From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E8362E65D; Sat, 25 Apr 2026 01:11:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777079473; cv=none; b=NYnxUQeFq88h/k4Wz7uPhOhHMIQuBNDpVvtFph7Xg4C1d8lrkJe1ksnDaK21iLD2YNTCiqHbq8OD6fk821Mx4RNwOq4Qyygx41wnddlIW5LVQKjhKtEhidLST8gKK2vh4ytSw7LoB7YUMrvXu6sqpfLRmpbFAYxUnJwJEC01mZM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777079473; c=relaxed/simple; bh=RX98IrciXUc5Mgh1BiQcNQ/X6SjvkQeVMibJ3fVYsB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cCsqiw4lWvgGvOfdCM8OGBoqnbSqfCY93kXVDUHouy2ApQ6s/5Mu6DBdAVA0G3fA5OE4I9wWNf6Ly1lSdRdJMn8OpE547qk/wVN0QBpbDBM8+au8b7RojG4mmQpC0Cjl5Mf0mZCi4HYJuP0snzQ0rNZAbFfPETYczpFSvxetpUQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=m06eL3KB; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="m06eL3KB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777079471; x=1808615471; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RX98IrciXUc5Mgh1BiQcNQ/X6SjvkQeVMibJ3fVYsB4=; b=m06eL3KB/5IVn+zGOfgfakqrWs1zWOsOAdCE5vWkLhMIZklwasw3YpAF WuTzJevq4uZRjDj8NC903emYX5uCDybRdmZk0yENjAuYAfZgLdbk6iTcX xC4bx/iFyXG3fOeSFXo6TtjTNrHI0eiAoEpJ1Bmv1HdVZhc5tbRtJMIqT GSNp3YCTdNX50ieZ+eXzLmYSXoFv+yvc4ldij1nV9ZmVvSURQnlKlATsJ Phgrz6AE8zf/ah8Gywtmj7FzboeyewdfarsNUbYZDxQ3d7QzLbhH8ROhc EJVTP13U5Q4lvrVDhLj5+5ecevBkwEb+FnFbNAwLgXCud+wdhlVfItbTn g==; X-CSE-ConnectionGUID: 0SG4pWh6QIqqjnghlZXZ8A== X-CSE-MsgGUID: TqRhdCiCQ9+0/3tF75+7ZQ== X-IronPort-AV: E=McAfee;i="6800,10657,11766"; a="88373622" X-IronPort-AV: E=Sophos;i="6.23,197,1770624000"; d="scan'208";a="88373622" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2026 18:11:10 -0700 X-CSE-ConnectionGUID: NgtTs5/bT2SenE7Vdi8CQg== X-CSE-MsgGUID: gy2pU2wqSiysT8aoLOHdNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,197,1770624000"; d="scan'208";a="232990183" Received: from arjan-box.jf.intel.com ([10.88.27.153]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2026 18:11:11 -0700 From: Arjan van de Ven To: kuniyu@google.com Cc: Arjan van de Ven , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Zhu Yanjun , Jason Gunthorpe , Leon Romanovsky Subject: Re: [syzbot] [net?] general protection fault in kernel_sock_shutdown (4) Date: Fri, 24 Apr 2026 18:12:25 -0700 Message-ID: <20260425011228.363364-1-arjan@linux.intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <69ea344f.a00a0220.17a17.0040.GAE@google.com> References: <69ea344f.a00a0220.17a17.0040.GAE@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Unfortunately the AI had a burp and did not write out the proper URL for analysis data; it should have been http://oops.fenrus.org/reports/lkml/69ea344f.a00a0220.17a17.0040.GAE_google.com/report.html and in addition, it made a candidate patch (below) From: Arjan van de Ven Subject: [PATCH] RDMA/rxe: fix double-release race on UDP tunnel socket teardown This patch is based on a BUG as reported at https://lore.kernel.org/r/69ea344f.a00a0220.17a17.0040.GAE@google.com. The Soft RoCE (RXE) driver stores per-network-namespace UDP tunnel sockets for IPv4 and IPv6 encapsulation. Two independent code paths tear these sockets down: rxe_ns_exit(), called when a network namespace is destroyed, and rxe_net_del(), called when an RDMA link is deleted via netlink. Both paths read the per-namespace socket pointer and call udp_tunnel_sock_release() on it. A time-of-check/time-of-use (TOCTOU) race exists in rxe_net_del(). It reads the socket pointer via rxe_ns_pernet_sk4(), then passes it to rxe_sock_put() for release. If rxe_ns_exit() runs concurrently between the read and the release, it clears the pointer and calls udp_tunnel_sock_release() first, causing sock_release() to set sock->ops = NULL. When rxe_net_del() then calls udp_tunnel_sock_release() on the same socket, kernel_sock_shutdown() dereferences the now-NULL sock->ops, triggering a KASAN null-ptr-deref at offset 0x68 (the shutdown function pointer in struct proto_ops). A minimal alternative would guard against NULL sock->ops inside udp_tunnel_sock_release() before calling kernel_sock_shutdown(). That treats the symptom rather than the root cause and leaves the double-release of socket state intact. Add rxe_ns_pernet_take_sk4() and rxe_ns_pernet_take_sk6() which use xchg() to atomically swap the per-namespace socket pointer to NULL and return the old value. Replace the non-atomic reads in rxe_net_del() with these take variants, and release the socket directly via udp_tunnel_sock_release() without going through rxe_sock_put(). Whichever teardown path executes take first claims ownership of the socket; the second caller gets NULL and skips the release, closing the double-release window. Link: https://lore.kernel.org/r/69ea344f.a00a0220.17a17.0040.GAE@google.com Oops-Analysis: http://oops.fenrus.org/reports/lkml/69ea344f.a00a0220.17a17.0040.GAE_google.com/report.html Fixes: 13f2a53c2a71 ("RDMA/rxe: Add net namespace support for IPv4/IPv6 sockets") Fixes: f1327abd6abe ("RDMA/rxe: Support RDMA link creation and destruction per net namespace") Assisted-by: GitHub Copilot patcher:claude linux-kernel-oops-x86. Signed-off-by: Arjan van de Ven Cc: linux-rdma@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Zhu Yanjun Cc: Jason Gunthorpe Cc: Leon Romanovsky --- drivers/infiniband/sw/rxe/rxe_net.c | 8 ++++---- drivers/infiniband/sw/rxe/rxe_ns.c | 14 ++++++++++++++ drivers/infiniband/sw/rxe/rxe_ns.h | 7 +++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c index 50a2cb5405e22..4f604636cb7b4 100644 --- a/drivers/infiniband/sw/rxe/rxe_net.c +++ b/drivers/infiniband/sw/rxe/rxe_net.c @@ -655,13 +655,13 @@ void rxe_net_del(struct ib_device *dev) net = dev_net(ndev); - sk = rxe_ns_pernet_sk4(net); + sk = rxe_ns_pernet_take_sk4(net); if (sk) - rxe_sock_put(sk, rxe_ns_pernet_set_sk4, net); + udp_tunnel_sock_release(sk->sk_socket); - sk = rxe_ns_pernet_sk6(net); + sk = rxe_ns_pernet_take_sk6(net); if (sk) - rxe_sock_put(sk, rxe_ns_pernet_set_sk6, net); + udp_tunnel_sock_release(sk->sk_socket); dev_put(ndev); } diff --git a/drivers/infiniband/sw/rxe/rxe_ns.c b/drivers/infiniband/sw/rxe/rxe_ns.c index 8b9d734229b24..d9d376e3c670f 100644 --- a/drivers/infiniband/sw/rxe/rxe_ns.c +++ b/drivers/infiniband/sw/rxe/rxe_ns.c @@ -91,6 +91,13 @@ void rxe_ns_pernet_set_sk4(struct net *net, struct sock *sk) synchronize_rcu(); } +struct sock *rxe_ns_pernet_take_sk4(struct net *net) +{ + struct rxe_ns_sock *ns_sk = net_generic(net, rxe_pernet_id); + + return xchg((__force struct sock **)&ns_sk->rxe_sk4, NULL); +} + #if IS_ENABLED(CONFIG_IPV6) struct sock *rxe_ns_pernet_sk6(struct net *net) { @@ -111,6 +118,13 @@ void rxe_ns_pernet_set_sk6(struct net *net, struct sock *sk) rcu_assign_pointer(ns_sk->rxe_sk6, sk); synchronize_rcu(); } + +struct sock *rxe_ns_pernet_take_sk6(struct net *net) +{ + struct rxe_ns_sock *ns_sk = net_generic(net, rxe_pernet_id); + + return xchg((__force struct sock **)&ns_sk->rxe_sk6, NULL); +} #endif /* IPV6 */ int rxe_namespace_init(void) diff --git a/drivers/infiniband/sw/rxe/rxe_ns.h b/drivers/infiniband/sw/rxe/rxe_ns.h index 4da2709e6b714..9d9a5106b77c8 100644 --- a/drivers/infiniband/sw/rxe/rxe_ns.h +++ b/drivers/infiniband/sw/rxe/rxe_ns.h @@ -5,10 +5,17 @@ struct sock *rxe_ns_pernet_sk4(struct net *net); void rxe_ns_pernet_set_sk4(struct net *net, struct sock *sk); +struct sock *rxe_ns_pernet_take_sk4(struct net *net); #if IS_ENABLED(CONFIG_IPV6) void rxe_ns_pernet_set_sk6(struct net *net, struct sock *sk); struct sock *rxe_ns_pernet_sk6(struct net *net); +struct sock *rxe_ns_pernet_take_sk6(struct net *net); #else /* IPv6 */ static inline struct sock *rxe_ns_pernet_sk6(struct net *net) { @@ -18,6 +25,10 @@ static inline void rxe_ns_pernet_set_sk6(struct net *net, struct sock *sk) { } +static inline struct sock *rxe_ns_pernet_take_sk6(struct net *net) +{ + return NULL; +} #endif /* IPv6 */ int rxe_namespace_init(void);