From: Alexander Grund <theflamefire89@gmail.com>
To: cip-dev@lists.cip-project.org
Cc: uli+cip@fpond.eu
Subject: [PATCH 4.4] bonding: Break instead of returning in alb_send_learning_packets
Date: Sat, 23 Mar 2024 13:43:01 +0100 [thread overview]
Message-ID: <20240323124301.250422-1-theflamefire89@gmail.com> (raw)
From: Alexander Grund <flamefire89@gmail.com>
The upstream commit used a function which upon returning an error value
would break out of the surrounding loop.
In 4.4.x the loop is inside the function alb_send_learning_packets
hence returning would be wrong as it will skip the rcu_read_unlock.
Moreover returning a value from a void function doesn't even compile.
Fixes d6b83f1e (bonding: return -ENOMEM instead of BUG in alb_upper_dev_walk)
Signed-off-by: Alexander Grund <flamefire89@gmail.com>
---
drivers/net/bonding/bond_alb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 5321de9d80f7e..25943d6b04e12 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -986,7 +986,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],
if (netif_is_macvlan(upper) && !strict_match) {
tags = bond_verify_device_path(bond->dev, upper, 0);
if (IS_ERR_OR_NULL(tags))
- return -ENOMEM;
+ break;
alb_send_lp_vid(slave, upper->dev_addr,
tags[0].vlan_proto, tags[0].vlan_id);
--
2.40.1
next reply other threads:[~2024-03-23 12:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-23 12:43 Alexander Grund [this message]
2024-04-04 12:46 ` [PATCH 4.4] bonding: Break instead of returning in alb_send_learning_packets Ulrich Hecht
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=20240323124301.250422-1-theflamefire89@gmail.com \
--to=theflamefire89@gmail.com \
--cc=cip-dev@lists.cip-project.org \
--cc=uli+cip@fpond.eu \
/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