Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 233c7df0 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

macvlan: fix passthru mode race between dev removal and rx path 



Currently, if macvlan in passthru mode is created and data are rxed and
you remove this device, following panic happens:

NULL pointer dereference at 0000000000000198
IP: [<ffffffffa0196058>] macvlan_handle_frame+0x153/0x1f7 [macvlan]

I'm using following script to trigger this:
<script>
while [ 1 ]
do
	ip link add link e1 name macvtap0 type macvtap mode passthru
	ip link set e1 up
	ip link set macvtap0 up
	IFINDEX=`ip link |grep macvtap0 | cut -f 1 -d ':'`
	cat /dev/tap$IFINDEX  >/dev/null &
	ip link del dev macvtap0
done
</script>

I run this script while "ping -f" is running on another machine to send
packets to e1 rx.

Reason of the panic is that list_first_entry() is blindly called in
macvlan_handle_frame() even if the list was empty. vlan is set to
incorrect pointer which leads to the crash.

I'm fixing this by protecting port->vlans list by rcu and by preventing
from getting incorrect pointer in case the list is empty.

Introduced by: commit eb06acdc "macvlan: Introduce 'passthru' mode to takeover the underlying device"

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb863b8b

drivers/net/macvlan.c

+4 −3
Original line number Diff line number Diff line
@@ -229,7 +229,8 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) 
	}



	if (port->passthru)

		vlan = list_first_entry(&port->vlans, struct macvlan_dev, list);

		vlan = list_first_or_null_rcu(&port->vlans,

					      struct macvlan_dev, list);

	else

		vlan = macvlan_hash_lookup(port, eth->h_dest);

	if (vlan == NULL)
@@ -814,7 +815,7 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, 
	if (err < 0)

		goto upper_dev_unlink;



	list_add_tail(&vlan->list, &port->vlans);

	list_add_tail_rcu(&vlan->list, &port->vlans);

	netif_stacked_transfer_operstate(lowerdev, dev);



	return 0;
@@ -842,7 +843,7 @@ void macvlan_dellink(struct net_device *dev, struct list_head *head) 
{

	struct macvlan_dev *vlan = netdev_priv(dev);



	list_del(&vlan->list);

	list_del_rcu(&vlan->list);

	unregister_netdevice_queue(dev, head);

	netdev_upper_dev_unlink(vlan->lowerdev, dev);

}