iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[INET]: kmalloc+memset -> kzalloc in frag_alloc_queue

Browse Source 
kmalloc + memset -> kzalloc in frag_alloc_queue

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2007-10-15 12:53:13 -07:00 committed by David S. Miller
parent c749b01351
commit f1673ca52c
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv4/ip_fragment.c
View File

@ -144,7 +144,7 @@ static __inline__ void ip4_frag_free(struct inet_frag_queue *q)
static __inline__ struct ipq *frag_alloc_queue(void) static __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) if (!qp)
return NULL; return NULL;
@ -265,15 +265,10 @@ static struct ipq *ip_frag_create(struct iphdr *iph, u32 user)
goto out_nomem; goto out_nomem;
qp->protocol = iph->protocol; qp->protocol = iph->protocol;
qp->q.last_in = 0;
qp->id = iph->id; qp->id = iph->id;
qp->saddr = iph->saddr; qp->saddr = iph->saddr;
qp->daddr = iph->daddr; qp->daddr = iph->daddr;
qp->user = user; 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; qp->peer = sysctl_ipfrag_max_dist ? inet_getpeer(iph->saddr, 1) : NULL;
/* Initialize a timer for this entry. */ /* Initialize a timer for this entry. */

7
net/ipv6/netfilter/nf_conntrack_reasm.c
View File

@ -137,9 +137,10 @@ static void nf_frag_free(struct inet_frag_queue *q)
static inline struct nf_ct_frag6_queue *frag_alloc_queue(void) static 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; return NULL;
atomic_add(sizeof(struct nf_ct_frag6_queue), &nf_frags.mem); atomic_add(sizeof(struct nf_ct_frag6_queue), &nf_frags.mem);
return fq; return fq;
@ -230,8 +231,6 @@ nf_ct_frag6_create(unsigned int hash, __be32 id, struct in6_addr *src, str
goto oom; goto oom;
} }
memset(fq, 0, sizeof(struct nf_ct_frag6_queue));
fq->id = id; fq->id = id;
ipv6_addr_copy(&fq->saddr, src); ipv6_addr_copy(&fq->saddr, src);
ipv6_addr_copy(&fq->daddr, dst); ipv6_addr_copy(&fq->daddr, dst);