Commit 9430cd62 authored by Chuang Wang's avatar Chuang Wang Committed by Steven Rostedt (Google)
Browse files

tracing/perf: Use strndup_user instead of kzalloc/strncpy_from_user 

This patch uses strndup_user instead of kzalloc + strncpy_from_user,
which makes the code more concise.

Link: https://lkml.kernel.org/r/20221121080831.707409-1-nashuiliang@gmail.com



Signed-off-by: default avatarChuang Wang <nashuiliang@gmail.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 67543cd6

kernel/trace/trace_event_perf.c

+6 −10
Original line number Diff line number Diff line
@@ -251,16 +251,12 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) 
	struct trace_event_call *tp_event;



	if (p_event->attr.kprobe_func) {

		func = kzalloc(KSYM_NAME_LEN, GFP_KERNEL);

		if (!func)

			return -ENOMEM;

		ret = strncpy_from_user(

			func, u64_to_user_ptr(p_event->attr.kprobe_func),

		func = strndup_user(u64_to_user_ptr(p_event->attr.kprobe_func),

				    KSYM_NAME_LEN);

		if (ret == KSYM_NAME_LEN)

			ret = -E2BIG;

		if (ret < 0)

			goto out;

		if (IS_ERR(func)) {

			ret = PTR_ERR(func);

			return (ret == -EINVAL) ? -E2BIG : ret;

		}



		if (func[0] == '\0') {

			kfree(func);