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

Add SCMP_ACT_LOG as a valid Seccomp action (#1951) 

Signed-off-by: blacktop <blacktop@users.noreply.github.com>
This commit is contained in:
blacktop 2019-09-26 11:03:03 -04:00 committed by Michael Crosby
parent 3e425f80a8
commit 84373aaa56
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libcontainer/configs/config.go
View File

@ -44,6 +44,7 @@ const (
Trap Trap
Allow Allow
Trace Trace
Log
) )
// Operator is a comparison operator to be used when matching syscall arguments in Seccomp // Operator is a comparison operator to be used when matching syscall arguments in Seccomp

1
libcontainer/seccomp/config.go
View File

@ -22,6 +22,7 @@ var actions = map[string]configs.Action{
"SCMP_ACT_TRAP": configs.Trap, "SCMP_ACT_TRAP": configs.Trap,
"SCMP_ACT_ALLOW": configs.Allow, "SCMP_ACT_ALLOW": configs.Allow,
"SCMP_ACT_TRACE": configs.Trace, "SCMP_ACT_TRACE": configs.Trace,
"SCMP_ACT_LOG": configs.Log,
} }
var archs = map[string]string{ var archs = map[string]string{

3
libcontainer/seccomp/seccomp_linux.go
View File

@ -19,6 +19,7 @@ var (
actTrap = libseccomp.ActTrap actTrap = libseccomp.ActTrap
actKill = libseccomp.ActKill actKill = libseccomp.ActKill
actTrace = libseccomp.ActTrace.SetReturnCode(int16(unix.EPERM)) actTrace = libseccomp.ActTrace.SetReturnCode(int16(unix.EPERM))
actLog = libseccomp.ActLog
actErrno = libseccomp.ActErrno.SetReturnCode(int16(unix.EPERM)) actErrno = libseccomp.ActErrno.SetReturnCode(int16(unix.EPERM))
) )
@ -112,6 +113,8 @@ func getAction(act configs.Action) (libseccomp.ScmpAction, error) {
return actAllow, nil return actAllow, nil
case configs.Trace: case configs.Trace:
return actTrace, nil return actTrace, nil
case configs.Log:
return actLog, nil
default: default:
return libseccomp.ActInvalid, fmt.Errorf("invalid action, cannot use in rule") return libseccomp.ActInvalid, fmt.Errorf("invalid action, cannot use in rule")
} }