Skip to content

Commit

Permalink
dma-direct: check return value when encrypting or decrypting memory
Browse files Browse the repository at this point in the history
__change_page_attr() can fail which will cause set_memory_encrypted() and
set_memory_decrypted() to return non-zero.

If the device requires unencrypted DMA memory and decryption fails, simply
free the memory and fail.

If attempting to re-encrypt in the failure path and that encryption fails,
there is no alternative other than to leak the memory.

Fixes: c10f07a ("dma/direct: Handle force decryption for DMA coherent buffers in common code")
Signed-off-by: David Rientjes <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
  • Loading branch information
rientjes authored and Christoph Hellwig committed Jun 17, 2020
1 parent 96a539f commit 56fccf2
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions kernel/dma/direct.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
{
struct page *page;
void *ret;
int err;

size = PAGE_ALIGN(size);

Expand Down Expand Up @@ -210,8 +211,12 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
}

ret = page_address(page);
if (force_dma_unencrypted(dev))
set_memory_decrypted((unsigned long)ret, 1 << get_order(size));
if (force_dma_unencrypted(dev)) {
err = set_memory_decrypted((unsigned long)ret,
1 << get_order(size));
if (err)
goto out_free_pages;
}

memset(ret, 0, size);

Expand All @@ -230,9 +235,13 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
return ret;

out_encrypt_pages:
if (force_dma_unencrypted(dev))
set_memory_encrypted((unsigned long)page_address(page),
1 << get_order(size));
if (force_dma_unencrypted(dev)) {
err = set_memory_encrypted((unsigned long)page_address(page),
1 << get_order(size));
/* If memory cannot be re-encrypted, it must be leaked */
if (err)
return NULL;
}
out_free_pages:
dma_free_contiguous(dev, page, size);
return NULL;
Expand Down

0 comments on commit 56fccf2

Please sign in to comment.