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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 2405FC43215 for ; Mon, 2 Dec 2019 10:16:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2E8821823 for ; Mon, 2 Dec 2019 10:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575281766; bh=XFUFq878wx8ulylKj+mozx37qxZmGp3eAXgARqgqM+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zVyyMt/Z4yyeXyyL+Pfqu61taF1NJqBGc8LWJ8yUVgYT516fmgxrPj4z0wby1ZPnG 8GpOM9O2l9sYH5APs7tjWFOxXJ2GXOSZi5C6U3YnndDtBfps/VoPIEwpPAhIKoJv4l HqA46+b+zBv15oZP59BQZ0TAZ/4kC5rOOuZnPbSo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727368AbfLBKQC (ORCPT ); Mon, 2 Dec 2019 05:16:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:60936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727354AbfLBKQB (ORCPT ); Mon, 2 Dec 2019 05:16:01 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81C3A217D9; Mon, 2 Dec 2019 10:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575281761; bh=XFUFq878wx8ulylKj+mozx37qxZmGp3eAXgARqgqM+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JtzBU/s38nrPqUf1ry6hevb4//dMP8J4G7izDWfMOJnSDw802eLgtJSc1gyBq8t5i AtWcPSJME3wUq82qKsP2h3bHPmooeOqOAOni6/4hPa9VjvfcQrccOVCBkOvIMfSGzh mPvTw0xp6T81ewuBuXbZn+kUwgm38KLzRakYjH1M= From: Masami Hiramatsu To: Steven Rostedt , Frank Rowand Cc: Ingo Molnar , Namhyung Kim , Tim Bird , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , Rob Herring , Andrew Morton , Thomas Gleixner , Greg Kroah-Hartman , Alexey Dobriyan , Jonathan Corbet , Linus Torvalds , linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v4 14/22] tracing: Add NULL trace-array check in print_synth_event() Date: Mon, 2 Dec 2019 19:15:55 +0900 Message-Id: <157528175542.22451.2622783120594712316.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157528159833.22451.14878731055438721716.stgit@devnote2> References: <157528159833.22451.14878731055438721716.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Add NULL trace-array check in print_synth_event(), because if we enable tp_printk option, iter->tr can be NULL. Signed-off-by: Masami Hiramatsu --- 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 06d91bb59297..d902a61775c4 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -833,7 +833,7 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter, fmt = synth_field_fmt(se->fields[i]->type); /* parameter types */ - if (tr->trace_flags & TRACE_ITER_VERBOSE) + if (tr && tr->trace_flags & TRACE_ITER_VERBOSE) trace_seq_printf(s, "%s ", fmt); snprintf(print_fmt, sizeof(print_fmt), "%%s=%s%%s", fmt);