From mboxrd@z Thu Jan 1 00:00:00 1970 From: Scott Feldman Date: Mon, 16 Nov 2009 23:46:25 +0000 Subject: Re: [PATCH 1/4] drivers/net/enic: decrement sizeof size in strncmp Message-Id: List-Id: In-Reply-To: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Julia Lawall , Joe Eykholt , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Thanks Julia/Jorg. We'll pick up change in next enic patch series. -scott On 11/11/09 11:48 PM, "Julia Lawall" wrote: > From: Julia Lawall > > As observed by Joe Perches, sizeof of a constant string includes the > trailing 0. If what is wanted is to check the initial characters of > another string, this trailing 0 should not be taken into account. If an > exact match is wanted, strcmp should be used instead. > > The semantic patch that makes this change is as follows: > (http://coccinelle.lip6.fr/) > > // > @@ > expression foo; > constant char *abc; > @@ > > strncmp(foo, abc, > - sizeof(abc) > + sizeof(abc)-1 > ) > // > > Signed-off-by: Julia Lawall > > --- > drivers/net/enic/vnic_dev.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff -u -p a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c > --- a/drivers/net/enic/vnic_dev.c > +++ b/drivers/net/enic/vnic_dev.c > @@ -358,9 +358,9 @@ int vnic_dev_hw_version(struct vnic_dev > if (err) > return err; > > - if (strncmp(fw_info->hw_version, "A1", sizeof("A1")) = 0) > + if (strncmp(fw_info->hw_version, "A1", sizeof("A1") - 1) = 0) > *hw_ver = VNIC_DEV_HW_VER_A1; > - else if (strncmp(fw_info->hw_version, "A2", sizeof("A2")) = 0) > + else if (strncmp(fw_info->hw_version, "A2", sizeof("A2") - 1) = 0) > *hw_ver = VNIC_DEV_HW_VER_A2; > else > *hw_ver = VNIC_DEV_HW_VER_UNKNOWN;