Commit f9632de4 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-4.13-2' of... 

Merge tag 'irqchip-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core

Merge second batch of irqchip updates for 4.13 from Marc Zyngier

- Potential out of bound access for GICv3
- Memory allocation gotcha in the Marvell GICP driver
- Fix openrisc interrupt acknowledgement
parents 425a17cb ca387019

drivers/irqchip/irq-gic-v3.c

+3 −0
Original line number Diff line number Diff line
@@ -645,6 +645,9 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, 
	int enabled;

	u64 val;



	if (cpu >= nr_cpu_ids)

		return -EINVAL;



	if (gic_irq_in_rdist(d))

		return -EINVAL;

drivers/irqchip/irq-mvebu-gicp.c

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev) 
	}



	gicp->spi_bitmap = devm_kzalloc(&pdev->dev,

					BITS_TO_LONGS(gicp->spi_cnt),

				BITS_TO_LONGS(gicp->spi_cnt) * sizeof(long),

				GFP_KERNEL);

	if (!gicp->spi_bitmap)

		return -ENOMEM;

drivers/irqchip/irq-or1k-pic.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static struct or1k_pic_dev or1k_pic_level = { 
		.name = "or1k-PIC-level",

		.irq_unmask = or1k_pic_unmask,

		.irq_mask = or1k_pic_mask,

		.irq_mask_ack = or1k_pic_mask,

		.irq_mask_ack = or1k_pic_mask_ack,

	},

	.handle = handle_level_irq,

	.flags = IRQ_LEVEL | IRQ_NOPROBE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE