From mboxrd@z Thu Jan 1 00:00:00 1970 From: roopa@cumulusnetworks.com Subject: [PATCH net-next v2 2/2] bridge: modify bridge af spec parser to accomodate vlan list and ranges Date: Wed, 31 Dec 2014 08:48:53 -0800 Message-ID: <1420044533-16963-3-git-send-email-roopa@cumulusnetworks.com> Cc: sfeldma@gmail.com, wkok@cumulusnetworks.com, Roopa Prabhu To: netdev@vger.kernel.org, hemminger@vyatta.com, vyasevic@redhat.com Return-path: Received: from mail-pd0-f179.google.com ([209.85.192.179]:59358 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751080AbaLaQtA (ORCPT ); Wed, 31 Dec 2014 11:49:00 -0500 Received: by mail-pd0-f179.google.com with SMTP id fp1so21195177pdb.38 for ; Wed, 31 Dec 2014 08:48:59 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: From: Roopa Prabhu This patch modifies br_afspec to parse incoming IFLA_BRIDGE_VLAN_INFO_LIST Signed-off-by: Roopa Prabhu --- net/bridge/br_netlink.c | 115 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 85 insertions(+), 30 deletions(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 492ef6a..bcba9d2 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -226,53 +226,108 @@ static const struct nla_policy ifla_br_policy[IFLA_MAX+1] = { [IFLA_BRIDGE_VLAN_INFO_LIST] = { .type = NLA_NESTED, }, }; +static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p, + int cmd, struct bridge_vlan_info *vinfo) +{ + int err = 0; + + switch (cmd) { + case RTM_SETLINK: + if (p) { + err = nbp_vlan_add(p, vinfo->vid, vinfo->flags); + if (err) + break; + + if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER) + err = br_vlan_add(p->br, vinfo->vid, + vinfo->flags); + } else { + err = br_vlan_add(br, vinfo->vid, vinfo->flags); + } + break; + + case RTM_DELLINK: + if (p) { + nbp_vlan_delete(p, vinfo->vid); + if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER) + br_vlan_delete(p->br, vinfo->vid); + } else { + br_vlan_delete(br, vinfo->vid); + } + break; + } + + return err; +} + static int br_afspec(struct net_bridge *br, struct net_bridge_port *p, struct nlattr *af_spec, int cmd) { struct nlattr *tb[IFLA_BRIDGE_MAX+1]; + struct nlattr *attr; int err = 0; + int rem; err = nla_parse_nested(tb, IFLA_BRIDGE_MAX, af_spec, ifla_br_policy); if (err) return err; if (tb[IFLA_BRIDGE_VLAN_INFO]) { - struct bridge_vlan_info *vinfo; - - vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]); - - if (!vinfo->vid || vinfo->vid >= VLAN_VID_MASK) - return -EINVAL; - - switch (cmd) { - case RTM_SETLINK: - if (p) { - err = nbp_vlan_add(p, vinfo->vid, vinfo->flags); - if (err) - break; - - if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER) - err = br_vlan_add(p->br, vinfo->vid, - vinfo->flags); - } else - err = br_vlan_add(br, vinfo->vid, vinfo->flags); - - break; - - case RTM_DELLINK: - if (p) { - nbp_vlan_delete(p, vinfo->vid); - if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER) - br_vlan_delete(p->br, vinfo->vid); - } else - br_vlan_delete(br, vinfo->vid); - break; + attr = tb[IFLA_BRIDGE_VLAN_INFO]; + if (nla_len(attr) != sizeof(struct bridge_vlan_info)) + goto err_inval; + + err = br_vlan_info(br, p, cmd, + (struct bridge_vlan_info *)nla_data(attr)); + + } else if (tb[IFLA_BRIDGE_VLAN_INFO_LIST]) { + struct bridge_vlan_info *vinfo_start = NULL; + struct bridge_vlan_info *vinfo = NULL; + + nla_for_each_nested(attr, tb[IFLA_BRIDGE_VLAN_INFO_LIST], rem) { + if (nla_len(attr) != sizeof(struct bridge_vlan_info) || + nla_type(attr) != IFLA_BRIDGE_VLAN_INFO) + goto err_inval; + vinfo = nla_data(attr); + if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_START) { + if (vinfo_start) + goto err_inval; + vinfo_start = vinfo; + continue; + } + + if (vinfo_start) { + int v; + + if (!(vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END)) + goto err_inval; + + if (vinfo->vid < vinfo_start->vid) + goto err_inval; + + for (v = vinfo_start->vid; v <= vinfo->vid; + v++) { + vinfo_start->vid = v; + err = br_vlan_info(br, p, cmd, + vinfo_start); + if (err) + break; + } + vinfo_start = NULL; + } else { + err = br_vlan_info(br, p, cmd, vinfo); + } + if (err) + break; } } return err; + +err_inval: + return -EINVAL; } static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = { -- 1.7.10.4