Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

specs-go: sync SCMP_ARCH_* constants with libseccomp main #1229

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −0
Open

specs-go: sync SCMP_ARCH_* constants with libseccomp main #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
specs-go: sync SCMP_ARCH_* constants with libseccomp main 
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
AkihiroSuda committed Sep 26, 2023
commit eb1dc7d3b4f82e8e77366e874343aad1bd24a9d2
11 changes: 11 additions & 0 deletions config-linux.md
View file
Open in desktop
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
-->
Comment on lines +746 to +755
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created an issue and assigned it to me so that we would not forget to update it.
#1231


* **`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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,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