[Xen-changelog] [xen-unstable] [IA64] Return ENOMEM if VPD allocation failed

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1178910424 21600
# Node ID 7812598f65beaf4934cec9e01e0f538ada097da6
# Parent  7d8acd319d5b5927ce40230d48132ba4301edf44
[IA64] Return ENOMEM if VPD allocation failed

Usually ASSRET() is "(void)0".  Therefore if VPD allocation
fails with xenheap shortage or fragmentation, NULL pointer
access occurs in vmx_final_setup_guest().
This patch fixes it.

Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
 xen/arch/ia64/vmx/vmx_init.c |    2 ++
 1 files changed, 2 insertions(+)

diff -r 7d8acd319d5b -r 7812598f65be xen/arch/ia64/vmx/vmx_init.c
--- a/xen/arch/ia64/vmx/vmx_init.c      Thu May 10 15:55:22 2007 -0600
+++ b/xen/arch/ia64/vmx/vmx_init.c      Fri May 11 13:07:04 2007 -0600
@@ -299,6 +299,8 @@ vmx_final_setup_guest(struct vcpu *v)
 
        vpd = alloc_vpd();
        ASSERT(vpd);
+       if (!vpd)
+               return -ENOMEM;
 
        v->arch.privregs = (mapped_regs_t *)vpd;
        vcpu_share_privregs_with_guest(v);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog