summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Expósito <jose.exposito89@gmail.com>2022-01-09 19:42:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-29 17:25:33 +0200
commitf85a6046f7718f11c6ad015a0ba25d897194b1ac (patch)
tree744c74731ec615933381879534d0d89b72cf214d
parent760fe32034931a8c97c773edef2f1b7c7346f43a (diff)
downloadlinux-stable-f85a6046f7718f11c6ad015a0ba25d897194b1ac.tar.gz
linux-stable-f85a6046f7718f11c6ad015a0ba25d897194b1ac.tar.bz2
linux-stable-f85a6046f7718f11c6ad015a0ba25d897194b1ac.zip
drm/amd/display: invalid parameter check in dmub_hpd_callback
commit 978ffac878fd64039f95798b15b430032d2d89d5 upstream. The function performs a check on the "adev" input parameter, however, it is used before the check. Initialize the "dev" variable after the sanity check to avoid a possible NULL pointer dereference. Fixes: e27c41d5b0681 ("drm/amd/display: Support for DMUB HPD interrupt handling") Addresses-Coverity-ID: 1493909 ("Null pointer dereference") Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: José Expósito <jose.exposito89@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 2b5e8de94082..5323d00f8f59 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -653,7 +653,7 @@ void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *not
struct drm_connector_list_iter iter;
struct dc_link *link;
uint8_t link_index = 0;
- struct drm_device *dev = adev->dm.ddev;
+ struct drm_device *dev;
if (adev == NULL)
return;
@@ -670,6 +670,7 @@ void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *not
link_index = notify->link_index;
link = adev->dm.dc->links[link_index];
+ dev = adev->dm.ddev;
drm_connector_list_iter_begin(dev, &iter);
drm_for_each_connector_iter(connector, &iter) {