Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 519d2567 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

RxRPC: Don't attempt to reuse aborted connections 



Connections that have seen a connection-level abort should not be reused
as the far end will just abort them again; instead a new connection
should be made.

Connection-level aborts occur due to such things as authentication
failures.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0dd51986

net/rxrpc/ar-connection.c

+10 −0
Original line number Diff line number Diff line
@@ -444,6 +444,11 @@ int rxrpc_connect_call(struct rxrpc_sock *rx, 
			conn = list_entry(bundle->avail_conns.next,

					  struct rxrpc_connection,

					  bundle_link);

			if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {

				list_del_init(&conn->bundle_link);

				bundle->num_conns--;

				continue;

			}

			if (--conn->avail_calls == 0)

				list_move(&conn->bundle_link,

					  &bundle->busy_conns);
@@ -461,6 +466,11 @@ int rxrpc_connect_call(struct rxrpc_sock *rx, 
			conn = list_entry(bundle->unused_conns.next,

					  struct rxrpc_connection,

					  bundle_link);

			if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {

				list_del_init(&conn->bundle_link);

				bundle->num_conns--;

				continue;

			}

			ASSERTCMP(conn->avail_calls, ==, RXRPC_MAXCALLS);

			conn->avail_calls = RXRPC_MAXCALLS - 1;

			ASSERT(conn->channels[0] == NULL &&

net/rxrpc/ar-connevent.c

+6 −1
Original line number Diff line number Diff line
@@ -150,11 +150,15 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, 
	u32 serial;

	int loop, ret;



	if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED)

	if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {

		kleave(" = -ECONNABORTED [%u]", conn->state);

		return -ECONNABORTED;

	}



	serial = ntohl(sp->hdr.serial);



	_enter("{%d},{%u,%%%u},", conn->debug_id, sp->hdr.type, serial);



	switch (sp->hdr.type) {

	case RXRPC_PACKET_TYPE_ABORT:

		if (skb_copy_bits(skb, 0, &tmp, sizeof(tmp)) < 0)
@@ -199,6 +203,7 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, 
		return 0;



	default:

		_leave(" = -EPROTO [%u]", sp->hdr.type);

		return -EPROTO;

	}

}