net: inet6: do not leave a dangling sk pointer in inet6_create()
[ 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: 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-8-ignat@cloudflare.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
1c6ed358a6
commit
dae550bb1d
1 changed files with 10 additions and 12 deletions
|
@ -257,31 +257,29 @@ lookup_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,
|
||||
|
|
Loading…
Reference in a new issue