linux-kernel - [RESEND PATCH v2] firmware: qcom: scm: fix a NULL-pointer dereference

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240930083328.17904-1-brgl@bgdev.pl>
Date: Mon, 30 Sep 2024 10:33:28 +0200
From: Bartosz Golaszewski <brgl@...ev.pl>
To: Bjorn Andersson <andersson@...nel.org>,
	Konrad Dybcio <konradybcio@...nel.org>,
	Andrew Halaney <ahalaney@...hat.com>,
	Elliot Berman <quic_eberman@...cinc.com>
Cc: linux-arm-msm@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Thorsten Leemhuis <linux@...mhuis.info>,
	Bartosz Golaszewski <bartosz.golaszewski@...aro.org>,
	Rudraksha Gupta <guptarud@...il.com>,
	Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
	Stephan Gerhold <stephan.gerhold@...aro.org>
Subject: [RESEND PATCH v2] firmware: qcom: scm: fix a NULL-pointer dereference

From: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>

Some SCM calls can be invoked with __scm being NULL (the driver may not
have been and will not be probed as there's no SCM entry in device-tree).
Make sure we don't dereference a NULL pointer.

Fixes: 449d0d84bcd8 ("firmware: qcom: scm: smc: switch to using the SCM allocator")
Reported-by: Rudraksha Gupta <guptarud@...il.com>
Closes: https://lore.kernel.org/lkml/692cfe9a-8c05-4ce4-813e-82b3f310019a@gmail.com/
Reviewed-by: Konrad Dybcio <konradybcio@...nel.org>
Tested-by: Rudraksha Gupta <guptarud@...il.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
Reviewed-by: Stephan Gerhold <stephan.gerhold@...aro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
---
I dropped patch 2/2 and am resending this separately rebased on top of
v6.12-rc1.

 drivers/firmware/qcom/qcom_scm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 10986cb11ec0..8bac4915c211 100644
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -216,7 +216,7 @@ static DEFINE_SPINLOCK(scm_query_lock);
 
 struct qcom_tzmem_pool *qcom_scm_get_tzmem_pool(void)
 {
-	return __scm->mempool;
+	return __scm ? __scm->mempool : NULL;
 }
 
 static enum qcom_scm_convention __get_convention(void)
-- 
2.43.0