From owner-cvs-src@FreeBSD.ORG  Mon Jun  2 11:59:31 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id AA12337B41C; Mon,  2 Jun 2003 11:59:31 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7347C43FB1; Mon,  2 Jun 2003 11:59:30 -0700 (PDT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52IxU0U079635;
	Mon, 2 Jun 2003 11:59:30 -0700 (PDT)
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52IxTpa079634;
	Mon, 2 Jun 2003 11:59:29 -0700 (PDT)
Message-Id: <200306021859.h52IxTpa079634@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 2 Jun 2003 11:59:29 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5_1
Subject: cvs commit: src/sys/security/mac_biba
	mac_biba.csrc/sys/security/mac_lomac
	mac_lomac.c src/sys/security/mac_mls mac_mls.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jun 2003 18:59:32 -0000

rwatson     2003/06/02 11:59:29 PDT

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5_1)
    sys/security/mac_biba mac_biba.c 
    sys/security/mac_lomac mac_lomac.c 
    sys/security/mac_mls mac_mls.c 
  Log:
  Merge fixes to properly propagate labels across some mbuf copy
  operations for Biba, MLS, and LOMAC.  This was a result of a mismerge
  when we migrated from label storage in the mbuf pkthdr field to
  m_tags, and could result in fail-stop behavior after certain mbuf
  operations.
  
  Approved by:    re (scottl)
  Obtained from:  TrustedBSD Project
  Sponsored by:   DARPA, Network Associates Laboratories
  
  Revision  Changes    Path
  1.59.2.2  +1 -0      src/sys/security/mac_biba/mac_biba.c
  1.12.2.1  +1 -0      src/sys/security/mac_lomac/mac_lomac.c
  1.47.2.2  +1 -0      src/sys/security/mac_mls/mac_mls.c