: patch to allow the devicekit module to work with dbus
PATCH 8/34 : patch to allow the devicekit module to work with dbus
This patch adds two new interfaces (one for the kernel and the other for mount). It then allows dbus chat between dbus and devicekit and between xdm and devicekit. It also adds some permissions needed to run devicekit.
policy/modules/kernel/kernel.if +18 -0
@@ -1893,6 +1893,24 @@ interface(`kernel_rw_kernel_sysctl',` ######################################## ## <summary> +## Allow caller to search filesystem sysctls. +## </summary> +## <param name="domain"> +## <summary> +## Domain allowed access. +## </summary> +## </param> +# +interface(`kernel_search_fs_sysctl',` + gen_require(` + type proc_t, sysctl_t, sysctl_fs_t; + ') + + search_dirs_pattern($1, { proc_t sysctl_t }, sysctl_fs_t) +') + +######################################## +## <summary> ## Read filesystem sysctls. ## </summary> ## <param name="domain">
policy/modules/services/dbus.te +5 -0
@@ -145,6 +145,11 @@ optional_policy(` ') optional_policy(` + devicekit_dbus_chat_disk(system_dbusd_t) + devicekit_dbus_chat_power(system_dbusd_t) +') + +optional_policy(` policykit_dbus_chat(system_dbusd_t) policykit_domtrans_auth(system_dbusd_t) policykit_search_lib(system_dbusd_t)
policy/modules/services/devicekit.te +17 -1
@@ -43,6 +43,7 @@ dev_read_sysfs(devicekit_t) dev_read_urand(devicekit_t) files_read_etc_files(devicekit_t) +files_read_etc_runtime_files(devicekit_t) miscfiles_read_localization(devicekit_t)
@@ -113,6 +114,7 @@ files_read_etc_files(devicekit_disk_t) files_read_etc_runtime_files(devicekit_disk_t) files_read_usr_files(devicekit_disk_t) +fs_getattr_xattr_fs(devicekit_disk_t) fs_list_inotifyfs(devicekit_disk_t) fs_manage_fusefs_dirs(devicekit_disk_t) fs_mount_all_fs(devicekit_disk_t)
@@ -184,7 +186,7 @@ optional_policy(` # allow devicekit_power_t self:capability { dac_override net_admin sys_admin sys_tty_config sys_nice sys_ptrace }; -allow devicekit_power_t self:process getsched; +allow devicekit_power_t self:process { getsched signal }; 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;
@@ -197,7 +199,10 @@ kernel_read_network_state(devicekit_powe kernel_read_system_state(devicekit_power_t) kernel_rw_hotplug_sysctls(devicekit_power_t) kernel_rw_kernel_sysctl(devicekit_power_t) +kernel_rw_vm_sysctls(devicekit_power_t) kernel_search_debugfs(devicekit_power_t) +kernel_search_fs_sysctl(devicekit_power_t) +kernel_setsched(devicekit_power_t) kernel_write_proc_files(devicekit_power_t) corecmd_exec_bin(devicekit_power_t)
@@ -207,6 +212,7 @@ consoletype_exec(devicekit_power_t) domain_read_all_domains_state(devicekit_power_t) +dev_getattr_apm_bios_dev(devicekit_power_t) dev_read_input(devicekit_power_t) dev_rw_generic_usb_dev(devicekit_power_t) dev_rw_generic_chr_files(devicekit_power_t)
@@ -216,8 +222,11 @@ dev_rw_sysfs(devicekit_power_t) files_read_kernel_img(devicekit_power_t) files_read_etc_files(devicekit_power_t) files_read_usr_files(devicekit_power_t) +files_rw_etc_runtime_files(devicekit_power_t) +fs_getattr_xattr_fs(devicekit_power_t) fs_list_inotifyfs(devicekit_power_t) +fs_remount_xattr_fs(devicekit_power_t) term_use_all_terms(devicekit_power_t)
@@ -230,6 +239,9 @@ sysnet_domtrans_ifconfig(devicekit_power userdom_read_all_users_state(devicekit_power_t) +mount_exec(devicekit_power_t) +mount_getattr_executable_file(devicekit_power_t) + optional_policy(` bootloader_domtrans(devicekit_power_t) ')
@@ -276,6 +288,10 @@ optional_policy(` ') optional_policy(` + storage_raw_read_fixed_disk(devicekit_power_t) +') + +optional_policy(` udev_read_db(devicekit_power_t) ')
policy/modules/services/xserver.te +5 -0
@@ -520,6 +520,11 @@ optional_policy(` ') optional_policy(` + devicekit_dbus_chat_disk(xdm_t) + devicekit_dbus_chat_power(xdm_t) +') + +optional_policy(` # Talk to the console mouse server. gpm_stream_connect(xdm_t) gpm_setattr_gpmctl(xdm_t)
policy/modules/system/mount.if +20 -0
@@ -51,6 +51,26 @@ interface(`mount_run',` ######################################## ## <summary> +## Get the attributes of mount +## executable files. +## </summary> +## <param name="domain"> +## <summary> +## Domain allowed access. +## </summary> +## </param> +# +interface(`mount_getattr_executable_file',` + gen_require(` + type mount_exec_t; + ') + + corecmd_search_bin($1) + allow $1 mount_exec_t:file getattr_file_perms; +') + +######################################## +## <summary> ## Execute mount in the caller domain. ## </summary> ## <param name="domain">
PATCH 8/34 : patch to allow the devicekit module to work with dbus
Quoted 77 lines · Guido Trentalancia
This patch adds two new interfaces (one for the kernel and the other for mount). It then allows dbus chat between dbus and devicekit and between xdm and devicekit. It also adds some permissions needed to run devicekit.
diff -pruN refpolicy-git-15022011-new-before-modification/policy/modules/kernel/kernel.if refpolicy-git-15022011-new-modified/policy/modules/kernel/kernel.if
policy/modules/kernel/kernel.if +18
-0@@ -1893,6 +1893,24 @@ interface(`kernel_rw_kernel_sysctl',` ######################################## ## <summary> +## Allow caller to search filesystem sysctls. +## </summary> +## <param name="domain"> +## <summary> +## Domain allowed access. +## </summary> +## </param> +# +interface(`kernel_search_fs_sysctl',` + gen_require(` + type proc_t, sysctl_t, sysctl_fs_t; + ') + + search_dirs_pattern($1, { proc_t sysctl_t }, sysctl_fs_t) +') + +######################################## +## <summary> ## Read filesystem sysctls. ## </summary> ## <param name="domain">diff -pruN refpolicy-git-15022011-new-before-modification/policy/modules/services/dbus.te refpolicy-git-15022011-new-modified/policy/modules/services/dbus.te
policy/modules/services/dbus.te +5
-0@@ -145,6 +145,11 @@ optional_policy(` ') optional_policy(` + devicekit_dbus_chat_disk(system_dbusd_t) + devicekit_dbus_chat_power(system_dbusd_t) +') + +optional_policy(` policykit_dbus_chat(system_dbusd_t) policykit_domtrans_auth(system_dbusd_t) policykit_search_lib(system_dbusd_t)diff -pruN refpolicy-git-15022011-new-before-modification/policy/modules/services/devicekit.te refpolicy-git-15022011-new-modified/policy/modules/services/devicekit.te
policy/modules/services/devicekit.te +3
-1@@ -43,6 +43,7 @@ dev_read_sysfs(devicekit_t) dev_read_urand(devicekit_t) files_read_etc_files(devicekit_t) +files_read_etc_runtime_files(devicekit_t) miscfiles_read_localization(devicekit_t)@@ -113,6 +114,7 @@ files_read_etc_files(devicekit_disk_t) files_read_etc_runtime_files(devicekit_disk_t) files_read_usr_files(devicekit_disk_t) +fs_getattr_xattr_fs(devicekit_disk_t) fs_list_inotifyfs(devicekit_disk_t) fs_manage_fusefs_dirs(devicekit_disk_t) fs_mount_all_fs(devicekit_disk_t)@@ -184,7 +186,7 @@ optional_policy(` # allow devicekit_power_t self:capability { dac_override net_admin sys_admin sys_tty_config sys_nice sys_ptrace }; -allow devicekit_power_t self:process getsched; +allow devicekit_power_t self:process { getsched signal }; 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;
policy/modules/services/devicekit.te kernel_read_network_state(devicekit_powe · line 202
Quoted 4 lines
policy/modules/services/devicekit.te +1
-0@@ -197,7 +199,10 @@ kernel_read_network_state(devicekit_powe kernel_read_system_state(devicekit_power_t) kernel_rw_hotplug_sysctls(devicekit_power_t) kernel_rw_kernel_sysctl(devicekit_power_t) +kernel_rw_vm_sysctls(devicekit_power_t)
Any indication as to why this is necessary?
Quoted 15 lines
policy/modules/services/devicekit.te +3
-0kernel_search_debugfs(devicekit_power_t) +kernel_search_fs_sysctl(devicekit_power_t) +kernel_setsched(devicekit_power_t) kernel_write_proc_files(devicekit_power_t) corecmd_exec_bin(devicekit_power_t)@@ -207,6 +212,7 @@ consoletype_exec(devicekit_power_t) domain_read_all_domains_state(devicekit_power_t) +dev_getattr_apm_bios_dev(devicekit_power_t) dev_read_input(devicekit_power_t) dev_rw_generic_usb_dev(devicekit_power_t) dev_rw_generic_chr_files(devicekit_power_t)
policy/modules/services/devicekit.te dev_rw_sysfs(devicekit_power_t) · line 225
Quoted 4 lines
policy/modules/services/devicekit.te +1
-0@@ -216,8 +222,11 @@ dev_rw_sysfs(devicekit_power_t) files_read_kernel_img(devicekit_power_t) files_read_etc_files(devicekit_power_t) files_read_usr_files(devicekit_power_t) +files_rw_etc_runtime_files(devicekit_power_t)
Which files are being written?
policy/modules/services/devicekit.te dev_rw_sysfs(devicekit_power_t) · line 229
Quoted 3 lines
policy/modules/services/devicekit.te +2
-0+fs_getattr_xattr_fs(devicekit_power_t) fs_list_inotifyfs(devicekit_power_t) +fs_remount_xattr_fs(devicekit_power_t)
Remounting filesystems? Sounds suspect.
policy/modules/services/devicekit.te sysnet_domtrans_ifconfig(devicekit_power · line 243
Quoted 8 lines
policy/modules/services/devicekit.te +2
-0term_use_all_terms(devicekit_power_t)@@ -230,6 +239,9 @@ sysnet_domtrans_ifconfig(devicekit_power userdom_read_all_users_state(devicekit_power_t) +mount_exec(devicekit_power_t) +mount_getattr_executable_file(devicekit_power_t)
This getattr rule is a subset of the exec rule.
Quoted 60 lines
policy/modules/services/devicekit.te +5
-0+ optional_policy(` bootloader_domtrans(devicekit_power_t) ')@@ -276,6 +288,10 @@ optional_policy(` ') optional_policy(` + storage_raw_read_fixed_disk(devicekit_power_t) +') + +optional_policy(` udev_read_db(devicekit_power_t) ')diff -pruN refpolicy-git-15022011-new-before-modification/policy/modules/services/xserver.te refpolicy-git-15022011-new-modified/policy/modules/services/xserver.te
policy/modules/services/xserver.te +5
-0@@ -520,6 +520,11 @@ optional_policy(` ') optional_policy(` + devicekit_dbus_chat_disk(xdm_t) + devicekit_dbus_chat_power(xdm_t) +') + +optional_policy(` # Talk to the console mouse server. gpm_stream_connect(xdm_t) gpm_setattr_gpmctl(xdm_t)diff -pruN refpolicy-git-15022011-new-before-modification/policy/modules/system/mount.if refpolicy-git-15022011-new-modified/policy/modules/system/mount.if
policy/modules/system/mount.if +20
-0@@ -51,6 +51,26 @@ interface(`mount_run',` ######################################## ## <summary> +## Get the attributes of mount +## executable files. +## </summary> +## <param name="domain"> +## <summary> +## Domain allowed access. +## </summary> +## </param> +# +interface(`mount_getattr_executable_file',` + gen_require(` + type mount_exec_t; + ') + + corecmd_search_bin($1) + allow $1 mount_exec_t:file getattr_file_perms; +') + +######################################## +## <summary> ## Execute mount in the caller domain. ## </summary> ## <param name="domain">
Signature · 3 lines
Chris PeBenito Tresys Technology, LLC www.tresys.com | oss.tresys.com
PATCH 8/34 : patch to allow the devicekit module to work with dbus
Quoted 71 lines · Christopher J. PeBenito
Quoted 70 lines · Guido Trentalancia
This patch adds two new interfaces (one for the kernel and the other for mount). It then allows dbus chat between dbus and devicekit and between xdm and devicekit. It also adds some permissions needed to run devicekit.
diff -pruN refpolicy-git-15022011-new-before-modification/policy/modules/kernel/kernel.if refpolicy-git-15022011-new-modified/policy/modules/kernel/kernel.if
policy/modules/kernel/kernel.if +18
-0@@ -1893,6 +1893,24 @@ interface(`kernel_rw_kernel_sysctl',` ######################################## ## <summary> +## Allow caller to search filesystem sysctls. +## </summary> +## <param name="domain"> +## <summary> +## Domain allowed access. +## </summary> +## </param> +# +interface(`kernel_search_fs_sysctl',` + gen_require(` + type proc_t, sysctl_t, sysctl_fs_t; + ') + + search_dirs_pattern($1, { proc_t sysctl_t }, sysctl_fs_t) +') + +######################################## +## <summary> ## Read filesystem sysctls. ## </summary> ## <param name="domain">diff -pruN refpolicy-git-15022011-new-before-modification/policy/modules/services/dbus.te refpolicy-git-15022011-new-modified/policy/modules/services/dbus.te
policy/modules/services/dbus.te +5
-0@@ -145,6 +145,11 @@ optional_policy(` ') optional_policy(` + devicekit_dbus_chat_disk(system_dbusd_t) + devicekit_dbus_chat_power(system_dbusd_t) +') + +optional_policy(` policykit_dbus_chat(system_dbusd_t) policykit_domtrans_auth(system_dbusd_t) policykit_search_lib(system_dbusd_t)diff -pruN refpolicy-git-15022011-new-before-modification/policy/modules/services/devicekit.te refpolicy-git-15022011-new-modified/policy/modules/services/devicekit.te
policy/modules/services/devicekit.te +2
-0@@ -43,6 +43,7 @@ dev_read_sysfs(devicekit_t) dev_read_urand(devicekit_t) files_read_etc_files(devicekit_t) +files_read_etc_runtime_files(devicekit_t) miscfiles_read_localization(devicekit_t)@@ -113,6 +114,7 @@ files_read_etc_files(devicekit_disk_t) files_read_etc_runtime_files(devicekit_disk_t) files_read_usr_files(devicekit_disk_t) +fs_getattr_xattr_fs(devicekit_disk_t) fs_list_inotifyfs(devicekit_disk_t) fs_manage_fusefs_dirs(devicekit_disk_t) fs_mount_all_fs(devicekit_disk_t)@@ -184,7 +186,7 @@ optional_policy(` #
Quoted 13 lines
policy/modules/services/devicekit.te kernel_read_network_state(devicekit_powe · line 202
Quoted 11 lines
policy/modules/services/devicekit.te +2
-1allow devicekit_power_t self:capability { dac_override net_admin sys_admin sys_tty_config sys_nice sys_ptrace }; -allow devicekit_power_t self:process getsched; +allow devicekit_power_t self:process { getsched signal }; 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;@@ -197,7 +199,10 @@ kernel_read_network_state(devicekit_powe kernel_read_system_state(devicekit_power_t) kernel_rw_hotplug_sysctls(devicekit_power_t) kernel_rw_kernel_sysctl(devicekit_power_t) +kernel_rw_vm_sysctls(devicekit_power_t)Any indication as to why this is necessary?
type=AVC msg=audit(1298580944.801:11): avc: denied { search } for pid=2683 comm="laptop-mode" scontext=system_u:system_r:devicekit_power_t:s0-s0:c0.c1023 tcontext=system_u:object_r:sysctl_vm_t:s0 tclass=dir type=SYSCALL msg=audit(1298580944.801:11): arch=40000003 syscall=195 success=no exit=-13 a0=939b018 a1=bfdf1760 a2=b7767ff4 a3=939b018 items=0 ppid=2658 pid=2683 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="laptop-mode" exe="/bin/bash" subj=system_u:system_r:devicekit_power_t:s0-s0:c0.c1023 key=(null) type=AVC msg=audit(1298580944.810:12): avc: denied { search } for pid=2683 comm="laptop-mode" scontext=system_u:system_r:devicekit_power_t:s0-s0:c0.c1023 tcontext=system_u:object_r:sysctl_vm_t:s0 tclass=dir type=SYSCALL msg=audit(1298580944.810:12): arch=40000003 syscall=195 success=no exit=-13 a0=939c380 a1=bfdf1720 a2=b7767ff4 a3=939c380 items=0 ppid=2658 pid=2683 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="laptop-mode" exe="/bin/bash" subj=system_u:system_r:devicekit_power_t:s0-s0:c0.c1023 key=(null)
allow devicekit_power_t sysctl_vm_t:dir search; allow devicekit_power_t sysctl_vm_t:file { read write };
Quoted 10 lines
Quoted 10 lines
policy/modules/services/devicekit.te +2
-0kernel_search_debugfs(devicekit_power_t) +kernel_search_fs_sysctl(devicekit_power_t) +kernel_setsched(devicekit_power_t) kernel_write_proc_files(devicekit_power_t) corecmd_exec_bin(devicekit_power_t)@@ -207,6 +212,7 @@ consoletype_exec(devicekit_power_t) domain_read_all_domains_state(devicekit_power_t)
Quoted 11 lines
policy/modules/services/devicekit.te dev_rw_sysfs(devicekit_power_t) · line 225
Quoted 9 lines
policy/modules/services/devicekit.te +2
-0+dev_getattr_apm_bios_dev(devicekit_power_t) dev_read_input(devicekit_power_t) dev_rw_generic_usb_dev(devicekit_power_t) dev_rw_generic_chr_files(devicekit_power_t)@@ -216,8 +222,11 @@ dev_rw_sysfs(devicekit_power_t) files_read_kernel_img(devicekit_power_t) files_read_etc_files(devicekit_power_t) files_read_usr_files(devicekit_power_t) +files_rw_etc_runtime_files(devicekit_power_t)Which files are being written?
I think it's /etc/mtab.
allow devicekit_power_t etc_runtime_t:file { read getattr ioctl write };
And there are also problems in the contexts because there might be files /etc/mtab~[0-9]{3,4} produced at runtime that don't get labeled etc_runtime_t but instead fall back to etc_t which creates problems for write:
type=AVC msg=audit(1298587357.352:19): avc: denied { link } for pid=2837 comm="mount" name="mtab~2837" dev=dm-1 ino=1216 scontext=system_u:system_r:mount_t:s0-s0:c0.c1023 tcontext=system_u:object_r:etc_t:s0 tclass=file
type=AVC msg=audit(1298587357.358:20): avc: denied { unlink } for pid=2837 comm="mount" name="mtab~2837" dev=dm-1 ino=1216 scontext=system_u:system_r:mount_t:s0-s0:c0.c1023 tcontext=system_u:object_r:etc_t:s0 tclass=file
The above needs to get fixed in policy/modules/kernel/files.fc. Can you do some editing on the fly ?
Quoted 5 lines
policy/modules/services/devicekit.te dev_rw_sysfs(devicekit_power_t) · line 229
Quoted 3 lines
policy/modules/services/devicekit.te +2
-0+fs_getattr_xattr_fs(devicekit_power_t) fs_list_inotifyfs(devicekit_power_t) +fs_remount_xattr_fs(devicekit_power_t)Remounting filesystems? Sounds suspect.
allow devicekit_power_t fs_t:filesystem remount;
type=AVC msg=audit(1298580943.963:9): avc: denied { remount } for pid=2679 comm="mount" scontext=system_u:system_r:devicekit_power_t:s0-s0:c0.c1023 tcontext=system_u:object_r:fs_t:s0 tclass=filesystem type=SYSCALL msg=audit(1298580943.963:9): arch=40000003 syscall=21 success=no exit=-13 a0=b797a6f0 a1=b797a718 a2=b797a728 a3=c0ed0020 items=0 ppid=2678 pid=2679 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="mount" exe="/bin/mount" subj=system_u:system_r:devicekit_power_t:s0-s0:c0.c1023 key=(null)
type=AVC msg=audit(1298580944.756:10): avc: denied { remount } for pid=2680 comm="mount" scontext=system_u:system_r:devicekit_power_t:s0-s0:c0.c1023 tcontext=system_u:object_r:fs_t:s0 tclass=filesystem
The process does not exist anymore, maybe it's a script (it could be /sbin/mount.tmpfs that I took from Fedora which has got the proper label mount_exec_t). It happens after boot-up, after policykit has started but before a graphical login (or any other sort of login).
If it is problematic then perhaps it can be left out for the time being. Everything else even without it seems to be working fine.
Quoted 10 lines
policy/modules/services/devicekit.te sysnet_domtrans_ifconfig(devicekit_power · line 243
Quoted 8 lines
policy/modules/services/devicekit.te +2
-0term_use_all_terms(devicekit_power_t)@@ -230,6 +239,9 @@ sysnet_domtrans_ifconfig(devicekit_power userdom_read_all_users_state(devicekit_power_t) +mount_exec(devicekit_power_t) +mount_getattr_executable_file(devicekit_power_t)This getattr rule is a subset of the exec rule.
allow devicekit_power_t mount_exec_t:file { getattr read open execute execute_no_trans };
If it was a subset then we could get rid of the redundant one. But it seems to me that mount_exec() hasn't got corecmd_search_bin(devicekit_power_t) and allow devicekit_power_t mount_exec_t:file getattr_file_perms. The two interfaces seem to deal with disjoint sets of permissions...
You were trying to improve style ? I suspect it cannot be done at this time, please double-check.
Regards,
Guido