Patch "afs: Better abort and net error handling" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
afs: Better abort and net error handling
to the 4.9-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-better-abort-and-net-error-handling.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Dec 18 14:12:34 CET 2017
From: David Howells <[email protected]>
Date: Thu, 16 Mar 2017 16:27:47 +0000
Subject: afs: Better abort and net error handling
From: David Howells <[email protected]>
[ Upstream commit 70af0e3bd65142f9e674961c975451638a7ce1d5 ]
If we receive a network error, a remote abort or a protocol error whilst we're still transmitting data, make sure we return an appropriate error to the caller rather than ESHUTDOWN or ECONNABORTED.
--- fs/afs/rxrpc.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)
fs/afs/rxrpc.c +27 -8
@@ -321,6 +321,8 @@ int afs_make_call(struct in_addr *addr,struct rxrpc_call *rxcall;struct msghdr msg;struct kvec iov[1 ]; +size_t offset; +u32 abort_code;int ret;_enter ("%x,{%d}," , addr->s_addr,ntohs (call->port));
@@ -368,9 +370,11 @@ int afs_make_call(struct in_addr *addr, msg.msg_controllen =0 ; msg.msg_flags = (call->send_pages ?MSG_MORE :0 ); -/* have to change the state *before* sending the last packet as RxRPC -* might give us the reply before it returns from sending the -* request */ +/* We have to change the state *before* sending the last packet as +* rxrpc might give us the reply before it returns from sending the +* request. Further, if the send fails, we may already have been given +* a notification and may have collected it. +*/ if (!call->send_pages) call->state =AFS_CALL_AWAIT_REPLY ; ret = rxrpc_kernel_send_data(afs_socket, rxcall,
@@ -389,7 +393,17 @@ int afs_make_call(struct in_addr *addr,return wait_mode->wait (call); error_do_abort: -rxrpc_kernel_abort_call (afs_socket, rxcall,RX_USER_ABORT , -ret,"KSD" ); + call->state =AFS_CALL_COMPLETE ; +if (ret != -ECONNABORTED ) { +rxrpc_kernel_abort_call (afs_socket, rxcall,RX_USER_ABORT , + -ret,"KSD" ); + }else { + abort_code =0 ; + offset =0 ; +rxrpc_kernel_recv_data (afs_socket, rxcall,NULL ,0 , &offset, + false, &abort_code); + ret = call->type->abort_to_error (abort_code); + } error_kill_call:afs_end_call (call);_leave (" = %d" , ret);
@@ -434,16 +448,18 @@ static void afs_deliver_to_call(struct acase -EINPROGRESS :case -EAGAIN : goto out; +case -ECONNABORTED : + goto call_complete;case -ENOTCONN : abort_code =RX_CALL_DEAD ;rxrpc_kernel_abort_call (afs_socket, call->rxcall, abort_code, -ret,"KNC" ); - goto do_abort; + goto save_error;case -ENOTSUPP : abort_code =RXGEN_OPCODE ;rxrpc_kernel_abort_call (afs_socket, call->rxcall, abort_code, -ret,"KIV" ); - goto do_abort; + goto save_error;case -ENODATA :case -EBADMSG :case -EMSGSIZE :
@@ -453,7 +469,7 @@ static void afs_deliver_to_call(struct a abort_code =RXGEN_SS_UNMARSHAL ;rxrpc_kernel_abort_call (afs_socket, call->rxcall, abort_code,EBADMSG ,"KUM" ); - goto do_abort; + goto save_error; } }
@@ -464,8 +480,9 @@ out:_leave ("" );return ; -do_abort: +save_error: call->error = ret; +call_complete: call->state =AFS_CALL_COMPLETE ; goto done; }
@@ -513,6 +530,8 @@ static int afs_wait_for_call_to_complete_debug ("call incomplete" );rxrpc_kernel_abort_call (afs_socket, call->rxcall,RX_CALL_DEAD , -ret, abort_why); + }else if (call->error <0 ) { + ret = call->error; }_debug ("call complete" );
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/afs-flush-outstanding-writes-when-an-fd-is-closed.patch queue-4.9/afs-fix-the-maths-in-afs_fs_store_data.patch queue-4.9/afs-populate-group-id-from-vnode-status.patch queue-4.9/afs-prevent-callback-expiry-timer-overflow.patch queue-4.9/crypto-rsa-fix-buffer-overread-when-stripping-leading-zeroes.patch queue-4.9/afs-adjust-mode-bits-processing.patch queue-4.9/rxrpc-wake-up-the-transmitter-if-rx-window-size-increases-on-the-peer.patch queue-4.9/afs-invalid-op-id-should-abort-with-rxgen_opcode.patch queue-4.9/afs-fix-page-leak-in-afs_write_begin.patch queue-4.9/afs-better-abort-and-net-error-handling.patch queue-4.9/afs-fix-missing-put_page.patch queue-4.9/afs-migrate-vlocation-fields-to-64-bit.patch queue-4.9/rxrpc-ignore-busy-packets-on-old-calls.patch queue-4.9/afs-populate-and-use-client-modification-time.patch queue-4.9/afs-fix-afs_kill_pages.patch queue-4.9/afs-fix-abort-on-signal-while-waiting-for-call-completion.patch