tracing: Adding NULL checks for trace_array descriptor pointer (953ae45a) · Commits · 戴 / test

As part of commit ("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:

kernel/trace/trace.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3297,6 +3297,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 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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.