diff mbox series

[tip:,irq/urgent] irqdomain: Add missing NULL pointer check in irq_domain_create_hierarchy()

Message ID 167716435690.5837.7282180286659633068.tip-bot2@tip-bot2
State New
Headers
Series [tip:,irq/urgent] irqdomain: Add missing NULL pointer check in irq_domain_create_hierarchy() |

Commit Message

tip-bot2 for Thomas Gleixner Feb. 23, 2023, 2:59 p.m. UTC 
  The following commit has been merged into the irq/urgent branch of tip:

Commit-ID:     ad32ab9604f29827494024828f527228e84fbd2c
Gitweb:        https://git.kernel.org/tip/ad32ab9604f29827494024828f527228e84fbd2c
Author:        Juergen Gross <jgross@suse.com>
AuthorDate:    Thu, 23 Feb 2023 09:38:00 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 23 Feb 2023 15:52:28 +01:00

irqdomain: Add missing NULL pointer check in irq_domain_create_hierarchy()

The recent switch to per-domain locking caused a NULL dereference in
irq_domain_create_hierarchy(), as Xen code is calling
msi_create_irq_domain() with a NULL parent pointer.

Fix that by testing parent to be set before dereferencing it. For a
non-existing parent the irqdomain's root will stay to point to
itself.

Fixes: 9dbb8e3452ab ("irqdomain: Switch to per-domain locking")
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230223083800.31347-1-jgross@suse.com

---
 kernel/irq/irqdomain.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index aa5b7ee..6522dfb 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1172,7 +1172,8 @@  struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent,
 		domain = __irq_domain_create(fwnode, 0, ~0, 0, ops, host_data);
 
 	if (domain) {
-		domain->root = parent->root;
+		if (parent)
+			domain->root = parent->root;
 		domain->parent = parent;
 		domain->flags |= flags;