lkml.org 
[lkml]   [2011]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[142/152] mac80211: fix mesh forwarding
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Johannes Berg <johannes.berg@intel.com>

    commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 upstream.

    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.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Acked-by: Javier Cardona <javier@cozybit.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/mac80211/rx.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/net/mac80211/rx.c
    +++ b/net/mac80211/rx.c
    @@ -1712,9 +1712,11 @@ ieee80211_rx_h_mesh_fwding(struct ieee80

    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);
    + goto out;
    + }

    fwd_hdr = (struct ieee80211_hdr *) fwd_skb->data;
    memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);
    @@ -1752,6 +1754,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
    }
    }

    + out:
    if (is_multicast_ether_addr(hdr->addr1) ||
    sdata->dev->flags & IFF_PROMISC)
    return RX_CONTINUE;



    \
     
     \ /
      Last update: 2011-01-06 01:37    [W:4.421 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site