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

Commit c2931e05 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

ftrace: return an error when setting a nonexistent tracer 



When one try to set a nonexistent tracer, no error is returned
as if the name of the tracer was correct.
We should return -EINVAL.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3ea2e6d7

kernel/trace/trace.c

+10 −3
Original line number Diff line number Diff line
@@ -2381,9 +2381,11 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf, 
	struct tracer *t;

	char buf[max_tracer_type_len+1];

	int i;

	size_t ret;



	if (cnt > max_tracer_type_len)

		cnt = max_tracer_type_len;

	ret = cnt;



	if (copy_from_user(&buf, ubuf, cnt))

		return -EFAULT;
@@ -2399,7 +2401,11 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf, 
		if (strcmp(t->name, buf) == 0)

			break;

	}

	if (!t || t == current_trace)

	if (!t) {

		ret = -EINVAL;

		goto out;

	}

	if (t == current_trace)

		goto out;



	if (current_trace && current_trace->reset)
@@ -2412,9 +2418,10 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf, 
 out:

	mutex_unlock(&trace_types_lock);



	if (ret == cnt)

		filp->f_pos += cnt;



	return cnt;

	return ret;

}



static ssize_t