Merge pull request #32 from bytedance/libseccomp

Use libseccomp-v2.5.5 branch
bytedance · Feb 20, 2024 · 08cefcf · 08cefcf
2 parents 119c060 + 4bed9ec
commit 08cefcf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cmd/varmor/Dockerfile b/cmd/varmor/Dockerfile
@@ -25,6 +25,7 @@ RUN echo "policy-features=/etc/apparmor.d/abi/varmor" >> /etc/apparmor/parser.co
 
 RUN git clone https://github.com/seccomp/libseccomp.git /libseccomp
 WORKDIR /libseccomp
+RUN git checkout v2.5.5
 RUN ./autogen.sh && ./configure --prefix=/usr && \
     make && make install
 

diff --git a/internal/agent/utils_test.go b/internal/agent/utils_test.go
@@ -32,19 +32,19 @@ func Test_versionGreaterThanOrEqual(t *testing.T) {
 			current:        "4-43",
 			minimumVersion: minKernelVersionForAppArmorLSM,
 			expectedResult: false,
-			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (4) < the minimum testd version (%s)", minKernelVersionForAppArmorLSM)),
+			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (4) < the minimum version (%s)", minKernelVersionForAppArmorLSM)),
 		},
 		{
 			current:        "4.13.117.23.bsk.10-amd64",
 			minimumVersion: minKernelVersionForAppArmorLSM,
 			expectedResult: false,
-			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (4.13.117) < the minimum testd version (%s)", minKernelVersionForAppArmorLSM)),
+			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (4.13.117) < the minimum version (%s)", minKernelVersionForAppArmorLSM)),
 		},
 		{
 			current:        "4.14.117.bsk.10-amd64",
 			minimumVersion: minKernelVersionForAppArmorLSM,
 			expectedResult: false,
-			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (4.14.117) < the minimum testd version (%s)", minKernelVersionForAppArmorLSM)),
+			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (4.14.117) < the minimum version (%s)", minKernelVersionForAppArmorLSM)),
 		},
 		{
 			current:        "4.15",
@@ -98,13 +98,13 @@ func Test_versionGreaterThanOrEqual(t *testing.T) {
 			current:        "5.4.0-148-generic",
 			minimumVersion: minKernelVersionForBPFLSM,
 			expectedResult: false,
-			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (5.4.0) < the minimum testd version (%s)", minKernelVersionForBPFLSM)),
+			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (5.4.0) < the minimum version (%s)", minKernelVersionForBPFLSM)),
 		},
 		{
 			current:        "5.6.135-2-velinux1-amd64",
 			minimumVersion: minKernelVersionForBPFLSM,
 			expectedResult: false,
-			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (5.6.135) < the minimum testd version (%s)", minKernelVersionForBPFLSM)),
+			expectedErr:    fmt.Errorf(fmt.Sprintf("the current version (5.6.135) < the minimum version (%s)", minKernelVersionForBPFLSM)),
 		},
 		{
 			current:        "5.10.134-13.1.al8.x86_64",