X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libs%2Floader%2Fldt_keeper.c;h=433a83a5edc99539674aff9b283c71670d574d8b;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=2cfae68b0faf686b9e6d1a36cbd1c1b591961663;hpb=3305b049e7f587b23359a1c9047fb5763d19c1dc;p=vlc

diff --git a/libs/loader/ldt_keeper.c b/libs/loader/ldt_keeper.c
index 2cfae68b0f..433a83a5ed 100644
--- a/libs/loader/ldt_keeper.c
+++ b/libs/loader/ldt_keeper.c
@@ -146,8 +146,8 @@ void Setup_FS_Segment(void)
     unsigned int ldt_desc = LDT_SEL(fs_ldt);
 
     __asm__ __volatile__(
-	"movl %0,%%eax; movw %%ax, %%fs" : : "r" (ldt_desc)
-	:"eax"
+    "movl %0,%%eax; movw %%ax, %%fs" : : "r" (ldt_desc)
+    :"eax"
     );
 }
 
@@ -157,28 +157,28 @@ void Setup_FS_Segment(void)
 /* XXX: why is this routine from libc redefined here? */
 /* NOTE: the redefined version ignores the count param, count is hardcoded as 16 */
 static int LDT_Modify( int func, struct modify_ldt_ldt_s *ptr,
-		       unsigned long count )
+               unsigned long count )
 {
     int res;
 #ifdef __PIC__
     __asm__ __volatile__( "pushl %%ebx\n\t"
-			  "movl %2,%%ebx\n\t"
-			  "int $0x80\n\t"
-			  "popl %%ebx"
-			  : "=a" (res)
-			  : "0" (__NR_modify_ldt),
-			  "r" (func),
-			  "c" (ptr),
-			  "d"(16)//sizeof(*ptr) from kernel point of view
-			  :"esi"     );
+              "movl %2,%%ebx\n\t"
+              "int $0x80\n\t"
+              "popl %%ebx"
+              : "=a" (res)
+              : "0" (__NR_modify_ldt),
+              "r" (func),
+              "c" (ptr),
+              "d"(16)//sizeof(*ptr) from kernel point of view
+              :"esi"     );
 #else
     __asm__ __volatile__("int $0x80"
-			 : "=a" (res)
-			 : "0" (__NR_modify_ldt),
-			 "b" (func),
-			 "c" (ptr),
-			 "d"(16)
-			 :"esi");
+             : "=a" (res)
+             : "0" (__NR_modify_ldt),
+             "b" (func),
+             "c" (ptr),
+             "d"(16)
+             :"esi");
 #endif  /* __PIC__ */
     if (res >= 0) return res;
     errno = -res;
@@ -191,15 +191,15 @@ static int LDT_Modify( int func, struct modify_ldt_ldt_s *ptr,
 static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
 {
     *buffer++ = ((content->base_addr & 0x0000ffff) << 16) |
-	(content->limit & 0x0ffff);
+    (content->limit & 0x0ffff);
     *buffer = (content->base_addr & 0xff000000) |
-	((content->base_addr & 0x00ff0000)>>16) |
-	(content->limit & 0xf0000) |
-	(content->contents << 10) |
-	((content->read_exec_only == 0) << 9) |
-	((content->seg_32bit != 0) << 22) |
-	((content->limit_in_pages != 0) << 23) |
-	0xf000;
+    ((content->base_addr & 0x00ff0000)>>16) |
+    (content->limit & 0xf0000) |
+    (content->contents << 10) |
+    ((content->read_exec_only == 0) << 9) |
+    ((content->seg_32bit != 0) << 22) |
+    ((content->limit_in_pages != 0) << 23) |
+    0xf000;
 }
 #endif
 
@@ -212,22 +212,22 @@ ldt_fs_t* Setup_LDT_Keeper(void)
     ldt_fs_t* ldt_fs = (ldt_fs_t*) malloc(sizeof(ldt_fs_t));
 
     if (!ldt_fs)
-	return NULL;
+    return NULL;
 
     ldt_fs->fd = open("/dev/zero", O_RDWR);
     if(ldt_fs->fd<0){
         perror( "Cannot open /dev/zero for READ+WRITE. Check permissions! error: ");
-	return NULL;
+    return NULL;
     }
     fs_seg=
     ldt_fs->fs_seg = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE,
-			  ldt_fs->fd, 0);
+              ldt_fs->fd, 0);
     if (ldt_fs->fs_seg == (void*)-1)
     {
-	perror("ERROR: Couldn't allocate memory for fs segment");
+    perror("ERROR: Couldn't allocate memory for fs segment");
         close(ldt_fs->fd);
         free(ldt_fs);
-	return NULL;
+    return NULL;
     }
     *(void**)((char*)ldt_fs->fs_seg+0x18) = ldt_fs->fs_seg;
     memset(&array, 0, sizeof(array));
@@ -244,8 +244,8 @@ ldt_fs_t* Setup_LDT_Keeper(void)
     ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s));
     if(ret<0)
     {
-	perror("install_fs");
-	printf("Couldn't install fs segment, expect segfault\n");
+    perror("install_fs");
+    printf("Couldn't install fs segment, expect segfault\n");
     }
 #endif /*linux*/
 
@@ -264,7 +264,7 @@ ldt_fs_t* Setup_LDT_Keeper(void)
         if (ret < 0)
         {
             perror("install_fs");
-	    printf("Couldn't install fs segment, expect segfault\n");
+        printf("Couldn't install fs segment, expect segfault\n");
             printf("Did you reconfigure the kernel with \"options USER_LDT\"?\n");
         }
     }
@@ -272,18 +272,18 @@ ldt_fs_t* Setup_LDT_Keeper(void)
 
 #if defined(__svr4__)
     {
-	struct ssd ssd;
-	ssd.sel = LDT_SEL(TEB_SEL_IDX);
-	ssd.bo = array.base_addr;
-	ssd.ls = array.limit - array.base_addr;
-	ssd.acc1 = ((array.read_exec_only == 0) << 1) |
-	    (array.contents << 2) |
-	    0xf0;   /* P(resent) | DPL3 | S */
-	ssd.acc2 = 0x4;   /* byte limit, 32-bit segment */
-	if (sysi86(SI86DSCR, &ssd) < 0) {
-	    perror("sysi86(SI86DSCR)");
-	    printf("Couldn't install fs segment, expect segfault\n");
-	}
+    struct ssd ssd;
+    ssd.sel = LDT_SEL(TEB_SEL_IDX);
+    ssd.bo = array.base_addr;
+    ssd.ls = array.limit - array.base_addr;
+    ssd.acc1 = ((array.read_exec_only == 0) << 1) |
+        (array.contents << 2) |
+        0xf0;   /* P(resent) | DPL3 | S */
+    ssd.acc2 = 0x4;   /* byte limit, 32-bit segment */
+    if (sysi86(SI86DSCR, &ssd) < 0) {
+        perror("sysi86(SI86DSCR)");
+        printf("Couldn't install fs segment, expect segfault\n");
+    }
     }
 #endif
 
@@ -298,9 +298,9 @@ ldt_fs_t* Setup_LDT_Keeper(void)
 void Restore_LDT_Keeper(ldt_fs_t* ldt_fs)
 {
     if (ldt_fs == NULL || ldt_fs->fs_seg == 0)
-	return;
+    return;
     if (ldt_fs->prev_struct)
-	free(ldt_fs->prev_struct);
+    free(ldt_fs->prev_struct);
     munmap((char*)ldt_fs->fs_seg, getpagesize());
     ldt_fs->fs_seg = 0;
     close(ldt_fs->fd);