SOURCES (LINUX_2_6_22): linux-2.6-grsec_full.patch - up for 2.6.22.19

[arekm]

Author: arekm                        Date: Tue Feb 26 09:07:31 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6_22
---- Log message:
- up for 2.6.22.19

---- Files affected:
SOURCES:
   linux-2.6-grsec_full.patch (1.1.2.24.2.7 -> 1.1.2.24.2.8) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsec_full.patch
diff -u SOURCES/linux-2.6-grsec_full.patch:1.1.2.24.2.7 SOURCES/linux-2.6-grsec_full.patch:1.1.2.24.2.8
--- SOURCES/linux-2.6-grsec_full.patch:1.1.2.24.2.7	Mon Feb 11 15:17:37 2008
+++ SOURCES/linux-2.6-grsec_full.patch	Tue Feb 26 10:07:25 2008
@@ -2748,35 +2748,6 @@
 diff -urNp linux-2.6.22.1/arch/i386/kernel/ptrace.c linux-2.6.22.1/arch/i386/kernel/ptrace.c
 --- linux-2.6.22.1/arch/i386/kernel/ptrace.c	2007-07-10 14:56:30.000000000 -0400
 +++ linux-2.6.22.1/arch/i386/kernel/ptrace.c	2007-08-02 11:38:45.000000000 -0400
-@@ -161,17 +162,20 @@ static unsigned long convert_eip_to_line
- 	 * and APM bios ones we just ignore here.
- 	 */
- 	if (seg & LDT_SEGMENT) {
--		u32 *desc;
-+		struct desc_struct *desc;
- 		unsigned long base;
- 
- 		down(&child->mm->context.sem);
--		desc = child->mm->context.ldt + (seg & ~7);
--		base = (desc[0] >> 16) | ((desc[1] & 0xff) << 16) | (desc[1] & 0xff000000);
--
--		/* 16-bit code segment? */
--		if (!((desc[1] >> 22) & 1))
--			addr &= 0xffff;
--		addr += base;
-+		if ((seg >> 3) < child->mm->context.size) {
-+			desc = &child->mm->context.ldt[seg >> 3];
-+			base = (desc->a >> 16) | ((desc->b & 0xff) << 16) | (desc->b & 0xff000000);
-+
-+			/* 16-bit code segment? */
-+			if (!((desc->b >> 22) & 1))
-+				addr &= 0xffff;
-+			addr += base;
-+		} else
-+			addr = -EINVAL;
- 		up(&child->mm->context.sem);
- 	}
- 	return addr;
 @@ -183,6 +187,9 @@ static inline int is_setting_trap_flag(s
  	unsigned char opcode[15];
  	unsigned long addr = convert_eip_to_linear(child, regs);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec_full.patch?r1=1.1.2.24.2.7&r2=1.1.2.24.2.8&f=u