mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-14 21:01:29 +00:00
powerpc/macio: Don't the address of an array element before boundchecking
Check whether index is within bounds before grabbing the element. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
14ea58ad79
commit
fb2881a713
@ -294,10 +294,11 @@ static void macio_setup_interrupts(struct macio_dev *dev)
|
||||
int i = 0, j = 0;
|
||||
|
||||
for (;;) {
|
||||
struct resource *res = &dev->interrupt[j];
|
||||
struct resource *res;
|
||||
|
||||
if (j >= MACIO_DEV_COUNT_IRQS)
|
||||
break;
|
||||
res = &dev->interrupt[j];
|
||||
irq = irq_of_parse_and_map(np, i++);
|
||||
if (irq == NO_IRQ)
|
||||
break;
|
||||
@ -321,9 +322,10 @@ static void macio_setup_resources(struct macio_dev *dev,
|
||||
int index;
|
||||
|
||||
for (index = 0; of_address_to_resource(np, index, &r) == 0; index++) {
|
||||
struct resource *res = &dev->resource[index];
|
||||
struct resource *res;
|
||||
if (index >= MACIO_DEV_COUNT_RESOURCES)
|
||||
break;
|
||||
res = &dev->resource[index];
|
||||
*res = r;
|
||||
res->name = dev_name(&dev->ofdev.dev);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user