RE: [PATCH 4/4] drivers/net/wireless/mwifiex/scan.c: test the just-initialized value
From: Bing Zhao <hidden>
Date: 2011-08-22 19:02:51
Also in:
kernel-janitors, lkml, netdev
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 <redacted> Test the just-initialized value rather than some other one. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @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 ...; } ) // </smpl> Signed-off-by: Julia Lawall <redacted>
Acked-by: Bing Zhao <redacted> Thanks, Bing
quoted hunk ↗ jump to hunk
--- 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);