From owner-svn-src-all@FreeBSD.ORG Mon May 31 22:27:09 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 088E0106567B; Mon, 31 May 2010 22:27:09 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D1DBA8FC0A; Mon, 31 May 2010 22:27:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4VMR8hE040942; Mon, 31 May 2010 22:27:08 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4VMR8ds040938; Mon, 31 May 2010 22:27:08 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201005312227.o4VMR8ds040938@svn.freebsd.org> From: Robert Watson Date: Mon, 31 May 2010 22:27:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208680 - in stable/8/sys/security: mac_biba mac_lomac mac_mls X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 22:27:09 -0000 Author: rwatson Date: Mon May 31 22:27:08 2010 New Revision: 208680 URL: http://svn.freebsd.org/changeset/base/208680 Log: Merge r204581 from head to stable/8: Update device-labeling logic for Biba, LOMAC, and MLS to recognize new-style pts devices when various policy ptys_equal flags are enabled. Submitted by: Estella Mystagic Approved by: re (kib) Modified: stable/8/sys/security/mac_biba/mac_biba.c stable/8/sys/security/mac_lomac/mac_lomac.c stable/8/sys/security/mac_mls/mac_mls.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/security/mac_biba/mac_biba.c ============================================================================== --- stable/8/sys/security/mac_biba/mac_biba.c Mon May 31 22:18:42 2010 (r208679) +++ stable/8/sys/security/mac_biba/mac_biba.c Mon May 31 22:27:08 2010 (r208680) @@ -955,6 +955,7 @@ biba_devfs_create_device(struct ucred *c biba_type = MAC_BIBA_TYPE_EQUAL; else if (ptys_equal && (strncmp(dev->si_name, "ttyp", strlen("ttyp")) == 0 || + strncmp(dev->si_name, "pts/", strlen("pts/")) == 0 || strncmp(dev->si_name, "ptyp", strlen("ptyp")) == 0)) biba_type = MAC_BIBA_TYPE_EQUAL; else Modified: stable/8/sys/security/mac_lomac/mac_lomac.c ============================================================================== --- stable/8/sys/security/mac_lomac/mac_lomac.c Mon May 31 22:18:42 2010 (r208679) +++ stable/8/sys/security/mac_lomac/mac_lomac.c Mon May 31 22:27:08 2010 (r208680) @@ -1043,6 +1043,7 @@ lomac_devfs_create_device(struct ucred * lomac_type = MAC_LOMAC_TYPE_EQUAL; else if (ptys_equal && (strncmp(dev->si_name, "ttyp", strlen("ttyp")) == 0 || + strncmp(dev->si_name, "pts/", strlen("pts/")) == 0 || strncmp(dev->si_name, "ptyp", strlen("ptyp")) == 0)) lomac_type = MAC_LOMAC_TYPE_EQUAL; else Modified: stable/8/sys/security/mac_mls/mac_mls.c ============================================================================== --- stable/8/sys/security/mac_mls/mac_mls.c Mon May 31 22:18:42 2010 (r208679) +++ stable/8/sys/security/mac_mls/mac_mls.c Mon May 31 22:27:08 2010 (r208680) @@ -918,6 +918,7 @@ mls_devfs_create_device(struct ucred *cr mls_type = MAC_MLS_TYPE_HIGH; else if (ptys_equal && (strncmp(dev->si_name, "ttyp", strlen("ttyp")) == 0 || + strncmp(dev->si_name, "pts/", strlen("pts/")) == 0 || strncmp(dev->si_name, "ptyp", strlen("ptyp")) == 0)) mls_type = MAC_MLS_TYPE_EQUAL; else