linux-kernel - Re: [PATCH v3] drm/client: fix null pointer dereference in drm_client_modeset

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <87ikwvf6ol.fsf@intel.com>
Date: Wed, 24 Jul 2024 13:03:22 +0300
From: Jani Nikula <jani.nikula@...ux.intel.com>
To: Ma Ke <make24@...as.ac.cn>, maarten.lankhorst@...ux.intel.com,
 mripard@...nel.org, tzimmermann@...e.de, airlied@...il.com,
 daniel@...ll.ch, sam@...nborg.org, noralf@...nnes.org
Cc: dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org, Ma Ke
 <make24@...as.ac.cn>, stable@...r.kernel.org
Subject: Re: [PATCH v3] drm/client: fix null pointer dereference in
 drm_client_modeset_probe

On Wed, 24 Jul 2024, Ma Ke <make24@...as.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@...r.kernel.org
> Fixes: cf13909aee05 ("drm/fb-helper: Move out modeset config code")
> Signed-off-by: Ma Ke <make24@...as.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.


> 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