summary refs log tree commit diff stats
path: root/hw/arm/strongarm.c
diff options
context:
space:
mode:
authorPrasad J Pandit <pjp@fedoraproject.org>2018-10-30 15:23:56 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-11-02 14:03:33 +0000
commit9a93b2fa0ed8de66a9deb9106ce5ddc2a65d68f0 (patch)
treeb793434e0f323386c7d7df1e250ac0b575e2e906 /hw/arm/strongarm.c
parent22461bd2e59380c08683044c580c18b1f3c9ce26 (diff)
downloadfocaccia-qemu-9a93b2fa0ed8de66a9deb9106ce5ddc2a65d68f0.tar.gz
focaccia-qemu-9a93b2fa0ed8de66a9deb9106ce5ddc2a65d68f0.zip
strongarm: mask off high[31:28] bits from dir and state registers
The high[31:28] bits of 'direction' and 'state' registers of
SA-1100/SA-1110 device are reserved. Setting them may lead to
OOB 's->handler[]' array access issue. Mask off [31:28] bits to
avoid it.

Reported-by: Moguofang <moguofang@huawei.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-id: 20181030114635.31232-1-ppandit@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/strongarm.c')
-rw-r--r--hw/arm/strongarm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index ec2627374d..644a9c45b4 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -587,12 +587,12 @@ static void strongarm_gpio_write(void *opaque, hwaddr offset,
 
     switch (offset) {
     case GPDR:        /* GPIO Pin-Direction registers */
-        s->dir = value;
+        s->dir = value & 0x0fffffff;
         strongarm_gpio_handler_update(s);
         break;
 
     case GPSR:        /* GPIO Pin-Output Set registers */
-        s->olevel |= value;
+        s->olevel |= value & 0x0fffffff;
         strongarm_gpio_handler_update(s);
         break;