diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2021-10-01 21:11:08 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2021-10-21 16:54:04 +0200 |
| commit | 8223ac199a3849257e86ec27865dc63f034b1cf1 (patch) | |
| tree | e7e391484c4dbe8592e4c8da300442f4a8ec5be1 /net/mac80211/ibss.c | |
| parent | cfg80211: prepare for const netdev->dev_addr (diff) | |
| download | linux-8223ac199a3849257e86ec27865dc63f034b1cf1.tar.xz linux-8223ac199a3849257e86ec27865dc63f034b1cf1.zip | |
mac80211: fix memory leaks with element parsing
My previous commit 5d24828d05f3 ("mac80211: always allocate
struct ieee802_11_elems") had a few bugs and leaked the new
allocated struct in a few error cases, fix that.
Fixes: 5d24828d05f3 ("mac80211: always allocate struct ieee802_11_elems")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20211001211108.9839928e42e0.Ib81ca187d3d3af7ed1bfeac2e00d08a4637c8025@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 66b00046f0c2..0416c4d22292 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1659,11 +1659,11 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, mgmt->u.action.u.chan_switch.variable, ies_len, true, mgmt->bssid, NULL); - if (!elems || elems->parse_error) - break; - - ieee80211_rx_mgmt_spectrum_mgmt(sdata, mgmt, skb->len, - rx_status, elems); + if (elems && !elems->parse_error) + ieee80211_rx_mgmt_spectrum_mgmt(sdata, mgmt, + skb->len, + rx_status, + elems); kfree(elems); break; } |