| Message ID | 20110103054355.GP1886@bicker |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Le lundi 03 janvier 2011 à 08:43 +0300, Dan Carpenter a écrit : > The printk() is supposed to be ratelimited but we should always goto out > when fwd_skb is NULL. Otherwise it gets dereferenced on the next line. > > Signed-off-by: Dan Carpenter <error27@gmail.com> > > diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c > index 5e9d3bc..dc8b566 100644 > --- a/net/mac80211/rx.c > +++ b/net/mac80211/rx.c > @@ -1831,8 +1831,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) > > fwd_skb = skb_copy(skb, GFP_ATOMIC); > > - if (!fwd_skb && net_ratelimit()) { > - printk(KERN_DEBUG "%s: failed to clone mesh frame\n", > + if (!fwd_skb) { > + if (net_ratelimit()) > + printk(KERN_DEBUG "%s: failed to clone mesh frame\n", > sdata->name); > goto out; > } Already discovered/coped by Milton Miller. -- 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/net/mac80211/rx.c b/net/mac80211/rx.c index 5e9d3bc..dc8b566 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1831,8 +1831,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) fwd_skb = skb_copy(skb, GFP_ATOMIC); - if (!fwd_skb && net_ratelimit()) { - printk(KERN_DEBUG "%s: failed to clone mesh frame\n", + if (!fwd_skb) { + if (net_ratelimit()) + printk(KERN_DEBUG "%s: failed to clone mesh frame\n", sdata->name); goto out; }
The printk() is supposed to be ratelimited but we should always goto out when fwd_skb is NULL. Otherwise it gets dereferenced on the next line. Signed-off-by: Dan Carpenter <error27@gmail.com> -- 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