From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793207531; b=UwRDbTzVgYJ+eR4eiex6WVFleOUEOfQDaoJoh+Jsom+bXnNrJlxx9SINpTSrfWWVixsU +jz10km3lNW40+3VgOZ2CHFhAXf/9p0tX9dDBJCOI4gd96Y5Otfo5yMuqg+HqMZAf/0pP nSRpFDLn70lcVbVg+aHaE6hXyLfeniIZvX15p/HyFlRV7xkNoUTlh8pZ5GhyOT6ZetpQH r/WIQslrgQo8wGCrLZw0QspTrfWwDSrw3Kn53ApRdGBPPIy4ye3bQn2LUmCWojtf5zUWk gCe4Q38lFW1I/Cl4aU3hKJ4zPi4p1wkgX4DjeB0ME8LY4xJXYzYz+DboootLWpAv6+w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793207531; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=G9uMnvr+/+UITcxSz262i4wttTa2iB+iRnGPHSaxAH8=; b=3QWAnpblknyMZrv9owirjwBnaceBu1vwJhmCTR2SFCDf0t5n8BbA5fwKw/LO6mMztBrE DwQ69MHjhuX7u272jbGDmGmnFXUZ7G3cH4LENjN4Vqblnth9oe0XrIc+8IqOG6ZN87lB+ xQ+3N2y0is5WnRSL1vHm1So/wa5vylUaN4gtdNcKuNCvIci5bisvoykDhPa3uXlgNHACJ ki2i4WRcP+c210fGRf8sumZ2Gm/bzXUQd7Roe+9aaU3qI+6W57xPHRZLIPpMtpnTqxbJy AQ6JKy1NU0dv6gT7JWVegHZf61LaW1tc4p5tkQ9M8Y2Emqy2QVBVji5XK8MN6zf/itw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=MyidHizN; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D082606A31C; Wed, 28 Oct 2026 17:12:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=MyidHizN Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E41D1F01825; Wed, 28 Oct 2026 17:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793207531; bh=G9uMnvr+/+UITcxSz262i4wttTa2iB+iRnGPHSaxAH8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MyidHizN1V3fjYX6KQYuT9JUwUV3JvPzYC8fUL5XO5udjbK+XytLNr2qEIz3lC3/t QZ/1S30tklQnaLUgQ6szFukw1GVE/7fvJgGA8M5kyIiT9DLJATajJSSW9LR49qmgVH Au3jBFK0HYY4PImetDidq353gu8smAvw1qQjkLIk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kyle Zeng , Simon Horman , Eric Dumazet , Paolo Abeni , Sasha Levin Subject: [PATCH 6.12 050/247] netlink: avoid hashing the network namespace pointer Date: Wed, 28 Oct 2026 17:57:33 +0100 Message-ID: <20261028165948.561638828@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028165947.349197979@linuxfoundation.org> References: <20261028165947.349197979@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kyle Zeng [ Upstream commit f88bb3606e4bd11ee035b682cddc2999e604609a ] The netlink rhashtable key includes a raw struct net pointer and a user-controlled port ID. Both /proc/net/netlink and socket diagnostics expose the table's bucket order. By binding and rebinding chosen NETLINK_USERSOCK port IDs, an unprivileged reader can distinguish equal buckets and recover the low bits of the Jenkins hash. Its 32-bit seed and the limited set of kernel-image slides can then be searched offline to recover the address of init_net. Use the namespace's unique, non-address net_cookie in the comparison key instead. It is assigned before the per-net initializers run and remains unchanged for the namespace's lifetime. The lookup key and object hash are still built by netlink_compare_arg_init(), keeping lookup, insertion, removal and rehashing consistent while preserving namespace separation. Neither public table walker needs to change. Reading the socket's namespace cookie in netlink_compare() is safe under RCU, including during namespace teardown. netlink_release() removes the socket from the hash table and defers its final put with call_rcu(). cleanup_net() runs the per-net exit methods and waits for outstanding RCU callbacks with rcu_barrier() before freeing namespace storage. Unlike ns.ns_id, net_cookie is also available and initialized during setup_net() in older stable kernels, making the change straightforward to backport to v5.15 and later. Fixes: c428ecd1a21f ("netlink: Move namespace into hash key") Assisted-by: LLM Signed-off-by: Kyle Zeng Reviewed-by: Simon Horman Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20261008011359.63727-2-kylebot@openai.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/netlink/af_netlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index a0a8f185ccdeb..7e1c087a98647 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -463,7 +463,7 @@ netlink_unlock_table(void) struct netlink_compare_arg { - possible_net_t pnet; + u64 net_cookie; u32 portid; }; @@ -478,14 +478,14 @@ static inline int netlink_compare(struct rhashtable_compare_arg *arg, const struct netlink_sock *nlk = ptr; return nlk->portid != x->portid || - !net_eq(sock_net(&nlk->sk), read_pnet(&x->pnet)); + sock_net(&nlk->sk)->net_cookie != x->net_cookie; } static void netlink_compare_arg_init(struct netlink_compare_arg *arg, struct net *net, u32 portid) { memset(arg, 0, sizeof(*arg)); - write_pnet(&arg->pnet, net); + arg->net_cookie = net->net_cookie; arg->portid = portid; } -- 2.53.0