patch-2.1.118 linux/arch/i386/kernel/signal.c

• Lines: 73
• Date: Tue Aug 25 17:42:46 1998
• Orig file: v2.1.117/linux/arch/i386/kernel/signal.c
• Orig date: Tue Aug 18 22:02:02 1998

diff -u --recursive --new-file v2.1.117/linux/arch/i386/kernel/signal.c linux/arch/i386/kernel/signal.c
@@ -184,26 +184,17 @@
 
 #define COPY_SEG(seg)							\
 	{ unsigned short tmp;						\
-	   err |= __get_user(tmp, &sc->seg);				\
-	  if ((tmp & 0xfffc)		/* not a NULL selectors */	\
-	      && (tmp & 0x4) != 0x4	/* not a LDT selector */	\
-	      && (tmp & 3) != 3)	/* not a RPL3 GDT selector */	\
-		  goto badframe;					\
+	  err |= __get_user(tmp, &sc->seg);				\
 	  regs->x##seg = tmp; }
 
 #define COPY_SEG_STRICT(seg)						\
 	{ unsigned short tmp;						\
 	  err |= __get_user(tmp, &sc->seg);				\
-	  if ((tmp & 0xfffc) && (tmp & 3) != 3) goto badframe;		\
-	  regs->x##seg = tmp; }
+	  regs->x##seg = tmp|3; }
 
 #define GET_SEG(seg)							\
 	{ unsigned short tmp;						\
 	  err |= __get_user(tmp, &sc->seg);				\
-	  if ((tmp & 0xfffc)		/* not a NULL selectors */	\
-	      && (tmp & 0x4) != 0x4	/* not a LDT selector */	\
-	      && (tmp & 3) != 3)	/* not a RPL3 GDT selector */	\
-		  goto badframe;					\
 	  loadsegment(seg,tmp); }
 
 	GET_SEG(gs);
@@ -459,15 +450,12 @@
 	/* Set up registers for signal handler */
 	regs->esp = (unsigned long) frame;
 	regs->eip = (unsigned long) ka->sa.sa_handler;
-	{
-		unsigned long seg = __USER_DS;
-		__asm__("movl %w0,%%fs ; movl %w0,%%gs": "=r"(seg) : "0"(seg));
-		set_fs(USER_DS);
-		regs->xds = seg;
-		regs->xes = seg;
-		regs->xss = seg;
-		regs->xcs = __USER_CS;
-	}
+
+	set_fs(USER_DS);
+	regs->xds = __USER_DS;
+	regs->xes = __USER_DS;
+	regs->xss = __USER_DS;
+	regs->xcs = __USER_CS;
 	regs->eflags &= ~TF_MASK;
 
 #if DEBUG_SIG
@@ -533,15 +521,12 @@
 	/* Set up registers for signal handler */
 	regs->esp = (unsigned long) frame;
 	regs->eip = (unsigned long) ka->sa.sa_handler;
-	{
-		unsigned long seg = __USER_DS;
-		__asm__("movl %w0,%%fs ; movl %w0,%%gs": "=r"(seg) : "0"(seg));
-		set_fs(USER_DS);
-		regs->xds = seg;
-		regs->xes = seg;
-		regs->xss = seg;
-		regs->xcs = __USER_CS;
-	}
+
+	set_fs(USER_DS);
+	regs->xds = __USER_DS;
+	regs->xes = __USER_DS;
+	regs->xss = __USER_DS;
+	regs->xcs = __USER_CS;
 	regs->eflags &= ~TF_MASK;
 
 #if DEBUG_SIG