diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-23 20:36:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:11:23 -0800 |
| commit | 53b2bf3f8a652c9c8e86831f94ae2c5767ea54d7 (patch) | |
| tree | eba61efed08a932766a32b0b6a60e766f8b44bcb /net/sched/act_ipt.c | |
| parent | 6fa8c0144b770dac941cf2c15053b6e24f046c8a (diff) | |
| download | lwn-53b2bf3f8a652c9c8e86831f94ae2c5767ea54d7.tar.gz lwn-53b2bf3f8a652c9c8e86831f94ae2c5767ea54d7.zip | |
[NET_SCHED]: Use nla_policy for attribute validation in actions
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_ipt.c')
| -rw-r--r-- | net/sched/act_ipt.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index 7ab2419b44ec..da696fd3e341 100644 --- a/net/sched/act_ipt.c +++ b/net/sched/act_ipt.c @@ -92,6 +92,13 @@ static int tcf_ipt_release(struct tcf_ipt *ipt, int bind) return ret; } +static const struct nla_policy ipt_policy[TCA_IPT_MAX + 1] = { + [TCA_IPT_TABLE] = { .type = NLA_STRING, .len = IFNAMSIZ }, + [TCA_IPT_HOOK] = { .type = NLA_U32 }, + [TCA_IPT_INDEX] = { .type = NLA_U32 }, + [TCA_IPT_TARG] = { .len = sizeof(struct ipt_entry_target) }, +}; + static int tcf_ipt_init(struct nlattr *nla, struct nlattr *est, struct tc_action *a, int ovr, int bind) { @@ -107,22 +114,20 @@ static int tcf_ipt_init(struct nlattr *nla, struct nlattr *est, if (nla == NULL) return -EINVAL; - err = nla_parse_nested(tb, TCA_IPT_MAX, nla, NULL); + err = nla_parse_nested(tb, TCA_IPT_MAX, nla, ipt_policy); if (err < 0) return err; - if (tb[TCA_IPT_HOOK] == NULL || - nla_len(tb[TCA_IPT_HOOK]) < sizeof(u32)) + if (tb[TCA_IPT_HOOK] == NULL) return -EINVAL; - if (tb[TCA_IPT_TARG] == NULL || - nla_len(tb[TCA_IPT_TARG]) < sizeof(*t)) + if (tb[TCA_IPT_TARG] == NULL) return -EINVAL; + td = (struct ipt_entry_target *)nla_data(tb[TCA_IPT_TARG]); if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size) return -EINVAL; - if (tb[TCA_IPT_INDEX] != NULL && - nla_len(tb[TCA_IPT_INDEX]) >= sizeof(u32)) + if (tb[TCA_IPT_INDEX] != NULL) index = nla_get_u32(tb[TCA_IPT_INDEX]); pc = tcf_hash_check(index, a, bind, &ipt_hash_info); |