diff options
author | Markus Armbruster <armbru@redhat.com> | 2013-02-06 21:27:14 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-06 16:35:17 -0600 |
commit | 82e59a676c01b3df3b53998d428d0a64a55f2439 (patch) | |
tree | c57a24a95c993f67f20b55a2d2510a06aacdcd1c /qemu-char.c | |
parent | 15af6321f4d1f90d0ae1b5cb05093c48b41c4533 (diff) |
qmp: Fix design bug and read beyond buffer in memchar-write
Command memchar-write takes data and size parameter. Begs the
question what happens when data doesn't match size.
With format base64, qmp_memchar_write() copies the full data argument,
regardless of size argument.
With format utf8, qmp_memchar_write() copies size bytes from data,
happily reading beyond data. Copies crap from the heap or even
crashes.
Drop the size parameter, and always copy the full data argument.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-char.c')
-rw-r--r-- | qemu-char.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qemu-char.c b/qemu-char.c index ac5d62dd9a..9c1dd1326d 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2753,9 +2753,8 @@ static bool qemu_is_chr(const CharDriverState *chr, const char *filename) return strcmp(chr->filename, filename); } -void qmp_memchar_write(const char *device, int64_t size, - const char *data, bool has_format, - enum DataFormat format, +void qmp_memchar_write(const char *device, const char *data, + bool has_format, enum DataFormat format, Error **errp) { CharDriverState *chr; @@ -2774,12 +2773,11 @@ void qmp_memchar_write(const char *device, int64_t size, return; } - write_count = (gsize)size; - if (has_format && (format == DATA_FORMAT_BASE64)) { write_data = g_base64_decode(data, &write_count); } else { write_data = (uint8_t *)data; + write_count = strlen(data); } ret = cirmem_chr_write(chr, write_data, write_count); |