From: Kalle Valo <kvalo@kernel.org>
To: Hillf Danton <hdanton@sina.com>
Cc: "Fedor Pchelkin" <pchelkin@ispras.ru>,
"Toke Høiland-Jørgensen" <toke@toke.dk>,
linux-kernel@vger.kernel.org,
syzbot+f2cb6e0ffdb961921e4d@syzkaller.appspotmail.com,
syzbot+df61b36319e045c00a08@syzkaller.appspotmail.com,
linux-wireless@vger.kernel.org
Subject: Re: [PATCH v2] wifi: ath9k: fix races between ath9k_wmi_cmd and ath9k_wmi_ctrl_rx
Date: Tue, 25 Apr 2023 08:45:06 +0300 [thread overview]
Message-ID: <87edo8qzvh.fsf@kernel.org> (raw)
In-Reply-To: <20230425033832.2041-1-hdanton@sina.com> (Hillf Danton's message of "Tue, 25 Apr 2023 11:38:32 +0800")
Hillf Danton <hdanton@sina.com> writes:
> On 24 Apr 2023 22:18:26 +0300 Fedor Pchelkin <pchelkin@ispras.ru>
>> Currently, the synchronization between ath9k_wmi_cmd() and
>> ath9k_wmi_ctrl_rx() is exposed to a race condition which, although being
>> rather unlikely, can lead to invalid behaviour of ath9k_wmi_cmd().
>>
>> Consider the following scenario:
>>
>> CPU0 CPU1
>>
>> ath9k_wmi_cmd(...)
>> mutex_lock(&wmi->op_mutex)
>> ath9k_wmi_cmd_issue(...)
>> wait_for_completion_timeout(...)
>> ---
>> timeout
>> ---
>> /* the callback is being processed
>> * before last_seq_id became zero
>> */
>> ath9k_wmi_ctrl_rx(...)
>> spin_lock_irqsave(...)
>> /* wmi->last_seq_id check here
>> * doesn't detect timeout yet
>> */
>> spin_unlock_irqrestore(...)
>> /* last_seq_id is zeroed to
>> * indicate there was a timeout
>> */
>> wmi->last_seq_id = 0
>
> Without wmi->wmi_lock held, updating last_seq_id on the waiter side
> means it is random on the waker side, so the fix below is incorrect.
>
>> mutex_unlock(&wmi->op_mutex)
>> return -ETIMEDOUT
>>
>> ath9k_wmi_cmd(...)
>> mutex_lock(&wmi->op_mutex)
>> /* the buffer is replaced with
>> * another one
>> */
>> wmi->cmd_rsp_buf = rsp_buf
>> wmi->cmd_rsp_len = rsp_len
>> ath9k_wmi_cmd_issue(...)
>> spin_lock_irqsave(...)
>> spin_unlock_irqrestore(...)
>> wait_for_completion_timeout(...)
>> /* the continuation of the
>> * callback left after the first
>> * ath9k_wmi_cmd call
>> */
>> ath9k_wmi_rsp_callback(...)
>> /* copying data designated
>> * to already timeouted
>> * WMI command into an
>> * inappropriate wmi_cmd_buf
>> */
>> memcpy(...)
>> complete(&wmi->cmd_wait)
>> /* awakened by the bogus callback
>> * => invalid return result
>> */
>> mutex_unlock(&wmi->op_mutex)
>> return 0
>>
>> To fix this, move ath9k_wmi_rsp_callback() under wmi_lock inside
>> ath9k_wmi_ctrl_rx() so that the wmi->cmd_wait can be completed only for
>> initially designated wmi_cmd call, otherwise the path would be rejected
>> with last_seq_id check.
>>
>> Also move recording the rsp buffer and length into ath9k_wmi_cmd_issue()
>> under the same wmi_lock with last_seq_id update to avoid their racy
>> changes.
>
> Better in a seperate one.
Adding linux-wireless, please always CC the list with wireless patches.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2023-04-25 5:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-15 20:21 [PATCH 0/3] wifi: ath9k: deal with uninit memory Fedor Pchelkin
2023-03-15 20:21 ` [PATCH 1/3] wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx Fedor Pchelkin
2023-03-17 5:26 ` Kalle Valo
2023-03-18 20:25 ` Fedor Pchelkin
2023-04-24 18:23 ` Fedor Pchelkin
2023-04-24 18:33 ` [PATCH v2] " Fedor Pchelkin
2023-04-25 11:14 ` Toke Høiland-Jørgensen
2023-04-28 16:52 ` Kalle Valo
2023-03-15 20:21 ` [PATCH 2/3] wifi: ath9k: fix races between ath9k_wmi_cmd and ath9k_wmi_ctrl_rx Fedor Pchelkin
2023-04-24 19:11 ` Fedor Pchelkin
2023-04-24 19:18 ` [PATCH v2] " Fedor Pchelkin
[not found] ` <20230425033832.2041-1-hdanton@sina.com>
2023-04-25 5:45 ` Kalle Valo [this message]
2023-04-25 7:54 ` Fedor Pchelkin
2023-04-25 19:26 ` [PATCH v3 1/2] " Fedor Pchelkin
2023-04-25 19:26 ` [PATCH v3 2/2] wifi: ath9k: protect WMI command response buffer replacement with a lock Fedor Pchelkin
2023-08-08 14:07 ` Toke Høiland-Jørgensen
[not found] ` <20230425230708.2132-1-hdanton@sina.com>
2023-04-26 19:02 ` [PATCH v3 1/2] wifi: ath9k: fix races between ath9k_wmi_cmd and ath9k_wmi_ctrl_rx Fedor Pchelkin
2023-05-15 12:06 ` Toke Høiland-Jørgensen
[not found] ` <20230518102437.4443-1-hdanton@sina.com>
2023-05-18 15:44 ` Fedor Pchelkin
2023-08-08 14:06 ` Toke Høiland-Jørgensen
2023-08-22 13:35 ` Kalle Valo
2023-03-15 20:21 ` [PATCH 3/3] wifi: ath9k: fix ath9k_wmi_cmd return value when device is unplugged Fedor Pchelkin
2023-03-15 20:47 ` [PATCH 0/3] wifi: ath9k: deal with uninit memory Fedor Pchelkin
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=87edo8qzvh.fsf@kernel.org \
--to=kvalo@kernel.org \
--cc=hdanton@sina.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=pchelkin@ispras.ru \
--cc=syzbot+df61b36319e045c00a08@syzkaller.appspotmail.com \
--cc=syzbot+f2cb6e0ffdb961921e4d@syzkaller.appspotmail.com \
--cc=toke@toke.dk \
/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).