From: Ma Ke <make24@iscas.ac.cn>
To: jani.nikula@linux.intel.com
Cc: airlied@gmail.com, daniel@ffwll.ch,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
maarten.lankhorst@linux.intel.com, make24@iscas.ac.cn,
mripard@kernel.org, noralf@tronnes.org, sam@ravnborg.org,
stable@vger.kernel.org, tzimmermann@suse.de
Subject: Re: [PATCH v3] drm/client: fix null pointer dereference in drm_client_modeset_probe
Date: Wed, 24 Jul 2024 18:55:35 +0800 [thread overview]
Message-ID: <20240724105535.1524294-1-make24@iscas.ac.cn> (raw)
In-Reply-To: <87ikwvf6ol.fsf@intel.com>
On Wed, 24 Jul 2024, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Wed, 24 Jul 2024, Ma Ke <make24@iscas.ac.cn> wrote:
> > In drm_client_modeset_probe(), the return value of drm_mode_duplicate() is
> > assigned to modeset->mode, which will lead to a possible NULL pointer
> > dereference on failure of drm_mode_duplicate(). Add a check to avoid npd.
> >
> > Cc: stable@vger.kernel.org
> > Fixes: cf13909aee05 ("drm/fb-helper: Move out modeset config code")
> > Signed-off-by: Ma Ke <make24@iscas.ac.cn>
> > ---
> > Changes in v3:
> > - modified patch as suggestions, returned error directly when failing to
> > get modeset->mode.
>
> This is not what I suggested, and you can't just return here either.
>
> BR,
> Jani.
>
I have carefully read through your comments. Based on your comments on the
patchs I submitted, I am uncertain about the appropriate course of action
following the return value check(whether to continue or to return directly,
as both are common approaches in dealing with function drm_mode_duplicate()
in Linux kernel, and such handling has received 'acked-by' in similar
vulnerabilities). Could you provide some advice on this matter? Certainly,
adding a return value check is essential, the reasons for which have been
detailed in the vulnerability description. I am looking forward to your
guidance and response. Thank you!
Best regards,
Ma Ke
>
> > Changes in v2:
> > - added the recipient's email address, due to the prolonged absence of a
> > response from the recipients.
> > - added Cc stable.
> > ---
> > drivers/gpu/drm/drm_client_modeset.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
> > index 31af5cf37a09..750b8dce0f90 100644
> > --- a/drivers/gpu/drm/drm_client_modeset.c
> > +++ b/drivers/gpu/drm/drm_client_modeset.c
> > @@ -880,6 +880,9 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,
> >
> > kfree(modeset->mode);
> > modeset->mode = drm_mode_duplicate(dev, mode);
> > + if (!modeset->mode)
> > + return 0;
> > +
> > drm_connector_get(connector);
> > modeset->connectors[modeset->num_connectors++] = connector;
> > modeset->x = offset->x;
>
> --
> Jani Nikula, Intel
next prev parent reply other threads:[~2024-07-24 10:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-24 9:45 Ma Ke
2024-07-24 10:03 ` Jani Nikula
2024-07-24 10:55 ` Ma Ke [this message]
2024-07-24 14:50 ` Jani Nikula
2024-07-25 1:38 ` Ma Ke
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=20240724105535.1524294-1-make24@iscas.ac.cn \
--to=make24@iscas.ac.cn \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=noralf@tronnes.org \
--cc=sam@ravnborg.org \
--cc=stable@vger.kernel.org \
--cc=tzimmermann@suse.de \
/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®