UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dma-direct: re-encrypt memory if dma_direct_alloc_pages() fails 

If arch_dma_set_uncached() fails after memory has been decrypted, it needs
to be re-encrypted before freeing.

Fixes: fa7e2247c5 ("dma-direct: make uncached_kernel_address more general")
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
David Rientjes 2020-06-11 12:20:29 -07:00 committed by Christoph Hellwig
parent 633d5fce78
commit 96a539fa3b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/dma/direct.c
View File

@ -220,7 +220,7 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
arch_dma_prep_coherent(page, size); arch_dma_prep_coherent(page, size);
ret = arch_dma_set_uncached(ret, size); ret = arch_dma_set_uncached(ret, size);
if (IS_ERR(ret)) if (IS_ERR(ret))
goto out_free_pages; goto out_encrypt_pages;
} }
done: done:
if (force_dma_unencrypted(dev)) if (force_dma_unencrypted(dev))
@ -228,6 +228,11 @@ done:
else else
*dma_handle = phys_to_dma(dev, page_to_phys(page)); *dma_handle = phys_to_dma(dev, page_to_phys(page));
return ret; return ret;
out_encrypt_pages:
if (force_dma_unencrypted(dev))
set_memory_encrypted((unsigned long)page_address(page),
1 << get_order(size));
out_free_pages: out_free_pages:
dma_free_contiguous(dev, page, size); dma_free_contiguous(dev, page, size);
return NULL; return NULL;