From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 501C43C3F; Tue, 23 Jan 2024 00:25:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969549; cv=none; b=jg1JEhHUa3XT+iPs/5BRsaFspZxS8naoL7QIqO1p+Z2fl3tgx8OFTMECxXJ8UhcvJ8sVFCC0/Q9mAm69keIZC360rJk9MCWNpYIX6Ryc7/liVxuAMCr/R2xq3UcjqrNGgleEuT03QywC07STfVYa15eh/13XLGhuoiyh4PQAJxw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969549; c=relaxed/simple; bh=SUOFzZJ2Xh9PH9ERwAjD8i7XmIqpixwV3TfHIJX1YpU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j78Zs6IJky7hsm4NHKA/osBxKlPcL2euJooUH2tR/bN0aFBqTOAM89cYjSJhsdZXfzBkdWTyOQDZdMg3BCxNvmQH79TNEGiAygXnrUz3gaL5aWZf5d0n7Wj7I/+DrjyzrjBrGDHrZrvh7hyXbVDAmFt6dm5SpVrndvBph/mU+UA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SC7+p3yD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SC7+p3yD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1328BC43390; Tue, 23 Jan 2024 00:25:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705969549; bh=SUOFzZJ2Xh9PH9ERwAjD8i7XmIqpixwV3TfHIJX1YpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SC7+p3yDaHt7SU9tyfwRhve7iIvFIgZryVMxvYkqJxHl8ydx3y6zpdvRL8faDKAZF 5gHvzC96ftWqRwYQ2qcDfS8Mrl9E9EUVAyEwN1lMZczrSvtRCuBTQ1unvPz+nRwK37 2zxKeR15y2jrurz7A1sjhUKUt5rqhAKgw5jTW7rk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhipeng Lu , Alex Deucher , Sasha Levin Subject: [PATCH 6.7 295/641] drm/radeon/dpm: fix a memleak in sumo_parse_power_table Date: Mon, 22 Jan 2024 15:53:19 -0800 Message-ID: <20240122235827.130544301@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235818.091081209@linuxfoundation.org> References: <20240122235818.091081209@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhipeng Lu [ Upstream commit 0737df9ed0997f5b8addd6e2b9699a8c6edba2e4 ] The rdev->pm.dpm.ps allocated by kcalloc should be freed in every following error-handling path. However, in the error-handling of rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed, resulting in a memleak in this function. Fixes: 80ea2c129c76 ("drm/radeon/kms: add dpm support for sumo asics (v2)") Signed-off-by: Zhipeng Lu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/sumo_dpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c index f74f381af05f..d49c145db437 100644 --- a/drivers/gpu/drm/radeon/sumo_dpm.c +++ b/drivers/gpu/drm/radeon/sumo_dpm.c @@ -1493,8 +1493,10 @@ static int sumo_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; - if (!rdev->pm.power_state[i].clock_info) + if (!rdev->pm.power_state[i].clock_info) { + kfree(rdev->pm.dpm.ps); return -EINVAL; + } ps = kzalloc(sizeof(struct sumo_ps), GFP_KERNEL); if (ps == NULL) { kfree(rdev->pm.dpm.ps); -- 2.43.0