svn commit: r215689 - stable/8/sys/powerpc/aim

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Nov 22 17:01:40 2010
New Revision: 215689
URL: http://svn.freebsd.org/changeset/base/215689

Log:
  MFC r214610:
  Map userland copyin/copyout segment no-execute while it is mapped into the
  kernel.

Modified:
  stable/8/sys/powerpc/aim/copyinout.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/powerpc/aim/copyinout.c
==============================================================================
--- stable/8/sys/powerpc/aim/copyinout.c	Mon Nov 22 16:58:07 2010	(r215688)
+++ stable/8/sys/powerpc/aim/copyinout.c	Mon Nov 22 17:01:40 2010	(r215689)
@@ -76,6 +76,9 @@ static __inline void
 set_user_sr(register_t vsid)
 {
 
+	/* Mark segment no-execute */
+	vsid |= SR_N;
+
 	isync();
 	__asm __volatile ("mtsr %0,%1" :: "n"(USER_SR), "r"(vsid));
 	isync();