mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
libxl: Fix bootloader-related virtual memory leak on pv build failure
The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap <george.dunlap@citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Tested-by: George Dunlap <george.dunlap@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
1 parent
eedecb3cf0
commit
40412e3c99
2 files changed
+3
-3
No files matched your search
@@ -1479,6 +1479,9 @@ static void domcreate_complete(libxl__egc *egc,
|
||||
libxl_domain_config *const d_config = dcs->guest_config;
|
||||
libxl_domain_config *d_config_saved = &dcs->guest_config_saved;
|
||||
|
||||
libxl__file_reference_unmap(&dcs->build_state.pv_kernel);
|
||||
libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk);
|
||||
|
||||
if (!rc && d_config->b_info.exec_ssidref)
|
||||
rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref);
|
||||
|
||||
|
||||
@@ -770,9 +770,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid,
|
||||
state->store_mfn = xc_dom_p2m(dom, dom->xenstore_pfn);
|
||||
}
|
||||
|
||||
libxl__file_reference_unmap(&state->pv_kernel);
|
||||
libxl__file_reference_unmap(&state->pv_ramdisk);
|
||||
|
||||
ret = 0;
|
||||
out:
|
||||
xc_dom_release(dom);
|
||||
|
||||