git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
ipv6
/
ip6_input.c
diff --git
a/net/ipv6/ip6_input.c
b/net/ipv6/ip6_input.c
index
aceee25
..
25c2a9e
100644
(file)
--- a/
net/ipv6/ip6_input.c
+++ b/
net/ipv6/ip6_input.c
@@
-71,6
+71,8
@@
int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
goto out;
}
goto out;
}
+ memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm));
+
/*
* Store incoming device index. When the packet will
* be queued, we cannot refer to skb->dev anymore.
/*
* Store incoming device index. When the packet will
* be queued, we cannot refer to skb->dev anymore.
@@
-84,14
+86,9
@@
int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
*/
IP6CB(skb)->iif = skb->dst ? ((struct rt6_info *)skb->dst)->rt6i_idev->dev->ifindex : dev->ifindex;
*/
IP6CB(skb)->iif = skb->dst ? ((struct rt6_info *)skb->dst)->rt6i_idev->dev->ifindex : dev->ifindex;
- if (
skb->len < sizeof(struct ipv6hdr
))
+ if (
unlikely(!pskb_may_pull(skb, sizeof(*hdr))
))
goto err;
goto err;
- if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) {
- IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
- goto drop;
- }
-
hdr = skb->nh.ipv6h;
if (hdr->version != 6)
hdr = skb->nh.ipv6h;
if (hdr->version != 6)