Commit c5bdd25f authored by Ignat Korchagin's avatar Ignat Korchagin Committed by Lin Ruifeng
Browse files

Bluetooth: L2CAP: do not leave dangling sk pointer on error in l2cap_sock_create() 

stable inclusion
from stable-v5.10.231
commit daa13175a6dea312a76099066cb4cbd4fc959a84
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEANO
CVE: CVE-2024-56605

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=daa13175a6dea312a76099066cb4cbd4fc959a84



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

[ 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: default avatarIgnat Korchagin <ignat@cloudflare.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20241014153808.51894-3-ignat@cloudflare.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLin Ruifeng <linruifeng4@huawei.com>
parent c2020692

net/bluetooth/l2cap_sock.c

+1 −0
Original line number Diff line number Diff line
@@ -1872,6 +1872,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;

	}