From 08f41a997e926981076b89c7b68575d2f536b8b0 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 20 Jun 2022 03:16:33 -0400 Subject: [PATCH] Fixes for 4.14 Signed-off-by: Sasha Levin --- ...view-fix-refcount-leak-in-realview_g.patch | 37 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.14/irqchip-gic-realview-fix-refcount-leak-in-realview_g.patch diff --git a/queue-4.14/irqchip-gic-realview-fix-refcount-leak-in-realview_g.patch b/queue-4.14/irqchip-gic-realview-fix-refcount-leak-in-realview_g.patch new file mode 100644 index 00000000000..a216b782c95 --- /dev/null +++ b/queue-4.14/irqchip-gic-realview-fix-refcount-leak-in-realview_g.patch @@ -0,0 +1,37 @@ +From a8bea166ef0766142a4f73866984ddcd0d336fc7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Jun 2022 12:09:25 +0400 +Subject: irqchip/gic/realview: Fix refcount leak in realview_gic_of_init + +From: Miaoqian Lin + +[ Upstream commit f4b98e314888cc51486421bcf6d52852452ea48b ] + +of_find_matching_node_and_match() returns a node pointer with refcount +incremented, we should use of_node_put() on it when not need anymore. +Add missing of_node_put() to avoid refcount leak. + +Fixes: 82b0a434b436 ("irqchip/gic/realview: Support more RealView DCC variants") +Signed-off-by: Miaoqian Lin +Signed-off-by: Marc Zyngier +Link: https://lore.kernel.org/r/20220601080930.31005-2-linmq006@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-gic-realview.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/irqchip/irq-gic-realview.c b/drivers/irqchip/irq-gic-realview.c +index b4c1924f0255..38fab02ffe9d 100644 +--- a/drivers/irqchip/irq-gic-realview.c ++++ b/drivers/irqchip/irq-gic-realview.c +@@ -57,6 +57,7 @@ realview_gic_of_init(struct device_node *node, struct device_node *parent) + + /* The PB11MPCore GIC needs to be configured in the syscon */ + map = syscon_node_to_regmap(np); ++ of_node_put(np); + if (!IS_ERR(map)) { + /* new irq mode with no DCC */ + regmap_write(map, REALVIEW_SYS_LOCK_OFFSET, +-- +2.35.1 + diff --git a/queue-4.14/series b/queue-4.14/series index a3f617a5e0d..02e0e548be9 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -213,3 +213,4 @@ misc-atmel-ssc-fix-irq-check-in-ssc_probe.patch net-bgmac-fix-an-erroneous-kfree-in-bgmac_remove.patch arm64-ftrace-fix-branch-range-checks.patch certs-blacklist_hashes.c-fix-const-confusion-in-cert.patch +irqchip-gic-realview-fix-refcount-leak-in-realview_g.patch -- 2.47.3