[IPV6]: Fix offset in ICMPV6_HDR_FIELD messages.

7b9e6ace · Hideaki Yoshifuji · David S. Miller · aad08544 · 7b9e6ace
Commit 7b9e6ace authored May 05, 2003 by Hideaki Yoshifuji Committed by David S. Miller May 05, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

net/ipv6/exthdrs.c net/ipv6/exthdrs.c +7 -2

No files found.
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -252,8 +252,13 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp, unsigned int *nhoffp)
 		return 1;
 	}

-	if (hdr->type != IPV6_SRCRT_TYPE_0 || (hdr->hdrlen & 0x01)) {
-		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, hdr->type != IPV6_SRCRT_TYPE_0 ? 2 : 1);
+	if (hdr->type != IPV6_SRCRT_TYPE_0) {
+		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, (&hdr->type) - skb->nh.raw);
+		return -1;
+	}
+	
+	if (hdr->hdrlen & 0x01) {
+		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, (&hdr->hdrlen) - skb->nh.raw);
 		return -1;
 	}