diff --git a/runsc/boot/filter/config_amd64.go b/runsc/boot/filter/config_amd64.go index e0786542f..c77598349 100644 --- a/runsc/boot/filter/config_amd64.go +++ b/runsc/boot/filter/config_amd64.go @@ -40,19 +40,5 @@ func init() { seccomp.EqualTo(0), // child_tidptr seccomp.MatchAny{}, // tls }, - { - // TODO(b/168828518): No longer used in Go 1.16+ (on amd64). - seccomp.EqualTo( - unix.CLONE_VM | - unix.CLONE_FS | - unix.CLONE_FILES | - unix.CLONE_SIGHAND | - unix.CLONE_SYSVSEM | - unix.CLONE_THREAD), - seccomp.MatchAny{}, // newsp - seccomp.EqualTo(0), // parent_tidptr - seccomp.EqualTo(0), // child_tidptr - seccomp.MatchAny{}, // tls - }, } } diff --git a/runsc/fsgofer/filter/config_amd64.go b/runsc/fsgofer/filter/config_amd64.go index 1cb9d312a..e0bb95a4d 100644 --- a/runsc/fsgofer/filter/config_amd64.go +++ b/runsc/fsgofer/filter/config_amd64.go @@ -19,16 +19,10 @@ package filter import ( "golang.org/x/sys/unix" - "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/seccomp" ) func init() { - allowedSyscalls[unix.SYS_ARCH_PRCTL] = []seccomp.Rule{ - // TODO(b/168828518): No longer used in Go 1.16+. - {seccomp.EqualTo(linux.ARCH_SET_FS)}, - } - allowedSyscalls[unix.SYS_CLONE] = []seccomp.Rule{ // parent_tidptr and child_tidptr are always 0 because neither // CLONE_PARENT_SETTID nor CLONE_CHILD_SETTID are used. @@ -46,20 +40,6 @@ func init() { seccomp.EqualTo(0), // child_tidptr seccomp.MatchAny{}, // tls }, - { - // TODO(b/168828518): No longer used in Go 1.16+ (on amd64). - seccomp.EqualTo( - unix.CLONE_VM | - unix.CLONE_FS | - unix.CLONE_FILES | - unix.CLONE_SIGHAND | - unix.CLONE_SYSVSEM | - unix.CLONE_THREAD), - seccomp.MatchAny{}, // newsp - seccomp.EqualTo(0), // parent_tidptr - seccomp.EqualTo(0), // child_tidptr - seccomp.MatchAny{}, // tls - }, } allowedSyscalls[unix.SYS_NEWFSTATAT] = []seccomp.Rule{}