All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
Cc: <tglx@linutronix.de>, <maz@kernel.org>
Subject: [PATCH 3/3] irqchip/gic-v3: fix possible memory leak in gic_populate_ppi_part()
Date: Mon, 9 May 2022 14:32:06 +0800	[thread overview]
Message-ID: <20220509063206.3147124-3-yangyingliang@huawei.com> (raw)
In-Reply-To: <20220509063206.3147124-1-yangyingliang@huawei.com>

'ppi_descs' should be freed in error path in gic_populate_ppi_part().

Fixes: 52085d3f2028 ("irqchip/gic-v3: Dynamically allocate PPI partition descriptors")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/irqchip/irq-gic-v3.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 0e23dc8bafcf..3264fef89360 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1871,11 +1871,11 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
 	nr_parts = of_get_child_count(parts_node);
 
 	if (!nr_parts)
-		goto out_put_node;
+		goto out_free_ppi_descs;
 
 	parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
 	if (WARN_ON(!parts))
-		goto out_put_node;
+		goto out_free_ppi_descs;
 
 	for_each_child_of_node(parts_node, child_part) {
 		struct partition_affinity *part;
@@ -1946,6 +1946,9 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
 		gic_data.ppi_descs[i] = desc;
 	}
 
+out_free_ppi_descs:
+	kfree(gic_data.ppi_descs);
+	gic_data.ppi_descs = NULL;
 out_put_node:
 	of_node_put(parts_node);
 }
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
Cc: <tglx@linutronix.de>, <maz@kernel.org>
Subject: [PATCH 3/3] irqchip/gic-v3: fix possible memory leak in gic_populate_ppi_part()
Date: Mon, 9 May 2022 14:32:06 +0800	[thread overview]
Message-ID: <20220509063206.3147124-3-yangyingliang@huawei.com> (raw)
In-Reply-To: <20220509063206.3147124-1-yangyingliang@huawei.com>

'ppi_descs' should be freed in error path in gic_populate_ppi_part().

Fixes: 52085d3f2028 ("irqchip/gic-v3: Dynamically allocate PPI partition descriptors")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/irqchip/irq-gic-v3.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 0e23dc8bafcf..3264fef89360 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1871,11 +1871,11 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
 	nr_parts = of_get_child_count(parts_node);
 
 	if (!nr_parts)
-		goto out_put_node;
+		goto out_free_ppi_descs;
 
 	parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
 	if (WARN_ON(!parts))
-		goto out_put_node;
+		goto out_free_ppi_descs;
 
 	for_each_child_of_node(parts_node, child_part) {
 		struct partition_affinity *part;
@@ -1946,6 +1946,9 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
 		gic_data.ppi_descs[i] = desc;
 	}
 
+out_free_ppi_descs:
+	kfree(gic_data.ppi_descs);
+	gic_data.ppi_descs = NULL;
 out_put_node:
 	of_node_put(parts_node);
 }
-- 
2.25.1


  parent reply	other threads:[~2022-05-09  6:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-09  6:32 [PATCH 1/3] irqchip/gic-v3: add of_node_put() when finish using the device node Yang Yingliang
2022-05-09  6:32 ` Yang Yingliang
2022-05-09  6:32 ` [PATCH 2/3] irqchip/gic-v3: fix missing of_node_put() in gic_populate_ppi_part() Yang Yingliang
2022-05-09  6:32   ` Yang Yingliang
2022-05-09  6:32 ` Yang Yingliang [this message]
2022-05-09  6:32   ` [PATCH 3/3] irqchip/gic-v3: fix possible memory leak " Yang Yingliang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220509063206.3147124-3-yangyingliang@huawei.com \
    --to=yangyingliang@huawei.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maz@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.