Return-path: Received: from na3sys009aog122.obsmtp.com ([74.125.149.147]:34886 "EHLO na3sys009aog122.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753189Ab1HVTaG convert rfc822-to-8bit (ORCPT ); Mon, 22 Aug 2011 15:30:06 -0400 From: Bing Zhao To: "wharms@bfs.de" CC: Julia Lawall , Pierre Louis Aublin , "kernel-janitors@vger.kernel.org" , "John W. Linville" , "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Date: Mon, 22 Aug 2011 12:29:23 -0700 Subject: RE: [PATCH 4/4] drivers/net/wireless/mwifiex/scan.c: test the just-initialized value Message-ID: <477F20668A386D41ADCC57781B1F70430802DD7B8C@SC-VEXCH1.marvell.com> (sfid-20110822_213009_765507_AF63F799) References: <1314021636-11528-4-git-send-email-julia@diku.dk> <4E52638C.8080407@inria.fr> <477F20668A386D41ADCC57781B1F70430802DD7B7E@SC-VEXCH1.marvell.com> <4E52A966.3090502@bfs.de> In-Reply-To: <4E52A966.3090502@bfs.de> Content-Type: text/plain; charset=US-ASCII MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: > Am 22.08.2011 21:02, schrieb Bing Zhao: > > Hi Julia, > > > > Thanks for the patch. > > > >> -----Original Message----- > >> From: Julia Lawall [mailto:julia@diku.dk] > >> Sent: Monday, August 22, 2011 7:16 AM > >> To: Pierre Louis Aublin > >> Cc: Bing Zhao; kernel-janitors@vger.kernel.org; John W. Linville; linux-wireless@vger.kernel.org; > >> netdev@vger.kernel.org; linux-kernel@vger.kernel.org > >> Subject: [PATCH 4/4] drivers/net/wireless/mwifiex/scan.c: test the just-initialized value > >> > >> From: Julia Lawall > >> > >> Test the just-initialized value rather than some other one. > >> > >> The semantic match that finds this problem is as follows: > >> (http://coccinelle.lip6.fr/) > >> > >> // > >> @r@ > >> identifier x,y,f!={PTR_ERR,ERR_PTR,ERR_CAST}; > >> statement S; > >> @@ > >> > >> x = f(...); > >> ( > >> if (\(x == NULL\|IS_ERR(x)\)) S > >> | > >> *if (\(y == NULL\|IS_ERR(y)\)) > >> { ... when != x > >> return ...; } > >> ) > >> // > >> > >> Signed-off-by: Julia Lawall > > > > Acked-by: Bing Zhao > > > > > > Thanks, > > Bing > > > >> > >> --- > >> drivers/net/wireless/mwifiex/scan.c | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c > >> index b28241c..37ca2f9 100644 > >> --- a/drivers/net/wireless/mwifiex/scan.c > >> +++ b/drivers/net/wireless/mwifiex/scan.c > >> @@ -1480,8 +1480,8 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, > >> return -ENOMEM; > >> } > >> beacon_ie = kzalloc(ie_len, GFP_KERNEL); > >> - if (!bss_desc) { > >> - dev_err(priv->adapter->dev, " failed to alloc bss_desc\n"); > >> + if (!beacon_ie) { > >> + dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n"); > >> return -ENOMEM; > >> } > >> memcpy(beacon_ie, ie_buf, ie_len); > > -- > > > this looks like a case for kmemdup() Hi Walter, You are right. I believe there are some more cases where kmemdup can be used. Hi John, Please apply Julia's patch as I will send a separate patch later to address Walter's comment. Thanks. > > just my 2 cents, Thanks a lot for your 2 cents. Bing > > re, > wh >