Commit 173c2049 authored by Beau Belgrave's avatar Beau Belgrave Committed by Steven Rostedt (Google)
Browse files

user_events: Fix potential uninitialized pointer while parsing field 

Ensure name is initialized by default to NULL to prevent possible edge
cases that could lead to it being left uninitialized. Add an explicit
check for NULL name to ensure edge boundaries.

Link: https://lore.kernel.org/bpf/20220224105334.GA2248@kili/
Link: https://lore.kernel.org/linux-trace-devel/20220224181637.2129-1-beaub@linux.microsoft.com



Signed-off-by: default avatarBeau Belgrave <beaub@linux.microsoft.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 9f8e5aee

kernel/trace/trace_events_user.c

+3 −1
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ static int user_event_parse_field(char *field, struct user_event *user, 
	*field++ = '\0';

	depth++;

parse:

	name = NULL;



	while ((part = strsep(&field, " ")) != NULL) {

		switch (depth++) {

		case FIELD_DEPTH_TYPE:
@@ -382,7 +384,7 @@ static int user_event_parse_field(char *field, struct user_event *user, 
		}

	}



	if (depth < FIELD_DEPTH_SIZE)

	if (depth < FIELD_DEPTH_SIZE || !name)

		return -EINVAL;



	if (depth == FIELD_DEPTH_SIZE)