diff options
| author | Shawn Lin | 2018-02-25 03:01:42 +0100 |
|---|---|---|
| committer | Bjorn Helgaas | 2018-02-28 21:35:54 +0100 |
| commit | 205adda79a408f4a2945f636e1c076f7db3b2045 (patch) | |
| tree | 5839bc4242ed2c1bddfb646285d3955d795a01cb /drivers/pci/hotplug/cpqphp_ctrl.c | |
| parent | Linux 4.16-rc1 (diff) | |
| download | kernel-qcow2-linux-205adda79a408f4a2945f636e1c076f7db3b2045.tar.gz kernel-qcow2-linux-205adda79a408f4a2945f636e1c076f7db3b2045.tar.xz kernel-qcow2-linux-205adda79a408f4a2945f636e1c076f7db3b2045.zip | |
PCI: cpqphp: Fix possible NULL pointer dereference
Check io_node for NULL before dereferencing it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_ctrl.c')
| -rw-r--r-- | drivers/pci/hotplug/cpqphp_ctrl.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c index b1b6e45253b2..616df442520b 100644 --- a/drivers/pci/hotplug/cpqphp_ctrl.c +++ b/drivers/pci/hotplug/cpqphp_ctrl.c @@ -2812,18 +2812,16 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func dbg("CND: length = 0x%x\n", base); io_node = get_io_resource(&(resources->io_head), base); + if (!io_node) + return -ENOMEM; dbg("Got io_node start = %8.8x, length = %8.8x next (%p)\n", io_node->base, io_node->length, io_node->next); dbg("func (%p) io_head (%p)\n", func, func->io_head); /* allocate the resource to the board */ - if (io_node) { - base = io_node->base; - - io_node->next = func->io_head; - func->io_head = io_node; - } else - return -ENOMEM; + base = io_node->base; + io_node->next = func->io_head; + func->io_head = io_node; } else if ((temp_register & 0x0BL) == 0x08) { /* Map prefetchable memory */ base = temp_register & 0xFFFFFFF0; |