From 56187c2f8aea435ecc4a8b69bc2631ed065e53f6 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: May 31 2007 18:40:35 +0000 Subject: - Remove ifdef strict policy from upstream --- diff --git a/.cvsignore b/.cvsignore index 50a7c15..b9326c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -118,3 +118,4 @@ serefpolicy-2.6.2.tgz serefpolicy-2.6.3.tgz serefpolicy-2.6.4.tgz serefpolicy-2.6.5.tgz +serefpolicy-3.0.1.tgz diff --git a/modules-targeted.conf b/modules-targeted.conf index 32106a6..38fd1b4 100644 --- a/modules-targeted.conf +++ b/modules-targeted.conf @@ -1229,7 +1229,7 @@ userdomain = base # # The unconfined domain. # -unconfined = base +unconfined = module # Layer: apps # Module: wine @@ -1463,3 +1463,10 @@ w3c = module # rpcbind = module +# Layer: apps +# Module: vmware +# +# VMWare Workstation virtual machines +# +vmware = module + diff --git a/policy-20070518.patch b/policy-20070518.patch deleted file mode 100644 index be11dd4..0000000 --- a/policy-20070518.patch +++ /dev/null @@ -1,9888 +0,0 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.6.5/man/man8/ftpd_selinux.8 ---- nsaserefpolicy/man/man8/ftpd_selinux.8 2007-04-02 10:58:34.000000000 -0400 -+++ serefpolicy-2.6.5/man/man8/ftpd_selinux.8 2007-05-22 14:41:13.000000000 -0400 -@@ -12,7 +12,7 @@ - .TP - chcon -R -t public_content_t /var/ftp - .TP --If you want to setup a directory where you can upload files to you must label the files and directories ftpd_anon_rw_t. So if you created a special directory /var/ftp/incoming, you would need to label the directory with the chcon tool. -+If you want to setup a directory where you can upload files to you must label the files and directories public_content_rw_t. So if you created a special directory /var/ftp/incoming, you would need to label the directory with the chcon tool. - .TP - chcon -t public_content_rw_t /var/ftp/incoming - .TP -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.6.5/policy/flask/access_vectors ---- nsaserefpolicy/policy/flask/access_vectors 2007-02-26 09:43:33.000000000 -0500 -+++ serefpolicy-2.6.5/policy/flask/access_vectors 2007-05-22 14:41:13.000000000 -0400 -@@ -598,6 +598,8 @@ - shmempwd - shmemgrp - shmemhost -+ getserv -+ shmemserv - } - - # Define the access vector interpretation for controlling -@@ -623,6 +625,8 @@ - send - recv - relabelto -+ flow_in -+ flow_out - } - - class key -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.5/policy/global_booleans ---- nsaserefpolicy/policy/global_booleans 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.5/policy/global_booleans 2007-05-22 14:41:13.000000000 -0400 -@@ -4,7 +4,6 @@ - # file should be used. - # - --ifdef(`strict_policy',` - ## - ##

- ## Enabling secure mode disallows programs, such as -@@ -13,7 +12,6 @@ - ##

- ## - gen_bool(secure_mode,false) --') - - ## - ##

-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.5/policy/global_tunables ---- nsaserefpolicy/policy/global_tunables 2007-03-26 16:24:14.000000000 -0400 -+++ serefpolicy-2.6.5/policy/global_tunables 2007-05-22 14:41:13.000000000 -0400 -@@ -102,12 +102,6 @@ - ## - gen_tunable(use_samba_home_dirs,false) - --######################################## --# --# Strict policy specific --# -- --ifdef(`strict_policy',` - ## - ##

- ## Allow email client to various content. -@@ -143,4 +137,11 @@ - ##

- ## - gen_tunable(write_untrusted_content,false) --') -+ -+## -+##

-+## Allow users to connect to console (s390) -+##

-+## -+gen_tunable(allow_console_login,false) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.5/policy/mls ---- nsaserefpolicy/policy/mls 2007-03-09 13:02:20.000000000 -0500 -+++ serefpolicy-2.6.5/policy/mls 2007-05-22 14:41:13.000000000 -0400 -@@ -89,12 +89,14 @@ - mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } - (( l1 eq l2 ) or - (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or -- (( t2 == mlsfilewriteinrange ) and ( l1 dom l2 ) and ( h1 domby h2 )) or - ( t1 == mlsfilewrite ) or -+ (( t2 == mlsrangedobject ) and ( l1 dom l2 ) and ( h1 domby h2 )) or - ( t2 == mlstrustedobject )); - -+# Directory "write" ops - mlsconstrain dir { add_name remove_name reparent rmdir } -- ((( l1 dom l2 ) and ( l1 domby h2 )) or -+ (( l1 eq l2 ) or -+ (( t1 == mlsfilewriteinrange ) and ( l1 dom l2 ) and ( l1 domby h2 )) or - (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or - ( t1 == mlsfilewrite ) or - ( t2 == mlstrustedobject )); -@@ -165,8 +167,20 @@ - mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } relabelto - ( h1 dom h2 ); - -+# the socket "read+write" ops -+# (Socket FDs are generally bidirectional, equivalent to open(..., O_RDWR), -+# require equal levels for unprivileged subjects, or read *and* write overrides) -+mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { accept connect } -+ (( l1 eq l2 ) or -+ (((( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or -+ ( t1 == mlsnetread )) and -+ ((( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or -+ (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or -+ ( t1 == mlsnetwrite )))); -+ -+ - # the socket "read" ops (note the check is dominance of the low level) --mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { read getattr listen accept getopt recv_msg } -+mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { read getattr listen getopt recv_msg } - (( l1 dom l2 ) or - (( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or - ( t1 == mlsnetread )); -@@ -177,8 +191,9 @@ - ( t1 == mlsnetread )); - - # the socket "write" ops --mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { write setattr relabelfrom connect setopt shutdown } -- ((( l1 dom l2 ) and ( l1 domby h2 )) or -+mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { write setattr relabelfrom setopt shutdown } -+ (( l1 eq l2 ) or -+ (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or - (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or - ( t1 == mlsnetwrite )); - -@@ -274,7 +289,8 @@ - - # the netif/node "write" ops (implicit single level socket doing the write) - mlsconstrain { netif node } { tcp_send udp_send rawip_send } -- (( l1 dom l2 ) and ( l1 domby h2 )); -+ (( l1 eq l2 ) or -+ (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 ))); - - # these access vectors have no MLS restrictions - # node enforce_dest -@@ -581,7 +597,8 @@ - ( t2 == unlabeled_t )); - - mlsconstrain association { sendto } -- ((( l1 dom l2 ) and ( l1 domby h2 )) or -+ (( l1 eq l2 ) or -+ (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or - ( t2 == unlabeled_t )); - - mlsconstrain association { polmatch } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.5/policy/modules/admin/acct.te ---- nsaserefpolicy/policy/modules/admin/acct.te 2007-03-26 10:39:08.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/acct.te 2007-05-22 14:41:13.000000000 -0400 -@@ -9,6 +9,7 @@ - type acct_t; - type acct_exec_t; - init_system_domain(acct_t,acct_exec_t) -+application_executable_file(acct_exec_t) - - type acct_data_t; - logging_log_file(acct_data_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.6.5/policy/modules/admin/alsa.fc ---- nsaserefpolicy/policy/modules/admin/alsa.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/alsa.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -1,4 +1,7 @@ - - /etc/alsa/pcm(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t,s0) -+/etc/asound(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t,s0) -+/etc/asound\.state gen_context(system_u:object_r:alsa_etc_rw_t,s0) - - /usr/bin/ainit -- gen_context(system_u:object_r:alsa_exec_t,s0) -+/sbin/alsactl -- gen_context(system_u:object_r:alsa_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-2.6.5/policy/modules/admin/alsa.te ---- nsaserefpolicy/policy/modules/admin/alsa.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/alsa.te 2007-05-23 09:37:14.000000000 -0400 -@@ -20,20 +20,24 @@ - # Local policy - # - --allow alsa_t self:capability { setgid setuid ipc_owner }; -+allow alsa_t self:capability { dac_read_search dac_override setgid setuid ipc_owner }; - dontaudit alsa_t self:capability sys_admin; - allow alsa_t self:sem create_sem_perms; - allow alsa_t self:shm create_shm_perms; - allow alsa_t self:unix_stream_socket create_stream_socket_perms; - allow alsa_t self:unix_dgram_socket create_socket_perms; - -+dev_read_sound(alsa_t) -+dev_write_sound(alsa_t) -+ -+files_etc_filetrans(alsa_t, alsa_etc_rw_t, file) - manage_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t) - manage_lnk_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t) - -+files_search_home(alsa_t) - files_read_etc_files(alsa_t) - --term_use_generic_ptys(alsa_t) --term_dontaudit_use_unallocated_ttys(alsa_t) -+kernel_read_system_state(alsa_t) - - libs_use_ld_so(alsa_t) - libs_use_shared_libs(alsa_t) -@@ -44,7 +48,17 @@ - - userdom_manage_unpriv_user_semaphores(alsa_t) - userdom_manage_unpriv_user_shared_mem(alsa_t) -+userdom_search_generic_user_home_dirs(alsa_t) -+ -+term_use_generic_ptys(alsa_t) -+term_dontaudit_use_unallocated_ttys(alsa_t) - - optional_policy(` - nscd_socket_use(alsa_t) - ') -+ -+optional_policy(` -+ hal_use_fds(alsa_t) -+ hal_write_log(alsa_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.6.5/policy/modules/admin/amanda.te ---- nsaserefpolicy/policy/modules/admin/amanda.te 2007-03-26 10:39:08.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/amanda.te 2007-05-25 08:29:31.000000000 -0400 -@@ -70,7 +70,7 @@ - - allow amanda_t self:capability { chown dac_override setuid kill }; - allow amanda_t self:process { setpgid signal }; --allow amanda_t self:fifo_file { getattr read write ioctl lock }; -+allow amanda_t self:fifo_file rw_fifo_file_perms; - allow amanda_t self:unix_stream_socket create_stream_socket_perms; - allow amanda_t self:unix_dgram_socket create_socket_perms; - allow amanda_t self:tcp_socket create_stream_socket_perms; -@@ -85,18 +85,22 @@ - - # access to amandas data structure - allow amanda_t amanda_data_t:dir { read search write }; --allow amanda_t amanda_data_t:file { read write }; -+allow amanda_t amanda_data_t:file manage_file_perms; - - # access to amanda_dumpdates_t - allow amanda_t amanda_dumpdates_t:file { getattr lock read write }; - - can_exec(amanda_t,amanda_exec_t) -+can_exec(amanda_t,amanda_inetd_exec_t) - - # access to amanda_gnutarlists_t (/var/lib/amanda/gnutar-lists) - allow amanda_t amanda_gnutarlists_t:dir rw_dir_perms; - allow amanda_t amanda_gnutarlists_t:file manage_file_perms; - allow amanda_t amanda_gnutarlists_t:lnk_file manage_file_perms; - -+manage_dirs_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t) -+manage_files_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t) -+ - manage_files_pattern(amanda_t,amanda_log_t,amanda_log_t) - manage_dirs_pattern(amanda_t,amanda_log_t,amanda_log_t) - logging_log_filetrans(amanda_t,amanda_log_t,{ file dir }) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.5/policy/modules/admin/amtu.fc ---- nsaserefpolicy/policy/modules/admin/amtu.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/amtu.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,3 @@ -+ -+/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.5/policy/modules/admin/amtu.if ---- nsaserefpolicy/policy/modules/admin/amtu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/amtu.if 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,53 @@ -+## -+## abstract Machine Test Utility -+## -+ -+######################################## -+## -+## Execute amtu in the amtu domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`amtu_domtrans',` -+ gen_require(` -+ type amtu_t, amtu_exec_t; -+ ') -+ -+ corecmd_search_bin($1) -+ domtrans_pattern($1,amtu_exec_t,amtu_t) -+') -+ -+######################################## -+## -+## Execute amtu in the amtu domain, and -+## allow the specified role the amtu domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+## -+## -+## The role to be allowed the amtu domain. -+## -+## -+## -+## -+## The type of the terminal allow the amtu domain to use. -+## -+## -+# -+interface(`amtu_run',` -+ gen_require(` -+ type amtu_t; -+ ') -+ -+ amtu_domtrans($1) -+ role $2 types amtu_t; -+ allow amtu_t $3:chr_file rw_term_perms; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.6.5/policy/modules/admin/amtu.te ---- nsaserefpolicy/policy/modules/admin/amtu.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/amtu.te 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,57 @@ -+policy_module(amtu,1.0.23) -+ -+######################################## -+# -+# Declarations -+# -+ -+type amtu_t; -+type amtu_exec_t; -+domain_type(amtu_t) -+domain_entry_file(amtu_t, amtu_exec_t) -+ -+######################################## -+# -+# amtu local policy -+# -+ -+# Specific allow rules required for amtu -+allow amtu_t self:capability net_raw; -+allow amtu_t self:packet_socket { bind create read write }; -+allow amtu_t self:udp_socket { create ioctl }; -+ -+files_manage_boot_files(amtu_t) -+files_read_etc_runtime_files(amtu_t) -+files_read_etc_files(amtu_t) -+ -+kernel_read_system_state(amtu_t) -+ -+libs_use_ld_so(amtu_t) -+libs_use_shared_libs(amtu_t) -+ -+logging_send_audit_msg(amtu_t) -+ -+optional_policy(` -+ seutil_use_newrole_fds(amtu_t) -+'); -+ -+optional_policy(` -+ userdom_use_sysadm_fds(amtu_t) -+'); -+ -+optional_policy(` -+ userdom_sigchld_sysadm(amtu_t) -+'); -+ -+optional_policy(` -+ nscd_dontaudit_search_pid(amtu_t) -+'); -+ -+optional_policy(` -+ kernel_dontaudit_read_system_state(amtu_t) -+'); -+ -+optional_policy(` -+ term_dontaudit_search_ptys(amtu_t) -+'); -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.6.5/policy/modules/admin/bootloader.te ---- nsaserefpolicy/policy/modules/admin/bootloader.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/bootloader.te 2007-05-22 14:41:13.000000000 -0400 -@@ -65,6 +65,8 @@ - files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file }) - # for tune2fs (cjp: ?) - files_root_filetrans(bootloader_t,bootloader_tmp_t,file) -+# grup-install is creating files in /tmp that grup later needs to read -+files_read_generic_tmp_files(bootloader_t) - - kernel_getattr_core_if(bootloader_t) - kernel_read_network_state(bootloader_t) -@@ -187,6 +189,7 @@ - - optional_policy(` - hal_dontaudit_append_lib_files(bootloader_t) -+ hal_write_log(bootloader_t) - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.6.5/policy/modules/admin/consoletype.te ---- nsaserefpolicy/policy/modules/admin/consoletype.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/consoletype.te 2007-05-22 14:41:13.000000000 -0400 -@@ -8,7 +8,12 @@ - - type consoletype_t; - type consoletype_exec_t; --init_domain(consoletype_t,consoletype_exec_t) -+#dont transition from initrc -+#init_domain(consoletype_t,consoletype_exec_t) -+domain_type(consoletype_t) -+domain_entry_file(consoletype_t,consoletype_exec_t) -+role system_r types consoletype_t; -+ - mls_file_read_up(consoletype_t) - mls_file_write_down(consoletype_t) - role system_r types consoletype_t; -@@ -16,6 +21,7 @@ - ifdef(`targeted_policy',`',` - init_system_domain(consoletype_t,consoletype_exec_t) - ') -+application_executable_file(consoletype_exec_t) - - ######################################## - # -@@ -49,7 +55,7 @@ - init_use_fds(consoletype_t) - init_use_script_ptys(consoletype_t) - init_use_script_fds(consoletype_t) --init_write_script_pipes(consoletype_t) -+init_rw_script_pipes(consoletype_t) - - domain_use_interactive_fds(consoletype_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.6.5/policy/modules/admin/dmesg.te ---- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/dmesg.te 2007-05-22 14:41:13.000000000 -0400 -@@ -10,6 +10,7 @@ - type dmesg_t; - type dmesg_exec_t; - init_system_domain(dmesg_t,dmesg_exec_t) -+ application_executable_file(dmesg_exec_t) - role system_r types dmesg_t; - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.5/policy/modules/admin/kudzu.te ---- nsaserefpolicy/policy/modules/admin/kudzu.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/kudzu.te 2007-05-23 10:52:36.000000000 -0400 -@@ -21,8 +21,8 @@ - # Local policy - # - --allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod }; --dontaudit kudzu_t self:capability { sys_ptrace sys_tty_config }; -+allow kudzu_t self:capability { dac_override sys_admin sys_ptrace sys_rawio net_admin sys_tty_config mknod }; -+dontaudit kudzu_t self:capability sys_tty_config; - allow kudzu_t self:process { signal_perms execmem }; - allow kudzu_t self:fifo_file rw_fifo_file_perms; - allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms }; -@@ -103,6 +103,8 @@ - init_use_fds(kudzu_t) - init_use_script_ptys(kudzu_t) - init_stream_connect_script(kudzu_t) -+init_read_init_state(kudzu_t) -+init_ptrace_init_domain(kudzu_t) - # kudzu will telinit to make init re-read - # the inittab after configuring serial consoles - init_telinit(kudzu_t) -@@ -129,13 +131,6 @@ - term_dontaudit_use_unallocated_ttys(kudzu_t) - term_dontaudit_use_generic_ptys(kudzu_t) - files_dontaudit_read_root_files(kudzu_t) -- -- # cjp: this was originally in the else block -- # of ifdef userhelper.te, but it seems to -- # make more sense here. also, require -- # blocks curently do not work in the -- # else block of optionals -- unconfined_domain(kudzu_t) - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.6.5/policy/modules/admin/logrotate.te ---- nsaserefpolicy/policy/modules/admin/logrotate.te 2007-03-26 10:39:08.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/logrotate.te 2007-05-23 10:52:49.000000000 -0400 -@@ -75,6 +75,7 @@ - mls_file_read_up(logrotate_t) - mls_file_write_down(logrotate_t) - mls_file_upgrade(logrotate_t) -+mls_process_write_down(logrotate_t) - - selinux_get_fs_mount(logrotate_t) - selinux_get_enforce_mode(logrotate_t) -@@ -130,10 +131,6 @@ - can_exec(logrotate_t, logrotate_exec_t) - ') - --ifdef(`targeted_policy',` -- unconfined_domain(logrotate_t) --') -- - optional_policy(` - acct_domtrans(logrotate_t) - acct_manage_data(logrotate_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.6.5/policy/modules/admin/logwatch.te ---- nsaserefpolicy/policy/modules/admin/logwatch.te 2007-05-02 15:04:46.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/logwatch.te 2007-05-22 14:41:13.000000000 -0400 -@@ -63,6 +63,8 @@ - files_search_mnt(logwatch_t) - files_dontaudit_search_home(logwatch_t) - files_dontaudit_search_boot(logwatch_t) -+# Execs df and if file system mounted with a context avc raised -+files_search_all(logwatch_t) - - fs_getattr_all_fs(logwatch_t) - fs_dontaudit_list_auto_mountpoints(logwatch_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.6.5/policy/modules/admin/netutils.te ---- nsaserefpolicy/policy/modules/admin/netutils.te 2007-04-30 10:41:38.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/netutils.te 2007-05-22 14:41:13.000000000 -0400 -@@ -31,6 +31,7 @@ - type traceroute_t; - type traceroute_exec_t; - init_system_domain(traceroute_t,traceroute_exec_t) -+application_executable_file(traceroute_exec_t) - role system_r types traceroute_t; - - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.6.5/policy/modules/admin/prelink.te ---- nsaserefpolicy/policy/modules/admin/prelink.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/prelink.te 2007-05-23 09:21:05.000000000 -0400 -@@ -26,7 +26,7 @@ - # Local policy - # - --allow prelink_t self:capability { chown dac_override fowner fsetid }; -+allow prelink_t self:capability { chown dac_override fowner fsetid sys_resource }; - allow prelink_t self:process { execheap execmem execstack signal }; - allow prelink_t self:fifo_file rw_fifo_file_perms; - -@@ -65,6 +65,7 @@ - files_read_etc_files(prelink_t) - files_read_etc_runtime_files(prelink_t) - files_dontaudit_read_all_symlinks(prelink_t) -+files_manage_usr_files(prelink_t) - - fs_getattr_xattr_fs(prelink_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.6.5/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/readahead.te 2007-05-22 14:41:13.000000000 -0400 -@@ -18,7 +18,8 @@ - # Local policy - # - --dontaudit readahead_t self:capability { dac_override dac_read_search sys_tty_config }; -+allow readahead_t self:capability { dac_override dac_read_search }; -+dontaudit readahead_t self:capability sys_tty_config; - allow readahead_t self:process signal_perms; - - manage_files_pattern(readahead_t,readahead_var_run_t,readahead_var_run_t) -@@ -36,7 +37,7 @@ - dev_dontaudit_read_all_blk_files(readahead_t) - dev_dontaudit_getattr_memory_dev(readahead_t) - dev_dontaudit_getattr_nvram_dev(readahead_t) --storage_dontaudit_getattr_fixed_disk_dev(readahead_t) -+storage_raw_read_fixed_disk(readahead_t) - - domain_use_interactive_fds(readahead_t) - -@@ -82,3 +83,7 @@ - optional_policy(` - seutil_sigchld_newrole(readahead_t) - ') -+ -+optional_policy(` -+ logging_dontaudit_search_audit_config(readahead_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.6.5/policy/modules/admin/rpm.fc ---- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/rpm.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -21,6 +21,9 @@ - /usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0) - /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0) - /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0) -+/usr/sbin/synaptic -- gen_context(system_u:object_r:rpm_exec_t,s0) -+/usr/bin/apt-get -- gen_context(system_u:object_r:rpm_exec_t,s0) -+/usr/bin/apt-shell -- gen_context(system_u:object_r:rpm_exec_t,s0) - ') - - /var/lib/alternatives(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.6.5/policy/modules/admin/rpm.if ---- nsaserefpolicy/policy/modules/admin/rpm.if 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/rpm.if 2007-05-22 14:41:13.000000000 -0400 -@@ -224,8 +224,29 @@ - type rpm_script_tmp_t; - ') - -- files_search_tmp($1) -+ manage_dirs_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) - manage_files_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) -+ manage_lnk_files_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) -+') -+ -+######################################## -+## -+## read, RPM -+## script temporary files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rpm_read_script_tmp_files',` -+ gen_require(` -+ type rpm_script_tmp_t; -+ ') -+ -+ read_files_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) -+ read_lnk_files_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) - ') - - ######################################## -@@ -289,3 +310,46 @@ - dontaudit $1 rpm_var_lib_t:file manage_file_perms; - dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms; - ') -+ -+ -+######################################## -+## -+## Allow application to transition to rpm_script domain. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rpm_transition_script',` -+ gen_require(` -+ type rpm_script_t; -+ ') -+ -+ allow $1 rpm_script_t:process transition; -+ -+ allow $1 rpm_script_t:fd use; -+ allow rpm_script_t $1:fd use; -+ allow rpm_script_t $1:fifo_file rw_fifo_file_perms; -+ allow rpm_script_t $1:process sigchld; -+') -+ -+######################################## -+## -+## Do not audit attempts to read, -+## write RPM tmp files -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`rpm_dontaudit_rw_tmp_files',` -+ gen_require(` -+ type rpm_tmp_t; -+ ') -+ -+ dontaudit $1 rpm_tmp_t:file rw_file_perms; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.6.5/policy/modules/admin/rpm.te ---- nsaserefpolicy/policy/modules/admin/rpm.te 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/rpm.te 2007-05-22 14:41:13.000000000 -0400 -@@ -9,6 +9,8 @@ - type rpm_t; - type rpm_exec_t; - init_system_domain(rpm_t,rpm_exec_t) -+application_executable_file(rpm_exec_t) -+ - domain_obj_id_change_exemption(rpm_t) - domain_role_change_exemption(rpm_t) - domain_system_change_exemption(rpm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.6.5/policy/modules/admin/sudo.if ---- nsaserefpolicy/policy/modules/admin/sudo.if 2007-03-26 10:39:08.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/sudo.if 2007-05-22 14:41:13.000000000 -0400 -@@ -69,7 +69,6 @@ - allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms; - allow $1_sudo_t self:unix_dgram_socket sendto; - allow $1_sudo_t self:unix_stream_socket connectto; -- allow $1_sudo_t self:netlink_audit_socket { create bind write nlmsg_read read }; - allow $1_sudo_t self:netlink_route_socket r_netlink_socket_perms; - - # Enter this derived domain from the user domain -@@ -77,6 +76,7 @@ - - # By default, revert to the calling domain when a shell is executed. - corecmd_shell_domtrans($1_sudo_t,$2) -+ corecmd_bin_domtrans($1_sudo_t,$2) - allow $2 $1_sudo_t:fd use; - allow $2 $1_sudo_t:fifo_file rw_file_perms; - allow $2 $1_sudo_t:process sigchld; -@@ -91,8 +91,10 @@ - fs_getattr_xattr_fs($1_sudo_t) - - auth_domtrans_chk_passwd($1_sudo_t) -+ auth_domtrans_upd_passwd($1_sudo_t) - # sudo stores a token in the pam_pid directory - auth_manage_pam_pid($1_sudo_t) -+ auth_search_key($1_sudo_t) - - corecmd_read_bin_symlinks($1_sudo_t) - corecmd_getattr_all_executables($1_sudo_t) -@@ -114,6 +116,7 @@ - libs_use_shared_libs($1_sudo_t) - - logging_send_syslog_msg($1_sudo_t) -+ logging_send_audit_msg($1_sudo_t) - - miscfiles_read_localization($1_sudo_t) - -@@ -127,6 +130,10 @@ - userdom_dontaudit_search_all_users_home_content($1_sudo_t) - - optional_policy(` -+ locallogin_search_keys($1_sudo_t) -+ ') -+ -+ optional_policy(` - nis_use_ypbind($1_sudo_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.6.5/policy/modules/admin/su.if ---- nsaserefpolicy/policy/modules/admin/su.if 2007-04-30 10:41:38.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/su.if 2007-05-22 14:41:13.000000000 -0400 -@@ -41,12 +41,11 @@ - - allow $2 $1_su_t:process signal; - -- allow $1_su_t self:capability { audit_control audit_write setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; -+ allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; - dontaudit $1_su_t self:capability sys_tty_config; - allow $1_su_t self:key { search write }; - allow $1_su_t self:process { setexec setsched setrlimit }; - allow $1_su_t self:fifo_file rw_fifo_file_perms; -- allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; - allow $1_su_t self:unix_stream_socket create_stream_socket_perms; - - # Transition from the user domain to this domain. -@@ -75,6 +74,7 @@ - selinux_compute_access_vector($1_su_t) - - auth_domtrans_chk_passwd($1_su_t) -+ auth_domtrans_upd_passwd($1_su_t) - auth_dontaudit_read_shadow($1_su_t) - auth_use_nsswitch($1_su_t) - auth_rw_faillog($1_su_t) -@@ -89,6 +89,7 @@ - libs_use_ld_so($1_su_t) - libs_use_shared_libs($1_su_t) - -+ logging_send_audit_msg($1_su_t) - logging_send_syslog_msg($1_su_t) - - miscfiles_read_localization($1_su_t) -@@ -174,11 +175,9 @@ - - allow $2 $1_su_t:process signal; - -- allow $1_su_t self:capability { audit_control audit_write setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; - dontaudit $1_su_t self:capability sys_tty_config; - allow $1_su_t self:process { setexec setsched setrlimit }; - allow $1_su_t self:fifo_file rw_fifo_file_perms; -- allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; - allow $1_su_t self:key { search write }; - - # Transition from the user domain to this domain. -@@ -204,9 +203,11 @@ - selinux_compute_access_vector($1_su_t) - - auth_domtrans_user_chk_passwd($1,$1_su_t) -+ auth_domtrans_upd_passwd($1_su_t) - auth_dontaudit_read_shadow($1_su_t) - auth_use_nsswitch($1_su_t) -- auth_rw_faillog($1_su_t) -+ auth_keyring_domain($1_su_t) -+ auth_search_key($1_su_t) - - corecmd_search_bin($1_su_t) - -@@ -227,6 +228,7 @@ - libs_use_shared_libs($1_su_t) - - logging_send_syslog_msg($1_su_t) -+ logging_send_audit_msg($1_su_t) - - miscfiles_read_localization($1_su_t) - -@@ -310,6 +312,8 @@ - xserver_domtrans_user_xauth($1, $1_su_t) - ') - -+ userdom_search_all_users_home_dirs($1_su_t) -+ - ifdef(`TODO',` - allow $1_su_t $1_home_t:file manage_file_perms; - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-2.6.5/policy/modules/admin/usermanage.if ---- nsaserefpolicy/policy/modules/admin/usermanage.if 2007-03-26 10:39:08.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/usermanage.if 2007-05-22 14:41:13.000000000 -0400 -@@ -278,5 +278,5 @@ - type crack_db_t; - ') - -- allow $1 crack_db_t:file read_file_perms; -+ read_files_pattern($1,crack_db_t,crack_db_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.6.5/policy/modules/admin/usermanage.te ---- nsaserefpolicy/policy/modules/admin/usermanage.te 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/admin/usermanage.te 2007-05-22 14:41:13.000000000 -0400 -@@ -198,7 +198,6 @@ - allow groupadd_t self:unix_stream_socket create_stream_socket_perms; - allow groupadd_t self:unix_dgram_socket sendto; - allow groupadd_t self:unix_stream_socket connectto; --allow groupadd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; - - fs_getattr_xattr_fs(groupadd_t) - fs_search_auto_mountpoints(groupadd_t) -@@ -231,6 +230,7 @@ - corecmd_exec_bin(groupadd_t) - - logging_send_syslog_msg(groupadd_t) -+logging_send_audit_msg(groupadd_t) - - miscfiles_read_localization(groupadd_t) - -@@ -252,8 +252,13 @@ - ') - - optional_policy(` -+ nscd_domtrans(groupadd_t) -+') -+ -+optional_policy(` - rpm_use_fds(groupadd_t) - rpm_rw_pipes(groupadd_t) -+ rpm_dontaudit_rw_tmp_files(groupadd_t) - ') - - ######################################## -@@ -261,7 +266,7 @@ - # Passwd local policy - # - --allow passwd_t self:capability { chown dac_override fsetid setuid setgid sys_resource audit_control audit_write }; -+allow passwd_t self:capability { chown dac_override fsetid setuid setgid sys_resource }; - allow passwd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; - allow passwd_t self:process { setrlimit setfscreate }; - allow passwd_t self:fd use; -@@ -271,7 +276,6 @@ - allow passwd_t self:unix_stream_socket create_stream_socket_perms; - allow passwd_t self:unix_dgram_socket sendto; - allow passwd_t self:unix_stream_socket connectto; --allow passwd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; - allow passwd_t self:shm create_shm_perms; - allow passwd_t self:sem create_sem_perms; - allow passwd_t self:msgq create_msgq_perms; -@@ -324,6 +328,7 @@ - libs_use_shared_libs(passwd_t) - - logging_send_syslog_msg(passwd_t) -+logging_send_audit_msg(passwd_t) - - miscfiles_read_localization(passwd_t) - -@@ -343,6 +348,7 @@ - - optional_policy(` - nscd_socket_use(passwd_t) -+ nscd_domtrans(passwd_t) - ') - - ######################################## -@@ -433,6 +439,7 @@ - - optional_policy(` - nscd_socket_use(sysadm_passwd_t) -+ nscd_domtrans(sysadm_passwd_t) - ') - - ######################################## -@@ -440,7 +447,7 @@ - # Useradd local policy - # - --allow useradd_t self:capability { dac_override chown kill fowner fsetid setuid sys_resource audit_write }; -+allow useradd_t self:capability { dac_override chown kill fowner fsetid setuid sys_resource }; - dontaudit useradd_t self:capability sys_tty_config; - allow useradd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; - allow useradd_t self:process setfscreate; -@@ -454,7 +461,6 @@ - allow useradd_t self:unix_stream_socket create_stream_socket_perms; - allow useradd_t self:unix_dgram_socket sendto; - allow useradd_t self:unix_stream_socket connectto; --allow useradd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; - - # for getting the number of groups - kernel_read_kernel_sysctls(useradd_t) -@@ -500,6 +506,7 @@ - libs_use_shared_libs(useradd_t) - - logging_send_syslog_msg(useradd_t) -+logging_send_audit_msg(useradd_t) - - miscfiles_read_localization(useradd_t) - -@@ -508,6 +515,9 @@ - seutil_read_default_contexts(useradd_t) - seutil_domtrans_semanage(useradd_t) - seutil_domtrans_setfiles(useradd_t) -+# Required because semanage execs these and hands them useradd_t:fd -+seutil_domtrans_setfiles(useradd_t) -+seutil_domtrans_loadpolicy(useradd_t) - - userdom_use_unpriv_users_fds(useradd_t) - # for when /root is the cwd -@@ -521,11 +531,26 @@ - mta_manage_spool(useradd_t) - - optional_policy(` -+ apache_manage_all_content(useradd_t) -+') -+ -+optional_policy(` - dpkg_use_fds(useradd_t) - dpkg_rw_pipes(useradd_t) - ') - - optional_policy(` -+ nscd_domtrans(useradd_t) -+') -+ -+optional_policy(` -+ tunable_policy(`samba_domain_controller',` -+ samba_append_log(useradd_t) -+ ') -+') -+ -+optional_policy(` - rpm_use_fds(useradd_t) - rpm_rw_pipes(useradd_t) -+ rpm_dontaudit_rw_tmp_files(useradd_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.6.5/policy/modules/admin/vbetool.te ---- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/admin/vbetool.te 2007-05-22 14:41:13.000000000 -0400 -@@ -32,4 +32,5 @@ - - optional_policy(` - hal_rw_pid_files(vbetool_t) -+ hal_write_log(vbetool_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cdrecord.te serefpolicy-2.6.5/policy/modules/apps/cdrecord.te ---- nsaserefpolicy/policy/modules/apps/cdrecord.te 2007-04-23 09:35:56.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/apps/cdrecord.te 2007-05-25 08:57:00.000000000 -0400 -@@ -6,7 +6,6 @@ - # Declarations - # - --ifdef(`strict_policy',` - ## - ##

- ## Allow cdrecord to read various content. -@@ -15,7 +14,6 @@ - ##

- ## - gen_tunable(cdrecord_read_content,false) --') - - type cdrecord_exec_t; - corecmd_executable_file(cdrecord_exec_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-2.6.5/policy/modules/apps/gnome.if ---- nsaserefpolicy/policy/modules/apps/gnome.if 2007-02-19 11:32:52.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/apps/gnome.if 2007-05-24 15:02:17.000000000 -0400 -@@ -35,6 +35,7 @@ - template(`gnome_per_role_template',` - gen_require(` - type gconfd_exec_t; -+ type gconf_etc_t; - attribute gnomedomain; - ') - -@@ -102,6 +103,11 @@ - - optional_policy(` - nscd_dontaudit_search_pid($1_gconfd_t) -+ nscd_socket_use($1_gconfd_t) -+ ') -+ -+ optional_policy(` -+ ssh_dontaudit_use_user_ssh_agent_fds($1,$1_gconfd_t) - ') - - optional_policy(` -@@ -136,13 +142,32 @@ - allow $2 $1_gconfd_t:unix_stream_socket connectto; - ') - -+ -+######################################## -+## -+## Send general signals to all gconf domains. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`gnome_signal_all',` -+ gen_require(` -+ attribute gnomedomain; -+ ') -+ -+ allow $1 gnomedomain:process signal; -+') -+ - ######################################## - ## - ## Run gconfd in the role-specific gconfd domain. - ## - ## - ##

--## Run gconfd in the role-specfic gconfd domain. -+## Run gconfd in the role-specific gconfd domain. - ##

- ##

- ## This is a templated interface, and should only -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-2.6.5/policy/modules/apps/gpg.fc ---- nsaserefpolicy/policy/modules/apps/gpg.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/apps/gpg.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -7,6 +7,4 @@ - /usr/lib/gnupg/.* -- gen_context(system_u:object_r:gpg_exec_t,s0) - /usr/lib/gnupg/gpgkeys.* -- gen_context(system_u:object_r:gpg_helper_exec_t,s0) - --ifdef(`targeted_policy',`',` - HOME_DIR/\.gnupg(/.+)? gen_context(system_u:object_r:ROLE_gpg_secret_t,s0) --') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.6.5/policy/modules/apps/java.if ---- nsaserefpolicy/policy/modules/apps/java.if 2007-02-19 11:32:52.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/apps/java.if 2007-05-22 14:41:13.000000000 -0400 -@@ -224,3 +224,35 @@ - refpolicywarn(`$0($1) has no effect in strict policy.') - ') - ') -+ -+######################################## -+##

-+## Execute a java in the specified domain -+## -+## -+##

-+## Execute the java command in the specified domain. This allows -+## the specified domain to execute any file -+## on these filesystems in the specified -+## domain. -+##

-+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The type of the new process. -+## -+## -+# -+interface(`java_spec_domtrans',` -+ gen_require(` -+ type java_exec_t; -+ ') -+ -+ domain_trans($1,java_exec_t,$2) -+ type_transition $1 java_exec_t:process $2; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.if serefpolicy-2.6.5/policy/modules/apps/loadkeys.if ---- nsaserefpolicy/policy/modules/apps/loadkeys.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/apps/loadkeys.if 2007-05-22 14:41:13.000000000 -0400 -@@ -11,16 +11,12 @@ - ## - # - interface(`loadkeys_domtrans',` -- ifdef(`strict_policy',` -- gen_require(` -- type loadkeys_t, loadkeys_exec_t; -- ') -- -- corecmd_search_bin($1) -- domtrans_pattern($1, loadkeys_exec_t, loadkeys_t) -- ',` -- refpolicywarn(`$0($*) has no effect in targeted policy.') -+ gen_require(` -+ type loadkeys_t, loadkeys_exec_t; - ') -+ -+ corecmd_search_bin($1) -+ domtrans_pattern($1, loadkeys_exec_t, loadkeys_t) - ') - - ######################################## -@@ -45,18 +41,13 @@ - ## - # - interface(`loadkeys_run',` -- ifdef(`targeted_policy',` -- # $0(): disabled in targeted policy as there -- # is no loadkeys domain. -- ',` -- gen_require(` -- type loadkeys_t; -- ') -- -- loadkeys_domtrans($1) -- role $2 types loadkeys_t; -- allow loadkeys_t $3:chr_file rw_term_perms; -+ gen_require(` -+ type loadkeys_t; - ') -+ -+ loadkeys_domtrans($1) -+ role $2 types loadkeys_t; -+ allow loadkeys_t $3:chr_file rw_term_perms; - ') - - ######################################## -@@ -70,15 +61,8 @@ - ## - # - interface(`loadkeys_exec',` -- ifdef(`targeted_policy',` -- # $0(): the loadkeys program is an alias -- # of generic bin programs. -- corecmd_exec_bin($1) -- ',` -- gen_require(` -- type loadkeys_exec_t; -- ') -- -- can_exec($1,loadkeys_exec_t) -+ gen_require(` -+ type loadkeys_exec_t; - ') -+ can_exec($1,loadkeys_exec_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.6.5/policy/modules/apps/mozilla.if ---- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-03-26 16:24:09.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/apps/mozilla.if 2007-05-22 14:41:13.000000000 -0400 -@@ -150,6 +150,7 @@ - corenet_dontaudit_tcp_bind_generic_port($1_mozilla_t) - - dev_read_urand($1_mozilla_t) -+ dev_read_rand($1_mozilla_t) - dev_write_sound($1_mozilla_t) - dev_read_sound($1_mozilla_t) - dev_dontaudit_rw_dri($1_mozilla_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-2.6.5/policy/modules/apps/screen.fc ---- nsaserefpolicy/policy/modules/apps/screen.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/apps/screen.fc 2007-05-25 08:59:03.000000000 -0400 -@@ -1,9 +1,7 @@ - # - # /home - # --ifdef(`strict_policy',` - HOME_DIR/\.screenrc -- gen_context(system_u:object_r:ROLE_screen_ro_home_t,s0) --') - - # - # /usr -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.6.5/policy/modules/apps/slocate.te ---- nsaserefpolicy/policy/modules/apps/slocate.te 2007-04-30 11:25:12.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/apps/slocate.te 2007-05-23 09:29:08.000000000 -0400 -@@ -39,11 +39,13 @@ - - files_list_all(locate_t) - files_getattr_all_files(locate_t) -+files_getattr_all_sockets(locate_t) - files_read_etc_runtime_files(locate_t) - files_read_etc_files(locate_t) - - fs_getattr_all_fs(locate_t) --fs_getattr_all_dirs(locate_t) -+fs_getattr_all_files(locate_t) -+fs_list_all(locate_t) - - libs_use_shared_libs(locate_t) - libs_use_ld_so(locate_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.fc serefpolicy-2.6.5/policy/modules/apps/thunderbird.fc ---- nsaserefpolicy/policy/modules/apps/thunderbird.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/apps/thunderbird.fc 2007-05-25 08:58:55.000000000 -0400 -@@ -3,6 +3,4 @@ - # - /usr/bin/thunderbird.* -- gen_context(system_u:object_r:thunderbird_exec_t,s0) - --ifdef(`strict_policy',` - HOME_DIR/\.thunderbird(/.*)? gen_context(system_u:object_r:ROLE_thunderbird_home_t,s0) --') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.fc serefpolicy-2.6.5/policy/modules/apps/uml.fc ---- nsaserefpolicy/policy/modules/apps/uml.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/apps/uml.fc 2007-05-25 08:58:48.000000000 -0400 -@@ -8,6 +8,4 @@ - # - /var/run/uml-utilities(/.*)? gen_context(system_u:object_r:uml_switch_var_run_t,s0) - --ifdef(`strict_policy',` -- HOME_DIR/\.uml(/.*)? gen_context(system_u:object_r:ROLE_uml_rw_t,s0) --') -+HOME_DIR/\.uml(/.*)? gen_context(system_u:object_r:ROLE_uml_rw_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.if serefpolicy-2.6.5/policy/modules/apps/uml.if ---- nsaserefpolicy/policy/modules/apps/uml.if 2007-03-26 10:38:58.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/apps/uml.if 2007-05-22 14:41:13.000000000 -0400 -@@ -193,33 +193,6 @@ - nis_use_ypbind($1_uml_t) - ') - -- ifdef(`TODO',` -- # for X -- optional_policy(` -- ifelse($1, sysadm,` -- ',` -- optional_policy(` -- allow $1_uml_t xdm_xserver_tmp_t:dir search; -- ') -- allow $1_uml_t $1_xserver_tmp_t:sock_file write; -- allow $1_uml_t $1_xserver_t:unix_stream_socket connectto; -- ') -- ') -- -- optional_policy(` -- # for uml_net -- domain_auto_trans($1_uml_t, uml_net_exec_t, uml_net_t) -- allow uml_net_t $1_uml_t:unix_stream_socket { read write }; -- allow uml_net_t $1_uml_t:unix_dgram_socket { read write }; -- dontaudit uml_net_t privfd:fd use; -- can_access_pty(uml_net_t, $1_uml) -- dontaudit uml_net_t $1_uml_rw_t:dir { getattr search }; -- ') -- #TODO -- optional_policy(` -- allow $1_uml_t $1_xauth_home_t:file { getattr read }; -- ') -- ') - ') - - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/usernetctl.te serefpolicy-2.6.5/policy/modules/apps/usernetctl.te ---- nsaserefpolicy/policy/modules/apps/usernetctl.te 2007-04-23 09:35:56.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/apps/usernetctl.te 2007-05-25 08:58:42.000000000 -0400 -@@ -6,7 +6,6 @@ - # Declarations - # - --ifdef(`strict_policy',` - ## - ##

- ## Allow users to control network interfaces -@@ -14,7 +13,6 @@ - ##

- ## - gen_tunable(user_net_control,false) --') - - type usernetctl_t; - type usernetctl_exec_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-2.6.5/policy/modules/apps/vmware.fc ---- nsaserefpolicy/policy/modules/apps/vmware.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/apps/vmware.fc 2007-05-25 08:58:36.000000000 -0400 -@@ -1,11 +1,9 @@ - # - # HOME_DIR/ - # --ifdef(`strict_policy',` - HOME_DIR/\.vmware(/.*)? gen_context(system_u:object_r:ROLE_vmware_file_t,s0) - HOME_DIR/vmware(/.*)? gen_context(system_u:object_r:ROLE_vmware_file_t,s0) - HOME_DIR/\.vmware[^/]*/.*\.cfg -- gen_context(system_u:object_r:ROLE_vmware_conf_t,s0) --') - - # - # /etc -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.6.5/policy/modules/kernel/corecommands.fc ---- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2007-04-11 15:52:53.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/corecommands.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -36,6 +36,11 @@ - /etc/cipe/ip-up.* -- gen_context(system_u:object_r:bin_t,s0) - /etc/cipe/ip-down.* -- gen_context(system_u:object_r:bin_t,s0) - -+/etc/cron.daily/.* -- gen_context(system_u:object_r:bin_t,s0) -+/etc/cron.hourly/.* -- gen_context(system_u:object_r:bin_t,s0) -+/etc/cron.weekly/.* -- gen_context(system_u:object_r:bin_t,s0) -+/etc/cron.monthly/.* -- gen_context(system_u:object_r:bin_t,s0) -+ - /etc/hotplug/.*agent -- gen_context(system_u:object_r:bin_t,s0) - /etc/hotplug/.*rc -- gen_context(system_u:object_r:bin_t,s0) - /etc/hotplug/hotplug\.functions -- gen_context(system_u:object_r:bin_t,s0) -@@ -256,3 +261,5 @@ - ifdef(`distro_suse',` - /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) - ') -+/usr/lib/vmware-tools/sbin32(/.*)? gen_context(system_u:object_r:bin_t,s0) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.6.5/policy/modules/kernel/corecommands.if ---- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-03-26 10:38:57.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/corecommands.if 2007-05-22 14:41:13.000000000 -0400 -@@ -988,3 +988,23 @@ - - mmap_files_pattern($1,bin_t,exec_type) - ') -+ -+######################################## -+## -+## dontaudit checking for execute privs on all executables -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`corecmd_dontaudit_exec_all_executables',` -+ gen_require(` -+ attribute exec_type; -+ ') -+ -+ dontaudit $1 exec_type:file execute; -+') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.6.5/policy/modules/kernel/corenetwork.te.in ---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2007-05-18 11:12:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/corenetwork.te.in 2007-05-22 14:41:13.000000000 -0400 -@@ -48,6 +48,11 @@ - type reserved_port_t, port_type, reserved_port_type; - - # -+# hi_reserved_port_t is the type of INET port numbers between 600-1023. -+# -+type hi_reserved_port_t, port_type, reserved_port_type, rpc_port_type; -+ -+# - # server_packet_t is the default type of IPv4 and IPv6 server packets. - # - type server_packet_t, packet_type, server_packet_type; -@@ -86,7 +91,7 @@ - network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy - network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0, tcp,8443,s0) #8443 is mod_nss default port - network_port(howl, tcp,5335,s0, udp,5353,s0) --network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp,50000,s0, tcp,50002,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0) -+network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp, 8290,s0, tcp,50000,s0, tcp,50002,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0) - network_port(i18n_input, tcp,9010,s0) - network_port(imaze, tcp,5323,s0, udp,5323,s0) - network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0) -@@ -101,7 +106,7 @@ - network_port(kerberos_master, tcp,4444,s0, udp,4444,s0) - network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0) - network_port(ktalkd, udp,517,s0, udp,518,s0) --network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0) -+network_port(ldap, tcp,3268,s0, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0) - type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon - network_port(lmtp, tcp,24,s0, udp,24,s0) - network_port(mail, tcp,2000,s0) -@@ -160,6 +165,9 @@ - - # Defaults for reserved ports. Earlier portcon entries take precedence; - # these entries just cover any remaining reserved ports not otherwise declared. -+ -+portcon tcp 600-1023 gen_context(system_u:object_r:hi_reserved_port_t, s0) -+portcon udp 600-1023 gen_context(system_u:object_r:hi_reserved_port_t, s0) - portcon tcp 1-1023 gen_context(system_u:object_r:reserved_port_t, s0) - portcon udp 1-1023 gen_context(system_u:object_r:reserved_port_t, s0) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.6.5/policy/modules/kernel/devices.fc ---- nsaserefpolicy/policy/modules/kernel/devices.fc 2007-03-01 10:01:48.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/devices.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -19,6 +19,7 @@ - /dev/evtchn -c gen_context(system_u:object_r:xen_device_t,s0) - /dev/fb[0-9]* -c gen_context(system_u:object_r:framebuf_device_t,s0) - /dev/full -c gen_context(system_u:object_r:null_device_t,s0) -+/dev/fw.* -c gen_context(system_u:object_r:usb_device_t,s0) - /dev/hiddev.* -c gen_context(system_u:object_r:usb_device_t,s0) - /dev/hpet -c gen_context(system_u:object_r:clock_device_t,s0) - /dev/hw_random -c gen_context(system_u:object_r:random_device_t,s0) -@@ -81,6 +82,8 @@ - - /dev/bus/usb/.*/[0-9]+ -c gen_context(system_u:object_r:usb_device_t,s0) - -+/dev/cmx.* -c gen_context(system_u:object_r:smartcard_device_t,s0) -+ - /dev/cpu/.* -c gen_context(system_u:object_r:cpu_device_t,s0) - /dev/cpu/mtrr -c gen_context(system_u:object_r:mtrr_device_t,s0) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.6.5/policy/modules/kernel/devices.if ---- nsaserefpolicy/policy/modules/kernel/devices.if 2007-05-07 14:50:42.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/devices.if 2007-05-22 14:41:13.000000000 -0400 -@@ -2729,6 +2729,24 @@ - - ######################################## - ## -+## Get the attributes of a directory in the usb filesystem. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dev_search_usbfs_dirs',` -+ gen_require(` -+ type usbfs_t; -+ ') -+ -+ allow $1 usbfs_t:dir search_dir_perms; -+') -+ -+######################################## -+## - ## Do not audit attempts to get the attributes - ## of a directory in the usb filesystem. - ## -@@ -3210,3 +3228,78 @@ - - typeattribute $1 devices_unconfined_type; - ') -+ -+######################################## -+## -+## Getattr on smartcard devices -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dev_getattr_smartcard',` -+ gen_require(` -+ type smartcard_device_t; -+ ') -+ -+ allow $1 smartcard_device_t:chr_file getattr; -+ -+') -+ -+######################################## -+## -+## dontaudit getattr on smartcard devices -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dev_dontaudit_getattr_smartcard',` -+ gen_require(` -+ type smartcard_device_t; -+ ') -+ -+ dontaudit $1 smartcard_device_t:chr_file getattr; -+ -+') -+ -+######################################## -+## -+## Read and write smartcard devices. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dev_rw_smartcard',` -+ gen_require(` -+ type device_t, smartcard_device_t; -+ ') -+ -+ rw_chr_files_pattern($1,device_t,smartcard_device_t) -+') -+ -+######################################## -+## -+## Create, read, write, and delete smartcard devices. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dev_manage_smartcard',` -+ gen_require(` -+ type device_t, smartcard_device_t; -+ ') -+ -+ manage_chr_files_pattern($1,device_t,smartcard_device_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.6.5/policy/modules/kernel/devices.te ---- nsaserefpolicy/policy/modules/kernel/devices.te 2007-05-07 14:50:42.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/devices.te 2007-05-22 14:41:13.000000000 -0400 -@@ -139,6 +139,12 @@ - # - # Type for sound devices and mixers - # -+type smartcard_device_t; -+dev_node(smartcard_device_t) -+ -+# -+# Type for sound devices and mixers -+# - type sound_device_t; - dev_node(sound_device_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.6.5/policy/modules/kernel/domain.if ---- nsaserefpolicy/policy/modules/kernel/domain.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/domain.if 2007-05-22 14:41:13.000000000 -0400 -@@ -1254,3 +1254,21 @@ - typeattribute $1 can_change_object_identity; - typeattribute $1 set_curr_context; - ') -+ -+######################################## -+## -+## Allow specified type to associate ipsec packets from any domain -+## -+## -+## -+## Type of subject to be allowed this. -+## -+## -+# -+interface(`domain_ipsec_labels',` -+ gen_require(` -+ attribute domain; -+ ') -+ -+ allow $1 domain:association { sendto recvfrom }; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.6.5/policy/modules/kernel/domain.te ---- nsaserefpolicy/policy/modules/kernel/domain.te 2007-04-23 09:35:56.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/domain.te 2007-05-22 14:41:13.000000000 -0400 -@@ -6,6 +6,29 @@ - # Declarations - # - -+ifdef(`enable_mls',` -+## -+##

-+## Allow all domains to use netlabel labeled packets -+##

-+## -+gen_tunable(allow_netlabel,true) -+ -+## -+##

-+## Allow all domains to use ipsec labeled packets -+##

-+## -+gen_tunable(allow_ipsec_label,true) -+') -+ -+## -+##

-+## Allow unlabeled packets to work on system -+##

-+## -+gen_tunable(allow_unlabeled_packets,true) -+ - # Mark process types as domains - attribute domain; - -@@ -144,3 +167,26 @@ - - # act on all domains keys - allow unconfined_domain_type domain:key *; -+ -+ -+# xdm passes an open file descriptor to xsession-errors.log which is then audited by all confined domains. -+optional_policy(` -+ xserver_dontaudit_use_xdm_fds(domain) -+ xserver_dontaudit_rw_xdm_pipes(domain) -+') -+ -+tunable_policy(`allow_unlabeled_packets',` -+ kernel_sendrecv_unlabeled_association(domain) -+ corenet_sendrecv_unlabeled_packets(domain) -+') -+ -+ifdef(`enable_mls',` -+ tunable_policy(`allow_netlabel',` -+ kernel_raw_recvfrom_unlabeled(domain) -+ kernel_tcp_recvfrom_unlabeled(domain) -+ kernel_udp_recvfrom_unlabeled(domain) -+ ') -+ tunable_policy(`allow_ipsec_label',` -+ ipsec_labeled(domain) -+ ') -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.6.5/policy/modules/kernel/files.fc ---- nsaserefpolicy/policy/modules/kernel/files.fc 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/files.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -45,7 +45,6 @@ - /etc -d gen_context(system_u:object_r:etc_t,s0) - /etc/.* gen_context(system_u:object_r:etc_t,s0) - /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) --/etc/asound\.state -- gen_context(system_u:object_r:etc_runtime_t,s0) - /etc/blkid(/.*)? gen_context(system_u:object_r:etc_runtime_t,s0) - /etc/fstab\.REVOKE -- gen_context(system_u:object_r:etc_runtime_t,s0) - /etc/HOSTNAME -- gen_context(system_u:object_r:etc_runtime_t,s0) -@@ -54,6 +53,7 @@ - /etc/issue\.net -- gen_context(system_u:object_r:etc_runtime_t,s0) - /etc/localtime -l gen_context(system_u:object_r:etc_t,s0) - /etc/mtab -- gen_context(system_u:object_r:etc_runtime_t,s0) -+/etc/mtab\.fuselock -- gen_context(system_u:object_r:etc_runtime_t,s0) - /etc/motd -- gen_context(system_u:object_r:etc_runtime_t,s0) - /etc/nohotplug -- gen_context(system_u:object_r:etc_runtime_t,s0) - /etc/nologin.* -- gen_context(system_u:object_r:etc_runtime_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.6.5/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2007-02-26 14:17:21.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/files.if 2007-05-23 09:19:57.000000000 -0400 -@@ -343,8 +343,7 @@ - - ######################################## - ## --## Mount a filesystem on all non-security --## directories and files. -+## Mount a filesystem on all non-security directories. - ## - ## - ## -@@ -352,12 +351,29 @@ - ## - ## - # --interface(`files_mounton_non_security',` -+interface(`files_mounton_non_security_dir',` - gen_require(` - attribute file_type, security_file_type; - ') - - allow $1 { file_type -security_file_type }:dir mounton; -+') -+ -+######################################## -+## -+## Mount a filesystem on all non-security and files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`files_mounton_non_security_files',` -+ gen_require(` -+ attribute file_type, security_file_type; -+ ') -+ - allow $1 { file_type -security_file_type }:file mounton; - ') - -@@ -376,7 +392,7 @@ - attribute file_type, security_file_type; - ') - -- allow $1 { file_type -security_file_type }:dir write; -+ allow $1 { file_type -security_file_type }:dir rw_dir_perms; - ') - - ######################################## -@@ -992,7 +1008,7 @@ - attribute file_type; - ') - -- dontaudit $1 file_type:dir search; -+ dontaudit $1 file_type:dir search_dir_perms; - ') - - ######################################## -@@ -1320,7 +1336,7 @@ - type boot_t; - ') - -- dontaudit $1 boot_t:dir search; -+ dontaudit $1 boot_t:dir search_dir_perms; - ') - - ######################################## -@@ -3310,6 +3326,42 @@ - - ######################################## - ## -+## Add and remove entries from /usr directories. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`files_rw_usr_dirs',` -+ gen_require(` -+ type usr_t; -+ ') -+ -+ allow $1 usr_t:dir rw_dir_perms; -+') -+ -+######################################## -+## -+## Create, read, write, and delete files in the /usr directory. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`files_manage_usr_files',` -+ gen_require(` -+ type usr_t; -+ ') -+ -+ manage_files_pattern($1, usr_t, usr_t) -+') -+ -+######################################## -+## - ## Get the attributes of files in /usr. - ## - ## -@@ -3637,7 +3689,7 @@ - type var_t; - ') - -- dontaudit $1 var_t:dir search; -+ dontaudit $1 var_t:dir search_dir_perms; - ') - - ######################################## -@@ -3993,7 +4045,7 @@ - type var_lock_t; - ') - -- dontaudit $1 var_lock_t:dir search; -+ dontaudit $1 var_lock_t:dir search_dir_perms; - ') - - ######################################## -@@ -4012,7 +4064,7 @@ - type var_t, var_lock_t; - ') - -- rw_dirs_pattern($1,var_t,var_lock_t) -+ rw_files_pattern($1,var_t,var_lock_t) - ') - - ######################################## -@@ -4181,7 +4233,7 @@ - type var_run_t; - ') - -- dontaudit $1 var_run_t:dir search; -+ dontaudit $1 var_run_t:dir search_dir_perms; - ') - - ######################################## -@@ -4529,6 +4581,8 @@ - # Need to give access to /selinux/member - selinux_compute_member($1) - -+ files_search_home($1) -+ - # Need sys_admin capability for mounting - allow $1 self:capability { chown fsetid sys_admin }; - -@@ -4551,6 +4605,8 @@ - # Default type for mountpoints - allow $1 poly_t:dir { create mounton }; - fs_unmount_xattr_fs($1) -+ corecmd_exec_bin($1) -+ - ') - - ######################################## -@@ -4588,3 +4644,28 @@ - - allow $1 { file_type -security_file_type }:dir manage_dir_perms; - ') -+ -+######################################## -+## -+## Create a core files in / -+## -+## -+##

-+## Create a core file in /, -+##

-+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+# -+interface(`files_dump_core',` -+ gen_require(` -+ type root_t; -+ ') -+ -+ allow $1 root_t:dir rw_dir_perms; -+ allow $1 root_t:file { create getattr write }; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-2.6.5/policy/modules/kernel/files.te ---- nsaserefpolicy/policy/modules/kernel/files.te 2007-04-23 09:35:56.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/files.te 2007-05-22 14:41:13.000000000 -0400 -@@ -54,6 +54,7 @@ - files_type(etc_t) - # compatibility aliases for removed types: - typealias etc_t alias automount_etc_t; -+typealias etc_t alias snmpd_etc_t; - - # - # etc_runtime_t is the type of various -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.6.5/policy/modules/kernel/filesystem.if ---- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-03-26 16:24:09.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/filesystem.if 2007-05-22 14:41:13.000000000 -0400 -@@ -1096,6 +1096,24 @@ - - ######################################## - ## -+## Search dosfs filesystem. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`fs_search_dos',` -+ gen_require(` -+ type dosfs_t; -+ ') -+ -+ allow $1 dosfs_t:dir search_dir_perms; -+') -+ -+######################################## -+## - ## Read files on a DOS filesystem. - ## - ## -@@ -1291,6 +1309,26 @@ - - ######################################## - ## -+## Read files on an iso9660 filesystem, which -+## is usually used on CDs. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`fs_getattr_iso9660_files',` -+ gen_require(` -+ type iso9660_t; -+ ') -+ -+ allow $1 iso9660_t:dir list_dir_perms; -+ allow $1 iso9660_t:file getattr; -+') -+ -+######################################## -+## - ## Mount a NFS filesystem. - ## - ## -@@ -3420,3 +3458,22 @@ - relabelfrom_blk_files_pattern($1,noxattrfs,noxattrfs) - relabelfrom_chr_files_pattern($1,noxattrfs,noxattrfs) - ') -+ -+ -+######################################## -+## -+## Mount an fuse filesystem. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`fs_mount_fusefs',` -+ gen_require(` -+ type fusefs_t; -+ ') -+ -+ allow $1 fusefs_t:filesystem mount; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.6.5/policy/modules/kernel/filesystem.te ---- nsaserefpolicy/policy/modules/kernel/filesystem.te 2007-04-23 09:35:56.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/filesystem.te 2007-05-22 14:41:13.000000000 -0400 -@@ -54,17 +54,29 @@ - - type capifs_t; - fs_type(capifs_t) -+files_mountpoint(capifs_t) - genfscon capifs / gen_context(system_u:object_r:capifs_t,s0) - - type configfs_t; - fs_type(configfs_t) - genfscon configfs / gen_context(system_u:object_r:configfs_t,s0) - -+type cpusetfs_t; -+fs_type(cpusetfs_t) -+allow cpusetfs_t self:filesystem associate; -+genfscon cpuset / gen_context(system_u:object_r:cpusetfs_t,s0) -+ - type eventpollfs_t; - fs_type(eventpollfs_t) - # change to task SID 20060628 - #genfscon eventpollfs / gen_context(system_u:object_r:eventpollfs_t,s0) - -+type fusefs_t; -+fs_noxattr_type(fusefs_t) -+allow fusefs_t self:filesystem associate; -+genfscon fuse / gen_context(system_u:object_r:fusefs_t,s0) -+genfscon fuseblk / gen_context(system_u:object_r:fusefs_t,s0) -+ - type futexfs_t; - fs_type(futexfs_t) - genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0) -@@ -83,6 +95,11 @@ - fs_type(inotifyfs_t) - genfscon inotifyfs / gen_context(system_u:object_r:inotifyfs_t,s0) - -+type mvfs_t; -+fs_noxattr_type(mvfs_t) -+allow mvfs_t self:filesystem associate; -+genfscon mvfs / gen_context(system_u:object_r:mvfs_t,s0) -+ - type nfsd_fs_t; - fs_type(nfsd_fs_t) - genfscon nfsd / gen_context(system_u:object_r:nfsd_fs_t,s0) -@@ -105,6 +122,11 @@ - genfscon rpc_pipefs / gen_context(system_u:object_r:rpc_pipefs_t,s0) - files_mountpoint(rpc_pipefs_t) - -+type vxfs_t; -+fs_noxattr_type(vxfs_t) -+files_mountpoint(vxfs_t) -+genfscon vxfs / gen_context(system_u:object_r:vxfs_t,s0) -+ - # - # tmpfs_t is the type for tmpfs filesystems - # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.6.5/policy/modules/kernel/kernel.if ---- nsaserefpolicy/policy/modules/kernel/kernel.if 2007-05-02 15:04:46.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/kernel.if 2007-05-22 14:41:13.000000000 -0400 -@@ -1848,6 +1848,26 @@ - - ######################################## - ## -+## Read the process state (/proc/pid) of all unlabeled_t. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`kernel_read_unlabeled_state',` -+ gen_require(` -+ type unlabeled_t; -+ ') -+ -+ allow $1 unlabeled_t:dir list_dir_perms; -+ read_files_pattern($1,unlabeled_t,unlabeled_t) -+ read_lnk_files_pattern($1,unlabeled_t,unlabeled_t) -+') -+ -+######################################## -+## - ## Do not audit attempts to list unlabeled directories. - ## - ## -@@ -2158,9 +2178,6 @@ - ') - - allow $1 unlabeled_t:association { sendto recvfrom }; -- -- # temporary hack until labeling on packets is supported -- allow $1 unlabeled_t:packet { send recv }; - ') - - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.6.5/policy/modules/kernel/kernel.te ---- nsaserefpolicy/policy/modules/kernel/kernel.te 2007-05-02 15:04:46.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/kernel.te 2007-05-22 14:41:13.000000000 -0400 -@@ -146,6 +146,8 @@ - type unlabeled_t; - sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) - -+corenet_non_ipsec_sendrecv(unlabeled_t) -+ - # These initial sids are no longer used, and can be removed: - sid any_socket gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) - sid file_labels gen_context(system_u:object_r:unlabeled_t,s0) -@@ -279,6 +281,7 @@ - - optional_policy(` - logging_send_syslog_msg(kernel_t) -+ logging_unconfined(kernel_t) - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.6.5/policy/modules/kernel/mls.if ---- nsaserefpolicy/policy/modules/kernel/mls.if 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/mls.if 2007-05-22 14:41:13.000000000 -0400 -@@ -154,6 +154,26 @@ - ######################################## - ## - ## Make specified domain MLS trusted -+## for writing to sockets at any level -+## that is dominated by the process clearance. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`mls_socket_write_to_clearance',` -+ gen_require(` -+ attribute mlsnetwritetoclr; -+ ') -+ -+ typeattribute $1 mlsnetwritetoclr; -+') -+ -+######################################## -+## -+## Make specified domain MLS trusted - ## for writing to sockets at any level. - ## - ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.6.5/policy/modules/kernel/mls.te ---- nsaserefpolicy/policy/modules/kernel/mls.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/mls.te 2007-05-22 14:41:13.000000000 -0400 -@@ -18,6 +18,7 @@ - attribute mlsnetreadtoclr; - attribute mlsnetwrite; - attribute mlsnetwritetoclr; -+attribute mlsnetwriteranged; - attribute mlsnetupgrade; - attribute mlsnetdowngrade; - attribute mlsnetrecvall; -@@ -43,6 +44,8 @@ - attribute mlsxwinwritecolormap; - attribute mlsxwinwritexinput; - -+# Object attributes that allow MLS overrides for access by all subjects -+attribute mlsrangedobject; - attribute mlstrustedobject; - - attribute privrangetrans; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.6.5/policy/modules/kernel/selinux.if ---- nsaserefpolicy/policy/modules/kernel/selinux.if 2007-02-27 14:37:10.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/selinux.if 2007-05-24 15:28:25.000000000 -0400 -@@ -51,6 +51,44 @@ - - ######################################## - ## -+## Do not audit attempts to get the -+## attributes of the selinuxfs filesystem -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`selinux_dontaudit_getattr_fs',` -+ gen_require(` -+ type security_t; -+ ') -+ -+ dontaudit $1 security_t:filesystem getattr; -+') -+ -+######################################## -+## -+## Allow domain to get the -+## attributes of the selinuxfs filesystem -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`selinux_getattr_fs',` -+ gen_require(` -+ type security_t; -+ ') -+ -+ allow $1 security_t:filesystem getattr; -+') -+ -+######################################## -+## - ## Search selinuxfs. - ## - ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-2.6.5/policy/modules/kernel/storage.if ---- nsaserefpolicy/policy/modules/kernel/storage.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/storage.if 2007-05-22 14:41:13.000000000 -0400 -@@ -100,6 +100,7 @@ - - dev_list_all_dev_nodes($1) - allow $1 fixed_disk_device_t:blk_file read_blk_file_perms; -+ allow $1 fixed_disk_device_t:chr_file read_chr_file_perms; - typeattribute $1 fixed_disk_raw_read; - ') - -@@ -144,6 +145,7 @@ - - dev_list_all_dev_nodes($1) - allow $1 fixed_disk_device_t:blk_file write_blk_file_perms; -+ allow $1 fixed_disk_device_t:chr_file write_chr_file_perms; - typeattribute $1 fixed_disk_raw_write; - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.6.5/policy/modules/kernel/terminal.if ---- nsaserefpolicy/policy/modules/kernel/terminal.if 2007-02-20 16:35:52.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/kernel/terminal.if 2007-05-22 14:41:13.000000000 -0400 -@@ -278,6 +278,25 @@ - - ######################################## - ## -+## Relabel from and to the console_device_t -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`term_relabel_console',` -+ gen_require(` -+ type console_device_t; -+ ') -+ -+ dev_list_all_dev_nodes($1) -+ allow $1 console_device_t:chr_file { relabelfrom relabelto }; -+') -+ -+######################################## -+## - ## Create the console device (/dev/console). - ## - ## -@@ -1052,7 +1071,7 @@ - ') - - dev_list_all_dev_nodes($1) -- allow $1 ttynode:chr_file { getattr write }; -+ allow $1 ttynode:chr_file { getattr write append }; - ') - - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-2.6.5/policy/modules/kernel/terminal.te ---- nsaserefpolicy/policy/modules/kernel/terminal.te 2007-04-23 09:35:56.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/kernel/terminal.te 2007-05-22 14:41:13.000000000 -0400 -@@ -28,6 +28,7 @@ - type devpts_t; - files_mountpoint(devpts_t) - fs_associate_tmpfs(devpts_t) -+files_associate_tmp(devpts_t) - fs_type(devpts_t) - fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0); - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.fc serefpolicy-2.6.5/policy/modules/services/aide.fc ---- nsaserefpolicy/policy/modules/services/aide.fc 2007-04-30 11:25:12.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/aide.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -2,5 +2,5 @@ - - /var/lib/aide(/.*) gen_context(system_u:object_r:aide_db_t,mls_systemhigh) - --/var/log/aide(/.*)? gen_context(system_u:object_r:aide_log_t,mls_systemhigh) - /var/log/aide.log -- gen_context(system_u:object_r:aide_log_t,mls_systemhigh) -+/var/log/aide(/.*)? gen_context(system_u:object_r:aide_log_t,mls_systemhigh) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.te serefpolicy-2.6.5/policy/modules/services/aide.te ---- nsaserefpolicy/policy/modules/services/aide.te 2007-04-30 11:25:12.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/aide.te 2007-05-22 14:41:13.000000000 -0400 -@@ -26,7 +26,7 @@ - - allow aide_t self:capability { dac_override fowner }; - --send_audit_msgs_pattern(aide_t) -+logging_send_audit_msg(aide_t) - - # database actions - manage_files_pattern(aide_t,aide_db_t,aide_db_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-2.6.5/policy/modules/services/amavis.if ---- nsaserefpolicy/policy/modules/services/amavis.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/amavis.if 2007-05-22 14:41:13.000000000 -0400 -@@ -167,3 +167,22 @@ - allow $1 amavis_var_run_t:file setattr; - files_search_pids($1) - ') -+ -+######################################## -+## -+## Set the create of amavis var run files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`amavis_create_pid_files',` -+ gen_require(` -+ type amavis_var_run_t; -+ ') -+ -+ allow $1 amavis_var_run_t:file create_file_perms; -+ files_search_pids($1) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.6.5/policy/modules/services/apache.fc ---- nsaserefpolicy/policy/modules/services/apache.fc 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/apache.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -1,10 +1,5 @@ - # temporary hack till genhomedircon is fixed --ifdef(`targeted_policy',` --HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) --',` - HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0) --') -- - /etc/apache(2)?(/.*)? gen_context(system_u:object_r:httpd_config_t,s0) - /etc/apache-ssl(2)?(/.*)? gen_context(system_u:object_r:httpd_config_t,s0) - /etc/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) -@@ -21,7 +16,6 @@ - - /usr/lib/apache-ssl/.+ -- gen_context(system_u:object_r:httpd_exec_t,s0) - /usr/lib/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) --/usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_exec_t,s0) - /usr/lib(64)?/apache(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0) - /usr/lib(64)?/apache2/modules(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0) - /usr/lib(64)?/apache(2)?/suexec(2)? -- gen_context(system_u:object_r:httpd_suexec_exec_t,s0) -@@ -78,3 +72,11 @@ - /var/www/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) - /var/www/icons(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) - /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) -+ -+#Bugzilla file context -+/usr/share/bugzilla(/.*)? -d gen_context(system_u:object_r:httpd_bugzilla_content_t,s0) -+/usr/share/bugzilla(/.*)? -- gen_context(system_u:object_r:httpd_bugzilla_script_exec_t,s0) -+/var/lib/bugzilla(/.*)? gen_context(system_u:object_r:httpd_bugzilla_script_rw_t,s0) -+#viewvc file context -+/var/spool/viewvc(/.*)? gen_context(system_u:object_r:httpd_sys_script_rw_t, s0) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.6.5/policy/modules/services/apache.if ---- nsaserefpolicy/policy/modules/services/apache.if 2007-04-02 10:58:34.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/apache.if 2007-05-22 14:41:13.000000000 -0400 -@@ -18,10 +18,6 @@ - attribute httpd_script_exec_type; - type httpd_t, httpd_suexec_t, httpd_log_t; - ') -- # allow write access to public file transfer -- # services files. -- gen_tunable(allow_httpd_$1_script_anon_write,false) -- - #This type is for webpages - type httpd_$1_content_t, httpdcontent; # customizable - files_type(httpd_$1_content_t) -@@ -120,10 +116,6 @@ - can_exec(httpd_$1_script_t, httpdcontent) - ') - -- tunable_policy(`allow_httpd_$1_script_anon_write',` -- miscfiles_manage_public_files(httpd_$1_script_t) -- ') -- - # Allow the web server to run scripts and serve pages - tunable_policy(`httpd_builtin_scripting',` - manage_dirs_pattern(httpd_t,httpd_$1_script_rw_t,httpd_$1_script_rw_t) -@@ -268,8 +260,11 @@ - ') - - apache_content_template($1) -+ manage_dirs_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) -+ manage_files_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) -+ manage_lnk_files_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) - -- typeattribute httpd_$1_script_t httpd_script_domains; -+ typeattribute httpd_$1_content_t httpd_script_domains; - userdom_user_home_content($1,httpd_$1_content_t) - - role $3 types httpd_$1_script_t; -@@ -434,6 +429,24 @@ - - ######################################## - ## -+## getattr apache.process -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`apache_getattr',` -+ gen_require(` -+ type httpd_t; -+ ') -+ -+ allow $1 httpd_t:process getattr; -+') -+ -+######################################## -+## - ## Inherit and use file descriptors from Apache. - ## - ## -@@ -752,6 +765,7 @@ - ') - - allow $1 httpd_modules_t:dir list_dir_perms; -+ read_lnk_files_pattern($1,httpd_modules_t,httpd_modules_t) - ') - - ######################################## -@@ -836,6 +850,10 @@ - type httpd_sys_script_t; - ') - -+ tunable_policy(`httpd_enable_cgi',` -+ domtrans_pattern($1, httpd_sys_script_exec_t, httpd_sys_script_t) -+ ') -+ - tunable_policy(`httpd_enable_cgi && httpd_unified',` - domtrans_pattern($1, httpdcontent, httpd_sys_script_t) - ') -@@ -923,7 +941,7 @@ - type httpd_squirrelmail_t; - ') - -- allow $1 httpd_squirrelmail_t:file { getattr read }; -+ read_files_pattern($1,httpd_squirrelmail_t,httpd_squirrelmail_t) - ') - - ######################################## -@@ -1000,3 +1018,140 @@ - - allow $1 httpd_sys_script_t:dir search_dir_perms; - ') -+ -+######################################## -+## -+## Allow the specified domain to manage -+## apache modules. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`apache_manage_modules',` -+ gen_require(` -+ type httpd_modules_t; -+ ') -+ -+ manage_dirs_pattern($1,httpd_modules_t,httpd_modules_t) -+ manage_files_pattern($1,httpd_modules_t,httpd_modules_t) -+ manage_lnk_files_pattern($1,httpd_modules_t,httpd_modules_t) -+') -+ -+######################################## -+## -+## Allow the specified domain to create -+## apache lock file -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`apache_manage_lock',` -+ gen_require(` -+ type httpd_lock_t; -+ ') -+ allow $1 httpd_lock_t:file manage_file_perms; -+ files_lock_filetrans($1, httpd_lock_t, file) -+') -+ -+######################################## -+## -+## Allow the specified domain to manage -+## apache pid file -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`apache_manage_pid',` -+ gen_require(` -+ type httpd_var_run_t; -+ ') -+ manage_files_pattern($1,httpd_var_run_t,httpd_var_run_t) -+ files_pid_filetrans($1,httpd_var_run_t, file) -+') -+ -+######################################## -+## -+##f Read apache system state -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`apache_read_state',` -+ gen_require(` -+ type httpd_t; -+ ') -+ kernel_search_proc($1) -+ allow $1 httpd_t:dir list_dir_perms; -+ read_files_pattern($1,httpd_t,httpd_t) -+ read_lnk_files_pattern($1,httpd_t,httpd_t) -+ dontaudit $1 httpd_t:process ptrace; -+') -+ -+######################################## -+## -+##f allow domain to signal apache -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`apache_signal',` -+ gen_require(` -+ type httpd_t; -+ ') -+ allow $1 httpd_t:process signal; -+') -+ -+######################################## -+## -+## allow domain to relabel apache content -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`apache_relabel',` -+ gen_require(` -+ attribute httpdcontent; -+ attribute httpd_script_exec_type; -+ ') -+ -+ allow $1 { httpd_script_exec_type httpdcontent}:dir { relabelto relabelfrom }; -+ allow $1 { httpd_script_exec_type httpdcontent}:file { relabelto relabelfrom }; -+') -+ -+######################################## -+## -+## Allow the specified domain to search -+## apache bugzilla directories. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`apache_search_bugzilla_dirs',` -+ gen_require(` -+ type httpd_bugzilla_content_t; -+ ') -+ -+ allow $1 httpd_bugzilla_content_t:dir search_dir_perms; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.6.5/policy/modules/services/apache.te ---- nsaserefpolicy/policy/modules/services/apache.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/apache.te 2007-05-24 16:08:36.000000000 -0400 -@@ -47,6 +47,13 @@ - ## Allow http daemon to tcp connect - ##

- ## -+gen_tunable(httpd_can_sendmail,false) -+ -+## -+##

-+## Allow http daemon to tcp connect -+##

-+## - gen_tunable(httpd_can_network_connect,false) - - ## -@@ -106,6 +113,27 @@ - ## - gen_tunable(httpd_unified,false) - -+## -+##

-+## Allow httpd to read nfs files -+##

-+## -+gen_tunable(httpd_use_nfs,false) -+ -+## -+##

-+## Allow httpd to read cifs files -+##

-+## -+gen_tunable(httpd_use_cifs,false) -+ -+## -+##

-+## Allow apache scripts to write to public content -+##

-+## -+gen_tunable(allow_httpd_sys_script_anon_write,false) -+ - attribute httpdcontent; - - # domains that can exec all users scripts -@@ -201,11 +229,6 @@ - type squirrelmail_spool_t; - files_tmp_file(squirrelmail_spool_t) - --ifdef(`targeted_policy',` -- typealias httpd_sys_content_t alias httpd_user_content_t; -- typealias httpd_sys_script_exec_t alias httpd_user_script_exec_t; --') -- - optional_policy(` - prelink_object_file(httpd_modules_t) - ') -@@ -257,6 +280,7 @@ - allow httpd_t httpd_modules_t:dir list_dir_perms; - mmap_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) - read_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) -+read_lnk_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) - - apache_domtrans_rotatelogs(httpd_t) - # Apache-httpd needs to be able to send signals to the log rotate procs. -@@ -297,6 +321,7 @@ - kernel_read_kernel_sysctls(httpd_t) - # for modules that want to access /proc/meminfo - kernel_read_system_state(httpd_t) -+kernel_search_network_sysctl(httpd_t) - - corenet_non_ipsec_sendrecv(httpd_t) - corenet_tcp_sendrecv_all_if(httpd_t) -@@ -342,6 +367,9 @@ - files_read_var_lib_symlinks(httpd_t) - - fs_search_auto_mountpoints(httpd_sys_script_t) -+# php uploads a file to /tmp and then execs programs to acton them -+manage_dirs_pattern(httpd_sys_script_t,httpd_tmp_t,httpd_tmp_t) -+manage_files_pattern(httpd_sys_script_t,httpd_tmp_t,httpd_tmp_t) - - libs_use_ld_so(httpd_t) - libs_use_shared_libs(httpd_t) -@@ -362,6 +390,10 @@ - - mta_send_mail(httpd_t) - -+optional_policy(` -+ nscd_socket_use(httpd_t) -+') -+ - ifdef(`targeted_policy',` - term_dontaudit_use_unallocated_ttys(httpd_t) - term_dontaudit_use_generic_ptys(httpd_t) -@@ -389,6 +421,14 @@ - corenet_tcp_connect_all_ports(httpd_t) - ') - -+tunable_policy(`httpd_can_sendmail',` -+ # allow httpd to connect to mail servers -+ corenet_tcp_connect_smtp_port(httpd_t) -+ corenet_sendrecv_smtp_client_packets(httpd_t) -+ corenet_tcp_connect_pop_port(httpd_t) -+ corenet_sendrecv_pop_client_packets(httpd_t) -+') -+ - tunable_policy(`httpd_can_network_connect_db',` - # allow httpd to connect to mysql/posgresql - corenet_tcp_connect_postgresql_port(httpd_t) -@@ -416,6 +456,10 @@ - allow httpd_t httpd_unconfined_script_exec_t:dir list_dir_perms; - ') - -+tunable_policy(`allow_httpd_sys_script_anon_write',` -+ miscfiles_manage_public_files(httpd_sys_script_t) -+') -+ - tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',` - domtrans_pattern(httpd_t, httpdcontent, httpd_sys_script_t) - -@@ -433,11 +477,21 @@ - fs_read_nfs_symlinks(httpd_t) - ') - -+tunable_policy(`httpd_use_nfs',` -+ fs_read_nfs_files(httpd_t) -+ fs_read_nfs_symlinks(httpd_t) -+') -+ - tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` - fs_read_cifs_files(httpd_t) - fs_read_cifs_symlinks(httpd_t) - ') - -+tunable_policy(`httpd_use_cifs',` -+ fs_read_cifs_files(httpd_t) -+ fs_read_cifs_symlinks(httpd_t) -+') -+ - tunable_policy(`httpd_ssi_exec',` - corecmd_shell_domtrans(httpd_t,httpd_sys_script_t) - allow httpd_sys_script_t httpd_t:fd use; -@@ -668,6 +722,12 @@ - fs_exec_nfs_files(httpd_suexec_t) - ') - -+tunable_policy(`httpd_use_cifs',` -+ fs_read_cifs_files(httpd_suexec_t) -+ fs_read_cifs_symlinks(httpd_suexec_t) -+ fs_exec_cifs_files(httpd_suexec_t) -+') -+ - tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` - fs_read_cifs_files(httpd_suexec_t) - fs_read_cifs_symlinks(httpd_suexec_t) -@@ -706,7 +766,8 @@ - - dontaudit httpd_sys_script_t httpd_config_t:dir search; - --allow httpd_sys_script_t httpd_squirrelmail_t:file { append read }; -+apache_read_squirrelmail_data(httpd_sys_script_t) -+apache_append_squirrelmail_data(httpd_sys_script_t) - - allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms; - read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t) -@@ -730,11 +791,21 @@ - ') - ') - -+tunable_policy(`httpd_use_nfs', ` -+ fs_read_nfs_files(httpd_sys_script_t) -+ fs_read_nfs_symlinks(httpd_sys_script_t) -+') -+ - tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` - fs_read_nfs_files(httpd_sys_script_t) - fs_read_nfs_symlinks(httpd_sys_script_t) - ') - -+tunable_policy(`httpd_use_cifs', ` -+ fs_read_cifs_files(httpd_sys_script_t) -+ fs_read_cifs_symlinks(httpd_sys_script_t) -+') -+ - tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` - fs_read_cifs_files(httpd_sys_script_t) - fs_read_cifs_symlinks(httpd_sys_script_t) -@@ -788,3 +859,19 @@ - term_dontaudit_use_generic_ptys(httpd_rotatelogs_t) - term_dontaudit_use_unallocated_ttys(httpd_rotatelogs_t) - ') -+ -+#============= bugzilla policy ============== -+apache_content_template(bugzilla) -+allow httpd_bugzilla_script_t self:netlink_route_socket r_netlink_socket_perms; -+ -+files_search_var_lib(httpd_bugzilla_script_t) -+ -+optional_policy(` -+ mysql_search_db(httpd_bugzilla_script_t) -+ mysql_stream_connect(httpd_bugzilla_script_t) -+') -+ -+optional_policy(` -+ postgresql_stream_connect(httpd_bugzilla_script_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-2.6.5/policy/modules/services/apcupsd.fc ---- nsaserefpolicy/policy/modules/services/apcupsd.fc 2007-05-07 11:11:55.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/apcupsd.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -3,3 +3,8 @@ - /var/log/apcupsd\.events.* -- gen_context(system_u:object_r:apcupsd_log_t,s0) - - /var/run/apcupsd\.pid -- gen_context(system_u:object_r:apcupsd_var_run_t,s0) -+ -+/var/www/apcupsd/multimon.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) -+/var/www/apcupsd/upsfstats.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) -+/var/www/apcupsd/upsimage.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) -+/var/www/apcupsd/upsstats.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-2.6.5/policy/modules/services/apcupsd.if ---- nsaserefpolicy/policy/modules/services/apcupsd.if 2007-05-07 11:11:55.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/apcupsd.if 2007-05-22 14:41:13.000000000 -0400 -@@ -79,3 +79,25 @@ - allow $1 apcupsd_log_t:dir list_dir_perms; - allow $1 apcupsd_log_t:file { getattr append }; - ') -+ -+######################################## -+## -+## Execute a domain transition to run httpd_apcupsd_cgi_script. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`httpd_apcupsd_cgi_script_domtrans',` -+ gen_require(` -+ type httpd_apcupsd_cgi_script_t, httpd_apcupsd_cgi_script_exec_t; -+ ') -+ -+ domain_auto_trans($1,httpd_apcupsd_cgi_script_exec_t,httpd_apcupsd_cgi_script_t) -+ -+ allow httpd_apcupsd_cgi_script_t $1:fd use; -+ allow httpd_apcupsd_cgi_script_t $1:fifo_file rw_file_perms; -+ allow httpd_apcupsd_cgi_script_t $1:process sigchld; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-2.6.5/policy/modules/services/apcupsd.te ---- nsaserefpolicy/policy/modules/services/apcupsd.te 2007-05-18 11:12:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/apcupsd.te 2007-05-22 14:51:55.000000000 -0400 -@@ -62,7 +62,34 @@ - - miscfiles_read_localization(apcupsd_t) - -+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240805 -+term_use_unallocated_ttys(apcupsd_t) -+ - ifdef(`targeted_policy',` -- term_dontaudit_use_unallocated_ttys(apcupsd_t) - term_dontaudit_use_generic_ptys(apcupsd_t) -+ unconfined_dontaudit_rw_pipes(apcupsd_t) -+ - ') -+ -+######################################## -+# -+# apcupsd_cgi Declarations -+# -+ -+apache_content_template(apcupsd_cgi) -+ -+# Default Networking -+sysnet_dns_name_resolve(httpd_apcupsd_cgi_script_t) -+corenet_non_ipsec_sendrecv(httpd_apcupsd_cgi_script_t) -+ -+allow httpd_apcupsd_cgi_script_t self:tcp_socket create_stream_socket_perms; -+corenet_tcp_sendrecv_all_if(httpd_apcupsd_cgi_script_t) -+corenet_tcp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t) -+corenet_tcp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t) -+corenet_tcp_connect_apcupsd_port(httpd_apcupsd_cgi_script_t) -+ -+allow httpd_apcupsd_cgi_script_t self:udp_socket create_socket_perms; -+corenet_udp_sendrecv_all_if(httpd_apcupsd_cgi_script_t) -+corenet_udp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t) -+corenet_udp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.6.5/policy/modules/services/automount.te ---- nsaserefpolicy/policy/modules/services/automount.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/automount.te 2007-05-22 14:41:13.000000000 -0400 -@@ -69,6 +69,7 @@ - files_mounton_all_mountpoints(automount_t) - files_mount_all_file_type_fs(automount_t) - files_unmount_all_file_type_fs(automount_t) -+files_manage_non_security_dirs(automount_t) - - fs_mount_all_fs(automount_t) - fs_unmount_all_fs(automount_t) -@@ -98,6 +99,7 @@ - - dev_read_sysfs(automount_t) - # for SSP -+dev_read_rand(automount_t) - dev_read_urand(automount_t) - - domain_use_interactive_fds(automount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.6.5/policy/modules/services/avahi.te ---- nsaserefpolicy/policy/modules/services/avahi.te 2007-05-03 08:50:57.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/avahi.te 2007-05-22 14:41:13.000000000 -0400 -@@ -18,7 +18,7 @@ - # Local policy - # - --allow avahi_t self:capability { dac_override setgid chown kill setuid sys_chroot }; -+allow avahi_t self:capability { dac_override setgid chown fowner kill setuid sys_chroot }; - dontaudit avahi_t self:capability sys_tty_config; - allow avahi_t self:process { setrlimit signal_perms setcap }; - allow avahi_t self:fifo_file { read write }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.6.5/policy/modules/services/bind.te ---- nsaserefpolicy/policy/modules/services/bind.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/bind.te 2007-05-22 14:41:13.000000000 -0400 -@@ -236,6 +236,7 @@ - corenet_tcp_sendrecv_all_nodes(ndc_t) - corenet_tcp_sendrecv_all_ports(ndc_t) - corenet_tcp_connect_rndc_port(ndc_t) -+corenet_tcp_bind_all_nodes(ndc_t) - corenet_sendrecv_rndc_client_packets(ndc_t) - - fs_getattr_xattr_fs(ndc_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.6.5/policy/modules/services/clamav.te ---- nsaserefpolicy/policy/modules/services/clamav.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/clamav.te 2007-05-22 14:41:13.000000000 -0400 -@@ -126,6 +126,7 @@ - amavis_read_lib_files(clamd_t) - amavis_read_spool_files(clamd_t) - amavis_spool_filetrans(clamd_t,clamd_var_run_t,sock_file) -+ amavis_create_pid_files(clamd_t) - ') - - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.6.5/policy/modules/services/consolekit.te ---- nsaserefpolicy/policy/modules/services/consolekit.te 2007-05-04 12:19:22.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/consolekit.te 2007-05-22 14:41:13.000000000 -0400 -@@ -10,7 +10,6 @@ - type consolekit_exec_t; - init_daemon_domain(consolekit_t, consolekit_exec_t) - --# pid files - type consolekit_var_run_t; - files_pid_file(consolekit_var_run_t) - -@@ -25,7 +24,6 @@ - allow consolekit_t self:unix_stream_socket create_stream_socket_perms; - allow consolekit_t self:unix_dgram_socket create_socket_perms; - --# pid file - manage_files_pattern(consolekit_t,consolekit_var_run_t,consolekit_var_run_t) - files_pid_filetrans(consolekit_t,consolekit_var_run_t, file) - -@@ -50,8 +48,15 @@ - libs_use_ld_so(consolekit_t) - libs_use_shared_libs(consolekit_t) - -+logging_send_syslog_msg(consolekit_t) -+ - miscfiles_read_localization(consolekit_t) - -+# consolekit needs to be able to ptrace all logged in users -+userdom_ptrace_all_users(consolekit_t) -+hal_ptrace(consolekit_t) -+mcs_ptrace_all(consolekit_t) -+ - optional_policy(` - dbus_system_bus_client_template(consolekit, consolekit_t) - dbus_send_system_bus(consolekit_t) -@@ -68,3 +73,9 @@ - xserver_read_all_users_xauth(consolekit_t) - xserver_stream_connect_xdm_xserver(consolekit_t) - ') -+ -+ifdef(`targeted_policy',` -+ #reading .Xauthity -+ unconfined_ptrace(consolekit_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-2.6.5/policy/modules/services/cron.fc ---- nsaserefpolicy/policy/modules/services/cron.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/cron.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -45,3 +45,4 @@ - /var/spool/fcron/systab\.orig -- gen_context(system_u:object_r:system_cron_spool_t,s0) - /var/spool/fcron/systab -- gen_context(system_u:object_r:system_cron_spool_t,s0) - /var/spool/fcron/new\.systab -- gen_context(system_u:object_r:system_cron_spool_t,s0) -+/var/lib/misc(/.*)? gen_context(system_u:object_r:crond_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.6.5/policy/modules/services/cron.if ---- nsaserefpolicy/policy/modules/services/cron.if 2007-03-26 10:39:05.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/cron.if 2007-05-22 14:41:13.000000000 -0400 -@@ -35,6 +35,7 @@ - # - template(`cron_per_role_template',` - gen_require(` -+ class context contains; - attribute cron_spool_type; - type crond_t, cron_spool_t, crontab_exec_t; - ') -@@ -54,9 +55,6 @@ - domain_entry_file($1_crontab_t,crontab_exec_t) - role $3 types $1_crontab_t; - -- type $1_crontab_tmp_t; -- files_tmp_file($1_crontab_tmp_t) -- - ############################## - # - # $1_crond_t local policy -@@ -67,6 +65,7 @@ - allow $1_crond_t self:fifo_file rw_fifo_file_perms; - allow $1_crond_t self:unix_stream_socket create_stream_socket_perms; - allow $1_crond_t self:unix_dgram_socket create_socket_perms; -+ allow $1_crond_t self:context contains; - - # The entrypoint interface is not used as this is not - # a regular entrypoint. Since crontab files are -@@ -134,19 +133,22 @@ - - miscfiles_read_localization($1_crond_t) - -+ mls_rangetrans_target($1_crond_t) -+ - userdom_manage_user_tmp_files($1,$1_crond_t) - userdom_manage_user_tmp_symlinks($1,$1_crond_t) - userdom_manage_user_tmp_pipes($1,$1_crond_t) - userdom_manage_user_tmp_sockets($1,$1_crond_t) -+ userdom_transition_user_tmp($1,$1_crond_t, { lnk_file file dir fifo_file }) - # Run scripts in user home directory and access shared libs. - userdom_exec_user_home_content_files($1,$1_crond_t) - # Access user files and dirs. --# userdom_manage_user_home_subdir_dirs($1,$1_crond_t) -+ userdom_manage_user_home_content_dirs($1,$1_crond_t) - userdom_manage_user_home_content_files($1,$1_crond_t) - userdom_manage_user_home_content_symlinks($1,$1_crond_t) - userdom_manage_user_home_content_pipes($1,$1_crond_t) - userdom_manage_user_home_content_sockets($1,$1_crond_t) --# userdom_user_home_dir_filetrans_user_home_content($1,$1_crond_t,notdevfile_class_set) -+ userdom_user_home_dir_filetrans_user_home_content($1,$1_crond_t,notdevfile_class_set) - - tunable_policy(`fcron_crond', ` - allow crond_t $1_cron_spool_t:file manage_file_perms; -@@ -156,22 +158,13 @@ - nis_use_ypbind($1_crond_t) - ') - -- ifdef(`TODO',` - optional_policy(` -- create_dir_file($1_crond_t, httpd_$1_content_t) -+ mta_send_mail($1_crond_t) - ') -- allow $1_crond_t tmp_t:dir rw_dir_perms; -- type_transition $1_crond_t $1_tmp_t:{ file lnk_file sock_file fifo_file } $1_tmp_t; - -- ifdef(`mta.te', ` -- domain_auto_trans($1_crond_t, sendmail_exec_t, $1_mail_t) -- allow $1_crond_t sendmail_exec_t:lnk_file r_file_perms; -- -- # $1_mail_t should only be reading from the cron fifo not needing to write -- dontaudit $1_mail_t crond_t:fifo_file write; -- allow mta_user_agent $1_crond_t:fd use; -+ optional_policy(` -+ nscd_socket_use($1_crond_t) - ') -- ') dnl endif TODO - - ############################## - # -@@ -184,6 +177,7 @@ - - # Transition from the user domain to the derived domain. - domtrans_pattern($2, crontab_exec_t, $1_crontab_t) -+ allow $2 $1_crontab_t:fd use; - - # crontab shows up in user ps - ps_process_pattern($2,$1_crontab_t) -@@ -194,9 +188,6 @@ - # Allow crond to read those crontabs in cron spool. - allow crond_t $1_cron_spool_t:file manage_file_perms; - -- allow $1_crontab_t $1_crontab_tmp_t:file manage_file_perms; -- files_tmp_filetrans($1_crontab_t,$1_crontab_tmp_t,file) -- - # create files in /var/spool/cron - manage_files_pattern($1_crontab_t,cron_spool_t,$1_cron_spool_t) - filetrans_pattern($1_crontab_t,cron_spool_t,$1_cron_spool_t,file) -@@ -232,10 +223,12 @@ - - userdom_manage_user_tmp_dirs($1,$1_crontab_t) - userdom_manage_user_tmp_files($1,$1_crontab_t) -+ userdom_transition_user_tmp($1,$1_crontab_t, { file dir }) - # Access terminals. - userdom_use_user_terminals($1,$1_crontab_t) - # Read user crontabs - userdom_read_user_home_content_files($1,$1_crontab_t) -+ userdom_transition_user_tmp($1,$1_crontab_t, { lnk_file file dir fifo_file }) - - tunable_policy(`fcron_crond',` - # fcron wants an instant update of a crontab change for the administrator -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.6.5/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2007-05-18 11:12:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/cron.te 2007-05-24 16:01:30.000000000 -0400 -@@ -42,6 +42,9 @@ - type cron_log_t; - logging_log_file(cron_log_t) - -+type cron_lock_t; -+files_lock_file(cron_lock_t) -+ - type crond_t; - type crond_exec_t; - init_daemon_domain(crond_t,crond_exec_t) -@@ -50,6 +53,7 @@ - - type crond_tmp_t; - files_tmp_file(crond_tmp_t) -+files_poly_parent(crond_tmp_t) - - type crond_var_run_t; - files_pid_file(crond_var_run_t) -@@ -75,11 +79,6 @@ - type system_crond_tmp_t; - files_tmp_file(system_crond_tmp_t) - --ifdef(`targeted_policy',` -- type sysadm_cron_spool_t; -- files_type(sysadm_cron_spool_t) --') -- - ifdef(`enable_mcs',` - init_ranged_daemon_domain(crond_t,crond_exec_t,s0 - mcs_systemhigh) - ') -@@ -89,7 +88,7 @@ - # Cron Local policy - # - --allow crond_t self:capability { dac_override setgid setuid sys_nice dac_read_search audit_control }; -+allow crond_t self:capability { dac_override setgid setuid sys_nice dac_read_search }; - dontaudit crond_t self:capability { sys_resource sys_tty_config }; - allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; - allow crond_t self:process { setexec setfscreate }; -@@ -108,14 +107,12 @@ - allow crond_t crond_var_run_t:file manage_file_perms; - files_pid_filetrans(crond_t,crond_var_run_t,file) - --allow crond_t cron_spool_t:dir rw_dir_perms; --allow crond_t cron_spool_t:file read_file_perms; -- --allow crond_t system_cron_spool_t:dir list_dir_perms; --allow crond_t system_cron_spool_t:file read_file_perms; -+manage_files_pattern(crond_t,cron_spool_t,cron_spool_t) -+read_files_pattern(crond_t, system_cron_spool_t, system_cron_spool_t) - - kernel_read_kernel_sysctls(crond_t) - kernel_search_key(crond_t) -+kernel_link_key(crond_t) - - dev_read_sysfs(crond_t) - selinux_get_fs_mount(crond_t) -@@ -131,12 +128,22 @@ - fs_search_auto_mountpoints(crond_t) - - # need auth_chkpwd to check for locked accounts. --auth_domtrans_chk_passwd(crond_t) -+auth_domtrans_upd_passwd(crond_t) - - corecmd_exec_shell(crond_t) - corecmd_list_bin(crond_t) - corecmd_read_bin_symlinks(crond_t) - -+mls_rangetrans_source(crond_t) -+mls_file_read_up(crond_t) -+mls_file_write_down(crond_t) -+mls_file_upgrade(crond_t) -+mls_file_downgrade(crond_t) -+mls_process_set_level(crond_t) -+mls_fd_share_all_levels(crond_t) -+mls_fd_share_all_levels(crond_t) -+mls_trusted_object(crond_t) -+ - domain_use_interactive_fds(crond_t) - - files_read_etc_files(crond_t) -@@ -152,6 +159,7 @@ - libs_use_shared_libs(crond_t) - - logging_send_syslog_msg(crond_t) -+logging_send_audit_msg(crond_t) - - seutil_read_config(crond_t) - seutil_read_default_contexts(crond_t) -@@ -165,6 +173,12 @@ - - mta_send_mail(crond_t) - -+tunable_policy(`allow_polyinstantiation',` -+ allow crond_t self:capability fowner; -+ files_search_tmp(crond_t) -+ files_polyinstantiate_all(crond_t) -+') -+ - ifdef(`distro_debian',` - optional_policy(` - # Debian logcheck has the home dir set to its cache -@@ -258,17 +272,26 @@ - # System cron process domain - # - -+# This is to handle creation of files in /var/lock directory. (anacron) -+allow crond_t cron_lock_t:file manage_file_perms; -+files_lock_filetrans(crond_t,cron_lock_t,file) -+ - # This is to handle creation of files in /var/log directory. - # Used currently by rpm script log files - allow system_crond_t cron_log_t:file manage_file_perms; - logging_log_filetrans(system_crond_t,cron_log_t,file) - -+ - # This is to handle /var/lib/misc directory. Used currently - # by prelink var/lib files for cron - allow system_crond_t cron_var_lib_t:file manage_file_perms; - files_var_lib_filetrans(system_crond_t,cron_var_lib_t,file) - - optional_policy(` -+ spamassassin_manage_lib_files(system_crond_t) -+') -+ -+optional_policy(` - # cjp: why? - squid_domtrans(system_crond_t) - ') -@@ -369,7 +392,7 @@ - init_read_utmp(system_crond_t) - init_dontaudit_rw_utmp(system_crond_t) - # prelink tells init to restart it self, we either need to allow or dontaudit -- init_write_initctl(system_crond_t) -+ init_telinit(system_crond_t) - - libs_use_ld_so(system_crond_t) - libs_use_shared_libs(system_crond_t) -@@ -427,6 +450,10 @@ - ') - - optional_policy(` -+ lpd_list_spool(system_crond_t) -+ ') -+ -+ optional_policy(` - mrtg_append_create_logs(system_crond_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.6.5/policy/modules/services/cups.fc ---- nsaserefpolicy/policy/modules/services/cups.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/cups.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -8,6 +8,7 @@ - /etc/cups/ppd/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) - /etc/cups/ppds\.dat -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) - /etc/cups/printers\.conf.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) -+/etc/cups/subscriptions.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) - /etc/cups/certs -d gen_context(system_u:object_r:cupsd_rw_etc_t,s0) - /etc/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.6.5/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/cups.te 2007-05-22 14:41:13.000000000 -0400 -@@ -93,8 +93,6 @@ - # generic socket here until appletalk socket is available in kernels - allow cupsd_t self:socket create_socket_perms; - --send_audit_msgs_pattern(cupsd_t) -- - allow cupsd_t cupsd_etc_t:{ dir file } setattr; - read_files_pattern(cupsd_t,cupsd_etc_t,cupsd_etc_t) - read_lnk_files_pattern(cupsd_t,cupsd_etc_t,cupsd_etc_t) -@@ -151,9 +149,11 @@ - corenet_tcp_bind_reserved_port(cupsd_t) - corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t) - corenet_tcp_connect_all_ports(cupsd_t) -+corenet_tcp_connect_smbd_port(cupsd_t) - corenet_sendrecv_hplip_client_packets(cupsd_t) - corenet_sendrecv_ipp_client_packets(cupsd_t) - corenet_sendrecv_ipp_server_packets(cupsd_t) -+corenet_tcp_bind_all_rpc_ports(cupsd_t) - - dev_rw_printer(cupsd_t) - dev_read_urand(cupsd_t) -@@ -214,6 +214,7 @@ - libs_read_lib_files(cupsd_t) - - logging_send_syslog_msg(cupsd_t) -+logging_send_audit_msg(cupsd_t) - - miscfiles_read_localization(cupsd_t) - # invoking ghostscript needs to read fonts -@@ -223,6 +224,7 @@ - - sysnet_read_config(cupsd_t) - -+files_dontaudit_list_home(cupsd_t) - userdom_dontaudit_use_unpriv_user_fds(cupsd_t) - userdom_dontaudit_search_all_users_home_content(cupsd_t) - -@@ -284,6 +286,10 @@ - ') - - optional_policy(` -+ nis_use_ypbind(cupsd_t) -+') -+ -+optional_policy(` - nscd_socket_use(cupsd_t) - ') - -@@ -294,6 +300,10 @@ - ') - - optional_policy(` -+ sendmail_domtrans(cupsd_t) -+') -+ -+optional_policy(` - seutil_sigchld_newrole(cupsd_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.6.5/policy/modules/services/cvs.te ---- nsaserefpolicy/policy/modules/services/cvs.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/cvs.te 2007-05-22 14:41:13.000000000 -0400 -@@ -16,6 +16,7 @@ - type cvs_t; - type cvs_exec_t; - inetd_tcp_service_domain(cvs_t,cvs_exec_t) -+application_executable_file(cvs_exec_t) - role system_r types cvs_t; - - type cvs_data_t; # customizable -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.6.5/policy/modules/services/cyrus.te ---- nsaserefpolicy/policy/modules/services/cyrus.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/cyrus.te 2007-05-22 14:41:13.000000000 -0400 -@@ -145,6 +145,7 @@ - - optional_policy(` - snmp_read_snmp_var_lib_files(cyrus_t) -+ snmp_dontaudit_write_snmp_var_lib_files(cyrus_t) - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.6.5/policy/modules/services/dbus.if ---- nsaserefpolicy/policy/modules/services/dbus.if 2007-03-26 10:39:04.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/dbus.if 2007-05-24 14:21:05.000000000 -0400 -@@ -49,6 +49,12 @@ - ## - # - template(`dbus_per_role_template',` -+ gen_require(` -+ type system_dbusd_exec_t; -+ type system_dbusd_t; -+ type dbusd_etc_t; -+ class dbus { send_msg acquire_svc }; -+ ') - - ############################## - # -@@ -70,6 +76,7 @@ - # - - allow $1_dbusd_t self:process { getattr sigkill signal }; -+ dontaudit $1_dbusd_t self:process ptrace; - allow $1_dbusd_t self:file { getattr read write }; - allow $1_dbusd_t self:fifo_file rw_fifo_file_perms; - allow $1_dbusd_t self:dbus { send_msg acquire_svc }; -@@ -78,8 +85,6 @@ - allow $1_dbusd_t self:tcp_socket create_stream_socket_perms; - allow $1_dbusd_t self:netlink_selinux_socket create_socket_perms; - -- send_audit_msgs_pattern($1_dbusd_t) -- - # For connecting to the bus - allow $2 $1_dbusd_t:unix_stream_socket connectto; - type_change $2 $1_dbusd_t:dbus $1_dbusd_$1_t; -@@ -135,12 +140,24 @@ - selinux_compute_relabel_context($1_dbusd_t) - selinux_compute_user_contexts($1_dbusd_t) - -+ corecmd_bin_domtrans($1_dbusd_t, $1_t) -+ allow $1_t $1_dbusd_t:fd use; -+ allow $1_t $1_dbusd_t:fifo_file rw_fifo_file_perms; -+ allow $1_t $1_dbusd_t:process sigchld; -+ -+ ifdef(`hide_broken_symptoms', ` -+ dontaudit $1_t $1_dbusd_t:netlink_selinux_socket { read write }; -+ '); -+ -+ userdom_read_user_home_content_files($1, $1_dbusd_t) -+ - auth_read_pam_console_data($1_dbusd_t) - - libs_use_ld_so($1_dbusd_t) - libs_use_shared_libs($1_dbusd_t) - - logging_send_syslog_msg($1_dbusd_t) -+ logging_send_audit_msg($1_dbusd_t) - - miscfiles_read_localization($1_dbusd_t) - -@@ -204,6 +221,7 @@ - # For connecting to the bus - files_search_pids($2) - stream_connect_pattern($2,system_dbusd_var_run_t,system_dbusd_var_run_t,system_dbusd_t) -+ dbus_read_config($2) - ') - - ####################################### -@@ -273,6 +291,31 @@ - - ######################################## - ## -+## connectto a message on user/application specific DBUS. -+## -+## -+## -+## The prefix of the domain (e.g., user -+## is the prefix for user_t). -+## -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+template(`dbus_connectto_user_bus',` -+ gen_require(` -+ type $1_dbusd_t; -+ ') -+ -+ allow $2 $1_dbusd_t:unix_stream_socket connectto; -+') -+ -+ -+######################################## -+## - ## Read dbus configuration. - ## - ## -@@ -286,6 +329,7 @@ - type dbusd_etc_t; - ') - -+ allow $1 dbusd_etc_t:dir list_dir_perms; - allow $1 dbusd_etc_t:file read_file_perms; - ') - -@@ -346,3 +390,23 @@ - - allow $1 system_dbusd_t:dbus *; - ') -+ -+######################################## -+## -+## dontaudit attempts to use system_dbus_t selinux_socket -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dbus_dontaudit_rw_system_selinux_socket',` -+ gen_require(` -+ type system_dbusd_t; -+ ') -+ -+ dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write }; -+') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.6.5/policy/modules/services/dbus.te ---- nsaserefpolicy/policy/modules/services/dbus.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/dbus.te 2007-05-22 14:41:13.000000000 -0400 -@@ -40,8 +40,6 @@ - # Receive notifications of policy reloads and enforcing status changes. - allow system_dbusd_t self:netlink_selinux_socket { create bind read }; - --send_audit_msgs_pattern(system_dbusd_t) -- - allow system_dbusd_t dbusd_etc_t:dir list_dir_perms; - read_files_pattern(system_dbusd_t,dbusd_etc_t,dbusd_etc_t) - read_lnk_files_pattern(system_dbusd_t,dbusd_etc_t,dbusd_etc_t) -@@ -93,6 +91,7 @@ - libs_use_shared_libs(system_dbusd_t) - - logging_send_syslog_msg(system_dbusd_t) -+logging_send_audit_msg(system_dbusd_t) - - miscfiles_read_localization(system_dbusd_t) - miscfiles_read_certs(system_dbusd_t) -@@ -123,6 +122,10 @@ - ') - - optional_policy(` -+ nis_use_ypbind(system_dbusd_t) -+') -+ -+optional_policy(` - sysnet_domtrans_dhcpc(system_dbusd_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-2.6.5/policy/modules/services/dhcp.te ---- nsaserefpolicy/policy/modules/services/dhcp.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/dhcp.te 2007-05-22 14:41:13.000000000 -0400 -@@ -119,6 +119,8 @@ - dbus_system_bus_client_template(dhcpd,dhcpd_t) - dbus_connect_system_bus(dhcpd_t) - dbus_send_system_bus(dhcpd_t) -+ dbus_read_config(dhcpd_t) -+ dbus_dontaudit_rw_system_selinux_socket(dhcpd_t) - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/djbdns.te serefpolicy-2.6.5/policy/modules/services/djbdns.te ---- nsaserefpolicy/policy/modules/services/djbdns.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/djbdns.te 2007-05-22 14:41:13.000000000 -0400 -@@ -44,4 +44,7 @@ - libs_use_ld_so(djbdns_axfrdns_t) - libs_use_shared_libs(djbdns_axfrdns_t) - --ucspitcp_service_domain(djbdns_axfrdns_t, djbdns_axfrdns_exec_t) -+optional_policy(` -+ ucspitcp_service_domain(djbdns_axfrdns_t, djbdns_axfrdns_exec_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.6.5/policy/modules/services/dovecot.fc ---- nsaserefpolicy/policy/modules/services/dovecot.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/dovecot.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -17,10 +17,12 @@ - - ifdef(`distro_debian', ` - /usr/lib/dovecot/dovecot-auth -- gen_context(system_u:object_r:dovecot_auth_exec_t,s0) -+/usr/lib/dovecot/deliver -- gen_context(system_u:object_r:dovecot_deliver_exec_t,s0) - ') - - ifdef(`distro_redhat', ` - /usr/libexec/dovecot/dovecot-auth -- gen_context(system_u:object_r:dovecot_auth_exec_t,s0) -+/usr/libexec/dovecot/deliver -- gen_context(system_u:object_r:dovecot_deliver_exec_t,s0) - ') - - # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-2.6.5/policy/modules/services/dovecot.if ---- nsaserefpolicy/policy/modules/services/dovecot.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/dovecot.if 2007-05-22 14:41:13.000000000 -0400 -@@ -18,3 +18,43 @@ - manage_files_pattern($1,dovecot_spool_t,dovecot_spool_t) - manage_lnk_files_pattern($1,dovecot_spool_t,dovecot_spool_t) - ') -+ -+######################################## -+## -+## Connect to dovecot auth unix domain stream socket. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+# -+interface(`dovecot_auth_stream_connect',` -+ gen_require(` -+ type dovecot_auth_t, dovecot_var_run_t; -+ ') -+ -+ allow $1 dovecot_var_run_t:dir search; -+ allow $1 dovecot_var_run_t:sock_file write; -+ allow $1 dovecot_auth_t:unix_stream_socket connectto; -+') -+ -+######################################## -+## -+## Execute dovecot_deliver in the dovecot_deliver domain. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dovecot_domtrans_deliver',` -+ gen_require(` -+ type dovecot_deliver_t, dovecot_deliver_exec_t; -+ ') -+ -+ domtrans_pattern($1,dovecot_deliver_exec_t,dovecot_deliver_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.6.5/policy/modules/services/dovecot.te ---- nsaserefpolicy/policy/modules/services/dovecot.te 2007-05-07 10:32:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/dovecot.te 2007-05-22 14:41:13.000000000 -0400 -@@ -15,6 +15,12 @@ - domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t) - role system_r types dovecot_auth_t; - -+type dovecot_deliver_t; -+type dovecot_deliver_exec_t; -+domain_type(dovecot_deliver_t) -+domain_entry_file(dovecot_deliver_t,dovecot_deliver_exec_t) -+role system_r types dovecot_deliver_t; -+ - type dovecot_cert_t; - files_type(dovecot_cert_t) - -@@ -111,7 +117,6 @@ - miscfiles_read_localization(dovecot_t) - - sysnet_read_config(dovecot_t) --sysnet_use_ldap(dovecot_auth_t) - - userdom_dontaudit_use_unpriv_user_fds(dovecot_t) - userdom_dontaudit_search_sysadm_home_dirs(dovecot_t) -@@ -150,25 +155,29 @@ - # dovecot auth local policy - # - --allow dovecot_auth_t self:capability { setgid setuid }; -+allow dovecot_auth_t self:capability { chown dac_override setgid setuid }; - allow dovecot_auth_t self:process signal_perms; - allow dovecot_auth_t self:fifo_file rw_fifo_file_perms; - allow dovecot_auth_t self:unix_dgram_socket create_socket_perms; - allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms; - --allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl }; -+allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl connectto }; - - allow dovecot_auth_t dovecot_passwd_t:file { getattr read }; - - # Allow dovecot to create and read SSL parameters file - manage_files_pattern(dovecot_t,dovecot_var_lib_t,dovecot_var_lib_t) - files_search_var_lib(dovecot_t) -+files_read_var_symlinks(dovecot_t) - - allow dovecot_auth_t dovecot_var_run_t:dir r_dir_perms; - - kernel_read_all_sysctls(dovecot_auth_t) - kernel_read_system_state(dovecot_auth_t) - -+logging_send_syslog_msg(dovecot_auth_t) -+logging_send_audit_msg(dovecot_auth_t) -+ - dev_read_urand(dovecot_auth_t) - - auth_domtrans_chk_passwd(dovecot_auth_t) -@@ -177,6 +186,7 @@ - files_read_etc_files(dovecot_auth_t) - files_read_etc_runtime_files(dovecot_auth_t) - files_search_pids(dovecot_auth_t) -+files_read_usr_files(dovecot_auth_t) - files_read_usr_symlinks(dovecot_auth_t) - files_search_tmp(dovecot_auth_t) - files_read_var_lib_files(dovecot_t) -@@ -191,11 +201,48 @@ - seutil_dontaudit_search_config(dovecot_auth_t) - - sysnet_dns_name_resolve(dovecot_auth_t) -+sysnet_use_ldap(dovecot_auth_t) - - optional_policy(` - kerberos_use(dovecot_auth_t) - ') - - optional_policy(` -- logging_send_syslog_msg(dovecot_auth_t) -+ mysql_search_db(dovecot_auth_t) -+ mysql_stream_connect(dovecot_auth_t) -+') -+ -+optional_policy(` -+ postfix_create_pivate_sockets(dovecot_auth_t) -+ postfix_search_spool(dovecot_auth_t) -+') -+ -+ -+######################################## -+# -+# dovecot deliver local policy -+# -+allow dovecot_deliver_t dovecot_etc_t:file read_file_perms; -+allow dovecot_deliver_t dovecot_var_run_t:dir r_dir_perms; -+ -+kernel_read_all_sysctls(dovecot_deliver_t) -+kernel_read_system_state(dovecot_deliver_t) -+ -+dovecot_auth_stream_connect(dovecot_deliver_t) -+ -+files_read_etc_files(dovecot_deliver_t) -+files_read_etc_runtime_files(dovecot_deliver_t) -+ -+libs_use_ld_so(dovecot_deliver_t) -+libs_use_shared_libs(dovecot_deliver_t) -+ -+miscfiles_read_localization(dovecot_deliver_t) -+ -+optional_policy(` -+ mta_manage_spool(dovecot_deliver_t) -+') -+ -+ifdef(`targeted_policy',` -+ term_dontaudit_use_unallocated_ttys(dovecot_deliver_t) -+ term_dontaudit_use_generic_ptys(dovecot_deliver_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.6.5/policy/modules/services/ftp.te ---- nsaserefpolicy/policy/modules/services/ftp.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/ftp.te 2007-05-24 16:25:41.000000000 -0400 -@@ -168,6 +168,7 @@ - libs_use_shared_libs(ftpd_t) - - logging_send_syslog_msg(ftpd_t) -+logging_send_audit_msg(ftpd_t) - - miscfiles_read_localization(ftpd_t) - miscfiles_read_public_files(ftpd_t) -@@ -223,10 +224,14 @@ - userdom_manage_all_users_home_content_dirs(ftpd_t) - userdom_manage_all_users_home_content_files(ftpd_t) - userdom_manage_all_users_home_content_symlinks(ftpd_t) -+ auth_manage_all_files_except_shadow(ftpd_t) - - ifdef(`targeted_policy',` -- userdom_generic_user_home_dir_filetrans_generic_user_home_content(ftpd_t,{ dir file lnk_file sock_file fifo_file }) -+ files_manage_generic_tmp_files(ftpd_t) - ') -+ auth_read_all_dirs_except_shadow(ftpd_t) -+ auth_read_all_files_except_shadow(ftpd_t) -+ auth_read_all_symlinks_except_shadow(ftpd_t) - ') - - tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.6.5/policy/modules/services/hal.fc ---- nsaserefpolicy/policy/modules/services/hal.fc 2007-05-07 14:50:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/hal.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -2,15 +2,20 @@ - /etc/hal/device\.d/printer_remove\.hal -- gen_context(system_u:object_r:hald_exec_t,s0) - /etc/hal/capability\.d/printer_update\.hal -- gen_context(system_u:object_r:hald_exec_t,s0) - --/usr/libexec/hal-acl-tool -- gen_context(system_u:object_r:hald_acl_exec_t,s0) - /usr/libexec/hal-hotplug-map -- gen_context(system_u:object_r:hald_exec_t,s0) --/usr/libexec/hal-system-sonypic -- gen_context(system_u:object_r:hald_sonypic_exec_t,s0) --/usr/libexec/hald-addon-macbookpro-backlight -- gen_context(system_u:object_r:hald_mac_exec_t,s0) - - /usr/sbin/hald -- gen_context(system_u:object_r:hald_exec_t,s0) - --/var/cache/hald(/.*)? gen_context(system_u:object_r:hald_cache_t,s0) -- - /var/lib/hal(/.*)? gen_context(system_u:object_r:hald_var_lib_t,s0) - -+/var/cache/hald(/.*)? gen_context(system_u:object_r:hald_cache_t,s0) -+ - /var/run/haldaemon.pid -- gen_context(system_u:object_r:hald_var_run_t,s0) -+/var/run/vbestate -- gen_context(system_u:object_r:hald_var_run_t,s0) -+ -+/usr/libexec/hal-acl-tool -- gen_context(system_u:object_r:hald_acl_exec_t,s0) -+/usr/libexec/hald-addon-macbookpro-backlight -- gen_context(system_u:object_r:hald_mac_exec_t,s0) -+/usr/libexec/hal-system-sonypic -- gen_context(system_u:object_r:hald_sonypic_exec_t,s0) -+ -+/var/log/pm-suspend.log gen_context(system_u:object_r:hald_log_t,s0) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.6.5/policy/modules/services/hal.if ---- nsaserefpolicy/policy/modules/services/hal.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/hal.if 2007-05-22 14:41:13.000000000 -0400 -@@ -208,3 +208,98 @@ - files_search_pids($1) - allow $1 hald_var_run_t:file rw_file_perms; - ') -+ -+######################################## -+## -+## Do not audit attempts to write the hal -+## log files. -+## -+## -+## -+## Domain to not audit -+## -+## -+# -+interface(`hal_dontaudit_write_log',` -+ gen_require(` -+ type hald_log_t; -+ ') -+ -+ dontaudit $1 hald_log_t:file { append write }; -+') -+ -+######################################## -+## -+## Allow attempts to write the hal -+## log files. -+## -+## -+## -+## Domain to not audit -+## -+## -+# -+interface(`hal_write_log',` -+ gen_require(` -+ type hald_log_t; -+ ') -+ -+ logging_search_logs($1) -+ allow $1 hald_log_t:file rw_file_perms; -+') -+ -+######################################## -+## -+## Allow domain to use file descriptors from hal. -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`hal_use_fds',` -+ gen_require(` -+ type hald_t; -+ ') -+ -+ allow $1 hald_t:fd use; -+') -+ -+######################################## -+## -+## Allow attempts to read and write to -+## hald unnamed pipes. -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`hal_rw_pipes',` -+ gen_require(` -+ type hald_t; -+ ') -+ -+ allow $1 hald_t:fifo_file rw_fifo_file_perms; -+') -+ -+######################################## -+## -+## Allow ptrace of hal domain -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`hal_ptrace',` -+ gen_require(` -+ type hald_t; -+ ') -+ -+ allow $1 hald_t:process ptrace; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.6.5/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2007-05-07 14:50:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/hal.te 2007-05-22 14:41:13.000000000 -0400 -@@ -61,8 +61,6 @@ - # For backwards compatibility with older kernels - allow hald_t self:netlink_socket create_socket_perms; - --send_audit_msgs_pattern(hald_t) -- - manage_files_pattern(hald_t,hald_cache_t,hald_cache_t) - - # log files for hald -@@ -115,6 +113,9 @@ - dev_rw_power_management(hald_t) - # hal is now execing pm-suspend - dev_rw_sysfs(hald_t) -+dev_read_sound(hald_t) -+dev_write_sound(hald_t) -+dev_read_raw_memory(hald_t) - - domain_use_interactive_fds(hald_t) - domain_read_all_domains_state(hald_t) -@@ -132,6 +133,7 @@ - files_create_boot_flag(hald_t) - files_getattr_all_dirs(hald_t) - files_read_kernel_img(hald_t) -+files_rw_lock_dirs(hald_t) - - fs_getattr_all_fs(hald_t) - fs_search_all(hald_t) -@@ -170,6 +172,7 @@ - libs_exec_ld_so(hald_t) - libs_exec_lib_files(hald_t) - -+logging_send_audit_msg(hald_t) - logging_send_syslog_msg(hald_t) - logging_search_logs(hald_t) - -@@ -180,6 +183,7 @@ - - seutil_read_config(hald_t) - seutil_read_default_contexts(hald_t) -+seutil_read_file_contexts(hald_t) - - sysnet_read_config(hald_t) - -@@ -192,6 +196,7 @@ - ') - - optional_policy(` -+ alsa_domtrans(hald_t) - alsa_read_rw_config(hald_t) - ') - -@@ -301,7 +306,10 @@ - corecmd_exec_bin(hald_acl_t) - - dev_getattr_all_chr_files(hald_acl_t) -+dev_getattr_generic_usb_dev(hald_acl_t) -+dev_getattr_video_dev(hald_acl_t) - dev_setattr_video_dev(hald_acl_t) -+dev_getattr_sound_dev(hald_acl_t) - dev_setattr_sound_dev(hald_acl_t) - dev_setattr_generic_usb_dev(hald_acl_t) - dev_setattr_usbfs_files(hald_acl_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.6.5/policy/modules/services/inetd.te ---- nsaserefpolicy/policy/modules/services/inetd.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/inetd.te 2007-05-22 14:41:13.000000000 -0400 -@@ -135,8 +135,8 @@ - mls_fd_use_all_levels(inetd_t) - mls_fd_share_all_levels(inetd_t) - mls_socket_read_to_clearance(inetd_t) -+mls_socket_write_to_clearance(inetd_t) - mls_process_set_level(inetd_t) --mls_socket_read_to_clearance(inetd_t) - - sysnet_read_config(inetd_t) - -@@ -187,6 +187,9 @@ - # for identd - allow inetd_child_t self:netlink_tcpdiag_socket r_netlink_socket_perms; - allow inetd_child_t self:capability { setuid setgid }; -+allow inetd_child_t self:dir search; -+allow inetd_child_t self:{ lnk_file file } { getattr read }; -+ - files_search_home(inetd_child_t) - - manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-2.6.5/policy/modules/services/kerberos.if ---- nsaserefpolicy/policy/modules/services/kerberos.if 2007-04-10 13:21:52.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/kerberos.if 2007-05-22 14:41:13.000000000 -0400 -@@ -33,43 +33,10 @@ - # - interface(`kerberos_use',` - gen_require(` -- type krb5_conf_t; -- type krb5kdc_conf_t; -+ attribute kerberosclient; - ') - -- files_search_etc($1) -- allow $1 krb5_conf_t:file { getattr read }; -- dontaudit $1 krb5_conf_t:file write; -- dontaudit $1 krb5kdc_conf_t:dir list_dir_perms; -- dontaudit $1 krb5kdc_conf_t:file rw_file_perms; -- -- tunable_policy(`allow_kerberos',` -- allow $1 self:tcp_socket create_socket_perms; -- allow $1 self:udp_socket create_socket_perms; -- -- corenet_non_ipsec_sendrecv($1) -- corenet_tcp_sendrecv_all_if($1) -- corenet_udp_sendrecv_all_if($1) -- corenet_tcp_sendrecv_all_nodes($1) -- corenet_udp_sendrecv_all_nodes($1) -- corenet_tcp_sendrecv_kerberos_port($1) -- corenet_udp_sendrecv_kerberos_port($1) -- corenet_tcp_bind_all_nodes($1) -- corenet_udp_bind_all_nodes($1) -- corenet_tcp_connect_kerberos_port($1) -- corenet_tcp_connect_ocsp_port($1) -- corenet_sendrecv_kerberos_client_packets($1) -- corenet_sendrecv_ocsp_client_packets($1) -- -- sysnet_read_config($1) -- sysnet_dns_name_resolve($1) -- ') -- -- optional_policy(` -- tunable_policy(`allow_kerberos',` -- pcscd_stream_connect($1) -- ') -- ') -+ typeattribute $1 kerberosclient; - ') - - ######################################## -@@ -94,46 +61,47 @@ - - ######################################## - ## --## Do not audit attempts to write the kerberos --## configuration file (/etc/krb5.conf). -+## Read the kerberos kdc configuration file (/etc/krb5kdc.conf). - ## - ## - ## --## Domain to not audit. -+## Domain allowed access. - ## - ## -+## - # --interface(`kerberos_dontaudit_write_config',` -+interface(`kerberos_read_kdc_config',` - gen_require(` -- type krb5_conf_t; -+ type krb5kdc_conf_t; - ') - -- dontaudit $1 krb5_conf_t:file write; -+ files_search_etc($1) -+ allow $1 krb5kdc_conf_t:file read_file_perms; -+ - ') - - ######################################## - ## --## Read and write the kerberos configuration file (/etc/krb5.conf). -+## Do not audit attempts to write the kerberos -+## configuration file (/etc/krb5.conf). - ## - ## - ## --## Domain allowed access. -+## Domain to not audit. - ## - ## --## - # --interface(`kerberos_rw_config',` -+interface(`kerberos_dontaudit_write_config',` - gen_require(` - type krb5_conf_t; - ') - -- files_search_etc($1) -- allow $1 krb5_conf_t:file rw_file_perms; -+ dontaudit $1 krb5_conf_t:file write; - ') - - ######################################## - ## --## Read the kerberos key table. -+## Read and write the kerberos configuration file (/etc/krb5.conf). - ## - ## - ## -@@ -142,18 +110,18 @@ - ## - ## - # --interface(`kerberos_read_keytab',` -+interface(`kerberos_rw_config',` - gen_require(` -- type krb5_keytab_t; -+ type krb5_conf_t; - ') - - files_search_etc($1) -- allow $1 krb5_keytab_t:file read_file_perms; -+ allow $1 krb5_conf_t:file rw_file_perms; - ') - - ######################################## - ## --## Read the kerberos kdc configuration file (/etc/krb5kdc.conf). -+## Read the kerberos key table. - ## - ## - ## -@@ -162,12 +130,11 @@ - ## - ## - # --interface(`kerberos_read_kdc_config',` -+interface(`kerberos_read_keytab',` - gen_require(` -- type krb5kdc_conf_t; -+ type krb5_keytab_t; - ') - - files_search_etc($1) -- allow $1 krb5kdc_conf_t:file read_file_perms; -- -+ allow $1 krb5_keytab_t:file read_file_perms; - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.6.5/policy/modules/services/kerberos.te ---- nsaserefpolicy/policy/modules/services/kerberos.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/kerberos.te 2007-05-22 14:41:13.000000000 -0400 -@@ -5,6 +5,7 @@ - # - # Declarations - # -+attribute kerberosclient; - - ## - ##

-@@ -126,6 +127,7 @@ - miscfiles_read_localization(kadmind_t) - - sysnet_read_config(kadmind_t) -+sysnet_use_ldap(kadmind_t) - - userdom_dontaudit_use_unpriv_user_fds(kadmind_t) - userdom_dontaudit_search_sysadm_home_dirs(kadmind_t) -@@ -227,6 +229,7 @@ - miscfiles_read_localization(krb5kdc_t) - - sysnet_read_config(krb5kdc_t) -+sysnet_use_ldap(krb5kdc_t) - - userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t) - userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t) -@@ -248,3 +251,36 @@ - optional_policy(` - udev_read_db(krb5kdc_t) - ') -+ -+files_search_etc(kerberosclient) -+allow kerberosclient krb5_conf_t:file { getattr read }; -+dontaudit kerberosclient krb5_conf_t:file write; -+dontaudit kerberosclient krb5kdc_conf_t:dir list_dir_perms; -+dontaudit kerberosclient krb5kdc_conf_t:file rw_file_perms; -+ -+tunable_policy(`allow_kerberos',` -+ allow kerberosclient self:tcp_socket create_socket_perms; -+ allow kerberosclient self:udp_socket create_socket_perms; -+ -+ corenet_non_ipsec_sendrecv(kerberosclient) -+ corenet_tcp_sendrecv_all_if(kerberosclient) -+ corenet_udp_sendrecv_all_if(kerberosclient) -+ corenet_tcp_sendrecv_all_nodes(kerberosclient) -+ corenet_udp_sendrecv_all_nodes(kerberosclient) -+ corenet_tcp_sendrecv_kerberos_port(kerberosclient) -+ corenet_udp_sendrecv_kerberos_port(kerberosclient) -+ corenet_tcp_bind_all_nodes(kerberosclient) -+ corenet_udp_bind_all_nodes(kerberosclient) -+ corenet_tcp_connect_kerberos_port(kerberosclient) -+ corenet_tcp_connect_ocsp_port(kerberosclient) -+ corenet_sendrecv_kerberos_client_packets(kerberosclient) -+ corenet_sendrecv_ocsp_client_packets(kerberosclient) -+ -+ sysnet_read_config(kerberosclient) -+ sysnet_dns_name_resolve(kerberosclient) -+') -+optional_policy(` -+ tunable_policy(`allow_kerberos',` -+ pcscd_stream_connect(kerberosclient) -+ ') -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.6.5/policy/modules/services/mailman.if ---- nsaserefpolicy/policy/modules/services/mailman.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/mailman.if 2007-05-22 14:41:13.000000000 -0400 -@@ -275,6 +275,25 @@ - - ####################################### - ##

-+## append -+## mailman logs. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`mailman_append_log',` -+ gen_require(` -+ type mailman_log_t; -+ ') -+ -+ append_files_pattern($1,mailman_log_t,mailman_log_t) -+') -+ -+####################################### -+## - ## Allow domain to read mailman archive files. - ## - ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.6.5/policy/modules/services/mta.if ---- nsaserefpolicy/policy/modules/services/mta.if 2007-05-18 11:12:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/mta.if 2007-05-25 09:01:36.000000000 -0400 -@@ -263,10 +263,8 @@ - type $1_mail_t; - ') - -- ifdef(`strict_policy',` -- # allow the sysadmin to do "mail someone < /home/user/whatever" -- userdom_read_unpriv_users_home_content_files($1_mail_t) -- ') -+ # allow the sysadmin to do "mail someone < /home/user/whatever" -+ userdom_read_unpriv_users_home_content_files($1_mail_t) - - optional_policy(` - gen_require(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.6.5/policy/modules/services/mta.te ---- nsaserefpolicy/policy/modules/services/mta.te 2007-05-18 11:12:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/mta.te 2007-05-25 09:01:51.000000000 -0400 -@@ -27,18 +27,11 @@ - - type sendmail_exec_t; - files_type(sendmail_exec_t) -+application_executable_file(sendmail_exec_t) - - mta_base_mail_template(system) - role system_r types system_mail_t; - --# cjp: need to resolve this, but require{} --# does not work in the else part of the optional --#ifdef(`strict_policy',` --# optional_policy(`',` --# init_system_domain(system_mail_t,sendmail_exec_t) --# ') --#') -- - ######################################## - # - # System mail local policy -@@ -61,7 +54,6 @@ - userdom_dontaudit_search_sysadm_home_dirs(system_mail_t) - - ifdef(`targeted_policy',` -- typealias system_mail_t alias sysadm_mail_t; - - manage_dirs_pattern(system_mail_t,mail_spool_t,mail_spool_t) - manage_files_pattern(system_mail_t,mail_spool_t,mail_spool_t) -@@ -91,6 +83,7 @@ - optional_policy(` - apache_read_squirrelmail_data(system_mail_t) - apache_append_squirrelmail_data(system_mail_t) -+ apache_search_bugzilla_dirs(system_mail_t) - - # apache should set close-on-exec - apache_dontaudit_append_log(system_mail_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-2.6.5/policy/modules/services/networkmanager.if ---- nsaserefpolicy/policy/modules/services/networkmanager.if 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/networkmanager.if 2007-05-22 14:41:13.000000000 -0400 -@@ -78,3 +78,22 @@ - allow $1 NetworkManager_t:dbus send_msg; - allow NetworkManager_t $1:dbus send_msg; - ') -+ -+######################################## -+## -+## Transition to NetworkManager -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`networkmanager_domtrans',` -+ gen_require(` -+ type NetworkManager_t, NetworkManager_exec_t; -+ ') -+ corecmd_search_bin($1) -+ domtrans_pattern($1,NetworkManager_exec_t,NetworkManager_t) -+ -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.6.5/policy/modules/services/nis.if ---- nsaserefpolicy/policy/modules/services/nis.if 2007-03-26 10:39:04.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/nis.if 2007-05-22 14:41:13.000000000 -0400 -@@ -48,8 +48,8 @@ - corenet_udp_bind_all_nodes($1) - corenet_tcp_bind_generic_port($1) - corenet_udp_bind_generic_port($1) -- corenet_tcp_bind_reserved_port($1) -- corenet_udp_bind_reserved_port($1) -+ corenet_dontaudit_tcp_bind_all_reserved_ports($1) -+ corenet_dontaudit_udp_bind_all_reserved_ports($1) - corenet_dontaudit_tcp_bind_all_ports($1) - corenet_dontaudit_udp_bind_all_ports($1) - corenet_tcp_connect_portmap_port($1) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.6.5/policy/modules/services/nis.te ---- nsaserefpolicy/policy/modules/services/nis.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/nis.te 2007-05-22 14:41:13.000000000 -0400 -@@ -120,6 +120,13 @@ - ') - - optional_policy(` -+ dbus_system_bus_client_template(ypbind,ypbind_t) -+ dbus_connect_system_bus(ypbind_t) -+ dbus_send_system_bus(ypbind_t) -+ init_dbus_chat_script(ypbind_t) -+') -+ -+optional_policy(` - seutil_sigchld_newrole(ypbind_t) - ') - -@@ -258,6 +265,8 @@ - corenet_udp_bind_all_nodes(ypserv_t) - corenet_tcp_bind_reserved_port(ypserv_t) - corenet_udp_bind_reserved_port(ypserv_t) -+corenet_tcp_bind_all_rpc_ports(ypserv_t) -+corenet_udp_bind_all_rpc_ports(ypserv_t) - corenet_dontaudit_tcp_bind_all_reserved_ports(ypserv_t) - corenet_dontaudit_udp_bind_all_reserved_ports(ypserv_t) - corenet_sendrecv_generic_server_packets(ypserv_t) -@@ -332,6 +341,8 @@ - corenet_udp_bind_all_nodes(ypxfr_t) - corenet_tcp_bind_reserved_port(ypxfr_t) - corenet_udp_bind_reserved_port(ypxfr_t) -+corenet_tcp_bind_all_rpc_ports(ypxfr_t) -+corenet_udp_bind_all_rpc_ports(ypxfr_t) - corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t) - corenet_dontaudit_udp_bind_all_reserved_ports(ypxfr_t) - corenet_tcp_connect_all_ports(ypxfr_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.6.5/policy/modules/services/nscd.te ---- nsaserefpolicy/policy/modules/services/nscd.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/nscd.te 2007-05-22 14:41:13.000000000 -0400 -@@ -28,14 +28,14 @@ - # Local policy - # - --allow nscd_t self:capability { kill setgid setuid audit_write }; -+allow nscd_t self:capability { kill setgid setuid }; - dontaudit nscd_t self:capability sys_tty_config; --allow nscd_t self:process { getattr setsched signal_perms }; -+allow nscd_t self:process { getattr setcap setsched signal_perms }; - allow nscd_t self:fifo_file { read write }; - allow nscd_t self:unix_stream_socket create_stream_socket_perms; - allow nscd_t self:unix_dgram_socket create_socket_perms; - allow nscd_t self:netlink_selinux_socket create_socket_perms; --allow nscd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; -+ - allow nscd_t self:tcp_socket create_socket_perms; - allow nscd_t self:udp_socket create_socket_perms; - -@@ -93,6 +93,7 @@ - libs_use_shared_libs(nscd_t) - - logging_send_syslog_msg(nscd_t) -+logging_send_audit_msg(nscd_t) - - miscfiles_read_localization(nscd_t) - -@@ -119,3 +120,11 @@ - xen_dontaudit_rw_unix_stream_sockets(nscd_t) - xen_append_log(nscd_t) - ') -+ -+optional_policy(` -+ tunable_policy(`samba_domain_controller',` -+ samba_append_log(nscd_t) -+ samba_dontaudit_use_fds(nscd_t) -+ ') -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.6.5/policy/modules/services/ntp.te ---- nsaserefpolicy/policy/modules/services/ntp.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/ntp.te 2007-05-22 14:41:13.000000000 -0400 -@@ -137,6 +137,10 @@ - ') - - optional_policy(` -+ hal_dontaudit_write_log(ntpd_t) -+') -+ -+optional_policy(` - seutil_sigchld_newrole(ntpd_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.6.5/policy/modules/services/oddjob.te ---- nsaserefpolicy/policy/modules/services/oddjob.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/oddjob.te 2007-05-22 14:41:13.000000000 -0400 -@@ -27,7 +27,7 @@ - # oddjob local policy - # - --allow oddjob_t self:capability { audit_write setgid } ; -+allow oddjob_t self:capability setgid; - allow oddjob_t self:process { setexec signal }; - allow oddjob_t self:fifo_file { read write }; - allow oddjob_t self:unix_stream_socket create_stream_socket_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.fc serefpolicy-2.6.5/policy/modules/services/openct.fc ---- nsaserefpolicy/policy/modules/services/openct.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/openct.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -2,6 +2,7 @@ - # /usr - # - /usr/sbin/openct-control -- gen_context(system_u:object_r:openct_exec_t,s0) -+/usr/sbin/ifdhandler -- gen_context(system_u:object_r:openct_exec_t,s0) - - # - # /var -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.if serefpolicy-2.6.5/policy/modules/services/openct.if ---- nsaserefpolicy/policy/modules/services/openct.if 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/openct.if 2007-05-22 14:41:13.000000000 -0400 -@@ -1 +1,83 @@ --## Service for handling smart card readers. -+ -+## policy for openct -+ -+######################################## -+## -+## Execute a domain transition to run openct. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`openct_domtrans',` -+ gen_require(` -+ type openct_t, openct_exec_t; -+ ') -+ -+ domain_auto_trans($1,openct_exec_t,openct_t) -+ -+ allow openct_t $1:fd use; -+ allow openct_t $1:fifo_file rw_file_perms; -+ allow openct_t $1:process sigchld; -+') -+ -+######################################## -+## -+## Read openct PID files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`openct_read_pid_files',` -+ gen_require(` -+ type openct_var_run_t; -+ ') -+ -+ files_search_pids($1) -+ allow $1 openct_var_run_t:dir search_dir_perms; -+ allow $1 openct_var_run_t:file r_file_perms; -+') -+ -+######################################## -+## -+## Connect to openct over an unix stream socket. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`openct_stream_connect',` -+ gen_require(` -+ type openct_t, openct_var_run_t; -+ ') -+ -+ files_search_pids($1) -+ allow $1 openct_var_run_t:dir search_dir_perms; -+ allow $1 openct_var_run_t:sock_file write; -+ allow $1 openct_t:unix_stream_socket connectto; -+') -+ -+######################################## -+## -+## Send openct a null signal. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`openct_signull',` -+ gen_require(` -+ type openct_t; -+ ') -+ -+ allow $1 openct_t:process signull; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.te serefpolicy-2.6.5/policy/modules/services/openct.te ---- nsaserefpolicy/policy/modules/services/openct.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/openct.te 2007-05-23 09:21:48.000000000 -0400 -@@ -21,9 +21,13 @@ - dontaudit openct_t self:capability sys_tty_config; - allow openct_t self:process signal_perms; - -+can_exec(openct_t,openct_exec_t) -+ - manage_files_pattern(openct_t,openct_var_run_t,openct_var_run_t) - files_pid_filetrans(openct_t,openct_var_run_t,file) - -+corecmd_search_bin(openct_t) -+ - kernel_read_kernel_sysctls(openct_t) - kernel_list_proc(openct_t) - kernel_read_proc_symlinks(openct_t) -@@ -31,6 +35,8 @@ - dev_read_sysfs(openct_t) - # openct asks for this - dev_rw_usbfs(openct_t) -+dev_rw_smartcard(openct_t) -+dev_rw_generic_usb_dev(openct_t) - - domain_use_interactive_fds(openct_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-2.6.5/policy/modules/services/openvpn.fc ---- nsaserefpolicy/policy/modules/services/openvpn.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/openvpn.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -11,5 +11,5 @@ - # - # /var - # --/var/log/openvpn.* -- gen_context(system_u:object_r:openvpn_var_log_t,s0) --/var/run/openvpn.* -- gen_context(system_u:object_r:openvpn_var_run_t,s0) -+/var/log/openvpn(/.*)? gen_context(system_u:object_r:openvpn_var_log_t,s0) -+/var/run/openvpn(/.*)? gen_context(system_u:object_r:openvpn_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-2.6.5/policy/modules/services/pcscd.te ---- nsaserefpolicy/policy/modules/services/pcscd.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/pcscd.te 2007-05-22 14:41:13.000000000 -0400 -@@ -21,6 +21,7 @@ - # - - allow pcscd_t self:capability { dac_override dac_read_search }; -+allow pcscd_t self:process signal; - allow pcscd_t self:fifo_file { read write }; - allow pcscd_t self:unix_stream_socket create_stream_socket_perms; - allow pcscd_t self:unix_dgram_socket create_socket_perms; -@@ -62,5 +63,13 @@ - ') - - optional_policy(` -+ openct_stream_connect(pcscd_t) -+ openct_read_pid_files(pcscd_t) -+ openct_signull(pcscd_t) -+') -+ -+optional_policy(` - rpm_use_script_fds(pcscd_t) - ') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.6.5/policy/modules/services/pegasus.if ---- nsaserefpolicy/policy/modules/services/pegasus.if 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/pegasus.if 2007-05-22 14:41:13.000000000 -0400 -@@ -1 +1,19 @@ - ## The Open Group Pegasus CIM/WBEM Server. -+ -+######################################## -+## -+## Execute a domain transition to run pegasus. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`pegasus_domtrans',` -+ gen_require(` -+ type pegasus_t, pegasus_exec_t; -+ ') -+ -+ domtrans_pattern($1,pegasus_exec_t,pegasus_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.6.5/policy/modules/services/pegasus.te ---- nsaserefpolicy/policy/modules/services/pegasus.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/pegasus.te 2007-05-22 14:41:13.000000000 -0400 -@@ -38,8 +38,6 @@ - allow pegasus_t self:unix_stream_socket create_stream_socket_perms; - allow pegasus_t self:tcp_socket create_stream_socket_perms; - --send_audit_msgs_pattern(pegasus_t) -- - allow pegasus_t pegasus_conf_t:dir rw_dir_perms; - allow pegasus_t pegasus_conf_t:file { read_file_perms link unlink }; - allow pegasus_t pegasus_conf_t:lnk_file read_lnk_file_perms; -@@ -96,13 +94,12 @@ - - auth_use_nsswitch(pegasus_t) - auth_domtrans_chk_passwd(pegasus_t) -+auth_read_shadow(pegasus_t) - - domain_use_interactive_fds(pegasus_t) - domain_read_all_domains_state(pegasus_t) - --files_read_etc_files(pegasus_t) --files_list_var_lib(pegasus_t) --files_read_var_lib_files(pegasus_t) -+files_read_all_files(pegasus_t) - files_read_var_lib_symlinks(pegasus_t) - - hostname_exec(pegasus_t) -@@ -116,6 +113,7 @@ - miscfiles_read_localization(pegasus_t) - - sysnet_read_config(pegasus_t) -+sysnet_domtrans_ifconfig(pegasus_t) - - userdom_dontaudit_use_unpriv_user_fds(pegasus_t) - userdom_dontaudit_search_sysadm_home_dirs(pegasus_t) -@@ -129,6 +127,7 @@ - - optional_policy(` - logging_send_syslog_msg(pegasus_t) -+ logging_send_audit_msg(pegasus_t) - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.6.5/policy/modules/services/postfix.if ---- nsaserefpolicy/policy/modules/services/postfix.if 2007-03-26 10:39:04.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/postfix.if 2007-05-22 14:41:13.000000000 -0400 -@@ -122,6 +122,7 @@ - allow postfix_$1_t postfix_master_t:unix_stream_socket { connectto rw_stream_socket_perms }; - allow postfix_$1_t self:tcp_socket create_socket_perms; - allow postfix_$1_t self:udp_socket create_socket_perms; -+ allow postfix_$1_t self:netlink_route_socket r_netlink_socket_perms; - - domtrans_pattern(postfix_master_t, postfix_$1_exec_t, postfix_$1_t) - -@@ -455,3 +456,22 @@ - - typeattribute $1 postfix_user_domtrans; - ') -+ -+######################################## -+## -+## Create a named socket in a postfix private directory. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`postfix_create_pivate_sockets',` -+ gen_require(` -+ type postfix_private_t; -+ ') -+ -+ allow $1 postfix_private_t:dir list_dir_perms; -+ create_sock_files_pattern($1,postfix_private_t,postfix_private_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.6.5/policy/modules/services/postfix.te ---- nsaserefpolicy/policy/modules/services/postfix.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/postfix.te 2007-05-22 14:41:13.000000000 -0400 -@@ -169,6 +169,8 @@ - mta_rw_aliases(postfix_master_t) - mta_read_sendmail_bin(postfix_master_t) - -+term_dontaudit_search_ptys(postfix_master_t) -+ - ifdef(`targeted_policy',` - term_dontaudit_use_unallocated_ttys(postfix_master_t) - term_dontaudit_use_generic_ptys(postfix_master_t) -@@ -184,6 +186,10 @@ - ') - - optional_policy(` -+ mysql_stream_connect(postfix_master_t) -+') -+ -+optional_policy(` - nis_use_ypbind(postfix_master_t) - ') - -@@ -210,6 +216,7 @@ - - allow postfix_bounce_t self:capability dac_read_search; - allow postfix_bounce_t self:tcp_socket create_socket_perms; -+allow postfix_bounce_t postfix_master_t:file read; - - allow postfix_bounce_t postfix_public_t:sock_file write; - allow postfix_bounce_t postfix_public_t:dir search; -@@ -228,6 +235,7 @@ - # - - allow postfix_cleanup_t self:process setrlimit; -+allow postfix_cleanup_t postfix_master_t:file read; - - # connect to master process - stream_connect_pattern(postfix_cleanup_t,postfix_private_t,postfix_private_t,postfix_master_t) -@@ -250,6 +258,7 @@ - - allow postfix_local_t self:fifo_file rw_fifo_file_perms; - allow postfix_local_t self:process { setsched setrlimit }; -+allow postfix_local_t postfix_master_t:file read; - - manage_dirs_pattern(postfix_local_t,postfix_local_tmp_t,postfix_local_tmp_t) - manage_files_pattern(postfix_local_t,postfix_local_tmp_t,postfix_local_tmp_t) -@@ -369,6 +378,7 @@ - # - - allow postfix_pickup_t self:tcp_socket create_socket_perms; -+allow postfix_pickup_t postfix_master_t:file read; - - stream_connect_pattern(postfix_pickup_t,postfix_private_t,postfix_private_t,postfix_master_t) - -@@ -386,7 +396,7 @@ - # Postfix pipe local policy - # - --allow postfix_pipe_t self:fifo_file { read write }; -+allow postfix_pipe_t self:fifo_file rw_fifo_file_perms; - - write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t) - -@@ -395,6 +405,10 @@ - rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t) - - optional_policy(` -+ dovecot_domtrans_deliver(postfix_pipe_t) -+') -+ -+optional_policy(` - procmail_domtrans(postfix_pipe_t) - ') - -@@ -475,6 +489,8 @@ - # Postfix qmgr local policy - # - -+allow postfix_qmgr_t postfix_master_t:file read; -+ - stream_connect_pattern(postfix_qmgr_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t) - - rw_fifo_files_pattern(postfix_qmgr_t,postfix_public_t,postfix_public_t) -@@ -519,8 +535,6 @@ - # Postfix smtp delivery local policy - # - --allow postfix_smtp_t self:netlink_route_socket r_netlink_socket_perms; -- - # connect to master process - stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t) - -@@ -552,9 +566,18 @@ - mta_read_aliases(postfix_smtpd_t) - - optional_policy(` -+ mailman_read_data_files(postfix_smtpd_t) -+') -+ -+optional_policy(` - postgrey_stream_connect(postfix_smtpd_t) - ') - - optional_policy(` - sasl_connect(postfix_smtpd_t) - ') -+ -+optional_policy(` -+ dovecot_auth_stream_connect(postfix_smtpd_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.6.5/policy/modules/services/ppp.te ---- nsaserefpolicy/policy/modules/services/ppp.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/ppp.te 2007-05-25 09:01:55.000000000 -0400 -@@ -13,14 +13,12 @@ - ## - gen_tunable(pppd_can_insmod,false) - --ifdef(`strict_policy',` - ## - ##

- ## Allow pppd to be run for a regular user - ##

- ## - gen_tunable(pppd_for_user,false) --') - - # pppd_t is the domain for the pppd program. - # pppd_exec_t is the type of the pppd executable. -@@ -155,7 +153,7 @@ - - files_exec_etc_files(pppd_t) - files_manage_etc_runtime_files(pppd_t) --files_etc_filetrans_etc_runtime(pppd_t, { dir file }) -+sysnet_etc_filetrans_config(pppd_t) - files_dontaudit_write_etc_files(pppd_t) - - # for scripts -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.6.5/policy/modules/services/procmail.te ---- nsaserefpolicy/policy/modules/services/procmail.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/procmail.te 2007-05-22 14:41:13.000000000 -0400 -@@ -10,6 +10,7 @@ - type procmail_exec_t; - domain_type(procmail_t) - domain_entry_file(procmail_t,procmail_exec_t) -+application_executable_file(procmail_exec_t) - role system_r types procmail_t; - - type procmail_tmp_t; -@@ -101,6 +102,10 @@ - ') - - optional_policy(` -+ nis_use_ypbind(procmail_t) -+') -+ -+optional_policy(` - # for a bug in the postfix local program - postfix_dontaudit_rw_local_tcp_sockets(procmail_t) - postfix_dontaudit_use_fds(procmail_t) -@@ -119,8 +124,11 @@ - - optional_policy(` - corenet_udp_bind_generic_port(procmail_t) -+ corenet_dontaudit_udp_bind_all_ports(procmail_t) - - spamassassin_exec(procmail_t) - spamassassin_exec_client(procmail_t) - spamassassin_read_lib_files(procmail_t) - ') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-2.6.5/policy/modules/services/pyzor.fc ---- nsaserefpolicy/policy/modules/services/pyzor.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/pyzor.fc 2007-05-25 09:01:59.000000000 -0400 -@@ -6,6 +6,4 @@ - /var/lib/pyzord(/.*)? gen_context(system_u:object_r:pyzor_var_lib_t,s0) - /var/log/pyzord\.log -- gen_context(system_u:object_r:pyzord_log_t,s0) - --ifdef(`strict_policy',` - HOME_DIR/\.pyzor(/.*)? gen_context(system_u:object_r:ROLE_pyzor_home_t,s0) --') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.6.5/policy/modules/services/pyzor.te ---- nsaserefpolicy/policy/modules/services/pyzor.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/pyzor.te 2007-05-22 14:41:13.000000000 -0400 -@@ -54,6 +54,11 @@ - corenet_udp_sendrecv_all_nodes(pyzor_t) - corenet_udp_sendrecv_all_ports(pyzor_t) - -+corenet_tcp_sendrecv_all_if(pyzor_t) -+corenet_tcp_sendrecv_all_nodes(pyzor_t) -+corenet_tcp_sendrecv_all_ports(pyzor_t) -+corenet_tcp_connect_http_port(pyzor_t) -+ - dev_read_urand(pyzor_t) - - files_read_etc_files(pyzor_t) -@@ -68,6 +73,7 @@ - userdom_dontaudit_search_sysadm_home_dirs(pyzor_t) - - ifdef(`targeted_policy',` -+ userdom_dontaudit_write_sysadm_home_dirs(pyzor_t) - userdom_read_generic_user_home_content_files(pyzor_t) - ') - -@@ -77,6 +83,7 @@ - ') - - optional_policy(` -+ spamassassin_signal_spamd(pyzor_t) - spamassassin_read_spamd_tmp_files(pyzor_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.6.5/policy/modules/services/radius.te ---- nsaserefpolicy/policy/modules/services/radius.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/radius.te 2007-05-22 14:41:13.000000000 -0400 -@@ -130,3 +130,7 @@ - optional_policy(` - udev_read_db(radiusd_t) - ') -+ -+optional_policy(` -+ samba_read_var_files(radiusd_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-2.6.5/policy/modules/services/razor.fc ---- nsaserefpolicy/policy/modules/services/razor.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/razor.fc 2007-05-25 09:02:03.000000000 -0400 -@@ -1,6 +1,4 @@ --ifdef(`strict_policy',` - HOME_DIR/\.razor(/.*)? gen_context(system_u:object_r:ROLE_razor_home_t,s0) --') - - /etc/razor(/.*)? gen_context(system_u:object_r:razor_etc_t,s0) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-2.6.5/policy/modules/services/rhgb.te ---- nsaserefpolicy/policy/modules/services/rhgb.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/rhgb.te 2007-05-25 09:02:23.000000000 -0400 -@@ -113,19 +113,8 @@ - xserver_domtrans_xdm_xserver(rhgb_t) - xserver_signal_xdm_xserver(rhgb_t) - --ifdef(`strict_policy',` -- allow rhgb_t rhgb_devpts_t:chr_file { rw_chr_file_perms setattr }; -- term_create_pty(rhgb_t,rhgb_devpts_t) --', ` -- files_dontaudit_read_root_files(rhgb_t) -- -- term_use_generic_ptys(rhgb_t) -- term_setattr_generic_ptys(rhgb_t) -- term_dontaudit_use_unallocated_ttys(rhgb_t) -- -- xserver_domtrans_xdm_xserver(rhgb_t) -- xserver_read_xdm_tmp_files(rhgb_t) --') -+allow rhgb_t rhgb_devpts_t:chr_file { rw_chr_file_perms setattr }; -+term_create_pty(rhgb_t,rhgb_devpts_t) - - optional_policy(` - consoletype_exec(rhgb_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-2.6.5/policy/modules/services/rlogin.te ---- nsaserefpolicy/policy/modules/services/rlogin.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/rlogin.te 2007-05-22 14:41:13.000000000 -0400 -@@ -64,6 +64,7 @@ - fs_search_auto_mountpoints(rlogind_t) - - auth_domtrans_chk_passwd(rlogind_t) -+auth_domtrans_upd_passwd(rlogind_t) - auth_rw_login_records(rlogind_t) - auth_use_nsswitch(rlogind_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-2.6.5/policy/modules/services/rpcbind.fc ---- nsaserefpolicy/policy/modules/services/rpcbind.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/rpcbind.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,6 @@ -+ -+/sbin/rpcbind -- gen_context(system_u:object_r:rpcbind_exec_t,s0) -+/var/run/rpcbind.lock -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) -+/var/run/rpc.statd.pid -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) -+/var/run/rpcbind.sock -s gen_context(system_u:object_r:rpcbind_var_run_t,s0) -+/var/lib/rpcbind(/.*)? gen_context(system_u:object_r:rpcbind_var_lib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-2.6.5/policy/modules/services/rpcbind.if ---- nsaserefpolicy/policy/modules/services/rpcbind.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/rpcbind.if 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,104 @@ -+ -+## policy for rpcbind -+ -+######################################## -+## -+## Execute a domain transition to run rpcbind. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`rpcbind_domtrans',` -+ gen_require(` -+ type rpcbind_t, rpcbind_exec_t; -+ ') -+ -+ domain_auto_trans($1,rpcbind_exec_t,rpcbind_t) -+ -+ allow rpcbind_t $1:fd use; -+ allow rpcbind_t $1:fifo_file rw_file_perms; -+ allow rpcbind_t $1:process sigchld; -+') -+ -+######################################## -+## -+## Read rpcbind PID files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rpcbind_read_pid_files',` -+ gen_require(` -+ type rpcbind_var_run_t; -+ ') -+ -+ files_search_pids($1) -+ allow $1 rpcbind_var_run_t:file r_file_perms; -+') -+ -+ -+######################################## -+## -+## Search rpcbind lib directories. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rpcbind_search_lib',` -+ gen_require(` -+ type rpcbind_var_lib_t; -+ ') -+ -+ allow $1 rpcbind_var_lib_t:dir search_dir_perms; -+ files_search_var_lib($1) -+') -+ -+######################################## -+## -+## Read rpcbind lib files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rpcbind_read_lib_files',` -+ gen_require(` -+ type rpcbind_var_lib_t; -+ ') -+ -+ allow $1 rpcbind_var_lib_t:file r_file_perms; -+ allow $1 rpcbind_var_lib_t:dir list_dir_perms; -+ files_search_var_lib($1) -+') -+ -+######################################## -+## -+## Create, read, write, and delete -+## rpcbind lib files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rpcbind_manage_lib_files',` -+ gen_require(` -+ type rpcbind_var_lib_t; -+ ') -+ -+ allow $1 rpcbind_var_lib_t:file manage_file_perms; -+ allow $1 rpcbind_var_lib_t:dir rw_dir_perms; -+ files_search_var_lib($1) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-2.6.5/policy/modules/services/rpcbind.te ---- nsaserefpolicy/policy/modules/services/rpcbind.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/rpcbind.te 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,83 @@ -+policy_module(rpcbind,1.0.0) -+ -+######################################## -+# -+# Declarations -+# -+ -+type rpcbind_t; -+type rpcbind_exec_t; -+domain_type(rpcbind_t) -+init_daemon_domain(rpcbind_t, rpcbind_exec_t) -+ -+# pid files -+type rpcbind_var_run_t; -+files_pid_file(rpcbind_var_run_t) -+ -+# var/lib files -+type rpcbind_var_lib_t; -+files_type(rpcbind_var_lib_t) -+ -+######################################## -+# -+# rpcbind local policy -+# -+ -+# Init script handling -+init_use_fds(rpcbind_t) -+init_use_script_ptys(rpcbind_t) -+domain_use_interactive_fds(rpcbind_t) -+ -+allow rpcbind_t self:capability setuid; -+allow rpcbind_t self:netlink_route_socket r_netlink_socket_perms; -+allow rpcbind_t self:udp_socket listen; -+allow rpcbind_t self:tcp_socket create_stream_socket_perms; -+allow rpcbind_t self:fifo_file rw_file_perms; -+allow rpcbind_t self:unix_stream_socket create_stream_socket_perms; -+ -+# pid file -+allow rpcbind_t rpcbind_var_run_t:file manage_file_perms; -+allow rpcbind_t rpcbind_var_run_t:sock_file manage_sock_file_perms; -+allow rpcbind_t rpcbind_var_run_t:dir rw_dir_perms; -+files_pid_filetrans(rpcbind_t,rpcbind_var_run_t, { file sock_file }) -+ -+# var/lib files for rpcbind -+allow rpcbind_t rpcbind_var_lib_t:file manage_file_perms; -+allow rpcbind_t rpcbind_var_lib_t:sock_file manage_sock_file_perms; -+allow rpcbind_t rpcbind_var_lib_t:dir manage_dir_perms; -+files_var_lib_filetrans(rpcbind_t,rpcbind_var_lib_t, { file dir sock_file }) -+ -+corenet_non_ipsec_sendrecv(rpcbind_t) -+corenet_tcp_sendrecv_all_if(rpcbind_t) -+corenet_tcp_sendrecv_all_nodes(rpcbind_t) -+corenet_tcp_sendrecv_all_ports(rpcbind_t) -+corenet_tcp_bind_all_nodes(rpcbind_t) -+corenet_tcp_bind_portmap_port(rpcbind_t) -+ -+allow rpcbind_t self:udp_socket create_socket_perms; -+corenet_udp_sendrecv_all_if(rpcbind_t) -+corenet_udp_sendrecv_all_nodes(rpcbind_t) -+corenet_udp_sendrecv_all_ports(rpcbind_t) -+corenet_udp_bind_all_nodes(rpcbind_t) -+corenet_udp_bind_portmap_port(rpcbind_t) -+corenet_udp_bind_all_rpc_ports(rpcbind_t) -+ -+files_read_etc_files(rpcbind_t) -+ -+kernel_read_network_state(rpcbind_t) -+ -+libs_use_ld_so(rpcbind_t) -+libs_use_shared_libs(rpcbind_t) -+ -+logging_send_syslog_msg(rpcbind_t) -+ -+miscfiles_read_localization(rpcbind_t) -+ -+sysnet_dns_name_resolve(rpcbind_t) -+ -+ifdef(`targeted_policy',` -+ term_dontaudit_use_unallocated_ttys(rpcbind_t) -+ term_dontaudit_use_generic_ptys(rpcbind_t) -+') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.6.5/policy/modules/services/rpc.if ---- nsaserefpolicy/policy/modules/services/rpc.if 2007-03-20 23:38:10.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/rpc.if 2007-05-22 14:41:13.000000000 -0400 -@@ -89,8 +89,11 @@ - # bind to arbitary unused ports - corenet_tcp_bind_generic_port($1_t) - corenet_udp_bind_generic_port($1_t) -- corenet_udp_bind_reserved_port($1_t) -+ corenet_dontaudit_tcp_bind_all_ports($1_t) -+ corenet_dontaudit_udp_bind_all_ports($1_t) - corenet_sendrecv_generic_server_packets($1_t) -+ corenet_tcp_bind_all_rpc_ports($1_t) -+ corenet_udp_bind_all_rpc_ports($1_t) - - fs_rw_rpc_named_pipes($1_t) - fs_search_auto_mountpoints($1_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.6.5/policy/modules/services/rpc.te ---- nsaserefpolicy/policy/modules/services/rpc.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/rpc.te 2007-05-22 14:41:13.000000000 -0400 -@@ -79,6 +79,7 @@ - - optional_policy(` - nis_read_ypserv_config(rpcd_t) -+ nis_use_ypbind(rpcd_t) - ') - - ######################################## -@@ -123,6 +124,7 @@ - tunable_policy(`nfs_export_all_rw',` - fs_read_noxattr_fs_files(nfsd_t) - auth_manage_all_files_except_shadow(nfsd_t) -+ userdom_generic_user_home_dir_filetrans_generic_user_home_content(nfsd_t, { file dir }) - ') - - tunable_policy(`nfs_export_all_ro',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.6.5/policy/modules/services/rsync.te ---- nsaserefpolicy/policy/modules/services/rsync.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/rsync.te 2007-05-22 14:41:13.000000000 -0400 -@@ -17,6 +17,7 @@ - type rsync_t; - type rsync_exec_t; - init_daemon_domain(rsync_t,rsync_exec_t) -+application_executable_file(rsync_exec_t) - role system_r types rsync_t; - - type rsync_data_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-2.6.5/policy/modules/services/rwho.if ---- nsaserefpolicy/policy/modules/services/rwho.if 2007-04-30 22:35:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/rwho.if 2007-05-22 14:41:13.000000000 -0400 -@@ -1 +1,84 @@ --## Who is logged in on other machines? -+ -+## policy for rwho -+ -+######################################## -+## -+## Execute a domain transition to run rwho. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`rwho_domtrans',` -+ gen_require(` -+ type rwho_t, rwho_exec_t; -+ ') -+ -+ domain_auto_trans($1,rwho_exec_t,rwho_t) -+ -+ allow rwho_t $1:fd use; -+ allow rwho_t $1:fifo_file rw_file_perms; -+ allow rwho_t $1:process sigchld; -+') -+ -+######################################## -+## -+## Search rwho spool directories. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rwho_search_spool',` -+ gen_require(` -+ type rwho_spool_t; -+ ') -+ -+ allow $1 rwho_spool_t:dir search_dir_perms; -+ files_search_spool($1) -+') -+ -+######################################## -+## -+## Read rwho spool files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rwho_read_spool_files',` -+ gen_require(` -+ type rwho_spool_t; -+ ') -+ -+ allow $1 rwho_spool_t:file r_file_perms; -+ allow $1 rwho_spool_t:dir list_dir_perms; -+ files_search_spool($1) -+') -+ -+######################################## -+## -+## Create, read, write, and delete -+## rwho spool files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`rwho_manage_spool_files',` -+ gen_require(` -+ type rwho_spool_t; -+ ') -+ -+ allow $1 rwho_spool_t:file manage_file_perms; -+ allow $1 rwho_spool_t:dir rw_dir_perms; -+ files_search_spool($1) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.6.5/policy/modules/services/samba.fc ---- nsaserefpolicy/policy/modules/services/samba.fc 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/samba.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -3,6 +3,7 @@ - # /etc - # - /etc/samba/MACHINE\.SID -- gen_context(system_u:object_r:samba_secrets_t,s0) -+/etc/samba/passdb.tdb -- gen_context(system_u:object_r:samba_secrets_t,s0) - /etc/samba/secrets\.tdb -- gen_context(system_u:object_r:samba_secrets_t,s0) - /etc/samba/smbpasswd -- gen_context(system_u:object_r:samba_secrets_t,s0) - /etc/samba(/.*)? gen_context(system_u:object_r:samba_etc_t,s0) -@@ -27,6 +28,9 @@ - /var/cache/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0) - - /var/lib/samba(/.*)? gen_context(system_u:object_r:samba_var_t,s0) -+/var/lib/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0) -+ -+/var/lib/samba/scripts(/.*)? gen_context(system_u:object_r:samba_unconfined_script_exec_t,s0) - - /var/log/samba(/.*)? gen_context(system_u:object_r:samba_log_t,s0) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.6.5/policy/modules/services/samba.if ---- nsaserefpolicy/policy/modules/services/samba.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/samba.if 2007-05-22 14:41:13.000000000 -0400 -@@ -177,6 +177,27 @@ - - ######################################## - ## -+## Allow the specified domain to append to samba's log files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+# -+interface(`samba_append_log',` -+ gen_require(` -+ type samba_log_t; -+ ') -+ -+ logging_search_logs($1) -+ allow $1 samba_log_t:dir list_dir_perms; -+ allow $1 samba_log_t:file append_file_perms; -+') -+ -+######################################## -+## - ## Execute samba log in the caller domain. - ## - ## -@@ -230,6 +251,7 @@ - ') - - files_search_var($1) -+ files_search_var_lib($1) - allow $1 samba_var_t:dir search_dir_perms; - ') - -@@ -250,11 +272,55 @@ - ') - - files_search_var($1) -+ files_search_var_lib($1) - rw_files_pattern($1,samba_var_t,samba_var_t) - ') - - ######################################## - ## -+## Allow the specified domain to -+## read and write samba /var files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`samba_manage_var_files',` -+ gen_require(` -+ type samba_var_t; -+ ') -+ -+ files_search_var($1) -+ files_search_var_lib($1) -+ manage_files_pattern($1,samba_var_t,samba_var_t) -+ manage_lnk_files_pattern($1,samba_var_t,samba_var_t) -+') -+ -+######################################## -+## -+## Allow the specified domain to -+## read samba /var files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`samba_read_var_files',` -+ gen_require(` -+ type samba_var_t; -+ ') -+ -+ files_search_var($1) -+ files_search_var_lib($1) -+ read_files_pattern($1,samba_var_t,samba_var_t) -+') -+ -+######################################## -+## - ## Allow the specified domain to write to smbmount tcp sockets. - ## - ## -@@ -377,3 +443,52 @@ - allow $1 samba_var_t:dir search_dir_perms; - stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t) - ') -+ -+######################################## -+## -+## Do not audit attempts to use file descriptors from samba. -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`samba_dontaudit_use_fds',` -+ gen_require(` -+ type smbd_t; -+ ') -+ -+ dontaudit $1 smbd_t:fd use; -+') -+ -+ -+######################################## -+## -+## Create a set of derived types for apache -+## web content. -+## -+## -+## -+## The prefix to be used for deriving type names. -+## -+## -+# -+template(`samba_helper_template',` -+ gen_require(` -+ type smbd_t; -+ ') -+ #This type is for samba helper scripts -+ type samba_$1_script_t; -+ domain_type(samba_$1_script_t) -+ role system_r types samba_$1_script_t; -+ -+ # This type is used for executable scripts files -+ type samba_$1_script_exec_t; -+ corecmd_shell_entry_type(samba_$1_script_t) -+ domain_entry_file(samba_$1_script_t,samba_$1_script_exec_t) -+ -+ domtrans_pattern(smbd_t, samba_$1_script_exec_t, samba_$1_script_t) -+ allow smbd_t samba_$1_script_exec_t:file ioctl; -+ -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.5/policy/modules/services/samba.te ---- nsaserefpolicy/policy/modules/services/samba.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/samba.te 2007-05-23 14:32:38.000000000 -0400 -@@ -28,6 +28,35 @@ - ## - gen_tunable(samba_share_nfs,false) - -+## -+##

-+## Allow samba to run as the domain controller; add machines to passwd file -+## -+##

-+## -+gen_tunable(samba_domain_controller,false) -+ -+## -+##

-+## Allow samba to be exported read/write. -+##

-+## -+gen_tunable(samba_export_all_rw,false) -+ -+## -+##

-+## Allow samba to be exported read only -+##

-+## -+gen_tunable(samba_export_all_ro,false) -+ -+## -+##

-+## Allow samba to run unconfined scripts -+##

-+## -+gen_tunable(samba_run_unconfined,false) -+ - type nmbd_t; - type nmbd_exec_t; - init_daemon_domain(nmbd_t,nmbd_exec_t) -@@ -117,6 +146,7 @@ - allow samba_net_t self:unix_stream_socket create_stream_socket_perms; - allow samba_net_t self:udp_socket create_socket_perms; - allow samba_net_t self:tcp_socket create_socket_perms; -+allow samba_net_t self:netlink_route_socket r_netlink_socket_perms; - - allow samba_net_t samba_etc_t:file read_file_perms; - -@@ -159,6 +189,8 @@ - - miscfiles_read_localization(samba_net_t) - -+samba_read_var_files(samba_net_t) -+ - sysnet_read_config(samba_net_t) - sysnet_use_ldap(samba_net_t) - -@@ -202,7 +234,6 @@ - - create_dirs_pattern(smbd_t,samba_log_t,samba_log_t) - create_files_pattern(smbd_t,samba_log_t,samba_log_t) --append_files_pattern(smbd_t,samba_log_t,samba_log_t) - allow smbd_t samba_log_t:dir setattr; - dontaudit smbd_t samba_log_t:dir remove_name; - -@@ -256,6 +287,9 @@ - corenet_tcp_connect_ipp_port(smbd_t) - corenet_tcp_connect_smbd_port(smbd_t) - -+corecmd_exec_shell(smbd_t) -+corecmd_exec_bin(smbd_t) -+ - dev_read_sysfs(smbd_t) - dev_read_urand(smbd_t) - dev_getattr_mtrr_dev(smbd_t) -@@ -265,11 +299,13 @@ - fs_get_xattr_fs_quotas(smbd_t) - fs_search_auto_mountpoints(smbd_t) - fs_getattr_rpc_dirs(smbd_t) -+fs_list_inotifyfs(smbd_t) - - auth_use_nsswitch(smbd_t) - auth_domtrans_chk_passwd(smbd_t) - - domain_use_interactive_fds(smbd_t) -+domain_dontaudit_list_all_domains_state(smbd_t) - - files_list_var_lib(smbd_t) - files_read_etc_files(smbd_t) -@@ -296,6 +332,12 @@ - userdom_dontaudit_use_unpriv_user_fds(smbd_t) - userdom_use_unpriv_users_fds(smbd_t) - -+tunable_policy(`samba_domain_controller',` -+ usermanage_domtrans_passwd(smbd_t) -+ usermanage_domtrans_useradd(smbd_t) -+ usermanage_domtrans_groupadd(smbd_t) -+') -+ - ifdef(`hide_broken_symptoms', ` - files_dontaudit_getattr_default_dirs(smbd_t) - files_dontaudit_getattr_boot_dirs(smbd_t) -@@ -339,6 +381,23 @@ - udev_read_db(smbd_t) - ') - -+tunable_policy(`samba_export_all_rw',` -+ fs_read_noxattr_fs_files(smbd_t) -+ auth_manage_all_files_except_shadow(smbd_t) -+ fs_read_noxattr_fs_files(nmbd_t) -+ auth_manage_all_files_except_shadow(nmbd_t) -+ userdom_generic_user_home_dir_filetrans_generic_user_home_content(nmbd_t, { file dir }) -+ -+') -+ -+tunable_policy(`samba_export_all_ro',` -+ fs_read_noxattr_fs_files(smbd_t) -+ auth_read_all_files_except_shadow(smbd_t) -+ fs_read_noxattr_fs_files(nmbd_t) -+ auth_read_all_files_except_shadow(nmbd_t) -+') -+ -+ - ######################################## - # - # nmbd Local policy -@@ -362,9 +421,12 @@ - files_pid_filetrans(nmbd_t,nmbd_var_run_t,file) - - read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t) -+files_list_var_lib(nmbd_t) - --create_dirs_pattern(nmbd_t,samba_log_t,samba_log_t) -+manage_dirs_pattern(nmbd_t,samba_log_t,samba_log_t) - append_files_pattern(nmbd_t,samba_log_t,samba_log_t) -+allow nmbd_t samba_log_t:file unlink; -+ - read_files_pattern(nmbd_t,samba_log_t,samba_log_t) - create_files_pattern(nmbd_t,samba_log_t,samba_log_t) - allow nmbd_t samba_log_t:dir setattr; -@@ -391,6 +453,7 @@ - corenet_udp_bind_nmbd_port(nmbd_t) - corenet_sendrecv_nmbd_server_packets(nmbd_t) - corenet_sendrecv_nmbd_client_packets(nmbd_t) -+corenet_tcp_connect_smbd_port(nmbd_t) - - dev_read_sysfs(nmbd_t) - dev_getattr_mtrr_dev(nmbd_t) -@@ -457,6 +520,7 @@ - - allow smbmount_t samba_secrets_t:file manage_file_perms; - -+files_list_var_lib(smbmount_t) - allow smbmount_t samba_var_t:dir rw_dir_perms; - manage_files_pattern(smbmount_t,samba_var_t,samba_var_t) - manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t) -@@ -514,7 +578,7 @@ - userdom_use_sysadm_ttys(smbmount_t) - - optional_policy(` -- cups_read_rw_config(smbd_t) -+ cups_read_rw_config(smbmount_t) - ') - - optional_policy(` -@@ -534,7 +598,6 @@ - allow swat_t self:process signal_perms; - allow swat_t self:fifo_file rw_file_perms; - allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms; --allow swat_t self:netlink_audit_socket create; - allow swat_t self:tcp_socket create_stream_socket_perms; - allow swat_t self:udp_socket create_socket_perms; - allow swat_t self:netlink_route_socket r_netlink_socket_perms; -@@ -625,6 +688,8 @@ - # Winbind local policy - # - -+ -+allow winbind_t self:capability { dac_override ipc_lock setuid }; - dontaudit winbind_t self:capability sys_tty_config; - allow winbind_t self:process signal_perms; - allow winbind_t self:fifo_file { read write }; -@@ -634,10 +699,15 @@ - allow winbind_t self:tcp_socket create_stream_socket_perms; - allow winbind_t self:udp_socket create_socket_perms; - -+allow winbind_t nmbd_t:process { signal signull }; -+allow winbind_t nmbd_var_run_t:file read_file_perms; -+ - allow winbind_t samba_etc_t:dir list_dir_perms; - read_files_pattern(winbind_t,samba_etc_t,samba_etc_t) - read_lnk_files_pattern(winbind_t,samba_etc_t,samba_etc_t) - -+rw_files_pattern(winbind_t,smbd_tmp_t,smbd_tmp_t) -+ - manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t) - filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file) - -@@ -645,6 +715,8 @@ - manage_files_pattern(winbind_t,samba_log_t,samba_log_t) - manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t) - -+files_list_var_lib(winbind_t) -+manage_dirs_pattern(winbind_t,samba_var_t,samba_var_t) - manage_files_pattern(winbind_t,samba_var_t,samba_var_t) - manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t) - -@@ -736,6 +808,7 @@ - read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t) - read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t) - -+files_list_var_lib(winbind_helper_t) - allow winbind_helper_t samba_var_t:dir search; - - stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t) -@@ -764,3 +837,24 @@ - squid_read_log(winbind_helper_t) - squid_append_log(winbind_helper_t) - ') -+ -+######################################## -+# -+# samba_unconfined_script_t local policy -+# -+type samba_unconfined_script_t; -+domain_type(samba_unconfined_script_t) -+role system_r types samba_unconfined_script_t; -+ -+# This type is used for executable scripts files -+type samba_unconfined_script_exec_t; -+corecmd_shell_entry_type(samba_unconfined_script_t) -+domain_entry_file(samba_unconfined_script_t,samba_unconfined_script_exec_t) -+allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms; -+allow smbd_t samba_unconfined_script_exec_t:file ioctl; -+ -+tunable_policy(`samba_run_unconfined',` -+ domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t) -+') -+unconfined_domain(samba_unconfined_script_t) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.6.5/policy/modules/services/sasl.te ---- nsaserefpolicy/policy/modules/services/sasl.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/sasl.te 2007-05-22 14:41:13.000000000 -0400 -@@ -63,6 +63,7 @@ - selinux_compute_access_vector(saslauthd_t) - - auth_domtrans_chk_passwd(saslauthd_t) -+auth_domtrans_upd_passwd(saslauthd_t) - auth_use_nsswitch(saslauthd_t) - - domain_use_interactive_fds(saslauthd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.6.5/policy/modules/services/sendmail.te ---- nsaserefpolicy/policy/modules/services/sendmail.te 2007-05-18 11:12:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/sendmail.te 2007-05-23 10:53:14.000000000 -0400 -@@ -107,7 +107,6 @@ - mta_manage_spool(sendmail_t) - - ifdef(`targeted_policy',` -- unconfined_domain(sendmail_t) - term_dontaudit_use_unallocated_ttys(sendmail_t) - term_dontaudit_use_generic_ptys(sendmail_t) - files_dontaudit_read_root_files(sendmail_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.6.5/policy/modules/services/setroubleshoot.te ---- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/setroubleshoot.te 2007-05-22 14:41:13.000000000 -0400 -@@ -28,7 +28,7 @@ - # - - allow setroubleshootd_t self:capability { dac_override sys_tty_config }; --allow setroubleshootd_t self:process { signal getattr getsched }; -+allow setroubleshootd_t self:process { signull signal getattr getsched }; - allow setroubleshootd_t self:fifo_file rw_fifo_file_perms; - allow setroubleshootd_t self:tcp_socket create_stream_socket_perms; - allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.6.5/policy/modules/services/smartmon.te ---- nsaserefpolicy/policy/modules/services/smartmon.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/smartmon.te 2007-05-22 14:41:13.000000000 -0400 -@@ -60,6 +60,7 @@ - fs_search_auto_mountpoints(fsdaemon_t) - - mls_file_read_up(fsdaemon_t) -+mls_file_write_down(fsdaemon_t) - - storage_raw_read_fixed_disk(fsdaemon_t) - storage_raw_write_fixed_disk(fsdaemon_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-2.6.5/policy/modules/services/snmp.fc ---- nsaserefpolicy/policy/modules/services/snmp.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/snmp.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -1,11 +1,5 @@ - - # --# /etc --# -- --/etc/snmp/snmp(trap)?d\.conf -- gen_context(system_u:object_r:snmpd_etc_t,s0) -- --# - # /usr - # - /usr/sbin/snmp(trap)?d -- gen_context(system_u:object_r:snmpd_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.6.5/policy/modules/services/snmp.te ---- nsaserefpolicy/policy/modules/services/snmp.te 2007-05-18 11:12:43.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/snmp.te 2007-05-22 14:41:13.000000000 -0400 -@@ -9,9 +9,6 @@ - type snmpd_exec_t; - init_daemon_domain(snmpd_t,snmpd_exec_t) - --type snmpd_etc_t; --files_config_file(snmpd_etc_t) -- - type snmpd_log_t; - logging_log_file(snmpd_log_t) - -@@ -33,8 +30,6 @@ - allow snmpd_t self:tcp_socket create_stream_socket_perms; - allow snmpd_t self:udp_socket connected_stream_socket_perms; - --allow snmpd_t snmpd_etc_t:file { getattr read }; -- - allow snmpd_t snmpd_log_t:file manage_file_perms; - logging_log_filetrans(snmpd_t,snmpd_log_t,file) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.6.5/policy/modules/services/spamassassin.fc ---- nsaserefpolicy/policy/modules/services/spamassassin.fc 2007-03-08 08:26:59.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/spamassassin.fc 2007-05-25 09:02:28.000000000 -0400 -@@ -10,6 +10,4 @@ - - /var/spool/spamassassin(/.*)? gen_context(system_u:object_r:spamd_spool_t,s0) - --ifdef(`strict_policy',` - HOME_DIR/\.spamassassin(/.*)? gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0) --') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.6.5/policy/modules/services/spamassassin.te ---- nsaserefpolicy/policy/modules/services/spamassassin.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/spamassassin.te 2007-05-24 16:47:42.000000000 -0400 -@@ -6,14 +6,12 @@ - # Declarations - # - --ifdef(`strict_policy',` - ## - ##

- ## Allow user spamassassin clients to use the network. - ##

- ## - gen_tunable(spamassassin_can_network,false) --') - - ifdef(`targeted_policy',` - ## -@@ -26,7 +24,7 @@ - - # spamassassin client executable - type spamc_exec_t; --corecmd_executable_file(spamc_exec_t) -+application_executable_file(spamc_exec_t) - - type spamd_t; - type spamd_exec_t; -@@ -46,7 +44,7 @@ - files_pid_file(spamd_var_run_t) - - type spamassassin_exec_t; --corecmd_executable_file(spamassassin_exec_t) -+application_executable_file(spamassassin_exec_t) - - ######################################## - # -@@ -103,6 +101,7 @@ - corenet_tcp_bind_all_nodes(spamd_t) - corenet_tcp_bind_spamd_port(spamd_t) - corenet_tcp_connect_razor_port(spamd_t) -+corenet_tcp_connect_smtp_port(spamd_t) - corenet_sendrecv_razor_client_packets(spamd_t) - corenet_sendrecv_spamd_server_packets(spamd_t) - # spamassassin 3.1 needs this for its -@@ -162,7 +161,7 @@ - userdom_manage_generic_user_home_content_dirs(spamd_t) - userdom_manage_generic_user_home_content_files(spamd_t) - userdom_manage_generic_user_home_content_symlinks(spamd_t) -- userdom_generic_user_home_dir_filetrans_generic_user_home_content(spamd_t,dir) -+# userdom_generic_user_home_dir_filetrans_generic_user_home_content(spamd_t,dir) - ') - ') - -@@ -192,6 +191,11 @@ - ') - - optional_policy(` -+ mysql_search_db(spamd_t) -+ mysql_stream_connect(spamd_t) -+') -+ -+optional_policy(` - nis_use_ypbind(spamd_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-2.6.5/policy/modules/services/squid.fc ---- nsaserefpolicy/policy/modules/services/squid.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/squid.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -12,3 +12,5 @@ - /var/run/squid\.pid -- gen_context(system_u:object_r:squid_var_run_t,s0) - - /var/spool/squid(/.*)? gen_context(system_u:object_r:squid_cache_t,s0) -+/usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0) -+/usr/lib64/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.6.5/policy/modules/services/squid.te ---- nsaserefpolicy/policy/modules/services/squid.te 2007-05-07 10:32:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/squid.te 2007-05-22 14:41:13.000000000 -0400 -@@ -185,3 +185,12 @@ - #squid requires the following when run in diskd mode, the recommended setting - allow squid_t tmpfs_t:file { read write }; - ') dnl end TODO -+ -+optional_policy(` -+ apache_content_template(squid) -+ corenet_tcp_connect_http_cache_port(httpd_squid_script_t) -+ squid_read_config(httpd_squid_script_t) -+ allow httpd_squid_script_t self:tcp_socket create_socket_perms; -+ sysnet_read_config(httpd_squid_script_t) -+ corenet_non_ipsec_sendrecv(httpd_squid_script_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-2.6.5/policy/modules/services/ssh.fc ---- nsaserefpolicy/policy/modules/services/ssh.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/ssh.fc 2007-05-24 13:35:36.000000000 -0400 -@@ -12,8 +12,6 @@ - - /var/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) - --ifdef(`targeted_policy', `', ` - /usr/bin/ssh-agent -- gen_context(system_u:object_r:ssh_agent_exec_t,s0) - - HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ROLE_home_ssh_t,s0) --') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.6.5/policy/modules/services/ssh.if ---- nsaserefpolicy/policy/modules/services/ssh.if 2007-04-30 10:41:38.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/ssh.if 2007-05-22 14:41:13.000000000 -0400 -@@ -709,3 +709,42 @@ - - dontaudit $1 sshd_key_t:file { getattr read }; - ') -+ -+######################################## -+## -+## Inherit and use a file descriptor -+## from the ssh-agent. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`ssh_use_user_ssh_agent_fds',` -+ gen_require(` -+ type $1_ssh_agent_t; -+ ') -+ -+ allow $2 $1_ssh_agent_t:fd use; -+') -+ -+######################################## -+## -+## dontaudit use of file descriptor -+## from the ssh-agent. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`ssh_dontaudit_use_user_ssh_agent_fds',` -+ gen_require(` -+ type $1_ssh_agent_t; -+ ') -+ -+ dontaudit $2 $1_ssh_agent_t:fd use; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.6.5/policy/modules/services/ssh.te ---- nsaserefpolicy/policy/modules/services/ssh.te 2007-04-30 10:41:38.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/ssh.te 2007-05-22 14:41:13.000000000 -0400 -@@ -24,11 +24,11 @@ - - # Type for the ssh-agent executable. - type ssh_agent_exec_t; --files_type(ssh_agent_exec_t) -+application_executable_file(ssh_agent_exec_t) - - # ssh client executable. - type ssh_exec_t; --corecmd_executable_file(ssh_exec_t) -+application_executable_file(ssh_exec_t) - - type ssh_keygen_t; - type ssh_keygen_exec_t; -@@ -82,6 +82,7 @@ - - ifdef(`targeted_policy',` - unconfined_domain(sshd_t) -+ unconfined_shell_domtrans(sshd_t) - ') - - tunable_policy(`ssh_sysadm_login',` -@@ -122,6 +123,10 @@ - rssh_read_all_users_ro_content(sshd_t) - ') - -+optional_policy(` -+ usermanage_read_crack_db(sshd_t) -+') -+ - ifdef(`TODO',` - tunable_policy(`ssh_sysadm_login',` - # Relabel and access ptys created by sshd -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.6.5/policy/modules/services/tftp.te ---- nsaserefpolicy/policy/modules/services/tftp.te 2007-04-23 09:36:01.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/tftp.te 2007-05-22 14:41:13.000000000 -0400 -@@ -69,6 +69,7 @@ - logging_send_syslog_msg(tftpd_t) - - miscfiles_read_localization(tftpd_t) -+miscfiles_read_public_files(tftpd_t) - - sysnet_read_config(tftpd_t) - sysnet_use_ldap(tftpd_t) -@@ -102,3 +103,4 @@ - optional_policy(` - udev_read_db(tftpd_t) - ') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-2.6.5/policy/modules/services/w3c.fc ---- nsaserefpolicy/policy/modules/services/w3c.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/w3c.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,2 @@ -+/usr/share/w3c-markup-validator(/.*)? gen_context(system_u:object_r:httpd_w3c_validator_content_t,s0) -+/usr/share/w3c-markup-validator/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_w3c_validator_script_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-2.6.5/policy/modules/services/w3c.if ---- nsaserefpolicy/policy/modules/services/w3c.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/w3c.if 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1 @@ -+## W3C -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-2.6.5/policy/modules/services/w3c.te ---- nsaserefpolicy/policy/modules/services/w3c.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/w3c.te 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,14 @@ -+policy_module(w3c,1.2.1) -+ -+apache_content_template(w3c_validator) -+ -+sysnet_dns_name_resolve(httpd_w3c_validator_script_t) -+ -+corenet_tcp_connect_ftp_port(httpd_w3c_validator_script_t) -+corenet_tcp_sendrecv_ftp_port(httpd_w3c_validator_script_t) -+corenet_tcp_connect_http_port(httpd_w3c_validator_script_t) -+corenet_tcp_sendrecv_http_port(httpd_w3c_validator_script_t) -+corenet_tcp_connect_http_cache_port(httpd_w3c_validator_script_t) -+corenet_tcp_sendrecv_http_cache_port(httpd_w3c_validator_script_t) -+ -+miscfiles_read_certs(httpd_w3c_validator_script_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.6.5/policy/modules/services/xserver.fc ---- nsaserefpolicy/policy/modules/services/xserver.fc 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/services/xserver.fc 2007-05-25 09:03:12.000000000 -0400 -@@ -1,7 +1,6 @@ - # - # HOME_DIR - # --ifdef(`strict_policy',` - HOME_DIR/\.fonts\.conf -- gen_context(system_u:object_r:ROLE_fonts_config_t,s0) - HOME_DIR/\.fonts(/.*)? gen_context(system_u:object_r:ROLE_fonts_t,s0) - HOME_DIR/\.fonts/auto(/.*)? gen_context(system_u:object_r:ROLE_fonts_cache_t,s0) -@@ -9,7 +8,6 @@ - HOME_DIR/\.ICEauthority.* -- gen_context(system_u:object_r:ROLE_iceauth_home_t,s0) - HOME_DIR/\.xauth.* -- gen_context(system_u:object_r:ROLE_xauth_home_t,s0) - HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:ROLE_xauth_home_t,s0) --') - - # - # /dev -@@ -29,6 +27,7 @@ - - /etc/X11/[wx]dm/Xreset.* -- gen_context(system_u:object_r:xsession_exec_t,s0) - /etc/X11/[wxg]dm/Xsession -- gen_context(system_u:object_r:xsession_exec_t,s0) -+/etc/X11/init/Xsession -- gen_context(system_u:object_r:xsession_exec_t,s0) - /etc/X11/wdm(/.*)? gen_context(system_u:object_r:xdm_rw_etc_t,s0) - /etc/X11/wdm/Xsetup.* -- gen_context(system_u:object_r:xsession_exec_t,s0) - /etc/X11/wdm/Xstartup.* -- gen_context(system_u:object_r:xsession_exec_t,s0) -@@ -49,9 +48,7 @@ - /tmp/\.X11-unix -d gen_context(system_u:object_r:xdm_tmp_t,s0) - /tmp/\.X11-unix/.* -s <> - --ifdef(`strict_policy',` - /tmp/\.X0-lock -- gen_context(system_u:object_r:xdm_xserver_tmp_t,s0) --') - - # - # /usr -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.6.5/policy/modules/services/xserver.if ---- nsaserefpolicy/policy/modules/services/xserver.if 2007-05-04 12:19:22.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/xserver.if 2007-05-25 09:03:19.000000000 -0400 -@@ -154,6 +154,8 @@ - - modutils_domtrans_insmod($1_xserver_t) - -+ selinux_get_fs_mount($1_xserver_t) -+ - seutil_dontaudit_search_config($1_xserver_t) - - sysnet_read_config($1_xserver_t) -@@ -732,12 +734,8 @@ - attribute xauth_home_type; - ') - -- ifdef(`strict_policy',` -- allow $1 xauth_home_type:file read_file_perms; -- userdom_search_all_users_home_dirs($1) -- ',` -- userdom_read_generic_user_home_content_files($1) -- ') -+ allow $1 xauth_home_type:file read_file_perms; -+ userdom_search_all_users_home_dirs($1) - ') - - ######################################## -@@ -1136,7 +1134,7 @@ - type xdm_xserver_tmp_t; - ') - -- allow $1 xdm_xserver_tmp_t:file { getattr read }; -+ read_files_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t) - ') - - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.6.5/policy/modules/services/xserver.te ---- nsaserefpolicy/policy/modules/services/xserver.te 2007-05-04 12:19:22.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/services/xserver.te 2007-05-24 16:22:38.000000000 -0400 -@@ -6,7 +6,6 @@ - # Declarations - # - --ifdef(`strict_policy',` - ## - ##

- ## Allows clients to write to the X server shared -@@ -14,7 +13,6 @@ - ##

- ## - gen_tunable(allow_write_xshm,false) --') - - ## - ##

-@@ -276,9 +274,9 @@ - xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t) - - ifdef(`targeted_policy',` -- unconfined_domain(xdm_t) -+# unconfined_domain(xdm_t) - unconfined_domtrans(xdm_t) -- userdom_generic_user_home_dir_filetrans_generic_user_home_content(xdm_t, {file dir }) -+# userdom_generic_user_home_dir_filetrans_generic_user_home_content(xdm_t, {file dir }) - - ifndef(`distro_redhat',` - allow xdm_t self:process { execheap execmem }; -@@ -321,6 +319,8 @@ - - optional_policy(` - consolekit_dbus_chat(xdm_t) -+ dbus_system_bus_client_template(xdm, xdm_t) -+ dbus_send_system_bus(xdm_t) - ') - - optional_policy(` -@@ -427,7 +427,7 @@ - ') - - ifdef(`targeted_policy',` -- unconfined_domain_noaudit(xdm_xserver_t) -+# unconfined_domain_noaudit(xdm_xserver_t) - unconfined_domtrans(xdm_xserver_t) - - ifndef(`distro_redhat',` -@@ -449,28 +449,6 @@ - ') - - ifdef(`TODO',` --# Need to further investigate these permissions and --# perhaps define derived types. --allow xdm_t var_lib_t:dir { write search add_name remove_name create unlink }; --allow xdm_t var_lib_t:file { create write unlink }; -- --# Do not audit attempts to write to index files under /usr --dontaudit xdm_t usr_t:file write; -- --ifdef(`rhgb.te', ` --allow xdm_xserver_t ramfs_t:dir rw_dir_perms; --allow xdm_xserver_t ramfs_t:file manage_file_perms; --allow rhgb_t xdm_xserver_t:process signal; --') -- --tunable_policy(`allow_polyinstantiation',` --# xdm needs access for linking .X11-unix to poly /tmp --allow xdm_t polymember:dir { add_name remove_name write }; --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 }; --') -- - # - # Wants to delete .xsession-errors file - # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-2.6.5/policy/modules/system/application.fc ---- nsaserefpolicy/policy/modules/system/application.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/application.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1 @@ -+# No application file contexts. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-2.6.5/policy/modules/system/application.if ---- nsaserefpolicy/policy/modules/system/application.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/application.if 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,104 @@ -+##

Policy for application domains -+ -+######################################## -+## -+## Make the specified type usable as an application domain. -+## -+## -+## -+## Type to be used as a domain type. -+## -+## -+# -+interface(`application_type',` -+ gen_require(` -+ attribute application_domain_type; -+ ') -+ -+ typeattribute $1 application_domain_type; -+ -+ # start with basic domain -+ domain_type($1) -+') -+ -+######################################## -+## -+## Make the specified type usable for files -+## that are exectuables, such as binary programs. -+## This does not include shared libraries. -+## -+## -+## -+## Type to be used for files. -+## -+## -+# -+interface(`application_executable_file',` -+ gen_require(` -+ attribute application_exec_type; -+ ') -+ -+ typeattribute $1 application_exec_type; -+ -+ corecmd_executable_file($1) -+') -+ -+######################################## -+## -+## Execute application executables in the caller domain. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`application_exec',` -+ gen_require(` -+ attribute application_exec_type; -+ ') -+ -+ can_exec($1, application_exec_type) -+') -+ -+######################################## -+## -+## Execute all executable files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+# -+interface(`application_exec_all',` -+ # Need this dontaudit or command completion fires hundreds of avcs -+ corecmd_dontaudit_exec_all_executables($1) -+ corecmd_exec_bin($1) -+ corecmd_exec_shell($1) -+ corecmd_exec_chroot($1) -+ application_exec($1) -+') -+ -+######################################## -+## -+## Create a domain which can be started by users -+## -+## -+## -+## Type to be used as a domain. -+## -+## -+## -+## -+## Type of the program to be used as an entry point to this domain. -+## -+## -+# -+interface(`application_domain',` -+ -+ application_type($1) -+ application_executable_file($2) -+ domain_entry_file($1,$2) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-2.6.5/policy/modules/system/application.te ---- nsaserefpolicy/policy/modules/system/application.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/application.te 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,14 @@ -+ -+policy_module(application,1.0.0) -+ -+# Attribute of user applications -+attribute application_domain_type; -+ -+# Executables to be run by user -+attribute application_exec_type; -+ -+optional_policy(` -+ ssh_sigchld(application_domain_type) -+ ssh_rw_stream_sockets(application_domain_type) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-2.6.5/policy/modules/system/authlogin.fc ---- nsaserefpolicy/policy/modules/system/authlogin.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/authlogin.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -14,6 +14,7 @@ - /sbin/pam_timestamp_check -- gen_context(system_u:object_r:pam_exec_t,s0) - /sbin/unix_chkpwd -- gen_context(system_u:object_r:chkpwd_exec_t,s0) - /sbin/unix_verify -- gen_context(system_u:object_r:chkpwd_exec_t,s0) -+/sbin/unix_update -- gen_context(system_u:object_r:updpwd_exec_t,s0) - ifdef(`distro_suse', ` - /sbin/unix2_chkpwd -- gen_context(system_u:object_r:chkpwd_exec_t,s0) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.6.5/policy/modules/system/authlogin.if ---- nsaserefpolicy/policy/modules/system/authlogin.if 2007-03-26 10:39:07.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/authlogin.if 2007-05-24 15:13:17.000000000 -0400 -@@ -27,11 +27,9 @@ - domain_type($1_chkpwd_t) - domain_entry_file($1_chkpwd_t,chkpwd_exec_t) - -- allow $1_chkpwd_t self:capability { audit_control setuid }; -+ allow $1_chkpwd_t self:capability { dac_override setuid }; - allow $1_chkpwd_t self:process getattr; - -- send_audit_msgs_pattern($1_chkpwd_t) -- - files_list_etc($1_chkpwd_t) - allow $1_chkpwd_t shadow_t:file { getattr read }; - -@@ -53,6 +51,7 @@ - libs_use_shared_libs($1_chkpwd_t) - - logging_send_syslog_msg($1_chkpwd_t) -+ logging_send_audit_msg($1_chkpwd_t) - - miscfiles_read_localization($1_chkpwd_t) - -@@ -109,7 +108,7 @@ - role $3 types system_chkpwd_t; - - # cjp: is this really needed? -- allow $2 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; -+ logging_send_audit_msg($2) - - dontaudit $2 shadow_t:file { getattr read }; - -@@ -152,21 +151,12 @@ - ## - # - template(`auth_domtrans_user_chk_passwd',` -- ifdef(`targeted_policy',` -- gen_require(` -- type system_chkpwd_t, chkpwd_exec_t; -- ') -- -- corecmd_search_bin($2) -- domtrans_pattern($2,chkpwd_exec_t,system_chkpwd_t) -- ',` -- gen_require(` -- type $1_chkpwd_t, chkpwd_exec_t; -- ') -- -- corecmd_search_bin($2) -- domtrans_pattern($2,chkpwd_exec_t,$1_chkpwd_t) -+ gen_require(` -+ type $1_chkpwd_t, chkpwd_exec_t; - ') -+ -+ corecmd_search_bin($2) -+ domtrans_pattern($2,chkpwd_exec_t,$1_chkpwd_t) - ') - - ######################################## -@@ -180,6 +170,9 @@ - ## - # - interface(`auth_login_pgm_domain',` -+ gen_require(` -+ attribute keyring_type; -+ ') - - domain_type($1) - domain_subj_id_change_exemption($1) -@@ -187,6 +180,12 @@ - domain_obj_id_change_exemption($1) - role system_r types $1; - -+ auth_keyring_domain($1) -+ allow $1 keyring_type:key { search link }; -+ -+ logging_send_audit_msg($1) -+ logging_set_loginuid($1) -+ - # for SSP/ProPolice - dev_read_urand($1) - -@@ -211,9 +210,11 @@ - auth_read_login_records($1) - auth_append_login_records($1) - auth_rw_lastlog($1) -- auth_append_faillog($1) -+ auth_rw_faillog($1) - auth_exec_pam($1) - -+ auth_domtrans_upd_passwd($1) -+ - init_rw_utmp($1) - - logging_send_syslog_msg($1) -@@ -221,6 +222,7 @@ - seutil_read_config($1) - seutil_read_default_contexts($1) - -+ - tunable_policy(`allow_polyinstantiation',` - files_polyinstantiate_all($1) - ') -@@ -320,10 +322,6 @@ - type system_chkpwd_t, chkpwd_exec_t, shadow_t; - ') - -- # cjp: is this really needed? -- allow $1 self:capability audit_control; -- send_audit_msgs_pattern($1) -- - corecmd_search_bin($1) - domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t) - -@@ -357,6 +355,37 @@ - - ######################################## - ## -+## Execute chkpwd programs in the chkpwd domain. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The role to allow the updpwd domain. -+## -+## -+## -+## -+## The type of the terminal allow the updpwd domain to use. -+## -+## -+# -+interface(`auth_run_chk_passwd',` -+ gen_require(` -+ type system_chkpwd_t; -+ ') -+ -+ auth_domtrans_chk_passwd($1) -+ role $2 types system_chkpwd_t; -+ allow system_chkpwd_t $3:chr_file rw_file_perms; -+ -+') -+ -+######################################## -+## - ## Get the attributes of the shadow passwords file. - ## - ## -@@ -1391,3 +1420,114 @@ - typeattribute $1 can_write_shadow_passwords; - typeattribute $1 can_relabelto_shadow_passwords; - ') -+ -+######################################## -+## -+## read login keyrings. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`auth_read_key',` -+ gen_require(` -+ attribute keyring_type; -+ ') -+ -+ allow $1 keyring_type:key { read search view }; -+') -+ -+######################################## -+## -+## search login keyrings. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`auth_search_key',` -+ gen_require(` -+ attribute keyring_type; -+ ') -+ -+ allow $1 keyring_type:key { search link }; -+') -+ -+ -+ -+######################################## -+## -+## Make the specified domain a keyring domain -+## -+## -+## -+## Domain type used for a login program domain. -+## -+## -+# -+interface(`auth_keyring_domain',` -+ gen_require(` -+ attribute keyring_type; -+ ') -+ -+ typeattribute $1 keyring_type; -+') -+ -+######################################## -+## -+## Execute a domain transition to run unix_update. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`auth_domtrans_upd_passwd',` -+ gen_require(` -+ type updpwd_t, updpwd_exec_t; -+ ') -+ -+ domain_auto_trans($1,updpwd_exec_t,updpwd_t) -+ allow updpwd_t $1:fd use; -+ allow updpwd_t $1:fifo_file rw_file_perms; -+ allow updpwd_t $1:process sigchld; -+ auth_dontaudit_read_shadow($1) -+ -+') -+ -+######################################## -+## -+## Execute updpwd programs in the updpwd domain. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The role to allow the updpwd domain. -+## -+## -+## -+## -+## The type of the terminal allow the updpwd domain to use. -+## -+## -+# -+interface(`auth_run_upd_passwd',` -+ gen_require(` -+ type updpwd_t; -+ ') -+ -+ auth_domtrans_upd_passwd($1) -+ role $2 types updpwd_t; -+ allow updpwd_t $3:chr_file rw_file_perms; -+ auth_dontaudit_read_shadow($1) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.6.5/policy/modules/system/authlogin.te ---- nsaserefpolicy/policy/modules/system/authlogin.te 2007-04-30 10:41:38.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/authlogin.te 2007-05-24 15:01:06.000000000 -0400 -@@ -9,6 +9,13 @@ - attribute can_read_shadow_passwords; - attribute can_write_shadow_passwords; - attribute can_relabelto_shadow_passwords; -+attribute keyring_type; -+ -+type updpwd_t; -+type updpwd_exec_t; -+domain_type(updpwd_t) -+domain_entry_file(updpwd_t,updpwd_exec_t) -+role system_r types updpwd_t; - - type chkpwd_exec_t; - corecmd_executable_file(chkpwd_exec_t) -@@ -244,7 +251,6 @@ - - optional_policy(` - xserver_read_xdm_pid(pam_console_t) -- xserver_use_xdm_fds(pam_t) - ') - - ######################################## -@@ -252,12 +258,16 @@ - # System check password local policy - # - -+logging_send_audit_msg(system_chkpwd_t) -+ - allow system_chkpwd_t shadow_t:file { getattr read }; - - corecmd_search_bin(system_chkpwd_t) - - domain_dontaudit_use_interactive_fds(system_chkpwd_t) - -+selinux_get_fs_mount(system_chkpwd_t) -+ - term_dontaudit_use_unallocated_ttys(system_chkpwd_t) - term_dontaudit_use_generic_ptys(system_chkpwd_t) - -@@ -305,3 +315,30 @@ - xserver_use_xdm_fds(utempter_t) - xserver_rw_xdm_pipes(utempter_t) - ') -+ -+######################################## -+# -+# updpwd local policy -+# -+ -+allow updpwd_t self:process setfscreate; -+allow updpwd_t self:fifo_file { read write }; -+allow updpwd_t self:unix_stream_socket create_stream_socket_perms; -+allow updpwd_t self:unix_dgram_socket create_socket_perms; -+ -+files_read_etc_files(updpwd_t) -+libs_use_ld_so(updpwd_t) -+libs_use_shared_libs(updpwd_t) -+miscfiles_read_localization(updpwd_t) -+ -+auth_manage_shadow(updpwd_t) -+term_dontaudit_use_console(updpwd_t) -+term_dontaudit_use_console(updpwd_t) -+term_dontaudit_use_unallocated_ttys(updpwd_t) -+files_manage_etc_files(updpwd_t) -+kernel_read_system_state(updpwd_t) -+logging_send_syslog_msg(updpwd_t) -+ -+optional_policy(` -+ nscd_socket_use(updpwd_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/clock.te serefpolicy-2.6.5/policy/modules/system/clock.te ---- nsaserefpolicy/policy/modules/system/clock.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/clock.te 2007-05-22 14:41:13.000000000 -0400 -@@ -26,8 +26,6 @@ - allow hwclock_t self:process signal_perms; - allow hwclock_t self:fifo_file { getattr read write }; - --send_audit_msgs_pattern(hwclock_t) -- - # Allow hwclock to store & retrieve correction factors. - allow hwclock_t adjtime_t:file { rw_file_perms setattr }; - -@@ -61,6 +59,7 @@ - libs_use_shared_libs(hwclock_t) - - logging_send_syslog_msg(hwclock_t) -+logging_send_audit_msg(hwclock_t) - - miscfiles_read_localization(hwclock_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.6.5/policy/modules/system/fstools.fc ---- nsaserefpolicy/policy/modules/system/fstools.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/fstools.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -19,7 +19,6 @@ - /sbin/mkfs.* -- gen_context(system_u:object_r:fsadm_exec_t,s0) - /sbin/mkraid -- gen_context(system_u:object_r:fsadm_exec_t,s0) - /sbin/mkreiserfs -- gen_context(system_u:object_r:fsadm_exec_t,s0) --/sbin/mkswap -- gen_context(system_u:object_r:fsadm_exec_t,s0) - /sbin/parted -- gen_context(system_u:object_r:fsadm_exec_t,s0) - /sbin/partprobe -- gen_context(system_u:object_r:fsadm_exec_t,s0) - /sbin/partx -- gen_context(system_u:object_r:fsadm_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.6.5/policy/modules/system/fstools.te ---- nsaserefpolicy/policy/modules/system/fstools.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/fstools.te 2007-05-22 14:41:13.000000000 -0400 -@@ -9,6 +9,7 @@ - type fsadm_t; - type fsadm_exec_t; - init_system_domain(fsadm_t,fsadm_exec_t) -+application_executable_file(fsadm_exec_t) - role system_r types fsadm_t; - - type fsadm_log_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.fc serefpolicy-2.6.5/policy/modules/system/fusermount.fc ---- nsaserefpolicy/policy/modules/system/fusermount.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/fusermount.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,6 @@ -+# fusermount executable will have: -+# label: system_u:object_r:fusermount_exec_t -+# MLS sensitivity: s0 -+# MCS categories: -+ -+/usr/bin/fusermount -- gen_context(system_u:object_r:fusermount_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.if serefpolicy-2.6.5/policy/modules/system/fusermount.if ---- nsaserefpolicy/policy/modules/system/fusermount.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/fusermount.if 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,41 @@ -+## policy for fusermount -+ -+######################################## -+## -+## Execute a domain transition to run fusermount. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`fusermount_domtrans',` -+ gen_require(` -+ type fusermount_t, fusermount_exec_t; -+ ') -+ -+ domain_auto_trans($1,fusermount_exec_t,fusermount_t) -+ -+ allow fusermount_t $1:fd use; -+ allow fusermount_t $1:fifo_file rw_file_perms; -+ allow fusermount_t $1:process sigchld; -+') -+ -+######################################## -+## -+## Inherit and use file descriptors from fusermount. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`fusermount_use_fds',` -+ gen_require(` -+ type fusermount_t; -+ ') -+ -+ allow $1 fusermount_t:fd use; -+') -\ No newline at end of file -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.te serefpolicy-2.6.5/policy/modules/system/fusermount.te ---- nsaserefpolicy/policy/modules/system/fusermount.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/fusermount.te 2007-05-22 14:41:13.000000000 -0400 -@@ -0,0 +1,51 @@ -+policy_module(fusermount,1.0.0) -+ -+######################################## -+# -+# Declarations -+# -+ -+type fusermount_t; -+type fusermount_exec_t; -+application_domain(fusermount_t, fusermount_exec_t) -+role system_r types fusermount_t; -+ -+######################################## -+# -+# fusermount local policy -+# -+allow fusermount_t self:capability sys_admin; -+allow fusermount_t self:fifo_file { read write }; -+allow fusermount_t self:unix_stream_socket create_stream_socket_perms; -+ -+files_read_etc_files(fusermount_t) -+ -+libs_use_ld_so(fusermount_t) -+libs_use_shared_libs(fusermount_t) -+ -+miscfiles_read_localization(fusermount_t) -+ -+files_manage_etc_runtime_files(fusermount_t) -+files_etc_filetrans_etc_runtime(fusermount_t,file) -+files_mounton_all_mountpoints(fusermount_t) -+ -+fs_mount_fusefs(fusermount_t) -+ -+storage_raw_read_fixed_disk(fusermount_t) -+storage_raw_write_fixed_disk(fusermount_t) -+ -+optional_policy(` -+ hal_write_log(fusermount_t) -+ hal_use_fds(fusermount_t) -+ hal_rw_pipes(fusermount_t) -+') -+ -+optional_policy(` -+ mount_ntfs_rw_stream_sockets(fusermount_t) -+') -+ -+ifdef(`targeted_policy',` -+ term_use_generic_ptys(fusermount_t) -+ term_use_console(fusermount_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.6.5/policy/modules/system/getty.te ---- nsaserefpolicy/policy/modules/system/getty.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/getty.te 2007-05-22 14:41:13.000000000 -0400 -@@ -33,7 +33,8 @@ - # - - # Use capabilities. --allow getty_t self:capability { dac_override chown setgid sys_resource sys_tty_config fowner fsetid }; -+# getty requires sys_admin #209426 -+allow getty_t self:capability { dac_override chown setgid sys_resource sys_tty_config fowner fsetid sys_admin }; - dontaudit getty_t self:capability sys_tty_config; - allow getty_t self:process { getpgid setpgid getsession signal_perms }; - allow getty_t self:fifo_file rw_fifo_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.6.5/policy/modules/system/hostname.te ---- nsaserefpolicy/policy/modules/system/hostname.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/hostname.te 2007-05-22 14:41:13.000000000 -0400 -@@ -8,8 +8,12 @@ - - type hostname_t; - type hostname_exec_t; --init_system_domain(hostname_t,hostname_exec_t) -+ -+#dont transition from initrc -+domain_type(hostname_t) -+domain_entry_file(hostname_t,hostname_exec_t) - role system_r types hostname_t; -+application_executable_file(hostname_exec_t) - - ######################################## - # -@@ -60,3 +64,11 @@ - xen_append_log(hostname_t) - xen_dontaudit_use_fds(hostname_t) - ') -+ -+optional_policy(` -+ xen_append_log(hostname_t) -+') -+ -+optional_policy(` -+ unconfined_dontaudit_rw_pipes(hostname_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.6.5/policy/modules/system/init.fc ---- nsaserefpolicy/policy/modules/system/init.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/init.fc 2007-05-25 09:03:41.000000000 -0400 -@@ -14,9 +14,7 @@ - /etc/x11/startDM.sh -- gen_context(system_u:object_r:initrc_exec_t,s0) - ') - --ifdef(`strict_policy',` - /etc/X11/prefdm -- gen_context(system_u:object_r:initrc_exec_t,s0) --') - - # - # /dev -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.6.5/policy/modules/system/init.if ---- nsaserefpolicy/policy/modules/system/init.if 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/init.if 2007-05-22 14:41:13.000000000 -0400 -@@ -194,11 +194,14 @@ - gen_require(` - type initrc_t; - role system_r; -+ attribute daemon; - ') - - domain_type($1) - domain_entry_file($1,$2) - -+ typeattribute $1 daemon; -+ - role system_r types $1; - - domtrans_pattern(initrc_t,$2,$1) -@@ -300,6 +303,9 @@ - interface(`init_getpgid',` - gen_require(` - type init_t; -+ -+ # cjp: remove this when init_t decl is moved back to this module -+ attribute direct_run_init; - ') - - allow $1 init_t:process getpgid; -@@ -318,6 +324,9 @@ - interface(`init_signull',` - gen_require(` - type init_t; -+ -+ # cjp: remove this when init_t decl is moved back to this module -+ attribute direct_run_init; - ') - - allow $1 init_t:process signull; -@@ -336,6 +345,9 @@ - interface(`init_sigchld',` - gen_require(` - type init_t; -+ -+ # cjp: remove this when init_t decl is moved back to this module -+ attribute direct_run_init; - ') - - allow $1 init_t:process sigchld; -@@ -354,6 +366,9 @@ - interface(`init_use_fds',` - gen_require(` - type init_t; -+ -+ # cjp: remove this when init_t decl is moved back to this module -+ attribute direct_run_init; - ') - - allow $1 init_t:fd use; -@@ -373,6 +388,9 @@ - interface(`init_dontaudit_use_fds',` - gen_require(` - type init_t; -+ -+ # cjp: remove this when init_t decl is moved back to this module -+ attribute direct_run_init; - ') - - dontaudit $1 init_t:fd use; -@@ -1073,7 +1091,7 @@ - ') - - files_search_tmp($1) -- rw_files_pattern($1,initrc_tmp_t,initrc_tmp_t) -+ allow $1 initrc_tmp_t:file rw_file_perms; - ') - - ######################################## -@@ -1254,3 +1272,42 @@ - files_search_pids($1) - allow $1 initrc_var_run_t:file manage_file_perms; - ') -+ -+######################################## -+## -+## Read the process state (/proc/pid) of init. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`init_read_init_state',` -+ gen_require(` -+ attribute init_t; -+ ') -+ -+ allow $1 init_t:dir search_dir_perms; -+ allow $1 init_t:file r_file_perms; -+ allow $1 init_t:lnk_file r_file_perms; -+') -+ -+######################################## -+## -+## Ptrace init -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+# -+interface(`init_ptrace_init_domain',` -+ gen_require(` -+ attribute init_t; -+ ') -+ -+ allow $1 init_t:process ptrace; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.6.5/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2007-04-30 10:41:38.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/init.te 2007-05-22 14:41:13.000000000 -0400 -@@ -10,13 +10,20 @@ - # Declarations - # - --ifdef(`targeted_policy',` - ## - ##

- ## Allow all daemons the ability to use unallocated ttys - ##

- ## - gen_tunable(allow_daemons_use_tty,false) -+ -+ifdef(`targeted_policy',` -+## -+##

-+## Allow all daemons to write corefiles to / -+##

-+## -+gen_tunable(allow_daemons_dump_core,false) - ') - - # used for direct running of init scripts -@@ -82,7 +89,7 @@ - # - - # Use capabilities. old rule: --allow init_t self:capability ~sys_module; -+allow init_t self:capability ~{ audit_control audit_write sys_module }; - # is ~sys_module really needed? observed: - # sys_boot - # sys_tty_config -@@ -198,7 +205,7 @@ - # - - allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched }; --allow initrc_t self:capability ~{ sys_admin sys_module }; -+allow initrc_t self:capability ~{ audit_control audit_write sys_admin sys_module }; - dontaudit initrc_t self:capability sys_module; # sysctl is triggering this - allow initrc_t self:passwd rootok; - -@@ -213,8 +220,7 @@ - allow initrc_t initrc_devpts_t:chr_file rw_term_perms; - term_create_pty(initrc_t,initrc_devpts_t) - --# Going to single user mode --init_exec(initrc_t) -+init_telinit(initrc_t) - - can_exec(initrc_t,initrc_exec_t) - -@@ -508,6 +514,12 @@ - ') - ') - -+optional_policy(` -+ rhgb_use_ptys(daemon) -+') -+ -+domain_dontaudit_use_interactive_fds(daemon) -+ - ifdef(`targeted_policy',` - domain_subj_id_change_exemption(initrc_t) - unconfined_domain(initrc_t) -@@ -520,11 +532,21 @@ - tunable_policy(`allow_daemons_use_tty',` - term_use_unallocated_ttys(daemon) - term_use_generic_ptys(daemon) -- ') -- -+ unconfined_rw_pipes(daemon) -+ ', ` -+ # system-config-services causes avc messages that should be dontaudited -+ unconfined_dontaudit_rw_pipes(daemon) -+ -+ ') -+ - optional_policy(` - mono_domtrans(initrc_t) - ') -+ -+ tunable_policy(`allow_daemons_dump_core',` -+ files_dump_core(daemon) -+ ') -+ - ',` - # cjp: require doesnt work in the else of optionals :\ - # this also would result in a type transition -@@ -735,6 +757,9 @@ - - # why is this needed: - rpm_manage_db(initrc_t) -+ # Allow SELinux aware applications to request rpm_script_t execution -+ rpm_transition_script(initrc_t) -+ - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.6.5/policy/modules/system/ipsec.if ---- nsaserefpolicy/policy/modules/system/ipsec.if 2007-03-26 16:24:13.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/ipsec.if 2007-05-22 14:41:13.000000000 -0400 -@@ -114,6 +114,26 @@ - - ######################################## - ## -+## Allow an IPsec SA to be used by an IPsec Policy. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`ipsec_labeled',` -+ gen_require(` -+ type ipsec_spd_t; -+ ') -+ -+ allow $1 ipsec_spd_t:association polmatch; -+ domain_ipsec_labels($1) -+') -+ -+ -+######################################## -+## - ## Execute racoon in the racoon domain. - ## - ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-2.6.5/policy/modules/system/ipsec.te ---- nsaserefpolicy/policy/modules/system/ipsec.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/ipsec.te 2007-05-22 14:41:13.000000000 -0400 -@@ -289,6 +289,7 @@ - allow racoon_t self:netlink_selinux_socket { bind create read }; - allow racoon_t self:udp_socket create_socket_perms; - allow racoon_t self:key_socket { create read setopt write }; -+logging_send_audit_msg(racoon_t) - - # manage pid file - manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.6.5/policy/modules/system/iptables.te ---- nsaserefpolicy/policy/modules/system/iptables.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/iptables.te 2007-05-22 14:41:13.000000000 -0400 -@@ -56,6 +56,7 @@ - domain_use_interactive_fds(iptables_t) - - files_read_etc_files(iptables_t) -+files_read_etc_runtime_files(iptables_t) - - init_use_fds(iptables_t) - init_use_script_ptys(iptables_t) -@@ -112,3 +113,7 @@ - optional_policy(` - udev_read_db(iptables_t) - ') -+ -+optional_policy(` -+ fail2ban_append_log(iptables_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.6.5/policy/modules/system/libraries.fc ---- nsaserefpolicy/policy/modules/system/libraries.fc 2007-05-04 12:19:22.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/libraries.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -81,8 +81,8 @@ - /opt/cisco-vpnclient/lib/libvpnapi\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /opt/netbeans(.*/)?jdk.*/linux/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /opt/cxoffice/lib/wine/.+\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/opt/f-secure/fspms/libexec/librapi.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /opt/ibm/java2-ppc64-50/jre/bin/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/opt/f-secure/fspms/libexec/librapi.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - ifdef(`distro_gentoo',` - # despite the extensions, they are actually libs -@@ -132,13 +132,16 @@ - - /usr/(.*/)?nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) - --/usr/lib/transgaming_cedega/gddb_parser.so -- gen_context(system_u:object_r:shlib_t,s0) - /usr/lib/win32/.* -- gen_context(system_u:object_r:shlib_t,s0) -+/usr/lib/transgaming_cedega/gddb_parser.so -- gen_context(system_u:object_r:shlib_t,s0) -+/usr/lib/vlc/codec/libdmo_plugin.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib/vlc/codec/librealaudio_plugin.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/libsipphoneapi\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/ati-fglrx/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/xorg/libGL\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/fglrx/libGL\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.6.5/policy/modules/system/libraries.te ---- nsaserefpolicy/policy/modules/system/libraries.te 2007-05-04 12:19:23.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/libraries.te 2007-05-22 14:41:13.000000000 -0400 -@@ -62,7 +62,8 @@ - - manage_dirs_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t) - manage_files_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t) --files_tmp_filetrans(ldconfig_t, ldconfig_tmp_t, { file dir }) -+manage_lnk_files_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t) -+files_tmp_filetrans(ldconfig_t, ldconfig_tmp_t, { file dir lnk_file }) - - manage_lnk_files_pattern(ldconfig_t,lib_t,lib_t) - -@@ -101,6 +102,7 @@ - files_read_generic_tmp_symlinks(ldconfig_t) - term_dontaudit_use_generic_ptys(ldconfig_t) - term_dontaudit_use_unallocated_ttys(ldconfig_t) -+ files_read_generic_tmp_files(ldconfig_t) - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.6.5/policy/modules/system/locallogin.te ---- nsaserefpolicy/policy/modules/system/locallogin.te 2007-03-26 10:39:07.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/locallogin.te 2007-05-22 14:41:13.000000000 -0400 -@@ -48,6 +48,8 @@ - allow local_login_t self:msgq create_msgq_perms; - allow local_login_t self:msg { send receive }; - allow local_login_t self:key { search write link }; -+allow local_login_t self:appletalk_socket create_socket_perms; -+allow local_login_t self:socket create_socket_perms; - - allow local_login_t local_login_lock_t:file manage_file_perms; - files_lock_filetrans(local_login_t,local_login_lock_t,file) -@@ -56,6 +58,7 @@ - allow local_login_t local_login_tmp_t:file manage_file_perms; - files_tmp_filetrans(local_login_t, local_login_tmp_t, { file dir }) - -+kernel_read_network_state(local_login_t) - kernel_read_system_state(local_login_t) - kernel_read_kernel_sysctls(local_login_t) - kernel_search_key(local_login_t) -@@ -98,6 +101,11 @@ - term_setattr_all_user_ttys(local_login_t) - term_setattr_unallocated_ttys(local_login_t) - -+tunable_policy(`allow_console_login', ` -+ term_relabel_console(local_login_t) -+ term_setattr_console(local_login_t) -+') -+ - auth_rw_login_records(local_login_t) - auth_rw_faillog(local_login_t) - auth_manage_pam_console_data(local_login_t) -@@ -162,6 +170,10 @@ - ') - - optional_policy(` -+ consolekit_dbus_chat(local_login_t) -+') -+ -+optional_policy(` - gpm_getattr_gpmctl(local_login_t) - gpm_setattr_gpmctl(local_login_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.6.5/policy/modules/system/logging.if ---- nsaserefpolicy/policy/modules/system/logging.if 2007-03-26 10:39:07.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/logging.if 2007-05-24 15:05:14.000000000 -0400 -@@ -223,6 +223,25 @@ - - ######################################## - ## -+## Execute klogd in the klog domain. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`logging_domtrans_klog',` -+ gen_require(` -+ type klogd_t, klogd_exec_t; -+ ') -+ -+ corecmd_search_bin($1) -+ domtrans_pattern($1,klogd_exec_t,klogd_t) -+') -+ -+######################################## -+## - ## Create an object in the log directory, with a private - ## type using a type transition. - ## -@@ -302,6 +321,25 @@ - - ######################################## - ## -+## dontaudit search of auditd configuration files. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+# -+interface(`logging_dontaudit_search_audit_config',` -+ gen_require(` -+ type auditd_etc_t; -+ ') -+ -+ dontaudit $1 auditd_etc_t:dir search_dir_perms; -+') -+ -+######################################## -+## - ## Allows the domain to open a file in the - ## log directory, but does not allow the listing - ## of the contents of the log directory. -@@ -436,7 +474,7 @@ - - files_search_var($1) - allow $1 var_log_t:dir list_dir_perms; -- read_files_pattern($1,var_log_t,logfile) -+ read_files_pattern($1,logfile, logfile) - ') - - ######################################## -@@ -480,6 +518,8 @@ - files_search_var($1) - manage_files_pattern($1,logfile,logfile) - read_lnk_files_pattern($1,logfile,logfile) -+ allow $1 logfile:dir { relabelfrom relabelto }; -+ allow $1 logfile:file { relabelfrom relabelto }; - ') - - ######################################## -@@ -563,3 +603,121 @@ - files_search_var($1) - manage_files_pattern($1,var_log_t,var_log_t) - ') -+ -+######################################## -+## -+## Send audit messages -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`logging_send_audit_msg',` -+ gen_require(` -+ attribute can_send_audit_msg; -+ ') -+ -+ typeattribute $1 can_send_audit_msg; -+ allow $1 self:capability audit_write; -+ allow $1 self:netlink_audit_socket { create_socket_perms nlmsg_read nlmsg_relay }; -+') -+ -+######################################## -+## -+## Set login uid -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`logging_set_loginuid',` -+ gen_require(` -+ attribute can_set_loginuid; -+ attribute can_send_audit_msg; -+ ') -+ -+ typeattribute $1 can_set_loginuid, can_send_audit_msg; -+ -+ allow $1 self:capability audit_control; -+ allow $1 self:netlink_audit_socket { create_socket_perms nlmsg_read nlmsg_relay }; -+') -+ -+######################################## -+## -+## Set up audit -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`logging_set_audit',` -+ gen_require(` -+ attribute can_set_audit; -+ attribute can_send_audit_msg; -+ ') -+ -+ typeattribute $1 can_set_audit, can_send_audit_msg; -+ allow $1 self:capability { audit_write audit_control }; -+ allow $1 self:netlink_audit_socket { create_socket_perms nlmsg_read nlmsg_write nlmsg_relay }; -+') -+ -+######################################## -+## -+## Set audit control rules -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`logging_set_auditctl',` -+ gen_require(` -+ attribute can_set_auditctl; -+ ') -+ -+ typeattribute $1 can_set_auditctl; -+ logging_set_audit($1) -+ allow $1 self:netlink_audit_socket nlmsg_readpriv; -+') -+ -+######################################## -+## -+## Unconfined access to the loggin module. -+## -+## -+##

-+## Unconfined access to the authlogin module. -+##

-+##

-+## Currently, this only allows assertions for -+## the audit susbsystem to be passed. -+## No access is granted yet. -+##

-+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`logging_unconfined',` -+ gen_require(` -+ attribute can_set_audit; -+ attribute can_set_auditctl; -+ attribute can_send_audit_msg; -+ attribute can_set_loginuid; -+ ') -+ -+ typeattribute $1 can_set_loginuid; -+ typeattribute $1 can_set_audit; -+ typeattribute $1 can_set_auditctl; -+ typeattribute $1 can_send_audit_msg; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.6.5/policy/modules/system/logging.te ---- nsaserefpolicy/policy/modules/system/logging.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/logging.te 2007-05-22 14:41:13.000000000 -0400 -@@ -7,10 +7,15 @@ - # - - attribute logfile; -+attribute can_set_audit; -+attribute can_set_auditctl; -+attribute can_set_loginuid; -+attribute can_send_audit_msg; - - type auditctl_t; - type auditctl_exec_t; - init_system_domain(auditctl_t,auditctl_exec_t) -+application_type(auditctl_t) - role system_r types auditctl_t; - - type auditd_etc_t; -@@ -59,14 +64,17 @@ - init_ranged_daemon_domain(auditd_t,auditd_exec_t,mls_systemhigh) - ') - -+neverallow ~{ can_set_loginuid can_set_audit } self:capability audit_control; -+neverallow ~can_set_audit self:netlink_audit_socket nlmsg_write; -+neverallow ~can_set_auditctl self:netlink_audit_socket nlmsg_readpriv; -+neverallow ~can_send_audit_msg self:capability audit_write; -+neverallow ~can_send_audit_msg self:netlink_audit_socket nlmsg_relay; -+ - ######################################## - # - # Auditd local policy - # - --allow auditctl_t self:capability { audit_write audit_control }; --allow auditctl_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv }; -- - read_files_pattern(auditctl_t,auditd_etc_t,auditd_etc_t) - allow auditctl_t auditd_etc_t:dir list_dir_perms; - -@@ -91,6 +99,7 @@ - - locallogin_dontaudit_use_fds(auditctl_t) - -+logging_set_auditctl(auditctl_t) - logging_send_syslog_msg(auditctl_t) - - ifdef(`targeted_policy',` -@@ -103,12 +112,11 @@ - # Auditd local policy - # - --allow auditd_t self:capability { audit_write audit_control fsetid sys_nice sys_resource }; -+allow auditd_t self:capability { fsetid sys_nice sys_resource }; - dontaudit auditd_t self:capability sys_tty_config; - allow auditd_t self:process { signal_perms setpgid setsched }; - allow auditd_t self:file { getattr read write }; - allow auditd_t self:unix_dgram_socket create_socket_perms; --allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv }; - allow auditd_t self:fifo_file rw_file_perms; - - allow auditd_t auditd_etc_t:dir list_dir_perms; -@@ -146,6 +154,7 @@ - - init_telinit(auditd_t) - -+logging_set_audit(auditd_t) - logging_send_syslog_msg(auditd_t) - - libs_use_ld_so(auditd_t) -@@ -267,6 +276,9 @@ - - # create/append log files. - manage_files_pattern(syslogd_t,var_log_t,var_log_t) -+# r/w log fifo_files files. -+rw_fifo_files_pattern(syslogd_t,var_log_t,var_log_t) -+ - # Allow access for syslog-ng - allow syslogd_t var_log_t:dir { create setattr }; - -@@ -331,6 +343,7 @@ - domain_use_interactive_fds(syslogd_t) - - files_read_etc_files(syslogd_t) -+files_read_var_files(syslogd_t) - files_read_etc_runtime_files(syslogd_t) - # /initrd is not umounted before minilog starts - files_dontaudit_search_isid_type_dirs(syslogd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.6.5/policy/modules/system/lvm.fc ---- nsaserefpolicy/policy/modules/system/lvm.fc 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/lvm.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -15,6 +15,7 @@ - # - /etc/lvm(/.*)? gen_context(system_u:object_r:lvm_etc_t,s0) - /etc/lvm/\.cache -- gen_context(system_u:object_r:lvm_metadata_t,s0) -+/etc/lvm/cache(./*)? gen_context(system_u:object_r:lvm_metadata_t,s0) - /etc/lvm/archive(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) - /etc/lvm/backup(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) - /etc/lvm/lock(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.6.5/policy/modules/system/lvm.te ---- nsaserefpolicy/policy/modules/system/lvm.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/lvm.te 2007-05-23 13:27:59.000000000 -0400 -@@ -16,6 +16,7 @@ - type lvm_t; - type lvm_exec_t; - init_system_domain(lvm_t,lvm_exec_t) -+application_type(lvm_t) - # needs privowner because it assigns the identity system_u to device nodes - # but runs as the identity of the sysadmin - domain_obj_id_change_exemption(lvm_t) -@@ -155,7 +156,9 @@ - - # DAC overrides and mknod for modifying /dev entries (vgmknodes) - # rawio needed for dmraid --allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio }; -+allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio net_admin }; -+# lvm needs net_admin for multipath -+ - dontaudit lvm_t self:capability sys_tty_config; - allow lvm_t self:process { sigchld sigkill sigstop signull signal }; - # LVM will complain a lot if it cannot set its priority. -@@ -233,6 +236,8 @@ - dev_dontaudit_getattr_generic_blk_files(lvm_t) - dev_dontaudit_getattr_generic_pipes(lvm_t) - dev_create_generic_dirs(lvm_t) -+dev_delete_generic_dirs(lvm_t) -+dev_rw_generic_files(lvm_t) - - fs_getattr_xattr_fs(lvm_t) - fs_search_auto_mountpoints(lvm_t) -@@ -251,6 +256,7 @@ - storage_dev_filetrans_fixed_disk(lvm_t) - # Access raw devices and old /dev/lvm (c 109,0). Is this needed? - storage_manage_fixed_disk(lvm_t) -+mls_file_read_up(lvm_t) - - term_getattr_all_user_ttys(lvm_t) - term_list_ptys(lvm_t) -@@ -305,5 +311,15 @@ - ') - - optional_policy(` -+ modutils_domtrans_insmod(lvm_t) -+') -+ -+optional_policy(` - udev_read_db(lvm_t) - ') -+ -+optional_policy(` -+ xen_append_log(lvm_t) -+ xen_dontaudit_rw_unix_stream_sockets(lvm_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.6.5/policy/modules/system/modutils.te ---- nsaserefpolicy/policy/modules/system/modutils.te 2007-05-02 15:04:46.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/modutils.te 2007-05-22 14:41:13.000000000 -0400 -@@ -102,6 +102,7 @@ - init_use_fds(insmod_t) - init_use_script_fds(insmod_t) - init_use_script_ptys(insmod_t) -+init_spec_domtrans_script(insmod_t) - - libs_use_ld_so(insmod_t) - libs_use_shared_libs(insmod_t) -@@ -123,6 +124,14 @@ - ') - - optional_policy(` -+ alsa_domtrans(insmod_t) -+') -+ -+optional_policy(` -+ hal_write_log(insmod_t) -+') -+ -+optional_policy(` - hotplug_search_config(insmod_t) - ') - -@@ -155,6 +164,7 @@ - - optional_policy(` - rpm_rw_pipes(insmod_t) -+ rpm_read_script_tmp_files(insmod_t) - ') - - optional_policy(` -@@ -185,6 +195,7 @@ - - files_read_kernel_symbol_table(depmod_t) - files_read_kernel_modules(depmod_t) -+files_delete_kernel_modules(depmod_t) - - fs_getattr_xattr_fs(depmod_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-2.6.5/policy/modules/system/mount.fc ---- nsaserefpolicy/policy/modules/system/mount.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/mount.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -1,4 +1,3 @@ - /bin/mount.* -- gen_context(system_u:object_r:mount_exec_t,s0) - /bin/umount.* -- gen_context(system_u:object_r:mount_exec_t,s0) -- --/usr/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0) -+/sbin/mount.ntfs-3g -- gen_context(system_u:object_r:mount_ntfs_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-2.6.5/policy/modules/system/mount.if ---- nsaserefpolicy/policy/modules/system/mount.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/mount.if 2007-05-22 14:41:13.000000000 -0400 -@@ -143,3 +143,40 @@ - mount_domtrans($1) - ') - ') -+ -+######################################## -+## -+## Execute a domain transition to run mount_ntfs. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`mount_ntfs_domtrans',` -+ gen_require(` -+ type mount_ntfs_t, mount_ntfs_exec_t; -+ ') -+ -+ domtrans_pattern($1,mount_ntfs_exec_t,mount_ntfs_t) -+') -+ -+######################################## -+## -+## Allow the specified domain to read/write to -+## init scripts with a unix domain stream sockets. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`mount_ntfs_rw_stream_sockets',` -+ gen_require(` -+ type mount_ntfs_t; -+ ') -+ -+ allow $1 mount_ntfs_t:unix_stream_socket { read write }; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.6.5/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/mount.te 2007-05-22 14:41:13.000000000 -0400 -@@ -9,6 +9,13 @@ - ifdef(`targeted_policy',` - ## - ##

-+## Allow mount to mount any dir -+##

-+## -+gen_tunable(allow_mounton_anydir,true) -+ -+## -+##

- ## Allow mount to mount any file - ##

- ## -@@ -18,8 +25,13 @@ - type mount_t; - type mount_exec_t; - init_system_domain(mount_t,mount_exec_t) -+application_executable_file(mount_exec_t) - role system_r types mount_t; - -+type mount_ntfs_t; -+type mount_ntfs_exec_t; -+init_system_domain(mount_ntfs_t, mount_ntfs_exec_t) -+ - type mount_loopback_t; # customizable - files_type(mount_loopback_t) - -@@ -38,7 +50,7 @@ - # - - # setuid/setgid needed to mount cifs --allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid }; -+allow mount_t self:capability { fsetid ipc_lock sys_rawio sys_resource sys_admin dac_override chown sys_tty_config setuid setgid }; - - allow mount_t mount_loopback_t:file read_file_perms; - allow mount_t self:netlink_route_socket r_netlink_socket_perms; -@@ -130,10 +142,15 @@ - ') - - ifdef(`targeted_policy',` -+ tunable_policy(`allow_mounton_anydir',` -+ auth_read_all_dirs_except_shadow(mount_t) -+ files_mounton_non_security_dir(mount_t) -+ ') -+ - tunable_policy(`allow_mount_anyfile',` - auth_read_all_dirs_except_shadow(mount_t) - auth_read_all_files_except_shadow(mount_t) -- files_mounton_non_security(mount_t) -+ files_mounton_non_security_files(mount_t) - ') - ') - -@@ -205,3 +222,53 @@ - files_etc_filetrans_etc_runtime(unconfined_mount_t,file) - unconfined_domain(unconfined_mount_t) - ') -+ -+######################################## -+# -+# mount_ntfs local policy -+# -+allow mount_ntfs_t self:capability { setuid sys_admin }; -+allow mount_ntfs_t self:fifo_file { read write }; -+allow mount_ntfs_t self:unix_stream_socket create_stream_socket_perms; -+allow mount_ntfs_t self:unix_dgram_socket { connect create }; -+ -+corecmd_read_bin_symlinks(mount_ntfs_t) -+corecmd_exec_shell(mount_ntfs_t) -+ -+files_read_etc_files(mount_ntfs_t) -+ -+libs_use_ld_so(mount_ntfs_t) -+libs_use_shared_libs(mount_ntfs_t) -+ -+fusermount_domtrans(mount_ntfs_t) -+fusermount_use_fds(mount_ntfs_t) -+ -+init_dontaudit_use_fds(mount_ntfs_t) -+ -+kernel_read_system_state(mount_ntfs_t) -+ -+logging_send_syslog_msg(mount_ntfs_t) -+ -+miscfiles_read_localization(mount_ntfs_t) -+ -+modutils_domtrans_insmod(mount_ntfs_t) -+ -+mount_ntfs_domtrans(mount_t) -+ -+storage_raw_read_fixed_disk(mount_ntfs_t) -+storage_raw_write_fixed_disk(mount_ntfs_t) -+ -+optional_policy(` -+ nscd_socket_use(mount_ntfs_t) -+') -+ -+optional_policy(` -+ hal_write_log(mount_ntfs_t) -+ hal_use_fds(mount_ntfs_t) -+ hal_rw_pipes(mount_ntfs_t) -+') -+ -+ifdef(`targeted_policy',` -+ term_use_generic_ptys(mount_ntfs_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/netlabel.te serefpolicy-2.6.5/policy/modules/system/netlabel.te ---- nsaserefpolicy/policy/modules/system/netlabel.te 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/netlabel.te 2007-05-22 14:41:13.000000000 -0400 -@@ -20,6 +20,10 @@ - allow netlabel_mgmt_t self:capability net_admin; - allow netlabel_mgmt_t self:netlink_socket create_socket_perms; - -+init_use_script_ptys(netlabel_mgmt_t) -+ -+files_read_etc_files(netlabel_mgmt_t) -+ - kernel_read_network_state(netlabel_mgmt_t) - - libs_use_ld_so(netlabel_mgmt_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.6.5/policy/modules/system/raid.te ---- nsaserefpolicy/policy/modules/system/raid.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/raid.te 2007-05-22 14:41:13.000000000 -0400 -@@ -19,7 +19,7 @@ - # Local policy - # - --allow mdadm_t self:capability { dac_override sys_admin ipc_lock }; -+allow mdadm_t self:capability { dac_override mknod sys_admin ipc_lock }; - dontaudit mdadm_t self:capability sys_tty_config; - allow mdadm_t self:process { sigchld sigkill sigstop signull signal }; - allow mdadm_t self:fifo_file rw_fifo_file_perms; -@@ -46,6 +46,7 @@ - # RAID block device access - storage_manage_fixed_disk(mdadm_t) - storage_dev_filetrans_fixed_disk(mdadm_t) -+storage_read_scsi_generic(mdadm_t) - - term_dontaudit_list_ptys(mdadm_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.6.5/policy/modules/system/selinuxutil.fc ---- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/selinuxutil.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -40,6 +40,7 @@ - /usr/sbin/setfiles.* -- gen_context(system_u:object_r:setfiles_exec_t,s0) - /usr/sbin/setsebool -- gen_context(system_u:object_r:semanage_exec_t,s0) - /usr/sbin/semanage -- gen_context(system_u:object_r:semanage_exec_t,s0) -+/usr/sbin/genhomedircon -- gen_context(system_u:object_r:semanage_exec_t,s0) - /usr/sbin/semodule -- gen_context(system_u:object_r:semanage_exec_t,s0) - - # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.6.5/policy/modules/system/selinuxutil.if ---- nsaserefpolicy/policy/modules/system/selinuxutil.if 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/selinuxutil.if 2007-05-22 14:41:13.000000000 -0400 -@@ -432,6 +432,7 @@ - role $2 types run_init_t; - allow run_init_t $3:chr_file rw_term_perms; - allow $2 system_r; -+ auth_run_upd_passwd($1,$2,$3) - ') - - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.5/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/selinuxutil.te 2007-05-24 15:37:32.000000000 -0400 -@@ -1,10 +1,8 @@ - - policy_module(selinuxutil,1.5.1) - --ifdef(`strict_policy',` -- gen_require(` -- bool secure_mode; -- ') -+gen_require(` -+ bool secure_mode; - ') - - ######################################## -@@ -26,11 +24,9 @@ - files_type(selinux_config_t) - - type checkpolicy_t, can_write_binary_policy; --domain_type(checkpolicy_t) --role system_r types checkpolicy_t; -- - type checkpolicy_exec_t; --domain_entry_file(checkpolicy_t,checkpolicy_exec_t) -+application_domain(checkpolicy_t, checkpolicy_exec_t) -+role system_r types checkpolicy_t; - - # - # default_context_t is the type applied to -@@ -83,25 +79,27 @@ - type restorecond_exec_t; - init_daemon_domain(restorecond_t,restorecond_exec_t) - domain_obj_id_change_exemption(restorecond_t) --role system_r types restorecond_t; - - type restorecond_var_run_t; - files_pid_file(restorecond_var_run_t) - - type run_init_t; - type run_init_exec_t; --domain_type(run_init_t) --domain_entry_file(run_init_t,run_init_exec_t) -+application_domain(run_init_t, run_init_exec_t) - domain_system_change_exemption(run_init_t) -+role system_r types run_init_t; - - type semanage_t; --domain_type(semanage_t) --domain_interactive_fd(semanage_t) -- - type semanage_exec_t; --domain_entry_file(semanage_t, semanage_exec_t) -+application_domain(semanage_t, semanage_exec_t) -+domain_interactive_fd(semanage_t) - role system_r types semanage_t; - -+ifdef(`targeted_policy',` -+init_use_fds(semanage_t) -+init_system_domain(semanage_t, semanage_exec_t) -+') -+ - type semanage_store_t; - files_type(semanage_store_t) - -@@ -115,9 +113,12 @@ - files_type(semanage_trans_lock_t) - - type setfiles_t alias restorecon_t, can_relabelto_binary_policy; --type setfiles_exec_t alias restorecon_exec_t; --init_system_domain(setfiles_t,setfiles_exec_t) - domain_obj_id_change_exemption(setfiles_t) -+domain_type(setfiles_t) -+role system_r types setfiles_t; -+ -+type setfiles_exec_t alias restorecon_exec_t; -+domain_entry_file(setfiles_t,setfiles_exec_t) - - ifdef(`distro_redhat',` - init_system_domain(setfiles_t,setfiles_exec_t) -@@ -186,6 +187,7 @@ - fs_getattr_xattr_fs(load_policy_t) - - mls_file_read_up(load_policy_t) -+mls_file_write_down(load_policy_t) - - selinux_get_fs_mount(load_policy_t) - selinux_load_policy(load_policy_t) -@@ -208,7 +210,7 @@ - # cjp: cover up stray file descriptors. - dontaudit load_policy_t selinux_config_t:file write; - optional_policy(` -- unconfined_dontaudit_read_pipes(load_policy_t) -+ unconfined_dontaudit_rw_pipes(load_policy_t) - ') - ') - -@@ -234,7 +236,7 @@ - allow newrole_t self:msg { send receive }; - allow newrole_t self:unix_dgram_socket sendto; - allow newrole_t self:unix_stream_socket { create_stream_socket_perms connectto }; --allow newrole_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; -+logging_send_audit_msg(newrole_t) - - read_files_pattern(newrole_t,selinux_config_t,selinux_config_t) - read_lnk_files_pattern(newrole_t,selinux_config_t,selinux_config_t) -@@ -272,6 +274,7 @@ - term_dontaudit_use_unallocated_ttys(newrole_t) - - auth_domtrans_chk_passwd(newrole_t) -+auth_domtrans_upd_passwd(newrole_t) - auth_rw_faillog(newrole_t) - - corecmd_list_bin(newrole_t) -@@ -301,15 +304,13 @@ - userdom_dontaudit_search_all_users_home_content(newrole_t) - userdom_search_all_users_home_dirs(newrole_t) - --ifdef(`strict_policy',` -- # if secure mode is enabled, then newrole -- # can only transition to unprivileged users -- if(secure_mode) { -- userdom_spec_domtrans_unpriv_users(newrole_t) -- } else { -- userdom_spec_domtrans_all_users(newrole_t) -- } --') -+# if secure mode is enabled, then newrole -+# can only transition to unprivileged users -+if(secure_mode) { -+ userdom_spec_domtrans_unpriv_users(newrole_t) -+} else { -+ userdom_spec_domtrans_all_users(newrole_t) -+} - - tunable_policy(`allow_polyinstantiation',` - files_polyinstantiate_all(newrole_t) -@@ -387,7 +388,7 @@ - allow run_init_t self:process setexec; - allow run_init_t self:capability setuid; - allow run_init_t self:fifo_file rw_file_perms; --allow run_init_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; -+logging_send_audit_msg(run_init_t) - - # often the administrator runs such programs from a directory that is owned - # by a different user or has restrictive SE permissions, do not want to audit -@@ -401,6 +402,7 @@ - term_dontaudit_list_ptys(run_init_t) - - auth_domtrans_chk_passwd(run_init_t) -+auth_domtrans_upd_passwd(run_init_t) - auth_dontaudit_read_shadow(run_init_t) - - corecmd_exec_bin(run_init_t) -@@ -457,7 +459,7 @@ - allow semanage_t self:capability { dac_override audit_write }; - allow semanage_t self:unix_stream_socket create_stream_socket_perms; - allow semanage_t self:unix_dgram_socket create_socket_perms; --allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; -+logging_send_audit_msg(semanage_t) - - allow semanage_t policy_config_t:file { read write }; - -@@ -468,7 +470,10 @@ - kernel_read_system_state(semanage_t) - kernel_read_kernel_sysctls(semanage_t) - -+can_exec(semanage_t, semanage_exec_t) -+ - corecmd_exec_bin(semanage_t) -+corecmd_exec_shell(semanage_t) - - dev_read_urand(semanage_t) - -@@ -483,6 +488,7 @@ - mls_rangetrans_target(semanage_t) - mls_file_read_up(semanage_t) - -+selinux_get_fs_mount(semanage_t) - selinux_validate_context(semanage_t) - selinux_get_enforce_mode(semanage_t) - # for setsebool: -@@ -492,6 +498,8 @@ - - # Running genhomedircon requires this for finding all users - auth_use_nsswitch(semanage_t) -+# Admins are creating pp files in random locations -+auth_read_all_files_except_shadow(semanage_t) - - libs_use_ld_so(semanage_t) - libs_use_shared_libs(semanage_t) -@@ -518,6 +526,15 @@ - - userdom_search_sysadm_home_dirs(semanage_t) - -+optional_policy(` -+ #signal mcstrans on reload -+ init_spec_domtrans_script(semanage_t) -+') -+ -+optional_policy(` -+ rpm_dontaudit_rw_tmp_files(semanage_t) -+') -+ - # cjp: need a more general way to handle this: - ifdef(`enable_mls',` - # read secadm tmp files -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.6.5/policy/modules/system/sysnetwork.te ---- nsaserefpolicy/policy/modules/system/sysnetwork.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/sysnetwork.te 2007-05-22 14:41:13.000000000 -0400 -@@ -164,6 +164,10 @@ - dbus_connect_system_bus(dhcpc_t) - dbus_send_system_bus(dhcpc_t) - -+ dbus_read_config(dhcpc_t) -+ -+ dbus_dontaudit_rw_system_selinux_socket(dhcpc_t) -+ - optional_policy(` - networkmanager_dbus_chat(dhcpc_t) - ') -@@ -221,6 +225,7 @@ - optional_policy(` - seutil_sigchld_newrole(dhcpc_t) - seutil_dontaudit_search_config(dhcpc_t) -+ seutil_domtrans_setfiles(dhcpc_t) - ') - - optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.6.5/policy/modules/system/udev.te ---- nsaserefpolicy/policy/modules/system/udev.te 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/udev.te 2007-05-22 14:41:13.000000000 -0400 -@@ -83,12 +83,19 @@ - kernel_dgram_send(udev_t) - kernel_signal(udev_t) - -+#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235182 -+kernel_read_net_sysctls(udev_t) -+kernel_read_network_state(udev_t) -+sysnet_read_dhcpc_pid(udev_t) -+sysnet_delete_dhcpc_pid(udev_t) -+ - corecmd_exec_all_executables(udev_t) - - dev_rw_sysfs(udev_t) - dev_manage_all_dev_nodes(udev_t) - dev_rw_generic_files(udev_t) - dev_delete_generic_files(udev_t) -+dev_search_usbfs_dirs(udev_t) - - domain_read_all_domains_state(udev_t) - domain_dontaudit_ptrace_all_domains(udev_t) #pidof triggers these -@@ -194,5 +201,24 @@ - ') - - optional_policy(` -+ openct_read_pid_files(udev_t) -+ openct_domtrans(udev_t) -+') -+ -+optional_policy(` -+ pcscd_read_pub_files(udev_t) -+ pcscd_domtrans(udev_t) -+') -+ -+optional_policy(` -+ xen_append_log(udev_t) -+ kernel_write_xen_state(udev_t) -+ kernel_read_xen_state(udev_t) -+ xen_read_image_files(udev_t) -+') -+ -+optional_policy(` - xserver_read_xdm_pid(udev_t) - ') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.6.5/policy/modules/system/unconfined.fc ---- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/unconfined.fc 2007-05-22 14:41:13.000000000 -0400 -@@ -10,4 +10,5 @@ - /usr/bin/valgrind -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) - /usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) - /usr/lib/ia32el/ia32x_loader -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) -+/usr/bin/vmware.* -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.6.5/policy/modules/system/unconfined.if ---- nsaserefpolicy/policy/modules/system/unconfined.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/unconfined.if 2007-05-22 14:41:13.000000000 -0400 -@@ -18,7 +18,7 @@ - ') - - # Use any Linux capability. -- allow $1 self:capability *; -+ allow $1 self:capability all_capabilities; - allow $1 self:fifo_file manage_fifo_file_perms; - - # Transition to myself, to make get_ordered_context_list happy. -@@ -28,10 +28,10 @@ - allow $1 self:file rw_file_perms; - - # Userland object managers -- allow $1 self:nscd *; -- allow $1 self:dbus *; -- allow $1 self:passwd *; -- allow $1 self:association *; -+ allow $1 self:nscd all_nscd; -+ allow $1 self:dbus all_dbus; -+ allow $1 self:passwd all_passwd; -+ allow $1 self:association all_association; - - kernel_unconfined($1) - corenet_unconfined($1) -@@ -78,6 +78,10 @@ - ') - - optional_policy(` -+ logging_unconfined($1) -+ ') -+ -+ optional_policy(` - nscd_unconfined($1) - ') - -@@ -556,3 +560,22 @@ - - allow $1 unconfined_t:dbus acquire_svc; - ') -+ -+######################################## -+## -+## Allow ptrace of unconfined domain -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`unconfined_ptrace',` -+ gen_require(` -+ type unconfined_t; -+ ') -+ -+ allow $1 unconfined_t:process ptrace; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.5/policy/modules/system/unconfined.te ---- nsaserefpolicy/policy/modules/system/unconfined.te 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/unconfined.te 2007-05-22 14:41:13.000000000 -0400 -@@ -6,6 +6,15 @@ - # Declarations - # - -+ifdef(`targeted_policy',` -+## -+##

-+## Allow unconfined to dyntrans to unconfined_execmem -+##

-+## -+gen_tunable(allow_unconfined_execmem_dyntrans,false) -+') -+ - type unconfined_t; - type unconfined_exec_t; - init_system_domain(unconfined_t,unconfined_exec_t) -@@ -50,6 +59,8 @@ - userdom_unconfined(unconfined_t) - userdom_priveleged_home_dir_manager(unconfined_t) - -+ term_user_pty(unconfined_t, devpts_t) -+ - optional_policy(` - ada_domtrans(unconfined_t) - ') -@@ -63,10 +74,6 @@ - ') - - optional_policy(` -- bootloader_domtrans(unconfined_t) -- ') -- -- optional_policy(` - init_dbus_chat_script(unconfined_t) - - dbus_stub(unconfined_t) -@@ -93,6 +100,7 @@ - - optional_policy(` - networkmanager_dbus_chat(unconfined_t) -+ networkmanager_domtrans(unconfined_t) - ') - - optional_policy(` -@@ -153,6 +161,8 @@ - - optional_policy(` - rpm_domtrans(unconfined_t) -+ # Allow SELinux aware applications to request rpm_script execution -+ rpm_transition_script(unconfined_t) - ') - - optional_policy(` -@@ -192,6 +202,9 @@ - optional_policy(` - xserver_domtrans_xdm_xserver(unconfined_t) - ') -+ mcs_killall(unconfined_t) -+ mcs_ptrace_all(unconfined_t) -+ - ') - - ######################################## -@@ -200,10 +213,18 @@ - # - - ifdef(`targeted_policy',` -+ tunable_policy(`allow_unconfined_execmem_dyntrans',` -+ allow unconfined_t unconfined_execmem_t:process dyntransition; -+ ') -+ - allow unconfined_execmem_t self:process { execstack execmem }; - unconfined_domain_noaudit(unconfined_execmem_t) - - optional_policy(` -+ hal_dbus_chat(unconfined_execmem_t) -+ ') -+ -+ optional_policy(` - dbus_stub(unconfined_execmem_t) - - init_dbus_chat_script(unconfined_execmem_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.6.5/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/userdomain.if 2007-05-24 14:35:27.000000000 -0400 -@@ -114,6 +114,18 @@ - # Allow making the stack executable via mprotect. - allow $1_t self:process execstack; - ') -+ -+ optional_policy(` -+ ssh_rw_stream_sockets($1_t) -+ ') -+ -+ optional_policy(` -+ consoletype_exec($1_t) -+ ') -+ -+ optional_policy(` -+ hostname_exec($1_t) -+ ') - ') - - ####################################### -@@ -764,6 +776,8 @@ - auth_search_pam_console_data($1_t) - auth_run_pam($1_t,$1_r,{ $1_tty_device_t $1_devpts_t }) - auth_run_utempter($1_t,$1_r,{ $1_tty_device_t $1_devpts_t }) -+ auth_run_upd_passwd($1_t,$1_r,{ $1_tty_device_t $1_devpts_t }) -+ auth_read_key($1_t) - - init_read_utmp($1_t) - # The library functions always try to open read-write first, -@@ -953,6 +967,38 @@ - ## - ## - # -+template(`userdom_privhome_user_template',` -+ gen_require(` -+ type $1_home_dir_t, $1_home_t; -+ ') -+ -+ # privileged home directory writers -+ manage_dirs_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -+ manage_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -+ manage_lnk_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -+ manage_sock_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -+ manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -+ filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file }) -+') -+ -+####################################### -+## -+## The template for creating a unprivileged user. -+## -+## -+##

-+## This template creates a user domain, types, and -+## rules for the user's tty, pty, home directories, -+## tmp, and tmpfs files. -+##

-+## -+## -+## -+## The prefix of the user domain (e.g., user -+## is the prefix for user_t). -+## -+## -+# - template(`userdom_unpriv_user_template', ` - - gen_require(` -@@ -979,20 +1025,13 @@ - userdom_poly_home_template($1) - userdom_poly_tmp_template($1) - -+ userdom_privhome_user_template($1) -+ - ############################## - # - # Local policy - # -- -- # privileged home directory writers -- manage_dirs_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -- manage_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -- manage_lnk_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -- manage_sock_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -- manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) -- filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file }) -- -- corecmd_exec_all_executables($1_t) -+ application_exec_all($1_t) - - # port access is audited even if dac would not have allowed it, so dontaudit it here - corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) -@@ -1059,10 +1098,6 @@ - dontaudit xdm_t $1_home_t:file rw_file_perms; - ') - -- # Do not audit write denials to /etc/ld.so.cache. -- dontaudit $1_t ld_so_cache_t:file write; -- -- dontaudit $1_t sysadm_home_t:file { read append }; - ') dnl end TODO - ') - -@@ -1126,7 +1161,7 @@ - # $1_t local policy - # - -- allow $1_t self:capability ~sys_module; -+ allow $1_t self:capability ~{ sys_module audit_control audit_write }; - allow $1_t self:process { setexec setfscreate }; - - # Set password information for other users. -@@ -1138,8 +1173,6 @@ - # Manipulate other users crontab. - allow $1_t self:passwd crontab; - -- allow $1_t self:netlink_audit_socket nlmsg_readpriv; -- - kernel_read_software_raid_state($1_t) - kernel_getattr_core_if($1_t) - kernel_getattr_message_if($1_t) -@@ -1352,11 +1385,7 @@ - ## - # - template(`userdom_role_change_generic_user',` -- ifdef(`strict_policy',` -- userdom_role_change_template($1,user) -- ',` -- refpolicywarn(`$0($*) has no effect in targeted policy.') -- ') -+ userdom_role_change_template($1,user) - ') - - ######################################## -@@ -1383,11 +1412,7 @@ - ## - # - template(`userdom_role_change_from_generic_user',` -- ifdef(`strict_policy',` -- userdom_role_change_template(user,$1) -- ',` -- refpolicywarn(`$0($*) has no effect in targeted policy.') -- ') -+ userdom_role_change_template(user,$1) - ') - - ######################################## -@@ -1413,11 +1438,7 @@ - ## - # - template(`userdom_role_change_staff',` -- ifdef(`strict_policy',` -- userdom_role_change_template($1,staff) -- ',` -- refpolicywarn(`$0($*) has no effect in targeted policy.') -- ') -+ userdom_role_change_template($1,staff) - ') - - ######################################## -@@ -1444,11 +1465,7 @@ - ## - # - template(`userdom_role_change_from_staff',` -- ifdef(`strict_policy',` -- userdom_role_change_template(staff,$1) -- ',` -- refpolicywarn(`$0($*) has no effect in targeted policy.') -- ') -+ userdom_role_change_template(staff,$1) - ') - - ######################################## -@@ -1474,11 +1491,7 @@ - ## - # - template(`userdom_role_change_sysadm',` -- ifdef(`strict_policy',` -- userdom_role_change_template($1,sysadm) -- ',` -- refpolicywarn(`$0($*) has no effect in targeted policy.') -- ') -+ userdom_role_change_template($1,sysadm) - ') - - ######################################## -@@ -1505,11 +1518,7 @@ - ## - # - template(`userdom_role_change_from_sysadm',` -- ifdef(`strict_policy',` -- userdom_role_change_template(sysadm,$1) -- ',` -- refpolicywarn(`$0($*) has no effect in targeted policy.') -- ') -+ userdom_role_change_template(sysadm,$1) - ') - - ######################################## -@@ -1697,13 +1706,11 @@ - ## - # - template(`userdom_setattr_user_ptys',` -- ifdef(`strict_policy',` -- gen_require(` -- type $1_devpts_t; -- ') -- -- allow $2 $1_devpts_t:chr_file setattr; -+ gen_require(` -+ type $1_devpts_t; - ') -+ -+ allow $2 $1_devpts_t:chr_file setattr; - ') - - ######################################## -@@ -1732,13 +1739,11 @@ - ## - # - template(`userdom_create_user_pty',` -- ifdef(`strict_policy',` -- gen_require(` -- type $1_devpts_t; -- ') -- -- term_create_pty($2,$1_devpts_t) -+ gen_require(` -+ type $1_devpts_t; - ') -+ -+ term_create_pty($2,$1_devpts_t) - ') - - ######################################## -@@ -3623,13 +3628,12 @@ - template(`userdom_setattr_user_ttys',` - ifdef(`targeted_policy',` - term_setattr_unallocated_ttys($2) -- ',` -- gen_require(` -- type $1_tty_device_t; -- ') -- -- allow $2 $1_tty_device_t:chr_file setattr; - ') -+ gen_require(` -+ type $1_tty_device_t; -+ ') -+ -+ allow $2 $1_tty_device_t:chr_file setattr; - ') - - ######################################## -@@ -3660,13 +3664,12 @@ - template(`userdom_use_user_ttys',` - ifdef(`targeted_policy',` - term_use_unallocated_ttys($2) -- ',` -- gen_require(` -- type $1_tty_device_t; -- ') -- -- allow $2 $1_tty_device_t:chr_file rw_term_perms; - ') -+ gen_require(` -+ type $1_tty_device_t; -+ ') -+ -+ allow $2 $1_tty_device_t:chr_file rw_term_perms; - ') - - ######################################## -@@ -3695,18 +3698,13 @@ - ## - # - template(`userdom_use_user_terminals',` -- ifdef(`targeted_policy',` -- term_use_unallocated_ttys($2) -- term_use_generic_ptys($2) -- ',` -- gen_require(` -- type $1_tty_device_t, $1_devpts_t; -- ') -- -- allow $2 $1_tty_device_t:chr_file rw_term_perms; -- allow $2 $1_devpts_t:chr_file rw_term_perms; -- term_list_ptys($2) -+ gen_require(` -+ type $1_tty_device_t, $1_devpts_t; - ') -+ -+ allow $2 $1_tty_device_t:chr_file rw_term_perms; -+ allow $2 $1_devpts_t:chr_file rw_term_perms; -+ term_list_ptys($2) - ') - - ######################################## -@@ -4682,18 +4680,14 @@ - ## - # - interface(`userdom_read_sysadm_home_content_files',` -- ifdef(`strict_policy',` -- gen_require(` -- type sysadm_home_dir_t, sysadm_home_t; -- ') -- -- files_search_home($1) -- allow $1 { sysadm_home_dir_t sysadm_home_t }:dir list_dir_perms; -- read_files_pattern($1,{ sysadm_home_dir_t sysadm_home_t },sysadm_home_t) -- read_lnk_files_pattern($1,{ sysadm_home_dir_t sysadm_home_t },sysadm_home_t) -- ',` -- userdom_read_generic_user_home_content_files($1) -+ gen_require(` -+ type sysadm_home_dir_t, sysadm_home_t; - ') -+ -+ files_search_home($1) -+ allow $1 { sysadm_home_dir_t sysadm_home_t }:dir list_dir_perms; -+ read_files_pattern($1,{ sysadm_home_dir_t sysadm_home_t },sysadm_home_t) -+ read_lnk_files_pattern($1,{ sysadm_home_dir_t sysadm_home_t },sysadm_home_t) - ') - - ######################################## -@@ -4707,18 +4701,14 @@ - ## - # - interface(`userdom_read_sysadm_tmp_files',` -- ifdef(`strict_policy',` -- gen_require(` -- type sysadm_tmp_t; -- ') -- -- files_search_tmp($1) -- allow $1 sysadm_tmp_t:dir list_dir_perms; -- read_files_pattern($1,sysadm_tmp_t,sysadm_tmp_t) -- read_lnk_files_pattern($1,sysadm_tmp_t,sysadm_tmp_t) -- ',` -- files_read_generic_tmp_files($1) -+ gen_require(` -+ type sysadm_tmp_t; - ') -+ -+ files_search_tmp($1) -+ allow $1 sysadm_tmp_t:dir list_dir_perms; -+ read_files_pattern($1,sysadm_tmp_t,sysadm_tmp_t) -+ read_lnk_files_pattern($1,sysadm_tmp_t,sysadm_tmp_t) - ') - - ######################################## -@@ -5352,14 +5342,13 @@ - interface(`userdom_use_unpriv_users_ptys',` - ifdef(`targeted_policy',` - term_use_generic_ptys($1) -- ',` -- gen_require(` -- attribute user_ptynode; -- ') -- -- term_search_ptys($1) -- allow $1 user_ptynode:chr_file rw_file_perms; - ') -+ gen_require(` -+ attribute user_ptynode; -+ ') -+ -+ term_search_ptys($1) -+ allow $1 user_ptynode:chr_file rw_file_perms; - ') - - ######################################## -@@ -5376,13 +5365,13 @@ - interface(`userdom_dontaudit_use_unpriv_users_ptys',` - ifdef(`targeted_policy',` - term_dontaudit_use_generic_ptys($1) -- ',` -- gen_require(` -- attribute user_ptynode; -- ') -+ ') - -- dontaudit $1 user_ptynode:chr_file rw_file_perms; -+ gen_require(` -+ attribute user_ptynode; - ') -+ -+ dontaudit $1 user_ptynode:chr_file rw_file_perms; - ') - - ######################################## -@@ -5435,13 +5424,12 @@ - interface(`userdom_list_unpriv_users_tmp',` - ifdef(`targeted_policy',` - files_list_tmp($1) -- ',` -- gen_require(` -- attribute user_tmpfile; -- ') -- -- allow $1 user_tmpfile:dir list_dir_perms; - ') -+ gen_require(` -+ attribute user_tmpfile; -+ ') -+ -+ allow $1 user_tmpfile:dir list_dir_perms; - ') - - ######################################## -@@ -5457,13 +5445,12 @@ - interface(`userdom_read_unpriv_users_tmp_files',` - ifdef(`targeted_policy',` - files_read_generic_tmp_files($1) -- ',` -- gen_require(` -- attribute user_tmpfile; -- ') -- -- allow $1 user_tmpfile:file { read getattr }; - ') -+ gen_require(` -+ attribute user_tmpfile; -+ ') -+ -+ allow $1 user_tmpfile:file { read getattr }; - ') - - ######################################## -@@ -5479,13 +5466,12 @@ - interface(`userdom_read_unpriv_users_tmp_symlinks',` - ifdef(`targeted_policy',` - files_read_generic_tmp_symlinks($1) -- ',` -- gen_require(` -- attribute user_tmpfile; -- ') -- -- allow $1 user_tmpfile:lnk_file { getattr read }; - ') -+ gen_require(` -+ attribute user_tmpfile; -+ ') -+ -+ allow $1 user_tmpfile:lnk_file { getattr read }; - ') - - ######################################## -@@ -5519,13 +5505,12 @@ - interface(`userdom_use_unpriv_users_ttys',` - ifdef(`targeted_policy',` - term_use_unallocated_ttys($1) -- ',` -- gen_require(` -- attribute user_ttynode; -- ') -- -- allow $1 user_ttynode:chr_file rw_term_perms; - ') -+ gen_require(` -+ attribute user_ttynode; -+ ') -+ -+ allow $1 user_ttynode:chr_file rw_term_perms; - ') - - ######################################## -@@ -5542,13 +5527,12 @@ - interface(`userdom_dontaudit_use_unpriv_users_ttys',` - ifdef(`targeted_policy',` - term_dontaudit_use_unallocated_ttys($1) -- ',` -- gen_require(` -- attribute user_ttynode; -- ') -- -- dontaudit $1 user_ttynode:chr_file rw_file_perms; - ') -+ gen_require(` -+ attribute user_ttynode; -+ ') -+ -+ dontaudit $1 user_ttynode:chr_file rw_file_perms; - ') - - ######################################## -@@ -5672,15 +5656,11 @@ - ## - # - interface(`userdom_create_all_users_keys',` -- ifdef(`strict_policy',` -- gen_require(` -- attribute userdomain; -- ') -- -- allow $1 userdomain:key create; -- ',` -- unconfined_create_keys($1) -+ gen_require(` -+ attribute userdomain; - ') -+ -+ allow $1 userdomain:key create; - ') - - ######################################## -@@ -5720,3 +5700,112 @@ - allow $1 user_home_dir_t:dir manage_dir_perms; - files_home_filetrans($1,user_home_dir_t,dir) - ') -+ -+ -+######################################## -+## -+## Manage and create all files in /tmp on behalf of the user -+## -+## -+##

-+## The interface for full access to the temporary directories. -+## This creates a derived type for the user -+## temporary type. Execute access is not given. -+##

-+##

-+## This is a templated interface, and should only -+## be called from a per-userdomain template. -+##

-+## -+## -+## -+## The prefix of the user domain (e.g., user -+## is the prefix for user_t). -+## -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The class of the object to be created. -+## If not specified, file is used. -+## -+## -+# -+template(`userdom_transition_user_tmp',` -+ gen_require(` -+ type $1_tmp_t; -+ ') -+ -+ files_tmp_filetrans($2,$1_tmp_t, $3) -+') -+ -+######################################## -+## -+## dontaudit getattr all user file type -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+# -+interface(`userdom_dontaudit_list_user_files',` -+ gen_require(` -+ attribute $1_file_type; -+ ') -+ -+ dontaudit $2 $1_file_type:dir search_dir_perms; -+ dontaudit $2 $1_file_type:file getattr; -+') -+ -+######################################## -+## -+## Do not audit attempts to write to homedirs of sysadm users -+## home directory. -+## -+## -+## -+## Domain to not audit. -+## -+## -+# -+interface(`userdom_dontaudit_write_sysadm_home_dirs',` -+ ifdef(`targeted_policy',` -+ gen_require(` -+ type user_home_dir_t; -+ ') -+ -+ dontaudit $1 user_home_dir_t:dir write; -+ ', ` -+ gen_require(` -+ type sysadm_home_dir_t; -+ ') -+ -+ dontaudit $1 sysadm_home_dir_t:dir write; -+ ') -+') -+ -+######################################## -+## -+## Ptrace all user domains. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+# -+interface(`userdom_ptrace_all_users',` -+ gen_require(` -+ attribute userdomain; -+ ') -+ -+ allow $1 userdomain:process ptrace; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.5/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2007-05-18 11:12:44.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/userdomain.te 2007-05-25 08:27:29.000000000 -0400 -@@ -15,7 +15,6 @@ - # Declarations - # - --ifdef(`strict_policy',` - ## - ##

- ## Allow sysadm to ptrace all processes -@@ -58,7 +57,6 @@ - ##

- ## - gen_tunable(user_ttyfile_stat,false) --') - - # admin users terminals (tty and pty) - attribute admin_terminal; -@@ -69,6 +67,9 @@ - # users home directory contents - attribute home_type; - -+# Executables to be run by user -+attribute user_exec_type; -+ - # The privhome attribute identifies every domain that can create files under - # regular user home directories in the regular context (IE act on behalf of - # a user in writing regular files) -@@ -101,440 +102,421 @@ - # Local policy - # - --ifdef(`strict_policy',` -- userdom_admin_user_template(sysadm) -- userdom_unpriv_user_template(staff) -- userdom_unpriv_user_template(user) -- -- # user role change rules: -- # sysadm_r can change to user roles -- userdom_role_change_template(sysadm, user) -- userdom_role_change_template(sysadm, staff) -- -- # only staff_r can change to sysadm_r -- userdom_role_change_template(staff, sysadm) -- dontaudit staff_t admin_terminal:chr_file { read write }; -+userdom_unpriv_user_template(user) -+userdom_admin_user_template(sysadm) - -- ifdef(`enable_mls',` -- userdom_unpriv_user_template(secadm) -- userdom_unpriv_user_template(auditadm) -+optional_policy(` -+ cron_admin_template(sysadm,sysadm_t,sysadm_r) -+') - -- userdom_role_change_template(staff,auditadm) -- userdom_role_change_template(staff,secadm) -+optional_policy(` -+ ethereal_admin_template(sysadm,sysadm_t,sysadm_r) -+') - -- userdom_role_change_template(sysadm,secadm) -- userdom_role_change_template(sysadm,auditadm) -+optional_policy(` -+ lpr_admin_template(sysadm,sysadm_t,sysadm_r) -+') - -- userdom_role_change_template(auditadm,secadm) -- userdom_role_change_template(auditadm,sysadm) -+optional_policy(` -+ mta_admin_template(sysadm,sysadm_t,sysadm_r) -+') - -- userdom_role_change_template(secadm,auditadm) -- userdom_role_change_template(secadm,sysadm) -- ') -+userdom_unpriv_user_template(staff) - -- # this should be tunable_policy, but -- # currently type_change and RBAC allow -- # do not work in conditionals -- ifdef(`user_canbe_sysadm',` -- userdom_role_change_template(user,sysadm) -- ') -+# user role change rules: -+# sysadm_r can change to user roles -+userdom_role_change_template(sysadm, user) -+userdom_role_change_template(sysadm, staff) - -- ######################################## -- # -- # Sysadm local policy -- # -+# only staff_r can change to sysadm_r -+userdom_role_change_template(staff, sysadm) -+dontaudit staff_t admin_terminal:chr_file { read write }; - -- # for su -- allow sysadm_t userdomain:fd use; -+ifdef(`enable_mls',` -+ userdom_unpriv_user_template(secadm) -+ userdom_unpriv_user_template(auditadm) - -- # Add/remove user home directories -- allow sysadm_t user_home_dir_t:dir manage_dir_perms; -- files_home_filetrans(sysadm_t,user_home_dir_t,dir) -+ userdom_role_change_template(staff,auditadm) -+ userdom_role_change_template(staff,secadm) - -- corecmd_exec_shell(sysadm_t) -+ userdom_role_change_template(sysadm,secadm) -+ userdom_role_change_template(sysadm,auditadm) - -- mls_process_read_up(sysadm_t) -+ userdom_role_change_template(auditadm,secadm) -+ userdom_role_change_template(auditadm,sysadm) - -- init_exec(sysadm_t) -+ userdom_role_change_template(secadm,auditadm) -+ userdom_role_change_template(secadm,sysadm) -+') - -- # Following for sending reboot and wall messages -- userdom_use_unpriv_users_ptys(sysadm_t) -- userdom_use_unpriv_users_ttys(sysadm_t) -+# this should be tunable_policy, but -+# currently type_change and RBAC allow -+# do not work in conditionals -+ifdef(`user_canbe_sysadm',` -+ userdom_role_change_template(user,sysadm) -+') - -- ifdef(`direct_sysadm_daemon',` -- optional_policy(` -- init_run_daemon(sysadm_t,sysadm_r,admin_terminal) -- ') -- ',` -- ifdef(`distro_gentoo',` -- optional_policy(` -- seutil_init_script_run_runinit(sysadm_t,sysadm_r,admin_terminal) -- ') -- ') -- ') -+######################################## -+# -+# Sysadm local policy -+# - -- ifdef(`enable_mls',` -- allow auditadm_t self:capability { dac_read_search dac_override }; -- seutil_run_runinit(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t }) -- domain_kill_all_domains(auditadm_t) -- seutil_read_bin_policy(auditadm_t) -- corecmd_exec_shell(auditadm_t) -- logging_send_syslog_msg(auditadm_t) -- logging_read_generic_logs(auditadm_t) -- logging_manage_audit_log(auditadm_t) -- logging_manage_audit_config(auditadm_t) -- logging_run_auditctl(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t }) -- logging_run_auditd(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t }) -- userdom_dontaudit_read_sysadm_home_content_files(auditadm_t) -- -- allow secadm_t self:capability { dac_read_search dac_override }; -- corecmd_exec_shell(secadm_t) -- domain_obj_id_change_exemption(secadm_t) -- mls_process_read_up(secadm_t) -- mls_file_read_up(secadm_t) -- mls_file_write_down(secadm_t) -- mls_file_upgrade(secadm_t) -- mls_file_downgrade(secadm_t) -- auth_relabel_all_files_except_shadow(secadm_t) -- dev_relabel_all_dev_nodes(secadm_t) -- auth_relabel_shadow(secadm_t) -- init_exec(secadm_t) -- logging_read_audit_log(secadm_t) -- logging_read_generic_logs(secadm_t) -- logging_read_audit_config(secadm_t) -- userdom_dontaudit_append_staff_home_content_files(secadm_t) -- userdom_dontaudit_read_sysadm_home_content_files(secadm_t) -+# for su -+allow sysadm_t userdomain:fd use; - -- optional_policy(` -- aide_run(secadm_t,secadm_r, { secadm_tty_device_t secadm_devpts_t }) -- ') -+# Add/remove user home directories -+allow sysadm_t user_home_dir_t:dir manage_dir_perms; -+files_home_filetrans(sysadm_t,user_home_dir_t,dir) - -+corecmd_exec_shell(sysadm_t) -+ -+mls_process_read_up(sysadm_t) -+ -+init_exec(sysadm_t) -+ -+kernel_sigstop_unlabeled(sysadm_t) -+kernel_signal_unlabeled(sysadm_t) -+kernel_kill_unlabeled(sysadm_t) -+kernel_read_unlabeled_state(sysadm_t) -+ -+# Following for sending reboot and wall messages -+userdom_use_unpriv_users_ptys(sysadm_t) -+userdom_use_unpriv_users_ttys(sysadm_t) -+ -+ifdef(`direct_sysadm_daemon',` -+ optional_policy(` -+ init_run_daemon(sysadm_t,sysadm_r,admin_terminal) -+ ') -+',` -+ ifdef(`distro_gentoo',` - optional_policy(` -- netlabel_run_mgmt(secadm_t,secadm_r, { secadm_tty_device_t secadm_devpts_t }) -+ seutil_init_script_run_runinit(sysadm_t,sysadm_r,admin_terminal) - ') -- ',` -- logging_manage_audit_log(sysadm_t) -- logging_manage_audit_config(sysadm_t) -- logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal) - ') -+') - -- tunable_policy(`allow_ptrace',` -- domain_ptrace_all_domains(sysadm_t) -+ifdef(`enable_mls',` -+ allow auditadm_t self:capability { dac_read_search dac_override }; -+ seutil_run_runinit(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t }) -+ domain_kill_all_domains(auditadm_t) -+ seutil_read_bin_policy(auditadm_t) -+ corecmd_exec_shell(auditadm_t) -+ logging_send_syslog_msg(auditadm_t) -+ logging_read_generic_logs(auditadm_t) -+ logging_manage_audit_log(auditadm_t) -+ logging_manage_audit_config(auditadm_t) -+ logging_run_auditctl(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t }) -+ logging_run_auditd(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t }) -+ userdom_dontaudit_read_sysadm_home_content_files(auditadm_t) -+ -+ allow secadm_t self:capability { dac_read_search dac_override }; -+ corecmd_exec_shell(secadm_t) -+ domain_obj_id_change_exemption(secadm_t) -+ mls_process_read_up(secadm_t) -+ mls_file_read_up(secadm_t) -+ mls_file_write_down(secadm_t) -+ mls_file_upgrade(secadm_t) -+ mls_file_downgrade(secadm_t) -+ auth_relabel_all_files_except_shadow(secadm_t) -+ dev_relabel_all_dev_nodes(secadm_t) -+ auth_relabel_shadow(secadm_t) -+ init_exec(secadm_t) -+ logging_read_audit_log(secadm_t) -+ logging_read_generic_logs(secadm_t) -+ logging_read_audit_config(secadm_t) -+ userdom_dontaudit_append_staff_home_content_files(secadm_t) -+ userdom_dontaudit_read_sysadm_home_content_files(secadm_t) -+ -+ optional_policy(` -+ aide_run(secadm_t,secadm_r, { secadm_tty_device_t secadm_devpts_t }) - ') - - optional_policy(` -- amanda_run_recover(sysadm_t,sysadm_r,admin_terminal) -- ') -+ netlabel_run_mgmt(secadm_t,secadm_r, { secadm_tty_device_t secadm_devpts_t }) -+ ') -+',` -+ logging_manage_audit_log(sysadm_t) -+ logging_manage_audit_config(sysadm_t) -+ logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- apache_run_helper(sysadm_t,sysadm_r,admin_terminal) -- #apache_run_all_scripts(sysadm_t,sysadm_r) -- #apache_domtrans_sys_script(sysadm_t) -- ') -+tunable_policy(`allow_ptrace',` -+ domain_ptrace_all_domains(sysadm_t) -+') - -- optional_policy(` -- tzdata_domtrans(sysadm_t) -- ') -+optional_policy(` -+ amanda_run_recover(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- raid_domtrans_mdadm(sysadm_t) -- ') -+optional_policy(` -+ amtu_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- # cjp: why is this not apm_run_client -- apm_domtrans_client(sysadm_t) -- ') -+optional_policy(` -+ apache_run_helper(sysadm_t,sysadm_r,admin_terminal) -+ #apache_run_all_scripts(sysadm_t,sysadm_r) -+ #apache_domtrans_sys_script(sysadm_t) -+') - -- optional_policy(` -- apt_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ tzdata_domtrans(sysadm_t) -+') - -- optional_policy(` -- backup_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ raid_domtrans_mdadm(sysadm_t) -+') - -- optional_policy(` -- bootloader_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ # cjp: why is this not apm_run_client -+ apm_domtrans_client(sysadm_t) -+') - -- optional_policy(` -- bind_run_ndc(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ apt_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- bluetooth_run_helper(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ backup_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- consoletype_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ bootloader_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- clock_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ bind_run_ndc(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- clockspeed_run_cli(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ bluetooth_run_helper(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- certwatach_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ consoletype_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- cvs_exec(sysadm_t) -- ') -+optional_policy(` -+ clock_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- consoletype_exec(sysadm_t) -+optional_policy(` -+ clockspeed_run_cli(sysadm_t,sysadm_r,admin_terminal) -+') - -- ifdef(`enable_mls',` -- consoletype_exec(auditadm_t) -- ') -- ') -+optional_policy(` -+ certwatach_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- cron_admin_template(sysadm,sysadm_t,sysadm_r) -- ') -+optional_policy(` -+ cvs_exec(sysadm_t) -+') - -- optional_policy(` -- dcc_run_cdcc(sysadm_t,sysadm_r,admin_terminal) -- dcc_run_client(sysadm_t,sysadm_r,admin_terminal) -- dcc_run_dbclean(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ dcc_run_cdcc(sysadm_t,sysadm_r,admin_terminal) -+ dcc_run_client(sysadm_t,sysadm_r,admin_terminal) -+ dcc_run_dbclean(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- ddcprobe_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ ddcprobe_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- dmesg_exec(sysadm_t) -+optional_policy(` -+ dmesg_exec(sysadm_t) - -- ifdef(`enable_mls',` -- dmesg_exec(auditadm_t) -- ') -+ ifdef(`enable_mls',` -+ dmesg_exec(auditadm_t) - ') -+') - -- optional_policy(` -- dmidecode_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ dmidecode_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- dpkg_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ dpkg_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- ethereal_run_tethereal(sysadm_t,sysadm_r,admin_terminal) -- ethereal_admin_template(sysadm,sysadm_t,sysadm_r) -- ') -+optional_policy(` -+ ethereal_run_tethereal(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- firstboot_run(sysadm_t,sysadm_r,sysadm_tty_device_t) -- ') -+optional_policy(` -+ firstboot_run(sysadm_t,sysadm_r,sysadm_tty_device_t) -+') - -- optional_policy(` -- fstools_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ fstools_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- hostname_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ hostname_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- # allow system administrator to use the ipsec script to look -- # at things (e.g., ipsec auto --status) -- # probably should create an ipsec_admin role for this kind of thing -- ipsec_exec_mgmt(sysadm_t) -- ipsec_stream_connect(sysadm_t) -- # for lsof -- ipsec_getattr_key_sockets(sysadm_t) -- ') -+optional_policy(` -+ # allow system administrator to use the ipsec script to look -+ # at things (e.g., ipsec auto --status) -+ # probably should create an ipsec_admin role for this kind of thing -+ ipsec_exec_mgmt(sysadm_t) -+ ipsec_stream_connect(sysadm_t) -+ # for lsof -+ ipsec_getattr_key_sockets(sysadm_t) -+') - -- optional_policy(` -- iptables_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ iptables_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- libs_run_ldconfig(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ libs_run_ldconfig(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- lvm_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ lvm_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- logrotate_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ logrotate_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- lpd_run_checkpc(sysadm_t,sysadm_r,admin_terminal) -- lpr_admin_template(sysadm,sysadm_t,sysadm_r) -- ') -+optional_policy(` -+ lpd_run_checkpc(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- kudzu_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ kudzu_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- modutils_run_depmod(sysadm_t,sysadm_r,admin_terminal) -- modutils_run_insmod(sysadm_t,sysadm_r,admin_terminal) -- modutils_run_update_mods(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ modutils_run_depmod(sysadm_t,sysadm_r,admin_terminal) -+ modutils_run_insmod(sysadm_t,sysadm_r,admin_terminal) -+ modutils_run_update_mods(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- mount_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ mount_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- mta_admin_template(sysadm,sysadm_t,sysadm_r) -- ') -+optional_policy(` -+ mysql_stream_connect(sysadm_t) -+') - -- optional_policy(` -- mysql_stream_connect(sysadm_t) -- ') -+optional_policy(` -+ netlabel_run_mgmt(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- netutils_run(sysadm_t,sysadm_r,admin_terminal) -- netutils_run_ping(sysadm_t,sysadm_r,admin_terminal) -- netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ netutils_run(sysadm_t,sysadm_r,admin_terminal) -+ netutils_run_ping(sysadm_t,sysadm_r,admin_terminal) -+ netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- rpc_domtrans_nfsd(sysadm_t) -- ') -+optional_policy(` -+ rpc_domtrans_nfsd(sysadm_t) -+') - -- optional_policy(` -- munin_stream_connect(sysadm_t) -- ') -+optional_policy(` -+ munin_stream_connect(sysadm_t) -+') - -- optional_policy(` -- ntp_stub() -- corenet_udp_bind_ntp_port(sysadm_t) -- ') -+optional_policy(` -+ ntp_stub() -+ corenet_udp_bind_ntp_port(sysadm_t) -+') - -- optional_policy(` -- oav_run_update(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ oav_run_update(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- pcmcia_run_cardctl(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ pcmcia_run_cardctl(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- portage_run(sysadm_t,sysadm_r,admin_terminal) -- portage_run_gcc_config(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ portage_run(sysadm_t,sysadm_r,admin_terminal) -+ portage_run_gcc_config(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- portmap_run_helper(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ portmap_run_helper(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- quota_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ quota_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- rpm_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ rpm_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- rsync_exec(sysadm_t) -- ') -+optional_policy(` -+ rsync_exec(sysadm_t) -+') - -- optional_policy(` -- samba_run_net(sysadm_t,sysadm_r,admin_terminal) -- samba_run_winbind_helper(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ samba_run_net(sysadm_t,sysadm_r,admin_terminal) -+ samba_run_winbind_helper(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- seutil_run_setfiles(sysadm_t,sysadm_r,admin_terminal) -- seutil_run_runinit(sysadm_t,sysadm_r,admin_terminal) -+optional_policy(` -+ seutil_run_setfiles(sysadm_t,sysadm_r,admin_terminal) -+ seutil_run_runinit(sysadm_t,sysadm_r,admin_terminal) - -- ifdef(`enable_mls',` -- userdom_security_admin_template(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) -- ', ` -+ ifdef(`enable_mls',` -+ userdom_security_admin_template(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) -+# tunable_policy(`allow_sysadm_manage_security',` - userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal) -- ') -+# ') -+ ', ` -+ userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal) - ') -+') - -- optional_policy(` -- sysnet_run_ifconfig(sysadm_t,sysadm_r,admin_terminal) -- sysnet_run_dhcpc(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ sysnet_run_ifconfig(sysadm_t,sysadm_r,admin_terminal) -+ sysnet_run_dhcpc(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- tripwire_run_siggen(sysadm_t,sysadm_r,admin_terminal) -- tripwire_run_tripwire(sysadm_t,sysadm_r,admin_terminal) -- tripwire_run_twadmin(sysadm_t,sysadm_r,admin_terminal) -- tripwire_run_twprint(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ tripwire_run_siggen(sysadm_t,sysadm_r,admin_terminal) -+ tripwire_run_tripwire(sysadm_t,sysadm_r,admin_terminal) -+ tripwire_run_twadmin(sysadm_t,sysadm_r,admin_terminal) -+ tripwire_run_twprint(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- unconfined_domtrans(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ unconfined_domtrans(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- usbmodules_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ usbmodules_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- usermanage_run_admin_passwd(sysadm_t,sysadm_r,admin_terminal) -- usermanage_run_groupadd(sysadm_t,sysadm_r,admin_terminal) -- usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ usermanage_run_admin_passwd(sysadm_t,sysadm_r,admin_terminal) -+ usermanage_run_groupadd(sysadm_t,sysadm_r,admin_terminal) -+ usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- vpn_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ vpn_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- webalizer_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ webalizer_run(sysadm_t,sysadm_r,admin_terminal) -+') - -- optional_policy(` -- yam_run(sysadm_t,sysadm_r,admin_terminal) -- ') -+optional_policy(` -+ yam_run(sysadm_t,sysadm_r,admin_terminal) - ') - - ifdef(`targeted_policy',` -- # Define some type aliases to help with compatibility with -- # strict policy. -- unconfined_alias_domain(secadm_t) -- unconfined_alias_domain(auditadm_t) -- unconfined_alias_domain(sysadm_t) -- -- # User home directory type. -- type user_home_t alias { staff_home_t sysadm_home_t }, home_type, user_home_type; -- files_type(user_home_t) -- files_associate_tmp(user_home_t) -- fs_associate_tmpfs(user_home_t) -- -- type user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t }, home_dir_type, home_type, user_home_dir_type; -- files_type(user_home_dir_t) -- files_associate_tmp(user_home_dir_t) -- fs_associate_tmpfs(user_home_dir_t) -- -- # compatibility for switching from strict --# dominance { role secadm_r { role system_r; }} --# dominance { role auditadm_r { role system_r; }} --# dominance { role sysadm_r { role system_r; }} --# dominance { role user_r { role system_r; }} --# dominance { role staff_r { role system_r; }} -- - # dont need to use the full role_change() - allow sysadm_r system_r; - allow sysadm_r user_r; -- allow user_r system_r; -- allow user_r sysadm_r; - allow system_r sysadm_r; - allow system_r sysadm_r; - -- manage_dirs_pattern(privhome,{ user_home_dir_t user_home_t },user_home_t) -- manage_files_pattern(privhome,{ user_home_dir_t user_home_t },user_home_t) -- manage_lnk_files_pattern(privhome,{ user_home_dir_t user_home_t },user_home_t) -- manage_sock_files_pattern(privhome,{ user_home_dir_t user_home_t },user_home_t) -- manage_fifo_files_pattern(privhome,{ user_home_dir_t user_home_t },user_home_t) -- filetrans_pattern(privhome,user_home_dir_t,user_home_t,{ dir file lnk_file sock_file fifo_file }) - files_search_home(privhome) - - ifdef(`enable_mls',` -@@ -545,7 +527,8 @@ - allow staff_r auditadm_r; - ') - -- optional_policy(` -- samba_per_role_template(user) -- ') -+') -+ -+tunable_policy(`allow_console_login', ` -+ term_use_console(userdomain) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.6.5/policy/modules/system/xen.if ---- nsaserefpolicy/policy/modules/system/xen.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.6.5/policy/modules/system/xen.if 2007-05-22 14:41:13.000000000 -0400 -@@ -72,12 +72,35 @@ - ') - - logging_search_logs($1) -+ allow $1 xend_var_log_t:dir search_dir_perms; - allow $1 xend_var_log_t:file { getattr append }; - dontaudit $1 xend_var_log_t:file write; - ') - - ######################################## - ## -+## Allow the specified domain to manage -+## xend log files. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`xen_manage_log',` -+ gen_require(` -+ type var_log_t, xend_var_log_t; -+ ') -+ -+ logging_search_logs($1) -+ allow $1 xend_var_log_t:dir create_dir_perms; -+ allow $1 xend_var_log_t:file create_file_perms; -+ dontaudit $1 xend_var_log_t:file write; -+') -+ -+######################################## -+## - ## Do not audit attempts to read and write - ## Xen unix domain stream sockets. These - ## are leaked file descriptors. -@@ -151,3 +174,25 @@ - - domtrans_pattern($1,xm_exec_t,xm_t) - ') -+ -+######################################## -+## -+## Allow the specified domain to read -+## xend image files. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`xen_read_image_files',` -+ gen_require(` -+ type xen_image_t, xend_var_lib_t; -+ ') -+ -+ files_list_var_lib($1) -+ allow $1 xend_var_lib_t:dir search_dir_perms; -+ read_files_pattern($1,xen_image_t,xen_image_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.5/policy/modules/system/xen.te ---- nsaserefpolicy/policy/modules/system/xen.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.5/policy/modules/system/xen.te 2007-05-22 14:41:13.000000000 -0400 -@@ -25,6 +25,10 @@ - domain_type(xend_t) - init_daemon_domain(xend_t, xend_exec_t) - -+# tmp files -+type xend_tmp_t; -+files_tmp_file(xend_tmp_t) -+ - # var/lib files - type xend_var_lib_t; - files_type(xend_var_lib_t) -@@ -88,6 +92,7 @@ - allow xend_t xen_image_t:dir list_dir_perms; - manage_dirs_pattern(xend_t,xen_image_t,xen_image_t) - manage_files_pattern(xend_t,xen_image_t,xen_image_t) -+read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t) - rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t) - - allow xend_t xenctl_t:fifo_file manage_file_perms; -@@ -97,7 +102,8 @@ - allow xend_t xend_var_run_t:dir setattr; - manage_files_pattern(xend_t,xend_var_run_t,xend_var_run_t) - manage_sock_files_pattern(xend_t,xend_var_run_t,xend_var_run_t) --files_pid_filetrans(xend_t,xend_var_run_t, { file sock_file }) -+manage_fifo_files_pattern(xend_t,xend_var_run_t,xend_var_run_t) -+files_pid_filetrans(xend_t,xend_var_run_t, { file sock_file fifo_file }) - - # log files - allow xend_t xend_var_log_t:dir setattr; -@@ -105,6 +111,10 @@ - manage_sock_files_pattern(xend_t,xend_var_log_t,xend_var_log_t) - logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir }) - -+manage_files_pattern(xend_t,xend_tmp_t,xend_tmp_t) -+manage_dirs_pattern(xend_t,xend_tmp_t,xend_tmp_t) -+files_tmp_filetrans(xend_t, xend_tmp_t, { file dir }) -+ - # var/lib files for xend - manage_dirs_pattern(xend_t,xend_var_lib_t,xend_var_lib_t) - manage_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t) -@@ -165,8 +175,13 @@ - files_manage_etc_runtime_files(xend_t) - files_etc_filetrans_etc_runtime(xend_t,file) - files_read_usr_files(xend_t) -+files_read_default_symlinks(xend_t) -+ -+#tunable_policy(`xen_use_raw_disk',` -+ storage_raw_read_fixed_disk(xend_t) -+ storage_raw_write_fixed_disk(xend_t) -+#') - --storage_raw_read_fixed_disk(xend_t) - storage_raw_read_removable_device(xend_t) - - term_getattr_all_user_ptys(xend_t) -@@ -195,6 +210,10 @@ - - xen_stream_connect_xenstore(xend_t) - -+lvm_domtrans(xend_t) -+ -+mount_domtrans(xend_t) -+ - netutils_domtrans(xend_t) - - optional_policy(` -@@ -284,6 +303,12 @@ - - files_read_usr_files(xenstored_t) - -+#tunable_policy(`xen_use_raw_disk',` -+ storage_raw_read_fixed_disk(xenstored_t) -+ storage_raw_write_fixed_disk(xenstored_t) -+#') -+storage_raw_read_removable_device(xenstored_t) -+ - term_use_generic_ptys(xenstored_t) - term_use_console(xenconsoled_t) - -@@ -317,6 +342,11 @@ - - allow xm_t xen_image_t:dir rw_dir_perms; - allow xm_t xen_image_t:file read_file_perms; -+allow xm_t xen_image_t:blk_file r_file_perms; -+ -+#tunable_policy(`xen_use_raw_disk',` -+ storage_raw_read_fixed_disk(xm_t) -+#') - - kernel_read_system_state(xm_t) - kernel_read_kernel_sysctls(xm_t) -@@ -352,3 +382,11 @@ - xen_append_log(xm_t) - xen_stream_connect(xm_t) - xen_stream_connect_xenstore(xm_t) -+ -+#Should have a boolean wrapping these -+fs_list_auto_mountpoints(xend_t) -+files_search_mnt(xend_t) -+fs_write_nfs_files(xend_t) -+fs_read_nfs_files(xend_t) -+fs_getattr_all_fs(xend_t) -+fs_read_dos_files(xend_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.6.5/policy/rolemap ---- nsaserefpolicy/policy/rolemap 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.5/policy/rolemap 2007-05-24 15:51:16.000000000 -0400 -@@ -8,13 +8,11 @@ - # syntax: role prefix user_domain - # - --ifdef(`strict_policy',` -- user_r user user_t -- staff_r staff staff_t -- sysadm_r sysadm sysadm_t -+user_r user user_t -+staff_r staff staff_t -+sysadm_r sysadm sysadm_t - -- ifdef(`enable_mls',` -- secadm_r secadm secadm_t -- auditadm_r auditadm auditadm_t -- ') -+ifdef(`enable_mls',` -+ secadm_r secadm secadm_t -+ auditadm_r auditadm auditadm_t - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns.spt serefpolicy-2.6.5/policy/support/misc_patterns.spt ---- nsaserefpolicy/policy/support/misc_patterns.spt 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.6.5/policy/support/misc_patterns.spt 2007-05-22 14:41:13.000000000 -0400 -@@ -41,11 +41,6 @@ - # - # Other process permissions - # --define(`send_audit_msgs_pattern',` -- allow $1 self:capability audit_write; -- allow $1 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; --') -- - define(`ps_process_pattern',` - allow $1 $2:dir { search getattr read }; - allow $1 $2:{ file lnk_file } { read getattr }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.5/policy/support/obj_perm_sets.spt ---- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-05-04 12:19:23.000000000 -0400 -+++ serefpolicy-2.6.5/policy/support/obj_perm_sets.spt 2007-05-22 14:41:13.000000000 -0400 -@@ -203,7 +203,6 @@ - define(`add_entry_dir_perms',`{ getattr search lock ioctl write add_name }') - define(`del_entry_dir_perms',`{ getattr search lock ioctl write remove_name }') - define(`create_dir_perms',`{ getattr create }') --define(`rename_dir_perms',`{ getattr rename }') - define(`delete_dir_perms',`{ getattr rmdir }') - define(`manage_dir_perms',`{ create getattr setattr read write link unlink rename search add_name remove_name reparent rmdir lock ioctl }') - define(`relabelfrom_dir_perms',`{ getattr relabelfrom }') -@@ -216,7 +215,7 @@ - define(`getattr_file_perms',`{ getattr }') - define(`setattr_file_perms',`{ setattr }') - define(`read_file_perms',`{ getattr read lock ioctl }') --define(`mmap_file_perms',`{ getattr read execute }') -+define(`mmap_file_perms',`{ getattr read execute ioctl }') - define(`exec_file_perms',`{ getattr read execute execute_no_trans }') - define(`append_file_perms',`{ getattr append lock ioctl }') - define(`write_file_perms',`{ getattr write append lock ioctl }') -@@ -325,3 +324,13 @@ - # - define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') - define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }') -+ -+define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control } -+') -+ -+define(`all_nscd', `{ getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost } ') -+define(`all_dbus', `{ acquire_svc send_msg } ') -+define(`all_passwd', `{ passwd chfn chsh rootok crontab } ') -+define(`all_association', `{ sendto recvfrom setcontext polmatch } ') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.6.5/policy/users ---- nsaserefpolicy/policy/users 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.5/policy/users 2007-05-24 15:42:41.000000000 -0400 -@@ -25,13 +25,9 @@ - # SELinux user identity for a Linux user. If you do not want to - # permit any access to such users, then remove this entry. - # --ifdef(`targeted_policy',` --gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - mls_systemhigh, mcs_allcats) --',` - gen_user(user_u, user, user_r, s0, s0) - gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) - gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - mls_systemhigh, mcs_allcats) --') - - # - # The following users correspond to Unix identities. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.5/Rules.modular ---- nsaserefpolicy/Rules.modular 2007-03-22 14:30:10.000000000 -0400 -+++ serefpolicy-2.6.5/Rules.modular 2007-05-22 14:41:13.000000000 -0400 -@@ -167,7 +167,7 @@ - # these have to run individually because order matters: - $(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true - $(verbose) $(GREP) '^fs_use_(xattr|task|trans)' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true -- $(verbose) $(GREP) ^genfscon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true -+ $(verbose) $(GREP) genfscon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true - $(verbose) $(GREP) ^portcon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true - $(verbose) $(GREP) ^netifcon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true - $(verbose) $(GREP) ^nodecon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true -@@ -219,6 +219,16 @@ - - ######################################## - # -+# Validate File Contexts -+# -+validatefc: $(base_pkg) $(base_fc) -+ @echo "Validating file context." -+ $(verbose) $(SEMOD_EXP) $(base_pkg) $(tmpdir)/policy.tmp -+ $(verbose) $(SETFILES) -c $(tmpdir)/policy.tmp $(base_fc) -+ @echo "Success." -+ -+######################################## -+# - # Clean the sources - # - clean: diff --git a/policy-20070525.patch b/policy-20070525.patch new file mode 100644 index 0000000..e5ffae8 --- /dev/null +++ b/policy-20070525.patch @@ -0,0 +1,9066 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.0.1/Makefile +--- nsaserefpolicy/Makefile 2007-05-29 13:53:56.000000000 -0400 ++++ serefpolicy-3.0.1/Makefile 2007-05-30 15:54:27.000000000 -0400 +@@ -158,8 +158,18 @@ + headerdir = $(modpkgdir)/include + docsdir = $(prefix)/share/doc/$(PKGNAME) + ++# compile strict policy if requested. ++ifneq ($(findstring strict,$(TYPE)),) ++ M4PARAM += -D strict_policy ++endif ++ ++# compile targeted policy if requested. ++ifneq ($(findstring targeted,$(TYPE)),) ++ M4PARAM += -D targeted_policy ++endif ++ + # enable MLS if requested. +-ifeq "$(TYPE)" "mls" ++ifneq ($(findstring -mls,$(TYPE)),) + M4PARAM += -D enable_mls + CHECKPOLICY += -M + CHECKMODULE += -M +@@ -167,7 +177,7 @@ + endif + + # enable MLS if MCS requested. +-ifeq "$(TYPE)" "mcs" ++ifneq ($(findstring -mcs,$(TYPE)),) + M4PARAM += -D enable_mcs + CHECKPOLICY += -M + CHECKMODULE += -M +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.0.1/man/man8/ftpd_selinux.8 +--- nsaserefpolicy/man/man8/ftpd_selinux.8 2007-05-25 09:09:10.000000000 -0400 ++++ serefpolicy-3.0.1/man/man8/ftpd_selinux.8 2007-05-30 15:12:50.000000000 -0400 +@@ -12,7 +12,7 @@ + .TP + chcon -R -t public_content_t /var/ftp + .TP +-If you want to setup a directory where you can upload files to you must label the files and directories ftpd_anon_rw_t. So if you created a special directory /var/ftp/incoming, you would need to label the directory with the chcon tool. ++If you want to setup a directory where you can upload files to you must label the files and directories public_content_rw_t. So if you created a special directory /var/ftp/incoming, you would need to label the directory with the chcon tool. + .TP + chcon -t public_content_rw_t /var/ftp/incoming + .TP +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.0.1/policy/flask/access_vectors +--- nsaserefpolicy/policy/flask/access_vectors 2007-05-29 14:10:47.000000000 -0400 ++++ serefpolicy-3.0.1/policy/flask/access_vectors 2007-05-30 15:12:50.000000000 -0400 +@@ -598,6 +598,8 @@ + shmempwd + shmemgrp + shmemhost ++ getserv ++ shmemserv + } + + # Define the access vector interpretation for controlling +@@ -623,6 +625,8 @@ + send + recv + relabelto ++ flow_in ++ flow_out + } + + class key +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.0.1/policy/global_tunables +--- nsaserefpolicy/policy/global_tunables 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/global_tunables 2007-05-30 15:12:50.000000000 -0400 +@@ -133,3 +133,10 @@ + ## + gen_tunable(write_untrusted_content,false) + ++## ++##

++## Allow users to connect to console (s390) ++##

++## ++gen_tunable(allow_console_login,false) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.0.1/policy/mls +--- nsaserefpolicy/policy/mls 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/mls 2007-05-30 15:12:50.000000000 -0400 +@@ -89,12 +89,14 @@ + mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } + (( l1 eq l2 ) or + (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or +- (( t2 == mlsfilewriteinrange ) and ( l1 dom l2 ) and ( h1 domby h2 )) or ++ (( t2 == mlsrangedobject ) and ( l1 dom l2 ) and ( h1 domby h2 )) or + ( t1 == mlsfilewrite ) or + ( t2 == mlstrustedobject )); + ++# Directory "write" ops + mlsconstrain dir { add_name remove_name reparent rmdir } +- ((( l1 dom l2 ) and ( l1 domby h2 )) or ++ (( l1 eq l2 ) or ++ (( t1 == mlsfilewriteinrange ) and ( l1 dom l2 ) and ( l1 domby h2 )) or + (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or + ( t1 == mlsfilewrite ) or + ( t2 == mlstrustedobject )); +@@ -165,8 +167,20 @@ + mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } relabelto + ( h1 dom h2 ); + ++# the socket "read+write" ops ++# (Socket FDs are generally bidirectional, equivalent to open(..., O_RDWR), ++# require equal levels for unprivileged subjects, or read *and* write overrides) ++mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { accept connect } ++ (( l1 eq l2 ) or ++ (((( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or ++ ( t1 == mlsnetread )) and ++ ((( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or ++ (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or ++ ( t1 == mlsnetwrite )))); ++ ++ + # the socket "read" ops (note the check is dominance of the low level) +-mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { read getattr listen accept getopt recv_msg } ++mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { read getattr listen getopt recv_msg } + (( l1 dom l2 ) or + (( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or + ( t1 == mlsnetread )); +@@ -177,8 +191,9 @@ + ( t1 == mlsnetread )); + + # the socket "write" ops +-mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { write setattr relabelfrom connect setopt shutdown } +- ((( l1 dom l2 ) and ( l1 domby h2 )) or ++mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { write setattr relabelfrom setopt shutdown } ++ (( l1 eq l2 ) or ++ (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or + (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or + ( t1 == mlsnetwrite )); + +@@ -274,7 +289,8 @@ + + # the netif/node "write" ops (implicit single level socket doing the write) + mlsconstrain { netif node } { tcp_send udp_send rawip_send } +- (( l1 dom l2 ) and ( l1 domby h2 )); ++ (( l1 eq l2 ) or ++ (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 ))); + + # these access vectors have no MLS restrictions + # node enforce_dest +@@ -581,7 +597,8 @@ + ( t2 == unlabeled_t )); + + mlsconstrain association { sendto } +- ((( l1 dom l2 ) and ( l1 domby h2 )) or ++ (( l1 eq l2 ) or ++ (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or + ( t2 == unlabeled_t )); + + mlsconstrain association { polmatch } +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-3.0.1/policy/modules/admin/acct.te +--- nsaserefpolicy/policy/modules/admin/acct.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/acct.te 2007-05-30 15:12:50.000000000 -0400 +@@ -9,6 +9,7 @@ + type acct_t; + type acct_exec_t; + init_system_domain(acct_t,acct_exec_t) ++application_executable_file(acct_exec_t) + + type acct_data_t; + logging_log_file(acct_data_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-3.0.1/policy/modules/admin/alsa.fc +--- nsaserefpolicy/policy/modules/admin/alsa.fc 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/alsa.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -1,4 +1,7 @@ + + /etc/alsa/pcm(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t,s0) ++/etc/asound(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t,s0) ++/etc/asound\.state gen_context(system_u:object_r:alsa_etc_rw_t,s0) + + /usr/bin/ainit -- gen_context(system_u:object_r:alsa_exec_t,s0) ++/sbin/alsactl -- gen_context(system_u:object_r:alsa_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.1/policy/modules/admin/alsa.te +--- nsaserefpolicy/policy/modules/admin/alsa.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/alsa.te 2007-05-30 15:12:50.000000000 -0400 +@@ -20,20 +20,24 @@ + # Local policy + # + +-allow alsa_t self:capability { setgid setuid ipc_owner }; ++allow alsa_t self:capability { dac_read_search dac_override setgid setuid ipc_owner }; + dontaudit alsa_t self:capability sys_admin; + allow alsa_t self:sem create_sem_perms; + allow alsa_t self:shm create_shm_perms; + allow alsa_t self:unix_stream_socket create_stream_socket_perms; + allow alsa_t self:unix_dgram_socket create_socket_perms; + ++dev_read_sound(alsa_t) ++dev_write_sound(alsa_t) ++ ++files_etc_filetrans(alsa_t, alsa_etc_rw_t, file) + manage_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t) + manage_lnk_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t) + ++files_search_home(alsa_t) + files_read_etc_files(alsa_t) + +-term_use_generic_ptys(alsa_t) +-term_dontaudit_use_unallocated_ttys(alsa_t) ++kernel_read_system_state(alsa_t) + + libs_use_ld_so(alsa_t) + libs_use_shared_libs(alsa_t) +@@ -44,7 +48,14 @@ + + userdom_manage_unpriv_user_semaphores(alsa_t) + userdom_manage_unpriv_user_shared_mem(alsa_t) ++userdom_search_generic_user_home_dirs(alsa_t) + + optional_policy(` + nscd_socket_use(alsa_t) + ') ++ ++optional_policy(` ++ hal_use_fds(alsa_t) ++ hal_write_log(alsa_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.0.1/policy/modules/admin/amanda.te +--- nsaserefpolicy/policy/modules/admin/amanda.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/amanda.te 2007-05-30 15:12:50.000000000 -0400 +@@ -70,7 +70,7 @@ + + allow amanda_t self:capability { chown dac_override setuid kill }; + allow amanda_t self:process { setpgid signal }; +-allow amanda_t self:fifo_file { getattr read write ioctl lock }; ++allow amanda_t self:fifo_file rw_fifo_file_perms; + allow amanda_t self:unix_stream_socket create_stream_socket_perms; + allow amanda_t self:unix_dgram_socket create_socket_perms; + allow amanda_t self:tcp_socket create_stream_socket_perms; +@@ -85,18 +85,22 @@ + + # access to amandas data structure + allow amanda_t amanda_data_t:dir { read search write }; +-allow amanda_t amanda_data_t:file { read write }; ++allow amanda_t amanda_data_t:file manage_file_perms; + + # access to amanda_dumpdates_t + allow amanda_t amanda_dumpdates_t:file { getattr lock read write }; + + can_exec(amanda_t,amanda_exec_t) ++can_exec(amanda_t,amanda_inetd_exec_t) + + # access to amanda_gnutarlists_t (/var/lib/amanda/gnutar-lists) + allow amanda_t amanda_gnutarlists_t:dir rw_dir_perms; + allow amanda_t amanda_gnutarlists_t:file manage_file_perms; + allow amanda_t amanda_gnutarlists_t:lnk_file manage_file_perms; + ++manage_dirs_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t) ++manage_files_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t) ++ + manage_files_pattern(amanda_t,amanda_log_t,amanda_log_t) + manage_dirs_pattern(amanda_t,amanda_log_t,amanda_log_t) + logging_log_filetrans(amanda_t,amanda_log_t,{ file dir }) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-3.0.1/policy/modules/admin/amtu.fc +--- nsaserefpolicy/policy/modules/admin/amtu.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/admin/amtu.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,3 @@ ++ ++/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-3.0.1/policy/modules/admin/amtu.if +--- nsaserefpolicy/policy/modules/admin/amtu.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/admin/amtu.if 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,53 @@ ++## ++## abstract Machine Test Utility ++## ++ ++######################################## ++## ++## Execute amtu in the amtu domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`amtu_domtrans',` ++ gen_require(` ++ type amtu_t, amtu_exec_t; ++ ') ++ ++ corecmd_search_bin($1) ++ domtrans_pattern($1,amtu_exec_t,amtu_t) ++') ++ ++######################################## ++## ++## Execute amtu in the amtu domain, and ++## allow the specified role the amtu domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++## ++## ++## The role to be allowed the amtu domain. ++## ++## ++## ++## ++## The type of the terminal allow the amtu domain to use. ++## ++## ++# ++interface(`amtu_run',` ++ gen_require(` ++ type amtu_t; ++ ') ++ ++ amtu_domtrans($1) ++ role $2 types amtu_t; ++ allow amtu_t $3:chr_file rw_term_perms; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-3.0.1/policy/modules/admin/amtu.te +--- nsaserefpolicy/policy/modules/admin/amtu.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/admin/amtu.te 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,57 @@ ++policy_module(amtu,1.0.23) ++ ++######################################## ++# ++# Declarations ++# ++ ++type amtu_t; ++type amtu_exec_t; ++domain_type(amtu_t) ++domain_entry_file(amtu_t, amtu_exec_t) ++ ++######################################## ++# ++# amtu local policy ++# ++ ++# Specific allow rules required for amtu ++allow amtu_t self:capability net_raw; ++allow amtu_t self:packet_socket { bind create read write }; ++allow amtu_t self:udp_socket { create ioctl }; ++ ++files_manage_boot_files(amtu_t) ++files_read_etc_runtime_files(amtu_t) ++files_read_etc_files(amtu_t) ++ ++kernel_read_system_state(amtu_t) ++ ++libs_use_ld_so(amtu_t) ++libs_use_shared_libs(amtu_t) ++ ++logging_send_audit_msg(amtu_t) ++ ++optional_policy(` ++ seutil_use_newrole_fds(amtu_t) ++'); ++ ++optional_policy(` ++ userdom_use_sysadm_fds(amtu_t) ++'); ++ ++optional_policy(` ++ userdom_sigchld_sysadm(amtu_t) ++'); ++ ++optional_policy(` ++ nscd_dontaudit_search_pid(amtu_t) ++'); ++ ++optional_policy(` ++ kernel_dontaudit_read_system_state(amtu_t) ++'); ++ ++optional_policy(` ++ term_dontaudit_search_ptys(amtu_t) ++'); ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-3.0.1/policy/modules/admin/bootloader.te +--- nsaserefpolicy/policy/modules/admin/bootloader.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/bootloader.te 2007-05-30 15:12:50.000000000 -0400 +@@ -182,6 +182,7 @@ + + optional_policy(` + hal_dontaudit_append_lib_files(bootloader_t) ++ hal_write_log(bootloader_t) + ') + + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.0.1/policy/modules/admin/consoletype.te +--- nsaserefpolicy/policy/modules/admin/consoletype.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/consoletype.te 2007-05-30 15:12:50.000000000 -0400 +@@ -8,12 +8,21 @@ + + type consoletype_t; + type consoletype_exec_t; +-init_domain(consoletype_t,consoletype_exec_t) +-init_system_domain(consoletype_t,consoletype_exec_t) ++#dont transition from initrc ++#init_domain(consoletype_t,consoletype_exec_t) ++domain_type(consoletype_t) ++domain_entry_file(consoletype_t,consoletype_exec_t) ++role system_r types consoletype_t; ++ + mls_file_read_up(consoletype_t) + mls_file_write_down(consoletype_t) + role system_r types consoletype_t; + ++ifdef(`targeted_policy',`',` ++ init_system_domain(consoletype_t,consoletype_exec_t) ++') ++application_executable_file(consoletype_exec_t) ++ + ######################################## + # + # Local declarations +@@ -46,7 +55,7 @@ + init_use_fds(consoletype_t) + init_use_script_ptys(consoletype_t) + init_use_script_fds(consoletype_t) +-init_write_script_pipes(consoletype_t) ++init_rw_script_pipes(consoletype_t) + + domain_use_interactive_fds(consoletype_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-3.0.1/policy/modules/admin/kudzu.te +--- nsaserefpolicy/policy/modules/admin/kudzu.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/kudzu.te 2007-05-30 15:12:50.000000000 -0400 +@@ -21,8 +21,8 @@ + # Local policy + # + +-allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod }; +-dontaudit kudzu_t self:capability { sys_ptrace sys_tty_config }; ++allow kudzu_t self:capability { dac_override sys_admin sys_ptrace sys_rawio net_admin sys_tty_config mknod }; ++dontaudit kudzu_t self:capability sys_tty_config; + allow kudzu_t self:process { signal_perms execmem }; + allow kudzu_t self:fifo_file rw_fifo_file_perms; + allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms }; +@@ -103,6 +103,8 @@ + init_use_fds(kudzu_t) + init_use_script_ptys(kudzu_t) + init_stream_connect_script(kudzu_t) ++init_read_init_state(kudzu_t) ++init_ptrace_init_domain(kudzu_t) + # kudzu will telinit to make init re-read + # the inittab after configuring serial consoles + init_telinit(kudzu_t) +@@ -141,15 +143,6 @@ + udev_read_db(kudzu_t) + ') + +-optional_policy(` +- # cjp: this was originally in the else block +- # of ifdef userhelper.te, but it seems to +- # make more sense here. also, require +- # blocks curently do not work in the +- # else block of optionals +- unconfined_domain(kudzu_t) +-') +- + ifdef(`TODO',` + allow kudzu_t modules_conf_t:file unlink; + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.0.1/policy/modules/admin/logrotate.te +--- nsaserefpolicy/policy/modules/admin/logrotate.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/logrotate.te 2007-05-30 15:12:50.000000000 -0400 +@@ -75,6 +75,7 @@ + mls_file_read_up(logrotate_t) + mls_file_write_down(logrotate_t) + mls_file_upgrade(logrotate_t) ++mls_process_write_down(logrotate_t) + + selinux_get_fs_mount(logrotate_t) + selinux_get_enforce_mode(logrotate_t) +@@ -193,10 +194,6 @@ + squid_domtrans(logrotate_t) + ') + +-optional_policy(` +- unconfined_domain(logrotate_t) +-') +- + ifdef(`TODO',` + # it should not require this + allow logrotate_t {staff_home_dir_t sysadm_home_dir_t}:dir { getattr read search }; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.0.1/policy/modules/admin/logwatch.te +--- nsaserefpolicy/policy/modules/admin/logwatch.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/logwatch.te 2007-05-30 15:12:50.000000000 -0400 +@@ -63,6 +63,8 @@ + files_search_mnt(logwatch_t) + files_dontaudit_search_home(logwatch_t) + files_dontaudit_search_boot(logwatch_t) ++# Execs df and if file system mounted with a context avc raised ++files_dontaudit_search_all_dirs(logwatch_t) + + fs_getattr_all_fs(logwatch_t) + fs_dontaudit_list_auto_mountpoints(logwatch_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.0.1/policy/modules/admin/netutils.te +--- nsaserefpolicy/policy/modules/admin/netutils.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/netutils.te 2007-05-30 15:12:50.000000000 -0400 +@@ -29,6 +29,7 @@ + type traceroute_t; + type traceroute_exec_t; + init_system_domain(traceroute_t,traceroute_exec_t) ++application_executable_file(traceroute_exec_t) + role system_r types traceroute_t; + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.0.1/policy/modules/admin/prelink.te +--- nsaserefpolicy/policy/modules/admin/prelink.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/prelink.te 2007-05-30 15:12:50.000000000 -0400 +@@ -26,7 +26,7 @@ + # Local policy + # + +-allow prelink_t self:capability { chown dac_override fowner fsetid }; ++allow prelink_t self:capability { chown dac_override fowner fsetid sys_resource }; + allow prelink_t self:process { execheap execmem execstack signal }; + allow prelink_t self:fifo_file rw_fifo_file_perms; + +@@ -65,6 +65,7 @@ + files_read_etc_files(prelink_t) + files_read_etc_runtime_files(prelink_t) + files_dontaudit_read_all_symlinks(prelink_t) ++files_manage_usr_files(prelink_t) + + fs_getattr_xattr_fs(prelink_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.0.1/policy/modules/admin/readahead.te +--- nsaserefpolicy/policy/modules/admin/readahead.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/readahead.te 2007-05-30 15:12:50.000000000 -0400 +@@ -18,7 +18,8 @@ + # Local policy + # + +-dontaudit readahead_t self:capability { dac_override dac_read_search sys_tty_config }; ++allow readahead_t self:capability { dac_override dac_read_search }; ++dontaudit readahead_t self:capability sys_tty_config; + allow readahead_t self:process signal_perms; + + manage_files_pattern(readahead_t,readahead_var_run_t,readahead_var_run_t) +@@ -36,7 +37,7 @@ + dev_dontaudit_read_all_blk_files(readahead_t) + dev_dontaudit_getattr_memory_dev(readahead_t) + dev_dontaudit_getattr_nvram_dev(readahead_t) +-storage_dontaudit_getattr_fixed_disk_dev(readahead_t) ++storage_raw_read_fixed_disk(readahead_t) + + domain_use_interactive_fds(readahead_t) + +@@ -76,3 +77,7 @@ + optional_policy(` + seutil_sigchld_newrole(readahead_t) + ') ++ ++optional_policy(` ++ logging_dontaudit_search_audit_config(readahead_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.0.1/policy/modules/admin/rpm.fc +--- nsaserefpolicy/policy/modules/admin/rpm.fc 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/rpm.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -21,6 +21,9 @@ + /usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0) + /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0) + /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/usr/sbin/synaptic -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/usr/bin/apt-get -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/usr/bin/apt-shell -- gen_context(system_u:object_r:rpm_exec_t,s0) + ') + + /var/lib/alternatives(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.0.1/policy/modules/admin/rpm.if +--- nsaserefpolicy/policy/modules/admin/rpm.if 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/rpm.if 2007-05-30 15:12:50.000000000 -0400 +@@ -224,8 +224,29 @@ + type rpm_script_tmp_t; + ') + +- files_search_tmp($1) ++ manage_dirs_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) + manage_files_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) ++ manage_lnk_files_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) ++') ++ ++######################################## ++## ++## read, RPM ++## script temporary files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rpm_read_script_tmp_files',` ++ gen_require(` ++ type rpm_script_tmp_t; ++ ') ++ ++ read_files_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) ++ read_lnk_files_pattern($1,rpm_script_tmp_t,rpm_script_tmp_t) + ') + + ######################################## +@@ -289,3 +310,46 @@ + dontaudit $1 rpm_var_lib_t:file manage_file_perms; + dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms; + ') ++ ++ ++######################################## ++## ++## Allow application to transition to rpm_script domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rpm_transition_script',` ++ gen_require(` ++ type rpm_script_t; ++ ') ++ ++ allow $1 rpm_script_t:process transition; ++ ++ allow $1 rpm_script_t:fd use; ++ allow rpm_script_t $1:fd use; ++ allow rpm_script_t $1:fifo_file rw_fifo_file_perms; ++ allow rpm_script_t $1:process sigchld; ++') ++ ++######################################## ++## ++## Do not audit attempts to read, ++## write RPM tmp files ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`rpm_dontaudit_rw_tmp_files',` ++ gen_require(` ++ type rpm_tmp_t; ++ ') ++ ++ dontaudit $1 rpm_tmp_t:file rw_file_perms; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.0.1/policy/modules/admin/rpm.te +--- nsaserefpolicy/policy/modules/admin/rpm.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/rpm.te 2007-05-30 15:12:50.000000000 -0400 +@@ -9,6 +9,8 @@ + type rpm_t; + type rpm_exec_t; + init_system_domain(rpm_t,rpm_exec_t) ++application_executable_file(rpm_exec_t) ++ + domain_obj_id_change_exemption(rpm_t) + domain_role_change_exemption(rpm_t) + domain_system_change_exemption(rpm_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.0.1/policy/modules/admin/sudo.if +--- nsaserefpolicy/policy/modules/admin/sudo.if 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/sudo.if 2007-05-30 15:12:50.000000000 -0400 +@@ -69,7 +69,6 @@ + allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms; + allow $1_sudo_t self:unix_dgram_socket sendto; + allow $1_sudo_t self:unix_stream_socket connectto; +- allow $1_sudo_t self:netlink_audit_socket { create bind write nlmsg_read read }; + allow $1_sudo_t self:netlink_route_socket r_netlink_socket_perms; + + # Enter this derived domain from the user domain +@@ -77,6 +76,7 @@ + + # By default, revert to the calling domain when a shell is executed. + corecmd_shell_domtrans($1_sudo_t,$2) ++ corecmd_bin_domtrans($1_sudo_t,$2) + allow $2 $1_sudo_t:fd use; + allow $2 $1_sudo_t:fifo_file rw_file_perms; + allow $2 $1_sudo_t:process sigchld; +@@ -91,8 +91,10 @@ + fs_getattr_xattr_fs($1_sudo_t) + + auth_domtrans_chk_passwd($1_sudo_t) ++ auth_domtrans_upd_passwd($1_sudo_t) + # sudo stores a token in the pam_pid directory + auth_manage_pam_pid($1_sudo_t) ++ auth_search_key($1_sudo_t) + + corecmd_read_bin_symlinks($1_sudo_t) + corecmd_getattr_all_executables($1_sudo_t) +@@ -114,6 +116,7 @@ + libs_use_shared_libs($1_sudo_t) + + logging_send_syslog_msg($1_sudo_t) ++ logging_send_audit_msg($1_sudo_t) + + miscfiles_read_localization($1_sudo_t) + +@@ -127,6 +130,10 @@ + userdom_dontaudit_search_all_users_home_content($1_sudo_t) + + optional_policy(` ++ locallogin_search_keys($1_sudo_t) ++ ') ++ ++ optional_policy(` + nis_use_ypbind($1_sudo_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.0.1/policy/modules/admin/su.if +--- nsaserefpolicy/policy/modules/admin/su.if 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/su.if 2007-05-30 15:12:50.000000000 -0400 +@@ -41,12 +41,11 @@ + + allow $2 $1_su_t:process signal; + +- allow $1_su_t self:capability { audit_control audit_write setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; ++ allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; + dontaudit $1_su_t self:capability sys_tty_config; + allow $1_su_t self:key { search write }; + allow $1_su_t self:process { setexec setsched setrlimit }; + allow $1_su_t self:fifo_file rw_fifo_file_perms; +- allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; + allow $1_su_t self:unix_stream_socket create_stream_socket_perms; + + # Transition from the user domain to this domain. +@@ -75,6 +74,7 @@ + selinux_compute_access_vector($1_su_t) + + auth_domtrans_chk_passwd($1_su_t) ++ auth_domtrans_upd_passwd($1_su_t) + auth_dontaudit_read_shadow($1_su_t) + auth_use_nsswitch($1_su_t) + auth_rw_faillog($1_su_t) +@@ -89,6 +89,7 @@ + libs_use_ld_so($1_su_t) + libs_use_shared_libs($1_su_t) + ++ logging_send_audit_msg($1_su_t) + logging_send_syslog_msg($1_su_t) + + miscfiles_read_localization($1_su_t) +@@ -174,11 +175,10 @@ + + allow $2 $1_su_t:process signal; + +- allow $1_su_t self:capability { audit_control audit_write setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; ++ allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; + dontaudit $1_su_t self:capability sys_tty_config; + allow $1_su_t self:process { setexec setsched setrlimit }; + allow $1_su_t self:fifo_file rw_fifo_file_perms; +- allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; + allow $1_su_t self:key { search write }; + + # Transition from the user domain to this domain. +@@ -204,9 +204,11 @@ + selinux_compute_access_vector($1_su_t) + + auth_domtrans_user_chk_passwd($1,$1_su_t) ++ auth_domtrans_upd_passwd($1_su_t) + auth_dontaudit_read_shadow($1_su_t) + auth_use_nsswitch($1_su_t) +- auth_rw_faillog($1_su_t) ++ auth_keyring_domain($1_su_t) ++ auth_search_key($1_su_t) + + corecmd_search_bin($1_su_t) + +@@ -227,6 +229,7 @@ + libs_use_shared_libs($1_su_t) + + logging_send_syslog_msg($1_su_t) ++ logging_send_audit_msg($1_su_t) + + miscfiles_read_localization($1_su_t) + +@@ -270,19 +273,6 @@ + ') + ') + +-# ifdef(`targeted_policy',` +-# # allow user to suspend terminal. +-# # does not work in strict since the +-# # parent may not be able to use +-# # the terminal if we newrole, +-# # which relabels the terminal. +-# allow $1_su_t self:process sigstop; +-# +-# corecmd_exec_bin($1_su_t) +-# userdom_manage_all_users_home_content_files($1_su_t) +-# userdom_manage_all_users_home_content_symlinks($1_su_t) +-# ') +- + tunable_policy(`allow_polyinstantiation',` + fs_mount_xattr_fs($1_su_t) + fs_unmount_xattr_fs($1_su_t) +@@ -310,6 +300,8 @@ + xserver_domtrans_user_xauth($1, $1_su_t) + ') + ++ userdom_search_all_users_home_dirs($1_su_t) ++ + ifdef(`TODO',` + allow $1_su_t $1_home_t:file manage_file_perms; + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.0.1/policy/modules/admin/usermanage.if +--- nsaserefpolicy/policy/modules/admin/usermanage.if 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/usermanage.if 2007-05-30 15:12:50.000000000 -0400 +@@ -278,5 +278,5 @@ + type crack_db_t; + ') + +- allow $1 crack_db_t:file read_file_perms; ++ read_files_pattern($1,crack_db_t,crack_db_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.0.1/policy/modules/admin/usermanage.te +--- nsaserefpolicy/policy/modules/admin/usermanage.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/usermanage.te 2007-05-30 15:12:50.000000000 -0400 +@@ -198,7 +198,6 @@ + allow groupadd_t self:unix_stream_socket create_stream_socket_perms; + allow groupadd_t self:unix_dgram_socket sendto; + allow groupadd_t self:unix_stream_socket connectto; +-allow groupadd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; + + fs_getattr_xattr_fs(groupadd_t) + fs_search_auto_mountpoints(groupadd_t) +@@ -231,6 +230,7 @@ + corecmd_exec_bin(groupadd_t) + + logging_send_syslog_msg(groupadd_t) ++logging_send_audit_msg(groupadd_t) + + miscfiles_read_localization(groupadd_t) + +@@ -252,8 +252,13 @@ + ') + + optional_policy(` ++ nscd_domtrans(groupadd_t) ++') ++ ++optional_policy(` + rpm_use_fds(groupadd_t) + rpm_rw_pipes(groupadd_t) ++ rpm_dontaudit_rw_tmp_files(groupadd_t) + ') + + ######################################## +@@ -261,7 +266,7 @@ + # Passwd local policy + # + +-allow passwd_t self:capability { chown dac_override fsetid setuid setgid sys_resource audit_control audit_write }; ++allow passwd_t self:capability { chown dac_override fsetid setuid setgid sys_resource }; + allow passwd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; + allow passwd_t self:process { setrlimit setfscreate }; + allow passwd_t self:fd use; +@@ -271,7 +276,6 @@ + allow passwd_t self:unix_stream_socket create_stream_socket_perms; + allow passwd_t self:unix_dgram_socket sendto; + allow passwd_t self:unix_stream_socket connectto; +-allow passwd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; + allow passwd_t self:shm create_shm_perms; + allow passwd_t self:sem create_sem_perms; + allow passwd_t self:msgq create_msgq_perms; +@@ -324,6 +328,7 @@ + libs_use_shared_libs(passwd_t) + + logging_send_syslog_msg(passwd_t) ++logging_send_audit_msg(passwd_t) + + miscfiles_read_localization(passwd_t) + +@@ -343,6 +348,7 @@ + + optional_policy(` + nscd_socket_use(passwd_t) ++ nscd_domtrans(passwd_t) + ') + + ######################################## +@@ -433,6 +439,7 @@ + + optional_policy(` + nscd_socket_use(sysadm_passwd_t) ++ nscd_domtrans(sysadm_passwd_t) + ') + + ######################################## +@@ -440,7 +447,7 @@ + # Useradd local policy + # + +-allow useradd_t self:capability { dac_override chown kill fowner fsetid setuid sys_resource audit_write }; ++allow useradd_t self:capability { dac_override chown kill fowner fsetid setuid sys_resource }; + dontaudit useradd_t self:capability sys_tty_config; + allow useradd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; + allow useradd_t self:process setfscreate; +@@ -454,7 +461,6 @@ + allow useradd_t self:unix_stream_socket create_stream_socket_perms; + allow useradd_t self:unix_dgram_socket sendto; + allow useradd_t self:unix_stream_socket connectto; +-allow useradd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; + + # for getting the number of groups + kernel_read_kernel_sysctls(useradd_t) +@@ -500,6 +506,7 @@ + libs_use_shared_libs(useradd_t) + + logging_send_syslog_msg(useradd_t) ++logging_send_audit_msg(useradd_t) + + miscfiles_read_localization(useradd_t) + +@@ -508,6 +515,9 @@ + seutil_read_default_contexts(useradd_t) + seutil_domtrans_semanage(useradd_t) + seutil_domtrans_setfiles(useradd_t) ++# Required because semanage execs these and hands them useradd_t:fd ++seutil_domtrans_setfiles(useradd_t) ++seutil_domtrans_loadpolicy(useradd_t) + + userdom_use_unpriv_users_fds(useradd_t) + # for when /root is the cwd +@@ -521,11 +531,26 @@ + mta_manage_spool(useradd_t) + + optional_policy(` ++ apache_manage_all_content(useradd_t) ++') ++ ++optional_policy(` + dpkg_use_fds(useradd_t) + dpkg_rw_pipes(useradd_t) + ') + + optional_policy(` ++ nscd_domtrans(useradd_t) ++') ++ ++optional_policy(` ++ tunable_policy(`samba_domain_controller',` ++ samba_append_log(useradd_t) ++ ') ++') ++ ++optional_policy(` + rpm_use_fds(useradd_t) + rpm_rw_pipes(useradd_t) ++ rpm_dontaudit_rw_tmp_files(useradd_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.0.1/policy/modules/admin/vbetool.te +--- nsaserefpolicy/policy/modules/admin/vbetool.te 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/admin/vbetool.te 2007-05-30 15:12:50.000000000 -0400 +@@ -32,4 +32,5 @@ + + optional_policy(` + hal_rw_pid_files(vbetool_t) ++ hal_write_log(vbetool_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.0.1/policy/modules/apps/gnome.if +--- nsaserefpolicy/policy/modules/apps/gnome.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/apps/gnome.if 2007-05-30 15:12:50.000000000 -0400 +@@ -35,6 +35,7 @@ + template(`gnome_per_role_template',` + gen_require(` + type gconfd_exec_t; ++ type gconf_etc_t; + attribute gnomedomain; + ') + +@@ -102,6 +103,11 @@ + + optional_policy(` + nscd_dontaudit_search_pid($1_gconfd_t) ++ nscd_socket_use($1_gconfd_t) ++ ') ++ ++ optional_policy(` ++ ssh_dontaudit_use_user_ssh_agent_fds($1,$1_gconfd_t) + ') + + optional_policy(` +@@ -136,13 +142,32 @@ + allow $2 $1_gconfd_t:unix_stream_socket connectto; + ') + ++ ++######################################## ++## ++## Send general signals to all gconf domains. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`gnome_signal_all',` ++ gen_require(` ++ attribute gnomedomain; ++ ') ++ ++ allow $1 gnomedomain:process signal; ++') ++ + ######################################## + ## + ## Run gconfd in the role-specific gconfd domain. + ## + ## + ##

+-## Run gconfd in the role-specfic gconfd domain. ++## Run gconfd in the role-specific gconfd domain. + ##

+ ##

+ ## This is a templated interface, and should only +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.1/policy/modules/apps/java.if +--- nsaserefpolicy/policy/modules/apps/java.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/apps/java.if 2007-05-30 15:12:50.000000000 -0400 +@@ -220,3 +220,35 @@ + corecmd_search_bin($1) + domtrans_pattern($1, java_exec_t, java_t) + ') ++ ++######################################## ++##

++## Execute a java in the specified domain ++## ++## ++##

++## Execute the java command in the specified domain. This allows ++## the specified domain to execute any file ++## on these filesystems in the specified ++## domain. ++##

++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The type of the new process. ++## ++## ++# ++interface(`java_spec_domtrans',` ++ gen_require(` ++ type java_exec_t; ++ ') ++ ++ domain_trans($1,java_exec_t,$2) ++ type_transition $1 java_exec_t:process $2; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.1/policy/modules/apps/mono.if +--- nsaserefpolicy/policy/modules/apps/mono.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/apps/mono.if 2007-05-31 06:59:56.000000000 -0400 +@@ -18,3 +18,21 @@ + corecmd_search_bin($1) + domtrans_pattern($1, mono_exec_t, mono_t) + ') ++ ++######################################## ++## ++## Read and write to mono shared memory. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`mono_rw_shm',` ++ gen_require(` ++ type mono_t; ++ ') ++ ++ allow $1 mono_t:shm rw_shm_perms; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.0.1/policy/modules/apps/mozilla.if +--- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/apps/mozilla.if 2007-05-30 15:12:50.000000000 -0400 +@@ -150,6 +150,7 @@ + corenet_dontaudit_tcp_bind_generic_port($1_mozilla_t) + + dev_read_urand($1_mozilla_t) ++ dev_read_rand($1_mozilla_t) + dev_write_sound($1_mozilla_t) + dev_read_sound($1_mozilla_t) + dev_dontaudit_rw_dri($1_mozilla_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.te serefpolicy-3.0.1/policy/modules/apps/mplayer.te +--- nsaserefpolicy/policy/modules/apps/mplayer.te 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/apps/mplayer.te 2007-05-30 15:12:50.000000000 -0400 +@@ -22,7 +22,3 @@ + type mplayer_exec_t; + corecmd_executable_file(mplayer_exec_t) + +-#ifdef(`targeted_policy',` +-# unconfined_execmem_alias_program(mencoder_exec_t) +-# unconfined_execmem_alias_program(mplayer_exec_t) +-#') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-3.0.1/policy/modules/apps/slocate.te +--- nsaserefpolicy/policy/modules/apps/slocate.te 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/apps/slocate.te 2007-05-30 15:12:50.000000000 -0400 +@@ -39,11 +39,13 @@ + + files_list_all(locate_t) + files_getattr_all_files(locate_t) ++files_getattr_all_sockets(locate_t) + files_read_etc_runtime_files(locate_t) + files_read_etc_files(locate_t) + + fs_getattr_all_fs(locate_t) +-fs_getattr_all_dirs(locate_t) ++fs_getattr_all_files(locate_t) ++fs_list_all(locate_t) + + libs_use_shared_libs(locate_t) + libs_use_ld_so(locate_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.if serefpolicy-3.0.1/policy/modules/apps/uml.if +--- nsaserefpolicy/policy/modules/apps/uml.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/apps/uml.if 2007-05-30 15:12:50.000000000 -0400 +@@ -193,33 +193,6 @@ + nis_use_ypbind($1_uml_t) + ') + +- ifdef(`TODO',` +- # for X +- optional_policy(` +- ifelse($1, sysadm,` +- ',` +- optional_policy(` +- allow $1_uml_t xdm_xserver_tmp_t:dir search; +- ') +- allow $1_uml_t $1_xserver_tmp_t:sock_file write; +- allow $1_uml_t $1_xserver_t:unix_stream_socket connectto; +- ') +- ') +- +- optional_policy(` +- # for uml_net +- domain_auto_trans($1_uml_t, uml_net_exec_t, uml_net_t) +- allow uml_net_t $1_uml_t:unix_stream_socket { read write }; +- allow uml_net_t $1_uml_t:unix_dgram_socket { read write }; +- dontaudit uml_net_t privfd:fd use; +- can_access_pty(uml_net_t, $1_uml) +- dontaudit uml_net_t $1_uml_rw_t:dir { getattr search }; +- ') +- #TODO +- optional_policy(` +- allow $1_uml_t $1_xauth_home_t:file { getattr read }; +- ') +- ') + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.1/policy/modules/kernel/corecommands.fc +--- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/corecommands.fc 2007-05-30 16:20:21.000000000 -0400 +@@ -36,6 +36,11 @@ + /etc/cipe/ip-up.* -- gen_context(system_u:object_r:bin_t,s0) + /etc/cipe/ip-down.* -- gen_context(system_u:object_r:bin_t,s0) + ++/etc/cron.daily/.* -- gen_context(system_u:object_r:bin_t,s0) ++/etc/cron.hourly/.* -- gen_context(system_u:object_r:bin_t,s0) ++/etc/cron.weekly/.* -- gen_context(system_u:object_r:bin_t,s0) ++/etc/cron.monthly/.* -- gen_context(system_u:object_r:bin_t,s0) ++ + /etc/hotplug/.*agent -- gen_context(system_u:object_r:bin_t,s0) + /etc/hotplug/.*rc -- gen_context(system_u:object_r:bin_t,s0) + /etc/hotplug/hotplug\.functions -- gen_context(system_u:object_r:bin_t,s0) +@@ -244,6 +249,7 @@ + /var/ftp/bin(/.*)? gen_context(system_u:object_r:bin_t,s0) + + /usr/lib/yp/.+ -- gen_context(system_u:object_r:bin_t,s0) ++/usr/lib64/yp/.+ -- gen_context(system_u:object_r:bin_t,s0) + + /var/qmail/bin -d gen_context(system_u:object_r:bin_t,s0) + /var/qmail/bin(/.*)? gen_context(system_u:object_r:bin_t,s0) +@@ -252,3 +258,5 @@ + ifdef(`distro_suse',` + /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) + ') ++/usr/lib/vmware-tools/sbin32(/.*)? gen_context(system_u:object_r:bin_t,s0) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.0.1/policy/modules/kernel/corecommands.if +--- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/corecommands.if 2007-05-30 15:12:50.000000000 -0400 +@@ -980,3 +980,23 @@ + + mmap_files_pattern($1,bin_t,exec_type) + ') ++ ++######################################## ++## ++## dontaudit checking for execute privs on all executables ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`corecmd_dontaudit_exec_all_executables',` ++ gen_require(` ++ attribute exec_type; ++ ') ++ ++ dontaudit $1 exec_type:file execute; ++') ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.1/policy/modules/kernel/corenetwork.te.in +--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2007-05-30 11:47:28.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/corenetwork.te.in 2007-05-31 14:35:16.000000000 -0400 +@@ -48,6 +48,11 @@ + type reserved_port_t, port_type, reserved_port_type; + + # ++# hi_reserved_port_t is the type of INET port numbers between 600-1023. ++# ++type hi_reserved_port_t, port_type, reserved_port_type, rpc_port_type; ++ ++# + # server_packet_t is the default type of IPv4 and IPv6 server packets. + # + type server_packet_t, packet_type, server_packet_type; +@@ -86,10 +91,10 @@ + network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy + network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0, tcp,8443,s0) #8443 is mod_nss default port + network_port(howl, tcp,5335,s0, udp,5353,s0) +-network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp,50000,s0, tcp,50002,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0) ++network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp, 8290,s0, tcp,50000,s0, tcp,50002,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0) + network_port(i18n_input, tcp,9010,s0) + network_port(imaze, tcp,5323,s0, udp,5323,s0) +-network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0) ++network_port(inetd_child, tcp,1,s0, udp,1,s0, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0) + network_port(innd, tcp,119,s0) + network_port(ipp, tcp,631,s0, udp,631,s0) + network_port(ircd, tcp,6667,s0) +@@ -101,7 +106,7 @@ + network_port(kerberos_master, tcp,4444,s0, udp,4444,s0) + network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0) + network_port(ktalkd, udp,517,s0, udp,518,s0) +-network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0) ++network_port(ldap, tcp,3268,s0, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0) + type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon + network_port(lmtp, tcp,24,s0, udp,24,s0) + network_port(mail, tcp,2000,s0) +@@ -160,6 +165,9 @@ + + # Defaults for reserved ports. Earlier portcon entries take precedence; + # these entries just cover any remaining reserved ports not otherwise declared. ++ ++portcon tcp 600-1023 gen_context(system_u:object_r:hi_reserved_port_t, s0) ++portcon udp 600-1023 gen_context(system_u:object_r:hi_reserved_port_t, s0) + portcon tcp 1-1023 gen_context(system_u:object_r:reserved_port_t, s0) + portcon udp 1-1023 gen_context(system_u:object_r:reserved_port_t, s0) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.0.1/policy/modules/kernel/devices.fc +--- nsaserefpolicy/policy/modules/kernel/devices.fc 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/devices.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -19,6 +19,7 @@ + /dev/evtchn -c gen_context(system_u:object_r:xen_device_t,s0) + /dev/fb[0-9]* -c gen_context(system_u:object_r:framebuf_device_t,s0) + /dev/full -c gen_context(system_u:object_r:null_device_t,s0) ++/dev/fw.* -c gen_context(system_u:object_r:usb_device_t,s0) + /dev/hiddev.* -c gen_context(system_u:object_r:usb_device_t,s0) + /dev/hpet -c gen_context(system_u:object_r:clock_device_t,s0) + /dev/hw_random -c gen_context(system_u:object_r:random_device_t,s0) +@@ -81,6 +82,8 @@ + + /dev/bus/usb/.*/[0-9]+ -c gen_context(system_u:object_r:usb_device_t,s0) + ++/dev/cmx.* -c gen_context(system_u:object_r:smartcard_device_t,s0) ++ + /dev/cpu/.* -c gen_context(system_u:object_r:cpu_device_t,s0) + /dev/cpu/mtrr -c gen_context(system_u:object_r:mtrr_device_t,s0) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.0.1/policy/modules/kernel/devices.if +--- nsaserefpolicy/policy/modules/kernel/devices.if 2007-05-30 11:47:28.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/devices.if 2007-05-30 15:12:50.000000000 -0400 +@@ -2729,6 +2729,24 @@ + + ######################################## + ## ++## Get the attributes of a directory in the usb filesystem. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_search_usbfs_dirs',` ++ gen_require(` ++ type usbfs_t; ++ ') ++ ++ allow $1 usbfs_t:dir search_dir_perms; ++') ++ ++######################################## ++## + ## Do not audit attempts to get the attributes + ## of a directory in the usb filesystem. + ## +@@ -3210,3 +3228,78 @@ + + typeattribute $1 devices_unconfined_type; + ') ++ ++######################################## ++## ++## Getattr on smartcard devices ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_getattr_smartcard',` ++ gen_require(` ++ type smartcard_device_t; ++ ') ++ ++ allow $1 smartcard_device_t:chr_file getattr; ++ ++') ++ ++######################################## ++## ++## dontaudit getattr on smartcard devices ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_dontaudit_getattr_smartcard',` ++ gen_require(` ++ type smartcard_device_t; ++ ') ++ ++ dontaudit $1 smartcard_device_t:chr_file getattr; ++ ++') ++ ++######################################## ++## ++## Read and write smartcard devices. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_rw_smartcard',` ++ gen_require(` ++ type device_t, smartcard_device_t; ++ ') ++ ++ rw_chr_files_pattern($1,device_t,smartcard_device_t) ++') ++ ++######################################## ++## ++## Create, read, write, and delete smartcard devices. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_manage_smartcard',` ++ gen_require(` ++ type device_t, smartcard_device_t; ++ ') ++ ++ manage_chr_files_pattern($1,device_t,smartcard_device_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.0.1/policy/modules/kernel/devices.te +--- nsaserefpolicy/policy/modules/kernel/devices.te 2007-05-30 11:47:28.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/devices.te 2007-05-30 15:12:50.000000000 -0400 +@@ -139,6 +139,12 @@ + # + # Type for sound devices and mixers + # ++type smartcard_device_t; ++dev_node(smartcard_device_t) ++ ++# ++# Type for sound devices and mixers ++# + type sound_device_t; + dev_node(sound_device_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.1/policy/modules/kernel/domain.if +--- nsaserefpolicy/policy/modules/kernel/domain.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/domain.if 2007-05-30 17:11:03.000000000 -0400 +@@ -45,6 +45,11 @@ + # start with basic domain + domain_base_type($1) + ++ optional_policy(` ++ unconfined_use_fds($1) ++ unconfined_sigchld($1) ++ ') ++ + # send init a sigchld and signull + optional_policy(` + init_sigchld($1) +@@ -1247,3 +1252,21 @@ + typeattribute $1 set_curr_context; + typeattribute $1 process_uncond_exempt; + ') ++ ++######################################## ++## ++## Allow specified type to associate ipsec packets from any domain ++## ++## ++## ++## Type of subject to be allowed this. ++## ++## ++# ++interface(`domain_ipsec_labels',` ++ gen_require(` ++ attribute domain; ++ ') ++ ++ allow $1 domain:association { sendto recvfrom }; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.0.1/policy/modules/kernel/domain.te +--- nsaserefpolicy/policy/modules/kernel/domain.te 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/domain.te 2007-05-30 15:12:50.000000000 -0400 +@@ -6,6 +6,29 @@ + # Declarations + # + ++ifdef(`enable_mls',` ++## ++##

++## Allow all domains to use netlabel labeled packets ++##

++## ++gen_tunable(allow_netlabel,true) ++ ++## ++##

++## Allow all domains to use ipsec labeled packets ++##

++## ++gen_tunable(allow_ipsec_label,true) ++') ++ ++## ++##

++## Allow unlabeled packets to work on system ++##

++## ++gen_tunable(allow_unlabeled_packets,true) ++ + # Mark process types as domains + attribute domain; + +@@ -130,3 +153,26 @@ + + # act on all domains keys + allow unconfined_domain_type domain:key *; ++ ++ ++# xdm passes an open file descriptor to xsession-errors.log which is then audited by all confined domains. ++optional_policy(` ++ xserver_dontaudit_use_xdm_fds(domain) ++ xserver_dontaudit_rw_xdm_pipes(domain) ++') ++ ++tunable_policy(`allow_unlabeled_packets',` ++ kernel_sendrecv_unlabeled_association(domain) ++ corenet_sendrecv_unlabeled_packets(domain) ++') ++ ++ifdef(`enable_mls',` ++ tunable_policy(`allow_netlabel',` ++ kernel_raw_recvfrom_unlabeled(domain) ++ kernel_tcp_recvfrom_unlabeled(domain) ++ kernel_udp_recvfrom_unlabeled(domain) ++ ') ++ tunable_policy(`allow_ipsec_label',` ++ ipsec_labeled(domain) ++ ') ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.0.1/policy/modules/kernel/files.fc +--- nsaserefpolicy/policy/modules/kernel/files.fc 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/files.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -45,7 +45,6 @@ + /etc -d gen_context(system_u:object_r:etc_t,s0) + /etc/.* gen_context(system_u:object_r:etc_t,s0) + /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) +-/etc/asound\.state -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/blkid(/.*)? gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/fstab\.REVOKE -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/HOSTNAME -- gen_context(system_u:object_r:etc_runtime_t,s0) +@@ -54,6 +53,7 @@ + /etc/issue\.net -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/localtime -l gen_context(system_u:object_r:etc_t,s0) + /etc/mtab -- gen_context(system_u:object_r:etc_runtime_t,s0) ++/etc/mtab\.fuselock -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/motd -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/nohotplug -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/nologin.* -- gen_context(system_u:object_r:etc_runtime_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.1/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/files.if 2007-05-30 15:12:50.000000000 -0400 +@@ -343,8 +343,7 @@ + + ######################################## + ## +-## Mount a filesystem on all non-security +-## directories and files. ++## Mount a filesystem on all non-security directories. + ## + ## + ## +@@ -352,12 +351,29 @@ + ## + ## + # +-interface(`files_mounton_non_security',` ++interface(`files_mounton_non_security_dir',` + gen_require(` + attribute file_type, security_file_type; + ') + + allow $1 { file_type -security_file_type }:dir mounton; ++') ++ ++######################################## ++## ++## Mount a filesystem on all non-security and files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`files_mounton_non_security_files',` ++ gen_require(` ++ attribute file_type, security_file_type; ++ ') ++ + allow $1 { file_type -security_file_type }:file mounton; + ') + +@@ -376,7 +392,7 @@ + attribute file_type, security_file_type; + ') + +- allow $1 { file_type -security_file_type }:dir write; ++ allow $1 { file_type -security_file_type }:dir rw_dir_perms; + ') + + ######################################## +@@ -987,7 +1003,7 @@ + attribute file_type; + ') + +- dontaudit $1 file_type:dir search; ++ dontaudit $1 file_type:dir search_dir_perms; + ') + + ######################################## +@@ -1315,7 +1331,7 @@ + type boot_t; + ') + +- dontaudit $1 boot_t:dir search; ++ dontaudit $1 boot_t:dir search_dir_perms; + ') + + ######################################## +@@ -3305,6 +3321,42 @@ + + ######################################## + ## ++## Add and remove entries from /usr directories. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`files_rw_usr_dirs',` ++ gen_require(` ++ type usr_t; ++ ') ++ ++ allow $1 usr_t:dir rw_dir_perms; ++') ++ ++######################################## ++## ++## Create, read, write, and delete files in the /usr directory. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`files_manage_usr_files',` ++ gen_require(` ++ type usr_t; ++ ') ++ ++ manage_files_pattern($1, usr_t, usr_t) ++') ++ ++######################################## ++## + ## Get the attributes of files in /usr. + ## + ## +@@ -3632,7 +3684,7 @@ + type var_t; + ') + +- dontaudit $1 var_t:dir search; ++ dontaudit $1 var_t:dir search_dir_perms; + ') + + ######################################## +@@ -3988,7 +4040,7 @@ + type var_lock_t; + ') + +- dontaudit $1 var_lock_t:dir search; ++ dontaudit $1 var_lock_t:dir search_dir_perms; + ') + + ######################################## +@@ -4007,7 +4059,7 @@ + type var_t, var_lock_t; + ') + +- rw_dirs_pattern($1,var_t,var_lock_t) ++ rw_files_pattern($1,var_t,var_lock_t) + ') + + ######################################## +@@ -4176,7 +4228,7 @@ + type var_run_t; + ') + +- dontaudit $1 var_run_t:dir search; ++ dontaudit $1 var_run_t:dir search_dir_perms; + ') + + ######################################## +@@ -4524,6 +4576,8 @@ + # Need to give access to /selinux/member + selinux_compute_member($1) + ++ files_search_home($1) ++ + # Need sys_admin capability for mounting + allow $1 self:capability { chown fsetid sys_admin }; + +@@ -4546,6 +4600,8 @@ + # Default type for mountpoints + allow $1 poly_t:dir { create mounton }; + fs_unmount_xattr_fs($1) ++ corecmd_exec_bin($1) ++ + ') + + ######################################## +@@ -4583,3 +4639,28 @@ + + allow $1 { file_type -security_file_type }:dir manage_dir_perms; + ') ++ ++######################################## ++## ++## Create a core files in / ++## ++## ++##

++## Create a core file in /, ++##

++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`files_dump_core',` ++ gen_require(` ++ type root_t; ++ ') ++ ++ allow $1 root_t:dir rw_dir_perms; ++ allow $1 root_t:file { create getattr write }; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.0.1/policy/modules/kernel/files.te +--- nsaserefpolicy/policy/modules/kernel/files.te 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/files.te 2007-05-30 15:12:50.000000000 -0400 +@@ -54,6 +54,7 @@ + files_type(etc_t) + # compatibility aliases for removed types: + typealias etc_t alias automount_etc_t; ++typealias etc_t alias snmpd_etc_t; + + # + # etc_runtime_t is the type of various +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.0.1/policy/modules/kernel/filesystem.if +--- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/filesystem.if 2007-05-31 11:04:05.000000000 -0400 +@@ -1096,6 +1096,24 @@ + + ######################################## + ## ++## Search dosfs filesystem. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fs_search_dos',` ++ gen_require(` ++ type dosfs_t; ++ ') ++ ++ allow $1 dosfs_t:dir search_dir_perms; ++') ++ ++######################################## ++## + ## Read files on a DOS filesystem. + ## + ## +@@ -1291,6 +1309,26 @@ + + ######################################## + ## ++## Read files on an iso9660 filesystem, which ++## is usually used on CDs. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fs_getattr_iso9660_files',` ++ gen_require(` ++ type iso9660_t; ++ ') ++ ++ allow $1 iso9660_t:dir list_dir_perms; ++ allow $1 iso9660_t:file getattr; ++') ++ ++######################################## ++## + ## Mount a NFS filesystem. + ## + ## +@@ -3420,3 +3458,22 @@ + relabelfrom_blk_files_pattern($1,noxattrfs,noxattrfs) + relabelfrom_chr_files_pattern($1,noxattrfs,noxattrfs) + ') ++ ++ ++######################################## ++## ++## Mount an fuse filesystem. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fs_mount_fusefs',` ++ gen_require(` ++ type fusefs_t; ++ ') ++ ++ allow $1 fusefs_t:filesystem mount; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.0.1/policy/modules/kernel/filesystem.te +--- nsaserefpolicy/policy/modules/kernel/filesystem.te 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/filesystem.te 2007-05-30 15:12:50.000000000 -0400 +@@ -54,17 +54,29 @@ + + type capifs_t; + fs_type(capifs_t) ++files_mountpoint(capifs_t) + genfscon capifs / gen_context(system_u:object_r:capifs_t,s0) + + type configfs_t; + fs_type(configfs_t) + genfscon configfs / gen_context(system_u:object_r:configfs_t,s0) + ++type cpusetfs_t; ++fs_type(cpusetfs_t) ++allow cpusetfs_t self:filesystem associate; ++genfscon cpuset / gen_context(system_u:object_r:cpusetfs_t,s0) ++ + type eventpollfs_t; + fs_type(eventpollfs_t) + # change to task SID 20060628 + #genfscon eventpollfs / gen_context(system_u:object_r:eventpollfs_t,s0) + ++type fusefs_t; ++fs_noxattr_type(fusefs_t) ++allow fusefs_t self:filesystem associate; ++genfscon fuse / gen_context(system_u:object_r:fusefs_t,s0) ++genfscon fuseblk / gen_context(system_u:object_r:fusefs_t,s0) ++ + type futexfs_t; + fs_type(futexfs_t) + genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0) +@@ -83,6 +95,11 @@ + fs_type(inotifyfs_t) + genfscon inotifyfs / gen_context(system_u:object_r:inotifyfs_t,s0) + ++type mvfs_t; ++fs_noxattr_type(mvfs_t) ++allow mvfs_t self:filesystem associate; ++genfscon mvfs / gen_context(system_u:object_r:mvfs_t,s0) ++ + type nfsd_fs_t; + fs_type(nfsd_fs_t) + genfscon nfsd / gen_context(system_u:object_r:nfsd_fs_t,s0) +@@ -105,6 +122,16 @@ + genfscon rpc_pipefs / gen_context(system_u:object_r:rpc_pipefs_t,s0) + files_mountpoint(rpc_pipefs_t) + ++type spufs_t; ++fs_type(spufs_t) ++genfscon spufs / gen_context(system_u:object_r:spufs_t,s0) ++files_mountpoint(spufs_t) ++ ++type vxfs_t; ++fs_noxattr_type(vxfs_t) ++files_mountpoint(vxfs_t) ++genfscon vxfs / gen_context(system_u:object_r:vxfs_t,s0) ++ + # + # tmpfs_t is the type for tmpfs filesystems + # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.0.1/policy/modules/kernel/kernel.if +--- nsaserefpolicy/policy/modules/kernel/kernel.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/kernel.if 2007-05-31 11:09:09.000000000 -0400 +@@ -661,22 +661,24 @@ + dontaudit $1 proc_t:dir list_dir_perms; + ') + ++ + ######################################## + ## +-## Get the attributes of files in /proc. ++## Do not audit attempts to list the ++## contents of directories in /proc. + ## + ## + ## +-## Domain allowed access. ++## Domain to not audit. + ## + ## + # +-interface(`kernel_getattr_proc_files',` ++interface(`kernel_dontaudit_list_proc',` + gen_require(` + type proc_t; + ') + +- getattr_files_pattern($1,proc_t,proc_t) ++ dontaudit $1 proc_t:dir list_dir_perms; + ') + + ######################################## +@@ -1122,6 +1124,24 @@ + + ######################################## + ## ++## Do not audit attempts to read all proc files ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`kernel_dontaudit_read_all_proc',` ++ gen_require(` ++ attribute proc_type; ++ ') ++ ++ dontaudit $1 proc_type:file r_file_perms; ++') ++ ++######################################## ++## + ## Do not audit attempts by caller to search + ## the base directory of sysctls. + ## +@@ -1848,6 +1868,26 @@ + + ######################################## + ## ++## Read the process state (/proc/pid) of all unlabeled_t. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`kernel_read_unlabeled_state',` ++ gen_require(` ++ type unlabeled_t; ++ ') ++ ++ allow $1 unlabeled_t:dir list_dir_perms; ++ read_files_pattern($1,unlabeled_t,unlabeled_t) ++ read_lnk_files_pattern($1,unlabeled_t,unlabeled_t) ++') ++ ++######################################## ++## + ## Do not audit attempts to list unlabeled directories. + ## + ## +@@ -2158,9 +2198,6 @@ + ') + + allow $1 unlabeled_t:association { sendto recvfrom }; +- +- # temporary hack until labeling on packets is supported +- allow $1 unlabeled_t:packet { send recv }; + ') + + ######################################## +@@ -2426,3 +2463,23 @@ + + typeattribute $1 kern_unconfined; + ') ++ ++ ++######################################## ++## ++## Do not audit attempts by caller to read sysct types ++## ++## ++## ++## The process type not to audit. ++## ++## ++# ++interface(`kernel_dontaudit_read_all_sysctls',` ++ gen_require(` ++ attribute sysctl_type; ++ ') ++ ++ dontaudit $1 sysctl_type:file read; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.0.1/policy/modules/kernel/kernel.te +--- nsaserefpolicy/policy/modules/kernel/kernel.te 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/kernel.te 2007-05-30 15:12:50.000000000 -0400 +@@ -146,6 +146,8 @@ + type unlabeled_t; + sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) + ++corenet_non_ipsec_sendrecv(unlabeled_t) ++ + # These initial sids are no longer used, and can be removed: + sid any_socket gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) + sid file_labels gen_context(system_u:object_r:unlabeled_t,s0) +@@ -275,6 +277,7 @@ + + optional_policy(` + logging_send_syslog_msg(kernel_t) ++ logging_unconfined(kernel_t) + ') + + optional_policy(` +@@ -341,6 +344,10 @@ + # Unlabeled process local policy + # + ++ifdef(`targeted_policy',` ++ allow unlabeled_t self:filesystem associate; ++') ++ + optional_policy(` + # If you load a new policy that removes active domains, processes can + # get stuck if you do not allow unlabeled processes to signal init. +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-3.0.1/policy/modules/kernel/mls.if +--- nsaserefpolicy/policy/modules/kernel/mls.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/mls.if 2007-05-30 15:12:50.000000000 -0400 +@@ -154,6 +154,26 @@ + ######################################## + ## + ## Make specified domain MLS trusted ++## for writing to sockets at any level ++## that is dominated by the process clearance. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`mls_socket_write_to_clearance',` ++ gen_require(` ++ attribute mlsnetwritetoclr; ++ ') ++ ++ typeattribute $1 mlsnetwritetoclr; ++') ++ ++######################################## ++## ++## Make specified domain MLS trusted + ## for writing to sockets at any level. + ## + ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-3.0.1/policy/modules/kernel/mls.te +--- nsaserefpolicy/policy/modules/kernel/mls.te 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/mls.te 2007-05-30 15:12:50.000000000 -0400 +@@ -18,6 +18,7 @@ + attribute mlsnetreadtoclr; + attribute mlsnetwrite; + attribute mlsnetwritetoclr; ++attribute mlsnetwriteranged; + attribute mlsnetupgrade; + attribute mlsnetdowngrade; + attribute mlsnetrecvall; +@@ -43,6 +44,8 @@ + attribute mlsxwinwritecolormap; + attribute mlsxwinwritexinput; + ++# Object attributes that allow MLS overrides for access by all subjects ++attribute mlsrangedobject; + attribute mlstrustedobject; + + attribute privrangetrans; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.0.1/policy/modules/kernel/selinux.if +--- nsaserefpolicy/policy/modules/kernel/selinux.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/selinux.if 2007-05-31 11:13:10.000000000 -0400 +@@ -51,6 +51,44 @@ + + ######################################## + ## ++## Do not audit attempts to get the ++## attributes of the selinuxfs filesystem ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`selinux_dontaudit_getattr_fs',` ++ gen_require(` ++ type security_t; ++ ') ++ ++ dontaudit $1 security_t:filesystem getattr; ++') ++ ++######################################## ++## ++## Allow domain to get the ++## attributes of the selinuxfs filesystem ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`selinux_getattr_fs',` ++ gen_require(` ++ type security_t; ++ ') ++ ++ allow $1 security_t:filesystem getattr; ++') ++ ++######################################## ++## + ## Search selinuxfs. + ## + ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.0.1/policy/modules/kernel/storage.if +--- nsaserefpolicy/policy/modules/kernel/storage.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/storage.if 2007-05-30 15:12:50.000000000 -0400 +@@ -100,6 +100,7 @@ + + dev_list_all_dev_nodes($1) + allow $1 fixed_disk_device_t:blk_file read_blk_file_perms; ++ allow $1 fixed_disk_device_t:chr_file read_chr_file_perms; + typeattribute $1 fixed_disk_raw_read; + ') + +@@ -144,6 +145,7 @@ + + dev_list_all_dev_nodes($1) + allow $1 fixed_disk_device_t:blk_file write_blk_file_perms; ++ allow $1 fixed_disk_device_t:chr_file write_chr_file_perms; + typeattribute $1 fixed_disk_raw_write; + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.0.1/policy/modules/kernel/terminal.if +--- nsaserefpolicy/policy/modules/kernel/terminal.if 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/terminal.if 2007-05-31 09:48:57.000000000 -0400 +@@ -44,11 +44,11 @@ + # + interface(`term_user_pty',` + gen_require(` +- attribute server_ptynode; ++ attribute ptynode; + ') + + term_pty($2) +- type_change $1 server_ptynode:chr_file $2; ++ type_change $1 ptynode:chr_file $2; + ') + + ######################################## +@@ -278,6 +278,25 @@ + + ######################################## + ## ++## Relabel from and to the console_device_t ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`term_relabel_console',` ++ gen_require(` ++ type console_device_t; ++ ') ++ ++ dev_list_all_dev_nodes($1) ++ allow $1 console_device_t:chr_file { relabelfrom relabelto }; ++') ++ ++######################################## ++## + ## Create the console device (/dev/console). + ## + ## +@@ -1052,7 +1071,7 @@ + ') + + dev_list_all_dev_nodes($1) +- allow $1 ttynode:chr_file { getattr write }; ++ allow $1 ttynode:chr_file { getattr write append }; + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-3.0.1/policy/modules/kernel/terminal.te +--- nsaserefpolicy/policy/modules/kernel/terminal.te 2007-05-29 14:10:48.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/kernel/terminal.te 2007-05-30 15:12:50.000000000 -0400 +@@ -28,9 +28,15 @@ + type devpts_t; + files_mountpoint(devpts_t) + fs_associate_tmpfs(devpts_t) ++files_associate_tmp(devpts_t) + fs_type(devpts_t) + fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0); + ++ifdef(`targeted_policy',` ++ # cjp: the ttynode should probably be removed. ++ typeattribute devpts_t ttynode, ptynode; ++') ++ + # + # devtty_t is the type of /dev/tty. + # +@@ -51,6 +57,10 @@ + type tty_device_t, serial_device; + dev_node(tty_device_t) + ++ifdef(`targeted_policy',` ++ typeattribute tty_device_t ttynode; ++') ++ + # + # usbtty_device_t is the type of /dev/usr/tty* + # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.te serefpolicy-3.0.1/policy/modules/services/aide.te +--- nsaserefpolicy/policy/modules/services/aide.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/aide.te 2007-05-30 15:12:50.000000000 -0400 +@@ -26,7 +26,7 @@ + + allow aide_t self:capability { dac_override fowner }; + +-send_audit_msgs_pattern(aide_t) ++logging_send_audit_msg(aide_t) + + # database actions + manage_files_pattern(aide_t,aide_db_t,aide_db_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-3.0.1/policy/modules/services/amavis.if +--- nsaserefpolicy/policy/modules/services/amavis.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/amavis.if 2007-05-30 15:12:50.000000000 -0400 +@@ -167,3 +167,22 @@ + allow $1 amavis_var_run_t:file setattr; + files_search_pids($1) + ') ++ ++######################################## ++## ++## Set the create of amavis var run files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`amavis_create_pid_files',` ++ gen_require(` ++ type amavis_var_run_t; ++ ') ++ ++ allow $1 amavis_var_run_t:file create_file_perms; ++ files_search_pids($1) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.0.1/policy/modules/services/amavis.te +--- nsaserefpolicy/policy/modules/services/amavis.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/amavis.te 2007-05-31 10:49:54.000000000 -0400 +@@ -165,6 +165,7 @@ + + optional_policy(` + pyzor_domtrans(amavis_t) ++ pyzor_signal(amavis_t) + ') + + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.0.1/policy/modules/services/apache.fc +--- nsaserefpolicy/policy/modules/services/apache.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/apache.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -16,7 +16,6 @@ + + /usr/lib/apache-ssl/.+ -- gen_context(system_u:object_r:httpd_exec_t,s0) + /usr/lib/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) +-/usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_exec_t,s0) + /usr/lib(64)?/apache(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0) + /usr/lib(64)?/apache2/modules(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0) + /usr/lib(64)?/apache(2)?/suexec(2)? -- gen_context(system_u:object_r:httpd_suexec_exec_t,s0) +@@ -73,3 +72,11 @@ + /var/www/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) + /var/www/icons(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) + /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) ++ ++#Bugzilla file context ++/usr/share/bugzilla(/.*)? -d gen_context(system_u:object_r:httpd_bugzilla_content_t,s0) ++/usr/share/bugzilla(/.*)? -- gen_context(system_u:object_r:httpd_bugzilla_script_exec_t,s0) ++/var/lib/bugzilla(/.*)? gen_context(system_u:object_r:httpd_bugzilla_script_rw_t,s0) ++#viewvc file context ++/var/spool/viewvc(/.*)? gen_context(system_u:object_r:httpd_sys_script_rw_t, s0) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.0.1/policy/modules/services/apache.if +--- nsaserefpolicy/policy/modules/services/apache.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/apache.if 2007-05-30 15:12:50.000000000 -0400 +@@ -18,10 +18,6 @@ + attribute httpd_script_exec_type; + type httpd_t, httpd_suexec_t, httpd_log_t; + ') +- # allow write access to public file transfer +- # services files. +- gen_tunable(allow_httpd_$1_script_anon_write,false) +- + #This type is for webpages + type httpd_$1_content_t, httpdcontent; # customizable + files_type(httpd_$1_content_t) +@@ -120,10 +116,6 @@ + can_exec(httpd_$1_script_t, httpdcontent) + ') + +- tunable_policy(`allow_httpd_$1_script_anon_write',` +- miscfiles_manage_public_files(httpd_$1_script_t) +- ') +- + # Allow the web server to run scripts and serve pages + tunable_policy(`httpd_builtin_scripting',` + manage_dirs_pattern(httpd_t,httpd_$1_script_rw_t,httpd_$1_script_rw_t) +@@ -268,8 +260,11 @@ + ') + + apache_content_template($1) ++ manage_dirs_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) ++ manage_files_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) ++ manage_lnk_files_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) + +- typeattribute httpd_$1_script_t httpd_script_domains; ++ typeattribute httpd_$1_content_t httpd_script_domains; + userdom_user_home_content($1,httpd_$1_content_t) + + role $3 types httpd_$1_script_t; +@@ -434,6 +429,24 @@ + + ######################################## + ## ++## getattr apache.process ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`apache_getattr',` ++ gen_require(` ++ type httpd_t; ++ ') ++ ++ allow $1 httpd_t:process getattr; ++') ++ ++######################################## ++## + ## Inherit and use file descriptors from Apache. + ## + ## +@@ -752,6 +765,7 @@ + ') + + allow $1 httpd_modules_t:dir list_dir_perms; ++ read_lnk_files_pattern($1,httpd_modules_t,httpd_modules_t) + ') + + ######################################## +@@ -836,6 +850,10 @@ + type httpd_sys_script_t; + ') + ++ tunable_policy(`httpd_enable_cgi',` ++ domtrans_pattern($1, httpd_sys_script_exec_t, httpd_sys_script_t) ++ ') ++ + tunable_policy(`httpd_enable_cgi && httpd_unified',` + domtrans_pattern($1, httpdcontent, httpd_sys_script_t) + ') +@@ -923,7 +941,7 @@ + type httpd_squirrelmail_t; + ') + +- allow $1 httpd_squirrelmail_t:file { getattr read }; ++ read_files_pattern($1,httpd_squirrelmail_t,httpd_squirrelmail_t) + ') + + ######################################## +@@ -1000,3 +1018,140 @@ + + allow $1 httpd_sys_script_t:dir search_dir_perms; + ') ++ ++######################################## ++## ++## Allow the specified domain to manage ++## apache modules. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`apache_manage_modules',` ++ gen_require(` ++ type httpd_modules_t; ++ ') ++ ++ manage_dirs_pattern($1,httpd_modules_t,httpd_modules_t) ++ manage_files_pattern($1,httpd_modules_t,httpd_modules_t) ++ manage_lnk_files_pattern($1,httpd_modules_t,httpd_modules_t) ++') ++ ++######################################## ++## ++## Allow the specified domain to create ++## apache lock file ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`apache_manage_lock',` ++ gen_require(` ++ type httpd_lock_t; ++ ') ++ allow $1 httpd_lock_t:file manage_file_perms; ++ files_lock_filetrans($1, httpd_lock_t, file) ++') ++ ++######################################## ++## ++## Allow the specified domain to manage ++## apache pid file ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`apache_manage_pid',` ++ gen_require(` ++ type httpd_var_run_t; ++ ') ++ manage_files_pattern($1,httpd_var_run_t,httpd_var_run_t) ++ files_pid_filetrans($1,httpd_var_run_t, file) ++') ++ ++######################################## ++## ++##f Read apache system state ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`apache_read_state',` ++ gen_require(` ++ type httpd_t; ++ ') ++ kernel_search_proc($1) ++ allow $1 httpd_t:dir list_dir_perms; ++ read_files_pattern($1,httpd_t,httpd_t) ++ read_lnk_files_pattern($1,httpd_t,httpd_t) ++ dontaudit $1 httpd_t:process ptrace; ++') ++ ++######################################## ++## ++##f allow domain to signal apache ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`apache_signal',` ++ gen_require(` ++ type httpd_t; ++ ') ++ allow $1 httpd_t:process signal; ++') ++ ++######################################## ++## ++## allow domain to relabel apache content ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`apache_relabel',` ++ gen_require(` ++ attribute httpdcontent; ++ attribute httpd_script_exec_type; ++ ') ++ ++ allow $1 { httpd_script_exec_type httpdcontent}:dir { relabelto relabelfrom }; ++ allow $1 { httpd_script_exec_type httpdcontent}:file { relabelto relabelfrom }; ++') ++ ++######################################## ++## ++## Allow the specified domain to search ++## apache bugzilla directories. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`apache_search_bugzilla_dirs',` ++ gen_require(` ++ type httpd_bugzilla_content_t; ++ ') ++ ++ allow $1 httpd_bugzilla_content_t:dir search_dir_perms; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.0.1/policy/modules/services/apache.te +--- nsaserefpolicy/policy/modules/services/apache.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/apache.te 2007-05-30 15:12:50.000000000 -0400 +@@ -30,7 +30,7 @@ + + ## + ##

+-## Allow Apache to use mod_auth_pam ++## Allow Apache to use mod_auth_pams + ##

+ ## + gen_tunable(allow_httpd_mod_auth_pam,false) +@@ -47,6 +47,13 @@ + ## Allow http daemon to tcp connect + ##

+ ## ++gen_tunable(httpd_can_sendmail,false) ++ ++## ++##

++## Allow http daemon to tcp connect ++##

++## + gen_tunable(httpd_can_network_connect,false) + + ## +@@ -106,6 +113,27 @@ + ## + gen_tunable(httpd_unified,false) + ++## ++##

++## Allow httpd to read nfs files ++##

++## ++gen_tunable(httpd_use_nfs,false) ++ ++## ++##

++## Allow httpd to read cifs files ++##

++## ++gen_tunable(httpd_use_cifs,false) ++ ++## ++##

++## Allow apache scripts to write to public content ++##

++## ++gen_tunable(allow_httpd_sys_script_anon_write,false) ++ + attribute httpdcontent; + + # domains that can exec all users scripts +@@ -210,7 +238,7 @@ + # Apache server local policy + # + +-allow httpd_t self:capability { chown dac_override kill setgid setuid sys_tty_config }; ++allow httpd_t self:capability { chown dac_override kill setgid setuid sys_nice sys_tty_config }; + dontaudit httpd_t self:capability { net_admin sys_tty_config }; + allow httpd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; + allow httpd_t self:fd use; +@@ -252,6 +280,7 @@ + allow httpd_t httpd_modules_t:dir list_dir_perms; + mmap_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) + read_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) ++read_lnk_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) + + apache_domtrans_rotatelogs(httpd_t) + # Apache-httpd needs to be able to send signals to the log rotate procs. +@@ -292,6 +321,7 @@ + kernel_read_kernel_sysctls(httpd_t) + # for modules that want to access /proc/meminfo + kernel_read_system_state(httpd_t) ++kernel_search_network_sysctl(httpd_t) + + corenet_non_ipsec_sendrecv(httpd_t) + corenet_tcp_sendrecv_all_if(httpd_t) +@@ -337,6 +367,9 @@ + files_read_var_lib_symlinks(httpd_t) + + fs_search_auto_mountpoints(httpd_sys_script_t) ++# php uploads a file to /tmp and then execs programs to acton them ++manage_dirs_pattern(httpd_sys_script_t,httpd_tmp_t,httpd_tmp_t) ++manage_files_pattern(httpd_sys_script_t,httpd_tmp_t,httpd_tmp_t) + + libs_use_ld_so(httpd_t) + libs_use_shared_libs(httpd_t) +@@ -357,6 +390,10 @@ + + mta_send_mail(httpd_t) + ++optional_policy(` ++ nscd_socket_use(httpd_t) ++') ++ + ifdef(`targeted_policy',` + tunable_policy(`httpd_enable_homedirs',` + userdom_search_generic_user_home_dirs(httpd_t) +@@ -380,6 +417,14 @@ + corenet_tcp_connect_all_ports(httpd_t) + ') + ++tunable_policy(`httpd_can_sendmail',` ++ # allow httpd to connect to mail servers ++ corenet_tcp_connect_smtp_port(httpd_t) ++ corenet_sendrecv_smtp_client_packets(httpd_t) ++ corenet_tcp_connect_pop_port(httpd_t) ++ corenet_sendrecv_pop_client_packets(httpd_t) ++') ++ + tunable_policy(`httpd_can_network_connect_db',` + # allow httpd to connect to mysql/posgresql + corenet_tcp_connect_postgresql_port(httpd_t) +@@ -407,6 +452,10 @@ + allow httpd_t httpd_unconfined_script_exec_t:dir list_dir_perms; + ') + ++tunable_policy(`allow_httpd_sys_script_anon_write',` ++ miscfiles_manage_public_files(httpd_sys_script_t) ++') ++ + tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',` + domtrans_pattern(httpd_t, httpdcontent, httpd_sys_script_t) + +@@ -424,11 +473,21 @@ + fs_read_nfs_symlinks(httpd_t) + ') + ++tunable_policy(`httpd_use_nfs',` ++ fs_read_nfs_files(httpd_t) ++ fs_read_nfs_symlinks(httpd_t) ++') ++ + tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` + fs_read_cifs_files(httpd_t) + fs_read_cifs_symlinks(httpd_t) + ') + ++tunable_policy(`httpd_use_cifs',` ++ fs_read_cifs_files(httpd_t) ++ fs_read_cifs_symlinks(httpd_t) ++') ++ + tunable_policy(`httpd_ssi_exec',` + corecmd_shell_domtrans(httpd_t,httpd_sys_script_t) + allow httpd_sys_script_t httpd_t:fd use; +@@ -659,6 +718,12 @@ + fs_exec_nfs_files(httpd_suexec_t) + ') + ++tunable_policy(`httpd_use_cifs',` ++ fs_read_cifs_files(httpd_suexec_t) ++ fs_read_cifs_symlinks(httpd_suexec_t) ++ fs_exec_cifs_files(httpd_suexec_t) ++') ++ + tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` + fs_read_cifs_files(httpd_suexec_t) + fs_read_cifs_symlinks(httpd_suexec_t) +@@ -697,7 +762,8 @@ + + dontaudit httpd_sys_script_t httpd_config_t:dir search; + +-allow httpd_sys_script_t httpd_squirrelmail_t:file { append read }; ++apache_read_squirrelmail_data(httpd_sys_script_t) ++apache_append_squirrelmail_data(httpd_sys_script_t) + + allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms; + read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t) +@@ -721,11 +787,21 @@ + ') + ') + ++tunable_policy(`httpd_use_nfs', ` ++ fs_read_nfs_files(httpd_sys_script_t) ++ fs_read_nfs_symlinks(httpd_sys_script_t) ++') ++ + tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` + fs_read_nfs_files(httpd_sys_script_t) + fs_read_nfs_symlinks(httpd_sys_script_t) + ') + ++tunable_policy(`httpd_use_cifs', ` ++ fs_read_cifs_files(httpd_sys_script_t) ++ fs_read_cifs_symlinks(httpd_sys_script_t) ++') ++ + tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` + fs_read_cifs_files(httpd_sys_script_t) + fs_read_cifs_symlinks(httpd_sys_script_t) +@@ -776,3 +852,19 @@ + logging_search_logs(httpd_rotatelogs_t) + + miscfiles_read_localization(httpd_rotatelogs_t) ++ ++#============= bugzilla policy ============== ++apache_content_template(bugzilla) ++allow httpd_bugzilla_script_t self:netlink_route_socket r_netlink_socket_perms; ++ ++files_search_var_lib(httpd_bugzilla_script_t) ++ ++optional_policy(` ++ mysql_search_db(httpd_bugzilla_script_t) ++ mysql_stream_connect(httpd_bugzilla_script_t) ++') ++ ++optional_policy(` ++ postgresql_stream_connect(httpd_bugzilla_script_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-3.0.1/policy/modules/services/apcupsd.fc +--- nsaserefpolicy/policy/modules/services/apcupsd.fc 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/apcupsd.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -3,3 +3,8 @@ + /var/log/apcupsd\.events.* -- gen_context(system_u:object_r:apcupsd_log_t,s0) + + /var/run/apcupsd\.pid -- gen_context(system_u:object_r:apcupsd_var_run_t,s0) ++ ++/var/www/apcupsd/multimon.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) ++/var/www/apcupsd/upsfstats.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) ++/var/www/apcupsd/upsimage.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) ++/var/www/apcupsd/upsstats.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.0.1/policy/modules/services/apcupsd.if +--- nsaserefpolicy/policy/modules/services/apcupsd.if 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/apcupsd.if 2007-05-30 15:12:50.000000000 -0400 +@@ -79,3 +79,25 @@ + allow $1 apcupsd_log_t:dir list_dir_perms; + allow $1 apcupsd_log_t:file { getattr append }; + ') ++ ++######################################## ++## ++## Execute a domain transition to run httpd_apcupsd_cgi_script. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`httpd_apcupsd_cgi_script_domtrans',` ++ gen_require(` ++ type httpd_apcupsd_cgi_script_t, httpd_apcupsd_cgi_script_exec_t; ++ ') ++ ++ domain_auto_trans($1,httpd_apcupsd_cgi_script_exec_t,httpd_apcupsd_cgi_script_t) ++ ++ allow httpd_apcupsd_cgi_script_t $1:fd use; ++ allow httpd_apcupsd_cgi_script_t $1:fifo_file rw_file_perms; ++ allow httpd_apcupsd_cgi_script_t $1:process sigchld; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-3.0.1/policy/modules/services/apcupsd.te +--- nsaserefpolicy/policy/modules/services/apcupsd.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/apcupsd.te 2007-05-31 11:11:33.000000000 -0400 +@@ -24,6 +24,7 @@ + # apcupsd local policy + # + ++allow apcupsd_t self:capability sys_tty_config; + allow apcupsd_t self:process signal; + allow apcupsd_t self:fifo_file rw_file_perms; + allow apcupsd_t self:unix_stream_socket create_stream_socket_perms; +@@ -61,3 +62,29 @@ + logging_send_syslog_msg(apcupsd_t) + + miscfiles_read_localization(apcupsd_t) ++ ++# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240805 ++term_use_unallocated_ttys(apcupsd_t) ++ ++######################################## ++# ++# apcupsd_cgi Declarations ++# ++ ++apache_content_template(apcupsd_cgi) ++ ++# Default Networking ++sysnet_dns_name_resolve(httpd_apcupsd_cgi_script_t) ++corenet_non_ipsec_sendrecv(httpd_apcupsd_cgi_script_t) ++ ++allow httpd_apcupsd_cgi_script_t self:tcp_socket create_stream_socket_perms; ++corenet_tcp_sendrecv_all_if(httpd_apcupsd_cgi_script_t) ++corenet_tcp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t) ++corenet_tcp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t) ++corenet_tcp_connect_apcupsd_port(httpd_apcupsd_cgi_script_t) ++ ++allow httpd_apcupsd_cgi_script_t self:udp_socket create_socket_perms; ++corenet_udp_sendrecv_all_if(httpd_apcupsd_cgi_script_t) ++corenet_udp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t) ++corenet_udp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.0.1/policy/modules/services/arpwatch.te +--- nsaserefpolicy/policy/modules/services/arpwatch.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/arpwatch.te 2007-05-30 15:12:50.000000000 -0400 +@@ -28,7 +28,6 @@ + allow arpwatch_t self:process signal_perms; + allow arpwatch_t self:unix_dgram_socket create_socket_perms; + allow arpwatch_t self:unix_stream_socket create_stream_socket_perms; +-allow arpwatch_t self:netlink_route_socket r_netlink_socket_perms; + allow arpwatch_t self:tcp_socket { connect create_stream_socket_perms }; + allow arpwatch_t self:udp_socket create_socket_perms; + allow arpwatch_t self:packet_socket create_socket_perms; +@@ -78,15 +77,13 @@ + + miscfiles_read_localization(arpwatch_t) + +-sysnet_read_config(arpwatch_t) +- + userdom_dontaudit_use_unpriv_user_fds(arpwatch_t) + userdom_dontaudit_search_sysadm_home_dirs(arpwatch_t) + + mta_send_mail(arpwatch_t) + + optional_policy(` +- nis_use_ypbind(arpwatch_t) ++ auth_use_nsswitch(arpwatch_t) + ') + + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.0.1/policy/modules/services/automount.te +--- nsaserefpolicy/policy/modules/services/automount.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/automount.te 2007-05-30 15:12:50.000000000 -0400 +@@ -69,6 +69,7 @@ + files_mounton_all_mountpoints(automount_t) + files_mount_all_file_type_fs(automount_t) + files_unmount_all_file_type_fs(automount_t) ++files_manage_non_security_dirs(automount_t) + + fs_mount_all_fs(automount_t) + fs_unmount_all_fs(automount_t) +@@ -98,6 +99,7 @@ + + dev_read_sysfs(automount_t) + # for SSP ++dev_read_rand(automount_t) + dev_read_urand(automount_t) + + domain_use_interactive_fds(automount_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.0.1/policy/modules/services/avahi.te +--- nsaserefpolicy/policy/modules/services/avahi.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/avahi.te 2007-05-30 15:12:50.000000000 -0400 +@@ -18,7 +18,7 @@ + # Local policy + # + +-allow avahi_t self:capability { dac_override setgid chown kill setuid sys_chroot }; ++allow avahi_t self:capability { dac_override setgid chown fowner kill setuid sys_chroot }; + dontaudit avahi_t self:capability sys_tty_config; + allow avahi_t self:process { setrlimit signal_perms setcap }; + allow avahi_t self:fifo_file { read write }; +@@ -32,6 +32,8 @@ + allow avahi_t avahi_var_run_t:dir setattr; + files_pid_filetrans(avahi_t,avahi_var_run_t,file) + ++auth_use_nsswitch(avahi_t) ++ + kernel_read_kernel_sysctls(avahi_t) + kernel_list_proc(avahi_t) + kernel_read_proc_symlinks(avahi_t) +@@ -63,8 +65,6 @@ + files_read_etc_runtime_files(avahi_t) + files_read_usr_files(avahi_t) + +-auth_use_nsswitch(avahi_t) +- + init_signal_script(avahi_t) + init_signull_script(avahi_t) + +@@ -75,8 +75,6 @@ + + miscfiles_read_localization(avahi_t) + +-sysnet_read_config(avahi_t) +- + userdom_dontaudit_use_unpriv_user_fds(avahi_t) + userdom_dontaudit_search_sysadm_home_dirs(avahi_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.0.1/policy/modules/services/bind.te +--- nsaserefpolicy/policy/modules/services/bind.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/bind.te 2007-05-30 15:12:50.000000000 -0400 +@@ -230,6 +230,7 @@ + corenet_tcp_sendrecv_all_nodes(ndc_t) + corenet_tcp_sendrecv_all_ports(ndc_t) + corenet_tcp_connect_rndc_port(ndc_t) ++corenet_tcp_bind_all_nodes(ndc_t) + corenet_sendrecv_rndc_client_packets(ndc_t) + + fs_getattr_xattr_fs(ndc_t) +@@ -257,6 +258,10 @@ + allow ndc_t named_conf_t:dir search; + ') + ++ifdef(`targeted_policy',` ++ kernel_dontaudit_read_unlabeled_files(ndc_t) ++') ++ + optional_policy(` + nis_use_ypbind(ndc_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.0.1/policy/modules/services/bluetooth.te +--- nsaserefpolicy/policy/modules/services/bluetooth.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/bluetooth.te 2007-05-30 17:14:15.000000000 -0400 +@@ -195,26 +195,26 @@ + + sysnet_read_config(bluetooth_helper_t) + +-ifdef(`targeted_policy',` +- files_rw_generic_tmp_sockets(bluetooth_helper_t) +- files_manage_generic_tmp_files(bluetooth_helper_t) ++files_rw_generic_tmp_sockets(bluetooth_helper_t) ++files_manage_generic_tmp_files(bluetooth_helper_t) + +- fs_rw_tmpfs_files(bluetooth_helper_t) ++fs_rw_tmpfs_files(bluetooth_helper_t) + +- unconfined_stream_connect(bluetooth_helper_t) ++userdom_manage_generic_user_home_content_files(bluetooth_helper_t) + +- userdom_manage_generic_user_home_content_files(bluetooth_helper_t) ++optional_policy(` ++ unconfined_stream_connect(bluetooth_helper_t) ++') + +- optional_policy(` +- corenet_tcp_connect_xserver_port(bluetooth_helper_t) +- #Bugzilla https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=205956 +- xserver_read_xdm_tmp_files(bluetooth_helper_t) +- xserver_stream_connect_xdm(bluetooth_helper_t) +- xserver_use_xdm_fds(bluetooth_helper_t) +- xserver_rw_xdm_pipes(bluetooth_helper_t) +- # when started via startx +- xserver_stream_connect_xdm_xserver(bluetooth_helper_t) +- ') ++optional_policy(` ++ corenet_tcp_connect_xserver_port(bluetooth_helper_t) ++ #Bugzilla https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=205956 ++ xserver_read_xdm_tmp_files(bluetooth_helper_t) ++ xserver_stream_connect_xdm(bluetooth_helper_t) ++ xserver_use_xdm_fds(bluetooth_helper_t) ++ xserver_rw_xdm_pipes(bluetooth_helper_t) ++ # when started via startx ++ xserver_stream_connect_xdm_xserver(bluetooth_helper_t) + ') + + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.0.1/policy/modules/services/clamav.te +--- nsaserefpolicy/policy/modules/services/clamav.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/clamav.te 2007-05-30 15:12:50.000000000 -0400 +@@ -121,6 +121,7 @@ + amavis_read_lib_files(clamd_t) + amavis_read_spool_files(clamd_t) + amavis_spool_filetrans(clamd_t,clamd_var_run_t,sock_file) ++ amavis_create_pid_files(clamd_t) + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.0.1/policy/modules/services/consolekit.te +--- nsaserefpolicy/policy/modules/services/consolekit.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/consolekit.te 2007-05-30 15:12:50.000000000 -0400 +@@ -10,7 +10,6 @@ + type consolekit_exec_t; + init_daemon_domain(consolekit_t, consolekit_exec_t) + +-# pid files + type consolekit_var_run_t; + files_pid_file(consolekit_var_run_t) + +@@ -25,7 +24,6 @@ + allow consolekit_t self:unix_stream_socket create_stream_socket_perms; + allow consolekit_t self:unix_dgram_socket create_socket_perms; + +-# pid file + manage_files_pattern(consolekit_t,consolekit_var_run_t,consolekit_var_run_t) + files_pid_filetrans(consolekit_t,consolekit_var_run_t, file) + +@@ -50,8 +48,15 @@ + libs_use_ld_so(consolekit_t) + libs_use_shared_libs(consolekit_t) + ++logging_send_syslog_msg(consolekit_t) ++ + miscfiles_read_localization(consolekit_t) + ++# consolekit needs to be able to ptrace all logged in users ++userdom_ptrace_all_users(consolekit_t) ++hal_ptrace(consolekit_t) ++mcs_ptrace_all(consolekit_t) ++ + optional_policy(` + dbus_system_bus_client_template(consolekit, consolekit_t) + dbus_send_system_bus(consolekit_t) +@@ -68,3 +73,9 @@ + xserver_read_all_users_xauth(consolekit_t) + xserver_stream_connect_xdm_xserver(consolekit_t) + ') ++ ++optional_policy(` ++ #reading .Xauthity ++ unconfined_ptrace(consolekit_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.0.1/policy/modules/services/cron.fc +--- nsaserefpolicy/policy/modules/services/cron.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/cron.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -45,3 +45,4 @@ + /var/spool/fcron/systab\.orig -- gen_context(system_u:object_r:system_cron_spool_t,s0) + /var/spool/fcron/systab -- gen_context(system_u:object_r:system_cron_spool_t,s0) + /var/spool/fcron/new\.systab -- gen_context(system_u:object_r:system_cron_spool_t,s0) ++/var/lib/misc(/.*)? gen_context(system_u:object_r:crond_var_run_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.0.1/policy/modules/services/cron.if +--- nsaserefpolicy/policy/modules/services/cron.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/cron.if 2007-05-30 15:12:50.000000000 -0400 +@@ -35,6 +35,7 @@ + # + template(`cron_per_role_template',` + gen_require(` ++ class context contains; + attribute cron_spool_type; + type crond_t, cron_spool_t, crontab_exec_t; + ') +@@ -54,9 +55,6 @@ + domain_entry_file($1_crontab_t,crontab_exec_t) + role $3 types $1_crontab_t; + +- type $1_crontab_tmp_t; +- files_tmp_file($1_crontab_tmp_t) +- + ############################## + # + # $1_crond_t local policy +@@ -67,6 +65,7 @@ + allow $1_crond_t self:fifo_file rw_fifo_file_perms; + allow $1_crond_t self:unix_stream_socket create_stream_socket_perms; + allow $1_crond_t self:unix_dgram_socket create_socket_perms; ++ allow $1_crond_t self:context contains; + + # The entrypoint interface is not used as this is not + # a regular entrypoint. Since crontab files are +@@ -134,19 +133,22 @@ + + miscfiles_read_localization($1_crond_t) + ++ mls_rangetrans_target($1_crond_t) ++ + userdom_manage_user_tmp_files($1,$1_crond_t) + userdom_manage_user_tmp_symlinks($1,$1_crond_t) + userdom_manage_user_tmp_pipes($1,$1_crond_t) + userdom_manage_user_tmp_sockets($1,$1_crond_t) ++ userdom_transition_user_tmp($1,$1_crond_t, { lnk_file file dir fifo_file }) + # Run scripts in user home directory and access shared libs. + userdom_exec_user_home_content_files($1,$1_crond_t) + # Access user files and dirs. +-# userdom_manage_user_home_subdir_dirs($1,$1_crond_t) ++ userdom_manage_user_home_content_dirs($1,$1_crond_t) + userdom_manage_user_home_content_files($1,$1_crond_t) + userdom_manage_user_home_content_symlinks($1,$1_crond_t) + userdom_manage_user_home_content_pipes($1,$1_crond_t) + userdom_manage_user_home_content_sockets($1,$1_crond_t) +-# userdom_user_home_dir_filetrans_user_home_content($1,$1_crond_t,notdevfile_class_set) ++ userdom_user_home_dir_filetrans_user_home_content($1,$1_crond_t,notdevfile_class_set) + + tunable_policy(`fcron_crond', ` + allow crond_t $1_cron_spool_t:file manage_file_perms; +@@ -156,22 +158,13 @@ + nis_use_ypbind($1_crond_t) + ') + +- ifdef(`TODO',` + optional_policy(` +- create_dir_file($1_crond_t, httpd_$1_content_t) ++ mta_send_mail($1_crond_t) + ') +- allow $1_crond_t tmp_t:dir rw_dir_perms; +- type_transition $1_crond_t $1_tmp_t:{ file lnk_file sock_file fifo_file } $1_tmp_t; + +- ifdef(`mta.te', ` +- domain_auto_trans($1_crond_t, sendmail_exec_t, $1_mail_t) +- allow $1_crond_t sendmail_exec_t:lnk_file r_file_perms; +- +- # $1_mail_t should only be reading from the cron fifo not needing to write +- dontaudit $1_mail_t crond_t:fifo_file write; +- allow mta_user_agent $1_crond_t:fd use; ++ optional_policy(` ++ nscd_socket_use($1_crond_t) + ') +- ') dnl endif TODO + + ############################## + # +@@ -184,6 +177,7 @@ + + # Transition from the user domain to the derived domain. + domtrans_pattern($2, crontab_exec_t, $1_crontab_t) ++ allow $2 $1_crontab_t:fd use; + + # crontab shows up in user ps + ps_process_pattern($2,$1_crontab_t) +@@ -194,9 +188,6 @@ + # Allow crond to read those crontabs in cron spool. + allow crond_t $1_cron_spool_t:file manage_file_perms; + +- allow $1_crontab_t $1_crontab_tmp_t:file manage_file_perms; +- files_tmp_filetrans($1_crontab_t,$1_crontab_tmp_t,file) +- + # create files in /var/spool/cron + manage_files_pattern($1_crontab_t,cron_spool_t,$1_cron_spool_t) + filetrans_pattern($1_crontab_t,cron_spool_t,$1_cron_spool_t,file) +@@ -232,10 +223,12 @@ + + userdom_manage_user_tmp_dirs($1,$1_crontab_t) + userdom_manage_user_tmp_files($1,$1_crontab_t) ++ userdom_transition_user_tmp($1,$1_crontab_t, { file dir }) + # Access terminals. + userdom_use_user_terminals($1,$1_crontab_t) + # Read user crontabs + userdom_read_user_home_content_files($1,$1_crontab_t) ++ userdom_transition_user_tmp($1,$1_crontab_t, { lnk_file file dir fifo_file }) + + tunable_policy(`fcron_crond',` + # fcron wants an instant update of a crontab change for the administrator +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.0.1/policy/modules/services/cron.te +--- nsaserefpolicy/policy/modules/services/cron.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/cron.te 2007-05-30 17:23:16.000000000 -0400 +@@ -42,6 +42,9 @@ + type cron_log_t; + logging_log_file(cron_log_t) + ++type cron_lock_t; ++files_lock_file(cron_lock_t) ++ + type crond_t; + type crond_exec_t; + init_daemon_domain(crond_t,crond_exec_t) +@@ -50,6 +53,7 @@ + + type crond_tmp_t; + files_tmp_file(crond_tmp_t) ++files_poly_parent(crond_tmp_t) + + type crond_var_run_t; + files_pid_file(crond_var_run_t) +@@ -75,11 +79,6 @@ + type system_crond_tmp_t; + files_tmp_file(system_crond_tmp_t) + +-ifdef(`targeted_policy',` +- type sysadm_cron_spool_t; +- files_type(sysadm_cron_spool_t) +-') +- + ifdef(`enable_mcs',` + init_ranged_daemon_domain(crond_t,crond_exec_t,s0 - mcs_systemhigh) + ') +@@ -89,7 +88,7 @@ + # Cron Local policy + # + +-allow crond_t self:capability { dac_override setgid setuid sys_nice dac_read_search audit_control }; ++allow crond_t self:capability { dac_override setgid setuid sys_nice dac_read_search }; + dontaudit crond_t self:capability { sys_resource sys_tty_config }; + allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; + allow crond_t self:process { setexec setfscreate }; +@@ -108,14 +107,12 @@ + allow crond_t crond_var_run_t:file manage_file_perms; + files_pid_filetrans(crond_t,crond_var_run_t,file) + +-allow crond_t cron_spool_t:dir rw_dir_perms; +-allow crond_t cron_spool_t:file read_file_perms; +- +-allow crond_t system_cron_spool_t:dir list_dir_perms; +-allow crond_t system_cron_spool_t:file read_file_perms; ++manage_files_pattern(crond_t,cron_spool_t,cron_spool_t) ++read_files_pattern(crond_t, system_cron_spool_t, system_cron_spool_t) + + kernel_read_kernel_sysctls(crond_t) + kernel_search_key(crond_t) ++kernel_link_key(crond_t) + + dev_read_sysfs(crond_t) + selinux_get_fs_mount(crond_t) +@@ -131,12 +128,22 @@ + fs_search_auto_mountpoints(crond_t) + + # need auth_chkpwd to check for locked accounts. +-auth_domtrans_chk_passwd(crond_t) ++auth_domtrans_upd_passwd(crond_t) + + corecmd_exec_shell(crond_t) + corecmd_list_bin(crond_t) + corecmd_read_bin_symlinks(crond_t) + ++mls_rangetrans_source(crond_t) ++mls_file_read_up(crond_t) ++mls_file_write_down(crond_t) ++mls_file_upgrade(crond_t) ++mls_file_downgrade(crond_t) ++mls_process_set_level(crond_t) ++mls_fd_share_all_levels(crond_t) ++mls_fd_share_all_levels(crond_t) ++mls_trusted_object(crond_t) ++ + domain_use_interactive_fds(crond_t) + + files_read_etc_files(crond_t) +@@ -152,6 +159,7 @@ + libs_use_shared_libs(crond_t) + + logging_send_syslog_msg(crond_t) ++logging_send_audit_msg(crond_t) + + seutil_read_config(crond_t) + seutil_read_default_contexts(crond_t) +@@ -165,6 +173,12 @@ + + mta_send_mail(crond_t) + ++tunable_policy(`allow_polyinstantiation',` ++ allow crond_t self:capability fowner; ++ files_search_tmp(crond_t) ++ files_polyinstantiate_all(crond_t) ++') ++ + ifdef(`distro_debian',` + optional_policy(` + # Debian logcheck has the home dir set to its cache +@@ -193,8 +207,6 @@ + manage_sock_files_pattern(crond_t,system_crond_tmp_t,system_crond_tmp_t) + files_tmp_filetrans(crond_t,system_crond_tmp_t,{ dir file lnk_file sock_file fifo_file }) + +- unconfined_domain(crond_t) +- + userdom_manage_generic_user_home_content_dirs(crond_t) + userdom_manage_generic_user_home_content_files(crond_t) + userdom_manage_generic_user_home_content_symlinks(crond_t) +@@ -202,12 +214,16 @@ + userdom_manage_generic_user_home_content_pipes(crond_t) + userdom_generic_user_home_dir_filetrans_generic_user_home_content(crond_t,{ dir file lnk_file fifo_file sock_file }) + +- allow crond_t unconfined_t:dbus send_msg; +- allow crond_t initrc_t:dbus send_msg; ++ init_dbus_chat_script(crond_t) + + optional_policy(` + mono_domtrans(crond_t) + ') ++ ++ optional_policy(` ++ unconfined_dbus_chat(crond_t) ++ unconfined_domain(crond_t) ++ ') + ',` + manage_dirs_pattern(crond_t,crond_tmp_t,crond_tmp_t) + manage_files_pattern(crond_t,crond_tmp_t,crond_tmp_t) +@@ -258,24 +274,35 @@ + # System cron process domain + # + ++# This is to handle creation of files in /var/lock directory. (anacron) ++allow crond_t cron_lock_t:file manage_file_perms; ++files_lock_filetrans(crond_t,cron_lock_t,file) ++ + # This is to handle creation of files in /var/log directory. + # Used currently by rpm script log files + allow system_crond_t cron_log_t:file manage_file_perms; + logging_log_filetrans(system_crond_t,cron_log_t,file) + ++ + # This is to handle /var/lib/misc directory. Used currently + # by prelink var/lib files for cron + allow system_crond_t cron_var_lib_t:file manage_file_perms; + files_var_lib_filetrans(system_crond_t,cron_var_lib_t,file) + + optional_policy(` ++ spamassassin_manage_lib_files(system_crond_t) ++') ++ ++optional_policy(` + # cjp: why? + squid_domtrans(system_crond_t) + ') + + ifdef(`targeted_policy',` + # cjp: FIXME +- allow crond_t unconfined_t:process transition; ++ optional_policy(` ++ unconfined_domtrans(crond_t) ++ ') + ',` + allow system_crond_t self:capability { dac_override dac_read_search chown setgid setuid fowner net_bind_service fsetid }; + allow system_crond_t self:process { signal_perms setsched }; +@@ -369,7 +396,7 @@ + init_read_utmp(system_crond_t) + init_dontaudit_rw_utmp(system_crond_t) + # prelink tells init to restart it self, we either need to allow or dontaudit +- init_write_initctl(system_crond_t) ++ init_telinit(system_crond_t) + + libs_use_ld_so(system_crond_t) + libs_use_shared_libs(system_crond_t) +@@ -427,6 +454,10 @@ + ') + + optional_policy(` ++ lpd_list_spool(system_crond_t) ++ ') ++ ++ optional_policy(` + mrtg_append_create_logs(system_crond_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.1/policy/modules/services/cups.fc +--- nsaserefpolicy/policy/modules/services/cups.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/cups.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -8,6 +8,7 @@ + /etc/cups/ppd/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) + /etc/cups/ppds\.dat -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) + /etc/cups/printers\.conf.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) ++/etc/cups/subscriptions.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) + /etc/cups/certs -d gen_context(system_u:object_r:cupsd_rw_etc_t,s0) + /etc/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.1/policy/modules/services/cups.te +--- nsaserefpolicy/policy/modules/services/cups.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/cups.te 2007-05-30 17:24:24.000000000 -0400 +@@ -93,8 +93,6 @@ + # generic socket here until appletalk socket is available in kernels + allow cupsd_t self:socket create_socket_perms; + +-send_audit_msgs_pattern(cupsd_t) +- + allow cupsd_t cupsd_etc_t:{ dir file } setattr; + read_files_pattern(cupsd_t,cupsd_etc_t,cupsd_etc_t) + read_lnk_files_pattern(cupsd_t,cupsd_etc_t,cupsd_etc_t) +@@ -151,9 +149,11 @@ + corenet_tcp_bind_reserved_port(cupsd_t) + corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t) + corenet_tcp_connect_all_ports(cupsd_t) ++corenet_tcp_connect_smbd_port(cupsd_t) + corenet_sendrecv_hplip_client_packets(cupsd_t) + corenet_sendrecv_ipp_client_packets(cupsd_t) + corenet_sendrecv_ipp_server_packets(cupsd_t) ++corenet_tcp_bind_all_rpc_ports(cupsd_t) + + dev_rw_printer(cupsd_t) + dev_read_urand(cupsd_t) +@@ -214,6 +214,7 @@ + libs_read_lib_files(cupsd_t) + + logging_send_syslog_msg(cupsd_t) ++logging_send_audit_msg(cupsd_t) + + miscfiles_read_localization(cupsd_t) + # invoking ghostscript needs to read fonts +@@ -223,6 +224,7 @@ + + sysnet_read_config(cupsd_t) + ++files_dontaudit_list_home(cupsd_t) + userdom_dontaudit_use_unpriv_user_fds(cupsd_t) + userdom_dontaudit_search_all_users_home_content(cupsd_t) + +@@ -233,7 +235,7 @@ + lpd_relabel_spool(cupsd_t) + ') + +-ifdef(`targeted_policy',` ++optional_policy(` + init_stream_connect_script(cupsd_t) + + unconfined_rw_pipes(cupsd_t) +@@ -279,6 +281,10 @@ + ') + + optional_policy(` ++ nis_use_ypbind(cupsd_t) ++') ++ ++optional_policy(` + nscd_socket_use(cupsd_t) + ') + +@@ -289,6 +295,10 @@ + ') + + optional_policy(` ++ mta_send_mail(cupsd_t) ++') ++ ++optional_policy(` + seutil_sigchld_newrole(cupsd_t) + ') + +@@ -391,7 +401,11 @@ + ') + ') + +-ifdef(`targeted_policy',` ++optional_policy(` ++ term_use_generic_ptys(cupsd_config_t) ++') ++ ++optional_policy(` + unconfined_rw_pipes(cupsd_config_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.0.1/policy/modules/services/cvs.te +--- nsaserefpolicy/policy/modules/services/cvs.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/cvs.te 2007-05-30 15:12:50.000000000 -0400 +@@ -16,6 +16,7 @@ + type cvs_t; + type cvs_exec_t; + inetd_tcp_service_domain(cvs_t,cvs_exec_t) ++application_executable_file(cvs_exec_t) + role system_r types cvs_t; + + type cvs_data_t; # customizable +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.0.1/policy/modules/services/cyrus.te +--- nsaserefpolicy/policy/modules/services/cyrus.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/cyrus.te 2007-05-30 15:12:50.000000000 -0400 +@@ -138,6 +138,7 @@ + + optional_policy(` + snmp_read_snmp_var_lib_files(cyrus_t) ++ snmp_dontaudit_write_snmp_var_lib_files(cyrus_t) + ') + + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.1/policy/modules/services/dbus.if +--- nsaserefpolicy/policy/modules/services/dbus.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/dbus.if 2007-05-30 15:12:50.000000000 -0400 +@@ -49,6 +49,12 @@ + ## + # + template(`dbus_per_role_template',` ++ gen_require(` ++ type system_dbusd_exec_t; ++ type system_dbusd_t; ++ type dbusd_etc_t; ++ class dbus { send_msg acquire_svc }; ++ ') + + ############################## + # +@@ -70,6 +76,7 @@ + # + + allow $1_dbusd_t self:process { getattr sigkill signal }; ++ dontaudit $1_dbusd_t self:process ptrace; + allow $1_dbusd_t self:file { getattr read write }; + allow $1_dbusd_t self:fifo_file rw_fifo_file_perms; + allow $1_dbusd_t self:dbus { send_msg acquire_svc }; +@@ -78,8 +85,6 @@ + allow $1_dbusd_t self:tcp_socket create_stream_socket_perms; + allow $1_dbusd_t self:netlink_selinux_socket create_socket_perms; + +- send_audit_msgs_pattern($1_dbusd_t) +- + # For connecting to the bus + allow $2 $1_dbusd_t:unix_stream_socket connectto; + type_change $2 $1_dbusd_t:dbus $1_dbusd_$1_t; +@@ -135,12 +140,24 @@ + selinux_compute_relabel_context($1_dbusd_t) + selinux_compute_user_contexts($1_dbusd_t) + ++ corecmd_bin_domtrans($1_dbusd_t, $1_t) ++ allow $1_t $1_dbusd_t:fd use; ++ allow $1_t $1_dbusd_t:fifo_file rw_fifo_file_perms; ++ allow $1_t $1_dbusd_t:process sigchld; ++ ++ ifdef(`hide_broken_symptoms', ` ++ dontaudit $1_t $1_dbusd_t:netlink_selinux_socket { read write }; ++ '); ++ ++ userdom_read_user_home_content_files($1, $1_dbusd_t) ++ + auth_read_pam_console_data($1_dbusd_t) + + libs_use_ld_so($1_dbusd_t) + libs_use_shared_libs($1_dbusd_t) + + logging_send_syslog_msg($1_dbusd_t) ++ logging_send_audit_msg($1_dbusd_t) + + miscfiles_read_localization($1_dbusd_t) + +@@ -204,6 +221,7 @@ + # For connecting to the bus + files_search_pids($2) + stream_connect_pattern($2,system_dbusd_var_run_t,system_dbusd_var_run_t,system_dbusd_t) ++ dbus_read_config($2) + ') + + ####################################### +@@ -273,6 +291,31 @@ + + ######################################## + ## ++## connectto a message on user/application specific DBUS. ++## ++## ++## ++## The prefix of the domain (e.g., user ++## is the prefix for user_t). ++## ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++template(`dbus_connectto_user_bus',` ++ gen_require(` ++ type $1_dbusd_t; ++ ') ++ ++ allow $2 $1_dbusd_t:unix_stream_socket connectto; ++') ++ ++ ++######################################## ++## + ## Read dbus configuration. + ## + ## +@@ -286,6 +329,7 @@ + type dbusd_etc_t; + ') + ++ allow $1 dbusd_etc_t:dir list_dir_perms; + allow $1 dbusd_etc_t:file read_file_perms; + ') + +@@ -346,3 +390,23 @@ + + allow $1 system_dbusd_t:dbus *; + ') ++ ++######################################## ++## ++## dontaudit attempts to use system_dbus_t selinux_socket ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dbus_dontaudit_rw_system_selinux_socket',` ++ gen_require(` ++ type system_dbusd_t; ++ ') ++ ++ dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write }; ++') ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.1/policy/modules/services/dbus.te +--- nsaserefpolicy/policy/modules/services/dbus.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/dbus.te 2007-05-30 15:12:50.000000000 -0400 +@@ -40,8 +40,6 @@ + # Receive notifications of policy reloads and enforcing status changes. + allow system_dbusd_t self:netlink_selinux_socket { create bind read }; + +-send_audit_msgs_pattern(system_dbusd_t) +- + allow system_dbusd_t dbusd_etc_t:dir list_dir_perms; + read_files_pattern(system_dbusd_t,dbusd_etc_t,dbusd_etc_t) + read_lnk_files_pattern(system_dbusd_t,dbusd_etc_t,dbusd_etc_t) +@@ -93,6 +91,7 @@ + libs_use_shared_libs(system_dbusd_t) + + logging_send_syslog_msg(system_dbusd_t) ++logging_send_audit_msg(system_dbusd_t) + + miscfiles_read_localization(system_dbusd_t) + miscfiles_read_certs(system_dbusd_t) +@@ -117,6 +116,10 @@ + ') + + optional_policy(` ++ nis_use_ypbind(system_dbusd_t) ++') ++ ++optional_policy(` + sysnet_domtrans_dhcpc(system_dbusd_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.0.1/policy/modules/services/dhcp.te +--- nsaserefpolicy/policy/modules/services/dhcp.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/dhcp.te 2007-05-30 15:12:50.000000000 -0400 +@@ -113,6 +113,8 @@ + dbus_system_bus_client_template(dhcpd,dhcpd_t) + dbus_connect_system_bus(dhcpd_t) + dbus_send_system_bus(dhcpd_t) ++ dbus_read_config(dhcpd_t) ++ dbus_dontaudit_rw_system_selinux_socket(dhcpd_t) + ') + + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/djbdns.te serefpolicy-3.0.1/policy/modules/services/djbdns.te +--- nsaserefpolicy/policy/modules/services/djbdns.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/djbdns.te 2007-05-30 15:12:50.000000000 -0400 +@@ -44,4 +44,7 @@ + libs_use_ld_so(djbdns_axfrdns_t) + libs_use_shared_libs(djbdns_axfrdns_t) + +-ucspitcp_service_domain(djbdns_axfrdns_t, djbdns_axfrdns_exec_t) ++optional_policy(` ++ ucspitcp_service_domain(djbdns_axfrdns_t, djbdns_axfrdns_exec_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.0.1/policy/modules/services/dovecot.fc +--- nsaserefpolicy/policy/modules/services/dovecot.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/dovecot.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -17,10 +17,12 @@ + + ifdef(`distro_debian', ` + /usr/lib/dovecot/dovecot-auth -- gen_context(system_u:object_r:dovecot_auth_exec_t,s0) ++/usr/lib/dovecot/deliver -- gen_context(system_u:object_r:dovecot_deliver_exec_t,s0) + ') + + ifdef(`distro_redhat', ` + /usr/libexec/dovecot/dovecot-auth -- gen_context(system_u:object_r:dovecot_auth_exec_t,s0) ++/usr/libexec/dovecot/deliver -- gen_context(system_u:object_r:dovecot_deliver_exec_t,s0) + ') + + # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.0.1/policy/modules/services/dovecot.if +--- nsaserefpolicy/policy/modules/services/dovecot.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/dovecot.if 2007-05-30 15:12:50.000000000 -0400 +@@ -18,3 +18,43 @@ + manage_files_pattern($1,dovecot_spool_t,dovecot_spool_t) + manage_lnk_files_pattern($1,dovecot_spool_t,dovecot_spool_t) + ') ++ ++######################################## ++## ++## Connect to dovecot auth unix domain stream socket. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`dovecot_auth_stream_connect',` ++ gen_require(` ++ type dovecot_auth_t, dovecot_var_run_t; ++ ') ++ ++ allow $1 dovecot_var_run_t:dir search; ++ allow $1 dovecot_var_run_t:sock_file write; ++ allow $1 dovecot_auth_t:unix_stream_socket connectto; ++') ++ ++######################################## ++## ++## Execute dovecot_deliver in the dovecot_deliver domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dovecot_domtrans_deliver',` ++ gen_require(` ++ type dovecot_deliver_t, dovecot_deliver_exec_t; ++ ') ++ ++ domtrans_pattern($1,dovecot_deliver_exec_t,dovecot_deliver_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.0.1/policy/modules/services/dovecot.te +--- nsaserefpolicy/policy/modules/services/dovecot.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/dovecot.te 2007-05-30 15:12:50.000000000 -0400 +@@ -15,6 +15,12 @@ + domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t) + role system_r types dovecot_auth_t; + ++type dovecot_deliver_t; ++type dovecot_deliver_exec_t; ++domain_type(dovecot_deliver_t) ++domain_entry_file(dovecot_deliver_t,dovecot_deliver_exec_t) ++role system_r types dovecot_deliver_t; ++ + type dovecot_cert_t; + files_type(dovecot_cert_t) + +@@ -46,8 +52,6 @@ + allow dovecot_t self:tcp_socket create_stream_socket_perms; + allow dovecot_t self:unix_dgram_socket create_socket_perms; + allow dovecot_t self:unix_stream_socket { create_stream_socket_perms connectto }; +-allow dovecot_t self:netlink_route_socket r_netlink_socket_perms; +- + domtrans_pattern(dovecot_t, dovecot_auth_exec_t, dovecot_auth_t) + + allow dovecot_t dovecot_cert_t:dir list_dir_perms; +@@ -67,6 +71,8 @@ + manage_sock_files_pattern(dovecot_t,dovecot_var_run_t,dovecot_var_run_t) + files_pid_filetrans(dovecot_t,dovecot_var_run_t,file) + ++auth_use_nsswitch(dovecot_t) ++ + kernel_read_kernel_sysctls(dovecot_t) + kernel_read_system_state(dovecot_t) + +@@ -110,9 +116,6 @@ + miscfiles_read_certs(dovecot_t) + miscfiles_read_localization(dovecot_t) + +-sysnet_read_config(dovecot_t) +-sysnet_use_ldap(dovecot_auth_t) +- + userdom_dontaudit_use_unpriv_user_fds(dovecot_t) + userdom_dontaudit_search_sysadm_home_dirs(dovecot_t) + userdom_priveleged_home_dir_manager(dovecot_t) +@@ -124,10 +127,6 @@ + ') + + optional_policy(` +- nis_use_ypbind(dovecot_t) +-') +- +-optional_policy(` + seutil_sigchld_newrole(dovecot_t) + ') + +@@ -144,25 +143,29 @@ + # dovecot auth local policy + # + +-allow dovecot_auth_t self:capability { setgid setuid }; ++allow dovecot_auth_t self:capability { chown dac_override setgid setuid }; + allow dovecot_auth_t self:process signal_perms; + allow dovecot_auth_t self:fifo_file rw_fifo_file_perms; + allow dovecot_auth_t self:unix_dgram_socket create_socket_perms; + allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms; + +-allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl }; ++allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl connectto }; + + allow dovecot_auth_t dovecot_passwd_t:file { getattr read }; + + # Allow dovecot to create and read SSL parameters file + manage_files_pattern(dovecot_t,dovecot_var_lib_t,dovecot_var_lib_t) + files_search_var_lib(dovecot_t) ++files_read_var_symlinks(dovecot_t) + + allow dovecot_auth_t dovecot_var_run_t:dir r_dir_perms; + + kernel_read_all_sysctls(dovecot_auth_t) + kernel_read_system_state(dovecot_auth_t) + ++logging_send_syslog_msg(dovecot_auth_t) ++logging_send_audit_msg(dovecot_auth_t) ++ + dev_read_urand(dovecot_auth_t) + + auth_domtrans_chk_passwd(dovecot_auth_t) +@@ -171,6 +174,7 @@ + files_read_etc_files(dovecot_auth_t) + files_read_etc_runtime_files(dovecot_auth_t) + files_search_pids(dovecot_auth_t) ++files_read_usr_files(dovecot_auth_t) + files_read_usr_symlinks(dovecot_auth_t) + files_search_tmp(dovecot_auth_t) + files_read_var_lib_files(dovecot_t) +@@ -184,12 +188,41 @@ + + seutil_dontaudit_search_config(dovecot_auth_t) + +-sysnet_dns_name_resolve(dovecot_auth_t) +- + optional_policy(` + kerberos_use(dovecot_auth_t) + ') + + optional_policy(` +- logging_send_syslog_msg(dovecot_auth_t) ++ mysql_search_db(dovecot_auth_t) ++ mysql_stream_connect(dovecot_auth_t) ++') ++ ++optional_policy(` ++ postfix_create_pivate_sockets(dovecot_auth_t) ++ postfix_search_spool(dovecot_auth_t) ++') ++ ++ ++######################################## ++# ++# dovecot deliver local policy ++# ++allow dovecot_deliver_t dovecot_etc_t:file read_file_perms; ++allow dovecot_deliver_t dovecot_var_run_t:dir r_dir_perms; ++ ++kernel_read_all_sysctls(dovecot_deliver_t) ++kernel_read_system_state(dovecot_deliver_t) ++ ++dovecot_auth_stream_connect(dovecot_deliver_t) ++ ++files_read_etc_files(dovecot_deliver_t) ++files_read_etc_runtime_files(dovecot_deliver_t) ++ ++libs_use_ld_so(dovecot_deliver_t) ++libs_use_shared_libs(dovecot_deliver_t) ++ ++miscfiles_read_localization(dovecot_deliver_t) ++ ++optional_policy(` ++ mta_manage_spool(dovecot_deliver_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.0.1/policy/modules/services/ftp.te +--- nsaserefpolicy/policy/modules/services/ftp.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/ftp.te 2007-05-30 15:12:50.000000000 -0400 +@@ -168,6 +168,7 @@ + libs_use_shared_libs(ftpd_t) + + logging_send_syslog_msg(ftpd_t) ++logging_send_audit_msg(ftpd_t) + + miscfiles_read_localization(ftpd_t) + miscfiles_read_public_files(ftpd_t) +@@ -216,10 +217,14 @@ + userdom_manage_all_users_home_content_dirs(ftpd_t) + userdom_manage_all_users_home_content_files(ftpd_t) + userdom_manage_all_users_home_content_symlinks(ftpd_t) ++ auth_manage_all_files_except_shadow(ftpd_t) + + ifdef(`targeted_policy',` +- userdom_generic_user_home_dir_filetrans_generic_user_home_content(ftpd_t,{ dir file lnk_file sock_file fifo_file }) ++ files_manage_generic_tmp_files(ftpd_t) + ') ++ auth_read_all_dirs_except_shadow(ftpd_t) ++ auth_read_all_files_except_shadow(ftpd_t) ++ auth_read_all_symlinks_except_shadow(ftpd_t) + ') + + tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.0.1/policy/modules/services/hal.fc +--- nsaserefpolicy/policy/modules/services/hal.fc 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/hal.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -2,15 +2,20 @@ + /etc/hal/device\.d/printer_remove\.hal -- gen_context(system_u:object_r:hald_exec_t,s0) + /etc/hal/capability\.d/printer_update\.hal -- gen_context(system_u:object_r:hald_exec_t,s0) + +-/usr/libexec/hal-acl-tool -- gen_context(system_u:object_r:hald_acl_exec_t,s0) + /usr/libexec/hal-hotplug-map -- gen_context(system_u:object_r:hald_exec_t,s0) +-/usr/libexec/hal-system-sonypic -- gen_context(system_u:object_r:hald_sonypic_exec_t,s0) +-/usr/libexec/hald-addon-macbookpro-backlight -- gen_context(system_u:object_r:hald_mac_exec_t,s0) + + /usr/sbin/hald -- gen_context(system_u:object_r:hald_exec_t,s0) + +-/var/cache/hald(/.*)? gen_context(system_u:object_r:hald_cache_t,s0) +- + /var/lib/hal(/.*)? gen_context(system_u:object_r:hald_var_lib_t,s0) + ++/var/cache/hald(/.*)? gen_context(system_u:object_r:hald_cache_t,s0) ++ + /var/run/haldaemon.pid -- gen_context(system_u:object_r:hald_var_run_t,s0) ++/var/run/vbestate -- gen_context(system_u:object_r:hald_var_run_t,s0) ++ ++/usr/libexec/hal-acl-tool -- gen_context(system_u:object_r:hald_acl_exec_t,s0) ++/usr/libexec/hald-addon-macbookpro-backlight -- gen_context(system_u:object_r:hald_mac_exec_t,s0) ++/usr/libexec/hal-system-sonypic -- gen_context(system_u:object_r:hald_sonypic_exec_t,s0) ++ ++/var/log/pm-suspend.log gen_context(system_u:object_r:hald_log_t,s0) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.0.1/policy/modules/services/hal.if +--- nsaserefpolicy/policy/modules/services/hal.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/hal.if 2007-05-30 15:12:50.000000000 -0400 +@@ -208,3 +208,98 @@ + files_search_pids($1) + allow $1 hald_var_run_t:file rw_file_perms; + ') ++ ++######################################## ++## ++## Do not audit attempts to write the hal ++## log files. ++## ++## ++## ++## Domain to not audit ++## ++## ++# ++interface(`hal_dontaudit_write_log',` ++ gen_require(` ++ type hald_log_t; ++ ') ++ ++ dontaudit $1 hald_log_t:file { append write }; ++') ++ ++######################################## ++## ++## Allow attempts to write the hal ++## log files. ++## ++## ++## ++## Domain to not audit ++## ++## ++# ++interface(`hal_write_log',` ++ gen_require(` ++ type hald_log_t; ++ ') ++ ++ logging_search_logs($1) ++ allow $1 hald_log_t:file rw_file_perms; ++') ++ ++######################################## ++## ++## Allow domain to use file descriptors from hal. ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`hal_use_fds',` ++ gen_require(` ++ type hald_t; ++ ') ++ ++ allow $1 hald_t:fd use; ++') ++ ++######################################## ++## ++## Allow attempts to read and write to ++## hald unnamed pipes. ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`hal_rw_pipes',` ++ gen_require(` ++ type hald_t; ++ ') ++ ++ allow $1 hald_t:fifo_file rw_fifo_file_perms; ++') ++ ++######################################## ++## ++## Allow ptrace of hal domain ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`hal_ptrace',` ++ gen_require(` ++ type hald_t; ++ ') ++ ++ allow $1 hald_t:process ptrace; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.0.1/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/hal.te 2007-05-30 15:12:50.000000000 -0400 +@@ -61,8 +61,6 @@ + # For backwards compatibility with older kernels + allow hald_t self:netlink_socket create_socket_perms; + +-send_audit_msgs_pattern(hald_t) +- + manage_files_pattern(hald_t,hald_cache_t,hald_cache_t) + + # log files for hald +@@ -115,6 +113,9 @@ + dev_rw_power_management(hald_t) + # hal is now execing pm-suspend + dev_rw_sysfs(hald_t) ++dev_read_sound(hald_t) ++dev_write_sound(hald_t) ++dev_read_raw_memory(hald_t) + + domain_use_interactive_fds(hald_t) + domain_read_all_domains_state(hald_t) +@@ -132,6 +133,7 @@ + files_create_boot_flag(hald_t) + files_getattr_all_dirs(hald_t) + files_read_kernel_img(hald_t) ++files_rw_lock_dirs(hald_t) + + fs_getattr_all_fs(hald_t) + fs_search_all(hald_t) +@@ -170,6 +172,7 @@ + libs_exec_ld_so(hald_t) + libs_exec_lib_files(hald_t) + ++logging_send_audit_msg(hald_t) + logging_send_syslog_msg(hald_t) + logging_search_logs(hald_t) + +@@ -180,6 +183,7 @@ + + seutil_read_config(hald_t) + seutil_read_default_contexts(hald_t) ++seutil_read_file_contexts(hald_t) + + sysnet_read_config(hald_t) + +@@ -187,6 +191,7 @@ + userdom_dontaudit_search_sysadm_home_dirs(hald_t) + + optional_policy(` ++ alsa_domtrans(hald_t) + alsa_read_rw_config(hald_t) + ') + +@@ -296,7 +301,10 @@ + corecmd_exec_bin(hald_acl_t) + + dev_getattr_all_chr_files(hald_acl_t) ++dev_getattr_generic_usb_dev(hald_acl_t) ++dev_getattr_video_dev(hald_acl_t) + dev_setattr_video_dev(hald_acl_t) ++dev_getattr_sound_dev(hald_acl_t) + dev_setattr_sound_dev(hald_acl_t) + dev_setattr_generic_usb_dev(hald_acl_t) + dev_setattr_usbfs_files(hald_acl_t) +@@ -358,3 +366,4 @@ + libs_use_shared_libs(hald_sonypic_t) + + miscfiles_read_localization(hald_sonypic_t) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.0.1/policy/modules/services/inetd.te +--- nsaserefpolicy/policy/modules/services/inetd.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/inetd.te 2007-05-31 14:32:57.000000000 -0400 +@@ -79,17 +79,21 @@ + corenet_udp_bind_comsat_port(inetd_t) + corenet_tcp_bind_dbskkd_port(inetd_t) + corenet_udp_bind_dbskkd_port(inetd_t) ++corenet_tcp_bind_ftp_port(inetd_t) + corenet_udp_bind_ftp_port(inetd_t) + corenet_tcp_bind_inetd_child_port(inetd_t) +-corenet_tcp_bind_inetd_child_port(inetd_t) ++corenet_udp_bind_inetd_child_port(inetd_t) + corenet_udp_bind_ktalkd_port(inetd_t) + corenet_tcp_bind_printer_port(inetd_t) ++corenet_udp_bind_rlogind_port(inetd_t) + corenet_udp_bind_rsh_port(inetd_t) ++corenet_tcp_bind_rsh_port(inetd_t) + corenet_tcp_bind_rsync_port(inetd_t) + corenet_udp_bind_rsync_port(inetd_t) + #corenet_tcp_bind_stunnel_port(inetd_t) + corenet_tcp_bind_swat_port(inetd_t) + corenet_udp_bind_swat_port(inetd_t) ++corenet_tcp_bind_telnetd_port(inetd_t) + corenet_udp_bind_tftp_port(inetd_t) + corenet_tcp_bind_ssh_port(inetd_t) + +@@ -135,8 +139,8 @@ + mls_fd_use_all_levels(inetd_t) + mls_fd_share_all_levels(inetd_t) + mls_socket_read_to_clearance(inetd_t) ++mls_socket_write_to_clearance(inetd_t) + mls_process_set_level(inetd_t) +-mls_socket_read_to_clearance(inetd_t) + + sysnet_read_config(inetd_t) + +@@ -177,6 +181,9 @@ + # for identd + allow inetd_child_t self:netlink_tcpdiag_socket r_netlink_socket_perms; + allow inetd_child_t self:capability { setuid setgid }; ++allow inetd_child_t self:dir search; ++allow inetd_child_t self:{ lnk_file file } { getattr read }; ++ + files_search_home(inetd_child_t) + + manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.1/policy/modules/services/kerberos.if +--- nsaserefpolicy/policy/modules/services/kerberos.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/kerberos.if 2007-05-30 15:12:50.000000000 -0400 +@@ -33,43 +33,10 @@ + # + interface(`kerberos_use',` + gen_require(` +- type krb5_conf_t; +- type krb5kdc_conf_t; ++ attribute kerberosclient; + ') + +- files_search_etc($1) +- allow $1 krb5_conf_t:file { getattr read }; +- dontaudit $1 krb5_conf_t:file write; +- dontaudit $1 krb5kdc_conf_t:dir list_dir_perms; +- dontaudit $1 krb5kdc_conf_t:file rw_file_perms; +- +- tunable_policy(`allow_kerberos',` +- allow $1 self:tcp_socket create_socket_perms; +- allow $1 self:udp_socket create_socket_perms; +- +- corenet_non_ipsec_sendrecv($1) +- corenet_tcp_sendrecv_all_if($1) +- corenet_udp_sendrecv_all_if($1) +- corenet_tcp_sendrecv_all_nodes($1) +- corenet_udp_sendrecv_all_nodes($1) +- corenet_tcp_sendrecv_kerberos_port($1) +- corenet_udp_sendrecv_kerberos_port($1) +- corenet_tcp_bind_all_nodes($1) +- corenet_udp_bind_all_nodes($1) +- corenet_tcp_connect_kerberos_port($1) +- corenet_tcp_connect_ocsp_port($1) +- corenet_sendrecv_kerberos_client_packets($1) +- corenet_sendrecv_ocsp_client_packets($1) +- +- sysnet_read_config($1) +- sysnet_dns_name_resolve($1) +- ') +- +- optional_policy(` +- tunable_policy(`allow_kerberos',` +- pcscd_stream_connect($1) +- ') +- ') ++ typeattribute $1 kerberosclient; + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.1/policy/modules/services/kerberos.te +--- nsaserefpolicy/policy/modules/services/kerberos.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/kerberos.te 2007-05-30 15:12:50.000000000 -0400 +@@ -5,6 +5,7 @@ + # + # Declarations + # ++attribute kerberosclient; + + ## + ##

+@@ -126,6 +127,7 @@ + miscfiles_read_localization(kadmind_t) + + sysnet_read_config(kadmind_t) ++sysnet_use_ldap(kadmind_t) + + userdom_dontaudit_use_unpriv_user_fds(kadmind_t) + userdom_dontaudit_search_sysadm_home_dirs(kadmind_t) +@@ -221,6 +223,7 @@ + miscfiles_read_localization(krb5kdc_t) + + sysnet_read_config(krb5kdc_t) ++sysnet_use_ldap(krb5kdc_t) + + userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t) + userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t) +@@ -236,3 +239,36 @@ + optional_policy(` + udev_read_db(krb5kdc_t) + ') ++ ++files_search_etc(kerberosclient) ++allow kerberosclient krb5_conf_t:file { getattr read }; ++dontaudit kerberosclient krb5_conf_t:file write; ++dontaudit kerberosclient krb5kdc_conf_t:dir list_dir_perms; ++dontaudit kerberosclient krb5kdc_conf_t:file rw_file_perms; ++ ++tunable_policy(`allow_kerberos',` ++ allow kerberosclient self:tcp_socket create_socket_perms; ++ allow kerberosclient self:udp_socket create_socket_perms; ++ ++ corenet_non_ipsec_sendrecv(kerberosclient) ++ corenet_tcp_sendrecv_all_if(kerberosclient) ++ corenet_udp_sendrecv_all_if(kerberosclient) ++ corenet_tcp_sendrecv_all_nodes(kerberosclient) ++ corenet_udp_sendrecv_all_nodes(kerberosclient) ++ corenet_tcp_sendrecv_kerberos_port(kerberosclient) ++ corenet_udp_sendrecv_kerberos_port(kerberosclient) ++ corenet_tcp_bind_all_nodes(kerberosclient) ++ corenet_udp_bind_all_nodes(kerberosclient) ++ corenet_tcp_connect_kerberos_port(kerberosclient) ++ corenet_tcp_connect_ocsp_port(kerberosclient) ++ corenet_sendrecv_kerberos_client_packets(kerberosclient) ++ corenet_sendrecv_ocsp_client_packets(kerberosclient) ++ ++ sysnet_read_config(kerberosclient) ++ sysnet_dns_name_resolve(kerberosclient) ++') ++optional_policy(` ++ tunable_policy(`allow_kerberos',` ++ pcscd_stream_connect(kerberosclient) ++ ') ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.0.1/policy/modules/services/mailman.if +--- nsaserefpolicy/policy/modules/services/mailman.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/mailman.if 2007-05-30 15:12:50.000000000 -0400 +@@ -275,6 +275,25 @@ + + ####################################### + ##

++## append ++## mailman logs. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`mailman_append_log',` ++ gen_require(` ++ type mailman_log_t; ++ ') ++ ++ append_files_pattern($1,mailman_log_t,mailman_log_t) ++') ++ ++####################################### ++## + ## Allow domain to read mailman archive files. + ## + ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.0.1/policy/modules/services/mta.te +--- nsaserefpolicy/policy/modules/services/mta.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/mta.te 2007-05-30 15:12:50.000000000 -0400 +@@ -27,18 +27,11 @@ + + type sendmail_exec_t; + files_type(sendmail_exec_t) ++application_executable_file(sendmail_exec_t) + + mta_base_mail_template(system) + role system_r types system_mail_t; + +-# cjp: need to resolve this, but require{} +-# does not work in the else part of the optional +-#ifdef(`strict_policy',` +-# optional_policy(`',` +-# init_system_domain(system_mail_t,sendmail_exec_t) +-# ') +-#') +- + ######################################## + # + # System mail local policy +@@ -61,7 +54,6 @@ + userdom_dontaudit_search_sysadm_home_dirs(system_mail_t) + + ifdef(`targeted_policy',` +- typealias system_mail_t alias sysadm_mail_t; + + manage_dirs_pattern(system_mail_t,mail_spool_t,mail_spool_t) + manage_files_pattern(system_mail_t,mail_spool_t,mail_spool_t) +@@ -91,6 +83,7 @@ + optional_policy(` + apache_read_squirrelmail_data(system_mail_t) + apache_append_squirrelmail_data(system_mail_t) ++ apache_search_bugzilla_dirs(system_mail_t) + + # apache should set close-on-exec + apache_dontaudit_append_log(system_mail_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.0.1/policy/modules/services/nagios.te +--- nsaserefpolicy/policy/modules/services/nagios.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/nagios.te 2007-05-30 15:12:50.000000000 -0400 +@@ -73,8 +73,10 @@ + corenet_udp_sendrecv_all_nodes(nagios_t) + corenet_tcp_sendrecv_all_ports(nagios_t) + corenet_udp_sendrecv_all_ports(nagios_t) ++corenet_tcp_connect_all_ports(nagios_t) + + dev_read_sysfs(nagios_t) ++dev_read_urand(nagios_t) + + domain_use_interactive_fds(nagios_t) + # for ps +@@ -97,8 +99,6 @@ + + miscfiles_read_localization(nagios_t) + +-sysnet_read_config(nagios_t) +- + userdom_dontaudit_use_unpriv_user_fds(nagios_t) + userdom_dontaudit_search_sysadm_home_dirs(nagios_t) + +@@ -108,14 +108,10 @@ + netutils_domtrans_ping(nagios_t) + netutils_signal_ping(nagios_t) + netutils_kill_ping(nagios_t) +- +- # cjp: leaked file descriptors: +- #dontaudit ping_t nagios_etc_t:file read; +- #dontaudit ping_t nagios_log_t:fifo_file read; + ') + + optional_policy(` +- nis_use_ypbind(nagios_t) ++ auth_use_nsswitch(nagios_t) + ') + + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.0.1/policy/modules/services/networkmanager.if +--- nsaserefpolicy/policy/modules/services/networkmanager.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/networkmanager.if 2007-05-30 15:12:50.000000000 -0400 +@@ -78,3 +78,22 @@ + allow $1 NetworkManager_t:dbus send_msg; + allow NetworkManager_t $1:dbus send_msg; + ') ++ ++######################################## ++## ++## Transition to NetworkManager ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`networkmanager_domtrans',` ++ gen_require(` ++ type NetworkManager_t, NetworkManager_exec_t; ++ ') ++ corecmd_search_bin($1) ++ domtrans_pattern($1,NetworkManager_exec_t,NetworkManager_t) ++ ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.0.1/policy/modules/services/nis.fc +--- nsaserefpolicy/policy/modules/services/nis.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/nis.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -4,6 +4,7 @@ + /sbin/ypbind -- gen_context(system_u:object_r:ypbind_exec_t,s0) + + /usr/lib/yp/ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) ++/usr/lib64/yp/ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) + + /usr/sbin/rpc\.yppasswdd -- gen_context(system_u:object_r:yppasswdd_exec_t,s0) + /usr/sbin/rpc\.ypxfrd -- gen_context(system_u:object_r:ypxfr_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.0.1/policy/modules/services/nis.if +--- nsaserefpolicy/policy/modules/services/nis.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/nis.if 2007-05-30 15:12:50.000000000 -0400 +@@ -48,8 +48,8 @@ + corenet_udp_bind_all_nodes($1) + corenet_tcp_bind_generic_port($1) + corenet_udp_bind_generic_port($1) +- corenet_tcp_bind_reserved_port($1) +- corenet_udp_bind_reserved_port($1) ++ corenet_dontaudit_tcp_bind_all_reserved_ports($1) ++ corenet_dontaudit_udp_bind_all_reserved_ports($1) + corenet_dontaudit_tcp_bind_all_ports($1) + corenet_dontaudit_udp_bind_all_ports($1) + corenet_tcp_connect_portmap_port($1) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.0.1/policy/modules/services/nis.te +--- nsaserefpolicy/policy/modules/services/nis.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/nis.te 2007-05-30 15:12:50.000000000 -0400 +@@ -112,6 +112,14 @@ + userdom_dontaudit_use_unpriv_user_fds(ypbind_t) + userdom_dontaudit_search_sysadm_home_dirs(ypbind_t) + ++ ++optional_policy(` ++ dbus_system_bus_client_template(ypbind,ypbind_t) ++ dbus_connect_system_bus(ypbind_t) ++ dbus_send_system_bus(ypbind_t) ++ init_dbus_chat_script(ypbind_t) ++') ++ + optional_policy(` + seutil_sigchld_newrole(ypbind_t) + ') +@@ -192,6 +200,7 @@ + userdom_dontaudit_use_unpriv_user_fds(yppasswdd_t) + userdom_dontaudit_search_sysadm_home_dirs(yppasswdd_t) + ++ + optional_policy(` + hostname_exec(yppasswdd_t) + ') +@@ -244,6 +253,8 @@ + corenet_udp_bind_all_nodes(ypserv_t) + corenet_tcp_bind_reserved_port(ypserv_t) + corenet_udp_bind_reserved_port(ypserv_t) ++corenet_tcp_bind_all_rpc_ports(ypserv_t) ++corenet_udp_bind_all_rpc_ports(ypserv_t) + corenet_dontaudit_tcp_bind_all_reserved_ports(ypserv_t) + corenet_dontaudit_udp_bind_all_reserved_ports(ypserv_t) + corenet_sendrecv_generic_server_packets(ypserv_t) +@@ -274,6 +285,7 @@ + userdom_dontaudit_use_unpriv_user_fds(ypserv_t) + userdom_dontaudit_search_sysadm_home_dirs(ypserv_t) + ++ + optional_policy(` + seutil_sigchld_newrole(ypserv_t) + ') +@@ -311,6 +323,8 @@ + corenet_udp_bind_all_nodes(ypxfr_t) + corenet_tcp_bind_reserved_port(ypxfr_t) + corenet_udp_bind_reserved_port(ypxfr_t) ++corenet_tcp_bind_all_rpc_ports(ypxfr_t) ++corenet_udp_bind_all_rpc_ports(ypxfr_t) + corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t) + corenet_dontaudit_udp_bind_all_reserved_ports(ypxfr_t) + corenet_tcp_connect_all_ports(ypxfr_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.0.1/policy/modules/services/nscd.te +--- nsaserefpolicy/policy/modules/services/nscd.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/nscd.te 2007-05-30 15:12:50.000000000 -0400 +@@ -28,14 +28,14 @@ + # Local policy + # + +-allow nscd_t self:capability { kill setgid setuid audit_write }; ++allow nscd_t self:capability { kill setgid setuid }; + dontaudit nscd_t self:capability sys_tty_config; +-allow nscd_t self:process { getattr setsched signal_perms }; ++allow nscd_t self:process { getattr setcap setsched signal_perms }; + allow nscd_t self:fifo_file { read write }; + allow nscd_t self:unix_stream_socket create_stream_socket_perms; + allow nscd_t self:unix_dgram_socket create_socket_perms; + allow nscd_t self:netlink_selinux_socket create_socket_perms; +-allow nscd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; ++ + allow nscd_t self:tcp_socket create_socket_perms; + allow nscd_t self:udp_socket create_socket_perms; + +@@ -93,6 +93,7 @@ + libs_use_shared_libs(nscd_t) + + logging_send_syslog_msg(nscd_t) ++logging_send_audit_msg(nscd_t) + + miscfiles_read_localization(nscd_t) + +@@ -113,3 +114,11 @@ + xen_dontaudit_rw_unix_stream_sockets(nscd_t) + xen_append_log(nscd_t) + ') ++ ++optional_policy(` ++ tunable_policy(`samba_domain_controller',` ++ samba_append_log(nscd_t) ++ samba_dontaudit_use_fds(nscd_t) ++ ') ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.0.1/policy/modules/services/ntp.te +--- nsaserefpolicy/policy/modules/services/ntp.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/ntp.te 2007-05-30 17:34:07.000000000 -0400 +@@ -110,14 +110,6 @@ + userdom_list_sysadm_home_dirs(ntpd_t) + userdom_dontaudit_list_sysadm_home_dirs(ntpd_t) + +-ifdef(`targeted_policy', ` +- optional_policy(` +- # The Gnome date GUI code is requesting that +- # the ntp code change the date of the machine. +- unconfined_rw_pipes(ntpd_t) +- ') +-') +- + optional_policy(` + # for cron jobs + cron_system_entry(ntpd_t,ntpdate_exec_t) +@@ -133,6 +125,10 @@ + ') + + optional_policy(` ++ hal_dontaudit_write_log(ntpd_t) ++') ++ ++optional_policy(` + seutil_sigchld_newrole(ntpd_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.0.1/policy/modules/services/oddjob.te +--- nsaserefpolicy/policy/modules/services/oddjob.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/oddjob.te 2007-05-30 15:12:50.000000000 -0400 +@@ -27,7 +27,7 @@ + # oddjob local policy + # + +-allow oddjob_t self:capability { audit_write setgid } ; ++allow oddjob_t self:capability setgid; + allow oddjob_t self:process { setexec signal }; + allow oddjob_t self:fifo_file { read write }; + allow oddjob_t self:unix_stream_socket create_stream_socket_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.fc serefpolicy-3.0.1/policy/modules/services/openct.fc +--- nsaserefpolicy/policy/modules/services/openct.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/openct.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -2,6 +2,7 @@ + # /usr + # + /usr/sbin/openct-control -- gen_context(system_u:object_r:openct_exec_t,s0) ++/usr/sbin/ifdhandler -- gen_context(system_u:object_r:openct_exec_t,s0) + + # + # /var +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.if serefpolicy-3.0.1/policy/modules/services/openct.if +--- nsaserefpolicy/policy/modules/services/openct.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/openct.if 2007-05-30 15:12:50.000000000 -0400 +@@ -1 +1,82 @@ + ## Service for handling smart card readers. ++ ++######################################## ++## ++## Execute a domain transition to run openct. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`openct_domtrans',` ++ gen_require(` ++ type openct_t, openct_exec_t; ++ ') ++ ++ domain_auto_trans($1,openct_exec_t,openct_t) ++ ++ allow openct_t $1:fd use; ++ allow openct_t $1:fifo_file rw_file_perms; ++ allow openct_t $1:process sigchld; ++') ++ ++######################################## ++## ++## Read openct PID files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`openct_read_pid_files',` ++ gen_require(` ++ type openct_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 openct_var_run_t:dir search_dir_perms; ++ allow $1 openct_var_run_t:file r_file_perms; ++') ++ ++######################################## ++## ++## Connect to openct over an unix stream socket. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`openct_stream_connect',` ++ gen_require(` ++ type openct_t, openct_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 openct_var_run_t:dir search_dir_perms; ++ allow $1 openct_var_run_t:sock_file write; ++ allow $1 openct_t:unix_stream_socket connectto; ++') ++ ++######################################## ++## ++## Send openct a null signal. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`openct_signull',` ++ gen_require(` ++ type openct_t; ++ ') ++ ++ allow $1 openct_t:process signull; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.te serefpolicy-3.0.1/policy/modules/services/openct.te +--- nsaserefpolicy/policy/modules/services/openct.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/openct.te 2007-05-30 15:12:50.000000000 -0400 +@@ -21,9 +21,13 @@ + dontaudit openct_t self:capability sys_tty_config; + allow openct_t self:process signal_perms; + ++can_exec(openct_t,openct_exec_t) ++ + manage_files_pattern(openct_t,openct_var_run_t,openct_var_run_t) + files_pid_filetrans(openct_t,openct_var_run_t,file) + ++corecmd_search_bin(openct_t) ++ + kernel_read_kernel_sysctls(openct_t) + kernel_list_proc(openct_t) + kernel_read_proc_symlinks(openct_t) +@@ -31,6 +35,8 @@ + dev_read_sysfs(openct_t) + # openct asks for this + dev_rw_usbfs(openct_t) ++dev_rw_smartcard(openct_t) ++dev_rw_generic_usb_dev(openct_t) + + domain_use_interactive_fds(openct_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-3.0.1/policy/modules/services/openvpn.fc +--- nsaserefpolicy/policy/modules/services/openvpn.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/openvpn.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -11,5 +11,5 @@ + # + # /var + # +-/var/log/openvpn.* -- gen_context(system_u:object_r:openvpn_var_log_t,s0) +-/var/run/openvpn.* -- gen_context(system_u:object_r:openvpn_var_run_t,s0) ++/var/log/openvpn(/.*)? gen_context(system_u:object_r:openvpn_var_log_t,s0) ++/var/run/openvpn(/.*)? gen_context(system_u:object_r:openvpn_var_run_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.0.1/policy/modules/services/openvpn.te +--- nsaserefpolicy/policy/modules/services/openvpn.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/openvpn.te 2007-05-30 15:12:50.000000000 -0400 +@@ -84,6 +84,11 @@ + sysnet_dns_name_resolve(openvpn_t) + sysnet_exec_ifconfig(openvpn_t) + ++ifdef(`targeted_policy',` ++ # Need to interact with terminals if config option "auth-user-pass" is used ++ term_use_generic_ptys(openvpn_t) ++') ++ + optional_policy(` + daemontools_service_domain(openvpn_t,openvpn_exec_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.0.1/policy/modules/services/pcscd.te +--- nsaserefpolicy/policy/modules/services/pcscd.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/pcscd.te 2007-05-30 15:12:50.000000000 -0400 +@@ -21,6 +21,7 @@ + # + + allow pcscd_t self:capability { dac_override dac_read_search }; ++allow pcscd_t self:process signal; + allow pcscd_t self:fifo_file { read write }; + allow pcscd_t self:unix_stream_socket create_stream_socket_perms; + allow pcscd_t self:unix_dgram_socket create_socket_perms; +@@ -57,5 +58,13 @@ + sysnet_dns_name_resolve(pcscd_t) + + optional_policy(` ++ openct_stream_connect(pcscd_t) ++ openct_read_pid_files(pcscd_t) ++ openct_signull(pcscd_t) ++') ++ ++optional_policy(` + rpm_use_script_fds(pcscd_t) + ') ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-3.0.1/policy/modules/services/pegasus.if +--- nsaserefpolicy/policy/modules/services/pegasus.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/pegasus.if 2007-05-30 15:12:50.000000000 -0400 +@@ -1 +1,19 @@ + ## The Open Group Pegasus CIM/WBEM Server. ++ ++######################################## ++## ++## Execute a domain transition to run pegasus. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`pegasus_domtrans',` ++ gen_require(` ++ type pegasus_t, pegasus_exec_t; ++ ') ++ ++ domtrans_pattern($1,pegasus_exec_t,pegasus_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.0.1/policy/modules/services/pegasus.te +--- nsaserefpolicy/policy/modules/services/pegasus.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/pegasus.te 2007-05-30 15:12:50.000000000 -0400 +@@ -38,8 +38,6 @@ + allow pegasus_t self:unix_stream_socket create_stream_socket_perms; + allow pegasus_t self:tcp_socket create_stream_socket_perms; + +-send_audit_msgs_pattern(pegasus_t) +- + allow pegasus_t pegasus_conf_t:dir rw_dir_perms; + allow pegasus_t pegasus_conf_t:file { read_file_perms link unlink }; + allow pegasus_t pegasus_conf_t:lnk_file read_lnk_file_perms; +@@ -96,13 +94,12 @@ + + auth_use_nsswitch(pegasus_t) + auth_domtrans_chk_passwd(pegasus_t) ++auth_read_shadow(pegasus_t) + + domain_use_interactive_fds(pegasus_t) + domain_read_all_domains_state(pegasus_t) + +-files_read_etc_files(pegasus_t) +-files_list_var_lib(pegasus_t) +-files_read_var_lib_files(pegasus_t) ++files_read_all_files(pegasus_t) + files_read_var_lib_symlinks(pegasus_t) + + hostname_exec(pegasus_t) +@@ -116,12 +113,18 @@ + miscfiles_read_localization(pegasus_t) + + sysnet_read_config(pegasus_t) ++sysnet_domtrans_ifconfig(pegasus_t) + + userdom_dontaudit_use_unpriv_user_fds(pegasus_t) + userdom_dontaudit_search_sysadm_home_dirs(pegasus_t) + + optional_policy(` ++ unconfined_signull(pegasus_t) ++') ++ ++optional_policy(` + logging_send_syslog_msg(pegasus_t) ++ logging_send_audit_msg(pegasus_t) + ') + + optional_policy(` +@@ -136,7 +139,3 @@ + optional_policy(` + udev_read_db(pegasus_t) + ') +- +-optional_policy(` +- unconfined_signull(pegasus_t) +-') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.0.1/policy/modules/services/postfix.if +--- nsaserefpolicy/policy/modules/services/postfix.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/postfix.if 2007-05-30 15:12:50.000000000 -0400 +@@ -131,10 +131,8 @@ + corenet_tcp_connect_all_ports(postfix_$1_t) + corenet_sendrecv_all_client_packets(postfix_$1_t) + +- sysnet_read_config(postfix_$1_t) +- + optional_policy(` +- nis_use_ypbind(postfix_$1_t) ++ auth_use_nsswitch(postfix_$1_t) + ') + ') + +@@ -449,3 +447,22 @@ + + typeattribute $1 postfix_user_domtrans; + ') ++ ++######################################## ++## ++## Create a named socket in a postfix private directory. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`postfix_create_pivate_sockets',` ++ gen_require(` ++ type postfix_private_t; ++ ') ++ ++ allow $1 postfix_private_t:dir list_dir_perms; ++ create_sock_files_pattern($1,postfix_private_t,postfix_private_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.0.1/policy/modules/services/postfix.te +--- nsaserefpolicy/policy/modules/services/postfix.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/postfix.te 2007-05-30 15:12:50.000000000 -0400 +@@ -169,6 +169,12 @@ + mta_rw_aliases(postfix_master_t) + mta_read_sendmail_bin(postfix_master_t) + ++term_dontaudit_search_ptys(postfix_master_t) ++ ++optional_policy(` ++ auth_use_nsswitch(postfix_master_t) ++') ++ + optional_policy(` + cyrus_stream_connect(postfix_master_t) + ') +@@ -179,6 +185,10 @@ + ') + + optional_policy(` ++ mysql_stream_connect(postfix_master_t) ++') ++ ++optional_policy(` + nis_use_ypbind(postfix_master_t) + ') + +@@ -205,6 +215,7 @@ + + allow postfix_bounce_t self:capability dac_read_search; + allow postfix_bounce_t self:tcp_socket create_socket_perms; ++allow postfix_bounce_t postfix_master_t:file read; + + allow postfix_bounce_t postfix_public_t:sock_file write; + allow postfix_bounce_t postfix_public_t:dir search; +@@ -223,6 +234,7 @@ + # + + allow postfix_cleanup_t self:process setrlimit; ++allow postfix_cleanup_t postfix_master_t:file read; + + # connect to master process + stream_connect_pattern(postfix_cleanup_t,postfix_private_t,postfix_private_t,postfix_master_t) +@@ -245,6 +257,7 @@ + + allow postfix_local_t self:fifo_file rw_fifo_file_perms; + allow postfix_local_t self:process { setsched setrlimit }; ++allow postfix_local_t postfix_master_t:file read; + + manage_dirs_pattern(postfix_local_t,postfix_local_tmp_t,postfix_local_tmp_t) + manage_files_pattern(postfix_local_t,postfix_local_tmp_t,postfix_local_tmp_t) +@@ -359,6 +372,7 @@ + # + + allow postfix_pickup_t self:tcp_socket create_socket_perms; ++allow postfix_pickup_t postfix_master_t:file read; + + stream_connect_pattern(postfix_pickup_t,postfix_private_t,postfix_private_t,postfix_master_t) + +@@ -376,7 +390,7 @@ + # Postfix pipe local policy + # + +-allow postfix_pipe_t self:fifo_file { read write }; ++allow postfix_pipe_t self:fifo_file rw_fifo_file_perms; + + write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t) + +@@ -385,6 +399,10 @@ + rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t) + + optional_policy(` ++ dovecot_domtrans_deliver(postfix_pipe_t) ++') ++ ++optional_policy(` + procmail_domtrans(postfix_pipe_t) + ') + +@@ -425,6 +443,11 @@ + cron_system_entry(postfix_postdrop_t, postfix_postdrop_exec_t) + ') + ++# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239951 ++optional_policy(` ++ fstools_read_pipes(postfix_postdrop_t) ++') ++ + optional_policy(` + ppp_use_fds(postfix_postqueue_t) + ppp_sigchld(postfix_postqueue_t) +@@ -460,6 +483,8 @@ + # Postfix qmgr local policy + # + ++allow postfix_qmgr_t postfix_master_t:file read; ++ + stream_connect_pattern(postfix_qmgr_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t) + + rw_fifo_files_pattern(postfix_qmgr_t,postfix_public_t,postfix_public_t) +@@ -504,8 +529,6 @@ + # Postfix smtp delivery local policy + # + +-allow postfix_smtp_t self:netlink_route_socket r_netlink_socket_perms; +- + # connect to master process + stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t) + +@@ -537,9 +560,18 @@ + mta_read_aliases(postfix_smtpd_t) + + optional_policy(` ++ mailman_read_data_files(postfix_smtpd_t) ++') ++ ++optional_policy(` + postgrey_stream_connect(postfix_smtpd_t) + ') + + optional_policy(` + sasl_connect(postfix_smtpd_t) + ') ++ ++optional_policy(` ++ dovecot_auth_stream_connect(postfix_smtpd_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.0.1/policy/modules/services/ppp.te +--- nsaserefpolicy/policy/modules/services/ppp.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/ppp.te 2007-05-30 15:12:50.000000000 -0400 +@@ -153,7 +153,7 @@ + + files_exec_etc_files(pppd_t) + files_manage_etc_runtime_files(pppd_t) +-files_etc_filetrans_etc_runtime(pppd_t, { dir file }) ++sysnet_etc_filetrans_config(pppd_t) + files_dontaudit_write_etc_files(pppd_t) + + # for scripts +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.0.1/policy/modules/services/procmail.te +--- nsaserefpolicy/policy/modules/services/procmail.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/procmail.te 2007-05-30 15:12:50.000000000 -0400 +@@ -10,6 +10,7 @@ + type procmail_exec_t; + domain_type(procmail_t) + domain_entry_file(procmail_t,procmail_exec_t) ++application_executable_file(procmail_exec_t) + role system_r types procmail_t; + + type procmail_tmp_t; +@@ -101,6 +102,10 @@ + ') + + optional_policy(` ++ nis_use_ypbind(procmail_t) ++') ++ ++optional_policy(` + # for a bug in the postfix local program + postfix_dontaudit_rw_local_tcp_sockets(procmail_t) + postfix_dontaudit_use_fds(procmail_t) +@@ -119,8 +124,11 @@ + + optional_policy(` + corenet_udp_bind_generic_port(procmail_t) ++ corenet_dontaudit_udp_bind_all_ports(procmail_t) + + spamassassin_exec(procmail_t) + spamassassin_exec_client(procmail_t) + spamassassin_read_lib_files(procmail_t) + ') ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.0.1/policy/modules/services/pyzor.te +--- nsaserefpolicy/policy/modules/services/pyzor.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/pyzor.te 2007-05-30 15:12:50.000000000 -0400 +@@ -54,6 +54,11 @@ + corenet_udp_sendrecv_all_nodes(pyzor_t) + corenet_udp_sendrecv_all_ports(pyzor_t) + ++corenet_tcp_sendrecv_all_if(pyzor_t) ++corenet_tcp_sendrecv_all_nodes(pyzor_t) ++corenet_tcp_sendrecv_all_ports(pyzor_t) ++corenet_tcp_connect_http_port(pyzor_t) ++ + dev_read_urand(pyzor_t) + + files_read_etc_files(pyzor_t) +@@ -68,6 +73,7 @@ + userdom_dontaudit_search_sysadm_home_dirs(pyzor_t) + + ifdef(`targeted_policy',` ++ userdom_dontaudit_write_sysadm_home_dirs(pyzor_t) + userdom_read_generic_user_home_content_files(pyzor_t) + ') + +@@ -77,6 +83,7 @@ + ') + + optional_policy(` ++ spamassassin_signal_spamd(pyzor_t) + spamassassin_read_spamd_tmp_files(pyzor_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.0.1/policy/modules/services/radius.te +--- nsaserefpolicy/policy/modules/services/radius.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/radius.te 2007-05-30 15:12:50.000000000 -0400 +@@ -124,3 +124,7 @@ + optional_policy(` + udev_read_db(radiusd_t) + ') ++ ++optional_policy(` ++ samba_read_var_files(radiusd_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-3.0.1/policy/modules/services/remotelogin.te +--- nsaserefpolicy/policy/modules/services/remotelogin.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/remotelogin.te 2007-05-30 17:31:03.000000000 -0400 +@@ -95,7 +95,7 @@ + # Search for mail spool file. + mta_getattr_spool(remote_login_t) + +-ifdef(`targeted_policy',` ++optional_policy(` + unconfined_shell_domtrans(remote_login_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.1/policy/modules/services/rlogin.te +--- nsaserefpolicy/policy/modules/services/rlogin.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/rlogin.te 2007-05-30 15:12:50.000000000 -0400 +@@ -64,6 +64,7 @@ + fs_search_auto_mountpoints(rlogind_t) + + auth_domtrans_chk_passwd(rlogind_t) ++auth_domtrans_upd_passwd(rlogind_t) + auth_rw_login_records(rlogind_t) + auth_use_nsswitch(rlogind_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.0.1/policy/modules/services/rpcbind.fc +--- nsaserefpolicy/policy/modules/services/rpcbind.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/services/rpcbind.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,6 @@ ++ ++/sbin/rpcbind -- gen_context(system_u:object_r:rpcbind_exec_t,s0) ++/var/run/rpcbind.lock -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) ++/var/run/rpc.statd.pid -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) ++/var/run/rpcbind.sock -s gen_context(system_u:object_r:rpcbind_var_run_t,s0) ++/var/lib/rpcbind(/.*)? gen_context(system_u:object_r:rpcbind_var_lib_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.0.1/policy/modules/services/rpcbind.if +--- nsaserefpolicy/policy/modules/services/rpcbind.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/services/rpcbind.if 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,104 @@ ++ ++## policy for rpcbind ++ ++######################################## ++## ++## Execute a domain transition to run rpcbind. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`rpcbind_domtrans',` ++ gen_require(` ++ type rpcbind_t, rpcbind_exec_t; ++ ') ++ ++ domain_auto_trans($1,rpcbind_exec_t,rpcbind_t) ++ ++ allow rpcbind_t $1:fd use; ++ allow rpcbind_t $1:fifo_file rw_file_perms; ++ allow rpcbind_t $1:process sigchld; ++') ++ ++######################################## ++## ++## Read rpcbind PID files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rpcbind_read_pid_files',` ++ gen_require(` ++ type rpcbind_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 rpcbind_var_run_t:file r_file_perms; ++') ++ ++ ++######################################## ++## ++## Search rpcbind lib directories. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rpcbind_search_lib',` ++ gen_require(` ++ type rpcbind_var_lib_t; ++ ') ++ ++ allow $1 rpcbind_var_lib_t:dir search_dir_perms; ++ files_search_var_lib($1) ++') ++ ++######################################## ++## ++## Read rpcbind lib files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rpcbind_read_lib_files',` ++ gen_require(` ++ type rpcbind_var_lib_t; ++ ') ++ ++ allow $1 rpcbind_var_lib_t:file r_file_perms; ++ allow $1 rpcbind_var_lib_t:dir list_dir_perms; ++ files_search_var_lib($1) ++') ++ ++######################################## ++## ++## Create, read, write, and delete ++## rpcbind lib files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rpcbind_manage_lib_files',` ++ gen_require(` ++ type rpcbind_var_lib_t; ++ ') ++ ++ allow $1 rpcbind_var_lib_t:file manage_file_perms; ++ allow $1 rpcbind_var_lib_t:dir rw_dir_perms; ++ files_search_var_lib($1) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.0.1/policy/modules/services/rpcbind.te +--- nsaserefpolicy/policy/modules/services/rpcbind.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/services/rpcbind.te 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,79 @@ ++policy_module(rpcbind,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type rpcbind_t; ++type rpcbind_exec_t; ++domain_type(rpcbind_t) ++init_daemon_domain(rpcbind_t, rpcbind_exec_t) ++ ++# pid files ++type rpcbind_var_run_t; ++files_pid_file(rpcbind_var_run_t) ++ ++# var/lib files ++type rpcbind_var_lib_t; ++files_type(rpcbind_var_lib_t) ++ ++######################################## ++# ++# rpcbind local policy ++# ++ ++# Init script handling ++init_use_fds(rpcbind_t) ++init_use_script_ptys(rpcbind_t) ++domain_use_interactive_fds(rpcbind_t) ++ ++allow rpcbind_t self:capability setuid; ++allow rpcbind_t self:netlink_route_socket r_netlink_socket_perms; ++allow rpcbind_t self:udp_socket listen; ++allow rpcbind_t self:tcp_socket create_stream_socket_perms; ++allow rpcbind_t self:fifo_file rw_file_perms; ++allow rpcbind_t self:unix_stream_socket create_stream_socket_perms; ++ ++# pid file ++allow rpcbind_t rpcbind_var_run_t:file manage_file_perms; ++allow rpcbind_t rpcbind_var_run_t:sock_file manage_sock_file_perms; ++allow rpcbind_t rpcbind_var_run_t:dir rw_dir_perms; ++files_pid_filetrans(rpcbind_t,rpcbind_var_run_t, { file sock_file }) ++ ++# var/lib files for rpcbind ++allow rpcbind_t rpcbind_var_lib_t:file manage_file_perms; ++allow rpcbind_t rpcbind_var_lib_t:sock_file manage_sock_file_perms; ++allow rpcbind_t rpcbind_var_lib_t:dir manage_dir_perms; ++files_var_lib_filetrans(rpcbind_t,rpcbind_var_lib_t, { file dir sock_file }) ++ ++corenet_non_ipsec_sendrecv(rpcbind_t) ++corenet_tcp_sendrecv_all_if(rpcbind_t) ++corenet_tcp_sendrecv_all_nodes(rpcbind_t) ++corenet_tcp_sendrecv_all_ports(rpcbind_t) ++corenet_tcp_bind_all_nodes(rpcbind_t) ++corenet_tcp_bind_portmap_port(rpcbind_t) ++ ++allow rpcbind_t self:udp_socket create_socket_perms; ++corenet_udp_sendrecv_all_if(rpcbind_t) ++corenet_udp_sendrecv_all_nodes(rpcbind_t) ++corenet_udp_sendrecv_all_ports(rpcbind_t) ++corenet_udp_bind_all_nodes(rpcbind_t) ++corenet_udp_bind_portmap_port(rpcbind_t) ++corenet_udp_bind_all_rpc_ports(rpcbind_t) ++ ++files_read_etc_files(rpcbind_t) ++ ++kernel_read_network_state(rpcbind_t) ++ ++libs_use_ld_so(rpcbind_t) ++libs_use_shared_libs(rpcbind_t) ++ ++logging_send_syslog_msg(rpcbind_t) ++ ++miscfiles_read_localization(rpcbind_t) ++ ++sysnet_dns_name_resolve(rpcbind_t) ++ ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.0.1/policy/modules/services/rpc.if +--- nsaserefpolicy/policy/modules/services/rpc.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/rpc.if 2007-05-30 15:12:50.000000000 -0400 +@@ -89,8 +89,11 @@ + # bind to arbitary unused ports + corenet_tcp_bind_generic_port($1_t) + corenet_udp_bind_generic_port($1_t) +- corenet_udp_bind_reserved_port($1_t) ++ corenet_dontaudit_tcp_bind_all_ports($1_t) ++ corenet_dontaudit_udp_bind_all_ports($1_t) + corenet_sendrecv_generic_server_packets($1_t) ++ corenet_tcp_bind_all_rpc_ports($1_t) ++ corenet_udp_bind_all_rpc_ports($1_t) + + fs_rw_rpc_named_pipes($1_t) + fs_search_auto_mountpoints($1_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.1/policy/modules/services/rpc.te +--- nsaserefpolicy/policy/modules/services/rpc.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/rpc.te 2007-05-30 15:12:50.000000000 -0400 +@@ -79,6 +79,7 @@ + + optional_policy(` + nis_read_ypserv_config(rpcd_t) ++ nis_use_ypbind(rpcd_t) + ') + + ######################################## +@@ -123,6 +124,7 @@ + tunable_policy(`nfs_export_all_rw',` + fs_read_noxattr_fs_files(nfsd_t) + auth_manage_all_files_except_shadow(nfsd_t) ++ userdom_generic_user_home_dir_filetrans_generic_user_home_content(nfsd_t, { file dir }) + ') + + tunable_policy(`nfs_export_all_ro',` +@@ -159,8 +161,6 @@ + miscfiles_read_certs(gssd_t) + + ifdef(`targeted_policy',` +- files_read_generic_tmp_files(gssd_t) +- files_read_generic_tmp_symlinks(gssd_t) + # Manage the users kerberos tgt file + files_manage_generic_tmp_files(gssd_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.0.1/policy/modules/services/rshd.te +--- nsaserefpolicy/policy/modules/services/rshd.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/rshd.te 2007-05-30 17:32:57.000000000 -0400 +@@ -65,10 +65,6 @@ + + userdom_search_all_users_home_content(rshd_t) + +-ifdef(`targeted_policy',` +- unconfined_shell_domtrans(rshd_t) +-') +- + tunable_policy(`use_nfs_home_dirs',` + fs_read_nfs_files(rshd_t) + fs_read_nfs_symlinks(rshd_t) +@@ -88,7 +84,7 @@ + ') + + optional_policy(` +- unconfined_domain(rshd_t) ++ unconfined_shell_domtrans(rshd_t) + ') + + ifdef(`TODO',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.0.1/policy/modules/services/rsync.te +--- nsaserefpolicy/policy/modules/services/rsync.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/rsync.te 2007-05-30 15:12:50.000000000 -0400 +@@ -17,6 +17,7 @@ + type rsync_t; + type rsync_exec_t; + init_daemon_domain(rsync_t,rsync_exec_t) ++application_executable_file(rsync_exec_t) + role system_r types rsync_t; + + type rsync_data_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-3.0.1/policy/modules/services/rwho.if +--- nsaserefpolicy/policy/modules/services/rwho.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/rwho.if 2007-05-30 15:12:50.000000000 -0400 +@@ -1 +1,84 @@ +-## Who is logged in on other machines? ++ ++## policy for rwho ++ ++######################################## ++## ++## Execute a domain transition to run rwho. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`rwho_domtrans',` ++ gen_require(` ++ type rwho_t, rwho_exec_t; ++ ') ++ ++ domain_auto_trans($1,rwho_exec_t,rwho_t) ++ ++ allow rwho_t $1:fd use; ++ allow rwho_t $1:fifo_file rw_file_perms; ++ allow rwho_t $1:process sigchld; ++') ++ ++######################################## ++## ++## Search rwho spool directories. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rwho_search_spool',` ++ gen_require(` ++ type rwho_spool_t; ++ ') ++ ++ allow $1 rwho_spool_t:dir search_dir_perms; ++ files_search_spool($1) ++') ++ ++######################################## ++## ++## Read rwho spool files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rwho_read_spool_files',` ++ gen_require(` ++ type rwho_spool_t; ++ ') ++ ++ allow $1 rwho_spool_t:file r_file_perms; ++ allow $1 rwho_spool_t:dir list_dir_perms; ++ files_search_spool($1) ++') ++ ++######################################## ++## ++## Create, read, write, and delete ++## rwho spool files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rwho_manage_spool_files',` ++ gen_require(` ++ type rwho_spool_t; ++ ') ++ ++ allow $1 rwho_spool_t:file manage_file_perms; ++ allow $1 rwho_spool_t:dir rw_dir_perms; ++ files_search_spool($1) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.0.1/policy/modules/services/samba.fc +--- nsaserefpolicy/policy/modules/services/samba.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/samba.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -3,6 +3,7 @@ + # /etc + # + /etc/samba/MACHINE\.SID -- gen_context(system_u:object_r:samba_secrets_t,s0) ++/etc/samba/passdb.tdb -- gen_context(system_u:object_r:samba_secrets_t,s0) + /etc/samba/secrets\.tdb -- gen_context(system_u:object_r:samba_secrets_t,s0) + /etc/samba/smbpasswd -- gen_context(system_u:object_r:samba_secrets_t,s0) + /etc/samba(/.*)? gen_context(system_u:object_r:samba_etc_t,s0) +@@ -27,6 +28,9 @@ + /var/cache/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0) + + /var/lib/samba(/.*)? gen_context(system_u:object_r:samba_var_t,s0) ++/var/lib/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0) ++ ++/var/lib/samba/scripts(/.*)? gen_context(system_u:object_r:samba_unconfined_script_exec_t,s0) + + /var/log/samba(/.*)? gen_context(system_u:object_r:samba_log_t,s0) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.0.1/policy/modules/services/samba.if +--- nsaserefpolicy/policy/modules/services/samba.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/samba.if 2007-05-30 15:12:50.000000000 -0400 +@@ -210,6 +210,27 @@ + + ######################################## + ## ++## Allow the specified domain to append to samba's log files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`samba_append_log',` ++ gen_require(` ++ type samba_log_t; ++ ') ++ ++ logging_search_logs($1) ++ allow $1 samba_log_t:dir list_dir_perms; ++ allow $1 samba_log_t:file append_file_perms; ++') ++ ++######################################## ++## + ## Execute samba log in the caller domain. + ## + ## +@@ -263,6 +284,7 @@ + ') + + files_search_var($1) ++ files_search_var_lib($1) + allow $1 samba_var_t:dir search_dir_perms; + ') + +@@ -283,11 +305,55 @@ + ') + + files_search_var($1) ++ files_search_var_lib($1) + rw_files_pattern($1,samba_var_t,samba_var_t) + ') + + ######################################## + ## ++## Allow the specified domain to ++## read and write samba /var files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`samba_manage_var_files',` ++ gen_require(` ++ type samba_var_t; ++ ') ++ ++ files_search_var($1) ++ files_search_var_lib($1) ++ manage_files_pattern($1,samba_var_t,samba_var_t) ++ manage_lnk_files_pattern($1,samba_var_t,samba_var_t) ++') ++ ++######################################## ++## ++## Allow the specified domain to ++## read samba /var files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`samba_read_var_files',` ++ gen_require(` ++ type samba_var_t; ++ ') ++ ++ files_search_var($1) ++ files_search_var_lib($1) ++ read_files_pattern($1,samba_var_t,samba_var_t) ++') ++ ++######################################## ++## + ## Allow the specified domain to write to smbmount tcp sockets. + ## + ## +@@ -410,3 +476,52 @@ + allow $1 samba_var_t:dir search_dir_perms; + stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t) + ') ++ ++######################################## ++## ++## Do not audit attempts to use file descriptors from samba. ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`samba_dontaudit_use_fds',` ++ gen_require(` ++ type smbd_t; ++ ') ++ ++ dontaudit $1 smbd_t:fd use; ++') ++ ++ ++######################################## ++## ++## Create a set of derived types for apache ++## web content. ++## ++## ++## ++## The prefix to be used for deriving type names. ++## ++## ++# ++template(`samba_helper_template',` ++ gen_require(` ++ type smbd_t; ++ ') ++ #This type is for samba helper scripts ++ type samba_$1_script_t; ++ domain_type(samba_$1_script_t) ++ role system_r types samba_$1_script_t; ++ ++ # This type is used for executable scripts files ++ type samba_$1_script_exec_t; ++ corecmd_shell_entry_type(samba_$1_script_t) ++ domain_entry_file(samba_$1_script_t,samba_$1_script_exec_t) ++ ++ domtrans_pattern(smbd_t, samba_$1_script_exec_t, samba_$1_script_t) ++ allow smbd_t samba_$1_script_exec_t:file ioctl; ++ ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.0.1/policy/modules/services/samba.te +--- nsaserefpolicy/policy/modules/services/samba.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/samba.te 2007-05-31 13:00:53.000000000 -0400 +@@ -28,6 +28,35 @@ + ## + gen_tunable(samba_share_nfs,false) + ++## ++##

++## Allow samba to run as the domain controller; add machines to passwd file ++## ++##

++## ++gen_tunable(samba_domain_controller,false) ++ ++## ++##

++## Allow samba to be exported read/write. ++##

++## ++gen_tunable(samba_export_all_rw,false) ++ ++## ++##

++## Allow samba to be exported read only ++##

++## ++gen_tunable(samba_export_all_ro,false) ++ ++## ++##

++## Allow samba to run unconfined scripts ++##

++## ++gen_tunable(samba_run_unconfined,false) ++ + type nmbd_t; + type nmbd_exec_t; + init_daemon_domain(nmbd_t,nmbd_exec_t) +@@ -117,6 +146,7 @@ + allow samba_net_t self:unix_stream_socket create_stream_socket_perms; + allow samba_net_t self:udp_socket create_socket_perms; + allow samba_net_t self:tcp_socket create_socket_perms; ++allow samba_net_t self:netlink_route_socket r_netlink_socket_perms; + + allow samba_net_t samba_etc_t:file read_file_perms; + +@@ -159,6 +189,8 @@ + + miscfiles_read_localization(samba_net_t) + ++samba_read_var_files(samba_net_t) ++ + sysnet_read_config(samba_net_t) + sysnet_use_ldap(samba_net_t) + +@@ -197,7 +229,6 @@ + + create_dirs_pattern(smbd_t,samba_log_t,samba_log_t) + create_files_pattern(smbd_t,samba_log_t,samba_log_t) +-append_files_pattern(smbd_t,samba_log_t,samba_log_t) + allow smbd_t samba_log_t:dir setattr; + dontaudit smbd_t samba_log_t:dir remove_name; + +@@ -251,6 +282,9 @@ + corenet_tcp_connect_ipp_port(smbd_t) + corenet_tcp_connect_smbd_port(smbd_t) + ++corecmd_exec_shell(smbd_t) ++corecmd_exec_bin(smbd_t) ++ + dev_read_sysfs(smbd_t) + dev_read_urand(smbd_t) + dev_getattr_mtrr_dev(smbd_t) +@@ -260,11 +294,13 @@ + fs_get_xattr_fs_quotas(smbd_t) + fs_search_auto_mountpoints(smbd_t) + fs_getattr_rpc_dirs(smbd_t) ++fs_list_inotifyfs(smbd_t) + + auth_use_nsswitch(smbd_t) + auth_domtrans_chk_passwd(smbd_t) + + domain_use_interactive_fds(smbd_t) ++domain_dontaudit_list_all_domains_state(smbd_t) + + files_list_var_lib(smbd_t) + files_read_etc_files(smbd_t) +@@ -291,6 +327,12 @@ + userdom_dontaudit_use_unpriv_user_fds(smbd_t) + userdom_use_unpriv_users_fds(smbd_t) + ++tunable_policy(`samba_domain_controller',` ++ usermanage_domtrans_passwd(smbd_t) ++ usermanage_domtrans_useradd(smbd_t) ++ usermanage_domtrans_groupadd(smbd_t) ++') ++ + ifdef(`hide_broken_symptoms', ` + files_dontaudit_getattr_default_dirs(smbd_t) + files_dontaudit_getattr_boot_dirs(smbd_t) +@@ -328,6 +370,23 @@ + udev_read_db(smbd_t) + ') + ++tunable_policy(`samba_export_all_rw',` ++ fs_read_noxattr_fs_files(smbd_t) ++ auth_manage_all_files_except_shadow(smbd_t) ++ fs_read_noxattr_fs_files(nmbd_t) ++ auth_manage_all_files_except_shadow(nmbd_t) ++ userdom_generic_user_home_dir_filetrans_generic_user_home_content(nmbd_t, { file dir }) ++ ++') ++ ++tunable_policy(`samba_export_all_ro',` ++ fs_read_noxattr_fs_files(smbd_t) ++ auth_read_all_files_except_shadow(smbd_t) ++ fs_read_noxattr_fs_files(nmbd_t) ++ auth_read_all_files_except_shadow(nmbd_t) ++') ++ ++ + ######################################## + # + # nmbd Local policy +@@ -351,9 +410,12 @@ + files_pid_filetrans(nmbd_t,nmbd_var_run_t,file) + + read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t) ++files_list_var_lib(nmbd_t) + +-create_dirs_pattern(nmbd_t,samba_log_t,samba_log_t) ++manage_dirs_pattern(nmbd_t,samba_log_t,samba_log_t) + append_files_pattern(nmbd_t,samba_log_t,samba_log_t) ++allow nmbd_t samba_log_t:file unlink; ++ + read_files_pattern(nmbd_t,samba_log_t,samba_log_t) + create_files_pattern(nmbd_t,samba_log_t,samba_log_t) + allow nmbd_t samba_log_t:dir setattr; +@@ -380,6 +442,7 @@ + corenet_udp_bind_nmbd_port(nmbd_t) + corenet_sendrecv_nmbd_server_packets(nmbd_t) + corenet_sendrecv_nmbd_client_packets(nmbd_t) ++corenet_tcp_connect_smbd_port(nmbd_t) + + dev_read_sysfs(nmbd_t) + dev_getattr_mtrr_dev(nmbd_t) +@@ -440,6 +503,7 @@ + + allow smbmount_t samba_secrets_t:file manage_file_perms; + ++files_list_var_lib(smbmount_t) + allow smbmount_t samba_var_t:dir rw_dir_perms; + manage_files_pattern(smbmount_t,samba_var_t,samba_var_t) + manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t) +@@ -470,6 +534,7 @@ + storage_raw_write_fixed_disk(smbmount_t) + + term_list_ptys(smbmount_t) ++term_use_controlling_term(smbmount_t) + + corecmd_list_bin(smbmount_t) + +@@ -493,6 +558,11 @@ + sysnet_read_config(smbmount_t) + + userdom_use_all_users_fds(smbmount_t) ++userdom_use_sysadm_ttys(smbmount_t) ++ ++optional_policy(` ++ cups_read_rw_config(smbmount_t) ++') + + optional_policy(` + nis_use_ypbind(smbmount_t) +@@ -511,7 +581,6 @@ + allow swat_t self:process signal_perms; + allow swat_t self:fifo_file rw_file_perms; + allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms; +-allow swat_t self:netlink_audit_socket create; + allow swat_t self:tcp_socket create_stream_socket_perms; + allow swat_t self:udp_socket create_socket_perms; + allow swat_t self:netlink_route_socket r_netlink_socket_perms; +@@ -602,6 +671,8 @@ + # Winbind local policy + # + ++ ++allow winbind_t self:capability { dac_override ipc_lock setuid }; + dontaudit winbind_t self:capability sys_tty_config; + allow winbind_t self:process signal_perms; + allow winbind_t self:fifo_file { read write }; +@@ -611,10 +682,15 @@ + allow winbind_t self:tcp_socket create_stream_socket_perms; + allow winbind_t self:udp_socket create_socket_perms; + ++allow winbind_t nmbd_t:process { signal signull }; ++allow winbind_t nmbd_var_run_t:file read_file_perms; ++ + allow winbind_t samba_etc_t:dir list_dir_perms; + read_files_pattern(winbind_t,samba_etc_t,samba_etc_t) + read_lnk_files_pattern(winbind_t,samba_etc_t,samba_etc_t) + ++rw_files_pattern(winbind_t,smbd_tmp_t,smbd_tmp_t) ++ + manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t) + filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file) + +@@ -622,6 +698,8 @@ + manage_files_pattern(winbind_t,samba_log_t,samba_log_t) + manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t) + ++files_list_var_lib(winbind_t) ++manage_dirs_pattern(winbind_t,samba_var_t,samba_var_t) + manage_files_pattern(winbind_t,samba_var_t,samba_var_t) + manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t) + +@@ -707,6 +785,7 @@ + read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t) + read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t) + ++files_list_var_lib(winbind_helper_t) + allow winbind_helper_t samba_var_t:dir search; + + stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t) +@@ -730,3 +809,23 @@ + squid_read_log(winbind_helper_t) + squid_append_log(winbind_helper_t) + ') ++ ++######################################## ++# ++# samba_unconfined_script_t local policy ++# ++type samba_unconfined_script_t; ++domain_type(samba_unconfined_script_t) ++role system_r types samba_unconfined_script_t; ++ ++# This type is used for executable scripts files ++type samba_unconfined_script_exec_t; ++corecmd_shell_entry_type(samba_unconfined_script_t) ++domain_entry_file(samba_unconfined_script_t,samba_unconfined_script_exec_t) ++allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms; ++allow smbd_t samba_unconfined_script_exec_t:file ioctl; ++ ++tunable_policy(`samba_run_unconfined',` ++ domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t) ++') ++unconfined_domain(samba_unconfined_script_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.0.1/policy/modules/services/sasl.te +--- nsaserefpolicy/policy/modules/services/sasl.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/sasl.te 2007-05-30 15:12:50.000000000 -0400 +@@ -63,6 +63,7 @@ + selinux_compute_access_vector(saslauthd_t) + + auth_domtrans_chk_passwd(saslauthd_t) ++auth_domtrans_upd_passwd(saslauthd_t) + auth_use_nsswitch(saslauthd_t) + + domain_use_interactive_fds(saslauthd_t) +@@ -90,7 +91,7 @@ + userdom_dontaudit_use_unpriv_user_fds(saslauthd_t) + userdom_dontaudit_search_sysadm_home_dirs(saslauthd_t) + +-# cjp: typeattribute doesnt work in conditionals ++# cjp: typeattribute dont work in conditionals yet + auth_can_read_shadow_passwords(saslauthd_t) + tunable_policy(`allow_saslauthd_read_shadow',` + auth_tunable_read_shadow(saslauthd_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.0.1/policy/modules/services/sendmail.te +--- nsaserefpolicy/policy/modules/services/sendmail.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/sendmail.te 2007-05-30 15:12:50.000000000 -0400 +@@ -136,10 +136,6 @@ + udev_read_db(sendmail_t) + ') + +-optional_policy(` +- unconfined_domain(sendmail_t) +-') +- + ifdef(`TODO',` + allow sendmail_t etc_mail_t:dir rw_dir_perms; + allow sendmail_t etc_mail_t:file manage_file_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.1/policy/modules/services/setroubleshoot.te +--- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/setroubleshoot.te 2007-05-31 11:02:58.000000000 -0400 +@@ -28,7 +28,7 @@ + # + + allow setroubleshootd_t self:capability { dac_override sys_tty_config }; +-allow setroubleshootd_t self:process { signal getattr getsched }; ++allow setroubleshootd_t self:process { signull signal getattr getsched }; + allow setroubleshootd_t self:fifo_file rw_fifo_file_perms; + allow setroubleshootd_t self:tcp_socket create_stream_socket_perms; + allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto }; +@@ -75,6 +75,10 @@ + files_getattr_all_dirs(setroubleshootd_t) + files_getattr_all_files(setroubleshootd_t) + ++fs_getattr_all_dirs(setroubleshootd_t) ++fs_getattr_all_files(setroubleshootd_t) ++ ++selinux_get_fs_mount(setroubleshootd_t) + selinux_get_enforce_mode(setroubleshootd_t) + selinux_validate_context(setroubleshootd_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.0.1/policy/modules/services/smartmon.te +--- nsaserefpolicy/policy/modules/services/smartmon.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/smartmon.te 2007-05-30 15:12:50.000000000 -0400 +@@ -60,6 +60,7 @@ + fs_search_auto_mountpoints(fsdaemon_t) + + mls_file_read_up(fsdaemon_t) ++mls_file_write_down(fsdaemon_t) + + storage_raw_read_fixed_disk(fsdaemon_t) + storage_raw_write_fixed_disk(fsdaemon_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.0.1/policy/modules/services/snmp.te +--- nsaserefpolicy/policy/modules/services/snmp.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/snmp.te 2007-05-30 15:12:50.000000000 -0400 +@@ -9,9 +9,6 @@ + type snmpd_exec_t; + init_daemon_domain(snmpd_t,snmpd_exec_t) + +-type snmpd_etc_t; +-files_config_file(snmpd_etc_t) +- + type snmpd_log_t; + logging_log_file(snmpd_log_t) + +@@ -33,8 +30,6 @@ + allow snmpd_t self:tcp_socket create_stream_socket_perms; + allow snmpd_t self:udp_socket connected_stream_socket_perms; + +-allow snmpd_t snmpd_etc_t:file { getattr read }; +- + allow snmpd_t snmpd_log_t:file manage_file_perms; + logging_log_filetrans(snmpd_t,snmpd_log_t,file) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.0.1/policy/modules/services/spamassassin.te +--- nsaserefpolicy/policy/modules/services/spamassassin.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/spamassassin.te 2007-05-30 15:12:50.000000000 -0400 +@@ -13,18 +13,16 @@ + ## + gen_tunable(spamassassin_can_network,false) + +-ifdef(`targeted_policy',` + ## + ##

+ ## Allow spamd to read/write user home directories. + ##

+ ## + gen_tunable(spamd_enable_home_dirs,true) +-') + + # spamassassin client executable + type spamc_exec_t; +-corecmd_executable_file(spamc_exec_t) ++application_executable_file(spamc_exec_t) + + type spamd_t; + type spamd_exec_t; +@@ -44,7 +42,7 @@ + files_pid_file(spamd_var_run_t) + + type spamassassin_exec_t; +-corecmd_executable_file(spamassassin_exec_t) ++application_executable_file(spamassassin_exec_t) + + ######################################## + # +@@ -101,6 +99,7 @@ + corenet_tcp_bind_all_nodes(spamd_t) + corenet_tcp_bind_spamd_port(spamd_t) + corenet_tcp_connect_razor_port(spamd_t) ++corenet_tcp_connect_smtp_port(spamd_t) + corenet_sendrecv_razor_client_packets(spamd_t) + corenet_sendrecv_spamd_server_packets(spamd_t) + # spamassassin 3.1 needs this for its +@@ -155,7 +154,7 @@ + userdom_manage_generic_user_home_content_dirs(spamd_t) + userdom_manage_generic_user_home_content_files(spamd_t) + userdom_manage_generic_user_home_content_symlinks(spamd_t) +- userdom_generic_user_home_dir_filetrans_generic_user_home_content(spamd_t,dir) ++# userdom_generic_user_home_dir_filetrans_generic_user_home_content(spamd_t,dir) + ') + ') + +@@ -185,6 +184,11 @@ + ') + + optional_policy(` ++ mysql_search_db(spamd_t) ++ mysql_stream_connect(spamd_t) ++') ++ ++optional_policy(` + nis_use_ypbind(spamd_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.0.1/policy/modules/services/squid.fc +--- nsaserefpolicy/policy/modules/services/squid.fc 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/squid.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -12,3 +12,5 @@ + /var/run/squid\.pid -- gen_context(system_u:object_r:squid_var_run_t,s0) + + /var/spool/squid(/.*)? gen_context(system_u:object_r:squid_cache_t,s0) ++/usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0) ++/usr/lib64/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.0.1/policy/modules/services/squid.te +--- nsaserefpolicy/policy/modules/services/squid.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/squid.te 2007-05-30 15:12:50.000000000 -0400 +@@ -179,3 +179,12 @@ + #squid requires the following when run in diskd mode, the recommended setting + allow squid_t tmpfs_t:file { read write }; + ') dnl end TODO ++ ++optional_policy(` ++ apache_content_template(squid) ++ corenet_tcp_connect_http_cache_port(httpd_squid_script_t) ++ squid_read_config(httpd_squid_script_t) ++ allow httpd_squid_script_t self:tcp_socket create_socket_perms; ++ sysnet_read_config(httpd_squid_script_t) ++ corenet_non_ipsec_sendrecv(httpd_squid_script_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.0.1/policy/modules/services/ssh.if +--- nsaserefpolicy/policy/modules/services/ssh.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/ssh.if 2007-05-30 15:12:50.000000000 -0400 +@@ -709,3 +709,42 @@ + + dontaudit $1 sshd_key_t:file { getattr read }; + ') ++ ++######################################## ++## ++## Inherit and use a file descriptor ++## from the ssh-agent. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`ssh_use_user_ssh_agent_fds',` ++ gen_require(` ++ type $1_ssh_agent_t; ++ ') ++ ++ allow $2 $1_ssh_agent_t:fd use; ++') ++ ++######################################## ++## ++## dontaudit use of file descriptor ++## from the ssh-agent. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`ssh_dontaudit_use_user_ssh_agent_fds',` ++ gen_require(` ++ type $1_ssh_agent_t; ++ ') ++ ++ dontaudit $2 $1_ssh_agent_t:fd use; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.0.1/policy/modules/services/ssh.te +--- nsaserefpolicy/policy/modules/services/ssh.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/ssh.te 2007-05-31 14:36:21.000000000 -0400 +@@ -24,11 +24,11 @@ + + # Type for the ssh-agent executable. + type ssh_agent_exec_t; +-files_type(ssh_agent_exec_t) ++application_executable_file(ssh_agent_exec_t) + + # ssh client executable. + type ssh_exec_t; +-corecmd_executable_file(ssh_exec_t) ++application_executable_file(ssh_exec_t) + + type ssh_keygen_t; + type ssh_keygen_exec_t; +@@ -119,7 +119,13 @@ + ') + + optional_policy(` ++ usermanage_read_crack_db(sshd_t) ++') ++ ++optional_policy(` + unconfined_domain(sshd_t) ++ unconfined_shell_domtrans(sshd_t) ++ userdom_read_all_users_home_content_files(sshd_t) + ') + + ifdef(`TODO',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-3.0.1/policy/modules/services/tftp.te +--- nsaserefpolicy/policy/modules/services/tftp.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/tftp.te 2007-05-30 15:12:50.000000000 -0400 +@@ -69,6 +69,7 @@ + logging_send_syslog_msg(tftpd_t) + + miscfiles_read_localization(tftpd_t) ++miscfiles_read_public_files(tftpd_t) + + sysnet_read_config(tftpd_t) + sysnet_use_ldap(tftpd_t) +@@ -96,3 +97,4 @@ + optional_policy(` + udev_read_db(tftpd_t) + ') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-3.0.1/policy/modules/services/w3c.fc +--- nsaserefpolicy/policy/modules/services/w3c.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/services/w3c.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,2 @@ ++/usr/share/w3c-markup-validator(/.*)? gen_context(system_u:object_r:httpd_w3c_validator_content_t,s0) ++/usr/share/w3c-markup-validator/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_w3c_validator_script_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-3.0.1/policy/modules/services/w3c.if +--- nsaserefpolicy/policy/modules/services/w3c.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/services/w3c.if 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1 @@ ++## W3C +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.0.1/policy/modules/services/w3c.te +--- nsaserefpolicy/policy/modules/services/w3c.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/services/w3c.te 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,14 @@ ++policy_module(w3c,1.2.1) ++ ++apache_content_template(w3c_validator) ++ ++sysnet_dns_name_resolve(httpd_w3c_validator_script_t) ++ ++corenet_tcp_connect_ftp_port(httpd_w3c_validator_script_t) ++corenet_tcp_sendrecv_ftp_port(httpd_w3c_validator_script_t) ++corenet_tcp_connect_http_port(httpd_w3c_validator_script_t) ++corenet_tcp_sendrecv_http_port(httpd_w3c_validator_script_t) ++corenet_tcp_connect_http_cache_port(httpd_w3c_validator_script_t) ++corenet_tcp_sendrecv_http_cache_port(httpd_w3c_validator_script_t) ++ ++miscfiles_read_certs(httpd_w3c_validator_script_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.1/policy/modules/services/xserver.if +--- nsaserefpolicy/policy/modules/services/xserver.if 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/xserver.if 2007-05-30 15:12:50.000000000 -0400 +@@ -154,6 +154,8 @@ + + modutils_domtrans_insmod($1_xserver_t) + ++ selinux_get_fs_mount($1_xserver_t) ++ + seutil_dontaudit_search_config($1_xserver_t) + + sysnet_read_config($1_xserver_t) +@@ -732,12 +734,8 @@ + attribute xauth_home_type; + ') + +- ifdef(`strict_policy',` +- allow $1 xauth_home_type:file read_file_perms; +- userdom_search_all_users_home_dirs($1) +- ',` +- userdom_read_generic_user_home_content_files($1) +- ') ++ allow $1 xauth_home_type:file read_file_perms; ++ userdom_search_all_users_home_dirs($1) + ') + + ######################################## +@@ -1136,7 +1134,7 @@ + type xdm_xserver_tmp_t; + ') + +- allow $1 xdm_xserver_tmp_t:file { getattr read }; ++ read_files_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t) + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.1/policy/modules/services/xserver.te +--- nsaserefpolicy/policy/modules/services/xserver.te 2007-05-29 14:10:57.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/services/xserver.te 2007-05-31 14:35:46.000000000 -0400 +@@ -132,6 +132,7 @@ + manage_fifo_files_pattern(xdm_t,xdm_tmpfs_t,xdm_tmpfs_t) + manage_sock_files_pattern(xdm_t,xdm_tmpfs_t,xdm_tmpfs_t) + fs_tmpfs_filetrans(xdm_t,xdm_tmpfs_t,{ dir file lnk_file sock_file fifo_file }) ++fs_rw_tmpfs_files(xdm_xserver_t) + + manage_dirs_pattern(xdm_t,xdm_var_lib_t,xdm_var_lib_t) + manage_files_pattern(xdm_t,xdm_var_lib_t,xdm_var_lib_t) +@@ -256,6 +257,7 @@ + libs_exec_lib_files(xdm_t) + + logging_read_generic_logs(xdm_t) ++logging_send_audit_msg(xdm_t) + + miscfiles_read_localization(xdm_t) + miscfiles_read_fonts(xdm_t) +@@ -305,6 +307,8 @@ + + optional_policy(` + consolekit_dbus_chat(xdm_t) ++ dbus_system_bus_client_template(xdm, xdm_t) ++ dbus_send_system_bus(xdm_t) + ') + + optional_policy(` +@@ -349,11 +353,7 @@ + optional_policy(` + unconfined_domain(xdm_t) + unconfined_domtrans(xdm_t) +- userdom_generic_user_home_dir_filetrans_generic_user_home_content(xdm_t, {file dir }) +- +- ifndef(`distro_redhat',` +- allow xdm_t self:process { execheap execmem }; +- ') ++ unconfined_signal(xdm_t) + + ifdef(`distro_rhel4',` + allow xdm_t self:process { execheap execmem }; +@@ -425,6 +425,10 @@ + ') + + optional_policy(` ++ mono_rw_shm(xdm_xserver_t) ++') ++ ++optional_policy(` + resmgr_stream_connect(xdm_t) + ') + +@@ -434,41 +438,17 @@ + ') + + optional_policy(` +- unconfined_domain_noaudit(xdm_xserver_t) ++ unconfined_domain(xdm_xserver_t) + unconfined_domtrans(xdm_xserver_t) +- +- ifndef(`distro_redhat',` +- allow xdm_xserver_t self:process { execheap execmem }; +- ') ++ unconfined_rw_shm(xdm_xserver_t) + + ifdef(`distro_rhel4',` + allow xdm_xserver_t self:process { execheap execmem }; + ') + ') + +-ifdef(`TODO',` +-# Need to further investigate these permissions and +-# perhaps define derived types. +-allow xdm_t var_lib_t:dir { write search add_name remove_name create unlink }; +-allow xdm_t var_lib_t:file { create write unlink }; +- +-# Do not audit attempts to write to index files under /usr +-dontaudit xdm_t usr_t:file write; +- +-ifdef(`rhgb.te', ` +-allow xdm_xserver_t ramfs_t:dir rw_dir_perms; +-allow xdm_xserver_t ramfs_t:file manage_file_perms; +-allow rhgb_t xdm_xserver_t:process signal; +-') +- +-tunable_policy(`allow_polyinstantiation',` +-# xdm needs access for linking .X11-unix to poly /tmp +-allow xdm_t polymember:dir { add_name remove_name write }; +-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 }; +-') + ++ifdef(`TODO',` + # + # Wants to delete .xsession-errors file + # +@@ -478,3 +458,4 @@ + # + allow pam_t xdm_t:fifo_file { getattr ioctl write }; + ') dnl end TODO ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-3.0.1/policy/modules/system/application.fc +--- nsaserefpolicy/policy/modules/system/application.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/system/application.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1 @@ ++# No application file contexts. +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-3.0.1/policy/modules/system/application.if +--- nsaserefpolicy/policy/modules/system/application.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/system/application.if 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,104 @@ ++## Policy for application domains ++ ++######################################## ++## ++## Make the specified type usable as an application domain. ++## ++## ++## ++## Type to be used as a domain type. ++## ++## ++# ++interface(`application_type',` ++ gen_require(` ++ attribute application_domain_type; ++ ') ++ ++ typeattribute $1 application_domain_type; ++ ++ # start with basic domain ++ domain_type($1) ++') ++ ++######################################## ++## ++## Make the specified type usable for files ++## that are exectuables, such as binary programs. ++## This does not include shared libraries. ++## ++## ++## ++## Type to be used for files. ++## ++## ++# ++interface(`application_executable_file',` ++ gen_require(` ++ attribute application_exec_type; ++ ') ++ ++ typeattribute $1 application_exec_type; ++ ++ corecmd_executable_file($1) ++') ++ ++######################################## ++## ++## Execute application executables in the caller domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`application_exec',` ++ gen_require(` ++ attribute application_exec_type; ++ ') ++ ++ can_exec($1, application_exec_type) ++') ++ ++######################################## ++## ++## Execute all executable files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`application_exec_all',` ++ # Need this dontaudit or command completion fires hundreds of avcs ++ corecmd_dontaudit_exec_all_executables($1) ++ corecmd_exec_bin($1) ++ corecmd_exec_shell($1) ++ corecmd_exec_chroot($1) ++ application_exec($1) ++') ++ ++######################################## ++## ++## Create a domain which can be started by users ++## ++## ++## ++## Type to be used as a domain. ++## ++## ++## ++## ++## Type of the program to be used as an entry point to this domain. ++## ++## ++# ++interface(`application_domain',` ++ ++ application_type($1) ++ application_executable_file($2) ++ domain_entry_file($1,$2) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.0.1/policy/modules/system/application.te +--- nsaserefpolicy/policy/modules/system/application.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/system/application.te 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,14 @@ ++ ++policy_module(application,1.0.0) ++ ++# Attribute of user applications ++attribute application_domain_type; ++ ++# Executables to be run by user ++attribute application_exec_type; ++ ++optional_policy(` ++ ssh_sigchld(application_domain_type) ++ ssh_rw_stream_sockets(application_domain_type) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.0.1/policy/modules/system/authlogin.fc +--- nsaserefpolicy/policy/modules/system/authlogin.fc 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/authlogin.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -14,6 +14,7 @@ + /sbin/pam_timestamp_check -- gen_context(system_u:object_r:pam_exec_t,s0) + /sbin/unix_chkpwd -- gen_context(system_u:object_r:chkpwd_exec_t,s0) + /sbin/unix_verify -- gen_context(system_u:object_r:chkpwd_exec_t,s0) ++/sbin/unix_update -- gen_context(system_u:object_r:updpwd_exec_t,s0) + ifdef(`distro_suse', ` + /sbin/unix2_chkpwd -- gen_context(system_u:object_r:chkpwd_exec_t,s0) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.1/policy/modules/system/authlogin.if +--- nsaserefpolicy/policy/modules/system/authlogin.if 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/authlogin.if 2007-05-31 11:10:26.000000000 -0400 +@@ -27,11 +27,10 @@ + domain_type($1_chkpwd_t) + domain_entry_file($1_chkpwd_t,chkpwd_exec_t) + +- allow $1_chkpwd_t self:capability { audit_control setuid }; ++ allow $1_chkpwd_t self:capability { dac_override setuid }; ++ dontaudit $1_chkpwd_t self:capability sys_tty_config; + allow $1_chkpwd_t self:process getattr; + +- send_audit_msgs_pattern($1_chkpwd_t) +- + files_list_etc($1_chkpwd_t) + allow $1_chkpwd_t shadow_t:file { getattr read }; + +@@ -53,6 +52,7 @@ + libs_use_shared_libs($1_chkpwd_t) + + logging_send_syslog_msg($1_chkpwd_t) ++ logging_send_audit_msg($1_chkpwd_t) + + miscfiles_read_localization($1_chkpwd_t) + +@@ -109,7 +109,8 @@ + role $3 types system_chkpwd_t; + + # cjp: is this really needed? +- allow $2 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; ++ logging_send_audit_msg($2) ++ logging_set_loginuid($2) + + dontaudit $2 shadow_t:file { getattr read }; + +@@ -171,6 +172,9 @@ + ## + # + interface(`auth_login_pgm_domain',` ++ gen_require(` ++ attribute keyring_type; ++ ') + + domain_type($1) + domain_subj_id_change_exemption($1) +@@ -178,6 +182,9 @@ + domain_obj_id_change_exemption($1) + role system_r types $1; + ++ auth_keyring_domain($1) ++ allow $1 keyring_type:key { search link }; ++ + # for SSP/ProPolice + dev_read_urand($1) + +@@ -202,16 +209,20 @@ + auth_read_login_records($1) + auth_append_login_records($1) + auth_rw_lastlog($1) +- auth_append_faillog($1) ++ auth_rw_faillog($1) + auth_exec_pam($1) + ++ auth_domtrans_upd_passwd($1) ++ + init_rw_utmp($1) + + logging_send_syslog_msg($1) ++ logging_send_audit_msg($1) ++ logging_set_loginuid($1) + + seutil_read_config($1) + seutil_read_default_contexts($1) +- ++ + tunable_policy(`allow_polyinstantiation',` + files_polyinstantiate_all($1) + ') +@@ -311,10 +322,6 @@ + type system_chkpwd_t, chkpwd_exec_t, shadow_t; + ') + +- # cjp: is this really needed? +- allow $1 self:capability audit_control; +- send_audit_msgs_pattern($1) +- + corecmd_search_bin($1) + domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t) + +@@ -348,6 +355,37 @@ + + ######################################## + ## ++## Execute chkpwd programs in the chkpwd domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The role to allow the updpwd domain. ++## ++## ++## ++## ++## The type of the terminal allow the updpwd domain to use. ++## ++## ++# ++interface(`auth_run_chk_passwd',` ++ gen_require(` ++ type system_chkpwd_t; ++ ') ++ ++ auth_domtrans_chk_passwd($1) ++ role $2 types system_chkpwd_t; ++ allow system_chkpwd_t $3:chr_file rw_file_perms; ++ ++') ++ ++######################################## ++## + ## Get the attributes of the shadow passwords file. + ## + ## +@@ -1322,7 +1360,7 @@ + gen_require(` + type var_auth_t; + ') +- ++ + allow $1 self:netlink_route_socket r_netlink_socket_perms; + + allow $1 var_auth_t:dir list_dir_perms; +@@ -1382,3 +1420,114 @@ + typeattribute $1 can_write_shadow_passwords; + typeattribute $1 can_relabelto_shadow_passwords; + ') ++ ++######################################## ++## ++## read login keyrings. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`auth_read_key',` ++ gen_require(` ++ attribute keyring_type; ++ ') ++ ++ allow $1 keyring_type:key { read search view }; ++') ++ ++######################################## ++## ++## search login keyrings. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`auth_search_key',` ++ gen_require(` ++ attribute keyring_type; ++ ') ++ ++ allow $1 keyring_type:key { search link }; ++') ++ ++ ++ ++######################################## ++## ++## Make the specified domain a keyring domain ++## ++## ++## ++## Domain type used for a login program domain. ++## ++## ++# ++interface(`auth_keyring_domain',` ++ gen_require(` ++ attribute keyring_type; ++ ') ++ ++ typeattribute $1 keyring_type; ++') ++ ++######################################## ++## ++## Execute a domain transition to run unix_update. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`auth_domtrans_upd_passwd',` ++ gen_require(` ++ type updpwd_t, updpwd_exec_t; ++ ') ++ ++ domain_auto_trans($1,updpwd_exec_t,updpwd_t) ++ allow updpwd_t $1:fd use; ++ allow updpwd_t $1:fifo_file rw_file_perms; ++ allow updpwd_t $1:process sigchld; ++ auth_dontaudit_read_shadow($1) ++ ++') ++ ++######################################## ++## ++## Execute updpwd programs in the updpwd domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The role to allow the updpwd domain. ++## ++## ++## ++## ++## The type of the terminal allow the updpwd domain to use. ++## ++## ++# ++interface(`auth_run_upd_passwd',` ++ gen_require(` ++ type updpwd_t; ++ ') ++ ++ auth_domtrans_upd_passwd($1) ++ role $2 types updpwd_t; ++ allow updpwd_t $3:chr_file rw_file_perms; ++ auth_dontaudit_read_shadow($1) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.1/policy/modules/system/authlogin.te +--- nsaserefpolicy/policy/modules/system/authlogin.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/authlogin.te 2007-05-30 15:12:50.000000000 -0400 +@@ -9,6 +9,13 @@ + attribute can_read_shadow_passwords; + attribute can_write_shadow_passwords; + attribute can_relabelto_shadow_passwords; ++attribute keyring_type; ++ ++type updpwd_t; ++type updpwd_exec_t; ++domain_type(updpwd_t) ++domain_entry_file(updpwd_t,updpwd_exec_t) ++role system_r types updpwd_t; + + type chkpwd_exec_t; + corecmd_executable_file(chkpwd_exec_t) +@@ -238,7 +245,6 @@ + + optional_policy(` + xserver_read_xdm_pid(pam_console_t) +- xserver_use_xdm_fds(pam_t) + ') + + ######################################## +@@ -246,12 +252,16 @@ + # System check password local policy + # + ++logging_send_audit_msg(system_chkpwd_t) ++ + allow system_chkpwd_t shadow_t:file { getattr read }; + + corecmd_search_bin(system_chkpwd_t) + + domain_dontaudit_use_interactive_fds(system_chkpwd_t) + ++selinux_get_fs_mount(system_chkpwd_t) ++ + term_dontaudit_use_unallocated_ttys(system_chkpwd_t) + term_dontaudit_use_generic_ptys(system_chkpwd_t) + +@@ -296,11 +306,33 @@ + ') + + optional_policy(` +- # Allow utemper to write to /tmp/.xses-* +- unconfined_write_tmp_files(utempter_t) ++ xserver_use_xdm_fds(utempter_t) ++ xserver_rw_xdm_pipes(utempter_t) + ') + ++######################################## ++# ++# updpwd local policy ++# ++ ++allow updpwd_t self:process setfscreate; ++allow updpwd_t self:fifo_file { read write }; ++allow updpwd_t self:unix_stream_socket create_stream_socket_perms; ++allow updpwd_t self:unix_dgram_socket create_socket_perms; ++ ++files_read_etc_files(updpwd_t) ++libs_use_ld_so(updpwd_t) ++libs_use_shared_libs(updpwd_t) ++miscfiles_read_localization(updpwd_t) ++ ++auth_manage_shadow(updpwd_t) ++term_dontaudit_use_console(updpwd_t) ++term_dontaudit_use_console(updpwd_t) ++term_dontaudit_use_unallocated_ttys(updpwd_t) ++files_manage_etc_files(updpwd_t) ++kernel_read_system_state(updpwd_t) ++logging_send_syslog_msg(updpwd_t) ++ + optional_policy(` +- xserver_use_xdm_fds(utempter_t) +- xserver_rw_xdm_pipes(utempter_t) ++ nscd_socket_use(updpwd_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/clock.te serefpolicy-3.0.1/policy/modules/system/clock.te +--- nsaserefpolicy/policy/modules/system/clock.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/clock.te 2007-05-30 15:12:50.000000000 -0400 +@@ -26,8 +26,6 @@ + allow hwclock_t self:process signal_perms; + allow hwclock_t self:fifo_file { getattr read write }; + +-send_audit_msgs_pattern(hwclock_t) +- + # Allow hwclock to store & retrieve correction factors. + allow hwclock_t adjtime_t:file { rw_file_perms setattr }; + +@@ -61,6 +59,7 @@ + libs_use_shared_libs(hwclock_t) + + logging_send_syslog_msg(hwclock_t) ++logging_send_audit_msg(hwclock_t) + + miscfiles_read_localization(hwclock_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.0.1/policy/modules/system/fstools.fc +--- nsaserefpolicy/policy/modules/system/fstools.fc 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/fstools.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -19,7 +19,6 @@ + /sbin/mkfs.* -- gen_context(system_u:object_r:fsadm_exec_t,s0) + /sbin/mkraid -- gen_context(system_u:object_r:fsadm_exec_t,s0) + /sbin/mkreiserfs -- gen_context(system_u:object_r:fsadm_exec_t,s0) +-/sbin/mkswap -- gen_context(system_u:object_r:fsadm_exec_t,s0) + /sbin/parted -- gen_context(system_u:object_r:fsadm_exec_t,s0) + /sbin/partprobe -- gen_context(system_u:object_r:fsadm_exec_t,s0) + /sbin/partx -- gen_context(system_u:object_r:fsadm_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-3.0.1/policy/modules/system/fstools.if +--- nsaserefpolicy/policy/modules/system/fstools.if 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/fstools.if 2007-05-30 15:12:50.000000000 -0400 +@@ -124,3 +124,22 @@ + + allow $1 swapfile_t:file getattr; + ') ++ ++######################################## ++## ++## Read fstools unnamed pipes. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fstools_read_pipes',` ++ gen_require(` ++ type fsdaemon_t; ++ ') ++ ++ allow $1 fsdaemon_t:fifo_file read_fifo_file_perms; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.0.1/policy/modules/system/fstools.te +--- nsaserefpolicy/policy/modules/system/fstools.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/fstools.te 2007-05-30 15:12:50.000000000 -0400 +@@ -9,6 +9,7 @@ + type fsadm_t; + type fsadm_exec_t; + init_system_domain(fsadm_t,fsadm_exec_t) ++application_executable_file(fsadm_exec_t) + role system_r types fsadm_t; + + type fsadm_log_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.fc serefpolicy-3.0.1/policy/modules/system/fusermount.fc +--- nsaserefpolicy/policy/modules/system/fusermount.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/system/fusermount.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,6 @@ ++# fusermount executable will have: ++# label: system_u:object_r:fusermount_exec_t ++# MLS sensitivity: s0 ++# MCS categories: ++ ++/usr/bin/fusermount -- gen_context(system_u:object_r:fusermount_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.if serefpolicy-3.0.1/policy/modules/system/fusermount.if +--- nsaserefpolicy/policy/modules/system/fusermount.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/system/fusermount.if 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,41 @@ ++## policy for fusermount ++ ++######################################## ++## ++## Execute a domain transition to run fusermount. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`fusermount_domtrans',` ++ gen_require(` ++ type fusermount_t, fusermount_exec_t; ++ ') ++ ++ domain_auto_trans($1,fusermount_exec_t,fusermount_t) ++ ++ allow fusermount_t $1:fd use; ++ allow fusermount_t $1:fifo_file rw_file_perms; ++ allow fusermount_t $1:process sigchld; ++') ++ ++######################################## ++## ++## Inherit and use file descriptors from fusermount. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fusermount_use_fds',` ++ gen_require(` ++ type fusermount_t; ++ ') ++ ++ allow $1 fusermount_t:fd use; ++') +\ No newline at end of file +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.te serefpolicy-3.0.1/policy/modules/system/fusermount.te +--- nsaserefpolicy/policy/modules/system/fusermount.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.1/policy/modules/system/fusermount.te 2007-05-30 15:12:50.000000000 -0400 +@@ -0,0 +1,46 @@ ++policy_module(fusermount,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type fusermount_t; ++type fusermount_exec_t; ++application_domain(fusermount_t, fusermount_exec_t) ++role system_r types fusermount_t; ++ ++######################################## ++# ++# fusermount local policy ++# ++allow fusermount_t self:capability sys_admin; ++allow fusermount_t self:fifo_file { read write }; ++allow fusermount_t self:unix_stream_socket create_stream_socket_perms; ++ ++files_read_etc_files(fusermount_t) ++ ++libs_use_ld_so(fusermount_t) ++libs_use_shared_libs(fusermount_t) ++ ++miscfiles_read_localization(fusermount_t) ++ ++files_manage_etc_runtime_files(fusermount_t) ++files_etc_filetrans_etc_runtime(fusermount_t,file) ++files_mounton_all_mountpoints(fusermount_t) ++ ++fs_mount_fusefs(fusermount_t) ++ ++storage_raw_read_fixed_disk(fusermount_t) ++storage_raw_write_fixed_disk(fusermount_t) ++ ++optional_policy(` ++ hal_write_log(fusermount_t) ++ hal_use_fds(fusermount_t) ++ hal_rw_pipes(fusermount_t) ++') ++ ++optional_policy(` ++ mount_ntfs_rw_stream_sockets(fusermount_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-3.0.1/policy/modules/system/getty.te +--- nsaserefpolicy/policy/modules/system/getty.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/getty.te 2007-05-30 15:12:50.000000000 -0400 +@@ -33,7 +33,8 @@ + # + + # Use capabilities. +-allow getty_t self:capability { dac_override chown setgid sys_resource sys_tty_config fowner fsetid }; ++# getty requires sys_admin #209426 ++allow getty_t self:capability { dac_override chown setgid sys_resource sys_tty_config fowner fsetid sys_admin }; + dontaudit getty_t self:capability sys_tty_config; + allow getty_t self:process { getpgid setpgid getsession signal_perms }; + allow getty_t self:fifo_file rw_fifo_file_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.0.1/policy/modules/system/hostname.te +--- nsaserefpolicy/policy/modules/system/hostname.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/hostname.te 2007-05-30 15:12:50.000000000 -0400 +@@ -8,8 +8,12 @@ + + type hostname_t; + type hostname_exec_t; +-init_system_domain(hostname_t,hostname_exec_t) ++ ++#dont transition from initrc ++domain_type(hostname_t) ++domain_entry_file(hostname_t,hostname_exec_t) + role system_r types hostname_t; ++application_executable_file(hostname_exec_t) + + ######################################## + # +@@ -60,3 +64,11 @@ + xen_append_log(hostname_t) + xen_dontaudit_use_fds(hostname_t) + ') ++ ++optional_policy(` ++ xen_append_log(hostname_t) ++') ++ ++optional_policy(` ++ unconfined_dontaudit_rw_pipes(hostname_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.1/policy/modules/system/init.if +--- nsaserefpolicy/policy/modules/system/init.if 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/init.if 2007-05-30 15:12:50.000000000 -0400 +@@ -194,11 +194,14 @@ + gen_require(` + type initrc_t; + role system_r; ++ attribute daemon; + ') + + domain_type($1) + domain_entry_file($1,$2) + ++ typeattribute $1 daemon; ++ + role system_r types $1; + + domtrans_pattern(initrc_t,$2,$1) +@@ -300,6 +303,9 @@ + interface(`init_getpgid',` + gen_require(` + type init_t; ++ ++ # cjp: remove this when init_t decl is moved back to this module ++ attribute direct_run_init; + ') + + allow $1 init_t:process getpgid; +@@ -318,6 +324,9 @@ + interface(`init_signull',` + gen_require(` + type init_t; ++ ++ # cjp: remove this when init_t decl is moved back to this module ++ attribute direct_run_init; + ') + + allow $1 init_t:process signull; +@@ -336,6 +345,9 @@ + interface(`init_sigchld',` + gen_require(` + type init_t; ++ ++ # cjp: remove this when init_t decl is moved back to this module ++ attribute direct_run_init; + ') + + allow $1 init_t:process sigchld; +@@ -354,6 +366,9 @@ + interface(`init_use_fds',` + gen_require(` + type init_t; ++ ++ # cjp: remove this when init_t decl is moved back to this module ++ attribute direct_run_init; + ') + + allow $1 init_t:fd use; +@@ -373,6 +388,9 @@ + interface(`init_dontaudit_use_fds',` + gen_require(` + type init_t; ++ ++ # cjp: remove this when init_t decl is moved back to this module ++ attribute direct_run_init; + ') + + dontaudit $1 init_t:fd use; +@@ -1254,3 +1272,42 @@ + files_search_pids($1) + allow $1 initrc_var_run_t:file manage_file_perms; + ') ++ ++######################################## ++## ++## Read the process state (/proc/pid) of init. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`init_read_init_state',` ++ gen_require(` ++ attribute init_t; ++ ') ++ ++ allow $1 init_t:dir search_dir_perms; ++ allow $1 init_t:file r_file_perms; ++ allow $1 init_t:lnk_file r_file_perms; ++') ++ ++######################################## ++## ++## Ptrace init ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`init_ptrace_init_domain',` ++ gen_require(` ++ attribute init_t; ++ ') ++ ++ allow $1 init_t:process ptrace; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.1/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/init.te 2007-05-30 17:29:20.000000000 -0400 +@@ -10,6 +10,20 @@ + # Declarations + # + ++## ++##

++## Allow all daemons the ability to use unallocated ttys ++##

++## ++gen_tunable(allow_daemons_use_tty,false) ++ ++## ++##

++## Allow all daemons to write corefiles to / ++##

++## ++gen_tunable(allow_daemons_dump_core,false) ++ + # used for direct running of init scripts + # by admin domains + attribute direct_run_init; +@@ -73,7 +87,7 @@ + # + + # Use capabilities. old rule: +-allow init_t self:capability ~sys_module; ++allow init_t self:capability ~{ audit_control audit_write sys_module }; + # is ~sys_module really needed? observed: + # sys_boot + # sys_tty_config +@@ -189,7 +203,7 @@ + # + + allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched }; +-allow initrc_t self:capability ~{ sys_admin sys_module }; ++allow initrc_t self:capability ~{ audit_control audit_write sys_admin sys_module }; + dontaudit initrc_t self:capability sys_module; # sysctl is triggering this + allow initrc_t self:passwd rootok; + +@@ -204,8 +218,7 @@ + allow initrc_t initrc_devpts_t:chr_file rw_term_perms; + term_create_pty(initrc_t,initrc_devpts_t) + +-# Going to single user mode +-init_exec(initrc_t) ++init_telinit(initrc_t) + + can_exec(initrc_t,initrc_exec_t) + +@@ -500,6 +513,33 @@ + ') + + optional_policy(` ++ rhgb_use_ptys(daemon) ++') ++ ++domain_dontaudit_use_interactive_fds(daemon) ++ ++ifdef(`targeted_policy',` ++ domain_subj_id_change_exemption(initrc_t) ++ ++ tunable_policy(`allow_daemons_use_tty',` ++ term_use_unallocated_ttys(daemon) ++ term_use_generic_ptys(daemon) ++ ', ` ++ term_dontaudit_use_unallocated_ttys(daemon) ++ term_dontaudit_use_generic_ptys(daemon) ++ ') ++ ++ # system-config-services causes avc messages that should be dontaudited ++ optional_policy(` ++ unconfined_dontaudit_rw_pipes(daemon) ++ ') ++ ++ tunable_policy(`allow_daemons_dump_core',` ++ files_dump_core(daemon) ++ ') ++') ++ ++optional_policy(` + amavis_search_lib(initrc_t) + amavis_setattr_pid_files(initrc_t) + ') +@@ -630,12 +670,6 @@ + mta_read_config(initrc_t) + mta_dontaudit_read_spool_symlinks(initrc_t) + ') +-# cjp: require doesnt work in the else of optionals :\ +-# this also would result in a type transition +-# conflict if sendmail is enabled +-#optional_policy(`',` +-# mta_send_mail(initrc_t) +-#') + + optional_policy(` + ifdef(`distro_redhat',` +@@ -701,6 +735,9 @@ + + # why is this needed: + rpm_manage_db(initrc_t) ++ # Allow SELinux aware applications to request rpm_script_t execution ++ rpm_transition_script(initrc_t) ++ + ') + + optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-3.0.1/policy/modules/system/ipsec.if +--- nsaserefpolicy/policy/modules/system/ipsec.if 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/ipsec.if 2007-05-30 15:12:50.000000000 -0400 +@@ -114,6 +114,26 @@ + + ######################################## + ## ++## Allow an IPsec SA to be used by an IPsec Policy. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`ipsec_labeled',` ++ gen_require(` ++ type ipsec_spd_t; ++ ') ++ ++ allow $1 ipsec_spd_t:association polmatch; ++ domain_ipsec_labels($1) ++') ++ ++ ++######################################## ++## + ## Execute racoon in the racoon domain. + ## + ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.0.1/policy/modules/system/ipsec.te +--- nsaserefpolicy/policy/modules/system/ipsec.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/ipsec.te 2007-05-30 15:12:50.000000000 -0400 +@@ -283,6 +283,7 @@ + allow racoon_t self:netlink_selinux_socket { bind create read }; + allow racoon_t self:udp_socket create_socket_perms; + allow racoon_t self:key_socket { create read setopt write }; ++logging_send_audit_msg(racoon_t) + + # manage pid file + manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.0.1/policy/modules/system/iptables.te +--- nsaserefpolicy/policy/modules/system/iptables.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/iptables.te 2007-05-30 16:53:27.000000000 -0400 +@@ -56,6 +56,7 @@ + domain_use_interactive_fds(iptables_t) + + files_read_etc_files(iptables_t) ++files_read_etc_runtime_files(iptables_t) + + init_use_fds(iptables_t) + init_use_script_ptys(iptables_t) +@@ -74,9 +75,15 @@ + sysnet_domtrans_ifconfig(iptables_t) + sysnet_dns_name_resolve(iptables_t) + ++selinux_get_fs_mount(iptables_t) ++ + userdom_use_all_users_fds(iptables_t) + + optional_policy(` ++ fail2ban_append_log(iptables_t) ++') ++ ++optional_policy(` + firstboot_use_fds(iptables_t) + firstboot_rw_pipes(iptables_t) + ') +@@ -105,3 +112,4 @@ + optional_policy(` + udev_read_db(iptables_t) + ') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.1/policy/modules/system/libraries.fc +--- nsaserefpolicy/policy/modules/system/libraries.fc 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/libraries.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -134,11 +134,14 @@ + + /usr/lib/transgaming_cedega/gddb_parser.so -- gen_context(system_u:object_r:shlib_t,s0) + /usr/lib/win32/.* -- gen_context(system_u:object_r:shlib_t,s0) ++/usr/lib/vlc/codec/libdmo_plugin.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib/vlc/codec/librealaudio_plugin.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) + + /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/libsipphoneapi\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/ati-fglrx/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib(64)?/xorg/libGL\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/fglrx/libGL\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.1/policy/modules/system/libraries.te +--- nsaserefpolicy/policy/modules/system/libraries.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/libraries.te 2007-05-30 15:12:50.000000000 -0400 +@@ -62,7 +62,8 @@ + + manage_dirs_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t) + manage_files_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t) +-files_tmp_filetrans(ldconfig_t, ldconfig_tmp_t, { file dir }) ++manage_lnk_files_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t) ++files_tmp_filetrans(ldconfig_t, ldconfig_tmp_t, { file dir lnk_file }) + + manage_lnk_files_pattern(ldconfig_t,lib_t,lib_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.0.1/policy/modules/system/locallogin.te +--- nsaserefpolicy/policy/modules/system/locallogin.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/locallogin.te 2007-05-31 14:36:02.000000000 -0400 +@@ -48,6 +48,8 @@ + allow local_login_t self:msgq create_msgq_perms; + allow local_login_t self:msg { send receive }; + allow local_login_t self:key { search write link }; ++allow local_login_t self:appletalk_socket create_socket_perms; ++allow local_login_t self:socket create_socket_perms; + + allow local_login_t local_login_lock_t:file manage_file_perms; + files_lock_filetrans(local_login_t,local_login_lock_t,file) +@@ -56,6 +58,10 @@ + allow local_login_t local_login_tmp_t:file manage_file_perms; + files_tmp_filetrans(local_login_t, local_login_tmp_t, { file dir }) + ++corecmd_exec_bin(local_login_t) ++ ++kernel_read_network_state(local_login_t) ++kernel_search_network_sysctl(local_login_t) + kernel_read_system_state(local_login_t) + kernel_read_kernel_sysctls(local_login_t) + kernel_search_key(local_login_t) +@@ -98,6 +104,11 @@ + term_setattr_all_user_ttys(local_login_t) + term_setattr_unallocated_ttys(local_login_t) + ++tunable_policy(`allow_console_login', ` ++ term_relabel_console(local_login_t) ++ term_setattr_console(local_login_t) ++') ++ + auth_rw_login_records(local_login_t) + auth_rw_faillog(local_login_t) + auth_manage_pam_console_data(local_login_t) +@@ -138,10 +149,6 @@ + userdom_sigchld_all_users(local_login_t) + userdom_create_all_users_keys(local_login_t) + +-ifdef(`targeted_policy',` +- unconfined_shell_domtrans(local_login_t) +-') +- + tunable_policy(`read_default_t',` + files_list_default(local_login_t) + files_read_default_files(local_login_t) +@@ -165,6 +172,15 @@ + ') + + optional_policy(` ++ consolekit_dbus_chat(local_login_t) ++') ++ ++optional_policy(` ++ dbus_system_bus_client_template(local_login,local_login_t) ++ dbus_send_system_bus(local_login_t) ++') ++ ++optional_policy(` + gpm_getattr_gpmctl(local_login_t) + gpm_setattr_gpmctl(local_login_t) + ') +@@ -184,12 +200,18 @@ + + optional_policy(` + unconfined_domain(local_login_t) ++ unconfined_shell_domtrans(local_login_t) + ') + + optional_policy(` + usermanage_read_crack_db(local_login_t) + ') + ++optional_policy(` ++ xserver_read_xdm_tmp_files(local_login_t) ++ xserver_rw_xdm_tmp_files(local_login_t) ++') ++ + ################################# + # + # Sulogin local policy +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.1/policy/modules/system/logging.if +--- nsaserefpolicy/policy/modules/system/logging.if 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/logging.if 2007-05-30 15:12:50.000000000 -0400 +@@ -223,6 +223,25 @@ + + ######################################## + ## ++## Execute klogd in the klog domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`logging_domtrans_klog',` ++ gen_require(` ++ type klogd_t, klogd_exec_t; ++ ') ++ ++ corecmd_search_bin($1) ++ domtrans_pattern($1,klogd_exec_t,klogd_t) ++') ++ ++######################################## ++## + ## Create an object in the log directory, with a private + ## type using a type transition. + ## +@@ -302,6 +321,25 @@ + + ######################################## + ## ++## dontaudit search of auditd configuration files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`logging_dontaudit_search_audit_config',` ++ gen_require(` ++ type auditd_etc_t; ++ ') ++ ++ dontaudit $1 auditd_etc_t:dir search_dir_perms; ++') ++ ++######################################## ++## + ## Allows the domain to open a file in the + ## log directory, but does not allow the listing + ## of the contents of the log directory. +@@ -436,7 +474,7 @@ + + files_search_var($1) + allow $1 var_log_t:dir list_dir_perms; +- read_files_pattern($1,var_log_t,logfile) ++ read_files_pattern($1,logfile, logfile) + ') + + ######################################## +@@ -480,6 +518,8 @@ + files_search_var($1) + manage_files_pattern($1,logfile,logfile) + read_lnk_files_pattern($1,logfile,logfile) ++ allow $1 logfile:dir { relabelfrom relabelto }; ++ allow $1 logfile:file { relabelfrom relabelto }; + ') + + ######################################## +@@ -563,3 +603,121 @@ + files_search_var($1) + manage_files_pattern($1,var_log_t,var_log_t) + ') ++ ++######################################## ++## ++## Send audit messages ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`logging_send_audit_msg',` ++ gen_require(` ++ attribute can_send_audit_msg; ++ ') ++ ++ typeattribute $1 can_send_audit_msg; ++ allow $1 self:capability audit_write; ++ allow $1 self:netlink_audit_socket { create_socket_perms nlmsg_read nlmsg_relay }; ++') ++ ++######################################## ++## ++## Set login uid ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`logging_set_loginuid',` ++ gen_require(` ++ attribute can_set_loginuid; ++ attribute can_send_audit_msg; ++ ') ++ ++ typeattribute $1 can_set_loginuid, can_send_audit_msg; ++ ++ allow $1 self:capability audit_control; ++ allow $1 self:netlink_audit_socket { create_socket_perms nlmsg_read nlmsg_relay }; ++') ++ ++######################################## ++## ++## Set up audit ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`logging_set_audit',` ++ gen_require(` ++ attribute can_set_audit; ++ attribute can_send_audit_msg; ++ ') ++ ++ typeattribute $1 can_set_audit, can_send_audit_msg; ++ allow $1 self:capability { audit_write audit_control }; ++ allow $1 self:netlink_audit_socket { create_socket_perms nlmsg_read nlmsg_write nlmsg_relay }; ++') ++ ++######################################## ++## ++## Set audit control rules ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`logging_set_auditctl',` ++ gen_require(` ++ attribute can_set_auditctl; ++ ') ++ ++ typeattribute $1 can_set_auditctl; ++ logging_set_audit($1) ++ allow $1 self:netlink_audit_socket nlmsg_readpriv; ++') ++ ++######################################## ++## ++## Unconfined access to the loggin module. ++## ++## ++##

++## Unconfined access to the authlogin module. ++##

++##

++## Currently, this only allows assertions for ++## the audit susbsystem to be passed. ++## No access is granted yet. ++##

++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`logging_unconfined',` ++ gen_require(` ++ attribute can_set_audit; ++ attribute can_set_auditctl; ++ attribute can_send_audit_msg; ++ attribute can_set_loginuid; ++ ') ++ ++ typeattribute $1 can_set_loginuid; ++ typeattribute $1 can_set_audit; ++ typeattribute $1 can_set_auditctl; ++ typeattribute $1 can_send_audit_msg; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.0.1/policy/modules/system/logging.te +--- nsaserefpolicy/policy/modules/system/logging.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/logging.te 2007-05-30 17:30:40.000000000 -0400 +@@ -7,10 +7,15 @@ + # + + attribute logfile; ++attribute can_set_audit; ++attribute can_set_auditctl; ++attribute can_set_loginuid; ++attribute can_send_audit_msg; + + type auditctl_t; + type auditctl_exec_t; + init_system_domain(auditctl_t,auditctl_exec_t) ++application_type(auditctl_t) + role system_r types auditctl_t; + + type auditd_etc_t; +@@ -59,14 +64,17 @@ + init_ranged_daemon_domain(auditd_t,auditd_exec_t,mls_systemhigh) + ') + ++neverallow ~{ can_set_loginuid can_set_audit } self:capability audit_control; ++neverallow ~can_set_audit self:netlink_audit_socket nlmsg_write; ++neverallow ~can_set_auditctl self:netlink_audit_socket nlmsg_readpriv; ++neverallow ~can_send_audit_msg self:capability audit_write; ++neverallow ~can_send_audit_msg self:netlink_audit_socket nlmsg_relay; ++ + ######################################## + # + # Auditd local policy + # + +-allow auditctl_t self:capability { audit_write audit_control }; +-allow auditctl_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv }; +- + read_files_pattern(auditctl_t,auditd_etc_t,auditd_etc_t) + allow auditctl_t auditd_etc_t:dir list_dir_perms; + +@@ -91,6 +99,7 @@ + + locallogin_dontaudit_use_fds(auditctl_t) + ++logging_set_auditctl(auditctl_t) + logging_send_syslog_msg(auditctl_t) + + ######################################## +@@ -98,12 +107,11 @@ + # Auditd local policy + # + +-allow auditd_t self:capability { audit_write audit_control fsetid sys_nice sys_resource }; ++allow auditd_t self:capability { fsetid sys_nice sys_resource }; + dontaudit auditd_t self:capability sys_tty_config; + allow auditd_t self:process { signal_perms setpgid setsched }; + allow auditd_t self:file { getattr read write }; + allow auditd_t self:unix_dgram_socket create_socket_perms; +-allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv }; + allow auditd_t self:fifo_file rw_file_perms; + + allow auditd_t auditd_etc_t:dir list_dir_perms; +@@ -141,6 +149,7 @@ + + init_telinit(auditd_t) + ++logging_set_audit(auditd_t) + logging_send_syslog_msg(auditd_t) + + libs_use_ld_so(auditd_t) +@@ -157,6 +166,8 @@ + + userdom_dontaudit_use_unpriv_user_fds(auditd_t) + userdom_dontaudit_search_sysadm_home_dirs(auditd_t) ++# cjp: this is questionable ++userdom_use_sysadm_ttys(auditd_t) + + optional_policy(` + seutil_sigchld_newrole(auditd_t) +@@ -249,6 +260,10 @@ + + # create/append log files. + manage_files_pattern(syslogd_t,var_log_t,var_log_t) ++allow syslogd_t var_run_t:fifo_file { ioctl read write }; ++# r/w log fifo_files files. ++rw_fifo_files_pattern(syslogd_t,var_log_t,var_log_t) ++ + # Allow access for syslog-ng + allow syslogd_t var_log_t:dir { create setattr }; + +@@ -313,6 +328,7 @@ + domain_use_interactive_fds(syslogd_t) + + files_read_etc_files(syslogd_t) ++files_read_var_files(syslogd_t) + files_read_etc_runtime_files(syslogd_t) + # /initrd is not umounted before minilog starts + files_dontaudit_search_isid_type_dirs(syslogd_t) +@@ -342,6 +358,7 @@ + files_var_lib_filetrans(syslogd_t,devlog_t,sock_file) + ') + ++ + optional_policy(` + inn_manage_log(syslogd_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.0.1/policy/modules/system/lvm.fc +--- nsaserefpolicy/policy/modules/system/lvm.fc 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/lvm.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -15,6 +15,7 @@ + # + /etc/lvm(/.*)? gen_context(system_u:object_r:lvm_etc_t,s0) + /etc/lvm/\.cache -- gen_context(system_u:object_r:lvm_metadata_t,s0) ++/etc/lvm/cache(./*)? gen_context(system_u:object_r:lvm_metadata_t,s0) + /etc/lvm/archive(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) + /etc/lvm/backup(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) + /etc/lvm/lock(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.1/policy/modules/system/lvm.te +--- nsaserefpolicy/policy/modules/system/lvm.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/lvm.te 2007-05-30 15:12:50.000000000 -0400 +@@ -16,6 +16,7 @@ + type lvm_t; + type lvm_exec_t; + init_system_domain(lvm_t,lvm_exec_t) ++application_type(lvm_t) + # needs privowner because it assigns the identity system_u to device nodes + # but runs as the identity of the sysadmin + domain_obj_id_change_exemption(lvm_t) +@@ -149,7 +150,9 @@ + + # DAC overrides and mknod for modifying /dev entries (vgmknodes) + # rawio needed for dmraid +-allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio }; ++allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio net_admin }; ++# lvm needs net_admin for multipath ++ + dontaudit lvm_t self:capability sys_tty_config; + allow lvm_t self:process { sigchld sigkill sigstop signull signal }; + # LVM will complain a lot if it cannot set its priority. +@@ -227,6 +230,8 @@ + dev_dontaudit_getattr_generic_blk_files(lvm_t) + dev_dontaudit_getattr_generic_pipes(lvm_t) + dev_create_generic_dirs(lvm_t) ++dev_delete_generic_dirs(lvm_t) ++dev_rw_generic_files(lvm_t) + + fs_getattr_xattr_fs(lvm_t) + fs_search_auto_mountpoints(lvm_t) +@@ -245,6 +250,7 @@ + storage_dev_filetrans_fixed_disk(lvm_t) + # Access raw devices and old /dev/lvm (c 109,0). Is this needed? + storage_manage_fixed_disk(lvm_t) ++mls_file_read_up(lvm_t) + + term_getattr_all_user_ttys(lvm_t) + term_list_ptys(lvm_t) +@@ -292,5 +298,15 @@ + ') + + optional_policy(` ++ modutils_domtrans_insmod(lvm_t) ++') ++ ++optional_policy(` + udev_read_db(lvm_t) + ') ++ ++optional_policy(` ++ xen_append_log(lvm_t) ++ xen_dontaudit_rw_unix_stream_sockets(lvm_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.0.1/policy/modules/system/modutils.te +--- nsaserefpolicy/policy/modules/system/modutils.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/modutils.te 2007-05-30 15:12:50.000000000 -0400 +@@ -102,6 +102,7 @@ + init_use_fds(insmod_t) + init_use_script_fds(insmod_t) + init_use_script_ptys(insmod_t) ++init_spec_domtrans_script(insmod_t) + + libs_use_ld_so(insmod_t) + libs_use_shared_libs(insmod_t) +@@ -118,6 +119,18 @@ + } + + optional_policy(` ++ alsa_domtrans(insmod_t) ++') ++ ++optional_policy(` ++ firstboot_dontaudit_rw_pipes(insmod_t) ++') ++ ++optional_policy(` ++ hal_write_log(insmod_t) ++') ++ ++optional_policy(` + hotplug_search_config(insmod_t) + ') + +@@ -150,6 +163,7 @@ + + optional_policy(` + rpm_rw_pipes(insmod_t) ++ rpm_read_script_tmp_files(insmod_t) + ') + + optional_policy(` +@@ -180,6 +194,7 @@ + + files_read_kernel_symbol_table(depmod_t) + files_read_kernel_modules(depmod_t) ++files_delete_kernel_modules(depmod_t) + + fs_getattr_xattr_fs(depmod_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.0.1/policy/modules/system/mount.fc +--- nsaserefpolicy/policy/modules/system/mount.fc 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/mount.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -1,4 +1,3 @@ + /bin/mount.* -- gen_context(system_u:object_r:mount_exec_t,s0) + /bin/umount.* -- gen_context(system_u:object_r:mount_exec_t,s0) +- +-/usr/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0) ++/sbin/mount.ntfs-3g -- gen_context(system_u:object_r:mount_ntfs_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.0.1/policy/modules/system/mount.if +--- nsaserefpolicy/policy/modules/system/mount.if 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/mount.if 2007-05-30 15:12:50.000000000 -0400 +@@ -143,8 +143,42 @@ + allow unconfined_mount_t $1:fd use; + allow unconfined_mount_t $1:fifo_file rw_file_perms; + allow unconfined_mount_t $1:process sigchld; +-# cjp: require in the else doesnt work +-# ',` +-# mount_domtrans($1) + ') + ') ++ ++######################################## ++## ++## Execute a domain transition to run mount_ntfs. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`mount_ntfs_domtrans',` ++ gen_require(` ++ type mount_ntfs_t, mount_ntfs_exec_t; ++ ') ++ ++ domtrans_pattern($1,mount_ntfs_exec_t,mount_ntfs_t) ++') ++ ++######################################## ++## ++## Allow the specified domain to read/write to ++## init scripts with a unix domain stream sockets. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`mount_ntfs_rw_stream_sockets',` ++ gen_require(` ++ type mount_ntfs_t; ++ ') ++ ++ allow $1 mount_ntfs_t:unix_stream_socket { read write }; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.0.1/policy/modules/system/mount.te +--- nsaserefpolicy/policy/modules/system/mount.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/mount.te 2007-05-30 17:17:50.000000000 -0400 +@@ -8,6 +8,13 @@ + + ## + ##

++## Allow mount to mount any dir ++##

++## ++gen_tunable(allow_mounton_anydir,true) ++ ++## ++##

+ ## Allow mount to mount any file + ##

+ ## +@@ -16,21 +23,30 @@ + type mount_t; + type mount_exec_t; + init_system_domain(mount_t,mount_exec_t) ++application_executable_file(mount_exec_t) + role system_r types mount_t; + ++type mount_ntfs_t; ++type mount_ntfs_exec_t; ++init_system_domain(mount_ntfs_t, mount_ntfs_exec_t) ++ + type mount_loopback_t; # customizable + files_type(mount_loopback_t) + + type mount_tmp_t; + files_tmp_file(mount_tmp_t) + ++type unconfined_mount_t; ++domain_type(unconfined_mount_t) ++domain_entry_file(unconfined_mount_t,mount_exec_t) ++ + ######################################## + # + # mount local policy + # + + # setuid/setgid needed to mount cifs +-allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid }; ++allow mount_t self:capability { fsetid ipc_lock sys_rawio sys_resource sys_admin dac_override chown sys_tty_config setuid setgid }; + + allow mount_t mount_loopback_t:file read_file_perms; + allow mount_t self:netlink_route_socket r_netlink_socket_perms; +@@ -108,6 +124,7 @@ + + sysnet_use_portmap(mount_t) + ++selinux_get_fs_mount(mount_t) + selinux_get_enforce_mode(mount_t) + seutil_read_config(mount_t) + +@@ -121,10 +138,15 @@ + ') + ') + ++tunable_policy(`allow_mounton_anydir',` ++ auth_read_all_dirs_except_shadow(mount_t) ++ files_mounton_non_security_dir(mount_t) ++') ++ + tunable_policy(`allow_mount_anyfile',` + auth_read_all_dirs_except_shadow(mount_t) + auth_read_all_files_except_shadow(mount_t) +- files_mounton_non_security(mount_t) ++ files_mounton_non_security_files(mount_t) + ') + + optional_policy(` +@@ -192,10 +214,52 @@ + # + + optional_policy(` +- type unconfined_mount_t; +- domain_type(unconfined_mount_t) +- domain_entry_file(unconfined_mount_t,mount_exec_t) +- + files_etc_filetrans_etc_runtime(unconfined_mount_t,file) + unconfined_domain(unconfined_mount_t) + ') ++ ++######################################## ++# ++# mount_ntfs local policy ++# ++allow mount_ntfs_t self:capability { setuid sys_admin }; ++allow mount_ntfs_t self:fifo_file { read write }; ++allow mount_ntfs_t self:unix_stream_socket create_stream_socket_perms; ++allow mount_ntfs_t self:unix_dgram_socket { connect create }; ++ ++corecmd_read_bin_symlinks(mount_ntfs_t) ++corecmd_exec_shell(mount_ntfs_t) ++ ++files_read_etc_files(mount_ntfs_t) ++ ++libs_use_ld_so(mount_ntfs_t) ++libs_use_shared_libs(mount_ntfs_t) ++ ++fusermount_domtrans(mount_ntfs_t) ++fusermount_use_fds(mount_ntfs_t) ++ ++init_dontaudit_use_fds(mount_ntfs_t) ++ ++kernel_read_system_state(mount_ntfs_t) ++ ++logging_send_syslog_msg(mount_ntfs_t) ++ ++miscfiles_read_localization(mount_ntfs_t) ++ ++modutils_domtrans_insmod(mount_ntfs_t) ++ ++mount_ntfs_domtrans(mount_t) ++ ++storage_raw_read_fixed_disk(mount_ntfs_t) ++storage_raw_write_fixed_disk(mount_ntfs_t) ++ ++optional_policy(` ++ nscd_socket_use(mount_ntfs_t) ++') ++ ++optional_policy(` ++ hal_write_log(mount_ntfs_t) ++ hal_use_fds(mount_ntfs_t) ++ hal_rw_pipes(mount_ntfs_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/netlabel.te serefpolicy-3.0.1/policy/modules/system/netlabel.te +--- nsaserefpolicy/policy/modules/system/netlabel.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/netlabel.te 2007-05-30 15:12:50.000000000 -0400 +@@ -20,6 +20,8 @@ + allow netlabel_mgmt_t self:capability net_admin; + allow netlabel_mgmt_t self:netlink_socket create_socket_perms; + ++files_read_etc_files(netlabel_mgmt_t) ++ + kernel_read_network_state(netlabel_mgmt_t) + + libs_use_ld_so(netlabel_mgmt_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.0.1/policy/modules/system/raid.te +--- nsaserefpolicy/policy/modules/system/raid.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/raid.te 2007-05-30 15:12:50.000000000 -0400 +@@ -19,7 +19,7 @@ + # Local policy + # + +-allow mdadm_t self:capability { dac_override sys_admin ipc_lock }; ++allow mdadm_t self:capability { dac_override mknod sys_admin ipc_lock }; + dontaudit mdadm_t self:capability sys_tty_config; + allow mdadm_t self:process { sigchld sigkill sigstop signull signal }; + allow mdadm_t self:fifo_file rw_fifo_file_perms; +@@ -46,6 +46,7 @@ + # RAID block device access + storage_manage_fixed_disk(mdadm_t) + storage_dev_filetrans_fixed_disk(mdadm_t) ++storage_read_scsi_generic(mdadm_t) + + term_dontaudit_list_ptys(mdadm_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.0.1/policy/modules/system/selinuxutil.fc +--- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/selinuxutil.fc 2007-05-30 15:12:50.000000000 -0400 +@@ -40,6 +40,7 @@ + /usr/sbin/setfiles.* -- gen_context(system_u:object_r:setfiles_exec_t,s0) + /usr/sbin/setsebool -- gen_context(system_u:object_r:semanage_exec_t,s0) + /usr/sbin/semanage -- gen_context(system_u:object_r:semanage_exec_t,s0) ++/usr/sbin/genhomedircon -- gen_context(system_u:object_r:semanage_exec_t,s0) + /usr/sbin/semodule -- gen_context(system_u:object_r:semanage_exec_t,s0) + + # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.0.1/policy/modules/system/selinuxutil.if +--- nsaserefpolicy/policy/modules/system/selinuxutil.if 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/selinuxutil.if 2007-05-30 15:12:50.000000000 -0400 +@@ -432,6 +432,7 @@ + role $2 types run_init_t; + allow run_init_t $3:chr_file rw_term_perms; + allow $2 system_r; ++ auth_run_upd_passwd($1,$2,$3) + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.1/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/selinuxutil.te 2007-05-31 11:09:22.000000000 -0400 +@@ -24,11 +24,9 @@ + files_type(selinux_config_t) + + type checkpolicy_t, can_write_binary_policy; +-domain_type(checkpolicy_t) +-role system_r types checkpolicy_t; +- + type checkpolicy_exec_t; +-domain_entry_file(checkpolicy_t,checkpolicy_exec_t) ++application_domain(checkpolicy_t, checkpolicy_exec_t) ++role system_r types checkpolicy_t; + + # + # default_context_t is the type applied to +@@ -81,25 +79,27 @@ + type restorecond_exec_t; + init_daemon_domain(restorecond_t,restorecond_exec_t) + domain_obj_id_change_exemption(restorecond_t) +-role system_r types restorecond_t; + + type restorecond_var_run_t; + files_pid_file(restorecond_var_run_t) + + type run_init_t; + type run_init_exec_t; +-domain_type(run_init_t) +-domain_entry_file(run_init_t,run_init_exec_t) ++application_domain(run_init_t, run_init_exec_t) + domain_system_change_exemption(run_init_t) ++role system_r types run_init_t; + + type semanage_t; +-domain_type(semanage_t) +-domain_interactive_fd(semanage_t) +- + type semanage_exec_t; +-domain_entry_file(semanage_t, semanage_exec_t) ++application_domain(semanage_t, semanage_exec_t) ++domain_interactive_fd(semanage_t) + role system_r types semanage_t; + ++ifdef(`targeted_policy',` ++init_use_fds(semanage_t) ++init_system_domain(semanage_t, semanage_exec_t) ++') ++ + type semanage_store_t; + files_type(semanage_store_t) + +@@ -113,9 +113,12 @@ + files_type(semanage_trans_lock_t) + + type setfiles_t alias restorecon_t, can_relabelto_binary_policy; +-type setfiles_exec_t alias restorecon_exec_t; +-init_system_domain(setfiles_t,setfiles_exec_t) + domain_obj_id_change_exemption(setfiles_t) ++domain_type(setfiles_t) ++role system_r types setfiles_t; ++ ++type setfiles_exec_t alias restorecon_exec_t; ++domain_entry_file(setfiles_t,setfiles_exec_t) + + ifdef(`distro_redhat',` + init_system_domain(setfiles_t,setfiles_exec_t) +@@ -157,6 +160,11 @@ + + userdom_use_all_users_fds(checkpolicy_t) + ++ifdef(`targeted_policy',` ++ term_use_generic_ptys(checkpolicy_t) ++ term_use_unallocated_ttys(checkpolicy_t) ++') ++ + ######################################## + # + # Load_policy local policy +@@ -179,6 +187,7 @@ + fs_getattr_xattr_fs(load_policy_t) + + mls_file_read_up(load_policy_t) ++mls_file_write_down(load_policy_t) + + selinux_get_fs_mount(load_policy_t) + selinux_load_policy(load_policy_t) +@@ -201,10 +210,15 @@ + # cjp: cover up stray file descriptors. + dontaudit load_policy_t selinux_config_t:file write; + optional_policy(` +- unconfined_dontaudit_read_pipes(load_policy_t) ++ unconfined_dontaudit_rw_pipes(load_policy_t) + ') + ') + ++ifdef(`targeted_policy',` ++ term_use_unallocated_ttys(load_policy_t) ++ term_use_generic_ptys(load_policy_t) ++') ++ + ######################################## + # + # Newrole local policy +@@ -222,7 +236,7 @@ + allow newrole_t self:msg { send receive }; + allow newrole_t self:unix_dgram_socket sendto; + allow newrole_t self:unix_stream_socket { create_stream_socket_perms connectto }; +-allow newrole_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; ++logging_send_audit_msg(newrole_t) + + read_files_pattern(newrole_t,selinux_config_t,selinux_config_t) + read_lnk_files_pattern(newrole_t,selinux_config_t,selinux_config_t) +@@ -260,6 +274,7 @@ + term_dontaudit_use_unallocated_ttys(newrole_t) + + auth_domtrans_chk_passwd(newrole_t) ++auth_domtrans_upd_passwd(newrole_t) + auth_rw_faillog(newrole_t) + + corecmd_list_bin(newrole_t) +@@ -368,7 +383,7 @@ + allow run_init_t self:process setexec; + allow run_init_t self:capability setuid; + allow run_init_t self:fifo_file rw_file_perms; +-allow run_init_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; ++logging_send_audit_msg(run_init_t) + + # often the administrator runs such programs from a directory that is owned + # by a different user or has restrictive SE permissions, do not want to audit +@@ -382,6 +397,7 @@ + term_dontaudit_list_ptys(run_init_t) + + auth_domtrans_chk_passwd(run_init_t) ++auth_domtrans_upd_passwd(run_init_t) + auth_dontaudit_read_shadow(run_init_t) + + corecmd_exec_bin(run_init_t) +@@ -438,7 +454,7 @@ + allow semanage_t self:capability { dac_override audit_write }; + allow semanage_t self:unix_stream_socket create_stream_socket_perms; + allow semanage_t self:unix_dgram_socket create_socket_perms; +-allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; ++logging_send_audit_msg(semanage_t) + + allow semanage_t policy_config_t:file { read write }; + +@@ -449,7 +465,10 @@ + kernel_read_system_state(semanage_t) + kernel_read_kernel_sysctls(semanage_t) + ++can_exec(semanage_t, semanage_exec_t) ++ + corecmd_exec_bin(semanage_t) ++corecmd_exec_shell(semanage_t) + + dev_read_urand(semanage_t) + +@@ -464,6 +483,7 @@ + mls_rangetrans_target(semanage_t) + mls_file_read_up(semanage_t) + ++selinux_get_fs_mount(semanage_t) + selinux_validate_context(semanage_t) + selinux_get_enforce_mode(semanage_t) + # for setsebool: +@@ -473,6 +493,8 @@ + + # Running genhomedircon requires this for finding all users + auth_use_nsswitch(semanage_t) ++# Admins are creating pp files in random locations ++auth_read_all_files_except_shadow(semanage_t) + + libs_use_ld_so(semanage_t) + libs_use_shared_libs(semanage_t) +@@ -497,6 +519,17 @@ + # netfilter_contexts: + seutil_manage_default_contexts(semanage_t) + ++userdom_search_sysadm_home_dirs(semanage_t) ++ ++optional_policy(` ++ #signal mcstrans on reload ++ init_spec_domtrans_script(semanage_t) ++') ++ ++optional_policy(` ++ rpm_dontaudit_rw_tmp_files(semanage_t) ++') ++ + # cjp: need a more general way to handle this: + ifdef(`enable_mls',` + # read secadm tmp files +@@ -504,11 +537,6 @@ + # Handle pp files created in homedir and /tmp + userdom_read_sysadm_home_content_files(semanage_t) + userdom_read_sysadm_tmp_files(semanage_t) +- +- optional_policy(` +- unconfined_read_home_content_files(semanage_t) +- unconfined_read_tmp_files(semanage_t) +- ') + ') + + ######################################## +@@ -534,12 +562,15 @@ + kernel_rw_pipes(setfiles_t) + kernel_rw_unix_dgram_sockets(setfiles_t) + kernel_dontaudit_list_all_proc(setfiles_t) ++kernel_dontaudit_read_all_proc(setfiles_t) + kernel_dontaudit_list_all_sysctls(setfiles_t) ++kernel_dontaudit_read_all_sysctls(setfiles_t) + + dev_relabel_all_dev_nodes(setfiles_t) + + fs_getattr_xattr_fs(setfiles_t) + fs_list_all(setfiles_t) ++fs_getattr_all_files(setfiles_t) + fs_search_auto_mountpoints(setfiles_t) + fs_relabelfrom_noxattr_fs(setfiles_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-3.0.1/policy/modules/system/setrans.te +--- nsaserefpolicy/policy/modules/system/setrans.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/setrans.te 2007-05-30 16:52:20.000000000 -0400 +@@ -61,6 +61,7 @@ + mls_socket_read_all_levels(setrans_t) + mls_fd_use_all_levels(setrans_t) + ++selinux_get_fs_mount(setrans_t) + selinux_compute_access_vector(setrans_t) + + term_dontaudit_use_generic_ptys(setrans_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.0.1/policy/modules/system/sysnetwork.te +--- nsaserefpolicy/policy/modules/system/sysnetwork.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/sysnetwork.te 2007-05-31 11:13:31.000000000 -0400 +@@ -158,6 +158,10 @@ + dbus_connect_system_bus(dhcpc_t) + dbus_send_system_bus(dhcpc_t) + ++ dbus_read_config(dhcpc_t) ++ ++ dbus_dontaudit_rw_system_selinux_socket(dhcpc_t) ++ + optional_policy(` + networkmanager_dbus_chat(dhcpc_t) + ') +@@ -215,6 +219,7 @@ + optional_policy(` + seutil_sigchld_newrole(dhcpc_t) + seutil_dontaudit_search_config(dhcpc_t) ++ seutil_domtrans_setfiles(dhcpc_t) + ') + + optional_policy(` +@@ -279,6 +284,8 @@ + fs_getattr_xattr_fs(ifconfig_t) + fs_search_auto_mountpoints(ifconfig_t) + ++selinux_dontaudit_getattr_fs(ifconfig_t) ++ + term_dontaudit_use_all_user_ttys(ifconfig_t) + term_dontaudit_use_all_user_ptys(ifconfig_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.1/policy/modules/system/udev.te +--- nsaserefpolicy/policy/modules/system/udev.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/udev.te 2007-05-30 15:12:50.000000000 -0400 +@@ -83,12 +83,19 @@ + kernel_dgram_send(udev_t) + kernel_signal(udev_t) + ++#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235182 ++kernel_read_net_sysctls(udev_t) ++kernel_read_network_state(udev_t) ++sysnet_read_dhcpc_pid(udev_t) ++sysnet_delete_dhcpc_pid(udev_t) ++ + corecmd_exec_all_executables(udev_t) + + dev_rw_sysfs(udev_t) + dev_manage_all_dev_nodes(udev_t) + dev_rw_generic_files(udev_t) + dev_delete_generic_files(udev_t) ++dev_search_usbfs_dirs(udev_t) + + domain_read_all_domains_state(udev_t) + domain_dontaudit_ptrace_all_domains(udev_t) #pidof triggers these +@@ -145,6 +152,7 @@ + sysnet_domtrans_ifconfig(udev_t) + sysnet_domtrans_dhcpc(udev_t) + ++userdom_use_sysadm_ttys(udev_t) + userdom_dontaudit_search_all_users_home_content(udev_t) + + ifdef(`distro_gentoo',` +@@ -188,5 +196,24 @@ + ') + + optional_policy(` ++ openct_read_pid_files(udev_t) ++ openct_domtrans(udev_t) ++') ++ ++optional_policy(` ++ pcscd_read_pub_files(udev_t) ++ pcscd_domtrans(udev_t) ++') ++ ++optional_policy(` ++ xen_append_log(udev_t) ++ kernel_write_xen_state(udev_t) ++ kernel_read_xen_state(udev_t) ++ xen_read_image_files(udev_t) ++') ++ ++optional_policy(` + xserver_read_xdm_pid(udev_t) + ') ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.1/policy/modules/system/unconfined.if +--- nsaserefpolicy/policy/modules/system/unconfined.if 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/unconfined.if 2007-05-31 07:24:57.000000000 -0400 +@@ -12,14 +12,13 @@ + # + interface(`unconfined_domain_noaudit',` + gen_require(` +- type unconfined_t; + class dbus all_dbus_perms; + class nscd all_nscd_perms; + class passwd all_passwd_perms; + ') + + # Use any Linux capability. +- allow $1 self:capability *; ++ allow $1 self:capability all_capabilities; + allow $1 self:fifo_file manage_fifo_file_perms; + + # Transition to myself, to make get_ordered_context_list happy. +@@ -29,10 +28,10 @@ + allow $1 self:file rw_file_perms; + + # Userland object managers +- allow $1 self:nscd *; +- allow $1 self:dbus *; +- allow $1 self:passwd *; +- allow $1 self:association *; ++ allow $1 self:nscd all_nscd; ++ allow $1 self:dbus all_dbus; ++ allow $1 self:passwd all_passwd; ++ allow $1 self:association all_association; + + kernel_unconfined($1) + corenet_unconfined($1) +@@ -79,6 +78,10 @@ + ') + + optional_policy(` ++ logging_unconfined($1) ++ ') ++ ++ optional_policy(` + nscd_unconfined($1) + ') + +@@ -601,3 +604,39 @@ + + allow $1 unconfined_tmp_t:file { getattr write append }; + ') ++ ++######################################## ++## ++## Allow ptrace of unconfined domain ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`unconfined_ptrace',` ++ gen_require(` ++ type unconfined_t; ++ ') ++ ++ allow $1 unconfined_t:process ptrace; ++') ++ ++######################################## ++## ++## Read and write to unconfined shared memory. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`unconfined_rw_shm',` ++ gen_require(` ++ type unconfined_t; ++ ') ++ ++ allow $1 unconfined_t:shm rw_shm_perms; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.1/policy/modules/system/unconfined.te +--- nsaserefpolicy/policy/modules/system/unconfined.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/unconfined.te 2007-05-30 17:04:04.000000000 -0400 +@@ -10,6 +10,7 @@ + type unconfined_exec_t; + init_system_domain(unconfined_t,unconfined_exec_t) + role unconfined_r types unconfined_t; ++domain_user_exemption_target(unconfined_t) + + type unconfined_execmem_t; + type unconfined_execmem_exec_t; +@@ -77,10 +78,6 @@ + ') + + optional_policy(` +- bootloader_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t }) +-') +- +-optional_policy(` + init_dbus_chat_script(unconfined_t) + + dbus_stub(unconfined_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.1/policy/modules/system/userdomain.if +--- nsaserefpolicy/policy/modules/system/userdomain.if 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/userdomain.if 2007-05-31 09:45:37.000000000 -0400 +@@ -114,6 +114,18 @@ + # Allow making the stack executable via mprotect. + allow $1_t self:process execstack; + ') ++ ++ optional_policy(` ++ ssh_rw_stream_sockets($1_t) ++ ') ++ ++ optional_policy(` ++ consoletype_exec($1_t) ++ ') ++ ++ optional_policy(` ++ hostname_exec($1_t) ++ ') + ') + + ####################################### +@@ -183,14 +195,6 @@ + read_sock_files_pattern($1_t,{ $1_home_t $1_home_dir_t },$1_home_t) + files_list_home($1_t) + +- # privileged home directory writers +- manage_dirs_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) +- manage_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) +- manage_lnk_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) +- manage_sock_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) +- manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) +- filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file }) +- + tunable_policy(`use_nfs_home_dirs',` + fs_list_nfs_dirs($1_t) + fs_read_nfs_files($1_t) +@@ -772,6 +776,8 @@ + auth_search_pam_console_data($1_t) + auth_run_pam($1_t,$1_r,{ $1_tty_device_t $1_devpts_t }) + auth_run_utempter($1_t,$1_r,{ $1_tty_device_t $1_devpts_t }) ++ auth_run_upd_passwd($1_t,$1_r,{ $1_tty_device_t $1_devpts_t }) ++ auth_read_key($1_t) + + init_read_utmp($1_t) + # The library functions always try to open read-write first, +@@ -961,6 +967,38 @@ + ## + ## + # ++template(`userdom_privhome_user_template',` ++ gen_require(` ++ type $1_home_dir_t, $1_home_t; ++ ') ++ ++ # privileged home directory writers ++ manage_dirs_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) ++ manage_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) ++ manage_lnk_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) ++ manage_sock_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) ++ manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) ++ filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file }) ++') ++ ++####################################### ++## ++## The template for creating a unprivileged user. ++## ++## ++##

++## This template creates a user domain, types, and ++## rules for the user's tty, pty, home directories, ++## tmp, and tmpfs files. ++##

++## ++## ++## ++## The prefix of the user domain (e.g., user ++## is the prefix for user_t). ++## ++## ++# + template(`userdom_unpriv_user_template', ` + + gen_require(` +@@ -987,12 +1025,13 @@ + userdom_poly_home_template($1) + userdom_poly_tmp_template($1) + ++ userdom_privhome_user_template($1) ++ + ############################## + # + # Local policy + # +- +- corecmd_exec_all_executables($1_t) ++ application_exec_all($1_t) + + # port access is audited even if dac would not have allowed it, so dontaudit it here + corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) +@@ -1126,7 +1165,7 @@ + # $1_t local policy + # + +- allow $1_t self:capability ~sys_module; ++ allow $1_t self:capability ~{ sys_module audit_control audit_write }; + allow $1_t self:process { setexec setfscreate }; + + # Set password information for other users. +@@ -1138,8 +1177,6 @@ + # Manipulate other users crontab. + allow $1_t self:passwd crontab; + +- allow $1_t self:netlink_audit_socket nlmsg_readpriv; +- + kernel_read_software_raid_state($1_t) + kernel_getattr_core_if($1_t) + kernel_getattr_message_if($1_t) +@@ -5563,3 +5600,104 @@ + allow $1 user_home_dir_t:dir manage_dir_perms; + files_home_filetrans($1,user_home_dir_t,dir) + ') ++ ++ ++######################################## ++## ++## Manage and create all files in /tmp on behalf of the user ++## ++## ++##

++## The interface for full access to the temporary directories. ++## This creates a derived type for the user ++## temporary type. Execute access is not given. ++##

++##

++## This is a templated interface, and should only ++## be called from a per-userdomain template. ++##

++## ++## ++## ++## The prefix of the user domain (e.g., user ++## is the prefix for user_t). ++## ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The class of the object to be created. ++## If not specified, file is used. ++## ++## ++# ++template(`userdom_transition_user_tmp',` ++ gen_require(` ++ type $1_tmp_t; ++ ') ++ ++ files_tmp_filetrans($2,$1_tmp_t, $3) ++') ++ ++######################################## ++## ++## dontaudit getattr all user file type ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`userdom_dontaudit_list_user_files',` ++ gen_require(` ++ attribute $1_file_type; ++ ') ++ ++ dontaudit $2 $1_file_type:dir search_dir_perms; ++ dontaudit $2 $1_file_type:file getattr; ++') ++ ++######################################## ++## ++## Do not audit attempts to write to homedirs of sysadm users ++## home directory. ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`userdom_dontaudit_write_sysadm_home_dirs',` ++ gen_require(` ++ type sysadm_home_dir_t; ++ ') ++ ++ dontaudit $1 sysadm_home_dir_t:dir write; ++') ++ ++######################################## ++## ++## Ptrace all user domains. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`userdom_ptrace_all_users',` ++ gen_require(` ++ attribute userdomain; ++ ') ++ ++ allow $1 userdomain:process ptrace; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.1/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2007-05-30 11:47:29.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/userdomain.te 2007-05-30 15:12:50.000000000 -0400 +@@ -67,6 +67,9 @@ + # users home directory contents + attribute home_type; + ++# Executables to be run by user ++attribute user_exec_type; ++ + # The privhome attribute identifies every domain that can create files under + # regular user home directories in the regular context (IE act on behalf of + # a user in writing regular files) +@@ -154,6 +157,11 @@ + + init_exec(sysadm_t) + ++kernel_sigstop_unlabeled(sysadm_t) ++kernel_signal_unlabeled(sysadm_t) ++kernel_kill_unlabeled(sysadm_t) ++kernel_read_unlabeled_state(sysadm_t) ++ + # Following for sending reboot and wall messages + userdom_use_unpriv_users_ptys(sysadm_t) + userdom_use_unpriv_users_ttys(sysadm_t) +@@ -224,6 +232,10 @@ + ') + + optional_policy(` ++ amtu_run(sysadm_t,sysadm_r,admin_terminal) ++') ++ ++optional_policy(` + apache_run_helper(sysadm_t,sysadm_r,admin_terminal) + #apache_run_all_scripts(sysadm_t,sysadm_r) + #apache_domtrans_sys_script(sysadm_t) +@@ -283,14 +295,6 @@ + ') + + optional_policy(` +- consoletype_exec(sysadm_t) +- +- ifdef(`enable_mls',` +- consoletype_exec(auditadm_t) +- ') +-') +- +-optional_policy(` + cron_admin_template(sysadm,sysadm_t,sysadm_r) + ') + +@@ -391,6 +395,10 @@ + ') + + optional_policy(` ++ netlabel_run_mgmt(sysadm_t,sysadm_r,admin_terminal) ++') ++ ++optional_policy(` + netutils_run(sysadm_t,sysadm_r,admin_terminal) + netutils_run_ping(sysadm_t,sysadm_r,admin_terminal) + netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal) +@@ -449,6 +457,9 @@ + + ifdef(`enable_mls',` + userdom_security_admin_template(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) ++# tunable_policy(`allow_sysadm_manage_security',` ++ userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal) ++# ') + ', ` + userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal) + ') +@@ -491,3 +502,7 @@ + optional_policy(` + yam_run(sysadm_t,sysadm_r,admin_terminal) + ') ++ ++tunable_policy(`allow_console_login', ` ++ term_use_console(userdomain) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.0.1/policy/modules/system/xen.if +--- nsaserefpolicy/policy/modules/system/xen.if 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/xen.if 2007-05-30 15:12:50.000000000 -0400 +@@ -72,12 +72,35 @@ + ') + + logging_search_logs($1) ++ allow $1 xend_var_log_t:dir search_dir_perms; + allow $1 xend_var_log_t:file { getattr append }; + dontaudit $1 xend_var_log_t:file write; + ') + + ######################################## + ## ++## Allow the specified domain to manage ++## xend log files. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`xen_manage_log',` ++ gen_require(` ++ type var_log_t, xend_var_log_t; ++ ') ++ ++ logging_search_logs($1) ++ allow $1 xend_var_log_t:dir create_dir_perms; ++ allow $1 xend_var_log_t:file create_file_perms; ++ dontaudit $1 xend_var_log_t:file write; ++') ++ ++######################################## ++## + ## Do not audit attempts to read and write + ## Xen unix domain stream sockets. These + ## are leaked file descriptors. +@@ -151,3 +174,25 @@ + + domtrans_pattern($1,xm_exec_t,xm_t) + ') ++ ++######################################## ++## ++## Allow the specified domain to read ++## xend image files. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`xen_read_image_files',` ++ gen_require(` ++ type xen_image_t, xend_var_lib_t; ++ ') ++ ++ files_list_var_lib($1) ++ allow $1 xend_var_lib_t:dir search_dir_perms; ++ read_files_pattern($1,xen_image_t,xen_image_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.1/policy/modules/system/xen.te +--- nsaserefpolicy/policy/modules/system/xen.te 2007-05-29 14:10:58.000000000 -0400 ++++ serefpolicy-3.0.1/policy/modules/system/xen.te 2007-05-30 15:12:50.000000000 -0400 +@@ -25,6 +25,10 @@ + domain_type(xend_t) + init_daemon_domain(xend_t, xend_exec_t) + ++# tmp files ++type xend_tmp_t; ++files_tmp_file(xend_tmp_t) ++ + # var/lib files + type xend_var_lib_t; + files_type(xend_var_lib_t) +@@ -88,6 +92,7 @@ + allow xend_t xen_image_t:dir list_dir_perms; + manage_dirs_pattern(xend_t,xen_image_t,xen_image_t) + manage_files_pattern(xend_t,xen_image_t,xen_image_t) ++read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t) + rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t) + + allow xend_t xenctl_t:fifo_file manage_file_perms; +@@ -97,7 +102,8 @@ + allow xend_t xend_var_run_t:dir setattr; + manage_files_pattern(xend_t,xend_var_run_t,xend_var_run_t) + manage_sock_files_pattern(xend_t,xend_var_run_t,xend_var_run_t) +-files_pid_filetrans(xend_t,xend_var_run_t, { file sock_file }) ++manage_fifo_files_pattern(xend_t,xend_var_run_t,xend_var_run_t) ++files_pid_filetrans(xend_t,xend_var_run_t, { file sock_file fifo_file }) + + # log files + allow xend_t xend_var_log_t:dir setattr; +@@ -105,6 +111,10 @@ + manage_sock_files_pattern(xend_t,xend_var_log_t,xend_var_log_t) + logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir }) + ++manage_files_pattern(xend_t,xend_tmp_t,xend_tmp_t) ++manage_dirs_pattern(xend_t,xend_tmp_t,xend_tmp_t) ++files_tmp_filetrans(xend_t, xend_tmp_t, { file dir }) ++ + # var/lib files for xend + manage_dirs_pattern(xend_t,xend_var_lib_t,xend_var_lib_t) + manage_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t) +@@ -165,8 +175,13 @@ + files_manage_etc_runtime_files(xend_t) + files_etc_filetrans_etc_runtime(xend_t,file) + files_read_usr_files(xend_t) ++files_read_default_symlinks(xend_t) ++ ++#tunable_policy(`xen_use_raw_disk',` ++ storage_raw_read_fixed_disk(xend_t) ++ storage_raw_write_fixed_disk(xend_t) ++#') + +-storage_raw_read_fixed_disk(xend_t) + storage_raw_read_removable_device(xend_t) + + term_getattr_all_user_ptys(xend_t) +@@ -195,6 +210,10 @@ + + xen_stream_connect_xenstore(xend_t) + ++lvm_domtrans(xend_t) ++ ++mount_domtrans(xend_t) ++ + netutils_domtrans(xend_t) + + optional_policy(` +@@ -275,6 +294,12 @@ + + files_read_usr_files(xenstored_t) + ++#tunable_policy(`xen_use_raw_disk',` ++ storage_raw_read_fixed_disk(xenstored_t) ++ storage_raw_write_fixed_disk(xenstored_t) ++#') ++storage_raw_read_removable_device(xenstored_t) ++ + term_use_generic_ptys(xenstored_t) + term_use_console(xenconsoled_t) + +@@ -308,6 +333,11 @@ + + allow xm_t xen_image_t:dir rw_dir_perms; + allow xm_t xen_image_t:file read_file_perms; ++allow xm_t xen_image_t:blk_file r_file_perms; ++ ++#tunable_policy(`xen_use_raw_disk',` ++ storage_raw_read_fixed_disk(xm_t) ++#') + + kernel_read_system_state(xm_t) + kernel_read_kernel_sysctls(xm_t) +@@ -343,3 +373,11 @@ + xen_append_log(xm_t) + xen_stream_connect(xm_t) + xen_stream_connect_xenstore(xm_t) ++ ++#Should have a boolean wrapping these ++fs_list_auto_mountpoints(xend_t) ++files_search_mnt(xend_t) ++fs_write_nfs_files(xend_t) ++fs_read_nfs_files(xend_t) ++fs_getattr_all_fs(xend_t) ++fs_read_dos_files(xend_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns.spt serefpolicy-3.0.1/policy/support/misc_patterns.spt +--- nsaserefpolicy/policy/support/misc_patterns.spt 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/support/misc_patterns.spt 2007-05-30 15:12:50.000000000 -0400 +@@ -41,11 +41,6 @@ + # + # Other process permissions + # +-define(`send_audit_msgs_pattern',` +- allow $1 self:capability audit_write; +- allow $1 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; +-') +- + define(`ps_process_pattern',` + allow $1 $2:dir { search getattr read }; + allow $1 $2:{ file lnk_file } { read getattr }; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.1/policy/support/obj_perm_sets.spt +--- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/support/obj_perm_sets.spt 2007-05-30 15:12:50.000000000 -0400 +@@ -203,7 +203,6 @@ + define(`add_entry_dir_perms',`{ getattr search lock ioctl write add_name }') + define(`del_entry_dir_perms',`{ getattr search lock ioctl write remove_name }') + define(`create_dir_perms',`{ getattr create }') +-define(`rename_dir_perms',`{ getattr rename }') + define(`delete_dir_perms',`{ getattr rmdir }') + define(`manage_dir_perms',`{ create getattr setattr read write link unlink rename search add_name remove_name reparent rmdir lock ioctl }') + define(`relabelfrom_dir_perms',`{ getattr relabelfrom }') +@@ -216,7 +215,7 @@ + define(`getattr_file_perms',`{ getattr }') + define(`setattr_file_perms',`{ setattr }') + define(`read_file_perms',`{ getattr read lock ioctl }') +-define(`mmap_file_perms',`{ getattr read execute }') ++define(`mmap_file_perms',`{ getattr read execute ioctl }') + define(`exec_file_perms',`{ getattr read execute execute_no_trans }') + define(`append_file_perms',`{ getattr append lock ioctl }') + define(`write_file_perms',`{ getattr write append lock ioctl }') +@@ -325,3 +324,13 @@ + # + define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') + define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }') ++ ++define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control } ++') ++ ++define(`all_nscd', `{ getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost } ') ++define(`all_dbus', `{ acquire_svc send_msg } ') ++define(`all_passwd', `{ passwd chfn chsh rootok crontab } ') ++define(`all_association', `{ sendto recvfrom setcontext polmatch } ') ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.1/policy/users +--- nsaserefpolicy/policy/users 2007-05-29 14:10:59.000000000 -0400 ++++ serefpolicy-3.0.1/policy/users 2007-05-30 15:12:50.000000000 -0400 +@@ -36,8 +36,12 @@ + # role should use the staff_r role instead of the user_r role when + # not in the sysadm_r. + # +-ifdef(`direct_sysadm_daemon',` +- gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) ++ifdef(`targeted_policy',` ++ gen_user(root, user, user_r sysadm_r system_r, s0, s0 - mls_systemhigh, mcs_allcats) + ',` +- gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) ++ ifdef(`direct_sysadm_daemon',` ++ gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats) ++ ',` ++ gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) ++ ') + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.1/Rules.modular +--- nsaserefpolicy/Rules.modular 2007-05-25 09:09:10.000000000 -0400 ++++ serefpolicy-3.0.1/Rules.modular 2007-05-30 15:12:50.000000000 -0400 +@@ -167,7 +167,7 @@ + # these have to run individually because order matters: + $(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true + $(verbose) $(GREP) '^fs_use_(xattr|task|trans)' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true +- $(verbose) $(GREP) ^genfscon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true ++ $(verbose) $(GREP) genfscon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true + $(verbose) $(GREP) ^portcon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true + $(verbose) $(GREP) ^netifcon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true + $(verbose) $(GREP) ^nodecon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true +@@ -219,6 +219,16 @@ + + ######################################## + # ++# Validate File Contexts ++# ++validatefc: $(base_pkg) $(base_fc) ++ @echo "Validating file context." ++ $(verbose) $(SEMOD_EXP) $(base_pkg) $(tmpdir)/policy.tmp ++ $(verbose) $(SETFILES) -c $(tmpdir)/policy.tmp $(base_fc) ++ @echo "Success." ++ ++######################################## ++# + # Clean the sources + # + clean: +diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.0.1/support/Makefile.devel +--- nsaserefpolicy/support/Makefile.devel 2007-05-29 13:53:56.000000000 -0400 ++++ serefpolicy-3.0.1/support/Makefile.devel 2007-05-31 06:38:16.000000000 -0400 +@@ -24,7 +24,7 @@ + XMLLINT := $(BINDIR)/xmllint + + # set default build options if missing +-TYPE ?= standard ++TYPE ?= strict + DIRECT_INITRC ?= n + POLY ?= n + QUIET ?= y +@@ -39,15 +39,25 @@ + globaltun = $(HEADERDIR)/global_tunables.xml + globalbool = $(HEADERDIR)/global_booleans.xml + ++# compile strict policy if requested. ++ifneq ($(findstring strict,$(TYPE)),) ++ M4PARAM += -D strict_policy ++endif ++ ++# compile targeted policy if requested. ++ifneq ($(findstring targeted,$(TYPE)),) ++ M4PARAM += -D targeted_policy ++endif ++ + # enable MLS if requested. +-ifeq "$(TYPE)" "mls" ++ifneq ($(findstring -mls,$(TYPE)),) + M4PARAM += -D enable_mls + CHECKPOLICY += -M + CHECKMODULE += -M + endif + + # enable MLS if MCS requested. +-ifeq "$(TYPE)" "mcs" ++ifneq ($(findstring -mcs,$(TYPE)),) + M4PARAM += -D enable_mcs + CHECKPOLICY += -M + CHECKMODULE += -M diff --git a/selinux-policy.spec b/selinux-policy.spec index 2a9bd2f..ce99ad9 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -1,9 +1,6 @@ %define distro redhat %define polyinstatiate n %define monolithic n -%if %{?BUILD_STRICT:0}%{!?BUILD_STRICT:1} -%define BUILD_STRICT 1 -%endif %if %{?BUILD_TARGETED:0}%{!?BUILD_TARGETED:1} %define BUILD_TARGETED 1 %endif @@ -16,12 +13,12 @@ %define CHECKPOLICYVER 2.0.1-2 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.6.5 -Release: 2%{?dist} +Version: 3.0.1 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz -patch: policy-20070518.patch +patch: policy-20070525.patch Source1: modules-targeted.conf Source2: booleans-targeted.conf Source3: Makefile.devel @@ -29,13 +26,9 @@ Source4: setrans-targeted.conf Source5: modules-mls.conf Source6: booleans-mls.conf Source8: setrans-mls.conf -Source9: modules-strict.conf -Source10: booleans-strict.conf -Source12: setrans-strict.conf Source13: policygentool Source14: securetty_types-targeted Source15: securetty_types-mls -Source16: securetty_types-strict Url: http://serefpolicy.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -168,7 +161,7 @@ fi; %description SELinux Reference Policy - modular. -Based off of reference policy: Checked out revision 2300. +Based off of reference policy: Checked out revision 2312. %prep %setup -q -n serefpolicy-%{version} @@ -185,7 +178,7 @@ touch %{buildroot}%{_sysconfdir}/selinux/config touch %{buildroot}%{_sysconfdir}/sysconfig/selinux # Always create policy module package directories -mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,strict,mls}/ +mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,mls}/ # Install devel make clean @@ -196,15 +189,6 @@ make clean %installCmds targeted targeted-mcs y y %endif -%if %{BUILD_STRICT} -# Build strict policy -# Commented out because only targeted ref policy currently builds -make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n MLS_CATS=1024 MCS_CATS=1024 bare -make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n MLS_CATS=1024 MCS_CATS=1024 conf -cp -f ${RPM_SOURCE_DIR}/modules-strict.conf ./policy/modules.conf -%installCmds strict strict-mcs y n -%endif - %if %{BUILD_MLS} # Build mls policy %setupCmds mls strict-mls y y @@ -237,8 +221,7 @@ if [ ! -s /etc/selinux/config ]; then # disabled - No SELinux policy is loaded. SELINUX=enforcing # SELINUXTYPE= can take one of these two values: -# targeted - Only targeted network daemons are protected. -# strict - Full SELinux protection. +# targeted - Targeted processes are protected, # mls - Multi Level Security protection. SELINUXTYPE=targeted # SETLOCALDEFS= Check local definition changes @@ -323,42 +306,13 @@ SELinux Reference policy mls base module. %endif -%if %{BUILD_STRICT} - -%package strict -Summary: SELinux strict base policy -Group: System Environment/Base -Provides: selinux-policy-base -Obsoletes: selinux-policy-strict-sources -Prereq: policycoreutils >= %{POLICYCOREUTILSVER} -Prereq: coreutils -Prereq: selinux-policy = %{version}-%{release} -Requires: policycoreutils-newrole >= %{POLICYCOREUTILSVER} - -%description strict -SELinux Reference policy strict base module. - -%pre strict -%saveFileContext strict - -%post strict -%rebuildpolicy strict -%relabel strict - -%triggerpostun strict -- selinux-policy-strict <= 2.2.35-2 -cd /usr/share/selinux/strict -x=`ls *.pp | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i " $1 }'` -semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init -r libraries -r locallogin -r logging -r lvm -r miscfiles -r modutils -r mount -r mta -r netutils -r selinuxutil -r storage -r sysnetwork -r udev -r userdomain -r vpnc -r xend $x -s strict - -%triggerpostun strict -- strict <= 2.0.7 -%rebuildpolicy strict +%changelog +* Fri May 25 2007 Dan Walsh 3.0.1-1 +- Remove ifdef strict policy from upstream -%files strict -%fileList strict +* Fri May 18 2007 Dan Walsh 2.6.5-3 +- Remove ifdef strict to allow user_u to login -%endif - -%changelog * Fri May 18 2007 Dan Walsh 2.6.5-2 - Fix for amands - Allow semanage to read pp files diff --git a/sources b/sources index 4ad9163..3566ffe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15d095e645523b8d4aa36ee2f4093a2f serefpolicy-2.6.5.tgz +7c004ddde0e20cfeba8a94b2aa308a06 serefpolicy-3.0.1.tgz