From owner-p4-projects  Fri Oct 18 14: 1:47 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ABF2537B432; Fri, 18 Oct 2002 14:01:43 -0700 (PDT)
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 C7B3537B42F
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 14:01:38 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7B38E43E9C
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 14:01:38 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9IL1NmV083197
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 14:01:23 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9IL1LDF083193
	for perforce@freebsd.org; Fri, 18 Oct 2002 14:01:21 -0700 (PDT)
Date: Fri, 18 Oct 2002 14:01:21 -0700 (PDT)
Message-Id: <200210182101.g9IL1LDF083193@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 19580 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://perforce.freebsd.org/chv.cgi?CH=19580

Change 19580 by rwatson@rwatson_tislabs on 2002/10/18 14:00:20

	Merge two semantically similar but syntactically different
	ACL memory leak fixes.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#54 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#54 (text+ko) ====

@@ -1356,7 +1356,7 @@
 	struct dirtemplate dirtemplate, *dtp;
 	struct direct newdir;
 #ifdef UFS_ACL
-	struct acl *acl = NULL, *dacl = NULL;
+	struct acl *acl, *dacl;
 #endif
 	int error, dmode;
 	long blkoff;
@@ -1559,11 +1559,12 @@
 			break;
 
 		default:
+			FREE(acl, M_ACL);
+			FREE(dacl, M_ACL);
 			goto bad;
 		}
 		FREE(acl, M_ACL);
 		FREE(dacl, M_ACL);
-		acl = dacl = NULL;
 	}
 #endif /* !UFS_ACL */
 
@@ -1647,12 +1648,6 @@
 		vput(tvp);
 	}
 out:
-#ifdef UFS_ACL
-	if (acl != NULL)
-		FREE(acl, M_ACL);
-	if (dacl != NULL)
-		FREE(dacl, M_ACL);
-#endif /* UFS_ACL */
 	return (error);
 }
 
@@ -2289,7 +2284,7 @@
 	struct direct newdir;
 	struct vnode *tvp;
 #ifdef UFS_ACL
-	struct acl *acl = NULL;
+	struct acl *acl;
 #endif
 	int error;
 
@@ -2475,10 +2470,10 @@
 			break;
 
 		default:
+			FREE(acl, M_ACL);
 			goto bad;
 		}
 		FREE(acl, M_ACL);
-		acl = NULL;
 	}
 #endif /* !UFS_ACL */
 	ufs_makedirentry(ip, cnp, &newdir);
@@ -2500,10 +2495,6 @@
 	if (DOINGSOFTDEP(tvp))
 		softdep_change_linkcnt(ip);
 	vput(tvp);
-#ifdef UFS_ACL
-	if (acl != NULL)
-		FREE(acl, M_ACL);
-#endif /* UFS_ACL */
 	return (error);
 }
 

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