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 92CABC0032E for ; Tue, 7 Nov 2023 12:31:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01F0D10E5CB; Tue, 7 Nov 2023 12:31:27 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 281AA10E5CA; Tue, 7 Nov 2023 12:31:25 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8C3FE611E0; Tue, 7 Nov 2023 12:31:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67DC3C433CA; Tue, 7 Nov 2023 12:31:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699360284; bh=9nm4Z8c6OhEMnJ7ocPEBQyBSRrMl2l0AxZ6jPHbvYRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ApdywHBqpolnEXDIpjpFUQuylO3I2QmzvNTFiEFBM/xhJVAIzLvUqRM7PeN3hEzEq I+pTyJOdK7nfL2XCpOrSffBP10jP/R08cvWRtXZLZauhkYkeF8eL3qrBAzSr7pC2B6 JOLJB7TeDpTZx2x+m7t+dvy77chHInWUzQ5lgWskuNgm5yE9lr6BIbcPqkBCkRwz9q P/Bc6PPT8hf1b9ZwezZaabYqi3XhrpPtgIQC9iXTLWEX2KfSEcRInK8okUb1z+bcCG ZtTgUAn/+ZmpW139TSW2eW0unYXkEm2he84werhzN5DiyHtEFdxAbFXK5umYIJq1Jt oVJrdBDr3q3TA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 06/11] drm/amdgpu: Fix potential null pointer derefernce Date: Tue, 7 Nov 2023 07:30:39 -0500 Message-ID: <20231107123100.3762796-6-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107123100.3762796-1-sashal@kernel.org> References: <20231107123100.3762796-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.199 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 , Tao Zhou , andrealmeid@igalia.com, shashank.sharma@amd.com, dri-devel@lists.freedesktop.org, Xinhui.Pan@amd.com, amd-gfx@lists.freedesktop.org, lijo.lazar@amd.com, le.ma@amd.com, "Stanley.Yang" , mario.limonciello@amd.com, daniel@ffwll.ch, Alex Deucher , srinivasan.shanmugam@amd.com, candice.li@amd.com, airlied@gmail.com, christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: "Stanley.Yang" [ Upstream commit 80285ae1ec8717b597b20de38866c29d84d321a1 ] The amdgpu_ras_get_context may return NULL if device not support ras feature, so add check before using. Signed-off-by: Stanley.Yang Reviewed-by: Tao Zhou Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index f0db9724ca85e..a093f1b277244 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4530,7 +4530,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, * Flush RAM to disk so that after reboot * the user can read log and see why the system rebooted. */ - if (need_emergency_restart && amdgpu_ras_get_context(adev)->reboot) { + if (need_emergency_restart && amdgpu_ras_get_context(adev) && + amdgpu_ras_get_context(adev)->reboot) { DRM_WARN("Emergency reboot."); ksys_sync_helper(); -- 2.42.0 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6E53C04A68 for ; Tue, 7 Nov 2023 12:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235238AbjKGMow (ORCPT ); Tue, 7 Nov 2023 07:44:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344018AbjKGMoT (ORCPT ); Tue, 7 Nov 2023 07:44:19 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B869BA24F; Tue, 7 Nov 2023 04:31:24 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67DC3C433CA; Tue, 7 Nov 2023 12:31:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699360284; bh=9nm4Z8c6OhEMnJ7ocPEBQyBSRrMl2l0AxZ6jPHbvYRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ApdywHBqpolnEXDIpjpFUQuylO3I2QmzvNTFiEFBM/xhJVAIzLvUqRM7PeN3hEzEq I+pTyJOdK7nfL2XCpOrSffBP10jP/R08cvWRtXZLZauhkYkeF8eL3qrBAzSr7pC2B6 JOLJB7TeDpTZx2x+m7t+dvy77chHInWUzQ5lgWskuNgm5yE9lr6BIbcPqkBCkRwz9q P/Bc6PPT8hf1b9ZwezZaabYqi3XhrpPtgIQC9iXTLWEX2KfSEcRInK8okUb1z+bcCG ZtTgUAn/+ZmpW139TSW2eW0unYXkEm2he84werhzN5DiyHtEFdxAbFXK5umYIJq1Jt oVJrdBDr3q3TA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Stanley.Yang" , Tao Zhou , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, mario.limonciello@amd.com, Hawking.Zhang@amd.com, lijo.lazar@amd.com, candice.li@amd.com, le.ma@amd.com, shashank.sharma@amd.com, andrealmeid@igalia.com, srinivasan.shanmugam@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.10 06/11] drm/amdgpu: Fix potential null pointer derefernce Date: Tue, 7 Nov 2023 07:30:39 -0500 Message-ID: <20231107123100.3762796-6-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107123100.3762796-1-sashal@kernel.org> References: <20231107123100.3762796-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.199 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "Stanley.Yang" [ Upstream commit 80285ae1ec8717b597b20de38866c29d84d321a1 ] The amdgpu_ras_get_context may return NULL if device not support ras feature, so add check before using. Signed-off-by: Stanley.Yang Reviewed-by: Tao Zhou Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index f0db9724ca85e..a093f1b277244 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4530,7 +4530,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, * Flush RAM to disk so that after reboot * the user can read log and see why the system rebooted. */ - if (need_emergency_restart && amdgpu_ras_get_context(adev)->reboot) { + if (need_emergency_restart && amdgpu_ras_get_context(adev) && + amdgpu_ras_get_context(adev)->reboot) { DRM_WARN("Emergency reboot."); ksys_sync_helper(); -- 2.42.0 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 6F0F5C4332F for ; Tue, 7 Nov 2023 12:31:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9DFC010E5CA; Tue, 7 Nov 2023 12:31:27 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 281AA10E5CA; Tue, 7 Nov 2023 12:31:25 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8C3FE611E0; Tue, 7 Nov 2023 12:31:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67DC3C433CA; Tue, 7 Nov 2023 12:31:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699360284; bh=9nm4Z8c6OhEMnJ7ocPEBQyBSRrMl2l0AxZ6jPHbvYRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ApdywHBqpolnEXDIpjpFUQuylO3I2QmzvNTFiEFBM/xhJVAIzLvUqRM7PeN3hEzEq I+pTyJOdK7nfL2XCpOrSffBP10jP/R08cvWRtXZLZauhkYkeF8eL3qrBAzSr7pC2B6 JOLJB7TeDpTZx2x+m7t+dvy77chHInWUzQ5lgWskuNgm5yE9lr6BIbcPqkBCkRwz9q P/Bc6PPT8hf1b9ZwezZaabYqi3XhrpPtgIQC9iXTLWEX2KfSEcRInK8okUb1z+bcCG ZtTgUAn/+ZmpW139TSW2eW0unYXkEm2he84werhzN5DiyHtEFdxAbFXK5umYIJq1Jt oVJrdBDr3q3TA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 06/11] drm/amdgpu: Fix potential null pointer derefernce Date: Tue, 7 Nov 2023 07:30:39 -0500 Message-ID: <20231107123100.3762796-6-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107123100.3762796-1-sashal@kernel.org> References: <20231107123100.3762796-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.199 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Tao Zhou , andrealmeid@igalia.com, shashank.sharma@amd.com, dri-devel@lists.freedesktop.org, Xinhui.Pan@amd.com, amd-gfx@lists.freedesktop.org, lijo.lazar@amd.com, le.ma@amd.com, "Stanley.Yang" , mario.limonciello@amd.com, Alex Deucher , srinivasan.shanmugam@amd.com, candice.li@amd.com, christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: "Stanley.Yang" [ Upstream commit 80285ae1ec8717b597b20de38866c29d84d321a1 ] The amdgpu_ras_get_context may return NULL if device not support ras feature, so add check before using. Signed-off-by: Stanley.Yang Reviewed-by: Tao Zhou Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index f0db9724ca85e..a093f1b277244 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4530,7 +4530,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, * Flush RAM to disk so that after reboot * the user can read log and see why the system rebooted. */ - if (need_emergency_restart && amdgpu_ras_get_context(adev)->reboot) { + if (need_emergency_restart && amdgpu_ras_get_context(adev) && + amdgpu_ras_get_context(adev)->reboot) { DRM_WARN("Emergency reboot."); ksys_sync_helper(); -- 2.42.0