Skip to content

Commit 4ac15ea

Browse files
committed
afs: Handle EIO from delivery function
Fix afs_deliver_to_call() to handle -EIO being returned by the operation delivery function, indicating that the call found itself in the wrong state, by printing an error and aborting the call. Currently, an assertion failure will occur. This can happen, say, if the delivery function falls off the end without calling afs_extract_data() with the want_more parameter set to false to collect the end of the Rx phase of a call. The assertion failure looks like: AFS: Assertion failed 4 == 7 is false 0x4 == 0x7 is false ------------[ cut here ]------------ kernel BUG at fs/afs/rxrpc.c:462! and is matched in the trace buffer by a line like: kworker/7:3-3226 [007] ...1 85158.030203: afs_io_error: c=0003be0c r=-5 CM_REPLY Fixes: 98bf40c ("afs: Protect call->state changes against signals") Reported-by: Marc Dionne <[email protected]> Signed-off-by: David Howells <[email protected]>
1 parent ded2f4c commit 4ac15ea

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

fs/afs/rxrpc.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,6 @@ static void afs_deliver_to_call(struct afs_call *call)
499499
case -EINPROGRESS:
500500
case -EAGAIN:
501501
goto out;
502-
case -EIO:
503502
case -ECONNABORTED:
504503
ASSERTCMP(state, ==, AFS_CALL_COMPLETE);
505504
goto done;
@@ -508,6 +507,10 @@ static void afs_deliver_to_call(struct afs_call *call)
508507
rxrpc_kernel_abort_call(call->net->socket, call->rxcall,
509508
abort_code, ret, "KIV");
510509
goto local_abort;
510+
case -EIO:
511+
pr_err("kAFS: Call %u in bad state %u\n",
512+
call->debug_id, state);
513+
/* Fall through */
511514
case -ENODATA:
512515
case -EBADMSG:
513516
case -EMSGSIZE:

0 commit comments

Comments
 (0)