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

Merge tag 'trace-v5.13-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fixes from Steven Rostedt:

 - Fix the length check in the temp buffer filter

 - Fix build failure in bootconfig tools for "fallthrough" macro

 - Fix error return of bootconfig apply_xbc() routine

* tag 'trace-v5.13-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Correct the length check which causes memory corruption
  ftrace: Do not blindly read the ip address in ftrace_bug()
  tools/bootconfig: Fix a build error accroding to undefined fallthrough
  tools/bootconfig: Fix error return code in apply_xbc()
parents 548843c0 3e08a9f9

kernel/trace/ftrace.c

+7 −1
Original line number Diff line number Diff line
@@ -1967,12 +1967,18 @@ static int ftrace_hash_ipmodify_update(struct ftrace_ops *ops, 


static void print_ip_ins(const char *fmt, const unsigned char *p)

{

	char ins[MCOUNT_INSN_SIZE];

	int i;



	if (copy_from_kernel_nofault(ins, p, MCOUNT_INSN_SIZE)) {

		printk(KERN_CONT "%s[FAULT] %px\n", fmt, p);

		return;

	}



	printk(KERN_CONT "%s", fmt);



	for (i = 0; i < MCOUNT_INSN_SIZE; i++)

		printk(KERN_CONT "%s%02x", i ? ":" : "", p[i]);

		printk(KERN_CONT "%s%02x", i ? ":" : "", ins[i]);

}



enum ftrace_bug_type ftrace_bug_type;

kernel/trace/trace.c

+1 −1
Original line number Diff line number Diff line
@@ -2736,7 +2736,7 @@ trace_event_buffer_lock_reserve(struct trace_buffer **current_rb, 
	    (entry = this_cpu_read(trace_buffered_event))) {

		/* Try to use the per cpu buffer first */

		val = this_cpu_inc_return(trace_buffered_event_cnt);

		if ((len < (PAGE_SIZE - sizeof(*entry))) && val == 1) {

		if ((len < (PAGE_SIZE - sizeof(*entry) - sizeof(entry->array[0]))) && val == 1) {

			trace_event_setup(entry, type, trace_ctx);

			entry->array[0] = len;

			return entry;

tools/bootconfig/include/linux/bootconfig.h

+4 −0
Original line number Diff line number Diff line
@@ -4,4 +4,8 @@ 


#include "../../../../include/linux/bootconfig.h"



#ifndef fallthrough

# define fallthrough

#endif



#endif

tools/bootconfig/main.c

+1 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ static int apply_xbc(const char *path, const char *xbc_path) 
	}

	/* TODO: Ensure the @path is initramfs/initrd image */

	if (fstat(fd, &stat) < 0) {

		ret = -errno;

		pr_err("Failed to get the size of %s\n", path);

		goto out;

	}