Netdev List
 help / color / mirror / Atom feed
* [PATCH v1 net] tcp: Don't clear saddr before ->put_port().
@ 2026-11-21 20:35 Kuniyuki Iwashima
  0 siblings, 0 replies; only message in thread
From: Kuniyuki Iwashima @ 2026-11-21 20:35 UTC (permalink / raw)
  To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Willem de Bruijn
  Cc: Simon Horman, Joanne Koong, Kuniyuki Iwashima, Kuniyuki Iwashima,
	netdev

When CGROUP_INET4_POST_BIND or CGROUP_INET6_POST_BIND prog fails,
__inet_bind() / __inet6_bind() calls sk->sk_prot->put_port().

For TCP, __inet_put_port() calls inet_bhashfn_portaddr() to get
the corresponding bhash2 bucket.

inet_bhashfn_portaddr() requires saddr, but it is cleared before
__inet_put_port(), leading to bhash2 lock mismatch.

This triggers list corruption or use-after-free by a conccurent
thread touching the same bhash2 bucket, e.g. tcp_diag_dump()
with TCPF_BOUND_INACTIVE. [0]

Let's clear saddr after calling sk->sk_prot->put_port().

[0]:
BUG: KASAN: slab-use-after-free in tcp_diag_dump (net/ipv4/tcp_diag.c:415)
Read of size 8 at addr ffff88810ae0e7a0 by task a/1007

CPU: 10 UID: 0 PID: 1007 Comm: a Not tainted 7.4.0-rc3-00456-gd5b89d55a322 #295 PREEMPT(lazy)
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.17.0-debian-1.17.0-1 04/01/2014
Call Trace:
 <TASK>
 dump_stack_lvl (lib/dump_stack.c:120)
 print_address_description (mm/kasan/report.c:378)
 print_report (mm/kasan/report.c:482)
 kasan_report (mm/kasan/report.c:595)
 sock_recvmsg (net/socket.c:1154)
 __sys_recvfrom (net/socket.c:2333)
 __x64_sys_recvfrom (net/socket.c:2348 net/socket.c:2344 net/socket.c:2344)
 do_syscall_64 (arch/x86/entry/syscall_64.c:61 arch/x86/entry/syscall_64.c:89)
 entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121)
RIP: 0033:0x7f2f268f8e92
Code: 08 0f 85 91 41 ff ff 49 89 fb 48 89 f0 48 89 d7 48 89 ce 4c 89 c2 4d 89 ca 4c 8b 44 24 08 4c 8b 4c 24 10 4c 89 5c 24 08 0f 05 <c3> 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 f3 0f 1e fa 55 bf 01 00
RSP: 002b:00007f2f26874d28 EFLAGS: 00000246 ORIG_RAX: 000000000000002d
RAX: ffffffffffffffda RBX: 00007f2f26879ce4 RCX: 00007f2f268f8e92
RDX: 0000000000004000 RSI: 00007f2f26874db0 RDI: 00000000000007d7
RBP: 00007f2f26874d50 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000021
R13: 00007ffcbb216e70 R14: 0000000000000000 R15: 00007ffcbb216f77
 </TASK>

Allocated by task 1009:
 kasan_save_track (mm/kasan/common.c:57 mm/kasan/common.c:79)
 __kasan_slab_alloc (mm/kasan/common.c:354 mm/kasan/common.c:380)
 kmem_cache_alloc_noprof (./include/linux/kasan.h:257 mm/slub.c:4720 mm/slub.c:5033 mm/slub.c:5047)
 inet_bind2_bucket_create (net/ipv4/inet_hashtables.c:162)
 inet_csk_get_port (net/ipv4/inet_connection_sock.c:573)
 __inet_bind (net/ipv4/af_inet.c:544)
 inet_bind_sk (net/ipv4/af_inet.c:470)
 __sys_bind (net/socket.c:1947 net/socket.c:1978)
 __x64_sys_bind (net/socket.c:1983 net/socket.c:1981 net/socket.c:1981)
 do_syscall_64 (arch/x86/entry/syscall_64.c:61 arch/x86/entry/syscall_64.c:89)
 entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121)

Freed by task 1009:
 kasan_save_track (mm/kasan/common.c:57 mm/kasan/common.c:79)
 kasan_save_free_info (mm/kasan/generic.c:599)
 __kasan_slab_free (mm/kasan/common.c:267 mm/kasan/common.c:299)
 kmem_cache_free (./include/linux/kasan.h:239 mm/slub.c:2780 mm/slub.c:6637 mm/slub.c:6764)
 inet_put_port (net/ipv4/inet_hashtables.c:178)
 __inet_bind (net/ipv4/af_inet.c:554)
 inet_bind_sk (net/ipv4/af_inet.c:470)
 __sys_bind (net/socket.c:1947 net/socket.c:1978)
 __x64_sys_bind (net/socket.c:1983 net/socket.c:1981 net/socket.c:1981)
 do_syscall_64 (arch/x86/entry/syscall_64.c:61 arch/x86/entry/syscall_64.c:89)
 entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121)

The buggy address belongs to the object at ffff88810ae0e780
 which belongs to the cache tcp_bind2_bucket of size 80

Fixes: 28044fc1d495 ("net: Add a bhash2 table hashed by port and address")
Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
---
Found while reviewing
https://lore.kernel.org/netdev/20261119192133.2632936-1-dmnk@google.com/
---
 net/ipv4/af_inet.c  | 2 +-
 net/ipv6/af_inet6.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 8822bae439f8..5d03a9149b40 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -549,9 +549,9 @@ int __inet_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len,
 		if (!(flags & BIND_FROM_BPF)) {
 			err = BPF_CGROUP_RUN_PROG_INET4_POST_BIND(sk);
 			if (err) {
-				inet->inet_saddr = inet->inet_rcv_saddr = 0;
 				if (sk->sk_prot->put_port)
 					sk->sk_prot->put_port(sk);
+				inet->inet_saddr = inet->inet_rcv_saddr = 0;
 				goto out_release_sock;
 			}
 		}
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index a9b8b4b42a1a..b85125c3f14b 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -398,10 +398,10 @@ int __inet6_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len,
 		if (!(flags & BIND_FROM_BPF)) {
 			err = BPF_CGROUP_RUN_PROG_INET6_POST_BIND(sk);
 			if (err) {
-				sk->sk_ipv6only = saved_ipv6only;
-				inet_reset_saddr(sk);
 				if (sk->sk_prot->put_port)
 					sk->sk_prot->put_port(sk);
+				sk->sk_ipv6only = saved_ipv6only;
+				inet_reset_saddr(sk);
 				goto out;
 			}
 		}
-- 
2.56.1.750.gf70dc682cf-goog


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-21 20:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-21 20:35 [PATCH v1 net] tcp: Don't clear saddr before ->put_port() Kuniyuki Iwashima

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox