drm/mst: Fix NULL pointer dereference in drm_dp_add_payload_part2 (again)
Subsystems (3)
PATCH 1/1 drm/mst: Fix NULL pointer dereference in drm_dp_add_payload_part2 (again)
Commit 54d217406afe (drm: use mgr->dev in drm_dbg_kms in drm_dp_add_payload_part2) appears to have been accidentially reverted as part of commit 5aa1dfcdf0a42 (drm/mst: Refactor the flow for payload allocation/removement).
I've been seeing NULL pointer dereferences in drm_dp_add_payload_part2 due to state->dev being NULL in the debug message printed if the payload allocation has failed.
This commit restores mgr->dev to avoid the Oops.
--- drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
@@ -3437,7 +3437,7 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,/* Skip failed payloads */ if (payload->payload_allocation_status !=DRM_DP_MST_PAYLOAD_ALLOCATION_DFP ) { -drm_dbg_kms (state->dev,"Part 1 of payload creation for %s failed, skipping part 2\n" , +drm_dbg_kms (mgr->dev,"Part 1 of payload creation for %s failed, skipping part 2\n" , payload->port->connector->name);return -EIO ; }
Signature · 1 line
2.44.0
As a follow up, I read through the original thread before sending this and my understanding is that this message probably shouldn't be getting printed in the first place. I've turned on KMS, ATOMIC, STATE, and DP debugging to see what shakes out. I have a KVM on my desk that I use to switch between systems fairly frequently. I'm speculating that the connecting and disconnecting is related, so I'm hopeful I can trigger it quickly.
-Jeff
Quoted 31 lines · Jeff Mahoney
Commit
54d217406afe(drm: usemgr->devindrm_dbg_kmsindrm_dp_add_payload_part2) appears to have been accidentially reverted as part of commit5aa1dfcdf0a42(drm/mst: Refactor the flow for payload allocation/removement).I've been seeing NULL pointer dereferences in
drm_dp_add_payload_part2due tostate->devbeing NULL in the debug message printed if the payload allocation has failed.This commit restores
mgr->devto avoid the Oops.Fixes 5aa1dfcdf0a42 ("drm/mst: Refactor the flow for payload allocation/removement")Signed-off-by Jeff Mahoney <[email protected]>--- drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/display/drm_dp_mst_topology.c +1
-1@@ -3437,7 +3437,7 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,/* Skip failed payloads */ if (payload->payload_allocation_status !=DRM_DP_MST_PAYLOAD_ALLOCATION_DFP ) { -drm_dbg_kms (state->dev,"Part 1 of payload creation for %s failed, skipping part 2\n" , +drm_dbg_kms (mgr->dev,"Part 1 of payload creation for %s failed, skipping part 2\n" , payload->port->connector->name);return -EIO ; }
Signature · 2 lines
Jeff Mahoney VP Engineering, Linux Systems
[Public]
Hi Jeff,
I have a patch sent for this before but not yet get reviewed. Will ping again.
https://patchwork.freedesktop.org/series/130852/
Thanks!
Regards,
Wayne
________________________________________
From: Jeff Mahoney <[email protected]>
Sent: Saturday, April 13, 2024 08:57
To: Lin, Wayne; [email protected]
Cc: [email protected]; David Airlie; Daniel Vetter; [email protected]
Subject: Re: [PATCH] drm/mst: Fix NULL pointer dereference in drm_dp_add_payload_part2 (again)
As a follow up, I read through the original thread before sending this and my understanding is that this message probably shouldn't be getting printed in the first place. I've turned on KMS, ATOMIC, STATE, and DP debugging to see what shakes out. I have a KVM on my desk that I use to switch between systems fairly frequently. I'm speculating that the connecting and disconnecting is related, so I'm hopeful I can trigger it quickly.
-Jeff
Quoted 23 lines · Jeff Mahoney
Commit
54d217406afe(drm: usemgr->devindrm_dbg_kmsindrm_dp_add_payload_part2) appears to have been accidentially reverted as part of commit5aa1dfcdf0a42(drm/mst: Refactor the flow for payload allocation/removement).I've been seeing NULL pointer dereferences in
drm_dp_add_payload_part2due tostate->devbeing NULL in the debug message printed if the payload allocation has failed.This commit restores
mgr->devto avoid the Oops.Fixes 5aa1dfcdf0a42 ("drm/mst: Refactor the flow for payload allocation/removement")Signed-off-by Jeff Mahoney <[email protected]>--- drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/display/drm_dp_mst_topology.c +0
-0
drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr, · line 3443
Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1
-1@@ -3437,7 +3437,7 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,/* Skip failed payloads */ if (payload->payload_allocation_status !=DRM_DP_MST_PAYLOAD_ALLOCATION_DFP ) { -drm_dbg_kms (state->dev,"Part 1 of payload creation for %s failed, skipping part 2\n" , +drm_dbg_kms (mgr->dev,"Part 1 of payload creation for %s failed, skipping part 2\n" , payload->port->connector->name);return -EIO ; }
--
Jeff Mahoney
VP Engineering, Linux Systems