Commit dfaef6fe authored by Edward Adam Davis's avatar Edward Adam Davis Committed by Zhengchao Shao
Browse files

bluetooth/l2cap: sync sock recv cb and release 

mainline inclusion
from mainline-v6.10-rc7
commit 89e856e124f9ae548572c56b1b70c2255705f8fe
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGEK1
CVE: CVE-2024-41062

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=89e856e124f9ae548572c56b1b70c2255705f8fe



-------------------------------------------

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 mutex in the rx callback of the sock to achieve synchronization between
the sock release and recv cb.

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

Reported-and-tested-by: default avatar <syzbot+b7f6f8c9303466e16c8a@syzkaller.appspotmail.com>
Signed-off-by: default avatarEdward Adam Davis <eadavis@qq.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>

Conflicts:
	net/bluetooth/l2cap_sock.c
[The conflict occurs because the commit ce60b9231b66("Bluetooth:
compute LE flow credits based on recvbuf space") is not merged]
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
parent cf320507

net/bluetooth/l2cap_sock.c

+19 −1
Original line number Diff line number Diff line
@@ -1238,6 +1238,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);
@@ -1480,9 +1484,21 @@ 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 sock *sk;

	int err;



	/* To avoid race with sock_release, a chan lock needs to be added here

	 * to synchronize the sock.

	 */

	l2cap_chan_hold(chan);

	l2cap_chan_lock(chan);

	sk = chan->data;

	if (!sk) {

		l2cap_chan_unlock(chan);

		l2cap_chan_put(chan);

		return -ENXIO;

	}



	lock_sock(sk);



	if (l2cap_pi(sk)->rx_busy_skb) {
@@ -1519,6 +1535,8 @@ static int l2cap_sock_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb) 


done:

	release_sock(sk);

	l2cap_chan_unlock(chan);

	l2cap_chan_put(chan);



	return err;

}