Remove LEGACY_MIFARE_READER
cleanup dead code
remove CVE_2019_2133
remove CVE_2019_2134
remove CVE_2019_2135
remove CVE-2021-0596
remove CVE-2022-20123
Bug: 246483838
Test: R/W MFC
Change-Id: Ib85042bb8c485f843839f62d3c53f63c63102e61
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2133/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2133/Android.bp
deleted file mode 100644
index 35d651e..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2133/Android.bp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_test {
- name: "CVE-2019-2133",
- defaults: ["cts_hostsidetests_securitybulletin_defaults"],
- srcs: [
- "poc.cpp",
- ],
- multilib: {
- lib64: {
- include_dirs: [
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/mifare/",
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/common/",
- "packages/apps/Nfc/nci/jni/extns/pn54x/inc/",
- "system/nfc/src/nfa/include/",
- "system/nfc/src/gki/common/",
- "system/nfc/src/include/",
- "system/nfc/src/gki/ulinux/",
- "system/nfc/src/nfc/include/",
- ],
- shared_libs: [
- "libnfc_nci_jni",
- ],
- },
- },
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2133/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2133/poc.cpp
deleted file mode 100644
index 3cce7af..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2133/poc.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../includes/common.h"
-#include <stdlib.h>
-
-// This PoC is only for 64-bit builds
-#if _64_BIT
-#include "phNxpExtns_MifareStd.h"
-#endif /* _64_BIT */
-
-int main() {
-
-// This PoC is only for 64-bit builds
-#if _64_BIT
- uint8_t p_data = 0xA0;
- uint32_t len = 0;
-
- phNxpExtns_MfcModuleInit();
- Mfc_Transceive(&p_data, len);
-#endif /* _64_BIT */
-
- return EXIT_SUCCESS;
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2134/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2134/Android.bp
deleted file mode 100644
index 13ab145..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2134/Android.bp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_test {
- name: "CVE-2019-2134",
- defaults: ["cts_hostsidetests_securitybulletin_defaults"],
- srcs: [
- "poc.cpp",
- ],
- multilib: {
- lib64: {
- include_dirs: [
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/mifare/",
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/common/",
- "packages/apps/Nfc/nci/jni/extns/pn54x/inc/",
- "system/nfc/src/nfa/include/",
- "system/nfc/src/gki/common/",
- "system/nfc/src/include/",
- "system/nfc/src/gki/ulinux/",
- "system/nfc/src/nfc/include/",
- ],
- shared_libs: [
- "libnfc_nci_jni",
- ],
- },
- },
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2134/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2134/poc.cpp
deleted file mode 100644
index 1514e2a..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2134/poc.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../includes/common.h"
-#include <stdlib.h>
-
-// This PoC is only for 64-bit builds
-#if _64_BIT
-#include "phNxpExtns_MifareStd.h"
-#endif /* _64_BIT */
-
-int main() {
-
-// This PoC is only for 64-bit builds
-#if _64_BIT
- uint8_t p_data = 0xA0;
- uint32_t len = 1;
-
- phNxpExtns_MfcModuleInit();
- Mfc_Transceive(&p_data, len);
-#endif /* _64_BIT */
-
- return EXIT_SUCCESS;
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2135/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2135/Android.bp
deleted file mode 100644
index b55107a..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2135/Android.bp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_test {
- name: "CVE_2019_2135",
- defaults: ["cts_hostsidetests_securitybulletin_defaults"],
- srcs: [
- "poc.cpp",
- ":cts_hostsidetests_securitybulletin_memutils",
- ],
- cflags: [
- "-DCHECK_OVERFLOW",
- ],
- compile_multilib: "64",
- include_dirs: [
- "system/nfc/src/nfc/include/",
- "system/nfc/src/nfa/include/",
- "system/nfc/src/gki/common/",
- "system/nfc/src/include/",
- "system/nfc/src/gki/ulinux/",
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/common/",
- "packages/apps/Nfc/nci/jni/extns/pn54x/inc/",
- ],
- shared_libs: [
- "libnfc_nci_jni",
- ],
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2135/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2135/poc.cpp
deleted file mode 100644
index 582ddb8..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2135/poc.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <nfa_api.h>
-#include <nfc_api.h>
-#include <phNfcTypes.h>
-#include <phNxpExtns.h>
-
-static void nfaMockDMCallback(uint8_t, tNFA_DM_CBACK_DATA *) {}
-static void nfaMockCCallback(uint8_t, tNFA_CONN_EVT_DATA *) {}
-
-int main(void) {
- if (EXTNS_Init(nfaMockDMCallback, nfaMockCCallback) != NFCSTATUS_SUCCESS) {
- return EXIT_FAILURE;
- }
- const int32_t size = 16;
- const int32_t offset = size - 1;
- uint8_t *p_data = static_cast<uint8_t *>(malloc(size));
- if (p_data == nullptr) {
- return EXIT_FAILURE;
- }
- p_data[offset] = 0x60;
- EXTNS_MfcTransceive(&p_data[offset], 1);
- free(p_data);
- EXTNS_Close();
- return EXIT_SUCCESS;
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2021-0596/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2021-0596/Android.bp
deleted file mode 100644
index cdcf942..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2021-0596/Android.bp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_test {
- name: "CVE-2021-0596",
- defaults: ["cts_hostsidetests_securitybulletin_defaults"],
- srcs: [
- "poc.cpp",
- ":cts_hostsidetests_securitybulletin_memutils",
- ],
- compile_multilib: "64",
- include_dirs: [
- "packages/apps/Nfc/nci/jni/extns/pn54x/inc",
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/common",
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/mifare",
- "system/nfc/src/gki/common",
- "system/nfc/src/gki/ulinux",
- "system/nfc/src/include",
- "system/nfc/src/nfa/include",
- "system/nfc/src/nfc/include",
- ],
- shared_libs: [
- "libnfc_nci_jni",
- ],
- cflags: [
- "-DCHECK_UNDERFLOW",
- "-DENABLE_SELECTIVE_OVERLOADING",
- ],
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2021-0596/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2021-0596/poc.cpp
deleted file mode 100644
index 3b1a580..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2021-0596/poc.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <unistd.h>
-#include "phNxpExtns_MifareStd.h"
-#include "../includes/common.h"
-#include "../includes/memutils.h"
-
-char enable_selective_overload = ENABLE_NONE;
-char *vulnPtr = nullptr;
-bool testInProgress = false;
-struct sigaction new_action, old_action;
-void sigsegv_handler(int signum, siginfo_t *info, void* context) {
- if (testInProgress && info->si_signo == SIGSEGV) {
- size_t pageSize = getpagesize();
- if (pageSize) {
- char *vulnPtrGuardPage = (char *) ((size_t) vulnPtr & PAGE_MASK) - pageSize;
- char *faultPage = (char *) ((size_t) info->si_addr & PAGE_MASK);
- if (faultPage == vulnPtrGuardPage) {
- (*old_action.sa_sigaction)(signum, info, context);
- return;
- }
- }
- }
- _exit(EXIT_FAILURE);
-}
-uint8_t NFC_GetNCIVersion() {
- return NCI_VERSION_2_0;
-}
-
-int main() {
- sigemptyset(&new_action.sa_mask);
- new_action.sa_flags = SA_SIGINFO;
- new_action.sa_sigaction = sigsegv_handler;
- sigaction(SIGSEGV, &new_action, &old_action);
- enable_selective_overload = ENABLE_MEMALIGN_CHECK;
- uint8_t *buffer = (uint8_t*) memalign(16, 16 * sizeof(uint8_t));
- enable_selective_overload = ENABLE_FREE_CHECK | ENABLE_REALLOC_CHECK;
- FAIL_CHECK(buffer);
-
- vulnPtr = (char *) buffer;
- uint8_t bufferSize = 1;
- buffer[0] = 0x10;
- phNxpExtns_MfcModuleInit();
- testInProgress = true;
- Mfc_RecvPacket(buffer, bufferSize);
- testInProgress = false;
- free(buffer);
- return EXIT_SUCCESS;
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2022-20123/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2022-20123/Android.bp
deleted file mode 100644
index cf02527..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2022-20123/Android.bp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_test {
- name: "CVE-2022-20123",
- defaults: ["cts_hostsidetests_securitybulletin_defaults"],
- srcs: [
- "poc.cpp",
- ":cts_hostsidetests_securitybulletin_memutils",
- ],
- include_dirs: [
- "packages/apps/Nfc/nci/jni/extns/pn54x/inc",
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/common",
- "packages/apps/Nfc/nci/jni/extns/pn54x/src/mifare",
- "system/nfc/src/gki/common",
- "system/nfc/src/gki/ulinux",
- "system/nfc/src/include",
- "system/nfc/src/nfa/include",
- "system/nfc/src/nfc/include",
- ],
- shared_libs: [
- "libnfc_nci_jni",
- ],
- cflags: [
- "-DCHECK_OVERFLOW",
- "-DENABLE_SELECTIVE_OVERLOADING",
- ],
-}
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2022-20123/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2022-20123/poc.cpp
deleted file mode 100644
index 26c233e..0000000
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2022-20123/poc.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <unistd.h>
-#include <vector>
-#include "../includes/common.h"
-#include "../includes/memutils.h"
-#include "phNxpExtns_MifareStd.h"
-
-bool testInProgress = false;
-char enable_selective_overload = ENABLE_NONE;
-struct sigaction new_action, old_action;
-
-void sigsegv_handler(int signum, siginfo_t *info, void *context) {
- if (testInProgress && info->si_signo == SIGSEGV) {
- (*old_action.sa_sigaction)(signum, info, context);
- return;
- }
- _exit(EXIT_FAILURE);
-}
-
-int main() {
- sigemptyset(&new_action.sa_mask);
- new_action.sa_flags = SA_SIGINFO;
- new_action.sa_sigaction = sigsegv_handler;
- sigaction(SIGSEGV, &new_action, &old_action);
- constexpr int32_t size = 16;
- constexpr int32_t index = 1;
- enable_selective_overload = ENABLE_ALL;
- std::vector<uint8_t> bufferVector(size);
- uint8_t *buffer = bufferVector.data();
- FAIL_CHECK(buffer);
- buffer[size - 1] = phNciNfc_e_MfcAuthRsp;
- phNxpExtns_MfcModuleInit();
- testInProgress = true;
- Mfc_RecvPacket(&buffer[size - 1], index);
- enable_selective_overload = ENABLE_FREE_CHECK | ENABLE_REALLOC_CHECK;
- testInProgress = false;
- return EXIT_SUCCESS;
-}
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2019_2135.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2019_2135.java
deleted file mode 100644
index cc9e24d..0000000
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2019_2135.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.security.cts;
-
-import android.platform.test.annotations.AsbSecurityTest;
-
-import com.android.sts.common.tradefed.testtype.NonRootSecurityTestCase;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class CVE_2019_2135 extends NonRootSecurityTestCase {
-
- /**
- * b/125900276
- * Vulnerability Behaviour: SIGSEGV in self
- */
- @Test
- @AsbSecurityTest(cveBugId = 125900276)
- public void testPocCVE_2019_2135() throws Exception {
- AdbUtils.assumeHasNfc(getDevice());
- pocPusher.only64();
- AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE_2019_2135", null, getDevice());
- }
-}
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2021_0596.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2021_0596.java
deleted file mode 100644
index fecab0c..0000000
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2021_0596.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.security.cts;
-
-import android.platform.test.annotations.AsbSecurityTest;
-
-import com.android.sts.common.tradefed.testtype.NonRootSecurityTestCase;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class CVE_2021_0596 extends NonRootSecurityTestCase {
-
- /**
- * b/181346550
- * Vulnerability Behaviour: SIGSEGV in self
- */
- @AsbSecurityTest(cveBugId = 181346550)
- @Test
- public void testPocCVE_2021_0596() throws Exception {
- AdbUtils.assumeHasNfc(getDevice());
- pocPusher.only64();
- AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2021-0596", null, getDevice());
- }
-}
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2022_20123.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2022_20123.java
deleted file mode 100644
index baa8707..0000000
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2022_20123.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.security.cts;
-
-import android.platform.test.annotations.AsbSecurityTest;
-
-import com.android.compatibility.common.util.CrashUtils;
-import com.android.compatibility.common.util.CrashUtils.Config.BacktraceFilterPattern;
-import com.android.sts.common.tradefed.testtype.NonRootSecurityTestCase;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.regex.Pattern;
-
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class CVE_2022_20123 extends NonRootSecurityTestCase {
-
- /**
- * b/221852424
- * Vulnerability Behaviour: SIGSEGV in self
- * Vulnerable Library: libnfc_nci_jni (As per AOSP code)
- * Vulnerable Function: Mfc_RecvPacket (As per AOSP code)
- */
- @AsbSecurityTest(cveBugId = 221852424)
- @Test
- public void testPocCVE_2022_20123() throws Exception {
- AdbUtils.assumeHasNfc(getDevice());
- assumeIsSupportedNfcDevice(getDevice());
- String signals[] = {CrashUtils.SIGSEGV};
- String binaryName = "CVE-2022-20123";
- AdbUtils.pocConfig testConfig = new AdbUtils.pocConfig(binaryName, getDevice());
- testConfig.config = new CrashUtils.Config().setProcessPatterns(Pattern.compile(binaryName))
- .setBacktraceIncludes(
- new BacktraceFilterPattern("libnfc_nci_jni", "Mfc_RecvPacket"));
- testConfig.config
- .setBacktraceExcludes(new BacktraceFilterPattern("libdl", "__cfi_slowpath"));
- testConfig.config.setSignals(signals);
- AdbUtils.runPocAssertNoCrashesNotVulnerable(testConfig);
- }
-}
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java b/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
index 91c84d7..c2956f3 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
@@ -148,28 +148,6 @@
}
/**
- * b/132082342
- * Vulnerability Behaviour: SIGSEGV in self
- */
- @Test
- @AsbSecurityTest(cveBugId = 132082342)
- public void testPocCVE_2019_2133() throws Exception {
- AdbUtils.assumeHasNfc(getDevice());
- AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2019-2133", null, getDevice());
- }
-
- /**
- * b/132083376
- * Vulnerability Behaviour: SIGSEGV in self
- */
- @Test
- @AsbSecurityTest(cveBugId = 132083376)
- public void testPocCVE_2019_2134() throws Exception {
- AdbUtils.assumeHasNfc(getDevice());
- AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2019-2134", null, getDevice());
- }
-
- /**
* b/31470908
* Vulnerability Behaviour: SIGSEGV in self
*/
