Commit 7b674e39 authored by David Howells's avatar David Howells
Browse files

rxrpc: Fix IPv6 support 



Fix IPv6 support in AF_RXRPC in the following ways:

 (1) When extracting the address from a received IPv4 packet, if the local
     transport socket is open for IPv6 then fill out the sockaddr_rxrpc
     struct for an IPv4-mapped-to-IPv6 AF_INET6 transport address instead
     of an AF_INET one.

 (2) When sending CHALLENGE or RESPONSE packets, the transport length needs
     to be set from the sockaddr_rxrpc::transport_len field rather than
     sizeof() on the IPv4 transport address.

 (3) When processing an IPv4 ICMP packet received by an IPv6 socket, set up
     the address correctly before searching for the affected peer.

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

net/rxrpc/ar-internal.h

+2 −2
Original line number Diff line number Diff line
@@ -830,7 +830,6 @@ void rxrpc_process_connection(struct work_struct *); 
 */

extern unsigned int rxrpc_connection_expiry;



int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *, struct sk_buff *);

struct rxrpc_connection *rxrpc_alloc_connection(gfp_t);

struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *,

						   struct sk_buff *);
@@ -1060,7 +1059,8 @@ static inline void rxrpc_sysctl_exit(void) {} 
/*

 * utils.c

 */

int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *, struct sk_buff *);

int rxrpc_extract_addr_from_skb(struct rxrpc_local *, struct sockaddr_rxrpc *,

				struct sk_buff *);



static inline bool before(u32 seq1, u32 seq2)

{

net/rxrpc/call_accept.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static struct rxrpc_call *rxrpc_alloc_incoming_call(struct rxrpc_sock *rx, 
		 * anticipation - and to save on stack space.

		 */

		xpeer = b->peer_backlog[peer_tail];

		if (rxrpc_extract_addr_from_skb(&xpeer->srx, skb) < 0)

		if (rxrpc_extract_addr_from_skb(local, &xpeer->srx, skb) < 0)

			return NULL;



		peer = rxrpc_lookup_incoming_peer(local, xpeer);

net/rxrpc/conn_object.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local, 


	_enter(",%x", sp->hdr.cid & RXRPC_CIDMASK);



	if (rxrpc_extract_addr_from_skb(&srx, skb) < 0)

	if (rxrpc_extract_addr_from_skb(local, &srx, skb) < 0)

		goto not_found;



	k.epoch	= sp->hdr.epoch;

net/rxrpc/local_event.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void rxrpc_send_version_request(struct rxrpc_local *local, 


	_enter("");



	if (rxrpc_extract_addr_from_skb(&srx, skb) < 0)

	if (rxrpc_extract_addr_from_skb(local, &srx, skb) < 0)

		return;



	msg.msg_name	= &srx.transport;

net/rxrpc/output.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ void rxrpc_reject_packets(struct rxrpc_local *local) 
		rxrpc_see_skb(skb, rxrpc_skb_rx_seen);

		sp = rxrpc_skb(skb);



		if (rxrpc_extract_addr_from_skb(&srx, skb) == 0) {

		if (rxrpc_extract_addr_from_skb(local, &srx, skb) == 0) {

			msg.msg_namelen = srx.transport_len;



			code = htonl(skb->priority);

CRA Git | Maintained and supported by SUSTech CRA and CCSE