Commit 3a92789a authored by David Howells's avatar David Howells
Browse files

rxrpc: Use negative error codes in rxrpc_call struct 



Use negative error codes in struct rxrpc_call::error because that's what
the kernel normally deals with and to make the code consistent.  We only
turn them positive when transcribing into a cmsg for userspace recvmsg.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent faeeb317

fs/afs/rxrpc.c

+6 −6
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp, 
	call->state = AFS_CALL_COMPLETE;

	if (ret != -ECONNABORTED) {

		rxrpc_kernel_abort_call(afs_socket, rxcall, RX_USER_ABORT,

					-ret, "KSD");

					ret, "KSD");

	} else {

		abort_code = 0;

		offset = 0;
@@ -478,12 +478,12 @@ static void afs_deliver_to_call(struct afs_call *call) 
		case -ENOTCONN:

			abort_code = RX_CALL_DEAD;

			rxrpc_kernel_abort_call(afs_socket, call->rxcall,

						abort_code, -ret, "KNC");

						abort_code, ret, "KNC");

			goto save_error;

		case -ENOTSUPP:

			abort_code = RXGEN_OPCODE;

			rxrpc_kernel_abort_call(afs_socket, call->rxcall,

						abort_code, -ret, "KIV");

						abort_code, ret, "KIV");

			goto save_error;

		case -ENODATA:

		case -EBADMSG:
@@ -493,7 +493,7 @@ static void afs_deliver_to_call(struct afs_call *call) 
			if (call->state != AFS_CALL_AWAIT_REPLY)

				abort_code = RXGEN_SS_UNMARSHAL;

			rxrpc_kernel_abort_call(afs_socket, call->rxcall,

						abort_code, EBADMSG, "KUM");

						abort_code, -EBADMSG, "KUM");

			goto save_error;

		}

	}
@@ -754,7 +754,7 @@ void afs_send_empty_reply(struct afs_call *call) 
	case -ENOMEM:

		_debug("oom");

		rxrpc_kernel_abort_call(afs_socket, call->rxcall,

					RX_USER_ABORT, ENOMEM, "KOO");

					RX_USER_ABORT, -ENOMEM, "KOO");

	default:

		_leave(" [error]");

		return;
@@ -792,7 +792,7 @@ void afs_send_simple_reply(struct afs_call *call, const void *buf, size_t len) 
	if (n == -ENOMEM) {

		_debug("oom");

		rxrpc_kernel_abort_call(afs_socket, call->rxcall,

					RX_USER_ABORT, ENOMEM, "KOO");

					RX_USER_ABORT, -ENOMEM, "KOO");

	}

	_leave(" [error]");

}

net/rxrpc/call_accept.c

+3 −3
Original line number Diff line number Diff line
@@ -413,11 +413,11 @@ struct rxrpc_call *rxrpc_new_incoming_call(struct rxrpc_local *local, 


	case RXRPC_CONN_REMOTELY_ABORTED:

		rxrpc_set_call_completion(call, RXRPC_CALL_REMOTELY_ABORTED,

					  conn->remote_abort, ECONNABORTED);

					  conn->remote_abort, -ECONNABORTED);

		break;

	case RXRPC_CONN_LOCALLY_ABORTED:

		rxrpc_abort_call("CON", call, sp->hdr.seq,

				 conn->local_abort, ECONNABORTED);

				 conn->local_abort, -ECONNABORTED);

		break;

	default:

		BUG();
@@ -600,7 +600,7 @@ int rxrpc_reject_call(struct rxrpc_sock *rx) 
	write_lock_bh(&call->state_lock);

	switch (call->state) {

	case RXRPC_CALL_SERVER_ACCEPTING:

		__rxrpc_abort_call("REJ", call, 1, RX_USER_ABORT, ECONNABORTED);

		__rxrpc_abort_call("REJ", call, 1, RX_USER_ABORT, -ECONNABORTED);

		abort = true;

		/* fall through */

	case RXRPC_CALL_COMPLETE:

net/rxrpc/call_event.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ void rxrpc_process_call(struct work_struct *work) 


	now = ktime_get_real();

	if (ktime_before(call->expire_at, now)) {

		rxrpc_abort_call("EXP", call, 0, RX_CALL_TIMEOUT, ETIME);

		rxrpc_abort_call("EXP", call, 0, RX_CALL_TIMEOUT, -ETIME);

		set_bit(RXRPC_CALL_EV_ABORT, &call->events);

		goto recheck_state;

	}

net/rxrpc/call_object.c

+2 −2
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ void rxrpc_release_calls_on_socket(struct rxrpc_sock *rx) 
		call = list_entry(rx->to_be_accepted.next,

				  struct rxrpc_call, accept_link);

		list_del(&call->accept_link);

		rxrpc_abort_call("SKR", call, 0, RX_CALL_DEAD, ECONNRESET);

		rxrpc_abort_call("SKR", call, 0, RX_CALL_DEAD, -ECONNRESET);

		rxrpc_put_call(call, rxrpc_call_put);

	}
@@ -494,7 +494,7 @@ void rxrpc_release_calls_on_socket(struct rxrpc_sock *rx) 
		call = list_entry(rx->sock_calls.next,

				  struct rxrpc_call, sock_link);

		rxrpc_get_call(call, rxrpc_call_got);

		rxrpc_abort_call("SKT", call, 0, RX_CALL_DEAD, ECONNRESET);

		rxrpc_abort_call("SKT", call, 0, RX_CALL_DEAD, -ECONNRESET);

		rxrpc_send_abort_packet(call);

		rxrpc_release_call(rx, call);

		rxrpc_put_call(call, rxrpc_call_put);

net/rxrpc/conn_event.c

+4 −4
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void rxrpc_abort_calls(struct rxrpc_connection *conn, 
 * generate a connection-level abort

 */

static int rxrpc_abort_connection(struct rxrpc_connection *conn,

				  u32 error, u32 abort_code)

				  int error, u32 abort_code)

{

	struct rxrpc_wire_header whdr;

	struct msghdr msg;
@@ -288,7 +288,7 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, 


		conn->state = RXRPC_CONN_REMOTELY_ABORTED;

		rxrpc_abort_calls(conn, RXRPC_CALL_REMOTELY_ABORTED,

				  abort_code, ECONNABORTED);

				  abort_code, -ECONNABORTED);

		return -ECONNABORTED;



	case RXRPC_PACKET_TYPE_CHALLENGE:
@@ -370,7 +370,7 @@ static void rxrpc_secure_connection(struct rxrpc_connection *conn) 


abort:

	_debug("abort %d, %d", ret, abort_code);

	rxrpc_abort_connection(conn, -ret, abort_code);

	rxrpc_abort_connection(conn, ret, abort_code);

	_leave(" [aborted]");

}
@@ -419,7 +419,7 @@ void rxrpc_process_connection(struct work_struct *work) 
	goto out;



protocol_error:

	if (rxrpc_abort_connection(conn, -ret, abort_code) < 0)

	if (rxrpc_abort_connection(conn, ret, abort_code) < 0)

		goto requeue_and_leave;

	rxrpc_free_skb(skb, rxrpc_skb_rx_freed);

	_leave(" [EPROTO]");