Skip to content

Commit

Permalink
specs-go: sync SCMP_ARCH_* constants with libseccomp main (#1229)
Browse files Browse the repository at this point in the history
The following constants are defined in the main branch of libseccomp,
but not included in its latest release (v2.5) yet:

* SCMP_ARCH_LOONGARCH64  (seccomp/libseccomp@6966ec7)
* SCMP_ARCH_M68K         (seccomp/libseccomp@dd5c9c2)
* SCMP_ARCH_SH           (seccomp/libseccomp@c12945d)
* SCMP_ARCH_SHEB         (seccomp/libseccomp@c12945d)

These constant names are unlikely to change before v2.6 GA,
so we can safely refer to them in specs-go.

Signed-off-by: Akihiro Suda <[email protected]>
  • Loading branch information
AkihiroSuda authored Dec 9, 2024
1 parent 9505701 commit 8cfc407
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
11 changes: 11 additions & 0 deletions config-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,17 @@ The following parameters can be specified to set up seccomp:
* `SCMP_ARCH_PARISC64`
* `SCMP_ARCH_RISCV64`

<!--
The following constants are defined in the main branch of libseccomp,
but not included in its latest release (v2.5) yet:
https://github.com/seccomp/libseccomp/commits/main/include/seccomp.h.in
* SCMP_ARCH_LOONGARCH64
* SCMP_ARCH_M68K
* SCMP_ARCH_SH
* SCMP_ARCH_SHEB
-->

* **`flags`** *(array of strings, OPTIONAL)* - list of flags to use with seccomp(2).

A valid list of constants is shown below.
Expand Down
4 changes: 4 additions & 0 deletions schema/defs-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
"SCMP_ARCH_X32",
"SCMP_ARCH_ARM",
"SCMP_ARCH_AARCH64",
"SCMP_ARCH_LOONGARCH64",
"SCMP_ARCH_M68K",
"SCMP_ARCH_MIPS",
"SCMP_ARCH_MIPS64",
"SCMP_ARCH_MIPS64N32",
Expand All @@ -46,6 +48,8 @@
"SCMP_ARCH_PPC64LE",
"SCMP_ARCH_S390",
"SCMP_ARCH_S390X",
"SCMP_ARCH_SH",
"SCMP_ARCH_SHEB",
"SCMP_ARCH_PARISC",
"SCMP_ARCH_PARISC64",
"SCMP_ARCH_RISCV64"
Expand Down
12 changes: 12 additions & 0 deletions specs-go/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,18 @@ const (
ArchRISCV64 Arch = "SCMP_ARCH_RISCV64"
)

// The following constants are defined in the main branch of libseccomp,
// but not included in its latest release (v2.5) yet.
// https://github.com/seccomp/libseccomp/commits/main/include/seccomp.h.in
//
// Will be included in libseccomp v2.6.
const (
ArchLOONGARCH64 Arch = "SCMP_ARCH_LOONGARCH64"
ArchM68K Arch = "SCMP_ARCH_M68K"
ArchSH Arch = "SCMP_ARCH_SH"
ArchSHEB Arch = "SCMP_ARCH_SHEB"
)

// LinuxSeccompAction taken upon Seccomp rule match
type LinuxSeccompAction string

Expand Down

0 comments on commit 8cfc407

Please sign in to comment.