From 78b1f713df8b8a892536b05da6832bd99f3c1dc6 Mon Sep 17 00:00:00 2001 From: Ignat Korchagin Date: Wed, 12 Mar 2025 22:51:00 +0900 Subject: [PATCH] Bluetooth: L2CAP: do not leave dangling sk pointer on error in l2cap_sock_create() BugLink: https://bugs.launchpad.net/bugs/2102118 [ Upstream commit 7c4f78cdb8e7501e9f92d291a7d956591bf73be9 ] bt_sock_alloc() allocates the sk object and attaches it to the provided sock object. On error l2cap_sock_alloc() frees the sk object, but the dangling pointer is still attached to the sock object, which may create use-after-free in other code. Signed-off-by: Ignat Korchagin Reviewed-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20241014153808.51894-3-ignat@cloudflare.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin CVE-2024-56605 Signed-off-by: Koichiro Den Signed-off-by: Stefan Bader --- net/bluetooth/l2cap_sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 1bc79887a794..31fbb562641f 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1886,6 +1886,7 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, chan = l2cap_chan_create(); if (!chan) { sk_free(sk); + sock->sk = NULL; return NULL; }