From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Mar 2021 17:06:30 +0000 (-0700)
Subject: Merge tag 'trace-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: baikal/aarch64/sdk6.1~7005
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=e0223d0cdf410d89d5effc283e9e2847f36b386a;p=kernel.git

Merge tag 'trace-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull workqueue tracing fix from Steven Rostedt:
 "Fix workqueue trace event unsafe string reference

  After adding a verifier to test all strings printed in trace events to
  make sure they either point to a string on the ring buffer, or to read
  only core kernel memory, it triggered on a workqueue trace event. The
  trace event workqueue_queue_work references the allocated name of the
  workqueue in the output. If the workqueue is freed before the trace is
  read, then the trace will dereference freed memory.

  Update the trace event to use the __string(), __assign_str(), and
  __get_str() helpers to handle such cases"

* tag 'trace-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  workqueue/tracing: Copy workqueue name to buffer in trace event
---

e0223d0cdf410d89d5effc283e9e2847f36b386a