Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7b1b249 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SCHED]: Use kmemdup & kzalloc where appropriate 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent b3ab09f9

net/sched/act_ipt.c

+2 −4
Original line number Diff line number Diff line
@@ -156,10 +156,9 @@ static int tcf_ipt_init(struct rtattr *rta, struct rtattr *est, 
	    rtattr_strlcpy(tname, tb[TCA_IPT_TABLE-1], IFNAMSIZ) >= IFNAMSIZ)

		strcpy(tname, "mangle");



	t = kmalloc(td->u.target_size, GFP_KERNEL);

	t = kmemdup(td, td->u.target_size, GFP_KERNEL);

	if (unlikely(!t))

		goto err2;

	memcpy(t, td, td->u.target_size);



	if ((err = ipt_init_target(t, tname, hook)) < 0)

		goto err3;
@@ -256,13 +255,12 @@ static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind, int 
	** for foolproof you need to not assume this

	*/



	t = kmalloc(ipt->tcfi_t->u.user.target_size, GFP_ATOMIC);

	t = kmemdup(ipt->tcfi_t, ipt->tcfi_t->u.user.target_size, GFP_ATOMIC);

	if (unlikely(!t))

		goto rtattr_failure;



	c.bindcnt = ipt->tcf_bindcnt - bind;

	c.refcnt = ipt->tcf_refcnt - ref;

	memcpy(t, ipt->tcfi_t, ipt->tcfi_t->u.user.target_size);

	strcpy(t->u.user.name, ipt->tcfi_t->u.kernel.target->name);



	RTA_PUT(skb, TCA_IPT_TARG, ipt->tcfi_t->u.user.target_size, t);

net/sched/act_simple.c

+1 −2
Original line number Diff line number Diff line
@@ -71,11 +71,10 @@ static int tcf_simp_release(struct tcf_defact *d, int bind) 


static int alloc_defdata(struct tcf_defact *d, u32 datalen, void *defdata)

{

	d->tcfd_defdata = kmalloc(datalen, GFP_KERNEL);

	d->tcfd_defdata = kmemdup(defdata, datalen, GFP_KERNEL);

	if (unlikely(!d->tcfd_defdata))

		return -ENOMEM;

	d->tcfd_datalen = datalen;

	memcpy(d->tcfd_defdata, defdata, datalen);

	return 0;

}

net/sched/cls_api.c

+1 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 
		/* Create new proto tcf */



		err = -ENOBUFS;

		if ((tp = kmalloc(sizeof(*tp), GFP_KERNEL)) == NULL)

		if ((tp = kzalloc(sizeof(*tp), GFP_KERNEL)) == NULL)

			goto errout;

		err = -EINVAL;

		tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND-1]);
@@ -247,7 +247,6 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 
			kfree(tp);

			goto errout;

		}

		memset(tp, 0, sizeof(*tp));

		tp->ops = tp_ops;

		tp->protocol = protocol;

		tp->prio = nprio ? : tcf_auto_prio(*back);

net/sched/em_meta.c

+1 −2
Original line number Diff line number Diff line
@@ -546,10 +546,9 @@ static int meta_var_change(struct meta_value *dst, struct rtattr *rta) 
{

	int len = RTA_PAYLOAD(rta);



	dst->val = (unsigned long) kmalloc(len, GFP_KERNEL);

	dst->val = (unsigned long)kmemdup(RTA_DATA(rta), len, GFP_KERNEL);

	if (dst->val == 0UL)

		return -ENOMEM;

	memcpy((void *) dst->val, RTA_DATA(rta), len);

	dst->len = len;

	return 0;

}

net/sched/em_nbyte.c

+1 −3
Original line number Diff line number Diff line
@@ -34,12 +34,10 @@ static int em_nbyte_change(struct tcf_proto *tp, void *data, int data_len, 
		return -EINVAL;



	em->datalen = sizeof(*nbyte) + nbyte->len;

	em->data = (unsigned long) kmalloc(em->datalen, GFP_KERNEL);

	em->data = (unsigned long)kmemdup(data, em->datalen, GFP_KERNEL);

	if (em->data == 0UL)

		return -ENOBUFS;



	memcpy((void *) em->data, data, em->datalen);



	return 0;

}