mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmstate: fix buffer overflow in target-arm/machine.c

Browse Source 
CVE-2013-4531

cpreg_vmstate_indexes is a VARRAY_INT32. A negative value for
cpreg_vmstate_array_len will cause a buffer overflow.

VMSTATE_INT32_LE was supposed to protect against this
but doesn't because it doesn't validate that input is
non-negative.

Fix this macro to valide the value appropriately.

The only other user of VMSTATE_INT32_LE doesn't
ever use negative numbers so it doesn't care.

Reported-by: Anthony Liguori <anthony@codemonkey.ws>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2014-04-03 19:51:42 +03:00 committed by Juan Quintela
parent d8d0a0bc7e
commit d2ef4b61fe
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmstate.c
View File

@ -337,8 +337,9 @@ const VMStateInfo vmstate_info_int32_equal = {
.put = put_int32, .put = put_int32,
}; };
/* 32 bit int. Check that the received value is less than or equal to /* 32 bit int. Check that the received value is non-negative
the one in the field */ * and less than or equal to the one in the field.
*/
static int get_int32_le(QEMUFile *f, void *pv, size_t size) static int get_int32_le(QEMUFile *f, void *pv, size_t size)
{ {
@ -346,7 +347,7 @@ static int get_int32_le(QEMUFile *f, void *pv, size_t size)
int32_t loaded; int32_t loaded;
qemu_get_sbe32s(f, &loaded); qemu_get_sbe32s(f, &loaded);
if (loaded <= *cur) { if (loaded >= 0 && loaded <= *cur) {
*cur = loaded; *cur = loaded;
return 0; return 0;
} }