svn commit: r245420 - in stable/9/sys: kern vm

[Andrey Zonov]

Author: zont
Date: Mon Jan 14 11:13:31 2013
New Revision: 245420
URL: http://svnweb.freebsd.org/changeset/base/245420

Log:
  - Fix r245416.
    Turn unprivileged mlock off for compatibility.  Exactly this behaviour
    was approved by kib (mentor).
  
  This is a direct commit.
  
  Approved by:	kib (mentor)

Modified:
  stable/9/sys/kern/kern_priv.c
  stable/9/sys/vm/vm_mmap.c

Modified: stable/9/sys/kern/kern_priv.c
==============================================================================
--- stable/9/sys/kern/kern_priv.c	Mon Jan 14 11:06:50 2013	(r245419)
+++ stable/9/sys/kern/kern_priv.c	Mon Jan 14 11:13:31 2013	(r245420)
@@ -59,7 +59,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, suse
     &suser_enabled, 0, "processes with uid 0 have privilege");
 TUNABLE_INT("security.bsd.suser_enabled", &suser_enabled);
 
-static int	unprivileged_mlock = 1;
+static int	unprivileged_mlock = 0;
 SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_mlock, CTLFLAG_RW|CTLFLAG_TUN,
     &unprivileged_mlock, 0, "Allow non-root users to call mlock(2)");
 TUNABLE_INT("security.bsd.unprivileged_mlock", &unprivileged_mlock);

Modified: stable/9/sys/vm/vm_mmap.c
==============================================================================
--- stable/9/sys/vm/vm_mmap.c	Mon Jan 14 11:06:50 2013	(r245419)
+++ stable/9/sys/vm/vm_mmap.c	Mon Jan 14 11:13:31 2013	(r245420)
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/pmckern.h>
 #endif
 
-int old_mlock = 0;
+int old_mlock = 1;
 SYSCTL_INT(_vm, OID_AUTO, old_mlock, CTLFLAG_RW | CTLFLAG_TUN, &old_mlock, 0,
     "Do not apply RLIMIT_MEMLOCK on mlockall");
 TUNABLE_INT("vm.old_mlock", &old_mlock);