diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-23 23:36:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:23 -0500 |
commit | 53b2bf3f8a652c9c8e86831f94ae2c5767ea54d7 (patch) | |
tree | eba61efed08a932766a32b0b6a60e766f8b44bcb /net/sched/act_police.c | |
parent | 6fa8c0144b770dac941cf2c15053b6e24f046c8a (diff) |
[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_police.c')
-rw-r--r-- | net/sched/act_police.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 62de806af3af..0898120bbcc0 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c | |||
@@ -119,6 +119,13 @@ static void tcf_police_destroy(struct tcf_police *p) | |||
119 | BUG_TRAP(0); | 119 | BUG_TRAP(0); |
120 | } | 120 | } |
121 | 121 | ||
122 | static const struct nla_policy police_policy[TCA_POLICE_MAX + 1] = { | ||
123 | [TCA_POLICE_RATE] = { .len = TC_RTAB_SIZE }, | ||
124 | [TCA_POLICE_PEAKRATE] = { .len = TC_RTAB_SIZE }, | ||
125 | [TCA_POLICE_AVRATE] = { .type = NLA_U32 }, | ||
126 | [TCA_POLICE_RESULT] = { .type = NLA_U32 }, | ||
127 | }; | ||
128 | |||
122 | static int tcf_act_police_locate(struct nlattr *nla, struct nlattr *est, | 129 | static int tcf_act_police_locate(struct nlattr *nla, struct nlattr *est, |
123 | struct tc_action *a, int ovr, int bind) | 130 | struct tc_action *a, int ovr, int bind) |
124 | { | 131 | { |
@@ -133,7 +140,7 @@ static int tcf_act_police_locate(struct nlattr *nla, struct nlattr *est, | |||
133 | if (nla == NULL) | 140 | if (nla == NULL) |
134 | return -EINVAL; | 141 | return -EINVAL; |
135 | 142 | ||
136 | err = nla_parse_nested(tb, TCA_POLICE_MAX, nla, NULL); | 143 | err = nla_parse_nested(tb, TCA_POLICE_MAX, nla, police_policy); |
137 | if (err < 0) | 144 | if (err < 0) |
138 | return err; | 145 | return err; |
139 | 146 | ||
@@ -144,13 +151,6 @@ static int tcf_act_police_locate(struct nlattr *nla, struct nlattr *est, | |||
144 | return -EINVAL; | 151 | return -EINVAL; |
145 | parm = nla_data(tb[TCA_POLICE_TBF]); | 152 | parm = nla_data(tb[TCA_POLICE_TBF]); |
146 | 153 | ||
147 | if (tb[TCA_POLICE_RESULT] != NULL && | ||
148 | nla_len(tb[TCA_POLICE_RESULT]) != sizeof(u32)) | ||
149 | return -EINVAL; | ||
150 | if (tb[TCA_POLICE_RESULT] != NULL && | ||
151 | nla_len(tb[TCA_POLICE_RESULT]) != sizeof(u32)) | ||
152 | return -EINVAL; | ||
153 | |||
154 | if (parm->index) { | 154 | if (parm->index) { |
155 | struct tcf_common *pc; | 155 | struct tcf_common *pc; |
156 | 156 | ||