mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Edward Adam Davis <eadavis@qq.com>
To: luiz.dentz@gmail.com
Cc: eadavis@qq.com, johan.hedberg@gmail.com,
	linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
	marcel@holtmann.org,
	syzbot+b7f6f8c9303466e16c8a@syzkaller.appspotmail.com,
	syzkaller-bugs@googlegroups.com
Subject: [PATCH V3] Bluetooth/l2cap: sync sock recv cb and release
Date: Tue, 25 Jun 2024 18:12:15 +0800	[thread overview]
Message-ID: <tencent_CFD37DA36B4965E3A7C45E7770776C86DB05@qq.com> (raw)
In-Reply-To: <CABBYNZL5xiNDzDa3JJiwx2D-qpmA8Y3RBVWLetZ0fd4jURpN7g@mail.gmail.com>

The problem occurs between the system call to close the sock and hci_rx_work,
where the former releases the sock and the latter accesses it without lock protection.

           CPU0                       CPU1
           ----                       ----
           sock_close                 hci_rx_work
	   l2cap_sock_release         hci_acldata_packet
	   l2cap_sock_kill            l2cap_recv_frame
	   sk_free                    l2cap_conless_channel
	                              l2cap_sock_recv_cb

If hci_rx_work processes the data that needs to be received before the sock is
closed, then everything is normal; Otherwise, the work thread may access the
released sock when receiving data.

Add a chan lock in the l2cap_conless_channel of the sock to achieve sync
between the sock release and recv cb.

Sock is dead, so set chan data to NULL, avoid others use invalid sock pointer.

Reported-by: syzbot+b7f6f8c9303466e16c8a@syzkaller.appspotmail.com
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
---
 net/bluetooth/l2cap_core.c |  3 +++
 net/bluetooth/l2cap_sock.c | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index aed025734d04..35a9534eb62d 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6771,10 +6771,13 @@ static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm,
 	bacpy(&bt_cb(skb)->l2cap.bdaddr, &hcon->dst);
 	bt_cb(skb)->l2cap.psm = psm;
 
+	l2cap_chan_lock(chan);
 	if (!chan->ops->recv(chan, skb)) {
+		l2cap_chan_unlock(chan);
 		l2cap_chan_put(chan);
 		return;
 	}
+	l2cap_chan_unlock(chan);
 
 drop:
 	l2cap_chan_put(chan);
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 6db60946c627..25091fb992a7 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1239,6 +1239,10 @@ static void l2cap_sock_kill(struct sock *sk)
 
 	BT_DBG("sk %p state %s", sk, state_to_string(sk->sk_state));
 
+	/* Sock is dead, so set chan data to NULL, avoid other task use invalid
+	 * sock pointer.
+	 */
+	l2cap_pi(sk)->chan->data = NULL;
 	/* Kill poor orphan */
 
 	l2cap_chan_put(l2cap_pi(sk)->chan);
@@ -1481,11 +1485,16 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan)
 
 static int l2cap_sock_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
 {
-	struct sock *sk = chan->data;
-	struct l2cap_pinfo *pi = l2cap_pi(sk);
+	struct sock *sk;
+	struct l2cap_pinfo *pi;
 	int err;
 
+	if (!chan->data)
+		return -ENXIO;
+
+	sk = chan->data;
 	lock_sock(sk);
+	pi = l2cap_pi(sk);
 
 	if (chan->mode == L2CAP_MODE_ERTM && !list_empty(&pi->rx_busy)) {
 		err = -ENOMEM;
-- 
2.43.0


  reply	other threads:[~2024-06-25 10:20 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-07  6:02 [syzbot] [bluetooth?] general protection fault in l2cap_sock_recv_cb syzbot
2024-06-11  1:47 ` Edward Adam Davis
2024-06-11  2:15   ` syzbot
2024-06-11  2:28 ` Edward Adam Davis
2024-06-11  2:47   ` syzbot
2024-06-11  3:00 ` Edward Adam Davis
2024-06-11  3:43   ` syzbot
2024-06-11  4:09 ` Edward Adam Davis
2024-06-11  4:34   ` syzbot
2024-06-11  6:35 ` Edward Adam Davis
2024-06-11 12:05   ` syzbot
2024-06-11 13:27 ` Edward Adam Davis
2024-06-11 14:06   ` syzbot
2024-06-11 14:50 ` [PATCH] bluetooth/l2cap: sync sock recv cb and release Edward Adam Davis
2024-06-11 19:24   ` Luiz Augusto von Dentz
2024-06-12  0:33     ` Edward Adam Davis
2024-06-15  1:45     ` [PATCH v2] " Edward Adam Davis
2024-06-17 19:00       ` patchwork-bot+bluetooth
2024-06-20 16:53       ` Luiz Augusto von Dentz
2024-06-21 14:45         ` [PATCH] " Edward Adam Davis
2024-06-22  3:46         ` Edward Adam Davis
2024-06-24 13:36           ` Luiz Augusto von Dentz
2024-06-25  0:52             ` Edward Adam Davis
2024-06-25  3:08               ` Luiz Augusto von Dentz
2024-06-25 10:12                 ` Edward Adam Davis [this message]
2024-06-15  1:25 ` [syzbot] [bluetooth?] general protection fault in l2cap_sock_recv_cb Edward Adam Davis
2024-06-15 15:25   ` syzbot
2024-06-21 14:18 ` Edward Adam Davis
2024-06-22  1:25   ` syzbot
2024-06-21 14:56 ` Edward Adam Davis
2024-06-22  3:27   ` syzbot
2024-06-22  8:24 ` Hillf Danton
2024-06-22  9:10   ` syzbot

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=tencent_CFD37DA36B4965E3A7C45E7770776C86DB05@qq.com \
    --to=eadavis@qq.com \
    --cc=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luiz.dentz@gmail.com \
    --cc=marcel@holtmann.org \
    --cc=syzbot+b7f6f8c9303466e16c8a@syzkaller.appspotmail.com \
    --cc=syzkaller-bugs@googlegroups.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

all inboxes | Powered by JetHome®