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 A5C0613C816; Thu, 25 Jul 2024 14:53:30 +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=1721919210; cv=none; b=LrbAkigaZXiMHJzj71YlrVQvDHgyQIfzm1leuydGY0DiNqCEGNp8iNRI7/mBJDkdYF6bCcSCM78SoKvhLZfOIc600i11IL63vUyhpzaxYJ6kOe+r3E0cyXepYLjmi79FNScA13z/0S+BxMOq1R1AB4HBmuykkIhID7gglDU3jBY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721919210; c=relaxed/simple; bh=FAau1rtoTUoRMuqIE0Q/8K47DxNmISvynfd+rRzQXXA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V8KH1TMZTNx0/YXwFZyG4NBILxyn/sig9ifYWKwDz89yvi4Hh55u3abucHA/S7xxn8bnkv9k3l+gPnqRNq7SIShaQ2CtAifWMyDBCWpctTfbr0d7OpWlUATFuLAJHd3qXS5lf0XLFFcNxhL+zp4SqT28tgM0e/Pfbl1nYAAuLHQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=J9V6ELYy; 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="J9V6ELYy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17C6FC116B1; Thu, 25 Jul 2024 14:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721919210; bh=FAau1rtoTUoRMuqIE0Q/8K47DxNmISvynfd+rRzQXXA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J9V6ELYy8TO0k7fR1nEBJx8EQFpGQI2uDkf1UXlH38w6do4Mp2wQ9st+axPEgpSd9 BuH1jAerPqvLCnOH1Yw9ybamabK89Wz5cJTi93f7WX/HZx2mt1jxtlKVRXwVIVaUz0 Ig17H83+JqUBrDgyk8a5JUWs1JzpvemRdKcFXIEM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pierre-Eric Pelloux-Prayer , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 57/87] drm/radeon: check bo_va->bo is non-NULL before using it Date: Thu, 25 Jul 2024 16:37:30 +0200 Message-ID: <20240725142740.582569911@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240725142738.422724252@linuxfoundation.org> References: <20240725142738.422724252@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pierre-Eric Pelloux-Prayer [ Upstream commit 6fb15dcbcf4f212930350eaee174bb60ed40a536 ] The call to radeon_vm_clear_freed might clear bo_va->bo, so we have to check it before dereferencing it. Signed-off-by: Pierre-Eric Pelloux-Prayer Acked-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 57218263ef3b1..277a313432b28 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -653,7 +653,7 @@ static void radeon_gem_va_update_vm(struct radeon_device *rdev, if (r) goto error_unlock; - if (bo_va->it.start) + if (bo_va->it.start && bo_va->bo) r = radeon_vm_bo_update(rdev, bo_va, bo_va->bo->tbo.resource); error_unlock: -- 2.43.0