From: P J P <ppandit@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: Prasad J Pandit <pjp@fedoraproject.org>,
Yi Ren <c4tren@gmail.com>,
QEMU Developers <qemu-devel@nongnu.org>,
Ren Ding <rding@gatech.edu>, Hanqing Zhao <hanqing@gatech.edu>
Subject: [PATCH] ati-vga: increment mm_index in ati_mm_read/write
Date: Wed, 3 Jun 2020 18:17:32 +0530 [thread overview]
Message-ID: <20200603124732.1137892-1-ppandit@redhat.com> (raw)
From: Prasad J Pandit <pjp@fedoraproject.org>
While accessing VGA registers via ati_mm_read/write routines,
a guest may set 's->regs.mm_index' such that it leads to infinite
recursion. Increment the mm_index value to avoid it.
Reported-by: Ren Ding <rding@gatech.edu>
Reported-by: Hanqing Zhao <hanqing@gatech.edu>
Reported-by: Yi Ren <c4tren@gmail.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
hw/display/ati.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/display/ati.c b/hw/display/ati.c
index 065f197678..fa9061ad0b 100644
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -286,7 +286,8 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr, unsigned int size)
val = ldn_le_p(s->vga.vram_ptr + idx, size);
}
} else {
- val = ati_mm_read(s, s->regs.mm_index + addr - MM_DATA, size);
+ uint32_t idx = s->regs.mm_index++;
+ val = ati_mm_read(s, idx + addr - MM_DATA, size);
}
break;
case BIOS_0_SCRATCH ... BUS_CNTL - 1:
@@ -521,7 +522,8 @@ static void ati_mm_write(void *opaque, hwaddr addr,
stn_le_p(s->vga.vram_ptr + idx, size, data);
}
} else {
- ati_mm_write(s, s->regs.mm_index + addr - MM_DATA, data, size);
+ uint32_t idx = s->regs.mm_index++;
+ ati_mm_write(s, idx + addr - MM_DATA, data, size);
}
break;
case BIOS_0_SCRATCH ... BUS_CNTL - 1:
--
2.26.2
next reply other threads:[~2020-06-03 12:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 12:47 P J P [this message]
2020-06-03 13:44 ` [PATCH] ati-vga: increment mm_index in ati_mm_read/write Gerd Hoffmann
2020-06-03 13:56 ` BALATON Zoltan
2020-06-03 14:35 ` P J P
2020-06-03 15:32 ` Gerd Hoffmann
2020-06-03 15:38 ` BALATON Zoltan
2020-06-03 15:43 ` BALATON Zoltan
2020-06-03 19:08 ` P J P
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200603124732.1137892-1-ppandit@redhat.com \
--to=ppandit@redhat.com \
--cc=c4tren@gmail.com \
--cc=hanqing@gatech.edu \
--cc=kraxel@redhat.com \
--cc=pjp@fedoraproject.org \
--cc=qemu-devel@nongnu.org \
--cc=rding@gatech.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).