Commit dd912306 authored May 07, 2020 by Cong Wang Committed by David S. Miller May 07, 2020

net: fix a potential recursive NETDEV_FEAT_CHANGE



syzbot managed to trigger a recursive NETDEV_FEAT_CHANGE event
between bonding master and slave. I managed to find a reproducer
for this:

  ip li set bond0 up
  ifenslave bond0 eth0
  brctl addbr br0
  ethtool -K eth0 lro off
  brctl addif br0 bond0
  ip li set br0 up

When a NETDEV_FEAT_CHANGE event is triggered on a bonding slave,
it captures this and calls bond_compute_features() to fixup its
master's and other slaves' features. However, when syncing with
its lower devices by netdev_sync_lower_features() this event is
triggered again on slaves when the LRO feature fails to change,
so it goes back and forth recursively until the kernel stack is
exhausted.

Commit 17b85d29 intentionally lets __netdev_update_features()
return -1 for such a failure case, so we have to just rely on
the existing check inside netdev_sync_lower_features() and skip
NETDEV_FEAT_CHANGE event only for this specific failure case.

Fixes: fd867d51 ("net/core: generic support for disabling netdev features down stack")
Reported-by:  <syzbot+e73ceacfd8560cc8a3ca@syzkaller.appspotmail.com>
Reported-by:  <syzbot+c2fb6f9ddcea95ba49b5@syzkaller.appspotmail.com>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Jann Horn <jannh@google.com>
Reviewed-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7d14b0d2

net/core/dev.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -8907,11 +8907,13 @@ static void netdev_sync_lower_features(struct net_device *upper,
		netdev_dbg(upper, "Disabling feature %pNF on lower dev %s.\n",
		&feature, lower->name);
		lower->wanted_features &= ~feature;
		netdev_update_features(lower);
		__netdev_update_features(lower);

		if (unlikely(lower->features & feature))
		netdev_WARN(upper, "failed to disable %pNF on %s!\n",
		&feature, lower->name);
		else
		netdev_features_change(lower);
		}
		}
		}

Admin message