| Message ID | 20220224181637.2129-1-beaub@linux.microsoft.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Commit | 7f03bc737c07545d8bcd791f15af426cf74d792e |
| Headers | show |
| Series | user_events: Fix potential uninitialized pointer while parsing field | expand |
diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 2b5e9fdb63a0..9a6191a6a786 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -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)
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/ Signed-off-by: Beau Belgrave <beaub@linux.microsoft.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> --- kernel/trace/trace_events_user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: 864ea0e10cc90416a01b46f0d47a6f26dc020820