From patchwork Tue Jul 11 11:53:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhijian Li (Fujitsu)" X-Patchwork-Id: 13308469 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C57E3EB64DC for ; Tue, 11 Jul 2023 11:55:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230313AbjGKLzG (ORCPT ); Tue, 11 Jul 2023 07:55:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbjGKLzF (ORCPT ); Tue, 11 Jul 2023 07:55:05 -0400 X-Greylist: delayed 64 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 11 Jul 2023 04:55:03 PDT Received: from esa5.hc1455-7.c3s2.iphmx.com (esa5.hc1455-7.c3s2.iphmx.com [68.232.139.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 817CA11D for ; Tue, 11 Jul 2023 04:55:03 -0700 (PDT) X-IronPort-AV: E=McAfee;i="6600,9927,10767"; a="123651479" X-IronPort-AV: E=Sophos;i="6.01,196,1684767600"; d="scan'208";a="123651479" Received: from unknown (HELO yto-r4.gw.nic.fujitsu.com) ([218.44.52.220]) by esa5.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2023 20:53:58 +0900 Received: from yto-m3.gw.nic.fujitsu.com (yto-nat-yto-m3.gw.nic.fujitsu.com [192.168.83.66]) by yto-r4.gw.nic.fujitsu.com (Postfix) with ESMTP id 959C9D3EB2 for ; Tue, 11 Jul 2023 20:53:55 +0900 (JST) Received: from kws-ab3.gw.nic.fujitsu.com (kws-ab3.gw.nic.fujitsu.com [192.51.206.21]) by yto-m3.gw.nic.fujitsu.com (Postfix) with ESMTP id DA339D9687 for ; Tue, 11 Jul 2023 20:53:54 +0900 (JST) Received: from localhost.localdomain (unknown [10.167.234.230]) by kws-ab3.gw.nic.fujitsu.com (Postfix) with ESMTP id 2852220077BB3; Tue, 11 Jul 2023 20:53:54 +0900 (JST) From: Li Zhijian To: nvdimm@lists.linux.dev, alison.schofield@intel.com Cc: linux-cxl@vger.kernel.org, Li Zhijian , Dave Jiang Subject: [ndctl PATCH v4 2/4] cxl/monitor: replace monitor.log_file with monitor.ctx.log_file Date: Tue, 11 Jul 2023 19:53:42 +0800 Message-Id: <20230711115344.562823-3-lizhijian@fujitsu.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230711115344.562823-1-lizhijian@fujitsu.com> References: <20230711115344.562823-1-lizhijian@fujitsu.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-27744.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27744.006 X-TMASE-Result: 10--12.638700-10.000000 X-TMASE-MatchedRID: tQw5ef8H/dt4Ydbp7yKeAVhRyidsElYkQR7lWMXPA1uOVdQAiMmbZ441 Yiw6vZQgEr2Q42LcwM8KRuKRI67R4Aw8Nmue9wz38IK7yRWPRNFc8r3LfPzYa6CjQPEjtbB0dqr zSDDO/UQi+t+0AiFaYvL3NxFKQpq1uE+7i0XVHsEMPOZL2X19in607foZgOWyPdIdnoYIUtmjxY yRBa/qJcFwgTvxipFajoczmuoPCq0mkgQKuNNMrkwcfFlhTHyDXn57FXFUEqewRxQ5xVOCTszFc YWKl9tq X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org Commit ba5825b0b7e0 ("ndctl/monitor: move common logging functions to util/log.c") have replaced monitor.log_file with monitor.ctx.log_file for ndctl-monitor, but for cxl-monitor, it forgot to do such work. So where user specifies its own logfile, a segmentation fault will be trggered like below: # build/cxl/cxl monitor -l ./monitor.log Segmentation fault (core dumped) Fixes: 299f69f974a6 ("cxl/monitor: add a new monitor command for CXL trace events") Reviewed-by: Dave Jiang Signed-off-by: Li Zhijian Reviewed-by: Alison Schofield --- V4: add reviewed tag V2: exchange order of previous patch1 and patch2 # Alison a few commit log updated --- cxl/monitor.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cxl/monitor.c b/cxl/monitor.c index d8245ed8d0e9..e83455b63d35 100644 --- a/cxl/monitor.c +++ b/cxl/monitor.c @@ -37,7 +37,6 @@ const char *default_log = "/var/log/cxl-monitor.log"; static struct monitor { const char *log; struct log_ctx ctx; - FILE *log_file; bool human; bool verbose; bool daemon; @@ -192,8 +191,8 @@ int cmd_monitor(int argc, const char **argv, struct cxl_ctx *ctx) if (strncmp(log, "./standard", 10) == 0) monitor.ctx.log_fn = log_standard; else { - monitor.log_file = fopen(log, "a+"); - if (!monitor.log_file) { + monitor.ctx.log_file = fopen(log, "a+"); + if (!monitor.ctx.log_file) { rc = -errno; error("open %s failed: %d\n", log, rc); goto out; @@ -212,7 +211,7 @@ int cmd_monitor(int argc, const char **argv, struct cxl_ctx *ctx) rc = monitor_event(ctx); out: - if (monitor.log_file) - fclose(monitor.log_file); + if (monitor.ctx.log_file) + fclose(monitor.ctx.log_file); return rc; }