diff options
| author | Jia-Ju Bai <baijiaju1990@gmail.com> | 2021-03-07 19:11:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-25 09:04:13 +0100 |
| commit | 9392b8219b62b0536df25c9de82b33f8a00881ef (patch) | |
| tree | 024430667e93a1ff4d9703023a32f40b7263cc95 /drivers | |
| parent | 76f496681d6a125d28321deda355ca14d0e4ad23 (diff) | |
| download | kernel_replicant_linux-9392b8219b62b0536df25c9de82b33f8a00881ef.tar.gz kernel_replicant_linux-9392b8219b62b0536df25c9de82b33f8a00881ef.tar.bz2 kernel_replicant_linux-9392b8219b62b0536df25c9de82b33f8a00881ef.zip | |
net: bonding: fix error return code of bond_neigh_init()
[ Upstream commit 2055a99da8a253a357bdfd359b3338ef3375a26c ]
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 47afc5938c26..6d5a39af1097 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3918,11 +3918,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, |