• Linus Torvalds's avatar
    Merge tag 'probes-fixes-v6.5-rc1-2' of... · 4b4eef57
    Linus Torvalds authored
    Merge tag 'probes-fixes-v6.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
    
    Pull probe fixes from Masami Hiramatsu:
    
     - fprobe: Add a comment why fprobe will be skipped if another kprobe is
       running in fprobe_kprobe_handler().
    
     - probe-events: Fix some issues related to fetch-arguments:
    
        - Fix double counting of the string length for user-string and
          symstr. This will require longer buffer in the array case.
    
        - Fix not to count error code (minus value) for the total used
          length in array argument. This makes the total used length
          shorter.
    
        - Fix to update dynamic used data size counter only if fetcharg uses
          the dynamic size data. This may mis-count the used dynamic data
          size and corrupt data.
    
        - Revert "tracing: Add "(fault)" name injection to kernel probes"
          because that did not work correctly with a bug, and we agreed the
          current '(fault)' output (instead of '"(fault)"' like a string)
          explains what happened more clearly.
    
        - Fix to record 0-length (means fault access) data_loc data in fetch
          function itself, instead of store_trace_args(). If we record an
          array of string, this will fix to save fault access data on each
          entry of the array correctly.
    
    * tag 'probes-fixes-v6.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
      tracing/probes: Fix to record 0-length data_loc in fetch_store_string*() if fails
      Revert "tracing: Add "(fault)" name injection to kernel probes"
      tracing/probes: Fix to update dynamic data counter if fetcharg uses it
      tracing/probes: Fix not to count error code to total length
      tracing/probes: Fix to avoid double count of the string length on the array
      fprobes: Add a comment why fprobe_kprobe_handler exits if kprobe is running
    4b4eef57
fprobe.c 9.3 KB