mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Divya Indi <divya.indi@oracle.com>
To: Steven Rostedt <rostedt@goodmis.org>, linux-kernel@vger.kernel.org
Cc: Divya Indi <divya.indi@oracle.com>,
	Aruna Ramakrishna <aruna.ramakrishna@oracle.com>,
	Srinivas Eeda <srinivas.eeda@oracle.com>,
	Joe Jin <joe.jin@oracle.com>,
	Manjunath Patil <manjunath.b.patil@oracle.com>
Subject: [PATCH 3/5] tracing: Adding NULL checks
Date: Wed, 13 Nov 2019 13:16:00 -0800	[thread overview]
Message-ID: <1573679762-7774-4-git-send-email-divya.indi@oracle.com> (raw)
In-Reply-To: <1573679762-7774-3-git-send-email-divya.indi@oracle.com>

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.

Signed-off-by: Divya Indi <divya.indi@oracle.com>
Reviewed-by: Aruna Ramakrishna <aruna.ramakrishna@oracle.com>
Reviewed-by: Manjunath Patil <manjunath.b.patil@oracle.com>
---
 kernel/trace/trace.c        | 3 +++
 kernel/trace/trace_events.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index bff967f..e0faf81 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3205,6 +3205,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);
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 0ce3db6..2621995 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -800,6 +800,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.
-- 
1.8.3.1


  reply	other threads:[~2019-11-13 21:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-13 21:15 [RFC v4] Kernel access to ftrace instances Divya Indi
2019-11-13 21:15 ` [PATCH 1/5] tracing: Declare newly exported APIs in include/linux/trace.h Divya Indi
2019-11-13 21:15   ` [PATCH 2/5] tracing: Verify if trace array exists before destroying it Divya Indi
2019-11-13 21:16     ` Divya Indi [this message]
2019-11-13 21:16       ` [PATCH 4/5] tracing: Adding new functions for kernel access to Ftrace instances Divya Indi
2019-11-13 21:16         ` [PATCH 5/5] tracing: Sample module to demonstrate " Divya Indi
2019-11-14 17:17         ` [PATCH 4/5] tracing: Adding new functions for " Steven Rostedt
  -- strict thread matches above, loose matches on Subject: below --
2019-08-14 17:55 [PATCH 0/5 v4]Kernel Access " Divya Indi
2019-08-14 17:55 ` [PATCH 3/5] tracing: Adding NULL checks Divya Indi

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=1573679762-7774-4-git-send-email-divya.indi@oracle.com \
    --to=divya.indi@oracle.com \
    --cc=aruna.ramakrishna@oracle.com \
    --cc=joe.jin@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=manjunath.b.patil@oracle.com \
    --cc=rostedt@goodmis.org \
    --cc=srinivas.eeda@oracle.com \
    /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

Powered by JetHome