netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: bonding: fix error return code of bond_neigh_init()
@ 2021-03-08  3:11 Jia-Ju Bai
  2021-03-08 23:00 ` patchwork-bot+netdevbpf
  2021-03-10  9:24 ` Roi Dayan
  0 siblings, 2 replies; 6+ messages in thread
From: Jia-Ju Bai @ 2021-03-08  3:11 UTC (permalink / raw)
  To: j.vosburgh, vfalico, andy, davem, kuba; +Cc: netdev, linux-kernel, Jia-Ju Bai

When slave is NULL or slave_ops->ndo_neigh_setup is NULL, no error
return code of bond_neigh_init() is assigned.
To fix this bug, ret is assigned with -EINVAL in these cases.

Fixes: 9e99bfefdbce ("bonding: fix bond_neigh_init()")
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
 drivers/net/bonding/bond_main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 74cbbb22470b..456315bef3a8 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3978,11 +3978,15 @@ static int bond_neigh_init(struct neighbour *n)
 
 	rcu_read_lock();
 	slave = bond_first_slave_rcu(bond);
-	if (!slave)
+	if (!slave) {
+		ret = -EINVAL;
 		goto out;
+	}
 	slave_ops = slave->dev->netdev_ops;
-	if (!slave_ops->ndo_neigh_setup)
+	if (!slave_ops->ndo_neigh_setup) {
+		ret = -EINVAL;
 		goto out;
+	}
 
 	/* TODO: find another way [1] to implement this.
 	 * Passing a zeroed structure is fragile,
-- 
2.17.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-03-12 20:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-08  3:11 [PATCH] net: bonding: fix error return code of bond_neigh_init() Jia-Ju Bai
2021-03-08 23:00 ` patchwork-bot+netdevbpf
2021-03-10  9:24 ` Roi Dayan
2021-03-10  9:29   ` Jia-Ju Bai
2021-03-10 16:55   ` Eric Dumazet
2021-03-12 20:16     ` David Miller

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).