From owner-svn-src-all@FreeBSD.ORG  Mon Jan 14 11:13:32 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A92751FF;
 Mon, 14 Jan 2013 11:13:32 +0000 (UTC)
 (envelope-from zont@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9B2C8884;
 Mon, 14 Jan 2013 11:13:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0EBDWSZ050430;
 Mon, 14 Jan 2013 11:13:32 GMT (envelope-from zont@svn.freebsd.org)
Received: (from zont@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0EBDW5q050428;
 Mon, 14 Jan 2013 11:13:32 GMT (envelope-from zont@svn.freebsd.org)
Message-Id: <201301141113.r0EBDW5q050428@svn.freebsd.org>
From: Andrey Zonov <zont@FreeBSD.org>
Date: Mon, 14 Jan 2013 11:13:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r245420 - in stable/9/sys: kern vm
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jan 2013 11:13:32 -0000

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);