Skip to contentSkip to conversation

spi: Fix potential uninitialized variable in probe()

PATCH In review Dan Carpenter 3 participants 3 messages Nov 24, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 spi: Fix potential uninitialized variable in probe()

If the device tree is messed up, then potentially the "protocol" string could potentially be uninitialized. The property is supposed to default to "motorola" so if the of_property_read_string() function returns -EINVAL then default to "motorola".

Fixes 059f545832be ("spi: add support for microchip "soft" spi controller")

---
v2: Add an error message on failure.
Default to "motorola".

 drivers/spi/spi-microchip-core-spi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi-microchip-core-spi.c +3 -1
index b8738190cdcb..16e0885474a0 100644
@@ -295,10 +295,10 @@ static int mchp_corespi_transfer_one(struct spi_controller *host,
 
 static int mchp_corespi_probe(struct platform_device *pdev)
 {
+	const char *protocol = "motorola";
 	struct spi_controller *host;
 	struct mchp_corespi *spi;
 	struct resource *res;
-	const char *protocol;
 	u32 num_cs, mode, frame_size;
 	bool assert_ssel;
 	int ret = 0;
@@ -320,6 +320,8 @@ static int mchp_corespi_probe(struct platform_device *pdev)
 	 */
 	ret = of_property_read_string(pdev->dev.of_node, "microchip,protocol-configuration",
 				      &protocol);
+	if (ret && ret != -EINVAL)
+		return dev_err_probe(&pdev->dev, ret, "Error reading protocol-configuration\n");
 	if (strcmp(protocol, "motorola") != 0)
 		return dev_err_probe(&pdev->dev, -EINVAL,
 				     "CoreSPI: protocol '%s' not supported by this driver\n",
Signature · 1 line
2.51.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Dan Carpenter

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

If the device tree is messed up, then potentially the "protocol" string could potentially be uninitialized. The property is supposed to default to "motorola" so if the of_property_read_string() function returns -EINVAL then default to "motorola".

Fixes 059f545832be ("spi: add support for microchip "soft" spi controller")
Quoted 35 lines

---
v2: Add an error message on failure.
Default to "motorola".

  drivers/spi/spi-microchip-core-spi.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi-microchip-core-spi.c +3 -2
index b8738190cdcb..16e0885474a0 100644
@@ -295,10 +295,10 @@ static int mchp_corespi_transfer_one(struct spi_controller *host,
 
  static int mchp_corespi_probe(struct platform_device *pdev)
  {
+       const char *protocol = "motorola";
         struct spi_controller *host;
         struct mchp_corespi *spi;
         struct resource *res;
-       const char *protocol;
         u32 num_cs, mode, frame_size;
         bool assert_ssel;
         int ret = 0;
@@ -320,6 +320,8 @@ static int mchp_corespi_probe(struct platform_device *pdev)
          */
         ret = of_property_read_string(pdev->dev.of_node, "microchip,protocol-configuration",
                                       &protocol);
+       if (ret && ret != -EINVAL)
+               return dev_err_probe(&pdev->dev, ret, "Error reading protocol-configuration\n");
         if (strcmp(protocol, "motorola") != 0)
                 return dev_err_probe(&pdev->dev, -EINVAL,
                                      "CoreSPI: protocol '%s' not supported by this driver\n",
--

2.51.0

maintainer
#2 lore raw
In reply to Dan Carpenter
Quoted 6 lines · Dan Carpenter

If the device tree is messed up, then potentially the "protocol" string could potentially be uninitialized. The property is supposed to default to "motorola" so if the of_property_read_string() function returns -EINVAL then default to "motorola".

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: Fix potential uninitialized variable in probe()

      commit: cb99656b7c4185953c9d272bbdab63c8aa651e6e

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark