lkml.org 
[lkml]   [2011]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[05/55] gro: Only reset frag0 when skb can be pulled
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Herbert Xu <herbert@gondor.apana.org.au>

    commit 17dd759c67f21e34f2156abcf415e1f60605a188 upstream.

    Currently skb_gro_header_slow unconditionally resets frag0 and
    frag0_len. However, when we can't pull on the skb this leaves
    the GRO fields in an inconsistent state.

    This patch fixes this by only resetting those fields after the
    pskb_may_pull test.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    include/linux/netdevice.h | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/include/linux/netdevice.h
    +++ b/include/linux/netdevice.h
    @@ -1164,9 +1164,12 @@ static inline int skb_gro_header_hard(st
    static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
    unsigned int offset)
    {
    + if (!pskb_may_pull(skb, hlen))
    + return NULL;
    +
    NAPI_GRO_CB(skb)->frag0 = NULL;
    NAPI_GRO_CB(skb)->frag0_len = 0;
    - return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL;
    + return skb->data + offset;
    }

    static inline void *skb_gro_mac_header(struct sk_buff *skb)



    \
     
     \ /
      Last update: 2011-08-06 02:11    [W:0.020 / U:0.424 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site