Commit 8a94df90 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Kaixiong Yu
Browse files

soc: qcom: llcc: Handle a second device without data corruption 

stable inclusion
from stable-v5.10.201
commit 5e5b85ea0f4bc484bfe4cc73ead51fa48d2366a0
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9RFK0
CVE: CVE-2023-52871

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5e5b85ea0f4bc484bfe4cc73ead51fa48d2366a0



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

[ Upstream commit f1a1bc8775b26345aba2be278118999e7f661d3d ]

Usually there is only one llcc device. But if there were a second, even
a failed probe call would modify the global drv_data pointer. So check
if drv_data is valid before overwriting it.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fixes: a3134fb0 ("drivers: soc: Add LLCC driver")
Link: https://lore.kernel.org/r/20230926083229.2073890-1-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKaixiong Yu <yukaixiong@huawei.com>
parent 3b44b815

drivers/soc/qcom/llcc-qcom.c

+3 −0
Original line number Diff line number Diff line
@@ -413,6 +413,9 @@ static int qcom_llcc_probe(struct platform_device *pdev) 
	const struct llcc_slice_config *llcc_cfg;

	u32 sz;



	if (!IS_ERR(drv_data))

		return -EBUSY;



	drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL);

	if (!drv_data) {

		ret = -ENOMEM;