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

Commit e6436be2 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: fix statistics leak if dev_alloc_name() fails 



In the case that dev_alloc_name() fails, e.g. because the name was
given by the user and already exists, we need to clean up properly
and free the per-CPU statistics. Fix that.

Cc: stable@vger.kernel.org
Fixes: 5a490510 ("mac80211: use per-CPU TX/RX statistics")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8f815cdd

net/mac80211/iface.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}

	}