[PATCH] common/memory: fix an XSM error path

[PATCH] common/memory: fix an XSM error path

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 706 bytes --]

XENMEM_{in,de}crease_reservation as well as XENMEM_populate_physmap
return the extent at which failure was detected, not error indicators.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -747,11 +747,10 @@ long do_memory_op(unsigned long cmd, XEN
             return start_extent;
         args.domain = d;
 
-        rc = xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d);
-        if ( rc )
+        if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) )
         {
             rcu_unlock_domain(d);
-            return rc;
+            return start_extent;
         }
 
         switch ( op )




[-- Attachment #2: memop-XSM-error-path.patch --]
[-- Type: text/plain, Size: 740 bytes --]

common/memory: fix an XSM error path

XENMEM_{in,de}crease_reservation as well as XENMEM_populate_physmap
return the extent at which failure was detected, not error indicators.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -747,11 +747,10 @@ long do_memory_op(unsigned long cmd, XEN
             return start_extent;
         args.domain = d;
 
-        rc = xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d);
-        if ( rc )
+        if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) )
         {
             rcu_unlock_domain(d);
-            return rc;
+            return start_extent;
         }
 
         switch ( op )

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] common/memory: fix an XSM error path

[Andrew Cooper]

[-- Attachment #1.1: Type: text/plain, Size: 959 bytes --]

On 12/01/15 08:21, Jan Beulich wrote:
> XENMEM_{in,de}crease_reservation as well as XENMEM_populate_physmap
> return the extent at which failure was detected, not error indicators.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

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

>
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -747,11 +747,10 @@ long do_memory_op(unsigned long cmd, XEN
>              return start_extent;
>          args.domain = d;
>  
> -        rc = xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d);
> -        if ( rc )
> +        if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) )
>          {
>              rcu_unlock_domain(d);
> -            return rc;
> +            return start_extent;
>          }
>  
>          switch ( op )
>
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel


[-- Attachment #1.2: Type: text/html, Size: 1849 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] common/memory: fix an XSM error path

[Daniel De Graaf]

On 01/12/2015 03:21 AM, Jan Beulich wrote:
> XENMEM_{in,de}crease_reservation as well as XENMEM_populate_physmap
> return the extent at which failure was detected, not error indicators.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
(though I don't think my ack is technically required here)

> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -747,11 +747,10 @@ long do_memory_op(unsigned long cmd, XEN
>               return start_extent;
>           args.domain = d;
>
> -        rc = xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d);
> -        if ( rc )
> +        if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) )
>           {
>               rcu_unlock_domain(d);
> -            return rc;
> +            return start_extent;
>           }
>
>           switch ( op )
>
>
>


-- 
Daniel De Graaf
National Security Agency