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 DF9E1C3DA49 for ; Sun, 28 Jul 2024 15:49:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96B4E10E293; Sun, 28 Jul 2024 15:49:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="AhqfLsOQ"; dkim-atps=neutral Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 832F710E293; Sun, 28 Jul 2024 15:49:37 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id C58C2CE094B; Sun, 28 Jul 2024 15:49:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EA2FC4AF0A; Sun, 28 Jul 2024 15:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722181775; bh=rwRXqfy8vZGIuCyCYCq3SkLuG1Y6Rh0rlUUNXg9Wgc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AhqfLsOQUWAO1oQ8koi5deIPLUrcGXDuq4eUUMyE17lY9XxZ35gI7QDaUp5Kfx3of mp1CY3S8kb9m/zYPV7pCavZ7pJBnKL95b2ZdP3UnG99NXz0UQFiGOf3qSLLivzv8Cg 60mPEbtzruJwwUjCPK+swXbZtxG166voQgxQgJcR+c2ZYSEjwdkUGJRo0c4iEpyPjP /+Zt5Q+XzAD+pgVr2ko/AXH6wIdhkOept6xX3Dx4oXbYU8rJekwCE1wdxHlrLAkaej nvIVdMmEYDWZaD4NZGqFoKigMKbRPzm68oDgF3M+FNi7rdx09Di14QDDJbENtJnHbf I87dIf7LGxd4w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ma Jun , Lijo Lazar , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Hawking.Zhang@amd.com, tao.zhou1@amd.com, kevinyang.wang@amd.com, YiPeng.Chai@amd.com, Stanley.Yang@amd.com, candice.li@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 02/10] drm/amdgpu: Fix the null pointer dereference to ras_manager Date: Sun, 28 Jul 2024 11:49:00 -0400 Message-ID: <20240728154927.2050160-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728154927.2050160-1-sashal@kernel.org> References: <20240728154927.2050160-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.164 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: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Ma Jun [ Upstream commit 4c11d30c95576937c6c35e6f29884761f2dddb43 ] Check ras_manager before using it Signed-off-by: Ma Jun Reviewed-by: Lijo Lazar Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index c963b87014b69..92a4f07858785 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1509,12 +1509,15 @@ static void amdgpu_ras_interrupt_process_handler(struct work_struct *work) int amdgpu_ras_interrupt_dispatch(struct amdgpu_device *adev, struct ras_dispatch_if *info) { - struct ras_manager *obj = amdgpu_ras_find_obj(adev, &info->head); - struct ras_ih_data *data = &obj->ih_data; + struct ras_manager *obj; + struct ras_ih_data *data; + obj = amdgpu_ras_find_obj(adev, &info->head); if (!obj) return -EINVAL; + data = &obj->ih_data; + if (data->inuse == 0) return 0; -- 2.43.0