mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
mac80211: fix divide by zero when NOA update
In case of one shot NOA the interval can be 0, catch that
instead of potentially (depending on the driver) crashing
like this:
divide error: 0000 [#1] SMP
[...]
Call Trace:
<IRQ>
[<ffffffffc08e891c>] ieee80211_extend_absent_time+0x6c/0xb0 [mac80211]
[<ffffffffc08e8a17>] ieee80211_update_p2p_noa+0xb7/0xe0 [mac80211]
[<ffffffffc069cc30>] ath9k_p2p_ps_timer+0x170/0x190 [ath9k]
[<ffffffffc070adf8>] ath_gen_timer_isr+0xc8/0xf0 [ath9k_hw]
[<ffffffffc0691156>] ath9k_tasklet+0x296/0x2f0 [ath9k]
[<ffffffff8107ad65>] tasklet_action+0xe5/0xf0
[...]
Cc: stable@vger.kernel.org [3.16+, due to d463af4a1c
using it]
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
e9829b9745
commit
519ee6918b
1 changed files with 7 additions and 0 deletions
|
@ -2958,6 +2958,13 @@ ieee80211_extend_noa_desc(struct ieee80211_noa_data *data, u32 tsf, int i)
|
||||||
if (end > 0)
|
if (end > 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
/* One shot NOA */
|
||||||
|
if (data->count[i] == 1)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (data->desc[i].interval == 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
/* End time is in the past, check for repetitions */
|
/* End time is in the past, check for repetitions */
|
||||||
skip = DIV_ROUND_UP(-end, data->desc[i].interval);
|
skip = DIV_ROUND_UP(-end, data->desc[i].interval);
|
||||||
if (data->count[i] < 255) {
|
if (data->count[i] < 255) {
|
||||||
|
|
Loading…
Reference in a new issue