| From stable-bounces@linux.kernel.org Tue Apr 18 19:12:31 2006 |
| Date: Wed, 19 Apr 2006 11:14:07 +0900 (JST) |
| Message-Id: <20060419.111407.100375776.yoshfuji@linux-ipv6.org> |
| To: stable@kernel.org |
| From: YOSHIFUJI Hideaki / =?iso-2022-jp?B?GyRCNUhGIzFRTEAbKEI=?= |
| <yoshfuji@linux-ipv6.org> |
| Cc: netdev-core@vger.kernel.org, yoshfuji@linux-ipv6.org |
| Subject: IPV6: XFRM: Don't use old copy of pointer after pskb_may_pull(). |
| |
| [IPV6] XFRM: Don't use old copy of pointer after pskb_may_pull(). |
| |
| Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| |
| --- |
| net/ipv6/xfrm6_policy.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- linux-2.6.16.9.orig/net/ipv6/xfrm6_policy.c |
| +++ linux-2.6.16.9/net/ipv6/xfrm6_policy.c |
| @@ -193,7 +193,7 @@ _decode_session6(struct sk_buff *skb, st |
| { |
| u16 offset = sizeof(struct ipv6hdr); |
| struct ipv6hdr *hdr = skb->nh.ipv6h; |
| - struct ipv6_opt_hdr *exthdr = (struct ipv6_opt_hdr*)(skb->nh.raw + offset); |
| + struct ipv6_opt_hdr *exthdr; |
| u8 nexthdr = skb->nh.ipv6h->nexthdr; |
| |
| memset(fl, 0, sizeof(struct flowi)); |
| @@ -201,6 +201,8 @@ _decode_session6(struct sk_buff *skb, st |
| ipv6_addr_copy(&fl->fl6_src, &hdr->saddr); |
| |
| while (pskb_may_pull(skb, skb->nh.raw + offset + 1 - skb->data)) { |
| + exthdr = (struct ipv6_opt_hdr*)(skb->nh.raw + offset); |
| + |
| switch (nexthdr) { |
| case NEXTHDR_ROUTING: |
| case NEXTHDR_HOP: |
