From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 3D66F35F170 for ; Wed, 22 Jul 2026 16:07:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784736473; cv=none; b=ITByjeV9EdDsXlK0RO48td2v1rhsSjOFI4+Rx35CX+IuwgapU/zFQCyNURPEklTX4oJrHwdu4q6F+oTLR/R9IdH4FrHt3pMFvs/QhfwmQbcyh5gSxFMX0q1foSrAHCmfOQIGXlTw9TD0nfmS/J0i7Rgd2lmQJqB+orycbQwLLZY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784736473; c=relaxed/simple; bh=7gPMgWysU5qyJJxEKvD9DOJtawAYaKN0iULcl+5cDR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D/G8zySxjNF697eXwRwXUp34bxydoj3ccTCtETeg9wpUz4qnb6fk/3FjLr8P1HZMHyNbi+pGzKh1r8Nkc68Ilp6XF2fmXD58hSALJibIQrnGwvdgMKLb8g8rmb/i5pHigIaCjPboKILmlrHsTqNXbqrxm3BaQjPlQOpUnidFUAM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MyF3zWnM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MyF3zWnM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B8B21F000E9; Wed, 22 Jul 2026 16:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784736471; bh=bEimN58aj+Frn8e3Og4H5JphuPwJJ2aQqYByx7iwVgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MyF3zWnMXxmDrgvRJVOb3EooD5g07fTVrUSC9nXSNveHYqBV0Ijg6HhGLMzqO5ylo 7KwMY1Q9bsvBTR94XOw33JActlsNvP4+ZJpinwTBkKxN7jMQk0wqcgn8jPEfvGaQdr dULlVi8ggXdj0W2DiKuo/dt7avPfMBfHkXvTdrqb6bB0uiJwmnhMEEY+6iaMDVFq0+ fS5SZcXXi5mOaD+U6rMgrXnjWPEyHCwKUu9e7MUUFqXFjvpuDM8d5xwHntGTVgGZMa cilG5kAykZDYw9/YeWIVYohqGsKnju6CL9ciFj398RjO/fdON7BPBrfnplQpBcmVcr TlFlRD5GqYnBA== From: Sasha Levin To: stable@vger.kernel.org Cc: Li Daming , Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Ren Wei , David Howells , Marc Dionne , Jeffrey Altman , Simon Horman , linux-afs@lists.infradead.org, stable@kernel.org, Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] rxrpc: serialize kernel accept preallocation with socket teardown Date: Wed, 22 Jul 2026 12:07:48 -0400 Message-ID: <20260722160748.1740112-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026072054-refined-unstuck-fb67@gregkh> References: <2026072054-refined-unstuck-fb67@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Li Daming [ Upstream commit dc175389b18c29a5303ee83169ec653adfae3e17 ] rxrpc_kernel_charge_accept() reads rx->backlog without any socket/backlog synchronization and passes that raw pointer into rxrpc_service_prealloc_one(). A concurrent rxrpc_discard_prealloc() sets rx->backlog = NULL and frees the backlog rings, so a kernel preallocation worker can keep using a freed struct rxrpc_backlog while updating *_backlog_head/tail and array slots. Serialize the state check and backlog lookup with the socket lock, and reject kernel preallocation once teardown has disabled listening or discarded the service backlog. Fixes: 00e907127e6f ("rxrpc: Preallocate peers, conns and calls for incoming service requests") Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Signed-off-by: Li Daming Signed-off-by: Ren Wei Signed-off-by: David Howells cc: Marc Dionne cc: Jeffrey Altman cc: Simon Horman cc: linux-afs@lists.infradead.org cc: stable@kernel.org Link: https://patch.msgid.link/20260609140911.838677-6-dhowells@redhat.com Signed-off-by: Jakub Kicinski [ kept 6.1's extra user_attach_call argument in the rxrpc_service_prealloc_one() call ] Signed-off-by: Sasha Levin --- net/rxrpc/call_accept.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c index 658b592e58e058..4a1e5d7a07262c 100644 --- a/net/rxrpc/call_accept.c +++ b/net/rxrpc/call_accept.c @@ -481,14 +481,27 @@ int rxrpc_kernel_charge_accept(struct socket *sock, unsigned long user_call_ID, gfp_t gfp, unsigned int debug_id) { - struct rxrpc_sock *rx = rxrpc_sk(sock->sk); - struct rxrpc_backlog *b = rx->backlog; + struct rxrpc_backlog *b; + struct rxrpc_sock *rx; + struct sock *sk; + int ret; + + sk = sock->sk; + rx = rxrpc_sk(sk); + + lock_sock(sk); + if (sk->sk_state != RXRPC_SERVER_LISTENING || !rx->backlog) { + ret = -ESHUTDOWN; + goto out; + } - if (sock->sk->sk_state == RXRPC_CLOSE) - return -ESHUTDOWN; + b = rx->backlog; + ret = rxrpc_service_prealloc_one(rx, b, notify_rx, + user_attach_call, user_call_ID, + gfp, debug_id); - return rxrpc_service_prealloc_one(rx, b, notify_rx, - user_attach_call, user_call_ID, - gfp, debug_id); +out: + release_sock(sk); + return ret; } EXPORT_SYMBOL(rxrpc_kernel_charge_accept); -- 2.53.0