Merge ~roxanan/ubuntu/+source/systemd:5.15.0-bt-sysctl-issue into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-focal

[Roxana Nicolescu]

[Nick Rosbrook (enr0n)]

This does match what we have in jammy and newer, and matches https://github.com/systemd/systemd/commit/0af05e485a3a88f454c714901eb6109307dc893e.

We will want to bundle some other changes in with a focal SRU, but I think this should be included. Please fill out the SRU template on the bug report.

review: Approve

[Roxana Nicolescu (roxanan)]

Thank you for your review. I created the ticket https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2004657. Let me know if it's ok.

[Nick Rosbrook (enr0n)]

I forgot I was in a packaging context when I first reviewed this. We don't modify the source directly for our downstream patches in Debian/Ubuntu, but instead we have a patch queue in debian/patches, and patches are applied in the order specified in debian/patches/series.

I am preparing an SRU for focal now, so I have converted your change into the correct format. Thanks for identifying the fix! We can close this PR.

review: Disapprove

Unmerged commits

8a36179... by Roxana Nicolescu on 2023-02-02

test: fix autotest sysctl failure with kernel 5.15

upstream and root-unitttest suites are failing on focal-5.15 backports
on test_protect_syscall:
Assertion 'errno == EFAULT' failed at src/test/test-seccomp.c:311

This is due to sysctl being removed completely from 5.5 onwards
(88db0aa2421666d2f73486d15b239a4521983d55)
The assertion now check if either EFAULT or ENOSYS is returned instead.

BugLink: https://bugs.launchpad.net/bugs/1933090

Signed-off-by: Roxana Nicolescu <email address hidden>

diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 67900d8..7ebcca4 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -307,7 +307,7 @@ static void test_protect_sysctl(void) {
         if (pid == 0) {
 #if defined __NR__sysctl && __NR__sysctl >= 0
                 assert_se(syscall(__NR__sysctl, NULL) < 0);
-                assert_se(errno == EFAULT);
+                assert_se(IN_SET(errno, EFAULT, ENOSYS));
 #endif
 
                 assert_se(seccomp_protect_sysctl() >= 0);