linux-kernel - [PATCH 03/11] parse-events: Get rid of handling concatenation on event_read

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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 23 Apr 2012 13:58:30 +0900
From:	Namhyung Kim <namhyung.kim@....com>
To:	Steven Rostedt <rostedt@...dmis.org>,
	Frederic Weisbecker <fweisbec@...il.com>
Cc:	Namhyung Kim <namhyung@...il.com>, Ingo Molnar <mingo@...nel.org>,
	Arnaldo Carvalho de Melo <acme@...radead.org>,
	Borislav Petkov <bp@...en8.de>,
	David Ahern <dsahern@...il.com>,
	LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH 03/11] parse-events: Get rid of handling concatenation on event_read_print

The concatenation of subsequent DQUOTE'd strings is handled
by __read_token() already.

Signed-off-by: Namhyung Kim <namhyung.kim@....com>
---
 parse-events.c |   16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/parse-events.c b/parse-events.c
index 0cd79c5..b4ae313 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -2695,7 +2695,6 @@ static int event_read_print(struct event_format *event)
 	if (read_expect_type(EVENT_DQUOTE, &token) < 0)
 		goto fail;
 
- concat:
 	event->print_fmt.format = token;
 	event->print_fmt.args = NULL;
 
@@ -2705,21 +2704,6 @@ static int event_read_print(struct event_format *event)
 	if (type == EVENT_NONE)
 		return 0;
 
-	/* Handle concatenation of print lines */
-	if (type == EVENT_DQUOTE) {
-		char *cat;
-
-		cat = malloc_or_die(strlen(event->print_fmt.format) +
-				    strlen(token) + 1);
-		strcpy(cat, event->print_fmt.format);
-		strcat(cat, token);
-		free_token(token);
-		free_token(event->print_fmt.format);
-		event->print_fmt.format = NULL;
-		token = cat;
-		goto concat;
-	}
-			     
 	if (test_type_token(type, token, EVENT_DELIM, ","))
 		goto fail;
 
-- 
1.7.10

--
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/