Skip to content

Commit b9fa169

Browse files
rpedgecoChristoph Hellwig
authored andcommitted
dma-direct: Leak pages on dma_set_decrypted() failure
On TDX it is possible for the untrusted host to cause set_memory_encrypted() or set_memory_decrypted() to fail such that an error is returned and the resulting memory is shared. Callers need to take care to handle these errors to avoid returning decrypted (shared) memory to the page allocator, which could lead to functional or security issues. DMA could free decrypted/shared pages if dma_set_decrypted() fails. This should be a rare case. Just leak the pages in this case instead of freeing them. Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent 02e7656 commit b9fa169

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

kernel/dma/direct.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ void *dma_direct_alloc(struct device *dev, size_t size,
286286
} else {
287287
ret = page_address(page);
288288
if (dma_set_decrypted(dev, ret, size))
289-
goto out_free_pages;
289+
goto out_leak_pages;
290290
}
291291

292292
memset(ret, 0, size);
@@ -307,6 +307,8 @@ void *dma_direct_alloc(struct device *dev, size_t size,
307307
out_free_pages:
308308
__dma_direct_free_pages(dev, page, size);
309309
return NULL;
310+
out_leak_pages:
311+
return NULL;
310312
}
311313

312314
void dma_direct_free(struct device *dev, size_t size,
@@ -367,12 +369,11 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size,
367369

368370
ret = page_address(page);
369371
if (dma_set_decrypted(dev, ret, size))
370-
goto out_free_pages;
372+
goto out_leak_pages;
371373
memset(ret, 0, size);
372374
*dma_handle = phys_to_dma_direct(dev, page_to_phys(page));
373375
return page;
374-
out_free_pages:
375-
__dma_direct_free_pages(dev, page, size);
376+
out_leak_pages:
376377
return NULL;
377378
}
378379

0 commit comments

Comments
 (0)