From: Robert Beckett <bob.beckett@collabora.com>
To: dri-devel@lists.freedesktop.org,
Christian Koenig <christian.koenig@amd.com>,
Huang Rui <ray.huang@amd.com>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
Matthew Auld <matthew.auld@intel.com>
Cc: Robert Beckett <bob.beckett@collabora.com>, linux-kernel@vger.kernel.org
Subject: [PATCH] drm/ttm: fix potential null ptr deref in when mem space alloc fails
Date: Fri, 18 Mar 2022 19:50:04 +0000 [thread overview]
Message-ID: <20220318195004.416539-1-bob.beckett@collabora.com> (raw)
when allocating a resource in place it is common to free the buffer's
resource, then allocate a new resource in a different placement.
e.g. amdgpu_bo_create_kernel_at calls ttm_resource_free, then calls
ttm_bo_mem_space.
In this situation, bo->resource will be null as it is cleared during
the initial freeing of the previous resource.
This leads to a null deref.
Fixes: d3116756a710 (drm/ttm: rename bo->mem and make it a pointer)
Signed-off-by: Robert Beckett <bob.beckett@collabora.com>
---
drivers/gpu/drm/ttm/ttm_bo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index db3dc7ef5382..62b29ee7d040 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -875,7 +875,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
}
error:
- if (bo->resource->mem_type == TTM_PL_SYSTEM && !bo->pin_count)
+ if (bo->resource && bo->resource->mem_type == TTM_PL_SYSTEM && !bo->pin_count)
ttm_bo_move_to_lru_tail_unlocked(bo);
return ret;
--
2.25.1
next reply other threads:[~2022-03-18 19:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-18 19:50 Robert Beckett [this message]
2022-03-21 9:51 ` Christian König
2022-03-21 15:44 ` Robert Beckett
2022-03-22 7:17 ` Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220318195004.416539-1-bob.beckett@collabora.com \
--to=bob.beckett@collabora.com \
--cc=airlied@linux.ie \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.auld@intel.com \
--cc=ray.huang@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®