[Xen-changelog] [xen stable-4.6] memory: fix compat handling of XENMEM_access_op

[patchbot@xxxxxxx]

commit 4627e5e5f10bf8cdebaf45b66a476c4adb104f6d
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Sep 6 11:52:22 2016 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Sep 6 11:52:22 2016 +0200

    memory: fix compat handling of XENMEM_access_op
    
    Within compat_memory_op() this needs to be placed in the first switch()
    statement, or it ends up being dead code (as that first switch() has a
    default case chaining to compat_arch_memory_op()).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Tested-by: Razvan Cojocaru <rcojocaru@xxxxxxxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 8d6af808a7e9d9ae1d129e1e5a0def7f8b2333ee
    master date: 2016-09-02 14:19:51 +0200
---
 xen/common/compat/memory.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c
index 002948b..a31fa9b 100644
--- a/xen/common/compat/memory.c
+++ b/xen/common/compat/memory.c
@@ -312,6 +312,11 @@ int compat_memory_op(unsigned int cmd, 
XEN_GUEST_HANDLE_PARAM(void) compat)
             break;
         }
 
+        case XENMEM_access_op:
+            return mem_access_memop(cmd,
+                                    guest_handle_cast(compat,
+                                                      xen_mem_access_op_t));
+
         case XENMEM_get_vnumainfo:
         {
             enum XLAT_vnuma_topology_info_vdistance vdistance =
@@ -487,10 +492,6 @@ int compat_memory_op(unsigned int cmd, 
XEN_GUEST_HANDLE_PARAM(void) compat)
             break;
         }
 
-        case XENMEM_access_op:
-            rc = mem_access_memop(cmd, guest_handle_cast(compat, 
xen_mem_access_op_t));
-            break;
-
         case XENMEM_add_to_physmap_batch:
             start_extent = end_extent;
             break;
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog