lkml.org 
[lkml]   [2011]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[28/70] vlan: should take into account needed_headroom
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

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


    From: Eric Dumazet <eric.dumazet@gmail.com>

    [ Upstream commit d870bfb9d366c5d466c0f5419a4ec95a3f71ea8a ]

    Commit c95b819ad7 (gre: Use needed_headroom)
    made gre use needed_headroom instead of hard_header_len

    This uncover a bug in vlan code.

    We should make sure vlan devices take into account their
    real_dev->needed_headroom or we risk a crash in ipgre_header(), because
    we dont have enough room to push IP header in skb.

    Reported-by: Diddi Oscarsson <diddi@diddi.se>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Cc: Patrick McHardy <kaber@trash.net>
    Cc: Herbert Xu <herbert@gondor.apana.org.au>
    Acked-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>
    ---
    net/8021q/vlan_dev.c | 1 +
    1 file changed, 1 insertion(+)

    --- a/net/8021q/vlan_dev.c
    +++ b/net/8021q/vlan_dev.c
    @@ -707,6 +707,7 @@ static int vlan_dev_init(struct net_devi
    dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid;
    #endif

    + dev->needed_headroom = real_dev->needed_headroom;
    if (real_dev->features & NETIF_F_HW_VLAN_TX) {
    dev->header_ops = real_dev->header_ops;
    dev->hard_header_len = real_dev->hard_header_len;



    \
     
     \ /
      Last update: 2011-04-19 22:29    [W:0.020 / U:59.684 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site