Skip to content

Commit 1f886a7

Browse files
Huai-Yuan Liubroonie
authored andcommitted
spi: mchp-pci1xxx: Fix a possible null pointer dereference in pci1xxx_spi_probe
In function pci1xxxx_spi_probe, there is a potential null pointer that may be caused by a failed memory allocation by the function devm_kzalloc. Hence, a null pointer check needs to be added to prevent null pointer dereferencing later in the code. To fix this issue, spi_bus->spi_int[iter] should be checked. The memory allocated by devm_kzalloc will be automatically released, so just directly return -ENOMEM without worrying about memory leaks. Fixes: 1cc0cbe ("spi: microchip: pci1xxxx: Add driver for SPI controller of PCI1XXXX PCIe switch") Signed-off-by: Huai-Yuan Liu <qq810974084@gmail.com> Link: https://msgid.link/r/20240403014221.969801-1-qq810974084@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent bff892a commit 1f886a7

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/spi/spi-pci1xxxx.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,8 @@ static int pci1xxxx_spi_probe(struct pci_dev *pdev, const struct pci_device_id *
725725
spi_bus->spi_int[iter] = devm_kzalloc(&pdev->dev,
726726
sizeof(struct pci1xxxx_spi_internal),
727727
GFP_KERNEL);
728+
if (!spi_bus->spi_int[iter])
729+
return -ENOMEM;
728730
spi_sub_ptr = spi_bus->spi_int[iter];
729731
spi_sub_ptr->spi_host = devm_spi_alloc_host(dev, sizeof(struct spi_controller));
730732
if (!spi_sub_ptr->spi_host)

0 commit comments

Comments
 (0)