From: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
Gerd Hoffmann <kraxel@redhat.com>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH] drm/atomic-helper: Validate pointer before dereference
Date: Mon, 11 Mar 2019 18:01:20 -0300 [thread overview]
Message-ID: <20190311210120.fdixvenmqjoxuoqt@smtp.gmail.com> (raw)
The function disable_outputs() and
drm_atomic_helper_commit_modeset_enables() tries to retrieve
helper_private from the target CRTC, for dereferencing some operations.
However, the current implementation does not check whether
helper_private is null and, if not, if it has a valid pointer to a dpms
and commit functions. This commit adds pointer validations before
trying to dereference the dpms and commit function.
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
---
drivers/gpu/drm/drm_atomic_helper.c | 30 ++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 540a77a2ade9..fbeef7c461fc 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1028,14 +1028,16 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
/* Right function depends upon target state. */
- if (new_crtc_state->enable && funcs->prepare)
- funcs->prepare(crtc);
- else if (funcs->atomic_disable)
- funcs->atomic_disable(crtc, old_crtc_state);
- else if (funcs->disable)
- funcs->disable(crtc);
- else
- funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+ if (funcs) {
+ if (new_crtc_state->enable && funcs->prepare)
+ funcs->prepare(crtc);
+ else if (funcs->atomic_disable)
+ funcs->atomic_disable(crtc, old_crtc_state);
+ else if (funcs->disable)
+ funcs->disable(crtc);
+ else if (funcs->dpms)
+ funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+ }
if (!(dev->irq_enabled && dev->num_crtcs))
continue;
@@ -1277,11 +1279,13 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,
if (new_crtc_state->enable) {
DRM_DEBUG_ATOMIC("enabling [CRTC:%d:%s]\n",
crtc->base.id, crtc->name);
-
- if (funcs->atomic_enable)
- funcs->atomic_enable(crtc, old_crtc_state);
- else
- funcs->commit(crtc);
+ if (funcs) {
+ if (funcs->atomic_enable)
+ funcs->atomic_enable(crtc,
+ old_crtc_state);
+ else if (funcs->atomic_enable)
+ funcs->commit(crtc);
+ }
}
}
--
2.21.0
next reply other threads:[~2019-03-11 21:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 21:01 Rodrigo Siqueira [this message]
2019-03-11 21:47 ` [PATCH] drm/atomic-helper: Validate pointer before dereference Sam Ravnborg
2019-03-12 6:59 ` Gerd Hoffmann
2019-03-12 11:00 ` Daniel Vetter
2019-03-12 11:50 ` Rodrigo Siqueira
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=20190311210120.fdixvenmqjoxuoqt@smtp.gmail.com \
--to=rodrigosiqueiramelo@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maxime.ripard@bootlin.com \
--cc=sean@poorly.run \
/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;
as well as URLs for NNTP newsgroup(s).