Patch "PCI: keystone: Fix interrupt-controller-node lookup" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
PCI: keystone: Fix interrupt-controller-node lookup
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pci-keystone-fix-interrupt-controller-node-lookup.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
eac56aa3bc8af3d9b9850345d0f2da9d83529134Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 17 Nov 2017 14:38:31 +0100
Subject: PCI: keystone: Fix interrupt-controller-node lookup
From: Johan Hovold <[email protected]>
commit eac56aa3bc8af3d9b9850345d0f2da9d83529134 upstream.
Fix child-node lookup during initialisation which was using the wrong OF-helper and ended up searching the whole device tree depth-first starting at the parent rather than just matching on its children.
To make things worse, the parent pci node could end up being prematurely freed as of_find_node_by_name() drops a reference to its first argument. Any matching child interrupt-controller node was also leaked.
--- drivers/pci/host/pci-keystone.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/host/pci-keystone.c +4 -1
@@ -181,7 +181,7 @@ static int ks_pcie_get_irq_controller_in }/* interrupt controller is in a child node */ - *np_temp =of_find_node_by_name (np_pcie, controller); + *np_temp =of_get_child_by_name (np_pcie, controller);if (!(*np_temp)) {dev_err (dev,"Node for %s is absent\n" , controller);return -EINVAL ;
@@ -190,6 +190,7 @@ static int ks_pcie_get_irq_controller_in temp =of_irq_count (*np_temp);if (!temp) {dev_err (dev,"No IRQ entries in %s\n" , controller); +of_node_put (*np_temp);return -EINVAL ; }
@@ -207,6 +208,8 @@ static int ks_pcie_get_irq_controller_inbreak ; } +of_node_put (*np_temp); +if (temp) { *num_irqs = temp;return 0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/pci-keystone-fix-interrupt-controller-node-lookup.patch queue-4.9/video-fbdev-atmel_lcdfb-fix-display-timings-lookup.patch