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

Commit 5e33a23b authored by David Howells's avatar David Howells
Browse files

rxrpc: Fix some missed refs to init_net 



Fix some refs to init_net that should've been changed to the appropriate
network namespace.

Fixes: 2baec2c3 ("rxrpc: Support network namespacing")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 7e418375

net/rxrpc/ar-internal.h

+6 −4
Original line number Diff line number Diff line
@@ -891,8 +891,9 @@ extern unsigned long rxrpc_conn_idle_client_fast_expiry; 
extern struct idr rxrpc_client_conn_ids;



void rxrpc_destroy_client_conn_ids(void);

int rxrpc_connect_call(struct rxrpc_call *, struct rxrpc_conn_parameters *,

		       struct sockaddr_rxrpc *, gfp_t);

int rxrpc_connect_call(struct rxrpc_sock *, struct rxrpc_call *,

		       struct rxrpc_conn_parameters *, struct sockaddr_rxrpc *,

		       gfp_t);

void rxrpc_expose_client_call(struct rxrpc_call *);

void rxrpc_disconnect_client_call(struct rxrpc_call *);

void rxrpc_put_client_conn(struct rxrpc_connection *);
@@ -1045,10 +1046,11 @@ void rxrpc_peer_keepalive_worker(struct work_struct *); 
 */

struct rxrpc_peer *rxrpc_lookup_peer_rcu(struct rxrpc_local *,

					 const struct sockaddr_rxrpc *);

struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_local *,

struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_sock *, struct rxrpc_local *,

				     struct sockaddr_rxrpc *, gfp_t);

struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *, gfp_t);

void rxrpc_new_incoming_peer(struct rxrpc_local *, struct rxrpc_peer *);

void rxrpc_new_incoming_peer(struct rxrpc_sock *, struct rxrpc_local *,

			     struct rxrpc_peer *);

void rxrpc_destroy_all_peers(struct rxrpc_net *);

struct rxrpc_peer *rxrpc_get_peer(struct rxrpc_peer *);

struct rxrpc_peer *rxrpc_get_peer_maybe(struct rxrpc_peer *);

net/rxrpc/call_accept.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static struct rxrpc_call *rxrpc_alloc_incoming_call(struct rxrpc_sock *rx, 
					  (peer_tail + 1) &

					  (RXRPC_BACKLOG_MAX - 1));



			rxrpc_new_incoming_peer(local, peer);

			rxrpc_new_incoming_peer(rx, local, peer);

		}



		/* Now allocate and set up the connection */

net/rxrpc/call_object.c

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx, 
	/* Set up or get a connection record and set the protocol parameters,

	 * including channel number and call ID.

	 */

	ret = rxrpc_connect_call(call, cp, srx, gfp);

	ret = rxrpc_connect_call(rx, call, cp, srx, gfp);

	if (ret < 0)

		goto error;
@@ -339,7 +339,7 @@ int rxrpc_retry_client_call(struct rxrpc_sock *rx, 
	/* Set up or get a connection record and set the protocol parameters,

	 * including channel number and call ID.

	 */

	ret = rxrpc_connect_call(call, cp, srx, gfp);

	ret = rxrpc_connect_call(rx, call, cp, srx, gfp);

	if (ret < 0)

		goto error;

net/rxrpc/conn_client.c

+6 −4
Original line number Diff line number Diff line
@@ -276,7 +276,8 @@ static bool rxrpc_may_reuse_conn(struct rxrpc_connection *conn) 
 * If we return with a connection, the call will be on its waiting list.  It's

 * left to the caller to assign a channel and wake up the call.

 */

static int rxrpc_get_client_conn(struct rxrpc_call *call,

static int rxrpc_get_client_conn(struct rxrpc_sock *rx,

				 struct rxrpc_call *call,

				 struct rxrpc_conn_parameters *cp,

				 struct sockaddr_rxrpc *srx,

				 gfp_t gfp)
@@ -289,7 +290,7 @@ static int rxrpc_get_client_conn(struct rxrpc_call *call, 


	_enter("{%d,%lx},", call->debug_id, call->user_call_ID);



	cp->peer = rxrpc_lookup_peer(cp->local, srx, gfp);

	cp->peer = rxrpc_lookup_peer(rx, cp->local, srx, gfp);

	if (!cp->peer)

		goto error;
@@ -683,7 +684,8 @@ static int rxrpc_wait_for_channel(struct rxrpc_call *call, gfp_t gfp) 
 * find a connection for a call

 * - called in process context with IRQs enabled

 */

int rxrpc_connect_call(struct rxrpc_call *call,

int rxrpc_connect_call(struct rxrpc_sock *rx,

		       struct rxrpc_call *call,

		       struct rxrpc_conn_parameters *cp,

		       struct sockaddr_rxrpc *srx,

		       gfp_t gfp)
@@ -696,7 +698,7 @@ int rxrpc_connect_call(struct rxrpc_call *call, 
	rxrpc_discard_expired_client_conns(&rxnet->client_conn_reaper);

	rxrpc_cull_active_client_conns(rxnet);



	ret = rxrpc_get_client_conn(call, cp, srx, gfp);

	ret = rxrpc_get_client_conn(rx, call, cp, srx, gfp);

	if (ret < 0)

		goto out;

net/rxrpc/input.c

+2 −2
Original line number Diff line number Diff line
@@ -1156,12 +1156,12 @@ void rxrpc_data_ready(struct sock *udp_sk) 
	/* we'll probably need to checksum it (didn't call sock_recvmsg) */

	if (skb_checksum_complete(skb)) {

		rxrpc_free_skb(skb, rxrpc_skb_rx_freed);

		__UDP_INC_STATS(&init_net, UDP_MIB_INERRORS, 0);

		__UDP_INC_STATS(sock_net(udp_sk), UDP_MIB_INERRORS, 0);

		_leave(" [CSUM failed]");

		return;

	}



	__UDP_INC_STATS(&init_net, UDP_MIB_INDATAGRAMS, 0);

	__UDP_INC_STATS(sock_net(udp_sk), UDP_MIB_INDATAGRAMS, 0);



	/* The UDP protocol already released all skb resources;

	 * we are free to add our own data there.