hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: inet: do not leave a dangling sk pointer in inet_create()

Browse Source 
[ Upstream commit 9365fa510c6f82e3aa550a09d0c5c6b44dbc78ff ]

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

Clear the sk pointer in the sock object 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-7-ignat@cloudflare.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ignat Korchagin 2024-10-14 16:38:05 +01:00 committed by Greg Kroah-Hartman
parent e8bd6c5f5d
commit b4513cfd3a
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/ipv4/af_inet.c
View File

@ -371,32 +371,30 @@ lookup_protocol:
inet->inet_sport = htons(inet->inet_num); inet->inet_sport = htons(inet->inet_num);
/* Add to protocol hash chains. */ /* Add to protocol hash chains. */
err = sk->sk_prot->hash(sk); err = sk->sk_prot->hash(sk);
if (err) { if (err)
sk_common_release(sk); goto out_sk_release;
goto out;
}
} }
if (sk->sk_prot->init) { if (sk->sk_prot->init) {
err = sk->sk_prot->init(sk); err = sk->sk_prot->init(sk);
if (err) { if (err)
sk_common_release(sk); goto out_sk_release;
goto out;
}
} }
if (!kern) { if (!kern) {
err = BPF_CGROUP_RUN_PROG_INET_SOCK(sk); err = BPF_CGROUP_RUN_PROG_INET_SOCK(sk);
if (err) { if (err)
sk_common_release(sk); goto out_sk_release;
goto out;
}
} }
out: out:
return err; return err;
out_rcu_unlock: out_rcu_unlock:
rcu_read_unlock(); rcu_read_unlock();
goto out; goto out;
out_sk_release:
sk_common_release(sk);
sock->sk = NULL;
goto out;
} }