From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B812CC433DF for ; Mon, 29 Jun 2020 21:50:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89856206A1 for ; Mon, 29 Jun 2020 21:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593467413; bh=i8qZhbIvdS30tcZvAuSwD6f39kDveI1mWIy+nCpRyL4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gG56hvjS7AeJZHJbz3JeOF61+2l/mYdwaJYh1Bswe5+w71oRP7Gzl44YDCk/sC9QQ vTgbbqrAsgRMUA0UCJFkoxaRMuWq20fiIVUwGyzTgy2sAPWcUuXVwRrtbj/GIF0VKn lejr4lsM9Hxcsaaa1OtguGpLb4fEIZZ6fDB1DdJM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730940AbgF2VuL (ORCPT ); Mon, 29 Jun 2020 17:50:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:56782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726693AbgF2Sfl (ORCPT ); Mon, 29 Jun 2020 14:35:41 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 834A121883; Mon, 29 Jun 2020 15:20:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444016; bh=i8qZhbIvdS30tcZvAuSwD6f39kDveI1mWIy+nCpRyL4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUNvxRsQ2UYr8TVvMKi1H4Jlcu7P01JAZN4sP8zu9bPMdJ8nNWs3ny9eQQUlZlmDs rzeP/3vYUwP1mBUcXBvw+w8U+5BdE1h1lhpx8BvWJLs9xQrQBXzyo7vNmb6/aJ0DU8 3wMdO1HEv6WQ5LtVXZcSdpwqXAc+oFAdoNm7ONKk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Rientjes , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.7 122/265] dma-direct: re-encrypt memory if dma_direct_alloc_pages() fails Date: Mon, 29 Jun 2020 11:15:55 -0400 Message-Id: <20200629151818.2493727-123-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Rientjes [ Upstream commit 96a539fa3bb71f443ae08e57b9f63d6e5bb2207c ] If arch_dma_set_uncached() fails after memory has been decrypted, it needs to be re-encrypted before freeing. Fixes: fa7e2247c572 ("dma-direct: make uncached_kernel_address more general") Signed-off-by: David Rientjes Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- kernel/dma/direct.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 8f4bbdaf965eb..4e789c46ff0bf 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -186,7 +186,7 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size, arch_dma_prep_coherent(page, size); ret = arch_dma_set_uncached(ret, size); if (IS_ERR(ret)) - goto out_free_pages; + goto out_encrypt_pages; } done: if (force_dma_unencrypted(dev)) @@ -194,6 +194,11 @@ done: else *dma_handle = phys_to_dma(dev, page_to_phys(page)); 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: dma_free_contiguous(dev, page, size); return NULL; -- 2.25.1