From: Herve Codina <herve.codina@bootlin.com>
To: Matti Vaittinen <mazziesaccount@gmail.com>,
Herve Codina <herve.codina@bootlin.com>,
Thomas Gleixner <tglx@linutronix.de>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Richard Weinberger <richard@nod.at>,
Anton Ivanov <anton.ivanov@cambridgegreys.com>,
Johannes Berg <johannes@sipsolutions.net>,
Marc Zyngier <maz@kernel.org>
Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-um@lists.infradead.org,
Allan Nielsen <allan.nielsen@microchip.com>,
Horatiu Vultur <horatiu.vultur@microchip.com>,
Steen Hegelund <steen.hegelund@microchip.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
stable@vger.kernel.org
Subject: [PATCH 03/23] irqdomain: Fixed unbalanced fwnode get and put
Date: Fri, 14 Jun 2024 19:32:04 +0200 [thread overview]
Message-ID: <20240614173232.1184015-4-herve.codina@bootlin.com> (raw)
In-Reply-To: <20240614173232.1184015-1-herve.codina@bootlin.com>
fwnode_handle_get(fwnode) is called when a domain is created with fwnode
passed as a function parameter. fwnode_handle_put(domain->fwnode) is
called when the domain is destroyed but during the creation a path
exists that does not set domain->fwnode.
If this path is taken, the fwnode get will never be put.
To avoid the unbalanced get and put, set domain->fwnode unconditionally.
Fixes: d59f6617eef0 ("genirq: Allow fwnode to carry name information only")
Cc: stable@vger.kernel.org
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
kernel/irq/irqdomain.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 012ada09b419..31277488ed42 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -156,7 +156,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
switch (fwid->type) {
case IRQCHIP_FWNODE_NAMED:
case IRQCHIP_FWNODE_NAMED_ID:
- domain->fwnode = fwnode;
domain->name = kstrdup(fwid->name, GFP_KERNEL);
if (!domain->name) {
kfree(domain);
@@ -165,7 +164,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
break;
default:
- domain->fwnode = fwnode;
domain->name = fwid->name;
break;
}
@@ -185,7 +183,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
}
domain->name = strreplace(name, '/', ':');
- domain->fwnode = fwnode;
domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
}
@@ -201,8 +198,8 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
}
- fwnode_handle_get(fwnode);
- fwnode_dev_initialized(fwnode, true);
+ domain->fwnode = fwnode_handle_get(fwnode);
+ fwnode_dev_initialized(domain->fwnode, true);
/* Fill structure */
INIT_RADIX_TREE(&domain->revmap_tree, GFP_KERNEL);
--
2.45.0
next prev parent reply other threads:[~2024-06-14 17:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-14 17:32 [PATCH 00/23] Introduce irq_domain_instanciate() Herve Codina
2024-06-14 17:32 ` [PATCH 01/23] irqdomain: Introduce irq_domain_free() Herve Codina
2024-06-14 17:32 ` [PATCH 02/23] irqdomain: Introduce irq_domain_instantiate() Herve Codina
2024-06-14 17:32 ` Herve Codina [this message]
2024-06-14 17:32 ` [PATCH 04/23] irqdomain: Constify parameter in is_fwnode_irqchip() Herve Codina
2024-06-14 17:32 ` [PATCH 05/23] irqdomain: Use a dedicated function to set the domain name Herve Codina
2024-06-14 17:32 ` [PATCH 06/23] irqdomain: Convert __irq_domain_create() to use struct irq_domain_info Herve Codina
2024-06-14 17:32 ` [PATCH 07/23] irqdomain: Handle additional domain flags in irq_domain_instantiate() Herve Codina
2024-06-14 17:32 ` [PATCH 08/23] irqdomain: Handle domain hierarchy parent " Herve Codina
2024-06-14 17:32 ` [PATCH 09/23] irqdomain: Use irq_domain_instantiate() for hierarchy domain creation Herve Codina
2024-06-14 17:32 ` [PATCH 10/23] irqdomain: Make __irq_domain_create() return an error code Herve Codina
2024-06-14 17:32 ` [PATCH 11/23] irqdomain: Handle domain bus token in irq_domain_create() Herve Codina
2024-06-14 17:32 ` [PATCH 12/23] irqdomain: Introduce init() and exit() hooks Herve Codina
2024-06-14 17:32 ` [PATCH 13/23] genirq/generic_chip: Introduce irq_domain_{alloc,remove}_generic_chips() Herve Codina
2024-06-14 17:32 ` [PATCH 14/23] genirq/generic_chip: Introduce init() and exit() hooks Herve Codina
2024-06-14 17:32 ` [PATCH 15/23] irqdomain: Add support for generic irq chips creation before publishing a domain Herve Codina
2024-06-14 17:32 ` [PATCH 16/23] irqdomain: Add a resource managed version of irq_domain_instantiate() Herve Codina
2024-06-14 17:32 ` [PATCH 17/23] irqdomain: Convert __irq_domain_add() wrappers to irq_domain_instantiate() Herve Codina
2024-06-14 17:32 ` [PATCH 18/23] irqdomain: Convert domain creation functions " Herve Codina
2024-06-14 17:32 ` [PATCH 19/23] um: virt-pci: Use irq_domain_instantiate() Herve Codina
2024-06-14 17:32 ` [PATCH 20/23] irqdomain: Remove __irq_domain_add() Herve Codina
2024-06-14 17:32 ` [PATCH 21/23] dt-bindings: interrupt-controller: Add support for Microchip LAN966x OIC Herve Codina
2024-06-14 17:32 ` [PATCH 22/23] irqchip: Add support for " Herve Codina
2024-06-14 17:32 ` [PATCH 23/23] MAINTAINERS: Add the Microchip LAN966x OIC driver entry Herve Codina
2024-06-17 13:57 ` [PATCH 00/23] Introduce irq_domain_instanciate() Thomas Gleixner
2024-06-18 13:05 ` Matti Vaittinen
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=20240614173232.1184015-4-herve.codina@bootlin.com \
--to=herve.codina@bootlin.com \
--cc=allan.nielsen@microchip.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=horatiu.vultur@microchip.com \
--cc=johannes@sipsolutions.net \
--cc=krzk+dt@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=maz@kernel.org \
--cc=mazziesaccount@gmail.com \
--cc=richard@nod.at \
--cc=robh@kernel.org \
--cc=stable@vger.kernel.org \
--cc=steen.hegelund@microchip.com \
--cc=tglx@linutronix.de \
--cc=thomas.petazzoni@bootlin.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).