From: Daniel Vetter <daniel@ffwll.ch>
To: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
stable@vger.kernel.org,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Benjamin Gaignard <benjamin.gaignard@st.com>,
Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH v2 1/4] drm/rect: Avoid division by zero
Date: Tue, 26 Nov 2019 15:40:30 +0100 [thread overview]
Message-ID: <20191126144030.GY29965@phenom.ffwll.local> (raw)
In-Reply-To: <20191122175623.13565-2-ville.syrjala@linux.intel.com>
On Fri, Nov 22, 2019 at 07:56:20PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Check for zero width/height destination rectangle in
> drm_rect_clip_scaled() to avoid a division by zero.
>
> Cc: stable@vger.kernel.org
> Fixes: f96bdf564f3e ("drm/rect: Handle rounding errors in drm_rect_clip_scaled, v3.")
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Benjamin Gaignard <benjamin.gaignard@st.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Testcase: igt/kms_selftest/drm_rect_clip_scaled_div_by_zero
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Clamping src to 0 if dst is 0 makes sense to me.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/drm_rect.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
> index b8363aaa9032..818738e83d06 100644
> --- a/drivers/gpu/drm/drm_rect.c
> +++ b/drivers/gpu/drm/drm_rect.c
> @@ -54,7 +54,12 @@ EXPORT_SYMBOL(drm_rect_intersect);
>
> static u32 clip_scaled(u32 src, u32 dst, u32 clip)
> {
> - u64 tmp = mul_u32_u32(src, dst - clip);
> + u64 tmp;
> +
> + if (dst == 0)
> + return 0;
> +
> + tmp = mul_u32_u32(src, dst - clip);
>
> /*
> * Round toward 1.0 when clipping so that we don't accidentally
> --
> 2.23.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch>
To: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Benjamin Gaignard <benjamin.gaignard@st.com>,
intel-gfx@lists.freedesktop.org, stable@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v2 1/4] drm/rect: Avoid division by zero
Date: Tue, 26 Nov 2019 15:40:30 +0100 [thread overview]
Message-ID: <20191126144030.GY29965@phenom.ffwll.local> (raw)
Message-ID: <20191126144030.N-jAewSomknRRuCzIJ8iDiVINg2zKY4ad1XKpvpYM6c@z> (raw)
In-Reply-To: <20191122175623.13565-2-ville.syrjala@linux.intel.com>
On Fri, Nov 22, 2019 at 07:56:20PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Check for zero width/height destination rectangle in
> drm_rect_clip_scaled() to avoid a division by zero.
>
> Cc: stable@vger.kernel.org
> Fixes: f96bdf564f3e ("drm/rect: Handle rounding errors in drm_rect_clip_scaled, v3.")
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Benjamin Gaignard <benjamin.gaignard@st.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Testcase: igt/kms_selftest/drm_rect_clip_scaled_div_by_zero
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Clamping src to 0 if dst is 0 makes sense to me.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/drm_rect.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
> index b8363aaa9032..818738e83d06 100644
> --- a/drivers/gpu/drm/drm_rect.c
> +++ b/drivers/gpu/drm/drm_rect.c
> @@ -54,7 +54,12 @@ EXPORT_SYMBOL(drm_rect_intersect);
>
> static u32 clip_scaled(u32 src, u32 dst, u32 clip)
> {
> - u64 tmp = mul_u32_u32(src, dst - clip);
> + u64 tmp;
> +
> + if (dst == 0)
> + return 0;
> +
> + tmp = mul_u32_u32(src, dst - clip);
>
> /*
> * Round toward 1.0 when clipping so that we don't accidentally
> --
> 2.23.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-11-26 14:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-22 17:56 [PATCH v2 0/4] drm/rect: Bugfixes and selftests Ville Syrjala
2019-11-22 17:56 ` [PATCH v2 1/4] drm/rect: Avoid division by zero Ville Syrjala
2019-11-22 17:56 ` Ville Syrjala
2019-11-26 14:40 ` Daniel Vetter [this message]
2019-11-26 14:40 ` Daniel Vetter
2019-11-22 17:56 ` [PATCH v2 2/4] drm/rect: Keep the scaled clip bounded Ville Syrjala
2019-11-26 14:48 ` Daniel Vetter
2019-11-26 14:48 ` Daniel Vetter
2019-11-22 17:56 ` [PATCH v2 3/4] drm/rect: Keep the clipped dst rectangle in place Ville Syrjala
2019-11-22 17:56 ` Ville Syrjala
2019-11-26 15:02 ` Daniel Vetter
2019-11-22 17:56 ` [PATCH v2 4/4] drm/selftests: Add drm_rect selftests Ville Syrjala
2019-11-22 17:56 ` Ville Syrjala
2019-11-26 15:18 ` Daniel Vetter
2019-11-26 15:18 ` [Intel-gfx] " Daniel Vetter
2019-11-27 10:19 ` [PATCH v2 0/4] drm/rect: Bugfixes and selftests Benjamin GAIGNARD
2019-11-27 10:19 ` Benjamin GAIGNARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191126144030.GY29965@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=benjamin.gaignard@st.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox