[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: Bump upstream commit

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: Bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 3915ebfb3dbcdc9a0f12c8ab146fd18f0c39caaf
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2021-03-04T12:39:46+01:00
            Stats  : +1/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/3915ebfb3dbcdc9a0f12c8ab146fd18f0c39caaf?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: Bump upstream commit

Highlights:
- fixed lockdown and perf_event tests to work with latest Fedora policy
- userfaultfd test added
- removed dependency on `which`

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index a3ca98f..c373309 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,7 +35,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="24bb5c0090710767ff187f1682e5bf355166caa3"
+DEFAULT_COMMIT="9ef6c43a3ffa810c9a0061eb4625980dd178f60a"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.
@@ -180,7 +180,6 @@ rlJournalStart
             rdma-core-devel
             selinux-policy-devel
             setools-console
-            which
             xfsprogs-devel
         "
         rlRun "installDeps \$REQUIRES" 0 "Install requires"

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: Bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : d85b0bfed91c8d4ddfae36e2dbfc90cc0b775eff
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2021-04-08T12:02:58+02:00
            Stats  : +1/-6 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/d85b0bfed91c8d4ddfae36e2dbfc90cc0b775eff?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: Bump upstream commit

...to pull in two fixes for the userfaultfd test so it builds
sucessfully on RHEL-7 and remove the associated workaround from the
wrapper.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 51dbadc..75fefce 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,7 +35,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="9ef6c43a3ffa810c9a0061eb4625980dd178f60a"
+DEFAULT_COMMIT="1defa850ae71bc27c9dd101d19f543a42abc9537"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.
@@ -375,11 +375,6 @@ rlJournalStart
                 rlRun "sed -i 's/SCTP_SEND_FAILED_EVENT/SCTP_STREAM_CHANGE_EVENT + 1/g' tests/sctp/*.c" 0 \
                     "Fix SCTP test compilation on old RHEL kernels"
             fi
-            if kver_lt 5.12; then
-                # __NR_userfaultfd not defined in s390x headers on RHEL-7
-                # For now just disable it on kernels without the feature.
-                exclude_tests+=" userfaultfd"
-            fi
             # CONFIG_KEYS_DH_COMPUTE not enabled on RHEL-8 :(
             exclude_tests+=" keys"
 

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: Bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : d96170f11041959cd7f35e6dfd8ffa6fc6fbbd9a
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2021-04-28T16:36:06+02:00
            Stats  : +1/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/d96170f11041959cd7f35e6dfd8ffa6fc6fbbd9a?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: Bump upstream commit

This pulls in a fix to account for the following kernel commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.12&id=db2e718a47984b9d71ed890eb2ea36ecf150de18

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 75fefce..140d4c8 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,7 +35,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="1defa850ae71bc27c9dd101d19f543a42abc9537"
+DEFAULT_COMMIT="fd4254f09316f6db0410a9187cb8866571f109b5"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: Bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : f6ee2087e8f1a98ef0920a72f3e1545fc19cee5a
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2021-05-04T10:36:41+02:00
            Stats  : +1/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/f6ee2087e8f1a98ef0920a72f3e1545fc19cee5a?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: Bump upstream commit

This pulls in two fixes for running on the latest v5.13 kernels.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 140d4c8..825855a 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,7 +35,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="fd4254f09316f6db0410a9187cb8866571f109b5"
+DEFAULT_COMMIT="58eaa31c9e0e0a0567990336ae355b4cd309e6e3"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 25396ff474ed6d4862d162ddddd61befba89bf51
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2021-09-06T13:06:46+02:00
            Stats  : +2/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/25396ff474ed6d4862d162ddddd61befba89bf51?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: bump upstream commit

This adds a new VSOCK test and drops an already merged bugfix.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 24a9c3c..a86e669 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,13 +35,13 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="58eaa31c9e0e0a0567990336ae355b4cd309e6e3"
+DEFAULT_COMMIT="4ed5d11312d673203d93dafbcdad441c3afc36f9"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.
 DEFAULT_PULLS=""
 # Default SELinux Patchwork series to apply before running the test.
-DEFAULT_PATCHES="526253"
+DEFAULT_PATCHES=""
 
 # Optional test parameter - location of testuite git.
 GIT_URL=${GIT_URL:-"git://github.com/SELinuxProject/selinux-testsuite"}

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : b0f7063a8d1044ee7c47e5befe9c5ce7399f91a9
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2021-10-27T13:52:48+02:00
            Stats  : +1/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/b0f7063a8d1044ee7c47e5befe9c5ce7399f91a9?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: bump upstream commit

Pull in a fix that allows the testsuite to succeed on kernels with
CONFIG_IP_TABLES=n (e.g. Fedora ELN kernels; future RHEL 10+ kernels).

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 583276f..4bf8617 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,7 +35,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="bba37c007a0c7a12dd603bdac5e4431796f3e2e1"
+DEFAULT_COMMIT="b2d0f3c5f946e58e3e6f8f1fff81d8435b005f92"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : fff6691dcdb5cb38ef30fb86e83ad7ee8c716957
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2022-04-20T17:07:44+02:00
            Stats  : +17/-20 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/fff6691dcdb5cb38ef30fb86e83ad7ee8c716957?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: bump upstream commit

...and remove some workarounds that are no longer needed. Also add code
to enable/disable SCTP client peeloff tests based on where SCTP client
peeloff is currently fixed in RHEL.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 184cc68..3ac3078 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,7 +35,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="b2d0f3c5f946e58e3e6f8f1fff81d8435b005f92"
+DEFAULT_COMMIT="b11701a55614eeb20e85fee9829d1699cc13c39a"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.
@@ -304,7 +304,7 @@ rlJournalStart
         exclude_tests=""
         force_tests=""
         for file in ./tests/nnp*/execnnp.c; do
-            rlRun "sed -i 's/3.18/3.9/' $file" 0 \
+            rlRun "sed -i 's/3\.18/3.9/' $file" 0 \
                 "Fix up kernel version in nnp test"
         done
         if rlIsRHEL "<8.2"; then
@@ -376,6 +376,21 @@ rlJournalStart
                 # a17f0671017f selinux: vsock: Set SID for socket returned by accept()
                 exclude_tests+=" vsock_socket"
             fi
+
+            sctp_client_peeloff=0
+            if kver_ge 4.18.0-305.39.1 && kver_lt 4.18.0-306; then
+                sctp_client_peeloff=1
+            fi
+            if kver_ge 4.18.0-348.19.1 && kver_lt 4.18.0-349; then
+                sctp_client_peeloff=1
+            fi
+            if kver_ge 4.18.0-372.1.1 && kver_lt 5.14; then
+                sctp_client_peeloff=1
+            fi
+            if [ "$sctp_client_peeloff" -eq 1 ]; then
+                rlRun "sed -i 's/5\.18/4.18/g' tests/sctp/test" 0 \
+                    "Fix up kernel version in sctp test"
+            fi
         fi
 
         # CKI mainline kernels don't ship with module build infrastructure
@@ -403,24 +418,6 @@ rlJournalStart
                 "Force applicable tests: $force_tests"
         fi
 
-        if ! modprobe sctp 2>/dev/null; then
-            script1='s/runcon -t test_sctp_socket_t/true/g'
-            script2='s/runcon -t test_no_sctp_socket_t/false/g'
-            rlRun "sed -i -e '$script1' -e '$script2' ./tests/extended_socket_class/test" 0 \
-                "No SCTP support => fix up extended_socket_class test"
-        fi
-
-        # on aarch64 and s390x the kernel support for Bluetooth is turned
-        # off so we disable the Bluetooth socket tests there
-        case "$(rlGetPrimaryArch)" in
-            aarch64|s390x)
-                script1='s/runcon -t test_bluetooth_socket_t/true/g'
-                script2='s/runcon -t test_no_bluetooth_socket_t/false/g'
-                rlRun "sed -i -e '$script1' -e '$script2' ./tests/extended_socket_class/test" 0 \
-                    "No Bluetooth support => fix up extended_socket_class test"
-                ;;
-        esac
-
         # Initialize report.
         rlRun "echo 'Remote: $GIT_URL' >results.log" 0
         rlRun "echo 'Branch: $GIT_BRANCH' >>results.log" 0

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 66bf874becc32987607e863a7ff592e98442730f
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2022-06-08T09:27:31+00:00
            Stats  : +2/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/66bf874becc32987607e863a7ff592e98442730f?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: bump upstream commit

