25576708db
- Add upstream patch <https://github.com/opencontainers/runc/pull/4219> to properly fix -ENOSYS stub on ppc64le. bsc#1192051 bsc#1221050 + 0001-bsc1221050-libct-seccomp-patchbpf-rm-duplicated-code.patch + 0002-bsc1221050-seccomp-patchbpf-rename-nativeArch-linuxA.patch + 0003-bsc1221050-seccomp-patchbpf-always-include-native-ar.patch OBS-URL: https://build.opensuse.org/request/show/1159948 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=156
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 0c224086deacb981d7ea0fcbdab39ddf7bc3f24e Mon Sep 17 00:00:00 2001
|
|
From: Kir Kolyshkin <kolyshkin@gmail.com>
|
|
Date: Fri, 14 Oct 2022 18:37:00 -0700
|
|
Subject: [PATCH 1/3] bsc1221050: libct/seccomp/patchbpf: rm duplicated code
|
|
|
|
(This is a cherry-pick of 2cd05e44b662fb79c46d5ebfd6c71e9ebc98d40c.)
|
|
|
|
In findLastSyscalls, we convert libseccomp.ArchNative to the real
|
|
libseccomp architecture, but archToNative already does that, so
|
|
this code is redundant.
|
|
|
|
Remove the redundant code, and move its comment to archToNative.
|
|
|
|
Fixes: 7a8d7162f
|
|
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
|
|
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
|
|
---
|
|
libcontainer/seccomp/patchbpf/enosys_linux.go | 10 ----------
|
|
1 file changed, 10 deletions(-)
|
|
|
|
diff --git a/libcontainer/seccomp/patchbpf/enosys_linux.go b/libcontainer/seccomp/patchbpf/enosys_linux.go
|
|
index efe6dca58b21..c9c1d4ccb685 100644
|
|
--- a/libcontainer/seccomp/patchbpf/enosys_linux.go
|
|
+++ b/libcontainer/seccomp/patchbpf/enosys_linux.go
|
|
@@ -233,16 +233,6 @@ func findLastSyscalls(config *configs.Seccomp) (lastSyscallMap, error) {
|
|
return nil, fmt.Errorf("unable to validate seccomp architecture: %w", err)
|
|
}
|
|
|
|
- // Map native architecture to a real architecture value to avoid
|
|
- // doubling-up the lastSyscall mapping.
|
|
- if arch == libseccomp.ArchNative {
|
|
- nativeArch, err := libseccomp.GetNativeArch()
|
|
- if err != nil {
|
|
- return nil, fmt.Errorf("unable to get native architecture: %w", err)
|
|
- }
|
|
- arch = nativeArch
|
|
- }
|
|
-
|
|
// Figure out native architecture representation of the architecture.
|
|
nativeArch, err := archToNative(arch)
|
|
if err != nil {
|
|
--
|
|
2.44.0
|
|
|