]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: bonding: fix error return code of bond_neigh_init()
authorJia-Ju Bai <baijiaju1990@gmail.com>
Mon, 8 Mar 2021 03:11:02 +0000 (19:11 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Mar 2021 20:05:36 +0000 (12:05 -0800)
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>
drivers/net/bonding/bond_main.c

index 74cbbb22470b5ec22015bf5c7563a22edda0e1d3..456315bef3a8b7084960ab2e87a79cd09066b48b 100644 (file)
@@ -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,