diff options
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/ia32/ptrace32.c | 9 | ||||
-rw-r--r-- | arch/x86_64/kernel/ptrace.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c index 5f4cdfa56901..ea4394e021d6 100644 --- a/arch/x86_64/ia32/ptrace32.c +++ b/arch/x86_64/ia32/ptrace32.c | |||
@@ -28,9 +28,12 @@ | |||
28 | #include <asm/i387.h> | 28 | #include <asm/i387.h> |
29 | #include <asm/fpu32.h> | 29 | #include <asm/fpu32.h> |
30 | 30 | ||
31 | /* determines which flags the user has access to. */ | 31 | /* |
32 | /* 1 = access 0 = no access */ | 32 | * Determines which flags the user has access to [1 = access, 0 = no access]. |
33 | #define FLAG_MASK 0x44dd5UL | 33 | * Prohibits changing ID(21), VIP(20), VIF(19), VM(17), IOPL(12-13), IF(9). |
34 | * Also masks reserved bits (31-22, 15, 5, 3, 1). | ||
35 | */ | ||
36 | #define FLAG_MASK 0x54dd5UL | ||
34 | 37 | ||
35 | #define R32(l,q) \ | 38 | #define R32(l,q) \ |
36 | case offsetof(struct user32, regs.l): stack[offsetof(struct pt_regs, q)/8] = val; break | 39 | case offsetof(struct user32, regs.l): stack[offsetof(struct pt_regs, q)/8] = val; break |
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c index a87b6cebe80f..86248bc9303e 100644 --- a/arch/x86_64/kernel/ptrace.c +++ b/arch/x86_64/kernel/ptrace.c | |||
@@ -36,9 +36,12 @@ | |||
36 | * in exit.c or in signal.c. | 36 | * in exit.c or in signal.c. |
37 | */ | 37 | */ |
38 | 38 | ||
39 | /* determines which flags the user has access to. */ | 39 | /* |
40 | /* 1 = access 0 = no access */ | 40 | * Determines which flags the user has access to [1 = access, 0 = no access]. |
41 | #define FLAG_MASK 0x44dd5UL | 41 | * Prohibits changing ID(21), VIP(20), VIF(19), VM(17), IOPL(12-13), IF(9). |
42 | * Also masks reserved bits (63-22, 15, 5, 3, 1). | ||
43 | */ | ||
44 | #define FLAG_MASK 0x54dd5UL | ||
42 | 45 | ||
43 | /* set's the trap flag. */ | 46 | /* set's the trap flag. */ |
44 | #define TRAP_FLAG 0x100UL | 47 | #define TRAP_FLAG 0x100UL |