Merge tag 'irq-urgent-2025-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit a226e6540b0a · 2025-04-26T09:08:45.000-07:00
Pull irq fix from Ingo Molnar:
 "Fix crashes in the gic-v2m irqchip driver, caused by an incorrect
  __init annotation"

* tag 'irq-urgent-2025-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
@@ -421,7 +421,7 @@ static int __init gicv2m_of_init(struct fwnode_handle *parent_handle,
 #ifdef CONFIG_ACPI
 static int acpi_num_msi;
 
-static __init struct fwnode_handle *gicv2m_get_fwnode(struct device *dev)
+static struct fwnode_handle *gicv2m_get_fwnode(struct device *dev)
 {
 	struct v2m_data *data;
 

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ static int __init gicv2m_of_init(struct fwnode_handle *parent_handle,`
`421`	`421`	`#ifdef CONFIG_ACPI`
`422`	`422`	`static int acpi_num_msi;`
`423`	`423`
`424`		`-static __init struct fwnode_handle gicv2m_get_fwnode(struct device dev)`
	`424`	`+static struct fwnode_handle gicv2m_get_fwnode(struct device dev)`
`425`	`425`	`{`
`426`	`426`	`struct v2m_data *data;`
`427`	`427`