From owner-svn-src-projects@FreeBSD.ORG  Tue Feb  8 13:24:59 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3B551065673;
	Tue,  8 Feb 2011 13:24:59 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B54558FC20;
	Tue,  8 Feb 2011 13:24:59 +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 p18DOxei047256;
	Tue, 8 Feb 2011 13:24:59 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18DOxEb047254;
	Tue, 8 Feb 2011 13:24:59 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102081324.p18DOxEb047254@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 8 Feb 2011 13:24:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218440 - projects/graid/head/sys/geom/raid
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Feb 2011 13:24:59 -0000

Author: mav
Date: Tue Feb  8 13:24:59 2011
New Revision: 218440
URL: http://svn.freebsd.org/changeset/base/218440

Log:
  Do not try to read freshly allocated memory.

Modified:
  projects/graid/head/sys/geom/raid/md_intel.c

Modified: projects/graid/head/sys/geom/raid/md_intel.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_intel.c	Tue Feb  8 13:04:51 2011	(r218439)
+++ projects/graid/head/sys/geom/raid/md_intel.c	Tue Feb  8 13:24:59 2011	(r218440)
@@ -374,8 +374,9 @@ intel_meta_read(struct g_consumer *cp)
 		g_free(buf);
 		return (NULL);
 	}
-	meta = malloc(meta->config_size, M_MD_INTEL, M_WAITOK);
-	memcpy(meta, buf, min(meta->config_size, pp->sectorsize));
+	size = meta->config_size;
+	meta = malloc(size, M_MD_INTEL, M_WAITOK);
+	memcpy(meta, buf, min(size, pp->sectorsize));
 	g_free(buf);
 
 	/* Read all the rest, if needed. */