Deprecate ActKill in favor of ActKillThread

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Acked-by: Tom Hromatka <[email protected]>
Signed-off-by: Paul Moore <[email protected]>

Author: thaJeztah

seccomp.go

@@ -182,9 +182,9 @@ const (
 	// ActInvalid is a placeholder to ensure uninitialized ScmpAction
 	// variables are invalid
 	ActInvalid ScmpAction = iota
-	// ActKill kills the thread that violated the rule. It is the same as ActKillThread.
+	// ActKillThread kills the thread that violated the rule.
 	// All other threads from the same thread group will continue to execute.
-	ActKill
+	ActKillThread
 	// ActTrap throws SIGSYS
 	ActTrap
 	// ActNotify triggers a userspace notification. This action is only usable when
@@ -207,9 +207,11 @@ const (
 	// This action is only usable when libseccomp API level 3 or higher is
 	// supported.
 	ActKillProcess
-	// ActKillThread kills the thread that violated the rule. It is the same as ActKill.
+	// ActKill kills the thread that violated the rule.
 	// All other threads from the same thread group will continue to execute.
-	ActKillThread = ActKill
+	//
+	// Deprecated: use ActKillThread
+	ActKill = ActKillThread
 )
 
 const (

seccomp_internal.go

@@ -293,7 +293,7 @@ const (
 	archStart ScmpArch = ArchNative
 	archEnd   ScmpArch = ArchRISCV64
 	// Comparison boundaries to check for action validity
-	actionStart ScmpAction = ActKill
+	actionStart ScmpAction = ActKillThread
 	actionEnd   ScmpAction = ActKillProcess
 	// Comparison boundaries to check for comparison operator validity
 	compareOpStart ScmpCompareOp = CompareNotEqual

seccomp_test.go

@@ -274,7 +274,7 @@ func TestFilterCreateRelease(t *testing.T) {
 		t.Errorf("Can create filter with invalid action")
 	}
 
-	filter, err := NewFilter(ActKill)
+	filter, err := NewFilter(ActKillThread)
 	if err != nil {
 		t.Errorf("Error creating filter: %s", err)
 	}
@@ -291,7 +291,7 @@ func TestFilterCreateRelease(t *testing.T) {
 }
 
 func TestFilterReset(t *testing.T) {
-	filter, err := NewFilter(ActKill)
+	filter, err := NewFilter(ActKillThread)
 	if err != nil {
 		t.Errorf("Error creating filter: %s", err)
 	}
@@ -301,7 +301,7 @@ func TestFilterReset(t *testing.T) {
 	action, err := filter.GetDefaultAction()
 	if err != nil {
 		t.Errorf("Error getting default action of filter")
-	} else if action != ActKill {
+	} else if action != ActKillThread {
 		t.Errorf("Default action of filter was set incorrectly!")
 	}
 
@@ -326,7 +326,7 @@ func TestFilterReset(t *testing.T) {
 }
 
 func TestFilterArchFunctions(t *testing.T) {
-	filter, err := NewFilter(ActKill)
+	filter, err := NewFilter(ActKillThread)
 	if err != nil {
 		t.Errorf("Error creating filter: %s", err)
 	}
@@ -402,7 +402,7 @@ func TestFilterArchFunctions(t *testing.T) {
 }
 
 func TestFilterAttributeGettersAndSetters(t *testing.T) {
-	filter, err := NewFilter(ActKill)
+	filter, err := NewFilter(ActKillThread)
 	if err != nil {
 		t.Errorf("Error creating filter: %s", err)
 	}
@@ -411,7 +411,7 @@ func TestFilterAttributeGettersAndSetters(t *testing.T) {
 	act, err := filter.GetDefaultAction()
 	if err != nil {
 		t.Errorf("Error getting default action: %s", err)
-	} else if act != ActKill {
+	} else if act != ActKillThread {
 		t.Errorf("Default action was set incorrectly")
 	}
 
@@ -547,7 +547,7 @@ func TestMergeFilters(t *testing.T) {
 		t.Errorf("Source filter should not be valid after merging")
 	}
 
-	filter3, err := NewFilter(ActKill)
+	filter3, err := NewFilter(ActKillThread)
 	if err != nil {
 		t.Errorf("Error creating filter: %s", err)
 	}