[xen staging] x86/soft-reset: Drop gfn reference after calling get_gfn_query()

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen staging] x86/soft-reset: Drop gfn reference after calling get_gfn_query()

patchbot
commit e7969e917cef276318f722a607985a2e896aeb94
Author:     Andrew Cooper <[hidden email]>
AuthorDate: Wed Nov 7 12:25:19 2018 +0000
Commit:     Andrew Cooper <[hidden email]>
CommitDate: Thu Nov 22 17:58:46 2018 +0000

    x86/soft-reset: Drop gfn reference after calling get_gfn_query()
   
    get_gfn_query() internally takes the p2m lock, and this error path leaves it
    locked.
   
    This wasn't included in XSA-277 because the error path can only be triggered
    by a carefully timed phymap operation concurrent with the domain being paused
    and the toolstack issuing DOMCTL_soft_reset.
   
    Signed-off-by: Andrew Cooper <[hidden email]>
    Reviewed-by: Jan Beulich <[hidden email]>
---
 xen/arch/x86/domain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 295b10c48c..b4d59487ad 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -725,7 +725,7 @@ int arch_domain_soft_reset(struct domain *d)
         printk(XENLOG_G_ERR "Failed to get Dom%d's shared_info GFN (%lx)\n",
                d->domain_id, gfn);
         ret = -EINVAL;
-        goto exit_put_page;
+        goto exit_put_gfn;
     }
 
     new_page = alloc_domheap_page(d, 0);
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog