From: Steven Rostedt (VMware) <rostedt@goodmis.org>
Date: Fri, 23 Feb 2018 03:32:51 +0000 (-0500)
Subject: tracing: Remove BUG_ON() from append_filter_string()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a0ff08fd4e3f8b1cbc18950a8bf1f9067f7e700a;p=openwrt%2Fstaging%2Fblogic.git

tracing: Remove BUG_ON() from append_filter_string()

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>
---

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)