diff options
| author | Huai-Yuan Liu <qq810974084@gmail.com> | 2024-04-03 09:42:21 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-10 16:36:01 +0200 |
| commit | 4b31a226097cf8cc3c9de5e855d97757fdb2bf06 (patch) | |
| tree | 42859bd754d0d09f5841b481a07609110fec466f | |
| parent | 0fdada1ef5b10ea73bf618d0498723c7860b5be9 (diff) | |
| download | linux-stable-4b31a226097cf8cc3c9de5e855d97757fdb2bf06.tar.gz linux-stable-4b31a226097cf8cc3c9de5e855d97757fdb2bf06.tar.bz2 linux-stable-4b31a226097cf8cc3c9de5e855d97757fdb2bf06.zip | |
spi: mchp-pci1xxx: Fix a possible null pointer dereference in pci1xxx_spi_probe
[ Upstream commit 1f886a7bfb3faf4c1021e73f045538008ce7634e ]
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: 1cc0cbea7167 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/spi/spi-pci1xxxx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-pci1xxxx.c b/drivers/spi/spi-pci1xxxx.c index 3638e974f5d4..06bf58b7e5d7 100644 --- a/drivers/spi/spi-pci1xxxx.c +++ b/drivers/spi/spi-pci1xxxx.c @@ -275,6 +275,8 @@ static int pci1xxxx_spi_probe(struct pci_dev *pdev, const struct pci_device_id * spi_bus->spi_int[iter] = devm_kzalloc(&pdev->dev, sizeof(struct pci1xxxx_spi_internal), GFP_KERNEL); + if (!spi_bus->spi_int[iter]) + return -ENOMEM; spi_sub_ptr = spi_bus->spi_int[iter]; spi_sub_ptr->spi_host = devm_spi_alloc_host(dev, sizeof(struct spi_controller)); if (!spi_sub_ptr->spi_host) |