From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Namhyung Kim <namhyung@kernel.org>,
Changbin Du <changbin.du@intel.com>
Subject: [for-next][PATCH 2/6] tracing: Clear parser->idx if only spaces are read
Date: Wed, 24 Jan 2018 13:36:35 -0500 [thread overview]
Message-ID: <20180124183655.981887270@goodmis.org> (raw)
In-Reply-To: <20180124183633.610217564@goodmis.org>
[-- Attachment #1: 0002-tracing-Clear-parser-idx-if-only-spaces-are-read.patch --]
[-- Type: text/plain, Size: 995 bytes --]
From: Changbin Du <changbin.du@intel.com>
If only spaces were read while parsing the next string, then parser->idx should be
cleared in order to make trace_parser_loaded() return false.
Link: http://lkml.kernel.org/r/1516093350-12045-3-git-send-email-changbin.du@intel.com
Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Changbin Du <changbin.du@intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c00a31d18f8a..cb90435e63da 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1236,14 +1236,14 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf,
cnt--;
}
+ parser->idx = 0;
+
/* only spaces were written */
if (isspace(ch) || !ch) {
*ppos += read;
ret = read;
goto out;
}
-
- parser->idx = 0;
}
/* read the non-space input */
--
2.15.1
next prev parent reply other threads:[~2018-01-24 18:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-24 18:36 [for-next][PATCH 0/6] tracing: A few updates for 4.16 Steven Rostedt
2018-01-24 18:36 ` [for-next][PATCH 1/6] tracing: Detect the string nul character when parsing user input string Steven Rostedt
2018-01-24 18:36 ` Steven Rostedt [this message]
2018-01-24 18:36 ` [for-next][PATCH 3/6] tracing: Make sure the parsed string always terminates with \0 Steven Rostedt
2018-01-24 18:36 ` [for-next][PATCH 4/6] trace_uprobe: Display correct offset in uprobe_events Steven Rostedt
2018-01-24 18:36 ` [for-next][PATCH 5/6] ftrace: Mark function tracer test functions noinline/noclone Steven Rostedt
2018-01-24 18:36 ` [for-next][PATCH 6/6] vsprintf: Do not have bprintf dereference pointers 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=20180124183655.981887270@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=changbin.du@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@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
Powered by JetHome