From owner-svn-src-all@FreeBSD.ORG  Fri Aug 13 15:17:20 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2741810656A7;
	Fri, 13 Aug 2010 15:17:20 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 159C68FC1B;
	Fri, 13 Aug 2010 15:17:20 +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 o7DFHJ4d038100;
	Fri, 13 Aug 2010 15:17:19 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7DFHJFe038098;
	Fri, 13 Aug 2010 15:17:19 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201008131517.o7DFHJFe038098@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Fri, 13 Aug 2010 15:17:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211282 - head/sbin/geom/class/multipath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Aug 2010 15:17:20 -0000

Author: mjacob
Date: Fri Aug 13 15:17:19 2010
New Revision: 211282
URL: http://svn.freebsd.org/changeset/base/211282

Log:
  Avoid a memory leak.
  
  Submitted by:	Dmitry Luhtionov via Alexander Motin
  MFC after:	1 week

Modified:
  head/sbin/geom/class/multipath/geom_multipath.c

Modified: head/sbin/geom/class/multipath/geom_multipath.c
==============================================================================
--- head/sbin/geom/class/multipath/geom_multipath.c	Fri Aug 13 13:36:18 2010	(r211281)
+++ head/sbin/geom/class/multipath/geom_multipath.c	Fri Aug 13 15:17:19 2010	(r211282)
@@ -149,16 +149,6 @@ mp_label(struct gctl_req *req)
 	}
 
 	/*
-	 * Allocate a sector to write as metadata.
-	 */
-	sector = malloc(secsize);
-	if (sector == NULL) {
-		gctl_error(req, "unable to allocate metadata buffer");
-		return;
-	}
-	memset(sector, 0, secsize);
-
-	/*
 	 * Generate metadata.
 	 */
 	strlcpy(md.md_magic, G_MULTIPATH_MAGIC, sizeof(md.md_magic));
@@ -191,6 +181,16 @@ mp_label(struct gctl_req *req)
 	}
 
 	/*
+	 * Allocate a sector to write as metadata.
+	 */
+	sector = malloc(secsize);
+	if (sector == NULL) {
+		gctl_error(req, "unable to allocate metadata buffer");
+		return;
+	}
+	memset(sector, 0, secsize);
+
+	/*
 	 * encode the metadata
 	 */
 	multipath_metadata_encode(&md, sector);