]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes
authorMa Ke <make24@iscas.ac.cn>
Tue, 25 Jun 2024 08:18:28 +0000 (16:18 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Jul 2024 07:08:31 +0000 (09:08 +0200)
commit 66edf3fb331b6c55439b10f9862987b0916b3726 upstream.

In nv17_tv_get_ld_modes(), the return value of drm_mode_duplicate() is
assigned to 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
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240625081828.2620794-1-make24@iscas.ac.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c

index 03466f04c7419162f91659f91d12cada10458a39..d3d45d52408cb3768a1e6e64a2f41f1e6a58ade3 100644 (file)
@@ -208,6 +208,8 @@ static int nv17_tv_get_ld_modes(struct drm_encoder *encoder,
                struct drm_display_mode *mode;
 
                mode = drm_mode_duplicate(encoder->dev, tv_mode);
+               if (!mode)
+                       continue;
 
                mode->clock = tv_norm->tv_enc_mode.vrefresh *
                        mode->htotal / 1000 *