Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'parisc-5.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"Fix ptrace syscall number modification which has been broken since
kernel v4.5 and provide alternative email addresses for the remaining
users of the retired parisc-linux.org email domain"
* 'parisc-5.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
CREDITS/MAINTAINERS: Retire parisc-linux.org email domain
parisc: Fix ptrace syscall number modification
+32
-22
+9
-11
CREDITS
+9
-11
CREDITS
···
842
842
843
843
N: Helge Deller
844
844
E: deller@gmx.de
845
-
E: hdeller@redhat.de
846
-
D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver
847
-
S: Schimmelsrain 1
848
-
S: D-69231 Rauenberg
845
+
W: http://www.parisc-linux.org/
846
+
D: PA-RISC Linux architecture maintainer
847
+
D: LASI-, ASP-, WAX-, LCD/LED-driver
849
848
S: Germany
850
849
851
850
N: Jean Delvare
···
1360
1361
S: South Africa
1361
1362
1362
1363
N: Grant Grundler
1363
-
E: grundler@parisc-linux.org
1364
+
E: grantgrundler@gmail.com
1364
1365
W: http://obmouse.sourceforge.net/
1365
1366
W: http://www.parisc-linux.org/
1366
1367
D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
···
2491
2492
S: USA
2492
2493
2493
2494
N: Kyle McMartin
2494
-
E: kyle@parisc-linux.org
2495
+
E: kyle@mcmartin.ca
2495
2496
D: Linux/PARISC hacker
2496
2497
D: AD1889 sound driver
2497
2498
S: Ottawa, Canada
···
3779
3780
S: Cupertino, CA 95014
3780
3781
S: USA
3781
3782
3782
-
N: Thibaut Varene
3783
-
E: T-Bone@parisc-linux.org
3784
-
W: http://www.parisc-linux.org/~varenet/
3785
-
P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063
3783
+
N: Thibaut Varène
3784
+
E: hacks+kernel@slashdirt.org
3785
+
W: http://hacks.slashdirt.org/
3786
3786
D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
3787
3787
D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
3788
3788
D: AD1889 sound driver
3789
-
S: Paris, France
3789
+
S: France
3790
3790
3791
3791
N: Heikki Vatiainen
3792
3792
E: hessu@cs.tut.fi
+2
-3
MAINTAINERS
+2
-3
MAINTAINERS
···
409
409
F: include/uapi/linux/wmi.h
410
410
411
411
AD1889 ALSA SOUND DRIVER
412
-
M: Thibaut Varene <T-Bone@parisc-linux.org>
413
-
W: http://wiki.parisc-linux.org/AD1889
412
+
W: https://parisc.wiki.kernel.org/index.php/AD1889
414
413
L: linux-parisc@vger.kernel.org
415
414
S: Maintained
416
415
F: sound/pci/ad1889.*
···
11487
11488
F: drivers/block/paride/
11488
11489
11489
11490
PARISC ARCHITECTURE
11490
-
M: "James E.J. Bottomley" <jejb@parisc-linux.org>
11491
+
M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
11491
11492
M: Helge Deller <deller@gmx.de>
11492
11493
L: linux-parisc@vger.kernel.org
11493
11494
W: http://www.parisc-linux.org/
+21
-8
arch/parisc/kernel/ptrace.c
+21
-8
arch/parisc/kernel/ptrace.c
···
308
308
309
309
long do_syscall_trace_enter(struct pt_regs *regs)
310
310
{
311
-
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
312
-
tracehook_report_syscall_entry(regs)) {
311
+
if (test_thread_flag(TIF_SYSCALL_TRACE)) {
312
+
int rc = tracehook_report_syscall_entry(regs);
313
+
313
314
/*
314
-
* Tracing decided this syscall should not happen or the
315
-
* debugger stored an invalid system call number. Skip
316
-
* the system call and the system call restart handling.
315
+
* As tracesys_next does not set %r28 to -ENOSYS
316
+
* when %r20 is set to -1, initialize it here.
317
317
*/
318
-
regs->gr[20] = -1UL;
319
-
goto out;
318
+
regs->gr[28] = -ENOSYS;
319
+
320
+
if (rc) {
321
+
/*
322
+
* A nonzero return code from
323
+
* tracehook_report_syscall_entry() tells us
324
+
* to prevent the syscall execution. Skip
325
+
* the syscall call and the syscall restart handling.
326
+
*
327
+
* Note that the tracer may also just change
328
+
* regs->gr[20] to an invalid syscall number,
329
+
* that is handled by tracesys_next.
330
+
*/
331
+
regs->gr[20] = -1UL;
332
+
return -1;
333
+
}
320
334
}
321
335
322
336
/* Do the secure computing check after ptrace. */
···
354
340
regs->gr[24] & 0xffffffff,
355
341
regs->gr[23] & 0xffffffff);
356
342
357
-
out:
358
343
/*
359
344
* Sign extend the syscall number to 64bit since it may have been
360
345
* modified by a compat ptrace call