[for-next][PATCH 39/46] tracing: Remove BUG_ON() from append_filter_string()

Steven Rostedt
2018-03-21T02:23:46Z

[-- Attachment #1: 0039-tracing-Remove-BUG_ON-from-append_filter_string.patch --]
[-- Type: text/plain, Size: 885 bytes --]

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

There's no reason to BUG if there's a bug in the filtering code. Simply do a
warning and return.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace_events_filter.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index a764aec3c9a1..819a13c3e13c 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -681,7 +681,8 @@ static int append_filter_string(struct event_filter *filter,
int newlen;
char *new_filter_string;

- BUG_ON(!filter->filter_string);
+ if (WARN_ON(!filter->filter_string))
+ return -EINVAL;
newlen = strlen(filter->filter_string) + strlen(string) + 1;
new_filter_string = kmalloc(newlen, GFP_KERNEL);
if (!new_filter_string)
--
2.15.1