diff options
| author | David S. Miller <davem@davemloft.net> | 2022-08-26 11:43:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-08-26 11:43:20 +0100 |
| commit | 4ba9d38bb5a3255390dc15d8ac81f656a968273c (patch) | |
| tree | 1dae03ef538991b5e0c4174a668d4e44571d1574 /net/wireless/debugfs.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 <davem@davemloft.net>
Diffstat (limited to 'net/wireless/debugfs.c')
| -rw-r--r-- | net/wireless/debugfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/debugfs.c b/net/wireless/debugfs.c index aab43469a2f0..0878b162890a 100644 --- a/net/wireless/debugfs.c +++ b/net/wireless/debugfs.c @@ -65,9 +65,10 @@ static ssize_t ht40allow_map_read(struct file *file, { struct wiphy *wiphy = file->private_data; char *buf; - unsigned int offset = 0, buf_size = PAGE_SIZE, i, r; + unsigned int offset = 0, buf_size = PAGE_SIZE, i; enum nl80211_band band; struct ieee80211_supported_band *sband; + ssize_t r; buf = kzalloc(buf_size, GFP_KERNEL); if (!buf) |