2018-04-25 04:03:16

by Jason Zaman

Subject: [refpolicy] [PATCH] sysnetwork: put systemd_read_resolved_runtime in an ifdef

commit f865919872a2d709d37f3df7032a6ea73bdd8080
(Interface to read /run/systemd/resolve/resolv.conf)
Added an interface to sysnet_read_config which requires the systemd
module loaded. Putting the interface in an optional_policy() is not
possible since sysnet_read_config is called from several tunables so
we use an ifdef.
---
policy/modules/system/sysnetwork.if | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/policy/modules/system/sysnetwork.if b/policy/modules/system/sysnetwork.if
index 1f7cf460..e6e4246d 100644
--- a/policy/modules/system/sysnetwork.if
+++ b/policy/modules/system/sysnetwork.if
@@ -348,7 +348,9 @@ interface(`sysnet_read_config',`
files_search_etc($1)
allow $1 net_conf_t:file read_file_perms;

- systemd_read_resolved_runtime($1)
+ ifdef(`init_systemd',`
+ systemd_read_resolved_runtime($1)
+ ')

ifdef(`distro_debian',`
files_search_pids($1)
--
2.16.1

2018-04-25 21:30:47

by Chris PeBenito

Subject: [refpolicy] [PATCH] sysnetwork: put systemd_read_resolved_runtime in an ifdef

On 04/25/2018 12:03 AM, Jason Zaman wrote:
> commit f865919872a2d709d37f3df7032a6ea73bdd8080
> (Interface to read /run/systemd/resolve/resolv.conf)
> Added an interface to sysnet_read_config which requires the systemd
> module loaded. Putting the interface in an optional_policy() is not
> possible since sysnet_read_config is called from several tunables so
> we use an ifdef.
> ---
> policy/modules/system/sysnetwork.if | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/policy/modules/system/sysnetwork.if b/policy/modules/system/sysnetwork.if
> index 1f7cf460..e6e4246d 100644
> --- a/policy/modules/system/sysnetwork.if
> +++ b/policy/modules/system/sysnetwork.if
> @@ -348,7 +348,9 @@ interface(`sysnet_read_config',`
> files_search_etc($1)
> allow $1 net_conf_t:file read_file_perms;
>
> - systemd_read_resolved_runtime($1)
> + ifdef(`init_systemd',`
> + systemd_read_resolved_runtime($1)
> + ')
>
> ifdef(`distro_debian',`
> files_search_pids($1)

Merged.

--
Chris PeBenito