##
@@ -26348,119 +25975,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
## Allow xdm logins as sysadm
##
##
-@@ -48,108 +53,107 @@
+@@ -48,6 +55,9 @@
##
gen_tunable(xserver_object_manager, false)
+attribute xdmhomewriter;
-+attribute input_xevent_type;
-+attribute xserver_unconfined_type;
- attribute x_domain;
--
--# X Events
+attribute x_userdomain;
-+attribute xproperty_type;
-+attribute xselection_type;
-+attribute xextension_type;
- attribute xevent_type;
--attribute input_xevent_type;
--type xevent_t, xevent_type;
--typealias xevent_t alias { user_property_xevent_t staff_property_xevent_t sysadm_property_xevent_t };
--typealias xevent_t alias { auditadm_property_xevent_t secadm_property_xevent_t };
--typealias xevent_t alias { user_focus_xevent_t staff_focus_xevent_t sysadm_focus_xevent_t };
--typealias xevent_t alias { auditadm_focus_xevent_t secadm_focus_xevent_t };
--typealias xevent_t alias { user_manage_xevent_t staff_manage_xevent_t sysadm_manage_xevent_t };
--typealias xevent_t alias { auditadm_manage_xevent_t secadm_manage_xevent_t };
--typealias xevent_t alias { user_default_xevent_t staff_default_xevent_t sysadm_default_xevent_t };
--typealias xevent_t alias { auditadm_default_xevent_t secadm_default_xevent_t };
-
-+type accelgraphics_xext_t, xextension_type;
- type client_xevent_t, xevent_type;
--typealias client_xevent_t alias { user_client_xevent_t staff_client_xevent_t sysadm_client_xevent_t };
--typealias client_xevent_t alias { auditadm_client_xevent_t secadm_client_xevent_t };
--
--type input_xevent_t, xevent_type, input_xevent_type;
--
--# X Extensions
--attribute xextension_type;
--type xextension_t, xextension_type;
--type security_xextension_t, xextension_type;
--
--# X Properties
--attribute xproperty_type;
--type xproperty_t, xproperty_type;
--type seclabel_xproperty_t, xproperty_type;
- type clipboard_xproperty_t, xproperty_type;
--
--# X Selections
--attribute xselection_type;
--type xselection_t, xselection_type;
- type clipboard_xselection_t, xselection_type;
--#type settings_xselection_t, xselection_type;
--#type dbus_xselection_t, xselection_type;
-+type debug_xext_t, xextension_type;
-+type directhw_xext_t alias disallowed_xext_t, xextension_type;
-+type focus_xevent_t, xevent_type;
-
--# X Drawables
--attribute xdrawable_type;
--attribute xcolormap_type;
--type root_xdrawable_t, xdrawable_type;
--type root_xcolormap_t, xcolormap_type;
-+type iceauth_t;
-+type iceauth_exec_t;
-+typealias iceauth_t alias { user_iceauth_t staff_iceauth_t sysadm_iceauth_t xguest_iceauth_t };
-+typealias iceauth_t alias { auditadm_iceauth_t secadm_iceauth_t };
-+application_domain(iceauth_t, iceauth_exec_t)
-+ubac_constrained(iceauth_t)
++
+ attribute x_domain;
--attribute xserver_unconfined_type;
-+type iceauth_home_t;
-+typealias iceauth_home_t alias { user_iceauth_home_t staff_iceauth_home_t sysadm_iceauth_home_t };
-+typealias iceauth_home_t alias { auditadm_iceauth_home_t secadm_iceauth_home_t xguest_iceauth_home_t };
-+files_poly_member(iceauth_home_t)
-+userdom_user_home_content(iceauth_home_t)
-
--xserver_object_types_template(root)
--xserver_object_types_template(user)
-+type info_xproperty_t, xproperty_type;
-+type input_xevent_t, xevent_type;
-+type manage_xevent_t, xevent_type;
-+type output_xext_t, xextension_type;
-+type property_xevent_t, xevent_type;
-+type remote_xclient_t;
-+
-+type rootwindow_t;
-+typealias rootwindow_t alias { user_rootwindow_t staff_rootwindow_t sysadm_rootwindow_t };
-+typealias rootwindow_t alias { auditadm_rootwindow_t secadm_rootwindow_t };
-+ubac_constrained(rootwindow_t)
-+
-+type screensaver_xext_t, xextension_type;
-+type security_xext_t, xextension_type;
-+type shmem_xext_t, xextension_type;
-+type std_xext_t, xextension_type;
-+type video_xext_t, xextension_type;
-+type unknown_xevent_t, xevent_type;
-
-+xserver_object_types_template(user)
- typealias user_xproperty_t alias { staff_xproperty_t sysadm_xproperty_t };
- typealias user_xproperty_t alias { auditadm_xproperty_t secadm_xproperty_t };
- typealias user_input_xevent_t alias { staff_input_xevent_t sysadm_input_xevent_t };
- typealias user_input_xevent_t alias { auditadm_input_xevent_t secadm_input_xevent_t };
--
--type remote_t;
--xserver_object_types_template(remote)
--xserver_common_x_domain_template(remote,remote_t)
-+typealias user_property_xevent_t alias { staff_property_xevent_t sysadm_property_xevent_t };
-+typealias user_property_xevent_t alias { auditadm_property_xevent_t secadm_property_xevent_t };
-+typealias user_focus_xevent_t alias { staff_focus_xevent_t sysadm_focus_xevent_t };
-+typealias user_focus_xevent_t alias { auditadm_focus_xevent_t secadm_focus_xevent_t };
-+typealias user_manage_xevent_t alias { staff_manage_xevent_t sysadm_manage_xevent_t };
-+typealias user_manage_xevent_t alias { auditadm_manage_xevent_t secadm_manage_xevent_t };
-+typealias user_default_xevent_t alias { staff_default_xevent_t sysadm_default_xevent_t };
-+typealias user_default_xevent_t alias { auditadm_default_xevent_t secadm_default_xevent_t };
-+typealias user_client_xevent_t alias { staff_client_xevent_t sysadm_client_xevent_t };
-+typealias user_client_xevent_t alias { auditadm_client_xevent_t secadm_client_xevent_t };
+ # X Events
+@@ -108,48 +118,48 @@
+ xserver_common_x_domain_template(remote,remote_t)
type user_fonts_t;
-typealias user_fonts_t alias { staff_fonts_t sysadm_fonts_t };
@@ -26481,22 +26007,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
typealias user_fonts_config_t alias { auditadm_fonts_config_t secadm_fonts_config_t };
userdom_user_home_content(user_fonts_config_t)
--type iceauth_t;
--type iceauth_exec_t;
+ type iceauth_t;
+ type iceauth_exec_t;
-typealias iceauth_t alias { user_iceauth_t staff_iceauth_t sysadm_iceauth_t };
--typealias iceauth_t alias { auditadm_iceauth_t secadm_iceauth_t };
--application_domain(iceauth_t, iceauth_exec_t)
--ubac_constrained(iceauth_t)
--
--type iceauth_home_t;
--typealias iceauth_home_t alias { user_iceauth_home_t staff_iceauth_home_t sysadm_iceauth_home_t };
++typealias iceauth_t alias { user_iceauth_t staff_iceauth_t sysadm_iceauth_t xguest_iceauth_t };
+ typealias iceauth_t alias { auditadm_iceauth_t secadm_iceauth_t };
+ application_domain(iceauth_t, iceauth_exec_t)
+ ubac_constrained(iceauth_t)
+
+ type iceauth_home_t;
+ typealias iceauth_home_t alias { user_iceauth_home_t staff_iceauth_home_t sysadm_iceauth_home_t };
-typealias iceauth_home_t alias { auditadm_iceauth_home_t secadm_iceauth_home_t };
--files_poly_member(iceauth_home_t)
--userdom_user_home_content(iceauth_home_t)
-+type xevent_t alias default_xevent_t, xevent_type;
-+type xext_t alias unknown_xext_t, xextension_type;
-+type xproperty_t alias default_xproperty_t, xproperty_type;
-+type xselection_t alias default_xselection_t, xselection_type;
++typealias iceauth_home_t alias { auditadm_iceauth_home_t secadm_iceauth_home_t xguest_iceauth_home_t };
+ files_poly_member(iceauth_home_t)
+ userdom_user_home_content(iceauth_home_t)
type xauth_t;
type xauth_exec_t;
@@ -26519,12 +26043,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
typealias xauth_tmp_t alias { auditadm_xauth_tmp_t secadm_xauth_tmp_t };
files_tmp_file(xauth_tmp_t)
ubac_constrained(xauth_tmp_t)
-@@ -165,15 +169,15 @@
- auth_login_pgm_domain(xdm_t)
- init_domain(xdm_t, xdm_exec_t)
+@@ -167,13 +177,15 @@
init_daemon_domain(xdm_t, xdm_exec_t)
--xserver_object_types_template(xdm)
--xserver_common_x_domain_template(xdm, xdm_t)
+ xserver_object_types_template(xdm)
+ xserver_common_x_domain_template(xdm, xdm_t)
-xserver_unconfined(xdm_t)
type xdm_lock_t;
@@ -26539,7 +26061,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
type xdm_var_lib_t;
files_type(xdm_var_lib_t)
-@@ -181,13 +185,21 @@
+@@ -181,13 +193,21 @@
type xdm_var_run_t;
files_pid_file(xdm_var_run_t)
@@ -26564,21 +26086,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
# type for /var/lib/xkb
type xkb_var_lib_t;
files_type(xkb_var_lib_t)
-@@ -197,18 +209,20 @@
- type xserver_exec_t;
- typealias xserver_t alias { user_xserver_t staff_xserver_t sysadm_xserver_t };
- typealias xserver_t alias { auditadm_xserver_t secadm_xserver_t xdm_xserver_t };
-+xserver_object_types_template(xdm)
-+xserver_common_x_domain_template(xdm, xdm_t)
+@@ -200,15 +220,15 @@
init_system_domain(xserver_t, xserver_exec_t)
ubac_constrained(xserver_t)
- type xserver_tmp_t;
+-type xserver_tmp_t;
-typealias xserver_tmp_t alias { user_xserver_tmp_t staff_xserver_tmp_t sysadm_xserver_tmp_t };
-+typealias xserver_tmp_t alias { xdm_tmp_t user_xserver_tmp_t staff_xserver_tmp_t sysadm_xserver_tmp_t ice_tmp_t };
- typealias xserver_tmp_t alias { auditadm_xserver_tmp_t secadm_xserver_tmp_t xdm_xserver_tmp_t };
- files_tmp_file(xserver_tmp_t)
- ubac_constrained(xserver_tmp_t)
+-typealias xserver_tmp_t alias { auditadm_xserver_tmp_t secadm_xserver_tmp_t xdm_xserver_tmp_t };
+-files_tmp_file(xserver_tmp_t)
+-ubac_constrained(xserver_tmp_t)
++type xdm_tmp_t;
++typealias xdm_tmp_t alias { xserver_tmp_t user_xserver_tmp_t staff_xserver_tmp_t sysadm_xserver_tmp_t ice_tmp_t };
++typealias xdm_tmp_t alias { auditadm_xserver_tmp_t secadm_xserver_tmp_t xdm_xserver_tmp_t };
++files_tmp_file(xdm_tmp_t)
++ubac_constrained(xdm_tmp_t)
type xserver_tmpfs_t;
-typealias xserver_tmpfs_t alias { user_xserver_tmpfs_t staff_xserver_tmpfs_t sysadm_xserver_tmpfs_t };
@@ -26588,15 +26109,37 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
files_tmpfs_file(xserver_tmpfs_t)
ubac_constrained(xserver_tmpfs_t)
-@@ -241,6 +255,7 @@
+@@ -238,9 +258,13 @@
+
+ allow xdm_t iceauth_home_t:file read_file_perms;
+
++dev_read_rand(iceauth_t)
++
fs_search_auto_mountpoints(iceauth_t)
userdom_use_user_terminals(iceauth_t)
+userdom_read_user_tmp_files(iceauth_t)
++userdom_read_all_users_state(iceauth_t)
tunable_policy(`use_nfs_home_dirs',`
fs_manage_nfs_files(iceauth_t)
-@@ -255,25 +270,31 @@
+@@ -250,30 +274,47 @@
+ fs_manage_cifs_files(iceauth_t)
+ ')
+
++ifdef(`hide_broken_symptoms', `
++ dev_dontaudit_rw_dri(iceauth_t)
++ dev_dontaudit_rw_generic_dev_nodes(iceauth_t)
++ fs_list_inotifyfs(iceauth_t)
++ term_dontaudit_use_unallocated_ttys(iceauth_t)
++
++ optional_policy(`
++ mozilla_dontaudit_rw_user_home_files(iceauth_t)
++ ')
++')
++
+ ########################################
+ #
# Xauth local policy
#
@@ -26632,7 +26175,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
fs_search_auto_mountpoints(xauth_t)
# cjp: why?
-@@ -283,6 +304,14 @@
+@@ -283,6 +324,14 @@
userdom_use_user_terminals(xauth_t)
userdom_read_user_tmp_files(xauth_t)
@@ -26647,7 +26190,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
xserver_rw_xdm_tmp_files(xauth_t)
-@@ -294,6 +323,15 @@
+@@ -294,6 +343,15 @@
fs_manage_cifs_files(xauth_t)
')
@@ -26663,7 +26206,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
optional_policy(`
ssh_sigchld(xauth_t)
ssh_read_pipes(xauth_t)
-@@ -305,20 +343,31 @@
+@@ -305,20 +363,31 @@
# XDM Local policy
#
@@ -26698,20 +26241,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
# Allow gdm to run gdm-binary
can_exec(xdm_t, xdm_exec_t)
-@@ -330,26 +379,43 @@
- # this is ugly, daemons should not create files under /etc!
- manage_files_pattern(xdm_t, xdm_rw_etc_t, xdm_rw_etc_t)
-
--manage_dirs_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
--manage_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
--manage_sock_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
--files_tmp_filetrans(xdm_t, xdm_tmp_t, { file dir sock_file })
-+manage_dirs_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
-+manage_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
-+manage_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
-+files_tmp_filetrans(xdm_t, xserver_tmp_t, { file dir sock_file })
-+relabelfrom_dirs_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
-+relabelfrom_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
+@@ -334,22 +403,39 @@
+ manage_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
+ manage_sock_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
+ files_tmp_filetrans(xdm_t, xdm_tmp_t, { file dir sock_file })
++relabelfrom_dirs_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
++relabelfrom_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
manage_dirs_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
manage_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
@@ -26749,7 +26284,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
allow xdm_t xserver_t:process signal;
allow xdm_t xserver_t:unix_stream_socket connectto;
-@@ -363,6 +429,7 @@
+@@ -363,6 +449,7 @@
allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
allow xdm_t xserver_t:shm rw_shm_perms;
@@ -26757,7 +26292,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
# connect to xdm xserver over stream socket
stream_connect_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t, xserver_t)
-@@ -371,10 +438,14 @@
+@@ -371,10 +458,14 @@
delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
@@ -26773,7 +26308,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
kernel_read_system_state(xdm_t)
kernel_read_kernel_sysctls(xdm_t)
-@@ -394,11 +465,13 @@
+@@ -394,11 +485,13 @@
corenet_udp_sendrecv_all_ports(xdm_t)
corenet_tcp_bind_generic_node(xdm_t)
corenet_udp_bind_generic_node(xdm_t)
@@ -26787,7 +26322,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
dev_read_rand(xdm_t)
dev_read_sysfs(xdm_t)
dev_getattr_framebuffer_dev(xdm_t)
-@@ -406,6 +479,7 @@
+@@ -406,6 +499,7 @@
dev_getattr_mouse_dev(xdm_t)
dev_setattr_mouse_dev(xdm_t)
dev_rw_apm_bios(xdm_t)
@@ -26795,7 +26330,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
dev_setattr_apm_bios_dev(xdm_t)
dev_rw_dri(xdm_t)
dev_rw_agp(xdm_t)
-@@ -418,14 +492,17 @@
+@@ -418,14 +512,17 @@
dev_setattr_video_dev(xdm_t)
dev_getattr_scanner_dev(xdm_t)
dev_setattr_scanner_dev(xdm_t)
@@ -26815,7 +26350,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
files_read_etc_files(xdm_t)
files_read_var_files(xdm_t)
-@@ -436,9 +513,15 @@
+@@ -436,9 +533,15 @@
files_read_usr_files(xdm_t)
# Poweroff wants to create the /poweroff file when run from xdm
files_create_boot_flag(xdm_t)
@@ -26831,7 +26366,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
storage_dontaudit_read_fixed_disk(xdm_t)
storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -447,6 +530,7 @@
+@@ -447,6 +550,7 @@
storage_dontaudit_raw_write_removable_device(xdm_t)
storage_dontaudit_setattr_removable_dev(xdm_t)
storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -26839,7 +26374,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
term_setattr_console(xdm_t)
term_use_unallocated_ttys(xdm_t)
-@@ -455,6 +539,7 @@
+@@ -455,6 +559,7 @@
auth_domtrans_pam_console(xdm_t)
auth_manage_pam_pid(xdm_t)
auth_manage_pam_console_data(xdm_t)
@@ -26847,7 +26382,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
auth_rw_faillog(xdm_t)
auth_write_login_records(xdm_t)
-@@ -465,10 +550,12 @@
+@@ -465,10 +570,12 @@
logging_read_generic_logs(xdm_t)
@@ -26862,7 +26397,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
userdom_dontaudit_use_unpriv_user_fds(xdm_t)
userdom_create_all_users_keys(xdm_t)
-@@ -477,6 +564,10 @@
+@@ -477,6 +584,10 @@
# Search /proc for any user domain processes.
userdom_read_all_users_state(xdm_t)
userdom_signal_all_users(xdm_t)
@@ -26873,7 +26408,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
xserver_rw_session(xdm_t, xdm_tmpfs_t)
xserver_unconfined(xdm_t)
-@@ -509,10 +600,12 @@
+@@ -509,10 +620,12 @@
optional_policy(`
alsa_domtrans(xdm_t)
@@ -26886,7 +26421,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
')
optional_policy(`
-@@ -520,12 +613,47 @@
+@@ -520,12 +633,47 @@
')
optional_policy(`
@@ -26934,7 +26469,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
hostname_exec(xdm_t)
')
-@@ -547,6 +675,39 @@
+@@ -543,9 +691,42 @@
')
optional_policy(`
@@ -26959,6 +26494,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+ pulseaudio_dbus_chat(xdm_t)
+')
+
++optional_policy(`
+ resmgr_stream_connect(xdm_t)
+ ')
+
+# On crash gdm execs gdb to dump stack
+optional_policy(`
+ rpm_exec(xdm_t)
@@ -26970,11 +26509,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+ rtkit_daemon_system_domain(xdm_t)
+')
+
-+optional_policy(`
+ optional_policy(`
seutil_sigchld_newrole(xdm_t)
')
-
-@@ -555,8 +716,9 @@
+@@ -555,8 +736,9 @@
')
optional_policy(`
@@ -26986,7 +26524,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
ifndef(`distro_redhat',`
allow xdm_t self:process { execheap execmem };
-@@ -565,7 +727,6 @@
+@@ -565,7 +747,6 @@
ifdef(`distro_rhel4',`
allow xdm_t self:process { execheap execmem };
')
@@ -26994,7 +26532,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
optional_policy(`
userhelper_dontaudit_search_config(xdm_t)
-@@ -576,6 +737,10 @@
+@@ -576,6 +757,10 @@
')
optional_policy(`
@@ -27005,22 +26543,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
xfs_stream_connect(xdm_t)
')
-@@ -584,14 +749,6 @@
- # X server local policy
- #
-
--# X Object Manager rules
--type_transition xserver_t xserver_t:x_drawable root_xdrawable_t;
--type_transition xserver_t xserver_t:x_colormap root_xcolormap_t;
--type_transition root_xdrawable_t input_xevent_t:x_event root_input_xevent_t;
--
--allow xserver_t { root_xdrawable_t x_domain }:x_drawable send;
--allow xserver_t input_xevent_t:x_event send;
--
- # setuid/setgid for the wrapper program to change UID
- # sys_rawio is for iopl access - should not be needed for frame-buffer
- # sys_admin, locking shared mem? chowning IPC message queues or semaphores?
-@@ -600,10 +757,9 @@
+@@ -600,10 +785,9 @@
# execheap needed until the X module loader is fixed.
# NVIDIA Needs execstack
@@ -27032,7 +26555,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
allow xserver_t self:fd use;
allow xserver_t self:fifo_file rw_fifo_file_perms;
allow xserver_t self:sock_file read_sock_file_perms;
-@@ -615,13 +771,31 @@
+@@ -615,6 +799,18 @@
allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
allow xserver_t self:tcp_socket create_stream_socket_perms;
allow xserver_t self:udp_socket create_socket_perms;
@@ -27048,24 +26571,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+domtrans_pattern(xserver_t, xauth_exec_t, xauth_t)
+
+allow xserver_t xauth_home_t:file read_file_perms;
-+
-+# Labeling rules for root windows and colormaps
-+type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
-+
-+allow xserver_t { rootwindow_t x_domain }:x_drawable send;
-+allow xserver_t x_domain:shm rw_shm_perms;
manage_dirs_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
manage_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
- manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
- files_tmp_filetrans(xserver_t, xserver_tmp_t, { file dir sock_file })
-
--filetrans_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t, sock_file)
-+#filetrans_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t,sock_file)
-
- manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
- manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -634,12 +808,19 @@
+@@ -634,12 +830,19 @@
manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
files_search_var_lib(xserver_t)
@@ -27087,7 +26596,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
kernel_read_system_state(xserver_t)
kernel_read_device_sysctls(xserver_t)
-@@ -673,7 +854,6 @@
+@@ -673,7 +876,6 @@
dev_rw_agp(xserver_t)
dev_rw_framebuffer(xserver_t)
dev_manage_dri_dev(xserver_t)
@@ -27095,7 +26604,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
dev_create_generic_dirs(xserver_t)
dev_setattr_generic_dirs(xserver_t)
# raw memory access is needed if not using the frame buffer
-@@ -683,9 +863,12 @@
+@@ -683,9 +885,12 @@
dev_rw_xserver_misc(xserver_t)
# read events - the synaptics touchpad driver reads raw events
dev_rw_input_dev(xserver_t)
@@ -27109,7 +26618,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
files_read_etc_files(xserver_t)
files_read_etc_runtime_files(xserver_t)
-@@ -700,8 +883,12 @@
+@@ -700,8 +905,12 @@
fs_search_nfs(xserver_t)
fs_search_auto_mountpoints(xserver_t)
fs_search_ramfs(xserver_t)
@@ -27122,7 +26631,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
selinux_validate_context(xserver_t)
selinux_compute_access_vector(xserver_t)
-@@ -723,6 +910,7 @@
+@@ -723,6 +932,7 @@
miscfiles_read_localization(xserver_t)
miscfiles_read_fonts(xserver_t)
@@ -27130,37 +26639,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
modutils_domtrans_insmod(xserver_t)
-@@ -745,7 +933,7 @@
- ')
-
- ifdef(`enable_mls',`
-- range_transition xserver_t xserver_tmp_t:sock_file s0 - mls_systemhigh;
-+# range_transition xserver_t xserver_tmp_t:sock_file s0 - mls_systemhigh;
- range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
- ')
-
-@@ -754,17 +942,15 @@
- # but typeattribute doesnt work in conditionals
-
- allow xserver_t xserver_t:x_server *;
-- allow xserver_t { x_domain root_xdrawable_t }:x_drawable *;
-+ allow xserver_t { x_domain rootwindow_t }:x_drawable *;
- allow xserver_t xserver_t:x_screen *;
- allow xserver_t x_domain:x_gc *;
-- allow xserver_t { x_domain root_xcolormap_t }:x_colormap *;
-+ allow xserver_t { x_domain rootwindow_t }:x_colormap *;
- allow xserver_t xproperty_type:x_property *;
- allow xserver_t xselection_type:x_selection *;
- allow xserver_t x_domain:x_cursor *;
-- allow xserver_t x_domain:x_client *;
-+ allow xserver_t { x_domain remote_xclient_t }:x_client *;
- allow xserver_t { x_domain xserver_t }:x_device *;
-- allow xserver_t { x_domain xserver_t }:x_pointer *;
-- allow xserver_t { x_domain xserver_t }:x_keyboard *;
- allow xserver_t xextension_type:x_extension *;
- allow xserver_t { x_domain xserver_t }:x_resource *;
- allow xserver_t xevent_type:{ x_event x_synthetic_event } *;
-@@ -779,12 +965,20 @@
+@@ -779,12 +989,20 @@
')
optional_policy(`
@@ -27182,7 +26661,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
unconfined_domtrans(xserver_t)
')
-@@ -811,12 +1005,12 @@
+@@ -811,7 +1029,7 @@
allow xserver_t xdm_var_lib_t:file { getattr read };
dontaudit xserver_t xdm_var_lib_t:dir search;
@@ -27190,16 +26669,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+read_files_pattern(xserver_t, xdm_var_run_t, xdm_var_run_t)
# Label pid and temporary files with derived types.
--manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
--manage_lnk_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
--manage_sock_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-+manage_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
-+manage_lnk_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
-+manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
-
- # Run xkbcomp.
- allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -832,9 +1026,14 @@
+ manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
+@@ -832,9 +1050,14 @@
# to read ROLE_home_t - examine this in more detail
# (xauth?)
userdom_read_user_home_content_files(xserver_t)
@@ -27214,15 +26685,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
tunable_policy(`use_nfs_home_dirs',`
fs_manage_nfs_dirs(xserver_t)
fs_manage_nfs_files(xserver_t)
-@@ -849,11 +1048,14 @@
+@@ -849,11 +1072,14 @@
optional_policy(`
dbus_system_bus_client(xserver_t)
+- hal_dbus_chat(xserver_t)
+
+ optional_policy(`
- hal_dbus_chat(xserver_t)
++ hal_dbus_chat(xserver_t)
++ ')
')
-+')
optional_policy(`
- resmgr_stream_connect(xdm_t)
@@ -27230,191 +26702,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
')
optional_policy(`
-@@ -867,150 +1069,163 @@
- #
-
- # Hacks
-+# everyone can get the input focus of everyone else
-+# this is a fundamental brokenness in the X protocol
-+allow x_domain { x_domain xserver_t }:x_device getfocus;
-+# everyone can grab the server
-+# everyone does it, it is basically a free DOS attack
-+allow x_domain xserver_t:x_server grab;
-+# everyone can get the font path, etc.
-+# this could leak out sensitive information
-+allow x_domain xserver_t:x_server getattr;
- # everyone can do override-redirect windows.
- # this could be used to spoof labels
- allow x_domain self:x_drawable override;
--# firefox gets nosy with other people's windows
--allow x_domain x_domain:x_drawable { list_child receive };
-+# everyone can receive management events on the root window
-+# allows to know when new windows appear, among other things
-+allow x_domain manage_xevent_t:x_event receive;
-
- # X Server
--# can get X server attributes
--allow x_domain xserver_t:x_server getattr;
--# can grab the server
--allow x_domain xserver_t:x_server grab;
--# can read and write server-owned generic resources
--allow x_domain xserver_t:x_resource { read write };
-+# can read server-owned resources
-+allow x_domain xserver_t:x_resource read;
-+allow x_domain xserver_t:x_device { manage force_cursor };
-+
- # can mess with own clients
--allow x_domain self:x_client { getattr manage destroy };
-+allow x_domain self:x_client { manage destroy };
-
- # X Protocol Extensions
--allow x_domain xextension_t:x_extension { query use };
--allow x_domain security_xextension_t:x_extension { query use };
-+allow x_domain std_xext_t:x_extension { query use };
-+allow x_domain shmem_xext_t:x_extension { query use };
-+dontaudit x_domain xextension_type:x_extension { query use };
-
- # X Properties
--# can change properties of root window
--allow x_domain root_xdrawable_t:x_drawable { list_property get_property set_property };
--# can change properties of my own windows
--allow x_domain self:x_drawable { list_property get_property set_property };
- # can read and write cut buffers
- allow x_domain clipboard_xproperty_t:x_property { create read write append };
--# can read security labels
--allow x_domain seclabel_xproperty_t:x_property { getattr read };
--# can change all other properties
--allow x_domain xproperty_t:x_property { getattr create read write append destroy };
-+# can read info properties
-+allow x_domain info_xproperty_t:x_property read;
-+# can change properties of root window
-+allow x_domain rootwindow_t:x_drawable { list_property get_property set_property };
-+# can change properties of own windows
-+allow x_domain self:x_drawable { list_property get_property set_property };
-
- # X Windows
- # operations allowed on root windows
--allow x_domain root_xdrawable_t:x_drawable { getattr setattr list_child add_child remove_child send receive hide show };
-+allow x_domain rootwindow_t:x_drawable { getattr list_child add_child remove_child send receive };
- # operations allowed on my windows
- allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
--allow x_domain self:x_drawable { blend };
--# operations allowed on all windows
--allow x_domain x_domain:x_drawable { getattr get_property set_property remove_child };
-+
-+allow x_domain x_domain:x_drawable { get_property getattr list_child };
-
- # X Colormaps
- # can use the default colormap
--allow x_domain root_xcolormap_t:x_colormap { read use add_color remove_color install uninstall };
--# can create and use colormaps
--allow x_domain self:x_colormap *;
--
--# X Devices
--# operations allowed on my own devices
--allow x_domain self:{ x_device x_pointer x_keyboard } *;
--# operations allowed on generic devices
--allow x_domain xserver_t:x_device { use getattr setattr getfocus setfocus bell grab freeze force_cursor };
--# operations allowed on core keyboard
--allow x_domain xserver_t:x_keyboard { use getattr setattr getfocus setfocus bell grab };
--# operations allowed on core pointer
--allow x_domain xserver_t:x_pointer { read use getattr setattr getfocus setfocus bell grab freeze force_cursor };
--
--# all devices can generate input events
--allow x_domain root_xdrawable_t:x_drawable send;
--allow x_domain x_domain:x_drawable send;
--allow x_domain input_xevent_t:x_event send;
--
--# dontaudit keyloggers repeatedly polling
--#dontaudit x_domain xserver_t:x_keyboard read;
-+allow x_domain rootwindow_t:x_colormap { read use add_color };
-
- # X Input
--# can receive default events
--allow x_domain xevent_t:{ x_event x_synthetic_event } receive;
--# can receive ICCCM events
--allow x_domain client_xevent_t:{ x_event x_synthetic_event } receive;
-+# can receive certain root window events
-+allow x_domain focus_xevent_t:x_event receive;
-+allow x_domain property_xevent_t:x_event receive;
-+allow x_domain client_xevent_t:x_synthetic_event receive;
-+allow x_domain manage_xevent_t:x_synthetic_event receive;
- # can send ICCCM events to the root window
-+allow x_domain manage_xevent_t:x_synthetic_event send;
- allow x_domain client_xevent_t:x_synthetic_event send;
--# can receive root window input events
--allow x_domain root_input_xevent_t:x_event receive;
--
- # X Selections
- # can use the clipboard
- allow x_domain clipboard_xselection_t:x_selection { getattr setattr read };
--# can use default selections
--allow x_domain xselection_t:x_selection { getattr setattr read };
-+# can query all other selections
-+allow x_domain xselection_t:x_selection { getattr read };
-
- # Other X Objects
- # can create and use cursors
- allow x_domain self:x_cursor *;
- # can create and use graphics contexts
- allow x_domain self:x_gc *;
-+# can create and use colormaps
-+allow x_domain self:x_colormap *;
- # can read and write own objects
- allow x_domain self:x_resource { read write };
--# can mess with the screensaver
--allow x_domain xserver_t:x_screen { getattr saver_getattr };
--
--########################################
--#
--# Rules for unconfined access to this module
--#
-
- tunable_policy(`! xserver_object_manager',`
- # should be xserver_unconfined(x_domain),
- # but typeattribute doesnt work in conditionals
-
- allow x_domain xserver_t:x_server *;
-- allow x_domain xdrawable_type:x_drawable *;
-+ allow x_domain { x_domain rootwindow_t }:x_drawable *;
- allow x_domain xserver_t:x_screen *;
- allow x_domain x_domain:x_gc *;
-- allow x_domain xcolormap_type:x_colormap *;
-+ allow x_domain { x_domain rootwindow_t }:x_colormap *;
- allow x_domain xproperty_type:x_property *;
- allow x_domain xselection_type:x_selection *;
- allow x_domain x_domain:x_cursor *;
-- allow x_domain x_domain:x_client *;
-+ allow x_domain { x_domain remote_xclient_t }:x_client *;
- allow x_domain { x_domain xserver_t }:x_device *;
-- allow x_domain { x_domain xserver_t }:x_pointer *;
-- allow x_domain { x_domain xserver_t }:x_keyboard *;
- allow x_domain xextension_type:x_extension *;
- allow x_domain { x_domain xserver_t }:x_resource *;
- allow x_domain xevent_type:{ x_event x_synthetic_event } *;
- ')
-
-+########################################
-+#
-+# Rules for unconfined access to this module
-+#
-+
- allow xserver_unconfined_type xserver_t:x_server *;
--allow xserver_unconfined_type xdrawable_type:x_drawable *;
-+allow xserver_unconfined_type { x_domain rootwindow_t }:x_drawable *;
- allow xserver_unconfined_type xserver_t:x_screen *;
- allow xserver_unconfined_type x_domain:x_gc *;
--allow xserver_unconfined_type xcolormap_type:x_colormap *;
-+allow xserver_unconfined_type { x_domain rootwindow_t }:x_colormap *;
- allow xserver_unconfined_type xproperty_type:x_property *;
- allow xserver_unconfined_type xselection_type:x_selection *;
- allow xserver_unconfined_type x_domain:x_cursor *;
--allow xserver_unconfined_type x_domain:x_client *;
-+allow xserver_unconfined_type { x_domain remote_xclient_t }:x_client *;
- allow xserver_unconfined_type { x_domain xserver_t }:x_device *;
--allow xserver_unconfined_type { x_domain xserver_t }:x_pointer *;
--allow xserver_unconfined_type { x_domain xserver_t }:x_keyboard *;
- allow xserver_unconfined_type xextension_type:x_extension *;
+@@ -1000,17 +1226,32 @@
allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
@@ -27425,22 +26713,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
-allow xdm_t polymember:lnk_file { create unlink };
-# xdm needs access for copying .Xauthority into new home
-allow xdm_t polymember:file { create getattr write };
-+allow xserver_unconfined_type self:x_drawable all_x_drawable_perms;
-+allow xserver_unconfined_type self:x_screen all_x_screen_perms;
-+allow xserver_unconfined_type self:x_gc all_x_gc_perms;
-+allow xserver_unconfined_type self:x_font all_x_font_perms;
-+allow xserver_unconfined_type self:x_colormap all_x_colormap_perms;
-+allow xserver_unconfined_type self:x_property all_x_property_perms;
-+allow xserver_unconfined_type self:x_selection all_x_selection_perms;
-+allow xserver_unconfined_type self:x_cursor all_x_cursor_perms;
-+allow xserver_unconfined_type self:x_client all_x_client_perms;
-+allow xserver_unconfined_type self:x_device all_x_device_perms;
-+allow xserver_unconfined_type self:x_server all_x_server_perms;
-+allow xserver_unconfined_type self:x_extension all_x_extension_perms;
-+allow xserver_unconfined_type self:x_resource all_x_resource_perms;
-+allow xserver_unconfined_type self:x_event all_x_event_perms;
-+allow xserver_unconfined_type self:x_synthetic_event all_x_synthetic_event_perms;
-+
+optional_policy(`
+ unconfined_rw_shm(xserver_t)
+ unconfined_execmem_rw_shm(xserver_t)
@@ -27448,8 +26720,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+ # xserver signals unconfined user on startx
+ unconfined_signal(xserver_t)
+ unconfined_getpgid(xserver_t)
-+')
-+
+ ')
+
+-#
+-# Wants to delete .xsession-errors file
+-#
+-allow xdm_t user_home_type:file unlink;
+-') dnl end TODO
+tunable_policy(`allow_xserver_execmem',`
+ allow xserver_t self:process { execheap execmem execstack };
+')
@@ -27469,16 +26746,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+
+tunable_policy(`use_samba_home_dirs',`
+ fs_append_cifs_files(xdmhomewriter)
- ')
-
--#
--# Wants to delete .xsession-errors file
--#
--allow xdm_t user_home_type:file unlink;
--') dnl end TODO
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.7.4/policy/modules/services/zebra.if
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.7.5/policy/modules/services/zebra.if
--- nsaserefpolicy/policy/modules/services/zebra.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/zebra.if 2009-12-06 09:58:29.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/zebra.if 2009-12-18 12:16:37.000000000 -0500
@@ -24,6 +24,26 @@
########################################
@@ -27506,9 +26777,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
## All of the rules required to administrate
## an zebra environment
##