Skip to contentSkip to conversation

drm: fix missing reference counting decrease

PATCH In review Insu Yun 2 participants 3 messages Feb 1, 2016 – Feb 9, 2016

Subsystems (2)
lore
Share & tools
lore

Insu Yun

author
#0 lore raw

PATCH 1/1 drm: fix missing reference counting decrease

In drm_dp_mst_allocate_vcpi, it returns true in two paths, but in one path, there is no reference couting decrease.

---
 drivers/gpu/drm/drm_dp_mst_topology.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_dp_mst_topology.c +1 -0
index 6ed90a2..fe273b6 100644
@@ -2446,6 +2446,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp
 		DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", port->vcpi.vcpi, port->vcpi.pbn, pbn);
 		if (pbn == port->vcpi.pbn) {
 			*slots = port->vcpi.num_slots;
+			drm_dp_put_port(port);
 			return true;
 		}
 	}
Signature · 1 line
1.9.1
Reviewed-by Mykola Lysenko on v1 1/1
#1 lore raw

This looks good but we should probably do the same for all return paths when reference for port has been acquired.

Please see attached patch.

Thanks,
Harry

Quoted 21 lines · Insu Yun

In drm_dp_mst_allocate_vcpi, it returns true in two paths, but in one path, there is no reference couting decrease.

---
  drivers/gpu/drm/drm_dp_mst_topology.c | 1 +
  1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_dp_mst_topology.c +1 -0
index 6ed90a2..fe273b6 100644
@@ -2446,6 +2446,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp
  		DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", port->vcpi.vcpi, port->vcpi.pbn, pbn);
  		if (pbn == port->vcpi.pbn) {
  			*slots = port->vcpi.num_slots;
+			drm_dp_put_port(port);
  			return true;
  		}
  	}
Quoted 1 line

From a6d4dc6206f06a3d1acc05ea5bf3b4885cc96a0a Mon Sep 17 00:00:00 2001

From: Harry Wentland <[email protected]>
Date: Tue, 9 Feb 2016 09:33:11 -0500
Subject: [PATCH] drm/dp/mst: Fix missing ref count decrease

Decrease ref count for port on all exit conditions.

---
 drivers/gpu/drm/drm_dp_mst_topology.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +5 -4
index 5662e68ecccd..fa50fd0cb5ef 100644
@@ -2498,7 +2498,8 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp
 		DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", port->vcpi.vcpi, port->vcpi.pbn, pbn);
 		if (pbn == port->vcpi.pbn) {
 			*slots = port->vcpi.num_slots;
-			return true;
+			ret = 0;
+			goto out;
 		}
 	}
 
@@ -2510,10 +2511,10 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp
 	DRM_DEBUG_KMS("initing vcpi for %d %d\n", pbn, port->vcpi.num_slots);
 	*slots = port->vcpi.num_slots;
 
-	drm_dp_put_port(port);
-	return true;
+	ret = 0;
 out:
-	return false;
+	drm_dp_put_port(port);
+	return ret == 0;
 }
 EXPORT_SYMBOL(drm_dp_mst_allocate_vcpi);
 
Signature · 1 line
2.1.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#2 lore raw

For me, it is good :)

Quoted 37 lines · Harry Wentland

This looks good but we should probably do the same for all return paths when reference for port has been acquired.

Please see attached patch.

Thanks,
Harry

Quoted 24 lines · Insu Yun

In drm_dp_mst_allocate_vcpi, it returns true in two paths, but in one path, there is no reference couting decrease.

---
  drivers/gpu/drm/drm_dp_mst_topology.c | 1 +
  1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_dp_mst_topology.c +0 -0
index 6ed90a2..fe273b6 100644
@@ -2446,6 +2446,7 @@ bool drm_dp_mst_allocate_vcpi(struct

drm_dp_mst_topology_mgr *mgr, struct drm_dp
DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn

%d - requested pbn %d\n", port->vcpi.vcpi, port->vcpi.pbn, pbn);
                if (pbn == port->vcpi.pbn) {
                        *slots = port->vcpi.num_slots;
+                       drm_dp_put_port(port);
                        return true;
                }
        }
Signature · 2 lines
Regards
Insu Yun

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel