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

Commit 0c600eda authored by Ingo Oeser's avatar Ingo Oeser Committed by David S. Miller
Browse files

[IPV6]: Nearly complete kzalloc cleanup for net/ipv6 



Stupidly use kzalloc() instead of kmalloc()/memset()
everywhere where this is possible in net/ipv6/*.c .

Signed-off-by: default avatarIngo Oeser <ioe-lkml@rameria.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 78c784c4

net/ipv6/ah6.c

+1 −3
Original line number Diff line number Diff line
@@ -354,12 +354,10 @@ static int ah6_init_state(struct xfrm_state *x) 
	if (x->encap)

		goto error;



	ahp = kmalloc(sizeof(*ahp), GFP_KERNEL);

	ahp = kzalloc(sizeof(*ahp), GFP_KERNEL);

	if (ahp == NULL)

		return -ENOMEM;



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



	ahp->key = x->aalg->alg_key;

	ahp->key_len = (x->aalg->alg_key_len+7)/8;

	ahp->tfm = crypto_alloc_tfm(x->aalg->alg_name, 0);

net/ipv6/anycast.c

+2 −5
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr) 
	 *	not found: create a new one.

	 */



	aca = kmalloc(sizeof(struct ifacaddr6), GFP_ATOMIC);

	aca = kzalloc(sizeof(struct ifacaddr6), GFP_ATOMIC);



	if (aca == NULL) {

		err = -ENOMEM;
@@ -322,8 +322,6 @@ int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr) 
		goto out;

	}



	memset(aca, 0, sizeof(struct ifacaddr6));



	ipv6_addr_copy(&aca->aca_addr, addr);

	aca->aca_idev = idev;

	aca->aca_rt = rt;
@@ -550,7 +548,7 @@ static int ac6_seq_open(struct inode *inode, struct file *file) 
{

	struct seq_file *seq;

	int rc = -ENOMEM;

	struct ac6_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);

	struct ac6_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL);



	if (!s)

		goto out;
@@ -561,7 +559,6 @@ static int ac6_seq_open(struct inode *inode, struct file *file) 


	seq = file->private_data;

	seq->private = s;

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

out:

	return rc;

out_kfree:

net/ipv6/esp6.c

+1 −3
Original line number Diff line number Diff line
@@ -305,12 +305,10 @@ static int esp6_init_state(struct xfrm_state *x) 
	if (x->encap)

		goto error;



	esp = kmalloc(sizeof(*esp), GFP_KERNEL);

	esp = kzalloc(sizeof(*esp), GFP_KERNEL);

	if (esp == NULL)

		return -ENOMEM;



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



	if (x->aalg) {

		struct xfrm_algo_desc *aalg_desc;

net/ipv6/ip6_flowlabel.c

+2 −4
Original line number Diff line number Diff line
@@ -287,10 +287,9 @@ fl_create(struct in6_flowlabel_req *freq, char __user *optval, int optlen, int * 
	int err;



	err = -ENOMEM;

	fl = kmalloc(sizeof(*fl), GFP_KERNEL);

	fl = kzalloc(sizeof(*fl), GFP_KERNEL);

	if (fl == NULL)

		goto done;

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



	olen = optlen - CMSG_ALIGN(sizeof(*freq));

	if (olen > 0) {
@@ -663,7 +662,7 @@ static int ip6fl_seq_open(struct inode *inode, struct file *file) 
{

	struct seq_file *seq;

	int rc = -ENOMEM;

	struct ip6fl_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);

	struct ip6fl_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL);



	if (!s)

		goto out;
@@ -674,7 +673,6 @@ static int ip6fl_seq_open(struct inode *inode, struct file *file) 


	seq = file->private_data;

	seq->private = s;

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

out:

	return rc;

out_kfree:

net/ipv6/ipcomp6.c

+1 −2
Original line number Diff line number Diff line
@@ -428,11 +428,10 @@ static int ipcomp6_init_state(struct xfrm_state *x) 
		goto out;



	err = -ENOMEM;

	ipcd = kmalloc(sizeof(*ipcd), GFP_KERNEL);

	ipcd = kzalloc(sizeof(*ipcd), GFP_KERNEL);

	if (!ipcd)

		goto out;



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

	x->props.header_len = 0;

	if (x->props.mode)

		x->props.header_len += sizeof(struct ipv6hdr);