From d20e650ea27e9e95ad081aa33ea265e789b19371 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Dec 15 2021 17:37:19 +0000 Subject: Merge branch 'users/bpetkov/SLE15-SP4/for-next' into SLE15-SP4 Pull SEV fix from Borislav Petkov --- diff --git a/patches.suse/x86-sev-fix-sev-es-ins-outs-instructions-for-word-dword-and-qword.patch b/patches.suse/x86-sev-fix-sev-es-ins-outs-instructions-for-word-dword-and-qword.patch new file mode 100644 index 0000000..2f07c24 --- /dev/null +++ b/patches.suse/x86-sev-fix-sev-es-ins-outs-instructions-for-word-dword-and-qword.patch @@ -0,0 +1,152 @@ +From: Michael Sterritt +Date: Fri, 19 Nov 2021 15:27:57 -0800 +Subject: x86/sev: Fix SEV-ES INS/OUTS instructions for word, dword, and qword +Git-commit: 1d5379d0475419085d3575bd9155f2e558e96390 +Patch-mainline: v5.16-rc4 +References: bsc#1190497 + +Properly type the operands being passed to __put_user()/__get_user(). +Otherwise, these routines truncate data for dependent instructions +(e.g., INSW) and only read/write one byte. + +This has been tested by sending a string with REP OUTSW to a port and +then reading it back in with REP INSW on the same port. + +Previous behavior was to only send and receive the first char of the +size. For example, word operations for "abcd" would only read/write +"ac". With change, the full string is now written and read back. + +Fixes: f980f9c31a923 (x86/sev-es: Compile early handler code into kernel image) +Signed-off-by: Michael Sterritt +Signed-off-by: Borislav Petkov +Reviewed-by: Paolo Bonzini +Reviewed-by: Marc Orr +Reviewed-by: Peter Gonda +Reviewed-by: Joerg Roedel +Link: https://lkml.kernel.org/r/20211119232757.176201-1-sterritt@google.com +--- + arch/x86/kernel/sev.c | 57 +++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 39 insertions(+), 18 deletions(-) + +diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c +index 74f0ec955384..a9fc2ac7a8bd 100644 +--- a/arch/x86/kernel/sev.c ++++ b/arch/x86/kernel/sev.c +@@ -294,11 +294,6 @@ static enum es_result vc_write_mem(struct es_em_ctxt *ctxt, + char *dst, char *buf, size_t size) + { + unsigned long error_code = X86_PF_PROT | X86_PF_WRITE; +- char __user *target = (char __user *)dst; +- u64 d8; +- u32 d4; +- u16 d2; +- u8 d1; + + /* + * This function uses __put_user() independent of whether kernel or user +@@ -320,26 +315,42 @@ static enum es_result vc_write_mem(struct es_em_ctxt *ctxt, + * instructions here would cause infinite nesting. + */ + switch (size) { +- case 1: ++ case 1: { ++ u8 d1; ++ u8 __user *target = (u8 __user *)dst; ++ + memcpy(&d1, buf, 1); + if (__put_user(d1, target)) + goto fault; + break; +- case 2: ++ } ++ case 2: { ++ u16 d2; ++ u16 __user *target = (u16 __user *)dst; ++ + memcpy(&d2, buf, 2); + if (__put_user(d2, target)) + goto fault; + break; +- case 4: ++ } ++ case 4: { ++ u32 d4; ++ u32 __user *target = (u32 __user *)dst; ++ + memcpy(&d4, buf, 4); + if (__put_user(d4, target)) + goto fault; + break; +- case 8: ++ } ++ case 8: { ++ u64 d8; ++ u64 __user *target = (u64 __user *)dst; ++ + memcpy(&d8, buf, 8); + if (__put_user(d8, target)) + goto fault; + break; ++ } + default: + WARN_ONCE(1, "%s: Invalid size: %zu\n", __func__, size); + return ES_UNSUPPORTED; +@@ -362,11 +373,6 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt, + char *src, char *buf, size_t size) + { + unsigned long error_code = X86_PF_PROT; +- char __user *s = (char __user *)src; +- u64 d8; +- u32 d4; +- u16 d2; +- u8 d1; + + /* + * This function uses __get_user() independent of whether kernel or user +@@ -388,26 +394,41 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt, + * instructions here would cause infinite nesting. + */ + switch (size) { +- case 1: ++ case 1: { ++ u8 d1; ++ u8 __user *s = (u8 __user *)src; ++ + if (__get_user(d1, s)) + goto fault; + memcpy(buf, &d1, 1); + break; +- case 2: ++ } ++ case 2: { ++ u16 d2; ++ u16 __user *s = (u16 __user *)src; ++ + if (__get_user(d2, s)) + goto fault; + memcpy(buf, &d2, 2); + break; +- case 4: ++ } ++ case 4: { ++ u32 d4; ++ u32 __user *s = (u32 __user *)src; ++ + if (__get_user(d4, s)) + goto fault; + memcpy(buf, &d4, 4); + break; +- case 8: ++ } ++ case 8: { ++ u64 d8; ++ u64 __user *s = (u64 __user *)src; + if (__get_user(d8, s)) + goto fault; + memcpy(buf, &d8, 8); + break; ++ } + default: + WARN_ONCE(1, "%s: Invalid size: %zu\n", __func__, size); + return ES_UNSUPPORTED; + diff --git a/series.conf b/series.conf index c39e6fd..b311149 100644 --- a/series.conf +++ b/series.conf @@ -6544,6 +6544,7 @@ patches.suse/i2c-stm32f7-recover-the-bus-on-access-timeout.patch patches.suse/i2c-stm32f7-stop-dma-transfer-in-case-of-NACK.patch patches.suse/scsi-lpfc-Fix-non-recovery-of-remote-ports-following.patch + patches.suse/x86-sev-fix-sev-es-ins-outs-instructions-for-word-dword-and-qword.patch patches.suse/x86-entry-add-a-fence-for-kernel-entry-swapgs-in-paranoid_entry.patch patches.suse/x86-entry-use-the-correct-fence-macro-after-swapgs-in-kernel-cr3.patch patches.suse/x86-xen-add-xenpv_restore_regs_and_return_to_usermode.patch