| Message ID | 1526629134-10049-1-git-send-email-huxm@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 30bfce0b63fa68c14ae1613eb9d259fa18644074 |
| Delegated to: | Kalle Valo |
| Headers | show |
Xinming Hu <huxm@marvell.com> wrote: > Correct snr/nr/rssi data index to avoid possible buffer underflow. > > Signed-off-by: Xinming Hu <huxm@marvell.com> Patch applied to wireless-drivers-next.git, thanks. 30bfce0b63fa mwifiex: correct histogram data with appropriate index
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 */
Correct snr/nr/rssi data index to avoid possible buffer underflow. Signed-off-by: Xinming Hu <huxm@marvell.com> --- drivers/net/wireless/marvell/mwifiex/util.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)