From owner-p4-projects  Wed Jul 31 10:25:17 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F06437B405; Wed, 31 Jul 2002 10:25:13 -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 C797537B401
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 10:25:12 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 86CBE43E65
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 10:25:12 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VHPCJU009540
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 10:25:12 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VHPC7Z009537
	for perforce@freebsd.org; Wed, 31 Jul 2002 10:25:12 -0700 (PDT)
Date: Wed, 31 Jul 2002 10:25:12 -0700 (PDT)
Message-Id: <200207311725.g6VHPC7Z009537@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 15326 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=15326

Change 15326 by rwatson@rwatson_tislabs on 2002/07/31 10:24:57

	Short-circuit the MAC check on receiving raw IP packets if
	the IPsec check has already failed.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#14 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#14 (text+ko) ====

@@ -158,7 +158,8 @@
 				}
 #endif /*IPSEC*/
 #ifdef MAC
-				if (mac_check_socket_receive(last->inp_socket,
+				if (policyfail == 0 &&
+				    mac_check_socket_receive(last->inp_socket,
 				    n) != 0)
 					policyfail = 1;
 #endif

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