From b707711f3ca1293bc7e8e8cf9dda046df64d003e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 30 Jul 2021 04:20:55 +0000 Subject: [PATCH] import policycoreutils-2.9-15.el8 --- ...setfiles-do-not-restrict-checks-agai.patch | 69 +++++++++++++++++++ SPECS/policycoreutils.spec | 6 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0040-policycoreutils-setfiles-do-not-restrict-checks-agai.patch diff --git a/SOURCES/0040-policycoreutils-setfiles-do-not-restrict-checks-agai.patch b/SOURCES/0040-policycoreutils-setfiles-do-not-restrict-checks-agai.patch new file mode 100644 index 0000000..3f7a839 --- /dev/null +++ b/SOURCES/0040-policycoreutils-setfiles-do-not-restrict-checks-agai.patch @@ -0,0 +1,69 @@ +From d10e773c014a12b17fefd9caef0bd02528d75d18 Mon Sep 17 00:00:00 2001 +From: Antoine Tenart +Date: Tue, 7 Jul 2020 16:35:01 +0200 +Subject: [PATCH] policycoreutils: setfiles: do not restrict checks against a + binary policy + +The -c option allows to check the validity of contexts against a +specified binary policy. Its use is restricted: no pathname can be used +when a binary policy is given to setfiles. It's not clear if this is +intentional as the built-in help and the man page are not stating the +same thing about this (the man page document -c as a normal option, +while the built-in help shows it is restricted). + +When generating full system images later used with SELinux in enforcing +mode, the extended attributed of files have to be set by the build +machine. The issue is setfiles always checks the contexts against a +policy (ctx_validate = 1) and using an external binary policy is not +currently possible when using a pathname. This ends up in setfiles +failing early as the contexts of the target image are not always +compatible with the ones of the build machine. + +This patch reworks a check on optind only made when -c is used, that +enforced the use of a single argument to allow 1+ arguments, allowing to +use setfiles with an external binary policy and pathnames. The following +command is then allowed, as already documented in the man page: + + $ setfiles -m -r target/ -c policy.32 file_contexts target/ + +Signed-off-by: Antoine Tenart +Acked-by: Stephen Smalley + +(cherry-picked from SElinuxProject + commit: c94e542c98da2f26863c1cbd9d7ad9bc5cca6aff ) +--- + policycoreutils/setfiles/setfiles.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c +index 82d0aaa7..4fd3d756 100644 +--- a/policycoreutils/setfiles/setfiles.c ++++ b/policycoreutils/setfiles/setfiles.c +@@ -39,11 +39,10 @@ static __attribute__((__noreturn__)) void usage(const char *const name) + name, name); + } else { + fprintf(stderr, +- "usage: %s [-diIDlmnpqvFW] [-e excludedir] [-r alt_root_path] spec_file pathname...\n" +- "usage: %s [-diIDlmnpqvFW] [-e excludedir] [-r alt_root_path] spec_file -f filename\n" +- "usage: %s -s [-diIDlmnpqvFW] spec_file\n" +- "usage: %s -c policyfile spec_file\n", +- name, name, name, name); ++ "usage: %s [-diIDlmnpqvEFW] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file pathname...\n" ++ "usage: %s [-diIDlmnpqvEFW] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file -f filename\n" ++ "usage: %s -s [-diIDlmnpqvFW] spec_file\n", ++ name, name, name); + } + exit(-1); + } +@@ -376,7 +375,7 @@ int main(int argc, char **argv) + + if (!iamrestorecon) { + if (policyfile) { +- if (optind != (argc - 1)) ++ if (optind > (argc - 1)) + usage(argv[0]); + } else if (use_input_file) { + if (optind != (argc - 1)) { +-- +2.30.2 + diff --git a/SPECS/policycoreutils.spec b/SPECS/policycoreutils.spec index 06896f4..7d87076 100644 --- a/SPECS/policycoreutils.spec +++ b/SPECS/policycoreutils.spec @@ -12,7 +12,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.9 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 # https://github.com/SELinuxProject/selinux/wiki/Releases Source0: https://github.com/SELinuxProject/selinux/releases/download/20190315/policycoreutils-2.9.tar.gz @@ -77,6 +77,7 @@ Patch0036: 0036-setfiles-Do-not-abort-on-labeling-error.patch Patch0037: 0037-setfiles-drop-ABORT_ON_ERRORS-and-related-code.patch Patch0038: 0038-policycoreutils-setfiles-Drop-unused-nerr-variable.patch Patch0039: 0039-selinux-8-5-Describe-fcontext-regular-expressions.patch +Patch0040: 0040-policycoreutils-setfiles-do-not-restrict-checks-agai.patch Obsoletes: policycoreutils < 2.0.61-2 Conflicts: filesystem < 3, selinux-policy-base < 3.13.1-138 @@ -516,6 +517,9 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Mon Jul 19 2021 Vit Mojzis - 2.9-15 +- setfiles: do not restrict checks against a binary policy (#1973754) + * Tue Mar 09 2021 Vit Mojzis - 2.9-14 - Update translations (#1899695)