moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracing: Adding NULL checks for trace_array descriptor pointer

Browse Source 
[ Upstream commit 953ae45a0c ]

As part of commit f45d1225ad ("tracing: Kernel access to Ftrace
instances") we exported certain functions. Here, we are adding some additional
NULL checks to ensure safe usage by users of these APIs.

Link: http://lkml.kernel.org/r/1565805327-579-4-git-send-email-divya.indi@oracle.com

Signed-off-by: Divya Indi <divya.indi@oracle.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Divya Indi
2019-08-14 10:55:25 -07:00
committed by Greg Kroah-Hartman
parent 8e0d54aa40
commit 9f81aa5d44
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/trace/trace.c
View File

@@ -3233,6 +3233,9 @@ int trace_array_printk(struct trace_array *tr,
if (!(global_trace.trace_flags & TRACE_ITER_PRINTK)) if (!(global_trace.trace_flags & TRACE_ITER_PRINTK))
return 0; return 0;
if (!tr)
return -ENOENT;
va_start(ap, fmt); va_start(ap, fmt);
ret = trace_array_vprintk(tr, ip, fmt, ap); ret = trace_array_vprintk(tr, ip, fmt, ap);
va_end(ap); va_end(ap);

2
kernel/trace/trace_events.c
View File

@@ -793,6 +793,8 @@ int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set)
char *event = NULL, *sub = NULL, *match; char *event = NULL, *sub = NULL, *match;
int ret; int ret;
if (!tr)
return -ENOENT;
/* /*
* The buf format can be <subsystem>:<event-name> * The buf format can be <subsystem>:<event-name>
* *:<event-name> means any event by that name. * *:<event-name> means any event by that name.