SOURCES (LINUX_2_6): linux-2.6-grsec_full.patch - updated for 2.6....

zbyniu zbyniu at pld-linux.org
Tue Mar 25 02:13:07 CET 2008


Author: zbyniu                       Date: Tue Mar 25 01:13:07 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated for 2.6.24.4

---- Files affected:
SOURCES:
   linux-2.6-grsec_full.patch (1.1.2.26 -> 1.1.2.27) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsec_full.patch
diff -u SOURCES/linux-2.6-grsec_full.patch:1.1.2.26 SOURCES/linux-2.6-grsec_full.patch:1.1.2.27
--- SOURCES/linux-2.6-grsec_full.patch:1.1.2.26	Mon Feb 25 23:50:45 2008
+++ SOURCES/linux-2.6-grsec_full.patch	Tue Mar 25 02:13:01 2008
@@ -28288,8 +28288,8 @@
 +1:	movl	%%es:%2, %0\n\
  	movl	%0, %3\n"					\
  	insn "\n"						\
--"2:	" LOCK_PREFIX "cmpxchgl %3, %2\n\
-+"2:	" LOCK_PREFIX "cmpxchgl %3, %%es:%2\n\
+-"2:	lock ; cmpxchgl %3, %2\n\
++"2:	lock ; cmpxchgl %3, %%es:%2\n\
  	jnz	1b\n\
 -3:	.section .fixup,\"ax\"\n\
 +3:	pushl	%%ss\n\
@@ -28324,8 +28324,8 @@
  #endif
  		switch (op) {
  		case FUTEX_OP_ADD:
--			__futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret,
-+			__futex_atomic_op1(LOCK_PREFIX "xaddl %0, %%ds:%2", ret,
+-			__futex_atomic_op1("lock ; xaddl %0, %2", ret,
++			__futex_atomic_op1("lock ; xaddl %0, %%ds:%2", ret,
  					   oldval, uaddr, oparg);
  			break;
  		case FUTEX_OP_OR:
@@ -28340,11 +28340,11 @@
  		return -EFAULT;
  
  	__asm__ __volatile__(
--		"1:	" LOCK_PREFIX "cmpxchgl %3, %1		\n"
+-		"1:	lock ; cmpxchgl %3, %1			\n"
 -
 -		"2:	.section .fixup, \"ax\"			\n"
 +		"	movw %w5, %%ds				\n"
-+		"1:	" LOCK_PREFIX "cmpxchgl %3, %%ds:%1	\n"
++		"1:	lock ; cmpxchgl %3, %%ds:%1	\n"
 +		"2:	pushl   %%ss				\n"
 +		"	popl    %%ds				\n"
 +		"	.section .fixup, \"ax\"			\n"
================================================================

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



More information about the pld-cvs-commit mailing list