motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-26 03:21:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hmp: fix bad value conversion for M type

Browse source 
The M type converts from megabytes to bytes. However, the value can be
negative before the conversion, which will lead to a flawed conversion.

For example, this:

 (qemu) balloon -1000000000000011
 (qemu)

Just "works", but the value passed by the balloon command will be
something else.

This patch fixes this problem by requering a positive value before
converting. There's really no reason to accept a negative value for
the M type.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Luiz Capitulino 2012-04-26 17:34:30 -03:00
parent 6b0e33be88
commit 911628498c
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
monitor.c
View file

@ -89,8 +89,8 @@
* TODO lift the restriction * TODO lift the restriction
* 'i' 32 bit integer * 'i' 32 bit integer
* 'l' target long (32 or 64 bit) * 'l' target long (32 or 64 bit)
* 'M' just like 'l', except in user mode the value is * 'M' Non-negative target long (32 or 64 bit), in user mode the
* multiplied by 2^20 (think Mebibyte) * value is multiplied by 2^20 (think Mebibyte)
* 'o' octets (aka bytes) * 'o' octets (aka bytes)
* user mode accepts an optional T, t, G, g, M, m, K, k * user mode accepts an optional T, t, G, g, M, m, K, k
* suffix, which multiplies the value by 2^40 for * suffix, which multiplies the value by 2^40 for
@ -3622,6 +3622,10 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
monitor_printf(mon, "integer is for 32-bit values\n"); monitor_printf(mon, "integer is for 32-bit values\n");
goto fail; goto fail;
} else if (c == 'M') { } else if (c == 'M') {
if (val < 0) {
monitor_printf(mon, "enter a positive value\n");
goto fail;
}
val <<= 20; val <<= 20;
} }
qdict_put(qdict, key, qint_from_int(val)); qdict_put(qdict, key, qint_from_int(val));