diff options
| -rw-r--r-- | kernel/trace/trace_events_filter.c | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 09b4733a2933..33264e510d16 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -1360,7 +1360,7 @@ int filter_assign_type(const char *type)  			return FILTER_DYN_STRING;  		if (strstr(type, "cpumask_t"))  			return FILTER_CPUMASK; -		} +	}  	if (strstr(type, "__rel_loc") && strstr(type, "char"))  		return FILTER_RDYN_STRING; @@ -1731,7 +1731,9 @@ static int parse_pred(const char *str, void *data,  		maskstart = i;  		/* Walk the cpulist until closing } */ -		for (; str[i] && str[i] != '}'; i++); +		for (; str[i] && str[i] != '}'; i++) +			; +  		if (str[i] != '}') {  			parse_error(pe, FILT_ERR_MISSING_BRACE_CLOSE, pos + i);  			goto err_free; | 
