Skip to content

Commit 47c51df

Browse files
Paolo 'Blaisorblade' GiarrussoLinus Torvalds
authored andcommitted
[PATCH] x86_64: fix 2.6.18 regression - PTRACE_OLDSETOPTIONS should be accepted
Also PTRACE_OLDSETOPTIONS should be accepted, as done by kernel/ptrace.c and forced by binary compatibility. UML/32bit breaks because of this - since it is wise enough to use PTRACE_OLDSETOPTIONS to be binary compatible with 2.4 host kernels. Until 2.6.17 (commit f0f2d65) we had: default: return sys_ptrace(request, pid, addr, data); Instead here we have: case PTRACE_GET_THREAD_AREA: case ...: return sys_ptrace(request, pid, addr, data); default: return -EINVAL; This change was a style change - when a case is added, it must be explicitly tested this way. In this case, not enough testing was done. Cc: Andi Kleen <[email protected]> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent de7b37c commit 47c51df

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86_64/ia32/ptrace32.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
243243
case PTRACE_SINGLESTEP:
244244
case PTRACE_DETACH:
245245
case PTRACE_SYSCALL:
246+
case PTRACE_OLDSETOPTIONS:
246247
case PTRACE_SETOPTIONS:
247248
case PTRACE_SET_THREAD_AREA:
248249
case PTRACE_GET_THREAD_AREA:

0 commit comments

Comments
 (0)