mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/core/or-irq: Fix incorrect assert forbidding num-lines == MAX_OR_LINES

Browse Source 
The num-lines property of the TYPE_OR_GATE device sets the number
of input lines it has. An assert() in or_irq_realize() restricts
this to the maximum supported by the implementation. However we
got the condition in the assert wrong: it should be using <=,
because num-lines == MAX_OR_LINES is permitted, and means that
all entries from 0 to MAX_OR_LINES-1 in the s->levels[] array
are used.

We didn't notice this previously because no user has so far
needed that many input lines.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Message-id: 20200120142235.10432-1-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2020-01-30 16:02:01 +00:00
parent 204aa60b37
commit ea4d7ab5d9
1 changed files with 1 additions and 1 deletions

2
hw/core/or-irq.c

@ -58,7 +58,7 @@ static void or_irq_realize(DeviceState *dev, Error **errp)
{ {
qemu_or_irq *s = OR_IRQ(dev); qemu_or_irq *s = OR_IRQ(dev);
assert(s->num_lines < MAX_OR_LINES); assert(s->num_lines <= MAX_OR_LINES);
qdev_init_gpio_in(dev, or_irq_handler, s->num_lines); qdev_init_gpio_in(dev, or_irq_handler, s->num_lines);
} }