diff options
| author |   Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | 2018-08-22 17:11:47 +0530 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-29 15:22:27 +0100 |
| commit | a11c8ee86007f7f7a34b9dc29d01acc323b71873 (patch) | |
| tree | 27a8a417d24e4550d51f6f7b98e5a022b0cbdaa7 /meta/recipes-devtools | |
| parent | 9f1d026168956e7bf45135577c123f7679a6ebba (diff) | |
| download | openembedded-core-contrib-a11c8ee86007f7f7a34b9dc29d01acc323b71873.tar.gz | |
qemu: CVE-2018-12617
qga: check bytes count read by guest-file-read
While reading file content via 'guest-file-read' command,
'qmp_guest_file_read' routine allocates buffer of count+1
bytes. It could overflow for large values of 'count'.
Add check to avoid it.
Affects qemu < v3.0.0
Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2018-12617.patch | 53 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_2.11.1.bb | 1 |
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2018-12617.patch b/meta/recipes-devtools/qemu/qemu/CVE-2018-12617.patch new file mode 100644 index 0000000000..c89f189824 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2018-12617.patch @@ -0,0 +1,53 @@ +From 141b197408ab398c4f474ac1a728ab316e921f2b Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit <pjp@fedoraproject.org> +Date: Wed, 13 Jun 2018 11:46:57 +0530 +Subject: [PATCH] qga: check bytes count read by guest-file-read + +While reading file content via 'guest-file-read' command, +'qmp_guest_file_read' routine allocates buffer of count+1 +bytes. It could overflow for large values of 'count'. +Add check to avoid it. + +Reported-by: Fakhri Zulkifli <mohdfakhrizulkifli@gmail.com> +Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> +Cc: qemu-stable@nongnu.org +Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> + +CVE: CVE-2018-12617 +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commitdiff;h=141b197408ab398c4f474ac1a728ab316e921f2b] + +Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> +--- + qga/commands-posix.c | 2 +- + qga/commands-win32.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qga/commands-posix.c b/qga/commands-posix.c +index 594d21ef3e..9284e71666 100644 +--- a/qga/commands-posix.c ++++ b/qga/commands-posix.c +@@ -458,7 +458,7 @@ struct GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count, + + if (!has_count) { + count = QGA_READ_COUNT_DEFAULT; +- } else if (count < 0) { ++ } else if (count < 0 || count >= UINT32_MAX) { + error_setg(errp, "value '%" PRId64 "' is invalid for argument count", + count); + return NULL; +diff --git a/qga/commands-win32.c b/qga/commands-win32.c +index 70ee5379f6..73f31fa8c2 100644 +--- a/qga/commands-win32.c ++++ b/qga/commands-win32.c +@@ -318,7 +318,7 @@ GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count, + } + if (!has_count) { + count = QGA_READ_COUNT_DEFAULT; +- } else if (count < 0) { ++ } else if (count < 0 || count >= UINT32_MAX) { + error_setg(errp, "value '%" PRId64 + "' is invalid for argument count", count); + return NULL; +-- +2.13.3 + diff --git a/meta/recipes-devtools/qemu/qemu_2.11.1.bb b/meta/recipes-devtools/qemu/qemu_2.11.1.bb index db7ead7682..a447dc7196 100644 --- a/meta/recipes-devtools/qemu/qemu_2.11.1.bb +++ b/meta/recipes-devtools/qemu/qemu_2.11.1.bb @@ -25,6 +25,7 @@ SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \ file://0013-ps2-check-PS2Queue-pointers-in-post_load-routine.patch \ file://0001-CVE-2018-11806-QEMU-slirp-heap-buffer-overflow.patch \ file://CVE-2018-7550.patch \ + file://CVE-2018-12617.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar" |