FAILED: patch "[PATCH] tcp: Decrement tcp_md5_needed static branch" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 6f6e860e370c9e4e919b92118a25e9e1f82e9180
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072046-unworn-conductor-0b8e@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6f6e860e370c9e4e919b92118a25e9e1f82e9180 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <[email protected]>
Date: Thu, 25 Jun 2026 19:21:41 +0100
Subject: [PATCH] tcp: Decrement tcp_md5_needed static branch
In case of early freeing an unwanted TCP-MD5 key on TCP-AO connect(), md5sig_info is freed right away (and set to NULL). Later, at the moment of socket destruction, the static branch counter is not getting decremented.
Add a missing decrement for TCP-MD5 static branch.
net/ipv4/tcp_output.c +2 -2
@@ -4334,8 +4334,8 @@ int tcp_connect(struct sock *sk)tcp_clear_md5_list (sk); md5sig =rcu_replace_pointer (tp->md5sig_info,NULL ,lockdep_sock_is_held (sk)); -if (md5sig) - kfree_rcu(md5sig, rcu); +kfree_rcu (md5sig, rcu); + static_branch_slow_dec_deferred(&tcp_md5_needed); } }#endif
Sasha Levin
maintainerPATCH 1/2 tcp: defer md5sig_info kfree past RCU grace period in tcp_connect
From: Michael Bommarito <[email protected]>
[ Upstream commit b74cd55038905d5e74c1de109ab78a30b2ea0e1f ]
The md5+ao reconciliation in tcp_connect() (net/ipv4/tcp_output.c) has two symmetric branches:
if (needs_md5) {
tcp_ao_destroy_sock(sk, false);
} else if (needs_ao) {
tcp_clear_md5_list(sk);
kfree(rcu_replace_pointer(tp->md5sig_info, NULL, ...));
}Both branches free a per-socket auth-info object while the socket is in TCP_SYN_SENT and is already on the inet ehash (inserted by inet_hash_connect() in tcp_v4_connect()). Both branches are reachable by softirq RX-path readers that load the corresponding info pointer via implicit RCU before bh_lock_sock_nested() is taken.
The needs_md5 branch is fixed in the prior patch by re-introducing the call_rcu() free in tcp_ao_destroy_sock(): the equivalent per-key loop runs inside tcp_ao_info_free_rcu(), the RCU callback, so by the time it frees each tcp_ao_key all softirq readers that captured the container have already completed rcu_read_unlock().
The needs_ao branch is not symmetric in the same way. The container free can be deferred via kfree_rcu(md5sig, rcu) -- struct tcp_md5sig_info already has the required rcu member (include/net/tcp.h:1999-2002), and the rest of the tree already does this in the tcp_md5sig_info_add() rollback paths (net/ipv4/tcp_ipv4.c:1410, 1436). But the per-key teardown is done by tcp_clear_md5_list() in process context BEFORE the container's RCU grace period: it walks &md5sig->head and frees each tcp_md5sig_key with bare hlist_del + kfree. A concurrent softirq reader in __tcp_md5_do_lookup() / __tcp_md5_do_lookup_exact() (tcp_ipv4.c:1253, 1298) walks the same list via hlist_for_each_entry_rcu() and races with that bare kfree on the keys themselves -- a per-key slab use-after-free of the same class as the TCP-AO bug, on the same race window.
Fix this in two halves:
1. Convert the bare kfree() in tcp_connect() to kfree_rcu() so the md5sig_info container joins the rest of the md5sig lifecycle. The local-variable lift is mechanical and required because kfree_rcu() is a macro that expects an lvalue.
2. Make tcp_clear_md5_list() RCU-safe by replacing hlist_del + kfree(key) with hlist_del_rcu + kfree_rcu(key, rcu). struct tcp_md5sig_key already carries the rcu member (include/net/tcp.h:1995) and tcp_md5_do_del() (net/ipv4/tcp_ipv4.c:1456) already uses kfree_rcu, so this restores the lifecycle invariant the rest of the file follows rather than introducing a one-off.
The other caller of tcp_clear_md5_list() is tcp_md5_destruct_sock() (net/ipv4/tcp.c:412), which runs from the sock destructor when the socket is already unhashed and unreachable; the extra grace period there is unnecessary but harmless. Making the helper unconditionally RCU-safe is the cleaner contract.
The needs_ao branch is not reachable by the userns reproducer used to demonstrate the AO-side splat (the repro installs both keys but ends up in the needs_md5 branch because the connect peer matches the MD5 key, not the AO key); however the symmetric race exists and a maintainer touching this code should not have to think about which branch escapes RCU and which one does not.
Stable-dep-of: 6f6e860e370c ("tcp: Decrement tcp_md5_needed static branch")
--- net/ipv4/tcp_output.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/ipv4/tcp_output.c +6 -2
@@ -4119,9 +4119,13 @@ int tcp_connect(struct sock *sk)if (needs_md5) {tcp_ao_destroy_sock (sk, false); }else if (needs_ao) { +struct tcp_md5sig_info *md5sig; +tcp_clear_md5_list (sk); -kfree (rcu_replace_pointer (tp->md5sig_info,NULL , -lockdep_sock_is_held (sk))); + md5sig =rcu_replace_pointer (tp->md5sig_info,NULL , +lockdep_sock_is_held (sk)); +if (md5sig) +kfree_rcu (md5sig, rcu); } }#endif
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 tcp: Decrement tcp_md5_needed static branch
From: Dmitry Safonov <[email protected]>
[ Upstream commit 6f6e860e370c9e4e919b92118a25e9e1f82e9180 ]
In case of early freeing an unwanted TCP-MD5 key on TCP-AO connect(), md5sig_info is freed right away (and set to NULL). Later, at the moment of socket destruction, the static branch counter is not getting decremented.
Add a missing decrement for TCP-MD5 static branch.
--- net/ipv4/tcp_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/tcp_output.c +2 -2
@@ -4124,8 +4124,8 @@ int tcp_connect(struct sock *sk)tcp_clear_md5_list (sk); md5sig =rcu_replace_pointer (tp->md5sig_info,NULL ,lockdep_sock_is_held (sk)); -if (md5sig) - kfree_rcu(md5sig, rcu); +kfree_rcu (md5sig, rcu); + static_branch_slow_dec_deferred(&tcp_md5_needed); } }#endif
Signature · 1 line
2.53.0