commit 9d1a0e121234a7fd2844e8583174b8662dbaad4b
author xf.li <xf.li@mobiletek.cn> Wed Sep 20 01:43:20 2023 -0700
committer xf.li <xf.li@mobiletek.cn> Wed Sep 20 01:43:20 2023 -0700
tree f688a232b251d86e7af4206ca6704e54a4a5da96
parent d7e85d1c54d3940850d139a0f3c41792931d8c3b

[Feature][ZXW-136]merge P50U04 version

Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No

Change-Id: I7b6a8e22777591bc7a9ede91d6695d9415116f81

ap/lib/libcpnv/nvro.c

diff --git a/ap/lib/libcpnv/nvro.c b/ap/lib/libcpnv/nvro.c
index 0e5880c..d65b151 100755
--- a/ap/lib/libcpnv/nvro.c
+++ b/ap/lib/libcpnv/nvro.c
@@ -161,7 +161,10 @@
         return -1;
     buf = malloc(4096);
     if (buf == NULL)
+    {
+        close(fd);
         return -1;
+    }
     MD5_Init(&ctx);
     do
     {
@@ -173,6 +176,7 @@
 
     MD5_Final(hash_value, &ctx);
     free(buf);
+    close(fd);
     return 0;
 }
 
@@ -233,13 +237,17 @@
         printf("[error]cpnv erase nvrofs2\n");
         return CPNV_ERROR;
     }
-    
-    nvrofs2_umount();
+
     ret = nvrofs2_mount(1);
     if (ret != 0)
     {
-        printf("[error]cpnv nvrofs2_mount\n");
-        return CPNV_ERROR;
+        nvrofs2_umount();
+        ret = nvrofs2_mount(1);
+        if (ret != 0)
+        {
+            printf("[error]cpnv nvrofs2_mount\n");
+            return CPNV_ERROR;
+        }
     }
     ret = copyfile("/mnt/nvrofs/nvroall.bin", "/mnt/nvrofs2/nvroall.bin");
     if (ret != 0)
@@ -333,6 +341,7 @@
 
 out_err:
     nvrofs2_umount();
+    flags_set_nvroflag(NVRO_BACKED_UP);
 
     return CPNV_ERROR;
 }