]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mfd: macsmc: Initialize mutex
authorJanne Grunau <j@jannau.net>
Wed, 31 Dec 2025 09:42:12 +0000 (10:42 +0100)
committerSasha Levin <sashal@kernel.org>
Wed, 4 Mar 2026 12:21:12 +0000 (07:21 -0500)
[ Upstream commit 414f65d6736342c77d4ec5e7373039f4a09250dd ]

Initialize struct apple_smc's mutex in apple_smc_probe(). Using the
mutex uninitialized surprisingly resulted only in occasional NULL
pointer dereferences in apple_smc_read() calls from the probe()
functions of sub devices.

Cc: stable@vger.kernel.org
Fixes: e038d985c9823 ("mfd: Add Apple Silicon System Management Controller")
Signed-off-by: Janne Grunau <j@jannau.net>
Reviewed-by: Sven Peter <sven@kernel.org>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Link: https://patch.msgid.link/20251231-macsmc-mutex_init-v2-1-5818c9dc9b29@jannau.net
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mfd/macsmc.c

index e6cdae221f1d4e5776887353e8f0c40e1600028c..3228e79c86eb5626729eae679a839e47d695c794 100644 (file)
@@ -413,6 +413,7 @@ static int apple_smc_probe(struct platform_device *pdev)
        if (!smc)
                return -ENOMEM;
 
+       mutex_init(&smc->mutex);
        smc->dev = &pdev->dev;
        smc->sram_base = devm_platform_get_and_ioremap_resource(pdev, 1, &smc->sram);
        if (IS_ERR(smc->sram_base))