Commit 995b406c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'csky-for-linus-6.5' of https://github.com/c-sky/csky-linux 

Pull arch/csky update from Guo Ren:

 - Correct thread.trap_no restore of uprobe

* tag 'csky-for-linus-6.5' of https://github.com/c-sky/csky-linux:
  csky: uprobes: Restore thread.trap_no
parents dfab92f2 dd64621a

arch/csky/kernel/probes/uprobes.c

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs) 
	struct uprobe_task *utask = current->utask;



	WARN_ON_ONCE(current->thread.trap_no != UPROBE_TRAP_NR);

	current->thread.trap_no = utask->autask.saved_trap_no;



	instruction_pointer_set(regs, utask->vaddr + auprobe->insn_size);
@@ -101,6 +102,8 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs) 
{

	struct uprobe_task *utask = current->utask;



	current->thread.trap_no = utask->autask.saved_trap_no;



	/*

	 * Task has received a fatal signal, so reset back to probed

	 * address.