netdev - [PATCH net v2 1/4] bonding: add bond_ether

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20230314111426.1254998-2-razor@blackwall.org>
Date:   Tue, 14 Mar 2023 13:14:23 +0200
From:   Nikolay Aleksandrov <razor@...ckwall.org>
To:     netdev@...r.kernel.org
Cc:     monis@...taire.com, syoshida@...hat.com, j.vosburgh@...il.com,
        andy@...yhouse.net, kuba@...nel.org, davem@...emloft.net,
        pabeni@...hat.com, edumazet@...gle.com,
        syzbot+9dfc3f3348729cc82277@...kaller.appspotmail.com,
        Nikolay Aleksandrov <razor@...ckwall.org>
Subject: [PATCH net v2 1/4] bonding: add bond_ether_setup helper

Add bond_ether_setup helper which will be used in the following patches
to fix all ether_setup() calls in the bonding driver. It takes care of both
IFF_MASTER and IFF_SLAVE flags, the former is always restored and the
latter only if it was set.

Fixes: e36b9d16c6a6d ("bonding: clean muticast addresses when device changes type")
Fixes: 7d5cd2ce5292 ("bonding: correctly handle bonding type change on enslave failure")
Signed-off-by: Nikolay Aleksandrov <razor@...ckwall.org>
---
 drivers/net/bonding/bond_main.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 00646aa315c3..d41024ad2c18 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1775,6 +1775,18 @@ void bond_lower_state_changed(struct slave *slave)
 		slave_err(bond_dev, slave_dev, "Error: %s\n", errmsg);	\
 } while (0)
 
+/* ether_setup() resets bond_dev's flags so we always have to restore
+ * IFF_MASTER, and only restore IFF_SLAVE if it was set
+ */
+static void bond_ether_setup(struct net_device *bond_dev)
+{
+	unsigned int slave_flag = bond_dev->flags & IFF_SLAVE;
+
+	ether_setup(bond_dev);
+	bond_dev->flags |= IFF_MASTER | slave_flag;
+	bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;
+}
+
 /* enslave device <slave> to bond device <master> */
 int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
 		 struct netlink_ext_ack *extack)
-- 
2.39.2