2013-06-24 12:06:06

by Michal Kazior

Subject: [PATCH] nl80211: fix mgmt tx status and testmode reporting for netns

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.

Signed-off-by: Michal Kazior <[email protected]>
---
net/wireless/nl80211.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index b14b7e3..7bafce2 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6593,7 +6593,10 @@ void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)

nla_nest_end(skb, data);
genlmsg_end(skb, hdr);
- genlmsg_multicast(skb, 0, nl80211_testmode_mcgrp.id, gfp);
+
+ rcu_read_lock();
+ genlmsg_multicast_allns(skb, 0, nl80211_testmode_mcgrp.id, GFP_ATOMIC);
+ rcu_read_unlock();
}
EXPORT_SYMBOL(cfg80211_testmode_event);
#endif
@@ -10028,7 +10031,8 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,

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.9.5

2013-06-24 13:41:15

by Johannes Berg

Subject: Re: [PATCH] nl80211: fix mgmt tx status and testmode reporting for netns

On Mon, 2013-06-24 at 13:50 +0200, Michal Kazior wrote:
> 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.

Good catch.

> @@ -6593,7 +6593,10 @@ void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
>
> nla_nest_end(skb, data);
> genlmsg_end(skb, hdr);
> - genlmsg_multicast(skb, 0, nl80211_testmode_mcgrp.id, gfp);
> +
> + rcu_read_lock();
> + genlmsg_multicast_allns(skb, 0, nl80211_testmode_mcgrp.id, GFP_ATOMIC);
> + rcu_read_unlock();
> }
> EXPORT_SYMBOL(cfg80211_testmode_event);

I think this one should get a wiphy parameter though, to put it into the
right netns.

johannes

2013-06-25 08:50:07

by Johannes Berg

Subject: Re: [PATCH v2] nl80211: fix mgmt tx status and testmode reporting for netns

On Tue, 2013-06-25 at 09:17 +0200, Michal Kazior wrote:
> 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.

Applied, thanks.

johannes

2013-06-25 07:17:23

by Michal Kazior

Subject: [PATCH v2] nl80211: fix mgmt tx status and testmode reporting for netns

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.

Signed-off-by: Michal Kazior <[email protected]>
---
v2: push testmode event to the right netns (thanks Johannes!)

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 b14b7e3..db8ead9 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6588,12 +6588,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
@@ -10028,7 +10030,8 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,

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.9.5