From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 350C3C47DD9 for ; Mon, 22 Jan 2024 15:09:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A07E10F35C; Mon, 22 Jan 2024 15:08:58 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id A815610F356; Mon, 22 Jan 2024 15:08:56 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 2C62D611C5; Mon, 22 Jan 2024 15:08:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A20AC43394; Mon, 22 Jan 2024 15:08:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705936106; bh=w5b//J8h5GhxUfu+VtkycHarSPwgsZgDO/hO2yKIPek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NMl9pcLZBnpuuNQBmAT+djPp/QMfJ8ioyJJmxoScsSLa4ZpB7vbojwQxEtEv7uD14 13OXpQnTMLhHQq/1HbINmnMIWls40ny7EcV7wQwUhTQdayesKPqg/AEucz1bjge1gn KJjWWxr1Ga4k2lQ3A2ZbKlg9XJDV/+YhaZhM4L+lAtX1pHScijSqhCazTV6uiUPA8e 8rbzoEYs6kd+chZ7pijMF1Bin6NPeniov2RmEe2jybDUXrSIw1B4p/hyXgHahotvQ7 qsZAtKSqD62wnjJP7Il7hyqxbKfY2G7StERgoqy057VSNO8kRY5ZuoMdAYBXqhcb9v CTw6jrujDorOQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 65/73] drm/amdgpu: Fix '*fw' from request_firmware() not released in 'amdgpu_ucode_request()' Date: Mon, 22 Jan 2024 10:02:19 -0500 Message-ID: <20240122150432.992458-65-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122150432.992458-1-sashal@kernel.org> References: <20240122150432.992458-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.13 Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Xinhui.Pan@amd.com, Srinivasan Shanmugam , amd-gfx@lists.freedesktop.org, Lang.Yu@amd.com, dri-devel@lists.freedesktop.org, Lijo Lazar , lee@kernel.org, le.ma@amd.com, Stanley.Yang@amd.com, Mario Limonciello , daniel@ffwll.ch, Alex Deucher , airlied@gmail.com, =?UTF-8?q?Christian=20K=C3=B6nig?= Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Srinivasan Shanmugam [ Upstream commit 13a1851f923d9a7a78a477497295c2dfd16ad4a4 ] Fixes the below: drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c:1404 amdgpu_ucode_request() warn: '*fw' from request_firmware() not released on lines: 1404. Cc: Mario Limonciello Cc: Lijo Lazar Cc: Christian König Cc: Alex Deucher Signed-off-by: Srinivasan Shanmugam Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index 8beefc045e14..bef754177064 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -1326,9 +1326,13 @@ int amdgpu_ucode_request(struct amdgpu_device *adev, const struct firmware **fw, if (err) return -ENODEV; + err = amdgpu_ucode_validate(*fw); - if (err) + if (err) { dev_dbg(adev->dev, "\"%s\" failed to validate\n", fw_name); + release_firmware(*fw); + *fw = NULL; + } return err; } -- 2.43.0