net: ieee802154: do not leave a dangling sk pointer in ieee802154_create()

[ Upstream commit b4fcd63f6ef79c73cafae8cf4a114def5fc3d80d ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
index 586a6c4adf246dc081a37a2c4e6092342206679d..d7fa862b81ef5327f0c61c1df71a5eccc3e60c19 100644 (file)
--- a/net/ieee802154/socket.c
+++ b/net/ieee802154/socket.c
@@ -1046,19 +1046,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 = {