The only effective difference is that the broken SCTP ASCONF tests will
now be skipped, see:
https://github.com/SELinuxProject/selinux-testsuite/commit/3e93ece73da162fe58f9ec7d16b01915a4568c11

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 496b11c..af2f1f1 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,13 +35,13 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="b11701a55614eeb20e85fee9829d1699cc13c39a"
+DEFAULT_COMMIT="3e93ece73da162fe58f9ec7d16b01915a4568c11"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.
 DEFAULT_PULLS=""
 # Default SELinux Patchwork series to apply before running the test.
-DEFAULT_PATCHES="634066"
+DEFAULT_PATCHES=""
 
 # Optional test parameter - location of testuite git.
 GIT_URL=${GIT_URL:-"https://github.com/SELinuxProject/selinux-testsuite"}

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 96c98bb01dc740efdec6cdb91c81d3f5cc14ea8f
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2022-12-12T16:19:39+01:00
            Stats  : +1/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/96c98bb01dc740efdec6cdb91c81d3f5cc14ea8f?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: bump upstream commit

Effective changes:
- fix the policy to allow the new user_namespace::create permission
  where needed
- fix the code to build without warnings with latest SELinux userspace

The rest is various cleanups or changes not affecting Fedora/RHEL.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index ae535fb..9114201 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,7 +35,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="c592d7f49e5e8ca907d90cb1d6f54bb0d410d442"
+DEFAULT_COMMIT="3389abeaa3bb6fdf23a0f2d8b1550fae69f9c52e"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.

[tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: bump upstream commit

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : a4390a7a1e87eb9600d504d1badda216eaf6af31
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2023-03-06T14:31:52+01:00
            Stats  : +7/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/a4390a7a1e87eb9600d504d1badda216eaf6af31?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: bump upstream commit

Notable changes:
- fixed DH prime format in 'keys' test
- native quota support now used for ext4 when available
  - needs special exception on RHEL-7 where it is broken
- fixed stderr noise from 'yes' command
- fixed SIGIO tests to work under CONFIG_LEGACY_TIOCSTI=n

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 9114201..8e785ab 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -35,7 +35,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="3389abeaa3bb6fdf23a0f2d8b1550fae69f9c52e"
+DEFAULT_COMMIT="5fc5dc9f5964aae3a6dce57178b25ddc49d21415"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.
@@ -347,6 +347,12 @@ rlJournalStart
                 rlRun "cat >>policy/test_mmap.te <<<'allow_map(test_no_execmem_t, tmpfs_t, file)'"
             fi
 
+            # work around non-functional ext4 native quota support on
+            # RHEL-7
+            if kver_lt 4.18; then
+                rlRun "sed -i 's/3.6/4.18/g' tests/{fs_,}filesystem/test"
+            fi
+
             if kver_ge 4.18; then
                 force_tests+=" sctp"
             fi