diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-11-02 16:14:42 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 11:48:07 +0900 |
| commit | 9016332014404ae1dca7198f93804ac67ba9e918 (patch) | |
| tree | 5823e797deb138ba18d1c441910d9781a8b7e561 /arch/sh | |
| parent | c4b973f532206e1a67b1beae654b44c8be26fc44 (diff) | |
| download | op-kernel-dev-9016332014404ae1dca7198f93804ac67ba9e918.zip op-kernel-dev-9016332014404ae1dca7198f93804ac67ba9e918.tar.gz | |
sh: Make sure indexes are positive
The indexes are signed, make sure they are not negative
when we read array elements.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/boards/mach-highlander/setup.c | 2 | ||||
| -rw-r--r-- | arch/sh/boards/mach-r2d/irq.c | 2 | ||||
| -rw-r--r-- | arch/sh/mm/numa.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c index 566e69d..f663c14 100644 --- a/arch/sh/boards/mach-highlander/setup.c +++ b/arch/sh/boards/mach-highlander/setup.c @@ -384,7 +384,7 @@ static unsigned char irl2irq[HL_NR_IRL]; static int highlander_irq_demux(int irq) { - if (irq >= HL_NR_IRL || !irl2irq[irq]) + if (irq >= HL_NR_IRL || irq < 0 || !irl2irq[irq]) return irq; return irl2irq[irq]; diff --git a/arch/sh/boards/mach-r2d/irq.c b/arch/sh/boards/mach-r2d/irq.c index c70fece..78d7b27 100644 --- a/arch/sh/boards/mach-r2d/irq.c +++ b/arch/sh/boards/mach-r2d/irq.c @@ -116,7 +116,7 @@ static unsigned char irl2irq[R2D_NR_IRL]; int rts7751r2d_irq_demux(int irq) { - if (irq >= R2D_NR_IRL || !irl2irq[irq]) + if (irq >= R2D_NR_IRL || irq < 0 || !irl2irq[irq]) return irq; return irl2irq[irq]; diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c index 9b784fd..6c52444 100644 --- a/arch/sh/mm/numa.c +++ b/arch/sh/mm/numa.c @@ -60,7 +60,7 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) unsigned long bootmem_paddr; /* Don't allow bogus node assignment */ - BUG_ON(nid > MAX_NUMNODES || nid == 0); + BUG_ON(nid > MAX_NUMNODES || nid <= 0); start_pfn = start >> PAGE_SHIFT; end_pfn = end >> PAGE_SHIFT; |
