From owner-p4-projects@FreeBSD.ORG  Mon Oct 17 11:51:37 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8B7BB16A421; Mon, 17 Oct 2005 11:51:36 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4852D16A41F
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:51:36 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DA2C143D46
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:51:35 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9HBpZPn054660
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:51:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9HBpZux054657
	for perforce@freebsd.org; Mon, 17 Oct 2005 11:51:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 17 Oct 2005 11:51:35 GMT
Message-Id: <200510171151.j9HBpZux054657@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 85428 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, 17 Oct 2005 11:51:37 -0000

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

Change 85428 by rwatson@rwatson_zoo on 2005/10/17 11:50:44

	KASSERT non-NULL argument to kaudit_to_bsm() rather than returning
	an error.
	
	kau_open() doesn't fail.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#21 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#21 (text+ko) ====

@@ -362,15 +362,11 @@
 	struct audit_record *ar;
 	int ctr;
 
+	KASSERT(kar != NULL, ("kaudit_to_bsm: kar == NULL"));
+
 	*pau = NULL;
-	if (kar == NULL)
-		return (BSM_FAILURE);
-
 	ar = &kar->k_ar;
-
 	rec = kau_open();
-	if (rec == NULL)
-		return (BSM_FAILURE);
 
 	/* Create the subject token */
 	tid.port = ar->ar_subj_term.port;