[lkml]   [2011]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH] [40/106] gro: Reset dev pointer on reuse
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    From: Herbert Xu <>

    commit 66c46d741e2e60f0e8b625b80edb0ab820c46d7a upstream.

    On older kernels the VLAN code may zero skb->dev before dropping
    it and causing it to be reused by GRO.

    Unfortunately we didn't reset skb->dev in that case which causes
    the next GRO user to get a bogus skb->dev pointer.

    This particular problem no longer happens with the current upstream
    kernel due to changes in VLAN processing.

    However, for correctness we should still reset the skb->dev pointer
    in the GRO reuse function in case a future user does the same thing.

    Signed-off-by: Herbert Xu <>
    Signed-off-by: David S. Miller <>
    Signed-off-by: Brandon Philips <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>

    net/core/dev.c | 1 +
    1 file changed, 1 insertion(+)

    Index: linux-2.6.35.y/net/core/dev.c
    --- linux-2.6.35.y.orig/net/core/dev.c
    +++ linux-2.6.35.y/net/core/dev.c
    @@ -3231,6 +3231,7 @@ void napi_reuse_skb(struct napi_struct *
    __skb_pull(skb, skb_headlen(skb));
    skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
    + skb->dev = napi->dev;

    napi->skb = skb;

     \ /
      Last update: 2011-04-26 23:35    [W:0.023 / U:1.304 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site