Commit d75dec1f authored by Jonathan Cavitt's avatar Jonathan Cavitt Committed by Andi Shyti
Browse files

drm/i915: Allow NULL memory region 



Prevent a NULL pointer access in intel_memory_regions_hw_probe.

Fixes: 05da7d9f ("drm/i915/gem: Downgrade stolen lmem setup warning")
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11704


Signed-off-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240712214156.3969584-1-jonathan.cavitt@intel.com
parent 7df0be6e

drivers/gpu/drm/i915/intel_memory_region.c

+4 −2
Original line number Diff line number Diff line
@@ -368,9 +368,11 @@ int intel_memory_regions_hw_probe(struct drm_i915_private *i915) 
			goto out_cleanup;

		}



		if (mem) { /* Skip on non-fatal errors */

			mem->id = i;

			i915->mm.regions[i] = mem;

		}

	}



	for (i = 0; i < ARRAY_SIZE(i915->mm.regions); i++) {

		struct intel_memory_region *mem = i915->mm.regions[i];