summaryrefslogtreecommitdiff
path: root/drivers/net/team
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2020-09-25 16:38:08 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-14 10:51:12 +0300
commit37c0cdc3b2061ea4e57c680abecb8b0d37b06c26 (patch)
treebcad44d1f84cb3583ed1867b82cd6f2c9db55a96 /drivers/net/team
parent9775dd63d526c54c2a2d11155916e05f6ef7d14f (diff)
downloadlinux-37c0cdc3b2061ea4e57c680abecb8b0d37b06c26.tar.xz
team: set dev->needed_headroom in team_setup_by_port()
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>
Diffstat (limited to 'drivers/net/team')
-rw-r--r--drivers/net/team/team.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 396a8c6cb999..12e2eb418a14 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2078,6 +2078,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);