From:   Bernard Zhao <bernard@vivo.com>
To:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc:     Bernard Zhao <bernard@vivo.com>
Subject: [PATCH] gpu/drm: fix potential memleak in error branch
Date:   Tue, 16 Nov 2021 04:47:51 -0800
Message-Id: <20211116124751.31181-1-bernard@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wp1LzpcX7tieuBHg0ac5zM+LO0vM7giXUMS5/fcy0QP2umufAd9oV9qKIEOS?=
 =?us-ascii?Q?vUKp7eYrYXwva9BHrDPOFI+w92M5GU0C+9w87Lizrql6+SeEs2y5W5O2FZc2?=
 =?us-ascii?Q?9yLzBhgd9BU6KSR8n1hCO4ZXHC9P6c3S1Sa3cNsVV6meYfDDmk8nigwgsndt?=
 =?us-ascii?Q?T2DKTQLIlVHTosdVUrXXAkDOKCqT3dCezeYU+vg0blC/vJ8oW49GTE5Dc9vx?=
 =?us-ascii?Q?Mrw7bdIBQsWbc+D+MDQqsISUd99Ef7pfk6LLlc9brT6whwnY/pv7cDk9crPt?=
 =?us-ascii?Q?k/q20SnGDlQulWyPrSuYxq6o2U3iYwApA96w10gkKhNhyK5d5mtmJ6eyv7PE?=
 =?us-ascii?Q?GVaeFdgEPiGy/BtNHwKkC0GTTN7Uk3u38M4LU+3LwQ2LlrXrO2F0BRk3xWL0?=
 =?us-ascii?Q?IfwGyIpmiwr553u/UJxpkqCNJ/ahok0UYjMBI08U7/KhrxMYxfmlVEPeauON?=
 =?us-ascii?Q?9Lk0+NAyexCnjzkTgn5W8THkr2tY3+Fnpk3zvVJITDqr0xAFvF4xHPbk/9AM?=
 =?us-ascii?Q?0fAKIhHrXQpMpo+5Jfs39NR6TI7kpdwDArlyv95/k3E69LAxiaPWJezPqF65?=
 =?us-ascii?Q?WH98OcdAlak2fIQuJx4XO+MSfC1gxBMh/9/qLsnelcMy1qo+YwrvGOqe3JpY?=
 =?us-ascii?Q?UZnwOnI9GtAj9otVJyibRLn/B5nBy/8Qmn30FDvUkWJLdeip5mxi1Al9TTlb?=
 =?us-ascii?Q?0ih2K6e0N6WV+6uGEcV+0FfqxIBjPrg9ZF0kgtbfu9tBjFFYz2xjJ9YxumXQ?=
 =?us-ascii?Q?jETRMNnP5LA5WBIZx+MuF0fmimsYa2QAOVRGgDEHBdMBLJdva/5FpE52ezVA?=
 =?us-ascii?Q?SXtve4POUhCVB4BIv60ZBudQ/fakZzJvuEFrYIJ+SDGqgwS6YpPNgs+2g7Ki?=
 =?us-ascii?Q?WFDYD00xQYIeYknr0UBszesDZdpkqwjK/NzTKiGitFyDrOYaj7oAN+pAyxbX?=
 =?us-ascii?Q?ftxM41TX7A8u7meYhniGaCMJP7M62ypsk3JMdyqEQ4ENt0cgzK0oVv3MYD7S?=
 =?us-ascii?Q?ryrpmgOUV99z94HfBT/LugS+l7P5E67Gs/GY5eFvtzrKAqp4mnCqqf0le3gy?=
 =?us-ascii?Q?ZAQTpxGgQNcZHLyNJPJtcHlnF7jR9FzQgK8xyUZJ8X5Zgv2PLuB9T+GOrHzy?=
 =?us-ascii?Q?r6QXEftfjRNxKc1BSU8oUBLOIeo4x8FxWr41lLSNOlKjjCAPlPgZmzIVZvZB?=
 =?us-ascii?Q?00yrnyFXN107n5smG3qxfXsY0Mm23DSx4V+TzYYHl0+bEUerdnozkA2HqEHG?=
 =?us-ascii?Q?9dfYmuy7lDLGTKRWjE07OJgwfNyIafSZwQonm2Ih8LPQk0HDSVvefUFwRfuA?=
 =?us-ascii?Q?2eW3eUDCUmupSIwUIIypEd3YiT1evXbwvcGjvCdezdD6+is+fLXkz5V9cXO+?=
 =?us-ascii?Q?JfOe1VydHm/vMWOMuLOmNis9IcdvQsAGct6kdQxwINWTRX5ywi3tmKb0TBW0?=
 =?us-ascii?Q?MIIm0n6DD2p3a9BLY1NUZraigN/WCqadPthAwbAFPgrHU1cyTYv1JJvKoU7k?=
 =?us-ascii?Q?6acD1CgXJutyCU2+Klrd/y/a4EbMTuXOlASYZN7pRhrfg/TVcmLcnJ1hlkV/?=
 =?us-ascii?Q?rs3oyw6tnwgmRrhiLN8bWdkfHASsl3SNhlT8qlqMWrME/ZbksW803Zgo2ZF1?=
 =?us-ascii?Q?Wgd+bY8LaBvdpZsCcoFQN6Q=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7375d6cb-4540-45ea-f255-08d9a8ff52e6
