From owner-svn-src-head@FreeBSD.ORG  Thu Jun  7 22:49:09 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A926D106566C;
	Thu,  7 Jun 2012 22:49:09 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 94EB08FC15;
	Thu,  7 Jun 2012 22:49:09 +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 q57Mn9hL016251;
	Thu, 7 Jun 2012 22:49:09 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q57Mn9cO016249;
	Thu, 7 Jun 2012 22:49:09 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201206072249.q57Mn9cO016249@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 7 Jun 2012 22:49:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236727 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jun 2012 22:49:09 -0000

Author: pjd
Date: Thu Jun  7 22:49:09 2012
New Revision: 236727
URL: http://svn.freebsd.org/changeset/base/236727

Log:
  Plug file reference leak in capability failure case.
  
  Sponsored by:	FreeBSD Foundation
  MFC after:	3 days

Modified:
  head/sys/kern/tty.c

Modified: head/sys/kern/tty.c
==============================================================================
--- head/sys/kern/tty.c	Thu Jun  7 22:47:53 2012	(r236726)
+++ head/sys/kern/tty.c	Thu Jun  7 22:49:09 2012	(r236727)
@@ -1841,7 +1841,7 @@ ttyhook_register(struct tty **rtp, struc
 	fp_cap = fp;
 	error = cap_funwrap(fp_cap, CAP_TTYHOOK, &fp);
 	if (error)
-		return (error);
+		goto done1;
 #endif
 
 	/*