From 08583307f90338a0d5a8f542048462a3a996336f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 25 Jun 2011 00:22:08 +0100 Subject: [PATCH] --- yaml --- r: 256287 b: refs/heads/master c: 589327905cf0ce4402f7fb1ed29682f7ae68a82e h: refs/heads/master i: 256285: 43dac5d9c4b17538f5fa05712a52d44e51d035a6 256283: 5f28e1672832488cc9373d0ead89ab0eb134561a 256279: d27e22a962bb47fe97d94ae3be0e2a277838977d 256271: 244df51bac67bc75accb44c74ab9c5af87530d8f 256255: 2ecb7d69cf39be7a184b7c5ac8aea0f05ab0193a v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/filter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a1125a286cb9..5ec4f9588745 100644 --- 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 index 054f0a3d45a9..2b9636f96e05 100644 --- 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);