netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Engelhardt <jengelh@medozas.de>
To: kaber@trash.net
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 7/9] xtables: fix excessive memory allocation in host_to_ipaddr
Date: Sun, 27 Feb 2011 02:31:17 +0100	[thread overview]
Message-ID: <1298770280-7652-8-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1298770280-7652-1-git-send-email-jengelh@medozas.de>

From: Wes Campaigne <westacular@gmail.com>

host_to_ipaddr was unnecessarily asking for an array of length n^2 to
store just n addresses.

Signed-off-by: Wes Campaigne <westacular@gmail.com>
---
 xtables.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xtables.c b/xtables.c
index 83c5b41..b45bf92 100644
--- a/xtables.c
+++ b/xtables.c
@@ -1143,7 +1143,7 @@ static struct in_addr *host_to_ipaddr(const char *name, unsigned int *naddr)
 
 		while (host->h_addr_list[*naddr] != NULL)
 			++*naddr;
-		addr = xtables_calloc(*naddr, sizeof(struct in_addr) * *naddr);
+		addr = xtables_calloc(*naddr, sizeof(struct in_addr));
 		for (i = 0; i < *naddr; i++)
 			memcpy(&addr[i], host->h_addr_list[i],
 			       sizeof(struct in_addr));
-- 
1.7.1


  parent reply	other threads:[~2011-02-27  1:31 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-27  1:31 iptables: docs & address parsing Jan Engelhardt
2011-02-27  1:31 ` [PATCH 1/9] doc: mention other possible nf_loggers for TRACE Jan Engelhardt
2011-02-27  1:31 ` [PATCH 2/9] doc: fix odd partial sentence in libipt_TTL Jan Engelhardt
2011-02-27  1:31 ` [PATCH 3/9] libxt_quota: require --quota to be specified Jan Engelhardt
2011-02-27  1:31 ` [PATCH 4/9] doc: rateest options can be optional Jan Engelhardt
2011-02-27  1:31 ` [PATCH 5/9] libxtables: fix memory scribble beyond end of array Jan Engelhardt
2011-02-27  1:31 ` [PATCH 6/9] libxtables: avoid confusing use of ai_protocol=IPPROTO_IPV6 Jan Engelhardt
2011-02-27  1:31 ` Jan Engelhardt [this message]
2011-02-27  1:31 ` [PATCH 8/9] xtables: fix the broken detection/removal of redundant addresses Jan Engelhardt
2011-02-27  1:31 ` [PATCH 9/9] xtables: use all IPv6 addresses resolved from a hostname Jan Engelhardt
2011-02-27 15:19 ` iptables: docs & address parsing Patrick McHardy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1298770280-7652-8-git-send-email-jengelh@medozas.de \
    --to=jengelh@medozas.de \
    --cc=kaber@trash.net \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).