From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754485AbbKWJw1 (ORCPT <rfc822;w@1wt.eu>);
	Mon, 23 Nov 2015 04:52:27 -0500
Received: from mx2.suse.de ([195.135.220.15]:40864 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754344AbbKWJwZ (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 23 Nov 2015 04:52:25 -0500
Date: Mon, 23 Nov 2015 10:52:23 +0100 (CET)
From: Miroslav Benes <mbenes@suse.cz>
To: Chris J Arges <chris.j.arges@canonical.com>
cc: live-patching@vger.kernel.org, linux-kernel@vger.kernel.org,
        jpoimboe@redhat.com, jikos@kernel.org, pmladek@suse.com,
        jeyu@redhat.com, Seth Jennings <sjenning@redhat.com>,
        Vojtech Pavlik <vojtech@suse.com>
Subject: Re: [PATCH 2/3 v8] livepatch: add sympos as disambiguator field to
 klp_reloc
In-Reply-To: <1448040325-32498-3-git-send-email-chris.j.arges@canonical.com>
Message-ID: <alpine.LNX.2.00.1511231047560.30177@pobox.suse.cz>
References: <1447693391-10065-1-git-send-email-chris.j.arges@canonical.com> <1448040325-32498-1-git-send-email-chris.j.arges@canonical.com> <1448040325-32498-3-git-send-email-chris.j.arges@canonical.com>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, 20 Nov 2015, Chris J Arges wrote:

[...]

> @@ -272,6 +233,7 @@ static int klp_write_object_relocations(struct module *pmod,
>  					struct klp_object *obj)
>  {
>  	int ret;
> +	unsigned long val;
>  	struct klp_reloc *reloc;
>  
>  	if (WARN_ON(!klp_is_object_loaded(obj)))
> @@ -281,29 +243,26 @@ static int klp_write_object_relocations(struct module *pmod,
>  		return -EINVAL;
>  
>  	for (reloc = obj->relocs; reloc->name; reloc++) {
> -		if (!klp_is_module(obj)) {
> -			ret = klp_verify_vmlinux_symbol(reloc->name,
> -							reloc->val);
> -			if (ret)
> -				return ret;
> -		} else {
> -			/* module, reloc->val needs to be discovered */
> -			if (reloc->external)
> -				ret = klp_find_external_symbol(pmod,
> -							       reloc->name,
> -							       &reloc->val);
> -			else
> -				ret = klp_find_object_symbol(obj->mod->name,
> -							     reloc->name,
> -							     0, &reloc->val);
> -			if (ret)
> -				return ret;
> -		}
> +		/* discover the address of the referenced symbol */
> +		if (reloc->external) {
> +			if (reloc->sympos > 0) {
> +				pr_err("non-zero sympos for external reloc symbol '%s' is not supported\n",
> +				       reloc->name);
> +				return -EINVAL;
> +			}
> +			ret = klp_find_external_symbol(pmod, reloc->name, &val);
> +		} else
> +			ret = klp_find_object_symbol(obj->mod->name,
> +						     reloc->name,
> +						     reloc->sympos,
> +						     &val);

I think this will cause an unwanted effect if a relocation is for vmlinux 
symbol. obj->mod is NULL in that case. So obj->name should be there. Can 
you test it with kpatch, Chris, please? If that is possible.

Thanks,
Miroslav