diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-06-09 21:33:09 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-09 15:40:15 -0400 |
commit | c7a61cba71fd151cc7d9ebe53a090e0e61eeebf3 (patch) | |
tree | 3b8b1365c8ca48422d4fa366838c799d3880b55a /net | |
parent | 773fc8f6e8d63ec9d840588e161cbb73a01cfc45 (diff) | |
download | op-kernel-dev-c7a61cba71fd151cc7d9ebe53a090e0e61eeebf3.zip op-kernel-dev-c7a61cba71fd151cc7d9ebe53a090e0e61eeebf3.tar.gz |
mac80211: free netdev on dev_alloc_name() error
The change to remove free_netdev() from ieee80211_if_free()
erroneously didn't add the necessary free_netdev() for when
ieee80211_if_free() is called directly in one place, rather
than as the priv_destructor. Add the missing call.
Fixes: cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/iface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 915d7e1..f5f5015 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1816,6 +1816,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, ret = dev_alloc_name(ndev, ndev->name); if (ret < 0) { ieee80211_if_free(ndev); + free_netdev(ndev); return ret; } |