PCI/hotplug: fix potential null pointer deference
PATCH 1/1 PCI/hotplug: fix potential null pointer deference
There is otherwise a risk of a null pointer dereference.
Signed-off-by Young Xiao <[email protected]>
--- drivers/pci/hotplug/cpqphp_ctrl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/pci/hotplug/cpqphp_ctrl.c +6 -4
@@ -598,10 +598,11 @@ static struct pci_resource *get_io_resource(struct pci_resource **head, u32 size *head = node->next; }else { prevnode = *head; -while (prevnode->next != node) +while (prevnode && prevnode->next != node) prevnode = prevnode->next; - prevnode->next = node->next; +if (prevnode) + prevnode->next = node->next; } node->next =NULL ;break ;
@@ -788,10 +789,11 @@ static struct pci_resource *get_resource(struct pci_resource **head, u32 size) *head = node->next; }else { prevnode = *head; -while (prevnode->next != node) +while (prevnode && prevnode->next != node) prevnode = prevnode->next; - prevnode->next = node->next; +if (prevnode) + prevnode->next = node->next; } node->next =NULL ;break ;
Signature · 1 line
2.7.4
Quoted 2 lines · Young Xiao
There is otherwise a risk of a null pointer dereference.
Had you analyze the code?
How come that prevnode can become NULL?
Quoted 40 lines
Signed-off-by Young Xiao <[email protected]>--- drivers/pci/hotplug/cpqphp_ctrl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/pci/hotplug/cpqphp_ctrl.c +6
-5@@ -598,10 +598,11 @@ static struct pci_resource *get_io_resource(struct pci_resource **head, u32 size *head = node->next; }else { prevnode = *head; -while (prevnode->next != node) +while (prevnode && prevnode->next != node) prevnode = prevnode->next; - prevnode->next = node->next; +if (prevnode) + prevnode->next = node->next; } node->next =NULL ;break ;@@ -788,10 +789,11 @@ static struct pci_resource *get_resource(struct pci_resource **head, u32 size) *head = node->next; }else { prevnode = *head; -while (prevnode->next != node) +while (prevnode && prevnode->next != node) prevnode = prevnode->next; - prevnode->next = node->next; +if (prevnode) + prevnode->next = node->next; } node->next =NULL ;break ; --2.7.4
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 6 lines · Andy Shevchenko
Quoted 2 lines · Young Xiao
There is otherwise a risk of a null pointer dereference.
Had you analyze the code?
How come that prevnode can become NULL?
Dropping this for now. Young, if there's a scenario where prevnode can actually be NULL, please mention that in the changelog and repost this.
Quoted 45 lines
Quoted 40 lines
Signed-off-by Young Xiao <[email protected]>--- drivers/pci/hotplug/cpqphp_ctrl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/pci/hotplug/cpqphp_ctrl.c +6
-5@@ -598,10 +598,11 @@ static struct pci_resource *get_io_resource(struct pci_resource **head, u32 size *head = node->next; }else { prevnode = *head; -while (prevnode->next != node) +while (prevnode && prevnode->next != node) prevnode = prevnode->next; - prevnode->next = node->next; +if (prevnode) + prevnode->next = node->next; } node->next =NULL ;break ;@@ -788,10 +789,11 @@ static struct pci_resource *get_resource(struct pci_resource **head, u32 size) *head = node->next; }else { prevnode = *head; -while (prevnode->next != node) +while (prevnode && prevnode->next != node) prevnode = prevnode->next; - prevnode->next = node->next; +if (prevnode) + prevnode->next = node->next; } node->next =NULL ;break ; --2.7.4
Signature · 2 lines
With Best Regards, Andy Shevchenko