linux-kernel - [PATCH] perf: free original memory on realloc failure in str

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1373229833-6157-1-git-send-email-dsahern@gmail.com>
Date:	Sun,  7 Jul 2013 14:43:53 -0600
From:	David Ahern <dsahern@...il.com>
To:	acme@...stprotocols.net, linux-kernel@...r.kernel.org
Cc:	David Ahern <dsahern@...il.com>, Andi Kleen <ak@...ux.intel.com>
Subject: [PATCH] perf: free original memory on realloc failure in str_append

str_append was added in 578d9c6. If realloc fails orignal block is
not freed. Need to save the original pointer to handle on failure.

Signed-off-by: David Ahern <dsahern@...il.com>
Cc: Andi Kleen <ak@...ux.intel.com>
---
 tools/perf/util/string.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c
index f0b0c00..53bca50 100644
--- a/tools/perf/util/string.c
+++ b/tools/perf/util/string.c
@@ -398,13 +398,20 @@ int str_append(char **s, int *len, const char *a)
 {
 	int olen = *s ? strlen(*s) : 0;
 	int nlen = olen + strlen(a) + 1;
+	char *p;
+
 	if (*len < nlen) {
 		*len = *len * 2;
 		if (*len < nlen)
 			*len = nlen;
+
+		p = *s;
 		*s = realloc(*s, *len);
-		if (!*s)
+		if (!*s) {
+			free(p);
 			return -ENOMEM;
+		}
+
 		if (olen == 0)
 			**s = 0;
 	}
-- 
1.7.10.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/