Commit c9f0322c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-12-15' of... 

Merge tag 'drm-intel-fixes-2021-12-15' of ssh://git.freedesktop.org/git/drm/drm-intel

 into drm-fixes

Fix a bound check in the DMC fw load.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YbnGvnsX/H3rKAqO@intel.com
parents 2585cf9d 53b34952

drivers/gpu/drm/i915/display/intel_dmc.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static void parse_dmc_fw(struct drm_i915_private *dev_priv, 
			continue;



		offset = readcount + dmc->dmc_info[id].dmc_offset * 4;

		if (fw->size - offset < 0) {

		if (offset > fw->size) {

			drm_err(&dev_priv->drm, "Reading beyond the fw_size\n");

			continue;

		}