Commit dc1e0c2b authored by Marek Marczykowski-Górecki's avatar Marek Marczykowski-Górecki Committed by Greg Kroah-Hartman

x86/xen: allow userspace access during hypercalls

commit c54590ca upstream.

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.
Signed-off-by: default avatarMarek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2bfc675
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/smap.h>
#include <xen/interface/xen.h> #include <xen/interface/xen.h>
#include <xen/interface/sched.h> #include <xen/interface/sched.h>
...@@ -214,10 +215,12 @@ privcmd_call(unsigned call, ...@@ -214,10 +215,12 @@ privcmd_call(unsigned call,
__HYPERCALL_DECLS; __HYPERCALL_DECLS;
__HYPERCALL_5ARG(a1, a2, a3, a4, a5); __HYPERCALL_5ARG(a1, a2, a3, a4, a5);
stac();
asm volatile("call *%[call]" asm volatile("call *%[call]"
: __HYPERCALL_5PARAM : __HYPERCALL_5PARAM
: [call] "a" (&hypercall_page[call]) : [call] "a" (&hypercall_page[call])
: __HYPERCALL_CLOBBER5); : __HYPERCALL_CLOBBER5);
clac();
return (long)__res; return (long)__res;
} }
...@@ -476,7 +479,11 @@ static inline int ...@@ -476,7 +479,11 @@ static inline int
HYPERVISOR_dm_op( HYPERVISOR_dm_op(
domid_t dom, unsigned int nr_bufs, void *bufs) domid_t dom, unsigned int nr_bufs, void *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 static inline void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment