diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/signal.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_events_filter.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 47db2ffabbde..c4462e92e9cd 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2391,6 +2391,8 @@ relock: if (signal_group_exit(signal)) { ksig->info.si_signo = signr = SIGKILL; sigdelset(¤t->pending.signal, SIGKILL); + trace_signal_deliver(SIGKILL, SEND_SIG_NOINFO, + &sighand->action[SIGKILL - 1]); recalc_sigpending(); goto fatal; } diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 66c3b1ecdef3..9c1c903750b7 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -440,7 +440,7 @@ predicate_parse(const char *str, int nr_parens, int nr_preds, op_stack = kmalloc_array(nr_parens, sizeof(*op_stack), GFP_KERNEL); if (!op_stack) return ERR_PTR(-ENOMEM); - prog_stack = kmalloc_array(nr_preds, sizeof(*prog_stack), GFP_KERNEL); + prog_stack = kcalloc(nr_preds, sizeof(*prog_stack), GFP_KERNEL); if (!prog_stack) { parse_error(pe, -ENOMEM, 0); goto out_free; @@ -589,7 +589,11 @@ predicate_parse(const char *str, int nr_parens, int nr_preds, out_free: kfree(op_stack); kfree(inverts); - kfree(prog_stack); + if (prog_stack) { + for (i = 0; prog_stack[i].pred; i++) + kfree(prog_stack[i].pred); + kfree(prog_stack); + } return ERR_PTR(ret); } |