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=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 762B1C7618B for ; Mon, 15 Jul 2019 05:12:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AA1821655 for ; Mon, 15 Jul 2019 05:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563167540; bh=1MgpH1r23u2tqpsRDhiOww76XSTOfo2+LJaAlGqRg44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jfcGqKNPAunrQAxu8gsW2f0jXIQfkNVavnLCz7xZiP8wBdAu/KkE46c0M5S4n4d8j pzCleTdQi5O0MLEM6DPVfqTYj8D0fL0lVwdXy3SoWoVNaRmQvLRzpb+7PlrQoYPgA6 Y5sDRj0EZQFq4v0Jtoq0MBG3iuFtMypDlnvBjt+U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729191AbfGOFMT (ORCPT ); Mon, 15 Jul 2019 01:12:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:46886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725385AbfGOFMS (ORCPT ); Mon, 15 Jul 2019 01:12:18 -0400 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 40B24214C6; Mon, 15 Jul 2019 05:12:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563167537; bh=1MgpH1r23u2tqpsRDhiOww76XSTOfo2+LJaAlGqRg44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izs+dkdPe6px5EWFBoBHvZhEW4fFHIs+lmPfx7nydzT9bC3q8dQ0B6rtwZCSpbyHS mW/dJzWJPMB7BUuTBWdLsmVPvfffLaRRF+M0NXynCP1MB8UTxXOP2Jt9kiJ/dpI4om FrXL0vIFF0ODJ1jqv9cAYS7uvfUtEKRMv4nQduhM= From: Masami Hiramatsu To: Steven Rostedt , Rob Herring , Frank Rowand , Tim Bird Cc: Ingo Molnar , Namhyung Kim , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [RFC PATCH v2 06/15] tracing: Add NULL trace-array check in print_synth_event() Date: Mon, 15 Jul 2019 14:12:12 +0900 Message-Id: <156316753259.23477.16711531463620386669.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <156316746861.23477.5815110570539190650.stgit@devnote2> References: <156316746861.23477.5815110570539190650.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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 a7f447195143..db973928e580 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -822,7 +822,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);