Skip to content

Commit

Permalink
omap: Ptr "isr_reg" tracked as NULL was dereferenced
Browse files Browse the repository at this point in the history
Value of "isr_reg" pointer is depend on configuration and GPIO method.
Potentially it may have NULL value and it is dereferenced later
in code. Warning and exit from function are added in this case.

Signed-off-by: Evgeny Kuznetsov <EXT-Eugeny.Kuznetsov@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Evgeny Kuznetsov authored and Tony Lindgren committed Dec 8, 2010
1 parent be40f7a commit b1cc4c5
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/arm/plat-omap/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1318,6 +1318,10 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
if (bank->method == METHOD_GPIO_44XX)
isr_reg = bank->base + OMAP4_GPIO_IRQSTATUS0;
#endif

if (WARN_ON(!isr_reg))
goto exit;

while(1) {
u32 isr_saved, level_mask = 0;
u32 enabled;
Expand Down Expand Up @@ -1377,6 +1381,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
configured, we must unmask the bank interrupt only after
handler(s) are executed in order to avoid spurious bank
interrupt */
exit:
if (!unmasked)
desc->chip->unmask(irq);

Expand Down

0 comments on commit b1cc4c5

Please sign in to comment.