Commit fa1b1cff authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

net_cls_act: Make act_simple use of netlink policy. 



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

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5ffc02a1

net/sched/act_simple.c

+16 −18
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *		as published by the Free Software Foundation; either 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,

};



#define SIMP_MAX_DATA	32

static int tcf_simp(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res)

{

	struct tcf_defact *d = a->priv;
@@ -69,23 +70,24 @@ static int tcf_simp_release(struct tcf_defact *d, int bind) 
	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))

		return -ENOMEM;

	d->tcfd_datalen = datalen;



	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);

	return alloc_defdata(d, datalen, defdata);

	return alloc_defdata(d, defdata);

}



static const struct nla_policy simple_policy[TCA_DEF_MAX + 1] = {

	[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,
@@ -95,28 +97,24 @@ static int tcf_simp_init(struct nlattr *nla, struct nlattr *est, 
	struct tc_defact *parm;

	struct tcf_defact *d;

	struct tcf_common *pc;

	void *defdata;

	u32 datalen = 0;

	char *defdata;

	int ret = 0, err;



	if (nla == NULL)

		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)

		return err;



	if (tb[TCA_DEF_PARMS] == NULL)

		return -EINVAL;



	parm = nla_data(tb[TCA_DEF_PARMS]);

	defdata = nla_data(tb[TCA_DEF_DATA]);

	if (defdata == NULL)

	if (tb[TCA_DEF_DATA] == NULL)

		return -EINVAL;



	datalen = nla_len(tb[TCA_DEF_DATA]);

	if (datalen == 0)

		return -EINVAL;

	parm = nla_data(tb[TCA_DEF_PARMS]);

	defdata = nla_data(tb[TCA_DEF_DATA]);



	pc = tcf_hash_check(parm->index, a, bind, &simp_hash_info);

	if (!pc) {
@@ -126,7 +124,7 @@ static int tcf_simp_init(struct nlattr *nla, struct nlattr *est, 
			return -ENOMEM;



		d = to_defact(pc);

		ret = alloc_defdata(d, datalen, defdata);

		ret = alloc_defdata(d, defdata);

		if (ret < 0) {

			kfree(pc);

			return ret;
@@ -138,7 +136,7 @@ static int tcf_simp_init(struct nlattr *nla, struct nlattr *est, 
			tcf_simp_release(d, bind);

			return -EEXIST;

		}

		realloc_defdata(d, datalen, defdata);

		realloc_defdata(d, defdata);

	}



	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.action = d->tcf_action;

	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.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);

	t.expires = jiffies_to_clock_t(d->tcf_tm.expires);