diff options
| author | libin <huawei.libin@huawei.com> | 2015-11-03 08:58:47 +0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-12-13 17:49:06 +0000 |
| commit | 811f0bd948ffbf8f1b05c24953926666e1cb1886 (patch) | |
| tree | eafcccc9ce07b034d1481cd71b528f43b72f819c /scripts | |
| parent | fd5507bac259dd048f77ad564cb68535a5a98661 (diff) | |
| download | linux-stable-811f0bd948ffbf8f1b05c24953926666e1cb1886.tar.gz linux-stable-811f0bd948ffbf8f1b05c24953926666e1cb1886.tar.bz2 linux-stable-811f0bd948ffbf8f1b05c24953926666e1cb1886.zip | |
recordmcount: Fix endianness handling bug for nop_mcount
commit c84da8b9ad3761eef43811181c7e896e9834b26b upstream.
In nop_mcount, shdr->sh_offset and welp->r_offset should handle
endianness properly, otherwise it will trigger Segmentation fault
if the recordmcount main and file.o have different endianness.
Link: http://lkml.kernel.org/r/563806C7.7070606@huawei.com
Signed-off-by: Li Bin <huawei.libin@huawei.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/recordmcount.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h index 49b582a225b0..b9897e2be404 100644 --- a/scripts/recordmcount.h +++ b/scripts/recordmcount.h @@ -377,7 +377,7 @@ static void nop_mcount(Elf_Shdr const *const relhdr, if (mcountsym == Elf_r_sym(relp) && !is_fake_mcount(relp)) { if (make_nop) - ret = make_nop((void *)ehdr, shdr->sh_offset + relp->r_offset); + ret = make_nop((void *)ehdr, _w(shdr->sh_offset) + _w(relp->r_offset)); if (warn_on_notrace_sect && !once) { printf("Section %s has mcount callers being ignored\n", txtname); |