diff options
author | Imre Deak <imre.deak@intel.com> | 2016-01-29 07:44:29 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-02-05 00:23:48 -0500 |
commit | 4d6a10da79fddcf7460299ab390da74ef2b592f6 (patch) | |
tree | 1a09af919fb8ab10db0d84a0b1440883ee89f913 | |
parent | 441388a8a73f905359e60518cfc18eca6aed2b6a (diff) |
drm/mst: Add range check for max_payloads during init
max_payload is limited by the space we have in
drm_dp_mst_topology_mgr::vcpi_mask,payload_mask. We need to track
max_payloads+1 IDs in these masks, see drm_dp_mst_assign_payload_id().
Add a sanity check for this.
Caught by coverity.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: David Weinehall <david.weinehall@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/drm_dp_mst_topology.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 2b7c2f068834..0680e7aecac4 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c | |||
@@ -2848,6 +2848,9 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, | |||
2848 | mgr->max_dpcd_transaction_bytes = max_dpcd_transaction_bytes; | 2848 | mgr->max_dpcd_transaction_bytes = max_dpcd_transaction_bytes; |
2849 | mgr->max_payloads = max_payloads; | 2849 | mgr->max_payloads = max_payloads; |
2850 | mgr->conn_base_id = conn_base_id; | 2850 | mgr->conn_base_id = conn_base_id; |
2851 | if (max_payloads + 1 > sizeof(mgr->payload_mask) * 8 || | ||
2852 | max_payloads + 1 > sizeof(mgr->vcpi_mask) * 8) | ||
2853 | return -EINVAL; | ||
2851 | mgr->payloads = kcalloc(max_payloads, sizeof(struct drm_dp_payload), GFP_KERNEL); | 2854 | mgr->payloads = kcalloc(max_payloads, sizeof(struct drm_dp_payload), GFP_KERNEL); |
2852 | if (!mgr->payloads) | 2855 | if (!mgr->payloads) |
2853 | return -ENOMEM; | 2856 | return -ENOMEM; |