Merge ~cascardo/qa-regression-testing:unprivileged_bpf into qa-regression-testing:master

[Thadeu Lima de Souza Cascardo]

We have not turned unprivileged_bpf_disabled to 2 by default on all kernels.

[Steve Beattie (sbeattie)]

thanks, merged!

review: Approve

diff --git a/scripts/test-kernel-security.py b/scripts/test-kernel-security.py
index 74a8d5c..d2032ac 100755
--- a/scripts/test-kernel-security.py
+++ b/scripts/test-kernel-security.py
@@ -1859,14 +1859,12 @@ class KernelSecurityTest(KernelSecurityBaseTest):
     def test_151_sysctl_disables_bpf_unpriv_userns(self):
         '''unprivileged_bpf_disabled sysctl supported'''
 
-        expected = 0
+        expected = 2
         exists = True
         if not self.kernel_at_least('4.4'):
             self._skipped("unprivileged bpf disable sysctl did not exist before xenial")
             expected = 1
             exists = False
-        elif self.kernel_at_least('5.13'):
-            expected = 2
 
         self._test_sysctl_value('kernel/unprivileged_bpf_disabled', expected, exists=exists)