From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
To: LinMa <linma@zju.edu.cn>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
Johan Hedberg <johan.hedberg@gmail.com>,
Marcel Holtmann <marcel@holtmann.org>,
"linux-bluetooth@vger.kernel.org"
<linux-bluetooth@vger.kernel.org>,
"open list:NETWORKING [GENERAL]" <netdev@vger.kernel.org>
Subject: Re: [PATCH v3] Bluetooth: call lock_sock() outside of spinlock section
Date: Thu, 22 Jul 2021 14:16:27 +0900 [thread overview]
Message-ID: <38e78054-7713-a142-4161-22890d8981ba@i-love.sakura.ne.jp> (raw)
In-Reply-To: <7e4fafe2.58d70.17acc8a1a0b.Coremail.linma@zju.edu.cn>
On 2021/07/22 13:47, LinMa wrote:
> Hi Tetsuo,
>
> Just find out another interesting function: sock_owned_by_user(). (I am just a noob of kernel locks)
>
> Hence I think the following patch has the same 'effect' as the old patch e305509e678b3 ("Bluetooth: use correct lock to prevent UAF of hdev object")
>
> diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
> index b04a5a02ecf3..0cc4b88daa96 100644
> --- a/net/bluetooth/hci_sock.c
> +++ b/net/bluetooth/hci_sock.c
> @@ -762,7 +762,11 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event)
> /* Detach sockets from device */
> read_lock(&hci_sk_list.lock);
> sk_for_each(sk, &hci_sk_list.head) {
> - lock_sock(sk);
> + bh_lock_sock_nested(sk);
> +busywait:
> + if (sock_owned_by_user(sk))
> + goto busywait;
> +
> if (hci_pi(sk)->hdev == hdev) {
> hci_pi(sk)->hdev = NULL;
> sk->sk_err = EPIPE;
> @@ -771,7 +775,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event)
>
> hci_dev_put(hdev);
> }
> - release_sock(sk);
> + bh_unlock_sock(sk);
> }
> read_unlock(&hci_sk_list.lock);
> }
>
> The sad thing is that it seems will cost CPU resource to do meaningless wait...
>
> What do you think? Can this sock_owned_by_user() function do any help?
I don't think it helps.
One of problems we are seeing (and my patch will fix) is a race window that
this sk_for_each() loop needs to wait using lock_sock() because
"hci_pi(sk)->hdev = hdev;" is called by hci_sock_bind() under lock_sock().
Doing hci_pi(sk)->hdev == hdev comparison without lock_sock() will lead to
failing to "/* Detach sockets from device */".
prev parent reply other threads:[~2021-07-22 5:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-27 13:11 [PATCH] Bluetooth: call lock_sock() outside of spinlock section Tetsuo Handa
2021-06-27 14:05 ` bluez.test.bot
2021-07-07 9:43 ` [PATCH v2] " Tetsuo Handa
2021-07-07 10:08 ` [v2] " bluez.test.bot
2021-07-07 18:20 ` [PATCH v2] " Luiz Augusto von Dentz
2021-07-07 23:33 ` Tetsuo Handa
2021-07-08 1:00 ` LinMa
2021-07-09 13:50 ` Tetsuo Handa
2021-07-10 13:34 ` Tetsuo Handa
2021-07-08 7:16 ` [v2] " bluez.test.bot
2021-07-13 11:27 ` [PATCH v3] " Tetsuo Handa
2021-07-13 11:57 ` [v3] " bluez.test.bot
2021-07-14 19:20 ` [PATCH v3] " Luiz Augusto von Dentz
2021-07-15 3:03 ` LinMa
2021-07-16 3:47 ` Desmond Cheong Zhi Xi
2021-07-16 4:11 ` Desmond Cheong Zhi Xi
2021-07-16 14:48 ` Tetsuo Handa
2021-07-16 15:26 ` LinMa
2021-07-17 15:41 ` Yet Another Patch for CVE-2021-3573 LinMa
2021-07-17 15:45 ` LinMa
2021-07-22 9:36 ` [PATCH v3] Bluetooth: call lock_sock() outside of spinlock section Tetsuo Handa
2021-07-22 4:47 ` LinMa
2021-07-22 5:16 ` Tetsuo Handa [this message]
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=38e78054-7713-a142-4161-22890d8981ba@i-love.sakura.ne.jp \
--to=penguin-kernel@i-love.sakura.ne.jp \
--cc=johan.hedberg@gmail.com \
--cc=linma@zju.edu.cn \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
/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).