diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-06-30 16:35:46 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-30 17:12:04 -0400 |
commit | 2889139a6acd2945f6143eb85f7dc2a22a352e1a (patch) | |
tree | 67d21e371107c46f6f0e7a2708b19ad24d8cbfbe /net/ipv6 | |
parent | dd7271feba61d5dc0fab1cb5365db9926d35ea3a (diff) |
[IPV6]: Remove redundant length check on input
We don't need to check skb->len when we're just about to call
pskb_may_pull since that checks it for us.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_input.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index aceee252503d..df8f051c0fce 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c | |||
@@ -84,14 +84,9 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt | |||
84 | */ | 84 | */ |
85 | IP6CB(skb)->iif = skb->dst ? ((struct rt6_info *)skb->dst)->rt6i_idev->dev->ifindex : dev->ifindex; | 85 | IP6CB(skb)->iif = skb->dst ? ((struct rt6_info *)skb->dst)->rt6i_idev->dev->ifindex : dev->ifindex; |
86 | 86 | ||
87 | if (skb->len < sizeof(struct ipv6hdr)) | 87 | if (unlikely(!pskb_may_pull(skb, sizeof(*hdr)))) |
88 | goto err; | 88 | goto err; |
89 | 89 | ||
90 | if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) { | ||
91 | IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS); | ||
92 | goto drop; | ||
93 | } | ||
94 | |||
95 | hdr = skb->nh.ipv6h; | 90 | hdr = skb->nh.ipv6h; |
96 | 91 | ||
97 | if (hdr->version != 6) | 92 | if (hdr->version != 6) |