[PATCH net] mac80211: free netdev on dev_alloc_name() error

Subsystems: mac80211, the rest

STALE3414d

2 messages, 2 authors, 2017-06-09 · open the first message on its own page

[PATCH net] mac80211: free netdev on dev_alloc_name() error

From: Johannes Berg <johannes@sipsolutions.net>
Date: 2017-06-09 19:33:13

From: Johannes Berg <redacted>

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 <redacted>
---
 net/mac80211/iface.c | 1 +
 1 file changed, 1 insertion(+)
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 915d7e1b4545..f5f50150ba1c 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;
 		}
 
-- 
2.11.0

Re: [PATCH net] mac80211: free netdev on dev_alloc_name() error

From: David Miller <davem@davemloft.net>
Date: 2017-06-09 19:40:37

From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri,  9 Jun 2017 21:33:09 +0200
From: Johannes Berg <redacted>

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 <redacted>
Applied, thanks Johannes.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help