If someone provides too large number for fixed16 type we will WARN but we will not correctly clamp values and that may lead to fully wrong calculations.
Signed-off-by: Michal Wajdeczko <[email protected]> Cc: Chris Wilson <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: Joonas Lahtinen <[email protected]> --- drivers/gpu/drm/i915/fixed16_16.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/fixed16_16.h b/drivers/gpu/drm/i915/fixed16_16.h index af23997..43fe0037 100644 --- a/drivers/gpu/drm/i915/fixed16_16.h +++ b/drivers/gpu/drm/i915/fixed16_16.h @@ -57,7 +57,8 @@ static inline fixed16_16_t u32_to_fixed16(u32 val) { fixed16_16_t fp; - WARN_ON(val > U16_MAX); + if (WARN_ON(val > U16_MAX)) + val = U16_MAX; fp.val = val << 16; return fp; @@ -93,7 +94,9 @@ static inline fixed16_16_t clamp_u64_to_fixed16(u64 val) { fixed16_16_t fp; - WARN_ON(val > U32_MAX); + if (WARN_ON(val > U32_MAX)) + val = U32_MAX; + fp.val = (u32) val; return fp; } @@ -109,7 +112,8 @@ static inline u32 mul_round_up_u32_fixed16(u32 val, fixed16_16_t mul) intermediate_val = (u64) val * mul.val; intermediate_val = DIV_ROUND_UP_ULL(intermediate_val, 1 << 16); - WARN_ON(intermediate_val > U32_MAX); + if (WARN_ON(intermediate_val > U32_MAX)) + intermediate_val = U32_MAX; return (u32) intermediate_val; } @@ -137,7 +141,8 @@ static inline u32 div_round_up_u32_fixed16(u32 val, fixed16_16_t d) interm_val = (u64)val << 16; interm_val = DIV_ROUND_UP_ULL(interm_val, d.val); - WARN_ON(interm_val > U32_MAX); + if (WARN_ON(interm_val > U32_MAX)) + interm_val = U32_MAX; return (u32) interm_val; } -- 1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
