summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Liaw <edliaw@google.com>2023-12-02 00:41:37 +0000
committerAndroid Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com>2024-04-03 17:17:38 +0000
commitbd76e57423a07595827affefca61b50ffb04e3d5 (patch)
tree42081b4e47616da8124e8a9d8bbe60a2dac7e631
parent18d536c50411bb9cf4588167c49f41f42ae76b49 (diff)
downloadkernel-bd76e57423a07595827affefca61b50ffb04e3d5.tar.gz
ltp: disable bpf_prog06 (cve-2021-4204)android14-tests-dev
This CVE is of little concern to Android because untrusted bpf is disallowed. The patch for it does not apply cleanly to 5.15 and below, so for now it will be disabled in VTS. Bug: 314008608 Test: mma Signed-off-by: Edward Liaw <edliaw@google.com> (cherry picked from https://android-review.googlesource.com/q/commit:81d7e4b2a3a50ac0c19e79bd416e3683e98219ac) Merged-In: Iaf32c9b73642366e151700eca784fb1b40a000ab Change-Id: Iaf32c9b73642366e151700eca784fb1b40a000ab
-rw-r--r--ltp/testcase/tools/configs/disabled_tests.py6
-rw-r--r--ltp/testcase/tools/configs/stable_tests.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/ltp/testcase/tools/configs/disabled_tests.py b/ltp/testcase/tools/configs/disabled_tests.py
index 8b99f438..9f8fc896 100644
--- a/ltp/testcase/tools/configs/disabled_tests.py
+++ b/ltp/testcase/tools/configs/disabled_tests.py
@@ -36,6 +36,8 @@ DISABLED_TESTS = {
'cve.cve-2021-3444_64bit', # b/191226866
'cve.cve-2021-4197_1_32bit', # b/259557077
'cve.cve-2021-4197_1_64bit', # b/259557077
+ 'cve.cve-2021-4204_32bit', # b/314008608
+ 'cve.cve-2021-4204_64bit', # b/314008608
'kernel_misc.zram01_32bit', # b/191226875
'kernel_misc.zram01_64bit', # b/191226875
'kernel_misc.zram02_32bit', # b/191227531
@@ -44,8 +46,8 @@ DISABLED_TESTS = {
'sched.sched_setattr01_32bit', # b/200686092
'syscalls.bpf_prog02_32bit', # b/191867447
'syscalls.bpf_prog02_64bit', # b/191867447
- 'syscalls.bpf_prog06_32bit', # b/259559270
- 'syscalls.bpf_prog06_64bit', # b/259559270
+ 'syscalls.bpf_prog06_32bit', # b/314008608
+ 'syscalls.bpf_prog06_64bit', # b/314008608
'syscalls.clone301_32bit', # b/191236153
'syscalls.clone301_64bit', # b/191236153
'syscalls.clone302_32bit', # b/191236103
diff --git a/ltp/testcase/tools/configs/stable_tests.py b/ltp/testcase/tools/configs/stable_tests.py
index 7612681b..41e807d0 100644
--- a/ltp/testcase/tools/configs/stable_tests.py
+++ b/ltp/testcase/tools/configs/stable_tests.py
@@ -301,8 +301,6 @@ STABLE_TESTS = {
'cve.cve-2021-4034_64bit': False,
'cve.cve-2021-4197_2_32bit': False,
'cve.cve-2021-4197_2_64bit': False,
- 'cve.cve-2021-4204_32bit': False,
- 'cve.cve-2021-4204_64bit': False,
'cve.cve-2022-0185_32bit': False,
'cve.cve-2022-0185_64bit': False,
'cve.cve-2022-0847_32bit': False,