| Message ID | 20241014153808.51894-10-ignat@cloudflare.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 18429e6e0c2ad26250862a786964d8c73400d9a0 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | do not leave dangling sk pointers in pf->create functions | expand |
From: Ignat Korchagin <ignat@cloudflare.com> Date: Mon, 14 Oct 2024 16:38:08 +0100 > This reverts commit 6cd4a78d962bebbaf8beb7d2ead3f34120e3f7b2. > > inet/inet6->create() implementations have been fixed to explicitly NULL the > allocated sk object on error. > > A warning was put in place to make sure any future changes will not leave > a dangling pointer in pf->create() implementations. > > So this code is now redundant. > > Suggested-by: Kuniyuki Iwashima <kuniyu@amazon.com> > Signed-off-by: Ignat Korchagin <ignat@cloudflare.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
On Mon, Oct 14, 2024 at 11:42 PM Kuniyuki Iwashima <kuniyu@amazon.com> wrote: > > From: Ignat Korchagin <ignat@cloudflare.com> > Date: Mon, 14 Oct 2024 16:38:08 +0100 > > This reverts commit 6cd4a78d962bebbaf8beb7d2ead3f34120e3f7b2. > > > > inet/inet6->create() implementations have been fixed to explicitly NULL the > > allocated sk object on error. > > > > A warning was put in place to make sure any future changes will not leave > > a dangling pointer in pf->create() implementations. > > > > So this code is now redundant. > > > > 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>
diff --git a/net/core/sock.c b/net/core/sock.c index 083d438d8b6f..a9391cb796a2 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3830,9 +3830,6 @@ void sk_common_release(struct sock *sk) sk->sk_prot->unhash(sk); - if (sk->sk_socket) - sk->sk_socket->sk = NULL; - /* * In this point socket cannot receive new packets, but it is possible * that some packets are in flight because some CPU runs receiver and
This reverts commit 6cd4a78d962bebbaf8beb7d2ead3f34120e3f7b2. inet/inet6->create() implementations have been fixed to explicitly NULL the allocated sk object on error. A warning was put in place to make sure any future changes will not leave a dangling pointer in pf->create() implementations. So this code is now redundant. Suggested-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: Ignat Korchagin <ignat@cloudflare.com> --- net/core/sock.c | 3 --- 1 file changed, 3 deletions(-)