summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorliujunjie2018-06-07 10:02:37 +0200
committerGerd Hoffmann2018-06-18 12:06:45 +0200
commitb55a06df4f03f21e8a32e9d067a8a5782ac3ce0d (patch)
tree0edfc57a17f025f6bccd098214e00c0cdd561481 /hw
parentMerge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180615a'... (diff)
downloadqemu-b55a06df4f03f21e8a32e9d067a8a5782ac3ce0d.tar.gz
qemu-b55a06df4f03f21e8a32e9d067a8a5782ac3ce0d.tar.xz
qemu-b55a06df4f03f21e8a32e9d067a8a5782ac3ce0d.zip
ps2: check PS2Queue wptr pointer in post_load routine
In commit 802cbcb7300, most issues have been fixed when qemu guest migration. But the queue size still need to check whether is equal to PS2_QUEUE_SIZE. If yes, the wptr should set as 0. Or, wptr would larger than PS2_QUEUE_SIZE and never come back when ps2_queue_noirq is called. This could lead to OOB access, add check to avoid it. Signed-off-by: liujunjie <liujunjie23@huawei.com> Reviewed-by: Gonglei <arei.gonglei@huawei.com> Message-id: 20180607080237.12360-1-liujunjie23@huawei.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/input/ps2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index eeec6180d0..fdfcadf9a1 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -927,7 +927,7 @@ static void ps2_common_post_load(PS2State *s)
/* reset rptr/wptr/count */
q->rptr = 0;
- q->wptr = size;
+ q->wptr = (size == PS2_QUEUE_SIZE) ? 0 : size;
q->count = size;
s->update_irq(s->update_arg, q->count != 0);
}