diff options
author | Oleg Nesterov <[email protected]> | 2013-09-11 17:47:26 +0200 |
---|---|---|
committer | Ingo Molnar <[email protected]> | 2013-09-12 08:00:55 +0200 |
commit | 878b5a6efd38030c7a90895dc8346e8fb1e09b4c (patch) | |
tree | 5b58037396e9afa4799106c5c38cf9498d5db2d1 | |
parent | 6113af14c82726d5a2993a7ba238df24c990a5ee (diff) |
uprobes: Fix utask->depth accounting in handle_trampoline()
Currently utask->depth is simply the number of allocated/pending
return_instance's in uprobe_task->return_instances list.
handle_trampoline() should decrement this counter every time we
handle/free an instance, but due to typo it does this only if
->chained == T. This means that in the likely case this counter
is never decremented and the probed task can't report more than
MAX_URETPROBE_DEPTH events.
Reported-by: Mikhail Kulemin <[email protected]>
Reported-by: Hemant Kumar Shaw <[email protected]>
Signed-off-by: Oleg Nesterov <[email protected]>
Acked-by: Anton Arapov <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
-rw-r--r-- | kernel/events/uprobes.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index f3569747d629..ad8e1bdca70e 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1682,12 +1682,10 @@ static bool handle_trampoline(struct pt_regs *regs) tmp = ri; ri = ri->next; kfree(tmp); + utask->depth--; if (!chained) break; - - utask->depth--; - BUG_ON(!ri); } |