diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/glibc/glibc/faccessat2-perm.patch | 31 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.33.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/faccessat2-perm.patch b/meta/recipes-core/glibc/glibc/faccessat2-perm.patch new file mode 100644 index 0000000000..2ee7110ca1 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/faccessat2-perm.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Older seccomp-based filters used in container frameworks will block faccessat2 | ||
2 | calls as it's a relatively new syscall. This isn't a big problem with | ||
3 | glibc <2.33 but 2.33 will call faccessat2 itself, get EPERM, and thenn be confused | ||
4 | about what to do as EPERM isn't an expected error code. | ||
5 | |||
6 | This manifests itself as mysterious errors, for example a kernel failing to link. | ||
7 | |||
8 | The root cause of bad seccomp filters is mostly fixed (systemd 247, Docker 20.10.0) | ||
9 | but we can't expect everyone to upgrade, so add a workaound (originally from | ||
10 | Red Hat) to handle EPERM like ENOSYS and fallback to faccessat(). | ||
11 | |||
12 | Upstream-Status: Inappropriate | ||
13 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
14 | |||
15 | diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c | ||
16 | index 56cb6dcc8b4d58d3..5de75032bbc93a2c 100644 | ||
17 | --- a/sysdeps/unix/sysv/linux/faccessat.c | ||
18 | +++ b/sysdeps/unix/sysv/linux/faccessat.c | ||
19 | @@ -34,7 +34,11 @@ faccessat (int fd, const char *file, int mode, int flag) | ||
20 | #if __ASSUME_FACCESSAT2 | ||
21 | return ret; | ||
22 | #else | ||
23 | - if (ret == 0 || errno != ENOSYS) | ||
24 | + /* Fedora-specific workaround: | ||
25 | + As a workround for a broken systemd-nspawn that returns | ||
26 | + EPERM when a syscall is not allowed instead of ENOSYS | ||
27 | + we must check for EPERM here and fall back to faccessat. */ | ||
28 | + if (ret == 0 || !(errno == ENOSYS || errno == EPERM)) | ||
29 | return ret; | ||
30 | |||
31 | if (flag & ~(AT_SYMLINK_NOFOLLOW | AT_EACCESS)) | ||
diff --git a/meta/recipes-core/glibc/glibc_2.33.bb b/meta/recipes-core/glibc/glibc_2.33.bb index 4085c779eb..e0002e6046 100644 --- a/meta/recipes-core/glibc/glibc_2.33.bb +++ b/meta/recipes-core/glibc/glibc_2.33.bb | |||
@@ -12,6 +12,7 @@ NATIVESDKFIXES_class-nativesdk = "\ | |||
12 | file://0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \ | 12 | file://0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \ |
13 | file://0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch \ | 13 | file://0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch \ |
14 | file://0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch \ | 14 | file://0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch \ |
15 | file://faccessat2-perm.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ | 18 | SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ |