Commit 2c2b3d90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

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

   - Add "const" to "char *" in event structure field that gets assigned
     literals.

   - Check size of input passed into the tracing cpumask file.

     If a too large of an input gets passed into the cpumask file, it
     could trigger a warning in the bitmask parsing code"

* tag 'trace-v6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: Prevent bad count for tracing_cpumask_write
  tracing: Constify string literal data member in struct trace_event_call
parents d6ef8b40 98feccbf

include/linux/trace_events.h

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ struct trace_event_call { 
	struct list_head	list;

	struct trace_event_class *class;

	union {

		char			*name;

		const char		*name;

		/* Set TRACE_EVENT_FL_TRACEPOINT flag when using "tp" */

		struct tracepoint	*tp;

	};

kernel/trace/trace.c

+3 −0
Original line number Diff line number Diff line
@@ -5087,6 +5087,9 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf, 
	cpumask_var_t tracing_cpumask_new;

	int err;



	if (count == 0 || count > KMALLOC_MAX_SIZE)

		return -EINVAL;



	if (!zalloc_cpumask_var(&tracing_cpumask_new, GFP_KERNEL))

		return -ENOMEM;