From e8df704cf9b5e9e517317b8912377c0a8ca0d11e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 19 Jun 2024 00:09:54 +0100 Subject: gentoo auto-resync : 19:06:2024 - 00:09:54 --- sys-apps/Manifest.gz | Bin 51182 -> 51184 bytes sys-apps/systemd/Manifest | 1 - .../systemd/files/systemd-254.9-fchmodat2.patch | 255 --------------------- 3 files changed, 256 deletions(-) delete mode 100644 sys-apps/systemd/files/systemd-254.9-fchmodat2.patch (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 945f3483368b..24d5e34b9e41 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index c2da2cd4d009..0c6ccdda947d 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -5,7 +5,6 @@ AUX gentoo-journald-audit-r1.patch 1941 BLAKE2B 93f1a0ba8dd575359e5ab4bd04f99ed3 AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da64fdea0531eadfe97ac8bc4e63b44404dcf89940d438de6b7081158b78639945ce0fadbb103c SHA512 f74f05991102b644dee7822a80cb8e6c14cd1eb48bd9342bc662d5947b9f04d32e875d2a5e6476a67bdbface4d2b2159b99c11d72eb4658c5cb4caf595f138be AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 AUX systemd-253-initrd-generators.patch 1486 BLAKE2B 85a7f714aa1743bd88e01b45624dc4104e4d762732745d9958019063f6ac91ffd89ae84e03f728e6040a58643f253a5ea7f77f44ef71620e686e23aed61876e4 SHA512 f8aab9f4bbf5a73c52144013fd7001dc78974211f11abb58a0f5eceff59b3ebf670409846fff854daec10219074602674176730f85583db0e81275289e89c66b -AUX systemd-254.9-fchmodat2.patch 9696 BLAKE2B d3e3dbf5af966742c18d6710efc75f13b21e703daa256c37c8d7a2f8ec4247f67687647eb34f38675dbba3e2a9ddd6606a3ca599688d0c2115bf29406521c4b3 SHA512 b28ff60cf0eb3fb58ff26b120721efa39537d0dc10e162ac07cb415db25c98eca98103f833bffcb1b98d4cefb44af8e433c69280b88d1bcd1209944e78ce5c6c AUX systemd-test-process-util.patch 1077 BLAKE2B 0f01ea7641366cdb01a9e310d326ea73052dd0e6fe8b4217e45d0632aa2af3f2ee33b8a8f6dfe70c3b4e3f240f0e2c738a6c4d28f6f38d9e36c4f408b2ac0202 SHA512 ca23effa72da5875ec6ee112e25db51229bf1a03b61053ce4bf2b81becceb31456c137ce9f0fa05071fe1bfc2fe705fa6b885df88d9fe093fc87970936feb071 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781 DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70 diff --git a/sys-apps/systemd/files/systemd-254.9-fchmodat2.patch b/sys-apps/systemd/files/systemd-254.9-fchmodat2.patch deleted file mode 100644 index 27bdd121aa60..000000000000 --- a/sys-apps/systemd/files/systemd-254.9-fchmodat2.patch +++ /dev/null @@ -1,255 +0,0 @@ -From 3d93b69fa558b33f1f2b52305fa4c2d836789394 Mon Sep 17 00:00:00 2001 -From: Arseny Maslennikov -Date: Sun, 15 Oct 2023 11:00:00 +0300 -Subject: [PATCH 1/3] basic/missing_syscall: generate defs for `fchmodat2(2)` - -We will need this to set seccomp filters on this system call regardless -of libseccomp or kernel support. - -(cherry picked from commit 3677364cc3a2c5429380cfd3a2472e2da87925c4) ---- - src/basic/missing_syscall_def.h | 68 +++++++++++++++++++++++++++++++++ - src/basic/missing_syscalls.py | 1 + - 2 files changed, 69 insertions(+) - -diff --git a/src/basic/missing_syscall_def.h b/src/basic/missing_syscall_def.h -index 402fdd00dc..b5beb434db 100644 ---- a/src/basic/missing_syscall_def.h -+++ b/src/basic/missing_syscall_def.h -@@ -246,6 +246,74 @@ assert_cc(__NR_copy_file_range == systemd_NR_copy_file_range); - # endif - #endif - -+#ifndef __IGNORE_fchmodat2 -+# if defined(__aarch64__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__alpha__) -+# define systemd_NR_fchmodat2 562 -+# elif defined(__arc__) || defined(__tilegx__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__arm__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__i386__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__ia64__) -+# define systemd_NR_fchmodat2 1476 -+# elif defined(__loongarch_lp64) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__m68k__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(_MIPS_SIM) -+# if _MIPS_SIM == _MIPS_SIM_ABI32 -+# define systemd_NR_fchmodat2 4452 -+# elif _MIPS_SIM == _MIPS_SIM_NABI32 -+# define systemd_NR_fchmodat2 6452 -+# elif _MIPS_SIM == _MIPS_SIM_ABI64 -+# define systemd_NR_fchmodat2 5452 -+# else -+# error "Unknown MIPS ABI" -+# endif -+# elif defined(__hppa__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__powerpc__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__riscv) -+# if __riscv_xlen == 32 -+# define systemd_NR_fchmodat2 452 -+# elif __riscv_xlen == 64 -+# define systemd_NR_fchmodat2 452 -+# else -+# error "Unknown RISC-V ABI" -+# endif -+# elif defined(__s390__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__sparc__) -+# define systemd_NR_fchmodat2 452 -+# elif defined(__x86_64__) -+# if defined(__ILP32__) -+# define systemd_NR_fchmodat2 (452 | /* __X32_SYSCALL_BIT */ 0x40000000) -+# else -+# define systemd_NR_fchmodat2 452 -+# endif -+# elif !defined(missing_arch_template) -+# warning "fchmodat2() syscall number is unknown for your architecture" -+# endif -+ -+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */ -+# if defined __NR_fchmodat2 && __NR_fchmodat2 >= 0 -+# if defined systemd_NR_fchmodat2 -+assert_cc(__NR_fchmodat2 == systemd_NR_fchmodat2); -+# endif -+# else -+# if defined __NR_fchmodat2 -+# undef __NR_fchmodat2 -+# endif -+# if defined systemd_NR_fchmodat2 && systemd_NR_fchmodat2 >= 0 -+# define __NR_fchmodat2 systemd_NR_fchmodat2 -+# endif -+# endif -+#endif -+ - #ifndef __IGNORE_getrandom - # if defined(__aarch64__) - # define systemd_NR_getrandom 278 -diff --git a/src/basic/missing_syscalls.py b/src/basic/missing_syscalls.py -index 5ccf02adec..00f72dc7a8 100644 ---- a/src/basic/missing_syscalls.py -+++ b/src/basic/missing_syscalls.py -@@ -9,6 +9,7 @@ SYSCALLS = [ - 'bpf', - 'close_range', - 'copy_file_range', -+ 'fchmodat2', - 'getrandom', - 'memfd_create', - 'mount_setattr', --- -2.43.0 - - -From c1ffd32c642dcadb844b149fcc0c6fe0dbe8a292 Mon Sep 17 00:00:00 2001 -From: Arseny Maslennikov -Date: Sun, 15 Oct 2023 11:00:00 +0300 -Subject: [PATCH 2/3] seccomp: include `fchmodat2` in `@file-system` - -(cherry picked from commit 6e10405aa25fe5e76b740d9ec59730e3f4470c7a) ---- - src/shared/seccomp-util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c -index bd9660cb35..a9c6279b18 100644 ---- a/src/shared/seccomp-util.c -+++ b/src/shared/seccomp-util.c -@@ -468,6 +468,7 @@ const SyscallFilterSet syscall_filter_sets[_SYSCALL_FILTER_SET_MAX] = { - "fchdir\0" - "fchmod\0" - "fchmodat\0" -+ "fchmodat2\0" - "fcntl\0" - "fcntl64\0" - "fgetxattr\0" --- -2.43.0 - - -From da6ec29e7f755e14655132b4e0b04f463f40af3e Mon Sep 17 00:00:00 2001 -From: Arseny Maslennikov -Date: Sun, 15 Oct 2023 11:00:00 +0300 -Subject: [PATCH 3/3] seccomp: also check the mode parameter of `fchmodat2(2)` - -If there is no libseccomp support, just ban the entire syscall instead -so wrappers will fall back to older, supported syscalls. -Also reflect all of this in `test-seccomp.c`. - -(cherry picked from commit 8b45281daa3a87b4b7a3248263cd0ba929d15596) ---- - src/shared/seccomp-util.c | 24 +++++++++++++++++++++++- - src/test/test-seccomp.c | 28 ++++++++++++++++++++++++++++ - 2 files changed, 51 insertions(+), 1 deletion(-) - -diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c -index a9c6279b18..12fd95d95b 100644 ---- a/src/shared/seccomp-util.c -+++ b/src/shared/seccomp-util.c -@@ -2038,7 +2038,7 @@ int seccomp_protect_hostname(void) { - static int seccomp_restrict_sxid(scmp_filter_ctx seccomp, mode_t m) { - /* Checks the mode_t parameter of the following system calls: - * -- * → chmod() + fchmod() + fchmodat() -+ * → chmod() + fchmod() + fchmodat() + fchmodat2() - * → open() + creat() + openat() - * → mkdir() + mkdirat() - * → mknod() + mknodat() -@@ -2081,6 +2081,28 @@ static int seccomp_restrict_sxid(scmp_filter_ctx seccomp, mode_t m) { - else - any = true; - -+#if defined(__SNR_fchmodat2) -+ r = seccomp_rule_add_exact( -+ seccomp, -+ SCMP_ACT_ERRNO(EPERM), -+ SCMP_SYS(fchmodat2), -+ 1, -+ SCMP_A2(SCMP_CMP_MASKED_EQ, m, m)); -+#else -+ /* It looks like this libseccomp does not know about fchmodat2(). -+ * Pretend the fchmodat2() system call is not supported at all, -+ * regardless of the kernel version. */ -+ r = seccomp_rule_add_exact( -+ seccomp, -+ SCMP_ACT_ERRNO(ENOSYS), -+ __NR_fchmodat2, -+ 0); -+#endif -+ if (r < 0) -+ log_debug_errno(r, "Failed to add filter for fchmodat2: %m"); -+ else -+ any = true; -+ - r = seccomp_rule_add_exact( - seccomp, - SCMP_ACT_ERRNO(EPERM), -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index 2d06098ddd..3a73262a8b 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -21,6 +21,7 @@ - #include "macro.h" - #include "memory-util.h" - #include "missing_sched.h" -+#include "missing_syscall_def.h" - #include "nsflags.h" - #include "nulstr-util.h" - #include "process-util.h" -@@ -1003,6 +1004,23 @@ static int real_open(const char *path, int flags, mode_t mode) { - #endif - } - -+static int try_fchmodat2(int dirfd, const char *path, int flags, mode_t mode) { -+ /* glibc does not provide a direct wrapper for fchmodat2(). Let's hence define our own wrapper for -+ * testing purposes that calls the real syscall, on architectures and in environments where -+ * SYS_fchmodat2 is defined. Otherwise, let's just fall back to the glibc fchmodat() call. */ -+ -+#if defined __NR_fchmodat2 && __NR_fchmodat2 >= 0 -+ int r; -+ r = (int) syscall(__NR_fchmodat2, dirfd, path, flags, mode); -+ /* The syscall might still be unsupported by kernel or libseccomp. */ -+ if (r < 0 && errno == ENOSYS) -+ return fchmodat(dirfd, path, flags, mode); -+ return r; -+#else -+ return fchmodat(dirfd, path, flags, mode); -+#endif -+} -+ - TEST(restrict_suid_sgid) { - pid_t pid; - -@@ -1044,6 +1062,11 @@ TEST(restrict_suid_sgid) { - assert_se(fchmodat(AT_FDCWD, path, 0755 | S_ISGID | S_ISUID, 0) >= 0); - assert_se(fchmodat(AT_FDCWD, path, 0755, 0) >= 0); - -+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISUID, 0) >= 0); -+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISGID, 0) >= 0); -+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISGID | S_ISUID, 0) >= 0); -+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755, 0) >= 0); -+ - k = real_open(z, O_CREAT|O_RDWR|O_CLOEXEC|O_EXCL, 0644 | S_ISUID); - k = safe_close(k); - assert_se(unlink(z) >= 0); -@@ -1145,6 +1168,11 @@ TEST(restrict_suid_sgid) { - assert_se(fchmodat(AT_FDCWD, path, 0755 | S_ISGID | S_ISUID, 0) < 0 && errno == EPERM); - assert_se(fchmodat(AT_FDCWD, path, 0755, 0) >= 0); - -+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISUID, 0) < 0 && errno == EPERM); -+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISGID, 0) < 0 && errno == EPERM); -+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755 | S_ISGID | S_ISUID, 0) < 0 && errno == EPERM); -+ assert_se(try_fchmodat2(AT_FDCWD, path, 0755, 0) >= 0); -+ - assert_se(real_open(z, O_CREAT|O_RDWR|O_CLOEXEC|O_EXCL, 0644 | S_ISUID) < 0 && errno == EPERM); - assert_se(real_open(z, O_CREAT|O_RDWR|O_CLOEXEC|O_EXCL, 0644 | S_ISGID) < 0 && errno == EPERM); - assert_se(real_open(z, O_CREAT|O_RDWR|O_CLOEXEC|O_EXCL, 0644 | S_ISUID | S_ISGID) < 0 && errno == EPERM); --- -2.43.0 - -- cgit v1.2.3