X-MS-Exchange-CrossTenant-AuthSource: PSAPR06MB4021.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2021 12:48:01.3566
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0Iu8+zFRPQAUqD5tZggTqpML0lqUAtCd52LpLdI/49DMBwo+boOb2d5hfvsq2y3AXjqbiwmFfYV9BOgVTutGuA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB4103
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This patch try to fix potential memleak in error branch.

Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index f3d79eda94bb..f73b180dee73 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -5501,7 +5501,10 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
 				 int max_lane_count, int max_link_rate,
 				 int conn_base_id)
 {
-	struct drm_dp_mst_topology_state *mst_state;
+	struct drm_dp_mst_topology_state *mst_state = NULL;
+
+	mgr->payloads = NULL;
+	mgr->proposed_vcpis = NULL;
 
 	mutex_init(&mgr->lock);
 	mutex_init(&mgr->qlock);
@@ -5523,7 +5526,7 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
 	 */
 	mgr->delayed_destroy_wq = alloc_ordered_workqueue("drm_dp_mst_wq", 0);
 	if (mgr->delayed_destroy_wq == NULL)
-		return -ENOMEM;
+		goto out;
 
 	INIT_WORK(&mgr->work, drm_dp_mst_link_probe_work);
 	INIT_WORK(&mgr->tx_work, drm_dp_tx_work);
@@ -5539,18 +5542,18 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
 	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;
+		goto failed;
 	mgr->payloads = kcalloc(max_payloads, sizeof(struct drm_dp_payload), GFP_KERNEL);
 	if (!mgr->payloads)
-		return -ENOMEM;
+		goto failed;
 	mgr->proposed_vcpis = kcalloc(max_payloads, sizeof(struct drm_dp_vcpi *), GFP_KERNEL);
 	if (!mgr->proposed_vcpis)
-		return -ENOMEM;
+		goto failed;
 	set_bit(0, &mgr->payload_mask);
 
 	mst_state = kzalloc(sizeof(*mst_state), GFP_KERNEL);
 	if (mst_state == NULL)
-		return -ENOMEM;
+		goto failed;
 
 	mst_state->total_avail_slots = 63;
 	mst_state->start_slot = 1;
@@ -5563,6 +5566,13 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
 				    &drm_dp_mst_topology_state_funcs);
 
 	return 0;
+
+failed:
+	kfree(mgr->proposed_vcpis);
+	kfree(mgr->payloads);
+	destroy_workqueue(mgr->delayed_destroy_wq);
+out:
+	return -ENOMEM;
 }
 EXPORT_SYMBOL(drm_dp_mst_topology_mgr_init);
 
-- 
2.33.1