mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
libxc: Check there's enough memory for segments we're creating
Previously, xc_dom_alloc_segment would go ahead even if the segment we're trying to create is too big for the domain's RAM (or the requested addr is out of range). It would pass invalid parameters to xc_dom_seg_to_ptr giving undefined behaviour. Fixing xc_dom_seg_to_ptr to fail is not sufficient because we want to provide a comprehensible explanation to the caller - which may ultimately be the user. In particular, with this change attempting "xl create" with a ramdisk image bigger than the guest's specified RAM will provide a useful error message mentioning the ramdisk. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
1 parent
91e172bf6b
commit
afe765651d
1 file changed
+12
-1
@@ -409,8 +409,19 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom,
|
||||
}
|
||||
|
||||
seg->vstart = start;
|
||||
seg->vend = start + pages * page_size;
|
||||
seg->pfn = (seg->vstart - dom->parms.virt_base) / page_size;
|
||||
|
||||
if ( pages > dom->total_pages || /* double test avoids overflow probs */
|
||||
pages > dom->total_pages - seg->pfn)
|
||||
{
|
||||
xc_dom_panic(XC_OUT_OF_MEMORY,
|
||||
"%s: segment %s too large (0x%"PRIpfn" > "
|
||||
"0x%"PRIpfn" - 0x%"PRIpfn" pages)\n",
|
||||
__FUNCTION__, name, pages, dom->total_pages, seg->pfn);
|
||||
return -1;
|
||||
}
|
||||
|
||||
seg->vend = start + pages * page_size;
|
||||
dom->virt_alloc_end = seg->vend;
|
||||
if (dom->allocate)
|
||||
dom->allocate(dom, dom->virt_alloc_end);
|
||||
|
||||