From owner-p4-projects@FreeBSD.ORG  Sat Feb 11 13:44:28 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 DE73716A423; Sat, 11 Feb 2006 13:44:27 +0000 (GMT)
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 9AF5716A420
	for <perforce@freebsd.org>; Sat, 11 Feb 2006 13:44:27 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 65A3743D48
	for <perforce@freebsd.org>; Sat, 11 Feb 2006 13:44:27 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BDiRdu039979
	for <perforce@freebsd.org>; Sat, 11 Feb 2006 13:44:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BDiQV1039966
	for perforce@freebsd.org; Sat, 11 Feb 2006 13:44:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 11 Feb 2006 13:44:26 GMT
Message-Id: <200602111344.k1BDiQV1039966@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>
Cc: 
Subject: PERFORCE change 91569 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, 11 Feb 2006 13:44:28 -0000

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

Change 91569 by rwatson@rwatson_zoo on 2006/02/11 13:43:42

	Re-merge CIPSO option parsing.  Note that what we have may not be
	everything we need.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/netinet/ip_options.c#2 edit

Differences ...

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

@@ -354,8 +354,11 @@
 
 		case IPOPT_CIPSO:
 #ifdef MAC
-			error = mac_update_mbuf_from_cipso(m, cp, &code);
-			if (error)
+			/*
+			 * Should we be providing the option to free the mbuf
+			 * and not return ICMP?
+			 */
+			if (mac_update_mbuf_from_cipso(m, cp, &code) != 0)
 				goto bad;
 #endif
 			break;