Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74514957 authored by Mahesh Bandewar's avatar Mahesh Bandewar Committed by David S. Miller
Browse files

bonding: Allow userspace to set actors' macaddr in an AD-system. 



In an AD system, the communication between actor and partner is the
business between these two entities. In the current setup anyone on the
same L2 can "guess" the LACPDU contents and then possibly send the
spoofed LACPDUs and trick the partner causing connectivity issues for
the AD system. This patch allows to use a random mac-address obscuring
it's identity making it harder for someone in the L2 is do the same thing.

This patch allows user-space to choose the mac-address for the AD-system.
This mac-address can not be NULL or a Multicast. If the mac-address is set
from user-space; kernel will honor it and will not overwrite it. In the
absence (value from user space); the logic will default to using the
masters' mac as the mac-address for the AD-system.

It can be set using example code below -

   # modprobe bonding mode=4
   # sys_mac_addr=$(printf '%02x:%02x:%02x:%02x:%02x:%02x' \
                    $(( (RANDOM & 0xFE) | 0x02 )) \
                    $(( RANDOM & 0xFF )) \
                    $(( RANDOM & 0xFF )) \
                    $(( RANDOM & 0xFF )) \
                    $(( RANDOM & 0xFF )) \
                    $(( RANDOM & 0xFF )))
   # echo $sys_mac_addr > /sys/class/net/bond0/bonding/ad_actor_system
   # echo +eth1 > /sys/class/net/bond0/bonding/slaves
   ...
   # ip link set bond0 up

Signed-off-by: default avatarMahesh Bandewar <maheshb@google.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
[jt: fixed up style issues reported by checkpatch]
Signed-off-by: default avatarJonathan Toppins <jtoppins@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6791e466

Documentation/networking/bonding.txt

+12 −0
Original line number Diff line number Diff line
@@ -187,6 +187,18 @@ ad_actor_sys_prio 
	This parameter has effect only in 802.3ad mode and is available through

	SysFs interface.



ad_actor_system



	In an AD system, this specifies the mac-address for the actor in

	protocol packet exchanges (LACPDUs). The value cannot be NULL or

	multicast. It is preferred to have the local-admin bit set for this

	mac but driver does not enforce it. If the value is not given then

	system defaults to using the masters' mac address as actors' system

	address.



	This parameter has effect only in 802.3ad mode and is available through

	SysFs interface.



ad_select



	Specifies the 802.3ad aggregation selection logic to use.  The

drivers/net/bonding/bond_3ad.c

+6 −1
Original line number Diff line number Diff line
@@ -1910,7 +1910,12 @@ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution) 


		BOND_AD_INFO(bond).system.sys_priority =

			bond->params.ad_actor_sys_prio;

		BOND_AD_INFO(bond).system.sys_mac_addr = *((struct mac_addr *)bond->dev->dev_addr);

		if (is_zero_ether_addr(bond->params.ad_actor_system))

			BOND_AD_INFO(bond).system.sys_mac_addr =

			    *((struct mac_addr *)bond->dev->dev_addr);

		else

			BOND_AD_INFO(bond).system.sys_mac_addr =

			    *((struct mac_addr *)bond->params.ad_actor_system);



		/* initialize how many times this module is called in one

		 * second (should be about every 100ms)

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -4474,6 +4474,7 @@ static int bond_check_params(struct bond_params *params) 
	params->packets_per_slave = packets_per_slave;

	params->tlb_dynamic_lb = 1; /* Default value */

	params->ad_actor_sys_prio = ad_actor_sys_prio;

	eth_zero_addr(params->ad_actor_system);

	if (packets_per_slave > 0) {

		params->reciprocal_packets_per_slave =

			reciprocal_value(packets_per_slave);

drivers/net/bonding/bond_options.c

+27 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ static int bond_option_tlb_dynamic_lb_set(struct bonding *bond, 
				  const struct bond_opt_value *newval);

static int bond_option_ad_actor_sys_prio_set(struct bonding *bond,

					     const struct bond_opt_value *newval);

static int bond_option_ad_actor_system_set(struct bonding *bond,

					   const struct bond_opt_value *newval);





static const struct bond_opt_value bond_mode_tbl[] = {
@@ -396,6 +398,13 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = { 
		.values = bond_ad_actor_sys_prio_tbl,

		.set = bond_option_ad_actor_sys_prio_set,

	},

	[BOND_OPT_AD_ACTOR_SYSTEM] = {

		.id = BOND_OPT_AD_ACTOR_SYSTEM,

		.name = "ad_actor_system",

		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),

		.flags = BOND_OPTFLAG_RAWVAL | BOND_OPTFLAG_IFDOWN,

		.set = bond_option_ad_actor_system_set,

	},

};



/* Searches for an option by name */
@@ -1375,3 +1384,21 @@ static int bond_option_ad_actor_sys_prio_set(struct bonding *bond, 
	bond->params.ad_actor_sys_prio = newval->value;

	return 0;

}



static int bond_option_ad_actor_system_set(struct bonding *bond,

					   const struct bond_opt_value *newval)

{

	u8 macaddr[ETH_ALEN];

	int i;



	i = sscanf(newval->string, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",

		   &macaddr[0], &macaddr[1], &macaddr[2],

		   &macaddr[3], &macaddr[4], &macaddr[5]);

	if (i != ETH_ALEN || !is_valid_ether_addr(macaddr)) {

		netdev_err(bond->dev, "Invalid MAC address.\n");

		return -EINVAL;

	}



	ether_addr_copy(bond->params.ad_actor_system, macaddr);

	return 0;

}

drivers/net/bonding/bond_procfs.c

+6 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ static void bond_info_show_master(struct seq_file *seq) 
			   optval->string);

		seq_printf(seq, "System priority: %d\n",

			   BOND_AD_INFO(bond).system.sys_priority);

		seq_printf(seq, "System MAC address: %pM\n",

			   &BOND_AD_INFO(bond).system.sys_mac_addr);



		if (__bond_3ad_get_active_agg_info(bond, &ad_info)) {

			seq_printf(seq, "bond %s has no active aggregator\n",
@@ -200,6 +202,8 @@ static void bond_info_show_slave(struct seq_file *seq, 
			seq_puts(seq, "details actor lacp pdu:\n");

			seq_printf(seq, "    system priority: %d\n",

				   port->actor_system_priority);

			seq_printf(seq, "    system mac address: %pM\n",

				   &port->actor_system);

			seq_printf(seq, "    port key: %d\n",

				   port->actor_oper_port_key);

			seq_printf(seq, "    port priority: %d\n",
@@ -212,6 +216,8 @@ static void bond_info_show_slave(struct seq_file *seq, 
			seq_puts(seq, "details partner lacp pdu:\n");

			seq_printf(seq, "    system priority: %d\n",

				   port->partner_oper.system_priority);

			seq_printf(seq, "    system mac address: %pM\n",

				   &port->partner_oper.system);

			seq_printf(seq, "    oper key: %d\n",

				   port->partner_oper.key);

			seq_printf(seq, "    port priority: %d\n",