: Enable ip6t_esp.c to work without skb_linearize()

Convert ip6t_esp to skb_header_pointer.

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/10/19 02:19:33+02:00 [email protected]
# [NETFILTER]: Enable ip6t_esp.c to work without skb_linearize()
#
# Signed-off-by: Yasuyuki KOZAKAI <[email protected]>
# Signed-off-by: Patrick McHardy <[email protected]>
#

# net/ipv6/netfilter/ip6t_esp.c
#   2004/10/19 02:19:06+02:00 [email protected] +12 -10
#   [NETFILTER]: Enable ip6t_esp.c to work without skb_linearize()
#   
#   Signed-off-by: Yasuyuki KOZAKAI <[email protected]>
#   Signed-off-by: Patrick McHardy <[email protected]>
# 
diff -Nru a/net/ipv6/netfilter/ip6t_esp.c b/net/ipv6/netfilter/ip6t_esp.c
--- a/net/ipv6/netfilter/ip6t_esp.c	2004-10-22 03:38:39 +02:00
+++ b/net/ipv6/netfilter/ip6t_esp.c	2004-10-22 03:38:39 +02:00
@@ -48,7 +48,7 @@
       unsigned int protoff,
       int *hotdrop)
 {
-	struct ip_esp_hdr *esp = NULL;
+	struct ip_esp_hdr _esp, *eh = NULL;
 	const struct ip6t_esp *espinfo = matchinfo;
 	unsigned int temp;
 	int len;
@@ -67,7 +67,7 @@
 	temp = 0;

         while (ip6t_ext_hdr(nexthdr)) {
-        	struct ipv6_opt_hdr *hdr;
+        	struct ipv6_opt_hdr _hdr, *hp;
         	int hdrlen;

DEBUGP("ipv6_esp header iteration \n");
@@ -85,15 +85,16 @@
break;
}

- hdr=(struct ipv6_opt_hdr *)skb->data+ptr;
+ hp = skb_header_pointer(skb, ptr, sizeof(_hdr), &_hdr);
+ BUG_ON(hp == NULL);

/* Calculate the header length */

                 if (nexthdr == NEXTHDR_FRAGMENT) {
                         hdrlen = 8;
                 } else if (nexthdr == NEXTHDR_AUTH)

- hdrlen = (hdr->hdrlen+2)<<2;
+ hdrlen = (hp->hdrlen+2)<<2;
else
- hdrlen = ipv6_optlen(hdr);
+ hdrlen = ipv6_optlen(hp);

/* set the flag */
switch (nexthdr){
@@ -109,7 +110,7 @@
break;
}

- nexthdr = hdr->nexthdr;

+                nexthdr = hp->nexthdr;
                 len -= hdrlen;
                 ptr += hdrlen;
 		if ( ptr > skb->len ) {
@@ -126,13 +127,14 @@
        		return 0;
        }

- esp = (struct ip_esp_hdr *) (skb->data + ptr);
+ eh = skb_header_pointer(skb, ptr, sizeof(_esp), &_esp);
+ BUG_ON(eh == NULL);

- DEBUGP("IPv6 ESP SPI %u %08X\n", ntohl(esp->spi), ntohl(esp->spi));
+ DEBUGP("IPv6 ESP SPI %u %08X\n", ntohl(eh->spi), ntohl(eh->spi));

- return (esp != NULL)
+ return (eh != NULL)
&& spi_match(espinfo->spis[0], espinfo->spis[1],
- ntohl(esp->spi),
+ ntohl(eh->spi),
!!(espinfo->invflags & IP6T_ESP_INV_SPI));
}