diff options
| author |   Jia-Ju Bai <baijiaju1990@gmail.com> | 2021-03-07 19:11:02 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-03-08 12:05:36 -0800 |
| commit | 2055a99da8a253a357bdfd359b3338ef3375a26c (patch) | |
| tree | 455b9767f08f89d7a476c0055c7fa28552131c90 /drivers/net/bonding | |
| parent | net: enetc: allow hardware timestamping on TX queues with tc-etf enabled (diff) | |
| download | linux-dev-2055a99da8a253a357bdfd359b3338ef3375a26c.tar.xz linux-dev-2055a99da8a253a357bdfd359b3338ef3375a26c.zip | |
net: bonding: fix error return code of bond_neigh_init()
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>
Diffstat (limited to 'drivers/net/bonding')
| -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 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, |