Commit f3bed7f8 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

net: remove the unnecessary strict_start_type in some policies 



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: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff998a80

net/ipv4/nexthop.c

+0 −1
Original line number Diff line number Diff line
@@ -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 },

net/sched/act_ct.c

+0 −1
Original line number Diff line number Diff line
@@ -474,7 +474,6 @@ drop: 
}



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 },

net/sched/act_mpls.c

+0 −1
Original line number Diff line number Diff line
@@ -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),

CRA Git | Maintained and supported by SUSTech CRA and CCSE