* [PATCH] ath9k_htc: Add a sanity check in ath9k_htc_ampdu_action()
@ 2017-12-05 14:35 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2017-12-05 14:35 UTC (permalink / raw)
To: QCA ath9k Development, Sujith; +Cc: Kalle Valo, linux-wireless, kernel-janitors
Smatch generates a warning here:
drivers/net/wireless/ath/ath9k/htc_drv_main.c:1688 ath9k_htc_ampdu_action()
error: buffer overflow 'ista->tid_state' 8 <= 15
I don't know if it's a real bug or not but the other paths through this
function all ensure that "tid" is less than ATH9K_HTC_MAX_TID (8) so
checking here makes things more consistent.
Fixes: fb9987d0f748 ("ath9k_htc: Support for AR9271 chipset.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This might be fine. I see lots of other drivers don't check tid.
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index f808e5833d7e..a82ad739ab80 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1683,6 +1683,10 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
break;
case IEEE80211_AMPDU_TX_OPERATIONAL:
+ if (tid >= ATH9K_HTC_MAX_TID) {
+ ret = -EINVAL;
+ break;
+ }
ista = (struct ath9k_htc_sta *) sta->drv_priv;
spin_lock_bh(&priv->tx.tx_lock);
ista->tid_state[tid] = AGGR_OPERATIONAL;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ath9k_htc: Add a sanity check in ath9k_htc_ampdu_action()
@ 2017-12-05 14:35 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2017-12-05 14:35 UTC (permalink / raw)
To: QCA ath9k Development, Sujith; +Cc: Kalle Valo, linux-wireless, kernel-janitors
Smatch generates a warning here:
drivers/net/wireless/ath/ath9k/htc_drv_main.c:1688 ath9k_htc_ampdu_action()
error: buffer overflow 'ista->tid_state' 8 <= 15
I don't know if it's a real bug or not but the other paths through this
function all ensure that "tid" is less than ATH9K_HTC_MAX_TID (8) so
checking here makes things more consistent.
Fixes: fb9987d0f748 ("ath9k_htc: Support for AR9271 chipset.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This might be fine. I see lots of other drivers don't check tid.
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index f808e5833d7e..a82ad739ab80 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1683,6 +1683,10 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
break;
case IEEE80211_AMPDU_TX_OPERATIONAL:
+ if (tid >= ATH9K_HTC_MAX_TID) {
+ ret = -EINVAL;
+ break;
+ }
ista = (struct ath9k_htc_sta *) sta->drv_priv;
spin_lock_bh(&priv->tx.tx_lock);
ista->tid_state[tid] = AGGR_OPERATIONAL;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: ath9k_htc: Add a sanity check in ath9k_htc_ampdu_action()
2017-12-05 14:35 ` Dan Carpenter
@ 2017-12-14 15:30 ` Kalle Valo
-1 siblings, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2017-12-14 15:30 UTC (permalink / raw)
To: Dan Carpenter
Cc: QCA ath9k Development, Sujith, Kalle Valo, linux-wireless,
kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> Smatch generates a warning here:
>
> drivers/net/wireless/ath/ath9k/htc_drv_main.c:1688 ath9k_htc_ampdu_action()
> error: buffer overflow 'ista->tid_state' 8 <= 15
>
> I don't know if it's a real bug or not but the other paths through this
> function all ensure that "tid" is less than ATH9K_HTC_MAX_TID (8) so
> checking here makes things more consistent.
>
> Fixes: fb9987d0f748 ("ath9k_htc: Support for AR9271 chipset.")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Patch applied to ath-next branch of ath.git, thanks.
413fd2f5c023 ath9k_htc: Add a sanity check in ath9k_htc_ampdu_action()
--
https://patchwork.kernel.org/patch/10093021/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: ath9k_htc: Add a sanity check in ath9k_htc_ampdu_action()
@ 2017-12-14 15:30 ` Kalle Valo
0 siblings, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2017-12-14 15:30 UTC (permalink / raw)
To: Dan Carpenter
Cc: QCA ath9k Development, Sujith, Kalle Valo, linux-wireless,
kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> Smatch generates a warning here:
>
> drivers/net/wireless/ath/ath9k/htc_drv_main.c:1688 ath9k_htc_ampdu_action()
> error: buffer overflow 'ista->tid_state' 8 <= 15
>
> I don't know if it's a real bug or not but the other paths through this
> function all ensure that "tid" is less than ATH9K_HTC_MAX_TID (8) so
> checking here makes things more consistent.
>
> Fixes: fb9987d0f748 ("ath9k_htc: Support for AR9271 chipset.")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Patch applied to ath-next branch of ath.git, thanks.
413fd2f5c023 ath9k_htc: Add a sanity check in ath9k_htc_ampdu_action()
--
https://patchwork.kernel.org/patch/10093021/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-12-14 15:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-05 14:35 [PATCH] ath9k_htc: Add a sanity check in ath9k_htc_ampdu_action() Dan Carpenter
2017-12-05 14:35 ` Dan Carpenter
2017-12-14 15:30 ` Kalle Valo
2017-12-14 15:30 ` Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.