commit b6ee0816ab27ba925105875cb12a83723306106f
author Anil Hiranniah <anil.hiranniah@nxp.com> Wed Mar 25 04:06:43 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 25 04:06:43 2020 +0000
tree d8db3bd5ad0dc3f3d62136befbd474821ffb18c7
parent 2b1a22d21259f600fbd18a90e704daa711267391
parent 95b207f8e587ba668abd014219cc7703ea0f0dda

[automerger skipped] Fix warnings from static analysis tools(se_hal) am: 93b6583070 am: 4389761770 am: fe80b46673 am: 95b207f8e5 -s ours

am skip reason: Change-Id I9484f80bd3f6d8e478836d358cbdeca82dd9158e with SHA-1 93b6583070 is in history

Change-Id: I497918539905c70c2754ce0ac17f60689ca42fba

libese-spi/p73/lib/phNxpEse_Api.cpp

diff --git a/libese-spi/p73/lib/phNxpEse_Api.cpp b/libese-spi/p73/lib/phNxpEse_Api.cpp
index 6ffefcf..4d054b8 100644
--- a/libese-spi/p73/lib/phNxpEse_Api.cpp
+++ b/libese-spi/p73/lib/phNxpEse_Api.cpp
@@ -210,7 +210,7 @@
 
   /*Read device node path*/
   ese_node = EseConfig::getString(NAME_NXP_ESE_DEV_NODE, "/dev/pn81a");
-  strcpy(ese_dev_node, ese_node.c_str());
+  strlcpy(ese_dev_node, ese_node.c_str(), sizeof(ese_dev_node));
   tPalConfig.pDevName = (int8_t*)ese_dev_node;
 
   /* Initialize PAL layer */

libese-spi/p73/pal/spi/phNxpEsePal_spi.cpp

diff --git a/libese-spi/p73/pal/spi/phNxpEsePal_spi.cpp b/libese-spi/p73/pal/spi/phNxpEsePal_spi.cpp
index 21057b6..cb2d4c5 100755
--- a/libese-spi/p73/pal/spi/phNxpEsePal_spi.cpp
+++ b/libese-spi/p73/pal/spi/phNxpEsePal_spi.cpp
@@ -89,6 +89,11 @@
   return;
 }
 ESESTATUS phNxpEse_spiIoctl(uint64_t ioctlType, void* p_data) {
+  if (!p_data) {
+    ALOGD_IF(ese_debug_enabled, "%s:p_data is null ioctltyp: %ld", __FUNCTION__,
+             (long)ioctlType);
+    return ESESTATUS_FAILED;
+  }
   ese_nxp_IoctlInOutData_t* inpOutData = (ese_nxp_IoctlInOutData_t*)p_data;
   rf_status = inpOutData->inp.data.nxpCmd.p_cmd[0];
   if (rf_status == 1) {
@@ -99,11 +104,6 @@
         ese_debug_enabled,
         "******************RF IS OFF*************************************");
   }
-  if (p_data != NULL) {
-    ALOGD_IF(ese_debug_enabled,
-             "halimpl phNxpEse_spiIoctl p_data is not null ioctltyp: %ld",
-             (long)ioctlType);
-  }
   return ESESTATUS_SUCCESS;
 }
 

ls_client/src/LsLib.cpp

diff --git a/ls_client/src/LsLib.cpp b/ls_client/src/LsLib.cpp
index 87a7763..c670408 100755
--- a/ls_client/src/LsLib.cpp
+++ b/ls_client/src/LsLib.cpp
@@ -95,7 +95,7 @@
   ALOGD_IF(ese_debug_enabled, "%s: enter", fn);
   memset(&update_info, 0, sizeof(Lsc_ImageInfo_t));
   if (dest != NULL) {
-    strcat(update_info.fls_RespPath, dest);
+    strlcat(update_info.fls_RespPath, dest, sizeof(update_info.fls_RespPath));
     ALOGD_IF(ese_debug_enabled,
              "%s: Loader Service response data path/destination: %s", fn, dest);
     update_info.bytes_wrote = 0xAA;
@@ -106,7 +106,7 @@
     return LSCSTATUS_FAILED;
   }
   // memcpy(update_info.fls_path, (char*)Lsc_path, sizeof(Lsc_path));
-  strcat(update_info.fls_path, name);
+  strlcat(update_info.fls_path, name, sizeof(update_info.fls_path));
   ALOGD_IF(ese_debug_enabled, "Selected applet to install is: %s",
            update_info.fls_path);