From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 30 Jan 2020 16:02:01 +0000 (+0000)
Subject: hw/core/or-irq: Fix incorrect assert forbidding num-lines == MAX_OR_LINES
X-Git-Tag: qemu-xen-4.14.0~169^2~25
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ea4d7ab5d927baa96b940bcbbdf3b2971cf6b9ab;p=qemu-xen.git

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

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
---

diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c
index 4bbdbcb321..d8f3754e96 100644
--- a/hw/core/or-irq.c
+++ b/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);
 
-    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);
 }