From: libin <huawei.li...@huawei.com> 3.4.113-rc1 review patch. If anyone has any objections, please let me know.
------------------ 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.7070...@huawei.com Signed-off-by: Li Bin <huawei.li...@huawei.com> Signed-off-by: Steven Rostedt <rost...@goodmis.org> Signed-off-by: Zefan Li <lize...@huawei.com> --- scripts/recordmcount.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h index 5e29610..799d734 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); -- 1.9.1
