afs: Fix abort on signal while waiting for call completion (954cd6dc) · Commits · 戴 / test

Fix the way in which a call that's in progress and being waited for is aborted in the case that EINTR is detected. We should be sending RX_USER_ABORT rather than RX_CALL_DEAD as the abort code. Note that since the only two ways out of the loop are if the call completes or if a signal happens, the kill-the-call clause after the loop has finished can only happen in the case of EINTR. This means that we only have one abort case to deal with, not two, and the "KWC" case can never happen and so can be deleted. Note further that simply aborting the call isn't necessarily the best thing here since at this point: the request has been entirely sent and it's likely the server will do the operation anyway - whether we abort it or not. In future, we should punt the handling of the remainder of the call off to a background thread. Reported-by:

Marc Dionne <marc.c.dionne@auristor.com> Signed-off-by:

David Howells <dhowells@redhat.com>

fs/afs/rxrpc.c

+6 −13

Original line number	Diff line number	Diff line
		@@ -517,7 +517,6 @@ call_complete:
		*/
		static int afs_wait_for_call_to_complete(struct afs_call *call)
		{
		const char *abort_why;
		int ret;

		DECLARE_WAITQUEUE(myself, current);
		@@ -536,13 +535,8 @@ static int afs_wait_for_call_to_complete(struct afs_call *call)
		continue;
		}

		abort_why = "KWC";
		ret = call->error;
		if (call->state == AFS_CALL_COMPLETE)
		break;
		abort_why = "KWI";
		ret = -EINTR;
		if (signal_pending(current))
		if (call->state == AFS_CALL_COMPLETE \|\|
		signal_pending(current))
		break;
		schedule();
		}
		@@ -550,15 +544,14 @@ static int afs_wait_for_call_to_complete(struct afs_call *call)
		remove_wait_queue(&call->waitq, &myself);
		__set_current_state(TASK_RUNNING);

		/* kill the call */
		/* Kill off the call if it's still live. */
		if (call->state < AFS_CALL_COMPLETE) {
		_debug("call incomplete");
		_debug("call interrupted");
		rxrpc_kernel_abort_call(afs_socket, call->rxcall,
		RX_CALL_DEAD, -ret, abort_why);
		} else if (call->error < 0) {
		ret = call->error;
		RX_USER_ABORT, -EINTR, "KWI");
		}

		ret = call->error;
		_debug("call complete");
		afs_put_call(call);
		_leave(" = %d", ret);

Admin message