Merge tag 'x86-urgent-2020-10-27' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / alternative.c

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index cd6be6f143e85540399d106465c28e0657237f52..2400ad62f330b9f518b3bcfa3462f5fd2e659e78 100644 (file)
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -1112,6 +1112,10 @@ noinstr int poke_int3_handler(struct pt_regs *regs)
                 */
                goto out_put;
 
+       case RET_INSN_OPCODE:
+               int3_emulate_ret(regs);
+               break;
+
        case CALL_INSN_OPCODE:
                int3_emulate_call(regs, (long)ip + tp->rel32);
                break;
@@ -1286,6 +1290,7 @@ static void text_poke_loc_init(struct text_poke_loc *tp, void *addr,
 
        switch (tp->opcode) {
        case INT3_INSN_OPCODE:
+       case RET_INSN_OPCODE:
                break;
 
        case CALL_INSN_OPCODE: