From 4de3826dbf6e567fb5d80d94d8a3a90d2172f0c8 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Aug 07 2009 11:51:54 +0000 Subject: - Allow nsplugin to connecto the session bus - Allow samba_net to write to coolkey data --- diff --git a/policy-F12.patch b/policy-F12.patch index 34e0cda..bf1183c 100644 --- a/policy-F12.patch +++ b/policy-F12.patch @@ -2598,8 +2598,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.26/policy/modules/apps/nsplugin.te --- nsaserefpolicy/policy/modules/apps/nsplugin.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.26/policy/modules/apps/nsplugin.te 2009-08-05 07:20:45.000000000 -0400 -@@ -0,0 +1,285 @@ ++++ serefpolicy-3.6.26/policy/modules/apps/nsplugin.te 2009-08-06 08:01:24.000000000 -0400 +@@ -0,0 +1,286 @@ + +policy_module(nsplugin, 1.0.0) + @@ -2761,6 +2761,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +optional_policy(` + dbus_session_bus_client(nsplugin_t) ++ dbus_connect_session_bus(nsplugin_t) + dbus_system_bus_client(nsplugin_t) +') + @@ -4142,7 +4143,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.6.26/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 2009-07-14 14:19:57.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/apps/wine.te 2009-07-30 15:33:08.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/apps/wine.te 2009-08-07 06:43:34.000000000 -0400 @@ -9,20 +9,35 @@ type wine_t; type wine_exec_t; @@ -5373,7 +5374,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.26/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2009-07-14 14:19:57.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/kernel/kernel.if 2009-07-30 15:33:08.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/kernel/kernel.if 2009-08-07 07:36:43.000000000 -0400 @@ -1807,7 +1807,7 @@ ') @@ -5681,24 +5682,31 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +gen_user(guest_u, user, guest_r, s0, s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.6.26/policy/modules/roles/staff.te --- nsaserefpolicy/policy/modules/roles/staff.te 2009-07-14 14:19:57.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/roles/staff.te 2009-08-05 16:17:34.000000000 -0400 -@@ -15,156 +15,110 @@ ++++ serefpolicy-3.6.26/policy/modules/roles/staff.te 2009-08-07 06:42:40.000000000 -0400 +@@ -15,156 +15,109 @@ # Local policy # -optional_policy(` - apache_role(staff_r, staff_t) -') -- ++kernel_read_ring_buffer(staff_t) ++kernel_getattr_core_if(staff_t) ++kernel_getattr_message_if(staff_t) ++kernel_read_software_raid_state(staff_t) + -optional_policy(` - auth_role(staff_r, staff_t) -') -- ++auth_domtrans_pam_console(staff_t) + -optional_policy(` - auditadm_role_change(staff_r) -') -- --optional_policy(` ++seutil_run_newrole(staff_t, staff_r) ++netutils_run_ping(staff_t, staff_r) + + optional_policy(` - bluetooth_role(staff_r, staff_t) -') - @@ -5713,11 +5721,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -optional_policy(` - dbus_role_template(staff, staff_r, staff_t) -') -+kernel_read_ring_buffer(staff_t) -+kernel_getattr_core_if(staff_t) -+kernel_getattr_message_if(staff_t) -+kernel_read_software_raid_state(staff_t) - +- -optional_policy(` - ethereal_role(staff_r, staff_t) -') @@ -5729,157 +5733,154 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -optional_policy(` - games_role(staff_r, staff_t) -') -+auth_domtrans_pam_console(staff_t) - +- -optional_policy(` - gift_role(staff_r, staff_t) -') -+seutil_run_newrole(staff_t, staff_r) -+netutils_run_ping(staff_t, staff_r) - - optional_policy(` +- +-optional_policy(` - gnome_role(staff_r, staff_t) +-') +- +-optional_policy(` +- gpg_role(staff_r, staff_t) + sudo_role_template(staff, staff_r, staff_t) ') optional_policy(` -- gpg_role(staff_r, staff_t) +- irc_role(staff_r, staff_t) + auditadm_role_change(staff_r) ') optional_policy(` -- irc_role(staff_r, staff_t) +- java_role(staff_r, staff_t) + kerneloops_manage_tmp_files(staff_t) ') optional_policy(` -- java_role(staff_r, staff_t) +- lockdev_role(staff_r, staff_t) + logadm_role_change(staff_r) ') optional_policy(` -- lockdev_role(staff_r, staff_t) +- lpd_role(staff_r, staff_t) + postgresql_role(staff_r, staff_t) ') optional_policy(` -- lpd_role(staff_r, staff_t) +- mozilla_role(staff_r, staff_t) + rtkit_daemon_system_domain(staff_t) ') optional_policy(` -- mozilla_role(staff_r, staff_t) +- mplayer_role(staff_r, staff_t) + secadm_role_change(staff_r) ') optional_policy(` -- mplayer_role(staff_r, staff_t) +- mta_role(staff_r, staff_t) + ssh_role_template(staff, staff_r, staff_t) ') optional_policy(` -- mta_role(staff_r, staff_t) +- oident_manage_user_content(staff_t) +- oident_relabel_user_content(staff_t) + sysadm_role_change(staff_r) ') optional_policy(` -- oident_manage_user_content(staff_t) -- oident_relabel_user_content(staff_t) +- pyzor_role(staff_r, staff_t) + usernetctl_run(staff_t, staff_r) ') optional_policy(` -- pyzor_role(staff_r, staff_t) +- razor_role(staff_r, staff_t) + unconfined_role_change(staff_r) ') optional_policy(` -- razor_role(staff_r, staff_t) +- rssh_role(staff_r, staff_t) + webadm_role_change(staff_r) ') -optional_policy(` -- rssh_role(staff_r, staff_t) +- screen_role_template(staff, staff_r, staff_t) -') +domain_read_all_domains_state(staff_t) +domain_getattr_all_domains(staff_t) +domain_obj_id_change_exemption(staff_t) -optional_policy(` -- screen_role_template(staff, staff_r, staff_t) +- secadm_role_change(staff_r) -') +files_read_kernel_modules(staff_t) -optional_policy(` -- secadm_role_change(staff_r) +- spamassassin_role(staff_r, staff_t) -') +kernel_read_fs_sysctls(staff_t) -optional_policy(` -- spamassassin_role(staff_r, staff_t) +- ssh_role_template(staff, staff_r, staff_t) -') +modutils_read_module_config(staff_t) +modutils_read_module_deps(staff_t) -optional_policy(` -- ssh_role_template(staff, staff_r, staff_t) +- su_role_template(staff, staff_r, staff_t) -') +miscfiles_read_hwdata(staff_t) -optional_policy(` -- su_role_template(staff, staff_r, staff_t) +- sudo_role_template(staff, staff_r, staff_t) -') +term_use_unallocated_ttys(staff_t) optional_policy(` -- sudo_role_template(staff, staff_r, staff_t) +- sysadm_role_change(staff_r) +- userdom_dontaudit_use_user_terminals(staff_t) + gnomeclock_dbus_chat(staff_t) ') optional_policy(` -- sysadm_role_change(staff_r) -- userdom_dontaudit_use_user_terminals(staff_t) +- thunderbird_role(staff_r, staff_t) + lpd_list_spool(staff_t) ') optional_policy(` -- thunderbird_role(staff_r, staff_t) +- tvtime_role(staff_r, staff_t) + kerneloops_dbus_chat(staff_t) ') optional_policy(` -- tvtime_role(staff_r, staff_t) +- uml_role(staff_r, staff_t) + rpm_dbus_chat(staff_usertype) ') optional_policy(` -- uml_role(staff_r, staff_t) +- userhelper_role_template(staff, staff_r, staff_t) + sandbox_transition(staff_t, staff_r) ') optional_policy(` -- userhelper_role_template(staff, staff_r, staff_t) +- vmware_role(staff_r, staff_t) + screen_role_template(staff, staff_r, staff_t) + screen_manage_var_run(staff_t) ') optional_policy(` -- vmware_role(staff_r, staff_t) +- wireshark_role(staff_r, staff_t) + setroubleshoot_stream_connect(staff_t) + setroubleshoot_dbus_chat(staff_t) ') optional_policy(` -- wireshark_role(staff_r, staff_t) +- xserver_role(staff_r, staff_t) + virt_stream_connect(staff_t) ') - --optional_policy(` -- xserver_role(staff_r, staff_t) --') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.26/policy/modules/roles/sysadm.te --- nsaserefpolicy/policy/modules/roles/sysadm.te 2009-07-14 14:19:57.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/roles/sysadm.te 2009-07-30 15:33:08.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/roles/sysadm.te 2009-08-06 07:59:15.000000000 -0400 @@ -15,7 +15,7 @@ role sysadm_r; @@ -6138,7 +6139,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol unconfined_domtrans(sysadm_t) ') -@@ -418,20 +322,12 @@ +@@ -418,17 +322,13 @@ ') optional_policy(` @@ -6153,13 +6154,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` - vmware_role(sysadm_r, sysadm_t) --') -- --optional_policy(` - vpn_run(sysadm_t, sysadm_r) ++ vpn_run(sysadm_t, sysadm_r) ') -@@ -440,13 +336,12 @@ + optional_policy(` +@@ -440,13 +340,12 @@ ') optional_policy(` @@ -6862,7 +6861,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.26/policy/modules/roles/unconfineduser.te --- nsaserefpolicy/policy/modules/roles/unconfineduser.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.26/policy/modules/roles/unconfineduser.te 2009-07-30 15:33:08.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/roles/unconfineduser.te 2009-08-06 07:58:58.000000000 -0400 @@ -0,0 +1,395 @@ +policy_module(unconfineduser, 1.0.0) + @@ -7261,7 +7260,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.6.26/policy/modules/roles/unprivuser.te --- nsaserefpolicy/policy/modules/roles/unprivuser.te 2009-07-14 14:19:57.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/roles/unprivuser.te 2009-07-30 15:33:08.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/roles/unprivuser.te 2009-08-07 06:42:14.000000000 -0400 @@ -14,142 +14,21 @@ userdom_unpriv_user_template(user) @@ -9787,17 +9786,28 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.6.26/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2009-07-28 15:51:13.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/services/cups.fc 2009-07-30 15:33:08.000000000 -0400 -@@ -13,6 +13,8 @@ ++++ serefpolicy-3.6.26/policy/modules/services/cups.fc 2009-08-07 07:43:48.000000000 -0400 +@@ -13,7 +13,9 @@ /etc/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) /etc/rc\.d/init\.d/cups -- gen_context(system_u:object_r:cupsd_initrc_exec_t,s0) +-/etc/hp(/.*)? gen_context(system_u:object_r:hplip_etc_t,s0) +/etc/cups/interfaces(/.*)? gen_context(system_u:object_r:cupsd_interface_t,s0) + - /etc/hp(/.*)? gen_context(system_u:object_r:hplip_etc_t,s0) ++/etc/hp(/.*)? gen_context(system_u:object_r:hplip_var_lib_t,s0) /etc/printcap.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) -@@ -62,3 +64,8 @@ + +@@ -52,6 +54,8 @@ + /var/lib/cups/certs -d gen_context(system_u:object_r:cupsd_rw_etc_t,s0) + /var/lib/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) + ++/var/lib/hp(/.*)? gen_context(system_u:object_r:hplip_var_lib_t,s0) ++ + /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) + /var/log/turboprint.* gen_context(system_u:object_r:cupsd_log_t,s0) + +@@ -62,3 +67,8 @@ /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) /var/run/ptal-mlcd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) /var/turboprint(/.*)? gen_context(system_u:object_r:cupsd_var_run_t,s0) @@ -9808,7 +9818,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/usr/local/linuxprinter/ppd(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.26/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2009-07-28 15:51:13.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/services/cups.te 2009-07-30 15:33:08.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/services/cups.te 2009-08-07 07:43:13.000000000 -0400 @@ -23,6 +23,9 @@ type cupsd_initrc_exec_t; init_script_file(cupsd_initrc_exec_t) @@ -9819,6 +9829,22 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type cupsd_rw_etc_t; files_config_file(cupsd_rw_etc_t) +@@ -64,12 +67,12 @@ + # For CUPS to run as a backend + cups_backend(hplip_t, hplip_exec_t) + +-type hplip_etc_t; +-files_config_file(hplip_etc_t) +- + type hplip_tmp_t; + files_tmp_file(hplip_tmp_t) + ++type hplip_var_lib_t alias hplip_etc_t; ++files_type(hplip_var_lib_t) ++ + type hplip_var_run_t; + files_pid_file(hplip_var_run_t) + @@ -116,6 +119,9 @@ read_lnk_files_pattern(cupsd_t, cupsd_etc_t, cupsd_etc_t) files_search_etc(cupsd_t) @@ -9829,6 +9855,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t) manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t) filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file) +@@ -146,7 +152,7 @@ + + allow cupsd_t hplip_t:process { signal sigkill }; + +-read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t) ++read_files_pattern(cupsd_t, hplip_var_lib_t, hplip_var_lib_t) + + allow cupsd_t hplip_var_run_t:file read_file_perms; + @@ -250,6 +256,7 @@ miscfiles_read_localization(cupsd_t) # invoking ghostscript needs to read fonts @@ -9837,6 +9872,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol seutil_read_config(cupsd_t) sysnet_exec_ifconfig(cupsd_t) +@@ -360,7 +367,7 @@ + + domtrans_pattern(cupsd_config_t, hplip_exec_t, hplip_t) + +-read_files_pattern(cupsd_config_t, hplip_etc_t, hplip_etc_t) ++read_files_pattern(cupsd_config_t, hplip_var_lib_t, hplip_var_lib_t) + + kernel_read_system_state(cupsd_config_t) + kernel_read_all_sysctls(cupsd_config_t) @@ -419,6 +426,10 @@ ') @@ -9857,6 +9901,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_system_state(cups_pdf_t) files_read_etc_files(cups_pdf_t) +@@ -596,9 +609,9 @@ + + cups_stream_connect(hplip_t) + +-allow hplip_t hplip_etc_t:dir list_dir_perms; +-read_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t) +-read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t) ++allow hplip_t hplip_var_lib_t:dir list_dir_perms; ++read_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t) ++read_lnk_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t) + files_search_etc(hplip_t) + + manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.6.26/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2009-07-14 14:19:57.000000000 -0400 +++ serefpolicy-3.6.26/policy/modules/services/cvs.te 2009-07-30 15:33:08.000000000 -0400 @@ -9868,7 +9925,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.26/policy/modules/services/dbus.if --- nsaserefpolicy/policy/modules/services/dbus.if 2009-07-28 13:28:33.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/services/dbus.if 2009-08-05 07:49:49.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/services/dbus.if 2009-08-06 08:01:02.000000000 -0400 @@ -42,8 +42,10 @@ gen_require(` class dbus { send_msg acquire_svc }; @@ -10128,7 +10185,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow $1 devicekit_t:process { ptrace signal_perms getattr }; diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.26/policy/modules/services/devicekit.te --- nsaserefpolicy/policy/modules/services/devicekit.te 2009-07-29 15:15:33.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/services/devicekit.te 2009-08-05 16:52:16.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/services/devicekit.te 2009-08-07 07:49:12.000000000 -0400 @@ -36,12 +36,15 @@ manage_dirs_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t) manage_files_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t) @@ -10202,7 +10259,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol policykit_domtrans_auth(devicekit_disk_t) policykit_read_lib(devicekit_disk_t) policykit_read_reload(devicekit_disk_t) -@@ -134,6 +147,19 @@ +@@ -134,14 +147,28 @@ udev_read_db(devicekit_disk_t) ') @@ -10222,8 +10279,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # DeviceKit-Power local policy -@@ -142,6 +168,7 @@ - allow devicekit_power_t self:capability { dac_override sys_tty_config sys_nice sys_ptrace }; + # + +-allow devicekit_power_t self:capability { dac_override sys_tty_config sys_nice sys_ptrace }; ++allow devicekit_power_t self:capability { dac_override net_admin sys_tty_config sys_nice sys_ptrace }; allow devicekit_power_t self:fifo_file rw_fifo_file_perms; allow devicekit_power_t self:unix_dgram_socket create_socket_perms; +allow devicekit_power_t self:netlink_kobject_uevent_socket create_socket_perms; @@ -10246,7 +10305,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol dev_rw_generic_usb_dev(devicekit_power_t) dev_rw_netcontrol(devicekit_power_t) dev_rw_sysfs(devicekit_power_t) -@@ -180,8 +209,11 @@ +@@ -167,6 +196,8 @@ + files_read_etc_files(devicekit_power_t) + files_read_usr_files(devicekit_power_t) + ++fs_list_inotifyfs(devicekit_power_t) ++ + term_use_all_terms(devicekit_power_t) + + auth_use_nsswitch(devicekit_power_t) +@@ -180,8 +211,11 @@ ') optional_policy(` @@ -10259,7 +10327,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow devicekit_power_t devicekit_t:dbus send_msg; optional_policy(` -@@ -203,17 +235,23 @@ +@@ -203,17 +237,23 @@ optional_policy(` hal_domtrans_mac(devicekit_power_t) @@ -10698,6 +10766,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - ntpd_rw_shm(gpsd_t) + ntp_rw_shm(gpsd_t) ') +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.6.26/policy/modules/services/hal.fc +--- nsaserefpolicy/policy/modules/services/hal.fc 2009-07-28 13:28:33.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/services/hal.fc 2009-08-06 08:14:20.000000000 -0400 +@@ -26,6 +26,7 @@ + /var/run/pm(/.*)? gen_context(system_u:object_r:hald_var_run_t,s0) + /var/run/pm-utils(/.*)? gen_context(system_u:object_r:hald_var_run_t,s0) + /var/run/vbe.* -- gen_context(system_u:object_r:hald_var_run_t,s0) ++/var/run/synce.* gen_context(system_u:object_r:hald_var_run_t,s0) + + ifdef(`distro_gentoo',` + /var/lib/cache/hald(/.*)? gen_context(system_u:object_r:hald_cache_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.26/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2009-07-28 13:28:33.000000000 -0400 +++ serefpolicy-3.6.26/policy/modules/services/hal.if 2009-07-30 15:33:08.000000000 -0400 @@ -12655,7 +12734,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.6.26/policy/modules/services/policykit.te --- nsaserefpolicy/policy/modules/services/policykit.te 2009-07-23 14:11:04.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/services/policykit.te 2009-08-05 15:36:05.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/services/policykit.te 2009-08-07 06:11:40.000000000 -0400 @@ -38,9 +38,10 @@ allow policykit_t self:capability { setgid setuid }; @@ -12713,15 +12792,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t) -@@ -96,6 +111,7 @@ +@@ -95,7 +110,10 @@ + files_read_etc_files(policykit_auth_t) files_read_usr_files(policykit_auth_t) ++fs_getattr_all_fs(polkit_auth_t) ++ auth_use_nsswitch(policykit_auth_t) +auth_domtrans_chk_passwd(policykit_auth_t) logging_send_syslog_msg(policykit_auth_t) -@@ -104,6 +120,7 @@ +@@ -104,6 +122,7 @@ userdom_dontaudit_read_user_home_content_files(policykit_auth_t) optional_policy(` @@ -12729,7 +12811,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol dbus_session_bus_client(policykit_auth_t) optional_policy(` -@@ -116,6 +133,13 @@ +@@ -116,6 +135,13 @@ hal_read_state(policykit_auth_t) ') @@ -12743,7 +12825,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # polkit_grant local policy -@@ -123,7 +147,8 @@ +@@ -123,7 +149,8 @@ allow policykit_grant_t self:capability setuid; allow policykit_grant_t self:process getattr; @@ -12753,7 +12835,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow policykit_grant_t self:unix_dgram_socket create_socket_perms; allow policykit_grant_t self:unix_stream_socket create_stream_socket_perms; -@@ -153,9 +178,12 @@ +@@ -153,9 +180,12 @@ userdom_read_all_users_state(policykit_grant_t) optional_policy(` @@ -12767,7 +12849,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol consolekit_dbus_chat(policykit_grant_t) ') ') -@@ -167,7 +195,8 @@ +@@ -167,7 +197,8 @@ allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace }; allow policykit_resolve_t self:process getattr; @@ -14135,8 +14217,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit_daemon.te serefpolicy-3.6.26/policy/modules/services/rtkit_daemon.te --- nsaserefpolicy/policy/modules/services/rtkit_daemon.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.26/policy/modules/services/rtkit_daemon.te 2009-07-30 15:33:09.000000000 -0400 -@@ -0,0 +1,36 @@ ++++ serefpolicy-3.6.26/policy/modules/services/rtkit_daemon.te 2009-08-07 07:36:54.000000000 -0400 +@@ -0,0 +1,38 @@ +policy_module(rtkit_daemon,1.0.0) + +######################################## @@ -14162,6 +14244,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +domain_getsched_all_domains(rtkit_daemon_t) +domain_read_all_domains_state(rtkit_daemon_t) + ++kernel_read_system_state(rtkit_daemon_t) ++ +fs_rw_anon_inodefs_files(rtkit_daemon_t) + +auth_use_nsswitch(rtkit_daemon_t) @@ -14361,7 +14445,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.26/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2009-07-29 15:15:33.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/services/samba.te 2009-07-30 15:33:09.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/services/samba.te 2009-08-06 07:30:26.000000000 -0400 @@ -66,6 +66,13 @@ ## gen_tunable(samba_share_nfs, false) @@ -14376,7 +14460,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type nmbd_t; type nmbd_exec_t; init_daemon_domain(nmbd_t, nmbd_exec_t) -@@ -207,8 +214,10 @@ +@@ -201,14 +208,16 @@ + files_read_usr_symlinks(samba_net_t) + + auth_use_nsswitch(samba_net_t) +-auth_read_cache(samba_net_t) ++auth_rw_cache(samba_net_t) + + logging_send_syslog_msg(samba_net_t) miscfiles_read_localization(samba_net_t) @@ -23090,7 +23181,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/dev/shm/mono.* gen_context(system_u:object_r:user_tmpfs_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.26/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2009-07-28 13:28:33.000000000 -0400 -+++ serefpolicy-3.6.26/policy/modules/system/userdomain.if 2009-08-05 07:54:48.000000000 -0400 ++++ serefpolicy-3.6.26/policy/modules/system/userdomain.if 2009-08-07 06:43:58.000000000 -0400 @@ -30,8 +30,9 @@ ') @@ -24080,7 +24171,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # cjp: why? files_read_kernel_symbol_table($1_t) -@@ -978,37 +1060,55 @@ +@@ -978,36 +1060,53 @@ ') ') @@ -24146,11 +24237,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + optional_policy(` + ppp_run_cond($1_t, $1_r) ') -+ ') - ####################################### -@@ -1042,7 +1142,7 @@ +@@ -1042,7 +1141,7 @@ # template(`userdom_admin_user_template',` gen_require(` @@ -24159,7 +24248,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ############################## -@@ -1051,8 +1151,7 @@ +@@ -1051,8 +1150,7 @@ # # Inherit rules for ordinary users. @@ -24169,7 +24258,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol domain_obj_id_change_exemption($1_t) role system_r types $1_t; -@@ -1075,7 +1174,8 @@ +@@ -1075,7 +1173,8 @@ # Skip authentication when pam_rootok is specified. allow $1_t self:passwd rootok; @@ -24179,7 +24268,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_software_raid_state($1_t) kernel_getattr_core_if($1_t) -@@ -1091,6 +1191,7 @@ +@@ -1091,6 +1190,7 @@ kernel_sigstop_unlabeled($1_t) kernel_signull_unlabeled($1_t) kernel_sigchld_unlabeled($1_t) @@ -24187,7 +24276,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corenet_tcp_bind_generic_port($1_t) # allow setting up tunnels -@@ -1098,8 +1199,6 @@ +@@ -1098,8 +1198,6 @@ dev_getattr_generic_blk_files($1_t) dev_getattr_generic_chr_files($1_t) @@ -24196,7 +24285,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # Allow MAKEDEV to work dev_create_all_blk_files($1_t) dev_create_all_chr_files($1_t) -@@ -1154,20 +1253,6 @@ +@@ -1154,20 +1252,6 @@ # But presently necessary for installing the file_contexts file. seutil_manage_bin_policy($1_t) @@ -24217,7 +24306,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` postgresql_unconfined($1_t) ') -@@ -1213,6 +1298,7 @@ +@@ -1213,6 +1297,7 @@ dev_relabel_all_dev_nodes($1) files_create_boot_flag($1) @@ -24225,7 +24314,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # Necessary for managing /boot/efi fs_manage_dos_files($1) -@@ -1278,11 +1364,15 @@ +@@ -1278,11 +1363,15 @@ interface(`userdom_user_home_content',` gen_require(` type user_home_t; @@ -24241,7 +24330,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -1374,12 +1464,13 @@ +@@ -1374,12 +1463,13 @@ ') allow $1 user_home_dir_t:dir search_dir_perms; @@ -24256,7 +24345,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## ## ## -@@ -1412,6 +1503,14 @@ +@@ -1412,6 +1502,14 @@ allow $1 user_home_dir_t:dir list_dir_perms; files_search_home($1) @@ -24271,7 +24360,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -1427,9 +1526,11 @@ +@@ -1427,9 +1525,11 @@ interface(`userdom_dontaudit_list_user_home_dirs',` gen_require(` type user_home_dir_t; @@ -24283,7 +24372,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -1486,6 +1587,25 @@ +@@ -1486,6 +1586,25 @@ allow $1 user_home_dir_t:dir relabelto; ') @@ -24309,7 +24398,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## ## ## Create directories in the home dir root with -@@ -1560,6 +1680,8 @@ +@@ -1560,6 +1679,8 @@ ') dontaudit $1 user_home_t:dir search_dir_perms; @@ -24318,7 +24407,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -1653,6 +1775,7 @@ +@@ -1653,6 +1774,7 @@ type user_home_dir_t, user_home_t; ') @@ -24326,7 +24415,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t) files_search_home($1) ') -@@ -1780,19 +1903,32 @@ +@@ -1780,19 +1902,32 @@ # interface(`userdom_exec_user_home_content_files',` gen_require(` @@ -24366,7 +24455,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -1827,6 +1963,7 @@ +@@ -1827,6 +1962,7 @@ interface(`userdom_manage_user_home_content_files',` gen_require(` type user_home_dir_t, user_home_t; @@ -24374,7 +24463,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') manage_files_pattern($1, user_home_t, user_home_t) -@@ -2374,7 +2511,7 @@ +@@ -2374,7 +2510,7 @@ ######################################## ## @@ -24383,7 +24472,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## ## ## -@@ -2728,11 +2865,32 @@ +@@ -2728,11 +2864,32 @@ # interface(`userdom_search_user_home_content',` gen_require(` @@ -24418,7 +24507,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -2860,7 +3018,25 @@ +@@ -2860,7 +3017,25 @@ type user_tmp_t; ') @@ -24445,7 +24534,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -2897,6 +3073,7 @@ +@@ -2897,6 +3072,7 @@ ') read_files_pattern($1, userdomain, userdomain) @@ -24453,7 +24542,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_search_proc($1) ') -@@ -3027,3 +3204,501 @@ +@@ -3027,3 +3203,501 @@ allow $1 userdomain:dbus send_msg; ') diff --git a/selinux-policy.spec b/selinux-policy.spec index 5a5d2a2..ec78267 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.26 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -475,6 +475,10 @@ exit 0 %endif %changelog +* Thu Aug 6 2009 Dan Walsh 3.6.26-7 +- Allow nsplugin to connecto the session bus +- Allow samba_net to write to coolkey data + * Wed Aug 5 2009 Dan Walsh 3.6.26-6 - Allow devicekit_disk to list inotify