From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Beau Belgrave <beaub@linux.microsoft.com>,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: [for-next][PATCH 02/12] user_events: Fix potential uninitialized pointer while parsing field
Date: Sat, 12 Mar 2022 18:25:27 -0500 [thread overview]
Message-ID: <20220312232550.246237276@goodmis.org> (raw)
In-Reply-To: 20220312232525.234705244@goodmis.org
From: Beau Belgrave <beaub@linux.microsoft.com>
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: Beau Belgrave <beaub@linux.microsoft.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/trace_events_user.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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)
--
2.35.1
next prev parent reply other threads:[~2022-03-12 23:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-12 23:25 [for-next][PATCH 00/12] tracing: Updates for v5.18 Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 01/12] tracing: Fix allocation of last_cmd in last_cmd_set() Steven Rostedt
2022-03-12 23:25 ` Steven Rostedt [this message]
2022-03-12 23:25 ` [for-next][PATCH 03/12] tracing: Fix last_cmd_set() string management in histogram code Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 04/12] tracing: Allow custom events to be added to the tracefs directory Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 05/12] tracing: Add sample code for custom trace events Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 06/12] tracing: Move the defines to create TRACE_EVENTS into their own files Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 07/12] tracing: Add TRACE_CUSTOM_EVENT() macro Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 08/12] user_events: Prevent dyn_event delete racing with ioctl add/delete Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 09/12] tracing: Fix strncpy warning in trace_events_synth.c Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 10/12] tracing: Have TRACE_DEFINE_ENUM affect trace event types as well Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 11/12] tracing: Add snapshot at end of kernel boot up Steven Rostedt
2022-03-12 23:25 ` [for-next][PATCH 12/12] tracing/user_events: Use alloc_pages instead of kzalloc() for register pages Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220312232550.246237276@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=beaub@linux.microsoft.com \
--cc=dan.carpenter@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox