aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshi Kani <[email protected]>2015-09-24 13:59:27 -0600
committerBorislav Petkov <[email protected]>2015-09-28 16:39:05 +0200
commitd0c9c93019e9b61f21ac22a5c23749873adc0038 (patch)
treea697747506b4d36385cb5f984bc34bd1fe388151
parent438470b84c119f4910ebf1fdd26738c8d9881b24 (diff)
EDAC: Don't allow empty DIMM labels
Updating dimm_label to an empty string does not make much sense. Change the sysfs dimm_label store operation to fail a request when an input string is empty. Suggested-by: Borislav Petkov <[email protected]> Signed-off-by: Toshi Kani <[email protected]> Cc: [email protected] Cc: Mauro Carvalho Chehab <[email protected]> Cc: Tony Luck <[email protected]> Cc: linux-edac <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Borislav Petkov <[email protected]>
-rw-r--r--drivers/edac/edac_mc_sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index bf6b6802105c..3929391f0b92 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -248,7 +248,7 @@ static ssize_t channel_dimm_label_store(struct device *dev,
if (data[count - 1] == '\0' || data[count - 1] == '\n')
copy_count -= 1;
- if (copy_count >= sizeof(rank->dimm->label))
+ if (copy_count == 0 || copy_count >= sizeof(rank->dimm->label))
return -EINVAL;
strncpy(rank->dimm->label, data, copy_count);
@@ -509,7 +509,7 @@ static ssize_t dimmdev_label_store(struct device *dev,
if (data[count - 1] == '\0' || data[count - 1] == '\n')
copy_count -= 1;
- if (copy_count >= sizeof(dimm->label))
+ if (copy_count == 0 || copy_count >= sizeof(dimm->label))
return -EINVAL;
strncpy(dimm->label, data, copy_count);