[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1446791100-41585-1-git-send-email-zhouchengming1@huawei.com>
Date: Fri, 6 Nov 2015 14:25:00 +0800
From: Zhou Chengming <zhouchengming1@...wei.com>
To: <jpoimboe@...hat.com>, <sjenning@...hat.com>, <jkosina@...e.cz>,
<vojtech@...e.cz>
CC: <live-patching@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<guohanjun@...wei.com>, <huawei.libin@...wei.com>,
<xiexiuqi@...wei.com>, <cbay@...aysdata.com>,
<zhouchengming1@...wei.com>
Subject: [PATCH v2] livepatch: x86: bugfix about kASLR
When enable KASLR, livepatch will adjust old_addr of changed
function accordingly. So do the same thing for reloc.
[PATCH v1] https://lkml.org/lkml/2015/11/4/91
Reported-by: Cyril B. <cbay@...aysdata.com>
Signed-off-by: Zhou Chengming <zhouchengming1@...wei.com>
---
kernel/livepatch/core.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 6e53441..db545cb 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -294,6 +294,12 @@ static int klp_write_object_relocations(struct module *pmod,
for (reloc = obj->relocs; reloc->name; reloc++) {
if (!klp_is_module(obj)) {
+
+#if defined(CONFIG_RANDOMIZE_BASE)
+ /* If KASLR has been enabled, adjust old value accordingly */
+ if (kaslr_enabled())
+ reloc->val += kaslr_offset();
+#endif
ret = klp_verify_vmlinux_symbol(reloc->name,
reloc->val);
if (ret)
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists