Commit 6cf18e69 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman

goldfish: Sanitize the broken interrupt handler

This interrupt handler is broken in several ways:

  - It loops forever when the op code is not decodeable

  - It never returns IRQ_HANDLED because the only way to exit the loop
    returns IRQ_NONE unconditionally.

The whole concept of this is broken. Creating devices in an interrupt
handler is beyond any point of sanity.

Make it at least behave halfways sane so accidental users do not have to
deal with a hard to debug lockup.

Fixes: e809c22b ("goldfish: add the goldfish virtual bus")
Reported-by: default avatarGabriel C <nix.or.die@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 47512cfd
...@@ -157,23 +157,26 @@ static int goldfish_new_pdev(void) ...@@ -157,23 +157,26 @@ static int goldfish_new_pdev(void)
static irqreturn_t goldfish_pdev_bus_interrupt(int irq, void *dev_id) static irqreturn_t goldfish_pdev_bus_interrupt(int irq, void *dev_id)
{ {
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
while (1) { while (1) {
u32 op = readl(pdev_bus_base + PDEV_BUS_OP); u32 op = readl(pdev_bus_base + PDEV_BUS_OP);
switch (op) {
case PDEV_BUS_OP_DONE:
return IRQ_NONE;
switch (op) {
case PDEV_BUS_OP_REMOVE_DEV: case PDEV_BUS_OP_REMOVE_DEV:
goldfish_pdev_remove(); goldfish_pdev_remove();
ret = IRQ_HANDLED;
break; break;
case PDEV_BUS_OP_ADD_DEV: case PDEV_BUS_OP_ADD_DEV:
goldfish_new_pdev(); goldfish_new_pdev();
ret = IRQ_HANDLED;
break; break;
case PDEV_BUS_OP_DONE:
default:
return ret;
} }
ret = IRQ_HANDLED;
} }
return ret;
} }
static int goldfish_pdev_bus_probe(struct platform_device *pdev) static int goldfish_pdev_bus_probe(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment