From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [for-linus][PATCH 08/15] tracing: Change synthetic event string format to limit printed length
Date: Tue, 06 Oct 2020 10:34:54 -0400 [thread overview]
Message-ID: <20201006143511.847692707@goodmis.org> (raw)
In-Reply-To: 20201006143446.182666356@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Change the format for printing synthetic field strings to limit the
length of the string printed even if it's not correctly terminated.
Link: https://lore.kernel.org/r/20201002210036.0200371b@oasis.local.home
Link: https://lkml.kernel.org/r/b6bdb34e70d970e8026daa3503db6b8e5cdad524.1601848695.git.zanussi@kernel.org
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace_events_synth.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c
index 24bc6d61aa40..742ce5f62d6d 100644
--- a/kernel/trace/trace_events_synth.c
+++ b/kernel/trace/trace_events_synth.c
@@ -234,7 +234,7 @@ static const char *synth_field_fmt(char *type)
else if (strcmp(type, "gfp_t") == 0)
fmt = "%x";
else if (synth_field_is_string(type))
- fmt = "%s";
+ fmt = "%.*s";
return fmt;
}
@@ -303,11 +303,13 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter,
str_field = (char *)entry + data_offset;
trace_seq_printf(s, print_fmt, se->fields[i]->name,
+ STR_VAR_LEN_MAX,
str_field,
i == se->n_fields - 1 ? "" : " ");
n_u64++;
} else {
trace_seq_printf(s, print_fmt, se->fields[i]->name,
+ STR_VAR_LEN_MAX,
(char *)&entry->fields[n_u64],
i == se->n_fields - 1 ? "" : " ");
n_u64 += STR_VAR_LEN_MAX / sizeof(u64);
--
2.28.0
next prev parent reply other threads:[~2020-10-06 14:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 14:34 [for-linus][PATCH 00/15] tracing: Some final updates for 5.10 Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 01/15] ftrace: Fix some typos in comment Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 02/15] tracing: Change STR_VAR_MAX_LEN Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 03/15] tracing: Fix parse_synth_field() error handling Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 04/15] tracing: Save normal string variables Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 05/15] tracing: Add support for dynamic strings to synthetic events Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 06/15] tracing: Add README information for synthetic_events file Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 07/15] selftests/ftrace: Add test case for synthetic event dynamic strings Steven Rostedt
2020-10-06 14:34 ` Steven Rostedt [this message]
2020-10-06 14:34 ` [for-linus][PATCH 09/15] ftrace: Use fls() to get the bits for dup_hash() Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 10/15] ftrace: Simplify the hash calculation Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 11/15] ftrace: Simplify the dyn_ftrace->flags macro Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 12/15] ftrace: Simplify the calculation of page number for ftrace_page->records Steven Rostedt
2020-10-06 14:34 ` [for-linus][PATCH 13/15] ftrace: Format variable declarations of ftrace_allocate_records Steven Rostedt
2020-10-06 14:35 ` [for-linus][PATCH 14/15] ftrace: ftrace_global_list is renamed to ftrace_ops_list Steven Rostedt
2020-10-06 14:35 ` [for-linus][PATCH 15/15] tracing: Remove a pointless assignment Steven Rostedt
2020-10-06 15:01 ` [for-linus][PATCH 00/15] tracing: Some final updates for 5.10 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=20201006143511.847692707@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@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