From: Borislav Petkov <[email protected]> Simplify code, no functional changes.
Signed-off-by: Borislav Petkov <[email protected]> --- arch/x86/kernel/sev-es.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c index 37736486603e..564cc9fc693d 100644 --- a/arch/x86/kernel/sev-es.c +++ b/arch/x86/kernel/sev-es.c @@ -244,8 +244,7 @@ static int vc_fetch_insn_kernel(struct es_em_ctxt *ctxt, static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt) { char buffer[MAX_INSN_SIZE]; - enum es_result ret; - int res; + int res, ret; if (user_mode(ctxt->regs)) { res = insn_fetch_from_user(ctxt->regs, buffer); @@ -267,13 +266,13 @@ static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt) return ES_EXCEPTION; } - insn_init(&ctxt->insn, buffer, MAX_INSN_SIZE - res, 1); - insn_get_length(&ctxt->insn); + ret = insn_decode(&ctxt->insn, buffer, MAX_INSN_SIZE - res, INSN_MODE_64); } - ret = ctxt->insn.immediate.got ? ES_OK : ES_DECODE_FAILED; - - return ret; + if (ret < 0) + return ES_DECODE_FAILED; + else + return ES_OK; } static enum es_result vc_write_mem(struct es_em_ctxt *ctxt, -- 2.21.0
