From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E56BCC4363A for ; Mon, 5 Oct 2020 22:17:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A4E920774 for ; Mon, 5 Oct 2020 22:17:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726793AbgJEWRy (ORCPT ); Mon, 5 Oct 2020 18:17:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:49908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725870AbgJEWRy (ORCPT ); Mon, 5 Oct 2020 18:17:54 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 449FB206CB; Mon, 5 Oct 2020 22:17:53 +0000 (UTC) Date: Mon, 5 Oct 2020 18:17:51 -0400 From: Steven Rostedt To: Tom Zanussi Cc: axelrasmussen@google.com, mhiramat@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 7/7] tracing: Change synthetic event string format to limit printed length Message-ID: <20201005181751.1338afbc@gandalf.local.home> In-Reply-To: References: X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 4 Oct 2020 17:14:09 -0500 Tom Zanussi wrote: > From: Steven Rostedt > > Change the format for printing synthetic field strings to limit the > length of the string printed even if it's not correctly terminated. > > Description from Steve: > > I also added this for a bit of paranoid, and probably should be a > separate patch, just to make sure if the string isn't nul terminated, > this will keep it from bleeding pass the end of the string. Just FYI. In the future, for something like this, you should still have your own Signed-off-by, as you are sending it (and part of the commit path). You could also add: [ Need signed-off-by from Steven ] Which I would have also added as well. Thanks! -- Steve > --- > 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);