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

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

mac80211: fix memory leak in device registration error path 



If the cipher suites need to be allocated, but this
allocation fails, this leaks the internal scan request.
Fix that by going to the correct error handling label.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 987c285c

net/mac80211/main.c

+4 −2
Original line number Diff line number Diff line
@@ -871,8 +871,10 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
				local->hw.wiphy->cipher_suites,

				sizeof(u32) * local->hw.wiphy->n_cipher_suites,

				GFP_KERNEL);

			if (!suites)

				return -ENOMEM;

			if (!suites) {

				result = -ENOMEM;

				goto fail_wiphy_register;

			}

			for (r = 0; r < local->hw.wiphy->n_cipher_suites; r++) {

				u32 suite = local->hw.wiphy->cipher_suites[r];

				if (suite == WLAN_CIPHER_SUITE_WEP40 ||