From owner-cvs-src@FreeBSD.ORG  Sat Mar  1 14:52:07 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6D1D71065672;
	Sat,  1 Mar 2008 14:52:07 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F9548FC20;
	Sat,  1 Mar 2008 14:52:07 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21Eq7cb038009;
	Sat, 1 Mar 2008 14:52:07 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21Eq7K7038008;
	Sat, 1 Mar 2008 14:52:07 GMT (envelope-from rwatson)
Message-Id: <200803011452.m21Eq7K7038008@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 1 Mar 2008 14:52:06 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/security/mac_mls mac_mls.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 01 Mar 2008 14:52:07 -0000

rwatson     2008-03-01 14:52:06 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/security/mac_mls mac_mls.c 
  Log:
  Merge mac_mls.c:1.99 from HEAD to RELENG_6:
  
    Properly return the error from mls_subject_privileged() in the ifnet
    relabel check for MLS rather than returning 0 directly.
  
    This problem didn't result in a vulnerability currently as the central
    implementation of ifnet relabeling also checks for UNIX privilege, and
    we currently don't guarantee containment for the root user in mac_mls,
    but we should be using the MLS definition of privilege as well as the
    UNIX definition in anticipation of supporting root containment at some
    point.
  
    Submitted by:   Zhouyi Zhou <zhouzhouyi at gmail dot com>
    Sponsored by:   Google SoC 2007
  
  Revision  Changes    Path
  1.72.2.6  +1 -3      src/sys/security/mac_mls/mac_mls.c