Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2510487pxj; Mon, 10 May 2021 04:52:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAwGLOzfQeuO/hdq1Lz2jYcqOXgNLYYBzid4RX1O3wa1Q4IkvFs4nmaq4zEKcS6bjStJZL X-Received: by 2002:aa7:cd8b:: with SMTP id x11mr29149753edv.87.1620647463563; Mon, 10 May 2021 04:51:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620647463; cv=none; d=google.com; s=arc-20160816; b=r6COXnWYLzE1Vaxs4B0rs65ihKSwkjoYkoI7daEwJgiBZDHpyt1Iwda+wHNRWQ6mYP DGzXcG1e/aOCP46p1p+uN33oIyCFSJYj7H6oLbAyTa39SOP2AOOok+TU2y42wQr4YJqk hBtgwLTqLnAzo6vfaGEzKZeBwgbIIfhu0cxjYlcqx/NAJ55482neFdcv9qYQjSExvvNA 5lFXEJc6dWdErurOXng5ThgEXwSeevfG4jrmS7iCE6Gk06b0B0RsCL/y5ivyAIFgBM1A SuVeVlbGLwyp2Isup2yEAo+5NeW8SvNlBbf/akzx1g1UihLHEr4KgrDztjFcSs5horej bYRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CaDG8wjMoG5VPdEAUpv4yLt9bZ6/yw/ciP2XdZbSTrg=; b=sUf8nUZsgotYJPHgX0B8cgDzLfn4/GVqHLoNtvN60/RKazIHKq9y/zq2G0OjQF/wJO 4dA/ynsg+OfcrlulUHTygo9J4GRg0C41p76q2mFPkVhZJ0vkfyn2f21rMeAzwpm1wu25 doAmZmMrD4EGkCpMcvUDgETTznQmM58cOkiDbbClWISg8kRw9ZL89kTc2Di1uVGqsNRR 7ItwMTqUrlKp6ZWA4W1SrMF2fIegEDumOF5UawqYV1BZdzGvasJkEwt97kEGwc/olaYk fUZMTII8orjLdrQ2LrH3sD+DRFCxeZKkZUPuevmoIPkqa+mXivvpCPi6ExP2IxgsfcRx lmBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oR6BWdMI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a15si15061273edr.192.2021.05.10.04.50.37; Mon, 10 May 2021 04:51:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oR6BWdMI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237016AbhEJLqN (ORCPT + 99 others); Mon, 10 May 2021 07:46:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:55722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232913AbhEJK61 (ORCPT ); Mon, 10 May 2021 06:58:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CC87B61C45; Mon, 10 May 2021 10:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643942; bh=IjeMbqmB4BKCPS0cYSRxsOO2UiZlLKXeBUfuaFLY91E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oR6BWdMIDax5rMXwDnH33lzJITNXOEkngHNpuFLkhyUyWDDpniWoKT+5LeiMw/M+h C2gYnfEpMNaIXU4hSTjgWh7xIIfZrT1UfvxuKbB7HzWrZRiE5oXN9wAQQu8YV/V2Uo 5aDUOaxXyIQFf8bH5SlvgJtak6wfhCAGTDQuD8Xs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guchun Chen , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin Subject: [PATCH 5.11 224/342] drm/amdgpu: fix NULL pointer dereference Date: Mon, 10 May 2021 12:20:14 +0200 Message-Id: <20210510102017.494150488@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guchun Chen [ Upstream commit 3c3dc654333f6389803cdcaf03912e94173ae510 ] ttm->sg needs to be checked before accessing its child member. Call Trace: amdgpu_ttm_backend_destroy+0x12/0x70 [amdgpu] ttm_bo_cleanup_memtype_use+0x3a/0x60 [ttm] ttm_bo_release+0x17d/0x300 [ttm] amdgpu_bo_unref+0x1a/0x30 [amdgpu] amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu+0x78b/0x8b0 [amdgpu] kfd_ioctl_alloc_memory_of_gpu+0x118/0x220 [amdgpu] kfd_ioctl+0x222/0x400 [amdgpu] ? kfd_dev_is_large_bar+0x90/0x90 [amdgpu] __x64_sys_ioctl+0x8e/0xd0 ? __context_tracking_exit+0x52/0x90 do_syscall_64+0x33/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f97f264d317 Code: b3 66 90 48 8b 05 71 4b 2d 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 41 4b 2d 00 f7 d8 64 89 01 48 RSP: 002b:00007ffdb402c338 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007f97f3cc63a0 RCX: 00007f97f264d317 RDX: 00007ffdb402c380 RSI: 00000000c0284b16 RDI: 0000000000000003 RBP: 00007ffdb402c380 R08: 00007ffdb402c428 R09: 00000000c4000004 R10: 00000000c4000004 R11: 0000000000000246 R12: 00000000c0284b16 R13: 0000000000000003 R14: 00007f97f3cc63a0 R15: 00007f8836200000 Signed-off-by: Guchun Chen Acked-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index c074a81e8fae..a884ec5bce3e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -943,7 +943,7 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_bo_device *bdev, DMA_BIDIRECTIONAL : DMA_TO_DEVICE; /* double check that we don't free the table twice */ - if (!ttm->sg->sgl) + if (!ttm->sg || !ttm->sg->sgl) return; /* unmap the pages mapped to the device */ -- 2.30.2