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 8EED5627F3; Tue, 23 Jan 2024 00:54:00 +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=1705971240; cv=none; b=K2ffz3awZrSBb9jLHp7BPElWzyVgyednTVR9lnjktPmhD2yhBr+oiM37q15s+XucL1KsvsxVkpJIbSa93Y745SvtawrgO8QmekNB1YeXDgVByQX46UeCtpAkeo++ZV0SLQ9xBMhGrb6USCcaxmMmaeFcJN8um+quCwl4NLfM9Ds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971240; c=relaxed/simple; bh=X/h+3iwal6ngr/iUz5oBcY8FlMwYPXDrfdcRYpG/w3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=j23H/ScWulM+G/GqTg/2hckPFKh0+Qj5z7bqrtRCPu15wTEjNzEX2mC21gvakAsVp9ZiN82Wp49nI5OcpbPkvXhgjjaYBmFdZT+OuUNbY7VJT6rMlgZYJ0jwdW0bWCzWQSsOQBbJNOXdPCL5lWFqH1Nm9cNiPbekD8kbc4SyZaA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fTjeE7oU; 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="fTjeE7oU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DC16C43399; Tue, 23 Jan 2024 00:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971240; bh=X/h+3iwal6ngr/iUz5oBcY8FlMwYPXDrfdcRYpG/w3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fTjeE7oUPf5MUcSMAG4+bamX9kHF7pZgSgAhOq9dq1GKScakb/dJcErVxz8FVfLDV Fu3d6BfA+Bi3s4zQs6hL+rZLrt54t8iB3b4sMhM0C5TLEW+xmQZBnrd+UdGW3zFIPx osXudxUwXwLBbnyz8U2xUoKj3PYz/cOpZ27pIvoU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin Subject: [PATCH 6.1 209/417] drm/amdgpu/debugfs: fix error code when smc register accessors are NULL Date: Mon, 22 Jan 2024 15:56:17 -0800 Message-ID: <20240122235759.170948037@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher [ Upstream commit afe58346d5d3887b3e49ff623d2f2e471f232a8d ] Should be -EOPNOTSUPP. Fixes: 5104fdf50d32 ("drm/amdgpu: Fix a null pointer access when the smc_rreg pointer is NULL") Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c index 8123feb1a116..06ab6066da61 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c @@ -596,7 +596,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf, int r; if (!adev->smc_rreg) - return -EPERM; + return -EOPNOTSUPP; if (size & 0x3 || *pos & 0x3) return -EINVAL; @@ -655,7 +655,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user * int r; if (!adev->smc_wreg) - return -EPERM; + return -EOPNOTSUPP; if (size & 0x3 || *pos & 0x3) return -EINVAL; -- 2.43.0