From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 94E592BDC29 for ; Sun, 3 May 2026 19:14:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777835661; cv=none; b=R6FIY4PEfhay9UojmsNRB0JjRqEBWWnOBcNm3VkbmsGXPTi8+nqJm38k3hEwsCJWdLyHDgbfTxp6OGTKBMDqMKloh/ViExEkC71Iqujp3QKdhp2vyFztEDGTlY1CzsJjXSA6YNUNKsiHWKD5pFRzeDaqkPfoh/W0e6xPqp4KEr0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777835661; c=relaxed/simple; bh=OYcf7noJjMrNPMXoo9K6LIjQ6Y7yZ4L+g/d7zjWeXr0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cGpGRVk3hydJwhk76uWSTUU4sWtRD9WdrIF/RLHyV7sZibq/8yEJsuOUKsUo7Rh+o5F5LGnQg2k5I+OXZ8vtC1QfF/X5VNxq+pLBv/EWohiafsLtphDNqemv0zcEWrAgAfJyDMKOiapL5lGzlirWfPC2lUmDzB2em7ZFJ6YS/Lw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DTMKQKl8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DTMKQKl8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEFA4C2BCB9; Sun, 3 May 2026 19:14:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777835661; bh=OYcf7noJjMrNPMXoo9K6LIjQ6Y7yZ4L+g/d7zjWeXr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DTMKQKl8o3vKvb8meo25IJwaKyDqUOfe9GS+saeauvXWmWhFXBlanPAernj7Yv3b9 xUZmQLUIRSt+JNLcmcrz+ZHMT47paXyEdB+nILPOHdZ8HnxCZbzyrhiA+Rty+YMeY2 Jc3wqSuTfYDXmXVLMaPXelq7kW5hcj4s/Xcy8Ag/Xvj73OgQnalvJxG8kxV72DUYhm dCJknoPmDJymtKm7+gdf6N9splyLff6WgZZ5vKCl1oqkze6cC6pIAhjRR7P6njKZFk Y8ocQMTD9a1PFRX6mbflBDpR9eqxkoQ1HOMuPYudfoWgN3e89y34QO9ZcDF4vkVocM KkVs1SEBpc5rw== From: Sasha Levin To: stable@vger.kernel.org Cc: David Howells , Marc Dionne , Jeffrey Altman , Simon Horman , linux-afs@lists.infradead.org, stable@kernel.org, Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15.y] rxrpc: Fix conn-level packet handling to unshare RESPONSE packets Date: Sun, 3 May 2026 15:14:16 -0400 Message-ID: <20260503191416.1286222-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050110-amplify-sadly-0de4@gregkh> References: <2026050110-amplify-sadly-0de4@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: David Howells [ Upstream commit 24481a7f573305706054c59e275371f8d0fe919f ] The security operations that verify the RESPONSE packets decrypt bits of it in place - however, the sk_buff may be shared with a packet sniffer, which would lead to the sniffer seeing an apparently corrupt packet (actually decrypted). Fix this by handing a copy of the packet off to the specific security handler if the packet was cloned. Fixes: 17926a79320a ("[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both") Closes: https://sashiko.dev/#/patchset/20260408121252.2249051-1-dhowells%40redhat.com 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/20260422161438.2593376-5-dhowells@redhat.com Signed-off-by: Jakub Kicinski [ adapted callback signature to include `_abort_code` ] Signed-off-by: Sasha Levin --- net/rxrpc/conn_event.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index 5d91ef562ff78..09438850f9a5a 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -285,6 +285,34 @@ static void rxrpc_call_is_secure(struct rxrpc_call *call) } } +static int rxrpc_verify_response(struct rxrpc_connection *conn, + struct sk_buff *skb, + u32 *_abort_code) +{ + int ret; + + if (skb_cloned(skb)) { + /* Copy the packet if shared so that we can do in-place + * decryption. + */ + struct sk_buff *nskb = skb_copy(skb, GFP_NOFS); + + if (nskb) { + rxrpc_new_skb(nskb, rxrpc_skb_unshared); + ret = conn->security->verify_response(conn, nskb, _abort_code); + rxrpc_free_skb(nskb, rxrpc_skb_freed); + } else { + /* OOM - Drop the packet. */ + rxrpc_see_skb(skb, rxrpc_skb_unshared_nomem); + ret = -ENOMEM; + } + } else { + ret = conn->security->verify_response(conn, skb, _abort_code); + } + + return ret; +} + /* * connection-level Rx packet processor */ @@ -337,7 +365,7 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, _abort_code); case RXRPC_PACKET_TYPE_RESPONSE: - ret = conn->security->verify_response(conn, skb, _abort_code); + ret = rxrpc_verify_response(conn, skb, _abort_code); if (ret < 0) return ret; -- 2.53.0