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

Commit 598a0c7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Two kernel side fixes: a kprobes fix and a perf_remove_from_context()
  fix (which does not yet fix the migration bug which is WIP)"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Fix a race condition in perf_remove_from_context()
  kprobes/x86: Free 'optinsn' cache when range check fails
parents 7a5e8786 3577af70

arch/x86/kernel/kprobes/opt.c

+3 −1
Original line number Diff line number Diff line
@@ -338,8 +338,10 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op) 
	 * a relative jump.

	 */

	rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;

	if (abs(rel) > 0x7fffffff)

	if (abs(rel) > 0x7fffffff) {

		__arch_remove_optimized_kprobe(op, 0);

		return -ERANGE;

	}



	buf = (u8 *)op->optinsn.insn;

kernel/events/core.c

+10 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,11 @@ static void perf_remove_from_context(struct perf_event *event, bool detach_group 
	 */

	if (ctx->is_active) {

		raw_spin_unlock_irq(&ctx->lock);

		/*

		 * Reload the task pointer, it might have been changed by

		 * a concurrent perf_event_context_sched_out().

		 */

		task = ctx->task;

		goto retry;

	}
@@ -1967,6 +1972,11 @@ perf_install_in_context(struct perf_event_context *ctx, 
	 */

	if (ctx->is_active) {

		raw_spin_unlock_irq(&ctx->lock);

		/*

		 * Reload the task pointer, it might have been changed by

		 * a concurrent perf_event_context_sched_out().

		 */

		task = ctx->task;

		goto retry;

	}