Commit 50360345 authored by Pedro Tammela's avatar Pedro Tammela Committed by David S. Miller
Browse files

net/sched: act_pedit: use NLA_POLICY for parsing 'ex' keys 



Transform two checks in the 'ex' key parsing into netlink policies
removing extra if checks.

Signed-off-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f0f9465

net/sched/act_pedit.c

+3 −8
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = { 
};



static const struct nla_policy pedit_key_ex_policy[TCA_PEDIT_KEY_EX_MAX + 1] = {

	[TCA_PEDIT_KEY_EX_HTYPE]  = { .type = NLA_U16 },

	[TCA_PEDIT_KEY_EX_CMD]	  = { .type = NLA_U16 },

	[TCA_PEDIT_KEY_EX_HTYPE] =

		NLA_POLICY_MAX(NLA_U16, TCA_PEDIT_HDR_TYPE_MAX),

	[TCA_PEDIT_KEY_EX_CMD] = NLA_POLICY_MAX(NLA_U16, TCA_PEDIT_CMD_MAX),

};



static struct tcf_pedit_key_ex *tcf_pedit_keys_ex_parse(struct nlattr *nla,
@@ -81,12 +82,6 @@ static struct tcf_pedit_key_ex *tcf_pedit_keys_ex_parse(struct nlattr *nla, 
		k->htype = nla_get_u16(tb[TCA_PEDIT_KEY_EX_HTYPE]);

		k->cmd = nla_get_u16(tb[TCA_PEDIT_KEY_EX_CMD]);



		if (k->htype > TCA_PEDIT_HDR_TYPE_MAX ||

		    k->cmd > TCA_PEDIT_CMD_MAX) {

			err = -EINVAL;

			goto err_out;

		}



		k++;

	}