From: Oleksandr Andrushchenko <Oleksandr_Andrushchenko@epam.com>
To: Oleksandr Andrushchenko <andr2000@gmail.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
daniel.vetter@intel.com
Cc: gustavo@padovan.org, airlied@linux.ie, seanpaul@chromium.org
Subject: Re: [PATCH v1] drm/simple_kms_helper: Fix NULL pointer dereference with no active CRTC
Date: Thu, 22 Feb 2018 08:12:48 +0200 [thread overview]
Message-ID: <1f051697-468d-76b9-a2be-16a281f57249@epam.com> (raw)
In-Reply-To: <1519279759-7803-1-git-send-email-andr2000@gmail.com>
On 02/22/2018 08:09 AM, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> It is possible that drm_simple_kms_plane_atomic_check called
> with no CRTC set, e.g. when user-space application sets CRTC_ID/FB_ID
> to 0 before doing any actual drawing. This leads to NULL pointer
> dereference because in this case new CRTC state is NULL and must be
> checked before accessing.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> ---
> Changes since initial:
> - re-worked checks for null CRTC as suggested by Daniel Vetter
> ---
> drivers/gpu/drm/drm_simple_kms_helper.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c
> index 9ca8a4a59b74..4a1dbd88b1ec 100644
> --- a/drivers/gpu/drm/drm_simple_kms_helper.c
> +++ b/drivers/gpu/drm/drm_simple_kms_helper.c
> @@ -121,12 +121,6 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
> pipe = container_of(plane, struct drm_simple_display_pipe, plane);
> crtc_state = drm_atomic_get_new_crtc_state(plane_state->state,
> &pipe->crtc);
> - if (!crtc_state->enable)
> - return 0; /* nothing to check when disabling or disabled */
> -
> - if (crtc_state->enable)
> - drm_mode_get_hv_timing(&crtc_state->mode,
> - &clip.x2, &clip.y2);
>
> ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
> &clip,
> @@ -137,7 +131,9 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
> return ret;
>
> if (!plane_state->visible)
> - return -EINVAL;
Daniel, I have put your R-b tag, but I had removed suggested
"WARN_ON(crtc_state && crtc_state->enable);"
here as it fires each time when crtc_state is not NULL.
Please let me know if this is not ok and you want me to remove
your R-b tag.
> + return 0;
> +
> + drm_mode_get_hv_timing(&crtc_state->mode, &clip.x2, &clip.y2);
>
> if (!pipe->funcs || !pipe->funcs->check)
> return 0;
Thank you,
Oleksandr
next prev parent reply other threads:[~2018-02-22 6:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-22 6:09 Oleksandr Andrushchenko
2018-02-22 6:12 ` Oleksandr Andrushchenko [this message]
2018-02-22 16:11 ` Daniel Vetter
2018-02-22 17:16 ` Oleksandr Andrushchenko
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=1f051697-468d-76b9-a2be-16a281f57249@epam.com \
--to=oleksandr_andrushchenko@epam.com \
--cc=airlied@linux.ie \
--cc=andr2000@gmail.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavo@padovan.org \
--cc=linux-kernel@vger.kernel.org \
--cc=seanpaul@chromium.org \
/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
all inboxes | Powered by JetHome®