linux-kernel - [tip: x86/mm] dma-mapping: Fix dma_pgprot() for unencrypted coherent pages

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <158445704082.28353.8744856923251332507.tip-bot2@tip-bot2>
Date:   Tue, 17 Mar 2020 14:57:20 -0000
From:   "tip-bot2 for Thomas Hellstrom" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Thomas Hellstrom <thellstrom@...are.com>,
        Borislav Petkov <bp@...e.de>, Christoph Hellwig <hch@....de>,
        Tom Lendacky <thomas.lendacky@....com>, x86 <x86@...nel.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: [tip: x86/mm] dma-mapping: Fix dma_pgprot() for unencrypted coherent pages

The following commit has been merged into the x86/mm branch of tip:

Commit-ID:     17c4a2ae15a7aaefe84bdb271952678c5c9cd8e1
Gitweb:        https://git.kernel.org/tip/17c4a2ae15a7aaefe84bdb271952678c5c9cd8e1
Author:        Thomas Hellstrom <thellstrom@...are.com>
AuthorDate:    Wed, 04 Mar 2020 12:45:27 +01:00
Committer:     Borislav Petkov <bp@...e.de>
CommitterDate: Tue, 17 Mar 2020 11:52:58 +01:00

dma-mapping: Fix dma_pgprot() for unencrypted coherent pages

When dma_mmap_coherent() sets up a mapping to unencrypted coherent memory
under SEV encryption and sometimes under SME encryption, it will actually
set up an encrypted mapping rather than an unencrypted, causing devices
that DMAs from that memory to read encrypted contents. Fix this.

When force_dma_unencrypted() returns true, the linear kernel map of the
coherent pages have had the encryption bit explicitly cleared and the
page content is unencrypted. Make sure that any additional PTEs we set
up to these pages also have the encryption bit cleared by having
dma_pgprot() return a protection with the encryption bit cleared in this
case.

Signed-off-by: Thomas Hellstrom <thellstrom@...are.com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Reviewed-by: Christoph Hellwig <hch@....de>
Acked-by: Tom Lendacky <thomas.lendacky@....com>
Link: https://lkml.kernel.org/r/20200304114527.3636-3-thomas_os@shipmail.org
---
 kernel/dma/mapping.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 12ff766..98e3d87 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -154,6 +154,8 @@ EXPORT_SYMBOL(dma_get_sgtable_attrs);
  */
 pgprot_t dma_pgprot(struct device *dev, pgprot_t prot, unsigned long attrs)
 {
+	if (force_dma_unencrypted(dev))
+		prot = pgprot_decrypted(prot);
 	if (dev_is_dma_coherent(dev) ||
 	    (IS_ENABLED(CONFIG_DMA_NONCOHERENT_CACHE_SYNC) &&
              (attrs & DMA_ATTR_NON_CONSISTENT)))