From 1d98ab40983a66a63fff59a0efaa99fa3e6af7b3 Mon Sep 17 00:00:00 2001
From: maoyong <maoyong5@huawei.com>
Date: Mon, 6 May 2024 11:51:40 +0800
Subject: [PATCH 1/4] fix code warning

Signed-off-by: maoyong <maoyong5@huawei.com>
---
 .../nncompiled_cache.cpp                      | 32 +++++++++++++++++++
 .../neural_network_runtime/nncompiled_cache.h |  1 +
 2 files changed, 33 insertions(+)

diff --git a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
index 4aad156..d19cd7d 100644
--- a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
+++ b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
@@ -197,6 +197,7 @@ OH_NN_ReturnCode NNCompiledCache::GenerateCacheModel(const std::vector<OHOS::Neu
     *cacheInfoPtr++ = static_cast<uint64_t>(version);
     *cacheInfoPtr++ = static_cast<uint64_t>(m_backendID); // Should call SetBackend first.
 
+    OH_NN_ReturnCode ret = OH_NN_SUCCESS;
     for (size_t i = 0; i < cacheNumber; ++i) {
         std::string cacheModelFile = cacheDir + "/" + m_modelName + std::to_string(i) + ".nncache";
         char path[PATH_MAX];
@@ -205,6 +206,12 @@ OH_NN_ReturnCode NNCompiledCache::GenerateCacheModel(const std::vector<OHOS::Neu
             return OH_NN_INVALID_PARAMETER;
         }
 
+        ret = VerifyCachePath(cacheModelFile);
+        if (ret != OH_NN_SUCCESS) {
+            LOGE("[NNCompiledCache] GenerateCacheModel failed, fail to verify the file path of cacheModelFile.");
+            return ret;
+        }
+
         std::ofstream cacheModelStream(cacheModelFile, std::ios::binary | std::ios::out | std::ios::trunc);
         if (cacheModelStream.fail()) {
             LOGE("[NNCompiledCache] GenerateCacheModel failed, model cache file is invalid.");
@@ -237,6 +244,12 @@ OH_NN_ReturnCode NNCompiledCache::WriteCacheInfo(uint32_t cacheSize,
         return OH_NN_INVALID_PARAMETER;
     }
 
+    OH_NN_ReturnCode ret = VerifyCachePath(cacheInfoPath);
+    if (ret != OH_NN_SUCCESS) {
+        LOGE("[NNCompiledCache] WriteCacheInfo failed, fail to verify the file path of cacheInfoPath.");
+        return ret;
+    }
+
     std::ofstream cacheInfoStream(cacheInfoPath, std::ios::binary | std::ios::out | std::ios::trunc);
     if (cacheInfoStream.fail()) {
         LOGE("[NNCompiledCache] WriteCacheInfo failed, model cache info file is invalid.");
@@ -392,5 +405,24 @@ OH_NN_ReturnCode NNCompiledCache::GetCacheFileLength(std::ifstream& ifs, int& fi
     fileSize = handleValue;
     return OH_NN_SUCCESS;
 }
+
+OH_NN_ReturnCode NNCompiledCache::VerifyCachePath(const std::string& cachePath)
+{
+    if (cachePath.find('/') != size_t(0)) {
+        LOGE("[NNCompiledCache] VerifyCachePath failed, input file dir=%{public}s is invalid, "
+             "should start with '/'.",
+             cachePath.c_str());
+        return OH_NN_INVALID_FILE;
+    }
+
+    if (cachePath.find("//" != std::string:npos)) {
+        LOGE("[NNCompiledCache] VerifyCachePath failed, input file dir=%{public}s is invalid, "
+             "containing double '/'.",
+             cachePath.c_str());
+        return OH_NN_INVALID_FILE;
+    }
+
+    return OH_NN_SUCCESS;
+}
 } // namespace NeuralNetworkRuntime
 } // namespace OHOS
diff --git a/frameworks/native/neural_network_runtime/nncompiled_cache.h b/frameworks/native/neural_network_runtime/nncompiled_cache.h
index 49dc108..2020b5a 100644
--- a/frameworks/native/neural_network_runtime/nncompiled_cache.h
+++ b/frameworks/native/neural_network_runtime/nncompiled_cache.h
@@ -65,6 +65,7 @@ private:
     OH_NN_ReturnCode ReadCacheModelFile(const std::string& file, Buffer& cache) const;
     unsigned short GetCrc16(char* buffer, size_t length) const;
     OH_NN_ReturnCode GetCacheFileLength(std::ifstream& ifs, int& fileSize) const;
+    OH_NN_ReturnCode VerifyCachePath(const std::string& cachePath);
 
 private:
     size_t m_backendID {0};
-- 
Gitee


From 8ccb44f851269eacee875ad5329f4c5698a3e3f8 Mon Sep 17 00:00:00 2001
From: maoyong <maoyong5@huawei.com>
Date: Mon, 6 May 2024 11:51:40 +0800
Subject: [PATCH 2/4] fix code warning

Signed-off-by: maoyong <maoyong5@huawei.com>
---
 frameworks/native/neural_network_runtime/nncompiled_cache.cpp | 2 +-
 frameworks/native/neural_network_runtime/nncompiled_cache.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
index d19cd7d..9fa5084 100644
--- a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
+++ b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
@@ -406,7 +406,7 @@ OH_NN_ReturnCode NNCompiledCache::GetCacheFileLength(std::ifstream& ifs, int& fi
     return OH_NN_SUCCESS;
 }
 
-OH_NN_ReturnCode NNCompiledCache::VerifyCachePath(const std::string& cachePath)
+OH_NN_ReturnCode NNCompiledCache::VerifyCachePath(const std::string& cachePath) const
 {
     if (cachePath.find('/') != size_t(0)) {
         LOGE("[NNCompiledCache] VerifyCachePath failed, input file dir=%{public}s is invalid, "
diff --git a/frameworks/native/neural_network_runtime/nncompiled_cache.h b/frameworks/native/neural_network_runtime/nncompiled_cache.h
index 2020b5a..1140fab 100644
--- a/frameworks/native/neural_network_runtime/nncompiled_cache.h
+++ b/frameworks/native/neural_network_runtime/nncompiled_cache.h
@@ -65,7 +65,7 @@ private:
     OH_NN_ReturnCode ReadCacheModelFile(const std::string& file, Buffer& cache) const;
     unsigned short GetCrc16(char* buffer, size_t length) const;
     OH_NN_ReturnCode GetCacheFileLength(std::ifstream& ifs, int& fileSize) const;
-    OH_NN_ReturnCode VerifyCachePath(const std::string& cachePath);
+    OH_NN_ReturnCode VerifyCachePath(const std::string& cachePath) const;
 
 private:
     size_t m_backendID {0};
-- 
Gitee


From fe7de6c88fda9a7e520c018bab97c4ef9406e7ae Mon Sep 17 00:00:00 2001
From: maoyong <maoyong5@huawei.com>
Date: Mon, 6 May 2024 14:54:45 +0800
Subject: [PATCH 3/4] fix cache bug

---
 .../native/neural_network_runtime/nncompiled_cache.cpp      | 6 +++---
 frameworks/native/neural_network_runtime/nncompiler.cpp     | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
index 9fa5084..c380d7e 100644
--- a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
+++ b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
@@ -203,7 +203,7 @@ OH_NN_ReturnCode NNCompiledCache::GenerateCacheModel(const std::vector<OHOS::Neu
         char path[PATH_MAX];
         if (realpath(cacheModelFile.c_str(), path) == nullptr) {
             LOGE("[NNCompiledCache] GenerateCacheModel failed, fail to get the real path of cacheModelFile.");
-            return OH_NN_INVALID_PARAMETER;
+            return OH_NN_SAVE_CACHE_EXCEPTION;
         }
 
         ret = VerifyCachePath(cacheModelFile);
@@ -241,7 +241,7 @@ OH_NN_ReturnCode NNCompiledCache::WriteCacheInfo(uint32_t cacheSize,
     char path[PATH_MAX];
     if (realpath(cacheInfoPath.c_str(), path) == nullptr) {
         LOGE("[NNCompiledCache] WriteCacheInfo failed, fail to get the real path of cacheInfoPath.");
-        return OH_NN_INVALID_PARAMETER;
+        return OH_NN_SAVE_CACHE_EXCEPTION;
     }
 
     OH_NN_ReturnCode ret = VerifyCachePath(cacheInfoPath);
@@ -415,7 +415,7 @@ OH_NN_ReturnCode NNCompiledCache::VerifyCachePath(const std::string& cachePath)
         return OH_NN_INVALID_FILE;
     }
 
-    if (cachePath.find("//" != std::string:npos)) {
+    if (cachePath.find("//" != std::string::npos)) {
         LOGE("[NNCompiledCache] VerifyCachePath failed, input file dir=%{public}s is invalid, "
              "containing double '/'.",
              cachePath.c_str());
diff --git a/frameworks/native/neural_network_runtime/nncompiler.cpp b/frameworks/native/neural_network_runtime/nncompiler.cpp
index 56ab886..cbc89e6 100644
--- a/frameworks/native/neural_network_runtime/nncompiler.cpp
+++ b/frameworks/native/neural_network_runtime/nncompiler.cpp
@@ -391,7 +391,9 @@ OH_NN_ReturnCode NNCompiler::NormalBuild()
     // 保存cache
     if (!m_cachePath.empty()) {
         ret = SaveToCacheFile();
-        if (ret != OH_NN_SUCCESS) {
+        if (ret == OH_NN_SAVE_CACHE_EXCEPTION) {
+            LOGE("[NNCompiler] Build success, but some error happened when write cache, continue running.");
+        } else if (ret != OH_NN_SUCCESS) {
             LOGE("[NNCompiler] Build success, but fail to save cache to file.");
             return ret;
         }
-- 
Gitee


From 9d13e2ddbc3d08c2663dc7ac2d61703e28ec49dd Mon Sep 17 00:00:00 2001
From: maoyong <maoyong5@huawei.com>
Date: Mon, 6 May 2024 15:18:08 +0800
Subject: [PATCH 4/4] fix cache bug

---
 .../native/neural_network_runtime/nncompiled_cache.cpp    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
index c380d7e..d9bd049 100644
--- a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
+++ b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp
@@ -18,6 +18,8 @@
 #include <unistd.h>
 #include <functional>
 #include <memory>
+#include <cstdlib>
+#include <limits>
 
 #include "common/utils.h"
 #include "backend_manager.h"
@@ -206,7 +208,7 @@ OH_NN_ReturnCode NNCompiledCache::GenerateCacheModel(const std::vector<OHOS::Neu
             return OH_NN_SAVE_CACHE_EXCEPTION;
         }
 
-        ret = VerifyCachePath(cacheModelFile);
+        ret = VerifyCachePath(path);
         if (ret != OH_NN_SUCCESS) {
             LOGE("[NNCompiledCache] GenerateCacheModel failed, fail to verify the file path of cacheModelFile.");
             return ret;
@@ -244,7 +246,7 @@ OH_NN_ReturnCode NNCompiledCache::WriteCacheInfo(uint32_t cacheSize,
         return OH_NN_SAVE_CACHE_EXCEPTION;
     }
 
-    OH_NN_ReturnCode ret = VerifyCachePath(cacheInfoPath);
+    OH_NN_ReturnCode ret = VerifyCachePath(path);
     if (ret != OH_NN_SUCCESS) {
         LOGE("[NNCompiledCache] WriteCacheInfo failed, fail to verify the file path of cacheInfoPath.");
         return ret;
@@ -415,7 +417,7 @@ OH_NN_ReturnCode NNCompiledCache::VerifyCachePath(const std::string& cachePath)
         return OH_NN_INVALID_FILE;
     }
 
-    if (cachePath.find("//" != std::string::npos)) {
+    if (cachePath.find("//") != std::string::npos) {
         LOGE("[NNCompiledCache] VerifyCachePath failed, input file dir=%{public}s is invalid, "
              "containing double '/'.",
              cachePath.c_str());
-- 
Gitee