From patchwork Sat Feb 18 00:40:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13145441 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 3FBEBC636D6 for ; Sat, 18 Feb 2023 00:44:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229882AbjBRAow (ORCPT ); Fri, 17 Feb 2023 19:44:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbjBRAov (ORCPT ); Fri, 17 Feb 2023 19:44:51 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F0FF6B336 for ; Fri, 17 Feb 2023 16:44:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676681059; x=1708217059; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=LT0dFcEhdmV5La+BwNbufwp+Qmm3U4wmcz4EnEgESaI=; b=SlYQ2n1R8UVcCcpUTzLexI0qD6t673KPNeKhgXHJu5rl89I1nvp+cdNK t0bFOpXU0MxdX+kmVFk3XfmqCe/oepj+7rMhTYPcRgPpzrvRVHPoU+Nha IaWwPfA9TkgGKvLH6Z/IIZX5zdotp52bcgqFT+h07cp5BR2PsW4nGVEsj qBi2LVcEifxU4F8iOY9QsdDoPixrURdDg1gKb/WRtnfjxU/TTN/X3UXSF hexxStpeEXJaMHXJewZ63MiMezolKhMW11CZ4K60Klxr+ybbvidRL5Efm 03FQMCAnhy2oJjXS5bpE7n3ZREIo4RNWqELQIII40QHM6P80C/pUp+Rwr Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10624"; a="311754222" X-IronPort-AV: E=Sophos;i="5.97,306,1669104000"; d="scan'208";a="311754222" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2023 16:40:32 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10624"; a="844749002" X-IronPort-AV: E=Sophos;i="5.97,306,1669104000"; d="scan'208";a="844749002" Received: from basavana-mobl.amr.corp.intel.com (HELO vverma7-desk1.local) ([10.209.2.127]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2023 16:40:32 -0800 From: Vishal Verma Date: Fri, 17 Feb 2023 17:40:22 -0700 Subject: [PATCH ndctl 1/3] cxl/event_trace: fix a resource leak in cxl_event_to_json() MIME-Version: 1.0 Message-Id: <20230217-coverity-fixes-v1-1-043fac896a40@intel.com> References: <20230217-coverity-fixes-v1-0-043fac896a40@intel.com> In-Reply-To: <20230217-coverity-fixes-v1-0-043fac896a40@intel.com> To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, Dave Jiang , Dan Williams , Vishal Verma X-Mailer: b4 0.13-dev-ada30 X-Developer-Signature: v=1; a=openpgp-sha256; l=1014; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=LT0dFcEhdmV5La+BwNbufwp+Qmm3U4wmcz4EnEgESaI=; b=owGbwMvMwCXGf25diOft7jLG02pJDMkf5OrtNqj9Oi8mONXFNjPnluU+xthEnnbvvT4pa5S41 VhivrF0lLIwiHExyIopsvzd85HxmNz2fJ7ABEeYOaxMIEMYuDgFYCJf1BgZZtjvadkRZnKEMTJE hmO//yqT9osredXf/9rXO/fAcs6Zuxj++2YXJq2W6C733H7721n2dT7yupN+dy26Hfzx9Kdat5/ veAE= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org Static analysis reports that a 'return -ENOMEM' in the above function bypasses the error unwinding and leaks 'jevent'. Fix the error handling to use the right goto sequence before returning. Fixes: 8dedc6cf5e85 ("cxl: add a helper to parse trace events into a json object") Cc: Dave Jiang Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Dave Jiang Reviewed-by: Ira Weiny --- cxl/event_trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cxl/event_trace.c b/cxl/event_trace.c index a973a1f..76dd4e7 100644 --- a/cxl/event_trace.c +++ b/cxl/event_trace.c @@ -142,7 +142,8 @@ static int cxl_event_to_json(struct tep_event *event, struct tep_record *record, jobj = num_to_json(data, f->elementsize, f->flags); if (!jobj) { json_object_put(jarray); - return -ENOMEM; + rc = -ENOMEM; + goto err_jevent; } json_object_array_add(jarray, jobj); data += f->elementsize; From patchwork Sat Feb 18 00:40:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13145442 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 2FDD1C636D6 for ; Sat, 18 Feb 2023 00:45:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbjBRApb (ORCPT ); Fri, 17 Feb 2023 19:45:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229800AbjBRApX (ORCPT ); Fri, 17 Feb 2023 19:45:23 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7889953818 for ; Fri, 17 Feb 2023 16:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676681091; x=1708217091; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=9UeQUR+hYc76x7YfmfwMiEJR1+Ro6FeZ9RipZ0udPiY=; b=iUe8jc2QwijtlU/ZDcuyoNm2NtDA0odBfc4syymg4F7Z8bPB34RAkmX6 QQnsT2u6zOdquLfkfeS1nMLE7XWvrCQf5Ogjw2NM8wx8AcefkaIsmrsXM F5puc4AzXANGeZBcashBqAqD9EivUWVj9Xwaw7Fg19BD6BqHMjrxupNaf c8l/Ci+Z/y88fAJGp32o6EMuUffDsV0qtIEwPpwmtMU10FN4iC9u7ToGv 03yr2mbH/LlHjUYwQxsERIWOaPagbil3FmrZersnL/jM7YbYCchK2N2h+ 1i4P7RVG0/FRMp2PHThqaQ5sfuDnT6+B4yIzrmIdNYaUO+0oprp2r/uNP Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10624"; a="311754224" X-IronPort-AV: E=Sophos;i="5.97,306,1669104000"; d="scan'208";a="311754224" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2023 16:40:32 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10624"; a="844749005" X-IronPort-AV: E=Sophos;i="5.97,306,1669104000"; d="scan'208";a="844749005" Received: from basavana-mobl.amr.corp.intel.com (HELO vverma7-desk1.local) ([10.209.2.127]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2023 16:40:32 -0800 From: Vishal Verma Date: Fri, 17 Feb 2023 17:40:23 -0700 Subject: [PATCH ndctl 2/3] cxl/monitor: retain error code in monitor_event() MIME-Version: 1.0 Message-Id: <20230217-coverity-fixes-v1-2-043fac896a40@intel.com> References: <20230217-coverity-fixes-v1-0-043fac896a40@intel.com> In-Reply-To: <20230217-coverity-fixes-v1-0-043fac896a40@intel.com> To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, Dave Jiang , Dan Williams , Vishal Verma X-Mailer: b4 0.13-dev-ada30 X-Developer-Signature: v=1; a=openpgp-sha256; l=1113; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=9UeQUR+hYc76x7YfmfwMiEJR1+Ro6FeZ9RipZ0udPiY=; b=owGbwMvMwCXGf25diOft7jLG02pJDMkf5Oq7Dz7oPdK202man3ff7srrsX2e1t6rzix8utVA3 9vz82r9jlIWBjEuBlkxRZa/ez4yHpPbns8TmOAIM4eVCWQIAxenAEzk5U6Gf6o3Ox4vXb1mb3bk bcl1SXfSZE2vme8+HnE4SuMZb/+CjXcY/lfYH5H58mD1Nb0LU9ze3eKatvb1V8tFhz1ObRK4WXX Dt58BAA== X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org Static analysis reports that the error unwinding path in monitor_event() overwrites 'rc' with the return from cxl_event_tracing_disable(). This masks the actual error code from either epoll_wait() or cxl_parse_events() which is the one that should be propagated. Print a spot error in case there's an error while disabling tracing, but otherwise retain the rc from the main body of the function. Fixes: 299f69f974a6 ("cxl/monitor: add a new monitor command for CXL trace events") Cc: Dave Jiang Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Dave Jiang Reviewed-by: Ira Weiny --- cxl/monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cxl/monitor.c b/cxl/monitor.c index 31e6f98..749f472 100644 --- a/cxl/monitor.c +++ b/cxl/monitor.c @@ -130,7 +130,8 @@ static int monitor_event(struct cxl_ctx *ctx) } parse_err: - rc = cxl_event_tracing_disable(inst); + if (cxl_event_tracing_disable(inst) < 0) + err(&monitor, "failed to disable tracing\n"); event_en_err: epoll_ctl_err: close(fd); From patchwork Sat Feb 18 00:40:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13145443 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 86A66C636D6 for ; Sat, 18 Feb 2023 00:45:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229745AbjBRAp4 (ORCPT ); Fri, 17 Feb 2023 19:45:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbjBRApz (ORCPT ); Fri, 17 Feb 2023 19:45:55 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7739C6745E for ; Fri, 17 Feb 2023 16:45:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676681123; x=1708217123; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=4mXc8aXzC2a5QQ64fr2TipWZlLxkknQajmWzGZWeva0=; b=AZ+ZFQyV6Rl3B1I0neOF2lyHf3uILbtddzNCbs2SYR+ez966JJRE9d8Z yN3GXaQMG6DU1FQcYKDReEi68hqDatRq2q88IzMRKb/rqJcRpuimeAokI fRPmsqIHdJlaS0YhS9oFVeZ8zeQxAtsfWCuA0sQAKASznxMRSzQtlZWiM u1ryoiL2WyIaITfO4ifLP7gF0Co//ZXTv7gWzqOd5siPxLYoWQnUp7tzg uUlJPkQyeiDNXSr8sdDq7bF+PyYdAQygDvxLtKIHqS0Aqe4AhTItXiNI9 f0HKeE1HFiULQwa5keo2k6b6+ZYtsVCsT2oBDcMt3Ex+K3f5Jeax6UjZ0 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10624"; a="311754226" X-IronPort-AV: E=Sophos;i="5.97,306,1669104000"; d="scan'208";a="311754226" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2023 16:40:32 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10624"; a="844749009" X-IronPort-AV: E=Sophos;i="5.97,306,1669104000"; d="scan'208";a="844749009" Received: from basavana-mobl.amr.corp.intel.com (HELO vverma7-desk1.local) ([10.209.2.127]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2023 16:40:32 -0800 From: Vishal Verma Date: Fri, 17 Feb 2023 17:40:24 -0700 Subject: [PATCH ndctl 3/3] test/cxl-security.sh: avoid intermittent failures due to sasync probe MIME-Version: 1.0 Message-Id: <20230217-coverity-fixes-v1-3-043fac896a40@intel.com> References: <20230217-coverity-fixes-v1-0-043fac896a40@intel.com> In-Reply-To: <20230217-coverity-fixes-v1-0-043fac896a40@intel.com> To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, Dave Jiang , Dan Williams , Vishal Verma X-Mailer: b4 0.13-dev-ada30 X-Developer-Signature: v=1; a=openpgp-sha256; l=896; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=4mXc8aXzC2a5QQ64fr2TipWZlLxkknQajmWzGZWeva0=; b=owGbwMvMwCXGf25diOft7jLG02pJDMkf5OqLBFx1l6UXlB2W6bmTu9Zyy50dsq83SVoWZz1Yz xYg7D+7o5SFQYyLQVZMkeXvno+Mx+S25/MEJjjCzGFlAhnCwMUpABN5y8Lwhz8r8Gl//o/jXjWR vz0fZByLcvvMuVdn844g4Y5tal+yfRkZemJfe3efblUuTnmvsXJP0bX55vHzp04892vh144FLXd WcQMA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org This test failed intermittently because the ndctl-list operation right after a 'modprobe cxl_test' could race the actual nmem devices getting loaded. Since CXL device probes are asynchronous, and cxl_acpi might've kicked off a cxl_bus_rescan(), a cxl_flush() (via cxl_wait_probe()) can ensure everything is loaded. Add a plain cxl-list right after the modprobe to allow for a flush/wait cycle. Cc: Dave Jiang Suggested-by: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Dave Jiang --- test/security.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/security.sh b/test/security.sh index 04f630e..fb04aa6 100755 --- a/test/security.sh +++ b/test/security.sh @@ -225,6 +225,7 @@ if [ "$uid" -ne 0 ]; then fi modprobe "$KMOD_TEST" +cxl list setup check_prereq "keyctl" rc=1