e966055
diff -up serefpolicy-3.10.0/policy/modules/kernel/devices.if.systemd serefpolicy-3.10.0/policy/modules/kernel/devices.if
e966055
--- serefpolicy-3.10.0/policy/modules/kernel/devices.if.systemd	2012-01-13 12:21:08.578666030 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/kernel/devices.if	2012-01-13 12:21:08.678669095 -0500
86d3f66
@@ -143,13 +143,13 @@ interface(`dev_relabel_all_dev_nodes',`
86d3f66
 		type device_t;
86d3f66
 	')
86d3f66
 
86d3f66
-	relabelfrom_dirs_pattern($1, device_t, device_node)
86d3f66
-	relabelfrom_files_pattern($1, device_t, device_node)
86d3f66
-	relabelfrom_lnk_files_pattern($1, device_t, { device_t device_node })
86d3f66
-	relabel_fifo_files_pattern($1, device_t,  { device_t device_node })
86d3f66
-	relabel_sock_files_pattern($1, device_t, { device_t device_node })
86d3f66
-	relabel_blk_files_pattern($1, device_t, { device_t device_node })
86d3f66
-	relabel_chr_files_pattern($1, device_t, { device_t device_node })
86d3f66
+	relabel_dirs_pattern($1, device_t, device_node)
86d3f66
+	relabel_files_pattern($1, device_t, device_node)
86d3f66
+	relabel_lnk_files_pattern($1, device_t, device_node)
86d3f66
+	relabel_fifo_files_pattern($1, device_t,  device_node)
86d3f66
+	relabel_sock_files_pattern($1, device_t, device_node)
86d3f66
+	relabel_blk_files_pattern($1, device_t, device_node)
86d3f66
+	relabel_chr_files_pattern($1, device_t, device_node)
86d3f66
 ')
86d3f66
 
86d3f66
 ########################################
ba7c7ae
@@ -4201,6 +4201,27 @@ interface(`dev_read_cpu_online',`
86d3f66
 
86d3f66
 ########################################
86d3f66
 ## <summary>
86d3f66
+##	Relabel cpu online hardware state information.
86d3f66
+## </summary>
86d3f66
+## <param name="domain">
86d3f66
+##	<summary>
86d3f66
+##	Domain allowed access.
86d3f66
+##	</summary>
86d3f66
+## </param>
86d3f66
+#
ba7c7ae
+interface(`dev_relabel_cpu_online',`
86d3f66
+	gen_require(`
86d3f66
+		type cpu_online_t;
86d3f66
+		type sysfs_t;
86d3f66
+	')
86d3f66
+
86d3f66
+	dev_search_sysfs($1)
86d3f66
+	allow $1 cpu_online_t:file relabel;
86d3f66
+')
86d3f66
+
86d3f66
+
86d3f66
+########################################
86d3f66
+## <summary>
86d3f66
 ##	Read hardware state information.
86d3f66
 ## </summary>
86d3f66
 ## <desc>
e966055
@@ -4269,6 +4290,26 @@ interface(`dev_relabel_sysfs_dirs',`
e966055
 ')
86d3f66
 
86d3f66
 ########################################
e966055
+## <summary>
86d3f66
+##	Relabel hardware state files
86d3f66
+## </summary>
86d3f66
+## <param name="domain">
86d3f66
+##	<summary>
86d3f66
+##	Domain allowed access.
86d3f66
+##	</summary>
86d3f66
+## </param>
86d3f66
+#
86d3f66
+interface(`dev_relabel_all_sysfs',`
86d3f66
+	gen_require(`
86d3f66
+		type sysfs_t;
86d3f66
+	')
86d3f66
+
86d3f66
+	relabel_dirs_pattern($1, sysfs_t, sysfs_t)
86d3f66
+	relabel_files_pattern($1, sysfs_t, sysfs_t)
86d3f66
+	relabel_lnk_files_pattern($1, sysfs_t, sysfs_t)
86d3f66
+')
86d3f66
+
86d3f66
+########################################
e966055
 ## <summary>
86d3f66
 ##	Allow caller to modify hardware state information.
86d3f66
 ## </summary>
e966055
diff -up serefpolicy-3.10.0/policy/modules/roles/staff.te.systemd serefpolicy-3.10.0/policy/modules/roles/staff.te
e966055
--- serefpolicy-3.10.0/policy/modules/roles/staff.te.systemd	2012-01-13 12:21:08.586666274 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/roles/staff.te	2012-01-13 12:21:08.678669095 -0500
86d3f66
@@ -70,6 +70,10 @@ optional_policy(`
86d3f66
 ')
86d3f66
 
86d3f66
 optional_policy(`
86d3f66
+	bluetooth_role(staff_r, staff_t)
86d3f66
+')
86d3f66
+
86d3f66
+optional_policy(`
86d3f66
 	dbadm_role_change(staff_r)
86d3f66
 ')
86d3f66
 
86d3f66
@@ -238,10 +242,6 @@ ifndef(`distro_redhat',`
86d3f66
 	')
86d3f66
 
86d3f66
 	optional_policy(`
86d3f66
-		bluetooth_role(staff_r, staff_t)
86d3f66
-	')
86d3f66
-
86d3f66
-	optional_policy(`
86d3f66
 		cdrecord_role(staff_r, staff_t)
86d3f66
 	')
86d3f66
 
e966055
diff -up serefpolicy-3.10.0/policy/modules/roles/unprivuser.te.systemd serefpolicy-3.10.0/policy/modules/roles/unprivuser.te
e966055
--- serefpolicy-3.10.0/policy/modules/roles/unprivuser.te.systemd	2012-01-13 12:21:08.586666274 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/roles/unprivuser.te	2012-01-13 12:21:08.678669095 -0500
86d3f66
@@ -35,6 +35,10 @@ optional_policy(`
86d3f66
 ')
86d3f66
 
86d3f66
 optional_policy(`
86d3f66
+	bluetooth_role(user_r, user_t)
86d3f66
+')
86d3f66
+
86d3f66
+optional_policy(`
86d3f66
 	colord_dbus_chat(user_t)
86d3f66
 ')
86d3f66
 
e966055
diff -up serefpolicy-3.10.0/policy/modules/services/apache.fc.systemd serefpolicy-3.10.0/policy/modules/services/apache.fc
e966055
--- serefpolicy-3.10.0/policy/modules/services/apache.fc.systemd	2012-01-13 12:21:08.589666367 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/services/apache.fc	2012-01-13 12:21:08.678669095 -0500
cd25a7a
@@ -140,6 +140,8 @@ ifdef(`distro_debian', `
cd25a7a
 
cd25a7a
 /var/www/gallery/albums(/.*)?		gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
cd25a7a
 
cd25a7a
+/var/www/moodledata(/.*)?		gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
cd25a7a
+
cd25a7a
 /var/www/svn(/.*)?			gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
cd25a7a
 /var/www/svn/hooks(/.*)?		gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
cd25a7a
 /var/www/svn/conf(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
e966055
diff -up serefpolicy-3.10.0/policy/modules/services/blueman.te.systemd serefpolicy-3.10.0/policy/modules/services/blueman.te
e966055
--- serefpolicy-3.10.0/policy/modules/services/blueman.te.systemd	2012-01-13 12:21:08.594666519 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/services/blueman.te	2012-01-13 12:21:08.679669126 -0500
86d3f66
@@ -36,3 +36,7 @@ miscfiles_read_localization(blueman_t)
86d3f66
 optional_policy(`
86d3f66
 	avahi_domtrans(blueman_t)
86d3f66
 ')
86d3f66
+
86d3f66
+optional_policy(`
86d3f66
+	gnome_search_gconf(blueman_t)
86d3f66
+')
e966055
diff -up serefpolicy-3.10.0/policy/modules/services/entropyd.te.systemd serefpolicy-3.10.0/policy/modules/services/entropyd.te
e966055
--- serefpolicy-3.10.0/policy/modules/services/entropyd.te.systemd	2012-01-13 12:21:08.609666980 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/services/entropyd.te	2012-01-13 12:21:08.679669126 -0500
86d3f66
@@ -52,6 +52,8 @@ domain_use_interactive_fds(entropyd_t)
86d3f66
 
86d3f66
 logging_send_syslog_msg(entropyd_t)
86d3f66
 
86d3f66
+auth_use_nsswitch(entropyd_t)
86d3f66
+
86d3f66
 miscfiles_read_localization(entropyd_t)
86d3f66
 
86d3f66
 userdom_dontaudit_use_unpriv_user_fds(entropyd_t)
e966055
diff -up serefpolicy-3.10.0/policy/modules/services/virt.fc.systemd serefpolicy-3.10.0/policy/modules/services/virt.fc
e966055
--- serefpolicy-3.10.0/policy/modules/services/virt.fc.systemd	2012-01-13 12:21:08.653668329 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/services/virt.fc	2012-01-13 12:21:08.679669126 -0500
e966055
@@ -49,3 +49,7 @@ HOME_DIR/VirtualMachines/isos(/.*)? gen_
86d3f66
 
86d3f66
 # support for nova-stack
86d3f66
 /usr/bin/nova-compute       --  gen_context(system_u:object_r:virtd_exec_t,s0)
86d3f66
+/usr/bin/qemu		--	gen_context(system_u:object_r:qemu_exec_t,s0)
86d3f66
+/usr/bin/qemu-system-.*	--	gen_context(system_u:object_r:qemu_exec_t,s0)
86d3f66
+/usr/bin/qemu-kvm	--	gen_context(system_u:object_r:qemu_exec_t,s0)
86d3f66
+/usr/libexec/qemu.*	--	gen_context(system_u:object_r:qemu_exec_t,s0)
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/init.te.systemd serefpolicy-3.10.0/policy/modules/system/init.te
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/logging.fc.systemd serefpolicy-3.10.0/policy/modules/system/logging.fc
e966055
--- serefpolicy-3.10.0/policy/modules/system/logging.fc.systemd	2012-01-13 12:21:08.664668666 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/system/logging.fc	2012-01-13 12:21:11.123743804 -0500
86d3f66
@@ -61,6 +61,7 @@ ifdef(`distro_suse', `
86d3f66
 /var/log/spooler[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
86d3f66
 /var/log/audit(/.*)?		gen_context(system_u:object_r:auditd_log_t,mls_systemhigh)
86d3f66
 /var/log/syslog-ng(/.*)? 	gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
86d3f66
+/var/run/log(/.*)?		gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
86d3f66
 
86d3f66
 ifndef(`distro_gentoo',`
86d3f66
 /var/log/audit\.log	--	gen_context(system_u:object_r:auditd_log_t,mls_systemhigh)
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/logging.te.systemd serefpolicy-3.10.0/policy/modules/system/logging.te
e966055
--- serefpolicy-3.10.0/policy/modules/system/logging.te.systemd	2012-01-13 12:21:08.665668696 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/system/logging.te	2012-01-13 12:21:11.123743804 -0500
86d3f66
@@ -386,7 +386,7 @@ optional_policy(`
86d3f66
 # chown fsetid for syslog-ng
86d3f66
 # sys_admin for the integrated klog of syslog-ng and metalog
86d3f66
 # cjp: why net_admin!
86d3f66
-allow syslogd_t self:capability { dac_override sys_resource sys_tty_config ipc_lock net_admin sys_admin sys_nice chown fsetid };
86d3f66
+allow syslogd_t self:capability { dac_override sys_resource sys_tty_config ipc_lock net_admin sys_admin sys_nice chown fsetid setuid setgid };
86d3f66
 dontaudit syslogd_t self:capability sys_tty_config;
86d3f66
 allow syslogd_t self:capability2 syslog;
86d3f66
 # setpgid for metalog
e966055
@@ -474,6 +474,7 @@ tunable_policy(`logging_syslogd_can_send
86d3f66
 dev_filetrans(syslogd_t, devlog_t, sock_file)
86d3f66
 dev_read_sysfs(syslogd_t)
86d3f66
 dev_read_rand(syslogd_t)
86d3f66
+dev_read_urand(syslogd_t)
86d3f66
 # relating to systemd-kmsg-syslogd
86d3f66
 dev_write_kmsg(syslogd_t)
86d3f66
 
e966055
@@ -497,6 +498,7 @@ mls_file_write_all_levels(syslogd_t) # N
86d3f66
 term_write_console(syslogd_t)
86d3f66
 # Allow syslog to a terminal
86d3f66
 term_write_unallocated_ttys(syslogd_t)
86d3f66
+term_use_generic_ptys(syslogd_t)
86d3f66
 
86d3f66
 init_stream_connect(syslogd_t)
86d3f66
 # for sending messages to logged in users
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/sysnetwork.te.systemd serefpolicy-3.10.0/policy/modules/system/sysnetwork.te
e966055
--- serefpolicy-3.10.0/policy/modules/system/sysnetwork.te.systemd	2012-01-13 12:21:08.669668819 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/system/sysnetwork.te	2012-01-13 12:21:11.124743834 -0500
cd25a7a
@@ -150,6 +150,8 @@ term_dontaudit_use_all_ptys(dhcpc_t)
cd25a7a
 term_dontaudit_use_unallocated_ttys(dhcpc_t)
cd25a7a
 term_dontaudit_use_generic_ptys(dhcpc_t)
cd25a7a
 
cd25a7a
+auth_use_nsswitch(dhcpc_t)
cd25a7a
+
cd25a7a
 init_rw_utmp(dhcpc_t)
cd25a7a
 init_stream_connect(dhcpc_t)
cd25a7a
 init_stream_send(dhcpc_t)
cd25a7a
@@ -333,6 +335,7 @@ domain_use_interactive_fds(ifconfig_t)
cd25a7a
 
cd25a7a
 read_files_pattern(ifconfig_t, dhcpc_state_t, dhcpc_state_t)
cd25a7a
 
cd25a7a
+files_dontaudit_read_root_files(ifconfig_t)
cd25a7a
 files_read_etc_files(ifconfig_t)
cd25a7a
 files_read_etc_runtime_files(ifconfig_t)
cd25a7a
 files_read_usr_files(ifconfig_t)
cd25a7a
@@ -348,7 +351,7 @@ term_dontaudit_use_all_ptys(ifconfig_t)
cd25a7a
 term_dontaudit_use_ptmx(ifconfig_t)
cd25a7a
 term_dontaudit_use_generic_ptys(ifconfig_t)
cd25a7a
 
cd25a7a
-files_dontaudit_read_root_files(ifconfig_t)
cd25a7a
+auth_use_nsswitch(ifconfig_t)
cd25a7a
 
cd25a7a
 init_use_fds(ifconfig_t)
cd25a7a
 init_use_script_ptys(ifconfig_t)
cd25a7a
@@ -359,7 +362,6 @@ logging_send_syslog_msg(ifconfig_t)
cd25a7a
 
cd25a7a
 miscfiles_read_localization(ifconfig_t)
cd25a7a
 
cd25a7a
-
cd25a7a
 seutil_use_runinit_fds(ifconfig_t)
cd25a7a
 
cd25a7a
 sysnet_dns_name_resolve(ifconfig_t)
cd25a7a
@@ -423,10 +425,6 @@ optional_policy(`
cd25a7a
 ')
cd25a7a
 
cd25a7a
 optional_policy(`
cd25a7a
-	nis_use_ypbind(ifconfig_t)
cd25a7a
-')
cd25a7a
-
cd25a7a
-optional_policy(`
cd25a7a
 	ppp_use_fds(ifconfig_t)
cd25a7a
 ')
cd25a7a
 
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/systemd.if.systemd serefpolicy-3.10.0/policy/modules/system/systemd.if
e966055
--- serefpolicy-3.10.0/policy/modules/system/systemd.if.systemd	2012-01-13 12:21:08.669668819 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/system/systemd.if	2012-01-13 12:21:11.124743834 -0500
cd25a7a
@@ -51,6 +51,9 @@ interface(`systemd_exec_systemctl',`
cd25a7a
 	init_list_pid_dirs($1)
cd25a7a
 	init_read_state($1)
cd25a7a
 	init_stream_send($1)
cd25a7a
+
cd25a7a
+	systemd_login_list_pid_dirs($1)
cd25a7a
+	systemd_login_read_pid_files($1)
cd25a7a
 ')
cd25a7a
 
cd25a7a
 #######################################
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/systemd.te.systemd serefpolicy-3.10.0/policy/modules/system/systemd.te
e966055
--- serefpolicy-3.10.0/policy/modules/system/systemd.te.systemd	2012-01-13 12:21:08.670668850 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/system/systemd.te	2012-01-13 12:21:11.124743834 -0500
86d3f66
@@ -111,6 +111,7 @@ init_dbus_chat(systemd_logind_t)
86d3f66
 init_dbus_chat_script(systemd_logind_t)
86d3f66
 init_read_script_state(systemd_logind_t)
86d3f66
 init_read_state(systemd_logind_t)
86d3f66
+init_rw_stream_sockets(systemd_logind_t)
86d3f66
 
86d3f66
 logging_send_syslog_msg(systemd_logind_t)
86d3f66
 
e966055
@@ -198,6 +199,8 @@ kernel_read_network_state(systemd_tmpfil
86d3f66
 files_delete_kernel_modules(systemd_tmpfiles_t)
86d3f66
 
86d3f66
 dev_write_kmsg(systemd_tmpfiles_t)
86d3f66
+dev_relabel_all_sysfs(systemd_tmpfiles_t)
86d3f66
+dev_read_cpu_online(systemd_tmpfiles_t)
86d3f66
 
86d3f66
 domain_obj_id_change_exemption(systemd_tmpfiles_t)
86d3f66
 
e966055
@@ -322,6 +325,8 @@ fs_getattr_cgroup_files(systemd_notify_t
86d3f66
 
86d3f66
 auth_use_nsswitch(systemd_notify_t)
86d3f66
 
86d3f66
+init_rw_stream_sockets(systemd_notify_t)
86d3f66
+
86d3f66
 miscfiles_read_localization(systemd_notify_t)
86d3f66
 
86d3f66
 optional_policy(`
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/udev.te.systemd serefpolicy-3.10.0/policy/modules/system/udev.te
e966055
--- serefpolicy-3.10.0/policy/modules/system/udev.te.systemd	2012-01-13 12:21:08.670668850 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/system/udev.te	2012-01-13 12:21:11.124743834 -0500
86d3f66
@@ -333,6 +333,7 @@ optional_policy(`
86d3f66
 	kernel_read_xen_state(udev_t)
86d3f66
 	xen_manage_log(udev_t)
86d3f66
 	xen_read_image_files(udev_t)
86d3f66
+	xen_stream_connect_xenstore(udev_t)
86d3f66
 ')
86d3f66
 
86d3f66
 optional_policy(`
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/xen.fc.systemd serefpolicy-3.10.0/policy/modules/system/xen.fc
e966055
--- serefpolicy-3.10.0/policy/modules/system/xen.fc.systemd	2012-01-13 12:21:08.673668943 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/system/xen.fc	2012-01-13 12:21:11.125743864 -0500
86d3f66
@@ -4,7 +4,7 @@
86d3f66
 /usr/sbin/evtchnd	--	gen_context(system_u:object_r:evtchnd_exec_t,s0)
86d3f66
 /usr/sbin/tapdisk	--	gen_context(system_u:object_r:blktap_exec_t,s0)
86d3f66
 
86d3f66
-/usr/lib/xen/bin/qemu-dm	-- gen_context(system_u:object_r:qemu_dm_exec_t,s0)
86d3f66
+#/usr/lib/xen/bin/qemu-dm	-- gen_context(system_u:object_r:qemu_dm_exec_t,s0)
86d3f66
 
86d3f66
 ifdef(`distro_debian',`
86d3f66
 /usr/lib/xen-[^/]*/bin/xenconsoled -- gen_context(system_u:object_r:xenconsoled_exec_t,s0)
e966055
diff -up serefpolicy-3.10.0/policy/modules/system/xen.te.systemd serefpolicy-3.10.0/policy/modules/system/xen.te
e966055
--- serefpolicy-3.10.0/policy/modules/system/xen.te.systemd	2012-01-13 12:21:08.673668943 -0500
e966055
+++ serefpolicy-3.10.0/policy/modules/system/xen.te	2012-01-13 12:21:11.125743864 -0500
e966055
@@ -167,6 +167,10 @@ files_pid_filetrans(evtchnd_t, evtchnd_v
86d3f66
 #
86d3f66
 # qemu-dm local policy
86d3f66
 #
86d3f66
+
86d3f66
+# TODO: This part of policy should be removed
86d3f66
+#       qemu-dm should run in xend_t domain
86d3f66
+
86d3f66
 # Do we need to allow execution of qemu-dm?
86d3f66
 tunable_policy(`xend_run_qemu',`
86d3f66
 	allow qemu_dm_t self:capability sys_resource;
86d3f66
@@ -207,6 +211,11 @@ tunable_policy(`xend_run_qemu',`
86d3f66
 
86d3f66
 allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_admin sys_nice sys_tty_config net_raw };
86d3f66
 allow xend_t self:process { signal sigkill };
86d3f66
+
86d3f66
+# needed by qemu_dm
86d3f66
+allow xend_t self:capability sys_resource;
86d3f66
+allow xend_t self:process setrlimit;
86d3f66
+
86d3f66
 dontaudit xend_t self:process ptrace;
86d3f66
 # internal communication is often done using fifo and unix sockets.
86d3f66
 allow xend_t self:fifo_file rw_fifo_file_perms;
86d3f66
@@ -319,7 +328,6 @@ logging_send_syslog_msg(xend_t)
86d3f66
 miscfiles_read_localization(xend_t)
86d3f66
 miscfiles_read_hwdata(xend_t)
86d3f66
 
86d3f66
-
86d3f66
 sysnet_domtrans_dhcpc(xend_t)
86d3f66
 sysnet_signal_dhcpc(xend_t)
86d3f66
 sysnet_domtrans_ifconfig(xend_t)