p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Shawn Lin 2018-02-25 10:01:42 +08:00 committed by Bjorn Helgaas
parent 7928b2cbe5
commit 205adda79a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/pci/hotplug/cpqphp_ctrl.c
View File

@ -2812,18 +2812,16 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
dbg("CND: length = 0x%x\n", base); dbg("CND: length = 0x%x\n", base);
io_node = get_io_resource(&(resources->io_head), 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", dbg("Got io_node start = %8.8x, length = %8.8x next (%p)\n",
io_node->base, io_node->length, io_node->next); io_node->base, io_node->length, io_node->next);
dbg("func (%p) io_head (%p)\n", func, func->io_head); dbg("func (%p) io_head (%p)\n", func, func->io_head);
/* allocate the resource to the board */ /* allocate the resource to the board */
if (io_node) { base = io_node->base;
base = io_node->base; io_node->next = func->io_head;
func->io_head = io_node;
io_node->next = func->io_head;
func->io_head = io_node;
} else
return -ENOMEM;
} else if ((temp_register & 0x0BL) == 0x08) { } else if ((temp_register & 0x0BL) == 0x08) {
/* Map prefetchable memory */ /* Map prefetchable memory */
base = temp_register & 0xFFFFFFF0; base = temp_register & 0xFFFFFFF0;