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_gact.c | |
| parent | 6fa8c0144b770dac941cf2c15053b6e24f046c8a (diff) | |
| download | linux-53b2bf3f8a652c9c8e86831f94ae2c5767ea54d7.tar.bz2 | |
[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_gact.c')
| -rw-r--r-- | net/sched/act_gact.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index df214d47fc92..422872c4f14b 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c @@ -53,6 +53,11 @@ typedef int (*g_rand)(struct tcf_gact *gact); static g_rand gact_rand[MAX_RAND]= { NULL, gact_net_rand, gact_determ }; #endif /* CONFIG_GACT_PROB */ +static const struct nla_policy gact_policy[TCA_GACT_MAX + 1] = { + [TCA_GACT_PARMS] = { .len = sizeof(struct tc_gact) }, + [TCA_GACT_PROB] = { .len = sizeof(struct tc_gact_p) }, +}; + static int tcf_gact_init(struct nlattr *nla, struct nlattr *est, struct tc_action *a, int ovr, int bind) { @@ -66,20 +71,16 @@ static int tcf_gact_init(struct nlattr *nla, struct nlattr *est, if (nla == NULL) return -EINVAL; - err = nla_parse_nested(tb, TCA_GACT_MAX, nla, NULL); + err = nla_parse_nested(tb, TCA_GACT_MAX, nla, gact_policy); if (err < 0) return err; - if (tb[TCA_GACT_PARMS] == NULL || - nla_len(tb[TCA_GACT_PARMS]) < sizeof(*parm)) + if (tb[TCA_GACT_PARMS] == NULL) return -EINVAL; parm = nla_data(tb[TCA_GACT_PARMS]); +#ifndef CONFIG_GACT_PROB if (tb[TCA_GACT_PROB] != NULL) -#ifdef CONFIG_GACT_PROB - if (nla_len(tb[TCA_GACT_PROB]) < sizeof(struct tc_gact_p)) - return -EINVAL; -#else return -EOPNOTSUPP; #endif |