| Message ID | 1314021636-11528-4-git-send-email-julia@diku.dk |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello all On 08/22/2011 04:00 PM, Julia Lawall wrote: > - if (!bss_desc) { > + if (!beacon_ie) { > dev_err(priv->adapter->dev, " failed to alloc bss_desc\n"); Shouldn't we also modify the error message, from "failed to alloc bss_desc" to "failed to alloc beacon_ie" ? Sincerely Pierre Louis Aublin -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 22 Aug 2011, Pierre Louis Aublin wrote: > Hello all > > On 08/22/2011 04:00 PM, Julia Lawall wrote: > > - if (!bss_desc) { > > + if (!beacon_ie) { > > dev_err(priv->adapter->dev, " failed to alloc bss_desc\n"); > Shouldn't we also modify the error message, from "failed to alloc bss_desc" to > "failed to alloc beacon_ie" ? Sure :) julia -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/22/2011 09:00 AM, Julia Lawall wrote: > From: Julia Lawall<julia@diku.dk> > > 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<julia@diku.dk> > > --- > drivers/net/wireless/mwifiex/scan.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c > index b28241c..d3111c9 100644 > --- a/drivers/net/wireless/mwifiex/scan.c > +++ b/drivers/net/wireless/mwifiex/scan.c > @@ -1480,7 +1480,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, > return -ENOMEM; > } > beacon_ie = kzalloc(ie_len, GFP_KERNEL); > - if (!bss_desc) { > + if (!beacon_ie) { > dev_err(priv->adapter->dev, " failed to alloc bss_desc\n"); > return -ENOMEM; > } The error message should also get the bss_desc => beacon_ie chang. Larry -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 22 Aug 2011, Larry Finger wrote: > On 08/22/2011 09:00 AM, Julia Lawall wrote: > > From: Julia Lawall<julia@diku.dk> > > > > 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<julia@diku.dk> > > > > --- > > drivers/net/wireless/mwifiex/scan.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/net/wireless/mwifiex/scan.c > > b/drivers/net/wireless/mwifiex/scan.c > > index b28241c..d3111c9 100644 > > --- a/drivers/net/wireless/mwifiex/scan.c > > +++ b/drivers/net/wireless/mwifiex/scan.c > > @@ -1480,7 +1480,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private > > *priv, > > return -ENOMEM; > > } > > beacon_ie = kzalloc(ie_len, GFP_KERNEL); > > - if (!bss_desc) { > > + if (!beacon_ie) { > > dev_err(priv->adapter->dev, " failed to alloc bss_desc\n"); > > return -ENOMEM; > > } > > The error message should also get the bss_desc => beacon_ie chang. Thanks. Pierre Louis Aublin made the same observation and I resumitted the patch. julia -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c index b28241c..d3111c9 100644 --- a/drivers/net/wireless/mwifiex/scan.c +++ b/drivers/net/wireless/mwifiex/scan.c @@ -1480,7 +1480,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, return -ENOMEM; } beacon_ie = kzalloc(ie_len, GFP_KERNEL); - if (!bss_desc) { + if (!beacon_ie) { dev_err(priv->adapter->dev, " failed to alloc bss_desc\n"); return -ENOMEM; }