Skip to contentSkip to conversation

spi: orion: set devdata properly as it is being used later

PATCH In review Muhammad Usama Anjum 2 participants 2 messages Apr 8, 2021 – Apr 9, 2021

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

PATCH 1/1 spi: orion: set devdata properly as it is being used later

If device_get_match_data returns NULL, devdata isn't being updated properly. It is being used later in the function. Both devdata and spi->devdata should be updated to avoid NULL pointer dereference.

Addresses-Coverity: ("NULL pointer dereference")

Fixes 0e6521f13c2 ("spi: orion: Use device_get_match_data() helper")
---
 drivers/spi/spi-orion.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-orion.c +2 -1
index d02c5c9def20..34b31aba3981 100644
@@ -676,7 +676,8 @@ static int orion_spi_probe(struct platform_device *pdev)
 	spi->dev = &pdev->dev;
 
 	devdata = device_get_match_data(&pdev->dev);
-	spi->devdata = devdata ? devdata : &orion_spi_dev_data;
+	devdata = devdata ? devdata : &orion_spi_dev_data;
+	spi->devdata = devdata;
 
 	spi->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(spi->clk)) {
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 3 lines · Muhammad Usama Anjum

If device_get_match_data returns NULL, devdata isn't being updated properly. It is being used later in the function. Both devdata and spi->devdata should be updated to avoid NULL pointer dereference.

Applied to

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

Thanks!

[1/1] spi: orion: set devdata properly as it is being used later

      commit: e980048263ba72dcdbbf45d59e84c02001340f75

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