mwifiex: correct channel stat buffer overflows

commit 4b5dde2d6234ff5bc68e97e6901d1f2a0a7f3749 upstream.

mwifiex records information about various channels as it receives scan
information. It does this by appending to a buffer that was sized
to the max number of supported channels on any band, but there are
numerous problems:

(a) scans can return info from more than one band (e.g., both 2.4 and 5
    GHz), so the determined "max" is not large enough
(b) some firmware appears to return multiple results for a given
    channel, so the max *really* isn't large enough
(c) there is no bounds checking when stashing these stats, so problems
    (a) and (b) can easily lead to buffer overflows

Let's patch this by setting a slightly-more-correct max (that accounts
for a combination of both 2.4G and 5G bands) and adding a bounds check
when writing to our statistics buffer.

Due to problem (b), we still might not properly report all known survey
information (e.g., with "iw <dev> survey dump"), since duplicate results
(or otherwise "larger than expected" results) will cause some
truncation. But that's a problem for a future bugfix.

(And because of this known deficiency, only log the excess at the WARN
level, since that isn't visible by default in this driver and would
otherwise be a bit too noisy.)

Fixes: bf35443314ac ("mwifiex: channel statistics support for mwifiex")
Cc: Avinash Patil <patila@marvell.com>
Cc: Xinming Hu <huxm@marvell.com>
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Ganapathi Bhat <gbhat@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 06ad2d50f9b028558f8236760cee422a7f434e9f..fdfdf2371986efa79fc1872110a3f7d7f66e0d66 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -4215,7 +4215,7 @@ int mwifiex_init_channel_scan_gap(struct mwifiex_adapter *adapter)
        if (adapter->config_bands & BAND_A)
                n_channels_a = mwifiex_band_5ghz.n_channels;
 
-       adapter->num_in_chan_stats = max_t(u32, n_channels_bg, n_channels_a);
+       adapter->num_in_chan_stats = n_channels_bg + n_channels_a;
        adapter->chan_stats = vmalloc(sizeof(*adapter->chan_stats) *
                                      adapter->num_in_chan_stats);
 

diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index ae9630b493420f8ea9af78e2ef7a715eb799a2b2..9900855746acdc8cd3de299be78a3e6f781719a0 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -2492,6 +2492,12 @@ mwifiex_update_chan_statistics(struct mwifiex_private *priv,
                                              sizeof(struct mwifiex_chan_stats);
 
        for (i = 0 ; i < num_chan; i++) {
+               if (adapter->survey_idx >= adapter->num_in_chan_stats) {
+                       mwifiex_dbg(adapter, WARN,
+                                   "FW reported too many channel results (max %d)\n",
+                                   adapter->num_in_chan_stats);
+                       return;
+               }
                chan_stats.chan_num = fw_chan_stats->chan_num;
                chan_stats.bandcfg = fw_chan_stats->bandcfg;
                chan_stats.flags = fw_chan_stats->flags;