leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Thomas Gleixner
2017-06-30 17:29:46 +02:00
parent 425a17cbff ca38701935
commit f9632de40e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/irqchip/irq-gic-v3.c
View File

@@ -645,6 +645,9 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
int enabled; int enabled;
u64 val; u64 val;
if (cpu >= nr_cpu_ids)
return -EINVAL;
if (gic_irq_in_rdist(d)) if (gic_irq_in_rdist(d))
return -EINVAL; return -EINVAL;

4
drivers/irqchip/irq-mvebu-gicp.c
View File

@@ -226,8 +226,8 @@ static int mvebu_gicp_probe(struct platform_device *pdev)
} }
gicp->spi_bitmap = devm_kzalloc(&pdev->dev, gicp->spi_bitmap = devm_kzalloc(&pdev->dev,
BITS_TO_LONGS(gicp->spi_cnt), BITS_TO_LONGS(gicp->spi_cnt) * sizeof(long),
GFP_KERNEL); GFP_KERNEL);
if (!gicp->spi_bitmap) if (!gicp->spi_bitmap)
return -ENOMEM; return -ENOMEM;

2
drivers/irqchip/irq-or1k-pic.c
View File

@@ -70,7 +70,7 @@ static struct or1k_pic_dev or1k_pic_level = {
.name = "or1k-PIC-level", .name = "or1k-PIC-level",
.irq_unmask = or1k_pic_unmask, .irq_unmask = or1k_pic_unmask,
.irq_mask = or1k_pic_mask, .irq_mask = or1k_pic_mask,
.irq_mask_ack = or1k_pic_mask, .irq_mask_ack = or1k_pic_mask_ack,
}, },
.handle = handle_level_irq, .handle = handle_level_irq,
.flags = IRQ_LEVEL | IRQ_NOPROBE, .flags = IRQ_LEVEL | IRQ_NOPROBE,