summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorXinming Hu <huxm@marvell.com>2018-05-18 15:38:54 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-06 16:24:34 +0200
commit5c174f95e7ded3f492d05425a205420dad0f7926 (patch)
treee5d5e34e18b27ee565a82f49ce20a94041601e01 /drivers
parentc51df1153c835b0b6b1b436e0394f0e76758bc59 (diff)
downloadlinux-stable-5c174f95e7ded3f492d05425a205420dad0f7926.tar.gz
linux-stable-5c174f95e7ded3f492d05425a205420dad0f7926.tar.bz2
linux-stable-5c174f95e7ded3f492d05425a205420dad0f7926.zip
mwifiex: correct histogram data with appropriate index
[ Upstream commit 30bfce0b63fa68c14ae1613eb9d259fa18644074 ] Correct snr/nr/rssi data index to avoid possible buffer underflow. Signed-off-by: Xinming Hu <huxm@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/mwifiex/util.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 0cec8a64473e..eb5ffa5b1c6c 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -702,12 +702,14 @@ void mwifiex_hist_data_set(struct mwifiex_private *priv, u8 rx_rate, s8 snr,
s8 nflr)
{
struct mwifiex_histogram_data *phist_data = priv->hist_data;
+ s8 nf = -nflr;
+ s8 rssi = snr - nflr;
atomic_inc(&phist_data->num_samples);
atomic_inc(&phist_data->rx_rate[rx_rate]);
- atomic_inc(&phist_data->snr[snr]);
- atomic_inc(&phist_data->noise_flr[128 + nflr]);
- atomic_inc(&phist_data->sig_str[nflr - snr]);
+ atomic_inc(&phist_data->snr[snr + 128]);
+ atomic_inc(&phist_data->noise_flr[nf + 128]);
+ atomic_inc(&phist_data->sig_str[rssi + 128]);
}
/* function to reset histogram data during init/reset */