Skip to contentSkip to conversation

perf_bundle: Check memory allocation failure

PATCH In review Namhyung Kim 2 participants 4 messages Sep 18, 2012

lore
Share & tools
lore

Namhyung Kim

author
#0 lore raw

PATCH 1/2 perf_bundle: Check memory allocation failure

Check return value of malloc/strdup not to make NULL dereferences.

Signed-off-by Namhyung Kim <namhyung(a)gmail.com>
---
 src/perf/perf_bundle.cpp |   13 +++++++++++++
 1 file changed, 13 insertions(+)
src/perf/perf_bundle.cpp +13 -0
index 38e1e91..4e70f30 100644
@@ -60,6 +60,9 @@ void perf_bundle_event::handle_event(struct perf_event_header *header, void *coo
 	vector<void *> *vector;
 
 	buffer = (unsigned char *)malloc(header->size);
+	if (!buffer)
+		return;
+
 	memcpy(buffer, header, header->size);
 
 #ifdef USE_DECLTYPE
@@ -130,6 +133,9 @@ static void parse_event_format(const char *event_name)
 {
 	char *tptr;
 	char *name = strdup(event_name);
+	if (!name)
+		return;
+
 	char *sys = strtok_r(name, ":", &tptr);
 	char *event = strtok_r(NULL, ":", &tptr);
 	char *file;
@@ -137,6 +143,9 @@ static void parse_event_format(const char *event_name)
 
 	file = (char *)malloc(strlen(sys) + strlen(event) +
 		      strlen("/sys/kernel/debug/tracing/events////format") + 2);
+	if (!file)
+		return;
+
 	sprintf(file, "/sys/kernel/debug/tracing/events/%s/%s/format", sys, event);
 
 	buf = read_file(file);
@@ -169,6 +178,10 @@ bool perf_bundle::add_event(const char *event_name)
 		if ((int)ev->trace_type >= 0) {
 			if (event_names.find(ev->trace_type) == event_names.end()) {
 				event_names[ev->trace_type] = strdup(event_name);
+				if (!event_names[ev->trace_type]) {
+					delete ev;
+					continue;
+				}
 				parse_event_format(event_name);
 			}
 			events.push_back(ev);
Signature · 1 line
1.7.9.2
author
#1 lore raw

PATCH 2/2 perf_bundle: Cleanup realloc use

The if block can be removed since the realloc can handle NULL pointer as a first argument.

Signed-off-by Namhyung Kim <namhyung(a)gmail.com>
---
 src/perf/perf_bundle.cpp |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
src/perf/perf_bundle.cpp +4 -7
index 4e70f30..7649036 100644
@@ -112,13 +112,10 @@ static char * read_file(const char *file)
 		exit(-1);
 
 	while((r = read(fd, buf, 4096)) > 0) {
-		if (len) {
-			char *tmp = (char *)realloc(buffer, len + r + 1);
-			if (!tmp)
-				free(buffer);
-			buffer = tmp;
-		} else
-			buffer = (char *)malloc(r + 1);
+		char *tmp = (char *)realloc(buffer, len + r + 1);
+		if (!tmp)
+			free(buffer);
+		buffer = tmp;
 		if (!buffer)
 			goto out;
 		memcpy(buffer + len, buf, r);
Signature · 1 line
1.7.9.2
#2 lore raw
In reply to Namhyung Kim
Quoted 1 line · Namhyung Kim

Check return value of malloc/strdup not to make NULL dereferences.

I don't mind these patches; they are clean code

however, one of the core userspace developers at work basically said "we don't check for malloc NULL in userspace; if that ever happens the system is so screwed up anyway that you just cannot continue".

Quoted 52 lines
Signed-off-by Namhyung Kim <namhyung(a)gmail.com>
---
 src/perf/perf_bundle.cpp |   13 +++++++++++++
 1 file changed, 13 insertions(+)
src/perf/perf_bundle.cpp +13 -0
index 38e1e91..4e70f30 100644
@@ -60,6 +60,9 @@ void perf_bundle_event::handle_event(struct perf_event_header *header, void *coo
 	vector<void *> *vector;
 
 	buffer = (unsigned char *)malloc(header->size);
+	if (!buffer)
+		return;
+
 	memcpy(buffer, header, header->size);
 
 #ifdef USE_DECLTYPE
@@ -130,6 +133,9 @@ static void parse_event_format(const char *event_name)
 {
 	char *tptr;
 	char *name = strdup(event_name);
+	if (!name)
+		return;
+
 	char *sys = strtok_r(name, ":", &tptr);
 	char *event = strtok_r(NULL, ":", &tptr);
 	char *file;
@@ -137,6 +143,9 @@ static void parse_event_format(const char *event_name)
 
 	file = (char *)malloc(strlen(sys) + strlen(event) +
 		      strlen("/sys/kernel/debug/tracing/events////format") + 2);
+	if (!file)
+		return;
+
 	sprintf(file, "/sys/kernel/debug/tracing/events/%s/%s/format", sys, event);
 
 	buf = read_file(file);
@@ -169,6 +178,10 @@ bool perf_bundle::add_event(const char *event_name)
 		if ((int)ev->trace_type >= 0) {
 			if (event_names.find(ev->trace_type) == event_names.end()) {
 				event_names[ev->trace_type] = strdup(event_name);
+				if (!event_names[ev->trace_type]) {
+					delete ev;
+					continue;
+				}
 				parse_event_format(event_name);
 			}
 			events.push_back(ev);
author
#3 lore raw

2012-09-18 (화), 07:25 -0700, Arjan van de Ven:

Quoted 7 lines · Namhyung Kim
Quoted 1 line

Check return value of malloc/strdup not to make NULL dereferences.

I don't mind these patches; they are clean code

however, one of the core userspace developers at work basically said "we don't check for malloc NULL in userspace; if that ever happens the system is so screwed up anyway that you just cannot continue".

Thanks for the quick reply. :)

Basically I agree with you. But even in that case it'd be better letting a user know about current situation somehow rather than just segfault. Maybe by replacing them to xmalloc or so?

Thanks,
Namhyung