]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: cs42l43: Property entry should be a null-terminated array
authorSimon Trimmer <simont@opensource.cirrus.com>
Thu, 31 Jul 2025 16:01:09 +0000 (16:01 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 1 Aug 2025 13:36:21 +0000 (14:36 +0100)
The software node does not specify a count of property entries, so the
array must be null-terminated.

When unterminated, this can lead to a fault in the downstream cs35l56
amplifier driver, because the node parse walks off the end of the
array into unknown memory.

Fixes: 0ca645ab5b15 ("spi: cs42l43: Add speaker id support to the bridge configuration")
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220371
Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/20250731160109.1547131-1-simont@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-cs42l43.c

index b28a840b3b04b5a4cce15539188bca02bf36716a..14307dd800b744fee17edd864688a68c65666c68 100644 (file)
@@ -295,7 +295,7 @@ static struct spi_board_info *cs42l43_create_bridge_amp(struct cs42l43_spi *priv
        struct spi_board_info *info;
 
        if (spkid >= 0) {
-               props = devm_kmalloc(priv->dev, sizeof(*props), GFP_KERNEL);
+               props = devm_kcalloc(priv->dev, 2, sizeof(*props), GFP_KERNEL);
                if (!props)
                        return NULL;