Commit 41796cc0 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Zheng Yejian
Browse files

thermal/drivers/qcom/lmh: Check for SCM availability at probe 

mainline inclusion
from mainline-v6.10-rc1
commit d9d3490c48df572edefc0b64655259eefdcbb9be
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA8AE9
CVE: CVE-2024-39466

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d9d3490c48df572edefc0b64655259eefdcbb9be



---------------------------

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: 53bca371 ("thermal/drivers/qcom: Add support for LMh driver")
Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20240308-topic-rb1_lmh-v2-2-bac3914b0fe3@linaro.org


Signed-off-by: default avatarZheng Yejian <zhengyejian@huaweicloud.com>
Signed-off-by: default avatarZheng Yejian <zhengyejian1@huawei.com>
parent d034e4c8

drivers/thermal/qcom/lmh.c

+3 −0
Original line number Diff line number Diff line
@@ -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;