Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee9a7d2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fixes from Steven Rostedt:
 "Two more fixes:

  1. The recordmcount change had an output that used sprintf()
     (incorrectly) when it should have been a fprintf() to stderr.

  2. The printk_formats file could crash if someone added a
     trace_printk() in the core kernel, and also added one in a module.
     This does not affect production kernels.  Only kernels where
     developers add trace_printk() for debugging can crash"

* tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix setting of start_index in find_next()
  ftrace/scripts: Fix incorrect use of sprintf in recordmcount
parents 3331f99a f36d1be2

kernel/trace/trace_printk.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -273,6 +273,7 @@ static const char **find_next(void *v, loff_t *pos) 
	if (*pos < last_index + start_index)

	if (*pos < last_index + start_index)

		return __start___tracepoint_str + (*pos - last_index);

		return __start___tracepoint_str + (*pos - last_index);





	start_index += last_index;

	return find_next_mod_format(start_index, v, fmt, pos);

	return find_next_mod_format(start_index, v, fmt, pos);

}

}

scripts/recordmcount.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -586,7 +586,7 @@ main(int argc, char *argv[]) 
			do_file(file);

			do_file(file);

			break;

			break;

		case SJ_FAIL:    /* error in do_file or below */

		case SJ_FAIL:    /* error in do_file or below */

			sprintf("%s: failed\n", file);

			fprintf(stderr, "%s: failed\n", file);

			++n_error;

			++n_error;

			break;

			break;

		case SJ_SUCCEED:    /* premature success */

		case SJ_SUCCEED:    /* premature success */