From 25dd3923dcf7fc1f4b0ceea6186813523d0de41f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 22 May 2025 09:54:01 -0700 Subject: [PATCH] anv: attempt to make coverity happy Coverity is upset that we're using `ptr` after we've `munmap`ed up to the offset of the region, even though we're just moving past the unmapped region to the still mapped region. Attempt to make it happy by doing that calculation before unmapping. If it's still mad there's nothing left we can do. CID: 1646981 Reviewed-by: Lionel Landwerlin CID: 1646956 Part-of: --- src/intel/vulkan/i915/anv_kmd_backend.c | 4 +++- src/intel/vulkan/xe/anv_kmd_backend.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/i915/anv_kmd_backend.c b/src/intel/vulkan/i915/anv_kmd_backend.c index f89b096f0fa..4cebb48e02e 100644 --- a/src/intel/vulkan/i915/anv_kmd_backend.c +++ b/src/intel/vulkan/i915/anv_kmd_backend.c @@ -187,10 +187,12 @@ i915_gem_mmap_offset(struct anv_device *device, struct anv_bo *bo, if (ptr == MAP_FAILED) return ptr; + void *ret = ptr + offset; + if (offset != 0) munmap(ptr, offset); - return ptr + offset; + return ret; } static void * diff --git a/src/intel/vulkan/xe/anv_kmd_backend.c b/src/intel/vulkan/xe/anv_kmd_backend.c index c13352d6ad6..458b797d83b 100644 --- a/src/intel/vulkan/xe/anv_kmd_backend.c +++ b/src/intel/vulkan/xe/anv_kmd_backend.c @@ -131,10 +131,12 @@ xe_gem_mmap(struct anv_device *device, struct anv_bo *bo, uint64_t offset, if (ptr == MAP_FAILED) return ptr; + void *ret = ptr + offset; + if (offset != 0) munmap(ptr, offset); - return ptr + offset; + return ret; } static inline uint32_t