Skip to content

Commit

Permalink
net: warn, if pf->create does not clear sock->sk on error
Browse files Browse the repository at this point in the history
All pf->create implementations have been fixed now to clear sock->sk on
error, when they deallocate the allocated sk object.

Put a warning in place to make sure we don't break this promise in the
future.

Suggested-by: Kuniyuki Iwashima <kuniyu@amazon.com>
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-9-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 9df99c3 commit 4815629
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -1576,9 +1576,9 @@ int __sock_create(struct net *net, int family, int type, int protocol,
err = pf->create(net, sock, protocol, kern);
if (err < 0) {
/* ->create should release the allocated sock->sk object on error
* but it may leave the dangling pointer
* and make sure sock->sk is set to NULL to avoid use-after-free
*/
sock->sk = NULL;
DEBUG_NET_WARN_ON_ONCE(sock->sk);
goto out_module_put;
}

Expand Down

0 comments on commit 4815629

Please sign in to comment.