Merge tag 'mac80211-for-davem-2016-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

davem330 · davem330 · commit 12395d0647dd · 2016-04-28T16:55:26.000-04:00
Johannes Berg says:

====================
Just a single fix, for a per-CPU memory leak in a
(root user triggerable) error case.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
@@ -1761,7 +1761,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 
 		ret = dev_alloc_name(ndev, ndev->name);
 		if (ret < 0) {
-			free_netdev(ndev);
+			ieee80211_if_free(ndev);
 			return ret;
 		}
 
@@ -1847,7 +1847,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 
 		ret = register_netdevice(ndev);
 		if (ret) {
-			free_netdev(ndev);
+			ieee80211_if_free(ndev);
 			return ret;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1761,7 +1761,7 @@ int ieee80211_if_add(struct ieee80211_local local, const char name,`
`1761`	`1761`
`1762`	`1762`	`ret = dev_alloc_name(ndev, ndev->name);`
`1763`	`1763`	`if (ret < 0) {`
`1764`		`- free_netdev(ndev);`
	`1764`	`+ ieee80211_if_free(ndev);`
`1765`	`1765`	`return ret;`
`1766`	`1766`	`}`
`1767`	`1767`
`@@ -1847,7 +1847,7 @@ int ieee80211_if_add(struct ieee80211_local local, const char name,`
`1847`	`1847`
`1848`	`1848`	`ret = register_netdevice(ndev);`
`1849`	`1849`	`if (ret) {`
`1850`		`- free_netdev(ndev);`
	`1850`	`+ ieee80211_if_free(ndev);`
`1851`	`1851`	`return ret;`
`1852`	`1852`	`}`
`1853`	`1853`	`}`