linux-kernel - [GIT PULL] tracing: Fix of mismatch section

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20201016162242.16434e2b@oasis.local.home>
Date:   Fri, 16 Oct 2020 16:22:42 -0400
From:   Steven Rostedt <rostedt@...dmis.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     LKML <linux-kernel@...r.kernel.org>,
        Ingo Molnar <mingo@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Masami Hiramatsu <mhiramat@...nel.org>
Subject: [GIT PULL] tracing: Fix of mismatch section


Linus,

Tracing: Fix mismatch section of adding early trace events

- Fixes the issue of a mismatch section that was missed due to gcc
  inlining the offending function, while clang did not (and reported
  the issue).


Please pull the latest trace-v5.10-2 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v5.10-2

Tag SHA1: 39abab2b445c7e77fa0932a45e150c90ede54bd8
Head SHA1: ce66f6136460a51acfc32de4481fe8fd69dfd50b


Masami Hiramatsu (1):
      tracing: Remove __init from __trace_early_add_new_event()

----
 kernel/trace/trace_events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit ce66f6136460a51acfc32de4481fe8fd69dfd50b
Author: Masami Hiramatsu <mhiramat@...nel.org>
Date:   Fri Oct 16 13:20:02 2020 +0900

    tracing: Remove __init from __trace_early_add_new_event()
    
    The commit 720dee53ad8d ("tracing/boot: Initialize per-instance event
    list in early boot") removes __init from __trace_early_add_events()
    but __trace_early_add_new_event() still has __init and will cause a
    section mismatch.
    
    Remove __init from __trace_early_add_new_event() as same as
    __trace_early_add_events().
    
    Link: https://lore.kernel.org/lkml/CAHk-=wjU86UhovK4XuwvCqTOfc+nvtpAuaN2PJBz15z=w=u0Xg@mail.gmail.com/
    
    Reported-by: Linus Torvalds <torvalds@...ux-foundation.org>
    Signed-off-by: Masami Hiramatsu <mhiramat@...nel.org>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@...dmis.org>

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 851ab37058dd..e705f06c68c6 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2498,7 +2498,7 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr)
  * for enabling events at boot. We want to enable events before
  * the filesystem is initialized.
  */
-static __init int
+static int
 __trace_early_add_new_event(struct trace_event_call *call,
 			    struct trace_array *tr)
 {