diff options
| author | libin <huawei.libin@huawei.com> | 2015-11-03 08:58:47 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-11-27 12:48:22 +0000 |
| commit | 6b8120dbc56a7ecc9e4b664d860011877bdce985 (patch) | |
| tree | f96dbced2062d114c4079ea6fc38b6350c2a6750 /scripts | |
| parent | f7e70badb0ee4fb9737bf9793e17eedd907b68f8 (diff) | |
| download | linux-stable-6b8120dbc56a7ecc9e4b664d860011877bdce985.tar.gz linux-stable-6b8120dbc56a7ecc9e4b664d860011877bdce985.tar.bz2 linux-stable-6b8120dbc56a7ecc9e4b664d860011877bdce985.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: Ben Hutchings <ben@decadent.org.uk>
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 5e29610303b0..799d73483fb2 100644 --- a/scripts/recordmcount.h +++ b/scripts/recordmcount.h @@ -375,7 +375,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); |