merge 'refs/pull/3635/head' of github.com:opencontainers/runc

Kir Kolyshkin (1):
  libct/seccomp/patchbpf: rm duplicated code

LGTMs: cyphar thaJeztah
Closes #3635
This commit is contained in:
Aleksa Sarai
2022-11-02 15:46:03 +11:00

View File

@@ -240,16 +240,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 {