[selinux-policy] Remove qemu.pp, everything should use svirt_t or stay in its current domain
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Oct 26 19:42:34 UTC 2011
commit b4b0268a28eddb181c678e979340b94d92a63b2f
Author: Dan Walsh <dwalsh at redhat.com>
Date: Wed Oct 26 15:42:29 2011 -0400
Remove qemu.pp, everything should use svirt_t or stay in its current domain
modules-mls.conf | 7 ----
modules-targeted.conf | 7 ----
qemu.patch | 89 +++++++++++++++++++++++++++++++++++++++++++++++++
selinux-policy.spec | 11 ++++--
4 files changed, 97 insertions(+), 17 deletions(-)
---
diff --git a/modules-mls.conf b/modules-mls.conf
index 51c3d97..1c6e4bf 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -1606,13 +1606,6 @@ xen = module
#
virt = module
-# Layer: apps
-# Module: qemu
-#
-# Virtualization emulator
-#
-qemu = module
-
# Layer: system
# Module: brctl
#
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 516c185..ddcda07 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1943,13 +1943,6 @@ virt = module
#
vnstatd = module
-# Layer: apps
-# Module: qemu
-#
-# Virtualization emulator
-#
-qemu = module
-
# Layer: system
# Module: brctl
#
diff --git a/qemu.patch b/qemu.patch
new file mode 100644
index 0000000..32decbe
--- /dev/null
+++ b/qemu.patch
@@ -0,0 +1,89 @@
+diff -up serefpolicy-3.10.0/policy/modules/apps/qemu.te.qemu serefpolicy-3.10.0/policy/modules/apps/qemu.te
+--- serefpolicy-3.10.0/policy/modules/apps/qemu.te.qemu 2011-10-26 10:41:20.413408329 -0400
++++ serefpolicy-3.10.0/policy/modules/apps/qemu.te 2011-10-26 10:41:21.207408907 -0400
+@@ -40,9 +40,7 @@ gen_tunable(qemu_use_nfs, true)
+ ## </desc>
+ gen_tunable(qemu_use_usb, true)
+
+-type qemu_exec_t;
+ virt_domain_template(qemu)
+-application_domain(qemu_t, qemu_exec_t)
+ role system_r types qemu_t;
+
+ ########################################
+diff -up serefpolicy-3.10.0/policy/modules/services/virt.if.qemu serefpolicy-3.10.0/policy/modules/services/virt.if
+--- serefpolicy-3.10.0/policy/modules/services/virt.if.qemu 2011-10-26 10:41:21.180408888 -0400
++++ serefpolicy-3.10.0/policy/modules/services/virt.if 2011-10-26 10:41:21.208408908 -0400
+@@ -16,10 +16,11 @@ template(`virt_domain_template',`
+ attribute virt_image_type, virt_domain;
+ attribute virt_tmpfs_type;
+ attribute virt_ptynode;
++ type qemu_exec_t;
+ ')
+
+ type $1_t, virt_domain;
+- domain_type($1_t)
++ application_domain($1_t, qemu_exec_t)
+ domain_user_exemption_target($1_t)
+ mls_rangetrans_target($1_t)
+ mcs_untrusted_proc($1_t)
+@@ -848,3 +849,21 @@ template(`virt_lxc_domain_template',`
+ role system_r types $1_t;
+ ')
+
++########################################
++## <summary>
++## Execute a qemu_exec_t in the callers domain
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`virt_exec_qemu',`
++ gen_require(`
++ type qemu_exec_t;
++ ')
++
++ can_exec($1, qemu_exec_t)
++')
++
+diff -up serefpolicy-3.10.0/policy/modules/services/virt.te.qemu serefpolicy-3.10.0/policy/modules/services/virt.te
+--- serefpolicy-3.10.0/policy/modules/services/virt.te.qemu 2011-10-26 10:41:21.181408889 -0400
++++ serefpolicy-3.10.0/policy/modules/services/virt.te 2011-10-26 10:42:00.351437032 -0400
+@@ -78,6 +78,8 @@ attribute virt_domain;
+ attribute virt_image_type;
+ attribute virt_tmpfs_type;
+
++type qemu_exec_t;
++
+ type virt_cache_t alias svirt_cache_t;
+ files_type(virt_cache_t)
+
+@@ -279,6 +281,8 @@ allow virtd_t virt_domain:process { geta
+ allow virt_domain virtd_t:fd use;
+ dontaudit virt_domain virtd_t:unix_stream_socket { read write };
+
++can_exec(virt_domain, qemu_exec_t)
++
+ allow virtd_t qemu_var_run_t:file relabel_file_perms;
+ manage_dirs_pattern(virtd_t, qemu_var_run_t, qemu_var_run_t)
+ manage_files_pattern(virtd_t, qemu_var_run_t, qemu_var_run_t)
+@@ -514,16 +518,6 @@ optional_policy(`
+ ')
+
+ optional_policy(`
+- qemu_domtrans(virtd_t)
+- qemu_read_state(virtd_t)
+- qemu_signal(virtd_t)
+- qemu_kill(virtd_t)
+- qemu_setsched(virtd_t)
+- qemu_entry_type(virt_domain)
+- qemu_exec(virt_domain)
+-')
+-
+-optional_policy(`
+ sanlock_stream_connect(virtd_t)
+ ')
+
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 74b8f98..624b56b 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
Summary: SELinux policy configuration
Name: selinux-policy
Version: 3.10.0
-Release: 50%{?dist}
+Release: 50.1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: serefpolicy-%{version}.tgz
@@ -29,6 +29,7 @@ patch4: execmem.patch
patch5: userdomain.patch
patch6: apache.patch
patch7: ptrace.patch
+patch8: qemu.patch
Source1: modules-targeted.conf
Source2: booleans-targeted.conf
Source3: Makefile.devel
@@ -218,7 +219,7 @@ fi;
if [ -e /etc/selinux/%2/.rebuild ]; then \
rm /etc/selinux/%2/.rebuild; \
if [ %1 -ne 1 ]; then \
- /usr/sbin/semodule -n -s %2 -r ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd 2>/dev/null; \
+ /usr/sbin/semodule -n -s %2 -r ada qemu tzdata hal hotplug howl java mono moilscanner gamin audio_entropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd 2>/dev/null; \
fi \
/usr/sbin/semodule -B -s %2; \
else \
@@ -249,6 +250,7 @@ Based off of reference policy: Checked out revision 2.20091117
%patch5 -p1 -b .userdomain
%patch6 -p1 -b .apache
%patch7 -p1 -b .ptrace
+%patch8 -p1 -b .qemu
%install
mkdir selinux_config
@@ -480,7 +482,10 @@ SELinux Reference policy mls base module.
%endif
%changelog
-* Wed Oct 25 2011 Miroslav Grepl <mgrepl at redhat.com> 3.10.0-50
+* Wed Oct 26 2011 Dan Walsh <dwalsh at redhat.com> 3.10.0-50.1
+- Remove qemu.pp, everything should use svirt_t or stay in its current domain
+
+* Wed Oct 26 2011 Miroslav Grepl <mgrepl at redhat.com> 3.10.0-50
- Allow policykit to talk to the systemd via dbus
- Move chrome_sandbox_nacl_t to permissive domains
- Additional rules for chrome_sandbox_nacl
More information about the scm-commits
mailing list