]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tracing: Adding NULL checks for trace_array descriptor pointer
authorDivya Indi <divya.indi@oracle.com>
Wed, 14 Aug 2019 17:55:25 +0000 (10:55 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 09:11:51 +0000 (11:11 +0200)
[ Upstream commit 953ae45a0c25e09428d4a03d7654f97ab8a36647 ]

As part of commit f45d1225adb0 ("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>
kernel/trace/trace.c
kernel/trace/trace_events.c

index 06efd18bf3e385b0539ba3480db7e0926d47a61c..17ea5f9d36b480f350fa43236279b8ce104f1c1d 100644 (file)
@@ -2271,6 +2271,9 @@ int trace_array_printk(struct trace_array *tr,
        if (!(global_trace.trace_flags & TRACE_ITER_PRINTK))
                return 0;
 
+       if (!tr)
+               return -ENOENT;
+
        va_start(ap, fmt);
        ret = trace_array_vprintk(tr, ip, fmt, ap);
        va_end(ap);
index bd4c0bb61ad72cc7d72f06710f9c0421f113de23..9d6e755d17546163849ab14a4f19e04ce12d9760 100644 (file)
@@ -755,6 +755,8 @@ static int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set)
        char *event = NULL, *sub = NULL, *match;
        int ret;
 
+       if (!tr)
+               return -ENOENT;
        /*
         * The buf format can be <subsystem>:<event-name>
         *  *:<event-name> means any event by that name.