stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org,
	Fernando Fernandez Mancera <ffmancera@riseup.net>,
	Jay Vosburgh <jay.vosburgh@canonical.com>,
	Jakub Kicinski <kuba@kernel.org>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.4 06/17] bonding: fix ad_actor_system option setting to default
Date: Mon, 27 Dec 2021 16:27:01 +0100	[thread overview]
Message-ID: <20211227151316.166037116@linuxfoundation.org> (raw)
In-Reply-To: <20211227151315.962187770@linuxfoundation.org>

From: Fernando Fernandez Mancera <ffmancera@riseup.net>

[ Upstream commit 1c15b05baea71a5ff98235783e3e4ad227760876 ]

When 802.3ad bond mode is configured the ad_actor_system option is set to
"00:00:00:00:00:00". But when trying to set the all-zeroes MAC as actors'
system address it was failing with EINVAL.

An all-zeroes ethernet address is valid, only multicast addresses are not
valid values.

Fixes: 171a42c38c6e ("bonding: add netlink support for sys prio, actor sys mac, and port key")
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Link: https://lore.kernel.org/r/20211221111345.2462-1-ffmancera@riseup.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 Documentation/networking/bonding.txt | 11 ++++++-----
 drivers/net/bonding/bond_options.c   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index 334b49ef02d13..5a6e70483cedf 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -191,11 +191,12 @@ ad_actor_sys_prio
 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.
+	protocol packet exchanges (LACPDUs). The value cannot be a multicast
+	address. If the all-zeroes MAC is specified, bonding will internally
+	use the MAC of the bond itself. 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.
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 1022e80aaf974..1d95a83d2baeb 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -1407,7 +1407,7 @@ static int bond_option_ad_actor_system_set(struct bonding *bond,
 		mac = (u8 *)&newval->value;
 	}
 
-	if (!is_valid_ether_addr(mac))
+	if (is_multicast_ether_addr(mac))
 		goto err;
 
 	netdev_info(bond->dev, "Setting ad_actor_system to %pM\n", mac);
-- 
2.34.1




  parent reply	other threads:[~2021-12-27 15:28 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-27 15:26 [PATCH 4.4 00/17] 4.4.297-rc1 review Greg Kroah-Hartman
2021-12-27 15:26 ` [PATCH 4.4 01/17] net: usb: lan78xx: add Allied Telesis AT29M2-AF Greg Kroah-Hartman
2021-12-27 15:26 ` [PATCH 4.4 02/17] can: kvaser_usb: get CAN clock frequency from device Greg Kroah-Hartman
2021-12-27 15:26 ` [PATCH 4.4 03/17] HID: holtek: fix mouse probing Greg Kroah-Hartman
2021-12-27 15:26 ` [PATCH 4.4 04/17] IB/qib: Fix memory leak in qib_user_sdma_queue_pkts() Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 05/17] qlcnic: potential dereference null pointer of rx_queue->page_ring Greg Kroah-Hartman
2021-12-27 15:27 ` Greg Kroah-Hartman [this message]
2021-12-27 15:27 ` [PATCH 4.4 07/17] drivers: net: smc911x: Check for error irq Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 08/17] hwmon: (lm90) Fix usage of CONFIG2 register in detect function Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 09/17] ALSA: jack: Check the return value of kstrdup() Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 10/17] ALSA: drivers: opl3: Fix incorrect use of vp->state Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 11/17] ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 12/17] xen/blkfront: fix bug in backported patch Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 13/17] Input: i8042 - enable deferred probe quirk for ASUS UM325UA Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 14/17] ax25: NPD bug when detaching AX25 device Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 15/17] hamradio: defer ax25 kfree after unregister_netdev Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 16/17] hamradio: improve the incomplete fix to avoid NPD Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.4 17/17] phonet/pep: refuse to enable an unbound pipe Greg Kroah-Hartman
2021-12-27 21:16 ` [PATCH 4.4 00/17] 4.4.297-rc1 review Pavel Machek
2021-12-28 17:05 ` Guenter Roeck
2021-12-28 17:16 ` Naresh Kamboju
2021-12-28 21:30 ` Shuah Khan
2022-01-19 10:28 ` 4.4 series end of line was " Pavel Machek
2022-01-19 10:32   ` Greg Kroah-Hartman
2022-01-19 13:49     ` Pavel Machek
2022-01-19 18:03       ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211227151316.166037116@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=ffmancera@riseup.net \
    --cc=jay.vosburgh@canonical.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).