diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-06-30 13:35:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-30 14:12:04 -0700 |
| commit | 2889139a6acd2945f6143eb85f7dc2a22a352e1a (patch) | |
| tree | 67d21e371107c46f6f0e7a2708b19ad24d8cbfbe /net | |
| parent | dd7271feba61d5dc0fab1cb5365db9926d35ea3a (diff) | |
| download | op-kernel-dev-2889139a6acd2945f6143eb85f7dc2a22a352e1a.zip op-kernel-dev-2889139a6acd2945f6143eb85f7dc2a22a352e1a.tar.gz | |
[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')
| -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 aceee25..df8f051 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 */ 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; - 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) |
