Merge branch 'bonding-team-basic-dev-needed_headroom-support' (dc171dcf) · Commits · 戴 / test

Eric Dumazet says: ==================== bonding/team: basic dev->needed_headroom support Both bonding and team drivers support non-ethernet devices, but missed proper dev->needed_headroom initializations. syzbot found a crash caused by bonding, I mirrored the fix in team as well. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/bonding/bond_main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1315,6 +1315,7 @@ static void bond_setup_by_slave(struct net_device *bond_dev,

		bond_dev->type = slave_dev->type;
		bond_dev->hard_header_len = slave_dev->hard_header_len;
		bond_dev->needed_headroom = slave_dev->needed_headroom;
		bond_dev->addr_len = slave_dev->addr_len;

		memcpy(bond_dev->broadcast, slave_dev->broadcast,

drivers/net/team/team.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2112,6 +2112,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);

Admin message