Skip to contentSkip to conversation

selinuxutil sysnetwork consolekit apt dpkg udev iptables logrotate, and gpm

PATCH In review Russell Coker 3 participants 4 messages Jan 2, 2019 – Jan 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 selinuxutil sysnetwork consolekit apt dpkg udev iptables logrotate, and gpm

Lots of little stuff.

Also the sysnet_dns_name_resolve() change the previous patch needed.

policy/modules/system/selinuxutil.te +1 -0
Index: refpolicy-2.20180701/policy/modules/system/selinuxutil.te
===================================================================
@@ -606,6 +606,7 @@ files_read_usr_symlinks(setfiles_t)
 files_dontaudit_read_all_symlinks(setfiles_t)
 
 fs_getattr_all_xattr_fs(setfiles_t)
+fs_getattr_cgroup(setfiles_t)
 fs_getattr_nfs(setfiles_t)
 fs_getattr_pstore_dirs(setfiles_t)
 fs_getattr_pstorefs(setfiles_t)
policy/modules/system/sysnetwork.if +4 -0
Index: refpolicy-2.20180701/policy/modules/system/sysnetwork.if
===================================================================
@@ -755,6 +755,10 @@ interface(`sysnet_dns_name_resolve',`
 	optional_policy(`
 		nscd_use($1)
 	')
+	optional_policy(`
+	# for /etc/resolv.conf symlink
+		networkmanager_read_pid_files($1)
+	')
 
 	ifdef(`init_systemd',`
 		optional_policy(`
policy/modules/system/sysnetwork.te +3 -0
Index: refpolicy-2.20180701/policy/modules/system/sysnetwork.te
===================================================================
@@ -68,6 +68,7 @@ exec_files_pattern(dhcpc_t, dhcp_etc_t,
 allow dhcpc_t dhcp_state_t:file read_file_perms;
 manage_files_pattern(dhcpc_t, dhcpc_state_t, dhcpc_state_t)
 filetrans_pattern(dhcpc_t, dhcp_state_t, dhcpc_state_t, file)
+allow dhcpc_t dhcpc_state_t:file map;
 
 # create pid file
 manage_files_pattern(dhcpc_t, dhcpc_var_run_t, dhcpc_var_run_t)
@@ -339,6 +340,8 @@ init_use_script_ptys(ifconfig_t)
 
 logging_send_syslog_msg(ifconfig_t)
 
+# dhclient reads /etc/ssl
+miscfiles_read_generic_certs(dhcpc_t)
 miscfiles_read_localization(ifconfig_t)
 
 seutil_use_runinit_fds(ifconfig_t)
policy/modules/services/consolekit.te +1 -1
Index: refpolicy-2.20180701/policy/modules/services/consolekit.te
===================================================================
@@ -27,7 +27,7 @@ init_daemon_pid_file(consolekit_var_run_
 # Local policy
 #
 
-allow consolekit_t self:capability { chown dac_override fowner setgid setuid sys_admin sys_nice sys_ptrace sys_tty_config };
+allow consolekit_t self:capability { chown dac_override dac_read_search fowner setgid setuid sys_admin sys_nice sys_ptrace sys_tty_config };
 allow consolekit_t self:process { getsched signal setfscreate };
 allow consolekit_t self:fifo_file rw_fifo_file_perms;
 allow consolekit_t self:unix_stream_socket { accept listen };
policy/modules/admin/usermanage.te +18 -2
Index: refpolicy-2.20180701/policy/modules/admin/usermanage.te
===================================================================
@@ -189,7 +189,7 @@ optional_policy(`
 #
 
 allow groupadd_t self:capability { audit_write chown dac_override fsetid kill setuid sys_resource };
-dontaudit groupadd_t self:capability { fsetid sys_tty_config };
+dontaudit groupadd_t self:capability { fsetid net_admin sys_tty_config };
 allow groupadd_t self:process { transition signal_perms getsched setsched getsession getpgid setpgid getcap setcap share getattr setfscreate noatsecure siginh setrlimit rlimitinh dyntransition setkeycreate setsockcreate getrlimit };
 allow groupadd_t self:fd use;
 allow groupadd_t self:fifo_file rw_fifo_file_perms;
@@ -252,6 +252,10 @@ userdom_use_unpriv_users_fds(groupadd_t)
 userdom_dontaudit_search_user_home_dirs(groupadd_t)
 
 optional_policy(`
+	dbus_system_bus_client(groupadd_t)
+')
+
+optional_policy(`
 	dpkg_use_fds(groupadd_t)
 	dpkg_rw_pipes(groupadd_t)
 ')
@@ -269,6 +273,10 @@ optional_policy(`
 	rpm_rw_pipes(groupadd_t)
 ')
 
+optional_policy(`
+	unconfined_use_fds(groupadd_t)
+')
+
 ########################################
 #
 # Passwd local policy
@@ -446,7 +454,7 @@ optional_policy(`
 #
 
 allow useradd_t self:capability { chown dac_override fowner fsetid kill setuid sys_resource };
-dontaudit useradd_t self:capability sys_tty_config;
+dontaudit useradd_t self:capability { net_admin sys_tty_config };
 allow useradd_t self:process { transition signal_perms getsched setsched getsession getpgid setpgid getcap setcap share getattr setfscreate noatsecure siginh rlimitinh dyntransition setkeycreate setsockcreate getrlimit };
 allow useradd_t self:fd use;
 allow useradd_t self:fifo_file rw_fifo_file_perms;
@@ -538,6 +546,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	dbus_system_bus_client(useradd_t)
+')
+
+optional_policy(`
 	dpkg_use_fds(useradd_t)
 	dpkg_rw_pipes(useradd_t)
 ')
@@ -560,3 +572,7 @@ optional_policy(`
 	rpm_use_fds(useradd_t)
 	rpm_rw_pipes(useradd_t)
 ')
+
+optional_policy(`
+	unconfined_use_fds(useradd_t)
+')
policy/modules/admin/apt.if +2 -2
Index: refpolicy-2.20180701/policy/modules/admin/apt.if
===================================================================
@@ -171,7 +171,7 @@ interface(`apt_read_cache',`
 
 	files_search_var($1)
 	allow $1 apt_var_cache_t:dir list_dir_perms;
-	allow $1 apt_var_cache_t:file read_file_perms;
+	allow $1 apt_var_cache_t:file mmap_read_file_perms;
 ')
 
 ########################################
@@ -191,7 +191,7 @@ interface(`apt_manage_cache',`
 
 	files_search_var($1)
 	allow $1 apt_var_cache_t:dir manage_dir_perms;
-	allow $1 apt_var_cache_t:file manage_file_perms;
+	allow $1 apt_var_cache_t:file { manage_file_perms map };
 ')
 
 ########################################
policy/modules/admin/dpkg.te +4 -0
Index: refpolicy-2.20180701/policy/modules/admin/dpkg.te
===================================================================
@@ -317,6 +317,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	init_dbus_chat(dpkg_script_t)
+')
+
+optional_policy(`
 	modutils_run(dpkg_script_t, dpkg_roles)
 ')
 
policy/modules/system/udev.te +5 -4
Index: refpolicy-2.20180701/policy/modules/system/udev.te
===================================================================
@@ -306,10 +306,6 @@ optional_policy(`
 ')
 
 optional_policy(`
-	lvm_domtrans(udev_t)
-')
-
-optional_policy(`
 	fstools_domtrans(udev_t)
 ')
 
@@ -328,6 +324,11 @@ optional_policy(`
 ')
 
 optional_policy(`
+	iptables_domtrans(udev_t)
+	iptables_write_pipe(udev_t)
+')
+
+optional_policy(`
 	lvm_domtrans(udev_t)
 ')
 
policy/modules/system/iptables.if +18 -0
Index: refpolicy-2.20180701/policy/modules/system/iptables.if
===================================================================
@@ -25,6 +25,24 @@ interface(`iptables_domtrans',`
 
 ########################################
 ## <summary>
+##	Allow iptables to write to a pipe
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to be written to
+##	</summary>
+## </param>
+#
+interface(`iptables_write_pipe',`
+	gen_require(`
+		type iptables_t;
+	')
+
+	allow iptables_t $1:fifo_file write;
+')
+
+########################################
+## <summary>
 ##	Execute iptables in the iptables domain, and
 ##	allow the specified role the iptables domain.
 ## </summary>
policy/modules/admin/logrotate.te +2 -0
Index: refpolicy-2.20180701/policy/modules/admin/logrotate.te
===================================================================
@@ -92,6 +92,8 @@ fs_search_auto_mountpoints(logrotate_t)
 fs_getattr_xattr_fs(logrotate_t)
 fs_list_inotifyfs(logrotate_t)
 fs_getattr_tmpfs(logrotate_t)
+# killall reads nsfs files
+fs_read_nsfs_files(logrotate_t)
 
 mls_file_read_all_levels(logrotate_t)
 mls_file_write_all_levels(logrotate_t)
policy/modules/services/gpm.if +1 -0
Index: refpolicy-2.20180701/policy/modules/services/gpm.if
===================================================================
@@ -59,6 +59,7 @@ interface(`gpm_dontaudit_getattr_gpmctl'
 	')
 
 	dontaudit $1 gpmctl_t:sock_file getattr_sock_file_perms;
+	dontaudit $1 gpmctl_t:fifo_file getattr_fifo_file_perms;
 ')
 
 ########################################
#1 lore raw
Quoted 4 lines · Russell Coker

Lots of little stuff.

Also the sysnet_dns_name_resolve() change the previous patch needed.

[...]

policy/modules/services/consolekit.te init_daemon_pid_file(consolekit_var_run_ · line 30

Quoted 8 lines
policy/modules/services/consolekit.te +1 -1
@@ -27,7 +27,7 @@ init_daemon_pid_file(consolekit_var_run_
  # Local policy
  #
 
-allow consolekit_t self:capability { chown dac_override fowner setgid setuid sys_admin sys_nice sys_ptrace sys_tty_config };
+allow consolekit_t self:capability { chown dac_override dac_read_search fowner setgid setuid sys_admin sys_nice sys_ptrace sys_tty_config };

Since you're getting the dac_read_search denial, the dac_override probably isn't necessary anymore. Can you retest without it?

[...]

Quoted 3 lines

===================================================================

policy/modules/system/udev.te +0 -0

[...]

policy/modules/system/udev.te optional_policy(` · line 328

Quoted 6 lines
policy/modules/system/udev.te +2 -0
@@ -328,6 +324,11 @@ optional_policy(`
  ')
 
  optional_policy(`
+	iptables_domtrans(udev_t)
+	iptables_write_pipe(udev_t)

I'm not clear why this separate pipe interface is necessary, as that access should be provided by the domtrans interface already.

Quoted 5 lines
policy/modules/system/iptables.if +0 -0
@@ -25,6 +25,24 @@ interface(`iptables_domtrans',`
 
  ########################################

policy/modules/system/iptables.if interface(`iptables_domtrans',` · line 36

Quoted 10 lines
policy/modules/system/iptables.if +9 -0
  ## <summary>
+##	Allow iptables to write to a pipe
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to be written to
+##	</summary>
+## </param>
+#
+interface(`iptables_write_pipe',`

Should be iptables_write_inherited_pipe().

Quoted 7 lines
policy/modules/system/iptables.if +7 -0
+	gen_require(`
+		type iptables_t;
+	')
+
+	allow iptables_t $1:fifo_file write;
+')
+
Signature · 1 line
Chris PeBenito
#2 lore raw
Quoted 13 lines · Chris PeBenito
Quoted 4 lines · Russell Coker

Lots of little stuff.

Also the sysnet_dns_name_resolve() change the previous patch needed.

[...]

Quoted 6 lines
policy/modules/services/consolekit.te +0 -0
@@ -27,7 +27,7 @@ init_daemon_pid_file(consolekit_var_run_
  # Local policy
  #
 
Quoted 5 lines

policy/modules/services/consolekit.te init_daemon_pid_file(consolekit_var_run_ · line 30

Quoted 2 lines
policy/modules/services/consolekit.te +1 -1
-allow consolekit_t self:capability { chown dac_override fowner setgid setuid sys_admin sys_nice sys_ptrace sys_tty_config };
+allow consolekit_t self:capability { chown dac_override dac_read_search fowner setgid setuid sys_admin sys_nice sys_ptrace sys_tty_config };

Since you're getting the dac_read_search denial, the dac_override probably isn't necessary anymore. Can you retest without it?

No, consolekit definitely needs dac_override. It needs to be able to nuke /run/user/1000/*. it perhaps doesnt need to read only nuke but i'd say grant the perm instead of dontaudit makes things easier if doing semodule -DB.

Quoted 48 lines

[...]

Quoted 3 lines

===================================================================

policy/modules/system/udev.te +0 -0

[...]

policy/modules/system/udev.te optional_policy(` · line 328

Quoted 6 lines
policy/modules/system/udev.te +2 -0
@@ -328,6 +324,11 @@ optional_policy(`
  ')
 
  optional_policy(`
+	iptables_domtrans(udev_t)
+	iptables_write_pipe(udev_t)

I'm not clear why this separate pipe interface is necessary, as that access should be provided by the domtrans interface already.

Quoted 5 lines
policy/modules/system/iptables.if +0 -0
@@ -25,6 +25,24 @@ interface(`iptables_domtrans',`
 
  ########################################

policy/modules/system/iptables.if interface(`iptables_domtrans',` · line 36

Quoted 10 lines
policy/modules/system/iptables.if +9 -0
  ## <summary>
+##	Allow iptables to write to a pipe
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to be written to
+##	</summary>
+## </param>
+#
+interface(`iptables_write_pipe',`

Should be iptables_write_inherited_pipe().

Quoted 7 lines
policy/modules/system/iptables.if +7 -0
+	gen_require(`
+		type iptables_t;
+	')
+
+	allow iptables_t $1:fifo_file write;
+')
+
Signature · 1 line
Chris PeBenito
#3 lore raw
Quoted 11 lines · AEDT Jason Zaman
Quoted 6 lines
Quoted 4 lines

-allow consolekit_t self:capability { chown dac_override fowner setgid setuid sys_admin sys_nice sys_ptrace sys_tty_config }; +allow consolekit_t self:capability { chown dac_override dac_read_search fowner setgid setuid sys_admin sys_nice sys_ptrace sys_tty_config };>

Since you're getting the dac_read_search denial, the dac_override probably isn't necessary anymore. Can you retest without it?

No, consolekit definitely needs dac_override. It needs to be able to nuke /run/user/1000/*. it perhaps doesnt need to read only nuke but i'd say grant the perm instead of dontaudit makes things easier if doing semodule -DB.

Thanks for that comment.

As an aside we might consider a policy of having all capabilities documented in future. For the existing policy it's going to be an unpleasant task to comment things. But for greenfields stuff I think it makes sense to require it.

Signature · 2 lines
My Main Blog         http://etbe.coker.com.au/
My Documents Blog    http://doc.coker.com.au/