From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 13:56:36 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2521E16A4C0; Mon, 29 Sep 2003 13:56:36 -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 F31C716A4B3
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 13:56:35 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 72D1B43FBD
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 13:56:35 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8TKuYXJ004035
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 13:56:34 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TKuX49004032
	for perforce@freebsd.org; Mon, 29 Sep 2003 13:56:33 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 29 Sep 2003 13:56:33 -0700 (PDT)
Message-Id: <200309292056.h8TKuX49004032@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>
Subject: PERFORCE change 38800 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 29 Sep 2003 20:56:36 -0000

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

Change 38800 by rwatson@rwatson_tislabs on 2003/09/29 13:56:24

	Integrate pipe locking fix from trustedbsd_mac: make sure to
	unlock the pipe lock on a MAC failure.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/sys_pipe.c#5 integrate

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/sys_pipe.c#5 (text+ko) ====

@@ -1233,8 +1233,10 @@
 
 #ifdef MAC
 	error = mac_check_pipe_ioctl(active_cred, mpipe, cmd, data);
-	if (error)
+	if (error) {
+		PIPE_UNLOCK(mpipe);
 		return (error);
+	}
 #endif
 
 	switch (cmd) {