Re: [PATCH v2 1/8] net: explicitly clear the sk pointer, when pf->create fails

From: Jakub Kicinski
Date: Mon Oct 07 2024 - 20:20:52 EST


On Mon, 7 Oct 2024 22:34:55 +0100 Ignat Korchagin wrote:
> diff --git a/net/socket.c b/net/socket.c
> index 601ad74930ef..042451f01c65 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -1574,8 +1574,13 @@ int __sock_create(struct net *net, int family, int type, int protocol,
> rcu_read_unlock();
>
> err = pf->create(net, sock, protocol, kern);
> - if (err < 0)
> + if (err < 0) {
> + /* ->create should release the allocated sock->sk object on error
> + * but it may leave the dangling pointer
> + */
> + sock->sk = NULL;
> goto out_module_put;
> + }

This chunk is already in net, as part of the fix you posted earlier.
Please resend the cleanup portion with the other patches for net-next
on Friday (IOW after net -> net-next merge).
--
pw-bot: cr