From: Brian Masney <masneyb@onstation.org>
To: robdclark@gmail.com, sean@poorly.run,
dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
freedreno@lists.freedesktop.org, airlied@linux.ie,
daniel@ffwll.ch, linux-kernel@vger.kernel.org,
linus.walleij@linaro.org
Subject: [PATCH RFC 1/6] drm/msm: fix null pointer dereference in msm_atomic_prepare_fb()
Date: Sun, 5 May 2019 09:04:08 -0400 [thread overview]
Message-ID: <20190505130413.32253-2-masneyb@onstation.org> (raw)
In-Reply-To: <20190505130413.32253-1-masneyb@onstation.org>
_msm_gem_new() calls msm_gem_new_impl() with a NULL reservation_object
struct. msm_atomic_prepare_fb() assumes that the reservation_object is
always set, and attempts to reference a NULL pointer. Correct this by
checking to see if this value is NULL.
Signed-off-by: Brian Masney <masneyb@onstation.org>
---
drivers/gpu/drm/msm/msm_atomic.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index f5b1256e32b6..0da80a93876a 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -56,10 +56,12 @@ int msm_atomic_prepare_fb(struct drm_plane *plane,
return 0;
obj = msm_framebuffer_bo(new_state->fb, 0);
- msm_obj = to_msm_bo(obj);
- fence = reservation_object_get_excl_rcu(msm_obj->resv);
- drm_atomic_set_fence_for_plane(new_state, fence);
+ msm_obj = to_msm_bo(obj);
+ if (msm_obj->resv) {
+ fence = reservation_object_get_excl_rcu(msm_obj->resv);
+ drm_atomic_set_fence_for_plane(new_state, fence);
+ }
return msm_framebuffer_prepare(new_state->fb, kms->aspace);
}
--
2.20.1
next prev parent reply other threads:[~2019-05-05 13:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-05 13:04 [PATCH RFC 0/6] ARM: qcom: initial Nexus 5 display support Brian Masney
2019-05-05 13:04 ` Brian Masney [this message]
2019-05-05 13:04 ` [PATCH RFC 2/6] drm/msm: add dirty framebuffer helper Brian Masney
2019-05-05 13:04 ` [PATCH RFC 3/6] ARM: qcom_defconfig: add display-related options Brian Masney
2019-05-06 7:04 ` Linus Walleij
2019-05-05 13:04 ` [PATCH RFC 4/6] ARM: dts: msm8974: add display support Brian Masney
2019-05-06 7:07 ` Linus Walleij
2019-05-07 6:39 ` Bjorn Andersson
2019-05-09 2:16 ` Brian Masney
2019-05-09 2:25 ` Rob Clark
2019-05-09 3:00 ` Bjorn Andersson
2019-05-09 7:12 ` Brian Masney
2019-05-09 14:38 ` Rob Clark
2019-05-09 14:59 ` Bjorn Andersson
2019-05-05 13:04 ` [PATCH RFC 5/6] ARM: dts: qcom: msm8974-hammerhead: add support for backlight Brian Masney
2019-05-06 7:08 ` Linus Walleij
2019-05-05 13:04 ` [PATCH RFC 6/6] ARM: dts: qcom: msm8974-hammerhead: add support for display Brian Masney
2019-05-06 7:09 ` Linus Walleij
2019-05-06 6:42 ` [PATCH RFC 0/6] ARM: qcom: initial Nexus 5 display support Linus Walleij
2019-05-06 8:46 ` Brian Masney
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=20190505130413.32253-2-masneyb@onstation.org \
--to=masneyb@onstation.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.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
all inboxes | Powered by JetHome®