1 files changed, 3 insertions, 2 deletions

diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 284e2691e380..0e7c23c6cf3f 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -234,8 +234,9 @@ static int klp_find_verify_func_addr(struct klp_object *obj,
         int ret;
 
 #if defined(CONFIG_RANDOMIZE_BASE)
-        /* KASLR is enabled, disregard old_addr from user */
-        func->old_addr = 0;
+        /* If KASLR has been enabled, adjust old_addr accordingly */
+        if (kaslr_enabled() && func->old_addr)
+                func->old_addr += kaslr_offset();
 #endif
 
         if (!func->old_addr || klp_is_module(obj))