Patch "mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mwifiex-debugfs-fix-sometimes-off-by-1-ssid-print.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6183468a23fc6b6903f8597982017ad2c7fdefcfMon Sep 17 00:00:00 2001
From: Brian Norris <[email protected]>
Date: Mon, 9 Jan 2017 15:33:50 -0800
Subject: mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print
From: Brian Norris <[email protected]>
commit 6183468a23fc6b6903f8597982017ad2c7fdefcf upstream.
Similar to commit fcd2042e8d36 ("mwifiex: printk() overflow with 32-byte SSIDs"), we failed to account for the existence of 32-char SSIDs in our debugfs code. Unlike in that case though, we zeroed out the containing struct first, and I'm pretty sure we're guaranteed to have some padding after the 'ssid.ssid' and 'ssid.ssid_len' fields (the struct is 33 bytes long).
So, this is the difference between:
# cat /sys/kernel/debug/mwifiex/mlan0/info ... essid="0123456789abcdef0123456789abcdef " ...
and the correct output:
# cat /sys/kernel/debug/mwifiex/mlan0/info ... essid="0123456789abcdef0123456789abcdef" ...
--- drivers/net/wireless/mwifiex/debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mwifiex/debugfs.c +2 -1
@@ -115,7 +115,8 @@ mwifiex_info_read(struct file *file, chaif (GET_BSS_ROLE (priv) ==MWIFIEX_BSS_ROLE_STA ) { p +=sprintf (p,"multicast_count=\"%d\"\n" ,netdev_mc_count (netdev)); - p +=sprintf (p,"essid=\"%s\"\n" , info.ssid.ssid); + p +=sprintf (p,"essid=\"%.*s\"\n" , info.ssid.ssid_len, + info.ssid.ssid); p +=sprintf (p,"bssid=\"%pM\"\n" , info.bssid); p +=sprintf (p,"channel=\"%d\"\n" , (int ) info.bss_chan); p +=sprintf (p,"country_code = \"%s\"\n" , info.country_code);
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/mwifiex-debugfs-fix-sometimes-off-by-1-ssid-print.patch