Skip to contentSkip to conversation

irqchip/imx-irqsteer: fix of_property_read_u32() error handling

PATCH Applied Arnd Bergmann 2 participants 2 messages Mar 4, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irqchip/imx-irqsteer: fix of_property_read_u32() error handling

gcc points out that irqs_num is not initialized when of_property_read_u32() is an empty stub function:

Included from drivers/irqchip/irq-imx-irqsteer.c:7:
drivers/irqchip/irq-imx-irqsteer.c: In function 'imx_irqsteer_probe':
include/uapi/linux/kernel.h:13:49: error: 'irqs_num' may be used uninitialized in this function [-Werror=maybe-uninitialized]

The same can actually happen with CONFIG_OF=y as well, though we don't get a warning then.

Add error checking here that lets the code deal with missing or invalid properties as well as avoid the warning.

Fixes 28528fca4908 ("irqchip/imx-irqsteer: Add multi output interrupts support")
---
 drivers/irqchip/irq-imx-irqsteer.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/irqchip/irq-imx-irqsteer.c +6 -2
index d1098f4da6a4..88df3d00052c 100644
@@ -169,8 +169,12 @@ static int imx_irqsteer_probe(struct platform_device *pdev)
 
 	raw_spin_lock_init(&data->lock);
 
-	of_property_read_u32(np, "fsl,num-irqs", &irqs_num);
-	of_property_read_u32(np, "fsl,channel", &data->channel);
+	ret = of_property_read_u32(np, "fsl,num-irqs", &irqs_num);
+	if (ret)
+		return ret;
+	ret = of_property_read_u32(np, "fsl,channel", &data->channel);
+	if (ret)
+		return ret;
 
 	/*
 	 * There is one output irq for each group of 64 inputs.
Signature · 1 line
2.20.0
Applied
#1 lore raw
Quoted 11 lines · Arnd Bergmann

gcc points out that irqs_num is not initialized when of_property_read_u32() is an empty stub function:

Included from drivers/irqchip/irq-imx-irqsteer.c:7:
drivers/irqchip/irq-imx-irqsteer.c: In function 'imx_irqsteer_probe':
include/uapi/linux/kernel.h:13:49: error: 'irqs_num' may be used uninitialized in this function [-Werror=maybe-uninitialized]

The same can actually happen with CONFIG_OF=y as well, though we don't get a warning then.

Quoted 8 lines

Add error checking here that lets the code deal with missing or invalid properties as well as avoid the warning.

Fixes 28528fca4908 ("irqchip/imx-irqsteer: Add multi output interrupts support")
---
 drivers/irqchip/irq-imx-irqsteer.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Applied, thanks Arnd.

	M.
Signature · 1 line
Jazz is not dead, it just smell funny.