From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933238AbbIUXn3 (ORCPT ); Mon, 21 Sep 2015 19:43:29 -0400 Received: from g1t6216.austin.hp.com ([15.73.96.123]:40187 "EHLO g1t6216.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932130AbbIUXn1 (ORCPT ); Mon, 21 Sep 2015 19:43:27 -0400 X-Greylist: delayed 15650 seconds by postgrey-1.27 at vger.kernel.org; Mon, 21 Sep 2015 19:43:27 EDT Message-ID: <1442878835.25474.119.camel@hpe.com> Subject: Re: [PATCH 2/2] EDAC: Fix sysfs dimm_label store operation From: Toshi Kani To: mchehab@osg.samsung.com, bp@alien8.de, dougthompson@xmission.com Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, elliott@hpe.com, tony.luck@intel.com Date: Mon, 21 Sep 2015 17:40:35 -0600 In-Reply-To: <1442863184-17935-3-git-send-email-toshi.kani@hpe.com> References: <1442863184-17935-1-git-send-email-toshi.kani@hpe.com> <1442863184-17935-3-git-send-email-toshi.kani@hpe.com> 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 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