From d98f574222d81aa8d804b7da1ee77dd2fec53576 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Mon, 15 Oct 2007 12:53:13 -0700 Subject: [PATCH] --- yaml --- r: 69431 b: refs/heads/master c: f1673ca52c04f1b311abe03fd67cd4d650d19435 h: refs/heads/master i: 69429: 11fbc38cd9c4e1e3d05c9b9eb013be310e3654c7 69427: 0278756861f36821d43d4ba661ea3af809e6ae55 69423: 2c4c73e4ef3d77cf2bb53dab94e76593532f91bc v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_fragment.c | 7 +------ trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 7 +++---- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 0da09c15d329..e7bf191eb47f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c749b01351d249a924d1dd061dd1431bd3ad0579 +refs/heads/master: f1673ca52c04f1b311abe03fd67cd4d650d19435 diff --git a/trunk/net/ipv4/ip_fragment.c b/trunk/net/ipv4/ip_fragment.c index 3171ec0c0fa0..443b3f89192f 100644 --- a/trunk/net/ipv4/ip_fragment.c +++ b/trunk/net/ipv4/ip_fragment.c @@ -144,7 +144,7 @@ static __inline__ void ip4_frag_free(struct inet_frag_queue *q) 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) return NULL; @@ -265,15 +265,10 @@ static struct ipq *ip_frag_create(struct iphdr *iph, u32 user) 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. */ diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c index bf6f2f09eae3..726fafd41961 100644 --- a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -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) { - 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, __be32 id, struct in6_addr *src, str 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);