Commit eec567ba authored by Herve Codina's avatar Herve Codina Committed by Lin Yujun
Browse files

irqdomain: Fixed unbalanced fwnode get and put 

mainline inclusion
from mainline-v6.11-rc1
commit 6ce3e98184b625d2870991880bf9586ded7ea7f9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAF0D0

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6ce3e98184b625d2870991880bf9586ded7ea7f9



--------------------------------

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: d59f6617 ("genirq: Allow fwnode to carry name information only")
Signed-off-by: default avatarHerve Codina <herve.codina@bootlin.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240614173232.1184015-4-herve.codina@bootlin.com


Signed-off-by: default avatarLin Yujun <linyujun809@huawei.com>
parent 1f7c7602

kernel/irq/irqdomain.c

+2 −5
Original line number Diff line number Diff line
@@ -154,7 +154,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);
@@ -163,7 +162,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;

		}
@@ -183,7 +181,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;

	}
@@ -199,8 +196,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);