svn commit: r208680 - in stable/8/sys/security: mac_biba mac_lomac mac_mls

[Robert Watson]

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 <estella at mystagic.com>
  
  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