lkml.org 
[lkml]   [2013]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[137/251] nl80211: fix mgmt tx status and testmode reporting for netns
    3.6.11.9-rc1 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Michal Kazior <michal.kazior@tieto.com>

    [ Upstream commit a0ec570f4f69c4cb700d743a915096c2c8f56a99 ]

    These two events were sent to the default network
    namespace.

    This caused AP mode in a non-default netns to not
    work correctly. Mgmt tx status was multicasted to
    a different (default) netns instead of the one the
    AP was in.

    Cc: stable@vger.kernel.org
    Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    net/wireless/nl80211.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
    index 1e37dbf..79ad33d 100644
    --- a/net/wireless/nl80211.c
    +++ b/net/wireless/nl80211.c
    @@ -5542,12 +5542,14 @@ EXPORT_SYMBOL(cfg80211_testmode_alloc_event_skb);

    void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
    {
    + struct cfg80211_registered_device *rdev = ((void **)skb->cb)[0];
    void *hdr = ((void **)skb->cb)[1];
    struct nlattr *data = ((void **)skb->cb)[2];

    nla_nest_end(skb, data);
    genlmsg_end(skb, hdr);
    - genlmsg_multicast(skb, 0, nl80211_testmode_mcgrp.id, gfp);
    + genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
    + nl80211_testmode_mcgrp.id, gfp);
    }
    EXPORT_SYMBOL(cfg80211_testmode_event);
    #endif
    @@ -8378,7 +8380,8 @@ void nl80211_send_mgmt_tx_status(struct cfg80211_registered_device *rdev,

    genlmsg_end(msg, hdr);

    - genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, gfp);
    + genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
    + nl80211_mlme_mcgrp.id, gfp);
    return;

    nla_put_failure:
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-09-11 07:41    [W:4.198 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site