This is a note to let you know that I've just added the patch titled
Revert "net: bonding: fix error return code of bond_neigh_init()"
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-net-bonding-fix-error-return-code-of-bond_neigh_init.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 080bfa1e6d928a5d1f185cc44e5f3c251df06df5 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@xxxxxxxxxxxxx>
Date: Fri, 12 Mar 2021 12:15:03 -0800
Subject: Revert "net: bonding: fix error return code of bond_neigh_init()"
From: David S. Miller <davem@xxxxxxxxxxxxx>
commit 080bfa1e6d928a5d1f185cc44e5f3c251df06df5 upstream.
This reverts commit 2055a99da8a253a357bdfd359b3338ef3375a26c.
This change rejects legitimate configurations.
A slave doesn't need to exist nor implement ndo_slave_setup.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/bonding/bond_main.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3918,15 +3918,11 @@ static int bond_neigh_init(struct neighb
rcu_read_lock();
slave = bond_first_slave_rcu(bond);
- if (!slave) {
- ret = -EINVAL;
+ if (!slave)
goto out;
- }
slave_ops = slave->dev->netdev_ops;
- if (!slave_ops->ndo_neigh_setup) {
- ret = -EINVAL;
+ if (!slave_ops->ndo_neigh_setup)
goto out;
- }
/* TODO: find another way [1] to implement this.
* Passing a zeroed structure is fragile,
Patches currently in stable-queue which might be from davem@xxxxxxxxxxxxx are
queue-5.10/net-phy-broadcom-avoid-forward-for-bcm54xx_config_cl.patch
queue-5.10/net-sched-validate-stab-values.patch
queue-5.10/net-dsa-bcm_sf2-qualify-phydev-dev_flags-based-on-po.patch
queue-5.10/atm-idt77252-fix-null-ptr-dereference.patch
queue-5.10/revert-r8152-adjust-the-settings-about-mac-clock-spe.patch
queue-5.10/net-hisilicon-hns-fix-error-return-code-of-hns_nic_c.patch
queue-5.10/octeontx2-af-remove-tos-field-from-mkex-tx.patch
queue-5.10/netsec-restore-phy-power-state-after-controller-reset.patch
queue-5.10/macvlan-macvlan_count_rx-needs-to-be-aware-of-preemp.patch
queue-5.10/net-phy-introduce-phydev-port.patch
queue-5.10/selinux-vsock-set-sid-for-socket-returned-by-accept.patch
queue-5.10/selftests-net-fix-warnings-on-reuseaddr_ports_exhaus.patch
queue-5.10/selftests-forwarding-vxlan_bridge_1d-fix-vxlan-ecn-d.patch
queue-5.10/net-sched-cls_flower-fix-only-mask-bit-check-in-the-.patch
queue-5.10/ionic-linearize-tso-skb-with-too-many-frags.patch
queue-5.10/net-tehuti-fix-error-return-code-in-bdx_probe.patch
queue-5.10/net-cdc-phonet-fix-data-interface-release-on-probe-f.patch
queue-5.10/r8169-fix-dma-being-used-after-buffer-free-if-wol-is-enabled.patch
queue-5.10/ftgmac100-restart-mac-hw-once.patch
queue-5.10/sparc64-fix-opcode-filtering-in-handling-of-no-fault.patch
queue-5.10/octeontx2-af-fix-memory-leak-of-object-buf.patch
queue-5.10/net-phy-broadcom-set-proper-1000basex-sgmii-interfac.patch
queue-5.10/r8152-limit-the-rx-buffer-size-of-rtl8153a-for-usb-2.patch
queue-5.10/net-intel-iavf-fix-error-return-code-of-iavf_init_ge.patch
queue-5.10/flow_dissector-fix-byteorder-of-dissected-icmp-id.patch
queue-5.10/octeontx2-pf-clear-rss-enable-flag-on-interace-down.patch
queue-5.10/net-enetc-set-mac-rx-fifo-to-recommended-value.patch
queue-5.10/net-axienet-fix-probe-error-cleanup.patch
queue-5.10/net-check-all-name-nodes-in-__dev_alloc_name.patch
queue-5.10/net-wan-fix-error-return-code-of-uhdlc_init.patch
queue-5.10/revert-net-bonding-fix-error-return-code-of-bond_neigh_init.patch
queue-5.10/ipv6-fix-suspecious-rcu-usage-warning.patch
queue-5.10/net-qlcnic-fix-a-use-after-free-in-qlcnic_83xx_get_m.patch
queue-5.10/nfp-flower-fix-unsupported-pre_tunnel-flows.patch
queue-5.10/octeontx2-af-formatting-debugfs-entry-rsrc_alloc.patch
queue-5.10/tcp-relookup-sock-for-rst-ack-packets-handled-by-obs.patch
queue-5.10/nfp-flower-fix-pre_tun-mask-id-allocation.patch
queue-5.10/atm-eni-dont-release-is-never-initialized.patch
queue-5.10/net-bpf-fix-ip6ip6-crash-with-collect_md-populated-s.patch
queue-5.10/psample-fix-user-api-breakage.patch
queue-5.10/ipv6-weaken-the-v4mapped-source-check.patch
queue-5.10/atm-lanai-dont-run-lanai_dev_close-if-not-open.patch
queue-5.10/nfp-flower-add-ipv6-bit-to-pre_tunnel-control-messag.patch
queue-5.10/drop_monitor-perform-cleanup-upon-probe-registration.patch
queue-5.10/sun-niu-fix-wrong-rxmac_bc_frm_cnt_count-count.patch
queue-5.10/gianfar-fix-jumbo-packets-napi-rx-overrun-crash.patch
queue-5.10/net-ipa-terminate-message-handler-arrays.patch
queue-5.10/net-phylink-fix-phylink_err-function-name-error-in-p.patch
queue-5.10/ch_ktls-fix-enum-conversion-warning.patch
queue-5.10/net-stmmac-dwmac-sun8i-provide-tx-and-rx-fifo-sizes.patch
queue-5.10/net-dsa-b53-vlan-filtering-is-global-to-all-users.patch
queue-5.10/net-phy-broadcom-fix-rgmii-delays-for-bcm50160-and-b.patch
queue-5.10/octeontx2-af-fix-irq-free-in-rvu-teardown.patch
queue-5.10/tipc-better-validate-user-input-in-tipc_nl_retrieve_.patch
queue-5.10/net-consolidate-common-blackhole-dst-ops.patch
queue-5.10/net-phy-broadcom-add-power-down-exit-reset-state-del.patch
queue-5.10/net-hdlc_x25-prevent-racing-between-x25_close-and-x2.patch
queue-5.10/net-davicom-use-platform_get_irq_optional.patch
queue-5.10/octeontx2-af-fix-infinite-loop-in-unmapping-npc-coun.patch
queue-5.10/net-qrtr-fix-a-kernel-infoleak-in-qrtr_recvmsg.patch
queue-5.10/atm-upd98402-fix-incorrect-allocation.patch
queue-5.10/net-bridge-don-t-notify-switchdev-for-local-fdb-addr.patch
