* [PATCH] mac80211: fix mesh forwarding when ratelimited too
[not found] ` <201012262159.oBQLxOsw008865@hera.kernel.org>
@ 2010-12-30 8:01 ` Milton Miller
2010-12-30 8:53 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Milton Miller @ 2010-12-30 8:01 UTC (permalink / raw
To: John W. Linville, Johannes Berg, Javier Cardona
Cc: David S. Miller, linux-wireless, netdev, linux-kernel
Commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 said:
Under memory pressure, the mac80211 mesh code
may helpfully print a message that it failed
to clone a mesh frame and then will proceed
to crash trying to use it anyway. Fix that.
Avoid the reference whenever the frame copy is unsuccessful
regardless of the debug message being suppressed or printed.
Cc: stable@kernel.org [2.6.27+]
Signed-off-by: Milton Miller <miltonm@bga.com>
---
I chose a seperate if vs nesting the ratelimit check to avoid shifting
the printk further to the right.
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b01e467..e98668f 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1788,11 +1788,11 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
fwd_skb = skb_copy(skb, GFP_ATOMIC);
- if (!fwd_skb && net_ratelimit()) {
+ if (!fwd_skb && net_ratelimit())
printk(KERN_DEBUG "%s: failed to clone mesh frame\n",
sdata->name);
+ if (!fwd_skb)
goto out;
- }
fwd_hdr = (struct ieee80211_hdr *) fwd_skb->data;
memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mac80211: fix mesh forwarding when ratelimited too
2010-12-30 8:01 ` [PATCH] mac80211: fix mesh forwarding when ratelimited too Milton Miller
@ 2010-12-30 8:53 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2010-12-30 8:53 UTC (permalink / raw
To: Milton Miller
Cc: John W. Linville, Javier Cardona, David S. Miller, linux-wireless,
netdev, linux-kernel
On Thu, 2010-12-30 at 02:01 -0600, Milton Miller wrote:
> Commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 said:
>
> Under memory pressure, the mac80211 mesh code
> may helpfully print a message that it failed
> to clone a mesh frame and then will proceed
> to crash trying to use it anyway. Fix that.
>
> Avoid the reference whenever the frame copy is unsuccessful
> regardless of the debug message being suppressed or printed.
>
> Cc: stable@kernel.org [2.6.27+]
> Signed-off-by: Milton Miller <miltonm@bga.com>
> ---
> I chose a seperate if vs nesting the ratelimit check to avoid shifting
> the printk further to the right.
>
> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
> index b01e467..e98668f 100644
> --- a/net/mac80211/rx.c
> +++ b/net/mac80211/rx.c
> @@ -1788,11 +1788,11 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
>
> fwd_skb = skb_copy(skb, GFP_ATOMIC);
>
> - if (!fwd_skb && net_ratelimit()) {
> + if (!fwd_skb && net_ratelimit())
> printk(KERN_DEBUG "%s: failed to clone mesh frame\n",
> sdata->name);
> + if (!fwd_skb)
> goto out;
> - }
Oops, good catch! Thanks.
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-30 8:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1293009307.3531.13.camel@jlt3.sipsolutions.net>
[not found] ` <AANLkTik9PS-wKYg=XC0bUaZ=a99d-FdUmzZfvALVQ9Tv@mail.gmail.com>
[not found] ` <201012262159.oBQLxOsw008865@hera.kernel.org>
2010-12-30 8:01 ` [PATCH] mac80211: fix mesh forwarding when ratelimited too Milton Miller
2010-12-30 8:53 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).