lkml.org 
[lkml]   [2015]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2/2] EDAC: Fix sysfs dimm_label store operation
From
Date
On Mon, 2015-09-21 at 13:19 -0600, Toshi Kani wrote:
:
>
> diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
> index 8983755..f2ea914 100644
> --- a/drivers/edac/edac_mc_sysfs.c
> +++ b/drivers/edac/edac_mc_sysfs.c
> @@ -241,13 +241,14 @@ static ssize_t channel_dimm_label_store(struct
> device *dev,
> unsigned chan = to_channel(mattr);
> struct rank_info *rank = csrow->channels[chan];
>
> - ssize_t max_size = 0;
> + if (count == 0 || count > sizeof(rank->dimm->label))
> + return -EINVAL;
>
> - max_size = min((ssize_t) count, (ssize_t) EDAC_MC_LABEL_LEN - 1);
> - strncpy(rank->dimm->label, data, max_size);
> - rank->dimm->label[max_size] = '\0';
> + strncpy(rank->dimm->label, data, count);
> + if (rank->dimm->label[count - 1] == '\n')
> + rank->dimm->label[count - 1] = '\0';

Thinking further, it'd be safer to always set a null at the end. I will
update the patch.

-Toshi



\
 
 \ /
  Last update: 2015-09-22 02:01    [W:0.044 / U:0.532 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site