From owner-svn-src-all@FreeBSD.ORG  Sun Mar 31 14:02:43 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D52FA97A;
 Sun, 31 Mar 2013 14:02:43 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C7E6AE13;
 Sun, 31 Mar 2013 14:02:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VE2h4t066062;
 Sun, 31 Mar 2013 14:02:43 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VE2hM8066061;
 Sun, 31 Mar 2013 14:02:43 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201303311402.r2VE2hM8066061@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 31 Mar 2013 14:02:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r248948 - stable/8/sys/cddl/dev/fbt
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 31 Mar 2013 14:02:43 -0000

Author: avg
Date: Sun Mar 31 14:02:43 2013
New Revision: 248948
URL: http://svnweb.freebsd.org/changeset/base/248948

Log:
  MFC r248640: fbt_typoff_init: fix an off by one in determining required
  memory size

Modified:
  stable/8/sys/cddl/dev/fbt/fbt.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/cddl/   (props changed)

Modified: stable/8/sys/cddl/dev/fbt/fbt.c
==============================================================================
--- stable/8/sys/cddl/dev/fbt/fbt.c	Sun Mar 31 14:02:28 2013	(r248947)
+++ stable/8/sys/cddl/dev/fbt/fbt.c	Sun Mar 31 14:02:43 2013	(r248948)
@@ -777,6 +777,8 @@ fbt_typoff_init(linker_ctf_t *lc)
 		pop[kind]++;
 	}
 
+	/* account for a sentinel value below */
+	ctf_typemax++;
 	*lc->typlenp = ctf_typemax;
 
 	if ((xp = malloc(sizeof(uint32_t) * ctf_typemax, M_LINKER, M_ZERO | M_WAITOK)) == NULL)