kmalloc+memset -> kzalloc in frag_alloc_queue
Subsystems (4)
PATCH 1/1 kmalloc+memset -> kzalloc in frag_alloc_queue
kmalloc + memset -> kzalloc in frag_alloc_queue
Signed-off-by Denis V. Lunev <[email protected]>
net/ipv4/ip_fragment.c renamed from net/ipv4/ip_fragment.c.alloc +1 -6
@@ -144,7 +144,7 @@ static __inline__ void ip4_frag_free(strstatic __inline__struct ipq *frag_alloc_queue (void ) { -struct ipq *qp =kmalloc (sizeof (struct ipq ),GFP_ATOMIC ); +struct ipq *qp =kzalloc (sizeof (struct ipq ),GFP_ATOMIC );if (!qp)return NULL ;
@@ -265,15 +265,10 @@ static struct ipq *ip_frag_create(struct goto out_nomem; qp->protocol = iph->protocol; - qp->q.last_in =0 ; qp->id = iph->id; qp->saddr = iph->saddr; qp->daddr = iph->daddr; qp->user = user; - qp->q.len =0 ; - qp->q.meat =0 ; - qp->q.fragments =NULL ; - qp->iif =0 ; qp->peer = sysctl_ipfrag_max_dist ?inet_getpeer (iph->saddr,1 ) :NULL ;/* Initialize a timer for this entry. */
net/ipv6/netfilter/nf_conntrack_reasm.c renamed from net/ipv6/netfilter/nf_conntrack_reasm.c.alloc +3 -4
@@ -137,9 +137,10 @@ static void nf_frag_free(struct inet_frastatic inline struct nf_ct_frag6_queue *frag_alloc_queue (void ) { -struct nf_ct_frag6_queue *fq =kmalloc (sizeof (struct nf_ct_frag6_queue ),GFP_ATOMIC ); +struct nf_ct_frag6_queue *fq; -if (!fq) + fq =kzalloc (sizeof (struct nf_ct_frag6_queue ),GFP_ATOMIC ); +if (fq ==NULL )return NULL ;atomic_add (sizeof (struct nf_ct_frag6_queue ), &nf_frags.mem);return fq;
@@ -230,8 +231,6 @@ nf_ct_frag6_create(unsigned int hash, __ goto oom; } -memset (fq,0 ,sizeof (struct nf_ct_frag6_queue )); - fq->id = id;ipv6_addr_copy (&fq->saddr, src);ipv6_addr_copy (&fq->daddr, dst);
From: "Denis V. Lunev" <[email protected]>
Date: Mon, 15 Oct 2007 18:48:41 +0400
Quoted 3 lines
kmalloc + memset -> kzalloc in
frag_alloc_queueSigned-off-by Denis V. Lunev <[email protected]>
Applied, thanks!