diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2017-06-07 10:25:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-07 10:25:30 +0200 |
| commit | 4c7aba46c9e82aa236502760a677e666589afead (patch) | |
| tree | 9baa94b072fa58c674c34b8ddaec8b9e727e1657 /net/bridge/br_netlink.c | |
| parent | ALSA: fireface: constify ALSA specific operations (diff) | |
| parent | ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT (diff) | |
| download | linux-dev-4c7aba46c9e82aa236502760a677e666589afead.tar.xz linux-dev-4c7aba46c9e82aa236502760a677e666589afead.zip | |
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
Diffstat (limited to 'net/bridge/br_netlink.c')
| -rw-r--r-- | net/bridge/br_netlink.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index c5ce7745b230..574f78824d8a 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -835,6 +835,13 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[]) return -EPROTONOSUPPORT; } } + + if (data[IFLA_BR_VLAN_DEFAULT_PVID]) { + __u16 defpvid = nla_get_u16(data[IFLA_BR_VLAN_DEFAULT_PVID]); + + if (defpvid >= VLAN_VID_MASK) + return -EINVAL; + } #endif return 0; |