rpms/selinux-policy/devel modules-minimum.conf, 1.58, 1.59 modules-targeted.conf, 1.167, 1.168 policy-F14.patch, 1.16, 1.17

Daniel J Walsh dwalsh at fedoraproject.org
Mon Jun 28 21:27:06 UTC 2010


Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14903

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F14.patch 
Log Message:
* Tue Jun 22 2010 Dan Walsh <dwalsh at redhat.com> 3.8.6-1
-Update to upstream



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- modules-minimum.conf	16 Jun 2010 20:17:50 -0000	1.58
+++ modules-minimum.conf	28 Jun 2010 21:27:05 -0000	1.59
@@ -973,7 +973,7 @@ mls = base
 #
 # Policy for mock rpm builder
 # 
-mock = base
+mock = module
 
 # Layer: system
 # Module: modutils


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- modules-targeted.conf	16 Jun 2010 20:17:50 -0000	1.167
+++ modules-targeted.conf	28 Jun 2010 21:27:05 -0000	1.168
@@ -973,7 +973,7 @@ mls = base
 #
 # Policy for mock rpm builder
 # 
-mock = base
+mock = module
 
 # Layer: system
 # Module: modutils

policy-F14.patch:
 Makefile                                  |    2 
 man/man8/git_selinux.8                    |  109 +
 policy/global_tunables                    |   24 
 policy/modules/admin/accountsd.fc         |    4 
 policy/modules/admin/accountsd.if         |  164 ++
 policy/modules/admin/accountsd.te         |   62 +
 policy/modules/admin/anaconda.te          |    4 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    1 
 policy/modules/admin/dmesg.te             |    6 
 policy/modules/admin/firstboot.te         |    7 
 policy/modules/admin/logrotate.te         |    3 
 policy/modules/admin/logwatch.fc          |    4 
 policy/modules/admin/logwatch.te          |   14 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/ncftool.fc           |    2 
 policy/modules/admin/ncftool.if           |   74 +
 policy/modules/admin/ncftool.te           |   79 +
 policy/modules/admin/netutils.te          |   21 
 policy/modules/admin/prelink.te           |    4 
 policy/modules/admin/readahead.te         |    2 
 policy/modules/admin/rpm.fc               |    4 
 policy/modules/admin/rpm.if               |  133 ++
 policy/modules/admin/rpm.te               |   41 
 policy/modules/admin/sectoolm.te          |    1 
 policy/modules/admin/shorewall.if         |   11 
 policy/modules/admin/shorewall.te         |    3 
 policy/modules/admin/shutdown.fc          |    5 
 policy/modules/admin/shutdown.if          |  136 ++
 policy/modules/admin/shutdown.te          |   61 +
 policy/modules/admin/su.if                |    3 
 policy/modules/admin/sudo.if              |   12 
 policy/modules/admin/tmpreaper.te         |   13 
 policy/modules/admin/usermanage.if        |   20 
 policy/modules/admin/usermanage.te        |   24 
 policy/modules/admin/vbetool.te           |    3 
 policy/modules/admin/vpn.if               |   20 
 policy/modules/admin/vpn.te               |    3 
 policy/modules/apps/chrome.fc             |    3 
 policy/modules/apps/chrome.if             |   90 +
 policy/modules/apps/chrome.te             |   86 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   47 
 policy/modules/apps/execmem.if            |  110 +
 policy/modules/apps/execmem.te            |   10 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   65 +
 policy/modules/apps/gitosis.fc            |    2 
 policy/modules/apps/gitosis.if            |    2 
 policy/modules/apps/gitosis.te            |    7 
 policy/modules/apps/gnome.fc              |   24 
 policy/modules/apps/gnome.if              |  438 +++++++
 policy/modules/apps/gnome.te              |  118 ++
 policy/modules/apps/gpg.fc                |    1 
 policy/modules/apps/gpg.if                |   41 
 policy/modules/apps/gpg.te                |   85 +
 policy/modules/apps/irc.fc                |    4 
 policy/modules/apps/irc.if                |   15 
 policy/modules/apps/irc.te                |  104 +
 policy/modules/apps/java.fc               |    3 
 policy/modules/apps/java.if               |    4 
 policy/modules/apps/java.te               |    1 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   68 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |  127 ++
 policy/modules/apps/livecd.te             |   34 
 policy/modules/apps/mono.if               |    5 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |    8 
 policy/modules/apps/mozilla.te            |    7 
 policy/modules/apps/mplayer.if            |   36 
 policy/modules/apps/mplayer.te            |    8 
 policy/modules/apps/nsplugin.fc           |   10 
 policy/modules/apps/nsplugin.if           |  391 ++++++
 policy/modules/apps/nsplugin.te           |  299 +++++
 policy/modules/apps/openoffice.fc         |    4 
 policy/modules/apps/openoffice.if         |  129 ++
 policy/modules/apps/openoffice.te         |   16 
 policy/modules/apps/podsleuth.te          |    3 
 policy/modules/apps/pulseaudio.if         |   57 +
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |   84 +
 policy/modules/apps/qemu.te               |   11 
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   66 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  314 +++++
 policy/modules/apps/sandbox.te            |  387 ++++++
 policy/modules/apps/seunshare.if          |   33 
 policy/modules/apps/seunshare.te          |   35 
 policy/modules/apps/slocate.te            |    4 
 policy/modules/apps/telepathysofiasip.fc  |    2 
 policy/modules/apps/telepathysofiasip.if  |   69 +
 policy/modules/apps/telepathysofiasip.te  |   42 
 policy/modules/apps/userhelper.fc         |    1 
 policy/modules/apps/userhelper.if         |   56 
 policy/modules/apps/userhelper.te         |   42 
 policy/modules/apps/vmware.fc             |    4 
 policy/modules/apps/vmware.if             |   19 
 policy/modules/apps/vmware.te             |   14 
 policy/modules/apps/wine.fc               |    1 
 policy/modules/apps/wine.if               |   11 
 policy/modules/apps/wine.te               |   22 
 policy/modules/apps/wm.if                 |   15 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |    2 
 policy/modules/kernel/corenetwork.te.in   |   32 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |   77 +
 policy/modules/kernel/devices.te          |    3 
 policy/modules/kernel/domain.if           |   45 
 policy/modules/kernel/domain.te           |  110 +
 policy/modules/kernel/files.fc            |   26 
 policy/modules/kernel/files.if            |  382 ++++++
 policy/modules/kernel/files.te            |   12 
 policy/modules/kernel/filesystem.if       |  159 ++
 policy/modules/kernel/filesystem.te       |   13 
 policy/modules/kernel/kernel.if           |   40 
 policy/modules/kernel/kernel.te           |   18 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |   10 
 policy/modules/roles/auditadm.te          |    3 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/secadm.te            |    2 
 policy/modules/roles/staff.te             |  118 ++
 policy/modules/roles/sysadm.te            |  102 +
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |   23 
 policy/modules/roles/xguest.te            |   79 +
 policy/modules/services/abrt.fc           |    1 
 policy/modules/services/abrt.if           |   45 
 policy/modules/services/abrt.te           |   49 
 policy/modules/services/afs.te            |    4 
 policy/modules/services/aiccu.fc          |    6 
 policy/modules/services/aiccu.if          |  118 ++
 policy/modules/services/aiccu.te          |   71 +
 policy/modules/services/aisexec.te        |    3 
 policy/modules/services/apache.fc         |   18 
 policy/modules/services/apache.if         |  222 +++
 policy/modules/services/apache.te         |  242 +++-
 policy/modules/services/apcupsd.te        |    4 
 policy/modules/services/arpwatch.te       |    1 
 policy/modules/services/asterisk.te       |    6 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.if          |    1 
 policy/modules/services/bind.if           |    7 
 policy/modules/services/bitlbee.te        |    5 
 policy/modules/services/bluetooth.if      |   26 
 policy/modules/services/boinc.fc          |    6 
 policy/modules/services/boinc.if          |  151 ++
 policy/modules/services/boinc.te          |   94 +
 policy/modules/services/bugzilla.fc       |    4 
 policy/modules/services/bugzilla.if       |   39 
 policy/modules/services/bugzilla.te       |   56 
 policy/modules/services/cachefilesd.fc    |   29 
 policy/modules/services/cachefilesd.if    |   41 
 policy/modules/services/cachefilesd.te    |  147 ++
 policy/modules/services/ccs.te            |    5 
 policy/modules/services/certmaster.if     |   19 
 policy/modules/services/certmonger.if     |    4 
 policy/modules/services/certmonger.te     |    2 
 policy/modules/services/cgroup.if         |    2 
 policy/modules/services/cgroup.te         |    4 
 policy/modules/services/chronyd.if        |   80 +
 policy/modules/services/chronyd.te        |    8 
 policy/modules/services/clamav.te         |    7 
 policy/modules/services/cmirrord.fc       |    6 
 policy/modules/services/cmirrord.if       |  118 ++
 policy/modules/services/cmirrord.te       |   56 
 policy/modules/services/cobbler.fc        |   35 
 policy/modules/services/cobbler.if        |  133 +-
 policy/modules/services/cobbler.te        |  155 ++
 policy/modules/services/consolekit.te     |   22 
 policy/modules/services/corosync.fc       |    1 
 policy/modules/services/corosync.te       |   21 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |  116 +-
 policy/modules/services/cron.te           |   98 +
 policy/modules/services/cups.fc           |    6 
 policy/modules/services/cups.if           |    5 
 policy/modules/services/cups.te           |   15 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   26 
 policy/modules/services/dbus.te           |   20 
 policy/modules/services/denyhosts.te      |    6 
 policy/modules/services/devicekit.te      |   14 
 policy/modules/services/dhcp.te           |    5 
 policy/modules/services/dnsmasq.te        |    6 
 policy/modules/services/dovecot.if        |   16 
 policy/modules/services/dovecot.te        |    5 
 policy/modules/services/exim.fc           |    3 
 policy/modules/services/exim.if           |   61 +
 policy/modules/services/exim.te           |    7 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fprintd.te        |    1 
 policy/modules/services/ftp.te            |   67 +
 policy/modules/services/git.fc            |    9 
 policy/modules/services/git.if            |  526 +++++++++
 policy/modules/services/git.te            |  190 +++
 policy/modules/services/gnomeclock.if     |   21 
 policy/modules/services/gpsd.te           |    4 
 policy/modules/services/hal.if            |   20 
 policy/modules/services/hal.te            |   28 
 policy/modules/services/hddtemp.te        |    1 
 policy/modules/services/icecast.te        |    6 
 policy/modules/services/inn.te            |    1 
 policy/modules/services/kerberos.te       |    6 
 policy/modules/services/ksmtuned.fc       |    2 
 policy/modules/services/ksmtuned.if       |    2 
 policy/modules/services/ksmtuned.te       |   13 
 policy/modules/services/ldap.fc           |    5 
 policy/modules/services/ldap.if           |   81 +
 policy/modules/services/ldap.te           |   13 
 policy/modules/services/lircd.te          |    3 
 policy/modules/services/memcached.if      |    1 
 policy/modules/services/milter.if         |   20 
 policy/modules/services/mock.fc           |    6 
 policy/modules/services/mock.if           |  238 ++++
 policy/modules/services/mock.te           |   98 +
 policy/modules/services/modemmanager.te   |    8 
 policy/modules/services/mpd.fc            |   10 
 policy/modules/services/mpd.if            |  274 ++++
 policy/modules/services/mpd.te            |  110 +
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   34 
 policy/modules/services/mta.te            |   28 
 policy/modules/services/munin.if          |   18 
 policy/modules/services/munin.te          |   17 
 policy/modules/services/mysql.te          |    3 
 policy/modules/services/nagios.if         |   20 
 policy/modules/services/nagios.te         |    8 
 policy/modules/services/networkmanager.fc |    4 
 policy/modules/services/networkmanager.if |   68 +
 policy/modules/services/networkmanager.te |   25 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   27 
 policy/modules/services/nslcd.te          |    2 
 policy/modules/services/ntp.te            |    3 
 policy/modules/services/nut.te            |    4 
 policy/modules/services/nx.if             |    1 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.fc         |    1 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/oident.te         |    1 
 policy/modules/services/openvpn.te        |    7 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/piranha.fc        |   21 
 policy/modules/services/piranha.if        |  175 +++
 policy/modules/services/piranha.te        |  181 +++
 policy/modules/services/plymouthd.te      |    5 
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   86 +
 policy/modules/services/portreserve.fc    |    3 
 policy/modules/services/portreserve.if    |   55 
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    3 
 policy/modules/services/postfix.if        |  152 ++
 policy/modules/services/postfix.te        |   56 
 policy/modules/services/ppp.te            |    4 
 policy/modules/services/procmail.fc       |    2 
 policy/modules/services/procmail.te       |   17 
 policy/modules/services/psad.if           |   22 
 policy/modules/services/psad.te           |    1 
 policy/modules/services/puppet.te         |    2 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/qpidd.fc          |    9 
 policy/modules/services/qpidd.if          |  236 ++++
 policy/modules/services/qpidd.te          |   59 +
 policy/modules/services/radius.te         |    2 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    2 
 policy/modules/services/rgmanager.if      |   61 +
 policy/modules/services/rgmanager.te      |   17 
 policy/modules/services/rhcs.if           |   61 +
 policy/modules/services/rhcs.te           |   25 
 policy/modules/services/ricci.fc          |    3 
 policy/modules/services/ricci.if          |   62 +
 policy/modules/services/ricci.te          |    9 
 policy/modules/services/rlogin.fc         |    3 
 policy/modules/services/rlogin.te         |    1 
 policy/modules/services/rpc.if            |   21 
 policy/modules/services/rpc.te            |   14 
 policy/modules/services/rpcbind.if        |    2 
 policy/modules/services/rpcbind.te        |    4 
 policy/modules/services/rsync.if          |   47 
 policy/modules/services/rsync.te          |   26 
 policy/modules/services/rtkit.if          |   21 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  106 +
 policy/modules/services/samba.te          |   44 
 policy/modules/services/sasl.te           |    3 
 policy/modules/services/sendmail.fc       |    2 
 policy/modules/services/sendmail.if       |   65 +
 policy/modules/services/sendmail.te       |   15 
 policy/modules/services/setroubleshoot.if |   23 
 policy/modules/services/setroubleshoot.te |   16 
 policy/modules/services/smartmon.te       |    2 
 policy/modules/services/smokeping.te      |    2 
 policy/modules/services/snmp.te           |    3 
 policy/modules/services/snort.te          |    2 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |  107 +
 policy/modules/services/spamassassin.te   |  147 ++
 policy/modules/services/ssh.fc            |    8 
 policy/modules/services/ssh.if            |   64 -
 policy/modules/services/ssh.te            |   64 -
 policy/modules/services/sssd.te           |    3 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.if           |   49 
 policy/modules/services/tftp.te           |    4 
 policy/modules/services/tgtd.te           |    4 
 policy/modules/services/tor.te            |    2 
 policy/modules/services/tuned.te          |    5 
 policy/modules/services/ucspitcp.te       |    5 
 policy/modules/services/usbmuxd.fc        |    2 
 policy/modules/services/varnishd.if       |   19 
 policy/modules/services/vhostmd.if        |    2 
 policy/modules/services/vhostmd.te        |    2 
 policy/modules/services/virt.fc           |    7 
 policy/modules/services/virt.if           |   79 +
 policy/modules/services/virt.te           |  199 +++
 policy/modules/services/w3c.te            |    9 
 policy/modules/services/xserver.fc        |   61 -
 policy/modules/services/xserver.if        |  451 +++++++
 policy/modules/services/xserver.te        |  423 ++++++-
 policy/modules/services/zabbix.te         |    2 
 policy/modules/services/zarafa.fc         |   27 
 policy/modules/services/zarafa.if         |  105 +
 policy/modules/services/zarafa.te         |  133 ++
 policy/modules/system/application.te      |   16 
 policy/modules/system/authlogin.fc        |    1 
 policy/modules/system/authlogin.if        |   56 
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/daemontools.if      |   62 +
 policy/modules/system/daemontools.te      |   26 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   12 
 policy/modules/system/getty.te            |    2 
 policy/modules/system/hostname.te         |    7 
 policy/modules/system/hotplug.te          |    3 
 policy/modules/system/init.fc             |    3 
 policy/modules/system/init.if             |  148 ++
 policy/modules/system/init.te             |  207 +++
 policy/modules/system/ipsec.fc            |    1 
 policy/modules/system/ipsec.if            |   76 +
 policy/modules/system/ipsec.te            |   50 
 policy/modules/system/iptables.fc         |    6 
 policy/modules/system/iptables.if         |    4 
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   18 
 policy/modules/system/iscsi.te            |    2 
 policy/modules/system/libraries.fc        |  155 ++
 policy/modules/system/libraries.te        |    8 
 policy/modules/system/locallogin.te       |   40 
 policy/modules/system/logging.fc          |   16 
 policy/modules/system/logging.if          |   43 
 policy/modules/system/logging.te          |   35 
 policy/modules/system/lvm.fc              |    2 
 policy/modules/system/lvm.te              |   21 
 policy/modules/system/miscfiles.fc        |    6 
 policy/modules/system/miscfiles.if        |    3 
 policy/modules/system/modutils.if         |   20 
 policy/modules/system/modutils.te         |   14 
 policy/modules/system/mount.fc            |    8 
 policy/modules/system/mount.if            |  163 ++
 policy/modules/system/mount.te            |  152 ++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  330 +++++
 policy/modules/system/selinuxutil.te      |  236 +---
 policy/modules/system/setrans.te          |    1 
 policy/modules/system/sosreport.fc        |    2 
 policy/modules/system/sosreport.if        |  131 ++
 policy/modules/system/sosreport.te        |  154 ++
 policy/modules/system/sysnetwork.fc       |    2 
 policy/modules/system/sysnetwork.if       |  190 ++-
 policy/modules/system/sysnetwork.te       |   27 
 policy/modules/system/udev.fc             |    1 
 policy/modules/system/udev.te             |   13 
 policy/modules/system/unconfined.fc       |   14 
 policy/modules/system/unconfined.if       |  440 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |   12 
 policy/modules/system/userdomain.if       | 1707 ++++++++++++++++++++++++------
 policy/modules/system/userdomain.te       |   33 
 policy/modules/system/xen.fc              |    2 
 policy/modules/system/xen.if              |   23 
 policy/modules/system/xen.te              |   97 -
 policy/support/misc_patterns.spt          |    8 
 policy/support/obj_perm_sets.spt          |   38 
 policy/users                              |   15 
 406 files changed, 19016 insertions(+), 2004 deletions(-)

