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 2725E13B5AC; Thu, 1 Aug 2024 00:10:30 +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=1722471031; cv=none; b=PrUFWlf/iuqS85wxkCnfo2/MoLjjDSofb3ytqE5f7mb0+RSJfqH5pylsGgAClZ3P7f6TW9PdVLYqhPc5Hio/bXjb68UisE7fjZBnmWFWQh48SLJXebkBbtkdkGYSmcJjWUrjkuvLcObUUs4o89Lp4hN9gI8EvWvc0cAgKgV6jKs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722471031; c=relaxed/simple; bh=0VXbUl11Rtte8Kli2pOK4K2w0PnCqNRTqNw9MqpWpOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GZeAEQ3f+Ul7W1Pn3wp/ThyDcmot9Xqxv2du5Dob0OLB5CUKMc/MS8mdwDh/A4CmuoRrmqbWfYvAahTnftEJJuBBAznZ5nXghAucpw4U2uzsKtE6w4IToOP4tfMpRKQlCHQ2b6jfXDRsaBKXpwhTQEbJrcRQGjSmyKemUbkeRFQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Sgubpro1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Sgubpro1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46381C116B1; Thu, 1 Aug 2024 00:10:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722471030; bh=0VXbUl11Rtte8Kli2pOK4K2w0PnCqNRTqNw9MqpWpOw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sgubpro1JN+OpyqCejgJPrCf6zDKUXl3711ZujYC3PdY5spkWt1b9z3OPew4KyIzM TjFuePtE8m9SFvc46Mvda7HIc1kEB6DpM3H+u8BqwRzKA7JCnusIgzSLv+AgxY8rX2 rIuBxRWlPXBGXKtvVcWlAVkvkjnb5dmS4KGoSpiKJQkC8hibfdQ+FjMLhMO3wkk+Vy c14Hyf9Yq+U3g7Vs3SvfoLYDisWIZsf8Vd7DGWSQEcbdHumn5rAfTeaPB3ePzCy7v1 jzDbdFzwFEOB+N79CxJX0Wky8RMhKBv7EvX0DTRa2Qz4p3zet68PX5KlQd7KBGwDXm BMiWmJqV83CSg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hersen Wu , Alex Hung , Harry Wentland , Tom Chung , Daniel Wheeler , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, hamza.mahfooz@amd.com, roman.li@amd.com, mario.limonciello@amd.com, Wayne.Lin@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.10 021/121] drm/amd/display: Release state memory if amdgpu_dm_create_color_properties fail Date: Wed, 31 Jul 2024 19:59:19 -0400 Message-ID: <20240801000834.3930818-21-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801000834.3930818-1-sashal@kernel.org> References: <20240801000834.3930818-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.2 Content-Transfer-Encoding: 8bit From: Hersen Wu [ Upstream commit 52cbcf980509e6190740dd1e2a1a437e8fb8101b ] [Why] Coverity reports RESOURCE_LEAK warning. State memory is not released if dm_create_color_properties fail. [How] Call kfree(state) before return. Reviewed-by: Alex Hung Reviewed-by: Harry Wentland Acked-by: Tom Chung Signed-off-by: Hersen Wu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index c893cf8f2d36e..fca6f7d4c28e2 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4206,8 +4206,11 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev) } #ifdef AMD_PRIVATE_COLOR - if (amdgpu_dm_create_color_properties(adev)) + if (amdgpu_dm_create_color_properties(adev)) { + dc_state_release(state->context); + kfree(state); return -ENOMEM; + } #endif r = amdgpu_dm_audio_init(adev); -- 2.43.0