summaryrefslogtreecommitdiffstats
path: root/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysklogd.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysklogd.patch')
-rw-r--r--recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysklogd.patch38
1 files changed, 22 insertions, 16 deletions
diff --git a/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysklogd.patch b/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysklogd.patch
index 03284cd..dfa67a6 100644
--- a/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysklogd.patch
+++ b/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysklogd.patch
@@ -9,6 +9,7 @@ for syslogd_t to read syslog_conf_t lnk_file is needed.
9Upstream-Status: Inappropriate [only for Poky] 9Upstream-Status: Inappropriate [only for Poky]
10 10
11Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> 11Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
12Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
12--- 13---
13 policy/modules/system/logging.fc | 4 ++++ 14 policy/modules/system/logging.fc | 4 ++++
14 policy/modules/system/logging.te | 1 + 15 policy/modules/system/logging.te | 1 +
@@ -16,7 +17,7 @@ Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
16 17
17--- a/policy/modules/system/logging.fc 18--- a/policy/modules/system/logging.fc
18+++ b/policy/modules/system/logging.fc 19+++ b/policy/modules/system/logging.fc
19@@ -1,22 +1,26 @@ 20@@ -1,12 +1,14 @@
20 /dev/log -s gen_context(system_u:object_r:devlog_t,mls_systemhigh) 21 /dev/log -s gen_context(system_u:object_r:devlog_t,mls_systemhigh)
21 22
22 /etc/rsyslog.conf gen_context(system_u:object_r:syslog_conf_t,s0) 23 /etc/rsyslog.conf gen_context(system_u:object_r:syslog_conf_t,s0)
@@ -27,25 +28,30 @@ Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
27 /etc/rc\.d/init\.d/rsyslog -- gen_context(system_u:object_r:syslogd_initrc_exec_t,s0) 28 /etc/rc\.d/init\.d/rsyslog -- gen_context(system_u:object_r:syslogd_initrc_exec_t,s0)
28+/etc/rc\.d/init\.d/syslog\.sysklogd -- gen_context(system_u:object_r:syslogd_initrc_exec_t,s0) 29+/etc/rc\.d/init\.d/syslog\.sysklogd -- gen_context(system_u:object_r:syslogd_initrc_exec_t,s0)
29 30
30 /sbin/audispd -- gen_context(system_u:object_r:audisp_exec_t,s0)
31 /sbin/audisp-remote -- gen_context(system_u:object_r:audisp_remote_exec_t,s0)
32 /sbin/auditctl -- gen_context(system_u:object_r:auditctl_exec_t,s0)
33 /sbin/auditd -- gen_context(system_u:object_r:auditd_exec_t,s0)
34 /sbin/klogd -- gen_context(system_u:object_r:klogd_exec_t,s0)
35+/sbin/klogd\.sysklogd -- gen_context(system_u:object_r:klogd_exec_t,s0)
36 /sbin/minilogd -- gen_context(system_u:object_r:syslogd_exec_t,s0)
37 /sbin/rklogd -- gen_context(system_u:object_r:klogd_exec_t,s0)
38 /sbin/rsyslogd -- gen_context(system_u:object_r:syslogd_exec_t,s0)
39 /sbin/syslogd -- gen_context(system_u:object_r:syslogd_exec_t,s0)
40+/sbin/syslogd\.sysklogd -- gen_context(system_u:object_r:syslogd_exec_t,s0)
41 /sbin/syslog-ng -- gen_context(system_u:object_r:syslogd_exec_t,s0)
42
43 /usr/lib/systemd/system/auditd.* -- gen_context(system_u:object_r:auditd_unit_t,s0) 31 /usr/lib/systemd/system/auditd.* -- gen_context(system_u:object_r:auditd_unit_t,s0)
44 /usr/lib/systemd/system/[^/]*systemd-journal.* -- gen_context(system_u:object_r:syslogd_unit_t,s0) 32 /usr/lib/systemd/system/[^/]*systemd-journal.* -- gen_context(system_u:object_r:syslogd_unit_t,s0)
33 /usr/lib/systemd/system/rsyslog.*\.service -- gen_context(system_u:object_r:syslogd_unit_t,s0)
45 /usr/lib/systemd/systemd-journald -- gen_context(system_u:object_r:syslogd_exec_t,s0) 34 /usr/lib/systemd/systemd-journald -- gen_context(system_u:object_r:syslogd_exec_t,s0)
35@@ -15,14 +17,16 @@
36 /usr/sbin/audispd -- gen_context(system_u:object_r:audisp_exec_t,s0)
37 /usr/sbin/audisp-remote -- gen_context(system_u:object_r:audisp_remote_exec_t,s0)
38 /usr/sbin/auditctl -- gen_context(system_u:object_r:auditctl_exec_t,s0)
39 /usr/sbin/auditd -- gen_context(system_u:object_r:auditd_exec_t,s0)
40 /usr/sbin/klogd -- gen_context(system_u:object_r:klogd_exec_t,s0)
41+/usr/sbin/klogd\.sysklogd -- gen_context(system_u:object_r:klogd_exec_t,s0)
42 /usr/sbin/metalog -- gen_context(system_u:object_r:syslogd_exec_t,s0)
43 /usr/sbin/minilogd -- gen_context(system_u:object_r:syslogd_exec_t,s0)
44 /usr/sbin/rklogd -- gen_context(system_u:object_r:klogd_exec_t,s0)
45 /usr/sbin/rsyslogd -- gen_context(system_u:object_r:syslogd_exec_t,s0)
46+/usr/sbin/syslogd\.sysklogd -- gen_context(system_u:object_r:syslogd_exec_t,s0)
47 /usr/sbin/syslog-ng -- gen_context(system_u:object_r:syslogd_exec_t,s0)
48 /usr/sbin/syslogd -- gen_context(system_u:object_r:syslogd_exec_t,s0)
49
50 /var/lib/misc/syslog-ng.persist-? -- gen_context(system_u:object_r:syslogd_var_lib_t,s0)
51 /var/lib/syslog-ng(/.*)? gen_context(system_u:object_r:syslogd_var_lib_t,s0)
46--- a/policy/modules/system/logging.te 52--- a/policy/modules/system/logging.te
47+++ b/policy/modules/system/logging.te 53+++ b/policy/modules/system/logging.te
48@@ -386,10 +386,11 @@ allow syslogd_t self:unix_dgram_socket s 54@@ -390,10 +390,11 @@ allow syslogd_t self:unix_dgram_socket s
49 allow syslogd_t self:fifo_file rw_fifo_file_perms; 55 allow syslogd_t self:fifo_file rw_fifo_file_perms;
50 allow syslogd_t self:udp_socket create_socket_perms; 56 allow syslogd_t self:udp_socket create_socket_perms;
51 allow syslogd_t self:tcp_socket create_stream_socket_perms; 57 allow syslogd_t self:tcp_socket create_stream_socket_perms;
@@ -56,4 +62,4 @@ Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
56 # Create and bind to /dev/log or /var/run/log. 62 # Create and bind to /dev/log or /var/run/log.
57 allow syslogd_t devlog_t:sock_file manage_sock_file_perms; 63 allow syslogd_t devlog_t:sock_file manage_sock_file_perms;
58 files_pid_filetrans(syslogd_t, devlog_t, sock_file) 64 files_pid_filetrans(syslogd_t, devlog_t, sock_file)
59 65 init_pid_filetrans(syslogd_t, devlog_t, sock_file, "dev-log")