]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
soc: qcom: llcc: Handle a second device without data corruption
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 26 Sep 2023 08:32:29 +0000 (10:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:57:04 +0000 (11:57 +0100)
[ 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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fixes: a3134fb09e0b ("drivers: soc: Add LLCC driver")
Link: https://lore.kernel.org/r/20230926083229.2073890-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/soc/qcom/llcc-qcom.c

index 67c19ed2219a6d35d0c6927c8b65c81c9c961f92..221a1be098d7bc4343496fbd388d63914db0a6c3 100644 (file)
@@ -945,6 +945,9 @@ static int qcom_llcc_probe(struct platform_device *pdev)
        u32 version;
        struct regmap *regmap;
 
+       if (!IS_ERR(drv_data))
+               return -EBUSY;
+
        drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL);
        if (!drv_data) {
                ret = -ENOMEM;