[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/7] ps2: check PS2Queue pointers in post_load routin
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 3/7] ps2: check PS2Queue pointers in post_load routine |
Date: |
Mon, 29 Jan 2018 11:23:16 +0100 |
From: Prasad J Pandit <address@hidden>
During Qemu guest migration, a destination process invokes ps2
post_load function. In that, if 'rptr' and 'count' values were
invalid, it could lead to OOB access or infinite loop issue.
Add check to avoid it.
Reported-by: Cyrille Chatras <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/input/ps2.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index f388a23c8e..de171a28dd 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -1225,24 +1225,21 @@ static void ps2_common_reset(PS2State *s)
static void ps2_common_post_load(PS2State *s)
{
PS2Queue *q = &s->queue;
- int size;
- int i;
- int tmp_data[PS2_QUEUE_SIZE];
+ uint8_t i, size;
+ uint8_t tmp_data[PS2_QUEUE_SIZE];
/* set the useful data buffer queue size, < PS2_QUEUE_SIZE */
- size = q->count > PS2_QUEUE_SIZE ? 0 : q->count;
+ size = (q->count < 0 || q->count > PS2_QUEUE_SIZE) ? 0 : q->count;
/* move the queue elements to the start of data array */
- if (size > 0) {
- for (i = 0; i < size; i++) {
- /* move the queue elements to the temporary buffer */
- tmp_data[i] = q->data[q->rptr];
- if (++q->rptr == 256) {
- q->rptr = 0;
- }
+ for (i = 0; i < size; i++) {
+ if (q->rptr < 0 || q->rptr >= sizeof(q->data)) {
+ q->rptr = 0;
}
- memcpy(q->data, tmp_data, size);
+ tmp_data[i] = q->data[q->rptr++];
}
+ memcpy(q->data, tmp_data, size);
+
/* reset rptr/wptr/count */
q->rptr = 0;
q->wptr = size;
--
2.9.3
- [Qemu-devel] [PULL 0/7] Input 20180129 v2 patches, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 5/7] hw: convert the escc device to keycodemapdb, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 2/7] input: virtio: don't send mouse wheel event twice, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 6/7] ui: fix alphabetical ordering of keymaps, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 1/7] input: add mouse side buttons to virtio input, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 4/7] hw: convert ps2 device to keycodemapdb, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 7/7] hw: convert virtio-input-hid device to keycodemapdb, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 3/7] ps2: check PS2Queue pointers in post_load routine,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 0/7] Input 20180129 v2 patches, Peter Maydell, 2018/01/29