diff options
| author | Bartosz Golaszewski <[email protected]> | 2024-09-30 10:33:28 +0200 |
|---|---|---|
| committer | Bjorn Andersson <[email protected]> | 2024-10-05 22:01:52 -0500 |
| commit | ca61d6836e6f4442a77762e1074d2706a2a6e578 (patch) | |
| tree | 759a9b3e9fbebfb3e512e193bc340f280b5a6a9b | |
| parent | d67907154808745b0fae5874edc7b0f78d33991c (diff) | |
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: 449d0d84bcd8 ("firmware: qcom: scm: smc: switch to using the SCM allocator")
Reported-by: Rudraksha Gupta <[email protected]>
Closes: https://lore.kernel.org/lkml/[email protected]/
Reviewed-by: Konrad Dybcio <[email protected]>
Tested-by: Rudraksha Gupta <[email protected]>
Reviewed-by: Dmitry Baryshkov <[email protected]>
Reviewed-by: Stephan Gerhold <[email protected]>
Signed-off-by: Bartosz Golaszewski <[email protected]>
Reviewed-by: Kuldeep Singh <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Bjorn Andersson <[email protected]>
| -rw-r--r-- | drivers/firmware/qcom/qcom_scm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index e2ac595902ed..f47fdf32d2da 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) |