]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: af_can: do not leave a dangling sk pointer in can_create()
authorIgnat Korchagin <ignat@cloudflare.com>
Mon, 14 Oct 2024 15:38:03 +0000 (16:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 18:48:27 +0000 (19:48 +0100)
[ Upstream commit 811a7ca7320c062e15d0f5b171fe6ad8592d1434 ]

On error can_create() frees the allocated sk object, but sock_init_data()
has already attached it to the provided sock object. This will leave a
dangling sk pointer in the sock object and may cause use-after-free later.

Signed-off-by: Ignat Korchagin <ignat@cloudflare.com>
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Marc Kleine-Budde <mkl@pengutronix.de>
Link: https://patch.msgid.link/20241014153808.51894-5-ignat@cloudflare.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/can/af_can.c

index 79f24c6f43c8c44fb4aa7bef8183475761ca3836..de47c16b134bfaa5f54a01d72cc4b31e0864d773 100644 (file)
@@ -171,6 +171,7 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
                /* release sk on errors */
                sock_orphan(sk);
                sock_put(sk);
+               sock->sk = NULL;
        }
 
  errout: