From owner-svn-src-user@FreeBSD.ORG  Thu Sep 19 11:06:59 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2D6D4295;
 Thu, 19 Sep 2013 11:06:59 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1BAA725C5;
 Thu, 19 Sep 2013 11:06:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8JB6w5q005002;
 Thu, 19 Sep 2013 11:06:58 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8JB6wDW005001;
 Thu, 19 Sep 2013 11:06:58 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201309191106.r8JB6wDW005001@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 19 Sep 2013 11:06:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r255700 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Sep 2013 11:06:59 -0000

Author: pho
Date: Thu Sep 19 11:06:58 2013
New Revision: 255700
URL: http://svnweb.freebsd.org/changeset/base/255700

Log:
  Use getpwnam() get switch to user "nobody".
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/syscall4.sh

Modified: user/pho/stress2/misc/syscall4.sh
==============================================================================
--- user/pho/stress2/misc/syscall4.sh	Thu Sep 19 10:56:36 2013	(r255699)
+++ user/pho/stress2/misc/syscall4.sh	Thu Sep 19 11:06:58 2013	(r255700)
@@ -78,6 +78,7 @@ EOF
 #include <fts.h>
 #include <libutil.h>
 #include <pthread.h>
+#include <pwd.h>
 #include <signal.h>
 #include <sys/socket.h>
 #include <stdint.h>
@@ -114,9 +115,6 @@ int fd[900], fds[2], socketpr[2];
 u_int32_t r[N];
 int syscallno;
 
-#define		UID_NOBODY	65534
-#define		GID_NOBODY	65534
-
 static int
 random_int(int mi, int ma)
 {
@@ -240,13 +238,18 @@ calls(void *arg __unused)
 int
 main(int argc, char **argv)
 {
+	struct passwd *pw;
 	pthread_t rp, cp[50];
 	int i, j;
 
-	if (setgid(GID_NOBODY) == -1)
-		err(1, "setgid(%d)", GID_NOBODY);
-	if (setuid(UID_NOBODY) == -1)
-		err(1, "setuid(%d)", UID_NOBODY);
+	if ((pw = getpwnam("nobody")) == NULL)
+		err(1, "no such user: nobody");
+
+	if (setgroups(1, &pw->pw_gid) ||
+	    setegid(pw->pw_gid) || setgid(pw->pw_gid) ||
+	    seteuid(pw->pw_uid) || setuid(pw->pw_uid))
+		err(1, "Can't drop privileges to \"nobody\"");
+	endpwent();
 
 	signal(SIGALRM, hand);
 	signal(SIGILL,  hand);