patch-2.1.121 linux/arch/i386/kernel/ldt.c

• Lines: 33
• Date: Wed Sep 9 08:56:58 1998
• Orig file: v2.1.120/linux/arch/i386/kernel/ldt.c
• Orig date: Tue Aug 18 22:02:02 1998

diff -u --recursive --new-file v2.1.120/linux/arch/i386/kernel/ldt.c linux/arch/i386/kernel/ldt.c
@@ -16,6 +16,8 @@
 #include <asm/system.h>
 #include <asm/ldt.h>
 
+#include "desc.h"
+
 static int read_ldt(void * ptr, unsigned long bytecount)
 {
 	void * address = current->mm->segments;
@@ -23,11 +25,9 @@
 
 	if (!ptr)
 		return -EINVAL;
+	if (!address)
+		return 0;
 	size = LDT_ENTRIES*LDT_ENTRY_SIZE;
-	if (!address) {
-		address = &default_ldt;
-		size = sizeof(default_ldt);
-	}
 	if (size > bytecount)
 		size = bytecount;
 	return copy_to_user(ptr, address, size) ? -EFAULT : size;
@@ -81,7 +81,8 @@
 		if (!mm->segments) {
 			int i = current->tarray_ptr - &task[0];
 			mm->segments = ldt;
-			set_ldt_desc(gdt+(i<<1)+FIRST_LDT_ENTRY, ldt, LDT_ENTRIES);
+			set_ldt_desc(i, ldt, LDT_ENTRIES);
+			current->tss.ldt = _LDT(i);
 			load_ldt(i);
 			if (atomic_read(&mm->count) > 1)
 				printk(KERN_WARNING