From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793976710; b=BPliYamNtFqHVCBIB+I/1+ZL8F9+SN4oHGrTSQ32U0paCIrmyscBIxZqs4OiO0gVY/7o RF+p/EfYE9edLrqrkkmRMxdyi2+ovpZF6EMvfo9qqCV4pIWJIb7G4T66EvexxuNmq5ar8 s92sqTfVP4J97Lx+9nTuBu1OmkJQyMbLg+GU83YKGOl5Gh4MBVZ60eudEqcNE5ubhLKVb fqin1RB/lloio1NA64RTVWOQGfSTUaggoSNh9pov1dKB82+JmhU/dYcGZDXixHf2Bv2H9 56B1MDOPMfb6jUelEMstTVymtGLjHR0u9GYQ7Cc3i57+hAP+sc+amSY9mjsDiVuzDqg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793976710; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=dvu6idBWIq0cjApvakRVUpIn3O7L7Wk0yD4NBzZf1Gs=; b=0wICMsMbcyfXlTr2nGv4CQYheb2KdDd0l+ApCiYgXbbUgcBl741TT9zYDpm6MZCilaQq TLTQADJL+GPDydCXTZLDC5UtMzzYwXhhNv9SPnRT4eogaXllUcHxKJI3eFTnyCnOCFYJ7 2OKkRRAUKSxPct2NQtV2Fnh5KO1I7lbsNAafvqoMXEu5SwJwhrBiyGiEUMmz6n+BnhNYW Np5yQQ0EYCJEkFNWPa6VHXumSOM4WVXIuDCZLcwSzjQFOLCEMTMtJ/+RAYr5PSEebHKlz 5ZKTDDzOqV/15z6daXgwJ+2BOLh0/Gqkff1r84cGEGWWyHIXu7Kjk4NtX4x04+6Gs9g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=dAKE7YZC; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D223606A32F for ; Fri, 6 Nov 2026 14:51:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=dAKE7YZC Received: by smtp.kernel.org (Postfix) with ESMTPSA id 191F41F008A4; Fri, 6 Nov 2026 14:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793976710; bh=dvu6idBWIq0cjApvakRVUpIn3O7L7Wk0yD4NBzZf1Gs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dAKE7YZCFf2IZh2+Uzym28IhRaWIJKRHI1Xi1qgYqctnVmpK043gyF2IlVFr51Jkq t1wHdgRUo/TZK9HMjOxsn/JhsByIEQHE9l8G/Eslv8UbrQkLC0kwbUW69gSuK5zItn gaAUJ2W89FjFQuLlfiOp+0xNNymiASmQHlDKf+XfWyvMIT3e3O1GIuoSoOqTCz+1rP FK0kgqLAaO3Fkc9ycHmNBjnVdmWhWSEwNtUwjcfUYRqaDvth2Gh6MEB/zHbEOOPfEd bNv3WS/hBRpwgm0UJ6/Yl3/EkuF01WznHpFowvWK0UYQkSO1dNqe3I1hjjUrHa2fvC b4AAPLg8Nuk6g== From: Sasha Levin To: stable@vger.kernel.org Cc: David Howells , Marc Dionne , Eric Dumazet , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-afs@lists.infradead.org, Sasha Levin Subject: [PATCH 6.1.y] afs: Fix afs to abort the rxrpc call on send error Date: Fri, 6 Nov 2026 09:51:47 -0500 Message-ID: <20261106145126.355683-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026110415-paying-grill-e5e0@gregkh> References: <2026110415-paying-grill-e5e0@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: David Howells [ Upstream commit 3e6af08a571fe2943a006acf3e890f36322602bc ] Fix afs_send_empty_reply() and afs_send_simple_reply() to always try to abort the rxrpc call rather than just aborting on -ENOMEM and otherwise abandoning it. If the call is already complete due to network failure or a received abort, this will do nothing. Also make afs_make_call() always abort on send error; again, it does nothing if the rxrpc call is already dead. Fixes: 08e0e7c82eea ("[AF_RXRPC]: Make the in-kernel AFS filesystem use AF_RXRPC.") Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260824091645.415423-1-dhowells%40redhat.com Signed-off-by: David Howells cc: Marc Dionne cc: Eric Dumazet cc: "David S. Miller" cc: Jakub Kicinski cc: Paolo Abeni cc: Simon Horman cc: linux-afs@lists.infradead.org cc: stable@vger.kernel.org Link: https://patch.msgid.link/20261006133011.531806-6-dhowells@redhat.com Signed-off-by: Paolo Abeni [ sashal: adapted RxRPC calls to the older API with explicit send lengths and three-character abort reasons ] Signed-off-by: Sasha Levin --- fs/afs/rxrpc.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index 0658523bd7865..501a98583e810 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -435,10 +435,9 @@ void afs_make_call(struct afs_addr_cursor *ac, struct afs_call *call, gfp_t gfp) return; error_do_abort: - if (ret != -ECONNABORTED) { - rxrpc_kernel_abort_call(call->net->socket, rxcall, - RX_USER_ABORT, ret, "KSD"); - } else { + rxrpc_kernel_abort_call(call->net->socket, rxcall, + RX_USER_ABORT, ret, "KSD"); + if (ret == -ECONNABORTED) { len = 0; iov_iter_kvec(&msg.msg_iter, ITER_DEST, NULL, 0, 0); rxrpc_kernel_recv_data(call->net->socket, rxcall, @@ -857,6 +856,7 @@ void afs_send_empty_reply(struct afs_call *call) { struct afs_net *net = call->net; struct msghdr msg; + int ret; _enter(""); @@ -869,20 +869,12 @@ void afs_send_empty_reply(struct afs_call *call) msg.msg_controllen = 0; msg.msg_flags = 0; - switch (rxrpc_kernel_send_data(net->socket, call->rxcall, &msg, 0, - afs_notify_end_reply_tx)) { - case 0: - _leave(" [replied]"); - return; - - case -ENOMEM: - _debug("oom"); + ret = rxrpc_kernel_send_data(net->socket, call->rxcall, &msg, 0, + afs_notify_end_reply_tx); + if (ret < 0) { rxrpc_kernel_abort_call(net->socket, call->rxcall, - RXGEN_SS_MARSHAL, -ENOMEM, "KOO"); - fallthrough; - default: - _leave(" [error]"); - return; + RXGEN_SS_MARSHAL, ret, "KSE"); + afs_set_call_complete(call, ret, RXGEN_SS_MARSHAL); } } @@ -917,11 +909,9 @@ void afs_send_simple_reply(struct afs_call *call, const void *buf, size_t len) return; } - if (n == -ENOMEM) { - _debug("oom"); - rxrpc_kernel_abort_call(net->socket, call->rxcall, - RXGEN_SS_MARSHAL, -ENOMEM, "KOO"); - } + rxrpc_kernel_abort_call(net->socket, call->rxcall, + RXGEN_SS_MARSHAL, n, "KSE"); + afs_set_call_complete(call, n, RXGEN_SS_MARSHAL); _leave(" [error]"); } -- 2.53.0