android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SUNRPC: Don't change task->tk_status after the call to rpc_exit_task

Browse Source 
commit d180891fba995bd54e25b089b1ec98d134873586 upstream.

Some calls to rpc_exit_task() may deliberately change the value of
task->tk_status, for instance because it gets checked by the RPC call's
rpc_release() callback. That makes it wrong to reset the value to
task->tk_rpc_status.
In particular this causes a bug where the rpc_call_done() callback tries
to fail over a set of pNFS/flexfiles writes to a different IP address,
but the reset of task->tk_status causes nfs_commit_release_pages() to
immediately mark the file as having a fatal error.

Fixes: 39494194f9 ("SUNRPC: Fix races with rpc_killall_tasks()")
Cc: stable@vger.kernel.org # 6.1.x
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Trond Myklebust 2023-05-10 12:28:00 -04:00 committed by Greg Kroah-Hartman
parent 40599969ff
commit 0d97634ad4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/sunrpc/sched.c
View File

@ -927,11 +927,10 @@ static void __rpc_execute(struct rpc_task *task)
*/ */
do_action = task->tk_action; do_action = task->tk_action;
/* Tasks with an RPC error status should exit */ /* Tasks with an RPC error status should exit */
if (do_action != rpc_exit_task && if (do_action && do_action != rpc_exit_task &&
(status = READ_ONCE(task->tk_rpc_status)) != 0) { (status = READ_ONCE(task->tk_rpc_status)) != 0) {
task->tk_status = status; task->tk_status = status;
if (do_action != NULL) do_action = rpc_exit_task;
do_action = rpc_exit_task;
} }
/* Callbacks override all actions */ /* Callbacks override all actions */
if (task->tk_callback) { if (task->tk_callback) {