diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-07-02 05:48:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-02 12:19:17 -0700 |
| commit | 462e1ead9296a8452499fb10cf3b51903ffe24ac (patch) | |
| tree | 7b09da8f3051c6c94f0acf2a7b992b8a62a723f9 | |
| parent | c4555d16d9d24b4a376b87817d264e16f00d08d8 (diff) | |
| download | blackbird-op-linux-462e1ead9296a8452499fb10cf3b51903ffe24ac.tar.gz blackbird-op-linux-462e1ead9296a8452499fb10cf3b51903ffe24ac.zip | |
bridge: vlan: fix usage of vlan 0 and 4095 again
Vlan ids 0 and 4095 were disallowed by commit:
8adff41c3d25 ("bridge: Don't use VID 0 and 4095 in vlan filtering")
but then the check was removed when vlan ranges were introduced by:
bdced7ef7838 ("bridge: support for multiple vlans and vlan ranges in setlink and dellink requests")
So reintroduce the vlan range check.
Before patch:
[root@testvm ~]# bridge vlan add vid 0 dev eth0 master
(succeeds)
After Patch:
[root@testvm ~]# bridge vlan add vid 0 dev eth0 master
RTNETLINK answers: Invalid argument
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fixes: bdced7ef7838 ("bridge: support for multiple vlans and vlan ranges in setlink and dellink requests")
Acked-by: Toshiaki Makita <toshiaki.makita1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_netlink.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 6b67ed3831de..364bdc98bd9b 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -457,6 +457,8 @@ static int br_afspec(struct net_bridge *br, 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; if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) { if (vinfo_start) return -EINVAL; |
