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

Commit 007f0211 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Store IPv6 nh pointer in mac_header on output 



Current the x->mode->output functions store the IPv6 nh pointer in the
skb network header.  This is inconvenient because the network header then
has to be fixed up before the packet can leave the IPsec stack.  The mac
header field is unused on output so we can use that to store this instead.

This patch does that and removes the network header fix-up in xfrm_output.

It also uses ipv6_hdr where appropriate in the x->type->output functions.

There is also a minor clean-up in esp4 to make it use the same code as
esp6 to help any subsequent effort to merge the two.

Lastly it kills two redundant skb_set_* statements in BEET that were
simply copied over from transport mode.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ecafede

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
	tail[clen - skb->len - 2] = (clen - skb->len) - 2;

	pskb_put(skb, trailer, clen - skb->len);



	__skb_push(skb, skb->data - skb_network_header(skb));

	__skb_push(skb, -skb_network_offset(skb));

	top_iph = ip_hdr(skb);

	esph = (struct ip_esp_hdr *)(skb_network_header(skb) +

				     top_iph->ihl * 4);

net/ipv6/ah6.c

+3 −3
Original line number Diff line number Diff line
@@ -235,11 +235,11 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) 
		char hdrs[0];

	} *tmp_ext;



	top_iph = (struct ipv6hdr *)skb->data;

	top_iph = ipv6_hdr(skb);

	top_iph->payload_len = htons(skb->len - sizeof(*top_iph));



	nexthdr = *skb_network_header(skb);

	*skb_network_header(skb) = IPPROTO_AH;

	nexthdr = *skb_mac_header(skb);

	*skb_mac_header(skb) = IPPROTO_AH;



	/* When there are no extension headers, we only need to save the first

	 * 8 bytes of the base IP header.

net/ipv6/esp6.c

+4 −3
Original line number Diff line number Diff line
@@ -88,11 +88,12 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) 
	tail[clen-skb->len - 2] = (clen - skb->len) - 2;

	pskb_put(skb, trailer, clen - skb->len);



	top_iph = (struct ipv6hdr *)__skb_push(skb, hdr_len);

	__skb_push(skb, -skb_network_offset(skb));

	top_iph = ipv6_hdr(skb);

	esph = (struct ipv6_esp_hdr *)skb_transport_header(skb);

	top_iph->payload_len = htons(skb->len + alen - sizeof(*top_iph));

	*(skb_tail_pointer(trailer) - 1) = *skb_network_header(skb);

	*skb_network_header(skb) = IPPROTO_ESP;

	*(skb_tail_pointer(trailer) - 1) = *skb_mac_header(skb);

	*skb_mac_header(skb) = IPPROTO_ESP;



	esph->spi = x->id.spi;

	esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq);

net/ipv6/ipcomp6.c

+3 −3
Original line number Diff line number Diff line
@@ -157,15 +157,15 @@ static int ipcomp6_output(struct xfrm_state *x, struct sk_buff *skb) 
	pskb_trim(skb, hdr_len + dlen + sizeof(struct ip_comp_hdr));



	/* insert ipcomp header and replace datagram */

	top_iph = (struct ipv6hdr *)skb->data;

	top_iph = ipv6_hdr(skb);



	top_iph->payload_len = htons(skb->len - sizeof(struct ipv6hdr));



	ipch = (struct ipv6_comp_hdr *)start;

	ipch->nexthdr = *skb_network_header(skb);

	ipch->nexthdr = *skb_mac_header(skb);

	ipch->flags = 0;

	ipch->cpi = htons((u16 )ntohl(x->id.spi));

	*skb_network_header(skb) = IPPROTO_COMP;

	*skb_mac_header(skb) = IPPROTO_COMP;



out_ok:

	return 0;

net/ipv6/mip6.c

+6 −6
Original line number Diff line number Diff line
@@ -153,11 +153,11 @@ static int mip6_destopt_output(struct xfrm_state *x, struct sk_buff *skb) 
	u8 nexthdr;

	int len;



	iph = (struct ipv6hdr *)skb->data;

	iph = ipv6_hdr(skb);

	iph->payload_len = htons(skb->len - sizeof(*iph));



	nexthdr = *skb_network_header(skb);

	*skb_network_header(skb) = IPPROTO_DSTOPTS;

	nexthdr = *skb_mac_header(skb);

	*skb_mac_header(skb) = IPPROTO_DSTOPTS;



	dstopt = (struct ipv6_destopt_hdr *)skb_transport_header(skb);

	dstopt->nexthdr = nexthdr;
@@ -365,11 +365,11 @@ static int mip6_rthdr_output(struct xfrm_state *x, struct sk_buff *skb) 
	struct rt2_hdr *rt2;

	u8 nexthdr;



	iph = (struct ipv6hdr *)skb->data;

	iph = ipv6_hdr(skb);

	iph->payload_len = htons(skb->len - sizeof(*iph));



	nexthdr = *skb_network_header(skb);

	*skb_network_header(skb) = IPPROTO_ROUTING;

	nexthdr = *skb_mac_header(skb);

	*skb_mac_header(skb) = IPPROTO_ROUTING;



	rt2 = (struct rt2_hdr *)skb_transport_header(skb);

	rt2->rt_hdr.nexthdr = nexthdr;