diff options
| author | David S. Miller <[email protected]> | 2022-08-26 11:43:20 +0100 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2022-08-26 11:43:20 +0100 |
| commit | 4ba9d38bb5a3255390dc15d8ac81f656a968273c (patch) | |
| tree | 1dae03ef538991b5e0c4174a668d4e44571d1574 /net/mac80211/sta_info.c | |
| parent | 4c612826bec1441214816827979b62f84a097e91 (diff) | |
| parent | 55f0a4894484e8d6ddf662f5aebbf3b4cb028541 (diff) | |
Merge tag 'wireless-2022-08-26' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless
Johannes Berg says:
====================
pull-request: wireless-2022-08-26
Here are a couple of fixes for the current cycle,
see the tag description below.
Just a couple of fixes:
* two potential leaks
* use-after-free in certain scan races
* warning in IBSS code
* error return from a debugfs file was wrong
* possible NULL-ptr-deref when station lookup fails
Please pull and let me know if there's any problem.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index cb23da9aff1e..330dab41f2fe 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -494,7 +494,7 @@ __sta_info_alloc(struct ieee80211_sub_if_data *sdata, sta->sdata = sdata; if (sta_info_alloc_link(local, &sta->deflink, gfp)) - return NULL; + goto free; if (link_id >= 0) { sta_info_add_link(sta, link_id, &sta->deflink, |