44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
Subject: tsc210x: fix buffer overrun on invalid state load
|
||
|
|
From: Michael S. Tsirkin mst@redhat.com Thu Apr 3 19:52:09 2014 +0300
|
||
|
|
Date: Mon May 5 22:15:02 2014 +0200:
|
||
|
|
Git: 5193be3be35f29a35bc465036cd64ad60d43385f
|
||
|
|
|
||
|
|
CVE-2013-4539
|
||
|
|
|
||
|
|
s->precision, nextprecision, function and nextfunction
|
||
|
|
come from wire and are used
|
||
|
|
as idx into resolution[] in TSC_CUT_RESOLUTION.
|
||
|
|
|
||
|
|
Validate after load to avoid buffer overrun.
|
||
|
|
|
||
|
|
Cc: Andreas Färber <afaerber@suse.de>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
|
||
|
|
Index: xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/hw/tsc210x.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.6.0-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/tsc210x.c
|
||
|
|
+++ xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/hw/tsc210x.c
|
||
|
|
@@ -1077,9 +1077,21 @@ static int tsc210x_load(QEMUFile *f, voi
|
||
|
|
s->enabled = qemu_get_byte(f);
|
||
|
|
s->host_mode = qemu_get_byte(f);
|
||
|
|
s->function = qemu_get_byte(f);
|
||
|
|
+ if (s->function < 0 || s->function >= ARRAY_SIZE(mode_regs)) {
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
s->nextfunction = qemu_get_byte(f);
|
||
|
|
+ if (s->nextfunction < 0 || s->nextfunction >= ARRAY_SIZE(mode_regs)) {
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
s->precision = qemu_get_byte(f);
|
||
|
|
+ if (s->precision < 0 || s->precision >= ARRAY_SIZE(resolution)) {
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
s->nextprecision = qemu_get_byte(f);
|
||
|
|
+ if (s->nextprecision < 0 || s->nextprecision >= ARRAY_SIZE(resolution)) {
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
s->filter = qemu_get_byte(f);
|
||
|
|
s->pin_func = qemu_get_byte(f);
|
||
|
|
s->ref = qemu_get_byte(f);
|