From owner-svn-soc-all@FreeBSD.ORG  Wed Jul 10 15:18:45 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-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 8FE52C35
 for <svn-soc-all@FreeBSD.org>; Wed, 10 Jul 2013 15:18:45 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id 8213F166D
 for <svn-soc-all@FreeBSD.org>; Wed, 10 Jul 2013 15:18:45 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6AFIjM9007606
 for <svn-soc-all@FreeBSD.org>; Wed, 10 Jul 2013 15:18:45 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6AFIjgD007600
 for svn-soc-all@FreeBSD.org; Wed, 10 Jul 2013 15:18:45 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Wed, 10 Jul 2013 15:18:45 GMT
Message-Id: <201307101518.r6AFIjgD007600@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r254566 - soc2013/dpl/head/contrib/xz/src/xz
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jul 2013 15:18:45 -0000

Author: dpl
Date: Wed Jul 10 15:18:45 2013
New Revision: 254566
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254566

Log:
  Limit std fds.
  

Modified:
  soc2013/dpl/head/contrib/xz/src/xz/file_io.c

Modified: soc2013/dpl/head/contrib/xz/src/xz/file_io.c
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/file_io.c	Wed Jul 10 15:17:22 2013	(r254565)
+++ soc2013/dpl/head/contrib/xz/src/xz/file_io.c	Wed Jul 10 15:18:45 2013	(r254566)
@@ -604,7 +604,9 @@
 			free(pair->dest_name);
 			return true;
 		}
+#if defined(CAPSICUM)
 		limitfd(pair);
+#endif
 	}
 
 	// If this really fails... well, we have a safe fallback.
@@ -981,16 +983,29 @@
 extern void
 cap_init(void)
 {
-	if (cap_rights_limit(STDIN_FILENO, CAP_READ) < 0 && errno != ENOSYS){
+	cap_rights_t *rights;
+
+	if( cap_rights_get(STDIN_FILENO, rights) < 0) {
 		message_error("%d: %s", STDIN_FILENO, strerror(errno));
 		exit(E_ERROR);
+	} else if (*rights == 0) {
+		if (cap_rights_limit(STDIN_FILENO, CAP_WRITE) < 0 && errno != ENOSYS){
+			message_error("%d: %s", STDIN_FILENO, strerror(errno));
+			exit(E_ERROR);
+		}
 	}
 
-	if (cap_rights_limit(STDOUT_FILENO, CAP_WRITE) < 0 && errno != ENOSYS){
+	if( cap_rights_get(STDOUT_FILENO, rights) < 0) {
 		message_error("%d: %s", STDOUT_FILENO, strerror(errno));
 		exit(E_ERROR);
+	} else if (*rights == 0) {
+		if (cap_rights_limit(STDOUT_FILENO, CAP_WRITE) < 0 && errno != ENOSYS){
+			message_error("%d: %s", STDOUT_FILENO, strerror(errno));
+			exit(E_ERROR);
+		}
 	}
 
+
 	if (cap_rights_limit(STDERR_FILENO, CAP_WRITE) < 0 && errno != ENOSYS){
 		message_error("%d: %s", STDERR_FILENO, strerror(errno));
 		exit(E_ERROR);
@@ -1000,6 +1015,7 @@
 		message_error("cap_enter: %s", strerror(errno));
 		exit(E_ERROR);
 	}
+
 	return;
 }
 #endif