Commit cdc4865b authored by Ignat Korchagin's avatar Ignat Korchagin Committed by Dong Chenchen
Browse files

net: inet6: do not leave a dangling sk pointer in inet6_create() 

stable inclusion
from stable-v5.10.231
commit 35360255ca30776dee34d9fa764cffa24d0a5f65
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEAPG
CVE: CVE-2024-56600

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



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

[ Upstream commit 9df99c395d0f55fb444ef39f4d6f194ca437d884 ]

sock_init_data() attaches the allocated sk pointer to the provided sock
object. If inet6_create() fails later, the sk object is released, but the
sock object retains the dangling sk pointer, which may cause use-after-free
later.

Clear the sock sk pointer on error.

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-8-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 avatarDong Chenchen <dongchenchen2@huawei.com>
parent 83b361e2

net/ipv6/af_inet6.c

+10 −12
Original line number Diff line number Diff line
@@ -259,31 +259,29 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, 
		 */

		inet->inet_sport = htons(inet->inet_num);

		err = sk->sk_prot->hash(sk);

		if (err) {

			sk_common_release(sk);

			goto out;

		}

		if (err)

			goto out_sk_release;

	}

	if (sk->sk_prot->init) {

		err = sk->sk_prot->init(sk);

		if (err) {

			sk_common_release(sk);

			goto out;

		}

		if (err)

			goto out_sk_release;

	}



	if (!kern) {

		err = BPF_CGROUP_RUN_PROG_INET_SOCK(sk);

		if (err) {

			sk_common_release(sk);

			goto out;

		}

		if (err)

			goto out_sk_release;

	}

out:

	return err;

out_rcu_unlock:

	rcu_read_unlock();

	goto out;

out_sk_release:

	sk_common_release(sk);

	sock->sk = NULL;

	goto out;

}



static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,