Skip to contentSkip to conversation

RFE: remove special RHEL-5 and -4 policies

PATCH In review Ondrej Mosnacek 1 participant 3 messages Sep 20, 2019 SELinux security module

lore
Share & tools
lore
#0 lore raw

cover RFE: remove special RHEL-5 and -4 policies

The first patch fixes a minor issue from a recent commit that breaks the task_setscheduler test on very old kernels (RHEL-5).

The second patch then removes the special policies for RHEL-5 nad RHEL-4 (see the log message for more details).

Verified that the testsuite still runs on Fedora Rawhide and a handful of RHELs after this change (RHEL-5 needs some workarounds to be applied to policy files - see the log message of patch 2).

Ondrej Mosnacek (2):
tests/task_setscheduler: fix for old kernels
policy: remove RHEL-5 and RHEL-4 special policies

 policy/Makefile                          |  55 ++++--------
 policy/redhat/4/Makefile                 |  23 -----
 policy/redhat/4/test_attrib.te           |  38 --------
 policy/redhat/4/test_capable_file.te     |  46 ----------
 policy/redhat/4/test_capable_net.te      |  30 -------
 policy/redhat/4/test_capable_sys.te      |  15 ----
 policy/redhat/4/test_dyntrace.te         |  35 --------
 policy/redhat/4/test_dyntrans.te         |  20 -----
 policy/redhat/4/test_entrypoint.te       |  17 ----
 policy/redhat/4/test_execshare.te        |  24 -----
 policy/redhat/4/test_exectrace.te        |  33 -------
 policy/redhat/4/test_execute_no_trans.te |  20 -----
 policy/redhat/4/test_fdreceive.te        |  52 -----------
 policy/redhat/4/test_file.te             |  60 -------------
 policy/redhat/4/test_global.te           |  77 ----------------
 policy/redhat/4/test_inherit.te          |  41 ---------
 policy/redhat/4/test_ioctl.te            |  25 ------
 policy/redhat/4/test_ipc.te              |  63 -------------
 policy/redhat/4/test_link.te             |  49 -----------
 policy/redhat/4/test_mkdir.te            |  38 --------
 policy/redhat/4/test_open.te             |  23 -----
 policy/redhat/4/test_ptrace.te           |  28 ------
 policy/redhat/4/test_readlink.te         |  22 -----
 policy/redhat/4/test_relabel.te          |  28 ------
 policy/redhat/4/test_rename.te           |  76 ----------------
 policy/redhat/4/test_rxdir.te            |  21 -----
 policy/redhat/4/test_setattr.te          |  21 -----
 policy/redhat/4/test_setnice.te          |  23 -----
 policy/redhat/4/test_sigkill.te          |  29 ------
 policy/redhat/4/test_socket.te           |  92 -------------------
 policy/redhat/4/test_stat.te             |  18 ----
 policy/redhat/4/test_sysctl.te           |  21 -----
 policy/redhat/4/test_task_create.te      |  39 ---------
 policy/redhat/4/test_task_getpgid.te     |  22 -----
 policy/redhat/4/test_task_getsched.te    |  22 -----
 policy/redhat/4/test_task_getsid.te      |  22 -----
 policy/redhat/4/test_task_setpgid.te     |  36 --------
 policy/redhat/4/test_task_setsched.te    |  29 ------
 policy/redhat/4/test_transition.te       |  20 -----
 policy/redhat/4/test_wait.te             |  27 ------
 policy/redhat/5/Makefile                 |  36 --------
 policy/redhat/5/test_capable_file.te     |  64 --------------
 policy/redhat/5/test_capable_net.te      |  61 -------------
 policy/redhat/5/test_capable_sys.te      |  20 -----
 policy/redhat/5/test_dyntrace.te         |  48 ----------
 policy/redhat/5/test_dyntrans.te         |  32 -------
 policy/redhat/5/test_entrypoint.te       |  21 -----
 policy/redhat/5/test_execshare.te        |  43 ---------
 policy/redhat/5/test_exectrace.te        |  51 -----------
 policy/redhat/5/test_execute_no_trans.te |  26 ------
 policy/redhat/5/test_fdreceive.te        |  65 --------------
 policy/redhat/5/test_file.te             |  98 ---------------------
 policy/redhat/5/test_global.te           |  85 ------------------
 policy/redhat/5/test_inherit.te          |  64 --------------
 policy/redhat/5/test_ioctl.te            |  44 ----------
 policy/redhat/5/test_ipc.te              |  82 -----------------
 policy/redhat/5/test_link.te             |  73 ----------------
 policy/redhat/5/test_mkdir.te            |  59 -------------
 policy/redhat/5/test_open.te             |  35 --------
 policy/redhat/5/test_ptrace.te           |  47 ----------
 policy/redhat/5/test_readlink.te         |  36 --------
 policy/redhat/5/test_relabel.te          |  44 ----------
 policy/redhat/5/test_rename.te           | 107 -----------------------
 policy/redhat/5/test_rxdir.te            |  34 -------
 policy/redhat/5/test_setattr.te          |  31 -------
 policy/redhat/5/test_setnice.te          |  52 -----------
 policy/redhat/5/test_sigkill.te          |  49 -----------
 policy/redhat/5/test_stat.te             |  31 -------
 policy/redhat/5/test_sysctl.te           |  29 ------
 policy/redhat/5/test_task_create.te      |  53 -----------
 policy/redhat/5/test_task_getpgid.te     |  31 -------
 policy/redhat/5/test_task_getsched.te    |  31 -------
 policy/redhat/5/test_task_getsid.te      |  31 -------
 policy/redhat/5/test_task_setpgid.te     |  44 ----------
 policy/redhat/5/test_task_setsched.te    |  38 --------
 policy/redhat/5/test_transition.te       |  33 -------
 policy/redhat/5/test_wait.te             |  41 ---------
 policy/test_task_setsched.te             |   1 +
 tests/task_setscheduler/test             |   2 +-
 79 files changed, 18 insertions(+), 3134 deletions(-)
 delete mode 100644 policy/redhat/4/Makefile
 delete mode 100644 policy/redhat/4/test_attrib.te
 delete mode 100644 policy/redhat/4/test_capable_file.te
 delete mode 100644 policy/redhat/4/test_capable_net.te
 delete mode 100644 policy/redhat/4/test_capable_sys.te
 delete mode 100644 policy/redhat/4/test_dyntrace.te
 delete mode 100644 policy/redhat/4/test_dyntrans.te
 delete mode 100644 policy/redhat/4/test_entrypoint.te
 delete mode 100644 policy/redhat/4/test_execshare.te
 delete mode 100644 policy/redhat/4/test_exectrace.te
 delete mode 100644 policy/redhat/4/test_execute_no_trans.te
 delete mode 100644 policy/redhat/4/test_fdreceive.te
 delete mode 100644 policy/redhat/4/test_file.te
 delete mode 100644 policy/redhat/4/test_global.te
 delete mode 100644 policy/redhat/4/test_inherit.te
 delete mode 100644 policy/redhat/4/test_ioctl.te
 delete mode 100644 policy/redhat/4/test_ipc.te
 delete mode 100644 policy/redhat/4/test_link.te
 delete mode 100644 policy/redhat/4/test_mkdir.te
 delete mode 100644 policy/redhat/4/test_open.te
 delete mode 100644 policy/redhat/4/test_ptrace.te
 delete mode 100644 policy/redhat/4/test_readlink.te
 delete mode 100644 policy/redhat/4/test_relabel.te
 delete mode 100644 policy/redhat/4/test_rename.te
 delete mode 100644 policy/redhat/4/test_rxdir.te
 delete mode 100644 policy/redhat/4/test_setattr.te
 delete mode 100644 policy/redhat/4/test_setnice.te
 delete mode 100644 policy/redhat/4/test_sigkill.te
 delete mode 100644 policy/redhat/4/test_socket.te
 delete mode 100644 policy/redhat/4/test_stat.te
 delete mode 100644 policy/redhat/4/test_sysctl.te
 delete mode 100644 policy/redhat/4/test_task_create.te
 delete mode 100644 policy/redhat/4/test_task_getpgid.te
 delete mode 100644 policy/redhat/4/test_task_getsched.te
 delete mode 100644 policy/redhat/4/test_task_getsid.te
 delete mode 100644 policy/redhat/4/test_task_setpgid.te
 delete mode 100644 policy/redhat/4/test_task_setsched.te
 delete mode 100644 policy/redhat/4/test_transition.te
 delete mode 100644 policy/redhat/4/test_wait.te
 delete mode 100644 policy/redhat/5/Makefile
 delete mode 100644 policy/redhat/5/test_capable_file.te
 delete mode 100644 policy/redhat/5/test_capable_net.te
 delete mode 100644 policy/redhat/5/test_capable_sys.te
 delete mode 100644 policy/redhat/5/test_dyntrace.te
 delete mode 100644 policy/redhat/5/test_dyntrans.te
 delete mode 100644 policy/redhat/5/test_entrypoint.te
 delete mode 100644 policy/redhat/5/test_execshare.te
 delete mode 100644 policy/redhat/5/test_exectrace.te
 delete mode 100644 policy/redhat/5/test_execute_no_trans.te
 delete mode 100644 policy/redhat/5/test_fdreceive.te
 delete mode 100644 policy/redhat/5/test_file.te
 delete mode 100644 policy/redhat/5/test_global.te
 delete mode 100644 policy/redhat/5/test_inherit.te
 delete mode 100644 policy/redhat/5/test_ioctl.te
 delete mode 100644 policy/redhat/5/test_ipc.te
 delete mode 100644 policy/redhat/5/test_link.te
 delete mode 100644 policy/redhat/5/test_mkdir.te
 delete mode 100644 policy/redhat/5/test_open.te
 delete mode 100644 policy/redhat/5/test_ptrace.te
 delete mode 100644 policy/redhat/5/test_readlink.te
 delete mode 100644 policy/redhat/5/test_relabel.te
 delete mode 100644 policy/redhat/5/test_rename.te
 delete mode 100644 policy/redhat/5/test_rxdir.te
 delete mode 100644 policy/redhat/5/test_setattr.te
 delete mode 100644 policy/redhat/5/test_setnice.te
 delete mode 100644 policy/redhat/5/test_sigkill.te
 delete mode 100644 policy/redhat/5/test_stat.te
 delete mode 100644 policy/redhat/5/test_sysctl.te
 delete mode 100644 policy/redhat/5/test_task_create.te
 delete mode 100644 policy/redhat/5/test_task_getpgid.te
 delete mode 100644 policy/redhat/5/test_task_getsched.te
 delete mode 100644 policy/redhat/5/test_task_getsid.te
 delete mode 100644 policy/redhat/5/test_task_setpgid.te
 delete mode 100644 policy/redhat/5/test_task_setsched.te
 delete mode 100644 policy/redhat/5/test_transition.te
 delete mode 100644 policy/redhat/5/test_wait.te
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/2 tests/task_setscheduler: fix for old kernels

