Module Name: src
Committed By: snj
Date: Fri Aug 14 21:15:16 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: kern_resource.c
Log Message:
Pull up following revision(s) (requested by dsl in ticket #893):
sys/kern/kern_resource.c: revision 1.152
PR/41489: Stathis Kamperis: setpriority(2) returns EACCES instead of EPERM
Per discussion on the PR's audit trail, put back original checks for now.
To generate a diff of this commit:
cvs rdiff -u -r1.147.4.1 -r1.147.4.2 src/sys/kern/kern_resource.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_resource.c
diff -u src/sys/kern/kern_resource.c:1.147.4.1 src/sys/kern/kern_resource.c:1.147.4.2
--- src/sys/kern/kern_resource.c:1.147.4.1 Wed Apr 1 00:25:22 2009
+++ src/sys/kern/kern_resource.c Fri Aug 14 21:15:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_resource.c,v 1.147.4.1 2009/04/01 00:25:22 snj Exp $ */
+/* $NetBSD: kern_resource.c,v 1.147.4.2 2009/08/14 21:15:16 snj Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.147.4.1 2009/04/01 00:25:22 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.147.4.2 2009/08/14 21:15:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,6 +229,11 @@
KASSERT(mutex_owned(chgp->p_lock));
+ if (kauth_cred_geteuid(cred) && kauth_cred_getuid(cred) &&
+ kauth_cred_geteuid(cred) != kauth_cred_geteuid(chgp->p_cred) &&
+ kauth_cred_getuid(cred) != kauth_cred_geteuid(chgp->p_cred))
+ return (EPERM);
+
if (n > PRIO_MAX)
n = PRIO_MAX;
if (n < PRIO_MIN)
