From owner-p4-projects  Fri May 31  6:41:58 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E11E37B403; Fri, 31 May 2002 06:41:52 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id A4CFA37B403
	for <perforce@freebsd.org>; Fri, 31 May 2002 06:41:51 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4VDfpM19055
	for perforce@freebsd.org; Fri, 31 May 2002 06:41:51 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 31 May 2002 06:41:51 -0700 (PDT)
Message-Id: <200205311341.g4VDfpM19055@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 12195 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12195

Change 12195 by rwatson@rwatson_curry on 2002/05/31 06:40:52

	Merge-o: resource freeing block got duplicated since it was
	present in both branches, and p4 "did the right thing" :-)

Affected files ...

... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#21 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#21 (text+ko) ====

@@ -516,25 +516,6 @@
 		vrele(tracevp);
 	pargs_drop(oldargs);
 
-	/*
-	 * Free any resources malloc'd earlier that we didn't use.
-	 */
-	if (newcred == NULL)
-		crfree(oldcred);
-	else
-		crfree(newcred);
-	KASSERT(newargs == NULL, ("leaking p_args"));
-	/*
-	 * Handle deferred decrement of ref counts.
-	 */
-	if (textvp != NULL)
-		vrele(textvp);
-	if (textdvp != NULL)
-		vrele(textdvp);
-	if (tracevp != NULL)
-		vrele(tracevp);
-	pargs_drop(oldargs);
-
 exec_fail_dealloc:
 
 	/*

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message