* [Qemu-devel] [PATCH v1] multiboot: validate multiboot header address values
@ 2017-09-07 6:32 P J P
2017-09-11 15:31 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: P J P @ 2017-09-07 6:32 UTC (permalink / raw)
To: Qemu Developers
Cc: Paolo Bonzini, Eduardo Habkost, Thomas Garnier, Prasad J Pandit
From: Prasad J Pandit <pjp@fedoraproject.org>
While loading kernel via multiboot-v1 image, (flags & 0x00010000)
indicates that multiboot header contains valid addresses to load
the kernel image. These addresses are used to compute kernel
size and kernel text offset in the OS image. Validate these
address values to avoid an OOB access issue.
This is CVE-2017-14167.
Reported-by: Thomas Garnier <thgarnie@google.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
hw/i386/multiboot.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
Update: add CVE-ID to the commit message.
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 6001f4caa2..c7b70c91d5 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -221,15 +221,34 @@ int load_multiboot(FWCfgState *fw_cfg,
uint32_t mh_header_addr = ldl_p(header+i+12);
uint32_t mh_load_end_addr = ldl_p(header+i+20);
uint32_t mh_bss_end_addr = ldl_p(header+i+24);
+
mh_load_addr = ldl_p(header+i+16);
+ if (mh_header_addr < mh_load_addr) {
+ fprintf(stderr, "invalid mh_load_addr address\n");
+ exit(1);
+ }
+
uint32_t mb_kernel_text_offset = i - (mh_header_addr - mh_load_addr);
uint32_t mb_load_size = 0;
mh_entry_addr = ldl_p(header+i+28);
if (mh_load_end_addr) {
+ if (mh_bss_end_addr < mh_load_addr) {
+ fprintf(stderr, "invalid mh_bss_end_addr address\n");
+ exit(1);
+ }
mb_kernel_size = mh_bss_end_addr - mh_load_addr;
+
+ if (mh_load_end_addr < mh_load_addr) {
+ fprintf(stderr, "invalid mh_load_end_addr address\n");
+ exit(1);
+ }
mb_load_size = mh_load_end_addr - mh_load_addr;
} else {
+ if (kernel_file_size < mb_kernel_text_offset) {
+ fprintf(stderr, "invalid kernel_file_size\n");
+ exit(1);
+ }
mb_kernel_size = kernel_file_size - mb_kernel_text_offset;
mb_load_size = mb_kernel_size;
}
--
2.13.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v1] multiboot: validate multiboot header address values
2017-09-07 6:32 [Qemu-devel] [PATCH v1] multiboot: validate multiboot header address values P J P
@ 2017-09-11 15:31 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2017-09-11 15:31 UTC (permalink / raw)
To: P J P, Qemu Developers; +Cc: Eduardo Habkost, Thomas Garnier, Prasad J Pandit
On 07/09/2017 08:32, P J P wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> While loading kernel via multiboot-v1 image, (flags & 0x00010000)
> indicates that multiboot header contains valid addresses to load
> the kernel image. These addresses are used to compute kernel
> size and kernel text offset in the OS image. Validate these
> address values to avoid an OOB access issue.
>
> This is CVE-2017-14167.
>
> Reported-by: Thomas Garnier <thgarnie@google.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
> hw/i386/multiboot.c | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> Update: add CVE-ID to the commit message.
>
> diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
> index 6001f4caa2..c7b70c91d5 100644
> --- a/hw/i386/multiboot.c
> +++ b/hw/i386/multiboot.c
> @@ -221,15 +221,34 @@ int load_multiboot(FWCfgState *fw_cfg,
> uint32_t mh_header_addr = ldl_p(header+i+12);
> uint32_t mh_load_end_addr = ldl_p(header+i+20);
> uint32_t mh_bss_end_addr = ldl_p(header+i+24);
> +
> mh_load_addr = ldl_p(header+i+16);
> + if (mh_header_addr < mh_load_addr) {
> + fprintf(stderr, "invalid mh_load_addr address\n");
> + exit(1);
> + }
> +
> uint32_t mb_kernel_text_offset = i - (mh_header_addr - mh_load_addr);
> uint32_t mb_load_size = 0;
> mh_entry_addr = ldl_p(header+i+28);
>
> if (mh_load_end_addr) {
> + if (mh_bss_end_addr < mh_load_addr) {
> + fprintf(stderr, "invalid mh_bss_end_addr address\n");
> + exit(1);
> + }
> mb_kernel_size = mh_bss_end_addr - mh_load_addr;
> +
> + if (mh_load_end_addr < mh_load_addr) {
> + fprintf(stderr, "invalid mh_load_end_addr address\n");
> + exit(1);
> + }
> mb_load_size = mh_load_end_addr - mh_load_addr;
> } else {
> + if (kernel_file_size < mb_kernel_text_offset) {
> + fprintf(stderr, "invalid kernel_file_size\n");
> + exit(1);
> + }
> mb_kernel_size = kernel_file_size - mb_kernel_text_offset;
> mb_load_size = mb_kernel_size;
> }
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-11 15:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-07 6:32 [Qemu-devel] [PATCH v1] multiboot: validate multiboot header address values P J P
2017-09-11 15:31 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).