From: "Paul E. McKenney" <paulmck@kernel.org>
To: Marco Elver <elver@google.com>
Cc: kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] kcsan: Fix function matching in report
Date: Fri, 10 Apr 2020 13:38:15 -0700 [thread overview]
Message-ID: <20200410203815.GV17661@paulmck-ThinkPad-P72> (raw)
In-Reply-To: <20200410164418.65808-1-elver@google.com>
On Fri, Apr 10, 2020 at 06:44:17PM +0200, Marco Elver wrote:
> Pass string length as returned by scnprintf() to strnstr(), since
> strnstr() searches exactly len bytes in haystack, even if it contains a
> NUL-terminator before haystack+len.
>
> Signed-off-by: Marco Elver <elver@google.com>
I queued both for testing and review, thank you, Marco!
Thanx, Paul
> ---
> kernel/kcsan/report.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/kernel/kcsan/report.c b/kernel/kcsan/report.c
> index ddc18f1224a4..cf41d63dd0cd 100644
> --- a/kernel/kcsan/report.c
> +++ b/kernel/kcsan/report.c
> @@ -192,11 +192,11 @@ skip_report(enum kcsan_value_change value_change, unsigned long top_frame)
> * maintainers.
> */
> char buf[64];
> + int len = scnprintf(buf, sizeof(buf), "%ps", (void *)top_frame);
>
> - snprintf(buf, sizeof(buf), "%ps", (void *)top_frame);
> - if (!strnstr(buf, "rcu_", sizeof(buf)) &&
> - !strnstr(buf, "_rcu", sizeof(buf)) &&
> - !strnstr(buf, "_srcu", sizeof(buf)))
> + if (!strnstr(buf, "rcu_", len) &&
> + !strnstr(buf, "_rcu", len) &&
> + !strnstr(buf, "_srcu", len))
> return true;
> }
>
> @@ -262,15 +262,15 @@ static const char *get_thread_desc(int task_id)
> static int get_stack_skipnr(const unsigned long stack_entries[], int num_entries)
> {
> char buf[64];
> + int len;
> int skip = 0;
>
> for (; skip < num_entries; ++skip) {
> - snprintf(buf, sizeof(buf), "%ps", (void *)stack_entries[skip]);
> - if (!strnstr(buf, "csan_", sizeof(buf)) &&
> - !strnstr(buf, "tsan_", sizeof(buf)) &&
> - !strnstr(buf, "_once_size", sizeof(buf))) {
> + len = scnprintf(buf, sizeof(buf), "%ps", (void *)stack_entries[skip]);
> + if (!strnstr(buf, "csan_", len) &&
> + !strnstr(buf, "tsan_", len) &&
> + !strnstr(buf, "_once_size", len))
> break;
> - }
> }
> return skip;
> }
> --
> 2.26.0.110.g2183baf09c-goog
>
prev parent reply other threads:[~2020-04-10 20:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-10 16:44 [PATCH 1/2] kcsan: Fix function matching in report Marco Elver
2020-04-10 16:44 ` [PATCH 2/2] kcsan: Make reporting aware of KCSAN tests Marco Elver
2020-04-10 20:38 ` Paul E. McKenney [this message]
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=20200410203815.GV17661@paulmck-ThinkPad-P72 \
--to=paulmck@kernel.org \
--cc=elver@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.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;
as well as URLs for NNTP newsgroup(s).