diff options
| author | Ma Ke <make24@iscas.ac.cn> | 2024-06-25 16:10:29 +0800 |
|---|---|---|
| committer | Lyude Paul <lyude@redhat.com> | 2024-06-25 15:30:33 -0400 |
| commit | 6d411c8ccc0137a612e0044489030a194ff5c843 (patch) | |
| tree | 1116633dcbedcc3a5052614f3914a3d2b3eb3934 | |
| parent | 37ce99b77762256ec9fda58d58fd613230151456 (diff) | |
| download | linux-6d411c8ccc0137a612e0044489030a194ff5c843.tar.gz linux-6d411c8ccc0137a612e0044489030a194ff5c843.tar.bz2 linux-6d411c8ccc0137a612e0044489030a194ff5c843.zip | |
drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes
In nv17_tv_get_hd_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(). The same applies to drm_cvt_mode().
Add a check to avoid null pointer dereference.
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/20240625081029.2619437-1-make24@iscas.ac.cn
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c index 670c9739e5e1..9c3dc9a5bb46 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c @@ -258,6 +258,8 @@ static int nv17_tv_get_hd_modes(struct drm_encoder *encoder, if (modes[i].hdisplay == output_mode->hdisplay && modes[i].vdisplay == output_mode->vdisplay) { mode = drm_mode_duplicate(encoder->dev, output_mode); + if (!mode) + continue; mode->type |= DRM_MODE_TYPE_PREFERRED; } else { @@ -265,6 +267,8 @@ static int nv17_tv_get_hd_modes(struct drm_encoder *encoder, modes[i].vdisplay, 60, false, (output_mode->flags & DRM_MODE_FLAG_INTERLACE), false); + if (!mode) + continue; } /* CVT modes are sometimes unsuitable... */ |