From owner-p4-projects@FreeBSD.ORG  Thu Mar 15 21:49:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D496716A405; Thu, 15 Mar 2007 21:49:12 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 954B716A403
	for <perforce@freebsd.org>; Thu, 15 Mar 2007 21:49:12 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6FEC813C44B
	for <perforce@freebsd.org>; Thu, 15 Mar 2007 21:49:12 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2FLnCLT078907
	for <perforce@freebsd.org>; Thu, 15 Mar 2007 21:49:12 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2FLnC2a078904
	for perforce@freebsd.org; Thu, 15 Mar 2007 21:49:12 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 15 Mar 2007 21:49:12 GMT
Message-Id: <200703152149.l2FLnC2a078904@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 115947 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Mar 2007 21:49:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=115947

Change 115947 by jhb@jhb_mutex on 2007/03/15 21:48:56

	Don't leak socket fd's if we get a fault trying to copyout
	the values.  Need to write a test case before this goes into
	CVS.

Affected files ...

.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#99 edit

Differences ...

==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#99 (text+ko) ====

@@ -665,6 +665,8 @@
 	fp2->f_type = DTYPE_SOCKET;
 	FILE_UNLOCK(fp2);
 	error = copyout(sv, uap->rsv, 2 * sizeof (int));
+	if (error)
+		goto free4;
 	fdrop(fp1, td);
 	fdrop(fp2, td);
 	goto done2;