tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/xe: Fix bo leak in xe_dma_buf_init_obj() on allocation failure

When drm_gpuvm_resv_object_alloc() fails, the pre-allocated storage bo
is not freed. Add xe_bo_free(storage) before returning the error.

xe_dma_buf_init_obj() calls xe_bo_init_locked(), which frees the bo on
error. Therefore, xe_dma_buf_init_obj() must also free the bo on its own
error paths. Otherwise, since xe_gem_prime_import() cannot distinguish
whether the failure originated from xe_dma_buf_init_obj() or from
xe_bo_init_locked(), it cannot safely decide whether the bo should be
freed.

Add comments documenting the ownership semantics: on success, ownership
of storage is transferred to the returned drm_gem_object; on failure,
storage is freed before returning.

v2: Add comments to explain the free logic.

Fixes: eb289a5f6cc6 ("drm/xe: Convert xe_dma_buf.c for exhaustive eviction")
Cc: stable@vger.kernel.org
Assisted-by: Claude:claude-opus-4.6
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260408175255.3402838-4-shuicheng.lin@intel.com
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
(cherry picked from commit 78a6c5f899f22338bbf48b44fb8950409c5a69b9)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Shuicheng Lin and committed by
Rodrigo Vivi 93a528f6 1d0adf2f

+11 -1
+11 -1
drivers/gpu/drm/xe/xe_dma_buf.c
··· 258 258 return ERR_PTR(ret); 259 259 } 260 260 261 + /* 262 + * Takes ownership of @storage: on success it is transferred to the returned 263 + * drm_gem_object; on failure it is freed before returning the error. 264 + * This matches the contract of xe_bo_init_locked() which frees @storage on 265 + * its error paths, so callers need not (and must not) free @storage after 266 + * this call. 267 + */ 261 268 static struct drm_gem_object * 262 269 xe_dma_buf_init_obj(struct drm_device *dev, struct xe_bo *storage, 263 270 struct dma_buf *dma_buf) ··· 278 271 int ret = 0; 279 272 280 273 dummy_obj = drm_gpuvm_resv_object_alloc(&xe->drm); 281 - if (!dummy_obj) 274 + if (!dummy_obj) { 275 + xe_bo_free(storage); 282 276 return ERR_PTR(-ENOMEM); 277 + } 283 278 284 279 dummy_obj->resv = resv; 285 280 xe_validation_guard(&ctx, &xe->val, &exec, (struct xe_val_flags) {}, ret) { ··· 290 281 if (ret) 291 282 break; 292 283 284 + /* xe_bo_init_locked() frees storage on error */ 293 285 bo = xe_bo_init_locked(xe, storage, NULL, resv, NULL, dma_buf->size, 294 286 0, /* Will require 1way or 2way for vm_bind */ 295 287 ttm_bo_type_sg, XE_BO_FLAG_SYSTEM, &exec);