Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1639812

[PATCH 4.10 039/129] mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print

Show all headers | View raw

4.10-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Brian Norris <briannorris@chromium.org>

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"
  ...

Fixes: 5e6e3a92b9a4 ("wireless: mwifiex: initial commit for Marvell mwifiex driver")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/net/wireless/marvell/mwifiex/debugfs.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/net/wireless/marvell/mwifiex/debugfs.c
+++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c
@@ -114,7 +114,8 @@ mwifiex_info_read(struct file *file, cha
 	if (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);

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 4.10 000/129] 4.10.16-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 051/129] iwlwifi: mvm: fix reorder timer re-arming Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 028/129] arm64: remove wrong CONFIG_PROC_SYSCTL ifdef Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 041/129] mwifiex: Avoid skipping WEP key deletion for AP Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 050/129] iwlwifi: pcie: fix the set of DMA memory mask Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 039/129] mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 057/129] iwlwifi: mvm: writing zero bytes to debugfs causes a crash Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 014/129] powerpc/mm: Fixup wrong LPCR_VRMASD value Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 030/129] spi: armada-3700: Remove spi_master_put in a3700_spi_remove() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 020/129] power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 048/129] iwlwifi: pcie: dont increment / decrement a bool Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 021/129] power: supply: bq24190_charger: Call set_mode_host() on pm_resume() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 017/129] powerpc/ftrace: Fix confusing help text for DISABLE_MPROFILE_KERNEL Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  Re: [PATCH 4.10 000/129] 4.10.16-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-05-11 18:10 +0200
    Re: [PATCH 4.10 000/129] 4.10.16-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 19:50 +0200
      Re: [PATCH 4.10 000/129] 4.10.16-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 20:20 +0200
  [PATCH 4.10 001/129] 9p: fix a potential acl leak Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:10 +0200
  Re: [PATCH 4.10 000/129] 4.10.16-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-05-12 17:30 +0200
  Re: [PATCH 4.10 000/129] 4.10.16-stable review Guenter Roeck <linux@roeck-us.net> - 2017-05-12 22:00 +0200

csiph-web