Commit 658245d6 authored by Joerg Roedel's avatar Joerg Roedel Committed by Yu Liao
Browse files

x86/sev: Check for user-space IOIO pointing to kernel space 

stable inclusion
from stable-v5.10.199
commit 6550cbe25de182f6c0176909a90b324cb375133f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8BCTB
CVE: CVE-2023-46813

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6550cbe25de182f6c0176909a90b324cb375133f



--------------------------------

Upstream commit: 63e44bc5

Check the memory operand of INS/OUTS before emulating the instruction.
The #VC exception can get raised from user-space, but the memory operand
can be manipulated to access kernel memory before the emulation actually
begins and after the exception handler has run.

  [ bp: Massage commit message. ]

Fixes: 597cfe48 ("x86/boot/compressed/64: Setup a GHCB-based VC Exception handler")
Reported-by: default avatarTom Dohrmann <erbse.13@gmx.de>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Cc: <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
parent 8f996743

arch/x86/boot/compressed/sev-es.c

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ static enum es_result vc_ioio_check(struct es_em_ctxt *ctxt, u16 port, size_t si 
	return ES_OK;

}



static bool fault_in_kernel_space(unsigned long address)

{

	return false;

}



#undef __init

#undef __pa

#define __init

arch/x86/kernel/sev-es-shared.c

+29 −2
Original line number Diff line number Diff line
@@ -217,6 +217,23 @@ void __init do_vc_no_ghcb(struct pt_regs *regs, unsigned long exit_code) 
		asm volatile("hlt\n");

}



static enum es_result vc_insn_string_check(struct es_em_ctxt *ctxt,

					   unsigned long address,

					   bool write)

{

	if (user_mode(ctxt->regs) && fault_in_kernel_space(address)) {

		ctxt->fi.vector     = X86_TRAP_PF;

		ctxt->fi.error_code = X86_PF_USER;

		ctxt->fi.cr2        = address;

		if (write)

			ctxt->fi.error_code |= X86_PF_WRITE;



		return ES_EXCEPTION;

	}



	return ES_OK;

}



static enum es_result vc_insn_string_read(struct es_em_ctxt *ctxt,

					  void *src, char *buf,

					  unsigned int data_size,
@@ -224,7 +241,12 @@ static enum es_result vc_insn_string_read(struct es_em_ctxt *ctxt, 
					  bool backwards)

{

	int i, b = backwards ? -1 : 1;

	enum es_result ret = ES_OK;

	unsigned long address = (unsigned long)src;

	enum es_result ret;



	ret = vc_insn_string_check(ctxt, address, false);

	if (ret != ES_OK)

		return ret;



	for (i = 0; i < count; i++) {

		void *s = src + (i * data_size * b);
@@ -245,7 +267,12 @@ static enum es_result vc_insn_string_write(struct es_em_ctxt *ctxt, 
					   bool backwards)

{

	int i, s = backwards ? -1 : 1;

	enum es_result ret = ES_OK;

	unsigned long address = (unsigned long)dst;

	enum es_result ret;



	ret = vc_insn_string_check(ctxt, address, true);

	if (ret != ES_OK)

		return ret;



	for (i = 0; i < count; i++) {

		void *d = dst + (i * data_size * s);