diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-06-19 20:55:06 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-19 20:55:12 +0400 |
| commit | f93beba705842af466e7c916b39630cacb40e9c6 (patch) | |
| tree | 0f296f0b1e419eb4fc242e188376a4fdd80085fa /net/wireless | |
| parent | 52874a5e3917dde3b081521b014d6e4b226aacff (diff) | |
| parent | 3a5a423bb958ad22eeccca66c533e85bf69ba10e (diff) | |
| download | linux-f93beba705842af466e7c916b39630cacb40e9c6.tar.xz | |
Merge remote-tracking branch 'mac80211/master' into HEAD
Merge mac80211 to avoid conflicts with the nl80211 attrbuf
changes.
Conflicts:
net/mac80211/iface.c
net/wireless/nl80211.c
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 4ab1ffa9df11..f8ffb9a59c83 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1527,12 +1527,17 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb) struct cfg80211_registered_device *dev; s64 filter_wiphy = -1; bool split = false; - struct nlattr **tb = nl80211_fam.attrbuf; + struct nlattr **tb; int res; + /* will be zeroed in nlmsg_parse() */ + tb = kmalloc(sizeof(*tb) * (NL80211_ATTR_MAX + 1), GFP_KERNEL); + if (!tb) + return -ENOMEM; + rtnl_lock(); res = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize, - tb, nl80211_fam.maxattr, nl80211_policy); + tb, NL80211_ATTR_MAX, nl80211_policy); if (res == 0) { split = tb[NL80211_ATTR_SPLIT_WIPHY_DUMP]; if (tb[NL80211_ATTR_WIPHY]) @@ -1546,6 +1551,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb) netdev = dev_get_by_index(sock_net(skb->sk), ifidx); if (!netdev) { rtnl_unlock(); + kfree(tb); return -ENODEV; } if (netdev->ieee80211_ptr) { @@ -1556,6 +1562,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb) dev_put(netdev); } } + kfree(tb); list_for_each_entry(dev, &cfg80211_rdev_list, list) { if (!net_eq(wiphy_net(&dev->wiphy), sock_net(skb->sk))) |