]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: remove the unnecessary strict_start_type in some policies
authorXin Long <lucien.xin@gmail.com>
Thu, 21 Nov 2019 10:08:38 +0000 (18:08 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Nov 2019 19:46:18 +0000 (11:46 -0800)
ct_policy and mpls_policy are parsed with nla_parse_nested(), which
does NL_VALIDATE_STRICT validation, strict_start_type is not needed
to set as it is actually trying to make some attributes parsed with
NL_VALIDATE_STRICT.

This patch is to remove it, and do the same on rtm_nh_policy which
is parsed by nlmsg_parse().

Suggested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/nexthop.c
net/sched/act_ct.c
net/sched/act_mpls.c

index fc34fd1668d6ddd44a5cd4e47ad98c5decb2c1d5..511eaa94e2d161cb00579cca4dd3d5163bbacc98 100644 (file)
@@ -23,7 +23,6 @@ static void remove_nexthop(struct net *net, struct nexthop *nh,
 #define NH_DEV_HASHSIZE (1U << NH_DEV_HASHBITS)
 
 static const struct nla_policy rtm_nh_policy[NHA_MAX + 1] = {
-       [NHA_UNSPEC]            = { .strict_start_type = NHA_UNSPEC + 1 },
        [NHA_ID]                = { .type = NLA_U32 },
        [NHA_GROUP]             = { .type = NLA_BINARY },
        [NHA_GROUP_TYPE]        = { .type = NLA_U16 },
index 68d6af56b243f3475d1f1fc2c10afd74fe62ed4b..c13638aeef46bef95f2bf5cd09530fd0bb8b271a 100644 (file)
@@ -474,7 +474,6 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
 }
 
 static const struct nla_policy ct_policy[TCA_CT_MAX + 1] = {
-       [TCA_CT_UNSPEC] = { .strict_start_type = TCA_CT_UNSPEC + 1 },
        [TCA_CT_ACTION] = { .type = NLA_U16 },
        [TCA_CT_PARMS] = { .type = NLA_EXACT_LEN, .len = sizeof(struct tc_ct) },
        [TCA_CT_ZONE] = { .type = NLA_U16 },
index 4d8c822b6acada80a81b4a4b9ccedb59aebfeaa0..c7d5e12ee9197e065fec6ee7d42c32bfbae57f13 100644 (file)
@@ -119,7 +119,6 @@ static int valid_label(const struct nlattr *attr,
 }
 
 static const struct nla_policy mpls_policy[TCA_MPLS_MAX + 1] = {
-       [TCA_MPLS_UNSPEC]       = { .strict_start_type = TCA_MPLS_UNSPEC + 1 },
        [TCA_MPLS_PARMS]        = NLA_POLICY_EXACT_LEN(sizeof(struct tc_mpls)),
        [TCA_MPLS_PROTO]        = { .type = NLA_U16 },
        [TCA_MPLS_LABEL]        = NLA_POLICY_VALIDATE_FN(NLA_U32, valid_label),