Re: [PATCH v2] livepatch: x86: bugfix about kASLR

From: Josh Poimboeuf
Date: Wed Nov 11 2015 - 11:26:34 EST


On Fri, Nov 06, 2015 at 02:25:00PM +0800, Zhou Chengming wrote:
> When enable KASLR, livepatch will adjust old_addr of changed
> function accordingly. So do the same thing for reloc.
>
> [PATCH v1] https://lkml.org/lkml/2015/11/4/91
>
> Reported-by: Cyril B. <cbay@xxxxxxxxxxxxxx>
> Signed-off-by: Zhou Chengming <zhouchengming1@xxxxxxxxxx>
> ---
> kernel/livepatch/core.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
> index 6e53441..db545cb 100644
> --- a/kernel/livepatch/core.c
> +++ b/kernel/livepatch/core.c
> @@ -294,6 +294,12 @@ static int klp_write_object_relocations(struct module *pmod,
>
> for (reloc = obj->relocs; reloc->name; reloc++) {
> if (!klp_is_module(obj)) {
> +
> +#if defined(CONFIG_RANDOMIZE_BASE)
> + /* If KASLR has been enabled, adjust old value accordingly */
> + if (kaslr_enabled())
> + reloc->val += kaslr_offset();
> +#endif
> ret = klp_verify_vmlinux_symbol(reloc->name,
> reloc->val);
> if (ret)

Acked-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/