From: Lyude Paul <lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Daniel Vetter <daniel.vetter-/w4YWyX8dFk@public.gmane.org>,
Jerry Zuo <Jerry.Zuo-5C7GfCeVMHo@public.gmane.org>,
David Airlie <airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
Harry Wentland <harry.wentland-5C7GfCeVMHo@public.gmane.org>,
Juston Li <juston.li-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: [PATCH v4 15/16] drm/dp_mst: Check payload count in drm_dp_mst_atomic_check()
Date: Fri, 4 Jan 2019 19:15:05 -0500 [thread overview]
Message-ID: <20190105001506.30181-16-lyude@redhat.com> (raw)
In-Reply-To: <20190105001506.30181-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
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 c33c4a3aec34..fc9bcbb55417 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -3647,7 +3647,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 */
@@ -3667,6 +3667,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
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2019-01-05 0:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-05 0:14 [PATCH v4 00/16] MST refcounting/atomic helpers cleanup Lyude Paul
2019-01-05 0:14 ` [PATCH v4 01/16] drm/dp_mst: Rename drm_dp_mst_get_validated_(port|mstb)_ref and friends Lyude Paul
2019-01-05 0:15 ` [PATCH v4 10/16] drm/nouveau: Keep malloc references to MST ports Lyude Paul
2019-01-05 0:15 ` [PATCH v4 11/16] drm/nouveau: Stop unsetting mstc->port, use malloc refs Lyude Paul
[not found] ` <20190105001506.30181-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-05 0:14 ` [PATCH v4 02/16] drm/dp_mst: Introduce new refcounting scheme for mstbs and ports Lyude Paul
2019-01-08 19:00 ` Wentland, Harry
2019-01-05 0:14 ` [PATCH v4 03/16] drm/dp_mst: Restart last_connected_port_and_mstb() if topology ref fails Lyude Paul
2019-01-05 0:14 ` [PATCH v4 04/16] drm/dp_mst: Stop releasing VCPI when removing ports from topology Lyude Paul
2019-01-05 0:14 ` [PATCH v4 05/16] drm/dp_mst: Fix payload deallocation on hotplugs using malloc refs Lyude Paul
2019-01-05 0:14 ` [PATCH v4 06/16] drm/i915: Keep malloc references to MST ports Lyude Paul
2019-01-05 0:14 ` [PATCH v4 07/16] drm/amdgpu/display: Keep malloc ref to MST port Lyude Paul
2019-01-05 0:14 ` [PATCH v4 08/16] drm/nouveau: Remove bogus cleanup in nv50_mstm_add_connector() Lyude Paul
2019-01-05 0:14 ` [PATCH v4 09/16] drm/nouveau: Remove unnecessary VCPI checks in nv50_msto_cleanup() Lyude Paul
2019-01-05 0:15 ` [PATCH v4 12/16] drm/nouveau: Grab payload lock in nv50_msto_payload() Lyude Paul
2019-01-05 0:15 ` [PATCH v4 14/16] drm/dp_mst: Start tracking per-port VCPI allocations Lyude Paul
2019-01-05 0:15 ` Lyude Paul [this message]
2019-01-08 19:57 ` [PATCH v4 00/16] MST refcounting/atomic helpers cleanup Wentland, Harry
[not found] ` <a297d81b-f4e2-84ea-1c06-cf38d336ac6c-5C7GfCeVMHo@public.gmane.org>
2019-01-08 21:04 ` Lyude Paul
2019-01-05 0:15 ` [PATCH v4 13/16] drm/dp_mst: Add some atomic state iterator macros Lyude Paul
2019-01-05 0:15 ` [PATCH v4 16/16] drm/nouveau: Use atomic VCPI helpers for MST Lyude Paul
2019-01-05 0:44 ` ✗ Fi.CI.CHECKPATCH: warning for MST refcounting/atomic helpers cleanup (rev4) Patchwork
2019-01-05 0:49 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-01-05 1:01 ` ✓ Fi.CI.BAT: success " Patchwork
2019-01-05 2:33 ` ✓ Fi.CI.IGT: " Patchwork
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=20190105001506.30181-16-lyude@redhat.com \
--to=lyude-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=Jerry.Zuo-5C7GfCeVMHo@public.gmane.org \
--cc=airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=daniel.vetter-/w4YWyX8dFk@public.gmane.org \
--cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=harry.wentland-5C7GfCeVMHo@public.gmane.org \
--cc=intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=juston.li-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.