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

Commit 183742f0 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Do not use return values of trace_seq_printf() in syscall tracing 



The functions trace_seq_printf() and friends will not be returning values
soon and will be void functions. To know if they succeeded or not, the
functions trace_seq_has_overflowed() and trace_handle_return() should be
used instead.

Reviewed-by: default avatarPetr Mladek <pmladek@suse.cz>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 8579a107

kernel/trace/trace_syscalls.c

+19 −28
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ print_syscall_enter(struct trace_iterator *iter, int flags, 
	struct trace_entry *ent = iter->ent;

	struct syscall_trace_enter *trace;

	struct syscall_metadata *entry;

	int i, ret, syscall;

	int i, syscall;



	trace = (typeof(trace))ent;

	syscall = trace->nr;
@@ -128,35 +128,28 @@ print_syscall_enter(struct trace_iterator *iter, int flags, 
		goto end;

	}



	ret = trace_seq_printf(s, "%s(", entry->name);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;

	trace_seq_printf(s, "%s(", entry->name);



	for (i = 0; i < entry->nb_args; i++) {



		if (trace_seq_has_overflowed(s))

			goto end;



		/* parameter types */

		if (trace_flags & TRACE_ITER_VERBOSE) {

			ret = trace_seq_printf(s, "%s ", entry->types[i]);

			if (!ret)

				return TRACE_TYPE_PARTIAL_LINE;

		}

		if (trace_flags & TRACE_ITER_VERBOSE)

			trace_seq_printf(s, "%s ", entry->types[i]);



		/* parameter values */

		ret = trace_seq_printf(s, "%s: %lx%s", entry->args[i],

		trace_seq_printf(s, "%s: %lx%s", entry->args[i],

				 trace->args[i],

				 i == entry->nb_args - 1 ? "" : ", ");

		if (!ret)

			return TRACE_TYPE_PARTIAL_LINE;

	}



	ret = trace_seq_putc(s, ')');

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;



	trace_seq_putc(s, ')');

end:

	ret =  trace_seq_putc(s, '\n');

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;

	trace_seq_putc(s, '\n');



	return TRACE_TYPE_HANDLED;

	return trace_handle_return(s);

}



static enum print_line_t
@@ -168,7 +161,6 @@ print_syscall_exit(struct trace_iterator *iter, int flags, 
	struct syscall_trace_exit *trace;

	int syscall;

	struct syscall_metadata *entry;

	int ret;



	trace = (typeof(trace))ent;

	syscall = trace->nr;
@@ -176,7 +168,7 @@ print_syscall_exit(struct trace_iterator *iter, int flags, 


	if (!entry) {

		trace_seq_putc(s, '\n');

		return TRACE_TYPE_HANDLED;

		goto out;

	}



	if (entry->exit_event->event.type != ent->type) {
@@ -184,12 +176,11 @@ print_syscall_exit(struct trace_iterator *iter, int flags, 
		return TRACE_TYPE_UNHANDLED;

	}



	ret = trace_seq_printf(s, "%s -> 0x%lx\n", entry->name,

	trace_seq_printf(s, "%s -> 0x%lx\n", entry->name,

				trace->ret);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;



	return TRACE_TYPE_HANDLED;

 out:

	return trace_handle_return(s);

}



extern char *__bad_type_size(void);