Skip to content

Commit

Permalink
net: ieee802154: do not leave a dangling sk pointer in ieee802154_cre…
Browse files Browse the repository at this point in the history
…ate()

sock_init_data() attaches the allocated sk object to the provided sock
object. If ieee802154_create() fails later, the allocated sk object is
freed, but the dangling pointer remains in the provided sock object, which
may allow use-after-free.

Clear the sk pointer in the sock object on error.

Signed-off-by: Ignat Korchagin <ignat@cloudflare.com>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20241014153808.51894-6-ignat@cloudflare.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Ignat Korchagin authored and Jakub Kicinski committed Oct 16, 2024
1 parent 811a7ca commit b4fcd63
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions net/ieee802154/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -1043,19 +1043,21 @@ static int ieee802154_create(struct net *net, struct socket *sock,

if (sk->sk_prot->hash) {
rc = sk->sk_prot->hash(sk);
if (rc) {
sk_common_release(sk);
goto out;
}
if (rc)
goto out_sk_release;
}

if (sk->sk_prot->init) {
rc = sk->sk_prot->init(sk);
if (rc)
sk_common_release(sk);
goto out_sk_release;
}
out:
return rc;
out_sk_release:
sk_common_release(sk);
sock->sk = NULL;
goto out;
}

static const struct net_proto_family ieee802154_family_ops = {
Expand Down

0 comments on commit b4fcd63

Please sign in to comment.