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

Monitor patches for 2016-02-03

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWscTMAAoJEDhwtADrkYZTx0gP/AnA9vYw6ps2UZqfPX6nRvdL
 aFqqZXpGJkjYggD01IYf+mrb652R1SJ9drUgWN5KGfNYZqp+OkH5UAYNA4EDVMUV
 JiKhMKeYYpKOjbh5RNlWexIFJZ+N+CZZnrPWemxjgPqQWM2FXHzK3Id3kcio5/HV
 qGyCpT7Tsuh1MhZFdf0JKkiw+Umc91j2jIp2aHxxjDaQXzL/RMedbEhwbt6ypOjA
 upyq728NGjLMm+hQSIZnNJGUhmhLS4/VYfiMaGU8+Wrr9I7NiF03R5zEVVPCHblk
 nX0Ne6S47FGG5GmXlYjpbqkKkkrddm/ArKwswSDm5GHwBF0II0RZPLv8Tc5mO9AF
 mKG7P63gimhd/1F7OwUdTiXp2C/505e4pr2xye0NfcuKheeGmjj3pQZmulU5P4nl
 9M9hBNwXcOYR/PxcIaTHGS5QZdzWUkkhLWVzlRX1TJEZDYj9HDqaxz5R+OK7G83Z
 eN4nRXT0BZcyCYHbkVpnImQnYjXpaVQ3F9zvSXN6FvNP03bI5nxbJ2MF7pU1/dPw
 jAGXnfVLTWEFqT4EyyWn3MiuQbJk9rDmLOQygPpUVXz718XoZmXl2PkM3rgOCefl
 /GLV4S4+H9FspSlnm1AZFqkEdGehlwlsmHJYahSVKGcnfKf/s28E0BmI3nKTeirI
 0/m/twwg+ZpwHTmbF4Gv
 =9jZy
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2016-02-03' into staging

Monitor patches for 2016-02-03

# gpg: Signature made Wed 03 Feb 2016 09:13:48 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-monitor-2016-02-03:
  hmp: fix sendkey out of bounds write (CVE-2015-8619)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-02-03 10:50:06 +00:00
commit ad9e1dab20
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hmp.c
View File

@ -1731,21 +1731,18 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict)
int has_hold_time = qdict_haskey(qdict, "hold-time"); int has_hold_time = qdict_haskey(qdict, "hold-time");
int hold_time = qdict_get_try_int(qdict, "hold-time", -1); int hold_time = qdict_get_try_int(qdict, "hold-time", -1);
Error *err = NULL; Error *err = NULL;
char keyname_buf[16];
char *separator; char *separator;
int keyname_len; int keyname_len;
while (1) { while (1) {
separator = strchr(keys, '-'); separator = strchr(keys, '-');
keyname_len = separator ? separator - keys : strlen(keys); keyname_len = separator ? separator - keys : strlen(keys);
pstrcpy(keyname_buf, sizeof(keyname_buf), keys);
/* Be compatible with old interface, convert user inputted "<" */ /* Be compatible with old interface, convert user inputted "<" */
if (!strncmp(keyname_buf, "<", 1) && keyname_len == 1) { if (keys[0] == '<' && keyname_len == 1) {
pstrcpy(keyname_buf, sizeof(keyname_buf), "less"); keys = "less";
keyname_len = 4; keyname_len = 4;
} }
keyname_buf[keyname_len] = 0;
keylist = g_malloc0(sizeof(*keylist)); keylist = g_malloc0(sizeof(*keylist));
keylist->value = g_malloc0(sizeof(*keylist->value)); keylist->value = g_malloc0(sizeof(*keylist->value));
@ -1758,16 +1755,17 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict)
} }
tmp = keylist; tmp = keylist;
if (strstart(keyname_buf, "0x", NULL)) { if (strstart(keys, "0x", NULL)) {
char *endp; char *endp;
int value = strtoul(keyname_buf, &endp, 0); int value = strtoul(keys, &endp, 0);
if (*endp != '\0') { assert(endp <= keys + keyname_len);
if (endp != keys + keyname_len) {
goto err_out; goto err_out;
} }
keylist->value->type = KEY_VALUE_KIND_NUMBER; keylist->value->type = KEY_VALUE_KIND_NUMBER;
keylist->value->u.number = value; keylist->value->u.number = value;
} else { } else {
int idx = index_from_key(keyname_buf); int idx = index_from_key(keys, keyname_len);
if (idx == Q_KEY_CODE__MAX) { if (idx == Q_KEY_CODE__MAX) {
goto err_out; goto err_out;
} }
@ -1789,7 +1787,7 @@ out:
return; return;
err_out: err_out:
monitor_printf(mon, "invalid parameter: %s\n", keyname_buf); monitor_printf(mon, "invalid parameter: %.*s\n", keyname_len, keys);
goto out; goto out;
} }

2
include/ui/console.h
View File

@ -448,7 +448,7 @@ static inline int vnc_display_pw_expire(const char *id, time_t expires)
void curses_display_init(DisplayState *ds, int full_screen); void curses_display_init(DisplayState *ds, int full_screen);
/* input.c */ /* input.c */
int index_from_key(const char *key); int index_from_key(const char *key, size_t key_length);
/* gtk.c */ /* gtk.c */
void early_gtk_display_init(int opengl); void early_gtk_display_init(int opengl);

5
ui/input-legacy.c
View File

@ -57,12 +57,13 @@ struct QEMUPutLEDEntry {
static QTAILQ_HEAD(, QEMUPutLEDEntry) led_handlers = static QTAILQ_HEAD(, QEMUPutLEDEntry) led_handlers =
QTAILQ_HEAD_INITIALIZER(led_handlers); QTAILQ_HEAD_INITIALIZER(led_handlers);
int index_from_key(const char *key) int index_from_key(const char *key, size_t key_length)
{ {
int i; int i;
for (i = 0; QKeyCode_lookup[i] != NULL; i++) { for (i = 0; QKeyCode_lookup[i] != NULL; i++) {
if (!strcmp(key, QKeyCode_lookup[i])) { if (!strncmp(key, QKeyCode_lookup[i], key_length) &&
!QKeyCode_lookup[i][key_length]) {
break; break;
} }
} }