nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net_cls_act: Make act_simple use of netlink policy.

Browse source 
Convert to netlink helpers by using netlink policy validation.
As a side effect fixes a leak.

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jamal Hadi Salim 2008-05-05 00:22:35 -07:00 committed by David S. Miller
parent 5ffc02a158
commit fa1b1cff3d
1 changed files with 16 additions and 18 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

34
net/sched/act_simple.c
View file

@ -6,7 +6,7 @@
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
* *
* Authors: Jamal Hadi Salim (2005) * Authors: Jamal Hadi Salim (2005-8)
* *
*/ */
@ -34,6 +34,7 @@ static struct tcf_hashinfo simp_hash_info = {
.lock = &simp_lock, .lock = &simp_lock,
}; };
#define SIMP_MAX_DATA 32
static int tcf_simp(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res) static int tcf_simp(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res)
{ {
struct tcf_defact *d = a->priv; struct tcf_defact *d = a->priv;
@ -69,23 +70,24 @@ static int tcf_simp_release(struct tcf_defact *d, int bind)
return ret; return ret;
} }
static int alloc_defdata(struct tcf_defact *d, u32 datalen, void *defdata) static int alloc_defdata(struct tcf_defact *d, char *defdata)
{ {
d->tcfd_defdata = kmemdup(defdata, datalen, GFP_KERNEL); d->tcfd_defdata = kstrndup(defdata, SIMP_MAX_DATA, GFP_KERNEL);
if (unlikely(!d->tcfd_defdata)) if (unlikely(!d->tcfd_defdata))
return -ENOMEM; return -ENOMEM;
d->tcfd_datalen = datalen;
return 0; return 0;
} }
static int realloc_defdata(struct tcf_defact *d, u32 datalen, void *defdata) static int realloc_defdata(struct tcf_defact *d, char *defdata)
{ {
kfree(d->tcfd_defdata); kfree(d->tcfd_defdata);
return alloc_defdata(d, datalen, defdata); return alloc_defdata(d, defdata);
} }
static const struct nla_policy simple_policy[TCA_DEF_MAX + 1] = { static const struct nla_policy simple_policy[TCA_DEF_MAX + 1] = {
[TCA_DEF_PARMS] = { .len = sizeof(struct tc_defact) }, [TCA_DEF_PARMS] = { .len = sizeof(struct tc_defact) },
[TCA_DEF_DATA] = { .type = NLA_STRING, .len = SIMP_MAX_DATA },
}; };
static int tcf_simp_init(struct nlattr *nla, struct nlattr *est, static int tcf_simp_init(struct nlattr *nla, struct nlattr *est,
@ -95,28 +97,24 @@ static int tcf_simp_init(struct nlattr *nla, struct nlattr *est,
struct tc_defact *parm; struct tc_defact *parm;
struct tcf_defact *d; struct tcf_defact *d;
struct tcf_common *pc; struct tcf_common *pc;
void *defdata; char *defdata;
u32 datalen = 0;
int ret = 0, err; int ret = 0, err;
if (nla == NULL) if (nla == NULL)
return -EINVAL; return -EINVAL;
err = nla_parse_nested(tb, TCA_DEF_MAX, nla, NULL); err = nla_parse_nested(tb, TCA_DEF_MAX, nla, simple_policy);
if (err < 0) if (err < 0)
return err; return err;
if (tb[TCA_DEF_PARMS] == NULL) if (tb[TCA_DEF_PARMS] == NULL)
return -EINVAL; return -EINVAL;
parm = nla_data(tb[TCA_DEF_PARMS]); if (tb[TCA_DEF_DATA] == NULL)
defdata = nla_data(tb[TCA_DEF_DATA]);
if (defdata == NULL)
return -EINVAL; return -EINVAL;
datalen = nla_len(tb[TCA_DEF_DATA]); parm = nla_data(tb[TCA_DEF_PARMS]);
if (datalen == 0) defdata = nla_data(tb[TCA_DEF_DATA]);
return -EINVAL;
pc = tcf_hash_check(parm->index, a, bind, &simp_hash_info); pc = tcf_hash_check(parm->index, a, bind, &simp_hash_info);
if (!pc) { if (!pc) {
@ -126,7 +124,7 @@ static int tcf_simp_init(struct nlattr *nla, struct nlattr *est,
return -ENOMEM; return -ENOMEM;
d = to_defact(pc); d = to_defact(pc);
ret = alloc_defdata(d, datalen, defdata); ret = alloc_defdata(d, defdata);
if (ret < 0) { if (ret < 0) {
kfree(pc); kfree(pc);
return ret; return ret;
@ -138,7 +136,7 @@ static int tcf_simp_init(struct nlattr *nla, struct nlattr *est,
tcf_simp_release(d, bind); tcf_simp_release(d, bind);
return -EEXIST; return -EEXIST;
} }
realloc_defdata(d, datalen, defdata); realloc_defdata(d, defdata);
} }
spin_lock_bh(&d->tcf_lock); spin_lock_bh(&d->tcf_lock);
@ -172,7 +170,7 @@ static inline int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a,
opt.bindcnt = d->tcf_bindcnt - bind; opt.bindcnt = d->tcf_bindcnt - bind;
opt.action = d->tcf_action; opt.action = d->tcf_action;
NLA_PUT(skb, TCA_DEF_PARMS, sizeof(opt), &opt); NLA_PUT(skb, TCA_DEF_PARMS, sizeof(opt), &opt);
NLA_PUT(skb, TCA_DEF_DATA, d->tcfd_datalen, d->tcfd_defdata); NLA_PUT_STRING(skb, TCA_DEF_DATA, d->tcfd_defdata);
t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install); t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);
t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse); t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);
t.expires = jiffies_to_clock_t(d->tcf_tm.expires); t.expires = jiffies_to_clock_t(d->tcf_tm.expires);