|
@@ -2202,7 +2202,7 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
|
|
|
struct trace_parser *parser;
|
|
|
ssize_t ret, read;
|
|
|
|
|
|
- if (!cnt || cnt < 0)
|
|
|
+ if (!cnt)
|
|
|
return 0;
|
|
|
|
|
|
mutex_lock(&ftrace_regex_lock);
|
|
@@ -2216,7 +2216,7 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
|
|
|
parser = &iter->parser;
|
|
|
read = trace_get_user(parser, ubuf, cnt, ppos);
|
|
|
|
|
|
- if (trace_parser_loaded(parser) &&
|
|
|
+ if (read >= 0 && trace_parser_loaded(parser) &&
|
|
|
!trace_parser_cont(parser)) {
|
|
|
ret = ftrace_process_regex(parser->buffer,
|
|
|
parser->idx, enable);
|
|
@@ -2552,8 +2552,7 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,
|
|
|
size_t cnt, loff_t *ppos)
|
|
|
{
|
|
|
struct trace_parser parser;
|
|
|
- size_t read = 0;
|
|
|
- ssize_t ret;
|
|
|
+ ssize_t read, ret;
|
|
|
|
|
|
if (!cnt || cnt < 0)
|
|
|
return 0;
|
|
@@ -2572,7 +2571,7 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,
|
|
|
|
|
|
read = trace_get_user(&parser, ubuf, cnt, ppos);
|
|
|
|
|
|
- if (trace_parser_loaded((&parser))) {
|
|
|
+ if (read >= 0 && trace_parser_loaded((&parser))) {
|
|
|
parser.buffer[parser.idx] = 0;
|
|
|
|
|
|
/* we allow only one expression at a time */
|