]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/i915/guc: prevent a possible int overflow in wq offsets
authorNikita Zhandarovich <n.zhandarovich@fintech.ru>
Thu, 25 Jul 2024 15:59:25 +0000 (08:59 -0700)
committerTvrtko Ursulin <tursulin@ursulin.net>
Tue, 10 Sep 2024 07:13:51 +0000 (08:13 +0100)
It may be possible for the sum of the values derived from
i915_ggtt_offset() and __get_parent_scratch_offset()/
i915_ggtt_offset() to go over the u32 limit before being assigned
to wq offsets of u64 type.

Mitigate these issues by expanding one of the right operands
to u64 to avoid any overflow issues just in case.

Found by Linux Verification Center (linuxtesting.org) with static
analysis tool SVACE.

Fixes: c2aa552ff09d ("drm/i915/guc: Add multi-lrc context registration")
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru>
Link: https://patchwork.freedesktop.org/patch/msgid/20240725155925.14707-1-n.zhandarovich@fintech.ru
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit 1f1c1bd56620b80ae407c5790743e17caad69cec)
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

index 9400d0eb682b234825c2320d99c9d6a7515fa10b..908ebfa2293335d58312e5956d8730b1b9026487 100644 (file)
@@ -2842,9 +2842,9 @@ static void prepare_context_registration_info_v70(struct intel_context *ce,
                ce->parallel.guc.wqi_tail = 0;
                ce->parallel.guc.wqi_head = 0;
 
-               wq_desc_offset = i915_ggtt_offset(ce->state) +
+               wq_desc_offset = (u64)i915_ggtt_offset(ce->state) +
                                 __get_parent_scratch_offset(ce);
-               wq_base_offset = i915_ggtt_offset(ce->state) +
+               wq_base_offset = (u64)i915_ggtt_offset(ce->state) +
                                 __get_wq_offset(ce);
                info->wq_desc_lo = lower_32_bits(wq_desc_offset);
                info->wq_desc_hi = upper_32_bits(wq_desc_offset);