From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ma Ke <make_ruc2021@163.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com,
daniel@ffwll.ch, guchun.chen@amd.com,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 6.1 20/25] drm/amdgpu/vkms: fix a possible null pointer dereference
Date: Tue, 7 Nov 2023 07:26:59 -0500 [thread overview]
Message-ID: <20231107122745.3761613-20-sashal@kernel.org> (raw)
In-Reply-To: <20231107122745.3761613-1-sashal@kernel.org>
From: Ma Ke <make_ruc2021@163.com>
[ Upstream commit cd90511557fdfb394bb4ac4c3b539b007383914c ]
In amdgpu_vkms_conn_get_modes(), the return value of drm_cvt_mode()
is assigned to mode, which will lead to a NULL pointer dereference
on failure of drm_cvt_mode(). Add a check to avoid null pointer
dereference.
Signed-off-by: Ma Ke <make_ruc2021@163.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index d60c4a2eeb0c5..06980b8527ff8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -239,6 +239,8 @@ static int amdgpu_vkms_conn_get_modes(struct drm_connector *connector)
for (i = 0; i < ARRAY_SIZE(common_modes); i++) {
mode = drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, false, false, false);
+ if (!mode)
+ continue;
drm_mode_probed_add(connector, mode);
}
--
2.42.0
next prev parent reply other threads:[~2023-11-07 12:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 12:26 [PATCH AUTOSEL 6.1 01/25] drm/gma500: Fix call trace when psb_gem_mm_init() fails Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 02/25] drm/komeda: drop all currently held locks if deadlock happens Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 03/25] drm/amdgpu: not to save bo in the case of RAS err_event_athub Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 04/25] drm/amdkfd: Fix a race condition of vram buffer unref in svm code Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 05/25] drm/amd: Update `update_pcie_parameters` functions to use uint8_t arguments Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 06/25] drm/amd/display: use full update for clip size increase of large plane source Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 07/25] string.h: add array-wrappers for (v)memdup_user() Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 08/25] kernel: kexec: copy user-array safely Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 09/25] kernel: watch_queue: " Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 10/25] drm_lease.c: " Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 11/25] drm: vmwgfx_surface.c: " Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 12/25] drm/msm/dp: skip validity check for DP CTS EDID checksum Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 13/25] drm/amd: Fix UBSAN array-index-out-of-bounds for SMU7 Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 14/25] drm/radeon: Fix UBSAN array-index-out-of-bounds for Radeon HD 5430 Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 15/25] drm/amd: Fix UBSAN array-index-out-of-bounds for Polaris and Tonga Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 16/25] drm/amdgpu: Fix potential null pointer derefernce Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 17/25] drm/panel: fix a possible null pointer dereference Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 18/25] drm/panel/panel-tpo-tpg110: " Sasha Levin
2023-11-07 12:26 ` [PATCH AUTOSEL 6.1 19/25] drm/radeon: " Sasha Levin
2023-11-07 12:26 ` Sasha Levin [this message]
2023-11-07 12:27 ` [PATCH AUTOSEL 6.1 21/25] drm/panel: st7703: Pick different reset sequence Sasha Levin
2023-11-07 12:27 ` [PATCH AUTOSEL 6.1 22/25] drm/amdkfd: Fix shift out-of-bounds issue Sasha Levin
2023-11-07 12:27 ` [PATCH AUTOSEL 6.1 23/25] drm/amdgpu: Fix a null pointer access when the smc_rreg pointer is NULL Sasha Levin
2023-11-07 12:27 ` [PATCH AUTOSEL 6.1 24/25] arm64: dts: ls208xa: use a pseudo-bus to constrain usb dma size Sasha Levin
2023-11-07 12:27 ` [PATCH AUTOSEL 6.1 25/25] selftests/efivarfs: create-read: fix a resource leak Sasha Levin
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=20231107122745.3761613-20-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=guchun.chen@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=make_ruc2021@163.com \
--cc=stable@vger.kernel.org \
/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).