Merge pull request #1096 from kinvolk/rata_seccomp_listenerpath

vbatts · web-flow · commit 9c848d91e8cf · 2021-03-19T07:46:52.000-04:00
Fix seccomp notify inconsistencies
diff --git a/schema/defs-linux.json b/schema/defs-linux.json
@@ -70,8 +70,7 @@
             "enum": [
                 "SECCOMP_FILTER_FLAG_TSYNC",
                 "SECCOMP_FILTER_FLAG_LOG",
-                "SECCOMP_FILTER_FLAG_SPEC_ALLOW",
-                "SECCOMP_FILTER_FLAG_NEW_LISTENER"
+                "SECCOMP_FILTER_FLAG_SPEC_ALLOW"
             ]
         },
         "SeccompOperators": {
diff --git a/specs-go/config.go b/specs-go/config.go
@@ -650,6 +650,7 @@ const (
 	ActTrace       LinuxSeccompAction = "SCMP_ACT_TRACE"
 	ActAllow       LinuxSeccompAction = "SCMP_ACT_ALLOW"
 	ActLog         LinuxSeccompAction = "SCMP_ACT_LOG"
+	ActNotify      LinuxSeccompAction = "SCMP_ACT_NOTIFY"
 )
 
 // LinuxSeccompOperator used to match syscall arguments in Seccomp

Original file line number	Diff line number	Diff line change
`@@ -650,6 +650,7 @@ const (`
`650`	`650`	`ActTrace LinuxSeccompAction = "SCMP_ACT_TRACE"`
`651`	`651`	`ActAllow LinuxSeccompAction = "SCMP_ACT_ALLOW"`
`652`	`652`	`ActLog LinuxSeccompAction = "SCMP_ACT_LOG"`
	`653`	`+ ActNotify LinuxSeccompAction = "SCMP_ACT_NOTIFY"`
`653`	`654`	`)`
`654`	`655`
`655`	`656`	`// LinuxSeccompOperator used to match syscall arguments in Seccomp`