From 93476c62994245aba4e3fef4acaaad90c91a61be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Thu, 4 Jun 2026 14:28:48 +0300 Subject: [PATCH] anv: fix a null pointer access with isl_mod_info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is possible for isl_mod_info to be NULL if no drm modifier was given, layout transition on external queue can hit this condition. Fixes: 11f8f333e23 ("anv: set a private binding when the image is not externally shared") Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Reviewed-by: Nanley Chery Part-of: --- src/intel/vulkan/genX_cmd_buffer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 9b96862521b..5d50f3dd8fb 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -1191,14 +1191,16 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer, * of acquire/release direction. */ if (private_binding_acquire) { - initial_aux_usage = isl_drm_modifier_has_aux(isl_mod_info->modifier) ? + initial_aux_usage = isl_mod_info && + isl_drm_modifier_has_aux(isl_mod_info->modifier) ? image->planes[plane].aux_usage : ISL_AUX_USAGE_NONE; - initial_fast_clear = isl_mod_info->supports_clear_color ? + initial_fast_clear = isl_mod_info && isl_mod_info->supports_clear_color ? initial_fast_clear : ANV_FAST_CLEAR_NONE; } else if (private_binding_release) { - final_aux_usage = isl_drm_modifier_has_aux(isl_mod_info->modifier) ? + final_aux_usage = isl_mod_info && + isl_drm_modifier_has_aux(isl_mod_info->modifier) ? image->planes[plane].aux_usage : ISL_AUX_USAGE_NONE; - final_fast_clear = isl_mod_info->supports_clear_color ? + final_fast_clear = isl_mod_info && isl_mod_info->supports_clear_color ? final_fast_clear : ANV_FAST_CLEAR_NONE; }