Commit ca61d683 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Bjorn Andersson
Browse files

firmware: qcom: scm: fix a NULL-pointer dereference 



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: 449d0d84 ("firmware: qcom: scm: smc: switch to using the SCM allocator")
Reported-by: default avatarRudraksha Gupta <guptarud@gmail.com>
Closes: https://lore.kernel.org/lkml/692cfe9a-8c05-4ce4-813e-82b3f310019a@gmail.com/


Reviewed-by: default avatarKonrad Dybcio <konradybcio@kernel.org>
Tested-by: default avatarRudraksha Gupta <guptarud@gmail.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarStephan Gerhold <stephan.gerhold@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarKuldeep Singh <quic_kuldsing@quicinc.com>
Link: https://lore.kernel.org/r/20240930083328.17904-1-brgl@bgdev.pl


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent d6790715

drivers/firmware/qcom/qcom_scm.c

+1 −1
Original line number Diff line number Diff line
@@ -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)