2012-11-19 13:58:33 +00:00
|
|
|
References: CVE-2012-4539 XSA-24 bnc#786520
|
|
|
|
|
2012-12-07 18:04:08 +00:00
|
|
|
# HG changeset patch
|
|
|
|
# User Ian Jackson <Ian.Jackson@eu.citrix.com>
|
|
|
|
# Date 1352893537 0
|
|
|
|
# Node ID b64a7d868f06c730a444e990da1a4d816ce3f5dc
|
|
|
|
# Parent c7a01b6450e483ca839228bf1e1e44de692e3458
|
2012-11-19 13:58:33 +00:00
|
|
|
compat/gnttab: Prevent infinite loop in compat code
|
|
|
|
|
|
|
|
c/s 20281:95ea2052b41b, which introduces Grant Table version 2
|
|
|
|
hypercalls introduces a vulnerability whereby the compat hypercall
|
|
|
|
handler can fall into an infinite loop.
|
|
|
|
|
|
|
|
If the watchdog is enabled, Xen will die after the timeout.
|
|
|
|
|
|
|
|
This is a security problem, XSA-24 / CVE-2012-4539.
|
|
|
|
|
|
|
|
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
|
|
Acked-by: Jan Beulich <jbeulich@suse.com>
|
|
|
|
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
2012-12-07 18:04:08 +00:00
|
|
|
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
2012-11-19 13:58:33 +00:00
|
|
|
|
2012-12-07 18:04:08 +00:00
|
|
|
--- a/xen/common/compat/grant_table.c
|
|
|
|
+++ b/xen/common/compat/grant_table.c
|
2012-11-19 13:58:33 +00:00
|
|
|
@@ -318,6 +318,8 @@ int compat_grant_table_op(unsigned int c
|
|
|
|
#undef XLAT_gnttab_get_status_frames_HNDL_frame_list
|
|
|
|
if ( unlikely(__copy_to_guest(cmp_uop, &cmp.get_status, 1)) )
|
|
|
|
rc = -EFAULT;
|
|
|
|
+ else
|
|
|
|
+ i = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|