datapath: Correctly validate vport attributes on old kernels.

The vport policy for OVS_VPORT_ATTR_PORT_NO and OVS_VPORT_ATTR_TYPE
are present only in the section for newer kernels.  This means that
on older kernels the length of these attributes are never checked
anywhere but we go ahead and read from them anyways.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 5bc0cc9..668d2ff 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1619,14 +1619,14 @@ static struct genl_ops dp_datapath_genl_ops[] = {
 static const struct nla_policy vport_policy[ODP_VPORT_ATTR_MAX + 1] = {
 #ifdef HAVE_NLA_NUL_STRING
        [ODP_VPORT_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
-       [ODP_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 },
-       [ODP_VPORT_ATTR_TYPE] = { .type = NLA_U32 },
        [ODP_VPORT_ATTR_STATS] = { .len = sizeof(struct rtnl_link_stats64) },
        [ODP_VPORT_ATTR_ADDRESS] = { .len = ETH_ALEN },
 #else
        [ODP_VPORT_ATTR_STATS] = { .minlen = sizeof(struct rtnl_link_stats64) },
        [ODP_VPORT_ATTR_ADDRESS] = { .minlen = ETH_ALEN },
 #endif
+       [ODP_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 },
+       [ODP_VPORT_ATTR_TYPE] = { .type = NLA_U32 },
        [ODP_VPORT_ATTR_MTU] = { .type = NLA_U32 },
        [ODP_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED },
 };