commit b7c30e886858d9a1ed073d4488d5be4a402420e5
author Linux Build Service Account <lnxbuild@quicinc.com> Fri Jul 07 23:38:25 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 07 23:38:25 2017 -0700
tree ef0c5e6a1667cd3ffe894fde5f9fe71d5ef1d997
parent 72c3fc7e841b8e592291e988609bbfd6bfa18ebc
parent a06d193f151eb8ae9c1863732cc5445d1288f73e

Merge "Restrict HAL implementation access to only /data/vendor/nfc"

halimpl/pn54x/hal/phNxpNciHal.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index 25b37fb..44b26c7 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -701,6 +701,11 @@
     static uint8_t cmd_init_nci[] = {0x20,0x01,0x00};
     /*NCI_RESET_CMD*/
     static uint8_t cmd_reset_nci[] = {0x20,0x00,0x01,0x00};
+
+    if (nxpncihal_ctrl.halStatus == HAL_STATUS_OPEN) {
+        NXPLOG_NCIHAL_E("phNxpNciHal_open already open");
+        return NFCSTATUS_SUCCESS;
+    }
     /* reset config cache */
     resetNxpConfig();
 
@@ -904,6 +909,9 @@
 {
     NFCSTATUS status = NFCSTATUS_FAILED;
     static phLibNfc_Message_t msg;
+    if (nxpncihal_ctrl.halStatus != HAL_STATUS_OPEN) {
+        return NFCSTATUS_FAILED;
+    }
     /* hard coded offsets in phNxpNciHal_print_packet */
     const uint16_t NCI_PRINT_OFFSET = 6;
 
@@ -1264,7 +1272,9 @@
     static uint8_t cmd_reset_nci[] = {0x20,0x00,0x01,0x00}; //keep configuration
     /* reset config cache */
     static uint8_t retry_core_init_cnt;
-
+    if (nxpncihal_ctrl.halStatus != HAL_STATUS_OPEN) {
+        return NFCSTATUS_FAILED;
+    }
     if((*p_core_init_rsp_params > 0) && (*p_core_init_rsp_params < 4)) //initializing for recovery.
     {
 retry_core_init:
@@ -2728,6 +2738,11 @@
     uint8_t ptr                         = 4;
     unsigned long uiccListenMask        = 0x00;
 
+    if (nxpncihal_ctrl.halStatus == HAL_STATUS_CLOSE) {
+        NXPLOG_NCIHAL_E("phNxpNciHal_close is already closed, ignoring close");
+        return NFCSTATUS_FAILED;
+    }
+
     if (!(GetNxpNumValue(NAME_NXP_UICC_LISTEN_TECH_MASK, &uiccListenMask, sizeof(uiccListenMask))))
     {
         uiccListenMask = 0x07;
@@ -3013,6 +3028,10 @@
 
     NFCSTATUS status = NFCSTATUS_FAILED;
 
+    if (nxpncihal_ctrl.halStatus != HAL_STATUS_OPEN) {
+        NXPLOG_NCIHAL_D("Power Cycle failed due to hal status not open");
+        return NFCSTATUS_FAILED;
+    }
     status = phTmlNfc_IoCtl(phTmlNfc_e_ResetDevice);
 
     if(NFCSTATUS_SUCCESS == status)

halimpl/pn54x/hal/phNxpNciHal.h

diff --git a/halimpl/pn54x/hal/phNxpNciHal.h b/halimpl/pn54x/hal/phNxpNciHal.h
index cd65c88..c6e67d7 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.h
+++ b/halimpl/pn54x/hal/phNxpNciHal.h
@@ -72,11 +72,7 @@
     uint8_t p_data[NCI_MAX_DATA_LEN];
 } nci_data_t;
 
-typedef enum
-{
-   HAL_STATUS_OPEN = 0,
-   HAL_STATUS_CLOSE
-} phNxpNci_HalStatus;
+typedef enum { HAL_STATUS_CLOSE = 0, HAL_STATUS_OPEN } phNxpNci_HalStatus;
 
 /* Macros to enable and disable extensions */
 #define HAL_ENABLE_EXT()    (nxpncihal_ctrl.hal_ext_enabled = 1)

halimpl/pn54x/utils/phNxpConfig.cpp

diff --git a/halimpl/pn54x/utils/phNxpConfig.cpp b/halimpl/pn54x/utils/phNxpConfig.cpp
index 15814ed..6d5a490 100644
--- a/halimpl/pn54x/utils/phNxpConfig.cpp
+++ b/halimpl/pn54x/utils/phNxpConfig.cpp
@@ -62,7 +62,7 @@
 #include <errno.h>
 
 #if GENERIC_TARGET
-const char alternative_config_path[] = "/data/nfc/";
+const char alternative_config_path[] = "/data/vendor/nfc/";
 #else
 const char alternative_config_path[] = "";
 #endif
@@ -85,7 +85,8 @@
 #define extra_config_ext        ".conf"
 #define     IsStringValue       0x80000000
 
-const char config_timestamp_path[] = "/data/nfc/libnfc-nxpConfigState.bin";
+const char config_timestamp_path[] =
+    "/data/vendor/nfc/libnfc-nxpConfigState.bin";
 const char default_nxp_config_path[] = "/etc/libnfc-nxp.conf";
 
 /**

halimpl/pn54x/utils/phNxpConfig.h

diff --git a/halimpl/pn54x/utils/phNxpConfig.h b/halimpl/pn54x/utils/phNxpConfig.h
index 3bdcad6..458647b 100644
--- a/halimpl/pn54x/utils/phNxpConfig.h
+++ b/halimpl/pn54x/utils/phNxpConfig.h
@@ -175,6 +175,6 @@
 #define DEBUG 0
 
 /* default configuration */
-#define default_storage_location "/data/nfc"
+#define default_storage_location "/data/vendor/nfc"
 
 #endif