---

yaml --- r: 256287 b: refs/heads/master c: 5893279 h: refs/heads/master i: 256285: 43dac5d 256283: 5f28e16 256279: d27e22a 256271: 244df51 256255: 2ecb7d6 v: v3
git-mirror · Jun 24, 2011 · 0858330 · 0858330
1 parent 95ab792
commit 0858330
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a659b2a94d87add999229ecd9f2f56817d5d737b
+refs/heads/master: 589327905cf0ce4402f7fb1ed29682f7ae68a82e
diff --git a/trunk/drivers/net/sfc/filter.c b/trunk/drivers/net/sfc/filter.c
@@ -657,11 +657,11 @@ int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
 		return -EPROTONOSUPPORT;
 
 	/* RFS must validate the IP header length before calling us */
-	EFX_BUG_ON_PARANOID(!pskb_may_pull(skb, nhoff + sizeof(*ip)));
+	EFX_BUG_ON_PARANOID(skb_headlen(skb) < nhoff + sizeof(*ip));
 	ip = (const struct iphdr *)(skb->data + nhoff);
 	if (ip_is_fragment(ip))
 		return -EPROTONOSUPPORT;
-	EFX_BUG_ON_PARANOID(!pskb_may_pull(skb, nhoff + 4 * ip->ihl + 4));
+	EFX_BUG_ON_PARANOID(skb_headlen(skb) < nhoff + 4 * ip->ihl + 4);
 	ports = (const __be16 *)(skb->data + nhoff + 4 * ip->ihl);
 
 	efx_filter_init_rx(&spec, EFX_FILTER_PRI_HINT, 0, rxq_index);