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

Commit 87aaf2ca authored Oct 12, 2015 by Nikolay Aleksandrov Committed by David S. Miller Oct 13, 2015

switchdev: check if the vlan id is in the proper vlan range



VLANs 0 and 4095 are reserved and shouldn't be used, add checks to
switchdev similar to the bridge. Also make sure ids above 4095 cannot
be passed either.

Fixes: 47f8328b ("switchdev: add new switchdev bridge setlink")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1f225031

net/switchdev/switchdev.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include <linux/notifier.h>
		#include <linux/netdevice.h>
		#include <linux/if_bridge.h>
		#include <linux/if_vlan.h>
		#include <net/ip_fib.h>
		#include <net/switchdev.h>

		@@ -634,6 +635,8 @@ static int switchdev_port_br_afspec(struct net_device *dev,
		if (nla_len(attr) != sizeof(struct bridge_vlan_info))
		return -EINVAL;
		vinfo = nla_data(attr);
		if (!vinfo->vid \|\| vinfo->vid >= VLAN_VID_MASK)
		return -EINVAL;
		vlan->flags = vinfo->flags;
		if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
		if (vlan->vid_begin)