Skip to content

Commit 37f71e2

Browse files
ImV4belgregkh
authored andcommitted
Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg
commit 2e07e83 upstream. 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: 1da177e ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 470896e commit 37f71e2

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

net/bluetooth/af_bluetooth.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,14 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
264264
if (flags & MSG_OOB)
265265
return -EOPNOTSUPP;
266266

267+
lock_sock(sk);
268+
267269
skb = skb_recv_datagram(sk, flags, &err);
268270
if (!skb) {
269271
if (sk->sk_shutdown & RCV_SHUTDOWN)
270-
return 0;
272+
err = 0;
271273

274+
release_sock(sk);
272275
return err;
273276
}
274277

@@ -294,6 +297,8 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
294297

295298
skb_free_datagram(sk, skb);
296299

300+
release_sock(sk);
301+
297302
if (flags & MSG_TRUNC)
298303
copied = skblen;
299304

0 commit comments

Comments
 (0)