From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753870AbbIXUCX (ORCPT ); Thu, 24 Sep 2015 16:02:23 -0400 Received: from g1t6214.austin.hp.com ([15.73.96.122]:39495 "EHLO g1t6214.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752386AbbIXUCW (ORCPT ); Thu, 24 Sep 2015 16:02:22 -0400 Message-ID: <1443124767.25474.172.camel@hpe.com> Subject: Re: [PATCH v2 2/2] EDAC: Fix sysfs dimm_label store operation From: Toshi Kani To: Borislav Petkov Cc: mchehab@osg.samsung.com, dougthompson@xmission.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, elliott@hpe.com, tony.luck@intel.com Date: Thu, 24 Sep 2015 13:59:27 -0600 In-Reply-To: <20150924191551.GK3774@pd.tnic> References: <1442933883-21587-1-git-send-email-toshi.kani@hpe.com> <1442933883-21587-3-git-send-email-toshi.kani@hpe.com> <20150924164830.GF3774@pd.tnic> <1443121564.25474.160.camel@hpe.com> <20150924191551.GK3774@pd.tnic> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.5 (3.16.5-1.fc22) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2015-09-24 at 21:15 +0200, Borislav Petkov wrote: > On Thu, Sep 24, 2015 at 01:06:04PM -0600, Toshi Kani wrote: > > edac-utils(1) checks empty labels and shows them as "ch%d" [1]. So, > > I think empty labels are supported today, and using 'echo "" >' seems > > to be a legitimate way to set them empty if desired. > > What would be a sane use case to set a DIMM label to an empty string? Well, I guess there isn't a sane use case for it... :-) Attached is a patch (on top of patch 2/2) to disallow an empty string. I prefer to make it as a separate patch in case someone comes up with a valid use-case for it. Thanks, -Toshi ==== Subject: [PATCH] EDAC: Fail empty string to sysfs dimm_label store Updating dimm_label to an empty string does not make much sense. Change the sysfs dimm_label store option to fail a request when an input string is empty. Suggested-by: Borislav Petkov Signed-off-by: Toshi Kani --- drivers/edac/edac_mc_sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 5252fb9..72ba530 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);