Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg

Origin: https://git.kernel.org/linus/2e07e8348ea454615e268222ae3fc240421be768
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2023-51779

This can cause a race with bt_sock_ioctl() because
bt_sock_recvmsg() gets the skb from sk->sk_receive_queue
and then frees it without holding lock_sock.
A use-after-free for a skb occurs with the following flow.
```
bt_sock_recvmsg() -> skb_recv_datagram() -> skb_free_datagram()
bt_sock_ioctl() -> skb_peek()
```
Add lock_sock to bt_sock_recvmsg() to fix this issue.

Cc: stable@vger.kernel.org
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Hyunwoo Kim <v4bel@theori.io>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name Bluetooth-af_bluetooth-Fix-Use-After-Free-in-bt_sock.patch

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 1c3c7ff5c3c66692216630a7ffaa3dac44ad9af0..f1b7510359e4b0277d209db0d3584a5d7e1a5881 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -264,11 +264,14 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
        if (flags & MSG_OOB)
                return -EOPNOTSUPP;
 
+       lock_sock(sk);
+
        skb = skb_recv_datagram(sk, flags, &err);
        if (!skb) {
                if (sk->sk_shutdown & RCV_SHUTDOWN)
-                       return 0;
+                       err = 0;
 
+               release_sock(sk);
                return err;
        }
 
@@ -294,6 +297,8 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
 
        skb_free_datagram(sk, skb);
 
+       release_sock(sk);
+
        if (flags & MSG_TRUNC)
                copied = skblen;