2018-05-18 07:39:17

by Xinming Hu

Subject: [PATCH] mwifiex: correct histogram data with appropriate index

Correct snr/nr/rssi data index to avoid possible buffer underflow.

Signed-off-by: Xinming Hu <[email protected]>
---
drivers/net/wireless/marvell/mwifiex/util.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/util.c b/drivers/net/wireless/marvell/mwifiex/util.c
index 0cd68ff..51ccf10 100644
--- a/drivers/net/wireless/marvell/mwifiex/util.c
+++ b/drivers/net/wireless/marvell/mwifiex/util.c
@@ -708,12 +708,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 */
--
1.9.1

2018-05-23 08:01:05

by Kalle Valo

Subject: Re: mwifiex: correct histogram data with appropriate index

Xinming Hu <[email protected]> wrote:

> Correct snr/nr/rssi data index to avoid possible buffer underflow.
>
> Signed-off-by: Xinming Hu <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

30bfce0b63fa mwifiex: correct histogram data with appropriate index

--
https://patchwork.kernel.org/patch/10408353/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches