mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arch/csky patches for 6.5 

The pull request we've done:
  - Correct thread.trap_no restore of uprobe
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE2KAv+isbWR/viAKHAXH1GYaIxXsFAmSg6mwSHGd1b3JlbkBr
 ZXJuZWwub3JnAAoJEAFx9RmGiMV7IWMP/28mSJrpSWM4U7U3gm2uNSyjz+8OM+9z
 ZYZFpVMZJLiNrcFTfoAbtWP+HQV8cuSw9TSN7k/oCeD+bDB07Tz1qnhP/1Tnnbgy
 IKSaQH+PN6DHx215pxF+1qv06wGJAifGGt4wmb773VYkZYhFp0t8c0V7WaOGbJtZ
 nEt3i400PLwX0gpJYfaWGEO0gqNKqfy5iiJD1SSgE9Cb5kX2qHaKTmB0otZBGyHF
 c1DavwUupu1/jp9ThJaPqPhIwKhT+nI8H0YmmkiA8hqg9kPVI6O9f5ePYjVnJUKl
 PZP0plDAMNgrM+0U/M5xa8srSA3WknEJoa75RwlWjVx5SHfaLn3v1g8zwsRPnhif
 L1ANttcV+MWrF8dvGvG2ghz1Z9yFriLe17LxeqFGtTOrTLKidpU905Cz2VKaUBW7
 qMxxuSfzopk2w+zgsLXFC2w3jLOqVNfurTZC3i0L1DHmfAb8ITh+caIFErdYtBeV
 cqHfaNJ6MLxSsvmz8RjiBU0LjRQ7nb/bk5RRrwIBX/9Ta0Sn4xYxtv2XmtmW4SSB
 ITKTRUiTwHZC8AR1nv53mejeRq0lgD7wejjF3Fz92mn5qaTc0kH77y/FbciOFMuX
 ADQ3abx9AuKCQ0/Ri+m/QOSFyHwq0FH8s6ffZkc8vi/FKPTP1qMLO9tZzp1HXFF4
 NKCfZ7uebz7o
 =zfTL
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-07-01 21:12:32 -07:00
parent dfab92f27c dd64621a2a
commit 995b406c7e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/csky/kernel/probes/uprobes.c
View File

@ -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.