From owner-p4-projects@FreeBSD.ORG  Mon Dec  1 12:42:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 569FA1065670; Mon,  1 Dec 2008 12:42:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1ACCF1065679
	for <perforce@freebsd.org>; Mon,  1 Dec 2008 12:42:33 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 04B168FC20
	for <perforce@freebsd.org>; Mon,  1 Dec 2008 12:42:33 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB1CgWES041586
	for <perforce@freebsd.org>; Mon, 1 Dec 2008 12:42:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB1CgWIo041584
	for perforce@freebsd.org; Mon, 1 Dec 2008 12:42:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 1 Dec 2008 12:42:32 GMT
Message-Id: <200812011242.mB1CgWIo041584@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153883 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Dec 2008 12:42:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=153883

Change 153883 by rwatson@rwatson_cinnamon_macosx on 2008/12/01 12:41:51

	In userspace, malloc(3) can fail, so we need to check for and
	handle NULL returns from GET_TOKEN_AREA() in au_to_zonename().

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#77 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#77 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#76 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#77 $
  */
 
 #include <sys/types.h>
@@ -1234,9 +1234,11 @@
 	u_int16_t textlen;
 	token_t *t;
 
-	textlen = strlen(zonename);
-	textlen += 1;
+	textlen = strlen(zonename) + 1;
 	GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) + textlen);
+	if (t == NULL)
+		return (NULL);
+
 	ADD_U_CHAR(dptr, AUT_ZONENAME);
 	ADD_U_INT16(dptr, textlen);
 	ADD_STRING(dptr, zonename, textlen);