From nobody@FreeBSD.org  Wed Oct 12 00:14:18 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28498106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 12 Oct 2011 00:14:18 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 18A1F8FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 12 Oct 2011 00:14:18 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p9C0EHkS020269
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 12 Oct 2011 00:14:17 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p9C0EH5N020241;
	Wed, 12 Oct 2011 00:14:17 GMT
	(envelope-from nobody)
Message-Id: <201110120014.p9C0EH5N020241@red.freebsd.org>
Date: Wed, 12 Oct 2011 00:14:17 GMT
From: Jeremy Huddleston <jeremyhu@apple.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: usr.bin/newgrp has a memory leak
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         161510
>Category:       bin
>Synopsis:       [patch] newgrp(1) has a memory leak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 12 00:20:03 UTC 2011
>Closed-Date:    Thu Jan 05 17:08:53 CST 2012
>Last-Modified:  Thu Jan  5 23:20:05 UTC 2012
>Originator:     Jeremy Huddleston
>Release:        HEAD
>Organization:
Apple Inc
>Environment:
NA
>Description:
version 1.3 added support for variable _SC_NGROUPS_MAX by mallocing the array, but the array is not freed on errors.
>How-To-Repeat:

>Fix:
Index: newgrp.c
===================================================================
--- newgrp.c	(revision 3271)
+++ newgrp.c	(working copy)
@@ -217,7 +217,7 @@
 		err(1, "malloc");
 	if ((ngrps = getgroups(ngrps_max, (gid_t *)grps)) < 0) {
 		warn("getgroups");
-		return;
+		goto end;
 	}
 
 	/* Remove requested gid from supp. list if it exists. */
@@ -231,7 +231,7 @@
 		if (setgroups(ngrps, (const gid_t *)grps) < 0) {
 			PRIV_END;
 			warn("setgroups");
-			return;
+			goto end;
 		}
 		PRIV_END;
 	}
@@ -240,7 +240,7 @@
 	if (setgid(grp->gr_gid)) {
 		PRIV_END;
 		warn("setgid");
-		return;
+		goto end;
 	}
 	PRIV_END;
 	grps[0] = grp->gr_gid;
@@ -255,12 +255,13 @@
 			if (setgroups(ngrps, (const gid_t *)grps)) {
 				PRIV_END;
 				warn("setgroups");
-				return;
+				goto end;
 			}
 			PRIV_END;
 		}
 	}
 
+end:
 	free(grps);
 }


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ghelmer 
State-Changed-When: Thu Jan 5 17:08:32 CST 2012 
State-Changed-Why:  
Patch applied, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161510 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/161510: commit references a PR
Date: Thu,  5 Jan 2012 23:10:18 +0000 (UTC)

 Author: ghelmer
 Date: Thu Jan  5 23:08:11 2012
 New Revision: 229668
 URL: http://svn.freebsd.org/changeset/base/229668
 
 Log:
   Fix a memory leak in addgroup() by ensuring the allocated memory
   is freed if an error occurs.
   
   PR:		bin/161510
   MFC after:	4 weeks
 
 Modified:
   head/usr.bin/newgrp/newgrp.c
 
 Modified: head/usr.bin/newgrp/newgrp.c
 ==============================================================================
 --- head/usr.bin/newgrp/newgrp.c	Thu Jan  5 22:48:36 2012	(r229667)
 +++ head/usr.bin/newgrp/newgrp.c	Thu Jan  5 23:08:11 2012	(r229668)
 @@ -190,7 +190,7 @@ addgroup(const char *grpname)
  		err(1, "malloc");
  	if ((ngrps = getgroups(ngrps_max, (gid_t *)grps)) < 0) {
  		warn("getgroups");
 -		return;
 +		goto end;
  	}
  
  	/* Remove requested gid from supp. list if it exists. */
 @@ -204,7 +204,7 @@ addgroup(const char *grpname)
  		if (setgroups(ngrps, (const gid_t *)grps) < 0) {
  			PRIV_END;
  			warn("setgroups");
 -			return;
 +			goto end;
  		}
  		PRIV_END;
  	}
 @@ -213,7 +213,7 @@ addgroup(const char *grpname)
  	if (setgid(grp->gr_gid)) {
  		PRIV_END;
  		warn("setgid");
 -		return;
 +		goto end;
  	}
  	PRIV_END;
  	grps[0] = grp->gr_gid;
 @@ -228,12 +228,12 @@ addgroup(const char *grpname)
  			if (setgroups(ngrps, (const gid_t *)grps)) {
  				PRIV_END;
  				warn("setgroups");
 -				return;
 +				goto end;
  			}
  			PRIV_END;
  		}
  	}
 -
 +end:
  	free(grps);
  }
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
