jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #705 from q384566678/test-seecomp 

Add new architectures from libseccomp 2.3.2
This commit is contained in:
Mrunal Patel 2017-03-03 11:36:27 -08:00 committed by GitHub
parent 7da699dcda 513ab686e9
commit f47e43c643
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config-linux.md
View File

@ -496,7 +496,7 @@ Seccomp provides application sandboxing mechanism in the Linux kernel.
Seccomp configuration allows one to configure actions to take for matched syscalls and furthermore also allows matching on values passed as arguments to syscalls. Seccomp configuration allows one to configure actions to take for matched syscalls and furthermore also allows matching on values passed as arguments to syscalls.
For more information about Seccomp, see [Seccomp kernel documentation](https://www.kernel.org/doc/Documentation/prctl/seccomp_filter.txt) For more information about Seccomp, see [Seccomp kernel documentation](https://www.kernel.org/doc/Documentation/prctl/seccomp_filter.txt)
The actions, architectures, and operators are strings that match the definitions in seccomp.h from [libseccomp](https://github.com/seccomp/libseccomp) and are translated to corresponding values. The actions, architectures, and operators are strings that match the definitions in seccomp.h from [libseccomp](https://github.com/seccomp/libseccomp) and are translated to corresponding values.
A valid list of constants as of libseccomp v2.3.0 is shown below. A valid list of constants as of libseccomp v2.3.2 is shown below.
Architecture Constants Architecture Constants
* `SCMP_ARCH_X86` * `SCMP_ARCH_X86`
@ -515,6 +515,8 @@ Architecture Constants
* `SCMP_ARCH_PPC64LE` * `SCMP_ARCH_PPC64LE`
* `SCMP_ARCH_S390` * `SCMP_ARCH_S390`
* `SCMP_ARCH_S390X` * `SCMP_ARCH_S390X`
* `SCMP_ARCH_PARISC`
* `SCMP_ARCH_PARISC64`
Action Constants: Action Constants:
* `SCMP_ACT_KILL` * `SCMP_ACT_KILL`

4
schema/defs-linux.json
View File

@ -18,7 +18,9 @@
"SCMP_ARCH_PPC64", "SCMP_ARCH_PPC64",
"SCMP_ARCH_PPC64LE", "SCMP_ARCH_PPC64LE",
"SCMP_ARCH_S390", "SCMP_ARCH_S390",
"SCMP_ARCH_S390X" "SCMP_ARCH_S390X",
"SCMP_ARCH_PARISC",
"SCMP_ARCH_PARISC64"
] ]
}, },
"SeccompAction": { "SeccompAction": {

2
specs-go/config.go
View File

@ -506,6 +506,8 @@ const (
ArchPPC64LE Arch = "SCMP_ARCH_PPC64LE" ArchPPC64LE Arch = "SCMP_ARCH_PPC64LE"
ArchS390 Arch = "SCMP_ARCH_S390" ArchS390 Arch = "SCMP_ARCH_S390"
ArchS390X Arch = "SCMP_ARCH_S390X" ArchS390X Arch = "SCMP_ARCH_S390X"
ArchPARISC Arch = "SCMP_ARCH_PARISC"
ArchPARISC64 Arch = "SCMP_ARCH_PARISC64"
) )
// LinuxSeccompAction taken upon Seccomp rule match // LinuxSeccompAction taken upon Seccomp rule match