linux-kernel - Re: [PATCH v2 2/8] powerpc/module: Only try to generate the ftrace

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160301120011.GB10342@lst.de>
Date:	Tue, 1 Mar 2016 13:00:11 +0100
From:	Torsten Duwe <duwe@....de>
To:	Michael Ellerman <mpe@...erman.id.au>
Cc:	linuxppc-dev@...abs.org, bsingharora@...il.com,
	linux-kernel@...r.kernel.org, rostedt@...dmis.org,
	kamalesh@...ux.vnet.ibm.com, pmladek@...e.com, jeyu@...hat.com,
	jkosina@...e.cz, live-patching@...r.kernel.org, mbenes@...e.cz
Subject: Re: [PATCH v2 2/8] powerpc/module: Only try to generate the
	ftrace_caller() stub once

On Mon, Feb 29, 2016 at 08:26:23PM +1100, Michael Ellerman wrote:
[...]
> diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
> index 2c01665eb410..dd095496d225 100644
> --- a/arch/powerpc/kernel/module_32.c
> +++ b/arch/powerpc/kernel/module_32.c
> @@ -294,11 +294,19 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
>  			return -ENOEXEC;
>  		}
>  	}
> +
> +	return 0;
> +}
> +
>  #ifdef CONFIG_DYNAMIC_FTRACE
> -	module->arch.tramp =
> -		do_plt_call(module->core_layout.base,
> -			    (unsigned long)ftrace_caller,
> -			    sechdrs, module);
> -#endif
> +int module_finalize_ftrace(struct module *module, const Elf_Shdr *sechdrs)
> +{
> +	module->arch.tramp = do_plt_call(module->core_layout.base,
> +					 (unsigned long)ftrace_caller,
> +					 sechdrs, module);
> +	if (!mod->arch.tramp)

That should probably read (!module->arch.tramp).

> +		return -ENOENT;
> +
>  	return 0;
>  }
> +#endif