diff options
| author | Pedro Tammela <pctammela@mojatatu.com> | 2023-04-21 18:25:13 -0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-04-23 18:35:26 +0100 |
| commit | 5036034572b79daa6d6600338e8e8229e2a44b09 (patch) | |
| tree | 47a9f1a0782dfc00c4819ed37e14aa2f756766ea /net/sched | |
| parent | 2f0f9465ad9fa9c93f30009184c10da0f504f313 (diff) | |
| download | linux-stable-5036034572b79daa6d6600338e8e8229e2a44b09.tar.gz linux-stable-5036034572b79daa6d6600338e8e8229e2a44b09.tar.bz2 linux-stable-5036034572b79daa6d6600338e8e8229e2a44b09.zip | |
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: Pedro Tammela <pctammela@mojatatu.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_pedit.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index 4559a1507ea5..45201f75e896 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -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++; } |