summary refs log tree commit diff
path: root/kernel/trace
diff options
context:
space:
mode:
authorsunliming <sunliming@kylinos.cn>2023-06-26 19:13:42 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-07-23 13:49:32 +0200
commit5aea2ac374560ee9bb13e32f4c06143fe95d330d (patch)
tree33020b9040a42aea501ca8515a216df4550e5d14 /kernel/trace
parenta4336343ea36540760b68cd71ea0864ca7ad3e98 (diff)
downloadlinux-5aea2ac374560ee9bb13e32f4c06143fe95d330d.tar.gz
tracing/user_events: Fix incorrect return value for writing operation when events are disabled
commit f6d026eea390d59787a6cdc2ef5c983d02e029d0 upstream.

The writing operation return the count of writes regardless of whether events
are enabled or disabled. Switch it to return -EBADF to indicates that the event
is disabled.

Link: https://lkml.kernel.org/r/20230626111344.19136-2-sunliming@kylinos.cn

Cc: stable@vger.kernel.org
7f5a08c79df35 ("user_events: Add minimal support for trace_event into ftrace")
Acked-by: Beau Belgrave <beaub@linux.microsoft.com>
Signed-off-by: sunliming <sunliming@kylinos.cn>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_events_user.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c
index 625cab4b9d94..492837609294 100644
--- a/kernel/trace/trace_events_user.c
+++ b/kernel/trace/trace_events_user.c
@@ -1456,7 +1456,8 @@ static ssize_t user_events_write_core(struct file *file, struct iov_iter *i)
 
 		if (unlikely(faulted))
 			return -EFAULT;
-	}
+	} else
+		return -EBADF;
 
 	return ret;
 }