aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-03-14 20:54:11 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-03-14 20:56:33 +0000
commite15b3ddf2325ff3e351f03250473a02c4c092512 (patch)
tree9fe5be153c48d0e0df04b5ff9e12611c855f3736
parent308055d78a64ac0cb8d870f79095cbbca6dedcd3 (diff)
downloadaports-e15b3ddf2325ff3e351f03250473a02c4c092512.tar.bz2
aports-e15b3ddf2325ff3e351f03250473a02c4c092512.tar.xz
main/linux-grsec: upgrade to 2.2.1-2.6.37.3-201103122250
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD6
-rw-r--r--main/linux-grsec/grsecurity-2.2.1-2.6.37.3-201103122250.patch (renamed from main/linux-grsec/grsecurity-2.2.1-2.6.37.3-201103111917.patch)336
2 files changed, 205 insertions, 137 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 823c877aea..d07bc1174e 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
pkgname=linux-${_flavor}
pkgver=2.6.37.3
_kernver=2.6.37
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH}}
install=
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
- grsecurity-2.2.1-2.6.37.3-201103111917.patch
+ grsecurity-2.2.1-2.6.37.3-201103122250.patch
0001-xfrm-use-gre-key-as-flow-upper-protocol-info.patch
xfrm-fix-gre-key-endianess.patch
@@ -139,7 +139,7 @@ dev() {
md5sums="c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2
c0a38dd3b5bad43d5f5d07ed0fcf3692 patch-2.6.37.3.bz2
-d9e9d2c8a0bb3b43fe6d8fcdc156f8cc grsecurity-2.2.1-2.6.37.3-201103111917.patch
+53731b8b21fbc8a4972387ecee2cade2 grsecurity-2.2.1-2.6.37.3-201103122250.patch
3152851c31bfa8c54660dbb84d75b38d 0001-xfrm-use-gre-key-as-flow-upper-protocol-info.patch
ea7a7eb2775b71ae5ef24d029a4905bd xfrm-fix-gre-key-endianess.patch
776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
diff --git a/main/linux-grsec/grsecurity-2.2.1-2.6.37.3-201103111917.patch b/main/linux-grsec/grsecurity-2.2.1-2.6.37.3-201103122250.patch
index 7848fc556b..0be63e5d41 100644
--- a/main/linux-grsec/grsecurity-2.2.1-2.6.37.3-201103111917.patch
+++ b/main/linux-grsec/grsecurity-2.2.1-2.6.37.3-201103122250.patch
@@ -7791,7 +7791,7 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/elf.h linux-2.6.37.3/arch/x86/inc
#endif /* _ASM_X86_ELF_H */
diff -urNp linux-2.6.37.3/arch/x86/include/asm/futex.h linux-2.6.37.3/arch/x86/include/asm/futex.h
--- linux-2.6.37.3/arch/x86/include/asm/futex.h 2011-01-04 19:50:19.000000000 -0500
-+++ linux-2.6.37.3/arch/x86/include/asm/futex.h 2011-01-25 20:24:56.000000000 -0500
++++ linux-2.6.37.3/arch/x86/include/asm/futex.h 2011-03-12 22:50:25.000000000 -0500
@@ -12,16 +12,18 @@
#include <asm/system.h>
@@ -7830,11 +7830,11 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/futex.h linux-2.6.37.3/arch/x86/i
switch (op) {
case FUTEX_OP_SET:
- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
-+ __futex_atomic_op1("xchgl %0, "__copyuser_seg"%2", ret, oldval, uaddr, oparg);
++ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
break;
case FUTEX_OP_ADD:
- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
-+ __futex_atomic_op1(LOCK_PREFIX "xaddl %0, "__copyuser_seg"%2", ret, oldval,
++ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
uaddr, oparg);
break;
case FUTEX_OP_OR:
@@ -7856,7 +7856,7 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/futex.h linux-2.6.37.3/arch/x86/i
return -EFAULT;
- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
-+ asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, "__copyuser_seg"%1\n"
++ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %1\n"
"2:\t.section .fixup, \"ax\"\n"
"3:\tmov %2, %0\n"
"\tjmp 2b\n"
@@ -9936,7 +9936,7 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess_64.h linux-2.6.37.3/arch/
#endif /* _ASM_X86_UACCESS_64_H */
diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86/include/asm/uaccess.h
--- linux-2.6.37.3/arch/x86/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
-+++ linux-2.6.37.3/arch/x86/include/asm/uaccess.h 2011-01-17 02:41:01.000000000 -0500
++++ linux-2.6.37.3/arch/x86/include/asm/uaccess.h 2011-03-12 22:50:25.000000000 -0500
@@ -8,12 +8,15 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -10007,7 +10007,7 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86
-
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define __copyuser_seg "%%gs:"
++#define __copyuser_seg "gs;"
+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
+#else
@@ -10020,8 +10020,8 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86
#define __put_user_asm_u64(x, addr, err, errret) \
- asm volatile("1: movl %%eax,0(%2)\n" \
- "2: movl %%edx,4(%2)\n" \
-+ asm volatile("1: movl %%eax," __copyuser_seg"0(%2)\n" \
-+ "2: movl %%edx," __copyuser_seg"4(%2)\n" \
++ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
++ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
"3:\n" \
".section .fixup,\"ax\"\n" \
"4: movl %3,%0\n" \
@@ -10031,8 +10031,8 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86
#define __put_user_asm_ex_u64(x, addr) \
- asm volatile("1: movl %%eax,0(%1)\n" \
- "2: movl %%edx,4(%1)\n" \
-+ asm volatile("1: movl %%eax," __copyuser_seg"0(%1)\n" \
-+ "2: movl %%edx," __copyuser_seg"4(%1)\n" \
++ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
++ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
"3:\n" \
_ASM_EXTABLE(1b, 2b - 1b) \
_ASM_EXTABLE(2b, 3b - 2b) \
@@ -10041,7 +10041,7 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86
#define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
-+ asm volatile("1: mov"itype" "__copyuser_seg"%2,%"rtype"1\n"\
++ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
"2:\n" \
".section .fixup,\"ax\"\n" \
"3: mov %3,%0\n" \
@@ -10059,7 +10059,7 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86
#define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
-+ asm volatile("1: mov"itype" "__copyuser_seg"%1,%"rtype"0\n"\
++ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
"2:\n" \
_ASM_EXTABLE(1b, 2b - 1b) \
: ltype(x) : "m" (__m(addr)))
@@ -10095,7 +10095,7 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86
*/
#define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
-+ asm volatile("1: mov"itype" %"rtype"1," __copyuser_seg"%2\n"\
++ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
"2:\n" \
".section .fixup,\"ax\"\n" \
"3: mov %3,%0\n" \
@@ -10108,7 +10108,7 @@ diff -urNp linux-2.6.37.3/arch/x86/include/asm/uaccess.h linux-2.6.37.3/arch/x86
#define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
-+ asm volatile("1: mov"itype" %"rtype"0," __copyuser_seg"%1\n"\
++ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
"2:\n" \
_ASM_EXTABLE(1b, 2b - 1b) \
: : ltype(x), "m" (__m(addr)))
@@ -16020,7 +16020,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/csum-wrappers_64.c linux-2.6.37.3/arch/x8
}
diff -urNp linux-2.6.37.3/arch/x86/lib/getuser.S linux-2.6.37.3/arch/x86/lib/getuser.S
--- linux-2.6.37.3/arch/x86/lib/getuser.S 2011-01-04 19:50:19.000000000 -0500
-+++ linux-2.6.37.3/arch/x86/lib/getuser.S 2011-01-17 02:41:01.000000000 -0500
++++ linux-2.6.37.3/arch/x86/lib/getuser.S 2011-03-12 22:50:25.000000000 -0500
@@ -33,14 +33,35 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -16029,7 +16029,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/getuser.S linux-2.6.37.3/arch/x86/lib/get
+#include <asm/pgtable.h>
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define __copyuser_seg %gs:
++#define __copyuser_seg gs;
+#else
+#define __copyuser_seg
+#endif
@@ -16054,7 +16054,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/getuser.S linux-2.6.37.3/arch/x86/lib/get
+
+#endif
+
-+1: movzb __copyuser_seg (%_ASM_AX),%edx
++1: __copyuser_seg movzb (%_ASM_AX),%edx
xor %eax,%eax
ret
CFI_ENDPROC
@@ -16080,7 +16080,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/getuser.S linux-2.6.37.3/arch/x86/lib/get
+
+#endif
+
-+2: movzwl __copyuser_seg -1(%_ASM_AX),%edx
++2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
xor %eax,%eax
ret
CFI_ENDPROC
@@ -16106,7 +16106,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/getuser.S linux-2.6.37.3/arch/x86/lib/get
+
+#endif
+
-+3: mov __copyuser_seg -3(%_ASM_AX),%edx
++3: __copyuser_seg mov -3(%_ASM_AX),%edx
xor %eax,%eax
ret
CFI_ENDPROC
@@ -16472,7 +16472,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/mmx_32.c linux-2.6.37.3/arch/x86/lib/mmx_
to += 64;
diff -urNp linux-2.6.37.3/arch/x86/lib/putuser.S linux-2.6.37.3/arch/x86/lib/putuser.S
--- linux-2.6.37.3/arch/x86/lib/putuser.S 2011-01-04 19:50:19.000000000 -0500
-+++ linux-2.6.37.3/arch/x86/lib/putuser.S 2011-01-17 02:41:01.000000000 -0500
++++ linux-2.6.37.3/arch/x86/lib/putuser.S 2011-03-12 22:50:25.000000000 -0500
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -16500,7 +16500,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/putuser.S linux-2.6.37.3/arch/x86/lib/put
+#endif
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define __copyuser_seg %gs:
++#define __copyuser_seg gs;
+#else
+#define __copyuser_seg
+#endif
@@ -16525,7 +16525,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/putuser.S linux-2.6.37.3/arch/x86/lib/put
+
+#endif
+
-+1: movb %al,__copyuser_seg (_DEST)
++1: __copyuser_seg movb %al,(_DEST)
xor %eax,%eax
EXIT
ENDPROC(__put_user_1)
@@ -16551,7 +16551,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/putuser.S linux-2.6.37.3/arch/x86/lib/put
+
+#endif
+
-+2: movw %ax,__copyuser_seg (_DEST)
++2: __copyuser_seg movw %ax,(_DEST)
xor %eax,%eax
EXIT
ENDPROC(__put_user_2)
@@ -16577,7 +16577,7 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/putuser.S linux-2.6.37.3/arch/x86/lib/put
+
+#endif
+
-+3: movl %eax,__copyuser_seg (_DEST)
++3: __copyuser_seg movl %eax,(_DEST)
xor %eax,%eax
EXIT
ENDPROC(__put_user_4)
@@ -16603,22 +16603,22 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/putuser.S linux-2.6.37.3/arch/x86/lib/put
+
+#endif
+
-+4: mov %_ASM_AX,__copyuser_seg (_DEST)
++4: __copyuser_seg mov %_ASM_AX,(_DEST)
#ifdef CONFIG_X86_32
-5: movl %edx,4(%_ASM_CX)
-+5: movl %edx,__copyuser_seg 4(_DEST)
++5: __copyuser_seg movl %edx,4(_DEST)
#endif
xor %eax,%eax
EXIT
diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib/usercopy_32.c
--- linux-2.6.37.3/arch/x86/lib/usercopy_32.c 2011-01-04 19:50:19.000000000 -0500
-+++ linux-2.6.37.3/arch/x86/lib/usercopy_32.c 2011-01-17 02:41:01.000000000 -0500
++++ linux-2.6.37.3/arch/x86/lib/usercopy_32.c 2011-03-12 22:50:25.000000000 -0500
@@ -43,7 +43,7 @@ do { \
__asm__ __volatile__( \
" testl %1,%1\n" \
" jz 2f\n" \
- "0: lodsb\n" \
-+ "0: lodsb " __copyuser_seg" (%%esi)\n" \
++ "0: "__copyuser_seg"lodsb\n" \
" stosb\n" \
" testb %%al,%%al\n" \
" jz 1f\n" \
@@ -16666,50 +16666,50 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
"4: movl 4(%4), %%edx\n"
- "5: movl %%eax, 0(%3)\n"
- "6: movl %%edx, 4(%3)\n"
-+ "5: movl %%eax, "__copyuser_seg" 0(%3)\n"
-+ "6: movl %%edx, "__copyuser_seg" 4(%3)\n"
++ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
++ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
"7: movl 8(%4), %%eax\n"
"8: movl 12(%4),%%edx\n"
- "9: movl %%eax, 8(%3)\n"
- "10: movl %%edx, 12(%3)\n"
-+ "9: movl %%eax, "__copyuser_seg" 8(%3)\n"
-+ "10: movl %%edx, "__copyuser_seg" 12(%3)\n"
++ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
++ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
"11: movl 16(%4), %%eax\n"
"12: movl 20(%4), %%edx\n"
- "13: movl %%eax, 16(%3)\n"
- "14: movl %%edx, 20(%3)\n"
-+ "13: movl %%eax, "__copyuser_seg" 16(%3)\n"
-+ "14: movl %%edx, "__copyuser_seg" 20(%3)\n"
++ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
++ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
"15: movl 24(%4), %%eax\n"
"16: movl 28(%4), %%edx\n"
- "17: movl %%eax, 24(%3)\n"
- "18: movl %%edx, 28(%3)\n"
-+ "17: movl %%eax, "__copyuser_seg" 24(%3)\n"
-+ "18: movl %%edx, "__copyuser_seg" 28(%3)\n"
++ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
++ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
"19: movl 32(%4), %%eax\n"
"20: movl 36(%4), %%edx\n"
- "21: movl %%eax, 32(%3)\n"
- "22: movl %%edx, 36(%3)\n"
-+ "21: movl %%eax, "__copyuser_seg" 32(%3)\n"
-+ "22: movl %%edx, "__copyuser_seg" 36(%3)\n"
++ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
++ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
"23: movl 40(%4), %%eax\n"
"24: movl 44(%4), %%edx\n"
- "25: movl %%eax, 40(%3)\n"
- "26: movl %%edx, 44(%3)\n"
-+ "25: movl %%eax, "__copyuser_seg" 40(%3)\n"
-+ "26: movl %%edx, "__copyuser_seg" 44(%3)\n"
++ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
++ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
"27: movl 48(%4), %%eax\n"
"28: movl 52(%4), %%edx\n"
- "29: movl %%eax, 48(%3)\n"
- "30: movl %%edx, 52(%3)\n"
-+ "29: movl %%eax, "__copyuser_seg" 48(%3)\n"
-+ "30: movl %%edx, "__copyuser_seg" 52(%3)\n"
++ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
++ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
"31: movl 56(%4), %%eax\n"
"32: movl 60(%4), %%edx\n"
- "33: movl %%eax, 56(%3)\n"
- "34: movl %%edx, 60(%3)\n"
-+ "33: movl %%eax, "__copyuser_seg" 56(%3)\n"
-+ "34: movl %%edx, "__copyuser_seg" 60(%3)\n"
++ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
++ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
" addl $-64, %0\n"
" addl $64, %4\n"
" addl $64, %3\n"
@@ -16780,41 +16780,41 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
+ int d0, d1;
+ __asm__ __volatile__(
+ " .align 2,0x90\n"
-+ "1: movl "__copyuser_seg" 32(%4), %%eax\n"
++ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
+ " cmpl $67, %0\n"
+ " jbe 3f\n"
-+ "2: movl "__copyuser_seg" 64(%4), %%eax\n"
++ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
+ " .align 2,0x90\n"
-+ "3: movl "__copyuser_seg" 0(%4), %%eax\n"
-+ "4: movl "__copyuser_seg" 4(%4), %%edx\n"
++ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
++ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
+ "5: movl %%eax, 0(%3)\n"
+ "6: movl %%edx, 4(%3)\n"
-+ "7: movl "__copyuser_seg" 8(%4), %%eax\n"
-+ "8: movl "__copyuser_seg" 12(%4),%%edx\n"
++ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
++ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
+ "9: movl %%eax, 8(%3)\n"
+ "10: movl %%edx, 12(%3)\n"
-+ "11: movl "__copyuser_seg" 16(%4), %%eax\n"
-+ "12: movl "__copyuser_seg" 20(%4), %%edx\n"
++ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
++ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
+ "13: movl %%eax, 16(%3)\n"
+ "14: movl %%edx, 20(%3)\n"
-+ "15: movl "__copyuser_seg" 24(%4), %%eax\n"
-+ "16: movl "__copyuser_seg" 28(%4), %%edx\n"
++ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
++ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
+ "17: movl %%eax, 24(%3)\n"
+ "18: movl %%edx, 28(%3)\n"
-+ "19: movl "__copyuser_seg" 32(%4), %%eax\n"
-+ "20: movl "__copyuser_seg" 36(%4), %%edx\n"
++ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
++ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
+ "21: movl %%eax, 32(%3)\n"
+ "22: movl %%edx, 36(%3)\n"
-+ "23: movl "__copyuser_seg" 40(%4), %%eax\n"
-+ "24: movl "__copyuser_seg" 44(%4), %%edx\n"
++ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
++ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
+ "25: movl %%eax, 40(%3)\n"
+ "26: movl %%edx, 44(%3)\n"
-+ "27: movl "__copyuser_seg" 48(%4), %%eax\n"
-+ "28: movl "__copyuser_seg" 52(%4), %%edx\n"
++ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
++ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
+ "29: movl %%eax, 48(%3)\n"
+ "30: movl %%edx, 52(%3)\n"
-+ "31: movl "__copyuser_seg" 56(%4), %%eax\n"
-+ "32: movl "__copyuser_seg" 60(%4), %%edx\n"
++ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
++ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
+ "33: movl %%eax, 56(%3)\n"
+ "34: movl %%edx, 60(%3)\n"
+ " addl $-64, %0\n"
@@ -16826,9 +16826,9 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
+ " shrl $2, %0\n"
+ " andl $3, %%eax\n"
+ " cld\n"
-+ "99: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
++ "99: rep; "__copyuser_seg" movsl\n"
+ "36: movl %%eax, %0\n"
-+ "37: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
++ "37: rep; "__copyuser_seg" movsb\n"
+ "100:\n"
".section .fixup,\"ax\"\n"
"101: lea 0(%%eax,%0,4),%0\n"
@@ -16838,58 +16838,58 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
__asm__ __volatile__(
" .align 2,0x90\n"
- "0: movl 32(%4), %%eax\n"
-+ "0: movl "__copyuser_seg" 32(%4), %%eax\n"
++ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
" cmpl $67, %0\n"
" jbe 2f\n"
- "1: movl 64(%4), %%eax\n"
-+ "1: movl "__copyuser_seg" 64(%4), %%eax\n"
++ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
" .align 2,0x90\n"
- "2: movl 0(%4), %%eax\n"
- "21: movl 4(%4), %%edx\n"
-+ "2: movl "__copyuser_seg" 0(%4), %%eax\n"
-+ "21: movl "__copyuser_seg" 4(%4), %%edx\n"
++ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
++ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
" movl %%eax, 0(%3)\n"
" movl %%edx, 4(%3)\n"
- "3: movl 8(%4), %%eax\n"
- "31: movl 12(%4),%%edx\n"
-+ "3: movl "__copyuser_seg" 8(%4), %%eax\n"
-+ "31: movl "__copyuser_seg" 12(%4),%%edx\n"
++ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
++ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
" movl %%eax, 8(%3)\n"
" movl %%edx, 12(%3)\n"
- "4: movl 16(%4), %%eax\n"
- "41: movl 20(%4), %%edx\n"
-+ "4: movl "__copyuser_seg" 16(%4), %%eax\n"
-+ "41: movl "__copyuser_seg" 20(%4), %%edx\n"
++ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
++ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
" movl %%eax, 16(%3)\n"
" movl %%edx, 20(%3)\n"
- "10: movl 24(%4), %%eax\n"
- "51: movl 28(%4), %%edx\n"
-+ "10: movl "__copyuser_seg" 24(%4), %%eax\n"
-+ "51: movl "__copyuser_seg" 28(%4), %%edx\n"
++ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
++ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
" movl %%eax, 24(%3)\n"
" movl %%edx, 28(%3)\n"
- "11: movl 32(%4), %%eax\n"
- "61: movl 36(%4), %%edx\n"
-+ "11: movl "__copyuser_seg" 32(%4), %%eax\n"
-+ "61: movl "__copyuser_seg" 36(%4), %%edx\n"
++ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
++ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
" movl %%eax, 32(%3)\n"
" movl %%edx, 36(%3)\n"
- "12: movl 40(%4), %%eax\n"
- "71: movl 44(%4), %%edx\n"
-+ "12: movl "__copyuser_seg" 40(%4), %%eax\n"
-+ "71: movl "__copyuser_seg" 44(%4), %%edx\n"
++ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
++ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
" movl %%eax, 40(%3)\n"
" movl %%edx, 44(%3)\n"
- "13: movl 48(%4), %%eax\n"
- "81: movl 52(%4), %%edx\n"
-+ "13: movl "__copyuser_seg" 48(%4), %%eax\n"
-+ "81: movl "__copyuser_seg" 52(%4), %%edx\n"
++ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
++ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
" movl %%eax, 48(%3)\n"
" movl %%edx, 52(%3)\n"
- "14: movl 56(%4), %%eax\n"
- "91: movl 60(%4), %%edx\n"
-+ "14: movl "__copyuser_seg" 56(%4), %%eax\n"
-+ "91: movl "__copyuser_seg" 60(%4), %%edx\n"
++ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
++ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
" movl %%eax, 56(%3)\n"
" movl %%edx, 60(%3)\n"
" addl $-64, %0\n"
@@ -16898,10 +16898,10 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
" andl $3, %%eax\n"
" cld\n"
- "6: rep; movsl\n"
-+ "6: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
++ "6: rep; "__copyuser_seg" movsl\n"
" movl %%eax,%0\n"
- "7: rep; movsb\n"
-+ "7: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
++ "7: rep; "__copyuser_seg" movsb\n"
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
@@ -16910,58 +16910,58 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
__asm__ __volatile__(
" .align 2,0x90\n"
- "0: movl 32(%4), %%eax\n"
-+ "0: movl "__copyuser_seg" 32(%4), %%eax\n"
++ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
" cmpl $67, %0\n"
" jbe 2f\n"
- "1: movl 64(%4), %%eax\n"
-+ "1: movl "__copyuser_seg" 64(%4), %%eax\n"
++ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
" .align 2,0x90\n"
- "2: movl 0(%4), %%eax\n"
- "21: movl 4(%4), %%edx\n"
-+ "2: movl "__copyuser_seg" 0(%4), %%eax\n"
-+ "21: movl "__copyuser_seg" 4(%4), %%edx\n"
++ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
++ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
" movnti %%eax, 0(%3)\n"
" movnti %%edx, 4(%3)\n"
- "3: movl 8(%4), %%eax\n"
- "31: movl 12(%4),%%edx\n"
-+ "3: movl "__copyuser_seg" 8(%4), %%eax\n"
-+ "31: movl "__copyuser_seg" 12(%4),%%edx\n"
++ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
++ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
" movnti %%eax, 8(%3)\n"
" movnti %%edx, 12(%3)\n"
- "4: movl 16(%4), %%eax\n"
- "41: movl 20(%4), %%edx\n"
-+ "4: movl "__copyuser_seg" 16(%4), %%eax\n"
-+ "41: movl "__copyuser_seg" 20(%4), %%edx\n"
++ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
++ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
" movnti %%eax, 16(%3)\n"
" movnti %%edx, 20(%3)\n"
- "10: movl 24(%4), %%eax\n"
- "51: movl 28(%4), %%edx\n"
-+ "10: movl "__copyuser_seg" 24(%4), %%eax\n"
-+ "51: movl "__copyuser_seg" 28(%4), %%edx\n"
++ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
++ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
" movnti %%eax, 24(%3)\n"
" movnti %%edx, 28(%3)\n"
- "11: movl 32(%4), %%eax\n"
- "61: movl 36(%4), %%edx\n"
-+ "11: movl "__copyuser_seg" 32(%4), %%eax\n"
-+ "61: movl "__copyuser_seg" 36(%4), %%edx\n"
++ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
++ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
" movnti %%eax, 32(%3)\n"
" movnti %%edx, 36(%3)\n"
- "12: movl 40(%4), %%eax\n"
- "71: movl 44(%4), %%edx\n"
-+ "12: movl "__copyuser_seg" 40(%4), %%eax\n"
-+ "71: movl "__copyuser_seg" 44(%4), %%edx\n"
++ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
++ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
" movnti %%eax, 40(%3)\n"
" movnti %%edx, 44(%3)\n"
- "13: movl 48(%4), %%eax\n"
- "81: movl 52(%4), %%edx\n"
-+ "13: movl "__copyuser_seg" 48(%4), %%eax\n"
-+ "81: movl "__copyuser_seg" 52(%4), %%edx\n"
++ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
++ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
" movnti %%eax, 48(%3)\n"
" movnti %%edx, 52(%3)\n"
- "14: movl 56(%4), %%eax\n"
- "91: movl 60(%4), %%edx\n"
-+ "14: movl "__copyuser_seg" 56(%4), %%eax\n"
-+ "91: movl "__copyuser_seg" 60(%4), %%edx\n"
++ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
++ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
" movnti %%eax, 56(%3)\n"
" movnti %%edx, 60(%3)\n"
" addl $-64, %0\n"
@@ -16970,10 +16970,10 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
" andl $3, %%eax\n"
" cld\n"
- "6: rep; movsl\n"
-+ "6: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
++ "6: rep; "__copyuser_seg" movsl\n"
" movl %%eax,%0\n"
- "7: rep; movsb\n"
-+ "7: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
++ "7: rep; "__copyuser_seg" movsb\n"
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
@@ -16982,58 +16982,58 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
__asm__ __volatile__(
" .align 2,0x90\n"
- "0: movl 32(%4), %%eax\n"
-+ "0: movl "__copyuser_seg" 32(%4), %%eax\n"
++ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
" cmpl $67, %0\n"
" jbe 2f\n"
- "1: movl 64(%4), %%eax\n"
-+ "1: movl "__copyuser_seg" 64(%4), %%eax\n"
++ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
" .align 2,0x90\n"
- "2: movl 0(%4), %%eax\n"
- "21: movl 4(%4), %%edx\n"
-+ "2: movl "__copyuser_seg" 0(%4), %%eax\n"
-+ "21: movl "__copyuser_seg" 4(%4), %%edx\n"
++ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
++ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
" movnti %%eax, 0(%3)\n"
" movnti %%edx, 4(%3)\n"
- "3: movl 8(%4), %%eax\n"
- "31: movl 12(%4),%%edx\n"
-+ "3: movl "__copyuser_seg" 8(%4), %%eax\n"
-+ "31: movl "__copyuser_seg" 12(%4),%%edx\n"
++ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
++ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
" movnti %%eax, 8(%3)\n"
" movnti %%edx, 12(%3)\n"
- "4: movl 16(%4), %%eax\n"
- "41: movl 20(%4), %%edx\n"
-+ "4: movl "__copyuser_seg" 16(%4), %%eax\n"
-+ "41: movl "__copyuser_seg" 20(%4), %%edx\n"
++ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
++ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
" movnti %%eax, 16(%3)\n"
" movnti %%edx, 20(%3)\n"
- "10: movl 24(%4), %%eax\n"
- "51: movl 28(%4), %%edx\n"
-+ "10: movl "__copyuser_seg" 24(%4), %%eax\n"
-+ "51: movl "__copyuser_seg" 28(%4), %%edx\n"
++ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
++ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
" movnti %%eax, 24(%3)\n"
" movnti %%edx, 28(%3)\n"
- "11: movl 32(%4), %%eax\n"
- "61: movl 36(%4), %%edx\n"
-+ "11: movl "__copyuser_seg" 32(%4), %%eax\n"
-+ "61: movl "__copyuser_seg" 36(%4), %%edx\n"
++ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
++ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
" movnti %%eax, 32(%3)\n"
" movnti %%edx, 36(%3)\n"
- "12: movl 40(%4), %%eax\n"
- "71: movl 44(%4), %%edx\n"
-+ "12: movl "__copyuser_seg" 40(%4), %%eax\n"
-+ "71: movl "__copyuser_seg" 44(%4), %%edx\n"
++ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
++ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
" movnti %%eax, 40(%3)\n"
" movnti %%edx, 44(%3)\n"
- "13: movl 48(%4), %%eax\n"
- "81: movl 52(%4), %%edx\n"
-+ "13: movl "__copyuser_seg" 48(%4), %%eax\n"
-+ "81: movl "__copyuser_seg" 52(%4), %%edx\n"
++ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
++ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
" movnti %%eax, 48(%3)\n"
" movnti %%edx, 52(%3)\n"
- "14: movl 56(%4), %%eax\n"
- "91: movl 60(%4), %%edx\n"
-+ "14: movl "__copyuser_seg" 56(%4), %%eax\n"
-+ "91: movl "__copyuser_seg" 60(%4), %%edx\n"
++ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
++ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
" movnti %%eax, 56(%3)\n"
" movnti %%edx, 60(%3)\n"
" addl $-64, %0\n"
@@ -17042,10 +17042,10 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
" andl $3, %%eax\n"
" cld\n"
- "6: rep; movsl\n"
-+ "6: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
++ "6: rep; "__copyuser_seg" movsl\n"
" movl %%eax,%0\n"
- "7: rep; movsb\n"
-+ "7: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
++ "7: rep; "__copyuser_seg" movsb\n"
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
@@ -17076,16 +17076,16 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
" andl $7,%0\n" \
" subl %0,%3\n" \
- "4: rep; movsb\n" \
-+ "4: rep; movsb "prefix" (%%esi), (%%edi)\n" \
++ "4: rep; "prefix"movsb\n" \
" movl %3,%0\n" \
" shrl $2,%0\n" \
" andl $3,%3\n" \
" .align 2,0x90\n" \
- "0: rep; movsl\n" \
-+ "0: rep; movsl "prefix" (%%esi), (%%edi)\n" \
++ "0: rep; "prefix"movsl\n" \
" movl %3,%0\n" \
- "1: rep; movsb\n" \
-+ "1: rep; movsb "prefix" (%%esi), (%%edi)\n" \
++ "1: rep; "prefix"movsb\n" \
"2:\n" \
+ restore \
".section .fixup,\"ax\"\n" \
@@ -17096,16 +17096,16 @@ diff -urNp linux-2.6.37.3/arch/x86/lib/usercopy_32.c linux-2.6.37.3/arch/x86/lib
" andl $7,%0\n" \
" subl %0,%3\n" \
- "4: rep; movsb\n" \
-+ "4: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n" \
++ "4: rep; "__copyuser_seg"movsb\n" \
" movl %3,%0\n" \
" shrl $2,%0\n" \
" andl $3,%3\n" \
" .align 2,0x90\n" \
- "0: rep; movsl\n" \
-+ "0: rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n" \
++ "0: rep; "__copyuser_seg"movsl\n" \
" movl %3,%0\n" \
- "1: rep; movsb\n" \
-+ "1: rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n" \
++ "1: rep; "__copyuser_seg"movsb\n" \
"2:\n" \
".section .fixup,\"ax\"\n" \
"5: addl %3,%0\n" \
@@ -17365,7 +17365,7 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/extable.c linux-2.6.37.3/arch/x86/mm/extab
pnp_bios_is_utter_crap = 1;
diff -urNp linux-2.6.37.3/arch/x86/mm/fault.c linux-2.6.37.3/arch/x86/mm/fault.c
--- linux-2.6.37.3/arch/x86/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
-+++ linux-2.6.37.3/arch/x86/mm/fault.c 2011-01-17 02:41:01.000000000 -0500
++++ linux-2.6.37.3/arch/x86/mm/fault.c 2011-03-12 22:50:25.000000000 -0500
@@ -12,10 +12,18 @@
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
#include <linux/perf_event.h> /* perf_sw_event */
@@ -17715,7 +17715,7 @@ diff -urNp linux-2.6.37.3/arch/x86/mm/fault.c linux-2.6.37.3/arch/x86/mm/fault.c
+ */
+ "invlpg (%0)\n"
+#endif
-+ "testb $0,"__copyuser_seg"(%0)\n"
++ __copyuser_seg"testb $0,(%0)\n"
+ "xorb %3,(%1)\n"
+ :
+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
@@ -24576,7 +24576,7 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_global.c linux-2.6.37.3/drivers/gp
}
diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_info.c linux-2.6.37.3/drivers/gpu/drm/drm_info.c
--- linux-2.6.37.3/drivers/gpu/drm/drm_info.c 2011-01-04 19:50:19.000000000 -0500
-+++ linux-2.6.37.3/drivers/gpu/drm/drm_info.c 2011-01-17 02:41:01.000000000 -0500
++++ linux-2.6.37.3/drivers/gpu/drm/drm_info.c 2011-03-12 19:51:43.000000000 -0500
@@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void
struct drm_local_map *map;
struct drm_map_list *r_list;
@@ -24605,6 +24605,43 @@ diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_info.c linux-2.6.37.3/drivers/gpu/
type = "??";
else
type = types[map->type];
+@@ -285,7 +289,11 @@ int drm_vma_info(struct seq_file *m, voi
+ mutex_lock(&dev->struct_mutex);
+ seq_printf(m, "vma use count: %d, high_memory = %p, 0x%08llx\n",
+ atomic_read(&dev->vma_count),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ NULL, 0);
++#else
+ high_memory, (u64)virt_to_phys(high_memory));
++#endif
+
+ list_for_each_entry(pt, &dev->vmalist, head) {
+ vma = pt->vma;
+@@ -293,14 +301,23 @@ int drm_vma_info(struct seq_file *m, voi
+ continue;
+ seq_printf(m,
+ "\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000",
+- pt->pid, vma->vm_start, vma->vm_end,
++ pt->pid,
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ 0, 0,
++#else
++ vma->vm_start, vma->vm_end,
++#endif
+ vma->vm_flags & VM_READ ? 'r' : '-',
+ vma->vm_flags & VM_WRITE ? 'w' : '-',
+ vma->vm_flags & VM_EXEC ? 'x' : '-',
+ vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
+ vma->vm_flags & VM_LOCKED ? 'l' : '-',
+ vma->vm_flags & VM_IO ? 'i' : '-',
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ 0);
++#else
+ vma->vm_pgoff);
++#endif
+
+ #if defined(__i386__)
+ pgprot = pgprot_val(vma->vm_page_prot);
diff -urNp linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c
--- linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c 2011-01-04 19:50:19.000000000 -0500
+++ linux-2.6.37.3/drivers/gpu/drm/drm_ioctl.c 2011-01-17 02:41:01.000000000 -0500
@@ -56488,7 +56525,7 @@ diff -urNp linux-2.6.37.3/net/atm/atm_misc.c linux-2.6.37.3/net/atm/atm_misc.c
}
diff -urNp linux-2.6.37.3/net/atm/proc.c linux-2.6.37.3/net/atm/proc.c
--- linux-2.6.37.3/net/atm/proc.c 2011-01-04 19:50:19.000000000 -0500
-+++ linux-2.6.37.3/net/atm/proc.c 2011-01-17 02:41:02.000000000 -0500
++++ linux-2.6.37.3/net/atm/proc.c 2011-03-12 19:47:22.000000000 -0500
@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -56515,6 +56552,18 @@ diff -urNp linux-2.6.37.3/net/atm/proc.c linux-2.6.37.3/net/atm/proc.c
if (!vcc->dev)
seq_printf(seq, "Unassigned ");
else
+@@ -218,7 +223,11 @@ static void svc_info(struct seq_file *se
+ {
+ if (!vcc->dev)
+ seq_printf(seq, sizeof(void *) == 4 ?
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ "N/A@%p%10s" : "N/A@%p%2s", NULL, "");
++#else
+ "N/A@%p%10s" : "N/A@%p%2s", vcc, "");
++#endif
+ else
+ seq_printf(seq, "%3d %3d %5d ",
+ vcc->dev->number, vcc->vpi, vcc->vci);
diff -urNp linux-2.6.37.3/net/atm/resources.c linux-2.6.37.3/net/atm/resources.c
--- linux-2.6.37.3/net/atm/resources.c 2011-01-04 19:50:19.000000000 -0500
+++ linux-2.6.37.3/net/atm/resources.c 2011-01-17 02:41:02.000000000 -0500
@@ -56613,6 +56662,25 @@ diff -urNp linux-2.6.37.3/net/bridge/netfilter/ebtables.c linux-2.6.37.3/net/bri
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
+diff -urNp linux-2.6.37.3/net/can/bcm.c linux-2.6.37.3/net/can/bcm.c
+--- linux-2.6.37.3/net/can/bcm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37.3/net/can/bcm.c 2011-03-12 19:49:01.000000000 -0500
+@@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file
+ struct bcm_sock *bo = bcm_sk(sk);
+ struct bcm_op *op;
+
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ seq_printf(m, ">>> socket %p", NULL);
++ seq_printf(m, " / sk %p", NULL);
++ seq_printf(m, " / bo %p", NULL);
++#else
+ seq_printf(m, ">>> socket %p", sk->sk_socket);
+ seq_printf(m, " / sk %p", sk);
+ seq_printf(m, " / bo %p", bo);
++#endif
+ seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
+ seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
+ seq_printf(m, " <<<\n");
diff -urNp linux-2.6.37.3/net/core/dev.c linux-2.6.37.3/net/core/dev.c
--- linux-2.6.37.3/net/core/dev.c 2011-02-27 14:49:17.000000000 -0500
+++ linux-2.6.37.3/net/core/dev.c 2011-02-28 18:08:16.000000000 -0500
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 19:45:58 +0000