Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp3612282ybl; Sun, 25 Aug 2019 20:19:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqxLX6BP/uhVE2bl12FW6s2jRr5kjcmiHkervaXo5aWtgWpp/dfOxQXMrWFL2/9yVZpkEz1M X-Received: by 2002:a17:902:8b8c:: with SMTP id ay12mr3795515plb.251.1566789551890; Sun, 25 Aug 2019 20:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566789551; cv=none; d=google.com; s=arc-20160816; b=QuQogcMw7K95GlYnraibxsGTErNaAMnJvSquxOVINNDLGjQvAE0uqp+0qQiVn3OEqb mRxUWMp2482wZC088NXLH6948s7QKumpzuK3JTWHUjbX/yDuR+Jrd6XYryrLXFZVEp18 VA0mRi4TpA/1Ca6wnpXmzxTpC3yQC/c/ZZVCIMKyD8s/Vq3gFKA6jtg8BVNT7Vpjxl3U bKn2vExfNclNp0bNbEB6QJhvOwFxcqok27fr/ijlRjxUJMa2k2/pO/sr8CA9oxH0MmFh NXrBBiA1Qj9Yp7Pboi/j3ao0MbOY6VM5Ig3PJ0UMg4ex0xrAN994AjhSuNX926kuKDkS vqVQ== 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=It1GV6nSmxc6+ZjaeNHyrJ0FPYR6YG+fNzVEzLYYrlMUVCacMJ8KX84kUhLqH2P+J3 zZH2h2Rt0VNm1/c6K9Uyw2MB2g2BnBeweXRLgaacIJSHDsmLzmfuc82cjTjnqATe/Vhj Gd0IzJy2kzdayxEvi1gpptZfCv/W10gaiqfqHiKNjLGojh4bvyolAYWJTN6HTeJo3JLG 3S1aYI0ZRGniXywwaeBuhhWbOsL97g6vF4rpD3oIZbHku+vQoyd68hafbAip0E6P7rq/ h46pivCgn09VXKwGGLk2792/hL3wB+0KZogU+tQSeklk7J8u86cy/eu/rJzd87gXenhy gPgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zaXDSbi+; 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 v123si9065353pfb.241.2019.08.25.20.18.57; Sun, 25 Aug 2019 20:19:11 -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=zaXDSbi+; 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 S1729565AbfHZDRo (ORCPT + 99 others); Sun, 25 Aug 2019 23:17:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:36574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729292AbfHZDRn (ORCPT ); Sun, 25 Aug 2019 23:17:43 -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 D19562168B; Mon, 26 Aug 2019 03:17:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566789462; bh=1MgpH1r23u2tqpsRDhiOww76XSTOfo2+LJaAlGqRg44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zaXDSbi+ox96xhO+enb6+FyW0JgXbUv/q9TK5OX23mUY4QpkElBk/cXC27VH7vYVf RzJL/bmO8P70DmL5emCXieC+1JmaG7s/2SrvORkwT5FrYa8UuDIakmLHJt/oJGec45 99i9dgUyMrLHFoagWS0qJq6+rMHbyrDJOCwK0cdk= 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 v3 10/19] tracing: Add NULL trace-array check in print_synth_event() Date: Mon, 26 Aug 2019 12:17:36 +0900 Message-Id: <156678945659.21459.15789978012125587066.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <156678933823.21459.4100380582025186209.stgit@devnote2> References: <156678933823.21459.4100380582025186209.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);