From: Greg Kroah-Hartman Date: Mon, 15 Mar 2021 12:35:11 +0000 (+0100) Subject: drop networking bonding patch. again. X-Git-Tag: v4.4.262~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=474c457f81c9ebeff86c1693fb1646d6819da5ec;p=thirdparty%2Fkernel%2Fstable-queue.git drop networking bonding patch. again. --- diff --git a/queue-5.10/net-bonding-fix-error-return-code-of-bond_neigh_init.patch b/queue-5.10/net-bonding-fix-error-return-code-of-bond_neigh_init.patch deleted file mode 100644 index 383c6f0f445..00000000000 --- a/queue-5.10/net-bonding-fix-error-return-code-of-bond_neigh_init.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 95947a3f8159e2a84e7623acd7e9d2dfac28f7ca 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 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, --- -2.30.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 3e7c8b052d9..1e258cd44af 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -242,7 +242,6 @@ sh_eth-fix-trscer-mask-for-r7s72100.patch cpufreq-qcom-hw-fix-dereferencing-freed-memory-data.patch cpufreq-qcom-hw-fix-return-value-check-in-qcom_cpufr.patch arm64-mm-fix-pfn_valid-for-zone_device-based-memory.patch -net-bonding-fix-error-return-code-of-bond_neigh_init.patch sunrpc-set-memalloc_nofs_save-for-sync-tasks.patch nfs-don-t-revalidate-the-directory-permissions-on-a-.patch nfs-don-t-gratuitously-clear-the-inode-cache-when-lo.patch 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 ea9ae1d16e2..00000000000 --- a/queue-5.11/net-bonding-fix-error-return-code-of-bond_neigh_init.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 765e6e4af62ed88ca52fd5eb58aeb363c94d4588 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 bb2dc1233c4..0b5a2940b30 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -242,7 +242,6 @@ net-macb-add-default-usrio-config-to-default-gem-con.patch cpufreq-qcom-hw-fix-dereferencing-freed-memory-data.patch cpufreq-qcom-hw-fix-return-value-check-in-qcom_cpufr.patch arm64-mm-fix-pfn_valid-for-zone_device-based-memory.patch -net-bonding-fix-error-return-code-of-bond_neigh_init.patch sunrpc-set-memalloc_nofs_save-for-sync-tasks.patch nfs-don-t-revalidate-the-directory-permissions-on-a-.patch nfs-don-t-gratuitously-clear-the-inode-cache-when-lo.patch diff --git a/queue-5.4/net-bonding-fix-error-return-code-of-bond_neigh_init.patch b/queue-5.4/net-bonding-fix-error-return-code-of-bond_neigh_init.patch deleted file mode 100644 index 60465507b45..00000000000 --- a/queue-5.4/net-bonding-fix-error-return-code-of-bond_neigh_init.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 496c2c03992a018b54092bee78b0ea9f5ba27fa9 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 2bc4cb9e3095..da6600255577 100644 ---- a/drivers/net/bonding/bond_main.c -+++ b/drivers/net/bonding/bond_main.c -@@ -3703,11 +3703,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.4/series b/queue-5.4/series index 8875d6ee5d0..9f547b6f5ef 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -142,7 +142,6 @@ staging-comedi-pcl711-fix-endian-problem-for-ai-command-data.patch staging-comedi-pcl818-fix-endian-problem-for-ai-command-data.patch sh_eth-fix-trscer-mask-for-r7s72100.patch arm64-mm-fix-pfn_valid-for-zone_device-based-memory.patch -net-bonding-fix-error-return-code-of-bond_neigh_init.patch sunrpc-set-memalloc_nofs_save-for-sync-tasks.patch nfs-don-t-revalidate-the-directory-permissions-on-a-.patch nfs-don-t-gratuitously-clear-the-inode-cache-when-lo.patch