From: "Alexey Gladkov (Intel)" legion@kernel.org
TDX only supports kernel-initiated MMIO operations. The handle_mmio() function checks if the #VE exception occurred in the kernel and rejects the operation if it did not.
However, userspace can deceive the kernel into performing MMIO on its behalf. For example, if userspace can point a syscall to an MMIO address, syscall does get_user() or put_user() on it, triggering MMIO #VE. The kernel will treat the #VE as in-kernel MMIO.
Ensure that the target MMIO address is within the kernel before decoding instruction.
Cc: stable@vger.kernel.org Reviewed-by: Kirill A. Shutemov kirill.shutemov@linux.intel.com Signed-off-by: Alexey Gladkov (Intel) legion@kernel.org --- arch/x86/coco/tdx/tdx.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 078e2bac2553..d6e6407e3999 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -16,6 +16,7 @@ #include <asm/insn-eval.h> #include <asm/pgtable.h> #include <asm/set_memory.h> +#include <asm/traps.h>
/* MMIO direction */ #define EPT_READ 0 @@ -434,6 +435,11 @@ static int handle_mmio(struct pt_regs *regs, struct ve_info *ve) return -EINVAL; }
+ if (!fault_in_kernel_space(ve->gla)) { + WARN_ONCE(1, "Access to userspace address is not supported"); + return -EINVAL; + } + /* * Reject EPT violation #VEs that split pages. *
On 9/13/24 10:05, Alexey Gladkov wrote:
TDX only supports kernel-initiated MMIO operations. The handle_mmio() function checks if the #VE exception occurred in the kernel and rejects the operation if it did not.
However, userspace can deceive the kernel into performing MMIO on its behalf. For example, if userspace can point a syscall to an MMIO address, syscall does get_user() or put_user() on it, triggering MMIO #VE. The kernel will treat the #VE as in-kernel MMIO.
Ensure that the target MMIO address is within the kernel before decoding instruction.
Acked-by: Dave Hansen dave.hansen@linux.intel.com
On 9/13/24 10:18, Dave Hansen wrote: ...
Ensure that the target MMIO address is within the kernel before decoding instruction.
Acked-by: Dave Hansen dave.hansen@linux.intel.com
Oh, and please add these to anything you cc:stable@ on:
Fixes: 31d58c4e557d ("x86/tdx: Handle in-kernel MMIO")
linux-stable-mirror@lists.linaro.org