diff options
| author | Todd Poynor <toddpoynor@google.com> | 2011-07-16 22:39:35 -0700 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2011-07-19 12:49:00 +0530 |
| commit | 33e1e5e317b0fc78ac6588ec8aa40005bcddd7ce (patch) | |
| tree | 001bb1f8b9a2072e3de8dc6ae54f82c8b3f6d4cc | |
| parent | f299bb9527abfa6ee45a5e26288b5e3a619f01d6 (diff) | |
| download | kernel_samsung_aries-33e1e5e317b0fc78ac6588ec8aa40005bcddd7ce.zip kernel_samsung_aries-33e1e5e317b0fc78ac6588ec8aa40005bcddd7ce.tar.gz kernel_samsung_aries-33e1e5e317b0fc78ac6588ec8aa40005bcddd7ce.tar.bz2 | |
ARM: davinci: Check for NULL return from irq_alloc_generic_chip
Avoid NULL dereference of irq_alloc_generic_chip return in low
memory conditions.
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
| -rw-r--r-- | arch/arm/mach-davinci/irq.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index bfe68ec..85e77fd 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -52,6 +52,12 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) struct irq_chip_type *ct; gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq); + if (!gc) { + pr_err("%s: irq_alloc_generic_chip for IRQ %u failed\n", + __func__, irq_start); + return; + } + ct = gc->chip_types; ct->chip.irq_ack = irq_gc_ack; ct->chip.irq_mask = irq_gc_mask_clr_bit; |