Patch "afs: Fix afs to abort the rxrpc call on send error" has been added to the 6.18-stable tree
gregkh at linuxfoundation.org
gregkh at linuxfoundation.org
Wed Nov 4 11:15:43 PST 2026
This is a note to let you know that I've just added the patch titled
afs: Fix afs to abort the rxrpc call on send error
to the 6.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
afs-fix-afs-to-abort-the-rxrpc-call-on-send-error.patch
and it can be found in the queue-6.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.
>From 3e6af08a571fe2943a006acf3e890f36322602bc Mon Sep 17 00:00:00 2001
From: David Howells <dhowells at redhat.com>
Date: Tue, 6 Oct 2026 14:29:57 +0100
Subject: afs: Fix afs to abort the rxrpc call on send error
From: David Howells <dhowells at redhat.com>
commit 3e6af08a571fe2943a006acf3e890f36322602bc upstream.
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 <dhowells at redhat.com>
cc: Marc Dionne <marc.dionne at auristor.com>
cc: Eric Dumazet <edumazet at google.com>
cc: "David S. Miller" <davem at davemloft.net>
cc: Jakub Kicinski <kuba at kernel.org>
cc: Paolo Abeni <pabeni at redhat.com>
cc: Simon Horman <horms at kernel.org>
cc: linux-afs at lists.infradead.org
cc: stable at vger.kernel.org
Link: https://patch.msgid.link/20261006133011.531806-6-dhowells@redhat.com
Signed-off-by: Paolo Abeni <pabeni at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
fs/afs/rxrpc.c | 37 +++++++++++++------------------------
include/trace/events/rxrpc.h | 2 +-
2 files changed, 14 insertions(+), 25 deletions(-)
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -441,10 +441,8 @@ void afs_make_call(struct afs_call *call
return;
error_do_abort:
- if (ret != -ECONNABORTED)
- rxrpc_kernel_abort_call(call->net->socket, rxcall,
- RX_USER_ABORT, ret,
- afs_abort_send_data_error);
+ rxrpc_kernel_abort_call(call->net->socket, rxcall,
+ RX_USER_ABORT, ret, afs_abort_send_data_error);
if (call->async) {
afs_see_call(call, afs_call_trace_async_abort);
return;
@@ -857,6 +855,7 @@ void afs_send_empty_reply(struct afs_cal
{
struct afs_net *net = call->net;
struct msghdr msg;
+ int ret;
_enter("");
@@ -869,21 +868,13 @@ void afs_send_empty_reply(struct afs_cal
msg.msg_controllen = 0;
msg.msg_flags = 0;
- switch (rxrpc_kernel_send_data(net->socket, call->rxcall, &msg,
- afs_notify_end_reply_tx)) {
- case 0:
- _leave(" [replied]");
- return;
-
- case -ENOMEM:
- _debug("oom");
+ ret = rxrpc_kernel_send_data(net->socket, call->rxcall, &msg,
+ afs_notify_end_reply_tx);
+ if (ret < 0) {
rxrpc_kernel_abort_call(net->socket, call->rxcall,
- RXGEN_SS_MARSHAL, -ENOMEM,
- afs_abort_oom);
- fallthrough;
- default:
- _leave(" [error]");
- return;
+ RXGEN_SS_MARSHAL, ret,
+ afs_abort_send_error);
+ afs_set_call_complete(call, ret, RXGEN_SS_MARSHAL);
}
}
@@ -913,12 +904,10 @@ void afs_send_simple_reply(struct afs_ca
ret = rxrpc_kernel_send_data(net->socket, call->rxcall, &msg,
afs_notify_end_reply_tx);
if (ret < 0) {
- if (ret == -ENOMEM) {
- _debug("oom");
- rxrpc_kernel_abort_call(net->socket, call->rxcall,
- RXGEN_SS_MARSHAL, -ENOMEM,
- afs_abort_oom);
- }
+ rxrpc_kernel_abort_call(net->socket, call->rxcall,
+ RXGEN_SS_MARSHAL, ret,
+ afs_abort_send_error);
+ afs_set_call_complete(call, ret, RXGEN_SS_MARSHAL);
_leave(" [error]");
}
}
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -20,10 +20,10 @@
/* AFS errors */ \
EM(afs_abort_general_error, "afs-error") \
EM(afs_abort_interrupted, "afs-intr") \
- EM(afs_abort_oom, "afs-oom") \
EM(afs_abort_op_not_supported, "afs-op-notsupp") \
EM(afs_abort_probeuuid_negative, "afs-probeuuid-neg") \
EM(afs_abort_send_data_error, "afs-send-data") \
+ EM(afs_abort_send_error, "afs-send-error") \
EM(afs_abort_unmarshal_error, "afs-unmarshal") \
EM(afs_abort_unsupported_sec_class, "afs-unsup-sec-class") \
/* rxperf errors */ \
Patches currently in stable-queue which might be from dhowells at redhat.com are
queue-6.18/rxrpc-fix-double-irq-enablement.patch
queue-6.18/rxrpc-fix-return-in-rxrpc_recvmsg_data-for-service-calls.patch
queue-6.18/smb-client-discard-post-eof-pagecache-when-extending.patch
queue-6.18/smb-client-fix-use-after-free-infoleak-via-the-readdir-resume-name.patch
queue-6.18/smb-client-clear-post-eof-pagecache-when-extending-a.patch
queue-6.18/smb-client-fix-fattr-leaking-on-wsl_to_fattr-failure.patch
queue-6.18/smb-client-fix-oob-last_entry-pointer-from-unbounded-lastnameoffset.patch
queue-6.18/smb-client-don-t-resurrect-an-exiting-tcon-from-cached-dir-workers.patch
queue-6.18/afs-fix-afs-to-abort-the-rxrpc-call-on-send-error.patch
queue-6.18/smb-client-require-stable-pages-for-signed-connectio.patch
queue-6.18/rxrpc-fix-update-of-call-tx_pending-without-holding-lock.patch
queue-6.18/rxrpc-fix-lack-of-short-send-handling-in-rxrpc_kernel_send_data.patch
queue-6.18/smb-client-fix-use-after-free-in-cifs_ses_add_channel.patch
queue-6.18/smb-client-only-require-read-lease-for-size-extendin.patch
queue-6.18/smb-client-drain-and-invalidate-before-server-side-c.patch
More information about the linux-afs
mailing list