From owner-p4-projects@FreeBSD.ORG  Fri Mar 17 21:37:59 2006
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 872D816A422; Fri, 17 Mar 2006 21:37:59 +0000 (UTC)
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 5960516A400
	for <perforce@freebsd.org>; Fri, 17 Mar 2006 21:37:59 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0B2D643D46
	for <perforce@freebsd.org>; Fri, 17 Mar 2006 21:37:59 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2HLbwGm015950
	for <perforce@freebsd.org>; Fri, 17 Mar 2006 21:37:58 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2HLbwCV015943
	for perforce@freebsd.org; Fri, 17 Mar 2006 21:37:58 GMT
	(envelope-from millert@freebsd.org)
Date: Fri, 17 Mar 2006 21:37:58 GMT
Message-Id: <200603172137.k2HLbwCV015943@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93468 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: Fri, 17 Mar 2006 21:37:59 -0000

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

Change 93468 by millert@millert_p3 on 2006/03/17 21:37:30

	Correct error path when mac_check_file_change_offset() fails
	in getdirentries().

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#18 edit

Differences ...

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

@@ -3775,10 +3775,8 @@
 	}
 #ifdef MAC
 	error = mac_check_file_change_offset(td->td_ucred, fp);
-	if (error) {
-		fdrop(fp, td);
-		return (error);
-	}
+	if (error)
+		goto fail;
 #endif
 	aiov.iov_base = uap->buf;
 	aiov.iov_len = uap->count;