From 6223a65d5d6f5df283a1ebec10c3920f9250d2f3 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 14 Oct 2022 18:37:00 -0700 Subject: [PATCH] [1.1] 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: 7a8d7162f9d7 ("seccomp: prepend -ENOSYS stub to all filters") Signed-off-by: Kir Kolyshkin Signed-off-by: Aleksa Sarai --- 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 efe6dca58..c9c1d4ccb 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 {