[PATCH v2] libxc: Protect xc_domain_resume from clobbering domain registers

[PATCH v2] libxc: Protect xc_domain_resume from clobbering domain registers

[Jason Andryuk]

xc_domain_resume() expects the guest to be in state SHUTDOWN_suspend.
However, nothing verifies the state before modify_returncode() modifies
the domain's registers.  This will crash guest processes or the kernel
itself.

This can be demonstrated with `LIBXL_SAVE_HELPER=/bin/false xl migrate`.

Signed-off-by: Jason Andryuk <andryuk@aero.org>
---
v2:
 - Verify domid
 - Improve error message
---
 tools/libxc/xc_resume.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c
index 18b4818..e423814 100644
--- a/tools/libxc/xc_resume.c
+++ b/tools/libxc/xc_resume.c
@@ -33,12 +33,21 @@ static int modify_returncode(xc_interface *xch, uint32_t domid)
     struct domain_info_context *dinfo = &_dinfo;
     int rc;
 
-    if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 )
+    if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 ||
+         info.domid != domid )
     {
         PERROR("Could not get domain info");
         return -1;
     }
 
+    if ( !info.shutdown || (info.shutdown_reason != SHUTDOWN_suspend) )
+    {
+        ERROR("Dom %d not suspended: (shutdown %d, reason %d)", domid,
+              info.shutdown, info.shutdown_reason);
+        errno = EINVAL;
+        return -1;
+    }
+
     if ( info.hvm )
     {
         /* HVM guests without PV drivers have no return code to modify. */
-- 
1.8.3.1

Re: [PATCH v2] libxc: Protect xc_domain_resume from clobbering domain registers

[Andrew Cooper]

On 20/05/14 14:37, Jason Andryuk wrote:
> xc_domain_resume() expects the guest to be in state SHUTDOWN_suspend.
> However, nothing verifies the state before modify_returncode() modifies
> the domain's registers.  This will crash guest processes or the kernel
> itself.
>
> This can be demonstrated with `LIBXL_SAVE_HELPER=/bin/false xl migrate`.
>
> Signed-off-by: Jason Andryuk <andryuk@aero.org>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

> ---
> v2:
>  - Verify domid
>  - Improve error message
> ---
>  tools/libxc/xc_resume.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c
> index 18b4818..e423814 100644
> --- a/tools/libxc/xc_resume.c
> +++ b/tools/libxc/xc_resume.c
> @@ -33,12 +33,21 @@ static int modify_returncode(xc_interface *xch, uint32_t domid)
>      struct domain_info_context *dinfo = &_dinfo;
>      int rc;
>  
> -    if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 )
> +    if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 ||
> +         info.domid != domid )
>      {
>          PERROR("Could not get domain info");
>          return -1;
>      }
>  
> +    if ( !info.shutdown || (info.shutdown_reason != SHUTDOWN_suspend) )
> +    {
> +        ERROR("Dom %d not suspended: (shutdown %d, reason %d)", domid,
> +              info.shutdown, info.shutdown_reason);
> +        errno = EINVAL;
> +        return -1;
> +    }
> +
>      if ( info.hvm )
>      {
>          /* HVM guests without PV drivers have no return code to modify. */

Re: [PATCH v2] libxc: Protect xc_domain_resume from clobbering domain registers

[Ian Campbell]

On Tue, 2014-05-20 at 14:42 +0100, Andrew Cooper wrote:
> On 20/05/14 14:37, Jason Andryuk wrote:
> > xc_domain_resume() expects the guest to be in state SHUTDOWN_suspend.
> > However, nothing verifies the state before modify_returncode() modifies
> > the domain's registers.  This will crash guest processes or the kernel
> > itself.
> >
> > This can be demonstrated with `LIBXL_SAVE_HELPER=/bin/false xl migrate`.
> >
> > Signed-off-by: Jason Andryuk <andryuk@aero.org>
> 
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked + applied.