Skip to content

Commit

Permalink
libcontainer: change seccomp test for clone syscall
Browse files Browse the repository at this point in the history
This commit changes the value of seccomp test for clone syscall.
Also hardcoded values should be changed because it is unclear to
understand what flags are tested.

Related issues:

* containerd/containerd#3314
* moby/moby#39308
* opencontainers/runtime-tools#694

Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
  • Loading branch information
Kenta Tada authored and Kenta Tada committed Jun 4, 2019
1 parent 5ef781c commit b54fd85
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions libcontainer/specconv/spec_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"strings"
"testing"

"golang.org/x/sys/unix"

"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs/validate"
"github.com/opencontainers/runtime-spec/specs-go"
Expand Down Expand Up @@ -104,7 +106,7 @@ func TestSetupSeccomp(t *testing.T) {
Args: []specs.LinuxSeccompArg{
{
Index: 0,
Value: 2080505856,
Value: unix.CLONE_NEWNS | unix.CLONE_NEWUTS | unix.CLONE_NEWIPC | unix.CLONE_NEWUSER | unix.CLONE_NEWPID | unix.CLONE_NEWNET | unix.CLONE_NEWCGROUP,
ValueTwo: 0,
Op: "SCMP_CMP_MASKED_EQ",
},
Expand Down Expand Up @@ -154,7 +156,7 @@ func TestSetupSeccomp(t *testing.T) {
expectedCloneSyscallArgs := configs.Arg{
Index: 0,
Op: 7, // SCMP_CMP_MASKED_EQ
Value: 2080505856,
Value: unix.CLONE_NEWNS | unix.CLONE_NEWUTS | unix.CLONE_NEWIPC | unix.CLONE_NEWUSER | unix.CLONE_NEWPID | unix.CLONE_NEWNET | unix.CLONE_NEWCGROUP,
ValueTwo: 0,
}
if expectedCloneSyscallArgs != *call.Args[0] {
Expand Down

0 comments on commit b54fd85

Please sign in to comment.