Commit f11c7cf7 authored Jul 31, 2024 by Herve Codina Committed by Lin Yujun Jul 31, 2024

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: Herve Codina <herve.codina@bootlin.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240614173232.1184015-4-herve.codina@bootlin.com


Conflicts:
	kernel/irq/irqdomain.c
[74c782cf ("driver core: fw_devlink: Handle suppliers that don't use driver core")
67a4e1a3 ("irqdomain: Use return value of strreplace()")
ed1054a0 ("irqdomain: Mark fwnodes when their irqdomain is added/removed")
these 3 patchs didn't backport to 5.10 which leads context conflicts.
Fix context conflicts.]
Signed-off-by: Lin Yujun <linyujun809@huawei.com>

parent ec8c5f98

kernel/irq/irqdomain.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -151,7 +151,6 @@ struct irq_domain __irq_domain_add(struct fwnode_handle fwnode, int size,
		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);
		@@ -160,7 +159,6 @@ struct irq_domain __irq_domain_add(struct fwnode_handle fwnode, int size,
		domain->flags \|= IRQ_DOMAIN_NAME_ALLOCATED;
		break;
		default:
		domain->fwnode = fwnode;
		domain->name = fwid->name;
		break;
		}
		@@ -182,7 +180,6 @@ struct irq_domain __irq_domain_add(struct fwnode_handle fwnode, int size,
		strreplace(name, '/', ':');

		domain->name = name;
		domain->fwnode = fwnode;
		domain->flags \|= IRQ_DOMAIN_NAME_ALLOCATED;
		}

		@@ -198,7 +195,7 @@ struct irq_domain __irq_domain_add(struct fwnode_handle fwnode, int size,
		domain->flags \|= IRQ_DOMAIN_NAME_ALLOCATED;
		}

		fwnode_handle_get(fwnode);
		domain->fwnode = fwnode_handle_get(fwnode);

		/* Fill structure */
		INIT_RADIX_TREE(&domain->revmap_tree, GFP_KERNEL);