Add missing NULL Checks to qae_mem_utils.c

Change-Id: Ibe87af7aa45f0482b01d459a3c06cdb897720415 Signed-off-by: Steve Linsell <stevenx.linsell@intel.com>
intel · Dec 20, 2017 · d8c881b · d8c881b
1 parent 85978c3
commit d8c881b
Showing 1 changed file with 32 additions and 1 deletion.
diff --git a/qae_mem_utils.c b/qae_mem_utils.c
@@ -261,6 +261,11 @@ void *copyAllocPinnedMemory(void *ptr, size_t size, const char *file,
 {
     void *nptr;
 
+    if (ptr == NULL) {
+        MEM_WARN("Input pointer is NULL\n");
+        return NULL;
+    }
+
     if ((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL) {
         MEM_WARN("pinned memory allocation failure\n");
         return NULL;
@@ -294,6 +299,16 @@ void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
 {
     void *nptr;
 
+    if (ptr == NULL) {
+        MEM_WARN("Input pointer is NULL\n");
+        return NULL;
+    }
+
+    if (original_size > size) {
+        MEM_WARN("original_size : %zd > size : %zd", original_size, size);
+        return NULL;
+    }
+
     if ((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL) {
         MEM_WARN("pinned memory allocation failure\n");
         return NULL;
@@ -323,6 +338,11 @@ void copyFreePinnedMemory(void *uptr, void *kptr, int size)
         return;
     }
 
+    if (size > MAX_ALLOC) {
+        MEM_WARN("Size greater than MAX_ALLOC\n");
+        return;
+    }
+
     memcpy(uptr, kptr, size);
     qaeCryptoMemFree(kptr);
 }
@@ -846,7 +866,8 @@ void slab_list_stat(qae_slab_pool * list)
     }
     for (slb = list->next, index = 0; index < list->slot_size;
          slb = slb->next) {
-        MEM_DEBUG("Slab index        : %d\n",index++);
+        MEM_DEBUG("Slab index        : %d\n",index);
+        index++;
         MEM_DEBUG("Slab virtual addr : %p\n",
                 (void *)slb->memCfg.virtualAddress);
         MEM_DEBUG("Slab physical addr: %p\n",
@@ -1029,6 +1050,11 @@ void qaeCryptoMemFree(void *ptr)
 void *qaeCryptoMemRealloc(void *ptr, size_t memsize, const char *file,
                           int line)
 {
+    if (ptr == NULL) {
+        MEM_WARN("Input pointer is NULL\n");
+        return NULL;
+    }
+
     int copy = crypto_slot_get_size(ptr);
     void *n = crypto_alloc_from_slab(memsize, file, line);
     if (n == NULL) {
@@ -1069,6 +1095,11 @@ void *qaeCryptoMemReallocClean(void *ptr, size_t memsize,
                                size_t original_size, const char *file,
                                int line)
 {
+    if (ptr == NULL) {
+        MEM_WARN("Input pointer is NULL\n");
+        return NULL;
+    }
+
     int copy = crypto_slot_get_size(ptr);
     void *n = crypto_alloc_from_slab(memsize, file, line);
     if (n == NULL) {