lkml.org 
[lkml]   [2021]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/urgent] x86/sev-es: Fix SEV-ES OUT/IN immediate opcode vc handling
    The following commit has been merged into the x86/urgent branch of tip:

    Commit-ID: a8f7e08a81708920a928664a865208fdf451c49f
    Gitweb: https://git.kernel.org/tip/a8f7e08a81708920a928664a865208fdf451c49f
    Author: Peter Gonda <pgonda@google.com>
    AuthorDate: Tue, 05 Jan 2021 08:33:11 -08:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Tue, 05 Jan 2021 18:55:00 +01:00

    x86/sev-es: Fix SEV-ES OUT/IN immediate opcode vc handling

    The IN and OUT instructions with port address as an immediate operand
    only use an 8-bit immediate (imm8). The current VC handler uses the
    entire 32-bit immediate value but these instructions only set the first
    bytes.

    Cast the operand to an u8 for that.

    [ bp: Massage commit message. ]

    Fixes: 25189d08e5168 ("x86/sev-es: Add support for handling IOIO exceptions")
    Signed-off-by: Peter Gonda <pgonda@google.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Acked-by: David Rientjes <rientjes@google.com>
    Link: https://lkml.kernel.org/r/20210105163311.221490-1-pgonda@google.com
    ---
    arch/x86/kernel/sev-es-shared.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/sev-es-shared.c b/arch/x86/kernel/sev-es-shared.c
    index 7d04b35..cdc04d0 100644
    --- a/arch/x86/kernel/sev-es-shared.c
    +++ b/arch/x86/kernel/sev-es-shared.c
    @@ -305,14 +305,14 @@ static enum es_result vc_ioio_exitinfo(struct es_em_ctxt *ctxt, u64 *exitinfo)
    case 0xe4:
    case 0xe5:
    *exitinfo |= IOIO_TYPE_IN;
    - *exitinfo |= (u64)insn->immediate.value << 16;
    + *exitinfo |= (u8)insn->immediate.value << 16;
    break;

    /* OUT immediate opcodes */
    case 0xe6:
    case 0xe7:
    *exitinfo |= IOIO_TYPE_OUT;
    - *exitinfo |= (u64)insn->immediate.value << 16;
    + *exitinfo |= (u8)insn->immediate.value << 16;
    break;

    /* IN register opcodes */
    \
     
     \ /
      Last update: 2021-01-05 19:07    [W:4.934 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site