From owner-svn-src-stable-8@FreeBSD.ORG Sat Oct 2 22:21:01 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A50BB106566B; Sat, 2 Oct 2010 22:21:01 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 79CAD8FC08; Sat, 2 Oct 2010 22:21:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o92ML18a056490; Sat, 2 Oct 2010 22:21:01 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o92ML1Yv056486; Sat, 2 Oct 2010 22:21:01 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201010022221.o92ML1Yv056486@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Sat, 2 Oct 2010 22:21:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213376 - stable/8/sys/geom/part X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Oct 2010 22:21:01 -0000 Author: ae Date: Sat Oct 2 22:21:01 2010 New Revision: 213376 URL: http://svn.freebsd.org/changeset/base/213376 Log: MFC r213174: Some schemes can allocate memory for internal purposes but when GEOM does withering this memory doesn't freed. Add G_PART_DESTROY call to g_part_wither. Also add missed g_free() call to G_PART_READ method for MBR and PC98 schemes. Submitted by: jh (previous version) Reviewed by: pjd Approved by: kib (mentor) Modified: stable/8/sys/geom/part/g_part.c stable/8/sys/geom/part/g_part_mbr.c stable/8/sys/geom/part/g_part_pc98.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/geom/part/g_part.c ============================================================================== --- stable/8/sys/geom/part/g_part.c Sat Oct 2 22:18:36 2010 (r213375) +++ stable/8/sys/geom/part/g_part.c Sat Oct 2 22:21:01 2010 (r213376) @@ -1204,6 +1204,7 @@ g_part_wither(struct g_geom *gp, int err table = gp->softc; if (table != NULL) { + G_PART_DESTROY(table, NULL); while ((entry = LIST_FIRST(&table->gpt_entry)) != NULL) { LIST_REMOVE(entry, gpe_entry); g_free(entry); Modified: stable/8/sys/geom/part/g_part_mbr.c ============================================================================== --- stable/8/sys/geom/part/g_part_mbr.c Sat Oct 2 22:18:36 2010 (r213375) +++ stable/8/sys/geom/part/g_part_mbr.c Sat Oct 2 22:21:01 2010 (r213376) @@ -465,6 +465,7 @@ g_part_mbr_read(struct g_part_table *bas basetable->gpt_first = basetable->gpt_sectors; basetable->gpt_last = msize - (msize % basetable->gpt_sectors) - 1; + g_free(buf); return (0); } Modified: stable/8/sys/geom/part/g_part_pc98.c ============================================================================== --- stable/8/sys/geom/part/g_part_pc98.c Sat Oct 2 22:18:36 2010 (r213375) +++ stable/8/sys/geom/part/g_part_pc98.c Sat Oct 2 22:21:01 2010 (r213376) @@ -458,6 +458,7 @@ g_part_pc98_read(struct g_part_table *ba basetable->gpt_first = cyl; basetable->gpt_last = msize - (msize % cyl) - 1; + g_free(buf); return (0); }