Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a8e05e5 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: fix netns error unwinding bug 



The error unwinding code in set_netns has a bug
that will make it run into a BUG_ON if passed a
bad wiphy index, fix by not trying to unlock a
wiphy that doesn't exist.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7e937c63

net/wireless/nl80211.c

+2 −1
Original line number Diff line number Diff line
@@ -4029,7 +4029,7 @@ static int nl80211_wiphy_netns(struct sk_buff *skb, struct genl_info *info) 
	rdev = cfg80211_get_dev_from_info(info);

	if (IS_ERR(rdev)) {

		err = PTR_ERR(rdev);

		goto out;

		goto out_rtnl;

	}



	net = get_net_ns_by_pid(pid);
@@ -4049,6 +4049,7 @@ static int nl80211_wiphy_netns(struct sk_buff *skb, struct genl_info *info) 
	put_net(net);

 out:

	cfg80211_unlock_rdev(rdev);

 out_rtnl:

	rtnl_unlock();

	return err;

}