This patchset introduces the init_daemon_pid_file interface, deprecates init_daemon_run_dir and updates the non-contrib modules to use the new init_daemon_pid_file interface.
Sven Vermeulen (3):
Support initrc_t generated pid files with file transition
Deprecate init_daemon_run_dir interface
Use init_daemon_pid_file instead of init_daemon_run_dir
policy/modules/services/postgresql.te | 2 +-
policy/modules/services/ssh.te | 2 +-
policy/modules/system/init.if | 38 ++++++++++++++++++++++++++++++++---
policy/modules/system/init.te | 9 +++++----
policy/modules/system/setrans.te | 2 +-
policy/modules/system/sysnetwork.te | 2 +-
policy/modules/system/udev.te | 2 +-
7 files changed, 45 insertions(+), 12 deletions(-)
--
1.8.5.5
For some daemons, it is the init script that is responsible for creating
the PID file of the daemon. As we do not want to update the init SELinux
policy module for each of these situations, we need to introduce an
interface that can be called by the SELinux policy module of the caller
(the daemon domain).
The initial suggestion was to transform the init_daemon_run_dir
interface, which offers a similar approach for directories in /run, into
a class-agnostic interface. Several names have been suggested, such as
init_script_spec_run_content or init_script_generic_run_filetrans_spec,
but in the end init_daemon_pid_file was used.
The interface requires the class(es) on which the file transition should
occur, like so:
init_daemon_pid_file(xdm_var_run_t, dir, "xdm")
init_daemon_pid_file(postgresql_var_run_t, file, "postgresql.pid")
Signed-off-by: Sven Vermeulen <[email protected]>
---
policy/modules/system/init.if | 33 +++++++++++++++++++++++++++++++++
policy/modules/system/init.te | 6 ++++++
2 files changed, 39 insertions(+)
diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if
index 4c66daf..a168713 100644
--- a/policy/modules/system/init.if
+++ b/policy/modules/system/init.if
@@ -412,6 +412,39 @@ interface(`init_ranged_system_domain',`
########################################
## <summary>
+## Mark the file type as a daemon pid file, allowing initrc_t
+## to create it
+## </summary>
+## <param name="filetype">
+## <summary>
+## Type to mark as a daemon pid file
+## </summary>
+## </param>
+## <param name="class">
+## <summary>
+## Class on which the type is applied
+## </summary>
+## </param>
+## <param name="filename">
+## <summary>
+## Filename of the file that the init script creates
+## </summary>
+## </param>
+#
+interface(`init_daemon_pid_file',`
+ gen_require(`
+ attribute daemonpidfile;
+ type initrc_t;
+ ')
+
+ typeattribute $1 daemonpidfile;
+
+ files_pid_file($1)
+ files_pid_filetrans(initrc_t, $1, $2, $3)
+')
+
+########################################
+## <summary>
## Mark the file type as a daemon run dir, allowing initrc_t
## to create it
## </summary>
diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
index b45b540..5d6f8b9 100644
--- a/policy/modules/system/init.te
+++ b/policy/modules/system/init.te
@@ -23,6 +23,8 @@ attribute init_run_all_scripts_domain;
# Mark process types as daemons
attribute daemon;
+# Mark file type as a daemon pid file
+attribute daemonpidfile;
# Mark file type as a daemon run directory
attribute daemonrundir;
@@ -247,6 +249,10 @@ init_telinit(initrc_t)
can_exec(initrc_t, init_script_file_type)
+create_dirs_pattern(initrc_t, daemonpidfile, daemonpidfile)
+manage_files_pattern(initrc_t, daemonpidfile, daemonpidfile)
+setattr_dirs_pattern(initrc_t, daemonpidfile, daemonpidfile)
+
create_dirs_pattern(initrc_t, daemonrundir, daemonrundir)
setattr_dirs_pattern(initrc_t, daemonrundir, daemonrundir)
--
1.8.5.5
With init_daemon_pid_file supporting class parameters, all calls to
init_daemon_run_dir can now be transformed into init_daemon_pid_file
calls.
Update the init_daemon_run_dir interface so it gives a warning when
used, and use the init_daemon_pid_file interface underlyingly.
Signed-off-by: Sven Vermeulen <[email protected]>
---
policy/modules/system/init.if | 5 ++---
policy/modules/system/init.te | 5 -----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if
index a168713..15483b0 100644
--- a/policy/modules/system/init.if
+++ b/policy/modules/system/init.if
@@ -465,9 +465,8 @@ interface(`init_daemon_run_dir',`
type initrc_t;
')
- typeattribute $1 daemonrundir;
-
- files_pid_filetrans(initrc_t, $1, dir, $2)
+ refpolicywarn(`$0($*) has been deprecated, use init_daemon_pid_file() instead.')
+ init_daemon_pid_file($1, dir, $2)
')
########################################
diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
index 5d6f8b9..7bc48d5 100644
--- a/policy/modules/system/init.te
+++ b/policy/modules/system/init.te
@@ -25,8 +25,6 @@ attribute daemon;
# Mark file type as a daemon pid file
attribute daemonpidfile;
-# Mark file type as a daemon run directory
-attribute daemonrundir;
#
# init_t is the domain of the init process.
@@ -253,9 +251,6 @@ create_dirs_pattern(initrc_t, daemonpidfile, daemonpidfile)
manage_files_pattern(initrc_t, daemonpidfile, daemonpidfile)
setattr_dirs_pattern(initrc_t, daemonpidfile, daemonpidfile)
-create_dirs_pattern(initrc_t, daemonrundir, daemonrundir)
-setattr_dirs_pattern(initrc_t, daemonrundir, daemonrundir)
-
domtrans_pattern(init_run_all_scripts_domain, initrc_exec_t, initrc_t)
manage_dirs_pattern(initrc_t, initrc_state_t, initrc_state_t)
--
1.8.5.5
Update non-contrib modules to use init_daemon_pid_file instead of
init_daemon_run_dir.
Signed-off-by: Sven Vermeulen <[email protected]>
---
policy/modules/services/postgresql.te | 2 +-
policy/modules/services/ssh.te | 2 +-
policy/modules/system/setrans.te | 2 +-
policy/modules/system/sysnetwork.te | 2 +-
policy/modules/system/udev.te | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/policy/modules/services/postgresql.te b/policy/modules/services/postgresql.te
index c771377..c38bb46 100644
--- a/policy/modules/services/postgresql.te
+++ b/policy/modules/services/postgresql.te
@@ -63,7 +63,7 @@ files_tmp_file(postgresql_tmp_t)
type postgresql_var_run_t;
files_pid_file(postgresql_var_run_t)
-init_daemon_run_dir(postgresql_var_run_t, "postgresql")
+init_daemon_pid_file(postgresql_var_run_t, dir, "postgresql")
# database clients attribute
attribute sepgsql_admin_type;
diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te
index 536a2d9..43b9cc1 100644
--- a/policy/modules/services/ssh.te
+++ b/policy/modules/services/ssh.te
@@ -85,7 +85,7 @@ type sshd_keytab_t;
files_type(sshd_keytab_t)
ifdef(`distro_debian',`
- init_daemon_run_dir(sshd_var_run_t, "sshd")
+ init_daemon_pid_file(sshd_var_run_t, dir, "sshd")
')
##############################
diff --git a/policy/modules/system/setrans.te b/policy/modules/system/setrans.te
index a840e70..057456c 100644
--- a/policy/modules/system/setrans.te
+++ b/policy/modules/system/setrans.te
@@ -21,7 +21,7 @@ files_pid_file(setrans_var_run_t)
mls_trusted_object(setrans_var_run_t)
ifdef(`distro_debian',`
- init_daemon_run_dir(setrans_var_run_t, "setrans")
+ init_daemon_pid_file(setrans_var_run_t, dir, "setrans")
')
ifdef(`enable_mcs',`
diff --git a/policy/modules/system/sysnetwork.te b/policy/modules/system/sysnetwork.te
index 4b6a520..9bd538b 100644
--- a/policy/modules/system/sysnetwork.te
+++ b/policy/modules/system/sysnetwork.te
@@ -40,7 +40,7 @@ type net_conf_t alias resolv_conf_t;
files_type(net_conf_t)
ifdef(`distro_debian',`
- init_daemon_run_dir(net_conf_t, "network")
+ init_daemon_pid_file(net_conf_t, dir, "network")
')
########################################
diff --git a/policy/modules/system/udev.te b/policy/modules/system/udev.te
index 35ea2c3..740233e 100644
--- a/policy/modules/system/udev.te
+++ b/policy/modules/system/udev.te
@@ -25,7 +25,7 @@ files_type(udev_rules_t)
type udev_var_run_t;
files_pid_file(udev_var_run_t)
-init_daemon_run_dir(udev_var_run_t, "udev")
+init_daemon_pid_file(udev_var_run_t, dir, "udev")
ifdef(`enable_mcs',`
kernel_ranged_domtrans_to(udev_t, udev_exec_t, s0 - mcs_systemhigh)
--
1.8.5.5
On 06/08/2014 10:36 AM, Sven Vermeulen wrote:
> With init_daemon_pid_file supporting class parameters, all calls to
> init_daemon_run_dir can now be transformed into init_daemon_pid_file
> calls.
>
> Update the init_daemon_run_dir interface so it gives a warning when
> used, and use the init_daemon_pid_file interface underlyingly.
>
> Signed-off-by: Sven Vermeulen <[email protected]>
> ---
> --- a/policy/modules/system/init.te
> +++ b/policy/modules/system/init.te
> @@ -25,8 +25,6 @@ attribute daemon;
>
> # Mark file type as a daemon pid file
> attribute daemonpidfile;
> -# Mark file type as a daemon run directory
> -attribute daemonrundir;
>
> #
> # init_t is the domain of the init process.
I think I would keep this attribute for a bit for compatibility reasons. Otherwise if someone has custom policy would be forced to recompile since their module would fail to link (it would still reference this attribute). I think we just need to mark this attribute as deprecated, for future removal.
--
Chris PeBenito
Tresys Technology, LLC
http://www.tresys.com | oss.tresys.com