Fix checks in umfMemoryProviderAllocationSplit/Merge()

ldorau · ldorau · commit b881164aaa83 · 2024-11-08T10:59:29.000+01:00
Signed-off-by: Lukasz Dorau &lt;lukasz.dorau@intel.com&gt;
diff --git a/src/memory_provider.c b/src/memory_provider.c
@@ -305,6 +305,8 @@ umf_result_t
 umfMemoryProviderAllocationSplit(umf_memory_provider_handle_t hProvider,
                                  void *ptr, size_t totalSize,
                                  size_t firstSize) {
+    UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
+
     if (!ptr) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
@@ -325,6 +327,8 @@ umf_result_t
 umfMemoryProviderAllocationMerge(umf_memory_provider_handle_t hProvider,
                                  void *lowPtr, void *highPtr,
                                  size_t totalSize) {
+    UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);
+
     if (!lowPtr || !highPtr) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
@@ -334,7 +338,7 @@ umfMemoryProviderAllocationMerge(umf_memory_provider_handle_t hProvider,
     if ((uintptr_t)lowPtr >= (uintptr_t)highPtr) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
-    if ((uintptr_t)highPtr - (uintptr_t)lowPtr > totalSize) {
+    if ((uintptr_t)highPtr - (uintptr_t)lowPtr >= totalSize) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,8 @@ umf_result_t`
`305`	`305`	`umfMemoryProviderAllocationSplit(umf_memory_provider_handle_t hProvider,`
`306`	`306`	`void *ptr, size_t totalSize,`
`307`	`307`	`size_t firstSize) {`
	`308`	`+ UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);`
	`309`	`+`
`308`	`310`	`if (!ptr) {`
`309`	`311`	`return UMF_RESULT_ERROR_INVALID_ARGUMENT;`
`310`	`312`	`}`
`@@ -325,6 +327,8 @@ umf_result_t`
`325`	`327`	`umfMemoryProviderAllocationMerge(umf_memory_provider_handle_t hProvider,`
`326`	`328`	`void lowPtr, void highPtr,`
`327`	`329`	`size_t totalSize) {`
	`330`	`+ UMF_CHECK((hProvider != NULL), UMF_RESULT_ERROR_INVALID_ARGUMENT);`
	`331`	`+`
`328`	`332`	`if (!lowPtr \|\| !highPtr) {`
`329`	`333`	`return UMF_RESULT_ERROR_INVALID_ARGUMENT;`
`330`	`334`	`}`
`@@ -334,7 +338,7 @@ umfMemoryProviderAllocationMerge(umf_memory_provider_handle_t hProvider,`
`334`	`338`	`if ((uintptr_t)lowPtr >= (uintptr_t)highPtr) {`
`335`	`339`	`return UMF_RESULT_ERROR_INVALID_ARGUMENT;`
`336`	`340`	`}`
`337`		`- if ((uintptr_t)highPtr - (uintptr_t)lowPtr > totalSize) {`
	`341`	`+ if ((uintptr_t)highPtr - (uintptr_t)lowPtr >= totalSize) {`
`338`	`342`	`return UMF_RESULT_ERROR_INVALID_ARGUMENT;`
`339`	`343`	`}`
`340`	`344`