From owner-p4-projects@FreeBSD.ORG  Sat Sep  6 00:34:14 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4296106567E; Sat,  6 Sep 2008 00:34:13 +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 A85E3106567A
	for <perforce@freebsd.org>; Sat,  6 Sep 2008 00:34:13 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9041C8FC0A
	for <perforce@freebsd.org>; Sat,  6 Sep 2008 00:34:13 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m860YD3q041027
	for <perforce@freebsd.org>; Sat, 6 Sep 2008 00:34:13 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m860YCNB041019
	for perforce@freebsd.org; Sat, 6 Sep 2008 00:34:12 GMT
	(envelope-from wsalamon@computer.org)
Date: Sat, 6 Sep 2008 00:34:12 GMT
Message-Id: <200809060034.m860YCNB041019@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 149299 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: Sat, 06 Sep 2008 00:34:14 -0000

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

Change 149299 by wsalamon@vh2 on 2008/09/06 00:33:31

	Use an sbuf when composing the string that the MAC framework sends
	to the Audit system on behalf of a policy that is annotating an audit
	record.

Affected files ...

.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_audit.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_audit.c#5 (text+ko) ====

@@ -42,6 +42,7 @@
 #include <sys/libkern.h>
 #include <sys/param.h>
 #include <sys/module.h>
+#include <sys/sbuf.h>
 #include <sys/vnode.h>
 
 #include <security/audit/audit.h>
@@ -118,13 +119,12 @@
 int
 mac_audit_text(char *text, struct mac_policy_conf *mpc)
 {
-	char *sanitized;
-	const char *name;
-	int i, size, plen, len;
+	struct sbuf sb;
+	char *buf;
+	int i, size, plen, len, ret;
 
-	name = mpc->mpc_name;
 	len = strlen(text);
-	plen = 2 + strlen(name);
+	plen = 2 + strlen(mpc->mpc_name);	/* 2 chars for the ": " below */
 	if (plen + len >= MAC_AUDIT_DATA_LIMIT)
 		return (EINVAL);
 
@@ -137,14 +137,17 @@
 			return (EINVAL);
 
 	size = len + plen + 1;
-	/* XXX Should we use a malloc area for MAC storage (M_AUDITMAC)? */
- 	sanitized = (char *)malloc(size, M_TEMP, M_WAITOK);
+	buf = (char *)malloc(size, M_TEMP, M_WAITOK);
+	sbuf_new(&sb, buf, size, SBUF_FIXEDLEN);
 
-	strcpy(sanitized, name);
-	strcat(sanitized, ": ");
-	strcat(sanitized, text);
+	sbuf_printf(&sb, "%s: %s", mpc->mpc_name, text);
+	sbuf_finish(&sb);
 
-	return (audit_mac_data(MAC_AUDIT_TEXT_TYPE, size, sanitized));
+	/* The data buffer is free'd in the Audit side */
+	ret = audit_mac_data(MAC_AUDIT_TEXT_TYPE, sbuf_len(&sb),
+	    sbuf_data(&sb));
+	sbuf_delete(&sb);
+	return (ret);
 }
 
 int