From owner-p4-projects@FreeBSD.ORG  Mon Apr  2 19:02:02 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 BB32216A407; Mon,  2 Apr 2007 19:02:01 +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 876B816A402
	for <perforce@freebsd.org>; Mon,  2 Apr 2007 19:02:01 +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 789E013C4B0
	for <perforce@freebsd.org>; Mon,  2 Apr 2007 19:02:01 +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 l32J21dt031887
	for <perforce@freebsd.org>; Mon, 2 Apr 2007 19:02:01 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32J21tV031883
	for perforce@freebsd.org; Mon, 2 Apr 2007 19:02:01 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 2 Apr 2007 19:02:01 GMT
Message-Id: <200704021902.l32J21tV031883@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 117208 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: Mon, 02 Apr 2007 19:02:02 -0000

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

Change 117208 by jhb@jhb_mutex on 2007/04/02 19:01:15

	Don't call soclose() on the sockets during failure once the file
	descriptors are fully constructed.

Affected files ...

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

Differences ...

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

@@ -664,6 +664,7 @@
 	fp2->f_ops = &socketops;
 	fp2->f_type = DTYPE_SOCKET;
 	FILE_UNLOCK(fp2);
+	so1 = so2 = NULL;
 	error = copyout(sv, uap->rsv, 2 * sizeof (int));
 	if (error)
 		goto free4;
@@ -677,9 +678,11 @@
 	fdclose(fdp, fp1, sv[0], td);
 	fdrop(fp1, td);
 free2:
-	(void)soclose(so2);
+	if (so2 != NULL)
+		(void)soclose(so2);
 free1:
-	(void)soclose(so1);
+	if (so1 != NULL)
+		(void)soclose(so1);
 done2:
 	NET_UNLOCK_GIANT();
 	return (error);