On 12/29/14, 1:40 PM, Scott Feldman wrote:

On Mon, Dec 29, 2014 at 1:05 PM,  [off-list ref] wrote:

quoted

From: Roopa Prabhu <redacted>

This patch changes bridge IFLA_AF_SPEC netlink attribute parser to
look for more than one IFLA_BRIDGE_VLAN_INFO attribute. This allows
userspace to pack more than one vlan in the setlink msg.

Signed-off-by: Roopa Prabhu <redacted>
---
  net/bridge/br_netlink.c |   18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 9f5eb55..75971b1 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c

@@ -230,18 +230,18 @@ static int br_afspec(struct net_bridge *br,
                      struct nlattr *af_spec,
                      int cmd)
  {
-       struct nlattr *tb[IFLA_BRIDGE_MAX+1];
+       struct bridge_vlan_info *vinfo;
         int err = 0;
+       struct nlattr *attr;
+       int err = 0;
+       int rem;
+       u16 vid;

-       err = nla_parse_nested(tb, IFLA_BRIDGE_MAX, af_spec, ifla_br_policy);

Removing this call orphans ifla_br_policy...should ifla_br_policy be removed?

good question. Its a good place to see the type. In-fact userspace 
programs also copy the same policy to parse netlink attributes. hmmm..
I would like to keep it if it does not throw a warning.

quoted

-       if (err)
-               return err;
-
-       if (tb[IFLA_BRIDGE_VLAN_INFO]) {
-               struct bridge_vlan_info *vinfo;
-
-               vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]);
+       nla_for_each_nested(attr, af_spec, rem) {
+               if (nla_type(attr) != IFLA_BRIDGE_VLAN_INFO)
+                       continue;

Need to validate size of attr is sizeof(struct bridge_vlan_info).

ack, will fix.

quoted

+               vinfo = nla_data(attr);
                 if (!vinfo->vid || vinfo->vid >= VLAN_VID_MASK)
                         return -EINVAL;

--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html