From: Tyler Hicks <tyhicks@canonical.com>
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Gen Zhang <blackgod016574@gmail.com>,
sean@poorly.run, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm_edid-load: Fix a missing-check bug in drivers/gpu/drm/drm_edid_load.c
Date: Tue, 18 Jun 2019 17:38:49 -0500 [thread overview]
Message-ID: <20190618223848.GD6248@lindsey> (raw)
In-Reply-To: <87o93u7d3s.fsf@intel.com>
On 2019-05-22 17:55:35, Jani Nikula wrote:
> On Wed, 22 May 2019, Gen Zhang <blackgod016574@gmail.com> wrote:
> > In drm_load_edid_firmware(), fwstr is allocated by kstrdup(). And fwstr
> > is dereferenced in the following codes. However, memory allocation
> > functions such as kstrdup() may fail and returns NULL. Dereferencing
> > this null pointer may cause the kernel go wrong. Thus we should check
> > this kstrdup() operation.
> > Further, if kstrdup() returns NULL, we should return ERR_PTR(-ENOMEM) to
> > the caller site.
>
> strsep() handles the NULL pointer just fine, so there won't be a NULL
> dereference. However this patch seems like the right thing to do anyway.
I came across this thread while triaging CVE-2019-12382. I agree that
the code before was fine but more complex than necessary. There's no
real security impact here since a NULL pointer dereference was not
possible. I've requested that MITRE reject CVE-2019-12382.
This change is a nice improvement, though.
Tyler
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>
> >
> > Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
> >
> > ---
> > diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
> > index a491509..a0e107a 100644
> > --- a/drivers/gpu/drm/drm_edid_load.c
> > +++ b/drivers/gpu/drm/drm_edid_load.c
> > @@ -290,6 +290,8 @@ struct edid *drm_load_edid_firmware(struct drm_connector *connector)
> > * the last one found one as a fallback.
> > */
> > fwstr = kstrdup(edid_firmware, GFP_KERNEL);
> > + if (!fwstr)
> > + return ERR_PTR(-ENOMEM);
> > edidstr = fwstr;
> >
> > while ((edidname = strsep(&edidstr, ","))) {
> > ---
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Jani Nikula, Intel Open Source Graphics Center
prev parent reply other threads:[~2019-06-18 22:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 12:39 [PATCH] drm_edid-load: Fix a missing-check bug in drivers/gpu/drm/drm_edid_load.c Gen Zhang
2019-05-22 14:55 ` Jani Nikula
2019-05-24 2:32 ` [PATCH] drm_edid-load: Fix a missing-check bug in drm_load_edid_firmware() Gen Zhang
2019-05-24 18:02 ` Jani Nikula
2019-06-18 22:38 ` Tyler Hicks [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=20190618223848.GD6248@lindsey \
--to=tyhicks@canonical.com \
--cc=blackgod016574@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--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).