Skip to contentSkip to conversation

spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()

PATCH In review Felix Gu 4 participants 4 messages Feb 12 – Feb 16

Subsystems (3)
lore
Share & tools
lore

Felix Gu

author
#0 lore raw

PATCH 1/1 spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()

platform_get_resource_byname() can return NULL, which would cause a crash when passed the pointer to resource_size().

Move the fiu->memory_size assignment after the error check for devm_ioremap_resource() to prevent the potential NULL pointer dereference.

Fixes 9838c182471e ("spi: wpcm-fiu: Add direct map support")
---
 drivers/spi/spi-wpcm-fiu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-wpcm-fiu.c +1 -1
index 0e3ee5516587..0e26ff178505 100644
@@ -459,11 +459,11 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory");
 	fiu->memory = devm_ioremap_resource(dev, res);
-	fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
 	if (IS_ERR(fiu->memory))
 		return dev_err_probe(dev, PTR_ERR(fiu->memory),
 			       "Failed to map flash memory window\n");
 
+	fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
 	fiu->shm_regmap = syscon_regmap_lookup_by_phandle_optional(dev->of_node, "nuvoton,shm");
 
 	wpcm_fiu_hw_init(fiu);

---
base-commit: 9152bc8cebcb14dc16b03ec81f2377ee8ce12268
change-id: 20260212-wpcm-d86f76761645

Best regards,

Signature · 1 line
Felix Gu <[email protected]>
#1 lore raw
Quoted 5 lines

platform_get_resource_byname() can return NULL, which would cause a crash when passed the pointer to resource_size().

Move the fiu->memory_size assignment after the error check for devm_ioremap_resource() to prevent the potential NULL pointer dereference.

Were any source code analysis tools involved here?

Regards,
Markus

Reviewed-by on v1 1/1
#2 lore raw
In reply to Felix Gu
Quoted 9 lines · Felix Gu

platform_get_resource_byname() can return NULL, which would cause a crash when passed the pointer to resource_size().

Move the fiu->memory_size assignment after the error check for devm_ioremap_resource() to prevent the potential NULL pointer dereference.

Fixes 9838c182471e ("spi: wpcm-fiu: Add direct map support")

---

Seems reasonable.

Thanks!

Quoted 29 lines
 drivers/spi/spi-wpcm-fiu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-wpcm-fiu.c +1 -2
index 0e3ee5516587..0e26ff178505 100644
@@ -459,11 +459,11 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory");
 	fiu->memory = devm_ioremap_resource(dev, res);
-	fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
 	if (IS_ERR(fiu->memory))
 		return dev_err_probe(dev, PTR_ERR(fiu->memory),
 			       "Failed to map flash memory window\n");
 
+	fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
 	fiu->shm_regmap = syscon_regmap_lookup_by_phandle_optional(dev->of_node, "nuvoton,shm");
 
 	wpcm_fiu_hw_init(fiu);
 
---

base-commit: 9152bc8cebcb14dc16b03ec81f2377ee8ce12268
change-id: 20260212-wpcm-d86f76761645

Best regards,

Signature · 1 line
Felix Gu <[email protected]>
maintainer
#3 lore raw
In reply to Felix Gu
Quoted 8 lines · Felix Gu

platform_get_resource_byname() can return NULL, which would cause a crash when passed the pointer to resource_size().

Move the fiu->memory_size assignment after the error check for devm_ioremap_resource() to prevent the potential NULL pointer dereference.

[...]

Applied to

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

Thanks!

[1/1] spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()

      commit: 888a0a802c467bbe34a42167bdf9d7331333440a

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