From owner-p4-projects@FreeBSD.ORG  Wed Aug  5 19:56:30 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2A3A61065670; Wed,  5 Aug 2009 19:56:30 +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 CB36D106564A
	for <perforce@freebsd.org>; Wed,  5 Aug 2009 19:56:29 +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 B67FF8FC17
	for <perforce@freebsd.org>; Wed,  5 Aug 2009 19:56:29 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n75JuTiZ093591
	for <perforce@freebsd.org>; Wed, 5 Aug 2009 19:56:29 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 n75JuTlT093589
	for perforce@freebsd.org; Wed, 5 Aug 2009 19:56:29 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 5 Aug 2009 19:56:29 GMT
Message-Id: <200908051956.n75JuTlT093589@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 167050 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: Wed, 05 Aug 2009 19:56:31 -0000

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

Change 167050 by rwatson@rwatson_cinnamon on 2009/08/05 19:55:43

	Fix warnings.

Affected files ...

.. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_slice.c#7 edit

Differences ...

==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_slice.c#7 (text+ko) ====

@@ -171,7 +171,7 @@
 	int nbytes = 0; /*Remaining bytes */
 	struct bsm_rec_hdr *audit_slice_dev_buf;
 	struct audit_slice *as;
-	void *as_rec;
+	void *as_rec = NULL;
 
 	as = dev->si_drv1;
 
@@ -204,7 +204,7 @@
 		 * longer than MAX_AUDIT_RECORD_SIZE, or less than
 		 * sizeof(*audit_slice_dev_buf).
 		 */
-		recsz = be32dec (audit_slice_dev_buf->rec_byte_count);
+		recsz = be32toh(audit_slice_dev_buf->rec_byte_count);
 		as_rec = (void *)malloc((unsigned long)recsz, M_AUDITBSM, 
 				M_WAITOK | M_ZERO);
 
@@ -224,7 +224,8 @@
 	 * XXXRW: Only free as_rec if we allocated it.
 	 */
 	free(audit_slice_dev_buf, M_TEMP);
-	free(as_rec, M_AUDITBSM);
+	if (as_rec != NULL)
+		free(as_rec, M_AUDITBSM);
 
 	return (error);
 }