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 044C31D0490; Wed, 2 Oct 2024 13:30:09 +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=1727875811; cv=none; b=ulLxc9DCJW9sfQfITm3Yd98b32N+XS2IVmreeQ6c3TRJY0y1bK4unuLhUHNAUTSmPbd9al6RPvxcIZF/9/n/DoK0qiWLJogHlRnLYgX8O0X06jsXVp6yqBxKq8jkl/pfG0HBuVcL10CL/ti1H/XOQ08FdrPpaa9xBbr/KIQmdjM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727875811; c=relaxed/simple; bh=IhK1dKlGDnabj+PN86Uz5S/ULkcZD6JDBTyt9SyoWkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g9j4nD+HQn7cdP4rqMxmBOtAnlou4DPrf+d9uHTKiImX/53t3Vd25e/NcyJZ4L93WT/BhBzkm0e9bK4cWnGnSFLvosNbQza/F3nW0xeyYve/HbXaKPSfKkqBuRt2nGr+FLVbCKuapE6A27vB3k1aqW565y3AovH+szqi3wan8gU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CmfyveSd; 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="CmfyveSd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0909AC4CECD; Wed, 2 Oct 2024 13:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727875809; bh=IhK1dKlGDnabj+PN86Uz5S/ULkcZD6JDBTyt9SyoWkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CmfyveSdnaBqxulqot8eLCfxPWvJVJ8NKjs1EvSs0/swiBZUcAt1Tmef1JRIuGuNA Qmr84ykvYiasV/+Lw+1CLXGQJfUf1iupgHawqRrvWbpctrdhbm5J8q1+qJ13iTZE5i AY6z7jtGeJ3G/rFj+HQgc6HumfHOYmr/pPq1z6kU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Aleksandr Mishin , Dmitry Baryshkov , Rob Clark , Sasha Levin Subject: [PATCH 6.11 229/695] drm/msm: Fix incorrect file name output in adreno_request_fw() Date: Wed, 2 Oct 2024 14:53:47 +0200 Message-ID: <20241002125831.594148965@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@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.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aleksandr Mishin [ Upstream commit e19366911340c2313a1abbb09c54eaf9bdea4f58 ] In adreno_request_fw() when debugging information is printed to the log after firmware load, an incorrect filename is printed. 'newname' is used instead of 'fwname', so prefix "qcom/" is being added to filename. Looks like "copy-paste" mistake. Fix this mistake by replacing 'newname' with 'fwname'. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 2c41ef1b6f7d ("drm/msm/adreno: deal with linux-firmware fw paths") Signed-off-by: Aleksandr Mishin Reviewed-by: Dmitry Baryshkov Patchwork: https://patchwork.freedesktop.org/patch/602382/ Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index ecc3fc5cec227..3896123ec51c9 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -478,7 +478,7 @@ adreno_request_fw(struct adreno_gpu *adreno_gpu, const char *fwname) ret = request_firmware_direct(&fw, fwname, drm->dev); if (!ret) { DRM_DEV_INFO(drm->dev, "loaded %s from legacy location\n", - newname); + fwname); adreno_gpu->fwloc = FW_LOCATION_LEGACY; goto out; } else if (adreno_gpu->fwloc != FW_LOCATION_UNKNOWN) { -- 2.43.0