From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 54A1546DFE5; Tue, 21 Jul 2026 17:58:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656717; cv=none; b=PPz7rNTe1VM8X/+HBuQWiHpq9cCgUULw+2yGZ3Dss0rpmERWgA/xKTaJb3jTeeQXNLP83RQ/27wPngzk3IvR7KmqvHUnn1T3MdtkuMOdDGg5M3mHage5d78pAl6nyRQZmqjYSyYbk3WOvoDbH0LKkNmEtXIqh9VZhTzHI69Ib8c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656717; c=relaxed/simple; bh=x7npCXv3c/FhLrjntJbiShE5y+x3SJTmuWcrntGPaEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yon3l84g212eLf/zyLS3K2ckqA3Y8TsrJg6+O1v+We5rHFz+6mTOXvbbqKspUEhf7Z9R2VrXUrZwcx70S/5KXXIyLK7d7tGtaQ87drvXE7gL1/8UxdoJp3XXpgaw5+uSc1Y2ThlYuQ6VKgjGHo++Oj7XKMmpXYwiCnx64EIIo40= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qfcnXgOM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="qfcnXgOM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EA9B1F000E9; Tue, 21 Jul 2026 17:58:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784656715; bh=ntuZSue37tlkvyPGIcuTuIh352bNew7d7n1hBBq1/GA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qfcnXgOMDXM+yQc2oJINmjTWjzhK9cE26iB1R8H/B59SakvOazc52UkL2Iz72xyku HTmlvHBPABDLivRBoZorbc+AL5+s8xun9TExvWeIbe8M3ECPyX+jvIlpTvh4/JxYVb 0HOSMYqUf6H6UkpciTA5xBU/q9FAaPPFQwwWh0Uw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alison Schofield , Dave Jiang , Sasha Levin Subject: [PATCH 6.18 0492/1611] cxl/test: Add check after kzalloc() memory in alloc_mock_res() Date: Tue, 21 Jul 2026 17:10:08 +0200 Message-ID: <20260721152526.407339325@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Jiang [ Upstream commit dfe28c8592538152e9611341dae6f7be1735b3f1 ] alloc_mock_res() calls kzalloc() without checking the return value. Add scope based resource management to deal with the allocated memory cleanly. Reported-by: sashiko-bot Fixes: 67dcdd4d3b83 ("tools/testing/cxl: Introduce a mocked-up CXL port hierarchy") Reviewed-by: Alison Schofield Link: https://patch.msgid.link/20260611230305.197390-1-dave.jiang@intel.com Signed-off-by: Dave Jiang Signed-off-by: Sasha Levin --- tools/testing/cxl/test/cxl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index a126a207126b43..3e5ae5caae94da 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -403,12 +403,16 @@ static void depopulate_all_mock_resources(void) static struct cxl_mock_res *alloc_mock_res(resource_size_t size, int align) { - struct cxl_mock_res *res = kzalloc(sizeof(*res), GFP_KERNEL); struct genpool_data_align data = { .align = align, }; unsigned long phys; + struct cxl_mock_res *res __free(kfree) = kzalloc(sizeof(*res), + GFP_KERNEL); + if (!res) + return NULL; + INIT_LIST_HEAD(&res->list); phys = gen_pool_alloc_algo(cxl_mock_pool, size, gen_pool_first_fit_align, &data); @@ -423,7 +427,7 @@ static struct cxl_mock_res *alloc_mock_res(resource_size_t size, int align) list_add(&res->list, &mock_res); mutex_unlock(&mock_res_lock); - return res; + return no_free_ptr(res); } static int populate_cedt(void) -- 2.53.0