Index: policy-F14.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F14.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- policy-F14.patch	28 Jun 2010 17:17:09 -0000	1.16
+++ policy-F14.patch	28 Jun 2010 21:27:05 -0000	1.17
@@ -22073,7 +22073,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /var/vdsm(/.*)?			gen_context(system_u:object_r:virt_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.8.6/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2010-03-23 10:55:15.000000000 -0400
-+++ serefpolicy-3.8.6/policy/modules/services/virt.if	2010-06-25 15:32:58.000000000 -0400
++++ serefpolicy-3.8.6/policy/modules/services/virt.if	2010-06-28 17:16:24.000000000 -0400
 @@ -21,6 +21,7 @@
  	type $1_t, virt_domain;
  	domain_type($1_t)
@@ -22220,8 +22220,16 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.8.6/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2010-06-18 13:07:19.000000000 -0400
-+++ serefpolicy-3.8.6/policy/modules/services/virt.te	2010-06-25 15:28:29.000000000 -0400
-@@ -50,12 +50,12 @@
++++ serefpolicy-3.8.6/policy/modules/services/virt.te	2010-06-28 17:20:07.000000000 -0400
+@@ -4,6 +4,7 @@
+ #
+ # Declarations
+ #
++attribute virsh_transition_domain;
+ 
+ ## <desc>
+ ## <p>
+@@ -50,12 +51,12 @@
  virt_domain_template(svirt)
  role system_r types svirt_t;
  
@@ -22237,7 +22245,7 @@ diff --exclude-from=exclude -N -u -r nsa
  type virt_etc_t;
  files_config_file(virt_etc_t)
  
-@@ -71,8 +71,12 @@
+@@ -71,8 +72,12 @@
  virt_image(virt_content_t)
  userdom_user_home_content(virt_content_t)
  
@@ -22250,7 +22258,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  type virt_var_run_t;
  files_pid_file(virt_var_run_t)
-@@ -89,6 +93,11 @@
+@@ -89,6 +94,11 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -22262,7 +22270,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ifdef(`enable_mcs',`
  	init_ranged_daemon_domain(virtd_t, virtd_exec_t, s0 - mcs_systemhigh)
  ')
-@@ -104,15 +113,12 @@
+@@ -104,15 +114,12 @@
  
  allow svirt_t self:udp_socket create_socket_perms;
  
@@ -22279,7 +22287,7 @@ diff --exclude-from=exclude -N -u -r nsa
  fs_hugetlbfs_filetrans(svirt_t, svirt_image_t, file)
  
  list_dirs_pattern(svirt_t, virt_content_t, virt_content_t)
-@@ -160,6 +166,7 @@
+@@ -160,6 +167,7 @@
  
  tunable_policy(`virt_use_usb',`
  	dev_rw_usbfs(svirt_t)
@@ -22287,7 +22295,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	fs_manage_dos_dirs(svirt_t)
  	fs_manage_dos_files(svirt_t)
  ')
-@@ -178,22 +185,29 @@
+@@ -178,22 +186,29 @@
  #
  
  allow virtd_t self:capability { chown dac_override fowner ipc_lock kill mknod net_admin net_raw setpcap setuid setgid sys_admin sys_nice sys_ptrace };
@@ -22320,7 +22328,7 @@ diff --exclude-from=exclude -N -u -r nsa
  read_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  
-@@ -204,9 +218,15 @@
+@@ -204,9 +219,15 @@
  
  manage_files_pattern(virtd_t, virt_image_type, virt_image_type)
  manage_blk_files_pattern(virtd_t, virt_image_type, virt_image_type)
@@ -22336,7 +22344,7 @@ diff --exclude-from=exclude -N -u -r nsa
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
  logging_log_filetrans(virtd_t, virt_log_t, { file dir })
-@@ -247,18 +267,25 @@
+@@ -247,18 +268,25 @@
  dev_rw_kvm(virtd_t)
  dev_getattr_all_chr_files(virtd_t)
  dev_rw_mtrr(virtd_t)
@@ -22363,7 +22371,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  fs_list_auto_mountpoints(virtd_t)
  fs_getattr_xattr_fs(virtd_t)
-@@ -267,6 +294,15 @@
+@@ -267,6 +295,15 @@
  fs_manage_cgroup_dirs(virtd_t)
  fs_rw_cgroup_files(virtd_t)
  
@@ -22379,7 +22387,7 @@ diff --exclude-from=exclude -N -u -r nsa
  mcs_process_set_categories(virtd_t)
  
  storage_manage_fixed_disk(virtd_t)
-@@ -290,15 +326,22 @@
+@@ -290,15 +327,22 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -22402,7 +22410,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -369,6 +412,7 @@
+@@ -369,6 +413,7 @@
  	qemu_signal(virtd_t)
  	qemu_kill(virtd_t)
  	qemu_setsched(virtd_t)
@@ -22410,7 +22418,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -406,6 +450,19 @@
+@@ -406,6 +451,19 @@
  allow virt_domain self:unix_dgram_socket { create_socket_perms sendto };
  allow virt_domain self:tcp_socket create_stream_socket_perms;
  
@@ -22430,7 +22438,7 @@ diff --exclude-from=exclude -N -u -r nsa
  append_files_pattern(virt_domain, virt_log_t, virt_log_t)
  
  append_files_pattern(virt_domain, virt_var_lib_t, virt_var_lib_t)
-@@ -426,6 +483,7 @@
+@@ -426,6 +484,7 @@
  corenet_tcp_bind_virt_migration_port(virt_domain)
  corenet_tcp_connect_virt_migration_port(virt_domain)
  
@@ -22438,7 +22446,7 @@ diff --exclude-from=exclude -N -u -r nsa
  dev_read_rand(virt_domain)
  dev_read_sound(virt_domain)
  dev_read_urand(virt_domain)
-@@ -433,6 +491,7 @@
+@@ -433,6 +492,7 @@
  dev_rw_ksm(virt_domain)
  dev_rw_kvm(virt_domain)
  dev_rw_qemu(virt_domain)
@@ -22446,7 +22454,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  domain_use_interactive_fds(virt_domain)
  
-@@ -444,6 +503,11 @@
+@@ -444,6 +504,11 @@
  fs_getattr_tmpfs(virt_domain)
  fs_rw_anon_inodefs_files(virt_domain)
  fs_rw_tmpfs_files(virt_domain)
@@ -22458,7 +22466,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  term_use_all_terms(virt_domain)
  term_getattr_pty_fs(virt_domain)
-@@ -461,8 +525,122 @@
+@@ -461,8 +526,120 @@
  ')
  
  optional_policy(`
@@ -22491,14 +22499,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +allow virsh_t self:unix_stream_socket { create_stream_socket_perms connectto };
 +allow virsh_t self:tcp_socket create_stream_socket_perms;
 +
-+manage_files_pattern(virsh_t, xend_var_lib_t, xend_var_lib_t)
-+manage_fifo_files_pattern(virsh_t, xend_var_lib_t, xend_var_lib_t)
-+manage_sock_files_pattern(virsh_t, xend_var_lib_t, xend_var_lib_t)
-+files_search_var_lib(virsh_t)
-+
-+allow virsh_t xen_image_t:dir rw_dir_perms;
-+allow virsh_t xen_image_t:file read_file_perms;
-+allow virsh_t xen_image_t:blk_file read_blk_file_perms;
++manage_files_pattern(virsh_t, virt_image_type, virt_image_type)
++manage_blk_files_pattern(virsh_t, virt_image_type, virt_image_type)
++manage_lnk_files_pattern(virsh_t, virt_image_type, virt_image_type)
 +
 +dontaudit virsh_t virt_var_lib_t:file read_inherited_file_perms;
 +
@@ -22541,9 +22544,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +sysnet_dns_name_resolve(virsh_t)
 +
-+xen_append_log(virsh_t)
-+xen_stream_connect(virsh_t)
-+xen_stream_connect_xenstore(virsh_t)
++optional_policy(`
++	xen_manage_image_dirs(virsh_t)
++	xen_append_log(virsh_t)
++	xen_stream_connect(virsh_t)
++	xen_stream_connect_xenstore(virsh_t)
++')
 +
 +optional_policy(`
 +	dbus_system_bus_client(virsh_t)
@@ -32105,21 +32111,48 @@ diff --exclude-from=exclude -N -u -r nsa
  ifdef(`distro_debian',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.8.6/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2010-03-23 10:55:15.000000000 -0400
-+++ serefpolicy-3.8.6/policy/modules/system/xen.if	2010-06-21 10:53:58.000000000 -0400
-@@ -213,8 +213,9 @@
++++ serefpolicy-3.8.6/policy/modules/system/xen.if	2010-06-28 17:17:26.000000000 -0400
+@@ -87,6 +87,26 @@
+ ## 	</summary>
+ ## </param>
+ #
++interface(`xen_manage_image_dirs',`
++	gen_require(`
++		type xend_var_lib_t;
++	')
++
++	files_list_var_lib($1)
++	manage_dirs_pattern($1, xend_var_lib_t, xend_var_lib_t)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to read/write
++##	xend image files.
++## </summary>
++## <param name="domain">
++## 	<summary>
++##	Domain allowed to transition.
++## 	</summary>
++## </param>
++#
+ interface(`xen_rw_image_files',`
+ 	gen_require(`
+ 		type xen_image_t, xend_var_lib_t;
+@@ -213,8 +233,9 @@
  interface(`xen_domtrans_xm',`
  	gen_require(`
  		type xm_t, xm_exec_t;
-+		attribute xm_transition_domain;
++		attribute virsh_transition_domain;
  	')
 -
-+	typeattribute $1 xm_transition_domain;
++	typeattribute $1 virsh_transition_domain;
  	domtrans_pattern($1, xm_exec_t, xm_t)
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.8.6/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2010-06-18 13:07:19.000000000 -0400
-+++ serefpolicy-3.8.6/policy/modules/system/xen.te	2010-06-22 09:24:13.000000000 -0400
++++ serefpolicy-3.8.6/policy/modules/system/xen.te	2010-06-28 17:16:48.000000000 -0400
 @@ -4,6 +4,7 @@
  #
  # Declarations
@@ -32128,7 +32161,15 @@ diff --exclude-from=exclude -N -u -r nsa
  
  ## <desc>
  ## <p>
-@@ -89,11 +90,6 @@
+@@ -34,6 +35,7 @@
+ files_type(xen_image_t)
+ # xen_image_t can be assigned to blk devices
+ dev_node(xen_image_t)
++virt_image(xen_image_t)
+ 
+ type xenctl_t;
+ files_type(xenctl_t)
+@@ -89,11 +91,6 @@
  type xenconsoled_var_run_t;
  files_pid_file(xenconsoled_var_run_t)
  
@@ -32140,7 +32181,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #######################################
  #
  # evtchnd local policy
-@@ -346,6 +342,7 @@
+@@ -346,6 +343,7 @@
  
  files_read_usr_files(xenstored_t)
  
@@ -32148,7 +32189,7 @@ diff --exclude-from=exclude -N -u -r nsa
  fs_manage_xenfs_files(xenstored_t)
  
  storage_raw_read_fixed_disk(xenstored_t)
-@@ -366,98 +363,9 @@
+@@ -366,98 +364,9 @@
  
  ########################################
  #



More information about the scm-commits mailing list