tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
+3
arch/csky/kernel/probes/uprobes.c
+3
arch/csky/kernel/probes/uprobes.c
···
64
64
struct uprobe_task *utask = current->utask;
65
65
66
66
WARN_ON_ONCE(current->thread.trap_no != UPROBE_TRAP_NR);
67
+
current->thread.trap_no = utask->autask.saved_trap_no;
67
68
68
69
instruction_pointer_set(regs, utask->vaddr + auprobe->insn_size);
69
70
···
101
100
void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
102
101
{
103
102
struct uprobe_task *utask = current->utask;
103
+
104
+
current->thread.trap_no = utask->autask.saved_trap_no;
104
105
105
106
/*
106
107
* Task has received a fatal signal, so reset back to probed