Fix disjoint_pool_free() and proxy_free()

Fix disjoint_pool_free() and proxy_free() - error out
on pool mismatch, when we try to free the pointer
belonging to a different pool.

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

src/memory_pool.c

@@ -208,3 +208,10 @@ umf_result_t umfPoolGetTag(umf_memory_pool_handle_t hPool, void **tag) {
     utils_mutex_unlock(&hPool->lock);
     return UMF_RESULT_SUCCESS;
 }
+
+void *umfPoolGetPoolPriv(umf_memory_pool_handle_t hPool) {
+    if (hPool == NULL) {
+        return NULL;
+    }
+    return hPool->pool_priv;
+}

src/memory_pool_internal.h

@@ -36,6 +36,8 @@ typedef struct umf_memory_pool_t {
     void *tag;
 } umf_memory_pool_t;
 
+void *umfPoolGetPoolPriv(umf_memory_pool_handle_t hPool);
+
 #ifdef __cplusplus
 }
 #endif

src/pool/pool_disjoint.c

@@ -17,6 +17,7 @@
 #include <umf/memory_provider.h>
 
 #include "base_alloc_global.h"
+#include "memory_pool_internal.h"
 #include "pool_disjoint_internal.h"
 #include "provider/provider_tracking.h"
 #include "uthash/utlist.h"
@@ -819,6 +820,11 @@ umf_result_t disjoint_pool_free(void *pool, void *ptr) {
             return ret;
         }
 
+        if (pool != umfPoolGetPoolPriv(allocInfo.pool)) {
+            LOG_ERR("pool mismatch");
+            return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+        }
+
         size_t size = allocInfo.baseSize;
         umf_memory_provider_handle_t provider = disjoint_pool->provider;
         ret = umfMemoryProviderFree(provider, ptr, size);

src/pool/pool_proxy.c

@@ -13,8 +13,10 @@
 #include <assert.h>
 
 #include "base_alloc_global.h"
+#include "memory_pool_internal.h"
 #include "provider/provider_tracking.h"
 #include "utils_common.h"
+#include "utils_log.h"
 
 static __TLS umf_result_t TLS_last_allocation_error;
 
@@ -100,6 +102,11 @@ static umf_result_t proxy_free(void *pool, void *ptr) {
         umf_alloc_info_t allocInfo = {NULL, 0, NULL};
         umf_result_t umf_result = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         if (umf_result == UMF_RESULT_SUCCESS) {
+            if (pool != umfPoolGetPoolPriv(allocInfo.pool)) {
+                LOG_ERR("pool mismatch");
+                return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+            }
+
             size = allocInfo.baseSize;
         }
     }