From: "Toke Høiland-Jørgensen" <toke@toke.dk>
To: Pavel Skripkin <paskripkin@gmail.com>,
ath9k-devel@qca.qualcomm.com, kvalo@kernel.org,
davem@davemloft.net, kuba@kernel.org, linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Pavel Skripkin <paskripkin@gmail.com>,
syzbot+03110230a11411024147@syzkaller.appspotmail.com,
syzbot+c6dde1f690b60e0b9fbe@syzkaller.appspotmail.com
Subject: Re: [PATCH v3 1/2] ath9k: fix use-after-free in ath9k_hif_usb_rx_cb
Date: Thu, 12 May 2022 14:49:57 +0200 [thread overview]
Message-ID: <87r14yhq4q.fsf@toke.dk> (raw)
In-Reply-To: <80962aae265995d1cdb724f5362c556d494c7566.1644265120.git.paskripkin@gmail.com>
Pavel Skripkin <paskripkin@gmail.com> writes:
> Syzbot reported use-after-free Read in ath9k_hif_usb_rx_cb(). The
> problem was in incorrect htc_handle->drv_priv initialization.
>
> Probable call trace which can trigger use-after-free:
>
> ath9k_htc_probe_device()
> /* htc_handle->drv_priv = priv; */
> ath9k_htc_wait_for_target() <--- Failed
> ieee80211_free_hw() <--- priv pointer is freed
>
> <IRQ>
> ...
> ath9k_hif_usb_rx_cb()
> ath9k_hif_usb_rx_stream()
> RX_STAT_INC() <--- htc_handle->drv_priv access
>
> In order to not add fancy protection for drv_priv we can move
> htc_handle->drv_priv initialization at the end of the
> ath9k_htc_probe_device() and add helper macro to make
> all *_STAT_* macros NULL save.
>
> Fixes: fb9987d0f748 ("ath9k_htc: Support for AR9271 chipset.")
> Reported-and-tested-by: syzbot+03110230a11411024147@syzkaller.appspotmail.com
> Reported-and-tested-by: syzbot+c6dde1f690b60e0b9fbe@syzkaller.appspotmail.com
> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Could you link the original syzbot report in the commit message as well,
please? Also that 'tested-by' implies that syzbot run-tested this? How
does it do that; does it have ath9k_htc hardware?
> ---
>
> Changes since v2:
> - My send-email script forgot, that mailing lists exist.
> Added back all related lists
>
> Changes since v1:
> - Removed clean-ups and moved them to 2/2
>
> ---
> drivers/net/wireless/ath/ath9k/htc.h | 10 +++++-----
> drivers/net/wireless/ath/ath9k/htc_drv_init.c | 3 ++-
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
> index 6b45e63fae4b..141642e5e00d 100644
> --- a/drivers/net/wireless/ath/ath9k/htc.h
> +++ b/drivers/net/wireless/ath/ath9k/htc.h
> @@ -327,11 +327,11 @@ static inline struct ath9k_htc_tx_ctl *HTC_SKB_CB(struct sk_buff *skb)
> }
>
> #ifdef CONFIG_ATH9K_HTC_DEBUGFS
> -
> -#define TX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.tx_stats.c++)
> -#define TX_STAT_ADD(c, a) (hif_dev->htc_handle->drv_priv->debug.tx_stats.c += a)
> -#define RX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c++)
> -#define RX_STAT_ADD(c, a) (hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c += a)
> +#define __STAT_SAVE(expr) (hif_dev->htc_handle->drv_priv ? (expr) : 0)
> +#define TX_STAT_INC(c) __STAT_SAVE(hif_dev->htc_handle->drv_priv->debug.tx_stats.c++)
> +#define TX_STAT_ADD(c, a) __STAT_SAVE(hif_dev->htc_handle->drv_priv->debug.tx_stats.c += a)
> +#define RX_STAT_INC(c) __STAT_SAVE(hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c++)
> +#define RX_STAT_ADD(c, a) __STAT_SAVE(hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c += a)
> #define CAB_STAT_INC priv->debug.tx_stats.cab_queued++
s/SAVE/SAFE/ here and in the next patch (and the commit message).
-Toke
next prev parent reply other threads:[~2022-05-12 12:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-07 20:24 [PATCH v3 1/2] ath9k: fix use-after-free in ath9k_hif_usb_rx_cb Pavel Skripkin
2022-02-07 20:24 ` [PATCH v3 2/2] ath9k: htc: clean up *STAT_* macros Pavel Skripkin
2022-02-07 21:24 ` Jeff Johnson
2022-02-08 15:32 ` Toke Høiland-Jørgensen
2022-02-08 15:49 ` Pavel Skripkin
2022-02-08 14:47 ` [PATCH v3 1/2] ath9k: fix use-after-free in ath9k_hif_usb_rx_cb Toke Høiland-Jørgensen
2022-02-08 15:48 ` Pavel Skripkin
2022-05-02 6:10 ` Tetsuo Handa
2022-05-05 19:09 ` Pavel Skripkin
2022-05-05 23:31 ` Tetsuo Handa
2022-05-10 19:26 ` Pavel Skripkin
2022-05-11 4:50 ` Kalle Valo
2022-05-11 9:53 ` Toke Høiland-Jørgensen
2022-05-11 9:59 ` Kalle Valo
2022-05-12 12:49 ` Toke Høiland-Jørgensen [this message]
2022-05-12 12:55 ` Pavel Skripkin
2022-05-12 13:48 ` Toke Høiland-Jørgensen
2022-05-12 16:05 ` Jeff Johnson
2022-05-12 16:09 ` Pavel Skripkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r14yhq4q.fsf@toke.dk \
--to=toke@toke.dk \
--cc=ath9k-devel@qca.qualcomm.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=paskripkin@gmail.com \
--cc=syzbot+03110230a11411024147@syzkaller.appspotmail.com \
--cc=syzbot+c6dde1f690b60e0b9fbe@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).