Commit 87aaf2ca authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller

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: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: default avatarScott Feldman <sfeldma@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f225031
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <linux/if_vlan.h>
#include <net/ip_fib.h> #include <net/ip_fib.h>
#include <net/switchdev.h> #include <net/switchdev.h>
...@@ -634,6 +635,8 @@ static int switchdev_port_br_afspec(struct net_device *dev, ...@@ -634,6 +635,8 @@ static int switchdev_port_br_afspec(struct net_device *dev,
if (nla_len(attr) != sizeof(struct bridge_vlan_info)) if (nla_len(attr) != sizeof(struct bridge_vlan_info))
return -EINVAL; return -EINVAL;
vinfo = nla_data(attr); vinfo = nla_data(attr);
if (!vinfo->vid || vinfo->vid >= VLAN_VID_MASK)
return -EINVAL;
vlan->flags = vinfo->flags; vlan->flags = vinfo->flags;
if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) { if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
if (vlan->vid_begin) if (vlan->vid_begin)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment