summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2020-09-25 06:38:08 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-14 09:46:22 +0200
commit2c67cd9cfbaac58c6506b89012689eb811b87988 (patch)
tree141797f7be596c29bfd052d1496da650b1fcb882
parent1e33ef76e155925b9ea4ad053eeb4a5dbfb6d811 (diff)
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>
-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 d0943415aeff..71dd9d69d6cb 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -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);