summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorIgnat Korchagin <ignat@cloudflare.com>2024-10-14 16:38:01 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-12-14 20:00:04 +0100
commit8ad09ddc63ace3950ac43db6fbfe25b40f589dd6 (patch)
tree13872ed8509008311a74b56ad05907ed9840225d /net
parent157f08db94123e2ba56877dd0ac88908b13a5dd0 (diff)
downloadlinux-8ad09ddc63ace3950ac43db6fbfe25b40f589dd6.tar.gz
linux-8ad09ddc63ace3950ac43db6fbfe25b40f589dd6.tar.bz2
linux-8ad09ddc63ace3950ac43db6fbfe25b40f589dd6.zip
Bluetooth: L2CAP: do not leave dangling sk pointer on error in l2cap_sock_create()
[ 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 <ignat@cloudflare.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20241014153808.51894-3-ignat@cloudflare.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_sock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index f04ce8426798..379ca86c41cd 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1885,6 +1885,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;
}