Commit 99506882 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville

ath9k: fix null pointer dereference in ani monitor code

In 'ath9k_ani_reset' the 'ahp->ah_curani' will be initialized only
if 'DO_ANI(ah)' true. In 'ath9k_hw_ani_monitor' we are using
'ahp->ah_curani' unconditionally, and it will cause a NULL pointer
dereference on AR9100.

Changes-licensed-under: ISC
Signed-off-by: default avatarGabor Juhos <>
Signed-off-by: default avatarImre Kaloz <>
Tested-by: default avatarPavel Roskin <>
Signed-off-by: default avatarJohn W. Linville <>
parent 1975ef20
......@@ -551,6 +551,9 @@ void ath9k_hw_ani_monitor(struct ath_hal *ah,
struct ar5416AniState *aniState;
int32_t listenTime;
if (!DO_ANI(ah))
aniState = ahp->ah_curani;
ahp->ah_stats.ast_nodestats = *stats;
......@@ -610,9 +613,6 @@ void ath9k_hw_ani_monitor(struct ath_hal *ah,
aniState->cckPhyErrCount = cckPhyErrCnt;
if (!DO_ANI(ah))
if (aniState->listenTime > 5 * ahp->ah_aniPeriod) {
if (aniState->ofdmPhyErrCount <= aniState->listenTime *
aniState->ofdmTrigLow / 1000 &&
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment