mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
dma-direct: use the correct size for dma_set_encrypted()
commit3be4562584
upstream. The third parameter of dma_set_encrypted() is a size in bytes rather than the number of pages. Fixes:4d0564785b
("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
16d5d91009
commit
eb9c7a8c9e
1 changed files with 2 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -392,7 +392,6 @@ 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 */
|
||||
|
@ -400,7 +399,7 @@ void dma_direct_free_pages(struct device *dev, size_t size,
|
|||
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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue