Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3784623ybi; Sun, 14 Jul 2019 22:13:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqzHiLUbweDJuurXh3C4VSiakznzpq8gcRinchNN8pNof71jlhOrWVdtoWtlcCAqqnhefFOt X-Received: by 2002:a17:902:361:: with SMTP id 88mr26767016pld.123.1563167613879; Sun, 14 Jul 2019 22:13:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563167613; cv=none; d=google.com; s=arc-20160816; b=hQQA5s83oXNEO/bjnr3PukIQeF95LpX+ACtjMl2Xe14m4mO7WlFs1ukTQ3hrAJn+5J ERZDfCecfCdWJpMpbHblSNJSGEMZCiX9qeU1EaVbESilPd+W70fO6PxnblrAa07U1ANj uk/Mg+d2L0EPDqorSjZemAko59+aOYkBXWWUVkKarreqMas5g1K7a7L9eIkLu9MeE3kB loCBCUz7D58etirGCk974BwmY5NZY+IkNKiumH5yL683whO1hVUYumLlj+FGLPkPEOps NQ6/mfJrybrV4ohsTqQ7ItpXvMq1PmGPJaa61S3lSdFqA8dXrpfHj4jtI67XPx1O3Ygz 0IXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Et7itjNrvZ3Gq73r7WX41P5gLURNNlQLxEUWJuO88Gk=; b=eYPzACzxvvDumjh9BtPo0EPCEQHsJqx4t6hORRdC7dsV8amW4lquTAC9LxqZb9lIEA gMRZSOVs0njxyN/QpQtlABc2Eeogq2t0Wm7DlRg+fLT/mUvuxiL/MfrztDdYxgx6S/LL ewQQlw6RuG6klIr5e1TZ684SdFwUgz6O+CcRb7SHWl6CVumnY4DrfeuV2dwdvnVDH0u4 g1pTuupQJ1Nx0XLM6TBHisFX9Rd64infIVUWjAJ2HAAK8dgYvUTFA/2KycD+w9CWYHlh CbiX2wFJIxvRBbatvCcQf8Z0/EkefWUTlE6g7xifbqMcgwOfazpKR3JqfzI9quc4NA4E bhhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=izs+dkdP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g6si14902258pll.82.2019.07.14.22.13.15; Sun, 14 Jul 2019 22:13:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=izs+dkdP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729182AbfGOFMT (ORCPT + 99 others); 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);