Commit ce9a4186 authored Mar 09, 2020 by Mahesh Bandewar Committed by David S. Miller Mar 09, 2020

macvlan: add cond_resched() during multicast processing



The Rx bound multicast packets are deferred to a workqueue and
macvlan can also suffer from the same attack that was discovered
by Syzbot for IPvlan. This solution is not as effective as in
IPvlan. IPvlan defers all (Tx and Rx) multicast packet processing
to a workqueue while macvlan does this way only for the Rx. This
fix should address the Rx codition to certain extent.

Tx is still suseptible. Tx multicast processing happens when
.ndo_start_xmit is called, hence we cannot add cond_resched().
However, it's not that severe since the user which is generating
 / flooding will be affected the most.

Fixes: 412ca155 ("macvlan: Move broadcasts into a work queue")
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e18b353f

drivers/net/macvlan.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,8 @@ static void macvlan_process_broadcast(struct work_struct *w)
		if (src)
		dev_put(src->dev);
		consume_skb(skb);

		cond_resched();
		}
		}

Admin message