From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jes Sorensen Subject: Re: [PATCH v2] mdadm: replace hard coded string length Date: Sat, 17 Sep 2016 17:06:15 -0400 Message-ID: References: <1474041111-4029795-1-git-send-email-songliubraving@fb.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1474041111-4029795-1-git-send-email-songliubraving@fb.com> (Song Liu's message of "Fri, 16 Sep 2016 08:51:51 -0700") Sender: linux-raid-owner@vger.kernel.org To: Song Liu Cc: linux-raid@vger.kernel.org List-Id: linux-raid.ids Song Liu writes: > This patch replaces hard coded 32 with sizeof(sb->set_name) in a > couple places. > > Signed-off-by: Song Liu > --- > super1.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/super1.c b/super1.c > index 9f62d23..729596f 100644 > --- a/super1.c > +++ b/super1.c > @@ -1030,7 +1030,7 @@ static void getinfo_super1(struct supertype *st, struct mdinfo *info, char *map) > > memcpy(info->uuid, sb->set_uuid, 16); > > - strncpy(info->name, sb->set_name, 32); > + strncpy(info->name, sb->set_name, sizeof(info->name) - 1); > info->name[32] = 0; > > if ((__le32_to_cpu(sb->feature_map)&MD_FEATURE_REPLACEMENT)) { > @@ -1124,7 +1124,7 @@ static int update_super1(struct supertype *st, struct mdinfo *info, > if (c) > strncpy(info->name, c+1, 31 - (c-sb->set_name)); > else > - strncpy(info->name, sb->set_name, 32); > + strncpy(info->name, sb->set_name, sizeof(info->name) - 1); > info->name[32] = 0; > } I had to check why this was OK, and technically it is, but I think you should change the 'info->name[32] = 0' lines as well, to say 'info->name[sizeof(info->name) -1] = '\0'' too. Sorry for the nitpicking, but I think it's better to be consistent here. Cheers, Jes