Skip to content

Commit

Permalink
dma-direct: use the correct size for dma_set_encrypted()
Browse files Browse the repository at this point in the history
The third parameter of dma_set_encrypted() is a size in bytes rather than
the number of pages.

Fixes: 4d05647 ("dma-direct: factor out dma_set_{de,en}crypted helpers")
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Dexuan Cui authored and Christoph Hellwig committed Jun 23, 2022
1 parent a111daf commit 3be4562
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions kernel/dma/direct.c
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ void dma_direct_free(struct device *dev, size_t size,
} else {
if (IS_ENABLED(CONFIG_ARCH_HAS_DMA_CLEAR_UNCACHED))
arch_dma_clear_uncached(cpu_addr, size);
if (dma_set_encrypted(dev, cpu_addr, 1 << page_order))
if (dma_set_encrypted(dev, cpu_addr, size))
return;
}

Expand Down Expand Up @@ -392,15 +392,14 @@ void dma_direct_free_pages(struct device *dev, size_t size,
struct page *page, dma_addr_t dma_addr,
enum dma_data_direction dir)
{
unsigned int page_order = get_order(size);
void *vaddr = page_address(page);

/* If cpu_addr is not from an atomic pool, dma_free_from_pool() fails */
if (IS_ENABLED(CONFIG_DMA_COHERENT_POOL) &&
dma_free_from_pool(dev, vaddr, size))
return;

if (dma_set_encrypted(dev, vaddr, 1 << page_order))
if (dma_set_encrypted(dev, vaddr, size))
return;
__dma_direct_free_pages(dev, page, size);
}
Expand Down

0 comments on commit 3be4562

Please sign in to comment.