On some old kernels (e.g. RHEL-5) the setscheduler test hangs the system after commit 26a3b59d5f5a ("selinux-testsuite: fix potential races when starting bg programs"). The issue seems to be that the new 'target' program does a busy loop, whereas the old one did sleep() in a loop.

Fix this by sleeping inside the loop as before. Note that the policy needs to be updated to allow running the sleep command from a test_setsched_target_t process.

Fixes 26a3b59d5f5a ("selinux-testsuite: fix potential races when starting bg programs")
---
 policy/test_task_setsched.te | 1 +
 tests/task_setscheduler/test | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
policy/test_task_setsched.te +1 -0
index 32569b7..794de65 100644
@@ -11,6 +11,7 @@ type test_setsched_target_t;
 domain_type(test_setsched_target_t)
 unconfined_runs_test(test_setsched_target_t)
 corecmd_shell_entry_type(test_setsched_target_t)
+corecmd_exec_bin(test_setsched_target_t)
 typeattribute test_setsched_target_t test_setsched_d;
 typeattribute test_setsched_target_t testdomain;
 
tests/task_setscheduler/test +1 -1
index 9e712a8..fa7d9cb 100755
@@ -10,7 +10,7 @@ $basedir =~ s|(.*)/[^/]*|$1|;
 system("mkfifo $basedir/flag");
 if ( ( $pid = fork() ) == 0 ) {
     exec
-"runcon -t test_setsched_target_t sh -c 'echo >$basedir/flag; while :; do :; done'";
+"runcon -t test_setsched_target_t sh -c 'echo >$basedir/flag; while :; do sleep 1; done'";
 }
 
 # Wait for it to start.
