From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932575AbbKDJib (ORCPT ); Wed, 4 Nov 2015 04:38:31 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:58899 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932241AbbKDJi1 (ORCPT ); Wed, 4 Nov 2015 04:38:27 -0500 From: Zhou Chengming To: , , , CC: , , , , , Subject: [PATCH] livepatch: x86: bugfix about kASLR Date: Wed, 4 Nov 2015 17:32:12 +0800 Message-ID: <1446629532-32111-1-git-send-email-zhouchengming1@huawei.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090201.5639D203.0081,ss=1,re=0.000,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2011-05-27 18:58:46 X-Mirapoint-Loop-Id: 14a30cff7b094f919340d4106d4de255 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When enable KASLR, func->old_addr will be set to zero and livepatch will find the right old address. But for reloc, livepatch just verify it using reloc->val (old addr from user), so verify failed and report "kernel mismatch" error. Reported-by: Cyril B. Signed-off-by: Zhou Chengming --- kernel/livepatch/core.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index 53196e2..c8885c6 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -311,7 +311,12 @@ static int klp_write_object_relocations(struct module *pmod, return -EINVAL; for (reloc = obj->relocs; reloc->name; reloc++) { - if (!klp_is_module(obj)) { + +#if defined(CONFIG_RANDOMIZE_BASE) + /* KASLR is enabled, disregard old_addr from user */ + reloc->val = 0; +#endif + if (reloc->val && !klp_is_module(obj)) { ret = klp_verify_vmlinux_symbol(reloc->name, reloc->val); if (ret) -- 1.7.7