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 B79E877A03; Wed, 21 Feb 2024 13:43: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=1708523005; cv=none; b=KiBc48P/C9RM3ZmpYZeBlkAJnlNBzVjDPcNNLdWfeZzgv7VEQvL5LQ2caJbsNz0HDrzKpAKjQF/bgdepZOO0Ei0Po7CsVID05X8o8mkuf1HvZKt0f20Ux3Ow/uqd+36Kvv0SJ3YM86593H6DZgoNyXTnbPO14SuR7ZJ+3SG9oF0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523005; c=relaxed/simple; bh=uP/Ea56hthg40vZx1OB5rsYksI5y9kJrZSiuhjyvWtY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pNtkhy0GtQUqpVDPof5yCvAvXCSxtb6/0fFLBM/B1rxIXfAnMxpZId18vNTzaxNTq7XZs2OuCC+UotK1uT2Yor9duwxf1ErHIUA1IU/t1aqu0TfghZi5o9PcC7FDpWchU93h7kv67uT5ooqgiviGpT50QWLL2k/NlcDBdDE3Y+4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eQ/p85pP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eQ/p85pP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08484C433C7; Wed, 21 Feb 2024 13:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708523005; bh=uP/Ea56hthg40vZx1OB5rsYksI5y9kJrZSiuhjyvWtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eQ/p85pPv1QWbjgcQFa3iUmNecA1lY8djq/jyVld8oyBhrG1zpFnWxsDhz6+0aNSE zyhNuO3r0vR0cMpf5yA2/KIrMeFTve/NP4R+8TifUVFuJugmp9gl48IzNU+8HQGnRr kS4y1O6Lu82DZSJqJoG/xLeXrnynt+AYcTZ5kfDs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , Marc Dionne , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-afs@lists.infradead.org, netdev@vger.kernel.org, Sasha Levin Subject: [PATCH 5.15 314/476] rxrpc: Fix response to PING RESPONSE ACKs to a dead call Date: Wed, 21 Feb 2024 14:06:05 +0100 Message-ID: <20240221130019.636627513@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells [ Upstream commit 6f769f22822aa4124b556339781b04d810f0e038 ] Stop rxrpc from sending a DUP ACK in response to a PING RESPONSE ACK on a dead call. We may have initiated the ping but the call may have beaten the response to completion. Fixes: 18bfeba50dfd ("rxrpc: Perform terminal call ACK/ABORT retransmission from conn processor") Signed-off-by: David Howells cc: Marc Dionne cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: linux-afs@lists.infradead.org cc: netdev@vger.kernel.org Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/rxrpc/conn_event.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index aab069701398..5d91ef562ff7 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -41,6 +41,14 @@ static void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn, _enter("%d", conn->debug_id); + if (sp && sp->hdr.type == RXRPC_PACKET_TYPE_ACK) { + if (skb_copy_bits(skb, sizeof(struct rxrpc_wire_header), + &pkt.ack, sizeof(pkt.ack)) < 0) + return; + if (pkt.ack.reason == RXRPC_ACK_PING_RESPONSE) + return; + } + chan = &conn->channels[channel]; /* If the last call got moved on whilst we were waiting to run, just -- 2.43.0