From owner-p4-projects@FreeBSD.ORG  Fri Jul  7 16:01:56 2006
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 9C8E216A4E7; Fri,  7 Jul 2006 16:01:56 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7894D16A4DE
	for <perforce@freebsd.org>; Fri,  7 Jul 2006 16:01:56 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1F6ED43D4C
	for <perforce@freebsd.org>; Fri,  7 Jul 2006 16:01:56 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k67G1tfS033101
	for <perforce@freebsd.org>; Fri, 7 Jul 2006 16:01:56 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k67G1t50033098
	for perforce@freebsd.org; Fri, 7 Jul 2006 16:01:55 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 7 Jul 2006 16:01:55 GMT
Message-Id: <200607071601.k67G1t50033098@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 100890 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: Fri, 07 Jul 2006 16:01:56 -0000

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

Change 100890 by jhb@jhb_mutex on 2006/07/07 16:01:44

	Don't try to free name in the !uap->name case as it is just
	garbage.

Affected files ...

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

Differences ...

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

@@ -328,8 +328,8 @@
 		if (error == 0)
 			error = copyout(&namelen, uap->anamelen,
 			    sizeof(namelen));
+		free(name, M_SONAME);
 	}
-	free(name, M_SONAME);
 	return (error);
 }
 
@@ -468,7 +468,8 @@
 		sa = NULL;
 	}
 noconnection:
-	free(sa, M_SONAME);
+	if (sa)
+		FREE(sa, M_SONAME);
 
 	/*
 	 * close the new descriptor, assuming someone hasn't ripped it