1 |
commit: bc4e25c63e5f4ec7536c59e64867e0ff97b4ffb4 |
2 |
Author: Laurent Bigonville <bigon <AT> debian <DOT> org> |
3 |
AuthorDate: Mon Dec 11 10:23:44 2017 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 12 07:07:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=bc4e25c6 |
7 |
|
8 |
Call systemd_write_inherited_logind_inhibit_pipes() where needed |
9 |
|
10 |
Multiple domains need to talk to logind to set inhibits |
11 |
|
12 |
policy/modules/contrib/dbus.te | 2 +- |
13 |
policy/modules/contrib/devicekit.te | 4 ++++ |
14 |
policy/modules/contrib/modemmanager.te | 4 ++++ |
15 |
policy/modules/contrib/networkmanager.te | 1 + |
16 |
policy/modules/contrib/virt.te | 4 ++++ |
17 |
5 files changed, 14 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/policy/modules/contrib/dbus.te b/policy/modules/contrib/dbus.te |
20 |
index 7281c0a4..d7e41c7e 100644 |
21 |
--- a/policy/modules/contrib/dbus.te |
22 |
+++ b/policy/modules/contrib/dbus.te |
23 |
@@ -164,8 +164,8 @@ ifdef(`init_systemd', ` |
24 |
optional_policy(` |
25 |
# for /run/systemd/users/* |
26 |
systemd_read_logind_pids(system_dbusd_t) |
27 |
+ systemd_write_inherited_logind_inhibit_pipes(system_dbusd_t) |
28 |
systemd_write_inherited_logind_sessions_pipes(system_dbusd_t) |
29 |
- systemd_write_logind_pid_pipes(system_dbusd_t) |
30 |
') |
31 |
|
32 |
optional_policy(` |
33 |
|
34 |
diff --git a/policy/modules/contrib/devicekit.te b/policy/modules/contrib/devicekit.te |
35 |
index 1730193d..53dff76e 100644 |
36 |
--- a/policy/modules/contrib/devicekit.te |
37 |
+++ b/policy/modules/contrib/devicekit.te |
38 |
@@ -345,6 +345,10 @@ optional_policy(` |
39 |
') |
40 |
|
41 |
optional_policy(` |
42 |
+ systemd_write_inherited_logind_inhibit_pipes(devicekit_power_t) |
43 |
+') |
44 |
+ |
45 |
+optional_policy(` |
46 |
udev_read_db(devicekit_power_t) |
47 |
udev_manage_pid_files(devicekit_power_t) |
48 |
') |
49 |
|
50 |
diff --git a/policy/modules/contrib/modemmanager.te b/policy/modules/contrib/modemmanager.te |
51 |
index 8dcbeead..9e064a40 100644 |
52 |
--- a/policy/modules/contrib/modemmanager.te |
53 |
+++ b/policy/modules/contrib/modemmanager.te |
54 |
@@ -56,3 +56,7 @@ optional_policy(` |
55 |
udev_read_db(modemmanager_t) |
56 |
udev_manage_pid_files(modemmanager_t) |
57 |
') |
58 |
+ |
59 |
+optional_policy(` |
60 |
+ systemd_write_inherited_logind_inhibit_pipes(modemmanager_t) |
61 |
+') |
62 |
|
63 |
diff --git a/policy/modules/contrib/networkmanager.te b/policy/modules/contrib/networkmanager.te |
64 |
index 1aecd329..779b3c69 100644 |
65 |
--- a/policy/modules/contrib/networkmanager.te |
66 |
+++ b/policy/modules/contrib/networkmanager.te |
67 |
@@ -350,6 +350,7 @@ optional_policy(` |
68 |
|
69 |
optional_policy(` |
70 |
systemd_read_logind_sessions_files(NetworkManager_t) |
71 |
+ systemd_write_inherited_logind_inhibit_pipes(NetworkManager_t) |
72 |
') |
73 |
|
74 |
optional_policy(` |
75 |
|
76 |
diff --git a/policy/modules/contrib/virt.te b/policy/modules/contrib/virt.te |
77 |
index de57096e..546f3375 100644 |
78 |
--- a/policy/modules/contrib/virt.te |
79 |
+++ b/policy/modules/contrib/virt.te |
80 |
@@ -818,6 +818,10 @@ optional_policy(` |
81 |
') |
82 |
|
83 |
optional_policy(` |
84 |
+ systemd_write_inherited_logind_inhibit_pipes(virtd_t) |
85 |
+') |
86 |
+ |
87 |
+optional_policy(` |
88 |
kernel_read_xen_state(virtd_t) |
89 |
kernel_write_xen_state(virtd_t) |