uprobes: Fix utask->xol_vaddr leak in pre_ssout()

pre_ssout() should do xol_free_insn_slot() if arch_uprobe_pre_xol()
fails, otherwise nobody will free the allocated slot.

Signed-off-by: Oleg Nesterov <[email protected]>
Acked-by: Anton Arapov <[email protected]>
Acked-by: Srikar Dronamraju <[email protected]>

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 8d9c5bcb110e1343a4b1946977dc62d675df5357..0527379dac5b1e429d48b21fb4fcc7374dfac886 100644 (file)
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1306,6 +1306,7 @@ pre_ssout(struct uprobe *uprobe, struct pt_regs *regs, unsigned long bp_vaddr)
 {
        struct uprobe_task *utask;
        unsigned long xol_vaddr;
+       int err;
 
        utask = current->utask;
 
@@ -1316,7 +1317,13 @@ pre_ssout(struct uprobe *uprobe, struct pt_regs *regs, unsigned long bp_vaddr)
        utask->xol_vaddr = xol_vaddr;
        utask->vaddr = bp_vaddr;
 
-       return arch_uprobe_pre_xol(&uprobe->arch, regs);
+       err = arch_uprobe_pre_xol(&uprobe->arch, regs);
+       if (unlikely(err)) {
+               xol_free_insn_slot(current);
+               return err;
+       }
+
+       return 0;
 }
 
 /*