From: Lyude Paul <lyude@redhat.com>
To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jerry Zuo <Jerry.Zuo@amd.com>, David Airlie <airlied@redhat.com>,
Harry Wentland <harry.wentland@amd.com>
Subject: [PATCH v6 19/20] drm/dp_mst: Check payload count in drm_dp_mst_atomic_check()
Date: Thu, 10 Jan 2019 14:57:53 -0500 [thread overview]
Message-ID: <20190110195753.6234-20-lyude@redhat.com> (raw)
In-Reply-To: <20190110195753.6234-1-lyude@redhat.com>
It occurred to me that we never actually check this! So let's start
doing that.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@redhat.com>
Cc: Jerry Zuo <Jerry.Zuo@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Juston Li <juston.li@intel.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 88db6d7e1a36..196ebba8af5f 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -3641,7 +3641,7 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_topology_state *mst_state)
{
struct drm_dp_vcpi_allocation *vcpi;
- int avail_slots = 63;
+ int avail_slots = 63, payload_count = 0;
list_for_each_entry(vcpi, &mst_state->vcpis, next) {
/* Releasing VCPI is always OK-even if the port is gone */
@@ -3661,6 +3661,12 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,
avail_slots + vcpi->vcpi);
return -ENOSPC;
}
+
+ if (++payload_count > mgr->max_payloads) {
+ DRM_DEBUG_ATOMIC("[MST MGR:%p] state %p has too many payloads (max=%d)\n",
+ mgr, mst_state, mgr->max_payloads);
+ return -EINVAL;
+ }
}
DRM_DEBUG_ATOMIC("[MST MGR:%p] mst state %p VCPI avail=%d used=%d\n",
mgr, mst_state, avail_slots,
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-01-10 19:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 19:57 [PATCH v6 00/20] MST refcounting/atomic helpers cleanup Lyude Paul
2019-01-10 19:57 ` [PATCH v6 03/20] drm/dp_mst: Fix some formatting in drm_dp_mst_allocate_vcpi() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 04/20] drm/dp_mst: Fix some formatting in drm_dp_mst_deallocate_vcpi() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 05/20] drm/dp_mst: Rename drm_dp_mst_get_validated_(port|mstb)_ref and friends Lyude Paul
[not found] ` <20190110195753.6234-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-10 19:57 ` [PATCH v6 01/20] drm/dp_mst: Fix some formatting in drm_dp_add_port() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 02/20] drm/dp_mst: Fix some formatting in drm_dp_payload_send_msg() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 06/20] drm/dp_mst: Introduce new refcounting scheme for mstbs and ports Lyude Paul
2019-01-10 19:57 ` [PATCH v6 07/20] drm/dp_mst: Restart last_connected_port_and_mstb() if topology ref fails Lyude Paul
2019-01-10 19:57 ` [PATCH v6 09/20] drm/dp_mst: Fix payload deallocation on hotplugs using malloc refs Lyude Paul
2019-01-10 19:57 ` [PATCH v6 10/20] drm/i915: Keep malloc references to MST ports Lyude Paul
2019-01-10 19:57 ` [PATCH v6 11/20] drm/amdgpu/display: Keep malloc ref to MST port Lyude Paul
2019-01-10 19:57 ` [PATCH v6 12/20] drm/nouveau: Remove bogus cleanup in nv50_mstm_add_connector() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 14/20] drm/nouveau: Keep malloc references to MST ports Lyude Paul
2019-01-10 19:57 ` [PATCH v6 15/20] drm/nouveau: Stop unsetting mstc->port, use malloc refs Lyude Paul
2019-01-10 19:57 ` [PATCH v6 16/20] drm/nouveau: Grab payload lock in nv50_msto_payload() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 17/20] drm/dp_mst: Add some atomic state iterator macros Lyude Paul
2019-01-10 19:57 ` [PATCH v6 08/20] drm/dp_mst: Stop releasing VCPI when removing ports from topology Lyude Paul
2019-01-10 19:57 ` [PATCH v6 13/20] drm/nouveau: Remove unnecessary VCPI checks in nv50_msto_cleanup() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 18/20] drm/dp_mst: Start tracking per-port VCPI allocations Lyude Paul
2019-01-10 19:57 ` Lyude Paul [this message]
2019-01-10 19:57 ` [PATCH v6 20/20] drm/nouveau: Use atomic VCPI helpers for MST Lyude Paul
2019-01-11 0:43 ` [Nouveau] [PATCH v6 00/20] MST refcounting/atomic helpers cleanup Ben Skeggs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190110195753.6234-20-lyude@redhat.com \
--to=lyude@redhat.com \
--cc=Jerry.Zuo@amd.com \
--cc=airlied@redhat.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=nouveau@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox