Change copyFreePinnedMemory() to return error status

Change-Id: I3f4547d8a3016a2c3784dbd87a258c7d32d455b5 Signed-off-by: Steve Linsell <stevenx.linsell@intel.com>
intel · Jan 23, 2018 · e027a3c · e027a3c
1 parent ef236aa
commit e027a3c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/cmn_mem_drv_inf.c b/cmn_mem_drv_inf.c
@@ -157,14 +157,16 @@ void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
     return nptr;
 }
 
-void copyFreePinnedMemory(void *uptr, void *kptr, int size)
+int copyFreePinnedMemory(void *uptr, void *kptr, int size)
 {
     if (uptr == NULL || kptr == NULL) {
        MEM_WARN("Input pointers uptr or kptr are NULL\n");
-       return;
+       return 0;
     }
+
     memcpy(uptr, kptr, size);
     qaeCryptoMemFree(kptr);
+    return 1;
 }
 
 CpaPhysicalAddr qaeCryptoMemV2P(void *v)

diff --git a/cmn_mem_drv_inf.h b/cmn_mem_drv_inf.h
@@ -95,6 +95,6 @@ void *copyAllocPinnedMemory(void *ptr, size_t size, const char *file,
                             int line);
 void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
                                  const char *file, int line);
-void copyFreePinnedMemory(void *uptr, void *kptr, int size);
+int copyFreePinnedMemory(void *uptr, void *kptr, int size);
 
 #endif                          /* CMN_MEM_DRV_INF_H */
diff --git a/multi_thread_qaememutils.c b/multi_thread_qaememutils.c
@@ -302,15 +302,21 @@ void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
 *   buffer and copy data to it.
 *
 ******************************************************************************/
-void copyFreePinnedMemory(void *uptr, void *kptr, int size)
+int copyFreePinnedMemory(void *uptr, void *kptr, int size)
 {
     if (uptr == NULL || kptr == NULL) {
         MEM_WARN("Input pointers uptr or kptr are NULL\n");
-        return;
+        return 0;
+    }
+
+    if (size > MAX_ALLOC) {
+        MEM_WARN("Size greater than MAX_ALLOC\n");
+        return 0;
     }
 
     memcpy(uptr, kptr, size);
     qaeCryptoMemFree(kptr);
+    return 1;
 }
 
 /*****************************************************************************

diff --git a/qae_mem_utils.c b/qae_mem_utils.c
@@ -331,20 +331,21 @@ void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
 *   buffer and copy data to it.
 *
 ******************************************************************************/
-void copyFreePinnedMemory(void *uptr, void *kptr, int size)
+int copyFreePinnedMemory(void *uptr, void *kptr, int size)
 {
     if (uptr == NULL || kptr == NULL) {
         MEM_WARN("Input pointers uptr or kptr are NULL\n");
-        return;
+        return 0;
     }
 
     if (size > MAX_ALLOC) {
         MEM_WARN("Size greater than MAX_ALLOC\n");
-        return;
+        return 0;
     }
 
     memcpy(uptr, kptr, size);
     qaeCryptoMemFree(kptr);
+    return 1;
 }
 
 /*****************************************************************************

diff --git a/qae_mem_utils.h b/qae_mem_utils.h
@@ -191,7 +191,7 @@ void *copyAllocPinnedMemory(void *ptr, size_t size, const char *file,
                             int line);
 void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
                                  const char *file, int line);
-void copyFreePinnedMemory(void *uptr, void *kptr, int size);
+int copyFreePinnedMemory(void *uptr, void *kptr, int size);
 
 void qaeCryptoAtFork();