This is a note to let you know that I've just added the patch titled
ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure path
to the 4.11-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:
arm64-pci-fix-struct-acpi_pci_root_ops-allocation-failure-path.patch
and it can be found in the queue-4.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 717902cc93118119a6fce7765da6cf2786987418 Mon Sep 17 00:00:00 2001
From: Timmy Li <lixiaoping3@xxxxxxxxxx>
Date: Mon, 22 May 2017 16:48:28 +0100
Subject: ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure path
From: Timmy Li <lixiaoping3@xxxxxxxxxx>
commit 717902cc93118119a6fce7765da6cf2786987418 upstream.
Commit 093d24a20442 ("arm64: PCI: Manage controller-specific data on
per-controller basis") added code to allocate ACPI PCI root_ops
dynamically on a per host bridge basis but failed to update the
corresponding memory allocation failure path in pci_acpi_scan_root()
leading to a potential memory leakage.
Fix it by adding the required kfree call.
Fixes: 093d24a20442 ("arm64: PCI: Manage controller-specific data on per-controller basis")
Reviewed-by: Tomasz Nowicki <tn@xxxxxxxxxxxx>
Signed-off-by: Timmy Li <lixiaoping3@xxxxxxxxxx>
[lorenzo.pieralisi@xxxxxxx: refactored code, rewrote commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
CC: Will Deacon <will.deacon@xxxxxxx>
CC: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm64/kernel/pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -191,8 +191,10 @@ struct pci_bus *pci_acpi_scan_root(struc
return NULL;
root_ops = kzalloc_node(sizeof(*root_ops), GFP_KERNEL, node);
- if (!root_ops)
+ if (!root_ops) {
+ kfree(ri);
return NULL;
+ }
ri->cfg = pci_acpi_setup_ecam_mapping(root);
if (!ri->cfg) {
Patches currently in stable-queue which might be from lixiaoping3@xxxxxxxxxx are
queue-4.11/arm64-pci-fix-struct-acpi_pci_root_ops-allocation-failure-path.patch