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 S1755567AbbKRJ4G (ORCPT <rfc822;w@1wt.eu>);
	Wed, 18 Nov 2015 04:56:06 -0500
Received: from mx2.suse.de ([195.135.220.15]:45965 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755462AbbKRJ4B (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 18 Nov 2015 04:56:01 -0500
Date: Wed, 18 Nov 2015 10:56:00 +0100 (CET)
From: Miroslav Benes <mbenes@suse.cz>
To: Chris J Arges <chris.j.arges@canonical.com>
cc: live-patching@vger.kernel.org, jpoimboe@redhat.com, sjenning@redhat.com,
        jikos@kernel.org, vojtech@suse.com, pmladek@suse.com, jeyu@redhat.com,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3 v7] livepatch: add sympos as disambiguator field to
 klp_reloc
In-Reply-To: <1447693391-10065-3-git-send-email-chris.j.arges@canonical.com>
Message-ID: <alpine.LNX.2.00.1511181048410.13999@pobox.suse.cz>
References: <1447431804-18786-1-git-send-email-chris.j.arges@canonical.com> <1447693391-10065-1-git-send-email-chris.j.arges@canonical.com> <1447693391-10065-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 Mon, 16 Nov 2015, Chris J Arges wrote:

> @@ -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;
> +		if (reloc->sympos && (reloc->sympos != 1)) {
> +			pr_err("symbol '%s' is external and has sympos %lu\n",
> +			       reloc->name, reloc->sympos);
> +			return -EINVAL;
>  		}

Oh, this check should not be here, right? I think it needs to be under 'if 
(reloc->external) {'.

And

if (reloc->sympos && (reloc->sympos != 1)) {

can be written as

if (reloc->sympos > 1) {

Anyway, I am not sure if this is the right thing to do. I know Petr 
suggested it, but maybe it would be sufficient just to error out when 
reloc->sympos is specified for external symbols. Despite there is a valid 
value (== 1). Like it had been done before. Josh came up with the issue. 
So what is your opinion, Josh? It is a nitpick, but nevertheless.

Miroslav

> +		/* discover the address of the referenced symbol */
> +		if (reloc->external) {
> +			ret = klp_find_external_symbol(pmod, reloc->name, &val);
> +		} else
> +			ret = klp_find_object_symbol(obj->mod->name,
> +						     reloc->name,
> +						     reloc->sympos,
> +						     &val);
> +		if (ret)
> +			return ret;
>  		ret = klp_write_module_reloc(pmod, reloc->type, reloc->loc,
> -					     reloc->val + reloc->addend);
> +					     val + reloc->addend);
>  		if (ret) {
>  			pr_err("relocation failed for symbol '%s' at 0x%016lx (%d)\n",
> -			       reloc->name, reloc->val, ret);
> +			       reloc->name, val, ret);
>  			return ret;
>  		}
>  	}
>