Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <christian.koenig@amd.com>
To: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Nitin Gote" <nitin.r.gote@intel.com>,
	intel-xe@lists.freedesktop.org
Cc: stable@vger.kernel.org, Matthew Auld <matthew.auld@intel.com>
Subject: Re: [PATCH] drm/ttm: Fix UAF on dma-buf attach failure for sg BOs
Date: Wed, 1 Jul 2026 15:20:47 +0200	[thread overview]
Message-ID: <b32a5081-545f-4703-ad88-ce54cc1efe09@amd.com> (raw)
In-Reply-To: <dfed18b63a7b6cf164b3af7f65df8b4a1b9dbdf2.camel@linux.intel.com>

On 7/1/26 14:59, Thomas Hellström wrote:
> Hi, Nitin
> 
> On Wed, 2026-07-01 at 11:56 +0530, Nitin Gote wrote:
>> When a dma-buf importer creates a ttm_bo_type_sg BO with bo-
>>> base.resv
>> pointing at the exporter's dma_buf->resv and dma_buf_dynamic_attach()
>> fails, no dma_buf reference is held. The exporter can be freed before
>> the delayed_delete worker calls dma_resv_lock(bo->base.resv), causing
>> a
>> use-after-free:
>>
>>   Oops: general protection fault, probably for non-canonical address
>>         0x6b6b6b6b6b6b6b9c
>>   Workqueue: ttm ttm_bo_delayed_delete [ttm]
>>   RIP: 0010:mutex_can_spin_on_owner+0x3f/0xc0
>>
>> ttm_bo_individualize_resv() skips the resv swap for all sg BOs to
>> keep
>> the shared resv available for delayed_delete to release the dma-buf
>> mapping. A BO whose attach never succeeded has no mapping to release,
>> yet it keeps bo->base.resv pointing at the exporter resv that
>> delayed_delete later locks once the exporter is gone.
>>
>> Fix this by checking bo->base.import_attach, which is set only after
>> a
>> successful attach. The check is placed after dma_resv_copy_fences()
>> so
>> successful imports still copy fences to _resv before returning,
>> keeping
>> the shared resv for delayed_delete. Failed imports fall through to
>> swap
>> resv to _resv, so delayed_delete never locks the stale exporter resv.
>>
>> Closes:
>> https://gitlab.freedesktop.org/drm/xe/kernel/-/work_items/8023
>> Fixes: d99fbd9aab62 ("drm/ttm: Always take the bo delayed cleanup
>> path for imported bos")
>> Cc: stable@vger.kernel.org # v6.8+
>> Cc: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
>> Cc: Christian Konig <christian.koenig@amd.com>
>> Cc: Matthew Auld <matthew.auld@intel.com>
>> Assisted-by: GitHub_Copilot:claude-sonnet-4.6
>> Signed-off-by: Nitin Gote <nitin.r.gote@intel.com>
>> ---
>> Hi Thomas/Christian,
>> Thank you for the review. Addressed the v3 review comments in this 
>> v4 version.
>>
>> v4:
>> - Moved import_attach check to after dma_resv_copy_fences() so fences
>>   are copied before returning for successful imports (Thomas).
>> - Removed exporter-alive claim from commit message (Thomas).
> 
> That's not sufficient. What I meant was that this invalidates the
> approach in its current form:
> 
> A			B
> prime_import()		
> exported_get();
> exported_lock();
> bo_create();		lru_walk():
> attach_fail();		bo_get();
> bo_put();		
> exported_unlock();	bo_lock() // exporter_lock
> exporter_put();		
> exporter_free();	
> 			bo_unlock(); //UAF
> 			
> There is no guarantee that the exporter stays alive until
> resv individualization happens.

IIRC at least for AMDGPU that shouldn't be possible.

We intentionally create the imported BO as empty shell without ttm_resource object, so it is not on any LRU list.

But to be honest I haven't looked into that in years, so it is perfectly possible that this is messed up again.

Regards,
Christian.

> 
> /Thomas
> 
> 
>>
>> v3:
>> - Dropped the xe-side reordering approach since importer_priv must be
>>   valid when dma_buf_dynamic_attach() publishes the attachment.
>> - Per Christian's suggestion on the v1 thread, keyed the check on
>>   import_attach rather than removing the sg guard entirely.
>> - Fixes both xe and amdgpu in a single TTM patch.
>>
>>  drivers/gpu/drm/ttm/ttm_bo.c | 24 +++++++++++++++---------
>>  1 file changed, 15 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c
>> b/drivers/gpu/drm/ttm/ttm_bo.c
>> index bcd76f6bb7f0..9b6341f69805 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>> @@ -203,15 +203,21 @@ static int ttm_bo_individualize_resv(struct
>> ttm_buffer_object *bo)
>>  	if (r)
>>  		return r;
>>  
>> -	if (bo->type != ttm_bo_type_sg) {
>> -		/* This works because the BO is about to be
>> destroyed and nobody
>> -		 * reference it any more. The only tricky case is
>> the trylock on
>> -		 * the resv object while holding the lru_lock.
>> -		 */
>> -		spin_lock(&bo->bdev->lru_lock);
>> -		bo->base.resv = &bo->base._resv;
>> -		spin_unlock(&bo->bdev->lru_lock);
>> -	}
>> +	/*
>> +	 * Successfully imported sg BOs need the shared resv for
>> dma-buf
>> +	 * cleanup. Failed imports have no attachment or mapping and
>> can
>> +	 * use the private _resv.
>> +	 */
>> +	if (bo->type == ttm_bo_type_sg && bo->base.import_attach)
>> +		return 0;
>> +
>> +	/* This works because the BO is about to be destroyed and
>> nobody
>> +	 * references it any more. The only tricky case is the
>> trylock on
>> +	 * the resv object while holding the lru_lock.
>> +	 */
>> +	spin_lock(&bo->bdev->lru_lock);
>> +	bo->base.resv = &bo->base._resv;
>> +	spin_unlock(&bo->bdev->lru_lock);
>>  
>>  	return r;
>>  }


  reply	other threads:[~2026-07-01 13:20 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-01  6:26 [PATCH] drm/ttm: Fix UAF on dma-buf attach failure for sg BOs Nitin Gote
2026-07-01  5:56 ` ✓ CI.KUnit: success for drm/ttm: Fix UAF on dma-buf attach failure for sg BOs (rev2) Patchwork
2026-07-01  6:46 ` ✓ Xe.CI.BAT: " Patchwork
2026-07-01  8:48 ` [PATCH] drm/ttm: Fix UAF on dma-buf attach failure for sg BOs Christian König
2026-07-01 12:59 ` Thomas Hellström
2026-07-01 13:20   ` Christian König [this message]
2026-07-01 15:23     ` Thomas Hellström
2026-07-01 21:55 ` ✓ Xe.CI.FULL: success for drm/ttm: Fix UAF on dma-buf attach failure for sg BOs (rev2) Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2026-06-25  5:57 [PATCH] drm/ttm: Fix UAF on dma-buf attach failure for sg BOs Nitin Gote
2026-06-25 10:45 ` Christian König
2026-06-25 17:10   ` Gote, Nitin R
2026-06-29 12:09     ` Christian König
2026-06-29  9:18 ` Thomas Hellström

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=b32a5081-545f-4703-ad88-ce54cc1efe09@amd.com \
    --to=christian.koenig@amd.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=matthew.auld@intel.com \
    --cc=nitin.r.gote@intel.com \
    --cc=stable@vger.kernel.org \
    --cc=thomas.hellstrom@linux.intel.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