Skip to content

Commit 1e77696

Browse files
kirylhansendc
authored andcommitted
x86/tdx: Handle load_unaligned_zeropad() page-cross to a shared page
load_unaligned_zeropad() can lead to unwanted loads across page boundaries. The unwanted loads are typically harmless. But, they might be made to totally unrelated or even unmapped memory. load_unaligned_zeropad() relies on exception fixup (#PF, #GP and now #VE) to recover from these unwanted loads. In TDX guests, the second page can be shared page and a VMM may configure it to trigger #VE. The kernel assumes that #VE on a shared page is an MMIO access and tries to decode instruction to handle it. In case of load_unaligned_zeropad() it may result in confusion as it is not MMIO access. Fix it by detecting split page MMIO accesses and failing them. load_unaligned_zeropad() will recover using exception fixups. The issue was discovered by analysis and reproduced artificially. It was not triggered during testing. [ dhansen: fix up changelogs and comments for grammar and clarity, plus incorporate Kirill's off-by-one fix] Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Link: https://lkml.kernel.org/r/20220614120135.14812-4-kirill.shutemov@linux.intel.com
1 parent cdd8578 commit 1e77696

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

arch/x86/coco/tdx/tdx.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ static bool mmio_write(int size, unsigned long addr, unsigned long val)
333333

334334
static int handle_mmio(struct pt_regs *regs, struct ve_info *ve)
335335
{
336+
unsigned long *reg, val, vaddr;
336337
char buffer[MAX_INSN_SIZE];
337-
unsigned long *reg, val;
338338
struct insn insn = {};
339339
enum mmio_type mmio;
340340
int size, extend_size;
@@ -360,6 +360,19 @@ static int handle_mmio(struct pt_regs *regs, struct ve_info *ve)
360360
return -EINVAL;
361361
}
362362

363+
/*
364+
* Reject EPT violation #VEs that split pages.
365+
*
366+
* MMIO accesses are supposed to be naturally aligned and therefore
367+
* never cross page boundaries. Seeing split page accesses indicates
368+
* a bug or a load_unaligned_zeropad() that stepped into an MMIO page.
369+
*
370+
* load_unaligned_zeropad() will recover using exception fixups.
371+
*/
372+
vaddr = (unsigned long)insn_get_addr_ref(&insn, regs);
373+
if (vaddr / PAGE_SIZE != (vaddr + size - 1) / PAGE_SIZE)
374+
return -EFAULT;
375+
363376
/* Handle writes first */
364377
switch (mmio) {
365378
case MMIO_WRITE:

0 commit comments

Comments
 (0)