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 88FC760DC3; Tue, 23 Jan 2024 00:45:19 +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=1705970719; cv=none; b=A5e39eebWJdqAofPisBmig+lyRyzz+v6bPdNnqGfCAkP3DiiDGDFd2kE/mSKd/udeIjFfvoOcLXJSUI/DnvpER6ZgjGk4gxaviE61VDPzeFCnnNGowWT6nUA73SNRIm4cpkOp6tHdvfcKi7oVvLRaNacnYNzXH/UQHjyDvD+5/w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705970719; c=relaxed/simple; bh=l9IsJdDiUKH5P40vL+2sL64bWpDik1rFeCQtD0zqBws=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=G9eu21m1RxJg9+HNBOwfQooSLGUrR3chb4bV8tCSWTxTnmQPt5GeAdHrhvxD4EN3K9Eg9081aK3xQgE6RRav9FCH5sL1xEtoOI5TGjF0R2WLoxeGus9cc4BvrEgimqT6CBvQyTSbRlzXSDKwRWLkz7vvFkDeGkxk8fB/7vCF3vc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FXuuvLq8; 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="FXuuvLq8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EEBDC433C7; Tue, 23 Jan 2024 00:45:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705970719; bh=l9IsJdDiUKH5P40vL+2sL64bWpDik1rFeCQtD0zqBws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FXuuvLq8oI2eHyjMbAAYaPXzoqZSxgxQsIVR1NiyAW4y0EuC6bgdZMlvE4fXsaxWF URuxJCHF8ttegPPJp0kqO0VUuArPpq9XBb1DLZAzmvbY1VhrX/UD1Vf3jP0wo34ZrQ S2oJznRH+Dt+KOFIBKnDgbr9ztUHyLNXXwriz7nc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Christian=20K=C3=B6nig?= , Lu Yao , Alex Deucher , Sasha Levin Subject: [PATCH 5.10 006/286] drm/amdgpu: Fix cat debugfs amdgpu_regs_didt causes kernel null pointer Date: Mon, 22 Jan 2024 15:55:12 -0800 Message-ID: <20240122235732.253987450@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235732.009174833@linuxfoundation.org> References: <20240122235732.009174833@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lu Yao [ Upstream commit 2161e09cd05a50d80736fe397145340d2e8f6c05 ] For 'AMDGPU_FAMILY_SI' family cards, in 'si_common_early_init' func, init 'didt_rreg' and 'didt_wreg' to 'NULL'. But in func 'amdgpu_debugfs_regs_didt_read/write', using 'RREG32_DIDT' 'WREG32_DIDT' lacks of relevant judgment. And other 'amdgpu_ip_block_version' that use these two definitions won't be added for 'AMDGPU_FAMILY_SI'. So, add null pointer judgment before calling. Reviewed-by: Christian König Signed-off-by: Lu Yao Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c index 48df32dd352e..3e573077368b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c @@ -459,6 +459,9 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, if (size & 0x3 || *pos & 0x3) return -EINVAL; + if (!adev->didt_rreg) + return -EOPNOTSUPP; + r = pm_runtime_get_sync(adev_to_drm(adev)->dev); if (r < 0) { pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); @@ -518,6 +521,9 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user if (size & 0x3 || *pos & 0x3) return -EINVAL; + if (!adev->didt_wreg) + return -EOPNOTSUPP; + r = pm_runtime_get_sync(adev_to_drm(adev)->dev); if (r < 0) { pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); -- 2.43.0