From owner-p4-projects  Tue Sep 17 13:59:24 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6B55A37B401; Tue, 17 Sep 2002 13:59:21 -0700 (PDT)
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 1AD6E37B404
	for <perforce@FreeBSD.org>; Tue, 17 Sep 2002 13:59:21 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CAF7B43E3B
	for <perforce@FreeBSD.org>; Tue, 17 Sep 2002 13:59:20 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8HKxKCo078305
	for <perforce@FreeBSD.org>; Tue, 17 Sep 2002 13:59:20 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8HKxKhx078302
	for perforce@freebsd.org; Tue, 17 Sep 2002 13:59:20 -0700 (PDT)
Date: Tue, 17 Sep 2002 13:59:20 -0700 (PDT)
Message-Id: <200209172059.g8HKxKhx078302@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f
From: Adam Migus <amigus@FreeBSD.org>
Subject: PERFORCE change 17628 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17628

Change 17628 by amigus@amigus_caster on 2002/09/17 13:58:41

	Forgot a pipe lock and userland bug fixes.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#266 edit
.. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/getfmac.c#3 edit
.. //depot/projects/trustedbsd/mac/usr.sbin/getpmac/getpmac.c#3 edit
.. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#266 (text+ko) ====

@@ -3842,8 +3842,10 @@
 		mac_free_element_array(element_array);
 		if (error == 0) {
 			pipe = (struct pipe *)fp->f_data;
+			PIPE_LOCK(pipe);
 			error = mac_pipe_label_set(td->td_ucred, pipe,
 			    &intlabel);
+			PIPE_UNLOCK(pipe);
 		}
 
 		mac_destroy_pipe_label(&intlabel);

==== //depot/projects/trustedbsd/mac/usr.sbin/getfmac/getfmac.c#3 (text+ko) ====

@@ -53,7 +53,7 @@
 
 		error = mac_get_file(argv[i], label);
 		if (error) {
-			perror(argv[1]);
+			perror(argv[i]);
 			mac_free(label);
 			continue;
 		}

==== //depot/projects/trustedbsd/mac/usr.sbin/getpmac/getpmac.c#3 (text+ko) ====

@@ -64,12 +64,17 @@
 		return (-1);
 	}
 
-	if (pid_set)
+	if (pid_set) {
 		error = mac_get_pid(pid, label);
-	else
+		if (error)
+			perror("mac_get_pid");
+	}
+	else {
 		error = mac_get_proc(label);
+		if (error)
+			perror("mac_get_proc");
+	}
 	if (error) {
-		perror("mac_get_proc");
 		mac_free(label);
 		exit (-1);
 	}

==== //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.c#3 (text+ko) ====

@@ -37,7 +37,7 @@
 	for (i = 2; i < argc; i++) {
 		error = mac_set_file(argv[i], label);
 		if (error) {
-			perror(argv[1]);
+			perror(argv[i]);
 			return (-1);
 		}
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message