diff options
| author |   jsg <jsg@openbsd.org> | 2020-08-22 06:31:19 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-08-22 06:31:19 +0000 |
| commit | 7053542a583a1b2a9f30d8ccf76fbdf56d96d38d (patch) | |
| tree | 68fe051d47619559e0defcbbe0b234be6bdf0385 /sys/dev/pci/drm/drm_dp_mst_topology.c | |
| parent | drm: Added orientation quirk for ASUS tablet model T103HAF (diff) | |
| download | wireguard-openbsd-7053542a583a1b2a9f30d8ccf76fbdf56d96d38d.tar.xz wireguard-openbsd-7053542a583a1b2a9f30d8ccf76fbdf56d96d38d.zip | |
drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi
From Xin Xiong
65ed6b7dacdb90099ebd50ca79bb72eaaf74a275 in linux 5.7.y/5.7.17
a34a0a632dd991a371fec56431d73279f9c54029 in mainline linux
Diffstat (limited to 'sys/dev/pci/drm/drm_dp_mst_topology.c')
| -rw-r--r-- | sys/dev/pci/drm/drm_dp_mst_topology.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/drm_dp_mst_topology.c b/sys/dev/pci/drm/drm_dp_mst_topology.c index 29d76d44cc8..309dc08caae 100644 --- a/sys/dev/pci/drm/drm_dp_mst_topology.c +++ b/sys/dev/pci/drm/drm_dp_mst_topology.c @@ -4329,11 +4329,11 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, { int ret; - port = drm_dp_mst_topology_get_port_validated(mgr, port); - if (!port) + if (slots < 0) return false; - if (slots < 0) + port = drm_dp_mst_topology_get_port_validated(mgr, port); + if (!port) return false; if (port->vcpi.vcpi > 0) { @@ -4349,6 +4349,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, if (ret) { DRM_DEBUG_KMS("failed to init vcpi slots=%d max=63 ret=%d\n", DIV_ROUND_UP(pbn, mgr->pbn_div), ret); + drm_dp_mst_topology_put_port(port); goto out; } DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n", |