From patchwork Tue Jan 10 23:09:14 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: 13095752 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F9E823A6 for ; Tue, 10 Jan 2023 23:09:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673392194; x=1704928194; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=Gtf6WAW/csOf427X3LRR5XcQfg7g7JRMlkKoYsNZ8zk=; b=k5BG7qlwngcYV+vz6o8Zjcop/0NQXQQvohU66EehEkU1vgKEmwoonccV 64auPOLUQX9Go9+wRauuIvQ7uel06hMJV8qmppd58UNjeCT3wxsIrGZ5r 2xMmyR+C9YQ9fvnob5A96MEoggnzWzSyZfEcoIouzD8LLK2nJhGKkTZ+M pOeQY82LXqajUtRkbuWvpfa5JraH/6DfTmxWjIdM7lD5UJT5+js2+jgDf 7AVd1+k75OlwEg4KCGerWQ6XBnYmcXo/N3lI06pE+JZxala0KJ+/xjblR sdkr9brOVgvU+m5NrHli4Nk4OvEgOJ0JLp0qTZ40+8MqLMHloDRRsxvP8 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="321981266" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="321981266" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 15:09:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="659155904" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="659155904" Received: from ffallaha-mobl.amr.corp.intel.com (HELO vverma7-desk1.local) ([10.212.116.179]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 15:09:52 -0800 From: Vishal Verma Date: Tue, 10 Jan 2023 16:09:14 -0700 Subject: [PATCH ndctl 1/4] ndctl/lib: fix usage of a non NUL-terminated string Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230110-vv-coverity-fixes-v1-1-c7ee6c76b200@intel.com> References: <20230110-vv-coverity-fixes-v1-0-c7ee6c76b200@intel.com> In-Reply-To: <20230110-vv-coverity-fixes-v1-0-c7ee6c76b200@intel.com> To: linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev Cc: Dave Jiang , Dan Williams , Vishal Verma X-Mailer: b4 0.12-dev-cc11a X-Developer-Signature: v=1; a=openpgp-sha256; l=872; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=Gtf6WAW/csOf427X3LRR5XcQfg7g7JRMlkKoYsNZ8zk=; b=owGbwMvMwCXGf25diOft7jLG02pJDMl7P9irFeUyXWHr15r8dsMkn/UNJ6wnKFrKaMzPzi6K353o bvito5SFQYyLQVZMkeXvno+Mx+S25/MEJjjCzGFlAhnCwMUpABPRnMPwT/lQ6enUJdbypnX9c9Q9XX ZctvxccnjyacUlbnVd26euXwJU0a3cvUFfdS+DSUjX+/NFs5TP+j35525+ni37eI6prAcnAA== X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Static analysis reports that in add_region(), a buffer from pread() won't have NUL-termination. Hence passing it to strtol subsequently can be wrong. Manually add the termination after pread() to fix this. Fixes: c64cc150a21e ("ndctl: add support in libndctl to provide deep flush") Cc: Dave Jiang Signed-off-by: Vishal Verma Reviewed-by: Alison Schofield --- ndctl/lib/libndctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index f32f704..ddbdd9a 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -2750,6 +2750,8 @@ static void *add_region(void *parent, int id, const char *region_base) goto out; } + /* pread() doesn't add NUL termination */ + buf[1] = 0; perm = strtol(buf, NULL, 0); if (perm == 0) { close(region->flush_fd); From patchwork Tue Jan 10 23:09:15 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: 13095753 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B5B22C80 for ; Tue, 10 Jan 2023 23:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673392194; x=1704928194; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=t2rn+Iy4jdDZV+5z4dc6ZLrjqjVRNl6oqWZfHBzRwBA=; b=U53m4qffQPdg5IwQjwZRJlqoPvwJcPSltiSHNMGuywPFWnzhBY/BTba6 HWjqsKRIyICkSx1DKsE7z5fReH64BYgngEAjqRO6ciphcVsgWRioxKc0e HQlqWDNxjl2iHP55FNlq4M2fz1thR2PYQCBLuzKz/ihznjwRMKA1HvTsA ypvr8dhDcTBbvCdbLx8B8hpqW6nyNDUYo+1m2+5RR72UtbxE0SiXk9oV0 dApysWPkIu2C83OD+2RGmi6252ZSbmdWXoNt+FkDJB3tc2hus8SMe99Yi OxEVTSaPEbOnJzrgA8Ccay/Gh772lZvBSjxBIihxfnoqOIbW4wsQPlhUb g==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="321981268" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="321981268" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 15:09:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="659155907" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="659155907" Received: from ffallaha-mobl.amr.corp.intel.com (HELO vverma7-desk1.local) ([10.212.116.179]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 15:09:52 -0800 From: Vishal Verma Date: Tue, 10 Jan 2023 16:09:15 -0700 Subject: [PATCH ndctl 2/4] cxl/region: fix a resource leak in to_csv() Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230110-vv-coverity-fixes-v1-2-c7ee6c76b200@intel.com> References: <20230110-vv-coverity-fixes-v1-0-c7ee6c76b200@intel.com> In-Reply-To: <20230110-vv-coverity-fixes-v1-0-c7ee6c76b200@intel.com> To: linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev Cc: Dave Jiang , Dan Williams , Vishal Verma X-Mailer: b4 0.12-dev-cc11a X-Developer-Signature: v=1; a=openpgp-sha256; l=984; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=t2rn+Iy4jdDZV+5z4dc6ZLrjqjVRNl6oqWZfHBzRwBA=; b=owGbwMvMwCXGf25diOft7jLG02pJDMl7P9jzLc3u1Z8pvcD56LEnYR6pE2Yk3PjykifSs+AH06TK ppKKjlIWBjEuBlkxRZa/ez4yHpPbns8TmOAIM4eVCWQIAxenAExEcDojw87Y75XR26fyRHLtVFdqTr A9ffBWspXkmsXvvyz/8eJY1QNGhg3JbBy/rzxmzuF2fynFJu20L29yA49FzdSmKWnGAlLXGAA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Static analysis reports there can be a memory leak in to_csv as an exit path returns from the function before freeing 'csv'. Since this is the only errpr path exit point after the allocation, just free() before returning. Fixes: 3d6cd829ec08 ("cxl/region: Use cxl_filter_walk() to gather create-region targets") Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Alison Schofield --- cxl/region.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cxl/region.c b/cxl/region.c index bb3a10a..9a81113 100644 --- a/cxl/region.c +++ b/cxl/region.c @@ -146,8 +146,10 @@ static const char *to_csv(int *count, const char **strings) return NULL; for (i = 0; i < *count; i++) { list = strdup(strings[i]); - if (!list) + if (!list) { + free(csv); return NULL; + } for (arg = strtok_r(list, which_sep(list), &save); arg; arg = strtok_r(NULL, which_sep(list), &save)) { From patchwork Tue Jan 10 23:09:16 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: 13095754 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4AE33C3B for ; Tue, 10 Jan 2023 23:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673392195; x=1704928195; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=mL6lmpUYl41ULhtrwC9KKvuRtlC9LZqv9zJejcRxHKI=; b=CxYDC7J8bhT44TeJzeXMnriBod36MihGaEeVewK0c6pLRbWuLoaAa52k +pkoPVLYaOgMiLEfz9LmO6AJP9BuRS1ITwDlxos4k6/B0XZh1QPV0FvjF RvA7RbE5Ik+JHM8I/3gFklTRNhnj9W/5rttSZW3bWTHjhpUYaBhqaKim8 9invi1admCekVc6EGZ5+3B1jYrAyuXprSf6KM2Ua3BrOdHy7yiGwFqCkT HuSKy1bYgHv+daNNlUS8clRFqdOg+RIx+JwiI+ZfCEcYHaHXl04UtjN/t 1fPzYzZJjMS1uQu9u2neKDdTlEiOj6FmpxN528rX0H13r2BkVaHKf1vOq g==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="321981271" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="321981271" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 15:09:53 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="659155910" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="659155910" Received: from ffallaha-mobl.amr.corp.intel.com (HELO vverma7-desk1.local) ([10.212.116.179]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 15:09:52 -0800 From: Vishal Verma Date: Tue, 10 Jan 2023 16:09:16 -0700 Subject: [PATCH ndctl 3/4] cxl/region: fix an out of bounds access in to_csv() Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230110-vv-coverity-fixes-v1-3-c7ee6c76b200@intel.com> References: <20230110-vv-coverity-fixes-v1-0-c7ee6c76b200@intel.com> In-Reply-To: <20230110-vv-coverity-fixes-v1-0-c7ee6c76b200@intel.com> To: linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev Cc: Dave Jiang , Dan Williams , Vishal Verma X-Mailer: b4 0.12-dev-cc11a X-Developer-Signature: v=1; a=openpgp-sha256; l=943; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=mL6lmpUYl41ULhtrwC9KKvuRtlC9LZqv9zJejcRxHKI=; b=owGbwMvMwCXGf25diOft7jLG02pJDMl7P9i71vl8ObSwPOnXlmuyv2yt/Z9MWTHb5+5O3axzGi5H 62f1d5SyMIhxMciKKbL83fOR8Zjc9nyewARHmDmsTCBDGLg4BWAitb8YGQ6c2zHdzpLbs1ezdop3+4 TVx3fLHuqO+hc5xYXzUnZssRUjw6TFNt9nfPX/1ZawhNnqZ/vr1QdfP6mwcXmxb/PStuAF51gA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Static analysis reports that when 'csv' is allocated for 'len' bytes, writing to csv[len] results in an out of bounds access. Fix this truncation operation to instead write the NUL terminator to csv[len - 1], which is the last byte of the memory allocated. Fixes: 3d6cd829ec08 ("cxl/region: Use cxl_filter_walk() to gather create-region targets") Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Alison Schofield --- cxl/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cxl/region.c b/cxl/region.c index 9a81113..89be9b5 100644 --- a/cxl/region.c +++ b/cxl/region.c @@ -156,7 +156,7 @@ static const char *to_csv(int *count, const char **strings) cursor += snprintf(csv + cursor, len - cursor, "%s%s", arg, i + 1 < new_count ? "," : ""); if (cursor >= len) { - csv[len] = 0; + csv[len - 1] = 0; break; } } From patchwork Tue Jan 10 23:09:17 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: 13095755 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9D7A7474 for ; Tue, 10 Jan 2023 23:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673392195; x=1704928195; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=P4hPdW8+bePoAaxzhoqscfaaJ238PGmVdQhKGufS+7Y=; b=CGOD0DTgMhn5D9v61hM3orQnWr0My6RGldFr4wq9j9gOUYecYlPzLQj1 ZprYSbf39FeV1kZ5g4KEMqdp9ekv9BmYYLjvfr15TkVOzaXJVdBBTXvBU fTuaeaIV9Qb8om+zIhJneI3PJgg6gckGlKDrr2HXiaKXFz4QxKuBW4N4w wNr/qB2TnGIR6XJjjcK3JYO4JumEZ2Ig0P72W5mE2QYqH3UDeilyZRjQm HOs6AoEMk0OBXiIcmnHvvpWLY+QXlS8TuGquj8/GLfJQ3lUwbTAiKQ22Y Dwka/7jOgLrat2pZGkTcX5sgRYJsmEFmKstgk3JpJyxXd4aEQ+1HiWR9u w==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="321981274" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="321981274" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 15:09:53 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="659155916" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="659155916" Received: from ffallaha-mobl.amr.corp.intel.com (HELO vverma7-desk1.local) ([10.212.116.179]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 15:09:52 -0800 From: Vishal Verma Date: Tue, 10 Jan 2023 16:09:17 -0700 Subject: [PATCH ndctl 4/4] cxl/region: fix a comment typo Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230110-vv-coverity-fixes-v1-4-c7ee6c76b200@intel.com> References: <20230110-vv-coverity-fixes-v1-0-c7ee6c76b200@intel.com> In-Reply-To: <20230110-vv-coverity-fixes-v1-0-c7ee6c76b200@intel.com> To: linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev Cc: Dave Jiang , Dan Williams , Vishal Verma X-Mailer: b4 0.12-dev-cc11a X-Developer-Signature: v=1; a=openpgp-sha256; l=813; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=P4hPdW8+bePoAaxzhoqscfaaJ238PGmVdQhKGufS+7Y=; b=owGbwMvMwCXGf25diOft7jLG02pJDMl7P9j/r16f9PzrvM5ly4XUb3J2ZxTtZuTbwnm5JnjBxVsp WVtndpSyMIhxMciKKbL83fOR8Zjc9nyewARHmDmsTCBDGLg4BWAiRnMZGbY/O7iLP3LWkt25mcxZ5f eeaIaI9LgWVXoeyTju12Q5SZmR4eP8cx/tX2y9N29qZ8x+Zp6HG753JGTNqzpbs/dos26DJysA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Fix a typo: s/separted/separated/ Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Alison Schofield --- cxl/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cxl/region.c b/cxl/region.c index 89be9b5..efe05aa 100644 --- a/cxl/region.c +++ b/cxl/region.c @@ -103,7 +103,7 @@ static const struct option destroy_options[] = { /* * Convert an array of strings that can be a mixture of single items, a - * command separted list, or a space separated list, into a flattened + * command separated list, or a space separated list, into a flattened * comma-separated string. That single string can then be used as a * filter argument to cxl_filter_walk(), or an ordering constraint for * json_object_array_sort()