From: Greg Kroah-Hartman Date: Fri, 19 Mar 2021 14:37:19 +0000 (+0100) Subject: drop net-bonding-fix-error-return-code-of-bond_neigh_init.patch from 5.11 X-Git-Tag: v4.19.182~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1902a1894137ee7866f0ea5801f4421e43e73f71;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-bonding-fix-error-return-code-of-bond_neigh_init.patch from 5.11 --- diff --git a/queue-5.11/net-bonding-fix-error-return-code-of-bond_neigh_init.patch b/queue-5.11/net-bonding-fix-error-return-code-of-bond_neigh_init.patch deleted file mode 100644 index 1652fb154e1..00000000000 --- a/queue-5.11/net-bonding-fix-error-return-code-of-bond_neigh_init.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3d4ed58e5471feb504a2eb05432ad23b95ff655e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 7 Mar 2021 19:11:02 -0800 -Subject: net: bonding: fix error return code of bond_neigh_init() - -From: Jia-Ju Bai - -[ 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 -Signed-off-by: Jia-Ju Bai -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - 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 5fe5232cc3f3..fba6b6d1b430 100644 ---- a/drivers/net/bonding/bond_main.c -+++ b/drivers/net/bonding/bond_main.c -@@ -3917,11 +3917,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.30.1 - diff --git a/queue-5.11/series b/queue-5.11/series index 2bb5d8db35c..acbe65d042f 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -9,7 +9,6 @@ io_uring-refactor-io_cqring_wait.patch io_uring-don-t-keep-looping-for-more-events-if-we-ca.patch io_uring-simplify-do_read-return-parsing.patch io_uring-clear-iocb_waitq-for-non-eiocbqueued-return.patch -net-bonding-fix-error-return-code-of-bond_neigh_init.patch regulator-pca9450-add-sd_vsel-gpio-for-ldo5.patch regulator-pca9450-enable-system-reset-on-wdog_b-asse.patch regulator-pca9450-clear-preset_en-bit-to-fix-buck1-2.patch