]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe/bo: Fix bo leak on unaligned size validation in xe_bo_init_locked()
authorShuicheng Lin <shuicheng.lin@intel.com>
Wed, 8 Apr 2026 17:52:52 +0000 (17:52 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 May 2026 15:16:31 +0000 (17:16 +0200)
commit 09a8f3c1c11977a6e10c167f26dd298790b31c32 upstream.

When type is ttm_bo_type_device and aligned_size != size, the function
returns an error without freeing a caller-provided bo, violating the
documented contract that bo is freed on failure.

Add xe_bo_free(bo) before returning the error.

Fixes: 4e03b584143e ("drm/xe/uapi: Reject bo creation of unaligned size")
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-2-shuicheng.lin@intel.com
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
(cherry picked from commit 601c2aa087b6f21014300a3f107a08ee4dde7bdf)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/xe/xe_bo.c

index 83b0bb81e1449ed4f400e98d9344e35e22d7c331..8a182611ddad24bf826d4a4fbbab2a1c7cc332ee 100644 (file)
@@ -2176,8 +2176,10 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo,
                alignment = SZ_4K >> PAGE_SHIFT;
        }
 
-       if (type == ttm_bo_type_device && aligned_size != size)
+       if (type == ttm_bo_type_device && aligned_size != size) {
+               xe_bo_free(bo);
                return ERR_PTR(-EINVAL);
+       }
 
        if (!bo) {
                bo = xe_bo_alloc();