Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2889139a authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd7271fe

net/ipv6/ip6_input.c

+1 −6
Original line number Diff line number Diff line
@@ -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)