Skip to contentSkip to conversation

mount: sets kernel thread priority mount: mount reads /lib/modules/3.10-2-amd64/modules.dep mount: mount lists all mount points

PATCH New Dominick Grift 2 participants 3 messages Sep 24, 2013 – Sep 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 16/20 mount: sets kernel thread priority mount: mount reads /lib/modules/3.10-2-amd64/modules.dep mount: mount lists all mount points

In debian mount was trying to list / on a tmpfs (/run/lock). Since var_lock_t is a mountpoint type, and so is mnt_t, i decided to implement a files_list_all_mountpoints() and call that for mount because it makes sense

---
 policy/modules/kernel/files.if | 18 ++++++++++++++++++
 policy/modules/system/mount.te |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
policy/modules/kernel/files.if +18 -0
index 64ff4d7..f962f76 100644
@@ -1655,6 +1655,24 @@ interface(`files_dontaudit_search_all_mountpoints',`
 
 ########################################
 ## <summary>
+##	List all mount points.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`files_list_all_mountpoints',`
+	gen_require(`
+		attribute mountpoint;
+	')
+
+	allow $1 mountpoint:dir list_dir_perms;
+')
+
+########################################
+## <summary>
 ##	Do not audit listing of all mount points.
 ## </summary>
 ## <param name="domain">
policy/modules/system/mount.te +6 -1
index eba28c0..5e5e089 100644
@@ -59,6 +59,7 @@ files_pid_filetrans(mount_t, mount_var_run_t, dir, "mount")
 
 kernel_read_system_state(mount_t)
 kernel_read_kernel_sysctls(mount_t)
+kernel_setsched(mount_t)
 kernel_dontaudit_getattr_core_if(mount_t)
 kernel_dontaudit_write_debugfs_dirs(mount_t)
 kernel_dontaudit_write_proc_dirs(mount_t)
@@ -96,7 +97,7 @@ files_unmount_all_file_type_fs(mount_t)
 files_read_isid_type_files(mount_t)
 # For reading cert files
 files_read_usr_files(mount_t)
-files_list_mnt(mount_t)
+files_list_all_mountpoints(mount_t)
 files_dontaudit_write_all_mountpoints(mount_t)
 files_dontaudit_setattr_all_mountpoints(mount_t)
 
@@ -202,6 +203,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	modutils_read_module_deps(mount_t)
+')
+
+optional_policy(`
 	puppet_rw_tmp(mount_t)
 ')
 
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 16/20 mount: sets kernel thread priority mount: mount reads /lib/modules/3.10-2-amd64/modules.dep mount: mount lists all mount points

Quoted 62 lines · Dominick Grift

In debian mount was trying to list / on a tmpfs (/run/lock). Since var_lock_t is a mountpoint type, and so is mnt_t, i decided to implement a files_list_all_mountpoints() and call that for mount because it makes sense

---
 policy/modules/kernel/files.if | 18 ++++++++++++++++++
 policy/modules/system/mount.te |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
policy/modules/kernel/files.if +18 -0
index 64ff4d7..f962f76 100644
@@ -1655,6 +1655,24 @@ interface(`files_dontaudit_search_all_mountpoints',`
 
 ########################################
 ## <summary>
+##	List all mount points.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`files_list_all_mountpoints',`
+	gen_require(`
+		attribute mountpoint;
+	')
+
+	allow $1 mountpoint:dir list_dir_perms;
+')
+
+########################################
+## <summary>
 ##	Do not audit listing of all mount points.
 ## </summary>
 ## <param name="domain">
policy/modules/system/mount.te +2 -1
index eba28c0..5e5e089 100644
@@ -59,6 +59,7 @@ files_pid_filetrans(mount_t, mount_var_run_t, dir, "mount")
 
 kernel_read_system_state(mount_t)
 kernel_read_kernel_sysctls(mount_t)
+kernel_setsched(mount_t)
 kernel_dontaudit_getattr_core_if(mount_t)
 kernel_dontaudit_write_debugfs_dirs(mount_t)
 kernel_dontaudit_write_proc_dirs(mount_t)
@@ -96,7 +97,7 @@ files_unmount_all_file_type_fs(mount_t)
 files_read_isid_type_files(mount_t)
 # For reading cert files
 files_read_usr_files(mount_t)
-files_list_mnt(mount_t)
+files_list_all_mountpoints(mount_t)
 files_dontaudit_write_all_mountpoints(mount_t)
 files_dontaudit_setattr_all_mountpoints(mount_t)
 

policy/modules/system/mount.te optional_policy(` · line 211

Quoted 9 lines
policy/modules/system/mount.te +4 -0
@@ -202,6 +203,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	modutils_read_module_deps(mount_t)
+')
+
+optional_policy(`
 	puppet_rw_tmp(mount_t)
 ')

I merged it, though I'm a little dubious that broad of an access is necessary. The fs_list_auto_mountpoints() call might now be redundant.

--
Chris PeBenito
Tresys Technology, LLC
www.tresys.com | oss.tresys.com

#2 lore raw

PATCH 16/20 mount: sets kernel thread priority mount: mount reads /lib/modules/3.10-2-amd64/modules.dep mount: mount lists all mount points

Quoted 65 lines · Christopher J. PeBenito
Quoted 64 lines · Dominick Grift

In debian mount was trying to list / on a tmpfs (/run/lock). Since var_lock_t is a mountpoint type, and so is mnt_t, i decided to implement a files_list_all_mountpoints() and call that for mount because it makes sense

---
 policy/modules/kernel/files.if | 18 ++++++++++++++++++
 policy/modules/system/mount.te |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
policy/modules/kernel/files.if +18 -0
index 64ff4d7..f962f76 100644
@@ -1655,6 +1655,24 @@ interface(`files_dontaudit_search_all_mountpoints',`
 
 ########################################
 ## <summary>
+##	List all mount points.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`files_list_all_mountpoints',`
+	gen_require(`
+		attribute mountpoint;
+	')
+
+	allow $1 mountpoint:dir list_dir_perms;
+')
+
+########################################
+## <summary>
 ##	Do not audit listing of all mount points.
 ## </summary>
 ## <param name="domain">
policy/modules/system/mount.te +2 -1
index eba28c0..5e5e089 100644
@@ -59,6 +59,7 @@ files_pid_filetrans(mount_t, mount_var_run_t, dir, "mount")
 
 kernel_read_system_state(mount_t)
 kernel_read_kernel_sysctls(mount_t)
+kernel_setsched(mount_t)
 kernel_dontaudit_getattr_core_if(mount_t)
 kernel_dontaudit_write_debugfs_dirs(mount_t)
 kernel_dontaudit_write_proc_dirs(mount_t)
@@ -96,7 +97,7 @@ files_unmount_all_file_type_fs(mount_t)
 files_read_isid_type_files(mount_t)
 # For reading cert files
 files_read_usr_files(mount_t)
-files_list_mnt(mount_t)
+files_list_all_mountpoints(mount_t)
 files_dontaudit_write_all_mountpoints(mount_t)
 files_dontaudit_setattr_all_mountpoints(mount_t)
 
@@ -202,6 +203,10 @@ optional_policy(`
 ')
 
Quoted 10 lines

policy/modules/system/mount.te optional_policy(` · line 211

Quoted 7 lines
policy/modules/system/mount.te +4 -0
 optional_policy(`
+	modutils_read_module_deps(mount_t)
+')
+
+optional_policy(`
 	puppet_rw_tmp(mount_t)
 ')

I merged it, though I'm a little dubious that broad of an access is necessary. The fs_list_auto_mountpoints() call might now be redundant.

Yes that is redundant since autofs_t is also a mountpoint

Quoted 6 lines

--
Chris PeBenito
Tresys Technology, LLC
www.tresys.com | oss.tresys.com