Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aba51024 authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

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: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarAnton Arapov <anton@redhat.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
parent a6cb3f6d

kernel/events/uprobes.c

+8 −1
Original line number Diff line number Diff line
@@ -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;

}



/*