From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr  8 16:26:27 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 622021065670;
	Sun,  8 Apr 2012 16:26:27 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D6B48FC0C;
	Sun,  8 Apr 2012 16:26:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q38GQR9w019426;
	Sun, 8 Apr 2012 16:26:27 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q38GQRJk019424;
	Sun, 8 Apr 2012 16:26:27 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201204081626.q38GQRJk019424@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 8 Apr 2012 16:26:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234037 - stable/9/sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 16:26:27 -0000

Author: pho
Date: Sun Apr  8 16:26:26 2012
New Revision: 234037
URL: http://svn.freebsd.org/changeset/base/234037

Log:
  MFC: r232860
  
  Allways call fdrop().

Modified:
  stable/9/sys/kern/sys_capability.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/sys_capability.c
==============================================================================
--- stable/9/sys/kern/sys_capability.c	Sun Apr  8 13:44:55 2012	(r234036)
+++ stable/9/sys/kern/sys_capability.c	Sun Apr  8 16:26:26 2012	(r234037)
@@ -253,16 +253,14 @@ sys_cap_new(struct thread *td, struct ca
 		return (error);
 	AUDIT_ARG_FILE(td->td_proc, fp);
 	error = kern_capwrap(td, fp, rights, &capfd);
-	if (error)
-		return (error);
-
 	/*
 	 * Release our reference to the file (kern_capwrap has held a reference
 	 * for the filedesc array).
 	 */
 	fdrop(fp, td);
-	td->td_retval[0] = capfd;
-	return (0);
+	if (error == 0)
+		td->td_retval[0] = capfd;
+	return (error);
 }
 
 /*