1 files changed, 8 insertions, 0 deletions

diff --git a/kernel/livepatch/patch.c b/kernel/livepatch/patch.c
index 825022d70912..0ff466ab4b5a 100644
--- a/kernel/livepatch/patch.c
+++ b/kernel/livepatch/patch.c
@@ -118,7 +118,15 @@ static void notrace klp_ftrace_handler(unsigned long ip,
                 }
         }
 
+        /*
+         * NOPs are used to replace existing patches with original code.
+         * Do nothing! Setting pc would cause an infinite loop.
+         */
+        if (func->nop)
+                goto unlock;
+
         klp_arch_set_pc(regs, (unsigned long)func->new_func);
+
 unlock:
         preempt_enable_notrace();
 }