Skip to content

Commit 3d26e2e

Browse files
ideakgregkh
authored andcommitted
drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req()
commit 7f8b3987da54cb4d41ad2545cd4d7958b9a36bdf upstream. In case of an unknown broadcast message is sent mstb will remain unset, so check for this. Cc: Dave Airlie <airlied@redhat.com> Cc: Lyude <lyude@redhat.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Lyude <lyude@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20170719114330.26540-3-imre.deak@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3383334 commit 3d26e2e

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/gpu/drm/drm_dp_mst_topology.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2323,7 +2323,9 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)
23232323
DRM_DEBUG_KMS("Got RSN: pn: %d avail_pbn %d\n", msg.u.resource_stat.port_number, msg.u.resource_stat.available_pbn);
23242324
}
23252325

2326-
drm_dp_put_mst_branch_device(mstb);
2326+
if (mstb)
2327+
drm_dp_put_mst_branch_device(mstb);
2328+
23272329
memset(&mgr->up_req_recv, 0, sizeof(struct drm_dp_sideband_msg_rx));
23282330
}
23292331
return ret;

0 commit comments

Comments
 (0)