From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Rick Edgecombe <rick.p.edgecombe@intel.com>,
Michael Kelley <mhklinux@outlook.com>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
Wei Liu <wei.liu@kernel.org>, Sasha Levin <sashal@kernel.org>,
kys@microsoft.com, haiyangz@microsoft.com, decui@microsoft.com,
linux-hyperv@vger.kernel.org
Subject: [PATCH AUTOSEL 6.8 36/43] Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
Date: Mon, 22 Apr 2024 19:14:22 -0400 [thread overview]
Message-ID: <20240422231521.1592991-36-sashal@kernel.org> (raw)
In-Reply-To: <20240422231521.1592991-1-sashal@kernel.org>
From: Rick Edgecombe <rick.p.edgecombe@intel.com>
[ Upstream commit 211f514ebf1ef5de37b1cf6df9d28a56cfd242ca ]
In CoCo VMs it is possible for the untrusted host to cause
set_memory_encrypted() or set_memory_decrypted() to fail such that an
error is returned and the resulting memory is shared. Callers need to
take care to handle these errors to avoid returning decrypted (shared)
memory to the page allocator, which could lead to functional or security
issues.
In order to make sure callers of vmbus_establish_gpadl() and
vmbus_teardown_gpadl() don't return decrypted/shared pages to
allocators, add a field in struct vmbus_gpadl to keep track of the
decryption status of the buffers. This will allow the callers to
know if they should free or leak the pages.
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: Michael Kelley <mhklinux@outlook.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Link: https://lore.kernel.org/r/20240311161558.1310-3-mhklinux@outlook.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Message-ID: <20240311161558.1310-3-mhklinux@outlook.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/hv/channel.c | 25 +++++++++++++++++++++----
include/linux/hyperv.h | 1 +
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index adbf674355b2b..98259b4925029 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -436,9 +436,18 @@ static int __vmbus_establish_gpadl(struct vmbus_channel *channel,
(atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
ret = create_gpadl_header(type, kbuffer, size, send_offset, &msginfo);
- if (ret)
+ if (ret) {
+ gpadl->decrypted = false;
return ret;
+ }
+ /*
+ * Set the "decrypted" flag to true for the set_memory_decrypted()
+ * success case. In the failure case, the encryption state of the
+ * memory is unknown. Leave "decrypted" as true to ensure the
+ * memory will be leaked instead of going back on the free list.
+ */
+ gpadl->decrypted = true;
ret = set_memory_decrypted((unsigned long)kbuffer,
PFN_UP(size));
if (ret) {
@@ -527,9 +536,15 @@ static int __vmbus_establish_gpadl(struct vmbus_channel *channel,
kfree(msginfo);
- if (ret)
- set_memory_encrypted((unsigned long)kbuffer,
- PFN_UP(size));
+ if (ret) {
+ /*
+ * If set_memory_encrypted() fails, the decrypted flag is
+ * left as true so the memory is leaked instead of being
+ * put back on the free list.
+ */
+ if (!set_memory_encrypted((unsigned long)kbuffer, PFN_UP(size)))
+ gpadl->decrypted = false;
+ }
return ret;
}
@@ -850,6 +865,8 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, struct vmbus_gpadl *gpad
if (ret)
pr_warn("Fail to set mem host visibility in GPADL teardown %d.\n", ret);
+ gpadl->decrypted = ret;
+
return ret;
}
EXPORT_SYMBOL_GPL(vmbus_teardown_gpadl);
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 6ef0557b4bff8..96ceb4095425e 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -832,6 +832,7 @@ struct vmbus_gpadl {
u32 gpadl_handle;
u32 size;
void *buffer;
+ bool decrypted;
};
struct vmbus_channel {
--
2.43.0
next prev parent reply other threads:[~2024-04-22 23:55 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 23:13 [PATCH AUTOSEL 6.8 01/43] tools/power turbostat: Fix added raw MSR output Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 02/43] tools/power turbostat: Increase the limit for fd opened Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 03/43] tools/power turbostat: Fix Bzy_MHz documentation typo Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 04/43] tools/power turbostat: Do not print negative LPI residency Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 05/43] tools/power turbostat: Expand probe_intel_uncore_frequency() Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 06/43] tools/power turbostat: Print ucode revision only if valid Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 07/43] tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 08/43] btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 09/43] btrfs: always clear PERTRANS metadata during commit Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 10/43] memblock tests: fix undefined reference to `early_pfn_to_nid' Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 11/43] memblock tests: fix undefined reference to `panic' Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 12/43] memblock tests: fix undefined reference to `BIT' Sasha Levin
2024-04-22 23:13 ` [PATCH AUTOSEL 6.8 13/43] nouveau/gsp: Avoid addressing beyond end of rpc->entries Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 14/43] scsi: target: Fix SELinux error when systemd-modules loads the target module Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 15/43] scsi: hisi_sas: Handle the NCQ error returned by D2H frame Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 16/43] blk-iocost: avoid out of bounds shift Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 17/43] accel/ivpu: Remove d3hot_after_power_off WA Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 18/43] accel/ivpu: Improve clarity of MMU error messages Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 19/43] accel/ivpu: Fix missed error message after VPU rename Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 20/43] platform/x86: acer-wmi: Add support for Acer PH18-71 Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 21/43] gpu: host1x: Do not setup DMA for virtual devices Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 22/43] MIPS: scall: Save thread_info.syscall unconditionally on entry Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 23/43] tools/power/turbostat: Fix uncore frequency file string Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 24/43] net: add copy_safe_from_sockptr() helper Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 25/43] nfc: llcp: fix nfc_llcp_setsockopt() unsafe copies Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 26/43] drm/amdgpu: Refine IB schedule error logging Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 27/43] drm/amd/display: add DCN 351 version for microcode load Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 28/43] drm/amdgpu: add smu 14.0.1 discovery support Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 29/43] drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2 Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 30/43] drm/amd/display: Skip on writeback when it's not applicable Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 31/43] drm/amd/pm: fix the high voltage issue after unload Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 32/43] drm/amdgpu: Fix VCN allocation in CPX partition Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 33/43] amd/amdkfd: sync all devices to wait all processes being evicted Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 34/43] selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 35/43] Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails Sasha Levin
2024-04-22 23:14 ` Sasha Levin [this message]
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 37/43] hv_netvsc: Don't free decrypted memory Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 38/43] uio_hv_generic: " Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 39/43] Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 40/43] drm/xe/xe_migrate: Cast to output precision before multiplying operands Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 41/43] drm/xe: Label RING_CONTEXT_CONTROL as masked Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 42/43] smb3: fix broken reconnect when password changing on the server by allowing password rotation Sasha Levin
2024-04-22 23:14 ` [PATCH AUTOSEL 6.8 43/43] iommu: mtk: fix module autoloading Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240422231521.1592991-36-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhklinux@outlook.com \
--cc=rick.p.edgecombe@intel.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=wei.liu@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox