Skip to content

Commit 0859bbb

Browse files
keesMarc Zyngier
authored andcommitted
irqchip/ingenic-tcu: Use correctly sized arguments for bit field
The find.h APIs are designed to be used only on unsigned long arguments. This can technically result in a over-read, but it is harmless in this case. Regardless, fix it to avoid the warning seen under -Warray-bounds, which we'd like to enable globally: In file included from ./include/linux/bitmap.h:9, from ./include/linux/cpumask.h:12, from ./include/linux/smp.h:13, from ./include/linux/lockdep.h:14, from ./include/linux/mutex.h:17, from ./include/linux/notifier.h:14, from ./include/linux/clk.h:14, from drivers/irqchip/irq-ingenic-tcu.c:7: drivers/irqchip/irq-ingenic-tcu.c: In function 'ingenic_tcu_intc_cascade': ./include/linux/find.h:40:23: warning: array subscript 'long unsigned int[0]' is partly outside array bounds of 'uint32_t[1]' {aka 'unsigned int[1]'} [-Warray-bounds] 40 | val = *addr & GENMASK(size - 1, offset); | ^~~~~ drivers/irqchip/irq-ingenic-tcu.c:30:18: note: while referencing 'irq_reg' 30 | uint32_t irq_reg, irq_mask; | ^~~~~~~ Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent c10f2f8 commit 0859bbb

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/irqchip/irq-ingenic-tcu.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ static void ingenic_tcu_intc_cascade(struct irq_desc *desc)
2828
struct irq_chip_generic *gc = irq_get_domain_generic_chip(domain, 0);
2929
struct regmap *map = gc->private;
3030
uint32_t irq_reg, irq_mask;
31+
unsigned long bits;
3132
unsigned int i;
3233

3334
regmap_read(map, TCU_REG_TFR, &irq_reg);
@@ -36,8 +37,9 @@ static void ingenic_tcu_intc_cascade(struct irq_desc *desc)
3637
chained_irq_enter(irq_chip, desc);
3738

3839
irq_reg &= ~irq_mask;
40+
bits = irq_reg;
3941

40-
for_each_set_bit(i, (unsigned long *)&irq_reg, 32)
42+
for_each_set_bit(i, &bits, 32)
4143
generic_handle_domain_irq(domain, i);
4244

4345
chained_irq_exit(irq_chip, desc);

0 commit comments

Comments
 (0)