diff options
| author | chenzefeng (A) <chenzefeng2@huawei.com> | 2019-02-20 12:37:54 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-23 09:05:14 +0100 |
| commit | f5aebe74113f488cad5444ab66f28c08d9c0a39a (patch) | |
| tree | 77eb3e892d3e0c7805d0c248b3a5664921a8de16 /arch/x86/kernel/livepatch.c | |
| parent | 01fb36063d972e1b1ac751d9249300098ba20794 (diff) | |
| download | linux-stable-f5aebe74113f488cad5444ab66f28c08d9c0a39a.tar.gz linux-stable-f5aebe74113f488cad5444ab66f28c08d9c0a39a.tar.bz2 linux-stable-f5aebe74113f488cad5444ab66f28c08d9c0a39a.zip | |
x86: livepatch: Treat R_X86_64_PLT32 as R_X86_64_PC32
Signed-off-by: chenzefeng <chenzefeng2@huawei.com>
On x86-64, for 32-bit PC-relacive branches, we can generate PLT32
relocation, instead of PC32 relocation. and R_X86_64_PLT32 can be
treated the same as R_X86_64_PC32 since linux kernel doesn't use PLT.
commit b21ebf2fb4cd ("x86: Treat R_X86_64_PLT32 as R_X86_64_PC32") been
fixed for the module loading, but not fixed for livepatch relocation,
which will fail to load livepatch with the error message as follow:
relocation failed for symbol <symbol name> at <symbol address>
This issue only effacted the kernel version from 4.0 to 4.6, becauce the
function klp_write_module_reloc is introduced by: commit b700e7f03df5
("livepatch: kernel: add support for live patching") and deleted by:
commit 425595a7fc20 ("livepatch: reuse module loader code to write
relocations")
Signed-off-by: chenzefeng <chenzefeng2@huawei.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/livepatch.c')
| -rw-r--r-- | arch/x86/kernel/livepatch.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c index d1d35ccffed3..579f8f813ce0 100644 --- a/arch/x86/kernel/livepatch.c +++ b/arch/x86/kernel/livepatch.c @@ -58,6 +58,7 @@ int klp_write_module_reloc(struct module *mod, unsigned long type, val = (s32)value; break; case R_X86_64_PC32: + case R_X86_64_PLT32: val = (u32)(value - loc); break; default: |