|
@@ -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,
|
|
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)
|