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 AD16D3DE456 for ; Tue, 14 Apr 2026 11:25:25 +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=1776165925; cv=none; b=EaS8q/SQ6iZDZhLdDUpbe8ZWYu2KIRas4qSPYZ2yYBZDGV9E37ooqvgBWZlhDE+4x1zCU184Rij3mYvhnbBbY9ScLhQQVqPpneXXb4HFeM2vvaV2l7FudTo2I7zlfIF2aSf6KQ0eiea75YVt86YfmboyN0tPqcqDfYGuPpQWXjc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776165925; c=relaxed/simple; bh=KdByVNpXwoj8JCwHdD/Ndd3Y7TdG/8P5pYAQVFpoFsk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UWTKoeeClLDjPDCJ4VKqBUiX4K0V47tYW3ZQoXlYVPltv6nJA+xSHYNANOpY7vEJdehED+fuFlcXJG+rERiCZ2OBLC9T1V6TZaJew3pXIrUsZHs2gGSu4VK3xWP1hT6d42W3yp2rKQjBWPPXW/gNLwkuTGTQLQ1oDYRheX5InLg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YuG/rJyc; 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="YuG/rJyc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3C28C2BCB0; Tue, 14 Apr 2026 11:25:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776165925; bh=KdByVNpXwoj8JCwHdD/Ndd3Y7TdG/8P5pYAQVFpoFsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YuG/rJycVXxEsw8gNa7DFG0dfBNU2ycsIqm685YDwlB5PIOEjt6Yrks+EOux43YdV 6Bs9vH6+VgjPkX+vHIdCJWD+kKrEcfyBtiSVC0oSCN7XBGS0nc4FAIb/IiqzYtv0VJ /vod7t4w4l1GL/WwNata2HXu4xLuCx4ADIa2A4u/q0uouVzVCpFVRsT3tc+x2mTDsz Gb07gexNh3LLAIPtSxDTwy9oflWKzqNQW6vru2eLjunMpZejYZqH1souMU+Y8QHFg9 +MokuIjGKmtM2A3ZDu2bBmkXYsgcluMiTyRFoE/X+CTYOt7w5bnU8GDYMQSno4r40Z wMfzdwhkF7wXA== From: Sasha Levin To: stable@vger.kernel.org Cc: Wang Jie , Yifan Wu , Juefei Pu , Yuan Tan , Xin Liu , Yang Yang , David Howells , Marc Dionne , Jeffrey Altman , Simon Horman , linux-afs@lists.infradead.org, stable@kernel.org, Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y 2/2] rxrpc: only handle RESPONSE during service challenge Date: Tue, 14 Apr 2026 07:25:21 -0400 Message-ID: <20260414112521.410826-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414112521.410826-1-sashal@kernel.org> References: <2026041311-bullion-gave-bf22@gregkh> <20260414112521.410826-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Wang Jie [ Upstream commit c43ffdcfdbb5567b1f143556df8a04b4eeea041c ] Only process RESPONSE packets while the service connection is still in RXRPC_CONN_SERVICE_CHALLENGING. Check that state under state_lock before running response verification and security initialization, then use a local secured flag to decide whether to queue the secured-connection work after the state transition. This keeps duplicate or late RESPONSE packets from re-running the setup path and removes the unlocked post-transition state test. Fixes: 17926a79320a ("[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both") Reported-by: Yifan Wu Reported-by: Juefei Pu Co-developed-by: Yuan Tan Signed-off-by: Yuan Tan Suggested-by: Xin Liu Signed-off-by: Jie Wang Signed-off-by: Yang Yang 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/20260408121252.2249051-21-dhowells@redhat.com Signed-off-by: Jakub Kicinski [ adapted spin_lock_irq/spin_unlock_irq calls to spin_lock/spin_unlock ] Signed-off-by: Sasha Levin --- net/rxrpc/conn_event.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index c8df12d80c7ce..6ef2dc1aa8cc2 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -233,6 +233,7 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, struct sk_buff *skb) { struct rxrpc_skb_priv *sp = rxrpc_skb(skb); + bool secured = false; int ret; if (conn->state == RXRPC_CONN_ABORTED) @@ -245,6 +246,13 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, return conn->security->respond_to_challenge(conn, skb); case RXRPC_PACKET_TYPE_RESPONSE: + spin_lock(&conn->state_lock); + if (conn->state != RXRPC_CONN_SERVICE_CHALLENGING) { + spin_unlock(&conn->state_lock); + return 0; + } + spin_unlock(&conn->state_lock); + ret = conn->security->verify_response(conn, skb); if (ret < 0) return ret; @@ -255,11 +263,13 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, return ret; spin_lock(&conn->state_lock); - if (conn->state == RXRPC_CONN_SERVICE_CHALLENGING) + if (conn->state == RXRPC_CONN_SERVICE_CHALLENGING) { conn->state = RXRPC_CONN_SERVICE; + secured = true; + } spin_unlock(&conn->state_lock); - if (conn->state == RXRPC_CONN_SERVICE) { + if (secured) { /* Offload call state flipping to the I/O thread. As * we've already received the packet, put it on the * front of the queue. -- 2.53.0