]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/mst: Add range check for max_payloads during init
authorImre Deak <imre.deak@intel.com>
Fri, 29 Jan 2016 12:44:29 +0000 (14:44 +0200)
committerDave Airlie <airlied@redhat.com>
Fri, 5 Feb 2016 05:23:48 +0000 (15:23 +1000)
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>
drivers/gpu/drm/drm_dp_mst_topology.c

index 2b7c2f0688340aebf2f827875b87f488b4bf0a2b..0680e7aecac49e3694316570ad314f27112c945a 100644 (file)
@@ -2848,6 +2848,9 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
        mgr->max_dpcd_transaction_bytes = max_dpcd_transaction_bytes;
        mgr->max_payloads = max_payloads;
        mgr->conn_base_id = conn_base_id;
+       if (max_payloads + 1 > sizeof(mgr->payload_mask) * 8 ||
+           max_payloads + 1 > sizeof(mgr->vcpi_mask) * 8)
+               return -EINVAL;
        mgr->payloads = kcalloc(max_payloads, sizeof(struct drm_dp_payload), GFP_KERNEL);
        if (!mgr->payloads)
                return -ENOMEM;