mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing/filters: Fix memory leak when setting a filter tracing: fix trace_vprintk call
This commit is contained in:
commit
e345fe1ada
2 changed files with 3 additions and 2 deletions
|
@ -1393,7 +1393,7 @@ int trace_array_vprintk(struct trace_array *tr,
|
|||
|
||||
int trace_vprintk(unsigned long ip, const char *fmt, va_list args)
|
||||
{
|
||||
return trace_array_printk(&global_trace, ip, fmt, args);
|
||||
return trace_array_vprintk(&global_trace, ip, fmt, args);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(trace_vprintk);
|
||||
|
||||
|
|
|
@ -933,8 +933,9 @@ static void postfix_clear(struct filter_parse_state *ps)
|
|||
|
||||
while (!list_empty(&ps->postfix)) {
|
||||
elt = list_first_entry(&ps->postfix, struct postfix_elt, list);
|
||||
kfree(elt->operand);
|
||||
list_del(&elt->list);
|
||||
kfree(elt->operand);
|
||||
kfree(elt);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue