From owner-p4-projects@FreeBSD.ORG  Tue Jul  5 12:00:11 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD3F116A424; Tue,  5 Jul 2005 12:00:10 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7BEA016A41F
	for <perforce@freebsd.org>; Tue,  5 Jul 2005 12:00:10 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6509B43D49
	for <perforce@freebsd.org>; Tue,  5 Jul 2005 12:00:10 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j65C09HN076728
	for <perforce@freebsd.org>; Tue, 5 Jul 2005 12:00:09 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j65C09TC076725
	for perforce@freebsd.org; Tue, 5 Jul 2005 12:00:09 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 5 Jul 2005 12:00:09 GMT
Message-Id: <200507051200.j65C09TC076725@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79600 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 12:00:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=79600

Change 79600 by rwatson@rwatson_paprika on 2005/07/05 11:59:37

	Use CAP_SYS_ADMIN to authorize configuring swap (swapon(),
	swapoff()).

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/vm/swap_pager.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/vm/swap_pager.c#12 (text+ko) ====

@@ -1965,11 +1965,11 @@
 	struct nameidata nd;
 	int error;
 
-	mtx_lock(&Giant);
-	error = suser(td);
+	error = cap_check(td, CAP_SYS_ADMIN);
 	if (error)
-		goto done2;
+		return (error);
 
+	mtx_lock(&Giant);
 	while (swdev_syscall_active)
 	    tsleep(&swdev_syscall_active, PUSER - 1, "swpon", 0);
 	swdev_syscall_active = 1;
@@ -2008,7 +2008,6 @@
 done:
 	swdev_syscall_active = 0;
 	wakeup_one(&swdev_syscall_active);
-done2:
 	mtx_unlock(&Giant);
 	return (error);
 }
@@ -2105,12 +2104,12 @@
 	u_long nblks, dvbase;
 	int error;
 
+	error = cap_check(td, CAP_SYS_ADMIN);
+	if (error)
+		return (error);
+
 	mtx_lock(&Giant);
 
-	error = suser(td);
-	if (error)
-		goto done2;
-
 	while (swdev_syscall_active)
 	    tsleep(&swdev_syscall_active, PUSER - 1, "swpoff", 0);
 	swdev_syscall_active = 1;
@@ -2188,7 +2187,6 @@
 done:
 	swdev_syscall_active = 0;
 	wakeup_one(&swdev_syscall_active);
-done2:
 	mtx_unlock(&Giant);
 	return (error);
 }