From: Sean Paul <sean@poorly.run>
To: Rob Clark <robdclark@gmail.com>
Cc: Brian Masney <masneyb@onstation.org>,
Jordan Crouse <jcrouse@codeaurora.org>,
Rob Clark <robdclark@chromium.org>,
Sean Paul <seanpaul@chromium.org>,
Jean-Philippe Brucker <jean-philippe.brucker@arm.com>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
Douglas Anderson <dianders@chromium.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Airlie <airlied@linux.ie>,
"Kristian H. Kristensen" <hoegsberg@google.com>,
Daniel Vetter <daniel@ffwll.ch>,
freedreno <freedreno@lists.freedesktop.org>
Subject: Re: [Freedreno] [PATCH] drm/msm: correct NULL pointer dereference in context_init
Date: Mon, 22 Jul 2019 14:22:22 -0400 [thread overview]
Message-ID: <20190722182222.GG104440@art_vandelay> (raw)
In-Reply-To: <CAF6AEGvFE46aKCBP5de_Bx_hFcTyF0Vc9B1PebBZjGZmw9zh2g@mail.gmail.com>
On Fri, Jun 28, 2019 at 05:57:26AM -0700, Rob Clark wrote:
> On Wed, Jun 26, 2019 at 7:05 PM Brian Masney <masneyb@onstation.org> wrote:
> >
> > Correct attempted NULL pointer dereference in context_init() when
> > running without an IOMMU.
> >
> > Signed-off-by: Brian Masney <masneyb@onstation.org>
> > Fixes: 295b22ae596c ("drm/msm: Pass the MMU domain index in struct msm_file_private")
> > ---
> > The no IOMMU case seems like functionality that we may want to keep
> > based on this comment:
> > https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/msm/adreno/a3xx_gpu.c#L523
> > Once I get the msm8974 interconnect driver done, I'm going to look into
> > what needs to be done to get the IOMMU working on the Nexus 5.
> >
> > Alternatively, for development purposes, maybe we could have a NOOP
> > IOMMU driver that would allow us to remove these NULL checks that are
> > sprinkled throughout the code. I haven't looked into this in detail.
> > Thoughts?
>
> yeah, we probably want to keep !iommu support, it is at least useful
> for bringup of new (or old) devices. But tends to bitrot a since it
> isn't a case that gets tested much once iommu is in place. Perhaps
> there is a way to have a null iommu/aspace, although I'm not quite
> sure how that would work..
>
> Anyways,
>
> Reviewed-by: Rob Clark <robdclark@gmail.com>
>
> (I guess this can go in via drm-misc-fixes unless we get some more
> fixes to justify sending msm-fixes MR..)
Applied to drm-misc-fixes for 5.3
Sean
>
> >
> > drivers/gpu/drm/msm/msm_drv.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
> > index 451bd4508793..83047cb2c735 100644
> > --- a/drivers/gpu/drm/msm/msm_drv.c
> > +++ b/drivers/gpu/drm/msm/msm_drv.c
> > @@ -619,7 +619,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file)
> >
> > msm_submitqueue_init(dev, ctx);
> >
> > - ctx->aspace = priv->gpu->aspace;
> > + ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL;
> > file->driver_priv = ctx;
> >
> > return 0;
> > --
> > 2.20.1
> >
> > _______________________________________________
> > Freedreno mailing list
> > Freedreno@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/freedreno
--
Sean Paul, Software Engineer, Google / Chromium OS
prev parent reply other threads:[~2019-07-22 18:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 2:05 [PATCH] drm/msm: correct NULL pointer dereference in context_init Brian Masney
2019-06-28 12:57 ` [Freedreno] " Rob Clark
2019-07-22 18:22 ` Sean Paul [this message]
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=20190722182222.GG104440@art_vandelay \
--to=sean@poorly.run \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=hoegsberg@google.com \
--cc=jcrouse@codeaurora.org \
--cc=jean-philippe.brucker@arm.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masneyb@onstation.org \
--cc=robdclark@chromium.org \
--cc=robdclark@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).