From fd642b94fd1b9cd08f6829926b03e7208a17f8ae Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Fri, 30 May 2008 11:35:03 +0900 Subject: [PATCH] --- yaml --- r: 97661 b: refs/heads/master c: baa2bfb8aef24bb7fe1875b256918724b3884662 h: refs/heads/master i: 97659: 1c804ba982b97af18f801509541af09c20ad65a4 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tunnel4.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1b6cf124b6a0..f33d8a795afc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82836372311a5cbf9cc5f4f47f9b56cb9edfe90d +refs/heads/master: baa2bfb8aef24bb7fe1875b256918724b3884662 diff --git a/trunk/net/ipv4/tunnel4.c b/trunk/net/ipv4/tunnel4.c index d3b709a6f264..cb1f0e83830b 100644 --- a/trunk/net/ipv4/tunnel4.c +++ b/trunk/net/ipv4/tunnel4.c @@ -97,7 +97,7 @@ static int tunnel64_rcv(struct sk_buff *skb) { struct xfrm_tunnel *handler; - if (!pskb_may_pull(skb, sizeof(struct iphdr))) + if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) goto drop; for (handler = tunnel64_handlers; handler; handler = handler->next)