Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c54590ca authored by Marek Marczykowski-Górecki's avatar Marek Marczykowski-Górecki Committed by Juergen Gross
Browse files

x86/xen: allow userspace access during hypercalls 



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: 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>
parent bf1b9ddf

arch/x86/include/asm/xen/hypercall.h

+8 −1
Original line number Diff line number Diff line
@@ -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>
@@ -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;

}
@@ -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