linux-kernel - [PATCH NET-PREV 42/51] bond: Make master and slave relate to the same nd

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: <174265458458.356712.53205870622253635.stgit@pro.pro>
Date: Sat, 22 Mar 2025 17:43:04 +0300
From: Kirill Tkhai <tkhai@...ru>
To: netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org
Cc: tkhai@...ru
Subject: [PATCH NET-PREV 42/51] bond: Make master and slave relate to the same nd_lock

Signed-off-by: Kirill Tkhai <tkhai@...ru>
---
 drivers/net/bonding/bond_main.c    |    4 ++++
 drivers/net/bonding/bond_options.c |    4 ++++
 2 files changed, 8 insertions(+)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 96f5470a5f55..1140e01f72b8 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4490,6 +4490,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
 	struct ifbond __user *u_binfo = NULL;
 	struct ifslave k_sinfo;
 	struct ifslave __user *u_sinfo = NULL;
+	struct nd_lock *nd_lock, *nd_lock2;
 	struct bond_opt_value newval;
 	struct net *net;
 	int res = 0;
@@ -4538,7 +4539,10 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
 
 	switch (cmd) {
 	case SIOCBONDENSLAVE:
+		double_lock_netdev(bond_dev, &nd_lock, slave_dev, &nd_lock2);
+		nd_lock_transfer_devices(&nd_lock, &nd_lock2);
 		res = bond_enslave(bond_dev, slave_dev, NULL);
+		double_unlock_netdev(nd_lock, nd_lock2);
 		break;
 	case SIOCBONDRELEASE:
 		res = bond_release(bond_dev, slave_dev);
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 95d59a18c022..a3ebb8d6c529 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -1605,6 +1605,7 @@ static int bond_option_slaves_set(struct bonding *bond,
 				  const struct bond_opt_value *newval)
 {
 	char command[IFNAMSIZ + 1] = { 0, };
+	struct nd_lock *nd_lock, *nd_lock2;
 	struct net_device *dev;
 	char *ifname;
 	int ret;
@@ -1627,7 +1628,10 @@ static int bond_option_slaves_set(struct bonding *bond,
 	switch (command[0]) {
 	case '+':
 		slave_dbg(bond->dev, dev, "Enslaving interface\n");
+		double_lock_netdev(bond->dev, &nd_lock, dev, &nd_lock2);
+		nd_lock_transfer_devices(&nd_lock, &nd_lock2);
 		ret = bond_enslave(bond->dev, dev, NULL);
+		double_unlock_netdev(nd_lock, nd_lock2);
 		break;
 
 	case '-':