Skip to content

Commit

Permalink
x86/xen: allow userspace access during hypercalls
Browse files Browse the repository at this point in the history
Userspace application can do a hypercall through /dev/xen/privcmd, and
some for some hypercalls argument is a pointers to user-provided
structure. When SMAP is supported and enabled, hypervisor can't access.
So, lets allow it.

The same applies to HYPERVISOR_dm_op, where additionally privcmd driver
carefully verify buffer addresses.

Cc: stable@vger.kernel.org
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
  • Loading branch information
Marek Marczykowski-Górecki authored and Juergen Gross committed Jul 3, 2017
1 parent bf1b9dd commit c54590c
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion arch/x86/include/asm/xen/hypercall.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/smap.h>

#include <xen/interface/xen.h>
#include <xen/interface/sched.h>
Expand Down Expand Up @@ -216,10 +217,12 @@ privcmd_call(unsigned call,
__HYPERCALL_DECLS;
__HYPERCALL_5ARG(a1, a2, a3, a4, a5);

stac();
asm volatile("call *%[call]"
: __HYPERCALL_5PARAM
: [call] "a" (&hypercall_page[call])
: __HYPERCALL_CLOBBER5);
clac();

return (long)__res;
}
Expand Down Expand Up @@ -478,7 +481,11 @@ static inline int
HYPERVISOR_dm_op(
domid_t dom, unsigned int nr_bufs, struct xen_dm_op_buf *bufs)
{
return _hypercall3(int, dm_op, dom, nr_bufs, bufs);
int ret;
stac();
ret = _hypercall3(int, dm_op, dom, nr_bufs, bufs);
clac();
return ret;
}

static inline void
Expand Down

0 comments on commit c54590c

Please sign in to comment.