[v2,2/3] thermal: qcom: lmh: Check for SCM availability at probe

Commit Message

Konrad Dybcio March 9, 2024, 1:15 p.m. UTC

Up until now, the necessary scm availability check has not been
performed, leading to possible null pointer dereferences (which did
happen for me on RB1).

Fix that.

Fixes: 53bca371cdf7 ("thermal/drivers/qcom: Add support for LMh driver")
Cc: <[e-mail]>
Reviewed-by: Dmitry Baryshkov <[e-mail]>
Signed-off-by: Konrad Dybcio <[e-mail]>
---
 drivers/thermal/qcom/lmh.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Bjorn Andersson March 18, 2024, 1:27 a.m. UTC | #1

On Sat, Mar 09, 2024 at 02:15:03PM +0100, Konrad Dybcio wrote:
> Up until now, the necessary scm availability check has not been
> performed, leading to possible null pointer dereferences (which did
> happen for me on RB1).
> 
> Fix that.
> 
> Fixes: 53bca371cdf7 ("thermal/drivers/qcom: Add support for LMh driver")
> Cc: <[e-mail]>
> Reviewed-by: Dmitry Baryshkov <[e-mail]>
> Signed-off-by: Konrad Dybcio <[e-mail]>

Reviewed-by: Bjorn Andersson <[e-mail]>

Regards,
Bjorn

Daniel Lezcano March 21, 2024, 5:13 p.m. UTC | #2

On 09/03/2024 14:15, Konrad Dybcio wrote:
> Up until now, the necessary scm availability check has not been
> performed, leading to possible null pointer dereferences (which did
> happen for me on RB1).
> 
> Fix that.
> 
> Fixes: 53bca371cdf7 ("thermal/drivers/qcom: Add support for LMh driver")
> Cc: <[e-mail]>
> Reviewed-by: Dmitry Baryshkov <[e-mail]>
> Signed-off-by: Konrad Dybcio <[e-mail]>
> ---

Applied, thanks

Patch

diff --git a/drivers/thermal/qcom/lmh.c b/drivers/thermal/qcom/lmh.c
index f6edb12ec004..5225b3621a56 100644
--- a/drivers/thermal/qcom/lmh.c
+++ b/drivers/thermal/qcom/lmh.c
@@ -95,6 +95,9 @@  static int lmh_probe(struct platform_device *pdev)
 	unsigned int enable_alg;
 	u32 node_id;
 
+	if (!qcom_scm_is_available())
+		return -EPROBE_DEFER;
+
 	lmh_data = devm_kzalloc(dev, sizeof(*lmh_data), GFP_KERNEL);
 	if (!lmh_data)
 		return -ENOMEM;