From: Greg Kroah-Hartman Date: Sun, 31 Jan 2016 19:22:53 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v4.1.17~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2897a702ed7391a8a954bc62bcecfd0f50d35a81;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: recordmcount-fix-endianness-handling-bug-for-nop_mcount.patch --- diff --git a/queue-3.10/recordmcount-fix-endianness-handling-bug-for-nop_mcount.patch b/queue-3.10/recordmcount-fix-endianness-handling-bug-for-nop_mcount.patch new file mode 100644 index 00000000000..cb03ae0ce91 --- /dev/null +++ b/queue-3.10/recordmcount-fix-endianness-handling-bug-for-nop_mcount.patch @@ -0,0 +1,34 @@ +From c84da8b9ad3761eef43811181c7e896e9834b26b Mon Sep 17 00:00:00 2001 +From: libin +Date: Tue, 3 Nov 2015 08:58:47 +0800 +Subject: recordmcount: Fix endianness handling bug for nop_mcount + +From: libin + +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 +Signed-off-by: Steven Rostedt +Signed-off-by: Greg Kroah-Hartman + +--- + scripts/recordmcount.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/recordmcount.h ++++ b/scripts/recordmcount.h +@@ -377,7 +377,7 @@ static void nop_mcount(Elf_Shdr const *c + + 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); diff --git a/queue-3.10/series b/queue-3.10/series index 829ab9249f5..83f88016439 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1 +1,2 @@ +recordmcount-fix-endianness-handling-bug-for-nop_mcount.patch xhci-fix-placement-of-call-to-usb_disabled.patch