From fcdbada38a9bb45cd4437885247117a7ac19b7ba Mon Sep 17 00:00:00 2001 From: Chuck Ebbert <76306.1226@compuserve.com> Date: Wed, 11 Jan 2006 22:46:03 +0100 Subject: [PATCH] --- yaml --- r: 17999 b: refs/heads/master c: 60923df35edab273d0bd8e829cdfdc5cfbb4fd2c h: refs/heads/master i: 17997: 787dc64442d4317f118d3148ac80ba6580deca36 17995: cea7f5c29971eb16a6d259e96e14c8ee70213282 17991: 56e001475acd2383ee5074c32a02bca80b68179f 17983: c5d65600aa68f3dd150752753a2009792a1216a4 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/ia32/ptrace32.c | 9 ++++++--- trunk/arch/x86_64/kernel/ptrace.c | 9 ++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a34b1fdf402e..af84b794d7ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 100c0e36852a771864c56c31b260b7810b554170 +refs/heads/master: 60923df35edab273d0bd8e829cdfdc5cfbb4fd2c diff --git a/trunk/arch/x86_64/ia32/ptrace32.c b/trunk/arch/x86_64/ia32/ptrace32.c index 5f4cdfa56901..ea4394e021d6 100644 --- a/trunk/arch/x86_64/ia32/ptrace32.c +++ b/trunk/arch/x86_64/ia32/ptrace32.c @@ -28,9 +28,12 @@ #include #include -/* determines which flags the user has access to. */ -/* 1 = access 0 = no access */ -#define FLAG_MASK 0x44dd5UL +/* + * Determines which flags the user has access to [1 = access, 0 = no access]. + * Prohibits changing ID(21), VIP(20), VIF(19), VM(17), IOPL(12-13), IF(9). + * Also masks reserved bits (31-22, 15, 5, 3, 1). + */ +#define FLAG_MASK 0x54dd5UL #define R32(l,q) \ case offsetof(struct user32, regs.l): stack[offsetof(struct pt_regs, q)/8] = val; break diff --git a/trunk/arch/x86_64/kernel/ptrace.c b/trunk/arch/x86_64/kernel/ptrace.c index a87b6cebe80f..86248bc9303e 100644 --- a/trunk/arch/x86_64/kernel/ptrace.c +++ b/trunk/arch/x86_64/kernel/ptrace.c @@ -36,9 +36,12 @@ * in exit.c or in signal.c. */ -/* determines which flags the user has access to. */ -/* 1 = access 0 = no access */ -#define FLAG_MASK 0x44dd5UL +/* + * Determines which flags the user has access to [1 = access, 0 = no access]. + * Prohibits changing ID(21), VIP(20), VIF(19), VM(17), IOPL(12-13), IF(9). + * Also masks reserved bits (63-22, 15, 5, 3, 1). + */ +#define FLAG_MASK 0x54dd5UL /* set's the trap flag. */ #define TRAP_FLAG 0x100UL