]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
team: set dev->needed_headroom in team_setup_by_port()
authorEric Dumazet <edumazet@google.com>
Fri, 25 Sep 2020 13:38:08 +0000 (06:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Oct 2020 07:46:22 +0000 (09:46 +0200)
commit 89d01748b2354e210b5d4ea47bc25a42a1b42c82 upstream.

Some devices set needed_headroom. If we ignore it, we might
end up crashing in various skb_push() for example in ipgre_header()
since some layers assume enough headroom has been reserved.

Fixes: 1d76efe1577b ("team: add support for non-ethernet devices")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/team/team.c

index d0943415aeff19bbb0a676d6cf2bd028462710c1..71dd9d69d6cbb7e6fd415cb7a357ccbec9b70301 100644 (file)
@@ -2038,6 +2038,7 @@ static void team_setup_by_port(struct net_device *dev,
        dev->header_ops = port_dev->header_ops;
        dev->type = port_dev->type;
        dev->hard_header_len = port_dev->hard_header_len;
+       dev->needed_headroom = port_dev->needed_headroom;
        dev->addr_len = port_dev->addr_len;
        dev->mtu = port_dev->mtu;
        memcpy(dev->broadcast, port_dev->broadcast, port_dev->addr_len);