Signature · 1 line
2.21.0
#2 lore raw
In reply to Ondrej Mosnacek
Quoted 5 lines · Ondrej Mosnacek

The first patch fixes a minor issue from a recent commit that breaks the task_setscheduler test on very old kernels (RHEL-5).

The second patch then removes the special policies for RHEL-5 nad RHEL-4 (see the log message for more details).

Looks like the second patch didn't make it to the mailing list... probably because it is too big removing so many lines.

Please refer to the corresponding GH pull request for full patches:
https://github.com/SELinuxProject/selinux-testsuite/pull/66

Quoted 169 lines

Verified that the testsuite still runs on Fedora Rawhide and a handful of RHELs after this change (RHEL-5 needs some workarounds to be applied to policy files - see the log message of patch 2).

Ondrej Mosnacek (2):
tests/task_setscheduler: fix for old kernels
policy: remove RHEL-5 and RHEL-4 special policies

 policy/Makefile                          |  55 ++++--------
 policy/redhat/4/Makefile                 |  23 -----
 policy/redhat/4/test_attrib.te           |  38 --------
 policy/redhat/4/test_capable_file.te     |  46 ----------
 policy/redhat/4/test_capable_net.te      |  30 -------
 policy/redhat/4/test_capable_sys.te      |  15 ----
 policy/redhat/4/test_dyntrace.te         |  35 --------
 policy/redhat/4/test_dyntrans.te         |  20 -----
 policy/redhat/4/test_entrypoint.te       |  17 ----
 policy/redhat/4/test_execshare.te        |  24 -----
 policy/redhat/4/test_exectrace.te        |  33 -------
 policy/redhat/4/test_execute_no_trans.te |  20 -----
 policy/redhat/4/test_fdreceive.te        |  52 -----------
 policy/redhat/4/test_file.te             |  60 -------------
 policy/redhat/4/test_global.te           |  77 ----------------
 policy/redhat/4/test_inherit.te          |  41 ---------
 policy/redhat/4/test_ioctl.te            |  25 ------
 policy/redhat/4/test_ipc.te              |  63 -------------
 policy/redhat/4/test_link.te             |  49 -----------
 policy/redhat/4/test_mkdir.te            |  38 --------
 policy/redhat/4/test_open.te             |  23 -----
 policy/redhat/4/test_ptrace.te           |  28 ------
 policy/redhat/4/test_readlink.te         |  22 -----
 policy/redhat/4/test_relabel.te          |  28 ------
 policy/redhat/4/test_rename.te           |  76 ----------------
 policy/redhat/4/test_rxdir.te            |  21 -----
 policy/redhat/4/test_setattr.te          |  21 -----
 policy/redhat/4/test_setnice.te          |  23 -----
 policy/redhat/4/test_sigkill.te          |  29 ------
 policy/redhat/4/test_socket.te           |  92 -------------------
 policy/redhat/4/test_stat.te             |  18 ----
 policy/redhat/4/test_sysctl.te           |  21 -----
 policy/redhat/4/test_task_create.te      |  39 ---------
 policy/redhat/4/test_task_getpgid.te     |  22 -----
 policy/redhat/4/test_task_getsched.te    |  22 -----
 policy/redhat/4/test_task_getsid.te      |  22 -----
 policy/redhat/4/test_task_setpgid.te     |  36 --------
 policy/redhat/4/test_task_setsched.te    |  29 ------
 policy/redhat/4/test_transition.te       |  20 -----
 policy/redhat/4/test_wait.te             |  27 ------
 policy/redhat/5/Makefile                 |  36 --------
 policy/redhat/5/test_capable_file.te     |  64 --------------
 policy/redhat/5/test_capable_net.te      |  61 -------------
 policy/redhat/5/test_capable_sys.te      |  20 -----
 policy/redhat/5/test_dyntrace.te         |  48 ----------
 policy/redhat/5/test_dyntrans.te         |  32 -------
 policy/redhat/5/test_entrypoint.te       |  21 -----
 policy/redhat/5/test_execshare.te        |  43 ---------
 policy/redhat/5/test_exectrace.te        |  51 -----------
 policy/redhat/5/test_execute_no_trans.te |  26 ------
 policy/redhat/5/test_fdreceive.te        |  65 --------------
 policy/redhat/5/test_file.te             |  98 ---------------------
 policy/redhat/5/test_global.te           |  85 ------------------
 policy/redhat/5/test_inherit.te          |  64 --------------
 policy/redhat/5/test_ioctl.te            |  44 ----------
 policy/redhat/5/test_ipc.te              |  82 -----------------
 policy/redhat/5/test_link.te             |  73 ----------------
 policy/redhat/5/test_mkdir.te            |  59 -------------
 policy/redhat/5/test_open.te             |  35 --------
 policy/redhat/5/test_ptrace.te           |  47 ----------
 policy/redhat/5/test_readlink.te         |  36 --------
 policy/redhat/5/test_relabel.te          |  44 ----------
 policy/redhat/5/test_rename.te           | 107 -----------------------
 policy/redhat/5/test_rxdir.te            |  34 -------
 policy/redhat/5/test_setattr.te          |  31 -------
 policy/redhat/5/test_setnice.te          |  52 -----------
 policy/redhat/5/test_sigkill.te          |  49 -----------
 policy/redhat/5/test_stat.te             |  31 -------
 policy/redhat/5/test_sysctl.te           |  29 ------
 policy/redhat/5/test_task_create.te      |  53 -----------
 policy/redhat/5/test_task_getpgid.te     |  31 -------
 policy/redhat/5/test_task_getsched.te    |  31 -------
 policy/redhat/5/test_task_getsid.te      |  31 -------
 policy/redhat/5/test_task_setpgid.te     |  44 ----------
 policy/redhat/5/test_task_setsched.te    |  38 --------
 policy/redhat/5/test_transition.te       |  33 -------
 policy/redhat/5/test_wait.te             |  41 ---------
 policy/test_task_setsched.te             |   1 +
 tests/task_setscheduler/test             |   2 +-
 79 files changed, 18 insertions(+), 3134 deletions(-)
 delete mode 100644 policy/redhat/4/Makefile
 delete mode 100644 policy/redhat/4/test_attrib.te
 delete mode 100644 policy/redhat/4/test_capable_file.te
 delete mode 100644 policy/redhat/4/test_capable_net.te
 delete mode 100644 policy/redhat/4/test_capable_sys.te
 delete mode 100644 policy/redhat/4/test_dyntrace.te
 delete mode 100644 policy/redhat/4/test_dyntrans.te
 delete mode 100644 policy/redhat/4/test_entrypoint.te
 delete mode 100644 policy/redhat/4/test_execshare.te
 delete mode 100644 policy/redhat/4/test_exectrace.te
 delete mode 100644 policy/redhat/4/test_execute_no_trans.te
 delete mode 100644 policy/redhat/4/test_fdreceive.te
 delete mode 100644 policy/redhat/4/test_file.te
 delete mode 100644 policy/redhat/4/test_global.te
 delete mode 100644 policy/redhat/4/test_inherit.te
 delete mode 100644 policy/redhat/4/test_ioctl.te
 delete mode 100644 policy/redhat/4/test_ipc.te
 delete mode 100644 policy/redhat/4/test_link.te
 delete mode 100644 policy/redhat/4/test_mkdir.te
 delete mode 100644 policy/redhat/4/test_open.te
 delete mode 100644 policy/redhat/4/test_ptrace.te
 delete mode 100644 policy/redhat/4/test_readlink.te
 delete mode 100644 policy/redhat/4/test_relabel.te
 delete mode 100644 policy/redhat/4/test_rename.te
 delete mode 100644 policy/redhat/4/test_rxdir.te
 delete mode 100644 policy/redhat/4/test_setattr.te
 delete mode 100644 policy/redhat/4/test_setnice.te
 delete mode 100644 policy/redhat/4/test_sigkill.te
 delete mode 100644 policy/redhat/4/test_socket.te
 delete mode 100644 policy/redhat/4/test_stat.te
 delete mode 100644 policy/redhat/4/test_sysctl.te
 delete mode 100644 policy/redhat/4/test_task_create.te
 delete mode 100644 policy/redhat/4/test_task_getpgid.te
 delete mode 100644 policy/redhat/4/test_task_getsched.te
 delete mode 100644 policy/redhat/4/test_task_getsid.te
 delete mode 100644 policy/redhat/4/test_task_setpgid.te
 delete mode 100644 policy/redhat/4/test_task_setsched.te
 delete mode 100644 policy/redhat/4/test_transition.te
 delete mode 100644 policy/redhat/4/test_wait.te
 delete mode 100644 policy/redhat/5/Makefile
 delete mode 100644 policy/redhat/5/test_capable_file.te
 delete mode 100644 policy/redhat/5/test_capable_net.te
 delete mode 100644 policy/redhat/5/test_capable_sys.te
 delete mode 100644 policy/redhat/5/test_dyntrace.te
 delete mode 100644 policy/redhat/5/test_dyntrans.te
 delete mode 100644 policy/redhat/5/test_entrypoint.te
 delete mode 100644 policy/redhat/5/test_execshare.te
 delete mode 100644 policy/redhat/5/test_exectrace.te
 delete mode 100644 policy/redhat/5/test_execute_no_trans.te
 delete mode 100644 policy/redhat/5/test_fdreceive.te
 delete mode 100644 policy/redhat/5/test_file.te
 delete mode 100644 policy/redhat/5/test_global.te
 delete mode 100644 policy/redhat/5/test_inherit.te
 delete mode 100644 policy/redhat/5/test_ioctl.te
 delete mode 100644 policy/redhat/5/test_ipc.te
 delete mode 100644 policy/redhat/5/test_link.te
 delete mode 100644 policy/redhat/5/test_mkdir.te
 delete mode 100644 policy/redhat/5/test_open.te
 delete mode 100644 policy/redhat/5/test_ptrace.te
 delete mode 100644 policy/redhat/5/test_readlink.te
 delete mode 100644 policy/redhat/5/test_relabel.te
 delete mode 100644 policy/redhat/5/test_rename.te
 delete mode 100644 policy/redhat/5/test_rxdir.te
 delete mode 100644 policy/redhat/5/test_setattr.te
 delete mode 100644 policy/redhat/5/test_setnice.te
 delete mode 100644 policy/redhat/5/test_sigkill.te
 delete mode 100644 policy/redhat/5/test_stat.te
 delete mode 100644 policy/redhat/5/test_sysctl.te
 delete mode 100644 policy/redhat/5/test_task_create.te
 delete mode 100644 policy/redhat/5/test_task_getpgid.te
 delete mode 100644 policy/redhat/5/test_task_getsched.te
 delete mode 100644 policy/redhat/5/test_task_getsid.te
 delete mode 100644 policy/redhat/5/test_task_setpgid.te
 delete mode 100644 policy/redhat/5/test_task_setsched.te
 delete mode 100644 policy/redhat/5/test_transition.te
 delete mode 100644 policy/redhat/5/test_wait.te

--
2.21.0

Signature · 3 lines
Ondrej Mosnacek <omosnace at redhat dot com>
Software Engineer, Security Technologies
Red Hat, Inc.