Commit af42e745 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "A small bunch of fixes from the irqchip department:

   - Fix a couple of UAF on error paths (RZA1, GICv3 ITS)

   - Fix iMX GPCv2 trigger setting

   - Add missing of_node_put() on error path in MBIGEN

   - Add another bunch of /* fall-through */ to silence warnings"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/renesas-rza1: Fix an use-after-free in rza1_irqc_probe()
  irqchip/irq-imx-gpcv2: Forward irq type to parent
  irqchip/irq-mbigen: Add of_node_put() before return
  irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail
  irqchip/gic-v3: Mark expected switch fall-through
parents e12b243d a5dbba8f

drivers/irqchip/irq-gic-v3-its.c

+1 −1
Original line number Diff line number Diff line
@@ -3010,7 +3010,7 @@ static int its_vpe_init(struct its_vpe *vpe) 


	if (!its_alloc_vpe_table(vpe_id)) {

		its_vpe_id_free(vpe_id);

		its_free_pending_table(vpe->vpt_page);

		its_free_pending_table(vpt_page);

		return -ENOMEM;

	}

drivers/irqchip/irq-gic-v3.c

+4 −0
Original line number Diff line number Diff line
@@ -771,8 +771,10 @@ static void gic_cpu_sys_reg_init(void) 
		case 7:

			write_gicreg(0, ICC_AP0R3_EL1);

			write_gicreg(0, ICC_AP0R2_EL1);

		/* Fall through */

		case 6:

			write_gicreg(0, ICC_AP0R1_EL1);

		/* Fall through */

		case 5:

		case 4:

			write_gicreg(0, ICC_AP0R0_EL1);
@@ -786,8 +788,10 @@ static void gic_cpu_sys_reg_init(void) 
	case 7:

		write_gicreg(0, ICC_AP1R3_EL1);

		write_gicreg(0, ICC_AP1R2_EL1);

		/* Fall through */

	case 6:

		write_gicreg(0, ICC_AP1R1_EL1);

		/* Fall through */

	case 5:

	case 4:

		write_gicreg(0, ICC_AP1R0_EL1);

drivers/irqchip/irq-imx-gpcv2.c

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static struct irq_chip gpcv2_irqchip_data_chip = { 
	.irq_unmask		= imx_gpcv2_irq_unmask,

	.irq_set_wake		= imx_gpcv2_irq_set_wake,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_type		= irq_chip_set_type_parent,

#ifdef CONFIG_SMP

	.irq_set_affinity	= irq_chip_set_affinity_parent,

#endif

drivers/irqchip/irq-mbigen.c

+7 −2
Original line number Diff line number Diff line
@@ -241,12 +241,15 @@ static int mbigen_of_create_domain(struct platform_device *pdev, 


		parent = platform_bus_type.dev_root;

		child = of_platform_device_create(np, NULL, parent);

		if (!child)

		if (!child) {

			of_node_put(np);

			return -ENOMEM;

		}



		if (of_property_read_u32(child->dev.of_node, "num-pins",

					 &num_pins) < 0) {

			dev_err(&pdev->dev, "No num-pins property\n");

			of_node_put(np);

			return -EINVAL;

		}
@@ -254,9 +257,11 @@ static int mbigen_of_create_domain(struct platform_device *pdev, 
							   mbigen_write_msg,

							   &mbigen_domain_ops,

							   mgn_chip);

		if (!domain)

		if (!domain) {

			of_node_put(np);

			return -ENOMEM;

		}

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE