Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751726AbbDLNVl (ORCPT ); Sun, 12 Apr 2015 09:21:41 -0400 Received: from blu004-omc4s8.hotmail.com ([65.55.111.147]:52094 "EHLO BLU004-OMC4S8.hotmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751641AbbDLNVh (ORCPT ); Sun, 12 Apr 2015 09:21:37 -0400 X-TMN: [stRGF2PiTsZcDXsXIUyo4EDEExF9em+u] X-Originating-Email: [minfei.huang@hotmail.com] Message-ID: From: Minfei Huang To: jpoimboe@redhat.com, sjenning@redhat.com, jkosina@suse.cz, vojtech@suse.cz CC: live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Minfei Huang Subject: [PATCH 2/2] livepatch: Fix the bug if the function name is larger than KSYM_NAME_LEN-1 Date: Sun, 12 Apr 2015 21:15:54 +0800 X-Mailer: git-send-email 2.2.2 In-Reply-To: <1428844554-4015-1-git-send-email-minfei.huang@hotmail.com> References: <1428844554-4015-1-git-send-email-minfei.huang@hotmail.com> X-OriginalArrivalTime: 12 Apr 2015 13:16:35.0523 (UTC) FILETIME=[E6CC4930:01D07522] MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1613 Lines: 47 For now, the kallsyms will only store the first (KSYM_NAME_LEN-1). The kallsyms name is same for the function which first (KSYM_NAME_LEN-1) is same, but the rest is not. Then function will never be patched, although function name and address are provided both. The reason caused this bug is livepatch cannt recognize the function name. Now, livepatch will verify the function name with first (KSYM_NAME_LEN-1) and address, if provided. Once they are matched, we can confirm that the patched function is found. Signed-off-by: Minfei Huang --- kernel/livepatch/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index ff42c29..eed719d 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -210,7 +210,7 @@ static int klp_verify_vmlinux_callback(void *data, const char *name, struct klp_verify_args *args = data; if (!mod && - !strcmp(args->name, name) && + !strncmp(args->name, name, KSYM_NAME_LEN-1) && args->addr == addr) return 1; @@ -226,7 +226,7 @@ static int klp_verify_module_callback(void *data, const char *name, return 0; if (!strcmp(args->objname, mod->name) && - !strcmp(args->name, name) && + !strncmp(args->name, name, KSYM_NAME_LEN-1) && args->addr == addr) return 1; -- 2.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/