From dc4450749a5525257bda8b0ee8c95138a0158f17 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Fri, 11 Apr 2008 23:51:26 +0900 Subject: [PATCH] --- yaml --- r: 90643 b: refs/heads/master c: 05f175cdcf9d3615c1633615d87891ebfb729401 h: refs/heads/master i: 90641: d805024421b040e6fdde33cb2ceb06cea2ba0ff9 90639: 29db591dfb9109a155164e9261051b1225c326a2 v: v3 --- [refs] | 2 +- trunk/net/ipv6/raw.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8c5b753eae25..d3148b349afd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 876c7f41961dc5172b03cbf2dca65f05003f28a0 +refs/heads/master: 05f175cdcf9d3615c1633615d87891ebfb729401 diff --git a/trunk/net/ipv6/raw.c b/trunk/net/ipv6/raw.c index 059298baa1dd..6193b124cbc7 100644 --- a/trunk/net/ipv6/raw.c +++ b/trunk/net/ipv6/raw.c @@ -357,8 +357,10 @@ void raw6_icmp_error(struct sk_buff *skb, int nexthdr, read_lock(&raw_v6_hashinfo.lock); sk = sk_head(&raw_v6_hashinfo.ht[hash]); if (sk != NULL) { - saddr = &ipv6_hdr(skb)->saddr; - daddr = &ipv6_hdr(skb)->daddr; + /* Note: ipv6_hdr(skb) != skb->data */ + struct ipv6hdr *ip6h = (struct ipv6hdr *)skb->data; + saddr = &ip6h->saddr; + daddr = &ip6h->daddr; net = dev_net(skb->dev); while ((sk = __raw_v6_lookup(net, sk, nexthdr, saddr, daddr,