Commit 278ac0cd authored by David Howells's avatar David Howells
Browse files

rxrpc: Cache the security index in the rxrpc_call struct 



Cache the security index in the rxrpc_call struct so that we can get at it
even when the call has been disconnected and the connection pointer
cleared.

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

net/rxrpc/ar-internal.h

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ struct rxrpc_call { 
	atomic_t		skb_count;	/* Outstanding packets on this call */

	atomic_t		sequence;	/* Tx data packet sequence counter */

	u16			service_id;	/* service ID */

	u8			security_ix;	/* Security type */

	u32			call_id;	/* call ID on connection  */

	u32			cid;		/* connection ID plus channel index */

	int			debug_id;	/* debug ID for printks */

net/rxrpc/call_object.c

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ struct rxrpc_call *rxrpc_incoming_call(struct rxrpc_sock *rx, 
	candidate->peer		= conn->params.peer;

	candidate->cid		= sp->hdr.cid;

	candidate->call_id	= sp->hdr.callNumber;

	candidate->security_ix	= sp->hdr.securityIndex;

	candidate->rx_data_post	= 0;

	candidate->state	= RXRPC_CALL_SERVER_ACCEPTING;

	candidate->flags	|= (1 << RXRPC_CALL_IS_SERVICE);

net/rxrpc/conn_client.c

+3 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ static int rxrpc_get_client_conn(struct rxrpc_call *call, 


	if (cp->exclusive) {

		call->conn = candidate;

		call->security_ix = candidate->security_ix;

		_leave(" = 0 [exclusive %d]", candidate->debug_id);

		return 0;

	}
@@ -395,6 +396,7 @@ static int rxrpc_get_client_conn(struct rxrpc_call *call, 
candidate_published:

	set_bit(RXRPC_CONN_IN_CLIENT_CONNS, &candidate->flags);

	call->conn = candidate;

	call->security_ix = candidate->security_ix;

	spin_unlock(&local->client_conns_lock);

	_leave(" = 0 [new %d]", candidate->debug_id);

	return 0;
@@ -412,6 +414,7 @@ static int rxrpc_get_client_conn(struct rxrpc_call *call, 


	spin_lock(&conn->channel_lock);

	call->conn = conn;

	call->security_ix = conn->security_ix;

	list_add(&call->chan_wait_link, &conn->waiting_calls);

	spin_unlock(&conn->channel_lock);

	_leave(" = 0 [extant %d]", conn->debug_id);

net/rxrpc/input.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call, 


	/* if the packet need security things doing to it, then it goes down

	 * the slow path */

	if (call->conn->security_ix)

	if (call->security_ix)

		goto enqueue_packet;



	sp->call = call;

net/rxrpc/sendmsg.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx, 
			sp->hdr.serial	= atomic_inc_return(&conn->serial);

			sp->hdr.type	= RXRPC_PACKET_TYPE_DATA;

			sp->hdr.userStatus = 0;

			sp->hdr.securityIndex = conn->security_ix;

			sp->hdr.securityIndex = call->security_ix;

			sp->hdr._rsvd	= 0;

			sp->hdr.serviceId = call->service_id;