Any error from hvm_save() or hvm_set_param() leaks the c.data allocation.
Spotted by Coverity.
Fixes: 353744830 "x86/hvm: introduce hvm_copy_context_and_params"
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wl@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Tamas K Lengyel <tamas@tklengyel.com>
This was the XenServer internal Coverity. The public one doesn't appear to
have spotted the issue, so no Coverity-ID tag for the fix.
---
xen/arch/x86/hvm/hvm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 814b7020d8..0a3797ef6e 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -5318,7 +5318,7 @@ int hvm_copy_context_and_params(struct domain *dst, struct domain *src)
return -ENOMEM;
if ( (rc = hvm_save(src, &c)) )
- return rc;
+ goto out;
for ( i = 0; i < HVM_NR_PARAMS; i++ )
{
@@ -5328,11 +5328,13 @@ int hvm_copy_context_and_params(struct domain *dst, struct domain *src)
continue;
if ( (rc = hvm_set_param(dst, i, value)) )
- return rc;
+ goto out;
}
c.cur = 0;
rc = hvm_load(dst, &c);
+
+ out:
vfree(c.data);
return rc;
--
2.11.0