From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
Rajvi Jingar <rajvi.jingar@intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tracing: avoid string overflow
Date: Wed, 28 Mar 2018 09:32:18 -0500 [thread overview]
Message-ID: <1522247538.10197.3.camel@tzanussi-mobl.amr.corp.intel.com> (raw)
In-Reply-To: <20180328140920.2842153-1-arnd@arndb.de>
Hi Arnd,
On Wed, 2018-03-28 at 16:09 +0200, Arnd Bergmann wrote:
> 'err' is used as a NUL-terminated string, but using strncpy() with the length
> equal to the buffer size may result in lack of the termination:
>
> kernel/trace/trace_events_hist.c: In function 'hist_err_event':
> kernel/trace/trace_events_hist.c:396:3: error: 'strncpy' specified bound 256 equals destination size [-Werror=stringop-truncation]
> strncpy(err, var, MAX_FILTER_STR_VAL);
>
> This changes it to use the safer strscpy() instead.
>
> Fixes: f404da6e1d46 ("tracing: Add 'last error' error facility for hist triggers")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> kernel/trace/trace_events_hist.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
> index 4f027642ceef..8357f36d7a1e 100644
> --- a/kernel/trace/trace_events_hist.c
> +++ b/kernel/trace/trace_events_hist.c
> @@ -393,7 +393,7 @@ static void hist_err_event(char *str, char *system, char *event, char *var)
> else if (system)
> snprintf(err, MAX_FILTER_STR_VAL, "%s.%s", system, event);
> else
> - strncpy(err, var, MAX_FILTER_STR_VAL);
> + strscpy(err, var, MAX_FILTER_STR_VAL);
>
> hist_err(str, err);
> }
Yes, thanks for finding this, and for the patch!
Acked-by: Tom Zanussi <tom.zanussi@linux.intel.com>
next prev parent reply other threads:[~2018-03-28 14:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-28 14:09 [PATCH] tracing: avoid string overflow Arnd Bergmann
2018-03-28 14:32 ` Tom Zanussi [this message]
2018-04-02 15:28 ` 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=1522247538.10197.3.camel@tzanussi-mobl.amr.corp.intel.com \
--to=tom.zanussi@linux.intel.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rajvi.jingar@intel.com \
--cc=rostedt@goodmis.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).