[xen master] improve XENMEM_add_to_physmap_batch address checking

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

[xen master] improve XENMEM_add_to_physmap_batch address checking

patchbot
commit 7f080956e9eed821fd42013bef11c1a2873fbeba
Author:     Jan Beulich <[hidden email]>
AuthorDate: Tue Nov 28 13:15:12 2017 +0100
Commit:     Jan Beulich <[hidden email]>
CommitDate: Tue Nov 28 13:15:12 2017 +0100

    improve XENMEM_add_to_physmap_batch address checking
   
    As a follow-up to XSA-212 we should have addressed a similar issue here:
    The handles being advanced at the top of xenmem_add_to_physmap_batch()
    means we allow hypervisor space accesses (in particular, for "errs",
    writes) with suitably crafted input arguments. This isn't a security
    issue in this case because of the limited width of struct
    xen_add_to_physmap_batch's size field: It being 16-bits wide, only the
    r/o M2P area can be accessed. Still we can and should do better.
   
    Signed-off-by: Jan Beulich <[hidden email]>
    Acked-by: Andrew Cooper <[hidden email]>
    Release-acked-by: Julien Grall <[hidden email]>
---
 xen/common/memory.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xen/common/memory.c b/xen/common/memory.c
index ad987e0..a6ba33f 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -823,6 +823,11 @@ static int xenmem_add_to_physmap_batch(struct domain *d,
     guest_handle_add_offset(xatpb->errs, start);
     xatpb->size -= start;
 
+    if ( !guest_handle_okay(xatpb->idxs, xatpb->size) ||
+         !guest_handle_okay(xatpb->gpfns, xatpb->size) ||
+         !guest_handle_okay(xatpb->errs, xatpb->size) )
+        return -EFAULT;
+
     while ( xatpb->size > done )
     {
         xen_ulong_t idx;
@@ -1141,10 +1146,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
         if ( start_extent != (typeof(xatpb.size))start_extent )
             return -EDOM;
 
-        if ( copy_from_guest(&xatpb, arg, 1) ||
-             !guest_handle_okay(xatpb.idxs, xatpb.size) ||
-             !guest_handle_okay(xatpb.gpfns, xatpb.size) ||
-             !guest_handle_okay(xatpb.errs, xatpb.size) )
+        if ( copy_from_guest(&xatpb, arg, 1) )
             return -EFAULT;
 
         /* This mapspace is unsupported for this hypercall. */
--
generated by git-patchbot for /home/xen/git/xen.git#master

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