]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.2.2-2.6.32.46-201110080819.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-2.2.2-2.6.32.46-201110080819.patch
CommitLineData
66ccdfdc
PK		 1diff -urNp linux-2.6.32.46/arch/alpha/include/asm/elf.h linux-2.6.32.46/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.46/arch/alpha/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
3+++ linux-2.6.32.46/arch/alpha/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400
4@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
5
6 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
7
8+#ifdef CONFIG_PAX_ASLR
9+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
10+
11+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
12+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
13+#endif
14+
15 /* $0 is set by ld.so to a pointer to a function which might be
16 registered using atexit. This provides a mean for the dynamic
17 linker to call DT_FINI functions for shared libraries that have
18diff -urNp linux-2.6.32.46/arch/alpha/include/asm/pgtable.h linux-2.6.32.46/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.46/arch/alpha/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400
20+++ linux-2.6.32.46/arch/alpha/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400
21@@ -101,6 +101,17 @@ struct vm_area_struct;
22 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
23 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
24 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
25+
26+#ifdef CONFIG_PAX_PAGEEXEC
27+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
28+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
29+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
30+#else
31+# define PAGE_SHARED_NOEXEC PAGE_SHARED
32+# define PAGE_COPY_NOEXEC PAGE_COPY
33+# define PAGE_READONLY_NOEXEC PAGE_READONLY
34+#endif
35+
36 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
37
38 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
39diff -urNp linux-2.6.32.46/arch/alpha/kernel/module.c linux-2.6.32.46/arch/alpha/kernel/module.c
40--- linux-2.6.32.46/arch/alpha/kernel/module.c 2011-03-27 14:31:47.000000000 -0400
41+++ linux-2.6.32.46/arch/alpha/kernel/module.c 2011-04-17 15:56:45.000000000 -0400
42@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
43
44 /* The small sections were sorted to the end of the segment.
45 The following should definitely cover them. */
46- gp = (u64)me->module_core + me->core_size - 0x8000;
47+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
48 got = sechdrs[me->arch.gotsecindex].sh_addr;
49
50 for (i = 0; i < n; i++) {
51diff -urNp linux-2.6.32.46/arch/alpha/kernel/osf_sys.c linux-2.6.32.46/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.46/arch/alpha/kernel/osf_sys.c 2011-08-09 18:35:28.000000000 -0400
53+++ linux-2.6.32.46/arch/alpha/kernel/osf_sys.c 2011-06-13 17:19:47.000000000 -0400
54@@ -1172,7 +1172,7 @@ arch_get_unmapped_area_1(unsigned long a
55 /* At this point: (!vma || addr < vma->vm_end). */
56 if (limit - len < addr)
57 return -ENOMEM;
58- if (!vma || addr + len <= vma->vm_start)
59+ if (check_heap_stack_gap(vma, addr, len))
60 return addr;
61 addr = vma->vm_end;
62 vma = vma->vm_next;
63@@ -1208,6 +1208,10 @@ arch_get_unmapped_area(struct file *filp
64 merely specific addresses, but regions of memory -- perhaps
65 this feature should be incorporated into all ports? */
66
67+#ifdef CONFIG_PAX_RANDMMAP
68+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
69+#endif
70+
71 if (addr) {
72 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
73 if (addr != (unsigned long) -ENOMEM)
74@@ -1215,8 +1219,8 @@ arch_get_unmapped_area(struct file *filp
75 }
76
77 /* Next, try allocating at TASK_UNMAPPED_BASE. */
78- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
79- len, limit);
80+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
81+
82 if (addr != (unsigned long) -ENOMEM)
83 return addr;
84
85diff -urNp linux-2.6.32.46/arch/alpha/mm/fault.c linux-2.6.32.46/arch/alpha/mm/fault.c
86--- linux-2.6.32.46/arch/alpha/mm/fault.c 2011-03-27 14:31:47.000000000 -0400
87+++ linux-2.6.32.46/arch/alpha/mm/fault.c 2011-04-17 15:56:45.000000000 -0400
88@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
89 __reload_thread(pcb);
90 }
91
92+#ifdef CONFIG_PAX_PAGEEXEC
93+/*
94+ * PaX: decide what to do with offenders (regs->pc = fault address)
95+ *
96+ * returns 1 when task should be killed
97+ * 2 when patched PLT trampoline was detected
98+ * 3 when unpatched PLT trampoline was detected
99+ */
100+static int pax_handle_fetch_fault(struct pt_regs *regs)
101+{
102+
103+#ifdef CONFIG_PAX_EMUPLT
104+ int err;
105+
106+ do { /* PaX: patched PLT emulation #1 */
107+ unsigned int ldah, ldq, jmp;
108+
109+ err = get_user(ldah, (unsigned int *)regs->pc);
110+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
111+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
112+
113+ if (err)
114+ break;
115+
116+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
117+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
118+ jmp == 0x6BFB0000U)
119+ {
120+ unsigned long r27, addr;
121+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
122+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
123+
124+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
125+ err = get_user(r27, (unsigned long *)addr);
126+ if (err)
127+ break;
128+
129+ regs->r27 = r27;
130+ regs->pc = r27;
131+ return 2;
132+ }
133+ } while (0);
134+
135+ do { /* PaX: patched PLT emulation #2 */
136+ unsigned int ldah, lda, br;
137+
138+ err = get_user(ldah, (unsigned int *)regs->pc);
139+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
140+ err |= get_user(br, (unsigned int *)(regs->pc+8));
141+
142+ if (err)
143+ break;
144+
145+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
146+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
147+ (br & 0xFFE00000U) == 0xC3E00000U)
148+ {
149+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
150+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
151+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
152+
153+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
154+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
155+ return 2;
156+ }
157+ } while (0);
158+
159+ do { /* PaX: unpatched PLT emulation */
160+ unsigned int br;
161+
162+ err = get_user(br, (unsigned int *)regs->pc);
163+
164+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
165+ unsigned int br2, ldq, nop, jmp;
166+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
167+
168+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
169+ err = get_user(br2, (unsigned int *)addr);
170+ err |= get_user(ldq, (unsigned int *)(addr+4));
171+ err |= get_user(nop, (unsigned int *)(addr+8));
172+ err |= get_user(jmp, (unsigned int *)(addr+12));
173+ err |= get_user(resolver, (unsigned long *)(addr+16));
174+
175+ if (err)
176+ break;
177+
178+ if (br2 == 0xC3600000U &&
179+ ldq == 0xA77B000CU &&
180+ nop == 0x47FF041FU &&
181+ jmp == 0x6B7B0000U)
182+ {
183+ regs->r28 = regs->pc+4;
184+ regs->r27 = addr+16;
185+ regs->pc = resolver;
186+ return 3;
187+ }
188+ }
189+ } while (0);
190+#endif
191+
192+ return 1;
193+}
194+
195+void pax_report_insns(void *pc, void *sp)
196+{
197+ unsigned long i;
198+
199+ printk(KERN_ERR "PAX: bytes at PC: ");
200+ for (i = 0; i < 5; i++) {
201+ unsigned int c;
202+ if (get_user(c, (unsigned int *)pc+i))
203+ printk(KERN_CONT "???????? ");
204+ else
205+ printk(KERN_CONT "%08x ", c);
206+ }
207+ printk("\n");
208+}
209+#endif
210
211 /*
212 * This routine handles page faults. It determines the address,
213@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, uns
214 good_area:
215 si_code = SEGV_ACCERR;
216 if (cause < 0) {
217- if (!(vma->vm_flags & VM_EXEC))
218+ if (!(vma->vm_flags & VM_EXEC)) {
219+
220+#ifdef CONFIG_PAX_PAGEEXEC
221+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
222+ goto bad_area;
223+
224+ up_read(&mm->mmap_sem);
225+ switch (pax_handle_fetch_fault(regs)) {
226+
227+#ifdef CONFIG_PAX_EMUPLT
228+ case 2:
229+ case 3:
230+ return;
231+#endif
232+
233+ }
234+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
235+ do_group_exit(SIGKILL);
236+#else
237 goto bad_area;
238+#endif
239+
240+ }
241 } else if (!cause) {
242 /* Allow reads even for write-only mappings */
243 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
244diff -urNp linux-2.6.32.46/arch/arm/include/asm/elf.h linux-2.6.32.46/arch/arm/include/asm/elf.h
245--- linux-2.6.32.46/arch/arm/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
246+++ linux-2.6.32.46/arch/arm/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400
247@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
248 the loader. We need to make sure that it is out of the way of the program
249 that it will "exec", and that there is sufficient room for the brk. */
250
251-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
252+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
253+
254+#ifdef CONFIG_PAX_ASLR
255+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
256+
257+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
258+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
259+#endif
260
261 /* When the program starts, a1 contains a pointer to a function to be
262 registered with atexit, as per the SVR4 ABI. A value of 0 means we
263diff -urNp linux-2.6.32.46/arch/arm/include/asm/kmap_types.h linux-2.6.32.46/arch/arm/include/asm/kmap_types.h
264--- linux-2.6.32.46/arch/arm/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400
265+++ linux-2.6.32.46/arch/arm/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400
266@@ -19,6 +19,7 @@ enum km_type {
267 KM_SOFTIRQ0,
268 KM_SOFTIRQ1,
269 KM_L2_CACHE,
270+ KM_CLEARPAGE,
271 KM_TYPE_NR
272 };
273
274diff -urNp linux-2.6.32.46/arch/arm/include/asm/uaccess.h linux-2.6.32.46/arch/arm/include/asm/uaccess.h
275--- linux-2.6.32.46/arch/arm/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400
276+++ linux-2.6.32.46/arch/arm/include/asm/uaccess.h 2011-06-29 21:02:24.000000000 -0400
277@@ -22,6 +22,8 @@
278 #define VERIFY_READ 0
279 #define VERIFY_WRITE 1
280
281+extern void check_object_size(const void *ptr, unsigned long n, bool to);
282+
283 /*
284 * The exception table consists of pairs of addresses: the first is the
285 * address of an instruction that is allowed to fault, and the second is
286@@ -387,8 +389,23 @@ do { \
287
288
289 #ifdef CONFIG_MMU
290-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
291-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
292+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
293+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
294+
295+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
296+{
297+ if (!__builtin_constant_p(n))
298+ check_object_size(to, n, false);
299+ return ___copy_from_user(to, from, n);
300+}
301+
302+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
303+{
304+ if (!__builtin_constant_p(n))
305+ check_object_size(from, n, true);
306+ return ___copy_to_user(to, from, n);
307+}
308+
309 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
310 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
311 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
312@@ -403,6 +420,9 @@ extern unsigned long __must_check __strn
313
314 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
315 {
316+ if ((long)n < 0)
317+ return n;
318+
319 if (access_ok(VERIFY_READ, from, n))
320 n = __copy_from_user(to, from, n);
321 else /* security hole - plug it */
322@@ -412,6 +432,9 @@ static inline unsigned long __must_check
323
324 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
325 {
326+ if ((long)n < 0)
327+ return n;
328+
329 if (access_ok(VERIFY_WRITE, to, n))
330 n = __copy_to_user(to, from, n);
331 return n;
332diff -urNp linux-2.6.32.46/arch/arm/kernel/armksyms.c linux-2.6.32.46/arch/arm/kernel/armksyms.c
333--- linux-2.6.32.46/arch/arm/kernel/armksyms.c 2011-03-27 14:31:47.000000000 -0400
334+++ linux-2.6.32.46/arch/arm/kernel/armksyms.c 2011-07-06 19:51:50.000000000 -0400
335@@ -118,8 +118,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
336 #ifdef CONFIG_MMU
337 EXPORT_SYMBOL(copy_page);
338
339-EXPORT_SYMBOL(__copy_from_user);
340-EXPORT_SYMBOL(__copy_to_user);
341+EXPORT_SYMBOL(___copy_from_user);
342+EXPORT_SYMBOL(___copy_to_user);
343 EXPORT_SYMBOL(__clear_user);
344
345 EXPORT_SYMBOL(__get_user_1);
346diff -urNp linux-2.6.32.46/arch/arm/kernel/kgdb.c linux-2.6.32.46/arch/arm/kernel/kgdb.c
347--- linux-2.6.32.46/arch/arm/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400
348+++ linux-2.6.32.46/arch/arm/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400
349@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
350 * and we handle the normal undef case within the do_undefinstr
351 * handler.
352 */
353-struct kgdb_arch arch_kgdb_ops = {
354+const struct kgdb_arch arch_kgdb_ops = {
355 #ifndef __ARMEB__
356 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
357 #else /* ! __ARMEB__ */
358diff -urNp linux-2.6.32.46/arch/arm/kernel/traps.c linux-2.6.32.46/arch/arm/kernel/traps.c
359--- linux-2.6.32.46/arch/arm/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400
360+++ linux-2.6.32.46/arch/arm/kernel/traps.c 2011-06-13 21:31:18.000000000 -0400
361@@ -247,6 +247,8 @@ static void __die(const char *str, int e
362
363 DEFINE_SPINLOCK(die_lock);
364
365+extern void gr_handle_kernel_exploit(void);
366+
367 /*
368 * This function is protected against re-entrancy.
369 */
370@@ -271,6 +273,8 @@ NORET_TYPE void die(const char *str, str
371 if (panic_on_oops)
372 panic("Fatal exception");
373
374+ gr_handle_kernel_exploit();
375+
376 do_exit(SIGSEGV);
377 }
378
379diff -urNp linux-2.6.32.46/arch/arm/lib/copy_from_user.S linux-2.6.32.46/arch/arm/lib/copy_from_user.S
380--- linux-2.6.32.46/arch/arm/lib/copy_from_user.S 2011-03-27 14:31:47.000000000 -0400
381+++ linux-2.6.32.46/arch/arm/lib/copy_from_user.S 2011-06-29 20:48:38.000000000 -0400
382@@ -16,7 +16,7 @@
383 /*
384 * Prototype:
385 *
386- * size_t __copy_from_user(void *to, const void *from, size_t n)
387+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
388 *
389 * Purpose:
390 *
391@@ -84,11 +84,11 @@
392
393 .text
394
395-ENTRY(__copy_from_user)
396+ENTRY(___copy_from_user)
397
398 #include "copy_template.S"
399
400-ENDPROC(__copy_from_user)
401+ENDPROC(___copy_from_user)
402
403 .section .fixup,"ax"
404 .align 0
405diff -urNp linux-2.6.32.46/arch/arm/lib/copy_to_user.S linux-2.6.32.46/arch/arm/lib/copy_to_user.S
406--- linux-2.6.32.46/arch/arm/lib/copy_to_user.S 2011-03-27 14:31:47.000000000 -0400
407+++ linux-2.6.32.46/arch/arm/lib/copy_to_user.S 2011-06-29 20:46:49.000000000 -0400
408@@ -16,7 +16,7 @@
409 /*
410 * Prototype:
411 *
412- * size_t __copy_to_user(void *to, const void *from, size_t n)
413+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
414 *
415 * Purpose:
416 *
417@@ -88,11 +88,11 @@
418 .text
419
420 ENTRY(__copy_to_user_std)
421-WEAK(__copy_to_user)
422+WEAK(___copy_to_user)
423
424 #include "copy_template.S"
425
426-ENDPROC(__copy_to_user)
427+ENDPROC(___copy_to_user)
428
429 .section .fixup,"ax"
430 .align 0
431diff -urNp linux-2.6.32.46/arch/arm/lib/uaccess.S linux-2.6.32.46/arch/arm/lib/uaccess.S
432--- linux-2.6.32.46/arch/arm/lib/uaccess.S 2011-03-27 14:31:47.000000000 -0400
433+++ linux-2.6.32.46/arch/arm/lib/uaccess.S 2011-06-29 20:48:53.000000000 -0400
434@@ -19,7 +19,7 @@
435
436 #define PAGE_SHIFT 12
437
438-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
439+/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
440 * Purpose : copy a block to user memory from kernel memory
441 * Params : to - user memory
442 * : from - kernel memory
443@@ -39,7 +39,7 @@ USER( strgtbt r3, [r0], #1) @ May fau
444 sub r2, r2, ip
445 b .Lc2u_dest_aligned
446
447-ENTRY(__copy_to_user)
448+ENTRY(___copy_to_user)
449 stmfd sp!, {r2, r4 - r7, lr}
450 cmp r2, #4
451 blt .Lc2u_not_enough
452@@ -277,14 +277,14 @@ USER( strgebt r3, [r0], #1) @ May fau
453 ldrgtb r3, [r1], #0
454 USER( strgtbt r3, [r0], #1) @ May fault
455 b .Lc2u_finished
456-ENDPROC(__copy_to_user)
457+ENDPROC(___copy_to_user)
458
459 .section .fixup,"ax"
460 .align 0
461 9001: ldmfd sp!, {r0, r4 - r7, pc}
462 .previous
463
464-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
465+/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
466 * Purpose : copy a block from user memory to kernel memory
467 * Params : to - kernel memory
468 * : from - user memory
469@@ -303,7 +303,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fau
470 sub r2, r2, ip
471 b .Lcfu_dest_aligned
472
473-ENTRY(__copy_from_user)
474+ENTRY(___copy_from_user)
475 stmfd sp!, {r0, r2, r4 - r7, lr}
476 cmp r2, #4
477 blt .Lcfu_not_enough
478@@ -543,7 +543,7 @@ USER( ldrgebt r3, [r1], #1) @ May fau
479 USER( ldrgtbt r3, [r1], #1) @ May fault
480 strgtb r3, [r0], #1
481 b .Lcfu_finished
482-ENDPROC(__copy_from_user)
483+ENDPROC(___copy_from_user)
484
485 .section .fixup,"ax"
486 .align 0
487diff -urNp linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c
488--- linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c 2011-03-27 14:31:47.000000000 -0400
489+++ linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c 2011-06-29 20:44:35.000000000 -0400
490@@ -97,7 +97,7 @@ out:
491 }
492
493 unsigned long
494-__copy_to_user(void __user *to, const void *from, unsigned long n)
495+___copy_to_user(void __user *to, const void *from, unsigned long n)
496 {
497 /*
498 * This test is stubbed out of the main function above to keep
499diff -urNp linux-2.6.32.46/arch/arm/mach-at91/pm.c linux-2.6.32.46/arch/arm/mach-at91/pm.c
500--- linux-2.6.32.46/arch/arm/mach-at91/pm.c 2011-03-27 14:31:47.000000000 -0400
501+++ linux-2.6.32.46/arch/arm/mach-at91/pm.c 2011-04-17 15:56:45.000000000 -0400
502@@ -348,7 +348,7 @@ static void at91_pm_end(void)
503 }
504
505
506-static struct platform_suspend_ops at91_pm_ops ={
507+static const struct platform_suspend_ops at91_pm_ops ={
508 .valid = at91_pm_valid_state,
509 .begin = at91_pm_begin,
510 .enter = at91_pm_enter,
511diff -urNp linux-2.6.32.46/arch/arm/mach-omap1/pm.c linux-2.6.32.46/arch/arm/mach-omap1/pm.c
512--- linux-2.6.32.46/arch/arm/mach-omap1/pm.c 2011-03-27 14:31:47.000000000 -0400
513+++ linux-2.6.32.46/arch/arm/mach-omap1/pm.c 2011-04-17 15:56:45.000000000 -0400
514@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
515
516
517
518-static struct platform_suspend_ops omap_pm_ops ={
519+static const struct platform_suspend_ops omap_pm_ops ={
520 .prepare = omap_pm_prepare,
521 .enter = omap_pm_enter,
522 .finish = omap_pm_finish,
523diff -urNp linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c
524--- linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c 2011-03-27 14:31:47.000000000 -0400
525+++ linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c 2011-04-17 15:56:45.000000000 -0400
526@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
527 enable_hlt();
528 }
529
530-static struct platform_suspend_ops omap_pm_ops = {
531+static const struct platform_suspend_ops omap_pm_ops = {
532 .prepare = omap2_pm_prepare,
533 .enter = omap2_pm_enter,
534 .finish = omap2_pm_finish,
535diff -urNp linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c
536--- linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c 2011-03-27 14:31:47.000000000 -0400
537+++ linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c 2011-04-17 15:56:45.000000000 -0400
538@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
539 return;
540 }
541
542-static struct platform_suspend_ops omap_pm_ops = {
543+static const struct platform_suspend_ops omap_pm_ops = {
544 .begin = omap3_pm_begin,
545 .end = omap3_pm_end,
546 .prepare = omap3_pm_prepare,
547diff -urNp linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c
548--- linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c 2011-03-27 14:31:47.000000000 -0400
549+++ linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c 2011-04-17 15:56:45.000000000 -0400
550@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
551 (state == PM_SUSPEND_MEM);
552 }
553
554-static struct platform_suspend_ops pnx4008_pm_ops = {
555+static const struct platform_suspend_ops pnx4008_pm_ops = {
556 .enter = pnx4008_pm_enter,
557 .valid = pnx4008_pm_valid,
558 };
559diff -urNp linux-2.6.32.46/arch/arm/mach-pxa/pm.c linux-2.6.32.46/arch/arm/mach-pxa/pm.c
560--- linux-2.6.32.46/arch/arm/mach-pxa/pm.c 2011-03-27 14:31:47.000000000 -0400
561+++ linux-2.6.32.46/arch/arm/mach-pxa/pm.c 2011-04-17 15:56:45.000000000 -0400
562@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
563 pxa_cpu_pm_fns->finish();
564 }
565
566-static struct platform_suspend_ops pxa_pm_ops = {
567+static const struct platform_suspend_ops pxa_pm_ops = {
568 .valid = pxa_pm_valid,
569 .enter = pxa_pm_enter,
570 .prepare = pxa_pm_prepare,
571diff -urNp linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c
572--- linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c 2011-03-27 14:31:47.000000000 -0400
573+++ linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c 2011-04-17 15:56:45.000000000 -0400
574@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
575 }
576
577 #ifdef CONFIG_PM
578-static struct platform_suspend_ops sharpsl_pm_ops = {
579+static const struct platform_suspend_ops sharpsl_pm_ops = {
580 .prepare = pxa_pm_prepare,
581 .finish = pxa_pm_finish,
582 .enter = corgi_pxa_pm_enter,
583diff -urNp linux-2.6.32.46/arch/arm/mach-sa1100/pm.c linux-2.6.32.46/arch/arm/mach-sa1100/pm.c
584--- linux-2.6.32.46/arch/arm/mach-sa1100/pm.c 2011-03-27 14:31:47.000000000 -0400
585+++ linux-2.6.32.46/arch/arm/mach-sa1100/pm.c 2011-04-17 15:56:45.000000000 -0400
586@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
587 return virt_to_phys(sp);
588 }
589
590-static struct platform_suspend_ops sa11x0_pm_ops = {
591+static const struct platform_suspend_ops sa11x0_pm_ops = {
592 .enter = sa11x0_pm_enter,
593 .valid = suspend_valid_only_mem,
594 };
595diff -urNp linux-2.6.32.46/arch/arm/mm/fault.c linux-2.6.32.46/arch/arm/mm/fault.c
596--- linux-2.6.32.46/arch/arm/mm/fault.c 2011-03-27 14:31:47.000000000 -0400
597+++ linux-2.6.32.46/arch/arm/mm/fault.c 2011-04-17 15:56:45.000000000 -0400
598@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
599 }
600 #endif
601
602+#ifdef CONFIG_PAX_PAGEEXEC
603+ if (fsr & FSR_LNX_PF) {
604+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
605+ do_group_exit(SIGKILL);
606+ }
607+#endif
608+
609 tsk->thread.address = addr;
610 tsk->thread.error_code = fsr;
611 tsk->thread.trap_no = 14;
612@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsign
613 }
614 #endif /* CONFIG_MMU */
615
616+#ifdef CONFIG_PAX_PAGEEXEC
617+void pax_report_insns(void *pc, void *sp)
618+{
619+ long i;
620+
621+ printk(KERN_ERR "PAX: bytes at PC: ");
622+ for (i = 0; i < 20; i++) {
623+ unsigned char c;
624+ if (get_user(c, (__force unsigned char __user *)pc+i))
625+ printk(KERN_CONT "?? ");
626+ else
627+ printk(KERN_CONT "%02x ", c);
628+ }
629+ printk("\n");
630+
631+ printk(KERN_ERR "PAX: bytes at SP-4: ");
632+ for (i = -1; i < 20; i++) {
633+ unsigned long c;
634+ if (get_user(c, (__force unsigned long __user *)sp+i))
635+ printk(KERN_CONT "???????? ");
636+ else
637+ printk(KERN_CONT "%08lx ", c);
638+ }
639+ printk("\n");
640+}
641+#endif
642+
643 /*
644 * First Level Translation Fault Handler
645 *
646diff -urNp linux-2.6.32.46/arch/arm/mm/mmap.c linux-2.6.32.46/arch/arm/mm/mmap.c
647--- linux-2.6.32.46/arch/arm/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400
648+++ linux-2.6.32.46/arch/arm/mm/mmap.c 2011-04-17 15:56:45.000000000 -0400
649@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
650 if (len > TASK_SIZE)
651 return -ENOMEM;
652
653+#ifdef CONFIG_PAX_RANDMMAP
654+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
655+#endif
656+
657 if (addr) {
658 if (do_align)
659 addr = COLOUR_ALIGN(addr, pgoff);
660@@ -70,15 +74,14 @@ arch_get_unmapped_area(struct file *filp
661 addr = PAGE_ALIGN(addr);
662
663 vma = find_vma(mm, addr);
664- if (TASK_SIZE - len >= addr &&
665- (!vma || addr + len <= vma->vm_start))
666+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
667 return addr;
668 }
669 if (len > mm->cached_hole_size) {
670- start_addr = addr = mm->free_area_cache;
671+ start_addr = addr = mm->free_area_cache;
672 } else {
673- start_addr = addr = TASK_UNMAPPED_BASE;
674- mm->cached_hole_size = 0;
675+ start_addr = addr = mm->mmap_base;
676+ mm->cached_hole_size = 0;
677 }
678
679 full_search:
680@@ -94,14 +97,14 @@ full_search:
681 * Start a new search - just in case we missed
682 * some holes.
683 */
684- if (start_addr != TASK_UNMAPPED_BASE) {
685- start_addr = addr = TASK_UNMAPPED_BASE;
686+ if (start_addr != mm->mmap_base) {
687+ start_addr = addr = mm->mmap_base;
688 mm->cached_hole_size = 0;
689 goto full_search;
690 }
691 return -ENOMEM;
692 }
693- if (!vma || addr + len <= vma->vm_start) {
694+ if (check_heap_stack_gap(vma, addr, len)) {
695 /*
696 * Remember the place where we stopped the search:
697 */
698diff -urNp linux-2.6.32.46/arch/arm/plat-s3c/pm.c linux-2.6.32.46/arch/arm/plat-s3c/pm.c
699--- linux-2.6.32.46/arch/arm/plat-s3c/pm.c 2011-03-27 14:31:47.000000000 -0400
700+++ linux-2.6.32.46/arch/arm/plat-s3c/pm.c 2011-04-17 15:56:45.000000000 -0400
701@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
702 s3c_pm_check_cleanup();
703 }
704
705-static struct platform_suspend_ops s3c_pm_ops = {
706+static const struct platform_suspend_ops s3c_pm_ops = {
707 .enter = s3c_pm_enter,
708 .prepare = s3c_pm_prepare,
709 .finish = s3c_pm_finish,
710diff -urNp linux-2.6.32.46/arch/avr32/include/asm/elf.h linux-2.6.32.46/arch/avr32/include/asm/elf.h
711--- linux-2.6.32.46/arch/avr32/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
712+++ linux-2.6.32.46/arch/avr32/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400
713@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
714 the loader. We need to make sure that it is out of the way of the program
715 that it will "exec", and that there is sufficient room for the brk. */
716
717-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
718+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
719
720+#ifdef CONFIG_PAX_ASLR
721+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
722+
723+#define PAX_DELTA_MMAP_LEN 15
724+#define PAX_DELTA_STACK_LEN 15
725+#endif
726
727 /* This yields a mask that user programs can use to figure out what
728 instruction set this CPU supports. This could be done in user space,
729diff -urNp linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h
730--- linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400
731+++ linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400
732@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
733 D(11) KM_IRQ1,
734 D(12) KM_SOFTIRQ0,
735 D(13) KM_SOFTIRQ1,
736-D(14) KM_TYPE_NR
737+D(14) KM_CLEARPAGE,
738+D(15) KM_TYPE_NR
739 };
740
741 #undef D
742diff -urNp linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c
743--- linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c 2011-03-27 14:31:47.000000000 -0400
744+++ linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c 2011-04-17 15:56:45.000000000 -0400
745@@ -176,7 +176,7 @@ out:
746 return 0;
747 }
748
749-static struct platform_suspend_ops avr32_pm_ops = {
750+static const struct platform_suspend_ops avr32_pm_ops = {
751 .valid = avr32_pm_valid_state,
752 .enter = avr32_pm_enter,
753 };
754diff -urNp linux-2.6.32.46/arch/avr32/mm/fault.c linux-2.6.32.46/arch/avr32/mm/fault.c
755--- linux-2.6.32.46/arch/avr32/mm/fault.c 2011-03-27 14:31:47.000000000 -0400
756+++ linux-2.6.32.46/arch/avr32/mm/fault.c 2011-04-17 15:56:45.000000000 -0400
757@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
758
759 int exception_trace = 1;
760
761+#ifdef CONFIG_PAX_PAGEEXEC
762+void pax_report_insns(void *pc, void *sp)
763+{
764+ unsigned long i;
765+
766+ printk(KERN_ERR "PAX: bytes at PC: ");
767+ for (i = 0; i < 20; i++) {
768+ unsigned char c;
769+ if (get_user(c, (unsigned char *)pc+i))
770+ printk(KERN_CONT "???????? ");
771+ else
772+ printk(KERN_CONT "%02x ", c);
773+ }
774+ printk("\n");
775+}
776+#endif
777+
778 /*
779 * This routine handles page faults. It determines the address and the
780 * problem, and then passes it off to one of the appropriate routines.
781@@ -157,6 +174,16 @@ bad_area:
782 up_read(&mm->mmap_sem);
783
784 if (user_mode(regs)) {
785+
786+#ifdef CONFIG_PAX_PAGEEXEC
787+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
788+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
789+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
790+ do_group_exit(SIGKILL);
791+ }
792+ }
793+#endif
794+
795 if (exception_trace && printk_ratelimit())
796 printk("%s%s[%d]: segfault at %08lx pc %08lx "
797 "sp %08lx ecr %lu\n",
798diff -urNp linux-2.6.32.46/arch/blackfin/kernel/kgdb.c linux-2.6.32.46/arch/blackfin/kernel/kgdb.c
799--- linux-2.6.32.46/arch/blackfin/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400
800+++ linux-2.6.32.46/arch/blackfin/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400
801@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
802 return -1; /* this means that we do not want to exit from the handler */
803 }
804
805-struct kgdb_arch arch_kgdb_ops = {
806+const struct kgdb_arch arch_kgdb_ops = {
807 .gdb_bpt_instr = {0xa1},
808 #ifdef CONFIG_SMP
809 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
810diff -urNp linux-2.6.32.46/arch/blackfin/mach-common/pm.c linux-2.6.32.46/arch/blackfin/mach-common/pm.c
811--- linux-2.6.32.46/arch/blackfin/mach-common/pm.c 2011-03-27 14:31:47.000000000 -0400
812+++ linux-2.6.32.46/arch/blackfin/mach-common/pm.c 2011-04-17 15:56:45.000000000 -0400
813@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
814 return 0;
815 }
816
817-struct platform_suspend_ops bfin_pm_ops = {
818+const struct platform_suspend_ops bfin_pm_ops = {
819 .enter = bfin_pm_enter,
820 .valid = bfin_pm_valid,
821 };
822diff -urNp linux-2.6.32.46/arch/frv/include/asm/kmap_types.h linux-2.6.32.46/arch/frv/include/asm/kmap_types.h
823--- linux-2.6.32.46/arch/frv/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400
824+++ linux-2.6.32.46/arch/frv/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400
825@@ -23,6 +23,7 @@ enum km_type {
826 KM_IRQ1,
827 KM_SOFTIRQ0,
828 KM_SOFTIRQ1,
829+ KM_CLEARPAGE,
830 KM_TYPE_NR
831 };
832
833diff -urNp linux-2.6.32.46/arch/frv/mm/elf-fdpic.c linux-2.6.32.46/arch/frv/mm/elf-fdpic.c
834--- linux-2.6.32.46/arch/frv/mm/elf-fdpic.c 2011-03-27 14:31:47.000000000 -0400
835+++ linux-2.6.32.46/arch/frv/mm/elf-fdpic.c 2011-04-17 15:56:45.000000000 -0400
836@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
837 if (addr) {
838 addr = PAGE_ALIGN(addr);
839 vma = find_vma(current->mm, addr);
840- if (TASK_SIZE - len >= addr &&
841- (!vma || addr + len <= vma->vm_start))
842+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
843 goto success;
844 }
845
846@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(str
847 for (; vma; vma = vma->vm_next) {
848 if (addr > limit)
849 break;
850- if (addr + len <= vma->vm_start)
851+ if (check_heap_stack_gap(vma, addr, len))
852 goto success;
853 addr = vma->vm_end;
854 }
855@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(str
856 for (; vma; vma = vma->vm_next) {
857 if (addr > limit)
858 break;
859- if (addr + len <= vma->vm_start)
860+ if (check_heap_stack_gap(vma, addr, len))
861 goto success;
862 addr = vma->vm_end;
863 }
864diff -urNp linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c
865--- linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c 2011-03-27 14:31:47.000000000 -0400
866+++ linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:56:45.000000000 -0400
867@@ -17,7 +17,7 @@
868 #include <linux/swiotlb.h>
869 #include <asm/machvec.h>
870
871-extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
872+extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
873
874 /* swiotlb declarations & definitions: */
875 extern int swiotlb_late_init_with_default_size (size_t size);
876@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct dev
877 !sba_dma_ops.dma_supported(dev, *dev->dma_mask);
878 }
879
880-struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
881+const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
882 {
883 if (use_swiotlb(dev))
884 return &swiotlb_dma_ops;
885diff -urNp linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c
886--- linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c 2011-03-27 14:31:47.000000000 -0400
887+++ linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:56:45.000000000 -0400
888@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
889 },
890 };
891
892-extern struct dma_map_ops swiotlb_dma_ops;
893+extern const struct dma_map_ops swiotlb_dma_ops;
894
895 static int __init
896 sba_init(void)
897@@ -2211,7 +2211,7 @@ sba_page_override(char *str)
898
899 __setup("sbapagesize=",sba_page_override);
900
901-struct dma_map_ops sba_dma_ops = {
902+const struct dma_map_ops sba_dma_ops = {
903 .alloc_coherent = sba_alloc_coherent,
904 .free_coherent = sba_free_coherent,
905 .map_page = sba_map_page,
906diff -urNp linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c
907--- linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c 2011-03-27 14:31:47.000000000 -0400
908+++ linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c 2011-04-17 15:56:45.000000000 -0400
909@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
910
911 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
912
913+#ifdef CONFIG_PAX_ASLR
914+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
915+
916+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
917+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
918+#endif
919+
920 /* Ugly but avoids duplication */
921 #include "../../../fs/binfmt_elf.c"
922
923diff -urNp linux-2.6.32.46/arch/ia64/ia32/ia32priv.h linux-2.6.32.46/arch/ia64/ia32/ia32priv.h
924--- linux-2.6.32.46/arch/ia64/ia32/ia32priv.h 2011-03-27 14:31:47.000000000 -0400
925+++ linux-2.6.32.46/arch/ia64/ia32/ia32priv.h 2011-04-17 15:56:45.000000000 -0400
926@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
927 #define ELF_DATA ELFDATA2LSB
928 #define ELF_ARCH EM_386
929
930-#define IA32_STACK_TOP IA32_PAGE_OFFSET
931+#ifdef CONFIG_PAX_RANDUSTACK
932+#define __IA32_DELTA_STACK (current->mm->delta_stack)
933+#else
934+#define __IA32_DELTA_STACK 0UL
935+#endif
936+
937+#define IA32_STACK_TOP (IA32_PAGE_OFFSET - __IA32_DELTA_STACK)
938+
939 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
940 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
941
942diff -urNp linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h
943--- linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400
944+++ linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:56:45.000000000 -0400
945@@ -12,7 +12,7 @@
946
947 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
948
949-extern struct dma_map_ops *dma_ops;
950+extern const struct dma_map_ops *dma_ops;
951 extern struct ia64_machine_vector ia64_mv;
952 extern void set_iommu_machvec(void);
953
954@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct d
955 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
956 dma_addr_t *daddr, gfp_t gfp)
957 {
958- struct dma_map_ops *ops = platform_dma_get_ops(dev);
959+ const struct dma_map_ops *ops = platform_dma_get_ops(dev);
960 void *caddr;
961
962 caddr = ops->alloc_coherent(dev, size, daddr, gfp);
963@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(s
964 static inline void dma_free_coherent(struct device *dev, size_t size,
965 void *caddr, dma_addr_t daddr)
966 {
967- struct dma_map_ops *ops = platform_dma_get_ops(dev);
968+ const struct dma_map_ops *ops = platform_dma_get_ops(dev);
969 debug_dma_free_coherent(dev, size, caddr, daddr);
970 ops->free_coherent(dev, size, caddr, daddr);
971 }
972@@ -49,13 +49,13 @@ static inline void dma_free_coherent(str
973
974 static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr)
975 {
976- struct dma_map_ops *ops = platform_dma_get_ops(dev);
977+ const struct dma_map_ops *ops = platform_dma_get_ops(dev);
978 return ops->mapping_error(dev, daddr);
979 }
980
981 static inline int dma_supported(struct device *dev, u64 mask)
982 {
983- struct dma_map_ops *ops = platform_dma_get_ops(dev);
984+ const struct dma_map_ops *ops = platform_dma_get_ops(dev);
985 return ops->dma_supported(dev, mask);
986 }
987
988diff -urNp linux-2.6.32.46/arch/ia64/include/asm/elf.h linux-2.6.32.46/arch/ia64/include/asm/elf.h
989--- linux-2.6.32.46/arch/ia64/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
990+++ linux-2.6.32.46/arch/ia64/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400
991@@ -43,6 +43,13 @@
992 */
993 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
994
995+#ifdef CONFIG_PAX_ASLR
996+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
997+
998+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
999+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1000+#endif
1001+
1002 #define PT_IA_64_UNWIND 0x70000001
1003
1004 /* IA-64 relocations: */
1005diff -urNp linux-2.6.32.46/arch/ia64/include/asm/machvec.h linux-2.6.32.46/arch/ia64/include/asm/machvec.h
1006--- linux-2.6.32.46/arch/ia64/include/asm/machvec.h 2011-03-27 14:31:47.000000000 -0400
1007+++ linux-2.6.32.46/arch/ia64/include/asm/machvec.h 2011-04-17 15:56:45.000000000 -0400
1008@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
1009 /* DMA-mapping interface: */
1010 typedef void ia64_mv_dma_init (void);
1011 typedef u64 ia64_mv_dma_get_required_mask (struct device *);
1012-typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
1013+typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
1014
1015 /*
1016 * WARNING: The legacy I/O space is _architected_. Platforms are
1017@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(co
1018 # endif /* CONFIG_IA64_GENERIC */
1019
1020 extern void swiotlb_dma_init(void);
1021-extern struct dma_map_ops *dma_get_ops(struct device *);
1022+extern const struct dma_map_ops *dma_get_ops(struct device *);
1023
1024 /*
1025 * Define default versions so we can extend machvec for new platforms without having
1026diff -urNp linux-2.6.32.46/arch/ia64/include/asm/pgtable.h linux-2.6.32.46/arch/ia64/include/asm/pgtable.h
1027--- linux-2.6.32.46/arch/ia64/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400
1028+++ linux-2.6.32.46/arch/ia64/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400
1029@@ -12,7 +12,7 @@
1030 * David Mosberger-Tang <davidm@hpl.hp.com>
1031 */
1032
1033-
1034+#include <linux/const.h>
1035 #include <asm/mman.h>
1036 #include <asm/page.h>
1037 #include <asm/processor.h>
1038@@ -143,6 +143,17 @@
1039 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1040 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1041 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
1042+
1043+#ifdef CONFIG_PAX_PAGEEXEC
1044+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
1045+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1046+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1047+#else
1048+# define PAGE_SHARED_NOEXEC PAGE_SHARED
1049+# define PAGE_READONLY_NOEXEC PAGE_READONLY
1050+# define PAGE_COPY_NOEXEC PAGE_COPY
1051+#endif
1052+
1053 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
1054 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
1055 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
1056diff -urNp linux-2.6.32.46/arch/ia64/include/asm/spinlock.h linux-2.6.32.46/arch/ia64/include/asm/spinlock.h
1057--- linux-2.6.32.46/arch/ia64/include/asm/spinlock.h 2011-03-27 14:31:47.000000000 -0400
1058+++ linux-2.6.32.46/arch/ia64/include/asm/spinlock.h 2011-04-17 15:56:45.000000000 -0400
1059@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
1060 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
1061
1062 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
1063- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
1064+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
1065 }
1066
1067 static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
1068diff -urNp linux-2.6.32.46/arch/ia64/include/asm/uaccess.h linux-2.6.32.46/arch/ia64/include/asm/uaccess.h
1069--- linux-2.6.32.46/arch/ia64/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400
1070+++ linux-2.6.32.46/arch/ia64/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400
1071@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
1072 const void *__cu_from = (from); \
1073 long __cu_len = (n); \
1074 \
1075- if (__access_ok(__cu_to, __cu_len, get_fs())) \
1076+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
1077 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
1078 __cu_len; \
1079 })
1080@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void _
1081 long __cu_len = (n); \
1082 \
1083 __chk_user_ptr(__cu_from); \
1084- if (__access_ok(__cu_from, __cu_len, get_fs())) \
1085+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
1086 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
1087 __cu_len; \
1088 })
1089diff -urNp linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c
1090--- linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c 2011-03-27 14:31:47.000000000 -0400
1091+++ linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:56:45.000000000 -0400
1092@@ -3,7 +3,7 @@
1093 /* Set this to 1 if there is a HW IOMMU in the system */
1094 int iommu_detected __read_mostly;
1095
1096-struct dma_map_ops *dma_ops;
1097+const struct dma_map_ops *dma_ops;
1098 EXPORT_SYMBOL(dma_ops);
1099
1100 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
1101@@ -16,7 +16,7 @@ static int __init dma_init(void)
1102 }
1103 fs_initcall(dma_init);
1104
1105-struct dma_map_ops *dma_get_ops(struct device *dev)
1106+const struct dma_map_ops *dma_get_ops(struct device *dev)
1107 {
1108 return dma_ops;
1109 }
1110diff -urNp linux-2.6.32.46/arch/ia64/kernel/module.c linux-2.6.32.46/arch/ia64/kernel/module.c
1111--- linux-2.6.32.46/arch/ia64/kernel/module.c 2011-03-27 14:31:47.000000000 -0400
1112+++ linux-2.6.32.46/arch/ia64/kernel/module.c 2011-04-17 15:56:45.000000000 -0400
1113@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
1114 void
1115 module_free (struct module *mod, void *module_region)
1116 {
1117- if (mod && mod->arch.init_unw_table &&
1118- module_region == mod->module_init) {
1119+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
1120 unw_remove_unwind_table(mod->arch.init_unw_table);
1121 mod->arch.init_unw_table = NULL;
1122 }
1123@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd
1124 }
1125
1126 static inline int
1127+in_init_rx (const struct module *mod, uint64_t addr)
1128+{
1129+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
1130+}
1131+
1132+static inline int
1133+in_init_rw (const struct module *mod, uint64_t addr)
1134+{
1135+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
1136+}
1137+
1138+static inline int
1139 in_init (const struct module *mod, uint64_t addr)
1140 {
1141- return addr - (uint64_t) mod->module_init < mod->init_size;
1142+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
1143+}
1144+
1145+static inline int
1146+in_core_rx (const struct module *mod, uint64_t addr)
1147+{
1148+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
1149+}
1150+
1151+static inline int
1152+in_core_rw (const struct module *mod, uint64_t addr)
1153+{
1154+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
1155 }
1156
1157 static inline int
1158 in_core (const struct module *mod, uint64_t addr)
1159 {
1160- return addr - (uint64_t) mod->module_core < mod->core_size;
1161+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
1162 }
1163
1164 static inline int
1165@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_
1166 break;
1167
1168 case RV_BDREL:
1169- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
1170+ if (in_init_rx(mod, val))
1171+ val -= (uint64_t) mod->module_init_rx;
1172+ else if (in_init_rw(mod, val))
1173+ val -= (uint64_t) mod->module_init_rw;
1174+ else if (in_core_rx(mod, val))
1175+ val -= (uint64_t) mod->module_core_rx;
1176+ else if (in_core_rw(mod, val))
1177+ val -= (uint64_t) mod->module_core_rw;
1178 break;
1179
1180 case RV_LTV:
1181@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
1182 * addresses have been selected...
1183 */
1184 uint64_t gp;
1185- if (mod->core_size > MAX_LTOFF)
1186+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
1187 /*
1188 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
1189 * at the end of the module.
1190 */
1191- gp = mod->core_size - MAX_LTOFF / 2;
1192+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
1193 else
1194- gp = mod->core_size / 2;
1195- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
1196+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
1197+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
1198 mod->arch.gp = gp;
1199 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
1200 }
1201diff -urNp linux-2.6.32.46/arch/ia64/kernel/pci-dma.c linux-2.6.32.46/arch/ia64/kernel/pci-dma.c
1202--- linux-2.6.32.46/arch/ia64/kernel/pci-dma.c 2011-03-27 14:31:47.000000000 -0400
1203+++ linux-2.6.32.46/arch/ia64/kernel/pci-dma.c 2011-04-17 15:56:45.000000000 -0400
1204@@ -43,7 +43,7 @@ struct device fallback_dev = {
1205 .dma_mask = &fallback_dev.coherent_dma_mask,
1206 };
1207
1208-extern struct dma_map_ops intel_dma_ops;
1209+extern const struct dma_map_ops intel_dma_ops;
1210
1211 static int __init pci_iommu_init(void)
1212 {
1213@@ -96,15 +96,34 @@ int iommu_dma_supported(struct device *d
1214 }
1215 EXPORT_SYMBOL(iommu_dma_supported);
1216
1217+extern void *intel_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t flags);
1218+extern void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle);
1219+extern int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs);
1220+extern void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs);
1221+extern dma_addr_t intel_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs);
1222+extern void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs);
1223+extern int intel_mapping_error(struct device *dev, dma_addr_t dma_addr);
1224+
1225+static const struct dma_map_ops intel_iommu_dma_ops = {
1226+ /* from drivers/pci/intel-iommu.c:intel_dma_ops */
1227+ .alloc_coherent = intel_alloc_coherent,
1228+ .free_coherent = intel_free_coherent,
1229+ .map_sg = intel_map_sg,
1230+ .unmap_sg = intel_unmap_sg,
1231+ .map_page = intel_map_page,
1232+ .unmap_page = intel_unmap_page,
1233+ .mapping_error = intel_mapping_error,
1234+
1235+ .sync_single_for_cpu = machvec_dma_sync_single,
1236+ .sync_sg_for_cpu = machvec_dma_sync_sg,
1237+ .sync_single_for_device = machvec_dma_sync_single,
1238+ .sync_sg_for_device = machvec_dma_sync_sg,
1239+ .dma_supported = iommu_dma_supported,
1240+};
1241+
1242 void __init pci_iommu_alloc(void)
1243 {
1244- dma_ops = &intel_dma_ops;
1245-
1246- dma_ops->sync_single_for_cpu = machvec_dma_sync_single;
1247- dma_ops->sync_sg_for_cpu = machvec_dma_sync_sg;
1248- dma_ops->sync_single_for_device = machvec_dma_sync_single;
1249- dma_ops->sync_sg_for_device = machvec_dma_sync_sg;
1250- dma_ops->dma_supported = iommu_dma_supported;
1251+ dma_ops = &intel_iommu_dma_ops;
1252
1253 /*
1254 * The order of these functions is important for
1255diff -urNp linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c
1256--- linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c 2011-03-27 14:31:47.000000000 -0400
1257+++ linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:56:45.000000000 -0400
1258@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
1259 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
1260 }
1261
1262-struct dma_map_ops swiotlb_dma_ops = {
1263+const struct dma_map_ops swiotlb_dma_ops = {
1264 .alloc_coherent = ia64_swiotlb_alloc_coherent,
1265 .free_coherent = swiotlb_free_coherent,
1266 .map_page = swiotlb_map_page,
1267diff -urNp linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c
1268--- linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c 2011-03-27 14:31:47.000000000 -0400
1269+++ linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:56:45.000000000 -0400
1270@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
1271 if (REGION_NUMBER(addr) == RGN_HPAGE)
1272 addr = 0;
1273 #endif
1274+
1275+#ifdef CONFIG_PAX_RANDMMAP
1276+ if (mm->pax_flags & MF_PAX_RANDMMAP)
1277+ addr = mm->free_area_cache;
1278+ else
1279+#endif
1280+
1281 if (!addr)
1282 addr = mm->free_area_cache;
1283
1284@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *fil
1285 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
1286 /* At this point: (!vma || addr < vma->vm_end). */
1287 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
1288- if (start_addr != TASK_UNMAPPED_BASE) {
1289+ if (start_addr != mm->mmap_base) {
1290 /* Start a new search --- just in case we missed some holes. */
1291- addr = TASK_UNMAPPED_BASE;
1292+ addr = mm->mmap_base;
1293 goto full_search;
1294 }
1295 return -ENOMEM;
1296 }
1297- if (!vma || addr + len <= vma->vm_start) {
1298+ if (check_heap_stack_gap(vma, addr, len)) {
1299 /* Remember the address where we stopped this search: */
1300 mm->free_area_cache = addr + len;
1301 return addr;
1302diff -urNp linux-2.6.32.46/arch/ia64/kernel/topology.c linux-2.6.32.46/arch/ia64/kernel/topology.c
1303--- linux-2.6.32.46/arch/ia64/kernel/topology.c 2011-03-27 14:31:47.000000000 -0400
1304+++ linux-2.6.32.46/arch/ia64/kernel/topology.c 2011-04-17 15:56:45.000000000 -0400
1305@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
1306 return ret;
1307 }
1308
1309-static struct sysfs_ops cache_sysfs_ops = {
1310+static const struct sysfs_ops cache_sysfs_ops = {
1311 .show = cache_show
1312 };
1313
1314diff -urNp linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S
1315--- linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S 2011-03-27 14:31:47.000000000 -0400
1316+++ linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:56:45.000000000 -0400
1317@@ -190,7 +190,7 @@ SECTIONS
1318 /* Per-cpu data: */
1319 . = ALIGN(PERCPU_PAGE_SIZE);
1320 PERCPU_VADDR(PERCPU_ADDR, :percpu)
1321- __phys_per_cpu_start = __per_cpu_load;
1322+ __phys_per_cpu_start = per_cpu_load;
1323 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
1324 * into percpu page size
1325 */
1326diff -urNp linux-2.6.32.46/arch/ia64/mm/fault.c linux-2.6.32.46/arch/ia64/mm/fault.c
1327--- linux-2.6.32.46/arch/ia64/mm/fault.c 2011-03-27 14:31:47.000000000 -0400
1328+++ linux-2.6.32.46/arch/ia64/mm/fault.c 2011-04-17 15:56:45.000000000 -0400
1329@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
1330 return pte_present(pte);
1331 }
1332
1333+#ifdef CONFIG_PAX_PAGEEXEC
1334+void pax_report_insns(void *pc, void *sp)
1335+{
1336+ unsigned long i;
1337+
1338+ printk(KERN_ERR "PAX: bytes at PC: ");
1339+ for (i = 0; i < 8; i++) {
1340+ unsigned int c;
1341+ if (get_user(c, (unsigned int *)pc+i))
1342+ printk(KERN_CONT "???????? ");
1343+ else
1344+ printk(KERN_CONT "%08x ", c);
1345+ }
1346+ printk("\n");
1347+}
1348+#endif
1349+
1350 void __kprobes
1351 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
1352 {
1353@@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long addres
1354 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
1355 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
1356
1357- if ((vma->vm_flags & mask) != mask)
1358+ if ((vma->vm_flags & mask) != mask) {
1359+
1360+#ifdef CONFIG_PAX_PAGEEXEC
1361+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
1362+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
1363+ goto bad_area;
1364+
1365+ up_read(&mm->mmap_sem);
1366+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
1367+ do_group_exit(SIGKILL);
1368+ }
1369+#endif
1370+
1371 goto bad_area;
1372
1373+ }
1374+
1375 survive:
1376 /*
1377 * If for any reason at all we couldn't handle the fault, make
1378diff -urNp linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c
1379--- linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400
1380+++ linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:56:45.000000000 -0400
1381@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
1382 /* At this point: (!vmm || addr < vmm->vm_end). */
1383 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
1384 return -ENOMEM;
1385- if (!vmm || (addr + len) <= vmm->vm_start)
1386+ if (check_heap_stack_gap(vmm, addr, len))
1387 return addr;
1388 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
1389 }
1390diff -urNp linux-2.6.32.46/arch/ia64/mm/init.c linux-2.6.32.46/arch/ia64/mm/init.c
1391--- linux-2.6.32.46/arch/ia64/mm/init.c 2011-03-27 14:31:47.000000000 -0400
1392+++ linux-2.6.32.46/arch/ia64/mm/init.c 2011-04-17 15:56:45.000000000 -0400
1393@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1394 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1395 vma->vm_end = vma->vm_start + PAGE_SIZE;
1396 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
1397+
1398+#ifdef CONFIG_PAX_PAGEEXEC
1399+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
1400+ vma->vm_flags &= ~VM_EXEC;
1401+
1402+#ifdef CONFIG_PAX_MPROTECT
1403+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
1404+ vma->vm_flags &= ~VM_MAYEXEC;
1405+#endif
1406+
1407+ }
1408+#endif
1409+
1410 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1411 down_write(&current->mm->mmap_sem);
1412 if (insert_vm_struct(current->mm, vma)) {
1413diff -urNp linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c
1414--- linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c 2011-03-27 14:31:47.000000000 -0400
1415+++ linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:56:45.000000000 -0400
1416@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
1417 return ret;
1418 }
1419
1420-static struct dma_map_ops sn_dma_ops = {
1421+static const struct dma_map_ops sn_dma_ops = {
1422 .alloc_coherent = sn_dma_alloc_coherent,
1423 .free_coherent = sn_dma_free_coherent,
1424 .map_page = sn_dma_map_page,
1425diff -urNp linux-2.6.32.46/arch/m32r/lib/usercopy.c linux-2.6.32.46/arch/m32r/lib/usercopy.c
1426--- linux-2.6.32.46/arch/m32r/lib/usercopy.c 2011-03-27 14:31:47.000000000 -0400
1427+++ linux-2.6.32.46/arch/m32r/lib/usercopy.c 2011-04-17 15:56:45.000000000 -0400
1428@@ -14,6 +14,9 @@
1429 unsigned long
1430 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
1431 {
1432+ if ((long)n < 0)
1433+ return n;
1434+
1435 prefetch(from);
1436 if (access_ok(VERIFY_WRITE, to, n))
1437 __copy_user(to,from,n);
1438@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to,
1439 unsigned long
1440 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
1441 {
1442+ if ((long)n < 0)
1443+ return n;
1444+
1445 prefetchw(to);
1446 if (access_ok(VERIFY_READ, from, n))
1447 __copy_user_zeroing(to,from,n);
1448diff -urNp linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c
1449--- linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c 2011-03-27 14:31:47.000000000 -0400
1450+++ linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c 2011-04-17 15:56:45.000000000 -0400
1451@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1452
1453 }
1454
1455-static struct platform_suspend_ops db1x_pm_ops = {
1456+static const struct platform_suspend_ops db1x_pm_ops = {
1457 .valid = suspend_valid_only_mem,
1458 .begin = db1x_pm_begin,
1459 .enter = db1x_pm_enter,
1460diff -urNp linux-2.6.32.46/arch/mips/include/asm/elf.h linux-2.6.32.46/arch/mips/include/asm/elf.h
1461--- linux-2.6.32.46/arch/mips/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
1462+++ linux-2.6.32.46/arch/mips/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400
1463@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
1464 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1465 #endif
1466
1467+#ifdef CONFIG_PAX_ASLR
1468+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
1469+
1470+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1471+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1472+#endif
1473+
1474 #endif /* _ASM_ELF_H */
1475diff -urNp linux-2.6.32.46/arch/mips/include/asm/page.h linux-2.6.32.46/arch/mips/include/asm/page.h
1476--- linux-2.6.32.46/arch/mips/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400
1477+++ linux-2.6.32.46/arch/mips/include/asm/page.h 2011-04-17 15:56:45.000000000 -0400
1478@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
1479 #ifdef CONFIG_CPU_MIPS32
1480 typedef struct { unsigned long pte_low, pte_high; } pte_t;
1481 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
1482- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
1483+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
1484 #else
1485 typedef struct { unsigned long long pte; } pte_t;
1486 #define pte_val(x) ((x).pte)
1487diff -urNp linux-2.6.32.46/arch/mips/include/asm/reboot.h linux-2.6.32.46/arch/mips/include/asm/reboot.h
1488--- linux-2.6.32.46/arch/mips/include/asm/reboot.h 2011-03-27 14:31:47.000000000 -0400
1489+++ linux-2.6.32.46/arch/mips/include/asm/reboot.h 2011-08-21 17:35:02.000000000 -0400
1490@@ -9,7 +9,7 @@
1491 #ifndef _ASM_REBOOT_H
1492 #define _ASM_REBOOT_H
1493
1494-extern void (*_machine_restart)(char *command);
1495-extern void (*_machine_halt)(void);
1496+extern void (*__noreturn _machine_restart)(char *command);
1497+extern void (*__noreturn _machine_halt)(void);
1498
1499 #endif /* _ASM_REBOOT_H */
1500diff -urNp linux-2.6.32.46/arch/mips/include/asm/system.h linux-2.6.32.46/arch/mips/include/asm/system.h
1501--- linux-2.6.32.46/arch/mips/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400
1502+++ linux-2.6.32.46/arch/mips/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400
1503@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1504 */
1505 #define __ARCH_WANT_UNLOCKED_CTXSW
1506
1507-extern unsigned long arch_align_stack(unsigned long sp);
1508+#define arch_align_stack(x) ((x) & ~0xfUL)
1509
1510 #endif /* _ASM_SYSTEM_H */
1511diff -urNp linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c
1512--- linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c 2011-03-27 14:31:47.000000000 -0400
1513+++ linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:56:45.000000000 -0400
1514@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1515 #undef ELF_ET_DYN_BASE
1516 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
1517
1518+#ifdef CONFIG_PAX_ASLR
1519+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
1520+
1521+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1522+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1523+#endif
1524+
1525 #include <asm/processor.h>
1526 #include <linux/module.h>
1527 #include <linux/elfcore.h>
1528diff -urNp linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c
1529--- linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c 2011-03-27 14:31:47.000000000 -0400
1530+++ linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:56:45.000000000 -0400
1531@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1532 #undef ELF_ET_DYN_BASE
1533 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
1534
1535+#ifdef CONFIG_PAX_ASLR
1536+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
1537+
1538+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1539+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1540+#endif
1541+
1542 #include <asm/processor.h>
1543
1544 /*
1545diff -urNp linux-2.6.32.46/arch/mips/kernel/kgdb.c linux-2.6.32.46/arch/mips/kernel/kgdb.c
1546--- linux-2.6.32.46/arch/mips/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400
1547+++ linux-2.6.32.46/arch/mips/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400
1548@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
1549 return -1;
1550 }
1551
1552+/* cannot be const */
1553 struct kgdb_arch arch_kgdb_ops;
1554
1555 /*
1556diff -urNp linux-2.6.32.46/arch/mips/kernel/process.c linux-2.6.32.46/arch/mips/kernel/process.c
1557--- linux-2.6.32.46/arch/mips/kernel/process.c 2011-03-27 14:31:47.000000000 -0400
1558+++ linux-2.6.32.46/arch/mips/kernel/process.c 2011-04-17 15:56:45.000000000 -0400
1559@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
1560 out:
1561 return pc;
1562 }
1563-
1564-/*
1565- * Don't forget that the stack pointer must be aligned on a 8 bytes
1566- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
1567- */
1568-unsigned long arch_align_stack(unsigned long sp)
1569-{
1570- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
1571- sp -= get_random_int() & ~PAGE_MASK;
1572-
1573- return sp & ALMASK;
1574-}
1575diff -urNp linux-2.6.32.46/arch/mips/kernel/reset.c linux-2.6.32.46/arch/mips/kernel/reset.c
1576--- linux-2.6.32.46/arch/mips/kernel/reset.c 2011-03-27 14:31:47.000000000 -0400
1577+++ linux-2.6.32.46/arch/mips/kernel/reset.c 2011-08-21 17:35:26.000000000 -0400
1578@@ -19,8 +19,8 @@
1579 * So handle all using function pointers to machine specific
1580 * functions.
1581 */
1582-void (*_machine_restart)(char *command);
1583-void (*_machine_halt)(void);
1584+void (*__noreturn _machine_restart)(char *command);
1585+void (*__noreturn _machine_halt)(void);
1586 void (*pm_power_off)(void);
1587
1588 EXPORT_SYMBOL(pm_power_off);
1589@@ -29,16 +29,19 @@ void machine_restart(char *command)
1590 {
1591 if (_machine_restart)
1592 _machine_restart(command);
1593+ BUG();
1594 }
1595
1596 void machine_halt(void)
1597 {
1598 if (_machine_halt)
1599 _machine_halt();
1600+ BUG();
1601 }
1602
1603 void machine_power_off(void)
1604 {
1605 if (pm_power_off)
1606 pm_power_off();
1607+ BUG();
1608 }
1609diff -urNp linux-2.6.32.46/arch/mips/kernel/syscall.c linux-2.6.32.46/arch/mips/kernel/syscall.c
1610--- linux-2.6.32.46/arch/mips/kernel/syscall.c 2011-03-27 14:31:47.000000000 -0400
1611+++ linux-2.6.32.46/arch/mips/kernel/syscall.c 2011-04-17 15:56:45.000000000 -0400
1612@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
1613 do_color_align = 0;
1614 if (filp || (flags & MAP_SHARED))
1615 do_color_align = 1;
1616+
1617+#ifdef CONFIG_PAX_RANDMMAP
1618+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
1619+#endif
1620+
1621 if (addr) {
1622 if (do_color_align)
1623 addr = COLOUR_ALIGN(addr, pgoff);
1624 else
1625 addr = PAGE_ALIGN(addr);
1626 vmm = find_vma(current->mm, addr);
1627- if (task_size - len >= addr &&
1628- (!vmm || addr + len <= vmm->vm_start))
1629+ if (task_size - len >= addr && check_heap_stack_gap(vmm, addr, len))
1630 return addr;
1631 }
1632- addr = TASK_UNMAPPED_BASE;
1633+ addr = current->mm->mmap_base;
1634 if (do_color_align)
1635 addr = COLOUR_ALIGN(addr, pgoff);
1636 else
1637@@ -122,7 +126,7 @@ unsigned long arch_get_unmapped_area(str
1638 /* At this point: (!vmm || addr < vmm->vm_end). */
1639 if (task_size - len < addr)
1640 return -ENOMEM;
1641- if (!vmm || addr + len <= vmm->vm_start)
1642+ if (check_heap_stack_gap(vmm, addr, len))
1643 return addr;
1644 addr = vmm->vm_end;
1645 if (do_color_align)
1646diff -urNp linux-2.6.32.46/arch/mips/Makefile linux-2.6.32.46/arch/mips/Makefile
1647--- linux-2.6.32.46/arch/mips/Makefile 2011-03-27 14:31:47.000000000 -0400
1648+++ linux-2.6.32.46/arch/mips/Makefile 2011-08-21 19:26:52.000000000 -0400
1649@@ -51,6 +51,8 @@ endif
1650 cflags-y := -ffunction-sections
1651 cflags-y += $(call cc-option, -mno-check-zero-division)
1652
1653+cflags-y += -Wno-sign-compare -Wno-extra
1654+
1655 ifdef CONFIG_32BIT
1656 ld-emul = $(32bit-emul)
1657 vmlinux-32 = vmlinux
1658diff -urNp linux-2.6.32.46/arch/mips/mm/fault.c linux-2.6.32.46/arch/mips/mm/fault.c
1659--- linux-2.6.32.46/arch/mips/mm/fault.c 2011-03-27 14:31:47.000000000 -0400
1660+++ linux-2.6.32.46/arch/mips/mm/fault.c 2011-04-17 15:56:45.000000000 -0400
1661@@ -26,6 +26,23 @@
1662 #include <asm/ptrace.h>
1663 #include <asm/highmem.h> /* For VMALLOC_END */
1664
1665+#ifdef CONFIG_PAX_PAGEEXEC
1666+void pax_report_insns(void *pc, void *sp)
1667+{
1668+ unsigned long i;
1669+
1670+ printk(KERN_ERR "PAX: bytes at PC: ");
1671+ for (i = 0; i < 5; i++) {
1672+ unsigned int c;
1673+ if (get_user(c, (unsigned int *)pc+i))
1674+ printk(KERN_CONT "???????? ");
1675+ else
1676+ printk(KERN_CONT "%08x ", c);
1677+ }
1678+ printk("\n");
1679+}
1680+#endif
1681+
1682 /*
1683 * This routine handles page faults. It determines the address,
1684 * and the problem, and then passes it off to one of the appropriate
1685diff -urNp linux-2.6.32.46/arch/parisc/include/asm/elf.h linux-2.6.32.46/arch/parisc/include/asm/elf.h
1686--- linux-2.6.32.46/arch/parisc/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
1687+++ linux-2.6.32.46/arch/parisc/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400
1688@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
1689
1690 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
1691
1692+#ifdef CONFIG_PAX_ASLR
1693+#define PAX_ELF_ET_DYN_BASE 0x10000UL
1694+
1695+#define PAX_DELTA_MMAP_LEN 16
1696+#define PAX_DELTA_STACK_LEN 16
1697+#endif
1698+
1699 /* This yields a mask that user programs can use to figure out what
1700 instruction set this CPU supports. This could be done in user space,
1701 but it's not easy, and we've already done it here. */
1702diff -urNp linux-2.6.32.46/arch/parisc/include/asm/pgtable.h linux-2.6.32.46/arch/parisc/include/asm/pgtable.h
1703--- linux-2.6.32.46/arch/parisc/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400
1704+++ linux-2.6.32.46/arch/parisc/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400
1705@@ -207,6 +207,17 @@
1706 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
1707 #define PAGE_COPY PAGE_EXECREAD
1708 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
1709+
1710+#ifdef CONFIG_PAX_PAGEEXEC
1711+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
1712+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
1713+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
1714+#else
1715+# define PAGE_SHARED_NOEXEC PAGE_SHARED
1716+# define PAGE_COPY_NOEXEC PAGE_COPY
1717+# define PAGE_READONLY_NOEXEC PAGE_READONLY
1718+#endif
1719+
1720 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
1721 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
1722 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
1723diff -urNp linux-2.6.32.46/arch/parisc/kernel/module.c linux-2.6.32.46/arch/parisc/kernel/module.c
1724--- linux-2.6.32.46/arch/parisc/kernel/module.c 2011-03-27 14:31:47.000000000 -0400
1725+++ linux-2.6.32.46/arch/parisc/kernel/module.c 2011-04-17 15:56:45.000000000 -0400
1726@@ -95,16 +95,38 @@
1727
1728 /* three functions to determine where in the module core
1729 * or init pieces the location is */
1730+static inline int in_init_rx(struct module *me, void *loc)
1731+{
1732+ return (loc >= me->module_init_rx &&
1733+ loc < (me->module_init_rx + me->init_size_rx));
1734+}
1735+
1736+static inline int in_init_rw(struct module *me, void *loc)
1737+{
1738+ return (loc >= me->module_init_rw &&
1739+ loc < (me->module_init_rw + me->init_size_rw));
1740+}
1741+
1742 static inline int in_init(struct module *me, void *loc)
1743 {
1744- return (loc >= me->module_init &&
1745- loc <= (me->module_init + me->init_size));
1746+ return in_init_rx(me, loc) || in_init_rw(me, loc);
1747+}
1748+
1749+static inline int in_core_rx(struct module *me, void *loc)
1750+{
1751+ return (loc >= me->module_core_rx &&
1752+ loc < (me->module_core_rx + me->core_size_rx));
1753+}
1754+
1755+static inline int in_core_rw(struct module *me, void *loc)
1756+{
1757+ return (loc >= me->module_core_rw &&
1758+ loc < (me->module_core_rw + me->core_size_rw));
1759 }
1760
1761 static inline int in_core(struct module *me, void *loc)
1762 {
1763- return (loc >= me->module_core &&
1764- loc <= (me->module_core + me->core_size));
1765+ return in_core_rx(me, loc) || in_core_rw(me, loc);
1766 }
1767
1768 static inline int in_local(struct module *me, void *loc)
1769@@ -364,13 +386,13 @@ int module_frob_arch_sections(CONST Elf_
1770 }
1771
1772 /* align things a bit */
1773- me->core_size = ALIGN(me->core_size, 16);
1774- me->arch.got_offset = me->core_size;
1775- me->core_size += gots * sizeof(struct got_entry);
1776-
1777- me->core_size = ALIGN(me->core_size, 16);
1778- me->arch.fdesc_offset = me->core_size;
1779- me->core_size += fdescs * sizeof(Elf_Fdesc);
1780+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
1781+ me->arch.got_offset = me->core_size_rw;
1782+ me->core_size_rw += gots * sizeof(struct got_entry);
1783+
1784+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
1785+ me->arch.fdesc_offset = me->core_size_rw;
1786+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
1787
1788 me->arch.got_max = gots;
1789 me->arch.fdesc_max = fdescs;
1790@@ -388,7 +410,7 @@ static Elf64_Word get_got(struct module
1791
1792 BUG_ON(value == 0);
1793
1794- got = me->module_core + me->arch.got_offset;
1795+ got = me->module_core_rw + me->arch.got_offset;
1796 for (i = 0; got[i].addr; i++)
1797 if (got[i].addr == value)
1798 goto out;
1799@@ -406,7 +428,7 @@ static Elf64_Word get_got(struct module
1800 #ifdef CONFIG_64BIT
1801 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
1802 {
1803- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
1804+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
1805
1806 if (!value) {
1807 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
1808@@ -424,7 +446,7 @@ static Elf_Addr get_fdesc(struct module
1809
1810 /* Create new one */
1811 fdesc->addr = value;
1812- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
1813+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
1814 return (Elf_Addr)fdesc;
1815 }
1816 #endif /* CONFIG_64BIT */
1817@@ -848,7 +870,7 @@ register_unwind_table(struct module *me,
1818
1819 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
1820 end = table + sechdrs[me->arch.unwind_section].sh_size;
1821- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
1822+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
1823
1824 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
1825 me->arch.unwind_section, table, end, gp);
1826diff -urNp linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c
1827--- linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c 2011-03-27 14:31:47.000000000 -0400
1828+++ linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:56:45.000000000 -0400
1829@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
1830 /* At this point: (!vma || addr < vma->vm_end). */
1831 if (TASK_SIZE - len < addr)
1832 return -ENOMEM;
1833- if (!vma || addr + len <= vma->vm_start)
1834+ if (check_heap_stack_gap(vma, addr, len))
1835 return addr;
1836 addr = vma->vm_end;
1837 }
1838@@ -79,7 +79,7 @@ static unsigned long get_shared_area(str
1839 /* At this point: (!vma || addr < vma->vm_end). */
1840 if (TASK_SIZE - len < addr)
1841 return -ENOMEM;
1842- if (!vma || addr + len <= vma->vm_start)
1843+ if (check_heap_stack_gap(vma, addr, len))
1844 return addr;
1845 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
1846 if (addr < vma->vm_end) /* handle wraparound */
1847@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
1848 if (flags & MAP_FIXED)
1849 return addr;
1850 if (!addr)
1851- addr = TASK_UNMAPPED_BASE;
1852+ addr = current->mm->mmap_base;
1853
1854 if (filp) {
1855 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
1856diff -urNp linux-2.6.32.46/arch/parisc/kernel/traps.c linux-2.6.32.46/arch/parisc/kernel/traps.c
1857--- linux-2.6.32.46/arch/parisc/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400
1858+++ linux-2.6.32.46/arch/parisc/kernel/traps.c 2011-04-17 15:56:45.000000000 -0400
1859@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
1860
1861 down_read(&current->mm->mmap_sem);
1862 vma = find_vma(current->mm,regs->iaoq[0]);
1863- if (vma && (regs->iaoq[0] >= vma->vm_start)
1864- && (vma->vm_flags & VM_EXEC)) {
1865-
1866+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
1867 fault_address = regs->iaoq[0];
1868 fault_space = regs->iasq[0];
1869
1870diff -urNp linux-2.6.32.46/arch/parisc/mm/fault.c linux-2.6.32.46/arch/parisc/mm/fault.c
1871--- linux-2.6.32.46/arch/parisc/mm/fault.c 2011-03-27 14:31:47.000000000 -0400
1872+++ linux-2.6.32.46/arch/parisc/mm/fault.c 2011-04-17 15:56:45.000000000 -0400
1873@@ -15,6 +15,7 @@
1874 #include <linux/sched.h>
1875 #include <linux/interrupt.h>
1876 #include <linux/module.h>
1877+#include <linux/unistd.h>
1878
1879 #include <asm/uaccess.h>
1880 #include <asm/traps.h>
1881@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, ex
1882 static unsigned long
1883 parisc_acctyp(unsigned long code, unsigned int inst)
1884 {
1885- if (code == 6 || code == 16)
1886+ if (code == 6 || code == 7 || code == 16)
1887 return VM_EXEC;
1888
1889 switch (inst & 0xf0000000) {
1890@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsign
1891 }
1892 #endif
1893
1894+#ifdef CONFIG_PAX_PAGEEXEC
1895+/*
1896+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
1897+ *
1898+ * returns 1 when task should be killed
1899+ * 2 when rt_sigreturn trampoline was detected
1900+ * 3 when unpatched PLT trampoline was detected
1901+ */
1902+static int pax_handle_fetch_fault(struct pt_regs *regs)
1903+{
1904+
1905+#ifdef CONFIG_PAX_EMUPLT
1906+ int err;
1907+
1908+ do { /* PaX: unpatched PLT emulation */
1909+ unsigned int bl, depwi;
1910+
1911+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
1912+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
1913+
1914+ if (err)
1915+ break;
1916+
1917+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
1918+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
1919+
1920+ err = get_user(ldw, (unsigned int *)addr);
1921+ err |= get_user(bv, (unsigned int *)(addr+4));
1922+ err |= get_user(ldw2, (unsigned int *)(addr+8));
1923+
1924+ if (err)
1925+ break;
1926+
1927+ if (ldw == 0x0E801096U &&
1928+ bv == 0xEAC0C000U &&
1929+ ldw2 == 0x0E881095U)
1930+ {
1931+ unsigned int resolver, map;
1932+
1933+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
1934+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
1935+ if (err)
1936+ break;
1937+
1938+ regs->gr[20] = instruction_pointer(regs)+8;
1939+ regs->gr[21] = map;
1940+ regs->gr[22] = resolver;
1941+ regs->iaoq[0] = resolver | 3UL;
1942+ regs->iaoq[1] = regs->iaoq[0] + 4;
1943+ return 3;
1944+ }
1945+ }
1946+ } while (0);
1947+#endif
1948+
1949+#ifdef CONFIG_PAX_EMUTRAMP
1950+
1951+#ifndef CONFIG_PAX_EMUSIGRT
1952+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
1953+ return 1;
1954+#endif
1955+
1956+ do { /* PaX: rt_sigreturn emulation */
1957+ unsigned int ldi1, ldi2, bel, nop;
1958+
1959+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
1960+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
1961+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
1962+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
1963+
1964+ if (err)
1965+ break;
1966+
1967+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
1968+ ldi2 == 0x3414015AU &&
1969+ bel == 0xE4008200U &&
1970+ nop == 0x08000240U)
1971+ {
1972+ regs->gr[25] = (ldi1 & 2) >> 1;
1973+ regs->gr[20] = __NR_rt_sigreturn;
1974+ regs->gr[31] = regs->iaoq[1] + 16;
1975+ regs->sr[0] = regs->iasq[1];
1976+ regs->iaoq[0] = 0x100UL;
1977+ regs->iaoq[1] = regs->iaoq[0] + 4;
1978+ regs->iasq[0] = regs->sr[2];
1979+ regs->iasq[1] = regs->sr[2];
1980+ return 2;
1981+ }
1982+ } while (0);
1983+#endif
1984+
1985+ return 1;
1986+}
1987+
1988+void pax_report_insns(void *pc, void *sp)
1989+{
1990+ unsigned long i;
1991+
1992+ printk(KERN_ERR "PAX: bytes at PC: ");
1993+ for (i = 0; i < 5; i++) {
1994+ unsigned int c;
1995+ if (get_user(c, (unsigned int *)pc+i))
1996+ printk(KERN_CONT "???????? ");
1997+ else
1998+ printk(KERN_CONT "%08x ", c);
1999+ }
2000+ printk("\n");
2001+}
2002+#endif
2003+
2004 int fixup_exception(struct pt_regs *regs)
2005 {
2006 const struct exception_table_entry *fix;
2007@@ -192,8 +303,33 @@ good_area:
2008
2009 acc_type = parisc_acctyp(code,regs->iir);
2010
2011- if ((vma->vm_flags & acc_type) != acc_type)
2012+ if ((vma->vm_flags & acc_type) != acc_type) {
2013+
2014+#ifdef CONFIG_PAX_PAGEEXEC
2015+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
2016+ (address & ~3UL) == instruction_pointer(regs))
2017+ {
2018+ up_read(&mm->mmap_sem);
2019+ switch (pax_handle_fetch_fault(regs)) {
2020+
2021+#ifdef CONFIG_PAX_EMUPLT
2022+ case 3:
2023+ return;
2024+#endif
2025+
2026+#ifdef CONFIG_PAX_EMUTRAMP
2027+ case 2:
2028+ return;
2029+#endif
2030+
2031+ }
2032+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
2033+ do_group_exit(SIGKILL);
2034+ }
2035+#endif
2036+
2037 goto bad_area;
2038+ }
2039
2040 /*
2041 * If for any reason at all we couldn't handle the fault, make
2042diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/device.h linux-2.6.32.46/arch/powerpc/include/asm/device.h
2043--- linux-2.6.32.46/arch/powerpc/include/asm/device.h 2011-03-27 14:31:47.000000000 -0400
2044+++ linux-2.6.32.46/arch/powerpc/include/asm/device.h 2011-04-17 15:56:45.000000000 -0400
2045@@ -14,7 +14,7 @@ struct dev_archdata {
2046 struct device_node *of_node;
2047
2048 /* DMA operations on that device */
2049- struct dma_map_ops *dma_ops;
2050+ const struct dma_map_ops *dma_ops;
2051
2052 /*
2053 * When an iommu is in use, dma_data is used as a ptr to the base of the
2054diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h
2055--- linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400
2056+++ linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15:56:45.000000000 -0400
2057@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
2058 #ifdef CONFIG_PPC64
2059 extern struct dma_map_ops dma_iommu_ops;
2060 #endif
2061-extern struct dma_map_ops dma_direct_ops;
2062+extern const struct dma_map_ops dma_direct_ops;
2063
2064-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
2065+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
2066 {
2067 /* We don't handle the NULL dev case for ISA for now. We could
2068 * do it via an out of line call but it is not needed for now. The
2069@@ -84,7 +84,7 @@ static inline struct dma_map_ops *get_dm
2070 return dev->archdata.dma_ops;
2071 }
2072
2073-static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
2074+static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
2075 {
2076 dev->archdata.dma_ops = ops;
2077 }
2078@@ -118,7 +118,7 @@ static inline void set_dma_offset(struct
2079
2080 static inline int dma_supported(struct device *dev, u64 mask)
2081 {
2082- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2083+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2084
2085 if (unlikely(dma_ops == NULL))
2086 return 0;
2087@@ -132,7 +132,7 @@ static inline int dma_supported(struct d
2088
2089 static inline int dma_set_mask(struct device *dev, u64 dma_mask)
2090 {
2091- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2092+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2093
2094 if (unlikely(dma_ops == NULL))
2095 return -EIO;
2096@@ -147,7 +147,7 @@ static inline int dma_set_mask(struct de
2097 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
2098 dma_addr_t *dma_handle, gfp_t flag)
2099 {
2100- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2101+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2102 void *cpu_addr;
2103
2104 BUG_ON(!dma_ops);
2105@@ -162,7 +162,7 @@ static inline void *dma_alloc_coherent(s
2106 static inline void dma_free_coherent(struct device *dev, size_t size,
2107 void *cpu_addr, dma_addr_t dma_handle)
2108 {
2109- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2110+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2111
2112 BUG_ON(!dma_ops);
2113
2114@@ -173,7 +173,7 @@ static inline void dma_free_coherent(str
2115
2116 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
2117 {
2118- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2119+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2120
2121 if (dma_ops->mapping_error)
2122 return dma_ops->mapping_error(dev, dma_addr);
2123diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/elf.h linux-2.6.32.46/arch/powerpc/include/asm/elf.h
2124--- linux-2.6.32.46/arch/powerpc/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
2125+++ linux-2.6.32.46/arch/powerpc/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400
2126@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
2127 the loader. We need to make sure that it is out of the way of the program
2128 that it will "exec", and that there is sufficient room for the brk. */
2129
2130-extern unsigned long randomize_et_dyn(unsigned long base);
2131-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
2132+#define ELF_ET_DYN_BASE (0x20000000)
2133+
2134+#ifdef CONFIG_PAX_ASLR
2135+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
2136+
2137+#ifdef __powerpc64__
2138+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 16 : 28)
2139+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 16 : 28)
2140+#else
2141+#define PAX_DELTA_MMAP_LEN 15
2142+#define PAX_DELTA_STACK_LEN 15
2143+#endif
2144+#endif
2145
2146 /*
2147 * Our registers are always unsigned longs, whether we're a 32 bit
2148@@ -275,9 +286,6 @@ extern int arch_setup_additional_pages(s
2149 (0x7ff >> (PAGE_SHIFT - 12)) : \
2150 (0x3ffff >> (PAGE_SHIFT - 12)))
2151
2152-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2153-#define arch_randomize_brk arch_randomize_brk
2154-
2155 #endif /* __KERNEL__ */
2156
2157 /*
2158diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/iommu.h linux-2.6.32.46/arch/powerpc/include/asm/iommu.h
2159--- linux-2.6.32.46/arch/powerpc/include/asm/iommu.h 2011-03-27 14:31:47.000000000 -0400
2160+++ linux-2.6.32.46/arch/powerpc/include/asm/iommu.h 2011-04-17 15:56:45.000000000 -0400
2161@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
2162 extern void iommu_init_early_dart(void);
2163 extern void iommu_init_early_pasemi(void);
2164
2165+/* dma-iommu.c */
2166+extern int dma_iommu_dma_supported(struct device *dev, u64 mask);
2167+
2168 #ifdef CONFIG_PCI
2169 extern void pci_iommu_init(void);
2170 extern void pci_direct_iommu_init(void);
2171diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h
2172--- linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400
2173+++ linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400
2174@@ -26,6 +26,7 @@ enum km_type {
2175 KM_SOFTIRQ1,
2176 KM_PPC_SYNC_PAGE,
2177 KM_PPC_SYNC_ICACHE,
2178+ KM_CLEARPAGE,
2179 KM_TYPE_NR
2180 };
2181
2182diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page_64.h linux-2.6.32.46/arch/powerpc/include/asm/page_64.h
2183--- linux-2.6.32.46/arch/powerpc/include/asm/page_64.h 2011-03-27 14:31:47.000000000 -0400
2184+++ linux-2.6.32.46/arch/powerpc/include/asm/page_64.h 2011-04-17 15:56:45.000000000 -0400
2185@@ -180,15 +180,18 @@ do { \
2186 * stack by default, so in the absense of a PT_GNU_STACK program header
2187 * we turn execute permission off.
2188 */
2189-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
2190- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2191+#define VM_STACK_DEFAULT_FLAGS32 \
2192+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
2193+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2194
2195 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
2196 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2197
2198+#ifndef CONFIG_PAX_PAGEEXEC
2199 #define VM_STACK_DEFAULT_FLAGS \
2200 (test_thread_flag(TIF_32BIT) ? \
2201 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
2202+#endif
2203
2204 #include <asm-generic/getorder.h>
2205
2206diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page.h linux-2.6.32.46/arch/powerpc/include/asm/page.h
2207--- linux-2.6.32.46/arch/powerpc/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400
2208+++ linux-2.6.32.46/arch/powerpc/include/asm/page.h 2011-08-21 16:07:39.000000000 -0400
2209@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
2210 * and needs to be executable. This means the whole heap ends
2211 * up being executable.
2212 */
2213-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
2214- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2215+#define VM_DATA_DEFAULT_FLAGS32 \
2216+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
2217+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2218
2219 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
2220 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2221@@ -145,6 +146,9 @@ extern phys_addr_t kernstart_addr;
2222 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
2223 #endif
2224
2225+#define ktla_ktva(addr) (addr)
2226+#define ktva_ktla(addr) (addr)
2227+
2228 #ifndef __ASSEMBLY__
2229
2230 #undef STRICT_MM_TYPECHECKS
2231diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pci.h linux-2.6.32.46/arch/powerpc/include/asm/pci.h
2232--- linux-2.6.32.46/arch/powerpc/include/asm/pci.h 2011-03-27 14:31:47.000000000 -0400
2233+++ linux-2.6.32.46/arch/powerpc/include/asm/pci.h 2011-04-17 15:56:45.000000000 -0400
2234@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
2235 }
2236
2237 #ifdef CONFIG_PCI
2238-extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);
2239-extern struct dma_map_ops *get_pci_dma_ops(void);
2240+extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
2241+extern const struct dma_map_ops *get_pci_dma_ops(void);
2242 #else /* CONFIG_PCI */
2243 #define set_pci_dma_ops(d)
2244 #define get_pci_dma_ops() NULL
2245diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h
2246--- linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400
2247+++ linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400
2248@@ -2,6 +2,7 @@
2249 #define _ASM_POWERPC_PGTABLE_H
2250 #ifdef __KERNEL__
2251
2252+#include <linux/const.h>
2253 #ifndef __ASSEMBLY__
2254 #include <asm/processor.h> /* For TASK_SIZE */
2255 #include <asm/mmu.h>
2256diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h
2257--- linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h 2011-03-27 14:31:47.000000000 -0400
2258+++ linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:56:45.000000000 -0400
2259@@ -21,6 +21,7 @@
2260 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
2261 #define _PAGE_USER 0x004 /* usermode access allowed */
2262 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
2263+#define _PAGE_EXEC _PAGE_GUARDED
2264 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
2265 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
2266 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
2267diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h
2268--- linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h 2011-03-27 14:31:47.000000000 -0400
2269+++ linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h 2011-08-21 15:53:58.000000000 -0400
2270@@ -103,7 +103,7 @@ extern unsigned long profile_pc(struct p
2271 } while(0)
2272
2273 struct task_struct;
2274-extern unsigned long ptrace_get_reg(struct task_struct *task, int regno);
2275+extern unsigned long ptrace_get_reg(struct task_struct *task, unsigned int regno);
2276 extern int ptrace_put_reg(struct task_struct *task, int regno,
2277 unsigned long data);
2278
2279diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/reg.h linux-2.6.32.46/arch/powerpc/include/asm/reg.h
2280--- linux-2.6.32.46/arch/powerpc/include/asm/reg.h 2011-03-27 14:31:47.000000000 -0400
2281+++ linux-2.6.32.46/arch/powerpc/include/asm/reg.h 2011-04-17 15:56:45.000000000 -0400
2282@@ -191,6 +191,7 @@
2283 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
2284 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
2285 #define DSISR_NOHPTE 0x40000000 /* no translation found */
2286+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
2287 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
2288 #define DSISR_ISSTORE 0x02000000 /* access was a store */
2289 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
2290diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h
2291--- linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h 2011-03-27 14:31:47.000000000 -0400
2292+++ linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:56:45.000000000 -0400
2293@@ -13,7 +13,7 @@
2294
2295 #include <linux/swiotlb.h>
2296
2297-extern struct dma_map_ops swiotlb_dma_ops;
2298+extern const struct dma_map_ops swiotlb_dma_ops;
2299
2300 static inline void dma_mark_clean(void *addr, size_t size) {}
2301
2302diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/system.h linux-2.6.32.46/arch/powerpc/include/asm/system.h
2303--- linux-2.6.32.46/arch/powerpc/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400
2304+++ linux-2.6.32.46/arch/powerpc/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400
2305@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
2306 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
2307 #endif
2308
2309-extern unsigned long arch_align_stack(unsigned long sp);
2310+#define arch_align_stack(x) ((x) & ~0xfUL)
2311
2312 /* Used in very early kernel initialization. */
2313 extern unsigned long reloc_offset(void);
2314diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h
2315--- linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400
2316+++ linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400
2317@@ -13,6 +13,8 @@
2318 #define VERIFY_READ 0
2319 #define VERIFY_WRITE 1
2320
2321+extern void check_object_size(const void *ptr, unsigned long n, bool to);
2322+
2323 /*
2324 * The fs value determines whether argument validity checking should be
2325 * performed or not. If get_fs() == USER_DS, checking is performed, with
2326@@ -327,52 +329,6 @@ do { \
2327 extern unsigned long __copy_tofrom_user(void __user *to,
2328 const void __user *from, unsigned long size);
2329
2330-#ifndef __powerpc64__
2331-
2332-static inline unsigned long copy_from_user(void *to,
2333- const void __user *from, unsigned long n)
2334-{
2335- unsigned long over;
2336-
2337- if (access_ok(VERIFY_READ, from, n))
2338- return __copy_tofrom_user((__force void __user *)to, from, n);
2339- if ((unsigned long)from < TASK_SIZE) {
2340- over = (unsigned long)from + n - TASK_SIZE;
2341- return __copy_tofrom_user((__force void __user *)to, from,
2342- n - over) + over;
2343- }
2344- return n;
2345-}
2346-
2347-static inline unsigned long copy_to_user(void __user *to,
2348- const void *from, unsigned long n)
2349-{
2350- unsigned long over;
2351-
2352- if (access_ok(VERIFY_WRITE, to, n))
2353- return __copy_tofrom_user(to, (__force void __user *)from, n);
2354- if ((unsigned long)to < TASK_SIZE) {
2355- over = (unsigned long)to + n - TASK_SIZE;
2356- return __copy_tofrom_user(to, (__force void __user *)from,
2357- n - over) + over;
2358- }
2359- return n;
2360-}
2361-
2362-#else /* __powerpc64__ */
2363-
2364-#define __copy_in_user(to, from, size) \
2365- __copy_tofrom_user((to), (from), (size))
2366-
2367-extern unsigned long copy_from_user(void *to, const void __user *from,
2368- unsigned long n);
2369-extern unsigned long copy_to_user(void __user *to, const void *from,
2370- unsigned long n);
2371-extern unsigned long copy_in_user(void __user *to, const void __user *from,
2372- unsigned long n);
2373-
2374-#endif /* __powerpc64__ */
2375-
2376 static inline unsigned long __copy_from_user_inatomic(void *to,
2377 const void __user *from, unsigned long n)
2378 {
2379@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_
2380 if (ret == 0)
2381 return 0;
2382 }
2383+
2384+ if (!__builtin_constant_p(n))
2385+ check_object_size(to, n, false);
2386+
2387 return __copy_tofrom_user((__force void __user *)to, from, n);
2388 }
2389
2390@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_us
2391 if (ret == 0)
2392 return 0;
2393 }
2394+
2395+ if (!__builtin_constant_p(n))
2396+ check_object_size(from, n, true);
2397+
2398 return __copy_tofrom_user(to, (__force const void __user *)from, n);
2399 }
2400
2401@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_us
2402 return __copy_to_user_inatomic(to, from, size);
2403 }
2404
2405+#ifndef __powerpc64__
2406+
2407+static inline unsigned long __must_check copy_from_user(void *to,
2408+ const void __user *from, unsigned long n)
2409+{
2410+ unsigned long over;
2411+
2412+ if ((long)n < 0)
2413+ return n;
2414+
2415+ if (access_ok(VERIFY_READ, from, n)) {
2416+ if (!__builtin_constant_p(n))
2417+ check_object_size(to, n, false);
2418+ return __copy_tofrom_user((__force void __user *)to, from, n);
2419+ }
2420+ if ((unsigned long)from < TASK_SIZE) {
2421+ over = (unsigned long)from + n - TASK_SIZE;
2422+ if (!__builtin_constant_p(n - over))
2423+ check_object_size(to, n - over, false);
2424+ return __copy_tofrom_user((__force void __user *)to, from,
2425+ n - over) + over;
2426+ }
2427+ return n;
2428+}
2429+
2430+static inline unsigned long __must_check copy_to_user(void __user *to,
2431+ const void *from, unsigned long n)
2432+{
2433+ unsigned long over;
2434+
2435+ if ((long)n < 0)
2436+ return n;
2437+
2438+ if (access_ok(VERIFY_WRITE, to, n)) {
2439+ if (!__builtin_constant_p(n))
2440+ check_object_size(from, n, true);
2441+ return __copy_tofrom_user(to, (__force void __user *)from, n);
2442+ }
2443+ if ((unsigned long)to < TASK_SIZE) {
2444+ over = (unsigned long)to + n - TASK_SIZE;
2445+ if (!__builtin_constant_p(n))
2446+ check_object_size(from, n - over, true);
2447+ return __copy_tofrom_user(to, (__force void __user *)from,
2448+ n - over) + over;
2449+ }
2450+ return n;
2451+}
2452+
2453+#else /* __powerpc64__ */
2454+
2455+#define __copy_in_user(to, from, size) \
2456+ __copy_tofrom_user((to), (from), (size))
2457+
2458+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2459+{
2460+ if ((long)n < 0 || n > INT_MAX)
2461+ return n;
2462+
2463+ if (!__builtin_constant_p(n))
2464+ check_object_size(to, n, false);
2465+
2466+ if (likely(access_ok(VERIFY_READ, from, n)))
2467+ n = __copy_from_user(to, from, n);
2468+ else
2469+ memset(to, 0, n);
2470+ return n;
2471+}
2472+
2473+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2474+{
2475+ if ((long)n < 0 || n > INT_MAX)
2476+ return n;
2477+
2478+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
2479+ if (!__builtin_constant_p(n))
2480+ check_object_size(from, n, true);
2481+ n = __copy_to_user(to, from, n);
2482+ }
2483+ return n;
2484+}
2485+
2486+extern unsigned long copy_in_user(void __user *to, const void __user *from,
2487+ unsigned long n);
2488+
2489+#endif /* __powerpc64__ */
2490+
2491 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2492
2493 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2494diff -urNp linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c
2495--- linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c 2011-03-27 14:31:47.000000000 -0400
2496+++ linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c 2011-04-17 15:56:45.000000000 -0400
2497@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
2498 &cache_assoc_attr,
2499 };
2500
2501-static struct sysfs_ops cache_index_ops = {
2502+static const struct sysfs_ops cache_index_ops = {
2503 .show = cache_index_show,
2504 };
2505
2506diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma.c linux-2.6.32.46/arch/powerpc/kernel/dma.c
2507--- linux-2.6.32.46/arch/powerpc/kernel/dma.c 2011-03-27 14:31:47.000000000 -0400
2508+++ linux-2.6.32.46/arch/powerpc/kernel/dma.c 2011-04-17 15:56:45.000000000 -0400
2509@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
2510 }
2511 #endif
2512
2513-struct dma_map_ops dma_direct_ops = {
2514+const struct dma_map_ops dma_direct_ops = {
2515 .alloc_coherent = dma_direct_alloc_coherent,
2516 .free_coherent = dma_direct_free_coherent,
2517 .map_sg = dma_direct_map_sg,
2518diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c
2519--- linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c 2011-03-27 14:31:47.000000000 -0400
2520+++ linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:56:45.000000000 -0400
2521@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
2522 }
2523
2524 /* We support DMA to/from any memory page via the iommu */
2525-static int dma_iommu_dma_supported(struct device *dev, u64 mask)
2526+int dma_iommu_dma_supported(struct device *dev, u64 mask)
2527 {
2528 struct iommu_table *tbl = get_iommu_table_base(dev);
2529
2530diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c
2531--- linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c 2011-03-27 14:31:47.000000000 -0400
2532+++ linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:56:45.000000000 -0400
2533@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
2534 * map_page, and unmap_page on highmem, use normal dma_ops
2535 * for everything else.
2536 */
2537-struct dma_map_ops swiotlb_dma_ops = {
2538+const struct dma_map_ops swiotlb_dma_ops = {
2539 .alloc_coherent = dma_direct_alloc_coherent,
2540 .free_coherent = dma_direct_free_coherent,
2541 .map_sg = swiotlb_map_sg_attrs,
2542diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S
2543--- linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S 2011-03-27 14:31:47.000000000 -0400
2544+++ linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:56:45.000000000 -0400
2545@@ -455,6 +455,7 @@ storage_fault_common:
2546 std r14,_DAR(r1)
2547 std r15,_DSISR(r1)
2548 addi r3,r1,STACK_FRAME_OVERHEAD
2549+ bl .save_nvgprs
2550 mr r4,r14
2551 mr r5,r15
2552 ld r14,PACA_EXGEN+EX_R14(r13)
2553@@ -464,8 +465,7 @@ storage_fault_common:
2554 cmpdi r3,0
2555 bne- 1f
2556 b .ret_from_except_lite
2557-1: bl .save_nvgprs
2558- mr r5,r3
2559+1: mr r5,r3
2560 addi r3,r1,STACK_FRAME_OVERHEAD
2561 ld r4,_DAR(r1)
2562 bl .bad_page_fault
2563diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S
2564--- linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S 2011-03-27 14:31:47.000000000 -0400
2565+++ linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:56:45.000000000 -0400
2566@@ -818,10 +818,10 @@ handle_page_fault:
2567 11: ld r4,_DAR(r1)
2568 ld r5,_DSISR(r1)
2569 addi r3,r1,STACK_FRAME_OVERHEAD
2570+ bl .save_nvgprs
2571 bl .do_page_fault
2572 cmpdi r3,0
2573 beq+ 13f
2574- bl .save_nvgprs
2575 mr r5,r3
2576 addi r3,r1,STACK_FRAME_OVERHEAD
2577 lwz r4,_DAR(r1)
2578diff -urNp linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c
2579--- linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c 2011-03-27 14:31:47.000000000 -0400
2580+++ linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:56:45.000000000 -0400
2581@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
2582 return 1;
2583 }
2584
2585-static struct dma_map_ops ibmebus_dma_ops = {
2586+static const struct dma_map_ops ibmebus_dma_ops = {
2587 .alloc_coherent = ibmebus_alloc_coherent,
2588 .free_coherent = ibmebus_free_coherent,
2589 .map_sg = ibmebus_map_sg,
2590diff -urNp linux-2.6.32.46/arch/powerpc/kernel/kgdb.c linux-2.6.32.46/arch/powerpc/kernel/kgdb.c
2591--- linux-2.6.32.46/arch/powerpc/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400
2592+++ linux-2.6.32.46/arch/powerpc/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400
2593@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
2594 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
2595 return 0;
2596
2597- if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
2598+ if (*(u32 *) (regs->nip) == *(const u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
2599 regs->nip += 4;
2600
2601 return 1;
2602@@ -353,7 +353,7 @@ int kgdb_arch_handle_exception(int vecto
2603 /*
2604 * Global data
2605 */
2606-struct kgdb_arch arch_kgdb_ops = {
2607+const struct kgdb_arch arch_kgdb_ops = {
2608 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
2609 };
2610
2611diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module_32.c linux-2.6.32.46/arch/powerpc/kernel/module_32.c
2612--- linux-2.6.32.46/arch/powerpc/kernel/module_32.c 2011-03-27 14:31:47.000000000 -0400
2613+++ linux-2.6.32.46/arch/powerpc/kernel/module_32.c 2011-04-17 15:56:45.000000000 -0400
2614@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
2615 me->arch.core_plt_section = i;
2616 }
2617 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
2618- printk("Module doesn't contain .plt or .init.plt sections.\n");
2619+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
2620 return -ENOEXEC;
2621 }
2622
2623@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
2624
2625 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
2626 /* Init, or core PLT? */
2627- if (location >= mod->module_core
2628- && location < mod->module_core + mod->core_size)
2629+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
2630+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
2631 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
2632- else
2633+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
2634+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
2635 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
2636+ else {
2637+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
2638+ return ~0UL;
2639+ }
2640
2641 /* Find this entry, or if that fails, the next avail. entry */
2642 while (entry->jump[0]) {
2643diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module.c linux-2.6.32.46/arch/powerpc/kernel/module.c
2644--- linux-2.6.32.46/arch/powerpc/kernel/module.c 2011-03-27 14:31:47.000000000 -0400
2645+++ linux-2.6.32.46/arch/powerpc/kernel/module.c 2011-04-17 15:56:45.000000000 -0400
2646@@ -31,11 +31,24 @@
2647
2648 LIST_HEAD(module_bug_list);
2649
2650+#ifdef CONFIG_PAX_KERNEXEC
2651 void *module_alloc(unsigned long size)
2652 {
2653 if (size == 0)
2654 return NULL;
2655
2656+ return vmalloc(size);
2657+}
2658+
2659+void *module_alloc_exec(unsigned long size)
2660+#else
2661+void *module_alloc(unsigned long size)
2662+#endif
2663+
2664+{
2665+ if (size == 0)
2666+ return NULL;
2667+
2668 return vmalloc_exec(size);
2669 }
2670
2671@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi
2672 vfree(module_region);
2673 }
2674
2675+#ifdef CONFIG_PAX_KERNEXEC
2676+void module_free_exec(struct module *mod, void *module_region)
2677+{
2678+ module_free(mod, module_region);
2679+}
2680+#endif
2681+
2682 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
2683 const Elf_Shdr *sechdrs,
2684 const char *name)
2685diff -urNp linux-2.6.32.46/arch/powerpc/kernel/pci-common.c linux-2.6.32.46/arch/powerpc/kernel/pci-common.c
2686--- linux-2.6.32.46/arch/powerpc/kernel/pci-common.c 2011-03-27 14:31:47.000000000 -0400
2687+++ linux-2.6.32.46/arch/powerpc/kernel/pci-common.c 2011-04-17 15:56:45.000000000 -0400
2688@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
2689 unsigned int ppc_pci_flags = 0;
2690
2691
2692-static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
2693+static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
2694
2695-void set_pci_dma_ops(struct dma_map_ops *dma_ops)
2696+void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
2697 {
2698 pci_dma_ops = dma_ops;
2699 }
2700
2701-struct dma_map_ops *get_pci_dma_ops(void)
2702+const struct dma_map_ops *get_pci_dma_ops(void)
2703 {
2704 return pci_dma_ops;
2705 }
2706diff -urNp linux-2.6.32.46/arch/powerpc/kernel/process.c linux-2.6.32.46/arch/powerpc/kernel/process.c
2707--- linux-2.6.32.46/arch/powerpc/kernel/process.c 2011-03-27 14:31:47.000000000 -0400
2708+++ linux-2.6.32.46/arch/powerpc/kernel/process.c 2011-04-17 15:56:45.000000000 -0400
2709@@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
2710 * Lookup NIP late so we have the best change of getting the
2711 * above info out without failing
2712 */
2713- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
2714- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
2715+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
2716+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
2717 #endif
2718 show_stack(current, (unsigned long *) regs->gpr[1]);
2719 if (!user_mode(regs))
2720@@ -1034,10 +1034,10 @@ void show_stack(struct task_struct *tsk,
2721 newsp = stack[0];
2722 ip = stack[STACK_FRAME_LR_SAVE];
2723 if (!firstframe || ip != lr) {
2724- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
2725+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
2726 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
2727 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
2728- printk(" (%pS)",
2729+ printk(" (%pA)",
2730 (void *)current->ret_stack[curr_frame].ret);
2731 curr_frame--;
2732 }
2733@@ -1057,7 +1057,7 @@ void show_stack(struct task_struct *tsk,
2734 struct pt_regs *regs = (struct pt_regs *)
2735 (sp + STACK_FRAME_OVERHEAD);
2736 lr = regs->link;
2737- printk("--- Exception: %lx at %pS\n LR = %pS\n",
2738+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
2739 regs->trap, (void *)regs->nip, (void *)lr);
2740 firstframe = 1;
2741 }
2742@@ -1134,58 +1134,3 @@ void thread_info_cache_init(void)
2743 }
2744
2745 #endif /* THREAD_SHIFT < PAGE_SHIFT */
2746-
2747-unsigned long arch_align_stack(unsigned long sp)
2748-{
2749- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2750- sp -= get_random_int() & ~PAGE_MASK;
2751- return sp & ~0xf;
2752-}
2753-
2754-static inline unsigned long brk_rnd(void)
2755-{
2756- unsigned long rnd = 0;
2757-
2758- /* 8MB for 32bit, 1GB for 64bit */
2759- if (is_32bit_task())
2760- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
2761- else
2762- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
2763-
2764- return rnd << PAGE_SHIFT;
2765-}
2766-
2767-unsigned long arch_randomize_brk(struct mm_struct *mm)
2768-{
2769- unsigned long base = mm->brk;
2770- unsigned long ret;
2771-
2772-#ifdef CONFIG_PPC_STD_MMU_64
2773- /*
2774- * If we are using 1TB segments and we are allowed to randomise
2775- * the heap, we can put it above 1TB so it is backed by a 1TB
2776- * segment. Otherwise the heap will be in the bottom 1TB
2777- * which always uses 256MB segments and this may result in a
2778- * performance penalty.
2779- */
2780- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
2781- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
2782-#endif
2783-
2784- ret = PAGE_ALIGN(base + brk_rnd());
2785-
2786- if (ret < mm->brk)
2787- return mm->brk;
2788-
2789- return ret;
2790-}
2791-
2792-unsigned long randomize_et_dyn(unsigned long base)
2793-{
2794- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
2795-
2796- if (ret < base)
2797- return base;
2798-
2799- return ret;
2800-}
2801diff -urNp linux-2.6.32.46/arch/powerpc/kernel/ptrace.c linux-2.6.32.46/arch/powerpc/kernel/ptrace.c
2802--- linux-2.6.32.46/arch/powerpc/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400
2803+++ linux-2.6.32.46/arch/powerpc/kernel/ptrace.c 2011-08-21 15:53:39.000000000 -0400
2804@@ -86,7 +86,7 @@ static int set_user_trap(struct task_str
2805 /*
2806 * Get contents of register REGNO in task TASK.
2807 */
2808-unsigned long ptrace_get_reg(struct task_struct *task, int regno)
2809+unsigned long ptrace_get_reg(struct task_struct *task, unsigned int regno)
2810 {
2811 if (task->thread.regs == NULL)
2812 return -EIO;
2813@@ -894,7 +894,7 @@ long arch_ptrace(struct task_struct *chi
2814
2815 CHECK_FULL_REGS(child->thread.regs);
2816 if (index < PT_FPR0) {
2817- tmp = ptrace_get_reg(child, (int) index);
2818+ tmp = ptrace_get_reg(child, index);
2819 } else {
2820 flush_fp_to_thread(child);
2821 tmp = ((unsigned long *)child->thread.fpr)
2822diff -urNp linux-2.6.32.46/arch/powerpc/kernel/signal_32.c linux-2.6.32.46/arch/powerpc/kernel/signal_32.c
2823--- linux-2.6.32.46/arch/powerpc/kernel/signal_32.c 2011-03-27 14:31:47.000000000 -0400
2824+++ linux-2.6.32.46/arch/powerpc/kernel/signal_32.c 2011-04-17 15:56:45.000000000 -0400
2825@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
2826 /* Save user registers on the stack */
2827 frame = &rt_sf->uc.uc_mcontext;
2828 addr = frame;
2829- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
2830+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
2831 if (save_user_regs(regs, frame, 0, 1))
2832 goto badframe;
2833 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2834diff -urNp linux-2.6.32.46/arch/powerpc/kernel/signal_64.c linux-2.6.32.46/arch/powerpc/kernel/signal_64.c
2835--- linux-2.6.32.46/arch/powerpc/kernel/signal_64.c 2011-03-27 14:31:47.000000000 -0400
2836+++ linux-2.6.32.46/arch/powerpc/kernel/signal_64.c 2011-04-17 15:56:45.000000000 -0400
2837@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
2838 current->thread.fpscr.val = 0;
2839
2840 /* Set up to return from userspace. */
2841- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
2842+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
2843 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2844 } else {
2845 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2846diff -urNp linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c
2847--- linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c 2011-03-27 14:31:47.000000000 -0400
2848+++ linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c 2011-04-17 15:56:45.000000000 -0400
2849@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
2850 if (oldlenp) {
2851 if (!error) {
2852 if (get_user(oldlen, oldlenp) ||
2853- put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)))
2854+ put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)) ||
2855+ copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused)))
2856 error = -EFAULT;
2857 }
2858- copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused));
2859 }
2860 return error;
2861 }
2862diff -urNp linux-2.6.32.46/arch/powerpc/kernel/traps.c linux-2.6.32.46/arch/powerpc/kernel/traps.c
2863--- linux-2.6.32.46/arch/powerpc/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400
2864+++ linux-2.6.32.46/arch/powerpc/kernel/traps.c 2011-06-13 21:33:37.000000000 -0400
2865@@ -99,6 +99,8 @@ static void pmac_backlight_unblank(void)
2866 static inline void pmac_backlight_unblank(void) { }
2867 #endif
2868
2869+extern void gr_handle_kernel_exploit(void);
2870+
2871 int die(const char *str, struct pt_regs *regs, long err)
2872 {
2873 static struct {
2874@@ -168,6 +170,8 @@ int die(const char *str, struct pt_regs
2875 if (panic_on_oops)
2876 panic("Fatal exception");
2877
2878+ gr_handle_kernel_exploit();
2879+
2880 oops_exit();
2881 do_exit(err);
2882
2883diff -urNp linux-2.6.32.46/arch/powerpc/kernel/vdso.c linux-2.6.32.46/arch/powerpc/kernel/vdso.c
2884--- linux-2.6.32.46/arch/powerpc/kernel/vdso.c 2011-03-27 14:31:47.000000000 -0400
2885+++ linux-2.6.32.46/arch/powerpc/kernel/vdso.c 2011-04-17 15:56:45.000000000 -0400
2886@@ -36,6 +36,7 @@
2887 #include <asm/firmware.h>
2888 #include <asm/vdso.h>
2889 #include <asm/vdso_datapage.h>
2890+#include <asm/mman.h>
2891
2892 #include "setup.h"
2893
2894@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct l
2895 vdso_base = VDSO32_MBASE;
2896 #endif
2897
2898- current->mm->context.vdso_base = 0;
2899+ current->mm->context.vdso_base = ~0UL;
2900
2901 /* vDSO has a problem and was disabled, just don't "enable" it for the
2902 * process
2903@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct l
2904 vdso_base = get_unmapped_area(NULL, vdso_base,
2905 (vdso_pages << PAGE_SHIFT) +
2906 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
2907- 0, 0);
2908+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
2909 if (IS_ERR_VALUE(vdso_base)) {
2910 rc = vdso_base;
2911 goto fail_mmapsem;
2912diff -urNp linux-2.6.32.46/arch/powerpc/kernel/vio.c linux-2.6.32.46/arch/powerpc/kernel/vio.c
2913--- linux-2.6.32.46/arch/powerpc/kernel/vio.c 2011-03-27 14:31:47.000000000 -0400
2914+++ linux-2.6.32.46/arch/powerpc/kernel/vio.c 2011-04-17 15:56:45.000000000 -0400
2915@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
2916 vio_cmo_dealloc(viodev, alloc_size);
2917 }
2918
2919-struct dma_map_ops vio_dma_mapping_ops = {
2920+static const struct dma_map_ops vio_dma_mapping_ops = {
2921 .alloc_coherent = vio_dma_iommu_alloc_coherent,
2922 .free_coherent = vio_dma_iommu_free_coherent,
2923 .map_sg = vio_dma_iommu_map_sg,
2924 .unmap_sg = vio_dma_iommu_unmap_sg,
2925+ .dma_supported = dma_iommu_dma_supported,
2926 .map_page = vio_dma_iommu_map_page,
2927 .unmap_page = vio_dma_iommu_unmap_page,
2928
2929@@ -857,7 +858,6 @@ static void vio_cmo_bus_remove(struct vi
2930
2931 static void vio_cmo_set_dma_ops(struct vio_dev *viodev)
2932 {
2933- vio_dma_mapping_ops.dma_supported = dma_iommu_ops.dma_supported;
2934 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
2935 }
2936
2937diff -urNp linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c
2938--- linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c 2011-03-27 14:31:47.000000000 -0400
2939+++ linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:56:45.000000000 -0400
2940@@ -9,22 +9,6 @@
2941 #include <linux/module.h>
2942 #include <asm/uaccess.h>
2943
2944-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
2945-{
2946- if (likely(access_ok(VERIFY_READ, from, n)))
2947- n = __copy_from_user(to, from, n);
2948- else
2949- memset(to, 0, n);
2950- return n;
2951-}
2952-
2953-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
2954-{
2955- if (likely(access_ok(VERIFY_WRITE, to, n)))
2956- n = __copy_to_user(to, from, n);
2957- return n;
2958-}
2959-
2960 unsigned long copy_in_user(void __user *to, const void __user *from,
2961 unsigned long n)
2962 {
2963@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *
2964 return n;
2965 }
2966
2967-EXPORT_SYMBOL(copy_from_user);
2968-EXPORT_SYMBOL(copy_to_user);
2969 EXPORT_SYMBOL(copy_in_user);
2970
2971diff -urNp linux-2.6.32.46/arch/powerpc/Makefile linux-2.6.32.46/arch/powerpc/Makefile
2972--- linux-2.6.32.46/arch/powerpc/Makefile 2011-03-27 14:31:47.000000000 -0400
2973+++ linux-2.6.32.46/arch/powerpc/Makefile 2011-08-21 19:27:08.000000000 -0400
2974@@ -74,6 +74,8 @@ KBUILD_AFLAGS += -Iarch/$(ARCH)
2975 KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
2976 CPP = $(CC) -E $(KBUILD_CFLAGS)
2977
2978+cflags-y += -Wno-sign-compare -Wno-extra
2979+
2980 CHECKFLAGS += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
2981
2982 ifeq ($(CONFIG_PPC64),y)
2983diff -urNp linux-2.6.32.46/arch/powerpc/mm/fault.c linux-2.6.32.46/arch/powerpc/mm/fault.c
2984--- linux-2.6.32.46/arch/powerpc/mm/fault.c 2011-03-27 14:31:47.000000000 -0400
2985+++ linux-2.6.32.46/arch/powerpc/mm/fault.c 2011-04-17 15:56:45.000000000 -0400
2986@@ -30,6 +30,10 @@
2987 #include <linux/kprobes.h>
2988 #include <linux/kdebug.h>
2989 #include <linux/perf_event.h>
2990+#include <linux/slab.h>
2991+#include <linux/pagemap.h>
2992+#include <linux/compiler.h>
2993+#include <linux/unistd.h>
2994
2995 #include <asm/firmware.h>
2996 #include <asm/page.h>
2997@@ -40,6 +44,7 @@
2998 #include <asm/uaccess.h>
2999 #include <asm/tlbflush.h>
3000 #include <asm/siginfo.h>
3001+#include <asm/ptrace.h>
3002
3003
3004 #ifdef CONFIG_KPROBES
3005@@ -64,6 +69,33 @@ static inline int notify_page_fault(stru
3006 }
3007 #endif
3008
3009+#ifdef CONFIG_PAX_PAGEEXEC
3010+/*
3011+ * PaX: decide what to do with offenders (regs->nip = fault address)
3012+ *
3013+ * returns 1 when task should be killed
3014+ */
3015+static int pax_handle_fetch_fault(struct pt_regs *regs)
3016+{
3017+ return 1;
3018+}
3019+
3020+void pax_report_insns(void *pc, void *sp)
3021+{
3022+ unsigned long i;
3023+
3024+ printk(KERN_ERR "PAX: bytes at PC: ");
3025+ for (i = 0; i < 5; i++) {
3026+ unsigned int c;
3027+ if (get_user(c, (unsigned int __user *)pc+i))
3028+ printk(KERN_CONT "???????? ");
3029+ else
3030+ printk(KERN_CONT "%08x ", c);
3031+ }
3032+ printk("\n");
3033+}
3034+#endif
3035+
3036 /*
3037 * Check whether the instruction at regs->nip is a store using
3038 * an update addressing form which will update r1.
3039@@ -134,7 +166,7 @@ int __kprobes do_page_fault(struct pt_re
3040 * indicate errors in DSISR but can validly be set in SRR1.
3041 */
3042 if (trap == 0x400)
3043- error_code &= 0x48200000;
3044+ error_code &= 0x58200000;
3045 else
3046 is_write = error_code & DSISR_ISSTORE;
3047 #else
3048@@ -250,7 +282,7 @@ good_area:
3049 * "undefined". Of those that can be set, this is the only
3050 * one which seems bad.
3051 */
3052- if (error_code & 0x10000000)
3053+ if (error_code & DSISR_GUARDED)
3054 /* Guarded storage error. */
3055 goto bad_area;
3056 #endif /* CONFIG_8xx */
3057@@ -265,7 +297,7 @@ good_area:
3058 * processors use the same I/D cache coherency mechanism
3059 * as embedded.
3060 */
3061- if (error_code & DSISR_PROTFAULT)
3062+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
3063 goto bad_area;
3064 #endif /* CONFIG_PPC_STD_MMU */
3065
3066@@ -335,6 +367,23 @@ bad_area:
3067 bad_area_nosemaphore:
3068 /* User mode accesses cause a SIGSEGV */
3069 if (user_mode(regs)) {
3070+
3071+#ifdef CONFIG_PAX_PAGEEXEC
3072+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
3073+#ifdef CONFIG_PPC_STD_MMU
3074+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
3075+#else
3076+ if (is_exec && regs->nip == address) {
3077+#endif
3078+ switch (pax_handle_fetch_fault(regs)) {
3079+ }
3080+
3081+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
3082+ do_group_exit(SIGKILL);
3083+ }
3084+ }
3085+#endif
3086+
3087 _exception(SIGSEGV, regs, code, address);
3088 return 0;
3089 }
3090diff -urNp linux-2.6.32.46/arch/powerpc/mm/mem.c linux-2.6.32.46/arch/powerpc/mm/mem.c
3091--- linux-2.6.32.46/arch/powerpc/mm/mem.c 2011-03-27 14:31:47.000000000 -0400
3092+++ linux-2.6.32.46/arch/powerpc/mm/mem.c 2011-08-21 15:50:39.000000000 -0400
3093@@ -250,7 +250,7 @@ static int __init mark_nonram_nosave(voi
3094 {
3095 unsigned long lmb_next_region_start_pfn,
3096 lmb_region_max_pfn;
3097- int i;
3098+ unsigned int i;
3099
3100 for (i = 0; i < lmb.memory.cnt - 1; i++) {
3101 lmb_region_max_pfn =
3102diff -urNp linux-2.6.32.46/arch/powerpc/mm/mmap_64.c linux-2.6.32.46/arch/powerpc/mm/mmap_64.c
3103--- linux-2.6.32.46/arch/powerpc/mm/mmap_64.c 2011-03-27 14:31:47.000000000 -0400
3104+++ linux-2.6.32.46/arch/powerpc/mm/mmap_64.c 2011-04-17 15:56:45.000000000 -0400
3105@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
3106 */
3107 if (mmap_is_legacy()) {
3108 mm->mmap_base = TASK_UNMAPPED_BASE;
3109+
3110+#ifdef CONFIG_PAX_RANDMMAP
3111+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3112+ mm->mmap_base += mm->delta_mmap;
3113+#endif
3114+
3115 mm->get_unmapped_area = arch_get_unmapped_area;
3116 mm->unmap_area = arch_unmap_area;
3117 } else {
3118 mm->mmap_base = mmap_base();
3119+
3120+#ifdef CONFIG_PAX_RANDMMAP
3121+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3122+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
3123+#endif
3124+
3125 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3126 mm->unmap_area = arch_unmap_area_topdown;
3127 }
3128diff -urNp linux-2.6.32.46/arch/powerpc/mm/slice.c linux-2.6.32.46/arch/powerpc/mm/slice.c
3129--- linux-2.6.32.46/arch/powerpc/mm/slice.c 2011-03-27 14:31:47.000000000 -0400
3130+++ linux-2.6.32.46/arch/powerpc/mm/slice.c 2011-04-17 15:56:45.000000000 -0400
3131@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
3132 if ((mm->task_size - len) < addr)
3133 return 0;
3134 vma = find_vma(mm, addr);
3135- return (!vma || (addr + len) <= vma->vm_start);
3136+ return check_heap_stack_gap(vma, addr, len);
3137 }
3138
3139 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
3140@@ -256,7 +256,7 @@ full_search:
3141 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
3142 continue;
3143 }
3144- if (!vma || addr + len <= vma->vm_start) {
3145+ if (check_heap_stack_gap(vma, addr, len)) {
3146 /*
3147 * Remember the place where we stopped the search:
3148 */
3149@@ -313,10 +313,14 @@ static unsigned long slice_find_area_top
3150 }
3151 }
3152
3153- addr = mm->mmap_base;
3154- while (addr > len) {
3155+ if (mm->mmap_base < len)
3156+ addr = -ENOMEM;
3157+ else
3158+ addr = mm->mmap_base - len;
3159+
3160+ while (!IS_ERR_VALUE(addr)) {
3161 /* Go down by chunk size */
3162- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
3163+ addr = _ALIGN_DOWN(addr, 1ul << pshift);
3164
3165 /* Check for hit with different page size */
3166 mask = slice_range_to_mask(addr, len);
3167@@ -336,7 +340,7 @@ static unsigned long slice_find_area_top
3168 * return with success:
3169 */
3170 vma = find_vma(mm, addr);
3171- if (!vma || (addr + len) <= vma->vm_start) {
3172+ if (check_heap_stack_gap(vma, addr, len)) {
3173 /* remember the address as a hint for next time */
3174 if (use_cache)
3175 mm->free_area_cache = addr;
3176@@ -348,7 +352,7 @@ static unsigned long slice_find_area_top
3177 mm->cached_hole_size = vma->vm_start - addr;
3178
3179 /* try just below the current vma->vm_start */
3180- addr = vma->vm_start;
3181+ addr = skip_heap_stack_gap(vma, len);
3182 }
3183
3184 /*
3185@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(un
3186 if (fixed && addr > (mm->task_size - len))
3187 return -EINVAL;
3188
3189+#ifdef CONFIG_PAX_RANDMMAP
3190+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
3191+ addr = 0;
3192+#endif
3193+
3194 /* If hint, make sure it matches our alignment restrictions */
3195 if (!fixed && addr) {
3196 addr = _ALIGN_UP(addr, 1ul << pshift);
3197diff -urNp linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c
3198--- linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-03-27 14:31:47.000000000 -0400
3199+++ linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-04-17 15:56:45.000000000 -0400
3200@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
3201 lite5200_pm_target_state = PM_SUSPEND_ON;
3202 }
3203
3204-static struct platform_suspend_ops lite5200_pm_ops = {
3205+static const struct platform_suspend_ops lite5200_pm_ops = {
3206 .valid = lite5200_pm_valid,
3207 .begin = lite5200_pm_begin,
3208 .prepare = lite5200_pm_prepare,
3209diff -urNp linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c
3210--- linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-03-27 14:31:47.000000000 -0400
3211+++ linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-04-17 15:56:45.000000000 -0400
3212@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
3213 iounmap(mbar);
3214 }
3215
3216-static struct platform_suspend_ops mpc52xx_pm_ops = {
3217+static const struct platform_suspend_ops mpc52xx_pm_ops = {
3218 .valid = mpc52xx_pm_valid,
3219 .prepare = mpc52xx_pm_prepare,
3220 .enter = mpc52xx_pm_enter,
3221diff -urNp linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c
3222--- linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c 2011-03-27 14:31:47.000000000 -0400
3223+++ linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c 2011-04-17 15:56:45.000000000 -0400
3224@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
3225 return ret;
3226 }
3227
3228-static struct platform_suspend_ops mpc83xx_suspend_ops = {
3229+static const struct platform_suspend_ops mpc83xx_suspend_ops = {
3230 .valid = mpc83xx_suspend_valid,
3231 .begin = mpc83xx_suspend_begin,
3232 .enter = mpc83xx_suspend_enter,
3233diff -urNp linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c
3234--- linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c 2011-03-27 14:31:47.000000000 -0400
3235+++ linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:56:45.000000000 -0400
3236@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
3237
3238 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
3239
3240-struct dma_map_ops dma_iommu_fixed_ops = {
3241+const struct dma_map_ops dma_iommu_fixed_ops = {
3242 .alloc_coherent = dma_fixed_alloc_coherent,
3243 .free_coherent = dma_fixed_free_coherent,
3244 .map_sg = dma_fixed_map_sg,
3245diff -urNp linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c
3246--- linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c 2011-03-27 14:31:47.000000000 -0400
3247+++ linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 15:56:45.000000000 -0400
3248@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
3249 return mask >= DMA_BIT_MASK(32);
3250 }
3251
3252-static struct dma_map_ops ps3_sb_dma_ops = {
3253+static const struct dma_map_ops ps3_sb_dma_ops = {
3254 .alloc_coherent = ps3_alloc_coherent,
3255 .free_coherent = ps3_free_coherent,
3256 .map_sg = ps3_sb_map_sg,
3257@@ -704,7 +704,7 @@ static struct dma_map_ops ps3_sb_dma_ops
3258 .unmap_page = ps3_unmap_page,
3259 };
3260
3261-static struct dma_map_ops ps3_ioc0_dma_ops = {
3262+static const struct dma_map_ops ps3_ioc0_dma_ops = {
3263 .alloc_coherent = ps3_alloc_coherent,
3264 .free_coherent = ps3_free_coherent,
3265 .map_sg = ps3_ioc0_map_sg,
3266diff -urNp linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig
3267--- linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig 2011-03-27 14:31:47.000000000 -0400
3268+++ linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig 2011-04-17 15:56:45.000000000 -0400
3269@@ -2,6 +2,8 @@ config PPC_PSERIES
3270 depends on PPC64 && PPC_BOOK3S
3271 bool "IBM pSeries & new (POWER5-based) iSeries"
3272 select MPIC
3273+ select PCI_MSI
3274+ select XICS
3275 select PPC_I8259
3276 select PPC_RTAS
3277 select RTAS_ERROR_LOGGING
3278diff -urNp linux-2.6.32.46/arch/s390/include/asm/elf.h linux-2.6.32.46/arch/s390/include/asm/elf.h
3279--- linux-2.6.32.46/arch/s390/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
3280+++ linux-2.6.32.46/arch/s390/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400
3281@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
3282 that it will "exec", and that there is sufficient room for the brk. */
3283 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
3284
3285+#ifdef CONFIG_PAX_ASLR
3286+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
3287+
3288+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 )
3289+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 )
3290+#endif
3291+
3292 /* This yields a mask that user programs can use to figure out what
3293 instruction set this CPU supports. */
3294
3295diff -urNp linux-2.6.32.46/arch/s390/include/asm/setup.h linux-2.6.32.46/arch/s390/include/asm/setup.h
3296--- linux-2.6.32.46/arch/s390/include/asm/setup.h 2011-03-27 14:31:47.000000000 -0400
3297+++ linux-2.6.32.46/arch/s390/include/asm/setup.h 2011-04-17 15:56:45.000000000 -0400
3298@@ -50,13 +50,13 @@ extern unsigned long memory_end;
3299 void detect_memory_layout(struct mem_chunk chunk[]);
3300
3301 #ifdef CONFIG_S390_SWITCH_AMODE
3302-extern unsigned int switch_amode;
3303+#define switch_amode (1)
3304 #else
3305 #define switch_amode (0)
3306 #endif
3307
3308 #ifdef CONFIG_S390_EXEC_PROTECT
3309-extern unsigned int s390_noexec;
3310+#define s390_noexec (1)
3311 #else
3312 #define s390_noexec (0)
3313 #endif
3314diff -urNp linux-2.6.32.46/arch/s390/include/asm/uaccess.h linux-2.6.32.46/arch/s390/include/asm/uaccess.h
3315--- linux-2.6.32.46/arch/s390/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400
3316+++ linux-2.6.32.46/arch/s390/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400
3317@@ -232,6 +232,10 @@ static inline unsigned long __must_check
3318 copy_to_user(void __user *to, const void *from, unsigned long n)
3319 {
3320 might_fault();
3321+
3322+ if ((long)n < 0)
3323+ return n;
3324+
3325 if (access_ok(VERIFY_WRITE, to, n))
3326 n = __copy_to_user(to, from, n);
3327 return n;
3328@@ -257,6 +261,9 @@ copy_to_user(void __user *to, const void
3329 static inline unsigned long __must_check
3330 __copy_from_user(void *to, const void __user *from, unsigned long n)
3331 {
3332+ if ((long)n < 0)
3333+ return n;
3334+
3335 if (__builtin_constant_p(n) && (n <= 256))
3336 return uaccess.copy_from_user_small(n, from, to);
3337 else
3338@@ -283,6 +290,10 @@ static inline unsigned long __must_check
3339 copy_from_user(void *to, const void __user *from, unsigned long n)
3340 {
3341 might_fault();
3342+
3343+ if ((long)n < 0)
3344+ return n;
3345+
3346 if (access_ok(VERIFY_READ, from, n))
3347 n = __copy_from_user(to, from, n);
3348 else
3349diff -urNp linux-2.6.32.46/arch/s390/Kconfig linux-2.6.32.46/arch/s390/Kconfig
3350--- linux-2.6.32.46/arch/s390/Kconfig 2011-03-27 14:31:47.000000000 -0400
3351+++ linux-2.6.32.46/arch/s390/Kconfig 2011-04-17 15:56:45.000000000 -0400
3352@@ -194,28 +194,26 @@ config AUDIT_ARCH
3353
3354 config S390_SWITCH_AMODE
3355 bool "Switch kernel/user addressing modes"
3356+ default y
3357 help
3358 This option allows to switch the addressing modes of kernel and user
3359- space. The kernel parameter switch_amode=on will enable this feature,
3360- default is disabled. Enabling this (via kernel parameter) on machines
3361- earlier than IBM System z9-109 EC/BC will reduce system performance.
3362+ space. Enabling this on machines earlier than IBM System z9-109 EC/BC
3363+ will reduce system performance.
3364
3365 Note that this option will also be selected by selecting the execute
3366- protection option below. Enabling the execute protection via the
3367- noexec kernel parameter will also switch the addressing modes,
3368- independent of the switch_amode kernel parameter.
3369+ protection option below. Enabling the execute protection will also
3370+ switch the addressing modes, independent of this option.
3371
3372
3373 config S390_EXEC_PROTECT
3374 bool "Data execute protection"
3375+ default y
3376 select S390_SWITCH_AMODE
3377 help
3378 This option allows to enable a buffer overflow protection for user
3379 space programs and it also selects the addressing mode option above.
3380- The kernel parameter noexec=on will enable this feature and also
3381- switch the addressing modes, default is disabled. Enabling this (via
3382- kernel parameter) on machines earlier than IBM System z9-109 EC/BC
3383- will reduce system performance.
3384+ Enabling this on machines earlier than IBM System z9-109 EC/BC will
3385+ reduce system performance.
3386
3387 comment "Code generation options"
3388
3389diff -urNp linux-2.6.32.46/arch/s390/kernel/module.c linux-2.6.32.46/arch/s390/kernel/module.c
3390--- linux-2.6.32.46/arch/s390/kernel/module.c 2011-03-27 14:31:47.000000000 -0400
3391+++ linux-2.6.32.46/arch/s390/kernel/module.c 2011-04-17 15:56:45.000000000 -0400
3392@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
3393
3394 /* Increase core size by size of got & plt and set start
3395 offsets for got and plt. */
3396- me->core_size = ALIGN(me->core_size, 4);
3397- me->arch.got_offset = me->core_size;
3398- me->core_size += me->arch.got_size;
3399- me->arch.plt_offset = me->core_size;
3400- me->core_size += me->arch.plt_size;
3401+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
3402+ me->arch.got_offset = me->core_size_rw;
3403+ me->core_size_rw += me->arch.got_size;
3404+ me->arch.plt_offset = me->core_size_rx;
3405+ me->core_size_rx += me->arch.plt_size;
3406 return 0;
3407 }
3408
3409@@ -256,7 +256,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
3410 if (info->got_initialized == 0) {
3411 Elf_Addr *gotent;
3412
3413- gotent = me->module_core + me->arch.got_offset +
3414+ gotent = me->module_core_rw + me->arch.got_offset +
3415 info->got_offset;
3416 *gotent = val;
3417 info->got_initialized = 1;
3418@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
3419 else if (r_type == R_390_GOTENT ||
3420 r_type == R_390_GOTPLTENT)
3421 *(unsigned int *) loc =
3422- (val + (Elf_Addr) me->module_core - loc) >> 1;
3423+ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
3424 else if (r_type == R_390_GOT64 ||
3425 r_type == R_390_GOTPLT64)
3426 *(unsigned long *) loc = val;
3427@@ -294,7 +294,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
3428 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
3429 if (info->plt_initialized == 0) {
3430 unsigned int *ip;
3431- ip = me->module_core + me->arch.plt_offset +
3432+ ip = me->module_core_rx + me->arch.plt_offset +
3433 info->plt_offset;
3434 #ifndef CONFIG_64BIT
3435 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
3436@@ -319,7 +319,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
3437 val - loc + 0xffffUL < 0x1ffffeUL) ||
3438 (r_type == R_390_PLT32DBL &&
3439 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
3440- val = (Elf_Addr) me->module_core +
3441+ val = (Elf_Addr) me->module_core_rx +
3442 me->arch.plt_offset +
3443 info->plt_offset;
3444 val += rela->r_addend - loc;
3445@@ -341,7 +341,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
3446 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
3447 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
3448 val = val + rela->r_addend -
3449- ((Elf_Addr) me->module_core + me->arch.got_offset);
3450+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
3451 if (r_type == R_390_GOTOFF16)
3452 *(unsigned short *) loc = val;
3453 else if (r_type == R_390_GOTOFF32)
3454@@ -351,7 +351,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
3455 break;
3456 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
3457 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
3458- val = (Elf_Addr) me->module_core + me->arch.got_offset +
3459+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
3460 rela->r_addend - loc;
3461 if (r_type == R_390_GOTPC)
3462 *(unsigned int *) loc = val;
3463diff -urNp linux-2.6.32.46/arch/s390/kernel/setup.c linux-2.6.32.46/arch/s390/kernel/setup.c
3464--- linux-2.6.32.46/arch/s390/kernel/setup.c 2011-03-27 14:31:47.000000000 -0400
3465+++ linux-2.6.32.46/arch/s390/kernel/setup.c 2011-04-17 15:56:45.000000000 -0400
3466@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
3467 early_param("mem", early_parse_mem);
3468
3469 #ifdef CONFIG_S390_SWITCH_AMODE
3470-unsigned int switch_amode = 0;
3471-EXPORT_SYMBOL_GPL(switch_amode);
3472-
3473 static int set_amode_and_uaccess(unsigned long user_amode,
3474 unsigned long user32_amode)
3475 {
3476@@ -334,17 +331,6 @@ static int set_amode_and_uaccess(unsigne
3477 return 0;
3478 }
3479 }
3480-
3481-/*
3482- * Switch kernel/user addressing modes?
3483- */
3484-static int __init early_parse_switch_amode(char *p)
3485-{
3486- switch_amode = 1;
3487- return 0;
3488-}
3489-early_param("switch_amode", early_parse_switch_amode);
3490-
3491 #else /* CONFIG_S390_SWITCH_AMODE */
3492 static inline int set_amode_and_uaccess(unsigned long user_amode,
3493 unsigned long user32_amode)
3494@@ -353,24 +339,6 @@ static inline int set_amode_and_uaccess(
3495 }
3496 #endif /* CONFIG_S390_SWITCH_AMODE */
3497
3498-#ifdef CONFIG_S390_EXEC_PROTECT
3499-unsigned int s390_noexec = 0;
3500-EXPORT_SYMBOL_GPL(s390_noexec);
3501-
3502-/*
3503- * Enable execute protection?
3504- */
3505-static int __init early_parse_noexec(char *p)
3506-{
3507- if (!strncmp(p, "off", 3))
3508- return 0;
3509- switch_amode = 1;
3510- s390_noexec = 1;
3511- return 0;
3512-}
3513-early_param("noexec", early_parse_noexec);
3514-#endif /* CONFIG_S390_EXEC_PROTECT */
3515-
3516 static void setup_addressing_mode(void)
3517 {
3518 if (s390_noexec) {
3519diff -urNp linux-2.6.32.46/arch/s390/mm/mmap.c linux-2.6.32.46/arch/s390/mm/mmap.c
3520--- linux-2.6.32.46/arch/s390/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400
3521+++ linux-2.6.32.46/arch/s390/mm/mmap.c 2011-04-17 15:56:45.000000000 -0400
3522@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
3523 */
3524 if (mmap_is_legacy()) {
3525 mm->mmap_base = TASK_UNMAPPED_BASE;
3526+
3527+#ifdef CONFIG_PAX_RANDMMAP
3528+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3529+ mm->mmap_base += mm->delta_mmap;
3530+#endif
3531+
3532 mm->get_unmapped_area = arch_get_unmapped_area;
3533 mm->unmap_area = arch_unmap_area;
3534 } else {
3535 mm->mmap_base = mmap_base();
3536+
3537+#ifdef CONFIG_PAX_RANDMMAP
3538+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3539+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
3540+#endif
3541+
3542 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3543 mm->unmap_area = arch_unmap_area_topdown;
3544 }
3545@@ -153,10 +165,22 @@ void arch_pick_mmap_layout(struct mm_str
3546 */
3547 if (mmap_is_legacy()) {
3548 mm->mmap_base = TASK_UNMAPPED_BASE;
3549+
3550+#ifdef CONFIG_PAX_RANDMMAP
3551+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3552+ mm->mmap_base += mm->delta_mmap;
3553+#endif
3554+
3555 mm->get_unmapped_area = s390_get_unmapped_area;
3556 mm->unmap_area = arch_unmap_area;
3557 } else {
3558 mm->mmap_base = mmap_base();
3559+
3560+#ifdef CONFIG_PAX_RANDMMAP
3561+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3562+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
3563+#endif
3564+
3565 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
3566 mm->unmap_area = arch_unmap_area_topdown;
3567 }
3568diff -urNp linux-2.6.32.46/arch/score/include/asm/system.h linux-2.6.32.46/arch/score/include/asm/system.h
3569--- linux-2.6.32.46/arch/score/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400
3570+++ linux-2.6.32.46/arch/score/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400
3571@@ -17,7 +17,7 @@ do { \
3572 #define finish_arch_switch(prev) do {} while (0)
3573
3574 typedef void (*vi_handler_t)(void);
3575-extern unsigned long arch_align_stack(unsigned long sp);
3576+#define arch_align_stack(x) (x)
3577
3578 #define mb() barrier()
3579 #define rmb() barrier()
3580diff -urNp linux-2.6.32.46/arch/score/kernel/process.c linux-2.6.32.46/arch/score/kernel/process.c
3581--- linux-2.6.32.46/arch/score/kernel/process.c 2011-03-27 14:31:47.000000000 -0400
3582+++ linux-2.6.32.46/arch/score/kernel/process.c 2011-04-17 15:56:45.000000000 -0400
3583@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
3584
3585 return task_pt_regs(task)->cp0_epc;
3586 }
3587-
3588-unsigned long arch_align_stack(unsigned long sp)
3589-{
3590- return sp;
3591-}
3592diff -urNp linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c
3593--- linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c 2011-03-27 14:31:47.000000000 -0400
3594+++ linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c 2011-04-17 15:56:45.000000000 -0400
3595@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
3596 return 0;
3597 }
3598
3599-static struct platform_suspend_ops hp6x0_pm_ops = {
3600+static const struct platform_suspend_ops hp6x0_pm_ops = {
3601 .enter = hp6x0_pm_enter,
3602 .valid = suspend_valid_only_mem,
3603 };
3604diff -urNp linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c
3605--- linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c 2011-03-27 14:31:47.000000000 -0400
3606+++ linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c 2011-04-17 15:56:46.000000000 -0400
3607@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
3608 NULL,
3609 };
3610
3611-static struct sysfs_ops sq_sysfs_ops = {
3612+static const struct sysfs_ops sq_sysfs_ops = {
3613 .show = sq_sysfs_show,
3614 .store = sq_sysfs_store,
3615 };
3616diff -urNp linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c
3617--- linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c 2011-03-27 14:31:47.000000000 -0400
3618+++ linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c 2011-04-17 15:56:46.000000000 -0400
3619@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
3620 return 0;
3621 }
3622
3623-static struct platform_suspend_ops sh_pm_ops = {
3624+static const struct platform_suspend_ops sh_pm_ops = {
3625 .enter = sh_pm_enter,
3626 .valid = suspend_valid_only_mem,
3627 };
3628diff -urNp linux-2.6.32.46/arch/sh/kernel/kgdb.c linux-2.6.32.46/arch/sh/kernel/kgdb.c
3629--- linux-2.6.32.46/arch/sh/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400
3630+++ linux-2.6.32.46/arch/sh/kernel/kgdb.c 2011-04-17 15:56:46.000000000 -0400
3631@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
3632 {
3633 }
3634
3635-struct kgdb_arch arch_kgdb_ops = {
3636+const struct kgdb_arch arch_kgdb_ops = {
3637 /* Breakpoint instruction: trapa #0x3c */
3638 #ifdef CONFIG_CPU_LITTLE_ENDIAN
3639 .gdb_bpt_instr = { 0x3c, 0xc3 },
3640diff -urNp linux-2.6.32.46/arch/sh/mm/mmap.c linux-2.6.32.46/arch/sh/mm/mmap.c
3641--- linux-2.6.32.46/arch/sh/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400
3642+++ linux-2.6.32.46/arch/sh/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400
3643@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
3644 addr = PAGE_ALIGN(addr);
3645
3646 vma = find_vma(mm, addr);
3647- if (TASK_SIZE - len >= addr &&
3648- (!vma || addr + len <= vma->vm_start))
3649+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
3650 return addr;
3651 }
3652
3653@@ -106,7 +105,7 @@ full_search:
3654 }
3655 return -ENOMEM;
3656 }
3657- if (likely(!vma || addr + len <= vma->vm_start)) {
3658+ if (likely(check_heap_stack_gap(vma, addr, len))) {
3659 /*
3660 * Remember the place where we stopped the search:
3661 */
3662@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct fi
3663 addr = PAGE_ALIGN(addr);
3664
3665 vma = find_vma(mm, addr);
3666- if (TASK_SIZE - len >= addr &&
3667- (!vma || addr + len <= vma->vm_start))
3668+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
3669 return addr;
3670 }
3671
3672@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct fi
3673 /* make sure it can fit in the remaining address space */
3674 if (likely(addr > len)) {
3675 vma = find_vma(mm, addr-len);
3676- if (!vma || addr <= vma->vm_start) {
3677+ if (check_heap_stack_gap(vma, addr - len, len)) {
3678 /* remember the address as a hint for next time */
3679 return (mm->free_area_cache = addr-len);
3680 }
3681@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct fi
3682 if (unlikely(mm->mmap_base < len))
3683 goto bottomup;
3684
3685- addr = mm->mmap_base-len;
3686- if (do_colour_align)
3687- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
3688+ addr = mm->mmap_base - len;
3689
3690 do {
3691+ if (do_colour_align)
3692+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
3693 /*
3694 * Lookup failure means no vma is above this address,
3695 * else if new region fits below vma->vm_start,
3696 * return with success:
3697 */
3698 vma = find_vma(mm, addr);
3699- if (likely(!vma || addr+len <= vma->vm_start)) {
3700+ if (likely(check_heap_stack_gap(vma, addr, len))) {
3701 /* remember the address as a hint for next time */
3702 return (mm->free_area_cache = addr);
3703 }
3704@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct fi
3705 mm->cached_hole_size = vma->vm_start - addr;
3706
3707 /* try just below the current vma->vm_start */
3708- addr = vma->vm_start-len;
3709- if (do_colour_align)
3710- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
3711- } while (likely(len < vma->vm_start));
3712+ addr = skip_heap_stack_gap(vma, len);
3713+ } while (!IS_ERR_VALUE(addr));
3714
3715 bottomup:
3716 /*
3717diff -urNp linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h
3718--- linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h 2011-03-27 14:31:47.000000000 -0400
3719+++ linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h 2011-08-18 23:11:34.000000000 -0400
3720@@ -14,18 +14,40 @@
3721 #define ATOMIC64_INIT(i) { (i) }
3722
3723 #define atomic_read(v) ((v)->counter)
3724+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
3725+{
3726+ return v->counter;
3727+}
3728 #define atomic64_read(v) ((v)->counter)
3729+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
3730+{
3731+ return v->counter;
3732+}
3733
3734 #define atomic_set(v, i) (((v)->counter) = i)
3735+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
3736+{
3737+ v->counter = i;
3738+}
3739 #define atomic64_set(v, i) (((v)->counter) = i)
3740+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
3741+{
3742+ v->counter = i;
3743+}
3744
3745 extern void atomic_add(int, atomic_t *);
3746+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
3747 extern void atomic64_add(long, atomic64_t *);
3748+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
3749 extern void atomic_sub(int, atomic_t *);
3750+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
3751 extern void atomic64_sub(long, atomic64_t *);
3752+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
3753
3754 extern int atomic_add_ret(int, atomic_t *);
3755+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
3756 extern long atomic64_add_ret(long, atomic64_t *);
3757+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
3758 extern int atomic_sub_ret(int, atomic_t *);
3759 extern long atomic64_sub_ret(long, atomic64_t *);
3760
3761@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomi
3762 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
3763
3764 #define atomic_inc_return(v) atomic_add_ret(1, v)
3765+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
3766+{
3767+ return atomic_add_ret_unchecked(1, v);
3768+}
3769 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
3770+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
3771+{
3772+ return atomic64_add_ret_unchecked(1, v);
3773+}
3774
3775 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
3776 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
3777
3778 #define atomic_add_return(i, v) atomic_add_ret(i, v)
3779+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
3780+{
3781+ return atomic_add_ret_unchecked(i, v);
3782+}
3783 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
3784+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
3785+{
3786+ return atomic64_add_ret_unchecked(i, v);
3787+}
3788
3789 /*
3790 * atomic_inc_and_test - increment and test
3791@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomi
3792 * other cases.
3793 */
3794 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
3795+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
3796+{
3797+ return atomic_inc_return_unchecked(v) == 0;
3798+}
3799 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
3800
3801 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
3802@@ -59,30 +101,65 @@ extern long atomic64_sub_ret(long, atomi
3803 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
3804
3805 #define atomic_inc(v) atomic_add(1, v)
3806+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
3807+{
3808+ atomic_add_unchecked(1, v);
3809+}
3810 #define atomic64_inc(v) atomic64_add(1, v)
3811+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
3812+{
3813+ atomic64_add_unchecked(1, v);
3814+}
3815
3816 #define atomic_dec(v) atomic_sub(1, v)
3817+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
3818+{
3819+ atomic_sub_unchecked(1, v);
3820+}
3821 #define atomic64_dec(v) atomic64_sub(1, v)
3822+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
3823+{
3824+ atomic64_sub_unchecked(1, v);
3825+}
3826
3827 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
3828 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
3829
3830 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
3831+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
3832+{
3833+ return cmpxchg(&v->counter, old, new);
3834+}
3835 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
3836+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
3837+{
3838+ return xchg(&v->counter, new);
3839+}
3840
3841 static inline int atomic_add_unless(atomic_t *v, int a, int u)
3842 {
3843- int c, old;
3844+ int c, old, new;
3845 c = atomic_read(v);
3846 for (;;) {
3847- if (unlikely(c == (u)))
3848+ if (unlikely(c == u))
3849 break;
3850- old = atomic_cmpxchg((v), c, c + (a));
3851+
3852+ asm volatile("addcc %2, %0, %0\n"
3853+
3854+#ifdef CONFIG_PAX_REFCOUNT
3855+ "tvs %%icc, 6\n"
3856+#endif
3857+
3858+ : "=r" (new)
3859+ : "0" (c), "ir" (a)
3860+ : "cc");
3861+
3862+ old = atomic_cmpxchg(v, c, new);
3863 if (likely(old == c))
3864 break;
3865 c = old;
3866 }
3867- return c != (u);
3868+ return c != u;
3869 }
3870
3871 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
3872@@ -90,20 +167,35 @@ static inline int atomic_add_unless(atom
3873 #define atomic64_cmpxchg(v, o, n) \
3874 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
3875 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
3876+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
3877+{
3878+ return xchg(&v->counter, new);
3879+}
3880
3881 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
3882 {
3883- long c, old;
3884+ long c, old, new;
3885 c = atomic64_read(v);
3886 for (;;) {
3887- if (unlikely(c == (u)))
3888+ if (unlikely(c == u))
3889 break;
3890- old = atomic64_cmpxchg((v), c, c + (a));
3891+
3892+ asm volatile("addcc %2, %0, %0\n"
3893+
3894+#ifdef CONFIG_PAX_REFCOUNT
3895+ "tvs %%xcc, 6\n"
3896+#endif
3897+
3898+ : "=r" (new)
3899+ : "0" (c), "ir" (a)
3900+ : "cc");
3901+
3902+ old = atomic64_cmpxchg(v, c, new);
3903 if (likely(old == c))
3904 break;
3905 c = old;
3906 }
3907- return c != (u);
3908+ return c != u;
3909 }
3910
3911 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3912diff -urNp linux-2.6.32.46/arch/sparc/include/asm/cache.h linux-2.6.32.46/arch/sparc/include/asm/cache.h
3913--- linux-2.6.32.46/arch/sparc/include/asm/cache.h 2011-03-27 14:31:47.000000000 -0400
3914+++ linux-2.6.32.46/arch/sparc/include/asm/cache.h 2011-07-06 19:53:33.000000000 -0400
3915@@ -8,7 +8,7 @@
3916 #define _SPARC_CACHE_H
3917
3918 #define L1_CACHE_SHIFT 5
3919-#define L1_CACHE_BYTES 32
3920+#define L1_CACHE_BYTES 32UL
3921 #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1)))
3922
3923 #ifdef CONFIG_SPARC32
3924diff -urNp linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h
3925--- linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400
3926+++ linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400
3927@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
3928 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
3929 #define dma_is_consistent(d, h) (1)
3930
3931-extern struct dma_map_ops *dma_ops, pci32_dma_ops;
3932+extern const struct dma_map_ops *dma_ops, pci32_dma_ops;
3933 extern struct bus_type pci_bus_type;
3934
3935-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
3936+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
3937 {
3938 #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
3939 if (dev->bus == &pci_bus_type)
3940@@ -31,7 +31,7 @@ static inline struct dma_map_ops *get_dm
3941 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
3942 dma_addr_t *dma_handle, gfp_t flag)
3943 {
3944- struct dma_map_ops *ops = get_dma_ops(dev);
3945+ const struct dma_map_ops *ops = get_dma_ops(dev);
3946 void *cpu_addr;
3947
3948 cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag);
3949@@ -42,7 +42,7 @@ static inline void *dma_alloc_coherent(s
3950 static inline void dma_free_coherent(struct device *dev, size_t size,
3951 void *cpu_addr, dma_addr_t dma_handle)
3952 {
3953- struct dma_map_ops *ops = get_dma_ops(dev);
3954+ const struct dma_map_ops *ops = get_dma_ops(dev);
3955
3956 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
3957 ops->free_coherent(dev, size, cpu_addr, dma_handle);
3958diff -urNp linux-2.6.32.46/arch/sparc/include/asm/elf_32.h linux-2.6.32.46/arch/sparc/include/asm/elf_32.h
3959--- linux-2.6.32.46/arch/sparc/include/asm/elf_32.h 2011-03-27 14:31:47.000000000 -0400
3960+++ linux-2.6.32.46/arch/sparc/include/asm/elf_32.h 2011-04-17 15:56:46.000000000 -0400
3961@@ -116,6 +116,13 @@ typedef struct {
3962
3963 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
3964
3965+#ifdef CONFIG_PAX_ASLR
3966+#define PAX_ELF_ET_DYN_BASE 0x10000UL
3967+
3968+#define PAX_DELTA_MMAP_LEN 16
3969+#define PAX_DELTA_STACK_LEN 16
3970+#endif
3971+
3972 /* This yields a mask that user programs can use to figure out what
3973 instruction set this cpu supports. This can NOT be done in userspace
3974 on Sparc. */
3975diff -urNp linux-2.6.32.46/arch/sparc/include/asm/elf_64.h linux-2.6.32.46/arch/sparc/include/asm/elf_64.h
3976--- linux-2.6.32.46/arch/sparc/include/asm/elf_64.h 2011-03-27 14:31:47.000000000 -0400
3977+++ linux-2.6.32.46/arch/sparc/include/asm/elf_64.h 2011-04-17 15:56:46.000000000 -0400
3978@@ -163,6 +163,12 @@ typedef struct {
3979 #define ELF_ET_DYN_BASE 0x0000010000000000UL
3980 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
3981
3982+#ifdef CONFIG_PAX_ASLR
3983+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
3984+
3985+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
3986+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
3987+#endif
3988
3989 /* This yields a mask that user programs can use to figure out what
3990 instruction set this cpu supports. */
3991diff -urNp linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h
3992--- linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h 2011-03-27 14:31:47.000000000 -0400
3993+++ linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:56:46.000000000 -0400
3994@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
3995 BTFIXUPDEF_INT(page_none)
3996 BTFIXUPDEF_INT(page_copy)
3997 BTFIXUPDEF_INT(page_readonly)
3998+
3999+#ifdef CONFIG_PAX_PAGEEXEC
4000+BTFIXUPDEF_INT(page_shared_noexec)
4001+BTFIXUPDEF_INT(page_copy_noexec)
4002+BTFIXUPDEF_INT(page_readonly_noexec)
4003+#endif
4004+
4005 BTFIXUPDEF_INT(page_kernel)
4006
4007 #define PMD_SHIFT SUN4C_PMD_SHIFT
4008@@ -64,6 +71,16 @@ extern pgprot_t PAGE_SHARED;
4009 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
4010 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
4011
4012+#ifdef CONFIG_PAX_PAGEEXEC
4013+extern pgprot_t PAGE_SHARED_NOEXEC;
4014+# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
4015+# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
4016+#else
4017+# define PAGE_SHARED_NOEXEC PAGE_SHARED
4018+# define PAGE_COPY_NOEXEC PAGE_COPY
4019+# define PAGE_READONLY_NOEXEC PAGE_READONLY
4020+#endif
4021+
4022 extern unsigned long page_kernel;
4023
4024 #ifdef MODULE
4025diff -urNp linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h
4026--- linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h 2011-03-27 14:31:47.000000000 -0400
4027+++ linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:56:46.000000000 -0400
4028@@ -115,6 +115,13 @@
4029 SRMMU_EXEC | SRMMU_REF)
4030 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
4031 SRMMU_EXEC | SRMMU_REF)
4032+
4033+#ifdef CONFIG_PAX_PAGEEXEC
4034+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
4035+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4036+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4037+#endif
4038+
4039 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
4040 SRMMU_DIRTY | SRMMU_REF)
4041
4042diff -urNp linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h
4043--- linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h 2011-03-27 14:31:47.000000000 -0400
4044+++ linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h 2011-08-18 23:19:30.000000000 -0400
4045@@ -92,14 +92,19 @@ static inline void __raw_spin_lock_flags
4046
4047 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
4048
4049-static void inline arch_read_lock(raw_rwlock_t *lock)
4050+static inline void arch_read_lock(raw_rwlock_t *lock)
4051 {
4052 unsigned long tmp1, tmp2;
4053
4054 __asm__ __volatile__ (
4055 "1: ldsw [%2], %0\n"
4056 " brlz,pn %0, 2f\n"
4057-"4: add %0, 1, %1\n"
4058+"4: addcc %0, 1, %1\n"
4059+
4060+#ifdef CONFIG_PAX_REFCOUNT
4061+" tvs %%icc, 6\n"
4062+#endif
4063+
4064 " cas [%2], %0, %1\n"
4065 " cmp %0, %1\n"
4066 " bne,pn %%icc, 1b\n"
4067@@ -112,10 +117,10 @@ static void inline arch_read_lock(raw_rw
4068 " .previous"
4069 : "=&r" (tmp1), "=&r" (tmp2)
4070 : "r" (lock)
4071- : "memory");
4072+ : "memory", "cc");
4073 }
4074
4075-static int inline arch_read_trylock(raw_rwlock_t *lock)
4076+static inline int arch_read_trylock(raw_rwlock_t *lock)
4077 {
4078 int tmp1, tmp2;
4079
4080@@ -123,7 +128,12 @@ static int inline arch_read_trylock(raw_
4081 "1: ldsw [%2], %0\n"
4082 " brlz,a,pn %0, 2f\n"
4083 " mov 0, %0\n"
4084-" add %0, 1, %1\n"
4085+" addcc %0, 1, %1\n"
4086+
4087+#ifdef CONFIG_PAX_REFCOUNT
4088+" tvs %%icc, 6\n"
4089+#endif
4090+
4091 " cas [%2], %0, %1\n"
4092 " cmp %0, %1\n"
4093 " bne,pn %%icc, 1b\n"
4094@@ -136,13 +146,18 @@ static int inline arch_read_trylock(raw_
4095 return tmp1;
4096 }
4097
4098-static void inline arch_read_unlock(raw_rwlock_t *lock)
4099+static inline void arch_read_unlock(raw_rwlock_t *lock)
4100 {
4101 unsigned long tmp1, tmp2;
4102
4103 __asm__ __volatile__(
4104 "1: lduw [%2], %0\n"
4105-" sub %0, 1, %1\n"
4106+" subcc %0, 1, %1\n"
4107+
4108+#ifdef CONFIG_PAX_REFCOUNT
4109+" tvs %%icc, 6\n"
4110+#endif
4111+
4112 " cas [%2], %0, %1\n"
4113 " cmp %0, %1\n"
4114 " bne,pn %%xcc, 1b\n"
4115@@ -152,7 +167,7 @@ static void inline arch_read_unlock(raw_
4116 : "memory");
4117 }
4118
4119-static void inline arch_write_lock(raw_rwlock_t *lock)
4120+static inline void arch_write_lock(raw_rwlock_t *lock)
4121 {
4122 unsigned long mask, tmp1, tmp2;
4123
4124@@ -177,7 +192,7 @@ static void inline arch_write_lock(raw_r
4125 : "memory");
4126 }
4127
4128-static void inline arch_write_unlock(raw_rwlock_t *lock)
4129+static inline void arch_write_unlock(raw_rwlock_t *lock)
4130 {
4131 __asm__ __volatile__(
4132 " stw %%g0, [%0]"
4133@@ -186,7 +201,7 @@ static void inline arch_write_unlock(raw
4134 : "memory");
4135 }
4136
4137-static int inline arch_write_trylock(raw_rwlock_t *lock)
4138+static inline int arch_write_trylock(raw_rwlock_t *lock)
4139 {
4140 unsigned long mask, tmp1, tmp2, result;
4141
4142diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h
4143--- linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h 2011-03-27 14:31:47.000000000 -0400
4144+++ linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h 2011-06-04 20:46:01.000000000 -0400
4145@@ -50,6 +50,8 @@ struct thread_info {
4146 unsigned long w_saved;
4147
4148 struct restart_block restart_block;
4149+
4150+ unsigned long lowest_stack;
4151 };
4152
4153 /*
4154diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h
4155--- linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h 2011-03-27 14:31:47.000000000 -0400
4156+++ linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h 2011-06-04 20:46:21.000000000 -0400
4157@@ -68,6 +68,8 @@ struct thread_info {
4158 struct pt_regs *kern_una_regs;
4159 unsigned int kern_una_insn;
4160
4161+ unsigned long lowest_stack;
4162+
4163 unsigned long fpregs[0] __attribute__ ((aligned(64)));
4164 };
4165
4166diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h
4167--- linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h 2011-03-27 14:31:47.000000000 -0400
4168+++ linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:56:46.000000000 -0400
4169@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
4170
4171 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
4172 {
4173- if (n && __access_ok((unsigned long) to, n))
4174+ if ((long)n < 0)
4175+ return n;
4176+
4177+ if (n && __access_ok((unsigned long) to, n)) {
4178+ if (!__builtin_constant_p(n))
4179+ check_object_size(from, n, true);
4180 return __copy_user(to, (__force void __user *) from, n);
4181- else
4182+ } else
4183 return n;
4184 }
4185
4186 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
4187 {
4188+ if ((long)n < 0)
4189+ return n;
4190+
4191+ if (!__builtin_constant_p(n))
4192+ check_object_size(from, n, true);
4193+
4194 return __copy_user(to, (__force void __user *) from, n);
4195 }
4196
4197 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
4198 {
4199- if (n && __access_ok((unsigned long) from, n))
4200+ if ((long)n < 0)
4201+ return n;
4202+
4203+ if (n && __access_ok((unsigned long) from, n)) {
4204+ if (!__builtin_constant_p(n))
4205+ check_object_size(to, n, false);
4206 return __copy_user((__force void __user *) to, from, n);
4207- else
4208+ } else
4209 return n;
4210 }
4211
4212 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
4213 {
4214+ if ((long)n < 0)
4215+ return n;
4216+
4217 return __copy_user((__force void __user *) to, from, n);
4218 }
4219
4220diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h
4221--- linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h 2011-03-27 14:31:47.000000000 -0400
4222+++ linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:56:46.000000000 -0400
4223@@ -9,6 +9,7 @@
4224 #include <linux/compiler.h>
4225 #include <linux/string.h>
4226 #include <linux/thread_info.h>
4227+#include <linux/kernel.h>
4228 #include <asm/asi.h>
4229 #include <asm/system.h>
4230 #include <asm/spitfire.h>
4231@@ -212,8 +213,15 @@ extern unsigned long copy_from_user_fixu
4232 static inline unsigned long __must_check
4233 copy_from_user(void *to, const void __user *from, unsigned long size)
4234 {
4235- unsigned long ret = ___copy_from_user(to, from, size);
4236+ unsigned long ret;
4237
4238+ if ((long)size < 0 || size > INT_MAX)
4239+ return size;
4240+
4241+ if (!__builtin_constant_p(size))
4242+ check_object_size(to, size, false);
4243+
4244+ ret = ___copy_from_user(to, from, size);
4245 if (unlikely(ret))
4246 ret = copy_from_user_fixup(to, from, size);
4247 return ret;
4248@@ -228,8 +236,15 @@ extern unsigned long copy_to_user_fixup(
4249 static inline unsigned long __must_check
4250 copy_to_user(void __user *to, const void *from, unsigned long size)
4251 {
4252- unsigned long ret = ___copy_to_user(to, from, size);
4253+ unsigned long ret;
4254+
4255+ if ((long)size < 0 || size > INT_MAX)
4256+ return size;
4257+
4258+ if (!__builtin_constant_p(size))
4259+ check_object_size(from, size, true);
4260
4261+ ret = ___copy_to_user(to, from, size);
4262 if (unlikely(ret))
4263 ret = copy_to_user_fixup(to, from, size);
4264 return ret;
4265diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess.h linux-2.6.32.46/arch/sparc/include/asm/uaccess.h
4266--- linux-2.6.32.46/arch/sparc/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400
4267+++ linux-2.6.32.46/arch/sparc/include/asm/uaccess.h 2011-04-17 15:56:46.000000000 -0400
4268@@ -1,5 +1,13 @@
4269 #ifndef ___ASM_SPARC_UACCESS_H
4270 #define ___ASM_SPARC_UACCESS_H
4271+
4272+#ifdef __KERNEL__
4273+#ifndef __ASSEMBLY__
4274+#include <linux/types.h>
4275+extern void check_object_size(const void *ptr, unsigned long n, bool to);
4276+#endif
4277+#endif
4278+
4279 #if defined(__sparc__) && defined(__arch64__)
4280 #include <asm/uaccess_64.h>
4281 #else
4282diff -urNp linux-2.6.32.46/arch/sparc/kernel/iommu.c linux-2.6.32.46/arch/sparc/kernel/iommu.c
4283--- linux-2.6.32.46/arch/sparc/kernel/iommu.c 2011-03-27 14:31:47.000000000 -0400
4284+++ linux-2.6.32.46/arch/sparc/kernel/iommu.c 2011-04-17 15:56:46.000000000 -0400
4285@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
4286 spin_unlock_irqrestore(&iommu->lock, flags);
4287 }
4288
4289-static struct dma_map_ops sun4u_dma_ops = {
4290+static const struct dma_map_ops sun4u_dma_ops = {
4291 .alloc_coherent = dma_4u_alloc_coherent,
4292 .free_coherent = dma_4u_free_coherent,
4293 .map_page = dma_4u_map_page,
4294@@ -837,7 +837,7 @@ static struct dma_map_ops sun4u_dma_ops
4295 .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu,
4296 };
4297
4298-struct dma_map_ops *dma_ops = &sun4u_dma_ops;
4299+const struct dma_map_ops *dma_ops = &sun4u_dma_ops;
4300 EXPORT_SYMBOL(dma_ops);
4301
4302 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
4303diff -urNp linux-2.6.32.46/arch/sparc/kernel/ioport.c linux-2.6.32.46/arch/sparc/kernel/ioport.c
4304--- linux-2.6.32.46/arch/sparc/kernel/ioport.c 2011-03-27 14:31:47.000000000 -0400
4305+++ linux-2.6.32.46/arch/sparc/kernel/ioport.c 2011-04-17 15:56:46.000000000 -0400
4306@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
4307 BUG();
4308 }
4309
4310-struct dma_map_ops sbus_dma_ops = {
4311+const struct dma_map_ops sbus_dma_ops = {
4312 .alloc_coherent = sbus_alloc_coherent,
4313 .free_coherent = sbus_free_coherent,
4314 .map_page = sbus_map_page,
4315@@ -403,7 +403,7 @@ struct dma_map_ops sbus_dma_ops = {
4316 .sync_sg_for_device = sbus_sync_sg_for_device,
4317 };
4318
4319-struct dma_map_ops *dma_ops = &sbus_dma_ops;
4320+const struct dma_map_ops *dma_ops = &sbus_dma_ops;
4321 EXPORT_SYMBOL(dma_ops);
4322
4323 static int __init sparc_register_ioport(void)
4324@@ -640,7 +640,7 @@ static void pci32_sync_sg_for_device(str
4325 }
4326 }
4327
4328-struct dma_map_ops pci32_dma_ops = {
4329+const struct dma_map_ops pci32_dma_ops = {
4330 .alloc_coherent = pci32_alloc_coherent,
4331 .free_coherent = pci32_free_coherent,
4332 .map_page = pci32_map_page,
4333diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c
4334--- linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c 2011-03-27 14:31:47.000000000 -0400
4335+++ linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:56:46.000000000 -0400
4336@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
4337 {
4338 }
4339
4340-struct kgdb_arch arch_kgdb_ops = {
4341+const struct kgdb_arch arch_kgdb_ops = {
4342 /* Breakpoint instruction: ta 0x7d */
4343 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
4344 };
4345diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c
4346--- linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c 2011-03-27 14:31:47.000000000 -0400
4347+++ linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:56:46.000000000 -0400
4348@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
4349 {
4350 }
4351
4352-struct kgdb_arch arch_kgdb_ops = {
4353+const struct kgdb_arch arch_kgdb_ops = {
4354 /* Breakpoint instruction: ta 0x72 */
4355 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
4356 };
4357diff -urNp linux-2.6.32.46/arch/sparc/kernel/Makefile linux-2.6.32.46/arch/sparc/kernel/Makefile
4358--- linux-2.6.32.46/arch/sparc/kernel/Makefile 2011-03-27 14:31:47.000000000 -0400
4359+++ linux-2.6.32.46/arch/sparc/kernel/Makefile 2011-04-17 15:56:46.000000000 -0400
4360@@ -3,7 +3,7 @@
4361 #
4362
4363 asflags-y := -ansi
4364-ccflags-y := -Werror
4365+#ccflags-y := -Werror
4366
4367 extra-y := head_$(BITS).o
4368 extra-y += init_task.o
4369diff -urNp linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c
4370--- linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c 2011-03-27 14:31:47.000000000 -0400
4371+++ linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:56:46.000000000 -0400
4372@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
4373 spin_unlock_irqrestore(&iommu->lock, flags);
4374 }
4375
4376-static struct dma_map_ops sun4v_dma_ops = {
4377+static const struct dma_map_ops sun4v_dma_ops = {
4378 .alloc_coherent = dma_4v_alloc_coherent,
4379 .free_coherent = dma_4v_free_coherent,
4380 .map_page = dma_4v_map_page,
4381diff -urNp linux-2.6.32.46/arch/sparc/kernel/process_32.c linux-2.6.32.46/arch/sparc/kernel/process_32.c
4382--- linux-2.6.32.46/arch/sparc/kernel/process_32.c 2011-03-27 14:31:47.000000000 -0400
4383+++ linux-2.6.32.46/arch/sparc/kernel/process_32.c 2011-04-17 15:56:46.000000000 -0400
4384@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
4385 rw->ins[4], rw->ins[5],
4386 rw->ins[6],
4387 rw->ins[7]);
4388- printk("%pS\n", (void *) rw->ins[7]);
4389+ printk("%pA\n", (void *) rw->ins[7]);
4390 rw = (struct reg_window32 *) rw->ins[6];
4391 }
4392 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
4393@@ -263,14 +263,14 @@ void show_regs(struct pt_regs *r)
4394
4395 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
4396 r->psr, r->pc, r->npc, r->y, print_tainted());
4397- printk("PC: <%pS>\n", (void *) r->pc);
4398+ printk("PC: <%pA>\n", (void *) r->pc);
4399 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4400 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
4401 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
4402 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4403 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
4404 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
4405- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
4406+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
4407
4408 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4409 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
4410@@ -305,7 +305,7 @@ void show_stack(struct task_struct *tsk,
4411 rw = (struct reg_window32 *) fp;
4412 pc = rw->ins[7];
4413 printk("[%08lx : ", pc);
4414- printk("%pS ] ", (void *) pc);
4415+ printk("%pA ] ", (void *) pc);
4416 fp = rw->ins[6];
4417 } while (++count < 16);
4418 printk("\n");
4419diff -urNp linux-2.6.32.46/arch/sparc/kernel/process_64.c linux-2.6.32.46/arch/sparc/kernel/process_64.c
4420--- linux-2.6.32.46/arch/sparc/kernel/process_64.c 2011-03-27 14:31:47.000000000 -0400
4421+++ linux-2.6.32.46/arch/sparc/kernel/process_64.c 2011-04-17 15:56:46.000000000 -0400
4422@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
4423 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
4424 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
4425 if (regs->tstate & TSTATE_PRIV)
4426- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
4427+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
4428 }
4429
4430 void show_regs(struct pt_regs *regs)
4431 {
4432 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
4433 regs->tpc, regs->tnpc, regs->y, print_tainted());
4434- printk("TPC: <%pS>\n", (void *) regs->tpc);
4435+ printk("TPC: <%pA>\n", (void *) regs->tpc);
4436 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
4437 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
4438 regs->u_regs[3]);
4439@@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs)
4440 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
4441 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
4442 regs->u_regs[15]);
4443- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
4444+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
4445 show_regwindow(regs);
4446 }
4447
4448@@ -284,7 +284,7 @@ void arch_trigger_all_cpu_backtrace(void
4449 ((tp && tp->task) ? tp->task->pid : -1));
4450
4451 if (gp->tstate & TSTATE_PRIV) {
4452- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
4453+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
4454 (void *) gp->tpc,
4455 (void *) gp->o7,
4456 (void *) gp->i7,
4457diff -urNp linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c
4458--- linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c 2011-03-27 14:31:47.000000000 -0400
4459+++ linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:56:46.000000000 -0400
4460@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
4461 if (ARCH_SUN4C && len > 0x20000000)
4462 return -ENOMEM;
4463 if (!addr)
4464- addr = TASK_UNMAPPED_BASE;
4465+ addr = current->mm->mmap_base;
4466
4467 if (flags & MAP_SHARED)
4468 addr = COLOUR_ALIGN(addr);
4469@@ -72,7 +72,7 @@ unsigned long arch_get_unmapped_area(str
4470 }
4471 if (TASK_SIZE - PAGE_SIZE - len < addr)
4472 return -ENOMEM;
4473- if (!vmm || addr + len <= vmm->vm_start)
4474+ if (check_heap_stack_gap(vmm, addr, len))
4475 return addr;
4476 addr = vmm->vm_end;
4477 if (flags & MAP_SHARED)
4478diff -urNp linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c
4479--- linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c 2011-03-27 14:31:47.000000000 -0400
4480+++ linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:56:46.000000000 -0400
4481@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
4482 /* We do not accept a shared mapping if it would violate
4483 * cache aliasing constraints.
4484 */
4485- if ((flags & MAP_SHARED) &&
4486+ if ((filp || (flags & MAP_SHARED)) &&
4487 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
4488 return -EINVAL;
4489 return addr;
4490@@ -140,6 +140,10 @@ unsigned long arch_get_unmapped_area(str
4491 if (filp || (flags & MAP_SHARED))
4492 do_color_align = 1;
4493
4494+#ifdef CONFIG_PAX_RANDMMAP
4495+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4496+#endif
4497+
4498 if (addr) {
4499 if (do_color_align)
4500 addr = COLOUR_ALIGN(addr, pgoff);
4501@@ -147,15 +151,14 @@ unsigned long arch_get_unmapped_area(str
4502 addr = PAGE_ALIGN(addr);
4503
4504 vma = find_vma(mm, addr);
4505- if (task_size - len >= addr &&
4506- (!vma || addr + len <= vma->vm_start))
4507+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
4508 return addr;
4509 }
4510
4511 if (len > mm->cached_hole_size) {
4512- start_addr = addr = mm->free_area_cache;
4513+ start_addr = addr = mm->free_area_cache;
4514 } else {
4515- start_addr = addr = TASK_UNMAPPED_BASE;
4516+ start_addr = addr = mm->mmap_base;
4517 mm->cached_hole_size = 0;
4518 }
4519
4520@@ -175,14 +178,14 @@ full_search:
4521 vma = find_vma(mm, VA_EXCLUDE_END);
4522 }
4523 if (unlikely(task_size < addr)) {
4524- if (start_addr != TASK_UNMAPPED_BASE) {
4525- start_addr = addr = TASK_UNMAPPED_BASE;
4526+ if (start_addr != mm->mmap_base) {
4527+ start_addr = addr = mm->mmap_base;
4528 mm->cached_hole_size = 0;
4529 goto full_search;
4530 }
4531 return -ENOMEM;
4532 }
4533- if (likely(!vma || addr + len <= vma->vm_start)) {
4534+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4535 /*
4536 * Remember the place where we stopped the search:
4537 */
4538@@ -216,7 +219,7 @@ arch_get_unmapped_area_topdown(struct fi
4539 /* We do not accept a shared mapping if it would violate
4540 * cache aliasing constraints.
4541 */
4542- if ((flags & MAP_SHARED) &&
4543+ if ((filp || (flags & MAP_SHARED)) &&
4544 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
4545 return -EINVAL;
4546 return addr;
4547@@ -237,8 +240,7 @@ arch_get_unmapped_area_topdown(struct fi
4548 addr = PAGE_ALIGN(addr);
4549
4550 vma = find_vma(mm, addr);
4551- if (task_size - len >= addr &&
4552- (!vma || addr + len <= vma->vm_start))
4553+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
4554 return addr;
4555 }
4556
4557@@ -259,7 +261,7 @@ arch_get_unmapped_area_topdown(struct fi
4558 /* make sure it can fit in the remaining address space */
4559 if (likely(addr > len)) {
4560 vma = find_vma(mm, addr-len);
4561- if (!vma || addr <= vma->vm_start) {
4562+ if (check_heap_stack_gap(vma, addr - len, len)) {
4563 /* remember the address as a hint for next time */
4564 return (mm->free_area_cache = addr-len);
4565 }
4566@@ -268,18 +270,18 @@ arch_get_unmapped_area_topdown(struct fi
4567 if (unlikely(mm->mmap_base < len))
4568 goto bottomup;
4569
4570- addr = mm->mmap_base-len;
4571- if (do_color_align)
4572- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4573+ addr = mm->mmap_base - len;
4574
4575 do {
4576+ if (do_color_align)
4577+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4578 /*
4579 * Lookup failure means no vma is above this address,
4580 * else if new region fits below vma->vm_start,
4581 * return with success:
4582 */
4583 vma = find_vma(mm, addr);
4584- if (likely(!vma || addr+len <= vma->vm_start)) {
4585+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4586 /* remember the address as a hint for next time */
4587 return (mm->free_area_cache = addr);
4588 }
4589@@ -289,10 +291,8 @@ arch_get_unmapped_area_topdown(struct fi
4590 mm->cached_hole_size = vma->vm_start - addr;
4591
4592 /* try just below the current vma->vm_start */
4593- addr = vma->vm_start-len;
4594- if (do_color_align)
4595- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4596- } while (likely(len < vma->vm_start));
4597+ addr = skip_heap_stack_gap(vma, len);
4598+ } while (!IS_ERR_VALUE(addr));
4599
4600 bottomup:
4601 /*
4602@@ -384,6 +384,12 @@ void arch_pick_mmap_layout(struct mm_str
4603 current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY ||
4604 sysctl_legacy_va_layout) {
4605 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4606+
4607+#ifdef CONFIG_PAX_RANDMMAP
4608+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4609+ mm->mmap_base += mm->delta_mmap;
4610+#endif
4611+
4612 mm->get_unmapped_area = arch_get_unmapped_area;
4613 mm->unmap_area = arch_unmap_area;
4614 } else {
4615@@ -398,6 +404,12 @@ void arch_pick_mmap_layout(struct mm_str
4616 gap = (task_size / 6 * 5);
4617
4618 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
4619+
4620+#ifdef CONFIG_PAX_RANDMMAP
4621+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4622+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4623+#endif
4624+
4625 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4626 mm->unmap_area = arch_unmap_area_topdown;
4627 }
4628diff -urNp linux-2.6.32.46/arch/sparc/kernel/traps_32.c linux-2.6.32.46/arch/sparc/kernel/traps_32.c
4629--- linux-2.6.32.46/arch/sparc/kernel/traps_32.c 2011-03-27 14:31:47.000000000 -0400
4630+++ linux-2.6.32.46/arch/sparc/kernel/traps_32.c 2011-06-13 21:25:39.000000000 -0400
4631@@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
4632 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
4633 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
4634
4635+extern void gr_handle_kernel_exploit(void);
4636+
4637 void die_if_kernel(char *str, struct pt_regs *regs)
4638 {
4639 static int die_counter;
4640@@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_
4641 count++ < 30 &&
4642 (((unsigned long) rw) >= PAGE_OFFSET) &&
4643 !(((unsigned long) rw) & 0x7)) {
4644- printk("Caller[%08lx]: %pS\n", rw->ins[7],
4645+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
4646 (void *) rw->ins[7]);
4647 rw = (struct reg_window32 *)rw->ins[6];
4648 }
4649 }
4650 printk("Instruction DUMP:");
4651 instruction_dump ((unsigned long *) regs->pc);
4652- if(regs->psr & PSR_PS)
4653+ if(regs->psr & PSR_PS) {
4654+ gr_handle_kernel_exploit();
4655 do_exit(SIGKILL);
4656+ }
4657 do_exit(SIGSEGV);
4658 }
4659
4660diff -urNp linux-2.6.32.46/arch/sparc/kernel/traps_64.c linux-2.6.32.46/arch/sparc/kernel/traps_64.c
4661--- linux-2.6.32.46/arch/sparc/kernel/traps_64.c 2011-03-27 14:31:47.000000000 -0400
4662+++ linux-2.6.32.46/arch/sparc/kernel/traps_64.c 2011-06-13 21:24:11.000000000 -0400
4663@@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_
4664 i + 1,
4665 p->trapstack[i].tstate, p->trapstack[i].tpc,
4666 p->trapstack[i].tnpc, p->trapstack[i].tt);
4667- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
4668+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
4669 }
4670 }
4671
4672@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
4673
4674 lvl -= 0x100;
4675 if (regs->tstate & TSTATE_PRIV) {
4676+
4677+#ifdef CONFIG_PAX_REFCOUNT
4678+ if (lvl == 6)
4679+ pax_report_refcount_overflow(regs);
4680+#endif
4681+
4682 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
4683 die_if_kernel(buffer, regs);
4684 }
4685@@ -111,11 +117,16 @@ void bad_trap(struct pt_regs *regs, long
4686 void bad_trap_tl1(struct pt_regs *regs, long lvl)
4687 {
4688 char buffer[32];
4689-
4690+
4691 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
4692 0, lvl, SIGTRAP) == NOTIFY_STOP)
4693 return;
4694
4695+#ifdef CONFIG_PAX_REFCOUNT
4696+ if (lvl == 6)
4697+ pax_report_refcount_overflow(regs);
4698+#endif
4699+
4700 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
4701
4702 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
4703@@ -1139,7 +1150,7 @@ static void cheetah_log_errors(struct pt
4704 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
4705 printk("%s" "ERROR(%d): ",
4706 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
4707- printk("TPC<%pS>\n", (void *) regs->tpc);
4708+ printk("TPC<%pA>\n", (void *) regs->tpc);
4709 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
4710 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
4711 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
4712@@ -1746,7 +1757,7 @@ void cheetah_plus_parity_error(int type,
4713 smp_processor_id(),
4714 (type & 0x1) ? 'I' : 'D',
4715 regs->tpc);
4716- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
4717+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
4718 panic("Irrecoverable Cheetah+ parity error.");
4719 }
4720
4721@@ -1754,7 +1765,7 @@ void cheetah_plus_parity_error(int type,
4722 smp_processor_id(),
4723 (type & 0x1) ? 'I' : 'D',
4724 regs->tpc);
4725- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
4726+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
4727 }
4728
4729 struct sun4v_error_entry {
4730@@ -1961,9 +1972,9 @@ void sun4v_itlb_error_report(struct pt_r
4731
4732 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
4733 regs->tpc, tl);
4734- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
4735+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
4736 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
4737- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
4738+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
4739 (void *) regs->u_regs[UREG_I7]);
4740 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
4741 "pte[%lx] error[%lx]\n",
4742@@ -1985,9 +1996,9 @@ void sun4v_dtlb_error_report(struct pt_r
4743
4744 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
4745 regs->tpc, tl);
4746- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
4747+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
4748 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
4749- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
4750+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
4751 (void *) regs->u_regs[UREG_I7]);
4752 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
4753 "pte[%lx] error[%lx]\n",
4754@@ -2191,7 +2202,7 @@ void show_stack(struct task_struct *tsk,
4755 fp = (unsigned long)sf->fp + STACK_BIAS;
4756 }
4757
4758- printk(" [%016lx] %pS\n", pc, (void *) pc);
4759+ printk(" [%016lx] %pA\n", pc, (void *) pc);
4760 } while (++count < 16);
4761 }
4762
4763@@ -2233,6 +2244,8 @@ static inline struct reg_window *kernel_
4764 return (struct reg_window *) (fp + STACK_BIAS);
4765 }
4766
4767+extern void gr_handle_kernel_exploit(void);
4768+
4769 void die_if_kernel(char *str, struct pt_regs *regs)
4770 {
4771 static int die_counter;
4772@@ -2260,7 +2273,7 @@ void die_if_kernel(char *str, struct pt_
4773 while (rw &&
4774 count++ < 30&&
4775 is_kernel_stack(current, rw)) {
4776- printk("Caller[%016lx]: %pS\n", rw->ins[7],
4777+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
4778 (void *) rw->ins[7]);
4779
4780 rw = kernel_stack_up(rw);
4781@@ -2273,8 +2286,11 @@ void die_if_kernel(char *str, struct pt_
4782 }
4783 user_instruction_dump ((unsigned int __user *) regs->tpc);
4784 }
4785- if (regs->tstate & TSTATE_PRIV)
4786+ if (regs->tstate & TSTATE_PRIV) {
4787+ gr_handle_kernel_exploit();
4788 do_exit(SIGKILL);
4789+ }
4790+
4791 do_exit(SIGSEGV);
4792 }
4793 EXPORT_SYMBOL(die_if_kernel);
4794diff -urNp linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S
4795--- linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S 2011-03-27 14:31:47.000000000 -0400
4796+++ linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S 2011-07-13 22:20:05.000000000 -0400
4797@@ -127,7 +127,7 @@ do_int_load:
4798 wr %o5, 0x0, %asi
4799 retl
4800 mov 0, %o0
4801- .size __do_int_load, .-__do_int_load
4802+ .size do_int_load, .-do_int_load
4803
4804 .section __ex_table,"a"
4805 .word 4b, __retl_efault
4806diff -urNp linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c
4807--- linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c 2011-03-27 14:31:47.000000000 -0400
4808+++ linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:56:46.000000000 -0400
4809@@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs
4810 if (count < 5) {
4811 last_time = jiffies;
4812 count++;
4813- printk("Kernel unaligned access at TPC[%lx] %pS\n",
4814+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
4815 regs->tpc, (void *) regs->tpc);
4816 }
4817 }
4818diff -urNp linux-2.6.32.46/arch/sparc/lib/atomic_64.S linux-2.6.32.46/arch/sparc/lib/atomic_64.S
4819--- linux-2.6.32.46/arch/sparc/lib/atomic_64.S 2011-03-27 14:31:47.000000000 -0400
4820+++ linux-2.6.32.46/arch/sparc/lib/atomic_64.S 2011-04-17 15:56:46.000000000 -0400
4821@@ -18,7 +18,12 @@
4822 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
4823 BACKOFF_SETUP(%o2)
4824 1: lduw [%o1], %g1
4825- add %g1, %o0, %g7
4826+ addcc %g1, %o0, %g7
4827+
4828+#ifdef CONFIG_PAX_REFCOUNT
4829+ tvs %icc, 6
4830+#endif
4831+
4832 cas [%o1], %g1, %g7
4833 cmp %g1, %g7
4834 bne,pn %icc, 2f
4835@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = at
4836 2: BACKOFF_SPIN(%o2, %o3, 1b)
4837 .size atomic_add, .-atomic_add
4838
4839+ .globl atomic_add_unchecked
4840+ .type atomic_add_unchecked,#function
4841+atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
4842+ BACKOFF_SETUP(%o2)
4843+1: lduw [%o1], %g1
4844+ add %g1, %o0, %g7
4845+ cas [%o1], %g1, %g7
4846+ cmp %g1, %g7
4847+ bne,pn %icc, 2f
4848+ nop
4849+ retl
4850+ nop
4851+2: BACKOFF_SPIN(%o2, %o3, 1b)
4852+ .size atomic_add_unchecked, .-atomic_add_unchecked
4853+
4854 .globl atomic_sub
4855 .type atomic_sub,#function
4856 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
4857 BACKOFF_SETUP(%o2)
4858 1: lduw [%o1], %g1
4859- sub %g1, %o0, %g7
4860+ subcc %g1, %o0, %g7
4861+
4862+#ifdef CONFIG_PAX_REFCOUNT
4863+ tvs %icc, 6
4864+#endif
4865+
4866 cas [%o1], %g1, %g7
4867 cmp %g1, %g7
4868 bne,pn %icc, 2f
4869@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = at
4870 2: BACKOFF_SPIN(%o2, %o3, 1b)
4871 .size atomic_sub, .-atomic_sub
4872
4873+ .globl atomic_sub_unchecked
4874+ .type atomic_sub_unchecked,#function
4875+atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
4876+ BACKOFF_SETUP(%o2)
4877+1: lduw [%o1], %g1
4878+ sub %g1, %o0, %g7
4879+ cas [%o1], %g1, %g7
4880+ cmp %g1, %g7
4881+ bne,pn %icc, 2f
4882+ nop
4883+ retl
4884+ nop
4885+2: BACKOFF_SPIN(%o2, %o3, 1b)
4886+ .size atomic_sub_unchecked, .-atomic_sub_unchecked
4887+
4888 .globl atomic_add_ret
4889 .type atomic_add_ret,#function
4890 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
4891 BACKOFF_SETUP(%o2)
4892 1: lduw [%o1], %g1
4893- add %g1, %o0, %g7
4894+ addcc %g1, %o0, %g7
4895+
4896+#ifdef CONFIG_PAX_REFCOUNT
4897+ tvs %icc, 6
4898+#endif
4899+
4900 cas [%o1], %g1, %g7
4901 cmp %g1, %g7
4902 bne,pn %icc, 2f
4903@@ -59,12 +104,33 @@ atomic_add_ret: /* %o0 = increment, %o1
4904 2: BACKOFF_SPIN(%o2, %o3, 1b)
4905 .size atomic_add_ret, .-atomic_add_ret
4906
4907+ .globl atomic_add_ret_unchecked
4908+ .type atomic_add_ret_unchecked,#function
4909+atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
4910+ BACKOFF_SETUP(%o2)
4911+1: lduw [%o1], %g1
4912+ addcc %g1, %o0, %g7
4913+ cas [%o1], %g1, %g7
4914+ cmp %g1, %g7
4915+ bne,pn %icc, 2f
4916+ add %g7, %o0, %g7
4917+ sra %g7, 0, %o0
4918+ retl
4919+ nop
4920+2: BACKOFF_SPIN(%o2, %o3, 1b)
4921+ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
4922+
4923 .globl atomic_sub_ret
4924 .type atomic_sub_ret,#function
4925 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
4926 BACKOFF_SETUP(%o2)
4927 1: lduw [%o1], %g1
4928- sub %g1, %o0, %g7
4929+ subcc %g1, %o0, %g7
4930+
4931+#ifdef CONFIG_PAX_REFCOUNT
4932+ tvs %icc, 6
4933+#endif
4934+
4935 cas [%o1], %g1, %g7
4936 cmp %g1, %g7
4937 bne,pn %icc, 2f
4938@@ -80,7 +146,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1
4939 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
4940 BACKOFF_SETUP(%o2)
4941 1: ldx [%o1], %g1
4942- add %g1, %o0, %g7
4943+ addcc %g1, %o0, %g7
4944+
4945+#ifdef CONFIG_PAX_REFCOUNT
4946+ tvs %xcc, 6
4947+#endif
4948+
4949 casx [%o1], %g1, %g7
4950 cmp %g1, %g7
4951 bne,pn %xcc, 2f
4952@@ -90,12 +161,32 @@ atomic64_add: /* %o0 = increment, %o1 =
4953 2: BACKOFF_SPIN(%o2, %o3, 1b)
4954 .size atomic64_add, .-atomic64_add
4955
4956+ .globl atomic64_add_unchecked
4957+ .type atomic64_add_unchecked,#function
4958+atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
4959+ BACKOFF_SETUP(%o2)
4960+1: ldx [%o1], %g1
4961+ addcc %g1, %o0, %g7
4962+ casx [%o1], %g1, %g7
4963+ cmp %g1, %g7
4964+ bne,pn %xcc, 2f
4965+ nop
4966+ retl
4967+ nop
4968+2: BACKOFF_SPIN(%o2, %o3, 1b)
4969+ .size atomic64_add_unchecked, .-atomic64_add_unchecked
4970+
4971 .globl atomic64_sub
4972 .type atomic64_sub,#function
4973 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
4974 BACKOFF_SETUP(%o2)
4975 1: ldx [%o1], %g1
4976- sub %g1, %o0, %g7
4977+ subcc %g1, %o0, %g7
4978+
4979+#ifdef CONFIG_PAX_REFCOUNT
4980+ tvs %xcc, 6
4981+#endif
4982+
4983 casx [%o1], %g1, %g7
4984 cmp %g1, %g7
4985 bne,pn %xcc, 2f
4986@@ -105,12 +196,32 @@ atomic64_sub: /* %o0 = decrement, %o1 =
4987 2: BACKOFF_SPIN(%o2, %o3, 1b)
4988 .size atomic64_sub, .-atomic64_sub
4989
4990+ .globl atomic64_sub_unchecked
4991+ .type atomic64_sub_unchecked,#function
4992+atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
4993+ BACKOFF_SETUP(%o2)
4994+1: ldx [%o1], %g1
4995+ subcc %g1, %o0, %g7
4996+ casx [%o1], %g1, %g7
4997+ cmp %g1, %g7
4998+ bne,pn %xcc, 2f
4999+ nop
5000+ retl
5001+ nop
5002+2: BACKOFF_SPIN(%o2, %o3, 1b)
5003+ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
5004+
5005 .globl atomic64_add_ret
5006 .type atomic64_add_ret,#function
5007 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5008 BACKOFF_SETUP(%o2)
5009 1: ldx [%o1], %g1
5010- add %g1, %o0, %g7
5011+ addcc %g1, %o0, %g7
5012+
5013+#ifdef CONFIG_PAX_REFCOUNT
5014+ tvs %xcc, 6
5015+#endif
5016+
5017 casx [%o1], %g1, %g7
5018 cmp %g1, %g7
5019 bne,pn %xcc, 2f
5020@@ -121,12 +232,33 @@ atomic64_add_ret: /* %o0 = increment, %o
5021 2: BACKOFF_SPIN(%o2, %o3, 1b)
5022 .size atomic64_add_ret, .-atomic64_add_ret
5023
5024+ .globl atomic64_add_ret_unchecked
5025+ .type atomic64_add_ret_unchecked,#function
5026+atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5027+ BACKOFF_SETUP(%o2)
5028+1: ldx [%o1], %g1
5029+ addcc %g1, %o0, %g7
5030+ casx [%o1], %g1, %g7
5031+ cmp %g1, %g7
5032+ bne,pn %xcc, 2f
5033+ add %g7, %o0, %g7
5034+ mov %g7, %o0
5035+ retl
5036+ nop
5037+2: BACKOFF_SPIN(%o2, %o3, 1b)
5038+ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
5039+
5040 .globl atomic64_sub_ret
5041 .type atomic64_sub_ret,#function
5042 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5043 BACKOFF_SETUP(%o2)
5044 1: ldx [%o1], %g1
5045- sub %g1, %o0, %g7
5046+ subcc %g1, %o0, %g7
5047+
5048+#ifdef CONFIG_PAX_REFCOUNT
5049+ tvs %xcc, 6
5050+#endif
5051+
5052 casx [%o1], %g1, %g7
5053 cmp %g1, %g7
5054 bne,pn %xcc, 2f
5055diff -urNp linux-2.6.32.46/arch/sparc/lib/ksyms.c linux-2.6.32.46/arch/sparc/lib/ksyms.c
5056--- linux-2.6.32.46/arch/sparc/lib/ksyms.c 2011-03-27 14:31:47.000000000 -0400
5057+++ linux-2.6.32.46/arch/sparc/lib/ksyms.c 2011-08-19 23:05:14.000000000 -0400
5058@@ -144,12 +144,18 @@ EXPORT_SYMBOL(__downgrade_write);
5059
5060 /* Atomic counter implementation. */
5061 EXPORT_SYMBOL(atomic_add);
5062+EXPORT_SYMBOL(atomic_add_unchecked);
5063 EXPORT_SYMBOL(atomic_add_ret);
5064+EXPORT_SYMBOL(atomic_add_ret_unchecked);
5065 EXPORT_SYMBOL(atomic_sub);
5066+EXPORT_SYMBOL(atomic_sub_unchecked);
5067 EXPORT_SYMBOL(atomic_sub_ret);
5068 EXPORT_SYMBOL(atomic64_add);
5069+EXPORT_SYMBOL(atomic64_add_unchecked);
5070 EXPORT_SYMBOL(atomic64_add_ret);
5071+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
5072 EXPORT_SYMBOL(atomic64_sub);
5073+EXPORT_SYMBOL(atomic64_sub_unchecked);
5074 EXPORT_SYMBOL(atomic64_sub_ret);
5075
5076 /* Atomic bit operations. */
5077diff -urNp linux-2.6.32.46/arch/sparc/lib/Makefile linux-2.6.32.46/arch/sparc/lib/Makefile
5078--- linux-2.6.32.46/arch/sparc/lib/Makefile 2011-03-27 14:31:47.000000000 -0400
5079+++ linux-2.6.32.46/arch/sparc/lib/Makefile 2011-05-17 19:26:34.000000000 -0400
5080@@ -2,7 +2,7 @@
5081 #
5082
5083 asflags-y := -ansi -DST_DIV0=0x02
5084-ccflags-y := -Werror
5085+#ccflags-y := -Werror
5086
5087 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
5088 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
5089diff -urNp linux-2.6.32.46/arch/sparc/lib/rwsem_64.S linux-2.6.32.46/arch/sparc/lib/rwsem_64.S
5090--- linux-2.6.32.46/arch/sparc/lib/rwsem_64.S 2011-03-27 14:31:47.000000000 -0400
5091+++ linux-2.6.32.46/arch/sparc/lib/rwsem_64.S 2011-04-17 15:56:46.000000000 -0400
5092@@ -11,7 +11,12 @@
5093 .globl __down_read
5094 __down_read:
5095 1: lduw [%o0], %g1
5096- add %g1, 1, %g7
5097+ addcc %g1, 1, %g7
5098+
5099+#ifdef CONFIG_PAX_REFCOUNT
5100+ tvs %icc, 6
5101+#endif
5102+
5103 cas [%o0], %g1, %g7
5104 cmp %g1, %g7
5105 bne,pn %icc, 1b
5106@@ -33,7 +38,12 @@ __down_read:
5107 .globl __down_read_trylock
5108 __down_read_trylock:
5109 1: lduw [%o0], %g1
5110- add %g1, 1, %g7
5111+ addcc %g1, 1, %g7
5112+
5113+#ifdef CONFIG_PAX_REFCOUNT
5114+ tvs %icc, 6
5115+#endif
5116+
5117 cmp %g7, 0
5118 bl,pn %icc, 2f
5119 mov 0, %o1
5120@@ -51,7 +61,12 @@ __down_write:
5121 or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1
5122 1:
5123 lduw [%o0], %g3
5124- add %g3, %g1, %g7
5125+ addcc %g3, %g1, %g7
5126+
5127+#ifdef CONFIG_PAX_REFCOUNT
5128+ tvs %icc, 6
5129+#endif
5130+
5131 cas [%o0], %g3, %g7
5132 cmp %g3, %g7
5133 bne,pn %icc, 1b
5134@@ -77,7 +92,12 @@ __down_write_trylock:
5135 cmp %g3, 0
5136 bne,pn %icc, 2f
5137 mov 0, %o1
5138- add %g3, %g1, %g7
5139+ addcc %g3, %g1, %g7
5140+
5141+#ifdef CONFIG_PAX_REFCOUNT
5142+ tvs %icc, 6
5143+#endif
5144+
5145 cas [%o0], %g3, %g7
5146 cmp %g3, %g7
5147 bne,pn %icc, 1b
5148@@ -90,7 +110,12 @@ __down_write_trylock:
5149 __up_read:
5150 1:
5151 lduw [%o0], %g1
5152- sub %g1, 1, %g7
5153+ subcc %g1, 1, %g7
5154+
5155+#ifdef CONFIG_PAX_REFCOUNT
5156+ tvs %icc, 6
5157+#endif
5158+
5159 cas [%o0], %g1, %g7
5160 cmp %g1, %g7
5161 bne,pn %icc, 1b
5162@@ -118,7 +143,12 @@ __up_write:
5163 or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1
5164 1:
5165 lduw [%o0], %g3
5166- sub %g3, %g1, %g7
5167+ subcc %g3, %g1, %g7
5168+
5169+#ifdef CONFIG_PAX_REFCOUNT
5170+ tvs %icc, 6
5171+#endif
5172+
5173 cas [%o0], %g3, %g7
5174 cmp %g3, %g7
5175 bne,pn %icc, 1b
5176@@ -143,7 +173,12 @@ __downgrade_write:
5177 or %g1, %lo(RWSEM_WAITING_BIAS), %g1
5178 1:
5179 lduw [%o0], %g3
5180- sub %g3, %g1, %g7
5181+ subcc %g3, %g1, %g7
5182+
5183+#ifdef CONFIG_PAX_REFCOUNT
5184+ tvs %icc, 6
5185+#endif
5186+
5187 cas [%o0], %g3, %g7
5188 cmp %g3, %g7
5189 bne,pn %icc, 1b
5190diff -urNp linux-2.6.32.46/arch/sparc/Makefile linux-2.6.32.46/arch/sparc/Makefile
5191--- linux-2.6.32.46/arch/sparc/Makefile 2011-03-27 14:31:47.000000000 -0400
5192+++ linux-2.6.32.46/arch/sparc/Makefile 2011-04-17 15:56:46.000000000 -0400
5193@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
5194 # Export what is needed by arch/sparc/boot/Makefile
5195 export VMLINUX_INIT VMLINUX_MAIN
5196 VMLINUX_INIT := $(head-y) $(init-y)
5197-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
5198+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
5199 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
5200 VMLINUX_MAIN += $(drivers-y) $(net-y)
5201
5202diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_32.c linux-2.6.32.46/arch/sparc/mm/fault_32.c
5203--- linux-2.6.32.46/arch/sparc/mm/fault_32.c 2011-03-27 14:31:47.000000000 -0400
5204+++ linux-2.6.32.46/arch/sparc/mm/fault_32.c 2011-04-17 15:56:46.000000000 -0400
5205@@ -21,6 +21,9 @@
5206 #include <linux/interrupt.h>
5207 #include <linux/module.h>
5208 #include <linux/kdebug.h>
5209+#include <linux/slab.h>
5210+#include <linux/pagemap.h>
5211+#include <linux/compiler.h>
5212
5213 #include <asm/system.h>
5214 #include <asm/page.h>
5215@@ -167,6 +170,267 @@ static unsigned long compute_si_addr(str
5216 return safe_compute_effective_address(regs, insn);
5217 }
5218
5219+#ifdef CONFIG_PAX_PAGEEXEC
5220+#ifdef CONFIG_PAX_DLRESOLVE
5221+static void pax_emuplt_close(struct vm_area_struct *vma)
5222+{
5223+ vma->vm_mm->call_dl_resolve = 0UL;
5224+}
5225+
5226+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
5227+{
5228+ unsigned int *kaddr;
5229+
5230+ vmf->page = alloc_page(GFP_HIGHUSER);
5231+ if (!vmf->page)
5232+ return VM_FAULT_OOM;
5233+
5234+ kaddr = kmap(vmf->page);
5235+ memset(kaddr, 0, PAGE_SIZE);
5236+ kaddr[0] = 0x9DE3BFA8U; /* save */
5237+ flush_dcache_page(vmf->page);
5238+ kunmap(vmf->page);
5239+ return VM_FAULT_MAJOR;
5240+}
5241+
5242+static const struct vm_operations_struct pax_vm_ops = {
5243+ .close = pax_emuplt_close,
5244+ .fault = pax_emuplt_fault
5245+};
5246+
5247+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
5248+{
5249+ int ret;
5250+
5251+ vma->vm_mm = current->mm;
5252+ vma->vm_start = addr;
5253+ vma->vm_end = addr + PAGE_SIZE;
5254+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
5255+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5256+ vma->vm_ops = &pax_vm_ops;
5257+
5258+ ret = insert_vm_struct(current->mm, vma);
5259+ if (ret)
5260+ return ret;
5261+
5262+ ++current->mm->total_vm;
5263+ return 0;
5264+}
5265+#endif
5266+
5267+/*
5268+ * PaX: decide what to do with offenders (regs->pc = fault address)
5269+ *
5270+ * returns 1 when task should be killed
5271+ * 2 when patched PLT trampoline was detected
5272+ * 3 when unpatched PLT trampoline was detected
5273+ */
5274+static int pax_handle_fetch_fault(struct pt_regs *regs)
5275+{
5276+
5277+#ifdef CONFIG_PAX_EMUPLT
5278+ int err;
5279+
5280+ do { /* PaX: patched PLT emulation #1 */
5281+ unsigned int sethi1, sethi2, jmpl;
5282+
5283+ err = get_user(sethi1, (unsigned int *)regs->pc);
5284+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
5285+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
5286+
5287+ if (err)
5288+ break;
5289+
5290+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
5291+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
5292+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
5293+ {
5294+ unsigned int addr;
5295+
5296+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
5297+ addr = regs->u_regs[UREG_G1];
5298+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
5299+ regs->pc = addr;
5300+ regs->npc = addr+4;
5301+ return 2;
5302+ }
5303+ } while (0);
5304+
5305+ { /* PaX: patched PLT emulation #2 */
5306+ unsigned int ba;
5307+
5308+ err = get_user(ba, (unsigned int *)regs->pc);
5309+
5310+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
5311+ unsigned int addr;
5312+
5313+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
5314+ regs->pc = addr;
5315+ regs->npc = addr+4;
5316+ return 2;
5317+ }
5318+ }
5319+
5320+ do { /* PaX: patched PLT emulation #3 */
5321+ unsigned int sethi, jmpl, nop;
5322+
5323+ err = get_user(sethi, (unsigned int *)regs->pc);
5324+ err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
5325+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
5326+
5327+ if (err)
5328+ break;
5329+
5330+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5331+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
5332+ nop == 0x01000000U)
5333+ {
5334+ unsigned int addr;
5335+
5336+ addr = (sethi & 0x003FFFFFU) << 10;
5337+ regs->u_regs[UREG_G1] = addr;
5338+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
5339+ regs->pc = addr;
5340+ regs->npc = addr+4;
5341+ return 2;
5342+ }
5343+ } while (0);
5344+
5345+ do { /* PaX: unpatched PLT emulation step 1 */
5346+ unsigned int sethi, ba, nop;
5347+
5348+ err = get_user(sethi, (unsigned int *)regs->pc);
5349+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
5350+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
5351+
5352+ if (err)
5353+ break;
5354+
5355+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5356+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
5357+ nop == 0x01000000U)
5358+ {
5359+ unsigned int addr, save, call;
5360+
5361+ if ((ba & 0xFFC00000U) == 0x30800000U)
5362+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
5363+ else
5364+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
5365+
5366+ err = get_user(save, (unsigned int *)addr);
5367+ err |= get_user(call, (unsigned int *)(addr+4));
5368+ err |= get_user(nop, (unsigned int *)(addr+8));
5369+ if (err)
5370+ break;
5371+
5372+#ifdef CONFIG_PAX_DLRESOLVE
5373+ if (save == 0x9DE3BFA8U &&
5374+ (call & 0xC0000000U) == 0x40000000U &&
5375+ nop == 0x01000000U)
5376+ {
5377+ struct vm_area_struct *vma;
5378+ unsigned long call_dl_resolve;
5379+
5380+ down_read(&current->mm->mmap_sem);
5381+ call_dl_resolve = current->mm->call_dl_resolve;
5382+ up_read(&current->mm->mmap_sem);
5383+ if (likely(call_dl_resolve))
5384+ goto emulate;
5385+
5386+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
5387+
5388+ down_write(&current->mm->mmap_sem);
5389+ if (current->mm->call_dl_resolve) {
5390+ call_dl_resolve = current->mm->call_dl_resolve;
5391+ up_write(&current->mm->mmap_sem);
5392+ if (vma)
5393+ kmem_cache_free(vm_area_cachep, vma);
5394+ goto emulate;
5395+ }
5396+
5397+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
5398+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
5399+ up_write(&current->mm->mmap_sem);
5400+ if (vma)
5401+ kmem_cache_free(vm_area_cachep, vma);
5402+ return 1;
5403+ }
5404+
5405+ if (pax_insert_vma(vma, call_dl_resolve)) {
5406+ up_write(&current->mm->mmap_sem);
5407+ kmem_cache_free(vm_area_cachep, vma);
5408+ return 1;
5409+ }
5410+
5411+ current->mm->call_dl_resolve = call_dl_resolve;
5412+ up_write(&current->mm->mmap_sem);
5413+
5414+emulate:
5415+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
5416+ regs->pc = call_dl_resolve;
5417+ regs->npc = addr+4;
5418+ return 3;
5419+ }
5420+#endif
5421+
5422+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
5423+ if ((save & 0xFFC00000U) == 0x05000000U &&
5424+ (call & 0xFFFFE000U) == 0x85C0A000U &&
5425+ nop == 0x01000000U)
5426+ {
5427+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
5428+ regs->u_regs[UREG_G2] = addr + 4;
5429+ addr = (save & 0x003FFFFFU) << 10;
5430+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
5431+ regs->pc = addr;
5432+ regs->npc = addr+4;
5433+ return 3;
5434+ }
5435+ }
5436+ } while (0);
5437+
5438+ do { /* PaX: unpatched PLT emulation step 2 */
5439+ unsigned int save, call, nop;
5440+
5441+ err = get_user(save, (unsigned int *)(regs->pc-4));
5442+ err |= get_user(call, (unsigned int *)regs->pc);
5443+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
5444+ if (err)
5445+ break;
5446+
5447+ if (save == 0x9DE3BFA8U &&
5448+ (call & 0xC0000000U) == 0x40000000U &&
5449+ nop == 0x01000000U)
5450+ {
5451+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
5452+
5453+ regs->u_regs[UREG_RETPC] = regs->pc;
5454+ regs->pc = dl_resolve;
5455+ regs->npc = dl_resolve+4;
5456+ return 3;
5457+ }
5458+ } while (0);
5459+#endif
5460+
5461+ return 1;
5462+}
5463+
5464+void pax_report_insns(void *pc, void *sp)
5465+{
5466+ unsigned long i;
5467+
5468+ printk(KERN_ERR "PAX: bytes at PC: ");
5469+ for (i = 0; i < 8; i++) {
5470+ unsigned int c;
5471+ if (get_user(c, (unsigned int *)pc+i))
5472+ printk(KERN_CONT "???????? ");
5473+ else
5474+ printk(KERN_CONT "%08x ", c);
5475+ }
5476+ printk("\n");
5477+}
5478+#endif
5479+
5480 asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
5481 unsigned long address)
5482 {
5483@@ -231,6 +495,24 @@ good_area:
5484 if(!(vma->vm_flags & VM_WRITE))
5485 goto bad_area;
5486 } else {
5487+
5488+#ifdef CONFIG_PAX_PAGEEXEC
5489+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
5490+ up_read(&mm->mmap_sem);
5491+ switch (pax_handle_fetch_fault(regs)) {
5492+
5493+#ifdef CONFIG_PAX_EMUPLT
5494+ case 2:
5495+ case 3:
5496+ return;
5497+#endif
5498+
5499+ }
5500+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
5501+ do_group_exit(SIGKILL);
5502+ }
5503+#endif
5504+
5505 /* Allow reads even for write-only mappings */
5506 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
5507 goto bad_area;
5508diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_64.c linux-2.6.32.46/arch/sparc/mm/fault_64.c
5509--- linux-2.6.32.46/arch/sparc/mm/fault_64.c 2011-03-27 14:31:47.000000000 -0400
5510+++ linux-2.6.32.46/arch/sparc/mm/fault_64.c 2011-04-17 15:56:46.000000000 -0400
5511@@ -20,6 +20,9 @@
5512 #include <linux/kprobes.h>
5513 #include <linux/kdebug.h>
5514 #include <linux/percpu.h>
5515+#include <linux/slab.h>
5516+#include <linux/pagemap.h>
5517+#include <linux/compiler.h>
5518
5519 #include <asm/page.h>
5520 #include <asm/pgtable.h>
5521@@ -78,7 +81,7 @@ static void bad_kernel_pc(struct pt_regs
5522 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
5523 regs->tpc);
5524 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
5525- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
5526+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
5527 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
5528 dump_stack();
5529 unhandled_fault(regs->tpc, current, regs);
5530@@ -249,6 +252,456 @@ static void noinline bogus_32bit_fault_a
5531 show_regs(regs);
5532 }
5533
5534+#ifdef CONFIG_PAX_PAGEEXEC
5535+#ifdef CONFIG_PAX_DLRESOLVE
5536+static void pax_emuplt_close(struct vm_area_struct *vma)
5537+{
5538+ vma->vm_mm->call_dl_resolve = 0UL;
5539+}
5540+
5541+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
5542+{
5543+ unsigned int *kaddr;
5544+
5545+ vmf->page = alloc_page(GFP_HIGHUSER);
5546+ if (!vmf->page)
5547+ return VM_FAULT_OOM;
5548+
5549+ kaddr = kmap(vmf->page);
5550+ memset(kaddr, 0, PAGE_SIZE);
5551+ kaddr[0] = 0x9DE3BFA8U; /* save */
5552+ flush_dcache_page(vmf->page);
5553+ kunmap(vmf->page);
5554+ return VM_FAULT_MAJOR;
5555+}
5556+
5557+static const struct vm_operations_struct pax_vm_ops = {
5558+ .close = pax_emuplt_close,
5559+ .fault = pax_emuplt_fault
5560+};
5561+
5562+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
5563+{
5564+ int ret;
5565+
5566+ vma->vm_mm = current->mm;
5567+ vma->vm_start = addr;
5568+ vma->vm_end = addr + PAGE_SIZE;
5569+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
5570+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5571+ vma->vm_ops = &pax_vm_ops;
5572+
5573+ ret = insert_vm_struct(current->mm, vma);
5574+ if (ret)
5575+ return ret;
5576+
5577+ ++current->mm->total_vm;
5578+ return 0;
5579+}
5580+#endif
5581+
5582+/*
5583+ * PaX: decide what to do with offenders (regs->tpc = fault address)
5584+ *
5585+ * returns 1 when task should be killed
5586+ * 2 when patched PLT trampoline was detected
5587+ * 3 when unpatched PLT trampoline was detected
5588+ */
5589+static int pax_handle_fetch_fault(struct pt_regs *regs)
5590+{
5591+
5592+#ifdef CONFIG_PAX_EMUPLT
5593+ int err;
5594+
5595+ do { /* PaX: patched PLT emulation #1 */
5596+ unsigned int sethi1, sethi2, jmpl;
5597+
5598+ err = get_user(sethi1, (unsigned int *)regs->tpc);
5599+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
5600+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
5601+
5602+ if (err)
5603+ break;
5604+
5605+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
5606+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
5607+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
5608+ {
5609+ unsigned long addr;
5610+
5611+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
5612+ addr = regs->u_regs[UREG_G1];
5613+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
5614+
5615+ if (test_thread_flag(TIF_32BIT))
5616+ addr &= 0xFFFFFFFFUL;
5617+
5618+ regs->tpc = addr;
5619+ regs->tnpc = addr+4;
5620+ return 2;
5621+ }
5622+ } while (0);
5623+
5624+ { /* PaX: patched PLT emulation #2 */
5625+ unsigned int ba;
5626+
5627+ err = get_user(ba, (unsigned int *)regs->tpc);
5628+
5629+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
5630+ unsigned long addr;
5631+
5632+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
5633+
5634+ if (test_thread_flag(TIF_32BIT))
5635+ addr &= 0xFFFFFFFFUL;
5636+
5637+ regs->tpc = addr;
5638+ regs->tnpc = addr+4;
5639+ return 2;
5640+ }
5641+ }
5642+
5643+ do { /* PaX: patched PLT emulation #3 */
5644+ unsigned int sethi, jmpl, nop;
5645+
5646+ err = get_user(sethi, (unsigned int *)regs->tpc);
5647+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
5648+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
5649+
5650+ if (err)
5651+ break;
5652+
5653+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5654+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
5655+ nop == 0x01000000U)
5656+ {
5657+ unsigned long addr;
5658+
5659+ addr = (sethi & 0x003FFFFFU) << 10;
5660+ regs->u_regs[UREG_G1] = addr;
5661+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
5662+
5663+ if (test_thread_flag(TIF_32BIT))
5664+ addr &= 0xFFFFFFFFUL;
5665+
5666+ regs->tpc = addr;
5667+ regs->tnpc = addr+4;
5668+ return 2;
5669+ }
5670+ } while (0);
5671+
5672+ do { /* PaX: patched PLT emulation #4 */
5673+ unsigned int sethi, mov1, call, mov2;
5674+
5675+ err = get_user(sethi, (unsigned int *)regs->tpc);
5676+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
5677+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
5678+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
5679+
5680+ if (err)
5681+ break;
5682+
5683+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5684+ mov1 == 0x8210000FU &&
5685+ (call & 0xC0000000U) == 0x40000000U &&
5686+ mov2 == 0x9E100001U)
5687+ {
5688+ unsigned long addr;
5689+
5690+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
5691+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
5692+
5693+ if (test_thread_flag(TIF_32BIT))
5694+ addr &= 0xFFFFFFFFUL;
5695+
5696+ regs->tpc = addr;
5697+ regs->tnpc = addr+4;
5698+ return 2;
5699+ }
5700+ } while (0);
5701+
5702+ do { /* PaX: patched PLT emulation #5 */
5703+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
5704+
5705+ err = get_user(sethi, (unsigned int *)regs->tpc);
5706+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
5707+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
5708+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
5709+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
5710+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
5711+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
5712+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
5713+
5714+ if (err)
5715+ break;
5716+
5717+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5718+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
5719+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
5720+ (or1 & 0xFFFFE000U) == 0x82106000U &&
5721+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
5722+ sllx == 0x83287020U &&
5723+ jmpl == 0x81C04005U &&
5724+ nop == 0x01000000U)
5725+ {
5726+ unsigned long addr;
5727+
5728+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
5729+ regs->u_regs[UREG_G1] <<= 32;
5730+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
5731+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
5732+ regs->tpc = addr;
5733+ regs->tnpc = addr+4;
5734+ return 2;
5735+ }
5736+ } while (0);
5737+
5738+ do { /* PaX: patched PLT emulation #6 */
5739+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
5740+
5741+ err = get_user(sethi, (unsigned int *)regs->tpc);
5742+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
5743+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
5744+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
5745+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
5746+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
5747+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
5748+
5749+ if (err)
5750+ break;
5751+
5752+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5753+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
5754+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
5755+ sllx == 0x83287020U &&
5756+ (or & 0xFFFFE000U) == 0x8A116000U &&
5757+ jmpl == 0x81C04005U &&
5758+ nop == 0x01000000U)
5759+ {
5760+ unsigned long addr;
5761+
5762+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
5763+ regs->u_regs[UREG_G1] <<= 32;
5764+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
5765+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
5766+ regs->tpc = addr;
5767+ regs->tnpc = addr+4;
5768+ return 2;
5769+ }
5770+ } while (0);
5771+
5772+ do { /* PaX: unpatched PLT emulation step 1 */
5773+ unsigned int sethi, ba, nop;
5774+
5775+ err = get_user(sethi, (unsigned int *)regs->tpc);
5776+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
5777+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
5778+
5779+ if (err)
5780+ break;
5781+
5782+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5783+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
5784+ nop == 0x01000000U)
5785+ {
5786+ unsigned long addr;
5787+ unsigned int save, call;
5788+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
5789+
5790+ if ((ba & 0xFFC00000U) == 0x30800000U)
5791+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
5792+ else
5793+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
5794+
5795+ if (test_thread_flag(TIF_32BIT))
5796+ addr &= 0xFFFFFFFFUL;
5797+
5798+ err = get_user(save, (unsigned int *)addr);
5799+ err |= get_user(call, (unsigned int *)(addr+4));
5800+ err |= get_user(nop, (unsigned int *)(addr+8));
5801+ if (err)
5802+ break;
5803+
5804+#ifdef CONFIG_PAX_DLRESOLVE
5805+ if (save == 0x9DE3BFA8U &&
5806+ (call & 0xC0000000U) == 0x40000000U &&
5807+ nop == 0x01000000U)
5808+ {
5809+ struct vm_area_struct *vma;
5810+ unsigned long call_dl_resolve;
5811+
5812+ down_read(&current->mm->mmap_sem);
5813+ call_dl_resolve = current->mm->call_dl_resolve;
5814+ up_read(&current->mm->mmap_sem);
5815+ if (likely(call_dl_resolve))
5816+ goto emulate;
5817+
5818+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
5819+
5820+ down_write(&current->mm->mmap_sem);
5821+ if (current->mm->call_dl_resolve) {
5822+ call_dl_resolve = current->mm->call_dl_resolve;
5823+ up_write(&current->mm->mmap_sem);
5824+ if (vma)
5825+ kmem_cache_free(vm_area_cachep, vma);
5826+ goto emulate;
5827+ }
5828+
5829+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
5830+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
5831+ up_write(&current->mm->mmap_sem);
5832+ if (vma)
5833+ kmem_cache_free(vm_area_cachep, vma);
5834+ return 1;
5835+ }
5836+
5837+ if (pax_insert_vma(vma, call_dl_resolve)) {
5838+ up_write(&current->mm->mmap_sem);
5839+ kmem_cache_free(vm_area_cachep, vma);
5840+ return 1;
5841+ }
5842+
5843+ current->mm->call_dl_resolve = call_dl_resolve;
5844+ up_write(&current->mm->mmap_sem);
5845+
5846+emulate:
5847+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
5848+ regs->tpc = call_dl_resolve;
5849+ regs->tnpc = addr+4;
5850+ return 3;
5851+ }
5852+#endif
5853+
5854+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
5855+ if ((save & 0xFFC00000U) == 0x05000000U &&
5856+ (call & 0xFFFFE000U) == 0x85C0A000U &&
5857+ nop == 0x01000000U)
5858+ {
5859+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
5860+ regs->u_regs[UREG_G2] = addr + 4;
5861+ addr = (save & 0x003FFFFFU) << 10;
5862+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
5863+
5864+ if (test_thread_flag(TIF_32BIT))
5865+ addr &= 0xFFFFFFFFUL;
5866+
5867+ regs->tpc = addr;
5868+ regs->tnpc = addr+4;
5869+ return 3;
5870+ }
5871+
5872+ /* PaX: 64-bit PLT stub */
5873+ err = get_user(sethi1, (unsigned int *)addr);
5874+ err |= get_user(sethi2, (unsigned int *)(addr+4));
5875+ err |= get_user(or1, (unsigned int *)(addr+8));
5876+ err |= get_user(or2, (unsigned int *)(addr+12));
5877+ err |= get_user(sllx, (unsigned int *)(addr+16));
5878+ err |= get_user(add, (unsigned int *)(addr+20));
5879+ err |= get_user(jmpl, (unsigned int *)(addr+24));
5880+ err |= get_user(nop, (unsigned int *)(addr+28));
5881+ if (err)
5882+ break;
5883+
5884+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
5885+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
5886+ (or1 & 0xFFFFE000U) == 0x88112000U &&
5887+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
5888+ sllx == 0x89293020U &&
5889+ add == 0x8A010005U &&
5890+ jmpl == 0x89C14000U &&
5891+ nop == 0x01000000U)
5892+ {
5893+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
5894+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
5895+ regs->u_regs[UREG_G4] <<= 32;
5896+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
5897+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
5898+ regs->u_regs[UREG_G4] = addr + 24;
5899+ addr = regs->u_regs[UREG_G5];
5900+ regs->tpc = addr;
5901+ regs->tnpc = addr+4;
5902+ return 3;
5903+ }
5904+ }
5905+ } while (0);
5906+
5907+#ifdef CONFIG_PAX_DLRESOLVE
5908+ do { /* PaX: unpatched PLT emulation step 2 */
5909+ unsigned int save, call, nop;
5910+
5911+ err = get_user(save, (unsigned int *)(regs->tpc-4));
5912+ err |= get_user(call, (unsigned int *)regs->tpc);
5913+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
5914+ if (err)
5915+ break;
5916+
5917+ if (save == 0x9DE3BFA8U &&
5918+ (call & 0xC0000000U) == 0x40000000U &&
5919+ nop == 0x01000000U)
5920+ {
5921+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
5922+
5923+ if (test_thread_flag(TIF_32BIT))
5924+ dl_resolve &= 0xFFFFFFFFUL;
5925+
5926+ regs->u_regs[UREG_RETPC] = regs->tpc;
5927+ regs->tpc = dl_resolve;
5928+ regs->tnpc = dl_resolve+4;
5929+ return 3;
5930+ }
5931+ } while (0);
5932+#endif
5933+
5934+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
5935+ unsigned int sethi, ba, nop;
5936+
5937+ err = get_user(sethi, (unsigned int *)regs->tpc);
5938+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
5939+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
5940+
5941+ if (err)
5942+ break;
5943+
5944+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5945+ (ba & 0xFFF00000U) == 0x30600000U &&
5946+ nop == 0x01000000U)
5947+ {
5948+ unsigned long addr;
5949+
5950+ addr = (sethi & 0x003FFFFFU) << 10;
5951+ regs->u_regs[UREG_G1] = addr;
5952+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
5953+
5954+ if (test_thread_flag(TIF_32BIT))
5955+ addr &= 0xFFFFFFFFUL;
5956+
5957+ regs->tpc = addr;
5958+ regs->tnpc = addr+4;
5959+ return 2;
5960+ }
5961+ } while (0);
5962+
5963+#endif
5964+
5965+ return 1;
5966+}
5967+
5968+void pax_report_insns(void *pc, void *sp)
5969+{
5970+ unsigned long i;
5971+
5972+ printk(KERN_ERR "PAX: bytes at PC: ");
5973+ for (i = 0; i < 8; i++) {
5974+ unsigned int c;
5975+ if (get_user(c, (unsigned int *)pc+i))
5976+ printk(KERN_CONT "???????? ");
5977+ else
5978+ printk(KERN_CONT "%08x ", c);
5979+ }
5980+ printk("\n");
5981+}
5982+#endif
5983+
5984 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
5985 {
5986 struct mm_struct *mm = current->mm;
5987@@ -315,6 +768,29 @@ asmlinkage void __kprobes do_sparc64_fau
5988 if (!vma)
5989 goto bad_area;
5990
5991+#ifdef CONFIG_PAX_PAGEEXEC
5992+ /* PaX: detect ITLB misses on non-exec pages */
5993+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
5994+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
5995+ {
5996+ if (address != regs->tpc)
5997+ goto good_area;
5998+
5999+ up_read(&mm->mmap_sem);
6000+ switch (pax_handle_fetch_fault(regs)) {
6001+
6002+#ifdef CONFIG_PAX_EMUPLT
6003+ case 2:
6004+ case 3:
6005+ return;
6006+#endif
6007+
6008+ }
6009+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
6010+ do_group_exit(SIGKILL);
6011+ }
6012+#endif
6013+
6014 /* Pure DTLB misses do not tell us whether the fault causing
6015 * load/store/atomic was a write or not, it only says that there
6016 * was no match. So in such a case we (carefully) read the
6017diff -urNp linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c
6018--- linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400
6019+++ linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:56:46.000000000 -0400
6020@@ -69,7 +69,7 @@ full_search:
6021 }
6022 return -ENOMEM;
6023 }
6024- if (likely(!vma || addr + len <= vma->vm_start)) {
6025+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6026 /*
6027 * Remember the place where we stopped the search:
6028 */
6029@@ -108,7 +108,7 @@ hugetlb_get_unmapped_area_topdown(struct
6030 /* make sure it can fit in the remaining address space */
6031 if (likely(addr > len)) {
6032 vma = find_vma(mm, addr-len);
6033- if (!vma || addr <= vma->vm_start) {
6034+ if (check_heap_stack_gap(vma, addr - len, len)) {
6035 /* remember the address as a hint for next time */
6036 return (mm->free_area_cache = addr-len);
6037 }
6038@@ -117,16 +117,17 @@ hugetlb_get_unmapped_area_topdown(struct
6039 if (unlikely(mm->mmap_base < len))
6040 goto bottomup;
6041
6042- addr = (mm->mmap_base-len) & HPAGE_MASK;
6043+ addr = mm->mmap_base - len;
6044
6045 do {
6046+ addr &= HPAGE_MASK;
6047 /*
6048 * Lookup failure means no vma is above this address,
6049 * else if new region fits below vma->vm_start,
6050 * return with success:
6051 */
6052 vma = find_vma(mm, addr);
6053- if (likely(!vma || addr+len <= vma->vm_start)) {
6054+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6055 /* remember the address as a hint for next time */
6056 return (mm->free_area_cache = addr);
6057 }
6058@@ -136,8 +137,8 @@ hugetlb_get_unmapped_area_topdown(struct
6059 mm->cached_hole_size = vma->vm_start - addr;
6060
6061 /* try just below the current vma->vm_start */
6062- addr = (vma->vm_start-len) & HPAGE_MASK;
6063- } while (likely(len < vma->vm_start));
6064+ addr = skip_heap_stack_gap(vma, len);
6065+ } while (!IS_ERR_VALUE(addr));
6066
6067 bottomup:
6068 /*
6069@@ -183,8 +184,7 @@ hugetlb_get_unmapped_area(struct file *f
6070 if (addr) {
6071 addr = ALIGN(addr, HPAGE_SIZE);
6072 vma = find_vma(mm, addr);
6073- if (task_size - len >= addr &&
6074- (!vma || addr + len <= vma->vm_start))
6075+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
6076 return addr;
6077 }
6078 if (mm->get_unmapped_area == arch_get_unmapped_area)
6079diff -urNp linux-2.6.32.46/arch/sparc/mm/init_32.c linux-2.6.32.46/arch/sparc/mm/init_32.c
6080--- linux-2.6.32.46/arch/sparc/mm/init_32.c 2011-03-27 14:31:47.000000000 -0400
6081+++ linux-2.6.32.46/arch/sparc/mm/init_32.c 2011-04-17 15:56:46.000000000 -0400
6082@@ -317,6 +317,9 @@ extern void device_scan(void);
6083 pgprot_t PAGE_SHARED __read_mostly;
6084 EXPORT_SYMBOL(PAGE_SHARED);
6085
6086+pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
6087+EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
6088+
6089 void __init paging_init(void)
6090 {
6091 switch(sparc_cpu_model) {
6092@@ -345,17 +348,17 @@ void __init paging_init(void)
6093
6094 /* Initialize the protection map with non-constant, MMU dependent values. */
6095 protection_map[0] = PAGE_NONE;
6096- protection_map[1] = PAGE_READONLY;
6097- protection_map[2] = PAGE_COPY;
6098- protection_map[3] = PAGE_COPY;
6099+ protection_map[1] = PAGE_READONLY_NOEXEC;
6100+ protection_map[2] = PAGE_COPY_NOEXEC;
6101+ protection_map[3] = PAGE_COPY_NOEXEC;
6102 protection_map[4] = PAGE_READONLY;
6103 protection_map[5] = PAGE_READONLY;
6104 protection_map[6] = PAGE_COPY;
6105 protection_map[7] = PAGE_COPY;
6106 protection_map[8] = PAGE_NONE;
6107- protection_map[9] = PAGE_READONLY;
6108- protection_map[10] = PAGE_SHARED;
6109- protection_map[11] = PAGE_SHARED;
6110+ protection_map[9] = PAGE_READONLY_NOEXEC;
6111+ protection_map[10] = PAGE_SHARED_NOEXEC;
6112+ protection_map[11] = PAGE_SHARED_NOEXEC;
6113 protection_map[12] = PAGE_READONLY;
6114 protection_map[13] = PAGE_READONLY;
6115 protection_map[14] = PAGE_SHARED;
6116diff -urNp linux-2.6.32.46/arch/sparc/mm/Makefile linux-2.6.32.46/arch/sparc/mm/Makefile
6117--- linux-2.6.32.46/arch/sparc/mm/Makefile 2011-03-27 14:31:47.000000000 -0400
6118+++ linux-2.6.32.46/arch/sparc/mm/Makefile 2011-04-17 15:56:46.000000000 -0400
6119@@ -2,7 +2,7 @@
6120 #
6121
6122 asflags-y := -ansi
6123-ccflags-y := -Werror
6124+#ccflags-y := -Werror
6125
6126 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
6127 obj-y += fault_$(BITS).o
6128diff -urNp linux-2.6.32.46/arch/sparc/mm/srmmu.c linux-2.6.32.46/arch/sparc/mm/srmmu.c
6129--- linux-2.6.32.46/arch/sparc/mm/srmmu.c 2011-03-27 14:31:47.000000000 -0400
6130+++ linux-2.6.32.46/arch/sparc/mm/srmmu.c 2011-04-17 15:56:46.000000000 -0400
6131@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
6132 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
6133 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
6134 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
6135+
6136+#ifdef CONFIG_PAX_PAGEEXEC
6137+ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
6138+ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
6139+ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
6140+#endif
6141+
6142 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
6143 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
6144
6145diff -urNp linux-2.6.32.46/arch/um/include/asm/kmap_types.h linux-2.6.32.46/arch/um/include/asm/kmap_types.h
6146--- linux-2.6.32.46/arch/um/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400
6147+++ linux-2.6.32.46/arch/um/include/asm/kmap_types.h 2011-04-17 15:56:46.000000000 -0400
6148@@ -23,6 +23,7 @@ enum km_type {
6149 KM_IRQ1,
6150 KM_SOFTIRQ0,
6151 KM_SOFTIRQ1,
6152+ KM_CLEARPAGE,
6153 KM_TYPE_NR
6154 };
6155
6156diff -urNp linux-2.6.32.46/arch/um/include/asm/page.h linux-2.6.32.46/arch/um/include/asm/page.h
6157--- linux-2.6.32.46/arch/um/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400
6158+++ linux-2.6.32.46/arch/um/include/asm/page.h 2011-04-17 15:56:46.000000000 -0400
6159@@ -14,6 +14,9 @@
6160 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
6161 #define PAGE_MASK (~(PAGE_SIZE-1))
6162
6163+#define ktla_ktva(addr) (addr)
6164+#define ktva_ktla(addr) (addr)
6165+
6166 #ifndef __ASSEMBLY__
6167
6168 struct page;
6169diff -urNp linux-2.6.32.46/arch/um/kernel/process.c linux-2.6.32.46/arch/um/kernel/process.c
6170--- linux-2.6.32.46/arch/um/kernel/process.c 2011-03-27 14:31:47.000000000 -0400
6171+++ linux-2.6.32.46/arch/um/kernel/process.c 2011-04-17 15:56:46.000000000 -0400
6172@@ -393,22 +393,6 @@ int singlestepping(void * t)
6173 return 2;
6174 }
6175
6176-/*
6177- * Only x86 and x86_64 have an arch_align_stack().
6178- * All other arches have "#define arch_align_stack(x) (x)"
6179- * in their asm/system.h
6180- * As this is included in UML from asm-um/system-generic.h,
6181- * we can use it to behave as the subarch does.
6182- */
6183-#ifndef arch_align_stack
6184-unsigned long arch_align_stack(unsigned long sp)
6185-{
6186- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6187- sp -= get_random_int() % 8192;
6188- return sp & ~0xf;
6189-}
6190-#endif
6191-
6192 unsigned long get_wchan(struct task_struct *p)
6193 {
6194 unsigned long stack_page, sp, ip;
6195diff -urNp linux-2.6.32.46/arch/um/sys-i386/syscalls.c linux-2.6.32.46/arch/um/sys-i386/syscalls.c
6196--- linux-2.6.32.46/arch/um/sys-i386/syscalls.c 2011-03-27 14:31:47.000000000 -0400
6197+++ linux-2.6.32.46/arch/um/sys-i386/syscalls.c 2011-04-17 15:56:46.000000000 -0400
6198@@ -11,6 +11,21 @@
6199 #include "asm/uaccess.h"
6200 #include "asm/unistd.h"
6201
6202+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
6203+{
6204+ unsigned long pax_task_size = TASK_SIZE;
6205+
6206+#ifdef CONFIG_PAX_SEGMEXEC
6207+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
6208+ pax_task_size = SEGMEXEC_TASK_SIZE;
6209+#endif
6210+
6211+ if (len > pax_task_size || addr > pax_task_size - len)
6212+ return -EINVAL;
6213+
6214+ return 0;
6215+}
6216+
6217 /*
6218 * Perform the select(nd, in, out, ex, tv) and mmap() system
6219 * calls. Linux/i386 didn't use to be able to handle more than
6220diff -urNp linux-2.6.32.46/arch/x86/boot/bitops.h linux-2.6.32.46/arch/x86/boot/bitops.h
6221--- linux-2.6.32.46/arch/x86/boot/bitops.h 2011-03-27 14:31:47.000000000 -0400
6222+++ linux-2.6.32.46/arch/x86/boot/bitops.h 2011-04-17 15:56:46.000000000 -0400
6223@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
6224 u8 v;
6225 const u32 *p = (const u32 *)addr;
6226
6227- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
6228+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
6229 return v;
6230 }
6231
6232@@ -37,7 +37,7 @@ static inline int variable_test_bit(int
6233
6234 static inline void set_bit(int nr, void *addr)
6235 {
6236- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
6237+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
6238 }
6239
6240 #endif /* BOOT_BITOPS_H */
6241diff -urNp linux-2.6.32.46/arch/x86/boot/boot.h linux-2.6.32.46/arch/x86/boot/boot.h
6242--- linux-2.6.32.46/arch/x86/boot/boot.h 2011-03-27 14:31:47.000000000 -0400
6243+++ linux-2.6.32.46/arch/x86/boot/boot.h 2011-04-17 15:56:46.000000000 -0400
6244@@ -82,7 +82,7 @@ static inline void io_delay(void)
6245 static inline u16 ds(void)
6246 {
6247 u16 seg;
6248- asm("movw %%ds,%0" : "=rm" (seg));
6249+ asm volatile("movw %%ds,%0" : "=rm" (seg));
6250 return seg;
6251 }
6252
6253@@ -178,7 +178,7 @@ static inline void wrgs32(u32 v, addr_t
6254 static inline int memcmp(const void *s1, const void *s2, size_t len)
6255 {
6256 u8 diff;
6257- asm("repe; cmpsb; setnz %0"
6258+ asm volatile("repe; cmpsb; setnz %0"
6259 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
6260 return diff;
6261 }
6262diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_32.S linux-2.6.32.46/arch/x86/boot/compressed/head_32.S
6263--- linux-2.6.32.46/arch/x86/boot/compressed/head_32.S 2011-03-27 14:31:47.000000000 -0400
6264+++ linux-2.6.32.46/arch/x86/boot/compressed/head_32.S 2011-04-17 15:56:46.000000000 -0400
6265@@ -76,7 +76,7 @@ ENTRY(startup_32)
6266 notl %eax
6267 andl %eax, %ebx
6268 #else
6269- movl $LOAD_PHYSICAL_ADDR, %ebx
6270+ movl $____LOAD_PHYSICAL_ADDR, %ebx
6271 #endif
6272
6273 /* Target address to relocate to for decompression */
6274@@ -149,7 +149,7 @@ relocated:
6275 * and where it was actually loaded.
6276 */
6277 movl %ebp, %ebx
6278- subl $LOAD_PHYSICAL_ADDR, %ebx
6279+ subl $____LOAD_PHYSICAL_ADDR, %ebx
6280 jz 2f /* Nothing to be done if loaded at compiled addr. */
6281 /*
6282 * Process relocations.
6283@@ -157,8 +157,7 @@ relocated:
6284
6285 1: subl $4, %edi
6286 movl (%edi), %ecx
6287- testl %ecx, %ecx
6288- jz 2f
6289+ jecxz 2f
6290 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
6291 jmp 1b
6292 2:
6293diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_64.S linux-2.6.32.46/arch/x86/boot/compressed/head_64.S
6294--- linux-2.6.32.46/arch/x86/boot/compressed/head_64.S 2011-03-27 14:31:47.000000000 -0400
6295+++ linux-2.6.32.46/arch/x86/boot/compressed/head_64.S 2011-07-01 18:53:00.000000000 -0400
6296@@ -91,7 +91,7 @@ ENTRY(startup_32)
6297 notl %eax
6298 andl %eax, %ebx
6299 #else
6300- movl $LOAD_PHYSICAL_ADDR, %ebx
6301+ movl $____LOAD_PHYSICAL_ADDR, %ebx
6302 #endif
6303
6304 /* Target address to relocate to for decompression */
6305@@ -183,7 +183,7 @@ no_longmode:
6306 hlt
6307 jmp 1b
6308
6309-#include "../../kernel/verify_cpu_64.S"
6310+#include "../../kernel/verify_cpu.S"
6311
6312 /*
6313 * Be careful here startup_64 needs to be at a predictable
6314@@ -234,7 +234,7 @@ ENTRY(startup_64)
6315 notq %rax
6316 andq %rax, %rbp
6317 #else
6318- movq $LOAD_PHYSICAL_ADDR, %rbp
6319+ movq $____LOAD_PHYSICAL_ADDR, %rbp
6320 #endif
6321
6322 /* Target address to relocate to for decompression */
6323diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/Makefile linux-2.6.32.46/arch/x86/boot/compressed/Makefile
6324--- linux-2.6.32.46/arch/x86/boot/compressed/Makefile 2011-03-27 14:31:47.000000000 -0400
6325+++ linux-2.6.32.46/arch/x86/boot/compressed/Makefile 2011-08-07 14:38:34.000000000 -0400
6326@@ -13,6 +13,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
6327 KBUILD_CFLAGS += $(cflags-y)
6328 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
6329 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
6330+ifdef CONSTIFY_PLUGIN
6331+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
6332+endif
6333
6334 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
6335 GCOV_PROFILE := n
6336diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/misc.c linux-2.6.32.46/arch/x86/boot/compressed/misc.c
6337--- linux-2.6.32.46/arch/x86/boot/compressed/misc.c 2011-03-27 14:31:47.000000000 -0400
6338+++ linux-2.6.32.46/arch/x86/boot/compressed/misc.c 2011-04-17 15:56:46.000000000 -0400
6339@@ -288,7 +288,7 @@ static void parse_elf(void *output)
6340 case PT_LOAD:
6341 #ifdef CONFIG_RELOCATABLE
6342 dest = output;
6343- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
6344+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
6345 #else
6346 dest = (void *)(phdr->p_paddr);
6347 #endif
6348@@ -335,7 +335,7 @@ asmlinkage void decompress_kernel(void *
6349 error("Destination address too large");
6350 #endif
6351 #ifndef CONFIG_RELOCATABLE
6352- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
6353+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
6354 error("Wrong destination address");
6355 #endif
6356
6357diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c
6358--- linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c 2011-03-27 14:31:47.000000000 -0400
6359+++ linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c 2011-04-17 15:56:46.000000000 -0400
6360@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
6361
6362 offs = (olen > ilen) ? olen - ilen : 0;
6363 offs += olen >> 12; /* Add 8 bytes for each 32K block */
6364- offs += 32*1024 + 18; /* Add 32K + 18 bytes slack */
6365+ offs += 64*1024; /* Add 64K bytes slack */
6366 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
6367
6368 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
6369diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/relocs.c linux-2.6.32.46/arch/x86/boot/compressed/relocs.c
6370--- linux-2.6.32.46/arch/x86/boot/compressed/relocs.c 2011-03-27 14:31:47.000000000 -0400
6371+++ linux-2.6.32.46/arch/x86/boot/compressed/relocs.c 2011-04-17 15:56:46.000000000 -0400
6372@@ -10,8 +10,11 @@
6373 #define USE_BSD
6374 #include <endian.h>
6375
6376+#include "../../../../include/linux/autoconf.h"
6377+
6378 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
6379 static Elf32_Ehdr ehdr;
6380+static Elf32_Phdr *phdr;
6381 static unsigned long reloc_count, reloc_idx;
6382 static unsigned long *relocs;
6383
6384@@ -37,7 +40,7 @@ static const char* safe_abs_relocs[] = {
6385
6386 static int is_safe_abs_reloc(const char* sym_name)
6387 {
6388- int i;
6389+ unsigned int i;
6390
6391 for (i = 0; i < ARRAY_SIZE(safe_abs_relocs); i++) {
6392 if (!strcmp(sym_name, safe_abs_relocs[i]))
6393@@ -245,9 +248,39 @@ static void read_ehdr(FILE *fp)
6394 }
6395 }
6396
6397+static void read_phdrs(FILE *fp)
6398+{
6399+ unsigned int i;
6400+
6401+ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
6402+ if (!phdr) {
6403+ die("Unable to allocate %d program headers\n",
6404+ ehdr.e_phnum);
6405+ }
6406+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
6407+ die("Seek to %d failed: %s\n",
6408+ ehdr.e_phoff, strerror(errno));
6409+ }
6410+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
6411+ die("Cannot read ELF program headers: %s\n",
6412+ strerror(errno));
6413+ }
6414+ for(i = 0; i < ehdr.e_phnum; i++) {
6415+ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
6416+ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
6417+ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
6418+ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
6419+ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
6420+ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
6421+ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
6422+ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
6423+ }
6424+
6425+}
6426+
6427 static void read_shdrs(FILE *fp)
6428 {
6429- int i;
6430+ unsigned int i;
6431 Elf32_Shdr shdr;
6432
6433 secs = calloc(ehdr.e_shnum, sizeof(struct section));
6434@@ -282,7 +315,7 @@ static void read_shdrs(FILE *fp)
6435
6436 static void read_strtabs(FILE *fp)
6437 {
6438- int i;
6439+ unsigned int i;
6440 for (i = 0; i < ehdr.e_shnum; i++) {
6441 struct section *sec = &secs[i];
6442 if (sec->shdr.sh_type != SHT_STRTAB) {
6443@@ -307,7 +340,7 @@ static void read_strtabs(FILE *fp)
6444
6445 static void read_symtabs(FILE *fp)
6446 {
6447- int i,j;
6448+ unsigned int i,j;
6449 for (i = 0; i < ehdr.e_shnum; i++) {
6450 struct section *sec = &secs[i];
6451 if (sec->shdr.sh_type != SHT_SYMTAB) {
6452@@ -340,7 +373,9 @@ static void read_symtabs(FILE *fp)
6453
6454 static void read_relocs(FILE *fp)
6455 {
6456- int i,j;
6457+ unsigned int i,j;
6458+ uint32_t base;
6459+
6460 for (i = 0; i < ehdr.e_shnum; i++) {
6461 struct section *sec = &secs[i];
6462 if (sec->shdr.sh_type != SHT_REL) {
6463@@ -360,9 +395,18 @@ static void read_relocs(FILE *fp)
6464 die("Cannot read symbol table: %s\n",
6465 strerror(errno));
6466 }
6467+ base = 0;
6468+ for (j = 0; j < ehdr.e_phnum; j++) {
6469+ if (phdr[j].p_type != PT_LOAD )
6470+ continue;
6471+ if (secs[sec->shdr.sh_info].shdr.sh_offset < phdr[j].p_offset || secs[sec->shdr.sh_info].shdr.sh_offset >= phdr[j].p_offset + phdr[j].p_filesz)
6472+ continue;
6473+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
6474+ break;
6475+ }
6476 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
6477 Elf32_Rel *rel = &sec->reltab[j];
6478- rel->r_offset = elf32_to_cpu(rel->r_offset);
6479+ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
6480 rel->r_info = elf32_to_cpu(rel->r_info);
6481 }
6482 }
6483@@ -371,14 +415,14 @@ static void read_relocs(FILE *fp)
6484
6485 static void print_absolute_symbols(void)
6486 {
6487- int i;
6488+ unsigned int i;
6489 printf("Absolute symbols\n");
6490 printf(" Num: Value Size Type Bind Visibility Name\n");
6491 for (i = 0; i < ehdr.e_shnum; i++) {
6492 struct section *sec = &secs[i];
6493 char *sym_strtab;
6494 Elf32_Sym *sh_symtab;
6495- int j;
6496+ unsigned int j;
6497
6498 if (sec->shdr.sh_type != SHT_SYMTAB) {
6499 continue;
6500@@ -406,14 +450,14 @@ static void print_absolute_symbols(void)
6501
6502 static void print_absolute_relocs(void)
6503 {
6504- int i, printed = 0;
6505+ unsigned int i, printed = 0;
6506
6507 for (i = 0; i < ehdr.e_shnum; i++) {
6508 struct section *sec = &secs[i];
6509 struct section *sec_applies, *sec_symtab;
6510 char *sym_strtab;
6511 Elf32_Sym *sh_symtab;
6512- int j;
6513+ unsigned int j;
6514 if (sec->shdr.sh_type != SHT_REL) {
6515 continue;
6516 }
6517@@ -474,13 +518,13 @@ static void print_absolute_relocs(void)
6518
6519 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
6520 {
6521- int i;
6522+ unsigned int i;
6523 /* Walk through the relocations */
6524 for (i = 0; i < ehdr.e_shnum; i++) {
6525 char *sym_strtab;
6526 Elf32_Sym *sh_symtab;
6527 struct section *sec_applies, *sec_symtab;
6528- int j;
6529+ unsigned int j;
6530 struct section *sec = &secs[i];
6531
6532 if (sec->shdr.sh_type != SHT_REL) {
6533@@ -504,6 +548,21 @@ static void walk_relocs(void (*visit)(El
6534 if (sym->st_shndx == SHN_ABS) {
6535 continue;
6536 }
6537+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
6538+ if (!strcmp(sec_name(sym->st_shndx), ".data.percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
6539+ continue;
6540+
6541+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
6542+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
6543+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
6544+ continue;
6545+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
6546+ continue;
6547+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
6548+ continue;
6549+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
6550+ continue;
6551+#endif
6552 if (r_type == R_386_NONE || r_type == R_386_PC32) {
6553 /*
6554 * NONE can be ignored and and PC relative
6555@@ -541,7 +600,7 @@ static int cmp_relocs(const void *va, co
6556
6557 static void emit_relocs(int as_text)
6558 {
6559- int i;
6560+ unsigned int i;
6561 /* Count how many relocations I have and allocate space for them. */
6562 reloc_count = 0;
6563 walk_relocs(count_reloc);
6564@@ -634,6 +693,7 @@ int main(int argc, char **argv)
6565 fname, strerror(errno));
6566 }
6567 read_ehdr(fp);
6568+ read_phdrs(fp);
6569 read_shdrs(fp);
6570 read_strtabs(fp);
6571 read_symtabs(fp);
6572diff -urNp linux-2.6.32.46/arch/x86/boot/cpucheck.c linux-2.6.32.46/arch/x86/boot/cpucheck.c
6573--- linux-2.6.32.46/arch/x86/boot/cpucheck.c 2011-03-27 14:31:47.000000000 -0400
6574+++ linux-2.6.32.46/arch/x86/boot/cpucheck.c 2011-04-17 15:56:46.000000000 -0400
6575@@ -74,7 +74,7 @@ static int has_fpu(void)
6576 u16 fcw = -1, fsw = -1;
6577 u32 cr0;
6578
6579- asm("movl %%cr0,%0" : "=r" (cr0));
6580+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
6581 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
6582 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
6583 asm volatile("movl %0,%%cr0" : : "r" (cr0));
6584@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
6585 {
6586 u32 f0, f1;
6587
6588- asm("pushfl ; "
6589+ asm volatile("pushfl ; "
6590 "pushfl ; "
6591 "popl %0 ; "
6592 "movl %0,%1 ; "
6593@@ -115,7 +115,7 @@ static void get_flags(void)
6594 set_bit(X86_FEATURE_FPU, cpu.flags);
6595
6596 if (has_eflag(X86_EFLAGS_ID)) {
6597- asm("cpuid"
6598+ asm volatile("cpuid"
6599 : "=a" (max_intel_level),
6600 "=b" (cpu_vendor[0]),
6601 "=d" (cpu_vendor[1]),
6602@@ -124,7 +124,7 @@ static void get_flags(void)
6603
6604 if (max_intel_level >= 0x00000001 &&
6605 max_intel_level <= 0x0000ffff) {
6606- asm("cpuid"
6607+ asm volatile("cpuid"
6608 : "=a" (tfms),
6609 "=c" (cpu.flags[4]),
6610 "=d" (cpu.flags[0])
6611@@ -136,7 +136,7 @@ static void get_flags(void)
6612 cpu.model += ((tfms >> 16) & 0xf) << 4;
6613 }
6614
6615- asm("cpuid"
6616+ asm volatile("cpuid"
6617 : "=a" (max_amd_level)
6618 : "a" (0x80000000)
6619 : "ebx", "ecx", "edx");
6620@@ -144,7 +144,7 @@ static void get_flags(void)
6621 if (max_amd_level >= 0x80000001 &&
6622 max_amd_level <= 0x8000ffff) {
6623 u32 eax = 0x80000001;
6624- asm("cpuid"
6625+ asm volatile("cpuid"
6626 : "+a" (eax),
6627 "=c" (cpu.flags[6]),
6628 "=d" (cpu.flags[1])
6629@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *r
6630 u32 ecx = MSR_K7_HWCR;
6631 u32 eax, edx;
6632
6633- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6634+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6635 eax &= ~(1 << 15);
6636- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6637+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6638
6639 get_flags(); /* Make sure it really did something */
6640 err = check_flags();
6641@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *r
6642 u32 ecx = MSR_VIA_FCR;
6643 u32 eax, edx;
6644
6645- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6646+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6647 eax |= (1<<1)|(1<<7);
6648- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6649+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6650
6651 set_bit(X86_FEATURE_CX8, cpu.flags);
6652 err = check_flags();
6653@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *r
6654 u32 eax, edx;
6655 u32 level = 1;
6656
6657- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6658- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
6659- asm("cpuid"
6660+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6661+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
6662+ asm volatile("cpuid"
6663 : "+a" (level), "=d" (cpu.flags[0])
6664 : : "ecx", "ebx");
6665- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6666+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6667
6668 err = check_flags();
6669 }
6670diff -urNp linux-2.6.32.46/arch/x86/boot/header.S linux-2.6.32.46/arch/x86/boot/header.S
6671--- linux-2.6.32.46/arch/x86/boot/header.S 2011-03-27 14:31:47.000000000 -0400
6672+++ linux-2.6.32.46/arch/x86/boot/header.S 2011-04-17 15:56:46.000000000 -0400
6673@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
6674 # single linked list of
6675 # struct setup_data
6676
6677-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
6678+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
6679
6680 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
6681 #define VO_INIT_SIZE (VO__end - VO__text)
6682diff -urNp linux-2.6.32.46/arch/x86/boot/Makefile linux-2.6.32.46/arch/x86/boot/Makefile
6683--- linux-2.6.32.46/arch/x86/boot/Makefile 2011-03-27 14:31:47.000000000 -0400
6684+++ linux-2.6.32.46/arch/x86/boot/Makefile 2011-08-07 14:38:13.000000000 -0400
6685@@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
6686 $(call cc-option, -fno-stack-protector) \
6687 $(call cc-option, -mpreferred-stack-boundary=2)
6688 KBUILD_CFLAGS += $(call cc-option, -m32)
6689+ifdef CONSTIFY_PLUGIN
6690+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
6691+endif
6692 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
6693 GCOV_PROFILE := n
6694
6695diff -urNp linux-2.6.32.46/arch/x86/boot/memory.c linux-2.6.32.46/arch/x86/boot/memory.c
6696--- linux-2.6.32.46/arch/x86/boot/memory.c 2011-03-27 14:31:47.000000000 -0400
6697+++ linux-2.6.32.46/arch/x86/boot/memory.c 2011-04-17 15:56:46.000000000 -0400
6698@@ -19,7 +19,7 @@
6699
6700 static int detect_memory_e820(void)
6701 {
6702- int count = 0;
6703+ unsigned int count = 0;
6704 struct biosregs ireg, oreg;
6705 struct e820entry *desc = boot_params.e820_map;
6706 static struct e820entry buf; /* static so it is zeroed */
6707diff -urNp linux-2.6.32.46/arch/x86/boot/video.c linux-2.6.32.46/arch/x86/boot/video.c
6708--- linux-2.6.32.46/arch/x86/boot/video.c 2011-03-27 14:31:47.000000000 -0400
6709+++ linux-2.6.32.46/arch/x86/boot/video.c 2011-04-17 15:56:46.000000000 -0400
6710@@ -90,7 +90,7 @@ static void store_mode_params(void)
6711 static unsigned int get_entry(void)
6712 {
6713 char entry_buf[4];
6714- int i, len = 0;
6715+ unsigned int i, len = 0;
6716 int key;
6717 unsigned int v;
6718
6719diff -urNp linux-2.6.32.46/arch/x86/boot/video-vesa.c linux-2.6.32.46/arch/x86/boot/video-vesa.c
6720--- linux-2.6.32.46/arch/x86/boot/video-vesa.c 2011-03-27 14:31:47.000000000 -0400
6721+++ linux-2.6.32.46/arch/x86/boot/video-vesa.c 2011-04-17 15:56:46.000000000 -0400
6722@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
6723
6724 boot_params.screen_info.vesapm_seg = oreg.es;
6725 boot_params.screen_info.vesapm_off = oreg.di;
6726+ boot_params.screen_info.vesapm_size = oreg.cx;
6727 }
6728
6729 /*
6730diff -urNp linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S
6731--- linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S 2011-03-27 14:31:47.000000000 -0400
6732+++ linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S 2011-10-06 09:37:14.000000000 -0400
6733@@ -8,6 +8,8 @@
6734 * including this sentence is retained in full.
6735 */
6736
6737+#include <asm/alternative-asm.h>
6738+
6739 .extern crypto_ft_tab
6740 .extern crypto_it_tab
6741 .extern crypto_fl_tab
6742@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
6743 je B192; \
6744 leaq 32(r9),r9;
6745
6746+#define ret pax_force_retaddr; ret
6747+
6748 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
6749 movq r1,r2; \
6750 movq r3,r4; \
6751diff -urNp linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S
6752--- linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-03-27 14:31:47.000000000 -0400
6753+++ linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-10-06 09:37:14.000000000 -0400
6754@@ -1,3 +1,5 @@
6755+#include <asm/alternative-asm.h>
6756+
6757 # enter ECRYPT_encrypt_bytes
6758 .text
6759 .p2align 5
6760@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
6761 add %r11,%rsp
6762 mov %rdi,%rax
6763 mov %rsi,%rdx
6764+ pax_force_retaddr
6765 ret
6766 # bytesatleast65:
6767 ._bytesatleast65:
6768@@ -891,6 +894,7 @@ ECRYPT_keysetup:
6769 add %r11,%rsp
6770 mov %rdi,%rax
6771 mov %rsi,%rdx
6772+ pax_force_retaddr
6773 ret
6774 # enter ECRYPT_ivsetup
6775 .text
6776@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
6777 add %r11,%rsp
6778 mov %rdi,%rax
6779 mov %rsi,%rdx
6780+ pax_force_retaddr
6781 ret
6782diff -urNp linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S
6783--- linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-03-27 14:31:47.000000000 -0400
6784+++ linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-10-06 09:37:14.000000000 -0400
6785@@ -21,6 +21,7 @@
6786 .text
6787
6788 #include <asm/asm-offsets.h>
6789+#include <asm/alternative-asm.h>
6790
6791 #define a_offset 0
6792 #define b_offset 4
6793@@ -269,6 +270,7 @@ twofish_enc_blk:
6794
6795 popq R1
6796 movq $1,%rax
6797+ pax_force_retaddr
6798 ret
6799
6800 twofish_dec_blk:
6801@@ -321,4 +323,5 @@ twofish_dec_blk:
6802
6803 popq R1
6804 movq $1,%rax
6805+ pax_force_retaddr
6806 ret
6807diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_aout.c linux-2.6.32.46/arch/x86/ia32/ia32_aout.c
6808--- linux-2.6.32.46/arch/x86/ia32/ia32_aout.c 2011-03-27 14:31:47.000000000 -0400
6809+++ linux-2.6.32.46/arch/x86/ia32/ia32_aout.c 2011-04-17 15:56:46.000000000 -0400
6810@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
6811 unsigned long dump_start, dump_size;
6812 struct user32 dump;
6813
6814+ memset(&dump, 0, sizeof(dump));
6815+
6816 fs = get_fs();
6817 set_fs(KERNEL_DS);
6818 has_dumped = 1;
6819@@ -218,12 +220,6 @@ static int aout_core_dump(long signr, st
6820 dump_size = dump.u_ssize << PAGE_SHIFT;
6821 DUMP_WRITE(dump_start, dump_size);
6822 }
6823- /*
6824- * Finally dump the task struct. Not be used by gdb, but
6825- * could be useful
6826- */
6827- set_fs(KERNEL_DS);
6828- DUMP_WRITE(current, sizeof(*current));
6829 end_coredump:
6830 set_fs(fs);
6831 return has_dumped;
6832diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32entry.S linux-2.6.32.46/arch/x86/ia32/ia32entry.S
6833--- linux-2.6.32.46/arch/x86/ia32/ia32entry.S 2011-03-27 14:31:47.000000000 -0400
6834+++ linux-2.6.32.46/arch/x86/ia32/ia32entry.S 2011-08-25 17:42:18.000000000 -0400
6835@@ -13,6 +13,7 @@
6836 #include <asm/thread_info.h>
6837 #include <asm/segment.h>
6838 #include <asm/irqflags.h>
6839+#include <asm/pgtable.h>
6840 #include <linux/linkage.h>
6841
6842 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
6843@@ -93,6 +94,29 @@ ENTRY(native_irq_enable_sysexit)
6844 ENDPROC(native_irq_enable_sysexit)
6845 #endif
6846
6847+ .macro pax_enter_kernel_user
6848+#ifdef CONFIG_PAX_MEMORY_UDEREF
6849+ call pax_enter_kernel_user
6850+#endif
6851+ .endm
6852+
6853+ .macro pax_exit_kernel_user
6854+#ifdef CONFIG_PAX_MEMORY_UDEREF
6855+ call pax_exit_kernel_user
6856+#endif
6857+#ifdef CONFIG_PAX_RANDKSTACK
6858+ pushq %rax
6859+ call pax_randomize_kstack
6860+ popq %rax
6861+#endif
6862+ .endm
6863+
6864+.macro pax_erase_kstack
6865+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
6866+ call pax_erase_kstack
6867+#endif
6868+.endm
6869+
6870 /*
6871 * 32bit SYSENTER instruction entry.
6872 *
6873@@ -119,7 +143,7 @@ ENTRY(ia32_sysenter_target)
6874 CFI_REGISTER rsp,rbp
6875 SWAPGS_UNSAFE_STACK
6876 movq PER_CPU_VAR(kernel_stack), %rsp
6877- addq $(KERNEL_STACK_OFFSET),%rsp
6878+ pax_enter_kernel_user
6879 /*
6880 * No need to follow this irqs on/off section: the syscall
6881 * disabled irqs, here we enable it straight after entry:
6882@@ -135,7 +159,8 @@ ENTRY(ia32_sysenter_target)
6883 pushfq
6884 CFI_ADJUST_CFA_OFFSET 8
6885 /*CFI_REL_OFFSET rflags,0*/
6886- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
6887+ GET_THREAD_INFO(%r10)
6888+ movl TI_sysenter_return(%r10), %r10d
6889 CFI_REGISTER rip,r10
6890 pushq $__USER32_CS
6891 CFI_ADJUST_CFA_OFFSET 8
6892@@ -150,6 +175,12 @@ ENTRY(ia32_sysenter_target)
6893 SAVE_ARGS 0,0,1
6894 /* no need to do an access_ok check here because rbp has been
6895 32bit zero extended */
6896+
6897+#ifdef CONFIG_PAX_MEMORY_UDEREF
6898+ mov $PAX_USER_SHADOW_BASE,%r10
6899+ add %r10,%rbp
6900+#endif
6901+
6902 1: movl (%rbp),%ebp
6903 .section __ex_table,"a"
6904 .quad 1b,ia32_badarg
6905@@ -172,6 +203,8 @@ sysenter_dispatch:
6906 testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
6907 jnz sysexit_audit
6908 sysexit_from_sys_call:
6909+ pax_exit_kernel_user
6910+ pax_erase_kstack
6911 andl $~TS_COMPAT,TI_status(%r10)
6912 /* clear IF, that popfq doesn't enable interrupts early */
6913 andl $~0x200,EFLAGS-R11(%rsp)
6914@@ -200,6 +233,9 @@ sysexit_from_sys_call:
6915 movl %eax,%esi /* 2nd arg: syscall number */
6916 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
6917 call audit_syscall_entry
6918+
6919+ pax_erase_kstack
6920+
6921 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
6922 cmpq $(IA32_NR_syscalls-1),%rax
6923 ja ia32_badsys
6924@@ -252,6 +288,9 @@ sysenter_tracesys:
6925 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
6926 movq %rsp,%rdi /* &pt_regs -> arg1 */
6927 call syscall_trace_enter
6928+
6929+ pax_erase_kstack
6930+
6931 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
6932 RESTORE_REST
6933 cmpq $(IA32_NR_syscalls-1),%rax
6934@@ -283,19 +322,24 @@ ENDPROC(ia32_sysenter_target)
6935 ENTRY(ia32_cstar_target)
6936 CFI_STARTPROC32 simple
6937 CFI_SIGNAL_FRAME
6938- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
6939+ CFI_DEF_CFA rsp,0
6940 CFI_REGISTER rip,rcx
6941 /*CFI_REGISTER rflags,r11*/
6942 SWAPGS_UNSAFE_STACK
6943 movl %esp,%r8d
6944 CFI_REGISTER rsp,r8
6945 movq PER_CPU_VAR(kernel_stack),%rsp
6946+
6947+#ifdef CONFIG_PAX_MEMORY_UDEREF
6948+ pax_enter_kernel_user
6949+#endif
6950+
6951 /*
6952 * No need to follow this irqs on/off section: the syscall
6953 * disabled irqs and here we enable it straight after entry:
6954 */
6955 ENABLE_INTERRUPTS(CLBR_NONE)
6956- SAVE_ARGS 8,1,1
6957+ SAVE_ARGS 8*6,1,1
6958 movl %eax,%eax /* zero extension */
6959 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
6960 movq %rcx,RIP-ARGOFFSET(%rsp)
6961@@ -311,6 +355,12 @@ ENTRY(ia32_cstar_target)
6962 /* no need to do an access_ok check here because r8 has been
6963 32bit zero extended */
6964 /* hardware stack frame is complete now */
6965+
6966+#ifdef CONFIG_PAX_MEMORY_UDEREF
6967+ mov $PAX_USER_SHADOW_BASE,%r10
6968+ add %r10,%r8
6969+#endif
6970+
6971 1: movl (%r8),%r9d
6972 .section __ex_table,"a"
6973 .quad 1b,ia32_badarg
6974@@ -333,6 +383,8 @@ cstar_dispatch:
6975 testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
6976 jnz sysretl_audit
6977 sysretl_from_sys_call:
6978+ pax_exit_kernel_user
6979+ pax_erase_kstack
6980 andl $~TS_COMPAT,TI_status(%r10)
6981 RESTORE_ARGS 1,-ARG_SKIP,1,1,1
6982 movl RIP-ARGOFFSET(%rsp),%ecx
6983@@ -370,6 +422,9 @@ cstar_tracesys:
6984 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
6985 movq %rsp,%rdi /* &pt_regs -> arg1 */
6986 call syscall_trace_enter
6987+
6988+ pax_erase_kstack
6989+
6990 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
6991 RESTORE_REST
6992 xchgl %ebp,%r9d
6993@@ -415,6 +470,7 @@ ENTRY(ia32_syscall)
6994 CFI_REL_OFFSET rip,RIP-RIP
6995 PARAVIRT_ADJUST_EXCEPTION_FRAME
6996 SWAPGS
6997+ pax_enter_kernel_user
6998 /*
6999 * No need to follow this irqs on/off section: the syscall
7000 * disabled irqs and here we enable it straight after entry:
7001@@ -448,6 +504,9 @@ ia32_tracesys:
7002 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
7003 movq %rsp,%rdi /* &pt_regs -> arg1 */
7004 call syscall_trace_enter
7005+
7006+ pax_erase_kstack
7007+
7008 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
7009 RESTORE_REST
7010 cmpq $(IA32_NR_syscalls-1),%rax
7011diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_signal.c linux-2.6.32.46/arch/x86/ia32/ia32_signal.c
7012--- linux-2.6.32.46/arch/x86/ia32/ia32_signal.c 2011-03-27 14:31:47.000000000 -0400
7013+++ linux-2.6.32.46/arch/x86/ia32/ia32_signal.c 2011-10-06 09:37:08.000000000 -0400
7014@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const
7015 }
7016 seg = get_fs();
7017 set_fs(KERNEL_DS);
7018- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
7019+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
7020 set_fs(seg);
7021 if (ret >= 0 && uoss_ptr) {
7022 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
7023@@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct
7024 */
7025 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
7026 size_t frame_size,
7027- void **fpstate)
7028+ void __user **fpstate)
7029 {
7030 unsigned long sp;
7031
7032@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct
7033
7034 if (used_math()) {
7035 sp = sp - sig_xstate_ia32_size;
7036- *fpstate = (struct _fpstate_ia32 *) sp;
7037+ *fpstate = (struct _fpstate_ia32 __user *) sp;
7038 if (save_i387_xstate_ia32(*fpstate) < 0)
7039 return (void __user *) -1L;
7040 }
7041@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
7042 sp -= frame_size;
7043 /* Align the stack pointer according to the i386 ABI,
7044 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
7045- sp = ((sp + 4) & -16ul) - 4;
7046+ sp = ((sp - 12) & -16ul) - 4;
7047 return (void __user *) sp;
7048 }
7049
7050@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_s
7051 * These are actually not used anymore, but left because some
7052 * gdb versions depend on them as a marker.
7053 */
7054- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
7055+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
7056 } put_user_catch(err);
7057
7058 if (err)
7059@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct
7060 0xb8,
7061 __NR_ia32_rt_sigreturn,
7062 0x80cd,
7063- 0,
7064+ 0
7065 };
7066
7067 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
7068@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct
7069
7070 if (ka->sa.sa_flags & SA_RESTORER)
7071 restorer = ka->sa.sa_restorer;
7072+ else if (current->mm->context.vdso)
7073+ /* Return stub is in 32bit vsyscall page */
7074+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
7075 else
7076- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
7077- rt_sigreturn);
7078+ restorer = &frame->retcode;
7079 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
7080
7081 /*
7082 * Not actually used anymore, but left because some gdb
7083 * versions need it.
7084 */
7085- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
7086+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
7087 } put_user_catch(err);
7088
7089 if (err)
7090diff -urNp linux-2.6.32.46/arch/x86/ia32/sys_ia32.c linux-2.6.32.46/arch/x86/ia32/sys_ia32.c
7091--- linux-2.6.32.46/arch/x86/ia32/sys_ia32.c 2011-03-27 14:31:47.000000000 -0400
7092+++ linux-2.6.32.46/arch/x86/ia32/sys_ia32.c 2011-10-06 09:37:14.000000000 -0400
7093@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign
7094 */
7095 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
7096 {
7097- typeof(ubuf->st_uid) uid = 0;
7098- typeof(ubuf->st_gid) gid = 0;
7099+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
7100+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
7101 SET_UID(uid, stat->uid);
7102 SET_GID(gid, stat->gid);
7103 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
7104@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int
7105 }
7106 set_fs(KERNEL_DS);
7107 ret = sys_rt_sigprocmask(how,
7108- set ? (sigset_t __user *)&s : NULL,
7109- oset ? (sigset_t __user *)&s : NULL,
7110+ set ? (sigset_t __force_user *)&s : NULL,
7111+ oset ? (sigset_t __force_user *)&s : NULL,
7112 sigsetsize);
7113 set_fs(old_fs);
7114 if (ret)
7115@@ -371,7 +371,7 @@ asmlinkage long sys32_sched_rr_get_inter
7116 mm_segment_t old_fs = get_fs();
7117
7118 set_fs(KERNEL_DS);
7119- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
7120+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
7121 set_fs(old_fs);
7122 if (put_compat_timespec(&t, interval))
7123 return -EFAULT;
7124@@ -387,7 +387,7 @@ asmlinkage long sys32_rt_sigpending(comp
7125 mm_segment_t old_fs = get_fs();
7126
7127 set_fs(KERNEL_DS);
7128- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
7129+ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
7130 set_fs(old_fs);
7131 if (!ret) {
7132 switch (_NSIG_WORDS) {
7133@@ -412,7 +412,7 @@ asmlinkage long sys32_rt_sigqueueinfo(in
7134 if (copy_siginfo_from_user32(&info, uinfo))
7135 return -EFAULT;
7136 set_fs(KERNEL_DS);
7137- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
7138+ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
7139 set_fs(old_fs);
7140 return ret;
7141 }
7142@@ -513,7 +513,7 @@ asmlinkage long sys32_sendfile(int out_f
7143 return -EFAULT;
7144
7145 set_fs(KERNEL_DS);
7146- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
7147+ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
7148 count);
7149 set_fs(old_fs);
7150
7151diff -urNp linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h
7152--- linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h 2011-03-27 14:31:47.000000000 -0400
7153+++ linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h 2011-10-08 08:14:37.000000000 -0400
7154@@ -19,4 +19,18 @@
7155 .endm
7156 #endif
7157
7158+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
7159+ .macro pax_force_retaddr rip=0
7160+ btsq $63,\rip(%rsp)
7161+ .endm
7162+ .macro pax_force_fptr ptr
7163+ btsq $63,\ptr
7164+ .endm
7165+#else
7166+ .macro pax_force_retaddr rip=0
7167+ .endm
7168+ .macro pax_force_fptr ptr
7169+ .endm
7170+#endif
7171+
7172 #endif /* __ASSEMBLY__ */
7173diff -urNp linux-2.6.32.46/arch/x86/include/asm/alternative.h linux-2.6.32.46/arch/x86/include/asm/alternative.h
7174--- linux-2.6.32.46/arch/x86/include/asm/alternative.h 2011-03-27 14:31:47.000000000 -0400
7175+++ linux-2.6.32.46/arch/x86/include/asm/alternative.h 2011-04-17 15:56:46.000000000 -0400
7176@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
7177 " .byte 662b-661b\n" /* sourcelen */ \
7178 " .byte 664f-663f\n" /* replacementlen */ \
7179 ".previous\n" \
7180- ".section .altinstr_replacement, \"ax\"\n" \
7181+ ".section .altinstr_replacement, \"a\"\n" \
7182 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
7183 ".previous"
7184
7185diff -urNp linux-2.6.32.46/arch/x86/include/asm/apic.h linux-2.6.32.46/arch/x86/include/asm/apic.h
7186--- linux-2.6.32.46/arch/x86/include/asm/apic.h 2011-03-27 14:31:47.000000000 -0400
7187+++ linux-2.6.32.46/arch/x86/include/asm/apic.h 2011-08-17 20:01:15.000000000 -0400
7188@@ -46,7 +46,7 @@ static inline void generic_apic_probe(vo
7189
7190 #ifdef CONFIG_X86_LOCAL_APIC
7191
7192-extern unsigned int apic_verbosity;
7193+extern int apic_verbosity;
7194 extern int local_apic_timer_c2_ok;
7195
7196 extern int disable_apic;
7197diff -urNp linux-2.6.32.46/arch/x86/include/asm/apm.h linux-2.6.32.46/arch/x86/include/asm/apm.h
7198--- linux-2.6.32.46/arch/x86/include/asm/apm.h 2011-03-27 14:31:47.000000000 -0400
7199+++ linux-2.6.32.46/arch/x86/include/asm/apm.h 2011-04-17 15:56:46.000000000 -0400
7200@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
7201 __asm__ __volatile__(APM_DO_ZERO_SEGS
7202 "pushl %%edi\n\t"
7203 "pushl %%ebp\n\t"
7204- "lcall *%%cs:apm_bios_entry\n\t"
7205+ "lcall *%%ss:apm_bios_entry\n\t"
7206 "setc %%al\n\t"
7207 "popl %%ebp\n\t"
7208 "popl %%edi\n\t"
7209@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_as
7210 __asm__ __volatile__(APM_DO_ZERO_SEGS
7211 "pushl %%edi\n\t"
7212 "pushl %%ebp\n\t"
7213- "lcall *%%cs:apm_bios_entry\n\t"
7214+ "lcall *%%ss:apm_bios_entry\n\t"
7215 "setc %%bl\n\t"
7216 "popl %%ebp\n\t"
7217 "popl %%edi\n\t"
7218diff -urNp linux-2.6.32.46/arch/x86/include/asm/atomic_32.h linux-2.6.32.46/arch/x86/include/asm/atomic_32.h
7219--- linux-2.6.32.46/arch/x86/include/asm/atomic_32.h 2011-03-27 14:31:47.000000000 -0400
7220+++ linux-2.6.32.46/arch/x86/include/asm/atomic_32.h 2011-05-04 17:56:20.000000000 -0400
7221@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
7222 }
7223
7224 /**
7225+ * atomic_read_unchecked - read atomic variable
7226+ * @v: pointer of type atomic_unchecked_t
7227+ *
7228+ * Atomically reads the value of @v.
7229+ */
7230+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
7231+{
7232+ return v->counter;
7233+}
7234+
7235+/**
7236 * atomic_set - set atomic variable
7237 * @v: pointer of type atomic_t
7238 * @i: required value
7239@@ -37,6 +48,18 @@ static inline void atomic_set(atomic_t *
7240 }
7241
7242 /**
7243+ * atomic_set_unchecked - set atomic variable
7244+ * @v: pointer of type atomic_unchecked_t
7245+ * @i: required value
7246+ *
7247+ * Atomically sets the value of @v to @i.
7248+ */
7249+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7250+{
7251+ v->counter = i;
7252+}
7253+
7254+/**
7255 * atomic_add - add integer to atomic variable
7256 * @i: integer value to add
7257 * @v: pointer of type atomic_t
7258@@ -45,7 +68,29 @@ static inline void atomic_set(atomic_t *
7259 */
7260 static inline void atomic_add(int i, atomic_t *v)
7261 {
7262- asm volatile(LOCK_PREFIX "addl %1,%0"
7263+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
7264+
7265+#ifdef CONFIG_PAX_REFCOUNT
7266+ "jno 0f\n"
7267+ LOCK_PREFIX "subl %1,%0\n"
7268+ "int $4\n0:\n"
7269+ _ASM_EXTABLE(0b, 0b)
7270+#endif
7271+
7272+ : "+m" (v->counter)
7273+ : "ir" (i));
7274+}
7275+
7276+/**
7277+ * atomic_add_unchecked - add integer to atomic variable
7278+ * @i: integer value to add
7279+ * @v: pointer of type atomic_unchecked_t
7280+ *
7281+ * Atomically adds @i to @v.
7282+ */
7283+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
7284+{
7285+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
7286 : "+m" (v->counter)
7287 : "ir" (i));
7288 }
7289@@ -59,7 +104,29 @@ static inline void atomic_add(int i, ato
7290 */
7291 static inline void atomic_sub(int i, atomic_t *v)
7292 {
7293- asm volatile(LOCK_PREFIX "subl %1,%0"
7294+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
7295+
7296+#ifdef CONFIG_PAX_REFCOUNT
7297+ "jno 0f\n"
7298+ LOCK_PREFIX "addl %1,%0\n"
7299+ "int $4\n0:\n"
7300+ _ASM_EXTABLE(0b, 0b)
7301+#endif
7302+
7303+ : "+m" (v->counter)
7304+ : "ir" (i));
7305+}
7306+
7307+/**
7308+ * atomic_sub_unchecked - subtract integer from atomic variable
7309+ * @i: integer value to subtract
7310+ * @v: pointer of type atomic_unchecked_t
7311+ *
7312+ * Atomically subtracts @i from @v.
7313+ */
7314+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
7315+{
7316+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
7317 : "+m" (v->counter)
7318 : "ir" (i));
7319 }
7320@@ -77,7 +144,16 @@ static inline int atomic_sub_and_test(in
7321 {
7322 unsigned char c;
7323
7324- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
7325+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
7326+
7327+#ifdef CONFIG_PAX_REFCOUNT
7328+ "jno 0f\n"
7329+ LOCK_PREFIX "addl %2,%0\n"
7330+ "int $4\n0:\n"
7331+ _ASM_EXTABLE(0b, 0b)
7332+#endif
7333+
7334+ "sete %1\n"
7335 : "+m" (v->counter), "=qm" (c)
7336 : "ir" (i) : "memory");
7337 return c;
7338@@ -91,7 +167,27 @@ static inline int atomic_sub_and_test(in
7339 */
7340 static inline void atomic_inc(atomic_t *v)
7341 {
7342- asm volatile(LOCK_PREFIX "incl %0"
7343+ asm volatile(LOCK_PREFIX "incl %0\n"
7344+
7345+#ifdef CONFIG_PAX_REFCOUNT
7346+ "jno 0f\n"
7347+ LOCK_PREFIX "decl %0\n"
7348+ "int $4\n0:\n"
7349+ _ASM_EXTABLE(0b, 0b)
7350+#endif
7351+
7352+ : "+m" (v->counter));
7353+}
7354+
7355+/**
7356+ * atomic_inc_unchecked - increment atomic variable
7357+ * @v: pointer of type atomic_unchecked_t
7358+ *
7359+ * Atomically increments @v by 1.
7360+ */
7361+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7362+{
7363+ asm volatile(LOCK_PREFIX "incl %0\n"
7364 : "+m" (v->counter));
7365 }
7366
7367@@ -103,7 +199,27 @@ static inline void atomic_inc(atomic_t *
7368 */
7369 static inline void atomic_dec(atomic_t *v)
7370 {
7371- asm volatile(LOCK_PREFIX "decl %0"
7372+ asm volatile(LOCK_PREFIX "decl %0\n"
7373+
7374+#ifdef CONFIG_PAX_REFCOUNT
7375+ "jno 0f\n"
7376+ LOCK_PREFIX "incl %0\n"
7377+ "int $4\n0:\n"
7378+ _ASM_EXTABLE(0b, 0b)
7379+#endif
7380+
7381+ : "+m" (v->counter));
7382+}
7383+
7384+/**
7385+ * atomic_dec_unchecked - decrement atomic variable
7386+ * @v: pointer of type atomic_unchecked_t
7387+ *
7388+ * Atomically decrements @v by 1.
7389+ */
7390+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
7391+{
7392+ asm volatile(LOCK_PREFIX "decl %0\n"
7393 : "+m" (v->counter));
7394 }
7395
7396@@ -119,7 +235,16 @@ static inline int atomic_dec_and_test(at
7397 {
7398 unsigned char c;
7399
7400- asm volatile(LOCK_PREFIX "decl %0; sete %1"
7401+ asm volatile(LOCK_PREFIX "decl %0\n"
7402+
7403+#ifdef CONFIG_PAX_REFCOUNT
7404+ "jno 0f\n"
7405+ LOCK_PREFIX "incl %0\n"
7406+ "int $4\n0:\n"
7407+ _ASM_EXTABLE(0b, 0b)
7408+#endif
7409+
7410+ "sete %1\n"
7411 : "+m" (v->counter), "=qm" (c)
7412 : : "memory");
7413 return c != 0;
7414@@ -137,7 +262,35 @@ static inline int atomic_inc_and_test(at
7415 {
7416 unsigned char c;
7417
7418- asm volatile(LOCK_PREFIX "incl %0; sete %1"
7419+ asm volatile(LOCK_PREFIX "incl %0\n"
7420+
7421+#ifdef CONFIG_PAX_REFCOUNT
7422+ "jno 0f\n"
7423+ LOCK_PREFIX "decl %0\n"
7424+ "into\n0:\n"
7425+ _ASM_EXTABLE(0b, 0b)
7426+#endif
7427+
7428+ "sete %1\n"
7429+ : "+m" (v->counter), "=qm" (c)
7430+ : : "memory");
7431+ return c != 0;
7432+}
7433+
7434+/**
7435+ * atomic_inc_and_test_unchecked - increment and test
7436+ * @v: pointer of type atomic_unchecked_t
7437+ *
7438+ * Atomically increments @v by 1
7439+ * and returns true if the result is zero, or false for all
7440+ * other cases.
7441+ */
7442+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7443+{
7444+ unsigned char c;
7445+
7446+ asm volatile(LOCK_PREFIX "incl %0\n"
7447+ "sete %1\n"
7448 : "+m" (v->counter), "=qm" (c)
7449 : : "memory");
7450 return c != 0;
7451@@ -156,7 +309,16 @@ static inline int atomic_add_negative(in
7452 {
7453 unsigned char c;
7454
7455- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
7456+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
7457+
7458+#ifdef CONFIG_PAX_REFCOUNT
7459+ "jno 0f\n"
7460+ LOCK_PREFIX "subl %2,%0\n"
7461+ "int $4\n0:\n"
7462+ _ASM_EXTABLE(0b, 0b)
7463+#endif
7464+
7465+ "sets %1\n"
7466 : "+m" (v->counter), "=qm" (c)
7467 : "ir" (i) : "memory");
7468 return c;
7469@@ -179,6 +341,46 @@ static inline int atomic_add_return(int
7470 #endif
7471 /* Modern 486+ processor */
7472 __i = i;
7473+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
7474+
7475+#ifdef CONFIG_PAX_REFCOUNT
7476+ "jno 0f\n"
7477+ "movl %0, %1\n"
7478+ "int $4\n0:\n"
7479+ _ASM_EXTABLE(0b, 0b)
7480+#endif
7481+
7482+ : "+r" (i), "+m" (v->counter)
7483+ : : "memory");
7484+ return i + __i;
7485+
7486+#ifdef CONFIG_M386
7487+no_xadd: /* Legacy 386 processor */
7488+ local_irq_save(flags);
7489+ __i = atomic_read(v);
7490+ atomic_set(v, i + __i);
7491+ local_irq_restore(flags);
7492+ return i + __i;
7493+#endif
7494+}
7495+
7496+/**
7497+ * atomic_add_return_unchecked - add integer and return
7498+ * @v: pointer of type atomic_unchecked_t
7499+ * @i: integer value to add
7500+ *
7501+ * Atomically adds @i to @v and returns @i + @v
7502+ */
7503+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
7504+{
7505+ int __i;
7506+#ifdef CONFIG_M386
7507+ unsigned long flags;
7508+ if (unlikely(boot_cpu_data.x86 <= 3))
7509+ goto no_xadd;
7510+#endif
7511+ /* Modern 486+ processor */
7512+ __i = i;
7513 asm volatile(LOCK_PREFIX "xaddl %0, %1"
7514 : "+r" (i), "+m" (v->counter)
7515 : : "memory");
7516@@ -211,11 +413,21 @@ static inline int atomic_cmpxchg(atomic_
7517 return cmpxchg(&v->counter, old, new);
7518 }
7519
7520+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7521+{
7522+ return cmpxchg(&v->counter, old, new);
7523+}
7524+
7525 static inline int atomic_xchg(atomic_t *v, int new)
7526 {
7527 return xchg(&v->counter, new);
7528 }
7529
7530+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7531+{
7532+ return xchg(&v->counter, new);
7533+}
7534+
7535 /**
7536 * atomic_add_unless - add unless the number is already a given value
7537 * @v: pointer of type atomic_t
7538@@ -227,22 +439,39 @@ static inline int atomic_xchg(atomic_t *
7539 */
7540 static inline int atomic_add_unless(atomic_t *v, int a, int u)
7541 {
7542- int c, old;
7543+ int c, old, new;
7544 c = atomic_read(v);
7545 for (;;) {
7546- if (unlikely(c == (u)))
7547+ if (unlikely(c == u))
7548 break;
7549- old = atomic_cmpxchg((v), c, c + (a));
7550+
7551+ asm volatile("addl %2,%0\n"
7552+
7553+#ifdef CONFIG_PAX_REFCOUNT
7554+ "jno 0f\n"
7555+ "subl %2,%0\n"
7556+ "int $4\n0:\n"
7557+ _ASM_EXTABLE(0b, 0b)
7558+#endif
7559+
7560+ : "=r" (new)
7561+ : "0" (c), "ir" (a));
7562+
7563+ old = atomic_cmpxchg(v, c, new);
7564 if (likely(old == c))
7565 break;
7566 c = old;
7567 }
7568- return c != (u);
7569+ return c != u;
7570 }
7571
7572 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
7573
7574 #define atomic_inc_return(v) (atomic_add_return(1, v))
7575+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7576+{
7577+ return atomic_add_return_unchecked(1, v);
7578+}
7579 #define atomic_dec_return(v) (atomic_sub_return(1, v))
7580
7581 /* These are x86-specific, used by some header files */
7582@@ -266,9 +495,18 @@ typedef struct {
7583 u64 __aligned(8) counter;
7584 } atomic64_t;
7585
7586+#ifdef CONFIG_PAX_REFCOUNT
7587+typedef struct {
7588+ u64 __aligned(8) counter;
7589+} atomic64_unchecked_t;
7590+#else
7591+typedef atomic64_t atomic64_unchecked_t;
7592+#endif
7593+
7594 #define ATOMIC64_INIT(val) { (val) }
7595
7596 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
7597+extern u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, u64 new_val);
7598
7599 /**
7600 * atomic64_xchg - xchg atomic64 variable
7601@@ -279,6 +517,7 @@ extern u64 atomic64_cmpxchg(atomic64_t *
7602 * the old value.
7603 */
7604 extern u64 atomic64_xchg(atomic64_t *ptr, u64 new_val);
7605+extern u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val);
7606
7607 /**
7608 * atomic64_set - set atomic64 variable
7609@@ -290,6 +529,15 @@ extern u64 atomic64_xchg(atomic64_t *ptr
7610 extern void atomic64_set(atomic64_t *ptr, u64 new_val);
7611
7612 /**
7613+ * atomic64_unchecked_set - set atomic64 variable
7614+ * @ptr: pointer to type atomic64_unchecked_t
7615+ * @new_val: value to assign
7616+ *
7617+ * Atomically sets the value of @ptr to @new_val.
7618+ */
7619+extern void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val);
7620+
7621+/**
7622 * atomic64_read - read atomic64 variable
7623 * @ptr: pointer to type atomic64_t
7624 *
7625@@ -317,7 +565,33 @@ static inline u64 atomic64_read(atomic64
7626 return res;
7627 }
7628
7629-extern u64 atomic64_read(atomic64_t *ptr);
7630+/**
7631+ * atomic64_read_unchecked - read atomic64 variable
7632+ * @ptr: pointer to type atomic64_unchecked_t
7633+ *
7634+ * Atomically reads the value of @ptr and returns it.
7635+ */
7636+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *ptr)
7637+{
7638+ u64 res;
7639+
7640+ /*
7641+ * Note, we inline this atomic64_unchecked_t primitive because
7642+ * it only clobbers EAX/EDX and leaves the others
7643+ * untouched. We also (somewhat subtly) rely on the
7644+ * fact that cmpxchg8b returns the current 64-bit value
7645+ * of the memory location we are touching:
7646+ */
7647+ asm volatile(
7648+ "mov %%ebx, %%eax\n\t"
7649+ "mov %%ecx, %%edx\n\t"
7650+ LOCK_PREFIX "cmpxchg8b %1\n"
7651+ : "=&A" (res)
7652+ : "m" (*ptr)
7653+ );
7654+
7655+ return res;
7656+}
7657
7658 /**
7659 * atomic64_add_return - add and return
7660@@ -332,8 +606,11 @@ extern u64 atomic64_add_return(u64 delta
7661 * Other variants with different arithmetic operators:
7662 */
7663 extern u64 atomic64_sub_return(u64 delta, atomic64_t *ptr);
7664+extern u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr);
7665 extern u64 atomic64_inc_return(atomic64_t *ptr);
7666+extern u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr);
7667 extern u64 atomic64_dec_return(atomic64_t *ptr);
7668+extern u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr);
7669
7670 /**
7671 * atomic64_add - add integer to atomic64 variable
7672@@ -345,6 +622,15 @@ extern u64 atomic64_dec_return(atomic64_
7673 extern void atomic64_add(u64 delta, atomic64_t *ptr);
7674
7675 /**
7676+ * atomic64_add_unchecked - add integer to atomic64 variable
7677+ * @delta: integer value to add
7678+ * @ptr: pointer to type atomic64_unchecked_t
7679+ *
7680+ * Atomically adds @delta to @ptr.
7681+ */
7682+extern void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr);
7683+
7684+/**
7685 * atomic64_sub - subtract the atomic64 variable
7686 * @delta: integer value to subtract
7687 * @ptr: pointer to type atomic64_t
7688@@ -354,6 +640,15 @@ extern void atomic64_add(u64 delta, atom
7689 extern void atomic64_sub(u64 delta, atomic64_t *ptr);
7690
7691 /**
7692+ * atomic64_sub_unchecked - subtract the atomic64 variable
7693+ * @delta: integer value to subtract
7694+ * @ptr: pointer to type atomic64_unchecked_t
7695+ *
7696+ * Atomically subtracts @delta from @ptr.
7697+ */
7698+extern void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr);
7699+
7700+/**
7701 * atomic64_sub_and_test - subtract value from variable and test result
7702 * @delta: integer value to subtract
7703 * @ptr: pointer to type atomic64_t
7704@@ -373,6 +668,14 @@ extern int atomic64_sub_and_test(u64 del
7705 extern void atomic64_inc(atomic64_t *ptr);
7706
7707 /**
7708+ * atomic64_inc_unchecked - increment atomic64 variable
7709+ * @ptr: pointer to type atomic64_unchecked_t
7710+ *
7711+ * Atomically increments @ptr by 1.
7712+ */
7713+extern void atomic64_inc_unchecked(atomic64_unchecked_t *ptr);
7714+
7715+/**
7716 * atomic64_dec - decrement atomic64 variable
7717 * @ptr: pointer to type atomic64_t
7718 *
7719@@ -381,6 +684,14 @@ extern void atomic64_inc(atomic64_t *ptr
7720 extern void atomic64_dec(atomic64_t *ptr);
7721
7722 /**
7723+ * atomic64_dec_unchecked - decrement atomic64 variable
7724+ * @ptr: pointer to type atomic64_unchecked_t
7725+ *
7726+ * Atomically decrements @ptr by 1.
7727+ */
7728+extern void atomic64_dec_unchecked(atomic64_unchecked_t *ptr);
7729+
7730+/**
7731 * atomic64_dec_and_test - decrement and test
7732 * @ptr: pointer to type atomic64_t
7733 *
7734diff -urNp linux-2.6.32.46/arch/x86/include/asm/atomic_64.h linux-2.6.32.46/arch/x86/include/asm/atomic_64.h
7735--- linux-2.6.32.46/arch/x86/include/asm/atomic_64.h 2011-03-27 14:31:47.000000000 -0400
7736+++ linux-2.6.32.46/arch/x86/include/asm/atomic_64.h 2011-05-04 18:35:31.000000000 -0400
7737@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
7738 }
7739
7740 /**
7741+ * atomic_read_unchecked - read atomic variable
7742+ * @v: pointer of type atomic_unchecked_t
7743+ *
7744+ * Atomically reads the value of @v.
7745+ */
7746+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
7747+{
7748+ return v->counter;
7749+}
7750+
7751+/**
7752 * atomic_set - set atomic variable
7753 * @v: pointer of type atomic_t
7754 * @i: required value
7755@@ -36,6 +47,18 @@ static inline void atomic_set(atomic_t *
7756 }
7757
7758 /**
7759+ * atomic_set_unchecked - set atomic variable
7760+ * @v: pointer of type atomic_unchecked_t
7761+ * @i: required value
7762+ *
7763+ * Atomically sets the value of @v to @i.
7764+ */
7765+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7766+{
7767+ v->counter = i;
7768+}
7769+
7770+/**
7771 * atomic_add - add integer to atomic variable
7772 * @i: integer value to add
7773 * @v: pointer of type atomic_t
7774@@ -44,7 +67,29 @@ static inline void atomic_set(atomic_t *
7775 */
7776 static inline void atomic_add(int i, atomic_t *v)
7777 {
7778- asm volatile(LOCK_PREFIX "addl %1,%0"
7779+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
7780+
7781+#ifdef CONFIG_PAX_REFCOUNT
7782+ "jno 0f\n"
7783+ LOCK_PREFIX "subl %1,%0\n"
7784+ "int $4\n0:\n"
7785+ _ASM_EXTABLE(0b, 0b)
7786+#endif
7787+
7788+ : "=m" (v->counter)
7789+ : "ir" (i), "m" (v->counter));
7790+}
7791+
7792+/**
7793+ * atomic_add_unchecked - add integer to atomic variable
7794+ * @i: integer value to add
7795+ * @v: pointer of type atomic_unchecked_t
7796+ *
7797+ * Atomically adds @i to @v.
7798+ */
7799+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
7800+{
7801+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
7802 : "=m" (v->counter)
7803 : "ir" (i), "m" (v->counter));
7804 }
7805@@ -58,7 +103,29 @@ static inline void atomic_add(int i, ato
7806 */
7807 static inline void atomic_sub(int i, atomic_t *v)
7808 {
7809- asm volatile(LOCK_PREFIX "subl %1,%0"
7810+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
7811+
7812+#ifdef CONFIG_PAX_REFCOUNT
7813+ "jno 0f\n"
7814+ LOCK_PREFIX "addl %1,%0\n"
7815+ "int $4\n0:\n"
7816+ _ASM_EXTABLE(0b, 0b)
7817+#endif
7818+
7819+ : "=m" (v->counter)
7820+ : "ir" (i), "m" (v->counter));
7821+}
7822+
7823+/**
7824+ * atomic_sub_unchecked - subtract the atomic variable
7825+ * @i: integer value to subtract
7826+ * @v: pointer of type atomic_unchecked_t
7827+ *
7828+ * Atomically subtracts @i from @v.
7829+ */
7830+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
7831+{
7832+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
7833 : "=m" (v->counter)
7834 : "ir" (i), "m" (v->counter));
7835 }
7836@@ -76,7 +143,16 @@ static inline int atomic_sub_and_test(in
7837 {
7838 unsigned char c;
7839
7840- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
7841+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
7842+
7843+#ifdef CONFIG_PAX_REFCOUNT
7844+ "jno 0f\n"
7845+ LOCK_PREFIX "addl %2,%0\n"
7846+ "int $4\n0:\n"
7847+ _ASM_EXTABLE(0b, 0b)
7848+#endif
7849+
7850+ "sete %1\n"
7851 : "=m" (v->counter), "=qm" (c)
7852 : "ir" (i), "m" (v->counter) : "memory");
7853 return c;
7854@@ -90,7 +166,28 @@ static inline int atomic_sub_and_test(in
7855 */
7856 static inline void atomic_inc(atomic_t *v)
7857 {
7858- asm volatile(LOCK_PREFIX "incl %0"
7859+ asm volatile(LOCK_PREFIX "incl %0\n"
7860+
7861+#ifdef CONFIG_PAX_REFCOUNT
7862+ "jno 0f\n"
7863+ LOCK_PREFIX "decl %0\n"
7864+ "int $4\n0:\n"
7865+ _ASM_EXTABLE(0b, 0b)
7866+#endif
7867+
7868+ : "=m" (v->counter)
7869+ : "m" (v->counter));
7870+}
7871+
7872+/**
7873+ * atomic_inc_unchecked - increment atomic variable
7874+ * @v: pointer of type atomic_unchecked_t
7875+ *
7876+ * Atomically increments @v by 1.
7877+ */
7878+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7879+{
7880+ asm volatile(LOCK_PREFIX "incl %0\n"
7881 : "=m" (v->counter)
7882 : "m" (v->counter));
7883 }
7884@@ -103,7 +200,28 @@ static inline void atomic_inc(atomic_t *
7885 */
7886 static inline void atomic_dec(atomic_t *v)
7887 {
7888- asm volatile(LOCK_PREFIX "decl %0"
7889+ asm volatile(LOCK_PREFIX "decl %0\n"
7890+
7891+#ifdef CONFIG_PAX_REFCOUNT
7892+ "jno 0f\n"
7893+ LOCK_PREFIX "incl %0\n"
7894+ "int $4\n0:\n"
7895+ _ASM_EXTABLE(0b, 0b)
7896+#endif
7897+
7898+ : "=m" (v->counter)
7899+ : "m" (v->counter));
7900+}
7901+
7902+/**
7903+ * atomic_dec_unchecked - decrement atomic variable
7904+ * @v: pointer of type atomic_unchecked_t
7905+ *
7906+ * Atomically decrements @v by 1.
7907+ */
7908+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
7909+{
7910+ asm volatile(LOCK_PREFIX "decl %0\n"
7911 : "=m" (v->counter)
7912 : "m" (v->counter));
7913 }
7914@@ -120,7 +238,16 @@ static inline int atomic_dec_and_test(at
7915 {
7916 unsigned char c;
7917
7918- asm volatile(LOCK_PREFIX "decl %0; sete %1"
7919+ asm volatile(LOCK_PREFIX "decl %0\n"
7920+
7921+#ifdef CONFIG_PAX_REFCOUNT
7922+ "jno 0f\n"
7923+ LOCK_PREFIX "incl %0\n"
7924+ "int $4\n0:\n"
7925+ _ASM_EXTABLE(0b, 0b)
7926+#endif
7927+
7928+ "sete %1\n"
7929 : "=m" (v->counter), "=qm" (c)
7930 : "m" (v->counter) : "memory");
7931 return c != 0;
7932@@ -138,7 +265,35 @@ static inline int atomic_inc_and_test(at
7933 {
7934 unsigned char c;
7935
7936- asm volatile(LOCK_PREFIX "incl %0; sete %1"
7937+ asm volatile(LOCK_PREFIX "incl %0\n"
7938+
7939+#ifdef CONFIG_PAX_REFCOUNT
7940+ "jno 0f\n"
7941+ LOCK_PREFIX "decl %0\n"
7942+ "int $4\n0:\n"
7943+ _ASM_EXTABLE(0b, 0b)
7944+#endif
7945+
7946+ "sete %1\n"
7947+ : "=m" (v->counter), "=qm" (c)
7948+ : "m" (v->counter) : "memory");
7949+ return c != 0;
7950+}
7951+
7952+/**
7953+ * atomic_inc_and_test_unchecked - increment and test
7954+ * @v: pointer of type atomic_unchecked_t
7955+ *
7956+ * Atomically increments @v by 1
7957+ * and returns true if the result is zero, or false for all
7958+ * other cases.
7959+ */
7960+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7961+{
7962+ unsigned char c;
7963+
7964+ asm volatile(LOCK_PREFIX "incl %0\n"
7965+ "sete %1\n"
7966 : "=m" (v->counter), "=qm" (c)
7967 : "m" (v->counter) : "memory");
7968 return c != 0;
7969@@ -157,7 +312,16 @@ static inline int atomic_add_negative(in
7970 {
7971 unsigned char c;
7972
7973- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
7974+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
7975+
7976+#ifdef CONFIG_PAX_REFCOUNT
7977+ "jno 0f\n"
7978+ LOCK_PREFIX "subl %2,%0\n"
7979+ "int $4\n0:\n"
7980+ _ASM_EXTABLE(0b, 0b)
7981+#endif
7982+
7983+ "sets %1\n"
7984 : "=m" (v->counter), "=qm" (c)
7985 : "ir" (i), "m" (v->counter) : "memory");
7986 return c;
7987@@ -173,7 +337,31 @@ static inline int atomic_add_negative(in
7988 static inline int atomic_add_return(int i, atomic_t *v)
7989 {
7990 int __i = i;
7991- asm volatile(LOCK_PREFIX "xaddl %0, %1"
7992+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
7993+
7994+#ifdef CONFIG_PAX_REFCOUNT
7995+ "jno 0f\n"
7996+ "movl %0, %1\n"
7997+ "int $4\n0:\n"
7998+ _ASM_EXTABLE(0b, 0b)
7999+#endif
8000+
8001+ : "+r" (i), "+m" (v->counter)
8002+ : : "memory");
8003+ return i + __i;
8004+}
8005+
8006+/**
8007+ * atomic_add_return_unchecked - add and return
8008+ * @i: integer value to add
8009+ * @v: pointer of type atomic_unchecked_t
8010+ *
8011+ * Atomically adds @i to @v and returns @i + @v
8012+ */
8013+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8014+{
8015+ int __i = i;
8016+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
8017 : "+r" (i), "+m" (v->counter)
8018 : : "memory");
8019 return i + __i;
8020@@ -185,6 +373,10 @@ static inline int atomic_sub_return(int
8021 }
8022
8023 #define atomic_inc_return(v) (atomic_add_return(1, v))
8024+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
8025+{
8026+ return atomic_add_return_unchecked(1, v);
8027+}
8028 #define atomic_dec_return(v) (atomic_sub_return(1, v))
8029
8030 /* The 64-bit atomic type */
8031@@ -204,6 +396,18 @@ static inline long atomic64_read(const a
8032 }
8033
8034 /**
8035+ * atomic64_read_unchecked - read atomic64 variable
8036+ * @v: pointer of type atomic64_unchecked_t
8037+ *
8038+ * Atomically reads the value of @v.
8039+ * Doesn't imply a read memory barrier.
8040+ */
8041+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8042+{
8043+ return v->counter;
8044+}
8045+
8046+/**
8047 * atomic64_set - set atomic64 variable
8048 * @v: pointer to type atomic64_t
8049 * @i: required value
8050@@ -216,6 +420,18 @@ static inline void atomic64_set(atomic64
8051 }
8052
8053 /**
8054+ * atomic64_set_unchecked - set atomic64 variable
8055+ * @v: pointer to type atomic64_unchecked_t
8056+ * @i: required value
8057+ *
8058+ * Atomically sets the value of @v to @i.
8059+ */
8060+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8061+{
8062+ v->counter = i;
8063+}
8064+
8065+/**
8066 * atomic64_add - add integer to atomic64 variable
8067 * @i: integer value to add
8068 * @v: pointer to type atomic64_t
8069@@ -224,6 +440,28 @@ static inline void atomic64_set(atomic64
8070 */
8071 static inline void atomic64_add(long i, atomic64_t *v)
8072 {
8073+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
8074+
8075+#ifdef CONFIG_PAX_REFCOUNT
8076+ "jno 0f\n"
8077+ LOCK_PREFIX "subq %1,%0\n"
8078+ "int $4\n0:\n"
8079+ _ASM_EXTABLE(0b, 0b)
8080+#endif
8081+
8082+ : "=m" (v->counter)
8083+ : "er" (i), "m" (v->counter));
8084+}
8085+
8086+/**
8087+ * atomic64_add_unchecked - add integer to atomic64 variable
8088+ * @i: integer value to add
8089+ * @v: pointer to type atomic64_unchecked_t
8090+ *
8091+ * Atomically adds @i to @v.
8092+ */
8093+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
8094+{
8095 asm volatile(LOCK_PREFIX "addq %1,%0"
8096 : "=m" (v->counter)
8097 : "er" (i), "m" (v->counter));
8098@@ -238,7 +476,15 @@ static inline void atomic64_add(long i,
8099 */
8100 static inline void atomic64_sub(long i, atomic64_t *v)
8101 {
8102- asm volatile(LOCK_PREFIX "subq %1,%0"
8103+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
8104+
8105+#ifdef CONFIG_PAX_REFCOUNT
8106+ "jno 0f\n"
8107+ LOCK_PREFIX "addq %1,%0\n"
8108+ "int $4\n0:\n"
8109+ _ASM_EXTABLE(0b, 0b)
8110+#endif
8111+
8112 : "=m" (v->counter)
8113 : "er" (i), "m" (v->counter));
8114 }
8115@@ -256,7 +502,16 @@ static inline int atomic64_sub_and_test(
8116 {
8117 unsigned char c;
8118
8119- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
8120+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
8121+
8122+#ifdef CONFIG_PAX_REFCOUNT
8123+ "jno 0f\n"
8124+ LOCK_PREFIX "addq %2,%0\n"
8125+ "int $4\n0:\n"
8126+ _ASM_EXTABLE(0b, 0b)
8127+#endif
8128+
8129+ "sete %1\n"
8130 : "=m" (v->counter), "=qm" (c)
8131 : "er" (i), "m" (v->counter) : "memory");
8132 return c;
8133@@ -270,6 +525,27 @@ static inline int atomic64_sub_and_test(
8134 */
8135 static inline void atomic64_inc(atomic64_t *v)
8136 {
8137+ asm volatile(LOCK_PREFIX "incq %0\n"
8138+
8139+#ifdef CONFIG_PAX_REFCOUNT
8140+ "jno 0f\n"
8141+ LOCK_PREFIX "decq %0\n"
8142+ "int $4\n0:\n"
8143+ _ASM_EXTABLE(0b, 0b)
8144+#endif
8145+
8146+ : "=m" (v->counter)
8147+ : "m" (v->counter));
8148+}
8149+
8150+/**
8151+ * atomic64_inc_unchecked - increment atomic64 variable
8152+ * @v: pointer to type atomic64_unchecked_t
8153+ *
8154+ * Atomically increments @v by 1.
8155+ */
8156+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8157+{
8158 asm volatile(LOCK_PREFIX "incq %0"
8159 : "=m" (v->counter)
8160 : "m" (v->counter));
8161@@ -283,7 +559,28 @@ static inline void atomic64_inc(atomic64
8162 */
8163 static inline void atomic64_dec(atomic64_t *v)
8164 {
8165- asm volatile(LOCK_PREFIX "decq %0"
8166+ asm volatile(LOCK_PREFIX "decq %0\n"
8167+
8168+#ifdef CONFIG_PAX_REFCOUNT
8169+ "jno 0f\n"
8170+ LOCK_PREFIX "incq %0\n"
8171+ "int $4\n0:\n"
8172+ _ASM_EXTABLE(0b, 0b)
8173+#endif
8174+
8175+ : "=m" (v->counter)
8176+ : "m" (v->counter));
8177+}
8178+
8179+/**
8180+ * atomic64_dec_unchecked - decrement atomic64 variable
8181+ * @v: pointer to type atomic64_t
8182+ *
8183+ * Atomically decrements @v by 1.
8184+ */
8185+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8186+{
8187+ asm volatile(LOCK_PREFIX "decq %0\n"
8188 : "=m" (v->counter)
8189 : "m" (v->counter));
8190 }
8191@@ -300,7 +597,16 @@ static inline int atomic64_dec_and_test(
8192 {
8193 unsigned char c;
8194
8195- asm volatile(LOCK_PREFIX "decq %0; sete %1"
8196+ asm volatile(LOCK_PREFIX "decq %0\n"
8197+
8198+#ifdef CONFIG_PAX_REFCOUNT
8199+ "jno 0f\n"
8200+ LOCK_PREFIX "incq %0\n"
8201+ "int $4\n0:\n"
8202+ _ASM_EXTABLE(0b, 0b)
8203+#endif
8204+
8205+ "sete %1\n"
8206 : "=m" (v->counter), "=qm" (c)
8207 : "m" (v->counter) : "memory");
8208 return c != 0;
8209@@ -318,7 +624,16 @@ static inline int atomic64_inc_and_test(
8210 {
8211 unsigned char c;
8212
8213- asm volatile(LOCK_PREFIX "incq %0; sete %1"
8214+ asm volatile(LOCK_PREFIX "incq %0\n"
8215+
8216+#ifdef CONFIG_PAX_REFCOUNT
8217+ "jno 0f\n"
8218+ LOCK_PREFIX "decq %0\n"
8219+ "int $4\n0:\n"
8220+ _ASM_EXTABLE(0b, 0b)
8221+#endif
8222+
8223+ "sete %1\n"
8224 : "=m" (v->counter), "=qm" (c)
8225 : "m" (v->counter) : "memory");
8226 return c != 0;
8227@@ -337,7 +652,16 @@ static inline int atomic64_add_negative(
8228 {
8229 unsigned char c;
8230
8231- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
8232+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
8233+
8234+#ifdef CONFIG_PAX_REFCOUNT
8235+ "jno 0f\n"
8236+ LOCK_PREFIX "subq %2,%0\n"
8237+ "int $4\n0:\n"
8238+ _ASM_EXTABLE(0b, 0b)
8239+#endif
8240+
8241+ "sets %1\n"
8242 : "=m" (v->counter), "=qm" (c)
8243 : "er" (i), "m" (v->counter) : "memory");
8244 return c;
8245@@ -353,7 +677,31 @@ static inline int atomic64_add_negative(
8246 static inline long atomic64_add_return(long i, atomic64_t *v)
8247 {
8248 long __i = i;
8249- asm volatile(LOCK_PREFIX "xaddq %0, %1;"
8250+ asm volatile(LOCK_PREFIX "xaddq %0, %1\n"
8251+
8252+#ifdef CONFIG_PAX_REFCOUNT
8253+ "jno 0f\n"
8254+ "movq %0, %1\n"
8255+ "int $4\n0:\n"
8256+ _ASM_EXTABLE(0b, 0b)
8257+#endif
8258+
8259+ : "+r" (i), "+m" (v->counter)
8260+ : : "memory");
8261+ return i + __i;
8262+}
8263+
8264+/**
8265+ * atomic64_add_return_unchecked - add and return
8266+ * @i: integer value to add
8267+ * @v: pointer to type atomic64_unchecked_t
8268+ *
8269+ * Atomically adds @i to @v and returns @i + @v
8270+ */
8271+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
8272+{
8273+ long __i = i;
8274+ asm volatile(LOCK_PREFIX "xaddq %0, %1"
8275 : "+r" (i), "+m" (v->counter)
8276 : : "memory");
8277 return i + __i;
8278@@ -365,6 +713,10 @@ static inline long atomic64_sub_return(l
8279 }
8280
8281 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
8282+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8283+{
8284+ return atomic64_add_return_unchecked(1, v);
8285+}
8286 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
8287
8288 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
8289@@ -372,21 +724,41 @@ static inline long atomic64_cmpxchg(atom
8290 return cmpxchg(&v->counter, old, new);
8291 }
8292
8293+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8294+{
8295+ return cmpxchg(&v->counter, old, new);
8296+}
8297+
8298 static inline long atomic64_xchg(atomic64_t *v, long new)
8299 {
8300 return xchg(&v->counter, new);
8301 }
8302
8303+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8304+{
8305+ return xchg(&v->counter, new);
8306+}
8307+
8308 static inline long atomic_cmpxchg(atomic_t *v, int old, int new)
8309 {
8310 return cmpxchg(&v->counter, old, new);
8311 }
8312
8313+static inline long atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
8314+{
8315+ return cmpxchg(&v->counter, old, new);
8316+}
8317+
8318 static inline long atomic_xchg(atomic_t *v, int new)
8319 {
8320 return xchg(&v->counter, new);
8321 }
8322
8323+static inline long atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
8324+{
8325+ return xchg(&v->counter, new);
8326+}
8327+
8328 /**
8329 * atomic_add_unless - add unless the number is a given value
8330 * @v: pointer of type atomic_t
8331@@ -398,17 +770,30 @@ static inline long atomic_xchg(atomic_t
8332 */
8333 static inline int atomic_add_unless(atomic_t *v, int a, int u)
8334 {
8335- int c, old;
8336+ int c, old, new;
8337 c = atomic_read(v);
8338 for (;;) {
8339- if (unlikely(c == (u)))
8340+ if (unlikely(c == u))
8341 break;
8342- old = atomic_cmpxchg((v), c, c + (a));
8343+
8344+ asm volatile("addl %2,%0\n"
8345+
8346+#ifdef CONFIG_PAX_REFCOUNT
8347+ "jno 0f\n"
8348+ "subl %2,%0\n"
8349+ "int $4\n0:\n"
8350+ _ASM_EXTABLE(0b, 0b)
8351+#endif
8352+
8353+ : "=r" (new)
8354+ : "0" (c), "ir" (a));
8355+
8356+ old = atomic_cmpxchg(v, c, new);
8357 if (likely(old == c))
8358 break;
8359 c = old;
8360 }
8361- return c != (u);
8362+ return c != u;
8363 }
8364
8365 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
8366@@ -424,17 +809,30 @@ static inline int atomic_add_unless(atom
8367 */
8368 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
8369 {
8370- long c, old;
8371+ long c, old, new;
8372 c = atomic64_read(v);
8373 for (;;) {
8374- if (unlikely(c == (u)))
8375+ if (unlikely(c == u))
8376 break;
8377- old = atomic64_cmpxchg((v), c, c + (a));
8378+
8379+ asm volatile("addq %2,%0\n"
8380+
8381+#ifdef CONFIG_PAX_REFCOUNT
8382+ "jno 0f\n"
8383+ "subq %2,%0\n"
8384+ "int $4\n0:\n"
8385+ _ASM_EXTABLE(0b, 0b)
8386+#endif
8387+
8388+ : "=r" (new)
8389+ : "0" (c), "er" (a));
8390+
8391+ old = atomic64_cmpxchg(v, c, new);
8392 if (likely(old == c))
8393 break;
8394 c = old;
8395 }
8396- return c != (u);
8397+ return c != u;
8398 }
8399
8400 /**
8401diff -urNp linux-2.6.32.46/arch/x86/include/asm/bitops.h linux-2.6.32.46/arch/x86/include/asm/bitops.h
8402--- linux-2.6.32.46/arch/x86/include/asm/bitops.h 2011-03-27 14:31:47.000000000 -0400
8403+++ linux-2.6.32.46/arch/x86/include/asm/bitops.h 2011-04-17 15:56:46.000000000 -0400
8404@@ -38,7 +38,7 @@
8405 * a mask operation on a byte.
8406 */
8407 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
8408-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
8409+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
8410 #define CONST_MASK(nr) (1 << ((nr) & 7))
8411
8412 /**
8413diff -urNp linux-2.6.32.46/arch/x86/include/asm/boot.h linux-2.6.32.46/arch/x86/include/asm/boot.h
8414--- linux-2.6.32.46/arch/x86/include/asm/boot.h 2011-03-27 14:31:47.000000000 -0400
8415+++ linux-2.6.32.46/arch/x86/include/asm/boot.h 2011-04-17 15:56:46.000000000 -0400
8416@@ -11,10 +11,15 @@
8417 #include <asm/pgtable_types.h>
8418
8419 /* Physical address where kernel should be loaded. */
8420-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
8421+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
8422 + (CONFIG_PHYSICAL_ALIGN - 1)) \
8423 & ~(CONFIG_PHYSICAL_ALIGN - 1))
8424
8425+#ifndef __ASSEMBLY__
8426+extern unsigned char __LOAD_PHYSICAL_ADDR[];
8427+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
8428+#endif
8429+
8430 /* Minimum kernel alignment, as a power of two */
8431 #ifdef CONFIG_X86_64
8432 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
8433diff -urNp linux-2.6.32.46/arch/x86/include/asm/cacheflush.h linux-2.6.32.46/arch/x86/include/asm/cacheflush.h
8434--- linux-2.6.32.46/arch/x86/include/asm/cacheflush.h 2011-03-27 14:31:47.000000000 -0400
8435+++ linux-2.6.32.46/arch/x86/include/asm/cacheflush.h 2011-04-17 15:56:46.000000000 -0400
8436@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
8437 static inline unsigned long get_page_memtype(struct page *pg)
8438 {
8439 if (!PageUncached(pg) && !PageWC(pg))
8440- return -1;
8441+ return ~0UL;
8442 else if (!PageUncached(pg) && PageWC(pg))
8443 return _PAGE_CACHE_WC;
8444 else if (PageUncached(pg) && !PageWC(pg))
8445@@ -85,7 +85,7 @@ static inline void set_page_memtype(stru
8446 SetPageWC(pg);
8447 break;
8448 default:
8449- case -1:
8450+ case ~0UL:
8451 ClearPageUncached(pg);
8452 ClearPageWC(pg);
8453 break;
8454diff -urNp linux-2.6.32.46/arch/x86/include/asm/cache.h linux-2.6.32.46/arch/x86/include/asm/cache.h
8455--- linux-2.6.32.46/arch/x86/include/asm/cache.h 2011-03-27 14:31:47.000000000 -0400
8456+++ linux-2.6.32.46/arch/x86/include/asm/cache.h 2011-07-06 19:53:33.000000000 -0400
8457@@ -5,9 +5,10 @@
8458
8459 /* L1 cache line size */
8460 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
8461-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8462+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8463
8464 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
8465+#define __read_only __attribute__((__section__(".data.read_only")))
8466
8467 #ifdef CONFIG_X86_VSMP
8468 /* vSMP Internode cacheline shift */
8469diff -urNp linux-2.6.32.46/arch/x86/include/asm/calling.h linux-2.6.32.46/arch/x86/include/asm/calling.h
8470--- linux-2.6.32.46/arch/x86/include/asm/calling.h 2011-03-27 14:31:47.000000000 -0400
8471+++ linux-2.6.32.46/arch/x86/include/asm/calling.h 2011-10-06 10:08:42.000000000 -0400
8472@@ -52,32 +52,32 @@ For 32-bit we have the following convent
8473 * for assembly code:
8474 */
8475
8476-#define R15 0
8477-#define R14 8
8478-#define R13 16
8479-#define R12 24
8480-#define RBP 32
8481-#define RBX 40
8482+#define R15 (0)
8483+#define R14 (8)
8484+#define R13 (16)
8485+#define R12 (24)
8486+#define RBP (32)
8487+#define RBX (40)
8488
8489 /* arguments: interrupts/non tracing syscalls only save up to here: */
8490-#define R11 48
8491-#define R10 56
8492-#define R9 64
8493-#define R8 72
8494-#define RAX 80
8495-#define RCX 88
8496-#define RDX 96
8497-#define RSI 104
8498-#define RDI 112
8499-#define ORIG_RAX 120 /* + error_code */
8500+#define R11 (48)
8501+#define R10 (56)
8502+#define R9 (64)
8503+#define R8 (72)
8504+#define RAX (80)
8505+#define RCX (88)
8506+#define RDX (96)
8507+#define RSI (104)
8508+#define RDI (112)
8509+#define ORIG_RAX (120) /* + error_code */
8510 /* end of arguments */
8511
8512 /* cpu exception frame or undefined in case of fast syscall: */
8513-#define RIP 128
8514-#define CS 136
8515-#define EFLAGS 144
8516-#define RSP 152
8517-#define SS 160
8518+#define RIP (128)
8519+#define CS (136)
8520+#define EFLAGS (144)
8521+#define RSP (152)
8522+#define SS (160)
8523
8524 #define ARGOFFSET R11
8525 #define SWFRAME ORIG_RAX
8526diff -urNp linux-2.6.32.46/arch/x86/include/asm/checksum_32.h linux-2.6.32.46/arch/x86/include/asm/checksum_32.h
8527--- linux-2.6.32.46/arch/x86/include/asm/checksum_32.h 2011-03-27 14:31:47.000000000 -0400
8528+++ linux-2.6.32.46/arch/x86/include/asm/checksum_32.h 2011-04-17 15:56:46.000000000 -0400
8529@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
8530 int len, __wsum sum,
8531 int *src_err_ptr, int *dst_err_ptr);
8532
8533+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
8534+ int len, __wsum sum,
8535+ int *src_err_ptr, int *dst_err_ptr);
8536+
8537+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
8538+ int len, __wsum sum,
8539+ int *src_err_ptr, int *dst_err_ptr);
8540+
8541 /*
8542 * Note: when you get a NULL pointer exception here this means someone
8543 * passed in an incorrect kernel address to one of these functions.
8544@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_f
8545 int *err_ptr)
8546 {
8547 might_sleep();
8548- return csum_partial_copy_generic((__force void *)src, dst,
8549+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
8550 len, sum, err_ptr, NULL);
8551 }
8552
8553@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_us
8554 {
8555 might_sleep();
8556 if (access_ok(VERIFY_WRITE, dst, len))
8557- return csum_partial_copy_generic(src, (__force void *)dst,
8558+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
8559 len, sum, NULL, err_ptr);
8560
8561 if (len)
8562diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc_defs.h linux-2.6.32.46/arch/x86/include/asm/desc_defs.h
8563--- linux-2.6.32.46/arch/x86/include/asm/desc_defs.h 2011-03-27 14:31:47.000000000 -0400
8564+++ linux-2.6.32.46/arch/x86/include/asm/desc_defs.h 2011-04-17 15:56:46.000000000 -0400
8565@@ -31,6 +31,12 @@ struct desc_struct {
8566 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
8567 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
8568 };
8569+ struct {
8570+ u16 offset_low;
8571+ u16 seg;
8572+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
8573+ unsigned offset_high: 16;
8574+ } gate;
8575 };
8576 } __attribute__((packed));
8577
8578diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc.h linux-2.6.32.46/arch/x86/include/asm/desc.h
8579--- linux-2.6.32.46/arch/x86/include/asm/desc.h 2011-03-27 14:31:47.000000000 -0400
8580+++ linux-2.6.32.46/arch/x86/include/asm/desc.h 2011-04-23 12:56:10.000000000 -0400
8581@@ -4,6 +4,7 @@
8582 #include <asm/desc_defs.h>
8583 #include <asm/ldt.h>
8584 #include <asm/mmu.h>
8585+#include <asm/pgtable.h>
8586 #include <linux/smp.h>
8587
8588 static inline void fill_ldt(struct desc_struct *desc,
8589@@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_
8590 desc->base1 = (info->base_addr & 0x00ff0000) >> 16;
8591 desc->type = (info->read_exec_only ^ 1) << 1;
8592 desc->type |= info->contents << 2;
8593+ desc->type |= info->seg_not_present ^ 1;
8594 desc->s = 1;
8595 desc->dpl = 0x3;
8596 desc->p = info->seg_not_present ^ 1;
8597@@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_
8598 }
8599
8600 extern struct desc_ptr idt_descr;
8601-extern gate_desc idt_table[];
8602-
8603-struct gdt_page {
8604- struct desc_struct gdt[GDT_ENTRIES];
8605-} __attribute__((aligned(PAGE_SIZE)));
8606-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
8607+extern gate_desc idt_table[256];
8608
8609+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
8610 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
8611 {
8612- return per_cpu(gdt_page, cpu).gdt;
8613+ return cpu_gdt_table[cpu];
8614 }
8615
8616 #ifdef CONFIG_X86_64
8617@@ -65,9 +63,14 @@ static inline void pack_gate(gate_desc *
8618 unsigned long base, unsigned dpl, unsigned flags,
8619 unsigned short seg)
8620 {
8621- gate->a = (seg << 16) | (base & 0xffff);
8622- gate->b = (base & 0xffff0000) |
8623- (((0x80 | type | (dpl << 5)) & 0xff) << 8);
8624+ gate->gate.offset_low = base;
8625+ gate->gate.seg = seg;
8626+ gate->gate.reserved = 0;
8627+ gate->gate.type = type;
8628+ gate->gate.s = 0;
8629+ gate->gate.dpl = dpl;
8630+ gate->gate.p = 1;
8631+ gate->gate.offset_high = base >> 16;
8632 }
8633
8634 #endif
8635@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(str
8636 static inline void native_write_idt_entry(gate_desc *idt, int entry,
8637 const gate_desc *gate)
8638 {
8639+ pax_open_kernel();
8640 memcpy(&idt[entry], gate, sizeof(*gate));
8641+ pax_close_kernel();
8642 }
8643
8644 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry,
8645 const void *desc)
8646 {
8647+ pax_open_kernel();
8648 memcpy(&ldt[entry], desc, 8);
8649+ pax_close_kernel();
8650 }
8651
8652 static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
8653@@ -139,7 +146,10 @@ static inline void native_write_gdt_entr
8654 size = sizeof(struct desc_struct);
8655 break;
8656 }
8657+
8658+ pax_open_kernel();
8659 memcpy(&gdt[entry], desc, size);
8660+ pax_close_kernel();
8661 }
8662
8663 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
8664@@ -211,7 +221,9 @@ static inline void native_set_ldt(const
8665
8666 static inline void native_load_tr_desc(void)
8667 {
8668+ pax_open_kernel();
8669 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
8670+ pax_close_kernel();
8671 }
8672
8673 static inline void native_load_gdt(const struct desc_ptr *dtr)
8674@@ -246,8 +258,10 @@ static inline void native_load_tls(struc
8675 unsigned int i;
8676 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
8677
8678+ pax_open_kernel();
8679 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
8680 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
8681+ pax_close_kernel();
8682 }
8683
8684 #define _LDT_empty(info) \
8685@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct
8686 desc->limit = (limit >> 16) & 0xf;
8687 }
8688
8689-static inline void _set_gate(int gate, unsigned type, void *addr,
8690+static inline void _set_gate(int gate, unsigned type, const void *addr,
8691 unsigned dpl, unsigned ist, unsigned seg)
8692 {
8693 gate_desc s;
8694@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, u
8695 * Pentium F0 0F bugfix can have resulted in the mapped
8696 * IDT being write-protected.
8697 */
8698-static inline void set_intr_gate(unsigned int n, void *addr)
8699+static inline void set_intr_gate(unsigned int n, const void *addr)
8700 {
8701 BUG_ON((unsigned)n > 0xFF);
8702 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
8703@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsig
8704 /*
8705 * This routine sets up an interrupt gate at directory privilege level 3.
8706 */
8707-static inline void set_system_intr_gate(unsigned int n, void *addr)
8708+static inline void set_system_intr_gate(unsigned int n, const void *addr)
8709 {
8710 BUG_ON((unsigned)n > 0xFF);
8711 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
8712 }
8713
8714-static inline void set_system_trap_gate(unsigned int n, void *addr)
8715+static inline void set_system_trap_gate(unsigned int n, const void *addr)
8716 {
8717 BUG_ON((unsigned)n > 0xFF);
8718 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
8719 }
8720
8721-static inline void set_trap_gate(unsigned int n, void *addr)
8722+static inline void set_trap_gate(unsigned int n, const void *addr)
8723 {
8724 BUG_ON((unsigned)n > 0xFF);
8725 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
8726@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigne
8727 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
8728 {
8729 BUG_ON((unsigned)n > 0xFF);
8730- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
8731+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
8732 }
8733
8734-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
8735+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
8736 {
8737 BUG_ON((unsigned)n > 0xFF);
8738 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
8739 }
8740
8741-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
8742+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
8743 {
8744 BUG_ON((unsigned)n > 0xFF);
8745 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
8746 }
8747
8748+#ifdef CONFIG_X86_32
8749+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
8750+{
8751+ struct desc_struct d;
8752+
8753+ if (likely(limit))
8754+ limit = (limit - 1UL) >> PAGE_SHIFT;
8755+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
8756+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
8757+}
8758+#endif
8759+
8760 #endif /* _ASM_X86_DESC_H */
8761diff -urNp linux-2.6.32.46/arch/x86/include/asm/device.h linux-2.6.32.46/arch/x86/include/asm/device.h
8762--- linux-2.6.32.46/arch/x86/include/asm/device.h 2011-03-27 14:31:47.000000000 -0400
8763+++ linux-2.6.32.46/arch/x86/include/asm/device.h 2011-04-17 15:56:46.000000000 -0400
8764@@ -6,7 +6,7 @@ struct dev_archdata {
8765 void *acpi_handle;
8766 #endif
8767 #ifdef CONFIG_X86_64
8768-struct dma_map_ops *dma_ops;
8769+ const struct dma_map_ops *dma_ops;
8770 #endif
8771 #ifdef CONFIG_DMAR
8772 void *iommu; /* hook for IOMMU specific extension */
8773diff -urNp linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h
8774--- linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400
8775+++ linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400
8776@@ -25,9 +25,9 @@ extern int iommu_merge;
8777 extern struct device x86_dma_fallback_dev;
8778 extern int panic_on_overflow;
8779
8780-extern struct dma_map_ops *dma_ops;
8781+extern const struct dma_map_ops *dma_ops;
8782
8783-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
8784+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
8785 {
8786 #ifdef CONFIG_X86_32
8787 return dma_ops;
8788@@ -44,7 +44,7 @@ static inline struct dma_map_ops *get_dm
8789 /* Make sure we keep the same behaviour */
8790 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
8791 {
8792- struct dma_map_ops *ops = get_dma_ops(dev);
8793+ const struct dma_map_ops *ops = get_dma_ops(dev);
8794 if (ops->mapping_error)
8795 return ops->mapping_error(dev, dma_addr);
8796
8797@@ -122,7 +122,7 @@ static inline void *
8798 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
8799 gfp_t gfp)
8800 {
8801- struct dma_map_ops *ops = get_dma_ops(dev);
8802+ const struct dma_map_ops *ops = get_dma_ops(dev);
8803 void *memory;
8804
8805 gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
8806@@ -149,7 +149,7 @@ dma_alloc_coherent(struct device *dev, s
8807 static inline void dma_free_coherent(struct device *dev, size_t size,
8808 void *vaddr, dma_addr_t bus)
8809 {
8810- struct dma_map_ops *ops = get_dma_ops(dev);
8811+ const struct dma_map_ops *ops = get_dma_ops(dev);
8812
8813 WARN_ON(irqs_disabled()); /* for portability */
8814
8815diff -urNp linux-2.6.32.46/arch/x86/include/asm/e820.h linux-2.6.32.46/arch/x86/include/asm/e820.h
8816--- linux-2.6.32.46/arch/x86/include/asm/e820.h 2011-03-27 14:31:47.000000000 -0400
8817+++ linux-2.6.32.46/arch/x86/include/asm/e820.h 2011-04-17 15:56:46.000000000 -0400
8818@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
8819 #define ISA_END_ADDRESS 0x100000
8820 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
8821
8822-#define BIOS_BEGIN 0x000a0000
8823+#define BIOS_BEGIN 0x000c0000
8824 #define BIOS_END 0x00100000
8825
8826 #ifdef __KERNEL__
8827diff -urNp linux-2.6.32.46/arch/x86/include/asm/elf.h linux-2.6.32.46/arch/x86/include/asm/elf.h
8828--- linux-2.6.32.46/arch/x86/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400
8829+++ linux-2.6.32.46/arch/x86/include/asm/elf.h 2011-08-23 20:24:19.000000000 -0400
8830@@ -257,7 +257,25 @@ extern int force_personality32;
8831 the loader. We need to make sure that it is out of the way of the program
8832 that it will "exec", and that there is sufficient room for the brk. */
8833
8834+#ifdef CONFIG_PAX_SEGMEXEC
8835+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
8836+#else
8837 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
8838+#endif
8839+
8840+#ifdef CONFIG_PAX_ASLR
8841+#ifdef CONFIG_X86_32
8842+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
8843+
8844+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
8845+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
8846+#else
8847+#define PAX_ELF_ET_DYN_BASE 0x400000UL
8848+
8849+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
8850+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
8851+#endif
8852+#endif
8853
8854 /* This yields a mask that user programs can use to figure out what
8855 instruction set this CPU supports. This could be done in user space,
8856@@ -310,9 +328,7 @@ do { \
8857
8858 #define ARCH_DLINFO \
8859 do { \
8860- if (vdso_enabled) \
8861- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
8862- (unsigned long)current->mm->context.vdso); \
8863+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
8864 } while (0)
8865
8866 #define AT_SYSINFO 32
8867@@ -323,7 +339,7 @@ do { \
8868
8869 #endif /* !CONFIG_X86_32 */
8870
8871-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
8872+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
8873
8874 #define VDSO_ENTRY \
8875 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
8876@@ -337,7 +353,4 @@ extern int arch_setup_additional_pages(s
8877 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
8878 #define compat_arch_setup_additional_pages syscall32_setup_pages
8879
8880-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8881-#define arch_randomize_brk arch_randomize_brk
8882-
8883 #endif /* _ASM_X86_ELF_H */
8884diff -urNp linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h
8885--- linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h 2011-03-27 14:31:47.000000000 -0400
8886+++ linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h 2011-05-22 23:02:06.000000000 -0400
8887@@ -15,6 +15,6 @@ enum reboot_type {
8888
8889 extern enum reboot_type reboot_type;
8890
8891-extern void machine_emergency_restart(void);
8892+extern void machine_emergency_restart(void) __noreturn;
8893
8894 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
8895diff -urNp linux-2.6.32.46/arch/x86/include/asm/futex.h linux-2.6.32.46/arch/x86/include/asm/futex.h
8896--- linux-2.6.32.46/arch/x86/include/asm/futex.h 2011-03-27 14:31:47.000000000 -0400
8897+++ linux-2.6.32.46/arch/x86/include/asm/futex.h 2011-10-06 09:37:08.000000000 -0400
8898@@ -12,16 +12,18 @@
8899 #include <asm/system.h>
8900
8901 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
8902+ typecheck(u32 __user *, uaddr); \
8903 asm volatile("1:\t" insn "\n" \
8904 "2:\t.section .fixup,\"ax\"\n" \
8905 "3:\tmov\t%3, %1\n" \
8906 "\tjmp\t2b\n" \
8907 "\t.previous\n" \
8908 _ASM_EXTABLE(1b, 3b) \
8909- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
8910+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
8911 : "i" (-EFAULT), "0" (oparg), "1" (0))
8912
8913 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
8914+ typecheck(u32 __user *, uaddr); \
8915 asm volatile("1:\tmovl %2, %0\n" \
8916 "\tmovl\t%0, %3\n" \
8917 "\t" insn "\n" \
8918@@ -34,10 +36,10 @@
8919 _ASM_EXTABLE(1b, 4b) \
8920 _ASM_EXTABLE(2b, 4b) \
8921 : "=&a" (oldval), "=&r" (ret), \
8922- "+m" (*uaddr), "=&r" (tem) \
8923+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
8924 : "r" (oparg), "i" (-EFAULT), "1" (0))
8925
8926-static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
8927+static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
8928 {
8929 int op = (encoded_op >> 28) & 7;
8930 int cmp = (encoded_op >> 24) & 15;
8931@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser
8932
8933 switch (op) {
8934 case FUTEX_OP_SET:
8935- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
8936+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
8937 break;
8938 case FUTEX_OP_ADD:
8939- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
8940+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
8941 uaddr, oparg);
8942 break;
8943 case FUTEX_OP_OR:
8944@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser
8945 return ret;
8946 }
8947
8948-static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
8949+static inline int futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval,
8950 int newval)
8951 {
8952
8953@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_i
8954 return -ENOSYS;
8955 #endif
8956
8957- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
8958+ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
8959 return -EFAULT;
8960
8961- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
8962+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %1\n"
8963 "2:\t.section .fixup, \"ax\"\n"
8964 "3:\tmov %2, %0\n"
8965 "\tjmp 2b\n"
8966 "\t.previous\n"
8967 _ASM_EXTABLE(1b, 3b)
8968- : "=a" (oldval), "+m" (*uaddr)
8969+ : "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
8970 : "i" (-EFAULT), "r" (newval), "0" (oldval)
8971 : "memory"
8972 );
8973diff -urNp linux-2.6.32.46/arch/x86/include/asm/hw_irq.h linux-2.6.32.46/arch/x86/include/asm/hw_irq.h
8974--- linux-2.6.32.46/arch/x86/include/asm/hw_irq.h 2011-03-27 14:31:47.000000000 -0400
8975+++ linux-2.6.32.46/arch/x86/include/asm/hw_irq.h 2011-05-04 17:56:28.000000000 -0400
8976@@ -92,8 +92,8 @@ extern void setup_ioapic_dest(void);
8977 extern void enable_IO_APIC(void);
8978
8979 /* Statistics */
8980-extern atomic_t irq_err_count;
8981-extern atomic_t irq_mis_count;
8982+extern atomic_unchecked_t irq_err_count;
8983+extern atomic_unchecked_t irq_mis_count;
8984
8985 /* EISA */
8986 extern void eisa_set_level_irq(unsigned int irq);
8987diff -urNp linux-2.6.32.46/arch/x86/include/asm/i387.h linux-2.6.32.46/arch/x86/include/asm/i387.h
8988--- linux-2.6.32.46/arch/x86/include/asm/i387.h 2011-03-27 14:31:47.000000000 -0400
8989+++ linux-2.6.32.46/arch/x86/include/asm/i387.h 2011-04-17 15:56:46.000000000 -0400
8990@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
8991 {
8992 int err;
8993
8994+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
8995+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
8996+ fx = (struct i387_fxsave_struct *)((void *)fx + PAX_USER_SHADOW_BASE);
8997+#endif
8998+
8999 asm volatile("1: rex64/fxrstor (%[fx])\n\t"
9000 "2:\n"
9001 ".section .fixup,\"ax\"\n"
9002@@ -105,6 +110,11 @@ static inline int fxsave_user(struct i38
9003 {
9004 int err;
9005
9006+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
9007+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
9008+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
9009+#endif
9010+
9011 asm volatile("1: rex64/fxsave (%[fx])\n\t"
9012 "2:\n"
9013 ".section .fixup,\"ax\"\n"
9014@@ -195,13 +205,8 @@ static inline int fxrstor_checking(struc
9015 }
9016
9017 /* We need a safe address that is cheap to find and that is already
9018- in L1 during context switch. The best choices are unfortunately
9019- different for UP and SMP */
9020-#ifdef CONFIG_SMP
9021-#define safe_address (__per_cpu_offset[0])
9022-#else
9023-#define safe_address (kstat_cpu(0).cpustat.user)
9024-#endif
9025+ in L1 during context switch. */
9026+#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
9027
9028 /*
9029 * These must be called with preempt disabled
9030@@ -291,7 +296,7 @@ static inline void kernel_fpu_begin(void
9031 struct thread_info *me = current_thread_info();
9032 preempt_disable();
9033 if (me->status & TS_USEDFPU)
9034- __save_init_fpu(me->task);
9035+ __save_init_fpu(current);
9036 else
9037 clts();
9038 }
9039diff -urNp linux-2.6.32.46/arch/x86/include/asm/io_32.h linux-2.6.32.46/arch/x86/include/asm/io_32.h
9040--- linux-2.6.32.46/arch/x86/include/asm/io_32.h 2011-03-27 14:31:47.000000000 -0400
9041+++ linux-2.6.32.46/arch/x86/include/asm/io_32.h 2011-04-17 15:56:46.000000000 -0400
9042@@ -3,6 +3,7 @@
9043
9044 #include <linux/string.h>
9045 #include <linux/compiler.h>
9046+#include <asm/processor.h>
9047
9048 /*
9049 * This file contains the definitions for the x86 IO instructions
9050@@ -42,6 +43,17 @@
9051
9052 #ifdef __KERNEL__
9053
9054+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
9055+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
9056+{
9057+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
9058+}
9059+
9060+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
9061+{
9062+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
9063+}
9064+
9065 #include <asm-generic/iomap.h>
9066
9067 #include <linux/vmalloc.h>
9068diff -urNp linux-2.6.32.46/arch/x86/include/asm/io_64.h linux-2.6.32.46/arch/x86/include/asm/io_64.h
9069--- linux-2.6.32.46/arch/x86/include/asm/io_64.h 2011-03-27 14:31:47.000000000 -0400
9070+++ linux-2.6.32.46/arch/x86/include/asm/io_64.h 2011-04-17 15:56:46.000000000 -0400
9071@@ -140,6 +140,17 @@ __OUTS(l)
9072
9073 #include <linux/vmalloc.h>
9074
9075+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
9076+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
9077+{
9078+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
9079+}
9080+
9081+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
9082+{
9083+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
9084+}
9085+
9086 #include <asm-generic/iomap.h>
9087
9088 void __memcpy_fromio(void *, unsigned long, unsigned);
9089diff -urNp linux-2.6.32.46/arch/x86/include/asm/iommu.h linux-2.6.32.46/arch/x86/include/asm/iommu.h
9090--- linux-2.6.32.46/arch/x86/include/asm/iommu.h 2011-03-27 14:31:47.000000000 -0400
9091+++ linux-2.6.32.46/arch/x86/include/asm/iommu.h 2011-04-17 15:56:46.000000000 -0400
9092@@ -3,7 +3,7 @@
9093
9094 extern void pci_iommu_shutdown(void);
9095 extern void no_iommu_init(void);
9096-extern struct dma_map_ops nommu_dma_ops;
9097+extern const struct dma_map_ops nommu_dma_ops;
9098 extern int force_iommu, no_iommu;
9099 extern int iommu_detected;
9100 extern int iommu_pass_through;
9101diff -urNp linux-2.6.32.46/arch/x86/include/asm/irqflags.h linux-2.6.32.46/arch/x86/include/asm/irqflags.h
9102--- linux-2.6.32.46/arch/x86/include/asm/irqflags.h 2011-03-27 14:31:47.000000000 -0400
9103+++ linux-2.6.32.46/arch/x86/include/asm/irqflags.h 2011-04-17 15:56:46.000000000 -0400
9104@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
9105 sti; \
9106 sysexit
9107
9108+#define GET_CR0_INTO_RDI mov %cr0, %rdi
9109+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
9110+#define GET_CR3_INTO_RDI mov %cr3, %rdi
9111+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
9112+
9113 #else
9114 #define INTERRUPT_RETURN iret
9115 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
9116diff -urNp linux-2.6.32.46/arch/x86/include/asm/kprobes.h linux-2.6.32.46/arch/x86/include/asm/kprobes.h
9117--- linux-2.6.32.46/arch/x86/include/asm/kprobes.h 2011-03-27 14:31:47.000000000 -0400
9118+++ linux-2.6.32.46/arch/x86/include/asm/kprobes.h 2011-04-23 12:56:12.000000000 -0400
9119@@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t;
9120 #define BREAKPOINT_INSTRUCTION 0xcc
9121 #define RELATIVEJUMP_INSTRUCTION 0xe9
9122 #define MAX_INSN_SIZE 16
9123-#define MAX_STACK_SIZE 64
9124-#define MIN_STACK_SIZE(ADDR) \
9125- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
9126- THREAD_SIZE - (unsigned long)(ADDR))) \
9127- ? (MAX_STACK_SIZE) \
9128- : (((unsigned long)current_thread_info()) + \
9129- THREAD_SIZE - (unsigned long)(ADDR)))
9130+#define MAX_STACK_SIZE 64UL
9131+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
9132
9133 #define flush_insn_slot(p) do { } while (0)
9134
9135diff -urNp linux-2.6.32.46/arch/x86/include/asm/kvm_host.h linux-2.6.32.46/arch/x86/include/asm/kvm_host.h
9136--- linux-2.6.32.46/arch/x86/include/asm/kvm_host.h 2011-05-10 22:12:01.000000000 -0400
9137+++ linux-2.6.32.46/arch/x86/include/asm/kvm_host.h 2011-08-26 20:19:09.000000000 -0400
9138@@ -534,9 +534,9 @@ struct kvm_x86_ops {
9139 bool (*gb_page_enable)(void);
9140
9141 const struct trace_print_flags *exit_reasons_str;
9142-};
9143+} __do_const;
9144
9145-extern struct kvm_x86_ops *kvm_x86_ops;
9146+extern const struct kvm_x86_ops *kvm_x86_ops;
9147
9148 int kvm_mmu_module_init(void);
9149 void kvm_mmu_module_exit(void);
9150diff -urNp linux-2.6.32.46/arch/x86/include/asm/local.h linux-2.6.32.46/arch/x86/include/asm/local.h
9151--- linux-2.6.32.46/arch/x86/include/asm/local.h 2011-03-27 14:31:47.000000000 -0400
9152+++ linux-2.6.32.46/arch/x86/include/asm/local.h 2011-04-17 15:56:46.000000000 -0400
9153@@ -18,26 +18,58 @@ typedef struct {
9154
9155 static inline void local_inc(local_t *l)
9156 {
9157- asm volatile(_ASM_INC "%0"
9158+ asm volatile(_ASM_INC "%0\n"
9159+
9160+#ifdef CONFIG_PAX_REFCOUNT
9161+ "jno 0f\n"
9162+ _ASM_DEC "%0\n"
9163+ "int $4\n0:\n"
9164+ _ASM_EXTABLE(0b, 0b)
9165+#endif
9166+
9167 : "+m" (l->a.counter));
9168 }
9169
9170 static inline void local_dec(local_t *l)
9171 {
9172- asm volatile(_ASM_DEC "%0"
9173+ asm volatile(_ASM_DEC "%0\n"
9174+
9175+#ifdef CONFIG_PAX_REFCOUNT
9176+ "jno 0f\n"
9177+ _ASM_INC "%0\n"
9178+ "int $4\n0:\n"
9179+ _ASM_EXTABLE(0b, 0b)
9180+#endif
9181+
9182 : "+m" (l->a.counter));
9183 }
9184
9185 static inline void local_add(long i, local_t *l)
9186 {
9187- asm volatile(_ASM_ADD "%1,%0"
9188+ asm volatile(_ASM_ADD "%1,%0\n"
9189+
9190+#ifdef CONFIG_PAX_REFCOUNT
9191+ "jno 0f\n"
9192+ _ASM_SUB "%1,%0\n"
9193+ "int $4\n0:\n"
9194+ _ASM_EXTABLE(0b, 0b)
9195+#endif
9196+
9197 : "+m" (l->a.counter)
9198 : "ir" (i));
9199 }
9200
9201 static inline void local_sub(long i, local_t *l)
9202 {
9203- asm volatile(_ASM_SUB "%1,%0"
9204+ asm volatile(_ASM_SUB "%1,%0\n"
9205+
9206+#ifdef CONFIG_PAX_REFCOUNT
9207+ "jno 0f\n"
9208+ _ASM_ADD "%1,%0\n"
9209+ "int $4\n0:\n"
9210+ _ASM_EXTABLE(0b, 0b)
9211+#endif
9212+
9213 : "+m" (l->a.counter)
9214 : "ir" (i));
9215 }
9216@@ -55,7 +87,16 @@ static inline int local_sub_and_test(lon
9217 {
9218 unsigned char c;
9219
9220- asm volatile(_ASM_SUB "%2,%0; sete %1"
9221+ asm volatile(_ASM_SUB "%2,%0\n"
9222+
9223+#ifdef CONFIG_PAX_REFCOUNT
9224+ "jno 0f\n"
9225+ _ASM_ADD "%2,%0\n"
9226+ "int $4\n0:\n"
9227+ _ASM_EXTABLE(0b, 0b)
9228+#endif
9229+
9230+ "sete %1\n"
9231 : "+m" (l->a.counter), "=qm" (c)
9232 : "ir" (i) : "memory");
9233 return c;
9234@@ -73,7 +114,16 @@ static inline int local_dec_and_test(loc
9235 {
9236 unsigned char c;
9237
9238- asm volatile(_ASM_DEC "%0; sete %1"
9239+ asm volatile(_ASM_DEC "%0\n"
9240+
9241+#ifdef CONFIG_PAX_REFCOUNT
9242+ "jno 0f\n"
9243+ _ASM_INC "%0\n"
9244+ "int $4\n0:\n"
9245+ _ASM_EXTABLE(0b, 0b)
9246+#endif
9247+
9248+ "sete %1\n"
9249 : "+m" (l->a.counter), "=qm" (c)
9250 : : "memory");
9251 return c != 0;
9252@@ -91,7 +141,16 @@ static inline int local_inc_and_test(loc
9253 {
9254 unsigned char c;
9255
9256- asm volatile(_ASM_INC "%0; sete %1"
9257+ asm volatile(_ASM_INC "%0\n"
9258+
9259+#ifdef CONFIG_PAX_REFCOUNT
9260+ "jno 0f\n"
9261+ _ASM_DEC "%0\n"
9262+ "int $4\n0:\n"
9263+ _ASM_EXTABLE(0b, 0b)
9264+#endif
9265+
9266+ "sete %1\n"
9267 : "+m" (l->a.counter), "=qm" (c)
9268 : : "memory");
9269 return c != 0;
9270@@ -110,7 +169,16 @@ static inline int local_add_negative(lon
9271 {
9272 unsigned char c;
9273
9274- asm volatile(_ASM_ADD "%2,%0; sets %1"
9275+ asm volatile(_ASM_ADD "%2,%0\n"
9276+
9277+#ifdef CONFIG_PAX_REFCOUNT
9278+ "jno 0f\n"
9279+ _ASM_SUB "%2,%0\n"
9280+ "int $4\n0:\n"
9281+ _ASM_EXTABLE(0b, 0b)
9282+#endif
9283+
9284+ "sets %1\n"
9285 : "+m" (l->a.counter), "=qm" (c)
9286 : "ir" (i) : "memory");
9287 return c;
9288@@ -133,7 +201,15 @@ static inline long local_add_return(long
9289 #endif
9290 /* Modern 486+ processor */
9291 __i = i;
9292- asm volatile(_ASM_XADD "%0, %1;"
9293+ asm volatile(_ASM_XADD "%0, %1\n"
9294+
9295+#ifdef CONFIG_PAX_REFCOUNT
9296+ "jno 0f\n"
9297+ _ASM_MOV "%0,%1\n"
9298+ "int $4\n0:\n"
9299+ _ASM_EXTABLE(0b, 0b)
9300+#endif
9301+
9302 : "+r" (i), "+m" (l->a.counter)
9303 : : "memory");
9304 return i + __i;
9305diff -urNp linux-2.6.32.46/arch/x86/include/asm/microcode.h linux-2.6.32.46/arch/x86/include/asm/microcode.h
9306--- linux-2.6.32.46/arch/x86/include/asm/microcode.h 2011-03-27 14:31:47.000000000 -0400
9307+++ linux-2.6.32.46/arch/x86/include/asm/microcode.h 2011-04-17 15:56:46.000000000 -0400
9308@@ -12,13 +12,13 @@ struct device;
9309 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
9310
9311 struct microcode_ops {
9312- enum ucode_state (*request_microcode_user) (int cpu,
9313+ enum ucode_state (* const request_microcode_user) (int cpu,
9314 const void __user *buf, size_t size);
9315
9316- enum ucode_state (*request_microcode_fw) (int cpu,
9317+ enum ucode_state (* const request_microcode_fw) (int cpu,
9318 struct device *device);
9319
9320- void (*microcode_fini_cpu) (int cpu);
9321+ void (* const microcode_fini_cpu) (int cpu);
9322
9323 /*
9324 * The generic 'microcode_core' part guarantees that
9325@@ -38,18 +38,18 @@ struct ucode_cpu_info {
9326 extern struct ucode_cpu_info ucode_cpu_info[];
9327
9328 #ifdef CONFIG_MICROCODE_INTEL
9329-extern struct microcode_ops * __init init_intel_microcode(void);
9330+extern const struct microcode_ops * __init init_intel_microcode(void);
9331 #else
9332-static inline struct microcode_ops * __init init_intel_microcode(void)
9333+static inline const struct microcode_ops * __init init_intel_microcode(void)
9334 {
9335 return NULL;
9336 }
9337 #endif /* CONFIG_MICROCODE_INTEL */
9338
9339 #ifdef CONFIG_MICROCODE_AMD
9340-extern struct microcode_ops * __init init_amd_microcode(void);
9341+extern const struct microcode_ops * __init init_amd_microcode(void);
9342 #else
9343-static inline struct microcode_ops * __init init_amd_microcode(void)
9344+static inline const struct microcode_ops * __init init_amd_microcode(void)
9345 {
9346 return NULL;
9347 }
9348diff -urNp linux-2.6.32.46/arch/x86/include/asm/mman.h linux-2.6.32.46/arch/x86/include/asm/mman.h
9349--- linux-2.6.32.46/arch/x86/include/asm/mman.h 2011-03-27 14:31:47.000000000 -0400
9350+++ linux-2.6.32.46/arch/x86/include/asm/mman.h 2011-04-17 15:56:46.000000000 -0400
9351@@ -5,4 +5,14 @@
9352
9353 #include <asm-generic/mman.h>
9354
9355+#ifdef __KERNEL__
9356+#ifndef __ASSEMBLY__
9357+#ifdef CONFIG_X86_32
9358+#define arch_mmap_check i386_mmap_check
9359+int i386_mmap_check(unsigned long addr, unsigned long len,
9360+ unsigned long flags);
9361+#endif
9362+#endif
9363+#endif
9364+
9365 #endif /* _ASM_X86_MMAN_H */
9366diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu_context.h linux-2.6.32.46/arch/x86/include/asm/mmu_context.h
9367--- linux-2.6.32.46/arch/x86/include/asm/mmu_context.h 2011-03-27 14:31:47.000000000 -0400
9368+++ linux-2.6.32.46/arch/x86/include/asm/mmu_context.h 2011-08-23 20:24:19.000000000 -0400
9369@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
9370
9371 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
9372 {
9373+
9374+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
9375+ unsigned int i;
9376+ pgd_t *pgd;
9377+
9378+ pax_open_kernel();
9379+ pgd = get_cpu_pgd(smp_processor_id());
9380+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
9381+ set_pgd_batched(pgd+i, native_make_pgd(0));
9382+ pax_close_kernel();
9383+#endif
9384+
9385 #ifdef CONFIG_SMP
9386 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
9387 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
9388@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_s
9389 struct task_struct *tsk)
9390 {
9391 unsigned cpu = smp_processor_id();
9392+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)) && defined(CONFIG_SMP)
9393+ int tlbstate = TLBSTATE_OK;
9394+#endif
9395
9396 if (likely(prev != next)) {
9397 #ifdef CONFIG_SMP
9398+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
9399+ tlbstate = percpu_read(cpu_tlbstate.state);
9400+#endif
9401 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
9402 percpu_write(cpu_tlbstate.active_mm, next);
9403 #endif
9404 cpumask_set_cpu(cpu, mm_cpumask(next));
9405
9406 /* Re-load page tables */
9407+#ifdef CONFIG_PAX_PER_CPU_PGD
9408+ pax_open_kernel();
9409+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
9410+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
9411+ pax_close_kernel();
9412+ load_cr3(get_cpu_pgd(cpu));
9413+#else
9414 load_cr3(next->pgd);
9415+#endif
9416
9417 /* stop flush ipis for the previous mm */
9418 cpumask_clear_cpu(cpu, mm_cpumask(prev));
9419@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_s
9420 */
9421 if (unlikely(prev->context.ldt != next->context.ldt))
9422 load_LDT_nolock(&next->context);
9423- }
9424+
9425+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
9426+ if (!nx_enabled) {
9427+ smp_mb__before_clear_bit();
9428+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
9429+ smp_mb__after_clear_bit();
9430+ cpu_set(cpu, next->context.cpu_user_cs_mask);
9431+ }
9432+#endif
9433+
9434+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
9435+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
9436+ prev->context.user_cs_limit != next->context.user_cs_limit))
9437+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
9438 #ifdef CONFIG_SMP
9439+ else if (unlikely(tlbstate != TLBSTATE_OK))
9440+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
9441+#endif
9442+#endif
9443+
9444+ }
9445 else {
9446+
9447+#ifdef CONFIG_PAX_PER_CPU_PGD
9448+ pax_open_kernel();
9449+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
9450+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
9451+ pax_close_kernel();
9452+ load_cr3(get_cpu_pgd(cpu));
9453+#endif
9454+
9455+#ifdef CONFIG_SMP
9456 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
9457 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
9458
9459@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_s
9460 * tlb flush IPI delivery. We must reload CR3
9461 * to make sure to use no freed page tables.
9462 */
9463+
9464+#ifndef CONFIG_PAX_PER_CPU_PGD
9465 load_cr3(next->pgd);
9466+#endif
9467+
9468 load_LDT_nolock(&next->context);
9469+
9470+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
9471+ if (!nx_enabled)
9472+ cpu_set(cpu, next->context.cpu_user_cs_mask);
9473+#endif
9474+
9475+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
9476+#ifdef CONFIG_PAX_PAGEEXEC
9477+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && nx_enabled))
9478+#endif
9479+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
9480+#endif
9481+
9482 }
9483- }
9484 #endif
9485+ }
9486 }
9487
9488 #define activate_mm(prev, next) \
9489diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu.h linux-2.6.32.46/arch/x86/include/asm/mmu.h
9490--- linux-2.6.32.46/arch/x86/include/asm/mmu.h 2011-03-27 14:31:47.000000000 -0400
9491+++ linux-2.6.32.46/arch/x86/include/asm/mmu.h 2011-04-17 15:56:46.000000000 -0400
9492@@ -9,10 +9,23 @@
9493 * we put the segment information here.
9494 */
9495 typedef struct {
9496- void *ldt;
9497+ struct desc_struct *ldt;
9498 int size;
9499 struct mutex lock;
9500- void *vdso;
9501+ unsigned long vdso;
9502+
9503+#ifdef CONFIG_X86_32
9504+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
9505+ unsigned long user_cs_base;
9506+ unsigned long user_cs_limit;
9507+
9508+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
9509+ cpumask_t cpu_user_cs_mask;
9510+#endif
9511+
9512+#endif
9513+#endif
9514+
9515 } mm_context_t;
9516
9517 #ifdef CONFIG_SMP
9518diff -urNp linux-2.6.32.46/arch/x86/include/asm/module.h linux-2.6.32.46/arch/x86/include/asm/module.h
9519--- linux-2.6.32.46/arch/x86/include/asm/module.h 2011-03-27 14:31:47.000000000 -0400
9520+++ linux-2.6.32.46/arch/x86/include/asm/module.h 2011-10-08 08:16:59.000000000 -0400
9521@@ -5,6 +5,7 @@
9522
9523 #ifdef CONFIG_X86_64
9524 /* X86_64 does not define MODULE_PROC_FAMILY */
9525+#define MODULE_PROC_FAMILY ""
9526 #elif defined CONFIG_M386
9527 #define MODULE_PROC_FAMILY "386 "
9528 #elif defined CONFIG_M486
9529@@ -59,13 +60,24 @@
9530 #error unknown processor family
9531 #endif
9532
9533-#ifdef CONFIG_X86_32
9534-# ifdef CONFIG_4KSTACKS
9535-# define MODULE_STACKSIZE "4KSTACKS "
9536-# else
9537-# define MODULE_STACKSIZE ""
9538-# endif
9539-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
9540+#if defined(CONFIG_X86_32) && defined(CONFIG_4KSTACKS)
9541+#define MODULE_STACKSIZE "4KSTACKS "
9542+#else
9543+#define MODULE_STACKSIZE ""
9544+#endif
9545+
9546+#ifdef CONFIG_PAX_KERNEXEC
9547+#define MODULE_PAX_KERNEXEC "KERNEXEC "
9548+#else
9549+#define MODULE_PAX_KERNEXEC ""
9550 #endif
9551
9552+#ifdef CONFIG_PAX_MEMORY_UDEREF
9553+#define MODULE_PAX_UDEREF "UDEREF "
9554+#else
9555+#define MODULE_PAX_UDEREF ""
9556+#endif
9557+
9558+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
9559+
9560 #endif /* _ASM_X86_MODULE_H */
9561diff -urNp linux-2.6.32.46/arch/x86/include/asm/page_64_types.h linux-2.6.32.46/arch/x86/include/asm/page_64_types.h
9562--- linux-2.6.32.46/arch/x86/include/asm/page_64_types.h 2011-03-27 14:31:47.000000000 -0400
9563+++ linux-2.6.32.46/arch/x86/include/asm/page_64_types.h 2011-04-17 15:56:46.000000000 -0400
9564@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
9565
9566 /* duplicated to the one in bootmem.h */
9567 extern unsigned long max_pfn;
9568-extern unsigned long phys_base;
9569+extern const unsigned long phys_base;
9570
9571 extern unsigned long __phys_addr(unsigned long);
9572 #define __phys_reloc_hide(x) (x)
9573diff -urNp linux-2.6.32.46/arch/x86/include/asm/paravirt.h linux-2.6.32.46/arch/x86/include/asm/paravirt.h
9574--- linux-2.6.32.46/arch/x86/include/asm/paravirt.h 2011-03-27 14:31:47.000000000 -0400
9575+++ linux-2.6.32.46/arch/x86/include/asm/paravirt.h 2011-08-23 21:36:48.000000000 -0400
9576@@ -648,6 +648,18 @@ static inline void set_pgd(pgd_t *pgdp,
9577 val);
9578 }
9579
9580+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
9581+{
9582+ pgdval_t val = native_pgd_val(pgd);
9583+
9584+ if (sizeof(pgdval_t) > sizeof(long))
9585+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
9586+ val, (u64)val >> 32);
9587+ else
9588+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
9589+ val);
9590+}
9591+
9592 static inline void pgd_clear(pgd_t *pgdp)
9593 {
9594 set_pgd(pgdp, __pgd(0));
9595@@ -729,6 +741,21 @@ static inline void __set_fixmap(unsigned
9596 pv_mmu_ops.set_fixmap(idx, phys, flags);
9597 }
9598
9599+#ifdef CONFIG_PAX_KERNEXEC
9600+static inline unsigned long pax_open_kernel(void)
9601+{
9602+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
9603+}
9604+
9605+static inline unsigned long pax_close_kernel(void)
9606+{
9607+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
9608+}
9609+#else
9610+static inline unsigned long pax_open_kernel(void) { return 0; }
9611+static inline unsigned long pax_close_kernel(void) { return 0; }
9612+#endif
9613+
9614 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
9615
9616 static inline int __raw_spin_is_locked(struct raw_spinlock *lock)
9617@@ -945,7 +972,7 @@ extern void default_banner(void);
9618
9619 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
9620 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
9621-#define PARA_INDIRECT(addr) *%cs:addr
9622+#define PARA_INDIRECT(addr) *%ss:addr
9623 #endif
9624
9625 #define INTERRUPT_RETURN \
9626@@ -1022,6 +1049,21 @@ extern void default_banner(void);
9627 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
9628 CLBR_NONE, \
9629 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
9630+
9631+#define GET_CR0_INTO_RDI \
9632+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
9633+ mov %rax,%rdi
9634+
9635+#define SET_RDI_INTO_CR0 \
9636+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
9637+
9638+#define GET_CR3_INTO_RDI \
9639+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
9640+ mov %rax,%rdi
9641+
9642+#define SET_RDI_INTO_CR3 \
9643+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
9644+
9645 #endif /* CONFIG_X86_32 */
9646
9647 #endif /* __ASSEMBLY__ */
9648diff -urNp linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h
9649--- linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h 2011-03-27 14:31:47.000000000 -0400
9650+++ linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h 2011-08-23 20:24:19.000000000 -0400
9651@@ -78,19 +78,19 @@ struct pv_init_ops {
9652 */
9653 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
9654 unsigned long addr, unsigned len);
9655-};
9656+} __no_const;
9657
9658
9659 struct pv_lazy_ops {
9660 /* Set deferred update mode, used for batching operations. */
9661 void (*enter)(void);
9662 void (*leave)(void);
9663-};
9664+} __no_const;
9665
9666 struct pv_time_ops {
9667 unsigned long long (*sched_clock)(void);
9668 unsigned long (*get_tsc_khz)(void);
9669-};
9670+} __no_const;
9671
9672 struct pv_cpu_ops {
9673 /* hooks for various privileged instructions */
9674@@ -186,7 +186,7 @@ struct pv_cpu_ops {
9675
9676 void (*start_context_switch)(struct task_struct *prev);
9677 void (*end_context_switch)(struct task_struct *next);
9678-};
9679+} __no_const;
9680
9681 struct pv_irq_ops {
9682 /*
9683@@ -217,7 +217,7 @@ struct pv_apic_ops {
9684 unsigned long start_eip,
9685 unsigned long start_esp);
9686 #endif
9687-};
9688+} __no_const;
9689
9690 struct pv_mmu_ops {
9691 unsigned long (*read_cr2)(void);
9692@@ -301,6 +301,7 @@ struct pv_mmu_ops {
9693 struct paravirt_callee_save make_pud;
9694
9695 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
9696+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
9697 #endif /* PAGETABLE_LEVELS == 4 */
9698 #endif /* PAGETABLE_LEVELS >= 3 */
9699
9700@@ -316,6 +317,12 @@ struct pv_mmu_ops {
9701 an mfn. We can tell which is which from the index. */
9702 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
9703 phys_addr_t phys, pgprot_t flags);
9704+
9705+#ifdef CONFIG_PAX_KERNEXEC
9706+ unsigned long (*pax_open_kernel)(void);
9707+ unsigned long (*pax_close_kernel)(void);
9708+#endif
9709+
9710 };
9711
9712 struct raw_spinlock;
9713@@ -326,7 +333,7 @@ struct pv_lock_ops {
9714 void (*spin_lock_flags)(struct raw_spinlock *lock, unsigned long flags);
9715 int (*spin_trylock)(struct raw_spinlock *lock);
9716 void (*spin_unlock)(struct raw_spinlock *lock);
9717-};
9718+} __no_const;
9719
9720 /* This contains all the paravirt structures: we get a convenient
9721 * number for each function using the offset which we use to indicate
9722diff -urNp linux-2.6.32.46/arch/x86/include/asm/pci_x86.h linux-2.6.32.46/arch/x86/include/asm/pci_x86.h
9723--- linux-2.6.32.46/arch/x86/include/asm/pci_x86.h 2011-03-27 14:31:47.000000000 -0400
9724+++ linux-2.6.32.46/arch/x86/include/asm/pci_x86.h 2011-04-17 15:56:46.000000000 -0400
9725@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
9726 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
9727
9728 struct pci_raw_ops {
9729- int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn,
9730+ int (* const read)(unsigned int domain, unsigned int bus, unsigned int devfn,
9731 int reg, int len, u32 *val);
9732- int (*write)(unsigned int domain, unsigned int bus, unsigned int devfn,
9733+ int (* const write)(unsigned int domain, unsigned int bus, unsigned int devfn,
9734 int reg, int len, u32 val);
9735 };
9736
9737-extern struct pci_raw_ops *raw_pci_ops;
9738-extern struct pci_raw_ops *raw_pci_ext_ops;
9739+extern const struct pci_raw_ops *raw_pci_ops;
9740+extern const struct pci_raw_ops *raw_pci_ext_ops;
9741
9742-extern struct pci_raw_ops pci_direct_conf1;
9743+extern const struct pci_raw_ops pci_direct_conf1;
9744 extern bool port_cf9_safe;
9745
9746 /* arch_initcall level */
9747diff -urNp linux-2.6.32.46/arch/x86/include/asm/percpu.h linux-2.6.32.46/arch/x86/include/asm/percpu.h
9748--- linux-2.6.32.46/arch/x86/include/asm/percpu.h 2011-03-27 14:31:47.000000000 -0400
9749+++ linux-2.6.32.46/arch/x86/include/asm/percpu.h 2011-08-17 19:33:59.000000000 -0400
9750@@ -78,6 +78,7 @@ do { \
9751 if (0) { \
9752 T__ tmp__; \
9753 tmp__ = (val); \
9754+ (void)tmp__; \
9755 } \
9756 switch (sizeof(var)) { \
9757 case 1: \
9758diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgalloc.h linux-2.6.32.46/arch/x86/include/asm/pgalloc.h
9759--- linux-2.6.32.46/arch/x86/include/asm/pgalloc.h 2011-03-27 14:31:47.000000000 -0400
9760+++ linux-2.6.32.46/arch/x86/include/asm/pgalloc.h 2011-04-17 15:56:46.000000000 -0400
9761@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
9762 pmd_t *pmd, pte_t *pte)
9763 {
9764 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
9765+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
9766+}
9767+
9768+static inline void pmd_populate_user(struct mm_struct *mm,
9769+ pmd_t *pmd, pte_t *pte)
9770+{
9771+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
9772 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
9773 }
9774
9775diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h
9776--- linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h 2011-03-27 14:31:47.000000000 -0400
9777+++ linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:56:46.000000000 -0400
9778@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
9779
9780 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
9781 {
9782+ pax_open_kernel();
9783 *pmdp = pmd;
9784+ pax_close_kernel();
9785 }
9786
9787 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
9788diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h
9789--- linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h 2011-03-27 14:31:47.000000000 -0400
9790+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:56:46.000000000 -0400
9791@@ -26,9 +26,6 @@
9792 struct mm_struct;
9793 struct vm_area_struct;
9794
9795-extern pgd_t swapper_pg_dir[1024];
9796-extern pgd_t trampoline_pg_dir[1024];
9797-
9798 static inline void pgtable_cache_init(void) { }
9799 static inline void check_pgt_cache(void) { }
9800 void paging_init(void);
9801@@ -49,6 +46,12 @@ extern void set_pmd_pfn(unsigned long, u
9802 # include <asm/pgtable-2level.h>
9803 #endif
9804
9805+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
9806+extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
9807+#ifdef CONFIG_X86_PAE
9808+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
9809+#endif
9810+
9811 #if defined(CONFIG_HIGHPTE)
9812 #define __KM_PTE \
9813 (in_nmi() ? KM_NMI_PTE : \
9814@@ -73,7 +76,9 @@ extern void set_pmd_pfn(unsigned long, u
9815 /* Clear a kernel PTE and flush it from the TLB */
9816 #define kpte_clear_flush(ptep, vaddr) \
9817 do { \
9818+ pax_open_kernel(); \
9819 pte_clear(&init_mm, (vaddr), (ptep)); \
9820+ pax_close_kernel(); \
9821 __flush_tlb_one((vaddr)); \
9822 } while (0)
9823
9824@@ -85,6 +90,9 @@ do { \
9825
9826 #endif /* !__ASSEMBLY__ */
9827
9828+#define HAVE_ARCH_UNMAPPED_AREA
9829+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
9830+
9831 /*
9832 * kern_addr_valid() is (1) for FLATMEM and (0) for
9833 * SPARSEMEM and DISCONTIGMEM
9834diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h
9835--- linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h 2011-03-27 14:31:47.000000000 -0400
9836+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 15:56:46.000000000 -0400
9837@@ -8,7 +8,7 @@
9838 */
9839 #ifdef CONFIG_X86_PAE
9840 # include <asm/pgtable-3level_types.h>
9841-# define PMD_SIZE (1UL << PMD_SHIFT)
9842+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
9843 # define PMD_MASK (~(PMD_SIZE - 1))
9844 #else
9845 # include <asm/pgtable-2level_types.h>
9846@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set
9847 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
9848 #endif
9849
9850+#ifdef CONFIG_PAX_KERNEXEC
9851+#ifndef __ASSEMBLY__
9852+extern unsigned char MODULES_EXEC_VADDR[];
9853+extern unsigned char MODULES_EXEC_END[];
9854+#endif
9855+#include <asm/boot.h>
9856+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
9857+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
9858+#else
9859+#define ktla_ktva(addr) (addr)
9860+#define ktva_ktla(addr) (addr)
9861+#endif
9862+
9863 #define MODULES_VADDR VMALLOC_START
9864 #define MODULES_END VMALLOC_END
9865 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
9866diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h
9867--- linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h 2011-03-27 14:31:47.000000000 -0400
9868+++ linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:56:46.000000000 -0400
9869@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
9870
9871 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
9872 {
9873+ pax_open_kernel();
9874 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
9875+ pax_close_kernel();
9876 }
9877
9878 static inline void native_set_pud(pud_t *pudp, pud_t pud)
9879 {
9880+ pax_open_kernel();
9881 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
9882+ pax_close_kernel();
9883 }
9884
9885 /*
9886diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h
9887--- linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h 2011-03-27 14:31:47.000000000 -0400
9888+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h 2011-08-23 20:24:19.000000000 -0400
9889@@ -16,10 +16,13 @@
9890
9891 extern pud_t level3_kernel_pgt[512];
9892 extern pud_t level3_ident_pgt[512];
9893+extern pud_t level3_vmalloc_pgt[512];
9894+extern pud_t level3_vmemmap_pgt[512];
9895+extern pud_t level2_vmemmap_pgt[512];
9896 extern pmd_t level2_kernel_pgt[512];
9897 extern pmd_t level2_fixmap_pgt[512];
9898-extern pmd_t level2_ident_pgt[512];
9899-extern pgd_t init_level4_pgt[];
9900+extern pmd_t level2_ident_pgt[512*2];
9901+extern pgd_t init_level4_pgt[512];
9902
9903 #define swapper_pg_dir init_level4_pgt
9904
9905@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
9906
9907 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
9908 {
9909+ pax_open_kernel();
9910 *pmdp = pmd;
9911+ pax_close_kernel();
9912 }
9913
9914 static inline void native_pmd_clear(pmd_t *pmd)
9915@@ -94,6 +99,13 @@ static inline void native_pud_clear(pud_
9916
9917 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
9918 {
9919+ pax_open_kernel();
9920+ *pgdp = pgd;
9921+ pax_close_kernel();
9922+}
9923+
9924+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
9925+{
9926 *pgdp = pgd;
9927 }
9928
9929diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h
9930--- linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h 2011-03-27 14:31:47.000000000 -0400
9931+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 15:56:46.000000000 -0400
9932@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
9933 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
9934 #define MODULES_END _AC(0xffffffffff000000, UL)
9935 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
9936+#define MODULES_EXEC_VADDR MODULES_VADDR
9937+#define MODULES_EXEC_END MODULES_END
9938+
9939+#define ktla_ktva(addr) (addr)
9940+#define ktva_ktla(addr) (addr)
9941
9942 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
9943diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable.h linux-2.6.32.46/arch/x86/include/asm/pgtable.h
9944--- linux-2.6.32.46/arch/x86/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400
9945+++ linux-2.6.32.46/arch/x86/include/asm/pgtable.h 2011-08-23 20:24:19.000000000 -0400
9946@@ -39,6 +39,7 @@ extern struct list_head pgd_list;
9947
9948 #ifndef __PAGETABLE_PUD_FOLDED
9949 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
9950+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
9951 #define pgd_clear(pgd) native_pgd_clear(pgd)
9952 #endif
9953
9954@@ -74,12 +75,51 @@ extern struct list_head pgd_list;
9955
9956 #define arch_end_context_switch(prev) do {} while(0)
9957
9958+#define pax_open_kernel() native_pax_open_kernel()
9959+#define pax_close_kernel() native_pax_close_kernel()
9960 #endif /* CONFIG_PARAVIRT */
9961
9962+#define __HAVE_ARCH_PAX_OPEN_KERNEL
9963+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
9964+
9965+#ifdef CONFIG_PAX_KERNEXEC
9966+static inline unsigned long native_pax_open_kernel(void)
9967+{
9968+ unsigned long cr0;
9969+
9970+ preempt_disable();
9971+ barrier();
9972+ cr0 = read_cr0() ^ X86_CR0_WP;
9973+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
9974+ write_cr0(cr0);
9975+ return cr0 ^ X86_CR0_WP;
9976+}
9977+
9978+static inline unsigned long native_pax_close_kernel(void)
9979+{
9980+ unsigned long cr0;
9981+
9982+ cr0 = read_cr0() ^ X86_CR0_WP;
9983+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
9984+ write_cr0(cr0);
9985+ barrier();
9986+ preempt_enable_no_resched();
9987+ return cr0 ^ X86_CR0_WP;
9988+}
9989+#else
9990+static inline unsigned long native_pax_open_kernel(void) { return 0; }
9991+static inline unsigned long native_pax_close_kernel(void) { return 0; }
9992+#endif
9993+
9994 /*
9995 * The following only work if pte_present() is true.
9996 * Undefined behaviour if not..
9997 */
9998+static inline int pte_user(pte_t pte)
9999+{
10000+ return pte_val(pte) & _PAGE_USER;
10001+}
10002+
10003 static inline int pte_dirty(pte_t pte)
10004 {
10005 return pte_flags(pte) & _PAGE_DIRTY;
10006@@ -167,9 +207,29 @@ static inline pte_t pte_wrprotect(pte_t
10007 return pte_clear_flags(pte, _PAGE_RW);
10008 }
10009
10010+static inline pte_t pte_mkread(pte_t pte)
10011+{
10012+ return __pte(pte_val(pte) | _PAGE_USER);
10013+}
10014+
10015 static inline pte_t pte_mkexec(pte_t pte)
10016 {
10017- return pte_clear_flags(pte, _PAGE_NX);
10018+#ifdef CONFIG_X86_PAE
10019+ if (__supported_pte_mask & _PAGE_NX)
10020+ return pte_clear_flags(pte, _PAGE_NX);
10021+ else
10022+#endif
10023+ return pte_set_flags(pte, _PAGE_USER);
10024+}
10025+
10026+static inline pte_t pte_exprotect(pte_t pte)
10027+{
10028+#ifdef CONFIG_X86_PAE
10029+ if (__supported_pte_mask & _PAGE_NX)
10030+ return pte_set_flags(pte, _PAGE_NX);
10031+ else
10032+#endif
10033+ return pte_clear_flags(pte, _PAGE_USER);
10034 }
10035
10036 static inline pte_t pte_mkdirty(pte_t pte)
10037@@ -302,6 +362,15 @@ pte_t *populate_extra_pte(unsigned long
10038 #endif
10039
10040 #ifndef __ASSEMBLY__
10041+
10042+#ifdef CONFIG_PAX_PER_CPU_PGD
10043+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
10044+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
10045+{
10046+ return cpu_pgd[cpu];
10047+}
10048+#endif
10049+
10050 #include <linux/mm_types.h>
10051
10052 static inline int pte_none(pte_t pte)
10053@@ -472,7 +541,7 @@ static inline pud_t *pud_offset(pgd_t *p
10054
10055 static inline int pgd_bad(pgd_t pgd)
10056 {
10057- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
10058+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
10059 }
10060
10061 static inline int pgd_none(pgd_t pgd)
10062@@ -495,7 +564,12 @@ static inline int pgd_none(pgd_t pgd)
10063 * pgd_offset() returns a (pgd_t *)
10064 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
10065 */
10066-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
10067+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
10068+
10069+#ifdef CONFIG_PAX_PER_CPU_PGD
10070+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
10071+#endif
10072+
10073 /*
10074 * a shortcut which implies the use of the kernel's pgd, instead
10075 * of a process's
10076@@ -506,6 +580,20 @@ static inline int pgd_none(pgd_t pgd)
10077 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
10078 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
10079
10080+#ifdef CONFIG_X86_32
10081+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
10082+#else
10083+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
10084+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
10085+
10086+#ifdef CONFIG_PAX_MEMORY_UDEREF
10087+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
10088+#else
10089+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
10090+#endif
10091+
10092+#endif
10093+
10094 #ifndef __ASSEMBLY__
10095
10096 extern int direct_gbpages;
10097@@ -611,11 +699,23 @@ static inline void ptep_set_wrprotect(st
10098 * dst and src can be on the same page, but the range must not overlap,
10099 * and must not cross a page boundary.
10100 */
10101-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
10102+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
10103 {
10104- memcpy(dst, src, count * sizeof(pgd_t));
10105+ pax_open_kernel();
10106+ while (count--)
10107+ *dst++ = *src++;
10108+ pax_close_kernel();
10109 }
10110
10111+#ifdef CONFIG_PAX_PER_CPU_PGD
10112+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
10113+#endif
10114+
10115+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10116+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
10117+#else
10118+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
10119+#endif
10120
10121 #include <asm-generic/pgtable.h>
10122 #endif /* __ASSEMBLY__ */
10123diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h
10124--- linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h 2011-03-27 14:31:47.000000000 -0400
10125+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:56:46.000000000 -0400
10126@@ -16,12 +16,11 @@
10127 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
10128 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
10129 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
10130-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
10131+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
10132 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
10133 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
10134 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
10135-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
10136-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
10137+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
10138 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
10139
10140 /* If _PAGE_BIT_PRESENT is clear, we use these: */
10141@@ -39,7 +38,6 @@
10142 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
10143 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
10144 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
10145-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
10146 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
10147 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
10148 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
10149@@ -55,8 +53,10 @@
10150
10151 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
10152 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
10153-#else
10154+#elif defined(CONFIG_KMEMCHECK)
10155 #define _PAGE_NX (_AT(pteval_t, 0))
10156+#else
10157+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
10158 #endif
10159
10160 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
10161@@ -93,6 +93,9 @@
10162 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
10163 _PAGE_ACCESSED)
10164
10165+#define PAGE_READONLY_NOEXEC PAGE_READONLY
10166+#define PAGE_SHARED_NOEXEC PAGE_SHARED
10167+
10168 #define __PAGE_KERNEL_EXEC \
10169 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
10170 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
10171@@ -103,8 +106,8 @@
10172 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
10173 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
10174 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
10175-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
10176-#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT)
10177+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
10178+#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_RO | _PAGE_PCD | _PAGE_PWT | _PAGE_USER)
10179 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
10180 #define __PAGE_KERNEL_LARGE_NOCACHE (__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE)
10181 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
10182@@ -163,8 +166,8 @@
10183 * bits are combined, this will alow user to access the high address mapped
10184 * VDSO in the presence of CONFIG_COMPAT_VDSO
10185 */
10186-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
10187-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
10188+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
10189+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
10190 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
10191 #endif
10192
10193@@ -202,7 +205,17 @@ static inline pgdval_t pgd_flags(pgd_t p
10194 {
10195 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
10196 }
10197+#endif
10198
10199+#if PAGETABLE_LEVELS == 3
10200+#include <asm-generic/pgtable-nopud.h>
10201+#endif
10202+
10203+#if PAGETABLE_LEVELS == 2
10204+#include <asm-generic/pgtable-nopmd.h>
10205+#endif
10206+
10207+#ifndef __ASSEMBLY__
10208 #if PAGETABLE_LEVELS > 3
10209 typedef struct { pudval_t pud; } pud_t;
10210
10211@@ -216,8 +229,6 @@ static inline pudval_t native_pud_val(pu
10212 return pud.pud;
10213 }
10214 #else
10215-#include <asm-generic/pgtable-nopud.h>
10216-
10217 static inline pudval_t native_pud_val(pud_t pud)
10218 {
10219 return native_pgd_val(pud.pgd);
10220@@ -237,8 +248,6 @@ static inline pmdval_t native_pmd_val(pm
10221 return pmd.pmd;
10222 }
10223 #else
10224-#include <asm-generic/pgtable-nopmd.h>
10225-
10226 static inline pmdval_t native_pmd_val(pmd_t pmd)
10227 {
10228 return native_pgd_val(pmd.pud.pgd);
10229@@ -278,7 +287,16 @@ typedef struct page *pgtable_t;
10230
10231 extern pteval_t __supported_pte_mask;
10232 extern void set_nx(void);
10233+
10234+#ifdef CONFIG_X86_32
10235+#ifdef CONFIG_X86_PAE
10236 extern int nx_enabled;
10237+#else
10238+#define nx_enabled (0)
10239+#endif
10240+#else
10241+#define nx_enabled (1)
10242+#endif
10243
10244 #define pgprot_writecombine pgprot_writecombine
10245 extern pgprot_t pgprot_writecombine(pgprot_t prot);
10246diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch/x86/include/asm/processor.h
10247--- linux-2.6.32.46/arch/x86/include/asm/processor.h 2011-04-22 19:16:29.000000000 -0400
10248+++ linux-2.6.32.46/arch/x86/include/asm/processor.h 2011-05-11 18:25:15.000000000 -0400
10249@@ -272,7 +272,7 @@ struct tss_struct {
10250
10251 } ____cacheline_aligned;
10252
10253-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
10254+extern struct tss_struct init_tss[NR_CPUS];
10255
10256 /*
10257 * Save the original ist values for checking stack pointers during debugging
10258@@ -888,11 +888,18 @@ static inline void spin_lock_prefetch(co
10259 */
10260 #define TASK_SIZE PAGE_OFFSET
10261 #define TASK_SIZE_MAX TASK_SIZE
10262+
10263+#ifdef CONFIG_PAX_SEGMEXEC
10264+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
10265+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
10266+#else
10267 #define STACK_TOP TASK_SIZE
10268-#define STACK_TOP_MAX STACK_TOP
10269+#endif
10270+
10271+#define STACK_TOP_MAX TASK_SIZE
10272
10273 #define INIT_THREAD { \
10274- .sp0 = sizeof(init_stack) + (long)&init_stack, \
10275+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
10276 .vm86_info = NULL, \
10277 .sysenter_cs = __KERNEL_CS, \
10278 .io_bitmap_ptr = NULL, \
10279@@ -906,7 +913,7 @@ static inline void spin_lock_prefetch(co
10280 */
10281 #define INIT_TSS { \
10282 .x86_tss = { \
10283- .sp0 = sizeof(init_stack) + (long)&init_stack, \
10284+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
10285 .ss0 = __KERNEL_DS, \
10286 .ss1 = __KERNEL_CS, \
10287 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
10288@@ -917,11 +924,7 @@ static inline void spin_lock_prefetch(co
10289 extern unsigned long thread_saved_pc(struct task_struct *tsk);
10290
10291 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
10292-#define KSTK_TOP(info) \
10293-({ \
10294- unsigned long *__ptr = (unsigned long *)(info); \
10295- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
10296-})
10297+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
10298
10299 /*
10300 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
10301@@ -936,7 +939,7 @@ extern unsigned long thread_saved_pc(str
10302 #define task_pt_regs(task) \
10303 ({ \
10304 struct pt_regs *__regs__; \
10305- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
10306+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
10307 __regs__ - 1; \
10308 })
10309
10310@@ -946,13 +949,13 @@ extern unsigned long thread_saved_pc(str
10311 /*
10312 * User space process size. 47bits minus one guard page.
10313 */
10314-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
10315+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
10316
10317 /* This decides where the kernel will search for a free chunk of vm
10318 * space during mmap's.
10319 */
10320 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
10321- 0xc0000000 : 0xFFFFe000)
10322+ 0xc0000000 : 0xFFFFf000)
10323
10324 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
10325 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
10326@@ -963,11 +966,11 @@ extern unsigned long thread_saved_pc(str
10327 #define STACK_TOP_MAX TASK_SIZE_MAX
10328
10329 #define INIT_THREAD { \
10330- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
10331+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
10332 }
10333
10334 #define INIT_TSS { \
10335- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
10336+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
10337 }
10338
10339 /*
10340@@ -989,6 +992,10 @@ extern void start_thread(struct pt_regs
10341 */
10342 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
10343
10344+#ifdef CONFIG_PAX_SEGMEXEC
10345+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
10346+#endif
10347+
10348 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
10349
10350 /* Get/set a process' ability to use the timestamp counter instruction */
10351diff -urNp linux-2.6.32.46/arch/x86/include/asm/ptrace.h linux-2.6.32.46/arch/x86/include/asm/ptrace.h
10352--- linux-2.6.32.46/arch/x86/include/asm/ptrace.h 2011-03-27 14:31:47.000000000 -0400
10353+++ linux-2.6.32.46/arch/x86/include/asm/ptrace.h 2011-04-17 15:56:46.000000000 -0400
10354@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
10355 }
10356
10357 /*
10358- * user_mode_vm(regs) determines whether a register set came from user mode.
10359+ * user_mode(regs) determines whether a register set came from user mode.
10360 * This is true if V8086 mode was enabled OR if the register set was from
10361 * protected mode with RPL-3 CS value. This tricky test checks that with
10362 * one comparison. Many places in the kernel can bypass this full check
10363- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
10364+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
10365+ * be used.
10366 */
10367-static inline int user_mode(struct pt_regs *regs)
10368+static inline int user_mode_novm(struct pt_regs *regs)
10369 {
10370 #ifdef CONFIG_X86_32
10371 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
10372 #else
10373- return !!(regs->cs & 3);
10374+ return !!(regs->cs & SEGMENT_RPL_MASK);
10375 #endif
10376 }
10377
10378-static inline int user_mode_vm(struct pt_regs *regs)
10379+static inline int user_mode(struct pt_regs *regs)
10380 {
10381 #ifdef CONFIG_X86_32
10382 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
10383 USER_RPL;
10384 #else
10385- return user_mode(regs);
10386+ return user_mode_novm(regs);
10387 #endif
10388 }
10389
10390diff -urNp linux-2.6.32.46/arch/x86/include/asm/reboot.h linux-2.6.32.46/arch/x86/include/asm/reboot.h
10391--- linux-2.6.32.46/arch/x86/include/asm/reboot.h 2011-03-27 14:31:47.000000000 -0400
10392+++ linux-2.6.32.46/arch/x86/include/asm/reboot.h 2011-08-05 20:33:55.000000000 -0400
10393@@ -6,19 +6,19 @@
10394 struct pt_regs;
10395
10396 struct machine_ops {
10397- void (*restart)(char *cmd);
10398- void (*halt)(void);
10399- void (*power_off)(void);
10400+ void (* __noreturn restart)(char *cmd);
10401+ void (* __noreturn halt)(void);
10402+ void (* __noreturn power_off)(void);
10403 void (*shutdown)(void);
10404 void (*crash_shutdown)(struct pt_regs *);
10405- void (*emergency_restart)(void);
10406-};
10407+ void (* __noreturn emergency_restart)(void);
10408+} __no_const;
10409
10410 extern struct machine_ops machine_ops;
10411
10412 void native_machine_crash_shutdown(struct pt_regs *regs);
10413 void native_machine_shutdown(void);
10414-void machine_real_restart(const unsigned char *code, int length);
10415+void machine_real_restart(const unsigned char *code, unsigned int length) __noreturn;
10416
10417 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
10418 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
10419diff -urNp linux-2.6.32.46/arch/x86/include/asm/rwsem.h linux-2.6.32.46/arch/x86/include/asm/rwsem.h
10420--- linux-2.6.32.46/arch/x86/include/asm/rwsem.h 2011-03-27 14:31:47.000000000 -0400
10421+++ linux-2.6.32.46/arch/x86/include/asm/rwsem.h 2011-04-17 15:56:46.000000000 -0400
10422@@ -118,6 +118,14 @@ static inline void __down_read(struct rw
10423 {
10424 asm volatile("# beginning down_read\n\t"
10425 LOCK_PREFIX _ASM_INC "(%1)\n\t"
10426+
10427+#ifdef CONFIG_PAX_REFCOUNT
10428+ "jno 0f\n"
10429+ LOCK_PREFIX _ASM_DEC "(%1)\n\t"
10430+ "int $4\n0:\n"
10431+ _ASM_EXTABLE(0b, 0b)
10432+#endif
10433+
10434 /* adds 0x00000001, returns the old value */
10435 " jns 1f\n"
10436 " call call_rwsem_down_read_failed\n"
10437@@ -139,6 +147,14 @@ static inline int __down_read_trylock(st
10438 "1:\n\t"
10439 " mov %1,%2\n\t"
10440 " add %3,%2\n\t"
10441+
10442+#ifdef CONFIG_PAX_REFCOUNT
10443+ "jno 0f\n"
10444+ "sub %3,%2\n"
10445+ "int $4\n0:\n"
10446+ _ASM_EXTABLE(0b, 0b)
10447+#endif
10448+
10449 " jle 2f\n\t"
10450 LOCK_PREFIX " cmpxchg %2,%0\n\t"
10451 " jnz 1b\n\t"
10452@@ -160,6 +176,14 @@ static inline void __down_write_nested(s
10453 tmp = RWSEM_ACTIVE_WRITE_BIAS;
10454 asm volatile("# beginning down_write\n\t"
10455 LOCK_PREFIX " xadd %1,(%2)\n\t"
10456+
10457+#ifdef CONFIG_PAX_REFCOUNT
10458+ "jno 0f\n"
10459+ "mov %1,(%2)\n"
10460+ "int $4\n0:\n"
10461+ _ASM_EXTABLE(0b, 0b)
10462+#endif
10463+
10464 /* subtract 0x0000ffff, returns the old value */
10465 " test %1,%1\n\t"
10466 /* was the count 0 before? */
10467@@ -198,6 +222,14 @@ static inline void __up_read(struct rw_s
10468 rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
10469 asm volatile("# beginning __up_read\n\t"
10470 LOCK_PREFIX " xadd %1,(%2)\n\t"
10471+
10472+#ifdef CONFIG_PAX_REFCOUNT
10473+ "jno 0f\n"
10474+ "mov %1,(%2)\n"
10475+ "int $4\n0:\n"
10476+ _ASM_EXTABLE(0b, 0b)
10477+#endif
10478+
10479 /* subtracts 1, returns the old value */
10480 " jns 1f\n\t"
10481 " call call_rwsem_wake\n"
10482@@ -216,6 +248,14 @@ static inline void __up_write(struct rw_
10483 rwsem_count_t tmp;
10484 asm volatile("# beginning __up_write\n\t"
10485 LOCK_PREFIX " xadd %1,(%2)\n\t"
10486+
10487+#ifdef CONFIG_PAX_REFCOUNT
10488+ "jno 0f\n"
10489+ "mov %1,(%2)\n"
10490+ "int $4\n0:\n"
10491+ _ASM_EXTABLE(0b, 0b)
10492+#endif
10493+
10494 /* tries to transition
10495 0xffff0001 -> 0x00000000 */
10496 " jz 1f\n"
10497@@ -234,6 +274,14 @@ static inline void __downgrade_write(str
10498 {
10499 asm volatile("# beginning __downgrade_write\n\t"
10500 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
10501+
10502+#ifdef CONFIG_PAX_REFCOUNT
10503+ "jno 0f\n"
10504+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
10505+ "int $4\n0:\n"
10506+ _ASM_EXTABLE(0b, 0b)
10507+#endif
10508+
10509 /*
10510 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
10511 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
10512@@ -253,7 +301,15 @@ static inline void __downgrade_write(str
10513 static inline void rwsem_atomic_add(rwsem_count_t delta,
10514 struct rw_semaphore *sem)
10515 {
10516- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
10517+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
10518+
10519+#ifdef CONFIG_PAX_REFCOUNT
10520+ "jno 0f\n"
10521+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
10522+ "int $4\n0:\n"
10523+ _ASM_EXTABLE(0b, 0b)
10524+#endif
10525+
10526 : "+m" (sem->count)
10527 : "er" (delta));
10528 }
10529@@ -266,7 +322,15 @@ static inline rwsem_count_t rwsem_atomic
10530 {
10531 rwsem_count_t tmp = delta;
10532
10533- asm volatile(LOCK_PREFIX "xadd %0,%1"
10534+ asm volatile(LOCK_PREFIX "xadd %0,%1\n"
10535+
10536+#ifdef CONFIG_PAX_REFCOUNT
10537+ "jno 0f\n"
10538+ "mov %0,%1\n"
10539+ "int $4\n0:\n"
10540+ _ASM_EXTABLE(0b, 0b)
10541+#endif
10542+
10543 : "+r" (tmp), "+m" (sem->count)
10544 : : "memory");
10545
10546diff -urNp linux-2.6.32.46/arch/x86/include/asm/segment.h linux-2.6.32.46/arch/x86/include/asm/segment.h
10547--- linux-2.6.32.46/arch/x86/include/asm/segment.h 2011-03-27 14:31:47.000000000 -0400
10548+++ linux-2.6.32.46/arch/x86/include/asm/segment.h 2011-10-06 09:37:08.000000000 -0400
10549@@ -62,10 +62,15 @@
10550 * 26 - ESPFIX small SS
10551 * 27 - per-cpu [ offset to per-cpu data area ]
10552 * 28 - stack_canary-20 [ for stack protector ]
10553- * 29 - unused
10554- * 30 - unused
10555+ * 29 - PCI BIOS CS
10556+ * 30 - PCI BIOS DS
10557 * 31 - TSS for double fault handler
10558 */
10559+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
10560+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
10561+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
10562+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
10563+
10564 #define GDT_ENTRY_TLS_MIN 6
10565 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
10566
10567@@ -77,6 +82,8 @@
10568
10569 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE + 0)
10570
10571+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
10572+
10573 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE + 1)
10574
10575 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE + 4)
10576@@ -88,7 +95,7 @@
10577 #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14)
10578 #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)
10579
10580-#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15)
10581+#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15)
10582 #ifdef CONFIG_SMP
10583 #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8)
10584 #else
10585@@ -102,6 +109,12 @@
10586 #define __KERNEL_STACK_CANARY 0
10587 #endif
10588
10589+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE + 17)
10590+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
10591+
10592+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE + 18)
10593+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
10594+
10595 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
10596
10597 /*
10598@@ -139,7 +152,7 @@
10599 */
10600
10601 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
10602-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
10603+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
10604
10605
10606 #else
10607@@ -163,6 +176,8 @@
10608 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3)
10609 #define __USER32_DS __USER_DS
10610
10611+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
10612+
10613 #define GDT_ENTRY_TSS 8 /* needs two entries */
10614 #define GDT_ENTRY_LDT 10 /* needs two entries */
10615 #define GDT_ENTRY_TLS_MIN 12
10616@@ -183,6 +198,7 @@
10617 #endif
10618
10619 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8)
10620+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS * 8)
10621 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
10622 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
10623 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
10624diff -urNp linux-2.6.32.46/arch/x86/include/asm/smp.h linux-2.6.32.46/arch/x86/include/asm/smp.h
10625--- linux-2.6.32.46/arch/x86/include/asm/smp.h 2011-03-27 14:31:47.000000000 -0400
10626+++ linux-2.6.32.46/arch/x86/include/asm/smp.h 2011-08-05 20:33:55.000000000 -0400
10627@@ -24,7 +24,7 @@ extern unsigned int num_processors;
10628 DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
10629 DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
10630 DECLARE_PER_CPU(u16, cpu_llc_id);
10631-DECLARE_PER_CPU(int, cpu_number);
10632+DECLARE_PER_CPU(unsigned int, cpu_number);
10633
10634 static inline struct cpumask *cpu_sibling_mask(int cpu)
10635 {
10636@@ -40,10 +40,7 @@ DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_ap
10637 DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
10638
10639 /* Static state in head.S used to set up a CPU */
10640-extern struct {
10641- void *sp;
10642- unsigned short ss;
10643-} stack_start;
10644+extern unsigned long stack_start; /* Initial stack pointer address */
10645
10646 struct smp_ops {
10647 void (*smp_prepare_boot_cpu)(void);
10648@@ -60,7 +57,7 @@ struct smp_ops {
10649
10650 void (*send_call_func_ipi)(const struct cpumask *mask);
10651 void (*send_call_func_single_ipi)(int cpu);
10652-};
10653+} __no_const;
10654
10655 /* Globals due to paravirt */
10656 extern void set_cpu_sibling_map(int cpu);
10657@@ -175,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitd
10658 extern int safe_smp_processor_id(void);
10659
10660 #elif defined(CONFIG_X86_64_SMP)
10661-#define raw_smp_processor_id() (percpu_read(cpu_number))
10662-
10663-#define stack_smp_processor_id() \
10664-({ \
10665- struct thread_info *ti; \
10666- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
10667- ti->cpu; \
10668-})
10669+#define raw_smp_processor_id() (percpu_read(cpu_number))
10670+#define stack_smp_processor_id() raw_smp_processor_id()
10671 #define safe_smp_processor_id() smp_processor_id()
10672
10673 #endif
10674diff -urNp linux-2.6.32.46/arch/x86/include/asm/spinlock.h linux-2.6.32.46/arch/x86/include/asm/spinlock.h
10675--- linux-2.6.32.46/arch/x86/include/asm/spinlock.h 2011-03-27 14:31:47.000000000 -0400
10676+++ linux-2.6.32.46/arch/x86/include/asm/spinlock.h 2011-04-17 15:56:46.000000000 -0400
10677@@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r
10678 static inline void __raw_read_lock(raw_rwlock_t *rw)
10679 {
10680 asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
10681+
10682+#ifdef CONFIG_PAX_REFCOUNT
10683+ "jno 0f\n"
10684+ LOCK_PREFIX " addl $1,(%0)\n"
10685+ "int $4\n0:\n"
10686+ _ASM_EXTABLE(0b, 0b)
10687+#endif
10688+
10689 "jns 1f\n"
10690 "call __read_lock_failed\n\t"
10691 "1:\n"
10692@@ -258,6 +266,14 @@ static inline void __raw_read_lock(raw_r
10693 static inline void __raw_write_lock(raw_rwlock_t *rw)
10694 {
10695 asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
10696+
10697+#ifdef CONFIG_PAX_REFCOUNT
10698+ "jno 0f\n"
10699+ LOCK_PREFIX " addl %1,(%0)\n"
10700+ "int $4\n0:\n"
10701+ _ASM_EXTABLE(0b, 0b)
10702+#endif
10703+
10704 "jz 1f\n"
10705 "call __write_lock_failed\n\t"
10706 "1:\n"
10707@@ -286,12 +302,29 @@ static inline int __raw_write_trylock(ra
10708
10709 static inline void __raw_read_unlock(raw_rwlock_t *rw)
10710 {
10711- asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory");
10712+ asm volatile(LOCK_PREFIX "incl %0\n"
10713+
10714+#ifdef CONFIG_PAX_REFCOUNT
10715+ "jno 0f\n"
10716+ LOCK_PREFIX "decl %0\n"
10717+ "int $4\n0:\n"
10718+ _ASM_EXTABLE(0b, 0b)
10719+#endif
10720+
10721+ :"+m" (rw->lock) : : "memory");
10722 }
10723
10724 static inline void __raw_write_unlock(raw_rwlock_t *rw)
10725 {
10726- asm volatile(LOCK_PREFIX "addl %1, %0"
10727+ asm volatile(LOCK_PREFIX "addl %1, %0\n"
10728+
10729+#ifdef CONFIG_PAX_REFCOUNT
10730+ "jno 0f\n"
10731+ LOCK_PREFIX "subl %1, %0\n"
10732+ "int $4\n0:\n"
10733+ _ASM_EXTABLE(0b, 0b)
10734+#endif
10735+
10736 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
10737 }
10738
10739diff -urNp linux-2.6.32.46/arch/x86/include/asm/stackprotector.h linux-2.6.32.46/arch/x86/include/asm/stackprotector.h
10740--- linux-2.6.32.46/arch/x86/include/asm/stackprotector.h 2011-03-27 14:31:47.000000000 -0400
10741+++ linux-2.6.32.46/arch/x86/include/asm/stackprotector.h 2011-07-06 19:53:33.000000000 -0400
10742@@ -48,7 +48,7 @@
10743 * head_32 for boot CPU and setup_per_cpu_areas() for others.
10744 */
10745 #define GDT_STACK_CANARY_INIT \
10746- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
10747+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
10748
10749 /*
10750 * Initialize the stackprotector canary value.
10751@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
10752
10753 static inline void load_stack_canary_segment(void)
10754 {
10755-#ifdef CONFIG_X86_32
10756+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
10757 asm volatile ("mov %0, %%gs" : : "r" (0));
10758 #endif
10759 }
10760diff -urNp linux-2.6.32.46/arch/x86/include/asm/system.h linux-2.6.32.46/arch/x86/include/asm/system.h
10761--- linux-2.6.32.46/arch/x86/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400
10762+++ linux-2.6.32.46/arch/x86/include/asm/system.h 2011-05-22 23:02:03.000000000 -0400
10763@@ -132,7 +132,7 @@ do { \
10764 "thread_return:\n\t" \
10765 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
10766 __switch_canary \
10767- "movq %P[thread_info](%%rsi),%%r8\n\t" \
10768+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
10769 "movq %%rax,%%rdi\n\t" \
10770 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
10771 "jnz ret_from_fork\n\t" \
10772@@ -143,7 +143,7 @@ do { \
10773 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
10774 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
10775 [_tif_fork] "i" (_TIF_FORK), \
10776- [thread_info] "i" (offsetof(struct task_struct, stack)), \
10777+ [thread_info] "m" (per_cpu_var(current_tinfo)), \
10778 [current_task] "m" (per_cpu_var(current_task)) \
10779 __switch_canary_iparam \
10780 : "memory", "cc" __EXTRA_CLOBBER)
10781@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
10782 {
10783 unsigned long __limit;
10784 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
10785- return __limit + 1;
10786+ return __limit;
10787 }
10788
10789 static inline void native_clts(void)
10790@@ -340,12 +340,12 @@ void enable_hlt(void);
10791
10792 void cpu_idle_wait(void);
10793
10794-extern unsigned long arch_align_stack(unsigned long sp);
10795+#define arch_align_stack(x) ((x) & ~0xfUL)
10796 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
10797
10798 void default_idle(void);
10799
10800-void stop_this_cpu(void *dummy);
10801+void stop_this_cpu(void *dummy) __noreturn;
10802
10803 /*
10804 * Force strict CPU ordering.
10805diff -urNp linux-2.6.32.46/arch/x86/include/asm/thread_info.h linux-2.6.32.46/arch/x86/include/asm/thread_info.h
10806--- linux-2.6.32.46/arch/x86/include/asm/thread_info.h 2011-03-27 14:31:47.000000000 -0400
10807+++ linux-2.6.32.46/arch/x86/include/asm/thread_info.h 2011-05-17 19:26:34.000000000 -0400
10808@@ -10,6 +10,7 @@
10809 #include <linux/compiler.h>
10810 #include <asm/page.h>
10811 #include <asm/types.h>
10812+#include <asm/percpu.h>
10813
10814 /*
10815 * low level task data that entry.S needs immediate access to
10816@@ -24,7 +25,6 @@ struct exec_domain;
10817 #include <asm/atomic.h>
10818
10819 struct thread_info {
10820- struct task_struct *task; /* main task structure */
10821 struct exec_domain *exec_domain; /* execution domain */
10822 __u32 flags; /* low level flags */
10823 __u32 status; /* thread synchronous flags */
10824@@ -34,18 +34,12 @@ struct thread_info {
10825 mm_segment_t addr_limit;
10826 struct restart_block restart_block;
10827 void __user *sysenter_return;
10828-#ifdef CONFIG_X86_32
10829- unsigned long previous_esp; /* ESP of the previous stack in
10830- case of nested (IRQ) stacks
10831- */
10832- __u8 supervisor_stack[0];
10833-#endif
10834+ unsigned long lowest_stack;
10835 int uaccess_err;
10836 };
10837
10838-#define INIT_THREAD_INFO(tsk) \
10839+#define INIT_THREAD_INFO \
10840 { \
10841- .task = &tsk, \
10842 .exec_domain = &default_exec_domain, \
10843 .flags = 0, \
10844 .cpu = 0, \
10845@@ -56,7 +50,7 @@ struct thread_info {
10846 }, \
10847 }
10848
10849-#define init_thread_info (init_thread_union.thread_info)
10850+#define init_thread_info (init_thread_union.stack)
10851 #define init_stack (init_thread_union.stack)
10852
10853 #else /* !__ASSEMBLY__ */
10854@@ -163,6 +157,23 @@ struct thread_info {
10855 #define alloc_thread_info(tsk) \
10856 ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER))
10857
10858+#ifdef __ASSEMBLY__
10859+/* how to get the thread information struct from ASM */
10860+#define GET_THREAD_INFO(reg) \
10861+ mov PER_CPU_VAR(current_tinfo), reg
10862+
10863+/* use this one if reg already contains %esp */
10864+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
10865+#else
10866+/* how to get the thread information struct from C */
10867+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
10868+
10869+static __always_inline struct thread_info *current_thread_info(void)
10870+{
10871+ return percpu_read_stable(current_tinfo);
10872+}
10873+#endif
10874+
10875 #ifdef CONFIG_X86_32
10876
10877 #define STACK_WARN (THREAD_SIZE/8)
10878@@ -173,35 +184,13 @@ struct thread_info {
10879 */
10880 #ifndef __ASSEMBLY__
10881
10882-
10883 /* how to get the current stack pointer from C */
10884 register unsigned long current_stack_pointer asm("esp") __used;
10885
10886-/* how to get the thread information struct from C */
10887-static inline struct thread_info *current_thread_info(void)
10888-{
10889- return (struct thread_info *)
10890- (current_stack_pointer & ~(THREAD_SIZE - 1));
10891-}
10892-
10893-#else /* !__ASSEMBLY__ */
10894-
10895-/* how to get the thread information struct from ASM */
10896-#define GET_THREAD_INFO(reg) \
10897- movl $-THREAD_SIZE, reg; \
10898- andl %esp, reg
10899-
10900-/* use this one if reg already contains %esp */
10901-#define GET_THREAD_INFO_WITH_ESP(reg) \
10902- andl $-THREAD_SIZE, reg
10903-
10904 #endif
10905
10906 #else /* X86_32 */
10907
10908-#include <asm/percpu.h>
10909-#define KERNEL_STACK_OFFSET (5*8)
10910-
10911 /*
10912 * macros/functions for gaining access to the thread information structure
10913 * preempt_count needs to be 1 initially, until the scheduler is functional.
10914@@ -209,21 +198,8 @@ static inline struct thread_info *curren
10915 #ifndef __ASSEMBLY__
10916 DECLARE_PER_CPU(unsigned long, kernel_stack);
10917
10918-static inline struct thread_info *current_thread_info(void)
10919-{
10920- struct thread_info *ti;
10921- ti = (void *)(percpu_read_stable(kernel_stack) +
10922- KERNEL_STACK_OFFSET - THREAD_SIZE);
10923- return ti;
10924-}
10925-
10926-#else /* !__ASSEMBLY__ */
10927-
10928-/* how to get the thread information struct from ASM */
10929-#define GET_THREAD_INFO(reg) \
10930- movq PER_CPU_VAR(kernel_stack),reg ; \
10931- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
10932-
10933+/* how to get the current stack pointer from C */
10934+register unsigned long current_stack_pointer asm("rsp") __used;
10935 #endif
10936
10937 #endif /* !X86_32 */
10938@@ -260,5 +236,16 @@ extern void arch_task_cache_init(void);
10939 extern void free_thread_info(struct thread_info *ti);
10940 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
10941 #define arch_task_cache_init arch_task_cache_init
10942+
10943+#define __HAVE_THREAD_FUNCTIONS
10944+#define task_thread_info(task) (&(task)->tinfo)
10945+#define task_stack_page(task) ((task)->stack)
10946+#define setup_thread_stack(p, org) do {} while (0)
10947+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
10948+
10949+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
10950+extern struct task_struct *alloc_task_struct(void);
10951+extern void free_task_struct(struct task_struct *);
10952+
10953 #endif
10954 #endif /* _ASM_X86_THREAD_INFO_H */
10955diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h
10956--- linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h 2011-03-27 14:31:47.000000000 -0400
10957+++ linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h 2011-05-16 21:46:57.000000000 -0400
10958@@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_u
10959 static __always_inline unsigned long __must_check
10960 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
10961 {
10962+ pax_track_stack();
10963+
10964+ if ((long)n < 0)
10965+ return n;
10966+
10967 if (__builtin_constant_p(n)) {
10968 unsigned long ret;
10969
10970@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to,
10971 return ret;
10972 }
10973 }
10974+ if (!__builtin_constant_p(n))
10975+ check_object_size(from, n, true);
10976 return __copy_to_user_ll(to, from, n);
10977 }
10978
10979@@ -83,12 +90,16 @@ static __always_inline unsigned long __m
10980 __copy_to_user(void __user *to, const void *from, unsigned long n)
10981 {
10982 might_fault();
10983+
10984 return __copy_to_user_inatomic(to, from, n);
10985 }
10986
10987 static __always_inline unsigned long
10988 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
10989 {
10990+ if ((long)n < 0)
10991+ return n;
10992+
10993 /* Avoid zeroing the tail if the copy fails..
10994 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
10995 * but as the zeroing behaviour is only significant when n is not
10996@@ -138,6 +149,12 @@ static __always_inline unsigned long
10997 __copy_from_user(void *to, const void __user *from, unsigned long n)
10998 {
10999 might_fault();
11000+
11001+ pax_track_stack();
11002+
11003+ if ((long)n < 0)
11004+ return n;
11005+
11006 if (__builtin_constant_p(n)) {
11007 unsigned long ret;
11008
11009@@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __
11010 return ret;
11011 }
11012 }
11013+ if (!__builtin_constant_p(n))
11014+ check_object_size(to, n, false);
11015 return __copy_from_user_ll(to, from, n);
11016 }
11017
11018@@ -160,6 +179,10 @@ static __always_inline unsigned long __c
11019 const void __user *from, unsigned long n)
11020 {
11021 might_fault();
11022+
11023+ if ((long)n < 0)
11024+ return n;
11025+
11026 if (__builtin_constant_p(n)) {
11027 unsigned long ret;
11028
11029@@ -182,14 +205,62 @@ static __always_inline unsigned long
11030 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
11031 unsigned long n)
11032 {
11033- return __copy_from_user_ll_nocache_nozero(to, from, n);
11034+ if ((long)n < 0)
11035+ return n;
11036+
11037+ return __copy_from_user_ll_nocache_nozero(to, from, n);
11038+}
11039+
11040+/**
11041+ * copy_to_user: - Copy a block of data into user space.
11042+ * @to: Destination address, in user space.
11043+ * @from: Source address, in kernel space.
11044+ * @n: Number of bytes to copy.
11045+ *
11046+ * Context: User context only. This function may sleep.
11047+ *
11048+ * Copy data from kernel space to user space.
11049+ *
11050+ * Returns number of bytes that could not be copied.
11051+ * On success, this will be zero.
11052+ */
11053+static __always_inline unsigned long __must_check
11054+copy_to_user(void __user *to, const void *from, unsigned long n)
11055+{
11056+ if (access_ok(VERIFY_WRITE, to, n))
11057+ n = __copy_to_user(to, from, n);
11058+ return n;
11059+}
11060+
11061+/**
11062+ * copy_from_user: - Copy a block of data from user space.
11063+ * @to: Destination address, in kernel space.
11064+ * @from: Source address, in user space.
11065+ * @n: Number of bytes to copy.
11066+ *
11067+ * Context: User context only. This function may sleep.
11068+ *
11069+ * Copy data from user space to kernel space.
11070+ *
11071+ * Returns number of bytes that could not be copied.
11072+ * On success, this will be zero.
11073+ *
11074+ * If some data could not be copied, this function will pad the copied
11075+ * data to the requested size using zero bytes.
11076+ */
11077+static __always_inline unsigned long __must_check
11078+copy_from_user(void *to, const void __user *from, unsigned long n)
11079+{
11080+ if (access_ok(VERIFY_READ, from, n))
11081+ n = __copy_from_user(to, from, n);
11082+ else if ((long)n > 0) {
11083+ if (!__builtin_constant_p(n))
11084+ check_object_size(to, n, false);
11085+ memset(to, 0, n);
11086+ }
11087+ return n;
11088 }
11089
11090-unsigned long __must_check copy_to_user(void __user *to,
11091- const void *from, unsigned long n);
11092-unsigned long __must_check copy_from_user(void *to,
11093- const void __user *from,
11094- unsigned long n);
11095 long __must_check strncpy_from_user(char *dst, const char __user *src,
11096 long count);
11097 long __must_check __strncpy_from_user(char *dst,
11098diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h
11099--- linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h 2011-03-27 14:31:47.000000000 -0400
11100+++ linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h 2011-10-06 09:37:08.000000000 -0400
11101@@ -9,6 +9,9 @@
11102 #include <linux/prefetch.h>
11103 #include <linux/lockdep.h>
11104 #include <asm/page.h>
11105+#include <asm/pgtable.h>
11106+
11107+#define set_fs(x) (current_thread_info()->addr_limit = (x))
11108
11109 /*
11110 * Copy To/From Userspace
11111@@ -19,113 +22,203 @@ __must_check unsigned long
11112 copy_user_generic(void *to, const void *from, unsigned len);
11113
11114 __must_check unsigned long
11115-copy_to_user(void __user *to, const void *from, unsigned len);
11116-__must_check unsigned long
11117-copy_from_user(void *to, const void __user *from, unsigned len);
11118-__must_check unsigned long
11119 copy_in_user(void __user *to, const void __user *from, unsigned len);
11120
11121 static __always_inline __must_check
11122-int __copy_from_user(void *dst, const void __user *src, unsigned size)
11123+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned size)
11124 {
11125- int ret = 0;
11126+ unsigned ret = 0;
11127
11128 might_fault();
11129- if (!__builtin_constant_p(size))
11130- return copy_user_generic(dst, (__force void *)src, size);
11131+
11132+ if ((int)size < 0)
11133+ return size;
11134+
11135+#ifdef CONFIG_PAX_MEMORY_UDEREF
11136+ if (!__access_ok(VERIFY_READ, src, size))
11137+ return size;
11138+#endif
11139+
11140+ if (!__builtin_constant_p(size)) {
11141+ check_object_size(dst, size, false);
11142+
11143+#ifdef CONFIG_PAX_MEMORY_UDEREF
11144+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11145+ src += PAX_USER_SHADOW_BASE;
11146+#endif
11147+
11148+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
11149+ }
11150 switch (size) {
11151- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
11152+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
11153 ret, "b", "b", "=q", 1);
11154 return ret;
11155- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
11156+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
11157 ret, "w", "w", "=r", 2);
11158 return ret;
11159- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
11160+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
11161 ret, "l", "k", "=r", 4);
11162 return ret;
11163- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
11164+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
11165 ret, "q", "", "=r", 8);
11166 return ret;
11167 case 10:
11168- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
11169+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
11170 ret, "q", "", "=r", 10);
11171 if (unlikely(ret))
11172 return ret;
11173 __get_user_asm(*(u16 *)(8 + (char *)dst),
11174- (u16 __user *)(8 + (char __user *)src),
11175+ (const u16 __user *)(8 + (const char __user *)src),
11176 ret, "w", "w", "=r", 2);
11177 return ret;
11178 case 16:
11179- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
11180+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
11181 ret, "q", "", "=r", 16);
11182 if (unlikely(ret))
11183 return ret;
11184 __get_user_asm(*(u64 *)(8 + (char *)dst),
11185- (u64 __user *)(8 + (char __user *)src),
11186+ (const u64 __user *)(8 + (const char __user *)src),
11187 ret, "q", "", "=r", 8);
11188 return ret;
11189 default:
11190- return copy_user_generic(dst, (__force void *)src, size);
11191+
11192+#ifdef CONFIG_PAX_MEMORY_UDEREF
11193+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11194+ src += PAX_USER_SHADOW_BASE;
11195+#endif
11196+
11197+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
11198 }
11199 }
11200
11201 static __always_inline __must_check
11202-int __copy_to_user(void __user *dst, const void *src, unsigned size)
11203+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned size)
11204 {
11205- int ret = 0;
11206+ unsigned ret = 0;
11207
11208 might_fault();
11209- if (!__builtin_constant_p(size))
11210- return copy_user_generic((__force void *)dst, src, size);
11211+
11212+ pax_track_stack();
11213+
11214+ if ((int)size < 0)
11215+ return size;
11216+
11217+#ifdef CONFIG_PAX_MEMORY_UDEREF
11218+ if (!__access_ok(VERIFY_WRITE, dst, size))
11219+ return size;
11220+#endif
11221+
11222+ if (!__builtin_constant_p(size)) {
11223+ check_object_size(src, size, true);
11224+
11225+#ifdef CONFIG_PAX_MEMORY_UDEREF
11226+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11227+ dst += PAX_USER_SHADOW_BASE;
11228+#endif
11229+
11230+ return copy_user_generic((__force_kernel void *)dst, src, size);
11231+ }
11232 switch (size) {
11233- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
11234+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
11235 ret, "b", "b", "iq", 1);
11236 return ret;
11237- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
11238+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
11239 ret, "w", "w", "ir", 2);
11240 return ret;
11241- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
11242+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
11243 ret, "l", "k", "ir", 4);
11244 return ret;
11245- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
11246+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
11247 ret, "q", "", "er", 8);
11248 return ret;
11249 case 10:
11250- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
11251+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
11252 ret, "q", "", "er", 10);
11253 if (unlikely(ret))
11254 return ret;
11255 asm("":::"memory");
11256- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
11257+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
11258 ret, "w", "w", "ir", 2);
11259 return ret;
11260 case 16:
11261- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
11262+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
11263 ret, "q", "", "er", 16);
11264 if (unlikely(ret))
11265 return ret;
11266 asm("":::"memory");
11267- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
11268+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
11269 ret, "q", "", "er", 8);
11270 return ret;
11271 default:
11272- return copy_user_generic((__force void *)dst, src, size);
11273+
11274+#ifdef CONFIG_PAX_MEMORY_UDEREF
11275+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11276+ dst += PAX_USER_SHADOW_BASE;
11277+#endif
11278+
11279+ return copy_user_generic((__force_kernel void *)dst, src, size);
11280+ }
11281+}
11282+
11283+static __always_inline __must_check
11284+unsigned long copy_to_user(void __user *to, const void *from, unsigned len)
11285+{
11286+ if (access_ok(VERIFY_WRITE, to, len))
11287+ len = __copy_to_user(to, from, len);
11288+ return len;
11289+}
11290+
11291+static __always_inline __must_check
11292+unsigned long copy_from_user(void *to, const void __user *from, unsigned len)
11293+{
11294+ if ((int)len < 0)
11295+ return len;
11296+
11297+ if (access_ok(VERIFY_READ, from, len))
11298+ len = __copy_from_user(to, from, len);
11299+ else if ((int)len > 0) {
11300+ if (!__builtin_constant_p(len))
11301+ check_object_size(to, len, false);
11302+ memset(to, 0, len);
11303 }
11304+ return len;
11305 }
11306
11307 static __always_inline __must_check
11308-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
11309+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
11310 {
11311- int ret = 0;
11312+ unsigned ret = 0;
11313
11314 might_fault();
11315- if (!__builtin_constant_p(size))
11316- return copy_user_generic((__force void *)dst,
11317- (__force void *)src, size);
11318+
11319+ pax_track_stack();
11320+
11321+ if ((int)size < 0)
11322+ return size;
11323+
11324+#ifdef CONFIG_PAX_MEMORY_UDEREF
11325+ if (!__access_ok(VERIFY_READ, src, size))
11326+ return size;
11327+ if (!__access_ok(VERIFY_WRITE, dst, size))
11328+ return size;
11329+#endif
11330+
11331+ if (!__builtin_constant_p(size)) {
11332+
11333+#ifdef CONFIG_PAX_MEMORY_UDEREF
11334+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11335+ src += PAX_USER_SHADOW_BASE;
11336+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11337+ dst += PAX_USER_SHADOW_BASE;
11338+#endif
11339+
11340+ return copy_user_generic((__force_kernel void *)dst,
11341+ (__force_kernel const void *)src, size);
11342+ }
11343 switch (size) {
11344 case 1: {
11345 u8 tmp;
11346- __get_user_asm(tmp, (u8 __user *)src,
11347+ __get_user_asm(tmp, (const u8 __user *)src,
11348 ret, "b", "b", "=q", 1);
11349 if (likely(!ret))
11350 __put_user_asm(tmp, (u8 __user *)dst,
11351@@ -134,7 +227,7 @@ int __copy_in_user(void __user *dst, con
11352 }
11353 case 2: {
11354 u16 tmp;
11355- __get_user_asm(tmp, (u16 __user *)src,
11356+ __get_user_asm(tmp, (const u16 __user *)src,
11357 ret, "w", "w", "=r", 2);
11358 if (likely(!ret))
11359 __put_user_asm(tmp, (u16 __user *)dst,
11360@@ -144,7 +237,7 @@ int __copy_in_user(void __user *dst, con
11361
11362 case 4: {
11363 u32 tmp;
11364- __get_user_asm(tmp, (u32 __user *)src,
11365+ __get_user_asm(tmp, (const u32 __user *)src,
11366 ret, "l", "k", "=r", 4);
11367 if (likely(!ret))
11368 __put_user_asm(tmp, (u32 __user *)dst,
11369@@ -153,7 +246,7 @@ int __copy_in_user(void __user *dst, con
11370 }
11371 case 8: {
11372 u64 tmp;
11373- __get_user_asm(tmp, (u64 __user *)src,
11374+ __get_user_asm(tmp, (const u64 __user *)src,
11375 ret, "q", "", "=r", 8);
11376 if (likely(!ret))
11377 __put_user_asm(tmp, (u64 __user *)dst,
11378@@ -161,8 +254,16 @@ int __copy_in_user(void __user *dst, con
11379 return ret;
11380 }
11381 default:
11382- return copy_user_generic((__force void *)dst,
11383- (__force void *)src, size);
11384+
11385+#ifdef CONFIG_PAX_MEMORY_UDEREF
11386+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11387+ src += PAX_USER_SHADOW_BASE;
11388+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11389+ dst += PAX_USER_SHADOW_BASE;
11390+#endif
11391+
11392+ return copy_user_generic((__force_kernel void *)dst,
11393+ (__force_kernel const void *)src, size);
11394 }
11395 }
11396
11397@@ -176,33 +277,75 @@ __must_check long strlen_user(const char
11398 __must_check unsigned long clear_user(void __user *mem, unsigned long len);
11399 __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
11400
11401-__must_check long __copy_from_user_inatomic(void *dst, const void __user *src,
11402- unsigned size);
11403+static __must_check __always_inline unsigned long
11404+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
11405+{
11406+ pax_track_stack();
11407+
11408+ if ((int)size < 0)
11409+ return size;
11410+
11411+#ifdef CONFIG_PAX_MEMORY_UDEREF
11412+ if (!__access_ok(VERIFY_READ, src, size))
11413+ return size;
11414+
11415+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11416+ src += PAX_USER_SHADOW_BASE;
11417+#endif
11418
11419-static __must_check __always_inline int
11420+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
11421+}
11422+
11423+static __must_check __always_inline unsigned long
11424 __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
11425 {
11426- return copy_user_generic((__force void *)dst, src, size);
11427+ if ((int)size < 0)
11428+ return size;
11429+
11430+#ifdef CONFIG_PAX_MEMORY_UDEREF
11431+ if (!__access_ok(VERIFY_WRITE, dst, size))
11432+ return size;
11433+
11434+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11435+ dst += PAX_USER_SHADOW_BASE;
11436+#endif
11437+
11438+ return copy_user_generic((__force_kernel void *)dst, src, size);
11439 }
11440
11441-extern long __copy_user_nocache(void *dst, const void __user *src,
11442+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
11443 unsigned size, int zerorest);
11444
11445-static inline int
11446-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
11447+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
11448 {
11449 might_sleep();
11450+
11451+ if ((int)size < 0)
11452+ return size;
11453+
11454+#ifdef CONFIG_PAX_MEMORY_UDEREF
11455+ if (!__access_ok(VERIFY_READ, src, size))
11456+ return size;
11457+#endif
11458+
11459 return __copy_user_nocache(dst, src, size, 1);
11460 }
11461
11462-static inline int
11463-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
11464+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
11465 unsigned size)
11466 {
11467+ if ((int)size < 0)
11468+ return size;
11469+
11470+#ifdef CONFIG_PAX_MEMORY_UDEREF
11471+ if (!__access_ok(VERIFY_READ, src, size))
11472+ return size;
11473+#endif
11474+
11475 return __copy_user_nocache(dst, src, size, 0);
11476 }
11477
11478-unsigned long
11479-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
11480+extern unsigned long
11481+copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest);
11482
11483 #endif /* _ASM_X86_UACCESS_64_H */
11484diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess.h linux-2.6.32.46/arch/x86/include/asm/uaccess.h
11485--- linux-2.6.32.46/arch/x86/include/asm/uaccess.h 2011-06-25 12:55:34.000000000 -0400
11486+++ linux-2.6.32.46/arch/x86/include/asm/uaccess.h 2011-10-06 09:37:08.000000000 -0400
11487@@ -8,12 +8,15 @@
11488 #include <linux/thread_info.h>
11489 #include <linux/prefetch.h>
11490 #include <linux/string.h>
11491+#include <linux/sched.h>
11492 #include <asm/asm.h>
11493 #include <asm/page.h>
11494
11495 #define VERIFY_READ 0
11496 #define VERIFY_WRITE 1
11497
11498+extern void check_object_size(const void *ptr, unsigned long n, bool to);
11499+
11500 /*
11501 * The fs value determines whether argument validity checking should be
11502 * performed or not. If get_fs() == USER_DS, checking is performed, with
11503@@ -29,7 +32,12 @@
11504
11505 #define get_ds() (KERNEL_DS)
11506 #define get_fs() (current_thread_info()->addr_limit)
11507+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
11508+void __set_fs(mm_segment_t x);
11509+void set_fs(mm_segment_t x);
11510+#else
11511 #define set_fs(x) (current_thread_info()->addr_limit = (x))
11512+#endif
11513
11514 #define segment_eq(a, b) ((a).seg == (b).seg)
11515
11516@@ -77,7 +85,33 @@
11517 * checks that the pointer is in the user space range - after calling
11518 * this function, memory access functions may still return -EFAULT.
11519 */
11520-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
11521+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
11522+#define access_ok(type, addr, size) \
11523+({ \
11524+ long __size = size; \
11525+ unsigned long __addr = (unsigned long)addr; \
11526+ unsigned long __addr_ao = __addr & PAGE_MASK; \
11527+ unsigned long __end_ao = __addr + __size - 1; \
11528+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
11529+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
11530+ while(__addr_ao <= __end_ao) { \
11531+ char __c_ao; \
11532+ __addr_ao += PAGE_SIZE; \
11533+ if (__size > PAGE_SIZE) \
11534+ cond_resched(); \
11535+ if (__get_user(__c_ao, (char __user *)__addr)) \
11536+ break; \
11537+ if (type != VERIFY_WRITE) { \
11538+ __addr = __addr_ao; \
11539+ continue; \
11540+ } \
11541+ if (__put_user(__c_ao, (char __user *)__addr)) \
11542+ break; \
11543+ __addr = __addr_ao; \
11544+ } \
11545+ } \
11546+ __ret_ao; \
11547+})
11548
11549 /*
11550 * The exception table consists of pairs of addresses: the first is the
11551@@ -183,12 +217,20 @@ extern int __get_user_bad(void);
11552 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
11553 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
11554
11555-
11556+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
11557+#define __copyuser_seg "gs;"
11558+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
11559+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
11560+#else
11561+#define __copyuser_seg
11562+#define __COPYUSER_SET_ES
11563+#define __COPYUSER_RESTORE_ES
11564+#endif
11565
11566 #ifdef CONFIG_X86_32
11567 #define __put_user_asm_u64(x, addr, err, errret) \
11568- asm volatile("1: movl %%eax,0(%2)\n" \
11569- "2: movl %%edx,4(%2)\n" \
11570+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
11571+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
11572 "3:\n" \
11573 ".section .fixup,\"ax\"\n" \
11574 "4: movl %3,%0\n" \
11575@@ -200,8 +242,8 @@ extern int __get_user_bad(void);
11576 : "A" (x), "r" (addr), "i" (errret), "0" (err))
11577
11578 #define __put_user_asm_ex_u64(x, addr) \
11579- asm volatile("1: movl %%eax,0(%1)\n" \
11580- "2: movl %%edx,4(%1)\n" \
11581+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
11582+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
11583 "3:\n" \
11584 _ASM_EXTABLE(1b, 2b - 1b) \
11585 _ASM_EXTABLE(2b, 3b - 2b) \
11586@@ -253,7 +295,7 @@ extern void __put_user_8(void);
11587 __typeof__(*(ptr)) __pu_val; \
11588 __chk_user_ptr(ptr); \
11589 might_fault(); \
11590- __pu_val = x; \
11591+ __pu_val = (x); \
11592 switch (sizeof(*(ptr))) { \
11593 case 1: \
11594 __put_user_x(1, __pu_val, ptr, __ret_pu); \
11595@@ -374,7 +416,7 @@ do { \
11596 } while (0)
11597
11598 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
11599- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
11600+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
11601 "2:\n" \
11602 ".section .fixup,\"ax\"\n" \
11603 "3: mov %3,%0\n" \
11604@@ -382,7 +424,7 @@ do { \
11605 " jmp 2b\n" \
11606 ".previous\n" \
11607 _ASM_EXTABLE(1b, 3b) \
11608- : "=r" (err), ltype(x) \
11609+ : "=r" (err), ltype (x) \
11610 : "m" (__m(addr)), "i" (errret), "0" (err))
11611
11612 #define __get_user_size_ex(x, ptr, size) \
11613@@ -407,7 +449,7 @@ do { \
11614 } while (0)
11615
11616 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
11617- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
11618+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
11619 "2:\n" \
11620 _ASM_EXTABLE(1b, 2b - 1b) \
11621 : ltype(x) : "m" (__m(addr)))
11622@@ -424,13 +466,24 @@ do { \
11623 int __gu_err; \
11624 unsigned long __gu_val; \
11625 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
11626- (x) = (__force __typeof__(*(ptr)))__gu_val; \
11627+ (x) = (__typeof__(*(ptr)))__gu_val; \
11628 __gu_err; \
11629 })
11630
11631 /* FIXME: this hack is definitely wrong -AK */
11632 struct __large_struct { unsigned long buf[100]; };
11633-#define __m(x) (*(struct __large_struct __user *)(x))
11634+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11635+#define ____m(x) \
11636+({ \
11637+ unsigned long ____x = (unsigned long)(x); \
11638+ if (____x < PAX_USER_SHADOW_BASE) \
11639+ ____x += PAX_USER_SHADOW_BASE; \
11640+ (void __user *)____x; \
11641+})
11642+#else
11643+#define ____m(x) (x)
11644+#endif
11645+#define __m(x) (*(struct __large_struct __user *)____m(x))
11646
11647 /*
11648 * Tell gcc we read from memory instead of writing: this is because
11649@@ -438,7 +491,7 @@ struct __large_struct { unsigned long bu
11650 * aliasing issues.
11651 */
11652 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
11653- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
11654+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
11655 "2:\n" \
11656 ".section .fixup,\"ax\"\n" \
11657 "3: mov %3,%0\n" \
11658@@ -446,10 +499,10 @@ struct __large_struct { unsigned long bu
11659 ".previous\n" \
11660 _ASM_EXTABLE(1b, 3b) \
11661 : "=r"(err) \
11662- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
11663+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
11664
11665 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
11666- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
11667+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
11668 "2:\n" \
11669 _ASM_EXTABLE(1b, 2b - 1b) \
11670 : : ltype(x), "m" (__m(addr)))
11671@@ -488,8 +541,12 @@ struct __large_struct { unsigned long bu
11672 * On error, the variable @x is set to zero.
11673 */
11674
11675+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11676+#define __get_user(x, ptr) get_user((x), (ptr))
11677+#else
11678 #define __get_user(x, ptr) \
11679 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
11680+#endif
11681
11682 /**
11683 * __put_user: - Write a simple value into user space, with less checking.
11684@@ -511,8 +568,12 @@ struct __large_struct { unsigned long bu
11685 * Returns zero on success, or -EFAULT on error.
11686 */
11687
11688+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11689+#define __put_user(x, ptr) put_user((x), (ptr))
11690+#else
11691 #define __put_user(x, ptr) \
11692 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
11693+#endif
11694
11695 #define __get_user_unaligned __get_user
11696 #define __put_user_unaligned __put_user
11697@@ -530,7 +591,7 @@ struct __large_struct { unsigned long bu
11698 #define get_user_ex(x, ptr) do { \
11699 unsigned long __gue_val; \
11700 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
11701- (x) = (__force __typeof__(*(ptr)))__gue_val; \
11702+ (x) = (__typeof__(*(ptr)))__gue_val; \
11703 } while (0)
11704
11705 #ifdef CONFIG_X86_WP_WORKS_OK
11706@@ -567,6 +628,7 @@ extern struct movsl_mask {
11707
11708 #define ARCH_HAS_NOCACHE_UACCESS 1
11709
11710+#define ARCH_HAS_SORT_EXTABLE
11711 #ifdef CONFIG_X86_32
11712 # include "uaccess_32.h"
11713 #else
11714diff -urNp linux-2.6.32.46/arch/x86/include/asm/vdso.h linux-2.6.32.46/arch/x86/include/asm/vdso.h
11715--- linux-2.6.32.46/arch/x86/include/asm/vdso.h 2011-03-27 14:31:47.000000000 -0400
11716+++ linux-2.6.32.46/arch/x86/include/asm/vdso.h 2011-10-06 09:37:14.000000000 -0400
11717@@ -25,7 +25,7 @@ extern const char VDSO32_PRELINK[];
11718 #define VDSO32_SYMBOL(base, name) \
11719 ({ \
11720 extern const char VDSO32_##name[]; \
11721- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
11722+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
11723 })
11724 #endif
11725
11726diff -urNp linux-2.6.32.46/arch/x86/include/asm/vgtod.h linux-2.6.32.46/arch/x86/include/asm/vgtod.h
11727--- linux-2.6.32.46/arch/x86/include/asm/vgtod.h 2011-03-27 14:31:47.000000000 -0400
11728+++ linux-2.6.32.46/arch/x86/include/asm/vgtod.h 2011-04-17 15:56:46.000000000 -0400
11729@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
11730 int sysctl_enabled;
11731 struct timezone sys_tz;
11732 struct { /* extract of a clocksource struct */
11733+ char name[8];
11734 cycle_t (*vread)(void);
11735 cycle_t cycle_last;
11736 cycle_t mask;
11737diff -urNp linux-2.6.32.46/arch/x86/include/asm/vmi.h linux-2.6.32.46/arch/x86/include/asm/vmi.h
11738--- linux-2.6.32.46/arch/x86/include/asm/vmi.h 2011-03-27 14:31:47.000000000 -0400
11739+++ linux-2.6.32.46/arch/x86/include/asm/vmi.h 2011-04-17 15:56:46.000000000 -0400
11740@@ -191,6 +191,7 @@ struct vrom_header {
11741 u8 reserved[96]; /* Reserved for headers */
11742 char vmi_init[8]; /* VMI_Init jump point */
11743 char get_reloc[8]; /* VMI_GetRelocationInfo jump point */
11744+ char rom_data[8048]; /* rest of the option ROM */
11745 } __attribute__((packed));
11746
11747 struct pnp_header {
11748diff -urNp linux-2.6.32.46/arch/x86/include/asm/vmi_time.h linux-2.6.32.46/arch/x86/include/asm/vmi_time.h
11749--- linux-2.6.32.46/arch/x86/include/asm/vmi_time.h 2011-03-27 14:31:47.000000000 -0400
11750+++ linux-2.6.32.46/arch/x86/include/asm/vmi_time.h 2011-08-05 20:33:55.000000000 -0400
11751@@ -43,7 +43,7 @@ extern struct vmi_timer_ops {
11752 int (*wallclock_updated)(void);
11753 void (*set_alarm)(u32 flags, u64 expiry, u64 period);
11754 void (*cancel_alarm)(u32 flags);
11755-} vmi_timer_ops;
11756+} __no_const vmi_timer_ops;
11757
11758 /* Prototypes */
11759 extern void __init vmi_time_init(void);
11760diff -urNp linux-2.6.32.46/arch/x86/include/asm/vsyscall.h linux-2.6.32.46/arch/x86/include/asm/vsyscall.h
11761--- linux-2.6.32.46/arch/x86/include/asm/vsyscall.h 2011-03-27 14:31:47.000000000 -0400
11762+++ linux-2.6.32.46/arch/x86/include/asm/vsyscall.h 2011-04-17 15:56:46.000000000 -0400
11763@@ -15,9 +15,10 @@ enum vsyscall_num {
11764
11765 #ifdef __KERNEL__
11766 #include <linux/seqlock.h>
11767+#include <linux/getcpu.h>
11768+#include <linux/time.h>
11769
11770 #define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16)))
11771-#define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
11772
11773 /* Definitions for CONFIG_GENERIC_TIME definitions */
11774 #define __section_vsyscall_gtod_data __attribute__ \
11775@@ -31,7 +32,6 @@ enum vsyscall_num {
11776 #define VGETCPU_LSL 2
11777
11778 extern int __vgetcpu_mode;
11779-extern volatile unsigned long __jiffies;
11780
11781 /* kernel space (writeable) */
11782 extern int vgetcpu_mode;
11783@@ -39,6 +39,9 @@ extern struct timezone sys_tz;
11784
11785 extern void map_vsyscall(void);
11786
11787+extern int vgettimeofday(struct timeval * tv, struct timezone * tz);
11788+extern time_t vtime(time_t *t);
11789+extern long vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache);
11790 #endif /* __KERNEL__ */
11791
11792 #endif /* _ASM_X86_VSYSCALL_H */
11793diff -urNp linux-2.6.32.46/arch/x86/include/asm/x86_init.h linux-2.6.32.46/arch/x86/include/asm/x86_init.h
11794--- linux-2.6.32.46/arch/x86/include/asm/x86_init.h 2011-03-27 14:31:47.000000000 -0400
11795+++ linux-2.6.32.46/arch/x86/include/asm/x86_init.h 2011-08-05 20:33:55.000000000 -0400
11796@@ -28,7 +28,7 @@ struct x86_init_mpparse {
11797 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
11798 void (*find_smp_config)(unsigned int reserve);
11799 void (*get_smp_config)(unsigned int early);
11800-};
11801+} __no_const;
11802
11803 /**
11804 * struct x86_init_resources - platform specific resource related ops
11805@@ -42,7 +42,7 @@ struct x86_init_resources {
11806 void (*probe_roms)(void);
11807 void (*reserve_resources)(void);
11808 char *(*memory_setup)(void);
11809-};
11810+} __no_const;
11811
11812 /**
11813 * struct x86_init_irqs - platform specific interrupt setup
11814@@ -55,7 +55,7 @@ struct x86_init_irqs {
11815 void (*pre_vector_init)(void);
11816 void (*intr_init)(void);
11817 void (*trap_init)(void);
11818-};
11819+} __no_const;
11820
11821 /**
11822 * struct x86_init_oem - oem platform specific customizing functions
11823@@ -65,7 +65,7 @@ struct x86_init_irqs {
11824 struct x86_init_oem {
11825 void (*arch_setup)(void);
11826 void (*banner)(void);
11827-};
11828+} __no_const;
11829
11830 /**
11831 * struct x86_init_paging - platform specific paging functions
11832@@ -75,7 +75,7 @@ struct x86_init_oem {
11833 struct x86_init_paging {
11834 void (*pagetable_setup_start)(pgd_t *base);
11835 void (*pagetable_setup_done)(pgd_t *base);
11836-};
11837+} __no_const;
11838
11839 /**
11840 * struct x86_init_timers - platform specific timer setup
11841@@ -88,7 +88,7 @@ struct x86_init_timers {
11842 void (*setup_percpu_clockev)(void);
11843 void (*tsc_pre_init)(void);
11844 void (*timer_init)(void);
11845-};
11846+} __no_const;
11847
11848 /**
11849 * struct x86_init_ops - functions for platform specific setup
11850@@ -101,7 +101,7 @@ struct x86_init_ops {
11851 struct x86_init_oem oem;
11852 struct x86_init_paging paging;
11853 struct x86_init_timers timers;
11854-};
11855+} __no_const;
11856
11857 /**
11858 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
11859@@ -109,7 +109,7 @@ struct x86_init_ops {
11860 */
11861 struct x86_cpuinit_ops {
11862 void (*setup_percpu_clockev)(void);
11863-};
11864+} __no_const;
11865
11866 /**
11867 * struct x86_platform_ops - platform specific runtime functions
11868@@ -121,7 +121,7 @@ struct x86_platform_ops {
11869 unsigned long (*calibrate_tsc)(void);
11870 unsigned long (*get_wallclock)(void);
11871 int (*set_wallclock)(unsigned long nowtime);
11872-};
11873+} __no_const;
11874
11875 extern struct x86_init_ops x86_init;
11876 extern struct x86_cpuinit_ops x86_cpuinit;
11877diff -urNp linux-2.6.32.46/arch/x86/include/asm/xsave.h linux-2.6.32.46/arch/x86/include/asm/xsave.h
11878--- linux-2.6.32.46/arch/x86/include/asm/xsave.h 2011-03-27 14:31:47.000000000 -0400
11879+++ linux-2.6.32.46/arch/x86/include/asm/xsave.h 2011-10-06 09:37:08.000000000 -0400
11880@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
11881 static inline int xsave_user(struct xsave_struct __user *buf)
11882 {
11883 int err;
11884+
11885+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11886+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
11887+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
11888+#endif
11889+
11890 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
11891 "2:\n"
11892 ".section .fixup,\"ax\"\n"
11893@@ -78,10 +84,15 @@ static inline int xsave_user(struct xsav
11894 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
11895 {
11896 int err;
11897- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
11898+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
11899 u32 lmask = mask;
11900 u32 hmask = mask >> 32;
11901
11902+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11903+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
11904+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
11905+#endif
11906+
11907 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
11908 "2:\n"
11909 ".section .fixup,\"ax\"\n"
11910diff -urNp linux-2.6.32.46/arch/x86/Kconfig linux-2.6.32.46/arch/x86/Kconfig
11911--- linux-2.6.32.46/arch/x86/Kconfig 2011-03-27 14:31:47.000000000 -0400
11912+++ linux-2.6.32.46/arch/x86/Kconfig 2011-10-07 08:11:49.000000000 -0400
11913@@ -223,7 +223,7 @@ config X86_TRAMPOLINE
11914
11915 config X86_32_LAZY_GS
11916 def_bool y
11917- depends on X86_32 && !CC_STACKPROTECTOR
11918+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
11919
11920 config KTIME_SCALAR
11921 def_bool X86_32
11922@@ -1008,7 +1008,7 @@ choice
11923
11924 config NOHIGHMEM
11925 bool "off"
11926- depends on !X86_NUMAQ
11927+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
11928 ---help---
11929 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
11930 However, the address space of 32-bit x86 processors is only 4
11931@@ -1045,7 +1045,7 @@ config NOHIGHMEM
11932
11933 config HIGHMEM4G
11934 bool "4GB"
11935- depends on !X86_NUMAQ
11936+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
11937 ---help---
11938 Select this if you have a 32-bit processor and between 1 and 4
11939 gigabytes of physical RAM.
11940@@ -1099,7 +1099,7 @@ config PAGE_OFFSET
11941 hex
11942 default 0xB0000000 if VMSPLIT_3G_OPT
11943 default 0x80000000 if VMSPLIT_2G
11944- default 0x78000000 if VMSPLIT_2G_OPT
11945+ default 0x70000000 if VMSPLIT_2G_OPT
11946 default 0x40000000 if VMSPLIT_1G
11947 default 0xC0000000
11948 depends on X86_32
11949@@ -1460,6 +1460,7 @@ config SECCOMP
11950
11951 config CC_STACKPROTECTOR
11952 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
11953+ depends on X86_64 || !PAX_MEMORY_UDEREF
11954 ---help---
11955 This option turns on the -fstack-protector GCC feature. This
11956 feature puts, at the beginning of functions, a canary value on
11957@@ -1517,6 +1518,7 @@ config KEXEC_JUMP
11958 config PHYSICAL_START
11959 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
11960 default "0x1000000"
11961+ range 0x400000 0x40000000
11962 ---help---
11963 This gives the physical address where the kernel is loaded.
11964
11965@@ -1581,6 +1583,7 @@ config PHYSICAL_ALIGN
11966 hex
11967 prompt "Alignment value to which kernel should be aligned" if X86_32
11968 default "0x1000000"
11969+ range 0x400000 0x1000000 if PAX_KERNEXEC
11970 range 0x2000 0x1000000
11971 ---help---
11972 This value puts the alignment restrictions on physical address
11973@@ -1612,9 +1615,10 @@ config HOTPLUG_CPU
11974 Say N if you want to disable CPU hotplug.
11975
11976 config COMPAT_VDSO
11977- def_bool y
11978+ def_bool n
11979 prompt "Compat VDSO support"
11980 depends on X86_32 || IA32_EMULATION
11981+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
11982 ---help---
11983 Map the 32-bit VDSO to the predictable old-style address too.
11984 ---help---
11985diff -urNp linux-2.6.32.46/arch/x86/Kconfig.cpu linux-2.6.32.46/arch/x86/Kconfig.cpu
11986--- linux-2.6.32.46/arch/x86/Kconfig.cpu 2011-03-27 14:31:47.000000000 -0400
11987+++ linux-2.6.32.46/arch/x86/Kconfig.cpu 2011-04-17 15:56:46.000000000 -0400
11988@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
11989
11990 config X86_F00F_BUG
11991 def_bool y
11992- depends on M586MMX || M586TSC || M586 || M486 || M386
11993+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
11994
11995 config X86_WP_WORKS_OK
11996 def_bool y
11997@@ -360,7 +360,7 @@ config X86_POPAD_OK
11998
11999 config X86_ALIGNMENT_16
12000 def_bool y
12001- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12002+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12003
12004 config X86_INTEL_USERCOPY
12005 def_bool y
12006@@ -406,7 +406,7 @@ config X86_CMPXCHG64
12007 # generates cmov.
12008 config X86_CMOV
12009 def_bool y
12010- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
12011+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
12012
12013 config X86_MINIMUM_CPU_FAMILY
12014 int
12015diff -urNp linux-2.6.32.46/arch/x86/Kconfig.debug linux-2.6.32.46/arch/x86/Kconfig.debug
12016--- linux-2.6.32.46/arch/x86/Kconfig.debug 2011-03-27 14:31:47.000000000 -0400
12017+++ linux-2.6.32.46/arch/x86/Kconfig.debug 2011-04-17 15:56:46.000000000 -0400
12018@@ -99,7 +99,7 @@ config X86_PTDUMP
12019 config DEBUG_RODATA
12020 bool "Write protect kernel read-only data structures"
12021 default y
12022- depends on DEBUG_KERNEL
12023+ depends on DEBUG_KERNEL && BROKEN
12024 ---help---
12025 Mark the kernel read-only data as write-protected in the pagetables,
12026 in order to catch accidental (and incorrect) writes to such const
12027diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile
12028--- linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile 2011-03-27 14:31:47.000000000 -0400
12029+++ linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile 2011-08-07 14:38:58.000000000 -0400
12030@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
12031 $(call cc-option, -fno-stack-protector) \
12032 $(call cc-option, -mpreferred-stack-boundary=2)
12033 KBUILD_CFLAGS += $(call cc-option, -m32)
12034+ifdef CONSTIFY_PLUGIN
12035+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
12036+endif
12037 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12038 GCOV_PROFILE := n
12039
12040diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S
12041--- linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S 2011-03-27 14:31:47.000000000 -0400
12042+++ linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-01 18:53:40.000000000 -0400
12043@@ -91,6 +91,9 @@ _start:
12044 /* Do any other stuff... */
12045
12046 #ifndef CONFIG_64BIT
12047+ /* Recheck NX bit overrides (64bit path does this in trampoline) */
12048+ call verify_cpu
12049+
12050 /* This could also be done in C code... */
12051 movl pmode_cr3, %eax
12052 movl %eax, %cr3
12053@@ -104,7 +107,7 @@ _start:
12054 movl %eax, %ecx
12055 orl %edx, %ecx
12056 jz 1f
12057- movl $0xc0000080, %ecx
12058+ mov $MSR_EFER, %ecx
12059 wrmsr
12060 1:
12061
12062@@ -114,6 +117,7 @@ _start:
12063 movl pmode_cr0, %eax
12064 movl %eax, %cr0
12065 jmp pmode_return
12066+# include "../../verify_cpu.S"
12067 #else
12068 pushw $0
12069 pushw trampoline_segment
12070diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c
12071--- linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c 2011-03-27 14:31:47.000000000 -0400
12072+++ linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c 2011-07-01 19:01:34.000000000 -0400
12073@@ -11,11 +11,12 @@
12074 #include <linux/cpumask.h>
12075 #include <asm/segment.h>
12076 #include <asm/desc.h>
12077+#include <asm/e820.h>
12078
12079 #include "realmode/wakeup.h"
12080 #include "sleep.h"
12081
12082-unsigned long acpi_wakeup_address;
12083+unsigned long acpi_wakeup_address = 0x2000;
12084 unsigned long acpi_realmode_flags;
12085
12086 /* address in low memory of the wakeup routine. */
12087@@ -98,9 +99,13 @@ int acpi_save_state_mem(void)
12088 #else /* CONFIG_64BIT */
12089 header->trampoline_segment = setup_trampoline() >> 4;
12090 #ifdef CONFIG_SMP
12091- stack_start.sp = temp_stack + sizeof(temp_stack);
12092+ stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
12093+
12094+ pax_open_kernel();
12095 early_gdt_descr.address =
12096 (unsigned long)get_cpu_gdt_table(smp_processor_id());
12097+ pax_close_kernel();
12098+
12099 initial_gs = per_cpu_offset(smp_processor_id());
12100 #endif
12101 initial_code = (unsigned long)wakeup_long64;
12102@@ -134,14 +139,8 @@ void __init acpi_reserve_bootmem(void)
12103 return;
12104 }
12105
12106- acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
12107-
12108- if (!acpi_realmode) {
12109- printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
12110- return;
12111- }
12112-
12113- acpi_wakeup_address = virt_to_phys((void *)acpi_realmode);
12114+ reserve_early(acpi_wakeup_address, acpi_wakeup_address + WAKEUP_SIZE, "ACPI Wakeup Code");
12115+ acpi_realmode = (unsigned long)__va(acpi_wakeup_address);;
12116 }
12117
12118
12119diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S
12120--- linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S 2011-03-27 14:31:47.000000000 -0400
12121+++ linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:56:46.000000000 -0400
12122@@ -30,13 +30,11 @@ wakeup_pmode_return:
12123 # and restore the stack ... but you need gdt for this to work
12124 movl saved_context_esp, %esp
12125
12126- movl %cs:saved_magic, %eax
12127- cmpl $0x12345678, %eax
12128+ cmpl $0x12345678, saved_magic
12129 jne bogus_magic
12130
12131 # jump to place where we left off
12132- movl saved_eip, %eax
12133- jmp *%eax
12134+ jmp *(saved_eip)
12135
12136 bogus_magic:
12137 jmp bogus_magic
12138diff -urNp linux-2.6.32.46/arch/x86/kernel/alternative.c linux-2.6.32.46/arch/x86/kernel/alternative.c
12139--- linux-2.6.32.46/arch/x86/kernel/alternative.c 2011-03-27 14:31:47.000000000 -0400
12140+++ linux-2.6.32.46/arch/x86/kernel/alternative.c 2011-04-17 15:56:46.000000000 -0400
12141@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
12142
12143 BUG_ON(p->len > MAX_PATCH_LEN);
12144 /* prep the buffer with the original instructions */
12145- memcpy(insnbuf, p->instr, p->len);
12146+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
12147 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
12148 (unsigned long)p->instr, p->len);
12149
12150@@ -475,7 +475,7 @@ void __init alternative_instructions(voi
12151 if (smp_alt_once)
12152 free_init_pages("SMP alternatives",
12153 (unsigned long)__smp_locks,
12154- (unsigned long)__smp_locks_end);
12155+ PAGE_ALIGN((unsigned long)__smp_locks_end));
12156
12157 restart_nmi();
12158 }
12159@@ -492,13 +492,17 @@ void __init alternative_instructions(voi
12160 * instructions. And on the local CPU you need to be protected again NMI or MCE
12161 * handlers seeing an inconsistent instruction while you patch.
12162 */
12163-static void *__init_or_module text_poke_early(void *addr, const void *opcode,
12164+static void *__kprobes text_poke_early(void *addr, const void *opcode,
12165 size_t len)
12166 {
12167 unsigned long flags;
12168 local_irq_save(flags);
12169- memcpy(addr, opcode, len);
12170+
12171+ pax_open_kernel();
12172+ memcpy(ktla_ktva(addr), opcode, len);
12173 sync_core();
12174+ pax_close_kernel();
12175+
12176 local_irq_restore(flags);
12177 /* Could also do a CLFLUSH here to speed up CPU recovery; but
12178 that causes hangs on some VIA CPUs. */
12179@@ -520,35 +524,21 @@ static void *__init_or_module text_poke_
12180 */
12181 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
12182 {
12183- unsigned long flags;
12184- char *vaddr;
12185+ unsigned char *vaddr = ktla_ktva(addr);
12186 struct page *pages[2];
12187- int i;
12188+ size_t i;
12189
12190 if (!core_kernel_text((unsigned long)addr)) {
12191- pages[0] = vmalloc_to_page(addr);
12192- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
12193+ pages[0] = vmalloc_to_page(vaddr);
12194+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
12195 } else {
12196- pages[0] = virt_to_page(addr);
12197+ pages[0] = virt_to_page(vaddr);
12198 WARN_ON(!PageReserved(pages[0]));
12199- pages[1] = virt_to_page(addr + PAGE_SIZE);
12200+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
12201 }
12202 BUG_ON(!pages[0]);
12203- local_irq_save(flags);
12204- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
12205- if (pages[1])
12206- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
12207- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
12208- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
12209- clear_fixmap(FIX_TEXT_POKE0);
12210- if (pages[1])
12211- clear_fixmap(FIX_TEXT_POKE1);
12212- local_flush_tlb();
12213- sync_core();
12214- /* Could also do a CLFLUSH here to speed up CPU recovery; but
12215- that causes hangs on some VIA CPUs. */
12216+ text_poke_early(addr, opcode, len);
12217 for (i = 0; i < len; i++)
12218- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
12219- local_irq_restore(flags);
12220+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
12221 return addr;
12222 }
12223diff -urNp linux-2.6.32.46/arch/x86/kernel/amd_iommu.c linux-2.6.32.46/arch/x86/kernel/amd_iommu.c
12224--- linux-2.6.32.46/arch/x86/kernel/amd_iommu.c 2011-03-27 14:31:47.000000000 -0400
12225+++ linux-2.6.32.46/arch/x86/kernel/amd_iommu.c 2011-04-17 15:56:46.000000000 -0400
12226@@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(
12227 }
12228 }
12229
12230-static struct dma_map_ops amd_iommu_dma_ops = {
12231+static const struct dma_map_ops amd_iommu_dma_ops = {
12232 .alloc_coherent = alloc_coherent,
12233 .free_coherent = free_coherent,
12234 .map_page = map_page,
12235diff -urNp linux-2.6.32.46/arch/x86/kernel/apic/apic.c linux-2.6.32.46/arch/x86/kernel/apic/apic.c
12236--- linux-2.6.32.46/arch/x86/kernel/apic/apic.c 2011-03-27 14:31:47.000000000 -0400
12237+++ linux-2.6.32.46/arch/x86/kernel/apic/apic.c 2011-08-17 20:00:16.000000000 -0400
12238@@ -170,7 +170,7 @@ int first_system_vector = 0xfe;
12239 /*
12240 * Debug level, exported for io_apic.c
12241 */
12242-unsigned int apic_verbosity;
12243+int apic_verbosity;
12244
12245 int pic_mode;
12246
12247@@ -1794,7 +1794,7 @@ void smp_error_interrupt(struct pt_regs
12248 apic_write(APIC_ESR, 0);
12249 v1 = apic_read(APIC_ESR);
12250 ack_APIC_irq();
12251- atomic_inc(&irq_err_count);
12252+ atomic_inc_unchecked(&irq_err_count);
12253
12254 /*
12255 * Here is what the APIC error bits mean:
12256@@ -2184,6 +2184,8 @@ static int __cpuinit apic_cluster_num(vo
12257 u16 *bios_cpu_apicid;
12258 DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
12259
12260+ pax_track_stack();
12261+
12262 bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
12263 bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
12264
12265diff -urNp linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c
12266--- linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c 2011-03-27 14:31:47.000000000 -0400
12267+++ linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c 2011-05-04 17:56:20.000000000 -0400
12268@@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi
12269 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
12270 GFP_ATOMIC);
12271 if (!ioapic_entries)
12272- return 0;
12273+ return NULL;
12274
12275 for (apic = 0; apic < nr_ioapics; apic++) {
12276 ioapic_entries[apic] =
12277@@ -733,7 +733,7 @@ nomem:
12278 kfree(ioapic_entries[apic]);
12279 kfree(ioapic_entries);
12280
12281- return 0;
12282+ return NULL;
12283 }
12284
12285 /*
12286@@ -1150,7 +1150,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
12287 }
12288 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
12289
12290-void lock_vector_lock(void)
12291+void lock_vector_lock(void) __acquires(vector_lock)
12292 {
12293 /* Used to the online set of cpus does not change
12294 * during assign_irq_vector.
12295@@ -1158,7 +1158,7 @@ void lock_vector_lock(void)
12296 spin_lock(&vector_lock);
12297 }
12298
12299-void unlock_vector_lock(void)
12300+void unlock_vector_lock(void) __releases(vector_lock)
12301 {
12302 spin_unlock(&vector_lock);
12303 }
12304@@ -2542,7 +2542,7 @@ static void ack_apic_edge(unsigned int i
12305 ack_APIC_irq();
12306 }
12307
12308-atomic_t irq_mis_count;
12309+atomic_unchecked_t irq_mis_count;
12310
12311 static void ack_apic_level(unsigned int irq)
12312 {
12313@@ -2626,7 +2626,7 @@ static void ack_apic_level(unsigned int
12314
12315 /* Tail end of version 0x11 I/O APIC bug workaround */
12316 if (!(v & (1 << (i & 0x1f)))) {
12317- atomic_inc(&irq_mis_count);
12318+ atomic_inc_unchecked(&irq_mis_count);
12319 spin_lock(&ioapic_lock);
12320 __mask_and_edge_IO_APIC_irq(cfg);
12321 __unmask_and_level_IO_APIC_irq(cfg);
12322diff -urNp linux-2.6.32.46/arch/x86/kernel/apm_32.c linux-2.6.32.46/arch/x86/kernel/apm_32.c
12323--- linux-2.6.32.46/arch/x86/kernel/apm_32.c 2011-03-27 14:31:47.000000000 -0400
12324+++ linux-2.6.32.46/arch/x86/kernel/apm_32.c 2011-04-23 12:56:10.000000000 -0400
12325@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
12326 * This is for buggy BIOS's that refer to (real mode) segment 0x40
12327 * even though they are called in protected mode.
12328 */
12329-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
12330+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
12331 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
12332
12333 static const char driver_version[] = "1.16ac"; /* no spaces */
12334@@ -588,7 +588,10 @@ static long __apm_bios_call(void *_call)
12335 BUG_ON(cpu != 0);
12336 gdt = get_cpu_gdt_table(cpu);
12337 save_desc_40 = gdt[0x40 / 8];
12338+
12339+ pax_open_kernel();
12340 gdt[0x40 / 8] = bad_bios_desc;
12341+ pax_close_kernel();
12342
12343 apm_irq_save(flags);
12344 APM_DO_SAVE_SEGS;
12345@@ -597,7 +600,11 @@ static long __apm_bios_call(void *_call)
12346 &call->esi);
12347 APM_DO_RESTORE_SEGS;
12348 apm_irq_restore(flags);
12349+
12350+ pax_open_kernel();
12351 gdt[0x40 / 8] = save_desc_40;
12352+ pax_close_kernel();
12353+
12354 put_cpu();
12355
12356 return call->eax & 0xff;
12357@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void
12358 BUG_ON(cpu != 0);
12359 gdt = get_cpu_gdt_table(cpu);
12360 save_desc_40 = gdt[0x40 / 8];
12361+
12362+ pax_open_kernel();
12363 gdt[0x40 / 8] = bad_bios_desc;
12364+ pax_close_kernel();
12365
12366 apm_irq_save(flags);
12367 APM_DO_SAVE_SEGS;
12368@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void
12369 &call->eax);
12370 APM_DO_RESTORE_SEGS;
12371 apm_irq_restore(flags);
12372+
12373+ pax_open_kernel();
12374 gdt[0x40 / 8] = save_desc_40;
12375+ pax_close_kernel();
12376+
12377 put_cpu();
12378 return error;
12379 }
12380@@ -975,7 +989,7 @@ recalc:
12381
12382 static void apm_power_off(void)
12383 {
12384- unsigned char po_bios_call[] = {
12385+ const unsigned char po_bios_call[] = {
12386 0xb8, 0x00, 0x10, /* movw $0x1000,ax */
12387 0x8e, 0xd0, /* movw ax,ss */
12388 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */
12389@@ -2357,12 +2371,15 @@ static int __init apm_init(void)
12390 * code to that CPU.
12391 */
12392 gdt = get_cpu_gdt_table(0);
12393+
12394+ pax_open_kernel();
12395 set_desc_base(&gdt[APM_CS >> 3],
12396 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
12397 set_desc_base(&gdt[APM_CS_16 >> 3],
12398 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
12399 set_desc_base(&gdt[APM_DS >> 3],
12400 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
12401+ pax_close_kernel();
12402
12403 proc_create("apm", 0, NULL, &apm_file_ops);
12404
12405diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c
12406--- linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c 2011-03-27 14:31:47.000000000 -0400
12407+++ linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c 2011-05-16 21:46:57.000000000 -0400
12408@@ -51,7 +51,6 @@ void foo(void)
12409 OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
12410 BLANK();
12411
12412- OFFSET(TI_task, thread_info, task);
12413 OFFSET(TI_exec_domain, thread_info, exec_domain);
12414 OFFSET(TI_flags, thread_info, flags);
12415 OFFSET(TI_status, thread_info, status);
12416@@ -60,6 +59,8 @@ void foo(void)
12417 OFFSET(TI_restart_block, thread_info, restart_block);
12418 OFFSET(TI_sysenter_return, thread_info, sysenter_return);
12419 OFFSET(TI_cpu, thread_info, cpu);
12420+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
12421+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
12422 BLANK();
12423
12424 OFFSET(GDS_size, desc_ptr, size);
12425@@ -99,6 +100,7 @@ void foo(void)
12426
12427 DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
12428 DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
12429+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
12430 DEFINE(PTRS_PER_PTE, PTRS_PER_PTE);
12431 DEFINE(PTRS_PER_PMD, PTRS_PER_PMD);
12432 DEFINE(PTRS_PER_PGD, PTRS_PER_PGD);
12433@@ -115,6 +117,11 @@ void foo(void)
12434 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
12435 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
12436 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
12437+
12438+#ifdef CONFIG_PAX_KERNEXEC
12439+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
12440+#endif
12441+
12442 #endif
12443
12444 #ifdef CONFIG_XEN
12445diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c
12446--- linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c 2011-03-27 14:31:47.000000000 -0400
12447+++ linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c 2011-08-23 20:24:19.000000000 -0400
12448@@ -44,6 +44,8 @@ int main(void)
12449 ENTRY(addr_limit);
12450 ENTRY(preempt_count);
12451 ENTRY(status);
12452+ ENTRY(lowest_stack);
12453+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
12454 #ifdef CONFIG_IA32_EMULATION
12455 ENTRY(sysenter_return);
12456 #endif
12457@@ -63,6 +65,18 @@ int main(void)
12458 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
12459 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
12460 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
12461+
12462+#ifdef CONFIG_PAX_KERNEXEC
12463+ OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
12464+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
12465+#endif
12466+
12467+#ifdef CONFIG_PAX_MEMORY_UDEREF
12468+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
12469+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
12470+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
12471+#endif
12472+
12473 #endif
12474
12475
12476@@ -115,6 +129,7 @@ int main(void)
12477 ENTRY(cr8);
12478 BLANK();
12479 #undef ENTRY
12480+ DEFINE(TSS_size, sizeof(struct tss_struct));
12481 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
12482 BLANK();
12483 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
12484@@ -130,6 +145,7 @@ int main(void)
12485
12486 BLANK();
12487 DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
12488+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
12489 #ifdef CONFIG_XEN
12490 BLANK();
12491 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
12492diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/amd.c linux-2.6.32.46/arch/x86/kernel/cpu/amd.c
12493--- linux-2.6.32.46/arch/x86/kernel/cpu/amd.c 2011-06-25 12:55:34.000000000 -0400
12494+++ linux-2.6.32.46/arch/x86/kernel/cpu/amd.c 2011-06-25 12:56:37.000000000 -0400
12495@@ -602,7 +602,7 @@ static unsigned int __cpuinit amd_size_c
12496 unsigned int size)
12497 {
12498 /* AMD errata T13 (order #21922) */
12499- if ((c->x86 == 6)) {
12500+ if (c->x86 == 6) {
12501 /* Duron Rev A0 */
12502 if (c->x86_model == 3 && c->x86_mask == 0)
12503 size = 64;
12504diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/common.c linux-2.6.32.46/arch/x86/kernel/cpu/common.c
12505--- linux-2.6.32.46/arch/x86/kernel/cpu/common.c 2011-03-27 14:31:47.000000000 -0400
12506+++ linux-2.6.32.46/arch/x86/kernel/cpu/common.c 2011-05-11 18:25:15.000000000 -0400
12507@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
12508
12509 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
12510
12511-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
12512-#ifdef CONFIG_X86_64
12513- /*
12514- * We need valid kernel segments for data and code in long mode too
12515- * IRET will check the segment types kkeil 2000/10/28
12516- * Also sysret mandates a special GDT layout
12517- *
12518- * TLS descriptors are currently at a different place compared to i386.
12519- * Hopefully nobody expects them at a fixed place (Wine?)
12520- */
12521- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
12522- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
12523- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
12524- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
12525- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
12526- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
12527-#else
12528- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
12529- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
12530- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
12531- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
12532- /*
12533- * Segments used for calling PnP BIOS have byte granularity.
12534- * They code segments and data segments have fixed 64k limits,
12535- * the transfer segment sizes are set at run time.
12536- */
12537- /* 32-bit code */
12538- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
12539- /* 16-bit code */
12540- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
12541- /* 16-bit data */
12542- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
12543- /* 16-bit data */
12544- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
12545- /* 16-bit data */
12546- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
12547- /*
12548- * The APM segments have byte granularity and their bases
12549- * are set at run time. All have 64k limits.
12550- */
12551- /* 32-bit code */
12552- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
12553- /* 16-bit code */
12554- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
12555- /* data */
12556- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
12557-
12558- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
12559- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
12560- GDT_STACK_CANARY_INIT
12561-#endif
12562-} };
12563-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
12564-
12565 static int __init x86_xsave_setup(char *s)
12566 {
12567 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
12568@@ -344,7 +290,7 @@ void switch_to_new_gdt(int cpu)
12569 {
12570 struct desc_ptr gdt_descr;
12571
12572- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
12573+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
12574 gdt_descr.size = GDT_SIZE - 1;
12575 load_gdt(&gdt_descr);
12576 /* Reload the per-cpu base */
12577@@ -798,6 +744,10 @@ static void __cpuinit identify_cpu(struc
12578 /* Filter out anything that depends on CPUID levels we don't have */
12579 filter_cpuid_features(c, true);
12580
12581+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || (defined(CONFIG_PAX_MEMORY_UDEREF) && defined(CONFIG_X86_32))
12582+ setup_clear_cpu_cap(X86_FEATURE_SEP);
12583+#endif
12584+
12585 /* If the model name is still unset, do table lookup. */
12586 if (!c->x86_model_id[0]) {
12587 const char *p;
12588@@ -980,6 +930,9 @@ static __init int setup_disablecpuid(cha
12589 }
12590 __setup("clearcpuid=", setup_disablecpuid);
12591
12592+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
12593+EXPORT_PER_CPU_SYMBOL(current_tinfo);
12594+
12595 #ifdef CONFIG_X86_64
12596 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
12597
12598@@ -995,7 +948,7 @@ DEFINE_PER_CPU(struct task_struct *, cur
12599 EXPORT_PER_CPU_SYMBOL(current_task);
12600
12601 DEFINE_PER_CPU(unsigned long, kernel_stack) =
12602- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
12603+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
12604 EXPORT_PER_CPU_SYMBOL(kernel_stack);
12605
12606 DEFINE_PER_CPU(char *, irq_stack_ptr) =
12607@@ -1060,7 +1013,7 @@ struct pt_regs * __cpuinit idle_regs(str
12608 {
12609 memset(regs, 0, sizeof(struct pt_regs));
12610 regs->fs = __KERNEL_PERCPU;
12611- regs->gs = __KERNEL_STACK_CANARY;
12612+ savesegment(gs, regs->gs);
12613
12614 return regs;
12615 }
12616@@ -1101,7 +1054,7 @@ void __cpuinit cpu_init(void)
12617 int i;
12618
12619 cpu = stack_smp_processor_id();
12620- t = &per_cpu(init_tss, cpu);
12621+ t = init_tss + cpu;
12622 orig_ist = &per_cpu(orig_ist, cpu);
12623
12624 #ifdef CONFIG_NUMA
12625@@ -1127,7 +1080,7 @@ void __cpuinit cpu_init(void)
12626 switch_to_new_gdt(cpu);
12627 loadsegment(fs, 0);
12628
12629- load_idt((const struct desc_ptr *)&idt_descr);
12630+ load_idt(&idt_descr);
12631
12632 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
12633 syscall_init();
12634@@ -1136,7 +1089,6 @@ void __cpuinit cpu_init(void)
12635 wrmsrl(MSR_KERNEL_GS_BASE, 0);
12636 barrier();
12637
12638- check_efer();
12639 if (cpu != 0)
12640 enable_x2apic();
12641
12642@@ -1199,7 +1151,7 @@ void __cpuinit cpu_init(void)
12643 {
12644 int cpu = smp_processor_id();
12645 struct task_struct *curr = current;
12646- struct tss_struct *t = &per_cpu(init_tss, cpu);
12647+ struct tss_struct *t = init_tss + cpu;
12648 struct thread_struct *thread = &curr->thread;
12649
12650 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
12651diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel.c linux-2.6.32.46/arch/x86/kernel/cpu/intel.c
12652--- linux-2.6.32.46/arch/x86/kernel/cpu/intel.c 2011-03-27 14:31:47.000000000 -0400
12653+++ linux-2.6.32.46/arch/x86/kernel/cpu/intel.c 2011-04-17 15:56:46.000000000 -0400
12654@@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug
12655 * Update the IDT descriptor and reload the IDT so that
12656 * it uses the read-only mapped virtual address.
12657 */
12658- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
12659+ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
12660 load_idt(&idt_descr);
12661 }
12662 #endif
12663diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c
12664--- linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-03-27 14:31:47.000000000 -0400
12665+++ linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-04-17 15:56:46.000000000 -0400
12666@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
12667 return ret;
12668 }
12669
12670-static struct sysfs_ops sysfs_ops = {
12671+static const struct sysfs_ops sysfs_ops = {
12672 .show = show,
12673 .store = store,
12674 };
12675diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/Makefile linux-2.6.32.46/arch/x86/kernel/cpu/Makefile
12676--- linux-2.6.32.46/arch/x86/kernel/cpu/Makefile 2011-03-27 14:31:47.000000000 -0400
12677+++ linux-2.6.32.46/arch/x86/kernel/cpu/Makefile 2011-04-17 15:56:46.000000000 -0400
12678@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
12679 CFLAGS_REMOVE_common.o = -pg
12680 endif
12681
12682-# Make sure load_percpu_segment has no stackprotector
12683-nostackp := $(call cc-option, -fno-stack-protector)
12684-CFLAGS_common.o := $(nostackp)
12685-
12686 obj-y := intel_cacheinfo.o addon_cpuid_features.o
12687 obj-y += proc.o capflags.o powerflags.o common.o
12688 obj-y += vmware.o hypervisor.o sched.o
12689diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c
12690--- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-05-23 16:56:59.000000000 -0400
12691+++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-05-23 16:57:13.000000000 -0400
12692@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
12693 return ret;
12694 }
12695
12696-static struct sysfs_ops threshold_ops = {
12697+static const struct sysfs_ops threshold_ops = {
12698 .show = show,
12699 .store = store,
12700 };
12701diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c
12702--- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-27 14:31:47.000000000 -0400
12703+++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-04 17:56:20.000000000 -0400
12704@@ -43,6 +43,7 @@
12705 #include <asm/ipi.h>
12706 #include <asm/mce.h>
12707 #include <asm/msr.h>
12708+#include <asm/local.h>
12709
12710 #include "mce-internal.h"
12711
12712@@ -187,7 +188,7 @@ static void print_mce(struct mce *m)
12713 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
12714 m->cs, m->ip);
12715
12716- if (m->cs == __KERNEL_CS)
12717+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
12718 print_symbol("{%s}", m->ip);
12719 pr_cont("\n");
12720 }
12721@@ -221,10 +222,10 @@ static void print_mce_tail(void)
12722
12723 #define PANIC_TIMEOUT 5 /* 5 seconds */
12724
12725-static atomic_t mce_paniced;
12726+static atomic_unchecked_t mce_paniced;
12727
12728 static int fake_panic;
12729-static atomic_t mce_fake_paniced;
12730+static atomic_unchecked_t mce_fake_paniced;
12731
12732 /* Panic in progress. Enable interrupts and wait for final IPI */
12733 static void wait_for_panic(void)
12734@@ -248,7 +249,7 @@ static void mce_panic(char *msg, struct
12735 /*
12736 * Make sure only one CPU runs in machine check panic
12737 */
12738- if (atomic_inc_return(&mce_paniced) > 1)
12739+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
12740 wait_for_panic();
12741 barrier();
12742
12743@@ -256,7 +257,7 @@ static void mce_panic(char *msg, struct
12744 console_verbose();
12745 } else {
12746 /* Don't log too much for fake panic */
12747- if (atomic_inc_return(&mce_fake_paniced) > 1)
12748+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
12749 return;
12750 }
12751 print_mce_head();
12752@@ -616,7 +617,7 @@ static int mce_timed_out(u64 *t)
12753 * might have been modified by someone else.
12754 */
12755 rmb();
12756- if (atomic_read(&mce_paniced))
12757+ if (atomic_read_unchecked(&mce_paniced))
12758 wait_for_panic();
12759 if (!monarch_timeout)
12760 goto out;
12761@@ -1429,14 +1430,14 @@ void __cpuinit mcheck_init(struct cpuinf
12762 */
12763
12764 static DEFINE_SPINLOCK(mce_state_lock);
12765-static int open_count; /* #times opened */
12766+static local_t open_count; /* #times opened */
12767 static int open_exclu; /* already open exclusive? */
12768
12769 static int mce_open(struct inode *inode, struct file *file)
12770 {
12771 spin_lock(&mce_state_lock);
12772
12773- if (open_exclu || (open_count && (file->f_flags & O_EXCL))) {
12774+ if (open_exclu || (local_read(&open_count) && (file->f_flags & O_EXCL))) {
12775 spin_unlock(&mce_state_lock);
12776
12777 return -EBUSY;
12778@@ -1444,7 +1445,7 @@ static int mce_open(struct inode *inode,
12779
12780 if (file->f_flags & O_EXCL)
12781 open_exclu = 1;
12782- open_count++;
12783+ local_inc(&open_count);
12784
12785 spin_unlock(&mce_state_lock);
12786
12787@@ -1455,7 +1456,7 @@ static int mce_release(struct inode *ino
12788 {
12789 spin_lock(&mce_state_lock);
12790
12791- open_count--;
12792+ local_dec(&open_count);
12793 open_exclu = 0;
12794
12795 spin_unlock(&mce_state_lock);
12796@@ -2082,7 +2083,7 @@ struct dentry *mce_get_debugfs_dir(void)
12797 static void mce_reset(void)
12798 {
12799 cpu_missing = 0;
12800- atomic_set(&mce_fake_paniced, 0);
12801+ atomic_set_unchecked(&mce_fake_paniced, 0);
12802 atomic_set(&mce_executing, 0);
12803 atomic_set(&mce_callin, 0);
12804 atomic_set(&global_nwo, 0);
12805diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c
12806--- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-03-27 14:31:47.000000000 -0400
12807+++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-08-05 20:33:55.000000000 -0400
12808@@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *fi
12809 static int inject_init(void)
12810 {
12811 printk(KERN_INFO "Machine check injector initialized\n");
12812- mce_chrdev_ops.write = mce_write;
12813+ pax_open_kernel();
12814+ *(void **)&mce_chrdev_ops.write = mce_write;
12815+ pax_close_kernel();
12816 register_die_notifier(&mce_raise_nb);
12817 return 0;
12818 }
12819diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c
12820--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c 2011-03-27 14:31:47.000000000 -0400
12821+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c 2011-04-17 15:56:46.000000000 -0400
12822@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
12823 return 0;
12824 }
12825
12826-static struct mtrr_ops amd_mtrr_ops = {
12827+static const struct mtrr_ops amd_mtrr_ops = {
12828 .vendor = X86_VENDOR_AMD,
12829 .set = amd_set_mtrr,
12830 .get = amd_get_mtrr,
12831diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c
12832--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c 2011-03-27 14:31:47.000000000 -0400
12833+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c 2011-04-17 15:56:46.000000000 -0400
12834@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
12835 return 0;
12836 }
12837
12838-static struct mtrr_ops centaur_mtrr_ops = {
12839+static const struct mtrr_ops centaur_mtrr_ops = {
12840 .vendor = X86_VENDOR_CENTAUR,
12841 .set = centaur_set_mcr,
12842 .get = centaur_get_mcr,
12843diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c
12844--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-03-27 14:31:47.000000000 -0400
12845+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-04-17 15:56:46.000000000 -0400
12846@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
12847 post_set();
12848 }
12849
12850-static struct mtrr_ops cyrix_mtrr_ops = {
12851+static const struct mtrr_ops cyrix_mtrr_ops = {
12852 .vendor = X86_VENDOR_CYRIX,
12853 .set_all = cyrix_set_all,
12854 .set = cyrix_set_arr,
12855diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c
12856--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-27 14:31:47.000000000 -0400
12857+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-23 12:56:10.000000000 -0400
12858@@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
12859 /*
12860 * Generic structure...
12861 */
12862-struct mtrr_ops generic_mtrr_ops = {
12863+const struct mtrr_ops generic_mtrr_ops = {
12864 .use_intel_if = 1,
12865 .set_all = generic_set_all,
12866 .get = generic_get_mtrr,
12867diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c
12868--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:00:52.000000000 -0400
12869+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:03:05.000000000 -0400
12870@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
12871 u64 size_or_mask, size_and_mask;
12872 static bool mtrr_aps_delayed_init;
12873
12874-static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
12875+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
12876
12877-struct mtrr_ops *mtrr_if;
12878+const struct mtrr_ops *mtrr_if;
12879
12880 static void set_mtrr(unsigned int reg, unsigned long base,
12881 unsigned long size, mtrr_type type);
12882
12883-void set_mtrr_ops(struct mtrr_ops *ops)
12884+void set_mtrr_ops(const struct mtrr_ops *ops)
12885 {
12886 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
12887 mtrr_ops[ops->vendor] = ops;
12888diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h
12889--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-27 14:31:47.000000000 -0400
12890+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-08-26 20:23:57.000000000 -0400
12891@@ -25,14 +25,14 @@ struct mtrr_ops {
12892 int (*validate_add_page)(unsigned long base, unsigned long size,
12893 unsigned int type);
12894 int (*have_wrcomb)(void);
12895-};
12896+} __do_const;
12897
12898 extern int generic_get_free_region(unsigned long base, unsigned long size,
12899 int replace_reg);
12900 extern int generic_validate_add_page(unsigned long base, unsigned long size,
12901 unsigned int type);
12902
12903-extern struct mtrr_ops generic_mtrr_ops;
12904+extern const struct mtrr_ops generic_mtrr_ops;
12905
12906 extern int positive_have_wrcomb(void);
12907
12908@@ -53,10 +53,10 @@ void fill_mtrr_var_range(unsigned int in
12909 u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
12910 void get_mtrr_state(void);
12911
12912-extern void set_mtrr_ops(struct mtrr_ops *ops);
12913+extern void set_mtrr_ops(const struct mtrr_ops *ops);
12914
12915 extern u64 size_or_mask, size_and_mask;
12916-extern struct mtrr_ops *mtrr_if;
12917+extern const struct mtrr_ops *mtrr_if;
12918
12919 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
12920 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
12921diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c
12922--- linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-03-27 14:31:47.000000000 -0400
12923+++ linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-04-17 15:56:46.000000000 -0400
12924@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
12925
12926 /* Interface defining a CPU specific perfctr watchdog */
12927 struct wd_ops {
12928- int (*reserve)(void);
12929- void (*unreserve)(void);
12930- int (*setup)(unsigned nmi_hz);
12931- void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
12932- void (*stop)(void);
12933+ int (* const reserve)(void);
12934+ void (* const unreserve)(void);
12935+ int (* const setup)(unsigned nmi_hz);
12936+ void (* const rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
12937+ void (* const stop)(void);
12938 unsigned perfctr;
12939 unsigned evntsel;
12940 u64 checkbit;
12941@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = {
12942 #define ARCH_PERFMON_NMI_EVENT_SEL ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
12943 #define ARCH_PERFMON_NMI_EVENT_UMASK ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
12944
12945+/* cannot be const */
12946 static struct wd_ops intel_arch_wd_ops;
12947
12948 static int setup_intel_arch_watchdog(unsigned nmi_hz)
12949@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(uns
12950 return 1;
12951 }
12952
12953+/* cannot be const */
12954 static struct wd_ops intel_arch_wd_ops __read_mostly = {
12955 .reserve = single_msr_reserve,
12956 .unreserve = single_msr_unreserve,
12957diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c
12958--- linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c 2011-03-27 14:31:47.000000000 -0400
12959+++ linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c 2011-05-04 17:56:20.000000000 -0400
12960@@ -723,10 +723,10 @@ x86_perf_event_update(struct perf_event
12961 * count to the generic event atomically:
12962 */
12963 again:
12964- prev_raw_count = atomic64_read(&hwc->prev_count);
12965+ prev_raw_count = atomic64_read_unchecked(&hwc->prev_count);
12966 rdmsrl(hwc->event_base + idx, new_raw_count);
12967
12968- if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
12969+ if (atomic64_cmpxchg_unchecked(&hwc->prev_count, prev_raw_count,
12970 new_raw_count) != prev_raw_count)
12971 goto again;
12972
12973@@ -741,7 +741,7 @@ again:
12974 delta = (new_raw_count << shift) - (prev_raw_count << shift);
12975 delta >>= shift;
12976
12977- atomic64_add(delta, &event->count);
12978+ atomic64_add_unchecked(delta, &event->count);
12979 atomic64_sub(delta, &hwc->period_left);
12980
12981 return new_raw_count;
12982@@ -1353,7 +1353,7 @@ x86_perf_event_set_period(struct perf_ev
12983 * The hw event starts counting from this event offset,
12984 * mark it to be able to extra future deltas:
12985 */
12986- atomic64_set(&hwc->prev_count, (u64)-left);
12987+ atomic64_set_unchecked(&hwc->prev_count, (u64)-left);
12988
12989 err = checking_wrmsrl(hwc->event_base + idx,
12990 (u64)(-left) & x86_pmu.event_mask);
12991@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
12992 break;
12993
12994 callchain_store(entry, frame.return_address);
12995- fp = frame.next_frame;
12996+ fp = (__force const void __user *)frame.next_frame;
12997 }
12998 }
12999
13000diff -urNp linux-2.6.32.46/arch/x86/kernel/crash.c linux-2.6.32.46/arch/x86/kernel/crash.c
13001--- linux-2.6.32.46/arch/x86/kernel/crash.c 2011-03-27 14:31:47.000000000 -0400
13002+++ linux-2.6.32.46/arch/x86/kernel/crash.c 2011-04-17 15:56:46.000000000 -0400
13003@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
13004 regs = args->regs;
13005
13006 #ifdef CONFIG_X86_32
13007- if (!user_mode_vm(regs)) {
13008+ if (!user_mode(regs)) {
13009 crash_fixup_ss_esp(&fixed_regs, regs);
13010 regs = &fixed_regs;
13011 }
13012diff -urNp linux-2.6.32.46/arch/x86/kernel/doublefault_32.c linux-2.6.32.46/arch/x86/kernel/doublefault_32.c
13013--- linux-2.6.32.46/arch/x86/kernel/doublefault_32.c 2011-03-27 14:31:47.000000000 -0400
13014+++ linux-2.6.32.46/arch/x86/kernel/doublefault_32.c 2011-04-17 15:56:46.000000000 -0400
13015@@ -11,7 +11,7 @@
13016
13017 #define DOUBLEFAULT_STACKSIZE (1024)
13018 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
13019-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
13020+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
13021
13022 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
13023
13024@@ -21,7 +21,7 @@ static void doublefault_fn(void)
13025 unsigned long gdt, tss;
13026
13027 store_gdt(&gdt_desc);
13028- gdt = gdt_desc.address;
13029+ gdt = (unsigned long)gdt_desc.address;
13030
13031 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
13032
13033@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cach
13034 /* 0x2 bit is always set */
13035 .flags = X86_EFLAGS_SF | 0x2,
13036 .sp = STACK_START,
13037- .es = __USER_DS,
13038+ .es = __KERNEL_DS,
13039 .cs = __KERNEL_CS,
13040 .ss = __KERNEL_DS,
13041- .ds = __USER_DS,
13042+ .ds = __KERNEL_DS,
13043 .fs = __KERNEL_PERCPU,
13044
13045 .__cr3 = __pa_nodebug(swapper_pg_dir),
13046diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c
13047--- linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c 2011-03-27 14:31:47.000000000 -0400
13048+++ linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:56:46.000000000 -0400
13049@@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task
13050 #endif
13051
13052 for (;;) {
13053- struct thread_info *context;
13054+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
13055+ bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
13056
13057- context = (struct thread_info *)
13058- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
13059- bp = print_context_stack(context, stack, bp, ops,
13060- data, NULL, &graph);
13061-
13062- stack = (unsigned long *)context->previous_esp;
13063- if (!stack)
13064+ if (stack_start == task_stack_page(task))
13065 break;
13066+ stack = *(unsigned long **)stack_start;
13067 if (ops->stack(data, "IRQ") < 0)
13068 break;
13069 touch_nmi_watchdog();
13070@@ -112,11 +108,12 @@ void show_registers(struct pt_regs *regs
13071 * When in-kernel, we also print out the stack and code at the
13072 * time of the fault..
13073 */
13074- if (!user_mode_vm(regs)) {
13075+ if (!user_mode(regs)) {
13076 unsigned int code_prologue = code_bytes * 43 / 64;
13077 unsigned int code_len = code_bytes;
13078 unsigned char c;
13079 u8 *ip;
13080+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
13081
13082 printk(KERN_EMERG "Stack:\n");
13083 show_stack_log_lvl(NULL, regs, &regs->sp,
13084@@ -124,10 +121,10 @@ void show_registers(struct pt_regs *regs
13085
13086 printk(KERN_EMERG "Code: ");
13087
13088- ip = (u8 *)regs->ip - code_prologue;
13089+ ip = (u8 *)regs->ip - code_prologue + cs_base;
13090 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
13091 /* try starting at IP */
13092- ip = (u8 *)regs->ip;
13093+ ip = (u8 *)regs->ip + cs_base;
13094 code_len = code_len - code_prologue + 1;
13095 }
13096 for (i = 0; i < code_len; i++, ip++) {
13097@@ -136,7 +133,7 @@ void show_registers(struct pt_regs *regs
13098 printk(" Bad EIP value.");
13099 break;
13100 }
13101- if (ip == (u8 *)regs->ip)
13102+ if (ip == (u8 *)regs->ip + cs_base)
13103 printk("<%02x> ", c);
13104 else
13105 printk("%02x ", c);
13106@@ -149,6 +146,7 @@ int is_valid_bugaddr(unsigned long ip)
13107 {
13108 unsigned short ud2;
13109
13110+ ip = ktla_ktva(ip);
13111 if (ip < PAGE_OFFSET)
13112 return 0;
13113 if (probe_kernel_address((unsigned short *)ip, ud2))
13114diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c
13115--- linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c 2011-03-27 14:31:47.000000000 -0400
13116+++ linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:56:46.000000000 -0400
13117@@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task
13118 unsigned long *irq_stack_end =
13119 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
13120 unsigned used = 0;
13121- struct thread_info *tinfo;
13122 int graph = 0;
13123+ void *stack_start;
13124
13125 if (!task)
13126 task = current;
13127@@ -146,10 +146,10 @@ void dump_trace(struct task_struct *task
13128 * current stack address. If the stacks consist of nested
13129 * exceptions
13130 */
13131- tinfo = task_thread_info(task);
13132 for (;;) {
13133 char *id;
13134 unsigned long *estack_end;
13135+
13136 estack_end = in_exception_stack(cpu, (unsigned long)stack,
13137 &used, &id);
13138
13139@@ -157,7 +157,7 @@ void dump_trace(struct task_struct *task
13140 if (ops->stack(data, id) < 0)
13141 break;
13142
13143- bp = print_context_stack(tinfo, stack, bp, ops,
13144+ bp = print_context_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
13145 data, estack_end, &graph);
13146 ops->stack(data, "<EOE>");
13147 /*
13148@@ -176,7 +176,7 @@ void dump_trace(struct task_struct *task
13149 if (stack >= irq_stack && stack < irq_stack_end) {
13150 if (ops->stack(data, "IRQ") < 0)
13151 break;
13152- bp = print_context_stack(tinfo, stack, bp,
13153+ bp = print_context_stack(task, irq_stack, stack, bp,
13154 ops, data, irq_stack_end, &graph);
13155 /*
13156 * We link to the next stack (which would be
13157@@ -195,7 +195,8 @@ void dump_trace(struct task_struct *task
13158 /*
13159 * This handles the process stack:
13160 */
13161- bp = print_context_stack(tinfo, stack, bp, ops, data, NULL, &graph);
13162+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
13163+ bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
13164 put_cpu();
13165 }
13166 EXPORT_SYMBOL(dump_trace);
13167diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.c linux-2.6.32.46/arch/x86/kernel/dumpstack.c
13168--- linux-2.6.32.46/arch/x86/kernel/dumpstack.c 2011-03-27 14:31:47.000000000 -0400
13169+++ linux-2.6.32.46/arch/x86/kernel/dumpstack.c 2011-04-17 15:56:46.000000000 -0400
13170@@ -2,6 +2,9 @@
13171 * Copyright (C) 1991, 1992 Linus Torvalds
13172 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
13173 */
13174+#ifdef CONFIG_GRKERNSEC_HIDESYM
13175+#define __INCLUDED_BY_HIDESYM 1
13176+#endif
13177 #include <linux/kallsyms.h>
13178 #include <linux/kprobes.h>
13179 #include <linux/uaccess.h>
13180@@ -28,7 +31,7 @@ static int die_counter;
13181
13182 void printk_address(unsigned long address, int reliable)
13183 {
13184- printk(" [<%p>] %s%pS\n", (void *) address,
13185+ printk(" [<%p>] %s%pA\n", (void *) address,
13186 reliable ? "" : "? ", (void *) address);
13187 }
13188
13189@@ -36,9 +39,8 @@ void printk_address(unsigned long addres
13190 static void
13191 print_ftrace_graph_addr(unsigned long addr, void *data,
13192 const struct stacktrace_ops *ops,
13193- struct thread_info *tinfo, int *graph)
13194+ struct task_struct *task, int *graph)
13195 {
13196- struct task_struct *task = tinfo->task;
13197 unsigned long ret_addr;
13198 int index = task->curr_ret_stack;
13199
13200@@ -59,7 +61,7 @@ print_ftrace_graph_addr(unsigned long ad
13201 static inline void
13202 print_ftrace_graph_addr(unsigned long addr, void *data,
13203 const struct stacktrace_ops *ops,
13204- struct thread_info *tinfo, int *graph)
13205+ struct task_struct *task, int *graph)
13206 { }
13207 #endif
13208
13209@@ -70,10 +72,8 @@ print_ftrace_graph_addr(unsigned long ad
13210 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
13211 */
13212
13213-static inline int valid_stack_ptr(struct thread_info *tinfo,
13214- void *p, unsigned int size, void *end)
13215+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
13216 {
13217- void *t = tinfo;
13218 if (end) {
13219 if (p < end && p >= (end-THREAD_SIZE))
13220 return 1;
13221@@ -84,14 +84,14 @@ static inline int valid_stack_ptr(struct
13222 }
13223
13224 unsigned long
13225-print_context_stack(struct thread_info *tinfo,
13226+print_context_stack(struct task_struct *task, void *stack_start,
13227 unsigned long *stack, unsigned long bp,
13228 const struct stacktrace_ops *ops, void *data,
13229 unsigned long *end, int *graph)
13230 {
13231 struct stack_frame *frame = (struct stack_frame *)bp;
13232
13233- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
13234+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
13235 unsigned long addr;
13236
13237 addr = *stack;
13238@@ -103,7 +103,7 @@ print_context_stack(struct thread_info *
13239 } else {
13240 ops->address(data, addr, 0);
13241 }
13242- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
13243+ print_ftrace_graph_addr(addr, data, ops, task, graph);
13244 }
13245 stack++;
13246 }
13247@@ -180,7 +180,7 @@ void dump_stack(void)
13248 #endif
13249
13250 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
13251- current->pid, current->comm, print_tainted(),
13252+ task_pid_nr(current), current->comm, print_tainted(),
13253 init_utsname()->release,
13254 (int)strcspn(init_utsname()->version, " "),
13255 init_utsname()->version);
13256@@ -220,6 +220,8 @@ unsigned __kprobes long oops_begin(void)
13257 return flags;
13258 }
13259
13260+extern void gr_handle_kernel_exploit(void);
13261+
13262 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
13263 {
13264 if (regs && kexec_should_crash(current))
13265@@ -241,7 +243,10 @@ void __kprobes oops_end(unsigned long fl
13266 panic("Fatal exception in interrupt");
13267 if (panic_on_oops)
13268 panic("Fatal exception");
13269- do_exit(signr);
13270+
13271+ gr_handle_kernel_exploit();
13272+
13273+ do_group_exit(signr);
13274 }
13275
13276 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
13277@@ -295,7 +300,7 @@ void die(const char *str, struct pt_regs
13278 unsigned long flags = oops_begin();
13279 int sig = SIGSEGV;
13280
13281- if (!user_mode_vm(regs))
13282+ if (!user_mode(regs))
13283 report_bug(regs->ip, regs);
13284
13285 if (__die(str, regs, err))
13286diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.h linux-2.6.32.46/arch/x86/kernel/dumpstack.h
13287--- linux-2.6.32.46/arch/x86/kernel/dumpstack.h 2011-03-27 14:31:47.000000000 -0400
13288+++ linux-2.6.32.46/arch/x86/kernel/dumpstack.h 2011-04-23 13:25:26.000000000 -0400
13289@@ -15,7 +15,7 @@
13290 #endif
13291
13292 extern unsigned long
13293-print_context_stack(struct thread_info *tinfo,
13294+print_context_stack(struct task_struct *task, void *stack_start,
13295 unsigned long *stack, unsigned long bp,
13296 const struct stacktrace_ops *ops, void *data,
13297 unsigned long *end, int *graph);
13298diff -urNp linux-2.6.32.46/arch/x86/kernel/e820.c linux-2.6.32.46/arch/x86/kernel/e820.c
13299--- linux-2.6.32.46/arch/x86/kernel/e820.c 2011-03-27 14:31:47.000000000 -0400
13300+++ linux-2.6.32.46/arch/x86/kernel/e820.c 2011-04-17 15:56:46.000000000 -0400
13301@@ -733,7 +733,7 @@ struct early_res {
13302 };
13303 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
13304 { 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */
13305- {}
13306+ { 0, 0, {0}, 0 }
13307 };
13308
13309 static int __init find_overlapped_early(u64 start, u64 end)
13310diff -urNp linux-2.6.32.46/arch/x86/kernel/early_printk.c linux-2.6.32.46/arch/x86/kernel/early_printk.c
13311--- linux-2.6.32.46/arch/x86/kernel/early_printk.c 2011-03-27 14:31:47.000000000 -0400
13312+++ linux-2.6.32.46/arch/x86/kernel/early_printk.c 2011-05-16 21:46:57.000000000 -0400
13313@@ -7,6 +7,7 @@
13314 #include <linux/pci_regs.h>
13315 #include <linux/pci_ids.h>
13316 #include <linux/errno.h>
13317+#include <linux/sched.h>
13318 #include <asm/io.h>
13319 #include <asm/processor.h>
13320 #include <asm/fcntl.h>
13321@@ -170,6 +171,8 @@ asmlinkage void early_printk(const char
13322 int n;
13323 va_list ap;
13324
13325+ pax_track_stack();
13326+
13327 va_start(ap, fmt);
13328 n = vscnprintf(buf, sizeof(buf), fmt, ap);
13329 early_console->write(early_console, buf, n);
13330diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_32.c linux-2.6.32.46/arch/x86/kernel/efi_32.c
13331--- linux-2.6.32.46/arch/x86/kernel/efi_32.c 2011-03-27 14:31:47.000000000 -0400
13332+++ linux-2.6.32.46/arch/x86/kernel/efi_32.c 2011-10-06 09:37:08.000000000 -0400
13333@@ -38,70 +38,56 @@
13334 */
13335
13336 static unsigned long efi_rt_eflags;
13337-static pgd_t efi_bak_pg_dir_pointer[2];
13338+static pgd_t __initdata efi_bak_pg_dir_pointer[KERNEL_PGD_PTRS];
13339
13340-void efi_call_phys_prelog(void)
13341+void __init efi_call_phys_prelog(void)
13342 {
13343- unsigned long cr4;
13344- unsigned long temp;
13345 struct desc_ptr gdt_descr;
13346
13347- local_irq_save(efi_rt_eflags);
13348+#ifdef CONFIG_PAX_KERNEXEC
13349+ struct desc_struct d;
13350+#endif
13351
13352- /*
13353- * If I don't have PAE, I should just duplicate two entries in page
13354- * directory. If I have PAE, I just need to duplicate one entry in
13355- * page directory.
13356- */
13357- cr4 = read_cr4_safe();
13358+ local_irq_save(efi_rt_eflags);
13359
13360- if (cr4 & X86_CR4_PAE) {
13361- efi_bak_pg_dir_pointer[0].pgd =
13362- swapper_pg_dir[pgd_index(0)].pgd;
13363- swapper_pg_dir[0].pgd =
13364- swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
13365- } else {
13366- efi_bak_pg_dir_pointer[0].pgd =
13367- swapper_pg_dir[pgd_index(0)].pgd;
13368- efi_bak_pg_dir_pointer[1].pgd =
13369- swapper_pg_dir[pgd_index(0x400000)].pgd;
13370- swapper_pg_dir[pgd_index(0)].pgd =
13371- swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
13372- temp = PAGE_OFFSET + 0x400000;
13373- swapper_pg_dir[pgd_index(0x400000)].pgd =
13374- swapper_pg_dir[pgd_index(temp)].pgd;
13375- }
13376+ clone_pgd_range(efi_bak_pg_dir_pointer, swapper_pg_dir, KERNEL_PGD_PTRS);
13377+ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
13378+ min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
13379
13380 /*
13381 * After the lock is released, the original page table is restored.
13382 */
13383 __flush_tlb_all();
13384
13385+#ifdef CONFIG_PAX_KERNEXEC
13386+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
13387+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
13388+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
13389+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
13390+#endif
13391+
13392 gdt_descr.address = __pa(get_cpu_gdt_table(0));
13393 gdt_descr.size = GDT_SIZE - 1;
13394 load_gdt(&gdt_descr);
13395 }
13396
13397-void efi_call_phys_epilog(void)
13398+void __init efi_call_phys_epilog(void)
13399 {
13400- unsigned long cr4;
13401 struct desc_ptr gdt_descr;
13402
13403+#ifdef CONFIG_PAX_KERNEXEC
13404+ struct desc_struct d;
13405+
13406+ memset(&d, 0, sizeof d);
13407+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
13408+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
13409+#endif
13410+
13411 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
13412 gdt_descr.size = GDT_SIZE - 1;
13413 load_gdt(&gdt_descr);
13414
13415- cr4 = read_cr4_safe();
13416-
13417- if (cr4 & X86_CR4_PAE) {
13418- swapper_pg_dir[pgd_index(0)].pgd =
13419- efi_bak_pg_dir_pointer[0].pgd;
13420- } else {
13421- swapper_pg_dir[pgd_index(0)].pgd =
13422- efi_bak_pg_dir_pointer[0].pgd;
13423- swapper_pg_dir[pgd_index(0x400000)].pgd =
13424- efi_bak_pg_dir_pointer[1].pgd;
13425- }
13426+ clone_pgd_range(swapper_pg_dir, efi_bak_pg_dir_pointer, KERNEL_PGD_PTRS);
13427
13428 /*
13429 * After the lock is released, the original page table is restored.
13430diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S
13431--- linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S 2011-03-27 14:31:47.000000000 -0400
13432+++ linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S 2011-10-06 09:37:08.000000000 -0400
13433@@ -6,7 +6,9 @@
13434 */
13435
13436 #include <linux/linkage.h>
13437+#include <linux/init.h>
13438 #include <asm/page_types.h>
13439+#include <asm/segment.h>
13440
13441 /*
13442 * efi_call_phys(void *, ...) is a function with variable parameters.
13443@@ -20,7 +22,7 @@
13444 * service functions will comply with gcc calling convention, too.
13445 */
13446
13447-.text
13448+__INIT
13449 ENTRY(efi_call_phys)
13450 /*
13451 * 0. The function can only be called in Linux kernel. So CS has been
13452@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
13453 * The mapping of lower virtual memory has been created in prelog and
13454 * epilog.
13455 */
13456- movl $1f, %edx
13457- subl $__PAGE_OFFSET, %edx
13458- jmp *%edx
13459+ movl $(__KERNEXEC_EFI_DS), %edx
13460+ mov %edx, %ds
13461+ mov %edx, %es
13462+ mov %edx, %ss
13463+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
13464 1:
13465
13466 /*
13467@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
13468 * parameter 2, ..., param n. To make things easy, we save the return
13469 * address of efi_call_phys in a global variable.
13470 */
13471- popl %edx
13472- movl %edx, saved_return_addr
13473- /* get the function pointer into ECX*/
13474- popl %ecx
13475- movl %ecx, efi_rt_function_ptr
13476- movl $2f, %edx
13477- subl $__PAGE_OFFSET, %edx
13478- pushl %edx
13479+ popl (saved_return_addr)
13480+ popl (efi_rt_function_ptr)
13481
13482 /*
13483 * 3. Clear PG bit in %CR0.
13484@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
13485 /*
13486 * 5. Call the physical function.
13487 */
13488- jmp *%ecx
13489+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
13490
13491-2:
13492 /*
13493 * 6. After EFI runtime service returns, control will return to
13494 * following instruction. We'd better readjust stack pointer first.
13495@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
13496 movl %cr0, %edx
13497 orl $0x80000000, %edx
13498 movl %edx, %cr0
13499- jmp 1f
13500-1:
13501+
13502 /*
13503 * 8. Now restore the virtual mode from flat mode by
13504 * adding EIP with PAGE_OFFSET.
13505 */
13506- movl $1f, %edx
13507- jmp *%edx
13508+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
13509 1:
13510+ movl $(__KERNEL_DS), %edx
13511+ mov %edx, %ds
13512+ mov %edx, %es
13513+ mov %edx, %ss
13514
13515 /*
13516 * 9. Balance the stack. And because EAX contain the return value,
13517 * we'd better not clobber it.
13518 */
13519- leal efi_rt_function_ptr, %edx
13520- movl (%edx), %ecx
13521- pushl %ecx
13522+ pushl (efi_rt_function_ptr)
13523
13524 /*
13525- * 10. Push the saved return address onto the stack and return.
13526+ * 10. Return to the saved return address.
13527 */
13528- leal saved_return_addr, %edx
13529- movl (%edx), %ecx
13530- pushl %ecx
13531- ret
13532+ jmpl *(saved_return_addr)
13533 ENDPROC(efi_call_phys)
13534 .previous
13535
13536-.data
13537+__INITDATA
13538 saved_return_addr:
13539 .long 0
13540 efi_rt_function_ptr:
13541diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S
13542--- linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S 2011-03-27 14:31:47.000000000 -0400
13543+++ linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S 2011-10-06 09:37:14.000000000 -0400
13544@@ -7,6 +7,7 @@
13545 */
13546
13547 #include <linux/linkage.h>
13548+#include <asm/alternative-asm.h>
13549
13550 #define SAVE_XMM \
13551 mov %rsp, %rax; \
13552@@ -40,6 +41,7 @@ ENTRY(efi_call0)
13553 call *%rdi
13554 addq $32, %rsp
13555 RESTORE_XMM
13556+ pax_force_retaddr
13557 ret
13558 ENDPROC(efi_call0)
13559
13560@@ -50,6 +52,7 @@ ENTRY(efi_call1)
13561 call *%rdi
13562 addq $32, %rsp
13563 RESTORE_XMM
13564+ pax_force_retaddr
13565 ret
13566 ENDPROC(efi_call1)
13567
13568@@ -60,6 +63,7 @@ ENTRY(efi_call2)
13569 call *%rdi
13570 addq $32, %rsp
13571 RESTORE_XMM
13572+ pax_force_retaddr
13573 ret
13574 ENDPROC(efi_call2)
13575
13576@@ -71,6 +75,7 @@ ENTRY(efi_call3)
13577 call *%rdi
13578 addq $32, %rsp
13579 RESTORE_XMM
13580+ pax_force_retaddr
13581 ret
13582 ENDPROC(efi_call3)
13583
13584@@ -83,6 +88,7 @@ ENTRY(efi_call4)
13585 call *%rdi
13586 addq $32, %rsp
13587 RESTORE_XMM
13588+ pax_force_retaddr
13589 ret
13590 ENDPROC(efi_call4)
13591
13592@@ -96,6 +102,7 @@ ENTRY(efi_call5)
13593 call *%rdi
13594 addq $48, %rsp
13595 RESTORE_XMM
13596+ pax_force_retaddr
13597 ret
13598 ENDPROC(efi_call5)
13599
13600@@ -112,5 +119,6 @@ ENTRY(efi_call6)
13601 call *%rdi
13602 addq $48, %rsp
13603 RESTORE_XMM
13604+ pax_force_retaddr
13605 ret
13606 ENDPROC(efi_call6)
13607diff -urNp linux-2.6.32.46/arch/x86/kernel/entry_32.S linux-2.6.32.46/arch/x86/kernel/entry_32.S
13608--- linux-2.6.32.46/arch/x86/kernel/entry_32.S 2011-03-27 14:31:47.000000000 -0400
13609+++ linux-2.6.32.46/arch/x86/kernel/entry_32.S 2011-08-30 18:19:52.000000000 -0400
13610@@ -185,13 +185,146 @@
13611 /*CFI_REL_OFFSET gs, PT_GS*/
13612 .endm
13613 .macro SET_KERNEL_GS reg
13614+
13615+#ifdef CONFIG_CC_STACKPROTECTOR
13616 movl $(__KERNEL_STACK_CANARY), \reg
13617+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
13618+ movl $(__USER_DS), \reg
13619+#else
13620+ xorl \reg, \reg
13621+#endif
13622+
13623 movl \reg, %gs
13624 .endm
13625
13626 #endif /* CONFIG_X86_32_LAZY_GS */
13627
13628-.macro SAVE_ALL
13629+.macro pax_enter_kernel
13630+#ifdef CONFIG_PAX_KERNEXEC
13631+ call pax_enter_kernel
13632+#endif
13633+.endm
13634+
13635+.macro pax_exit_kernel
13636+#ifdef CONFIG_PAX_KERNEXEC
13637+ call pax_exit_kernel
13638+#endif
13639+.endm
13640+
13641+#ifdef CONFIG_PAX_KERNEXEC
13642+ENTRY(pax_enter_kernel)
13643+#ifdef CONFIG_PARAVIRT
13644+ pushl %eax
13645+ pushl %ecx
13646+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
13647+ mov %eax, %esi
13648+#else
13649+ mov %cr0, %esi
13650+#endif
13651+ bts $16, %esi
13652+ jnc 1f
13653+ mov %cs, %esi
13654+ cmp $__KERNEL_CS, %esi
13655+ jz 3f
13656+ ljmp $__KERNEL_CS, $3f
13657+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
13658+2:
13659+#ifdef CONFIG_PARAVIRT
13660+ mov %esi, %eax
13661+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
13662+#else
13663+ mov %esi, %cr0
13664+#endif
13665+3:
13666+#ifdef CONFIG_PARAVIRT
13667+ popl %ecx
13668+ popl %eax
13669+#endif
13670+ ret
13671+ENDPROC(pax_enter_kernel)
13672+
13673+ENTRY(pax_exit_kernel)
13674+#ifdef CONFIG_PARAVIRT
13675+ pushl %eax
13676+ pushl %ecx
13677+#endif
13678+ mov %cs, %esi
13679+ cmp $__KERNEXEC_KERNEL_CS, %esi
13680+ jnz 2f
13681+#ifdef CONFIG_PARAVIRT
13682+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
13683+ mov %eax, %esi
13684+#else
13685+ mov %cr0, %esi
13686+#endif
13687+ btr $16, %esi
13688+ ljmp $__KERNEL_CS, $1f
13689+1:
13690+#ifdef CONFIG_PARAVIRT
13691+ mov %esi, %eax
13692+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
13693+#else
13694+ mov %esi, %cr0
13695+#endif
13696+2:
13697+#ifdef CONFIG_PARAVIRT
13698+ popl %ecx
13699+ popl %eax
13700+#endif
13701+ ret
13702+ENDPROC(pax_exit_kernel)
13703+#endif
13704+
13705+.macro pax_erase_kstack
13706+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
13707+ call pax_erase_kstack
13708+#endif
13709+.endm
13710+
13711+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
13712+/*
13713+ * ebp: thread_info
13714+ * ecx, edx: can be clobbered
13715+ */
13716+ENTRY(pax_erase_kstack)
13717+ pushl %edi
13718+ pushl %eax
13719+
13720+ mov TI_lowest_stack(%ebp), %edi
13721+ mov $-0xBEEF, %eax
13722+ std
13723+
13724+1: mov %edi, %ecx
13725+ and $THREAD_SIZE_asm - 1, %ecx
13726+ shr $2, %ecx
13727+ repne scasl
13728+ jecxz 2f
13729+
13730+ cmp $2*16, %ecx
13731+ jc 2f
13732+
13733+ mov $2*16, %ecx
13734+ repe scasl
13735+ jecxz 2f
13736+ jne 1b
13737+
13738+2: cld
13739+ mov %esp, %ecx
13740+ sub %edi, %ecx
13741+ shr $2, %ecx
13742+ rep stosl
13743+
13744+ mov TI_task_thread_sp0(%ebp), %edi
13745+ sub $128, %edi
13746+ mov %edi, TI_lowest_stack(%ebp)
13747+
13748+ popl %eax
13749+ popl %edi
13750+ ret
13751+ENDPROC(pax_erase_kstack)
13752+#endif
13753+
13754+.macro __SAVE_ALL _DS
13755 cld
13756 PUSH_GS
13757 pushl %fs
13758@@ -224,7 +357,7 @@
13759 pushl %ebx
13760 CFI_ADJUST_CFA_OFFSET 4
13761 CFI_REL_OFFSET ebx, 0
13762- movl $(__USER_DS), %edx
13763+ movl $\_DS, %edx
13764 movl %edx, %ds
13765 movl %edx, %es
13766 movl $(__KERNEL_PERCPU), %edx
13767@@ -232,6 +365,15 @@
13768 SET_KERNEL_GS %edx
13769 .endm
13770
13771+.macro SAVE_ALL
13772+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
13773+ __SAVE_ALL __KERNEL_DS
13774+ pax_enter_kernel
13775+#else
13776+ __SAVE_ALL __USER_DS
13777+#endif
13778+.endm
13779+
13780 .macro RESTORE_INT_REGS
13781 popl %ebx
13782 CFI_ADJUST_CFA_OFFSET -4
13783@@ -352,7 +494,15 @@ check_userspace:
13784 movb PT_CS(%esp), %al
13785 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
13786 cmpl $USER_RPL, %eax
13787+
13788+#ifdef CONFIG_PAX_KERNEXEC
13789+ jae resume_userspace
13790+
13791+ PAX_EXIT_KERNEL
13792+ jmp resume_kernel
13793+#else
13794 jb resume_kernel # not returning to v8086 or userspace
13795+#endif
13796
13797 ENTRY(resume_userspace)
13798 LOCKDEP_SYS_EXIT
13799@@ -364,7 +514,7 @@ ENTRY(resume_userspace)
13800 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
13801 # int/exception return?
13802 jne work_pending
13803- jmp restore_all
13804+ jmp restore_all_pax
13805 END(ret_from_exception)
13806
13807 #ifdef CONFIG_PREEMPT
13808@@ -414,25 +564,36 @@ sysenter_past_esp:
13809 /*CFI_REL_OFFSET cs, 0*/
13810 /*
13811 * Push current_thread_info()->sysenter_return to the stack.
13812- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
13813- * pushed above; +8 corresponds to copy_thread's esp0 setting.
13814 */
13815- pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
13816+ pushl $0
13817 CFI_ADJUST_CFA_OFFSET 4
13818 CFI_REL_OFFSET eip, 0
13819
13820 pushl %eax
13821 CFI_ADJUST_CFA_OFFSET 4
13822 SAVE_ALL
13823+ GET_THREAD_INFO(%ebp)
13824+ movl TI_sysenter_return(%ebp),%ebp
13825+ movl %ebp,PT_EIP(%esp)
13826 ENABLE_INTERRUPTS(CLBR_NONE)
13827
13828 /*
13829 * Load the potential sixth argument from user stack.
13830 * Careful about security.
13831 */
13832+ movl PT_OLDESP(%esp),%ebp
13833+
13834+#ifdef CONFIG_PAX_MEMORY_UDEREF
13835+ mov PT_OLDSS(%esp),%ds
13836+1: movl %ds:(%ebp),%ebp
13837+ push %ss
13838+ pop %ds
13839+#else
13840 cmpl $__PAGE_OFFSET-3,%ebp
13841 jae syscall_fault
13842 1: movl (%ebp),%ebp
13843+#endif
13844+
13845 movl %ebp,PT_EBP(%esp)
13846 .section __ex_table,"a"
13847 .align 4
13848@@ -455,12 +616,24 @@ sysenter_do_call:
13849 testl $_TIF_ALLWORK_MASK, %ecx
13850 jne sysexit_audit
13851 sysenter_exit:
13852+
13853+#ifdef CONFIG_PAX_RANDKSTACK
13854+ pushl_cfi %eax
13855+ movl %esp, %eax
13856+ call pax_randomize_kstack
13857+ popl_cfi %eax
13858+#endif
13859+
13860+ pax_erase_kstack
13861+
13862 /* if something modifies registers it must also disable sysexit */
13863 movl PT_EIP(%esp), %edx
13864 movl PT_OLDESP(%esp), %ecx
13865 xorl %ebp,%ebp
13866 TRACE_IRQS_ON
13867 1: mov PT_FS(%esp), %fs
13868+2: mov PT_DS(%esp), %ds
13869+3: mov PT_ES(%esp), %es
13870 PTGS_TO_GS
13871 ENABLE_INTERRUPTS_SYSEXIT
13872
13873@@ -477,6 +650,9 @@ sysenter_audit:
13874 movl %eax,%edx /* 2nd arg: syscall number */
13875 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
13876 call audit_syscall_entry
13877+
13878+ pax_erase_kstack
13879+
13880 pushl %ebx
13881 CFI_ADJUST_CFA_OFFSET 4
13882 movl PT_EAX(%esp),%eax /* reload syscall number */
13883@@ -504,11 +680,17 @@ sysexit_audit:
13884
13885 CFI_ENDPROC
13886 .pushsection .fixup,"ax"
13887-2: movl $0,PT_FS(%esp)
13888+4: movl $0,PT_FS(%esp)
13889+ jmp 1b
13890+5: movl $0,PT_DS(%esp)
13891+ jmp 1b
13892+6: movl $0,PT_ES(%esp)
13893 jmp 1b
13894 .section __ex_table,"a"
13895 .align 4
13896- .long 1b,2b
13897+ .long 1b,4b
13898+ .long 2b,5b
13899+ .long 3b,6b
13900 .popsection
13901 PTGS_TO_GS_EX
13902 ENDPROC(ia32_sysenter_target)
13903@@ -538,6 +720,15 @@ syscall_exit:
13904 testl $_TIF_ALLWORK_MASK, %ecx # current->work
13905 jne syscall_exit_work
13906
13907+restore_all_pax:
13908+
13909+#ifdef CONFIG_PAX_RANDKSTACK
13910+ movl %esp, %eax
13911+ call pax_randomize_kstack
13912+#endif
13913+
13914+ pax_erase_kstack
13915+
13916 restore_all:
13917 TRACE_IRQS_IRET
13918 restore_all_notrace:
13919@@ -602,10 +793,29 @@ ldt_ss:
13920 mov PT_OLDESP(%esp), %eax /* load userspace esp */
13921 mov %dx, %ax /* eax: new kernel esp */
13922 sub %eax, %edx /* offset (low word is 0) */
13923- PER_CPU(gdt_page, %ebx)
13924+#ifdef CONFIG_SMP
13925+ movl PER_CPU_VAR(cpu_number), %ebx
13926+ shll $PAGE_SHIFT_asm, %ebx
13927+ addl $cpu_gdt_table, %ebx
13928+#else
13929+ movl $cpu_gdt_table, %ebx
13930+#endif
13931 shr $16, %edx
13932+
13933+#ifdef CONFIG_PAX_KERNEXEC
13934+ mov %cr0, %esi
13935+ btr $16, %esi
13936+ mov %esi, %cr0
13937+#endif
13938+
13939 mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
13940 mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
13941+
13942+#ifdef CONFIG_PAX_KERNEXEC
13943+ bts $16, %esi
13944+ mov %esi, %cr0
13945+#endif
13946+
13947 pushl $__ESPFIX_SS
13948 CFI_ADJUST_CFA_OFFSET 4
13949 push %eax /* new kernel esp */
13950@@ -636,31 +846,25 @@ work_resched:
13951 movl TI_flags(%ebp), %ecx
13952 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
13953 # than syscall tracing?
13954- jz restore_all
13955+ jz restore_all_pax
13956 testb $_TIF_NEED_RESCHED, %cl
13957 jnz work_resched
13958
13959 work_notifysig: # deal with pending signals and
13960 # notify-resume requests
13961+ movl %esp, %eax
13962 #ifdef CONFIG_VM86
13963 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
13964- movl %esp, %eax
13965- jne work_notifysig_v86 # returning to kernel-space or
13966+ jz 1f # returning to kernel-space or
13967 # vm86-space
13968- xorl %edx, %edx
13969- call do_notify_resume
13970- jmp resume_userspace_sig
13971
13972- ALIGN
13973-work_notifysig_v86:
13974 pushl %ecx # save ti_flags for do_notify_resume
13975 CFI_ADJUST_CFA_OFFSET 4
13976 call save_v86_state # %eax contains pt_regs pointer
13977 popl %ecx
13978 CFI_ADJUST_CFA_OFFSET -4
13979 movl %eax, %esp
13980-#else
13981- movl %esp, %eax
13982+1:
13983 #endif
13984 xorl %edx, %edx
13985 call do_notify_resume
13986@@ -673,6 +877,9 @@ syscall_trace_entry:
13987 movl $-ENOSYS,PT_EAX(%esp)
13988 movl %esp, %eax
13989 call syscall_trace_enter
13990+
13991+ pax_erase_kstack
13992+
13993 /* What it returned is what we'll actually use. */
13994 cmpl $(nr_syscalls), %eax
13995 jnae syscall_call
13996@@ -695,6 +902,10 @@ END(syscall_exit_work)
13997
13998 RING0_INT_FRAME # can't unwind into user space anyway
13999 syscall_fault:
14000+#ifdef CONFIG_PAX_MEMORY_UDEREF
14001+ push %ss
14002+ pop %ds
14003+#endif
14004 GET_THREAD_INFO(%ebp)
14005 movl $-EFAULT,PT_EAX(%esp)
14006 jmp resume_userspace
14007@@ -726,6 +937,33 @@ PTREGSCALL(rt_sigreturn)
14008 PTREGSCALL(vm86)
14009 PTREGSCALL(vm86old)
14010
14011+ ALIGN;
14012+ENTRY(kernel_execve)
14013+ push %ebp
14014+ sub $PT_OLDSS+4,%esp
14015+ push %edi
14016+ push %ecx
14017+ push %eax
14018+ lea 3*4(%esp),%edi
14019+ mov $PT_OLDSS/4+1,%ecx
14020+ xorl %eax,%eax
14021+ rep stosl
14022+ pop %eax
14023+ pop %ecx
14024+ pop %edi
14025+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
14026+ mov %eax,PT_EBX(%esp)
14027+ mov %edx,PT_ECX(%esp)
14028+ mov %ecx,PT_EDX(%esp)
14029+ mov %esp,%eax
14030+ call sys_execve
14031+ GET_THREAD_INFO(%ebp)
14032+ test %eax,%eax
14033+ jz syscall_exit
14034+ add $PT_OLDSS+4,%esp
14035+ pop %ebp
14036+ ret
14037+
14038 .macro FIXUP_ESPFIX_STACK
14039 /*
14040 * Switch back for ESPFIX stack to the normal zerobased stack
14041@@ -735,7 +973,13 @@ PTREGSCALL(vm86old)
14042 * normal stack and adjusts ESP with the matching offset.
14043 */
14044 /* fixup the stack */
14045- PER_CPU(gdt_page, %ebx)
14046+#ifdef CONFIG_SMP
14047+ movl PER_CPU_VAR(cpu_number), %ebx
14048+ shll $PAGE_SHIFT_asm, %ebx
14049+ addl $cpu_gdt_table, %ebx
14050+#else
14051+ movl $cpu_gdt_table, %ebx
14052+#endif
14053 mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
14054 mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
14055 shl $16, %eax
14056@@ -1198,7 +1442,6 @@ return_to_handler:
14057 ret
14058 #endif
14059
14060-.section .rodata,"a"
14061 #include "syscall_table_32.S"
14062
14063 syscall_table_size=(.-sys_call_table)
14064@@ -1255,9 +1498,12 @@ error_code:
14065 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
14066 REG_TO_PTGS %ecx
14067 SET_KERNEL_GS %ecx
14068- movl $(__USER_DS), %ecx
14069+ movl $(__KERNEL_DS), %ecx
14070 movl %ecx, %ds
14071 movl %ecx, %es
14072+
14073+ pax_enter_kernel
14074+
14075 TRACE_IRQS_OFF
14076 movl %esp,%eax # pt_regs pointer
14077 call *%edi
14078@@ -1351,6 +1597,9 @@ nmi_stack_correct:
14079 xorl %edx,%edx # zero error code
14080 movl %esp,%eax # pt_regs pointer
14081 call do_nmi
14082+
14083+ pax_exit_kernel
14084+
14085 jmp restore_all_notrace
14086 CFI_ENDPROC
14087
14088@@ -1391,6 +1640,9 @@ nmi_espfix_stack:
14089 FIXUP_ESPFIX_STACK # %eax == %esp
14090 xorl %edx,%edx # zero error code
14091 call do_nmi
14092+
14093+ pax_exit_kernel
14094+
14095 RESTORE_REGS
14096 lss 12+4(%esp), %esp # back to espfix stack
14097 CFI_ADJUST_CFA_OFFSET -24
14098diff -urNp linux-2.6.32.46/arch/x86/kernel/entry_64.S linux-2.6.32.46/arch/x86/kernel/entry_64.S
14099--- linux-2.6.32.46/arch/x86/kernel/entry_64.S 2011-03-27 14:31:47.000000000 -0400
14100+++ linux-2.6.32.46/arch/x86/kernel/entry_64.S 2011-10-08 08:14:37.000000000 -0400
14101@@ -53,6 +53,8 @@
14102 #include <asm/paravirt.h>
14103 #include <asm/ftrace.h>
14104 #include <asm/percpu.h>
14105+#include <asm/pgtable.h>
14106+#include <asm/alternative-asm.h>
14107
14108 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14109 #include <linux/elf-em.h>
14110@@ -64,6 +66,7 @@
14111 #ifdef CONFIG_FUNCTION_TRACER
14112 #ifdef CONFIG_DYNAMIC_FTRACE
14113 ENTRY(mcount)
14114+ pax_force_retaddr
14115 retq
14116 END(mcount)
14117
14118@@ -88,6 +91,7 @@ GLOBAL(ftrace_graph_call)
14119 #endif
14120
14121 GLOBAL(ftrace_stub)
14122+ pax_force_retaddr
14123 retq
14124 END(ftrace_caller)
14125
14126@@ -108,6 +112,7 @@ ENTRY(mcount)
14127 #endif
14128
14129 GLOBAL(ftrace_stub)
14130+ pax_force_retaddr
14131 retq
14132
14133 trace:
14134@@ -117,6 +122,7 @@ trace:
14135 movq 8(%rbp), %rsi
14136 subq $MCOUNT_INSN_SIZE, %rdi
14137
14138+ pax_force_fptr ftrace_trace_function
14139 call *ftrace_trace_function
14140
14141 MCOUNT_RESTORE_FRAME
14142@@ -142,6 +148,7 @@ ENTRY(ftrace_graph_caller)
14143
14144 MCOUNT_RESTORE_FRAME
14145
14146+ pax_force_retaddr
14147 retq
14148 END(ftrace_graph_caller)
14149
14150@@ -159,6 +166,7 @@ GLOBAL(return_to_handler)
14151 movq 8(%rsp), %rdx
14152 movq (%rsp), %rax
14153 addq $16, %rsp
14154+ pax_force_retaddr
14155 retq
14156 #endif
14157
14158@@ -174,6 +182,269 @@ ENTRY(native_usergs_sysret64)
14159 ENDPROC(native_usergs_sysret64)
14160 #endif /* CONFIG_PARAVIRT */
14161
14162+ .macro ljmpq sel, off
14163+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
14164+ .byte 0x48; ljmp *1234f(%rip)
14165+ .pushsection .rodata
14166+ .align 16
14167+ 1234: .quad \off; .word \sel
14168+ .popsection
14169+#else
14170+ pushq $\sel
14171+ pushq $\off
14172+ lretq
14173+#endif
14174+ .endm
14175+
14176+ .macro pax_enter_kernel
14177+#ifdef CONFIG_PAX_KERNEXEC
14178+ call pax_enter_kernel
14179+#endif
14180+ .endm
14181+
14182+ .macro pax_exit_kernel
14183+#ifdef CONFIG_PAX_KERNEXEC
14184+ call pax_exit_kernel
14185+#endif
14186+ .endm
14187+
14188+#ifdef CONFIG_PAX_KERNEXEC
14189+ENTRY(pax_enter_kernel)
14190+ pushq %rdi
14191+
14192+#ifdef CONFIG_PARAVIRT
14193+ PV_SAVE_REGS(CLBR_RDI)
14194+#endif
14195+
14196+ GET_CR0_INTO_RDI
14197+ bts $16,%rdi
14198+ jnc 1f
14199+ mov %cs,%edi
14200+ cmp $__KERNEL_CS,%edi
14201+ jz 3f
14202+ ljmpq __KERNEL_CS,3f
14203+1: ljmpq __KERNEXEC_KERNEL_CS,2f
14204+2: SET_RDI_INTO_CR0
14205+3:
14206+
14207+#ifdef CONFIG_PARAVIRT
14208+ PV_RESTORE_REGS(CLBR_RDI)
14209+#endif
14210+
14211+ popq %rdi
14212+ pax_force_retaddr
14213+ retq
14214+ENDPROC(pax_enter_kernel)
14215+
14216+ENTRY(pax_exit_kernel)
14217+ pushq %rdi
14218+
14219+#ifdef CONFIG_PARAVIRT
14220+ PV_SAVE_REGS(CLBR_RDI)
14221+#endif
14222+
14223+ mov %cs,%rdi
14224+ cmp $__KERNEXEC_KERNEL_CS,%edi
14225+ jnz 2f
14226+ GET_CR0_INTO_RDI
14227+ btr $16,%rdi
14228+ ljmpq __KERNEL_CS,1f
14229+1: SET_RDI_INTO_CR0
14230+2:
14231+
14232+#ifdef CONFIG_PARAVIRT
14233+ PV_RESTORE_REGS(CLBR_RDI);
14234+#endif
14235+
14236+ popq %rdi
14237+ pax_force_retaddr
14238+ retq
14239+ENDPROC(pax_exit_kernel)
14240+#endif
14241+
14242+ .macro pax_enter_kernel_user
14243+#ifdef CONFIG_PAX_MEMORY_UDEREF
14244+ call pax_enter_kernel_user
14245+#endif
14246+ .endm
14247+
14248+ .macro pax_exit_kernel_user
14249+#ifdef CONFIG_PAX_MEMORY_UDEREF
14250+ call pax_exit_kernel_user
14251+#endif
14252+#ifdef CONFIG_PAX_RANDKSTACK
14253+ push %rax
14254+ call pax_randomize_kstack
14255+ pop %rax
14256+#endif
14257+ .endm
14258+
14259+#ifdef CONFIG_PAX_MEMORY_UDEREF
14260+ENTRY(pax_enter_kernel_user)
14261+ pushq %rdi
14262+ pushq %rbx
14263+
14264+#ifdef CONFIG_PARAVIRT
14265+ PV_SAVE_REGS(CLBR_RDI)
14266+#endif
14267+
14268+ GET_CR3_INTO_RDI
14269+ mov %rdi,%rbx
14270+ add $__START_KERNEL_map,%rbx
14271+ sub phys_base(%rip),%rbx
14272+
14273+#ifdef CONFIG_PARAVIRT
14274+ pushq %rdi
14275+ cmpl $0, pv_info+PARAVIRT_enabled
14276+ jz 1f
14277+ i = 0
14278+ .rept USER_PGD_PTRS
14279+ mov i*8(%rbx),%rsi
14280+ mov $0,%sil
14281+ lea i*8(%rbx),%rdi
14282+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
14283+ i = i + 1
14284+ .endr
14285+ jmp 2f
14286+1:
14287+#endif
14288+
14289+ i = 0
14290+ .rept USER_PGD_PTRS
14291+ movb $0,i*8(%rbx)
14292+ i = i + 1
14293+ .endr
14294+
14295+#ifdef CONFIG_PARAVIRT
14296+2: popq %rdi
14297+#endif
14298+ SET_RDI_INTO_CR3
14299+
14300+#ifdef CONFIG_PAX_KERNEXEC
14301+ GET_CR0_INTO_RDI
14302+ bts $16,%rdi
14303+ SET_RDI_INTO_CR0
14304+#endif
14305+
14306+#ifdef CONFIG_PARAVIRT
14307+ PV_RESTORE_REGS(CLBR_RDI)
14308+#endif
14309+
14310+ popq %rbx
14311+ popq %rdi
14312+ pax_force_retaddr
14313+ retq
14314+ENDPROC(pax_enter_kernel_user)
14315+
14316+ENTRY(pax_exit_kernel_user)
14317+ push %rdi
14318+
14319+#ifdef CONFIG_PARAVIRT
14320+ pushq %rbx
14321+ PV_SAVE_REGS(CLBR_RDI)
14322+#endif
14323+
14324+#ifdef CONFIG_PAX_KERNEXEC
14325+ GET_CR0_INTO_RDI
14326+ btr $16,%rdi
14327+ SET_RDI_INTO_CR0
14328+#endif
14329+
14330+ GET_CR3_INTO_RDI
14331+ add $__START_KERNEL_map,%rdi
14332+ sub phys_base(%rip),%rdi
14333+
14334+#ifdef CONFIG_PARAVIRT
14335+ cmpl $0, pv_info+PARAVIRT_enabled
14336+ jz 1f
14337+ mov %rdi,%rbx
14338+ i = 0
14339+ .rept USER_PGD_PTRS
14340+ mov i*8(%rbx),%rsi
14341+ mov $0x67,%sil
14342+ lea i*8(%rbx),%rdi
14343+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
14344+ i = i + 1
14345+ .endr
14346+ jmp 2f
14347+1:
14348+#endif
14349+
14350+ i = 0
14351+ .rept USER_PGD_PTRS
14352+ movb $0x67,i*8(%rdi)
14353+ i = i + 1
14354+ .endr
14355+
14356+#ifdef CONFIG_PARAVIRT
14357+2: PV_RESTORE_REGS(CLBR_RDI)
14358+ popq %rbx
14359+#endif
14360+
14361+ popq %rdi
14362+ pax_force_retaddr
14363+ retq
14364+ENDPROC(pax_exit_kernel_user)
14365+#endif
14366+
14367+.macro pax_erase_kstack
14368+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14369+ call pax_erase_kstack
14370+#endif
14371+.endm
14372+
14373+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14374+/*
14375+ * r10: thread_info
14376+ * rcx, rdx: can be clobbered
14377+ */
14378+ENTRY(pax_erase_kstack)
14379+ pushq %rdi
14380+ pushq %rax
14381+ pushq %r10
14382+
14383+ GET_THREAD_INFO(%r10)
14384+ mov TI_lowest_stack(%r10), %rdi
14385+ mov $-0xBEEF, %rax
14386+ std
14387+
14388+1: mov %edi, %ecx
14389+ and $THREAD_SIZE_asm - 1, %ecx
14390+ shr $3, %ecx
14391+ repne scasq
14392+ jecxz 2f
14393+
14394+ cmp $2*8, %ecx
14395+ jc 2f
14396+
14397+ mov $2*8, %ecx
14398+ repe scasq
14399+ jecxz 2f
14400+ jne 1b
14401+
14402+2: cld
14403+ mov %esp, %ecx
14404+ sub %edi, %ecx
14405+
14406+ cmp $THREAD_SIZE_asm, %rcx
14407+ jb 3f
14408+ ud2
14409+3:
14410+
14411+ shr $3, %ecx
14412+ rep stosq
14413+
14414+ mov TI_task_thread_sp0(%r10), %rdi
14415+ sub $256, %rdi
14416+ mov %rdi, TI_lowest_stack(%r10)
14417+
14418+ popq %r10
14419+ popq %rax
14420+ popq %rdi
14421+ pax_force_retaddr
14422+ ret
14423+ENDPROC(pax_erase_kstack)
14424+#endif
14425
14426 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
14427 #ifdef CONFIG_TRACE_IRQFLAGS
14428@@ -317,7 +588,7 @@ ENTRY(save_args)
14429 leaq -ARGOFFSET+16(%rsp),%rdi /* arg1 for handler */
14430 movq_cfi rbp, 8 /* push %rbp */
14431 leaq 8(%rsp), %rbp /* mov %rsp, %ebp */
14432- testl $3, CS(%rdi)
14433+ testb $3, CS(%rdi)
14434 je 1f
14435 SWAPGS
14436 /*
14437@@ -337,6 +608,7 @@ ENTRY(save_args)
14438 * We entered an interrupt context - irqs are off:
14439 */
14440 2: TRACE_IRQS_OFF
14441+ pax_force_retaddr
14442 ret
14443 CFI_ENDPROC
14444 END(save_args)
14445@@ -352,6 +624,7 @@ ENTRY(save_rest)
14446 movq_cfi r15, R15+16
14447 movq %r11, 8(%rsp) /* return address */
14448 FIXUP_TOP_OF_STACK %r11, 16
14449+ pax_force_retaddr
14450 ret
14451 CFI_ENDPROC
14452 END(save_rest)
14453@@ -383,7 +656,8 @@ ENTRY(save_paranoid)
14454 js 1f /* negative -> in kernel */
14455 SWAPGS
14456 xorl %ebx,%ebx
14457-1: ret
14458+1: pax_force_retaddr
14459+ ret
14460 CFI_ENDPROC
14461 END(save_paranoid)
14462 .popsection
14463@@ -409,7 +683,7 @@ ENTRY(ret_from_fork)
14464
14465 RESTORE_REST
14466
14467- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
14468+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
14469 je int_ret_from_sys_call
14470
14471 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
14472@@ -455,7 +729,7 @@ END(ret_from_fork)
14473 ENTRY(system_call)
14474 CFI_STARTPROC simple
14475 CFI_SIGNAL_FRAME
14476- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14477+ CFI_DEF_CFA rsp,0
14478 CFI_REGISTER rip,rcx
14479 /*CFI_REGISTER rflags,r11*/
14480 SWAPGS_UNSAFE_STACK
14481@@ -468,12 +742,13 @@ ENTRY(system_call_after_swapgs)
14482
14483 movq %rsp,PER_CPU_VAR(old_rsp)
14484 movq PER_CPU_VAR(kernel_stack),%rsp
14485+ pax_enter_kernel_user
14486 /*
14487 * No need to follow this irqs off/on section - it's straight
14488 * and short:
14489 */
14490 ENABLE_INTERRUPTS(CLBR_NONE)
14491- SAVE_ARGS 8,1
14492+ SAVE_ARGS 8*6,1
14493 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14494 movq %rcx,RIP-ARGOFFSET(%rsp)
14495 CFI_REL_OFFSET rip,RIP-ARGOFFSET
14496@@ -502,6 +777,8 @@ sysret_check:
14497 andl %edi,%edx
14498 jnz sysret_careful
14499 CFI_REMEMBER_STATE
14500+ pax_exit_kernel_user
14501+ pax_erase_kstack
14502 /*
14503 * sysretq will re-enable interrupts:
14504 */
14505@@ -562,6 +839,9 @@ auditsys:
14506 movq %rax,%rsi /* 2nd arg: syscall number */
14507 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
14508 call audit_syscall_entry
14509+
14510+ pax_erase_kstack
14511+
14512 LOAD_ARGS 0 /* reload call-clobbered registers */
14513 jmp system_call_fastpath
14514
14515@@ -592,6 +872,9 @@ tracesys:
14516 FIXUP_TOP_OF_STACK %rdi
14517 movq %rsp,%rdi
14518 call syscall_trace_enter
14519+
14520+ pax_erase_kstack
14521+
14522 /*
14523 * Reload arg registers from stack in case ptrace changed them.
14524 * We don't reload %rax because syscall_trace_enter() returned
14525@@ -613,7 +896,7 @@ tracesys:
14526 GLOBAL(int_ret_from_sys_call)
14527 DISABLE_INTERRUPTS(CLBR_NONE)
14528 TRACE_IRQS_OFF
14529- testl $3,CS-ARGOFFSET(%rsp)
14530+ testb $3,CS-ARGOFFSET(%rsp)
14531 je retint_restore_args
14532 movl $_TIF_ALLWORK_MASK,%edi
14533 /* edi: mask to check */
14534@@ -708,6 +991,7 @@ ENTRY(ptregscall_common)
14535 movq_cfi_restore R12+8, r12
14536 movq_cfi_restore RBP+8, rbp
14537 movq_cfi_restore RBX+8, rbx
14538+ pax_force_retaddr
14539 ret $REST_SKIP /* pop extended registers */
14540 CFI_ENDPROC
14541 END(ptregscall_common)
14542@@ -800,6 +1084,16 @@ END(interrupt)
14543 CFI_ADJUST_CFA_OFFSET 10*8
14544 call save_args
14545 PARTIAL_FRAME 0
14546+#ifdef CONFIG_PAX_MEMORY_UDEREF
14547+ testb $3, CS(%rdi)
14548+ jnz 1f
14549+ pax_enter_kernel
14550+ jmp 2f
14551+1: pax_enter_kernel_user
14552+2:
14553+#else
14554+ pax_enter_kernel
14555+#endif
14556 call \func
14557 .endm
14558
14559@@ -822,7 +1116,7 @@ ret_from_intr:
14560 CFI_ADJUST_CFA_OFFSET -8
14561 exit_intr:
14562 GET_THREAD_INFO(%rcx)
14563- testl $3,CS-ARGOFFSET(%rsp)
14564+ testb $3,CS-ARGOFFSET(%rsp)
14565 je retint_kernel
14566
14567 /* Interrupt came from user space */
14568@@ -844,12 +1138,16 @@ retint_swapgs: /* return to user-space
14569 * The iretq could re-enable interrupts:
14570 */
14571 DISABLE_INTERRUPTS(CLBR_ANY)
14572+ pax_exit_kernel_user
14573+ pax_erase_kstack
14574 TRACE_IRQS_IRETQ
14575 SWAPGS
14576 jmp restore_args
14577
14578 retint_restore_args: /* return to kernel space */
14579 DISABLE_INTERRUPTS(CLBR_ANY)
14580+ pax_exit_kernel
14581+ pax_force_retaddr RIP-ARGOFFSET
14582 /*
14583 * The iretq could re-enable interrupts:
14584 */
14585@@ -1032,6 +1330,16 @@ ENTRY(\sym)
14586 CFI_ADJUST_CFA_OFFSET 15*8
14587 call error_entry
14588 DEFAULT_FRAME 0
14589+#ifdef CONFIG_PAX_MEMORY_UDEREF
14590+ testb $3, CS(%rsp)
14591+ jnz 1f
14592+ pax_enter_kernel
14593+ jmp 2f
14594+1: pax_enter_kernel_user
14595+2:
14596+#else
14597+ pax_enter_kernel
14598+#endif
14599 movq %rsp,%rdi /* pt_regs pointer */
14600 xorl %esi,%esi /* no error code */
14601 call \do_sym
14602@@ -1049,6 +1357,16 @@ ENTRY(\sym)
14603 subq $15*8, %rsp
14604 call save_paranoid
14605 TRACE_IRQS_OFF
14606+#ifdef CONFIG_PAX_MEMORY_UDEREF
14607+ testb $3, CS(%rsp)
14608+ jnz 1f
14609+ pax_enter_kernel
14610+ jmp 2f
14611+1: pax_enter_kernel_user
14612+2:
14613+#else
14614+ pax_enter_kernel
14615+#endif
14616 movq %rsp,%rdi /* pt_regs pointer */
14617 xorl %esi,%esi /* no error code */
14618 call \do_sym
14619@@ -1066,9 +1384,24 @@ ENTRY(\sym)
14620 subq $15*8, %rsp
14621 call save_paranoid
14622 TRACE_IRQS_OFF
14623+#ifdef CONFIG_PAX_MEMORY_UDEREF
14624+ testb $3, CS(%rsp)
14625+ jnz 1f
14626+ pax_enter_kernel
14627+ jmp 2f
14628+1: pax_enter_kernel_user
14629+2:
14630+#else
14631+ pax_enter_kernel
14632+#endif
14633 movq %rsp,%rdi /* pt_regs pointer */
14634 xorl %esi,%esi /* no error code */
14635- PER_CPU(init_tss, %rbp)
14636+#ifdef CONFIG_SMP
14637+ imul $TSS_size, PER_CPU_VAR(cpu_number), %ebp
14638+ lea init_tss(%rbp), %rbp
14639+#else
14640+ lea init_tss(%rip), %rbp
14641+#endif
14642 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
14643 call \do_sym
14644 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
14645@@ -1085,6 +1418,16 @@ ENTRY(\sym)
14646 CFI_ADJUST_CFA_OFFSET 15*8
14647 call error_entry
14648 DEFAULT_FRAME 0
14649+#ifdef CONFIG_PAX_MEMORY_UDEREF
14650+ testb $3, CS(%rsp)
14651+ jnz 1f
14652+ pax_enter_kernel
14653+ jmp 2f
14654+1: pax_enter_kernel_user
14655+2:
14656+#else
14657+ pax_enter_kernel
14658+#endif
14659 movq %rsp,%rdi /* pt_regs pointer */
14660 movq ORIG_RAX(%rsp),%rsi /* get error code */
14661 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
14662@@ -1104,6 +1447,16 @@ ENTRY(\sym)
14663 call save_paranoid
14664 DEFAULT_FRAME 0
14665 TRACE_IRQS_OFF
14666+#ifdef CONFIG_PAX_MEMORY_UDEREF
14667+ testb $3, CS(%rsp)
14668+ jnz 1f
14669+ pax_enter_kernel
14670+ jmp 2f
14671+1: pax_enter_kernel_user
14672+2:
14673+#else
14674+ pax_enter_kernel
14675+#endif
14676 movq %rsp,%rdi /* pt_regs pointer */
14677 movq ORIG_RAX(%rsp),%rsi /* get error code */
14678 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
14679@@ -1141,6 +1494,7 @@ gs_change:
14680 SWAPGS
14681 popf
14682 CFI_ADJUST_CFA_OFFSET -8
14683+ pax_force_retaddr
14684 ret
14685 CFI_ENDPROC
14686 END(native_load_gs_index)
14687@@ -1195,6 +1549,7 @@ ENTRY(kernel_thread)
14688 */
14689 RESTORE_ALL
14690 UNFAKE_STACK_FRAME
14691+ pax_force_retaddr
14692 ret
14693 CFI_ENDPROC
14694 END(kernel_thread)
14695@@ -1208,6 +1563,7 @@ ENTRY(child_rip)
14696 */
14697 movq %rdi, %rax
14698 movq %rsi, %rdi
14699+ pax_force_fptr %rax
14700 call *%rax
14701 # exit
14702 mov %eax, %edi
14703@@ -1243,6 +1599,7 @@ ENTRY(kernel_execve)
14704 je int_ret_from_sys_call
14705 RESTORE_ARGS
14706 UNFAKE_STACK_FRAME
14707+ pax_force_retaddr
14708 ret
14709 CFI_ENDPROC
14710 END(kernel_execve)
14711@@ -1263,6 +1620,7 @@ ENTRY(call_softirq)
14712 CFI_DEF_CFA_REGISTER rsp
14713 CFI_ADJUST_CFA_OFFSET -8
14714 decl PER_CPU_VAR(irq_count)
14715+ pax_force_retaddr
14716 ret
14717 CFI_ENDPROC
14718 END(call_softirq)
14719@@ -1405,16 +1763,31 @@ ENTRY(paranoid_exit)
14720 TRACE_IRQS_OFF
14721 testl %ebx,%ebx /* swapgs needed? */
14722 jnz paranoid_restore
14723- testl $3,CS(%rsp)
14724+ testb $3,CS(%rsp)
14725 jnz paranoid_userspace
14726+#ifdef CONFIG_PAX_MEMORY_UDEREF
14727+ pax_exit_kernel
14728+ TRACE_IRQS_IRETQ 0
14729+ SWAPGS_UNSAFE_STACK
14730+ RESTORE_ALL 8
14731+ pax_force_retaddr
14732+ jmp irq_return
14733+#endif
14734 paranoid_swapgs:
14735+#ifdef CONFIG_PAX_MEMORY_UDEREF
14736+ pax_exit_kernel_user
14737+#else
14738+ pax_exit_kernel
14739+#endif
14740 TRACE_IRQS_IRETQ 0
14741 SWAPGS_UNSAFE_STACK
14742 RESTORE_ALL 8
14743 jmp irq_return
14744 paranoid_restore:
14745+ pax_exit_kernel
14746 TRACE_IRQS_IRETQ 0
14747 RESTORE_ALL 8
14748+ pax_force_retaddr
14749 jmp irq_return
14750 paranoid_userspace:
14751 GET_THREAD_INFO(%rcx)
14752@@ -1470,12 +1843,13 @@ ENTRY(error_entry)
14753 movq_cfi r14, R14+8
14754 movq_cfi r15, R15+8
14755 xorl %ebx,%ebx
14756- testl $3,CS+8(%rsp)
14757+ testb $3,CS+8(%rsp)
14758 je error_kernelspace
14759 error_swapgs:
14760 SWAPGS
14761 error_sti:
14762 TRACE_IRQS_OFF
14763+ pax_force_retaddr
14764 ret
14765 CFI_ENDPROC
14766
14767@@ -1529,6 +1903,16 @@ ENTRY(nmi)
14768 CFI_ADJUST_CFA_OFFSET 15*8
14769 call save_paranoid
14770 DEFAULT_FRAME 0
14771+#ifdef CONFIG_PAX_MEMORY_UDEREF
14772+ testb $3, CS(%rsp)
14773+ jnz 1f
14774+ pax_enter_kernel
14775+ jmp 2f
14776+1: pax_enter_kernel_user
14777+2:
14778+#else
14779+ pax_enter_kernel
14780+#endif
14781 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
14782 movq %rsp,%rdi
14783 movq $-1,%rsi
14784@@ -1539,12 +1923,28 @@ ENTRY(nmi)
14785 DISABLE_INTERRUPTS(CLBR_NONE)
14786 testl %ebx,%ebx /* swapgs needed? */
14787 jnz nmi_restore
14788- testl $3,CS(%rsp)
14789+ testb $3,CS(%rsp)
14790 jnz nmi_userspace
14791+#ifdef CONFIG_PAX_MEMORY_UDEREF
14792+ pax_exit_kernel
14793+ SWAPGS_UNSAFE_STACK
14794+ RESTORE_ALL 8
14795+ pax_force_retaddr
14796+ jmp irq_return
14797+#endif
14798 nmi_swapgs:
14799+#ifdef CONFIG_PAX_MEMORY_UDEREF
14800+ pax_exit_kernel_user
14801+#else
14802+ pax_exit_kernel
14803+#endif
14804 SWAPGS_UNSAFE_STACK
14805+ RESTORE_ALL 8
14806+ jmp irq_return
14807 nmi_restore:
14808+ pax_exit_kernel
14809 RESTORE_ALL 8
14810+ pax_force_retaddr
14811 jmp irq_return
14812 nmi_userspace:
14813 GET_THREAD_INFO(%rcx)
14814diff -urNp linux-2.6.32.46/arch/x86/kernel/ftrace.c linux-2.6.32.46/arch/x86/kernel/ftrace.c
14815--- linux-2.6.32.46/arch/x86/kernel/ftrace.c 2011-03-27 14:31:47.000000000 -0400
14816+++ linux-2.6.32.46/arch/x86/kernel/ftrace.c 2011-05-04 17:56:20.000000000 -0400
14817@@ -103,7 +103,7 @@ static void *mod_code_ip; /* holds the
14818 static void *mod_code_newcode; /* holds the text to write to the IP */
14819
14820 static unsigned nmi_wait_count;
14821-static atomic_t nmi_update_count = ATOMIC_INIT(0);
14822+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
14823
14824 int ftrace_arch_read_dyn_info(char *buf, int size)
14825 {
14826@@ -111,7 +111,7 @@ int ftrace_arch_read_dyn_info(char *buf,
14827
14828 r = snprintf(buf, size, "%u %u",
14829 nmi_wait_count,
14830- atomic_read(&nmi_update_count));
14831+ atomic_read_unchecked(&nmi_update_count));
14832 return r;
14833 }
14834
14835@@ -149,8 +149,10 @@ void ftrace_nmi_enter(void)
14836 {
14837 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
14838 smp_rmb();
14839+ pax_open_kernel();
14840 ftrace_mod_code();
14841- atomic_inc(&nmi_update_count);
14842+ pax_close_kernel();
14843+ atomic_inc_unchecked(&nmi_update_count);
14844 }
14845 /* Must have previous changes seen before executions */
14846 smp_mb();
14847@@ -215,7 +217,7 @@ do_ftrace_mod_code(unsigned long ip, voi
14848
14849
14850
14851-static unsigned char ftrace_nop[MCOUNT_INSN_SIZE];
14852+static unsigned char ftrace_nop[MCOUNT_INSN_SIZE] __read_only;
14853
14854 static unsigned char *ftrace_nop_replace(void)
14855 {
14856@@ -228,6 +230,8 @@ ftrace_modify_code(unsigned long ip, uns
14857 {
14858 unsigned char replaced[MCOUNT_INSN_SIZE];
14859
14860+ ip = ktla_ktva(ip);
14861+
14862 /*
14863 * Note: Due to modules and __init, code can
14864 * disappear and change, we need to protect against faulting
14865@@ -284,7 +288,7 @@ int ftrace_update_ftrace_func(ftrace_fun
14866 unsigned char old[MCOUNT_INSN_SIZE], *new;
14867 int ret;
14868
14869- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
14870+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
14871 new = ftrace_call_replace(ip, (unsigned long)func);
14872 ret = ftrace_modify_code(ip, old, new);
14873
14874@@ -337,15 +341,15 @@ int __init ftrace_dyn_arch_init(void *da
14875 switch (faulted) {
14876 case 0:
14877 pr_info("ftrace: converting mcount calls to 0f 1f 44 00 00\n");
14878- memcpy(ftrace_nop, ftrace_test_p6nop, MCOUNT_INSN_SIZE);
14879+ memcpy(ftrace_nop, ktla_ktva(ftrace_test_p6nop), MCOUNT_INSN_SIZE);
14880 break;
14881 case 1:
14882 pr_info("ftrace: converting mcount calls to 66 66 66 66 90\n");
14883- memcpy(ftrace_nop, ftrace_test_nop5, MCOUNT_INSN_SIZE);
14884+ memcpy(ftrace_nop, ktla_ktva(ftrace_test_nop5), MCOUNT_INSN_SIZE);
14885 break;
14886 case 2:
14887 pr_info("ftrace: converting mcount calls to jmp . + 5\n");
14888- memcpy(ftrace_nop, ftrace_test_jmp, MCOUNT_INSN_SIZE);
14889+ memcpy(ftrace_nop, ktla_ktva(ftrace_test_jmp), MCOUNT_INSN_SIZE);
14890 break;
14891 }
14892
14893@@ -366,6 +370,8 @@ static int ftrace_mod_jmp(unsigned long
14894 {
14895 unsigned char code[MCOUNT_INSN_SIZE];
14896
14897+ ip = ktla_ktva(ip);
14898+
14899 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
14900 return -EFAULT;
14901
14902diff -urNp linux-2.6.32.46/arch/x86/kernel/head32.c linux-2.6.32.46/arch/x86/kernel/head32.c
14903--- linux-2.6.32.46/arch/x86/kernel/head32.c 2011-03-27 14:31:47.000000000 -0400
14904+++ linux-2.6.32.46/arch/x86/kernel/head32.c 2011-04-17 15:56:46.000000000 -0400
14905@@ -16,6 +16,7 @@
14906 #include <asm/apic.h>
14907 #include <asm/io_apic.h>
14908 #include <asm/bios_ebda.h>
14909+#include <asm/boot.h>
14910
14911 static void __init i386_default_early_setup(void)
14912 {
14913@@ -31,7 +32,7 @@ void __init i386_start_kernel(void)
14914 {
14915 reserve_trampoline_memory();
14916
14917- reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
14918+ reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
14919
14920 #ifdef CONFIG_BLK_DEV_INITRD
14921 /* Reserve INITRD */
14922diff -urNp linux-2.6.32.46/arch/x86/kernel/head_32.S linux-2.6.32.46/arch/x86/kernel/head_32.S
14923--- linux-2.6.32.46/arch/x86/kernel/head_32.S 2011-03-27 14:31:47.000000000 -0400
14924+++ linux-2.6.32.46/arch/x86/kernel/head_32.S 2011-07-06 19:53:33.000000000 -0400
14925@@ -19,10 +19,17 @@
14926 #include <asm/setup.h>
14927 #include <asm/processor-flags.h>
14928 #include <asm/percpu.h>
14929+#include <asm/msr-index.h>
14930
14931 /* Physical address */
14932 #define pa(X) ((X) - __PAGE_OFFSET)
14933
14934+#ifdef CONFIG_PAX_KERNEXEC
14935+#define ta(X) (X)
14936+#else
14937+#define ta(X) ((X) - __PAGE_OFFSET)
14938+#endif
14939+
14940 /*
14941 * References to members of the new_cpu_data structure.
14942 */
14943@@ -52,11 +59,7 @@
14944 * and small than max_low_pfn, otherwise will waste some page table entries
14945 */
14946
14947-#if PTRS_PER_PMD > 1
14948-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
14949-#else
14950-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
14951-#endif
14952+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
14953
14954 /* Enough space to fit pagetables for the low memory linear map */
14955 MAPPING_BEYOND_END = \
14956@@ -73,6 +76,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P
14957 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
14958
14959 /*
14960+ * Real beginning of normal "text" segment
14961+ */
14962+ENTRY(stext)
14963+ENTRY(_stext)
14964+
14965+/*
14966 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
14967 * %esi points to the real-mode code as a 32-bit pointer.
14968 * CS and DS must be 4 GB flat segments, but we don't depend on
14969@@ -80,7 +89,16 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
14970 * can.
14971 */
14972 __HEAD
14973+
14974+#ifdef CONFIG_PAX_KERNEXEC
14975+ jmp startup_32
14976+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
14977+.fill PAGE_SIZE-5,1,0xcc
14978+#endif
14979+
14980 ENTRY(startup_32)
14981+ movl pa(stack_start),%ecx
14982+
14983 /* test KEEP_SEGMENTS flag to see if the bootloader is asking
14984 us to not reload segments */
14985 testb $(1<<6), BP_loadflags(%esi)
14986@@ -95,7 +113,60 @@ ENTRY(startup_32)
14987 movl %eax,%es
14988 movl %eax,%fs
14989 movl %eax,%gs
14990+ movl %eax,%ss
14991 2:
14992+ leal -__PAGE_OFFSET(%ecx),%esp
14993+
14994+#ifdef CONFIG_SMP
14995+ movl $pa(cpu_gdt_table),%edi
14996+ movl $__per_cpu_load,%eax
14997+ movw %ax,__KERNEL_PERCPU + 2(%edi)
14998+ rorl $16,%eax
14999+ movb %al,__KERNEL_PERCPU + 4(%edi)
15000+ movb %ah,__KERNEL_PERCPU + 7(%edi)
15001+ movl $__per_cpu_end - 1,%eax
15002+ subl $__per_cpu_start,%eax
15003+ movw %ax,__KERNEL_PERCPU + 0(%edi)
15004+#endif
15005+
15006+#ifdef CONFIG_PAX_MEMORY_UDEREF
15007+ movl $NR_CPUS,%ecx
15008+ movl $pa(cpu_gdt_table),%edi
15009+1:
15010+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
15011+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
15012+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
15013+ addl $PAGE_SIZE_asm,%edi
15014+ loop 1b
15015+#endif
15016+
15017+#ifdef CONFIG_PAX_KERNEXEC
15018+ movl $pa(boot_gdt),%edi
15019+ movl $__LOAD_PHYSICAL_ADDR,%eax
15020+ movw %ax,__BOOT_CS + 2(%edi)
15021+ rorl $16,%eax
15022+ movb %al,__BOOT_CS + 4(%edi)
15023+ movb %ah,__BOOT_CS + 7(%edi)
15024+ rorl $16,%eax
15025+
15026+ ljmp $(__BOOT_CS),$1f
15027+1:
15028+
15029+ movl $NR_CPUS,%ecx
15030+ movl $pa(cpu_gdt_table),%edi
15031+ addl $__PAGE_OFFSET,%eax
15032+1:
15033+ movw %ax,__KERNEL_CS + 2(%edi)
15034+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
15035+ rorl $16,%eax
15036+ movb %al,__KERNEL_CS + 4(%edi)
15037+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
15038+ movb %ah,__KERNEL_CS + 7(%edi)
15039+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
15040+ rorl $16,%eax
15041+ addl $PAGE_SIZE_asm,%edi
15042+ loop 1b
15043+#endif
15044
15045 /*
15046 * Clear BSS first so that there are no surprises...
15047@@ -140,9 +211,7 @@ ENTRY(startup_32)
15048 cmpl $num_subarch_entries, %eax
15049 jae bad_subarch
15050
15051- movl pa(subarch_entries)(,%eax,4), %eax
15052- subl $__PAGE_OFFSET, %eax
15053- jmp *%eax
15054+ jmp *pa(subarch_entries)(,%eax,4)
15055
15056 bad_subarch:
15057 WEAK(lguest_entry)
15058@@ -154,10 +223,10 @@ WEAK(xen_entry)
15059 __INITDATA
15060
15061 subarch_entries:
15062- .long default_entry /* normal x86/PC */
15063- .long lguest_entry /* lguest hypervisor */
15064- .long xen_entry /* Xen hypervisor */
15065- .long default_entry /* Moorestown MID */
15066+ .long ta(default_entry) /* normal x86/PC */
15067+ .long ta(lguest_entry) /* lguest hypervisor */
15068+ .long ta(xen_entry) /* Xen hypervisor */
15069+ .long ta(default_entry) /* Moorestown MID */
15070 num_subarch_entries = (. - subarch_entries) / 4
15071 .previous
15072 #endif /* CONFIG_PARAVIRT */
15073@@ -218,8 +287,11 @@ default_entry:
15074 movl %eax, pa(max_pfn_mapped)
15075
15076 /* Do early initialization of the fixmap area */
15077- movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax
15078- movl %eax,pa(swapper_pg_pmd+0x1000*KPMDS-8)
15079+#ifdef CONFIG_COMPAT_VDSO
15080+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_pmd+0x1000*KPMDS-8)
15081+#else
15082+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-8)
15083+#endif
15084 #else /* Not PAE */
15085
15086 page_pde_offset = (__PAGE_OFFSET >> 20);
15087@@ -249,8 +321,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
15088 movl %eax, pa(max_pfn_mapped)
15089
15090 /* Do early initialization of the fixmap area */
15091- movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax
15092- movl %eax,pa(swapper_pg_dir+0xffc)
15093+#ifdef CONFIG_COMPAT_VDSO
15094+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_dir+0xffc)
15095+#else
15096+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xffc)
15097+#endif
15098 #endif
15099 jmp 3f
15100 /*
15101@@ -272,6 +347,9 @@ ENTRY(startup_32_smp)
15102 movl %eax,%es
15103 movl %eax,%fs
15104 movl %eax,%gs
15105+ movl pa(stack_start),%ecx
15106+ movl %eax,%ss
15107+ leal -__PAGE_OFFSET(%ecx),%esp
15108 #endif /* CONFIG_SMP */
15109 3:
15110
15111@@ -297,6 +375,7 @@ ENTRY(startup_32_smp)
15112 orl %edx,%eax
15113 movl %eax,%cr4
15114
15115+#ifdef CONFIG_X86_PAE
15116 btl $5, %eax # check if PAE is enabled
15117 jnc 6f
15118
15119@@ -305,6 +384,10 @@ ENTRY(startup_32_smp)
15120 cpuid
15121 cmpl $0x80000000, %eax
15122 jbe 6f
15123+
15124+ /* Clear bogus XD_DISABLE bits */
15125+ call verify_cpu
15126+
15127 mov $0x80000001, %eax
15128 cpuid
15129 /* Execute Disable bit supported? */
15130@@ -312,13 +395,17 @@ ENTRY(startup_32_smp)
15131 jnc 6f
15132
15133 /* Setup EFER (Extended Feature Enable Register) */
15134- movl $0xc0000080, %ecx
15135+ movl $MSR_EFER, %ecx
15136 rdmsr
15137
15138 btsl $11, %eax
15139 /* Make changes effective */
15140 wrmsr
15141
15142+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
15143+ movl $1,pa(nx_enabled)
15144+#endif
15145+
15146 6:
15147
15148 /*
15149@@ -331,8 +418,8 @@ ENTRY(startup_32_smp)
15150 movl %eax,%cr0 /* ..and set paging (PG) bit */
15151 ljmp $__BOOT_CS,$1f /* Clear prefetch and normalize %eip */
15152 1:
15153- /* Set up the stack pointer */
15154- lss stack_start,%esp
15155+ /* Shift the stack pointer to a virtual address */
15156+ addl $__PAGE_OFFSET, %esp
15157
15158 /*
15159 * Initialize eflags. Some BIOS's leave bits like NT set. This would
15160@@ -344,9 +431,7 @@ ENTRY(startup_32_smp)
15161
15162 #ifdef CONFIG_SMP
15163 cmpb $0, ready
15164- jz 1f /* Initial CPU cleans BSS */
15165- jmp checkCPUtype
15166-1:
15167+ jnz checkCPUtype
15168 #endif /* CONFIG_SMP */
15169
15170 /*
15171@@ -424,7 +509,7 @@ is386: movl $2,%ecx # set MP
15172 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
15173 movl %eax,%ss # after changing gdt.
15174
15175- movl $(__USER_DS),%eax # DS/ES contains default USER segment
15176+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
15177 movl %eax,%ds
15178 movl %eax,%es
15179
15180@@ -438,15 +523,22 @@ is386: movl $2,%ecx # set MP
15181 */
15182 cmpb $0,ready
15183 jne 1f
15184- movl $per_cpu__gdt_page,%eax
15185+ movl $cpu_gdt_table,%eax
15186 movl $per_cpu__stack_canary,%ecx
15187+#ifdef CONFIG_SMP
15188+ addl $__per_cpu_load,%ecx
15189+#endif
15190 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
15191 shrl $16, %ecx
15192 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
15193 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
15194 1:
15195-#endif
15196 movl $(__KERNEL_STACK_CANARY),%eax
15197+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
15198+ movl $(__USER_DS),%eax
15199+#else
15200+ xorl %eax,%eax
15201+#endif
15202 movl %eax,%gs
15203
15204 xorl %eax,%eax # Clear LDT
15205@@ -454,14 +546,7 @@ is386: movl $2,%ecx # set MP
15206
15207 cld # gcc2 wants the direction flag cleared at all times
15208 pushl $0 # fake return address for unwinder
15209-#ifdef CONFIG_SMP
15210- movb ready, %cl
15211 movb $1, ready
15212- cmpb $0,%cl # the first CPU calls start_kernel
15213- je 1f
15214- movl (stack_start), %esp
15215-1:
15216-#endif /* CONFIG_SMP */
15217 jmp *(initial_code)
15218
15219 /*
15220@@ -546,22 +631,22 @@ early_page_fault:
15221 jmp early_fault
15222
15223 early_fault:
15224- cld
15225 #ifdef CONFIG_PRINTK
15226+ cmpl $1,%ss:early_recursion_flag
15227+ je hlt_loop
15228+ incl %ss:early_recursion_flag
15229+ cld
15230 pusha
15231 movl $(__KERNEL_DS),%eax
15232 movl %eax,%ds
15233 movl %eax,%es
15234- cmpl $2,early_recursion_flag
15235- je hlt_loop
15236- incl early_recursion_flag
15237 movl %cr2,%eax
15238 pushl %eax
15239 pushl %edx /* trapno */
15240 pushl $fault_msg
15241 call printk
15242+; call dump_stack
15243 #endif
15244- call dump_stack
15245 hlt_loop:
15246 hlt
15247 jmp hlt_loop
15248@@ -569,8 +654,11 @@ hlt_loop:
15249 /* This is the default interrupt "handler" :-) */
15250 ALIGN
15251 ignore_int:
15252- cld
15253 #ifdef CONFIG_PRINTK
15254+ cmpl $2,%ss:early_recursion_flag
15255+ je hlt_loop
15256+ incl %ss:early_recursion_flag
15257+ cld
15258 pushl %eax
15259 pushl %ecx
15260 pushl %edx
15261@@ -579,9 +667,6 @@ ignore_int:
15262 movl $(__KERNEL_DS),%eax
15263 movl %eax,%ds
15264 movl %eax,%es
15265- cmpl $2,early_recursion_flag
15266- je hlt_loop
15267- incl early_recursion_flag
15268 pushl 16(%esp)
15269 pushl 24(%esp)
15270 pushl 32(%esp)
15271@@ -600,6 +685,8 @@ ignore_int:
15272 #endif
15273 iret
15274
15275+#include "verify_cpu.S"
15276+
15277 __REFDATA
15278 .align 4
15279 ENTRY(initial_code)
15280@@ -610,31 +697,47 @@ ENTRY(initial_page_table)
15281 /*
15282 * BSS section
15283 */
15284-__PAGE_ALIGNED_BSS
15285- .align PAGE_SIZE_asm
15286 #ifdef CONFIG_X86_PAE
15287+.section .swapper_pg_pmd,"a",@progbits
15288 swapper_pg_pmd:
15289 .fill 1024*KPMDS,4,0
15290 #else
15291+.section .swapper_pg_dir,"a",@progbits
15292 ENTRY(swapper_pg_dir)
15293 .fill 1024,4,0
15294 #endif
15295+.section .swapper_pg_fixmap,"a",@progbits
15296 swapper_pg_fixmap:
15297 .fill 1024,4,0
15298 #ifdef CONFIG_X86_TRAMPOLINE
15299+.section .trampoline_pg_dir,"a",@progbits
15300 ENTRY(trampoline_pg_dir)
15301+#ifdef CONFIG_X86_PAE
15302+ .fill 4,8,0
15303+#else
15304 .fill 1024,4,0
15305 #endif
15306+#endif
15307+
15308+.section .empty_zero_page,"a",@progbits
15309 ENTRY(empty_zero_page)
15310 .fill 4096,1,0
15311
15312 /*
15313+ * The IDT has to be page-aligned to simplify the Pentium
15314+ * F0 0F bug workaround.. We have a special link segment
15315+ * for this.
15316+ */
15317+.section .idt,"a",@progbits
15318+ENTRY(idt_table)
15319+ .fill 256,8,0
15320+
15321+/*
15322 * This starts the data section.
15323 */
15324 #ifdef CONFIG_X86_PAE
15325-__PAGE_ALIGNED_DATA
15326- /* Page-aligned for the benefit of paravirt? */
15327- .align PAGE_SIZE_asm
15328+.section .swapper_pg_dir,"a",@progbits
15329+
15330 ENTRY(swapper_pg_dir)
15331 .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
15332 # if KPMDS == 3
15333@@ -653,15 +756,24 @@ ENTRY(swapper_pg_dir)
15334 # error "Kernel PMDs should be 1, 2 or 3"
15335 # endif
15336 .align PAGE_SIZE_asm /* needs to be page-sized too */
15337+
15338+#ifdef CONFIG_PAX_PER_CPU_PGD
15339+ENTRY(cpu_pgd)
15340+ .rept NR_CPUS
15341+ .fill 4,8,0
15342+ .endr
15343+#endif
15344+
15345 #endif
15346
15347 .data
15348+.balign 4
15349 ENTRY(stack_start)
15350- .long init_thread_union+THREAD_SIZE
15351- .long __BOOT_DS
15352+ .long init_thread_union+THREAD_SIZE-8
15353
15354 ready: .byte 0
15355
15356+.section .rodata,"a",@progbits
15357 early_recursion_flag:
15358 .long 0
15359
15360@@ -697,7 +809,7 @@ fault_msg:
15361 .word 0 # 32 bit align gdt_desc.address
15362 boot_gdt_descr:
15363 .word __BOOT_DS+7
15364- .long boot_gdt - __PAGE_OFFSET
15365+ .long pa(boot_gdt)
15366
15367 .word 0 # 32-bit align idt_desc.address
15368 idt_descr:
15369@@ -708,7 +820,7 @@ idt_descr:
15370 .word 0 # 32 bit align gdt_desc.address
15371 ENTRY(early_gdt_descr)
15372 .word GDT_ENTRIES*8-1
15373- .long per_cpu__gdt_page /* Overwritten for secondary CPUs */
15374+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
15375
15376 /*
15377 * The boot_gdt must mirror the equivalent in setup.S and is
15378@@ -717,5 +829,65 @@ ENTRY(early_gdt_descr)
15379 .align L1_CACHE_BYTES
15380 ENTRY(boot_gdt)
15381 .fill GDT_ENTRY_BOOT_CS,8,0
15382- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
15383- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
15384+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
15385+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
15386+
15387+ .align PAGE_SIZE_asm
15388+ENTRY(cpu_gdt_table)
15389+ .rept NR_CPUS
15390+ .quad 0x0000000000000000 /* NULL descriptor */
15391+ .quad 0x0000000000000000 /* 0x0b reserved */
15392+ .quad 0x0000000000000000 /* 0x13 reserved */
15393+ .quad 0x0000000000000000 /* 0x1b reserved */
15394+
15395+#ifdef CONFIG_PAX_KERNEXEC
15396+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
15397+#else
15398+ .quad 0x0000000000000000 /* 0x20 unused */
15399+#endif
15400+
15401+ .quad 0x0000000000000000 /* 0x28 unused */
15402+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
15403+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
15404+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
15405+ .quad 0x0000000000000000 /* 0x4b reserved */
15406+ .quad 0x0000000000000000 /* 0x53 reserved */
15407+ .quad 0x0000000000000000 /* 0x5b reserved */
15408+
15409+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
15410+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
15411+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
15412+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
15413+
15414+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
15415+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
15416+
15417+ /*
15418+ * Segments used for calling PnP BIOS have byte granularity.
15419+ * The code segments and data segments have fixed 64k limits,
15420+ * the transfer segment sizes are set at run time.
15421+ */
15422+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
15423+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
15424+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
15425+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
15426+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
15427+
15428+ /*
15429+ * The APM segments have byte granularity and their bases
15430+ * are set at run time. All have 64k limits.
15431+ */
15432+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
15433+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
15434+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
15435+
15436+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
15437+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
15438+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
15439+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
15440+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
15441+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
15442+
15443+ /* Be sure this is zeroed to avoid false validations in Xen */
15444+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
15445+ .endr
15446diff -urNp linux-2.6.32.46/arch/x86/kernel/head_64.S linux-2.6.32.46/arch/x86/kernel/head_64.S
15447--- linux-2.6.32.46/arch/x86/kernel/head_64.S 2011-03-27 14:31:47.000000000 -0400
15448+++ linux-2.6.32.46/arch/x86/kernel/head_64.S 2011-04-17 15:56:46.000000000 -0400
15449@@ -19,6 +19,7 @@
15450 #include <asm/cache.h>
15451 #include <asm/processor-flags.h>
15452 #include <asm/percpu.h>
15453+#include <asm/cpufeature.h>
15454
15455 #ifdef CONFIG_PARAVIRT
15456 #include <asm/asm-offsets.h>
15457@@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET
15458 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
15459 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
15460 L3_START_KERNEL = pud_index(__START_KERNEL_map)
15461+L4_VMALLOC_START = pgd_index(VMALLOC_START)
15462+L3_VMALLOC_START = pud_index(VMALLOC_START)
15463+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
15464+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
15465
15466 .text
15467 __HEAD
15468@@ -85,35 +90,22 @@ startup_64:
15469 */
15470 addq %rbp, init_level4_pgt + 0(%rip)
15471 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
15472+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
15473+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
15474 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
15475
15476 addq %rbp, level3_ident_pgt + 0(%rip)
15477+#ifndef CONFIG_XEN
15478+ addq %rbp, level3_ident_pgt + 8(%rip)
15479+#endif
15480
15481- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
15482- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
15483+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
15484
15485- addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
15486+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
15487+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
15488
15489- /* Add an Identity mapping if I am above 1G */
15490- leaq _text(%rip), %rdi
15491- andq $PMD_PAGE_MASK, %rdi
15492-
15493- movq %rdi, %rax
15494- shrq $PUD_SHIFT, %rax
15495- andq $(PTRS_PER_PUD - 1), %rax
15496- jz ident_complete
15497-
15498- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
15499- leaq level3_ident_pgt(%rip), %rbx
15500- movq %rdx, 0(%rbx, %rax, 8)
15501-
15502- movq %rdi, %rax
15503- shrq $PMD_SHIFT, %rax
15504- andq $(PTRS_PER_PMD - 1), %rax
15505- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
15506- leaq level2_spare_pgt(%rip), %rbx
15507- movq %rdx, 0(%rbx, %rax, 8)
15508-ident_complete:
15509+ addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
15510+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
15511
15512 /*
15513 * Fixup the kernel text+data virtual addresses. Note that
15514@@ -161,8 +153,8 @@ ENTRY(secondary_startup_64)
15515 * after the boot processor executes this code.
15516 */
15517
15518- /* Enable PAE mode and PGE */
15519- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
15520+ /* Enable PAE mode and PSE/PGE */
15521+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
15522 movq %rax, %cr4
15523
15524 /* Setup early boot stage 4 level pagetables. */
15525@@ -184,9 +176,13 @@ ENTRY(secondary_startup_64)
15526 movl $MSR_EFER, %ecx
15527 rdmsr
15528 btsl $_EFER_SCE, %eax /* Enable System Call */
15529- btl $20,%edi /* No Execute supported? */
15530+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
15531 jnc 1f
15532 btsl $_EFER_NX, %eax
15533+ leaq init_level4_pgt(%rip), %rdi
15534+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
15535+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
15536+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
15537 1: wrmsr /* Make changes effective */
15538
15539 /* Setup cr0 */
15540@@ -262,16 +258,16 @@ ENTRY(secondary_startup_64)
15541 .quad x86_64_start_kernel
15542 ENTRY(initial_gs)
15543 .quad INIT_PER_CPU_VAR(irq_stack_union)
15544- __FINITDATA
15545
15546 ENTRY(stack_start)
15547 .quad init_thread_union+THREAD_SIZE-8
15548 .word 0
15549+ __FINITDATA
15550
15551 bad_address:
15552 jmp bad_address
15553
15554- .section ".init.text","ax"
15555+ __INIT
15556 #ifdef CONFIG_EARLY_PRINTK
15557 .globl early_idt_handlers
15558 early_idt_handlers:
15559@@ -316,18 +312,23 @@ ENTRY(early_idt_handler)
15560 #endif /* EARLY_PRINTK */
15561 1: hlt
15562 jmp 1b
15563+ .previous
15564
15565 #ifdef CONFIG_EARLY_PRINTK
15566+ __INITDATA
15567 early_recursion_flag:
15568 .long 0
15569+ .previous
15570
15571+ .section .rodata,"a",@progbits
15572 early_idt_msg:
15573 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
15574 early_idt_ripmsg:
15575 .asciz "RIP %s\n"
15576-#endif /* CONFIG_EARLY_PRINTK */
15577 .previous
15578+#endif /* CONFIG_EARLY_PRINTK */
15579
15580+ .section .rodata,"a",@progbits
15581 #define NEXT_PAGE(name) \
15582 .balign PAGE_SIZE; \
15583 ENTRY(name)
15584@@ -350,13 +351,36 @@ NEXT_PAGE(init_level4_pgt)
15585 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15586 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
15587 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15588+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
15589+ .quad level3_vmalloc_pgt - __START_KERNEL_map + _KERNPG_TABLE
15590+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
15591+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
15592 .org init_level4_pgt + L4_START_KERNEL*8, 0
15593 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
15594 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
15595
15596+#ifdef CONFIG_PAX_PER_CPU_PGD
15597+NEXT_PAGE(cpu_pgd)
15598+ .rept NR_CPUS
15599+ .fill 512,8,0
15600+ .endr
15601+#endif
15602+
15603 NEXT_PAGE(level3_ident_pgt)
15604 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15605+#ifdef CONFIG_XEN
15606 .fill 511,8,0
15607+#else
15608+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
15609+ .fill 510,8,0
15610+#endif
15611+
15612+NEXT_PAGE(level3_vmalloc_pgt)
15613+ .fill 512,8,0
15614+
15615+NEXT_PAGE(level3_vmemmap_pgt)
15616+ .fill L3_VMEMMAP_START,8,0
15617+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
15618
15619 NEXT_PAGE(level3_kernel_pgt)
15620 .fill L3_START_KERNEL,8,0
15621@@ -364,20 +388,23 @@ NEXT_PAGE(level3_kernel_pgt)
15622 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
15623 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
15624
15625+NEXT_PAGE(level2_vmemmap_pgt)
15626+ .fill 512,8,0
15627+
15628 NEXT_PAGE(level2_fixmap_pgt)
15629- .fill 506,8,0
15630- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
15631- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
15632- .fill 5,8,0
15633+ .fill 507,8,0
15634+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
15635+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
15636+ .fill 4,8,0
15637
15638-NEXT_PAGE(level1_fixmap_pgt)
15639+NEXT_PAGE(level1_vsyscall_pgt)
15640 .fill 512,8,0
15641
15642-NEXT_PAGE(level2_ident_pgt)
15643- /* Since I easily can, map the first 1G.
15644+ /* Since I easily can, map the first 2G.
15645 * Don't set NX because code runs from these pages.
15646 */
15647- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
15648+NEXT_PAGE(level2_ident_pgt)
15649+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
15650
15651 NEXT_PAGE(level2_kernel_pgt)
15652 /*
15653@@ -390,33 +417,55 @@ NEXT_PAGE(level2_kernel_pgt)
15654 * If you want to increase this then increase MODULES_VADDR
15655 * too.)
15656 */
15657- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
15658- KERNEL_IMAGE_SIZE/PMD_SIZE)
15659-
15660-NEXT_PAGE(level2_spare_pgt)
15661- .fill 512, 8, 0
15662+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
15663
15664 #undef PMDS
15665 #undef NEXT_PAGE
15666
15667- .data
15668+ .align PAGE_SIZE
15669+ENTRY(cpu_gdt_table)
15670+ .rept NR_CPUS
15671+ .quad 0x0000000000000000 /* NULL descriptor */
15672+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
15673+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
15674+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
15675+ .quad 0x00cffb000000ffff /* __USER32_CS */
15676+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
15677+ .quad 0x00affb000000ffff /* __USER_CS */
15678+
15679+#ifdef CONFIG_PAX_KERNEXEC
15680+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
15681+#else
15682+ .quad 0x0 /* unused */
15683+#endif
15684+
15685+ .quad 0,0 /* TSS */
15686+ .quad 0,0 /* LDT */
15687+ .quad 0,0,0 /* three TLS descriptors */
15688+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
15689+ /* asm/segment.h:GDT_ENTRIES must match this */
15690+
15691+ /* zero the remaining page */
15692+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
15693+ .endr
15694+
15695 .align 16
15696 .globl early_gdt_descr
15697 early_gdt_descr:
15698 .word GDT_ENTRIES*8-1
15699 early_gdt_descr_base:
15700- .quad INIT_PER_CPU_VAR(gdt_page)
15701+ .quad cpu_gdt_table
15702
15703 ENTRY(phys_base)
15704 /* This must match the first entry in level2_kernel_pgt */
15705 .quad 0x0000000000000000
15706
15707 #include "../../x86/xen/xen-head.S"
15708-
15709- .section .bss, "aw", @nobits
15710+
15711+ .section .rodata,"a",@progbits
15712 .align L1_CACHE_BYTES
15713 ENTRY(idt_table)
15714- .skip IDT_ENTRIES * 16
15715+ .fill 512,8,0
15716
15717 __PAGE_ALIGNED_BSS
15718 .align PAGE_SIZE
15719diff -urNp linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c
15720--- linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c 2011-03-27 14:31:47.000000000 -0400
15721+++ linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:56:46.000000000 -0400
15722@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
15723 EXPORT_SYMBOL(cmpxchg8b_emu);
15724 #endif
15725
15726+EXPORT_SYMBOL_GPL(cpu_gdt_table);
15727+
15728 /* Networking helper routines. */
15729 EXPORT_SYMBOL(csum_partial_copy_generic);
15730+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
15731+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
15732
15733 EXPORT_SYMBOL(__get_user_1);
15734 EXPORT_SYMBOL(__get_user_2);
15735@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
15736
15737 EXPORT_SYMBOL(csum_partial);
15738 EXPORT_SYMBOL(empty_zero_page);
15739+
15740+#ifdef CONFIG_PAX_KERNEXEC
15741+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
15742+#endif
15743diff -urNp linux-2.6.32.46/arch/x86/kernel/i8259.c linux-2.6.32.46/arch/x86/kernel/i8259.c
15744--- linux-2.6.32.46/arch/x86/kernel/i8259.c 2011-03-27 14:31:47.000000000 -0400
15745+++ linux-2.6.32.46/arch/x86/kernel/i8259.c 2011-05-04 17:56:28.000000000 -0400
15746@@ -208,7 +208,7 @@ spurious_8259A_irq:
15747 "spurious 8259A interrupt: IRQ%d.\n", irq);
15748 spurious_irq_mask |= irqmask;
15749 }
15750- atomic_inc(&irq_err_count);
15751+ atomic_inc_unchecked(&irq_err_count);
15752 /*
15753 * Theoretically we do not have to handle this IRQ,
15754 * but in Linux this does not cause problems and is
15755diff -urNp linux-2.6.32.46/arch/x86/kernel/init_task.c linux-2.6.32.46/arch/x86/kernel/init_task.c
15756--- linux-2.6.32.46/arch/x86/kernel/init_task.c 2011-03-27 14:31:47.000000000 -0400
15757+++ linux-2.6.32.46/arch/x86/kernel/init_task.c 2011-04-17 15:56:46.000000000 -0400
15758@@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
15759 * way process stacks are handled. This is done by having a special
15760 * "init_task" linker map entry..
15761 */
15762-union thread_union init_thread_union __init_task_data =
15763- { INIT_THREAD_INFO(init_task) };
15764+union thread_union init_thread_union __init_task_data;
15765
15766 /*
15767 * Initial task structure.
15768@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
15769 * section. Since TSS's are completely CPU-local, we want them
15770 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
15771 */
15772-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
15773-
15774+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
15775+EXPORT_SYMBOL(init_tss);
15776diff -urNp linux-2.6.32.46/arch/x86/kernel/ioport.c linux-2.6.32.46/arch/x86/kernel/ioport.c
15777--- linux-2.6.32.46/arch/x86/kernel/ioport.c 2011-03-27 14:31:47.000000000 -0400
15778+++ linux-2.6.32.46/arch/x86/kernel/ioport.c 2011-04-17 15:56:46.000000000 -0400
15779@@ -6,6 +6,7 @@
15780 #include <linux/sched.h>
15781 #include <linux/kernel.h>
15782 #include <linux/capability.h>
15783+#include <linux/security.h>
15784 #include <linux/errno.h>
15785 #include <linux/types.h>
15786 #include <linux/ioport.h>
15787@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long
15788
15789 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
15790 return -EINVAL;
15791+#ifdef CONFIG_GRKERNSEC_IO
15792+ if (turn_on && grsec_disable_privio) {
15793+ gr_handle_ioperm();
15794+ return -EPERM;
15795+ }
15796+#endif
15797 if (turn_on && !capable(CAP_SYS_RAWIO))
15798 return -EPERM;
15799
15800@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long
15801 * because the ->io_bitmap_max value must match the bitmap
15802 * contents:
15803 */
15804- tss = &per_cpu(init_tss, get_cpu());
15805+ tss = init_tss + get_cpu();
15806
15807 set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
15808
15809@@ -111,6 +118,12 @@ static int do_iopl(unsigned int level, s
15810 return -EINVAL;
15811 /* Trying to gain more privileges? */
15812 if (level > old) {
15813+#ifdef CONFIG_GRKERNSEC_IO
15814+ if (grsec_disable_privio) {
15815+ gr_handle_iopl();
15816+ return -EPERM;
15817+ }
15818+#endif
15819 if (!capable(CAP_SYS_RAWIO))
15820 return -EPERM;
15821 }
15822diff -urNp linux-2.6.32.46/arch/x86/kernel/irq_32.c linux-2.6.32.46/arch/x86/kernel/irq_32.c
15823--- linux-2.6.32.46/arch/x86/kernel/irq_32.c 2011-03-27 14:31:47.000000000 -0400
15824+++ linux-2.6.32.46/arch/x86/kernel/irq_32.c 2011-07-06 19:53:33.000000000 -0400
15825@@ -35,7 +35,7 @@ static int check_stack_overflow(void)
15826 __asm__ __volatile__("andl %%esp,%0" :
15827 "=r" (sp) : "0" (THREAD_SIZE - 1));
15828
15829- return sp < (sizeof(struct thread_info) + STACK_WARN);
15830+ return sp < STACK_WARN;
15831 }
15832
15833 static void print_stack_overflow(void)
15834@@ -54,9 +54,9 @@ static inline void print_stack_overflow(
15835 * per-CPU IRQ handling contexts (thread information and stack)
15836 */
15837 union irq_ctx {
15838- struct thread_info tinfo;
15839- u32 stack[THREAD_SIZE/sizeof(u32)];
15840-} __attribute__((aligned(PAGE_SIZE)));
15841+ unsigned long previous_esp;
15842+ u32 stack[THREAD_SIZE/sizeof(u32)];
15843+} __attribute__((aligned(THREAD_SIZE)));
15844
15845 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
15846 static DEFINE_PER_CPU(union irq_ctx *, softirq_ctx);
15847@@ -78,10 +78,9 @@ static void call_on_stack(void *func, vo
15848 static inline int
15849 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15850 {
15851- union irq_ctx *curctx, *irqctx;
15852+ union irq_ctx *irqctx;
15853 u32 *isp, arg1, arg2;
15854
15855- curctx = (union irq_ctx *) current_thread_info();
15856 irqctx = __get_cpu_var(hardirq_ctx);
15857
15858 /*
15859@@ -90,21 +89,16 @@ execute_on_irq_stack(int overflow, struc
15860 * handler) we can't do that and just have to keep using the
15861 * current stack (which is the irq stack already after all)
15862 */
15863- if (unlikely(curctx == irqctx))
15864+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
15865 return 0;
15866
15867 /* build the stack frame on the IRQ stack */
15868- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
15869- irqctx->tinfo.task = curctx->tinfo.task;
15870- irqctx->tinfo.previous_esp = current_stack_pointer;
15871+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
15872+ irqctx->previous_esp = current_stack_pointer;
15873
15874- /*
15875- * Copy the softirq bits in preempt_count so that the
15876- * softirq checks work in the hardirq context.
15877- */
15878- irqctx->tinfo.preempt_count =
15879- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
15880- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
15881+#ifdef CONFIG_PAX_MEMORY_UDEREF
15882+ __set_fs(MAKE_MM_SEG(0));
15883+#endif
15884
15885 if (unlikely(overflow))
15886 call_on_stack(print_stack_overflow, isp);
15887@@ -116,6 +110,11 @@ execute_on_irq_stack(int overflow, struc
15888 : "0" (irq), "1" (desc), "2" (isp),
15889 "D" (desc->handle_irq)
15890 : "memory", "cc", "ecx");
15891+
15892+#ifdef CONFIG_PAX_MEMORY_UDEREF
15893+ __set_fs(current_thread_info()->addr_limit);
15894+#endif
15895+
15896 return 1;
15897 }
15898
15899@@ -124,28 +123,11 @@ execute_on_irq_stack(int overflow, struc
15900 */
15901 void __cpuinit irq_ctx_init(int cpu)
15902 {
15903- union irq_ctx *irqctx;
15904-
15905 if (per_cpu(hardirq_ctx, cpu))
15906 return;
15907
15908- irqctx = &per_cpu(hardirq_stack, cpu);
15909- irqctx->tinfo.task = NULL;
15910- irqctx->tinfo.exec_domain = NULL;
15911- irqctx->tinfo.cpu = cpu;
15912- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
15913- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
15914-
15915- per_cpu(hardirq_ctx, cpu) = irqctx;
15916-
15917- irqctx = &per_cpu(softirq_stack, cpu);
15918- irqctx->tinfo.task = NULL;
15919- irqctx->tinfo.exec_domain = NULL;
15920- irqctx->tinfo.cpu = cpu;
15921- irqctx->tinfo.preempt_count = 0;
15922- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
15923-
15924- per_cpu(softirq_ctx, cpu) = irqctx;
15925+ per_cpu(hardirq_ctx, cpu) = &per_cpu(hardirq_stack, cpu);
15926+ per_cpu(softirq_ctx, cpu) = &per_cpu(softirq_stack, cpu);
15927
15928 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
15929 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
15930@@ -159,7 +141,6 @@ void irq_ctx_exit(int cpu)
15931 asmlinkage void do_softirq(void)
15932 {
15933 unsigned long flags;
15934- struct thread_info *curctx;
15935 union irq_ctx *irqctx;
15936 u32 *isp;
15937
15938@@ -169,15 +150,22 @@ asmlinkage void do_softirq(void)
15939 local_irq_save(flags);
15940
15941 if (local_softirq_pending()) {
15942- curctx = current_thread_info();
15943 irqctx = __get_cpu_var(softirq_ctx);
15944- irqctx->tinfo.task = curctx->task;
15945- irqctx->tinfo.previous_esp = current_stack_pointer;
15946+ irqctx->previous_esp = current_stack_pointer;
15947
15948 /* build the stack frame on the softirq stack */
15949- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
15950+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
15951+
15952+#ifdef CONFIG_PAX_MEMORY_UDEREF
15953+ __set_fs(MAKE_MM_SEG(0));
15954+#endif
15955
15956 call_on_stack(__do_softirq, isp);
15957+
15958+#ifdef CONFIG_PAX_MEMORY_UDEREF
15959+ __set_fs(current_thread_info()->addr_limit);
15960+#endif
15961+
15962 /*
15963 * Shouldnt happen, we returned above if in_interrupt():
15964 */
15965diff -urNp linux-2.6.32.46/arch/x86/kernel/irq.c linux-2.6.32.46/arch/x86/kernel/irq.c
15966--- linux-2.6.32.46/arch/x86/kernel/irq.c 2011-03-27 14:31:47.000000000 -0400
15967+++ linux-2.6.32.46/arch/x86/kernel/irq.c 2011-05-04 17:56:28.000000000 -0400
15968@@ -15,7 +15,7 @@
15969 #include <asm/mce.h>
15970 #include <asm/hw_irq.h>
15971
15972-atomic_t irq_err_count;
15973+atomic_unchecked_t irq_err_count;
15974
15975 /* Function pointer for generic interrupt vector handling */
15976 void (*generic_interrupt_extension)(void) = NULL;
15977@@ -114,9 +114,9 @@ static int show_other_interrupts(struct
15978 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
15979 seq_printf(p, " Machine check polls\n");
15980 #endif
15981- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
15982+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
15983 #if defined(CONFIG_X86_IO_APIC)
15984- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
15985+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
15986 #endif
15987 return 0;
15988 }
15989@@ -209,10 +209,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
15990
15991 u64 arch_irq_stat(void)
15992 {
15993- u64 sum = atomic_read(&irq_err_count);
15994+ u64 sum = atomic_read_unchecked(&irq_err_count);
15995
15996 #ifdef CONFIG_X86_IO_APIC
15997- sum += atomic_read(&irq_mis_count);
15998+ sum += atomic_read_unchecked(&irq_mis_count);
15999 #endif
16000 return sum;
16001 }
16002diff -urNp linux-2.6.32.46/arch/x86/kernel/kgdb.c linux-2.6.32.46/arch/x86/kernel/kgdb.c
16003--- linux-2.6.32.46/arch/x86/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400
16004+++ linux-2.6.32.46/arch/x86/kernel/kgdb.c 2011-05-04 17:56:20.000000000 -0400
16005@@ -390,13 +390,13 @@ int kgdb_arch_handle_exception(int e_vec
16006
16007 /* clear the trace bit */
16008 linux_regs->flags &= ~X86_EFLAGS_TF;
16009- atomic_set(&kgdb_cpu_doing_single_step, -1);
16010+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
16011
16012 /* set the trace bit if we're stepping */
16013 if (remcomInBuffer[0] == 's') {
16014 linux_regs->flags |= X86_EFLAGS_TF;
16015 kgdb_single_step = 1;
16016- atomic_set(&kgdb_cpu_doing_single_step,
16017+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
16018 raw_smp_processor_id());
16019 }
16020
16021@@ -476,7 +476,7 @@ static int __kgdb_notify(struct die_args
16022 break;
16023
16024 case DIE_DEBUG:
16025- if (atomic_read(&kgdb_cpu_doing_single_step) ==
16026+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) ==
16027 raw_smp_processor_id()) {
16028 if (user_mode(regs))
16029 return single_step_cont(regs, args);
16030@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
16031 return instruction_pointer(regs);
16032 }
16033
16034-struct kgdb_arch arch_kgdb_ops = {
16035+const struct kgdb_arch arch_kgdb_ops = {
16036 /* Breakpoint instruction: */
16037 .gdb_bpt_instr = { 0xcc },
16038 .flags = KGDB_HW_BREAKPOINT,
16039diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/kernel/kprobes.c
16040--- linux-2.6.32.46/arch/x86/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400
16041+++ linux-2.6.32.46/arch/x86/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400
16042@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
16043 char op;
16044 s32 raddr;
16045 } __attribute__((packed)) * jop;
16046- jop = (struct __arch_jmp_op *)from;
16047+
16048+ jop = (struct __arch_jmp_op *)(ktla_ktva(from));
16049+
16050+ pax_open_kernel();
16051 jop->raddr = (s32)((long)(to) - ((long)(from) + 5));
16052 jop->op = RELATIVEJUMP_INSTRUCTION;
16053+ pax_close_kernel();
16054 }
16055
16056 /*
16057@@ -193,7 +197,7 @@ static int __kprobes can_boost(kprobe_op
16058 kprobe_opcode_t opcode;
16059 kprobe_opcode_t *orig_opcodes = opcodes;
16060
16061- if (search_exception_tables((unsigned long)opcodes))
16062+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
16063 return 0; /* Page fault may occur on this address. */
16064
16065 retry:
16066@@ -337,7 +341,9 @@ static void __kprobes fix_riprel(struct
16067 disp = (u8 *) p->addr + *((s32 *) insn) -
16068 (u8 *) p->ainsn.insn;
16069 BUG_ON((s64) (s32) disp != disp); /* Sanity check. */
16070+ pax_open_kernel();
16071 *(s32 *)insn = (s32) disp;
16072+ pax_close_kernel();
16073 }
16074 }
16075 #endif
16076@@ -345,16 +351,18 @@ static void __kprobes fix_riprel(struct
16077
16078 static void __kprobes arch_copy_kprobe(struct kprobe *p)
16079 {
16080- memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
16081+ pax_open_kernel();
16082+ memcpy(p->ainsn.insn, ktla_ktva(p->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
16083+ pax_close_kernel();
16084
16085 fix_riprel(p);
16086
16087- if (can_boost(p->addr))
16088+ if (can_boost(ktla_ktva(p->addr)))
16089 p->ainsn.boostable = 0;
16090 else
16091 p->ainsn.boostable = -1;
16092
16093- p->opcode = *p->addr;
16094+ p->opcode = *(ktla_ktva(p->addr));
16095 }
16096
16097 int __kprobes arch_prepare_kprobe(struct kprobe *p)
16098@@ -432,7 +440,7 @@ static void __kprobes prepare_singlestep
16099 if (p->opcode == BREAKPOINT_INSTRUCTION)
16100 regs->ip = (unsigned long)p->addr;
16101 else
16102- regs->ip = (unsigned long)p->ainsn.insn;
16103+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
16104 }
16105
16106 void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
16107@@ -453,7 +461,7 @@ static void __kprobes setup_singlestep(s
16108 if (p->ainsn.boostable == 1 && !p->post_handler) {
16109 /* Boost up -- we can execute copied instructions directly */
16110 reset_current_kprobe();
16111- regs->ip = (unsigned long)p->ainsn.insn;
16112+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
16113 preempt_enable_no_resched();
16114 return;
16115 }
16116@@ -523,7 +531,7 @@ static int __kprobes kprobe_handler(stru
16117 struct kprobe_ctlblk *kcb;
16118
16119 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
16120- if (*addr != BREAKPOINT_INSTRUCTION) {
16121+ if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
16122 /*
16123 * The breakpoint instruction was removed right
16124 * after we hit it. Another cpu has removed
16125@@ -775,7 +783,7 @@ static void __kprobes resume_execution(s
16126 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
16127 {
16128 unsigned long *tos = stack_addr(regs);
16129- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
16130+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
16131 unsigned long orig_ip = (unsigned long)p->addr;
16132 kprobe_opcode_t *insn = p->ainsn.insn;
16133
16134@@ -958,7 +966,7 @@ int __kprobes kprobe_exceptions_notify(s
16135 struct die_args *args = data;
16136 int ret = NOTIFY_DONE;
16137
16138- if (args->regs && user_mode_vm(args->regs))
16139+ if (args->regs && user_mode(args->regs))
16140 return ret;
16141
16142 switch (val) {
16143diff -urNp linux-2.6.32.46/arch/x86/kernel/kvm.c linux-2.6.32.46/arch/x86/kernel/kvm.c
16144--- linux-2.6.32.46/arch/x86/kernel/kvm.c 2011-03-27 14:31:47.000000000 -0400
16145+++ linux-2.6.32.46/arch/x86/kernel/kvm.c 2011-08-24 18:35:52.000000000 -0400
16146@@ -216,6 +216,7 @@ static void __init paravirt_ops_setup(vo
16147 pv_mmu_ops.set_pud = kvm_set_pud;
16148 #if PAGETABLE_LEVELS == 4
16149 pv_mmu_ops.set_pgd = kvm_set_pgd;
16150+ pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
16151 #endif
16152 #endif
16153 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
16154diff -urNp linux-2.6.32.46/arch/x86/kernel/ldt.c linux-2.6.32.46/arch/x86/kernel/ldt.c
16155--- linux-2.6.32.46/arch/x86/kernel/ldt.c 2011-03-27 14:31:47.000000000 -0400
16156+++ linux-2.6.32.46/arch/x86/kernel/ldt.c 2011-04-17 15:56:46.000000000 -0400
16157@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
16158 if (reload) {
16159 #ifdef CONFIG_SMP
16160 preempt_disable();
16161- load_LDT(pc);
16162+ load_LDT_nolock(pc);
16163 if (!cpumask_equal(mm_cpumask(current->mm),
16164 cpumask_of(smp_processor_id())))
16165 smp_call_function(flush_ldt, current->mm, 1);
16166 preempt_enable();
16167 #else
16168- load_LDT(pc);
16169+ load_LDT_nolock(pc);
16170 #endif
16171 }
16172 if (oldsize) {
16173@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t
16174 return err;
16175
16176 for (i = 0; i < old->size; i++)
16177- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
16178+ write_ldt_entry(new->ldt, i, old->ldt + i);
16179 return 0;
16180 }
16181
16182@@ -115,6 +115,24 @@ int init_new_context(struct task_struct
16183 retval = copy_ldt(&mm->context, &old_mm->context);
16184 mutex_unlock(&old_mm->context.lock);
16185 }
16186+
16187+ if (tsk == current) {
16188+ mm->context.vdso = 0;
16189+
16190+#ifdef CONFIG_X86_32
16191+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
16192+ mm->context.user_cs_base = 0UL;
16193+ mm->context.user_cs_limit = ~0UL;
16194+
16195+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
16196+ cpus_clear(mm->context.cpu_user_cs_mask);
16197+#endif
16198+
16199+#endif
16200+#endif
16201+
16202+ }
16203+
16204 return retval;
16205 }
16206
16207@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, u
16208 }
16209 }
16210
16211+#ifdef CONFIG_PAX_SEGMEXEC
16212+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
16213+ error = -EINVAL;
16214+ goto out_unlock;
16215+ }
16216+#endif
16217+
16218 fill_ldt(&ldt, &ldt_info);
16219 if (oldmode)
16220 ldt.avl = 0;
16221diff -urNp linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c
16222--- linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c 2011-03-27 14:31:47.000000000 -0400
16223+++ linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:56:46.000000000 -0400
16224@@ -26,7 +26,7 @@
16225 #include <asm/system.h>
16226 #include <asm/cacheflush.h>
16227
16228-static void set_idt(void *newidt, __u16 limit)
16229+static void set_idt(struct desc_struct *newidt, __u16 limit)
16230 {
16231 struct desc_ptr curidt;
16232
16233@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16
16234 }
16235
16236
16237-static void set_gdt(void *newgdt, __u16 limit)
16238+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
16239 {
16240 struct desc_ptr curgdt;
16241
16242@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
16243 }
16244
16245 control_page = page_address(image->control_code_page);
16246- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
16247+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
16248
16249 relocate_kernel_ptr = control_page;
16250 page_list[PA_CONTROL_PAGE] = __pa(control_page);
16251diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_amd.c linux-2.6.32.46/arch/x86/kernel/microcode_amd.c
16252--- linux-2.6.32.46/arch/x86/kernel/microcode_amd.c 2011-04-17 17:00:52.000000000 -0400
16253+++ linux-2.6.32.46/arch/x86/kernel/microcode_amd.c 2011-04-17 17:03:05.000000000 -0400
16254@@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int c
16255 uci->mc = NULL;
16256 }
16257
16258-static struct microcode_ops microcode_amd_ops = {
16259+static const struct microcode_ops microcode_amd_ops = {
16260 .request_microcode_user = request_microcode_user,
16261 .request_microcode_fw = request_microcode_fw,
16262 .collect_cpu_info = collect_cpu_info_amd,
16263@@ -372,7 +372,7 @@ static struct microcode_ops microcode_am
16264 .microcode_fini_cpu = microcode_fini_cpu_amd,
16265 };
16266
16267-struct microcode_ops * __init init_amd_microcode(void)
16268+const struct microcode_ops * __init init_amd_microcode(void)
16269 {
16270 return &microcode_amd_ops;
16271 }
16272diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_core.c linux-2.6.32.46/arch/x86/kernel/microcode_core.c
16273--- linux-2.6.32.46/arch/x86/kernel/microcode_core.c 2011-03-27 14:31:47.000000000 -0400
16274+++ linux-2.6.32.46/arch/x86/kernel/microcode_core.c 2011-04-17 15:56:46.000000000 -0400
16275@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
16276
16277 #define MICROCODE_VERSION "2.00"
16278
16279-static struct microcode_ops *microcode_ops;
16280+static const struct microcode_ops *microcode_ops;
16281
16282 /*
16283 * Synchronization.
16284diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_intel.c linux-2.6.32.46/arch/x86/kernel/microcode_intel.c
16285--- linux-2.6.32.46/arch/x86/kernel/microcode_intel.c 2011-03-27 14:31:47.000000000 -0400
16286+++ linux-2.6.32.46/arch/x86/kernel/microcode_intel.c 2011-10-06 09:37:08.000000000 -0400
16287@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
16288
16289 static int get_ucode_user(void *to, const void *from, size_t n)
16290 {
16291- return copy_from_user(to, from, n);
16292+ return copy_from_user(to, (const void __force_user *)from, n);
16293 }
16294
16295 static enum ucode_state
16296 request_microcode_user(int cpu, const void __user *buf, size_t size)
16297 {
16298- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
16299+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
16300 }
16301
16302 static void microcode_fini_cpu(int cpu)
16303@@ -460,7 +460,7 @@ static void microcode_fini_cpu(int cpu)
16304 uci->mc = NULL;
16305 }
16306
16307-static struct microcode_ops microcode_intel_ops = {
16308+static const struct microcode_ops microcode_intel_ops = {
16309 .request_microcode_user = request_microcode_user,
16310 .request_microcode_fw = request_microcode_fw,
16311 .collect_cpu_info = collect_cpu_info,
16312@@ -468,7 +468,7 @@ static struct microcode_ops microcode_in
16313 .microcode_fini_cpu = microcode_fini_cpu,
16314 };
16315
16316-struct microcode_ops * __init init_intel_microcode(void)
16317+const struct microcode_ops * __init init_intel_microcode(void)
16318 {
16319 return &microcode_intel_ops;
16320 }
16321diff -urNp linux-2.6.32.46/arch/x86/kernel/module.c linux-2.6.32.46/arch/x86/kernel/module.c
16322--- linux-2.6.32.46/arch/x86/kernel/module.c 2011-03-27 14:31:47.000000000 -0400
16323+++ linux-2.6.32.46/arch/x86/kernel/module.c 2011-04-17 15:56:46.000000000 -0400
16324@@ -34,7 +34,7 @@
16325 #define DEBUGP(fmt...)
16326 #endif
16327
16328-void *module_alloc(unsigned long size)
16329+static void *__module_alloc(unsigned long size, pgprot_t prot)
16330 {
16331 struct vm_struct *area;
16332
16333@@ -48,8 +48,18 @@ void *module_alloc(unsigned long size)
16334 if (!area)
16335 return NULL;
16336
16337- return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM,
16338- PAGE_KERNEL_EXEC);
16339+ return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot);
16340+}
16341+
16342+void *module_alloc(unsigned long size)
16343+{
16344+
16345+#ifdef CONFIG_PAX_KERNEXEC
16346+ return __module_alloc(size, PAGE_KERNEL);
16347+#else
16348+ return __module_alloc(size, PAGE_KERNEL_EXEC);
16349+#endif
16350+
16351 }
16352
16353 /* Free memory returned from module_alloc */
16354@@ -58,6 +68,40 @@ void module_free(struct module *mod, voi
16355 vfree(module_region);
16356 }
16357
16358+#ifdef CONFIG_PAX_KERNEXEC
16359+#ifdef CONFIG_X86_32
16360+void *module_alloc_exec(unsigned long size)
16361+{
16362+ struct vm_struct *area;
16363+
16364+ if (size == 0)
16365+ return NULL;
16366+
16367+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
16368+ return area ? area->addr : NULL;
16369+}
16370+EXPORT_SYMBOL(module_alloc_exec);
16371+
16372+void module_free_exec(struct module *mod, void *module_region)
16373+{
16374+ vunmap(module_region);
16375+}
16376+EXPORT_SYMBOL(module_free_exec);
16377+#else
16378+void module_free_exec(struct module *mod, void *module_region)
16379+{
16380+ module_free(mod, module_region);
16381+}
16382+EXPORT_SYMBOL(module_free_exec);
16383+
16384+void *module_alloc_exec(unsigned long size)
16385+{
16386+ return __module_alloc(size, PAGE_KERNEL_RX);
16387+}
16388+EXPORT_SYMBOL(module_alloc_exec);
16389+#endif
16390+#endif
16391+
16392 /* We don't need anything special. */
16393 int module_frob_arch_sections(Elf_Ehdr *hdr,
16394 Elf_Shdr *sechdrs,
16395@@ -77,14 +121,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
16396 unsigned int i;
16397 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
16398 Elf32_Sym *sym;
16399- uint32_t *location;
16400+ uint32_t *plocation, location;
16401
16402 DEBUGP("Applying relocate section %u to %u\n", relsec,
16403 sechdrs[relsec].sh_info);
16404 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
16405 /* This is where to make the change */
16406- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
16407- + rel[i].r_offset;
16408+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
16409+ location = (uint32_t)plocation;
16410+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
16411+ plocation = ktla_ktva((void *)plocation);
16412 /* This is the symbol it is referring to. Note that all
16413 undefined symbols have been resolved. */
16414 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
16415@@ -93,11 +139,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
16416 switch (ELF32_R_TYPE(rel[i].r_info)) {
16417 case R_386_32:
16418 /* We add the value into the location given */
16419- *location += sym->st_value;
16420+ pax_open_kernel();
16421+ *plocation += sym->st_value;
16422+ pax_close_kernel();
16423 break;
16424 case R_386_PC32:
16425 /* Add the value, subtract its postition */
16426- *location += sym->st_value - (uint32_t)location;
16427+ pax_open_kernel();
16428+ *plocation += sym->st_value - location;
16429+ pax_close_kernel();
16430 break;
16431 default:
16432 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
16433@@ -153,21 +203,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
16434 case R_X86_64_NONE:
16435 break;
16436 case R_X86_64_64:
16437+ pax_open_kernel();
16438 *(u64 *)loc = val;
16439+ pax_close_kernel();
16440 break;
16441 case R_X86_64_32:
16442+ pax_open_kernel();
16443 *(u32 *)loc = val;
16444+ pax_close_kernel();
16445 if (val != *(u32 *)loc)
16446 goto overflow;
16447 break;
16448 case R_X86_64_32S:
16449+ pax_open_kernel();
16450 *(s32 *)loc = val;
16451+ pax_close_kernel();
16452 if ((s64)val != *(s32 *)loc)
16453 goto overflow;
16454 break;
16455 case R_X86_64_PC32:
16456 val -= (u64)loc;
16457+ pax_open_kernel();
16458 *(u32 *)loc = val;
16459+ pax_close_kernel();
16460+
16461 #if 0
16462 if ((s64)val != *(s32 *)loc)
16463 goto overflow;
16464diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt.c linux-2.6.32.46/arch/x86/kernel/paravirt.c
16465--- linux-2.6.32.46/arch/x86/kernel/paravirt.c 2011-03-27 14:31:47.000000000 -0400
16466+++ linux-2.6.32.46/arch/x86/kernel/paravirt.c 2011-08-23 20:24:19.000000000 -0400
16467@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
16468 {
16469 return x;
16470 }
16471+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
16472+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
16473+#endif
16474
16475 void __init default_banner(void)
16476 {
16477@@ -122,7 +125,7 @@ unsigned paravirt_patch_jmp(void *insnbu
16478 * corresponding structure. */
16479 static void *get_call_destination(u8 type)
16480 {
16481- struct paravirt_patch_template tmpl = {
16482+ const struct paravirt_patch_template tmpl = {
16483 .pv_init_ops = pv_init_ops,
16484 .pv_time_ops = pv_time_ops,
16485 .pv_cpu_ops = pv_cpu_ops,
16486@@ -133,6 +136,8 @@ static void *get_call_destination(u8 typ
16487 .pv_lock_ops = pv_lock_ops,
16488 #endif
16489 };
16490+
16491+ pax_track_stack();
16492 return *((void **)&tmpl + type);
16493 }
16494
16495@@ -145,15 +150,19 @@ unsigned paravirt_patch_default(u8 type,
16496 if (opfunc == NULL)
16497 /* If there's no function, patch it with a ud2a (BUG) */
16498 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
16499- else if (opfunc == _paravirt_nop)
16500+ else if (opfunc == (void *)_paravirt_nop)
16501 /* If the operation is a nop, then nop the callsite */
16502 ret = paravirt_patch_nop();
16503
16504 /* identity functions just return their single argument */
16505- else if (opfunc == _paravirt_ident_32)
16506+ else if (opfunc == (void *)_paravirt_ident_32)
16507 ret = paravirt_patch_ident_32(insnbuf, len);
16508- else if (opfunc == _paravirt_ident_64)
16509+ else if (opfunc == (void *)_paravirt_ident_64)
16510+ ret = paravirt_patch_ident_64(insnbuf, len);
16511+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
16512+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
16513 ret = paravirt_patch_ident_64(insnbuf, len);
16514+#endif
16515
16516 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
16517 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
16518@@ -178,7 +187,7 @@ unsigned paravirt_patch_insns(void *insn
16519 if (insn_len > len || start == NULL)
16520 insn_len = len;
16521 else
16522- memcpy(insnbuf, start, insn_len);
16523+ memcpy(insnbuf, ktla_ktva(start), insn_len);
16524
16525 return insn_len;
16526 }
16527@@ -294,22 +303,22 @@ void arch_flush_lazy_mmu_mode(void)
16528 preempt_enable();
16529 }
16530
16531-struct pv_info pv_info = {
16532+struct pv_info pv_info __read_only = {
16533 .name = "bare hardware",
16534 .paravirt_enabled = 0,
16535 .kernel_rpl = 0,
16536 .shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */
16537 };
16538
16539-struct pv_init_ops pv_init_ops = {
16540+struct pv_init_ops pv_init_ops __read_only = {
16541 .patch = native_patch,
16542 };
16543
16544-struct pv_time_ops pv_time_ops = {
16545+struct pv_time_ops pv_time_ops __read_only = {
16546 .sched_clock = native_sched_clock,
16547 };
16548
16549-struct pv_irq_ops pv_irq_ops = {
16550+struct pv_irq_ops pv_irq_ops __read_only = {
16551 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
16552 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
16553 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
16554@@ -321,7 +330,7 @@ struct pv_irq_ops pv_irq_ops = {
16555 #endif
16556 };
16557
16558-struct pv_cpu_ops pv_cpu_ops = {
16559+struct pv_cpu_ops pv_cpu_ops __read_only = {
16560 .cpuid = native_cpuid,
16561 .get_debugreg = native_get_debugreg,
16562 .set_debugreg = native_set_debugreg,
16563@@ -382,21 +391,26 @@ struct pv_cpu_ops pv_cpu_ops = {
16564 .end_context_switch = paravirt_nop,
16565 };
16566
16567-struct pv_apic_ops pv_apic_ops = {
16568+struct pv_apic_ops pv_apic_ops __read_only = {
16569 #ifdef CONFIG_X86_LOCAL_APIC
16570 .startup_ipi_hook = paravirt_nop,
16571 #endif
16572 };
16573
16574-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
16575+#ifdef CONFIG_X86_32
16576+#ifdef CONFIG_X86_PAE
16577+/* 64-bit pagetable entries */
16578+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
16579+#else
16580 /* 32-bit pagetable entries */
16581 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
16582+#endif
16583 #else
16584 /* 64-bit pagetable entries */
16585 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
16586 #endif
16587
16588-struct pv_mmu_ops pv_mmu_ops = {
16589+struct pv_mmu_ops pv_mmu_ops __read_only = {
16590
16591 .read_cr2 = native_read_cr2,
16592 .write_cr2 = native_write_cr2,
16593@@ -448,6 +462,7 @@ struct pv_mmu_ops pv_mmu_ops = {
16594 .make_pud = PTE_IDENT,
16595
16596 .set_pgd = native_set_pgd,
16597+ .set_pgd_batched = native_set_pgd_batched,
16598 #endif
16599 #endif /* PAGETABLE_LEVELS >= 3 */
16600
16601@@ -467,6 +482,12 @@ struct pv_mmu_ops pv_mmu_ops = {
16602 },
16603
16604 .set_fixmap = native_set_fixmap,
16605+
16606+#ifdef CONFIG_PAX_KERNEXEC
16607+ .pax_open_kernel = native_pax_open_kernel,
16608+ .pax_close_kernel = native_pax_close_kernel,
16609+#endif
16610+
16611 };
16612
16613 EXPORT_SYMBOL_GPL(pv_time_ops);
16614diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c
16615--- linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c 2011-03-27 14:31:47.000000000 -0400
16616+++ linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:56:46.000000000 -0400
16617@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
16618 __raw_spin_lock(lock);
16619 }
16620
16621-struct pv_lock_ops pv_lock_ops = {
16622+struct pv_lock_ops pv_lock_ops __read_only = {
16623 #ifdef CONFIG_SMP
16624 .spin_is_locked = __ticket_spin_is_locked,
16625 .spin_is_contended = __ticket_spin_is_contended,
16626diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c
16627--- linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c 2011-03-27 14:31:47.000000000 -0400
16628+++ linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:56:46.000000000 -0400
16629@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
16630 free_pages((unsigned long)vaddr, get_order(size));
16631 }
16632
16633-static struct dma_map_ops calgary_dma_ops = {
16634+static const struct dma_map_ops calgary_dma_ops = {
16635 .alloc_coherent = calgary_alloc_coherent,
16636 .free_coherent = calgary_free_coherent,
16637 .map_sg = calgary_map_sg,
16638diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-dma.c linux-2.6.32.46/arch/x86/kernel/pci-dma.c
16639--- linux-2.6.32.46/arch/x86/kernel/pci-dma.c 2011-03-27 14:31:47.000000000 -0400
16640+++ linux-2.6.32.46/arch/x86/kernel/pci-dma.c 2011-04-17 15:56:46.000000000 -0400
16641@@ -14,7 +14,7 @@
16642
16643 static int forbid_dac __read_mostly;
16644
16645-struct dma_map_ops *dma_ops;
16646+const struct dma_map_ops *dma_ops;
16647 EXPORT_SYMBOL(dma_ops);
16648
16649 static int iommu_sac_force __read_mostly;
16650@@ -243,7 +243,7 @@ early_param("iommu", iommu_setup);
16651
16652 int dma_supported(struct device *dev, u64 mask)
16653 {
16654- struct dma_map_ops *ops = get_dma_ops(dev);
16655+ const struct dma_map_ops *ops = get_dma_ops(dev);
16656
16657 #ifdef CONFIG_PCI
16658 if (mask > 0xffffffff && forbid_dac > 0) {
16659diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c
16660--- linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c 2011-03-27 14:31:47.000000000 -0400
16661+++ linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:56:46.000000000 -0400
16662@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
16663 return -1;
16664 }
16665
16666-static struct dma_map_ops gart_dma_ops = {
16667+static const struct dma_map_ops gart_dma_ops = {
16668 .map_sg = gart_map_sg,
16669 .unmap_sg = gart_unmap_sg,
16670 .map_page = gart_map_page,
16671diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-nommu.c linux-2.6.32.46/arch/x86/kernel/pci-nommu.c
16672--- linux-2.6.32.46/arch/x86/kernel/pci-nommu.c 2011-03-27 14:31:47.000000000 -0400
16673+++ linux-2.6.32.46/arch/x86/kernel/pci-nommu.c 2011-04-17 15:56:46.000000000 -0400
16674@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
16675 flush_write_buffers();
16676 }
16677
16678-struct dma_map_ops nommu_dma_ops = {
16679+const struct dma_map_ops nommu_dma_ops = {
16680 .alloc_coherent = dma_generic_alloc_coherent,
16681 .free_coherent = nommu_free_coherent,
16682 .map_sg = nommu_map_sg,
16683diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c
16684--- linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c 2011-03-27 14:31:47.000000000 -0400
16685+++ linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:56:46.000000000 -0400
16686@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
16687 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
16688 }
16689
16690-static struct dma_map_ops swiotlb_dma_ops = {
16691+static const struct dma_map_ops swiotlb_dma_ops = {
16692 .mapping_error = swiotlb_dma_mapping_error,
16693 .alloc_coherent = x86_swiotlb_alloc_coherent,
16694 .free_coherent = swiotlb_free_coherent,
16695diff -urNp linux-2.6.32.46/arch/x86/kernel/process_32.c linux-2.6.32.46/arch/x86/kernel/process_32.c
16696--- linux-2.6.32.46/arch/x86/kernel/process_32.c 2011-06-25 12:55:34.000000000 -0400
16697+++ linux-2.6.32.46/arch/x86/kernel/process_32.c 2011-06-25 12:56:37.000000000 -0400
16698@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
16699 unsigned long thread_saved_pc(struct task_struct *tsk)
16700 {
16701 return ((unsigned long *)tsk->thread.sp)[3];
16702+//XXX return tsk->thread.eip;
16703 }
16704
16705 #ifndef CONFIG_SMP
16706@@ -129,15 +130,14 @@ void __show_regs(struct pt_regs *regs, i
16707 unsigned short ss, gs;
16708 const char *board;
16709
16710- if (user_mode_vm(regs)) {
16711+ if (user_mode(regs)) {
16712 sp = regs->sp;
16713 ss = regs->ss & 0xffff;
16714- gs = get_user_gs(regs);
16715 } else {
16716 sp = (unsigned long) (&regs->sp);
16717 savesegment(ss, ss);
16718- savesegment(gs, gs);
16719 }
16720+ gs = get_user_gs(regs);
16721
16722 printk("\n");
16723
16724@@ -210,10 +210,10 @@ int kernel_thread(int (*fn)(void *), voi
16725 regs.bx = (unsigned long) fn;
16726 regs.dx = (unsigned long) arg;
16727
16728- regs.ds = __USER_DS;
16729- regs.es = __USER_DS;
16730+ regs.ds = __KERNEL_DS;
16731+ regs.es = __KERNEL_DS;
16732 regs.fs = __KERNEL_PERCPU;
16733- regs.gs = __KERNEL_STACK_CANARY;
16734+ savesegment(gs, regs.gs);
16735 regs.orig_ax = -1;
16736 regs.ip = (unsigned long) kernel_thread_helper;
16737 regs.cs = __KERNEL_CS | get_kernel_rpl();
16738@@ -247,13 +247,14 @@ int copy_thread(unsigned long clone_flag
16739 struct task_struct *tsk;
16740 int err;
16741
16742- childregs = task_pt_regs(p);
16743+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
16744 *childregs = *regs;
16745 childregs->ax = 0;
16746 childregs->sp = sp;
16747
16748 p->thread.sp = (unsigned long) childregs;
16749 p->thread.sp0 = (unsigned long) (childregs+1);
16750+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
16751
16752 p->thread.ip = (unsigned long) ret_from_fork;
16753
16754@@ -345,7 +346,7 @@ __switch_to(struct task_struct *prev_p,
16755 struct thread_struct *prev = &prev_p->thread,
16756 *next = &next_p->thread;
16757 int cpu = smp_processor_id();
16758- struct tss_struct *tss = &per_cpu(init_tss, cpu);
16759+ struct tss_struct *tss = init_tss + cpu;
16760 bool preload_fpu;
16761
16762 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
16763@@ -380,6 +381,10 @@ __switch_to(struct task_struct *prev_p,
16764 */
16765 lazy_save_gs(prev->gs);
16766
16767+#ifdef CONFIG_PAX_MEMORY_UDEREF
16768+ __set_fs(task_thread_info(next_p)->addr_limit);
16769+#endif
16770+
16771 /*
16772 * Load the per-thread Thread-Local Storage descriptor.
16773 */
16774@@ -415,6 +420,9 @@ __switch_to(struct task_struct *prev_p,
16775 */
16776 arch_end_context_switch(next_p);
16777
16778+ percpu_write(current_task, next_p);
16779+ percpu_write(current_tinfo, &next_p->tinfo);
16780+
16781 if (preload_fpu)
16782 __math_state_restore();
16783
16784@@ -424,8 +432,6 @@ __switch_to(struct task_struct *prev_p,
16785 if (prev->gs | next->gs)
16786 lazy_load_gs(next->gs);
16787
16788- percpu_write(current_task, next_p);
16789-
16790 return prev_p;
16791 }
16792
16793@@ -495,4 +501,3 @@ unsigned long get_wchan(struct task_stru
16794 } while (count++ < 16);
16795 return 0;
16796 }
16797-
16798diff -urNp linux-2.6.32.46/arch/x86/kernel/process_64.c linux-2.6.32.46/arch/x86/kernel/process_64.c
16799--- linux-2.6.32.46/arch/x86/kernel/process_64.c 2011-06-25 12:55:34.000000000 -0400
16800+++ linux-2.6.32.46/arch/x86/kernel/process_64.c 2011-06-25 12:56:37.000000000 -0400
16801@@ -91,7 +91,7 @@ static void __exit_idle(void)
16802 void exit_idle(void)
16803 {
16804 /* idle loop has pid 0 */
16805- if (current->pid)
16806+ if (task_pid_nr(current))
16807 return;
16808 __exit_idle();
16809 }
16810@@ -170,7 +170,7 @@ void __show_regs(struct pt_regs *regs, i
16811 if (!board)
16812 board = "";
16813 printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
16814- current->pid, current->comm, print_tainted(),
16815+ task_pid_nr(current), current->comm, print_tainted(),
16816 init_utsname()->release,
16817 (int)strcspn(init_utsname()->version, " "),
16818 init_utsname()->version, board);
16819@@ -280,8 +280,7 @@ int copy_thread(unsigned long clone_flag
16820 struct pt_regs *childregs;
16821 struct task_struct *me = current;
16822
16823- childregs = ((struct pt_regs *)
16824- (THREAD_SIZE + task_stack_page(p))) - 1;
16825+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
16826 *childregs = *regs;
16827
16828 childregs->ax = 0;
16829@@ -292,6 +291,7 @@ int copy_thread(unsigned long clone_flag
16830 p->thread.sp = (unsigned long) childregs;
16831 p->thread.sp0 = (unsigned long) (childregs+1);
16832 p->thread.usersp = me->thread.usersp;
16833+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
16834
16835 set_tsk_thread_flag(p, TIF_FORK);
16836
16837@@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p,
16838 struct thread_struct *prev = &prev_p->thread;
16839 struct thread_struct *next = &next_p->thread;
16840 int cpu = smp_processor_id();
16841- struct tss_struct *tss = &per_cpu(init_tss, cpu);
16842+ struct tss_struct *tss = init_tss + cpu;
16843 unsigned fsindex, gsindex;
16844 bool preload_fpu;
16845
16846@@ -475,10 +475,9 @@ __switch_to(struct task_struct *prev_p,
16847 prev->usersp = percpu_read(old_rsp);
16848 percpu_write(old_rsp, next->usersp);
16849 percpu_write(current_task, next_p);
16850+ percpu_write(current_tinfo, &next_p->tinfo);
16851
16852- percpu_write(kernel_stack,
16853- (unsigned long)task_stack_page(next_p) +
16854- THREAD_SIZE - KERNEL_STACK_OFFSET);
16855+ percpu_write(kernel_stack, next->sp0);
16856
16857 /*
16858 * Now maybe reload the debug registers and handle I/O bitmaps
16859@@ -559,12 +558,11 @@ unsigned long get_wchan(struct task_stru
16860 if (!p || p == current || p->state == TASK_RUNNING)
16861 return 0;
16862 stack = (unsigned long)task_stack_page(p);
16863- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
16864+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
16865 return 0;
16866 fp = *(u64 *)(p->thread.sp);
16867 do {
16868- if (fp < (unsigned long)stack ||
16869- fp >= (unsigned long)stack+THREAD_SIZE)
16870+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
16871 return 0;
16872 ip = *(u64 *)(fp+8);
16873 if (!in_sched_functions(ip))
16874diff -urNp linux-2.6.32.46/arch/x86/kernel/process.c linux-2.6.32.46/arch/x86/kernel/process.c
16875--- linux-2.6.32.46/arch/x86/kernel/process.c 2011-04-22 19:16:29.000000000 -0400
16876+++ linux-2.6.32.46/arch/x86/kernel/process.c 2011-08-30 18:19:52.000000000 -0400
16877@@ -51,16 +51,33 @@ void free_thread_xstate(struct task_stru
16878
16879 void free_thread_info(struct thread_info *ti)
16880 {
16881- free_thread_xstate(ti->task);
16882 free_pages((unsigned long)ti, get_order(THREAD_SIZE));
16883 }
16884
16885+static struct kmem_cache *task_struct_cachep;
16886+
16887 void arch_task_cache_init(void)
16888 {
16889- task_xstate_cachep =
16890- kmem_cache_create("task_xstate", xstate_size,
16891+ /* create a slab on which task_structs can be allocated */
16892+ task_struct_cachep =
16893+ kmem_cache_create("task_struct", sizeof(struct task_struct),
16894+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
16895+
16896+ task_xstate_cachep =
16897+ kmem_cache_create("task_xstate", xstate_size,
16898 __alignof__(union thread_xstate),
16899- SLAB_PANIC | SLAB_NOTRACK, NULL);
16900+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
16901+}
16902+
16903+struct task_struct *alloc_task_struct(void)
16904+{
16905+ return kmem_cache_alloc(task_struct_cachep, GFP_KERNEL);
16906+}
16907+
16908+void free_task_struct(struct task_struct *task)
16909+{
16910+ free_thread_xstate(task);
16911+ kmem_cache_free(task_struct_cachep, task);
16912 }
16913
16914 /*
16915@@ -73,7 +90,7 @@ void exit_thread(void)
16916 unsigned long *bp = t->io_bitmap_ptr;
16917
16918 if (bp) {
16919- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
16920+ struct tss_struct *tss = init_tss + get_cpu();
16921
16922 t->io_bitmap_ptr = NULL;
16923 clear_thread_flag(TIF_IO_BITMAP);
16924@@ -93,6 +110,9 @@ void flush_thread(void)
16925
16926 clear_tsk_thread_flag(tsk, TIF_DEBUG);
16927
16928+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
16929+ loadsegment(gs, 0);
16930+#endif
16931 tsk->thread.debugreg0 = 0;
16932 tsk->thread.debugreg1 = 0;
16933 tsk->thread.debugreg2 = 0;
16934@@ -307,7 +327,7 @@ void default_idle(void)
16935 EXPORT_SYMBOL(default_idle);
16936 #endif
16937
16938-void stop_this_cpu(void *dummy)
16939+__noreturn void stop_this_cpu(void *dummy)
16940 {
16941 local_irq_disable();
16942 /*
16943@@ -568,16 +588,38 @@ static int __init idle_setup(char *str)
16944 }
16945 early_param("idle", idle_setup);
16946
16947-unsigned long arch_align_stack(unsigned long sp)
16948+#ifdef CONFIG_PAX_RANDKSTACK
16949+void pax_randomize_kstack(struct pt_regs *regs)
16950 {
16951- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
16952- sp -= get_random_int() % 8192;
16953- return sp & ~0xf;
16954-}
16955+ struct thread_struct *thread = &current->thread;
16956+ unsigned long time;
16957
16958-unsigned long arch_randomize_brk(struct mm_struct *mm)
16959-{
16960- unsigned long range_end = mm->brk + 0x02000000;
16961- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
16962+ if (!randomize_va_space)
16963+ return;
16964+
16965+ if (v8086_mode(regs))
16966+ return;
16967+
16968+ rdtscl(time);
16969+
16970+ /* P4 seems to return a 0 LSB, ignore it */
16971+#ifdef CONFIG_MPENTIUM4
16972+ time &= 0x3EUL;
16973+ time <<= 2;
16974+#elif defined(CONFIG_X86_64)
16975+ time &= 0xFUL;
16976+ time <<= 4;
16977+#else
16978+ time &= 0x1FUL;
16979+ time <<= 3;
16980+#endif
16981+
16982+ thread->sp0 ^= time;
16983+ load_sp0(init_tss + smp_processor_id(), thread);
16984+
16985+#ifdef CONFIG_X86_64
16986+ percpu_write(kernel_stack, thread->sp0);
16987+#endif
16988 }
16989+#endif
16990
16991diff -urNp linux-2.6.32.46/arch/x86/kernel/ptrace.c linux-2.6.32.46/arch/x86/kernel/ptrace.c
16992--- linux-2.6.32.46/arch/x86/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400
16993+++ linux-2.6.32.46/arch/x86/kernel/ptrace.c 2011-04-17 15:56:46.000000000 -0400
16994@@ -925,7 +925,7 @@ static const struct user_regset_view use
16995 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
16996 {
16997 int ret;
16998- unsigned long __user *datap = (unsigned long __user *)data;
16999+ unsigned long __user *datap = (__force unsigned long __user *)data;
17000
17001 switch (request) {
17002 /* read the word at location addr in the USER area. */
17003@@ -1012,14 +1012,14 @@ long arch_ptrace(struct task_struct *chi
17004 if (addr < 0)
17005 return -EIO;
17006 ret = do_get_thread_area(child, addr,
17007- (struct user_desc __user *) data);
17008+ (__force struct user_desc __user *) data);
17009 break;
17010
17011 case PTRACE_SET_THREAD_AREA:
17012 if (addr < 0)
17013 return -EIO;
17014 ret = do_set_thread_area(child, addr,
17015- (struct user_desc __user *) data, 0);
17016+ (__force struct user_desc __user *) data, 0);
17017 break;
17018 #endif
17019
17020@@ -1038,12 +1038,12 @@ long arch_ptrace(struct task_struct *chi
17021 #ifdef CONFIG_X86_PTRACE_BTS
17022 case PTRACE_BTS_CONFIG:
17023 ret = ptrace_bts_config
17024- (child, data, (struct ptrace_bts_config __user *)addr);
17025+ (child, data, (__force struct ptrace_bts_config __user *)addr);
17026 break;
17027
17028 case PTRACE_BTS_STATUS:
17029 ret = ptrace_bts_status
17030- (child, data, (struct ptrace_bts_config __user *)addr);
17031+ (child, data, (__force struct ptrace_bts_config __user *)addr);
17032 break;
17033
17034 case PTRACE_BTS_SIZE:
17035@@ -1052,7 +1052,7 @@ long arch_ptrace(struct task_struct *chi
17036
17037 case PTRACE_BTS_GET:
17038 ret = ptrace_bts_read_record
17039- (child, data, (struct bts_struct __user *) addr);
17040+ (child, data, (__force struct bts_struct __user *) addr);
17041 break;
17042
17043 case PTRACE_BTS_CLEAR:
17044@@ -1061,7 +1061,7 @@ long arch_ptrace(struct task_struct *chi
17045
17046 case PTRACE_BTS_DRAIN:
17047 ret = ptrace_bts_drain
17048- (child, data, (struct bts_struct __user *) addr);
17049+ (child, data, (__force struct bts_struct __user *) addr);
17050 break;
17051 #endif /* CONFIG_X86_PTRACE_BTS */
17052
17053@@ -1450,7 +1450,7 @@ void send_sigtrap(struct task_struct *ts
17054 info.si_code = si_code;
17055
17056 /* User-mode ip? */
17057- info.si_addr = user_mode_vm(regs) ? (void __user *) regs->ip : NULL;
17058+ info.si_addr = user_mode(regs) ? (__force void __user *) regs->ip : NULL;
17059
17060 /* Send us the fake SIGTRAP */
17061 force_sig_info(SIGTRAP, &info, tsk);
17062@@ -1469,7 +1469,7 @@ void send_sigtrap(struct task_struct *ts
17063 * We must return the syscall number to actually look up in the table.
17064 * This can be -1L to skip running any syscall at all.
17065 */
17066-asmregparm long syscall_trace_enter(struct pt_regs *regs)
17067+long syscall_trace_enter(struct pt_regs *regs)
17068 {
17069 long ret = 0;
17070
17071@@ -1514,7 +1514,7 @@ asmregparm long syscall_trace_enter(stru
17072 return ret ?: regs->orig_ax;
17073 }
17074
17075-asmregparm void syscall_trace_leave(struct pt_regs *regs)
17076+void syscall_trace_leave(struct pt_regs *regs)
17077 {
17078 if (unlikely(current->audit_context))
17079 audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
17080diff -urNp linux-2.6.32.46/arch/x86/kernel/reboot.c linux-2.6.32.46/arch/x86/kernel/reboot.c
17081--- linux-2.6.32.46/arch/x86/kernel/reboot.c 2011-08-09 18:35:28.000000000 -0400
17082+++ linux-2.6.32.46/arch/x86/kernel/reboot.c 2011-08-09 18:33:59.000000000 -0400
17083@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
17084 EXPORT_SYMBOL(pm_power_off);
17085
17086 static const struct desc_ptr no_idt = {};
17087-static int reboot_mode;
17088+static unsigned short reboot_mode;
17089 enum reboot_type reboot_type = BOOT_KBD;
17090 int reboot_force;
17091
17092@@ -292,12 +292,12 @@ core_initcall(reboot_init);
17093 controller to pulse the CPU reset line, which is more thorough, but
17094 doesn't work with at least one type of 486 motherboard. It is easy
17095 to stop this code working; hence the copious comments. */
17096-static const unsigned long long
17097-real_mode_gdt_entries [3] =
17098+static struct desc_struct
17099+real_mode_gdt_entries [3] __read_only =
17100 {
17101- 0x0000000000000000ULL, /* Null descriptor */
17102- 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */
17103- 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */
17104+ GDT_ENTRY_INIT(0, 0, 0), /* Null descriptor */
17105+ GDT_ENTRY_INIT(0x9b, 0, 0xffff), /* 16-bit real-mode 64k code at 0x00000000 */
17106+ GDT_ENTRY_INIT(0x93, 0x100, 0xffff) /* 16-bit real-mode 64k data at 0x00000100 */
17107 };
17108
17109 static const struct desc_ptr
17110@@ -346,7 +346,7 @@ static const unsigned char jump_to_bios
17111 * specified by the code and length parameters.
17112 * We assume that length will aways be less that 100!
17113 */
17114-void machine_real_restart(const unsigned char *code, int length)
17115+__noreturn void machine_real_restart(const unsigned char *code, unsigned int length)
17116 {
17117 local_irq_disable();
17118
17119@@ -366,8 +366,8 @@ void machine_real_restart(const unsigned
17120 /* Remap the kernel at virtual address zero, as well as offset zero
17121 from the kernel segment. This assumes the kernel segment starts at
17122 virtual address PAGE_OFFSET. */
17123- memcpy(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
17124- sizeof(swapper_pg_dir [0]) * KERNEL_PGD_PTRS);
17125+ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
17126+ min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
17127
17128 /*
17129 * Use `swapper_pg_dir' as our page directory.
17130@@ -379,16 +379,15 @@ void machine_real_restart(const unsigned
17131 boot)". This seems like a fairly standard thing that gets set by
17132 REBOOT.COM programs, and the previous reset routine did this
17133 too. */
17134- *((unsigned short *)0x472) = reboot_mode;
17135+ *(unsigned short *)(__va(0x472)) = reboot_mode;
17136
17137 /* For the switch to real mode, copy some code to low memory. It has
17138 to be in the first 64k because it is running in 16-bit mode, and it
17139 has to have the same physical and virtual address, because it turns
17140 off paging. Copy it near the end of the first page, out of the way
17141 of BIOS variables. */
17142- memcpy((void *)(0x1000 - sizeof(real_mode_switch) - 100),
17143- real_mode_switch, sizeof (real_mode_switch));
17144- memcpy((void *)(0x1000 - 100), code, length);
17145+ memcpy(__va(0x1000 - sizeof (real_mode_switch) - 100), real_mode_switch, sizeof (real_mode_switch));
17146+ memcpy(__va(0x1000 - 100), code, length);
17147
17148 /* Set up the IDT for real mode. */
17149 load_idt(&real_mode_idt);
17150@@ -416,6 +415,7 @@ void machine_real_restart(const unsigned
17151 __asm__ __volatile__ ("ljmp $0x0008,%0"
17152 :
17153 : "i" ((void *)(0x1000 - sizeof (real_mode_switch) - 100)));
17154+ do { } while (1);
17155 }
17156 #ifdef CONFIG_APM_MODULE
17157 EXPORT_SYMBOL(machine_real_restart);
17158@@ -544,7 +544,7 @@ void __attribute__((weak)) mach_reboot_f
17159 {
17160 }
17161
17162-static void native_machine_emergency_restart(void)
17163+__noreturn static void native_machine_emergency_restart(void)
17164 {
17165 int i;
17166
17167@@ -659,13 +659,13 @@ void native_machine_shutdown(void)
17168 #endif
17169 }
17170
17171-static void __machine_emergency_restart(int emergency)
17172+static __noreturn void __machine_emergency_restart(int emergency)
17173 {
17174 reboot_emergency = emergency;
17175 machine_ops.emergency_restart();
17176 }
17177
17178-static void native_machine_restart(char *__unused)
17179+static __noreturn void native_machine_restart(char *__unused)
17180 {
17181 printk("machine restart\n");
17182
17183@@ -674,7 +674,7 @@ static void native_machine_restart(char
17184 __machine_emergency_restart(0);
17185 }
17186
17187-static void native_machine_halt(void)
17188+static __noreturn void native_machine_halt(void)
17189 {
17190 /* stop other cpus and apics */
17191 machine_shutdown();
17192@@ -685,7 +685,7 @@ static void native_machine_halt(void)
17193 stop_this_cpu(NULL);
17194 }
17195
17196-static void native_machine_power_off(void)
17197+__noreturn static void native_machine_power_off(void)
17198 {
17199 if (pm_power_off) {
17200 if (!reboot_force)
17201@@ -694,6 +694,7 @@ static void native_machine_power_off(voi
17202 }
17203 /* a fallback in case there is no PM info available */
17204 tboot_shutdown(TB_SHUTDOWN_HALT);
17205+ do { } while (1);
17206 }
17207
17208 struct machine_ops machine_ops = {
17209diff -urNp linux-2.6.32.46/arch/x86/kernel/setup.c linux-2.6.32.46/arch/x86/kernel/setup.c
17210--- linux-2.6.32.46/arch/x86/kernel/setup.c 2011-04-17 17:00:52.000000000 -0400
17211+++ linux-2.6.32.46/arch/x86/kernel/setup.c 2011-04-17 17:03:05.000000000 -0400
17212@@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
17213
17214 if (!boot_params.hdr.root_flags)
17215 root_mountflags &= ~MS_RDONLY;
17216- init_mm.start_code = (unsigned long) _text;
17217- init_mm.end_code = (unsigned long) _etext;
17218+ init_mm.start_code = ktla_ktva((unsigned long) _text);
17219+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
17220 init_mm.end_data = (unsigned long) _edata;
17221 init_mm.brk = _brk_end;
17222
17223- code_resource.start = virt_to_phys(_text);
17224- code_resource.end = virt_to_phys(_etext)-1;
17225- data_resource.start = virt_to_phys(_etext);
17226+ code_resource.start = virt_to_phys(ktla_ktva(_text));
17227+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
17228+ data_resource.start = virt_to_phys(_sdata);
17229 data_resource.end = virt_to_phys(_edata)-1;
17230 bss_resource.start = virt_to_phys(&__bss_start);
17231 bss_resource.end = virt_to_phys(&__bss_stop)-1;
17232diff -urNp linux-2.6.32.46/arch/x86/kernel/setup_percpu.c linux-2.6.32.46/arch/x86/kernel/setup_percpu.c
17233--- linux-2.6.32.46/arch/x86/kernel/setup_percpu.c 2011-03-27 14:31:47.000000000 -0400
17234+++ linux-2.6.32.46/arch/x86/kernel/setup_percpu.c 2011-06-04 20:36:29.000000000 -0400
17235@@ -25,19 +25,17 @@
17236 # define DBG(x...)
17237 #endif
17238
17239-DEFINE_PER_CPU(int, cpu_number);
17240+#ifdef CONFIG_SMP
17241+DEFINE_PER_CPU(unsigned int, cpu_number);
17242 EXPORT_PER_CPU_SYMBOL(cpu_number);
17243+#endif
17244
17245-#ifdef CONFIG_X86_64
17246 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
17247-#else
17248-#define BOOT_PERCPU_OFFSET 0
17249-#endif
17250
17251 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
17252 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
17253
17254-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
17255+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
17256 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
17257 };
17258 EXPORT_SYMBOL(__per_cpu_offset);
17259@@ -159,10 +157,10 @@ static inline void setup_percpu_segment(
17260 {
17261 #ifdef CONFIG_X86_32
17262 struct desc_struct gdt;
17263+ unsigned long base = per_cpu_offset(cpu);
17264
17265- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
17266- 0x2 | DESCTYPE_S, 0x8);
17267- gdt.s = 1;
17268+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
17269+ 0x83 | DESCTYPE_S, 0xC);
17270 write_gdt_entry(get_cpu_gdt_table(cpu),
17271 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
17272 #endif
17273@@ -212,6 +210,11 @@ void __init setup_per_cpu_areas(void)
17274 /* alrighty, percpu areas up and running */
17275 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
17276 for_each_possible_cpu(cpu) {
17277+#ifdef CONFIG_CC_STACKPROTECTOR
17278+#ifdef CONFIG_X86_32
17279+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
17280+#endif
17281+#endif
17282 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
17283 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
17284 per_cpu(cpu_number, cpu) = cpu;
17285@@ -239,6 +242,12 @@ void __init setup_per_cpu_areas(void)
17286 early_per_cpu_map(x86_cpu_to_node_map, cpu);
17287 #endif
17288 #endif
17289+#ifdef CONFIG_CC_STACKPROTECTOR
17290+#ifdef CONFIG_X86_32
17291+ if (!cpu)
17292+ per_cpu(stack_canary.canary, cpu) = canary;
17293+#endif
17294+#endif
17295 /*
17296 * Up to this point, the boot CPU has been using .data.init
17297 * area. Reload any changed state for the boot CPU.
17298diff -urNp linux-2.6.32.46/arch/x86/kernel/signal.c linux-2.6.32.46/arch/x86/kernel/signal.c
17299--- linux-2.6.32.46/arch/x86/kernel/signal.c 2011-03-27 14:31:47.000000000 -0400
17300+++ linux-2.6.32.46/arch/x86/kernel/signal.c 2011-05-22 23:02:03.000000000 -0400
17301@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
17302 * Align the stack pointer according to the i386 ABI,
17303 * i.e. so that on function entry ((sp + 4) & 15) == 0.
17304 */
17305- sp = ((sp + 4) & -16ul) - 4;
17306+ sp = ((sp - 12) & -16ul) - 4;
17307 #else /* !CONFIG_X86_32 */
17308 sp = round_down(sp, 16) - 8;
17309 #endif
17310@@ -248,11 +248,11 @@ get_sigframe(struct k_sigaction *ka, str
17311 * Return an always-bogus address instead so we will die with SIGSEGV.
17312 */
17313 if (onsigstack && !likely(on_sig_stack(sp)))
17314- return (void __user *)-1L;
17315+ return (__force void __user *)-1L;
17316
17317 /* save i387 state */
17318 if (used_math() && save_i387_xstate(*fpstate) < 0)
17319- return (void __user *)-1L;
17320+ return (__force void __user *)-1L;
17321
17322 return (void __user *)sp;
17323 }
17324@@ -307,9 +307,9 @@ __setup_frame(int sig, struct k_sigactio
17325 }
17326
17327 if (current->mm->context.vdso)
17328- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
17329+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
17330 else
17331- restorer = &frame->retcode;
17332+ restorer = (void __user *)&frame->retcode;
17333 if (ka->sa.sa_flags & SA_RESTORER)
17334 restorer = ka->sa.sa_restorer;
17335
17336@@ -323,7 +323,7 @@ __setup_frame(int sig, struct k_sigactio
17337 * reasons and because gdb uses it as a signature to notice
17338 * signal handler stack frames.
17339 */
17340- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
17341+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
17342
17343 if (err)
17344 return -EFAULT;
17345@@ -377,7 +377,10 @@ static int __setup_rt_frame(int sig, str
17346 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
17347
17348 /* Set up to return from userspace. */
17349- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
17350+ if (current->mm->context.vdso)
17351+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
17352+ else
17353+ restorer = (void __user *)&frame->retcode;
17354 if (ka->sa.sa_flags & SA_RESTORER)
17355 restorer = ka->sa.sa_restorer;
17356 put_user_ex(restorer, &frame->pretcode);
17357@@ -389,7 +392,7 @@ static int __setup_rt_frame(int sig, str
17358 * reasons and because gdb uses it as a signature to notice
17359 * signal handler stack frames.
17360 */
17361- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
17362+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
17363 } put_user_catch(err);
17364
17365 if (err)
17366@@ -782,6 +785,8 @@ static void do_signal(struct pt_regs *re
17367 int signr;
17368 sigset_t *oldset;
17369
17370+ pax_track_stack();
17371+
17372 /*
17373 * We want the common case to go fast, which is why we may in certain
17374 * cases get here from kernel mode. Just return without doing anything
17375@@ -789,7 +794,7 @@ static void do_signal(struct pt_regs *re
17376 * X86_32: vm86 regs switched out by assembly code before reaching
17377 * here, so testing against kernel CS suffices.
17378 */
17379- if (!user_mode(regs))
17380+ if (!user_mode_novm(regs))
17381 return;
17382
17383 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
17384diff -urNp linux-2.6.32.46/arch/x86/kernel/smpboot.c linux-2.6.32.46/arch/x86/kernel/smpboot.c
17385--- linux-2.6.32.46/arch/x86/kernel/smpboot.c 2011-03-27 14:31:47.000000000 -0400
17386+++ linux-2.6.32.46/arch/x86/kernel/smpboot.c 2011-07-01 19:10:03.000000000 -0400
17387@@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct
17388 */
17389 static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
17390
17391-void cpu_hotplug_driver_lock()
17392+void cpu_hotplug_driver_lock(void)
17393 {
17394- mutex_lock(&x86_cpu_hotplug_driver_mutex);
17395+ mutex_lock(&x86_cpu_hotplug_driver_mutex);
17396 }
17397
17398-void cpu_hotplug_driver_unlock()
17399+void cpu_hotplug_driver_unlock(void)
17400 {
17401- mutex_unlock(&x86_cpu_hotplug_driver_mutex);
17402+ mutex_unlock(&x86_cpu_hotplug_driver_mutex);
17403 }
17404
17405 ssize_t arch_cpu_probe(const char *buf, size_t count) { return -1; }
17406@@ -625,7 +625,7 @@ wakeup_secondary_cpu_via_init(int phys_a
17407 * target processor state.
17408 */
17409 startup_ipi_hook(phys_apicid, (unsigned long) start_secondary,
17410- (unsigned long)stack_start.sp);
17411+ stack_start);
17412
17413 /*
17414 * Run STARTUP IPI loop.
17415@@ -743,6 +743,7 @@ static int __cpuinit do_boot_cpu(int api
17416 set_idle_for_cpu(cpu, c_idle.idle);
17417 do_rest:
17418 per_cpu(current_task, cpu) = c_idle.idle;
17419+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
17420 #ifdef CONFIG_X86_32
17421 /* Stack for startup_32 can be just as for start_secondary onwards */
17422 irq_ctx_init(cpu);
17423@@ -750,13 +751,15 @@ do_rest:
17424 #else
17425 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
17426 initial_gs = per_cpu_offset(cpu);
17427- per_cpu(kernel_stack, cpu) =
17428- (unsigned long)task_stack_page(c_idle.idle) -
17429- KERNEL_STACK_OFFSET + THREAD_SIZE;
17430+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
17431 #endif
17432+
17433+ pax_open_kernel();
17434 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
17435+ pax_close_kernel();
17436+
17437 initial_code = (unsigned long)start_secondary;
17438- stack_start.sp = (void *) c_idle.idle->thread.sp;
17439+ stack_start = c_idle.idle->thread.sp;
17440
17441 /* start_ip had better be page-aligned! */
17442 start_ip = setup_trampoline();
17443@@ -891,6 +894,12 @@ int __cpuinit native_cpu_up(unsigned int
17444
17445 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
17446
17447+#ifdef CONFIG_PAX_PER_CPU_PGD
17448+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
17449+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
17450+ KERNEL_PGD_PTRS);
17451+#endif
17452+
17453 err = do_boot_cpu(apicid, cpu);
17454
17455 if (err) {
17456diff -urNp linux-2.6.32.46/arch/x86/kernel/step.c linux-2.6.32.46/arch/x86/kernel/step.c
17457--- linux-2.6.32.46/arch/x86/kernel/step.c 2011-03-27 14:31:47.000000000 -0400
17458+++ linux-2.6.32.46/arch/x86/kernel/step.c 2011-04-17 15:56:46.000000000 -0400
17459@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
17460 struct desc_struct *desc;
17461 unsigned long base;
17462
17463- seg &= ~7UL;
17464+ seg >>= 3;
17465
17466 mutex_lock(&child->mm->context.lock);
17467- if (unlikely((seg >> 3) >= child->mm->context.size))
17468+ if (unlikely(seg >= child->mm->context.size))
17469 addr = -1L; /* bogus selector, access would fault */
17470 else {
17471 desc = child->mm->context.ldt + seg;
17472@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struc
17473 addr += base;
17474 }
17475 mutex_unlock(&child->mm->context.lock);
17476- }
17477+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
17478+ addr = ktla_ktva(addr);
17479
17480 return addr;
17481 }
17482@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct t
17483 unsigned char opcode[15];
17484 unsigned long addr = convert_ip_to_linear(child, regs);
17485
17486+ if (addr == -EINVAL)
17487+ return 0;
17488+
17489 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
17490 for (i = 0; i < copied; i++) {
17491 switch (opcode[i]) {
17492@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct t
17493
17494 #ifdef CONFIG_X86_64
17495 case 0x40 ... 0x4f:
17496- if (regs->cs != __USER_CS)
17497+ if ((regs->cs & 0xffff) != __USER_CS)
17498 /* 32-bit mode: register increment */
17499 return 0;
17500 /* 64-bit mode: REX prefix */
17501diff -urNp linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S
17502--- linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S 2011-03-27 14:31:47.000000000 -0400
17503+++ linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:56:46.000000000 -0400
17504@@ -1,3 +1,4 @@
17505+.section .rodata,"a",@progbits
17506 ENTRY(sys_call_table)
17507 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
17508 .long sys_exit
17509diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c
17510--- linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c 2011-03-27 14:31:47.000000000 -0400
17511+++ linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:56:46.000000000 -0400
17512@@ -24,6 +24,21 @@
17513
17514 #include <asm/syscalls.h>
17515
17516+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
17517+{
17518+ unsigned long pax_task_size = TASK_SIZE;
17519+
17520+#ifdef CONFIG_PAX_SEGMEXEC
17521+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
17522+ pax_task_size = SEGMEXEC_TASK_SIZE;
17523+#endif
17524+
17525+ if (len > pax_task_size || addr > pax_task_size - len)
17526+ return -EINVAL;
17527+
17528+ return 0;
17529+}
17530+
17531 /*
17532 * Perform the select(nd, in, out, ex, tv) and mmap() system
17533 * calls. Linux/i386 didn't use to be able to handle more than
17534@@ -58,6 +73,212 @@ out:
17535 return err;
17536 }
17537
17538+unsigned long
17539+arch_get_unmapped_area(struct file *filp, unsigned long addr,
17540+ unsigned long len, unsigned long pgoff, unsigned long flags)
17541+{
17542+ struct mm_struct *mm = current->mm;
17543+ struct vm_area_struct *vma;
17544+ unsigned long start_addr, pax_task_size = TASK_SIZE;
17545+
17546+#ifdef CONFIG_PAX_SEGMEXEC
17547+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17548+ pax_task_size = SEGMEXEC_TASK_SIZE;
17549+#endif
17550+
17551+ pax_task_size -= PAGE_SIZE;
17552+
17553+ if (len > pax_task_size)
17554+ return -ENOMEM;
17555+
17556+ if (flags & MAP_FIXED)
17557+ return addr;
17558+
17559+#ifdef CONFIG_PAX_RANDMMAP
17560+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17561+#endif
17562+
17563+ if (addr) {
17564+ addr = PAGE_ALIGN(addr);
17565+ if (pax_task_size - len >= addr) {
17566+ vma = find_vma(mm, addr);
17567+ if (check_heap_stack_gap(vma, addr, len))
17568+ return addr;
17569+ }
17570+ }
17571+ if (len > mm->cached_hole_size) {
17572+ start_addr = addr = mm->free_area_cache;
17573+ } else {
17574+ start_addr = addr = mm->mmap_base;
17575+ mm->cached_hole_size = 0;
17576+ }
17577+
17578+#ifdef CONFIG_PAX_PAGEEXEC
17579+ if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
17580+ start_addr = 0x00110000UL;
17581+
17582+#ifdef CONFIG_PAX_RANDMMAP
17583+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17584+ start_addr += mm->delta_mmap & 0x03FFF000UL;
17585+#endif
17586+
17587+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
17588+ start_addr = addr = mm->mmap_base;
17589+ else
17590+ addr = start_addr;
17591+ }
17592+#endif
17593+
17594+full_search:
17595+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
17596+ /* At this point: (!vma || addr < vma->vm_end). */
17597+ if (pax_task_size - len < addr) {
17598+ /*
17599+ * Start a new search - just in case we missed
17600+ * some holes.
17601+ */
17602+ if (start_addr != mm->mmap_base) {
17603+ start_addr = addr = mm->mmap_base;
17604+ mm->cached_hole_size = 0;
17605+ goto full_search;
17606+ }
17607+ return -ENOMEM;
17608+ }
17609+ if (check_heap_stack_gap(vma, addr, len))
17610+ break;
17611+ if (addr + mm->cached_hole_size < vma->vm_start)
17612+ mm->cached_hole_size = vma->vm_start - addr;
17613+ addr = vma->vm_end;
17614+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
17615+ start_addr = addr = mm->mmap_base;
17616+ mm->cached_hole_size = 0;
17617+ goto full_search;
17618+ }
17619+ }
17620+
17621+ /*
17622+ * Remember the place where we stopped the search:
17623+ */
17624+ mm->free_area_cache = addr + len;
17625+ return addr;
17626+}
17627+
17628+unsigned long
17629+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17630+ const unsigned long len, const unsigned long pgoff,
17631+ const unsigned long flags)
17632+{
17633+ struct vm_area_struct *vma;
17634+ struct mm_struct *mm = current->mm;
17635+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
17636+
17637+#ifdef CONFIG_PAX_SEGMEXEC
17638+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17639+ pax_task_size = SEGMEXEC_TASK_SIZE;
17640+#endif
17641+
17642+ pax_task_size -= PAGE_SIZE;
17643+
17644+ /* requested length too big for entire address space */
17645+ if (len > pax_task_size)
17646+ return -ENOMEM;
17647+
17648+ if (flags & MAP_FIXED)
17649+ return addr;
17650+
17651+#ifdef CONFIG_PAX_PAGEEXEC
17652+ if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
17653+ goto bottomup;
17654+#endif
17655+
17656+#ifdef CONFIG_PAX_RANDMMAP
17657+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17658+#endif
17659+
17660+ /* requesting a specific address */
17661+ if (addr) {
17662+ addr = PAGE_ALIGN(addr);
17663+ if (pax_task_size - len >= addr) {
17664+ vma = find_vma(mm, addr);
17665+ if (check_heap_stack_gap(vma, addr, len))
17666+ return addr;
17667+ }
17668+ }
17669+
17670+ /* check if free_area_cache is useful for us */
17671+ if (len <= mm->cached_hole_size) {
17672+ mm->cached_hole_size = 0;
17673+ mm->free_area_cache = mm->mmap_base;
17674+ }
17675+
17676+ /* either no address requested or can't fit in requested address hole */
17677+ addr = mm->free_area_cache;
17678+
17679+ /* make sure it can fit in the remaining address space */
17680+ if (addr > len) {
17681+ vma = find_vma(mm, addr-len);
17682+ if (check_heap_stack_gap(vma, addr - len, len))
17683+ /* remember the address as a hint for next time */
17684+ return (mm->free_area_cache = addr-len);
17685+ }
17686+
17687+ if (mm->mmap_base < len)
17688+ goto bottomup;
17689+
17690+ addr = mm->mmap_base-len;
17691+
17692+ do {
17693+ /*
17694+ * Lookup failure means no vma is above this address,
17695+ * else if new region fits below vma->vm_start,
17696+ * return with success:
17697+ */
17698+ vma = find_vma(mm, addr);
17699+ if (check_heap_stack_gap(vma, addr, len))
17700+ /* remember the address as a hint for next time */
17701+ return (mm->free_area_cache = addr);
17702+
17703+ /* remember the largest hole we saw so far */
17704+ if (addr + mm->cached_hole_size < vma->vm_start)
17705+ mm->cached_hole_size = vma->vm_start - addr;
17706+
17707+ /* try just below the current vma->vm_start */
17708+ addr = skip_heap_stack_gap(vma, len);
17709+ } while (!IS_ERR_VALUE(addr));
17710+
17711+bottomup:
17712+ /*
17713+ * A failed mmap() very likely causes application failure,
17714+ * so fall back to the bottom-up function here. This scenario
17715+ * can happen with large stack limits and large mmap()
17716+ * allocations.
17717+ */
17718+
17719+#ifdef CONFIG_PAX_SEGMEXEC
17720+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17721+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
17722+ else
17723+#endif
17724+
17725+ mm->mmap_base = TASK_UNMAPPED_BASE;
17726+
17727+#ifdef CONFIG_PAX_RANDMMAP
17728+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17729+ mm->mmap_base += mm->delta_mmap;
17730+#endif
17731+
17732+ mm->free_area_cache = mm->mmap_base;
17733+ mm->cached_hole_size = ~0UL;
17734+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
17735+ /*
17736+ * Restore the topdown base:
17737+ */
17738+ mm->mmap_base = base;
17739+ mm->free_area_cache = base;
17740+ mm->cached_hole_size = ~0UL;
17741+
17742+ return addr;
17743+}
17744
17745 struct sel_arg_struct {
17746 unsigned long n;
17747@@ -93,7 +314,7 @@ asmlinkage int sys_ipc(uint call, int fi
17748 return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL);
17749 case SEMTIMEDOP:
17750 return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
17751- (const struct timespec __user *)fifth);
17752+ (__force const struct timespec __user *)fifth);
17753
17754 case SEMGET:
17755 return sys_semget(first, second, third);
17756@@ -140,7 +361,7 @@ asmlinkage int sys_ipc(uint call, int fi
17757 ret = do_shmat(first, (char __user *) ptr, second, &raddr);
17758 if (ret)
17759 return ret;
17760- return put_user(raddr, (ulong __user *) third);
17761+ return put_user(raddr, (__force ulong __user *) third);
17762 }
17763 case 1: /* iBCS2 emulator entry point */
17764 if (!segment_eq(get_fs(), get_ds()))
17765@@ -207,17 +428,3 @@ asmlinkage int sys_olduname(struct oldol
17766
17767 return error;
17768 }
17769-
17770-
17771-/*
17772- * Do a system call from kernel instead of calling sys_execve so we
17773- * end up with proper pt_regs.
17774- */
17775-int kernel_execve(const char *filename, char *const argv[], char *const envp[])
17776-{
17777- long __res;
17778- asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx"
17779- : "=a" (__res)
17780- : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
17781- return __res;
17782-}
17783diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c
17784--- linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c 2011-03-27 14:31:47.000000000 -0400
17785+++ linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:56:46.000000000 -0400
17786@@ -32,8 +32,8 @@ out:
17787 return error;
17788 }
17789
17790-static void find_start_end(unsigned long flags, unsigned long *begin,
17791- unsigned long *end)
17792+static void find_start_end(struct mm_struct *mm, unsigned long flags,
17793+ unsigned long *begin, unsigned long *end)
17794 {
17795 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
17796 unsigned long new_begin;
17797@@ -52,7 +52,7 @@ static void find_start_end(unsigned long
17798 *begin = new_begin;
17799 }
17800 } else {
17801- *begin = TASK_UNMAPPED_BASE;
17802+ *begin = mm->mmap_base;
17803 *end = TASK_SIZE;
17804 }
17805 }
17806@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp
17807 if (flags & MAP_FIXED)
17808 return addr;
17809
17810- find_start_end(flags, &begin, &end);
17811+ find_start_end(mm, flags, &begin, &end);
17812
17813 if (len > end)
17814 return -ENOMEM;
17815
17816+#ifdef CONFIG_PAX_RANDMMAP
17817+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17818+#endif
17819+
17820 if (addr) {
17821 addr = PAGE_ALIGN(addr);
17822 vma = find_vma(mm, addr);
17823- if (end - len >= addr &&
17824- (!vma || addr + len <= vma->vm_start))
17825+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
17826 return addr;
17827 }
17828 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
17829@@ -106,7 +109,7 @@ full_search:
17830 }
17831 return -ENOMEM;
17832 }
17833- if (!vma || addr + len <= vma->vm_start) {
17834+ if (check_heap_stack_gap(vma, addr, len)) {
17835 /*
17836 * Remember the place where we stopped the search:
17837 */
17838@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct fi
17839 {
17840 struct vm_area_struct *vma;
17841 struct mm_struct *mm = current->mm;
17842- unsigned long addr = addr0;
17843+ unsigned long base = mm->mmap_base, addr = addr0;
17844
17845 /* requested length too big for entire address space */
17846 if (len > TASK_SIZE)
17847@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct fi
17848 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
17849 goto bottomup;
17850
17851+#ifdef CONFIG_PAX_RANDMMAP
17852+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17853+#endif
17854+
17855 /* requesting a specific address */
17856 if (addr) {
17857 addr = PAGE_ALIGN(addr);
17858- vma = find_vma(mm, addr);
17859- if (TASK_SIZE - len >= addr &&
17860- (!vma || addr + len <= vma->vm_start))
17861- return addr;
17862+ if (TASK_SIZE - len >= addr) {
17863+ vma = find_vma(mm, addr);
17864+ if (check_heap_stack_gap(vma, addr, len))
17865+ return addr;
17866+ }
17867 }
17868
17869 /* check if free_area_cache is useful for us */
17870@@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct fi
17871 /* make sure it can fit in the remaining address space */
17872 if (addr > len) {
17873 vma = find_vma(mm, addr-len);
17874- if (!vma || addr <= vma->vm_start)
17875+ if (check_heap_stack_gap(vma, addr - len, len))
17876 /* remember the address as a hint for next time */
17877 return mm->free_area_cache = addr-len;
17878 }
17879@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct fi
17880 * return with success:
17881 */
17882 vma = find_vma(mm, addr);
17883- if (!vma || addr+len <= vma->vm_start)
17884+ if (check_heap_stack_gap(vma, addr, len))
17885 /* remember the address as a hint for next time */
17886 return mm->free_area_cache = addr;
17887
17888@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct fi
17889 mm->cached_hole_size = vma->vm_start - addr;
17890
17891 /* try just below the current vma->vm_start */
17892- addr = vma->vm_start-len;
17893- } while (len < vma->vm_start);
17894+ addr = skip_heap_stack_gap(vma, len);
17895+ } while (!IS_ERR_VALUE(addr));
17896
17897 bottomup:
17898 /*
17899@@ -198,13 +206,21 @@ bottomup:
17900 * can happen with large stack limits and large mmap()
17901 * allocations.
17902 */
17903+ mm->mmap_base = TASK_UNMAPPED_BASE;
17904+
17905+#ifdef CONFIG_PAX_RANDMMAP
17906+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17907+ mm->mmap_base += mm->delta_mmap;
17908+#endif
17909+
17910+ mm->free_area_cache = mm->mmap_base;
17911 mm->cached_hole_size = ~0UL;
17912- mm->free_area_cache = TASK_UNMAPPED_BASE;
17913 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
17914 /*
17915 * Restore the topdown base:
17916 */
17917- mm->free_area_cache = mm->mmap_base;
17918+ mm->mmap_base = base;
17919+ mm->free_area_cache = base;
17920 mm->cached_hole_size = ~0UL;
17921
17922 return addr;
17923diff -urNp linux-2.6.32.46/arch/x86/kernel/tboot.c linux-2.6.32.46/arch/x86/kernel/tboot.c
17924--- linux-2.6.32.46/arch/x86/kernel/tboot.c 2011-03-27 14:31:47.000000000 -0400
17925+++ linux-2.6.32.46/arch/x86/kernel/tboot.c 2011-05-22 23:02:03.000000000 -0400
17926@@ -216,7 +216,7 @@ static int tboot_setup_sleep(void)
17927
17928 void tboot_shutdown(u32 shutdown_type)
17929 {
17930- void (*shutdown)(void);
17931+ void (* __noreturn shutdown)(void);
17932
17933 if (!tboot_enabled())
17934 return;
17935@@ -238,7 +238,7 @@ void tboot_shutdown(u32 shutdown_type)
17936
17937 switch_to_tboot_pt();
17938
17939- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
17940+ shutdown = (void *)tboot->shutdown_entry;
17941 shutdown();
17942
17943 /* should not reach here */
17944@@ -295,7 +295,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
17945 tboot_shutdown(acpi_shutdown_map[sleep_state]);
17946 }
17947
17948-static atomic_t ap_wfs_count;
17949+static atomic_unchecked_t ap_wfs_count;
17950
17951 static int tboot_wait_for_aps(int num_aps)
17952 {
17953@@ -319,9 +319,9 @@ static int __cpuinit tboot_cpu_callback(
17954 {
17955 switch (action) {
17956 case CPU_DYING:
17957- atomic_inc(&ap_wfs_count);
17958+ atomic_inc_unchecked(&ap_wfs_count);
17959 if (num_online_cpus() == 1)
17960- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
17961+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
17962 return NOTIFY_BAD;
17963 break;
17964 }
17965@@ -340,7 +340,7 @@ static __init int tboot_late_init(void)
17966
17967 tboot_create_trampoline();
17968
17969- atomic_set(&ap_wfs_count, 0);
17970+ atomic_set_unchecked(&ap_wfs_count, 0);
17971 register_hotcpu_notifier(&tboot_cpu_notifier);
17972 return 0;
17973 }
17974diff -urNp linux-2.6.32.46/arch/x86/kernel/time.c linux-2.6.32.46/arch/x86/kernel/time.c
17975--- linux-2.6.32.46/arch/x86/kernel/time.c 2011-03-27 14:31:47.000000000 -0400
17976+++ linux-2.6.32.46/arch/x86/kernel/time.c 2011-04-17 15:56:46.000000000 -0400
17977@@ -26,17 +26,13 @@
17978 int timer_ack;
17979 #endif
17980
17981-#ifdef CONFIG_X86_64
17982-volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
17983-#endif
17984-
17985 unsigned long profile_pc(struct pt_regs *regs)
17986 {
17987 unsigned long pc = instruction_pointer(regs);
17988
17989- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
17990+ if (!user_mode(regs) && in_lock_functions(pc)) {
17991 #ifdef CONFIG_FRAME_POINTER
17992- return *(unsigned long *)(regs->bp + sizeof(long));
17993+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
17994 #else
17995 unsigned long *sp =
17996 (unsigned long *)kernel_stack_pointer(regs);
17997@@ -45,11 +41,17 @@ unsigned long profile_pc(struct pt_regs
17998 * or above a saved flags. Eflags has bits 22-31 zero,
17999 * kernel addresses don't.
18000 */
18001+
18002+#ifdef CONFIG_PAX_KERNEXEC
18003+ return ktla_ktva(sp[0]);
18004+#else
18005 if (sp[0] >> 22)
18006 return sp[0];
18007 if (sp[1] >> 22)
18008 return sp[1];
18009 #endif
18010+
18011+#endif
18012 }
18013 return pc;
18014 }
18015diff -urNp linux-2.6.32.46/arch/x86/kernel/tls.c linux-2.6.32.46/arch/x86/kernel/tls.c
18016--- linux-2.6.32.46/arch/x86/kernel/tls.c 2011-03-27 14:31:47.000000000 -0400
18017+++ linux-2.6.32.46/arch/x86/kernel/tls.c 2011-04-17 15:56:46.000000000 -0400
18018@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
18019 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
18020 return -EINVAL;
18021
18022+#ifdef CONFIG_PAX_SEGMEXEC
18023+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
18024+ return -EINVAL;
18025+#endif
18026+
18027 set_tls_desc(p, idx, &info, 1);
18028
18029 return 0;
18030diff -urNp linux-2.6.32.46/arch/x86/kernel/trampoline_32.S linux-2.6.32.46/arch/x86/kernel/trampoline_32.S
18031--- linux-2.6.32.46/arch/x86/kernel/trampoline_32.S 2011-03-27 14:31:47.000000000 -0400
18032+++ linux-2.6.32.46/arch/x86/kernel/trampoline_32.S 2011-04-17 15:56:46.000000000 -0400
18033@@ -32,6 +32,12 @@
18034 #include <asm/segment.h>
18035 #include <asm/page_types.h>
18036
18037+#ifdef CONFIG_PAX_KERNEXEC
18038+#define ta(X) (X)
18039+#else
18040+#define ta(X) ((X) - __PAGE_OFFSET)
18041+#endif
18042+
18043 /* We can free up trampoline after bootup if cpu hotplug is not supported. */
18044 __CPUINITRODATA
18045 .code16
18046@@ -60,7 +66,7 @@ r_base = .
18047 inc %ax # protected mode (PE) bit
18048 lmsw %ax # into protected mode
18049 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
18050- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
18051+ ljmpl $__BOOT_CS, $ta(startup_32_smp)
18052
18053 # These need to be in the same 64K segment as the above;
18054 # hence we don't use the boot_gdt_descr defined in head.S
18055diff -urNp linux-2.6.32.46/arch/x86/kernel/trampoline_64.S linux-2.6.32.46/arch/x86/kernel/trampoline_64.S
18056--- linux-2.6.32.46/arch/x86/kernel/trampoline_64.S 2011-03-27 14:31:47.000000000 -0400
18057+++ linux-2.6.32.46/arch/x86/kernel/trampoline_64.S 2011-07-01 18:53:26.000000000 -0400
18058@@ -91,7 +91,7 @@ startup_32:
18059 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
18060 movl %eax, %ds
18061
18062- movl $X86_CR4_PAE, %eax
18063+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
18064 movl %eax, %cr4 # Enable PAE mode
18065
18066 # Setup trampoline 4 level pagetables
18067@@ -127,7 +127,7 @@ startup_64:
18068 no_longmode:
18069 hlt
18070 jmp no_longmode
18071-#include "verify_cpu_64.S"
18072+#include "verify_cpu.S"
18073
18074 # Careful these need to be in the same 64K segment as the above;
18075 tidt:
18076@@ -138,7 +138,7 @@ tidt:
18077 # so the kernel can live anywhere
18078 .balign 4
18079 tgdt:
18080- .short tgdt_end - tgdt # gdt limit
18081+ .short tgdt_end - tgdt - 1 # gdt limit
18082 .long tgdt - r_base
18083 .short 0
18084 .quad 0x00cf9b000000ffff # __KERNEL32_CS
18085diff -urNp linux-2.6.32.46/arch/x86/kernel/traps.c linux-2.6.32.46/arch/x86/kernel/traps.c
18086--- linux-2.6.32.46/arch/x86/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400
18087+++ linux-2.6.32.46/arch/x86/kernel/traps.c 2011-07-06 19:53:33.000000000 -0400
18088@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
18089
18090 /* Do we ignore FPU interrupts ? */
18091 char ignore_fpu_irq;
18092-
18093-/*
18094- * The IDT has to be page-aligned to simplify the Pentium
18095- * F0 0F bug workaround.
18096- */
18097-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
18098 #endif
18099
18100 DECLARE_BITMAP(used_vectors, NR_VECTORS);
18101@@ -112,19 +106,19 @@ static inline void preempt_conditional_c
18102 static inline void
18103 die_if_kernel(const char *str, struct pt_regs *regs, long err)
18104 {
18105- if (!user_mode_vm(regs))
18106+ if (!user_mode(regs))
18107 die(str, regs, err);
18108 }
18109 #endif
18110
18111 static void __kprobes
18112-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
18113+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
18114 long error_code, siginfo_t *info)
18115 {
18116 struct task_struct *tsk = current;
18117
18118 #ifdef CONFIG_X86_32
18119- if (regs->flags & X86_VM_MASK) {
18120+ if (v8086_mode(regs)) {
18121 /*
18122 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
18123 * On nmi (interrupt 2), do_trap should not be called.
18124@@ -135,7 +129,7 @@ do_trap(int trapnr, int signr, char *str
18125 }
18126 #endif
18127
18128- if (!user_mode(regs))
18129+ if (!user_mode_novm(regs))
18130 goto kernel_trap;
18131
18132 #ifdef CONFIG_X86_32
18133@@ -158,7 +152,7 @@ trap_signal:
18134 printk_ratelimit()) {
18135 printk(KERN_INFO
18136 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
18137- tsk->comm, tsk->pid, str,
18138+ tsk->comm, task_pid_nr(tsk), str,
18139 regs->ip, regs->sp, error_code);
18140 print_vma_addr(" in ", regs->ip);
18141 printk("\n");
18142@@ -175,8 +169,20 @@ kernel_trap:
18143 if (!fixup_exception(regs)) {
18144 tsk->thread.error_code = error_code;
18145 tsk->thread.trap_no = trapnr;
18146+
18147+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18148+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
18149+ str = "PAX: suspicious stack segment fault";
18150+#endif
18151+
18152 die(str, regs, error_code);
18153 }
18154+
18155+#ifdef CONFIG_PAX_REFCOUNT
18156+ if (trapnr == 4)
18157+ pax_report_refcount_overflow(regs);
18158+#endif
18159+
18160 return;
18161
18162 #ifdef CONFIG_X86_32
18163@@ -265,14 +271,30 @@ do_general_protection(struct pt_regs *re
18164 conditional_sti(regs);
18165
18166 #ifdef CONFIG_X86_32
18167- if (regs->flags & X86_VM_MASK)
18168+ if (v8086_mode(regs))
18169 goto gp_in_vm86;
18170 #endif
18171
18172 tsk = current;
18173- if (!user_mode(regs))
18174+ if (!user_mode_novm(regs))
18175 goto gp_in_kernel;
18176
18177+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
18178+ if (!nx_enabled && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
18179+ struct mm_struct *mm = tsk->mm;
18180+ unsigned long limit;
18181+
18182+ down_write(&mm->mmap_sem);
18183+ limit = mm->context.user_cs_limit;
18184+ if (limit < TASK_SIZE) {
18185+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
18186+ up_write(&mm->mmap_sem);
18187+ return;
18188+ }
18189+ up_write(&mm->mmap_sem);
18190+ }
18191+#endif
18192+
18193 tsk->thread.error_code = error_code;
18194 tsk->thread.trap_no = 13;
18195
18196@@ -305,6 +327,13 @@ gp_in_kernel:
18197 if (notify_die(DIE_GPF, "general protection fault", regs,
18198 error_code, 13, SIGSEGV) == NOTIFY_STOP)
18199 return;
18200+
18201+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18202+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
18203+ die("PAX: suspicious general protection fault", regs, error_code);
18204+ else
18205+#endif
18206+
18207 die("general protection fault", regs, error_code);
18208 }
18209
18210@@ -435,6 +464,17 @@ static notrace __kprobes void default_do
18211 dotraplinkage notrace __kprobes void
18212 do_nmi(struct pt_regs *regs, long error_code)
18213 {
18214+
18215+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18216+ if (!user_mode(regs)) {
18217+ unsigned long cs = regs->cs & 0xFFFF;
18218+ unsigned long ip = ktva_ktla(regs->ip);
18219+
18220+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
18221+ regs->ip = ip;
18222+ }
18223+#endif
18224+
18225 nmi_enter();
18226
18227 inc_irq_stat(__nmi_count);
18228@@ -558,7 +598,7 @@ dotraplinkage void __kprobes do_debug(st
18229 }
18230
18231 #ifdef CONFIG_X86_32
18232- if (regs->flags & X86_VM_MASK)
18233+ if (v8086_mode(regs))
18234 goto debug_vm86;
18235 #endif
18236
18237@@ -570,7 +610,7 @@ dotraplinkage void __kprobes do_debug(st
18238 * kernel space (but re-enable TF when returning to user mode).
18239 */
18240 if (condition & DR_STEP) {
18241- if (!user_mode(regs))
18242+ if (!user_mode_novm(regs))
18243 goto clear_TF_reenable;
18244 }
18245
18246@@ -757,7 +797,7 @@ do_simd_coprocessor_error(struct pt_regs
18247 * Handle strange cache flush from user space exception
18248 * in all other cases. This is undocumented behaviour.
18249 */
18250- if (regs->flags & X86_VM_MASK) {
18251+ if (v8086_mode(regs)) {
18252 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
18253 return;
18254 }
18255@@ -798,7 +838,7 @@ asmlinkage void __attribute__((weak)) sm
18256 void __math_state_restore(void)
18257 {
18258 struct thread_info *thread = current_thread_info();
18259- struct task_struct *tsk = thread->task;
18260+ struct task_struct *tsk = current;
18261
18262 /*
18263 * Paranoid restore. send a SIGSEGV if we fail to restore the state.
18264@@ -825,8 +865,7 @@ void __math_state_restore(void)
18265 */
18266 asmlinkage void math_state_restore(void)
18267 {
18268- struct thread_info *thread = current_thread_info();
18269- struct task_struct *tsk = thread->task;
18270+ struct task_struct *tsk = current;
18271
18272 if (!tsk_used_math(tsk)) {
18273 local_irq_enable();
18274diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S
18275--- linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S 2011-03-27 14:31:47.000000000 -0400
18276+++ linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S 1969-12-31 19:00:00.000000000 -0500
18277@@ -1,105 +0,0 @@
18278-/*
18279- *
18280- * verify_cpu.S - Code for cpu long mode and SSE verification. This
18281- * code has been borrowed from boot/setup.S and was introduced by
18282- * Andi Kleen.
18283- *
18284- * Copyright (c) 2007 Andi Kleen (ak@suse.de)
18285- * Copyright (c) 2007 Eric Biederman (ebiederm@xmission.com)
18286- * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com)
18287- *
18288- * This source code is licensed under the GNU General Public License,
18289- * Version 2. See the file COPYING for more details.
18290- *
18291- * This is a common code for verification whether CPU supports
18292- * long mode and SSE or not. It is not called directly instead this
18293- * file is included at various places and compiled in that context.
18294- * Following are the current usage.
18295- *
18296- * This file is included by both 16bit and 32bit code.
18297- *
18298- * arch/x86_64/boot/setup.S : Boot cpu verification (16bit)
18299- * arch/x86_64/boot/compressed/head.S: Boot cpu verification (32bit)
18300- * arch/x86_64/kernel/trampoline.S: secondary processor verfication (16bit)
18301- * arch/x86_64/kernel/acpi/wakeup.S:Verfication at resume (16bit)
18302- *
18303- * verify_cpu, returns the status of cpu check in register %eax.
18304- * 0: Success 1: Failure
18305- *
18306- * The caller needs to check for the error code and take the action
18307- * appropriately. Either display a message or halt.
18308- */
18309-
18310-#include <asm/cpufeature.h>
18311-
18312-verify_cpu:
18313- pushfl # Save caller passed flags
18314- pushl $0 # Kill any dangerous flags
18315- popfl
18316-
18317- pushfl # standard way to check for cpuid
18318- popl %eax
18319- movl %eax,%ebx
18320- xorl $0x200000,%eax
18321- pushl %eax
18322- popfl
18323- pushfl
18324- popl %eax
18325- cmpl %eax,%ebx
18326- jz verify_cpu_no_longmode # cpu has no cpuid
18327-
18328- movl $0x0,%eax # See if cpuid 1 is implemented
18329- cpuid
18330- cmpl $0x1,%eax
18331- jb verify_cpu_no_longmode # no cpuid 1
18332-
18333- xor %di,%di
18334- cmpl $0x68747541,%ebx # AuthenticAMD
18335- jnz verify_cpu_noamd
18336- cmpl $0x69746e65,%edx
18337- jnz verify_cpu_noamd
18338- cmpl $0x444d4163,%ecx
18339- jnz verify_cpu_noamd
18340- mov $1,%di # cpu is from AMD
18341-
18342-verify_cpu_noamd:
18343- movl $0x1,%eax # Does the cpu have what it takes
18344- cpuid
18345- andl $REQUIRED_MASK0,%edx
18346- xorl $REQUIRED_MASK0,%edx
18347- jnz verify_cpu_no_longmode
18348-
18349- movl $0x80000000,%eax # See if extended cpuid is implemented
18350- cpuid
18351- cmpl $0x80000001,%eax
18352- jb verify_cpu_no_longmode # no extended cpuid
18353-
18354- movl $0x80000001,%eax # Does the cpu have what it takes
18355- cpuid
18356- andl $REQUIRED_MASK1,%edx
18357- xorl $REQUIRED_MASK1,%edx
18358- jnz verify_cpu_no_longmode
18359-
18360-verify_cpu_sse_test:
18361- movl $1,%eax
18362- cpuid
18363- andl $SSE_MASK,%edx
18364- cmpl $SSE_MASK,%edx
18365- je verify_cpu_sse_ok
18366- test %di,%di
18367- jz verify_cpu_no_longmode # only try to force SSE on AMD
18368- movl $0xc0010015,%ecx # HWCR
18369- rdmsr
18370- btr $15,%eax # enable SSE
18371- wrmsr
18372- xor %di,%di # don't loop
18373- jmp verify_cpu_sse_test # try again
18374-
18375-verify_cpu_no_longmode:
18376- popfl # Restore caller passed flags
18377- movl $1,%eax
18378- ret
18379-verify_cpu_sse_ok:
18380- popfl # Restore caller passed flags
18381- xorl %eax, %eax
18382- ret
18383diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu.S linux-2.6.32.46/arch/x86/kernel/verify_cpu.S
18384--- linux-2.6.32.46/arch/x86/kernel/verify_cpu.S 1969-12-31 19:00:00.000000000 -0500
18385+++ linux-2.6.32.46/arch/x86/kernel/verify_cpu.S 2011-07-01 18:28:42.000000000 -0400
18386@@ -0,0 +1,140 @@
18387+/*
18388+ *
18389+ * verify_cpu.S - Code for cpu long mode and SSE verification. This
18390+ * code has been borrowed from boot/setup.S and was introduced by
18391+ * Andi Kleen.
18392+ *
18393+ * Copyright (c) 2007 Andi Kleen (ak@suse.de)
18394+ * Copyright (c) 2007 Eric Biederman (ebiederm@xmission.com)
18395+ * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com)
18396+ * Copyright (c) 2010 Kees Cook (kees.cook@canonical.com)
18397+ *
18398+ * This source code is licensed under the GNU General Public License,
18399+ * Version 2. See the file COPYING for more details.
18400+ *
18401+ * This is a common code for verification whether CPU supports
18402+ * long mode and SSE or not. It is not called directly instead this
18403+ * file is included at various places and compiled in that context.
18404+ * This file is expected to run in 32bit code. Currently:
18405+ *
18406+ * arch/x86/boot/compressed/head_64.S: Boot cpu verification
18407+ * arch/x86/kernel/trampoline_64.S: secondary processor verification
18408+ * arch/x86/kernel/head_32.S: processor startup
18409+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
18410+ *
18411+ * verify_cpu, returns the status of longmode and SSE in register %eax.
18412+ * 0: Success 1: Failure
18413+ *
18414+ * On Intel, the XD_DISABLE flag will be cleared as a side-effect.
18415+ *
18416+ * The caller needs to check for the error code and take the action
18417+ * appropriately. Either display a message or halt.
18418+ */
18419+
18420+#include <asm/cpufeature.h>
18421+#include <asm/msr-index.h>
18422+
18423+verify_cpu:
18424+ pushfl # Save caller passed flags
18425+ pushl $0 # Kill any dangerous flags
18426+ popfl
18427+
18428+ pushfl # standard way to check for cpuid
18429+ popl %eax
18430+ movl %eax,%ebx
18431+ xorl $0x200000,%eax
18432+ pushl %eax
18433+ popfl
18434+ pushfl
18435+ popl %eax
18436+ cmpl %eax,%ebx
18437+ jz verify_cpu_no_longmode # cpu has no cpuid
18438+
18439+ movl $0x0,%eax # See if cpuid 1 is implemented
18440+ cpuid
18441+ cmpl $0x1,%eax
18442+ jb verify_cpu_no_longmode # no cpuid 1
18443+
18444+ xor %di,%di
18445+ cmpl $0x68747541,%ebx # AuthenticAMD
18446+ jnz verify_cpu_noamd
18447+ cmpl $0x69746e65,%edx
18448+ jnz verify_cpu_noamd
18449+ cmpl $0x444d4163,%ecx
18450+ jnz verify_cpu_noamd
18451+ mov $1,%di # cpu is from AMD
18452+ jmp verify_cpu_check
18453+
18454+verify_cpu_noamd:
18455+ cmpl $0x756e6547,%ebx # GenuineIntel?
18456+ jnz verify_cpu_check
18457+ cmpl $0x49656e69,%edx
18458+ jnz verify_cpu_check
18459+ cmpl $0x6c65746e,%ecx
18460+ jnz verify_cpu_check
18461+
18462+ # only call IA32_MISC_ENABLE when:
18463+ # family > 6 || (family == 6 && model >= 0xd)
18464+ movl $0x1, %eax # check CPU family and model
18465+ cpuid
18466+ movl %eax, %ecx
18467+
18468+ andl $0x0ff00f00, %eax # mask family and extended family
18469+ shrl $8, %eax
18470+ cmpl $6, %eax
18471+ ja verify_cpu_clear_xd # family > 6, ok
18472+ jb verify_cpu_check # family < 6, skip
18473+
18474+ andl $0x000f00f0, %ecx # mask model and extended model
18475+ shrl $4, %ecx
18476+ cmpl $0xd, %ecx
18477+ jb verify_cpu_check # family == 6, model < 0xd, skip
18478+
18479+verify_cpu_clear_xd:
18480+ movl $MSR_IA32_MISC_ENABLE, %ecx
18481+ rdmsr
18482+ btrl $2, %edx # clear MSR_IA32_MISC_ENABLE_XD_DISABLE
18483+ jnc verify_cpu_check # only write MSR if bit was changed
18484+ wrmsr
18485+
18486+verify_cpu_check:
18487+ movl $0x1,%eax # Does the cpu have what it takes
18488+ cpuid
18489+ andl $REQUIRED_MASK0,%edx
18490+ xorl $REQUIRED_MASK0,%edx
18491+ jnz verify_cpu_no_longmode
18492+
18493+ movl $0x80000000,%eax # See if extended cpuid is implemented
18494+ cpuid
18495+ cmpl $0x80000001,%eax
18496+ jb verify_cpu_no_longmode # no extended cpuid
18497+
18498+ movl $0x80000001,%eax # Does the cpu have what it takes
18499+ cpuid
18500+ andl $REQUIRED_MASK1,%edx
18501+ xorl $REQUIRED_MASK1,%edx
18502+ jnz verify_cpu_no_longmode
18503+
18504+verify_cpu_sse_test:
18505+ movl $1,%eax
18506+ cpuid
18507+ andl $SSE_MASK,%edx
18508+ cmpl $SSE_MASK,%edx
18509+ je verify_cpu_sse_ok
18510+ test %di,%di
18511+ jz verify_cpu_no_longmode # only try to force SSE on AMD
18512+ movl $MSR_K7_HWCR,%ecx
18513+ rdmsr
18514+ btr $15,%eax # enable SSE
18515+ wrmsr
18516+ xor %di,%di # don't loop
18517+ jmp verify_cpu_sse_test # try again
18518+
18519+verify_cpu_no_longmode:
18520+ popfl # Restore caller passed flags
18521+ movl $1,%eax
18522+ ret
18523+verify_cpu_sse_ok:
18524+ popfl # Restore caller passed flags
18525+ xorl %eax, %eax
18526+ ret
18527diff -urNp linux-2.6.32.46/arch/x86/kernel/vm86_32.c linux-2.6.32.46/arch/x86/kernel/vm86_32.c
18528--- linux-2.6.32.46/arch/x86/kernel/vm86_32.c 2011-03-27 14:31:47.000000000 -0400
18529+++ linux-2.6.32.46/arch/x86/kernel/vm86_32.c 2011-04-17 15:56:46.000000000 -0400
18530@@ -41,6 +41,7 @@
18531 #include <linux/ptrace.h>
18532 #include <linux/audit.h>
18533 #include <linux/stddef.h>
18534+#include <linux/grsecurity.h>
18535
18536 #include <asm/uaccess.h>
18537 #include <asm/io.h>
18538@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct ke
18539 do_exit(SIGSEGV);
18540 }
18541
18542- tss = &per_cpu(init_tss, get_cpu());
18543+ tss = init_tss + get_cpu();
18544 current->thread.sp0 = current->thread.saved_sp0;
18545 current->thread.sysenter_cs = __KERNEL_CS;
18546 load_sp0(tss, &current->thread);
18547@@ -208,6 +209,13 @@ int sys_vm86old(struct pt_regs *regs)
18548 struct task_struct *tsk;
18549 int tmp, ret = -EPERM;
18550
18551+#ifdef CONFIG_GRKERNSEC_VM86
18552+ if (!capable(CAP_SYS_RAWIO)) {
18553+ gr_handle_vm86();
18554+ goto out;
18555+ }
18556+#endif
18557+
18558 tsk = current;
18559 if (tsk->thread.saved_sp0)
18560 goto out;
18561@@ -238,6 +246,14 @@ int sys_vm86(struct pt_regs *regs)
18562 int tmp, ret;
18563 struct vm86plus_struct __user *v86;
18564
18565+#ifdef CONFIG_GRKERNSEC_VM86
18566+ if (!capable(CAP_SYS_RAWIO)) {
18567+ gr_handle_vm86();
18568+ ret = -EPERM;
18569+ goto out;
18570+ }
18571+#endif
18572+
18573 tsk = current;
18574 switch (regs->bx) {
18575 case VM86_REQUEST_IRQ:
18576@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm
18577 tsk->thread.saved_fs = info->regs32->fs;
18578 tsk->thread.saved_gs = get_user_gs(info->regs32);
18579
18580- tss = &per_cpu(init_tss, get_cpu());
18581+ tss = init_tss + get_cpu();
18582 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
18583 if (cpu_has_sep)
18584 tsk->thread.sysenter_cs = 0;
18585@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_re
18586 goto cannot_handle;
18587 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
18588 goto cannot_handle;
18589- intr_ptr = (unsigned long __user *) (i << 2);
18590+ intr_ptr = (__force unsigned long __user *) (i << 2);
18591 if (get_user(segoffs, intr_ptr))
18592 goto cannot_handle;
18593 if ((segoffs >> 16) == BIOSSEG)
18594diff -urNp linux-2.6.32.46/arch/x86/kernel/vmi_32.c linux-2.6.32.46/arch/x86/kernel/vmi_32.c
18595--- linux-2.6.32.46/arch/x86/kernel/vmi_32.c 2011-03-27 14:31:47.000000000 -0400
18596+++ linux-2.6.32.46/arch/x86/kernel/vmi_32.c 2011-08-05 20:33:55.000000000 -0400
18597@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
18598 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
18599
18600 #define call_vrom_func(rom,func) \
18601- (((VROMFUNC *)(rom->func))())
18602+ (((VROMFUNC *)(ktva_ktla(rom.func)))())
18603
18604 #define call_vrom_long_func(rom,func,arg) \
18605- (((VROMLONGFUNC *)(rom->func)) (arg))
18606+({\
18607+ u64 __reloc = ((VROMLONGFUNC *)(ktva_ktla(rom.func))) (arg);\
18608+ struct vmi_relocation_info *const __rel = (struct vmi_relocation_info *)&__reloc;\
18609+ __rel->eip = (unsigned char *)ktva_ktla((unsigned long)__rel->eip);\
18610+ __reloc;\
18611+})
18612
18613-static struct vrom_header *vmi_rom;
18614+static struct vrom_header vmi_rom __attribute((__section__(".vmi.rom"), __aligned__(PAGE_SIZE)));
18615 static int disable_pge;
18616 static int disable_pse;
18617 static int disable_sep;
18618@@ -76,10 +81,10 @@ static struct {
18619 void (*set_initial_ap_state)(int, int);
18620 void (*halt)(void);
18621 void (*set_lazy_mode)(int mode);
18622-} vmi_ops;
18623+} __no_const vmi_ops __read_only;
18624
18625 /* Cached VMI operations */
18626-struct vmi_timer_ops vmi_timer_ops;
18627+struct vmi_timer_ops vmi_timer_ops __read_only;
18628
18629 /*
18630 * VMI patching routines.
18631@@ -94,7 +99,7 @@ struct vmi_timer_ops vmi_timer_ops;
18632 static inline void patch_offset(void *insnbuf,
18633 unsigned long ip, unsigned long dest)
18634 {
18635- *(unsigned long *)(insnbuf+1) = dest-ip-5;
18636+ *(unsigned long *)(insnbuf+1) = dest-ip-5;
18637 }
18638
18639 static unsigned patch_internal(int call, unsigned len, void *insnbuf,
18640@@ -102,6 +107,7 @@ static unsigned patch_internal(int call,
18641 {
18642 u64 reloc;
18643 struct vmi_relocation_info *const rel = (struct vmi_relocation_info *)&reloc;
18644+
18645 reloc = call_vrom_long_func(vmi_rom, get_reloc, call);
18646 switch(rel->type) {
18647 case VMI_RELOCATION_CALL_REL:
18648@@ -404,13 +410,13 @@ static void vmi_set_pud(pud_t *pudp, pud
18649
18650 static void vmi_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
18651 {
18652- const pte_t pte = { .pte = 0 };
18653+ const pte_t pte = __pte(0ULL);
18654 vmi_ops.set_pte(pte, ptep, vmi_flags_addr(mm, addr, VMI_PAGE_PT, 0));
18655 }
18656
18657 static void vmi_pmd_clear(pmd_t *pmd)
18658 {
18659- const pte_t pte = { .pte = 0 };
18660+ const pte_t pte = __pte(0ULL);
18661 vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD);
18662 }
18663 #endif
18664@@ -438,10 +444,10 @@ vmi_startup_ipi_hook(int phys_apicid, un
18665 ap.ss = __KERNEL_DS;
18666 ap.esp = (unsigned long) start_esp;
18667
18668- ap.ds = __USER_DS;
18669- ap.es = __USER_DS;
18670+ ap.ds = __KERNEL_DS;
18671+ ap.es = __KERNEL_DS;
18672 ap.fs = __KERNEL_PERCPU;
18673- ap.gs = __KERNEL_STACK_CANARY;
18674+ savesegment(gs, ap.gs);
18675
18676 ap.eflags = 0;
18677
18678@@ -486,6 +492,18 @@ static void vmi_leave_lazy_mmu(void)
18679 paravirt_leave_lazy_mmu();
18680 }
18681
18682+#ifdef CONFIG_PAX_KERNEXEC
18683+static unsigned long vmi_pax_open_kernel(void)
18684+{
18685+ return 0;
18686+}
18687+
18688+static unsigned long vmi_pax_close_kernel(void)
18689+{
18690+ return 0;
18691+}
18692+#endif
18693+
18694 static inline int __init check_vmi_rom(struct vrom_header *rom)
18695 {
18696 struct pci_header *pci;
18697@@ -498,6 +516,10 @@ static inline int __init check_vmi_rom(s
18698 return 0;
18699 if (rom->vrom_signature != VMI_SIGNATURE)
18700 return 0;
18701+ if (rom->rom_length * 512 > sizeof(*rom)) {
18702+ printk(KERN_WARNING "PAX: VMI: ROM size too big: %x\n", rom->rom_length * 512);
18703+ return 0;
18704+ }
18705 if (rom->api_version_maj != VMI_API_REV_MAJOR ||
18706 rom->api_version_min+1 < VMI_API_REV_MINOR+1) {
18707 printk(KERN_WARNING "VMI: Found mismatched rom version %d.%d\n",
18708@@ -562,7 +584,7 @@ static inline int __init probe_vmi_rom(v
18709 struct vrom_header *romstart;
18710 romstart = (struct vrom_header *)isa_bus_to_virt(base);
18711 if (check_vmi_rom(romstart)) {
18712- vmi_rom = romstart;
18713+ vmi_rom = *romstart;
18714 return 1;
18715 }
18716 }
18717@@ -836,6 +858,11 @@ static inline int __init activate_vmi(vo
18718
18719 para_fill(pv_irq_ops.safe_halt, Halt);
18720
18721+#ifdef CONFIG_PAX_KERNEXEC
18722+ pv_mmu_ops.pax_open_kernel = vmi_pax_open_kernel;
18723+ pv_mmu_ops.pax_close_kernel = vmi_pax_close_kernel;
18724+#endif
18725+
18726 /*
18727 * Alternative instruction rewriting doesn't happen soon enough
18728 * to convert VMI_IRET to a call instead of a jump; so we have
18729@@ -853,16 +880,16 @@ static inline int __init activate_vmi(vo
18730
18731 void __init vmi_init(void)
18732 {
18733- if (!vmi_rom)
18734+ if (!vmi_rom.rom_signature)
18735 probe_vmi_rom();
18736 else
18737- check_vmi_rom(vmi_rom);
18738+ check_vmi_rom(&vmi_rom);
18739
18740 /* In case probing for or validating the ROM failed, basil */
18741- if (!vmi_rom)
18742+ if (!vmi_rom.rom_signature)
18743 return;
18744
18745- reserve_top_address(-vmi_rom->virtual_top);
18746+ reserve_top_address(-vmi_rom.virtual_top);
18747
18748 #ifdef CONFIG_X86_IO_APIC
18749 /* This is virtual hardware; timer routing is wired correctly */
18750@@ -874,7 +901,7 @@ void __init vmi_activate(void)
18751 {
18752 unsigned long flags;
18753
18754- if (!vmi_rom)
18755+ if (!vmi_rom.rom_signature)
18756 return;
18757
18758 local_irq_save(flags);
18759diff -urNp linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S
18760--- linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S 2011-03-27 14:31:47.000000000 -0400
18761+++ linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:56:46.000000000 -0400
18762@@ -26,6 +26,13 @@
18763 #include <asm/page_types.h>
18764 #include <asm/cache.h>
18765 #include <asm/boot.h>
18766+#include <asm/segment.h>
18767+
18768+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18769+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
18770+#else
18771+#define __KERNEL_TEXT_OFFSET 0
18772+#endif
18773
18774 #undef i386 /* in case the preprocessor is a 32bit one */
18775
18776@@ -34,40 +41,53 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
18777 #ifdef CONFIG_X86_32
18778 OUTPUT_ARCH(i386)
18779 ENTRY(phys_startup_32)
18780-jiffies = jiffies_64;
18781 #else
18782 OUTPUT_ARCH(i386:x86-64)
18783 ENTRY(phys_startup_64)
18784-jiffies_64 = jiffies;
18785 #endif
18786
18787 PHDRS {
18788 text PT_LOAD FLAGS(5); /* R_E */
18789- data PT_LOAD FLAGS(7); /* RWE */
18790+#ifdef CONFIG_X86_32
18791+ module PT_LOAD FLAGS(5); /* R_E */
18792+#endif
18793+#ifdef CONFIG_XEN
18794+ rodata PT_LOAD FLAGS(5); /* R_E */
18795+#else
18796+ rodata PT_LOAD FLAGS(4); /* R__ */
18797+#endif
18798+ data PT_LOAD FLAGS(6); /* RW_ */
18799 #ifdef CONFIG_X86_64
18800 user PT_LOAD FLAGS(5); /* R_E */
18801+#endif
18802+ init.begin PT_LOAD FLAGS(6); /* RW_ */
18803 #ifdef CONFIG_SMP
18804 percpu PT_LOAD FLAGS(6); /* RW_ */
18805 #endif
18806+ text.init PT_LOAD FLAGS(5); /* R_E */
18807+ text.exit PT_LOAD FLAGS(5); /* R_E */
18808 init PT_LOAD FLAGS(7); /* RWE */
18809-#endif
18810 note PT_NOTE FLAGS(0); /* ___ */
18811 }
18812
18813 SECTIONS
18814 {
18815 #ifdef CONFIG_X86_32
18816- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
18817- phys_startup_32 = startup_32 - LOAD_OFFSET;
18818+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
18819 #else
18820- . = __START_KERNEL;
18821- phys_startup_64 = startup_64 - LOAD_OFFSET;
18822+ . = __START_KERNEL;
18823 #endif
18824
18825 /* Text and read-only data */
18826- .text : AT(ADDR(.text) - LOAD_OFFSET) {
18827- _text = .;
18828+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
18829 /* bootstrapping code */
18830+#ifdef CONFIG_X86_32
18831+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
18832+#else
18833+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
18834+#endif
18835+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
18836+ _text = .;
18837 HEAD_TEXT
18838 #ifdef CONFIG_X86_32
18839 . = ALIGN(PAGE_SIZE);
18840@@ -82,28 +102,71 @@ SECTIONS
18841 IRQENTRY_TEXT
18842 *(.fixup)
18843 *(.gnu.warning)
18844- /* End of text section */
18845- _etext = .;
18846 } :text = 0x9090
18847
18848- NOTES :text :note
18849+ . += __KERNEL_TEXT_OFFSET;
18850+
18851+#ifdef CONFIG_X86_32
18852+ . = ALIGN(PAGE_SIZE);
18853+ .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) {
18854+ *(.vmi.rom)
18855+ } :module
18856+
18857+ . = ALIGN(PAGE_SIZE);
18858+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
18859+
18860+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
18861+ MODULES_EXEC_VADDR = .;
18862+ BYTE(0)
18863+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
18864+ . = ALIGN(HPAGE_SIZE);
18865+ MODULES_EXEC_END = . - 1;
18866+#endif
18867+
18868+ } :module
18869+#endif
18870
18871- EXCEPTION_TABLE(16) :text = 0x9090
18872+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
18873+ /* End of text section */
18874+ _etext = . - __KERNEL_TEXT_OFFSET;
18875+ }
18876+
18877+#ifdef CONFIG_X86_32
18878+ . = ALIGN(PAGE_SIZE);
18879+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
18880+ *(.idt)
18881+ . = ALIGN(PAGE_SIZE);
18882+ *(.empty_zero_page)
18883+ *(.swapper_pg_fixmap)
18884+ *(.swapper_pg_pmd)
18885+ *(.swapper_pg_dir)
18886+ *(.trampoline_pg_dir)
18887+ } :rodata
18888+#endif
18889+
18890+ . = ALIGN(PAGE_SIZE);
18891+ NOTES :rodata :note
18892+
18893+ EXCEPTION_TABLE(16) :rodata
18894
18895 RO_DATA(PAGE_SIZE)
18896
18897 /* Data */
18898 .data : AT(ADDR(.data) - LOAD_OFFSET) {
18899+
18900+#ifdef CONFIG_PAX_KERNEXEC
18901+ . = ALIGN(HPAGE_SIZE);
18902+#else
18903+ . = ALIGN(PAGE_SIZE);
18904+#endif
18905+
18906 /* Start of data section */
18907 _sdata = .;
18908
18909 /* init_task */
18910 INIT_TASK_DATA(THREAD_SIZE)
18911
18912-#ifdef CONFIG_X86_32
18913- /* 32 bit has nosave before _edata */
18914 NOSAVE_DATA
18915-#endif
18916
18917 PAGE_ALIGNED_DATA(PAGE_SIZE)
18918
18919@@ -112,6 +175,8 @@ SECTIONS
18920 DATA_DATA
18921 CONSTRUCTORS
18922
18923+ jiffies = jiffies_64;
18924+
18925 /* rarely changed data like cpu maps */
18926 READ_MOSTLY_DATA(CONFIG_X86_INTERNODE_CACHE_BYTES)
18927
18928@@ -166,12 +231,6 @@ SECTIONS
18929 }
18930 vgetcpu_mode = VVIRT(.vgetcpu_mode);
18931
18932- . = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
18933- .jiffies : AT(VLOAD(.jiffies)) {
18934- *(.jiffies)
18935- }
18936- jiffies = VVIRT(.jiffies);
18937-
18938 .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
18939 *(.vsyscall_3)
18940 }
18941@@ -187,12 +246,19 @@ SECTIONS
18942 #endif /* CONFIG_X86_64 */
18943
18944 /* Init code and data - will be freed after init */
18945- . = ALIGN(PAGE_SIZE);
18946 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
18947+ BYTE(0)
18948+
18949+#ifdef CONFIG_PAX_KERNEXEC
18950+ . = ALIGN(HPAGE_SIZE);
18951+#else
18952+ . = ALIGN(PAGE_SIZE);
18953+#endif
18954+
18955 __init_begin = .; /* paired with __init_end */
18956- }
18957+ } :init.begin
18958
18959-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
18960+#ifdef CONFIG_SMP
18961 /*
18962 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
18963 * output PHDR, so the next output section - .init.text - should
18964@@ -201,12 +267,27 @@ SECTIONS
18965 PERCPU_VADDR(0, :percpu)
18966 #endif
18967
18968- INIT_TEXT_SECTION(PAGE_SIZE)
18969-#ifdef CONFIG_X86_64
18970- :init
18971-#endif
18972+ . = ALIGN(PAGE_SIZE);
18973+ init_begin = .;
18974+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
18975+ VMLINUX_SYMBOL(_sinittext) = .;
18976+ INIT_TEXT
18977+ VMLINUX_SYMBOL(_einittext) = .;
18978+ . = ALIGN(PAGE_SIZE);
18979+ } :text.init
18980
18981- INIT_DATA_SECTION(16)
18982+ /*
18983+ * .exit.text is discard at runtime, not link time, to deal with
18984+ * references from .altinstructions and .eh_frame
18985+ */
18986+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
18987+ EXIT_TEXT
18988+ . = ALIGN(16);
18989+ } :text.exit
18990+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
18991+
18992+ . = ALIGN(PAGE_SIZE);
18993+ INIT_DATA_SECTION(16) :init
18994
18995 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
18996 __x86_cpu_dev_start = .;
18997@@ -232,19 +313,11 @@ SECTIONS
18998 *(.altinstr_replacement)
18999 }
19000
19001- /*
19002- * .exit.text is discard at runtime, not link time, to deal with
19003- * references from .altinstructions and .eh_frame
19004- */
19005- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
19006- EXIT_TEXT
19007- }
19008-
19009 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
19010 EXIT_DATA
19011 }
19012
19013-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
19014+#ifndef CONFIG_SMP
19015 PERCPU(PAGE_SIZE)
19016 #endif
19017
19018@@ -267,12 +340,6 @@ SECTIONS
19019 . = ALIGN(PAGE_SIZE);
19020 }
19021
19022-#ifdef CONFIG_X86_64
19023- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
19024- NOSAVE_DATA
19025- }
19026-#endif
19027-
19028 /* BSS */
19029 . = ALIGN(PAGE_SIZE);
19030 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
19031@@ -288,6 +355,7 @@ SECTIONS
19032 __brk_base = .;
19033 . += 64 * 1024; /* 64k alignment slop space */
19034 *(.brk_reservation) /* areas brk users have reserved */
19035+ . = ALIGN(HPAGE_SIZE);
19036 __brk_limit = .;
19037 }
19038
19039@@ -316,13 +384,12 @@ SECTIONS
19040 * for the boot processor.
19041 */
19042 #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load
19043-INIT_PER_CPU(gdt_page);
19044 INIT_PER_CPU(irq_stack_union);
19045
19046 /*
19047 * Build-time check on the image size:
19048 */
19049-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
19050+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
19051 "kernel image bigger than KERNEL_IMAGE_SIZE");
19052
19053 #ifdef CONFIG_SMP
19054diff -urNp linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c
19055--- linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c 2011-03-27 14:31:47.000000000 -0400
19056+++ linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c 2011-04-23 12:56:10.000000000 -0400
19057@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
19058
19059 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
19060 /* copy vsyscall data */
19061+ strlcpy(vsyscall_gtod_data.clock.name, clock->name, sizeof vsyscall_gtod_data.clock.name);
19062 vsyscall_gtod_data.clock.vread = clock->vread;
19063 vsyscall_gtod_data.clock.cycle_last = clock->cycle_last;
19064 vsyscall_gtod_data.clock.mask = clock->mask;
19065@@ -203,7 +204,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s
19066 We do this here because otherwise user space would do it on
19067 its own in a likely inferior way (no access to jiffies).
19068 If you don't like it pass NULL. */
19069- if (tcache && tcache->blob[0] == (j = __jiffies)) {
19070+ if (tcache && tcache->blob[0] == (j = jiffies)) {
19071 p = tcache->blob[1];
19072 } else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
19073 /* Load per CPU data from RDTSCP */
19074diff -urNp linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c
19075--- linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c 2011-03-27 14:31:47.000000000 -0400
19076+++ linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:56:46.000000000 -0400
19077@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
19078
19079 EXPORT_SYMBOL(copy_user_generic);
19080 EXPORT_SYMBOL(__copy_user_nocache);
19081-EXPORT_SYMBOL(copy_from_user);
19082-EXPORT_SYMBOL(copy_to_user);
19083 EXPORT_SYMBOL(__copy_from_user_inatomic);
19084
19085 EXPORT_SYMBOL(copy_page);
19086diff -urNp linux-2.6.32.46/arch/x86/kernel/xsave.c linux-2.6.32.46/arch/x86/kernel/xsave.c
19087--- linux-2.6.32.46/arch/x86/kernel/xsave.c 2011-03-27 14:31:47.000000000 -0400
19088+++ linux-2.6.32.46/arch/x86/kernel/xsave.c 2011-10-06 09:37:08.000000000 -0400
19089@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
19090 fx_sw_user->xstate_size > fx_sw_user->extended_size)
19091 return -1;
19092
19093- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
19094+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
19095 fx_sw_user->extended_size -
19096 FP_XSTATE_MAGIC2_SIZE));
19097 /*
19098@@ -196,7 +196,7 @@ fx_only:
19099 * the other extended state.
19100 */
19101 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
19102- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
19103+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
19104 }
19105
19106 /*
19107@@ -228,7 +228,7 @@ int restore_i387_xstate(void __user *buf
19108 if (task_thread_info(tsk)->status & TS_XSAVE)
19109 err = restore_user_xstate(buf);
19110 else
19111- err = fxrstor_checking((__force struct i387_fxsave_struct *)
19112+ err = fxrstor_checking((struct i387_fxsave_struct __user *)
19113 buf);
19114 if (unlikely(err)) {
19115 /*
19116diff -urNp linux-2.6.32.46/arch/x86/kvm/emulate.c linux-2.6.32.46/arch/x86/kvm/emulate.c
19117--- linux-2.6.32.46/arch/x86/kvm/emulate.c 2011-03-27 14:31:47.000000000 -0400
19118+++ linux-2.6.32.46/arch/x86/kvm/emulate.c 2011-04-17 15:56:46.000000000 -0400
19119@@ -81,8 +81,8 @@
19120 #define Src2CL (1<<29)
19121 #define Src2ImmByte (2<<29)
19122 #define Src2One (3<<29)
19123-#define Src2Imm16 (4<<29)
19124-#define Src2Mask (7<<29)
19125+#define Src2Imm16 (4U<<29)
19126+#define Src2Mask (7U<<29)
19127
19128 enum {
19129 Group1_80, Group1_81, Group1_82, Group1_83,
19130@@ -411,6 +411,7 @@ static u32 group2_table[] = {
19131
19132 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
19133 do { \
19134+ unsigned long _tmp; \
19135 __asm__ __volatile__ ( \
19136 _PRE_EFLAGS("0", "4", "2") \
19137 _op _suffix " %"_x"3,%1; " \
19138@@ -424,8 +425,6 @@ static u32 group2_table[] = {
19139 /* Raw emulation: instruction has two explicit operands. */
19140 #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
19141 do { \
19142- unsigned long _tmp; \
19143- \
19144 switch ((_dst).bytes) { \
19145 case 2: \
19146 ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
19147@@ -441,7 +440,6 @@ static u32 group2_table[] = {
19148
19149 #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
19150 do { \
19151- unsigned long _tmp; \
19152 switch ((_dst).bytes) { \
19153 case 1: \
19154 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
19155diff -urNp linux-2.6.32.46/arch/x86/kvm/lapic.c linux-2.6.32.46/arch/x86/kvm/lapic.c
19156--- linux-2.6.32.46/arch/x86/kvm/lapic.c 2011-03-27 14:31:47.000000000 -0400
19157+++ linux-2.6.32.46/arch/x86/kvm/lapic.c 2011-04-17 15:56:46.000000000 -0400
19158@@ -52,7 +52,7 @@
19159 #define APIC_BUS_CYCLE_NS 1
19160
19161 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
19162-#define apic_debug(fmt, arg...)
19163+#define apic_debug(fmt, arg...) do {} while (0)
19164
19165 #define APIC_LVT_NUM 6
19166 /* 14 is the version for Xeon and Pentium 8.4.8*/
19167diff -urNp linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h
19168--- linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h 2011-03-27 14:31:47.000000000 -0400
19169+++ linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h 2011-05-16 21:46:57.000000000 -0400
19170@@ -416,6 +416,8 @@ static int FNAME(page_fault)(struct kvm_
19171 int level = PT_PAGE_TABLE_LEVEL;
19172 unsigned long mmu_seq;
19173
19174+ pax_track_stack();
19175+
19176 pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);
19177 kvm_mmu_audit(vcpu, "pre page fault");
19178
19179diff -urNp linux-2.6.32.46/arch/x86/kvm/svm.c linux-2.6.32.46/arch/x86/kvm/svm.c
19180--- linux-2.6.32.46/arch/x86/kvm/svm.c 2011-03-27 14:31:47.000000000 -0400
19181+++ linux-2.6.32.46/arch/x86/kvm/svm.c 2011-08-05 20:33:55.000000000 -0400
19182@@ -2485,7 +2485,11 @@ static void reload_tss(struct kvm_vcpu *
19183 int cpu = raw_smp_processor_id();
19184
19185 struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu);
19186+
19187+ pax_open_kernel();
19188 svm_data->tss_desc->type = 9; /* available 32/64-bit TSS */
19189+ pax_close_kernel();
19190+
19191 load_TR_desc();
19192 }
19193
19194@@ -2946,7 +2950,7 @@ static bool svm_gb_page_enable(void)
19195 return true;
19196 }
19197
19198-static struct kvm_x86_ops svm_x86_ops = {
19199+static const struct kvm_x86_ops svm_x86_ops = {
19200 .cpu_has_kvm_support = has_svm,
19201 .disabled_by_bios = is_disabled,
19202 .hardware_setup = svm_hardware_setup,
19203diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c
19204--- linux-2.6.32.46/arch/x86/kvm/vmx.c 2011-03-27 14:31:47.000000000 -0400
19205+++ linux-2.6.32.46/arch/x86/kvm/vmx.c 2011-05-04 17:56:20.000000000 -0400
19206@@ -570,7 +570,11 @@ static void reload_tss(void)
19207
19208 kvm_get_gdt(&gdt);
19209 descs = (void *)gdt.base;
19210+
19211+ pax_open_kernel();
19212 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
19213+ pax_close_kernel();
19214+
19215 load_TR_desc();
19216 }
19217
19218@@ -1409,8 +1413,11 @@ static __init int hardware_setup(void)
19219 if (!cpu_has_vmx_flexpriority())
19220 flexpriority_enabled = 0;
19221
19222- if (!cpu_has_vmx_tpr_shadow())
19223- kvm_x86_ops->update_cr8_intercept = NULL;
19224+ if (!cpu_has_vmx_tpr_shadow()) {
19225+ pax_open_kernel();
19226+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
19227+ pax_close_kernel();
19228+ }
19229
19230 if (enable_ept && !cpu_has_vmx_ept_2m_page())
19231 kvm_disable_largepages();
19232@@ -2361,7 +2368,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
19233 vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */
19234
19235 asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
19236- vmcs_writel(HOST_RIP, kvm_vmx_return); /* 22.2.5 */
19237+ vmcs_writel(HOST_RIP, ktla_ktva(kvm_vmx_return)); /* 22.2.5 */
19238 vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
19239 vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
19240 vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);
19241@@ -3717,6 +3724,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
19242 "jmp .Lkvm_vmx_return \n\t"
19243 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
19244 ".Lkvm_vmx_return: "
19245+
19246+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19247+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
19248+ ".Lkvm_vmx_return2: "
19249+#endif
19250+
19251 /* Save guest registers, load host registers, keep flags */
19252 "xchg %0, (%%"R"sp) \n\t"
19253 "mov %%"R"ax, %c[rax](%0) \n\t"
19254@@ -3763,8 +3776,13 @@ static void vmx_vcpu_run(struct kvm_vcpu
19255 [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
19256 #endif
19257 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
19258+
19259+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19260+ ,[cs]"i"(__KERNEL_CS)
19261+#endif
19262+
19263 : "cc", "memory"
19264- , R"bx", R"di", R"si"
19265+ , R"ax", R"bx", R"di", R"si"
19266 #ifdef CONFIG_X86_64
19267 , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
19268 #endif
19269@@ -3781,7 +3799,16 @@ static void vmx_vcpu_run(struct kvm_vcpu
19270 if (vmx->rmode.irq.pending)
19271 fixup_rmode_irq(vmx);
19272
19273- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
19274+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
19275+
19276+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19277+ loadsegment(fs, __KERNEL_PERCPU);
19278+#endif
19279+
19280+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19281+ __set_fs(current_thread_info()->addr_limit);
19282+#endif
19283+
19284 vmx->launched = 1;
19285
19286 vmx_complete_interrupts(vmx);
19287@@ -3956,7 +3983,7 @@ static bool vmx_gb_page_enable(void)
19288 return false;
19289 }
19290
19291-static struct kvm_x86_ops vmx_x86_ops = {
19292+static const struct kvm_x86_ops vmx_x86_ops = {
19293 .cpu_has_kvm_support = cpu_has_kvm_support,
19294 .disabled_by_bios = vmx_disabled_by_bios,
19295 .hardware_setup = hardware_setup,
19296diff -urNp linux-2.6.32.46/arch/x86/kvm/x86.c linux-2.6.32.46/arch/x86/kvm/x86.c
19297--- linux-2.6.32.46/arch/x86/kvm/x86.c 2011-05-10 22:12:01.000000000 -0400
19298+++ linux-2.6.32.46/arch/x86/kvm/x86.c 2011-05-10 22:12:26.000000000 -0400
19299@@ -82,7 +82,7 @@ static void update_cr8_intercept(struct
19300 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
19301 struct kvm_cpuid_entry2 __user *entries);
19302
19303-struct kvm_x86_ops *kvm_x86_ops;
19304+const struct kvm_x86_ops *kvm_x86_ops;
19305 EXPORT_SYMBOL_GPL(kvm_x86_ops);
19306
19307 int ignore_msrs = 0;
19308@@ -1430,15 +1430,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
19309 struct kvm_cpuid2 *cpuid,
19310 struct kvm_cpuid_entry2 __user *entries)
19311 {
19312- int r;
19313+ int r, i;
19314
19315 r = -E2BIG;
19316 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
19317 goto out;
19318 r = -EFAULT;
19319- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
19320- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
19321+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
19322 goto out;
19323+ for (i = 0; i < cpuid->nent; ++i) {
19324+ struct kvm_cpuid_entry2 cpuid_entry;
19325+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
19326+ goto out;
19327+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
19328+ }
19329 vcpu->arch.cpuid_nent = cpuid->nent;
19330 kvm_apic_set_version(vcpu);
19331 return 0;
19332@@ -1451,16 +1456,20 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
19333 struct kvm_cpuid2 *cpuid,
19334 struct kvm_cpuid_entry2 __user *entries)
19335 {
19336- int r;
19337+ int r, i;
19338
19339 vcpu_load(vcpu);
19340 r = -E2BIG;
19341 if (cpuid->nent < vcpu->arch.cpuid_nent)
19342 goto out;
19343 r = -EFAULT;
19344- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
19345- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
19346+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
19347 goto out;
19348+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
19349+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
19350+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
19351+ goto out;
19352+ }
19353 return 0;
19354
19355 out:
19356@@ -1678,7 +1687,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
19357 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
19358 struct kvm_interrupt *irq)
19359 {
19360- if (irq->irq < 0 || irq->irq >= 256)
19361+ if (irq->irq >= 256)
19362 return -EINVAL;
19363 if (irqchip_in_kernel(vcpu->kvm))
19364 return -ENXIO;
19365@@ -3260,10 +3269,10 @@ static struct notifier_block kvmclock_cp
19366 .notifier_call = kvmclock_cpufreq_notifier
19367 };
19368
19369-int kvm_arch_init(void *opaque)
19370+int kvm_arch_init(const void *opaque)
19371 {
19372 int r, cpu;
19373- struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
19374+ const struct kvm_x86_ops *ops = (const struct kvm_x86_ops *)opaque;
19375
19376 if (kvm_x86_ops) {
19377 printk(KERN_ERR "kvm: already loaded the other module\n");
19378diff -urNp linux-2.6.32.46/arch/x86/lguest/boot.c linux-2.6.32.46/arch/x86/lguest/boot.c
19379--- linux-2.6.32.46/arch/x86/lguest/boot.c 2011-03-27 14:31:47.000000000 -0400
19380+++ linux-2.6.32.46/arch/x86/lguest/boot.c 2011-08-05 20:33:55.000000000 -0400
19381@@ -1172,9 +1172,10 @@ static __init int early_put_chars(u32 vt
19382 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
19383 * Launcher to reboot us.
19384 */
19385-static void lguest_restart(char *reason)
19386+static __noreturn void lguest_restart(char *reason)
19387 {
19388 kvm_hypercall2(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART);
19389+ BUG();
19390 }
19391
19392 /*G:050
19393diff -urNp linux-2.6.32.46/arch/x86/lib/atomic64_32.c linux-2.6.32.46/arch/x86/lib/atomic64_32.c
19394--- linux-2.6.32.46/arch/x86/lib/atomic64_32.c 2011-03-27 14:31:47.000000000 -0400
19395+++ linux-2.6.32.46/arch/x86/lib/atomic64_32.c 2011-05-04 17:56:28.000000000 -0400
19396@@ -25,6 +25,12 @@ u64 atomic64_cmpxchg(atomic64_t *ptr, u6
19397 }
19398 EXPORT_SYMBOL(atomic64_cmpxchg);
19399
19400+u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, u64 new_val)
19401+{
19402+ return cmpxchg8b(&ptr->counter, old_val, new_val);
19403+}
19404+EXPORT_SYMBOL(atomic64_cmpxchg_unchecked);
19405+
19406 /**
19407 * atomic64_xchg - xchg atomic64 variable
19408 * @ptr: pointer to type atomic64_t
19409@@ -56,6 +62,36 @@ u64 atomic64_xchg(atomic64_t *ptr, u64 n
19410 EXPORT_SYMBOL(atomic64_xchg);
19411
19412 /**
19413+ * atomic64_xchg_unchecked - xchg atomic64 variable
19414+ * @ptr: pointer to type atomic64_unchecked_t
19415+ * @new_val: value to assign
19416+ *
19417+ * Atomically xchgs the value of @ptr to @new_val and returns
19418+ * the old value.
19419+ */
19420+u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val)
19421+{
19422+ /*
19423+ * Try first with a (possibly incorrect) assumption about
19424+ * what we have there. We'll do two loops most likely,
19425+ * but we'll get an ownership MESI transaction straight away
19426+ * instead of a read transaction followed by a
19427+ * flush-for-ownership transaction:
19428+ */
19429+ u64 old_val, real_val = 0;
19430+
19431+ do {
19432+ old_val = real_val;
19433+
19434+ real_val = atomic64_cmpxchg_unchecked(ptr, old_val, new_val);
19435+
19436+ } while (real_val != old_val);
19437+
19438+ return old_val;
19439+}
19440+EXPORT_SYMBOL(atomic64_xchg_unchecked);
19441+
19442+/**
19443 * atomic64_set - set atomic64 variable
19444 * @ptr: pointer to type atomic64_t
19445 * @new_val: value to assign
19446@@ -69,7 +105,19 @@ void atomic64_set(atomic64_t *ptr, u64 n
19447 EXPORT_SYMBOL(atomic64_set);
19448
19449 /**
19450-EXPORT_SYMBOL(atomic64_read);
19451+ * atomic64_unchecked_set - set atomic64 variable
19452+ * @ptr: pointer to type atomic64_unchecked_t
19453+ * @new_val: value to assign
19454+ *
19455+ * Atomically sets the value of @ptr to @new_val.
19456+ */
19457+void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val)
19458+{
19459+ atomic64_xchg_unchecked(ptr, new_val);
19460+}
19461+EXPORT_SYMBOL(atomic64_set_unchecked);
19462+
19463+/**
19464 * atomic64_add_return - add and return
19465 * @delta: integer value to add
19466 * @ptr: pointer to type atomic64_t
19467@@ -99,24 +147,72 @@ noinline u64 atomic64_add_return(u64 del
19468 }
19469 EXPORT_SYMBOL(atomic64_add_return);
19470
19471+/**
19472+ * atomic64_add_return_unchecked - add and return
19473+ * @delta: integer value to add
19474+ * @ptr: pointer to type atomic64_unchecked_t
19475+ *
19476+ * Atomically adds @delta to @ptr and returns @delta + *@ptr
19477+ */
19478+noinline u64 atomic64_add_return_unchecked(u64 delta, atomic64_unchecked_t *ptr)
19479+{
19480+ /*
19481+ * Try first with a (possibly incorrect) assumption about
19482+ * what we have there. We'll do two loops most likely,
19483+ * but we'll get an ownership MESI transaction straight away
19484+ * instead of a read transaction followed by a
19485+ * flush-for-ownership transaction:
19486+ */
19487+ u64 old_val, new_val, real_val = 0;
19488+
19489+ do {
19490+ old_val = real_val;
19491+ new_val = old_val + delta;
19492+
19493+ real_val = atomic64_cmpxchg_unchecked(ptr, old_val, new_val);
19494+
19495+ } while (real_val != old_val);
19496+
19497+ return new_val;
19498+}
19499+EXPORT_SYMBOL(atomic64_add_return_unchecked);
19500+
19501 u64 atomic64_sub_return(u64 delta, atomic64_t *ptr)
19502 {
19503 return atomic64_add_return(-delta, ptr);
19504 }
19505 EXPORT_SYMBOL(atomic64_sub_return);
19506
19507+u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr)
19508+{
19509+ return atomic64_add_return_unchecked(-delta, ptr);
19510+}
19511+EXPORT_SYMBOL(atomic64_sub_return_unchecked);
19512+
19513 u64 atomic64_inc_return(atomic64_t *ptr)
19514 {
19515 return atomic64_add_return(1, ptr);
19516 }
19517 EXPORT_SYMBOL(atomic64_inc_return);
19518
19519+u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr)
19520+{
19521+ return atomic64_add_return_unchecked(1, ptr);
19522+}
19523+EXPORT_SYMBOL(atomic64_inc_return_unchecked);
19524+
19525 u64 atomic64_dec_return(atomic64_t *ptr)
19526 {
19527 return atomic64_sub_return(1, ptr);
19528 }
19529 EXPORT_SYMBOL(atomic64_dec_return);
19530
19531+u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr)
19532+{
19533+ return atomic64_sub_return_unchecked(1, ptr);
19534+}
19535+EXPORT_SYMBOL(atomic64_dec_return_unchecked);
19536+
19537 /**
19538 * atomic64_add - add integer to atomic64 variable
19539 * @delta: integer value to add
19540@@ -131,6 +227,19 @@ void atomic64_add(u64 delta, atomic64_t
19541 EXPORT_SYMBOL(atomic64_add);
19542
19543 /**
19544+ * atomic64_add_unchecked - add integer to atomic64 variable
19545+ * @delta: integer value to add
19546+ * @ptr: pointer to type atomic64_unchecked_t
19547+ *
19548+ * Atomically adds @delta to @ptr.
19549+ */
19550+void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr)
19551+{
19552+ atomic64_add_return_unchecked(delta, ptr);
19553+}
19554+EXPORT_SYMBOL(atomic64_add_unchecked);
19555+
19556+/**
19557 * atomic64_sub - subtract the atomic64 variable
19558 * @delta: integer value to subtract
19559 * @ptr: pointer to type atomic64_t
19560@@ -144,6 +253,19 @@ void atomic64_sub(u64 delta, atomic64_t
19561 EXPORT_SYMBOL(atomic64_sub);
19562
19563 /**
19564+ * atomic64_sub_unchecked - subtract the atomic64 variable
19565+ * @delta: integer value to subtract
19566+ * @ptr: pointer to type atomic64_unchecked_t
19567+ *
19568+ * Atomically subtracts @delta from @ptr.
19569+ */
19570+void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr)
19571+{
19572+ atomic64_add_unchecked(-delta, ptr);
19573+}
19574+EXPORT_SYMBOL(atomic64_sub_unchecked);
19575+
19576+/**
19577 * atomic64_sub_and_test - subtract value from variable and test result
19578 * @delta: integer value to subtract
19579 * @ptr: pointer to type atomic64_t
19580@@ -173,6 +295,18 @@ void atomic64_inc(atomic64_t *ptr)
19581 EXPORT_SYMBOL(atomic64_inc);
19582
19583 /**
19584+ * atomic64_inc_unchecked - increment atomic64 variable
19585+ * @ptr: pointer to type atomic64_unchecked_t
19586+ *
19587+ * Atomically increments @ptr by 1.
19588+ */
19589+void atomic64_inc_unchecked(atomic64_unchecked_t *ptr)
19590+{
19591+ atomic64_add_unchecked(1, ptr);
19592+}
19593+EXPORT_SYMBOL(atomic64_inc_unchecked);
19594+
19595+/**
19596 * atomic64_dec - decrement atomic64 variable
19597 * @ptr: pointer to type atomic64_t
19598 *
19599@@ -185,6 +319,18 @@ void atomic64_dec(atomic64_t *ptr)
19600 EXPORT_SYMBOL(atomic64_dec);
19601
19602 /**
19603+ * atomic64_dec_unchecked - decrement atomic64 variable
19604+ * @ptr: pointer to type atomic64_unchecked_t
19605+ *
19606+ * Atomically decrements @ptr by 1.
19607+ */
19608+void atomic64_dec_unchecked(atomic64_unchecked_t *ptr)
19609+{
19610+ atomic64_sub_unchecked(1, ptr);
19611+}
19612+EXPORT_SYMBOL(atomic64_dec_unchecked);
19613+
19614+/**
19615 * atomic64_dec_and_test - decrement and test
19616 * @ptr: pointer to type atomic64_t
19617 *
19618diff -urNp linux-2.6.32.46/arch/x86/lib/checksum_32.S linux-2.6.32.46/arch/x86/lib/checksum_32.S
19619--- linux-2.6.32.46/arch/x86/lib/checksum_32.S 2011-03-27 14:31:47.000000000 -0400
19620+++ linux-2.6.32.46/arch/x86/lib/checksum_32.S 2011-04-17 15:56:46.000000000 -0400
19621@@ -28,7 +28,8 @@
19622 #include <linux/linkage.h>
19623 #include <asm/dwarf2.h>
19624 #include <asm/errno.h>
19625-
19626+#include <asm/segment.h>
19627+
19628 /*
19629 * computes a partial checksum, e.g. for TCP/UDP fragments
19630 */
19631@@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic (
19632
19633 #define ARGBASE 16
19634 #define FP 12
19635-
19636-ENTRY(csum_partial_copy_generic)
19637+
19638+ENTRY(csum_partial_copy_generic_to_user)
19639 CFI_STARTPROC
19640+
19641+#ifdef CONFIG_PAX_MEMORY_UDEREF
19642+ pushl %gs
19643+ CFI_ADJUST_CFA_OFFSET 4
19644+ popl %es
19645+ CFI_ADJUST_CFA_OFFSET -4
19646+ jmp csum_partial_copy_generic
19647+#endif
19648+
19649+ENTRY(csum_partial_copy_generic_from_user)
19650+
19651+#ifdef CONFIG_PAX_MEMORY_UDEREF
19652+ pushl %gs
19653+ CFI_ADJUST_CFA_OFFSET 4
19654+ popl %ds
19655+ CFI_ADJUST_CFA_OFFSET -4
19656+#endif
19657+
19658+ENTRY(csum_partial_copy_generic)
19659 subl $4,%esp
19660 CFI_ADJUST_CFA_OFFSET 4
19661 pushl %edi
19662@@ -331,7 +351,7 @@ ENTRY(csum_partial_copy_generic)
19663 jmp 4f
19664 SRC(1: movw (%esi), %bx )
19665 addl $2, %esi
19666-DST( movw %bx, (%edi) )
19667+DST( movw %bx, %es:(%edi) )
19668 addl $2, %edi
19669 addw %bx, %ax
19670 adcl $0, %eax
19671@@ -343,30 +363,30 @@ DST( movw %bx, (%edi) )
19672 SRC(1: movl (%esi), %ebx )
19673 SRC( movl 4(%esi), %edx )
19674 adcl %ebx, %eax
19675-DST( movl %ebx, (%edi) )
19676+DST( movl %ebx, %es:(%edi) )
19677 adcl %edx, %eax
19678-DST( movl %edx, 4(%edi) )
19679+DST( movl %edx, %es:4(%edi) )
19680
19681 SRC( movl 8(%esi), %ebx )
19682 SRC( movl 12(%esi), %edx )
19683 adcl %ebx, %eax
19684-DST( movl %ebx, 8(%edi) )
19685+DST( movl %ebx, %es:8(%edi) )
19686 adcl %edx, %eax
19687-DST( movl %edx, 12(%edi) )
19688+DST( movl %edx, %es:12(%edi) )
19689
19690 SRC( movl 16(%esi), %ebx )
19691 SRC( movl 20(%esi), %edx )
19692 adcl %ebx, %eax
19693-DST( movl %ebx, 16(%edi) )
19694+DST( movl %ebx, %es:16(%edi) )
19695 adcl %edx, %eax
19696-DST( movl %edx, 20(%edi) )
19697+DST( movl %edx, %es:20(%edi) )
19698
19699 SRC( movl 24(%esi), %ebx )
19700 SRC( movl 28(%esi), %edx )
19701 adcl %ebx, %eax
19702-DST( movl %ebx, 24(%edi) )
19703+DST( movl %ebx, %es:24(%edi) )
19704 adcl %edx, %eax
19705-DST( movl %edx, 28(%edi) )
19706+DST( movl %edx, %es:28(%edi) )
19707
19708 lea 32(%esi), %esi
19709 lea 32(%edi), %edi
19710@@ -380,7 +400,7 @@ DST( movl %edx, 28(%edi) )
19711 shrl $2, %edx # This clears CF
19712 SRC(3: movl (%esi), %ebx )
19713 adcl %ebx, %eax
19714-DST( movl %ebx, (%edi) )
19715+DST( movl %ebx, %es:(%edi) )
19716 lea 4(%esi), %esi
19717 lea 4(%edi), %edi
19718 dec %edx
19719@@ -392,12 +412,12 @@ DST( movl %ebx, (%edi) )
19720 jb 5f
19721 SRC( movw (%esi), %cx )
19722 leal 2(%esi), %esi
19723-DST( movw %cx, (%edi) )
19724+DST( movw %cx, %es:(%edi) )
19725 leal 2(%edi), %edi
19726 je 6f
19727 shll $16,%ecx
19728 SRC(5: movb (%esi), %cl )
19729-DST( movb %cl, (%edi) )
19730+DST( movb %cl, %es:(%edi) )
19731 6: addl %ecx, %eax
19732 adcl $0, %eax
19733 7:
19734@@ -408,7 +428,7 @@ DST( movb %cl, (%edi) )
19735
19736 6001:
19737 movl ARGBASE+20(%esp), %ebx # src_err_ptr
19738- movl $-EFAULT, (%ebx)
19739+ movl $-EFAULT, %ss:(%ebx)
19740
19741 # zero the complete destination - computing the rest
19742 # is too much work
19743@@ -421,11 +441,19 @@ DST( movb %cl, (%edi) )
19744
19745 6002:
19746 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
19747- movl $-EFAULT,(%ebx)
19748+ movl $-EFAULT,%ss:(%ebx)
19749 jmp 5000b
19750
19751 .previous
19752
19753+ pushl %ss
19754+ CFI_ADJUST_CFA_OFFSET 4
19755+ popl %ds
19756+ CFI_ADJUST_CFA_OFFSET -4
19757+ pushl %ss
19758+ CFI_ADJUST_CFA_OFFSET 4
19759+ popl %es
19760+ CFI_ADJUST_CFA_OFFSET -4
19761 popl %ebx
19762 CFI_ADJUST_CFA_OFFSET -4
19763 CFI_RESTORE ebx
19764@@ -439,26 +467,47 @@ DST( movb %cl, (%edi) )
19765 CFI_ADJUST_CFA_OFFSET -4
19766 ret
19767 CFI_ENDPROC
19768-ENDPROC(csum_partial_copy_generic)
19769+ENDPROC(csum_partial_copy_generic_to_user)
19770
19771 #else
19772
19773 /* Version for PentiumII/PPro */
19774
19775 #define ROUND1(x) \
19776+ nop; nop; nop; \
19777 SRC(movl x(%esi), %ebx ) ; \
19778 addl %ebx, %eax ; \
19779- DST(movl %ebx, x(%edi) ) ;
19780+ DST(movl %ebx, %es:x(%edi)) ;
19781
19782 #define ROUND(x) \
19783+ nop; nop; nop; \
19784 SRC(movl x(%esi), %ebx ) ; \
19785 adcl %ebx, %eax ; \
19786- DST(movl %ebx, x(%edi) ) ;
19787+ DST(movl %ebx, %es:x(%edi)) ;
19788
19789 #define ARGBASE 12
19790-
19791-ENTRY(csum_partial_copy_generic)
19792+
19793+ENTRY(csum_partial_copy_generic_to_user)
19794 CFI_STARTPROC
19795+
19796+#ifdef CONFIG_PAX_MEMORY_UDEREF
19797+ pushl %gs
19798+ CFI_ADJUST_CFA_OFFSET 4
19799+ popl %es
19800+ CFI_ADJUST_CFA_OFFSET -4
19801+ jmp csum_partial_copy_generic
19802+#endif
19803+
19804+ENTRY(csum_partial_copy_generic_from_user)
19805+
19806+#ifdef CONFIG_PAX_MEMORY_UDEREF
19807+ pushl %gs
19808+ CFI_ADJUST_CFA_OFFSET 4
19809+ popl %ds
19810+ CFI_ADJUST_CFA_OFFSET -4
19811+#endif
19812+
19813+ENTRY(csum_partial_copy_generic)
19814 pushl %ebx
19815 CFI_ADJUST_CFA_OFFSET 4
19816 CFI_REL_OFFSET ebx, 0
19817@@ -482,7 +531,7 @@ ENTRY(csum_partial_copy_generic)
19818 subl %ebx, %edi
19819 lea -1(%esi),%edx
19820 andl $-32,%edx
19821- lea 3f(%ebx,%ebx), %ebx
19822+ lea 3f(%ebx,%ebx,2), %ebx
19823 testl %esi, %esi
19824 jmp *%ebx
19825 1: addl $64,%esi
19826@@ -503,19 +552,19 @@ ENTRY(csum_partial_copy_generic)
19827 jb 5f
19828 SRC( movw (%esi), %dx )
19829 leal 2(%esi), %esi
19830-DST( movw %dx, (%edi) )
19831+DST( movw %dx, %es:(%edi) )
19832 leal 2(%edi), %edi
19833 je 6f
19834 shll $16,%edx
19835 5:
19836 SRC( movb (%esi), %dl )
19837-DST( movb %dl, (%edi) )
19838+DST( movb %dl, %es:(%edi) )
19839 6: addl %edx, %eax
19840 adcl $0, %eax
19841 7:
19842 .section .fixup, "ax"
19843 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
19844- movl $-EFAULT, (%ebx)
19845+ movl $-EFAULT, %ss:(%ebx)
19846 # zero the complete destination (computing the rest is too much work)
19847 movl ARGBASE+8(%esp),%edi # dst
19848 movl ARGBASE+12(%esp),%ecx # len
19849@@ -523,10 +572,21 @@ DST( movb %dl, (%edi) )
19850 rep; stosb
19851 jmp 7b
19852 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
19853- movl $-EFAULT, (%ebx)
19854+ movl $-EFAULT, %ss:(%ebx)
19855 jmp 7b
19856 .previous
19857
19858+#ifdef CONFIG_PAX_MEMORY_UDEREF
19859+ pushl %ss
19860+ CFI_ADJUST_CFA_OFFSET 4
19861+ popl %ds
19862+ CFI_ADJUST_CFA_OFFSET -4
19863+ pushl %ss
19864+ CFI_ADJUST_CFA_OFFSET 4
19865+ popl %es
19866+ CFI_ADJUST_CFA_OFFSET -4
19867+#endif
19868+
19869 popl %esi
19870 CFI_ADJUST_CFA_OFFSET -4
19871 CFI_RESTORE esi
19872@@ -538,7 +598,7 @@ DST( movb %dl, (%edi) )
19873 CFI_RESTORE ebx
19874 ret
19875 CFI_ENDPROC
19876-ENDPROC(csum_partial_copy_generic)
19877+ENDPROC(csum_partial_copy_generic_to_user)
19878
19879 #undef ROUND
19880 #undef ROUND1
19881diff -urNp linux-2.6.32.46/arch/x86/lib/clear_page_64.S linux-2.6.32.46/arch/x86/lib/clear_page_64.S
19882--- linux-2.6.32.46/arch/x86/lib/clear_page_64.S 2011-03-27 14:31:47.000000000 -0400
19883+++ linux-2.6.32.46/arch/x86/lib/clear_page_64.S 2011-10-06 09:37:08.000000000 -0400
19884@@ -1,5 +1,6 @@
19885 #include <linux/linkage.h>
19886 #include <asm/dwarf2.h>
19887+#include <asm/alternative-asm.h>
19888
19889 /*
19890 * Zero a page.
19891@@ -10,6 +11,7 @@ ENTRY(clear_page_c)
19892 movl $4096/8,%ecx
19893 xorl %eax,%eax
19894 rep stosq
19895+ pax_force_retaddr
19896 ret
19897 CFI_ENDPROC
19898 ENDPROC(clear_page_c)
19899@@ -33,6 +35,7 @@ ENTRY(clear_page)
19900 leaq 64(%rdi),%rdi
19901 jnz .Lloop
19902 nop
19903+ pax_force_retaddr
19904 ret
19905 CFI_ENDPROC
19906 .Lclear_page_end:
19907@@ -43,7 +46,7 @@ ENDPROC(clear_page)
19908
19909 #include <asm/cpufeature.h>
19910
19911- .section .altinstr_replacement,"ax"
19912+ .section .altinstr_replacement,"a"
19913 1: .byte 0xeb /* jmp <disp8> */
19914 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
19915 2:
19916diff -urNp linux-2.6.32.46/arch/x86/lib/copy_page_64.S linux-2.6.32.46/arch/x86/lib/copy_page_64.S
19917--- linux-2.6.32.46/arch/x86/lib/copy_page_64.S 2011-03-27 14:31:47.000000000 -0400
19918+++ linux-2.6.32.46/arch/x86/lib/copy_page_64.S 2011-10-06 09:37:08.000000000 -0400
19919@@ -2,12 +2,14 @@
19920
19921 #include <linux/linkage.h>
19922 #include <asm/dwarf2.h>
19923+#include <asm/alternative-asm.h>
19924
19925 ALIGN
19926 copy_page_c:
19927 CFI_STARTPROC
19928 movl $4096/8,%ecx
19929 rep movsq
19930+ pax_force_retaddr
19931 ret
19932 CFI_ENDPROC
19933 ENDPROC(copy_page_c)
19934@@ -94,6 +96,7 @@ ENTRY(copy_page)
19935 CFI_RESTORE r13
19936 addq $3*8,%rsp
19937 CFI_ADJUST_CFA_OFFSET -3*8
19938+ pax_force_retaddr
19939 ret
19940 .Lcopy_page_end:
19941 CFI_ENDPROC
19942@@ -104,7 +107,7 @@ ENDPROC(copy_page)
19943
19944 #include <asm/cpufeature.h>
19945
19946- .section .altinstr_replacement,"ax"
19947+ .section .altinstr_replacement,"a"
19948 1: .byte 0xeb /* jmp <disp8> */
19949 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
19950 2:
19951diff -urNp linux-2.6.32.46/arch/x86/lib/copy_user_64.S linux-2.6.32.46/arch/x86/lib/copy_user_64.S
19952--- linux-2.6.32.46/arch/x86/lib/copy_user_64.S 2011-06-25 12:55:34.000000000 -0400
19953+++ linux-2.6.32.46/arch/x86/lib/copy_user_64.S 2011-10-06 10:12:52.000000000 -0400
19954@@ -15,13 +15,15 @@
19955 #include <asm/asm-offsets.h>
19956 #include <asm/thread_info.h>
19957 #include <asm/cpufeature.h>
19958+#include <asm/pgtable.h>
19959+#include <asm/alternative-asm.h>
19960
19961 .macro ALTERNATIVE_JUMP feature,orig,alt
19962 0:
19963 .byte 0xe9 /* 32bit jump */
19964 .long \orig-1f /* by default jump to orig */
19965 1:
19966- .section .altinstr_replacement,"ax"
19967+ .section .altinstr_replacement,"a"
19968 2: .byte 0xe9 /* near jump with 32bit immediate */
19969 .long \alt-1b /* offset */ /* or alternatively to alt */
19970 .previous
19971@@ -64,55 +66,26 @@
19972 #endif
19973 .endm
19974
19975-/* Standard copy_to_user with segment limit checking */
19976-ENTRY(copy_to_user)
19977- CFI_STARTPROC
19978- GET_THREAD_INFO(%rax)
19979- movq %rdi,%rcx
19980- addq %rdx,%rcx
19981- jc bad_to_user
19982- cmpq TI_addr_limit(%rax),%rcx
19983- ja bad_to_user
19984- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
19985- CFI_ENDPROC
19986-ENDPROC(copy_to_user)
19987-
19988-/* Standard copy_from_user with segment limit checking */
19989-ENTRY(copy_from_user)
19990- CFI_STARTPROC
19991- GET_THREAD_INFO(%rax)
19992- movq %rsi,%rcx
19993- addq %rdx,%rcx
19994- jc bad_from_user
19995- cmpq TI_addr_limit(%rax),%rcx
19996- ja bad_from_user
19997- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
19998- CFI_ENDPROC
19999-ENDPROC(copy_from_user)
20000-
20001 ENTRY(copy_user_generic)
20002 CFI_STARTPROC
20003 ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
20004 CFI_ENDPROC
20005 ENDPROC(copy_user_generic)
20006
20007-ENTRY(__copy_from_user_inatomic)
20008- CFI_STARTPROC
20009- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
20010- CFI_ENDPROC
20011-ENDPROC(__copy_from_user_inatomic)
20012-
20013 .section .fixup,"ax"
20014 /* must zero dest */
20015 ENTRY(bad_from_user)
20016 bad_from_user:
20017 CFI_STARTPROC
20018+ testl %edx,%edx
20019+ js bad_to_user
20020 movl %edx,%ecx
20021 xorl %eax,%eax
20022 rep
20023 stosb
20024 bad_to_user:
20025 movl %edx,%eax
20026+ pax_force_retaddr
20027 ret
20028 CFI_ENDPROC
20029 ENDPROC(bad_from_user)
20030@@ -180,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
20031 decl %ecx
20032 jnz 21b
20033 23: xor %eax,%eax
20034+ pax_force_retaddr
20035 ret
20036
20037 .section .fixup,"ax"
20038@@ -252,6 +226,7 @@ ENTRY(copy_user_generic_string)
20039 3: rep
20040 movsb
20041 4: xorl %eax,%eax
20042+ pax_force_retaddr
20043 ret
20044
20045 .section .fixup,"ax"
20046diff -urNp linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S
20047--- linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S 2011-03-27 14:31:47.000000000 -0400
20048+++ linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S 2011-10-06 09:37:08.000000000 -0400
20049@@ -8,12 +8,14 @@
20050
20051 #include <linux/linkage.h>
20052 #include <asm/dwarf2.h>
20053+#include <asm/alternative-asm.h>
20054
20055 #define FIX_ALIGNMENT 1
20056
20057 #include <asm/current.h>
20058 #include <asm/asm-offsets.h>
20059 #include <asm/thread_info.h>
20060+#include <asm/pgtable.h>
20061
20062 .macro ALIGN_DESTINATION
20063 #ifdef FIX_ALIGNMENT
20064@@ -50,6 +52,15 @@
20065 */
20066 ENTRY(__copy_user_nocache)
20067 CFI_STARTPROC
20068+
20069+#ifdef CONFIG_PAX_MEMORY_UDEREF
20070+ mov $PAX_USER_SHADOW_BASE,%rcx
20071+ cmp %rcx,%rsi
20072+ jae 1f
20073+ add %rcx,%rsi
20074+1:
20075+#endif
20076+
20077 cmpl $8,%edx
20078 jb 20f /* less then 8 bytes, go to byte copy loop */
20079 ALIGN_DESTINATION
20080@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
20081 jnz 21b
20082 23: xorl %eax,%eax
20083 sfence
20084+ pax_force_retaddr
20085 ret
20086
20087 .section .fixup,"ax"
20088diff -urNp linux-2.6.32.46/arch/x86/lib/csum-copy_64.S linux-2.6.32.46/arch/x86/lib/csum-copy_64.S
20089--- linux-2.6.32.46/arch/x86/lib/csum-copy_64.S 2011-03-27 14:31:47.000000000 -0400
20090+++ linux-2.6.32.46/arch/x86/lib/csum-copy_64.S 2011-10-06 09:37:14.000000000 -0400
20091@@ -8,6 +8,7 @@
20092 #include <linux/linkage.h>
20093 #include <asm/dwarf2.h>
20094 #include <asm/errno.h>
20095+#include <asm/alternative-asm.h>
20096
20097 /*
20098 * Checksum copy with exception handling.
20099@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
20100 CFI_RESTORE rbp
20101 addq $7*8,%rsp
20102 CFI_ADJUST_CFA_OFFSET -7*8
20103+ pax_force_retaddr
20104 ret
20105 CFI_RESTORE_STATE
20106
20107diff -urNp linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c
20108--- linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c 2011-03-27 14:31:47.000000000 -0400
20109+++ linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c 2011-10-06 09:37:08.000000000 -0400
20110@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _
20111 len -= 2;
20112 }
20113 }
20114- isum = csum_partial_copy_generic((__force const void *)src,
20115+
20116+#ifdef CONFIG_PAX_MEMORY_UDEREF
20117+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
20118+ src += PAX_USER_SHADOW_BASE;
20119+#endif
20120+
20121+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
20122 dst, len, isum, errp, NULL);
20123 if (unlikely(*errp))
20124 goto out_err;
20125@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *sr
20126 }
20127
20128 *errp = 0;
20129- return csum_partial_copy_generic(src, (void __force *)dst,
20130+
20131+#ifdef CONFIG_PAX_MEMORY_UDEREF
20132+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
20133+ dst += PAX_USER_SHADOW_BASE;
20134+#endif
20135+
20136+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
20137 len, isum, NULL, errp);
20138 }
20139 EXPORT_SYMBOL(csum_partial_copy_to_user);
20140diff -urNp linux-2.6.32.46/arch/x86/lib/getuser.S linux-2.6.32.46/arch/x86/lib/getuser.S
20141--- linux-2.6.32.46/arch/x86/lib/getuser.S 2011-03-27 14:31:47.000000000 -0400
20142+++ linux-2.6.32.46/arch/x86/lib/getuser.S 2011-10-08 08:14:37.000000000 -0400
20143@@ -33,15 +33,38 @@
20144 #include <asm/asm-offsets.h>
20145 #include <asm/thread_info.h>
20146 #include <asm/asm.h>
20147+#include <asm/segment.h>
20148+#include <asm/pgtable.h>
20149+#include <asm/alternative-asm.h>
20150+
20151+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20152+#define __copyuser_seg gs;
20153+#else
20154+#define __copyuser_seg
20155+#endif
20156
20157 .text
20158 ENTRY(__get_user_1)
20159 CFI_STARTPROC
20160+
20161+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20162 GET_THREAD_INFO(%_ASM_DX)
20163 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
20164 jae bad_get_user
20165-1: movzb (%_ASM_AX),%edx
20166+
20167+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20168+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
20169+ cmp %_ASM_DX,%_ASM_AX
20170+ jae 1234f
20171+ add %_ASM_DX,%_ASM_AX
20172+1234:
20173+#endif
20174+
20175+#endif
20176+
20177+1: __copyuser_seg movzb (%_ASM_AX),%edx
20178 xor %eax,%eax
20179+ pax_force_retaddr
20180 ret
20181 CFI_ENDPROC
20182 ENDPROC(__get_user_1)
20183@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
20184 ENTRY(__get_user_2)
20185 CFI_STARTPROC
20186 add $1,%_ASM_AX
20187+
20188+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20189 jc bad_get_user
20190 GET_THREAD_INFO(%_ASM_DX)
20191 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
20192 jae bad_get_user
20193-2: movzwl -1(%_ASM_AX),%edx
20194+
20195+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20196+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
20197+ cmp %_ASM_DX,%_ASM_AX
20198+ jae 1234f
20199+ add %_ASM_DX,%_ASM_AX
20200+1234:
20201+#endif
20202+
20203+#endif
20204+
20205+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
20206 xor %eax,%eax
20207+ pax_force_retaddr
20208 ret
20209 CFI_ENDPROC
20210 ENDPROC(__get_user_2)
20211@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
20212 ENTRY(__get_user_4)
20213 CFI_STARTPROC
20214 add $3,%_ASM_AX
20215+
20216+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20217 jc bad_get_user
20218 GET_THREAD_INFO(%_ASM_DX)
20219 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
20220 jae bad_get_user
20221-3: mov -3(%_ASM_AX),%edx
20222+
20223+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20224+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
20225+ cmp %_ASM_DX,%_ASM_AX
20226+ jae 1234f
20227+ add %_ASM_DX,%_ASM_AX
20228+1234:
20229+#endif
20230+
20231+#endif
20232+
20233+3: __copyuser_seg mov -3(%_ASM_AX),%edx
20234 xor %eax,%eax
20235+ pax_force_retaddr
20236 ret
20237 CFI_ENDPROC
20238 ENDPROC(__get_user_4)
20239@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
20240 GET_THREAD_INFO(%_ASM_DX)
20241 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
20242 jae bad_get_user
20243+
20244+#ifdef CONFIG_PAX_MEMORY_UDEREF
20245+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
20246+ cmp %_ASM_DX,%_ASM_AX
20247+ jae 1234f
20248+ add %_ASM_DX,%_ASM_AX
20249+1234:
20250+#endif
20251+
20252 4: movq -7(%_ASM_AX),%_ASM_DX
20253 xor %eax,%eax
20254+ pax_force_retaddr
20255 ret
20256 CFI_ENDPROC
20257 ENDPROC(__get_user_8)
20258@@ -91,6 +152,7 @@ bad_get_user:
20259 CFI_STARTPROC
20260 xor %edx,%edx
20261 mov $(-EFAULT),%_ASM_AX
20262+ pax_force_retaddr
20263 ret
20264 CFI_ENDPROC
20265 END(bad_get_user)
20266diff -urNp linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S
20267--- linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S 2011-03-27 14:31:47.000000000 -0400
20268+++ linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S 2011-10-06 09:37:14.000000000 -0400
20269@@ -17,6 +17,7 @@
20270
20271 #include <linux/linkage.h>
20272 #include <asm/dwarf2.h>
20273+#include <asm/alternative-asm.h>
20274
20275 /*
20276 * override generic version in lib/iomap_copy.c
20277@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
20278 CFI_STARTPROC
20279 movl %edx,%ecx
20280 rep movsd
20281+ pax_force_retaddr
20282 ret
20283 CFI_ENDPROC
20284 ENDPROC(__iowrite32_copy)
20285diff -urNp linux-2.6.32.46/arch/x86/lib/memcpy_64.S linux-2.6.32.46/arch/x86/lib/memcpy_64.S
20286--- linux-2.6.32.46/arch/x86/lib/memcpy_64.S 2011-03-27 14:31:47.000000000 -0400
20287+++ linux-2.6.32.46/arch/x86/lib/memcpy_64.S 2011-10-06 10:13:49.000000000 -0400
20288@@ -4,6 +4,7 @@
20289
20290 #include <asm/cpufeature.h>
20291 #include <asm/dwarf2.h>
20292+#include <asm/alternative-asm.h>
20293
20294 /*
20295 * memcpy - Copy a memory block.
20296@@ -34,6 +35,7 @@ memcpy_c:
20297 rep movsq
20298 movl %edx, %ecx
20299 rep movsb
20300+ pax_force_retaddr
20301 ret
20302 CFI_ENDPROC
20303 ENDPROC(memcpy_c)
20304@@ -118,6 +120,7 @@ ENTRY(memcpy)
20305 jnz .Lloop_1
20306
20307 .Lend:
20308+ pax_force_retaddr
20309 ret
20310 CFI_ENDPROC
20311 ENDPROC(memcpy)
20312@@ -128,7 +131,7 @@ ENDPROC(__memcpy)
20313 * It is also a lot simpler. Use this when possible:
20314 */
20315
20316- .section .altinstr_replacement, "ax"
20317+ .section .altinstr_replacement, "a"
20318 1: .byte 0xeb /* jmp <disp8> */
20319 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
20320 2:
20321diff -urNp linux-2.6.32.46/arch/x86/lib/memset_64.S linux-2.6.32.46/arch/x86/lib/memset_64.S
20322--- linux-2.6.32.46/arch/x86/lib/memset_64.S 2011-03-27 14:31:47.000000000 -0400
20323+++ linux-2.6.32.46/arch/x86/lib/memset_64.S 2011-10-06 09:37:08.000000000 -0400
20324@@ -2,6 +2,7 @@
20325
20326 #include <linux/linkage.h>
20327 #include <asm/dwarf2.h>
20328+#include <asm/alternative-asm.h>
20329
20330 /*
20331 * ISO C memset - set a memory block to a byte value.
20332@@ -28,6 +29,7 @@ memset_c:
20333 movl %r8d,%ecx
20334 rep stosb
20335 movq %r9,%rax
20336+ pax_force_retaddr
20337 ret
20338 CFI_ENDPROC
20339 ENDPROC(memset_c)
20340@@ -96,6 +98,7 @@ ENTRY(__memset)
20341
20342 .Lende:
20343 movq %r10,%rax
20344+ pax_force_retaddr
20345 ret
20346
20347 CFI_RESTORE_STATE
20348@@ -118,7 +121,7 @@ ENDPROC(__memset)
20349
20350 #include <asm/cpufeature.h>
20351
20352- .section .altinstr_replacement,"ax"
20353+ .section .altinstr_replacement,"a"
20354 1: .byte 0xeb /* jmp <disp8> */
20355 .byte (memset_c - memset) - (2f - 1b) /* offset */
20356 2:
20357diff -urNp linux-2.6.32.46/arch/x86/lib/mmx_32.c linux-2.6.32.46/arch/x86/lib/mmx_32.c
20358--- linux-2.6.32.46/arch/x86/lib/mmx_32.c 2011-03-27 14:31:47.000000000 -0400
20359+++ linux-2.6.32.46/arch/x86/lib/mmx_32.c 2011-04-17 15:56:46.000000000 -0400
20360@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
20361 {
20362 void *p;
20363 int i;
20364+ unsigned long cr0;
20365
20366 if (unlikely(in_interrupt()))
20367 return __memcpy(to, from, len);
20368@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *
20369 kernel_fpu_begin();
20370
20371 __asm__ __volatile__ (
20372- "1: prefetch (%0)\n" /* This set is 28 bytes */
20373- " prefetch 64(%0)\n"
20374- " prefetch 128(%0)\n"
20375- " prefetch 192(%0)\n"
20376- " prefetch 256(%0)\n"
20377+ "1: prefetch (%1)\n" /* This set is 28 bytes */
20378+ " prefetch 64(%1)\n"
20379+ " prefetch 128(%1)\n"
20380+ " prefetch 192(%1)\n"
20381+ " prefetch 256(%1)\n"
20382 "2: \n"
20383 ".section .fixup, \"ax\"\n"
20384- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20385+ "3: \n"
20386+
20387+#ifdef CONFIG_PAX_KERNEXEC
20388+ " movl %%cr0, %0\n"
20389+ " movl %0, %%eax\n"
20390+ " andl $0xFFFEFFFF, %%eax\n"
20391+ " movl %%eax, %%cr0\n"
20392+#endif
20393+
20394+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20395+
20396+#ifdef CONFIG_PAX_KERNEXEC
20397+ " movl %0, %%cr0\n"
20398+#endif
20399+
20400 " jmp 2b\n"
20401 ".previous\n"
20402 _ASM_EXTABLE(1b, 3b)
20403- : : "r" (from));
20404+ : "=&r" (cr0) : "r" (from) : "ax");
20405
20406 for ( ; i > 5; i--) {
20407 __asm__ __volatile__ (
20408- "1: prefetch 320(%0)\n"
20409- "2: movq (%0), %%mm0\n"
20410- " movq 8(%0), %%mm1\n"
20411- " movq 16(%0), %%mm2\n"
20412- " movq 24(%0), %%mm3\n"
20413- " movq %%mm0, (%1)\n"
20414- " movq %%mm1, 8(%1)\n"
20415- " movq %%mm2, 16(%1)\n"
20416- " movq %%mm3, 24(%1)\n"
20417- " movq 32(%0), %%mm0\n"
20418- " movq 40(%0), %%mm1\n"
20419- " movq 48(%0), %%mm2\n"
20420- " movq 56(%0), %%mm3\n"
20421- " movq %%mm0, 32(%1)\n"
20422- " movq %%mm1, 40(%1)\n"
20423- " movq %%mm2, 48(%1)\n"
20424- " movq %%mm3, 56(%1)\n"
20425+ "1: prefetch 320(%1)\n"
20426+ "2: movq (%1), %%mm0\n"
20427+ " movq 8(%1), %%mm1\n"
20428+ " movq 16(%1), %%mm2\n"
20429+ " movq 24(%1), %%mm3\n"
20430+ " movq %%mm0, (%2)\n"
20431+ " movq %%mm1, 8(%2)\n"
20432+ " movq %%mm2, 16(%2)\n"
20433+ " movq %%mm3, 24(%2)\n"
20434+ " movq 32(%1), %%mm0\n"
20435+ " movq 40(%1), %%mm1\n"
20436+ " movq 48(%1), %%mm2\n"
20437+ " movq 56(%1), %%mm3\n"
20438+ " movq %%mm0, 32(%2)\n"
20439+ " movq %%mm1, 40(%2)\n"
20440+ " movq %%mm2, 48(%2)\n"
20441+ " movq %%mm3, 56(%2)\n"
20442 ".section .fixup, \"ax\"\n"
20443- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20444+ "3:\n"
20445+
20446+#ifdef CONFIG_PAX_KERNEXEC
20447+ " movl %%cr0, %0\n"
20448+ " movl %0, %%eax\n"
20449+ " andl $0xFFFEFFFF, %%eax\n"
20450+ " movl %%eax, %%cr0\n"
20451+#endif
20452+
20453+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20454+
20455+#ifdef CONFIG_PAX_KERNEXEC
20456+ " movl %0, %%cr0\n"
20457+#endif
20458+
20459 " jmp 2b\n"
20460 ".previous\n"
20461 _ASM_EXTABLE(1b, 3b)
20462- : : "r" (from), "r" (to) : "memory");
20463+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20464
20465 from += 64;
20466 to += 64;
20467@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
20468 static void fast_copy_page(void *to, void *from)
20469 {
20470 int i;
20471+ unsigned long cr0;
20472
20473 kernel_fpu_begin();
20474
20475@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, voi
20476 * but that is for later. -AV
20477 */
20478 __asm__ __volatile__(
20479- "1: prefetch (%0)\n"
20480- " prefetch 64(%0)\n"
20481- " prefetch 128(%0)\n"
20482- " prefetch 192(%0)\n"
20483- " prefetch 256(%0)\n"
20484+ "1: prefetch (%1)\n"
20485+ " prefetch 64(%1)\n"
20486+ " prefetch 128(%1)\n"
20487+ " prefetch 192(%1)\n"
20488+ " prefetch 256(%1)\n"
20489 "2: \n"
20490 ".section .fixup, \"ax\"\n"
20491- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20492+ "3: \n"
20493+
20494+#ifdef CONFIG_PAX_KERNEXEC
20495+ " movl %%cr0, %0\n"
20496+ " movl %0, %%eax\n"
20497+ " andl $0xFFFEFFFF, %%eax\n"
20498+ " movl %%eax, %%cr0\n"
20499+#endif
20500+
20501+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20502+
20503+#ifdef CONFIG_PAX_KERNEXEC
20504+ " movl %0, %%cr0\n"
20505+#endif
20506+
20507 " jmp 2b\n"
20508 ".previous\n"
20509- _ASM_EXTABLE(1b, 3b) : : "r" (from));
20510+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
20511
20512 for (i = 0; i < (4096-320)/64; i++) {
20513 __asm__ __volatile__ (
20514- "1: prefetch 320(%0)\n"
20515- "2: movq (%0), %%mm0\n"
20516- " movntq %%mm0, (%1)\n"
20517- " movq 8(%0), %%mm1\n"
20518- " movntq %%mm1, 8(%1)\n"
20519- " movq 16(%0), %%mm2\n"
20520- " movntq %%mm2, 16(%1)\n"
20521- " movq 24(%0), %%mm3\n"
20522- " movntq %%mm3, 24(%1)\n"
20523- " movq 32(%0), %%mm4\n"
20524- " movntq %%mm4, 32(%1)\n"
20525- " movq 40(%0), %%mm5\n"
20526- " movntq %%mm5, 40(%1)\n"
20527- " movq 48(%0), %%mm6\n"
20528- " movntq %%mm6, 48(%1)\n"
20529- " movq 56(%0), %%mm7\n"
20530- " movntq %%mm7, 56(%1)\n"
20531+ "1: prefetch 320(%1)\n"
20532+ "2: movq (%1), %%mm0\n"
20533+ " movntq %%mm0, (%2)\n"
20534+ " movq 8(%1), %%mm1\n"
20535+ " movntq %%mm1, 8(%2)\n"
20536+ " movq 16(%1), %%mm2\n"
20537+ " movntq %%mm2, 16(%2)\n"
20538+ " movq 24(%1), %%mm3\n"
20539+ " movntq %%mm3, 24(%2)\n"
20540+ " movq 32(%1), %%mm4\n"
20541+ " movntq %%mm4, 32(%2)\n"
20542+ " movq 40(%1), %%mm5\n"
20543+ " movntq %%mm5, 40(%2)\n"
20544+ " movq 48(%1), %%mm6\n"
20545+ " movntq %%mm6, 48(%2)\n"
20546+ " movq 56(%1), %%mm7\n"
20547+ " movntq %%mm7, 56(%2)\n"
20548 ".section .fixup, \"ax\"\n"
20549- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20550+ "3:\n"
20551+
20552+#ifdef CONFIG_PAX_KERNEXEC
20553+ " movl %%cr0, %0\n"
20554+ " movl %0, %%eax\n"
20555+ " andl $0xFFFEFFFF, %%eax\n"
20556+ " movl %%eax, %%cr0\n"
20557+#endif
20558+
20559+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20560+
20561+#ifdef CONFIG_PAX_KERNEXEC
20562+ " movl %0, %%cr0\n"
20563+#endif
20564+
20565 " jmp 2b\n"
20566 ".previous\n"
20567- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
20568+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20569
20570 from += 64;
20571 to += 64;
20572@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
20573 static void fast_copy_page(void *to, void *from)
20574 {
20575 int i;
20576+ unsigned long cr0;
20577
20578 kernel_fpu_begin();
20579
20580 __asm__ __volatile__ (
20581- "1: prefetch (%0)\n"
20582- " prefetch 64(%0)\n"
20583- " prefetch 128(%0)\n"
20584- " prefetch 192(%0)\n"
20585- " prefetch 256(%0)\n"
20586+ "1: prefetch (%1)\n"
20587+ " prefetch 64(%1)\n"
20588+ " prefetch 128(%1)\n"
20589+ " prefetch 192(%1)\n"
20590+ " prefetch 256(%1)\n"
20591 "2: \n"
20592 ".section .fixup, \"ax\"\n"
20593- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20594+ "3: \n"
20595+
20596+#ifdef CONFIG_PAX_KERNEXEC
20597+ " movl %%cr0, %0\n"
20598+ " movl %0, %%eax\n"
20599+ " andl $0xFFFEFFFF, %%eax\n"
20600+ " movl %%eax, %%cr0\n"
20601+#endif
20602+
20603+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20604+
20605+#ifdef CONFIG_PAX_KERNEXEC
20606+ " movl %0, %%cr0\n"
20607+#endif
20608+
20609 " jmp 2b\n"
20610 ".previous\n"
20611- _ASM_EXTABLE(1b, 3b) : : "r" (from));
20612+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
20613
20614 for (i = 0; i < 4096/64; i++) {
20615 __asm__ __volatile__ (
20616- "1: prefetch 320(%0)\n"
20617- "2: movq (%0), %%mm0\n"
20618- " movq 8(%0), %%mm1\n"
20619- " movq 16(%0), %%mm2\n"
20620- " movq 24(%0), %%mm3\n"
20621- " movq %%mm0, (%1)\n"
20622- " movq %%mm1, 8(%1)\n"
20623- " movq %%mm2, 16(%1)\n"
20624- " movq %%mm3, 24(%1)\n"
20625- " movq 32(%0), %%mm0\n"
20626- " movq 40(%0), %%mm1\n"
20627- " movq 48(%0), %%mm2\n"
20628- " movq 56(%0), %%mm3\n"
20629- " movq %%mm0, 32(%1)\n"
20630- " movq %%mm1, 40(%1)\n"
20631- " movq %%mm2, 48(%1)\n"
20632- " movq %%mm3, 56(%1)\n"
20633+ "1: prefetch 320(%1)\n"
20634+ "2: movq (%1), %%mm0\n"
20635+ " movq 8(%1), %%mm1\n"
20636+ " movq 16(%1), %%mm2\n"
20637+ " movq 24(%1), %%mm3\n"
20638+ " movq %%mm0, (%2)\n"
20639+ " movq %%mm1, 8(%2)\n"
20640+ " movq %%mm2, 16(%2)\n"
20641+ " movq %%mm3, 24(%2)\n"
20642+ " movq 32(%1), %%mm0\n"
20643+ " movq 40(%1), %%mm1\n"
20644+ " movq 48(%1), %%mm2\n"
20645+ " movq 56(%1), %%mm3\n"
20646+ " movq %%mm0, 32(%2)\n"
20647+ " movq %%mm1, 40(%2)\n"
20648+ " movq %%mm2, 48(%2)\n"
20649+ " movq %%mm3, 56(%2)\n"
20650 ".section .fixup, \"ax\"\n"
20651- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20652+ "3:\n"
20653+
20654+#ifdef CONFIG_PAX_KERNEXEC
20655+ " movl %%cr0, %0\n"
20656+ " movl %0, %%eax\n"
20657+ " andl $0xFFFEFFFF, %%eax\n"
20658+ " movl %%eax, %%cr0\n"
20659+#endif
20660+
20661+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20662+
20663+#ifdef CONFIG_PAX_KERNEXEC
20664+ " movl %0, %%cr0\n"
20665+#endif
20666+
20667 " jmp 2b\n"
20668 ".previous\n"
20669 _ASM_EXTABLE(1b, 3b)
20670- : : "r" (from), "r" (to) : "memory");
20671+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20672
20673 from += 64;
20674 to += 64;
20675diff -urNp linux-2.6.32.46/arch/x86/lib/msr-reg.S linux-2.6.32.46/arch/x86/lib/msr-reg.S
20676--- linux-2.6.32.46/arch/x86/lib/msr-reg.S 2011-03-27 14:31:47.000000000 -0400
20677+++ linux-2.6.32.46/arch/x86/lib/msr-reg.S 2011-10-08 08:14:40.000000000 -0400
20678@@ -3,6 +3,7 @@
20679 #include <asm/dwarf2.h>
20680 #include <asm/asm.h>
20681 #include <asm/msr.h>
20682+#include <asm/alternative-asm.h>
20683
20684 #ifdef CONFIG_X86_64
20685 /*
20686@@ -37,6 +38,7 @@ ENTRY(native_\op\()_safe_regs)
20687 movl %edi, 28(%r10)
20688 popq_cfi %rbp
20689 popq_cfi %rbx
20690+ pax_force_retaddr
20691 ret
20692 3:
20693 CFI_RESTORE_STATE
20694diff -urNp linux-2.6.32.46/arch/x86/lib/putuser.S linux-2.6.32.46/arch/x86/lib/putuser.S
20695--- linux-2.6.32.46/arch/x86/lib/putuser.S 2011-03-27 14:31:47.000000000 -0400
20696+++ linux-2.6.32.46/arch/x86/lib/putuser.S 2011-10-08 08:14:40.000000000 -0400
20697@@ -15,7 +15,9 @@
20698 #include <asm/thread_info.h>
20699 #include <asm/errno.h>
20700 #include <asm/asm.h>
20701-
20702+#include <asm/segment.h>
20703+#include <asm/pgtable.h>
20704+#include <asm/alternative-asm.h>
20705
20706 /*
20707 * __put_user_X
20708@@ -29,52 +31,119 @@
20709 * as they get called from within inline assembly.
20710 */
20711
20712-#define ENTER CFI_STARTPROC ; \
20713- GET_THREAD_INFO(%_ASM_BX)
20714-#define EXIT ret ; \
20715+#define ENTER CFI_STARTPROC
20716+#define EXIT pax_force_retaddr; ret ; \
20717 CFI_ENDPROC
20718
20719+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20720+#define _DEST %_ASM_CX,%_ASM_BX
20721+#else
20722+#define _DEST %_ASM_CX
20723+#endif
20724+
20725+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20726+#define __copyuser_seg gs;
20727+#else
20728+#define __copyuser_seg
20729+#endif
20730+
20731 .text
20732 ENTRY(__put_user_1)
20733 ENTER
20734+
20735+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20736+ GET_THREAD_INFO(%_ASM_BX)
20737 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
20738 jae bad_put_user
20739-1: movb %al,(%_ASM_CX)
20740+
20741+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20742+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20743+ cmp %_ASM_BX,%_ASM_CX
20744+ jb 1234f
20745+ xor %ebx,%ebx
20746+1234:
20747+#endif
20748+
20749+#endif
20750+
20751+1: __copyuser_seg movb %al,(_DEST)
20752 xor %eax,%eax
20753 EXIT
20754 ENDPROC(__put_user_1)
20755
20756 ENTRY(__put_user_2)
20757 ENTER
20758+
20759+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20760+ GET_THREAD_INFO(%_ASM_BX)
20761 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20762 sub $1,%_ASM_BX
20763 cmp %_ASM_BX,%_ASM_CX
20764 jae bad_put_user
20765-2: movw %ax,(%_ASM_CX)
20766+
20767+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20768+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20769+ cmp %_ASM_BX,%_ASM_CX
20770+ jb 1234f
20771+ xor %ebx,%ebx
20772+1234:
20773+#endif
20774+
20775+#endif
20776+
20777+2: __copyuser_seg movw %ax,(_DEST)
20778 xor %eax,%eax
20779 EXIT
20780 ENDPROC(__put_user_2)
20781
20782 ENTRY(__put_user_4)
20783 ENTER
20784+
20785+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20786+ GET_THREAD_INFO(%_ASM_BX)
20787 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20788 sub $3,%_ASM_BX
20789 cmp %_ASM_BX,%_ASM_CX
20790 jae bad_put_user
20791-3: movl %eax,(%_ASM_CX)
20792+
20793+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20794+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20795+ cmp %_ASM_BX,%_ASM_CX
20796+ jb 1234f
20797+ xor %ebx,%ebx
20798+1234:
20799+#endif
20800+
20801+#endif
20802+
20803+3: __copyuser_seg movl %eax,(_DEST)
20804 xor %eax,%eax
20805 EXIT
20806 ENDPROC(__put_user_4)
20807
20808 ENTRY(__put_user_8)
20809 ENTER
20810+
20811+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20812+ GET_THREAD_INFO(%_ASM_BX)
20813 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20814 sub $7,%_ASM_BX
20815 cmp %_ASM_BX,%_ASM_CX
20816 jae bad_put_user
20817-4: mov %_ASM_AX,(%_ASM_CX)
20818+
20819+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20820+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20821+ cmp %_ASM_BX,%_ASM_CX
20822+ jb 1234f
20823+ xor %ebx,%ebx
20824+1234:
20825+#endif
20826+
20827+#endif
20828+
20829+4: __copyuser_seg mov %_ASM_AX,(_DEST)
20830 #ifdef CONFIG_X86_32
20831-5: movl %edx,4(%_ASM_CX)
20832+5: __copyuser_seg movl %edx,4(_DEST)
20833 #endif
20834 xor %eax,%eax
20835 EXIT
20836diff -urNp linux-2.6.32.46/arch/x86/lib/rwlock_64.S linux-2.6.32.46/arch/x86/lib/rwlock_64.S
20837--- linux-2.6.32.46/arch/x86/lib/rwlock_64.S 2011-03-27 14:31:47.000000000 -0400
20838+++ linux-2.6.32.46/arch/x86/lib/rwlock_64.S 2011-10-06 09:37:14.000000000 -0400
20839@@ -17,6 +17,7 @@ ENTRY(__write_lock_failed)
20840 LOCK_PREFIX
20841 subl $RW_LOCK_BIAS,(%rdi)
20842 jnz __write_lock_failed
20843+ pax_force_retaddr
20844 ret
20845 CFI_ENDPROC
20846 END(__write_lock_failed)
20847@@ -33,6 +34,7 @@ ENTRY(__read_lock_failed)
20848 LOCK_PREFIX
20849 decl (%rdi)
20850 js __read_lock_failed
20851+ pax_force_retaddr
20852 ret
20853 CFI_ENDPROC
20854 END(__read_lock_failed)
20855diff -urNp linux-2.6.32.46/arch/x86/lib/rwsem_64.S linux-2.6.32.46/arch/x86/lib/rwsem_64.S
20856--- linux-2.6.32.46/arch/x86/lib/rwsem_64.S 2011-03-27 14:31:47.000000000 -0400
20857+++ linux-2.6.32.46/arch/x86/lib/rwsem_64.S 2011-10-06 09:37:14.000000000 -0400
20858@@ -48,6 +48,7 @@ ENTRY(call_rwsem_down_read_failed)
20859 call rwsem_down_read_failed
20860 popq %rdx
20861 restore_common_regs
20862+ pax_force_retaddr
20863 ret
20864 ENDPROC(call_rwsem_down_read_failed)
20865
20866@@ -56,6 +57,7 @@ ENTRY(call_rwsem_down_write_failed)
20867 movq %rax,%rdi
20868 call rwsem_down_write_failed
20869 restore_common_regs
20870+ pax_force_retaddr
20871 ret
20872 ENDPROC(call_rwsem_down_write_failed)
20873
20874@@ -66,7 +68,8 @@ ENTRY(call_rwsem_wake)
20875 movq %rax,%rdi
20876 call rwsem_wake
20877 restore_common_regs
20878-1: ret
20879+1: pax_force_retaddr
20880+ ret
20881 ENDPROC(call_rwsem_wake)
20882
20883 /* Fix up special calling conventions */
20884@@ -77,5 +80,6 @@ ENTRY(call_rwsem_downgrade_wake)
20885 call rwsem_downgrade_wake
20886 popq %rdx
20887 restore_common_regs
20888+ pax_force_retaddr
20889 ret
20890 ENDPROC(call_rwsem_downgrade_wake)
20891diff -urNp linux-2.6.32.46/arch/x86/lib/thunk_64.S linux-2.6.32.46/arch/x86/lib/thunk_64.S
20892--- linux-2.6.32.46/arch/x86/lib/thunk_64.S 2011-03-27 14:31:47.000000000 -0400
20893+++ linux-2.6.32.46/arch/x86/lib/thunk_64.S 2011-10-06 09:37:14.000000000 -0400
20894@@ -10,7 +10,8 @@
20895 #include <asm/dwarf2.h>
20896 #include <asm/calling.h>
20897 #include <asm/rwlock.h>
20898-
20899+ #include <asm/alternative-asm.h>
20900+
20901 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
20902 .macro thunk name,func
20903 .globl \name
20904@@ -70,6 +71,7 @@
20905 SAVE_ARGS
20906 restore:
20907 RESTORE_ARGS
20908+ pax_force_retaddr
20909 ret
20910 CFI_ENDPROC
20911
20912@@ -77,5 +79,6 @@ restore:
20913 SAVE_ARGS
20914 restore_norax:
20915 RESTORE_ARGS 1
20916+ pax_force_retaddr
20917 ret
20918 CFI_ENDPROC
20919diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_32.c linux-2.6.32.46/arch/x86/lib/usercopy_32.c
20920--- linux-2.6.32.46/arch/x86/lib/usercopy_32.c 2011-03-27 14:31:47.000000000 -0400
20921+++ linux-2.6.32.46/arch/x86/lib/usercopy_32.c 2011-04-23 21:12:28.000000000 -0400
20922@@ -43,7 +43,7 @@ do { \
20923 __asm__ __volatile__( \
20924 " testl %1,%1\n" \
20925 " jz 2f\n" \
20926- "0: lodsb\n" \
20927+ "0: "__copyuser_seg"lodsb\n" \
20928 " stosb\n" \
20929 " testb %%al,%%al\n" \
20930 " jz 1f\n" \
20931@@ -128,10 +128,12 @@ do { \
20932 int __d0; \
20933 might_fault(); \
20934 __asm__ __volatile__( \
20935+ __COPYUSER_SET_ES \
20936 "0: rep; stosl\n" \
20937 " movl %2,%0\n" \
20938 "1: rep; stosb\n" \
20939 "2:\n" \
20940+ __COPYUSER_RESTORE_ES \
20941 ".section .fixup,\"ax\"\n" \
20942 "3: lea 0(%2,%0,4),%0\n" \
20943 " jmp 2b\n" \
20944@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s,
20945 might_fault();
20946
20947 __asm__ __volatile__(
20948+ __COPYUSER_SET_ES
20949 " testl %0, %0\n"
20950 " jz 3f\n"
20951 " andl %0,%%ecx\n"
20952@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s,
20953 " subl %%ecx,%0\n"
20954 " addl %0,%%eax\n"
20955 "1:\n"
20956+ __COPYUSER_RESTORE_ES
20957 ".section .fixup,\"ax\"\n"
20958 "2: xorl %%eax,%%eax\n"
20959 " jmp 1b\n"
20960@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
20961
20962 #ifdef CONFIG_X86_INTEL_USERCOPY
20963 static unsigned long
20964-__copy_user_intel(void __user *to, const void *from, unsigned long size)
20965+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
20966 {
20967 int d0, d1;
20968 __asm__ __volatile__(
20969@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const
20970 " .align 2,0x90\n"
20971 "3: movl 0(%4), %%eax\n"
20972 "4: movl 4(%4), %%edx\n"
20973- "5: movl %%eax, 0(%3)\n"
20974- "6: movl %%edx, 4(%3)\n"
20975+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
20976+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
20977 "7: movl 8(%4), %%eax\n"
20978 "8: movl 12(%4),%%edx\n"
20979- "9: movl %%eax, 8(%3)\n"
20980- "10: movl %%edx, 12(%3)\n"
20981+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
20982+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
20983 "11: movl 16(%4), %%eax\n"
20984 "12: movl 20(%4), %%edx\n"
20985- "13: movl %%eax, 16(%3)\n"
20986- "14: movl %%edx, 20(%3)\n"
20987+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
20988+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
20989 "15: movl 24(%4), %%eax\n"
20990 "16: movl 28(%4), %%edx\n"
20991- "17: movl %%eax, 24(%3)\n"
20992- "18: movl %%edx, 28(%3)\n"
20993+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
20994+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
20995 "19: movl 32(%4), %%eax\n"
20996 "20: movl 36(%4), %%edx\n"
20997- "21: movl %%eax, 32(%3)\n"
20998- "22: movl %%edx, 36(%3)\n"
20999+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
21000+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
21001 "23: movl 40(%4), %%eax\n"
21002 "24: movl 44(%4), %%edx\n"
21003- "25: movl %%eax, 40(%3)\n"
21004- "26: movl %%edx, 44(%3)\n"
21005+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
21006+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
21007 "27: movl 48(%4), %%eax\n"
21008 "28: movl 52(%4), %%edx\n"
21009- "29: movl %%eax, 48(%3)\n"
21010- "30: movl %%edx, 52(%3)\n"
21011+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
21012+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
21013 "31: movl 56(%4), %%eax\n"
21014 "32: movl 60(%4), %%edx\n"
21015- "33: movl %%eax, 56(%3)\n"
21016- "34: movl %%edx, 60(%3)\n"
21017+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
21018+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
21019 " addl $-64, %0\n"
21020 " addl $64, %4\n"
21021 " addl $64, %3\n"
21022@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const
21023 " shrl $2, %0\n"
21024 " andl $3, %%eax\n"
21025 " cld\n"
21026+ __COPYUSER_SET_ES
21027 "99: rep; movsl\n"
21028 "36: movl %%eax, %0\n"
21029 "37: rep; movsb\n"
21030 "100:\n"
21031+ __COPYUSER_RESTORE_ES
21032+ ".section .fixup,\"ax\"\n"
21033+ "101: lea 0(%%eax,%0,4),%0\n"
21034+ " jmp 100b\n"
21035+ ".previous\n"
21036+ ".section __ex_table,\"a\"\n"
21037+ " .align 4\n"
21038+ " .long 1b,100b\n"
21039+ " .long 2b,100b\n"
21040+ " .long 3b,100b\n"
21041+ " .long 4b,100b\n"
21042+ " .long 5b,100b\n"
21043+ " .long 6b,100b\n"
21044+ " .long 7b,100b\n"
21045+ " .long 8b,100b\n"
21046+ " .long 9b,100b\n"
21047+ " .long 10b,100b\n"
21048+ " .long 11b,100b\n"
21049+ " .long 12b,100b\n"
21050+ " .long 13b,100b\n"
21051+ " .long 14b,100b\n"
21052+ " .long 15b,100b\n"
21053+ " .long 16b,100b\n"
21054+ " .long 17b,100b\n"
21055+ " .long 18b,100b\n"
21056+ " .long 19b,100b\n"
21057+ " .long 20b,100b\n"
21058+ " .long 21b,100b\n"
21059+ " .long 22b,100b\n"
21060+ " .long 23b,100b\n"
21061+ " .long 24b,100b\n"
21062+ " .long 25b,100b\n"
21063+ " .long 26b,100b\n"
21064+ " .long 27b,100b\n"
21065+ " .long 28b,100b\n"
21066+ " .long 29b,100b\n"
21067+ " .long 30b,100b\n"
21068+ " .long 31b,100b\n"
21069+ " .long 32b,100b\n"
21070+ " .long 33b,100b\n"
21071+ " .long 34b,100b\n"
21072+ " .long 35b,100b\n"
21073+ " .long 36b,100b\n"
21074+ " .long 37b,100b\n"
21075+ " .long 99b,101b\n"
21076+ ".previous"
21077+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
21078+ : "1"(to), "2"(from), "0"(size)
21079+ : "eax", "edx", "memory");
21080+ return size;
21081+}
21082+
21083+static unsigned long
21084+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
21085+{
21086+ int d0, d1;
21087+ __asm__ __volatile__(
21088+ " .align 2,0x90\n"
21089+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
21090+ " cmpl $67, %0\n"
21091+ " jbe 3f\n"
21092+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
21093+ " .align 2,0x90\n"
21094+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
21095+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
21096+ "5: movl %%eax, 0(%3)\n"
21097+ "6: movl %%edx, 4(%3)\n"
21098+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
21099+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
21100+ "9: movl %%eax, 8(%3)\n"
21101+ "10: movl %%edx, 12(%3)\n"
21102+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
21103+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
21104+ "13: movl %%eax, 16(%3)\n"
21105+ "14: movl %%edx, 20(%3)\n"
21106+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
21107+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
21108+ "17: movl %%eax, 24(%3)\n"
21109+ "18: movl %%edx, 28(%3)\n"
21110+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
21111+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
21112+ "21: movl %%eax, 32(%3)\n"
21113+ "22: movl %%edx, 36(%3)\n"
21114+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
21115+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
21116+ "25: movl %%eax, 40(%3)\n"
21117+ "26: movl %%edx, 44(%3)\n"
21118+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
21119+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
21120+ "29: movl %%eax, 48(%3)\n"
21121+ "30: movl %%edx, 52(%3)\n"
21122+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
21123+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
21124+ "33: movl %%eax, 56(%3)\n"
21125+ "34: movl %%edx, 60(%3)\n"
21126+ " addl $-64, %0\n"
21127+ " addl $64, %4\n"
21128+ " addl $64, %3\n"
21129+ " cmpl $63, %0\n"
21130+ " ja 1b\n"
21131+ "35: movl %0, %%eax\n"
21132+ " shrl $2, %0\n"
21133+ " andl $3, %%eax\n"
21134+ " cld\n"
21135+ "99: rep; "__copyuser_seg" movsl\n"
21136+ "36: movl %%eax, %0\n"
21137+ "37: rep; "__copyuser_seg" movsb\n"
21138+ "100:\n"
21139 ".section .fixup,\"ax\"\n"
21140 "101: lea 0(%%eax,%0,4),%0\n"
21141 " jmp 100b\n"
21142@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, cons
21143 int d0, d1;
21144 __asm__ __volatile__(
21145 " .align 2,0x90\n"
21146- "0: movl 32(%4), %%eax\n"
21147+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
21148 " cmpl $67, %0\n"
21149 " jbe 2f\n"
21150- "1: movl 64(%4), %%eax\n"
21151+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
21152 " .align 2,0x90\n"
21153- "2: movl 0(%4), %%eax\n"
21154- "21: movl 4(%4), %%edx\n"
21155+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
21156+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
21157 " movl %%eax, 0(%3)\n"
21158 " movl %%edx, 4(%3)\n"
21159- "3: movl 8(%4), %%eax\n"
21160- "31: movl 12(%4),%%edx\n"
21161+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
21162+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
21163 " movl %%eax, 8(%3)\n"
21164 " movl %%edx, 12(%3)\n"
21165- "4: movl 16(%4), %%eax\n"
21166- "41: movl 20(%4), %%edx\n"
21167+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
21168+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
21169 " movl %%eax, 16(%3)\n"
21170 " movl %%edx, 20(%3)\n"
21171- "10: movl 24(%4), %%eax\n"
21172- "51: movl 28(%4), %%edx\n"
21173+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
21174+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
21175 " movl %%eax, 24(%3)\n"
21176 " movl %%edx, 28(%3)\n"
21177- "11: movl 32(%4), %%eax\n"
21178- "61: movl 36(%4), %%edx\n"
21179+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
21180+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
21181 " movl %%eax, 32(%3)\n"
21182 " movl %%edx, 36(%3)\n"
21183- "12: movl 40(%4), %%eax\n"
21184- "71: movl 44(%4), %%edx\n"
21185+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
21186+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
21187 " movl %%eax, 40(%3)\n"
21188 " movl %%edx, 44(%3)\n"
21189- "13: movl 48(%4), %%eax\n"
21190- "81: movl 52(%4), %%edx\n"
21191+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
21192+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
21193 " movl %%eax, 48(%3)\n"
21194 " movl %%edx, 52(%3)\n"
21195- "14: movl 56(%4), %%eax\n"
21196- "91: movl 60(%4), %%edx\n"
21197+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21198+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21199 " movl %%eax, 56(%3)\n"
21200 " movl %%edx, 60(%3)\n"
21201 " addl $-64, %0\n"
21202@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, cons
21203 " shrl $2, %0\n"
21204 " andl $3, %%eax\n"
21205 " cld\n"
21206- "6: rep; movsl\n"
21207+ "6: rep; "__copyuser_seg" movsl\n"
21208 " movl %%eax,%0\n"
21209- "7: rep; movsb\n"
21210+ "7: rep; "__copyuser_seg" movsb\n"
21211 "8:\n"
21212 ".section .fixup,\"ax\"\n"
21213 "9: lea 0(%%eax,%0,4),%0\n"
21214@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing
21215
21216 __asm__ __volatile__(
21217 " .align 2,0x90\n"
21218- "0: movl 32(%4), %%eax\n"
21219+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
21220 " cmpl $67, %0\n"
21221 " jbe 2f\n"
21222- "1: movl 64(%4), %%eax\n"
21223+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
21224 " .align 2,0x90\n"
21225- "2: movl 0(%4), %%eax\n"
21226- "21: movl 4(%4), %%edx\n"
21227+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
21228+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
21229 " movnti %%eax, 0(%3)\n"
21230 " movnti %%edx, 4(%3)\n"
21231- "3: movl 8(%4), %%eax\n"
21232- "31: movl 12(%4),%%edx\n"
21233+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
21234+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
21235 " movnti %%eax, 8(%3)\n"
21236 " movnti %%edx, 12(%3)\n"
21237- "4: movl 16(%4), %%eax\n"
21238- "41: movl 20(%4), %%edx\n"
21239+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
21240+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
21241 " movnti %%eax, 16(%3)\n"
21242 " movnti %%edx, 20(%3)\n"
21243- "10: movl 24(%4), %%eax\n"
21244- "51: movl 28(%4), %%edx\n"
21245+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
21246+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
21247 " movnti %%eax, 24(%3)\n"
21248 " movnti %%edx, 28(%3)\n"
21249- "11: movl 32(%4), %%eax\n"
21250- "61: movl 36(%4), %%edx\n"
21251+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
21252+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
21253 " movnti %%eax, 32(%3)\n"
21254 " movnti %%edx, 36(%3)\n"
21255- "12: movl 40(%4), %%eax\n"
21256- "71: movl 44(%4), %%edx\n"
21257+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
21258+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
21259 " movnti %%eax, 40(%3)\n"
21260 " movnti %%edx, 44(%3)\n"
21261- "13: movl 48(%4), %%eax\n"
21262- "81: movl 52(%4), %%edx\n"
21263+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
21264+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
21265 " movnti %%eax, 48(%3)\n"
21266 " movnti %%edx, 52(%3)\n"
21267- "14: movl 56(%4), %%eax\n"
21268- "91: movl 60(%4), %%edx\n"
21269+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21270+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21271 " movnti %%eax, 56(%3)\n"
21272 " movnti %%edx, 60(%3)\n"
21273 " addl $-64, %0\n"
21274@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing
21275 " shrl $2, %0\n"
21276 " andl $3, %%eax\n"
21277 " cld\n"
21278- "6: rep; movsl\n"
21279+ "6: rep; "__copyuser_seg" movsl\n"
21280 " movl %%eax,%0\n"
21281- "7: rep; movsb\n"
21282+ "7: rep; "__copyuser_seg" movsb\n"
21283 "8:\n"
21284 ".section .fixup,\"ax\"\n"
21285 "9: lea 0(%%eax,%0,4),%0\n"
21286@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_n
21287
21288 __asm__ __volatile__(
21289 " .align 2,0x90\n"
21290- "0: movl 32(%4), %%eax\n"
21291+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
21292 " cmpl $67, %0\n"
21293 " jbe 2f\n"
21294- "1: movl 64(%4), %%eax\n"
21295+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
21296 " .align 2,0x90\n"
21297- "2: movl 0(%4), %%eax\n"
21298- "21: movl 4(%4), %%edx\n"
21299+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
21300+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
21301 " movnti %%eax, 0(%3)\n"
21302 " movnti %%edx, 4(%3)\n"
21303- "3: movl 8(%4), %%eax\n"
21304- "31: movl 12(%4),%%edx\n"
21305+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
21306+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
21307 " movnti %%eax, 8(%3)\n"
21308 " movnti %%edx, 12(%3)\n"
21309- "4: movl 16(%4), %%eax\n"
21310- "41: movl 20(%4), %%edx\n"
21311+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
21312+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
21313 " movnti %%eax, 16(%3)\n"
21314 " movnti %%edx, 20(%3)\n"
21315- "10: movl 24(%4), %%eax\n"
21316- "51: movl 28(%4), %%edx\n"
21317+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
21318+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
21319 " movnti %%eax, 24(%3)\n"
21320 " movnti %%edx, 28(%3)\n"
21321- "11: movl 32(%4), %%eax\n"
21322- "61: movl 36(%4), %%edx\n"
21323+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
21324+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
21325 " movnti %%eax, 32(%3)\n"
21326 " movnti %%edx, 36(%3)\n"
21327- "12: movl 40(%4), %%eax\n"
21328- "71: movl 44(%4), %%edx\n"
21329+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
21330+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
21331 " movnti %%eax, 40(%3)\n"
21332 " movnti %%edx, 44(%3)\n"
21333- "13: movl 48(%4), %%eax\n"
21334- "81: movl 52(%4), %%edx\n"
21335+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
21336+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
21337 " movnti %%eax, 48(%3)\n"
21338 " movnti %%edx, 52(%3)\n"
21339- "14: movl 56(%4), %%eax\n"
21340- "91: movl 60(%4), %%edx\n"
21341+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21342+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21343 " movnti %%eax, 56(%3)\n"
21344 " movnti %%edx, 60(%3)\n"
21345 " addl $-64, %0\n"
21346@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_n
21347 " shrl $2, %0\n"
21348 " andl $3, %%eax\n"
21349 " cld\n"
21350- "6: rep; movsl\n"
21351+ "6: rep; "__copyuser_seg" movsl\n"
21352 " movl %%eax,%0\n"
21353- "7: rep; movsb\n"
21354+ "7: rep; "__copyuser_seg" movsb\n"
21355 "8:\n"
21356 ".section .fixup,\"ax\"\n"
21357 "9: lea 0(%%eax,%0,4),%0\n"
21358@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_n
21359 */
21360 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
21361 unsigned long size);
21362-unsigned long __copy_user_intel(void __user *to, const void *from,
21363+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
21364+ unsigned long size);
21365+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
21366 unsigned long size);
21367 unsigned long __copy_user_zeroing_intel_nocache(void *to,
21368 const void __user *from, unsigned long size);
21369 #endif /* CONFIG_X86_INTEL_USERCOPY */
21370
21371 /* Generic arbitrary sized copy. */
21372-#define __copy_user(to, from, size) \
21373+#define __copy_user(to, from, size, prefix, set, restore) \
21374 do { \
21375 int __d0, __d1, __d2; \
21376 __asm__ __volatile__( \
21377+ set \
21378 " cmp $7,%0\n" \
21379 " jbe 1f\n" \
21380 " movl %1,%0\n" \
21381 " negl %0\n" \
21382 " andl $7,%0\n" \
21383 " subl %0,%3\n" \
21384- "4: rep; movsb\n" \
21385+ "4: rep; "prefix"movsb\n" \
21386 " movl %3,%0\n" \
21387 " shrl $2,%0\n" \
21388 " andl $3,%3\n" \
21389 " .align 2,0x90\n" \
21390- "0: rep; movsl\n" \
21391+ "0: rep; "prefix"movsl\n" \
21392 " movl %3,%0\n" \
21393- "1: rep; movsb\n" \
21394+ "1: rep; "prefix"movsb\n" \
21395 "2:\n" \
21396+ restore \
21397 ".section .fixup,\"ax\"\n" \
21398 "5: addl %3,%0\n" \
21399 " jmp 2b\n" \
21400@@ -682,14 +799,14 @@ do { \
21401 " negl %0\n" \
21402 " andl $7,%0\n" \
21403 " subl %0,%3\n" \
21404- "4: rep; movsb\n" \
21405+ "4: rep; "__copyuser_seg"movsb\n" \
21406 " movl %3,%0\n" \
21407 " shrl $2,%0\n" \
21408 " andl $3,%3\n" \
21409 " .align 2,0x90\n" \
21410- "0: rep; movsl\n" \
21411+ "0: rep; "__copyuser_seg"movsl\n" \
21412 " movl %3,%0\n" \
21413- "1: rep; movsb\n" \
21414+ "1: rep; "__copyuser_seg"movsb\n" \
21415 "2:\n" \
21416 ".section .fixup,\"ax\"\n" \
21417 "5: addl %3,%0\n" \
21418@@ -775,9 +892,9 @@ survive:
21419 }
21420 #endif
21421 if (movsl_is_ok(to, from, n))
21422- __copy_user(to, from, n);
21423+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
21424 else
21425- n = __copy_user_intel(to, from, n);
21426+ n = __generic_copy_to_user_intel(to, from, n);
21427 return n;
21428 }
21429 EXPORT_SYMBOL(__copy_to_user_ll);
21430@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero
21431 unsigned long n)
21432 {
21433 if (movsl_is_ok(to, from, n))
21434- __copy_user(to, from, n);
21435+ __copy_user(to, from, n, __copyuser_seg, "", "");
21436 else
21437- n = __copy_user_intel((void __user *)to,
21438- (const void *)from, n);
21439+ n = __generic_copy_from_user_intel(to, from, n);
21440 return n;
21441 }
21442 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
21443@@ -827,59 +943,38 @@ unsigned long __copy_from_user_ll_nocach
21444 if (n > 64 && cpu_has_xmm2)
21445 n = __copy_user_intel_nocache(to, from, n);
21446 else
21447- __copy_user(to, from, n);
21448+ __copy_user(to, from, n, __copyuser_seg, "", "");
21449 #else
21450- __copy_user(to, from, n);
21451+ __copy_user(to, from, n, __copyuser_seg, "", "");
21452 #endif
21453 return n;
21454 }
21455 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
21456
21457-/**
21458- * copy_to_user: - Copy a block of data into user space.
21459- * @to: Destination address, in user space.
21460- * @from: Source address, in kernel space.
21461- * @n: Number of bytes to copy.
21462- *
21463- * Context: User context only. This function may sleep.
21464- *
21465- * Copy data from kernel space to user space.
21466- *
21467- * Returns number of bytes that could not be copied.
21468- * On success, this will be zero.
21469- */
21470-unsigned long
21471-copy_to_user(void __user *to, const void *from, unsigned long n)
21472+#ifdef CONFIG_PAX_MEMORY_UDEREF
21473+void __set_fs(mm_segment_t x)
21474 {
21475- if (access_ok(VERIFY_WRITE, to, n))
21476- n = __copy_to_user(to, from, n);
21477- return n;
21478+ switch (x.seg) {
21479+ case 0:
21480+ loadsegment(gs, 0);
21481+ break;
21482+ case TASK_SIZE_MAX:
21483+ loadsegment(gs, __USER_DS);
21484+ break;
21485+ case -1UL:
21486+ loadsegment(gs, __KERNEL_DS);
21487+ break;
21488+ default:
21489+ BUG();
21490+ }
21491+ return;
21492 }
21493-EXPORT_SYMBOL(copy_to_user);
21494+EXPORT_SYMBOL(__set_fs);
21495
21496-/**
21497- * copy_from_user: - Copy a block of data from user space.
21498- * @to: Destination address, in kernel space.
21499- * @from: Source address, in user space.
21500- * @n: Number of bytes to copy.
21501- *
21502- * Context: User context only. This function may sleep.
21503- *
21504- * Copy data from user space to kernel space.
21505- *
21506- * Returns number of bytes that could not be copied.
21507- * On success, this will be zero.
21508- *
21509- * If some data could not be copied, this function will pad the copied
21510- * data to the requested size using zero bytes.
21511- */
21512-unsigned long
21513-copy_from_user(void *to, const void __user *from, unsigned long n)
21514+void set_fs(mm_segment_t x)
21515 {
21516- if (access_ok(VERIFY_READ, from, n))
21517- n = __copy_from_user(to, from, n);
21518- else
21519- memset(to, 0, n);
21520- return n;
21521+ current_thread_info()->addr_limit = x;
21522+ __set_fs(x);
21523 }
21524-EXPORT_SYMBOL(copy_from_user);
21525+EXPORT_SYMBOL(set_fs);
21526+#endif
21527diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_64.c linux-2.6.32.46/arch/x86/lib/usercopy_64.c
21528--- linux-2.6.32.46/arch/x86/lib/usercopy_64.c 2011-03-27 14:31:47.000000000 -0400
21529+++ linux-2.6.32.46/arch/x86/lib/usercopy_64.c 2011-10-06 09:37:08.000000000 -0400
21530@@ -42,6 +42,12 @@ long
21531 __strncpy_from_user(char *dst, const char __user *src, long count)
21532 {
21533 long res;
21534+
21535+#ifdef CONFIG_PAX_MEMORY_UDEREF
21536+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21537+ src += PAX_USER_SHADOW_BASE;
21538+#endif
21539+
21540 __do_strncpy_from_user(dst, src, count, res);
21541 return res;
21542 }
21543@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *
21544 {
21545 long __d0;
21546 might_fault();
21547+
21548+#ifdef CONFIG_PAX_MEMORY_UDEREF
21549+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
21550+ addr += PAX_USER_SHADOW_BASE;
21551+#endif
21552+
21553 /* no memory constraint because it doesn't change any memory gcc knows
21554 about */
21555 asm volatile(
21556@@ -151,10 +163,18 @@ EXPORT_SYMBOL(strlen_user);
21557
21558 unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
21559 {
21560- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
21561- return copy_user_generic((__force void *)to, (__force void *)from, len);
21562- }
21563- return len;
21564+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
21565+
21566+#ifdef CONFIG_PAX_MEMORY_UDEREF
21567+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
21568+ to += PAX_USER_SHADOW_BASE;
21569+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
21570+ from += PAX_USER_SHADOW_BASE;
21571+#endif
21572+
21573+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
21574+ }
21575+ return len;
21576 }
21577 EXPORT_SYMBOL(copy_in_user);
21578
21579@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
21580 * it is not necessary to optimize tail handling.
21581 */
21582 unsigned long
21583-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
21584+copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest)
21585 {
21586 char c;
21587 unsigned zero_len;
21588diff -urNp linux-2.6.32.46/arch/x86/Makefile linux-2.6.32.46/arch/x86/Makefile
21589--- linux-2.6.32.46/arch/x86/Makefile 2011-03-27 14:31:47.000000000 -0400
21590+++ linux-2.6.32.46/arch/x86/Makefile 2011-07-19 18:16:02.000000000 -0400
21591@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
21592 else
21593 BITS := 64
21594 UTS_MACHINE := x86_64
21595+ biarch := $(call cc-option,-m64)
21596 CHECKFLAGS += -D__x86_64__ -m64
21597
21598 KBUILD_AFLAGS += -m64
21599@@ -189,3 +190,12 @@ define archhelp
21600 echo ' FDARGS="..." arguments for the booted kernel'
21601 echo ' FDINITRD=file initrd for the booted kernel'
21602 endef
21603+
21604+define OLD_LD
21605+
21606+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
21607+*** Please upgrade your binutils to 2.18 or newer
21608+endef
21609+
21610+archprepare:
21611+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
21612diff -urNp linux-2.6.32.46/arch/x86/mm/extable.c linux-2.6.32.46/arch/x86/mm/extable.c
21613--- linux-2.6.32.46/arch/x86/mm/extable.c 2011-03-27 14:31:47.000000000 -0400
21614+++ linux-2.6.32.46/arch/x86/mm/extable.c 2011-04-17 15:56:46.000000000 -0400
21615@@ -1,14 +1,71 @@
21616 #include <linux/module.h>
21617 #include <linux/spinlock.h>
21618+#include <linux/sort.h>
21619 #include <asm/uaccess.h>
21620+#include <asm/pgtable.h>
21621
21622+/*
21623+ * The exception table needs to be sorted so that the binary
21624+ * search that we use to find entries in it works properly.
21625+ * This is used both for the kernel exception table and for
21626+ * the exception tables of modules that get loaded.
21627+ */
21628+static int cmp_ex(const void *a, const void *b)
21629+{
21630+ const struct exception_table_entry *x = a, *y = b;
21631+
21632+ /* avoid overflow */
21633+ if (x->insn > y->insn)
21634+ return 1;
21635+ if (x->insn < y->insn)
21636+ return -1;
21637+ return 0;
21638+}
21639+
21640+static void swap_ex(void *a, void *b, int size)
21641+{
21642+ struct exception_table_entry t, *x = a, *y = b;
21643+
21644+ t = *x;
21645+
21646+ pax_open_kernel();
21647+ *x = *y;
21648+ *y = t;
21649+ pax_close_kernel();
21650+}
21651+
21652+void sort_extable(struct exception_table_entry *start,
21653+ struct exception_table_entry *finish)
21654+{
21655+ sort(start, finish - start, sizeof(struct exception_table_entry),
21656+ cmp_ex, swap_ex);
21657+}
21658+
21659+#ifdef CONFIG_MODULES
21660+/*
21661+ * If the exception table is sorted, any referring to the module init
21662+ * will be at the beginning or the end.
21663+ */
21664+void trim_init_extable(struct module *m)
21665+{
21666+ /*trim the beginning*/
21667+ while (m->num_exentries && within_module_init(m->extable[0].insn, m)) {
21668+ m->extable++;
21669+ m->num_exentries--;
21670+ }
21671+ /*trim the end*/
21672+ while (m->num_exentries &&
21673+ within_module_init(m->extable[m->num_exentries-1].insn, m))
21674+ m->num_exentries--;
21675+}
21676+#endif /* CONFIG_MODULES */
21677
21678 int fixup_exception(struct pt_regs *regs)
21679 {
21680 const struct exception_table_entry *fixup;
21681
21682 #ifdef CONFIG_PNPBIOS
21683- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
21684+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
21685 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
21686 extern u32 pnp_bios_is_utter_crap;
21687 pnp_bios_is_utter_crap = 1;
21688diff -urNp linux-2.6.32.46/arch/x86/mm/fault.c linux-2.6.32.46/arch/x86/mm/fault.c
21689--- linux-2.6.32.46/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0400
21690+++ linux-2.6.32.46/arch/x86/mm/fault.c 2011-10-06 09:37:08.000000000 -0400
21691@@ -11,10 +11,19 @@
21692 #include <linux/kprobes.h> /* __kprobes, ... */
21693 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
21694 #include <linux/perf_event.h> /* perf_sw_event */
21695+#include <linux/unistd.h>
21696+#include <linux/compiler.h>
21697
21698 #include <asm/traps.h> /* dotraplinkage, ... */
21699 #include <asm/pgalloc.h> /* pgd_*(), ... */
21700 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
21701+#include <asm/vsyscall.h>
21702+#include <asm/tlbflush.h>
21703+
21704+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21705+#include <asm/stacktrace.h>
21706+#include "../kernel/dumpstack.h"
21707+#endif
21708
21709 /*
21710 * Page fault error code bits:
21711@@ -51,7 +60,7 @@ static inline int notify_page_fault(stru
21712 int ret = 0;
21713
21714 /* kprobe_running() needs smp_processor_id() */
21715- if (kprobes_built_in() && !user_mode_vm(regs)) {
21716+ if (kprobes_built_in() && !user_mode(regs)) {
21717 preempt_disable();
21718 if (kprobe_running() && kprobe_fault_handler(regs, 14))
21719 ret = 1;
21720@@ -112,7 +121,10 @@ check_prefetch_opcode(struct pt_regs *re
21721 return !instr_lo || (instr_lo>>1) == 1;
21722 case 0x00:
21723 /* Prefetch instruction is 0x0F0D or 0x0F18 */
21724- if (probe_kernel_address(instr, opcode))
21725+ if (user_mode(regs)) {
21726+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
21727+ return 0;
21728+ } else if (probe_kernel_address(instr, opcode))
21729 return 0;
21730
21731 *prefetch = (instr_lo == 0xF) &&
21732@@ -146,7 +158,10 @@ is_prefetch(struct pt_regs *regs, unsign
21733 while (instr < max_instr) {
21734 unsigned char opcode;
21735
21736- if (probe_kernel_address(instr, opcode))
21737+ if (user_mode(regs)) {
21738+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
21739+ break;
21740+ } else if (probe_kernel_address(instr, opcode))
21741 break;
21742
21743 instr++;
21744@@ -172,6 +187,30 @@ force_sig_info_fault(int si_signo, int s
21745 force_sig_info(si_signo, &info, tsk);
21746 }
21747
21748+#ifdef CONFIG_PAX_EMUTRAMP
21749+static int pax_handle_fetch_fault(struct pt_regs *regs);
21750+#endif
21751+
21752+#ifdef CONFIG_PAX_PAGEEXEC
21753+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
21754+{
21755+ pgd_t *pgd;
21756+ pud_t *pud;
21757+ pmd_t *pmd;
21758+
21759+ pgd = pgd_offset(mm, address);
21760+ if (!pgd_present(*pgd))
21761+ return NULL;
21762+ pud = pud_offset(pgd, address);
21763+ if (!pud_present(*pud))
21764+ return NULL;
21765+ pmd = pmd_offset(pud, address);
21766+ if (!pmd_present(*pmd))
21767+ return NULL;
21768+ return pmd;
21769+}
21770+#endif
21771+
21772 DEFINE_SPINLOCK(pgd_lock);
21773 LIST_HEAD(pgd_list);
21774
21775@@ -224,11 +263,24 @@ void vmalloc_sync_all(void)
21776 address += PMD_SIZE) {
21777
21778 unsigned long flags;
21779+
21780+#ifdef CONFIG_PAX_PER_CPU_PGD
21781+ unsigned long cpu;
21782+#else
21783 struct page *page;
21784+#endif
21785
21786 spin_lock_irqsave(&pgd_lock, flags);
21787+
21788+#ifdef CONFIG_PAX_PER_CPU_PGD
21789+ for (cpu = 0; cpu < NR_CPUS; ++cpu) {
21790+ pgd_t *pgd = get_cpu_pgd(cpu);
21791+#else
21792 list_for_each_entry(page, &pgd_list, lru) {
21793- if (!vmalloc_sync_one(page_address(page), address))
21794+ pgd_t *pgd = page_address(page);
21795+#endif
21796+
21797+ if (!vmalloc_sync_one(pgd, address))
21798 break;
21799 }
21800 spin_unlock_irqrestore(&pgd_lock, flags);
21801@@ -258,6 +310,11 @@ static noinline int vmalloc_fault(unsign
21802 * an interrupt in the middle of a task switch..
21803 */
21804 pgd_paddr = read_cr3();
21805+
21806+#ifdef CONFIG_PAX_PER_CPU_PGD
21807+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
21808+#endif
21809+
21810 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
21811 if (!pmd_k)
21812 return -1;
21813@@ -332,15 +389,27 @@ void vmalloc_sync_all(void)
21814
21815 const pgd_t *pgd_ref = pgd_offset_k(address);
21816 unsigned long flags;
21817+
21818+#ifdef CONFIG_PAX_PER_CPU_PGD
21819+ unsigned long cpu;
21820+#else
21821 struct page *page;
21822+#endif
21823
21824 if (pgd_none(*pgd_ref))
21825 continue;
21826
21827 spin_lock_irqsave(&pgd_lock, flags);
21828+
21829+#ifdef CONFIG_PAX_PER_CPU_PGD
21830+ for (cpu = 0; cpu < NR_CPUS; ++cpu) {
21831+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
21832+#else
21833 list_for_each_entry(page, &pgd_list, lru) {
21834 pgd_t *pgd;
21835 pgd = (pgd_t *)page_address(page) + pgd_index(address);
21836+#endif
21837+
21838 if (pgd_none(*pgd))
21839 set_pgd(pgd, *pgd_ref);
21840 else
21841@@ -373,7 +442,14 @@ static noinline int vmalloc_fault(unsign
21842 * happen within a race in page table update. In the later
21843 * case just flush:
21844 */
21845+
21846+#ifdef CONFIG_PAX_PER_CPU_PGD
21847+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
21848+ pgd = pgd_offset_cpu(smp_processor_id(), address);
21849+#else
21850 pgd = pgd_offset(current->active_mm, address);
21851+#endif
21852+
21853 pgd_ref = pgd_offset_k(address);
21854 if (pgd_none(*pgd_ref))
21855 return -1;
21856@@ -535,7 +611,7 @@ static int is_errata93(struct pt_regs *r
21857 static int is_errata100(struct pt_regs *regs, unsigned long address)
21858 {
21859 #ifdef CONFIG_X86_64
21860- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
21861+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
21862 return 1;
21863 #endif
21864 return 0;
21865@@ -562,7 +638,7 @@ static int is_f00f_bug(struct pt_regs *r
21866 }
21867
21868 static const char nx_warning[] = KERN_CRIT
21869-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
21870+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
21871
21872 static void
21873 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
21874@@ -571,15 +647,26 @@ show_fault_oops(struct pt_regs *regs, un
21875 if (!oops_may_print())
21876 return;
21877
21878- if (error_code & PF_INSTR) {
21879+ if (nx_enabled && (error_code & PF_INSTR)) {
21880 unsigned int level;
21881
21882 pte_t *pte = lookup_address(address, &level);
21883
21884 if (pte && pte_present(*pte) && !pte_exec(*pte))
21885- printk(nx_warning, current_uid());
21886+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
21887 }
21888
21889+#ifdef CONFIG_PAX_KERNEXEC
21890+ if (init_mm.start_code <= address && address < init_mm.end_code) {
21891+ if (current->signal->curr_ip)
21892+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
21893+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
21894+ else
21895+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
21896+ current->comm, task_pid_nr(current), current_uid(), current_euid());
21897+ }
21898+#endif
21899+
21900 printk(KERN_ALERT "BUG: unable to handle kernel ");
21901 if (address < PAGE_SIZE)
21902 printk(KERN_CONT "NULL pointer dereference");
21903@@ -704,6 +791,70 @@ __bad_area_nosemaphore(struct pt_regs *r
21904 unsigned long address, int si_code)
21905 {
21906 struct task_struct *tsk = current;
21907+#if defined(CONFIG_X86_64) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
21908+ struct mm_struct *mm = tsk->mm;
21909+#endif
21910+
21911+#ifdef CONFIG_X86_64
21912+ if (mm && (error_code & PF_INSTR) && mm->context.vdso) {
21913+ if (regs->ip == (unsigned long)vgettimeofday) {
21914+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday);
21915+ return;
21916+ } else if (regs->ip == (unsigned long)vtime) {
21917+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_time);
21918+ return;
21919+ } else if (regs->ip == (unsigned long)vgetcpu) {
21920+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu);
21921+ return;
21922+ }
21923+ }
21924+#endif
21925+
21926+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
21927+ if (mm && (error_code & PF_USER)) {
21928+ unsigned long ip = regs->ip;
21929+
21930+ if (v8086_mode(regs))
21931+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
21932+
21933+ /*
21934+ * It's possible to have interrupts off here:
21935+ */
21936+ local_irq_enable();
21937+
21938+#ifdef CONFIG_PAX_PAGEEXEC
21939+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) &&
21940+ ((nx_enabled && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && ip == address))) {
21941+
21942+#ifdef CONFIG_PAX_EMUTRAMP
21943+ switch (pax_handle_fetch_fault(regs)) {
21944+ case 2:
21945+ return;
21946+ }
21947+#endif
21948+
21949+ pax_report_fault(regs, (void *)ip, (void *)regs->sp);
21950+ do_group_exit(SIGKILL);
21951+ }
21952+#endif
21953+
21954+#ifdef CONFIG_PAX_SEGMEXEC
21955+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address)) {
21956+
21957+#ifdef CONFIG_PAX_EMUTRAMP
21958+ switch (pax_handle_fetch_fault(regs)) {
21959+ case 2:
21960+ return;
21961+ }
21962+#endif
21963+
21964+ pax_report_fault(regs, (void *)ip, (void *)regs->sp);
21965+ do_group_exit(SIGKILL);
21966+ }
21967+#endif
21968+
21969+ }
21970+#endif
21971
21972 /* User mode accesses just cause a SIGSEGV */
21973 if (error_code & PF_USER) {
21974@@ -857,6 +1008,99 @@ static int spurious_fault_check(unsigned
21975 return 1;
21976 }
21977
21978+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
21979+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
21980+{
21981+ pte_t *pte;
21982+ pmd_t *pmd;
21983+ spinlock_t *ptl;
21984+ unsigned char pte_mask;
21985+
21986+ if (nx_enabled || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
21987+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
21988+ return 0;
21989+
21990+ /* PaX: it's our fault, let's handle it if we can */
21991+
21992+ /* PaX: take a look at read faults before acquiring any locks */
21993+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
21994+ /* instruction fetch attempt from a protected page in user mode */
21995+ up_read(&mm->mmap_sem);
21996+
21997+#ifdef CONFIG_PAX_EMUTRAMP
21998+ switch (pax_handle_fetch_fault(regs)) {
21999+ case 2:
22000+ return 1;
22001+ }
22002+#endif
22003+
22004+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
22005+ do_group_exit(SIGKILL);
22006+ }
22007+
22008+ pmd = pax_get_pmd(mm, address);
22009+ if (unlikely(!pmd))
22010+ return 0;
22011+
22012+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
22013+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
22014+ pte_unmap_unlock(pte, ptl);
22015+ return 0;
22016+ }
22017+
22018+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
22019+ /* write attempt to a protected page in user mode */
22020+ pte_unmap_unlock(pte, ptl);
22021+ return 0;
22022+ }
22023+
22024+#ifdef CONFIG_SMP
22025+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
22026+#else
22027+ if (likely(address > get_limit(regs->cs)))
22028+#endif
22029+ {
22030+ set_pte(pte, pte_mkread(*pte));
22031+ __flush_tlb_one(address);
22032+ pte_unmap_unlock(pte, ptl);
22033+ up_read(&mm->mmap_sem);
22034+ return 1;
22035+ }
22036+
22037+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
22038+
22039+ /*
22040+ * PaX: fill DTLB with user rights and retry
22041+ */
22042+ __asm__ __volatile__ (
22043+ "orb %2,(%1)\n"
22044+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
22045+/*
22046+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
22047+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
22048+ * page fault when examined during a TLB load attempt. this is true not only
22049+ * for PTEs holding a non-present entry but also present entries that will
22050+ * raise a page fault (such as those set up by PaX, or the copy-on-write
22051+ * mechanism). in effect it means that we do *not* need to flush the TLBs
22052+ * for our target pages since their PTEs are simply not in the TLBs at all.
22053+
22054+ * the best thing in omitting it is that we gain around 15-20% speed in the
22055+ * fast path of the page fault handler and can get rid of tracing since we
22056+ * can no longer flush unintended entries.
22057+ */
22058+ "invlpg (%0)\n"
22059+#endif
22060+ __copyuser_seg"testb $0,(%0)\n"
22061+ "xorb %3,(%1)\n"
22062+ :
22063+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
22064+ : "memory", "cc");
22065+ pte_unmap_unlock(pte, ptl);
22066+ up_read(&mm->mmap_sem);
22067+ return 1;
22068+}
22069+#endif
22070+
22071 /*
22072 * Handle a spurious fault caused by a stale TLB entry.
22073 *
22074@@ -923,6 +1167,9 @@ int show_unhandled_signals = 1;
22075 static inline int
22076 access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
22077 {
22078+ if (nx_enabled && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
22079+ return 1;
22080+
22081 if (write) {
22082 /* write, present and write, not present: */
22083 if (unlikely(!(vma->vm_flags & VM_WRITE)))
22084@@ -956,17 +1203,31 @@ do_page_fault(struct pt_regs *regs, unsi
22085 {
22086 struct vm_area_struct *vma;
22087 struct task_struct *tsk;
22088- unsigned long address;
22089 struct mm_struct *mm;
22090 int write;
22091 int fault;
22092
22093+ /* Get the faulting address: */
22094+ unsigned long address = read_cr2();
22095+
22096+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22097+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
22098+ if (!search_exception_tables(regs->ip)) {
22099+ bad_area_nosemaphore(regs, error_code, address);
22100+ return;
22101+ }
22102+ if (address < PAX_USER_SHADOW_BASE) {
22103+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
22104+ printk(KERN_ERR "PAX: faulting IP: %pA\n", (void *)regs->ip);
22105+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
22106+ } else
22107+ address -= PAX_USER_SHADOW_BASE;
22108+ }
22109+#endif
22110+
22111 tsk = current;
22112 mm = tsk->mm;
22113
22114- /* Get the faulting address: */
22115- address = read_cr2();
22116-
22117 /*
22118 * Detect and handle instructions that would cause a page fault for
22119 * both a tracked kernel page and a userspace page.
22120@@ -1026,7 +1287,7 @@ do_page_fault(struct pt_regs *regs, unsi
22121 * User-mode registers count as a user access even for any
22122 * potential system fault or CPU buglet:
22123 */
22124- if (user_mode_vm(regs)) {
22125+ if (user_mode(regs)) {
22126 local_irq_enable();
22127 error_code |= PF_USER;
22128 } else {
22129@@ -1080,6 +1341,11 @@ do_page_fault(struct pt_regs *regs, unsi
22130 might_sleep();
22131 }
22132
22133+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
22134+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
22135+ return;
22136+#endif
22137+
22138 vma = find_vma(mm, address);
22139 if (unlikely(!vma)) {
22140 bad_area(regs, error_code, address);
22141@@ -1091,18 +1357,24 @@ do_page_fault(struct pt_regs *regs, unsi
22142 bad_area(regs, error_code, address);
22143 return;
22144 }
22145- if (error_code & PF_USER) {
22146- /*
22147- * Accessing the stack below %sp is always a bug.
22148- * The large cushion allows instructions like enter
22149- * and pusha to work. ("enter $65535, $31" pushes
22150- * 32 pointers and then decrements %sp by 65535.)
22151- */
22152- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
22153- bad_area(regs, error_code, address);
22154- return;
22155- }
22156+ /*
22157+ * Accessing the stack below %sp is always a bug.
22158+ * The large cushion allows instructions like enter
22159+ * and pusha to work. ("enter $65535, $31" pushes
22160+ * 32 pointers and then decrements %sp by 65535.)
22161+ */
22162+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
22163+ bad_area(regs, error_code, address);
22164+ return;
22165 }
22166+
22167+#ifdef CONFIG_PAX_SEGMEXEC
22168+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
22169+ bad_area(regs, error_code, address);
22170+ return;
22171+ }
22172+#endif
22173+
22174 if (unlikely(expand_stack(vma, address))) {
22175 bad_area(regs, error_code, address);
22176 return;
22177@@ -1146,3 +1418,199 @@ good_area:
22178
22179 up_read(&mm->mmap_sem);
22180 }
22181+
22182+#ifdef CONFIG_PAX_EMUTRAMP
22183+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
22184+{
22185+ int err;
22186+
22187+ do { /* PaX: gcc trampoline emulation #1 */
22188+ unsigned char mov1, mov2;
22189+ unsigned short jmp;
22190+ unsigned int addr1, addr2;
22191+
22192+#ifdef CONFIG_X86_64
22193+ if ((regs->ip + 11) >> 32)
22194+ break;
22195+#endif
22196+
22197+ err = get_user(mov1, (unsigned char __user *)regs->ip);
22198+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
22199+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
22200+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
22201+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
22202+
22203+ if (err)
22204+ break;
22205+
22206+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
22207+ regs->cx = addr1;
22208+ regs->ax = addr2;
22209+ regs->ip = addr2;
22210+ return 2;
22211+ }
22212+ } while (0);
22213+
22214+ do { /* PaX: gcc trampoline emulation #2 */
22215+ unsigned char mov, jmp;
22216+ unsigned int addr1, addr2;
22217+
22218+#ifdef CONFIG_X86_64
22219+ if ((regs->ip + 9) >> 32)
22220+ break;
22221+#endif
22222+
22223+ err = get_user(mov, (unsigned char __user *)regs->ip);
22224+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
22225+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
22226+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
22227+
22228+ if (err)
22229+ break;
22230+
22231+ if (mov == 0xB9 && jmp == 0xE9) {
22232+ regs->cx = addr1;
22233+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
22234+ return 2;
22235+ }
22236+ } while (0);
22237+
22238+ return 1; /* PaX in action */
22239+}
22240+
22241+#ifdef CONFIG_X86_64
22242+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
22243+{
22244+ int err;
22245+
22246+ do { /* PaX: gcc trampoline emulation #1 */
22247+ unsigned short mov1, mov2, jmp1;
22248+ unsigned char jmp2;
22249+ unsigned int addr1;
22250+ unsigned long addr2;
22251+
22252+ err = get_user(mov1, (unsigned short __user *)regs->ip);
22253+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
22254+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
22255+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
22256+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
22257+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
22258+
22259+ if (err)
22260+ break;
22261+
22262+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
22263+ regs->r11 = addr1;
22264+ regs->r10 = addr2;
22265+ regs->ip = addr1;
22266+ return 2;
22267+ }
22268+ } while (0);
22269+
22270+ do { /* PaX: gcc trampoline emulation #2 */
22271+ unsigned short mov1, mov2, jmp1;
22272+ unsigned char jmp2;
22273+ unsigned long addr1, addr2;
22274+
22275+ err = get_user(mov1, (unsigned short __user *)regs->ip);
22276+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
22277+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
22278+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
22279+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
22280+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
22281+
22282+ if (err)
22283+ break;
22284+
22285+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
22286+ regs->r11 = addr1;
22287+ regs->r10 = addr2;
22288+ regs->ip = addr1;
22289+ return 2;
22290+ }
22291+ } while (0);
22292+
22293+ return 1; /* PaX in action */
22294+}
22295+#endif
22296+
22297+/*
22298+ * PaX: decide what to do with offenders (regs->ip = fault address)
22299+ *
22300+ * returns 1 when task should be killed
22301+ * 2 when gcc trampoline was detected
22302+ */
22303+static int pax_handle_fetch_fault(struct pt_regs *regs)
22304+{
22305+ if (v8086_mode(regs))
22306+ return 1;
22307+
22308+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
22309+ return 1;
22310+
22311+#ifdef CONFIG_X86_32
22312+ return pax_handle_fetch_fault_32(regs);
22313+#else
22314+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
22315+ return pax_handle_fetch_fault_32(regs);
22316+ else
22317+ return pax_handle_fetch_fault_64(regs);
22318+#endif
22319+}
22320+#endif
22321+
22322+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
22323+void pax_report_insns(void *pc, void *sp)
22324+{
22325+ long i;
22326+
22327+ printk(KERN_ERR "PAX: bytes at PC: ");
22328+ for (i = 0; i < 20; i++) {
22329+ unsigned char c;
22330+ if (get_user(c, (unsigned char __force_user *)pc+i))
22331+ printk(KERN_CONT "?? ");
22332+ else
22333+ printk(KERN_CONT "%02x ", c);
22334+ }
22335+ printk("\n");
22336+
22337+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
22338+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
22339+ unsigned long c;
22340+ if (get_user(c, (unsigned long __force_user *)sp+i))
22341+#ifdef CONFIG_X86_32
22342+ printk(KERN_CONT "???????? ");
22343+#else
22344+ printk(KERN_CONT "???????????????? ");
22345+#endif
22346+ else
22347+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
22348+ }
22349+ printk("\n");
22350+}
22351+#endif
22352+
22353+/**
22354+ * probe_kernel_write(): safely attempt to write to a location
22355+ * @dst: address to write to
22356+ * @src: pointer to the data that shall be written
22357+ * @size: size of the data chunk
22358+ *
22359+ * Safely write to address @dst from the buffer at @src. If a kernel fault
22360+ * happens, handle that and return -EFAULT.
22361+ */
22362+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
22363+{
22364+ long ret;
22365+ mm_segment_t old_fs = get_fs();
22366+
22367+ set_fs(KERNEL_DS);
22368+ pagefault_disable();
22369+ pax_open_kernel();
22370+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
22371+ pax_close_kernel();
22372+ pagefault_enable();
22373+ set_fs(old_fs);
22374+
22375+ return ret ? -EFAULT : 0;
22376+}
22377diff -urNp linux-2.6.32.46/arch/x86/mm/gup.c linux-2.6.32.46/arch/x86/mm/gup.c
22378--- linux-2.6.32.46/arch/x86/mm/gup.c 2011-03-27 14:31:47.000000000 -0400
22379+++ linux-2.6.32.46/arch/x86/mm/gup.c 2011-04-17 15:56:46.000000000 -0400
22380@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
22381 addr = start;
22382 len = (unsigned long) nr_pages << PAGE_SHIFT;
22383 end = start + len;
22384- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
22385+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
22386 (void __user *)start, len)))
22387 return 0;
22388
22389diff -urNp linux-2.6.32.46/arch/x86/mm/highmem_32.c linux-2.6.32.46/arch/x86/mm/highmem_32.c
22390--- linux-2.6.32.46/arch/x86/mm/highmem_32.c 2011-03-27 14:31:47.000000000 -0400
22391+++ linux-2.6.32.46/arch/x86/mm/highmem_32.c 2011-04-17 15:56:46.000000000 -0400
22392@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
22393 idx = type + KM_TYPE_NR*smp_processor_id();
22394 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
22395 BUG_ON(!pte_none(*(kmap_pte-idx)));
22396+
22397+ pax_open_kernel();
22398 set_pte(kmap_pte-idx, mk_pte(page, prot));
22399+ pax_close_kernel();
22400
22401 return (void *)vaddr;
22402 }
22403diff -urNp linux-2.6.32.46/arch/x86/mm/hugetlbpage.c linux-2.6.32.46/arch/x86/mm/hugetlbpage.c
22404--- linux-2.6.32.46/arch/x86/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400
22405+++ linux-2.6.32.46/arch/x86/mm/hugetlbpage.c 2011-04-17 15:56:46.000000000 -0400
22406@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
22407 struct hstate *h = hstate_file(file);
22408 struct mm_struct *mm = current->mm;
22409 struct vm_area_struct *vma;
22410- unsigned long start_addr;
22411+ unsigned long start_addr, pax_task_size = TASK_SIZE;
22412+
22413+#ifdef CONFIG_PAX_SEGMEXEC
22414+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22415+ pax_task_size = SEGMEXEC_TASK_SIZE;
22416+#endif
22417+
22418+ pax_task_size -= PAGE_SIZE;
22419
22420 if (len > mm->cached_hole_size) {
22421- start_addr = mm->free_area_cache;
22422+ start_addr = mm->free_area_cache;
22423 } else {
22424- start_addr = TASK_UNMAPPED_BASE;
22425- mm->cached_hole_size = 0;
22426+ start_addr = mm->mmap_base;
22427+ mm->cached_hole_size = 0;
22428 }
22429
22430 full_search:
22431@@ -281,26 +288,27 @@ full_search:
22432
22433 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
22434 /* At this point: (!vma || addr < vma->vm_end). */
22435- if (TASK_SIZE - len < addr) {
22436+ if (pax_task_size - len < addr) {
22437 /*
22438 * Start a new search - just in case we missed
22439 * some holes.
22440 */
22441- if (start_addr != TASK_UNMAPPED_BASE) {
22442- start_addr = TASK_UNMAPPED_BASE;
22443+ if (start_addr != mm->mmap_base) {
22444+ start_addr = mm->mmap_base;
22445 mm->cached_hole_size = 0;
22446 goto full_search;
22447 }
22448 return -ENOMEM;
22449 }
22450- if (!vma || addr + len <= vma->vm_start) {
22451- mm->free_area_cache = addr + len;
22452- return addr;
22453- }
22454+ if (check_heap_stack_gap(vma, addr, len))
22455+ break;
22456 if (addr + mm->cached_hole_size < vma->vm_start)
22457 mm->cached_hole_size = vma->vm_start - addr;
22458 addr = ALIGN(vma->vm_end, huge_page_size(h));
22459 }
22460+
22461+ mm->free_area_cache = addr + len;
22462+ return addr;
22463 }
22464
22465 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
22466@@ -309,10 +317,9 @@ static unsigned long hugetlb_get_unmappe
22467 {
22468 struct hstate *h = hstate_file(file);
22469 struct mm_struct *mm = current->mm;
22470- struct vm_area_struct *vma, *prev_vma;
22471- unsigned long base = mm->mmap_base, addr = addr0;
22472+ struct vm_area_struct *vma;
22473+ unsigned long base = mm->mmap_base, addr;
22474 unsigned long largest_hole = mm->cached_hole_size;
22475- int first_time = 1;
22476
22477 /* don't allow allocations above current base */
22478 if (mm->free_area_cache > base)
22479@@ -322,64 +329,63 @@ static unsigned long hugetlb_get_unmappe
22480 largest_hole = 0;
22481 mm->free_area_cache = base;
22482 }
22483-try_again:
22484+
22485 /* make sure it can fit in the remaining address space */
22486 if (mm->free_area_cache < len)
22487 goto fail;
22488
22489 /* either no address requested or cant fit in requested address hole */
22490- addr = (mm->free_area_cache - len) & huge_page_mask(h);
22491+ addr = (mm->free_area_cache - len);
22492 do {
22493+ addr &= huge_page_mask(h);
22494+ vma = find_vma(mm, addr);
22495 /*
22496 * Lookup failure means no vma is above this address,
22497 * i.e. return with success:
22498- */
22499- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
22500- return addr;
22501-
22502- /*
22503 * new region fits between prev_vma->vm_end and
22504 * vma->vm_start, use it:
22505 */
22506- if (addr + len <= vma->vm_start &&
22507- (!prev_vma || (addr >= prev_vma->vm_end))) {
22508+ if (check_heap_stack_gap(vma, addr, len)) {
22509 /* remember the address as a hint for next time */
22510- mm->cached_hole_size = largest_hole;
22511- return (mm->free_area_cache = addr);
22512- } else {
22513- /* pull free_area_cache down to the first hole */
22514- if (mm->free_area_cache == vma->vm_end) {
22515- mm->free_area_cache = vma->vm_start;
22516- mm->cached_hole_size = largest_hole;
22517- }
22518+ mm->cached_hole_size = largest_hole;
22519+ return (mm->free_area_cache = addr);
22520+ }
22521+ /* pull free_area_cache down to the first hole */
22522+ if (mm->free_area_cache == vma->vm_end) {
22523+ mm->free_area_cache = vma->vm_start;
22524+ mm->cached_hole_size = largest_hole;
22525 }
22526
22527 /* remember the largest hole we saw so far */
22528 if (addr + largest_hole < vma->vm_start)
22529- largest_hole = vma->vm_start - addr;
22530+ largest_hole = vma->vm_start - addr;
22531
22532 /* try just below the current vma->vm_start */
22533- addr = (vma->vm_start - len) & huge_page_mask(h);
22534- } while (len <= vma->vm_start);
22535+ addr = skip_heap_stack_gap(vma, len);
22536+ } while (!IS_ERR_VALUE(addr));
22537
22538 fail:
22539 /*
22540- * if hint left us with no space for the requested
22541- * mapping then try again:
22542- */
22543- if (first_time) {
22544- mm->free_area_cache = base;
22545- largest_hole = 0;
22546- first_time = 0;
22547- goto try_again;
22548- }
22549- /*
22550 * A failed mmap() very likely causes application failure,
22551 * so fall back to the bottom-up function here. This scenario
22552 * can happen with large stack limits and large mmap()
22553 * allocations.
22554 */
22555- mm->free_area_cache = TASK_UNMAPPED_BASE;
22556+
22557+#ifdef CONFIG_PAX_SEGMEXEC
22558+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22559+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
22560+ else
22561+#endif
22562+
22563+ mm->mmap_base = TASK_UNMAPPED_BASE;
22564+
22565+#ifdef CONFIG_PAX_RANDMMAP
22566+ if (mm->pax_flags & MF_PAX_RANDMMAP)
22567+ mm->mmap_base += mm->delta_mmap;
22568+#endif
22569+
22570+ mm->free_area_cache = mm->mmap_base;
22571 mm->cached_hole_size = ~0UL;
22572 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
22573 len, pgoff, flags);
22574@@ -387,6 +393,7 @@ fail:
22575 /*
22576 * Restore the topdown base:
22577 */
22578+ mm->mmap_base = base;
22579 mm->free_area_cache = base;
22580 mm->cached_hole_size = ~0UL;
22581
22582@@ -400,10 +407,19 @@ hugetlb_get_unmapped_area(struct file *f
22583 struct hstate *h = hstate_file(file);
22584 struct mm_struct *mm = current->mm;
22585 struct vm_area_struct *vma;
22586+ unsigned long pax_task_size = TASK_SIZE;
22587
22588 if (len & ~huge_page_mask(h))
22589 return -EINVAL;
22590- if (len > TASK_SIZE)
22591+
22592+#ifdef CONFIG_PAX_SEGMEXEC
22593+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22594+ pax_task_size = SEGMEXEC_TASK_SIZE;
22595+#endif
22596+
22597+ pax_task_size -= PAGE_SIZE;
22598+
22599+ if (len > pax_task_size)
22600 return -ENOMEM;
22601
22602 if (flags & MAP_FIXED) {
22603@@ -415,8 +431,7 @@ hugetlb_get_unmapped_area(struct file *f
22604 if (addr) {
22605 addr = ALIGN(addr, huge_page_size(h));
22606 vma = find_vma(mm, addr);
22607- if (TASK_SIZE - len >= addr &&
22608- (!vma || addr + len <= vma->vm_start))
22609+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
22610 return addr;
22611 }
22612 if (mm->get_unmapped_area == arch_get_unmapped_area)
22613diff -urNp linux-2.6.32.46/arch/x86/mm/init_32.c linux-2.6.32.46/arch/x86/mm/init_32.c
22614--- linux-2.6.32.46/arch/x86/mm/init_32.c 2011-03-27 14:31:47.000000000 -0400
22615+++ linux-2.6.32.46/arch/x86/mm/init_32.c 2011-04-17 15:56:46.000000000 -0400
22616@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
22617 }
22618
22619 /*
22620- * Creates a middle page table and puts a pointer to it in the
22621- * given global directory entry. This only returns the gd entry
22622- * in non-PAE compilation mode, since the middle layer is folded.
22623- */
22624-static pmd_t * __init one_md_table_init(pgd_t *pgd)
22625-{
22626- pud_t *pud;
22627- pmd_t *pmd_table;
22628-
22629-#ifdef CONFIG_X86_PAE
22630- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
22631- if (after_bootmem)
22632- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
22633- else
22634- pmd_table = (pmd_t *)alloc_low_page();
22635- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
22636- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
22637- pud = pud_offset(pgd, 0);
22638- BUG_ON(pmd_table != pmd_offset(pud, 0));
22639-
22640- return pmd_table;
22641- }
22642-#endif
22643- pud = pud_offset(pgd, 0);
22644- pmd_table = pmd_offset(pud, 0);
22645-
22646- return pmd_table;
22647-}
22648-
22649-/*
22650 * Create a page table and place a pointer to it in a middle page
22651 * directory entry:
22652 */
22653@@ -121,13 +91,28 @@ static pte_t * __init one_page_table_ini
22654 page_table = (pte_t *)alloc_low_page();
22655
22656 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
22657+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
22658+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
22659+#else
22660 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
22661+#endif
22662 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
22663 }
22664
22665 return pte_offset_kernel(pmd, 0);
22666 }
22667
22668+static pmd_t * __init one_md_table_init(pgd_t *pgd)
22669+{
22670+ pud_t *pud;
22671+ pmd_t *pmd_table;
22672+
22673+ pud = pud_offset(pgd, 0);
22674+ pmd_table = pmd_offset(pud, 0);
22675+
22676+ return pmd_table;
22677+}
22678+
22679 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
22680 {
22681 int pgd_idx = pgd_index(vaddr);
22682@@ -201,6 +186,7 @@ page_table_range_init(unsigned long star
22683 int pgd_idx, pmd_idx;
22684 unsigned long vaddr;
22685 pgd_t *pgd;
22686+ pud_t *pud;
22687 pmd_t *pmd;
22688 pte_t *pte = NULL;
22689
22690@@ -210,8 +196,13 @@ page_table_range_init(unsigned long star
22691 pgd = pgd_base + pgd_idx;
22692
22693 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
22694- pmd = one_md_table_init(pgd);
22695- pmd = pmd + pmd_index(vaddr);
22696+ pud = pud_offset(pgd, vaddr);
22697+ pmd = pmd_offset(pud, vaddr);
22698+
22699+#ifdef CONFIG_X86_PAE
22700+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
22701+#endif
22702+
22703 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
22704 pmd++, pmd_idx++) {
22705 pte = page_table_kmap_check(one_page_table_init(pmd),
22706@@ -223,11 +214,20 @@ page_table_range_init(unsigned long star
22707 }
22708 }
22709
22710-static inline int is_kernel_text(unsigned long addr)
22711+static inline int is_kernel_text(unsigned long start, unsigned long end)
22712 {
22713- if (addr >= PAGE_OFFSET && addr <= (unsigned long)__init_end)
22714- return 1;
22715- return 0;
22716+ if ((start > ktla_ktva((unsigned long)_etext) ||
22717+ end <= ktla_ktva((unsigned long)_stext)) &&
22718+ (start > ktla_ktva((unsigned long)_einittext) ||
22719+ end <= ktla_ktva((unsigned long)_sinittext)) &&
22720+
22721+#ifdef CONFIG_ACPI_SLEEP
22722+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
22723+#endif
22724+
22725+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
22726+ return 0;
22727+ return 1;
22728 }
22729
22730 /*
22731@@ -243,9 +243,10 @@ kernel_physical_mapping_init(unsigned lo
22732 int use_pse = page_size_mask == (1<<PG_LEVEL_2M);
22733 unsigned long start_pfn, end_pfn;
22734 pgd_t *pgd_base = swapper_pg_dir;
22735- int pgd_idx, pmd_idx, pte_ofs;
22736+ unsigned int pgd_idx, pmd_idx, pte_ofs;
22737 unsigned long pfn;
22738 pgd_t *pgd;
22739+ pud_t *pud;
22740 pmd_t *pmd;
22741 pte_t *pte;
22742 unsigned pages_2m, pages_4k;
22743@@ -278,8 +279,13 @@ repeat:
22744 pfn = start_pfn;
22745 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
22746 pgd = pgd_base + pgd_idx;
22747- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
22748- pmd = one_md_table_init(pgd);
22749+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
22750+ pud = pud_offset(pgd, 0);
22751+ pmd = pmd_offset(pud, 0);
22752+
22753+#ifdef CONFIG_X86_PAE
22754+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
22755+#endif
22756
22757 if (pfn >= end_pfn)
22758 continue;
22759@@ -291,14 +297,13 @@ repeat:
22760 #endif
22761 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
22762 pmd++, pmd_idx++) {
22763- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
22764+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
22765
22766 /*
22767 * Map with big pages if possible, otherwise
22768 * create normal page tables:
22769 */
22770 if (use_pse) {
22771- unsigned int addr2;
22772 pgprot_t prot = PAGE_KERNEL_LARGE;
22773 /*
22774 * first pass will use the same initial
22775@@ -308,11 +313,7 @@ repeat:
22776 __pgprot(PTE_IDENT_ATTR |
22777 _PAGE_PSE);
22778
22779- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
22780- PAGE_OFFSET + PAGE_SIZE-1;
22781-
22782- if (is_kernel_text(addr) ||
22783- is_kernel_text(addr2))
22784+ if (is_kernel_text(address, address + PMD_SIZE))
22785 prot = PAGE_KERNEL_LARGE_EXEC;
22786
22787 pages_2m++;
22788@@ -329,7 +330,7 @@ repeat:
22789 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
22790 pte += pte_ofs;
22791 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
22792- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
22793+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
22794 pgprot_t prot = PAGE_KERNEL;
22795 /*
22796 * first pass will use the same initial
22797@@ -337,7 +338,7 @@ repeat:
22798 */
22799 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
22800
22801- if (is_kernel_text(addr))
22802+ if (is_kernel_text(address, address + PAGE_SIZE))
22803 prot = PAGE_KERNEL_EXEC;
22804
22805 pages_4k++;
22806@@ -489,7 +490,7 @@ void __init native_pagetable_setup_start
22807
22808 pud = pud_offset(pgd, va);
22809 pmd = pmd_offset(pud, va);
22810- if (!pmd_present(*pmd))
22811+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
22812 break;
22813
22814 pte = pte_offset_kernel(pmd, va);
22815@@ -541,9 +542,7 @@ void __init early_ioremap_page_table_ran
22816
22817 static void __init pagetable_init(void)
22818 {
22819- pgd_t *pgd_base = swapper_pg_dir;
22820-
22821- permanent_kmaps_init(pgd_base);
22822+ permanent_kmaps_init(swapper_pg_dir);
22823 }
22824
22825 #ifdef CONFIG_ACPI_SLEEP
22826@@ -551,12 +550,12 @@ static void __init pagetable_init(void)
22827 * ACPI suspend needs this for resume, because things like the intel-agp
22828 * driver might have split up a kernel 4MB mapping.
22829 */
22830-char swsusp_pg_dir[PAGE_SIZE]
22831+pgd_t swsusp_pg_dir[PTRS_PER_PGD]
22832 __attribute__ ((aligned(PAGE_SIZE)));
22833
22834 static inline void save_pg_dir(void)
22835 {
22836- memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE);
22837+ clone_pgd_range(swsusp_pg_dir, swapper_pg_dir, PTRS_PER_PGD);
22838 }
22839 #else /* !CONFIG_ACPI_SLEEP */
22840 static inline void save_pg_dir(void)
22841@@ -588,7 +587,7 @@ void zap_low_mappings(bool early)
22842 flush_tlb_all();
22843 }
22844
22845-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
22846+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
22847 EXPORT_SYMBOL_GPL(__supported_pte_mask);
22848
22849 /* user-defined highmem size */
22850@@ -777,7 +776,7 @@ void __init setup_bootmem_allocator(void
22851 * Initialize the boot-time allocator (with low memory only):
22852 */
22853 bootmap_size = bootmem_bootmap_pages(max_low_pfn)<<PAGE_SHIFT;
22854- bootmap = find_e820_area(0, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
22855+ bootmap = find_e820_area(0x100000, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
22856 PAGE_SIZE);
22857 if (bootmap == -1L)
22858 panic("Cannot find bootmem map of size %ld\n", bootmap_size);
22859@@ -864,6 +863,12 @@ void __init mem_init(void)
22860
22861 pci_iommu_alloc();
22862
22863+#ifdef CONFIG_PAX_PER_CPU_PGD
22864+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
22865+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
22866+ KERNEL_PGD_PTRS);
22867+#endif
22868+
22869 #ifdef CONFIG_FLATMEM
22870 BUG_ON(!mem_map);
22871 #endif
22872@@ -881,7 +886,7 @@ void __init mem_init(void)
22873 set_highmem_pages_init();
22874
22875 codesize = (unsigned long) &_etext - (unsigned long) &_text;
22876- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
22877+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
22878 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
22879
22880 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
22881@@ -923,10 +928,10 @@ void __init mem_init(void)
22882 ((unsigned long)&__init_end -
22883 (unsigned long)&__init_begin) >> 10,
22884
22885- (unsigned long)&_etext, (unsigned long)&_edata,
22886- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
22887+ (unsigned long)&_sdata, (unsigned long)&_edata,
22888+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
22889
22890- (unsigned long)&_text, (unsigned long)&_etext,
22891+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
22892 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
22893
22894 /*
22895@@ -1007,6 +1012,7 @@ void set_kernel_text_rw(void)
22896 if (!kernel_set_to_readonly)
22897 return;
22898
22899+ start = ktla_ktva(start);
22900 pr_debug("Set kernel text: %lx - %lx for read write\n",
22901 start, start+size);
22902
22903@@ -1021,6 +1027,7 @@ void set_kernel_text_ro(void)
22904 if (!kernel_set_to_readonly)
22905 return;
22906
22907+ start = ktla_ktva(start);
22908 pr_debug("Set kernel text: %lx - %lx for read only\n",
22909 start, start+size);
22910
22911@@ -1032,6 +1039,7 @@ void mark_rodata_ro(void)
22912 unsigned long start = PFN_ALIGN(_text);
22913 unsigned long size = PFN_ALIGN(_etext) - start;
22914
22915+ start = ktla_ktva(start);
22916 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
22917 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
22918 size >> 10);
22919diff -urNp linux-2.6.32.46/arch/x86/mm/init_64.c linux-2.6.32.46/arch/x86/mm/init_64.c
22920--- linux-2.6.32.46/arch/x86/mm/init_64.c 2011-04-17 17:00:52.000000000 -0400
22921+++ linux-2.6.32.46/arch/x86/mm/init_64.c 2011-04-17 17:03:05.000000000 -0400
22922@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
22923 pmd = fill_pmd(pud, vaddr);
22924 pte = fill_pte(pmd, vaddr);
22925
22926+ pax_open_kernel();
22927 set_pte(pte, new_pte);
22928+ pax_close_kernel();
22929
22930 /*
22931 * It's enough to flush this one mapping.
22932@@ -223,14 +225,12 @@ static void __init __init_extra_mapping(
22933 pgd = pgd_offset_k((unsigned long)__va(phys));
22934 if (pgd_none(*pgd)) {
22935 pud = (pud_t *) spp_getpage();
22936- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
22937- _PAGE_USER));
22938+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
22939 }
22940 pud = pud_offset(pgd, (unsigned long)__va(phys));
22941 if (pud_none(*pud)) {
22942 pmd = (pmd_t *) spp_getpage();
22943- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
22944- _PAGE_USER));
22945+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
22946 }
22947 pmd = pmd_offset(pud, phys);
22948 BUG_ON(!pmd_none(*pmd));
22949@@ -675,6 +675,12 @@ void __init mem_init(void)
22950
22951 pci_iommu_alloc();
22952
22953+#ifdef CONFIG_PAX_PER_CPU_PGD
22954+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
22955+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
22956+ KERNEL_PGD_PTRS);
22957+#endif
22958+
22959 /* clear_bss() already clear the empty_zero_page */
22960
22961 reservedpages = 0;
22962@@ -861,8 +867,8 @@ int kern_addr_valid(unsigned long addr)
22963 static struct vm_area_struct gate_vma = {
22964 .vm_start = VSYSCALL_START,
22965 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
22966- .vm_page_prot = PAGE_READONLY_EXEC,
22967- .vm_flags = VM_READ | VM_EXEC
22968+ .vm_page_prot = PAGE_READONLY,
22969+ .vm_flags = VM_READ
22970 };
22971
22972 struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
22973@@ -896,7 +902,7 @@ int in_gate_area_no_task(unsigned long a
22974
22975 const char *arch_vma_name(struct vm_area_struct *vma)
22976 {
22977- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
22978+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
22979 return "[vdso]";
22980 if (vma == &gate_vma)
22981 return "[vsyscall]";
22982diff -urNp linux-2.6.32.46/arch/x86/mm/init.c linux-2.6.32.46/arch/x86/mm/init.c
22983--- linux-2.6.32.46/arch/x86/mm/init.c 2011-04-17 17:00:52.000000000 -0400
22984+++ linux-2.6.32.46/arch/x86/mm/init.c 2011-06-07 19:06:09.000000000 -0400
22985@@ -69,11 +69,7 @@ static void __init find_early_table_spac
22986 * cause a hotspot and fill up ZONE_DMA. The page tables
22987 * need roughly 0.5KB per GB.
22988 */
22989-#ifdef CONFIG_X86_32
22990- start = 0x7000;
22991-#else
22992- start = 0x8000;
22993-#endif
22994+ start = 0x100000;
22995 e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
22996 tables, PAGE_SIZE);
22997 if (e820_table_start == -1UL)
22998@@ -147,7 +143,7 @@ unsigned long __init_refok init_memory_m
22999 #endif
23000
23001 set_nx();
23002- if (nx_enabled)
23003+ if (nx_enabled && cpu_has_nx)
23004 printk(KERN_INFO "NX (Execute Disable) protection: active\n");
23005
23006 /* Enable PSE if available */
23007@@ -329,10 +325,27 @@ unsigned long __init_refok init_memory_m
23008 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
23009 * mmio resources as well as potential bios/acpi data regions.
23010 */
23011+
23012 int devmem_is_allowed(unsigned long pagenr)
23013 {
23014+#ifdef CONFIG_GRKERNSEC_KMEM
23015+ /* allow BDA */
23016+ if (!pagenr)
23017+ return 1;
23018+ /* allow EBDA */
23019+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
23020+ return 1;
23021+ /* allow ISA/video mem */
23022+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
23023+ return 1;
23024+ /* throw out everything else below 1MB */
23025+ if (pagenr <= 256)
23026+ return 0;
23027+#else
23028 if (pagenr <= 256)
23029 return 1;
23030+#endif
23031+
23032 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
23033 return 0;
23034 if (!page_is_ram(pagenr))
23035@@ -379,6 +392,86 @@ void free_init_pages(char *what, unsigne
23036
23037 void free_initmem(void)
23038 {
23039+
23040+#ifdef CONFIG_PAX_KERNEXEC
23041+#ifdef CONFIG_X86_32
23042+ /* PaX: limit KERNEL_CS to actual size */
23043+ unsigned long addr, limit;
23044+ struct desc_struct d;
23045+ int cpu;
23046+
23047+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
23048+ limit = (limit - 1UL) >> PAGE_SHIFT;
23049+
23050+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
23051+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
23052+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
23053+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
23054+ }
23055+
23056+ /* PaX: make KERNEL_CS read-only */
23057+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
23058+ if (!paravirt_enabled())
23059+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
23060+/*
23061+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
23062+ pgd = pgd_offset_k(addr);
23063+ pud = pud_offset(pgd, addr);
23064+ pmd = pmd_offset(pud, addr);
23065+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
23066+ }
23067+*/
23068+#ifdef CONFIG_X86_PAE
23069+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
23070+/*
23071+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
23072+ pgd = pgd_offset_k(addr);
23073+ pud = pud_offset(pgd, addr);
23074+ pmd = pmd_offset(pud, addr);
23075+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
23076+ }
23077+*/
23078+#endif
23079+
23080+#ifdef CONFIG_MODULES
23081+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
23082+#endif
23083+
23084+#else
23085+ pgd_t *pgd;
23086+ pud_t *pud;
23087+ pmd_t *pmd;
23088+ unsigned long addr, end;
23089+
23090+ /* PaX: make kernel code/rodata read-only, rest non-executable */
23091+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
23092+ pgd = pgd_offset_k(addr);
23093+ pud = pud_offset(pgd, addr);
23094+ pmd = pmd_offset(pud, addr);
23095+ if (!pmd_present(*pmd))
23096+ continue;
23097+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
23098+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
23099+ else
23100+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
23101+ }
23102+
23103+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
23104+ end = addr + KERNEL_IMAGE_SIZE;
23105+ for (; addr < end; addr += PMD_SIZE) {
23106+ pgd = pgd_offset_k(addr);
23107+ pud = pud_offset(pgd, addr);
23108+ pmd = pmd_offset(pud, addr);
23109+ if (!pmd_present(*pmd))
23110+ continue;
23111+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
23112+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
23113+ }
23114+#endif
23115+
23116+ flush_tlb_all();
23117+#endif
23118+
23119 free_init_pages("unused kernel memory",
23120 (unsigned long)(&__init_begin),
23121 (unsigned long)(&__init_end));
23122diff -urNp linux-2.6.32.46/arch/x86/mm/iomap_32.c linux-2.6.32.46/arch/x86/mm/iomap_32.c
23123--- linux-2.6.32.46/arch/x86/mm/iomap_32.c 2011-03-27 14:31:47.000000000 -0400
23124+++ linux-2.6.32.46/arch/x86/mm/iomap_32.c 2011-04-17 15:56:46.000000000 -0400
23125@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
23126 debug_kmap_atomic(type);
23127 idx = type + KM_TYPE_NR * smp_processor_id();
23128 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
23129+
23130+ pax_open_kernel();
23131 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
23132+ pax_close_kernel();
23133+
23134 arch_flush_lazy_mmu_mode();
23135
23136 return (void *)vaddr;
23137diff -urNp linux-2.6.32.46/arch/x86/mm/ioremap.c linux-2.6.32.46/arch/x86/mm/ioremap.c
23138--- linux-2.6.32.46/arch/x86/mm/ioremap.c 2011-03-27 14:31:47.000000000 -0400
23139+++ linux-2.6.32.46/arch/x86/mm/ioremap.c 2011-04-17 15:56:46.000000000 -0400
23140@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
23141 * Second special case: Some BIOSen report the PC BIOS
23142 * area (640->1Mb) as ram even though it is not.
23143 */
23144- if (pagenr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
23145- pagenr < (BIOS_END >> PAGE_SHIFT))
23146+ if (pagenr >= (ISA_START_ADDRESS >> PAGE_SHIFT) &&
23147+ pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
23148 return 0;
23149
23150 for (i = 0; i < e820.nr_map; i++) {
23151@@ -137,13 +137,10 @@ static void __iomem *__ioremap_caller(re
23152 /*
23153 * Don't allow anybody to remap normal RAM that we're using..
23154 */
23155- for (pfn = phys_addr >> PAGE_SHIFT;
23156- (pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK);
23157- pfn++) {
23158-
23159+ for (pfn = phys_addr >> PAGE_SHIFT; ((resource_size_t)pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); pfn++) {
23160 int is_ram = page_is_ram(pfn);
23161
23162- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
23163+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
23164 return NULL;
23165 WARN_ON_ONCE(is_ram);
23166 }
23167@@ -407,7 +404,7 @@ static int __init early_ioremap_debug_se
23168 early_param("early_ioremap_debug", early_ioremap_debug_setup);
23169
23170 static __initdata int after_paging_init;
23171-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
23172+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
23173
23174 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
23175 {
23176@@ -439,8 +436,7 @@ void __init early_ioremap_init(void)
23177 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
23178
23179 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
23180- memset(bm_pte, 0, sizeof(bm_pte));
23181- pmd_populate_kernel(&init_mm, pmd, bm_pte);
23182+ pmd_populate_user(&init_mm, pmd, bm_pte);
23183
23184 /*
23185 * The boot-ioremap range spans multiple pmds, for which
23186diff -urNp linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c
23187--- linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-27 14:31:47.000000000 -0400
23188+++ linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:56:46.000000000 -0400
23189@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
23190 * memory (e.g. tracked pages)? For now, we need this to avoid
23191 * invoking kmemcheck for PnP BIOS calls.
23192 */
23193- if (regs->flags & X86_VM_MASK)
23194+ if (v8086_mode(regs))
23195 return false;
23196- if (regs->cs != __KERNEL_CS)
23197+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
23198 return false;
23199
23200 pte = kmemcheck_pte_lookup(address);
23201diff -urNp linux-2.6.32.46/arch/x86/mm/mmap.c linux-2.6.32.46/arch/x86/mm/mmap.c
23202--- linux-2.6.32.46/arch/x86/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400
23203+++ linux-2.6.32.46/arch/x86/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400
23204@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
23205 * Leave an at least ~128 MB hole with possible stack randomization.
23206 */
23207 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
23208-#define MAX_GAP (TASK_SIZE/6*5)
23209+#define MAX_GAP (pax_task_size/6*5)
23210
23211 /*
23212 * True on X86_32 or when emulating IA32 on X86_64
23213@@ -94,27 +94,40 @@ static unsigned long mmap_rnd(void)
23214 return rnd << PAGE_SHIFT;
23215 }
23216
23217-static unsigned long mmap_base(void)
23218+static unsigned long mmap_base(struct mm_struct *mm)
23219 {
23220 unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
23221+ unsigned long pax_task_size = TASK_SIZE;
23222+
23223+#ifdef CONFIG_PAX_SEGMEXEC
23224+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
23225+ pax_task_size = SEGMEXEC_TASK_SIZE;
23226+#endif
23227
23228 if (gap < MIN_GAP)
23229 gap = MIN_GAP;
23230 else if (gap > MAX_GAP)
23231 gap = MAX_GAP;
23232
23233- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
23234+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
23235 }
23236
23237 /*
23238 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
23239 * does, but not when emulating X86_32
23240 */
23241-static unsigned long mmap_legacy_base(void)
23242+static unsigned long mmap_legacy_base(struct mm_struct *mm)
23243 {
23244- if (mmap_is_ia32())
23245+ if (mmap_is_ia32()) {
23246+
23247+#ifdef CONFIG_PAX_SEGMEXEC
23248+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
23249+ return SEGMEXEC_TASK_UNMAPPED_BASE;
23250+ else
23251+#endif
23252+
23253 return TASK_UNMAPPED_BASE;
23254- else
23255+ } else
23256 return TASK_UNMAPPED_BASE + mmap_rnd();
23257 }
23258
23259@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(vo
23260 void arch_pick_mmap_layout(struct mm_struct *mm)
23261 {
23262 if (mmap_is_legacy()) {
23263- mm->mmap_base = mmap_legacy_base();
23264+ mm->mmap_base = mmap_legacy_base(mm);
23265+
23266+#ifdef CONFIG_PAX_RANDMMAP
23267+ if (mm->pax_flags & MF_PAX_RANDMMAP)
23268+ mm->mmap_base += mm->delta_mmap;
23269+#endif
23270+
23271 mm->get_unmapped_area = arch_get_unmapped_area;
23272 mm->unmap_area = arch_unmap_area;
23273 } else {
23274- mm->mmap_base = mmap_base();
23275+ mm->mmap_base = mmap_base(mm);
23276+
23277+#ifdef CONFIG_PAX_RANDMMAP
23278+ if (mm->pax_flags & MF_PAX_RANDMMAP)
23279+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
23280+#endif
23281+
23282 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
23283 mm->unmap_area = arch_unmap_area_topdown;
23284 }
23285diff -urNp linux-2.6.32.46/arch/x86/mm/mmio-mod.c linux-2.6.32.46/arch/x86/mm/mmio-mod.c
23286--- linux-2.6.32.46/arch/x86/mm/mmio-mod.c 2011-03-27 14:31:47.000000000 -0400
23287+++ linux-2.6.32.46/arch/x86/mm/mmio-mod.c 2011-07-06 19:53:33.000000000 -0400
23288@@ -193,7 +193,7 @@ static void pre(struct kmmio_probe *p, s
23289 break;
23290 default:
23291 {
23292- unsigned char *ip = (unsigned char *)instptr;
23293+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
23294 my_trace->opcode = MMIO_UNKNOWN_OP;
23295 my_trace->width = 0;
23296 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
23297@@ -233,7 +233,7 @@ static void post(struct kmmio_probe *p,
23298 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
23299 void __iomem *addr)
23300 {
23301- static atomic_t next_id;
23302+ static atomic_unchecked_t next_id;
23303 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
23304 /* These are page-unaligned. */
23305 struct mmiotrace_map map = {
23306@@ -257,7 +257,7 @@ static void ioremap_trace_core(resource_
23307 .private = trace
23308 },
23309 .phys = offset,
23310- .id = atomic_inc_return(&next_id)
23311+ .id = atomic_inc_return_unchecked(&next_id)
23312 };
23313 map.map_id = trace->id;
23314
23315diff -urNp linux-2.6.32.46/arch/x86/mm/numa_32.c linux-2.6.32.46/arch/x86/mm/numa_32.c
23316--- linux-2.6.32.46/arch/x86/mm/numa_32.c 2011-03-27 14:31:47.000000000 -0400
23317+++ linux-2.6.32.46/arch/x86/mm/numa_32.c 2011-04-17 15:56:46.000000000 -0400
23318@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
23319 }
23320 #endif
23321
23322-extern unsigned long find_max_low_pfn(void);
23323 extern unsigned long highend_pfn, highstart_pfn;
23324
23325 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
23326diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr.c linux-2.6.32.46/arch/x86/mm/pageattr.c
23327--- linux-2.6.32.46/arch/x86/mm/pageattr.c 2011-03-27 14:31:47.000000000 -0400
23328+++ linux-2.6.32.46/arch/x86/mm/pageattr.c 2011-04-17 15:56:46.000000000 -0400
23329@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
23330 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
23331 */
23332 if (within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
23333- pgprot_val(forbidden) |= _PAGE_NX;
23334+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23335
23336 /*
23337 * The kernel text needs to be executable for obvious reasons
23338 * Does not cover __inittext since that is gone later on. On
23339 * 64bit we do not enforce !NX on the low mapping
23340 */
23341- if (within(address, (unsigned long)_text, (unsigned long)_etext))
23342- pgprot_val(forbidden) |= _PAGE_NX;
23343+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
23344+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23345
23346+#ifdef CONFIG_DEBUG_RODATA
23347 /*
23348 * The .rodata section needs to be read-only. Using the pfn
23349 * catches all aliases.
23350@@ -278,6 +279,14 @@ static inline pgprot_t static_protection
23351 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
23352 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
23353 pgprot_val(forbidden) |= _PAGE_RW;
23354+#endif
23355+
23356+#ifdef CONFIG_PAX_KERNEXEC
23357+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
23358+ pgprot_val(forbidden) |= _PAGE_RW;
23359+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23360+ }
23361+#endif
23362
23363 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
23364
23365@@ -331,23 +340,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
23366 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
23367 {
23368 /* change init_mm */
23369+ pax_open_kernel();
23370 set_pte_atomic(kpte, pte);
23371+
23372 #ifdef CONFIG_X86_32
23373 if (!SHARED_KERNEL_PMD) {
23374+
23375+#ifdef CONFIG_PAX_PER_CPU_PGD
23376+ unsigned long cpu;
23377+#else
23378 struct page *page;
23379+#endif
23380
23381+#ifdef CONFIG_PAX_PER_CPU_PGD
23382+ for (cpu = 0; cpu < NR_CPUS; ++cpu) {
23383+ pgd_t *pgd = get_cpu_pgd(cpu);
23384+#else
23385 list_for_each_entry(page, &pgd_list, lru) {
23386- pgd_t *pgd;
23387+ pgd_t *pgd = (pgd_t *)page_address(page);
23388+#endif
23389+
23390 pud_t *pud;
23391 pmd_t *pmd;
23392
23393- pgd = (pgd_t *)page_address(page) + pgd_index(address);
23394+ pgd += pgd_index(address);
23395 pud = pud_offset(pgd, address);
23396 pmd = pmd_offset(pud, address);
23397 set_pte_atomic((pte_t *)pmd, pte);
23398 }
23399 }
23400 #endif
23401+ pax_close_kernel();
23402 }
23403
23404 static int
23405diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr-test.c linux-2.6.32.46/arch/x86/mm/pageattr-test.c
23406--- linux-2.6.32.46/arch/x86/mm/pageattr-test.c 2011-03-27 14:31:47.000000000 -0400
23407+++ linux-2.6.32.46/arch/x86/mm/pageattr-test.c 2011-04-17 15:56:46.000000000 -0400
23408@@ -36,7 +36,7 @@ enum {
23409
23410 static int pte_testbit(pte_t pte)
23411 {
23412- return pte_flags(pte) & _PAGE_UNUSED1;
23413+ return pte_flags(pte) & _PAGE_CPA_TEST;
23414 }
23415
23416 struct split_state {
23417diff -urNp linux-2.6.32.46/arch/x86/mm/pat.c linux-2.6.32.46/arch/x86/mm/pat.c
23418--- linux-2.6.32.46/arch/x86/mm/pat.c 2011-03-27 14:31:47.000000000 -0400
23419+++ linux-2.6.32.46/arch/x86/mm/pat.c 2011-04-17 15:56:46.000000000 -0400
23420@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
23421
23422 conflict:
23423 printk(KERN_INFO "%s:%d conflicting memory types "
23424- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start,
23425+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), new->start,
23426 new->end, cattr_name(new->type), cattr_name(entry->type));
23427 return -EBUSY;
23428 }
23429@@ -559,7 +559,7 @@ unlock_ret:
23430
23431 if (err) {
23432 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
23433- current->comm, current->pid, start, end);
23434+ current->comm, task_pid_nr(current), start, end);
23435 }
23436
23437 dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end);
23438@@ -689,8 +689,8 @@ static inline int range_is_allowed(unsig
23439 while (cursor < to) {
23440 if (!devmem_is_allowed(pfn)) {
23441 printk(KERN_INFO
23442- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
23443- current->comm, from, to);
23444+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
23445+ current->comm, from, to, cursor);
23446 return 0;
23447 }
23448 cursor += PAGE_SIZE;
23449@@ -755,7 +755,7 @@ int kernel_map_sync_memtype(u64 base, un
23450 printk(KERN_INFO
23451 "%s:%d ioremap_change_attr failed %s "
23452 "for %Lx-%Lx\n",
23453- current->comm, current->pid,
23454+ current->comm, task_pid_nr(current),
23455 cattr_name(flags),
23456 base, (unsigned long long)(base + size));
23457 return -EINVAL;
23458@@ -813,7 +813,7 @@ static int reserve_pfn_range(u64 paddr,
23459 free_memtype(paddr, paddr + size);
23460 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
23461 " for %Lx-%Lx, got %s\n",
23462- current->comm, current->pid,
23463+ current->comm, task_pid_nr(current),
23464 cattr_name(want_flags),
23465 (unsigned long long)paddr,
23466 (unsigned long long)(paddr + size),
23467diff -urNp linux-2.6.32.46/arch/x86/mm/pf_in.c linux-2.6.32.46/arch/x86/mm/pf_in.c
23468--- linux-2.6.32.46/arch/x86/mm/pf_in.c 2011-03-27 14:31:47.000000000 -0400
23469+++ linux-2.6.32.46/arch/x86/mm/pf_in.c 2011-07-06 19:53:33.000000000 -0400
23470@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
23471 int i;
23472 enum reason_type rv = OTHERS;
23473
23474- p = (unsigned char *)ins_addr;
23475+ p = (unsigned char *)ktla_ktva(ins_addr);
23476 p += skip_prefix(p, &prf);
23477 p += get_opcode(p, &opcode);
23478
23479@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(un
23480 struct prefix_bits prf;
23481 int i;
23482
23483- p = (unsigned char *)ins_addr;
23484+ p = (unsigned char *)ktla_ktva(ins_addr);
23485 p += skip_prefix(p, &prf);
23486 p += get_opcode(p, &opcode);
23487
23488@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned
23489 struct prefix_bits prf;
23490 int i;
23491
23492- p = (unsigned char *)ins_addr;
23493+ p = (unsigned char *)ktla_ktva(ins_addr);
23494 p += skip_prefix(p, &prf);
23495 p += get_opcode(p, &opcode);
23496
23497@@ -417,7 +417,7 @@ unsigned long get_ins_reg_val(unsigned l
23498 int i;
23499 unsigned long rv;
23500
23501- p = (unsigned char *)ins_addr;
23502+ p = (unsigned char *)ktla_ktva(ins_addr);
23503 p += skip_prefix(p, &prf);
23504 p += get_opcode(p, &opcode);
23505 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
23506@@ -472,7 +472,7 @@ unsigned long get_ins_imm_val(unsigned l
23507 int i;
23508 unsigned long rv;
23509
23510- p = (unsigned char *)ins_addr;
23511+ p = (unsigned char *)ktla_ktva(ins_addr);
23512 p += skip_prefix(p, &prf);
23513 p += get_opcode(p, &opcode);
23514 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
23515diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable_32.c linux-2.6.32.46/arch/x86/mm/pgtable_32.c
23516--- linux-2.6.32.46/arch/x86/mm/pgtable_32.c 2011-03-27 14:31:47.000000000 -0400
23517+++ linux-2.6.32.46/arch/x86/mm/pgtable_32.c 2011-04-17 15:56:46.000000000 -0400
23518@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
23519 return;
23520 }
23521 pte = pte_offset_kernel(pmd, vaddr);
23522+
23523+ pax_open_kernel();
23524 if (pte_val(pteval))
23525 set_pte_at(&init_mm, vaddr, pte, pteval);
23526 else
23527 pte_clear(&init_mm, vaddr, pte);
23528+ pax_close_kernel();
23529
23530 /*
23531 * It's enough to flush this one mapping.
23532diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable.c linux-2.6.32.46/arch/x86/mm/pgtable.c
23533--- linux-2.6.32.46/arch/x86/mm/pgtable.c 2011-03-27 14:31:47.000000000 -0400
23534+++ linux-2.6.32.46/arch/x86/mm/pgtable.c 2011-05-11 18:25:15.000000000 -0400
23535@@ -83,9 +83,52 @@ static inline void pgd_list_del(pgd_t *p
23536 list_del(&page->lru);
23537 }
23538
23539-#define UNSHARED_PTRS_PER_PGD \
23540- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
23541+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23542+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
23543
23544+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
23545+{
23546+ while (count--)
23547+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
23548+}
23549+#endif
23550+
23551+#ifdef CONFIG_PAX_PER_CPU_PGD
23552+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
23553+{
23554+ while (count--)
23555+
23556+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23557+ *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
23558+#else
23559+ *dst++ = *src++;
23560+#endif
23561+
23562+}
23563+#endif
23564+
23565+#ifdef CONFIG_X86_64
23566+#define pxd_t pud_t
23567+#define pyd_t pgd_t
23568+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
23569+#define pxd_free(mm, pud) pud_free((mm), (pud))
23570+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
23571+#define pyd_offset(mm ,address) pgd_offset((mm), (address))
23572+#define PYD_SIZE PGDIR_SIZE
23573+#else
23574+#define pxd_t pmd_t
23575+#define pyd_t pud_t
23576+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
23577+#define pxd_free(mm, pud) pmd_free((mm), (pud))
23578+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
23579+#define pyd_offset(mm ,address) pud_offset((mm), (address))
23580+#define PYD_SIZE PUD_SIZE
23581+#endif
23582+
23583+#ifdef CONFIG_PAX_PER_CPU_PGD
23584+static inline void pgd_ctor(pgd_t *pgd) {}
23585+static inline void pgd_dtor(pgd_t *pgd) {}
23586+#else
23587 static void pgd_ctor(pgd_t *pgd)
23588 {
23589 /* If the pgd points to a shared pagetable level (either the
23590@@ -119,6 +162,7 @@ static void pgd_dtor(pgd_t *pgd)
23591 pgd_list_del(pgd);
23592 spin_unlock_irqrestore(&pgd_lock, flags);
23593 }
23594+#endif
23595
23596 /*
23597 * List of all pgd's needed for non-PAE so it can invalidate entries
23598@@ -131,7 +175,7 @@ static void pgd_dtor(pgd_t *pgd)
23599 * -- wli
23600 */
23601
23602-#ifdef CONFIG_X86_PAE
23603+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
23604 /*
23605 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
23606 * updating the top-level pagetable entries to guarantee the
23607@@ -143,7 +187,7 @@ static void pgd_dtor(pgd_t *pgd)
23608 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
23609 * and initialize the kernel pmds here.
23610 */
23611-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
23612+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
23613
23614 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
23615 {
23616@@ -161,36 +205,38 @@ void pud_populate(struct mm_struct *mm,
23617 */
23618 flush_tlb_mm(mm);
23619 }
23620+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
23621+#define PREALLOCATED_PXDS USER_PGD_PTRS
23622 #else /* !CONFIG_X86_PAE */
23623
23624 /* No need to prepopulate any pagetable entries in non-PAE modes. */
23625-#define PREALLOCATED_PMDS 0
23626+#define PREALLOCATED_PXDS 0
23627
23628 #endif /* CONFIG_X86_PAE */
23629
23630-static void free_pmds(pmd_t *pmds[])
23631+static void free_pxds(pxd_t *pxds[])
23632 {
23633 int i;
23634
23635- for(i = 0; i < PREALLOCATED_PMDS; i++)
23636- if (pmds[i])
23637- free_page((unsigned long)pmds[i]);
23638+ for(i = 0; i < PREALLOCATED_PXDS; i++)
23639+ if (pxds[i])
23640+ free_page((unsigned long)pxds[i]);
23641 }
23642
23643-static int preallocate_pmds(pmd_t *pmds[])
23644+static int preallocate_pxds(pxd_t *pxds[])
23645 {
23646 int i;
23647 bool failed = false;
23648
23649- for(i = 0; i < PREALLOCATED_PMDS; i++) {
23650- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
23651- if (pmd == NULL)
23652+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
23653+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
23654+ if (pxd == NULL)
23655 failed = true;
23656- pmds[i] = pmd;
23657+ pxds[i] = pxd;
23658 }
23659
23660 if (failed) {
23661- free_pmds(pmds);
23662+ free_pxds(pxds);
23663 return -ENOMEM;
23664 }
23665
23666@@ -203,51 +249,56 @@ static int preallocate_pmds(pmd_t *pmds[
23667 * preallocate which never got a corresponding vma will need to be
23668 * freed manually.
23669 */
23670-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
23671+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
23672 {
23673 int i;
23674
23675- for(i = 0; i < PREALLOCATED_PMDS; i++) {
23676+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
23677 pgd_t pgd = pgdp[i];
23678
23679 if (pgd_val(pgd) != 0) {
23680- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
23681+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
23682
23683- pgdp[i] = native_make_pgd(0);
23684+ set_pgd(pgdp + i, native_make_pgd(0));
23685
23686- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
23687- pmd_free(mm, pmd);
23688+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
23689+ pxd_free(mm, pxd);
23690 }
23691 }
23692 }
23693
23694-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
23695+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
23696 {
23697- pud_t *pud;
23698+ pyd_t *pyd;
23699 unsigned long addr;
23700 int i;
23701
23702- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
23703+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
23704 return;
23705
23706- pud = pud_offset(pgd, 0);
23707+#ifdef CONFIG_X86_64
23708+ pyd = pyd_offset(mm, 0L);
23709+#else
23710+ pyd = pyd_offset(pgd, 0L);
23711+#endif
23712
23713- for (addr = i = 0; i < PREALLOCATED_PMDS;
23714- i++, pud++, addr += PUD_SIZE) {
23715- pmd_t *pmd = pmds[i];
23716+ for (addr = i = 0; i < PREALLOCATED_PXDS;
23717+ i++, pyd++, addr += PYD_SIZE) {
23718+ pxd_t *pxd = pxds[i];
23719
23720 if (i >= KERNEL_PGD_BOUNDARY)
23721- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
23722- sizeof(pmd_t) * PTRS_PER_PMD);
23723+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
23724+ sizeof(pxd_t) * PTRS_PER_PMD);
23725
23726- pud_populate(mm, pud, pmd);
23727+ pyd_populate(mm, pyd, pxd);
23728 }
23729 }
23730
23731 pgd_t *pgd_alloc(struct mm_struct *mm)
23732 {
23733 pgd_t *pgd;
23734- pmd_t *pmds[PREALLOCATED_PMDS];
23735+ pxd_t *pxds[PREALLOCATED_PXDS];
23736+
23737 unsigned long flags;
23738
23739 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
23740@@ -257,11 +308,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
23741
23742 mm->pgd = pgd;
23743
23744- if (preallocate_pmds(pmds) != 0)
23745+ if (preallocate_pxds(pxds) != 0)
23746 goto out_free_pgd;
23747
23748 if (paravirt_pgd_alloc(mm) != 0)
23749- goto out_free_pmds;
23750+ goto out_free_pxds;
23751
23752 /*
23753 * Make sure that pre-populating the pmds is atomic with
23754@@ -271,14 +322,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
23755 spin_lock_irqsave(&pgd_lock, flags);
23756
23757 pgd_ctor(pgd);
23758- pgd_prepopulate_pmd(mm, pgd, pmds);
23759+ pgd_prepopulate_pxd(mm, pgd, pxds);
23760
23761 spin_unlock_irqrestore(&pgd_lock, flags);
23762
23763 return pgd;
23764
23765-out_free_pmds:
23766- free_pmds(pmds);
23767+out_free_pxds:
23768+ free_pxds(pxds);
23769 out_free_pgd:
23770 free_page((unsigned long)pgd);
23771 out:
23772@@ -287,7 +338,7 @@ out:
23773
23774 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
23775 {
23776- pgd_mop_up_pmds(mm, pgd);
23777+ pgd_mop_up_pxds(mm, pgd);
23778 pgd_dtor(pgd);
23779 paravirt_pgd_free(mm, pgd);
23780 free_page((unsigned long)pgd);
23781diff -urNp linux-2.6.32.46/arch/x86/mm/setup_nx.c linux-2.6.32.46/arch/x86/mm/setup_nx.c
23782--- linux-2.6.32.46/arch/x86/mm/setup_nx.c 2011-03-27 14:31:47.000000000 -0400
23783+++ linux-2.6.32.46/arch/x86/mm/setup_nx.c 2011-04-17 15:56:46.000000000 -0400
23784@@ -4,11 +4,10 @@
23785
23786 #include <asm/pgtable.h>
23787
23788+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
23789 int nx_enabled;
23790
23791-#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
23792-static int disable_nx __cpuinitdata;
23793-
23794+#ifndef CONFIG_PAX_PAGEEXEC
23795 /*
23796 * noexec = on|off
23797 *
23798@@ -22,32 +21,26 @@ static int __init noexec_setup(char *str
23799 if (!str)
23800 return -EINVAL;
23801 if (!strncmp(str, "on", 2)) {
23802- __supported_pte_mask |= _PAGE_NX;
23803- disable_nx = 0;
23804+ nx_enabled = 1;
23805 } else if (!strncmp(str, "off", 3)) {
23806- disable_nx = 1;
23807- __supported_pte_mask &= ~_PAGE_NX;
23808+ nx_enabled = 0;
23809 }
23810 return 0;
23811 }
23812 early_param("noexec", noexec_setup);
23813 #endif
23814+#endif
23815
23816 #ifdef CONFIG_X86_PAE
23817 void __init set_nx(void)
23818 {
23819- unsigned int v[4], l, h;
23820+ if (!nx_enabled && cpu_has_nx) {
23821+ unsigned l, h;
23822
23823- if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
23824- cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);
23825-
23826- if ((v[3] & (1 << 20)) && !disable_nx) {
23827- rdmsr(MSR_EFER, l, h);
23828- l |= EFER_NX;
23829- wrmsr(MSR_EFER, l, h);
23830- nx_enabled = 1;
23831- __supported_pte_mask |= _PAGE_NX;
23832- }
23833+ __supported_pte_mask &= ~_PAGE_NX;
23834+ rdmsr(MSR_EFER, l, h);
23835+ l &= ~EFER_NX;
23836+ wrmsr(MSR_EFER, l, h);
23837 }
23838 }
23839 #else
23840@@ -62,7 +55,7 @@ void __cpuinit check_efer(void)
23841 unsigned long efer;
23842
23843 rdmsrl(MSR_EFER, efer);
23844- if (!(efer & EFER_NX) || disable_nx)
23845+ if (!(efer & EFER_NX) || !nx_enabled)
23846 __supported_pte_mask &= ~_PAGE_NX;
23847 }
23848 #endif
23849diff -urNp linux-2.6.32.46/arch/x86/mm/tlb.c linux-2.6.32.46/arch/x86/mm/tlb.c
23850--- linux-2.6.32.46/arch/x86/mm/tlb.c 2011-03-27 14:31:47.000000000 -0400
23851+++ linux-2.6.32.46/arch/x86/mm/tlb.c 2011-04-23 12:56:10.000000000 -0400
23852@@ -61,7 +61,11 @@ void leave_mm(int cpu)
23853 BUG();
23854 cpumask_clear_cpu(cpu,
23855 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
23856+
23857+#ifndef CONFIG_PAX_PER_CPU_PGD
23858 load_cr3(swapper_pg_dir);
23859+#endif
23860+
23861 }
23862 EXPORT_SYMBOL_GPL(leave_mm);
23863
23864diff -urNp linux-2.6.32.46/arch/x86/oprofile/backtrace.c linux-2.6.32.46/arch/x86/oprofile/backtrace.c
23865--- linux-2.6.32.46/arch/x86/oprofile/backtrace.c 2011-03-27 14:31:47.000000000 -0400
23866+++ linux-2.6.32.46/arch/x86/oprofile/backtrace.c 2011-04-17 15:56:46.000000000 -0400
23867@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
23868 struct frame_head bufhead[2];
23869
23870 /* Also check accessibility of one struct frame_head beyond */
23871- if (!access_ok(VERIFY_READ, head, sizeof(bufhead)))
23872+ if (!__access_ok(VERIFY_READ, head, sizeof(bufhead)))
23873 return NULL;
23874 if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead)))
23875 return NULL;
23876@@ -77,7 +77,7 @@ x86_backtrace(struct pt_regs * const reg
23877 {
23878 struct frame_head *head = (struct frame_head *)frame_pointer(regs);
23879
23880- if (!user_mode_vm(regs)) {
23881+ if (!user_mode(regs)) {
23882 unsigned long stack = kernel_stack_pointer(regs);
23883 if (depth)
23884 dump_trace(NULL, regs, (unsigned long *)stack, 0,
23885diff -urNp linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c
23886--- linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c 2011-03-27 14:31:47.000000000 -0400
23887+++ linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:56:46.000000000 -0400
23888@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
23889 #endif
23890 }
23891
23892-static int inline addr_increment(void)
23893+static inline int addr_increment(void)
23894 {
23895 #ifdef CONFIG_SMP
23896 return smp_num_siblings == 2 ? 2 : 1;
23897diff -urNp linux-2.6.32.46/arch/x86/pci/common.c linux-2.6.32.46/arch/x86/pci/common.c
23898--- linux-2.6.32.46/arch/x86/pci/common.c 2011-03-27 14:31:47.000000000 -0400
23899+++ linux-2.6.32.46/arch/x86/pci/common.c 2011-04-23 12:56:10.000000000 -0400
23900@@ -31,8 +31,8 @@ int noioapicreroute = 1;
23901 int pcibios_last_bus = -1;
23902 unsigned long pirq_table_addr;
23903 struct pci_bus *pci_root_bus;
23904-struct pci_raw_ops *raw_pci_ops;
23905-struct pci_raw_ops *raw_pci_ext_ops;
23906+const struct pci_raw_ops *raw_pci_ops;
23907+const struct pci_raw_ops *raw_pci_ext_ops;
23908
23909 int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
23910 int reg, int len, u32 *val)
23911diff -urNp linux-2.6.32.46/arch/x86/pci/direct.c linux-2.6.32.46/arch/x86/pci/direct.c
23912--- linux-2.6.32.46/arch/x86/pci/direct.c 2011-03-27 14:31:47.000000000 -0400
23913+++ linux-2.6.32.46/arch/x86/pci/direct.c 2011-04-17 15:56:46.000000000 -0400
23914@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
23915
23916 #undef PCI_CONF1_ADDRESS
23917
23918-struct pci_raw_ops pci_direct_conf1 = {
23919+const struct pci_raw_ops pci_direct_conf1 = {
23920 .read = pci_conf1_read,
23921 .write = pci_conf1_write,
23922 };
23923@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int
23924
23925 #undef PCI_CONF2_ADDRESS
23926
23927-struct pci_raw_ops pci_direct_conf2 = {
23928+const struct pci_raw_ops pci_direct_conf2 = {
23929 .read = pci_conf2_read,
23930 .write = pci_conf2_write,
23931 };
23932@@ -189,7 +189,7 @@ struct pci_raw_ops pci_direct_conf2 = {
23933 * This should be close to trivial, but it isn't, because there are buggy
23934 * chipsets (yes, you guessed it, by Intel and Compaq) that have no class ID.
23935 */
23936-static int __init pci_sanity_check(struct pci_raw_ops *o)
23937+static int __init pci_sanity_check(const struct pci_raw_ops *o)
23938 {
23939 u32 x = 0;
23940 int year, devfn;
23941diff -urNp linux-2.6.32.46/arch/x86/pci/mmconfig_32.c linux-2.6.32.46/arch/x86/pci/mmconfig_32.c
23942--- linux-2.6.32.46/arch/x86/pci/mmconfig_32.c 2011-03-27 14:31:47.000000000 -0400
23943+++ linux-2.6.32.46/arch/x86/pci/mmconfig_32.c 2011-04-17 15:56:46.000000000 -0400
23944@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
23945 return 0;
23946 }
23947
23948-static struct pci_raw_ops pci_mmcfg = {
23949+static const struct pci_raw_ops pci_mmcfg = {
23950 .read = pci_mmcfg_read,
23951 .write = pci_mmcfg_write,
23952 };
23953diff -urNp linux-2.6.32.46/arch/x86/pci/mmconfig_64.c linux-2.6.32.46/arch/x86/pci/mmconfig_64.c
23954--- linux-2.6.32.46/arch/x86/pci/mmconfig_64.c 2011-03-27 14:31:47.000000000 -0400
23955+++ linux-2.6.32.46/arch/x86/pci/mmconfig_64.c 2011-04-17 15:56:46.000000000 -0400
23956@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
23957 return 0;
23958 }
23959
23960-static struct pci_raw_ops pci_mmcfg = {
23961+static const struct pci_raw_ops pci_mmcfg = {
23962 .read = pci_mmcfg_read,
23963 .write = pci_mmcfg_write,
23964 };
23965diff -urNp linux-2.6.32.46/arch/x86/pci/numaq_32.c linux-2.6.32.46/arch/x86/pci/numaq_32.c
23966--- linux-2.6.32.46/arch/x86/pci/numaq_32.c 2011-03-27 14:31:47.000000000 -0400
23967+++ linux-2.6.32.46/arch/x86/pci/numaq_32.c 2011-04-17 15:56:46.000000000 -0400
23968@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
23969
23970 #undef PCI_CONF1_MQ_ADDRESS
23971
23972-static struct pci_raw_ops pci_direct_conf1_mq = {
23973+static const struct pci_raw_ops pci_direct_conf1_mq = {
23974 .read = pci_conf1_mq_read,
23975 .write = pci_conf1_mq_write
23976 };
23977diff -urNp linux-2.6.32.46/arch/x86/pci/olpc.c linux-2.6.32.46/arch/x86/pci/olpc.c
23978--- linux-2.6.32.46/arch/x86/pci/olpc.c 2011-03-27 14:31:47.000000000 -0400
23979+++ linux-2.6.32.46/arch/x86/pci/olpc.c 2011-04-17 15:56:46.000000000 -0400
23980@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
23981 return 0;
23982 }
23983
23984-static struct pci_raw_ops pci_olpc_conf = {
23985+static const struct pci_raw_ops pci_olpc_conf = {
23986 .read = pci_olpc_read,
23987 .write = pci_olpc_write,
23988 };
23989diff -urNp linux-2.6.32.46/arch/x86/pci/pcbios.c linux-2.6.32.46/arch/x86/pci/pcbios.c
23990--- linux-2.6.32.46/arch/x86/pci/pcbios.c 2011-03-27 14:31:47.000000000 -0400
23991+++ linux-2.6.32.46/arch/x86/pci/pcbios.c 2011-04-17 15:56:46.000000000 -0400
23992@@ -56,50 +56,93 @@ union bios32 {
23993 static struct {
23994 unsigned long address;
23995 unsigned short segment;
23996-} bios32_indirect = { 0, __KERNEL_CS };
23997+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
23998
23999 /*
24000 * Returns the entry point for the given service, NULL on error
24001 */
24002
24003-static unsigned long bios32_service(unsigned long service)
24004+static unsigned long __devinit bios32_service(unsigned long service)
24005 {
24006 unsigned char return_code; /* %al */
24007 unsigned long address; /* %ebx */
24008 unsigned long length; /* %ecx */
24009 unsigned long entry; /* %edx */
24010 unsigned long flags;
24011+ struct desc_struct d, *gdt;
24012
24013 local_irq_save(flags);
24014- __asm__("lcall *(%%edi); cld"
24015+
24016+ gdt = get_cpu_gdt_table(smp_processor_id());
24017+
24018+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
24019+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
24020+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
24021+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
24022+
24023+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
24024 : "=a" (return_code),
24025 "=b" (address),
24026 "=c" (length),
24027 "=d" (entry)
24028 : "0" (service),
24029 "1" (0),
24030- "D" (&bios32_indirect));
24031+ "D" (&bios32_indirect),
24032+ "r"(__PCIBIOS_DS)
24033+ : "memory");
24034+
24035+ pax_open_kernel();
24036+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
24037+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
24038+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
24039+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
24040+ pax_close_kernel();
24041+
24042 local_irq_restore(flags);
24043
24044 switch (return_code) {
24045- case 0:
24046- return address + entry;
24047- case 0x80: /* Not present */
24048- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
24049- return 0;
24050- default: /* Shouldn't happen */
24051- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
24052- service, return_code);
24053+ case 0: {
24054+ int cpu;
24055+ unsigned char flags;
24056+
24057+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
24058+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
24059+ printk(KERN_WARNING "bios32_service: not valid\n");
24060 return 0;
24061+ }
24062+ address = address + PAGE_OFFSET;
24063+ length += 16UL; /* some BIOSs underreport this... */
24064+ flags = 4;
24065+ if (length >= 64*1024*1024) {
24066+ length >>= PAGE_SHIFT;
24067+ flags |= 8;
24068+ }
24069+
24070+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
24071+ gdt = get_cpu_gdt_table(cpu);
24072+ pack_descriptor(&d, address, length, 0x9b, flags);
24073+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
24074+ pack_descriptor(&d, address, length, 0x93, flags);
24075+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
24076+ }
24077+ return entry;
24078+ }
24079+ case 0x80: /* Not present */
24080+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
24081+ return 0;
24082+ default: /* Shouldn't happen */
24083+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
24084+ service, return_code);
24085+ return 0;
24086 }
24087 }
24088
24089 static struct {
24090 unsigned long address;
24091 unsigned short segment;
24092-} pci_indirect = { 0, __KERNEL_CS };
24093+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
24094
24095-static int pci_bios_present;
24096+static int pci_bios_present __read_only;
24097
24098 static int __devinit check_pcibios(void)
24099 {
24100@@ -108,11 +151,13 @@ static int __devinit check_pcibios(void)
24101 unsigned long flags, pcibios_entry;
24102
24103 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
24104- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
24105+ pci_indirect.address = pcibios_entry;
24106
24107 local_irq_save(flags);
24108- __asm__(
24109- "lcall *(%%edi); cld\n\t"
24110+ __asm__("movw %w6, %%ds\n\t"
24111+ "lcall *%%ss:(%%edi); cld\n\t"
24112+ "push %%ss\n\t"
24113+ "pop %%ds\n\t"
24114 "jc 1f\n\t"
24115 "xor %%ah, %%ah\n"
24116 "1:"
24117@@ -121,7 +166,8 @@ static int __devinit check_pcibios(void)
24118 "=b" (ebx),
24119 "=c" (ecx)
24120 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
24121- "D" (&pci_indirect)
24122+ "D" (&pci_indirect),
24123+ "r" (__PCIBIOS_DS)
24124 : "memory");
24125 local_irq_restore(flags);
24126
24127@@ -165,7 +211,10 @@ static int pci_bios_read(unsigned int se
24128
24129 switch (len) {
24130 case 1:
24131- __asm__("lcall *(%%esi); cld\n\t"
24132+ __asm__("movw %w6, %%ds\n\t"
24133+ "lcall *%%ss:(%%esi); cld\n\t"
24134+ "push %%ss\n\t"
24135+ "pop %%ds\n\t"
24136 "jc 1f\n\t"
24137 "xor %%ah, %%ah\n"
24138 "1:"
24139@@ -174,7 +223,8 @@ static int pci_bios_read(unsigned int se
24140 : "1" (PCIBIOS_READ_CONFIG_BYTE),
24141 "b" (bx),
24142 "D" ((long)reg),
24143- "S" (&pci_indirect));
24144+ "S" (&pci_indirect),
24145+ "r" (__PCIBIOS_DS));
24146 /*
24147 * Zero-extend the result beyond 8 bits, do not trust the
24148 * BIOS having done it:
24149@@ -182,7 +232,10 @@ static int pci_bios_read(unsigned int se
24150 *value &= 0xff;
24151 break;
24152 case 2:
24153- __asm__("lcall *(%%esi); cld\n\t"
24154+ __asm__("movw %w6, %%ds\n\t"
24155+ "lcall *%%ss:(%%esi); cld\n\t"
24156+ "push %%ss\n\t"
24157+ "pop %%ds\n\t"
24158 "jc 1f\n\t"
24159 "xor %%ah, %%ah\n"
24160 "1:"
24161@@ -191,7 +244,8 @@ static int pci_bios_read(unsigned int se
24162 : "1" (PCIBIOS_READ_CONFIG_WORD),
24163 "b" (bx),
24164 "D" ((long)reg),
24165- "S" (&pci_indirect));
24166+ "S" (&pci_indirect),
24167+ "r" (__PCIBIOS_DS));
24168 /*
24169 * Zero-extend the result beyond 16 bits, do not trust the
24170 * BIOS having done it:
24171@@ -199,7 +253,10 @@ static int pci_bios_read(unsigned int se
24172 *value &= 0xffff;
24173 break;
24174 case 4:
24175- __asm__("lcall *(%%esi); cld\n\t"
24176+ __asm__("movw %w6, %%ds\n\t"
24177+ "lcall *%%ss:(%%esi); cld\n\t"
24178+ "push %%ss\n\t"
24179+ "pop %%ds\n\t"
24180 "jc 1f\n\t"
24181 "xor %%ah, %%ah\n"
24182 "1:"
24183@@ -208,7 +265,8 @@ static int pci_bios_read(unsigned int se
24184 : "1" (PCIBIOS_READ_CONFIG_DWORD),
24185 "b" (bx),
24186 "D" ((long)reg),
24187- "S" (&pci_indirect));
24188+ "S" (&pci_indirect),
24189+ "r" (__PCIBIOS_DS));
24190 break;
24191 }
24192
24193@@ -231,7 +289,10 @@ static int pci_bios_write(unsigned int s
24194
24195 switch (len) {
24196 case 1:
24197- __asm__("lcall *(%%esi); cld\n\t"
24198+ __asm__("movw %w6, %%ds\n\t"
24199+ "lcall *%%ss:(%%esi); cld\n\t"
24200+ "push %%ss\n\t"
24201+ "pop %%ds\n\t"
24202 "jc 1f\n\t"
24203 "xor %%ah, %%ah\n"
24204 "1:"
24205@@ -240,10 +301,14 @@ static int pci_bios_write(unsigned int s
24206 "c" (value),
24207 "b" (bx),
24208 "D" ((long)reg),
24209- "S" (&pci_indirect));
24210+ "S" (&pci_indirect),
24211+ "r" (__PCIBIOS_DS));
24212 break;
24213 case 2:
24214- __asm__("lcall *(%%esi); cld\n\t"
24215+ __asm__("movw %w6, %%ds\n\t"
24216+ "lcall *%%ss:(%%esi); cld\n\t"
24217+ "push %%ss\n\t"
24218+ "pop %%ds\n\t"
24219 "jc 1f\n\t"
24220 "xor %%ah, %%ah\n"
24221 "1:"
24222@@ -252,10 +317,14 @@ static int pci_bios_write(unsigned int s
24223 "c" (value),
24224 "b" (bx),
24225 "D" ((long)reg),
24226- "S" (&pci_indirect));
24227+ "S" (&pci_indirect),
24228+ "r" (__PCIBIOS_DS));
24229 break;
24230 case 4:
24231- __asm__("lcall *(%%esi); cld\n\t"
24232+ __asm__("movw %w6, %%ds\n\t"
24233+ "lcall *%%ss:(%%esi); cld\n\t"
24234+ "push %%ss\n\t"
24235+ "pop %%ds\n\t"
24236 "jc 1f\n\t"
24237 "xor %%ah, %%ah\n"
24238 "1:"
24239@@ -264,7 +333,8 @@ static int pci_bios_write(unsigned int s
24240 "c" (value),
24241 "b" (bx),
24242 "D" ((long)reg),
24243- "S" (&pci_indirect));
24244+ "S" (&pci_indirect),
24245+ "r" (__PCIBIOS_DS));
24246 break;
24247 }
24248
24249@@ -278,7 +348,7 @@ static int pci_bios_write(unsigned int s
24250 * Function table for BIOS32 access
24251 */
24252
24253-static struct pci_raw_ops pci_bios_access = {
24254+static const struct pci_raw_ops pci_bios_access = {
24255 .read = pci_bios_read,
24256 .write = pci_bios_write
24257 };
24258@@ -287,7 +357,7 @@ static struct pci_raw_ops pci_bios_acces
24259 * Try to find PCI BIOS.
24260 */
24261
24262-static struct pci_raw_ops * __devinit pci_find_bios(void)
24263+static const struct pci_raw_ops * __devinit pci_find_bios(void)
24264 {
24265 union bios32 *check;
24266 unsigned char sum;
24267@@ -368,10 +438,13 @@ struct irq_routing_table * pcibios_get_i
24268
24269 DBG("PCI: Fetching IRQ routing table... ");
24270 __asm__("push %%es\n\t"
24271+ "movw %w8, %%ds\n\t"
24272 "push %%ds\n\t"
24273 "pop %%es\n\t"
24274- "lcall *(%%esi); cld\n\t"
24275+ "lcall *%%ss:(%%esi); cld\n\t"
24276 "pop %%es\n\t"
24277+ "push %%ss\n\t"
24278+ "pop %%ds\n"
24279 "jc 1f\n\t"
24280 "xor %%ah, %%ah\n"
24281 "1:"
24282@@ -382,7 +455,8 @@ struct irq_routing_table * pcibios_get_i
24283 "1" (0),
24284 "D" ((long) &opt),
24285 "S" (&pci_indirect),
24286- "m" (opt)
24287+ "m" (opt),
24288+ "r" (__PCIBIOS_DS)
24289 : "memory");
24290 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
24291 if (ret & 0xff00)
24292@@ -406,7 +480,10 @@ int pcibios_set_irq_routing(struct pci_d
24293 {
24294 int ret;
24295
24296- __asm__("lcall *(%%esi); cld\n\t"
24297+ __asm__("movw %w5, %%ds\n\t"
24298+ "lcall *%%ss:(%%esi); cld\n\t"
24299+ "push %%ss\n\t"
24300+ "pop %%ds\n"
24301 "jc 1f\n\t"
24302 "xor %%ah, %%ah\n"
24303 "1:"
24304@@ -414,7 +491,8 @@ int pcibios_set_irq_routing(struct pci_d
24305 : "0" (PCIBIOS_SET_PCI_HW_INT),
24306 "b" ((dev->bus->number << 8) | dev->devfn),
24307 "c" ((irq << 8) | (pin + 10)),
24308- "S" (&pci_indirect));
24309+ "S" (&pci_indirect),
24310+ "r" (__PCIBIOS_DS));
24311 return !(ret & 0xff00);
24312 }
24313 EXPORT_SYMBOL(pcibios_set_irq_routing);
24314diff -urNp linux-2.6.32.46/arch/x86/power/cpu.c linux-2.6.32.46/arch/x86/power/cpu.c
24315--- linux-2.6.32.46/arch/x86/power/cpu.c 2011-03-27 14:31:47.000000000 -0400
24316+++ linux-2.6.32.46/arch/x86/power/cpu.c 2011-04-17 15:56:46.000000000 -0400
24317@@ -129,7 +129,7 @@ static void do_fpu_end(void)
24318 static void fix_processor_context(void)
24319 {
24320 int cpu = smp_processor_id();
24321- struct tss_struct *t = &per_cpu(init_tss, cpu);
24322+ struct tss_struct *t = init_tss + cpu;
24323
24324 set_tss_desc(cpu, t); /*
24325 * This just modifies memory; should not be
24326@@ -139,7 +139,9 @@ static void fix_processor_context(void)
24327 */
24328
24329 #ifdef CONFIG_X86_64
24330+ pax_open_kernel();
24331 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
24332+ pax_close_kernel();
24333
24334 syscall_init(); /* This sets MSR_*STAR and related */
24335 #endif
24336diff -urNp linux-2.6.32.46/arch/x86/vdso/Makefile linux-2.6.32.46/arch/x86/vdso/Makefile
24337--- linux-2.6.32.46/arch/x86/vdso/Makefile 2011-03-27 14:31:47.000000000 -0400
24338+++ linux-2.6.32.46/arch/x86/vdso/Makefile 2011-04-17 15:56:46.000000000 -0400
24339@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
24340 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
24341 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
24342
24343-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
24344+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
24345 GCOV_PROFILE := n
24346
24347 #
24348diff -urNp linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c
24349--- linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c 2011-03-27 14:31:47.000000000 -0400
24350+++ linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:56:46.000000000 -0400
24351@@ -22,24 +22,48 @@
24352 #include <asm/hpet.h>
24353 #include <asm/unistd.h>
24354 #include <asm/io.h>
24355+#include <asm/fixmap.h>
24356 #include "vextern.h"
24357
24358 #define gtod vdso_vsyscall_gtod_data
24359
24360+notrace noinline long __vdso_fallback_time(long *t)
24361+{
24362+ long secs;
24363+ asm volatile("syscall"
24364+ : "=a" (secs)
24365+ : "0" (__NR_time),"D" (t) : "r11", "cx", "memory");
24366+ return secs;
24367+}
24368+
24369 notrace static long vdso_fallback_gettime(long clock, struct timespec *ts)
24370 {
24371 long ret;
24372 asm("syscall" : "=a" (ret) :
24373- "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "memory");
24374+ "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "r11", "cx", "memory");
24375 return ret;
24376 }
24377
24378+notrace static inline cycle_t __vdso_vread_hpet(void)
24379+{
24380+ return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
24381+}
24382+
24383+notrace static inline cycle_t __vdso_vread_tsc(void)
24384+{
24385+ cycle_t ret = (cycle_t)vget_cycles();
24386+
24387+ return ret >= gtod->clock.cycle_last ? ret : gtod->clock.cycle_last;
24388+}
24389+
24390 notrace static inline long vgetns(void)
24391 {
24392 long v;
24393- cycles_t (*vread)(void);
24394- vread = gtod->clock.vread;
24395- v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
24396+ if (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3])
24397+ v = __vdso_vread_tsc();
24398+ else
24399+ v = __vdso_vread_hpet();
24400+ v = (v - gtod->clock.cycle_last) & gtod->clock.mask;
24401 return (v * gtod->clock.mult) >> gtod->clock.shift;
24402 }
24403
24404@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic
24405
24406 notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
24407 {
24408- if (likely(gtod->sysctl_enabled))
24409+ if (likely(gtod->sysctl_enabled &&
24410+ ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) ||
24411+ (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]))))
24412 switch (clock) {
24413 case CLOCK_REALTIME:
24414 if (likely(gtod->clock.vread))
24415@@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid
24416 int clock_gettime(clockid_t, struct timespec *)
24417 __attribute__((weak, alias("__vdso_clock_gettime")));
24418
24419-notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
24420+notrace noinline int __vdso_fallback_gettimeofday(struct timeval *tv, struct timezone *tz)
24421 {
24422 long ret;
24423- if (likely(gtod->sysctl_enabled && gtod->clock.vread)) {
24424+ asm("syscall" : "=a" (ret) :
24425+ "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "r11", "cx", "memory");
24426+ return ret;
24427+}
24428+
24429+notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
24430+{
24431+ if (likely(gtod->sysctl_enabled &&
24432+ ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) ||
24433+ (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]))))
24434+ {
24435 if (likely(tv != NULL)) {
24436 BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
24437 offsetof(struct timespec, tv_nsec) ||
24438@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct t
24439 }
24440 return 0;
24441 }
24442- asm("syscall" : "=a" (ret) :
24443- "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory");
24444- return ret;
24445+ return __vdso_fallback_gettimeofday(tv, tz);
24446 }
24447 int gettimeofday(struct timeval *, struct timezone *)
24448 __attribute__((weak, alias("__vdso_gettimeofday")));
24449diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c
24450--- linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c 2011-03-27 14:31:47.000000000 -0400
24451+++ linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c 2011-04-23 12:56:10.000000000 -0400
24452@@ -25,6 +25,7 @@
24453 #include <asm/tlbflush.h>
24454 #include <asm/vdso.h>
24455 #include <asm/proto.h>
24456+#include <asm/mman.h>
24457
24458 enum {
24459 VDSO_DISABLED = 0,
24460@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int m
24461 void enable_sep_cpu(void)
24462 {
24463 int cpu = get_cpu();
24464- struct tss_struct *tss = &per_cpu(init_tss, cpu);
24465+ struct tss_struct *tss = init_tss + cpu;
24466
24467 if (!boot_cpu_has(X86_FEATURE_SEP)) {
24468 put_cpu();
24469@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
24470 gate_vma.vm_start = FIXADDR_USER_START;
24471 gate_vma.vm_end = FIXADDR_USER_END;
24472 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
24473- gate_vma.vm_page_prot = __P101;
24474+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
24475 /*
24476 * Make sure the vDSO gets into every core dump.
24477 * Dumping its contents makes post-mortem fully interpretable later
24478@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct l
24479 if (compat)
24480 addr = VDSO_HIGH_BASE;
24481 else {
24482- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
24483+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
24484 if (IS_ERR_VALUE(addr)) {
24485 ret = addr;
24486 goto up_fail;
24487 }
24488 }
24489
24490- current->mm->context.vdso = (void *)addr;
24491+ current->mm->context.vdso = addr;
24492
24493 if (compat_uses_vma || !compat) {
24494 /*
24495@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct l
24496 }
24497
24498 current_thread_info()->sysenter_return =
24499- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
24500+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
24501
24502 up_fail:
24503 if (ret)
24504- current->mm->context.vdso = NULL;
24505+ current->mm->context.vdso = 0;
24506
24507 up_write(&mm->mmap_sem);
24508
24509@@ -413,8 +414,14 @@ __initcall(ia32_binfmt_init);
24510
24511 const char *arch_vma_name(struct vm_area_struct *vma)
24512 {
24513- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
24514+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
24515 return "[vdso]";
24516+
24517+#ifdef CONFIG_PAX_SEGMEXEC
24518+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
24519+ return "[vdso]";
24520+#endif
24521+
24522 return NULL;
24523 }
24524
24525@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(stru
24526 struct mm_struct *mm = tsk->mm;
24527
24528 /* Check to see if this task was created in compat vdso mode */
24529- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
24530+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
24531 return &gate_vma;
24532 return NULL;
24533 }
24534diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso.lds.S linux-2.6.32.46/arch/x86/vdso/vdso.lds.S
24535--- linux-2.6.32.46/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.000000000 -0400
24536+++ linux-2.6.32.46/arch/x86/vdso/vdso.lds.S 2011-06-06 17:35:35.000000000 -0400
24537@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
24538 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
24539 #include "vextern.h"
24540 #undef VEXTERN
24541+
24542+#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x;
24543+VEXTERN(fallback_gettimeofday)
24544+VEXTERN(fallback_time)
24545+VEXTERN(getcpu)
24546+#undef VEXTERN
24547diff -urNp linux-2.6.32.46/arch/x86/vdso/vextern.h linux-2.6.32.46/arch/x86/vdso/vextern.h
24548--- linux-2.6.32.46/arch/x86/vdso/vextern.h 2011-03-27 14:31:47.000000000 -0400
24549+++ linux-2.6.32.46/arch/x86/vdso/vextern.h 2011-04-17 15:56:46.000000000 -0400
24550@@ -11,6 +11,5 @@
24551 put into vextern.h and be referenced as a pointer with vdso prefix.
24552 The main kernel later fills in the values. */
24553
24554-VEXTERN(jiffies)
24555 VEXTERN(vgetcpu_mode)
24556 VEXTERN(vsyscall_gtod_data)
24557diff -urNp linux-2.6.32.46/arch/x86/vdso/vma.c linux-2.6.32.46/arch/x86/vdso/vma.c
24558--- linux-2.6.32.46/arch/x86/vdso/vma.c 2011-03-27 14:31:47.000000000 -0400
24559+++ linux-2.6.32.46/arch/x86/vdso/vma.c 2011-08-23 20:24:19.000000000 -0400
24560@@ -17,8 +17,6 @@
24561 #include "vextern.h" /* Just for VMAGIC. */
24562 #undef VEXTERN
24563
24564-unsigned int __read_mostly vdso_enabled = 1;
24565-
24566 extern char vdso_start[], vdso_end[];
24567 extern unsigned short vdso_sync_cpuid;
24568
24569@@ -27,10 +25,8 @@ static unsigned vdso_size;
24570
24571 static inline void *var_ref(void *p, char *name)
24572 {
24573- if (*(void **)p != (void *)VMAGIC) {
24574- printk("VDSO: variable %s broken\n", name);
24575- vdso_enabled = 0;
24576- }
24577+ if (*(void **)p != (void *)VMAGIC)
24578+ panic("VDSO: variable %s broken\n", name);
24579 return p;
24580 }
24581
24582@@ -57,21 +53,18 @@ static int __init init_vdso_vars(void)
24583 if (!vbase)
24584 goto oom;
24585
24586- if (memcmp(vbase, "\177ELF", 4)) {
24587- printk("VDSO: I'm broken; not ELF\n");
24588- vdso_enabled = 0;
24589- }
24590+ if (memcmp(vbase, ELFMAG, SELFMAG))
24591+ panic("VDSO: I'm broken; not ELF\n");
24592
24593 #define VEXTERN(x) \
24594 *(typeof(__ ## x) **) var_ref(VDSO64_SYMBOL(vbase, x), #x) = &__ ## x;
24595 #include "vextern.h"
24596 #undef VEXTERN
24597+ vunmap(vbase);
24598 return 0;
24599
24600 oom:
24601- printk("Cannot allocate vdso\n");
24602- vdso_enabled = 0;
24603- return -ENOMEM;
24604+ panic("Cannot allocate vdso\n");
24605 }
24606 __initcall(init_vdso_vars);
24607
24608@@ -105,9 +98,6 @@ int arch_setup_additional_pages(struct l
24609 unsigned long addr;
24610 int ret;
24611
24612- if (!vdso_enabled)
24613- return 0;
24614-
24615 down_write(&mm->mmap_sem);
24616 addr = vdso_addr(mm->start_stack, vdso_size);
24617 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
24618@@ -116,7 +106,7 @@ int arch_setup_additional_pages(struct l
24619 goto up_fail;
24620 }
24621
24622- current->mm->context.vdso = (void *)addr;
24623+ current->mm->context.vdso = addr;
24624
24625 ret = install_special_mapping(mm, addr, vdso_size,
24626 VM_READ|VM_EXEC|
24627@@ -124,7 +114,7 @@ int arch_setup_additional_pages(struct l
24628 VM_ALWAYSDUMP,
24629 vdso_pages);
24630 if (ret) {
24631- current->mm->context.vdso = NULL;
24632+ current->mm->context.vdso = 0;
24633 goto up_fail;
24634 }
24635
24636@@ -132,10 +122,3 @@ up_fail:
24637 up_write(&mm->mmap_sem);
24638 return ret;
24639 }
24640-
24641-static __init int vdso_setup(char *s)
24642-{
24643- vdso_enabled = simple_strtoul(s, NULL, 0);
24644- return 0;
24645-}
24646-__setup("vdso=", vdso_setup);
24647diff -urNp linux-2.6.32.46/arch/x86/xen/enlighten.c linux-2.6.32.46/arch/x86/xen/enlighten.c
24648--- linux-2.6.32.46/arch/x86/xen/enlighten.c 2011-03-27 14:31:47.000000000 -0400
24649+++ linux-2.6.32.46/arch/x86/xen/enlighten.c 2011-05-22 23:02:03.000000000 -0400
24650@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
24651
24652 struct shared_info xen_dummy_shared_info;
24653
24654-void *xen_initial_gdt;
24655-
24656 /*
24657 * Point at some empty memory to start with. We map the real shared_info
24658 * page as soon as fixmap is up and running.
24659@@ -548,7 +546,7 @@ static void xen_write_idt_entry(gate_des
24660
24661 preempt_disable();
24662
24663- start = __get_cpu_var(idt_desc).address;
24664+ start = (unsigned long)__get_cpu_var(idt_desc).address;
24665 end = start + __get_cpu_var(idt_desc).size + 1;
24666
24667 xen_mc_flush();
24668@@ -993,7 +991,7 @@ static const struct pv_apic_ops xen_apic
24669 #endif
24670 };
24671
24672-static void xen_reboot(int reason)
24673+static __noreturn void xen_reboot(int reason)
24674 {
24675 struct sched_shutdown r = { .reason = reason };
24676
24677@@ -1001,17 +999,17 @@ static void xen_reboot(int reason)
24678 BUG();
24679 }
24680
24681-static void xen_restart(char *msg)
24682+static __noreturn void xen_restart(char *msg)
24683 {
24684 xen_reboot(SHUTDOWN_reboot);
24685 }
24686
24687-static void xen_emergency_restart(void)
24688+static __noreturn void xen_emergency_restart(void)
24689 {
24690 xen_reboot(SHUTDOWN_reboot);
24691 }
24692
24693-static void xen_machine_halt(void)
24694+static __noreturn void xen_machine_halt(void)
24695 {
24696 xen_reboot(SHUTDOWN_poweroff);
24697 }
24698@@ -1095,9 +1093,20 @@ asmlinkage void __init xen_start_kernel(
24699 */
24700 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
24701
24702-#ifdef CONFIG_X86_64
24703 /* Work out if we support NX */
24704- check_efer();
24705+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
24706+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
24707+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
24708+ unsigned l, h;
24709+
24710+#ifdef CONFIG_X86_PAE
24711+ nx_enabled = 1;
24712+#endif
24713+ __supported_pte_mask |= _PAGE_NX;
24714+ rdmsr(MSR_EFER, l, h);
24715+ l |= EFER_NX;
24716+ wrmsr(MSR_EFER, l, h);
24717+ }
24718 #endif
24719
24720 xen_setup_features();
24721@@ -1129,13 +1138,6 @@ asmlinkage void __init xen_start_kernel(
24722
24723 machine_ops = xen_machine_ops;
24724
24725- /*
24726- * The only reliable way to retain the initial address of the
24727- * percpu gdt_page is to remember it here, so we can go and
24728- * mark it RW later, when the initial percpu area is freed.
24729- */
24730- xen_initial_gdt = &per_cpu(gdt_page, 0);
24731-
24732 xen_smp_init();
24733
24734 pgd = (pgd_t *)xen_start_info->pt_base;
24735diff -urNp linux-2.6.32.46/arch/x86/xen/mmu.c linux-2.6.32.46/arch/x86/xen/mmu.c
24736--- linux-2.6.32.46/arch/x86/xen/mmu.c 2011-07-13 17:23:04.000000000 -0400
24737+++ linux-2.6.32.46/arch/x86/xen/mmu.c 2011-08-24 18:35:52.000000000 -0400
24738@@ -1719,6 +1719,8 @@ __init pgd_t *xen_setup_kernel_pagetable
24739 convert_pfn_mfn(init_level4_pgt);
24740 convert_pfn_mfn(level3_ident_pgt);
24741 convert_pfn_mfn(level3_kernel_pgt);
24742+ convert_pfn_mfn(level3_vmalloc_pgt);
24743+ convert_pfn_mfn(level3_vmemmap_pgt);
24744
24745 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
24746 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
24747@@ -1737,7 +1739,10 @@ __init pgd_t *xen_setup_kernel_pagetable
24748 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
24749 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
24750 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
24751+ set_page_prot(level3_vmalloc_pgt, PAGE_KERNEL_RO);
24752+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
24753 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
24754+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
24755 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
24756 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
24757
24758@@ -1860,6 +1865,7 @@ static __init void xen_post_allocator_in
24759 pv_mmu_ops.set_pud = xen_set_pud;
24760 #if PAGETABLE_LEVELS == 4
24761 pv_mmu_ops.set_pgd = xen_set_pgd;
24762+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
24763 #endif
24764
24765 /* This will work as long as patching hasn't happened yet
24766@@ -1946,6 +1952,7 @@ static const struct pv_mmu_ops xen_mmu_o
24767 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
24768 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
24769 .set_pgd = xen_set_pgd_hyper,
24770+ .set_pgd_batched = xen_set_pgd_hyper,
24771
24772 .alloc_pud = xen_alloc_pmd_init,
24773 .release_pud = xen_release_pmd_init,
24774diff -urNp linux-2.6.32.46/arch/x86/xen/smp.c linux-2.6.32.46/arch/x86/xen/smp.c
24775--- linux-2.6.32.46/arch/x86/xen/smp.c 2011-03-27 14:31:47.000000000 -0400
24776+++ linux-2.6.32.46/arch/x86/xen/smp.c 2011-05-11 18:25:15.000000000 -0400
24777@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
24778 {
24779 BUG_ON(smp_processor_id() != 0);
24780 native_smp_prepare_boot_cpu();
24781-
24782- /* We've switched to the "real" per-cpu gdt, so make sure the
24783- old memory can be recycled */
24784- make_lowmem_page_readwrite(xen_initial_gdt);
24785-
24786 xen_setup_vcpu_info_placement();
24787 }
24788
24789@@ -231,12 +226,12 @@ cpu_initialize_context(unsigned int cpu,
24790 gdt = get_cpu_gdt_table(cpu);
24791
24792 ctxt->flags = VGCF_IN_KERNEL;
24793- ctxt->user_regs.ds = __USER_DS;
24794- ctxt->user_regs.es = __USER_DS;
24795+ ctxt->user_regs.ds = __KERNEL_DS;
24796+ ctxt->user_regs.es = __KERNEL_DS;
24797 ctxt->user_regs.ss = __KERNEL_DS;
24798 #ifdef CONFIG_X86_32
24799 ctxt->user_regs.fs = __KERNEL_PERCPU;
24800- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
24801+ savesegment(gs, ctxt->user_regs.gs);
24802 #else
24803 ctxt->gs_base_kernel = per_cpu_offset(cpu);
24804 #endif
24805@@ -287,13 +282,12 @@ static int __cpuinit xen_cpu_up(unsigned
24806 int rc;
24807
24808 per_cpu(current_task, cpu) = idle;
24809+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
24810 #ifdef CONFIG_X86_32
24811 irq_ctx_init(cpu);
24812 #else
24813 clear_tsk_thread_flag(idle, TIF_FORK);
24814- per_cpu(kernel_stack, cpu) =
24815- (unsigned long)task_stack_page(idle) -
24816- KERNEL_STACK_OFFSET + THREAD_SIZE;
24817+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
24818 #endif
24819 xen_setup_runstate_info(cpu);
24820 xen_setup_timer(cpu);
24821diff -urNp linux-2.6.32.46/arch/x86/xen/xen-asm_32.S linux-2.6.32.46/arch/x86/xen/xen-asm_32.S
24822--- linux-2.6.32.46/arch/x86/xen/xen-asm_32.S 2011-03-27 14:31:47.000000000 -0400
24823+++ linux-2.6.32.46/arch/x86/xen/xen-asm_32.S 2011-04-22 19:13:13.000000000 -0400
24824@@ -83,14 +83,14 @@ ENTRY(xen_iret)
24825 ESP_OFFSET=4 # bytes pushed onto stack
24826
24827 /*
24828- * Store vcpu_info pointer for easy access. Do it this way to
24829- * avoid having to reload %fs
24830+ * Store vcpu_info pointer for easy access.
24831 */
24832 #ifdef CONFIG_SMP
24833- GET_THREAD_INFO(%eax)
24834- movl TI_cpu(%eax), %eax
24835- movl __per_cpu_offset(,%eax,4), %eax
24836- mov per_cpu__xen_vcpu(%eax), %eax
24837+ push %fs
24838+ mov $(__KERNEL_PERCPU), %eax
24839+ mov %eax, %fs
24840+ mov PER_CPU_VAR(xen_vcpu), %eax
24841+ pop %fs
24842 #else
24843 movl per_cpu__xen_vcpu, %eax
24844 #endif
24845diff -urNp linux-2.6.32.46/arch/x86/xen/xen-head.S linux-2.6.32.46/arch/x86/xen/xen-head.S
24846--- linux-2.6.32.46/arch/x86/xen/xen-head.S 2011-03-27 14:31:47.000000000 -0400
24847+++ linux-2.6.32.46/arch/x86/xen/xen-head.S 2011-04-17 15:56:46.000000000 -0400
24848@@ -19,6 +19,17 @@ ENTRY(startup_xen)
24849 #ifdef CONFIG_X86_32
24850 mov %esi,xen_start_info
24851 mov $init_thread_union+THREAD_SIZE,%esp
24852+#ifdef CONFIG_SMP
24853+ movl $cpu_gdt_table,%edi
24854+ movl $__per_cpu_load,%eax
24855+ movw %ax,__KERNEL_PERCPU + 2(%edi)
24856+ rorl $16,%eax
24857+ movb %al,__KERNEL_PERCPU + 4(%edi)
24858+ movb %ah,__KERNEL_PERCPU + 7(%edi)
24859+ movl $__per_cpu_end - 1,%eax
24860+ subl $__per_cpu_start,%eax
24861+ movw %ax,__KERNEL_PERCPU + 0(%edi)
24862+#endif
24863 #else
24864 mov %rsi,xen_start_info
24865 mov $init_thread_union+THREAD_SIZE,%rsp
24866diff -urNp linux-2.6.32.46/arch/x86/xen/xen-ops.h linux-2.6.32.46/arch/x86/xen/xen-ops.h
24867--- linux-2.6.32.46/arch/x86/xen/xen-ops.h 2011-03-27 14:31:47.000000000 -0400
24868+++ linux-2.6.32.46/arch/x86/xen/xen-ops.h 2011-04-17 15:56:46.000000000 -0400
24869@@ -10,8 +10,6 @@
24870 extern const char xen_hypervisor_callback[];
24871 extern const char xen_failsafe_callback[];
24872
24873-extern void *xen_initial_gdt;
24874-
24875 struct trap_info;
24876 void xen_copy_trap_info(struct trap_info *traps);
24877
24878diff -urNp linux-2.6.32.46/block/blk-integrity.c linux-2.6.32.46/block/blk-integrity.c
24879--- linux-2.6.32.46/block/blk-integrity.c 2011-03-27 14:31:47.000000000 -0400
24880+++ linux-2.6.32.46/block/blk-integrity.c 2011-04-17 15:56:46.000000000 -0400
24881@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
24882 NULL,
24883 };
24884
24885-static struct sysfs_ops integrity_ops = {
24886+static const struct sysfs_ops integrity_ops = {
24887 .show = &integrity_attr_show,
24888 .store = &integrity_attr_store,
24889 };
24890diff -urNp linux-2.6.32.46/block/blk-iopoll.c linux-2.6.32.46/block/blk-iopoll.c
24891--- linux-2.6.32.46/block/blk-iopoll.c 2011-03-27 14:31:47.000000000 -0400
24892+++ linux-2.6.32.46/block/blk-iopoll.c 2011-04-17 15:56:46.000000000 -0400
24893@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
24894 }
24895 EXPORT_SYMBOL(blk_iopoll_complete);
24896
24897-static void blk_iopoll_softirq(struct softirq_action *h)
24898+static void blk_iopoll_softirq(void)
24899 {
24900 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
24901 int rearm = 0, budget = blk_iopoll_budget;
24902diff -urNp linux-2.6.32.46/block/blk-map.c linux-2.6.32.46/block/blk-map.c
24903--- linux-2.6.32.46/block/blk-map.c 2011-03-27 14:31:47.000000000 -0400
24904+++ linux-2.6.32.46/block/blk-map.c 2011-04-18 16:57:33.000000000 -0400
24905@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
24906 * direct dma. else, set up kernel bounce buffers
24907 */
24908 uaddr = (unsigned long) ubuf;
24909- if (blk_rq_aligned(q, ubuf, len) && !map_data)
24910+ if (blk_rq_aligned(q, (__force void *)ubuf, len) && !map_data)
24911 bio = bio_map_user(q, NULL, uaddr, len, reading, gfp_mask);
24912 else
24913 bio = bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask);
24914@@ -201,12 +201,13 @@ int blk_rq_map_user_iov(struct request_q
24915 for (i = 0; i < iov_count; i++) {
24916 unsigned long uaddr = (unsigned long)iov[i].iov_base;
24917
24918+ if (!iov[i].iov_len)
24919+ return -EINVAL;
24920+
24921 if (uaddr & queue_dma_alignment(q)) {
24922 unaligned = 1;
24923 break;
24924 }
24925- if (!iov[i].iov_len)
24926- return -EINVAL;
24927 }
24928
24929 if (unaligned || (q->dma_pad_mask & len) || map_data)
24930@@ -299,7 +300,7 @@ int blk_rq_map_kern(struct request_queue
24931 if (!len || !kbuf)
24932 return -EINVAL;
24933
24934- do_copy = !blk_rq_aligned(q, kbuf, len) || object_is_on_stack(kbuf);
24935+ do_copy = !blk_rq_aligned(q, kbuf, len) || object_starts_on_stack(kbuf);
24936 if (do_copy)
24937 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
24938 else
24939diff -urNp linux-2.6.32.46/block/blk-softirq.c linux-2.6.32.46/block/blk-softirq.c
24940--- linux-2.6.32.46/block/blk-softirq.c 2011-03-27 14:31:47.000000000 -0400
24941+++ linux-2.6.32.46/block/blk-softirq.c 2011-04-17 15:56:46.000000000 -0400
24942@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
24943 * Softirq action handler - move entries to local list and loop over them
24944 * while passing them to the queue registered handler.
24945 */
24946-static void blk_done_softirq(struct softirq_action *h)
24947+static void blk_done_softirq(void)
24948 {
24949 struct list_head *cpu_list, local_list;
24950
24951diff -urNp linux-2.6.32.46/block/blk-sysfs.c linux-2.6.32.46/block/blk-sysfs.c
24952--- linux-2.6.32.46/block/blk-sysfs.c 2011-05-10 22:12:01.000000000 -0400
24953+++ linux-2.6.32.46/block/blk-sysfs.c 2011-05-10 22:12:26.000000000 -0400
24954@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
24955 kmem_cache_free(blk_requestq_cachep, q);
24956 }
24957
24958-static struct sysfs_ops queue_sysfs_ops = {
24959+static const struct sysfs_ops queue_sysfs_ops = {
24960 .show = queue_attr_show,
24961 .store = queue_attr_store,
24962 };
24963diff -urNp linux-2.6.32.46/block/bsg.c linux-2.6.32.46/block/bsg.c
24964--- linux-2.6.32.46/block/bsg.c 2011-03-27 14:31:47.000000000 -0400
24965+++ linux-2.6.32.46/block/bsg.c 2011-10-06 09:37:08.000000000 -0400
24966@@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
24967 struct sg_io_v4 *hdr, struct bsg_device *bd,
24968 fmode_t has_write_perm)
24969 {
24970+ unsigned char tmpcmd[sizeof(rq->__cmd)];
24971+ unsigned char *cmdptr;
24972+
24973 if (hdr->request_len > BLK_MAX_CDB) {
24974 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
24975 if (!rq->cmd)
24976 return -ENOMEM;
24977- }
24978+ cmdptr = rq->cmd;
24979+ } else
24980+ cmdptr = tmpcmd;
24981
24982- if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request,
24983+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
24984 hdr->request_len))
24985 return -EFAULT;
24986
24987+ if (cmdptr != rq->cmd)
24988+ memcpy(rq->cmd, cmdptr, hdr->request_len);
24989+
24990 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
24991 if (blk_verify_command(rq->cmd, has_write_perm))
24992 return -EPERM;
24993@@ -282,7 +290,7 @@ bsg_map_hdr(struct bsg_device *bd, struc
24994 rq->next_rq = next_rq;
24995 next_rq->cmd_type = rq->cmd_type;
24996
24997- dxferp = (void*)(unsigned long)hdr->din_xferp;
24998+ dxferp = (void __user *)(unsigned long)hdr->din_xferp;
24999 ret = blk_rq_map_user(q, next_rq, NULL, dxferp,
25000 hdr->din_xfer_len, GFP_KERNEL);
25001 if (ret)
25002@@ -291,10 +299,10 @@ bsg_map_hdr(struct bsg_device *bd, struc
25003
25004 if (hdr->dout_xfer_len) {
25005 dxfer_len = hdr->dout_xfer_len;
25006- dxferp = (void*)(unsigned long)hdr->dout_xferp;
25007+ dxferp = (void __user *)(unsigned long)hdr->dout_xferp;
25008 } else if (hdr->din_xfer_len) {
25009 dxfer_len = hdr->din_xfer_len;
25010- dxferp = (void*)(unsigned long)hdr->din_xferp;
25011+ dxferp = (void __user *)(unsigned long)hdr->din_xferp;
25012 } else
25013 dxfer_len = 0;
25014
25015@@ -436,7 +444,7 @@ static int blk_complete_sgv4_hdr_rq(stru
25016 int len = min_t(unsigned int, hdr->max_response_len,
25017 rq->sense_len);
25018
25019- ret = copy_to_user((void*)(unsigned long)hdr->response,
25020+ ret = copy_to_user((void __user *)(unsigned long)hdr->response,
25021 rq->sense, len);
25022 if (!ret)
25023 hdr->response_len = len;
25024diff -urNp linux-2.6.32.46/block/compat_ioctl.c linux-2.6.32.46/block/compat_ioctl.c
25025--- linux-2.6.32.46/block/compat_ioctl.c 2011-03-27 14:31:47.000000000 -0400
25026+++ linux-2.6.32.46/block/compat_ioctl.c 2011-10-06 09:37:14.000000000 -0400
25027@@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_
25028 err |= __get_user(f->spec1, &uf->spec1);
25029 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
25030 err |= __get_user(name, &uf->name);
25031- f->name = compat_ptr(name);
25032+ f->name = (void __force_kernel *)compat_ptr(name);
25033 if (err) {
25034 err = -EFAULT;
25035 goto out;
25036diff -urNp linux-2.6.32.46/block/elevator.c linux-2.6.32.46/block/elevator.c
25037--- linux-2.6.32.46/block/elevator.c 2011-03-27 14:31:47.000000000 -0400
25038+++ linux-2.6.32.46/block/elevator.c 2011-04-17 15:56:46.000000000 -0400
25039@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
25040 return error;
25041 }
25042
25043-static struct sysfs_ops elv_sysfs_ops = {
25044+static const struct sysfs_ops elv_sysfs_ops = {
25045 .show = elv_attr_show,
25046 .store = elv_attr_store,
25047 };
25048diff -urNp linux-2.6.32.46/block/scsi_ioctl.c linux-2.6.32.46/block/scsi_ioctl.c
25049--- linux-2.6.32.46/block/scsi_ioctl.c 2011-03-27 14:31:47.000000000 -0400
25050+++ linux-2.6.32.46/block/scsi_ioctl.c 2011-04-23 13:28:22.000000000 -0400
25051@@ -220,8 +220,20 @@ EXPORT_SYMBOL(blk_verify_command);
25052 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
25053 struct sg_io_hdr *hdr, fmode_t mode)
25054 {
25055- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
25056+ unsigned char tmpcmd[sizeof(rq->__cmd)];
25057+ unsigned char *cmdptr;
25058+
25059+ if (rq->cmd != rq->__cmd)
25060+ cmdptr = rq->cmd;
25061+ else
25062+ cmdptr = tmpcmd;
25063+
25064+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
25065 return -EFAULT;
25066+
25067+ if (cmdptr != rq->cmd)
25068+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
25069+
25070 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
25071 return -EPERM;
25072
25073@@ -430,6 +442,8 @@ int sg_scsi_ioctl(struct request_queue *
25074 int err;
25075 unsigned int in_len, out_len, bytes, opcode, cmdlen;
25076 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
25077+ unsigned char tmpcmd[sizeof(rq->__cmd)];
25078+ unsigned char *cmdptr;
25079
25080 if (!sic)
25081 return -EINVAL;
25082@@ -463,9 +477,18 @@ int sg_scsi_ioctl(struct request_queue *
25083 */
25084 err = -EFAULT;
25085 rq->cmd_len = cmdlen;
25086- if (copy_from_user(rq->cmd, sic->data, cmdlen))
25087+
25088+ if (rq->cmd != rq->__cmd)
25089+ cmdptr = rq->cmd;
25090+ else
25091+ cmdptr = tmpcmd;
25092+
25093+ if (copy_from_user(cmdptr, sic->data, cmdlen))
25094 goto error;
25095
25096+ if (rq->cmd != cmdptr)
25097+ memcpy(rq->cmd, cmdptr, cmdlen);
25098+
25099 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
25100 goto error;
25101
25102diff -urNp linux-2.6.32.46/crypto/cryptd.c linux-2.6.32.46/crypto/cryptd.c
25103--- linux-2.6.32.46/crypto/cryptd.c 2011-03-27 14:31:47.000000000 -0400
25104+++ linux-2.6.32.46/crypto/cryptd.c 2011-08-23 21:22:32.000000000 -0400
25105@@ -50,7 +50,7 @@ struct cryptd_blkcipher_ctx {
25106
25107 struct cryptd_blkcipher_request_ctx {
25108 crypto_completion_t complete;
25109-};
25110+} __no_const;
25111
25112 struct cryptd_hash_ctx {
25113 struct crypto_shash *child;
25114diff -urNp linux-2.6.32.46/crypto/gf128mul.c linux-2.6.32.46/crypto/gf128mul.c
25115--- linux-2.6.32.46/crypto/gf128mul.c 2011-03-27 14:31:47.000000000 -0400
25116+++ linux-2.6.32.46/crypto/gf128mul.c 2011-07-06 19:53:33.000000000 -0400
25117@@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128
25118 for (i = 0; i < 7; ++i)
25119 gf128mul_x_lle(&p[i + 1], &p[i]);
25120
25121- memset(r, 0, sizeof(r));
25122+ memset(r, 0, sizeof(*r));
25123 for (i = 0;;) {
25124 u8 ch = ((u8 *)b)[15 - i];
25125
25126@@ -220,7 +220,7 @@ void gf128mul_bbe(be128 *r, const be128
25127 for (i = 0; i < 7; ++i)
25128 gf128mul_x_bbe(&p[i + 1], &p[i]);
25129
25130- memset(r, 0, sizeof(r));
25131+ memset(r, 0, sizeof(*r));
25132 for (i = 0;;) {
25133 u8 ch = ((u8 *)b)[i];
25134
25135diff -urNp linux-2.6.32.46/crypto/serpent.c linux-2.6.32.46/crypto/serpent.c
25136--- linux-2.6.32.46/crypto/serpent.c 2011-03-27 14:31:47.000000000 -0400
25137+++ linux-2.6.32.46/crypto/serpent.c 2011-08-18 23:59:56.000000000 -0400
25138@@ -21,6 +21,7 @@
25139 #include <asm/byteorder.h>
25140 #include <linux/crypto.h>
25141 #include <linux/types.h>
25142+#include <linux/sched.h>
25143
25144 /* Key is padded to the maximum of 256 bits before round key generation.
25145 * Any key length <= 256 bits (32 bytes) is allowed by the algorithm.
25146@@ -224,6 +225,8 @@ static int serpent_setkey(struct crypto_
25147 u32 r0,r1,r2,r3,r4;
25148 int i;
25149
25150+ pax_track_stack();
25151+
25152 /* Copy key, add padding */
25153
25154 for (i = 0; i < keylen; ++i)
25155diff -urNp linux-2.6.32.46/Documentation/dontdiff linux-2.6.32.46/Documentation/dontdiff
25156--- linux-2.6.32.46/Documentation/dontdiff 2011-03-27 14:31:47.000000000 -0400
25157+++ linux-2.6.32.46/Documentation/dontdiff 2011-08-21 18:59:02.000000000 -0400
25158@@ -1,13 +1,16 @@
25159 *.a
25160 *.aux
25161 *.bin
25162+*.cis
25163 *.cpio
25164 *.csp
25165+*.dbg
25166 *.dsp
25167 *.dvi
25168 *.elf
25169 *.eps
25170 *.fw
25171+*.gcno
25172 *.gen.S
25173 *.gif
25174 *.grep
25175@@ -38,8 +41,10 @@
25176 *.tab.h
25177 *.tex
25178 *.ver
25179+*.vim
25180 *.xml
25181 *_MODULES
25182+*_reg_safe.h
25183 *_vga16.c
25184 *~
25185 *.9
25186@@ -49,11 +54,16 @@
25187 53c700_d.h
25188 CVS
25189 ChangeSet
25190+GPATH
25191+GRTAGS
25192+GSYMS
25193+GTAGS
25194 Image
25195 Kerntypes
25196 Module.markers
25197 Module.symvers
25198 PENDING
25199+PERF*
25200 SCCS
25201 System.map*
25202 TAGS
25203@@ -76,7 +86,11 @@ btfixupprep
25204 build
25205 bvmlinux
25206 bzImage*
25207+capability_names.h
25208+capflags.c
25209 classlist.h*
25210+clut_vga16.c
25211+common-cmds.h
25212 comp*.log
25213 compile.h*
25214 conf
25215@@ -97,19 +111,21 @@ elfconfig.h*
25216 fixdep
25217 fore200e_mkfirm
25218 fore200e_pca_fw.c*
25219+gate.lds
25220 gconf
25221 gen-devlist
25222 gen_crc32table
25223 gen_init_cpio
25224 genksyms
25225 *_gray256.c
25226+hash
25227 ihex2fw
25228 ikconfig.h*
25229 initramfs_data.cpio
25230+initramfs_data.cpio.bz2
25231 initramfs_data.cpio.gz
25232 initramfs_list
25233 kallsyms
25234-kconfig
25235 keywords.c
25236 ksym.c*
25237 ksym.h*
25238@@ -133,7 +149,9 @@ mkboot
25239 mkbugboot
25240 mkcpustr
25241 mkdep
25242+mkpiggy
25243 mkprep
25244+mkregtable
25245 mktables
25246 mktree
25247 modpost
25248@@ -149,6 +167,7 @@ patches*
25249 pca200e.bin
25250 pca200e_ecd.bin2
25251 piggy.gz
25252+piggy.S
25253 piggyback
25254 pnmtologo
25255 ppc_defs.h*
25256@@ -157,12 +176,15 @@ qconf
25257 raid6altivec*.c
25258 raid6int*.c
25259 raid6tables.c
25260+regdb.c
25261 relocs
25262+rlim_names.h
25263 series
25264 setup
25265 setup.bin
25266 setup.elf
25267 sImage
25268+slabinfo
25269 sm_tbl*
25270 split-include
25271 syscalltab.h
25272@@ -186,14 +208,20 @@ version.h*
25273 vmlinux
25274 vmlinux-*
25275 vmlinux.aout
25276+vmlinux.bin.all
25277+vmlinux.bin.bz2
25278 vmlinux.lds
25279+vmlinux.relocs
25280+voffset.h
25281 vsyscall.lds
25282 vsyscall_32.lds
25283 wanxlfw.inc
25284 uImage
25285 unifdef
25286+utsrelease.h
25287 wakeup.bin
25288 wakeup.elf
25289 wakeup.lds
25290 zImage*
25291 zconf.hash.c
25292+zoffset.h
25293diff -urNp linux-2.6.32.46/Documentation/kernel-parameters.txt linux-2.6.32.46/Documentation/kernel-parameters.txt
25294--- linux-2.6.32.46/Documentation/kernel-parameters.txt 2011-03-27 14:31:47.000000000 -0400
25295+++ linux-2.6.32.46/Documentation/kernel-parameters.txt 2011-04-17 15:56:45.000000000 -0400
25296@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters.
25297 the specified number of seconds. This is to be used if
25298 your oopses keep scrolling off the screen.
25299
25300+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
25301+ virtualization environments that don't cope well with the
25302+ expand down segment used by UDEREF on X86-32 or the frequent
25303+ page table updates on X86-64.
25304+
25305+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
25306+
25307 pcbit= [HW,ISDN]
25308
25309 pcd. [PARIDE]
25310diff -urNp linux-2.6.32.46/drivers/acpi/acpi_pad.c linux-2.6.32.46/drivers/acpi/acpi_pad.c
25311--- linux-2.6.32.46/drivers/acpi/acpi_pad.c 2011-03-27 14:31:47.000000000 -0400
25312+++ linux-2.6.32.46/drivers/acpi/acpi_pad.c 2011-04-17 15:56:46.000000000 -0400
25313@@ -30,7 +30,7 @@
25314 #include <acpi/acpi_bus.h>
25315 #include <acpi/acpi_drivers.h>
25316
25317-#define ACPI_PROCESSOR_AGGREGATOR_CLASS "processor_aggregator"
25318+#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
25319 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
25320 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
25321 static DEFINE_MUTEX(isolated_cpus_lock);
25322diff -urNp linux-2.6.32.46/drivers/acpi/battery.c linux-2.6.32.46/drivers/acpi/battery.c
25323--- linux-2.6.32.46/drivers/acpi/battery.c 2011-03-27 14:31:47.000000000 -0400
25324+++ linux-2.6.32.46/drivers/acpi/battery.c 2011-04-17 15:56:46.000000000 -0400
25325@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
25326 }
25327
25328 static struct battery_file {
25329- struct file_operations ops;
25330+ const struct file_operations ops;
25331 mode_t mode;
25332 const char *name;
25333 } acpi_battery_file[] = {
25334diff -urNp linux-2.6.32.46/drivers/acpi/dock.c linux-2.6.32.46/drivers/acpi/dock.c
25335--- linux-2.6.32.46/drivers/acpi/dock.c 2011-03-27 14:31:47.000000000 -0400
25336+++ linux-2.6.32.46/drivers/acpi/dock.c 2011-04-17 15:56:46.000000000 -0400
25337@@ -77,7 +77,7 @@ struct dock_dependent_device {
25338 struct list_head list;
25339 struct list_head hotplug_list;
25340 acpi_handle handle;
25341- struct acpi_dock_ops *ops;
25342+ const struct acpi_dock_ops *ops;
25343 void *context;
25344 };
25345
25346@@ -605,7 +605,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi
25347 * the dock driver after _DCK is executed.
25348 */
25349 int
25350-register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
25351+register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops,
25352 void *context)
25353 {
25354 struct dock_dependent_device *dd;
25355diff -urNp linux-2.6.32.46/drivers/acpi/osl.c linux-2.6.32.46/drivers/acpi/osl.c
25356--- linux-2.6.32.46/drivers/acpi/osl.c 2011-03-27 14:31:47.000000000 -0400
25357+++ linux-2.6.32.46/drivers/acpi/osl.c 2011-04-17 15:56:46.000000000 -0400
25358@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
25359 void __iomem *virt_addr;
25360
25361 virt_addr = ioremap(phys_addr, width);
25362+ if (!virt_addr)
25363+ return AE_NO_MEMORY;
25364 if (!value)
25365 value = &dummy;
25366
25367@@ -551,6 +553,8 @@ acpi_os_write_memory(acpi_physical_addre
25368 void __iomem *virt_addr;
25369
25370 virt_addr = ioremap(phys_addr, width);
25371+ if (!virt_addr)
25372+ return AE_NO_MEMORY;
25373
25374 switch (width) {
25375 case 8:
25376diff -urNp linux-2.6.32.46/drivers/acpi/power_meter.c linux-2.6.32.46/drivers/acpi/power_meter.c
25377--- linux-2.6.32.46/drivers/acpi/power_meter.c 2011-03-27 14:31:47.000000000 -0400
25378+++ linux-2.6.32.46/drivers/acpi/power_meter.c 2011-04-17 15:56:46.000000000 -0400
25379@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
25380 return res;
25381
25382 temp /= 1000;
25383- if (temp < 0)
25384- return -EINVAL;
25385
25386 mutex_lock(&resource->lock);
25387 resource->trip[attr->index - 7] = temp;
25388diff -urNp linux-2.6.32.46/drivers/acpi/proc.c linux-2.6.32.46/drivers/acpi/proc.c
25389--- linux-2.6.32.46/drivers/acpi/proc.c 2011-03-27 14:31:47.000000000 -0400
25390+++ linux-2.6.32.46/drivers/acpi/proc.c 2011-04-17 15:56:46.000000000 -0400
25391@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
25392 size_t count, loff_t * ppos)
25393 {
25394 struct list_head *node, *next;
25395- char strbuf[5];
25396- char str[5] = "";
25397- unsigned int len = count;
25398+ char strbuf[5] = {0};
25399 struct acpi_device *found_dev = NULL;
25400
25401- if (len > 4)
25402- len = 4;
25403- if (len < 0)
25404- return -EFAULT;
25405+ if (count > 4)
25406+ count = 4;
25407
25408- if (copy_from_user(strbuf, buffer, len))
25409+ if (copy_from_user(strbuf, buffer, count))
25410 return -EFAULT;
25411- strbuf[len] = '\0';
25412- sscanf(strbuf, "%s", str);
25413+ strbuf[count] = '\0';
25414
25415 mutex_lock(&acpi_device_lock);
25416 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
25417@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct f
25418 if (!dev->wakeup.flags.valid)
25419 continue;
25420
25421- if (!strncmp(dev->pnp.bus_id, str, 4)) {
25422+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
25423 dev->wakeup.state.enabled =
25424 dev->wakeup.state.enabled ? 0 : 1;
25425 found_dev = dev;
25426diff -urNp linux-2.6.32.46/drivers/acpi/processor_core.c linux-2.6.32.46/drivers/acpi/processor_core.c
25427--- linux-2.6.32.46/drivers/acpi/processor_core.c 2011-03-27 14:31:47.000000000 -0400
25428+++ linux-2.6.32.46/drivers/acpi/processor_core.c 2011-04-17 15:56:46.000000000 -0400
25429@@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(
25430 return 0;
25431 }
25432
25433- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
25434+ BUG_ON(pr->id >= nr_cpu_ids);
25435
25436 /*
25437 * Buggy BIOS check
25438diff -urNp linux-2.6.32.46/drivers/acpi/sbshc.c linux-2.6.32.46/drivers/acpi/sbshc.c
25439--- linux-2.6.32.46/drivers/acpi/sbshc.c 2011-03-27 14:31:47.000000000 -0400
25440+++ linux-2.6.32.46/drivers/acpi/sbshc.c 2011-04-17 15:56:46.000000000 -0400
25441@@ -17,7 +17,7 @@
25442
25443 #define PREFIX "ACPI: "
25444
25445-#define ACPI_SMB_HC_CLASS "smbus_host_controller"
25446+#define ACPI_SMB_HC_CLASS "smbus_host_ctl"
25447 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
25448
25449 struct acpi_smb_hc {
25450diff -urNp linux-2.6.32.46/drivers/acpi/sleep.c linux-2.6.32.46/drivers/acpi/sleep.c
25451--- linux-2.6.32.46/drivers/acpi/sleep.c 2011-03-27 14:31:47.000000000 -0400
25452+++ linux-2.6.32.46/drivers/acpi/sleep.c 2011-04-17 15:56:46.000000000 -0400
25453@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
25454 }
25455 }
25456
25457-static struct platform_suspend_ops acpi_suspend_ops = {
25458+static const struct platform_suspend_ops acpi_suspend_ops = {
25459 .valid = acpi_suspend_state_valid,
25460 .begin = acpi_suspend_begin,
25461 .prepare_late = acpi_pm_prepare,
25462@@ -311,7 +311,7 @@ static int acpi_suspend_begin_old(suspen
25463 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
25464 * been requested.
25465 */
25466-static struct platform_suspend_ops acpi_suspend_ops_old = {
25467+static const struct platform_suspend_ops acpi_suspend_ops_old = {
25468 .valid = acpi_suspend_state_valid,
25469 .begin = acpi_suspend_begin_old,
25470 .prepare_late = acpi_pm_disable_gpes,
25471@@ -460,7 +460,7 @@ static void acpi_pm_enable_gpes(void)
25472 acpi_enable_all_runtime_gpes();
25473 }
25474
25475-static struct platform_hibernation_ops acpi_hibernation_ops = {
25476+static const struct platform_hibernation_ops acpi_hibernation_ops = {
25477 .begin = acpi_hibernation_begin,
25478 .end = acpi_pm_end,
25479 .pre_snapshot = acpi_hibernation_pre_snapshot,
25480@@ -513,7 +513,7 @@ static int acpi_hibernation_pre_snapshot
25481 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
25482 * been requested.
25483 */
25484-static struct platform_hibernation_ops acpi_hibernation_ops_old = {
25485+static const struct platform_hibernation_ops acpi_hibernation_ops_old = {
25486 .begin = acpi_hibernation_begin_old,
25487 .end = acpi_pm_end,
25488 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
25489diff -urNp linux-2.6.32.46/drivers/acpi/video.c linux-2.6.32.46/drivers/acpi/video.c
25490--- linux-2.6.32.46/drivers/acpi/video.c 2011-03-27 14:31:47.000000000 -0400
25491+++ linux-2.6.32.46/drivers/acpi/video.c 2011-04-17 15:56:46.000000000 -0400
25492@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
25493 vd->brightness->levels[request_level]);
25494 }
25495
25496-static struct backlight_ops acpi_backlight_ops = {
25497+static const struct backlight_ops acpi_backlight_ops = {
25498 .get_brightness = acpi_video_get_brightness,
25499 .update_status = acpi_video_set_brightness,
25500 };
25501diff -urNp linux-2.6.32.46/drivers/ata/ahci.c linux-2.6.32.46/drivers/ata/ahci.c
25502--- linux-2.6.32.46/drivers/ata/ahci.c 2011-03-27 14:31:47.000000000 -0400
25503+++ linux-2.6.32.46/drivers/ata/ahci.c 2011-04-23 12:56:10.000000000 -0400
25504@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
25505 .sdev_attrs = ahci_sdev_attrs,
25506 };
25507
25508-static struct ata_port_operations ahci_ops = {
25509+static const struct ata_port_operations ahci_ops = {
25510 .inherits = &sata_pmp_port_ops,
25511
25512 .qc_defer = sata_pmp_qc_defer_cmd_switch,
25513@@ -424,17 +424,17 @@ static struct ata_port_operations ahci_o
25514 .port_stop = ahci_port_stop,
25515 };
25516
25517-static struct ata_port_operations ahci_vt8251_ops = {
25518+static const struct ata_port_operations ahci_vt8251_ops = {
25519 .inherits = &ahci_ops,
25520 .hardreset = ahci_vt8251_hardreset,
25521 };
25522
25523-static struct ata_port_operations ahci_p5wdh_ops = {
25524+static const struct ata_port_operations ahci_p5wdh_ops = {
25525 .inherits = &ahci_ops,
25526 .hardreset = ahci_p5wdh_hardreset,
25527 };
25528
25529-static struct ata_port_operations ahci_sb600_ops = {
25530+static const struct ata_port_operations ahci_sb600_ops = {
25531 .inherits = &ahci_ops,
25532 .softreset = ahci_sb600_softreset,
25533 .pmp_softreset = ahci_sb600_softreset,
25534diff -urNp linux-2.6.32.46/drivers/ata/ata_generic.c linux-2.6.32.46/drivers/ata/ata_generic.c
25535--- linux-2.6.32.46/drivers/ata/ata_generic.c 2011-03-27 14:31:47.000000000 -0400
25536+++ linux-2.6.32.46/drivers/ata/ata_generic.c 2011-04-17 15:56:46.000000000 -0400
25537@@ -104,7 +104,7 @@ static struct scsi_host_template generic
25538 ATA_BMDMA_SHT(DRV_NAME),
25539 };
25540
25541-static struct ata_port_operations generic_port_ops = {
25542+static const struct ata_port_operations generic_port_ops = {
25543 .inherits = &ata_bmdma_port_ops,
25544 .cable_detect = ata_cable_unknown,
25545 .set_mode = generic_set_mode,
25546diff -urNp linux-2.6.32.46/drivers/ata/ata_piix.c linux-2.6.32.46/drivers/ata/ata_piix.c
25547--- linux-2.6.32.46/drivers/ata/ata_piix.c 2011-03-27 14:31:47.000000000 -0400
25548+++ linux-2.6.32.46/drivers/ata/ata_piix.c 2011-04-23 12:56:10.000000000 -0400
25549@@ -318,7 +318,7 @@ static struct scsi_host_template piix_sh
25550 ATA_BMDMA_SHT(DRV_NAME),
25551 };
25552
25553-static struct ata_port_operations piix_pata_ops = {
25554+static const struct ata_port_operations piix_pata_ops = {
25555 .inherits = &ata_bmdma32_port_ops,
25556 .cable_detect = ata_cable_40wire,
25557 .set_piomode = piix_set_piomode,
25558@@ -326,22 +326,22 @@ static struct ata_port_operations piix_p
25559 .prereset = piix_pata_prereset,
25560 };
25561
25562-static struct ata_port_operations piix_vmw_ops = {
25563+static const struct ata_port_operations piix_vmw_ops = {
25564 .inherits = &piix_pata_ops,
25565 .bmdma_status = piix_vmw_bmdma_status,
25566 };
25567
25568-static struct ata_port_operations ich_pata_ops = {
25569+static const struct ata_port_operations ich_pata_ops = {
25570 .inherits = &piix_pata_ops,
25571 .cable_detect = ich_pata_cable_detect,
25572 .set_dmamode = ich_set_dmamode,
25573 };
25574
25575-static struct ata_port_operations piix_sata_ops = {
25576+static const struct ata_port_operations piix_sata_ops = {
25577 .inherits = &ata_bmdma_port_ops,
25578 };
25579
25580-static struct ata_port_operations piix_sidpr_sata_ops = {
25581+static const struct ata_port_operations piix_sidpr_sata_ops = {
25582 .inherits = &piix_sata_ops,
25583 .hardreset = sata_std_hardreset,
25584 .scr_read = piix_sidpr_scr_read,
25585diff -urNp linux-2.6.32.46/drivers/ata/libata-acpi.c linux-2.6.32.46/drivers/ata/libata-acpi.c
25586--- linux-2.6.32.46/drivers/ata/libata-acpi.c 2011-03-27 14:31:47.000000000 -0400
25587+++ linux-2.6.32.46/drivers/ata/libata-acpi.c 2011-04-17 15:56:46.000000000 -0400
25588@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
25589 ata_acpi_uevent(dev->link->ap, dev, event);
25590 }
25591
25592-static struct acpi_dock_ops ata_acpi_dev_dock_ops = {
25593+static const struct acpi_dock_ops ata_acpi_dev_dock_ops = {
25594 .handler = ata_acpi_dev_notify_dock,
25595 .uevent = ata_acpi_dev_uevent,
25596 };
25597
25598-static struct acpi_dock_ops ata_acpi_ap_dock_ops = {
25599+static const struct acpi_dock_ops ata_acpi_ap_dock_ops = {
25600 .handler = ata_acpi_ap_notify_dock,
25601 .uevent = ata_acpi_ap_uevent,
25602 };
25603diff -urNp linux-2.6.32.46/drivers/ata/libata-core.c linux-2.6.32.46/drivers/ata/libata-core.c
25604--- linux-2.6.32.46/drivers/ata/libata-core.c 2011-03-27 14:31:47.000000000 -0400
25605+++ linux-2.6.32.46/drivers/ata/libata-core.c 2011-08-05 20:33:55.000000000 -0400
25606@@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd *
25607 struct ata_port *ap;
25608 unsigned int tag;
25609
25610- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25611+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25612 ap = qc->ap;
25613
25614 qc->flags = 0;
25615@@ -4970,7 +4970,7 @@ void __ata_qc_complete(struct ata_queued
25616 struct ata_port *ap;
25617 struct ata_link *link;
25618
25619- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25620+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25621 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
25622 ap = qc->ap;
25623 link = qc->dev->link;
25624@@ -5987,7 +5987,7 @@ static void ata_host_stop(struct device
25625 * LOCKING:
25626 * None.
25627 */
25628-static void ata_finalize_port_ops(struct ata_port_operations *ops)
25629+static void ata_finalize_port_ops(const struct ata_port_operations *ops)
25630 {
25631 static DEFINE_SPINLOCK(lock);
25632 const struct ata_port_operations *cur;
25633@@ -5999,6 +5999,7 @@ static void ata_finalize_port_ops(struct
25634 return;
25635
25636 spin_lock(&lock);
25637+ pax_open_kernel();
25638
25639 for (cur = ops->inherits; cur; cur = cur->inherits) {
25640 void **inherit = (void **)cur;
25641@@ -6012,8 +6013,9 @@ static void ata_finalize_port_ops(struct
25642 if (IS_ERR(*pp))
25643 *pp = NULL;
25644
25645- ops->inherits = NULL;
25646+ *(struct ata_port_operations **)&ops->inherits = NULL;
25647
25648+ pax_close_kernel();
25649 spin_unlock(&lock);
25650 }
25651
25652@@ -6110,7 +6112,7 @@ int ata_host_start(struct ata_host *host
25653 */
25654 /* KILLME - the only user left is ipr */
25655 void ata_host_init(struct ata_host *host, struct device *dev,
25656- unsigned long flags, struct ata_port_operations *ops)
25657+ unsigned long flags, const struct ata_port_operations *ops)
25658 {
25659 spin_lock_init(&host->lock);
25660 host->dev = dev;
25661@@ -6773,7 +6775,7 @@ static void ata_dummy_error_handler(stru
25662 /* truly dummy */
25663 }
25664
25665-struct ata_port_operations ata_dummy_port_ops = {
25666+const struct ata_port_operations ata_dummy_port_ops = {
25667 .qc_prep = ata_noop_qc_prep,
25668 .qc_issue = ata_dummy_qc_issue,
25669 .error_handler = ata_dummy_error_handler,
25670diff -urNp linux-2.6.32.46/drivers/ata/libata-eh.c linux-2.6.32.46/drivers/ata/libata-eh.c
25671--- linux-2.6.32.46/drivers/ata/libata-eh.c 2011-08-09 18:35:28.000000000 -0400
25672+++ linux-2.6.32.46/drivers/ata/libata-eh.c 2011-08-09 18:33:59.000000000 -0400
25673@@ -2423,6 +2423,8 @@ void ata_eh_report(struct ata_port *ap)
25674 {
25675 struct ata_link *link;
25676
25677+ pax_track_stack();
25678+
25679 ata_for_each_link(link, ap, HOST_FIRST)
25680 ata_eh_link_report(link);
25681 }
25682@@ -3594,7 +3596,7 @@ void ata_do_eh(struct ata_port *ap, ata_
25683 */
25684 void ata_std_error_handler(struct ata_port *ap)
25685 {
25686- struct ata_port_operations *ops = ap->ops;
25687+ const struct ata_port_operations *ops = ap->ops;
25688 ata_reset_fn_t hardreset = ops->hardreset;
25689
25690 /* ignore built-in hardreset if SCR access is not available */
25691diff -urNp linux-2.6.32.46/drivers/ata/libata-pmp.c linux-2.6.32.46/drivers/ata/libata-pmp.c
25692--- linux-2.6.32.46/drivers/ata/libata-pmp.c 2011-03-27 14:31:47.000000000 -0400
25693+++ linux-2.6.32.46/drivers/ata/libata-pmp.c 2011-04-17 15:56:46.000000000 -0400
25694@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
25695 */
25696 static int sata_pmp_eh_recover(struct ata_port *ap)
25697 {
25698- struct ata_port_operations *ops = ap->ops;
25699+ const struct ata_port_operations *ops = ap->ops;
25700 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
25701 struct ata_link *pmp_link = &ap->link;
25702 struct ata_device *pmp_dev = pmp_link->device;
25703diff -urNp linux-2.6.32.46/drivers/ata/pata_acpi.c linux-2.6.32.46/drivers/ata/pata_acpi.c
25704--- linux-2.6.32.46/drivers/ata/pata_acpi.c 2011-03-27 14:31:47.000000000 -0400
25705+++ linux-2.6.32.46/drivers/ata/pata_acpi.c 2011-04-17 15:56:46.000000000 -0400
25706@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
25707 ATA_BMDMA_SHT(DRV_NAME),
25708 };
25709
25710-static struct ata_port_operations pacpi_ops = {
25711+static const struct ata_port_operations pacpi_ops = {
25712 .inherits = &ata_bmdma_port_ops,
25713 .qc_issue = pacpi_qc_issue,
25714 .cable_detect = pacpi_cable_detect,
25715diff -urNp linux-2.6.32.46/drivers/ata/pata_ali.c linux-2.6.32.46/drivers/ata/pata_ali.c
25716--- linux-2.6.32.46/drivers/ata/pata_ali.c 2011-03-27 14:31:47.000000000 -0400
25717+++ linux-2.6.32.46/drivers/ata/pata_ali.c 2011-04-17 15:56:46.000000000 -0400
25718@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
25719 * Port operations for PIO only ALi
25720 */
25721
25722-static struct ata_port_operations ali_early_port_ops = {
25723+static const struct ata_port_operations ali_early_port_ops = {
25724 .inherits = &ata_sff_port_ops,
25725 .cable_detect = ata_cable_40wire,
25726 .set_piomode = ali_set_piomode,
25727@@ -382,7 +382,7 @@ static const struct ata_port_operations
25728 * Port operations for DMA capable ALi without cable
25729 * detect
25730 */
25731-static struct ata_port_operations ali_20_port_ops = {
25732+static const struct ata_port_operations ali_20_port_ops = {
25733 .inherits = &ali_dma_base_ops,
25734 .cable_detect = ata_cable_40wire,
25735 .mode_filter = ali_20_filter,
25736@@ -393,7 +393,7 @@ static struct ata_port_operations ali_20
25737 /*
25738 * Port operations for DMA capable ALi with cable detect
25739 */
25740-static struct ata_port_operations ali_c2_port_ops = {
25741+static const struct ata_port_operations ali_c2_port_ops = {
25742 .inherits = &ali_dma_base_ops,
25743 .check_atapi_dma = ali_check_atapi_dma,
25744 .cable_detect = ali_c2_cable_detect,
25745@@ -404,7 +404,7 @@ static struct ata_port_operations ali_c2
25746 /*
25747 * Port operations for DMA capable ALi with cable detect
25748 */
25749-static struct ata_port_operations ali_c4_port_ops = {
25750+static const struct ata_port_operations ali_c4_port_ops = {
25751 .inherits = &ali_dma_base_ops,
25752 .check_atapi_dma = ali_check_atapi_dma,
25753 .cable_detect = ali_c2_cable_detect,
25754@@ -414,7 +414,7 @@ static struct ata_port_operations ali_c4
25755 /*
25756 * Port operations for DMA capable ALi with cable detect and LBA48
25757 */
25758-static struct ata_port_operations ali_c5_port_ops = {
25759+static const struct ata_port_operations ali_c5_port_ops = {
25760 .inherits = &ali_dma_base_ops,
25761 .check_atapi_dma = ali_check_atapi_dma,
25762 .dev_config = ali_warn_atapi_dma,
25763diff -urNp linux-2.6.32.46/drivers/ata/pata_amd.c linux-2.6.32.46/drivers/ata/pata_amd.c
25764--- linux-2.6.32.46/drivers/ata/pata_amd.c 2011-03-27 14:31:47.000000000 -0400
25765+++ linux-2.6.32.46/drivers/ata/pata_amd.c 2011-04-17 15:56:46.000000000 -0400
25766@@ -397,28 +397,28 @@ static const struct ata_port_operations
25767 .prereset = amd_pre_reset,
25768 };
25769
25770-static struct ata_port_operations amd33_port_ops = {
25771+static const struct ata_port_operations amd33_port_ops = {
25772 .inherits = &amd_base_port_ops,
25773 .cable_detect = ata_cable_40wire,
25774 .set_piomode = amd33_set_piomode,
25775 .set_dmamode = amd33_set_dmamode,
25776 };
25777
25778-static struct ata_port_operations amd66_port_ops = {
25779+static const struct ata_port_operations amd66_port_ops = {
25780 .inherits = &amd_base_port_ops,
25781 .cable_detect = ata_cable_unknown,
25782 .set_piomode = amd66_set_piomode,
25783 .set_dmamode = amd66_set_dmamode,
25784 };
25785
25786-static struct ata_port_operations amd100_port_ops = {
25787+static const struct ata_port_operations amd100_port_ops = {
25788 .inherits = &amd_base_port_ops,
25789 .cable_detect = ata_cable_unknown,
25790 .set_piomode = amd100_set_piomode,
25791 .set_dmamode = amd100_set_dmamode,
25792 };
25793
25794-static struct ata_port_operations amd133_port_ops = {
25795+static const struct ata_port_operations amd133_port_ops = {
25796 .inherits = &amd_base_port_ops,
25797 .cable_detect = amd_cable_detect,
25798 .set_piomode = amd133_set_piomode,
25799@@ -433,13 +433,13 @@ static const struct ata_port_operations
25800 .host_stop = nv_host_stop,
25801 };
25802
25803-static struct ata_port_operations nv100_port_ops = {
25804+static const struct ata_port_operations nv100_port_ops = {
25805 .inherits = &nv_base_port_ops,
25806 .set_piomode = nv100_set_piomode,
25807 .set_dmamode = nv100_set_dmamode,
25808 };
25809
25810-static struct ata_port_operations nv133_port_ops = {
25811+static const struct ata_port_operations nv133_port_ops = {
25812 .inherits = &nv_base_port_ops,
25813 .set_piomode = nv133_set_piomode,
25814 .set_dmamode = nv133_set_dmamode,
25815diff -urNp linux-2.6.32.46/drivers/ata/pata_artop.c linux-2.6.32.46/drivers/ata/pata_artop.c
25816--- linux-2.6.32.46/drivers/ata/pata_artop.c 2011-03-27 14:31:47.000000000 -0400
25817+++ linux-2.6.32.46/drivers/ata/pata_artop.c 2011-04-17 15:56:46.000000000 -0400
25818@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
25819 ATA_BMDMA_SHT(DRV_NAME),
25820 };
25821
25822-static struct ata_port_operations artop6210_ops = {
25823+static const struct ata_port_operations artop6210_ops = {
25824 .inherits = &ata_bmdma_port_ops,
25825 .cable_detect = ata_cable_40wire,
25826 .set_piomode = artop6210_set_piomode,
25827@@ -320,7 +320,7 @@ static struct ata_port_operations artop6
25828 .qc_defer = artop6210_qc_defer,
25829 };
25830
25831-static struct ata_port_operations artop6260_ops = {
25832+static const struct ata_port_operations artop6260_ops = {
25833 .inherits = &ata_bmdma_port_ops,
25834 .cable_detect = artop6260_cable_detect,
25835 .set_piomode = artop6260_set_piomode,
25836diff -urNp linux-2.6.32.46/drivers/ata/pata_at32.c linux-2.6.32.46/drivers/ata/pata_at32.c
25837--- linux-2.6.32.46/drivers/ata/pata_at32.c 2011-03-27 14:31:47.000000000 -0400
25838+++ linux-2.6.32.46/drivers/ata/pata_at32.c 2011-04-17 15:56:46.000000000 -0400
25839@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
25840 ATA_PIO_SHT(DRV_NAME),
25841 };
25842
25843-static struct ata_port_operations at32_port_ops = {
25844+static const struct ata_port_operations at32_port_ops = {
25845 .inherits = &ata_sff_port_ops,
25846 .cable_detect = ata_cable_40wire,
25847 .set_piomode = pata_at32_set_piomode,
25848diff -urNp linux-2.6.32.46/drivers/ata/pata_at91.c linux-2.6.32.46/drivers/ata/pata_at91.c
25849--- linux-2.6.32.46/drivers/ata/pata_at91.c 2011-03-27 14:31:47.000000000 -0400
25850+++ linux-2.6.32.46/drivers/ata/pata_at91.c 2011-04-17 15:56:46.000000000 -0400
25851@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
25852 ATA_PIO_SHT(DRV_NAME),
25853 };
25854
25855-static struct ata_port_operations pata_at91_port_ops = {
25856+static const struct ata_port_operations pata_at91_port_ops = {
25857 .inherits = &ata_sff_port_ops,
25858
25859 .sff_data_xfer = pata_at91_data_xfer_noirq,
25860diff -urNp linux-2.6.32.46/drivers/ata/pata_atiixp.c linux-2.6.32.46/drivers/ata/pata_atiixp.c
25861--- linux-2.6.32.46/drivers/ata/pata_atiixp.c 2011-03-27 14:31:47.000000000 -0400
25862+++ linux-2.6.32.46/drivers/ata/pata_atiixp.c 2011-04-17 15:56:46.000000000 -0400
25863@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
25864 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
25865 };
25866
25867-static struct ata_port_operations atiixp_port_ops = {
25868+static const struct ata_port_operations atiixp_port_ops = {
25869 .inherits = &ata_bmdma_port_ops,
25870
25871 .qc_prep = ata_sff_dumb_qc_prep,
25872diff -urNp linux-2.6.32.46/drivers/ata/pata_atp867x.c linux-2.6.32.46/drivers/ata/pata_atp867x.c
25873--- linux-2.6.32.46/drivers/ata/pata_atp867x.c 2011-03-27 14:31:47.000000000 -0400
25874+++ linux-2.6.32.46/drivers/ata/pata_atp867x.c 2011-04-17 15:56:46.000000000 -0400
25875@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
25876 ATA_BMDMA_SHT(DRV_NAME),
25877 };
25878
25879-static struct ata_port_operations atp867x_ops = {
25880+static const struct ata_port_operations atp867x_ops = {
25881 .inherits = &ata_bmdma_port_ops,
25882 .cable_detect = atp867x_cable_detect,
25883 .set_piomode = atp867x_set_piomode,
25884diff -urNp linux-2.6.32.46/drivers/ata/pata_bf54x.c linux-2.6.32.46/drivers/ata/pata_bf54x.c
25885--- linux-2.6.32.46/drivers/ata/pata_bf54x.c 2011-03-27 14:31:47.000000000 -0400
25886+++ linux-2.6.32.46/drivers/ata/pata_bf54x.c 2011-04-17 15:56:46.000000000 -0400
25887@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
25888 .dma_boundary = ATA_DMA_BOUNDARY,
25889 };
25890
25891-static struct ata_port_operations bfin_pata_ops = {
25892+static const struct ata_port_operations bfin_pata_ops = {
25893 .inherits = &ata_sff_port_ops,
25894
25895 .set_piomode = bfin_set_piomode,
25896diff -urNp linux-2.6.32.46/drivers/ata/pata_cmd640.c linux-2.6.32.46/drivers/ata/pata_cmd640.c
25897--- linux-2.6.32.46/drivers/ata/pata_cmd640.c 2011-03-27 14:31:47.000000000 -0400
25898+++ linux-2.6.32.46/drivers/ata/pata_cmd640.c 2011-04-17 15:56:46.000000000 -0400
25899@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
25900 ATA_BMDMA_SHT(DRV_NAME),
25901 };
25902
25903-static struct ata_port_operations cmd640_port_ops = {
25904+static const struct ata_port_operations cmd640_port_ops = {
25905 .inherits = &ata_bmdma_port_ops,
25906 /* In theory xfer_noirq is not needed once we kill the prefetcher */
25907 .sff_data_xfer = ata_sff_data_xfer_noirq,
25908diff -urNp linux-2.6.32.46/drivers/ata/pata_cmd64x.c linux-2.6.32.46/drivers/ata/pata_cmd64x.c
25909--- linux-2.6.32.46/drivers/ata/pata_cmd64x.c 2011-06-25 12:55:34.000000000 -0400
25910+++ linux-2.6.32.46/drivers/ata/pata_cmd64x.c 2011-06-25 12:56:37.000000000 -0400
25911@@ -271,18 +271,18 @@ static const struct ata_port_operations
25912 .set_dmamode = cmd64x_set_dmamode,
25913 };
25914
25915-static struct ata_port_operations cmd64x_port_ops = {
25916+static const struct ata_port_operations cmd64x_port_ops = {
25917 .inherits = &cmd64x_base_ops,
25918 .cable_detect = ata_cable_40wire,
25919 };
25920
25921-static struct ata_port_operations cmd646r1_port_ops = {
25922+static const struct ata_port_operations cmd646r1_port_ops = {
25923 .inherits = &cmd64x_base_ops,
25924 .bmdma_stop = cmd646r1_bmdma_stop,
25925 .cable_detect = ata_cable_40wire,
25926 };
25927
25928-static struct ata_port_operations cmd648_port_ops = {
25929+static const struct ata_port_operations cmd648_port_ops = {
25930 .inherits = &cmd64x_base_ops,
25931 .bmdma_stop = cmd648_bmdma_stop,
25932 .cable_detect = cmd648_cable_detect,
25933diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5520.c linux-2.6.32.46/drivers/ata/pata_cs5520.c
25934--- linux-2.6.32.46/drivers/ata/pata_cs5520.c 2011-03-27 14:31:47.000000000 -0400
25935+++ linux-2.6.32.46/drivers/ata/pata_cs5520.c 2011-04-17 15:56:46.000000000 -0400
25936@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
25937 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
25938 };
25939
25940-static struct ata_port_operations cs5520_port_ops = {
25941+static const struct ata_port_operations cs5520_port_ops = {
25942 .inherits = &ata_bmdma_port_ops,
25943 .qc_prep = ata_sff_dumb_qc_prep,
25944 .cable_detect = ata_cable_40wire,
25945diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5530.c linux-2.6.32.46/drivers/ata/pata_cs5530.c
25946--- linux-2.6.32.46/drivers/ata/pata_cs5530.c 2011-03-27 14:31:47.000000000 -0400
25947+++ linux-2.6.32.46/drivers/ata/pata_cs5530.c 2011-04-17 15:56:46.000000000 -0400
25948@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
25949 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
25950 };
25951
25952-static struct ata_port_operations cs5530_port_ops = {
25953+static const struct ata_port_operations cs5530_port_ops = {
25954 .inherits = &ata_bmdma_port_ops,
25955
25956 .qc_prep = ata_sff_dumb_qc_prep,
25957diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5535.c linux-2.6.32.46/drivers/ata/pata_cs5535.c
25958--- linux-2.6.32.46/drivers/ata/pata_cs5535.c 2011-03-27 14:31:47.000000000 -0400
25959+++ linux-2.6.32.46/drivers/ata/pata_cs5535.c 2011-04-17 15:56:46.000000000 -0400
25960@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
25961 ATA_BMDMA_SHT(DRV_NAME),
25962 };
25963
25964-static struct ata_port_operations cs5535_port_ops = {
25965+static const struct ata_port_operations cs5535_port_ops = {
25966 .inherits = &ata_bmdma_port_ops,
25967 .cable_detect = cs5535_cable_detect,
25968 .set_piomode = cs5535_set_piomode,
25969diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5536.c linux-2.6.32.46/drivers/ata/pata_cs5536.c
25970--- linux-2.6.32.46/drivers/ata/pata_cs5536.c 2011-03-27 14:31:47.000000000 -0400
25971+++ linux-2.6.32.46/drivers/ata/pata_cs5536.c 2011-04-17 15:56:46.000000000 -0400
25972@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
25973 ATA_BMDMA_SHT(DRV_NAME),
25974 };
25975
25976-static struct ata_port_operations cs5536_port_ops = {
25977+static const struct ata_port_operations cs5536_port_ops = {
25978 .inherits = &ata_bmdma_port_ops,
25979 .cable_detect = cs5536_cable_detect,
25980 .set_piomode = cs5536_set_piomode,
25981diff -urNp linux-2.6.32.46/drivers/ata/pata_cypress.c linux-2.6.32.46/drivers/ata/pata_cypress.c
25982--- linux-2.6.32.46/drivers/ata/pata_cypress.c 2011-03-27 14:31:47.000000000 -0400
25983+++ linux-2.6.32.46/drivers/ata/pata_cypress.c 2011-04-17 15:56:46.000000000 -0400
25984@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
25985 ATA_BMDMA_SHT(DRV_NAME),
25986 };
25987
25988-static struct ata_port_operations cy82c693_port_ops = {
25989+static const struct ata_port_operations cy82c693_port_ops = {
25990 .inherits = &ata_bmdma_port_ops,
25991 .cable_detect = ata_cable_40wire,
25992 .set_piomode = cy82c693_set_piomode,
25993diff -urNp linux-2.6.32.46/drivers/ata/pata_efar.c linux-2.6.32.46/drivers/ata/pata_efar.c
25994--- linux-2.6.32.46/drivers/ata/pata_efar.c 2011-03-27 14:31:47.000000000 -0400
25995+++ linux-2.6.32.46/drivers/ata/pata_efar.c 2011-04-17 15:56:46.000000000 -0400
25996@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
25997 ATA_BMDMA_SHT(DRV_NAME),
25998 };
25999
26000-static struct ata_port_operations efar_ops = {
26001+static const struct ata_port_operations efar_ops = {
26002 .inherits = &ata_bmdma_port_ops,
26003 .cable_detect = efar_cable_detect,
26004 .set_piomode = efar_set_piomode,
26005diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt366.c linux-2.6.32.46/drivers/ata/pata_hpt366.c
26006--- linux-2.6.32.46/drivers/ata/pata_hpt366.c 2011-06-25 12:55:34.000000000 -0400
26007+++ linux-2.6.32.46/drivers/ata/pata_hpt366.c 2011-06-25 12:56:37.000000000 -0400
26008@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
26009 * Configuration for HPT366/68
26010 */
26011
26012-static struct ata_port_operations hpt366_port_ops = {
26013+static const struct ata_port_operations hpt366_port_ops = {
26014 .inherits = &ata_bmdma_port_ops,
26015 .cable_detect = hpt36x_cable_detect,
26016 .mode_filter = hpt366_filter,
26017diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt37x.c linux-2.6.32.46/drivers/ata/pata_hpt37x.c
26018--- linux-2.6.32.46/drivers/ata/pata_hpt37x.c 2011-06-25 12:55:34.000000000 -0400
26019+++ linux-2.6.32.46/drivers/ata/pata_hpt37x.c 2011-06-25 12:56:37.000000000 -0400
26020@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
26021 * Configuration for HPT370
26022 */
26023
26024-static struct ata_port_operations hpt370_port_ops = {
26025+static const struct ata_port_operations hpt370_port_ops = {
26026 .inherits = &ata_bmdma_port_ops,
26027
26028 .bmdma_stop = hpt370_bmdma_stop,
26029@@ -591,7 +591,7 @@ static struct ata_port_operations hpt370
26030 * Configuration for HPT370A. Close to 370 but less filters
26031 */
26032
26033-static struct ata_port_operations hpt370a_port_ops = {
26034+static const struct ata_port_operations hpt370a_port_ops = {
26035 .inherits = &hpt370_port_ops,
26036 .mode_filter = hpt370a_filter,
26037 };
26038@@ -601,7 +601,7 @@ static struct ata_port_operations hpt370
26039 * and DMA mode setting functionality.
26040 */
26041
26042-static struct ata_port_operations hpt372_port_ops = {
26043+static const struct ata_port_operations hpt372_port_ops = {
26044 .inherits = &ata_bmdma_port_ops,
26045
26046 .bmdma_stop = hpt37x_bmdma_stop,
26047@@ -616,7 +616,7 @@ static struct ata_port_operations hpt372
26048 * but we have a different cable detection procedure for function 1.
26049 */
26050
26051-static struct ata_port_operations hpt374_fn1_port_ops = {
26052+static const struct ata_port_operations hpt374_fn1_port_ops = {
26053 .inherits = &hpt372_port_ops,
26054 .prereset = hpt374_fn1_pre_reset,
26055 };
26056diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c
26057--- linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c 2011-06-25 12:55:34.000000000 -0400
26058+++ linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c 2011-06-25 12:56:37.000000000 -0400
26059@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
26060 * Configuration for HPT3x2n.
26061 */
26062
26063-static struct ata_port_operations hpt3x2n_port_ops = {
26064+static const struct ata_port_operations hpt3x2n_port_ops = {
26065 .inherits = &ata_bmdma_port_ops,
26066
26067 .bmdma_stop = hpt3x2n_bmdma_stop,
26068diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt3x3.c linux-2.6.32.46/drivers/ata/pata_hpt3x3.c
26069--- linux-2.6.32.46/drivers/ata/pata_hpt3x3.c 2011-03-27 14:31:47.000000000 -0400
26070+++ linux-2.6.32.46/drivers/ata/pata_hpt3x3.c 2011-04-17 15:56:46.000000000 -0400
26071@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
26072 ATA_BMDMA_SHT(DRV_NAME),
26073 };
26074
26075-static struct ata_port_operations hpt3x3_port_ops = {
26076+static const struct ata_port_operations hpt3x3_port_ops = {
26077 .inherits = &ata_bmdma_port_ops,
26078 .cable_detect = ata_cable_40wire,
26079 .set_piomode = hpt3x3_set_piomode,
26080diff -urNp linux-2.6.32.46/drivers/ata/pata_icside.c linux-2.6.32.46/drivers/ata/pata_icside.c
26081--- linux-2.6.32.46/drivers/ata/pata_icside.c 2011-03-27 14:31:47.000000000 -0400
26082+++ linux-2.6.32.46/drivers/ata/pata_icside.c 2011-04-17 15:56:46.000000000 -0400
26083@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
26084 }
26085 }
26086
26087-static struct ata_port_operations pata_icside_port_ops = {
26088+static const struct ata_port_operations pata_icside_port_ops = {
26089 .inherits = &ata_sff_port_ops,
26090 /* no need to build any PRD tables for DMA */
26091 .qc_prep = ata_noop_qc_prep,
26092diff -urNp linux-2.6.32.46/drivers/ata/pata_isapnp.c linux-2.6.32.46/drivers/ata/pata_isapnp.c
26093--- linux-2.6.32.46/drivers/ata/pata_isapnp.c 2011-03-27 14:31:47.000000000 -0400
26094+++ linux-2.6.32.46/drivers/ata/pata_isapnp.c 2011-04-17 15:56:46.000000000 -0400
26095@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
26096 ATA_PIO_SHT(DRV_NAME),
26097 };
26098
26099-static struct ata_port_operations isapnp_port_ops = {
26100+static const struct ata_port_operations isapnp_port_ops = {
26101 .inherits = &ata_sff_port_ops,
26102 .cable_detect = ata_cable_40wire,
26103 };
26104
26105-static struct ata_port_operations isapnp_noalt_port_ops = {
26106+static const struct ata_port_operations isapnp_noalt_port_ops = {
26107 .inherits = &ata_sff_port_ops,
26108 .cable_detect = ata_cable_40wire,
26109 /* No altstatus so we don't want to use the lost interrupt poll */
26110diff -urNp linux-2.6.32.46/drivers/ata/pata_it8213.c linux-2.6.32.46/drivers/ata/pata_it8213.c
26111--- linux-2.6.32.46/drivers/ata/pata_it8213.c 2011-03-27 14:31:47.000000000 -0400
26112+++ linux-2.6.32.46/drivers/ata/pata_it8213.c 2011-04-17 15:56:46.000000000 -0400
26113@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
26114 };
26115
26116
26117-static struct ata_port_operations it8213_ops = {
26118+static const struct ata_port_operations it8213_ops = {
26119 .inherits = &ata_bmdma_port_ops,
26120 .cable_detect = it8213_cable_detect,
26121 .set_piomode = it8213_set_piomode,
26122diff -urNp linux-2.6.32.46/drivers/ata/pata_it821x.c linux-2.6.32.46/drivers/ata/pata_it821x.c
26123--- linux-2.6.32.46/drivers/ata/pata_it821x.c 2011-03-27 14:31:47.000000000 -0400
26124+++ linux-2.6.32.46/drivers/ata/pata_it821x.c 2011-04-17 15:56:46.000000000 -0400
26125@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
26126 ATA_BMDMA_SHT(DRV_NAME),
26127 };
26128
26129-static struct ata_port_operations it821x_smart_port_ops = {
26130+static const struct ata_port_operations it821x_smart_port_ops = {
26131 .inherits = &ata_bmdma_port_ops,
26132
26133 .check_atapi_dma= it821x_check_atapi_dma,
26134@@ -814,7 +814,7 @@ static struct ata_port_operations it821x
26135 .port_start = it821x_port_start,
26136 };
26137
26138-static struct ata_port_operations it821x_passthru_port_ops = {
26139+static const struct ata_port_operations it821x_passthru_port_ops = {
26140 .inherits = &ata_bmdma_port_ops,
26141
26142 .check_atapi_dma= it821x_check_atapi_dma,
26143@@ -830,7 +830,7 @@ static struct ata_port_operations it821x
26144 .port_start = it821x_port_start,
26145 };
26146
26147-static struct ata_port_operations it821x_rdc_port_ops = {
26148+static const struct ata_port_operations it821x_rdc_port_ops = {
26149 .inherits = &ata_bmdma_port_ops,
26150
26151 .check_atapi_dma= it821x_check_atapi_dma,
26152diff -urNp linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c
26153--- linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c 2011-03-27 14:31:47.000000000 -0400
26154+++ linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:56:46.000000000 -0400
26155@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
26156 ATA_PIO_SHT(DRV_NAME),
26157 };
26158
26159-static struct ata_port_operations ixp4xx_port_ops = {
26160+static const struct ata_port_operations ixp4xx_port_ops = {
26161 .inherits = &ata_sff_port_ops,
26162 .sff_data_xfer = ixp4xx_mmio_data_xfer,
26163 .cable_detect = ata_cable_40wire,
26164diff -urNp linux-2.6.32.46/drivers/ata/pata_jmicron.c linux-2.6.32.46/drivers/ata/pata_jmicron.c
26165--- linux-2.6.32.46/drivers/ata/pata_jmicron.c 2011-03-27 14:31:47.000000000 -0400
26166+++ linux-2.6.32.46/drivers/ata/pata_jmicron.c 2011-04-17 15:56:46.000000000 -0400
26167@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
26168 ATA_BMDMA_SHT(DRV_NAME),
26169 };
26170
26171-static struct ata_port_operations jmicron_ops = {
26172+static const struct ata_port_operations jmicron_ops = {
26173 .inherits = &ata_bmdma_port_ops,
26174 .prereset = jmicron_pre_reset,
26175 };
26176diff -urNp linux-2.6.32.46/drivers/ata/pata_legacy.c linux-2.6.32.46/drivers/ata/pata_legacy.c
26177--- linux-2.6.32.46/drivers/ata/pata_legacy.c 2011-03-27 14:31:47.000000000 -0400
26178+++ linux-2.6.32.46/drivers/ata/pata_legacy.c 2011-04-17 15:56:46.000000000 -0400
26179@@ -106,7 +106,7 @@ struct legacy_probe {
26180
26181 struct legacy_controller {
26182 const char *name;
26183- struct ata_port_operations *ops;
26184+ const struct ata_port_operations *ops;
26185 unsigned int pio_mask;
26186 unsigned int flags;
26187 unsigned int pflags;
26188@@ -223,12 +223,12 @@ static const struct ata_port_operations
26189 * pio_mask as well.
26190 */
26191
26192-static struct ata_port_operations simple_port_ops = {
26193+static const struct ata_port_operations simple_port_ops = {
26194 .inherits = &legacy_base_port_ops,
26195 .sff_data_xfer = ata_sff_data_xfer_noirq,
26196 };
26197
26198-static struct ata_port_operations legacy_port_ops = {
26199+static const struct ata_port_operations legacy_port_ops = {
26200 .inherits = &legacy_base_port_ops,
26201 .sff_data_xfer = ata_sff_data_xfer_noirq,
26202 .set_mode = legacy_set_mode,
26203@@ -324,7 +324,7 @@ static unsigned int pdc_data_xfer_vlb(st
26204 return buflen;
26205 }
26206
26207-static struct ata_port_operations pdc20230_port_ops = {
26208+static const struct ata_port_operations pdc20230_port_ops = {
26209 .inherits = &legacy_base_port_ops,
26210 .set_piomode = pdc20230_set_piomode,
26211 .sff_data_xfer = pdc_data_xfer_vlb,
26212@@ -357,7 +357,7 @@ static void ht6560a_set_piomode(struct a
26213 ioread8(ap->ioaddr.status_addr);
26214 }
26215
26216-static struct ata_port_operations ht6560a_port_ops = {
26217+static const struct ata_port_operations ht6560a_port_ops = {
26218 .inherits = &legacy_base_port_ops,
26219 .set_piomode = ht6560a_set_piomode,
26220 };
26221@@ -400,7 +400,7 @@ static void ht6560b_set_piomode(struct a
26222 ioread8(ap->ioaddr.status_addr);
26223 }
26224
26225-static struct ata_port_operations ht6560b_port_ops = {
26226+static const struct ata_port_operations ht6560b_port_ops = {
26227 .inherits = &legacy_base_port_ops,
26228 .set_piomode = ht6560b_set_piomode,
26229 };
26230@@ -499,7 +499,7 @@ static void opti82c611a_set_piomode(stru
26231 }
26232
26233
26234-static struct ata_port_operations opti82c611a_port_ops = {
26235+static const struct ata_port_operations opti82c611a_port_ops = {
26236 .inherits = &legacy_base_port_ops,
26237 .set_piomode = opti82c611a_set_piomode,
26238 };
26239@@ -609,7 +609,7 @@ static unsigned int opti82c46x_qc_issue(
26240 return ata_sff_qc_issue(qc);
26241 }
26242
26243-static struct ata_port_operations opti82c46x_port_ops = {
26244+static const struct ata_port_operations opti82c46x_port_ops = {
26245 .inherits = &legacy_base_port_ops,
26246 .set_piomode = opti82c46x_set_piomode,
26247 .qc_issue = opti82c46x_qc_issue,
26248@@ -771,20 +771,20 @@ static int qdi_port(struct platform_devi
26249 return 0;
26250 }
26251
26252-static struct ata_port_operations qdi6500_port_ops = {
26253+static const struct ata_port_operations qdi6500_port_ops = {
26254 .inherits = &legacy_base_port_ops,
26255 .set_piomode = qdi6500_set_piomode,
26256 .qc_issue = qdi_qc_issue,
26257 .sff_data_xfer = vlb32_data_xfer,
26258 };
26259
26260-static struct ata_port_operations qdi6580_port_ops = {
26261+static const struct ata_port_operations qdi6580_port_ops = {
26262 .inherits = &legacy_base_port_ops,
26263 .set_piomode = qdi6580_set_piomode,
26264 .sff_data_xfer = vlb32_data_xfer,
26265 };
26266
26267-static struct ata_port_operations qdi6580dp_port_ops = {
26268+static const struct ata_port_operations qdi6580dp_port_ops = {
26269 .inherits = &legacy_base_port_ops,
26270 .set_piomode = qdi6580dp_set_piomode,
26271 .sff_data_xfer = vlb32_data_xfer,
26272@@ -855,7 +855,7 @@ static int winbond_port(struct platform_
26273 return 0;
26274 }
26275
26276-static struct ata_port_operations winbond_port_ops = {
26277+static const struct ata_port_operations winbond_port_ops = {
26278 .inherits = &legacy_base_port_ops,
26279 .set_piomode = winbond_set_piomode,
26280 .sff_data_xfer = vlb32_data_xfer,
26281@@ -978,7 +978,7 @@ static __init int legacy_init_one(struct
26282 int pio_modes = controller->pio_mask;
26283 unsigned long io = probe->port;
26284 u32 mask = (1 << probe->slot);
26285- struct ata_port_operations *ops = controller->ops;
26286+ const struct ata_port_operations *ops = controller->ops;
26287 struct legacy_data *ld = &legacy_data[probe->slot];
26288 struct ata_host *host = NULL;
26289 struct ata_port *ap;
26290diff -urNp linux-2.6.32.46/drivers/ata/pata_marvell.c linux-2.6.32.46/drivers/ata/pata_marvell.c
26291--- linux-2.6.32.46/drivers/ata/pata_marvell.c 2011-03-27 14:31:47.000000000 -0400
26292+++ linux-2.6.32.46/drivers/ata/pata_marvell.c 2011-04-17 15:56:46.000000000 -0400
26293@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
26294 ATA_BMDMA_SHT(DRV_NAME),
26295 };
26296
26297-static struct ata_port_operations marvell_ops = {
26298+static const struct ata_port_operations marvell_ops = {
26299 .inherits = &ata_bmdma_port_ops,
26300 .cable_detect = marvell_cable_detect,
26301 .prereset = marvell_pre_reset,
26302diff -urNp linux-2.6.32.46/drivers/ata/pata_mpc52xx.c linux-2.6.32.46/drivers/ata/pata_mpc52xx.c
26303--- linux-2.6.32.46/drivers/ata/pata_mpc52xx.c 2011-03-27 14:31:47.000000000 -0400
26304+++ linux-2.6.32.46/drivers/ata/pata_mpc52xx.c 2011-04-17 15:56:46.000000000 -0400
26305@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
26306 ATA_PIO_SHT(DRV_NAME),
26307 };
26308
26309-static struct ata_port_operations mpc52xx_ata_port_ops = {
26310+static const struct ata_port_operations mpc52xx_ata_port_ops = {
26311 .inherits = &ata_bmdma_port_ops,
26312 .sff_dev_select = mpc52xx_ata_dev_select,
26313 .set_piomode = mpc52xx_ata_set_piomode,
26314diff -urNp linux-2.6.32.46/drivers/ata/pata_mpiix.c linux-2.6.32.46/drivers/ata/pata_mpiix.c
26315--- linux-2.6.32.46/drivers/ata/pata_mpiix.c 2011-03-27 14:31:47.000000000 -0400
26316+++ linux-2.6.32.46/drivers/ata/pata_mpiix.c 2011-04-17 15:56:46.000000000 -0400
26317@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
26318 ATA_PIO_SHT(DRV_NAME),
26319 };
26320
26321-static struct ata_port_operations mpiix_port_ops = {
26322+static const struct ata_port_operations mpiix_port_ops = {
26323 .inherits = &ata_sff_port_ops,
26324 .qc_issue = mpiix_qc_issue,
26325 .cable_detect = ata_cable_40wire,
26326diff -urNp linux-2.6.32.46/drivers/ata/pata_netcell.c linux-2.6.32.46/drivers/ata/pata_netcell.c
26327--- linux-2.6.32.46/drivers/ata/pata_netcell.c 2011-03-27 14:31:47.000000000 -0400
26328+++ linux-2.6.32.46/drivers/ata/pata_netcell.c 2011-04-17 15:56:46.000000000 -0400
26329@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
26330 ATA_BMDMA_SHT(DRV_NAME),
26331 };
26332
26333-static struct ata_port_operations netcell_ops = {
26334+static const struct ata_port_operations netcell_ops = {
26335 .inherits = &ata_bmdma_port_ops,
26336 .cable_detect = ata_cable_80wire,
26337 .read_id = netcell_read_id,
26338diff -urNp linux-2.6.32.46/drivers/ata/pata_ninja32.c linux-2.6.32.46/drivers/ata/pata_ninja32.c
26339--- linux-2.6.32.46/drivers/ata/pata_ninja32.c 2011-03-27 14:31:47.000000000 -0400
26340+++ linux-2.6.32.46/drivers/ata/pata_ninja32.c 2011-04-17 15:56:46.000000000 -0400
26341@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
26342 ATA_BMDMA_SHT(DRV_NAME),
26343 };
26344
26345-static struct ata_port_operations ninja32_port_ops = {
26346+static const struct ata_port_operations ninja32_port_ops = {
26347 .inherits = &ata_bmdma_port_ops,
26348 .sff_dev_select = ninja32_dev_select,
26349 .cable_detect = ata_cable_40wire,
26350diff -urNp linux-2.6.32.46/drivers/ata/pata_ns87410.c linux-2.6.32.46/drivers/ata/pata_ns87410.c
26351--- linux-2.6.32.46/drivers/ata/pata_ns87410.c 2011-03-27 14:31:47.000000000 -0400
26352+++ linux-2.6.32.46/drivers/ata/pata_ns87410.c 2011-04-17 15:56:46.000000000 -0400
26353@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
26354 ATA_PIO_SHT(DRV_NAME),
26355 };
26356
26357-static struct ata_port_operations ns87410_port_ops = {
26358+static const struct ata_port_operations ns87410_port_ops = {
26359 .inherits = &ata_sff_port_ops,
26360 .qc_issue = ns87410_qc_issue,
26361 .cable_detect = ata_cable_40wire,
26362diff -urNp linux-2.6.32.46/drivers/ata/pata_ns87415.c linux-2.6.32.46/drivers/ata/pata_ns87415.c
26363--- linux-2.6.32.46/drivers/ata/pata_ns87415.c 2011-03-27 14:31:47.000000000 -0400
26364+++ linux-2.6.32.46/drivers/ata/pata_ns87415.c 2011-04-17 15:56:46.000000000 -0400
26365@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
26366 }
26367 #endif /* 87560 SuperIO Support */
26368
26369-static struct ata_port_operations ns87415_pata_ops = {
26370+static const struct ata_port_operations ns87415_pata_ops = {
26371 .inherits = &ata_bmdma_port_ops,
26372
26373 .check_atapi_dma = ns87415_check_atapi_dma,
26374@@ -313,7 +313,7 @@ static struct ata_port_operations ns8741
26375 };
26376
26377 #if defined(CONFIG_SUPERIO)
26378-static struct ata_port_operations ns87560_pata_ops = {
26379+static const struct ata_port_operations ns87560_pata_ops = {
26380 .inherits = &ns87415_pata_ops,
26381 .sff_tf_read = ns87560_tf_read,
26382 .sff_check_status = ns87560_check_status,
26383diff -urNp linux-2.6.32.46/drivers/ata/pata_octeon_cf.c linux-2.6.32.46/drivers/ata/pata_octeon_cf.c
26384--- linux-2.6.32.46/drivers/ata/pata_octeon_cf.c 2011-03-27 14:31:47.000000000 -0400
26385+++ linux-2.6.32.46/drivers/ata/pata_octeon_cf.c 2011-04-17 15:56:46.000000000 -0400
26386@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
26387 return 0;
26388 }
26389
26390+/* cannot be const */
26391 static struct ata_port_operations octeon_cf_ops = {
26392 .inherits = &ata_sff_port_ops,
26393 .check_atapi_dma = octeon_cf_check_atapi_dma,
26394diff -urNp linux-2.6.32.46/drivers/ata/pata_oldpiix.c linux-2.6.32.46/drivers/ata/pata_oldpiix.c
26395--- linux-2.6.32.46/drivers/ata/pata_oldpiix.c 2011-03-27 14:31:47.000000000 -0400
26396+++ linux-2.6.32.46/drivers/ata/pata_oldpiix.c 2011-04-17 15:56:46.000000000 -0400
26397@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
26398 ATA_BMDMA_SHT(DRV_NAME),
26399 };
26400
26401-static struct ata_port_operations oldpiix_pata_ops = {
26402+static const struct ata_port_operations oldpiix_pata_ops = {
26403 .inherits = &ata_bmdma_port_ops,
26404 .qc_issue = oldpiix_qc_issue,
26405 .cable_detect = ata_cable_40wire,
26406diff -urNp linux-2.6.32.46/drivers/ata/pata_opti.c linux-2.6.32.46/drivers/ata/pata_opti.c
26407--- linux-2.6.32.46/drivers/ata/pata_opti.c 2011-03-27 14:31:47.000000000 -0400
26408+++ linux-2.6.32.46/drivers/ata/pata_opti.c 2011-04-17 15:56:46.000000000 -0400
26409@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
26410 ATA_PIO_SHT(DRV_NAME),
26411 };
26412
26413-static struct ata_port_operations opti_port_ops = {
26414+static const struct ata_port_operations opti_port_ops = {
26415 .inherits = &ata_sff_port_ops,
26416 .cable_detect = ata_cable_40wire,
26417 .set_piomode = opti_set_piomode,
26418diff -urNp linux-2.6.32.46/drivers/ata/pata_optidma.c linux-2.6.32.46/drivers/ata/pata_optidma.c
26419--- linux-2.6.32.46/drivers/ata/pata_optidma.c 2011-03-27 14:31:47.000000000 -0400
26420+++ linux-2.6.32.46/drivers/ata/pata_optidma.c 2011-04-17 15:56:46.000000000 -0400
26421@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
26422 ATA_BMDMA_SHT(DRV_NAME),
26423 };
26424
26425-static struct ata_port_operations optidma_port_ops = {
26426+static const struct ata_port_operations optidma_port_ops = {
26427 .inherits = &ata_bmdma_port_ops,
26428 .cable_detect = ata_cable_40wire,
26429 .set_piomode = optidma_set_pio_mode,
26430@@ -346,7 +346,7 @@ static struct ata_port_operations optidm
26431 .prereset = optidma_pre_reset,
26432 };
26433
26434-static struct ata_port_operations optiplus_port_ops = {
26435+static const struct ata_port_operations optiplus_port_ops = {
26436 .inherits = &optidma_port_ops,
26437 .set_piomode = optiplus_set_pio_mode,
26438 .set_dmamode = optiplus_set_dma_mode,
26439diff -urNp linux-2.6.32.46/drivers/ata/pata_palmld.c linux-2.6.32.46/drivers/ata/pata_palmld.c
26440--- linux-2.6.32.46/drivers/ata/pata_palmld.c 2011-03-27 14:31:47.000000000 -0400
26441+++ linux-2.6.32.46/drivers/ata/pata_palmld.c 2011-04-17 15:56:46.000000000 -0400
26442@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
26443 ATA_PIO_SHT(DRV_NAME),
26444 };
26445
26446-static struct ata_port_operations palmld_port_ops = {
26447+static const struct ata_port_operations palmld_port_ops = {
26448 .inherits = &ata_sff_port_ops,
26449 .sff_data_xfer = ata_sff_data_xfer_noirq,
26450 .cable_detect = ata_cable_40wire,
26451diff -urNp linux-2.6.32.46/drivers/ata/pata_pcmcia.c linux-2.6.32.46/drivers/ata/pata_pcmcia.c
26452--- linux-2.6.32.46/drivers/ata/pata_pcmcia.c 2011-03-27 14:31:47.000000000 -0400
26453+++ linux-2.6.32.46/drivers/ata/pata_pcmcia.c 2011-04-17 15:56:46.000000000 -0400
26454@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
26455 ATA_PIO_SHT(DRV_NAME),
26456 };
26457
26458-static struct ata_port_operations pcmcia_port_ops = {
26459+static const struct ata_port_operations pcmcia_port_ops = {
26460 .inherits = &ata_sff_port_ops,
26461 .sff_data_xfer = ata_sff_data_xfer_noirq,
26462 .cable_detect = ata_cable_40wire,
26463 .set_mode = pcmcia_set_mode,
26464 };
26465
26466-static struct ata_port_operations pcmcia_8bit_port_ops = {
26467+static const struct ata_port_operations pcmcia_8bit_port_ops = {
26468 .inherits = &ata_sff_port_ops,
26469 .sff_data_xfer = ata_data_xfer_8bit,
26470 .cable_detect = ata_cable_40wire,
26471@@ -256,7 +256,7 @@ static int pcmcia_init_one(struct pcmcia
26472 unsigned long io_base, ctl_base;
26473 void __iomem *io_addr, *ctl_addr;
26474 int n_ports = 1;
26475- struct ata_port_operations *ops = &pcmcia_port_ops;
26476+ const struct ata_port_operations *ops = &pcmcia_port_ops;
26477
26478 info = kzalloc(sizeof(*info), GFP_KERNEL);
26479 if (info == NULL)
26480diff -urNp linux-2.6.32.46/drivers/ata/pata_pdc2027x.c linux-2.6.32.46/drivers/ata/pata_pdc2027x.c
26481--- linux-2.6.32.46/drivers/ata/pata_pdc2027x.c 2011-03-27 14:31:47.000000000 -0400
26482+++ linux-2.6.32.46/drivers/ata/pata_pdc2027x.c 2011-04-17 15:56:46.000000000 -0400
26483@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
26484 ATA_BMDMA_SHT(DRV_NAME),
26485 };
26486
26487-static struct ata_port_operations pdc2027x_pata100_ops = {
26488+static const struct ata_port_operations pdc2027x_pata100_ops = {
26489 .inherits = &ata_bmdma_port_ops,
26490 .check_atapi_dma = pdc2027x_check_atapi_dma,
26491 .cable_detect = pdc2027x_cable_detect,
26492 .prereset = pdc2027x_prereset,
26493 };
26494
26495-static struct ata_port_operations pdc2027x_pata133_ops = {
26496+static const struct ata_port_operations pdc2027x_pata133_ops = {
26497 .inherits = &pdc2027x_pata100_ops,
26498 .mode_filter = pdc2027x_mode_filter,
26499 .set_piomode = pdc2027x_set_piomode,
26500diff -urNp linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c
26501--- linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c 2011-03-27 14:31:47.000000000 -0400
26502+++ linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:56:46.000000000 -0400
26503@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
26504 ATA_BMDMA_SHT(DRV_NAME),
26505 };
26506
26507-static struct ata_port_operations pdc2024x_port_ops = {
26508+static const struct ata_port_operations pdc2024x_port_ops = {
26509 .inherits = &ata_bmdma_port_ops,
26510
26511 .cable_detect = ata_cable_40wire,
26512@@ -284,7 +284,7 @@ static struct ata_port_operations pdc202
26513 .sff_exec_command = pdc202xx_exec_command,
26514 };
26515
26516-static struct ata_port_operations pdc2026x_port_ops = {
26517+static const struct ata_port_operations pdc2026x_port_ops = {
26518 .inherits = &pdc2024x_port_ops,
26519
26520 .check_atapi_dma = pdc2026x_check_atapi_dma,
26521diff -urNp linux-2.6.32.46/drivers/ata/pata_platform.c linux-2.6.32.46/drivers/ata/pata_platform.c
26522--- linux-2.6.32.46/drivers/ata/pata_platform.c 2011-03-27 14:31:47.000000000 -0400
26523+++ linux-2.6.32.46/drivers/ata/pata_platform.c 2011-04-17 15:56:46.000000000 -0400
26524@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
26525 ATA_PIO_SHT(DRV_NAME),
26526 };
26527
26528-static struct ata_port_operations pata_platform_port_ops = {
26529+static const struct ata_port_operations pata_platform_port_ops = {
26530 .inherits = &ata_sff_port_ops,
26531 .sff_data_xfer = ata_sff_data_xfer_noirq,
26532 .cable_detect = ata_cable_unknown,
26533diff -urNp linux-2.6.32.46/drivers/ata/pata_qdi.c linux-2.6.32.46/drivers/ata/pata_qdi.c
26534--- linux-2.6.32.46/drivers/ata/pata_qdi.c 2011-03-27 14:31:47.000000000 -0400
26535+++ linux-2.6.32.46/drivers/ata/pata_qdi.c 2011-04-17 15:56:46.000000000 -0400
26536@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
26537 ATA_PIO_SHT(DRV_NAME),
26538 };
26539
26540-static struct ata_port_operations qdi6500_port_ops = {
26541+static const struct ata_port_operations qdi6500_port_ops = {
26542 .inherits = &ata_sff_port_ops,
26543 .qc_issue = qdi_qc_issue,
26544 .sff_data_xfer = qdi_data_xfer,
26545@@ -165,7 +165,7 @@ static struct ata_port_operations qdi650
26546 .set_piomode = qdi6500_set_piomode,
26547 };
26548
26549-static struct ata_port_operations qdi6580_port_ops = {
26550+static const struct ata_port_operations qdi6580_port_ops = {
26551 .inherits = &qdi6500_port_ops,
26552 .set_piomode = qdi6580_set_piomode,
26553 };
26554diff -urNp linux-2.6.32.46/drivers/ata/pata_radisys.c linux-2.6.32.46/drivers/ata/pata_radisys.c
26555--- linux-2.6.32.46/drivers/ata/pata_radisys.c 2011-03-27 14:31:47.000000000 -0400
26556+++ linux-2.6.32.46/drivers/ata/pata_radisys.c 2011-04-17 15:56:46.000000000 -0400
26557@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
26558 ATA_BMDMA_SHT(DRV_NAME),
26559 };
26560
26561-static struct ata_port_operations radisys_pata_ops = {
26562+static const struct ata_port_operations radisys_pata_ops = {
26563 .inherits = &ata_bmdma_port_ops,
26564 .qc_issue = radisys_qc_issue,
26565 .cable_detect = ata_cable_unknown,
26566diff -urNp linux-2.6.32.46/drivers/ata/pata_rb532_cf.c linux-2.6.32.46/drivers/ata/pata_rb532_cf.c
26567--- linux-2.6.32.46/drivers/ata/pata_rb532_cf.c 2011-03-27 14:31:47.000000000 -0400
26568+++ linux-2.6.32.46/drivers/ata/pata_rb532_cf.c 2011-04-17 15:56:46.000000000 -0400
26569@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
26570 return IRQ_HANDLED;
26571 }
26572
26573-static struct ata_port_operations rb532_pata_port_ops = {
26574+static const struct ata_port_operations rb532_pata_port_ops = {
26575 .inherits = &ata_sff_port_ops,
26576 .sff_data_xfer = ata_sff_data_xfer32,
26577 };
26578diff -urNp linux-2.6.32.46/drivers/ata/pata_rdc.c linux-2.6.32.46/drivers/ata/pata_rdc.c
26579--- linux-2.6.32.46/drivers/ata/pata_rdc.c 2011-03-27 14:31:47.000000000 -0400
26580+++ linux-2.6.32.46/drivers/ata/pata_rdc.c 2011-04-17 15:56:46.000000000 -0400
26581@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
26582 pci_write_config_byte(dev, 0x48, udma_enable);
26583 }
26584
26585-static struct ata_port_operations rdc_pata_ops = {
26586+static const struct ata_port_operations rdc_pata_ops = {
26587 .inherits = &ata_bmdma32_port_ops,
26588 .cable_detect = rdc_pata_cable_detect,
26589 .set_piomode = rdc_set_piomode,
26590diff -urNp linux-2.6.32.46/drivers/ata/pata_rz1000.c linux-2.6.32.46/drivers/ata/pata_rz1000.c
26591--- linux-2.6.32.46/drivers/ata/pata_rz1000.c 2011-03-27 14:31:47.000000000 -0400
26592+++ linux-2.6.32.46/drivers/ata/pata_rz1000.c 2011-04-17 15:56:46.000000000 -0400
26593@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
26594 ATA_PIO_SHT(DRV_NAME),
26595 };
26596
26597-static struct ata_port_operations rz1000_port_ops = {
26598+static const struct ata_port_operations rz1000_port_ops = {
26599 .inherits = &ata_sff_port_ops,
26600 .cable_detect = ata_cable_40wire,
26601 .set_mode = rz1000_set_mode,
26602diff -urNp linux-2.6.32.46/drivers/ata/pata_sc1200.c linux-2.6.32.46/drivers/ata/pata_sc1200.c
26603--- linux-2.6.32.46/drivers/ata/pata_sc1200.c 2011-03-27 14:31:47.000000000 -0400
26604+++ linux-2.6.32.46/drivers/ata/pata_sc1200.c 2011-04-17 15:56:46.000000000 -0400
26605@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
26606 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
26607 };
26608
26609-static struct ata_port_operations sc1200_port_ops = {
26610+static const struct ata_port_operations sc1200_port_ops = {
26611 .inherits = &ata_bmdma_port_ops,
26612 .qc_prep = ata_sff_dumb_qc_prep,
26613 .qc_issue = sc1200_qc_issue,
26614diff -urNp linux-2.6.32.46/drivers/ata/pata_scc.c linux-2.6.32.46/drivers/ata/pata_scc.c
26615--- linux-2.6.32.46/drivers/ata/pata_scc.c 2011-03-27 14:31:47.000000000 -0400
26616+++ linux-2.6.32.46/drivers/ata/pata_scc.c 2011-04-17 15:56:46.000000000 -0400
26617@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
26618 ATA_BMDMA_SHT(DRV_NAME),
26619 };
26620
26621-static struct ata_port_operations scc_pata_ops = {
26622+static const struct ata_port_operations scc_pata_ops = {
26623 .inherits = &ata_bmdma_port_ops,
26624
26625 .set_piomode = scc_set_piomode,
26626diff -urNp linux-2.6.32.46/drivers/ata/pata_sch.c linux-2.6.32.46/drivers/ata/pata_sch.c
26627--- linux-2.6.32.46/drivers/ata/pata_sch.c 2011-03-27 14:31:47.000000000 -0400
26628+++ linux-2.6.32.46/drivers/ata/pata_sch.c 2011-04-17 15:56:46.000000000 -0400
26629@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
26630 ATA_BMDMA_SHT(DRV_NAME),
26631 };
26632
26633-static struct ata_port_operations sch_pata_ops = {
26634+static const struct ata_port_operations sch_pata_ops = {
26635 .inherits = &ata_bmdma_port_ops,
26636 .cable_detect = ata_cable_unknown,
26637 .set_piomode = sch_set_piomode,
26638diff -urNp linux-2.6.32.46/drivers/ata/pata_serverworks.c linux-2.6.32.46/drivers/ata/pata_serverworks.c
26639--- linux-2.6.32.46/drivers/ata/pata_serverworks.c 2011-03-27 14:31:47.000000000 -0400
26640+++ linux-2.6.32.46/drivers/ata/pata_serverworks.c 2011-04-17 15:56:46.000000000 -0400
26641@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
26642 ATA_BMDMA_SHT(DRV_NAME),
26643 };
26644
26645-static struct ata_port_operations serverworks_osb4_port_ops = {
26646+static const struct ata_port_operations serverworks_osb4_port_ops = {
26647 .inherits = &ata_bmdma_port_ops,
26648 .cable_detect = serverworks_cable_detect,
26649 .mode_filter = serverworks_osb4_filter,
26650@@ -307,7 +307,7 @@ static struct ata_port_operations server
26651 .set_dmamode = serverworks_set_dmamode,
26652 };
26653
26654-static struct ata_port_operations serverworks_csb_port_ops = {
26655+static const struct ata_port_operations serverworks_csb_port_ops = {
26656 .inherits = &serverworks_osb4_port_ops,
26657 .mode_filter = serverworks_csb_filter,
26658 };
26659diff -urNp linux-2.6.32.46/drivers/ata/pata_sil680.c linux-2.6.32.46/drivers/ata/pata_sil680.c
26660--- linux-2.6.32.46/drivers/ata/pata_sil680.c 2011-06-25 12:55:34.000000000 -0400
26661+++ linux-2.6.32.46/drivers/ata/pata_sil680.c 2011-06-25 12:56:37.000000000 -0400
26662@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
26663 ATA_BMDMA_SHT(DRV_NAME),
26664 };
26665
26666-static struct ata_port_operations sil680_port_ops = {
26667+static const struct ata_port_operations sil680_port_ops = {
26668 .inherits = &ata_bmdma32_port_ops,
26669 .cable_detect = sil680_cable_detect,
26670 .set_piomode = sil680_set_piomode,
26671diff -urNp linux-2.6.32.46/drivers/ata/pata_sis.c linux-2.6.32.46/drivers/ata/pata_sis.c
26672--- linux-2.6.32.46/drivers/ata/pata_sis.c 2011-03-27 14:31:47.000000000 -0400
26673+++ linux-2.6.32.46/drivers/ata/pata_sis.c 2011-04-17 15:56:46.000000000 -0400
26674@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
26675 ATA_BMDMA_SHT(DRV_NAME),
26676 };
26677
26678-static struct ata_port_operations sis_133_for_sata_ops = {
26679+static const struct ata_port_operations sis_133_for_sata_ops = {
26680 .inherits = &ata_bmdma_port_ops,
26681 .set_piomode = sis_133_set_piomode,
26682 .set_dmamode = sis_133_set_dmamode,
26683 .cable_detect = sis_133_cable_detect,
26684 };
26685
26686-static struct ata_port_operations sis_base_ops = {
26687+static const struct ata_port_operations sis_base_ops = {
26688 .inherits = &ata_bmdma_port_ops,
26689 .prereset = sis_pre_reset,
26690 };
26691
26692-static struct ata_port_operations sis_133_ops = {
26693+static const struct ata_port_operations sis_133_ops = {
26694 .inherits = &sis_base_ops,
26695 .set_piomode = sis_133_set_piomode,
26696 .set_dmamode = sis_133_set_dmamode,
26697 .cable_detect = sis_133_cable_detect,
26698 };
26699
26700-static struct ata_port_operations sis_133_early_ops = {
26701+static const struct ata_port_operations sis_133_early_ops = {
26702 .inherits = &sis_base_ops,
26703 .set_piomode = sis_100_set_piomode,
26704 .set_dmamode = sis_133_early_set_dmamode,
26705 .cable_detect = sis_66_cable_detect,
26706 };
26707
26708-static struct ata_port_operations sis_100_ops = {
26709+static const struct ata_port_operations sis_100_ops = {
26710 .inherits = &sis_base_ops,
26711 .set_piomode = sis_100_set_piomode,
26712 .set_dmamode = sis_100_set_dmamode,
26713 .cable_detect = sis_66_cable_detect,
26714 };
26715
26716-static struct ata_port_operations sis_66_ops = {
26717+static const struct ata_port_operations sis_66_ops = {
26718 .inherits = &sis_base_ops,
26719 .set_piomode = sis_old_set_piomode,
26720 .set_dmamode = sis_66_set_dmamode,
26721 .cable_detect = sis_66_cable_detect,
26722 };
26723
26724-static struct ata_port_operations sis_old_ops = {
26725+static const struct ata_port_operations sis_old_ops = {
26726 .inherits = &sis_base_ops,
26727 .set_piomode = sis_old_set_piomode,
26728 .set_dmamode = sis_old_set_dmamode,
26729diff -urNp linux-2.6.32.46/drivers/ata/pata_sl82c105.c linux-2.6.32.46/drivers/ata/pata_sl82c105.c
26730--- linux-2.6.32.46/drivers/ata/pata_sl82c105.c 2011-03-27 14:31:47.000000000 -0400
26731+++ linux-2.6.32.46/drivers/ata/pata_sl82c105.c 2011-04-17 15:56:46.000000000 -0400
26732@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
26733 ATA_BMDMA_SHT(DRV_NAME),
26734 };
26735
26736-static struct ata_port_operations sl82c105_port_ops = {
26737+static const struct ata_port_operations sl82c105_port_ops = {
26738 .inherits = &ata_bmdma_port_ops,
26739 .qc_defer = sl82c105_qc_defer,
26740 .bmdma_start = sl82c105_bmdma_start,
26741diff -urNp linux-2.6.32.46/drivers/ata/pata_triflex.c linux-2.6.32.46/drivers/ata/pata_triflex.c
26742--- linux-2.6.32.46/drivers/ata/pata_triflex.c 2011-03-27 14:31:47.000000000 -0400
26743+++ linux-2.6.32.46/drivers/ata/pata_triflex.c 2011-04-17 15:56:46.000000000 -0400
26744@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
26745 ATA_BMDMA_SHT(DRV_NAME),
26746 };
26747
26748-static struct ata_port_operations triflex_port_ops = {
26749+static const struct ata_port_operations triflex_port_ops = {
26750 .inherits = &ata_bmdma_port_ops,
26751 .bmdma_start = triflex_bmdma_start,
26752 .bmdma_stop = triflex_bmdma_stop,
26753diff -urNp linux-2.6.32.46/drivers/ata/pata_via.c linux-2.6.32.46/drivers/ata/pata_via.c
26754--- linux-2.6.32.46/drivers/ata/pata_via.c 2011-03-27 14:31:47.000000000 -0400
26755+++ linux-2.6.32.46/drivers/ata/pata_via.c 2011-04-17 15:56:46.000000000 -0400
26756@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
26757 ATA_BMDMA_SHT(DRV_NAME),
26758 };
26759
26760-static struct ata_port_operations via_port_ops = {
26761+static const struct ata_port_operations via_port_ops = {
26762 .inherits = &ata_bmdma_port_ops,
26763 .cable_detect = via_cable_detect,
26764 .set_piomode = via_set_piomode,
26765@@ -429,7 +429,7 @@ static struct ata_port_operations via_po
26766 .port_start = via_port_start,
26767 };
26768
26769-static struct ata_port_operations via_port_ops_noirq = {
26770+static const struct ata_port_operations via_port_ops_noirq = {
26771 .inherits = &via_port_ops,
26772 .sff_data_xfer = ata_sff_data_xfer_noirq,
26773 };
26774diff -urNp linux-2.6.32.46/drivers/ata/pata_winbond.c linux-2.6.32.46/drivers/ata/pata_winbond.c
26775--- linux-2.6.32.46/drivers/ata/pata_winbond.c 2011-03-27 14:31:47.000000000 -0400
26776+++ linux-2.6.32.46/drivers/ata/pata_winbond.c 2011-04-17 15:56:46.000000000 -0400
26777@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
26778 ATA_PIO_SHT(DRV_NAME),
26779 };
26780
26781-static struct ata_port_operations winbond_port_ops = {
26782+static const struct ata_port_operations winbond_port_ops = {
26783 .inherits = &ata_sff_port_ops,
26784 .sff_data_xfer = winbond_data_xfer,
26785 .cable_detect = ata_cable_40wire,
26786diff -urNp linux-2.6.32.46/drivers/ata/pdc_adma.c linux-2.6.32.46/drivers/ata/pdc_adma.c
26787--- linux-2.6.32.46/drivers/ata/pdc_adma.c 2011-03-27 14:31:47.000000000 -0400
26788+++ linux-2.6.32.46/drivers/ata/pdc_adma.c 2011-04-17 15:56:46.000000000 -0400
26789@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
26790 .dma_boundary = ADMA_DMA_BOUNDARY,
26791 };
26792
26793-static struct ata_port_operations adma_ata_ops = {
26794+static const struct ata_port_operations adma_ata_ops = {
26795 .inherits = &ata_sff_port_ops,
26796
26797 .lost_interrupt = ATA_OP_NULL,
26798diff -urNp linux-2.6.32.46/drivers/ata/sata_fsl.c linux-2.6.32.46/drivers/ata/sata_fsl.c
26799--- linux-2.6.32.46/drivers/ata/sata_fsl.c 2011-03-27 14:31:47.000000000 -0400
26800+++ linux-2.6.32.46/drivers/ata/sata_fsl.c 2011-04-17 15:56:46.000000000 -0400
26801@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
26802 .dma_boundary = ATA_DMA_BOUNDARY,
26803 };
26804
26805-static struct ata_port_operations sata_fsl_ops = {
26806+static const struct ata_port_operations sata_fsl_ops = {
26807 .inherits = &sata_pmp_port_ops,
26808
26809 .qc_defer = ata_std_qc_defer,
26810diff -urNp linux-2.6.32.46/drivers/ata/sata_inic162x.c linux-2.6.32.46/drivers/ata/sata_inic162x.c
26811--- linux-2.6.32.46/drivers/ata/sata_inic162x.c 2011-03-27 14:31:47.000000000 -0400
26812+++ linux-2.6.32.46/drivers/ata/sata_inic162x.c 2011-04-17 15:56:46.000000000 -0400
26813@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
26814 return 0;
26815 }
26816
26817-static struct ata_port_operations inic_port_ops = {
26818+static const struct ata_port_operations inic_port_ops = {
26819 .inherits = &sata_port_ops,
26820
26821 .check_atapi_dma = inic_check_atapi_dma,
26822diff -urNp linux-2.6.32.46/drivers/ata/sata_mv.c linux-2.6.32.46/drivers/ata/sata_mv.c
26823--- linux-2.6.32.46/drivers/ata/sata_mv.c 2011-03-27 14:31:47.000000000 -0400
26824+++ linux-2.6.32.46/drivers/ata/sata_mv.c 2011-04-17 15:56:46.000000000 -0400
26825@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
26826 .dma_boundary = MV_DMA_BOUNDARY,
26827 };
26828
26829-static struct ata_port_operations mv5_ops = {
26830+static const struct ata_port_operations mv5_ops = {
26831 .inherits = &ata_sff_port_ops,
26832
26833 .lost_interrupt = ATA_OP_NULL,
26834@@ -678,7 +678,7 @@ static struct ata_port_operations mv5_op
26835 .port_stop = mv_port_stop,
26836 };
26837
26838-static struct ata_port_operations mv6_ops = {
26839+static const struct ata_port_operations mv6_ops = {
26840 .inherits = &mv5_ops,
26841 .dev_config = mv6_dev_config,
26842 .scr_read = mv_scr_read,
26843@@ -698,7 +698,7 @@ static struct ata_port_operations mv6_op
26844 .bmdma_status = mv_bmdma_status,
26845 };
26846
26847-static struct ata_port_operations mv_iie_ops = {
26848+static const struct ata_port_operations mv_iie_ops = {
26849 .inherits = &mv6_ops,
26850 .dev_config = ATA_OP_NULL,
26851 .qc_prep = mv_qc_prep_iie,
26852diff -urNp linux-2.6.32.46/drivers/ata/sata_nv.c linux-2.6.32.46/drivers/ata/sata_nv.c
26853--- linux-2.6.32.46/drivers/ata/sata_nv.c 2011-03-27 14:31:47.000000000 -0400
26854+++ linux-2.6.32.46/drivers/ata/sata_nv.c 2011-04-17 15:56:46.000000000 -0400
26855@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
26856 * cases. Define nv_hardreset() which only kicks in for post-boot
26857 * probing and use it for all variants.
26858 */
26859-static struct ata_port_operations nv_generic_ops = {
26860+static const struct ata_port_operations nv_generic_ops = {
26861 .inherits = &ata_bmdma_port_ops,
26862 .lost_interrupt = ATA_OP_NULL,
26863 .scr_read = nv_scr_read,
26864@@ -472,20 +472,20 @@ static struct ata_port_operations nv_gen
26865 .hardreset = nv_hardreset,
26866 };
26867
26868-static struct ata_port_operations nv_nf2_ops = {
26869+static const struct ata_port_operations nv_nf2_ops = {
26870 .inherits = &nv_generic_ops,
26871 .freeze = nv_nf2_freeze,
26872 .thaw = nv_nf2_thaw,
26873 };
26874
26875-static struct ata_port_operations nv_ck804_ops = {
26876+static const struct ata_port_operations nv_ck804_ops = {
26877 .inherits = &nv_generic_ops,
26878 .freeze = nv_ck804_freeze,
26879 .thaw = nv_ck804_thaw,
26880 .host_stop = nv_ck804_host_stop,
26881 };
26882
26883-static struct ata_port_operations nv_adma_ops = {
26884+static const struct ata_port_operations nv_adma_ops = {
26885 .inherits = &nv_ck804_ops,
26886
26887 .check_atapi_dma = nv_adma_check_atapi_dma,
26888@@ -509,7 +509,7 @@ static struct ata_port_operations nv_adm
26889 .host_stop = nv_adma_host_stop,
26890 };
26891
26892-static struct ata_port_operations nv_swncq_ops = {
26893+static const struct ata_port_operations nv_swncq_ops = {
26894 .inherits = &nv_generic_ops,
26895
26896 .qc_defer = ata_std_qc_defer,
26897diff -urNp linux-2.6.32.46/drivers/ata/sata_promise.c linux-2.6.32.46/drivers/ata/sata_promise.c
26898--- linux-2.6.32.46/drivers/ata/sata_promise.c 2011-03-27 14:31:47.000000000 -0400
26899+++ linux-2.6.32.46/drivers/ata/sata_promise.c 2011-04-17 15:56:46.000000000 -0400
26900@@ -195,7 +195,7 @@ static const struct ata_port_operations
26901 .error_handler = pdc_error_handler,
26902 };
26903
26904-static struct ata_port_operations pdc_sata_ops = {
26905+static const struct ata_port_operations pdc_sata_ops = {
26906 .inherits = &pdc_common_ops,
26907 .cable_detect = pdc_sata_cable_detect,
26908 .freeze = pdc_sata_freeze,
26909@@ -208,14 +208,14 @@ static struct ata_port_operations pdc_sa
26910
26911 /* First-generation chips need a more restrictive ->check_atapi_dma op,
26912 and ->freeze/thaw that ignore the hotplug controls. */
26913-static struct ata_port_operations pdc_old_sata_ops = {
26914+static const struct ata_port_operations pdc_old_sata_ops = {
26915 .inherits = &pdc_sata_ops,
26916 .freeze = pdc_freeze,
26917 .thaw = pdc_thaw,
26918 .check_atapi_dma = pdc_old_sata_check_atapi_dma,
26919 };
26920
26921-static struct ata_port_operations pdc_pata_ops = {
26922+static const struct ata_port_operations pdc_pata_ops = {
26923 .inherits = &pdc_common_ops,
26924 .cable_detect = pdc_pata_cable_detect,
26925 .freeze = pdc_freeze,
26926diff -urNp linux-2.6.32.46/drivers/ata/sata_qstor.c linux-2.6.32.46/drivers/ata/sata_qstor.c
26927--- linux-2.6.32.46/drivers/ata/sata_qstor.c 2011-03-27 14:31:47.000000000 -0400
26928+++ linux-2.6.32.46/drivers/ata/sata_qstor.c 2011-04-17 15:56:46.000000000 -0400
26929@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
26930 .dma_boundary = QS_DMA_BOUNDARY,
26931 };
26932
26933-static struct ata_port_operations qs_ata_ops = {
26934+static const struct ata_port_operations qs_ata_ops = {
26935 .inherits = &ata_sff_port_ops,
26936
26937 .check_atapi_dma = qs_check_atapi_dma,
26938diff -urNp linux-2.6.32.46/drivers/ata/sata_sil24.c linux-2.6.32.46/drivers/ata/sata_sil24.c
26939--- linux-2.6.32.46/drivers/ata/sata_sil24.c 2011-03-27 14:31:47.000000000 -0400
26940+++ linux-2.6.32.46/drivers/ata/sata_sil24.c 2011-04-17 15:56:46.000000000 -0400
26941@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
26942 .dma_boundary = ATA_DMA_BOUNDARY,
26943 };
26944
26945-static struct ata_port_operations sil24_ops = {
26946+static const struct ata_port_operations sil24_ops = {
26947 .inherits = &sata_pmp_port_ops,
26948
26949 .qc_defer = sil24_qc_defer,
26950diff -urNp linux-2.6.32.46/drivers/ata/sata_sil.c linux-2.6.32.46/drivers/ata/sata_sil.c
26951--- linux-2.6.32.46/drivers/ata/sata_sil.c 2011-03-27 14:31:47.000000000 -0400
26952+++ linux-2.6.32.46/drivers/ata/sata_sil.c 2011-04-17 15:56:46.000000000 -0400
26953@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
26954 .sg_tablesize = ATA_MAX_PRD
26955 };
26956
26957-static struct ata_port_operations sil_ops = {
26958+static const struct ata_port_operations sil_ops = {
26959 .inherits = &ata_bmdma32_port_ops,
26960 .dev_config = sil_dev_config,
26961 .set_mode = sil_set_mode,
26962diff -urNp linux-2.6.32.46/drivers/ata/sata_sis.c linux-2.6.32.46/drivers/ata/sata_sis.c
26963--- linux-2.6.32.46/drivers/ata/sata_sis.c 2011-03-27 14:31:47.000000000 -0400
26964+++ linux-2.6.32.46/drivers/ata/sata_sis.c 2011-04-17 15:56:46.000000000 -0400
26965@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
26966 ATA_BMDMA_SHT(DRV_NAME),
26967 };
26968
26969-static struct ata_port_operations sis_ops = {
26970+static const struct ata_port_operations sis_ops = {
26971 .inherits = &ata_bmdma_port_ops,
26972 .scr_read = sis_scr_read,
26973 .scr_write = sis_scr_write,
26974diff -urNp linux-2.6.32.46/drivers/ata/sata_svw.c linux-2.6.32.46/drivers/ata/sata_svw.c
26975--- linux-2.6.32.46/drivers/ata/sata_svw.c 2011-03-27 14:31:47.000000000 -0400
26976+++ linux-2.6.32.46/drivers/ata/sata_svw.c 2011-04-17 15:56:46.000000000 -0400
26977@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
26978 };
26979
26980
26981-static struct ata_port_operations k2_sata_ops = {
26982+static const struct ata_port_operations k2_sata_ops = {
26983 .inherits = &ata_bmdma_port_ops,
26984 .sff_tf_load = k2_sata_tf_load,
26985 .sff_tf_read = k2_sata_tf_read,
26986diff -urNp linux-2.6.32.46/drivers/ata/sata_sx4.c linux-2.6.32.46/drivers/ata/sata_sx4.c
26987--- linux-2.6.32.46/drivers/ata/sata_sx4.c 2011-03-27 14:31:47.000000000 -0400
26988+++ linux-2.6.32.46/drivers/ata/sata_sx4.c 2011-04-17 15:56:46.000000000 -0400
26989@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
26990 };
26991
26992 /* TODO: inherit from base port_ops after converting to new EH */
26993-static struct ata_port_operations pdc_20621_ops = {
26994+static const struct ata_port_operations pdc_20621_ops = {
26995 .inherits = &ata_sff_port_ops,
26996
26997 .check_atapi_dma = pdc_check_atapi_dma,
26998diff -urNp linux-2.6.32.46/drivers/ata/sata_uli.c linux-2.6.32.46/drivers/ata/sata_uli.c
26999--- linux-2.6.32.46/drivers/ata/sata_uli.c 2011-03-27 14:31:47.000000000 -0400
27000+++ linux-2.6.32.46/drivers/ata/sata_uli.c 2011-04-17 15:56:46.000000000 -0400
27001@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
27002 ATA_BMDMA_SHT(DRV_NAME),
27003 };
27004
27005-static struct ata_port_operations uli_ops = {
27006+static const struct ata_port_operations uli_ops = {
27007 .inherits = &ata_bmdma_port_ops,
27008 .scr_read = uli_scr_read,
27009 .scr_write = uli_scr_write,
27010diff -urNp linux-2.6.32.46/drivers/ata/sata_via.c linux-2.6.32.46/drivers/ata/sata_via.c
27011--- linux-2.6.32.46/drivers/ata/sata_via.c 2011-05-10 22:12:01.000000000 -0400
27012+++ linux-2.6.32.46/drivers/ata/sata_via.c 2011-05-10 22:15:08.000000000 -0400
27013@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
27014 ATA_BMDMA_SHT(DRV_NAME),
27015 };
27016
27017-static struct ata_port_operations svia_base_ops = {
27018+static const struct ata_port_operations svia_base_ops = {
27019 .inherits = &ata_bmdma_port_ops,
27020 .sff_tf_load = svia_tf_load,
27021 };
27022
27023-static struct ata_port_operations vt6420_sata_ops = {
27024+static const struct ata_port_operations vt6420_sata_ops = {
27025 .inherits = &svia_base_ops,
27026 .freeze = svia_noop_freeze,
27027 .prereset = vt6420_prereset,
27028 .bmdma_start = vt6420_bmdma_start,
27029 };
27030
27031-static struct ata_port_operations vt6421_pata_ops = {
27032+static const struct ata_port_operations vt6421_pata_ops = {
27033 .inherits = &svia_base_ops,
27034 .cable_detect = vt6421_pata_cable_detect,
27035 .set_piomode = vt6421_set_pio_mode,
27036 .set_dmamode = vt6421_set_dma_mode,
27037 };
27038
27039-static struct ata_port_operations vt6421_sata_ops = {
27040+static const struct ata_port_operations vt6421_sata_ops = {
27041 .inherits = &svia_base_ops,
27042 .scr_read = svia_scr_read,
27043 .scr_write = svia_scr_write,
27044 };
27045
27046-static struct ata_port_operations vt8251_ops = {
27047+static const struct ata_port_operations vt8251_ops = {
27048 .inherits = &svia_base_ops,
27049 .hardreset = sata_std_hardreset,
27050 .scr_read = vt8251_scr_read,
27051diff -urNp linux-2.6.32.46/drivers/ata/sata_vsc.c linux-2.6.32.46/drivers/ata/sata_vsc.c
27052--- linux-2.6.32.46/drivers/ata/sata_vsc.c 2011-03-27 14:31:47.000000000 -0400
27053+++ linux-2.6.32.46/drivers/ata/sata_vsc.c 2011-04-17 15:56:46.000000000 -0400
27054@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
27055 };
27056
27057
27058-static struct ata_port_operations vsc_sata_ops = {
27059+static const struct ata_port_operations vsc_sata_ops = {
27060 .inherits = &ata_bmdma_port_ops,
27061 /* The IRQ handling is not quite standard SFF behaviour so we
27062 cannot use the default lost interrupt handler */
27063diff -urNp linux-2.6.32.46/drivers/atm/adummy.c linux-2.6.32.46/drivers/atm/adummy.c
27064--- linux-2.6.32.46/drivers/atm/adummy.c 2011-03-27 14:31:47.000000000 -0400
27065+++ linux-2.6.32.46/drivers/atm/adummy.c 2011-04-17 15:56:46.000000000 -0400
27066@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
27067 vcc->pop(vcc, skb);
27068 else
27069 dev_kfree_skb_any(skb);
27070- atomic_inc(&vcc->stats->tx);
27071+ atomic_inc_unchecked(&vcc->stats->tx);
27072
27073 return 0;
27074 }
27075diff -urNp linux-2.6.32.46/drivers/atm/ambassador.c linux-2.6.32.46/drivers/atm/ambassador.c
27076--- linux-2.6.32.46/drivers/atm/ambassador.c 2011-03-27 14:31:47.000000000 -0400
27077+++ linux-2.6.32.46/drivers/atm/ambassador.c 2011-04-17 15:56:46.000000000 -0400
27078@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
27079 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
27080
27081 // VC layer stats
27082- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27083+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27084
27085 // free the descriptor
27086 kfree (tx_descr);
27087@@ -494,7 +494,7 @@ static void rx_complete (amb_dev * dev,
27088 dump_skb ("<<<", vc, skb);
27089
27090 // VC layer stats
27091- atomic_inc(&atm_vcc->stats->rx);
27092+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27093 __net_timestamp(skb);
27094 // end of our responsability
27095 atm_vcc->push (atm_vcc, skb);
27096@@ -509,7 +509,7 @@ static void rx_complete (amb_dev * dev,
27097 } else {
27098 PRINTK (KERN_INFO, "dropped over-size frame");
27099 // should we count this?
27100- atomic_inc(&atm_vcc->stats->rx_drop);
27101+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27102 }
27103
27104 } else {
27105@@ -1341,7 +1341,7 @@ static int amb_send (struct atm_vcc * at
27106 }
27107
27108 if (check_area (skb->data, skb->len)) {
27109- atomic_inc(&atm_vcc->stats->tx_err);
27110+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
27111 return -ENOMEM; // ?
27112 }
27113
27114diff -urNp linux-2.6.32.46/drivers/atm/atmtcp.c linux-2.6.32.46/drivers/atm/atmtcp.c
27115--- linux-2.6.32.46/drivers/atm/atmtcp.c 2011-03-27 14:31:47.000000000 -0400
27116+++ linux-2.6.32.46/drivers/atm/atmtcp.c 2011-04-17 15:56:46.000000000 -0400
27117@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
27118 if (vcc->pop) vcc->pop(vcc,skb);
27119 else dev_kfree_skb(skb);
27120 if (dev_data) return 0;
27121- atomic_inc(&vcc->stats->tx_err);
27122+ atomic_inc_unchecked(&vcc->stats->tx_err);
27123 return -ENOLINK;
27124 }
27125 size = skb->len+sizeof(struct atmtcp_hdr);
27126@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc
27127 if (!new_skb) {
27128 if (vcc->pop) vcc->pop(vcc,skb);
27129 else dev_kfree_skb(skb);
27130- atomic_inc(&vcc->stats->tx_err);
27131+ atomic_inc_unchecked(&vcc->stats->tx_err);
27132 return -ENOBUFS;
27133 }
27134 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
27135@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc
27136 if (vcc->pop) vcc->pop(vcc,skb);
27137 else dev_kfree_skb(skb);
27138 out_vcc->push(out_vcc,new_skb);
27139- atomic_inc(&vcc->stats->tx);
27140- atomic_inc(&out_vcc->stats->rx);
27141+ atomic_inc_unchecked(&vcc->stats->tx);
27142+ atomic_inc_unchecked(&out_vcc->stats->rx);
27143 return 0;
27144 }
27145
27146@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc
27147 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
27148 read_unlock(&vcc_sklist_lock);
27149 if (!out_vcc) {
27150- atomic_inc(&vcc->stats->tx_err);
27151+ atomic_inc_unchecked(&vcc->stats->tx_err);
27152 goto done;
27153 }
27154 skb_pull(skb,sizeof(struct atmtcp_hdr));
27155@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc
27156 __net_timestamp(new_skb);
27157 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
27158 out_vcc->push(out_vcc,new_skb);
27159- atomic_inc(&vcc->stats->tx);
27160- atomic_inc(&out_vcc->stats->rx);
27161+ atomic_inc_unchecked(&vcc->stats->tx);
27162+ atomic_inc_unchecked(&out_vcc->stats->rx);
27163 done:
27164 if (vcc->pop) vcc->pop(vcc,skb);
27165 else dev_kfree_skb(skb);
27166diff -urNp linux-2.6.32.46/drivers/atm/eni.c linux-2.6.32.46/drivers/atm/eni.c
27167--- linux-2.6.32.46/drivers/atm/eni.c 2011-03-27 14:31:47.000000000 -0400
27168+++ linux-2.6.32.46/drivers/atm/eni.c 2011-04-17 15:56:46.000000000 -0400
27169@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
27170 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
27171 vcc->dev->number);
27172 length = 0;
27173- atomic_inc(&vcc->stats->rx_err);
27174+ atomic_inc_unchecked(&vcc->stats->rx_err);
27175 }
27176 else {
27177 length = ATM_CELL_SIZE-1; /* no HEC */
27178@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27179 size);
27180 }
27181 eff = length = 0;
27182- atomic_inc(&vcc->stats->rx_err);
27183+ atomic_inc_unchecked(&vcc->stats->rx_err);
27184 }
27185 else {
27186 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
27187@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27188 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
27189 vcc->dev->number,vcc->vci,length,size << 2,descr);
27190 length = eff = 0;
27191- atomic_inc(&vcc->stats->rx_err);
27192+ atomic_inc_unchecked(&vcc->stats->rx_err);
27193 }
27194 }
27195 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
27196@@ -770,7 +770,7 @@ rx_dequeued++;
27197 vcc->push(vcc,skb);
27198 pushed++;
27199 }
27200- atomic_inc(&vcc->stats->rx);
27201+ atomic_inc_unchecked(&vcc->stats->rx);
27202 }
27203 wake_up(&eni_dev->rx_wait);
27204 }
27205@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *d
27206 PCI_DMA_TODEVICE);
27207 if (vcc->pop) vcc->pop(vcc,skb);
27208 else dev_kfree_skb_irq(skb);
27209- atomic_inc(&vcc->stats->tx);
27210+ atomic_inc_unchecked(&vcc->stats->tx);
27211 wake_up(&eni_dev->tx_wait);
27212 dma_complete++;
27213 }
27214diff -urNp linux-2.6.32.46/drivers/atm/firestream.c linux-2.6.32.46/drivers/atm/firestream.c
27215--- linux-2.6.32.46/drivers/atm/firestream.c 2011-03-27 14:31:47.000000000 -0400
27216+++ linux-2.6.32.46/drivers/atm/firestream.c 2011-04-17 15:56:46.000000000 -0400
27217@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
27218 }
27219 }
27220
27221- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27222+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27223
27224 fs_dprintk (FS_DEBUG_TXMEM, "i");
27225 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
27226@@ -815,7 +815,7 @@ static void process_incoming (struct fs_
27227 #endif
27228 skb_put (skb, qe->p1 & 0xffff);
27229 ATM_SKB(skb)->vcc = atm_vcc;
27230- atomic_inc(&atm_vcc->stats->rx);
27231+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27232 __net_timestamp(skb);
27233 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
27234 atm_vcc->push (atm_vcc, skb);
27235@@ -836,12 +836,12 @@ static void process_incoming (struct fs_
27236 kfree (pe);
27237 }
27238 if (atm_vcc)
27239- atomic_inc(&atm_vcc->stats->rx_drop);
27240+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27241 break;
27242 case 0x1f: /* Reassembly abort: no buffers. */
27243 /* Silently increment error counter. */
27244 if (atm_vcc)
27245- atomic_inc(&atm_vcc->stats->rx_drop);
27246+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27247 break;
27248 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
27249 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
27250diff -urNp linux-2.6.32.46/drivers/atm/fore200e.c linux-2.6.32.46/drivers/atm/fore200e.c
27251--- linux-2.6.32.46/drivers/atm/fore200e.c 2011-03-27 14:31:47.000000000 -0400
27252+++ linux-2.6.32.46/drivers/atm/fore200e.c 2011-04-17 15:56:46.000000000 -0400
27253@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
27254 #endif
27255 /* check error condition */
27256 if (*entry->status & STATUS_ERROR)
27257- atomic_inc(&vcc->stats->tx_err);
27258+ atomic_inc_unchecked(&vcc->stats->tx_err);
27259 else
27260- atomic_inc(&vcc->stats->tx);
27261+ atomic_inc_unchecked(&vcc->stats->tx);
27262 }
27263 }
27264
27265@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore2
27266 if (skb == NULL) {
27267 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
27268
27269- atomic_inc(&vcc->stats->rx_drop);
27270+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27271 return -ENOMEM;
27272 }
27273
27274@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore2
27275
27276 dev_kfree_skb_any(skb);
27277
27278- atomic_inc(&vcc->stats->rx_drop);
27279+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27280 return -ENOMEM;
27281 }
27282
27283 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27284
27285 vcc->push(vcc, skb);
27286- atomic_inc(&vcc->stats->rx);
27287+ atomic_inc_unchecked(&vcc->stats->rx);
27288
27289 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27290
27291@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200
27292 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
27293 fore200e->atm_dev->number,
27294 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
27295- atomic_inc(&vcc->stats->rx_err);
27296+ atomic_inc_unchecked(&vcc->stats->rx_err);
27297 }
27298 }
27299
27300@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struc
27301 goto retry_here;
27302 }
27303
27304- atomic_inc(&vcc->stats->tx_err);
27305+ atomic_inc_unchecked(&vcc->stats->tx_err);
27306
27307 fore200e->tx_sat++;
27308 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
27309diff -urNp linux-2.6.32.46/drivers/atm/he.c linux-2.6.32.46/drivers/atm/he.c
27310--- linux-2.6.32.46/drivers/atm/he.c 2011-03-27 14:31:47.000000000 -0400
27311+++ linux-2.6.32.46/drivers/atm/he.c 2011-04-17 15:56:46.000000000 -0400
27312@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
27313
27314 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
27315 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
27316- atomic_inc(&vcc->stats->rx_drop);
27317+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27318 goto return_host_buffers;
27319 }
27320
27321@@ -1802,7 +1802,7 @@ he_service_rbrq(struct he_dev *he_dev, i
27322 RBRQ_LEN_ERR(he_dev->rbrq_head)
27323 ? "LEN_ERR" : "",
27324 vcc->vpi, vcc->vci);
27325- atomic_inc(&vcc->stats->rx_err);
27326+ atomic_inc_unchecked(&vcc->stats->rx_err);
27327 goto return_host_buffers;
27328 }
27329
27330@@ -1861,7 +1861,7 @@ he_service_rbrq(struct he_dev *he_dev, i
27331 vcc->push(vcc, skb);
27332 spin_lock(&he_dev->global_lock);
27333
27334- atomic_inc(&vcc->stats->rx);
27335+ atomic_inc_unchecked(&vcc->stats->rx);
27336
27337 return_host_buffers:
27338 ++pdus_assembled;
27339@@ -2206,7 +2206,7 @@ __enqueue_tpd(struct he_dev *he_dev, str
27340 tpd->vcc->pop(tpd->vcc, tpd->skb);
27341 else
27342 dev_kfree_skb_any(tpd->skb);
27343- atomic_inc(&tpd->vcc->stats->tx_err);
27344+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
27345 }
27346 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
27347 return;
27348@@ -2618,7 +2618,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
27349 vcc->pop(vcc, skb);
27350 else
27351 dev_kfree_skb_any(skb);
27352- atomic_inc(&vcc->stats->tx_err);
27353+ atomic_inc_unchecked(&vcc->stats->tx_err);
27354 return -EINVAL;
27355 }
27356
27357@@ -2629,7 +2629,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
27358 vcc->pop(vcc, skb);
27359 else
27360 dev_kfree_skb_any(skb);
27361- atomic_inc(&vcc->stats->tx_err);
27362+ atomic_inc_unchecked(&vcc->stats->tx_err);
27363 return -EINVAL;
27364 }
27365 #endif
27366@@ -2641,7 +2641,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
27367 vcc->pop(vcc, skb);
27368 else
27369 dev_kfree_skb_any(skb);
27370- atomic_inc(&vcc->stats->tx_err);
27371+ atomic_inc_unchecked(&vcc->stats->tx_err);
27372 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27373 return -ENOMEM;
27374 }
27375@@ -2683,7 +2683,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
27376 vcc->pop(vcc, skb);
27377 else
27378 dev_kfree_skb_any(skb);
27379- atomic_inc(&vcc->stats->tx_err);
27380+ atomic_inc_unchecked(&vcc->stats->tx_err);
27381 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27382 return -ENOMEM;
27383 }
27384@@ -2714,7 +2714,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
27385 __enqueue_tpd(he_dev, tpd, cid);
27386 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27387
27388- atomic_inc(&vcc->stats->tx);
27389+ atomic_inc_unchecked(&vcc->stats->tx);
27390
27391 return 0;
27392 }
27393diff -urNp linux-2.6.32.46/drivers/atm/horizon.c linux-2.6.32.46/drivers/atm/horizon.c
27394--- linux-2.6.32.46/drivers/atm/horizon.c 2011-03-27 14:31:47.000000000 -0400
27395+++ linux-2.6.32.46/drivers/atm/horizon.c 2011-04-17 15:56:46.000000000 -0400
27396@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
27397 {
27398 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
27399 // VC layer stats
27400- atomic_inc(&vcc->stats->rx);
27401+ atomic_inc_unchecked(&vcc->stats->rx);
27402 __net_timestamp(skb);
27403 // end of our responsability
27404 vcc->push (vcc, skb);
27405@@ -1185,7 +1185,7 @@ static void tx_schedule (hrz_dev * const
27406 dev->tx_iovec = NULL;
27407
27408 // VC layer stats
27409- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27410+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27411
27412 // free the skb
27413 hrz_kfree_skb (skb);
27414diff -urNp linux-2.6.32.46/drivers/atm/idt77252.c linux-2.6.32.46/drivers/atm/idt77252.c
27415--- linux-2.6.32.46/drivers/atm/idt77252.c 2011-03-27 14:31:47.000000000 -0400
27416+++ linux-2.6.32.46/drivers/atm/idt77252.c 2011-04-17 15:56:46.000000000 -0400
27417@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
27418 else
27419 dev_kfree_skb(skb);
27420
27421- atomic_inc(&vcc->stats->tx);
27422+ atomic_inc_unchecked(&vcc->stats->tx);
27423 }
27424
27425 atomic_dec(&scq->used);
27426@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, st
27427 if ((sb = dev_alloc_skb(64)) == NULL) {
27428 printk("%s: Can't allocate buffers for aal0.\n",
27429 card->name);
27430- atomic_add(i, &vcc->stats->rx_drop);
27431+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
27432 break;
27433 }
27434 if (!atm_charge(vcc, sb->truesize)) {
27435 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
27436 card->name);
27437- atomic_add(i - 1, &vcc->stats->rx_drop);
27438+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
27439 dev_kfree_skb(sb);
27440 break;
27441 }
27442@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, st
27443 ATM_SKB(sb)->vcc = vcc;
27444 __net_timestamp(sb);
27445 vcc->push(vcc, sb);
27446- atomic_inc(&vcc->stats->rx);
27447+ atomic_inc_unchecked(&vcc->stats->rx);
27448
27449 cell += ATM_CELL_PAYLOAD;
27450 }
27451@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, st
27452 "(CDC: %08x)\n",
27453 card->name, len, rpp->len, readl(SAR_REG_CDC));
27454 recycle_rx_pool_skb(card, rpp);
27455- atomic_inc(&vcc->stats->rx_err);
27456+ atomic_inc_unchecked(&vcc->stats->rx_err);
27457 return;
27458 }
27459 if (stat & SAR_RSQE_CRC) {
27460 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
27461 recycle_rx_pool_skb(card, rpp);
27462- atomic_inc(&vcc->stats->rx_err);
27463+ atomic_inc_unchecked(&vcc->stats->rx_err);
27464 return;
27465 }
27466 if (skb_queue_len(&rpp->queue) > 1) {
27467@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, st
27468 RXPRINTK("%s: Can't alloc RX skb.\n",
27469 card->name);
27470 recycle_rx_pool_skb(card, rpp);
27471- atomic_inc(&vcc->stats->rx_err);
27472+ atomic_inc_unchecked(&vcc->stats->rx_err);
27473 return;
27474 }
27475 if (!atm_charge(vcc, skb->truesize)) {
27476@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, st
27477 __net_timestamp(skb);
27478
27479 vcc->push(vcc, skb);
27480- atomic_inc(&vcc->stats->rx);
27481+ atomic_inc_unchecked(&vcc->stats->rx);
27482
27483 return;
27484 }
27485@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, st
27486 __net_timestamp(skb);
27487
27488 vcc->push(vcc, skb);
27489- atomic_inc(&vcc->stats->rx);
27490+ atomic_inc_unchecked(&vcc->stats->rx);
27491
27492 if (skb->truesize > SAR_FB_SIZE_3)
27493 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
27494@@ -1303,14 +1303,14 @@ idt77252_rx_raw(struct idt77252_dev *car
27495 if (vcc->qos.aal != ATM_AAL0) {
27496 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
27497 card->name, vpi, vci);
27498- atomic_inc(&vcc->stats->rx_drop);
27499+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27500 goto drop;
27501 }
27502
27503 if ((sb = dev_alloc_skb(64)) == NULL) {
27504 printk("%s: Can't allocate buffers for AAL0.\n",
27505 card->name);
27506- atomic_inc(&vcc->stats->rx_err);
27507+ atomic_inc_unchecked(&vcc->stats->rx_err);
27508 goto drop;
27509 }
27510
27511@@ -1329,7 +1329,7 @@ idt77252_rx_raw(struct idt77252_dev *car
27512 ATM_SKB(sb)->vcc = vcc;
27513 __net_timestamp(sb);
27514 vcc->push(vcc, sb);
27515- atomic_inc(&vcc->stats->rx);
27516+ atomic_inc_unchecked(&vcc->stats->rx);
27517
27518 drop:
27519 skb_pull(queue, 64);
27520@@ -1954,13 +1954,13 @@ idt77252_send_skb(struct atm_vcc *vcc, s
27521
27522 if (vc == NULL) {
27523 printk("%s: NULL connection in send().\n", card->name);
27524- atomic_inc(&vcc->stats->tx_err);
27525+ atomic_inc_unchecked(&vcc->stats->tx_err);
27526 dev_kfree_skb(skb);
27527 return -EINVAL;
27528 }
27529 if (!test_bit(VCF_TX, &vc->flags)) {
27530 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
27531- atomic_inc(&vcc->stats->tx_err);
27532+ atomic_inc_unchecked(&vcc->stats->tx_err);
27533 dev_kfree_skb(skb);
27534 return -EINVAL;
27535 }
27536@@ -1972,14 +1972,14 @@ idt77252_send_skb(struct atm_vcc *vcc, s
27537 break;
27538 default:
27539 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
27540- atomic_inc(&vcc->stats->tx_err);
27541+ atomic_inc_unchecked(&vcc->stats->tx_err);
27542 dev_kfree_skb(skb);
27543 return -EINVAL;
27544 }
27545
27546 if (skb_shinfo(skb)->nr_frags != 0) {
27547 printk("%s: No scatter-gather yet.\n", card->name);
27548- atomic_inc(&vcc->stats->tx_err);
27549+ atomic_inc_unchecked(&vcc->stats->tx_err);
27550 dev_kfree_skb(skb);
27551 return -EINVAL;
27552 }
27553@@ -1987,7 +1987,7 @@ idt77252_send_skb(struct atm_vcc *vcc, s
27554
27555 err = queue_skb(card, vc, skb, oam);
27556 if (err) {
27557- atomic_inc(&vcc->stats->tx_err);
27558+ atomic_inc_unchecked(&vcc->stats->tx_err);
27559 dev_kfree_skb(skb);
27560 return err;
27561 }
27562@@ -2010,7 +2010,7 @@ idt77252_send_oam(struct atm_vcc *vcc, v
27563 skb = dev_alloc_skb(64);
27564 if (!skb) {
27565 printk("%s: Out of memory in send_oam().\n", card->name);
27566- atomic_inc(&vcc->stats->tx_err);
27567+ atomic_inc_unchecked(&vcc->stats->tx_err);
27568 return -ENOMEM;
27569 }
27570 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
27571diff -urNp linux-2.6.32.46/drivers/atm/iphase.c linux-2.6.32.46/drivers/atm/iphase.c
27572--- linux-2.6.32.46/drivers/atm/iphase.c 2011-03-27 14:31:47.000000000 -0400
27573+++ linux-2.6.32.46/drivers/atm/iphase.c 2011-04-17 15:56:46.000000000 -0400
27574@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
27575 status = (u_short) (buf_desc_ptr->desc_mode);
27576 if (status & (RX_CER | RX_PTE | RX_OFL))
27577 {
27578- atomic_inc(&vcc->stats->rx_err);
27579+ atomic_inc_unchecked(&vcc->stats->rx_err);
27580 IF_ERR(printk("IA: bad packet, dropping it");)
27581 if (status & RX_CER) {
27582 IF_ERR(printk(" cause: packet CRC error\n");)
27583@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
27584 len = dma_addr - buf_addr;
27585 if (len > iadev->rx_buf_sz) {
27586 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
27587- atomic_inc(&vcc->stats->rx_err);
27588+ atomic_inc_unchecked(&vcc->stats->rx_err);
27589 goto out_free_desc;
27590 }
27591
27592@@ -1296,7 +1296,7 @@ static void rx_dle_intr(struct atm_dev *
27593 ia_vcc = INPH_IA_VCC(vcc);
27594 if (ia_vcc == NULL)
27595 {
27596- atomic_inc(&vcc->stats->rx_err);
27597+ atomic_inc_unchecked(&vcc->stats->rx_err);
27598 dev_kfree_skb_any(skb);
27599 atm_return(vcc, atm_guess_pdu2truesize(len));
27600 goto INCR_DLE;
27601@@ -1308,7 +1308,7 @@ static void rx_dle_intr(struct atm_dev *
27602 if ((length > iadev->rx_buf_sz) || (length >
27603 (skb->len - sizeof(struct cpcs_trailer))))
27604 {
27605- atomic_inc(&vcc->stats->rx_err);
27606+ atomic_inc_unchecked(&vcc->stats->rx_err);
27607 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
27608 length, skb->len);)
27609 dev_kfree_skb_any(skb);
27610@@ -1324,7 +1324,7 @@ static void rx_dle_intr(struct atm_dev *
27611
27612 IF_RX(printk("rx_dle_intr: skb push");)
27613 vcc->push(vcc,skb);
27614- atomic_inc(&vcc->stats->rx);
27615+ atomic_inc_unchecked(&vcc->stats->rx);
27616 iadev->rx_pkt_cnt++;
27617 }
27618 INCR_DLE:
27619@@ -2806,15 +2806,15 @@ static int ia_ioctl(struct atm_dev *dev,
27620 {
27621 struct k_sonet_stats *stats;
27622 stats = &PRIV(_ia_dev[board])->sonet_stats;
27623- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
27624- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
27625- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
27626- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
27627- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
27628- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
27629- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
27630- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
27631- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
27632+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
27633+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
27634+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
27635+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
27636+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
27637+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
27638+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
27639+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
27640+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
27641 }
27642 ia_cmds.status = 0;
27643 break;
27644@@ -2919,7 +2919,7 @@ static int ia_pkt_tx (struct atm_vcc *vc
27645 if ((desc == 0) || (desc > iadev->num_tx_desc))
27646 {
27647 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
27648- atomic_inc(&vcc->stats->tx);
27649+ atomic_inc_unchecked(&vcc->stats->tx);
27650 if (vcc->pop)
27651 vcc->pop(vcc, skb);
27652 else
27653@@ -3024,14 +3024,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
27654 ATM_DESC(skb) = vcc->vci;
27655 skb_queue_tail(&iadev->tx_dma_q, skb);
27656
27657- atomic_inc(&vcc->stats->tx);
27658+ atomic_inc_unchecked(&vcc->stats->tx);
27659 iadev->tx_pkt_cnt++;
27660 /* Increment transaction counter */
27661 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
27662
27663 #if 0
27664 /* add flow control logic */
27665- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
27666+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
27667 if (iavcc->vc_desc_cnt > 10) {
27668 vcc->tx_quota = vcc->tx_quota * 3 / 4;
27669 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
27670diff -urNp linux-2.6.32.46/drivers/atm/lanai.c linux-2.6.32.46/drivers/atm/lanai.c
27671--- linux-2.6.32.46/drivers/atm/lanai.c 2011-03-27 14:31:47.000000000 -0400
27672+++ linux-2.6.32.46/drivers/atm/lanai.c 2011-04-17 15:56:46.000000000 -0400
27673@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
27674 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
27675 lanai_endtx(lanai, lvcc);
27676 lanai_free_skb(lvcc->tx.atmvcc, skb);
27677- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
27678+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
27679 }
27680
27681 /* Try to fill the buffer - don't call unless there is backlog */
27682@@ -1428,7 +1428,7 @@ static void vcc_rx_aal5(struct lanai_vcc
27683 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
27684 __net_timestamp(skb);
27685 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
27686- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
27687+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
27688 out:
27689 lvcc->rx.buf.ptr = end;
27690 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
27691@@ -1670,7 +1670,7 @@ static int handle_service(struct lanai_d
27692 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
27693 "vcc %d\n", lanai->number, (unsigned int) s, vci);
27694 lanai->stats.service_rxnotaal5++;
27695- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
27696+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
27697 return 0;
27698 }
27699 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
27700@@ -1682,7 +1682,7 @@ static int handle_service(struct lanai_d
27701 int bytes;
27702 read_unlock(&vcc_sklist_lock);
27703 DPRINTK("got trashed rx pdu on vci %d\n", vci);
27704- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
27705+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
27706 lvcc->stats.x.aal5.service_trash++;
27707 bytes = (SERVICE_GET_END(s) * 16) -
27708 (((unsigned long) lvcc->rx.buf.ptr) -
27709@@ -1694,7 +1694,7 @@ static int handle_service(struct lanai_d
27710 }
27711 if (s & SERVICE_STREAM) {
27712 read_unlock(&vcc_sklist_lock);
27713- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
27714+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
27715 lvcc->stats.x.aal5.service_stream++;
27716 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
27717 "PDU on VCI %d!\n", lanai->number, vci);
27718@@ -1702,7 +1702,7 @@ static int handle_service(struct lanai_d
27719 return 0;
27720 }
27721 DPRINTK("got rx crc error on vci %d\n", vci);
27722- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
27723+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
27724 lvcc->stats.x.aal5.service_rxcrc++;
27725 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
27726 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
27727diff -urNp linux-2.6.32.46/drivers/atm/nicstar.c linux-2.6.32.46/drivers/atm/nicstar.c
27728--- linux-2.6.32.46/drivers/atm/nicstar.c 2011-03-27 14:31:47.000000000 -0400
27729+++ linux-2.6.32.46/drivers/atm/nicstar.c 2011-04-17 15:56:46.000000000 -0400
27730@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
27731 if ((vc = (vc_map *) vcc->dev_data) == NULL)
27732 {
27733 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index);
27734- atomic_inc(&vcc->stats->tx_err);
27735+ atomic_inc_unchecked(&vcc->stats->tx_err);
27736 dev_kfree_skb_any(skb);
27737 return -EINVAL;
27738 }
27739@@ -1731,7 +1731,7 @@ static int ns_send(struct atm_vcc *vcc,
27740 if (!vc->tx)
27741 {
27742 printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index);
27743- atomic_inc(&vcc->stats->tx_err);
27744+ atomic_inc_unchecked(&vcc->stats->tx_err);
27745 dev_kfree_skb_any(skb);
27746 return -EINVAL;
27747 }
27748@@ -1739,7 +1739,7 @@ static int ns_send(struct atm_vcc *vcc,
27749 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
27750 {
27751 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index);
27752- atomic_inc(&vcc->stats->tx_err);
27753+ atomic_inc_unchecked(&vcc->stats->tx_err);
27754 dev_kfree_skb_any(skb);
27755 return -EINVAL;
27756 }
27757@@ -1747,7 +1747,7 @@ static int ns_send(struct atm_vcc *vcc,
27758 if (skb_shinfo(skb)->nr_frags != 0)
27759 {
27760 printk("nicstar%d: No scatter-gather yet.\n", card->index);
27761- atomic_inc(&vcc->stats->tx_err);
27762+ atomic_inc_unchecked(&vcc->stats->tx_err);
27763 dev_kfree_skb_any(skb);
27764 return -EINVAL;
27765 }
27766@@ -1792,11 +1792,11 @@ static int ns_send(struct atm_vcc *vcc,
27767
27768 if (push_scqe(card, vc, scq, &scqe, skb) != 0)
27769 {
27770- atomic_inc(&vcc->stats->tx_err);
27771+ atomic_inc_unchecked(&vcc->stats->tx_err);
27772 dev_kfree_skb_any(skb);
27773 return -EIO;
27774 }
27775- atomic_inc(&vcc->stats->tx);
27776+ atomic_inc_unchecked(&vcc->stats->tx);
27777
27778 return 0;
27779 }
27780@@ -2111,14 +2111,14 @@ static void dequeue_rx(ns_dev *card, ns_
27781 {
27782 printk("nicstar%d: Can't allocate buffers for aal0.\n",
27783 card->index);
27784- atomic_add(i,&vcc->stats->rx_drop);
27785+ atomic_add_unchecked(i,&vcc->stats->rx_drop);
27786 break;
27787 }
27788 if (!atm_charge(vcc, sb->truesize))
27789 {
27790 RXPRINTK("nicstar%d: atm_charge() dropped aal0 packets.\n",
27791 card->index);
27792- atomic_add(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
27793+ atomic_add_unchecked(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
27794 dev_kfree_skb_any(sb);
27795 break;
27796 }
27797@@ -2133,7 +2133,7 @@ static void dequeue_rx(ns_dev *card, ns_
27798 ATM_SKB(sb)->vcc = vcc;
27799 __net_timestamp(sb);
27800 vcc->push(vcc, sb);
27801- atomic_inc(&vcc->stats->rx);
27802+ atomic_inc_unchecked(&vcc->stats->rx);
27803 cell += ATM_CELL_PAYLOAD;
27804 }
27805
27806@@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev *card, ns_
27807 if (iovb == NULL)
27808 {
27809 printk("nicstar%d: Out of iovec buffers.\n", card->index);
27810- atomic_inc(&vcc->stats->rx_drop);
27811+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27812 recycle_rx_buf(card, skb);
27813 return;
27814 }
27815@@ -2182,7 +2182,7 @@ static void dequeue_rx(ns_dev *card, ns_
27816 else if (NS_SKB(iovb)->iovcnt >= NS_MAX_IOVECS)
27817 {
27818 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
27819- atomic_inc(&vcc->stats->rx_err);
27820+ atomic_inc_unchecked(&vcc->stats->rx_err);
27821 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, NS_MAX_IOVECS);
27822 NS_SKB(iovb)->iovcnt = 0;
27823 iovb->len = 0;
27824@@ -2202,7 +2202,7 @@ static void dequeue_rx(ns_dev *card, ns_
27825 printk("nicstar%d: Expected a small buffer, and this is not one.\n",
27826 card->index);
27827 which_list(card, skb);
27828- atomic_inc(&vcc->stats->rx_err);
27829+ atomic_inc_unchecked(&vcc->stats->rx_err);
27830 recycle_rx_buf(card, skb);
27831 vc->rx_iov = NULL;
27832 recycle_iov_buf(card, iovb);
27833@@ -2216,7 +2216,7 @@ static void dequeue_rx(ns_dev *card, ns_
27834 printk("nicstar%d: Expected a large buffer, and this is not one.\n",
27835 card->index);
27836 which_list(card, skb);
27837- atomic_inc(&vcc->stats->rx_err);
27838+ atomic_inc_unchecked(&vcc->stats->rx_err);
27839 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
27840 NS_SKB(iovb)->iovcnt);
27841 vc->rx_iov = NULL;
27842@@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev *card, ns_
27843 printk(" - PDU size mismatch.\n");
27844 else
27845 printk(".\n");
27846- atomic_inc(&vcc->stats->rx_err);
27847+ atomic_inc_unchecked(&vcc->stats->rx_err);
27848 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
27849 NS_SKB(iovb)->iovcnt);
27850 vc->rx_iov = NULL;
27851@@ -2256,7 +2256,7 @@ static void dequeue_rx(ns_dev *card, ns_
27852 if (!atm_charge(vcc, skb->truesize))
27853 {
27854 push_rxbufs(card, skb);
27855- atomic_inc(&vcc->stats->rx_drop);
27856+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27857 }
27858 else
27859 {
27860@@ -2268,7 +2268,7 @@ static void dequeue_rx(ns_dev *card, ns_
27861 ATM_SKB(skb)->vcc = vcc;
27862 __net_timestamp(skb);
27863 vcc->push(vcc, skb);
27864- atomic_inc(&vcc->stats->rx);
27865+ atomic_inc_unchecked(&vcc->stats->rx);
27866 }
27867 }
27868 else if (NS_SKB(iovb)->iovcnt == 2) /* One small plus one large buffer */
27869@@ -2283,7 +2283,7 @@ static void dequeue_rx(ns_dev *card, ns_
27870 if (!atm_charge(vcc, sb->truesize))
27871 {
27872 push_rxbufs(card, sb);
27873- atomic_inc(&vcc->stats->rx_drop);
27874+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27875 }
27876 else
27877 {
27878@@ -2295,7 +2295,7 @@ static void dequeue_rx(ns_dev *card, ns_
27879 ATM_SKB(sb)->vcc = vcc;
27880 __net_timestamp(sb);
27881 vcc->push(vcc, sb);
27882- atomic_inc(&vcc->stats->rx);
27883+ atomic_inc_unchecked(&vcc->stats->rx);
27884 }
27885
27886 push_rxbufs(card, skb);
27887@@ -2306,7 +2306,7 @@ static void dequeue_rx(ns_dev *card, ns_
27888 if (!atm_charge(vcc, skb->truesize))
27889 {
27890 push_rxbufs(card, skb);
27891- atomic_inc(&vcc->stats->rx_drop);
27892+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27893 }
27894 else
27895 {
27896@@ -2320,7 +2320,7 @@ static void dequeue_rx(ns_dev *card, ns_
27897 ATM_SKB(skb)->vcc = vcc;
27898 __net_timestamp(skb);
27899 vcc->push(vcc, skb);
27900- atomic_inc(&vcc->stats->rx);
27901+ atomic_inc_unchecked(&vcc->stats->rx);
27902 }
27903
27904 push_rxbufs(card, sb);
27905@@ -2342,7 +2342,7 @@ static void dequeue_rx(ns_dev *card, ns_
27906 if (hb == NULL)
27907 {
27908 printk("nicstar%d: Out of huge buffers.\n", card->index);
27909- atomic_inc(&vcc->stats->rx_drop);
27910+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27911 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
27912 NS_SKB(iovb)->iovcnt);
27913 vc->rx_iov = NULL;
27914@@ -2393,7 +2393,7 @@ static void dequeue_rx(ns_dev *card, ns_
27915 }
27916 else
27917 dev_kfree_skb_any(hb);
27918- atomic_inc(&vcc->stats->rx_drop);
27919+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27920 }
27921 else
27922 {
27923@@ -2427,7 +2427,7 @@ static void dequeue_rx(ns_dev *card, ns_
27924 #endif /* NS_USE_DESTRUCTORS */
27925 __net_timestamp(hb);
27926 vcc->push(vcc, hb);
27927- atomic_inc(&vcc->stats->rx);
27928+ atomic_inc_unchecked(&vcc->stats->rx);
27929 }
27930 }
27931
27932diff -urNp linux-2.6.32.46/drivers/atm/solos-pci.c linux-2.6.32.46/drivers/atm/solos-pci.c
27933--- linux-2.6.32.46/drivers/atm/solos-pci.c 2011-04-17 17:00:52.000000000 -0400
27934+++ linux-2.6.32.46/drivers/atm/solos-pci.c 2011-05-16 21:46:57.000000000 -0400
27935@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
27936 }
27937 atm_charge(vcc, skb->truesize);
27938 vcc->push(vcc, skb);
27939- atomic_inc(&vcc->stats->rx);
27940+ atomic_inc_unchecked(&vcc->stats->rx);
27941 break;
27942
27943 case PKT_STATUS:
27944@@ -914,6 +914,8 @@ static int print_buffer(struct sk_buff *
27945 char msg[500];
27946 char item[10];
27947
27948+ pax_track_stack();
27949+
27950 len = buf->len;
27951 for (i = 0; i < len; i++){
27952 if(i % 8 == 0)
27953@@ -1023,7 +1025,7 @@ static uint32_t fpga_tx(struct solos_car
27954 vcc = SKB_CB(oldskb)->vcc;
27955
27956 if (vcc) {
27957- atomic_inc(&vcc->stats->tx);
27958+ atomic_inc_unchecked(&vcc->stats->tx);
27959 solos_pop(vcc, oldskb);
27960 } else
27961 dev_kfree_skb_irq(oldskb);
27962diff -urNp linux-2.6.32.46/drivers/atm/suni.c linux-2.6.32.46/drivers/atm/suni.c
27963--- linux-2.6.32.46/drivers/atm/suni.c 2011-03-27 14:31:47.000000000 -0400
27964+++ linux-2.6.32.46/drivers/atm/suni.c 2011-04-17 15:56:46.000000000 -0400
27965@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
27966
27967
27968 #define ADD_LIMITED(s,v) \
27969- atomic_add((v),&stats->s); \
27970- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
27971+ atomic_add_unchecked((v),&stats->s); \
27972+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
27973
27974
27975 static void suni_hz(unsigned long from_timer)
27976diff -urNp linux-2.6.32.46/drivers/atm/uPD98402.c linux-2.6.32.46/drivers/atm/uPD98402.c
27977--- linux-2.6.32.46/drivers/atm/uPD98402.c 2011-03-27 14:31:47.000000000 -0400
27978+++ linux-2.6.32.46/drivers/atm/uPD98402.c 2011-04-17 15:56:46.000000000 -0400
27979@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
27980 struct sonet_stats tmp;
27981 int error = 0;
27982
27983- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
27984+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
27985 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
27986 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
27987 if (zero && !error) {
27988@@ -160,9 +160,9 @@ static int uPD98402_ioctl(struct atm_dev
27989
27990
27991 #define ADD_LIMITED(s,v) \
27992- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
27993- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
27994- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
27995+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
27996+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
27997+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
27998
27999
28000 static void stat_event(struct atm_dev *dev)
28001@@ -193,7 +193,7 @@ static void uPD98402_int(struct atm_dev
28002 if (reason & uPD98402_INT_PFM) stat_event(dev);
28003 if (reason & uPD98402_INT_PCO) {
28004 (void) GET(PCOCR); /* clear interrupt cause */
28005- atomic_add(GET(HECCT),
28006+ atomic_add_unchecked(GET(HECCT),
28007 &PRIV(dev)->sonet_stats.uncorr_hcs);
28008 }
28009 if ((reason & uPD98402_INT_RFO) &&
28010@@ -221,9 +221,9 @@ static int uPD98402_start(struct atm_dev
28011 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
28012 uPD98402_INT_LOS),PIMR); /* enable them */
28013 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
28014- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28015- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
28016- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
28017+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28018+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
28019+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
28020 return 0;
28021 }
28022
28023diff -urNp linux-2.6.32.46/drivers/atm/zatm.c linux-2.6.32.46/drivers/atm/zatm.c
28024--- linux-2.6.32.46/drivers/atm/zatm.c 2011-03-27 14:31:47.000000000 -0400
28025+++ linux-2.6.32.46/drivers/atm/zatm.c 2011-04-17 15:56:46.000000000 -0400
28026@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
28027 }
28028 if (!size) {
28029 dev_kfree_skb_irq(skb);
28030- if (vcc) atomic_inc(&vcc->stats->rx_err);
28031+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
28032 continue;
28033 }
28034 if (!atm_charge(vcc,skb->truesize)) {
28035@@ -468,7 +468,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
28036 skb->len = size;
28037 ATM_SKB(skb)->vcc = vcc;
28038 vcc->push(vcc,skb);
28039- atomic_inc(&vcc->stats->rx);
28040+ atomic_inc_unchecked(&vcc->stats->rx);
28041 }
28042 zout(pos & 0xffff,MTA(mbx));
28043 #if 0 /* probably a stupid idea */
28044@@ -732,7 +732,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
28045 skb_queue_head(&zatm_vcc->backlog,skb);
28046 break;
28047 }
28048- atomic_inc(&vcc->stats->tx);
28049+ atomic_inc_unchecked(&vcc->stats->tx);
28050 wake_up(&zatm_vcc->tx_wait);
28051 }
28052
28053diff -urNp linux-2.6.32.46/drivers/base/bus.c linux-2.6.32.46/drivers/base/bus.c
28054--- linux-2.6.32.46/drivers/base/bus.c 2011-03-27 14:31:47.000000000 -0400
28055+++ linux-2.6.32.46/drivers/base/bus.c 2011-04-17 15:56:46.000000000 -0400
28056@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
28057 return ret;
28058 }
28059
28060-static struct sysfs_ops driver_sysfs_ops = {
28061+static const struct sysfs_ops driver_sysfs_ops = {
28062 .show = drv_attr_show,
28063 .store = drv_attr_store,
28064 };
28065@@ -115,7 +115,7 @@ static ssize_t bus_attr_store(struct kob
28066 return ret;
28067 }
28068
28069-static struct sysfs_ops bus_sysfs_ops = {
28070+static const struct sysfs_ops bus_sysfs_ops = {
28071 .show = bus_attr_show,
28072 .store = bus_attr_store,
28073 };
28074@@ -154,7 +154,7 @@ static int bus_uevent_filter(struct kset
28075 return 0;
28076 }
28077
28078-static struct kset_uevent_ops bus_uevent_ops = {
28079+static const struct kset_uevent_ops bus_uevent_ops = {
28080 .filter = bus_uevent_filter,
28081 };
28082
28083diff -urNp linux-2.6.32.46/drivers/base/class.c linux-2.6.32.46/drivers/base/class.c
28084--- linux-2.6.32.46/drivers/base/class.c 2011-03-27 14:31:47.000000000 -0400
28085+++ linux-2.6.32.46/drivers/base/class.c 2011-04-17 15:56:46.000000000 -0400
28086@@ -63,7 +63,7 @@ static void class_release(struct kobject
28087 kfree(cp);
28088 }
28089
28090-static struct sysfs_ops class_sysfs_ops = {
28091+static const struct sysfs_ops class_sysfs_ops = {
28092 .show = class_attr_show,
28093 .store = class_attr_store,
28094 };
28095diff -urNp linux-2.6.32.46/drivers/base/core.c linux-2.6.32.46/drivers/base/core.c
28096--- linux-2.6.32.46/drivers/base/core.c 2011-03-27 14:31:47.000000000 -0400
28097+++ linux-2.6.32.46/drivers/base/core.c 2011-04-17 15:56:46.000000000 -0400
28098@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
28099 return ret;
28100 }
28101
28102-static struct sysfs_ops dev_sysfs_ops = {
28103+static const struct sysfs_ops dev_sysfs_ops = {
28104 .show = dev_attr_show,
28105 .store = dev_attr_store,
28106 };
28107@@ -252,7 +252,7 @@ static int dev_uevent(struct kset *kset,
28108 return retval;
28109 }
28110
28111-static struct kset_uevent_ops device_uevent_ops = {
28112+static const struct kset_uevent_ops device_uevent_ops = {
28113 .filter = dev_uevent_filter,
28114 .name = dev_uevent_name,
28115 .uevent = dev_uevent,
28116diff -urNp linux-2.6.32.46/drivers/base/memory.c linux-2.6.32.46/drivers/base/memory.c
28117--- linux-2.6.32.46/drivers/base/memory.c 2011-03-27 14:31:47.000000000 -0400
28118+++ linux-2.6.32.46/drivers/base/memory.c 2011-04-17 15:56:46.000000000 -0400
28119@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
28120 return retval;
28121 }
28122
28123-static struct kset_uevent_ops memory_uevent_ops = {
28124+static const struct kset_uevent_ops memory_uevent_ops = {
28125 .name = memory_uevent_name,
28126 .uevent = memory_uevent,
28127 };
28128diff -urNp linux-2.6.32.46/drivers/base/sys.c linux-2.6.32.46/drivers/base/sys.c
28129--- linux-2.6.32.46/drivers/base/sys.c 2011-03-27 14:31:47.000000000 -0400
28130+++ linux-2.6.32.46/drivers/base/sys.c 2011-04-17 15:56:46.000000000 -0400
28131@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
28132 return -EIO;
28133 }
28134
28135-static struct sysfs_ops sysfs_ops = {
28136+static const struct sysfs_ops sysfs_ops = {
28137 .show = sysdev_show,
28138 .store = sysdev_store,
28139 };
28140@@ -104,7 +104,7 @@ static ssize_t sysdev_class_store(struct
28141 return -EIO;
28142 }
28143
28144-static struct sysfs_ops sysfs_class_ops = {
28145+static const struct sysfs_ops sysfs_class_ops = {
28146 .show = sysdev_class_show,
28147 .store = sysdev_class_store,
28148 };
28149diff -urNp linux-2.6.32.46/drivers/block/cciss.c linux-2.6.32.46/drivers/block/cciss.c
28150--- linux-2.6.32.46/drivers/block/cciss.c 2011-03-27 14:31:47.000000000 -0400
28151+++ linux-2.6.32.46/drivers/block/cciss.c 2011-08-05 20:33:55.000000000 -0400
28152@@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
28153 int err;
28154 u32 cp;
28155
28156+ memset(&arg64, 0, sizeof(arg64));
28157+
28158 err = 0;
28159 err |=
28160 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
28161@@ -2852,7 +2854,7 @@ static unsigned long pollcomplete(int ct
28162 /* Wait (up to 20 seconds) for a command to complete */
28163
28164 for (i = 20 * HZ; i > 0; i--) {
28165- done = hba[ctlr]->access.command_completed(hba[ctlr]);
28166+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
28167 if (done == FIFO_EMPTY)
28168 schedule_timeout_uninterruptible(1);
28169 else
28170@@ -2876,7 +2878,7 @@ static int sendcmd_core(ctlr_info_t *h,
28171 resend_cmd1:
28172
28173 /* Disable interrupt on the board. */
28174- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28175+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28176
28177 /* Make sure there is room in the command FIFO */
28178 /* Actually it should be completely empty at this time */
28179@@ -2884,13 +2886,13 @@ resend_cmd1:
28180 /* tape side of the driver. */
28181 for (i = 200000; i > 0; i--) {
28182 /* if fifo isn't full go */
28183- if (!(h->access.fifo_full(h)))
28184+ if (!(h->access->fifo_full(h)))
28185 break;
28186 udelay(10);
28187 printk(KERN_WARNING "cciss cciss%d: SendCmd FIFO full,"
28188 " waiting!\n", h->ctlr);
28189 }
28190- h->access.submit_command(h, c); /* Send the cmd */
28191+ h->access->submit_command(h, c); /* Send the cmd */
28192 do {
28193 complete = pollcomplete(h->ctlr);
28194
28195@@ -3023,7 +3025,7 @@ static void start_io(ctlr_info_t *h)
28196 while (!hlist_empty(&h->reqQ)) {
28197 c = hlist_entry(h->reqQ.first, CommandList_struct, list);
28198 /* can't do anything if fifo is full */
28199- if ((h->access.fifo_full(h))) {
28200+ if ((h->access->fifo_full(h))) {
28201 printk(KERN_WARNING "cciss: fifo full\n");
28202 break;
28203 }
28204@@ -3033,7 +3035,7 @@ static void start_io(ctlr_info_t *h)
28205 h->Qdepth--;
28206
28207 /* Tell the controller execute command */
28208- h->access.submit_command(h, c);
28209+ h->access->submit_command(h, c);
28210
28211 /* Put job onto the completed Q */
28212 addQ(&h->cmpQ, c);
28213@@ -3393,17 +3395,17 @@ startio:
28214
28215 static inline unsigned long get_next_completion(ctlr_info_t *h)
28216 {
28217- return h->access.command_completed(h);
28218+ return h->access->command_completed(h);
28219 }
28220
28221 static inline int interrupt_pending(ctlr_info_t *h)
28222 {
28223- return h->access.intr_pending(h);
28224+ return h->access->intr_pending(h);
28225 }
28226
28227 static inline long interrupt_not_for_us(ctlr_info_t *h)
28228 {
28229- return (((h->access.intr_pending(h) == 0) ||
28230+ return (((h->access->intr_pending(h) == 0) ||
28231 (h->interrupts_enabled == 0)));
28232 }
28233
28234@@ -3892,7 +3894,7 @@ static int __devinit cciss_pci_init(ctlr
28235 */
28236 c->max_commands = readl(&(c->cfgtable->CmdsOutMax));
28237 c->product_name = products[prod_index].product_name;
28238- c->access = *(products[prod_index].access);
28239+ c->access = products[prod_index].access;
28240 c->nr_cmds = c->max_commands - 4;
28241 if ((readb(&c->cfgtable->Signature[0]) != 'C') ||
28242 (readb(&c->cfgtable->Signature[1]) != 'I') ||
28243@@ -4291,7 +4293,7 @@ static int __devinit cciss_init_one(stru
28244 }
28245
28246 /* make sure the board interrupts are off */
28247- hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
28248+ hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_OFF);
28249 if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
28250 IRQF_DISABLED | IRQF_SHARED, hba[i]->devname, hba[i])) {
28251 printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
28252@@ -4341,7 +4343,7 @@ static int __devinit cciss_init_one(stru
28253 cciss_scsi_setup(i);
28254
28255 /* Turn the interrupts on so we can service requests */
28256- hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON);
28257+ hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_ON);
28258
28259 /* Get the firmware version */
28260 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
28261diff -urNp linux-2.6.32.46/drivers/block/cciss.h linux-2.6.32.46/drivers/block/cciss.h
28262--- linux-2.6.32.46/drivers/block/cciss.h 2011-08-09 18:35:28.000000000 -0400
28263+++ linux-2.6.32.46/drivers/block/cciss.h 2011-08-09 18:33:59.000000000 -0400
28264@@ -90,7 +90,7 @@ struct ctlr_info
28265 // information about each logical volume
28266 drive_info_struct *drv[CISS_MAX_LUN];
28267
28268- struct access_method access;
28269+ struct access_method *access;
28270
28271 /* queue and queue Info */
28272 struct hlist_head reqQ;
28273diff -urNp linux-2.6.32.46/drivers/block/cpqarray.c linux-2.6.32.46/drivers/block/cpqarray.c
28274--- linux-2.6.32.46/drivers/block/cpqarray.c 2011-03-27 14:31:47.000000000 -0400
28275+++ linux-2.6.32.46/drivers/block/cpqarray.c 2011-08-05 20:33:55.000000000 -0400
28276@@ -402,7 +402,7 @@ static int __init cpqarray_register_ctlr
28277 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
28278 goto Enomem4;
28279 }
28280- hba[i]->access.set_intr_mask(hba[i], 0);
28281+ hba[i]->access->set_intr_mask(hba[i], 0);
28282 if (request_irq(hba[i]->intr, do_ida_intr,
28283 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
28284 {
28285@@ -460,7 +460,7 @@ static int __init cpqarray_register_ctlr
28286 add_timer(&hba[i]->timer);
28287
28288 /* Enable IRQ now that spinlock and rate limit timer are set up */
28289- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28290+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28291
28292 for(j=0; j<NWD; j++) {
28293 struct gendisk *disk = ida_gendisk[i][j];
28294@@ -695,7 +695,7 @@ DBGINFO(
28295 for(i=0; i<NR_PRODUCTS; i++) {
28296 if (board_id == products[i].board_id) {
28297 c->product_name = products[i].product_name;
28298- c->access = *(products[i].access);
28299+ c->access = products[i].access;
28300 break;
28301 }
28302 }
28303@@ -793,7 +793,7 @@ static int __init cpqarray_eisa_detect(v
28304 hba[ctlr]->intr = intr;
28305 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
28306 hba[ctlr]->product_name = products[j].product_name;
28307- hba[ctlr]->access = *(products[j].access);
28308+ hba[ctlr]->access = products[j].access;
28309 hba[ctlr]->ctlr = ctlr;
28310 hba[ctlr]->board_id = board_id;
28311 hba[ctlr]->pci_dev = NULL; /* not PCI */
28312@@ -896,6 +896,8 @@ static void do_ida_request(struct reques
28313 struct scatterlist tmp_sg[SG_MAX];
28314 int i, dir, seg;
28315
28316+ pax_track_stack();
28317+
28318 if (blk_queue_plugged(q))
28319 goto startio;
28320
28321@@ -968,7 +970,7 @@ static void start_io(ctlr_info_t *h)
28322
28323 while((c = h->reqQ) != NULL) {
28324 /* Can't do anything if we're busy */
28325- if (h->access.fifo_full(h) == 0)
28326+ if (h->access->fifo_full(h) == 0)
28327 return;
28328
28329 /* Get the first entry from the request Q */
28330@@ -976,7 +978,7 @@ static void start_io(ctlr_info_t *h)
28331 h->Qdepth--;
28332
28333 /* Tell the controller to do our bidding */
28334- h->access.submit_command(h, c);
28335+ h->access->submit_command(h, c);
28336
28337 /* Get onto the completion Q */
28338 addQ(&h->cmpQ, c);
28339@@ -1038,7 +1040,7 @@ static irqreturn_t do_ida_intr(int irq,
28340 unsigned long flags;
28341 __u32 a,a1;
28342
28343- istat = h->access.intr_pending(h);
28344+ istat = h->access->intr_pending(h);
28345 /* Is this interrupt for us? */
28346 if (istat == 0)
28347 return IRQ_NONE;
28348@@ -1049,7 +1051,7 @@ static irqreturn_t do_ida_intr(int irq,
28349 */
28350 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
28351 if (istat & FIFO_NOT_EMPTY) {
28352- while((a = h->access.command_completed(h))) {
28353+ while((a = h->access->command_completed(h))) {
28354 a1 = a; a &= ~3;
28355 if ((c = h->cmpQ) == NULL)
28356 {
28357@@ -1434,11 +1436,11 @@ static int sendcmd(
28358 /*
28359 * Disable interrupt
28360 */
28361- info_p->access.set_intr_mask(info_p, 0);
28362+ info_p->access->set_intr_mask(info_p, 0);
28363 /* Make sure there is room in the command FIFO */
28364 /* Actually it should be completely empty at this time. */
28365 for (i = 200000; i > 0; i--) {
28366- temp = info_p->access.fifo_full(info_p);
28367+ temp = info_p->access->fifo_full(info_p);
28368 if (temp != 0) {
28369 break;
28370 }
28371@@ -1451,7 +1453,7 @@ DBG(
28372 /*
28373 * Send the cmd
28374 */
28375- info_p->access.submit_command(info_p, c);
28376+ info_p->access->submit_command(info_p, c);
28377 complete = pollcomplete(ctlr);
28378
28379 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
28380@@ -1534,9 +1536,9 @@ static int revalidate_allvol(ctlr_info_t
28381 * we check the new geometry. Then turn interrupts back on when
28382 * we're done.
28383 */
28384- host->access.set_intr_mask(host, 0);
28385+ host->access->set_intr_mask(host, 0);
28386 getgeometry(ctlr);
28387- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
28388+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
28389
28390 for(i=0; i<NWD; i++) {
28391 struct gendisk *disk = ida_gendisk[ctlr][i];
28392@@ -1576,7 +1578,7 @@ static int pollcomplete(int ctlr)
28393 /* Wait (up to 2 seconds) for a command to complete */
28394
28395 for (i = 200000; i > 0; i--) {
28396- done = hba[ctlr]->access.command_completed(hba[ctlr]);
28397+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
28398 if (done == 0) {
28399 udelay(10); /* a short fixed delay */
28400 } else
28401diff -urNp linux-2.6.32.46/drivers/block/cpqarray.h linux-2.6.32.46/drivers/block/cpqarray.h
28402--- linux-2.6.32.46/drivers/block/cpqarray.h 2011-03-27 14:31:47.000000000 -0400
28403+++ linux-2.6.32.46/drivers/block/cpqarray.h 2011-08-05 20:33:55.000000000 -0400
28404@@ -99,7 +99,7 @@ struct ctlr_info {
28405 drv_info_t drv[NWD];
28406 struct proc_dir_entry *proc;
28407
28408- struct access_method access;
28409+ struct access_method *access;
28410
28411 cmdlist_t *reqQ;
28412 cmdlist_t *cmpQ;
28413diff -urNp linux-2.6.32.46/drivers/block/DAC960.c linux-2.6.32.46/drivers/block/DAC960.c
28414--- linux-2.6.32.46/drivers/block/DAC960.c 2011-03-27 14:31:47.000000000 -0400
28415+++ linux-2.6.32.46/drivers/block/DAC960.c 2011-05-16 21:46:57.000000000 -0400
28416@@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfigur
28417 unsigned long flags;
28418 int Channel, TargetID;
28419
28420+ pax_track_stack();
28421+
28422 if (!init_dma_loaf(Controller->PCIDevice, &local_dma,
28423 DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
28424 sizeof(DAC960_SCSI_Inquiry_T) +
28425diff -urNp linux-2.6.32.46/drivers/block/loop.c linux-2.6.32.46/drivers/block/loop.c
28426--- linux-2.6.32.46/drivers/block/loop.c 2011-06-25 12:55:34.000000000 -0400
28427+++ linux-2.6.32.46/drivers/block/loop.c 2011-10-06 09:37:14.000000000 -0400
28428@@ -282,7 +282,7 @@ static int __do_lo_send_write(struct fil
28429 mm_segment_t old_fs = get_fs();
28430
28431 set_fs(get_ds());
28432- bw = file->f_op->write(file, buf, len, &pos);
28433+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
28434 set_fs(old_fs);
28435 if (likely(bw == len))
28436 return 0;
28437diff -urNp linux-2.6.32.46/drivers/block/nbd.c linux-2.6.32.46/drivers/block/nbd.c
28438--- linux-2.6.32.46/drivers/block/nbd.c 2011-06-25 12:55:34.000000000 -0400
28439+++ linux-2.6.32.46/drivers/block/nbd.c 2011-06-25 12:56:37.000000000 -0400
28440@@ -155,6 +155,8 @@ static int sock_xmit(struct nbd_device *
28441 struct kvec iov;
28442 sigset_t blocked, oldset;
28443
28444+ pax_track_stack();
28445+
28446 if (unlikely(!sock)) {
28447 printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
28448 lo->disk->disk_name, (send ? "send" : "recv"));
28449@@ -569,6 +571,8 @@ static void do_nbd_request(struct reques
28450 static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
28451 unsigned int cmd, unsigned long arg)
28452 {
28453+ pax_track_stack();
28454+
28455 switch (cmd) {
28456 case NBD_DISCONNECT: {
28457 struct request sreq;
28458diff -urNp linux-2.6.32.46/drivers/block/pktcdvd.c linux-2.6.32.46/drivers/block/pktcdvd.c
28459--- linux-2.6.32.46/drivers/block/pktcdvd.c 2011-03-27 14:31:47.000000000 -0400
28460+++ linux-2.6.32.46/drivers/block/pktcdvd.c 2011-04-17 15:56:46.000000000 -0400
28461@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
28462 return len;
28463 }
28464
28465-static struct sysfs_ops kobj_pkt_ops = {
28466+static const struct sysfs_ops kobj_pkt_ops = {
28467 .show = kobj_pkt_show,
28468 .store = kobj_pkt_store
28469 };
28470diff -urNp linux-2.6.32.46/drivers/char/agp/frontend.c linux-2.6.32.46/drivers/char/agp/frontend.c
28471--- linux-2.6.32.46/drivers/char/agp/frontend.c 2011-03-27 14:31:47.000000000 -0400
28472+++ linux-2.6.32.46/drivers/char/agp/frontend.c 2011-04-17 15:56:46.000000000 -0400
28473@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
28474 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
28475 return -EFAULT;
28476
28477- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
28478+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
28479 return -EFAULT;
28480
28481 client = agp_find_client_by_pid(reserve.pid);
28482diff -urNp linux-2.6.32.46/drivers/char/briq_panel.c linux-2.6.32.46/drivers/char/briq_panel.c
28483--- linux-2.6.32.46/drivers/char/briq_panel.c 2011-03-27 14:31:47.000000000 -0400
28484+++ linux-2.6.32.46/drivers/char/briq_panel.c 2011-04-18 19:48:57.000000000 -0400
28485@@ -10,6 +10,7 @@
28486 #include <linux/types.h>
28487 #include <linux/errno.h>
28488 #include <linux/tty.h>
28489+#include <linux/mutex.h>
28490 #include <linux/timer.h>
28491 #include <linux/kernel.h>
28492 #include <linux/wait.h>
28493@@ -36,6 +37,7 @@ static int vfd_is_open;
28494 static unsigned char vfd[40];
28495 static int vfd_cursor;
28496 static unsigned char ledpb, led;
28497+static DEFINE_MUTEX(vfd_mutex);
28498
28499 static void update_vfd(void)
28500 {
28501@@ -142,12 +144,15 @@ static ssize_t briq_panel_write(struct f
28502 if (!vfd_is_open)
28503 return -EBUSY;
28504
28505+ mutex_lock(&vfd_mutex);
28506 for (;;) {
28507 char c;
28508 if (!indx)
28509 break;
28510- if (get_user(c, buf))
28511+ if (get_user(c, buf)) {
28512+ mutex_unlock(&vfd_mutex);
28513 return -EFAULT;
28514+ }
28515 if (esc) {
28516 set_led(c);
28517 esc = 0;
28518@@ -177,6 +182,7 @@ static ssize_t briq_panel_write(struct f
28519 buf++;
28520 }
28521 update_vfd();
28522+ mutex_unlock(&vfd_mutex);
28523
28524 return len;
28525 }
28526diff -urNp linux-2.6.32.46/drivers/char/genrtc.c linux-2.6.32.46/drivers/char/genrtc.c
28527--- linux-2.6.32.46/drivers/char/genrtc.c 2011-03-27 14:31:47.000000000 -0400
28528+++ linux-2.6.32.46/drivers/char/genrtc.c 2011-04-18 19:45:42.000000000 -0400
28529@@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *i
28530 switch (cmd) {
28531
28532 case RTC_PLL_GET:
28533+ memset(&pll, 0, sizeof(pll));
28534 if (get_rtc_pll(&pll))
28535 return -EINVAL;
28536 else
28537diff -urNp linux-2.6.32.46/drivers/char/hpet.c linux-2.6.32.46/drivers/char/hpet.c
28538--- linux-2.6.32.46/drivers/char/hpet.c 2011-03-27 14:31:47.000000000 -0400
28539+++ linux-2.6.32.46/drivers/char/hpet.c 2011-04-23 12:56:11.000000000 -0400
28540@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
28541 return 0;
28542 }
28543
28544-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
28545+static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int);
28546
28547 static int
28548 hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
28549@@ -565,7 +565,7 @@ static inline unsigned long hpet_time_di
28550 }
28551
28552 static int
28553-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
28554+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, int kernel)
28555 {
28556 struct hpet_timer __iomem *timer;
28557 struct hpet __iomem *hpet;
28558@@ -608,11 +608,11 @@ hpet_ioctl_common(struct hpet_dev *devp,
28559 {
28560 struct hpet_info info;
28561
28562+ memset(&info, 0, sizeof(info));
28563+
28564 if (devp->hd_ireqfreq)
28565 info.hi_ireqfreq =
28566 hpet_time_div(hpetp, devp->hd_ireqfreq);
28567- else
28568- info.hi_ireqfreq = 0;
28569 info.hi_flags =
28570 readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
28571 info.hi_hpet = hpetp->hp_which;
28572diff -urNp linux-2.6.32.46/drivers/char/hvc_beat.c linux-2.6.32.46/drivers/char/hvc_beat.c
28573--- linux-2.6.32.46/drivers/char/hvc_beat.c 2011-03-27 14:31:47.000000000 -0400
28574+++ linux-2.6.32.46/drivers/char/hvc_beat.c 2011-04-17 15:56:46.000000000 -0400
28575@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
28576 return cnt;
28577 }
28578
28579-static struct hv_ops hvc_beat_get_put_ops = {
28580+static const struct hv_ops hvc_beat_get_put_ops = {
28581 .get_chars = hvc_beat_get_chars,
28582 .put_chars = hvc_beat_put_chars,
28583 };
28584diff -urNp linux-2.6.32.46/drivers/char/hvc_console.c linux-2.6.32.46/drivers/char/hvc_console.c
28585--- linux-2.6.32.46/drivers/char/hvc_console.c 2011-03-27 14:31:47.000000000 -0400
28586+++ linux-2.6.32.46/drivers/char/hvc_console.c 2011-04-17 15:56:46.000000000 -0400
28587@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
28588 * console interfaces but can still be used as a tty device. This has to be
28589 * static because kmalloc will not work during early console init.
28590 */
28591-static struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
28592+static const struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
28593 static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
28594 {[0 ... MAX_NR_HVC_CONSOLES - 1] = -1};
28595
28596@@ -247,7 +247,7 @@ static void destroy_hvc_struct(struct kr
28597 * vty adapters do NOT get an hvc_instantiate() callback since they
28598 * appear after early console init.
28599 */
28600-int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
28601+int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
28602 {
28603 struct hvc_struct *hp;
28604
28605@@ -756,7 +756,7 @@ static const struct tty_operations hvc_o
28606 };
28607
28608 struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,
28609- struct hv_ops *ops, int outbuf_size)
28610+ const struct hv_ops *ops, int outbuf_size)
28611 {
28612 struct hvc_struct *hp;
28613 int i;
28614diff -urNp linux-2.6.32.46/drivers/char/hvc_console.h linux-2.6.32.46/drivers/char/hvc_console.h
28615--- linux-2.6.32.46/drivers/char/hvc_console.h 2011-03-27 14:31:47.000000000 -0400
28616+++ linux-2.6.32.46/drivers/char/hvc_console.h 2011-04-17 15:56:46.000000000 -0400
28617@@ -55,7 +55,7 @@ struct hvc_struct {
28618 int outbuf_size;
28619 int n_outbuf;
28620 uint32_t vtermno;
28621- struct hv_ops *ops;
28622+ const struct hv_ops *ops;
28623 int irq_requested;
28624 int data;
28625 struct winsize ws;
28626@@ -76,11 +76,11 @@ struct hv_ops {
28627 };
28628
28629 /* Register a vterm and a slot index for use as a console (console_init) */
28630-extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
28631+extern int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops);
28632
28633 /* register a vterm for hvc tty operation (module_init or hotplug add) */
28634 extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data,
28635- struct hv_ops *ops, int outbuf_size);
28636+ const struct hv_ops *ops, int outbuf_size);
28637 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
28638 extern int hvc_remove(struct hvc_struct *hp);
28639
28640diff -urNp linux-2.6.32.46/drivers/char/hvc_iseries.c linux-2.6.32.46/drivers/char/hvc_iseries.c
28641--- linux-2.6.32.46/drivers/char/hvc_iseries.c 2011-03-27 14:31:47.000000000 -0400
28642+++ linux-2.6.32.46/drivers/char/hvc_iseries.c 2011-04-17 15:56:46.000000000 -0400
28643@@ -197,7 +197,7 @@ done:
28644 return sent;
28645 }
28646
28647-static struct hv_ops hvc_get_put_ops = {
28648+static const struct hv_ops hvc_get_put_ops = {
28649 .get_chars = get_chars,
28650 .put_chars = put_chars,
28651 .notifier_add = notifier_add_irq,
28652diff -urNp linux-2.6.32.46/drivers/char/hvc_iucv.c linux-2.6.32.46/drivers/char/hvc_iucv.c
28653--- linux-2.6.32.46/drivers/char/hvc_iucv.c 2011-03-27 14:31:47.000000000 -0400
28654+++ linux-2.6.32.46/drivers/char/hvc_iucv.c 2011-04-17 15:56:46.000000000 -0400
28655@@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru
28656
28657
28658 /* HVC operations */
28659-static struct hv_ops hvc_iucv_ops = {
28660+static const struct hv_ops hvc_iucv_ops = {
28661 .get_chars = hvc_iucv_get_chars,
28662 .put_chars = hvc_iucv_put_chars,
28663 .notifier_add = hvc_iucv_notifier_add,
28664diff -urNp linux-2.6.32.46/drivers/char/hvc_rtas.c linux-2.6.32.46/drivers/char/hvc_rtas.c
28665--- linux-2.6.32.46/drivers/char/hvc_rtas.c 2011-03-27 14:31:47.000000000 -0400
28666+++ linux-2.6.32.46/drivers/char/hvc_rtas.c 2011-04-17 15:56:46.000000000 -0400
28667@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
28668 return i;
28669 }
28670
28671-static struct hv_ops hvc_rtas_get_put_ops = {
28672+static const struct hv_ops hvc_rtas_get_put_ops = {
28673 .get_chars = hvc_rtas_read_console,
28674 .put_chars = hvc_rtas_write_console,
28675 };
28676diff -urNp linux-2.6.32.46/drivers/char/hvcs.c linux-2.6.32.46/drivers/char/hvcs.c
28677--- linux-2.6.32.46/drivers/char/hvcs.c 2011-03-27 14:31:47.000000000 -0400
28678+++ linux-2.6.32.46/drivers/char/hvcs.c 2011-04-17 15:56:46.000000000 -0400
28679@@ -82,6 +82,7 @@
28680 #include <asm/hvcserver.h>
28681 #include <asm/uaccess.h>
28682 #include <asm/vio.h>
28683+#include <asm/local.h>
28684
28685 /*
28686 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
28687@@ -269,7 +270,7 @@ struct hvcs_struct {
28688 unsigned int index;
28689
28690 struct tty_struct *tty;
28691- int open_count;
28692+ local_t open_count;
28693
28694 /*
28695 * Used to tell the driver kernel_thread what operations need to take
28696@@ -419,7 +420,7 @@ static ssize_t hvcs_vterm_state_store(st
28697
28698 spin_lock_irqsave(&hvcsd->lock, flags);
28699
28700- if (hvcsd->open_count > 0) {
28701+ if (local_read(&hvcsd->open_count) > 0) {
28702 spin_unlock_irqrestore(&hvcsd->lock, flags);
28703 printk(KERN_INFO "HVCS: vterm state unchanged. "
28704 "The hvcs device node is still in use.\n");
28705@@ -1135,7 +1136,7 @@ static int hvcs_open(struct tty_struct *
28706 if ((retval = hvcs_partner_connect(hvcsd)))
28707 goto error_release;
28708
28709- hvcsd->open_count = 1;
28710+ local_set(&hvcsd->open_count, 1);
28711 hvcsd->tty = tty;
28712 tty->driver_data = hvcsd;
28713
28714@@ -1169,7 +1170,7 @@ fast_open:
28715
28716 spin_lock_irqsave(&hvcsd->lock, flags);
28717 kref_get(&hvcsd->kref);
28718- hvcsd->open_count++;
28719+ local_inc(&hvcsd->open_count);
28720 hvcsd->todo_mask |= HVCS_SCHED_READ;
28721 spin_unlock_irqrestore(&hvcsd->lock, flags);
28722
28723@@ -1213,7 +1214,7 @@ static void hvcs_close(struct tty_struct
28724 hvcsd = tty->driver_data;
28725
28726 spin_lock_irqsave(&hvcsd->lock, flags);
28727- if (--hvcsd->open_count == 0) {
28728+ if (local_dec_and_test(&hvcsd->open_count)) {
28729
28730 vio_disable_interrupts(hvcsd->vdev);
28731
28732@@ -1239,10 +1240,10 @@ static void hvcs_close(struct tty_struct
28733 free_irq(irq, hvcsd);
28734 kref_put(&hvcsd->kref, destroy_hvcs_struct);
28735 return;
28736- } else if (hvcsd->open_count < 0) {
28737+ } else if (local_read(&hvcsd->open_count) < 0) {
28738 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
28739 " is missmanaged.\n",
28740- hvcsd->vdev->unit_address, hvcsd->open_count);
28741+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
28742 }
28743
28744 spin_unlock_irqrestore(&hvcsd->lock, flags);
28745@@ -1258,7 +1259,7 @@ static void hvcs_hangup(struct tty_struc
28746
28747 spin_lock_irqsave(&hvcsd->lock, flags);
28748 /* Preserve this so that we know how many kref refs to put */
28749- temp_open_count = hvcsd->open_count;
28750+ temp_open_count = local_read(&hvcsd->open_count);
28751
28752 /*
28753 * Don't kref put inside the spinlock because the destruction
28754@@ -1273,7 +1274,7 @@ static void hvcs_hangup(struct tty_struc
28755 hvcsd->tty->driver_data = NULL;
28756 hvcsd->tty = NULL;
28757
28758- hvcsd->open_count = 0;
28759+ local_set(&hvcsd->open_count, 0);
28760
28761 /* This will drop any buffered data on the floor which is OK in a hangup
28762 * scenario. */
28763@@ -1344,7 +1345,7 @@ static int hvcs_write(struct tty_struct
28764 * the middle of a write operation? This is a crummy place to do this
28765 * but we want to keep it all in the spinlock.
28766 */
28767- if (hvcsd->open_count <= 0) {
28768+ if (local_read(&hvcsd->open_count) <= 0) {
28769 spin_unlock_irqrestore(&hvcsd->lock, flags);
28770 return -ENODEV;
28771 }
28772@@ -1418,7 +1419,7 @@ static int hvcs_write_room(struct tty_st
28773 {
28774 struct hvcs_struct *hvcsd = tty->driver_data;
28775
28776- if (!hvcsd || hvcsd->open_count <= 0)
28777+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
28778 return 0;
28779
28780 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
28781diff -urNp linux-2.6.32.46/drivers/char/hvc_udbg.c linux-2.6.32.46/drivers/char/hvc_udbg.c
28782--- linux-2.6.32.46/drivers/char/hvc_udbg.c 2011-03-27 14:31:47.000000000 -0400
28783+++ linux-2.6.32.46/drivers/char/hvc_udbg.c 2011-04-17 15:56:46.000000000 -0400
28784@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
28785 return i;
28786 }
28787
28788-static struct hv_ops hvc_udbg_ops = {
28789+static const struct hv_ops hvc_udbg_ops = {
28790 .get_chars = hvc_udbg_get,
28791 .put_chars = hvc_udbg_put,
28792 };
28793diff -urNp linux-2.6.32.46/drivers/char/hvc_vio.c linux-2.6.32.46/drivers/char/hvc_vio.c
28794--- linux-2.6.32.46/drivers/char/hvc_vio.c 2011-03-27 14:31:47.000000000 -0400
28795+++ linux-2.6.32.46/drivers/char/hvc_vio.c 2011-04-17 15:56:46.000000000 -0400
28796@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
28797 return got;
28798 }
28799
28800-static struct hv_ops hvc_get_put_ops = {
28801+static const struct hv_ops hvc_get_put_ops = {
28802 .get_chars = filtered_get_chars,
28803 .put_chars = hvc_put_chars,
28804 .notifier_add = notifier_add_irq,
28805diff -urNp linux-2.6.32.46/drivers/char/hvc_xen.c linux-2.6.32.46/drivers/char/hvc_xen.c
28806--- linux-2.6.32.46/drivers/char/hvc_xen.c 2011-03-27 14:31:47.000000000 -0400
28807+++ linux-2.6.32.46/drivers/char/hvc_xen.c 2011-04-17 15:56:46.000000000 -0400
28808@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
28809 return recv;
28810 }
28811
28812-static struct hv_ops hvc_ops = {
28813+static const struct hv_ops hvc_ops = {
28814 .get_chars = read_console,
28815 .put_chars = write_console,
28816 .notifier_add = notifier_add_irq,
28817diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c
28818--- linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c 2011-03-27 14:31:47.000000000 -0400
28819+++ linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c 2011-05-16 21:46:57.000000000 -0400
28820@@ -414,7 +414,7 @@ struct ipmi_smi {
28821 struct proc_dir_entry *proc_dir;
28822 char proc_dir_name[10];
28823
28824- atomic_t stats[IPMI_NUM_STATS];
28825+ atomic_unchecked_t stats[IPMI_NUM_STATS];
28826
28827 /*
28828 * run_to_completion duplicate of smb_info, smi_info
28829@@ -447,9 +447,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
28830
28831
28832 #define ipmi_inc_stat(intf, stat) \
28833- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
28834+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
28835 #define ipmi_get_stat(intf, stat) \
28836- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
28837+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
28838
28839 static int is_lan_addr(struct ipmi_addr *addr)
28840 {
28841@@ -2808,7 +2808,7 @@ int ipmi_register_smi(struct ipmi_smi_ha
28842 INIT_LIST_HEAD(&intf->cmd_rcvrs);
28843 init_waitqueue_head(&intf->waitq);
28844 for (i = 0; i < IPMI_NUM_STATS; i++)
28845- atomic_set(&intf->stats[i], 0);
28846+ atomic_set_unchecked(&intf->stats[i], 0);
28847
28848 intf->proc_dir = NULL;
28849
28850@@ -4160,6 +4160,8 @@ static void send_panic_events(char *str)
28851 struct ipmi_smi_msg smi_msg;
28852 struct ipmi_recv_msg recv_msg;
28853
28854+ pax_track_stack();
28855+
28856 si = (struct ipmi_system_interface_addr *) &addr;
28857 si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
28858 si->channel = IPMI_BMC_CHANNEL;
28859diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c
28860--- linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c 2011-03-27 14:31:47.000000000 -0400
28861+++ linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:56:46.000000000 -0400
28862@@ -277,7 +277,7 @@ struct smi_info {
28863 unsigned char slave_addr;
28864
28865 /* Counters and things for the proc filesystem. */
28866- atomic_t stats[SI_NUM_STATS];
28867+ atomic_unchecked_t stats[SI_NUM_STATS];
28868
28869 struct task_struct *thread;
28870
28871@@ -285,9 +285,9 @@ struct smi_info {
28872 };
28873
28874 #define smi_inc_stat(smi, stat) \
28875- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
28876+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
28877 #define smi_get_stat(smi, stat) \
28878- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
28879+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
28880
28881 #define SI_MAX_PARMS 4
28882
28883@@ -2931,7 +2931,7 @@ static int try_smi_init(struct smi_info
28884 atomic_set(&new_smi->req_events, 0);
28885 new_smi->run_to_completion = 0;
28886 for (i = 0; i < SI_NUM_STATS; i++)
28887- atomic_set(&new_smi->stats[i], 0);
28888+ atomic_set_unchecked(&new_smi->stats[i], 0);
28889
28890 new_smi->interrupt_disabled = 0;
28891 atomic_set(&new_smi->stop_operation, 0);
28892diff -urNp linux-2.6.32.46/drivers/char/istallion.c linux-2.6.32.46/drivers/char/istallion.c
28893--- linux-2.6.32.46/drivers/char/istallion.c 2011-03-27 14:31:47.000000000 -0400
28894+++ linux-2.6.32.46/drivers/char/istallion.c 2011-05-16 21:46:57.000000000 -0400
28895@@ -187,7 +187,6 @@ static struct ktermios stli_deftermios
28896 * re-used for each stats call.
28897 */
28898 static comstats_t stli_comstats;
28899-static combrd_t stli_brdstats;
28900 static struct asystats stli_cdkstats;
28901
28902 /*****************************************************************************/
28903@@ -4058,6 +4057,7 @@ static int stli_getbrdstats(combrd_t __u
28904 {
28905 struct stlibrd *brdp;
28906 unsigned int i;
28907+ combrd_t stli_brdstats;
28908
28909 if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
28910 return -EFAULT;
28911@@ -4269,6 +4269,8 @@ static int stli_getportstruct(struct stl
28912 struct stliport stli_dummyport;
28913 struct stliport *portp;
28914
28915+ pax_track_stack();
28916+
28917 if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport)))
28918 return -EFAULT;
28919 portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr,
28920@@ -4291,6 +4293,8 @@ static int stli_getbrdstruct(struct stli
28921 struct stlibrd stli_dummybrd;
28922 struct stlibrd *brdp;
28923
28924+ pax_track_stack();
28925+
28926 if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
28927 return -EFAULT;
28928 if (stli_dummybrd.brdnr >= STL_MAXBRDS)
28929diff -urNp linux-2.6.32.46/drivers/char/Kconfig linux-2.6.32.46/drivers/char/Kconfig
28930--- linux-2.6.32.46/drivers/char/Kconfig 2011-03-27 14:31:47.000000000 -0400
28931+++ linux-2.6.32.46/drivers/char/Kconfig 2011-04-18 19:20:15.000000000 -0400
28932@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
28933
28934 config DEVKMEM
28935 bool "/dev/kmem virtual device support"
28936- default y
28937+ default n
28938+ depends on !GRKERNSEC_KMEM
28939 help
28940 Say Y here if you want to support the /dev/kmem device. The
28941 /dev/kmem device is rarely used, but can be used for certain
28942@@ -1114,6 +1115,7 @@ config DEVPORT
28943 bool
28944 depends on !M68K
28945 depends on ISA || PCI
28946+ depends on !GRKERNSEC_KMEM
28947 default y
28948
28949 source "drivers/s390/char/Kconfig"
28950diff -urNp linux-2.6.32.46/drivers/char/keyboard.c linux-2.6.32.46/drivers/char/keyboard.c
28951--- linux-2.6.32.46/drivers/char/keyboard.c 2011-03-27 14:31:47.000000000 -0400
28952+++ linux-2.6.32.46/drivers/char/keyboard.c 2011-04-17 15:56:46.000000000 -0400
28953@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
28954 kbd->kbdmode == VC_MEDIUMRAW) &&
28955 value != KVAL(K_SAK))
28956 return; /* SAK is allowed even in raw mode */
28957+
28958+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
28959+ {
28960+ void *func = fn_handler[value];
28961+ if (func == fn_show_state || func == fn_show_ptregs ||
28962+ func == fn_show_mem)
28963+ return;
28964+ }
28965+#endif
28966+
28967 fn_handler[value](vc);
28968 }
28969
28970@@ -1386,7 +1396,7 @@ static const struct input_device_id kbd_
28971 .evbit = { BIT_MASK(EV_SND) },
28972 },
28973
28974- { }, /* Terminating entry */
28975+ { 0 }, /* Terminating entry */
28976 };
28977
28978 MODULE_DEVICE_TABLE(input, kbd_ids);
28979diff -urNp linux-2.6.32.46/drivers/char/mem.c linux-2.6.32.46/drivers/char/mem.c
28980--- linux-2.6.32.46/drivers/char/mem.c 2011-03-27 14:31:47.000000000 -0400
28981+++ linux-2.6.32.46/drivers/char/mem.c 2011-04-17 15:56:46.000000000 -0400
28982@@ -18,6 +18,7 @@
28983 #include <linux/raw.h>
28984 #include <linux/tty.h>
28985 #include <linux/capability.h>
28986+#include <linux/security.h>
28987 #include <linux/ptrace.h>
28988 #include <linux/device.h>
28989 #include <linux/highmem.h>
28990@@ -35,6 +36,10 @@
28991 # include <linux/efi.h>
28992 #endif
28993
28994+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
28995+extern struct file_operations grsec_fops;
28996+#endif
28997+
28998 static inline unsigned long size_inside_page(unsigned long start,
28999 unsigned long size)
29000 {
29001@@ -102,9 +107,13 @@ static inline int range_is_allowed(unsig
29002
29003 while (cursor < to) {
29004 if (!devmem_is_allowed(pfn)) {
29005+#ifdef CONFIG_GRKERNSEC_KMEM
29006+ gr_handle_mem_readwrite(from, to);
29007+#else
29008 printk(KERN_INFO
29009 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
29010 current->comm, from, to);
29011+#endif
29012 return 0;
29013 }
29014 cursor += PAGE_SIZE;
29015@@ -112,6 +121,11 @@ static inline int range_is_allowed(unsig
29016 }
29017 return 1;
29018 }
29019+#elif defined(CONFIG_GRKERNSEC_KMEM)
29020+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29021+{
29022+ return 0;
29023+}
29024 #else
29025 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29026 {
29027@@ -155,6 +169,8 @@ static ssize_t read_mem(struct file * fi
29028 #endif
29029
29030 while (count > 0) {
29031+ char *temp;
29032+
29033 /*
29034 * Handle first page in case it's not aligned
29035 */
29036@@ -177,11 +193,31 @@ static ssize_t read_mem(struct file * fi
29037 if (!ptr)
29038 return -EFAULT;
29039
29040- if (copy_to_user(buf, ptr, sz)) {
29041+#ifdef CONFIG_PAX_USERCOPY
29042+ temp = kmalloc(sz, GFP_KERNEL);
29043+ if (!temp) {
29044+ unxlate_dev_mem_ptr(p, ptr);
29045+ return -ENOMEM;
29046+ }
29047+ memcpy(temp, ptr, sz);
29048+#else
29049+ temp = ptr;
29050+#endif
29051+
29052+ if (copy_to_user(buf, temp, sz)) {
29053+
29054+#ifdef CONFIG_PAX_USERCOPY
29055+ kfree(temp);
29056+#endif
29057+
29058 unxlate_dev_mem_ptr(p, ptr);
29059 return -EFAULT;
29060 }
29061
29062+#ifdef CONFIG_PAX_USERCOPY
29063+ kfree(temp);
29064+#endif
29065+
29066 unxlate_dev_mem_ptr(p, ptr);
29067
29068 buf += sz;
29069@@ -419,9 +455,8 @@ static ssize_t read_kmem(struct file *fi
29070 size_t count, loff_t *ppos)
29071 {
29072 unsigned long p = *ppos;
29073- ssize_t low_count, read, sz;
29074+ ssize_t low_count, read, sz, err = 0;
29075 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
29076- int err = 0;
29077
29078 read = 0;
29079 if (p < (unsigned long) high_memory) {
29080@@ -444,6 +479,8 @@ static ssize_t read_kmem(struct file *fi
29081 }
29082 #endif
29083 while (low_count > 0) {
29084+ char *temp;
29085+
29086 sz = size_inside_page(p, low_count);
29087
29088 /*
29089@@ -453,7 +490,22 @@ static ssize_t read_kmem(struct file *fi
29090 */
29091 kbuf = xlate_dev_kmem_ptr((char *)p);
29092
29093- if (copy_to_user(buf, kbuf, sz))
29094+#ifdef CONFIG_PAX_USERCOPY
29095+ temp = kmalloc(sz, GFP_KERNEL);
29096+ if (!temp)
29097+ return -ENOMEM;
29098+ memcpy(temp, kbuf, sz);
29099+#else
29100+ temp = kbuf;
29101+#endif
29102+
29103+ err = copy_to_user(buf, temp, sz);
29104+
29105+#ifdef CONFIG_PAX_USERCOPY
29106+ kfree(temp);
29107+#endif
29108+
29109+ if (err)
29110 return -EFAULT;
29111 buf += sz;
29112 p += sz;
29113@@ -889,6 +941,9 @@ static const struct memdev {
29114 #ifdef CONFIG_CRASH_DUMP
29115 [12] = { "oldmem", 0, &oldmem_fops, NULL },
29116 #endif
29117+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29118+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
29119+#endif
29120 };
29121
29122 static int memory_open(struct inode *inode, struct file *filp)
29123diff -urNp linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c
29124--- linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c 2011-03-27 14:31:47.000000000 -0400
29125+++ linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:56:46.000000000 -0400
29126@@ -29,6 +29,7 @@
29127 #include <linux/tty_driver.h>
29128 #include <linux/tty_flip.h>
29129 #include <linux/uaccess.h>
29130+#include <asm/local.h>
29131
29132 #include "tty.h"
29133 #include "network.h"
29134@@ -51,7 +52,7 @@ struct ipw_tty {
29135 int tty_type;
29136 struct ipw_network *network;
29137 struct tty_struct *linux_tty;
29138- int open_count;
29139+ local_t open_count;
29140 unsigned int control_lines;
29141 struct mutex ipw_tty_mutex;
29142 int tx_bytes_queued;
29143@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *l
29144 mutex_unlock(&tty->ipw_tty_mutex);
29145 return -ENODEV;
29146 }
29147- if (tty->open_count == 0)
29148+ if (local_read(&tty->open_count) == 0)
29149 tty->tx_bytes_queued = 0;
29150
29151- tty->open_count++;
29152+ local_inc(&tty->open_count);
29153
29154 tty->linux_tty = linux_tty;
29155 linux_tty->driver_data = tty;
29156@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *l
29157
29158 static void do_ipw_close(struct ipw_tty *tty)
29159 {
29160- tty->open_count--;
29161-
29162- if (tty->open_count == 0) {
29163+ if (local_dec_return(&tty->open_count) == 0) {
29164 struct tty_struct *linux_tty = tty->linux_tty;
29165
29166 if (linux_tty != NULL) {
29167@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct
29168 return;
29169
29170 mutex_lock(&tty->ipw_tty_mutex);
29171- if (tty->open_count == 0) {
29172+ if (local_read(&tty->open_count) == 0) {
29173 mutex_unlock(&tty->ipw_tty_mutex);
29174 return;
29175 }
29176@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_
29177 return;
29178 }
29179
29180- if (!tty->open_count) {
29181+ if (!local_read(&tty->open_count)) {
29182 mutex_unlock(&tty->ipw_tty_mutex);
29183 return;
29184 }
29185@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *
29186 return -ENODEV;
29187
29188 mutex_lock(&tty->ipw_tty_mutex);
29189- if (!tty->open_count) {
29190+ if (!local_read(&tty->open_count)) {
29191 mutex_unlock(&tty->ipw_tty_mutex);
29192 return -EINVAL;
29193 }
29194@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_str
29195 if (!tty)
29196 return -ENODEV;
29197
29198- if (!tty->open_count)
29199+ if (!local_read(&tty->open_count))
29200 return -EINVAL;
29201
29202 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
29203@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tt
29204 if (!tty)
29205 return 0;
29206
29207- if (!tty->open_count)
29208+ if (!local_read(&tty->open_count))
29209 return 0;
29210
29211 return tty->tx_bytes_queued;
29212@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struc
29213 if (!tty)
29214 return -ENODEV;
29215
29216- if (!tty->open_count)
29217+ if (!local_read(&tty->open_count))
29218 return -EINVAL;
29219
29220 return get_control_lines(tty);
29221@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tt
29222 if (!tty)
29223 return -ENODEV;
29224
29225- if (!tty->open_count)
29226+ if (!local_read(&tty->open_count))
29227 return -EINVAL;
29228
29229 return set_control_lines(tty, set, clear);
29230@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *
29231 if (!tty)
29232 return -ENODEV;
29233
29234- if (!tty->open_count)
29235+ if (!local_read(&tty->open_count))
29236 return -EINVAL;
29237
29238 /* FIXME: Exactly how is the tty object locked here .. */
29239@@ -591,7 +590,7 @@ void ipwireless_tty_free(struct ipw_tty
29240 against a parallel ioctl etc */
29241 mutex_lock(&ttyj->ipw_tty_mutex);
29242 }
29243- while (ttyj->open_count)
29244+ while (local_read(&ttyj->open_count))
29245 do_ipw_close(ttyj);
29246 ipwireless_disassociate_network_ttys(network,
29247 ttyj->channel_idx);
29248diff -urNp linux-2.6.32.46/drivers/char/pty.c linux-2.6.32.46/drivers/char/pty.c
29249--- linux-2.6.32.46/drivers/char/pty.c 2011-03-27 14:31:47.000000000 -0400
29250+++ linux-2.6.32.46/drivers/char/pty.c 2011-08-05 20:33:55.000000000 -0400
29251@@ -736,8 +736,10 @@ static void __init unix98_pty_init(void)
29252 register_sysctl_table(pty_root_table);
29253
29254 /* Now create the /dev/ptmx special device */
29255+ pax_open_kernel();
29256 tty_default_fops(&ptmx_fops);
29257- ptmx_fops.open = ptmx_open;
29258+ *(void **)&ptmx_fops.open = ptmx_open;
29259+ pax_close_kernel();
29260
29261 cdev_init(&ptmx_cdev, &ptmx_fops);
29262 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
29263diff -urNp linux-2.6.32.46/drivers/char/random.c linux-2.6.32.46/drivers/char/random.c
29264--- linux-2.6.32.46/drivers/char/random.c 2011-08-16 20:37:25.000000000 -0400
29265+++ linux-2.6.32.46/drivers/char/random.c 2011-08-16 20:43:23.000000000 -0400
29266@@ -254,8 +254,13 @@
29267 /*
29268 * Configuration information
29269 */
29270+#ifdef CONFIG_GRKERNSEC_RANDNET
29271+#define INPUT_POOL_WORDS 512
29272+#define OUTPUT_POOL_WORDS 128
29273+#else
29274 #define INPUT_POOL_WORDS 128
29275 #define OUTPUT_POOL_WORDS 32
29276+#endif
29277 #define SEC_XFER_SIZE 512
29278
29279 /*
29280@@ -292,10 +297,17 @@ static struct poolinfo {
29281 int poolwords;
29282 int tap1, tap2, tap3, tap4, tap5;
29283 } poolinfo_table[] = {
29284+#ifdef CONFIG_GRKERNSEC_RANDNET
29285+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
29286+ { 512, 411, 308, 208, 104, 1 },
29287+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
29288+ { 128, 103, 76, 51, 25, 1 },
29289+#else
29290 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
29291 { 128, 103, 76, 51, 25, 1 },
29292 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
29293 { 32, 26, 20, 14, 7, 1 },
29294+#endif
29295 #if 0
29296 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
29297 { 2048, 1638, 1231, 819, 411, 1 },
29298@@ -1209,7 +1221,7 @@ EXPORT_SYMBOL(generate_random_uuid);
29299 #include <linux/sysctl.h>
29300
29301 static int min_read_thresh = 8, min_write_thresh;
29302-static int max_read_thresh = INPUT_POOL_WORDS * 32;
29303+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
29304 static int max_write_thresh = INPUT_POOL_WORDS * 32;
29305 static char sysctl_bootid[16];
29306
29307diff -urNp linux-2.6.32.46/drivers/char/rocket.c linux-2.6.32.46/drivers/char/rocket.c
29308--- linux-2.6.32.46/drivers/char/rocket.c 2011-03-27 14:31:47.000000000 -0400
29309+++ linux-2.6.32.46/drivers/char/rocket.c 2011-05-16 21:46:57.000000000 -0400
29310@@ -1266,6 +1266,8 @@ static int get_ports(struct r_port *info
29311 struct rocket_ports tmp;
29312 int board;
29313
29314+ pax_track_stack();
29315+
29316 if (!retports)
29317 return -EFAULT;
29318 memset(&tmp, 0, sizeof (tmp));
29319diff -urNp linux-2.6.32.46/drivers/char/sonypi.c linux-2.6.32.46/drivers/char/sonypi.c
29320--- linux-2.6.32.46/drivers/char/sonypi.c 2011-03-27 14:31:47.000000000 -0400
29321+++ linux-2.6.32.46/drivers/char/sonypi.c 2011-04-17 15:56:46.000000000 -0400
29322@@ -55,6 +55,7 @@
29323 #include <asm/uaccess.h>
29324 #include <asm/io.h>
29325 #include <asm/system.h>
29326+#include <asm/local.h>
29327
29328 #include <linux/sonypi.h>
29329
29330@@ -491,7 +492,7 @@ static struct sonypi_device {
29331 spinlock_t fifo_lock;
29332 wait_queue_head_t fifo_proc_list;
29333 struct fasync_struct *fifo_async;
29334- int open_count;
29335+ local_t open_count;
29336 int model;
29337 struct input_dev *input_jog_dev;
29338 struct input_dev *input_key_dev;
29339@@ -895,7 +896,7 @@ static int sonypi_misc_fasync(int fd, st
29340 static int sonypi_misc_release(struct inode *inode, struct file *file)
29341 {
29342 mutex_lock(&sonypi_device.lock);
29343- sonypi_device.open_count--;
29344+ local_dec(&sonypi_device.open_count);
29345 mutex_unlock(&sonypi_device.lock);
29346 return 0;
29347 }
29348@@ -905,9 +906,9 @@ static int sonypi_misc_open(struct inode
29349 lock_kernel();
29350 mutex_lock(&sonypi_device.lock);
29351 /* Flush input queue on first open */
29352- if (!sonypi_device.open_count)
29353+ if (!local_read(&sonypi_device.open_count))
29354 kfifo_reset(sonypi_device.fifo);
29355- sonypi_device.open_count++;
29356+ local_inc(&sonypi_device.open_count);
29357 mutex_unlock(&sonypi_device.lock);
29358 unlock_kernel();
29359 return 0;
29360diff -urNp linux-2.6.32.46/drivers/char/stallion.c linux-2.6.32.46/drivers/char/stallion.c
29361--- linux-2.6.32.46/drivers/char/stallion.c 2011-03-27 14:31:47.000000000 -0400
29362+++ linux-2.6.32.46/drivers/char/stallion.c 2011-05-16 21:46:57.000000000 -0400
29363@@ -2448,6 +2448,8 @@ static int stl_getportstruct(struct stlp
29364 struct stlport stl_dummyport;
29365 struct stlport *portp;
29366
29367+ pax_track_stack();
29368+
29369 if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
29370 return -EFAULT;
29371 portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
29372diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm_bios.c linux-2.6.32.46/drivers/char/tpm/tpm_bios.c
29373--- linux-2.6.32.46/drivers/char/tpm/tpm_bios.c 2011-03-27 14:31:47.000000000 -0400
29374+++ linux-2.6.32.46/drivers/char/tpm/tpm_bios.c 2011-10-06 09:37:08.000000000 -0400
29375@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
29376 event = addr;
29377
29378 if ((event->event_type == 0 && event->event_size == 0) ||
29379- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
29380+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
29381 return NULL;
29382
29383 return addr;
29384@@ -197,7 +197,7 @@ static void *tpm_bios_measurements_next(
29385 return NULL;
29386
29387 if ((event->event_type == 0 && event->event_size == 0) ||
29388- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
29389+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
29390 return NULL;
29391
29392 (*pos)++;
29393@@ -290,7 +290,8 @@ static int tpm_binary_bios_measurements_
29394 int i;
29395
29396 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
29397- seq_putc(m, data[i]);
29398+ if (!seq_putc(m, data[i]))
29399+ return -EFAULT;
29400
29401 return 0;
29402 }
29403@@ -409,8 +410,13 @@ static int read_log(struct tpm_bios_log
29404 log->bios_event_log_end = log->bios_event_log + len;
29405
29406 virt = acpi_os_map_memory(start, len);
29407+ if (!virt) {
29408+ kfree(log->bios_event_log);
29409+ log->bios_event_log = NULL;
29410+ return -EFAULT;
29411+ }
29412
29413- memcpy(log->bios_event_log, virt, len);
29414+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
29415
29416 acpi_os_unmap_memory(virt, len);
29417 return 0;
29418diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm.c linux-2.6.32.46/drivers/char/tpm/tpm.c
29419--- linux-2.6.32.46/drivers/char/tpm/tpm.c 2011-04-17 17:00:52.000000000 -0400
29420+++ linux-2.6.32.46/drivers/char/tpm/tpm.c 2011-05-16 21:46:57.000000000 -0400
29421@@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c
29422 chip->vendor.req_complete_val)
29423 goto out_recv;
29424
29425- if ((status == chip->vendor.req_canceled)) {
29426+ if (status == chip->vendor.req_canceled) {
29427 dev_err(chip->dev, "Operation Canceled\n");
29428 rc = -ECANCELED;
29429 goto out;
29430@@ -821,6 +821,8 @@ ssize_t tpm_show_pubek(struct device *de
29431
29432 struct tpm_chip *chip = dev_get_drvdata(dev);
29433
29434+ pax_track_stack();
29435+
29436 tpm_cmd.header.in = tpm_readpubek_header;
29437 err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
29438 "attempting to read the PUBEK");
29439diff -urNp linux-2.6.32.46/drivers/char/tty_io.c linux-2.6.32.46/drivers/char/tty_io.c
29440--- linux-2.6.32.46/drivers/char/tty_io.c 2011-03-27 14:31:47.000000000 -0400
29441+++ linux-2.6.32.46/drivers/char/tty_io.c 2011-08-05 20:33:55.000000000 -0400
29442@@ -2582,8 +2582,10 @@ long tty_ioctl(struct file *file, unsign
29443 return retval;
29444 }
29445
29446+EXPORT_SYMBOL(tty_ioctl);
29447+
29448 #ifdef CONFIG_COMPAT
29449-static long tty_compat_ioctl(struct file *file, unsigned int cmd,
29450+long tty_compat_ioctl(struct file *file, unsigned int cmd,
29451 unsigned long arg)
29452 {
29453 struct inode *inode = file->f_dentry->d_inode;
29454@@ -2607,6 +2609,8 @@ static long tty_compat_ioctl(struct file
29455
29456 return retval;
29457 }
29458+
29459+EXPORT_SYMBOL(tty_compat_ioctl);
29460 #endif
29461
29462 /*
29463@@ -3052,7 +3056,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
29464
29465 void tty_default_fops(struct file_operations *fops)
29466 {
29467- *fops = tty_fops;
29468+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
29469 }
29470
29471 /*
29472diff -urNp linux-2.6.32.46/drivers/char/tty_ldisc.c linux-2.6.32.46/drivers/char/tty_ldisc.c
29473--- linux-2.6.32.46/drivers/char/tty_ldisc.c 2011-07-13 17:23:04.000000000 -0400
29474+++ linux-2.6.32.46/drivers/char/tty_ldisc.c 2011-07-13 17:23:18.000000000 -0400
29475@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
29476 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
29477 struct tty_ldisc_ops *ldo = ld->ops;
29478
29479- ldo->refcount--;
29480+ atomic_dec(&ldo->refcount);
29481 module_put(ldo->owner);
29482 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
29483
29484@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct
29485 spin_lock_irqsave(&tty_ldisc_lock, flags);
29486 tty_ldiscs[disc] = new_ldisc;
29487 new_ldisc->num = disc;
29488- new_ldisc->refcount = 0;
29489+ atomic_set(&new_ldisc->refcount, 0);
29490 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
29491
29492 return ret;
29493@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
29494 return -EINVAL;
29495
29496 spin_lock_irqsave(&tty_ldisc_lock, flags);
29497- if (tty_ldiscs[disc]->refcount)
29498+ if (atomic_read(&tty_ldiscs[disc]->refcount))
29499 ret = -EBUSY;
29500 else
29501 tty_ldiscs[disc] = NULL;
29502@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(i
29503 if (ldops) {
29504 ret = ERR_PTR(-EAGAIN);
29505 if (try_module_get(ldops->owner)) {
29506- ldops->refcount++;
29507+ atomic_inc(&ldops->refcount);
29508 ret = ldops;
29509 }
29510 }
29511@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_o
29512 unsigned long flags;
29513
29514 spin_lock_irqsave(&tty_ldisc_lock, flags);
29515- ldops->refcount--;
29516+ atomic_dec(&ldops->refcount);
29517 module_put(ldops->owner);
29518 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
29519 }
29520diff -urNp linux-2.6.32.46/drivers/char/virtio_console.c linux-2.6.32.46/drivers/char/virtio_console.c
29521--- linux-2.6.32.46/drivers/char/virtio_console.c 2011-03-27 14:31:47.000000000 -0400
29522+++ linux-2.6.32.46/drivers/char/virtio_console.c 2011-08-05 20:33:55.000000000 -0400
29523@@ -133,7 +133,9 @@ static int get_chars(u32 vtermno, char *
29524 * virtqueue, so we let the drivers do some boutique early-output thing. */
29525 int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int))
29526 {
29527- virtio_cons.put_chars = put_chars;
29528+ pax_open_kernel();
29529+ *(void **)&virtio_cons.put_chars = put_chars;
29530+ pax_close_kernel();
29531 return hvc_instantiate(0, 0, &virtio_cons);
29532 }
29533
29534@@ -213,11 +215,13 @@ static int __devinit virtcons_probe(stru
29535 out_vq = vqs[1];
29536
29537 /* Start using the new console output. */
29538- virtio_cons.get_chars = get_chars;
29539- virtio_cons.put_chars = put_chars;
29540- virtio_cons.notifier_add = notifier_add_vio;
29541- virtio_cons.notifier_del = notifier_del_vio;
29542- virtio_cons.notifier_hangup = notifier_del_vio;
29543+ pax_open_kernel();
29544+ *(void **)&virtio_cons.get_chars = get_chars;
29545+ *(void **)&virtio_cons.put_chars = put_chars;
29546+ *(void **)&virtio_cons.notifier_add = notifier_add_vio;
29547+ *(void **)&virtio_cons.notifier_del = notifier_del_vio;
29548+ *(void **)&virtio_cons.notifier_hangup = notifier_del_vio;
29549+ pax_close_kernel();
29550
29551 /* The first argument of hvc_alloc() is the virtual console number, so
29552 * we use zero. The second argument is the parameter for the
29553diff -urNp linux-2.6.32.46/drivers/char/vt.c linux-2.6.32.46/drivers/char/vt.c
29554--- linux-2.6.32.46/drivers/char/vt.c 2011-03-27 14:31:47.000000000 -0400
29555+++ linux-2.6.32.46/drivers/char/vt.c 2011-04-17 15:56:46.000000000 -0400
29556@@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
29557
29558 static void notify_write(struct vc_data *vc, unsigned int unicode)
29559 {
29560- struct vt_notifier_param param = { .vc = vc, unicode = unicode };
29561+ struct vt_notifier_param param = { .vc = vc, .c = unicode };
29562 atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
29563 }
29564
29565diff -urNp linux-2.6.32.46/drivers/char/vt_ioctl.c linux-2.6.32.46/drivers/char/vt_ioctl.c
29566--- linux-2.6.32.46/drivers/char/vt_ioctl.c 2011-03-27 14:31:47.000000000 -0400
29567+++ linux-2.6.32.46/drivers/char/vt_ioctl.c 2011-04-17 15:56:46.000000000 -0400
29568@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
29569 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
29570 return -EFAULT;
29571
29572- if (!capable(CAP_SYS_TTY_CONFIG))
29573- perm = 0;
29574-
29575 switch (cmd) {
29576 case KDGKBENT:
29577 key_map = key_maps[s];
29578@@ -224,8 +221,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
29579 val = (i ? K_HOLE : K_NOSUCHMAP);
29580 return put_user(val, &user_kbe->kb_value);
29581 case KDSKBENT:
29582+ if (!capable(CAP_SYS_TTY_CONFIG))
29583+ perm = 0;
29584+
29585 if (!perm)
29586 return -EPERM;
29587+
29588 if (!i && v == K_NOSUCHMAP) {
29589 /* deallocate map */
29590 key_map = key_maps[s];
29591@@ -325,9 +326,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry
29592 int i, j, k;
29593 int ret;
29594
29595- if (!capable(CAP_SYS_TTY_CONFIG))
29596- perm = 0;
29597-
29598 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
29599 if (!kbs) {
29600 ret = -ENOMEM;
29601@@ -361,6 +359,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry
29602 kfree(kbs);
29603 return ((p && *p) ? -EOVERFLOW : 0);
29604 case KDSKBSENT:
29605+ if (!capable(CAP_SYS_TTY_CONFIG))
29606+ perm = 0;
29607+
29608 if (!perm) {
29609 ret = -EPERM;
29610 goto reterr;
29611diff -urNp linux-2.6.32.46/drivers/cpufreq/cpufreq.c linux-2.6.32.46/drivers/cpufreq/cpufreq.c
29612--- linux-2.6.32.46/drivers/cpufreq/cpufreq.c 2011-06-25 12:55:34.000000000 -0400
29613+++ linux-2.6.32.46/drivers/cpufreq/cpufreq.c 2011-06-25 12:56:37.000000000 -0400
29614@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
29615 complete(&policy->kobj_unregister);
29616 }
29617
29618-static struct sysfs_ops sysfs_ops = {
29619+static const struct sysfs_ops sysfs_ops = {
29620 .show = show,
29621 .store = store,
29622 };
29623diff -urNp linux-2.6.32.46/drivers/cpuidle/sysfs.c linux-2.6.32.46/drivers/cpuidle/sysfs.c
29624--- linux-2.6.32.46/drivers/cpuidle/sysfs.c 2011-03-27 14:31:47.000000000 -0400
29625+++ linux-2.6.32.46/drivers/cpuidle/sysfs.c 2011-04-17 15:56:46.000000000 -0400
29626@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
29627 return ret;
29628 }
29629
29630-static struct sysfs_ops cpuidle_sysfs_ops = {
29631+static const struct sysfs_ops cpuidle_sysfs_ops = {
29632 .show = cpuidle_show,
29633 .store = cpuidle_store,
29634 };
29635@@ -277,7 +277,7 @@ static ssize_t cpuidle_state_show(struct
29636 return ret;
29637 }
29638
29639-static struct sysfs_ops cpuidle_state_sysfs_ops = {
29640+static const struct sysfs_ops cpuidle_state_sysfs_ops = {
29641 .show = cpuidle_state_show,
29642 };
29643
29644@@ -294,7 +294,7 @@ static struct kobj_type ktype_state_cpui
29645 .release = cpuidle_state_sysfs_release,
29646 };
29647
29648-static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
29649+static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
29650 {
29651 kobject_put(&device->kobjs[i]->kobj);
29652 wait_for_completion(&device->kobjs[i]->kobj_unregister);
29653diff -urNp linux-2.6.32.46/drivers/crypto/hifn_795x.c linux-2.6.32.46/drivers/crypto/hifn_795x.c
29654--- linux-2.6.32.46/drivers/crypto/hifn_795x.c 2011-03-27 14:31:47.000000000 -0400
29655+++ linux-2.6.32.46/drivers/crypto/hifn_795x.c 2011-05-16 21:46:57.000000000 -0400
29656@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device
29657 0xCA, 0x34, 0x2B, 0x2E};
29658 struct scatterlist sg;
29659
29660+ pax_track_stack();
29661+
29662 memset(src, 0, sizeof(src));
29663 memset(ctx.key, 0, sizeof(ctx.key));
29664
29665diff -urNp linux-2.6.32.46/drivers/crypto/padlock-aes.c linux-2.6.32.46/drivers/crypto/padlock-aes.c
29666--- linux-2.6.32.46/drivers/crypto/padlock-aes.c 2011-03-27 14:31:47.000000000 -0400
29667+++ linux-2.6.32.46/drivers/crypto/padlock-aes.c 2011-05-16 21:46:57.000000000 -0400
29668@@ -108,6 +108,8 @@ static int aes_set_key(struct crypto_tfm
29669 struct crypto_aes_ctx gen_aes;
29670 int cpu;
29671
29672+ pax_track_stack();
29673+
29674 if (key_len % 8) {
29675 *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
29676 return -EINVAL;
29677diff -urNp linux-2.6.32.46/drivers/dma/ioat/dma.c linux-2.6.32.46/drivers/dma/ioat/dma.c
29678--- linux-2.6.32.46/drivers/dma/ioat/dma.c 2011-03-27 14:31:47.000000000 -0400
29679+++ linux-2.6.32.46/drivers/dma/ioat/dma.c 2011-04-17 15:56:46.000000000 -0400
29680@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
29681 return entry->show(&chan->common, page);
29682 }
29683
29684-struct sysfs_ops ioat_sysfs_ops = {
29685+const struct sysfs_ops ioat_sysfs_ops = {
29686 .show = ioat_attr_show,
29687 };
29688
29689diff -urNp linux-2.6.32.46/drivers/dma/ioat/dma.h linux-2.6.32.46/drivers/dma/ioat/dma.h
29690--- linux-2.6.32.46/drivers/dma/ioat/dma.h 2011-03-27 14:31:47.000000000 -0400
29691+++ linux-2.6.32.46/drivers/dma/ioat/dma.h 2011-04-17 15:56:46.000000000 -0400
29692@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
29693 unsigned long *phys_complete);
29694 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
29695 void ioat_kobject_del(struct ioatdma_device *device);
29696-extern struct sysfs_ops ioat_sysfs_ops;
29697+extern const struct sysfs_ops ioat_sysfs_ops;
29698 extern struct ioat_sysfs_entry ioat_version_attr;
29699 extern struct ioat_sysfs_entry ioat_cap_attr;
29700 #endif /* IOATDMA_H */
29701diff -urNp linux-2.6.32.46/drivers/edac/edac_device_sysfs.c linux-2.6.32.46/drivers/edac/edac_device_sysfs.c
29702--- linux-2.6.32.46/drivers/edac/edac_device_sysfs.c 2011-03-27 14:31:47.000000000 -0400
29703+++ linux-2.6.32.46/drivers/edac/edac_device_sysfs.c 2011-04-17 15:56:46.000000000 -0400
29704@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
29705 }
29706
29707 /* edac_dev file operations for an 'ctl_info' */
29708-static struct sysfs_ops device_ctl_info_ops = {
29709+static const struct sysfs_ops device_ctl_info_ops = {
29710 .show = edac_dev_ctl_info_show,
29711 .store = edac_dev_ctl_info_store
29712 };
29713@@ -373,7 +373,7 @@ static ssize_t edac_dev_instance_store(s
29714 }
29715
29716 /* edac_dev file operations for an 'instance' */
29717-static struct sysfs_ops device_instance_ops = {
29718+static const struct sysfs_ops device_instance_ops = {
29719 .show = edac_dev_instance_show,
29720 .store = edac_dev_instance_store
29721 };
29722@@ -476,7 +476,7 @@ static ssize_t edac_dev_block_store(stru
29723 }
29724
29725 /* edac_dev file operations for a 'block' */
29726-static struct sysfs_ops device_block_ops = {
29727+static const struct sysfs_ops device_block_ops = {
29728 .show = edac_dev_block_show,
29729 .store = edac_dev_block_store
29730 };
29731diff -urNp linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c
29732--- linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c 2011-03-27 14:31:47.000000000 -0400
29733+++ linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:56:46.000000000 -0400
29734@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
29735 return -EIO;
29736 }
29737
29738-static struct sysfs_ops csrowfs_ops = {
29739+static const struct sysfs_ops csrowfs_ops = {
29740 .show = csrowdev_show,
29741 .store = csrowdev_store
29742 };
29743@@ -575,7 +575,7 @@ static ssize_t mcidev_store(struct kobje
29744 }
29745
29746 /* Intermediate show/store table */
29747-static struct sysfs_ops mci_ops = {
29748+static const struct sysfs_ops mci_ops = {
29749 .show = mcidev_show,
29750 .store = mcidev_store
29751 };
29752diff -urNp linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c
29753--- linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c 2011-03-27 14:31:47.000000000 -0400
29754+++ linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c 2011-05-04 17:56:20.000000000 -0400
29755@@ -25,8 +25,8 @@ static int edac_pci_log_pe = 1; /* log
29756 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
29757 static int edac_pci_poll_msec = 1000; /* one second workq period */
29758
29759-static atomic_t pci_parity_count = ATOMIC_INIT(0);
29760-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
29761+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
29762+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
29763
29764 static struct kobject *edac_pci_top_main_kobj;
29765 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
29766@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
29767 }
29768
29769 /* fs_ops table */
29770-static struct sysfs_ops pci_instance_ops = {
29771+static const struct sysfs_ops pci_instance_ops = {
29772 .show = edac_pci_instance_show,
29773 .store = edac_pci_instance_store
29774 };
29775@@ -261,7 +261,7 @@ static ssize_t edac_pci_dev_store(struct
29776 return -EIO;
29777 }
29778
29779-static struct sysfs_ops edac_pci_sysfs_ops = {
29780+static const struct sysfs_ops edac_pci_sysfs_ops = {
29781 .show = edac_pci_dev_show,
29782 .store = edac_pci_dev_store
29783 };
29784@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(str
29785 edac_printk(KERN_CRIT, EDAC_PCI,
29786 "Signaled System Error on %s\n",
29787 pci_name(dev));
29788- atomic_inc(&pci_nonparity_count);
29789+ atomic_inc_unchecked(&pci_nonparity_count);
29790 }
29791
29792 if (status & (PCI_STATUS_PARITY)) {
29793@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(str
29794 "Master Data Parity Error on %s\n",
29795 pci_name(dev));
29796
29797- atomic_inc(&pci_parity_count);
29798+ atomic_inc_unchecked(&pci_parity_count);
29799 }
29800
29801 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29802@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(str
29803 "Detected Parity Error on %s\n",
29804 pci_name(dev));
29805
29806- atomic_inc(&pci_parity_count);
29807+ atomic_inc_unchecked(&pci_parity_count);
29808 }
29809 }
29810
29811@@ -616,7 +616,7 @@ static void edac_pci_dev_parity_test(str
29812 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
29813 "Signaled System Error on %s\n",
29814 pci_name(dev));
29815- atomic_inc(&pci_nonparity_count);
29816+ atomic_inc_unchecked(&pci_nonparity_count);
29817 }
29818
29819 if (status & (PCI_STATUS_PARITY)) {
29820@@ -624,7 +624,7 @@ static void edac_pci_dev_parity_test(str
29821 "Master Data Parity Error on "
29822 "%s\n", pci_name(dev));
29823
29824- atomic_inc(&pci_parity_count);
29825+ atomic_inc_unchecked(&pci_parity_count);
29826 }
29827
29828 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29829@@ -632,7 +632,7 @@ static void edac_pci_dev_parity_test(str
29830 "Detected Parity Error on %s\n",
29831 pci_name(dev));
29832
29833- atomic_inc(&pci_parity_count);
29834+ atomic_inc_unchecked(&pci_parity_count);
29835 }
29836 }
29837 }
29838@@ -674,7 +674,7 @@ void edac_pci_do_parity_check(void)
29839 if (!check_pci_errors)
29840 return;
29841
29842- before_count = atomic_read(&pci_parity_count);
29843+ before_count = atomic_read_unchecked(&pci_parity_count);
29844
29845 /* scan all PCI devices looking for a Parity Error on devices and
29846 * bridges.
29847@@ -686,7 +686,7 @@ void edac_pci_do_parity_check(void)
29848 /* Only if operator has selected panic on PCI Error */
29849 if (edac_pci_get_panic_on_pe()) {
29850 /* If the count is different 'after' from 'before' */
29851- if (before_count != atomic_read(&pci_parity_count))
29852+ if (before_count != atomic_read_unchecked(&pci_parity_count))
29853 panic("EDAC: PCI Parity Error");
29854 }
29855 }
29856diff -urNp linux-2.6.32.46/drivers/firewire/core-card.c linux-2.6.32.46/drivers/firewire/core-card.c
29857--- linux-2.6.32.46/drivers/firewire/core-card.c 2011-03-27 14:31:47.000000000 -0400
29858+++ linux-2.6.32.46/drivers/firewire/core-card.c 2011-08-23 21:22:32.000000000 -0400
29859@@ -558,7 +558,7 @@ void fw_card_release(struct kref *kref)
29860
29861 void fw_core_remove_card(struct fw_card *card)
29862 {
29863- struct fw_card_driver dummy_driver = dummy_driver_template;
29864+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
29865
29866 card->driver->update_phy_reg(card, 4,
29867 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
29868diff -urNp linux-2.6.32.46/drivers/firewire/core-cdev.c linux-2.6.32.46/drivers/firewire/core-cdev.c
29869--- linux-2.6.32.46/drivers/firewire/core-cdev.c 2011-03-27 14:31:47.000000000 -0400
29870+++ linux-2.6.32.46/drivers/firewire/core-cdev.c 2011-04-17 15:56:46.000000000 -0400
29871@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
29872 int ret;
29873
29874 if ((request->channels == 0 && request->bandwidth == 0) ||
29875- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
29876- request->bandwidth < 0)
29877+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
29878 return -EINVAL;
29879
29880 r = kmalloc(sizeof(*r), GFP_KERNEL);
29881diff -urNp linux-2.6.32.46/drivers/firewire/core.h linux-2.6.32.46/drivers/firewire/core.h
29882--- linux-2.6.32.46/drivers/firewire/core.h 2011-03-27 14:31:47.000000000 -0400
29883+++ linux-2.6.32.46/drivers/firewire/core.h 2011-08-23 20:24:26.000000000 -0400
29884@@ -86,6 +86,7 @@ struct fw_card_driver {
29885
29886 int (*stop_iso)(struct fw_iso_context *ctx);
29887 };
29888+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
29889
29890 void fw_card_initialize(struct fw_card *card,
29891 const struct fw_card_driver *driver, struct device *device);
29892diff -urNp linux-2.6.32.46/drivers/firewire/core-transaction.c linux-2.6.32.46/drivers/firewire/core-transaction.c
29893--- linux-2.6.32.46/drivers/firewire/core-transaction.c 2011-03-27 14:31:47.000000000 -0400
29894+++ linux-2.6.32.46/drivers/firewire/core-transaction.c 2011-05-16 21:46:57.000000000 -0400
29895@@ -36,6 +36,7 @@
29896 #include <linux/string.h>
29897 #include <linux/timer.h>
29898 #include <linux/types.h>
29899+#include <linux/sched.h>
29900
29901 #include <asm/byteorder.h>
29902
29903@@ -344,6 +345,8 @@ int fw_run_transaction(struct fw_card *c
29904 struct transaction_callback_data d;
29905 struct fw_transaction t;
29906
29907+ pax_track_stack();
29908+
29909 init_completion(&d.done);
29910 d.payload = payload;
29911 fw_send_request(card, &t, tcode, destination_id, generation, speed,
29912diff -urNp linux-2.6.32.46/drivers/firmware/dmi_scan.c linux-2.6.32.46/drivers/firmware/dmi_scan.c
29913--- linux-2.6.32.46/drivers/firmware/dmi_scan.c 2011-03-27 14:31:47.000000000 -0400
29914+++ linux-2.6.32.46/drivers/firmware/dmi_scan.c 2011-10-06 09:37:08.000000000 -0400
29915@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
29916 }
29917 }
29918 else {
29919- /*
29920- * no iounmap() for that ioremap(); it would be a no-op, but
29921- * it's so early in setup that sucker gets confused into doing
29922- * what it shouldn't if we actually call it.
29923- */
29924 p = dmi_ioremap(0xF0000, 0x10000);
29925 if (p == NULL)
29926 goto error;
29927@@ -667,7 +662,7 @@ int dmi_walk(void (*decode)(const struct
29928 if (buf == NULL)
29929 return -1;
29930
29931- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
29932+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
29933
29934 iounmap(buf);
29935 return 0;
29936diff -urNp linux-2.6.32.46/drivers/firmware/edd.c linux-2.6.32.46/drivers/firmware/edd.c
29937--- linux-2.6.32.46/drivers/firmware/edd.c 2011-03-27 14:31:47.000000000 -0400
29938+++ linux-2.6.32.46/drivers/firmware/edd.c 2011-04-17 15:56:46.000000000 -0400
29939@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
29940 return ret;
29941 }
29942
29943-static struct sysfs_ops edd_attr_ops = {
29944+static const struct sysfs_ops edd_attr_ops = {
29945 .show = edd_attr_show,
29946 };
29947
29948diff -urNp linux-2.6.32.46/drivers/firmware/efivars.c linux-2.6.32.46/drivers/firmware/efivars.c
29949--- linux-2.6.32.46/drivers/firmware/efivars.c 2011-03-27 14:31:47.000000000 -0400
29950+++ linux-2.6.32.46/drivers/firmware/efivars.c 2011-04-17 15:56:46.000000000 -0400
29951@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
29952 return ret;
29953 }
29954
29955-static struct sysfs_ops efivar_attr_ops = {
29956+static const struct sysfs_ops efivar_attr_ops = {
29957 .show = efivar_attr_show,
29958 .store = efivar_attr_store,
29959 };
29960diff -urNp linux-2.6.32.46/drivers/firmware/iscsi_ibft.c linux-2.6.32.46/drivers/firmware/iscsi_ibft.c
29961--- linux-2.6.32.46/drivers/firmware/iscsi_ibft.c 2011-03-27 14:31:47.000000000 -0400
29962+++ linux-2.6.32.46/drivers/firmware/iscsi_ibft.c 2011-04-17 15:56:46.000000000 -0400
29963@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
29964 return ret;
29965 }
29966
29967-static struct sysfs_ops ibft_attr_ops = {
29968+static const struct sysfs_ops ibft_attr_ops = {
29969 .show = ibft_show_attribute,
29970 };
29971
29972diff -urNp linux-2.6.32.46/drivers/firmware/memmap.c linux-2.6.32.46/drivers/firmware/memmap.c
29973--- linux-2.6.32.46/drivers/firmware/memmap.c 2011-03-27 14:31:47.000000000 -0400
29974+++ linux-2.6.32.46/drivers/firmware/memmap.c 2011-04-17 15:56:46.000000000 -0400
29975@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
29976 NULL
29977 };
29978
29979-static struct sysfs_ops memmap_attr_ops = {
29980+static const struct sysfs_ops memmap_attr_ops = {
29981 .show = memmap_attr_show,
29982 };
29983
29984diff -urNp linux-2.6.32.46/drivers/gpio/vr41xx_giu.c linux-2.6.32.46/drivers/gpio/vr41xx_giu.c
29985--- linux-2.6.32.46/drivers/gpio/vr41xx_giu.c 2011-03-27 14:31:47.000000000 -0400
29986+++ linux-2.6.32.46/drivers/gpio/vr41xx_giu.c 2011-05-04 17:56:28.000000000 -0400
29987@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
29988 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
29989 maskl, pendl, maskh, pendh);
29990
29991- atomic_inc(&irq_err_count);
29992+ atomic_inc_unchecked(&irq_err_count);
29993
29994 return -EINVAL;
29995 }
29996diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c
29997--- linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c 2011-03-27 14:31:47.000000000 -0400
29998+++ linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c 2011-10-06 09:37:14.000000000 -0400
29999@@ -1323,7 +1323,7 @@ int drm_mode_getconnector(struct drm_dev
30000 */
30001 if ((out_resp->count_modes >= mode_count) && mode_count) {
30002 copied = 0;
30003- mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
30004+ mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
30005 list_for_each_entry(mode, &connector->modes, head) {
30006 drm_crtc_convert_to_umode(&u_mode, mode);
30007 if (copy_to_user(mode_ptr + copied,
30008@@ -1338,8 +1338,8 @@ int drm_mode_getconnector(struct drm_dev
30009
30010 if ((out_resp->count_props >= props_count) && props_count) {
30011 copied = 0;
30012- prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
30013- prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
30014+ prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
30015+ prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
30016 for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
30017 if (connector->property_ids[i] != 0) {
30018 if (put_user(connector->property_ids[i],
30019@@ -1361,7 +1361,7 @@ int drm_mode_getconnector(struct drm_dev
30020
30021 if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
30022 copied = 0;
30023- encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
30024+ encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
30025 for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
30026 if (connector->encoder_ids[i] != 0) {
30027 if (put_user(connector->encoder_ids[i],
30028@@ -1513,7 +1513,7 @@ int drm_mode_setcrtc(struct drm_device *
30029 }
30030
30031 for (i = 0; i < crtc_req->count_connectors; i++) {
30032- set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
30033+ set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
30034 if (get_user(out_id, &set_connectors_ptr[i])) {
30035 ret = -EFAULT;
30036 goto out;
30037@@ -2118,7 +2118,7 @@ int drm_mode_getproperty_ioctl(struct dr
30038 out_resp->flags = property->flags;
30039
30040 if ((out_resp->count_values >= value_count) && value_count) {
30041- values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
30042+ values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
30043 for (i = 0; i < value_count; i++) {
30044 if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
30045 ret = -EFAULT;
30046@@ -2131,7 +2131,7 @@ int drm_mode_getproperty_ioctl(struct dr
30047 if (property->flags & DRM_MODE_PROP_ENUM) {
30048 if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
30049 copied = 0;
30050- enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
30051+ enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
30052 list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
30053
30054 if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
30055@@ -2154,7 +2154,7 @@ int drm_mode_getproperty_ioctl(struct dr
30056 if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
30057 copied = 0;
30058 blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
30059- blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
30060+ blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
30061
30062 list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
30063 if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
30064@@ -2226,7 +2226,7 @@ int drm_mode_getblob_ioctl(struct drm_de
30065 blob = obj_to_blob(obj);
30066
30067 if (out_resp->length == blob->length) {
30068- blob_ptr = (void *)(unsigned long)out_resp->data;
30069+ blob_ptr = (void __user *)(unsigned long)out_resp->data;
30070 if (copy_to_user(blob_ptr, blob->data, blob->length)){
30071 ret = -EFAULT;
30072 goto done;
30073diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c
30074--- linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c 2011-03-27 14:31:47.000000000 -0400
30075+++ linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c 2011-05-16 21:46:57.000000000 -0400
30076@@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d
30077 struct drm_crtc *tmp;
30078 int crtc_mask = 1;
30079
30080- WARN(!crtc, "checking null crtc?");
30081+ BUG_ON(!crtc);
30082
30083 dev = crtc->dev;
30084
30085@@ -642,6 +642,8 @@ bool drm_crtc_helper_set_mode(struct drm
30086
30087 adjusted_mode = drm_mode_duplicate(dev, mode);
30088
30089+ pax_track_stack();
30090+
30091 crtc->enabled = drm_helper_crtc_in_use(crtc);
30092
30093 if (!crtc->enabled)
30094diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_drv.c linux-2.6.32.46/drivers/gpu/drm/drm_drv.c
30095--- linux-2.6.32.46/drivers/gpu/drm/drm_drv.c 2011-03-27 14:31:47.000000000 -0400
30096+++ linux-2.6.32.46/drivers/gpu/drm/drm_drv.c 2011-04-17 15:56:46.000000000 -0400
30097@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
30098 char *kdata = NULL;
30099
30100 atomic_inc(&dev->ioctl_count);
30101- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
30102+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
30103 ++file_priv->ioctl_count;
30104
30105 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
30106diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_fops.c linux-2.6.32.46/drivers/gpu/drm/drm_fops.c
30107--- linux-2.6.32.46/drivers/gpu/drm/drm_fops.c 2011-03-27 14:31:47.000000000 -0400
30108+++ linux-2.6.32.46/drivers/gpu/drm/drm_fops.c 2011-04-17 15:56:46.000000000 -0400
30109@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
30110 }
30111
30112 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
30113- atomic_set(&dev->counts[i], 0);
30114+ atomic_set_unchecked(&dev->counts[i], 0);
30115
30116 dev->sigdata.lock = NULL;
30117
30118@@ -130,9 +130,9 @@ int drm_open(struct inode *inode, struct
30119
30120 retcode = drm_open_helper(inode, filp, dev);
30121 if (!retcode) {
30122- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
30123+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
30124 spin_lock(&dev->count_lock);
30125- if (!dev->open_count++) {
30126+ if (local_inc_return(&dev->open_count) == 1) {
30127 spin_unlock(&dev->count_lock);
30128 retcode = drm_setup(dev);
30129 goto out;
30130@@ -435,7 +435,7 @@ int drm_release(struct inode *inode, str
30131
30132 lock_kernel();
30133
30134- DRM_DEBUG("open_count = %d\n", dev->open_count);
30135+ DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
30136
30137 if (dev->driver->preclose)
30138 dev->driver->preclose(dev, file_priv);
30139@@ -447,7 +447,7 @@ int drm_release(struct inode *inode, str
30140 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
30141 task_pid_nr(current),
30142 (long)old_encode_dev(file_priv->minor->device),
30143- dev->open_count);
30144+ local_read(&dev->open_count));
30145
30146 /* if the master has gone away we can't do anything with the lock */
30147 if (file_priv->minor->master)
30148@@ -524,9 +524,9 @@ int drm_release(struct inode *inode, str
30149 * End inline drm_release
30150 */
30151
30152- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
30153+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
30154 spin_lock(&dev->count_lock);
30155- if (!--dev->open_count) {
30156+ if (local_dec_and_test(&dev->open_count)) {
30157 if (atomic_read(&dev->ioctl_count)) {
30158 DRM_ERROR("Device busy: %d\n",
30159 atomic_read(&dev->ioctl_count));
30160diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_gem.c linux-2.6.32.46/drivers/gpu/drm/drm_gem.c
30161--- linux-2.6.32.46/drivers/gpu/drm/drm_gem.c 2011-03-27 14:31:47.000000000 -0400
30162+++ linux-2.6.32.46/drivers/gpu/drm/drm_gem.c 2011-04-17 15:56:46.000000000 -0400
30163@@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev)
30164 spin_lock_init(&dev->object_name_lock);
30165 idr_init(&dev->object_name_idr);
30166 atomic_set(&dev->object_count, 0);
30167- atomic_set(&dev->object_memory, 0);
30168+ atomic_set_unchecked(&dev->object_memory, 0);
30169 atomic_set(&dev->pin_count, 0);
30170- atomic_set(&dev->pin_memory, 0);
30171+ atomic_set_unchecked(&dev->pin_memory, 0);
30172 atomic_set(&dev->gtt_count, 0);
30173- atomic_set(&dev->gtt_memory, 0);
30174+ atomic_set_unchecked(&dev->gtt_memory, 0);
30175
30176 mm = kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL);
30177 if (!mm) {
30178@@ -150,7 +150,7 @@ drm_gem_object_alloc(struct drm_device *
30179 goto fput;
30180 }
30181 atomic_inc(&dev->object_count);
30182- atomic_add(obj->size, &dev->object_memory);
30183+ atomic_add_unchecked(obj->size, &dev->object_memory);
30184 return obj;
30185 fput:
30186 fput(obj->filp);
30187@@ -429,7 +429,7 @@ drm_gem_object_free(struct kref *kref)
30188
30189 fput(obj->filp);
30190 atomic_dec(&dev->object_count);
30191- atomic_sub(obj->size, &dev->object_memory);
30192+ atomic_sub_unchecked(obj->size, &dev->object_memory);
30193 kfree(obj);
30194 }
30195 EXPORT_SYMBOL(drm_gem_object_free);
30196diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_info.c linux-2.6.32.46/drivers/gpu/drm/drm_info.c
30197--- linux-2.6.32.46/drivers/gpu/drm/drm_info.c 2011-03-27 14:31:47.000000000 -0400
30198+++ linux-2.6.32.46/drivers/gpu/drm/drm_info.c 2011-04-17 15:56:46.000000000 -0400
30199@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
30200 struct drm_local_map *map;
30201 struct drm_map_list *r_list;
30202
30203- /* Hardcoded from _DRM_FRAME_BUFFER,
30204- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
30205- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
30206- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
30207+ static const char * const types[] = {
30208+ [_DRM_FRAME_BUFFER] = "FB",
30209+ [_DRM_REGISTERS] = "REG",
30210+ [_DRM_SHM] = "SHM",
30211+ [_DRM_AGP] = "AGP",
30212+ [_DRM_SCATTER_GATHER] = "SG",
30213+ [_DRM_CONSISTENT] = "PCI",
30214+ [_DRM_GEM] = "GEM" };
30215 const char *type;
30216 int i;
30217
30218@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void
30219 map = r_list->map;
30220 if (!map)
30221 continue;
30222- if (map->type < 0 || map->type > 5)
30223+ if (map->type >= ARRAY_SIZE(types))
30224 type = "??";
30225 else
30226 type = types[map->type];
30227@@ -265,10 +269,10 @@ int drm_gem_object_info(struct seq_file
30228 struct drm_device *dev = node->minor->dev;
30229
30230 seq_printf(m, "%d objects\n", atomic_read(&dev->object_count));
30231- seq_printf(m, "%d object bytes\n", atomic_read(&dev->object_memory));
30232+ seq_printf(m, "%d object bytes\n", atomic_read_unchecked(&dev->object_memory));
30233 seq_printf(m, "%d pinned\n", atomic_read(&dev->pin_count));
30234- seq_printf(m, "%d pin bytes\n", atomic_read(&dev->pin_memory));
30235- seq_printf(m, "%d gtt bytes\n", atomic_read(&dev->gtt_memory));
30236+ seq_printf(m, "%d pin bytes\n", atomic_read_unchecked(&dev->pin_memory));
30237+ seq_printf(m, "%d gtt bytes\n", atomic_read_unchecked(&dev->gtt_memory));
30238 seq_printf(m, "%d gtt total\n", dev->gtt_total);
30239 return 0;
30240 }
30241@@ -288,7 +292,11 @@ int drm_vma_info(struct seq_file *m, voi
30242 mutex_lock(&dev->struct_mutex);
30243 seq_printf(m, "vma use count: %d, high_memory = %p, 0x%08llx\n",
30244 atomic_read(&dev->vma_count),
30245+#ifdef CONFIG_GRKERNSEC_HIDESYM
30246+ NULL, 0);
30247+#else
30248 high_memory, (u64)virt_to_phys(high_memory));
30249+#endif
30250
30251 list_for_each_entry(pt, &dev->vmalist, head) {
30252 vma = pt->vma;
30253@@ -296,14 +304,23 @@ int drm_vma_info(struct seq_file *m, voi
30254 continue;
30255 seq_printf(m,
30256 "\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000",
30257- pt->pid, vma->vm_start, vma->vm_end,
30258+ pt->pid,
30259+#ifdef CONFIG_GRKERNSEC_HIDESYM
30260+ 0, 0,
30261+#else
30262+ vma->vm_start, vma->vm_end,
30263+#endif
30264 vma->vm_flags & VM_READ ? 'r' : '-',
30265 vma->vm_flags & VM_WRITE ? 'w' : '-',
30266 vma->vm_flags & VM_EXEC ? 'x' : '-',
30267 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
30268 vma->vm_flags & VM_LOCKED ? 'l' : '-',
30269 vma->vm_flags & VM_IO ? 'i' : '-',
30270+#ifdef CONFIG_GRKERNSEC_HIDESYM
30271+ 0);
30272+#else
30273 vma->vm_pgoff);
30274+#endif
30275
30276 #if defined(__i386__)
30277 pgprot = pgprot_val(vma->vm_page_prot);
30278diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c
30279--- linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c 2011-03-27 14:31:47.000000000 -0400
30280+++ linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c 2011-10-06 09:37:14.000000000 -0400
30281@@ -463,7 +463,7 @@ static int compat_drm_infobufs(struct fi
30282 request = compat_alloc_user_space(nbytes);
30283 if (!access_ok(VERIFY_WRITE, request, nbytes))
30284 return -EFAULT;
30285- list = (struct drm_buf_desc *) (request + 1);
30286+ list = (struct drm_buf_desc __user *) (request + 1);
30287
30288 if (__put_user(count, &request->count)
30289 || __put_user(list, &request->list))
30290@@ -525,7 +525,7 @@ static int compat_drm_mapbufs(struct fil
30291 request = compat_alloc_user_space(nbytes);
30292 if (!access_ok(VERIFY_WRITE, request, nbytes))
30293 return -EFAULT;
30294- list = (struct drm_buf_pub *) (request + 1);
30295+ list = (struct drm_buf_pub __user *) (request + 1);
30296
30297 if (__put_user(count, &request->count)
30298 || __put_user(list, &request->list))
30299diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c
30300--- linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c 2011-03-27 14:31:47.000000000 -0400
30301+++ linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:56:46.000000000 -0400
30302@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
30303 stats->data[i].value =
30304 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
30305 else
30306- stats->data[i].value = atomic_read(&dev->counts[i]);
30307+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
30308 stats->data[i].type = dev->types[i];
30309 }
30310
30311diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_lock.c linux-2.6.32.46/drivers/gpu/drm/drm_lock.c
30312--- linux-2.6.32.46/drivers/gpu/drm/drm_lock.c 2011-03-27 14:31:47.000000000 -0400
30313+++ linux-2.6.32.46/drivers/gpu/drm/drm_lock.c 2011-04-17 15:56:46.000000000 -0400
30314@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
30315 if (drm_lock_take(&master->lock, lock->context)) {
30316 master->lock.file_priv = file_priv;
30317 master->lock.lock_time = jiffies;
30318- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
30319+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
30320 break; /* Got lock */
30321 }
30322
30323@@ -165,7 +165,7 @@ int drm_unlock(struct drm_device *dev, v
30324 return -EINVAL;
30325 }
30326
30327- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
30328+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
30329
30330 /* kernel_context_switch isn't used by any of the x86 drm
30331 * modules but is required by the Sparc driver.
30332diff -urNp linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c
30333--- linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c 2011-03-27 14:31:47.000000000 -0400
30334+++ linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:56:46.000000000 -0400
30335@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
30336 dma->buflist[vertex->idx],
30337 vertex->discard, vertex->used);
30338
30339- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30340- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30341+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30342+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30343 sarea_priv->last_enqueue = dev_priv->counter - 1;
30344 sarea_priv->last_dispatch = (int)hw_status[5];
30345
30346@@ -1115,8 +1115,8 @@ static int i810_dma_mc(struct drm_device
30347 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
30348 mc->last_render);
30349
30350- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30351- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30352+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30353+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30354 sarea_priv->last_enqueue = dev_priv->counter - 1;
30355 sarea_priv->last_dispatch = (int)hw_status[5];
30356
30357diff -urNp linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h
30358--- linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h 2011-03-27 14:31:47.000000000 -0400
30359+++ linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h 2011-05-04 17:56:28.000000000 -0400
30360@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
30361 int page_flipping;
30362
30363 wait_queue_head_t irq_queue;
30364- atomic_t irq_received;
30365- atomic_t irq_emitted;
30366+ atomic_unchecked_t irq_received;
30367+ atomic_unchecked_t irq_emitted;
30368
30369 int front_offset;
30370 } drm_i810_private_t;
30371diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h
30372--- linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h 2011-03-27 14:31:47.000000000 -0400
30373+++ linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h 2011-05-04 17:56:28.000000000 -0400
30374@@ -115,8 +115,8 @@ typedef struct drm_i830_private {
30375 int page_flipping;
30376
30377 wait_queue_head_t irq_queue;
30378- atomic_t irq_received;
30379- atomic_t irq_emitted;
30380+ atomic_unchecked_t irq_received;
30381+ atomic_unchecked_t irq_emitted;
30382
30383 int use_mi_batchbuffer_start;
30384
30385diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c
30386--- linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c 2011-03-27 14:31:47.000000000 -0400
30387+++ linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c 2011-05-04 17:56:28.000000000 -0400
30388@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_
30389
30390 I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
30391
30392- atomic_inc(&dev_priv->irq_received);
30393+ atomic_inc_unchecked(&dev_priv->irq_received);
30394 wake_up_interruptible(&dev_priv->irq_queue);
30395
30396 return IRQ_HANDLED;
30397@@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_devi
30398
30399 DRM_DEBUG("%s\n", __func__);
30400
30401- atomic_inc(&dev_priv->irq_emitted);
30402+ atomic_inc_unchecked(&dev_priv->irq_emitted);
30403
30404 BEGIN_LP_RING(2);
30405 OUT_RING(0);
30406 OUT_RING(GFX_OP_USER_INTERRUPT);
30407 ADVANCE_LP_RING();
30408
30409- return atomic_read(&dev_priv->irq_emitted);
30410+ return atomic_read_unchecked(&dev_priv->irq_emitted);
30411 }
30412
30413 static int i830_wait_irq(struct drm_device * dev, int irq_nr)
30414@@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_devi
30415
30416 DRM_DEBUG("%s\n", __func__);
30417
30418- if (atomic_read(&dev_priv->irq_received) >= irq_nr)
30419+ if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
30420 return 0;
30421
30422 dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
30423@@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_devi
30424
30425 for (;;) {
30426 __set_current_state(TASK_INTERRUPTIBLE);
30427- if (atomic_read(&dev_priv->irq_received) >= irq_nr)
30428+ if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
30429 break;
30430 if ((signed)(end - jiffies) <= 0) {
30431 DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
30432@@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct d
30433 I830_WRITE16(I830REG_HWSTAM, 0xffff);
30434 I830_WRITE16(I830REG_INT_MASK_R, 0x0);
30435 I830_WRITE16(I830REG_INT_ENABLE_R, 0x0);
30436- atomic_set(&dev_priv->irq_received, 0);
30437- atomic_set(&dev_priv->irq_emitted, 0);
30438+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30439+ atomic_set_unchecked(&dev_priv->irq_emitted, 0);
30440 init_waitqueue_head(&dev_priv->irq_queue);
30441 }
30442
30443diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c
30444--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-27 14:31:47.000000000 -0400
30445+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:56:46.000000000 -0400
30446@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
30447 }
30448 }
30449
30450-struct intel_dvo_dev_ops ch7017_ops = {
30451+const struct intel_dvo_dev_ops ch7017_ops = {
30452 .init = ch7017_init,
30453 .detect = ch7017_detect,
30454 .mode_valid = ch7017_mode_valid,
30455diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c
30456--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-27 14:31:47.000000000 -0400
30457+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:56:46.000000000 -0400
30458@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
30459 }
30460 }
30461
30462-struct intel_dvo_dev_ops ch7xxx_ops = {
30463+const struct intel_dvo_dev_ops ch7xxx_ops = {
30464 .init = ch7xxx_init,
30465 .detect = ch7xxx_detect,
30466 .mode_valid = ch7xxx_mode_valid,
30467diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h
30468--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h 2011-03-27 14:31:47.000000000 -0400
30469+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:56:46.000000000 -0400
30470@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
30471 *
30472 * \return singly-linked list of modes or NULL if no modes found.
30473 */
30474- struct drm_display_mode *(*get_modes)(struct intel_dvo_device *dvo);
30475+ struct drm_display_mode *(* const get_modes)(struct intel_dvo_device *dvo);
30476
30477 /**
30478 * Clean up driver-specific bits of the output
30479 */
30480- void (*destroy) (struct intel_dvo_device *dvo);
30481+ void (* const destroy) (struct intel_dvo_device *dvo);
30482
30483 /**
30484 * Debugging hook to dump device registers to log file
30485 */
30486- void (*dump_regs)(struct intel_dvo_device *dvo);
30487+ void (* const dump_regs)(struct intel_dvo_device *dvo);
30488 };
30489
30490-extern struct intel_dvo_dev_ops sil164_ops;
30491-extern struct intel_dvo_dev_ops ch7xxx_ops;
30492-extern struct intel_dvo_dev_ops ivch_ops;
30493-extern struct intel_dvo_dev_ops tfp410_ops;
30494-extern struct intel_dvo_dev_ops ch7017_ops;
30495+extern const struct intel_dvo_dev_ops sil164_ops;
30496+extern const struct intel_dvo_dev_ops ch7xxx_ops;
30497+extern const struct intel_dvo_dev_ops ivch_ops;
30498+extern const struct intel_dvo_dev_ops tfp410_ops;
30499+extern const struct intel_dvo_dev_ops ch7017_ops;
30500
30501 #endif /* _INTEL_DVO_H */
30502diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c
30503--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-27 14:31:47.000000000 -0400
30504+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:56:46.000000000 -0400
30505@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
30506 }
30507 }
30508
30509-struct intel_dvo_dev_ops ivch_ops= {
30510+const struct intel_dvo_dev_ops ivch_ops= {
30511 .init = ivch_init,
30512 .dpms = ivch_dpms,
30513 .save = ivch_save,
30514diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c
30515--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-27 14:31:47.000000000 -0400
30516+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:56:46.000000000 -0400
30517@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
30518 }
30519 }
30520
30521-struct intel_dvo_dev_ops sil164_ops = {
30522+const struct intel_dvo_dev_ops sil164_ops = {
30523 .init = sil164_init,
30524 .detect = sil164_detect,
30525 .mode_valid = sil164_mode_valid,
30526diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c
30527--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-27 14:31:47.000000000 -0400
30528+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:56:46.000000000 -0400
30529@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
30530 }
30531 }
30532
30533-struct intel_dvo_dev_ops tfp410_ops = {
30534+const struct intel_dvo_dev_ops tfp410_ops = {
30535 .init = tfp410_init,
30536 .detect = tfp410_detect,
30537 .mode_valid = tfp410_mode_valid,
30538diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c
30539--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c 2011-03-27 14:31:47.000000000 -0400
30540+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-04 17:56:28.000000000 -0400
30541@@ -192,7 +192,7 @@ static int i915_interrupt_info(struct se
30542 I915_READ(GTIMR));
30543 }
30544 seq_printf(m, "Interrupts received: %d\n",
30545- atomic_read(&dev_priv->irq_received));
30546+ atomic_read_unchecked(&dev_priv->irq_received));
30547 if (dev_priv->hw_status_page != NULL) {
30548 seq_printf(m, "Current sequence: %d\n",
30549 i915_get_gem_seqno(dev));
30550diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c
30551--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c 2011-03-27 14:31:47.000000000 -0400
30552+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:56:46.000000000 -0400
30553@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
30554 return i915_resume(dev);
30555 }
30556
30557-static struct vm_operations_struct i915_gem_vm_ops = {
30558+static const struct vm_operations_struct i915_gem_vm_ops = {
30559 .fault = i915_gem_fault,
30560 .open = drm_gem_vm_open,
30561 .close = drm_gem_vm_close,
30562diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h
30563--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h 2011-03-27 14:31:47.000000000 -0400
30564+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h 2011-08-05 20:33:55.000000000 -0400
30565@@ -168,7 +168,7 @@ struct drm_i915_display_funcs {
30566 /* display clock increase/decrease */
30567 /* pll clock increase/decrease */
30568 /* clock gating init */
30569-};
30570+} __no_const;
30571
30572 typedef struct drm_i915_private {
30573 struct drm_device *dev;
30574@@ -197,7 +197,7 @@ typedef struct drm_i915_private {
30575 int page_flipping;
30576
30577 wait_queue_head_t irq_queue;
30578- atomic_t irq_received;
30579+ atomic_unchecked_t irq_received;
30580 /** Protects user_irq_refcount and irq_mask_reg */
30581 spinlock_t user_irq_lock;
30582 /** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */
30583diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c
30584--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c 2011-03-27 14:31:47.000000000 -0400
30585+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c 2011-04-17 15:56:46.000000000 -0400
30586@@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d
30587
30588 args->aper_size = dev->gtt_total;
30589 args->aper_available_size = (args->aper_size -
30590- atomic_read(&dev->pin_memory));
30591+ atomic_read_unchecked(&dev->pin_memory));
30592
30593 return 0;
30594 }
30595@@ -492,6 +492,11 @@ i915_gem_pread_ioctl(struct drm_device *
30596 return -EINVAL;
30597 }
30598
30599+ if (!access_ok(VERIFY_WRITE, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
30600+ drm_gem_object_unreference(obj);
30601+ return -EFAULT;
30602+ }
30603+
30604 if (i915_gem_object_needs_bit17_swizzle(obj)) {
30605 ret = i915_gem_shmem_pread_slow(dev, obj, args, file_priv);
30606 } else {
30607@@ -965,6 +970,11 @@ i915_gem_pwrite_ioctl(struct drm_device
30608 return -EINVAL;
30609 }
30610
30611+ if (!access_ok(VERIFY_READ, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
30612+ drm_gem_object_unreference(obj);
30613+ return -EFAULT;
30614+ }
30615+
30616 /* We can only do the GTT pwrite on untiled buffers, as otherwise
30617 * it would end up going through the fenced access, and we'll get
30618 * different detiling behavior between reading and writing.
30619@@ -2054,7 +2064,7 @@ i915_gem_object_unbind(struct drm_gem_ob
30620
30621 if (obj_priv->gtt_space) {
30622 atomic_dec(&dev->gtt_count);
30623- atomic_sub(obj->size, &dev->gtt_memory);
30624+ atomic_sub_unchecked(obj->size, &dev->gtt_memory);
30625
30626 drm_mm_put_block(obj_priv->gtt_space);
30627 obj_priv->gtt_space = NULL;
30628@@ -2697,7 +2707,7 @@ i915_gem_object_bind_to_gtt(struct drm_g
30629 goto search_free;
30630 }
30631 atomic_inc(&dev->gtt_count);
30632- atomic_add(obj->size, &dev->gtt_memory);
30633+ atomic_add_unchecked(obj->size, &dev->gtt_memory);
30634
30635 /* Assert that the object is not currently in any GPU domain. As it
30636 * wasn't in the GTT, there shouldn't be any way it could have been in
30637@@ -3751,9 +3761,9 @@ i915_gem_execbuffer(struct drm_device *d
30638 "%d/%d gtt bytes\n",
30639 atomic_read(&dev->object_count),
30640 atomic_read(&dev->pin_count),
30641- atomic_read(&dev->object_memory),
30642- atomic_read(&dev->pin_memory),
30643- atomic_read(&dev->gtt_memory),
30644+ atomic_read_unchecked(&dev->object_memory),
30645+ atomic_read_unchecked(&dev->pin_memory),
30646+ atomic_read_unchecked(&dev->gtt_memory),
30647 dev->gtt_total);
30648 }
30649 goto err;
30650@@ -3985,7 +3995,7 @@ i915_gem_object_pin(struct drm_gem_objec
30651 */
30652 if (obj_priv->pin_count == 1) {
30653 atomic_inc(&dev->pin_count);
30654- atomic_add(obj->size, &dev->pin_memory);
30655+ atomic_add_unchecked(obj->size, &dev->pin_memory);
30656 if (!obj_priv->active &&
30657 (obj->write_domain & I915_GEM_GPU_DOMAINS) == 0 &&
30658 !list_empty(&obj_priv->list))
30659@@ -4018,7 +4028,7 @@ i915_gem_object_unpin(struct drm_gem_obj
30660 list_move_tail(&obj_priv->list,
30661 &dev_priv->mm.inactive_list);
30662 atomic_dec(&dev->pin_count);
30663- atomic_sub(obj->size, &dev->pin_memory);
30664+ atomic_sub_unchecked(obj->size, &dev->pin_memory);
30665 }
30666 i915_verify_inactive(dev, __FILE__, __LINE__);
30667 }
30668diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c
30669--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c 2011-03-27 14:31:47.000000000 -0400
30670+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c 2011-05-04 17:56:28.000000000 -0400
30671@@ -528,7 +528,7 @@ irqreturn_t i915_driver_irq_handler(DRM_
30672 int irq_received;
30673 int ret = IRQ_NONE;
30674
30675- atomic_inc(&dev_priv->irq_received);
30676+ atomic_inc_unchecked(&dev_priv->irq_received);
30677
30678 if (IS_IGDNG(dev))
30679 return igdng_irq_handler(dev);
30680@@ -1021,7 +1021,7 @@ void i915_driver_irq_preinstall(struct d
30681 {
30682 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30683
30684- atomic_set(&dev_priv->irq_received, 0);
30685+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30686
30687 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30688 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30689diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c
30690--- linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c 2011-03-27 14:31:47.000000000 -0400
30691+++ linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c 2011-08-05 20:33:55.000000000 -0400
30692@@ -2795,7 +2795,9 @@ bool intel_sdvo_init(struct drm_device *
30693 sdvo_priv->slave_addr = intel_sdvo_get_slave_addr(dev, output_device);
30694
30695 /* Save the bit-banging i2c functionality for use by the DDC wrapper */
30696- intel_sdvo_i2c_bit_algo.functionality = intel_output->i2c_bus->algo->functionality;
30697+ pax_open_kernel();
30698+ *(void **)&intel_sdvo_i2c_bit_algo.functionality = intel_output->i2c_bus->algo->functionality;
30699+ pax_close_kernel();
30700
30701 /* Read the regs to test if we can talk to the device */
30702 for (i = 0; i < 0x40; i++) {
30703diff -urNp linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h
30704--- linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h 2011-03-27 14:31:47.000000000 -0400
30705+++ linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h 2011-05-04 17:56:28.000000000 -0400
30706@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
30707 u32 clear_cmd;
30708 u32 maccess;
30709
30710- atomic_t vbl_received; /**< Number of vblanks received. */
30711+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
30712 wait_queue_head_t fence_queue;
30713- atomic_t last_fence_retired;
30714+ atomic_unchecked_t last_fence_retired;
30715 u32 next_fence_to_post;
30716
30717 unsigned int fb_cpp;
30718diff -urNp linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c
30719--- linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c 2011-03-27 14:31:47.000000000 -0400
30720+++ linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c 2011-05-04 17:56:28.000000000 -0400
30721@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
30722 if (crtc != 0)
30723 return 0;
30724
30725- return atomic_read(&dev_priv->vbl_received);
30726+ return atomic_read_unchecked(&dev_priv->vbl_received);
30727 }
30728
30729
30730@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I
30731 /* VBLANK interrupt */
30732 if (status & MGA_VLINEPEN) {
30733 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
30734- atomic_inc(&dev_priv->vbl_received);
30735+ atomic_inc_unchecked(&dev_priv->vbl_received);
30736 drm_handle_vblank(dev, 0);
30737 handled = 1;
30738 }
30739@@ -80,7 +80,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I
30740 MGA_WRITE(MGA_PRIMEND, prim_end);
30741 }
30742
30743- atomic_inc(&dev_priv->last_fence_retired);
30744+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
30745 DRM_WAKEUP(&dev_priv->fence_queue);
30746 handled = 1;
30747 }
30748@@ -131,7 +131,7 @@ int mga_driver_fence_wait(struct drm_dev
30749 * using fences.
30750 */
30751 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
30752- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
30753+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
30754 - *sequence) <= (1 << 23)));
30755
30756 *sequence = cur_fence;
30757diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c
30758--- linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c 2011-03-27 14:31:47.000000000 -0400
30759+++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c 2011-05-04 17:56:28.000000000 -0400
30760@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
30761
30762 /* GH: Simple idle check.
30763 */
30764- atomic_set(&dev_priv->idle_count, 0);
30765+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30766
30767 /* We don't support anything other than bus-mastering ring mode,
30768 * but the ring can be in either AGP or PCI space for the ring
30769diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h
30770--- linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h 2011-03-27 14:31:47.000000000 -0400
30771+++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h 2011-05-04 17:56:28.000000000 -0400
30772@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
30773 int is_pci;
30774 unsigned long cce_buffers_offset;
30775
30776- atomic_t idle_count;
30777+ atomic_unchecked_t idle_count;
30778
30779 int page_flipping;
30780 int current_page;
30781 u32 crtc_offset;
30782 u32 crtc_offset_cntl;
30783
30784- atomic_t vbl_received;
30785+ atomic_unchecked_t vbl_received;
30786
30787 u32 color_fmt;
30788 unsigned int front_offset;
30789diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c
30790--- linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c 2011-03-27 14:31:47.000000000 -0400
30791+++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c 2011-05-04 17:56:28.000000000 -0400
30792@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
30793 if (crtc != 0)
30794 return 0;
30795
30796- return atomic_read(&dev_priv->vbl_received);
30797+ return atomic_read_unchecked(&dev_priv->vbl_received);
30798 }
30799
30800 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30801@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_
30802 /* VBLANK interrupt */
30803 if (status & R128_CRTC_VBLANK_INT) {
30804 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
30805- atomic_inc(&dev_priv->vbl_received);
30806+ atomic_inc_unchecked(&dev_priv->vbl_received);
30807 drm_handle_vblank(dev, 0);
30808 return IRQ_HANDLED;
30809 }
30810diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c
30811--- linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c 2011-03-27 14:31:47.000000000 -0400
30812+++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c 2011-05-04 17:56:28.000000000 -0400
30813@@ -323,10 +323,10 @@ static void r128_clear_box(drm_r128_priv
30814
30815 static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv)
30816 {
30817- if (atomic_read(&dev_priv->idle_count) == 0) {
30818+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0) {
30819 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
30820 } else {
30821- atomic_set(&dev_priv->idle_count, 0);
30822+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30823 }
30824 }
30825
30826diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c
30827--- linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c 2011-05-10 22:12:01.000000000 -0400
30828+++ linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c 2011-05-16 21:46:57.000000000 -0400
30829@@ -1115,6 +1115,8 @@ struct atom_context *atom_parse(struct c
30830 char name[512];
30831 int i;
30832
30833+ pax_track_stack();
30834+
30835 ctx->card = card;
30836 ctx->bios = bios;
30837
30838diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c
30839--- linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c 2011-03-27 14:31:47.000000000 -0400
30840+++ linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:56:46.000000000 -0400
30841@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
30842 regex_t mask_rex;
30843 regmatch_t match[4];
30844 char buf[1024];
30845- size_t end;
30846+ long end;
30847 int len;
30848 int done = 0;
30849 int r;
30850 unsigned o;
30851 struct offset *offset;
30852 char last_reg_s[10];
30853- int last_reg;
30854+ unsigned long last_reg;
30855
30856 if (regcomp
30857 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
30858diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c
30859--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c 2011-03-27 14:31:47.000000000 -0400
30860+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-16 21:46:57.000000000 -0400
30861@@ -275,6 +275,8 @@ bool radeon_get_atom_connector_info_from
30862 bool linkb;
30863 struct radeon_i2c_bus_rec ddc_bus;
30864
30865+ pax_track_stack();
30866+
30867 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
30868
30869 if (data_offset == 0)
30870@@ -520,13 +522,13 @@ static uint16_t atombios_get_connector_o
30871 }
30872 }
30873
30874-struct bios_connector {
30875+static struct bios_connector {
30876 bool valid;
30877 uint16_t line_mux;
30878 uint16_t devices;
30879 int connector_type;
30880 struct radeon_i2c_bus_rec ddc_bus;
30881-};
30882+} bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
30883
30884 bool radeon_get_atom_connector_info_from_supported_devices_table(struct
30885 drm_device
30886@@ -542,7 +544,6 @@ bool radeon_get_atom_connector_info_from
30887 uint8_t dac;
30888 union atom_supported_devices *supported_devices;
30889 int i, j;
30890- struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
30891
30892 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
30893
30894diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c
30895--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c 2011-03-27 14:31:47.000000000 -0400
30896+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c 2011-04-17 15:56:46.000000000 -0400
30897@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
30898
30899 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
30900 error = freq - current_freq;
30901- error = error < 0 ? 0xffffffff : error;
30902+ error = (int32_t)error < 0 ? 0xffffffff : error;
30903 } else
30904 error = abs(current_freq - freq);
30905 vco_diff = abs(vco - best_vco);
30906diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h
30907--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h 2011-03-27 14:31:47.000000000 -0400
30908+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-04 17:56:28.000000000 -0400
30909@@ -253,7 +253,7 @@ typedef struct drm_radeon_private {
30910
30911 /* SW interrupt */
30912 wait_queue_head_t swi_queue;
30913- atomic_t swi_emitted;
30914+ atomic_unchecked_t swi_emitted;
30915 int vblank_crtc;
30916 uint32_t irq_enable_reg;
30917 uint32_t r500_disp_irq_reg;
30918diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c
30919--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c 2011-03-27 14:31:47.000000000 -0400
30920+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-04 17:56:28.000000000 -0400
30921@@ -47,7 +47,7 @@ int radeon_fence_emit(struct radeon_devi
30922 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
30923 return 0;
30924 }
30925- fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
30926+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
30927 if (!rdev->cp.ready) {
30928 /* FIXME: cp is not running assume everythings is done right
30929 * away
30930@@ -364,7 +364,7 @@ int radeon_fence_driver_init(struct rade
30931 return r;
30932 }
30933 WREG32(rdev->fence_drv.scratch_reg, 0);
30934- atomic_set(&rdev->fence_drv.seq, 0);
30935+ atomic_set_unchecked(&rdev->fence_drv.seq, 0);
30936 INIT_LIST_HEAD(&rdev->fence_drv.created);
30937 INIT_LIST_HEAD(&rdev->fence_drv.emited);
30938 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
30939diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h
30940--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h 2011-03-27 14:31:47.000000000 -0400
30941+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h 2011-08-05 20:33:55.000000000 -0400
30942@@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device
30943 */
30944 struct radeon_fence_driver {
30945 uint32_t scratch_reg;
30946- atomic_t seq;
30947+ atomic_unchecked_t seq;
30948 uint32_t last_seq;
30949 unsigned long count_timeout;
30950 wait_queue_head_t queue;
30951@@ -640,7 +640,7 @@ struct radeon_asic {
30952 uint32_t offset, uint32_t obj_size);
30953 int (*clear_surface_reg)(struct radeon_device *rdev, int reg);
30954 void (*bandwidth_update)(struct radeon_device *rdev);
30955-};
30956+} __no_const;
30957
30958 /*
30959 * Asic structures
30960diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c
30961--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-27 14:31:47.000000000 -0400
30962+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-23 13:57:24.000000000 -0400
30963@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(str
30964 request = compat_alloc_user_space(sizeof(*request));
30965 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
30966 || __put_user(req32.param, &request->param)
30967- || __put_user((void __user *)(unsigned long)req32.value,
30968+ || __put_user((unsigned long)req32.value,
30969 &request->value))
30970 return -EFAULT;
30971
30972diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c
30973--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c 2011-03-27 14:31:47.000000000 -0400
30974+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-04 17:56:28.000000000 -0400
30975@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
30976 unsigned int ret;
30977 RING_LOCALS;
30978
30979- atomic_inc(&dev_priv->swi_emitted);
30980- ret = atomic_read(&dev_priv->swi_emitted);
30981+ atomic_inc_unchecked(&dev_priv->swi_emitted);
30982+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
30983
30984 BEGIN_RING(4);
30985 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
30986@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct
30987 drm_radeon_private_t *dev_priv =
30988 (drm_radeon_private_t *) dev->dev_private;
30989
30990- atomic_set(&dev_priv->swi_emitted, 0);
30991+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
30992 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
30993
30994 dev->max_vblank_count = 0x001fffff;
30995diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c
30996--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c 2011-03-27 14:31:47.000000000 -0400
30997+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:56:46.000000000 -0400
30998@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
30999 {
31000 drm_radeon_private_t *dev_priv = dev->dev_private;
31001 drm_radeon_getparam_t *param = data;
31002- int value;
31003+ int value = 0;
31004
31005 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
31006
31007diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c
31008--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-27 14:31:47.000000000 -0400
31009+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:56:46.000000000 -0400
31010@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
31011 DRM_INFO("radeon: ttm finalized\n");
31012 }
31013
31014-static struct vm_operations_struct radeon_ttm_vm_ops;
31015-static const struct vm_operations_struct *ttm_vm_ops = NULL;
31016-
31017-static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
31018-{
31019- struct ttm_buffer_object *bo;
31020- int r;
31021-
31022- bo = (struct ttm_buffer_object *)vma->vm_private_data;
31023- if (bo == NULL) {
31024- return VM_FAULT_NOPAGE;
31025- }
31026- r = ttm_vm_ops->fault(vma, vmf);
31027- return r;
31028-}
31029-
31030 int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
31031 {
31032 struct drm_file *file_priv;
31033 struct radeon_device *rdev;
31034- int r;
31035
31036 if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
31037 return drm_mmap(filp, vma);
31038@@ -563,20 +546,9 @@ int radeon_mmap(struct file *filp, struc
31039
31040 file_priv = (struct drm_file *)filp->private_data;
31041 rdev = file_priv->minor->dev->dev_private;
31042- if (rdev == NULL) {
31043+ if (!rdev)
31044 return -EINVAL;
31045- }
31046- r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
31047- if (unlikely(r != 0)) {
31048- return r;
31049- }
31050- if (unlikely(ttm_vm_ops == NULL)) {
31051- ttm_vm_ops = vma->vm_ops;
31052- radeon_ttm_vm_ops = *ttm_vm_ops;
31053- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
31054- }
31055- vma->vm_ops = &radeon_ttm_vm_ops;
31056- return 0;
31057+ return ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
31058 }
31059
31060
31061diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c
31062--- linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c 2011-03-27 14:31:47.000000000 -0400
31063+++ linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:56:46.000000000 -0400
31064@@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct
31065 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
31066 rdev->pm.sideport_bandwidth.full)
31067 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
31068- read_delay_latency.full = rfixed_const(370 * 800 * 1000);
31069+ read_delay_latency.full = rfixed_const(800 * 1000);
31070 read_delay_latency.full = rfixed_div(read_delay_latency,
31071 rdev->pm.igp_sideport_mclk);
31072+ a.full = rfixed_const(370);
31073+ read_delay_latency.full = rfixed_mul(read_delay_latency, a);
31074 } else {
31075 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
31076 rdev->pm.k8_bandwidth.full)
31077diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c
31078--- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c 2011-08-29 22:24:44.000000000 -0400
31079+++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c 2011-08-29 22:25:07.000000000 -0400
31080@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
31081 NULL
31082 };
31083
31084-static struct sysfs_ops ttm_bo_global_ops = {
31085+static const struct sysfs_ops ttm_bo_global_ops = {
31086 .show = &ttm_bo_global_show
31087 };
31088
31089diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c
31090--- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-27 14:31:47.000000000 -0400
31091+++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:56:46.000000000 -0400
31092@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
31093 {
31094 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
31095 vma->vm_private_data;
31096- struct ttm_bo_device *bdev = bo->bdev;
31097+ struct ttm_bo_device *bdev;
31098 unsigned long bus_base;
31099 unsigned long bus_offset;
31100 unsigned long bus_size;
31101@@ -88,6 +88,10 @@ static int ttm_bo_vm_fault(struct vm_are
31102 unsigned long address = (unsigned long)vmf->virtual_address;
31103 int retval = VM_FAULT_NOPAGE;
31104
31105+ if (!bo)
31106+ return VM_FAULT_NOPAGE;
31107+ bdev = bo->bdev;
31108+
31109 /*
31110 * Work around locking order reversal in fault / nopfn
31111 * between mmap_sem and bo_reserve: Perform a trylock operation
31112diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c
31113--- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c 2011-03-27 14:31:47.000000000 -0400
31114+++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c 2011-04-17 15:56:46.000000000 -0400
31115@@ -36,7 +36,7 @@
31116 struct ttm_global_item {
31117 struct mutex mutex;
31118 void *object;
31119- int refcount;
31120+ atomic_t refcount;
31121 };
31122
31123 static struct ttm_global_item glob[TTM_GLOBAL_NUM];
31124@@ -49,7 +49,7 @@ void ttm_global_init(void)
31125 struct ttm_global_item *item = &glob[i];
31126 mutex_init(&item->mutex);
31127 item->object = NULL;
31128- item->refcount = 0;
31129+ atomic_set(&item->refcount, 0);
31130 }
31131 }
31132
31133@@ -59,7 +59,7 @@ void ttm_global_release(void)
31134 for (i = 0; i < TTM_GLOBAL_NUM; ++i) {
31135 struct ttm_global_item *item = &glob[i];
31136 BUG_ON(item->object != NULL);
31137- BUG_ON(item->refcount != 0);
31138+ BUG_ON(atomic_read(&item->refcount) != 0);
31139 }
31140 }
31141
31142@@ -70,7 +70,7 @@ int ttm_global_item_ref(struct ttm_globa
31143 void *object;
31144
31145 mutex_lock(&item->mutex);
31146- if (item->refcount == 0) {
31147+ if (atomic_read(&item->refcount) == 0) {
31148 item->object = kzalloc(ref->size, GFP_KERNEL);
31149 if (unlikely(item->object == NULL)) {
31150 ret = -ENOMEM;
31151@@ -83,7 +83,7 @@ int ttm_global_item_ref(struct ttm_globa
31152 goto out_err;
31153
31154 }
31155- ++item->refcount;
31156+ atomic_inc(&item->refcount);
31157 ref->object = item->object;
31158 object = item->object;
31159 mutex_unlock(&item->mutex);
31160@@ -100,9 +100,9 @@ void ttm_global_item_unref(struct ttm_gl
31161 struct ttm_global_item *item = &glob[ref->global_type];
31162
31163 mutex_lock(&item->mutex);
31164- BUG_ON(item->refcount == 0);
31165+ BUG_ON(atomic_read(&item->refcount) == 0);
31166 BUG_ON(ref->object != item->object);
31167- if (--item->refcount == 0) {
31168+ if (atomic_dec_and_test(&item->refcount)) {
31169 ref->release(ref);
31170 item->object = NULL;
31171 }
31172diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c
31173--- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c 2011-03-27 14:31:47.000000000 -0400
31174+++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c 2011-04-17 15:56:46.000000000 -0400
31175@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
31176 NULL
31177 };
31178
31179-static struct sysfs_ops ttm_mem_zone_ops = {
31180+static const struct sysfs_ops ttm_mem_zone_ops = {
31181 .show = &ttm_mem_zone_show,
31182 .store = &ttm_mem_zone_store
31183 };
31184diff -urNp linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h
31185--- linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h 2011-03-27 14:31:47.000000000 -0400
31186+++ linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h 2011-05-04 17:56:28.000000000 -0400
31187@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
31188 typedef uint32_t maskarray_t[5];
31189
31190 typedef struct drm_via_irq {
31191- atomic_t irq_received;
31192+ atomic_unchecked_t irq_received;
31193 uint32_t pending_mask;
31194 uint32_t enable_mask;
31195 wait_queue_head_t irq_queue;
31196@@ -75,7 +75,7 @@ typedef struct drm_via_private {
31197 struct timeval last_vblank;
31198 int last_vblank_valid;
31199 unsigned usec_per_vblank;
31200- atomic_t vbl_received;
31201+ atomic_unchecked_t vbl_received;
31202 drm_via_state_t hc_state;
31203 char pci_buf[VIA_PCI_BUF_SIZE];
31204 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
31205diff -urNp linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c
31206--- linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c 2011-03-27 14:31:47.000000000 -0400
31207+++ linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c 2011-05-04 17:56:28.000000000 -0400
31208@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
31209 if (crtc != 0)
31210 return 0;
31211
31212- return atomic_read(&dev_priv->vbl_received);
31213+ return atomic_read_unchecked(&dev_priv->vbl_received);
31214 }
31215
31216 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31217@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_I
31218
31219 status = VIA_READ(VIA_REG_INTERRUPT);
31220 if (status & VIA_IRQ_VBLANK_PENDING) {
31221- atomic_inc(&dev_priv->vbl_received);
31222- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
31223+ atomic_inc_unchecked(&dev_priv->vbl_received);
31224+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
31225 do_gettimeofday(&cur_vblank);
31226 if (dev_priv->last_vblank_valid) {
31227 dev_priv->usec_per_vblank =
31228@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_I
31229 dev_priv->last_vblank = cur_vblank;
31230 dev_priv->last_vblank_valid = 1;
31231 }
31232- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
31233+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
31234 DRM_DEBUG("US per vblank is: %u\n",
31235 dev_priv->usec_per_vblank);
31236 }
31237@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_I
31238
31239 for (i = 0; i < dev_priv->num_irqs; ++i) {
31240 if (status & cur_irq->pending_mask) {
31241- atomic_inc(&cur_irq->irq_received);
31242+ atomic_inc_unchecked(&cur_irq->irq_received);
31243 DRM_WAKEUP(&cur_irq->irq_queue);
31244 handled = 1;
31245 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) {
31246@@ -244,11 +244,11 @@ via_driver_irq_wait(struct drm_device *
31247 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31248 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
31249 masks[irq][4]));
31250- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
31251+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
31252 } else {
31253 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31254 (((cur_irq_sequence =
31255- atomic_read(&cur_irq->irq_received)) -
31256+ atomic_read_unchecked(&cur_irq->irq_received)) -
31257 *sequence) <= (1 << 23)));
31258 }
31259 *sequence = cur_irq_sequence;
31260@@ -286,7 +286,7 @@ void via_driver_irq_preinstall(struct dr
31261 }
31262
31263 for (i = 0; i < dev_priv->num_irqs; ++i) {
31264- atomic_set(&cur_irq->irq_received, 0);
31265+ atomic_set_unchecked(&cur_irq->irq_received, 0);
31266 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
31267 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
31268 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
31269@@ -368,7 +368,7 @@ int via_wait_irq(struct drm_device *dev,
31270 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
31271 case VIA_IRQ_RELATIVE:
31272 irqwait->request.sequence +=
31273- atomic_read(&cur_irq->irq_received);
31274+ atomic_read_unchecked(&cur_irq->irq_received);
31275 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
31276 case VIA_IRQ_ABSOLUTE:
31277 break;
31278diff -urNp linux-2.6.32.46/drivers/hid/hid-core.c linux-2.6.32.46/drivers/hid/hid-core.c
31279--- linux-2.6.32.46/drivers/hid/hid-core.c 2011-05-10 22:12:01.000000000 -0400
31280+++ linux-2.6.32.46/drivers/hid/hid-core.c 2011-05-10 22:12:32.000000000 -0400
31281@@ -1752,7 +1752,7 @@ static bool hid_ignore(struct hid_device
31282
31283 int hid_add_device(struct hid_device *hdev)
31284 {
31285- static atomic_t id = ATOMIC_INIT(0);
31286+ static atomic_unchecked_t id = ATOMIC_INIT(0);
31287 int ret;
31288
31289 if (WARN_ON(hdev->status & HID_STAT_ADDED))
31290@@ -1766,7 +1766,7 @@ int hid_add_device(struct hid_device *hd
31291 /* XXX hack, any other cleaner solution after the driver core
31292 * is converted to allow more than 20 bytes as the device name? */
31293 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
31294- hdev->vendor, hdev->product, atomic_inc_return(&id));
31295+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
31296
31297 ret = device_add(&hdev->dev);
31298 if (!ret)
31299diff -urNp linux-2.6.32.46/drivers/hid/usbhid/hiddev.c linux-2.6.32.46/drivers/hid/usbhid/hiddev.c
31300--- linux-2.6.32.46/drivers/hid/usbhid/hiddev.c 2011-03-27 14:31:47.000000000 -0400
31301+++ linux-2.6.32.46/drivers/hid/usbhid/hiddev.c 2011-04-17 15:56:46.000000000 -0400
31302@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
31303 return put_user(HID_VERSION, (int __user *)arg);
31304
31305 case HIDIOCAPPLICATION:
31306- if (arg < 0 || arg >= hid->maxapplication)
31307+ if (arg >= hid->maxapplication)
31308 return -EINVAL;
31309
31310 for (i = 0; i < hid->maxcollection; i++)
31311diff -urNp linux-2.6.32.46/drivers/hwmon/lis3lv02d.c linux-2.6.32.46/drivers/hwmon/lis3lv02d.c
31312--- linux-2.6.32.46/drivers/hwmon/lis3lv02d.c 2011-03-27 14:31:47.000000000 -0400
31313+++ linux-2.6.32.46/drivers/hwmon/lis3lv02d.c 2011-05-04 17:56:28.000000000 -0400
31314@@ -146,7 +146,7 @@ static irqreturn_t lis302dl_interrupt(in
31315 * the lid is closed. This leads to interrupts as soon as a little move
31316 * is done.
31317 */
31318- atomic_inc(&lis3_dev.count);
31319+ atomic_inc_unchecked(&lis3_dev.count);
31320
31321 wake_up_interruptible(&lis3_dev.misc_wait);
31322 kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
31323@@ -160,7 +160,7 @@ static int lis3lv02d_misc_open(struct in
31324 if (test_and_set_bit(0, &lis3_dev.misc_opened))
31325 return -EBUSY; /* already open */
31326
31327- atomic_set(&lis3_dev.count, 0);
31328+ atomic_set_unchecked(&lis3_dev.count, 0);
31329
31330 /*
31331 * The sensor can generate interrupts for free-fall and direction
31332@@ -206,7 +206,7 @@ static ssize_t lis3lv02d_misc_read(struc
31333 add_wait_queue(&lis3_dev.misc_wait, &wait);
31334 while (true) {
31335 set_current_state(TASK_INTERRUPTIBLE);
31336- data = atomic_xchg(&lis3_dev.count, 0);
31337+ data = atomic_xchg_unchecked(&lis3_dev.count, 0);
31338 if (data)
31339 break;
31340
31341@@ -244,7 +244,7 @@ out:
31342 static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
31343 {
31344 poll_wait(file, &lis3_dev.misc_wait, wait);
31345- if (atomic_read(&lis3_dev.count))
31346+ if (atomic_read_unchecked(&lis3_dev.count))
31347 return POLLIN | POLLRDNORM;
31348 return 0;
31349 }
31350diff -urNp linux-2.6.32.46/drivers/hwmon/lis3lv02d.h linux-2.6.32.46/drivers/hwmon/lis3lv02d.h
31351--- linux-2.6.32.46/drivers/hwmon/lis3lv02d.h 2011-03-27 14:31:47.000000000 -0400
31352+++ linux-2.6.32.46/drivers/hwmon/lis3lv02d.h 2011-05-04 17:56:28.000000000 -0400
31353@@ -201,7 +201,7 @@ struct lis3lv02d {
31354
31355 struct input_polled_dev *idev; /* input device */
31356 struct platform_device *pdev; /* platform device */
31357- atomic_t count; /* interrupt count after last read */
31358+ atomic_unchecked_t count; /* interrupt count after last read */
31359 int xcalib; /* calibrated null value for x */
31360 int ycalib; /* calibrated null value for y */
31361 int zcalib; /* calibrated null value for z */
31362diff -urNp linux-2.6.32.46/drivers/hwmon/sht15.c linux-2.6.32.46/drivers/hwmon/sht15.c
31363--- linux-2.6.32.46/drivers/hwmon/sht15.c 2011-03-27 14:31:47.000000000 -0400
31364+++ linux-2.6.32.46/drivers/hwmon/sht15.c 2011-05-04 17:56:28.000000000 -0400
31365@@ -112,7 +112,7 @@ struct sht15_data {
31366 int supply_uV;
31367 int supply_uV_valid;
31368 struct work_struct update_supply_work;
31369- atomic_t interrupt_handled;
31370+ atomic_unchecked_t interrupt_handled;
31371 };
31372
31373 /**
31374@@ -245,13 +245,13 @@ static inline int sht15_update_single_va
31375 return ret;
31376
31377 gpio_direction_input(data->pdata->gpio_data);
31378- atomic_set(&data->interrupt_handled, 0);
31379+ atomic_set_unchecked(&data->interrupt_handled, 0);
31380
31381 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31382 if (gpio_get_value(data->pdata->gpio_data) == 0) {
31383 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
31384 /* Only relevant if the interrupt hasn't occured. */
31385- if (!atomic_read(&data->interrupt_handled))
31386+ if (!atomic_read_unchecked(&data->interrupt_handled))
31387 schedule_work(&data->read_work);
31388 }
31389 ret = wait_event_timeout(data->wait_queue,
31390@@ -398,7 +398,7 @@ static irqreturn_t sht15_interrupt_fired
31391 struct sht15_data *data = d;
31392 /* First disable the interrupt */
31393 disable_irq_nosync(irq);
31394- atomic_inc(&data->interrupt_handled);
31395+ atomic_inc_unchecked(&data->interrupt_handled);
31396 /* Then schedule a reading work struct */
31397 if (data->flag != SHT15_READING_NOTHING)
31398 schedule_work(&data->read_work);
31399@@ -449,11 +449,11 @@ static void sht15_bh_read_data(struct wo
31400 here as could have gone low in meantime so verify
31401 it hasn't!
31402 */
31403- atomic_set(&data->interrupt_handled, 0);
31404+ atomic_set_unchecked(&data->interrupt_handled, 0);
31405 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31406 /* If still not occured or another handler has been scheduled */
31407 if (gpio_get_value(data->pdata->gpio_data)
31408- || atomic_read(&data->interrupt_handled))
31409+ || atomic_read_unchecked(&data->interrupt_handled))
31410 return;
31411 }
31412 /* Read the data back from the device */
31413diff -urNp linux-2.6.32.46/drivers/hwmon/w83791d.c linux-2.6.32.46/drivers/hwmon/w83791d.c
31414--- linux-2.6.32.46/drivers/hwmon/w83791d.c 2011-03-27 14:31:47.000000000 -0400
31415+++ linux-2.6.32.46/drivers/hwmon/w83791d.c 2011-04-17 15:56:46.000000000 -0400
31416@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
31417 struct i2c_board_info *info);
31418 static int w83791d_remove(struct i2c_client *client);
31419
31420-static int w83791d_read(struct i2c_client *client, u8 register);
31421-static int w83791d_write(struct i2c_client *client, u8 register, u8 value);
31422+static int w83791d_read(struct i2c_client *client, u8 reg);
31423+static int w83791d_write(struct i2c_client *client, u8 reg, u8 value);
31424 static struct w83791d_data *w83791d_update_device(struct device *dev);
31425
31426 #ifdef DEBUG
31427diff -urNp linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c
31428--- linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c 2011-03-27 14:31:47.000000000 -0400
31429+++ linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c 2011-08-23 21:22:32.000000000 -0400
31430@@ -43,7 +43,7 @@
31431 extern struct i2c_adapter amd756_smbus;
31432
31433 static struct i2c_adapter *s4882_adapter;
31434-static struct i2c_algorithm *s4882_algo;
31435+static i2c_algorithm_no_const *s4882_algo;
31436
31437 /* Wrapper access functions for multiplexed SMBus */
31438 static DEFINE_MUTEX(amd756_lock);
31439diff -urNp linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c
31440--- linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-03-27 14:31:47.000000000 -0400
31441+++ linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21:22:32.000000000 -0400
31442@@ -41,7 +41,7 @@
31443 extern struct i2c_adapter *nforce2_smbus;
31444
31445 static struct i2c_adapter *s4985_adapter;
31446-static struct i2c_algorithm *s4985_algo;
31447+static i2c_algorithm_no_const *s4985_algo;
31448
31449 /* Wrapper access functions for multiplexed SMBus */
31450 static DEFINE_MUTEX(nforce2_lock);
31451diff -urNp linux-2.6.32.46/drivers/ide/ide-cd.c linux-2.6.32.46/drivers/ide/ide-cd.c
31452--- linux-2.6.32.46/drivers/ide/ide-cd.c 2011-03-27 14:31:47.000000000 -0400
31453+++ linux-2.6.32.46/drivers/ide/ide-cd.c 2011-04-17 15:56:46.000000000 -0400
31454@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
31455 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
31456 if ((unsigned long)buf & alignment
31457 || blk_rq_bytes(rq) & q->dma_pad_mask
31458- || object_is_on_stack(buf))
31459+ || object_starts_on_stack(buf))
31460 drive->dma = 0;
31461 }
31462 }
31463diff -urNp linux-2.6.32.46/drivers/ide/ide-floppy.c linux-2.6.32.46/drivers/ide/ide-floppy.c
31464--- linux-2.6.32.46/drivers/ide/ide-floppy.c 2011-03-27 14:31:47.000000000 -0400
31465+++ linux-2.6.32.46/drivers/ide/ide-floppy.c 2011-05-16 21:46:57.000000000 -0400
31466@@ -373,6 +373,8 @@ static int ide_floppy_get_capacity(ide_d
31467 u8 pc_buf[256], header_len, desc_cnt;
31468 int i, rc = 1, blocks, length;
31469
31470+ pax_track_stack();
31471+
31472 ide_debug_log(IDE_DBG_FUNC, "enter");
31473
31474 drive->bios_cyl = 0;
31475diff -urNp linux-2.6.32.46/drivers/ide/setup-pci.c linux-2.6.32.46/drivers/ide/setup-pci.c
31476--- linux-2.6.32.46/drivers/ide/setup-pci.c 2011-03-27 14:31:47.000000000 -0400
31477+++ linux-2.6.32.46/drivers/ide/setup-pci.c 2011-05-16 21:46:57.000000000 -0400
31478@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
31479 int ret, i, n_ports = dev2 ? 4 : 2;
31480 struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
31481
31482+ pax_track_stack();
31483+
31484 for (i = 0; i < n_ports / 2; i++) {
31485 ret = ide_setup_pci_controller(pdev[i], d, !i);
31486 if (ret < 0)
31487diff -urNp linux-2.6.32.46/drivers/ieee1394/dv1394.c linux-2.6.32.46/drivers/ieee1394/dv1394.c
31488--- linux-2.6.32.46/drivers/ieee1394/dv1394.c 2011-03-27 14:31:47.000000000 -0400
31489+++ linux-2.6.32.46/drivers/ieee1394/dv1394.c 2011-04-23 12:56:11.000000000 -0400
31490@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
31491 based upon DIF section and sequence
31492 */
31493
31494-static void inline
31495+static inline void
31496 frame_put_packet (struct frame *f, struct packet *p)
31497 {
31498 int section_type = p->data[0] >> 5; /* section type is in bits 5 - 7 */
31499diff -urNp linux-2.6.32.46/drivers/ieee1394/hosts.c linux-2.6.32.46/drivers/ieee1394/hosts.c
31500--- linux-2.6.32.46/drivers/ieee1394/hosts.c 2011-03-27 14:31:47.000000000 -0400
31501+++ linux-2.6.32.46/drivers/ieee1394/hosts.c 2011-04-17 15:56:46.000000000 -0400
31502@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
31503 }
31504
31505 static struct hpsb_host_driver dummy_driver = {
31506+ .name = "dummy",
31507 .transmit_packet = dummy_transmit_packet,
31508 .devctl = dummy_devctl,
31509 .isoctl = dummy_isoctl
31510diff -urNp linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c
31511--- linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c 2011-03-27 14:31:47.000000000 -0400
31512+++ linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c 2011-04-17 15:56:46.000000000 -0400
31513@@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con
31514 for (func = 0; func < 8; func++) {
31515 u32 class = read_pci_config(num,slot,func,
31516 PCI_CLASS_REVISION);
31517- if ((class == 0xffffffff))
31518+ if (class == 0xffffffff)
31519 continue; /* No device at this func */
31520
31521 if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI)
31522diff -urNp linux-2.6.32.46/drivers/ieee1394/ohci1394.c linux-2.6.32.46/drivers/ieee1394/ohci1394.c
31523--- linux-2.6.32.46/drivers/ieee1394/ohci1394.c 2011-03-27 14:31:47.000000000 -0400
31524+++ linux-2.6.32.46/drivers/ieee1394/ohci1394.c 2011-04-23 12:56:11.000000000 -0400
31525@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
31526 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
31527
31528 /* Module Parameters */
31529-static int phys_dma = 1;
31530+static int phys_dma;
31531 module_param(phys_dma, int, 0444);
31532-MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 1).");
31533+MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 0).");
31534
31535 static void dma_trm_tasklet(unsigned long data);
31536 static void dma_trm_reset(struct dma_trm_ctx *d);
31537diff -urNp linux-2.6.32.46/drivers/ieee1394/sbp2.c linux-2.6.32.46/drivers/ieee1394/sbp2.c
31538--- linux-2.6.32.46/drivers/ieee1394/sbp2.c 2011-03-27 14:31:47.000000000 -0400
31539+++ linux-2.6.32.46/drivers/ieee1394/sbp2.c 2011-04-23 12:56:11.000000000 -0400
31540@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
31541 MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
31542 MODULE_LICENSE("GPL");
31543
31544-static int sbp2_module_init(void)
31545+static int __init sbp2_module_init(void)
31546 {
31547 int ret;
31548
31549diff -urNp linux-2.6.32.46/drivers/infiniband/core/cm.c linux-2.6.32.46/drivers/infiniband/core/cm.c
31550--- linux-2.6.32.46/drivers/infiniband/core/cm.c 2011-03-27 14:31:47.000000000 -0400
31551+++ linux-2.6.32.46/drivers/infiniband/core/cm.c 2011-04-17 15:56:46.000000000 -0400
31552@@ -112,7 +112,7 @@ static char const counter_group_names[CM
31553
31554 struct cm_counter_group {
31555 struct kobject obj;
31556- atomic_long_t counter[CM_ATTR_COUNT];
31557+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
31558 };
31559
31560 struct cm_counter_attribute {
31561@@ -1386,7 +1386,7 @@ static void cm_dup_req_handler(struct cm
31562 struct ib_mad_send_buf *msg = NULL;
31563 int ret;
31564
31565- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31566+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31567 counter[CM_REQ_COUNTER]);
31568
31569 /* Quick state check to discard duplicate REQs. */
31570@@ -1764,7 +1764,7 @@ static void cm_dup_rep_handler(struct cm
31571 if (!cm_id_priv)
31572 return;
31573
31574- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31575+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31576 counter[CM_REP_COUNTER]);
31577 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
31578 if (ret)
31579@@ -1931,7 +1931,7 @@ static int cm_rtu_handler(struct cm_work
31580 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
31581 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
31582 spin_unlock_irq(&cm_id_priv->lock);
31583- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31584+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31585 counter[CM_RTU_COUNTER]);
31586 goto out;
31587 }
31588@@ -2110,7 +2110,7 @@ static int cm_dreq_handler(struct cm_wor
31589 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
31590 dreq_msg->local_comm_id);
31591 if (!cm_id_priv) {
31592- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31593+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31594 counter[CM_DREQ_COUNTER]);
31595 cm_issue_drep(work->port, work->mad_recv_wc);
31596 return -EINVAL;
31597@@ -2131,7 +2131,7 @@ static int cm_dreq_handler(struct cm_wor
31598 case IB_CM_MRA_REP_RCVD:
31599 break;
31600 case IB_CM_TIMEWAIT:
31601- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31602+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31603 counter[CM_DREQ_COUNTER]);
31604 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
31605 goto unlock;
31606@@ -2145,7 +2145,7 @@ static int cm_dreq_handler(struct cm_wor
31607 cm_free_msg(msg);
31608 goto deref;
31609 case IB_CM_DREQ_RCVD:
31610- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31611+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31612 counter[CM_DREQ_COUNTER]);
31613 goto unlock;
31614 default:
31615@@ -2501,7 +2501,7 @@ static int cm_mra_handler(struct cm_work
31616 ib_modify_mad(cm_id_priv->av.port->mad_agent,
31617 cm_id_priv->msg, timeout)) {
31618 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
31619- atomic_long_inc(&work->port->
31620+ atomic_long_inc_unchecked(&work->port->
31621 counter_group[CM_RECV_DUPLICATES].
31622 counter[CM_MRA_COUNTER]);
31623 goto out;
31624@@ -2510,7 +2510,7 @@ static int cm_mra_handler(struct cm_work
31625 break;
31626 case IB_CM_MRA_REQ_RCVD:
31627 case IB_CM_MRA_REP_RCVD:
31628- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31629+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31630 counter[CM_MRA_COUNTER]);
31631 /* fall through */
31632 default:
31633@@ -2672,7 +2672,7 @@ static int cm_lap_handler(struct cm_work
31634 case IB_CM_LAP_IDLE:
31635 break;
31636 case IB_CM_MRA_LAP_SENT:
31637- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31638+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31639 counter[CM_LAP_COUNTER]);
31640 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
31641 goto unlock;
31642@@ -2688,7 +2688,7 @@ static int cm_lap_handler(struct cm_work
31643 cm_free_msg(msg);
31644 goto deref;
31645 case IB_CM_LAP_RCVD:
31646- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31647+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31648 counter[CM_LAP_COUNTER]);
31649 goto unlock;
31650 default:
31651@@ -2972,7 +2972,7 @@ static int cm_sidr_req_handler(struct cm
31652 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
31653 if (cur_cm_id_priv) {
31654 spin_unlock_irq(&cm.lock);
31655- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31656+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31657 counter[CM_SIDR_REQ_COUNTER]);
31658 goto out; /* Duplicate message. */
31659 }
31660@@ -3184,10 +3184,10 @@ static void cm_send_handler(struct ib_ma
31661 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
31662 msg->retries = 1;
31663
31664- atomic_long_add(1 + msg->retries,
31665+ atomic_long_add_unchecked(1 + msg->retries,
31666 &port->counter_group[CM_XMIT].counter[attr_index]);
31667 if (msg->retries)
31668- atomic_long_add(msg->retries,
31669+ atomic_long_add_unchecked(msg->retries,
31670 &port->counter_group[CM_XMIT_RETRIES].
31671 counter[attr_index]);
31672
31673@@ -3397,7 +3397,7 @@ static void cm_recv_handler(struct ib_ma
31674 }
31675
31676 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
31677- atomic_long_inc(&port->counter_group[CM_RECV].
31678+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
31679 counter[attr_id - CM_ATTR_ID_OFFSET]);
31680
31681 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
31682@@ -3595,10 +3595,10 @@ static ssize_t cm_show_counter(struct ko
31683 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
31684
31685 return sprintf(buf, "%ld\n",
31686- atomic_long_read(&group->counter[cm_attr->index]));
31687+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
31688 }
31689
31690-static struct sysfs_ops cm_counter_ops = {
31691+static const struct sysfs_ops cm_counter_ops = {
31692 .show = cm_show_counter
31693 };
31694
31695diff -urNp linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c
31696--- linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c 2011-03-27 14:31:47.000000000 -0400
31697+++ linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c 2011-05-04 17:56:28.000000000 -0400
31698@@ -97,8 +97,8 @@ struct ib_fmr_pool {
31699
31700 struct task_struct *thread;
31701
31702- atomic_t req_ser;
31703- atomic_t flush_ser;
31704+ atomic_unchecked_t req_ser;
31705+ atomic_unchecked_t flush_ser;
31706
31707 wait_queue_head_t force_wait;
31708 };
31709@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *p
31710 struct ib_fmr_pool *pool = pool_ptr;
31711
31712 do {
31713- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
31714+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
31715 ib_fmr_batch_release(pool);
31716
31717- atomic_inc(&pool->flush_ser);
31718+ atomic_inc_unchecked(&pool->flush_ser);
31719 wake_up_interruptible(&pool->force_wait);
31720
31721 if (pool->flush_function)
31722@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *p
31723 }
31724
31725 set_current_state(TASK_INTERRUPTIBLE);
31726- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
31727+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
31728 !kthread_should_stop())
31729 schedule();
31730 __set_current_state(TASK_RUNNING);
31731@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(s
31732 pool->dirty_watermark = params->dirty_watermark;
31733 pool->dirty_len = 0;
31734 spin_lock_init(&pool->pool_lock);
31735- atomic_set(&pool->req_ser, 0);
31736- atomic_set(&pool->flush_ser, 0);
31737+ atomic_set_unchecked(&pool->req_ser, 0);
31738+ atomic_set_unchecked(&pool->flush_ser, 0);
31739 init_waitqueue_head(&pool->force_wait);
31740
31741 pool->thread = kthread_run(ib_fmr_cleanup_thread,
31742@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool
31743 }
31744 spin_unlock_irq(&pool->pool_lock);
31745
31746- serial = atomic_inc_return(&pool->req_ser);
31747+ serial = atomic_inc_return_unchecked(&pool->req_ser);
31748 wake_up_process(pool->thread);
31749
31750 if (wait_event_interruptible(pool->force_wait,
31751- atomic_read(&pool->flush_ser) - serial >= 0))
31752+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
31753 return -EINTR;
31754
31755 return 0;
31756@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr
31757 } else {
31758 list_add_tail(&fmr->list, &pool->dirty_list);
31759 if (++pool->dirty_len >= pool->dirty_watermark) {
31760- atomic_inc(&pool->req_ser);
31761+ atomic_inc_unchecked(&pool->req_ser);
31762 wake_up_process(pool->thread);
31763 }
31764 }
31765diff -urNp linux-2.6.32.46/drivers/infiniband/core/sysfs.c linux-2.6.32.46/drivers/infiniband/core/sysfs.c
31766--- linux-2.6.32.46/drivers/infiniband/core/sysfs.c 2011-03-27 14:31:47.000000000 -0400
31767+++ linux-2.6.32.46/drivers/infiniband/core/sysfs.c 2011-04-17 15:56:46.000000000 -0400
31768@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
31769 return port_attr->show(p, port_attr, buf);
31770 }
31771
31772-static struct sysfs_ops port_sysfs_ops = {
31773+static const struct sysfs_ops port_sysfs_ops = {
31774 .show = port_attr_show
31775 };
31776
31777diff -urNp linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c
31778--- linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c 2011-03-27 14:31:47.000000000 -0400
31779+++ linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c 2011-04-17 15:56:46.000000000 -0400
31780@@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u
31781 dst->grh.sgid_index = src->grh.sgid_index;
31782 dst->grh.hop_limit = src->grh.hop_limit;
31783 dst->grh.traffic_class = src->grh.traffic_class;
31784+ memset(&dst->grh.reserved, 0, sizeof(dst->grh.reserved));
31785 dst->dlid = src->dlid;
31786 dst->sl = src->sl;
31787 dst->src_path_bits = src->src_path_bits;
31788 dst->static_rate = src->static_rate;
31789 dst->is_global = src->ah_flags & IB_AH_GRH ? 1 : 0;
31790 dst->port_num = src->port_num;
31791+ dst->reserved = 0;
31792 }
31793 EXPORT_SYMBOL(ib_copy_ah_attr_to_user);
31794
31795 void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
31796 struct ib_qp_attr *src)
31797 {
31798+ dst->qp_state = src->qp_state;
31799 dst->cur_qp_state = src->cur_qp_state;
31800 dst->path_mtu = src->path_mtu;
31801 dst->path_mig_state = src->path_mig_state;
31802@@ -83,6 +86,7 @@ void ib_copy_qp_attr_to_user(struct ib_u
31803 dst->rnr_retry = src->rnr_retry;
31804 dst->alt_port_num = src->alt_port_num;
31805 dst->alt_timeout = src->alt_timeout;
31806+ memset(dst->reserved, 0, sizeof(dst->reserved));
31807 }
31808 EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
31809
31810diff -urNp linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c
31811--- linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c 2011-03-27 14:31:47.000000000 -0400
31812+++ linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-16 21:46:57.000000000 -0400
31813@@ -110,6 +110,8 @@ static ssize_t atomic_counters_read(stru
31814 struct infinipath_counters counters;
31815 struct ipath_devdata *dd;
31816
31817+ pax_track_stack();
31818+
31819 dd = file->f_path.dentry->d_inode->i_private;
31820 dd->ipath_f_read_counters(dd, &counters);
31821
31822diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c
31823--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c 2011-03-27 14:31:47.000000000 -0400
31824+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c 2011-05-04 17:56:28.000000000 -0400
31825@@ -102,7 +102,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
31826 LIST_HEAD(nes_adapter_list);
31827 static LIST_HEAD(nes_dev_list);
31828
31829-atomic_t qps_destroyed;
31830+atomic_unchecked_t qps_destroyed;
31831
31832 static unsigned int ee_flsh_adapter;
31833 static unsigned int sysfs_nonidx_addr;
31834@@ -259,7 +259,7 @@ static void nes_cqp_rem_ref_callback(str
31835 struct nes_adapter *nesadapter = nesdev->nesadapter;
31836 u32 qp_id;
31837
31838- atomic_inc(&qps_destroyed);
31839+ atomic_inc_unchecked(&qps_destroyed);
31840
31841 /* Free the control structures */
31842
31843diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c
31844--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c 2011-03-27 14:31:47.000000000 -0400
31845+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c 2011-05-04 17:56:28.000000000 -0400
31846@@ -69,11 +69,11 @@ u32 cm_packets_received;
31847 u32 cm_listens_created;
31848 u32 cm_listens_destroyed;
31849 u32 cm_backlog_drops;
31850-atomic_t cm_loopbacks;
31851-atomic_t cm_nodes_created;
31852-atomic_t cm_nodes_destroyed;
31853-atomic_t cm_accel_dropped_pkts;
31854-atomic_t cm_resets_recvd;
31855+atomic_unchecked_t cm_loopbacks;
31856+atomic_unchecked_t cm_nodes_created;
31857+atomic_unchecked_t cm_nodes_destroyed;
31858+atomic_unchecked_t cm_accel_dropped_pkts;
31859+atomic_unchecked_t cm_resets_recvd;
31860
31861 static inline int mini_cm_accelerated(struct nes_cm_core *,
31862 struct nes_cm_node *);
31863@@ -149,13 +149,13 @@ static struct nes_cm_ops nes_cm_api = {
31864
31865 static struct nes_cm_core *g_cm_core;
31866
31867-atomic_t cm_connects;
31868-atomic_t cm_accepts;
31869-atomic_t cm_disconnects;
31870-atomic_t cm_closes;
31871-atomic_t cm_connecteds;
31872-atomic_t cm_connect_reqs;
31873-atomic_t cm_rejects;
31874+atomic_unchecked_t cm_connects;
31875+atomic_unchecked_t cm_accepts;
31876+atomic_unchecked_t cm_disconnects;
31877+atomic_unchecked_t cm_closes;
31878+atomic_unchecked_t cm_connecteds;
31879+atomic_unchecked_t cm_connect_reqs;
31880+atomic_unchecked_t cm_rejects;
31881
31882
31883 /**
31884@@ -1195,7 +1195,7 @@ static struct nes_cm_node *make_cm_node(
31885 cm_node->rem_mac);
31886
31887 add_hte_node(cm_core, cm_node);
31888- atomic_inc(&cm_nodes_created);
31889+ atomic_inc_unchecked(&cm_nodes_created);
31890
31891 return cm_node;
31892 }
31893@@ -1253,7 +1253,7 @@ static int rem_ref_cm_node(struct nes_cm
31894 }
31895
31896 atomic_dec(&cm_core->node_cnt);
31897- atomic_inc(&cm_nodes_destroyed);
31898+ atomic_inc_unchecked(&cm_nodes_destroyed);
31899 nesqp = cm_node->nesqp;
31900 if (nesqp) {
31901 nesqp->cm_node = NULL;
31902@@ -1320,7 +1320,7 @@ static int process_options(struct nes_cm
31903
31904 static void drop_packet(struct sk_buff *skb)
31905 {
31906- atomic_inc(&cm_accel_dropped_pkts);
31907+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
31908 dev_kfree_skb_any(skb);
31909 }
31910
31911@@ -1377,7 +1377,7 @@ static void handle_rst_pkt(struct nes_cm
31912
31913 int reset = 0; /* whether to send reset in case of err.. */
31914 int passive_state;
31915- atomic_inc(&cm_resets_recvd);
31916+ atomic_inc_unchecked(&cm_resets_recvd);
31917 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
31918 " refcnt=%d\n", cm_node, cm_node->state,
31919 atomic_read(&cm_node->ref_count));
31920@@ -2000,7 +2000,7 @@ static struct nes_cm_node *mini_cm_conne
31921 rem_ref_cm_node(cm_node->cm_core, cm_node);
31922 return NULL;
31923 }
31924- atomic_inc(&cm_loopbacks);
31925+ atomic_inc_unchecked(&cm_loopbacks);
31926 loopbackremotenode->loopbackpartner = cm_node;
31927 loopbackremotenode->tcp_cntxt.rcv_wscale =
31928 NES_CM_DEFAULT_RCV_WND_SCALE;
31929@@ -2262,7 +2262,7 @@ static int mini_cm_recv_pkt(struct nes_c
31930 add_ref_cm_node(cm_node);
31931 } else if (cm_node->state == NES_CM_STATE_TSA) {
31932 rem_ref_cm_node(cm_core, cm_node);
31933- atomic_inc(&cm_accel_dropped_pkts);
31934+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
31935 dev_kfree_skb_any(skb);
31936 break;
31937 }
31938@@ -2568,7 +2568,7 @@ static int nes_cm_disconn_true(struct ne
31939
31940 if ((cm_id) && (cm_id->event_handler)) {
31941 if (issue_disconn) {
31942- atomic_inc(&cm_disconnects);
31943+ atomic_inc_unchecked(&cm_disconnects);
31944 cm_event.event = IW_CM_EVENT_DISCONNECT;
31945 cm_event.status = disconn_status;
31946 cm_event.local_addr = cm_id->local_addr;
31947@@ -2590,7 +2590,7 @@ static int nes_cm_disconn_true(struct ne
31948 }
31949
31950 if (issue_close) {
31951- atomic_inc(&cm_closes);
31952+ atomic_inc_unchecked(&cm_closes);
31953 nes_disconnect(nesqp, 1);
31954
31955 cm_id->provider_data = nesqp;
31956@@ -2710,7 +2710,7 @@ int nes_accept(struct iw_cm_id *cm_id, s
31957
31958 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
31959 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
31960- atomic_inc(&cm_accepts);
31961+ atomic_inc_unchecked(&cm_accepts);
31962
31963 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
31964 atomic_read(&nesvnic->netdev->refcnt));
31965@@ -2919,7 +2919,7 @@ int nes_reject(struct iw_cm_id *cm_id, c
31966
31967 struct nes_cm_core *cm_core;
31968
31969- atomic_inc(&cm_rejects);
31970+ atomic_inc_unchecked(&cm_rejects);
31971 cm_node = (struct nes_cm_node *) cm_id->provider_data;
31972 loopback = cm_node->loopbackpartner;
31973 cm_core = cm_node->cm_core;
31974@@ -2982,7 +2982,7 @@ int nes_connect(struct iw_cm_id *cm_id,
31975 ntohl(cm_id->local_addr.sin_addr.s_addr),
31976 ntohs(cm_id->local_addr.sin_port));
31977
31978- atomic_inc(&cm_connects);
31979+ atomic_inc_unchecked(&cm_connects);
31980 nesqp->active_conn = 1;
31981
31982 /* cache the cm_id in the qp */
31983@@ -3195,7 +3195,7 @@ static void cm_event_connected(struct ne
31984 if (nesqp->destroyed) {
31985 return;
31986 }
31987- atomic_inc(&cm_connecteds);
31988+ atomic_inc_unchecked(&cm_connecteds);
31989 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
31990 " local port 0x%04X. jiffies = %lu.\n",
31991 nesqp->hwqp.qp_id,
31992@@ -3403,7 +3403,7 @@ static void cm_event_reset(struct nes_cm
31993
31994 ret = cm_id->event_handler(cm_id, &cm_event);
31995 cm_id->add_ref(cm_id);
31996- atomic_inc(&cm_closes);
31997+ atomic_inc_unchecked(&cm_closes);
31998 cm_event.event = IW_CM_EVENT_CLOSE;
31999 cm_event.status = IW_CM_EVENT_STATUS_OK;
32000 cm_event.provider_data = cm_id->provider_data;
32001@@ -3439,7 +3439,7 @@ static void cm_event_mpa_req(struct nes_
32002 return;
32003 cm_id = cm_node->cm_id;
32004
32005- atomic_inc(&cm_connect_reqs);
32006+ atomic_inc_unchecked(&cm_connect_reqs);
32007 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32008 cm_node, cm_id, jiffies);
32009
32010@@ -3477,7 +3477,7 @@ static void cm_event_mpa_reject(struct n
32011 return;
32012 cm_id = cm_node->cm_id;
32013
32014- atomic_inc(&cm_connect_reqs);
32015+ atomic_inc_unchecked(&cm_connect_reqs);
32016 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32017 cm_node, cm_id, jiffies);
32018
32019diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h
32020--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h 2011-03-27 14:31:47.000000000 -0400
32021+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h 2011-05-04 17:56:28.000000000 -0400
32022@@ -174,17 +174,17 @@ extern unsigned int nes_debug_level;
32023 extern unsigned int wqm_quanta;
32024 extern struct list_head nes_adapter_list;
32025
32026-extern atomic_t cm_connects;
32027-extern atomic_t cm_accepts;
32028-extern atomic_t cm_disconnects;
32029-extern atomic_t cm_closes;
32030-extern atomic_t cm_connecteds;
32031-extern atomic_t cm_connect_reqs;
32032-extern atomic_t cm_rejects;
32033-extern atomic_t mod_qp_timouts;
32034-extern atomic_t qps_created;
32035-extern atomic_t qps_destroyed;
32036-extern atomic_t sw_qps_destroyed;
32037+extern atomic_unchecked_t cm_connects;
32038+extern atomic_unchecked_t cm_accepts;
32039+extern atomic_unchecked_t cm_disconnects;
32040+extern atomic_unchecked_t cm_closes;
32041+extern atomic_unchecked_t cm_connecteds;
32042+extern atomic_unchecked_t cm_connect_reqs;
32043+extern atomic_unchecked_t cm_rejects;
32044+extern atomic_unchecked_t mod_qp_timouts;
32045+extern atomic_unchecked_t qps_created;
32046+extern atomic_unchecked_t qps_destroyed;
32047+extern atomic_unchecked_t sw_qps_destroyed;
32048 extern u32 mh_detected;
32049 extern u32 mh_pauses_sent;
32050 extern u32 cm_packets_sent;
32051@@ -196,11 +196,11 @@ extern u32 cm_packets_retrans;
32052 extern u32 cm_listens_created;
32053 extern u32 cm_listens_destroyed;
32054 extern u32 cm_backlog_drops;
32055-extern atomic_t cm_loopbacks;
32056-extern atomic_t cm_nodes_created;
32057-extern atomic_t cm_nodes_destroyed;
32058-extern atomic_t cm_accel_dropped_pkts;
32059-extern atomic_t cm_resets_recvd;
32060+extern atomic_unchecked_t cm_loopbacks;
32061+extern atomic_unchecked_t cm_nodes_created;
32062+extern atomic_unchecked_t cm_nodes_destroyed;
32063+extern atomic_unchecked_t cm_accel_dropped_pkts;
32064+extern atomic_unchecked_t cm_resets_recvd;
32065
32066 extern u32 int_mod_timer_init;
32067 extern u32 int_mod_cq_depth_256;
32068diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c
32069--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c 2011-03-27 14:31:47.000000000 -0400
32070+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c 2011-05-04 17:56:28.000000000 -0400
32071@@ -1210,17 +1210,17 @@ static void nes_netdev_get_ethtool_stats
32072 target_stat_values[++index] = mh_detected;
32073 target_stat_values[++index] = mh_pauses_sent;
32074 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
32075- target_stat_values[++index] = atomic_read(&cm_connects);
32076- target_stat_values[++index] = atomic_read(&cm_accepts);
32077- target_stat_values[++index] = atomic_read(&cm_disconnects);
32078- target_stat_values[++index] = atomic_read(&cm_connecteds);
32079- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
32080- target_stat_values[++index] = atomic_read(&cm_rejects);
32081- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
32082- target_stat_values[++index] = atomic_read(&qps_created);
32083- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
32084- target_stat_values[++index] = atomic_read(&qps_destroyed);
32085- target_stat_values[++index] = atomic_read(&cm_closes);
32086+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
32087+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
32088+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
32089+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
32090+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
32091+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
32092+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
32093+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
32094+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
32095+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
32096+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
32097 target_stat_values[++index] = cm_packets_sent;
32098 target_stat_values[++index] = cm_packets_bounced;
32099 target_stat_values[++index] = cm_packets_created;
32100@@ -1230,11 +1230,11 @@ static void nes_netdev_get_ethtool_stats
32101 target_stat_values[++index] = cm_listens_created;
32102 target_stat_values[++index] = cm_listens_destroyed;
32103 target_stat_values[++index] = cm_backlog_drops;
32104- target_stat_values[++index] = atomic_read(&cm_loopbacks);
32105- target_stat_values[++index] = atomic_read(&cm_nodes_created);
32106- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
32107- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
32108- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
32109+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
32110+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
32111+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
32112+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
32113+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
32114 target_stat_values[++index] = int_mod_timer_init;
32115 target_stat_values[++index] = int_mod_cq_depth_1;
32116 target_stat_values[++index] = int_mod_cq_depth_4;
32117diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c
32118--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c 2011-03-27 14:31:47.000000000 -0400
32119+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-04 17:56:28.000000000 -0400
32120@@ -45,9 +45,9 @@
32121
32122 #include <rdma/ib_umem.h>
32123
32124-atomic_t mod_qp_timouts;
32125-atomic_t qps_created;
32126-atomic_t sw_qps_destroyed;
32127+atomic_unchecked_t mod_qp_timouts;
32128+atomic_unchecked_t qps_created;
32129+atomic_unchecked_t sw_qps_destroyed;
32130
32131 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
32132
32133@@ -1240,7 +1240,7 @@ static struct ib_qp *nes_create_qp(struc
32134 if (init_attr->create_flags)
32135 return ERR_PTR(-EINVAL);
32136
32137- atomic_inc(&qps_created);
32138+ atomic_inc_unchecked(&qps_created);
32139 switch (init_attr->qp_type) {
32140 case IB_QPT_RC:
32141 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
32142@@ -1568,7 +1568,7 @@ static int nes_destroy_qp(struct ib_qp *
32143 struct iw_cm_event cm_event;
32144 int ret;
32145
32146- atomic_inc(&sw_qps_destroyed);
32147+ atomic_inc_unchecked(&sw_qps_destroyed);
32148 nesqp->destroyed = 1;
32149
32150 /* Blow away the connection if it exists. */
32151diff -urNp linux-2.6.32.46/drivers/input/gameport/gameport.c linux-2.6.32.46/drivers/input/gameport/gameport.c
32152--- linux-2.6.32.46/drivers/input/gameport/gameport.c 2011-03-27 14:31:47.000000000 -0400
32153+++ linux-2.6.32.46/drivers/input/gameport/gameport.c 2011-05-04 17:56:28.000000000 -0400
32154@@ -515,13 +515,13 @@ EXPORT_SYMBOL(gameport_set_phys);
32155 */
32156 static void gameport_init_port(struct gameport *gameport)
32157 {
32158- static atomic_t gameport_no = ATOMIC_INIT(0);
32159+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
32160
32161 __module_get(THIS_MODULE);
32162
32163 mutex_init(&gameport->drv_mutex);
32164 device_initialize(&gameport->dev);
32165- dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1);
32166+ dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
32167 gameport->dev.bus = &gameport_bus;
32168 gameport->dev.release = gameport_release_port;
32169 if (gameport->parent)
32170diff -urNp linux-2.6.32.46/drivers/input/input.c linux-2.6.32.46/drivers/input/input.c
32171--- linux-2.6.32.46/drivers/input/input.c 2011-03-27 14:31:47.000000000 -0400
32172+++ linux-2.6.32.46/drivers/input/input.c 2011-05-04 17:56:28.000000000 -0400
32173@@ -1558,7 +1558,7 @@ EXPORT_SYMBOL(input_set_capability);
32174 */
32175 int input_register_device(struct input_dev *dev)
32176 {
32177- static atomic_t input_no = ATOMIC_INIT(0);
32178+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
32179 struct input_handler *handler;
32180 const char *path;
32181 int error;
32182@@ -1585,7 +1585,7 @@ int input_register_device(struct input_d
32183 dev->setkeycode = input_default_setkeycode;
32184
32185 dev_set_name(&dev->dev, "input%ld",
32186- (unsigned long) atomic_inc_return(&input_no) - 1);
32187+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
32188
32189 error = device_add(&dev->dev);
32190 if (error)
32191diff -urNp linux-2.6.32.46/drivers/input/joystick/sidewinder.c linux-2.6.32.46/drivers/input/joystick/sidewinder.c
32192--- linux-2.6.32.46/drivers/input/joystick/sidewinder.c 2011-03-27 14:31:47.000000000 -0400
32193+++ linux-2.6.32.46/drivers/input/joystick/sidewinder.c 2011-05-18 20:09:36.000000000 -0400
32194@@ -30,6 +30,7 @@
32195 #include <linux/kernel.h>
32196 #include <linux/module.h>
32197 #include <linux/slab.h>
32198+#include <linux/sched.h>
32199 #include <linux/init.h>
32200 #include <linux/input.h>
32201 #include <linux/gameport.h>
32202@@ -428,6 +429,8 @@ static int sw_read(struct sw *sw)
32203 unsigned char buf[SW_LENGTH];
32204 int i;
32205
32206+ pax_track_stack();
32207+
32208 i = sw_read_packet(sw->gameport, buf, sw->length, 0);
32209
32210 if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */
32211diff -urNp linux-2.6.32.46/drivers/input/joystick/xpad.c linux-2.6.32.46/drivers/input/joystick/xpad.c
32212--- linux-2.6.32.46/drivers/input/joystick/xpad.c 2011-03-27 14:31:47.000000000 -0400
32213+++ linux-2.6.32.46/drivers/input/joystick/xpad.c 2011-05-04 17:56:28.000000000 -0400
32214@@ -621,7 +621,7 @@ static void xpad_led_set(struct led_clas
32215
32216 static int xpad_led_probe(struct usb_xpad *xpad)
32217 {
32218- static atomic_t led_seq = ATOMIC_INIT(0);
32219+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
32220 long led_no;
32221 struct xpad_led *led;
32222 struct led_classdev *led_cdev;
32223@@ -634,7 +634,7 @@ static int xpad_led_probe(struct usb_xpa
32224 if (!led)
32225 return -ENOMEM;
32226
32227- led_no = (long)atomic_inc_return(&led_seq) - 1;
32228+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
32229
32230 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
32231 led->xpad = xpad;
32232diff -urNp linux-2.6.32.46/drivers/input/serio/serio.c linux-2.6.32.46/drivers/input/serio/serio.c
32233--- linux-2.6.32.46/drivers/input/serio/serio.c 2011-03-27 14:31:47.000000000 -0400
32234+++ linux-2.6.32.46/drivers/input/serio/serio.c 2011-05-04 17:56:28.000000000 -0400
32235@@ -527,7 +527,7 @@ static void serio_release_port(struct de
32236 */
32237 static void serio_init_port(struct serio *serio)
32238 {
32239- static atomic_t serio_no = ATOMIC_INIT(0);
32240+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
32241
32242 __module_get(THIS_MODULE);
32243
32244@@ -536,7 +536,7 @@ static void serio_init_port(struct serio
32245 mutex_init(&serio->drv_mutex);
32246 device_initialize(&serio->dev);
32247 dev_set_name(&serio->dev, "serio%ld",
32248- (long)atomic_inc_return(&serio_no) - 1);
32249+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
32250 serio->dev.bus = &serio_bus;
32251 serio->dev.release = serio_release_port;
32252 if (serio->parent) {
32253diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/common.c linux-2.6.32.46/drivers/isdn/gigaset/common.c
32254--- linux-2.6.32.46/drivers/isdn/gigaset/common.c 2011-03-27 14:31:47.000000000 -0400
32255+++ linux-2.6.32.46/drivers/isdn/gigaset/common.c 2011-04-17 15:56:46.000000000 -0400
32256@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
32257 cs->commands_pending = 0;
32258 cs->cur_at_seq = 0;
32259 cs->gotfwver = -1;
32260- cs->open_count = 0;
32261+ local_set(&cs->open_count, 0);
32262 cs->dev = NULL;
32263 cs->tty = NULL;
32264 cs->tty_dev = NULL;
32265diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h
32266--- linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h 2011-03-27 14:31:47.000000000 -0400
32267+++ linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:56:46.000000000 -0400
32268@@ -34,6 +34,7 @@
32269 #include <linux/tty_driver.h>
32270 #include <linux/list.h>
32271 #include <asm/atomic.h>
32272+#include <asm/local.h>
32273
32274 #define GIG_VERSION {0,5,0,0}
32275 #define GIG_COMPAT {0,4,0,0}
32276@@ -446,7 +447,7 @@ struct cardstate {
32277 spinlock_t cmdlock;
32278 unsigned curlen, cmdbytes;
32279
32280- unsigned open_count;
32281+ local_t open_count;
32282 struct tty_struct *tty;
32283 struct tasklet_struct if_wake_tasklet;
32284 unsigned control_state;
32285diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/interface.c linux-2.6.32.46/drivers/isdn/gigaset/interface.c
32286--- linux-2.6.32.46/drivers/isdn/gigaset/interface.c 2011-03-27 14:31:47.000000000 -0400
32287+++ linux-2.6.32.46/drivers/isdn/gigaset/interface.c 2011-04-17 15:56:46.000000000 -0400
32288@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
32289 return -ERESTARTSYS; // FIXME -EINTR?
32290 tty->driver_data = cs;
32291
32292- ++cs->open_count;
32293-
32294- if (cs->open_count == 1) {
32295+ if (local_inc_return(&cs->open_count) == 1) {
32296 spin_lock_irqsave(&cs->lock, flags);
32297 cs->tty = tty;
32298 spin_unlock_irqrestore(&cs->lock, flags);
32299@@ -195,10 +193,10 @@ static void if_close(struct tty_struct *
32300
32301 if (!cs->connected)
32302 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32303- else if (!cs->open_count)
32304+ else if (!local_read(&cs->open_count))
32305 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32306 else {
32307- if (!--cs->open_count) {
32308+ if (!local_dec_return(&cs->open_count)) {
32309 spin_lock_irqsave(&cs->lock, flags);
32310 cs->tty = NULL;
32311 spin_unlock_irqrestore(&cs->lock, flags);
32312@@ -233,7 +231,7 @@ static int if_ioctl(struct tty_struct *t
32313 if (!cs->connected) {
32314 gig_dbg(DEBUG_IF, "not connected");
32315 retval = -ENODEV;
32316- } else if (!cs->open_count)
32317+ } else if (!local_read(&cs->open_count))
32318 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32319 else {
32320 retval = 0;
32321@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *t
32322 if (!cs->connected) {
32323 gig_dbg(DEBUG_IF, "not connected");
32324 retval = -ENODEV;
32325- } else if (!cs->open_count)
32326+ } else if (!local_read(&cs->open_count))
32327 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32328 else if (cs->mstate != MS_LOCKED) {
32329 dev_warn(cs->dev, "can't write to unlocked device\n");
32330@@ -395,7 +393,7 @@ static int if_write_room(struct tty_stru
32331 if (!cs->connected) {
32332 gig_dbg(DEBUG_IF, "not connected");
32333 retval = -ENODEV;
32334- } else if (!cs->open_count)
32335+ } else if (!local_read(&cs->open_count))
32336 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32337 else if (cs->mstate != MS_LOCKED) {
32338 dev_warn(cs->dev, "can't write to unlocked device\n");
32339@@ -425,7 +423,7 @@ static int if_chars_in_buffer(struct tty
32340
32341 if (!cs->connected)
32342 gig_dbg(DEBUG_IF, "not connected");
32343- else if (!cs->open_count)
32344+ else if (!local_read(&cs->open_count))
32345 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32346 else if (cs->mstate != MS_LOCKED)
32347 dev_warn(cs->dev, "can't write to unlocked device\n");
32348@@ -453,7 +451,7 @@ static void if_throttle(struct tty_struc
32349
32350 if (!cs->connected)
32351 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32352- else if (!cs->open_count)
32353+ else if (!local_read(&cs->open_count))
32354 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32355 else {
32356 //FIXME
32357@@ -478,7 +476,7 @@ static void if_unthrottle(struct tty_str
32358
32359 if (!cs->connected)
32360 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32361- else if (!cs->open_count)
32362+ else if (!local_read(&cs->open_count))
32363 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32364 else {
32365 //FIXME
32366@@ -510,7 +508,7 @@ static void if_set_termios(struct tty_st
32367 goto out;
32368 }
32369
32370- if (!cs->open_count) {
32371+ if (!local_read(&cs->open_count)) {
32372 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32373 goto out;
32374 }
32375diff -urNp linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c
32376--- linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c 2011-03-27 14:31:47.000000000 -0400
32377+++ linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:56:46.000000000 -0400
32378@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
32379 }
32380 if (left) {
32381 if (t4file->user) {
32382- if (copy_from_user(buf, dp, left))
32383+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32384 return -EFAULT;
32385 } else {
32386 memcpy(buf, dp, left);
32387@@ -221,7 +221,7 @@ int b1_load_config(avmcard *card, capilo
32388 }
32389 if (left) {
32390 if (config->user) {
32391- if (copy_from_user(buf, dp, left))
32392+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32393 return -EFAULT;
32394 } else {
32395 memcpy(buf, dp, left);
32396diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c
32397--- linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c 2011-03-27 14:31:47.000000000 -0400
32398+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-16 21:46:57.000000000 -0400
32399@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
32400 byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
32401 short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
32402
32403+ pax_track_stack();
32404
32405 if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
32406 {
32407diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c
32408--- linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c 2011-03-27 14:31:47.000000000 -0400
32409+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c 2011-05-16 21:46:57.000000000 -0400
32410@@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
32411 IDI_SYNC_REQ req;
32412 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
32413
32414+ pax_track_stack();
32415+
32416 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
32417
32418 for (x = 0; x < MAX_DESCRIPTORS; x++) {
32419diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c
32420--- linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c 2011-03-27 14:31:47.000000000 -0400
32421+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-16 21:46:57.000000000 -0400
32422@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
32423 IDI_SYNC_REQ req;
32424 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
32425
32426+ pax_track_stack();
32427+
32428 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
32429
32430 for (x = 0; x < MAX_DESCRIPTORS; x++) {
32431diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c
32432--- linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c 2011-03-27 14:31:47.000000000 -0400
32433+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-16 21:46:57.000000000 -0400
32434@@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di
32435 IDI_SYNC_REQ req;
32436 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
32437
32438+ pax_track_stack();
32439+
32440 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
32441
32442 for (x = 0; x < MAX_DESCRIPTORS; x++) {
32443diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h
32444--- linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h 2011-03-27 14:31:47.000000000 -0400
32445+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h 2011-08-05 20:33:55.000000000 -0400
32446@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
32447 } diva_didd_add_adapter_t;
32448 typedef struct _diva_didd_remove_adapter {
32449 IDI_CALL p_request;
32450-} diva_didd_remove_adapter_t;
32451+} __no_const diva_didd_remove_adapter_t;
32452 typedef struct _diva_didd_read_adapter_array {
32453 void * buffer;
32454 dword length;
32455diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c
32456--- linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c 2011-03-27 14:31:47.000000000 -0400
32457+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c 2011-05-16 21:46:57.000000000 -0400
32458@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
32459 IDI_SYNC_REQ req;
32460 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
32461
32462+ pax_track_stack();
32463+
32464 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
32465
32466 for (x = 0; x < MAX_DESCRIPTORS; x++) {
32467diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c
32468--- linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c 2011-03-27 14:31:47.000000000 -0400
32469+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c 2011-05-16 21:46:57.000000000 -0400
32470@@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci)
32471 dword d;
32472 word w;
32473
32474+ pax_track_stack();
32475+
32476 a = plci->adapter;
32477 Id = ((word)plci->Id<<8)|a->Id;
32478 PUT_WORD(&SS_Ind[4],0x0000);
32479@@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE
32480 word j, n, w;
32481 dword d;
32482
32483+ pax_track_stack();
32484+
32485
32486 for(i=0;i<8;i++) bp_parms[i].length = 0;
32487 for(i=0;i<2;i++) global_config[i].length = 0;
32488@@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARS
32489 const byte llc3[] = {4,3,2,2,6,6,0};
32490 const byte header[] = {0,2,3,3,0,0,0};
32491
32492+ pax_track_stack();
32493+
32494 for(i=0;i<8;i++) bp_parms[i].length = 0;
32495 for(i=0;i<6;i++) b2_config_parms[i].length = 0;
32496 for(i=0;i<5;i++) b3_config_parms[i].length = 0;
32497@@ -14761,6 +14767,8 @@ static void group_optimization(DIVA_CAPI
32498 word appl_number_group_type[MAX_APPL];
32499 PLCI *auxplci;
32500
32501+ pax_track_stack();
32502+
32503 set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
32504
32505 if(!a->group_optimization_enabled)
32506diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c
32507--- linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c 2011-03-27 14:31:47.000000000 -0400
32508+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-16 21:46:57.000000000 -0400
32509@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
32510 IDI_SYNC_REQ req;
32511 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
32512
32513+ pax_track_stack();
32514+
32515 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
32516
32517 for (x = 0; x < MAX_DESCRIPTORS; x++) {
32518diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h
32519--- linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-03-27 14:31:47.000000000 -0400
32520+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-08-05 20:33:55.000000000 -0400
32521@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
32522 typedef struct _diva_os_idi_adapter_interface {
32523 diva_init_card_proc_t cleanup_adapter_proc;
32524 diva_cmd_card_proc_t cmd_proc;
32525-} diva_os_idi_adapter_interface_t;
32526+} __no_const diva_os_idi_adapter_interface_t;
32527
32528 typedef struct _diva_os_xdi_adapter {
32529 struct list_head link;
32530diff -urNp linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c
32531--- linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c 2011-03-27 14:31:47.000000000 -0400
32532+++ linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c 2011-05-16 21:46:57.000000000 -0400
32533@@ -1290,6 +1290,8 @@ isdn_ioctl(struct inode *inode, struct f
32534 } iocpar;
32535 void __user *argp = (void __user *)arg;
32536
32537+ pax_track_stack();
32538+
32539 #define name iocpar.name
32540 #define bname iocpar.bname
32541 #define iocts iocpar.iocts
32542diff -urNp linux-2.6.32.46/drivers/isdn/icn/icn.c linux-2.6.32.46/drivers/isdn/icn/icn.c
32543--- linux-2.6.32.46/drivers/isdn/icn/icn.c 2011-03-27 14:31:47.000000000 -0400
32544+++ linux-2.6.32.46/drivers/isdn/icn/icn.c 2011-04-17 15:56:46.000000000 -0400
32545@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
32546 if (count > len)
32547 count = len;
32548 if (user) {
32549- if (copy_from_user(msg, buf, count))
32550+ if (count > sizeof msg || copy_from_user(msg, buf, count))
32551 return -EFAULT;
32552 } else
32553 memcpy(msg, buf, count);
32554diff -urNp linux-2.6.32.46/drivers/isdn/mISDN/socket.c linux-2.6.32.46/drivers/isdn/mISDN/socket.c
32555--- linux-2.6.32.46/drivers/isdn/mISDN/socket.c 2011-03-27 14:31:47.000000000 -0400
32556+++ linux-2.6.32.46/drivers/isdn/mISDN/socket.c 2011-04-17 15:56:46.000000000 -0400
32557@@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns
32558 if (dev) {
32559 struct mISDN_devinfo di;
32560
32561+ memset(&di, 0, sizeof(di));
32562 di.id = dev->id;
32563 di.Dprotocols = dev->Dprotocols;
32564 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
32565@@ -671,6 +672,7 @@ base_sock_ioctl(struct socket *sock, uns
32566 if (dev) {
32567 struct mISDN_devinfo di;
32568
32569+ memset(&di, 0, sizeof(di));
32570 di.id = dev->id;
32571 di.Dprotocols = dev->Dprotocols;
32572 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
32573diff -urNp linux-2.6.32.46/drivers/isdn/sc/interrupt.c linux-2.6.32.46/drivers/isdn/sc/interrupt.c
32574--- linux-2.6.32.46/drivers/isdn/sc/interrupt.c 2011-03-27 14:31:47.000000000 -0400
32575+++ linux-2.6.32.46/drivers/isdn/sc/interrupt.c 2011-04-17 15:56:46.000000000 -0400
32576@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
32577 }
32578 else if(callid>=0x0000 && callid<=0x7FFF)
32579 {
32580+ int len;
32581+
32582 pr_debug("%s: Got Incoming Call\n",
32583 sc_adapter[card]->devicename);
32584- strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4]));
32585- strcpy(setup.eazmsn,
32586- sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn);
32587+ len = strlcpy(setup.phone, &(rcvmsg.msg_data.byte_array[4]),
32588+ sizeof(setup.phone));
32589+ if (len >= sizeof(setup.phone))
32590+ continue;
32591+ len = strlcpy(setup.eazmsn,
32592+ sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
32593+ sizeof(setup.eazmsn));
32594+ if (len >= sizeof(setup.eazmsn))
32595+ continue;
32596 setup.si1 = 7;
32597 setup.si2 = 0;
32598 setup.plan = 0;
32599@@ -176,7 +184,9 @@ irqreturn_t interrupt_handler(int dummy,
32600 * Handle a GetMyNumber Rsp
32601 */
32602 if (IS_CE_MESSAGE(rcvmsg,Call,0,GetMyNumber)){
32603- strcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg_data.byte_array);
32604+ strlcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
32605+ rcvmsg.msg_data.byte_array,
32606+ sizeof(rcvmsg.msg_data.byte_array));
32607 continue;
32608 }
32609
32610diff -urNp linux-2.6.32.46/drivers/lguest/core.c linux-2.6.32.46/drivers/lguest/core.c
32611--- linux-2.6.32.46/drivers/lguest/core.c 2011-03-27 14:31:47.000000000 -0400
32612+++ linux-2.6.32.46/drivers/lguest/core.c 2011-04-17 15:56:46.000000000 -0400
32613@@ -91,9 +91,17 @@ static __init int map_switcher(void)
32614 * it's worked so far. The end address needs +1 because __get_vm_area
32615 * allocates an extra guard page, so we need space for that.
32616 */
32617+
32618+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32619+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
32620+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
32621+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
32622+#else
32623 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
32624 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
32625 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
32626+#endif
32627+
32628 if (!switcher_vma) {
32629 err = -ENOMEM;
32630 printk("lguest: could not map switcher pages high\n");
32631@@ -118,7 +126,7 @@ static __init int map_switcher(void)
32632 * Now the Switcher is mapped at the right address, we can't fail!
32633 * Copy in the compiled-in Switcher code (from <arch>_switcher.S).
32634 */
32635- memcpy(switcher_vma->addr, start_switcher_text,
32636+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
32637 end_switcher_text - start_switcher_text);
32638
32639 printk(KERN_INFO "lguest: mapped switcher at %p\n",
32640diff -urNp linux-2.6.32.46/drivers/lguest/x86/core.c linux-2.6.32.46/drivers/lguest/x86/core.c
32641--- linux-2.6.32.46/drivers/lguest/x86/core.c 2011-03-27 14:31:47.000000000 -0400
32642+++ linux-2.6.32.46/drivers/lguest/x86/core.c 2011-04-17 15:56:46.000000000 -0400
32643@@ -59,7 +59,7 @@ static struct {
32644 /* Offset from where switcher.S was compiled to where we've copied it */
32645 static unsigned long switcher_offset(void)
32646 {
32647- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
32648+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
32649 }
32650
32651 /* This cpu's struct lguest_pages. */
32652@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg
32653 * These copies are pretty cheap, so we do them unconditionally: */
32654 /* Save the current Host top-level page directory.
32655 */
32656+
32657+#ifdef CONFIG_PAX_PER_CPU_PGD
32658+ pages->state.host_cr3 = read_cr3();
32659+#else
32660 pages->state.host_cr3 = __pa(current->mm->pgd);
32661+#endif
32662+
32663 /*
32664 * Set up the Guest's page tables to see this CPU's pages (and no
32665 * other CPU's pages).
32666@@ -535,7 +541,7 @@ void __init lguest_arch_host_init(void)
32667 * compiled-in switcher code and the high-mapped copy we just made.
32668 */
32669 for (i = 0; i < IDT_ENTRIES; i++)
32670- default_idt_entries[i] += switcher_offset();
32671+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
32672
32673 /*
32674 * Set up the Switcher's per-cpu areas.
32675@@ -618,7 +624,7 @@ void __init lguest_arch_host_init(void)
32676 * it will be undisturbed when we switch. To change %cs and jump we
32677 * need this structure to feed to Intel's "lcall" instruction.
32678 */
32679- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
32680+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
32681 lguest_entry.segment = LGUEST_CS;
32682
32683 /*
32684diff -urNp linux-2.6.32.46/drivers/lguest/x86/switcher_32.S linux-2.6.32.46/drivers/lguest/x86/switcher_32.S
32685--- linux-2.6.32.46/drivers/lguest/x86/switcher_32.S 2011-03-27 14:31:47.000000000 -0400
32686+++ linux-2.6.32.46/drivers/lguest/x86/switcher_32.S 2011-04-17 15:56:46.000000000 -0400
32687@@ -87,6 +87,7 @@
32688 #include <asm/page.h>
32689 #include <asm/segment.h>
32690 #include <asm/lguest.h>
32691+#include <asm/processor-flags.h>
32692
32693 // We mark the start of the code to copy
32694 // It's placed in .text tho it's never run here
32695@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
32696 // Changes type when we load it: damn Intel!
32697 // For after we switch over our page tables
32698 // That entry will be read-only: we'd crash.
32699+
32700+#ifdef CONFIG_PAX_KERNEXEC
32701+ mov %cr0, %edx
32702+ xor $X86_CR0_WP, %edx
32703+ mov %edx, %cr0
32704+#endif
32705+
32706 movl $(GDT_ENTRY_TSS*8), %edx
32707 ltr %dx
32708
32709@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
32710 // Let's clear it again for our return.
32711 // The GDT descriptor of the Host
32712 // Points to the table after two "size" bytes
32713- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
32714+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
32715 // Clear "used" from type field (byte 5, bit 2)
32716- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
32717+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
32718+
32719+#ifdef CONFIG_PAX_KERNEXEC
32720+ mov %cr0, %eax
32721+ xor $X86_CR0_WP, %eax
32722+ mov %eax, %cr0
32723+#endif
32724
32725 // Once our page table's switched, the Guest is live!
32726 // The Host fades as we run this final step.
32727@@ -295,13 +309,12 @@ deliver_to_host:
32728 // I consulted gcc, and it gave
32729 // These instructions, which I gladly credit:
32730 leal (%edx,%ebx,8), %eax
32731- movzwl (%eax),%edx
32732- movl 4(%eax), %eax
32733- xorw %ax, %ax
32734- orl %eax, %edx
32735+ movl 4(%eax), %edx
32736+ movw (%eax), %dx
32737 // Now the address of the handler's in %edx
32738 // We call it now: its "iret" drops us home.
32739- jmp *%edx
32740+ ljmp $__KERNEL_CS, $1f
32741+1: jmp *%edx
32742
32743 // Every interrupt can come to us here
32744 // But we must truly tell each apart.
32745diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c
32746--- linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c 2011-03-27 14:31:47.000000000 -0400
32747+++ linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c 2011-04-17 15:56:46.000000000 -0400
32748@@ -15,7 +15,7 @@
32749
32750 #define MAX_PMU_LEVEL 0xFF
32751
32752-static struct backlight_ops pmu_backlight_data;
32753+static const struct backlight_ops pmu_backlight_data;
32754 static DEFINE_SPINLOCK(pmu_backlight_lock);
32755 static int sleeping, uses_pmu_bl;
32756 static u8 bl_curve[FB_BACKLIGHT_LEVELS];
32757@@ -115,7 +115,7 @@ static int pmu_backlight_get_brightness(
32758 return bd->props.brightness;
32759 }
32760
32761-static struct backlight_ops pmu_backlight_data = {
32762+static const struct backlight_ops pmu_backlight_data = {
32763 .get_brightness = pmu_backlight_get_brightness,
32764 .update_status = pmu_backlight_update_status,
32765
32766diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu.c linux-2.6.32.46/drivers/macintosh/via-pmu.c
32767--- linux-2.6.32.46/drivers/macintosh/via-pmu.c 2011-03-27 14:31:47.000000000 -0400
32768+++ linux-2.6.32.46/drivers/macintosh/via-pmu.c 2011-04-17 15:56:46.000000000 -0400
32769@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
32770 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
32771 }
32772
32773-static struct platform_suspend_ops pmu_pm_ops = {
32774+static const struct platform_suspend_ops pmu_pm_ops = {
32775 .enter = powerbook_sleep,
32776 .valid = pmu_sleep_valid,
32777 };
32778diff -urNp linux-2.6.32.46/drivers/md/dm.c linux-2.6.32.46/drivers/md/dm.c
32779--- linux-2.6.32.46/drivers/md/dm.c 2011-08-09 18:35:29.000000000 -0400
32780+++ linux-2.6.32.46/drivers/md/dm.c 2011-08-09 18:33:59.000000000 -0400
32781@@ -165,9 +165,9 @@ struct mapped_device {
32782 /*
32783 * Event handling.
32784 */
32785- atomic_t event_nr;
32786+ atomic_unchecked_t event_nr;
32787 wait_queue_head_t eventq;
32788- atomic_t uevent_seq;
32789+ atomic_unchecked_t uevent_seq;
32790 struct list_head uevent_list;
32791 spinlock_t uevent_lock; /* Protect access to uevent_list */
32792
32793@@ -1776,8 +1776,8 @@ static struct mapped_device *alloc_dev(i
32794 rwlock_init(&md->map_lock);
32795 atomic_set(&md->holders, 1);
32796 atomic_set(&md->open_count, 0);
32797- atomic_set(&md->event_nr, 0);
32798- atomic_set(&md->uevent_seq, 0);
32799+ atomic_set_unchecked(&md->event_nr, 0);
32800+ atomic_set_unchecked(&md->uevent_seq, 0);
32801 INIT_LIST_HEAD(&md->uevent_list);
32802 spin_lock_init(&md->uevent_lock);
32803
32804@@ -1927,7 +1927,7 @@ static void event_callback(void *context
32805
32806 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
32807
32808- atomic_inc(&md->event_nr);
32809+ atomic_inc_unchecked(&md->event_nr);
32810 wake_up(&md->eventq);
32811 }
32812
32813@@ -2562,18 +2562,18 @@ void dm_kobject_uevent(struct mapped_dev
32814
32815 uint32_t dm_next_uevent_seq(struct mapped_device *md)
32816 {
32817- return atomic_add_return(1, &md->uevent_seq);
32818+ return atomic_add_return_unchecked(1, &md->uevent_seq);
32819 }
32820
32821 uint32_t dm_get_event_nr(struct mapped_device *md)
32822 {
32823- return atomic_read(&md->event_nr);
32824+ return atomic_read_unchecked(&md->event_nr);
32825 }
32826
32827 int dm_wait_event(struct mapped_device *md, int event_nr)
32828 {
32829 return wait_event_interruptible(md->eventq,
32830- (event_nr != atomic_read(&md->event_nr)));
32831+ (event_nr != atomic_read_unchecked(&md->event_nr)));
32832 }
32833
32834 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
32835diff -urNp linux-2.6.32.46/drivers/md/dm-ioctl.c linux-2.6.32.46/drivers/md/dm-ioctl.c
32836--- linux-2.6.32.46/drivers/md/dm-ioctl.c 2011-03-27 14:31:47.000000000 -0400
32837+++ linux-2.6.32.46/drivers/md/dm-ioctl.c 2011-04-17 15:56:46.000000000 -0400
32838@@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str
32839 cmd == DM_LIST_VERSIONS_CMD)
32840 return 0;
32841
32842- if ((cmd == DM_DEV_CREATE_CMD)) {
32843+ if (cmd == DM_DEV_CREATE_CMD) {
32844 if (!*param->name) {
32845 DMWARN("name not supplied when creating device");
32846 return -EINVAL;
32847diff -urNp linux-2.6.32.46/drivers/md/dm-raid1.c linux-2.6.32.46/drivers/md/dm-raid1.c
32848--- linux-2.6.32.46/drivers/md/dm-raid1.c 2011-03-27 14:31:47.000000000 -0400
32849+++ linux-2.6.32.46/drivers/md/dm-raid1.c 2011-05-04 17:56:28.000000000 -0400
32850@@ -41,7 +41,7 @@ enum dm_raid1_error {
32851
32852 struct mirror {
32853 struct mirror_set *ms;
32854- atomic_t error_count;
32855+ atomic_unchecked_t error_count;
32856 unsigned long error_type;
32857 struct dm_dev *dev;
32858 sector_t offset;
32859@@ -203,7 +203,7 @@ static void fail_mirror(struct mirror *m
32860 * simple way to tell if a device has encountered
32861 * errors.
32862 */
32863- atomic_inc(&m->error_count);
32864+ atomic_inc_unchecked(&m->error_count);
32865
32866 if (test_and_set_bit(error_type, &m->error_type))
32867 return;
32868@@ -225,7 +225,7 @@ static void fail_mirror(struct mirror *m
32869 }
32870
32871 for (new = ms->mirror; new < ms->mirror + ms->nr_mirrors; new++)
32872- if (!atomic_read(&new->error_count)) {
32873+ if (!atomic_read_unchecked(&new->error_count)) {
32874 set_default_mirror(new);
32875 break;
32876 }
32877@@ -363,7 +363,7 @@ static struct mirror *choose_mirror(stru
32878 struct mirror *m = get_default_mirror(ms);
32879
32880 do {
32881- if (likely(!atomic_read(&m->error_count)))
32882+ if (likely(!atomic_read_unchecked(&m->error_count)))
32883 return m;
32884
32885 if (m-- == ms->mirror)
32886@@ -377,7 +377,7 @@ static int default_ok(struct mirror *m)
32887 {
32888 struct mirror *default_mirror = get_default_mirror(m->ms);
32889
32890- return !atomic_read(&default_mirror->error_count);
32891+ return !atomic_read_unchecked(&default_mirror->error_count);
32892 }
32893
32894 static int mirror_available(struct mirror_set *ms, struct bio *bio)
32895@@ -484,7 +484,7 @@ static void do_reads(struct mirror_set *
32896 */
32897 if (likely(region_in_sync(ms, region, 1)))
32898 m = choose_mirror(ms, bio->bi_sector);
32899- else if (m && atomic_read(&m->error_count))
32900+ else if (m && atomic_read_unchecked(&m->error_count))
32901 m = NULL;
32902
32903 if (likely(m))
32904@@ -855,7 +855,7 @@ static int get_mirror(struct mirror_set
32905 }
32906
32907 ms->mirror[mirror].ms = ms;
32908- atomic_set(&(ms->mirror[mirror].error_count), 0);
32909+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
32910 ms->mirror[mirror].error_type = 0;
32911 ms->mirror[mirror].offset = offset;
32912
32913@@ -1241,7 +1241,7 @@ static void mirror_resume(struct dm_targ
32914 */
32915 static char device_status_char(struct mirror *m)
32916 {
32917- if (!atomic_read(&(m->error_count)))
32918+ if (!atomic_read_unchecked(&(m->error_count)))
32919 return 'A';
32920
32921 return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' :
32922diff -urNp linux-2.6.32.46/drivers/md/dm-stripe.c linux-2.6.32.46/drivers/md/dm-stripe.c
32923--- linux-2.6.32.46/drivers/md/dm-stripe.c 2011-03-27 14:31:47.000000000 -0400
32924+++ linux-2.6.32.46/drivers/md/dm-stripe.c 2011-05-04 17:56:28.000000000 -0400
32925@@ -20,7 +20,7 @@ struct stripe {
32926 struct dm_dev *dev;
32927 sector_t physical_start;
32928
32929- atomic_t error_count;
32930+ atomic_unchecked_t error_count;
32931 };
32932
32933 struct stripe_c {
32934@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *
32935 kfree(sc);
32936 return r;
32937 }
32938- atomic_set(&(sc->stripe[i].error_count), 0);
32939+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
32940 }
32941
32942 ti->private = sc;
32943@@ -257,7 +257,7 @@ static int stripe_status(struct dm_targe
32944 DMEMIT("%d ", sc->stripes);
32945 for (i = 0; i < sc->stripes; i++) {
32946 DMEMIT("%s ", sc->stripe[i].dev->name);
32947- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
32948+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
32949 'D' : 'A';
32950 }
32951 buffer[i] = '\0';
32952@@ -304,8 +304,8 @@ static int stripe_end_io(struct dm_targe
32953 */
32954 for (i = 0; i < sc->stripes; i++)
32955 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
32956- atomic_inc(&(sc->stripe[i].error_count));
32957- if (atomic_read(&(sc->stripe[i].error_count)) <
32958+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
32959+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
32960 DM_IO_ERROR_THRESHOLD)
32961 queue_work(kstriped, &sc->kstriped_ws);
32962 }
32963diff -urNp linux-2.6.32.46/drivers/md/dm-sysfs.c linux-2.6.32.46/drivers/md/dm-sysfs.c
32964--- linux-2.6.32.46/drivers/md/dm-sysfs.c 2011-03-27 14:31:47.000000000 -0400
32965+++ linux-2.6.32.46/drivers/md/dm-sysfs.c 2011-04-17 15:56:46.000000000 -0400
32966@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
32967 NULL,
32968 };
32969
32970-static struct sysfs_ops dm_sysfs_ops = {
32971+static const struct sysfs_ops dm_sysfs_ops = {
32972 .show = dm_attr_show,
32973 };
32974
32975diff -urNp linux-2.6.32.46/drivers/md/dm-table.c linux-2.6.32.46/drivers/md/dm-table.c
32976--- linux-2.6.32.46/drivers/md/dm-table.c 2011-06-25 12:55:34.000000000 -0400
32977+++ linux-2.6.32.46/drivers/md/dm-table.c 2011-06-25 12:56:37.000000000 -0400
32978@@ -376,7 +376,7 @@ static int device_area_is_invalid(struct
32979 if (!dev_size)
32980 return 0;
32981
32982- if ((start >= dev_size) || (start + len > dev_size)) {
32983+ if ((start >= dev_size) || (len > dev_size - start)) {
32984 DMWARN("%s: %s too small for target: "
32985 "start=%llu, len=%llu, dev_size=%llu",
32986 dm_device_name(ti->table->md), bdevname(bdev, b),
32987diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c
32988--- linux-2.6.32.46/drivers/md/md.c 2011-07-13 17:23:04.000000000 -0400
32989+++ linux-2.6.32.46/drivers/md/md.c 2011-07-13 17:23:18.000000000 -0400
32990@@ -153,10 +153,10 @@ static int start_readonly;
32991 * start build, activate spare
32992 */
32993 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
32994-static atomic_t md_event_count;
32995+static atomic_unchecked_t md_event_count;
32996 void md_new_event(mddev_t *mddev)
32997 {
32998- atomic_inc(&md_event_count);
32999+ atomic_inc_unchecked(&md_event_count);
33000 wake_up(&md_event_waiters);
33001 }
33002 EXPORT_SYMBOL_GPL(md_new_event);
33003@@ -166,7 +166,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
33004 */
33005 static void md_new_event_inintr(mddev_t *mddev)
33006 {
33007- atomic_inc(&md_event_count);
33008+ atomic_inc_unchecked(&md_event_count);
33009 wake_up(&md_event_waiters);
33010 }
33011
33012@@ -1218,7 +1218,7 @@ static int super_1_load(mdk_rdev_t *rdev
33013
33014 rdev->preferred_minor = 0xffff;
33015 rdev->data_offset = le64_to_cpu(sb->data_offset);
33016- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33017+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33018
33019 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
33020 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
33021@@ -1392,7 +1392,7 @@ static void super_1_sync(mddev_t *mddev,
33022 else
33023 sb->resync_offset = cpu_to_le64(0);
33024
33025- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
33026+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
33027
33028 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
33029 sb->size = cpu_to_le64(mddev->dev_sectors);
33030@@ -2214,7 +2214,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
33031 static ssize_t
33032 errors_show(mdk_rdev_t *rdev, char *page)
33033 {
33034- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
33035+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
33036 }
33037
33038 static ssize_t
33039@@ -2223,7 +2223,7 @@ errors_store(mdk_rdev_t *rdev, const cha
33040 char *e;
33041 unsigned long n = simple_strtoul(buf, &e, 10);
33042 if (*buf && (*e == 0 || *e == '\n')) {
33043- atomic_set(&rdev->corrected_errors, n);
33044+ atomic_set_unchecked(&rdev->corrected_errors, n);
33045 return len;
33046 }
33047 return -EINVAL;
33048@@ -2517,7 +2517,7 @@ static void rdev_free(struct kobject *ko
33049 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
33050 kfree(rdev);
33051 }
33052-static struct sysfs_ops rdev_sysfs_ops = {
33053+static const struct sysfs_ops rdev_sysfs_ops = {
33054 .show = rdev_attr_show,
33055 .store = rdev_attr_store,
33056 };
33057@@ -2566,8 +2566,8 @@ static mdk_rdev_t *md_import_device(dev_
33058 rdev->data_offset = 0;
33059 rdev->sb_events = 0;
33060 atomic_set(&rdev->nr_pending, 0);
33061- atomic_set(&rdev->read_errors, 0);
33062- atomic_set(&rdev->corrected_errors, 0);
33063+ atomic_set_unchecked(&rdev->read_errors, 0);
33064+ atomic_set_unchecked(&rdev->corrected_errors, 0);
33065
33066 size = rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS;
33067 if (!size) {
33068@@ -3887,7 +3887,7 @@ static void md_free(struct kobject *ko)
33069 kfree(mddev);
33070 }
33071
33072-static struct sysfs_ops md_sysfs_ops = {
33073+static const struct sysfs_ops md_sysfs_ops = {
33074 .show = md_attr_show,
33075 .store = md_attr_store,
33076 };
33077@@ -4474,7 +4474,8 @@ out:
33078 err = 0;
33079 blk_integrity_unregister(disk);
33080 md_new_event(mddev);
33081- sysfs_notify_dirent(mddev->sysfs_state);
33082+ if (mddev->sysfs_state)
33083+ sysfs_notify_dirent(mddev->sysfs_state);
33084 return err;
33085 }
33086
33087@@ -5954,7 +5955,7 @@ static int md_seq_show(struct seq_file *
33088
33089 spin_unlock(&pers_lock);
33090 seq_printf(seq, "\n");
33091- mi->event = atomic_read(&md_event_count);
33092+ mi->event = atomic_read_unchecked(&md_event_count);
33093 return 0;
33094 }
33095 if (v == (void*)2) {
33096@@ -6043,7 +6044,7 @@ static int md_seq_show(struct seq_file *
33097 chunk_kb ? "KB" : "B");
33098 if (bitmap->file) {
33099 seq_printf(seq, ", file: ");
33100- seq_path(seq, &bitmap->file->f_path, " \t\n");
33101+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
33102 }
33103
33104 seq_printf(seq, "\n");
33105@@ -6077,7 +6078,7 @@ static int md_seq_open(struct inode *ino
33106 else {
33107 struct seq_file *p = file->private_data;
33108 p->private = mi;
33109- mi->event = atomic_read(&md_event_count);
33110+ mi->event = atomic_read_unchecked(&md_event_count);
33111 }
33112 return error;
33113 }
33114@@ -6093,7 +6094,7 @@ static unsigned int mdstat_poll(struct f
33115 /* always allow read */
33116 mask = POLLIN | POLLRDNORM;
33117
33118- if (mi->event != atomic_read(&md_event_count))
33119+ if (mi->event != atomic_read_unchecked(&md_event_count))
33120 mask |= POLLERR | POLLPRI;
33121 return mask;
33122 }
33123@@ -6137,7 +6138,7 @@ static int is_mddev_idle(mddev_t *mddev,
33124 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
33125 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
33126 (int)part_stat_read(&disk->part0, sectors[1]) -
33127- atomic_read(&disk->sync_io);
33128+ atomic_read_unchecked(&disk->sync_io);
33129 /* sync IO will cause sync_io to increase before the disk_stats
33130 * as sync_io is counted when a request starts, and
33131 * disk_stats is counted when it completes.
33132diff -urNp linux-2.6.32.46/drivers/md/md.h linux-2.6.32.46/drivers/md/md.h
33133--- linux-2.6.32.46/drivers/md/md.h 2011-03-27 14:31:47.000000000 -0400
33134+++ linux-2.6.32.46/drivers/md/md.h 2011-05-04 17:56:20.000000000 -0400
33135@@ -94,10 +94,10 @@ struct mdk_rdev_s
33136 * only maintained for arrays that
33137 * support hot removal
33138 */
33139- atomic_t read_errors; /* number of consecutive read errors that
33140+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
33141 * we have tried to ignore.
33142 */
33143- atomic_t corrected_errors; /* number of corrected read errors,
33144+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
33145 * for reporting to userspace and storing
33146 * in superblock.
33147 */
33148@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
33149
33150 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
33151 {
33152- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33153+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33154 }
33155
33156 struct mdk_personality
33157diff -urNp linux-2.6.32.46/drivers/md/raid10.c linux-2.6.32.46/drivers/md/raid10.c
33158--- linux-2.6.32.46/drivers/md/raid10.c 2011-03-27 14:31:47.000000000 -0400
33159+++ linux-2.6.32.46/drivers/md/raid10.c 2011-05-04 17:56:28.000000000 -0400
33160@@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bi
33161 if (test_bit(BIO_UPTODATE, &bio->bi_flags))
33162 set_bit(R10BIO_Uptodate, &r10_bio->state);
33163 else {
33164- atomic_add(r10_bio->sectors,
33165+ atomic_add_unchecked(r10_bio->sectors,
33166 &conf->mirrors[d].rdev->corrected_errors);
33167 if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
33168 md_error(r10_bio->mddev,
33169@@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf,
33170 test_bit(In_sync, &rdev->flags)) {
33171 atomic_inc(&rdev->nr_pending);
33172 rcu_read_unlock();
33173- atomic_add(s, &rdev->corrected_errors);
33174+ atomic_add_unchecked(s, &rdev->corrected_errors);
33175 if (sync_page_io(rdev->bdev,
33176 r10_bio->devs[sl].addr +
33177 sect + rdev->data_offset,
33178diff -urNp linux-2.6.32.46/drivers/md/raid1.c linux-2.6.32.46/drivers/md/raid1.c
33179--- linux-2.6.32.46/drivers/md/raid1.c 2011-03-27 14:31:47.000000000 -0400
33180+++ linux-2.6.32.46/drivers/md/raid1.c 2011-05-04 17:56:28.000000000 -0400
33181@@ -1415,7 +1415,7 @@ static void sync_request_write(mddev_t *
33182 if (r1_bio->bios[d]->bi_end_io != end_sync_read)
33183 continue;
33184 rdev = conf->mirrors[d].rdev;
33185- atomic_add(s, &rdev->corrected_errors);
33186+ atomic_add_unchecked(s, &rdev->corrected_errors);
33187 if (sync_page_io(rdev->bdev,
33188 sect + rdev->data_offset,
33189 s<<9,
33190@@ -1564,7 +1564,7 @@ static void fix_read_error(conf_t *conf,
33191 /* Well, this device is dead */
33192 md_error(mddev, rdev);
33193 else {
33194- atomic_add(s, &rdev->corrected_errors);
33195+ atomic_add_unchecked(s, &rdev->corrected_errors);
33196 printk(KERN_INFO
33197 "raid1:%s: read error corrected "
33198 "(%d sectors at %llu on %s)\n",
33199diff -urNp linux-2.6.32.46/drivers/md/raid5.c linux-2.6.32.46/drivers/md/raid5.c
33200--- linux-2.6.32.46/drivers/md/raid5.c 2011-06-25 12:55:34.000000000 -0400
33201+++ linux-2.6.32.46/drivers/md/raid5.c 2011-06-25 12:58:39.000000000 -0400
33202@@ -482,7 +482,7 @@ static void ops_run_io(struct stripe_hea
33203 bi->bi_next = NULL;
33204 if ((rw & WRITE) &&
33205 test_bit(R5_ReWrite, &sh->dev[i].flags))
33206- atomic_add(STRIPE_SECTORS,
33207+ atomic_add_unchecked(STRIPE_SECTORS,
33208 &rdev->corrected_errors);
33209 generic_make_request(bi);
33210 } else {
33211@@ -1517,15 +1517,15 @@ static void raid5_end_read_request(struc
33212 clear_bit(R5_ReadError, &sh->dev[i].flags);
33213 clear_bit(R5_ReWrite, &sh->dev[i].flags);
33214 }
33215- if (atomic_read(&conf->disks[i].rdev->read_errors))
33216- atomic_set(&conf->disks[i].rdev->read_errors, 0);
33217+ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
33218+ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
33219 } else {
33220 const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
33221 int retry = 0;
33222 rdev = conf->disks[i].rdev;
33223
33224 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
33225- atomic_inc(&rdev->read_errors);
33226+ atomic_inc_unchecked(&rdev->read_errors);
33227 if (conf->mddev->degraded >= conf->max_degraded)
33228 printk_rl(KERN_WARNING
33229 "raid5:%s: read error not correctable "
33230@@ -1543,7 +1543,7 @@ static void raid5_end_read_request(struc
33231 (unsigned long long)(sh->sector
33232 + rdev->data_offset),
33233 bdn);
33234- else if (atomic_read(&rdev->read_errors)
33235+ else if (atomic_read_unchecked(&rdev->read_errors)
33236 > conf->max_nr_stripes)
33237 printk(KERN_WARNING
33238 "raid5:%s: Too many read errors, failing device %s.\n",
33239@@ -1870,6 +1870,7 @@ static sector_t compute_blocknr(struct s
33240 sector_t r_sector;
33241 struct stripe_head sh2;
33242
33243+ pax_track_stack();
33244
33245 chunk_offset = sector_div(new_sector, sectors_per_chunk);
33246 stripe = new_sector;
33247diff -urNp linux-2.6.32.46/drivers/media/common/saa7146_hlp.c linux-2.6.32.46/drivers/media/common/saa7146_hlp.c
33248--- linux-2.6.32.46/drivers/media/common/saa7146_hlp.c 2011-03-27 14:31:47.000000000 -0400
33249+++ linux-2.6.32.46/drivers/media/common/saa7146_hlp.c 2011-05-16 21:46:57.000000000 -0400
33250@@ -353,6 +353,8 @@ static void calculate_clipping_registers
33251
33252 int x[32], y[32], w[32], h[32];
33253
33254+ pax_track_stack();
33255+
33256 /* clear out memory */
33257 memset(&line_list[0], 0x00, sizeof(u32)*32);
33258 memset(&pixel_list[0], 0x00, sizeof(u32)*32);
33259diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
33260--- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-03-27 14:31:47.000000000 -0400
33261+++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-16 21:46:57.000000000 -0400
33262@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
33263 u8 buf[HOST_LINK_BUF_SIZE];
33264 int i;
33265
33266+ pax_track_stack();
33267+
33268 dprintk("%s\n", __func__);
33269
33270 /* check if we have space for a link buf in the rx_buffer */
33271@@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(s
33272 unsigned long timeout;
33273 int written;
33274
33275+ pax_track_stack();
33276+
33277 dprintk("%s\n", __func__);
33278
33279 /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
33280diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h
33281--- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h 2011-03-27 14:31:47.000000000 -0400
33282+++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-05 20:33:55.000000000 -0400
33283@@ -71,7 +71,7 @@ struct dvb_demux_feed {
33284 union {
33285 dmx_ts_cb ts;
33286 dmx_section_cb sec;
33287- } cb;
33288+ } __no_const cb;
33289
33290 struct dvb_demux *demux;
33291 void *priv;
33292diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c
33293--- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-27 14:31:47.000000000 -0400
33294+++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c 2011-08-23 21:22:32.000000000 -0400
33295@@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapt
33296 const struct dvb_device *template, void *priv, int type)
33297 {
33298 struct dvb_device *dvbdev;
33299- struct file_operations *dvbdevfops;
33300+ file_operations_no_const *dvbdevfops;
33301 struct device *clsdev;
33302 int minor;
33303 int id;
33304diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c
33305--- linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c 2011-03-27 14:31:47.000000000 -0400
33306+++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c 2011-08-05 20:33:55.000000000 -0400
33307@@ -1040,7 +1040,7 @@ static struct dib0070_config dib7070p_di
33308 struct dib0700_adapter_state {
33309 int (*set_param_save) (struct dvb_frontend *,
33310 struct dvb_frontend_parameters *);
33311-};
33312+} __no_const;
33313
33314 static int dib7070_set_param_override(struct dvb_frontend *fe,
33315 struct dvb_frontend_parameters *fep)
33316diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c
33317--- linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-03-27 14:31:47.000000000 -0400
33318+++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-16 21:46:57.000000000 -0400
33319@@ -332,6 +332,8 @@ int dib0700_download_firmware(struct usb
33320
33321 u8 buf[260];
33322
33323+ pax_track_stack();
33324+
33325 while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
33326 deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.addr, hx.len, hx.chk);
33327
33328diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c
33329--- linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-05-10 22:12:01.000000000 -0400
33330+++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-08-05 20:33:55.000000000 -0400
33331@@ -28,7 +28,7 @@ MODULE_PARM_DESC(force_lna_activation, "
33332
33333 struct dib0700_adapter_state {
33334 int (*set_param_save) (struct dvb_frontend *, struct dvb_frontend_parameters *);
33335-};
33336+} __no_const;
33337
33338 /* Hauppauge Nova-T 500 (aka Bristol)
33339 * has a LNA on GPIO0 which is enabled by setting 1 */
33340diff -urNp linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h
33341--- linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h 2011-03-27 14:31:47.000000000 -0400
33342+++ linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h 2011-08-05 20:33:55.000000000 -0400
33343@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
33344 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
33345 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
33346 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
33347-};
33348+} __no_const;
33349
33350 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
33351 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
33352diff -urNp linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c
33353--- linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c 2011-03-27 14:31:47.000000000 -0400
33354+++ linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c 2011-05-16 21:46:57.000000000 -0400
33355@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
33356 u8 tudata[585];
33357 int i;
33358
33359+ pax_track_stack();
33360+
33361 dprintk("Firmware is %zd bytes\n",fw->size);
33362
33363 /* Get eprom data */
33364diff -urNp linux-2.6.32.46/drivers/media/radio/radio-cadet.c linux-2.6.32.46/drivers/media/radio/radio-cadet.c
33365--- linux-2.6.32.46/drivers/media/radio/radio-cadet.c 2011-03-27 14:31:47.000000000 -0400
33366+++ linux-2.6.32.46/drivers/media/radio/radio-cadet.c 2011-04-17 15:56:46.000000000 -0400
33367@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
33368 while (i < count && dev->rdsin != dev->rdsout)
33369 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
33370
33371- if (copy_to_user(data, readbuf, i))
33372+ if (i > sizeof readbuf || copy_to_user(data, readbuf, i))
33373 return -EFAULT;
33374 return i;
33375 }
33376diff -urNp linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c
33377--- linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c 2011-03-27 14:31:47.000000000 -0400
33378+++ linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c 2011-05-16 21:46:57.000000000 -0400
33379@@ -56,7 +56,7 @@ static struct pci_device_id cx18_pci_tbl
33380
33381 MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
33382
33383-static atomic_t cx18_instance = ATOMIC_INIT(0);
33384+static atomic_unchecked_t cx18_instance = ATOMIC_INIT(0);
33385
33386 /* Parameter declarations */
33387 static int cardtype[CX18_MAX_CARDS];
33388@@ -288,6 +288,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
33389 struct i2c_client c;
33390 u8 eedata[256];
33391
33392+ pax_track_stack();
33393+
33394 memset(&c, 0, sizeof(c));
33395 strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
33396 c.adapter = &cx->i2c_adap[0];
33397@@ -800,7 +802,7 @@ static int __devinit cx18_probe(struct p
33398 struct cx18 *cx;
33399
33400 /* FIXME - module parameter arrays constrain max instances */
33401- i = atomic_inc_return(&cx18_instance) - 1;
33402+ i = atomic_inc_return_unchecked(&cx18_instance) - 1;
33403 if (i >= CX18_MAX_CARDS) {
33404 printk(KERN_ERR "cx18: cannot manage card %d, driver has a "
33405 "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1);
33406diff -urNp linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c
33407--- linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c 2011-03-27 14:31:47.000000000 -0400
33408+++ linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c 2011-05-04 17:56:28.000000000 -0400
33409@@ -79,7 +79,7 @@ static struct pci_device_id ivtv_pci_tbl
33410 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
33411
33412 /* ivtv instance counter */
33413-static atomic_t ivtv_instance = ATOMIC_INIT(0);
33414+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
33415
33416 /* Parameter declarations */
33417 static int cardtype[IVTV_MAX_CARDS];
33418diff -urNp linux-2.6.32.46/drivers/media/video/omap24xxcam.c linux-2.6.32.46/drivers/media/video/omap24xxcam.c
33419--- linux-2.6.32.46/drivers/media/video/omap24xxcam.c 2011-03-27 14:31:47.000000000 -0400
33420+++ linux-2.6.32.46/drivers/media/video/omap24xxcam.c 2011-05-04 17:56:28.000000000 -0400
33421@@ -401,7 +401,7 @@ static void omap24xxcam_vbq_complete(str
33422 spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
33423
33424 do_gettimeofday(&vb->ts);
33425- vb->field_count = atomic_add_return(2, &fh->field_count);
33426+ vb->field_count = atomic_add_return_unchecked(2, &fh->field_count);
33427 if (csr & csr_error) {
33428 vb->state = VIDEOBUF_ERROR;
33429 if (!atomic_read(&fh->cam->in_reset)) {
33430diff -urNp linux-2.6.32.46/drivers/media/video/omap24xxcam.h linux-2.6.32.46/drivers/media/video/omap24xxcam.h
33431--- linux-2.6.32.46/drivers/media/video/omap24xxcam.h 2011-03-27 14:31:47.000000000 -0400
33432+++ linux-2.6.32.46/drivers/media/video/omap24xxcam.h 2011-05-04 17:56:28.000000000 -0400
33433@@ -533,7 +533,7 @@ struct omap24xxcam_fh {
33434 spinlock_t vbq_lock; /* spinlock for the videobuf queue */
33435 struct videobuf_queue vbq;
33436 struct v4l2_pix_format pix; /* serialise pix by vbq->lock */
33437- atomic_t field_count; /* field counter for videobuf_buffer */
33438+ atomic_unchecked_t field_count; /* field counter for videobuf_buffer */
33439 /* accessing cam here doesn't need serialisation: it's constant */
33440 struct omap24xxcam_device *cam;
33441 };
33442diff -urNp linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
33443--- linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-03-27 14:31:47.000000000 -0400
33444+++ linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-16 21:46:57.000000000 -0400
33445@@ -119,6 +119,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw
33446 u8 *eeprom;
33447 struct tveeprom tvdata;
33448
33449+ pax_track_stack();
33450+
33451 memset(&tvdata,0,sizeof(tvdata));
33452
33453 eeprom = pvr2_eeprom_fetch(hdw);
33454diff -urNp linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33455--- linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-03-27 14:31:47.000000000 -0400
33456+++ linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-08-23 21:22:38.000000000 -0400
33457@@ -195,7 +195,7 @@ struct pvr2_hdw {
33458
33459 /* I2C stuff */
33460 struct i2c_adapter i2c_adap;
33461- struct i2c_algorithm i2c_algo;
33462+ i2c_algorithm_no_const i2c_algo;
33463 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
33464 int i2c_cx25840_hack_state;
33465 int i2c_linked;
33466diff -urNp linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c
33467--- linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c 2011-03-27 14:31:47.000000000 -0400
33468+++ linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c 2011-05-16 21:46:57.000000000 -0400
33469@@ -683,6 +683,8 @@ static int saa6752hs_init(struct v4l2_su
33470 unsigned char localPAT[256];
33471 unsigned char localPMT[256];
33472
33473+ pax_track_stack();
33474+
33475 /* Set video format - must be done first as it resets other settings */
33476 set_reg8(client, 0x41, h->video_format);
33477
33478diff -urNp linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c
33479--- linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c 2011-03-27 14:31:47.000000000 -0400
33480+++ linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-16 21:46:57.000000000 -0400
33481@@ -87,6 +87,8 @@ int saa7164_irq_dequeue(struct saa7164_d
33482 wait_queue_head_t *q = 0;
33483 dprintk(DBGLVL_CMD, "%s()\n", __func__);
33484
33485+ pax_track_stack();
33486+
33487 /* While any outstand message on the bus exists... */
33488 do {
33489
33490@@ -126,6 +128,8 @@ int saa7164_cmd_dequeue(struct saa7164_d
33491 u8 tmp[512];
33492 dprintk(DBGLVL_CMD, "%s()\n", __func__);
33493
33494+ pax_track_stack();
33495+
33496 while (loop) {
33497
33498 tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 };
33499diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c
33500--- linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c 2011-03-27 14:31:47.000000000 -0400
33501+++ linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c 2011-08-05 20:33:55.000000000 -0400
33502@@ -3947,15 +3947,15 @@ static struct usb_device_id id_table[] =
33503 static int __init ibmcam_init(void)
33504 {
33505 struct usbvideo_cb cbTbl;
33506- memset(&cbTbl, 0, sizeof(cbTbl));
33507- cbTbl.probe = ibmcam_probe;
33508- cbTbl.setupOnOpen = ibmcam_setup_on_open;
33509- cbTbl.videoStart = ibmcam_video_start;
33510- cbTbl.videoStop = ibmcam_video_stop;
33511- cbTbl.processData = ibmcam_ProcessIsocData;
33512- cbTbl.postProcess = usbvideo_DeinterlaceFrame;
33513- cbTbl.adjustPicture = ibmcam_adjust_picture;
33514- cbTbl.getFPS = ibmcam_calculate_fps;
33515+ memset((void *)&cbTbl, 0, sizeof(cbTbl));
33516+ *(void **)&cbTbl.probe = ibmcam_probe;
33517+ *(void **)&cbTbl.setupOnOpen = ibmcam_setup_on_open;
33518+ *(void **)&cbTbl.videoStart = ibmcam_video_start;
33519+ *(void **)&cbTbl.videoStop = ibmcam_video_stop;
33520+ *(void **)&cbTbl.processData = ibmcam_ProcessIsocData;
33521+ *(void **)&cbTbl.postProcess = usbvideo_DeinterlaceFrame;
33522+ *(void **)&cbTbl.adjustPicture = ibmcam_adjust_picture;
33523+ *(void **)&cbTbl.getFPS = ibmcam_calculate_fps;
33524 return usbvideo_register(
33525 &cams,
33526 MAX_IBMCAM,
33527diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c
33528--- linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c 2011-03-27 14:31:47.000000000 -0400
33529+++ linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c 2011-08-05 20:33:55.000000000 -0400
33530@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
33531 int error;
33532
33533 usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
33534- strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
33535+ strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname));
33536
33537 cam->input = input_dev = input_allocate_device();
33538 if (!input_dev) {
33539@@ -935,16 +935,16 @@ static int __init konicawc_init(void)
33540 struct usbvideo_cb cbTbl;
33541 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
33542 DRIVER_DESC "\n");
33543- memset(&cbTbl, 0, sizeof(cbTbl));
33544- cbTbl.probe = konicawc_probe;
33545- cbTbl.setupOnOpen = konicawc_setup_on_open;
33546- cbTbl.processData = konicawc_process_isoc;
33547- cbTbl.getFPS = konicawc_calculate_fps;
33548- cbTbl.setVideoMode = konicawc_set_video_mode;
33549- cbTbl.startDataPump = konicawc_start_data;
33550- cbTbl.stopDataPump = konicawc_stop_data;
33551- cbTbl.adjustPicture = konicawc_adjust_picture;
33552- cbTbl.userFree = konicawc_free_uvd;
33553+ memset((void * )&cbTbl, 0, sizeof(cbTbl));
33554+ *(void **)&cbTbl.probe = konicawc_probe;
33555+ *(void **)&cbTbl.setupOnOpen = konicawc_setup_on_open;
33556+ *(void **)&cbTbl.processData = konicawc_process_isoc;
33557+ *(void **)&cbTbl.getFPS = konicawc_calculate_fps;
33558+ *(void **)&cbTbl.setVideoMode = konicawc_set_video_mode;
33559+ *(void **)&cbTbl.startDataPump = konicawc_start_data;
33560+ *(void **)&cbTbl.stopDataPump = konicawc_stop_data;
33561+ *(void **)&cbTbl.adjustPicture = konicawc_adjust_picture;
33562+ *(void **)&cbTbl.userFree = konicawc_free_uvd;
33563 return usbvideo_register(
33564 &cams,
33565 MAX_CAMERAS,
33566diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c
33567--- linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c 2011-03-27 14:31:47.000000000 -0400
33568+++ linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c 2011-04-17 15:56:46.000000000 -0400
33569@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
33570 int error;
33571
33572 usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
33573- strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
33574+ strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname));
33575
33576 cam->input = input_dev = input_allocate_device();
33577 if (!input_dev) {
33578diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c
33579--- linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c 2011-03-27 14:31:47.000000000 -0400
33580+++ linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c 2011-08-05 20:33:55.000000000 -0400
33581@@ -655,14 +655,14 @@ static int __init ultracam_init(void)
33582 {
33583 struct usbvideo_cb cbTbl;
33584 memset(&cbTbl, 0, sizeof(cbTbl));
33585- cbTbl.probe = ultracam_probe;
33586- cbTbl.setupOnOpen = ultracam_setup_on_open;
33587- cbTbl.videoStart = ultracam_video_start;
33588- cbTbl.videoStop = ultracam_video_stop;
33589- cbTbl.processData = ultracam_ProcessIsocData;
33590- cbTbl.postProcess = usbvideo_DeinterlaceFrame;
33591- cbTbl.adjustPicture = ultracam_adjust_picture;
33592- cbTbl.getFPS = ultracam_calculate_fps;
33593+ *(void **)&cbTbl.probe = ultracam_probe;
33594+ *(void **)&cbTbl.setupOnOpen = ultracam_setup_on_open;
33595+ *(void **)&cbTbl.videoStart = ultracam_video_start;
33596+ *(void **)&cbTbl.videoStop = ultracam_video_stop;
33597+ *(void **)&cbTbl.processData = ultracam_ProcessIsocData;
33598+ *(void **)&cbTbl.postProcess = usbvideo_DeinterlaceFrame;
33599+ *(void **)&cbTbl.adjustPicture = ultracam_adjust_picture;
33600+ *(void **)&cbTbl.getFPS = ultracam_calculate_fps;
33601 return usbvideo_register(
33602 &cams,
33603 MAX_CAMERAS,
33604diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c
33605--- linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c 2011-03-27 14:31:47.000000000 -0400
33606+++ linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c 2011-08-05 20:33:55.000000000 -0400
33607@@ -697,15 +697,15 @@ int usbvideo_register(
33608 __func__, cams, base_size, num_cams);
33609
33610 /* Copy callbacks, apply defaults for those that are not set */
33611- memmove(&cams->cb, cbTbl, sizeof(cams->cb));
33612+ memmove((void *)&cams->cb, cbTbl, sizeof(cams->cb));
33613 if (cams->cb.getFrame == NULL)
33614- cams->cb.getFrame = usbvideo_GetFrame;
33615+ *(void **)&cams->cb.getFrame = usbvideo_GetFrame;
33616 if (cams->cb.disconnect == NULL)
33617- cams->cb.disconnect = usbvideo_Disconnect;
33618+ *(void **)&cams->cb.disconnect = usbvideo_Disconnect;
33619 if (cams->cb.startDataPump == NULL)
33620- cams->cb.startDataPump = usbvideo_StartDataPump;
33621+ *(void **)&cams->cb.startDataPump = usbvideo_StartDataPump;
33622 if (cams->cb.stopDataPump == NULL)
33623- cams->cb.stopDataPump = usbvideo_StopDataPump;
33624+ *(void **)&cams->cb.stopDataPump = usbvideo_StopDataPump;
33625
33626 cams->num_cameras = num_cams;
33627 cams->cam = (struct uvd *) &cams[1];
33628diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h
33629--- linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h 2011-03-27 14:31:47.000000000 -0400
33630+++ linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h 2011-08-30 18:20:06.000000000 -0400
33631@@ -268,7 +268,7 @@ struct usbvideo_cb {
33632 int (*startDataPump)(struct uvd *uvd);
33633 void (*stopDataPump)(struct uvd *uvd);
33634 int (*setVideoMode)(struct uvd *uvd, struct video_window *vw);
33635-};
33636+} __no_const;
33637
33638 struct usbvideo {
33639 int num_cameras; /* As allocated */
33640diff -urNp linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c
33641--- linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c 2011-03-27 14:31:47.000000000 -0400
33642+++ linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c 2011-05-16 21:46:57.000000000 -0400
33643@@ -820,6 +820,8 @@ static enum ParseState usbvision_parse_c
33644 unsigned char rv, gv, bv;
33645 static unsigned char *Y, *U, *V;
33646
33647+ pax_track_stack();
33648+
33649 frame = usbvision->curFrame;
33650 imageSize = frame->frmwidth * frame->frmheight;
33651 if ( (frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
33652diff -urNp linux-2.6.32.46/drivers/media/video/v4l2-device.c linux-2.6.32.46/drivers/media/video/v4l2-device.c
33653--- linux-2.6.32.46/drivers/media/video/v4l2-device.c 2011-03-27 14:31:47.000000000 -0400
33654+++ linux-2.6.32.46/drivers/media/video/v4l2-device.c 2011-05-04 17:56:28.000000000 -0400
33655@@ -50,9 +50,9 @@ int v4l2_device_register(struct device *
33656 EXPORT_SYMBOL_GPL(v4l2_device_register);
33657
33658 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
33659- atomic_t *instance)
33660+ atomic_unchecked_t *instance)
33661 {
33662- int num = atomic_inc_return(instance) - 1;
33663+ int num = atomic_inc_return_unchecked(instance) - 1;
33664 int len = strlen(basename);
33665
33666 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
33667diff -urNp linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c
33668--- linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c 2011-03-27 14:31:47.000000000 -0400
33669+++ linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c 2011-05-16 21:46:57.000000000 -0400
33670@@ -693,6 +693,8 @@ void *videobuf_sg_alloc(size_t size)
33671 {
33672 struct videobuf_queue q;
33673
33674+ pax_track_stack();
33675+
33676 /* Required to make generic handler to call __videobuf_alloc */
33677 q.int_ops = &sg_ops;
33678
33679diff -urNp linux-2.6.32.46/drivers/message/fusion/mptbase.c linux-2.6.32.46/drivers/message/fusion/mptbase.c
33680--- linux-2.6.32.46/drivers/message/fusion/mptbase.c 2011-03-27 14:31:47.000000000 -0400
33681+++ linux-2.6.32.46/drivers/message/fusion/mptbase.c 2011-04-17 15:56:46.000000000 -0400
33682@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
33683 len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
33684 len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
33685
33686+#ifdef CONFIG_GRKERNSEC_HIDESYM
33687+ len += sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
33688+ NULL, NULL);
33689+#else
33690 len += sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
33691 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
33692+#endif
33693+
33694 /*
33695 * Rounding UP to nearest 4-kB boundary here...
33696 */
33697diff -urNp linux-2.6.32.46/drivers/message/fusion/mptsas.c linux-2.6.32.46/drivers/message/fusion/mptsas.c
33698--- linux-2.6.32.46/drivers/message/fusion/mptsas.c 2011-03-27 14:31:47.000000000 -0400
33699+++ linux-2.6.32.46/drivers/message/fusion/mptsas.c 2011-04-17 15:56:46.000000000 -0400
33700@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
33701 return 0;
33702 }
33703
33704+static inline void
33705+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
33706+{
33707+ if (phy_info->port_details) {
33708+ phy_info->port_details->rphy = rphy;
33709+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
33710+ ioc->name, rphy));
33711+ }
33712+
33713+ if (rphy) {
33714+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
33715+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
33716+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
33717+ ioc->name, rphy, rphy->dev.release));
33718+ }
33719+}
33720+
33721 /* no mutex */
33722 static void
33723 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
33724@@ -474,23 +491,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p
33725 return NULL;
33726 }
33727
33728-static inline void
33729-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
33730-{
33731- if (phy_info->port_details) {
33732- phy_info->port_details->rphy = rphy;
33733- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
33734- ioc->name, rphy));
33735- }
33736-
33737- if (rphy) {
33738- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
33739- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
33740- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
33741- ioc->name, rphy, rphy->dev.release));
33742- }
33743-}
33744-
33745 static inline struct sas_port *
33746 mptsas_get_port(struct mptsas_phyinfo *phy_info)
33747 {
33748diff -urNp linux-2.6.32.46/drivers/message/fusion/mptscsih.c linux-2.6.32.46/drivers/message/fusion/mptscsih.c
33749--- linux-2.6.32.46/drivers/message/fusion/mptscsih.c 2011-03-27 14:31:47.000000000 -0400
33750+++ linux-2.6.32.46/drivers/message/fusion/mptscsih.c 2011-04-17 15:56:46.000000000 -0400
33751@@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
33752
33753 h = shost_priv(SChost);
33754
33755- if (h) {
33756- if (h->info_kbuf == NULL)
33757- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
33758- return h->info_kbuf;
33759- h->info_kbuf[0] = '\0';
33760+ if (!h)
33761+ return NULL;
33762
33763- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
33764- h->info_kbuf[size-1] = '\0';
33765- }
33766+ if (h->info_kbuf == NULL)
33767+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
33768+ return h->info_kbuf;
33769+ h->info_kbuf[0] = '\0';
33770+
33771+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
33772+ h->info_kbuf[size-1] = '\0';
33773
33774 return h->info_kbuf;
33775 }
33776diff -urNp linux-2.6.32.46/drivers/message/i2o/i2o_config.c linux-2.6.32.46/drivers/message/i2o/i2o_config.c
33777--- linux-2.6.32.46/drivers/message/i2o/i2o_config.c 2011-03-27 14:31:47.000000000 -0400
33778+++ linux-2.6.32.46/drivers/message/i2o/i2o_config.c 2011-05-16 21:46:57.000000000 -0400
33779@@ -787,6 +787,8 @@ static int i2o_cfg_passthru(unsigned lon
33780 struct i2o_message *msg;
33781 unsigned int iop;
33782
33783+ pax_track_stack();
33784+
33785 if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
33786 return -EFAULT;
33787
33788diff -urNp linux-2.6.32.46/drivers/message/i2o/i2o_proc.c linux-2.6.32.46/drivers/message/i2o/i2o_proc.c
33789--- linux-2.6.32.46/drivers/message/i2o/i2o_proc.c 2011-03-27 14:31:47.000000000 -0400
33790+++ linux-2.6.32.46/drivers/message/i2o/i2o_proc.c 2011-04-17 15:56:46.000000000 -0400
33791@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
33792 "Array Controller Device"
33793 };
33794
33795-static char *chtostr(u8 * chars, int n)
33796-{
33797- char tmp[256];
33798- tmp[0] = 0;
33799- return strncat(tmp, (char *)chars, n);
33800-}
33801-
33802 static int i2o_report_query_status(struct seq_file *seq, int block_status,
33803 char *group)
33804 {
33805@@ -842,8 +835,7 @@ static int i2o_seq_show_ddm_table(struct
33806
33807 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
33808 seq_printf(seq, "%-#8x", ddm_table.module_id);
33809- seq_printf(seq, "%-29s",
33810- chtostr(ddm_table.module_name_version, 28));
33811+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
33812 seq_printf(seq, "%9d ", ddm_table.data_size);
33813 seq_printf(seq, "%8d", ddm_table.code_size);
33814
33815@@ -944,8 +936,8 @@ static int i2o_seq_show_drivers_stored(s
33816
33817 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
33818 seq_printf(seq, "%-#8x", dst->module_id);
33819- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
33820- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
33821+ seq_printf(seq, "%-.28s", dst->module_name_version);
33822+ seq_printf(seq, "%-.8s", dst->date);
33823 seq_printf(seq, "%8d ", dst->module_size);
33824 seq_printf(seq, "%8d ", dst->mpb_size);
33825 seq_printf(seq, "0x%04x", dst->module_flags);
33826@@ -1276,14 +1268,10 @@ static int i2o_seq_show_dev_identity(str
33827 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
33828 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
33829 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
33830- seq_printf(seq, "Vendor info : %s\n",
33831- chtostr((u8 *) (work32 + 2), 16));
33832- seq_printf(seq, "Product info : %s\n",
33833- chtostr((u8 *) (work32 + 6), 16));
33834- seq_printf(seq, "Description : %s\n",
33835- chtostr((u8 *) (work32 + 10), 16));
33836- seq_printf(seq, "Product rev. : %s\n",
33837- chtostr((u8 *) (work32 + 14), 8));
33838+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
33839+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
33840+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
33841+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
33842
33843 seq_printf(seq, "Serial number : ");
33844 print_serial_number(seq, (u8 *) (work32 + 16),
33845@@ -1328,10 +1316,8 @@ static int i2o_seq_show_ddm_identity(str
33846 }
33847
33848 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
33849- seq_printf(seq, "Module name : %s\n",
33850- chtostr(result.module_name, 24));
33851- seq_printf(seq, "Module revision : %s\n",
33852- chtostr(result.module_rev, 8));
33853+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
33854+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
33855
33856 seq_printf(seq, "Serial number : ");
33857 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
33858@@ -1362,14 +1348,10 @@ static int i2o_seq_show_uinfo(struct seq
33859 return 0;
33860 }
33861
33862- seq_printf(seq, "Device name : %s\n",
33863- chtostr(result.device_name, 64));
33864- seq_printf(seq, "Service name : %s\n",
33865- chtostr(result.service_name, 64));
33866- seq_printf(seq, "Physical name : %s\n",
33867- chtostr(result.physical_location, 64));
33868- seq_printf(seq, "Instance number : %s\n",
33869- chtostr(result.instance_number, 4));
33870+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
33871+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
33872+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
33873+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
33874
33875 return 0;
33876 }
33877diff -urNp linux-2.6.32.46/drivers/message/i2o/iop.c linux-2.6.32.46/drivers/message/i2o/iop.c
33878--- linux-2.6.32.46/drivers/message/i2o/iop.c 2011-03-27 14:31:47.000000000 -0400
33879+++ linux-2.6.32.46/drivers/message/i2o/iop.c 2011-05-04 17:56:28.000000000 -0400
33880@@ -110,10 +110,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
33881
33882 spin_lock_irqsave(&c->context_list_lock, flags);
33883
33884- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
33885- atomic_inc(&c->context_list_counter);
33886+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
33887+ atomic_inc_unchecked(&c->context_list_counter);
33888
33889- entry->context = atomic_read(&c->context_list_counter);
33890+ entry->context = atomic_read_unchecked(&c->context_list_counter);
33891
33892 list_add(&entry->list, &c->context_list);
33893
33894@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(voi
33895
33896 #if BITS_PER_LONG == 64
33897 spin_lock_init(&c->context_list_lock);
33898- atomic_set(&c->context_list_counter, 0);
33899+ atomic_set_unchecked(&c->context_list_counter, 0);
33900 INIT_LIST_HEAD(&c->context_list);
33901 #endif
33902
33903diff -urNp linux-2.6.32.46/drivers/mfd/wm8350-i2c.c linux-2.6.32.46/drivers/mfd/wm8350-i2c.c
33904--- linux-2.6.32.46/drivers/mfd/wm8350-i2c.c 2011-03-27 14:31:47.000000000 -0400
33905+++ linux-2.6.32.46/drivers/mfd/wm8350-i2c.c 2011-05-16 21:46:57.000000000 -0400
33906@@ -43,6 +43,8 @@ static int wm8350_i2c_write_device(struc
33907 u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
33908 int ret;
33909
33910+ pax_track_stack();
33911+
33912 if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
33913 return -EINVAL;
33914
33915diff -urNp linux-2.6.32.46/drivers/misc/kgdbts.c linux-2.6.32.46/drivers/misc/kgdbts.c
33916--- linux-2.6.32.46/drivers/misc/kgdbts.c 2011-03-27 14:31:47.000000000 -0400
33917+++ linux-2.6.32.46/drivers/misc/kgdbts.c 2011-04-17 15:56:46.000000000 -0400
33918@@ -118,7 +118,7 @@
33919 } while (0)
33920 #define MAX_CONFIG_LEN 40
33921
33922-static struct kgdb_io kgdbts_io_ops;
33923+static const struct kgdb_io kgdbts_io_ops;
33924 static char get_buf[BUFMAX];
33925 static int get_buf_cnt;
33926 static char put_buf[BUFMAX];
33927@@ -1102,7 +1102,7 @@ static void kgdbts_post_exp_handler(void
33928 module_put(THIS_MODULE);
33929 }
33930
33931-static struct kgdb_io kgdbts_io_ops = {
33932+static const struct kgdb_io kgdbts_io_ops = {
33933 .name = "kgdbts",
33934 .read_char = kgdbts_get_char,
33935 .write_char = kgdbts_put_char,
33936diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c
33937--- linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c 2011-03-27 14:31:47.000000000 -0400
33938+++ linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:56:46.000000000 -0400
33939@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
33940
33941 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
33942 {
33943- atomic_long_inc(&mcs_op_statistics[op].count);
33944- atomic_long_add(clks, &mcs_op_statistics[op].total);
33945+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
33946+ atomic_long_add_unchecked(clks, &mcs_op_statistics[op].total);
33947 if (mcs_op_statistics[op].max < clks)
33948 mcs_op_statistics[op].max = clks;
33949 }
33950diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c
33951--- linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c 2011-03-27 14:31:47.000000000 -0400
33952+++ linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:56:46.000000000 -0400
33953@@ -32,9 +32,9 @@
33954
33955 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
33956
33957-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
33958+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
33959 {
33960- unsigned long val = atomic_long_read(v);
33961+ unsigned long val = atomic_long_read_unchecked(v);
33962
33963 if (val)
33964 seq_printf(s, "%16lu %s\n", val, id);
33965@@ -136,8 +136,8 @@ static int mcs_statistics_show(struct se
33966 "cch_interrupt_sync", "cch_deallocate", "tgh_invalidate"};
33967
33968 for (op = 0; op < mcsop_last; op++) {
33969- count = atomic_long_read(&mcs_op_statistics[op].count);
33970- total = atomic_long_read(&mcs_op_statistics[op].total);
33971+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
33972+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
33973 max = mcs_op_statistics[op].max;
33974 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
33975 count ? total / count : 0, max);
33976diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h
33977--- linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h 2011-03-27 14:31:47.000000000 -0400
33978+++ linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:56:46.000000000 -0400
33979@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
33980 * GRU statistics.
33981 */
33982 struct gru_stats_s {
33983- atomic_long_t vdata_alloc;
33984- atomic_long_t vdata_free;
33985- atomic_long_t gts_alloc;
33986- atomic_long_t gts_free;
33987- atomic_long_t vdata_double_alloc;
33988- atomic_long_t gts_double_allocate;
33989- atomic_long_t assign_context;
33990- atomic_long_t assign_context_failed;
33991- atomic_long_t free_context;
33992- atomic_long_t load_user_context;
33993- atomic_long_t load_kernel_context;
33994- atomic_long_t lock_kernel_context;
33995- atomic_long_t unlock_kernel_context;
33996- atomic_long_t steal_user_context;
33997- atomic_long_t steal_kernel_context;
33998- atomic_long_t steal_context_failed;
33999- atomic_long_t nopfn;
34000- atomic_long_t break_cow;
34001- atomic_long_t asid_new;
34002- atomic_long_t asid_next;
34003- atomic_long_t asid_wrap;
34004- atomic_long_t asid_reuse;
34005- atomic_long_t intr;
34006- atomic_long_t intr_mm_lock_failed;
34007- atomic_long_t call_os;
34008- atomic_long_t call_os_offnode_reference;
34009- atomic_long_t call_os_check_for_bug;
34010- atomic_long_t call_os_wait_queue;
34011- atomic_long_t user_flush_tlb;
34012- atomic_long_t user_unload_context;
34013- atomic_long_t user_exception;
34014- atomic_long_t set_context_option;
34015- atomic_long_t migrate_check;
34016- atomic_long_t migrated_retarget;
34017- atomic_long_t migrated_unload;
34018- atomic_long_t migrated_unload_delay;
34019- atomic_long_t migrated_nopfn_retarget;
34020- atomic_long_t migrated_nopfn_unload;
34021- atomic_long_t tlb_dropin;
34022- atomic_long_t tlb_dropin_fail_no_asid;
34023- atomic_long_t tlb_dropin_fail_upm;
34024- atomic_long_t tlb_dropin_fail_invalid;
34025- atomic_long_t tlb_dropin_fail_range_active;
34026- atomic_long_t tlb_dropin_fail_idle;
34027- atomic_long_t tlb_dropin_fail_fmm;
34028- atomic_long_t tlb_dropin_fail_no_exception;
34029- atomic_long_t tlb_dropin_fail_no_exception_war;
34030- atomic_long_t tfh_stale_on_fault;
34031- atomic_long_t mmu_invalidate_range;
34032- atomic_long_t mmu_invalidate_page;
34033- atomic_long_t mmu_clear_flush_young;
34034- atomic_long_t flush_tlb;
34035- atomic_long_t flush_tlb_gru;
34036- atomic_long_t flush_tlb_gru_tgh;
34037- atomic_long_t flush_tlb_gru_zero_asid;
34038-
34039- atomic_long_t copy_gpa;
34040-
34041- atomic_long_t mesq_receive;
34042- atomic_long_t mesq_receive_none;
34043- atomic_long_t mesq_send;
34044- atomic_long_t mesq_send_failed;
34045- atomic_long_t mesq_noop;
34046- atomic_long_t mesq_send_unexpected_error;
34047- atomic_long_t mesq_send_lb_overflow;
34048- atomic_long_t mesq_send_qlimit_reached;
34049- atomic_long_t mesq_send_amo_nacked;
34050- atomic_long_t mesq_send_put_nacked;
34051- atomic_long_t mesq_qf_not_full;
34052- atomic_long_t mesq_qf_locked;
34053- atomic_long_t mesq_qf_noop_not_full;
34054- atomic_long_t mesq_qf_switch_head_failed;
34055- atomic_long_t mesq_qf_unexpected_error;
34056- atomic_long_t mesq_noop_unexpected_error;
34057- atomic_long_t mesq_noop_lb_overflow;
34058- atomic_long_t mesq_noop_qlimit_reached;
34059- atomic_long_t mesq_noop_amo_nacked;
34060- atomic_long_t mesq_noop_put_nacked;
34061+ atomic_long_unchecked_t vdata_alloc;
34062+ atomic_long_unchecked_t vdata_free;
34063+ atomic_long_unchecked_t gts_alloc;
34064+ atomic_long_unchecked_t gts_free;
34065+ atomic_long_unchecked_t vdata_double_alloc;
34066+ atomic_long_unchecked_t gts_double_allocate;
34067+ atomic_long_unchecked_t assign_context;
34068+ atomic_long_unchecked_t assign_context_failed;
34069+ atomic_long_unchecked_t free_context;
34070+ atomic_long_unchecked_t load_user_context;
34071+ atomic_long_unchecked_t load_kernel_context;
34072+ atomic_long_unchecked_t lock_kernel_context;
34073+ atomic_long_unchecked_t unlock_kernel_context;
34074+ atomic_long_unchecked_t steal_user_context;
34075+ atomic_long_unchecked_t steal_kernel_context;
34076+ atomic_long_unchecked_t steal_context_failed;
34077+ atomic_long_unchecked_t nopfn;
34078+ atomic_long_unchecked_t break_cow;
34079+ atomic_long_unchecked_t asid_new;
34080+ atomic_long_unchecked_t asid_next;
34081+ atomic_long_unchecked_t asid_wrap;
34082+ atomic_long_unchecked_t asid_reuse;
34083+ atomic_long_unchecked_t intr;
34084+ atomic_long_unchecked_t intr_mm_lock_failed;
34085+ atomic_long_unchecked_t call_os;
34086+ atomic_long_unchecked_t call_os_offnode_reference;
34087+ atomic_long_unchecked_t call_os_check_for_bug;
34088+ atomic_long_unchecked_t call_os_wait_queue;
34089+ atomic_long_unchecked_t user_flush_tlb;
34090+ atomic_long_unchecked_t user_unload_context;
34091+ atomic_long_unchecked_t user_exception;
34092+ atomic_long_unchecked_t set_context_option;
34093+ atomic_long_unchecked_t migrate_check;
34094+ atomic_long_unchecked_t migrated_retarget;
34095+ atomic_long_unchecked_t migrated_unload;
34096+ atomic_long_unchecked_t migrated_unload_delay;
34097+ atomic_long_unchecked_t migrated_nopfn_retarget;
34098+ atomic_long_unchecked_t migrated_nopfn_unload;
34099+ atomic_long_unchecked_t tlb_dropin;
34100+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
34101+ atomic_long_unchecked_t tlb_dropin_fail_upm;
34102+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
34103+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
34104+ atomic_long_unchecked_t tlb_dropin_fail_idle;
34105+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
34106+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
34107+ atomic_long_unchecked_t tlb_dropin_fail_no_exception_war;
34108+ atomic_long_unchecked_t tfh_stale_on_fault;
34109+ atomic_long_unchecked_t mmu_invalidate_range;
34110+ atomic_long_unchecked_t mmu_invalidate_page;
34111+ atomic_long_unchecked_t mmu_clear_flush_young;
34112+ atomic_long_unchecked_t flush_tlb;
34113+ atomic_long_unchecked_t flush_tlb_gru;
34114+ atomic_long_unchecked_t flush_tlb_gru_tgh;
34115+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
34116+
34117+ atomic_long_unchecked_t copy_gpa;
34118+
34119+ atomic_long_unchecked_t mesq_receive;
34120+ atomic_long_unchecked_t mesq_receive_none;
34121+ atomic_long_unchecked_t mesq_send;
34122+ atomic_long_unchecked_t mesq_send_failed;
34123+ atomic_long_unchecked_t mesq_noop;
34124+ atomic_long_unchecked_t mesq_send_unexpected_error;
34125+ atomic_long_unchecked_t mesq_send_lb_overflow;
34126+ atomic_long_unchecked_t mesq_send_qlimit_reached;
34127+ atomic_long_unchecked_t mesq_send_amo_nacked;
34128+ atomic_long_unchecked_t mesq_send_put_nacked;
34129+ atomic_long_unchecked_t mesq_qf_not_full;
34130+ atomic_long_unchecked_t mesq_qf_locked;
34131+ atomic_long_unchecked_t mesq_qf_noop_not_full;
34132+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
34133+ atomic_long_unchecked_t mesq_qf_unexpected_error;
34134+ atomic_long_unchecked_t mesq_noop_unexpected_error;
34135+ atomic_long_unchecked_t mesq_noop_lb_overflow;
34136+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
34137+ atomic_long_unchecked_t mesq_noop_amo_nacked;
34138+ atomic_long_unchecked_t mesq_noop_put_nacked;
34139
34140 };
34141
34142@@ -252,8 +252,8 @@ enum mcs_op {cchop_allocate, cchop_start
34143 cchop_deallocate, tghop_invalidate, mcsop_last};
34144
34145 struct mcs_op_statistic {
34146- atomic_long_t count;
34147- atomic_long_t total;
34148+ atomic_long_unchecked_t count;
34149+ atomic_long_unchecked_t total;
34150 unsigned long max;
34151 };
34152
34153@@ -276,7 +276,7 @@ extern struct mcs_op_statistic mcs_op_st
34154
34155 #define STAT(id) do { \
34156 if (gru_options & OPT_STATS) \
34157- atomic_long_inc(&gru_stats.id); \
34158+ atomic_long_inc_unchecked(&gru_stats.id); \
34159 } while (0)
34160
34161 #ifdef CONFIG_SGI_GRU_DEBUG
34162diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h
34163--- linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h 2011-03-27 14:31:47.000000000 -0400
34164+++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h 2011-08-05 20:33:55.000000000 -0400
34165@@ -876,7 +876,7 @@ extern struct xpc_registration xpc_regis
34166 /* found in xpc_main.c */
34167 extern struct device *xpc_part;
34168 extern struct device *xpc_chan;
34169-extern struct xpc_arch_operations xpc_arch_ops;
34170+extern const struct xpc_arch_operations xpc_arch_ops;
34171 extern int xpc_disengage_timelimit;
34172 extern int xpc_disengage_timedout;
34173 extern int xpc_activate_IRQ_rcvd;
34174diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c
34175--- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c 2011-03-27 14:31:47.000000000 -0400
34176+++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c 2011-08-05 20:33:55.000000000 -0400
34177@@ -169,7 +169,7 @@ static struct notifier_block xpc_die_not
34178 .notifier_call = xpc_system_die,
34179 };
34180
34181-struct xpc_arch_operations xpc_arch_ops;
34182+const struct xpc_arch_operations xpc_arch_ops;
34183
34184 /*
34185 * Timer function to enforce the timelimit on the partition disengage.
34186diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c
34187--- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c 2011-03-27 14:31:47.000000000 -0400
34188+++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c 2011-08-05 20:33:55.000000000 -0400
34189@@ -2350,7 +2350,7 @@ xpc_received_payload_sn2(struct xpc_chan
34190 xpc_acknowledge_msgs_sn2(ch, get, msg->flags);
34191 }
34192
34193-static struct xpc_arch_operations xpc_arch_ops_sn2 = {
34194+static const struct xpc_arch_operations xpc_arch_ops_sn2 = {
34195 .setup_partitions = xpc_setup_partitions_sn2,
34196 .teardown_partitions = xpc_teardown_partitions_sn2,
34197 .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_sn2,
34198@@ -2413,7 +2413,9 @@ xpc_init_sn2(void)
34199 int ret;
34200 size_t buf_size;
34201
34202- xpc_arch_ops = xpc_arch_ops_sn2;
34203+ pax_open_kernel();
34204+ memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_sn2, sizeof(xpc_arch_ops_sn2));
34205+ pax_close_kernel();
34206
34207 if (offsetof(struct xpc_msg_sn2, payload) > XPC_MSG_HDR_MAX_SIZE) {
34208 dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is "
34209diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c
34210--- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c 2011-03-27 14:31:47.000000000 -0400
34211+++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c 2011-08-05 20:33:55.000000000 -0400
34212@@ -1669,7 +1669,7 @@ xpc_received_payload_uv(struct xpc_chann
34213 XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
34214 }
34215
34216-static struct xpc_arch_operations xpc_arch_ops_uv = {
34217+static const struct xpc_arch_operations xpc_arch_ops_uv = {
34218 .setup_partitions = xpc_setup_partitions_uv,
34219 .teardown_partitions = xpc_teardown_partitions_uv,
34220 .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv,
34221@@ -1729,7 +1729,9 @@ static struct xpc_arch_operations xpc_ar
34222 int
34223 xpc_init_uv(void)
34224 {
34225- xpc_arch_ops = xpc_arch_ops_uv;
34226+ pax_open_kernel();
34227+ memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_uv, sizeof(xpc_arch_ops_uv));
34228+ pax_close_kernel();
34229
34230 if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
34231 dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",
34232diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xp.h linux-2.6.32.46/drivers/misc/sgi-xp/xp.h
34233--- linux-2.6.32.46/drivers/misc/sgi-xp/xp.h 2011-03-27 14:31:47.000000000 -0400
34234+++ linux-2.6.32.46/drivers/misc/sgi-xp/xp.h 2011-08-05 20:33:55.000000000 -0400
34235@@ -289,7 +289,7 @@ struct xpc_interface {
34236 xpc_notify_func, void *);
34237 void (*received) (short, int, void *);
34238 enum xp_retval (*partid_to_nasids) (short, void *);
34239-};
34240+} __no_const;
34241
34242 extern struct xpc_interface xpc_interface;
34243
34244diff -urNp linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c
34245--- linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c 2011-03-27 14:31:47.000000000 -0400
34246+++ linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-16 21:46:57.000000000 -0400
34247@@ -743,6 +743,8 @@ static int chip_ready (struct map_info *
34248 struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
34249 unsigned long timeo = jiffies + HZ;
34250
34251+ pax_track_stack();
34252+
34253 /* Prevent setting state FL_SYNCING for chip in suspended state. */
34254 if (mode == FL_SYNCING && chip->oldstate != FL_READY)
34255 goto sleep;
34256@@ -1642,6 +1644,8 @@ static int __xipram do_write_buffer(stru
34257 unsigned long initial_adr;
34258 int initial_len = len;
34259
34260+ pax_track_stack();
34261+
34262 wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
34263 adr += chip->start;
34264 initial_adr = adr;
34265@@ -1860,6 +1864,8 @@ static int __xipram do_erase_oneblock(st
34266 int retries = 3;
34267 int ret;
34268
34269+ pax_track_stack();
34270+
34271 adr += chip->start;
34272
34273 retry:
34274diff -urNp linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c
34275--- linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c 2011-03-27 14:31:47.000000000 -0400
34276+++ linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-16 21:46:57.000000000 -0400
34277@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
34278 unsigned long cmd_addr;
34279 struct cfi_private *cfi = map->fldrv_priv;
34280
34281+ pax_track_stack();
34282+
34283 adr += chip->start;
34284
34285 /* Ensure cmd read/writes are aligned. */
34286@@ -428,6 +430,8 @@ static inline int do_write_buffer(struct
34287 DECLARE_WAITQUEUE(wait, current);
34288 int wbufsize, z;
34289
34290+ pax_track_stack();
34291+
34292 /* M58LW064A requires bus alignment for buffer wriets -- saw */
34293 if (adr & (map_bankwidth(map)-1))
34294 return -EINVAL;
34295@@ -742,6 +746,8 @@ static inline int do_erase_oneblock(stru
34296 DECLARE_WAITQUEUE(wait, current);
34297 int ret = 0;
34298
34299+ pax_track_stack();
34300+
34301 adr += chip->start;
34302
34303 /* Let's determine this according to the interleave only once */
34304@@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struc
34305 unsigned long timeo = jiffies + HZ;
34306 DECLARE_WAITQUEUE(wait, current);
34307
34308+ pax_track_stack();
34309+
34310 adr += chip->start;
34311
34312 /* Let's determine this according to the interleave only once */
34313@@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(str
34314 unsigned long timeo = jiffies + HZ;
34315 DECLARE_WAITQUEUE(wait, current);
34316
34317+ pax_track_stack();
34318+
34319 adr += chip->start;
34320
34321 /* Let's determine this according to the interleave only once */
34322diff -urNp linux-2.6.32.46/drivers/mtd/devices/doc2000.c linux-2.6.32.46/drivers/mtd/devices/doc2000.c
34323--- linux-2.6.32.46/drivers/mtd/devices/doc2000.c 2011-03-27 14:31:47.000000000 -0400
34324+++ linux-2.6.32.46/drivers/mtd/devices/doc2000.c 2011-04-17 15:56:46.000000000 -0400
34325@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
34326
34327 /* The ECC will not be calculated correctly if less than 512 is written */
34328 /* DBB-
34329- if (len != 0x200 && eccbuf)
34330+ if (len != 0x200)
34331 printk(KERN_WARNING
34332 "ECC needs a full sector write (adr: %lx size %lx)\n",
34333 (long) to, (long) len);
34334diff -urNp linux-2.6.32.46/drivers/mtd/devices/doc2001.c linux-2.6.32.46/drivers/mtd/devices/doc2001.c
34335--- linux-2.6.32.46/drivers/mtd/devices/doc2001.c 2011-03-27 14:31:47.000000000 -0400
34336+++ linux-2.6.32.46/drivers/mtd/devices/doc2001.c 2011-04-17 15:56:46.000000000 -0400
34337@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
34338 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
34339
34340 /* Don't allow read past end of device */
34341- if (from >= this->totlen)
34342+ if (from >= this->totlen || !len)
34343 return -EINVAL;
34344
34345 /* Don't allow a single read to cross a 512-byte block boundary */
34346diff -urNp linux-2.6.32.46/drivers/mtd/ftl.c linux-2.6.32.46/drivers/mtd/ftl.c
34347--- linux-2.6.32.46/drivers/mtd/ftl.c 2011-03-27 14:31:47.000000000 -0400
34348+++ linux-2.6.32.46/drivers/mtd/ftl.c 2011-05-16 21:46:57.000000000 -0400
34349@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
34350 loff_t offset;
34351 uint16_t srcunitswap = cpu_to_le16(srcunit);
34352
34353+ pax_track_stack();
34354+
34355 eun = &part->EUNInfo[srcunit];
34356 xfer = &part->XferInfo[xferunit];
34357 DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
34358diff -urNp linux-2.6.32.46/drivers/mtd/inftlcore.c linux-2.6.32.46/drivers/mtd/inftlcore.c
34359--- linux-2.6.32.46/drivers/mtd/inftlcore.c 2011-03-27 14:31:47.000000000 -0400
34360+++ linux-2.6.32.46/drivers/mtd/inftlcore.c 2011-05-16 21:46:57.000000000 -0400
34361@@ -260,6 +260,8 @@ static u16 INFTL_foldchain(struct INFTLr
34362 struct inftl_oob oob;
34363 size_t retlen;
34364
34365+ pax_track_stack();
34366+
34367 DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
34368 "pending=%d)\n", inftl, thisVUC, pendingblock);
34369
34370diff -urNp linux-2.6.32.46/drivers/mtd/inftlmount.c linux-2.6.32.46/drivers/mtd/inftlmount.c
34371--- linux-2.6.32.46/drivers/mtd/inftlmount.c 2011-03-27 14:31:47.000000000 -0400
34372+++ linux-2.6.32.46/drivers/mtd/inftlmount.c 2011-05-16 21:46:57.000000000 -0400
34373@@ -54,6 +54,8 @@ static int find_boot_record(struct INFTL
34374 struct INFTLPartition *ip;
34375 size_t retlen;
34376
34377+ pax_track_stack();
34378+
34379 DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
34380
34381 /*
34382diff -urNp linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c
34383--- linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c 2011-03-27 14:31:47.000000000 -0400
34384+++ linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c 2011-05-16 21:46:57.000000000 -0400
34385@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
34386 {
34387 map_word pfow_val[4];
34388
34389+ pax_track_stack();
34390+
34391 /* Check identification string */
34392 pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
34393 pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
34394diff -urNp linux-2.6.32.46/drivers/mtd/mtdchar.c linux-2.6.32.46/drivers/mtd/mtdchar.c
34395--- linux-2.6.32.46/drivers/mtd/mtdchar.c 2011-03-27 14:31:47.000000000 -0400
34396+++ linux-2.6.32.46/drivers/mtd/mtdchar.c 2011-05-16 21:46:57.000000000 -0400
34397@@ -460,6 +460,8 @@ static int mtd_ioctl(struct inode *inode
34398 u_long size;
34399 struct mtd_info_user info;
34400
34401+ pax_track_stack();
34402+
34403 DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
34404
34405 size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
34406diff -urNp linux-2.6.32.46/drivers/mtd/nftlcore.c linux-2.6.32.46/drivers/mtd/nftlcore.c
34407--- linux-2.6.32.46/drivers/mtd/nftlcore.c 2011-03-27 14:31:47.000000000 -0400
34408+++ linux-2.6.32.46/drivers/mtd/nftlcore.c 2011-05-16 21:46:57.000000000 -0400
34409@@ -254,6 +254,8 @@ static u16 NFTL_foldchain (struct NFTLre
34410 int inplace = 1;
34411 size_t retlen;
34412
34413+ pax_track_stack();
34414+
34415 memset(BlockMap, 0xff, sizeof(BlockMap));
34416 memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
34417
34418diff -urNp linux-2.6.32.46/drivers/mtd/nftlmount.c linux-2.6.32.46/drivers/mtd/nftlmount.c
34419--- linux-2.6.32.46/drivers/mtd/nftlmount.c 2011-03-27 14:31:47.000000000 -0400
34420+++ linux-2.6.32.46/drivers/mtd/nftlmount.c 2011-05-18 20:09:37.000000000 -0400
34421@@ -23,6 +23,7 @@
34422 #include <asm/errno.h>
34423 #include <linux/delay.h>
34424 #include <linux/slab.h>
34425+#include <linux/sched.h>
34426 #include <linux/mtd/mtd.h>
34427 #include <linux/mtd/nand.h>
34428 #include <linux/mtd/nftl.h>
34429@@ -44,6 +45,8 @@ static int find_boot_record(struct NFTLr
34430 struct mtd_info *mtd = nftl->mbd.mtd;
34431 unsigned int i;
34432
34433+ pax_track_stack();
34434+
34435 /* Assume logical EraseSize == physical erasesize for starting the scan.
34436 We'll sort it out later if we find a MediaHeader which says otherwise */
34437 /* Actually, we won't. The new DiskOnChip driver has already scanned
34438diff -urNp linux-2.6.32.46/drivers/mtd/ubi/build.c linux-2.6.32.46/drivers/mtd/ubi/build.c
34439--- linux-2.6.32.46/drivers/mtd/ubi/build.c 2011-03-27 14:31:47.000000000 -0400
34440+++ linux-2.6.32.46/drivers/mtd/ubi/build.c 2011-04-17 15:56:46.000000000 -0400
34441@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
34442 static int __init bytes_str_to_int(const char *str)
34443 {
34444 char *endp;
34445- unsigned long result;
34446+ unsigned long result, scale = 1;
34447
34448 result = simple_strtoul(str, &endp, 0);
34449 if (str == endp || result >= INT_MAX) {
34450@@ -1266,11 +1266,11 @@ static int __init bytes_str_to_int(const
34451
34452 switch (*endp) {
34453 case 'G':
34454- result *= 1024;
34455+ scale *= 1024;
34456 case 'M':
34457- result *= 1024;
34458+ scale *= 1024;
34459 case 'K':
34460- result *= 1024;
34461+ scale *= 1024;
34462 if (endp[1] == 'i' && endp[2] == 'B')
34463 endp += 2;
34464 case '\0':
34465@@ -1281,7 +1281,13 @@ static int __init bytes_str_to_int(const
34466 return -EINVAL;
34467 }
34468
34469- return result;
34470+ if ((intoverflow_t)result*scale >= INT_MAX) {
34471+ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
34472+ str);
34473+ return -EINVAL;
34474+ }
34475+
34476+ return result*scale;
34477 }
34478
34479 /**
34480diff -urNp linux-2.6.32.46/drivers/net/bnx2.c linux-2.6.32.46/drivers/net/bnx2.c
34481--- linux-2.6.32.46/drivers/net/bnx2.c 2011-03-27 14:31:47.000000000 -0400
34482+++ linux-2.6.32.46/drivers/net/bnx2.c 2011-05-16 21:46:57.000000000 -0400
34483@@ -5809,6 +5809,8 @@ bnx2_test_nvram(struct bnx2 *bp)
34484 int rc = 0;
34485 u32 magic, csum;
34486
34487+ pax_track_stack();
34488+
34489 if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
34490 goto test_nvram_done;
34491
34492diff -urNp linux-2.6.32.46/drivers/net/cxgb3/l2t.h linux-2.6.32.46/drivers/net/cxgb3/l2t.h
34493--- linux-2.6.32.46/drivers/net/cxgb3/l2t.h 2011-03-27 14:31:47.000000000 -0400
34494+++ linux-2.6.32.46/drivers/net/cxgb3/l2t.h 2011-08-05 20:33:55.000000000 -0400
34495@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
34496 */
34497 struct l2t_skb_cb {
34498 arp_failure_handler_func arp_failure_handler;
34499-};
34500+} __no_const;
34501
34502 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
34503
34504diff -urNp linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c
34505--- linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c 2011-03-27 14:31:47.000000000 -0400
34506+++ linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c 2011-05-16 21:46:57.000000000 -0400
34507@@ -699,6 +699,8 @@ static int get_vpd_params(struct adapter
34508 int i, addr, ret;
34509 struct t3_vpd vpd;
34510
34511+ pax_track_stack();
34512+
34513 /*
34514 * Card information is normally at VPD_BASE but some early cards had
34515 * it at 0.
34516diff -urNp linux-2.6.32.46/drivers/net/e1000e/82571.c linux-2.6.32.46/drivers/net/e1000e/82571.c
34517--- linux-2.6.32.46/drivers/net/e1000e/82571.c 2011-03-27 14:31:47.000000000 -0400
34518+++ linux-2.6.32.46/drivers/net/e1000e/82571.c 2011-08-23 21:22:32.000000000 -0400
34519@@ -212,7 +212,7 @@ static s32 e1000_init_mac_params_82571(s
34520 {
34521 struct e1000_hw *hw = &adapter->hw;
34522 struct e1000_mac_info *mac = &hw->mac;
34523- struct e1000_mac_operations *func = &mac->ops;
34524+ e1000_mac_operations_no_const *func = &mac->ops;
34525 u32 swsm = 0;
34526 u32 swsm2 = 0;
34527 bool force_clear_smbi = false;
34528@@ -1656,7 +1656,7 @@ static void e1000_clear_hw_cntrs_82571(s
34529 temp = er32(ICRXDMTC);
34530 }
34531
34532-static struct e1000_mac_operations e82571_mac_ops = {
34533+static const struct e1000_mac_operations e82571_mac_ops = {
34534 /* .check_mng_mode: mac type dependent */
34535 /* .check_for_link: media type dependent */
34536 .id_led_init = e1000e_id_led_init,
34537@@ -1674,7 +1674,7 @@ static struct e1000_mac_operations e8257
34538 .setup_led = e1000e_setup_led_generic,
34539 };
34540
34541-static struct e1000_phy_operations e82_phy_ops_igp = {
34542+static const struct e1000_phy_operations e82_phy_ops_igp = {
34543 .acquire_phy = e1000_get_hw_semaphore_82571,
34544 .check_reset_block = e1000e_check_reset_block_generic,
34545 .commit_phy = NULL,
34546@@ -1691,7 +1691,7 @@ static struct e1000_phy_operations e82_p
34547 .cfg_on_link_up = NULL,
34548 };
34549
34550-static struct e1000_phy_operations e82_phy_ops_m88 = {
34551+static const struct e1000_phy_operations e82_phy_ops_m88 = {
34552 .acquire_phy = e1000_get_hw_semaphore_82571,
34553 .check_reset_block = e1000e_check_reset_block_generic,
34554 .commit_phy = e1000e_phy_sw_reset,
34555@@ -1708,7 +1708,7 @@ static struct e1000_phy_operations e82_p
34556 .cfg_on_link_up = NULL,
34557 };
34558
34559-static struct e1000_phy_operations e82_phy_ops_bm = {
34560+static const struct e1000_phy_operations e82_phy_ops_bm = {
34561 .acquire_phy = e1000_get_hw_semaphore_82571,
34562 .check_reset_block = e1000e_check_reset_block_generic,
34563 .commit_phy = e1000e_phy_sw_reset,
34564@@ -1725,7 +1725,7 @@ static struct e1000_phy_operations e82_p
34565 .cfg_on_link_up = NULL,
34566 };
34567
34568-static struct e1000_nvm_operations e82571_nvm_ops = {
34569+static const struct e1000_nvm_operations e82571_nvm_ops = {
34570 .acquire_nvm = e1000_acquire_nvm_82571,
34571 .read_nvm = e1000e_read_nvm_eerd,
34572 .release_nvm = e1000_release_nvm_82571,
34573diff -urNp linux-2.6.32.46/drivers/net/e1000e/e1000.h linux-2.6.32.46/drivers/net/e1000e/e1000.h
34574--- linux-2.6.32.46/drivers/net/e1000e/e1000.h 2011-03-27 14:31:47.000000000 -0400
34575+++ linux-2.6.32.46/drivers/net/e1000e/e1000.h 2011-04-17 15:56:46.000000000 -0400
34576@@ -375,9 +375,9 @@ struct e1000_info {
34577 u32 pba;
34578 u32 max_hw_frame_size;
34579 s32 (*get_variants)(struct e1000_adapter *);
34580- struct e1000_mac_operations *mac_ops;
34581- struct e1000_phy_operations *phy_ops;
34582- struct e1000_nvm_operations *nvm_ops;
34583+ const struct e1000_mac_operations *mac_ops;
34584+ const struct e1000_phy_operations *phy_ops;
34585+ const struct e1000_nvm_operations *nvm_ops;
34586 };
34587
34588 /* hardware capability, feature, and workaround flags */
34589diff -urNp linux-2.6.32.46/drivers/net/e1000e/es2lan.c linux-2.6.32.46/drivers/net/e1000e/es2lan.c
34590--- linux-2.6.32.46/drivers/net/e1000e/es2lan.c 2011-03-27 14:31:47.000000000 -0400
34591+++ linux-2.6.32.46/drivers/net/e1000e/es2lan.c 2011-08-23 21:22:32.000000000 -0400
34592@@ -207,7 +207,7 @@ static s32 e1000_init_mac_params_80003es
34593 {
34594 struct e1000_hw *hw = &adapter->hw;
34595 struct e1000_mac_info *mac = &hw->mac;
34596- struct e1000_mac_operations *func = &mac->ops;
34597+ e1000_mac_operations_no_const *func = &mac->ops;
34598
34599 /* Set media type */
34600 switch (adapter->pdev->device) {
34601@@ -1365,7 +1365,7 @@ static void e1000_clear_hw_cntrs_80003es
34602 temp = er32(ICRXDMTC);
34603 }
34604
34605-static struct e1000_mac_operations es2_mac_ops = {
34606+static const struct e1000_mac_operations es2_mac_ops = {
34607 .id_led_init = e1000e_id_led_init,
34608 .check_mng_mode = e1000e_check_mng_mode_generic,
34609 /* check_for_link dependent on media type */
34610@@ -1383,7 +1383,7 @@ static struct e1000_mac_operations es2_m
34611 .setup_led = e1000e_setup_led_generic,
34612 };
34613
34614-static struct e1000_phy_operations es2_phy_ops = {
34615+static const struct e1000_phy_operations es2_phy_ops = {
34616 .acquire_phy = e1000_acquire_phy_80003es2lan,
34617 .check_reset_block = e1000e_check_reset_block_generic,
34618 .commit_phy = e1000e_phy_sw_reset,
34619@@ -1400,7 +1400,7 @@ static struct e1000_phy_operations es2_p
34620 .cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan,
34621 };
34622
34623-static struct e1000_nvm_operations es2_nvm_ops = {
34624+static const struct e1000_nvm_operations es2_nvm_ops = {
34625 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
34626 .read_nvm = e1000e_read_nvm_eerd,
34627 .release_nvm = e1000_release_nvm_80003es2lan,
34628diff -urNp linux-2.6.32.46/drivers/net/e1000e/hw.h linux-2.6.32.46/drivers/net/e1000e/hw.h
34629--- linux-2.6.32.46/drivers/net/e1000e/hw.h 2011-03-27 14:31:47.000000000 -0400
34630+++ linux-2.6.32.46/drivers/net/e1000e/hw.h 2011-08-23 21:27:38.000000000 -0400
34631@@ -753,6 +753,7 @@ struct e1000_mac_operations {
34632 s32 (*setup_physical_interface)(struct e1000_hw *);
34633 s32 (*setup_led)(struct e1000_hw *);
34634 };
34635+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34636
34637 /* Function pointers for the PHY. */
34638 struct e1000_phy_operations {
34639@@ -774,6 +775,7 @@ struct e1000_phy_operations {
34640 s32 (*write_phy_reg_locked)(struct e1000_hw *, u32, u16);
34641 s32 (*cfg_on_link_up)(struct e1000_hw *);
34642 };
34643+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34644
34645 /* Function pointers for the NVM. */
34646 struct e1000_nvm_operations {
34647@@ -785,9 +787,10 @@ struct e1000_nvm_operations {
34648 s32 (*validate_nvm)(struct e1000_hw *);
34649 s32 (*write_nvm)(struct e1000_hw *, u16, u16, u16 *);
34650 };
34651+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34652
34653 struct e1000_mac_info {
34654- struct e1000_mac_operations ops;
34655+ e1000_mac_operations_no_const ops;
34656
34657 u8 addr[6];
34658 u8 perm_addr[6];
34659@@ -823,7 +826,7 @@ struct e1000_mac_info {
34660 };
34661
34662 struct e1000_phy_info {
34663- struct e1000_phy_operations ops;
34664+ e1000_phy_operations_no_const ops;
34665
34666 enum e1000_phy_type type;
34667
34668@@ -857,7 +860,7 @@ struct e1000_phy_info {
34669 };
34670
34671 struct e1000_nvm_info {
34672- struct e1000_nvm_operations ops;
34673+ e1000_nvm_operations_no_const ops;
34674
34675 enum e1000_nvm_type type;
34676 enum e1000_nvm_override override;
34677diff -urNp linux-2.6.32.46/drivers/net/e1000e/ich8lan.c linux-2.6.32.46/drivers/net/e1000e/ich8lan.c
34678--- linux-2.6.32.46/drivers/net/e1000e/ich8lan.c 2011-05-10 22:12:01.000000000 -0400
34679+++ linux-2.6.32.46/drivers/net/e1000e/ich8lan.c 2011-08-23 21:22:32.000000000 -0400
34680@@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan
34681 }
34682 }
34683
34684-static struct e1000_mac_operations ich8_mac_ops = {
34685+static const struct e1000_mac_operations ich8_mac_ops = {
34686 .id_led_init = e1000e_id_led_init,
34687 .check_mng_mode = e1000_check_mng_mode_ich8lan,
34688 .check_for_link = e1000_check_for_copper_link_ich8lan,
34689@@ -3481,7 +3481,7 @@ static struct e1000_mac_operations ich8_
34690 /* id_led_init dependent on mac type */
34691 };
34692
34693-static struct e1000_phy_operations ich8_phy_ops = {
34694+static const struct e1000_phy_operations ich8_phy_ops = {
34695 .acquire_phy = e1000_acquire_swflag_ich8lan,
34696 .check_reset_block = e1000_check_reset_block_ich8lan,
34697 .commit_phy = NULL,
34698@@ -3497,7 +3497,7 @@ static struct e1000_phy_operations ich8_
34699 .write_phy_reg = e1000e_write_phy_reg_igp,
34700 };
34701
34702-static struct e1000_nvm_operations ich8_nvm_ops = {
34703+static const struct e1000_nvm_operations ich8_nvm_ops = {
34704 .acquire_nvm = e1000_acquire_nvm_ich8lan,
34705 .read_nvm = e1000_read_nvm_ich8lan,
34706 .release_nvm = e1000_release_nvm_ich8lan,
34707diff -urNp linux-2.6.32.46/drivers/net/hamradio/6pack.c linux-2.6.32.46/drivers/net/hamradio/6pack.c
34708--- linux-2.6.32.46/drivers/net/hamradio/6pack.c 2011-07-13 17:23:04.000000000 -0400
34709+++ linux-2.6.32.46/drivers/net/hamradio/6pack.c 2011-07-13 17:23:18.000000000 -0400
34710@@ -461,6 +461,8 @@ static void sixpack_receive_buf(struct t
34711 unsigned char buf[512];
34712 int count1;
34713
34714+ pax_track_stack();
34715+
34716 if (!count)
34717 return;
34718
34719diff -urNp linux-2.6.32.46/drivers/net/ibmveth.c linux-2.6.32.46/drivers/net/ibmveth.c
34720--- linux-2.6.32.46/drivers/net/ibmveth.c 2011-03-27 14:31:47.000000000 -0400
34721+++ linux-2.6.32.46/drivers/net/ibmveth.c 2011-04-17 15:56:46.000000000 -0400
34722@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
34723 NULL,
34724 };
34725
34726-static struct sysfs_ops veth_pool_ops = {
34727+static const struct sysfs_ops veth_pool_ops = {
34728 .show = veth_pool_show,
34729 .store = veth_pool_store,
34730 };
34731diff -urNp linux-2.6.32.46/drivers/net/igb/e1000_82575.c linux-2.6.32.46/drivers/net/igb/e1000_82575.c
34732--- linux-2.6.32.46/drivers/net/igb/e1000_82575.c 2011-08-29 22:24:44.000000000 -0400
34733+++ linux-2.6.32.46/drivers/net/igb/e1000_82575.c 2011-08-29 22:25:07.000000000 -0400
34734@@ -1411,7 +1411,7 @@ void igb_vmdq_set_replication_pf(struct
34735 wr32(E1000_VT_CTL, vt_ctl);
34736 }
34737
34738-static struct e1000_mac_operations e1000_mac_ops_82575 = {
34739+static const struct e1000_mac_operations e1000_mac_ops_82575 = {
34740 .reset_hw = igb_reset_hw_82575,
34741 .init_hw = igb_init_hw_82575,
34742 .check_for_link = igb_check_for_link_82575,
34743@@ -1420,13 +1420,13 @@ static struct e1000_mac_operations e1000
34744 .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
34745 };
34746
34747-static struct e1000_phy_operations e1000_phy_ops_82575 = {
34748+static const struct e1000_phy_operations e1000_phy_ops_82575 = {
34749 .acquire = igb_acquire_phy_82575,
34750 .get_cfg_done = igb_get_cfg_done_82575,
34751 .release = igb_release_phy_82575,
34752 };
34753
34754-static struct e1000_nvm_operations e1000_nvm_ops_82575 = {
34755+static const struct e1000_nvm_operations e1000_nvm_ops_82575 = {
34756 .acquire = igb_acquire_nvm_82575,
34757 .read = igb_read_nvm_eerd,
34758 .release = igb_release_nvm_82575,
34759diff -urNp linux-2.6.32.46/drivers/net/igb/e1000_hw.h linux-2.6.32.46/drivers/net/igb/e1000_hw.h
34760--- linux-2.6.32.46/drivers/net/igb/e1000_hw.h 2011-03-27 14:31:47.000000000 -0400
34761+++ linux-2.6.32.46/drivers/net/igb/e1000_hw.h 2011-08-23 21:28:01.000000000 -0400
34762@@ -288,6 +288,7 @@ struct e1000_mac_operations {
34763 s32 (*read_mac_addr)(struct e1000_hw *);
34764 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
34765 };
34766+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34767
34768 struct e1000_phy_operations {
34769 s32 (*acquire)(struct e1000_hw *);
34770@@ -303,6 +304,7 @@ struct e1000_phy_operations {
34771 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
34772 s32 (*write_reg)(struct e1000_hw *, u32, u16);
34773 };
34774+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34775
34776 struct e1000_nvm_operations {
34777 s32 (*acquire)(struct e1000_hw *);
34778@@ -310,6 +312,7 @@ struct e1000_nvm_operations {
34779 void (*release)(struct e1000_hw *);
34780 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
34781 };
34782+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34783
34784 struct e1000_info {
34785 s32 (*get_invariants)(struct e1000_hw *);
34786@@ -321,7 +324,7 @@ struct e1000_info {
34787 extern const struct e1000_info e1000_82575_info;
34788
34789 struct e1000_mac_info {
34790- struct e1000_mac_operations ops;
34791+ e1000_mac_operations_no_const ops;
34792
34793 u8 addr[6];
34794 u8 perm_addr[6];
34795@@ -365,7 +368,7 @@ struct e1000_mac_info {
34796 };
34797
34798 struct e1000_phy_info {
34799- struct e1000_phy_operations ops;
34800+ e1000_phy_operations_no_const ops;
34801
34802 enum e1000_phy_type type;
34803
34804@@ -400,7 +403,7 @@ struct e1000_phy_info {
34805 };
34806
34807 struct e1000_nvm_info {
34808- struct e1000_nvm_operations ops;
34809+ e1000_nvm_operations_no_const ops;
34810
34811 enum e1000_nvm_type type;
34812 enum e1000_nvm_override override;
34813@@ -446,6 +449,7 @@ struct e1000_mbx_operations {
34814 s32 (*check_for_ack)(struct e1000_hw *, u16);
34815 s32 (*check_for_rst)(struct e1000_hw *, u16);
34816 };
34817+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
34818
34819 struct e1000_mbx_stats {
34820 u32 msgs_tx;
34821@@ -457,7 +461,7 @@ struct e1000_mbx_stats {
34822 };
34823
34824 struct e1000_mbx_info {
34825- struct e1000_mbx_operations ops;
34826+ e1000_mbx_operations_no_const ops;
34827 struct e1000_mbx_stats stats;
34828 u32 timeout;
34829 u32 usec_delay;
34830diff -urNp linux-2.6.32.46/drivers/net/igbvf/vf.h linux-2.6.32.46/drivers/net/igbvf/vf.h
34831--- linux-2.6.32.46/drivers/net/igbvf/vf.h 2011-03-27 14:31:47.000000000 -0400
34832+++ linux-2.6.32.46/drivers/net/igbvf/vf.h 2011-08-23 21:22:38.000000000 -0400
34833@@ -187,9 +187,10 @@ struct e1000_mac_operations {
34834 s32 (*read_mac_addr)(struct e1000_hw *);
34835 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
34836 };
34837+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34838
34839 struct e1000_mac_info {
34840- struct e1000_mac_operations ops;
34841+ e1000_mac_operations_no_const ops;
34842 u8 addr[6];
34843 u8 perm_addr[6];
34844
34845@@ -211,6 +212,7 @@ struct e1000_mbx_operations {
34846 s32 (*check_for_ack)(struct e1000_hw *);
34847 s32 (*check_for_rst)(struct e1000_hw *);
34848 };
34849+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
34850
34851 struct e1000_mbx_stats {
34852 u32 msgs_tx;
34853@@ -222,7 +224,7 @@ struct e1000_mbx_stats {
34854 };
34855
34856 struct e1000_mbx_info {
34857- struct e1000_mbx_operations ops;
34858+ e1000_mbx_operations_no_const ops;
34859 struct e1000_mbx_stats stats;
34860 u32 timeout;
34861 u32 usec_delay;
34862diff -urNp linux-2.6.32.46/drivers/net/iseries_veth.c linux-2.6.32.46/drivers/net/iseries_veth.c
34863--- linux-2.6.32.46/drivers/net/iseries_veth.c 2011-03-27 14:31:47.000000000 -0400
34864+++ linux-2.6.32.46/drivers/net/iseries_veth.c 2011-04-17 15:56:46.000000000 -0400
34865@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
34866 NULL
34867 };
34868
34869-static struct sysfs_ops veth_cnx_sysfs_ops = {
34870+static const struct sysfs_ops veth_cnx_sysfs_ops = {
34871 .show = veth_cnx_attribute_show
34872 };
34873
34874@@ -441,7 +441,7 @@ static struct attribute *veth_port_defau
34875 NULL
34876 };
34877
34878-static struct sysfs_ops veth_port_sysfs_ops = {
34879+static const struct sysfs_ops veth_port_sysfs_ops = {
34880 .show = veth_port_attribute_show
34881 };
34882
34883diff -urNp linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c
34884--- linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c 2011-03-27 14:31:47.000000000 -0400
34885+++ linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c 2011-05-16 21:46:57.000000000 -0400
34886@@ -1052,6 +1052,8 @@ ixgb_set_multi(struct net_device *netdev
34887 u32 rctl;
34888 int i;
34889
34890+ pax_track_stack();
34891+
34892 /* Check for Promiscuous and All Multicast modes */
34893
34894 rctl = IXGB_READ_REG(hw, RCTL);
34895diff -urNp linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c
34896--- linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c 2011-03-27 14:31:47.000000000 -0400
34897+++ linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c 2011-05-16 21:46:57.000000000 -0400
34898@@ -260,6 +260,9 @@ void __devinit
34899 ixgb_check_options(struct ixgb_adapter *adapter)
34900 {
34901 int bd = adapter->bd_number;
34902+
34903+ pax_track_stack();
34904+
34905 if (bd >= IXGB_MAX_NIC) {
34906 printk(KERN_NOTICE
34907 "Warning: no configuration for board #%i\n", bd);
34908diff -urNp linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h
34909--- linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h 2011-03-27 14:31:47.000000000 -0400
34910+++ linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:22:38.000000000 -0400
34911@@ -2327,6 +2327,7 @@ struct ixgbe_eeprom_operations {
34912 s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
34913 s32 (*update_checksum)(struct ixgbe_hw *);
34914 };
34915+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
34916
34917 struct ixgbe_mac_operations {
34918 s32 (*init_hw)(struct ixgbe_hw *);
34919@@ -2376,6 +2377,7 @@ struct ixgbe_mac_operations {
34920 /* Flow Control */
34921 s32 (*fc_enable)(struct ixgbe_hw *, s32);
34922 };
34923+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
34924
34925 struct ixgbe_phy_operations {
34926 s32 (*identify)(struct ixgbe_hw *);
34927@@ -2394,9 +2396,10 @@ struct ixgbe_phy_operations {
34928 s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8 , u8 *);
34929 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
34930 };
34931+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
34932
34933 struct ixgbe_eeprom_info {
34934- struct ixgbe_eeprom_operations ops;
34935+ ixgbe_eeprom_operations_no_const ops;
34936 enum ixgbe_eeprom_type type;
34937 u32 semaphore_delay;
34938 u16 word_size;
34939@@ -2404,7 +2407,7 @@ struct ixgbe_eeprom_info {
34940 };
34941
34942 struct ixgbe_mac_info {
34943- struct ixgbe_mac_operations ops;
34944+ ixgbe_mac_operations_no_const ops;
34945 enum ixgbe_mac_type type;
34946 u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
34947 u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
34948@@ -2423,7 +2426,7 @@ struct ixgbe_mac_info {
34949 };
34950
34951 struct ixgbe_phy_info {
34952- struct ixgbe_phy_operations ops;
34953+ ixgbe_phy_operations_no_const ops;
34954 struct mdio_if_info mdio;
34955 enum ixgbe_phy_type type;
34956 u32 id;
34957diff -urNp linux-2.6.32.46/drivers/net/mlx4/main.c linux-2.6.32.46/drivers/net/mlx4/main.c
34958--- linux-2.6.32.46/drivers/net/mlx4/main.c 2011-03-27 14:31:47.000000000 -0400
34959+++ linux-2.6.32.46/drivers/net/mlx4/main.c 2011-05-18 20:09:37.000000000 -0400
34960@@ -38,6 +38,7 @@
34961 #include <linux/errno.h>
34962 #include <linux/pci.h>
34963 #include <linux/dma-mapping.h>
34964+#include <linux/sched.h>
34965
34966 #include <linux/mlx4/device.h>
34967 #include <linux/mlx4/doorbell.h>
34968@@ -730,6 +731,8 @@ static int mlx4_init_hca(struct mlx4_dev
34969 u64 icm_size;
34970 int err;
34971
34972+ pax_track_stack();
34973+
34974 err = mlx4_QUERY_FW(dev);
34975 if (err) {
34976 if (err == -EACCES)
34977diff -urNp linux-2.6.32.46/drivers/net/niu.c linux-2.6.32.46/drivers/net/niu.c
34978--- linux-2.6.32.46/drivers/net/niu.c 2011-05-10 22:12:01.000000000 -0400
34979+++ linux-2.6.32.46/drivers/net/niu.c 2011-05-16 21:46:57.000000000 -0400
34980@@ -9128,6 +9128,8 @@ static void __devinit niu_try_msix(struc
34981 int i, num_irqs, err;
34982 u8 first_ldg;
34983
34984+ pax_track_stack();
34985+
34986 first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
34987 for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
34988 ldg_num_map[i] = first_ldg + i;
34989diff -urNp linux-2.6.32.46/drivers/net/pcnet32.c linux-2.6.32.46/drivers/net/pcnet32.c
34990--- linux-2.6.32.46/drivers/net/pcnet32.c 2011-03-27 14:31:47.000000000 -0400
34991+++ linux-2.6.32.46/drivers/net/pcnet32.c 2011-08-05 20:33:55.000000000 -0400
34992@@ -79,7 +79,7 @@ static int cards_found;
34993 /*
34994 * VLB I/O addresses
34995 */
34996-static unsigned int pcnet32_portlist[] __initdata =
34997+static unsigned int pcnet32_portlist[] __devinitdata =
34998 { 0x300, 0x320, 0x340, 0x360, 0 };
34999
35000 static int pcnet32_debug = 0;
35001@@ -267,7 +267,7 @@ struct pcnet32_private {
35002 struct sk_buff **rx_skbuff;
35003 dma_addr_t *tx_dma_addr;
35004 dma_addr_t *rx_dma_addr;
35005- struct pcnet32_access a;
35006+ struct pcnet32_access *a;
35007 spinlock_t lock; /* Guard lock */
35008 unsigned int cur_rx, cur_tx; /* The next free ring entry */
35009 unsigned int rx_ring_size; /* current rx ring size */
35010@@ -457,9 +457,9 @@ static void pcnet32_netif_start(struct n
35011 u16 val;
35012
35013 netif_wake_queue(dev);
35014- val = lp->a.read_csr(ioaddr, CSR3);
35015+ val = lp->a->read_csr(ioaddr, CSR3);
35016 val &= 0x00ff;
35017- lp->a.write_csr(ioaddr, CSR3, val);
35018+ lp->a->write_csr(ioaddr, CSR3, val);
35019 napi_enable(&lp->napi);
35020 }
35021
35022@@ -744,7 +744,7 @@ static u32 pcnet32_get_link(struct net_d
35023 r = mii_link_ok(&lp->mii_if);
35024 } else if (lp->chip_version >= PCNET32_79C970A) {
35025 ulong ioaddr = dev->base_addr; /* card base I/O address */
35026- r = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
35027+ r = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
35028 } else { /* can not detect link on really old chips */
35029 r = 1;
35030 }
35031@@ -806,7 +806,7 @@ static int pcnet32_set_ringparam(struct
35032 pcnet32_netif_stop(dev);
35033
35034 spin_lock_irqsave(&lp->lock, flags);
35035- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
35036+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
35037
35038 size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
35039
35040@@ -886,7 +886,7 @@ static void pcnet32_ethtool_test(struct
35041 static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
35042 {
35043 struct pcnet32_private *lp = netdev_priv(dev);
35044- struct pcnet32_access *a = &lp->a; /* access to registers */
35045+ struct pcnet32_access *a = lp->a; /* access to registers */
35046 ulong ioaddr = dev->base_addr; /* card base I/O address */
35047 struct sk_buff *skb; /* sk buff */
35048 int x, i; /* counters */
35049@@ -906,21 +906,21 @@ static int pcnet32_loopback_test(struct
35050 pcnet32_netif_stop(dev);
35051
35052 spin_lock_irqsave(&lp->lock, flags);
35053- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
35054+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
35055
35056 numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
35057
35058 /* Reset the PCNET32 */
35059- lp->a.reset(ioaddr);
35060- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
35061+ lp->a->reset(ioaddr);
35062+ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
35063
35064 /* switch pcnet32 to 32bit mode */
35065- lp->a.write_bcr(ioaddr, 20, 2);
35066+ lp->a->write_bcr(ioaddr, 20, 2);
35067
35068 /* purge & init rings but don't actually restart */
35069 pcnet32_restart(dev, 0x0000);
35070
35071- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
35072+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
35073
35074 /* Initialize Transmit buffers. */
35075 size = data_len + 15;
35076@@ -966,10 +966,10 @@ static int pcnet32_loopback_test(struct
35077
35078 /* set int loopback in CSR15 */
35079 x = a->read_csr(ioaddr, CSR15) & 0xfffc;
35080- lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
35081+ lp->a->write_csr(ioaddr, CSR15, x | 0x0044);
35082
35083 teststatus = cpu_to_le16(0x8000);
35084- lp->a.write_csr(ioaddr, CSR0, CSR0_START); /* Set STRT bit */
35085+ lp->a->write_csr(ioaddr, CSR0, CSR0_START); /* Set STRT bit */
35086
35087 /* Check status of descriptors */
35088 for (x = 0; x < numbuffs; x++) {
35089@@ -990,7 +990,7 @@ static int pcnet32_loopback_test(struct
35090 }
35091 }
35092
35093- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
35094+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
35095 wmb();
35096 if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
35097 printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
35098@@ -1039,7 +1039,7 @@ static int pcnet32_loopback_test(struct
35099 pcnet32_restart(dev, CSR0_NORMAL);
35100 } else {
35101 pcnet32_purge_rx_ring(dev);
35102- lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
35103+ lp->a->write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
35104 }
35105 spin_unlock_irqrestore(&lp->lock, flags);
35106
35107@@ -1049,7 +1049,7 @@ static int pcnet32_loopback_test(struct
35108 static void pcnet32_led_blink_callback(struct net_device *dev)
35109 {
35110 struct pcnet32_private *lp = netdev_priv(dev);
35111- struct pcnet32_access *a = &lp->a;
35112+ struct pcnet32_access *a = lp->a;
35113 ulong ioaddr = dev->base_addr;
35114 unsigned long flags;
35115 int i;
35116@@ -1066,7 +1066,7 @@ static void pcnet32_led_blink_callback(s
35117 static int pcnet32_phys_id(struct net_device *dev, u32 data)
35118 {
35119 struct pcnet32_private *lp = netdev_priv(dev);
35120- struct pcnet32_access *a = &lp->a;
35121+ struct pcnet32_access *a = lp->a;
35122 ulong ioaddr = dev->base_addr;
35123 unsigned long flags;
35124 int i, regs[4];
35125@@ -1112,7 +1112,7 @@ static int pcnet32_suspend(struct net_de
35126 {
35127 int csr5;
35128 struct pcnet32_private *lp = netdev_priv(dev);
35129- struct pcnet32_access *a = &lp->a;
35130+ struct pcnet32_access *a = lp->a;
35131 ulong ioaddr = dev->base_addr;
35132 int ticks;
35133
35134@@ -1388,8 +1388,8 @@ static int pcnet32_poll(struct napi_stru
35135 spin_lock_irqsave(&lp->lock, flags);
35136 if (pcnet32_tx(dev)) {
35137 /* reset the chip to clear the error condition, then restart */
35138- lp->a.reset(ioaddr);
35139- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
35140+ lp->a->reset(ioaddr);
35141+ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
35142 pcnet32_restart(dev, CSR0_START);
35143 netif_wake_queue(dev);
35144 }
35145@@ -1401,12 +1401,12 @@ static int pcnet32_poll(struct napi_stru
35146 __napi_complete(napi);
35147
35148 /* clear interrupt masks */
35149- val = lp->a.read_csr(ioaddr, CSR3);
35150+ val = lp->a->read_csr(ioaddr, CSR3);
35151 val &= 0x00ff;
35152- lp->a.write_csr(ioaddr, CSR3, val);
35153+ lp->a->write_csr(ioaddr, CSR3, val);
35154
35155 /* Set interrupt enable. */
35156- lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
35157+ lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN);
35158
35159 spin_unlock_irqrestore(&lp->lock, flags);
35160 }
35161@@ -1429,7 +1429,7 @@ static void pcnet32_get_regs(struct net_
35162 int i, csr0;
35163 u16 *buff = ptr;
35164 struct pcnet32_private *lp = netdev_priv(dev);
35165- struct pcnet32_access *a = &lp->a;
35166+ struct pcnet32_access *a = lp->a;
35167 ulong ioaddr = dev->base_addr;
35168 unsigned long flags;
35169
35170@@ -1466,9 +1466,9 @@ static void pcnet32_get_regs(struct net_
35171 for (j = 0; j < PCNET32_MAX_PHYS; j++) {
35172 if (lp->phymask & (1 << j)) {
35173 for (i = 0; i < PCNET32_REGS_PER_PHY; i++) {
35174- lp->a.write_bcr(ioaddr, 33,
35175+ lp->a->write_bcr(ioaddr, 33,
35176 (j << 5) | i);
35177- *buff++ = lp->a.read_bcr(ioaddr, 34);
35178+ *buff++ = lp->a->read_bcr(ioaddr, 34);
35179 }
35180 }
35181 }
35182@@ -1858,7 +1858,7 @@ pcnet32_probe1(unsigned long ioaddr, int
35183 ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
35184 lp->options |= PCNET32_PORT_FD;
35185
35186- lp->a = *a;
35187+ lp->a = a;
35188
35189 /* prior to register_netdev, dev->name is not yet correct */
35190 if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) {
35191@@ -1917,7 +1917,7 @@ pcnet32_probe1(unsigned long ioaddr, int
35192 if (lp->mii) {
35193 /* lp->phycount and lp->phymask are set to 0 by memset above */
35194
35195- lp->mii_if.phy_id = ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f;
35196+ lp->mii_if.phy_id = ((lp->a->read_bcr(ioaddr, 33)) >> 5) & 0x1f;
35197 /* scan for PHYs */
35198 for (i = 0; i < PCNET32_MAX_PHYS; i++) {
35199 unsigned short id1, id2;
35200@@ -1938,7 +1938,7 @@ pcnet32_probe1(unsigned long ioaddr, int
35201 "Found PHY %04x:%04x at address %d.\n",
35202 id1, id2, i);
35203 }
35204- lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
35205+ lp->a->write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
35206 if (lp->phycount > 1) {
35207 lp->options |= PCNET32_PORT_MII;
35208 }
35209@@ -2109,10 +2109,10 @@ static int pcnet32_open(struct net_devic
35210 }
35211
35212 /* Reset the PCNET32 */
35213- lp->a.reset(ioaddr);
35214+ lp->a->reset(ioaddr);
35215
35216 /* switch pcnet32 to 32bit mode */
35217- lp->a.write_bcr(ioaddr, 20, 2);
35218+ lp->a->write_bcr(ioaddr, 20, 2);
35219
35220 if (netif_msg_ifup(lp))
35221 printk(KERN_DEBUG
35222@@ -2122,14 +2122,14 @@ static int pcnet32_open(struct net_devic
35223 (u32) (lp->init_dma_addr));
35224
35225 /* set/reset autoselect bit */
35226- val = lp->a.read_bcr(ioaddr, 2) & ~2;
35227+ val = lp->a->read_bcr(ioaddr, 2) & ~2;
35228 if (lp->options & PCNET32_PORT_ASEL)
35229 val |= 2;
35230- lp->a.write_bcr(ioaddr, 2, val);
35231+ lp->a->write_bcr(ioaddr, 2, val);
35232
35233 /* handle full duplex setting */
35234 if (lp->mii_if.full_duplex) {
35235- val = lp->a.read_bcr(ioaddr, 9) & ~3;
35236+ val = lp->a->read_bcr(ioaddr, 9) & ~3;
35237 if (lp->options & PCNET32_PORT_FD) {
35238 val |= 1;
35239 if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
35240@@ -2139,14 +2139,14 @@ static int pcnet32_open(struct net_devic
35241 if (lp->chip_version == 0x2627)
35242 val |= 3;
35243 }
35244- lp->a.write_bcr(ioaddr, 9, val);
35245+ lp->a->write_bcr(ioaddr, 9, val);
35246 }
35247
35248 /* set/reset GPSI bit in test register */
35249- val = lp->a.read_csr(ioaddr, 124) & ~0x10;
35250+ val = lp->a->read_csr(ioaddr, 124) & ~0x10;
35251 if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
35252 val |= 0x10;
35253- lp->a.write_csr(ioaddr, 124, val);
35254+ lp->a->write_csr(ioaddr, 124, val);
35255
35256 /* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate */
35257 if (pdev && pdev->subsystem_vendor == PCI_VENDOR_ID_AT &&
35258@@ -2167,24 +2167,24 @@ static int pcnet32_open(struct net_devic
35259 * duplex, and/or enable auto negotiation, and clear DANAS
35260 */
35261 if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
35262- lp->a.write_bcr(ioaddr, 32,
35263- lp->a.read_bcr(ioaddr, 32) | 0x0080);
35264+ lp->a->write_bcr(ioaddr, 32,
35265+ lp->a->read_bcr(ioaddr, 32) | 0x0080);
35266 /* disable Auto Negotiation, set 10Mpbs, HD */
35267- val = lp->a.read_bcr(ioaddr, 32) & ~0xb8;
35268+ val = lp->a->read_bcr(ioaddr, 32) & ~0xb8;
35269 if (lp->options & PCNET32_PORT_FD)
35270 val |= 0x10;
35271 if (lp->options & PCNET32_PORT_100)
35272 val |= 0x08;
35273- lp->a.write_bcr(ioaddr, 32, val);
35274+ lp->a->write_bcr(ioaddr, 32, val);
35275 } else {
35276 if (lp->options & PCNET32_PORT_ASEL) {
35277- lp->a.write_bcr(ioaddr, 32,
35278- lp->a.read_bcr(ioaddr,
35279+ lp->a->write_bcr(ioaddr, 32,
35280+ lp->a->read_bcr(ioaddr,
35281 32) | 0x0080);
35282 /* enable auto negotiate, setup, disable fd */
35283- val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
35284+ val = lp->a->read_bcr(ioaddr, 32) & ~0x98;
35285 val |= 0x20;
35286- lp->a.write_bcr(ioaddr, 32, val);
35287+ lp->a->write_bcr(ioaddr, 32, val);
35288 }
35289 }
35290 } else {
35291@@ -2197,10 +2197,10 @@ static int pcnet32_open(struct net_devic
35292 * There is really no good other way to handle multiple PHYs
35293 * other than turning off all automatics
35294 */
35295- val = lp->a.read_bcr(ioaddr, 2);
35296- lp->a.write_bcr(ioaddr, 2, val & ~2);
35297- val = lp->a.read_bcr(ioaddr, 32);
35298- lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7)); /* stop MII manager */
35299+ val = lp->a->read_bcr(ioaddr, 2);
35300+ lp->a->write_bcr(ioaddr, 2, val & ~2);
35301+ val = lp->a->read_bcr(ioaddr, 32);
35302+ lp->a->write_bcr(ioaddr, 32, val & ~(1 << 7)); /* stop MII manager */
35303
35304 if (!(lp->options & PCNET32_PORT_ASEL)) {
35305 /* setup ecmd */
35306@@ -2210,7 +2210,7 @@ static int pcnet32_open(struct net_devic
35307 ecmd.speed =
35308 lp->
35309 options & PCNET32_PORT_100 ? SPEED_100 : SPEED_10;
35310- bcr9 = lp->a.read_bcr(ioaddr, 9);
35311+ bcr9 = lp->a->read_bcr(ioaddr, 9);
35312
35313 if (lp->options & PCNET32_PORT_FD) {
35314 ecmd.duplex = DUPLEX_FULL;
35315@@ -2219,7 +2219,7 @@ static int pcnet32_open(struct net_devic
35316 ecmd.duplex = DUPLEX_HALF;
35317 bcr9 |= ~(1 << 0);
35318 }
35319- lp->a.write_bcr(ioaddr, 9, bcr9);
35320+ lp->a->write_bcr(ioaddr, 9, bcr9);
35321 }
35322
35323 for (i = 0; i < PCNET32_MAX_PHYS; i++) {
35324@@ -2252,9 +2252,9 @@ static int pcnet32_open(struct net_devic
35325
35326 #ifdef DO_DXSUFLO
35327 if (lp->dxsuflo) { /* Disable transmit stop on underflow */
35328- val = lp->a.read_csr(ioaddr, CSR3);
35329+ val = lp->a->read_csr(ioaddr, CSR3);
35330 val |= 0x40;
35331- lp->a.write_csr(ioaddr, CSR3, val);
35332+ lp->a->write_csr(ioaddr, CSR3, val);
35333 }
35334 #endif
35335
35336@@ -2270,11 +2270,11 @@ static int pcnet32_open(struct net_devic
35337 napi_enable(&lp->napi);
35338
35339 /* Re-initialize the PCNET32, and start it when done. */
35340- lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
35341- lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
35342+ lp->a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
35343+ lp->a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
35344
35345- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
35346- lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
35347+ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
35348+ lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
35349
35350 netif_start_queue(dev);
35351
35352@@ -2286,20 +2286,20 @@ static int pcnet32_open(struct net_devic
35353
35354 i = 0;
35355 while (i++ < 100)
35356- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
35357+ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
35358 break;
35359 /*
35360 * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
35361 * reports that doing so triggers a bug in the '974.
35362 */
35363- lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
35364+ lp->a->write_csr(ioaddr, CSR0, CSR0_NORMAL);
35365
35366 if (netif_msg_ifup(lp))
35367 printk(KERN_DEBUG
35368 "%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n",
35369 dev->name, i,
35370 (u32) (lp->init_dma_addr),
35371- lp->a.read_csr(ioaddr, CSR0));
35372+ lp->a->read_csr(ioaddr, CSR0));
35373
35374 spin_unlock_irqrestore(&lp->lock, flags);
35375
35376@@ -2313,7 +2313,7 @@ static int pcnet32_open(struct net_devic
35377 * Switch back to 16bit mode to avoid problems with dumb
35378 * DOS packet driver after a warm reboot
35379 */
35380- lp->a.write_bcr(ioaddr, 20, 4);
35381+ lp->a->write_bcr(ioaddr, 20, 4);
35382
35383 err_free_irq:
35384 spin_unlock_irqrestore(&lp->lock, flags);
35385@@ -2420,7 +2420,7 @@ static void pcnet32_restart(struct net_d
35386
35387 /* wait for stop */
35388 for (i = 0; i < 100; i++)
35389- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
35390+ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_STOP)
35391 break;
35392
35393 if (i >= 100 && netif_msg_drv(lp))
35394@@ -2433,13 +2433,13 @@ static void pcnet32_restart(struct net_d
35395 return;
35396
35397 /* ReInit Ring */
35398- lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
35399+ lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
35400 i = 0;
35401 while (i++ < 1000)
35402- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
35403+ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
35404 break;
35405
35406- lp->a.write_csr(ioaddr, CSR0, csr0_bits);
35407+ lp->a->write_csr(ioaddr, CSR0, csr0_bits);
35408 }
35409
35410 static void pcnet32_tx_timeout(struct net_device *dev)
35411@@ -2452,8 +2452,8 @@ static void pcnet32_tx_timeout(struct ne
35412 if (pcnet32_debug & NETIF_MSG_DRV)
35413 printk(KERN_ERR
35414 "%s: transmit timed out, status %4.4x, resetting.\n",
35415- dev->name, lp->a.read_csr(ioaddr, CSR0));
35416- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
35417+ dev->name, lp->a->read_csr(ioaddr, CSR0));
35418+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
35419 dev->stats.tx_errors++;
35420 if (netif_msg_tx_err(lp)) {
35421 int i;
35422@@ -2497,7 +2497,7 @@ static netdev_tx_t pcnet32_start_xmit(st
35423 if (netif_msg_tx_queued(lp)) {
35424 printk(KERN_DEBUG
35425 "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n",
35426- dev->name, lp->a.read_csr(ioaddr, CSR0));
35427+ dev->name, lp->a->read_csr(ioaddr, CSR0));
35428 }
35429
35430 /* Default status -- will not enable Successful-TxDone
35431@@ -2528,7 +2528,7 @@ static netdev_tx_t pcnet32_start_xmit(st
35432 dev->stats.tx_bytes += skb->len;
35433
35434 /* Trigger an immediate send poll. */
35435- lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
35436+ lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
35437
35438 dev->trans_start = jiffies;
35439
35440@@ -2555,18 +2555,18 @@ pcnet32_interrupt(int irq, void *dev_id)
35441
35442 spin_lock(&lp->lock);
35443
35444- csr0 = lp->a.read_csr(ioaddr, CSR0);
35445+ csr0 = lp->a->read_csr(ioaddr, CSR0);
35446 while ((csr0 & 0x8f00) && --boguscnt >= 0) {
35447 if (csr0 == 0xffff) {
35448 break; /* PCMCIA remove happened */
35449 }
35450 /* Acknowledge all of the current interrupt sources ASAP. */
35451- lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
35452+ lp->a->write_csr(ioaddr, CSR0, csr0 & ~0x004f);
35453
35454 if (netif_msg_intr(lp))
35455 printk(KERN_DEBUG
35456 "%s: interrupt csr0=%#2.2x new csr=%#2.2x.\n",
35457- dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
35458+ dev->name, csr0, lp->a->read_csr(ioaddr, CSR0));
35459
35460 /* Log misc errors. */
35461 if (csr0 & 0x4000)
35462@@ -2595,19 +2595,19 @@ pcnet32_interrupt(int irq, void *dev_id)
35463 if (napi_schedule_prep(&lp->napi)) {
35464 u16 val;
35465 /* set interrupt masks */
35466- val = lp->a.read_csr(ioaddr, CSR3);
35467+ val = lp->a->read_csr(ioaddr, CSR3);
35468 val |= 0x5f00;
35469- lp->a.write_csr(ioaddr, CSR3, val);
35470+ lp->a->write_csr(ioaddr, CSR3, val);
35471
35472 __napi_schedule(&lp->napi);
35473 break;
35474 }
35475- csr0 = lp->a.read_csr(ioaddr, CSR0);
35476+ csr0 = lp->a->read_csr(ioaddr, CSR0);
35477 }
35478
35479 if (netif_msg_intr(lp))
35480 printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
35481- dev->name, lp->a.read_csr(ioaddr, CSR0));
35482+ dev->name, lp->a->read_csr(ioaddr, CSR0));
35483
35484 spin_unlock(&lp->lock);
35485
35486@@ -2627,21 +2627,21 @@ static int pcnet32_close(struct net_devi
35487
35488 spin_lock_irqsave(&lp->lock, flags);
35489
35490- dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
35491+ dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
35492
35493 if (netif_msg_ifdown(lp))
35494 printk(KERN_DEBUG
35495 "%s: Shutting down ethercard, status was %2.2x.\n",
35496- dev->name, lp->a.read_csr(ioaddr, CSR0));
35497+ dev->name, lp->a->read_csr(ioaddr, CSR0));
35498
35499 /* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
35500- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
35501+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
35502
35503 /*
35504 * Switch back to 16bit mode to avoid problems with dumb
35505 * DOS packet driver after a warm reboot
35506 */
35507- lp->a.write_bcr(ioaddr, 20, 4);
35508+ lp->a->write_bcr(ioaddr, 20, 4);
35509
35510 spin_unlock_irqrestore(&lp->lock, flags);
35511
35512@@ -2664,7 +2664,7 @@ static struct net_device_stats *pcnet32_
35513 unsigned long flags;
35514
35515 spin_lock_irqsave(&lp->lock, flags);
35516- dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
35517+ dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
35518 spin_unlock_irqrestore(&lp->lock, flags);
35519
35520 return &dev->stats;
35521@@ -2686,10 +2686,10 @@ static void pcnet32_load_multicast(struc
35522 if (dev->flags & IFF_ALLMULTI) {
35523 ib->filter[0] = cpu_to_le32(~0U);
35524 ib->filter[1] = cpu_to_le32(~0U);
35525- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
35526- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
35527- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
35528- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
35529+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
35530+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
35531+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
35532+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
35533 return;
35534 }
35535 /* clear the multicast filter */
35536@@ -2710,7 +2710,7 @@ static void pcnet32_load_multicast(struc
35537 mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
35538 }
35539 for (i = 0; i < 4; i++)
35540- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
35541+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER + i,
35542 le16_to_cpu(mcast_table[i]));
35543 return;
35544 }
35545@@ -2726,7 +2726,7 @@ static void pcnet32_set_multicast_list(s
35546
35547 spin_lock_irqsave(&lp->lock, flags);
35548 suspended = pcnet32_suspend(dev, &flags, 0);
35549- csr15 = lp->a.read_csr(ioaddr, CSR15);
35550+ csr15 = lp->a->read_csr(ioaddr, CSR15);
35551 if (dev->flags & IFF_PROMISC) {
35552 /* Log any net taps. */
35553 if (netif_msg_hw(lp))
35554@@ -2735,21 +2735,21 @@ static void pcnet32_set_multicast_list(s
35555 lp->init_block->mode =
35556 cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
35557 7);
35558- lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
35559+ lp->a->write_csr(ioaddr, CSR15, csr15 | 0x8000);
35560 } else {
35561 lp->init_block->mode =
35562 cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
35563- lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
35564+ lp->a->write_csr(ioaddr, CSR15, csr15 & 0x7fff);
35565 pcnet32_load_multicast(dev);
35566 }
35567
35568 if (suspended) {
35569 int csr5;
35570 /* clear SUSPEND (SPND) - CSR5 bit 0 */
35571- csr5 = lp->a.read_csr(ioaddr, CSR5);
35572- lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
35573+ csr5 = lp->a->read_csr(ioaddr, CSR5);
35574+ lp->a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
35575 } else {
35576- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
35577+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
35578 pcnet32_restart(dev, CSR0_NORMAL);
35579 netif_wake_queue(dev);
35580 }
35581@@ -2767,8 +2767,8 @@ static int mdio_read(struct net_device *
35582 if (!lp->mii)
35583 return 0;
35584
35585- lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
35586- val_out = lp->a.read_bcr(ioaddr, 34);
35587+ lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
35588+ val_out = lp->a->read_bcr(ioaddr, 34);
35589
35590 return val_out;
35591 }
35592@@ -2782,8 +2782,8 @@ static void mdio_write(struct net_device
35593 if (!lp->mii)
35594 return;
35595
35596- lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
35597- lp->a.write_bcr(ioaddr, 34, val);
35598+ lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
35599+ lp->a->write_bcr(ioaddr, 34, val);
35600 }
35601
35602 static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
35603@@ -2862,7 +2862,7 @@ static void pcnet32_check_media(struct n
35604 curr_link = mii_link_ok(&lp->mii_if);
35605 } else {
35606 ulong ioaddr = dev->base_addr; /* card base I/O address */
35607- curr_link = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
35608+ curr_link = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
35609 }
35610 if (!curr_link) {
35611 if (prev_link || verbose) {
35612@@ -2887,13 +2887,13 @@ static void pcnet32_check_media(struct n
35613 (ecmd.duplex ==
35614 DUPLEX_FULL) ? "full" : "half");
35615 }
35616- bcr9 = lp->a.read_bcr(dev->base_addr, 9);
35617+ bcr9 = lp->a->read_bcr(dev->base_addr, 9);
35618 if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
35619 if (lp->mii_if.full_duplex)
35620 bcr9 |= (1 << 0);
35621 else
35622 bcr9 &= ~(1 << 0);
35623- lp->a.write_bcr(dev->base_addr, 9, bcr9);
35624+ lp->a->write_bcr(dev->base_addr, 9, bcr9);
35625 }
35626 } else {
35627 if (netif_msg_link(lp))
35628diff -urNp linux-2.6.32.46/drivers/net/tg3.h linux-2.6.32.46/drivers/net/tg3.h
35629--- linux-2.6.32.46/drivers/net/tg3.h 2011-03-27 14:31:47.000000000 -0400
35630+++ linux-2.6.32.46/drivers/net/tg3.h 2011-04-17 15:56:46.000000000 -0400
35631@@ -95,6 +95,7 @@
35632 #define CHIPREV_ID_5750_A0 0x4000
35633 #define CHIPREV_ID_5750_A1 0x4001
35634 #define CHIPREV_ID_5750_A3 0x4003
35635+#define CHIPREV_ID_5750_C1 0x4201
35636 #define CHIPREV_ID_5750_C2 0x4202
35637 #define CHIPREV_ID_5752_A0_HW 0x5000
35638 #define CHIPREV_ID_5752_A0 0x6000
35639diff -urNp linux-2.6.32.46/drivers/net/tokenring/abyss.c linux-2.6.32.46/drivers/net/tokenring/abyss.c
35640--- linux-2.6.32.46/drivers/net/tokenring/abyss.c 2011-03-27 14:31:47.000000000 -0400
35641+++ linux-2.6.32.46/drivers/net/tokenring/abyss.c 2011-08-05 20:33:55.000000000 -0400
35642@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver =
35643
35644 static int __init abyss_init (void)
35645 {
35646- abyss_netdev_ops = tms380tr_netdev_ops;
35647+ pax_open_kernel();
35648+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35649
35650- abyss_netdev_ops.ndo_open = abyss_open;
35651- abyss_netdev_ops.ndo_stop = abyss_close;
35652+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
35653+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
35654+ pax_close_kernel();
35655
35656 return pci_register_driver(&abyss_driver);
35657 }
35658diff -urNp linux-2.6.32.46/drivers/net/tokenring/madgemc.c linux-2.6.32.46/drivers/net/tokenring/madgemc.c
35659--- linux-2.6.32.46/drivers/net/tokenring/madgemc.c 2011-03-27 14:31:47.000000000 -0400
35660+++ linux-2.6.32.46/drivers/net/tokenring/madgemc.c 2011-08-05 20:33:55.000000000 -0400
35661@@ -755,9 +755,11 @@ static struct mca_driver madgemc_driver
35662
35663 static int __init madgemc_init (void)
35664 {
35665- madgemc_netdev_ops = tms380tr_netdev_ops;
35666- madgemc_netdev_ops.ndo_open = madgemc_open;
35667- madgemc_netdev_ops.ndo_stop = madgemc_close;
35668+ pax_open_kernel();
35669+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35670+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
35671+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
35672+ pax_close_kernel();
35673
35674 return mca_register_driver (&madgemc_driver);
35675 }
35676diff -urNp linux-2.6.32.46/drivers/net/tokenring/proteon.c linux-2.6.32.46/drivers/net/tokenring/proteon.c
35677--- linux-2.6.32.46/drivers/net/tokenring/proteon.c 2011-03-27 14:31:47.000000000 -0400
35678+++ linux-2.6.32.46/drivers/net/tokenring/proteon.c 2011-08-05 20:33:55.000000000 -0400
35679@@ -353,9 +353,11 @@ static int __init proteon_init(void)
35680 struct platform_device *pdev;
35681 int i, num = 0, err = 0;
35682
35683- proteon_netdev_ops = tms380tr_netdev_ops;
35684- proteon_netdev_ops.ndo_open = proteon_open;
35685- proteon_netdev_ops.ndo_stop = tms380tr_close;
35686+ pax_open_kernel();
35687+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35688+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
35689+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
35690+ pax_close_kernel();
35691
35692 err = platform_driver_register(&proteon_driver);
35693 if (err)
35694diff -urNp linux-2.6.32.46/drivers/net/tokenring/skisa.c linux-2.6.32.46/drivers/net/tokenring/skisa.c
35695--- linux-2.6.32.46/drivers/net/tokenring/skisa.c 2011-03-27 14:31:47.000000000 -0400
35696+++ linux-2.6.32.46/drivers/net/tokenring/skisa.c 2011-08-05 20:33:55.000000000 -0400
35697@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
35698 struct platform_device *pdev;
35699 int i, num = 0, err = 0;
35700
35701- sk_isa_netdev_ops = tms380tr_netdev_ops;
35702- sk_isa_netdev_ops.ndo_open = sk_isa_open;
35703- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35704+ pax_open_kernel();
35705+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35706+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
35707+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35708+ pax_close_kernel();
35709
35710 err = platform_driver_register(&sk_isa_driver);
35711 if (err)
35712diff -urNp linux-2.6.32.46/drivers/net/tulip/de2104x.c linux-2.6.32.46/drivers/net/tulip/de2104x.c
35713--- linux-2.6.32.46/drivers/net/tulip/de2104x.c 2011-03-27 14:31:47.000000000 -0400
35714+++ linux-2.6.32.46/drivers/net/tulip/de2104x.c 2011-05-16 21:46:57.000000000 -0400
35715@@ -1785,6 +1785,8 @@ static void __devinit de21041_get_srom_i
35716 struct de_srom_info_leaf *il;
35717 void *bufp;
35718
35719+ pax_track_stack();
35720+
35721 /* download entire eeprom */
35722 for (i = 0; i < DE_EEPROM_WORDS; i++)
35723 ((__le16 *)ee_data)[i] =
35724diff -urNp linux-2.6.32.46/drivers/net/tulip/de4x5.c linux-2.6.32.46/drivers/net/tulip/de4x5.c
35725--- linux-2.6.32.46/drivers/net/tulip/de4x5.c 2011-03-27 14:31:47.000000000 -0400
35726+++ linux-2.6.32.46/drivers/net/tulip/de4x5.c 2011-04-17 15:56:46.000000000 -0400
35727@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
35728 for (i=0; i<ETH_ALEN; i++) {
35729 tmp.addr[i] = dev->dev_addr[i];
35730 }
35731- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
35732+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
35733 break;
35734
35735 case DE4X5_SET_HWADDR: /* Set the hardware address */
35736@@ -5512,7 +5512,7 @@ de4x5_ioctl(struct net_device *dev, stru
35737 spin_lock_irqsave(&lp->lock, flags);
35738 memcpy(&statbuf, &lp->pktStats, ioc->len);
35739 spin_unlock_irqrestore(&lp->lock, flags);
35740- if (copy_to_user(ioc->data, &statbuf, ioc->len))
35741+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
35742 return -EFAULT;
35743 break;
35744 }
35745diff -urNp linux-2.6.32.46/drivers/net/usb/hso.c linux-2.6.32.46/drivers/net/usb/hso.c
35746--- linux-2.6.32.46/drivers/net/usb/hso.c 2011-03-27 14:31:47.000000000 -0400
35747+++ linux-2.6.32.46/drivers/net/usb/hso.c 2011-04-17 15:56:46.000000000 -0400
35748@@ -71,7 +71,7 @@
35749 #include <asm/byteorder.h>
35750 #include <linux/serial_core.h>
35751 #include <linux/serial.h>
35752-
35753+#include <asm/local.h>
35754
35755 #define DRIVER_VERSION "1.2"
35756 #define MOD_AUTHOR "Option Wireless"
35757@@ -258,7 +258,7 @@ struct hso_serial {
35758
35759 /* from usb_serial_port */
35760 struct tty_struct *tty;
35761- int open_count;
35762+ local_t open_count;
35763 spinlock_t serial_lock;
35764
35765 int (*write_data) (struct hso_serial *serial);
35766@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_
35767 struct urb *urb;
35768
35769 urb = serial->rx_urb[0];
35770- if (serial->open_count > 0) {
35771+ if (local_read(&serial->open_count) > 0) {
35772 count = put_rxbuf_data(urb, serial);
35773 if (count == -1)
35774 return;
35775@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_cal
35776 DUMP1(urb->transfer_buffer, urb->actual_length);
35777
35778 /* Anyone listening? */
35779- if (serial->open_count == 0)
35780+ if (local_read(&serial->open_count) == 0)
35781 return;
35782
35783 if (status == 0) {
35784@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_st
35785 spin_unlock_irq(&serial->serial_lock);
35786
35787 /* check for port already opened, if not set the termios */
35788- serial->open_count++;
35789- if (serial->open_count == 1) {
35790+ if (local_inc_return(&serial->open_count) == 1) {
35791 tty->low_latency = 1;
35792 serial->rx_state = RX_IDLE;
35793 /* Force default termio settings */
35794@@ -1325,7 +1324,7 @@ static int hso_serial_open(struct tty_st
35795 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
35796 if (result) {
35797 hso_stop_serial_device(serial->parent);
35798- serial->open_count--;
35799+ local_dec(&serial->open_count);
35800 kref_put(&serial->parent->ref, hso_serial_ref_free);
35801 }
35802 } else {
35803@@ -1362,10 +1361,10 @@ static void hso_serial_close(struct tty_
35804
35805 /* reset the rts and dtr */
35806 /* do the actual close */
35807- serial->open_count--;
35808+ local_dec(&serial->open_count);
35809
35810- if (serial->open_count <= 0) {
35811- serial->open_count = 0;
35812+ if (local_read(&serial->open_count) <= 0) {
35813+ local_set(&serial->open_count, 0);
35814 spin_lock_irq(&serial->serial_lock);
35815 if (serial->tty == tty) {
35816 serial->tty->driver_data = NULL;
35817@@ -1447,7 +1446,7 @@ static void hso_serial_set_termios(struc
35818
35819 /* the actual setup */
35820 spin_lock_irqsave(&serial->serial_lock, flags);
35821- if (serial->open_count)
35822+ if (local_read(&serial->open_count))
35823 _hso_serial_set_termios(tty, old);
35824 else
35825 tty->termios = old;
35826@@ -3097,7 +3096,7 @@ static int hso_resume(struct usb_interfa
35827 /* Start all serial ports */
35828 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
35829 if (serial_table[i] && (serial_table[i]->interface == iface)) {
35830- if (dev2ser(serial_table[i])->open_count) {
35831+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
35832 result =
35833 hso_start_serial_device(serial_table[i], GFP_NOIO);
35834 hso_kick_transmit(dev2ser(serial_table[i]));
35835diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-config.h linux-2.6.32.46/drivers/net/vxge/vxge-config.h
35836--- linux-2.6.32.46/drivers/net/vxge/vxge-config.h 2011-03-27 14:31:47.000000000 -0400
35837+++ linux-2.6.32.46/drivers/net/vxge/vxge-config.h 2011-08-05 20:33:55.000000000 -0400
35838@@ -474,7 +474,7 @@ struct vxge_hw_uld_cbs {
35839 void (*link_down)(struct __vxge_hw_device *devh);
35840 void (*crit_err)(struct __vxge_hw_device *devh,
35841 enum vxge_hw_event type, u64 ext_data);
35842-};
35843+} __no_const;
35844
35845 /*
35846 * struct __vxge_hw_blockpool_entry - Block private data structure
35847diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-main.c linux-2.6.32.46/drivers/net/vxge/vxge-main.c
35848--- linux-2.6.32.46/drivers/net/vxge/vxge-main.c 2011-03-27 14:31:47.000000000 -0400
35849+++ linux-2.6.32.46/drivers/net/vxge/vxge-main.c 2011-05-16 21:46:57.000000000 -0400
35850@@ -93,6 +93,8 @@ static inline void VXGE_COMPLETE_VPATH_T
35851 struct sk_buff *completed[NR_SKB_COMPLETED];
35852 int more;
35853
35854+ pax_track_stack();
35855+
35856 do {
35857 more = 0;
35858 skb_ptr = completed;
35859@@ -1779,6 +1781,8 @@ static enum vxge_hw_status vxge_rth_conf
35860 u8 mtable[256] = {0}; /* CPU to vpath mapping */
35861 int index;
35862
35863+ pax_track_stack();
35864+
35865 /*
35866 * Filling
35867 * - itable with bucket numbers
35868diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h
35869--- linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h 2011-03-27 14:31:47.000000000 -0400
35870+++ linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h 2011-08-05 20:33:55.000000000 -0400
35871@@ -2123,7 +2123,7 @@ struct vxge_hw_mempool_cbs {
35872 struct vxge_hw_mempool_dma *dma_object,
35873 u32 index,
35874 u32 is_last);
35875-};
35876+} __no_const;
35877
35878 void
35879 __vxge_hw_mempool_destroy(
35880diff -urNp linux-2.6.32.46/drivers/net/wan/cycx_x25.c linux-2.6.32.46/drivers/net/wan/cycx_x25.c
35881--- linux-2.6.32.46/drivers/net/wan/cycx_x25.c 2011-03-27 14:31:47.000000000 -0400
35882+++ linux-2.6.32.46/drivers/net/wan/cycx_x25.c 2011-05-16 21:46:57.000000000 -0400
35883@@ -1017,6 +1017,8 @@ static void hex_dump(char *msg, unsigned
35884 unsigned char hex[1024],
35885 * phex = hex;
35886
35887+ pax_track_stack();
35888+
35889 if (len >= (sizeof(hex) / 2))
35890 len = (sizeof(hex) / 2) - 1;
35891
35892diff -urNp linux-2.6.32.46/drivers/net/wan/hdlc_x25.c linux-2.6.32.46/drivers/net/wan/hdlc_x25.c
35893--- linux-2.6.32.46/drivers/net/wan/hdlc_x25.c 2011-03-27 14:31:47.000000000 -0400
35894+++ linux-2.6.32.46/drivers/net/wan/hdlc_x25.c 2011-08-05 20:33:55.000000000 -0400
35895@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
35896
35897 static int x25_open(struct net_device *dev)
35898 {
35899- struct lapb_register_struct cb;
35900+ static struct lapb_register_struct cb = {
35901+ .connect_confirmation = x25_connected,
35902+ .connect_indication = x25_connected,
35903+ .disconnect_confirmation = x25_disconnected,
35904+ .disconnect_indication = x25_disconnected,
35905+ .data_indication = x25_data_indication,
35906+ .data_transmit = x25_data_transmit
35907+ };
35908 int result;
35909
35910- cb.connect_confirmation = x25_connected;
35911- cb.connect_indication = x25_connected;
35912- cb.disconnect_confirmation = x25_disconnected;
35913- cb.disconnect_indication = x25_disconnected;
35914- cb.data_indication = x25_data_indication;
35915- cb.data_transmit = x25_data_transmit;
35916-
35917 result = lapb_register(dev, &cb);
35918 if (result != LAPB_OK)
35919 return result;
35920diff -urNp linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c
35921--- linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c 2011-03-27 14:31:47.000000000 -0400
35922+++ linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c 2011-05-16 21:46:57.000000000 -0400
35923@@ -263,6 +263,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
35924 int do_autopm = 1;
35925 DECLARE_COMPLETION_ONSTACK(notif_completion);
35926
35927+ pax_track_stack();
35928+
35929 d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
35930 i2400m, ack, ack_size);
35931 BUG_ON(_ack == i2400m->bm_ack_buf);
35932diff -urNp linux-2.6.32.46/drivers/net/wireless/airo.c linux-2.6.32.46/drivers/net/wireless/airo.c
35933--- linux-2.6.32.46/drivers/net/wireless/airo.c 2011-03-27 14:31:47.000000000 -0400
35934+++ linux-2.6.32.46/drivers/net/wireless/airo.c 2011-05-16 21:46:57.000000000 -0400
35935@@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
35936 BSSListElement * loop_net;
35937 BSSListElement * tmp_net;
35938
35939+ pax_track_stack();
35940+
35941 /* Blow away current list of scan results */
35942 list_for_each_entry_safe (loop_net, tmp_net, &ai->network_list, list) {
35943 list_move_tail (&loop_net->list, &ai->network_free_list);
35944@@ -3783,6 +3785,8 @@ static u16 setup_card(struct airo_info *
35945 WepKeyRid wkr;
35946 int rc;
35947
35948+ pax_track_stack();
35949+
35950 memset( &mySsid, 0, sizeof( mySsid ) );
35951 kfree (ai->flash);
35952 ai->flash = NULL;
35953@@ -4758,6 +4762,8 @@ static int proc_stats_rid_open( struct i
35954 __le32 *vals = stats.vals;
35955 int len;
35956
35957+ pax_track_stack();
35958+
35959 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
35960 return -ENOMEM;
35961 data = (struct proc_data *)file->private_data;
35962@@ -5487,6 +5493,8 @@ static int proc_BSSList_open( struct ino
35963 /* If doLoseSync is not 1, we won't do a Lose Sync */
35964 int doLoseSync = -1;
35965
35966+ pax_track_stack();
35967+
35968 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
35969 return -ENOMEM;
35970 data = (struct proc_data *)file->private_data;
35971@@ -7193,6 +7201,8 @@ static int airo_get_aplist(struct net_de
35972 int i;
35973 int loseSync = capable(CAP_NET_ADMIN) ? 1: -1;
35974
35975+ pax_track_stack();
35976+
35977 qual = kmalloc(IW_MAX_AP * sizeof(*qual), GFP_KERNEL);
35978 if (!qual)
35979 return -ENOMEM;
35980@@ -7753,6 +7763,8 @@ static void airo_read_wireless_stats(str
35981 CapabilityRid cap_rid;
35982 __le32 *vals = stats_rid.vals;
35983
35984+ pax_track_stack();
35985+
35986 /* Get stats out of the card */
35987 clear_bit(JOB_WSTATS, &local->jobs);
35988 if (local->power.event) {
35989diff -urNp linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c
35990--- linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c 2011-03-27 14:31:47.000000000 -0400
35991+++ linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c 2011-05-16 21:46:57.000000000 -0400
35992@@ -205,6 +205,8 @@ static ssize_t read_file_beacon(struct f
35993 unsigned int v;
35994 u64 tsf;
35995
35996+ pax_track_stack();
35997+
35998 v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON);
35999 len += snprintf(buf+len, sizeof(buf)-len,
36000 "%-24s0x%08x\tintval: %d\tTIM: 0x%x\n",
36001@@ -318,6 +320,8 @@ static ssize_t read_file_debug(struct fi
36002 unsigned int len = 0;
36003 unsigned int i;
36004
36005+ pax_track_stack();
36006+
36007 len += snprintf(buf+len, sizeof(buf)-len,
36008 "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
36009
36010diff -urNp linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c
36011--- linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c 2011-03-27 14:31:47.000000000 -0400
36012+++ linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c 2011-05-16 21:46:57.000000000 -0400
36013@@ -220,6 +220,8 @@ static ssize_t read_file_interrupt(struc
36014 char buf[512];
36015 unsigned int len = 0;
36016
36017+ pax_track_stack();
36018+
36019 len += snprintf(buf + len, sizeof(buf) - len,
36020 "%8s: %10u\n", "RX", sc->debug.stats.istats.rxok);
36021 len += snprintf(buf + len, sizeof(buf) - len,
36022@@ -360,6 +362,8 @@ static ssize_t read_file_wiphy(struct fi
36023 int i;
36024 u8 addr[ETH_ALEN];
36025
36026+ pax_track_stack();
36027+
36028 len += snprintf(buf + len, sizeof(buf) - len,
36029 "primary: %s (%s chan=%d ht=%d)\n",
36030 wiphy_name(sc->pri_wiphy->hw->wiphy),
36031diff -urNp linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c
36032--- linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c 2011-03-27 14:31:47.000000000 -0400
36033+++ linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:56:46.000000000 -0400
36034@@ -43,7 +43,7 @@ static struct dentry *rootdir;
36035 struct b43_debugfs_fops {
36036 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
36037 int (*write)(struct b43_wldev *dev, const char *buf, size_t count);
36038- struct file_operations fops;
36039+ const struct file_operations fops;
36040 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
36041 size_t file_struct_offset;
36042 };
36043diff -urNp linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c
36044--- linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c 2011-03-27 14:31:47.000000000 -0400
36045+++ linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 15:56:46.000000000 -0400
36046@@ -44,7 +44,7 @@ static struct dentry *rootdir;
36047 struct b43legacy_debugfs_fops {
36048 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
36049 int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t count);
36050- struct file_operations fops;
36051+ const struct file_operations fops;
36052 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
36053 size_t file_struct_offset;
36054 /* Take wl->irq_lock before calling read/write? */
36055diff -urNp linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c
36056--- linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c 2011-03-27 14:31:47.000000000 -0400
36057+++ linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-16 21:46:57.000000000 -0400
36058@@ -2014,6 +2014,8 @@ static int ipw2100_set_essid(struct ipw2
36059 int err;
36060 DECLARE_SSID_BUF(ssid);
36061
36062+ pax_track_stack();
36063+
36064 IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len));
36065
36066 if (ssid_len)
36067@@ -5380,6 +5382,8 @@ static int ipw2100_set_key(struct ipw210
36068 struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters;
36069 int err;
36070
36071+ pax_track_stack();
36072+
36073 IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
36074 idx, keylen, len);
36075
36076diff -urNp linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c
36077--- linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-03-27 14:31:47.000000000 -0400
36078+++ linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-16 21:46:57.000000000 -0400
36079@@ -1566,6 +1566,8 @@ static void libipw_process_probe_respons
36080 unsigned long flags;
36081 DECLARE_SSID_BUF(ssid);
36082
36083+ pax_track_stack();
36084+
36085 LIBIPW_DEBUG_SCAN("'%s' (%pM"
36086 "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
36087 print_ssid(ssid, info_element->data, info_element->len),
36088diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c
36089--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-03-27 14:31:47.000000000 -0400
36090+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-04-17 15:56:46.000000000 -0400
36091@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
36092 },
36093 };
36094
36095-static struct iwl_ops iwl1000_ops = {
36096+static const struct iwl_ops iwl1000_ops = {
36097 .ucode = &iwl5000_ucode,
36098 .lib = &iwl1000_lib,
36099 .hcmd = &iwl5000_hcmd,
36100diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c
36101--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-03-27 14:31:47.000000000 -0400
36102+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-08-05 20:33:55.000000000 -0400
36103@@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_
36104 */
36105 if (iwl3945_mod_params.disable_hw_scan) {
36106 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
36107- iwl3945_hw_ops.hw_scan = NULL;
36108+ pax_open_kernel();
36109+ *(void **)&iwl3945_hw_ops.hw_scan = NULL;
36110+ pax_close_kernel();
36111 }
36112
36113
36114diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c
36115--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-03-27 14:31:47.000000000 -0400
36116+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-04-17 15:56:46.000000000 -0400
36117@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
36118 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
36119 };
36120
36121-static struct iwl_ops iwl3945_ops = {
36122+static const struct iwl_ops iwl3945_ops = {
36123 .ucode = &iwl3945_ucode,
36124 .lib = &iwl3945_lib,
36125 .hcmd = &iwl3945_hcmd,
36126diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c
36127--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-03-27 14:31:47.000000000 -0400
36128+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-04-17 15:56:46.000000000 -0400
36129@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
36130 },
36131 };
36132
36133-static struct iwl_ops iwl4965_ops = {
36134+static const struct iwl_ops iwl4965_ops = {
36135 .ucode = &iwl4965_ucode,
36136 .lib = &iwl4965_lib,
36137 .hcmd = &iwl4965_hcmd,
36138diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c
36139--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-06-25 12:55:34.000000000 -0400
36140+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-06-25 12:56:37.000000000 -0400
36141@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
36142 },
36143 };
36144
36145-struct iwl_ops iwl5000_ops = {
36146+const struct iwl_ops iwl5000_ops = {
36147 .ucode = &iwl5000_ucode,
36148 .lib = &iwl5000_lib,
36149 .hcmd = &iwl5000_hcmd,
36150 .utils = &iwl5000_hcmd_utils,
36151 };
36152
36153-static struct iwl_ops iwl5150_ops = {
36154+static const struct iwl_ops iwl5150_ops = {
36155 .ucode = &iwl5000_ucode,
36156 .lib = &iwl5150_lib,
36157 .hcmd = &iwl5000_hcmd,
36158diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c
36159--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-03-27 14:31:47.000000000 -0400
36160+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-04-17 15:56:46.000000000 -0400
36161@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
36162 .calc_rssi = iwl5000_calc_rssi,
36163 };
36164
36165-static struct iwl_ops iwl6000_ops = {
36166+static const struct iwl_ops iwl6000_ops = {
36167 .ucode = &iwl5000_ucode,
36168 .lib = &iwl6000_lib,
36169 .hcmd = &iwl5000_hcmd,
36170diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c
36171--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-03-27 14:31:47.000000000 -0400
36172+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-08-05 20:33:55.000000000 -0400
36173@@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev
36174 if (iwl_debug_level & IWL_DL_INFO)
36175 dev_printk(KERN_DEBUG, &(pdev->dev),
36176 "Disabling hw_scan\n");
36177- iwl_hw_ops.hw_scan = NULL;
36178+ pax_open_kernel();
36179+ *(void **)&iwl_hw_ops.hw_scan = NULL;
36180+ pax_close_kernel();
36181 }
36182
36183 hw = iwl_alloc_all(cfg, &iwl_hw_ops);
36184diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
36185--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-03-27 14:31:47.000000000 -0400
36186+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-16 21:46:57.000000000 -0400
36187@@ -857,6 +857,8 @@ static void rs_tx_status(void *priv_r, s
36188 u8 active_index = 0;
36189 s32 tpt = 0;
36190
36191+ pax_track_stack();
36192+
36193 IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n");
36194
36195 if (!ieee80211_is_data(hdr->frame_control) ||
36196@@ -2722,6 +2724,8 @@ static void rs_fill_link_cmd(struct iwl_
36197 u8 valid_tx_ant = 0;
36198 struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
36199
36200+ pax_track_stack();
36201+
36202 /* Override starting rate (index 0) if needed for debug purposes */
36203 rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
36204
36205diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c
36206--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-03-27 14:31:47.000000000 -0400
36207+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-16 21:46:57.000000000 -0400
36208@@ -524,6 +524,8 @@ static ssize_t iwl_dbgfs_status_read(str
36209 int pos = 0;
36210 const size_t bufsz = sizeof(buf);
36211
36212+ pax_track_stack();
36213+
36214 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
36215 test_bit(STATUS_HCMD_ACTIVE, &priv->status));
36216 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_SYNC_ACTIVE: %d\n",
36217@@ -658,6 +660,8 @@ static ssize_t iwl_dbgfs_qos_read(struct
36218 const size_t bufsz = sizeof(buf);
36219 ssize_t ret;
36220
36221+ pax_track_stack();
36222+
36223 for (i = 0; i < AC_NUM; i++) {
36224 pos += scnprintf(buf + pos, bufsz - pos,
36225 "\tcw_min\tcw_max\taifsn\ttxop\n");
36226diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h
36227--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-27 14:31:47.000000000 -0400
36228+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 15:56:46.000000000 -0400
36229@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
36230 #endif
36231
36232 #else
36233-#define IWL_DEBUG(__priv, level, fmt, args...)
36234-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
36235+#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
36236+#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
36237 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
36238 void *p, u32 len)
36239 {}
36240diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h
36241--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-03-27 14:31:47.000000000 -0400
36242+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-04-17 15:56:46.000000000 -0400
36243@@ -68,7 +68,7 @@ struct iwl_tx_queue;
36244
36245 /* shared structures from iwl-5000.c */
36246 extern struct iwl_mod_params iwl50_mod_params;
36247-extern struct iwl_ops iwl5000_ops;
36248+extern const struct iwl_ops iwl5000_ops;
36249 extern struct iwl_ucode_ops iwl5000_ucode;
36250 extern struct iwl_lib_ops iwl5000_lib;
36251 extern struct iwl_hcmd_ops iwl5000_hcmd;
36252diff -urNp linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c
36253--- linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-03-27 14:31:47.000000000 -0400
36254+++ linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-16 21:46:57.000000000 -0400
36255@@ -299,6 +299,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
36256 int buf_len = 512;
36257 size_t len = 0;
36258
36259+ pax_track_stack();
36260+
36261 if (*ppos != 0)
36262 return 0;
36263 if (count < sizeof(buf))
36264diff -urNp linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c
36265--- linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c 2011-03-27 14:31:47.000000000 -0400
36266+++ linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c 2011-04-17 15:56:46.000000000 -0400
36267@@ -708,7 +708,7 @@ out_unlock:
36268 struct lbs_debugfs_files {
36269 const char *name;
36270 int perm;
36271- struct file_operations fops;
36272+ const struct file_operations fops;
36273 };
36274
36275 static const struct lbs_debugfs_files debugfs_files[] = {
36276diff -urNp linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c
36277--- linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c 2011-03-27 14:31:47.000000000 -0400
36278+++ linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:56:46.000000000 -0400
36279@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
36280
36281 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
36282
36283- if (rts_threshold < 0 || rts_threshold > 2347)
36284+ if (rts_threshold > 2347)
36285 rts_threshold = 2347;
36286
36287 tmp = cpu_to_le32(rts_threshold);
36288diff -urNp linux-2.6.32.46/drivers/oprofile/buffer_sync.c linux-2.6.32.46/drivers/oprofile/buffer_sync.c
36289--- linux-2.6.32.46/drivers/oprofile/buffer_sync.c 2011-03-27 14:31:47.000000000 -0400
36290+++ linux-2.6.32.46/drivers/oprofile/buffer_sync.c 2011-04-17 15:56:46.000000000 -0400
36291@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
36292 if (cookie == NO_COOKIE)
36293 offset = pc;
36294 if (cookie == INVALID_COOKIE) {
36295- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
36296+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
36297 offset = pc;
36298 }
36299 if (cookie != last_cookie) {
36300@@ -385,14 +385,14 @@ add_sample(struct mm_struct *mm, struct
36301 /* add userspace sample */
36302
36303 if (!mm) {
36304- atomic_inc(&oprofile_stats.sample_lost_no_mm);
36305+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
36306 return 0;
36307 }
36308
36309 cookie = lookup_dcookie(mm, s->eip, &offset);
36310
36311 if (cookie == INVALID_COOKIE) {
36312- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
36313+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
36314 return 0;
36315 }
36316
36317@@ -561,7 +561,7 @@ void sync_buffer(int cpu)
36318 /* ignore backtraces if failed to add a sample */
36319 if (state == sb_bt_start) {
36320 state = sb_bt_ignore;
36321- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
36322+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
36323 }
36324 }
36325 release_mm(mm);
36326diff -urNp linux-2.6.32.46/drivers/oprofile/event_buffer.c linux-2.6.32.46/drivers/oprofile/event_buffer.c
36327--- linux-2.6.32.46/drivers/oprofile/event_buffer.c 2011-03-27 14:31:47.000000000 -0400
36328+++ linux-2.6.32.46/drivers/oprofile/event_buffer.c 2011-04-17 15:56:46.000000000 -0400
36329@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
36330 }
36331
36332 if (buffer_pos == buffer_size) {
36333- atomic_inc(&oprofile_stats.event_lost_overflow);
36334+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
36335 return;
36336 }
36337
36338diff -urNp linux-2.6.32.46/drivers/oprofile/oprof.c linux-2.6.32.46/drivers/oprofile/oprof.c
36339--- linux-2.6.32.46/drivers/oprofile/oprof.c 2011-03-27 14:31:47.000000000 -0400
36340+++ linux-2.6.32.46/drivers/oprofile/oprof.c 2011-04-17 15:56:46.000000000 -0400
36341@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
36342 if (oprofile_ops.switch_events())
36343 return;
36344
36345- atomic_inc(&oprofile_stats.multiplex_counter);
36346+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
36347 start_switch_worker();
36348 }
36349
36350diff -urNp linux-2.6.32.46/drivers/oprofile/oprofilefs.c linux-2.6.32.46/drivers/oprofile/oprofilefs.c
36351--- linux-2.6.32.46/drivers/oprofile/oprofilefs.c 2011-03-27 14:31:47.000000000 -0400
36352+++ linux-2.6.32.46/drivers/oprofile/oprofilefs.c 2011-04-17 15:56:46.000000000 -0400
36353@@ -187,7 +187,7 @@ static const struct file_operations atom
36354
36355
36356 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
36357- char const *name, atomic_t *val)
36358+ char const *name, atomic_unchecked_t *val)
36359 {
36360 struct dentry *d = __oprofilefs_create_file(sb, root, name,
36361 &atomic_ro_fops, 0444);
36362diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.c linux-2.6.32.46/drivers/oprofile/oprofile_stats.c
36363--- linux-2.6.32.46/drivers/oprofile/oprofile_stats.c 2011-03-27 14:31:47.000000000 -0400
36364+++ linux-2.6.32.46/drivers/oprofile/oprofile_stats.c 2011-04-17 15:56:46.000000000 -0400
36365@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
36366 cpu_buf->sample_invalid_eip = 0;
36367 }
36368
36369- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
36370- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
36371- atomic_set(&oprofile_stats.event_lost_overflow, 0);
36372- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
36373- atomic_set(&oprofile_stats.multiplex_counter, 0);
36374+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
36375+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
36376+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
36377+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
36378+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
36379 }
36380
36381
36382diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.h linux-2.6.32.46/drivers/oprofile/oprofile_stats.h
36383--- linux-2.6.32.46/drivers/oprofile/oprofile_stats.h 2011-03-27 14:31:47.000000000 -0400
36384+++ linux-2.6.32.46/drivers/oprofile/oprofile_stats.h 2011-04-17 15:56:46.000000000 -0400
36385@@ -13,11 +13,11 @@
36386 #include <asm/atomic.h>
36387
36388 struct oprofile_stat_struct {
36389- atomic_t sample_lost_no_mm;
36390- atomic_t sample_lost_no_mapping;
36391- atomic_t bt_lost_no_mapping;
36392- atomic_t event_lost_overflow;
36393- atomic_t multiplex_counter;
36394+ atomic_unchecked_t sample_lost_no_mm;
36395+ atomic_unchecked_t sample_lost_no_mapping;
36396+ atomic_unchecked_t bt_lost_no_mapping;
36397+ atomic_unchecked_t event_lost_overflow;
36398+ atomic_unchecked_t multiplex_counter;
36399 };
36400
36401 extern struct oprofile_stat_struct oprofile_stats;
36402diff -urNp linux-2.6.32.46/drivers/parisc/pdc_stable.c linux-2.6.32.46/drivers/parisc/pdc_stable.c
36403--- linux-2.6.32.46/drivers/parisc/pdc_stable.c 2011-03-27 14:31:47.000000000 -0400
36404+++ linux-2.6.32.46/drivers/parisc/pdc_stable.c 2011-04-17 15:56:46.000000000 -0400
36405@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
36406 return ret;
36407 }
36408
36409-static struct sysfs_ops pdcspath_attr_ops = {
36410+static const struct sysfs_ops pdcspath_attr_ops = {
36411 .show = pdcspath_attr_show,
36412 .store = pdcspath_attr_store,
36413 };
36414diff -urNp linux-2.6.32.46/drivers/parport/procfs.c linux-2.6.32.46/drivers/parport/procfs.c
36415--- linux-2.6.32.46/drivers/parport/procfs.c 2011-03-27 14:31:47.000000000 -0400
36416+++ linux-2.6.32.46/drivers/parport/procfs.c 2011-04-17 15:56:46.000000000 -0400
36417@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
36418
36419 *ppos += len;
36420
36421- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
36422+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
36423 }
36424
36425 #ifdef CONFIG_PARPORT_1284
36426@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table
36427
36428 *ppos += len;
36429
36430- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
36431+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
36432 }
36433 #endif /* IEEE1284.3 support. */
36434
36435diff -urNp linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c
36436--- linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c 2011-03-27 14:31:47.000000000 -0400
36437+++ linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:56:46.000000000 -0400
36438@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
36439 }
36440
36441
36442-static struct acpi_dock_ops acpiphp_dock_ops = {
36443+static const struct acpi_dock_ops acpiphp_dock_ops = {
36444 .handler = handle_hotplug_event_func,
36445 };
36446
36447diff -urNp linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h
36448--- linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h 2011-03-27 14:31:47.000000000 -0400
36449+++ linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h 2011-08-05 20:33:55.000000000 -0400
36450@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
36451 int (*hardware_test) (struct slot* slot, u32 value);
36452 u8 (*get_power) (struct slot* slot);
36453 int (*set_power) (struct slot* slot, int value);
36454-};
36455+} __no_const;
36456
36457 struct cpci_hp_controller {
36458 unsigned int irq;
36459diff -urNp linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c
36460--- linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-27 14:31:47.000000000 -0400
36461+++ linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:56:46.000000000 -0400
36462@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
36463
36464 void compaq_nvram_init (void __iomem *rom_start)
36465 {
36466+
36467+#ifndef CONFIG_PAX_KERNEXEC
36468 if (rom_start) {
36469 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
36470 }
36471+#endif
36472+
36473 dbg("int15 entry = %p\n", compaq_int15_entry_point);
36474
36475 /* initialize our int15 lock */
36476diff -urNp linux-2.6.32.46/drivers/pci/hotplug/fakephp.c linux-2.6.32.46/drivers/pci/hotplug/fakephp.c
36477--- linux-2.6.32.46/drivers/pci/hotplug/fakephp.c 2011-03-27 14:31:47.000000000 -0400
36478+++ linux-2.6.32.46/drivers/pci/hotplug/fakephp.c 2011-04-17 15:56:46.000000000 -0400
36479@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
36480 }
36481
36482 static struct kobj_type legacy_ktype = {
36483- .sysfs_ops = &(struct sysfs_ops){
36484+ .sysfs_ops = &(const struct sysfs_ops){
36485 .store = legacy_store, .show = legacy_show
36486 },
36487 .release = &legacy_release,
36488diff -urNp linux-2.6.32.46/drivers/pci/intel-iommu.c linux-2.6.32.46/drivers/pci/intel-iommu.c
36489--- linux-2.6.32.46/drivers/pci/intel-iommu.c 2011-05-10 22:12:01.000000000 -0400
36490+++ linux-2.6.32.46/drivers/pci/intel-iommu.c 2011-05-10 22:12:33.000000000 -0400
36491@@ -2643,7 +2643,7 @@ error:
36492 return 0;
36493 }
36494
36495-static dma_addr_t intel_map_page(struct device *dev, struct page *page,
36496+dma_addr_t intel_map_page(struct device *dev, struct page *page,
36497 unsigned long offset, size_t size,
36498 enum dma_data_direction dir,
36499 struct dma_attrs *attrs)
36500@@ -2719,7 +2719,7 @@ static void add_unmap(struct dmar_domain
36501 spin_unlock_irqrestore(&async_umap_flush_lock, flags);
36502 }
36503
36504-static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
36505+void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
36506 size_t size, enum dma_data_direction dir,
36507 struct dma_attrs *attrs)
36508 {
36509@@ -2768,7 +2768,7 @@ static void intel_unmap_page(struct devi
36510 }
36511 }
36512
36513-static void *intel_alloc_coherent(struct device *hwdev, size_t size,
36514+void *intel_alloc_coherent(struct device *hwdev, size_t size,
36515 dma_addr_t *dma_handle, gfp_t flags)
36516 {
36517 void *vaddr;
36518@@ -2800,7 +2800,7 @@ static void *intel_alloc_coherent(struct
36519 return NULL;
36520 }
36521
36522-static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
36523+void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
36524 dma_addr_t dma_handle)
36525 {
36526 int order;
36527@@ -2812,7 +2812,7 @@ static void intel_free_coherent(struct d
36528 free_pages((unsigned long)vaddr, order);
36529 }
36530
36531-static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
36532+void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
36533 int nelems, enum dma_data_direction dir,
36534 struct dma_attrs *attrs)
36535 {
36536@@ -2872,7 +2872,7 @@ static int intel_nontranslate_map_sg(str
36537 return nelems;
36538 }
36539
36540-static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
36541+int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
36542 enum dma_data_direction dir, struct dma_attrs *attrs)
36543 {
36544 int i;
36545@@ -2941,12 +2941,12 @@ static int intel_map_sg(struct device *h
36546 return nelems;
36547 }
36548
36549-static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
36550+int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
36551 {
36552 return !dma_addr;
36553 }
36554
36555-struct dma_map_ops intel_dma_ops = {
36556+const struct dma_map_ops intel_dma_ops = {
36557 .alloc_coherent = intel_alloc_coherent,
36558 .free_coherent = intel_free_coherent,
36559 .map_sg = intel_map_sg,
36560diff -urNp linux-2.6.32.46/drivers/pci/pcie/aspm.c linux-2.6.32.46/drivers/pci/pcie/aspm.c
36561--- linux-2.6.32.46/drivers/pci/pcie/aspm.c 2011-03-27 14:31:47.000000000 -0400
36562+++ linux-2.6.32.46/drivers/pci/pcie/aspm.c 2011-04-17 15:56:46.000000000 -0400
36563@@ -27,9 +27,9 @@
36564 #define MODULE_PARAM_PREFIX "pcie_aspm."
36565
36566 /* Note: those are not register definitions */
36567-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
36568-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
36569-#define ASPM_STATE_L1 (4) /* L1 state */
36570+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
36571+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
36572+#define ASPM_STATE_L1 (4U) /* L1 state */
36573 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
36574 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
36575
36576diff -urNp linux-2.6.32.46/drivers/pci/probe.c linux-2.6.32.46/drivers/pci/probe.c
36577--- linux-2.6.32.46/drivers/pci/probe.c 2011-03-27 14:31:47.000000000 -0400
36578+++ linux-2.6.32.46/drivers/pci/probe.c 2011-04-17 15:56:46.000000000 -0400
36579@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
36580 return ret;
36581 }
36582
36583-static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,
36584+static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev,
36585 struct device_attribute *attr,
36586 char *buf)
36587 {
36588 return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
36589 }
36590
36591-static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,
36592+static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev,
36593 struct device_attribute *attr,
36594 char *buf)
36595 {
36596diff -urNp linux-2.6.32.46/drivers/pci/proc.c linux-2.6.32.46/drivers/pci/proc.c
36597--- linux-2.6.32.46/drivers/pci/proc.c 2011-03-27 14:31:47.000000000 -0400
36598+++ linux-2.6.32.46/drivers/pci/proc.c 2011-04-17 15:56:46.000000000 -0400
36599@@ -480,7 +480,16 @@ static const struct file_operations proc
36600 static int __init pci_proc_init(void)
36601 {
36602 struct pci_dev *dev = NULL;
36603+
36604+#ifdef CONFIG_GRKERNSEC_PROC_ADD
36605+#ifdef CONFIG_GRKERNSEC_PROC_USER
36606+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
36607+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
36608+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
36609+#endif
36610+#else
36611 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
36612+#endif
36613 proc_create("devices", 0, proc_bus_pci_dir,
36614 &proc_bus_pci_dev_operations);
36615 proc_initialized = 1;
36616diff -urNp linux-2.6.32.46/drivers/pci/slot.c linux-2.6.32.46/drivers/pci/slot.c
36617--- linux-2.6.32.46/drivers/pci/slot.c 2011-03-27 14:31:47.000000000 -0400
36618+++ linux-2.6.32.46/drivers/pci/slot.c 2011-04-17 15:56:46.000000000 -0400
36619@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
36620 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
36621 }
36622
36623-static struct sysfs_ops pci_slot_sysfs_ops = {
36624+static const struct sysfs_ops pci_slot_sysfs_ops = {
36625 .show = pci_slot_attr_show,
36626 .store = pci_slot_attr_store,
36627 };
36628diff -urNp linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c
36629--- linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c 2011-03-27 14:31:47.000000000 -0400
36630+++ linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c 2011-04-17 15:56:46.000000000 -0400
36631@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
36632 return -EFAULT;
36633 }
36634 }
36635- buf = kmalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
36636+ buf = kzalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
36637 if (!buf)
36638 return -ENOMEM;
36639
36640diff -urNp linux-2.6.32.46/drivers/platform/x86/acer-wmi.c linux-2.6.32.46/drivers/platform/x86/acer-wmi.c
36641--- linux-2.6.32.46/drivers/platform/x86/acer-wmi.c 2011-03-27 14:31:47.000000000 -0400
36642+++ linux-2.6.32.46/drivers/platform/x86/acer-wmi.c 2011-04-17 15:56:46.000000000 -0400
36643@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
36644 return 0;
36645 }
36646
36647-static struct backlight_ops acer_bl_ops = {
36648+static const struct backlight_ops acer_bl_ops = {
36649 .get_brightness = read_brightness,
36650 .update_status = update_bl_status,
36651 };
36652diff -urNp linux-2.6.32.46/drivers/platform/x86/asus_acpi.c linux-2.6.32.46/drivers/platform/x86/asus_acpi.c
36653--- linux-2.6.32.46/drivers/platform/x86/asus_acpi.c 2011-03-27 14:31:47.000000000 -0400
36654+++ linux-2.6.32.46/drivers/platform/x86/asus_acpi.c 2011-04-17 15:56:46.000000000 -0400
36655@@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_
36656 return 0;
36657 }
36658
36659-static struct backlight_ops asus_backlight_data = {
36660+static const struct backlight_ops asus_backlight_data = {
36661 .get_brightness = read_brightness,
36662 .update_status = set_brightness_status,
36663 };
36664diff -urNp linux-2.6.32.46/drivers/platform/x86/asus-laptop.c linux-2.6.32.46/drivers/platform/x86/asus-laptop.c
36665--- linux-2.6.32.46/drivers/platform/x86/asus-laptop.c 2011-03-27 14:31:47.000000000 -0400
36666+++ linux-2.6.32.46/drivers/platform/x86/asus-laptop.c 2011-04-17 15:56:46.000000000 -0400
36667@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
36668 */
36669 static int read_brightness(struct backlight_device *bd);
36670 static int update_bl_status(struct backlight_device *bd);
36671-static struct backlight_ops asusbl_ops = {
36672+static const struct backlight_ops asusbl_ops = {
36673 .get_brightness = read_brightness,
36674 .update_status = update_bl_status,
36675 };
36676diff -urNp linux-2.6.32.46/drivers/platform/x86/compal-laptop.c linux-2.6.32.46/drivers/platform/x86/compal-laptop.c
36677--- linux-2.6.32.46/drivers/platform/x86/compal-laptop.c 2011-03-27 14:31:47.000000000 -0400
36678+++ linux-2.6.32.46/drivers/platform/x86/compal-laptop.c 2011-04-17 15:56:46.000000000 -0400
36679@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
36680 return set_lcd_level(b->props.brightness);
36681 }
36682
36683-static struct backlight_ops compalbl_ops = {
36684+static const struct backlight_ops compalbl_ops = {
36685 .get_brightness = bl_get_brightness,
36686 .update_status = bl_update_status,
36687 };
36688diff -urNp linux-2.6.32.46/drivers/platform/x86/dell-laptop.c linux-2.6.32.46/drivers/platform/x86/dell-laptop.c
36689--- linux-2.6.32.46/drivers/platform/x86/dell-laptop.c 2011-05-10 22:12:01.000000000 -0400
36690+++ linux-2.6.32.46/drivers/platform/x86/dell-laptop.c 2011-05-10 22:12:33.000000000 -0400
36691@@ -318,7 +318,7 @@ static int dell_get_intensity(struct bac
36692 return buffer.output[1];
36693 }
36694
36695-static struct backlight_ops dell_ops = {
36696+static const struct backlight_ops dell_ops = {
36697 .get_brightness = dell_get_intensity,
36698 .update_status = dell_send_intensity,
36699 };
36700diff -urNp linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c
36701--- linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c 2011-03-27 14:31:47.000000000 -0400
36702+++ linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c 2011-04-17 15:56:46.000000000 -0400
36703@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
36704 */
36705 static int read_brightness(struct backlight_device *bd);
36706 static int update_bl_status(struct backlight_device *bd);
36707-static struct backlight_ops eeepcbl_ops = {
36708+static const struct backlight_ops eeepcbl_ops = {
36709 .get_brightness = read_brightness,
36710 .update_status = update_bl_status,
36711 };
36712diff -urNp linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c
36713--- linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c 2011-03-27 14:31:47.000000000 -0400
36714+++ linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c 2011-04-17 15:56:46.000000000 -0400
36715@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
36716 return ret;
36717 }
36718
36719-static struct backlight_ops fujitsubl_ops = {
36720+static const struct backlight_ops fujitsubl_ops = {
36721 .get_brightness = bl_get_brightness,
36722 .update_status = bl_update_status,
36723 };
36724diff -urNp linux-2.6.32.46/drivers/platform/x86/msi-laptop.c linux-2.6.32.46/drivers/platform/x86/msi-laptop.c
36725--- linux-2.6.32.46/drivers/platform/x86/msi-laptop.c 2011-03-27 14:31:47.000000000 -0400
36726+++ linux-2.6.32.46/drivers/platform/x86/msi-laptop.c 2011-04-17 15:56:46.000000000 -0400
36727@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
36728 return set_lcd_level(b->props.brightness);
36729 }
36730
36731-static struct backlight_ops msibl_ops = {
36732+static const struct backlight_ops msibl_ops = {
36733 .get_brightness = bl_get_brightness,
36734 .update_status = bl_update_status,
36735 };
36736diff -urNp linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c
36737--- linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c 2011-03-27 14:31:47.000000000 -0400
36738+++ linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c 2011-04-17 15:56:46.000000000 -0400
36739@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
36740 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
36741 }
36742
36743-static struct backlight_ops pcc_backlight_ops = {
36744+static const struct backlight_ops pcc_backlight_ops = {
36745 .get_brightness = bl_get,
36746 .update_status = bl_set_status,
36747 };
36748diff -urNp linux-2.6.32.46/drivers/platform/x86/sony-laptop.c linux-2.6.32.46/drivers/platform/x86/sony-laptop.c
36749--- linux-2.6.32.46/drivers/platform/x86/sony-laptop.c 2011-03-27 14:31:47.000000000 -0400
36750+++ linux-2.6.32.46/drivers/platform/x86/sony-laptop.c 2011-04-17 15:56:46.000000000 -0400
36751@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
36752 }
36753
36754 static struct backlight_device *sony_backlight_device;
36755-static struct backlight_ops sony_backlight_ops = {
36756+static const struct backlight_ops sony_backlight_ops = {
36757 .update_status = sony_backlight_update_status,
36758 .get_brightness = sony_backlight_get_brightness,
36759 };
36760diff -urNp linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c
36761--- linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c 2011-03-27 14:31:47.000000000 -0400
36762+++ linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c 2011-08-05 20:33:55.000000000 -0400
36763@@ -2137,7 +2137,7 @@ static int hotkey_mask_get(void)
36764 return 0;
36765 }
36766
36767-void static hotkey_mask_warn_incomplete_mask(void)
36768+static void hotkey_mask_warn_incomplete_mask(void)
36769 {
36770 /* log only what the user can fix... */
36771 const u32 wantedmask = hotkey_driver_mask &
36772@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
36773 BACKLIGHT_UPDATE_HOTKEY);
36774 }
36775
36776-static struct backlight_ops ibm_backlight_data = {
36777+static const struct backlight_ops ibm_backlight_data = {
36778 .get_brightness = brightness_get,
36779 .update_status = brightness_update_status,
36780 };
36781diff -urNp linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c
36782--- linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c 2011-03-27 14:31:47.000000000 -0400
36783+++ linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c 2011-04-17 15:56:46.000000000 -0400
36784@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
36785 return AE_OK;
36786 }
36787
36788-static struct backlight_ops toshiba_backlight_data = {
36789+static const struct backlight_ops toshiba_backlight_data = {
36790 .get_brightness = get_lcd,
36791 .update_status = set_lcd_status,
36792 };
36793diff -urNp linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c
36794--- linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c 2011-03-27 14:31:47.000000000 -0400
36795+++ linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:56:46.000000000 -0400
36796@@ -60,7 +60,7 @@ do { \
36797 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
36798 } while(0)
36799
36800-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
36801+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
36802 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
36803
36804 /*
36805@@ -97,7 +97,10 @@ static inline u16 call_pnp_bios(u16 func
36806
36807 cpu = get_cpu();
36808 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
36809+
36810+ pax_open_kernel();
36811 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
36812+ pax_close_kernel();
36813
36814 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
36815 spin_lock_irqsave(&pnp_bios_lock, flags);
36816@@ -135,7 +138,10 @@ static inline u16 call_pnp_bios(u16 func
36817 :"memory");
36818 spin_unlock_irqrestore(&pnp_bios_lock, flags);
36819
36820+ pax_open_kernel();
36821 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
36822+ pax_close_kernel();
36823+
36824 put_cpu();
36825
36826 /* If we get here and this is set then the PnP BIOS faulted on us. */
36827@@ -469,7 +475,7 @@ int pnp_bios_read_escd(char *data, u32 n
36828 return status;
36829 }
36830
36831-void pnpbios_calls_init(union pnp_bios_install_struct *header)
36832+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
36833 {
36834 int i;
36835
36836@@ -477,6 +483,8 @@ void pnpbios_calls_init(union pnp_bios_i
36837 pnp_bios_callpoint.offset = header->fields.pm16offset;
36838 pnp_bios_callpoint.segment = PNP_CS16;
36839
36840+ pax_open_kernel();
36841+
36842 for_each_possible_cpu(i) {
36843 struct desc_struct *gdt = get_cpu_gdt_table(i);
36844 if (!gdt)
36845@@ -488,4 +496,6 @@ void pnpbios_calls_init(union pnp_bios_i
36846 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
36847 (unsigned long)__va(header->fields.pm16dseg));
36848 }
36849+
36850+ pax_close_kernel();
36851 }
36852diff -urNp linux-2.6.32.46/drivers/pnp/resource.c linux-2.6.32.46/drivers/pnp/resource.c
36853--- linux-2.6.32.46/drivers/pnp/resource.c 2011-03-27 14:31:47.000000000 -0400
36854+++ linux-2.6.32.46/drivers/pnp/resource.c 2011-04-17 15:56:46.000000000 -0400
36855@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
36856 return 1;
36857
36858 /* check if the resource is valid */
36859- if (*irq < 0 || *irq > 15)
36860+ if (*irq > 15)
36861 return 0;
36862
36863 /* check if the resource is reserved */
36864@@ -419,7 +419,7 @@ int pnp_check_dma(struct pnp_dev *dev, s
36865 return 1;
36866
36867 /* check if the resource is valid */
36868- if (*dma < 0 || *dma == 4 || *dma > 7)
36869+ if (*dma == 4 || *dma > 7)
36870 return 0;
36871
36872 /* check if the resource is reserved */
36873diff -urNp linux-2.6.32.46/drivers/power/bq27x00_battery.c linux-2.6.32.46/drivers/power/bq27x00_battery.c
36874--- linux-2.6.32.46/drivers/power/bq27x00_battery.c 2011-03-27 14:31:47.000000000 -0400
36875+++ linux-2.6.32.46/drivers/power/bq27x00_battery.c 2011-08-05 20:33:55.000000000 -0400
36876@@ -44,7 +44,7 @@ struct bq27x00_device_info;
36877 struct bq27x00_access_methods {
36878 int (*read)(u8 reg, int *rt_value, int b_single,
36879 struct bq27x00_device_info *di);
36880-};
36881+} __no_const;
36882
36883 struct bq27x00_device_info {
36884 struct device *dev;
36885diff -urNp linux-2.6.32.46/drivers/rtc/rtc-dev.c linux-2.6.32.46/drivers/rtc/rtc-dev.c
36886--- linux-2.6.32.46/drivers/rtc/rtc-dev.c 2011-03-27 14:31:47.000000000 -0400
36887+++ linux-2.6.32.46/drivers/rtc/rtc-dev.c 2011-04-17 15:56:46.000000000 -0400
36888@@ -14,6 +14,7 @@
36889 #include <linux/module.h>
36890 #include <linux/rtc.h>
36891 #include <linux/sched.h>
36892+#include <linux/grsecurity.h>
36893 #include "rtc-core.h"
36894
36895 static dev_t rtc_devt;
36896@@ -357,6 +358,8 @@ static long rtc_dev_ioctl(struct file *f
36897 if (copy_from_user(&tm, uarg, sizeof(tm)))
36898 return -EFAULT;
36899
36900+ gr_log_timechange();
36901+
36902 return rtc_set_time(rtc, &tm);
36903
36904 case RTC_PIE_ON:
36905diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.c linux-2.6.32.46/drivers/s390/cio/qdio_perf.c
36906--- linux-2.6.32.46/drivers/s390/cio/qdio_perf.c 2011-03-27 14:31:47.000000000 -0400
36907+++ linux-2.6.32.46/drivers/s390/cio/qdio_perf.c 2011-04-17 15:56:46.000000000 -0400
36908@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
36909 static int qdio_perf_proc_show(struct seq_file *m, void *v)
36910 {
36911 seq_printf(m, "Number of qdio interrupts\t\t\t: %li\n",
36912- (long)atomic_long_read(&perf_stats.qdio_int));
36913+ (long)atomic_long_read_unchecked(&perf_stats.qdio_int));
36914 seq_printf(m, "Number of PCI interrupts\t\t\t: %li\n",
36915- (long)atomic_long_read(&perf_stats.pci_int));
36916+ (long)atomic_long_read_unchecked(&perf_stats.pci_int));
36917 seq_printf(m, "Number of adapter interrupts\t\t\t: %li\n",
36918- (long)atomic_long_read(&perf_stats.thin_int));
36919+ (long)atomic_long_read_unchecked(&perf_stats.thin_int));
36920 seq_printf(m, "\n");
36921 seq_printf(m, "Inbound tasklet runs\t\t\t\t: %li\n",
36922- (long)atomic_long_read(&perf_stats.tasklet_inbound));
36923+ (long)atomic_long_read_unchecked(&perf_stats.tasklet_inbound));
36924 seq_printf(m, "Outbound tasklet runs\t\t\t\t: %li\n",
36925- (long)atomic_long_read(&perf_stats.tasklet_outbound));
36926+ (long)atomic_long_read_unchecked(&perf_stats.tasklet_outbound));
36927 seq_printf(m, "Adapter interrupt tasklet runs/loops\t\t: %li/%li\n",
36928- (long)atomic_long_read(&perf_stats.tasklet_thinint),
36929- (long)atomic_long_read(&perf_stats.tasklet_thinint_loop));
36930+ (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint),
36931+ (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint_loop));
36932 seq_printf(m, "Adapter interrupt inbound tasklet runs/loops\t: %li/%li\n",
36933- (long)atomic_long_read(&perf_stats.thinint_inbound),
36934- (long)atomic_long_read(&perf_stats.thinint_inbound_loop));
36935+ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound),
36936+ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop));
36937 seq_printf(m, "\n");
36938 seq_printf(m, "Number of SIGA In issued\t\t\t: %li\n",
36939- (long)atomic_long_read(&perf_stats.siga_in));
36940+ (long)atomic_long_read_unchecked(&perf_stats.siga_in));
36941 seq_printf(m, "Number of SIGA Out issued\t\t\t: %li\n",
36942- (long)atomic_long_read(&perf_stats.siga_out));
36943+ (long)atomic_long_read_unchecked(&perf_stats.siga_out));
36944 seq_printf(m, "Number of SIGA Sync issued\t\t\t: %li\n",
36945- (long)atomic_long_read(&perf_stats.siga_sync));
36946+ (long)atomic_long_read_unchecked(&perf_stats.siga_sync));
36947 seq_printf(m, "\n");
36948 seq_printf(m, "Number of inbound transfers\t\t\t: %li\n",
36949- (long)atomic_long_read(&perf_stats.inbound_handler));
36950+ (long)atomic_long_read_unchecked(&perf_stats.inbound_handler));
36951 seq_printf(m, "Number of outbound transfers\t\t\t: %li\n",
36952- (long)atomic_long_read(&perf_stats.outbound_handler));
36953+ (long)atomic_long_read_unchecked(&perf_stats.outbound_handler));
36954 seq_printf(m, "\n");
36955 seq_printf(m, "Number of fast requeues (outg. SBAL w/o SIGA)\t: %li\n",
36956- (long)atomic_long_read(&perf_stats.fast_requeue));
36957+ (long)atomic_long_read_unchecked(&perf_stats.fast_requeue));
36958 seq_printf(m, "Number of outbound target full condition\t: %li\n",
36959- (long)atomic_long_read(&perf_stats.outbound_target_full));
36960+ (long)atomic_long_read_unchecked(&perf_stats.outbound_target_full));
36961 seq_printf(m, "Number of outbound tasklet mod_timer calls\t: %li\n",
36962- (long)atomic_long_read(&perf_stats.debug_tl_out_timer));
36963+ (long)atomic_long_read_unchecked(&perf_stats.debug_tl_out_timer));
36964 seq_printf(m, "Number of stop polling calls\t\t\t: %li\n",
36965- (long)atomic_long_read(&perf_stats.debug_stop_polling));
36966+ (long)atomic_long_read_unchecked(&perf_stats.debug_stop_polling));
36967 seq_printf(m, "AI inbound tasklet loops after stop polling\t: %li\n",
36968- (long)atomic_long_read(&perf_stats.thinint_inbound_loop2));
36969+ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop2));
36970 seq_printf(m, "QEBSM EQBS total/incomplete\t\t\t: %li/%li\n",
36971- (long)atomic_long_read(&perf_stats.debug_eqbs_all),
36972- (long)atomic_long_read(&perf_stats.debug_eqbs_incomplete));
36973+ (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_all),
36974+ (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_incomplete));
36975 seq_printf(m, "QEBSM SQBS total/incomplete\t\t\t: %li/%li\n",
36976- (long)atomic_long_read(&perf_stats.debug_sqbs_all),
36977- (long)atomic_long_read(&perf_stats.debug_sqbs_incomplete));
36978+ (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_all),
36979+ (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_incomplete));
36980 seq_printf(m, "\n");
36981 return 0;
36982 }
36983diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.h linux-2.6.32.46/drivers/s390/cio/qdio_perf.h
36984--- linux-2.6.32.46/drivers/s390/cio/qdio_perf.h 2011-03-27 14:31:47.000000000 -0400
36985+++ linux-2.6.32.46/drivers/s390/cio/qdio_perf.h 2011-04-17 15:56:46.000000000 -0400
36986@@ -13,46 +13,46 @@
36987
36988 struct qdio_perf_stats {
36989 /* interrupt handler calls */
36990- atomic_long_t qdio_int;
36991- atomic_long_t pci_int;
36992- atomic_long_t thin_int;
36993+ atomic_long_unchecked_t qdio_int;
36994+ atomic_long_unchecked_t pci_int;
36995+ atomic_long_unchecked_t thin_int;
36996
36997 /* tasklet runs */
36998- atomic_long_t tasklet_inbound;
36999- atomic_long_t tasklet_outbound;
37000- atomic_long_t tasklet_thinint;
37001- atomic_long_t tasklet_thinint_loop;
37002- atomic_long_t thinint_inbound;
37003- atomic_long_t thinint_inbound_loop;
37004- atomic_long_t thinint_inbound_loop2;
37005+ atomic_long_unchecked_t tasklet_inbound;
37006+ atomic_long_unchecked_t tasklet_outbound;
37007+ atomic_long_unchecked_t tasklet_thinint;
37008+ atomic_long_unchecked_t tasklet_thinint_loop;
37009+ atomic_long_unchecked_t thinint_inbound;
37010+ atomic_long_unchecked_t thinint_inbound_loop;
37011+ atomic_long_unchecked_t thinint_inbound_loop2;
37012
37013 /* signal adapter calls */
37014- atomic_long_t siga_out;
37015- atomic_long_t siga_in;
37016- atomic_long_t siga_sync;
37017+ atomic_long_unchecked_t siga_out;
37018+ atomic_long_unchecked_t siga_in;
37019+ atomic_long_unchecked_t siga_sync;
37020
37021 /* misc */
37022- atomic_long_t inbound_handler;
37023- atomic_long_t outbound_handler;
37024- atomic_long_t fast_requeue;
37025- atomic_long_t outbound_target_full;
37026+ atomic_long_unchecked_t inbound_handler;
37027+ atomic_long_unchecked_t outbound_handler;
37028+ atomic_long_unchecked_t fast_requeue;
37029+ atomic_long_unchecked_t outbound_target_full;
37030
37031 /* for debugging */
37032- atomic_long_t debug_tl_out_timer;
37033- atomic_long_t debug_stop_polling;
37034- atomic_long_t debug_eqbs_all;
37035- atomic_long_t debug_eqbs_incomplete;
37036- atomic_long_t debug_sqbs_all;
37037- atomic_long_t debug_sqbs_incomplete;
37038+ atomic_long_unchecked_t debug_tl_out_timer;
37039+ atomic_long_unchecked_t debug_stop_polling;
37040+ atomic_long_unchecked_t debug_eqbs_all;
37041+ atomic_long_unchecked_t debug_eqbs_incomplete;
37042+ atomic_long_unchecked_t debug_sqbs_all;
37043+ atomic_long_unchecked_t debug_sqbs_incomplete;
37044 };
37045
37046 extern struct qdio_perf_stats perf_stats;
37047 extern int qdio_performance_stats;
37048
37049-static inline void qdio_perf_stat_inc(atomic_long_t *count)
37050+static inline void qdio_perf_stat_inc(atomic_long_unchecked_t *count)
37051 {
37052 if (qdio_performance_stats)
37053- atomic_long_inc(count);
37054+ atomic_long_inc_unchecked(count);
37055 }
37056
37057 int qdio_setup_perf_stats(void);
37058diff -urNp linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h
37059--- linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h 2011-03-27 14:31:47.000000000 -0400
37060+++ linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h 2011-08-05 20:33:55.000000000 -0400
37061@@ -471,7 +471,7 @@ struct adapter_ops
37062 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
37063 /* Administrative operations */
37064 int (*adapter_comm)(struct aac_dev * dev, int comm);
37065-};
37066+} __no_const;
37067
37068 /*
37069 * Define which interrupt handler needs to be installed
37070diff -urNp linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c
37071--- linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c 2011-03-27 14:31:47.000000000 -0400
37072+++ linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c 2011-05-16 21:46:57.000000000 -0400
37073@@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_d
37074 u32 actual_fibsize64, actual_fibsize = 0;
37075 int i;
37076
37077+ pax_track_stack();
37078
37079 if (dev->in_reset) {
37080 dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
37081diff -urNp linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c
37082--- linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-27 14:31:47.000000000 -0400
37083+++ linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:56:46.000000000 -0400
37084@@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru
37085 flash_error_table[i].reason);
37086 }
37087
37088-static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUGO,
37089+static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUSR,
37090 asd_show_update_bios, asd_store_update_bios);
37091
37092 static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
37093diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h
37094--- linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h 2011-03-27 14:31:47.000000000 -0400
37095+++ linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h 2011-08-05 20:33:55.000000000 -0400
37096@@ -61,7 +61,7 @@ struct bfa_hwif_s {
37097 void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix);
37098 void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap,
37099 u32 *nvecs, u32 *maxvec);
37100-};
37101+} __no_const;
37102 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
37103
37104 struct bfa_iocfc_s {
37105diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h
37106--- linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h 2011-03-27 14:31:47.000000000 -0400
37107+++ linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h 2011-08-05 20:33:55.000000000 -0400
37108@@ -127,7 +127,7 @@ struct bfa_ioc_cbfn_s {
37109 bfa_ioc_disable_cbfn_t disable_cbfn;
37110 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
37111 bfa_ioc_reset_cbfn_t reset_cbfn;
37112-};
37113+} __no_const;
37114
37115 /**
37116 * Heartbeat failure notification queue element.
37117diff -urNp linux-2.6.32.46/drivers/scsi/BusLogic.c linux-2.6.32.46/drivers/scsi/BusLogic.c
37118--- linux-2.6.32.46/drivers/scsi/BusLogic.c 2011-03-27 14:31:47.000000000 -0400
37119+++ linux-2.6.32.46/drivers/scsi/BusLogic.c 2011-05-16 21:46:57.000000000 -0400
37120@@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFla
37121 static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
37122 *PrototypeHostAdapter)
37123 {
37124+ pax_track_stack();
37125+
37126 /*
37127 If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
37128 Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
37129diff -urNp linux-2.6.32.46/drivers/scsi/dpt_i2o.c linux-2.6.32.46/drivers/scsi/dpt_i2o.c
37130--- linux-2.6.32.46/drivers/scsi/dpt_i2o.c 2011-03-27 14:31:47.000000000 -0400
37131+++ linux-2.6.32.46/drivers/scsi/dpt_i2o.c 2011-05-16 21:46:57.000000000 -0400
37132@@ -1804,6 +1804,8 @@ static int adpt_i2o_passthru(adpt_hba* p
37133 dma_addr_t addr;
37134 ulong flags = 0;
37135
37136+ pax_track_stack();
37137+
37138 memset(&msg, 0, MAX_MESSAGE_SIZE*4);
37139 // get user msg size in u32s
37140 if(get_user(size, &user_msg[0])){
37141@@ -2297,6 +2299,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pH
37142 s32 rcode;
37143 dma_addr_t addr;
37144
37145+ pax_track_stack();
37146+
37147 memset(msg, 0 , sizeof(msg));
37148 len = scsi_bufflen(cmd);
37149 direction = 0x00000000;
37150diff -urNp linux-2.6.32.46/drivers/scsi/eata.c linux-2.6.32.46/drivers/scsi/eata.c
37151--- linux-2.6.32.46/drivers/scsi/eata.c 2011-03-27 14:31:47.000000000 -0400
37152+++ linux-2.6.32.46/drivers/scsi/eata.c 2011-05-16 21:46:57.000000000 -0400
37153@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
37154 struct hostdata *ha;
37155 char name[16];
37156
37157+ pax_track_stack();
37158+
37159 sprintf(name, "%s%d", driver_name, j);
37160
37161 if (!request_region(port_base, REGION_SIZE, driver_name)) {
37162diff -urNp linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c
37163--- linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c 2011-03-27 14:31:47.000000000 -0400
37164+++ linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c 2011-05-16 21:46:57.000000000 -0400
37165@@ -809,6 +809,8 @@ static void fcoe_ctlr_recv_els(struct fc
37166 size_t rlen;
37167 size_t dlen;
37168
37169+ pax_track_stack();
37170+
37171 fiph = (struct fip_header *)skb->data;
37172 sub = fiph->fip_subcode;
37173 if (sub != FIP_SC_REQ && sub != FIP_SC_REP)
37174diff -urNp linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c
37175--- linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c 2011-03-27 14:31:47.000000000 -0400
37176+++ linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c 2011-08-05 20:33:55.000000000 -0400
37177@@ -669,7 +669,7 @@ static int __devinit fnic_probe(struct p
37178 /* Start local port initiatialization */
37179
37180 lp->link_up = 0;
37181- lp->tt = fnic_transport_template;
37182+ memcpy((void *)&lp->tt, &fnic_transport_template, sizeof(fnic_transport_template));
37183
37184 lp->max_retry_count = fnic->config.flogi_retries;
37185 lp->max_rport_retry_count = fnic->config.plogi_retries;
37186diff -urNp linux-2.6.32.46/drivers/scsi/gdth.c linux-2.6.32.46/drivers/scsi/gdth.c
37187--- linux-2.6.32.46/drivers/scsi/gdth.c 2011-03-27 14:31:47.000000000 -0400
37188+++ linux-2.6.32.46/drivers/scsi/gdth.c 2011-05-16 21:46:57.000000000 -0400
37189@@ -4102,6 +4102,8 @@ static int ioc_lockdrv(void __user *arg)
37190 ulong flags;
37191 gdth_ha_str *ha;
37192
37193+ pax_track_stack();
37194+
37195 if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv)))
37196 return -EFAULT;
37197 ha = gdth_find_ha(ldrv.ionode);
37198@@ -4134,6 +4136,8 @@ static int ioc_resetdrv(void __user *arg
37199 gdth_ha_str *ha;
37200 int rval;
37201
37202+ pax_track_stack();
37203+
37204 if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) ||
37205 res.number >= MAX_HDRIVES)
37206 return -EFAULT;
37207@@ -4169,6 +4173,8 @@ static int ioc_general(void __user *arg,
37208 gdth_ha_str *ha;
37209 int rval;
37210
37211+ pax_track_stack();
37212+
37213 if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general)))
37214 return -EFAULT;
37215 ha = gdth_find_ha(gen.ionode);
37216@@ -4625,6 +4631,9 @@ static void gdth_flush(gdth_ha_str *ha)
37217 int i;
37218 gdth_cmd_str gdtcmd;
37219 char cmnd[MAX_COMMAND_SIZE];
37220+
37221+ pax_track_stack();
37222+
37223 memset(cmnd, 0xff, MAX_COMMAND_SIZE);
37224
37225 TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
37226diff -urNp linux-2.6.32.46/drivers/scsi/gdth_proc.c linux-2.6.32.46/drivers/scsi/gdth_proc.c
37227--- linux-2.6.32.46/drivers/scsi/gdth_proc.c 2011-03-27 14:31:47.000000000 -0400
37228+++ linux-2.6.32.46/drivers/scsi/gdth_proc.c 2011-05-16 21:46:57.000000000 -0400
37229@@ -46,6 +46,9 @@ static int gdth_set_asc_info(struct Scsi
37230 ulong64 paddr;
37231
37232 char cmnd[MAX_COMMAND_SIZE];
37233+
37234+ pax_track_stack();
37235+
37236 memset(cmnd, 0xff, 12);
37237 memset(&gdtcmd, 0, sizeof(gdth_cmd_str));
37238
37239@@ -174,6 +177,8 @@ static int gdth_get_info(char *buffer,ch
37240 gdth_hget_str *phg;
37241 char cmnd[MAX_COMMAND_SIZE];
37242
37243+ pax_track_stack();
37244+
37245 gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
37246 estr = kmalloc(sizeof(*estr), GFP_KERNEL);
37247 if (!gdtcmd || !estr)
37248diff -urNp linux-2.6.32.46/drivers/scsi/hosts.c linux-2.6.32.46/drivers/scsi/hosts.c
37249--- linux-2.6.32.46/drivers/scsi/hosts.c 2011-03-27 14:31:47.000000000 -0400
37250+++ linux-2.6.32.46/drivers/scsi/hosts.c 2011-05-04 17:56:28.000000000 -0400
37251@@ -40,7 +40,7 @@
37252 #include "scsi_logging.h"
37253
37254
37255-static atomic_t scsi_host_next_hn; /* host_no for next new host */
37256+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
37257
37258
37259 static void scsi_host_cls_release(struct device *dev)
37260@@ -344,7 +344,7 @@ struct Scsi_Host *scsi_host_alloc(struct
37261 * subtract one because we increment first then return, but we need to
37262 * know what the next host number was before increment
37263 */
37264- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
37265+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
37266 shost->dma_channel = 0xff;
37267
37268 /* These three are default values which can be overridden */
37269diff -urNp linux-2.6.32.46/drivers/scsi/ipr.c linux-2.6.32.46/drivers/scsi/ipr.c
37270--- linux-2.6.32.46/drivers/scsi/ipr.c 2011-03-27 14:31:47.000000000 -0400
37271+++ linux-2.6.32.46/drivers/scsi/ipr.c 2011-04-17 15:56:46.000000000 -0400
37272@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
37273 return true;
37274 }
37275
37276-static struct ata_port_operations ipr_sata_ops = {
37277+static const struct ata_port_operations ipr_sata_ops = {
37278 .phy_reset = ipr_ata_phy_reset,
37279 .hardreset = ipr_sata_reset,
37280 .post_internal_cmd = ipr_ata_post_internal,
37281diff -urNp linux-2.6.32.46/drivers/scsi/ips.h linux-2.6.32.46/drivers/scsi/ips.h
37282--- linux-2.6.32.46/drivers/scsi/ips.h 2011-03-27 14:31:47.000000000 -0400
37283+++ linux-2.6.32.46/drivers/scsi/ips.h 2011-08-05 20:33:55.000000000 -0400
37284@@ -1027,7 +1027,7 @@ typedef struct {
37285 int (*intr)(struct ips_ha *);
37286 void (*enableint)(struct ips_ha *);
37287 uint32_t (*statupd)(struct ips_ha *);
37288-} ips_hw_func_t;
37289+} __no_const ips_hw_func_t;
37290
37291 typedef struct ips_ha {
37292 uint8_t ha_id[IPS_MAX_CHANNELS+1];
37293diff -urNp linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c
37294--- linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c 2011-03-27 14:31:47.000000000 -0400
37295+++ linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c 2011-08-23 21:22:32.000000000 -0400
37296@@ -86,12 +86,12 @@ struct fc_exch_mgr {
37297 * all together if not used XXX
37298 */
37299 struct {
37300- atomic_t no_free_exch;
37301- atomic_t no_free_exch_xid;
37302- atomic_t xid_not_found;
37303- atomic_t xid_busy;
37304- atomic_t seq_not_found;
37305- atomic_t non_bls_resp;
37306+ atomic_unchecked_t no_free_exch;
37307+ atomic_unchecked_t no_free_exch_xid;
37308+ atomic_unchecked_t xid_not_found;
37309+ atomic_unchecked_t xid_busy;
37310+ atomic_unchecked_t seq_not_found;
37311+ atomic_unchecked_t non_bls_resp;
37312 } stats;
37313 };
37314 #define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
37315@@ -510,7 +510,7 @@ static struct fc_exch *fc_exch_em_alloc(
37316 /* allocate memory for exchange */
37317 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
37318 if (!ep) {
37319- atomic_inc(&mp->stats.no_free_exch);
37320+ atomic_inc_unchecked(&mp->stats.no_free_exch);
37321 goto out;
37322 }
37323 memset(ep, 0, sizeof(*ep));
37324@@ -557,7 +557,7 @@ out:
37325 return ep;
37326 err:
37327 spin_unlock_bh(&pool->lock);
37328- atomic_inc(&mp->stats.no_free_exch_xid);
37329+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
37330 mempool_free(ep, mp->ep_pool);
37331 return NULL;
37332 }
37333@@ -690,7 +690,7 @@ static enum fc_pf_rjt_reason fc_seq_look
37334 xid = ntohs(fh->fh_ox_id); /* we originated exch */
37335 ep = fc_exch_find(mp, xid);
37336 if (!ep) {
37337- atomic_inc(&mp->stats.xid_not_found);
37338+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37339 reject = FC_RJT_OX_ID;
37340 goto out;
37341 }
37342@@ -720,7 +720,7 @@ static enum fc_pf_rjt_reason fc_seq_look
37343 ep = fc_exch_find(mp, xid);
37344 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
37345 if (ep) {
37346- atomic_inc(&mp->stats.xid_busy);
37347+ atomic_inc_unchecked(&mp->stats.xid_busy);
37348 reject = FC_RJT_RX_ID;
37349 goto rel;
37350 }
37351@@ -731,7 +731,7 @@ static enum fc_pf_rjt_reason fc_seq_look
37352 }
37353 xid = ep->xid; /* get our XID */
37354 } else if (!ep) {
37355- atomic_inc(&mp->stats.xid_not_found);
37356+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37357 reject = FC_RJT_RX_ID; /* XID not found */
37358 goto out;
37359 }
37360@@ -752,7 +752,7 @@ static enum fc_pf_rjt_reason fc_seq_look
37361 } else {
37362 sp = &ep->seq;
37363 if (sp->id != fh->fh_seq_id) {
37364- atomic_inc(&mp->stats.seq_not_found);
37365+ atomic_inc_unchecked(&mp->stats.seq_not_found);
37366 reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */
37367 goto rel;
37368 }
37369@@ -1163,22 +1163,22 @@ static void fc_exch_recv_seq_resp(struct
37370
37371 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
37372 if (!ep) {
37373- atomic_inc(&mp->stats.xid_not_found);
37374+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37375 goto out;
37376 }
37377 if (ep->esb_stat & ESB_ST_COMPLETE) {
37378- atomic_inc(&mp->stats.xid_not_found);
37379+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37380 goto out;
37381 }
37382 if (ep->rxid == FC_XID_UNKNOWN)
37383 ep->rxid = ntohs(fh->fh_rx_id);
37384 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
37385- atomic_inc(&mp->stats.xid_not_found);
37386+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37387 goto rel;
37388 }
37389 if (ep->did != ntoh24(fh->fh_s_id) &&
37390 ep->did != FC_FID_FLOGI) {
37391- atomic_inc(&mp->stats.xid_not_found);
37392+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37393 goto rel;
37394 }
37395 sof = fr_sof(fp);
37396@@ -1189,7 +1189,7 @@ static void fc_exch_recv_seq_resp(struct
37397 } else {
37398 sp = &ep->seq;
37399 if (sp->id != fh->fh_seq_id) {
37400- atomic_inc(&mp->stats.seq_not_found);
37401+ atomic_inc_unchecked(&mp->stats.seq_not_found);
37402 goto rel;
37403 }
37404 }
37405@@ -1249,9 +1249,9 @@ static void fc_exch_recv_resp(struct fc_
37406 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
37407
37408 if (!sp)
37409- atomic_inc(&mp->stats.xid_not_found);
37410+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37411 else
37412- atomic_inc(&mp->stats.non_bls_resp);
37413+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
37414
37415 fc_frame_free(fp);
37416 }
37417diff -urNp linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c
37418--- linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c 2011-03-27 14:31:47.000000000 -0400
37419+++ linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c 2011-04-23 12:56:11.000000000 -0400
37420@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
37421 }
37422 }
37423
37424-static struct ata_port_operations sas_sata_ops = {
37425+static const struct ata_port_operations sas_sata_ops = {
37426 .phy_reset = sas_ata_phy_reset,
37427 .post_internal_cmd = sas_ata_post_internal,
37428 .qc_defer = ata_std_qc_defer,
37429diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c
37430--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c 2011-03-27 14:31:47.000000000 -0400
37431+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-16 21:46:57.000000000 -0400
37432@@ -124,7 +124,7 @@ struct lpfc_debug {
37433 int len;
37434 };
37435
37436-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
37437+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
37438 static unsigned long lpfc_debugfs_start_time = 0L;
37439
37440 /**
37441@@ -158,7 +158,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
37442 lpfc_debugfs_enable = 0;
37443
37444 len = 0;
37445- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
37446+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
37447 (lpfc_debugfs_max_disc_trc - 1);
37448 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
37449 dtp = vport->disc_trc + i;
37450@@ -219,7 +219,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
37451 lpfc_debugfs_enable = 0;
37452
37453 len = 0;
37454- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
37455+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
37456 (lpfc_debugfs_max_slow_ring_trc - 1);
37457 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
37458 dtp = phba->slow_ring_trc + i;
37459@@ -397,6 +397,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpf
37460 uint32_t *ptr;
37461 char buffer[1024];
37462
37463+ pax_track_stack();
37464+
37465 off = 0;
37466 spin_lock_irq(&phba->hbalock);
37467
37468@@ -634,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport
37469 !vport || !vport->disc_trc)
37470 return;
37471
37472- index = atomic_inc_return(&vport->disc_trc_cnt) &
37473+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
37474 (lpfc_debugfs_max_disc_trc - 1);
37475 dtp = vport->disc_trc + index;
37476 dtp->fmt = fmt;
37477 dtp->data1 = data1;
37478 dtp->data2 = data2;
37479 dtp->data3 = data3;
37480- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
37481+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
37482 dtp->jif = jiffies;
37483 #endif
37484 return;
37485@@ -672,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
37486 !phba || !phba->slow_ring_trc)
37487 return;
37488
37489- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
37490+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
37491 (lpfc_debugfs_max_slow_ring_trc - 1);
37492 dtp = phba->slow_ring_trc + index;
37493 dtp->fmt = fmt;
37494 dtp->data1 = data1;
37495 dtp->data2 = data2;
37496 dtp->data3 = data3;
37497- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
37498+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
37499 dtp->jif = jiffies;
37500 #endif
37501 return;
37502@@ -1364,7 +1366,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
37503 "slow_ring buffer\n");
37504 goto debug_failed;
37505 }
37506- atomic_set(&phba->slow_ring_trc_cnt, 0);
37507+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
37508 memset(phba->slow_ring_trc, 0,
37509 (sizeof(struct lpfc_debugfs_trc) *
37510 lpfc_debugfs_max_slow_ring_trc));
37511@@ -1410,7 +1412,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
37512 "buffer\n");
37513 goto debug_failed;
37514 }
37515- atomic_set(&vport->disc_trc_cnt, 0);
37516+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
37517
37518 snprintf(name, sizeof(name), "discovery_trace");
37519 vport->debug_disc_trc =
37520diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h
37521--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h 2011-03-27 14:31:47.000000000 -0400
37522+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h 2011-05-04 17:56:28.000000000 -0400
37523@@ -400,7 +400,7 @@ struct lpfc_vport {
37524 struct dentry *debug_nodelist;
37525 struct dentry *vport_debugfs_root;
37526 struct lpfc_debugfs_trc *disc_trc;
37527- atomic_t disc_trc_cnt;
37528+ atomic_unchecked_t disc_trc_cnt;
37529 #endif
37530 uint8_t stat_data_enabled;
37531 uint8_t stat_data_blocked;
37532@@ -725,8 +725,8 @@ struct lpfc_hba {
37533 struct timer_list fabric_block_timer;
37534 unsigned long bit_flags;
37535 #define FABRIC_COMANDS_BLOCKED 0
37536- atomic_t num_rsrc_err;
37537- atomic_t num_cmd_success;
37538+ atomic_unchecked_t num_rsrc_err;
37539+ atomic_unchecked_t num_cmd_success;
37540 unsigned long last_rsrc_error_time;
37541 unsigned long last_ramp_down_time;
37542 unsigned long last_ramp_up_time;
37543@@ -740,7 +740,7 @@ struct lpfc_hba {
37544 struct dentry *debug_dumpDif; /* BlockGuard BPL*/
37545 struct dentry *debug_slow_ring_trc;
37546 struct lpfc_debugfs_trc *slow_ring_trc;
37547- atomic_t slow_ring_trc_cnt;
37548+ atomic_unchecked_t slow_ring_trc_cnt;
37549 #endif
37550
37551 /* Used for deferred freeing of ELS data buffers */
37552diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c
37553--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c 2011-03-27 14:31:47.000000000 -0400
37554+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c 2011-08-05 20:33:55.000000000 -0400
37555@@ -8021,8 +8021,10 @@ lpfc_init(void)
37556 printk(LPFC_COPYRIGHT "\n");
37557
37558 if (lpfc_enable_npiv) {
37559- lpfc_transport_functions.vport_create = lpfc_vport_create;
37560- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
37561+ pax_open_kernel();
37562+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
37563+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
37564+ pax_close_kernel();
37565 }
37566 lpfc_transport_template =
37567 fc_attach_transport(&lpfc_transport_functions);
37568diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c
37569--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c 2011-03-27 14:31:47.000000000 -0400
37570+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-04 17:56:28.000000000 -0400
37571@@ -259,7 +259,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
37572 uint32_t evt_posted;
37573
37574 spin_lock_irqsave(&phba->hbalock, flags);
37575- atomic_inc(&phba->num_rsrc_err);
37576+ atomic_inc_unchecked(&phba->num_rsrc_err);
37577 phba->last_rsrc_error_time = jiffies;
37578
37579 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
37580@@ -300,7 +300,7 @@ lpfc_rampup_queue_depth(struct lpfc_vpor
37581 unsigned long flags;
37582 struct lpfc_hba *phba = vport->phba;
37583 uint32_t evt_posted;
37584- atomic_inc(&phba->num_cmd_success);
37585+ atomic_inc_unchecked(&phba->num_cmd_success);
37586
37587 if (vport->cfg_lun_queue_depth <= queue_depth)
37588 return;
37589@@ -343,8 +343,8 @@ lpfc_ramp_down_queue_handler(struct lpfc
37590 int i;
37591 struct lpfc_rport_data *rdata;
37592
37593- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
37594- num_cmd_success = atomic_read(&phba->num_cmd_success);
37595+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
37596+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
37597
37598 vports = lpfc_create_vport_work_array(phba);
37599 if (vports != NULL)
37600@@ -378,8 +378,8 @@ lpfc_ramp_down_queue_handler(struct lpfc
37601 }
37602 }
37603 lpfc_destroy_vport_work_array(phba, vports);
37604- atomic_set(&phba->num_rsrc_err, 0);
37605- atomic_set(&phba->num_cmd_success, 0);
37606+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37607+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37608 }
37609
37610 /**
37611@@ -427,8 +427,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_h
37612 }
37613 }
37614 lpfc_destroy_vport_work_array(phba, vports);
37615- atomic_set(&phba->num_rsrc_err, 0);
37616- atomic_set(&phba->num_cmd_success, 0);
37617+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37618+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37619 }
37620
37621 /**
37622diff -urNp linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c
37623--- linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c 2011-03-27 14:31:47.000000000 -0400
37624+++ linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-16 21:46:57.000000000 -0400
37625@@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
37626 int rval;
37627 int i;
37628
37629+ pax_track_stack();
37630+
37631 // Allocate memory for the base list of scb for management module.
37632 adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
37633
37634diff -urNp linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c
37635--- linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c 2011-03-27 14:31:47.000000000 -0400
37636+++ linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c 2011-05-16 21:46:57.000000000 -0400
37637@@ -94,6 +94,8 @@ static int _osd_print_system_info(struct
37638 int nelem = ARRAY_SIZE(get_attrs), a = 0;
37639 int ret;
37640
37641+ pax_track_stack();
37642+
37643 or = osd_start_request(od, GFP_KERNEL);
37644 if (!or)
37645 return -ENOMEM;
37646diff -urNp linux-2.6.32.46/drivers/scsi/pmcraid.c linux-2.6.32.46/drivers/scsi/pmcraid.c
37647--- linux-2.6.32.46/drivers/scsi/pmcraid.c 2011-08-09 18:35:29.000000000 -0400
37648+++ linux-2.6.32.46/drivers/scsi/pmcraid.c 2011-08-09 18:33:59.000000000 -0400
37649@@ -189,8 +189,8 @@ static int pmcraid_slave_alloc(struct sc
37650 res->scsi_dev = scsi_dev;
37651 scsi_dev->hostdata = res;
37652 res->change_detected = 0;
37653- atomic_set(&res->read_failures, 0);
37654- atomic_set(&res->write_failures, 0);
37655+ atomic_set_unchecked(&res->read_failures, 0);
37656+ atomic_set_unchecked(&res->write_failures, 0);
37657 rc = 0;
37658 }
37659 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
37660@@ -2396,9 +2396,9 @@ static int pmcraid_error_handler(struct
37661
37662 /* If this was a SCSI read/write command keep count of errors */
37663 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
37664- atomic_inc(&res->read_failures);
37665+ atomic_inc_unchecked(&res->read_failures);
37666 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
37667- atomic_inc(&res->write_failures);
37668+ atomic_inc_unchecked(&res->write_failures);
37669
37670 if (!RES_IS_GSCSI(res->cfg_entry) &&
37671 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
37672@@ -4116,7 +4116,7 @@ static void pmcraid_worker_function(stru
37673
37674 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
37675 /* add resources only after host is added into system */
37676- if (!atomic_read(&pinstance->expose_resources))
37677+ if (!atomic_read_unchecked(&pinstance->expose_resources))
37678 return;
37679
37680 spin_lock_irqsave(&pinstance->resource_lock, lock_flags);
37681@@ -4850,7 +4850,7 @@ static int __devinit pmcraid_init_instan
37682 init_waitqueue_head(&pinstance->reset_wait_q);
37683
37684 atomic_set(&pinstance->outstanding_cmds, 0);
37685- atomic_set(&pinstance->expose_resources, 0);
37686+ atomic_set_unchecked(&pinstance->expose_resources, 0);
37687
37688 INIT_LIST_HEAD(&pinstance->free_res_q);
37689 INIT_LIST_HEAD(&pinstance->used_res_q);
37690@@ -5502,7 +5502,7 @@ static int __devinit pmcraid_probe(
37691 /* Schedule worker thread to handle CCN and take care of adding and
37692 * removing devices to OS
37693 */
37694- atomic_set(&pinstance->expose_resources, 1);
37695+ atomic_set_unchecked(&pinstance->expose_resources, 1);
37696 schedule_work(&pinstance->worker_q);
37697 return rc;
37698
37699diff -urNp linux-2.6.32.46/drivers/scsi/pmcraid.h linux-2.6.32.46/drivers/scsi/pmcraid.h
37700--- linux-2.6.32.46/drivers/scsi/pmcraid.h 2011-03-27 14:31:47.000000000 -0400
37701+++ linux-2.6.32.46/drivers/scsi/pmcraid.h 2011-05-04 17:56:28.000000000 -0400
37702@@ -690,7 +690,7 @@ struct pmcraid_instance {
37703 atomic_t outstanding_cmds;
37704
37705 /* should add/delete resources to mid-layer now ?*/
37706- atomic_t expose_resources;
37707+ atomic_unchecked_t expose_resources;
37708
37709 /* Tasklet to handle deferred processing */
37710 struct tasklet_struct isr_tasklet[PMCRAID_NUM_MSIX_VECTORS];
37711@@ -727,8 +727,8 @@ struct pmcraid_resource_entry {
37712 struct list_head queue; /* link to "to be exposed" resources */
37713 struct pmcraid_config_table_entry cfg_entry;
37714 struct scsi_device *scsi_dev; /* Link scsi_device structure */
37715- atomic_t read_failures; /* count of failed READ commands */
37716- atomic_t write_failures; /* count of failed WRITE commands */
37717+ atomic_unchecked_t read_failures; /* count of failed READ commands */
37718+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
37719
37720 /* To indicate add/delete/modify during CCN */
37721 u8 change_detected;
37722diff -urNp linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h
37723--- linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h 2011-03-27 14:31:47.000000000 -0400
37724+++ linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h 2011-08-05 20:33:55.000000000 -0400
37725@@ -2089,7 +2089,7 @@ struct isp_operations {
37726
37727 int (*get_flash_version) (struct scsi_qla_host *, void *);
37728 int (*start_scsi) (srb_t *);
37729-};
37730+} __no_const;
37731
37732 /* MSI-X Support *************************************************************/
37733
37734diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h
37735--- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h 2011-03-27 14:31:47.000000000 -0400
37736+++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h 2011-05-04 17:56:28.000000000 -0400
37737@@ -240,7 +240,7 @@ struct ddb_entry {
37738 atomic_t retry_relogin_timer; /* Min Time between relogins
37739 * (4000 only) */
37740 atomic_t relogin_timer; /* Max Time to wait for relogin to complete */
37741- atomic_t relogin_retry_count; /* Num of times relogin has been
37742+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
37743 * retried */
37744
37745 uint16_t port;
37746diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c
37747--- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c 2011-03-27 14:31:47.000000000 -0400
37748+++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c 2011-05-04 17:56:28.000000000 -0400
37749@@ -482,7 +482,7 @@ static struct ddb_entry * qla4xxx_alloc_
37750 atomic_set(&ddb_entry->port_down_timer, ha->port_down_retry_count);
37751 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
37752 atomic_set(&ddb_entry->relogin_timer, 0);
37753- atomic_set(&ddb_entry->relogin_retry_count, 0);
37754+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
37755 atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
37756 list_add_tail(&ddb_entry->list, &ha->ddb_list);
37757 ha->fw_ddb_index_map[fw_ddb_index] = ddb_entry;
37758@@ -1308,7 +1308,7 @@ int qla4xxx_process_ddb_changed(struct s
37759 atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
37760 atomic_set(&ddb_entry->port_down_timer,
37761 ha->port_down_retry_count);
37762- atomic_set(&ddb_entry->relogin_retry_count, 0);
37763+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
37764 atomic_set(&ddb_entry->relogin_timer, 0);
37765 clear_bit(DF_RELOGIN, &ddb_entry->flags);
37766 clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
37767diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c
37768--- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c 2011-03-27 14:31:47.000000000 -0400
37769+++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c 2011-05-04 17:56:28.000000000 -0400
37770@@ -641,13 +641,13 @@ static void qla4xxx_timer(struct scsi_ql
37771 ddb_entry->fw_ddb_device_state ==
37772 DDB_DS_SESSION_FAILED) {
37773 /* Reset retry relogin timer */
37774- atomic_inc(&ddb_entry->relogin_retry_count);
37775+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
37776 DEBUG2(printk("scsi%ld: index[%d] relogin"
37777 " timed out-retrying"
37778 " relogin (%d)\n",
37779 ha->host_no,
37780 ddb_entry->fw_ddb_index,
37781- atomic_read(&ddb_entry->
37782+ atomic_read_unchecked(&ddb_entry->
37783 relogin_retry_count))
37784 );
37785 start_dpc++;
37786diff -urNp linux-2.6.32.46/drivers/scsi/scsi.c linux-2.6.32.46/drivers/scsi/scsi.c
37787--- linux-2.6.32.46/drivers/scsi/scsi.c 2011-03-27 14:31:47.000000000 -0400
37788+++ linux-2.6.32.46/drivers/scsi/scsi.c 2011-05-04 17:56:28.000000000 -0400
37789@@ -652,7 +652,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
37790 unsigned long timeout;
37791 int rtn = 0;
37792
37793- atomic_inc(&cmd->device->iorequest_cnt);
37794+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37795
37796 /* check if the device is still usable */
37797 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
37798diff -urNp linux-2.6.32.46/drivers/scsi/scsi_debug.c linux-2.6.32.46/drivers/scsi/scsi_debug.c
37799--- linux-2.6.32.46/drivers/scsi/scsi_debug.c 2011-03-27 14:31:47.000000000 -0400
37800+++ linux-2.6.32.46/drivers/scsi/scsi_debug.c 2011-05-16 21:46:57.000000000 -0400
37801@@ -1395,6 +1395,8 @@ static int resp_mode_select(struct scsi_
37802 unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
37803 unsigned char *cmd = (unsigned char *)scp->cmnd;
37804
37805+ pax_track_stack();
37806+
37807 if ((errsts = check_readiness(scp, 1, devip)))
37808 return errsts;
37809 memset(arr, 0, sizeof(arr));
37810@@ -1492,6 +1494,8 @@ static int resp_log_sense(struct scsi_cm
37811 unsigned char arr[SDEBUG_MAX_LSENSE_SZ];
37812 unsigned char *cmd = (unsigned char *)scp->cmnd;
37813
37814+ pax_track_stack();
37815+
37816 if ((errsts = check_readiness(scp, 1, devip)))
37817 return errsts;
37818 memset(arr, 0, sizeof(arr));
37819diff -urNp linux-2.6.32.46/drivers/scsi/scsi_lib.c linux-2.6.32.46/drivers/scsi/scsi_lib.c
37820--- linux-2.6.32.46/drivers/scsi/scsi_lib.c 2011-05-10 22:12:01.000000000 -0400
37821+++ linux-2.6.32.46/drivers/scsi/scsi_lib.c 2011-05-10 22:12:33.000000000 -0400
37822@@ -1384,7 +1384,7 @@ static void scsi_kill_request(struct req
37823
37824 scsi_init_cmd_errh(cmd);
37825 cmd->result = DID_NO_CONNECT << 16;
37826- atomic_inc(&cmd->device->iorequest_cnt);
37827+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37828
37829 /*
37830 * SCSI request completion path will do scsi_device_unbusy(),
37831@@ -1415,9 +1415,9 @@ static void scsi_softirq_done(struct req
37832 */
37833 cmd->serial_number = 0;
37834
37835- atomic_inc(&cmd->device->iodone_cnt);
37836+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
37837 if (cmd->result)
37838- atomic_inc(&cmd->device->ioerr_cnt);
37839+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
37840
37841 disposition = scsi_decide_disposition(cmd);
37842 if (disposition != SUCCESS &&
37843diff -urNp linux-2.6.32.46/drivers/scsi/scsi_sysfs.c linux-2.6.32.46/drivers/scsi/scsi_sysfs.c
37844--- linux-2.6.32.46/drivers/scsi/scsi_sysfs.c 2011-06-25 12:55:34.000000000 -0400
37845+++ linux-2.6.32.46/drivers/scsi/scsi_sysfs.c 2011-06-25 12:56:37.000000000 -0400
37846@@ -662,7 +662,7 @@ show_iostat_##field(struct device *dev,
37847 char *buf) \
37848 { \
37849 struct scsi_device *sdev = to_scsi_device(dev); \
37850- unsigned long long count = atomic_read(&sdev->field); \
37851+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
37852 return snprintf(buf, 20, "0x%llx\n", count); \
37853 } \
37854 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
37855diff -urNp linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c
37856--- linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c 2011-03-27 14:31:47.000000000 -0400
37857+++ linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c 2011-10-06 09:37:14.000000000 -0400
37858@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc
37859 int err;
37860
37861 dprintk("%lx %u\n", uaddr, len);
37862- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
37863+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
37864 if (err) {
37865 /*
37866 * TODO: need to fixup sg_tablesize, max_segment_size,
37867diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c
37868--- linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c 2011-03-27 14:31:47.000000000 -0400
37869+++ linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c 2011-05-04 17:56:28.000000000 -0400
37870@@ -480,7 +480,7 @@ MODULE_PARM_DESC(dev_loss_tmo,
37871 * Netlink Infrastructure
37872 */
37873
37874-static atomic_t fc_event_seq;
37875+static atomic_unchecked_t fc_event_seq;
37876
37877 /**
37878 * fc_get_event_number - Obtain the next sequential FC event number
37879@@ -493,7 +493,7 @@ static atomic_t fc_event_seq;
37880 u32
37881 fc_get_event_number(void)
37882 {
37883- return atomic_add_return(1, &fc_event_seq);
37884+ return atomic_add_return_unchecked(1, &fc_event_seq);
37885 }
37886 EXPORT_SYMBOL(fc_get_event_number);
37887
37888@@ -641,7 +641,7 @@ static __init int fc_transport_init(void
37889 {
37890 int error;
37891
37892- atomic_set(&fc_event_seq, 0);
37893+ atomic_set_unchecked(&fc_event_seq, 0);
37894
37895 error = transport_class_register(&fc_host_class);
37896 if (error)
37897diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c
37898--- linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c 2011-03-27 14:31:47.000000000 -0400
37899+++ linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c 2011-05-04 17:56:28.000000000 -0400
37900@@ -81,7 +81,7 @@ struct iscsi_internal {
37901 struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
37902 };
37903
37904-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
37905+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
37906 static struct workqueue_struct *iscsi_eh_timer_workq;
37907
37908 /*
37909@@ -728,7 +728,7 @@ int iscsi_add_session(struct iscsi_cls_s
37910 int err;
37911
37912 ihost = shost->shost_data;
37913- session->sid = atomic_add_return(1, &iscsi_session_nr);
37914+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
37915
37916 if (id == ISCSI_MAX_TARGET) {
37917 for (id = 0; id < ISCSI_MAX_TARGET; id++) {
37918@@ -2060,7 +2060,7 @@ static __init int iscsi_transport_init(v
37919 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
37920 ISCSI_TRANSPORT_VERSION);
37921
37922- atomic_set(&iscsi_session_nr, 0);
37923+ atomic_set_unchecked(&iscsi_session_nr, 0);
37924
37925 err = class_register(&iscsi_transport_class);
37926 if (err)
37927diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c
37928--- linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c 2011-03-27 14:31:47.000000000 -0400
37929+++ linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c 2011-05-04 17:56:28.000000000 -0400
37930@@ -33,7 +33,7 @@
37931 #include "scsi_transport_srp_internal.h"
37932
37933 struct srp_host_attrs {
37934- atomic_t next_port_id;
37935+ atomic_unchecked_t next_port_id;
37936 };
37937 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
37938
37939@@ -62,7 +62,7 @@ static int srp_host_setup(struct transpo
37940 struct Scsi_Host *shost = dev_to_shost(dev);
37941 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
37942
37943- atomic_set(&srp_host->next_port_id, 0);
37944+ atomic_set_unchecked(&srp_host->next_port_id, 0);
37945 return 0;
37946 }
37947
37948@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct S
37949 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
37950 rport->roles = ids->roles;
37951
37952- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
37953+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
37954 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
37955
37956 transport_setup_device(&rport->dev);
37957diff -urNp linux-2.6.32.46/drivers/scsi/sg.c linux-2.6.32.46/drivers/scsi/sg.c
37958--- linux-2.6.32.46/drivers/scsi/sg.c 2011-03-27 14:31:47.000000000 -0400
37959+++ linux-2.6.32.46/drivers/scsi/sg.c 2011-10-06 09:37:08.000000000 -0400
37960@@ -1064,7 +1064,7 @@ sg_ioctl(struct inode *inode, struct fil
37961 sdp->disk->disk_name,
37962 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
37963 NULL,
37964- (char *)arg);
37965+ (char __user *)arg);
37966 case BLKTRACESTART:
37967 return blk_trace_startstop(sdp->device->request_queue, 1);
37968 case BLKTRACESTOP:
37969@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
37970 const struct file_operations * fops;
37971 };
37972
37973-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
37974+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
37975 {"allow_dio", &adio_fops},
37976 {"debug", &debug_fops},
37977 {"def_reserved_size", &dressz_fops},
37978@@ -2307,7 +2307,7 @@ sg_proc_init(void)
37979 {
37980 int k, mask;
37981 int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
37982- struct sg_proc_leaf * leaf;
37983+ const struct sg_proc_leaf * leaf;
37984
37985 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
37986 if (!sg_proc_sgp)
37987diff -urNp linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c
37988--- linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-03-27 14:31:47.000000000 -0400
37989+++ linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-16 21:46:57.000000000 -0400
37990@@ -1754,6 +1754,8 @@ static int __devinit sym2_probe(struct p
37991 int do_iounmap = 0;
37992 int do_disable_device = 1;
37993
37994+ pax_track_stack();
37995+
37996 memset(&sym_dev, 0, sizeof(sym_dev));
37997 memset(&nvram, 0, sizeof(nvram));
37998 sym_dev.pdev = pdev;
37999diff -urNp linux-2.6.32.46/drivers/serial/kgdboc.c linux-2.6.32.46/drivers/serial/kgdboc.c
38000--- linux-2.6.32.46/drivers/serial/kgdboc.c 2011-03-27 14:31:47.000000000 -0400
38001+++ linux-2.6.32.46/drivers/serial/kgdboc.c 2011-04-17 15:56:46.000000000 -0400
38002@@ -18,7 +18,7 @@
38003
38004 #define MAX_CONFIG_LEN 40
38005
38006-static struct kgdb_io kgdboc_io_ops;
38007+static const struct kgdb_io kgdboc_io_ops;
38008
38009 /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
38010 static int configured = -1;
38011@@ -154,7 +154,7 @@ static void kgdboc_post_exp_handler(void
38012 module_put(THIS_MODULE);
38013 }
38014
38015-static struct kgdb_io kgdboc_io_ops = {
38016+static const struct kgdb_io kgdboc_io_ops = {
38017 .name = "kgdboc",
38018 .read_char = kgdboc_get_char,
38019 .write_char = kgdboc_put_char,
38020diff -urNp linux-2.6.32.46/drivers/spi/spi.c linux-2.6.32.46/drivers/spi/spi.c
38021--- linux-2.6.32.46/drivers/spi/spi.c 2011-03-27 14:31:47.000000000 -0400
38022+++ linux-2.6.32.46/drivers/spi/spi.c 2011-05-04 17:56:28.000000000 -0400
38023@@ -774,7 +774,7 @@ int spi_sync(struct spi_device *spi, str
38024 EXPORT_SYMBOL_GPL(spi_sync);
38025
38026 /* portable code must never pass more than 32 bytes */
38027-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
38028+#define SPI_BUFSIZ max(32U,SMP_CACHE_BYTES)
38029
38030 static u8 *buf;
38031
38032diff -urNp linux-2.6.32.46/drivers/staging/android/binder.c linux-2.6.32.46/drivers/staging/android/binder.c
38033--- linux-2.6.32.46/drivers/staging/android/binder.c 2011-03-27 14:31:47.000000000 -0400
38034+++ linux-2.6.32.46/drivers/staging/android/binder.c 2011-04-17 15:56:46.000000000 -0400
38035@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
38036 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
38037 }
38038
38039-static struct vm_operations_struct binder_vm_ops = {
38040+static const struct vm_operations_struct binder_vm_ops = {
38041 .open = binder_vma_open,
38042 .close = binder_vma_close,
38043 };
38044diff -urNp linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c
38045--- linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c 2011-03-27 14:31:47.000000000 -0400
38046+++ linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c 2011-04-17 15:56:46.000000000 -0400
38047@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
38048 return VM_FAULT_NOPAGE;
38049 }
38050
38051-static struct vm_operations_struct b3dfg_vm_ops = {
38052+static const struct vm_operations_struct b3dfg_vm_ops = {
38053 .fault = b3dfg_vma_fault,
38054 };
38055
38056@@ -848,7 +848,7 @@ static int b3dfg_mmap(struct file *filp,
38057 return r;
38058 }
38059
38060-static struct file_operations b3dfg_fops = {
38061+static const struct file_operations b3dfg_fops = {
38062 .owner = THIS_MODULE,
38063 .open = b3dfg_open,
38064 .release = b3dfg_release,
38065diff -urNp linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c
38066--- linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c 2011-08-09 18:35:29.000000000 -0400
38067+++ linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c 2011-08-09 18:34:00.000000000 -0400
38068@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
38069 mutex_unlock(&dev->mutex);
38070 }
38071
38072-static struct vm_operations_struct comedi_vm_ops = {
38073+static const struct vm_operations_struct comedi_vm_ops = {
38074 .close = comedi_unmap,
38075 };
38076
38077diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c
38078--- linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c 2011-03-27 14:31:47.000000000 -0400
38079+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c 2011-04-17 15:56:46.000000000 -0400
38080@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
38081 static dev_t adsp_devno;
38082 static struct class *adsp_class;
38083
38084-static struct file_operations adsp_fops = {
38085+static const struct file_operations adsp_fops = {
38086 .owner = THIS_MODULE,
38087 .open = adsp_open,
38088 .unlocked_ioctl = adsp_ioctl,
38089diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c
38090--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c 2011-03-27 14:31:47.000000000 -0400
38091+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c 2011-04-17 15:56:46.000000000 -0400
38092@@ -1022,7 +1022,7 @@ done:
38093 return rc;
38094 }
38095
38096-static struct file_operations audio_aac_fops = {
38097+static const struct file_operations audio_aac_fops = {
38098 .owner = THIS_MODULE,
38099 .open = audio_open,
38100 .release = audio_release,
38101diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c
38102--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-03-27 14:31:47.000000000 -0400
38103+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-04-17 15:56:46.000000000 -0400
38104@@ -833,7 +833,7 @@ done:
38105 return rc;
38106 }
38107
38108-static struct file_operations audio_amrnb_fops = {
38109+static const struct file_operations audio_amrnb_fops = {
38110 .owner = THIS_MODULE,
38111 .open = audamrnb_open,
38112 .release = audamrnb_release,
38113diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c
38114--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c 2011-03-27 14:31:47.000000000 -0400
38115+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c 2011-04-17 15:56:46.000000000 -0400
38116@@ -805,7 +805,7 @@ dma_fail:
38117 return rc;
38118 }
38119
38120-static struct file_operations audio_evrc_fops = {
38121+static const struct file_operations audio_evrc_fops = {
38122 .owner = THIS_MODULE,
38123 .open = audevrc_open,
38124 .release = audevrc_release,
38125diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c
38126--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c 2011-03-27 14:31:47.000000000 -0400
38127+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c 2011-04-17 15:56:46.000000000 -0400
38128@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
38129 return 0;
38130 }
38131
38132-static struct file_operations audio_fops = {
38133+static const struct file_operations audio_fops = {
38134 .owner = THIS_MODULE,
38135 .open = audio_in_open,
38136 .release = audio_in_release,
38137@@ -922,7 +922,7 @@ static struct file_operations audio_fops
38138 .unlocked_ioctl = audio_in_ioctl,
38139 };
38140
38141-static struct file_operations audpre_fops = {
38142+static const struct file_operations audpre_fops = {
38143 .owner = THIS_MODULE,
38144 .open = audpre_open,
38145 .unlocked_ioctl = audpre_ioctl,
38146diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c
38147--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c 2011-03-27 14:31:47.000000000 -0400
38148+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c 2011-04-17 15:56:46.000000000 -0400
38149@@ -941,7 +941,7 @@ done:
38150 return rc;
38151 }
38152
38153-static struct file_operations audio_mp3_fops = {
38154+static const struct file_operations audio_mp3_fops = {
38155 .owner = THIS_MODULE,
38156 .open = audio_open,
38157 .release = audio_release,
38158diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c
38159--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c 2011-03-27 14:31:47.000000000 -0400
38160+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c 2011-04-17 15:56:46.000000000 -0400
38161@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
38162 return 0;
38163 }
38164
38165-static struct file_operations audio_fops = {
38166+static const struct file_operations audio_fops = {
38167 .owner = THIS_MODULE,
38168 .open = audio_open,
38169 .release = audio_release,
38170@@ -819,7 +819,7 @@ static struct file_operations audio_fops
38171 .unlocked_ioctl = audio_ioctl,
38172 };
38173
38174-static struct file_operations audpp_fops = {
38175+static const struct file_operations audpp_fops = {
38176 .owner = THIS_MODULE,
38177 .open = audpp_open,
38178 .unlocked_ioctl = audpp_ioctl,
38179diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c
38180--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-03-27 14:31:47.000000000 -0400
38181+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-04-17 15:56:46.000000000 -0400
38182@@ -816,7 +816,7 @@ err:
38183 return rc;
38184 }
38185
38186-static struct file_operations audio_qcelp_fops = {
38187+static const struct file_operations audio_qcelp_fops = {
38188 .owner = THIS_MODULE,
38189 .open = audqcelp_open,
38190 .release = audqcelp_release,
38191diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c
38192--- linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c 2011-03-27 14:31:47.000000000 -0400
38193+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c 2011-04-17 15:56:46.000000000 -0400
38194@@ -242,7 +242,7 @@ err:
38195 return rc;
38196 }
38197
38198-static struct file_operations snd_fops = {
38199+static const struct file_operations snd_fops = {
38200 .owner = THIS_MODULE,
38201 .open = snd_open,
38202 .release = snd_release,
38203diff -urNp linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c
38204--- linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c 2011-03-27 14:31:47.000000000 -0400
38205+++ linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c 2011-04-17 15:56:46.000000000 -0400
38206@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
38207 return 0;
38208 }
38209
38210-static struct file_operations qmi_fops = {
38211+static const struct file_operations qmi_fops = {
38212 .owner = THIS_MODULE,
38213 .read = qmi_read,
38214 .write = qmi_write,
38215diff -urNp linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c
38216--- linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-03-27 14:31:47.000000000 -0400
38217+++ linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-04-17 15:56:46.000000000 -0400
38218@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
38219 return rc;
38220 }
38221
38222-static struct file_operations rpcrouter_server_fops = {
38223+static const struct file_operations rpcrouter_server_fops = {
38224 .owner = THIS_MODULE,
38225 .open = rpcrouter_open,
38226 .release = rpcrouter_release,
38227@@ -224,7 +224,7 @@ static struct file_operations rpcrouter_
38228 .unlocked_ioctl = rpcrouter_ioctl,
38229 };
38230
38231-static struct file_operations rpcrouter_router_fops = {
38232+static const struct file_operations rpcrouter_router_fops = {
38233 .owner = THIS_MODULE,
38234 .open = rpcrouter_open,
38235 .release = rpcrouter_release,
38236diff -urNp linux-2.6.32.46/drivers/staging/dst/dcore.c linux-2.6.32.46/drivers/staging/dst/dcore.c
38237--- linux-2.6.32.46/drivers/staging/dst/dcore.c 2011-03-27 14:31:47.000000000 -0400
38238+++ linux-2.6.32.46/drivers/staging/dst/dcore.c 2011-04-17 15:56:46.000000000 -0400
38239@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
38240 return 0;
38241 }
38242
38243-static struct block_device_operations dst_blk_ops = {
38244+static const struct block_device_operations dst_blk_ops = {
38245 .open = dst_bdev_open,
38246 .release = dst_bdev_release,
38247 .owner = THIS_MODULE,
38248@@ -588,7 +588,7 @@ static struct dst_node *dst_alloc_node(s
38249 n->size = ctl->size;
38250
38251 atomic_set(&n->refcnt, 1);
38252- atomic_long_set(&n->gen, 0);
38253+ atomic_long_set_unchecked(&n->gen, 0);
38254 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
38255
38256 err = dst_node_sysfs_init(n);
38257diff -urNp linux-2.6.32.46/drivers/staging/dst/trans.c linux-2.6.32.46/drivers/staging/dst/trans.c
38258--- linux-2.6.32.46/drivers/staging/dst/trans.c 2011-03-27 14:31:47.000000000 -0400
38259+++ linux-2.6.32.46/drivers/staging/dst/trans.c 2011-04-17 15:56:46.000000000 -0400
38260@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
38261 t->error = 0;
38262 t->retries = 0;
38263 atomic_set(&t->refcnt, 1);
38264- t->gen = atomic_long_inc_return(&n->gen);
38265+ t->gen = atomic_long_inc_return_unchecked(&n->gen);
38266
38267 t->enc = bio_data_dir(bio);
38268 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
38269diff -urNp linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c
38270--- linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c 2011-03-27 14:31:47.000000000 -0400
38271+++ linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c 2011-05-04 17:56:28.000000000 -0400
38272@@ -710,11 +710,11 @@ inline void et131x_free_send_packet(stru
38273 struct net_device_stats *stats = &etdev->net_stats;
38274
38275 if (pMpTcb->Flags & fMP_DEST_BROAD)
38276- atomic_inc(&etdev->Stats.brdcstxmt);
38277+ atomic_inc_unchecked(&etdev->Stats.brdcstxmt);
38278 else if (pMpTcb->Flags & fMP_DEST_MULTI)
38279- atomic_inc(&etdev->Stats.multixmt);
38280+ atomic_inc_unchecked(&etdev->Stats.multixmt);
38281 else
38282- atomic_inc(&etdev->Stats.unixmt);
38283+ atomic_inc_unchecked(&etdev->Stats.unixmt);
38284
38285 if (pMpTcb->Packet) {
38286 stats->tx_bytes += pMpTcb->Packet->len;
38287diff -urNp linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h
38288--- linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h 2011-03-27 14:31:47.000000000 -0400
38289+++ linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h 2011-05-04 17:56:28.000000000 -0400
38290@@ -145,11 +145,11 @@ typedef struct _ce_stats_t {
38291 * operations
38292 */
38293 u32 unircv; /* # multicast packets received */
38294- atomic_t unixmt; /* # multicast packets for Tx */
38295+ atomic_unchecked_t unixmt; /* # multicast packets for Tx */
38296 u32 multircv; /* # multicast packets received */
38297- atomic_t multixmt; /* # multicast packets for Tx */
38298+ atomic_unchecked_t multixmt; /* # multicast packets for Tx */
38299 u32 brdcstrcv; /* # broadcast packets received */
38300- atomic_t brdcstxmt; /* # broadcast packets for Tx */
38301+ atomic_unchecked_t brdcstxmt; /* # broadcast packets for Tx */
38302 u32 norcvbuf; /* # Rx packets discarded */
38303 u32 noxmtbuf; /* # Tx packets discarded */
38304
38305diff -urNp linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c
38306--- linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c 2011-03-27 14:31:47.000000000 -0400
38307+++ linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:56:46.000000000 -0400
38308@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
38309 return 0;
38310 }
38311
38312-static struct vm_operations_struct go7007_vm_ops = {
38313+static const struct vm_operations_struct go7007_vm_ops = {
38314 .open = go7007_vm_open,
38315 .close = go7007_vm_close,
38316 .fault = go7007_vm_fault,
38317diff -urNp linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c
38318--- linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c 2011-03-27 14:31:47.000000000 -0400
38319+++ linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c 2011-04-17 15:56:46.000000000 -0400
38320@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
38321 /* The one and only one */
38322 static struct blkvsc_driver_context g_blkvsc_drv;
38323
38324-static struct block_device_operations block_ops = {
38325+static const struct block_device_operations block_ops = {
38326 .owner = THIS_MODULE,
38327 .open = blkvsc_open,
38328 .release = blkvsc_release,
38329diff -urNp linux-2.6.32.46/drivers/staging/hv/Channel.c linux-2.6.32.46/drivers/staging/hv/Channel.c
38330--- linux-2.6.32.46/drivers/staging/hv/Channel.c 2011-04-17 17:00:52.000000000 -0400
38331+++ linux-2.6.32.46/drivers/staging/hv/Channel.c 2011-05-04 17:56:28.000000000 -0400
38332@@ -464,8 +464,8 @@ int VmbusChannelEstablishGpadl(struct vm
38333
38334 DPRINT_ENTER(VMBUS);
38335
38336- nextGpadlHandle = atomic_read(&gVmbusConnection.NextGpadlHandle);
38337- atomic_inc(&gVmbusConnection.NextGpadlHandle);
38338+ nextGpadlHandle = atomic_read_unchecked(&gVmbusConnection.NextGpadlHandle);
38339+ atomic_inc_unchecked(&gVmbusConnection.NextGpadlHandle);
38340
38341 VmbusChannelCreateGpadlHeader(Kbuffer, Size, &msgInfo, &msgCount);
38342 ASSERT(msgInfo != NULL);
38343diff -urNp linux-2.6.32.46/drivers/staging/hv/Hv.c linux-2.6.32.46/drivers/staging/hv/Hv.c
38344--- linux-2.6.32.46/drivers/staging/hv/Hv.c 2011-03-27 14:31:47.000000000 -0400
38345+++ linux-2.6.32.46/drivers/staging/hv/Hv.c 2011-04-17 15:56:46.000000000 -0400
38346@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
38347 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
38348 u32 outputAddressHi = outputAddress >> 32;
38349 u32 outputAddressLo = outputAddress & 0xFFFFFFFF;
38350- volatile void *hypercallPage = gHvContext.HypercallPage;
38351+ volatile void *hypercallPage = ktva_ktla(gHvContext.HypercallPage);
38352
38353 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
38354 Control, Input, Output);
38355diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusApi.h linux-2.6.32.46/drivers/staging/hv/VmbusApi.h
38356--- linux-2.6.32.46/drivers/staging/hv/VmbusApi.h 2011-03-27 14:31:47.000000000 -0400
38357+++ linux-2.6.32.46/drivers/staging/hv/VmbusApi.h 2011-08-29 22:32:57.000000000 -0400
38358@@ -109,7 +109,7 @@ struct vmbus_channel_interface {
38359 u32 *GpadlHandle);
38360 int (*TeardownGpadl)(struct hv_device *device, u32 GpadlHandle);
38361 void (*GetInfo)(struct hv_device *dev, struct hv_device_info *devinfo);
38362-};
38363+} __no_const;
38364
38365 /* Base driver object */
38366 struct hv_driver {
38367diff -urNp linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c
38368--- linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c 2011-03-27 14:31:47.000000000 -0400
38369+++ linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c 2011-05-04 17:56:28.000000000 -0400
38370@@ -532,7 +532,7 @@ static int vmbus_child_device_register(s
38371 to_device_context(root_device_obj);
38372 struct device_context *child_device_ctx =
38373 to_device_context(child_device_obj);
38374- static atomic_t device_num = ATOMIC_INIT(0);
38375+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
38376
38377 DPRINT_ENTER(VMBUS_DRV);
38378
38379@@ -541,7 +541,7 @@ static int vmbus_child_device_register(s
38380
38381 /* Set the device name. Otherwise, device_register() will fail. */
38382 dev_set_name(&child_device_ctx->device, "vmbus_0_%d",
38383- atomic_inc_return(&device_num));
38384+ atomic_inc_return_unchecked(&device_num));
38385
38386 /* The new device belongs to this bus */
38387 child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
38388diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h
38389--- linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h 2011-04-17 17:00:52.000000000 -0400
38390+++ linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h 2011-05-04 17:56:28.000000000 -0400
38391@@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE {
38392 struct VMBUS_CONNECTION {
38393 enum VMBUS_CONNECT_STATE ConnectState;
38394
38395- atomic_t NextGpadlHandle;
38396+ atomic_unchecked_t NextGpadlHandle;
38397
38398 /*
38399 * Represents channel interrupts. Each bit position represents a
38400diff -urNp linux-2.6.32.46/drivers/staging/iio/ring_generic.h linux-2.6.32.46/drivers/staging/iio/ring_generic.h
38401--- linux-2.6.32.46/drivers/staging/iio/ring_generic.h 2011-03-27 14:31:47.000000000 -0400
38402+++ linux-2.6.32.46/drivers/staging/iio/ring_generic.h 2011-08-23 20:24:26.000000000 -0400
38403@@ -87,7 +87,7 @@ struct iio_ring_access_funcs {
38404
38405 int (*is_enabled)(struct iio_ring_buffer *ring);
38406 int (*enable)(struct iio_ring_buffer *ring);
38407-};
38408+} __no_const;
38409
38410 /**
38411 * struct iio_ring_buffer - general ring buffer structure
38412diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet.c linux-2.6.32.46/drivers/staging/octeon/ethernet.c
38413--- linux-2.6.32.46/drivers/staging/octeon/ethernet.c 2011-03-27 14:31:47.000000000 -0400
38414+++ linux-2.6.32.46/drivers/staging/octeon/ethernet.c 2011-05-04 17:56:28.000000000 -0400
38415@@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_
38416 * since the RX tasklet also increments it.
38417 */
38418 #ifdef CONFIG_64BIT
38419- atomic64_add(rx_status.dropped_packets,
38420- (atomic64_t *)&priv->stats.rx_dropped);
38421+ atomic64_add_unchecked(rx_status.dropped_packets,
38422+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
38423 #else
38424- atomic_add(rx_status.dropped_packets,
38425- (atomic_t *)&priv->stats.rx_dropped);
38426+ atomic_add_unchecked(rx_status.dropped_packets,
38427+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
38428 #endif
38429 }
38430
38431diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c
38432--- linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c 2011-03-27 14:31:47.000000000 -0400
38433+++ linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c 2011-05-04 17:56:28.000000000 -0400
38434@@ -406,11 +406,11 @@ void cvm_oct_tasklet_rx(unsigned long un
38435 /* Increment RX stats for virtual ports */
38436 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
38437 #ifdef CONFIG_64BIT
38438- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
38439- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
38440+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
38441+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
38442 #else
38443- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
38444- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
38445+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
38446+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
38447 #endif
38448 }
38449 netif_receive_skb(skb);
38450@@ -424,9 +424,9 @@ void cvm_oct_tasklet_rx(unsigned long un
38451 dev->name);
38452 */
38453 #ifdef CONFIG_64BIT
38454- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
38455+ atomic64_add_unchecked(1, (atomic64_t *)&priv->stats.rx_dropped);
38456 #else
38457- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
38458+ atomic_add_unchecked(1, (atomic_t *)&priv->stats.rx_dropped);
38459 #endif
38460 dev_kfree_skb_irq(skb);
38461 }
38462diff -urNp linux-2.6.32.46/drivers/staging/panel/panel.c linux-2.6.32.46/drivers/staging/panel/panel.c
38463--- linux-2.6.32.46/drivers/staging/panel/panel.c 2011-03-27 14:31:47.000000000 -0400
38464+++ linux-2.6.32.46/drivers/staging/panel/panel.c 2011-04-17 15:56:46.000000000 -0400
38465@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
38466 return 0;
38467 }
38468
38469-static struct file_operations lcd_fops = {
38470+static const struct file_operations lcd_fops = {
38471 .write = lcd_write,
38472 .open = lcd_open,
38473 .release = lcd_release,
38474@@ -1565,7 +1565,7 @@ static int keypad_release(struct inode *
38475 return 0;
38476 }
38477
38478-static struct file_operations keypad_fops = {
38479+static const struct file_operations keypad_fops = {
38480 .read = keypad_read, /* read */
38481 .open = keypad_open, /* open */
38482 .release = keypad_release, /* close */
38483diff -urNp linux-2.6.32.46/drivers/staging/phison/phison.c linux-2.6.32.46/drivers/staging/phison/phison.c
38484--- linux-2.6.32.46/drivers/staging/phison/phison.c 2011-03-27 14:31:47.000000000 -0400
38485+++ linux-2.6.32.46/drivers/staging/phison/phison.c 2011-04-17 15:56:46.000000000 -0400
38486@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
38487 ATA_BMDMA_SHT(DRV_NAME),
38488 };
38489
38490-static struct ata_port_operations phison_ops = {
38491+static const struct ata_port_operations phison_ops = {
38492 .inherits = &ata_bmdma_port_ops,
38493 .prereset = phison_pre_reset,
38494 };
38495diff -urNp linux-2.6.32.46/drivers/staging/poch/poch.c linux-2.6.32.46/drivers/staging/poch/poch.c
38496--- linux-2.6.32.46/drivers/staging/poch/poch.c 2011-03-27 14:31:47.000000000 -0400
38497+++ linux-2.6.32.46/drivers/staging/poch/poch.c 2011-04-17 15:56:46.000000000 -0400
38498@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
38499 return 0;
38500 }
38501
38502-static struct file_operations poch_fops = {
38503+static const struct file_operations poch_fops = {
38504 .owner = THIS_MODULE,
38505 .open = poch_open,
38506 .release = poch_release,
38507diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/inode.c linux-2.6.32.46/drivers/staging/pohmelfs/inode.c
38508--- linux-2.6.32.46/drivers/staging/pohmelfs/inode.c 2011-03-27 14:31:47.000000000 -0400
38509+++ linux-2.6.32.46/drivers/staging/pohmelfs/inode.c 2011-05-04 17:56:20.000000000 -0400
38510@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
38511 mutex_init(&psb->mcache_lock);
38512 psb->mcache_root = RB_ROOT;
38513 psb->mcache_timeout = msecs_to_jiffies(5000);
38514- atomic_long_set(&psb->mcache_gen, 0);
38515+ atomic_long_set_unchecked(&psb->mcache_gen, 0);
38516
38517 psb->trans_max_pages = 100;
38518
38519@@ -1865,7 +1865,7 @@ static int pohmelfs_fill_super(struct su
38520 INIT_LIST_HEAD(&psb->crypto_ready_list);
38521 INIT_LIST_HEAD(&psb->crypto_active_list);
38522
38523- atomic_set(&psb->trans_gen, 1);
38524+ atomic_set_unchecked(&psb->trans_gen, 1);
38525 atomic_long_set(&psb->total_inodes, 0);
38526
38527 mutex_init(&psb->state_lock);
38528diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c
38529--- linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c 2011-03-27 14:31:47.000000000 -0400
38530+++ linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:56:46.000000000 -0400
38531@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
38532 m->data = data;
38533 m->start = start;
38534 m->size = size;
38535- m->gen = atomic_long_inc_return(&psb->mcache_gen);
38536+ m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
38537
38538 mutex_lock(&psb->mcache_lock);
38539 err = pohmelfs_mcache_insert(psb, m);
38540diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h
38541--- linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h 2011-03-27 14:31:47.000000000 -0400
38542+++ linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h 2011-05-04 17:56:20.000000000 -0400
38543@@ -570,14 +570,14 @@ struct pohmelfs_config;
38544 struct pohmelfs_sb {
38545 struct rb_root mcache_root;
38546 struct mutex mcache_lock;
38547- atomic_long_t mcache_gen;
38548+ atomic_long_unchecked_t mcache_gen;
38549 unsigned long mcache_timeout;
38550
38551 unsigned int idx;
38552
38553 unsigned int trans_retries;
38554
38555- atomic_t trans_gen;
38556+ atomic_unchecked_t trans_gen;
38557
38558 unsigned int crypto_attached_size;
38559 unsigned int crypto_align_size;
38560diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/trans.c linux-2.6.32.46/drivers/staging/pohmelfs/trans.c
38561--- linux-2.6.32.46/drivers/staging/pohmelfs/trans.c 2011-03-27 14:31:47.000000000 -0400
38562+++ linux-2.6.32.46/drivers/staging/pohmelfs/trans.c 2011-05-04 17:56:28.000000000 -0400
38563@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
38564 int err;
38565 struct netfs_cmd *cmd = t->iovec.iov_base;
38566
38567- t->gen = atomic_inc_return(&psb->trans_gen);
38568+ t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
38569
38570 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
38571 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
38572diff -urNp linux-2.6.32.46/drivers/staging/sep/sep_driver.c linux-2.6.32.46/drivers/staging/sep/sep_driver.c
38573--- linux-2.6.32.46/drivers/staging/sep/sep_driver.c 2011-03-27 14:31:47.000000000 -0400
38574+++ linux-2.6.32.46/drivers/staging/sep/sep_driver.c 2011-04-17 15:56:46.000000000 -0400
38575@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
38576 static dev_t sep_devno;
38577
38578 /* the files operations structure of the driver */
38579-static struct file_operations sep_file_operations = {
38580+static const struct file_operations sep_file_operations = {
38581 .owner = THIS_MODULE,
38582 .ioctl = sep_ioctl,
38583 .poll = sep_poll,
38584diff -urNp linux-2.6.32.46/drivers/staging/usbip/usbip_common.h linux-2.6.32.46/drivers/staging/usbip/usbip_common.h
38585--- linux-2.6.32.46/drivers/staging/usbip/usbip_common.h 2011-04-17 17:00:52.000000000 -0400
38586+++ linux-2.6.32.46/drivers/staging/usbip/usbip_common.h 2011-08-23 20:24:26.000000000 -0400
38587@@ -374,7 +374,7 @@ struct usbip_device {
38588 void (*shutdown)(struct usbip_device *);
38589 void (*reset)(struct usbip_device *);
38590 void (*unusable)(struct usbip_device *);
38591- } eh_ops;
38592+ } __no_const eh_ops;
38593 };
38594
38595
38596diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci.h linux-2.6.32.46/drivers/staging/usbip/vhci.h
38597--- linux-2.6.32.46/drivers/staging/usbip/vhci.h 2011-03-27 14:31:47.000000000 -0400
38598+++ linux-2.6.32.46/drivers/staging/usbip/vhci.h 2011-05-04 17:56:28.000000000 -0400
38599@@ -92,7 +92,7 @@ struct vhci_hcd {
38600 unsigned resuming:1;
38601 unsigned long re_timeout;
38602
38603- atomic_t seqnum;
38604+ atomic_unchecked_t seqnum;
38605
38606 /*
38607 * NOTE:
38608diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c
38609--- linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c 2011-05-10 22:12:01.000000000 -0400
38610+++ linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c 2011-05-10 22:12:33.000000000 -0400
38611@@ -534,7 +534,7 @@ static void vhci_tx_urb(struct urb *urb)
38612 return;
38613 }
38614
38615- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
38616+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
38617 if (priv->seqnum == 0xffff)
38618 usbip_uinfo("seqnum max\n");
38619
38620@@ -793,7 +793,7 @@ static int vhci_urb_dequeue(struct usb_h
38621 return -ENOMEM;
38622 }
38623
38624- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
38625+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
38626 if (unlink->seqnum == 0xffff)
38627 usbip_uinfo("seqnum max\n");
38628
38629@@ -988,7 +988,7 @@ static int vhci_start(struct usb_hcd *hc
38630 vdev->rhport = rhport;
38631 }
38632
38633- atomic_set(&vhci->seqnum, 0);
38634+ atomic_set_unchecked(&vhci->seqnum, 0);
38635 spin_lock_init(&vhci->lock);
38636
38637
38638diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c
38639--- linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c 2011-04-17 17:00:52.000000000 -0400
38640+++ linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c 2011-05-04 17:56:28.000000000 -0400
38641@@ -78,7 +78,7 @@ static void vhci_recv_ret_submit(struct
38642 usbip_uerr("cannot find a urb of seqnum %u\n",
38643 pdu->base.seqnum);
38644 usbip_uinfo("max seqnum %d\n",
38645- atomic_read(&the_controller->seqnum));
38646+ atomic_read_unchecked(&the_controller->seqnum));
38647 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
38648 return;
38649 }
38650diff -urNp linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c
38651--- linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c 2011-03-27 14:31:47.000000000 -0400
38652+++ linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c 2011-04-17 15:56:46.000000000 -0400
38653@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
38654 static int __init vme_user_probe(struct device *, int, int);
38655 static int __exit vme_user_remove(struct device *, int, int);
38656
38657-static struct file_operations vme_user_fops = {
38658+static const struct file_operations vme_user_fops = {
38659 .open = vme_user_open,
38660 .release = vme_user_release,
38661 .read = vme_user_read,
38662diff -urNp linux-2.6.32.46/drivers/staging/vt6655/hostap.c linux-2.6.32.46/drivers/staging/vt6655/hostap.c
38663--- linux-2.6.32.46/drivers/staging/vt6655/hostap.c 2011-03-27 14:31:47.000000000 -0400
38664+++ linux-2.6.32.46/drivers/staging/vt6655/hostap.c 2011-09-14 09:51:07.000000000 -0400
38665@@ -84,7 +84,7 @@ static int hostap_enable_hostapd(PSDevic
38666 PSDevice apdev_priv;
38667 struct net_device *dev = pDevice->dev;
38668 int ret;
38669- const struct net_device_ops apdev_netdev_ops = {
38670+ net_device_ops_no_const apdev_netdev_ops = {
38671 .ndo_start_xmit = pDevice->tx_80211,
38672 };
38673
38674diff -urNp linux-2.6.32.46/drivers/staging/vt6656/hostap.c linux-2.6.32.46/drivers/staging/vt6656/hostap.c
38675--- linux-2.6.32.46/drivers/staging/vt6656/hostap.c 2011-03-27 14:31:47.000000000 -0400
38676+++ linux-2.6.32.46/drivers/staging/vt6656/hostap.c 2011-09-14 09:49:53.000000000 -0400
38677@@ -86,7 +86,7 @@ static int hostap_enable_hostapd(PSDevic
38678 PSDevice apdev_priv;
38679 struct net_device *dev = pDevice->dev;
38680 int ret;
38681- const struct net_device_ops apdev_netdev_ops = {
38682+ net_device_ops_no_const apdev_netdev_ops = {
38683 .ndo_start_xmit = pDevice->tx_80211,
38684 };
38685
38686diff -urNp linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c
38687--- linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c 2011-03-27 14:31:47.000000000 -0400
38688+++ linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c 2011-08-23 20:24:26.000000000 -0400
38689@@ -205,7 +205,7 @@ static void unlocked_usbctlx_complete(hf
38690
38691 struct usbctlx_completor {
38692 int (*complete) (struct usbctlx_completor *);
38693-};
38694+} __no_const;
38695 typedef struct usbctlx_completor usbctlx_completor_t;
38696
38697 static int
38698diff -urNp linux-2.6.32.46/drivers/telephony/ixj.c linux-2.6.32.46/drivers/telephony/ixj.c
38699--- linux-2.6.32.46/drivers/telephony/ixj.c 2011-03-27 14:31:47.000000000 -0400
38700+++ linux-2.6.32.46/drivers/telephony/ixj.c 2011-05-16 21:46:57.000000000 -0400
38701@@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
38702 bool mContinue;
38703 char *pIn, *pOut;
38704
38705+ pax_track_stack();
38706+
38707 if (!SCI_Prepare(j))
38708 return 0;
38709
38710diff -urNp linux-2.6.32.46/drivers/uio/uio.c linux-2.6.32.46/drivers/uio/uio.c
38711--- linux-2.6.32.46/drivers/uio/uio.c 2011-03-27 14:31:47.000000000 -0400
38712+++ linux-2.6.32.46/drivers/uio/uio.c 2011-05-04 17:56:20.000000000 -0400
38713@@ -23,6 +23,7 @@
38714 #include <linux/string.h>
38715 #include <linux/kobject.h>
38716 #include <linux/uio_driver.h>
38717+#include <asm/local.h>
38718
38719 #define UIO_MAX_DEVICES 255
38720
38721@@ -30,10 +31,10 @@ struct uio_device {
38722 struct module *owner;
38723 struct device *dev;
38724 int minor;
38725- atomic_t event;
38726+ atomic_unchecked_t event;
38727 struct fasync_struct *async_queue;
38728 wait_queue_head_t wait;
38729- int vma_count;
38730+ local_t vma_count;
38731 struct uio_info *info;
38732 struct kobject *map_dir;
38733 struct kobject *portio_dir;
38734@@ -129,7 +130,7 @@ static ssize_t map_type_show(struct kobj
38735 return entry->show(mem, buf);
38736 }
38737
38738-static struct sysfs_ops map_sysfs_ops = {
38739+static const struct sysfs_ops map_sysfs_ops = {
38740 .show = map_type_show,
38741 };
38742
38743@@ -217,7 +218,7 @@ static ssize_t portio_type_show(struct k
38744 return entry->show(port, buf);
38745 }
38746
38747-static struct sysfs_ops portio_sysfs_ops = {
38748+static const struct sysfs_ops portio_sysfs_ops = {
38749 .show = portio_type_show,
38750 };
38751
38752@@ -255,7 +256,7 @@ static ssize_t show_event(struct device
38753 struct uio_device *idev = dev_get_drvdata(dev);
38754 if (idev)
38755 return sprintf(buf, "%u\n",
38756- (unsigned int)atomic_read(&idev->event));
38757+ (unsigned int)atomic_read_unchecked(&idev->event));
38758 else
38759 return -ENODEV;
38760 }
38761@@ -424,7 +425,7 @@ void uio_event_notify(struct uio_info *i
38762 {
38763 struct uio_device *idev = info->uio_dev;
38764
38765- atomic_inc(&idev->event);
38766+ atomic_inc_unchecked(&idev->event);
38767 wake_up_interruptible(&idev->wait);
38768 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
38769 }
38770@@ -477,7 +478,7 @@ static int uio_open(struct inode *inode,
38771 }
38772
38773 listener->dev = idev;
38774- listener->event_count = atomic_read(&idev->event);
38775+ listener->event_count = atomic_read_unchecked(&idev->event);
38776 filep->private_data = listener;
38777
38778 if (idev->info->open) {
38779@@ -528,7 +529,7 @@ static unsigned int uio_poll(struct file
38780 return -EIO;
38781
38782 poll_wait(filep, &idev->wait, wait);
38783- if (listener->event_count != atomic_read(&idev->event))
38784+ if (listener->event_count != atomic_read_unchecked(&idev->event))
38785 return POLLIN | POLLRDNORM;
38786 return 0;
38787 }
38788@@ -553,7 +554,7 @@ static ssize_t uio_read(struct file *fil
38789 do {
38790 set_current_state(TASK_INTERRUPTIBLE);
38791
38792- event_count = atomic_read(&idev->event);
38793+ event_count = atomic_read_unchecked(&idev->event);
38794 if (event_count != listener->event_count) {
38795 if (copy_to_user(buf, &event_count, count))
38796 retval = -EFAULT;
38797@@ -624,13 +625,13 @@ static int uio_find_mem_index(struct vm_
38798 static void uio_vma_open(struct vm_area_struct *vma)
38799 {
38800 struct uio_device *idev = vma->vm_private_data;
38801- idev->vma_count++;
38802+ local_inc(&idev->vma_count);
38803 }
38804
38805 static void uio_vma_close(struct vm_area_struct *vma)
38806 {
38807 struct uio_device *idev = vma->vm_private_data;
38808- idev->vma_count--;
38809+ local_dec(&idev->vma_count);
38810 }
38811
38812 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
38813@@ -840,7 +841,7 @@ int __uio_register_device(struct module
38814 idev->owner = owner;
38815 idev->info = info;
38816 init_waitqueue_head(&idev->wait);
38817- atomic_set(&idev->event, 0);
38818+ atomic_set_unchecked(&idev->event, 0);
38819
38820 ret = uio_get_minor(idev);
38821 if (ret)
38822diff -urNp linux-2.6.32.46/drivers/usb/atm/usbatm.c linux-2.6.32.46/drivers/usb/atm/usbatm.c
38823--- linux-2.6.32.46/drivers/usb/atm/usbatm.c 2011-03-27 14:31:47.000000000 -0400
38824+++ linux-2.6.32.46/drivers/usb/atm/usbatm.c 2011-04-17 15:56:46.000000000 -0400
38825@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
38826 if (printk_ratelimit())
38827 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
38828 __func__, vpi, vci);
38829- atomic_inc(&vcc->stats->rx_err);
38830+ atomic_inc_unchecked(&vcc->stats->rx_err);
38831 return;
38832 }
38833
38834@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(stru
38835 if (length > ATM_MAX_AAL5_PDU) {
38836 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
38837 __func__, length, vcc);
38838- atomic_inc(&vcc->stats->rx_err);
38839+ atomic_inc_unchecked(&vcc->stats->rx_err);
38840 goto out;
38841 }
38842
38843@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(stru
38844 if (sarb->len < pdu_length) {
38845 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
38846 __func__, pdu_length, sarb->len, vcc);
38847- atomic_inc(&vcc->stats->rx_err);
38848+ atomic_inc_unchecked(&vcc->stats->rx_err);
38849 goto out;
38850 }
38851
38852 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
38853 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
38854 __func__, vcc);
38855- atomic_inc(&vcc->stats->rx_err);
38856+ atomic_inc_unchecked(&vcc->stats->rx_err);
38857 goto out;
38858 }
38859
38860@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(stru
38861 if (printk_ratelimit())
38862 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
38863 __func__, length);
38864- atomic_inc(&vcc->stats->rx_drop);
38865+ atomic_inc_unchecked(&vcc->stats->rx_drop);
38866 goto out;
38867 }
38868
38869@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(stru
38870
38871 vcc->push(vcc, skb);
38872
38873- atomic_inc(&vcc->stats->rx);
38874+ atomic_inc_unchecked(&vcc->stats->rx);
38875 out:
38876 skb_trim(sarb, 0);
38877 }
38878@@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned l
38879 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
38880
38881 usbatm_pop(vcc, skb);
38882- atomic_inc(&vcc->stats->tx);
38883+ atomic_inc_unchecked(&vcc->stats->tx);
38884
38885 skb = skb_dequeue(&instance->sndqueue);
38886 }
38887@@ -775,11 +775,11 @@ static int usbatm_atm_proc_read(struct a
38888 if (!left--)
38889 return sprintf(page,
38890 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
38891- atomic_read(&atm_dev->stats.aal5.tx),
38892- atomic_read(&atm_dev->stats.aal5.tx_err),
38893- atomic_read(&atm_dev->stats.aal5.rx),
38894- atomic_read(&atm_dev->stats.aal5.rx_err),
38895- atomic_read(&atm_dev->stats.aal5.rx_drop));
38896+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
38897+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
38898+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
38899+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
38900+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
38901
38902 if (!left--) {
38903 if (instance->disconnected)
38904diff -urNp linux-2.6.32.46/drivers/usb/class/cdc-wdm.c linux-2.6.32.46/drivers/usb/class/cdc-wdm.c
38905--- linux-2.6.32.46/drivers/usb/class/cdc-wdm.c 2011-03-27 14:31:47.000000000 -0400
38906+++ linux-2.6.32.46/drivers/usb/class/cdc-wdm.c 2011-04-17 15:56:46.000000000 -0400
38907@@ -314,7 +314,7 @@ static ssize_t wdm_write
38908 if (r < 0)
38909 goto outnp;
38910
38911- if (!file->f_flags && O_NONBLOCK)
38912+ if (!(file->f_flags & O_NONBLOCK))
38913 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
38914 &desc->flags));
38915 else
38916diff -urNp linux-2.6.32.46/drivers/usb/core/hcd.c linux-2.6.32.46/drivers/usb/core/hcd.c
38917--- linux-2.6.32.46/drivers/usb/core/hcd.c 2011-03-27 14:31:47.000000000 -0400
38918+++ linux-2.6.32.46/drivers/usb/core/hcd.c 2011-04-17 15:56:46.000000000 -0400
38919@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
38920
38921 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
38922
38923-struct usb_mon_operations *mon_ops;
38924+const struct usb_mon_operations *mon_ops;
38925
38926 /*
38927 * The registration is unlocked.
38928@@ -2226,7 +2226,7 @@ struct usb_mon_operations *mon_ops;
38929 * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
38930 */
38931
38932-int usb_mon_register (struct usb_mon_operations *ops)
38933+int usb_mon_register (const struct usb_mon_operations *ops)
38934 {
38935
38936 if (mon_ops)
38937diff -urNp linux-2.6.32.46/drivers/usb/core/hcd.h linux-2.6.32.46/drivers/usb/core/hcd.h
38938--- linux-2.6.32.46/drivers/usb/core/hcd.h 2011-03-27 14:31:47.000000000 -0400
38939+++ linux-2.6.32.46/drivers/usb/core/hcd.h 2011-04-17 15:56:46.000000000 -0400
38940@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
38941 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
38942
38943 struct usb_mon_operations {
38944- void (*urb_submit)(struct usb_bus *bus, struct urb *urb);
38945- void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
38946- void (*urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
38947+ void (* const urb_submit)(struct usb_bus *bus, struct urb *urb);
38948+ void (* const urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
38949+ void (* const urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
38950 /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
38951 };
38952
38953-extern struct usb_mon_operations *mon_ops;
38954+extern const struct usb_mon_operations *mon_ops;
38955
38956 static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
38957 {
38958@@ -514,7 +514,7 @@ static inline void usbmon_urb_complete(s
38959 (*mon_ops->urb_complete)(bus, urb, status);
38960 }
38961
38962-int usb_mon_register(struct usb_mon_operations *ops);
38963+int usb_mon_register(const struct usb_mon_operations *ops);
38964 void usb_mon_deregister(void);
38965
38966 #else
38967diff -urNp linux-2.6.32.46/drivers/usb/core/message.c linux-2.6.32.46/drivers/usb/core/message.c
38968--- linux-2.6.32.46/drivers/usb/core/message.c 2011-03-27 14:31:47.000000000 -0400
38969+++ linux-2.6.32.46/drivers/usb/core/message.c 2011-04-17 15:56:46.000000000 -0400
38970@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
38971 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
38972 if (buf) {
38973 len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
38974- if (len > 0) {
38975- smallbuf = kmalloc(++len, GFP_NOIO);
38976+ if (len++ > 0) {
38977+ smallbuf = kmalloc(len, GFP_NOIO);
38978 if (!smallbuf)
38979 return buf;
38980 memcpy(smallbuf, buf, len);
38981diff -urNp linux-2.6.32.46/drivers/usb/misc/appledisplay.c linux-2.6.32.46/drivers/usb/misc/appledisplay.c
38982--- linux-2.6.32.46/drivers/usb/misc/appledisplay.c 2011-03-27 14:31:47.000000000 -0400
38983+++ linux-2.6.32.46/drivers/usb/misc/appledisplay.c 2011-04-17 15:56:46.000000000 -0400
38984@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
38985 return pdata->msgdata[1];
38986 }
38987
38988-static struct backlight_ops appledisplay_bl_data = {
38989+static const struct backlight_ops appledisplay_bl_data = {
38990 .get_brightness = appledisplay_bl_get_brightness,
38991 .update_status = appledisplay_bl_update_status,
38992 };
38993diff -urNp linux-2.6.32.46/drivers/usb/mon/mon_main.c linux-2.6.32.46/drivers/usb/mon/mon_main.c
38994--- linux-2.6.32.46/drivers/usb/mon/mon_main.c 2011-03-27 14:31:47.000000000 -0400
38995+++ linux-2.6.32.46/drivers/usb/mon/mon_main.c 2011-04-17 15:56:46.000000000 -0400
38996@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
38997 /*
38998 * Ops
38999 */
39000-static struct usb_mon_operations mon_ops_0 = {
39001+static const struct usb_mon_operations mon_ops_0 = {
39002 .urb_submit = mon_submit,
39003 .urb_submit_error = mon_submit_error,
39004 .urb_complete = mon_complete,
39005diff -urNp linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h
39006--- linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h 2011-03-27 14:31:47.000000000 -0400
39007+++ linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h 2011-05-04 17:56:28.000000000 -0400
39008@@ -192,7 +192,7 @@ struct wahc {
39009 struct list_head xfer_delayed_list;
39010 spinlock_t xfer_list_lock;
39011 struct work_struct xfer_work;
39012- atomic_t xfer_id_count;
39013+ atomic_unchecked_t xfer_id_count;
39014 };
39015
39016
39017@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *
39018 INIT_LIST_HEAD(&wa->xfer_delayed_list);
39019 spin_lock_init(&wa->xfer_list_lock);
39020 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
39021- atomic_set(&wa->xfer_id_count, 1);
39022+ atomic_set_unchecked(&wa->xfer_id_count, 1);
39023 }
39024
39025 /**
39026diff -urNp linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c
39027--- linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c 2011-03-27 14:31:47.000000000 -0400
39028+++ linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c 2011-05-04 17:56:28.000000000 -0400
39029@@ -293,7 +293,7 @@ out:
39030 */
39031 static void wa_xfer_id_init(struct wa_xfer *xfer)
39032 {
39033- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
39034+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
39035 }
39036
39037 /*
39038diff -urNp linux-2.6.32.46/drivers/uwb/wlp/messages.c linux-2.6.32.46/drivers/uwb/wlp/messages.c
39039--- linux-2.6.32.46/drivers/uwb/wlp/messages.c 2011-03-27 14:31:47.000000000 -0400
39040+++ linux-2.6.32.46/drivers/uwb/wlp/messages.c 2011-04-17 15:56:46.000000000 -0400
39041@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
39042 size_t len = skb->len;
39043 size_t used;
39044 ssize_t result;
39045- struct wlp_nonce enonce, rnonce;
39046+ struct wlp_nonce enonce = {{0}}, rnonce = {{0}};
39047 enum wlp_assc_error assc_err;
39048 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
39049 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
39050diff -urNp linux-2.6.32.46/drivers/uwb/wlp/sysfs.c linux-2.6.32.46/drivers/uwb/wlp/sysfs.c
39051--- linux-2.6.32.46/drivers/uwb/wlp/sysfs.c 2011-03-27 14:31:47.000000000 -0400
39052+++ linux-2.6.32.46/drivers/uwb/wlp/sysfs.c 2011-04-17 15:56:46.000000000 -0400
39053@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
39054 return ret;
39055 }
39056
39057-static
39058-struct sysfs_ops wss_sysfs_ops = {
39059+static const struct sysfs_ops wss_sysfs_ops = {
39060 .show = wlp_wss_attr_show,
39061 .store = wlp_wss_attr_store,
39062 };
39063diff -urNp linux-2.6.32.46/drivers/video/atmel_lcdfb.c linux-2.6.32.46/drivers/video/atmel_lcdfb.c
39064--- linux-2.6.32.46/drivers/video/atmel_lcdfb.c 2011-03-27 14:31:47.000000000 -0400
39065+++ linux-2.6.32.46/drivers/video/atmel_lcdfb.c 2011-04-17 15:56:46.000000000 -0400
39066@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
39067 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
39068 }
39069
39070-static struct backlight_ops atmel_lcdc_bl_ops = {
39071+static const struct backlight_ops atmel_lcdc_bl_ops = {
39072 .update_status = atmel_bl_update_status,
39073 .get_brightness = atmel_bl_get_brightness,
39074 };
39075diff -urNp linux-2.6.32.46/drivers/video/aty/aty128fb.c linux-2.6.32.46/drivers/video/aty/aty128fb.c
39076--- linux-2.6.32.46/drivers/video/aty/aty128fb.c 2011-03-27 14:31:47.000000000 -0400
39077+++ linux-2.6.32.46/drivers/video/aty/aty128fb.c 2011-04-17 15:56:46.000000000 -0400
39078@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
39079 return bd->props.brightness;
39080 }
39081
39082-static struct backlight_ops aty128_bl_data = {
39083+static const struct backlight_ops aty128_bl_data = {
39084 .get_brightness = aty128_bl_get_brightness,
39085 .update_status = aty128_bl_update_status,
39086 };
39087diff -urNp linux-2.6.32.46/drivers/video/aty/atyfb_base.c linux-2.6.32.46/drivers/video/aty/atyfb_base.c
39088--- linux-2.6.32.46/drivers/video/aty/atyfb_base.c 2011-03-27 14:31:47.000000000 -0400
39089+++ linux-2.6.32.46/drivers/video/aty/atyfb_base.c 2011-04-17 15:56:46.000000000 -0400
39090@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
39091 return bd->props.brightness;
39092 }
39093
39094-static struct backlight_ops aty_bl_data = {
39095+static const struct backlight_ops aty_bl_data = {
39096 .get_brightness = aty_bl_get_brightness,
39097 .update_status = aty_bl_update_status,
39098 };
39099diff -urNp linux-2.6.32.46/drivers/video/aty/radeon_backlight.c linux-2.6.32.46/drivers/video/aty/radeon_backlight.c
39100--- linux-2.6.32.46/drivers/video/aty/radeon_backlight.c 2011-03-27 14:31:47.000000000 -0400
39101+++ linux-2.6.32.46/drivers/video/aty/radeon_backlight.c 2011-04-17 15:56:46.000000000 -0400
39102@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
39103 return bd->props.brightness;
39104 }
39105
39106-static struct backlight_ops radeon_bl_data = {
39107+static const struct backlight_ops radeon_bl_data = {
39108 .get_brightness = radeon_bl_get_brightness,
39109 .update_status = radeon_bl_update_status,
39110 };
39111diff -urNp linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c
39112--- linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c 2011-03-27 14:31:47.000000000 -0400
39113+++ linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c 2011-04-17 15:56:46.000000000 -0400
39114@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
39115 return error ? data->current_brightness : reg_val;
39116 }
39117
39118-static struct backlight_ops adp5520_bl_ops = {
39119+static const struct backlight_ops adp5520_bl_ops = {
39120 .update_status = adp5520_bl_update_status,
39121 .get_brightness = adp5520_bl_get_brightness,
39122 };
39123diff -urNp linux-2.6.32.46/drivers/video/backlight/adx_bl.c linux-2.6.32.46/drivers/video/backlight/adx_bl.c
39124--- linux-2.6.32.46/drivers/video/backlight/adx_bl.c 2011-03-27 14:31:47.000000000 -0400
39125+++ linux-2.6.32.46/drivers/video/backlight/adx_bl.c 2011-04-17 15:56:46.000000000 -0400
39126@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
39127 return 1;
39128 }
39129
39130-static struct backlight_ops adx_backlight_ops = {
39131+static const struct backlight_ops adx_backlight_ops = {
39132 .options = 0,
39133 .update_status = adx_backlight_update_status,
39134 .get_brightness = adx_backlight_get_brightness,
39135diff -urNp linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c
39136--- linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c 2011-03-27 14:31:47.000000000 -0400
39137+++ linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c 2011-04-17 15:56:46.000000000 -0400
39138@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
39139 return pwm_channel_enable(&pwmbl->pwmc);
39140 }
39141
39142-static struct backlight_ops atmel_pwm_bl_ops = {
39143+static const struct backlight_ops atmel_pwm_bl_ops = {
39144 .get_brightness = atmel_pwm_bl_get_intensity,
39145 .update_status = atmel_pwm_bl_set_intensity,
39146 };
39147diff -urNp linux-2.6.32.46/drivers/video/backlight/backlight.c linux-2.6.32.46/drivers/video/backlight/backlight.c
39148--- linux-2.6.32.46/drivers/video/backlight/backlight.c 2011-03-27 14:31:47.000000000 -0400
39149+++ linux-2.6.32.46/drivers/video/backlight/backlight.c 2011-04-17 15:56:46.000000000 -0400
39150@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
39151 * ERR_PTR() or a pointer to the newly allocated device.
39152 */
39153 struct backlight_device *backlight_device_register(const char *name,
39154- struct device *parent, void *devdata, struct backlight_ops *ops)
39155+ struct device *parent, void *devdata, const struct backlight_ops *ops)
39156 {
39157 struct backlight_device *new_bd;
39158 int rc;
39159diff -urNp linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c
39160--- linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c 2011-03-27 14:31:47.000000000 -0400
39161+++ linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c 2011-04-17 15:56:46.000000000 -0400
39162@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
39163 }
39164 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
39165
39166-static struct backlight_ops corgi_bl_ops = {
39167+static const struct backlight_ops corgi_bl_ops = {
39168 .get_brightness = corgi_bl_get_intensity,
39169 .update_status = corgi_bl_update_status,
39170 };
39171diff -urNp linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c
39172--- linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c 2011-03-27 14:31:47.000000000 -0400
39173+++ linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c 2011-04-17 15:56:46.000000000 -0400
39174@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
39175 return intensity;
39176 }
39177
39178-static struct backlight_ops cr_backlight_ops = {
39179+static const struct backlight_ops cr_backlight_ops = {
39180 .get_brightness = cr_backlight_get_intensity,
39181 .update_status = cr_backlight_set_intensity,
39182 };
39183diff -urNp linux-2.6.32.46/drivers/video/backlight/da903x_bl.c linux-2.6.32.46/drivers/video/backlight/da903x_bl.c
39184--- linux-2.6.32.46/drivers/video/backlight/da903x_bl.c 2011-03-27 14:31:47.000000000 -0400
39185+++ linux-2.6.32.46/drivers/video/backlight/da903x_bl.c 2011-04-17 15:56:46.000000000 -0400
39186@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
39187 return data->current_brightness;
39188 }
39189
39190-static struct backlight_ops da903x_backlight_ops = {
39191+static const struct backlight_ops da903x_backlight_ops = {
39192 .update_status = da903x_backlight_update_status,
39193 .get_brightness = da903x_backlight_get_brightness,
39194 };
39195diff -urNp linux-2.6.32.46/drivers/video/backlight/generic_bl.c linux-2.6.32.46/drivers/video/backlight/generic_bl.c
39196--- linux-2.6.32.46/drivers/video/backlight/generic_bl.c 2011-03-27 14:31:47.000000000 -0400
39197+++ linux-2.6.32.46/drivers/video/backlight/generic_bl.c 2011-04-17 15:56:46.000000000 -0400
39198@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
39199 }
39200 EXPORT_SYMBOL(corgibl_limit_intensity);
39201
39202-static struct backlight_ops genericbl_ops = {
39203+static const struct backlight_ops genericbl_ops = {
39204 .options = BL_CORE_SUSPENDRESUME,
39205 .get_brightness = genericbl_get_intensity,
39206 .update_status = genericbl_send_intensity,
39207diff -urNp linux-2.6.32.46/drivers/video/backlight/hp680_bl.c linux-2.6.32.46/drivers/video/backlight/hp680_bl.c
39208--- linux-2.6.32.46/drivers/video/backlight/hp680_bl.c 2011-03-27 14:31:47.000000000 -0400
39209+++ linux-2.6.32.46/drivers/video/backlight/hp680_bl.c 2011-04-17 15:56:46.000000000 -0400
39210@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
39211 return current_intensity;
39212 }
39213
39214-static struct backlight_ops hp680bl_ops = {
39215+static const struct backlight_ops hp680bl_ops = {
39216 .get_brightness = hp680bl_get_intensity,
39217 .update_status = hp680bl_set_intensity,
39218 };
39219diff -urNp linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c
39220--- linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c 2011-03-27 14:31:47.000000000 -0400
39221+++ linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c 2011-04-17 15:56:46.000000000 -0400
39222@@ -93,7 +93,7 @@ out:
39223 return ret;
39224 }
39225
39226-static struct backlight_ops jornada_bl_ops = {
39227+static const struct backlight_ops jornada_bl_ops = {
39228 .get_brightness = jornada_bl_get_brightness,
39229 .update_status = jornada_bl_update_status,
39230 .options = BL_CORE_SUSPENDRESUME,
39231diff -urNp linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c
39232--- linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c 2011-03-27 14:31:47.000000000 -0400
39233+++ linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c 2011-04-17 15:56:46.000000000 -0400
39234@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
39235 return kb3886bl_intensity;
39236 }
39237
39238-static struct backlight_ops kb3886bl_ops = {
39239+static const struct backlight_ops kb3886bl_ops = {
39240 .get_brightness = kb3886bl_get_intensity,
39241 .update_status = kb3886bl_send_intensity,
39242 };
39243diff -urNp linux-2.6.32.46/drivers/video/backlight/locomolcd.c linux-2.6.32.46/drivers/video/backlight/locomolcd.c
39244--- linux-2.6.32.46/drivers/video/backlight/locomolcd.c 2011-03-27 14:31:47.000000000 -0400
39245+++ linux-2.6.32.46/drivers/video/backlight/locomolcd.c 2011-04-17 15:56:46.000000000 -0400
39246@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
39247 return current_intensity;
39248 }
39249
39250-static struct backlight_ops locomobl_data = {
39251+static const struct backlight_ops locomobl_data = {
39252 .get_brightness = locomolcd_get_intensity,
39253 .update_status = locomolcd_set_intensity,
39254 };
39255diff -urNp linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c
39256--- linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c 2011-05-10 22:12:01.000000000 -0400
39257+++ linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c 2011-05-10 22:12:33.000000000 -0400
39258@@ -33,7 +33,7 @@ struct dmi_match_data {
39259 unsigned long iostart;
39260 unsigned long iolen;
39261 /* Backlight operations structure. */
39262- struct backlight_ops backlight_ops;
39263+ const struct backlight_ops backlight_ops;
39264 };
39265
39266 /* Module parameters. */
39267diff -urNp linux-2.6.32.46/drivers/video/backlight/omap1_bl.c linux-2.6.32.46/drivers/video/backlight/omap1_bl.c
39268--- linux-2.6.32.46/drivers/video/backlight/omap1_bl.c 2011-03-27 14:31:47.000000000 -0400
39269+++ linux-2.6.32.46/drivers/video/backlight/omap1_bl.c 2011-04-17 15:56:46.000000000 -0400
39270@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
39271 return bl->current_intensity;
39272 }
39273
39274-static struct backlight_ops omapbl_ops = {
39275+static const struct backlight_ops omapbl_ops = {
39276 .get_brightness = omapbl_get_intensity,
39277 .update_status = omapbl_update_status,
39278 };
39279diff -urNp linux-2.6.32.46/drivers/video/backlight/progear_bl.c linux-2.6.32.46/drivers/video/backlight/progear_bl.c
39280--- linux-2.6.32.46/drivers/video/backlight/progear_bl.c 2011-03-27 14:31:47.000000000 -0400
39281+++ linux-2.6.32.46/drivers/video/backlight/progear_bl.c 2011-04-17 15:56:46.000000000 -0400
39282@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
39283 return intensity - HW_LEVEL_MIN;
39284 }
39285
39286-static struct backlight_ops progearbl_ops = {
39287+static const struct backlight_ops progearbl_ops = {
39288 .get_brightness = progearbl_get_intensity,
39289 .update_status = progearbl_set_intensity,
39290 };
39291diff -urNp linux-2.6.32.46/drivers/video/backlight/pwm_bl.c linux-2.6.32.46/drivers/video/backlight/pwm_bl.c
39292--- linux-2.6.32.46/drivers/video/backlight/pwm_bl.c 2011-03-27 14:31:47.000000000 -0400
39293+++ linux-2.6.32.46/drivers/video/backlight/pwm_bl.c 2011-04-17 15:56:46.000000000 -0400
39294@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
39295 return bl->props.brightness;
39296 }
39297
39298-static struct backlight_ops pwm_backlight_ops = {
39299+static const struct backlight_ops pwm_backlight_ops = {
39300 .update_status = pwm_backlight_update_status,
39301 .get_brightness = pwm_backlight_get_brightness,
39302 };
39303diff -urNp linux-2.6.32.46/drivers/video/backlight/tosa_bl.c linux-2.6.32.46/drivers/video/backlight/tosa_bl.c
39304--- linux-2.6.32.46/drivers/video/backlight/tosa_bl.c 2011-03-27 14:31:47.000000000 -0400
39305+++ linux-2.6.32.46/drivers/video/backlight/tosa_bl.c 2011-04-17 15:56:46.000000000 -0400
39306@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
39307 return props->brightness;
39308 }
39309
39310-static struct backlight_ops bl_ops = {
39311+static const struct backlight_ops bl_ops = {
39312 .get_brightness = tosa_bl_get_brightness,
39313 .update_status = tosa_bl_update_status,
39314 };
39315diff -urNp linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c
39316--- linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c 2011-03-27 14:31:47.000000000 -0400
39317+++ linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c 2011-04-17 15:56:46.000000000 -0400
39318@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
39319 return data->current_brightness;
39320 }
39321
39322-static struct backlight_ops wm831x_backlight_ops = {
39323+static const struct backlight_ops wm831x_backlight_ops = {
39324 .options = BL_CORE_SUSPENDRESUME,
39325 .update_status = wm831x_backlight_update_status,
39326 .get_brightness = wm831x_backlight_get_brightness,
39327diff -urNp linux-2.6.32.46/drivers/video/bf54x-lq043fb.c linux-2.6.32.46/drivers/video/bf54x-lq043fb.c
39328--- linux-2.6.32.46/drivers/video/bf54x-lq043fb.c 2011-03-27 14:31:47.000000000 -0400
39329+++ linux-2.6.32.46/drivers/video/bf54x-lq043fb.c 2011-04-17 15:56:46.000000000 -0400
39330@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
39331 return 0;
39332 }
39333
39334-static struct backlight_ops bfin_lq043fb_bl_ops = {
39335+static const struct backlight_ops bfin_lq043fb_bl_ops = {
39336 .get_brightness = bl_get_brightness,
39337 };
39338
39339diff -urNp linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c
39340--- linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c 2011-03-27 14:31:47.000000000 -0400
39341+++ linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c 2011-04-17 15:56:46.000000000 -0400
39342@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
39343 return 0;
39344 }
39345
39346-static struct backlight_ops bfin_lq043fb_bl_ops = {
39347+static const struct backlight_ops bfin_lq043fb_bl_ops = {
39348 .get_brightness = bl_get_brightness,
39349 };
39350
39351diff -urNp linux-2.6.32.46/drivers/video/fbcmap.c linux-2.6.32.46/drivers/video/fbcmap.c
39352--- linux-2.6.32.46/drivers/video/fbcmap.c 2011-03-27 14:31:47.000000000 -0400
39353+++ linux-2.6.32.46/drivers/video/fbcmap.c 2011-04-17 15:56:46.000000000 -0400
39354@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
39355 rc = -ENODEV;
39356 goto out;
39357 }
39358- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
39359- !info->fbops->fb_setcmap)) {
39360+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
39361 rc = -EINVAL;
39362 goto out1;
39363 }
39364diff -urNp linux-2.6.32.46/drivers/video/fbmem.c linux-2.6.32.46/drivers/video/fbmem.c
39365--- linux-2.6.32.46/drivers/video/fbmem.c 2011-03-27 14:31:47.000000000 -0400
39366+++ linux-2.6.32.46/drivers/video/fbmem.c 2011-05-16 21:46:57.000000000 -0400
39367@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
39368 image->dx += image->width + 8;
39369 }
39370 } else if (rotate == FB_ROTATE_UD) {
39371- for (x = 0; x < num && image->dx >= 0; x++) {
39372+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
39373 info->fbops->fb_imageblit(info, image);
39374 image->dx -= image->width + 8;
39375 }
39376@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_in
39377 image->dy += image->height + 8;
39378 }
39379 } else if (rotate == FB_ROTATE_CCW) {
39380- for (x = 0; x < num && image->dy >= 0; x++) {
39381+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
39382 info->fbops->fb_imageblit(info, image);
39383 image->dy -= image->height + 8;
39384 }
39385@@ -915,6 +915,8 @@ fb_set_var(struct fb_info *info, struct
39386 int flags = info->flags;
39387 int ret = 0;
39388
39389+ pax_track_stack();
39390+
39391 if (var->activate & FB_ACTIVATE_INV_MODE) {
39392 struct fb_videomode mode1, mode2;
39393
39394@@ -1040,6 +1042,8 @@ static long do_fb_ioctl(struct fb_info *
39395 void __user *argp = (void __user *)arg;
39396 long ret = 0;
39397
39398+ pax_track_stack();
39399+
39400 switch (cmd) {
39401 case FBIOGET_VSCREENINFO:
39402 if (!lock_fb_info(info))
39403@@ -1119,7 +1123,7 @@ static long do_fb_ioctl(struct fb_info *
39404 return -EFAULT;
39405 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
39406 return -EINVAL;
39407- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
39408+ if (con2fb.framebuffer >= FB_MAX)
39409 return -EINVAL;
39410 if (!registered_fb[con2fb.framebuffer])
39411 request_module("fb%d", con2fb.framebuffer);
39412diff -urNp linux-2.6.32.46/drivers/video/i810/i810_accel.c linux-2.6.32.46/drivers/video/i810/i810_accel.c
39413--- linux-2.6.32.46/drivers/video/i810/i810_accel.c 2011-03-27 14:31:47.000000000 -0400
39414+++ linux-2.6.32.46/drivers/video/i810/i810_accel.c 2011-04-17 15:56:46.000000000 -0400
39415@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
39416 }
39417 }
39418 printk("ringbuffer lockup!!!\n");
39419+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
39420 i810_report_error(mmio);
39421 par->dev_flags |= LOCKUP;
39422 info->pixmap.scan_align = 1;
39423diff -urNp linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm
39424--- linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm 2011-03-27 14:31:47.000000000 -0400
39425+++ linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm 2011-08-29 23:49:24.000000000 -0400
39426@@ -1,1604 +1,1123 @@
39427 P3
39428-# Standard 224-color Linux logo
39429 80 80
39430 255
39431- 0 0 0 0 0 0 0 0 0 0 0 0
39432- 0 0 0 0 0 0 0 0 0 0 0 0
39433- 0 0 0 0 0 0 0 0 0 0 0 0
39434- 0 0 0 0 0 0 0 0 0 0 0 0
39435- 0 0 0 0 0 0 0 0 0 0 0 0
39436- 0 0 0 0 0 0 0 0 0 0 0 0
39437- 0 0 0 0 0 0 0 0 0 0 0 0
39438- 0 0 0 0 0 0 0 0 0 0 0 0
39439- 0 0 0 0 0 0 0 0 0 0 0 0
39440- 6 6 6 6 6 6 10 10 10 10 10 10
39441- 10 10 10 6 6 6 6 6 6 6 6 6
39442- 0 0 0 0 0 0 0 0 0 0 0 0
39443- 0 0 0 0 0 0 0 0 0 0 0 0
39444- 0 0 0 0 0 0 0 0 0 0 0 0
39445- 0 0 0 0 0 0 0 0 0 0 0 0
39446- 0 0 0 0 0 0 0 0 0 0 0 0
39447- 0 0 0 0 0 0 0 0 0 0 0 0
39448- 0 0 0 0 0 0 0 0 0 0 0 0
39449- 0 0 0 0 0 0 0 0 0 0 0 0
39450- 0 0 0 0 0 0 0 0 0 0 0 0
39451- 0 0 0 0 0 0 0 0 0 0 0 0
39452- 0 0 0 0 0 0 0 0 0 0 0 0
39453- 0 0 0 0 0 0 0 0 0 0 0 0
39454- 0 0 0 0 0 0 0 0 0 0 0 0
39455- 0 0 0 0 0 0 0 0 0 0 0 0
39456- 0 0 0 0 0 0 0 0 0 0 0 0
39457- 0 0 0 0 0 0 0 0 0 0 0 0
39458- 0 0 0 0 0 0 0 0 0 0 0 0
39459- 0 0 0 6 6 6 10 10 10 14 14 14
39460- 22 22 22 26 26 26 30 30 30 34 34 34
39461- 30 30 30 30 30 30 26 26 26 18 18 18
39462- 14 14 14 10 10 10 6 6 6 0 0 0
39463- 0 0 0 0 0 0 0 0 0 0 0 0
39464- 0 0 0 0 0 0 0 0 0 0 0 0
39465- 0 0 0 0 0 0 0 0 0 0 0 0
39466- 0 0 0 0 0 0 0 0 0 0 0 0
39467- 0 0 0 0 0 0 0 0 0 0 0 0
39468- 0 0 0 0 0 0 0 0 0 0 0 0
39469- 0 0 0 0 0 0 0 0 0 0 0 0
39470- 0 0 0 0 0 0 0 0 0 0 0 0
39471- 0 0 0 0 0 0 0 0 0 0 0 0
39472- 0 0 0 0 0 1 0 0 1 0 0 0
39473- 0 0 0 0 0 0 0 0 0 0 0 0
39474- 0 0 0 0 0 0 0 0 0 0 0 0
39475- 0 0 0 0 0 0 0 0 0 0 0 0
39476- 0 0 0 0 0 0 0 0 0 0 0 0
39477- 0 0 0 0 0 0 0 0 0 0 0 0
39478- 0 0 0 0 0 0 0 0 0 0 0 0
39479- 6 6 6 14 14 14 26 26 26 42 42 42
39480- 54 54 54 66 66 66 78 78 78 78 78 78
39481- 78 78 78 74 74 74 66 66 66 54 54 54
39482- 42 42 42 26 26 26 18 18 18 10 10 10
39483- 6 6 6 0 0 0 0 0 0 0 0 0
39484- 0 0 0 0 0 0 0 0 0 0 0 0
39485- 0 0 0 0 0 0 0 0 0 0 0 0
39486- 0 0 0 0 0 0 0 0 0 0 0 0
39487- 0 0 0 0 0 0 0 0 0 0 0 0
39488- 0 0 0 0 0 0 0 0 0 0 0 0
39489- 0 0 0 0 0 0 0 0 0 0 0 0
39490- 0 0 0 0 0 0 0 0 0 0 0 0
39491- 0 0 0 0 0 0 0 0 0 0 0 0
39492- 0 0 1 0 0 0 0 0 0 0 0 0
39493- 0 0 0 0 0 0 0 0 0 0 0 0
39494- 0 0 0 0 0 0 0 0 0 0 0 0
39495- 0 0 0 0 0 0 0 0 0 0 0 0
39496- 0 0 0 0 0 0 0 0 0 0 0 0
39497- 0 0 0 0 0 0 0 0 0 0 0 0
39498- 0 0 0 0 0 0 0 0 0 10 10 10
39499- 22 22 22 42 42 42 66 66 66 86 86 86
39500- 66 66 66 38 38 38 38 38 38 22 22 22
39501- 26 26 26 34 34 34 54 54 54 66 66 66
39502- 86 86 86 70 70 70 46 46 46 26 26 26
39503- 14 14 14 6 6 6 0 0 0 0 0 0
39504- 0 0 0 0 0 0 0 0 0 0 0 0
39505- 0 0 0 0 0 0 0 0 0 0 0 0
39506- 0 0 0 0 0 0 0 0 0 0 0 0
39507- 0 0 0 0 0 0 0 0 0 0 0 0
39508- 0 0 0 0 0 0 0 0 0 0 0 0
39509- 0 0 0 0 0 0 0 0 0 0 0 0
39510- 0 0 0 0 0 0 0 0 0 0 0 0
39511- 0 0 0 0 0 0 0 0 0 0 0 0
39512- 0 0 1 0 0 1 0 0 1 0 0 0
39513- 0 0 0 0 0 0 0 0 0 0 0 0
39514- 0 0 0 0 0 0 0 0 0 0 0 0
39515- 0 0 0 0 0 0 0 0 0 0 0 0
39516- 0 0 0 0 0 0 0 0 0 0 0 0
39517- 0 0 0 0 0 0 0 0 0 0 0 0
39518- 0 0 0 0 0 0 10 10 10 26 26 26
39519- 50 50 50 82 82 82 58 58 58 6 6 6
39520- 2 2 6 2 2 6 2 2 6 2 2 6
39521- 2 2 6 2 2 6 2 2 6 2 2 6
39522- 6 6 6 54 54 54 86 86 86 66 66 66
39523- 38 38 38 18 18 18 6 6 6 0 0 0
39524- 0 0 0 0 0 0 0 0 0 0 0 0
39525- 0 0 0 0 0 0 0 0 0 0 0 0
39526- 0 0 0 0 0 0 0 0 0 0 0 0
39527- 0 0 0 0 0 0 0 0 0 0 0 0
39528- 0 0 0 0 0 0 0 0 0 0 0 0
39529- 0 0 0 0 0 0 0 0 0 0 0 0
39530- 0 0 0 0 0 0 0 0 0 0 0 0
39531- 0 0 0 0 0 0 0 0 0 0 0 0
39532- 0 0 0 0 0 0 0 0 0 0 0 0
39533- 0 0 0 0 0 0 0 0 0 0 0 0
39534- 0 0 0 0 0 0 0 0 0 0 0 0
39535- 0 0 0 0 0 0 0 0 0 0 0 0
39536- 0 0 0 0 0 0 0 0 0 0 0 0
39537- 0 0 0 0 0 0 0 0 0 0 0 0
39538- 0 0 0 6 6 6 22 22 22 50 50 50
39539- 78 78 78 34 34 34 2 2 6 2 2 6
39540- 2 2 6 2 2 6 2 2 6 2 2 6
39541- 2 2 6 2 2 6 2 2 6 2 2 6
39542- 2 2 6 2 2 6 6 6 6 70 70 70
39543- 78 78 78 46 46 46 22 22 22 6 6 6
39544- 0 0 0 0 0 0 0 0 0 0 0 0
39545- 0 0 0 0 0 0 0 0 0 0 0 0
39546- 0 0 0 0 0 0 0 0 0 0 0 0
39547- 0 0 0 0 0 0 0 0 0 0 0 0
39548- 0 0 0 0 0 0 0 0 0 0 0 0
39549- 0 0 0 0 0 0 0 0 0 0 0 0
39550- 0 0 0 0 0 0 0 0 0 0 0 0
39551- 0 0 0 0 0 0 0 0 0 0 0 0
39552- 0 0 1 0 0 1 0 0 1 0 0 0
39553- 0 0 0 0 0 0 0 0 0 0 0 0
39554- 0 0 0 0 0 0 0 0 0 0 0 0
39555- 0 0 0 0 0 0 0 0 0 0 0 0
39556- 0 0 0 0 0 0 0 0 0 0 0 0
39557- 0 0 0 0 0 0 0 0 0 0 0 0
39558- 6 6 6 18 18 18 42 42 42 82 82 82
39559- 26 26 26 2 2 6 2 2 6 2 2 6
39560- 2 2 6 2 2 6 2 2 6 2 2 6
39561- 2 2 6 2 2 6 2 2 6 14 14 14
39562- 46 46 46 34 34 34 6 6 6 2 2 6
39563- 42 42 42 78 78 78 42 42 42 18 18 18
39564- 6 6 6 0 0 0 0 0 0 0 0 0
39565- 0 0 0 0 0 0 0 0 0 0 0 0
39566- 0 0 0 0 0 0 0 0 0 0 0 0
39567- 0 0 0 0 0 0 0 0 0 0 0 0
39568- 0 0 0 0 0 0 0 0 0 0 0 0
39569- 0 0 0 0 0 0 0 0 0 0 0 0
39570- 0 0 0 0 0 0 0 0 0 0 0 0
39571- 0 0 0 0 0 0 0 0 0 0 0 0
39572- 0 0 1 0 0 0 0 0 1 0 0 0
39573- 0 0 0 0 0 0 0 0 0 0 0 0
39574- 0 0 0 0 0 0 0 0 0 0 0 0
39575- 0 0 0 0 0 0 0 0 0 0 0 0
39576- 0 0 0 0 0 0 0 0 0 0 0 0
39577- 0 0 0 0 0 0 0 0 0 0 0 0
39578- 10 10 10 30 30 30 66 66 66 58 58 58
39579- 2 2 6 2 2 6 2 2 6 2 2 6
39580- 2 2 6 2 2 6 2 2 6 2 2 6
39581- 2 2 6 2 2 6 2 2 6 26 26 26
39582- 86 86 86 101 101 101 46 46 46 10 10 10
39583- 2 2 6 58 58 58 70 70 70 34 34 34
39584- 10 10 10 0 0 0 0 0 0 0 0 0
39585- 0 0 0 0 0 0 0 0 0 0 0 0
39586- 0 0 0 0 0 0 0 0 0 0 0 0
39587- 0 0 0 0 0 0 0 0 0 0 0 0
39588- 0 0 0 0 0 0 0 0 0 0 0 0
39589- 0 0 0 0 0 0 0 0 0 0 0 0
39590- 0 0 0 0 0 0 0 0 0 0 0 0
39591- 0 0 0 0 0 0 0 0 0 0 0 0
39592- 0 0 1 0 0 1 0 0 1 0 0 0
39593- 0 0 0 0 0 0 0 0 0 0 0 0
39594- 0 0 0 0 0 0 0 0 0 0 0 0
39595- 0 0 0 0 0 0 0 0 0 0 0 0
39596- 0 0 0 0 0 0 0 0 0 0 0 0
39597- 0 0 0 0 0 0 0 0 0 0 0 0
39598- 14 14 14 42 42 42 86 86 86 10 10 10
39599- 2 2 6 2 2 6 2 2 6 2 2 6
39600- 2 2 6 2 2 6 2 2 6 2 2 6
39601- 2 2 6 2 2 6 2 2 6 30 30 30
39602- 94 94 94 94 94 94 58 58 58 26 26 26
39603- 2 2 6 6 6 6 78 78 78 54 54 54
39604- 22 22 22 6 6 6 0 0 0 0 0 0
39605- 0 0 0 0 0 0 0 0 0 0 0 0
39606- 0 0 0 0 0 0 0 0 0 0 0 0
39607- 0 0 0 0 0 0 0 0 0 0 0 0
39608- 0 0 0 0 0 0 0 0 0 0 0 0
39609- 0 0 0 0 0 0 0 0 0 0 0 0
39610- 0 0 0 0 0 0 0 0 0 0 0 0
39611- 0 0 0 0 0 0 0 0 0 0 0 0
39612- 0 0 0 0 0 0 0 0 0 0 0 0
39613- 0 0 0 0 0 0 0 0 0 0 0 0
39614- 0 0 0 0 0 0 0 0 0 0 0 0
39615- 0 0 0 0 0 0 0 0 0 0 0 0
39616- 0 0 0 0 0 0 0 0 0 0 0 0
39617- 0 0 0 0 0 0 0 0 0 6 6 6
39618- 22 22 22 62 62 62 62 62 62 2 2 6
39619- 2 2 6 2 2 6 2 2 6 2 2 6
39620- 2 2 6 2 2 6 2 2 6 2 2 6
39621- 2 2 6 2 2 6 2 2 6 26 26 26
39622- 54 54 54 38 38 38 18 18 18 10 10 10
39623- 2 2 6 2 2 6 34 34 34 82 82 82
39624- 38 38 38 14 14 14 0 0 0 0 0 0
39625- 0 0 0 0 0 0 0 0 0 0 0 0
39626- 0 0 0 0 0 0 0 0 0 0 0 0
39627- 0 0 0 0 0 0 0 0 0 0 0 0
39628- 0 0 0 0 0 0 0 0 0 0 0 0
39629- 0 0 0 0 0 0 0 0 0 0 0 0
39630- 0 0 0 0 0 0 0 0 0 0 0 0
39631- 0 0 0 0 0 0 0 0 0 0 0 0
39632- 0 0 0 0 0 1 0 0 1 0 0 0
39633- 0 0 0 0 0 0 0 0 0 0 0 0
39634- 0 0 0 0 0 0 0 0 0 0 0 0
39635- 0 0 0 0 0 0 0 0 0 0 0 0
39636- 0 0 0 0 0 0 0 0 0 0 0 0
39637- 0 0 0 0 0 0 0 0 0 6 6 6
39638- 30 30 30 78 78 78 30 30 30 2 2 6
39639- 2 2 6 2 2 6 2 2 6 2 2 6
39640- 2 2 6 2 2 6 2 2 6 2 2 6
39641- 2 2 6 2 2 6 2 2 6 10 10 10
39642- 10 10 10 2 2 6 2 2 6 2 2 6
39643- 2 2 6 2 2 6 2 2 6 78 78 78
39644- 50 50 50 18 18 18 6 6 6 0 0 0
39645- 0 0 0 0 0 0 0 0 0 0 0 0
39646- 0 0 0 0 0 0 0 0 0 0 0 0
39647- 0 0 0 0 0 0 0 0 0 0 0 0
39648- 0 0 0 0 0 0 0 0 0 0 0 0
39649- 0 0 0 0 0 0 0 0 0 0 0 0
39650- 0 0 0 0 0 0 0 0 0 0 0 0
39651- 0 0 0 0 0 0 0 0 0 0 0 0
39652- 0 0 1 0 0 0 0 0 0 0 0 0
39653- 0 0 0 0 0 0 0 0 0 0 0 0
39654- 0 0 0 0 0 0 0 0 0 0 0 0
39655- 0 0 0 0 0 0 0 0 0 0 0 0
39656- 0 0 0 0 0 0 0 0 0 0 0 0
39657- 0 0 0 0 0 0 0 0 0 10 10 10
39658- 38 38 38 86 86 86 14 14 14 2 2 6
39659- 2 2 6 2 2 6 2 2 6 2 2 6
39660- 2 2 6 2 2 6 2 2 6 2 2 6
39661- 2 2 6 2 2 6 2 2 6 2 2 6
39662- 2 2 6 2 2 6 2 2 6 2 2 6
39663- 2 2 6 2 2 6 2 2 6 54 54 54
39664- 66 66 66 26 26 26 6 6 6 0 0 0
39665- 0 0 0 0 0 0 0 0 0 0 0 0
39666- 0 0 0 0 0 0 0 0 0 0 0 0
39667- 0 0 0 0 0 0 0 0 0 0 0 0
39668- 0 0 0 0 0 0 0 0 0 0 0 0
39669- 0 0 0 0 0 0 0 0 0 0 0 0
39670- 0 0 0 0 0 0 0 0 0 0 0 0
39671- 0 0 0 0 0 0 0 0 0 0 0 0
39672- 0 0 0 0 0 1 0 0 1 0 0 0
39673- 0 0 0 0 0 0 0 0 0 0 0 0
39674- 0 0 0 0 0 0 0 0 0 0 0 0
39675- 0 0 0 0 0 0 0 0 0 0 0 0
39676- 0 0 0 0 0 0 0 0 0 0 0 0
39677- 0 0 0 0 0 0 0 0 0 14 14 14
39678- 42 42 42 82 82 82 2 2 6 2 2 6
39679- 2 2 6 6 6 6 10 10 10 2 2 6
39680- 2 2 6 2 2 6 2 2 6 2 2 6
39681- 2 2 6 2 2 6 2 2 6 6 6 6
39682- 14 14 14 10 10 10 2 2 6 2 2 6
39683- 2 2 6 2 2 6 2 2 6 18 18 18
39684- 82 82 82 34 34 34 10 10 10 0 0 0
39685- 0 0 0 0 0 0 0 0 0 0 0 0
39686- 0 0 0 0 0 0 0 0 0 0 0 0
39687- 0 0 0 0 0 0 0 0 0 0 0 0
39688- 0 0 0 0 0 0 0 0 0 0 0 0
39689- 0 0 0 0 0 0 0 0 0 0 0 0
39690- 0 0 0 0 0 0 0 0 0 0 0 0
39691- 0 0 0 0 0 0 0 0 0 0 0 0
39692- 0 0 1 0 0 0 0 0 0 0 0 0
39693- 0 0 0 0 0 0 0 0 0 0 0 0
39694- 0 0 0 0 0 0 0 0 0 0 0 0
39695- 0 0 0 0 0 0 0 0 0 0 0 0
39696- 0 0 0 0 0 0 0 0 0 0 0 0
39697- 0 0 0 0 0 0 0 0 0 14 14 14
39698- 46 46 46 86 86 86 2 2 6 2 2 6
39699- 6 6 6 6 6 6 22 22 22 34 34 34
39700- 6 6 6 2 2 6 2 2 6 2 2 6
39701- 2 2 6 2 2 6 18 18 18 34 34 34
39702- 10 10 10 50 50 50 22 22 22 2 2 6
39703- 2 2 6 2 2 6 2 2 6 10 10 10
39704- 86 86 86 42 42 42 14 14 14 0 0 0
39705- 0 0 0 0 0 0 0 0 0 0 0 0
39706- 0 0 0 0 0 0 0 0 0 0 0 0
39707- 0 0 0 0 0 0 0 0 0 0 0 0
39708- 0 0 0 0 0 0 0 0 0 0 0 0
39709- 0 0 0 0 0 0 0 0 0 0 0 0
39710- 0 0 0 0 0 0 0 0 0 0 0 0
39711- 0 0 0 0 0 0 0 0 0 0 0 0
39712- 0 0 1 0 0 1 0 0 1 0 0 0
39713- 0 0 0 0 0 0 0 0 0 0 0 0
39714- 0 0 0 0 0 0 0 0 0 0 0 0
39715- 0 0 0 0 0 0 0 0 0 0 0 0
39716- 0 0 0 0 0 0 0 0 0 0 0 0
39717- 0 0 0 0 0 0 0 0 0 14 14 14
39718- 46 46 46 86 86 86 2 2 6 2 2 6
39719- 38 38 38 116 116 116 94 94 94 22 22 22
39720- 22 22 22 2 2 6 2 2 6 2 2 6
39721- 14 14 14 86 86 86 138 138 138 162 162 162
39722-154 154 154 38 38 38 26 26 26 6 6 6
39723- 2 2 6 2 2 6 2 2 6 2 2 6
39724- 86 86 86 46 46 46 14 14 14 0 0 0
39725- 0 0 0 0 0 0 0 0 0 0 0 0
39726- 0 0 0 0 0 0 0 0 0 0 0 0
39727- 0 0 0 0 0 0 0 0 0 0 0 0
39728- 0 0 0 0 0 0 0 0 0 0 0 0
39729- 0 0 0 0 0 0 0 0 0 0 0 0
39730- 0 0 0 0 0 0 0 0 0 0 0 0
39731- 0 0 0 0 0 0 0 0 0 0 0 0
39732- 0 0 0 0 0 0 0 0 0 0 0 0
39733- 0 0 0 0 0 0 0 0 0 0 0 0
39734- 0 0 0 0 0 0 0 0 0 0 0 0
39735- 0 0 0 0 0 0 0 0 0 0 0 0
39736- 0 0 0 0 0 0 0 0 0 0 0 0
39737- 0 0 0 0 0 0 0 0 0 14 14 14
39738- 46 46 46 86 86 86 2 2 6 14 14 14
39739-134 134 134 198 198 198 195 195 195 116 116 116
39740- 10 10 10 2 2 6 2 2 6 6 6 6
39741-101 98 89 187 187 187 210 210 210 218 218 218
39742-214 214 214 134 134 134 14 14 14 6 6 6
39743- 2 2 6 2 2 6 2 2 6 2 2 6
39744- 86 86 86 50 50 50 18 18 18 6 6 6
39745- 0 0 0 0 0 0 0 0 0 0 0 0
39746- 0 0 0 0 0 0 0 0 0 0 0 0
39747- 0 0 0 0 0 0 0 0 0 0 0 0
39748- 0 0 0 0 0 0 0 0 0 0 0 0
39749- 0 0 0 0 0 0 0 0 0 0 0 0
39750- 0 0 0 0 0 0 0 0 0 0 0 0
39751- 0 0 0 0 0 0 0 0 1 0 0 0
39752- 0 0 1 0 0 1 0 0 1 0 0 0
39753- 0 0 0 0 0 0 0 0 0 0 0 0
39754- 0 0 0 0 0 0 0 0 0 0 0 0
39755- 0 0 0 0 0 0 0 0 0 0 0 0
39756- 0 0 0 0 0 0 0 0 0 0 0 0
39757- 0 0 0 0 0 0 0 0 0 14 14 14
39758- 46 46 46 86 86 86 2 2 6 54 54 54
39759-218 218 218 195 195 195 226 226 226 246 246 246
39760- 58 58 58 2 2 6 2 2 6 30 30 30
39761-210 210 210 253 253 253 174 174 174 123 123 123
39762-221 221 221 234 234 234 74 74 74 2 2 6
39763- 2 2 6 2 2 6 2 2 6 2 2 6
39764- 70 70 70 58 58 58 22 22 22 6 6 6
39765- 0 0 0 0 0 0 0 0 0 0 0 0
39766- 0 0 0 0 0 0 0 0 0 0 0 0
39767- 0 0 0 0 0 0 0 0 0 0 0 0
39768- 0 0 0 0 0 0 0 0 0 0 0 0
39769- 0 0 0 0 0 0 0 0 0 0 0 0
39770- 0 0 0 0 0 0 0 0 0 0 0 0
39771- 0 0 0 0 0 0 0 0 0 0 0 0
39772- 0 0 0 0 0 0 0 0 0 0 0 0
39773- 0 0 0 0 0 0 0 0 0 0 0 0
39774- 0 0 0 0 0 0 0 0 0 0 0 0
39775- 0 0 0 0 0 0 0 0 0 0 0 0
39776- 0 0 0 0 0 0 0 0 0 0 0 0
39777- 0 0 0 0 0 0 0 0 0 14 14 14
39778- 46 46 46 82 82 82 2 2 6 106 106 106
39779-170 170 170 26 26 26 86 86 86 226 226 226
39780-123 123 123 10 10 10 14 14 14 46 46 46
39781-231 231 231 190 190 190 6 6 6 70 70 70
39782- 90 90 90 238 238 238 158 158 158 2 2 6
39783- 2 2 6 2 2 6 2 2 6 2 2 6
39784- 70 70 70 58 58 58 22 22 22 6 6 6
39785- 0 0 0 0 0 0 0 0 0 0 0 0
39786- 0 0 0 0 0 0 0 0 0 0 0 0
39787- 0 0 0 0 0 0 0 0 0 0 0 0
39788- 0 0 0 0 0 0 0 0 0 0 0 0
39789- 0 0 0 0 0 0 0 0 0 0 0 0
39790- 0 0 0 0 0 0 0 0 0 0 0 0
39791- 0 0 0 0 0 0 0 0 1 0 0 0
39792- 0 0 1 0 0 1 0 0 1 0 0 0
39793- 0 0 0 0 0 0 0 0 0 0 0 0
39794- 0 0 0 0 0 0 0 0 0 0 0 0
39795- 0 0 0 0 0 0 0 0 0 0 0 0
39796- 0 0 0 0 0 0 0 0 0 0 0 0
39797- 0 0 0 0 0 0 0 0 0 14 14 14
39798- 42 42 42 86 86 86 6 6 6 116 116 116
39799-106 106 106 6 6 6 70 70 70 149 149 149
39800-128 128 128 18 18 18 38 38 38 54 54 54
39801-221 221 221 106 106 106 2 2 6 14 14 14
39802- 46 46 46 190 190 190 198 198 198 2 2 6
39803- 2 2 6 2 2 6 2 2 6 2 2 6
39804- 74 74 74 62 62 62 22 22 22 6 6 6
39805- 0 0 0 0 0 0 0 0 0 0 0 0
39806- 0 0 0 0 0 0 0 0 0 0 0 0
39807- 0 0 0 0 0 0 0 0 0 0 0 0
39808- 0 0 0 0 0 0 0 0 0 0 0 0
39809- 0 0 0 0 0 0 0 0 0 0 0 0
39810- 0 0 0 0 0 0 0 0 0 0 0 0
39811- 0 0 0 0 0 0 0 0 1 0 0 0
39812- 0 0 1 0 0 0 0 0 1 0 0 0
39813- 0 0 0 0 0 0 0 0 0 0 0 0
39814- 0 0 0 0 0 0 0 0 0 0 0 0
39815- 0 0 0 0 0 0 0 0 0 0 0 0
39816- 0 0 0 0 0 0 0 0 0 0 0 0
39817- 0 0 0 0 0 0 0 0 0 14 14 14
39818- 42 42 42 94 94 94 14 14 14 101 101 101
39819-128 128 128 2 2 6 18 18 18 116 116 116
39820-118 98 46 121 92 8 121 92 8 98 78 10
39821-162 162 162 106 106 106 2 2 6 2 2 6
39822- 2 2 6 195 195 195 195 195 195 6 6 6
39823- 2 2 6 2 2 6 2 2 6 2 2 6
39824- 74 74 74 62 62 62 22 22 22 6 6 6
39825- 0 0 0 0 0 0 0 0 0 0 0 0
39826- 0 0 0 0 0 0 0 0 0 0 0 0
39827- 0 0 0 0 0 0 0 0 0 0 0 0
39828- 0 0 0 0 0 0 0 0 0 0 0 0
39829- 0 0 0 0 0 0 0 0 0 0 0 0
39830- 0 0 0 0 0 0 0 0 0 0 0 0
39831- 0 0 0 0 0 0 0 0 1 0 0 1
39832- 0 0 1 0 0 0 0 0 1 0 0 0
39833- 0 0 0 0 0 0 0 0 0 0 0 0
39834- 0 0 0 0 0 0 0 0 0 0 0 0
39835- 0 0 0 0 0 0 0 0 0 0 0 0
39836- 0 0 0 0 0 0 0 0 0 0 0 0
39837- 0 0 0 0 0 0 0 0 0 10 10 10
39838- 38 38 38 90 90 90 14 14 14 58 58 58
39839-210 210 210 26 26 26 54 38 6 154 114 10
39840-226 170 11 236 186 11 225 175 15 184 144 12
39841-215 174 15 175 146 61 37 26 9 2 2 6
39842- 70 70 70 246 246 246 138 138 138 2 2 6
39843- 2 2 6 2 2 6 2 2 6 2 2 6
39844- 70 70 70 66 66 66 26 26 26 6 6 6
39845- 0 0 0 0 0 0 0 0 0 0 0 0
39846- 0 0 0 0 0 0 0 0 0 0 0 0
39847- 0 0 0 0 0 0 0 0 0 0 0 0
39848- 0 0 0 0 0 0 0 0 0 0 0 0
39849- 0 0 0 0 0 0 0 0 0 0 0 0
39850- 0 0 0 0 0 0 0 0 0 0 0 0
39851- 0 0 0 0 0 0 0 0 0 0 0 0
39852- 0 0 0 0 0 0 0 0 0 0 0 0
39853- 0 0 0 0 0 0 0 0 0 0 0 0
39854- 0 0 0 0 0 0 0 0 0 0 0 0
39855- 0 0 0 0 0 0 0 0 0 0 0 0
39856- 0 0 0 0 0 0 0 0 0 0 0 0
39857- 0 0 0 0 0 0 0 0 0 10 10 10
39858- 38 38 38 86 86 86 14 14 14 10 10 10
39859-195 195 195 188 164 115 192 133 9 225 175 15
39860-239 182 13 234 190 10 232 195 16 232 200 30
39861-245 207 45 241 208 19 232 195 16 184 144 12
39862-218 194 134 211 206 186 42 42 42 2 2 6
39863- 2 2 6 2 2 6 2 2 6 2 2 6
39864- 50 50 50 74 74 74 30 30 30 6 6 6
39865- 0 0 0 0 0 0 0 0 0 0 0 0
39866- 0 0 0 0 0 0 0 0 0 0 0 0
39867- 0 0 0 0 0 0 0 0 0 0 0 0
39868- 0 0 0 0 0 0 0 0 0 0 0 0
39869- 0 0 0 0 0 0 0 0 0 0 0 0
39870- 0 0 0 0 0 0 0 0 0 0 0 0
39871- 0 0 0 0 0 0 0 0 0 0 0 0
39872- 0 0 0 0 0 0 0 0 0 0 0 0
39873- 0 0 0 0 0 0 0 0 0 0 0 0
39874- 0 0 0 0 0 0 0 0 0 0 0 0
39875- 0 0 0 0 0 0 0 0 0 0 0 0
39876- 0 0 0 0 0 0 0 0 0 0 0 0
39877- 0 0 0 0 0 0 0 0 0 10 10 10
39878- 34 34 34 86 86 86 14 14 14 2 2 6
39879-121 87 25 192 133 9 219 162 10 239 182 13
39880-236 186 11 232 195 16 241 208 19 244 214 54
39881-246 218 60 246 218 38 246 215 20 241 208 19
39882-241 208 19 226 184 13 121 87 25 2 2 6
39883- 2 2 6 2 2 6 2 2 6 2 2 6
39884- 50 50 50 82 82 82 34 34 34 10 10 10
39885- 0 0 0 0 0 0 0 0 0 0 0 0
39886- 0 0 0 0 0 0 0 0 0 0 0 0
39887- 0 0 0 0 0 0 0 0 0 0 0 0
39888- 0 0 0 0 0 0 0 0 0 0 0 0
39889- 0 0 0 0 0 0 0 0 0 0 0 0
39890- 0 0 0 0 0 0 0 0 0 0 0 0
39891- 0 0 0 0 0 0 0 0 0 0 0 0
39892- 0 0 0 0 0 0 0 0 0 0 0 0
39893- 0 0 0 0 0 0 0 0 0 0 0 0
39894- 0 0 0 0 0 0 0 0 0 0 0 0
39895- 0 0 0 0 0 0 0 0 0 0 0 0
39896- 0 0 0 0 0 0 0 0 0 0 0 0
39897- 0 0 0 0 0 0 0 0 0 10 10 10
39898- 34 34 34 82 82 82 30 30 30 61 42 6
39899-180 123 7 206 145 10 230 174 11 239 182 13
39900-234 190 10 238 202 15 241 208 19 246 218 74
39901-246 218 38 246 215 20 246 215 20 246 215 20
39902-226 184 13 215 174 15 184 144 12 6 6 6
39903- 2 2 6 2 2 6 2 2 6 2 2 6
39904- 26 26 26 94 94 94 42 42 42 14 14 14
39905- 0 0 0 0 0 0 0 0 0 0 0 0
39906- 0 0 0 0 0 0 0 0 0 0 0 0
39907- 0 0 0 0 0 0 0 0 0 0 0 0
39908- 0 0 0 0 0 0 0 0 0 0 0 0
39909- 0 0 0 0 0 0 0 0 0 0 0 0
39910- 0 0 0 0 0 0 0 0 0 0 0 0
39911- 0 0 0 0 0 0 0 0 0 0 0 0
39912- 0 0 0 0 0 0 0 0 0 0 0 0
39913- 0 0 0 0 0 0 0 0 0 0 0 0
39914- 0 0 0 0 0 0 0 0 0 0 0 0
39915- 0 0 0 0 0 0 0 0 0 0 0 0
39916- 0 0 0 0 0 0 0 0 0 0 0 0
39917- 0 0 0 0 0 0 0 0 0 10 10 10
39918- 30 30 30 78 78 78 50 50 50 104 69 6
39919-192 133 9 216 158 10 236 178 12 236 186 11
39920-232 195 16 241 208 19 244 214 54 245 215 43
39921-246 215 20 246 215 20 241 208 19 198 155 10
39922-200 144 11 216 158 10 156 118 10 2 2 6
39923- 2 2 6 2 2 6 2 2 6 2 2 6
39924- 6 6 6 90 90 90 54 54 54 18 18 18
39925- 6 6 6 0 0 0 0 0 0 0 0 0
39926- 0 0 0 0 0 0 0 0 0 0 0 0
39927- 0 0 0 0 0 0 0 0 0 0 0 0
39928- 0 0 0 0 0 0 0 0 0 0 0 0
39929- 0 0 0 0 0 0 0 0 0 0 0 0
39930- 0 0 0 0 0 0 0 0 0 0 0 0
39931- 0 0 0 0 0 0 0 0 0 0 0 0
39932- 0 0 0 0 0 0 0 0 0 0 0 0
39933- 0 0 0 0 0 0 0 0 0 0 0 0
39934- 0 0 0 0 0 0 0 0 0 0 0 0
39935- 0 0 0 0 0 0 0 0 0 0 0 0
39936- 0 0 0 0 0 0 0 0 0 0 0 0
39937- 0 0 0 0 0 0 0 0 0 10 10 10
39938- 30 30 30 78 78 78 46 46 46 22 22 22
39939-137 92 6 210 162 10 239 182 13 238 190 10
39940-238 202 15 241 208 19 246 215 20 246 215 20
39941-241 208 19 203 166 17 185 133 11 210 150 10
39942-216 158 10 210 150 10 102 78 10 2 2 6
39943- 6 6 6 54 54 54 14 14 14 2 2 6
39944- 2 2 6 62 62 62 74 74 74 30 30 30
39945- 10 10 10 0 0 0 0 0 0 0 0 0
39946- 0 0 0 0 0 0 0 0 0 0 0 0
39947- 0 0 0 0 0 0 0 0 0 0 0 0
39948- 0 0 0 0 0 0 0 0 0 0 0 0
39949- 0 0 0 0 0 0 0 0 0 0 0 0
39950- 0 0 0 0 0 0 0 0 0 0 0 0
39951- 0 0 0 0 0 0 0 0 0 0 0 0
39952- 0 0 0 0 0 0 0 0 0 0 0 0
39953- 0 0 0 0 0 0 0 0 0 0 0 0
39954- 0 0 0 0 0 0 0 0 0 0 0 0
39955- 0 0 0 0 0 0 0 0 0 0 0 0
39956- 0 0 0 0 0 0 0 0 0 0 0 0
39957- 0 0 0 0 0 0 0 0 0 10 10 10
39958- 34 34 34 78 78 78 50 50 50 6 6 6
39959- 94 70 30 139 102 15 190 146 13 226 184 13
39960-232 200 30 232 195 16 215 174 15 190 146 13
39961-168 122 10 192 133 9 210 150 10 213 154 11
39962-202 150 34 182 157 106 101 98 89 2 2 6
39963- 2 2 6 78 78 78 116 116 116 58 58 58
39964- 2 2 6 22 22 22 90 90 90 46 46 46
39965- 18 18 18 6 6 6 0 0 0 0 0 0
39966- 0 0 0 0 0 0 0 0 0 0 0 0
39967- 0 0 0 0 0 0 0 0 0 0 0 0
39968- 0 0 0 0 0 0 0 0 0 0 0 0
39969- 0 0 0 0 0 0 0 0 0 0 0 0
39970- 0 0 0 0 0 0 0 0 0 0 0 0
39971- 0 0 0 0 0 0 0 0 0 0 0 0
39972- 0 0 0 0 0 0 0 0 0 0 0 0
39973- 0 0 0 0 0 0 0 0 0 0 0 0
39974- 0 0 0 0 0 0 0 0 0 0 0 0
39975- 0 0 0 0 0 0 0 0 0 0 0 0
39976- 0 0 0 0 0 0 0 0 0 0 0 0
39977- 0 0 0 0 0 0 0 0 0 10 10 10
39978- 38 38 38 86 86 86 50 50 50 6 6 6
39979-128 128 128 174 154 114 156 107 11 168 122 10
39980-198 155 10 184 144 12 197 138 11 200 144 11
39981-206 145 10 206 145 10 197 138 11 188 164 115
39982-195 195 195 198 198 198 174 174 174 14 14 14
39983- 2 2 6 22 22 22 116 116 116 116 116 116
39984- 22 22 22 2 2 6 74 74 74 70 70 70
39985- 30 30 30 10 10 10 0 0 0 0 0 0
39986- 0 0 0 0 0 0 0 0 0 0 0 0
39987- 0 0 0 0 0 0 0 0 0 0 0 0
39988- 0 0 0 0 0 0 0 0 0 0 0 0
39989- 0 0 0 0 0 0 0 0 0 0 0 0
39990- 0 0 0 0 0 0 0 0 0 0 0 0
39991- 0 0 0 0 0 0 0 0 0 0 0 0
39992- 0 0 0 0 0 0 0 0 0 0 0 0
39993- 0 0 0 0 0 0 0 0 0 0 0 0
39994- 0 0 0 0 0 0 0 0 0 0 0 0
39995- 0 0 0 0 0 0 0 0 0 0 0 0
39996- 0 0 0 0 0 0 0 0 0 0 0 0
39997- 0 0 0 0 0 0 6 6 6 18 18 18
39998- 50 50 50 101 101 101 26 26 26 10 10 10
39999-138 138 138 190 190 190 174 154 114 156 107 11
40000-197 138 11 200 144 11 197 138 11 192 133 9
40001-180 123 7 190 142 34 190 178 144 187 187 187
40002-202 202 202 221 221 221 214 214 214 66 66 66
40003- 2 2 6 2 2 6 50 50 50 62 62 62
40004- 6 6 6 2 2 6 10 10 10 90 90 90
40005- 50 50 50 18 18 18 6 6 6 0 0 0
40006- 0 0 0 0 0 0 0 0 0 0 0 0
40007- 0 0 0 0 0 0 0 0 0 0 0 0
40008- 0 0 0 0 0 0 0 0 0 0 0 0
40009- 0 0 0 0 0 0 0 0 0 0 0 0
40010- 0 0 0 0 0 0 0 0 0 0 0 0
40011- 0 0 0 0 0 0 0 0 0 0 0 0
40012- 0 0 0 0 0 0 0 0 0 0 0 0
40013- 0 0 0 0 0 0 0 0 0 0 0 0
40014- 0 0 0 0 0 0 0 0 0 0 0 0
40015- 0 0 0 0 0 0 0 0 0 0 0 0
40016- 0 0 0 0 0 0 0 0 0 0 0 0
40017- 0 0 0 0 0 0 10 10 10 34 34 34
40018- 74 74 74 74 74 74 2 2 6 6 6 6
40019-144 144 144 198 198 198 190 190 190 178 166 146
40020-154 121 60 156 107 11 156 107 11 168 124 44
40021-174 154 114 187 187 187 190 190 190 210 210 210
40022-246 246 246 253 253 253 253 253 253 182 182 182
40023- 6 6 6 2 2 6 2 2 6 2 2 6
40024- 2 2 6 2 2 6 2 2 6 62 62 62
40025- 74 74 74 34 34 34 14 14 14 0 0 0
40026- 0 0 0 0 0 0 0 0 0 0 0 0
40027- 0 0 0 0 0 0 0 0 0 0 0 0
40028- 0 0 0 0 0 0 0 0 0 0 0 0
40029- 0 0 0 0 0 0 0 0 0 0 0 0
40030- 0 0 0 0 0 0 0 0 0 0 0 0
40031- 0 0 0 0 0 0 0 0 0 0 0 0
40032- 0 0 0 0 0 0 0 0 0 0 0 0
40033- 0 0 0 0 0 0 0 0 0 0 0 0
40034- 0 0 0 0 0 0 0 0 0 0 0 0
40035- 0 0 0 0 0 0 0 0 0 0 0 0
40036- 0 0 0 0 0 0 0 0 0 0 0 0
40037- 0 0 0 10 10 10 22 22 22 54 54 54
40038- 94 94 94 18 18 18 2 2 6 46 46 46
40039-234 234 234 221 221 221 190 190 190 190 190 190
40040-190 190 190 187 187 187 187 187 187 190 190 190
40041-190 190 190 195 195 195 214 214 214 242 242 242
40042-253 253 253 253 253 253 253 253 253 253 253 253
40043- 82 82 82 2 2 6 2 2 6 2 2 6
40044- 2 2 6 2 2 6 2 2 6 14 14 14
40045- 86 86 86 54 54 54 22 22 22 6 6 6
40046- 0 0 0 0 0 0 0 0 0 0 0 0
40047- 0 0 0 0 0 0 0 0 0 0 0 0
40048- 0 0 0 0 0 0 0 0 0 0 0 0
40049- 0 0 0 0 0 0 0 0 0 0 0 0
40050- 0 0 0 0 0 0 0 0 0 0 0 0
40051- 0 0 0 0 0 0 0 0 0 0 0 0
40052- 0 0 0 0 0 0 0 0 0 0 0 0
40053- 0 0 0 0 0 0 0 0 0 0 0 0
40054- 0 0 0 0 0 0 0 0 0 0 0 0
40055- 0 0 0 0 0 0 0 0 0 0 0 0
40056- 0 0 0 0 0 0 0 0 0 0 0 0
40057- 6 6 6 18 18 18 46 46 46 90 90 90
40058- 46 46 46 18 18 18 6 6 6 182 182 182
40059-253 253 253 246 246 246 206 206 206 190 190 190
40060-190 190 190 190 190 190 190 190 190 190 190 190
40061-206 206 206 231 231 231 250 250 250 253 253 253
40062-253 253 253 253 253 253 253 253 253 253 253 253
40063-202 202 202 14 14 14 2 2 6 2 2 6
40064- 2 2 6 2 2 6 2 2 6 2 2 6
40065- 42 42 42 86 86 86 42 42 42 18 18 18
40066- 6 6 6 0 0 0 0 0 0 0 0 0
40067- 0 0 0 0 0 0 0 0 0 0 0 0
40068- 0 0 0 0 0 0 0 0 0 0 0 0
40069- 0 0 0 0 0 0 0 0 0 0 0 0
40070- 0 0 0 0 0 0 0 0 0 0 0 0
40071- 0 0 0 0 0 0 0 0 0 0 0 0
40072- 0 0 0 0 0 0 0 0 0 0 0 0
40073- 0 0 0 0 0 0 0 0 0 0 0 0
40074- 0 0 0 0 0 0 0 0 0 0 0 0
40075- 0 0 0 0 0 0 0 0 0 0 0 0
40076- 0 0 0 0 0 0 0 0 0 6 6 6
40077- 14 14 14 38 38 38 74 74 74 66 66 66
40078- 2 2 6 6 6 6 90 90 90 250 250 250
40079-253 253 253 253 253 253 238 238 238 198 198 198
40080-190 190 190 190 190 190 195 195 195 221 221 221
40081-246 246 246 253 253 253 253 253 253 253 253 253
40082-253 253 253 253 253 253 253 253 253 253 253 253
40083-253 253 253 82 82 82 2 2 6 2 2 6
40084- 2 2 6 2 2 6 2 2 6 2 2 6
40085- 2 2 6 78 78 78 70 70 70 34 34 34
40086- 14 14 14 6 6 6 0 0 0 0 0 0
40087- 0 0 0 0 0 0 0 0 0 0 0 0
40088- 0 0 0 0 0 0 0 0 0 0 0 0
40089- 0 0 0 0 0 0 0 0 0 0 0 0
40090- 0 0 0 0 0 0 0 0 0 0 0 0
40091- 0 0 0 0 0 0 0 0 0 0 0 0
40092- 0 0 0 0 0 0 0 0 0 0 0 0
40093- 0 0 0 0 0 0 0 0 0 0 0 0
40094- 0 0 0 0 0 0 0 0 0 0 0 0
40095- 0 0 0 0 0 0 0 0 0 0 0 0
40096- 0 0 0 0 0 0 0 0 0 14 14 14
40097- 34 34 34 66 66 66 78 78 78 6 6 6
40098- 2 2 6 18 18 18 218 218 218 253 253 253
40099-253 253 253 253 253 253 253 253 253 246 246 246
40100-226 226 226 231 231 231 246 246 246 253 253 253
40101-253 253 253 253 253 253 253 253 253 253 253 253
40102-253 253 253 253 253 253 253 253 253 253 253 253
40103-253 253 253 178 178 178 2 2 6 2 2 6
40104- 2 2 6 2 2 6 2 2 6 2 2 6
40105- 2 2 6 18 18 18 90 90 90 62 62 62
40106- 30 30 30 10 10 10 0 0 0 0 0 0
40107- 0 0 0 0 0 0 0 0 0 0 0 0
40108- 0 0 0 0 0 0 0 0 0 0 0 0
40109- 0 0 0 0 0 0 0 0 0 0 0 0
40110- 0 0 0 0 0 0 0 0 0 0 0 0
40111- 0 0 0 0 0 0 0 0 0 0 0 0
40112- 0 0 0 0 0 0 0 0 0 0 0 0
40113- 0 0 0 0 0 0 0 0 0 0 0 0
40114- 0 0 0 0 0 0 0 0 0 0 0 0
40115- 0 0 0 0 0 0 0 0 0 0 0 0
40116- 0 0 0 0 0 0 10 10 10 26 26 26
40117- 58 58 58 90 90 90 18 18 18 2 2 6
40118- 2 2 6 110 110 110 253 253 253 253 253 253
40119-253 253 253 253 253 253 253 253 253 253 253 253
40120-250 250 250 253 253 253 253 253 253 253 253 253
40121-253 253 253 253 253 253 253 253 253 253 253 253
40122-253 253 253 253 253 253 253 253 253 253 253 253
40123-253 253 253 231 231 231 18 18 18 2 2 6
40124- 2 2 6 2 2 6 2 2 6 2 2 6
40125- 2 2 6 2 2 6 18 18 18 94 94 94
40126- 54 54 54 26 26 26 10 10 10 0 0 0
40127- 0 0 0 0 0 0 0 0 0 0 0 0
40128- 0 0 0 0 0 0 0 0 0 0 0 0
40129- 0 0 0 0 0 0 0 0 0 0 0 0
40130- 0 0 0 0 0 0 0 0 0 0 0 0
40131- 0 0 0 0 0 0 0 0 0 0 0 0
40132- 0 0 0 0 0 0 0 0 0 0 0 0
40133- 0 0 0 0 0 0 0 0 0 0 0 0
40134- 0 0 0 0 0 0 0 0 0 0 0 0
40135- 0 0 0 0 0 0 0 0 0 0 0 0
40136- 0 0 0 6 6 6 22 22 22 50 50 50
40137- 90 90 90 26 26 26 2 2 6 2 2 6
40138- 14 14 14 195 195 195 250 250 250 253 253 253
40139-253 253 253 253 253 253 253 253 253 253 253 253
40140-253 253 253 253 253 253 253 253 253 253 253 253
40141-253 253 253 253 253 253 253 253 253 253 253 253
40142-253 253 253 253 253 253 253 253 253 253 253 253
40143-250 250 250 242 242 242 54 54 54 2 2 6
40144- 2 2 6 2 2 6 2 2 6 2 2 6
40145- 2 2 6 2 2 6 2 2 6 38 38 38
40146- 86 86 86 50 50 50 22 22 22 6 6 6
40147- 0 0 0 0 0 0 0 0 0 0 0 0
40148- 0 0 0 0 0 0 0 0 0 0 0 0
40149- 0 0 0 0 0 0 0 0 0 0 0 0
40150- 0 0 0 0 0 0 0 0 0 0 0 0
40151- 0 0 0 0 0 0 0 0 0 0 0 0
40152- 0 0 0 0 0 0 0 0 0 0 0 0
40153- 0 0 0 0 0 0 0 0 0 0 0 0
40154- 0 0 0 0 0 0 0 0 0 0 0 0
40155- 0 0 0 0 0 0 0 0 0 0 0 0
40156- 6 6 6 14 14 14 38 38 38 82 82 82
40157- 34 34 34 2 2 6 2 2 6 2 2 6
40158- 42 42 42 195 195 195 246 246 246 253 253 253
40159-253 253 253 253 253 253 253 253 253 250 250 250
40160-242 242 242 242 242 242 250 250 250 253 253 253
40161-253 253 253 253 253 253 253 253 253 253 253 253
40162-253 253 253 250 250 250 246 246 246 238 238 238
40163-226 226 226 231 231 231 101 101 101 6 6 6
40164- 2 2 6 2 2 6 2 2 6 2 2 6
40165- 2 2 6 2 2 6 2 2 6 2 2 6
40166- 38 38 38 82 82 82 42 42 42 14 14 14
40167- 6 6 6 0 0 0 0 0 0 0 0 0
40168- 0 0 0 0 0 0 0 0 0 0 0 0
40169- 0 0 0 0 0 0 0 0 0 0 0 0
40170- 0 0 0 0 0 0 0 0 0 0 0 0
40171- 0 0 0 0 0 0 0 0 0 0 0 0
40172- 0 0 0 0 0 0 0 0 0 0 0 0
40173- 0 0 0 0 0 0 0 0 0 0 0 0
40174- 0 0 0 0 0 0 0 0 0 0 0 0
40175- 0 0 0 0 0 0 0 0 0 0 0 0
40176- 10 10 10 26 26 26 62 62 62 66 66 66
40177- 2 2 6 2 2 6 2 2 6 6 6 6
40178- 70 70 70 170 170 170 206 206 206 234 234 234
40179-246 246 246 250 250 250 250 250 250 238 238 238
40180-226 226 226 231 231 231 238 238 238 250 250 250
40181-250 250 250 250 250 250 246 246 246 231 231 231
40182-214 214 214 206 206 206 202 202 202 202 202 202
40183-198 198 198 202 202 202 182 182 182 18 18 18
40184- 2 2 6 2 2 6 2 2 6 2 2 6
40185- 2 2 6 2 2 6 2 2 6 2 2 6
40186- 2 2 6 62 62 62 66 66 66 30 30 30
40187- 10 10 10 0 0 0 0 0 0 0 0 0
40188- 0 0 0 0 0 0 0 0 0 0 0 0
40189- 0 0 0 0 0 0 0 0 0 0 0 0
40190- 0 0 0 0 0 0 0 0 0 0 0 0
40191- 0 0 0 0 0 0 0 0 0 0 0 0
40192- 0 0 0 0 0 0 0 0 0 0 0 0
40193- 0 0 0 0 0 0 0 0 0 0 0 0
40194- 0 0 0 0 0 0 0 0 0 0 0 0
40195- 0 0 0 0 0 0 0 0 0 0 0 0
40196- 14 14 14 42 42 42 82 82 82 18 18 18
40197- 2 2 6 2 2 6 2 2 6 10 10 10
40198- 94 94 94 182 182 182 218 218 218 242 242 242
40199-250 250 250 253 253 253 253 253 253 250 250 250
40200-234 234 234 253 253 253 253 253 253 253 253 253
40201-253 253 253 253 253 253 253 253 253 246 246 246
40202-238 238 238 226 226 226 210 210 210 202 202 202
40203-195 195 195 195 195 195 210 210 210 158 158 158
40204- 6 6 6 14 14 14 50 50 50 14 14 14
40205- 2 2 6 2 2 6 2 2 6 2 2 6
40206- 2 2 6 6 6 6 86 86 86 46 46 46
40207- 18 18 18 6 6 6 0 0 0 0 0 0
40208- 0 0 0 0 0 0 0 0 0 0 0 0
40209- 0 0 0 0 0 0 0 0 0 0 0 0
40210- 0 0 0 0 0 0 0 0 0 0 0 0
40211- 0 0 0 0 0 0 0 0 0 0 0 0
40212- 0 0 0 0 0 0 0 0 0 0 0 0
40213- 0 0 0 0 0 0 0 0 0 0 0 0
40214- 0 0 0 0 0 0 0 0 0 0 0 0
40215- 0 0 0 0 0 0 0 0 0 6 6 6
40216- 22 22 22 54 54 54 70 70 70 2 2 6
40217- 2 2 6 10 10 10 2 2 6 22 22 22
40218-166 166 166 231 231 231 250 250 250 253 253 253
40219-253 253 253 253 253 253 253 253 253 250 250 250
40220-242 242 242 253 253 253 253 253 253 253 253 253
40221-253 253 253 253 253 253 253 253 253 253 253 253
40222-253 253 253 253 253 253 253 253 253 246 246 246
40223-231 231 231 206 206 206 198 198 198 226 226 226
40224- 94 94 94 2 2 6 6 6 6 38 38 38
40225- 30 30 30 2 2 6 2 2 6 2 2 6
40226- 2 2 6 2 2 6 62 62 62 66 66 66
40227- 26 26 26 10 10 10 0 0 0 0 0 0
40228- 0 0 0 0 0 0 0 0 0 0 0 0
40229- 0 0 0 0 0 0 0 0 0 0 0 0
40230- 0 0 0 0 0 0 0 0 0 0 0 0
40231- 0 0 0 0 0 0 0 0 0 0 0 0
40232- 0 0 0 0 0 0 0 0 0 0 0 0
40233- 0 0 0 0 0 0 0 0 0 0 0 0
40234- 0 0 0 0 0 0 0 0 0 0 0 0
40235- 0 0 0 0 0 0 0 0 0 10 10 10
40236- 30 30 30 74 74 74 50 50 50 2 2 6
40237- 26 26 26 26 26 26 2 2 6 106 106 106
40238-238 238 238 253 253 253 253 253 253 253 253 253
40239-253 253 253 253 253 253 253 253 253 253 253 253
40240-253 253 253 253 253 253 253 253 253 253 253 253
40241-253 253 253 253 253 253 253 253 253 253 253 253
40242-253 253 253 253 253 253 253 253 253 253 253 253
40243-253 253 253 246 246 246 218 218 218 202 202 202
40244-210 210 210 14 14 14 2 2 6 2 2 6
40245- 30 30 30 22 22 22 2 2 6 2 2 6
40246- 2 2 6 2 2 6 18 18 18 86 86 86
40247- 42 42 42 14 14 14 0 0 0 0 0 0
40248- 0 0 0 0 0 0 0 0 0 0 0 0
40249- 0 0 0 0 0 0 0 0 0 0 0 0
40250- 0 0 0 0 0 0 0 0 0 0 0 0
40251- 0 0 0 0 0 0 0 0 0 0 0 0
40252- 0 0 0 0 0 0 0 0 0 0 0 0
40253- 0 0 0 0 0 0 0 0 0 0 0 0
40254- 0 0 0 0 0 0 0 0 0 0 0 0
40255- 0 0 0 0 0 0 0 0 0 14 14 14
40256- 42 42 42 90 90 90 22 22 22 2 2 6
40257- 42 42 42 2 2 6 18 18 18 218 218 218
40258-253 253 253 253 253 253 253 253 253 253 253 253
40259-253 253 253 253 253 253 253 253 253 253 253 253
40260-253 253 253 253 253 253 253 253 253 253 253 253
40261-253 253 253 253 253 253 253 253 253 253 253 253
40262-253 253 253 253 253 253 253 253 253 253 253 253
40263-253 253 253 253 253 253 250 250 250 221 221 221
40264-218 218 218 101 101 101 2 2 6 14 14 14
40265- 18 18 18 38 38 38 10 10 10 2 2 6
40266- 2 2 6 2 2 6 2 2 6 78 78 78
40267- 58 58 58 22 22 22 6 6 6 0 0 0
40268- 0 0 0 0 0 0 0 0 0 0 0 0
40269- 0 0 0 0 0 0 0 0 0 0 0 0
40270- 0 0 0 0 0 0 0 0 0 0 0 0
40271- 0 0 0 0 0 0 0 0 0 0 0 0
40272- 0 0 0 0 0 0 0 0 0 0 0 0
40273- 0 0 0 0 0 0 0 0 0 0 0 0
40274- 0 0 0 0 0 0 0 0 0 0 0 0
40275- 0 0 0 0 0 0 6 6 6 18 18 18
40276- 54 54 54 82 82 82 2 2 6 26 26 26
40277- 22 22 22 2 2 6 123 123 123 253 253 253
40278-253 253 253 253 253 253 253 253 253 253 253 253
40279-253 253 253 253 253 253 253 253 253 253 253 253
40280-253 253 253 253 253 253 253 253 253 253 253 253
40281-253 253 253 253 253 253 253 253 253 253 253 253
40282-253 253 253 253 253 253 253 253 253 253 253 253
40283-253 253 253 253 253 253 253 253 253 250 250 250
40284-238 238 238 198 198 198 6 6 6 38 38 38
40285- 58 58 58 26 26 26 38 38 38 2 2 6
40286- 2 2 6 2 2 6 2 2 6 46 46 46
40287- 78 78 78 30 30 30 10 10 10 0 0 0
40288- 0 0 0 0 0 0 0 0 0 0 0 0
40289- 0 0 0 0 0 0 0 0 0 0 0 0
40290- 0 0 0 0 0 0 0 0 0 0 0 0
40291- 0 0 0 0 0 0 0 0 0 0 0 0
40292- 0 0 0 0 0 0 0 0 0 0 0 0
40293- 0 0 0 0 0 0 0 0 0 0 0 0
40294- 0 0 0 0 0 0 0 0 0 0 0 0
40295- 0 0 0 0 0 0 10 10 10 30 30 30
40296- 74 74 74 58 58 58 2 2 6 42 42 42
40297- 2 2 6 22 22 22 231 231 231 253 253 253
40298-253 253 253 253 253 253 253 253 253 253 253 253
40299-253 253 253 253 253 253 253 253 253 250 250 250
40300-253 253 253 253 253 253 253 253 253 253 253 253
40301-253 253 253 253 253 253 253 253 253 253 253 253
40302-253 253 253 253 253 253 253 253 253 253 253 253
40303-253 253 253 253 253 253 253 253 253 253 253 253
40304-253 253 253 246 246 246 46 46 46 38 38 38
40305- 42 42 42 14 14 14 38 38 38 14 14 14
40306- 2 2 6 2 2 6 2 2 6 6 6 6
40307- 86 86 86 46 46 46 14 14 14 0 0 0
40308- 0 0 0 0 0 0 0 0 0 0 0 0
40309- 0 0 0 0 0 0 0 0 0 0 0 0
40310- 0 0 0 0 0 0 0 0 0 0 0 0
40311- 0 0 0 0 0 0 0 0 0 0 0 0
40312- 0 0 0 0 0 0 0 0 0 0 0 0
40313- 0 0 0 0 0 0 0 0 0 0 0 0
40314- 0 0 0 0 0 0 0 0 0 0 0 0
40315- 0 0 0 6 6 6 14 14 14 42 42 42
40316- 90 90 90 18 18 18 18 18 18 26 26 26
40317- 2 2 6 116 116 116 253 253 253 253 253 253
40318-253 253 253 253 253 253 253 253 253 253 253 253
40319-253 253 253 253 253 253 250 250 250 238 238 238
40320-253 253 253 253 253 253 253 253 253 253 253 253
40321-253 253 253 253 253 253 253 253 253 253 253 253
40322-253 253 253 253 253 253 253 253 253 253 253 253
40323-253 253 253 253 253 253 253 253 253 253 253 253
40324-253 253 253 253 253 253 94 94 94 6 6 6
40325- 2 2 6 2 2 6 10 10 10 34 34 34
40326- 2 2 6 2 2 6 2 2 6 2 2 6
40327- 74 74 74 58 58 58 22 22 22 6 6 6
40328- 0 0 0 0 0 0 0 0 0 0 0 0
40329- 0 0 0 0 0 0 0 0 0 0 0 0
40330- 0 0 0 0 0 0 0 0 0 0 0 0
40331- 0 0 0 0 0 0 0 0 0 0 0 0
40332- 0 0 0 0 0 0 0 0 0 0 0 0
40333- 0 0 0 0 0 0 0 0 0 0 0 0
40334- 0 0 0 0 0 0 0 0 0 0 0 0
40335- 0 0 0 10 10 10 26 26 26 66 66 66
40336- 82 82 82 2 2 6 38 38 38 6 6 6
40337- 14 14 14 210 210 210 253 253 253 253 253 253
40338-253 253 253 253 253 253 253 253 253 253 253 253
40339-253 253 253 253 253 253 246 246 246 242 242 242
40340-253 253 253 253 253 253 253 253 253 253 253 253
40341-253 253 253 253 253 253 253 253 253 253 253 253
40342-253 253 253 253 253 253 253 253 253 253 253 253
40343-253 253 253 253 253 253 253 253 253 253 253 253
40344-253 253 253 253 253 253 144 144 144 2 2 6
40345- 2 2 6 2 2 6 2 2 6 46 46 46
40346- 2 2 6 2 2 6 2 2 6 2 2 6
40347- 42 42 42 74 74 74 30 30 30 10 10 10
40348- 0 0 0 0 0 0 0 0 0 0 0 0
40349- 0 0 0 0 0 0 0 0 0 0 0 0
40350- 0 0 0 0 0 0 0 0 0 0 0 0
40351- 0 0 0 0 0 0 0 0 0 0 0 0
40352- 0 0 0 0 0 0 0 0 0 0 0 0
40353- 0 0 0 0 0 0 0 0 0 0 0 0
40354- 0 0 0 0 0 0 0 0 0 0 0 0
40355- 6 6 6 14 14 14 42 42 42 90 90 90
40356- 26 26 26 6 6 6 42 42 42 2 2 6
40357- 74 74 74 250 250 250 253 253 253 253 253 253
40358-253 253 253 253 253 253 253 253 253 253 253 253
40359-253 253 253 253 253 253 242 242 242 242 242 242
40360-253 253 253 253 253 253 253 253 253 253 253 253
40361-253 253 253 253 253 253 253 253 253 253 253 253
40362-253 253 253 253 253 253 253 253 253 253 253 253
40363-253 253 253 253 253 253 253 253 253 253 253 253
40364-253 253 253 253 253 253 182 182 182 2 2 6
40365- 2 2 6 2 2 6 2 2 6 46 46 46
40366- 2 2 6 2 2 6 2 2 6 2 2 6
40367- 10 10 10 86 86 86 38 38 38 10 10 10
40368- 0 0 0 0 0 0 0 0 0 0 0 0
40369- 0 0 0 0 0 0 0 0 0 0 0 0
40370- 0 0 0 0 0 0 0 0 0 0 0 0
40371- 0 0 0 0 0 0 0 0 0 0 0 0
40372- 0 0 0 0 0 0 0 0 0 0 0 0
40373- 0 0 0 0 0 0 0 0 0 0 0 0
40374- 0 0 0 0 0 0 0 0 0 0 0 0
40375- 10 10 10 26 26 26 66 66 66 82 82 82
40376- 2 2 6 22 22 22 18 18 18 2 2 6
40377-149 149 149 253 253 253 253 253 253 253 253 253
40378-253 253 253 253 253 253 253 253 253 253 253 253
40379-253 253 253 253 253 253 234 234 234 242 242 242
40380-253 253 253 253 253 253 253 253 253 253 253 253
40381-253 253 253 253 253 253 253 253 253 253 253 253
40382-253 253 253 253 253 253 253 253 253 253 253 253
40383-253 253 253 253 253 253 253 253 253 253 253 253
40384-253 253 253 253 253 253 206 206 206 2 2 6
40385- 2 2 6 2 2 6 2 2 6 38 38 38
40386- 2 2 6 2 2 6 2 2 6 2 2 6
40387- 6 6 6 86 86 86 46 46 46 14 14 14
40388- 0 0 0 0 0 0 0 0 0 0 0 0
40389- 0 0 0 0 0 0 0 0 0 0 0 0
40390- 0 0 0 0 0 0 0 0 0 0 0 0
40391- 0 0 0 0 0 0 0 0 0 0 0 0
40392- 0 0 0 0 0 0 0 0 0 0 0 0
40393- 0 0 0 0 0 0 0 0 0 0 0 0
40394- 0 0 0 0 0 0 0 0 0 6 6 6
40395- 18 18 18 46 46 46 86 86 86 18 18 18
40396- 2 2 6 34 34 34 10 10 10 6 6 6
40397-210 210 210 253 253 253 253 253 253 253 253 253
40398-253 253 253 253 253 253 253 253 253 253 253 253
40399-253 253 253 253 253 253 234 234 234 242 242 242
40400-253 253 253 253 253 253 253 253 253 253 253 253
40401-253 253 253 253 253 253 253 253 253 253 253 253
40402-253 253 253 253 253 253 253 253 253 253 253 253
40403-253 253 253 253 253 253 253 253 253 253 253 253
40404-253 253 253 253 253 253 221 221 221 6 6 6
40405- 2 2 6 2 2 6 6 6 6 30 30 30
40406- 2 2 6 2 2 6 2 2 6 2 2 6
40407- 2 2 6 82 82 82 54 54 54 18 18 18
40408- 6 6 6 0 0 0 0 0 0 0 0 0
40409- 0 0 0 0 0 0 0 0 0 0 0 0
40410- 0 0 0 0 0 0 0 0 0 0 0 0
40411- 0 0 0 0 0 0 0 0 0 0 0 0
40412- 0 0 0 0 0 0 0 0 0 0 0 0
40413- 0 0 0 0 0 0 0 0 0 0 0 0
40414- 0 0 0 0 0 0 0 0 0 10 10 10
40415- 26 26 26 66 66 66 62 62 62 2 2 6
40416- 2 2 6 38 38 38 10 10 10 26 26 26
40417-238 238 238 253 253 253 253 253 253 253 253 253
40418-253 253 253 253 253 253 253 253 253 253 253 253
40419-253 253 253 253 253 253 231 231 231 238 238 238
40420-253 253 253 253 253 253 253 253 253 253 253 253
40421-253 253 253 253 253 253 253 253 253 253 253 253
40422-253 253 253 253 253 253 253 253 253 253 253 253
40423-253 253 253 253 253 253 253 253 253 253 253 253
40424-253 253 253 253 253 253 231 231 231 6 6 6
40425- 2 2 6 2 2 6 10 10 10 30 30 30
40426- 2 2 6 2 2 6 2 2 6 2 2 6
40427- 2 2 6 66 66 66 58 58 58 22 22 22
40428- 6 6 6 0 0 0 0 0 0 0 0 0
40429- 0 0 0 0 0 0 0 0 0 0 0 0
40430- 0 0 0 0 0 0 0 0 0 0 0 0
40431- 0 0 0 0 0 0 0 0 0 0 0 0
40432- 0 0 0 0 0 0 0 0 0 0 0 0
40433- 0 0 0 0 0 0 0 0 0 0 0 0
40434- 0 0 0 0 0 0 0 0 0 10 10 10
40435- 38 38 38 78 78 78 6 6 6 2 2 6
40436- 2 2 6 46 46 46 14 14 14 42 42 42
40437-246 246 246 253 253 253 253 253 253 253 253 253
40438-253 253 253 253 253 253 253 253 253 253 253 253
40439-253 253 253 253 253 253 231 231 231 242 242 242
40440-253 253 253 253 253 253 253 253 253 253 253 253
40441-253 253 253 253 253 253 253 253 253 253 253 253
40442-253 253 253 253 253 253 253 253 253 253 253 253
40443-253 253 253 253 253 253 253 253 253 253 253 253
40444-253 253 253 253 253 253 234 234 234 10 10 10
40445- 2 2 6 2 2 6 22 22 22 14 14 14
40446- 2 2 6 2 2 6 2 2 6 2 2 6
40447- 2 2 6 66 66 66 62 62 62 22 22 22
40448- 6 6 6 0 0 0 0 0 0 0 0 0
40449- 0 0 0 0 0 0 0 0 0 0 0 0
40450- 0 0 0 0 0 0 0 0 0 0 0 0
40451- 0 0 0 0 0 0 0 0 0 0 0 0
40452- 0 0 0 0 0 0 0 0 0 0 0 0
40453- 0 0 0 0 0 0 0 0 0 0 0 0
40454- 0 0 0 0 0 0 6 6 6 18 18 18
40455- 50 50 50 74 74 74 2 2 6 2 2 6
40456- 14 14 14 70 70 70 34 34 34 62 62 62
40457-250 250 250 253 253 253 253 253 253 253 253 253
40458-253 253 253 253 253 253 253 253 253 253 253 253
40459-253 253 253 253 253 253 231 231 231 246 246 246
40460-253 253 253 253 253 253 253 253 253 253 253 253
40461-253 253 253 253 253 253 253 253 253 253 253 253
40462-253 253 253 253 253 253 253 253 253 253 253 253
40463-253 253 253 253 253 253 253 253 253 253 253 253
40464-253 253 253 253 253 253 234 234 234 14 14 14
40465- 2 2 6 2 2 6 30 30 30 2 2 6
40466- 2 2 6 2 2 6 2 2 6 2 2 6
40467- 2 2 6 66 66 66 62 62 62 22 22 22
40468- 6 6 6 0 0 0 0 0 0 0 0 0
40469- 0 0 0 0 0 0 0 0 0 0 0 0
40470- 0 0 0 0 0 0 0 0 0 0 0 0
40471- 0 0 0 0 0 0 0 0 0 0 0 0
40472- 0 0 0 0 0 0 0 0 0 0 0 0
40473- 0 0 0 0 0 0 0 0 0 0 0 0
40474- 0 0 0 0 0 0 6 6 6 18 18 18
40475- 54 54 54 62 62 62 2 2 6 2 2 6
40476- 2 2 6 30 30 30 46 46 46 70 70 70
40477-250 250 250 253 253 253 253 253 253 253 253 253
40478-253 253 253 253 253 253 253 253 253 253 253 253
40479-253 253 253 253 253 253 231 231 231 246 246 246
40480-253 253 253 253 253 253 253 253 253 253 253 253
40481-253 253 253 253 253 253 253 253 253 253 253 253
40482-253 253 253 253 253 253 253 253 253 253 253 253
40483-253 253 253 253 253 253 253 253 253 253 253 253
40484-253 253 253 253 253 253 226 226 226 10 10 10
40485- 2 2 6 6 6 6 30 30 30 2 2 6
40486- 2 2 6 2 2 6 2 2 6 2 2 6
40487- 2 2 6 66 66 66 58 58 58 22 22 22
40488- 6 6 6 0 0 0 0 0 0 0 0 0
40489- 0 0 0 0 0 0 0 0 0 0 0 0
40490- 0 0 0 0 0 0 0 0 0 0 0 0
40491- 0 0 0 0 0 0 0 0 0 0 0 0
40492- 0 0 0 0 0 0 0 0 0 0 0 0
40493- 0 0 0 0 0 0 0 0 0 0 0 0
40494- 0 0 0 0 0 0 6 6 6 22 22 22
40495- 58 58 58 62 62 62 2 2 6 2 2 6
40496- 2 2 6 2 2 6 30 30 30 78 78 78
40497-250 250 250 253 253 253 253 253 253 253 253 253
40498-253 253 253 253 253 253 253 253 253 253 253 253
40499-253 253 253 253 253 253 231 231 231 246 246 246
40500-253 253 253 253 253 253 253 253 253 253 253 253
40501-253 253 253 253 253 253 253 253 253 253 253 253
40502-253 253 253 253 253 253 253 253 253 253 253 253
40503-253 253 253 253 253 253 253 253 253 253 253 253
40504-253 253 253 253 253 253 206 206 206 2 2 6
40505- 22 22 22 34 34 34 18 14 6 22 22 22
40506- 26 26 26 18 18 18 6 6 6 2 2 6
40507- 2 2 6 82 82 82 54 54 54 18 18 18
40508- 6 6 6 0 0 0 0 0 0 0 0 0
40509- 0 0 0 0 0 0 0 0 0 0 0 0
40510- 0 0 0 0 0 0 0 0 0 0 0 0
40511- 0 0 0 0 0 0 0 0 0 0 0 0
40512- 0 0 0 0 0 0 0 0 0 0 0 0
40513- 0 0 0 0 0 0 0 0 0 0 0 0
40514- 0 0 0 0 0 0 6 6 6 26 26 26
40515- 62 62 62 106 106 106 74 54 14 185 133 11
40516-210 162 10 121 92 8 6 6 6 62 62 62
40517-238 238 238 253 253 253 253 253 253 253 253 253
40518-253 253 253 253 253 253 253 253 253 253 253 253
40519-253 253 253 253 253 253 231 231 231 246 246 246
40520-253 253 253 253 253 253 253 253 253 253 253 253
40521-253 253 253 253 253 253 253 253 253 253 253 253
40522-253 253 253 253 253 253 253 253 253 253 253 253
40523-253 253 253 253 253 253 253 253 253 253 253 253
40524-253 253 253 253 253 253 158 158 158 18 18 18
40525- 14 14 14 2 2 6 2 2 6 2 2 6
40526- 6 6 6 18 18 18 66 66 66 38 38 38
40527- 6 6 6 94 94 94 50 50 50 18 18 18
40528- 6 6 6 0 0 0 0 0 0 0 0 0
40529- 0 0 0 0 0 0 0 0 0 0 0 0
40530- 0 0 0 0 0 0 0 0 0 0 0 0
40531- 0 0 0 0 0 0 0 0 0 0 0 0
40532- 0 0 0 0 0 0 0 0 0 0 0 0
40533- 0 0 0 0 0 0 0 0 0 6 6 6
40534- 10 10 10 10 10 10 18 18 18 38 38 38
40535- 78 78 78 142 134 106 216 158 10 242 186 14
40536-246 190 14 246 190 14 156 118 10 10 10 10
40537- 90 90 90 238 238 238 253 253 253 253 253 253
40538-253 253 253 253 253 253 253 253 253 253 253 253
40539-253 253 253 253 253 253 231 231 231 250 250 250
40540-253 253 253 253 253 253 253 253 253 253 253 253
40541-253 253 253 253 253 253 253 253 253 253 253 253
40542-253 253 253 253 253 253 253 253 253 253 253 253
40543-253 253 253 253 253 253 253 253 253 246 230 190
40544-238 204 91 238 204 91 181 142 44 37 26 9
40545- 2 2 6 2 2 6 2 2 6 2 2 6
40546- 2 2 6 2 2 6 38 38 38 46 46 46
40547- 26 26 26 106 106 106 54 54 54 18 18 18
40548- 6 6 6 0 0 0 0 0 0 0 0 0
40549- 0 0 0 0 0 0 0 0 0 0 0 0
40550- 0 0 0 0 0 0 0 0 0 0 0 0
40551- 0 0 0 0 0 0 0 0 0 0 0 0
40552- 0 0 0 0 0 0 0 0 0 0 0 0
40553- 0 0 0 6 6 6 14 14 14 22 22 22
40554- 30 30 30 38 38 38 50 50 50 70 70 70
40555-106 106 106 190 142 34 226 170 11 242 186 14
40556-246 190 14 246 190 14 246 190 14 154 114 10
40557- 6 6 6 74 74 74 226 226 226 253 253 253
40558-253 253 253 253 253 253 253 253 253 253 253 253
40559-253 253 253 253 253 253 231 231 231 250 250 250
40560-253 253 253 253 253 253 253 253 253 253 253 253
40561-253 253 253 253 253 253 253 253 253 253 253 253
40562-253 253 253 253 253 253 253 253 253 253 253 253
40563-253 253 253 253 253 253 253 253 253 228 184 62
40564-241 196 14 241 208 19 232 195 16 38 30 10
40565- 2 2 6 2 2 6 2 2 6 2 2 6
40566- 2 2 6 6 6 6 30 30 30 26 26 26
40567-203 166 17 154 142 90 66 66 66 26 26 26
40568- 6 6 6 0 0 0 0 0 0 0 0 0
40569- 0 0 0 0 0 0 0 0 0 0 0 0
40570- 0 0 0 0 0 0 0 0 0 0 0 0
40571- 0 0 0 0 0 0 0 0 0 0 0 0
40572- 0 0 0 0 0 0 0 0 0 0 0 0
40573- 6 6 6 18 18 18 38 38 38 58 58 58
40574- 78 78 78 86 86 86 101 101 101 123 123 123
40575-175 146 61 210 150 10 234 174 13 246 186 14
40576-246 190 14 246 190 14 246 190 14 238 190 10
40577-102 78 10 2 2 6 46 46 46 198 198 198
40578-253 253 253 253 253 253 253 253 253 253 253 253
40579-253 253 253 253 253 253 234 234 234 242 242 242
40580-253 253 253 253 253 253 253 253 253 253 253 253
40581-253 253 253 253 253 253 253 253 253 253 253 253
40582-253 253 253 253 253 253 253 253 253 253 253 253
40583-253 253 253 253 253 253 253 253 253 224 178 62
40584-242 186 14 241 196 14 210 166 10 22 18 6
40585- 2 2 6 2 2 6 2 2 6 2 2 6
40586- 2 2 6 2 2 6 6 6 6 121 92 8
40587-238 202 15 232 195 16 82 82 82 34 34 34
40588- 10 10 10 0 0 0 0 0 0 0 0 0
40589- 0 0 0 0 0 0 0 0 0 0 0 0
40590- 0 0 0 0 0 0 0 0 0 0 0 0
40591- 0 0 0 0 0 0 0 0 0 0 0 0
40592- 0 0 0 0 0 0 0 0 0 0 0 0
40593- 14 14 14 38 38 38 70 70 70 154 122 46
40594-190 142 34 200 144 11 197 138 11 197 138 11
40595-213 154 11 226 170 11 242 186 14 246 190 14
40596-246 190 14 246 190 14 246 190 14 246 190 14
40597-225 175 15 46 32 6 2 2 6 22 22 22
40598-158 158 158 250 250 250 253 253 253 253 253 253
40599-253 253 253 253 253 253 253 253 253 253 253 253
40600-253 253 253 253 253 253 253 253 253 253 253 253
40601-253 253 253 253 253 253 253 253 253 253 253 253
40602-253 253 253 253 253 253 253 253 253 253 253 253
40603-253 253 253 250 250 250 242 242 242 224 178 62
40604-239 182 13 236 186 11 213 154 11 46 32 6
40605- 2 2 6 2 2 6 2 2 6 2 2 6
40606- 2 2 6 2 2 6 61 42 6 225 175 15
40607-238 190 10 236 186 11 112 100 78 42 42 42
40608- 14 14 14 0 0 0 0 0 0 0 0 0
40609- 0 0 0 0 0 0 0 0 0 0 0 0
40610- 0 0 0 0 0 0 0 0 0 0 0 0
40611- 0 0 0 0 0 0 0 0 0 0 0 0
40612- 0 0 0 0 0 0 0 0 0 6 6 6
40613- 22 22 22 54 54 54 154 122 46 213 154 11
40614-226 170 11 230 174 11 226 170 11 226 170 11
40615-236 178 12 242 186 14 246 190 14 246 190 14
40616-246 190 14 246 190 14 246 190 14 246 190 14
40617-241 196 14 184 144 12 10 10 10 2 2 6
40618- 6 6 6 116 116 116 242 242 242 253 253 253
40619-253 253 253 253 253 253 253 253 253 253 253 253
40620-253 253 253 253 253 253 253 253 253 253 253 253
40621-253 253 253 253 253 253 253 253 253 253 253 253
40622-253 253 253 253 253 253 253 253 253 253 253 253
40623-253 253 253 231 231 231 198 198 198 214 170 54
40624-236 178 12 236 178 12 210 150 10 137 92 6
40625- 18 14 6 2 2 6 2 2 6 2 2 6
40626- 6 6 6 70 47 6 200 144 11 236 178 12
40627-239 182 13 239 182 13 124 112 88 58 58 58
40628- 22 22 22 6 6 6 0 0 0 0 0 0
40629- 0 0 0 0 0 0 0 0 0 0 0 0
40630- 0 0 0 0 0 0 0 0 0 0 0 0
40631- 0 0 0 0 0 0 0 0 0 0 0 0
40632- 0 0 0 0 0 0 0 0 0 10 10 10
40633- 30 30 30 70 70 70 180 133 36 226 170 11
40634-239 182 13 242 186 14 242 186 14 246 186 14
40635-246 190 14 246 190 14 246 190 14 246 190 14
40636-246 190 14 246 190 14 246 190 14 246 190 14
40637-246 190 14 232 195 16 98 70 6 2 2 6
40638- 2 2 6 2 2 6 66 66 66 221 221 221
40639-253 253 253 253 253 253 253 253 253 253 253 253
40640-253 253 253 253 253 253 253 253 253 253 253 253
40641-253 253 253 253 253 253 253 253 253 253 253 253
40642-253 253 253 253 253 253 253 253 253 253 253 253
40643-253 253 253 206 206 206 198 198 198 214 166 58
40644-230 174 11 230 174 11 216 158 10 192 133 9
40645-163 110 8 116 81 8 102 78 10 116 81 8
40646-167 114 7 197 138 11 226 170 11 239 182 13
40647-242 186 14 242 186 14 162 146 94 78 78 78
40648- 34 34 34 14 14 14 6 6 6 0 0 0
40649- 0 0 0 0 0 0 0 0 0 0 0 0
40650- 0 0 0 0 0 0 0 0 0 0 0 0
40651- 0 0 0 0 0 0 0 0 0 0 0 0
40652- 0 0 0 0 0 0 0 0 0 6 6 6
40653- 30 30 30 78 78 78 190 142 34 226 170 11
40654-239 182 13 246 190 14 246 190 14 246 190 14
40655-246 190 14 246 190 14 246 190 14 246 190 14
40656-246 190 14 246 190 14 246 190 14 246 190 14
40657-246 190 14 241 196 14 203 166 17 22 18 6
40658- 2 2 6 2 2 6 2 2 6 38 38 38
40659-218 218 218 253 253 253 253 253 253 253 253 253
40660-253 253 253 253 253 253 253 253 253 253 253 253
40661-253 253 253 253 253 253 253 253 253 253 253 253
40662-253 253 253 253 253 253 253 253 253 253 253 253
40663-250 250 250 206 206 206 198 198 198 202 162 69
40664-226 170 11 236 178 12 224 166 10 210 150 10
40665-200 144 11 197 138 11 192 133 9 197 138 11
40666-210 150 10 226 170 11 242 186 14 246 190 14
40667-246 190 14 246 186 14 225 175 15 124 112 88
40668- 62 62 62 30 30 30 14 14 14 6 6 6
40669- 0 0 0 0 0 0 0 0 0 0 0 0
40670- 0 0 0 0 0 0 0 0 0 0 0 0
40671- 0 0 0 0 0 0 0 0 0 0 0 0
40672- 0 0 0 0 0 0 0 0 0 10 10 10
40673- 30 30 30 78 78 78 174 135 50 224 166 10
40674-239 182 13 246 190 14 246 190 14 246 190 14
40675-246 190 14 246 190 14 246 190 14 246 190 14
40676-246 190 14 246 190 14 246 190 14 246 190 14
40677-246 190 14 246 190 14 241 196 14 139 102 15
40678- 2 2 6 2 2 6 2 2 6 2 2 6
40679- 78 78 78 250 250 250 253 253 253 253 253 253
40680-253 253 253 253 253 253 253 253 253 253 253 253
40681-253 253 253 253 253 253 253 253 253 253 253 253
40682-253 253 253 253 253 253 253 253 253 253 253 253
40683-250 250 250 214 214 214 198 198 198 190 150 46
40684-219 162 10 236 178 12 234 174 13 224 166 10
40685-216 158 10 213 154 11 213 154 11 216 158 10
40686-226 170 11 239 182 13 246 190 14 246 190 14
40687-246 190 14 246 190 14 242 186 14 206 162 42
40688-101 101 101 58 58 58 30 30 30 14 14 14
40689- 6 6 6 0 0 0 0 0 0 0 0 0
40690- 0 0 0 0 0 0 0 0 0 0 0 0
40691- 0 0 0 0 0 0 0 0 0 0 0 0
40692- 0 0 0 0 0 0 0 0 0 10 10 10
40693- 30 30 30 74 74 74 174 135 50 216 158 10
40694-236 178 12 246 190 14 246 190 14 246 190 14
40695-246 190 14 246 190 14 246 190 14 246 190 14
40696-246 190 14 246 190 14 246 190 14 246 190 14
40697-246 190 14 246 190 14 241 196 14 226 184 13
40698- 61 42 6 2 2 6 2 2 6 2 2 6
40699- 22 22 22 238 238 238 253 253 253 253 253 253
40700-253 253 253 253 253 253 253 253 253 253 253 253
40701-253 253 253 253 253 253 253 253 253 253 253 253
40702-253 253 253 253 253 253 253 253 253 253 253 253
40703-253 253 253 226 226 226 187 187 187 180 133 36
40704-216 158 10 236 178 12 239 182 13 236 178 12
40705-230 174 11 226 170 11 226 170 11 230 174 11
40706-236 178 12 242 186 14 246 190 14 246 190 14
40707-246 190 14 246 190 14 246 186 14 239 182 13
40708-206 162 42 106 106 106 66 66 66 34 34 34
40709- 14 14 14 6 6 6 0 0 0 0 0 0
40710- 0 0 0 0 0 0 0 0 0 0 0 0
40711- 0 0 0 0 0 0 0 0 0 0 0 0
40712- 0 0 0 0 0 0 0 0 0 6 6 6
40713- 26 26 26 70 70 70 163 133 67 213 154 11
40714-236 178 12 246 190 14 246 190 14 246 190 14
40715-246 190 14 246 190 14 246 190 14 246 190 14
40716-246 190 14 246 190 14 246 190 14 246 190 14
40717-246 190 14 246 190 14 246 190 14 241 196 14
40718-190 146 13 18 14 6 2 2 6 2 2 6
40719- 46 46 46 246 246 246 253 253 253 253 253 253
40720-253 253 253 253 253 253 253 253 253 253 253 253
40721-253 253 253 253 253 253 253 253 253 253 253 253
40722-253 253 253 253 253 253 253 253 253 253 253 253
40723-253 253 253 221 221 221 86 86 86 156 107 11
40724-216 158 10 236 178 12 242 186 14 246 186 14
40725-242 186 14 239 182 13 239 182 13 242 186 14
40726-242 186 14 246 186 14 246 190 14 246 190 14
40727-246 190 14 246 190 14 246 190 14 246 190 14
40728-242 186 14 225 175 15 142 122 72 66 66 66
40729- 30 30 30 10 10 10 0 0 0 0 0 0
40730- 0 0 0 0 0 0 0 0 0 0 0 0
40731- 0 0 0 0 0 0 0 0 0 0 0 0
40732- 0 0 0 0 0 0 0 0 0 6 6 6
40733- 26 26 26 70 70 70 163 133 67 210 150 10
40734-236 178 12 246 190 14 246 190 14 246 190 14
40735-246 190 14 246 190 14 246 190 14 246 190 14
40736-246 190 14 246 190 14 246 190 14 246 190 14
40737-246 190 14 246 190 14 246 190 14 246 190 14
40738-232 195 16 121 92 8 34 34 34 106 106 106
40739-221 221 221 253 253 253 253 253 253 253 253 253
40740-253 253 253 253 253 253 253 253 253 253 253 253
40741-253 253 253 253 253 253 253 253 253 253 253 253
40742-253 253 253 253 253 253 253 253 253 253 253 253
40743-242 242 242 82 82 82 18 14 6 163 110 8
40744-216 158 10 236 178 12 242 186 14 246 190 14
40745-246 190 14 246 190 14 246 190 14 246 190 14
40746-246 190 14 246 190 14 246 190 14 246 190 14
40747-246 190 14 246 190 14 246 190 14 246 190 14
40748-246 190 14 246 190 14 242 186 14 163 133 67
40749- 46 46 46 18 18 18 6 6 6 0 0 0
40750- 0 0 0 0 0 0 0 0 0 0 0 0
40751- 0 0 0 0 0 0 0 0 0 0 0 0
40752- 0 0 0 0 0 0 0 0 0 10 10 10
40753- 30 30 30 78 78 78 163 133 67 210 150 10
40754-236 178 12 246 186 14 246 190 14 246 190 14
40755-246 190 14 246 190 14 246 190 14 246 190 14
40756-246 190 14 246 190 14 246 190 14 246 190 14
40757-246 190 14 246 190 14 246 190 14 246 190 14
40758-241 196 14 215 174 15 190 178 144 253 253 253
40759-253 253 253 253 253 253 253 253 253 253 253 253
40760-253 253 253 253 253 253 253 253 253 253 253 253
40761-253 253 253 253 253 253 253 253 253 253 253 253
40762-253 253 253 253 253 253 253 253 253 218 218 218
40763- 58 58 58 2 2 6 22 18 6 167 114 7
40764-216 158 10 236 178 12 246 186 14 246 190 14
40765-246 190 14 246 190 14 246 190 14 246 190 14
40766-246 190 14 246 190 14 246 190 14 246 190 14
40767-246 190 14 246 190 14 246 190 14 246 190 14
40768-246 190 14 246 186 14 242 186 14 190 150 46
40769- 54 54 54 22 22 22 6 6 6 0 0 0
40770- 0 0 0 0 0 0 0 0 0 0 0 0
40771- 0 0 0 0 0 0 0 0 0 0 0 0
40772- 0 0 0 0 0 0 0 0 0 14 14 14
40773- 38 38 38 86 86 86 180 133 36 213 154 11
40774-236 178 12 246 186 14 246 190 14 246 190 14
40775-246 190 14 246 190 14 246 190 14 246 190 14
40776-246 190 14 246 190 14 246 190 14 246 190 14
40777-246 190 14 246 190 14 246 190 14 246 190 14
40778-246 190 14 232 195 16 190 146 13 214 214 214
40779-253 253 253 253 253 253 253 253 253 253 253 253
40780-253 253 253 253 253 253 253 253 253 253 253 253
40781-253 253 253 253 253 253 253 253 253 253 253 253
40782-253 253 253 250 250 250 170 170 170 26 26 26
40783- 2 2 6 2 2 6 37 26 9 163 110 8
40784-219 162 10 239 182 13 246 186 14 246 190 14
40785-246 190 14 246 190 14 246 190 14 246 190 14
40786-246 190 14 246 190 14 246 190 14 246 190 14
40787-246 190 14 246 190 14 246 190 14 246 190 14
40788-246 186 14 236 178 12 224 166 10 142 122 72
40789- 46 46 46 18 18 18 6 6 6 0 0 0
40790- 0 0 0 0 0 0 0 0 0 0 0 0
40791- 0 0 0 0 0 0 0 0 0 0 0 0
40792- 0 0 0 0 0 0 6 6 6 18 18 18
40793- 50 50 50 109 106 95 192 133 9 224 166 10
40794-242 186 14 246 190 14 246 190 14 246 190 14
40795-246 190 14 246 190 14 246 190 14 246 190 14
40796-246 190 14 246 190 14 246 190 14 246 190 14
40797-246 190 14 246 190 14 246 190 14 246 190 14
40798-242 186 14 226 184 13 210 162 10 142 110 46
40799-226 226 226 253 253 253 253 253 253 253 253 253
40800-253 253 253 253 253 253 253 253 253 253 253 253
40801-253 253 253 253 253 253 253 253 253 253 253 253
40802-198 198 198 66 66 66 2 2 6 2 2 6
40803- 2 2 6 2 2 6 50 34 6 156 107 11
40804-219 162 10 239 182 13 246 186 14 246 190 14
40805-246 190 14 246 190 14 246 190 14 246 190 14
40806-246 190 14 246 190 14 246 190 14 246 190 14
40807-246 190 14 246 190 14 246 190 14 242 186 14
40808-234 174 13 213 154 11 154 122 46 66 66 66
40809- 30 30 30 10 10 10 0 0 0 0 0 0
40810- 0 0 0 0 0 0 0 0 0 0 0 0
40811- 0 0 0 0 0 0 0 0 0 0 0 0
40812- 0 0 0 0 0 0 6 6 6 22 22 22
40813- 58 58 58 154 121 60 206 145 10 234 174 13
40814-242 186 14 246 186 14 246 190 14 246 190 14
40815-246 190 14 246 190 14 246 190 14 246 190 14
40816-246 190 14 246 190 14 246 190 14 246 190 14
40817-246 190 14 246 190 14 246 190 14 246 190 14
40818-246 186 14 236 178 12 210 162 10 163 110 8
40819- 61 42 6 138 138 138 218 218 218 250 250 250
40820-253 253 253 253 253 253 253 253 253 250 250 250
40821-242 242 242 210 210 210 144 144 144 66 66 66
40822- 6 6 6 2 2 6 2 2 6 2 2 6
40823- 2 2 6 2 2 6 61 42 6 163 110 8
40824-216 158 10 236 178 12 246 190 14 246 190 14
40825-246 190 14 246 190 14 246 190 14 246 190 14
40826-246 190 14 246 190 14 246 190 14 246 190 14
40827-246 190 14 239 182 13 230 174 11 216 158 10
40828-190 142 34 124 112 88 70 70 70 38 38 38
40829- 18 18 18 6 6 6 0 0 0 0 0 0
40830- 0 0 0 0 0 0 0 0 0 0 0 0
40831- 0 0 0 0 0 0 0 0 0 0 0 0
40832- 0 0 0 0 0 0 6 6 6 22 22 22
40833- 62 62 62 168 124 44 206 145 10 224 166 10
40834-236 178 12 239 182 13 242 186 14 242 186 14
40835-246 186 14 246 190 14 246 190 14 246 190 14
40836-246 190 14 246 190 14 246 190 14 246 190 14
40837-246 190 14 246 190 14 246 190 14 246 190 14
40838-246 190 14 236 178 12 216 158 10 175 118 6
40839- 80 54 7 2 2 6 6 6 6 30 30 30
40840- 54 54 54 62 62 62 50 50 50 38 38 38
40841- 14 14 14 2 2 6 2 2 6 2 2 6
40842- 2 2 6 2 2 6 2 2 6 2 2 6
40843- 2 2 6 6 6 6 80 54 7 167 114 7
40844-213 154 11 236 178 12 246 190 14 246 190 14
40845-246 190 14 246 190 14 246 190 14 246 190 14
40846-246 190 14 242 186 14 239 182 13 239 182 13
40847-230 174 11 210 150 10 174 135 50 124 112 88
40848- 82 82 82 54 54 54 34 34 34 18 18 18
40849- 6 6 6 0 0 0 0 0 0 0 0 0
40850- 0 0 0 0 0 0 0 0 0 0 0 0
40851- 0 0 0 0 0 0 0 0 0 0 0 0
40852- 0 0 0 0 0 0 6 6 6 18 18 18
40853- 50 50 50 158 118 36 192 133 9 200 144 11
40854-216 158 10 219 162 10 224 166 10 226 170 11
40855-230 174 11 236 178 12 239 182 13 239 182 13
40856-242 186 14 246 186 14 246 190 14 246 190 14
40857-246 190 14 246 190 14 246 190 14 246 190 14
40858-246 186 14 230 174 11 210 150 10 163 110 8
40859-104 69 6 10 10 10 2 2 6 2 2 6
40860- 2 2 6 2 2 6 2 2 6 2 2 6
40861- 2 2 6 2 2 6 2 2 6 2 2 6
40862- 2 2 6 2 2 6 2 2 6 2 2 6
40863- 2 2 6 6 6 6 91 60 6 167 114 7
40864-206 145 10 230 174 11 242 186 14 246 190 14
40865-246 190 14 246 190 14 246 186 14 242 186 14
40866-239 182 13 230 174 11 224 166 10 213 154 11
40867-180 133 36 124 112 88 86 86 86 58 58 58
40868- 38 38 38 22 22 22 10 10 10 6 6 6
40869- 0 0 0 0 0 0 0 0 0 0 0 0
40870- 0 0 0 0 0 0 0 0 0 0 0 0
40871- 0 0 0 0 0 0 0 0 0 0 0 0
40872- 0 0 0 0 0 0 0 0 0 14 14 14
40873- 34 34 34 70 70 70 138 110 50 158 118 36
40874-167 114 7 180 123 7 192 133 9 197 138 11
40875-200 144 11 206 145 10 213 154 11 219 162 10
40876-224 166 10 230 174 11 239 182 13 242 186 14
40877-246 186 14 246 186 14 246 186 14 246 186 14
40878-239 182 13 216 158 10 185 133 11 152 99 6
40879-104 69 6 18 14 6 2 2 6 2 2 6
40880- 2 2 6 2 2 6 2 2 6 2 2 6
40881- 2 2 6 2 2 6 2 2 6 2 2 6
40882- 2 2 6 2 2 6 2 2 6 2 2 6
40883- 2 2 6 6 6 6 80 54 7 152 99 6
40884-192 133 9 219 162 10 236 178 12 239 182 13
40885-246 186 14 242 186 14 239 182 13 236 178 12
40886-224 166 10 206 145 10 192 133 9 154 121 60
40887- 94 94 94 62 62 62 42 42 42 22 22 22
40888- 14 14 14 6 6 6 0 0 0 0 0 0
40889- 0 0 0 0 0 0 0 0 0 0 0 0
40890- 0 0 0 0 0 0 0 0 0 0 0 0
40891- 0 0 0 0 0 0 0 0 0 0 0 0
40892- 0 0 0 0 0 0 0 0 0 6 6 6
40893- 18 18 18 34 34 34 58 58 58 78 78 78
40894-101 98 89 124 112 88 142 110 46 156 107 11
40895-163 110 8 167 114 7 175 118 6 180 123 7
40896-185 133 11 197 138 11 210 150 10 219 162 10
40897-226 170 11 236 178 12 236 178 12 234 174 13
40898-219 162 10 197 138 11 163 110 8 130 83 6
40899- 91 60 6 10 10 10 2 2 6 2 2 6
40900- 18 18 18 38 38 38 38 38 38 38 38 38
40901- 38 38 38 38 38 38 38 38 38 38 38 38
40902- 38 38 38 38 38 38 26 26 26 2 2 6
40903- 2 2 6 6 6 6 70 47 6 137 92 6
40904-175 118 6 200 144 11 219 162 10 230 174 11
40905-234 174 13 230 174 11 219 162 10 210 150 10
40906-192 133 9 163 110 8 124 112 88 82 82 82
40907- 50 50 50 30 30 30 14 14 14 6 6 6
40908- 0 0 0 0 0 0 0 0 0 0 0 0
40909- 0 0 0 0 0 0 0 0 0 0 0 0
40910- 0 0 0 0 0 0 0 0 0 0 0 0
40911- 0 0 0 0 0 0 0 0 0 0 0 0
40912- 0 0 0 0 0 0 0 0 0 0 0 0
40913- 6 6 6 14 14 14 22 22 22 34 34 34
40914- 42 42 42 58 58 58 74 74 74 86 86 86
40915-101 98 89 122 102 70 130 98 46 121 87 25
40916-137 92 6 152 99 6 163 110 8 180 123 7
40917-185 133 11 197 138 11 206 145 10 200 144 11
40918-180 123 7 156 107 11 130 83 6 104 69 6
40919- 50 34 6 54 54 54 110 110 110 101 98 89
40920- 86 86 86 82 82 82 78 78 78 78 78 78
40921- 78 78 78 78 78 78 78 78 78 78 78 78
40922- 78 78 78 82 82 82 86 86 86 94 94 94
40923-106 106 106 101 101 101 86 66 34 124 80 6
40924-156 107 11 180 123 7 192 133 9 200 144 11
40925-206 145 10 200 144 11 192 133 9 175 118 6
40926-139 102 15 109 106 95 70 70 70 42 42 42
40927- 22 22 22 10 10 10 0 0 0 0 0 0
40928- 0 0 0 0 0 0 0 0 0 0 0 0
40929- 0 0 0 0 0 0 0 0 0 0 0 0
40930- 0 0 0 0 0 0 0 0 0 0 0 0
40931- 0 0 0 0 0 0 0 0 0 0 0 0
40932- 0 0 0 0 0 0 0 0 0 0 0 0
40933- 0 0 0 0 0 0 6 6 6 10 10 10
40934- 14 14 14 22 22 22 30 30 30 38 38 38
40935- 50 50 50 62 62 62 74 74 74 90 90 90
40936-101 98 89 112 100 78 121 87 25 124 80 6
40937-137 92 6 152 99 6 152 99 6 152 99 6
40938-138 86 6 124 80 6 98 70 6 86 66 30
40939-101 98 89 82 82 82 58 58 58 46 46 46
40940- 38 38 38 34 34 34 34 34 34 34 34 34
40941- 34 34 34 34 34 34 34 34 34 34 34 34
40942- 34 34 34 34 34 34 38 38 38 42 42 42
40943- 54 54 54 82 82 82 94 86 76 91 60 6
40944-134 86 6 156 107 11 167 114 7 175 118 6
40945-175 118 6 167 114 7 152 99 6 121 87 25
40946-101 98 89 62 62 62 34 34 34 18 18 18
40947- 6 6 6 0 0 0 0 0 0 0 0 0
40948- 0 0 0 0 0 0 0 0 0 0 0 0
40949- 0 0 0 0 0 0 0 0 0 0 0 0
40950- 0 0 0 0 0 0 0 0 0 0 0 0
40951- 0 0 0 0 0 0 0 0 0 0 0 0
40952- 0 0 0 0 0 0 0 0 0 0 0 0
40953- 0 0 0 0 0 0 0 0 0 0 0 0
40954- 0 0 0 6 6 6 6 6 6 10 10 10
40955- 18 18 18 22 22 22 30 30 30 42 42 42
40956- 50 50 50 66 66 66 86 86 86 101 98 89
40957-106 86 58 98 70 6 104 69 6 104 69 6
40958-104 69 6 91 60 6 82 62 34 90 90 90
40959- 62 62 62 38 38 38 22 22 22 14 14 14
40960- 10 10 10 10 10 10 10 10 10 10 10 10
40961- 10 10 10 10 10 10 6 6 6 10 10 10
40962- 10 10 10 10 10 10 10 10 10 14 14 14
40963- 22 22 22 42 42 42 70 70 70 89 81 66
40964- 80 54 7 104 69 6 124 80 6 137 92 6
40965-134 86 6 116 81 8 100 82 52 86 86 86
40966- 58 58 58 30 30 30 14 14 14 6 6 6
40967- 0 0 0 0 0 0 0 0 0 0 0 0
40968- 0 0 0 0 0 0 0 0 0 0 0 0
40969- 0 0 0 0 0 0 0 0 0 0 0 0
40970- 0 0 0 0 0 0 0 0 0 0 0 0
40971- 0 0 0 0 0 0 0 0 0 0 0 0
40972- 0 0 0 0 0 0 0 0 0 0 0 0
40973- 0 0 0 0 0 0 0 0 0 0 0 0
40974- 0 0 0 0 0 0 0 0 0 0 0 0
40975- 0 0 0 6 6 6 10 10 10 14 14 14
40976- 18 18 18 26 26 26 38 38 38 54 54 54
40977- 70 70 70 86 86 86 94 86 76 89 81 66
40978- 89 81 66 86 86 86 74 74 74 50 50 50
40979- 30 30 30 14 14 14 6 6 6 0 0 0
40980- 0 0 0 0 0 0 0 0 0 0 0 0
40981- 0 0 0 0 0 0 0 0 0 0 0 0
40982- 0 0 0 0 0 0 0 0 0 0 0 0
40983- 6 6 6 18 18 18 34 34 34 58 58 58
40984- 82 82 82 89 81 66 89 81 66 89 81 66
40985- 94 86 66 94 86 76 74 74 74 50 50 50
40986- 26 26 26 14 14 14 6 6 6 0 0 0
40987- 0 0 0 0 0 0 0 0 0 0 0 0
40988- 0 0 0 0 0 0 0 0 0 0 0 0
40989- 0 0 0 0 0 0 0 0 0 0 0 0
40990- 0 0 0 0 0 0 0 0 0 0 0 0
40991- 0 0 0 0 0 0 0 0 0 0 0 0
40992- 0 0 0 0 0 0 0 0 0 0 0 0
40993- 0 0 0 0 0 0 0 0 0 0 0 0
40994- 0 0 0 0 0 0 0 0 0 0 0 0
40995- 0 0 0 0 0 0 0 0 0 0 0 0
40996- 6 6 6 6 6 6 14 14 14 18 18 18
40997- 30 30 30 38 38 38 46 46 46 54 54 54
40998- 50 50 50 42 42 42 30 30 30 18 18 18
40999- 10 10 10 0 0 0 0 0 0 0 0 0
41000- 0 0 0 0 0 0 0 0 0 0 0 0
41001- 0 0 0 0 0 0 0 0 0 0 0 0
41002- 0 0 0 0 0 0 0 0 0 0 0 0
41003- 0 0 0 6 6 6 14 14 14 26 26 26
41004- 38 38 38 50 50 50 58 58 58 58 58 58
41005- 54 54 54 42 42 42 30 30 30 18 18 18
41006- 10 10 10 0 0 0 0 0 0 0 0 0
41007- 0 0 0 0 0 0 0 0 0 0 0 0
41008- 0 0 0 0 0 0 0 0 0 0 0 0
41009- 0 0 0 0 0 0 0 0 0 0 0 0
41010- 0 0 0 0 0 0 0 0 0 0 0 0
41011- 0 0 0 0 0 0 0 0 0 0 0 0
41012- 0 0 0 0 0 0 0 0 0 0 0 0
41013- 0 0 0 0 0 0 0 0 0 0 0 0
41014- 0 0 0 0 0 0 0 0 0 0 0 0
41015- 0 0 0 0 0 0 0 0 0 0 0 0
41016- 0 0 0 0 0 0 0 0 0 6 6 6
41017- 6 6 6 10 10 10 14 14 14 18 18 18
41018- 18 18 18 14 14 14 10 10 10 6 6 6
41019- 0 0 0 0 0 0 0 0 0 0 0 0
41020- 0 0 0 0 0 0 0 0 0 0 0 0
41021- 0 0 0 0 0 0 0 0 0 0 0 0
41022- 0 0 0 0 0 0 0 0 0 0 0 0
41023- 0 0 0 0 0 0 0 0 0 6 6 6
41024- 14 14 14 18 18 18 22 22 22 22 22 22
41025- 18 18 18 14 14 14 10 10 10 6 6 6
41026- 0 0 0 0 0 0 0 0 0 0 0 0
41027- 0 0 0 0 0 0 0 0 0 0 0 0
41028- 0 0 0 0 0 0 0 0 0 0 0 0
41029- 0 0 0 0 0 0 0 0 0 0 0 0
41030- 0 0 0 0 0 0 0 0 0 0 0 0
41031+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41032+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41033+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41034+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41035+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41036+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41037+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41038+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41039+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41040+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41041+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41043+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41044+4 4 4 4 4 4
41045+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41046+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41047+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41048+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41049+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41050+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41051+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41052+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41053+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41054+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41055+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41056+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41057+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41058+4 4 4 4 4 4
41059+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41060+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41061+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41062+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41063+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41065+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41066+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41067+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41068+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41069+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41070+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41071+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41072+4 4 4 4 4 4
41073+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41074+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41075+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41076+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41077+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41078+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41079+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41080+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41081+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41082+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41083+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41086+4 4 4 4 4 4
41087+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41088+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41089+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41090+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41091+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41092+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41093+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41094+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41095+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41096+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41097+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41100+4 4 4 4 4 4
41101+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41102+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41103+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41104+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41105+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41106+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41107+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41108+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41109+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41110+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41111+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41113+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41114+4 4 4 4 4 4
41115+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41116+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41117+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41118+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41119+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
41120+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
41121+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41122+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41123+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41124+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
41125+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
41126+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
41127+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41128+4 4 4 4 4 4
41129+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41130+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41131+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41132+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41133+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
41134+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
41135+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41136+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41137+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41138+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
41139+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
41140+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
41141+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41142+4 4 4 4 4 4
41143+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41144+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41145+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41146+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41147+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
41148+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
41149+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
41150+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41151+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41152+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
41153+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
41154+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
41155+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
41156+4 4 4 4 4 4
41157+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41158+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41159+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41160+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
41161+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
41162+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
41163+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
41164+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41165+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
41166+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
41167+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
41168+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
41169+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
41170+4 4 4 4 4 4
41171+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41172+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41173+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41174+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
41175+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
41176+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
41177+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
41178+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41179+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
41180+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
41181+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
41182+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
41183+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
41184+4 4 4 4 4 4
41185+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41186+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41187+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41188+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
41189+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
41190+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
41191+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
41192+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
41193+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
41194+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
41195+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
41196+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
41197+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
41198+4 4 4 4 4 4
41199+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41200+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41201+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
41202+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
41203+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
41204+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
41205+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
41206+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
41207+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
41208+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
41209+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
41210+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
41211+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
41212+4 4 4 4 4 4
41213+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41214+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41215+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
41216+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
41217+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
41218+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
41219+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
41220+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
41221+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
41222+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
41223+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
41224+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
41225+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
41226+4 4 4 4 4 4
41227+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41228+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41229+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
41230+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
41231+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
41232+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
41233+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
41234+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
41235+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
41236+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
41237+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
41238+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
41239+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
41240+4 4 4 4 4 4
41241+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41242+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41243+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
41244+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
41245+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
41246+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
41247+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
41248+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
41249+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
41250+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
41251+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
41252+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
41253+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
41254+4 4 4 4 4 4
41255+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41256+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
41257+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
41258+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
41259+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
41260+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
41261+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
41262+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
41263+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
41264+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
41265+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
41266+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
41267+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
41268+4 4 4 4 4 4
41269+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41270+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
41271+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
41272+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
41273+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41274+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
41275+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
41276+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
41277+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
41278+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
41279+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
41280+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
41281+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
41282+0 0 0 4 4 4
41283+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
41284+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
41285+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
41286+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
41287+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
41288+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
41289+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
41290+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
41291+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
41292+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
41293+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
41294+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
41295+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
41296+2 0 0 0 0 0
41297+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
41298+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
41299+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
41300+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
41301+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
41302+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
41303+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
41304+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
41305+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
41306+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
41307+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
41308+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
41309+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
41310+37 38 37 0 0 0
41311+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
41312+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
41313+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
41314+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
41315+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
41316+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
41317+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
41318+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
41319+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
41320+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
41321+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
41322+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
41323+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
41324+85 115 134 4 0 0
41325+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
41326+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
41327+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
41328+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
41329+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
41330+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
41331+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
41332+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
41333+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
41334+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
41335+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
41336+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
41337+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
41338+60 73 81 4 0 0
41339+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
41340+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
41341+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
41342+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
41343+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
41344+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
41345+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
41346+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
41347+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
41348+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
41349+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
41350+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
41351+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
41352+16 19 21 4 0 0
41353+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
41354+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
41355+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
41356+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
41357+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
41358+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
41359+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
41360+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
41361+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
41362+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
41363+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
41364+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
41365+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
41366+4 0 0 4 3 3
41367+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
41368+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
41369+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
41370+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
41371+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
41372+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
41373+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
41374+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
41375+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
41376+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
41377+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
41378+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
41379+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
41380+3 2 2 4 4 4
41381+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
41382+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
41383+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
41384+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
41385+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
41386+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
41387+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
41388+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
41389+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
41390+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
41391+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
41392+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
41393+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
41394+4 4 4 4 4 4
41395+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
41396+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
41397+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
41398+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
41399+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
41400+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
41401+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
41402+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
41403+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
41404+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
41405+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
41406+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
41407+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
41408+4 4 4 4 4 4
41409+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
41410+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
41411+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
41412+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
41413+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
41414+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41415+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
41416+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
41417+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
41418+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
41419+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
41420+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
41421+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
41422+5 5 5 5 5 5
41423+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
41424+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
41425+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
41426+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
41427+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
41428+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41429+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
41430+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
41431+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
41432+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
41433+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
41434+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
41435+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41436+5 5 5 4 4 4
41437+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
41438+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
41439+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
41440+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
41441+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41442+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
41443+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
41444+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
41445+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
41446+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
41447+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
41448+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41450+4 4 4 4 4 4
41451+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
41452+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
41453+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
41454+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
41455+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
41456+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41457+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41458+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
41459+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
41460+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
41461+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
41462+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
41463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41464+4 4 4 4 4 4
41465+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
41466+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
41467+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
41468+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
41469+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41470+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
41471+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
41472+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
41473+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
41474+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
41475+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
41476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41478+4 4 4 4 4 4
41479+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
41480+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
41481+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
41482+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
41483+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41484+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41485+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41486+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
41487+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
41488+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
41489+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
41490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41492+4 4 4 4 4 4
41493+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
41494+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
41495+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
41496+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
41497+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41498+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
41499+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41500+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
41501+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
41502+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
41503+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41506+4 4 4 4 4 4
41507+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
41508+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
41509+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
41510+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
41511+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41512+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
41513+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
41514+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
41515+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
41516+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
41517+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
41518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41520+4 4 4 4 4 4
41521+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
41522+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
41523+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
41524+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
41525+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41526+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
41527+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
41528+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
41529+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
41530+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
41531+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
41532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41534+4 4 4 4 4 4
41535+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
41536+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
41537+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
41538+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41539+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
41540+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
41541+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
41542+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
41543+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
41544+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
41545+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41548+4 4 4 4 4 4
41549+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
41550+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
41551+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
41552+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41553+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41554+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
41555+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
41556+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
41557+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
41558+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
41559+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41562+4 4 4 4 4 4
41563+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
41564+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
41565+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41566+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41567+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41568+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
41569+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
41570+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
41571+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
41572+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
41573+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41576+4 4 4 4 4 4
41577+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
41578+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
41579+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41580+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41581+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41582+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
41583+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
41584+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
41585+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41586+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41587+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41590+4 4 4 4 4 4
41591+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41592+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
41593+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41594+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
41595+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
41596+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
41597+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
41598+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
41599+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41600+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41601+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41604+4 4 4 4 4 4
41605+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41606+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
41607+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41608+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
41609+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41610+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
41611+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
41612+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
41613+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41614+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41615+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41618+4 4 4 4 4 4
41619+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
41620+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
41621+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41622+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
41623+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
41624+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
41625+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
41626+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
41627+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41628+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41629+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41632+4 4 4 4 4 4
41633+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
41634+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
41635+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41636+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
41637+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
41638+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
41639+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
41640+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
41641+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41642+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41643+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41646+4 4 4 4 4 4
41647+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41648+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
41649+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41650+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
41651+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
41652+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
41653+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
41654+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
41655+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41656+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41657+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41660+4 4 4 4 4 4
41661+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
41662+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
41663+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41664+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
41665+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
41666+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
41667+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
41668+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
41669+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
41670+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41671+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41674+4 4 4 4 4 4
41675+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41676+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
41677+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
41678+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
41679+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
41680+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
41681+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
41682+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
41683+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41684+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41685+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41688+4 4 4 4 4 4
41689+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41690+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
41691+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41692+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
41693+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
41694+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
41695+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
41696+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
41697+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41698+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41699+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41702+4 4 4 4 4 4
41703+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41704+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
41705+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
41706+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
41707+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
41708+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
41709+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41710+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
41711+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41712+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41713+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41716+4 4 4 4 4 4
41717+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41718+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
41719+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
41720+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41721+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
41722+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
41723+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41724+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
41725+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41726+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41727+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41730+4 4 4 4 4 4
41731+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41732+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
41733+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
41734+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
41735+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
41736+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
41737+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
41738+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
41739+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
41740+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41741+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41744+4 4 4 4 4 4
41745+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41746+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
41747+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
41748+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
41749+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
41750+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
41751+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
41752+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
41753+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
41754+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41755+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41758+4 4 4 4 4 4
41759+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
41760+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
41761+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
41762+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
41763+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41764+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
41765+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
41766+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
41767+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
41768+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41769+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41772+4 4 4 4 4 4
41773+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41774+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
41775+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
41776+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
41777+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
41778+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
41779+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
41780+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
41781+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
41782+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41783+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41786+4 4 4 4 4 4
41787+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
41788+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
41789+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
41790+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
41791+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
41792+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
41793+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
41794+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
41795+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
41796+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
41797+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41800+4 4 4 4 4 4
41801+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
41802+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41803+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
41804+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
41805+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
41806+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
41807+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
41808+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
41809+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
41810+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
41811+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41814+4 4 4 4 4 4
41815+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
41816+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41817+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
41818+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
41819+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
41820+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
41821+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41822+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
41823+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
41824+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
41825+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41828+4 4 4 4 4 4
41829+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
41830+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
41831+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
41832+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
41833+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
41834+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
41835+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
41836+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
41837+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
41838+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
41839+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41842+4 4 4 4 4 4
41843+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
41844+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
41845+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41846+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
41847+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
41848+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
41849+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
41850+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
41851+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
41852+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
41853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41856+4 4 4 4 4 4
41857+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41858+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
41859+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
41860+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
41861+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
41862+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
41863+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
41864+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
41865+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
41866+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41867+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41868+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41869+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41870+4 4 4 4 4 4
41871+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
41872+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
41873+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
41874+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
41875+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
41876+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
41877+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
41878+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
41879+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
41880+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41881+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41882+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41883+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41884+4 4 4 4 4 4
41885+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
41886+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
41887+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
41888+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
41889+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
41890+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
41891+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
41892+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
41893+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41894+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41895+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41896+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41897+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41898+4 4 4 4 4 4
41899+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
41900+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41901+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
41902+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41903+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
41904+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
41905+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
41906+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
41907+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
41908+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41909+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41910+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41911+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41912+4 4 4 4 4 4
41913+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
41914+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
41915+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
41916+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
41917+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
41918+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
41919+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
41920+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
41921+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
41922+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41923+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41924+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41925+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41926+4 4 4 4 4 4
41927+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41928+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
41929+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
41930+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
41931+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
41932+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
41933+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
41934+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
41935+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41936+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41937+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41938+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41939+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41940+4 4 4 4 4 4
41941+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
41942+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
41943+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41944+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
41945+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
41946+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
41947+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
41948+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
41949+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41950+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41951+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41952+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41953+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41954+4 4 4 4 4 4
41955+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41956+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
41957+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
41958+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
41959+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
41960+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
41961+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
41962+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41963+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41964+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41965+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41966+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41967+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41968+4 4 4 4 4 4
41969+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41970+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
41971+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41972+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
41973+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
41974+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
41975+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
41976+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
41977+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41978+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41979+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41980+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41981+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41982+4 4 4 4 4 4
41983+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41984+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
41985+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
41986+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
41987+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
41988+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
41989+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
41990+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
41991+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41992+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41993+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41994+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41995+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41996+4 4 4 4 4 4
41997+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41998+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41999+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
42000+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
42001+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
42002+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
42003+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
42004+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
42005+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42006+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42007+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42008+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42009+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42010+4 4 4 4 4 4
42011+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42012+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42013+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
42014+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
42015+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
42016+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
42017+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
42018+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
42019+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42020+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42021+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42022+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42023+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42024+4 4 4 4 4 4
42025+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42026+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42027+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
42028+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
42029+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
42030+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
42031+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
42032+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42033+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42034+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42035+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42036+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42037+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42038+4 4 4 4 4 4
42039+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42040+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42041+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42042+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
42043+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
42044+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
42045+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
42046+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42047+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42048+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42049+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42050+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42051+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42052+4 4 4 4 4 4
42053+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42054+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42055+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42056+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
42057+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
42058+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
42059+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
42060+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42061+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42062+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42063+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42065+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42066+4 4 4 4 4 4
42067+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42068+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42069+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42070+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
42071+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
42072+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
42073+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
42074+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42075+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42076+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42077+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42078+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42079+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42080+4 4 4 4 4 4
42081+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42082+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42083+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
42085+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
42086+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
42087+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42088+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42089+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42090+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42091+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42092+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42093+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42094+4 4 4 4 4 4
42095+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42096+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42097+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42099+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
42100+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
42101+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
42102+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42103+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42104+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42105+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42106+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42107+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42108+4 4 4 4 4 4
42109+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42110+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42111+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42113+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
42114+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
42115+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42116+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42117+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42118+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42119+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42120+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42121+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42122+4 4 4 4 4 4
42123+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42124+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42125+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42126+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42127+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
42128+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
42129+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42130+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42131+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42132+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42133+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42134+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42135+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42136+4 4 4 4 4 4
42137+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42138+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42139+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42140+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42141+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
42142+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
42143+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42144+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42145+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42146+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42147+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42148+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42149+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42150+4 4 4 4 4 4
42151diff -urNp linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c
42152--- linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c 2011-03-27 14:31:47.000000000 -0400
42153+++ linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c 2011-04-17 15:56:46.000000000 -0400
42154@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
42155 return bd->props.brightness;
42156 }
42157
42158-static struct backlight_ops nvidia_bl_ops = {
42159+static const struct backlight_ops nvidia_bl_ops = {
42160 .get_brightness = nvidia_bl_get_brightness,
42161 .update_status = nvidia_bl_update_status,
42162 };
42163diff -urNp linux-2.6.32.46/drivers/video/riva/fbdev.c linux-2.6.32.46/drivers/video/riva/fbdev.c
42164--- linux-2.6.32.46/drivers/video/riva/fbdev.c 2011-03-27 14:31:47.000000000 -0400
42165+++ linux-2.6.32.46/drivers/video/riva/fbdev.c 2011-04-17 15:56:46.000000000 -0400
42166@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
42167 return bd->props.brightness;
42168 }
42169
42170-static struct backlight_ops riva_bl_ops = {
42171+static const struct backlight_ops riva_bl_ops = {
42172 .get_brightness = riva_bl_get_brightness,
42173 .update_status = riva_bl_update_status,
42174 };
42175diff -urNp linux-2.6.32.46/drivers/video/uvesafb.c linux-2.6.32.46/drivers/video/uvesafb.c
42176--- linux-2.6.32.46/drivers/video/uvesafb.c 2011-03-27 14:31:47.000000000 -0400
42177+++ linux-2.6.32.46/drivers/video/uvesafb.c 2011-04-17 15:56:46.000000000 -0400
42178@@ -18,6 +18,7 @@
42179 #include <linux/fb.h>
42180 #include <linux/io.h>
42181 #include <linux/mutex.h>
42182+#include <linux/moduleloader.h>
42183 #include <video/edid.h>
42184 #include <video/uvesafb.h>
42185 #ifdef CONFIG_X86
42186@@ -120,7 +121,7 @@ static int uvesafb_helper_start(void)
42187 NULL,
42188 };
42189
42190- return call_usermodehelper(v86d_path, argv, envp, 1);
42191+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
42192 }
42193
42194 /*
42195@@ -568,10 +569,32 @@ static int __devinit uvesafb_vbe_getpmi(
42196 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
42197 par->pmi_setpal = par->ypan = 0;
42198 } else {
42199+
42200+#ifdef CONFIG_PAX_KERNEXEC
42201+#ifdef CONFIG_MODULES
42202+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
42203+#endif
42204+ if (!par->pmi_code) {
42205+ par->pmi_setpal = par->ypan = 0;
42206+ return 0;
42207+ }
42208+#endif
42209+
42210 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
42211 + task->t.regs.edi);
42212+
42213+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42214+ pax_open_kernel();
42215+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
42216+ pax_close_kernel();
42217+
42218+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
42219+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
42220+#else
42221 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
42222 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
42223+#endif
42224+
42225 printk(KERN_INFO "uvesafb: protected mode interface info at "
42226 "%04x:%04x\n",
42227 (u16)task->t.regs.es, (u16)task->t.regs.edi);
42228@@ -1799,6 +1822,11 @@ out:
42229 if (par->vbe_modes)
42230 kfree(par->vbe_modes);
42231
42232+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42233+ if (par->pmi_code)
42234+ module_free_exec(NULL, par->pmi_code);
42235+#endif
42236+
42237 framebuffer_release(info);
42238 return err;
42239 }
42240@@ -1825,6 +1853,12 @@ static int uvesafb_remove(struct platfor
42241 kfree(par->vbe_state_orig);
42242 if (par->vbe_state_saved)
42243 kfree(par->vbe_state_saved);
42244+
42245+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42246+ if (par->pmi_code)
42247+ module_free_exec(NULL, par->pmi_code);
42248+#endif
42249+
42250 }
42251
42252 framebuffer_release(info);
42253diff -urNp linux-2.6.32.46/drivers/video/vesafb.c linux-2.6.32.46/drivers/video/vesafb.c
42254--- linux-2.6.32.46/drivers/video/vesafb.c 2011-03-27 14:31:47.000000000 -0400
42255+++ linux-2.6.32.46/drivers/video/vesafb.c 2011-08-05 20:33:55.000000000 -0400
42256@@ -9,6 +9,7 @@
42257 */
42258
42259 #include <linux/module.h>
42260+#include <linux/moduleloader.h>
42261 #include <linux/kernel.h>
42262 #include <linux/errno.h>
42263 #include <linux/string.h>
42264@@ -53,8 +54,8 @@ static int vram_remap __initdata; /*
42265 static int vram_total __initdata; /* Set total amount of memory */
42266 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
42267 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
42268-static void (*pmi_start)(void) __read_mostly;
42269-static void (*pmi_pal) (void) __read_mostly;
42270+static void (*pmi_start)(void) __read_only;
42271+static void (*pmi_pal) (void) __read_only;
42272 static int depth __read_mostly;
42273 static int vga_compat __read_mostly;
42274 /* --------------------------------------------------------------------- */
42275@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct pl
42276 unsigned int size_vmode;
42277 unsigned int size_remap;
42278 unsigned int size_total;
42279+ void *pmi_code = NULL;
42280
42281 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
42282 return -ENODEV;
42283@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct pl
42284 size_remap = size_total;
42285 vesafb_fix.smem_len = size_remap;
42286
42287-#ifndef __i386__
42288- screen_info.vesapm_seg = 0;
42289-#endif
42290-
42291 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
42292 printk(KERN_WARNING
42293 "vesafb: cannot reserve video memory at 0x%lx\n",
42294@@ -315,9 +313,21 @@ static int __init vesafb_probe(struct pl
42295 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
42296 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
42297
42298+#ifdef __i386__
42299+
42300+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42301+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
42302+ if (!pmi_code)
42303+#elif !defined(CONFIG_PAX_KERNEXEC)
42304+ if (0)
42305+#endif
42306+
42307+#endif
42308+ screen_info.vesapm_seg = 0;
42309+
42310 if (screen_info.vesapm_seg) {
42311- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
42312- screen_info.vesapm_seg,screen_info.vesapm_off);
42313+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
42314+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
42315 }
42316
42317 if (screen_info.vesapm_seg < 0xc000)
42318@@ -325,9 +335,25 @@ static int __init vesafb_probe(struct pl
42319
42320 if (ypan || pmi_setpal) {
42321 unsigned short *pmi_base;
42322+
42323 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
42324- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
42325- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
42326+
42327+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42328+ pax_open_kernel();
42329+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
42330+#else
42331+ pmi_code = pmi_base;
42332+#endif
42333+
42334+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
42335+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
42336+
42337+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42338+ pmi_start = ktva_ktla(pmi_start);
42339+ pmi_pal = ktva_ktla(pmi_pal);
42340+ pax_close_kernel();
42341+#endif
42342+
42343 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
42344 if (pmi_base[3]) {
42345 printk(KERN_INFO "vesafb: pmi: ports = ");
42346@@ -469,6 +495,11 @@ static int __init vesafb_probe(struct pl
42347 info->node, info->fix.id);
42348 return 0;
42349 err:
42350+
42351+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42352+ module_free_exec(NULL, pmi_code);
42353+#endif
42354+
42355 if (info->screen_base)
42356 iounmap(info->screen_base);
42357 framebuffer_release(info);
42358diff -urNp linux-2.6.32.46/drivers/xen/sys-hypervisor.c linux-2.6.32.46/drivers/xen/sys-hypervisor.c
42359--- linux-2.6.32.46/drivers/xen/sys-hypervisor.c 2011-03-27 14:31:47.000000000 -0400
42360+++ linux-2.6.32.46/drivers/xen/sys-hypervisor.c 2011-04-17 15:56:46.000000000 -0400
42361@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
42362 return 0;
42363 }
42364
42365-static struct sysfs_ops hyp_sysfs_ops = {
42366+static const struct sysfs_ops hyp_sysfs_ops = {
42367 .show = hyp_sysfs_show,
42368 .store = hyp_sysfs_store,
42369 };
42370diff -urNp linux-2.6.32.46/fs/9p/vfs_inode.c linux-2.6.32.46/fs/9p/vfs_inode.c
42371--- linux-2.6.32.46/fs/9p/vfs_inode.c 2011-03-27 14:31:47.000000000 -0400
42372+++ linux-2.6.32.46/fs/9p/vfs_inode.c 2011-04-17 15:56:46.000000000 -0400
42373@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
42374 static void
42375 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42376 {
42377- char *s = nd_get_link(nd);
42378+ const char *s = nd_get_link(nd);
42379
42380 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
42381 IS_ERR(s) ? "<error>" : s);
42382diff -urNp linux-2.6.32.46/fs/aio.c linux-2.6.32.46/fs/aio.c
42383--- linux-2.6.32.46/fs/aio.c 2011-03-27 14:31:47.000000000 -0400
42384+++ linux-2.6.32.46/fs/aio.c 2011-06-04 20:40:21.000000000 -0400
42385@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
42386 size += sizeof(struct io_event) * nr_events;
42387 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
42388
42389- if (nr_pages < 0)
42390+ if (nr_pages <= 0)
42391 return -EINVAL;
42392
42393 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
42394@@ -1089,6 +1089,8 @@ static int read_events(struct kioctx *ct
42395 struct aio_timeout to;
42396 int retry = 0;
42397
42398+ pax_track_stack();
42399+
42400 /* needed to zero any padding within an entry (there shouldn't be
42401 * any, but C is fun!
42402 */
42403@@ -1382,13 +1384,18 @@ static ssize_t aio_fsync(struct kiocb *i
42404 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb)
42405 {
42406 ssize_t ret;
42407+ struct iovec iovstack;
42408
42409 ret = rw_copy_check_uvector(type, (struct iovec __user *)kiocb->ki_buf,
42410 kiocb->ki_nbytes, 1,
42411- &kiocb->ki_inline_vec, &kiocb->ki_iovec);
42412+ &iovstack, &kiocb->ki_iovec);
42413 if (ret < 0)
42414 goto out;
42415
42416+ if (kiocb->ki_iovec == &iovstack) {
42417+ kiocb->ki_inline_vec = iovstack;
42418+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
42419+ }
42420 kiocb->ki_nr_segs = kiocb->ki_nbytes;
42421 kiocb->ki_cur_seg = 0;
42422 /* ki_nbytes/left now reflect bytes instead of segs */
42423diff -urNp linux-2.6.32.46/fs/attr.c linux-2.6.32.46/fs/attr.c
42424--- linux-2.6.32.46/fs/attr.c 2011-03-27 14:31:47.000000000 -0400
42425+++ linux-2.6.32.46/fs/attr.c 2011-04-17 15:56:46.000000000 -0400
42426@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
42427 unsigned long limit;
42428
42429 limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
42430+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
42431 if (limit != RLIM_INFINITY && offset > limit)
42432 goto out_sig;
42433 if (offset > inode->i_sb->s_maxbytes)
42434diff -urNp linux-2.6.32.46/fs/autofs/root.c linux-2.6.32.46/fs/autofs/root.c
42435--- linux-2.6.32.46/fs/autofs/root.c 2011-03-27 14:31:47.000000000 -0400
42436+++ linux-2.6.32.46/fs/autofs/root.c 2011-04-17 15:56:46.000000000 -0400
42437@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
42438 set_bit(n,sbi->symlink_bitmap);
42439 sl = &sbi->symlink[n];
42440 sl->len = strlen(symname);
42441- sl->data = kmalloc(slsize = sl->len+1, GFP_KERNEL);
42442+ slsize = sl->len+1;
42443+ sl->data = kmalloc(slsize, GFP_KERNEL);
42444 if (!sl->data) {
42445 clear_bit(n,sbi->symlink_bitmap);
42446 unlock_kernel();
42447diff -urNp linux-2.6.32.46/fs/autofs4/symlink.c linux-2.6.32.46/fs/autofs4/symlink.c
42448--- linux-2.6.32.46/fs/autofs4/symlink.c 2011-03-27 14:31:47.000000000 -0400
42449+++ linux-2.6.32.46/fs/autofs4/symlink.c 2011-04-17 15:56:46.000000000 -0400
42450@@ -15,7 +15,7 @@
42451 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
42452 {
42453 struct autofs_info *ino = autofs4_dentry_ino(dentry);
42454- nd_set_link(nd, (char *)ino->u.symlink);
42455+ nd_set_link(nd, ino->u.symlink);
42456 return NULL;
42457 }
42458
42459diff -urNp linux-2.6.32.46/fs/autofs4/waitq.c linux-2.6.32.46/fs/autofs4/waitq.c
42460--- linux-2.6.32.46/fs/autofs4/waitq.c 2011-03-27 14:31:47.000000000 -0400
42461+++ linux-2.6.32.46/fs/autofs4/waitq.c 2011-10-06 09:37:14.000000000 -0400
42462@@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi
42463 {
42464 unsigned long sigpipe, flags;
42465 mm_segment_t fs;
42466- const char *data = (const char *)addr;
42467+ const char __user *data = (const char __force_user *)addr;
42468 ssize_t wr = 0;
42469
42470 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
42471diff -urNp linux-2.6.32.46/fs/befs/linuxvfs.c linux-2.6.32.46/fs/befs/linuxvfs.c
42472--- linux-2.6.32.46/fs/befs/linuxvfs.c 2011-08-29 22:24:44.000000000 -0400
42473+++ linux-2.6.32.46/fs/befs/linuxvfs.c 2011-08-29 22:25:07.000000000 -0400
42474@@ -498,7 +498,7 @@ static void befs_put_link(struct dentry
42475 {
42476 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
42477 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
42478- char *link = nd_get_link(nd);
42479+ const char *link = nd_get_link(nd);
42480 if (!IS_ERR(link))
42481 kfree(link);
42482 }
42483diff -urNp linux-2.6.32.46/fs/binfmt_aout.c linux-2.6.32.46/fs/binfmt_aout.c
42484--- linux-2.6.32.46/fs/binfmt_aout.c 2011-03-27 14:31:47.000000000 -0400
42485+++ linux-2.6.32.46/fs/binfmt_aout.c 2011-04-17 15:56:46.000000000 -0400
42486@@ -16,6 +16,7 @@
42487 #include <linux/string.h>
42488 #include <linux/fs.h>
42489 #include <linux/file.h>
42490+#include <linux/security.h>
42491 #include <linux/stat.h>
42492 #include <linux/fcntl.h>
42493 #include <linux/ptrace.h>
42494@@ -102,6 +103,8 @@ static int aout_core_dump(long signr, st
42495 #endif
42496 # define START_STACK(u) (u.start_stack)
42497
42498+ memset(&dump, 0, sizeof(dump));
42499+
42500 fs = get_fs();
42501 set_fs(KERNEL_DS);
42502 has_dumped = 1;
42503@@ -113,10 +116,12 @@ static int aout_core_dump(long signr, st
42504
42505 /* If the size of the dump file exceeds the rlimit, then see what would happen
42506 if we wrote the stack, but not the data area. */
42507+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
42508 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > limit)
42509 dump.u_dsize = 0;
42510
42511 /* Make sure we have enough room to write the stack and data areas. */
42512+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
42513 if ((dump.u_ssize + 1) * PAGE_SIZE > limit)
42514 dump.u_ssize = 0;
42515
42516@@ -146,9 +151,7 @@ static int aout_core_dump(long signr, st
42517 dump_size = dump.u_ssize << PAGE_SHIFT;
42518 DUMP_WRITE(dump_start,dump_size);
42519 }
42520-/* Finally dump the task struct. Not be used by gdb, but could be useful */
42521- set_fs(KERNEL_DS);
42522- DUMP_WRITE(current,sizeof(*current));
42523+/* Finally, let's not dump the task struct. Not be used by gdb, but could be useful to an attacker */
42524 end_coredump:
42525 set_fs(fs);
42526 return has_dumped;
42527@@ -249,6 +252,8 @@ static int load_aout_binary(struct linux
42528 rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
42529 if (rlim >= RLIM_INFINITY)
42530 rlim = ~0;
42531+
42532+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
42533 if (ex.a_data + ex.a_bss > rlim)
42534 return -ENOMEM;
42535
42536@@ -277,6 +282,27 @@ static int load_aout_binary(struct linux
42537 install_exec_creds(bprm);
42538 current->flags &= ~PF_FORKNOEXEC;
42539
42540+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42541+ current->mm->pax_flags = 0UL;
42542+#endif
42543+
42544+#ifdef CONFIG_PAX_PAGEEXEC
42545+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
42546+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
42547+
42548+#ifdef CONFIG_PAX_EMUTRAMP
42549+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
42550+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
42551+#endif
42552+
42553+#ifdef CONFIG_PAX_MPROTECT
42554+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
42555+ current->mm->pax_flags |= MF_PAX_MPROTECT;
42556+#endif
42557+
42558+ }
42559+#endif
42560+
42561 if (N_MAGIC(ex) == OMAGIC) {
42562 unsigned long text_addr, map_size;
42563 loff_t pos;
42564@@ -349,7 +375,7 @@ static int load_aout_binary(struct linux
42565
42566 down_write(&current->mm->mmap_sem);
42567 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
42568- PROT_READ | PROT_WRITE | PROT_EXEC,
42569+ PROT_READ | PROT_WRITE,
42570 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
42571 fd_offset + ex.a_text);
42572 up_write(&current->mm->mmap_sem);
42573diff -urNp linux-2.6.32.46/fs/binfmt_elf.c linux-2.6.32.46/fs/binfmt_elf.c
42574--- linux-2.6.32.46/fs/binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400
42575+++ linux-2.6.32.46/fs/binfmt_elf.c 2011-05-16 21:46:57.000000000 -0400
42576@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
42577 #define elf_core_dump NULL
42578 #endif
42579
42580+#ifdef CONFIG_PAX_MPROTECT
42581+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
42582+#endif
42583+
42584 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
42585 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
42586 #else
42587@@ -69,6 +73,11 @@ static struct linux_binfmt elf_format =
42588 .load_binary = load_elf_binary,
42589 .load_shlib = load_elf_library,
42590 .core_dump = elf_core_dump,
42591+
42592+#ifdef CONFIG_PAX_MPROTECT
42593+ .handle_mprotect= elf_handle_mprotect,
42594+#endif
42595+
42596 .min_coredump = ELF_EXEC_PAGESIZE,
42597 .hasvdso = 1
42598 };
42599@@ -77,6 +86,8 @@ static struct linux_binfmt elf_format =
42600
42601 static int set_brk(unsigned long start, unsigned long end)
42602 {
42603+ unsigned long e = end;
42604+
42605 start = ELF_PAGEALIGN(start);
42606 end = ELF_PAGEALIGN(end);
42607 if (end > start) {
42608@@ -87,7 +98,7 @@ static int set_brk(unsigned long start,
42609 if (BAD_ADDR(addr))
42610 return addr;
42611 }
42612- current->mm->start_brk = current->mm->brk = end;
42613+ current->mm->start_brk = current->mm->brk = e;
42614 return 0;
42615 }
42616
42617@@ -148,12 +159,15 @@ create_elf_tables(struct linux_binprm *b
42618 elf_addr_t __user *u_rand_bytes;
42619 const char *k_platform = ELF_PLATFORM;
42620 const char *k_base_platform = ELF_BASE_PLATFORM;
42621- unsigned char k_rand_bytes[16];
42622+ u32 k_rand_bytes[4];
42623 int items;
42624 elf_addr_t *elf_info;
42625 int ei_index = 0;
42626 const struct cred *cred = current_cred();
42627 struct vm_area_struct *vma;
42628+ unsigned long saved_auxv[AT_VECTOR_SIZE];
42629+
42630+ pax_track_stack();
42631
42632 /*
42633 * In some cases (e.g. Hyper-Threading), we want to avoid L1
42634@@ -195,8 +209,12 @@ create_elf_tables(struct linux_binprm *b
42635 * Generate 16 random bytes for userspace PRNG seeding.
42636 */
42637 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
42638- u_rand_bytes = (elf_addr_t __user *)
42639- STACK_ALLOC(p, sizeof(k_rand_bytes));
42640+ srandom32(k_rand_bytes[0] ^ random32());
42641+ srandom32(k_rand_bytes[1] ^ random32());
42642+ srandom32(k_rand_bytes[2] ^ random32());
42643+ srandom32(k_rand_bytes[3] ^ random32());
42644+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
42645+ u_rand_bytes = (elf_addr_t __user *) p;
42646 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
42647 return -EFAULT;
42648
42649@@ -308,9 +326,11 @@ create_elf_tables(struct linux_binprm *b
42650 return -EFAULT;
42651 current->mm->env_end = p;
42652
42653+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
42654+
42655 /* Put the elf_info on the stack in the right place. */
42656 sp = (elf_addr_t __user *)envp + 1;
42657- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
42658+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
42659 return -EFAULT;
42660 return 0;
42661 }
42662@@ -385,10 +405,10 @@ static unsigned long load_elf_interp(str
42663 {
42664 struct elf_phdr *elf_phdata;
42665 struct elf_phdr *eppnt;
42666- unsigned long load_addr = 0;
42667+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
42668 int load_addr_set = 0;
42669 unsigned long last_bss = 0, elf_bss = 0;
42670- unsigned long error = ~0UL;
42671+ unsigned long error = -EINVAL;
42672 unsigned long total_size;
42673 int retval, i, size;
42674
42675@@ -434,6 +454,11 @@ static unsigned long load_elf_interp(str
42676 goto out_close;
42677 }
42678
42679+#ifdef CONFIG_PAX_SEGMEXEC
42680+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
42681+ pax_task_size = SEGMEXEC_TASK_SIZE;
42682+#endif
42683+
42684 eppnt = elf_phdata;
42685 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
42686 if (eppnt->p_type == PT_LOAD) {
42687@@ -477,8 +502,8 @@ static unsigned long load_elf_interp(str
42688 k = load_addr + eppnt->p_vaddr;
42689 if (BAD_ADDR(k) ||
42690 eppnt->p_filesz > eppnt->p_memsz ||
42691- eppnt->p_memsz > TASK_SIZE ||
42692- TASK_SIZE - eppnt->p_memsz < k) {
42693+ eppnt->p_memsz > pax_task_size ||
42694+ pax_task_size - eppnt->p_memsz < k) {
42695 error = -ENOMEM;
42696 goto out_close;
42697 }
42698@@ -532,6 +557,194 @@ out:
42699 return error;
42700 }
42701
42702+#if (defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS)) && defined(CONFIG_PAX_SOFTMODE)
42703+static unsigned long pax_parse_softmode(const struct elf_phdr * const elf_phdata)
42704+{
42705+ unsigned long pax_flags = 0UL;
42706+
42707+#ifdef CONFIG_PAX_PAGEEXEC
42708+ if (elf_phdata->p_flags & PF_PAGEEXEC)
42709+ pax_flags |= MF_PAX_PAGEEXEC;
42710+#endif
42711+
42712+#ifdef CONFIG_PAX_SEGMEXEC
42713+ if (elf_phdata->p_flags & PF_SEGMEXEC)
42714+ pax_flags |= MF_PAX_SEGMEXEC;
42715+#endif
42716+
42717+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42718+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42719+ if (nx_enabled)
42720+ pax_flags &= ~MF_PAX_SEGMEXEC;
42721+ else
42722+ pax_flags &= ~MF_PAX_PAGEEXEC;
42723+ }
42724+#endif
42725+
42726+#ifdef CONFIG_PAX_EMUTRAMP
42727+ if (elf_phdata->p_flags & PF_EMUTRAMP)
42728+ pax_flags |= MF_PAX_EMUTRAMP;
42729+#endif
42730+
42731+#ifdef CONFIG_PAX_MPROTECT
42732+ if (elf_phdata->p_flags & PF_MPROTECT)
42733+ pax_flags |= MF_PAX_MPROTECT;
42734+#endif
42735+
42736+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42737+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
42738+ pax_flags |= MF_PAX_RANDMMAP;
42739+#endif
42740+
42741+ return pax_flags;
42742+}
42743+#endif
42744+
42745+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42746+static unsigned long pax_parse_hardmode(const struct elf_phdr * const elf_phdata)
42747+{
42748+ unsigned long pax_flags = 0UL;
42749+
42750+#ifdef CONFIG_PAX_PAGEEXEC
42751+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
42752+ pax_flags |= MF_PAX_PAGEEXEC;
42753+#endif
42754+
42755+#ifdef CONFIG_PAX_SEGMEXEC
42756+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
42757+ pax_flags |= MF_PAX_SEGMEXEC;
42758+#endif
42759+
42760+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42761+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42762+ if (nx_enabled)
42763+ pax_flags &= ~MF_PAX_SEGMEXEC;
42764+ else
42765+ pax_flags &= ~MF_PAX_PAGEEXEC;
42766+ }
42767+#endif
42768+
42769+#ifdef CONFIG_PAX_EMUTRAMP
42770+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
42771+ pax_flags |= MF_PAX_EMUTRAMP;
42772+#endif
42773+
42774+#ifdef CONFIG_PAX_MPROTECT
42775+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
42776+ pax_flags |= MF_PAX_MPROTECT;
42777+#endif
42778+
42779+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42780+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
42781+ pax_flags |= MF_PAX_RANDMMAP;
42782+#endif
42783+
42784+ return pax_flags;
42785+}
42786+#endif
42787+
42788+#ifdef CONFIG_PAX_EI_PAX
42789+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
42790+{
42791+ unsigned long pax_flags = 0UL;
42792+
42793+#ifdef CONFIG_PAX_PAGEEXEC
42794+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
42795+ pax_flags |= MF_PAX_PAGEEXEC;
42796+#endif
42797+
42798+#ifdef CONFIG_PAX_SEGMEXEC
42799+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
42800+ pax_flags |= MF_PAX_SEGMEXEC;
42801+#endif
42802+
42803+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42804+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42805+ if (nx_enabled)
42806+ pax_flags &= ~MF_PAX_SEGMEXEC;
42807+ else
42808+ pax_flags &= ~MF_PAX_PAGEEXEC;
42809+ }
42810+#endif
42811+
42812+#ifdef CONFIG_PAX_EMUTRAMP
42813+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
42814+ pax_flags |= MF_PAX_EMUTRAMP;
42815+#endif
42816+
42817+#ifdef CONFIG_PAX_MPROTECT
42818+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
42819+ pax_flags |= MF_PAX_MPROTECT;
42820+#endif
42821+
42822+#ifdef CONFIG_PAX_ASLR
42823+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
42824+ pax_flags |= MF_PAX_RANDMMAP;
42825+#endif
42826+
42827+ return pax_flags;
42828+}
42829+#endif
42830+
42831+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS)
42832+static long pax_parse_elf_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
42833+{
42834+ unsigned long pax_flags = 0UL;
42835+
42836+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42837+ unsigned long i;
42838+ int found_flags = 0;
42839+#endif
42840+
42841+#ifdef CONFIG_PAX_EI_PAX
42842+ pax_flags = pax_parse_ei_pax(elf_ex);
42843+#endif
42844+
42845+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42846+ for (i = 0UL; i < elf_ex->e_phnum; i++)
42847+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
42848+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
42849+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
42850+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
42851+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
42852+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
42853+ return -EINVAL;
42854+
42855+#ifdef CONFIG_PAX_SOFTMODE
42856+ if (pax_softmode)
42857+ pax_flags = pax_parse_softmode(&elf_phdata[i]);
42858+ else
42859+#endif
42860+
42861+ pax_flags = pax_parse_hardmode(&elf_phdata[i]);
42862+ found_flags = 1;
42863+ break;
42864+ }
42865+#endif
42866+
42867+#if !defined(CONFIG_PAX_EI_PAX) && defined(CONFIG_PAX_PT_PAX_FLAGS)
42868+ if (found_flags == 0) {
42869+ struct elf_phdr phdr;
42870+ memset(&phdr, 0, sizeof(phdr));
42871+ phdr.p_flags = PF_NOEMUTRAMP;
42872+#ifdef CONFIG_PAX_SOFTMODE
42873+ if (pax_softmode)
42874+ pax_flags = pax_parse_softmode(&phdr);
42875+ else
42876+#endif
42877+ pax_flags = pax_parse_hardmode(&phdr);
42878+ }
42879+#endif
42880+
42881+
42882+ if (0 > pax_check_flags(&pax_flags))
42883+ return -EINVAL;
42884+
42885+ current->mm->pax_flags = pax_flags;
42886+ return 0;
42887+}
42888+#endif
42889+
42890 /*
42891 * These are the functions used to load ELF style executables and shared
42892 * libraries. There is no binary dependent code anywhere else.
42893@@ -548,6 +761,11 @@ static unsigned long randomize_stack_top
42894 {
42895 unsigned int random_variable = 0;
42896
42897+#ifdef CONFIG_PAX_RANDUSTACK
42898+ if (randomize_va_space)
42899+ return stack_top - current->mm->delta_stack;
42900+#endif
42901+
42902 if ((current->flags & PF_RANDOMIZE) &&
42903 !(current->personality & ADDR_NO_RANDOMIZE)) {
42904 random_variable = get_random_int() & STACK_RND_MASK;
42905@@ -566,7 +784,7 @@ static int load_elf_binary(struct linux_
42906 unsigned long load_addr = 0, load_bias = 0;
42907 int load_addr_set = 0;
42908 char * elf_interpreter = NULL;
42909- unsigned long error;
42910+ unsigned long error = 0;
42911 struct elf_phdr *elf_ppnt, *elf_phdata;
42912 unsigned long elf_bss, elf_brk;
42913 int retval, i;
42914@@ -576,11 +794,11 @@ static int load_elf_binary(struct linux_
42915 unsigned long start_code, end_code, start_data, end_data;
42916 unsigned long reloc_func_desc = 0;
42917 int executable_stack = EXSTACK_DEFAULT;
42918- unsigned long def_flags = 0;
42919 struct {
42920 struct elfhdr elf_ex;
42921 struct elfhdr interp_elf_ex;
42922 } *loc;
42923+ unsigned long pax_task_size = TASK_SIZE;
42924
42925 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
42926 if (!loc) {
42927@@ -718,11 +936,80 @@ static int load_elf_binary(struct linux_
42928
42929 /* OK, This is the point of no return */
42930 current->flags &= ~PF_FORKNOEXEC;
42931- current->mm->def_flags = def_flags;
42932+
42933+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42934+ current->mm->pax_flags = 0UL;
42935+#endif
42936+
42937+#ifdef CONFIG_PAX_DLRESOLVE
42938+ current->mm->call_dl_resolve = 0UL;
42939+#endif
42940+
42941+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
42942+ current->mm->call_syscall = 0UL;
42943+#endif
42944+
42945+#ifdef CONFIG_PAX_ASLR
42946+ current->mm->delta_mmap = 0UL;
42947+ current->mm->delta_stack = 0UL;
42948+#endif
42949+
42950+ current->mm->def_flags = 0;
42951+
42952+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS)
42953+ if (0 > pax_parse_elf_flags(&loc->elf_ex, elf_phdata)) {
42954+ send_sig(SIGKILL, current, 0);
42955+ goto out_free_dentry;
42956+ }
42957+#endif
42958+
42959+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
42960+ pax_set_initial_flags(bprm);
42961+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
42962+ if (pax_set_initial_flags_func)
42963+ (pax_set_initial_flags_func)(bprm);
42964+#endif
42965+
42966+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
42967+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !nx_enabled) {
42968+ current->mm->context.user_cs_limit = PAGE_SIZE;
42969+ current->mm->def_flags |= VM_PAGEEXEC;
42970+ }
42971+#endif
42972+
42973+#ifdef CONFIG_PAX_SEGMEXEC
42974+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
42975+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
42976+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
42977+ pax_task_size = SEGMEXEC_TASK_SIZE;
42978+ }
42979+#endif
42980+
42981+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
42982+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42983+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
42984+ put_cpu();
42985+ }
42986+#endif
42987
42988 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
42989 may depend on the personality. */
42990 SET_PERSONALITY(loc->elf_ex);
42991+
42992+#ifdef CONFIG_PAX_ASLR
42993+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
42994+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
42995+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
42996+ }
42997+#endif
42998+
42999+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
43000+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
43001+ executable_stack = EXSTACK_DISABLE_X;
43002+ current->personality &= ~READ_IMPLIES_EXEC;
43003+ } else
43004+#endif
43005+
43006 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
43007 current->personality |= READ_IMPLIES_EXEC;
43008
43009@@ -804,6 +1091,20 @@ static int load_elf_binary(struct linux_
43010 #else
43011 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
43012 #endif
43013+
43014+#ifdef CONFIG_PAX_RANDMMAP
43015+ /* PaX: randomize base address at the default exe base if requested */
43016+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
43017+#ifdef CONFIG_SPARC64
43018+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
43019+#else
43020+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
43021+#endif
43022+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
43023+ elf_flags |= MAP_FIXED;
43024+ }
43025+#endif
43026+
43027 }
43028
43029 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
43030@@ -836,9 +1137,9 @@ static int load_elf_binary(struct linux_
43031 * allowed task size. Note that p_filesz must always be
43032 * <= p_memsz so it is only necessary to check p_memsz.
43033 */
43034- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
43035- elf_ppnt->p_memsz > TASK_SIZE ||
43036- TASK_SIZE - elf_ppnt->p_memsz < k) {
43037+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
43038+ elf_ppnt->p_memsz > pax_task_size ||
43039+ pax_task_size - elf_ppnt->p_memsz < k) {
43040 /* set_brk can never work. Avoid overflows. */
43041 send_sig(SIGKILL, current, 0);
43042 retval = -EINVAL;
43043@@ -866,6 +1167,11 @@ static int load_elf_binary(struct linux_
43044 start_data += load_bias;
43045 end_data += load_bias;
43046
43047+#ifdef CONFIG_PAX_RANDMMAP
43048+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
43049+ elf_brk += PAGE_SIZE + ((pax_get_random_long() & ~PAGE_MASK) << 4);
43050+#endif
43051+
43052 /* Calling set_brk effectively mmaps the pages that we need
43053 * for the bss and break sections. We must do this before
43054 * mapping in the interpreter, to make sure it doesn't wind
43055@@ -877,9 +1183,11 @@ static int load_elf_binary(struct linux_
43056 goto out_free_dentry;
43057 }
43058 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
43059- send_sig(SIGSEGV, current, 0);
43060- retval = -EFAULT; /* Nobody gets to see this, but.. */
43061- goto out_free_dentry;
43062+ /*
43063+ * This bss-zeroing can fail if the ELF
43064+ * file specifies odd protections. So
43065+ * we don't check the return value
43066+ */
43067 }
43068
43069 if (elf_interpreter) {
43070@@ -1112,8 +1420,10 @@ static int dump_seek(struct file *file,
43071 unsigned long n = off;
43072 if (n > PAGE_SIZE)
43073 n = PAGE_SIZE;
43074- if (!dump_write(file, buf, n))
43075+ if (!dump_write(file, buf, n)) {
43076+ free_page((unsigned long)buf);
43077 return 0;
43078+ }
43079 off -= n;
43080 }
43081 free_page((unsigned long)buf);
43082@@ -1125,7 +1435,7 @@ static int dump_seek(struct file *file,
43083 * Decide what to dump of a segment, part, all or none.
43084 */
43085 static unsigned long vma_dump_size(struct vm_area_struct *vma,
43086- unsigned long mm_flags)
43087+ unsigned long mm_flags, long signr)
43088 {
43089 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
43090
43091@@ -1159,7 +1469,7 @@ static unsigned long vma_dump_size(struc
43092 if (vma->vm_file == NULL)
43093 return 0;
43094
43095- if (FILTER(MAPPED_PRIVATE))
43096+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
43097 goto whole;
43098
43099 /*
43100@@ -1255,8 +1565,11 @@ static int writenote(struct memelfnote *
43101 #undef DUMP_WRITE
43102
43103 #define DUMP_WRITE(addr, nr) \
43104+ do { \
43105+ gr_learn_resource(current, RLIMIT_CORE, size + (nr), 1); \
43106 if ((size += (nr)) > limit || !dump_write(file, (addr), (nr))) \
43107- goto end_coredump;
43108+ goto end_coredump; \
43109+ } while (0);
43110
43111 static void fill_elf_header(struct elfhdr *elf, int segs,
43112 u16 machine, u32 flags, u8 osabi)
43113@@ -1385,9 +1698,9 @@ static void fill_auxv_note(struct memelf
43114 {
43115 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
43116 int i = 0;
43117- do
43118+ do {
43119 i += 2;
43120- while (auxv[i - 2] != AT_NULL);
43121+ } while (auxv[i - 2] != AT_NULL);
43122 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
43123 }
43124
43125@@ -1973,7 +2286,7 @@ static int elf_core_dump(long signr, str
43126 phdr.p_offset = offset;
43127 phdr.p_vaddr = vma->vm_start;
43128 phdr.p_paddr = 0;
43129- phdr.p_filesz = vma_dump_size(vma, mm_flags);
43130+ phdr.p_filesz = vma_dump_size(vma, mm_flags, signr);
43131 phdr.p_memsz = vma->vm_end - vma->vm_start;
43132 offset += phdr.p_filesz;
43133 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
43134@@ -2006,7 +2319,7 @@ static int elf_core_dump(long signr, str
43135 unsigned long addr;
43136 unsigned long end;
43137
43138- end = vma->vm_start + vma_dump_size(vma, mm_flags);
43139+ end = vma->vm_start + vma_dump_size(vma, mm_flags, signr);
43140
43141 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
43142 struct page *page;
43143@@ -2015,6 +2328,7 @@ static int elf_core_dump(long signr, str
43144 page = get_dump_page(addr);
43145 if (page) {
43146 void *kaddr = kmap(page);
43147+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
43148 stop = ((size += PAGE_SIZE) > limit) ||
43149 !dump_write(file, kaddr, PAGE_SIZE);
43150 kunmap(page);
43151@@ -2042,6 +2356,97 @@ out:
43152
43153 #endif /* USE_ELF_CORE_DUMP */
43154
43155+#ifdef CONFIG_PAX_MPROTECT
43156+/* PaX: non-PIC ELF libraries need relocations on their executable segments
43157+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
43158+ * we'll remove VM_MAYWRITE for good on RELRO segments.
43159+ *
43160+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
43161+ * basis because we want to allow the common case and not the special ones.
43162+ */
43163+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
43164+{
43165+ struct elfhdr elf_h;
43166+ struct elf_phdr elf_p;
43167+ unsigned long i;
43168+ unsigned long oldflags;
43169+ bool is_textrel_rw, is_textrel_rx, is_relro;
43170+
43171+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
43172+ return;
43173+
43174+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
43175+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
43176+
43177+#ifdef CONFIG_PAX_ELFRELOCS
43178+ /* possible TEXTREL */
43179+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
43180+ is_textrel_rx = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
43181+#else
43182+ is_textrel_rw = false;
43183+ is_textrel_rx = false;
43184+#endif
43185+
43186+ /* possible RELRO */
43187+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
43188+
43189+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
43190+ return;
43191+
43192+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
43193+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
43194+
43195+#ifdef CONFIG_PAX_ETEXECRELOCS
43196+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
43197+#else
43198+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
43199+#endif
43200+
43201+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
43202+ !elf_check_arch(&elf_h) ||
43203+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
43204+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
43205+ return;
43206+
43207+ for (i = 0UL; i < elf_h.e_phnum; i++) {
43208+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
43209+ return;
43210+ switch (elf_p.p_type) {
43211+ case PT_DYNAMIC:
43212+ if (!is_textrel_rw && !is_textrel_rx)
43213+ continue;
43214+ i = 0UL;
43215+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
43216+ elf_dyn dyn;
43217+
43218+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
43219+ return;
43220+ if (dyn.d_tag == DT_NULL)
43221+ return;
43222+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
43223+ gr_log_textrel(vma);
43224+ if (is_textrel_rw)
43225+ vma->vm_flags |= VM_MAYWRITE;
43226+ else
43227+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
43228+ vma->vm_flags &= ~VM_MAYWRITE;
43229+ return;
43230+ }
43231+ i++;
43232+ }
43233+ return;
43234+
43235+ case PT_GNU_RELRO:
43236+ if (!is_relro)
43237+ continue;
43238+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
43239+ vma->vm_flags &= ~VM_MAYWRITE;
43240+ return;
43241+ }
43242+ }
43243+}
43244+#endif
43245+
43246 static int __init init_elf_binfmt(void)
43247 {
43248 return register_binfmt(&elf_format);
43249diff -urNp linux-2.6.32.46/fs/binfmt_flat.c linux-2.6.32.46/fs/binfmt_flat.c
43250--- linux-2.6.32.46/fs/binfmt_flat.c 2011-03-27 14:31:47.000000000 -0400
43251+++ linux-2.6.32.46/fs/binfmt_flat.c 2011-04-17 15:56:46.000000000 -0400
43252@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
43253 realdatastart = (unsigned long) -ENOMEM;
43254 printk("Unable to allocate RAM for process data, errno %d\n",
43255 (int)-realdatastart);
43256+ down_write(&current->mm->mmap_sem);
43257 do_munmap(current->mm, textpos, text_len);
43258+ up_write(&current->mm->mmap_sem);
43259 ret = realdatastart;
43260 goto err;
43261 }
43262@@ -588,8 +590,10 @@ static int load_flat_file(struct linux_b
43263 }
43264 if (IS_ERR_VALUE(result)) {
43265 printk("Unable to read data+bss, errno %d\n", (int)-result);
43266+ down_write(&current->mm->mmap_sem);
43267 do_munmap(current->mm, textpos, text_len);
43268 do_munmap(current->mm, realdatastart, data_len + extra);
43269+ up_write(&current->mm->mmap_sem);
43270 ret = result;
43271 goto err;
43272 }
43273@@ -658,8 +662,10 @@ static int load_flat_file(struct linux_b
43274 }
43275 if (IS_ERR_VALUE(result)) {
43276 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
43277+ down_write(&current->mm->mmap_sem);
43278 do_munmap(current->mm, textpos, text_len + data_len + extra +
43279 MAX_SHARED_LIBS * sizeof(unsigned long));
43280+ up_write(&current->mm->mmap_sem);
43281 ret = result;
43282 goto err;
43283 }
43284diff -urNp linux-2.6.32.46/fs/bio.c linux-2.6.32.46/fs/bio.c
43285--- linux-2.6.32.46/fs/bio.c 2011-03-27 14:31:47.000000000 -0400
43286+++ linux-2.6.32.46/fs/bio.c 2011-10-06 09:37:14.000000000 -0400
43287@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
43288
43289 i = 0;
43290 while (i < bio_slab_nr) {
43291- struct bio_slab *bslab = &bio_slabs[i];
43292+ bslab = &bio_slabs[i];
43293
43294 if (!bslab->slab && entry == -1)
43295 entry = i;
43296@@ -1236,7 +1236,7 @@ static void bio_copy_kern_endio(struct b
43297 const int read = bio_data_dir(bio) == READ;
43298 struct bio_map_data *bmd = bio->bi_private;
43299 int i;
43300- char *p = bmd->sgvecs[0].iov_base;
43301+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
43302
43303 __bio_for_each_segment(bvec, bio, i, 0) {
43304 char *addr = page_address(bvec->bv_page);
43305diff -urNp linux-2.6.32.46/fs/block_dev.c linux-2.6.32.46/fs/block_dev.c
43306--- linux-2.6.32.46/fs/block_dev.c 2011-08-09 18:35:29.000000000 -0400
43307+++ linux-2.6.32.46/fs/block_dev.c 2011-08-09 18:34:00.000000000 -0400
43308@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
43309 else if (bdev->bd_contains == bdev)
43310 res = 0; /* is a whole device which isn't held */
43311
43312- else if (bdev->bd_contains->bd_holder == bd_claim)
43313+ else if (bdev->bd_contains->bd_holder == (void *)bd_claim)
43314 res = 0; /* is a partition of a device that is being partitioned */
43315 else if (bdev->bd_contains->bd_holder != NULL)
43316 res = -EBUSY; /* is a partition of a held device */
43317diff -urNp linux-2.6.32.46/fs/btrfs/ctree.c linux-2.6.32.46/fs/btrfs/ctree.c
43318--- linux-2.6.32.46/fs/btrfs/ctree.c 2011-03-27 14:31:47.000000000 -0400
43319+++ linux-2.6.32.46/fs/btrfs/ctree.c 2011-04-17 15:56:46.000000000 -0400
43320@@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
43321 free_extent_buffer(buf);
43322 add_root_to_dirty_list(root);
43323 } else {
43324- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
43325- parent_start = parent->start;
43326- else
43327+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
43328+ if (parent)
43329+ parent_start = parent->start;
43330+ else
43331+ parent_start = 0;
43332+ } else
43333 parent_start = 0;
43334
43335 WARN_ON(trans->transid != btrfs_header_generation(parent));
43336@@ -3645,7 +3648,6 @@ setup_items_for_insert(struct btrfs_tran
43337
43338 ret = 0;
43339 if (slot == 0) {
43340- struct btrfs_disk_key disk_key;
43341 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
43342 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
43343 }
43344diff -urNp linux-2.6.32.46/fs/btrfs/disk-io.c linux-2.6.32.46/fs/btrfs/disk-io.c
43345--- linux-2.6.32.46/fs/btrfs/disk-io.c 2011-04-17 17:00:52.000000000 -0400
43346+++ linux-2.6.32.46/fs/btrfs/disk-io.c 2011-04-17 17:03:11.000000000 -0400
43347@@ -39,7 +39,7 @@
43348 #include "tree-log.h"
43349 #include "free-space-cache.h"
43350
43351-static struct extent_io_ops btree_extent_io_ops;
43352+static const struct extent_io_ops btree_extent_io_ops;
43353 static void end_workqueue_fn(struct btrfs_work *work);
43354 static void free_fs_root(struct btrfs_root *root);
43355
43356@@ -2607,7 +2607,7 @@ out:
43357 return 0;
43358 }
43359
43360-static struct extent_io_ops btree_extent_io_ops = {
43361+static const struct extent_io_ops btree_extent_io_ops = {
43362 .write_cache_pages_lock_hook = btree_lock_page_hook,
43363 .readpage_end_io_hook = btree_readpage_end_io_hook,
43364 .submit_bio_hook = btree_submit_bio_hook,
43365diff -urNp linux-2.6.32.46/fs/btrfs/extent_io.h linux-2.6.32.46/fs/btrfs/extent_io.h
43366--- linux-2.6.32.46/fs/btrfs/extent_io.h 2011-03-27 14:31:47.000000000 -0400
43367+++ linux-2.6.32.46/fs/btrfs/extent_io.h 2011-04-17 15:56:46.000000000 -0400
43368@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
43369 struct bio *bio, int mirror_num,
43370 unsigned long bio_flags);
43371 struct extent_io_ops {
43372- int (*fill_delalloc)(struct inode *inode, struct page *locked_page,
43373+ int (* const fill_delalloc)(struct inode *inode, struct page *locked_page,
43374 u64 start, u64 end, int *page_started,
43375 unsigned long *nr_written);
43376- int (*writepage_start_hook)(struct page *page, u64 start, u64 end);
43377- int (*writepage_io_hook)(struct page *page, u64 start, u64 end);
43378+ int (* const writepage_start_hook)(struct page *page, u64 start, u64 end);
43379+ int (* const writepage_io_hook)(struct page *page, u64 start, u64 end);
43380 extent_submit_bio_hook_t *submit_bio_hook;
43381- int (*merge_bio_hook)(struct page *page, unsigned long offset,
43382+ int (* const merge_bio_hook)(struct page *page, unsigned long offset,
43383 size_t size, struct bio *bio,
43384 unsigned long bio_flags);
43385- int (*readpage_io_hook)(struct page *page, u64 start, u64 end);
43386- int (*readpage_io_failed_hook)(struct bio *bio, struct page *page,
43387+ int (* const readpage_io_hook)(struct page *page, u64 start, u64 end);
43388+ int (* const readpage_io_failed_hook)(struct bio *bio, struct page *page,
43389 u64 start, u64 end,
43390 struct extent_state *state);
43391- int (*writepage_io_failed_hook)(struct bio *bio, struct page *page,
43392+ int (* const writepage_io_failed_hook)(struct bio *bio, struct page *page,
43393 u64 start, u64 end,
43394 struct extent_state *state);
43395- int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end,
43396+ int (* const readpage_end_io_hook)(struct page *page, u64 start, u64 end,
43397 struct extent_state *state);
43398- int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end,
43399+ int (* const writepage_end_io_hook)(struct page *page, u64 start, u64 end,
43400 struct extent_state *state, int uptodate);
43401- int (*set_bit_hook)(struct inode *inode, u64 start, u64 end,
43402+ int (* const set_bit_hook)(struct inode *inode, u64 start, u64 end,
43403 unsigned long old, unsigned long bits);
43404- int (*clear_bit_hook)(struct inode *inode, struct extent_state *state,
43405+ int (* const clear_bit_hook)(struct inode *inode, struct extent_state *state,
43406 unsigned long bits);
43407- int (*merge_extent_hook)(struct inode *inode,
43408+ int (* const merge_extent_hook)(struct inode *inode,
43409 struct extent_state *new,
43410 struct extent_state *other);
43411- int (*split_extent_hook)(struct inode *inode,
43412+ int (* const split_extent_hook)(struct inode *inode,
43413 struct extent_state *orig, u64 split);
43414- int (*write_cache_pages_lock_hook)(struct page *page);
43415+ int (* const write_cache_pages_lock_hook)(struct page *page);
43416 };
43417
43418 struct extent_io_tree {
43419@@ -88,7 +88,7 @@ struct extent_io_tree {
43420 u64 dirty_bytes;
43421 spinlock_t lock;
43422 spinlock_t buffer_lock;
43423- struct extent_io_ops *ops;
43424+ const struct extent_io_ops *ops;
43425 };
43426
43427 struct extent_state {
43428diff -urNp linux-2.6.32.46/fs/btrfs/extent-tree.c linux-2.6.32.46/fs/btrfs/extent-tree.c
43429--- linux-2.6.32.46/fs/btrfs/extent-tree.c 2011-03-27 14:31:47.000000000 -0400
43430+++ linux-2.6.32.46/fs/btrfs/extent-tree.c 2011-06-12 06:39:08.000000000 -0400
43431@@ -7141,6 +7141,10 @@ static noinline int relocate_one_extent(
43432 u64 group_start = group->key.objectid;
43433 new_extents = kmalloc(sizeof(*new_extents),
43434 GFP_NOFS);
43435+ if (!new_extents) {
43436+ ret = -ENOMEM;
43437+ goto out;
43438+ }
43439 nr_extents = 1;
43440 ret = get_new_locations(reloc_inode,
43441 extent_key,
43442diff -urNp linux-2.6.32.46/fs/btrfs/free-space-cache.c linux-2.6.32.46/fs/btrfs/free-space-cache.c
43443--- linux-2.6.32.46/fs/btrfs/free-space-cache.c 2011-03-27 14:31:47.000000000 -0400
43444+++ linux-2.6.32.46/fs/btrfs/free-space-cache.c 2011-04-17 15:56:46.000000000 -0400
43445@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
43446
43447 while(1) {
43448 if (entry->bytes < bytes || entry->offset < min_start) {
43449- struct rb_node *node;
43450-
43451 node = rb_next(&entry->offset_index);
43452 if (!node)
43453 break;
43454@@ -1226,7 +1224,7 @@ again:
43455 */
43456 while (entry->bitmap || found_bitmap ||
43457 (!entry->bitmap && entry->bytes < min_bytes)) {
43458- struct rb_node *node = rb_next(&entry->offset_index);
43459+ node = rb_next(&entry->offset_index);
43460
43461 if (entry->bitmap && entry->bytes > bytes + empty_size) {
43462 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
43463diff -urNp linux-2.6.32.46/fs/btrfs/inode.c linux-2.6.32.46/fs/btrfs/inode.c
43464--- linux-2.6.32.46/fs/btrfs/inode.c 2011-03-27 14:31:47.000000000 -0400
43465+++ linux-2.6.32.46/fs/btrfs/inode.c 2011-06-12 06:39:58.000000000 -0400
43466@@ -63,7 +63,7 @@ static const struct inode_operations btr
43467 static const struct address_space_operations btrfs_aops;
43468 static const struct address_space_operations btrfs_symlink_aops;
43469 static const struct file_operations btrfs_dir_file_operations;
43470-static struct extent_io_ops btrfs_extent_io_ops;
43471+static const struct extent_io_ops btrfs_extent_io_ops;
43472
43473 static struct kmem_cache *btrfs_inode_cachep;
43474 struct kmem_cache *btrfs_trans_handle_cachep;
43475@@ -925,6 +925,7 @@ static int cow_file_range_async(struct i
43476 1, 0, NULL, GFP_NOFS);
43477 while (start < end) {
43478 async_cow = kmalloc(sizeof(*async_cow), GFP_NOFS);
43479+ BUG_ON(!async_cow);
43480 async_cow->inode = inode;
43481 async_cow->root = root;
43482 async_cow->locked_page = locked_page;
43483@@ -4591,6 +4592,8 @@ static noinline int uncompress_inline(st
43484 inline_size = btrfs_file_extent_inline_item_len(leaf,
43485 btrfs_item_nr(leaf, path->slots[0]));
43486 tmp = kmalloc(inline_size, GFP_NOFS);
43487+ if (!tmp)
43488+ return -ENOMEM;
43489 ptr = btrfs_file_extent_inline_start(item);
43490
43491 read_extent_buffer(leaf, tmp, ptr, inline_size);
43492@@ -5410,7 +5413,7 @@ fail:
43493 return -ENOMEM;
43494 }
43495
43496-static int btrfs_getattr(struct vfsmount *mnt,
43497+int btrfs_getattr(struct vfsmount *mnt,
43498 struct dentry *dentry, struct kstat *stat)
43499 {
43500 struct inode *inode = dentry->d_inode;
43501@@ -5422,6 +5425,14 @@ static int btrfs_getattr(struct vfsmount
43502 return 0;
43503 }
43504
43505+EXPORT_SYMBOL(btrfs_getattr);
43506+
43507+dev_t get_btrfs_dev_from_inode(struct inode *inode)
43508+{
43509+ return BTRFS_I(inode)->root->anon_super.s_dev;
43510+}
43511+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
43512+
43513 static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
43514 struct inode *new_dir, struct dentry *new_dentry)
43515 {
43516@@ -5972,7 +5983,7 @@ static const struct file_operations btrf
43517 .fsync = btrfs_sync_file,
43518 };
43519
43520-static struct extent_io_ops btrfs_extent_io_ops = {
43521+static const struct extent_io_ops btrfs_extent_io_ops = {
43522 .fill_delalloc = run_delalloc_range,
43523 .submit_bio_hook = btrfs_submit_bio_hook,
43524 .merge_bio_hook = btrfs_merge_bio_hook,
43525diff -urNp linux-2.6.32.46/fs/btrfs/relocation.c linux-2.6.32.46/fs/btrfs/relocation.c
43526--- linux-2.6.32.46/fs/btrfs/relocation.c 2011-03-27 14:31:47.000000000 -0400
43527+++ linux-2.6.32.46/fs/btrfs/relocation.c 2011-04-17 15:56:46.000000000 -0400
43528@@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt
43529 }
43530 spin_unlock(&rc->reloc_root_tree.lock);
43531
43532- BUG_ON((struct btrfs_root *)node->data != root);
43533+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
43534
43535 if (!del) {
43536 spin_lock(&rc->reloc_root_tree.lock);
43537diff -urNp linux-2.6.32.46/fs/btrfs/sysfs.c linux-2.6.32.46/fs/btrfs/sysfs.c
43538--- linux-2.6.32.46/fs/btrfs/sysfs.c 2011-03-27 14:31:47.000000000 -0400
43539+++ linux-2.6.32.46/fs/btrfs/sysfs.c 2011-04-17 15:56:46.000000000 -0400
43540@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
43541 complete(&root->kobj_unregister);
43542 }
43543
43544-static struct sysfs_ops btrfs_super_attr_ops = {
43545+static const struct sysfs_ops btrfs_super_attr_ops = {
43546 .show = btrfs_super_attr_show,
43547 .store = btrfs_super_attr_store,
43548 };
43549
43550-static struct sysfs_ops btrfs_root_attr_ops = {
43551+static const struct sysfs_ops btrfs_root_attr_ops = {
43552 .show = btrfs_root_attr_show,
43553 .store = btrfs_root_attr_store,
43554 };
43555diff -urNp linux-2.6.32.46/fs/buffer.c linux-2.6.32.46/fs/buffer.c
43556--- linux-2.6.32.46/fs/buffer.c 2011-03-27 14:31:47.000000000 -0400
43557+++ linux-2.6.32.46/fs/buffer.c 2011-04-17 15:56:46.000000000 -0400
43558@@ -25,6 +25,7 @@
43559 #include <linux/percpu.h>
43560 #include <linux/slab.h>
43561 #include <linux/capability.h>
43562+#include <linux/security.h>
43563 #include <linux/blkdev.h>
43564 #include <linux/file.h>
43565 #include <linux/quotaops.h>
43566diff -urNp linux-2.6.32.46/fs/cachefiles/bind.c linux-2.6.32.46/fs/cachefiles/bind.c
43567--- linux-2.6.32.46/fs/cachefiles/bind.c 2011-03-27 14:31:47.000000000 -0400
43568+++ linux-2.6.32.46/fs/cachefiles/bind.c 2011-04-17 15:56:46.000000000 -0400
43569@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
43570 args);
43571
43572 /* start by checking things over */
43573- ASSERT(cache->fstop_percent >= 0 &&
43574- cache->fstop_percent < cache->fcull_percent &&
43575+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
43576 cache->fcull_percent < cache->frun_percent &&
43577 cache->frun_percent < 100);
43578
43579- ASSERT(cache->bstop_percent >= 0 &&
43580- cache->bstop_percent < cache->bcull_percent &&
43581+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
43582 cache->bcull_percent < cache->brun_percent &&
43583 cache->brun_percent < 100);
43584
43585diff -urNp linux-2.6.32.46/fs/cachefiles/daemon.c linux-2.6.32.46/fs/cachefiles/daemon.c
43586--- linux-2.6.32.46/fs/cachefiles/daemon.c 2011-03-27 14:31:47.000000000 -0400
43587+++ linux-2.6.32.46/fs/cachefiles/daemon.c 2011-04-17 15:56:46.000000000 -0400
43588@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
43589 if (test_bit(CACHEFILES_DEAD, &cache->flags))
43590 return -EIO;
43591
43592- if (datalen < 0 || datalen > PAGE_SIZE - 1)
43593+ if (datalen > PAGE_SIZE - 1)
43594 return -EOPNOTSUPP;
43595
43596 /* drag the command string into the kernel so we can parse it */
43597@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struc
43598 if (args[0] != '%' || args[1] != '\0')
43599 return -EINVAL;
43600
43601- if (fstop < 0 || fstop >= cache->fcull_percent)
43602+ if (fstop >= cache->fcull_percent)
43603 return cachefiles_daemon_range_error(cache, args);
43604
43605 cache->fstop_percent = fstop;
43606@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struc
43607 if (args[0] != '%' || args[1] != '\0')
43608 return -EINVAL;
43609
43610- if (bstop < 0 || bstop >= cache->bcull_percent)
43611+ if (bstop >= cache->bcull_percent)
43612 return cachefiles_daemon_range_error(cache, args);
43613
43614 cache->bstop_percent = bstop;
43615diff -urNp linux-2.6.32.46/fs/cachefiles/internal.h linux-2.6.32.46/fs/cachefiles/internal.h
43616--- linux-2.6.32.46/fs/cachefiles/internal.h 2011-03-27 14:31:47.000000000 -0400
43617+++ linux-2.6.32.46/fs/cachefiles/internal.h 2011-05-04 17:56:28.000000000 -0400
43618@@ -56,7 +56,7 @@ struct cachefiles_cache {
43619 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
43620 struct rb_root active_nodes; /* active nodes (can't be culled) */
43621 rwlock_t active_lock; /* lock for active_nodes */
43622- atomic_t gravecounter; /* graveyard uniquifier */
43623+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
43624 unsigned frun_percent; /* when to stop culling (% files) */
43625 unsigned fcull_percent; /* when to start culling (% files) */
43626 unsigned fstop_percent; /* when to stop allocating (% files) */
43627@@ -168,19 +168,19 @@ extern int cachefiles_check_in_use(struc
43628 * proc.c
43629 */
43630 #ifdef CONFIG_CACHEFILES_HISTOGRAM
43631-extern atomic_t cachefiles_lookup_histogram[HZ];
43632-extern atomic_t cachefiles_mkdir_histogram[HZ];
43633-extern atomic_t cachefiles_create_histogram[HZ];
43634+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43635+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43636+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
43637
43638 extern int __init cachefiles_proc_init(void);
43639 extern void cachefiles_proc_cleanup(void);
43640 static inline
43641-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
43642+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
43643 {
43644 unsigned long jif = jiffies - start_jif;
43645 if (jif >= HZ)
43646 jif = HZ - 1;
43647- atomic_inc(&histogram[jif]);
43648+ atomic_inc_unchecked(&histogram[jif]);
43649 }
43650
43651 #else
43652diff -urNp linux-2.6.32.46/fs/cachefiles/namei.c linux-2.6.32.46/fs/cachefiles/namei.c
43653--- linux-2.6.32.46/fs/cachefiles/namei.c 2011-03-27 14:31:47.000000000 -0400
43654+++ linux-2.6.32.46/fs/cachefiles/namei.c 2011-05-04 17:56:28.000000000 -0400
43655@@ -250,7 +250,7 @@ try_again:
43656 /* first step is to make up a grave dentry in the graveyard */
43657 sprintf(nbuffer, "%08x%08x",
43658 (uint32_t) get_seconds(),
43659- (uint32_t) atomic_inc_return(&cache->gravecounter));
43660+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
43661
43662 /* do the multiway lock magic */
43663 trap = lock_rename(cache->graveyard, dir);
43664diff -urNp linux-2.6.32.46/fs/cachefiles/proc.c linux-2.6.32.46/fs/cachefiles/proc.c
43665--- linux-2.6.32.46/fs/cachefiles/proc.c 2011-03-27 14:31:47.000000000 -0400
43666+++ linux-2.6.32.46/fs/cachefiles/proc.c 2011-05-04 17:56:28.000000000 -0400
43667@@ -14,9 +14,9 @@
43668 #include <linux/seq_file.h>
43669 #include "internal.h"
43670
43671-atomic_t cachefiles_lookup_histogram[HZ];
43672-atomic_t cachefiles_mkdir_histogram[HZ];
43673-atomic_t cachefiles_create_histogram[HZ];
43674+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43675+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43676+atomic_unchecked_t cachefiles_create_histogram[HZ];
43677
43678 /*
43679 * display the latency histogram
43680@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(str
43681 return 0;
43682 default:
43683 index = (unsigned long) v - 3;
43684- x = atomic_read(&cachefiles_lookup_histogram[index]);
43685- y = atomic_read(&cachefiles_mkdir_histogram[index]);
43686- z = atomic_read(&cachefiles_create_histogram[index]);
43687+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
43688+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
43689+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
43690 if (x == 0 && y == 0 && z == 0)
43691 return 0;
43692
43693diff -urNp linux-2.6.32.46/fs/cachefiles/rdwr.c linux-2.6.32.46/fs/cachefiles/rdwr.c
43694--- linux-2.6.32.46/fs/cachefiles/rdwr.c 2011-03-27 14:31:47.000000000 -0400
43695+++ linux-2.6.32.46/fs/cachefiles/rdwr.c 2011-10-06 09:37:14.000000000 -0400
43696@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
43697 old_fs = get_fs();
43698 set_fs(KERNEL_DS);
43699 ret = file->f_op->write(
43700- file, (const void __user *) data, len, &pos);
43701+ file, (const void __force_user *) data, len, &pos);
43702 set_fs(old_fs);
43703 kunmap(page);
43704 if (ret != len)
43705diff -urNp linux-2.6.32.46/fs/cifs/cifs_debug.c linux-2.6.32.46/fs/cifs/cifs_debug.c
43706--- linux-2.6.32.46/fs/cifs/cifs_debug.c 2011-03-27 14:31:47.000000000 -0400
43707+++ linux-2.6.32.46/fs/cifs/cifs_debug.c 2011-05-04 17:56:28.000000000 -0400
43708@@ -256,25 +256,25 @@ static ssize_t cifs_stats_proc_write(str
43709 tcon = list_entry(tmp3,
43710 struct cifsTconInfo,
43711 tcon_list);
43712- atomic_set(&tcon->num_smbs_sent, 0);
43713- atomic_set(&tcon->num_writes, 0);
43714- atomic_set(&tcon->num_reads, 0);
43715- atomic_set(&tcon->num_oplock_brks, 0);
43716- atomic_set(&tcon->num_opens, 0);
43717- atomic_set(&tcon->num_posixopens, 0);
43718- atomic_set(&tcon->num_posixmkdirs, 0);
43719- atomic_set(&tcon->num_closes, 0);
43720- atomic_set(&tcon->num_deletes, 0);
43721- atomic_set(&tcon->num_mkdirs, 0);
43722- atomic_set(&tcon->num_rmdirs, 0);
43723- atomic_set(&tcon->num_renames, 0);
43724- atomic_set(&tcon->num_t2renames, 0);
43725- atomic_set(&tcon->num_ffirst, 0);
43726- atomic_set(&tcon->num_fnext, 0);
43727- atomic_set(&tcon->num_fclose, 0);
43728- atomic_set(&tcon->num_hardlinks, 0);
43729- atomic_set(&tcon->num_symlinks, 0);
43730- atomic_set(&tcon->num_locks, 0);
43731+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
43732+ atomic_set_unchecked(&tcon->num_writes, 0);
43733+ atomic_set_unchecked(&tcon->num_reads, 0);
43734+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
43735+ atomic_set_unchecked(&tcon->num_opens, 0);
43736+ atomic_set_unchecked(&tcon->num_posixopens, 0);
43737+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
43738+ atomic_set_unchecked(&tcon->num_closes, 0);
43739+ atomic_set_unchecked(&tcon->num_deletes, 0);
43740+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
43741+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
43742+ atomic_set_unchecked(&tcon->num_renames, 0);
43743+ atomic_set_unchecked(&tcon->num_t2renames, 0);
43744+ atomic_set_unchecked(&tcon->num_ffirst, 0);
43745+ atomic_set_unchecked(&tcon->num_fnext, 0);
43746+ atomic_set_unchecked(&tcon->num_fclose, 0);
43747+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
43748+ atomic_set_unchecked(&tcon->num_symlinks, 0);
43749+ atomic_set_unchecked(&tcon->num_locks, 0);
43750 }
43751 }
43752 }
43753@@ -334,41 +334,41 @@ static int cifs_stats_proc_show(struct s
43754 if (tcon->need_reconnect)
43755 seq_puts(m, "\tDISCONNECTED ");
43756 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
43757- atomic_read(&tcon->num_smbs_sent),
43758- atomic_read(&tcon->num_oplock_brks));
43759+ atomic_read_unchecked(&tcon->num_smbs_sent),
43760+ atomic_read_unchecked(&tcon->num_oplock_brks));
43761 seq_printf(m, "\nReads: %d Bytes: %lld",
43762- atomic_read(&tcon->num_reads),
43763+ atomic_read_unchecked(&tcon->num_reads),
43764 (long long)(tcon->bytes_read));
43765 seq_printf(m, "\nWrites: %d Bytes: %lld",
43766- atomic_read(&tcon->num_writes),
43767+ atomic_read_unchecked(&tcon->num_writes),
43768 (long long)(tcon->bytes_written));
43769 seq_printf(m, "\nFlushes: %d",
43770- atomic_read(&tcon->num_flushes));
43771+ atomic_read_unchecked(&tcon->num_flushes));
43772 seq_printf(m, "\nLocks: %d HardLinks: %d "
43773 "Symlinks: %d",
43774- atomic_read(&tcon->num_locks),
43775- atomic_read(&tcon->num_hardlinks),
43776- atomic_read(&tcon->num_symlinks));
43777+ atomic_read_unchecked(&tcon->num_locks),
43778+ atomic_read_unchecked(&tcon->num_hardlinks),
43779+ atomic_read_unchecked(&tcon->num_symlinks));
43780 seq_printf(m, "\nOpens: %d Closes: %d "
43781 "Deletes: %d",
43782- atomic_read(&tcon->num_opens),
43783- atomic_read(&tcon->num_closes),
43784- atomic_read(&tcon->num_deletes));
43785+ atomic_read_unchecked(&tcon->num_opens),
43786+ atomic_read_unchecked(&tcon->num_closes),
43787+ atomic_read_unchecked(&tcon->num_deletes));
43788 seq_printf(m, "\nPosix Opens: %d "
43789 "Posix Mkdirs: %d",
43790- atomic_read(&tcon->num_posixopens),
43791- atomic_read(&tcon->num_posixmkdirs));
43792+ atomic_read_unchecked(&tcon->num_posixopens),
43793+ atomic_read_unchecked(&tcon->num_posixmkdirs));
43794 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
43795- atomic_read(&tcon->num_mkdirs),
43796- atomic_read(&tcon->num_rmdirs));
43797+ atomic_read_unchecked(&tcon->num_mkdirs),
43798+ atomic_read_unchecked(&tcon->num_rmdirs));
43799 seq_printf(m, "\nRenames: %d T2 Renames %d",
43800- atomic_read(&tcon->num_renames),
43801- atomic_read(&tcon->num_t2renames));
43802+ atomic_read_unchecked(&tcon->num_renames),
43803+ atomic_read_unchecked(&tcon->num_t2renames));
43804 seq_printf(m, "\nFindFirst: %d FNext %d "
43805 "FClose %d",
43806- atomic_read(&tcon->num_ffirst),
43807- atomic_read(&tcon->num_fnext),
43808- atomic_read(&tcon->num_fclose));
43809+ atomic_read_unchecked(&tcon->num_ffirst),
43810+ atomic_read_unchecked(&tcon->num_fnext),
43811+ atomic_read_unchecked(&tcon->num_fclose));
43812 }
43813 }
43814 }
43815diff -urNp linux-2.6.32.46/fs/cifs/cifsfs.c linux-2.6.32.46/fs/cifs/cifsfs.c
43816--- linux-2.6.32.46/fs/cifs/cifsfs.c 2011-03-27 14:31:47.000000000 -0400
43817+++ linux-2.6.32.46/fs/cifs/cifsfs.c 2011-08-25 17:17:57.000000000 -0400
43818@@ -869,7 +869,7 @@ cifs_init_request_bufs(void)
43819 cifs_req_cachep = kmem_cache_create("cifs_request",
43820 CIFSMaxBufSize +
43821 MAX_CIFS_HDR_SIZE, 0,
43822- SLAB_HWCACHE_ALIGN, NULL);
43823+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
43824 if (cifs_req_cachep == NULL)
43825 return -ENOMEM;
43826
43827@@ -896,7 +896,7 @@ cifs_init_request_bufs(void)
43828 efficient to alloc 1 per page off the slab compared to 17K (5page)
43829 alloc of large cifs buffers even when page debugging is on */
43830 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
43831- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
43832+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
43833 NULL);
43834 if (cifs_sm_req_cachep == NULL) {
43835 mempool_destroy(cifs_req_poolp);
43836@@ -991,8 +991,8 @@ init_cifs(void)
43837 atomic_set(&bufAllocCount, 0);
43838 atomic_set(&smBufAllocCount, 0);
43839 #ifdef CONFIG_CIFS_STATS2
43840- atomic_set(&totBufAllocCount, 0);
43841- atomic_set(&totSmBufAllocCount, 0);
43842+ atomic_set_unchecked(&totBufAllocCount, 0);
43843+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43844 #endif /* CONFIG_CIFS_STATS2 */
43845
43846 atomic_set(&midCount, 0);
43847diff -urNp linux-2.6.32.46/fs/cifs/cifsglob.h linux-2.6.32.46/fs/cifs/cifsglob.h
43848--- linux-2.6.32.46/fs/cifs/cifsglob.h 2011-08-09 18:35:29.000000000 -0400
43849+++ linux-2.6.32.46/fs/cifs/cifsglob.h 2011-08-25 17:17:57.000000000 -0400
43850@@ -252,28 +252,28 @@ struct cifsTconInfo {
43851 __u16 Flags; /* optional support bits */
43852 enum statusEnum tidStatus;
43853 #ifdef CONFIG_CIFS_STATS
43854- atomic_t num_smbs_sent;
43855- atomic_t num_writes;
43856- atomic_t num_reads;
43857- atomic_t num_flushes;
43858- atomic_t num_oplock_brks;
43859- atomic_t num_opens;
43860- atomic_t num_closes;
43861- atomic_t num_deletes;
43862- atomic_t num_mkdirs;
43863- atomic_t num_posixopens;
43864- atomic_t num_posixmkdirs;
43865- atomic_t num_rmdirs;
43866- atomic_t num_renames;
43867- atomic_t num_t2renames;
43868- atomic_t num_ffirst;
43869- atomic_t num_fnext;
43870- atomic_t num_fclose;
43871- atomic_t num_hardlinks;
43872- atomic_t num_symlinks;
43873- atomic_t num_locks;
43874- atomic_t num_acl_get;
43875- atomic_t num_acl_set;
43876+ atomic_unchecked_t num_smbs_sent;
43877+ atomic_unchecked_t num_writes;
43878+ atomic_unchecked_t num_reads;
43879+ atomic_unchecked_t num_flushes;
43880+ atomic_unchecked_t num_oplock_brks;
43881+ atomic_unchecked_t num_opens;
43882+ atomic_unchecked_t num_closes;
43883+ atomic_unchecked_t num_deletes;
43884+ atomic_unchecked_t num_mkdirs;
43885+ atomic_unchecked_t num_posixopens;
43886+ atomic_unchecked_t num_posixmkdirs;
43887+ atomic_unchecked_t num_rmdirs;
43888+ atomic_unchecked_t num_renames;
43889+ atomic_unchecked_t num_t2renames;
43890+ atomic_unchecked_t num_ffirst;
43891+ atomic_unchecked_t num_fnext;
43892+ atomic_unchecked_t num_fclose;
43893+ atomic_unchecked_t num_hardlinks;
43894+ atomic_unchecked_t num_symlinks;
43895+ atomic_unchecked_t num_locks;
43896+ atomic_unchecked_t num_acl_get;
43897+ atomic_unchecked_t num_acl_set;
43898 #ifdef CONFIG_CIFS_STATS2
43899 unsigned long long time_writes;
43900 unsigned long long time_reads;
43901@@ -414,7 +414,7 @@ static inline char CIFS_DIR_SEP(const st
43902 }
43903
43904 #ifdef CONFIG_CIFS_STATS
43905-#define cifs_stats_inc atomic_inc
43906+#define cifs_stats_inc atomic_inc_unchecked
43907
43908 static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
43909 unsigned int bytes)
43910@@ -701,8 +701,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnect
43911 /* Various Debug counters */
43912 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
43913 #ifdef CONFIG_CIFS_STATS2
43914-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
43915-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
43916+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
43917+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
43918 #endif
43919 GLOBAL_EXTERN atomic_t smBufAllocCount;
43920 GLOBAL_EXTERN atomic_t midCount;
43921diff -urNp linux-2.6.32.46/fs/cifs/link.c linux-2.6.32.46/fs/cifs/link.c
43922--- linux-2.6.32.46/fs/cifs/link.c 2011-03-27 14:31:47.000000000 -0400
43923+++ linux-2.6.32.46/fs/cifs/link.c 2011-04-17 15:56:46.000000000 -0400
43924@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
43925
43926 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
43927 {
43928- char *p = nd_get_link(nd);
43929+ const char *p = nd_get_link(nd);
43930 if (!IS_ERR(p))
43931 kfree(p);
43932 }
43933diff -urNp linux-2.6.32.46/fs/cifs/misc.c linux-2.6.32.46/fs/cifs/misc.c
43934--- linux-2.6.32.46/fs/cifs/misc.c 2011-03-27 14:31:47.000000000 -0400
43935+++ linux-2.6.32.46/fs/cifs/misc.c 2011-08-25 17:17:57.000000000 -0400
43936@@ -155,7 +155,7 @@ cifs_buf_get(void)
43937 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
43938 atomic_inc(&bufAllocCount);
43939 #ifdef CONFIG_CIFS_STATS2
43940- atomic_inc(&totBufAllocCount);
43941+ atomic_inc_unchecked(&totBufAllocCount);
43942 #endif /* CONFIG_CIFS_STATS2 */
43943 }
43944
43945@@ -190,7 +190,7 @@ cifs_small_buf_get(void)
43946 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
43947 atomic_inc(&smBufAllocCount);
43948 #ifdef CONFIG_CIFS_STATS2
43949- atomic_inc(&totSmBufAllocCount);
43950+ atomic_inc_unchecked(&totSmBufAllocCount);
43951 #endif /* CONFIG_CIFS_STATS2 */
43952
43953 }
43954diff -urNp linux-2.6.32.46/fs/coda/cache.c linux-2.6.32.46/fs/coda/cache.c
43955--- linux-2.6.32.46/fs/coda/cache.c 2011-03-27 14:31:47.000000000 -0400
43956+++ linux-2.6.32.46/fs/coda/cache.c 2011-05-04 17:56:28.000000000 -0400
43957@@ -24,14 +24,14 @@
43958 #include <linux/coda_fs_i.h>
43959 #include <linux/coda_cache.h>
43960
43961-static atomic_t permission_epoch = ATOMIC_INIT(0);
43962+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
43963
43964 /* replace or extend an acl cache hit */
43965 void coda_cache_enter(struct inode *inode, int mask)
43966 {
43967 struct coda_inode_info *cii = ITOC(inode);
43968
43969- cii->c_cached_epoch = atomic_read(&permission_epoch);
43970+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
43971 if (cii->c_uid != current_fsuid()) {
43972 cii->c_uid = current_fsuid();
43973 cii->c_cached_perm = mask;
43974@@ -43,13 +43,13 @@ void coda_cache_enter(struct inode *inod
43975 void coda_cache_clear_inode(struct inode *inode)
43976 {
43977 struct coda_inode_info *cii = ITOC(inode);
43978- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
43979+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
43980 }
43981
43982 /* remove all acl caches */
43983 void coda_cache_clear_all(struct super_block *sb)
43984 {
43985- atomic_inc(&permission_epoch);
43986+ atomic_inc_unchecked(&permission_epoch);
43987 }
43988
43989
43990@@ -61,7 +61,7 @@ int coda_cache_check(struct inode *inode
43991
43992 hit = (mask & cii->c_cached_perm) == mask &&
43993 cii->c_uid == current_fsuid() &&
43994- cii->c_cached_epoch == atomic_read(&permission_epoch);
43995+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
43996
43997 return hit;
43998 }
43999diff -urNp linux-2.6.32.46/fs/compat_binfmt_elf.c linux-2.6.32.46/fs/compat_binfmt_elf.c
44000--- linux-2.6.32.46/fs/compat_binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400
44001+++ linux-2.6.32.46/fs/compat_binfmt_elf.c 2011-04-17 15:56:46.000000000 -0400
44002@@ -29,10 +29,12 @@
44003 #undef elfhdr
44004 #undef elf_phdr
44005 #undef elf_note
44006+#undef elf_dyn
44007 #undef elf_addr_t
44008 #define elfhdr elf32_hdr
44009 #define elf_phdr elf32_phdr
44010 #define elf_note elf32_note
44011+#define elf_dyn Elf32_Dyn
44012 #define elf_addr_t Elf32_Addr
44013
44014 /*
44015diff -urNp linux-2.6.32.46/fs/compat.c linux-2.6.32.46/fs/compat.c
44016--- linux-2.6.32.46/fs/compat.c 2011-04-17 17:00:52.000000000 -0400
44017+++ linux-2.6.32.46/fs/compat.c 2011-10-06 09:37:14.000000000 -0400
44018@@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(char _
44019 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
44020 {
44021 compat_ino_t ino = stat->ino;
44022- typeof(ubuf->st_uid) uid = 0;
44023- typeof(ubuf->st_gid) gid = 0;
44024+ typeof(((struct compat_stat *)0)->st_uid) uid = 0;
44025+ typeof(((struct compat_stat *)0)->st_gid) gid = 0;
44026 int err;
44027
44028 SET_UID(uid, stat->uid);
44029@@ -533,7 +533,7 @@ compat_sys_io_setup(unsigned nr_reqs, u3
44030
44031 set_fs(KERNEL_DS);
44032 /* The __user pointer cast is valid because of the set_fs() */
44033- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
44034+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
44035 set_fs(oldfs);
44036 /* truncating is ok because it's a user address */
44037 if (!ret)
44038@@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
44039
44040 struct compat_readdir_callback {
44041 struct compat_old_linux_dirent __user *dirent;
44042+ struct file * file;
44043 int result;
44044 };
44045
44046@@ -847,6 +848,10 @@ static int compat_fillonedir(void *__buf
44047 buf->result = -EOVERFLOW;
44048 return -EOVERFLOW;
44049 }
44050+
44051+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44052+ return 0;
44053+
44054 buf->result++;
44055 dirent = buf->dirent;
44056 if (!access_ok(VERIFY_WRITE, dirent,
44057@@ -879,6 +884,7 @@ asmlinkage long compat_sys_old_readdir(u
44058
44059 buf.result = 0;
44060 buf.dirent = dirent;
44061+ buf.file = file;
44062
44063 error = vfs_readdir(file, compat_fillonedir, &buf);
44064 if (buf.result)
44065@@ -899,6 +905,7 @@ struct compat_linux_dirent {
44066 struct compat_getdents_callback {
44067 struct compat_linux_dirent __user *current_dir;
44068 struct compat_linux_dirent __user *previous;
44069+ struct file * file;
44070 int count;
44071 int error;
44072 };
44073@@ -919,6 +926,10 @@ static int compat_filldir(void *__buf, c
44074 buf->error = -EOVERFLOW;
44075 return -EOVERFLOW;
44076 }
44077+
44078+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44079+ return 0;
44080+
44081 dirent = buf->previous;
44082 if (dirent) {
44083 if (__put_user(offset, &dirent->d_off))
44084@@ -966,6 +977,7 @@ asmlinkage long compat_sys_getdents(unsi
44085 buf.previous = NULL;
44086 buf.count = count;
44087 buf.error = 0;
44088+ buf.file = file;
44089
44090 error = vfs_readdir(file, compat_filldir, &buf);
44091 if (error >= 0)
44092@@ -987,6 +999,7 @@ out:
44093 struct compat_getdents_callback64 {
44094 struct linux_dirent64 __user *current_dir;
44095 struct linux_dirent64 __user *previous;
44096+ struct file * file;
44097 int count;
44098 int error;
44099 };
44100@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf
44101 buf->error = -EINVAL; /* only used if we fail.. */
44102 if (reclen > buf->count)
44103 return -EINVAL;
44104+
44105+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44106+ return 0;
44107+
44108 dirent = buf->previous;
44109
44110 if (dirent) {
44111@@ -1054,13 +1071,14 @@ asmlinkage long compat_sys_getdents64(un
44112 buf.previous = NULL;
44113 buf.count = count;
44114 buf.error = 0;
44115+ buf.file = file;
44116
44117 error = vfs_readdir(file, compat_filldir64, &buf);
44118 if (error >= 0)
44119 error = buf.error;
44120 lastdirent = buf.previous;
44121 if (lastdirent) {
44122- typeof(lastdirent->d_off) d_off = file->f_pos;
44123+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
44124 if (__put_user_unaligned(d_off, &lastdirent->d_off))
44125 error = -EFAULT;
44126 else
44127@@ -1098,7 +1116,7 @@ static ssize_t compat_do_readv_writev(in
44128 * verify all the pointers
44129 */
44130 ret = -EINVAL;
44131- if ((nr_segs > UIO_MAXIOV) || (nr_segs <= 0))
44132+ if (nr_segs > UIO_MAXIOV)
44133 goto out;
44134 if (!file->f_op)
44135 goto out;
44136@@ -1463,11 +1481,35 @@ int compat_do_execve(char * filename,
44137 compat_uptr_t __user *envp,
44138 struct pt_regs * regs)
44139 {
44140+#ifdef CONFIG_GRKERNSEC
44141+ struct file *old_exec_file;
44142+ struct acl_subject_label *old_acl;
44143+ struct rlimit old_rlim[RLIM_NLIMITS];
44144+#endif
44145 struct linux_binprm *bprm;
44146 struct file *file;
44147 struct files_struct *displaced;
44148 bool clear_in_exec;
44149 int retval;
44150+ const struct cred *cred = current_cred();
44151+
44152+ /*
44153+ * We move the actual failure in case of RLIMIT_NPROC excess from
44154+ * set*uid() to execve() because too many poorly written programs
44155+ * don't check setuid() return code. Here we additionally recheck
44156+ * whether NPROC limit is still exceeded.
44157+ */
44158+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
44159+
44160+ if ((current->flags & PF_NPROC_EXCEEDED) &&
44161+ atomic_read(&cred->user->processes) > current->signal->rlim[RLIMIT_NPROC].rlim_cur) {
44162+ retval = -EAGAIN;
44163+ goto out_ret;
44164+ }
44165+
44166+ /* We're below the limit (still or again), so we don't want to make
44167+ * further execve() calls fail. */
44168+ current->flags &= ~PF_NPROC_EXCEEDED;
44169
44170 retval = unshare_files(&displaced);
44171 if (retval)
44172@@ -1499,6 +1541,15 @@ int compat_do_execve(char * filename,
44173 bprm->filename = filename;
44174 bprm->interp = filename;
44175
44176+ if (gr_process_user_ban()) {
44177+ retval = -EPERM;
44178+ goto out_file;
44179+ }
44180+
44181+ retval = -EACCES;
44182+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt))
44183+ goto out_file;
44184+
44185 retval = bprm_mm_init(bprm);
44186 if (retval)
44187 goto out_file;
44188@@ -1528,9 +1579,40 @@ int compat_do_execve(char * filename,
44189 if (retval < 0)
44190 goto out;
44191
44192+ if (!gr_tpe_allow(file)) {
44193+ retval = -EACCES;
44194+ goto out;
44195+ }
44196+
44197+ if (gr_check_crash_exec(file)) {
44198+ retval = -EACCES;
44199+ goto out;
44200+ }
44201+
44202+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
44203+
44204+ gr_handle_exec_args_compat(bprm, argv);
44205+
44206+#ifdef CONFIG_GRKERNSEC
44207+ old_acl = current->acl;
44208+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
44209+ old_exec_file = current->exec_file;
44210+ get_file(file);
44211+ current->exec_file = file;
44212+#endif
44213+
44214+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
44215+ bprm->unsafe & LSM_UNSAFE_SHARE);
44216+ if (retval < 0)
44217+ goto out_fail;
44218+
44219 retval = search_binary_handler(bprm, regs);
44220 if (retval < 0)
44221- goto out;
44222+ goto out_fail;
44223+#ifdef CONFIG_GRKERNSEC
44224+ if (old_exec_file)
44225+ fput(old_exec_file);
44226+#endif
44227
44228 /* execve succeeded */
44229 current->fs->in_exec = 0;
44230@@ -1541,6 +1623,14 @@ int compat_do_execve(char * filename,
44231 put_files_struct(displaced);
44232 return retval;
44233
44234+out_fail:
44235+#ifdef CONFIG_GRKERNSEC
44236+ current->acl = old_acl;
44237+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
44238+ fput(current->exec_file);
44239+ current->exec_file = old_exec_file;
44240+#endif
44241+
44242 out:
44243 if (bprm->mm) {
44244 acct_arg_size(bprm, 0);
44245@@ -1711,6 +1801,8 @@ int compat_core_sys_select(int n, compat
44246 struct fdtable *fdt;
44247 long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
44248
44249+ pax_track_stack();
44250+
44251 if (n < 0)
44252 goto out_nofds;
44253
44254@@ -2151,7 +2243,7 @@ asmlinkage long compat_sys_nfsservctl(in
44255 oldfs = get_fs();
44256 set_fs(KERNEL_DS);
44257 /* The __user pointer casts are valid because of the set_fs() */
44258- err = sys_nfsservctl(cmd, (void __user *) karg, (void __user *) kres);
44259+ err = sys_nfsservctl(cmd, (void __force_user *) karg, (void __force_user *) kres);
44260 set_fs(oldfs);
44261
44262 if (err)
44263diff -urNp linux-2.6.32.46/fs/compat_ioctl.c linux-2.6.32.46/fs/compat_ioctl.c
44264--- linux-2.6.32.46/fs/compat_ioctl.c 2011-03-27 14:31:47.000000000 -0400
44265+++ linux-2.6.32.46/fs/compat_ioctl.c 2011-10-06 09:37:14.000000000 -0400
44266@@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi
44267 up = (struct compat_video_spu_palette __user *) arg;
44268 err = get_user(palp, &up->palette);
44269 err |= get_user(length, &up->length);
44270+ if (err)
44271+ return -EFAULT;
44272
44273 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
44274 err = put_user(compat_ptr(palp), &up_native->palette);
44275@@ -1513,7 +1515,7 @@ static int serial_struct_ioctl(unsigned
44276 return -EFAULT;
44277 if (__get_user(udata, &ss32->iomem_base))
44278 return -EFAULT;
44279- ss.iomem_base = compat_ptr(udata);
44280+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
44281 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
44282 __get_user(ss.port_high, &ss32->port_high))
44283 return -EFAULT;
44284@@ -1809,7 +1811,7 @@ static int compat_ioctl_preallocate(stru
44285 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
44286 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
44287 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
44288- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
44289+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
44290 return -EFAULT;
44291
44292 return ioctl_preallocate(file, p);
44293diff -urNp linux-2.6.32.46/fs/configfs/dir.c linux-2.6.32.46/fs/configfs/dir.c
44294--- linux-2.6.32.46/fs/configfs/dir.c 2011-03-27 14:31:47.000000000 -0400
44295+++ linux-2.6.32.46/fs/configfs/dir.c 2011-05-11 18:25:15.000000000 -0400
44296@@ -1572,7 +1572,8 @@ static int configfs_readdir(struct file
44297 }
44298 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
44299 struct configfs_dirent *next;
44300- const char * name;
44301+ const unsigned char * name;
44302+ char d_name[sizeof(next->s_dentry->d_iname)];
44303 int len;
44304
44305 next = list_entry(p, struct configfs_dirent,
44306@@ -1581,7 +1582,12 @@ static int configfs_readdir(struct file
44307 continue;
44308
44309 name = configfs_get_name(next);
44310- len = strlen(name);
44311+ if (next->s_dentry && name == next->s_dentry->d_iname) {
44312+ len = next->s_dentry->d_name.len;
44313+ memcpy(d_name, name, len);
44314+ name = d_name;
44315+ } else
44316+ len = strlen(name);
44317 if (next->s_dentry)
44318 ino = next->s_dentry->d_inode->i_ino;
44319 else
44320diff -urNp linux-2.6.32.46/fs/dcache.c linux-2.6.32.46/fs/dcache.c
44321--- linux-2.6.32.46/fs/dcache.c 2011-03-27 14:31:47.000000000 -0400
44322+++ linux-2.6.32.46/fs/dcache.c 2011-04-23 13:32:21.000000000 -0400
44323@@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock);
44324
44325 static struct kmem_cache *dentry_cache __read_mostly;
44326
44327-#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname))
44328-
44329 /*
44330 * This is the single most critical data structure when it comes
44331 * to the dcache: the hashtable for lookups. Somebody should try
44332@@ -2319,7 +2317,7 @@ void __init vfs_caches_init(unsigned lon
44333 mempages -= reserve;
44334
44335 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
44336- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
44337+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
44338
44339 dcache_init();
44340 inode_init();
44341diff -urNp linux-2.6.32.46/fs/dlm/lockspace.c linux-2.6.32.46/fs/dlm/lockspace.c
44342--- linux-2.6.32.46/fs/dlm/lockspace.c 2011-03-27 14:31:47.000000000 -0400
44343+++ linux-2.6.32.46/fs/dlm/lockspace.c 2011-04-17 15:56:46.000000000 -0400
44344@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
44345 kfree(ls);
44346 }
44347
44348-static struct sysfs_ops dlm_attr_ops = {
44349+static const struct sysfs_ops dlm_attr_ops = {
44350 .show = dlm_attr_show,
44351 .store = dlm_attr_store,
44352 };
44353diff -urNp linux-2.6.32.46/fs/ecryptfs/inode.c linux-2.6.32.46/fs/ecryptfs/inode.c
44354--- linux-2.6.32.46/fs/ecryptfs/inode.c 2011-03-27 14:31:47.000000000 -0400
44355+++ linux-2.6.32.46/fs/ecryptfs/inode.c 2011-10-06 09:37:14.000000000 -0400
44356@@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc
44357 old_fs = get_fs();
44358 set_fs(get_ds());
44359 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
44360- (char __user *)lower_buf,
44361+ (char __force_user *)lower_buf,
44362 lower_bufsiz);
44363 set_fs(old_fs);
44364 if (rc < 0)
44365@@ -706,7 +706,7 @@ static void *ecryptfs_follow_link(struct
44366 }
44367 old_fs = get_fs();
44368 set_fs(get_ds());
44369- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
44370+ rc = dentry->d_inode->i_op->readlink(dentry, (__force char __user *)buf, len);
44371 set_fs(old_fs);
44372 if (rc < 0)
44373 goto out_free;
44374diff -urNp linux-2.6.32.46/fs/exec.c linux-2.6.32.46/fs/exec.c
44375--- linux-2.6.32.46/fs/exec.c 2011-06-25 12:55:34.000000000 -0400
44376+++ linux-2.6.32.46/fs/exec.c 2011-10-06 09:37:14.000000000 -0400
44377@@ -56,12 +56,24 @@
44378 #include <linux/fsnotify.h>
44379 #include <linux/fs_struct.h>
44380 #include <linux/pipe_fs_i.h>
44381+#include <linux/random.h>
44382+#include <linux/seq_file.h>
44383+
44384+#ifdef CONFIG_PAX_REFCOUNT
44385+#include <linux/kallsyms.h>
44386+#include <linux/kdebug.h>
44387+#endif
44388
44389 #include <asm/uaccess.h>
44390 #include <asm/mmu_context.h>
44391 #include <asm/tlb.h>
44392 #include "internal.h"
44393
44394+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
44395+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
44396+EXPORT_SYMBOL(pax_set_initial_flags_func);
44397+#endif
44398+
44399 int core_uses_pid;
44400 char core_pattern[CORENAME_MAX_SIZE] = "core";
44401 unsigned int core_pipe_limit;
44402@@ -115,7 +127,7 @@ SYSCALL_DEFINE1(uselib, const char __use
44403 goto out;
44404
44405 file = do_filp_open(AT_FDCWD, tmp,
44406- O_LARGEFILE | O_RDONLY | FMODE_EXEC, 0,
44407+ O_LARGEFILE | O_RDONLY | FMODE_EXEC | FMODE_GREXEC, 0,
44408 MAY_READ | MAY_EXEC | MAY_OPEN);
44409 putname(tmp);
44410 error = PTR_ERR(file);
44411@@ -178,18 +190,10 @@ struct page *get_arg_page(struct linux_b
44412 int write)
44413 {
44414 struct page *page;
44415- int ret;
44416
44417-#ifdef CONFIG_STACK_GROWSUP
44418- if (write) {
44419- ret = expand_stack_downwards(bprm->vma, pos);
44420- if (ret < 0)
44421- return NULL;
44422- }
44423-#endif
44424- ret = get_user_pages(current, bprm->mm, pos,
44425- 1, write, 1, &page, NULL);
44426- if (ret <= 0)
44427+ if (0 > expand_stack_downwards(bprm->vma, pos))
44428+ return NULL;
44429+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
44430 return NULL;
44431
44432 if (write) {
44433@@ -263,6 +267,11 @@ static int __bprm_mm_init(struct linux_b
44434 vma->vm_end = STACK_TOP_MAX;
44435 vma->vm_start = vma->vm_end - PAGE_SIZE;
44436 vma->vm_flags = VM_STACK_FLAGS;
44437+
44438+#ifdef CONFIG_PAX_SEGMEXEC
44439+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
44440+#endif
44441+
44442 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
44443
44444 err = security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1);
44445@@ -276,6 +285,12 @@ static int __bprm_mm_init(struct linux_b
44446 mm->stack_vm = mm->total_vm = 1;
44447 up_write(&mm->mmap_sem);
44448 bprm->p = vma->vm_end - sizeof(void *);
44449+
44450+#ifdef CONFIG_PAX_RANDUSTACK
44451+ if (randomize_va_space)
44452+ bprm->p ^= (pax_get_random_long() & ~15) & ~PAGE_MASK;
44453+#endif
44454+
44455 return 0;
44456 err:
44457 up_write(&mm->mmap_sem);
44458@@ -510,7 +525,7 @@ int copy_strings_kernel(int argc,char **
44459 int r;
44460 mm_segment_t oldfs = get_fs();
44461 set_fs(KERNEL_DS);
44462- r = copy_strings(argc, (char __user * __user *)argv, bprm);
44463+ r = copy_strings(argc, (__force char __user * __user *)argv, bprm);
44464 set_fs(oldfs);
44465 return r;
44466 }
44467@@ -540,7 +555,8 @@ static int shift_arg_pages(struct vm_are
44468 unsigned long new_end = old_end - shift;
44469 struct mmu_gather *tlb;
44470
44471- BUG_ON(new_start > new_end);
44472+ if (new_start >= new_end || new_start < mmap_min_addr)
44473+ return -ENOMEM;
44474
44475 /*
44476 * ensure there are no vmas between where we want to go
44477@@ -549,6 +565,10 @@ static int shift_arg_pages(struct vm_are
44478 if (vma != find_vma(mm, new_start))
44479 return -EFAULT;
44480
44481+#ifdef CONFIG_PAX_SEGMEXEC
44482+ BUG_ON(pax_find_mirror_vma(vma));
44483+#endif
44484+
44485 /*
44486 * cover the whole range: [new_start, old_end)
44487 */
44488@@ -630,10 +650,6 @@ int setup_arg_pages(struct linux_binprm
44489 stack_top = arch_align_stack(stack_top);
44490 stack_top = PAGE_ALIGN(stack_top);
44491
44492- if (unlikely(stack_top < mmap_min_addr) ||
44493- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
44494- return -ENOMEM;
44495-
44496 stack_shift = vma->vm_end - stack_top;
44497
44498 bprm->p -= stack_shift;
44499@@ -645,6 +661,14 @@ int setup_arg_pages(struct linux_binprm
44500 bprm->exec -= stack_shift;
44501
44502 down_write(&mm->mmap_sem);
44503+
44504+ /* Move stack pages down in memory. */
44505+ if (stack_shift) {
44506+ ret = shift_arg_pages(vma, stack_shift);
44507+ if (ret)
44508+ goto out_unlock;
44509+ }
44510+
44511 vm_flags = VM_STACK_FLAGS;
44512
44513 /*
44514@@ -658,19 +682,24 @@ int setup_arg_pages(struct linux_binprm
44515 vm_flags &= ~VM_EXEC;
44516 vm_flags |= mm->def_flags;
44517
44518+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44519+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
44520+ vm_flags &= ~VM_EXEC;
44521+
44522+#ifdef CONFIG_PAX_MPROTECT
44523+ if (mm->pax_flags & MF_PAX_MPROTECT)
44524+ vm_flags &= ~VM_MAYEXEC;
44525+#endif
44526+
44527+ }
44528+#endif
44529+
44530 ret = mprotect_fixup(vma, &prev, vma->vm_start, vma->vm_end,
44531 vm_flags);
44532 if (ret)
44533 goto out_unlock;
44534 BUG_ON(prev != vma);
44535
44536- /* Move stack pages down in memory. */
44537- if (stack_shift) {
44538- ret = shift_arg_pages(vma, stack_shift);
44539- if (ret)
44540- goto out_unlock;
44541- }
44542-
44543 stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE;
44544 stack_size = vma->vm_end - vma->vm_start;
44545 /*
44546@@ -707,7 +736,7 @@ struct file *open_exec(const char *name)
44547 int err;
44548
44549 file = do_filp_open(AT_FDCWD, name,
44550- O_LARGEFILE | O_RDONLY | FMODE_EXEC, 0,
44551+ O_LARGEFILE | O_RDONLY | FMODE_EXEC | FMODE_GREXEC, 0,
44552 MAY_EXEC | MAY_OPEN);
44553 if (IS_ERR(file))
44554 goto out;
44555@@ -744,7 +773,7 @@ int kernel_read(struct file *file, loff_
44556 old_fs = get_fs();
44557 set_fs(get_ds());
44558 /* The cast to a user pointer is valid due to the set_fs() */
44559- result = vfs_read(file, (void __user *)addr, count, &pos);
44560+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
44561 set_fs(old_fs);
44562 return result;
44563 }
44564@@ -1152,7 +1181,7 @@ int check_unsafe_exec(struct linux_binpr
44565 }
44566 rcu_read_unlock();
44567
44568- if (p->fs->users > n_fs) {
44569+ if (atomic_read(&p->fs->users) > n_fs) {
44570 bprm->unsafe |= LSM_UNSAFE_SHARE;
44571 } else {
44572 res = -EAGAIN;
44573@@ -1347,11 +1376,35 @@ int do_execve(char * filename,
44574 char __user *__user *envp,
44575 struct pt_regs * regs)
44576 {
44577+#ifdef CONFIG_GRKERNSEC
44578+ struct file *old_exec_file;
44579+ struct acl_subject_label *old_acl;
44580+ struct rlimit old_rlim[RLIM_NLIMITS];
44581+#endif
44582 struct linux_binprm *bprm;
44583 struct file *file;
44584 struct files_struct *displaced;
44585 bool clear_in_exec;
44586 int retval;
44587+ const struct cred *cred = current_cred();
44588+
44589+ /*
44590+ * We move the actual failure in case of RLIMIT_NPROC excess from
44591+ * set*uid() to execve() because too many poorly written programs
44592+ * don't check setuid() return code. Here we additionally recheck
44593+ * whether NPROC limit is still exceeded.
44594+ */
44595+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
44596+
44597+ if ((current->flags & PF_NPROC_EXCEEDED) &&
44598+ atomic_read(&cred->user->processes) > current->signal->rlim[RLIMIT_NPROC].rlim_cur) {
44599+ retval = -EAGAIN;
44600+ goto out_ret;
44601+ }
44602+
44603+ /* We're below the limit (still or again), so we don't want to make
44604+ * further execve() calls fail. */
44605+ current->flags &= ~PF_NPROC_EXCEEDED;
44606
44607 retval = unshare_files(&displaced);
44608 if (retval)
44609@@ -1383,6 +1436,16 @@ int do_execve(char * filename,
44610 bprm->filename = filename;
44611 bprm->interp = filename;
44612
44613+ if (gr_process_user_ban()) {
44614+ retval = -EPERM;
44615+ goto out_file;
44616+ }
44617+
44618+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
44619+ retval = -EACCES;
44620+ goto out_file;
44621+ }
44622+
44623 retval = bprm_mm_init(bprm);
44624 if (retval)
44625 goto out_file;
44626@@ -1412,10 +1475,41 @@ int do_execve(char * filename,
44627 if (retval < 0)
44628 goto out;
44629
44630+ if (!gr_tpe_allow(file)) {
44631+ retval = -EACCES;
44632+ goto out;
44633+ }
44634+
44635+ if (gr_check_crash_exec(file)) {
44636+ retval = -EACCES;
44637+ goto out;
44638+ }
44639+
44640+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
44641+
44642+ gr_handle_exec_args(bprm, (const char __user *const __user *)argv);
44643+
44644+#ifdef CONFIG_GRKERNSEC
44645+ old_acl = current->acl;
44646+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
44647+ old_exec_file = current->exec_file;
44648+ get_file(file);
44649+ current->exec_file = file;
44650+#endif
44651+
44652+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
44653+ bprm->unsafe & LSM_UNSAFE_SHARE);
44654+ if (retval < 0)
44655+ goto out_fail;
44656+
44657 current->flags &= ~PF_KTHREAD;
44658 retval = search_binary_handler(bprm,regs);
44659 if (retval < 0)
44660- goto out;
44661+ goto out_fail;
44662+#ifdef CONFIG_GRKERNSEC
44663+ if (old_exec_file)
44664+ fput(old_exec_file);
44665+#endif
44666
44667 /* execve succeeded */
44668 current->fs->in_exec = 0;
44669@@ -1426,6 +1520,14 @@ int do_execve(char * filename,
44670 put_files_struct(displaced);
44671 return retval;
44672
44673+out_fail:
44674+#ifdef CONFIG_GRKERNSEC
44675+ current->acl = old_acl;
44676+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
44677+ fput(current->exec_file);
44678+ current->exec_file = old_exec_file;
44679+#endif
44680+
44681 out:
44682 if (bprm->mm) {
44683 acct_arg_size(bprm, 0);
44684@@ -1591,6 +1693,220 @@ out:
44685 return ispipe;
44686 }
44687
44688+int pax_check_flags(unsigned long *flags)
44689+{
44690+ int retval = 0;
44691+
44692+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
44693+ if (*flags & MF_PAX_SEGMEXEC)
44694+ {
44695+ *flags &= ~MF_PAX_SEGMEXEC;
44696+ retval = -EINVAL;
44697+ }
44698+#endif
44699+
44700+ if ((*flags & MF_PAX_PAGEEXEC)
44701+
44702+#ifdef CONFIG_PAX_PAGEEXEC
44703+ && (*flags & MF_PAX_SEGMEXEC)
44704+#endif
44705+
44706+ )
44707+ {
44708+ *flags &= ~MF_PAX_PAGEEXEC;
44709+ retval = -EINVAL;
44710+ }
44711+
44712+ if ((*flags & MF_PAX_MPROTECT)
44713+
44714+#ifdef CONFIG_PAX_MPROTECT
44715+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44716+#endif
44717+
44718+ )
44719+ {
44720+ *flags &= ~MF_PAX_MPROTECT;
44721+ retval = -EINVAL;
44722+ }
44723+
44724+ if ((*flags & MF_PAX_EMUTRAMP)
44725+
44726+#ifdef CONFIG_PAX_EMUTRAMP
44727+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44728+#endif
44729+
44730+ )
44731+ {
44732+ *flags &= ~MF_PAX_EMUTRAMP;
44733+ retval = -EINVAL;
44734+ }
44735+
44736+ return retval;
44737+}
44738+
44739+EXPORT_SYMBOL(pax_check_flags);
44740+
44741+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44742+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
44743+{
44744+ struct task_struct *tsk = current;
44745+ struct mm_struct *mm = current->mm;
44746+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
44747+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
44748+ char *path_exec = NULL;
44749+ char *path_fault = NULL;
44750+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
44751+
44752+ if (buffer_exec && buffer_fault) {
44753+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
44754+
44755+ down_read(&mm->mmap_sem);
44756+ vma = mm->mmap;
44757+ while (vma && (!vma_exec || !vma_fault)) {
44758+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
44759+ vma_exec = vma;
44760+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
44761+ vma_fault = vma;
44762+ vma = vma->vm_next;
44763+ }
44764+ if (vma_exec) {
44765+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
44766+ if (IS_ERR(path_exec))
44767+ path_exec = "<path too long>";
44768+ else {
44769+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
44770+ if (path_exec) {
44771+ *path_exec = 0;
44772+ path_exec = buffer_exec;
44773+ } else
44774+ path_exec = "<path too long>";
44775+ }
44776+ }
44777+ if (vma_fault) {
44778+ start = vma_fault->vm_start;
44779+ end = vma_fault->vm_end;
44780+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
44781+ if (vma_fault->vm_file) {
44782+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
44783+ if (IS_ERR(path_fault))
44784+ path_fault = "<path too long>";
44785+ else {
44786+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
44787+ if (path_fault) {
44788+ *path_fault = 0;
44789+ path_fault = buffer_fault;
44790+ } else
44791+ path_fault = "<path too long>";
44792+ }
44793+ } else
44794+ path_fault = "<anonymous mapping>";
44795+ }
44796+ up_read(&mm->mmap_sem);
44797+ }
44798+ if (tsk->signal->curr_ip)
44799+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
44800+ else
44801+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
44802+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
44803+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
44804+ task_uid(tsk), task_euid(tsk), pc, sp);
44805+ free_page((unsigned long)buffer_exec);
44806+ free_page((unsigned long)buffer_fault);
44807+ pax_report_insns(pc, sp);
44808+ do_coredump(SIGKILL, SIGKILL, regs);
44809+}
44810+#endif
44811+
44812+#ifdef CONFIG_PAX_REFCOUNT
44813+void pax_report_refcount_overflow(struct pt_regs *regs)
44814+{
44815+ if (current->signal->curr_ip)
44816+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44817+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
44818+ else
44819+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44820+ current->comm, task_pid_nr(current), current_uid(), current_euid());
44821+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
44822+ show_regs(regs);
44823+ force_sig_specific(SIGKILL, current);
44824+}
44825+#endif
44826+
44827+#ifdef CONFIG_PAX_USERCOPY
44828+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
44829+int object_is_on_stack(const void *obj, unsigned long len)
44830+{
44831+ const void * const stack = task_stack_page(current);
44832+ const void * const stackend = stack + THREAD_SIZE;
44833+
44834+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44835+ const void *frame = NULL;
44836+ const void *oldframe;
44837+#endif
44838+
44839+ if (obj + len < obj)
44840+ return -1;
44841+
44842+ if (obj + len <= stack || stackend <= obj)
44843+ return 0;
44844+
44845+ if (obj < stack || stackend < obj + len)
44846+ return -1;
44847+
44848+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44849+ oldframe = __builtin_frame_address(1);
44850+ if (oldframe)
44851+ frame = __builtin_frame_address(2);
44852+ /*
44853+ low ----------------------------------------------> high
44854+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
44855+ ^----------------^
44856+ allow copies only within here
44857+ */
44858+ while (stack <= frame && frame < stackend) {
44859+ /* if obj + len extends past the last frame, this
44860+ check won't pass and the next frame will be 0,
44861+ causing us to bail out and correctly report
44862+ the copy as invalid
44863+ */
44864+ if (obj + len <= frame)
44865+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
44866+ oldframe = frame;
44867+ frame = *(const void * const *)frame;
44868+ }
44869+ return -1;
44870+#else
44871+ return 1;
44872+#endif
44873+}
44874+
44875+
44876+NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
44877+{
44878+ if (current->signal->curr_ip)
44879+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44880+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44881+ else
44882+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44883+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44884+
44885+ dump_stack();
44886+ gr_handle_kernel_exploit();
44887+ do_group_exit(SIGKILL);
44888+}
44889+#endif
44890+
44891+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
44892+void pax_track_stack(void)
44893+{
44894+ unsigned long sp = (unsigned long)&sp;
44895+ if (sp < current_thread_info()->lowest_stack &&
44896+ sp > (unsigned long)task_stack_page(current))
44897+ current_thread_info()->lowest_stack = sp;
44898+}
44899+EXPORT_SYMBOL(pax_track_stack);
44900+#endif
44901+
44902 static int zap_process(struct task_struct *start)
44903 {
44904 struct task_struct *t;
44905@@ -1793,17 +2109,17 @@ static void wait_for_dump_helpers(struct
44906 pipe = file->f_path.dentry->d_inode->i_pipe;
44907
44908 pipe_lock(pipe);
44909- pipe->readers++;
44910- pipe->writers--;
44911+ atomic_inc(&pipe->readers);
44912+ atomic_dec(&pipe->writers);
44913
44914- while ((pipe->readers > 1) && (!signal_pending(current))) {
44915+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
44916 wake_up_interruptible_sync(&pipe->wait);
44917 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
44918 pipe_wait(pipe);
44919 }
44920
44921- pipe->readers--;
44922- pipe->writers++;
44923+ atomic_dec(&pipe->readers);
44924+ atomic_inc(&pipe->writers);
44925 pipe_unlock(pipe);
44926
44927 }
44928@@ -1826,10 +2142,13 @@ void do_coredump(long signr, int exit_co
44929 char **helper_argv = NULL;
44930 int helper_argc = 0;
44931 int dump_count = 0;
44932- static atomic_t core_dump_count = ATOMIC_INIT(0);
44933+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
44934
44935 audit_core_dumps(signr);
44936
44937+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
44938+ gr_handle_brute_attach(current, mm->flags);
44939+
44940 binfmt = mm->binfmt;
44941 if (!binfmt || !binfmt->core_dump)
44942 goto fail;
44943@@ -1874,6 +2193,8 @@ void do_coredump(long signr, int exit_co
44944 */
44945 clear_thread_flag(TIF_SIGPENDING);
44946
44947+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
44948+
44949 /*
44950 * lock_kernel() because format_corename() is controlled by sysctl, which
44951 * uses lock_kernel()
44952@@ -1908,7 +2229,7 @@ void do_coredump(long signr, int exit_co
44953 goto fail_unlock;
44954 }
44955
44956- dump_count = atomic_inc_return(&core_dump_count);
44957+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
44958 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
44959 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
44960 task_tgid_vnr(current), current->comm);
44961@@ -1972,7 +2293,7 @@ close_fail:
44962 filp_close(file, NULL);
44963 fail_dropcount:
44964 if (dump_count)
44965- atomic_dec(&core_dump_count);
44966+ atomic_dec_unchecked(&core_dump_count);
44967 fail_unlock:
44968 if (helper_argv)
44969 argv_free(helper_argv);
44970diff -urNp linux-2.6.32.46/fs/ext2/balloc.c linux-2.6.32.46/fs/ext2/balloc.c
44971--- linux-2.6.32.46/fs/ext2/balloc.c 2011-03-27 14:31:47.000000000 -0400
44972+++ linux-2.6.32.46/fs/ext2/balloc.c 2011-04-17 15:56:46.000000000 -0400
44973@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
44974
44975 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44976 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44977- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44978+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
44979 sbi->s_resuid != current_fsuid() &&
44980 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44981 return 0;
44982diff -urNp linux-2.6.32.46/fs/ext3/balloc.c linux-2.6.32.46/fs/ext3/balloc.c
44983--- linux-2.6.32.46/fs/ext3/balloc.c 2011-03-27 14:31:47.000000000 -0400
44984+++ linux-2.6.32.46/fs/ext3/balloc.c 2011-04-17 15:56:46.000000000 -0400
44985@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
44986
44987 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44988 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44989- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44990+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
44991 sbi->s_resuid != current_fsuid() &&
44992 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44993 return 0;
44994diff -urNp linux-2.6.32.46/fs/ext4/balloc.c linux-2.6.32.46/fs/ext4/balloc.c
44995--- linux-2.6.32.46/fs/ext4/balloc.c 2011-03-27 14:31:47.000000000 -0400
44996+++ linux-2.6.32.46/fs/ext4/balloc.c 2011-04-17 15:56:46.000000000 -0400
44997@@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
44998 /* Hm, nope. Are (enough) root reserved blocks available? */
44999 if (sbi->s_resuid == current_fsuid() ||
45000 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
45001- capable(CAP_SYS_RESOURCE)) {
45002+ capable_nolog(CAP_SYS_RESOURCE)) {
45003 if (free_blocks >= (nblocks + dirty_blocks))
45004 return 1;
45005 }
45006diff -urNp linux-2.6.32.46/fs/ext4/ext4.h linux-2.6.32.46/fs/ext4/ext4.h
45007--- linux-2.6.32.46/fs/ext4/ext4.h 2011-03-27 14:31:47.000000000 -0400
45008+++ linux-2.6.32.46/fs/ext4/ext4.h 2011-04-17 15:56:46.000000000 -0400
45009@@ -1078,19 +1078,19 @@ struct ext4_sb_info {
45010
45011 /* stats for buddy allocator */
45012 spinlock_t s_mb_pa_lock;
45013- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
45014- atomic_t s_bal_success; /* we found long enough chunks */
45015- atomic_t s_bal_allocated; /* in blocks */
45016- atomic_t s_bal_ex_scanned; /* total extents scanned */
45017- atomic_t s_bal_goals; /* goal hits */
45018- atomic_t s_bal_breaks; /* too long searches */
45019- atomic_t s_bal_2orders; /* 2^order hits */
45020+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
45021+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
45022+ atomic_unchecked_t s_bal_allocated; /* in blocks */
45023+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
45024+ atomic_unchecked_t s_bal_goals; /* goal hits */
45025+ atomic_unchecked_t s_bal_breaks; /* too long searches */
45026+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
45027 spinlock_t s_bal_lock;
45028 unsigned long s_mb_buddies_generated;
45029 unsigned long long s_mb_generation_time;
45030- atomic_t s_mb_lost_chunks;
45031- atomic_t s_mb_preallocated;
45032- atomic_t s_mb_discarded;
45033+ atomic_unchecked_t s_mb_lost_chunks;
45034+ atomic_unchecked_t s_mb_preallocated;
45035+ atomic_unchecked_t s_mb_discarded;
45036 atomic_t s_lock_busy;
45037
45038 /* locality groups */
45039diff -urNp linux-2.6.32.46/fs/ext4/mballoc.c linux-2.6.32.46/fs/ext4/mballoc.c
45040--- linux-2.6.32.46/fs/ext4/mballoc.c 2011-06-25 12:55:34.000000000 -0400
45041+++ linux-2.6.32.46/fs/ext4/mballoc.c 2011-06-25 12:56:37.000000000 -0400
45042@@ -1755,7 +1755,7 @@ void ext4_mb_simple_scan_group(struct ex
45043 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
45044
45045 if (EXT4_SB(sb)->s_mb_stats)
45046- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
45047+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
45048
45049 break;
45050 }
45051@@ -2131,7 +2131,7 @@ repeat:
45052 ac->ac_status = AC_STATUS_CONTINUE;
45053 ac->ac_flags |= EXT4_MB_HINT_FIRST;
45054 cr = 3;
45055- atomic_inc(&sbi->s_mb_lost_chunks);
45056+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
45057 goto repeat;
45058 }
45059 }
45060@@ -2174,6 +2174,8 @@ static int ext4_mb_seq_groups_show(struc
45061 ext4_grpblk_t counters[16];
45062 } sg;
45063
45064+ pax_track_stack();
45065+
45066 group--;
45067 if (group == 0)
45068 seq_printf(seq, "#%-5s: %-5s %-5s %-5s "
45069@@ -2534,25 +2536,25 @@ int ext4_mb_release(struct super_block *
45070 if (sbi->s_mb_stats) {
45071 printk(KERN_INFO
45072 "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n",
45073- atomic_read(&sbi->s_bal_allocated),
45074- atomic_read(&sbi->s_bal_reqs),
45075- atomic_read(&sbi->s_bal_success));
45076+ atomic_read_unchecked(&sbi->s_bal_allocated),
45077+ atomic_read_unchecked(&sbi->s_bal_reqs),
45078+ atomic_read_unchecked(&sbi->s_bal_success));
45079 printk(KERN_INFO
45080 "EXT4-fs: mballoc: %u extents scanned, %u goal hits, "
45081 "%u 2^N hits, %u breaks, %u lost\n",
45082- atomic_read(&sbi->s_bal_ex_scanned),
45083- atomic_read(&sbi->s_bal_goals),
45084- atomic_read(&sbi->s_bal_2orders),
45085- atomic_read(&sbi->s_bal_breaks),
45086- atomic_read(&sbi->s_mb_lost_chunks));
45087+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
45088+ atomic_read_unchecked(&sbi->s_bal_goals),
45089+ atomic_read_unchecked(&sbi->s_bal_2orders),
45090+ atomic_read_unchecked(&sbi->s_bal_breaks),
45091+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
45092 printk(KERN_INFO
45093 "EXT4-fs: mballoc: %lu generated and it took %Lu\n",
45094 sbi->s_mb_buddies_generated++,
45095 sbi->s_mb_generation_time);
45096 printk(KERN_INFO
45097 "EXT4-fs: mballoc: %u preallocated, %u discarded\n",
45098- atomic_read(&sbi->s_mb_preallocated),
45099- atomic_read(&sbi->s_mb_discarded));
45100+ atomic_read_unchecked(&sbi->s_mb_preallocated),
45101+ atomic_read_unchecked(&sbi->s_mb_discarded));
45102 }
45103
45104 free_percpu(sbi->s_locality_groups);
45105@@ -3034,16 +3036,16 @@ static void ext4_mb_collect_stats(struct
45106 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
45107
45108 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
45109- atomic_inc(&sbi->s_bal_reqs);
45110- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
45111+ atomic_inc_unchecked(&sbi->s_bal_reqs);
45112+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
45113 if (ac->ac_o_ex.fe_len >= ac->ac_g_ex.fe_len)
45114- atomic_inc(&sbi->s_bal_success);
45115- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
45116+ atomic_inc_unchecked(&sbi->s_bal_success);
45117+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
45118 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
45119 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
45120- atomic_inc(&sbi->s_bal_goals);
45121+ atomic_inc_unchecked(&sbi->s_bal_goals);
45122 if (ac->ac_found > sbi->s_mb_max_to_scan)
45123- atomic_inc(&sbi->s_bal_breaks);
45124+ atomic_inc_unchecked(&sbi->s_bal_breaks);
45125 }
45126
45127 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
45128@@ -3443,7 +3445,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
45129 trace_ext4_mb_new_inode_pa(ac, pa);
45130
45131 ext4_mb_use_inode_pa(ac, pa);
45132- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45133+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45134
45135 ei = EXT4_I(ac->ac_inode);
45136 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
45137@@ -3503,7 +3505,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
45138 trace_ext4_mb_new_group_pa(ac, pa);
45139
45140 ext4_mb_use_group_pa(ac, pa);
45141- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45142+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45143
45144 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
45145 lg = ac->ac_lg;
45146@@ -3607,7 +3609,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
45147 * from the bitmap and continue.
45148 */
45149 }
45150- atomic_add(free, &sbi->s_mb_discarded);
45151+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
45152
45153 return err;
45154 }
45155@@ -3626,7 +3628,7 @@ ext4_mb_release_group_pa(struct ext4_bud
45156 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
45157 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
45158 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
45159- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45160+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45161
45162 if (ac) {
45163 ac->ac_sb = sb;
45164diff -urNp linux-2.6.32.46/fs/ext4/super.c linux-2.6.32.46/fs/ext4/super.c
45165--- linux-2.6.32.46/fs/ext4/super.c 2011-03-27 14:31:47.000000000 -0400
45166+++ linux-2.6.32.46/fs/ext4/super.c 2011-04-17 15:56:46.000000000 -0400
45167@@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
45168 }
45169
45170
45171-static struct sysfs_ops ext4_attr_ops = {
45172+static const struct sysfs_ops ext4_attr_ops = {
45173 .show = ext4_attr_show,
45174 .store = ext4_attr_store,
45175 };
45176diff -urNp linux-2.6.32.46/fs/fcntl.c linux-2.6.32.46/fs/fcntl.c
45177--- linux-2.6.32.46/fs/fcntl.c 2011-03-27 14:31:47.000000000 -0400
45178+++ linux-2.6.32.46/fs/fcntl.c 2011-10-06 09:37:14.000000000 -0400
45179@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
45180 if (err)
45181 return err;
45182
45183+ if (gr_handle_chroot_fowner(pid, type))
45184+ return -ENOENT;
45185+ if (gr_check_protected_task_fowner(pid, type))
45186+ return -EACCES;
45187+
45188 f_modown(filp, pid, type, force);
45189 return 0;
45190 }
45191@@ -265,7 +270,7 @@ pid_t f_getown(struct file *filp)
45192
45193 static int f_setown_ex(struct file *filp, unsigned long arg)
45194 {
45195- struct f_owner_ex * __user owner_p = (void * __user)arg;
45196+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45197 struct f_owner_ex owner;
45198 struct pid *pid;
45199 int type;
45200@@ -305,7 +310,7 @@ static int f_setown_ex(struct file *filp
45201
45202 static int f_getown_ex(struct file *filp, unsigned long arg)
45203 {
45204- struct f_owner_ex * __user owner_p = (void * __user)arg;
45205+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45206 struct f_owner_ex owner;
45207 int ret = 0;
45208
45209@@ -344,6 +349,7 @@ static long do_fcntl(int fd, unsigned in
45210 switch (cmd) {
45211 case F_DUPFD:
45212 case F_DUPFD_CLOEXEC:
45213+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
45214 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
45215 break;
45216 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
45217diff -urNp linux-2.6.32.46/fs/fifo.c linux-2.6.32.46/fs/fifo.c
45218--- linux-2.6.32.46/fs/fifo.c 2011-03-27 14:31:47.000000000 -0400
45219+++ linux-2.6.32.46/fs/fifo.c 2011-04-17 15:56:46.000000000 -0400
45220@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
45221 */
45222 filp->f_op = &read_pipefifo_fops;
45223 pipe->r_counter++;
45224- if (pipe->readers++ == 0)
45225+ if (atomic_inc_return(&pipe->readers) == 1)
45226 wake_up_partner(inode);
45227
45228- if (!pipe->writers) {
45229+ if (!atomic_read(&pipe->writers)) {
45230 if ((filp->f_flags & O_NONBLOCK)) {
45231 /* suppress POLLHUP until we have
45232 * seen a writer */
45233@@ -83,15 +83,15 @@ static int fifo_open(struct inode *inode
45234 * errno=ENXIO when there is no process reading the FIFO.
45235 */
45236 ret = -ENXIO;
45237- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
45238+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
45239 goto err;
45240
45241 filp->f_op = &write_pipefifo_fops;
45242 pipe->w_counter++;
45243- if (!pipe->writers++)
45244+ if (atomic_inc_return(&pipe->writers) == 1)
45245 wake_up_partner(inode);
45246
45247- if (!pipe->readers) {
45248+ if (!atomic_read(&pipe->readers)) {
45249 wait_for_partner(inode, &pipe->r_counter);
45250 if (signal_pending(current))
45251 goto err_wr;
45252@@ -107,11 +107,11 @@ static int fifo_open(struct inode *inode
45253 */
45254 filp->f_op = &rdwr_pipefifo_fops;
45255
45256- pipe->readers++;
45257- pipe->writers++;
45258+ atomic_inc(&pipe->readers);
45259+ atomic_inc(&pipe->writers);
45260 pipe->r_counter++;
45261 pipe->w_counter++;
45262- if (pipe->readers == 1 || pipe->writers == 1)
45263+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
45264 wake_up_partner(inode);
45265 break;
45266
45267@@ -125,19 +125,19 @@ static int fifo_open(struct inode *inode
45268 return 0;
45269
45270 err_rd:
45271- if (!--pipe->readers)
45272+ if (atomic_dec_and_test(&pipe->readers))
45273 wake_up_interruptible(&pipe->wait);
45274 ret = -ERESTARTSYS;
45275 goto err;
45276
45277 err_wr:
45278- if (!--pipe->writers)
45279+ if (atomic_dec_and_test(&pipe->writers))
45280 wake_up_interruptible(&pipe->wait);
45281 ret = -ERESTARTSYS;
45282 goto err;
45283
45284 err:
45285- if (!pipe->readers && !pipe->writers)
45286+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
45287 free_pipe_info(inode);
45288
45289 err_nocleanup:
45290diff -urNp linux-2.6.32.46/fs/file.c linux-2.6.32.46/fs/file.c
45291--- linux-2.6.32.46/fs/file.c 2011-03-27 14:31:47.000000000 -0400
45292+++ linux-2.6.32.46/fs/file.c 2011-04-17 15:56:46.000000000 -0400
45293@@ -14,6 +14,7 @@
45294 #include <linux/slab.h>
45295 #include <linux/vmalloc.h>
45296 #include <linux/file.h>
45297+#include <linux/security.h>
45298 #include <linux/fdtable.h>
45299 #include <linux/bitops.h>
45300 #include <linux/interrupt.h>
45301@@ -257,6 +258,8 @@ int expand_files(struct files_struct *fi
45302 * N.B. For clone tasks sharing a files structure, this test
45303 * will limit the total number of files that can be opened.
45304 */
45305+
45306+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
45307 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
45308 return -EMFILE;
45309
45310diff -urNp linux-2.6.32.46/fs/filesystems.c linux-2.6.32.46/fs/filesystems.c
45311--- linux-2.6.32.46/fs/filesystems.c 2011-03-27 14:31:47.000000000 -0400
45312+++ linux-2.6.32.46/fs/filesystems.c 2011-04-17 15:56:46.000000000 -0400
45313@@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(con
45314 int len = dot ? dot - name : strlen(name);
45315
45316 fs = __get_fs_type(name, len);
45317+
45318+#ifdef CONFIG_GRKERNSEC_MODHARDEN
45319+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
45320+#else
45321 if (!fs && (request_module("%.*s", len, name) == 0))
45322+#endif
45323 fs = __get_fs_type(name, len);
45324
45325 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
45326diff -urNp linux-2.6.32.46/fs/fscache/cookie.c linux-2.6.32.46/fs/fscache/cookie.c
45327--- linux-2.6.32.46/fs/fscache/cookie.c 2011-03-27 14:31:47.000000000 -0400
45328+++ linux-2.6.32.46/fs/fscache/cookie.c 2011-05-04 17:56:28.000000000 -0400
45329@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
45330 parent ? (char *) parent->def->name : "<no-parent>",
45331 def->name, netfs_data);
45332
45333- fscache_stat(&fscache_n_acquires);
45334+ fscache_stat_unchecked(&fscache_n_acquires);
45335
45336 /* if there's no parent cookie, then we don't create one here either */
45337 if (!parent) {
45338- fscache_stat(&fscache_n_acquires_null);
45339+ fscache_stat_unchecked(&fscache_n_acquires_null);
45340 _leave(" [no parent]");
45341 return NULL;
45342 }
45343@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire
45344 /* allocate and initialise a cookie */
45345 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
45346 if (!cookie) {
45347- fscache_stat(&fscache_n_acquires_oom);
45348+ fscache_stat_unchecked(&fscache_n_acquires_oom);
45349 _leave(" [ENOMEM]");
45350 return NULL;
45351 }
45352@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire
45353
45354 switch (cookie->def->type) {
45355 case FSCACHE_COOKIE_TYPE_INDEX:
45356- fscache_stat(&fscache_n_cookie_index);
45357+ fscache_stat_unchecked(&fscache_n_cookie_index);
45358 break;
45359 case FSCACHE_COOKIE_TYPE_DATAFILE:
45360- fscache_stat(&fscache_n_cookie_data);
45361+ fscache_stat_unchecked(&fscache_n_cookie_data);
45362 break;
45363 default:
45364- fscache_stat(&fscache_n_cookie_special);
45365+ fscache_stat_unchecked(&fscache_n_cookie_special);
45366 break;
45367 }
45368
45369@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire
45370 if (fscache_acquire_non_index_cookie(cookie) < 0) {
45371 atomic_dec(&parent->n_children);
45372 __fscache_cookie_put(cookie);
45373- fscache_stat(&fscache_n_acquires_nobufs);
45374+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
45375 _leave(" = NULL");
45376 return NULL;
45377 }
45378 }
45379
45380- fscache_stat(&fscache_n_acquires_ok);
45381+ fscache_stat_unchecked(&fscache_n_acquires_ok);
45382 _leave(" = %p", cookie);
45383 return cookie;
45384 }
45385@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_coo
45386 cache = fscache_select_cache_for_object(cookie->parent);
45387 if (!cache) {
45388 up_read(&fscache_addremove_sem);
45389- fscache_stat(&fscache_n_acquires_no_cache);
45390+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
45391 _leave(" = -ENOMEDIUM [no cache]");
45392 return -ENOMEDIUM;
45393 }
45394@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct f
45395 object = cache->ops->alloc_object(cache, cookie);
45396 fscache_stat_d(&fscache_n_cop_alloc_object);
45397 if (IS_ERR(object)) {
45398- fscache_stat(&fscache_n_object_no_alloc);
45399+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
45400 ret = PTR_ERR(object);
45401 goto error;
45402 }
45403
45404- fscache_stat(&fscache_n_object_alloc);
45405+ fscache_stat_unchecked(&fscache_n_object_alloc);
45406
45407 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
45408
45409@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fsca
45410 struct fscache_object *object;
45411 struct hlist_node *_p;
45412
45413- fscache_stat(&fscache_n_updates);
45414+ fscache_stat_unchecked(&fscache_n_updates);
45415
45416 if (!cookie) {
45417- fscache_stat(&fscache_n_updates_null);
45418+ fscache_stat_unchecked(&fscache_n_updates_null);
45419 _leave(" [no cookie]");
45420 return;
45421 }
45422@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct
45423 struct fscache_object *object;
45424 unsigned long event;
45425
45426- fscache_stat(&fscache_n_relinquishes);
45427+ fscache_stat_unchecked(&fscache_n_relinquishes);
45428 if (retire)
45429- fscache_stat(&fscache_n_relinquishes_retire);
45430+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
45431
45432 if (!cookie) {
45433- fscache_stat(&fscache_n_relinquishes_null);
45434+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
45435 _leave(" [no cookie]");
45436 return;
45437 }
45438@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct
45439
45440 /* wait for the cookie to finish being instantiated (or to fail) */
45441 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
45442- fscache_stat(&fscache_n_relinquishes_waitcrt);
45443+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
45444 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
45445 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
45446 }
45447diff -urNp linux-2.6.32.46/fs/fscache/internal.h linux-2.6.32.46/fs/fscache/internal.h
45448--- linux-2.6.32.46/fs/fscache/internal.h 2011-03-27 14:31:47.000000000 -0400
45449+++ linux-2.6.32.46/fs/fscache/internal.h 2011-05-04 17:56:28.000000000 -0400
45450@@ -136,94 +136,94 @@ extern void fscache_proc_cleanup(void);
45451 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
45452 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
45453
45454-extern atomic_t fscache_n_op_pend;
45455-extern atomic_t fscache_n_op_run;
45456-extern atomic_t fscache_n_op_enqueue;
45457-extern atomic_t fscache_n_op_deferred_release;
45458-extern atomic_t fscache_n_op_release;
45459-extern atomic_t fscache_n_op_gc;
45460-extern atomic_t fscache_n_op_cancelled;
45461-extern atomic_t fscache_n_op_rejected;
45462-
45463-extern atomic_t fscache_n_attr_changed;
45464-extern atomic_t fscache_n_attr_changed_ok;
45465-extern atomic_t fscache_n_attr_changed_nobufs;
45466-extern atomic_t fscache_n_attr_changed_nomem;
45467-extern atomic_t fscache_n_attr_changed_calls;
45468-
45469-extern atomic_t fscache_n_allocs;
45470-extern atomic_t fscache_n_allocs_ok;
45471-extern atomic_t fscache_n_allocs_wait;
45472-extern atomic_t fscache_n_allocs_nobufs;
45473-extern atomic_t fscache_n_allocs_intr;
45474-extern atomic_t fscache_n_allocs_object_dead;
45475-extern atomic_t fscache_n_alloc_ops;
45476-extern atomic_t fscache_n_alloc_op_waits;
45477-
45478-extern atomic_t fscache_n_retrievals;
45479-extern atomic_t fscache_n_retrievals_ok;
45480-extern atomic_t fscache_n_retrievals_wait;
45481-extern atomic_t fscache_n_retrievals_nodata;
45482-extern atomic_t fscache_n_retrievals_nobufs;
45483-extern atomic_t fscache_n_retrievals_intr;
45484-extern atomic_t fscache_n_retrievals_nomem;
45485-extern atomic_t fscache_n_retrievals_object_dead;
45486-extern atomic_t fscache_n_retrieval_ops;
45487-extern atomic_t fscache_n_retrieval_op_waits;
45488-
45489-extern atomic_t fscache_n_stores;
45490-extern atomic_t fscache_n_stores_ok;
45491-extern atomic_t fscache_n_stores_again;
45492-extern atomic_t fscache_n_stores_nobufs;
45493-extern atomic_t fscache_n_stores_oom;
45494-extern atomic_t fscache_n_store_ops;
45495-extern atomic_t fscache_n_store_calls;
45496-extern atomic_t fscache_n_store_pages;
45497-extern atomic_t fscache_n_store_radix_deletes;
45498-extern atomic_t fscache_n_store_pages_over_limit;
45499-
45500-extern atomic_t fscache_n_store_vmscan_not_storing;
45501-extern atomic_t fscache_n_store_vmscan_gone;
45502-extern atomic_t fscache_n_store_vmscan_busy;
45503-extern atomic_t fscache_n_store_vmscan_cancelled;
45504-
45505-extern atomic_t fscache_n_marks;
45506-extern atomic_t fscache_n_uncaches;
45507-
45508-extern atomic_t fscache_n_acquires;
45509-extern atomic_t fscache_n_acquires_null;
45510-extern atomic_t fscache_n_acquires_no_cache;
45511-extern atomic_t fscache_n_acquires_ok;
45512-extern atomic_t fscache_n_acquires_nobufs;
45513-extern atomic_t fscache_n_acquires_oom;
45514-
45515-extern atomic_t fscache_n_updates;
45516-extern atomic_t fscache_n_updates_null;
45517-extern atomic_t fscache_n_updates_run;
45518-
45519-extern atomic_t fscache_n_relinquishes;
45520-extern atomic_t fscache_n_relinquishes_null;
45521-extern atomic_t fscache_n_relinquishes_waitcrt;
45522-extern atomic_t fscache_n_relinquishes_retire;
45523-
45524-extern atomic_t fscache_n_cookie_index;
45525-extern atomic_t fscache_n_cookie_data;
45526-extern atomic_t fscache_n_cookie_special;
45527-
45528-extern atomic_t fscache_n_object_alloc;
45529-extern atomic_t fscache_n_object_no_alloc;
45530-extern atomic_t fscache_n_object_lookups;
45531-extern atomic_t fscache_n_object_lookups_negative;
45532-extern atomic_t fscache_n_object_lookups_positive;
45533-extern atomic_t fscache_n_object_lookups_timed_out;
45534-extern atomic_t fscache_n_object_created;
45535-extern atomic_t fscache_n_object_avail;
45536-extern atomic_t fscache_n_object_dead;
45537-
45538-extern atomic_t fscache_n_checkaux_none;
45539-extern atomic_t fscache_n_checkaux_okay;
45540-extern atomic_t fscache_n_checkaux_update;
45541-extern atomic_t fscache_n_checkaux_obsolete;
45542+extern atomic_unchecked_t fscache_n_op_pend;
45543+extern atomic_unchecked_t fscache_n_op_run;
45544+extern atomic_unchecked_t fscache_n_op_enqueue;
45545+extern atomic_unchecked_t fscache_n_op_deferred_release;
45546+extern atomic_unchecked_t fscache_n_op_release;
45547+extern atomic_unchecked_t fscache_n_op_gc;
45548+extern atomic_unchecked_t fscache_n_op_cancelled;
45549+extern atomic_unchecked_t fscache_n_op_rejected;
45550+
45551+extern atomic_unchecked_t fscache_n_attr_changed;
45552+extern atomic_unchecked_t fscache_n_attr_changed_ok;
45553+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
45554+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
45555+extern atomic_unchecked_t fscache_n_attr_changed_calls;
45556+
45557+extern atomic_unchecked_t fscache_n_allocs;
45558+extern atomic_unchecked_t fscache_n_allocs_ok;
45559+extern atomic_unchecked_t fscache_n_allocs_wait;
45560+extern atomic_unchecked_t fscache_n_allocs_nobufs;
45561+extern atomic_unchecked_t fscache_n_allocs_intr;
45562+extern atomic_unchecked_t fscache_n_allocs_object_dead;
45563+extern atomic_unchecked_t fscache_n_alloc_ops;
45564+extern atomic_unchecked_t fscache_n_alloc_op_waits;
45565+
45566+extern atomic_unchecked_t fscache_n_retrievals;
45567+extern atomic_unchecked_t fscache_n_retrievals_ok;
45568+extern atomic_unchecked_t fscache_n_retrievals_wait;
45569+extern atomic_unchecked_t fscache_n_retrievals_nodata;
45570+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
45571+extern atomic_unchecked_t fscache_n_retrievals_intr;
45572+extern atomic_unchecked_t fscache_n_retrievals_nomem;
45573+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
45574+extern atomic_unchecked_t fscache_n_retrieval_ops;
45575+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
45576+
45577+extern atomic_unchecked_t fscache_n_stores;
45578+extern atomic_unchecked_t fscache_n_stores_ok;
45579+extern atomic_unchecked_t fscache_n_stores_again;
45580+extern atomic_unchecked_t fscache_n_stores_nobufs;
45581+extern atomic_unchecked_t fscache_n_stores_oom;
45582+extern atomic_unchecked_t fscache_n_store_ops;
45583+extern atomic_unchecked_t fscache_n_store_calls;
45584+extern atomic_unchecked_t fscache_n_store_pages;
45585+extern atomic_unchecked_t fscache_n_store_radix_deletes;
45586+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
45587+
45588+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
45589+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
45590+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
45591+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
45592+
45593+extern atomic_unchecked_t fscache_n_marks;
45594+extern atomic_unchecked_t fscache_n_uncaches;
45595+
45596+extern atomic_unchecked_t fscache_n_acquires;
45597+extern atomic_unchecked_t fscache_n_acquires_null;
45598+extern atomic_unchecked_t fscache_n_acquires_no_cache;
45599+extern atomic_unchecked_t fscache_n_acquires_ok;
45600+extern atomic_unchecked_t fscache_n_acquires_nobufs;
45601+extern atomic_unchecked_t fscache_n_acquires_oom;
45602+
45603+extern atomic_unchecked_t fscache_n_updates;
45604+extern atomic_unchecked_t fscache_n_updates_null;
45605+extern atomic_unchecked_t fscache_n_updates_run;
45606+
45607+extern atomic_unchecked_t fscache_n_relinquishes;
45608+extern atomic_unchecked_t fscache_n_relinquishes_null;
45609+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
45610+extern atomic_unchecked_t fscache_n_relinquishes_retire;
45611+
45612+extern atomic_unchecked_t fscache_n_cookie_index;
45613+extern atomic_unchecked_t fscache_n_cookie_data;
45614+extern atomic_unchecked_t fscache_n_cookie_special;
45615+
45616+extern atomic_unchecked_t fscache_n_object_alloc;
45617+extern atomic_unchecked_t fscache_n_object_no_alloc;
45618+extern atomic_unchecked_t fscache_n_object_lookups;
45619+extern atomic_unchecked_t fscache_n_object_lookups_negative;
45620+extern atomic_unchecked_t fscache_n_object_lookups_positive;
45621+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
45622+extern atomic_unchecked_t fscache_n_object_created;
45623+extern atomic_unchecked_t fscache_n_object_avail;
45624+extern atomic_unchecked_t fscache_n_object_dead;
45625+
45626+extern atomic_unchecked_t fscache_n_checkaux_none;
45627+extern atomic_unchecked_t fscache_n_checkaux_okay;
45628+extern atomic_unchecked_t fscache_n_checkaux_update;
45629+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
45630
45631 extern atomic_t fscache_n_cop_alloc_object;
45632 extern atomic_t fscache_n_cop_lookup_object;
45633@@ -247,6 +247,11 @@ static inline void fscache_stat(atomic_t
45634 atomic_inc(stat);
45635 }
45636
45637+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
45638+{
45639+ atomic_inc_unchecked(stat);
45640+}
45641+
45642 static inline void fscache_stat_d(atomic_t *stat)
45643 {
45644 atomic_dec(stat);
45645@@ -259,6 +264,7 @@ extern const struct file_operations fsca
45646
45647 #define __fscache_stat(stat) (NULL)
45648 #define fscache_stat(stat) do {} while (0)
45649+#define fscache_stat_unchecked(stat) do {} while (0)
45650 #define fscache_stat_d(stat) do {} while (0)
45651 #endif
45652
45653diff -urNp linux-2.6.32.46/fs/fscache/object.c linux-2.6.32.46/fs/fscache/object.c
45654--- linux-2.6.32.46/fs/fscache/object.c 2011-03-27 14:31:47.000000000 -0400
45655+++ linux-2.6.32.46/fs/fscache/object.c 2011-05-04 17:56:28.000000000 -0400
45656@@ -144,7 +144,7 @@ static void fscache_object_state_machine
45657 /* update the object metadata on disk */
45658 case FSCACHE_OBJECT_UPDATING:
45659 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
45660- fscache_stat(&fscache_n_updates_run);
45661+ fscache_stat_unchecked(&fscache_n_updates_run);
45662 fscache_stat(&fscache_n_cop_update_object);
45663 object->cache->ops->update_object(object);
45664 fscache_stat_d(&fscache_n_cop_update_object);
45665@@ -233,7 +233,7 @@ static void fscache_object_state_machine
45666 spin_lock(&object->lock);
45667 object->state = FSCACHE_OBJECT_DEAD;
45668 spin_unlock(&object->lock);
45669- fscache_stat(&fscache_n_object_dead);
45670+ fscache_stat_unchecked(&fscache_n_object_dead);
45671 goto terminal_transit;
45672
45673 /* handle the parent cache of this object being withdrawn from
45674@@ -248,7 +248,7 @@ static void fscache_object_state_machine
45675 spin_lock(&object->lock);
45676 object->state = FSCACHE_OBJECT_DEAD;
45677 spin_unlock(&object->lock);
45678- fscache_stat(&fscache_n_object_dead);
45679+ fscache_stat_unchecked(&fscache_n_object_dead);
45680 goto terminal_transit;
45681
45682 /* complain about the object being woken up once it is
45683@@ -492,7 +492,7 @@ static void fscache_lookup_object(struct
45684 parent->cookie->def->name, cookie->def->name,
45685 object->cache->tag->name);
45686
45687- fscache_stat(&fscache_n_object_lookups);
45688+ fscache_stat_unchecked(&fscache_n_object_lookups);
45689 fscache_stat(&fscache_n_cop_lookup_object);
45690 ret = object->cache->ops->lookup_object(object);
45691 fscache_stat_d(&fscache_n_cop_lookup_object);
45692@@ -503,7 +503,7 @@ static void fscache_lookup_object(struct
45693 if (ret == -ETIMEDOUT) {
45694 /* probably stuck behind another object, so move this one to
45695 * the back of the queue */
45696- fscache_stat(&fscache_n_object_lookups_timed_out);
45697+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
45698 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45699 }
45700
45701@@ -526,7 +526,7 @@ void fscache_object_lookup_negative(stru
45702
45703 spin_lock(&object->lock);
45704 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45705- fscache_stat(&fscache_n_object_lookups_negative);
45706+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
45707
45708 /* transit here to allow write requests to begin stacking up
45709 * and read requests to begin returning ENODATA */
45710@@ -572,7 +572,7 @@ void fscache_obtained_object(struct fsca
45711 * result, in which case there may be data available */
45712 spin_lock(&object->lock);
45713 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45714- fscache_stat(&fscache_n_object_lookups_positive);
45715+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
45716
45717 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
45718
45719@@ -586,7 +586,7 @@ void fscache_obtained_object(struct fsca
45720 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45721 } else {
45722 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
45723- fscache_stat(&fscache_n_object_created);
45724+ fscache_stat_unchecked(&fscache_n_object_created);
45725
45726 object->state = FSCACHE_OBJECT_AVAILABLE;
45727 spin_unlock(&object->lock);
45728@@ -633,7 +633,7 @@ static void fscache_object_available(str
45729 fscache_enqueue_dependents(object);
45730
45731 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
45732- fscache_stat(&fscache_n_object_avail);
45733+ fscache_stat_unchecked(&fscache_n_object_avail);
45734
45735 _leave("");
45736 }
45737@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(
45738 enum fscache_checkaux result;
45739
45740 if (!object->cookie->def->check_aux) {
45741- fscache_stat(&fscache_n_checkaux_none);
45742+ fscache_stat_unchecked(&fscache_n_checkaux_none);
45743 return FSCACHE_CHECKAUX_OKAY;
45744 }
45745
45746@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(
45747 switch (result) {
45748 /* entry okay as is */
45749 case FSCACHE_CHECKAUX_OKAY:
45750- fscache_stat(&fscache_n_checkaux_okay);
45751+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
45752 break;
45753
45754 /* entry requires update */
45755 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
45756- fscache_stat(&fscache_n_checkaux_update);
45757+ fscache_stat_unchecked(&fscache_n_checkaux_update);
45758 break;
45759
45760 /* entry requires deletion */
45761 case FSCACHE_CHECKAUX_OBSOLETE:
45762- fscache_stat(&fscache_n_checkaux_obsolete);
45763+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
45764 break;
45765
45766 default:
45767diff -urNp linux-2.6.32.46/fs/fscache/operation.c linux-2.6.32.46/fs/fscache/operation.c
45768--- linux-2.6.32.46/fs/fscache/operation.c 2011-03-27 14:31:47.000000000 -0400
45769+++ linux-2.6.32.46/fs/fscache/operation.c 2011-05-04 17:56:28.000000000 -0400
45770@@ -16,7 +16,7 @@
45771 #include <linux/seq_file.h>
45772 #include "internal.h"
45773
45774-atomic_t fscache_op_debug_id;
45775+atomic_unchecked_t fscache_op_debug_id;
45776 EXPORT_SYMBOL(fscache_op_debug_id);
45777
45778 /**
45779@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fs
45780 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
45781 ASSERTCMP(atomic_read(&op->usage), >, 0);
45782
45783- fscache_stat(&fscache_n_op_enqueue);
45784+ fscache_stat_unchecked(&fscache_n_op_enqueue);
45785 switch (op->flags & FSCACHE_OP_TYPE) {
45786 case FSCACHE_OP_FAST:
45787 _debug("queue fast");
45788@@ -76,7 +76,7 @@ static void fscache_run_op(struct fscach
45789 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
45790 if (op->processor)
45791 fscache_enqueue_operation(op);
45792- fscache_stat(&fscache_n_op_run);
45793+ fscache_stat_unchecked(&fscache_n_op_run);
45794 }
45795
45796 /*
45797@@ -107,11 +107,11 @@ int fscache_submit_exclusive_op(struct f
45798 if (object->n_ops > 0) {
45799 atomic_inc(&op->usage);
45800 list_add_tail(&op->pend_link, &object->pending_ops);
45801- fscache_stat(&fscache_n_op_pend);
45802+ fscache_stat_unchecked(&fscache_n_op_pend);
45803 } else if (!list_empty(&object->pending_ops)) {
45804 atomic_inc(&op->usage);
45805 list_add_tail(&op->pend_link, &object->pending_ops);
45806- fscache_stat(&fscache_n_op_pend);
45807+ fscache_stat_unchecked(&fscache_n_op_pend);
45808 fscache_start_operations(object);
45809 } else {
45810 ASSERTCMP(object->n_in_progress, ==, 0);
45811@@ -127,7 +127,7 @@ int fscache_submit_exclusive_op(struct f
45812 object->n_exclusive++; /* reads and writes must wait */
45813 atomic_inc(&op->usage);
45814 list_add_tail(&op->pend_link, &object->pending_ops);
45815- fscache_stat(&fscache_n_op_pend);
45816+ fscache_stat_unchecked(&fscache_n_op_pend);
45817 ret = 0;
45818 } else {
45819 /* not allowed to submit ops in any other state */
45820@@ -214,11 +214,11 @@ int fscache_submit_op(struct fscache_obj
45821 if (object->n_exclusive > 0) {
45822 atomic_inc(&op->usage);
45823 list_add_tail(&op->pend_link, &object->pending_ops);
45824- fscache_stat(&fscache_n_op_pend);
45825+ fscache_stat_unchecked(&fscache_n_op_pend);
45826 } else if (!list_empty(&object->pending_ops)) {
45827 atomic_inc(&op->usage);
45828 list_add_tail(&op->pend_link, &object->pending_ops);
45829- fscache_stat(&fscache_n_op_pend);
45830+ fscache_stat_unchecked(&fscache_n_op_pend);
45831 fscache_start_operations(object);
45832 } else {
45833 ASSERTCMP(object->n_exclusive, ==, 0);
45834@@ -230,12 +230,12 @@ int fscache_submit_op(struct fscache_obj
45835 object->n_ops++;
45836 atomic_inc(&op->usage);
45837 list_add_tail(&op->pend_link, &object->pending_ops);
45838- fscache_stat(&fscache_n_op_pend);
45839+ fscache_stat_unchecked(&fscache_n_op_pend);
45840 ret = 0;
45841 } else if (object->state == FSCACHE_OBJECT_DYING ||
45842 object->state == FSCACHE_OBJECT_LC_DYING ||
45843 object->state == FSCACHE_OBJECT_WITHDRAWING) {
45844- fscache_stat(&fscache_n_op_rejected);
45845+ fscache_stat_unchecked(&fscache_n_op_rejected);
45846 ret = -ENOBUFS;
45847 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
45848 fscache_report_unexpected_submission(object, op, ostate);
45849@@ -305,7 +305,7 @@ int fscache_cancel_op(struct fscache_ope
45850
45851 ret = -EBUSY;
45852 if (!list_empty(&op->pend_link)) {
45853- fscache_stat(&fscache_n_op_cancelled);
45854+ fscache_stat_unchecked(&fscache_n_op_cancelled);
45855 list_del_init(&op->pend_link);
45856 object->n_ops--;
45857 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
45858@@ -344,7 +344,7 @@ void fscache_put_operation(struct fscach
45859 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
45860 BUG();
45861
45862- fscache_stat(&fscache_n_op_release);
45863+ fscache_stat_unchecked(&fscache_n_op_release);
45864
45865 if (op->release) {
45866 op->release(op);
45867@@ -361,7 +361,7 @@ void fscache_put_operation(struct fscach
45868 * lock, and defer it otherwise */
45869 if (!spin_trylock(&object->lock)) {
45870 _debug("defer put");
45871- fscache_stat(&fscache_n_op_deferred_release);
45872+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
45873
45874 cache = object->cache;
45875 spin_lock(&cache->op_gc_list_lock);
45876@@ -423,7 +423,7 @@ void fscache_operation_gc(struct work_st
45877
45878 _debug("GC DEFERRED REL OBJ%x OP%x",
45879 object->debug_id, op->debug_id);
45880- fscache_stat(&fscache_n_op_gc);
45881+ fscache_stat_unchecked(&fscache_n_op_gc);
45882
45883 ASSERTCMP(atomic_read(&op->usage), ==, 0);
45884
45885diff -urNp linux-2.6.32.46/fs/fscache/page.c linux-2.6.32.46/fs/fscache/page.c
45886--- linux-2.6.32.46/fs/fscache/page.c 2011-03-27 14:31:47.000000000 -0400
45887+++ linux-2.6.32.46/fs/fscache/page.c 2011-05-04 17:56:28.000000000 -0400
45888@@ -59,7 +59,7 @@ bool __fscache_maybe_release_page(struct
45889 val = radix_tree_lookup(&cookie->stores, page->index);
45890 if (!val) {
45891 rcu_read_unlock();
45892- fscache_stat(&fscache_n_store_vmscan_not_storing);
45893+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
45894 __fscache_uncache_page(cookie, page);
45895 return true;
45896 }
45897@@ -89,11 +89,11 @@ bool __fscache_maybe_release_page(struct
45898 spin_unlock(&cookie->stores_lock);
45899
45900 if (xpage) {
45901- fscache_stat(&fscache_n_store_vmscan_cancelled);
45902- fscache_stat(&fscache_n_store_radix_deletes);
45903+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
45904+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45905 ASSERTCMP(xpage, ==, page);
45906 } else {
45907- fscache_stat(&fscache_n_store_vmscan_gone);
45908+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
45909 }
45910
45911 wake_up_bit(&cookie->flags, 0);
45912@@ -106,7 +106,7 @@ page_busy:
45913 /* we might want to wait here, but that could deadlock the allocator as
45914 * the slow-work threads writing to the cache may all end up sleeping
45915 * on memory allocation */
45916- fscache_stat(&fscache_n_store_vmscan_busy);
45917+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
45918 return false;
45919 }
45920 EXPORT_SYMBOL(__fscache_maybe_release_page);
45921@@ -130,7 +130,7 @@ static void fscache_end_page_write(struc
45922 FSCACHE_COOKIE_STORING_TAG);
45923 if (!radix_tree_tag_get(&cookie->stores, page->index,
45924 FSCACHE_COOKIE_PENDING_TAG)) {
45925- fscache_stat(&fscache_n_store_radix_deletes);
45926+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45927 xpage = radix_tree_delete(&cookie->stores, page->index);
45928 }
45929 spin_unlock(&cookie->stores_lock);
45930@@ -151,7 +151,7 @@ static void fscache_attr_changed_op(stru
45931
45932 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
45933
45934- fscache_stat(&fscache_n_attr_changed_calls);
45935+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
45936
45937 if (fscache_object_is_active(object)) {
45938 fscache_set_op_state(op, "CallFS");
45939@@ -178,11 +178,11 @@ int __fscache_attr_changed(struct fscach
45940
45941 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
45942
45943- fscache_stat(&fscache_n_attr_changed);
45944+ fscache_stat_unchecked(&fscache_n_attr_changed);
45945
45946 op = kzalloc(sizeof(*op), GFP_KERNEL);
45947 if (!op) {
45948- fscache_stat(&fscache_n_attr_changed_nomem);
45949+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
45950 _leave(" = -ENOMEM");
45951 return -ENOMEM;
45952 }
45953@@ -202,7 +202,7 @@ int __fscache_attr_changed(struct fscach
45954 if (fscache_submit_exclusive_op(object, op) < 0)
45955 goto nobufs;
45956 spin_unlock(&cookie->lock);
45957- fscache_stat(&fscache_n_attr_changed_ok);
45958+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
45959 fscache_put_operation(op);
45960 _leave(" = 0");
45961 return 0;
45962@@ -210,7 +210,7 @@ int __fscache_attr_changed(struct fscach
45963 nobufs:
45964 spin_unlock(&cookie->lock);
45965 kfree(op);
45966- fscache_stat(&fscache_n_attr_changed_nobufs);
45967+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
45968 _leave(" = %d", -ENOBUFS);
45969 return -ENOBUFS;
45970 }
45971@@ -264,7 +264,7 @@ static struct fscache_retrieval *fscache
45972 /* allocate a retrieval operation and attempt to submit it */
45973 op = kzalloc(sizeof(*op), GFP_NOIO);
45974 if (!op) {
45975- fscache_stat(&fscache_n_retrievals_nomem);
45976+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
45977 return NULL;
45978 }
45979
45980@@ -294,13 +294,13 @@ static int fscache_wait_for_deferred_loo
45981 return 0;
45982 }
45983
45984- fscache_stat(&fscache_n_retrievals_wait);
45985+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
45986
45987 jif = jiffies;
45988 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
45989 fscache_wait_bit_interruptible,
45990 TASK_INTERRUPTIBLE) != 0) {
45991- fscache_stat(&fscache_n_retrievals_intr);
45992+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
45993 _leave(" = -ERESTARTSYS");
45994 return -ERESTARTSYS;
45995 }
45996@@ -318,8 +318,8 @@ static int fscache_wait_for_deferred_loo
45997 */
45998 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45999 struct fscache_retrieval *op,
46000- atomic_t *stat_op_waits,
46001- atomic_t *stat_object_dead)
46002+ atomic_unchecked_t *stat_op_waits,
46003+ atomic_unchecked_t *stat_object_dead)
46004 {
46005 int ret;
46006
46007@@ -327,7 +327,7 @@ static int fscache_wait_for_retrieval_ac
46008 goto check_if_dead;
46009
46010 _debug(">>> WT");
46011- fscache_stat(stat_op_waits);
46012+ fscache_stat_unchecked(stat_op_waits);
46013 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
46014 fscache_wait_bit_interruptible,
46015 TASK_INTERRUPTIBLE) < 0) {
46016@@ -344,7 +344,7 @@ static int fscache_wait_for_retrieval_ac
46017
46018 check_if_dead:
46019 if (unlikely(fscache_object_is_dead(object))) {
46020- fscache_stat(stat_object_dead);
46021+ fscache_stat_unchecked(stat_object_dead);
46022 return -ENOBUFS;
46023 }
46024 return 0;
46025@@ -371,7 +371,7 @@ int __fscache_read_or_alloc_page(struct
46026
46027 _enter("%p,%p,,,", cookie, page);
46028
46029- fscache_stat(&fscache_n_retrievals);
46030+ fscache_stat_unchecked(&fscache_n_retrievals);
46031
46032 if (hlist_empty(&cookie->backing_objects))
46033 goto nobufs;
46034@@ -405,7 +405,7 @@ int __fscache_read_or_alloc_page(struct
46035 goto nobufs_unlock;
46036 spin_unlock(&cookie->lock);
46037
46038- fscache_stat(&fscache_n_retrieval_ops);
46039+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
46040
46041 /* pin the netfs read context in case we need to do the actual netfs
46042 * read because we've encountered a cache read failure */
46043@@ -435,15 +435,15 @@ int __fscache_read_or_alloc_page(struct
46044
46045 error:
46046 if (ret == -ENOMEM)
46047- fscache_stat(&fscache_n_retrievals_nomem);
46048+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46049 else if (ret == -ERESTARTSYS)
46050- fscache_stat(&fscache_n_retrievals_intr);
46051+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46052 else if (ret == -ENODATA)
46053- fscache_stat(&fscache_n_retrievals_nodata);
46054+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46055 else if (ret < 0)
46056- fscache_stat(&fscache_n_retrievals_nobufs);
46057+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46058 else
46059- fscache_stat(&fscache_n_retrievals_ok);
46060+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
46061
46062 fscache_put_retrieval(op);
46063 _leave(" = %d", ret);
46064@@ -453,7 +453,7 @@ nobufs_unlock:
46065 spin_unlock(&cookie->lock);
46066 kfree(op);
46067 nobufs:
46068- fscache_stat(&fscache_n_retrievals_nobufs);
46069+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46070 _leave(" = -ENOBUFS");
46071 return -ENOBUFS;
46072 }
46073@@ -491,7 +491,7 @@ int __fscache_read_or_alloc_pages(struct
46074
46075 _enter("%p,,%d,,,", cookie, *nr_pages);
46076
46077- fscache_stat(&fscache_n_retrievals);
46078+ fscache_stat_unchecked(&fscache_n_retrievals);
46079
46080 if (hlist_empty(&cookie->backing_objects))
46081 goto nobufs;
46082@@ -522,7 +522,7 @@ int __fscache_read_or_alloc_pages(struct
46083 goto nobufs_unlock;
46084 spin_unlock(&cookie->lock);
46085
46086- fscache_stat(&fscache_n_retrieval_ops);
46087+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
46088
46089 /* pin the netfs read context in case we need to do the actual netfs
46090 * read because we've encountered a cache read failure */
46091@@ -552,15 +552,15 @@ int __fscache_read_or_alloc_pages(struct
46092
46093 error:
46094 if (ret == -ENOMEM)
46095- fscache_stat(&fscache_n_retrievals_nomem);
46096+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46097 else if (ret == -ERESTARTSYS)
46098- fscache_stat(&fscache_n_retrievals_intr);
46099+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46100 else if (ret == -ENODATA)
46101- fscache_stat(&fscache_n_retrievals_nodata);
46102+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46103 else if (ret < 0)
46104- fscache_stat(&fscache_n_retrievals_nobufs);
46105+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46106 else
46107- fscache_stat(&fscache_n_retrievals_ok);
46108+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
46109
46110 fscache_put_retrieval(op);
46111 _leave(" = %d", ret);
46112@@ -570,7 +570,7 @@ nobufs_unlock:
46113 spin_unlock(&cookie->lock);
46114 kfree(op);
46115 nobufs:
46116- fscache_stat(&fscache_n_retrievals_nobufs);
46117+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46118 _leave(" = -ENOBUFS");
46119 return -ENOBUFS;
46120 }
46121@@ -594,7 +594,7 @@ int __fscache_alloc_page(struct fscache_
46122
46123 _enter("%p,%p,,,", cookie, page);
46124
46125- fscache_stat(&fscache_n_allocs);
46126+ fscache_stat_unchecked(&fscache_n_allocs);
46127
46128 if (hlist_empty(&cookie->backing_objects))
46129 goto nobufs;
46130@@ -621,7 +621,7 @@ int __fscache_alloc_page(struct fscache_
46131 goto nobufs_unlock;
46132 spin_unlock(&cookie->lock);
46133
46134- fscache_stat(&fscache_n_alloc_ops);
46135+ fscache_stat_unchecked(&fscache_n_alloc_ops);
46136
46137 ret = fscache_wait_for_retrieval_activation(
46138 object, op,
46139@@ -637,11 +637,11 @@ int __fscache_alloc_page(struct fscache_
46140
46141 error:
46142 if (ret == -ERESTARTSYS)
46143- fscache_stat(&fscache_n_allocs_intr);
46144+ fscache_stat_unchecked(&fscache_n_allocs_intr);
46145 else if (ret < 0)
46146- fscache_stat(&fscache_n_allocs_nobufs);
46147+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46148 else
46149- fscache_stat(&fscache_n_allocs_ok);
46150+ fscache_stat_unchecked(&fscache_n_allocs_ok);
46151
46152 fscache_put_retrieval(op);
46153 _leave(" = %d", ret);
46154@@ -651,7 +651,7 @@ nobufs_unlock:
46155 spin_unlock(&cookie->lock);
46156 kfree(op);
46157 nobufs:
46158- fscache_stat(&fscache_n_allocs_nobufs);
46159+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46160 _leave(" = -ENOBUFS");
46161 return -ENOBUFS;
46162 }
46163@@ -694,7 +694,7 @@ static void fscache_write_op(struct fsca
46164
46165 spin_lock(&cookie->stores_lock);
46166
46167- fscache_stat(&fscache_n_store_calls);
46168+ fscache_stat_unchecked(&fscache_n_store_calls);
46169
46170 /* find a page to store */
46171 page = NULL;
46172@@ -705,7 +705,7 @@ static void fscache_write_op(struct fsca
46173 page = results[0];
46174 _debug("gang %d [%lx]", n, page->index);
46175 if (page->index > op->store_limit) {
46176- fscache_stat(&fscache_n_store_pages_over_limit);
46177+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
46178 goto superseded;
46179 }
46180
46181@@ -721,7 +721,7 @@ static void fscache_write_op(struct fsca
46182
46183 if (page) {
46184 fscache_set_op_state(&op->op, "Store");
46185- fscache_stat(&fscache_n_store_pages);
46186+ fscache_stat_unchecked(&fscache_n_store_pages);
46187 fscache_stat(&fscache_n_cop_write_page);
46188 ret = object->cache->ops->write_page(op, page);
46189 fscache_stat_d(&fscache_n_cop_write_page);
46190@@ -792,7 +792,7 @@ int __fscache_write_page(struct fscache_
46191 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46192 ASSERT(PageFsCache(page));
46193
46194- fscache_stat(&fscache_n_stores);
46195+ fscache_stat_unchecked(&fscache_n_stores);
46196
46197 op = kzalloc(sizeof(*op), GFP_NOIO);
46198 if (!op)
46199@@ -844,7 +844,7 @@ int __fscache_write_page(struct fscache_
46200 spin_unlock(&cookie->stores_lock);
46201 spin_unlock(&object->lock);
46202
46203- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
46204+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
46205 op->store_limit = object->store_limit;
46206
46207 if (fscache_submit_op(object, &op->op) < 0)
46208@@ -852,8 +852,8 @@ int __fscache_write_page(struct fscache_
46209
46210 spin_unlock(&cookie->lock);
46211 radix_tree_preload_end();
46212- fscache_stat(&fscache_n_store_ops);
46213- fscache_stat(&fscache_n_stores_ok);
46214+ fscache_stat_unchecked(&fscache_n_store_ops);
46215+ fscache_stat_unchecked(&fscache_n_stores_ok);
46216
46217 /* the slow work queue now carries its own ref on the object */
46218 fscache_put_operation(&op->op);
46219@@ -861,14 +861,14 @@ int __fscache_write_page(struct fscache_
46220 return 0;
46221
46222 already_queued:
46223- fscache_stat(&fscache_n_stores_again);
46224+ fscache_stat_unchecked(&fscache_n_stores_again);
46225 already_pending:
46226 spin_unlock(&cookie->stores_lock);
46227 spin_unlock(&object->lock);
46228 spin_unlock(&cookie->lock);
46229 radix_tree_preload_end();
46230 kfree(op);
46231- fscache_stat(&fscache_n_stores_ok);
46232+ fscache_stat_unchecked(&fscache_n_stores_ok);
46233 _leave(" = 0");
46234 return 0;
46235
46236@@ -886,14 +886,14 @@ nobufs:
46237 spin_unlock(&cookie->lock);
46238 radix_tree_preload_end();
46239 kfree(op);
46240- fscache_stat(&fscache_n_stores_nobufs);
46241+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
46242 _leave(" = -ENOBUFS");
46243 return -ENOBUFS;
46244
46245 nomem_free:
46246 kfree(op);
46247 nomem:
46248- fscache_stat(&fscache_n_stores_oom);
46249+ fscache_stat_unchecked(&fscache_n_stores_oom);
46250 _leave(" = -ENOMEM");
46251 return -ENOMEM;
46252 }
46253@@ -911,7 +911,7 @@ void __fscache_uncache_page(struct fscac
46254 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46255 ASSERTCMP(page, !=, NULL);
46256
46257- fscache_stat(&fscache_n_uncaches);
46258+ fscache_stat_unchecked(&fscache_n_uncaches);
46259
46260 /* cache withdrawal may beat us to it */
46261 if (!PageFsCache(page))
46262@@ -964,7 +964,7 @@ void fscache_mark_pages_cached(struct fs
46263 unsigned long loop;
46264
46265 #ifdef CONFIG_FSCACHE_STATS
46266- atomic_add(pagevec->nr, &fscache_n_marks);
46267+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
46268 #endif
46269
46270 for (loop = 0; loop < pagevec->nr; loop++) {
46271diff -urNp linux-2.6.32.46/fs/fscache/stats.c linux-2.6.32.46/fs/fscache/stats.c
46272--- linux-2.6.32.46/fs/fscache/stats.c 2011-03-27 14:31:47.000000000 -0400
46273+++ linux-2.6.32.46/fs/fscache/stats.c 2011-05-04 17:56:28.000000000 -0400
46274@@ -18,95 +18,95 @@
46275 /*
46276 * operation counters
46277 */
46278-atomic_t fscache_n_op_pend;
46279-atomic_t fscache_n_op_run;
46280-atomic_t fscache_n_op_enqueue;
46281-atomic_t fscache_n_op_requeue;
46282-atomic_t fscache_n_op_deferred_release;
46283-atomic_t fscache_n_op_release;
46284-atomic_t fscache_n_op_gc;
46285-atomic_t fscache_n_op_cancelled;
46286-atomic_t fscache_n_op_rejected;
46287-
46288-atomic_t fscache_n_attr_changed;
46289-atomic_t fscache_n_attr_changed_ok;
46290-atomic_t fscache_n_attr_changed_nobufs;
46291-atomic_t fscache_n_attr_changed_nomem;
46292-atomic_t fscache_n_attr_changed_calls;
46293-
46294-atomic_t fscache_n_allocs;
46295-atomic_t fscache_n_allocs_ok;
46296-atomic_t fscache_n_allocs_wait;
46297-atomic_t fscache_n_allocs_nobufs;
46298-atomic_t fscache_n_allocs_intr;
46299-atomic_t fscache_n_allocs_object_dead;
46300-atomic_t fscache_n_alloc_ops;
46301-atomic_t fscache_n_alloc_op_waits;
46302-
46303-atomic_t fscache_n_retrievals;
46304-atomic_t fscache_n_retrievals_ok;
46305-atomic_t fscache_n_retrievals_wait;
46306-atomic_t fscache_n_retrievals_nodata;
46307-atomic_t fscache_n_retrievals_nobufs;
46308-atomic_t fscache_n_retrievals_intr;
46309-atomic_t fscache_n_retrievals_nomem;
46310-atomic_t fscache_n_retrievals_object_dead;
46311-atomic_t fscache_n_retrieval_ops;
46312-atomic_t fscache_n_retrieval_op_waits;
46313-
46314-atomic_t fscache_n_stores;
46315-atomic_t fscache_n_stores_ok;
46316-atomic_t fscache_n_stores_again;
46317-atomic_t fscache_n_stores_nobufs;
46318-atomic_t fscache_n_stores_oom;
46319-atomic_t fscache_n_store_ops;
46320-atomic_t fscache_n_store_calls;
46321-atomic_t fscache_n_store_pages;
46322-atomic_t fscache_n_store_radix_deletes;
46323-atomic_t fscache_n_store_pages_over_limit;
46324-
46325-atomic_t fscache_n_store_vmscan_not_storing;
46326-atomic_t fscache_n_store_vmscan_gone;
46327-atomic_t fscache_n_store_vmscan_busy;
46328-atomic_t fscache_n_store_vmscan_cancelled;
46329-
46330-atomic_t fscache_n_marks;
46331-atomic_t fscache_n_uncaches;
46332-
46333-atomic_t fscache_n_acquires;
46334-atomic_t fscache_n_acquires_null;
46335-atomic_t fscache_n_acquires_no_cache;
46336-atomic_t fscache_n_acquires_ok;
46337-atomic_t fscache_n_acquires_nobufs;
46338-atomic_t fscache_n_acquires_oom;
46339-
46340-atomic_t fscache_n_updates;
46341-atomic_t fscache_n_updates_null;
46342-atomic_t fscache_n_updates_run;
46343-
46344-atomic_t fscache_n_relinquishes;
46345-atomic_t fscache_n_relinquishes_null;
46346-atomic_t fscache_n_relinquishes_waitcrt;
46347-atomic_t fscache_n_relinquishes_retire;
46348-
46349-atomic_t fscache_n_cookie_index;
46350-atomic_t fscache_n_cookie_data;
46351-atomic_t fscache_n_cookie_special;
46352-
46353-atomic_t fscache_n_object_alloc;
46354-atomic_t fscache_n_object_no_alloc;
46355-atomic_t fscache_n_object_lookups;
46356-atomic_t fscache_n_object_lookups_negative;
46357-atomic_t fscache_n_object_lookups_positive;
46358-atomic_t fscache_n_object_lookups_timed_out;
46359-atomic_t fscache_n_object_created;
46360-atomic_t fscache_n_object_avail;
46361-atomic_t fscache_n_object_dead;
46362-
46363-atomic_t fscache_n_checkaux_none;
46364-atomic_t fscache_n_checkaux_okay;
46365-atomic_t fscache_n_checkaux_update;
46366-atomic_t fscache_n_checkaux_obsolete;
46367+atomic_unchecked_t fscache_n_op_pend;
46368+atomic_unchecked_t fscache_n_op_run;
46369+atomic_unchecked_t fscache_n_op_enqueue;
46370+atomic_unchecked_t fscache_n_op_requeue;
46371+atomic_unchecked_t fscache_n_op_deferred_release;
46372+atomic_unchecked_t fscache_n_op_release;
46373+atomic_unchecked_t fscache_n_op_gc;
46374+atomic_unchecked_t fscache_n_op_cancelled;
46375+atomic_unchecked_t fscache_n_op_rejected;
46376+
46377+atomic_unchecked_t fscache_n_attr_changed;
46378+atomic_unchecked_t fscache_n_attr_changed_ok;
46379+atomic_unchecked_t fscache_n_attr_changed_nobufs;
46380+atomic_unchecked_t fscache_n_attr_changed_nomem;
46381+atomic_unchecked_t fscache_n_attr_changed_calls;
46382+
46383+atomic_unchecked_t fscache_n_allocs;
46384+atomic_unchecked_t fscache_n_allocs_ok;
46385+atomic_unchecked_t fscache_n_allocs_wait;
46386+atomic_unchecked_t fscache_n_allocs_nobufs;
46387+atomic_unchecked_t fscache_n_allocs_intr;
46388+atomic_unchecked_t fscache_n_allocs_object_dead;
46389+atomic_unchecked_t fscache_n_alloc_ops;
46390+atomic_unchecked_t fscache_n_alloc_op_waits;
46391+
46392+atomic_unchecked_t fscache_n_retrievals;
46393+atomic_unchecked_t fscache_n_retrievals_ok;
46394+atomic_unchecked_t fscache_n_retrievals_wait;
46395+atomic_unchecked_t fscache_n_retrievals_nodata;
46396+atomic_unchecked_t fscache_n_retrievals_nobufs;
46397+atomic_unchecked_t fscache_n_retrievals_intr;
46398+atomic_unchecked_t fscache_n_retrievals_nomem;
46399+atomic_unchecked_t fscache_n_retrievals_object_dead;
46400+atomic_unchecked_t fscache_n_retrieval_ops;
46401+atomic_unchecked_t fscache_n_retrieval_op_waits;
46402+
46403+atomic_unchecked_t fscache_n_stores;
46404+atomic_unchecked_t fscache_n_stores_ok;
46405+atomic_unchecked_t fscache_n_stores_again;
46406+atomic_unchecked_t fscache_n_stores_nobufs;
46407+atomic_unchecked_t fscache_n_stores_oom;
46408+atomic_unchecked_t fscache_n_store_ops;
46409+atomic_unchecked_t fscache_n_store_calls;
46410+atomic_unchecked_t fscache_n_store_pages;
46411+atomic_unchecked_t fscache_n_store_radix_deletes;
46412+atomic_unchecked_t fscache_n_store_pages_over_limit;
46413+
46414+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
46415+atomic_unchecked_t fscache_n_store_vmscan_gone;
46416+atomic_unchecked_t fscache_n_store_vmscan_busy;
46417+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
46418+
46419+atomic_unchecked_t fscache_n_marks;
46420+atomic_unchecked_t fscache_n_uncaches;
46421+
46422+atomic_unchecked_t fscache_n_acquires;
46423+atomic_unchecked_t fscache_n_acquires_null;
46424+atomic_unchecked_t fscache_n_acquires_no_cache;
46425+atomic_unchecked_t fscache_n_acquires_ok;
46426+atomic_unchecked_t fscache_n_acquires_nobufs;
46427+atomic_unchecked_t fscache_n_acquires_oom;
46428+
46429+atomic_unchecked_t fscache_n_updates;
46430+atomic_unchecked_t fscache_n_updates_null;
46431+atomic_unchecked_t fscache_n_updates_run;
46432+
46433+atomic_unchecked_t fscache_n_relinquishes;
46434+atomic_unchecked_t fscache_n_relinquishes_null;
46435+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
46436+atomic_unchecked_t fscache_n_relinquishes_retire;
46437+
46438+atomic_unchecked_t fscache_n_cookie_index;
46439+atomic_unchecked_t fscache_n_cookie_data;
46440+atomic_unchecked_t fscache_n_cookie_special;
46441+
46442+atomic_unchecked_t fscache_n_object_alloc;
46443+atomic_unchecked_t fscache_n_object_no_alloc;
46444+atomic_unchecked_t fscache_n_object_lookups;
46445+atomic_unchecked_t fscache_n_object_lookups_negative;
46446+atomic_unchecked_t fscache_n_object_lookups_positive;
46447+atomic_unchecked_t fscache_n_object_lookups_timed_out;
46448+atomic_unchecked_t fscache_n_object_created;
46449+atomic_unchecked_t fscache_n_object_avail;
46450+atomic_unchecked_t fscache_n_object_dead;
46451+
46452+atomic_unchecked_t fscache_n_checkaux_none;
46453+atomic_unchecked_t fscache_n_checkaux_okay;
46454+atomic_unchecked_t fscache_n_checkaux_update;
46455+atomic_unchecked_t fscache_n_checkaux_obsolete;
46456
46457 atomic_t fscache_n_cop_alloc_object;
46458 atomic_t fscache_n_cop_lookup_object;
46459@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq
46460 seq_puts(m, "FS-Cache statistics\n");
46461
46462 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
46463- atomic_read(&fscache_n_cookie_index),
46464- atomic_read(&fscache_n_cookie_data),
46465- atomic_read(&fscache_n_cookie_special));
46466+ atomic_read_unchecked(&fscache_n_cookie_index),
46467+ atomic_read_unchecked(&fscache_n_cookie_data),
46468+ atomic_read_unchecked(&fscache_n_cookie_special));
46469
46470 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
46471- atomic_read(&fscache_n_object_alloc),
46472- atomic_read(&fscache_n_object_no_alloc),
46473- atomic_read(&fscache_n_object_avail),
46474- atomic_read(&fscache_n_object_dead));
46475+ atomic_read_unchecked(&fscache_n_object_alloc),
46476+ atomic_read_unchecked(&fscache_n_object_no_alloc),
46477+ atomic_read_unchecked(&fscache_n_object_avail),
46478+ atomic_read_unchecked(&fscache_n_object_dead));
46479 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
46480- atomic_read(&fscache_n_checkaux_none),
46481- atomic_read(&fscache_n_checkaux_okay),
46482- atomic_read(&fscache_n_checkaux_update),
46483- atomic_read(&fscache_n_checkaux_obsolete));
46484+ atomic_read_unchecked(&fscache_n_checkaux_none),
46485+ atomic_read_unchecked(&fscache_n_checkaux_okay),
46486+ atomic_read_unchecked(&fscache_n_checkaux_update),
46487+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
46488
46489 seq_printf(m, "Pages : mrk=%u unc=%u\n",
46490- atomic_read(&fscache_n_marks),
46491- atomic_read(&fscache_n_uncaches));
46492+ atomic_read_unchecked(&fscache_n_marks),
46493+ atomic_read_unchecked(&fscache_n_uncaches));
46494
46495 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
46496 " oom=%u\n",
46497- atomic_read(&fscache_n_acquires),
46498- atomic_read(&fscache_n_acquires_null),
46499- atomic_read(&fscache_n_acquires_no_cache),
46500- atomic_read(&fscache_n_acquires_ok),
46501- atomic_read(&fscache_n_acquires_nobufs),
46502- atomic_read(&fscache_n_acquires_oom));
46503+ atomic_read_unchecked(&fscache_n_acquires),
46504+ atomic_read_unchecked(&fscache_n_acquires_null),
46505+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
46506+ atomic_read_unchecked(&fscache_n_acquires_ok),
46507+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
46508+ atomic_read_unchecked(&fscache_n_acquires_oom));
46509
46510 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
46511- atomic_read(&fscache_n_object_lookups),
46512- atomic_read(&fscache_n_object_lookups_negative),
46513- atomic_read(&fscache_n_object_lookups_positive),
46514- atomic_read(&fscache_n_object_lookups_timed_out),
46515- atomic_read(&fscache_n_object_created));
46516+ atomic_read_unchecked(&fscache_n_object_lookups),
46517+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
46518+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
46519+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out),
46520+ atomic_read_unchecked(&fscache_n_object_created));
46521
46522 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
46523- atomic_read(&fscache_n_updates),
46524- atomic_read(&fscache_n_updates_null),
46525- atomic_read(&fscache_n_updates_run));
46526+ atomic_read_unchecked(&fscache_n_updates),
46527+ atomic_read_unchecked(&fscache_n_updates_null),
46528+ atomic_read_unchecked(&fscache_n_updates_run));
46529
46530 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
46531- atomic_read(&fscache_n_relinquishes),
46532- atomic_read(&fscache_n_relinquishes_null),
46533- atomic_read(&fscache_n_relinquishes_waitcrt),
46534- atomic_read(&fscache_n_relinquishes_retire));
46535+ atomic_read_unchecked(&fscache_n_relinquishes),
46536+ atomic_read_unchecked(&fscache_n_relinquishes_null),
46537+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
46538+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
46539
46540 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
46541- atomic_read(&fscache_n_attr_changed),
46542- atomic_read(&fscache_n_attr_changed_ok),
46543- atomic_read(&fscache_n_attr_changed_nobufs),
46544- atomic_read(&fscache_n_attr_changed_nomem),
46545- atomic_read(&fscache_n_attr_changed_calls));
46546+ atomic_read_unchecked(&fscache_n_attr_changed),
46547+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
46548+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
46549+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
46550+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
46551
46552 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
46553- atomic_read(&fscache_n_allocs),
46554- atomic_read(&fscache_n_allocs_ok),
46555- atomic_read(&fscache_n_allocs_wait),
46556- atomic_read(&fscache_n_allocs_nobufs),
46557- atomic_read(&fscache_n_allocs_intr));
46558+ atomic_read_unchecked(&fscache_n_allocs),
46559+ atomic_read_unchecked(&fscache_n_allocs_ok),
46560+ atomic_read_unchecked(&fscache_n_allocs_wait),
46561+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
46562+ atomic_read_unchecked(&fscache_n_allocs_intr));
46563 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
46564- atomic_read(&fscache_n_alloc_ops),
46565- atomic_read(&fscache_n_alloc_op_waits),
46566- atomic_read(&fscache_n_allocs_object_dead));
46567+ atomic_read_unchecked(&fscache_n_alloc_ops),
46568+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
46569+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
46570
46571 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
46572 " int=%u oom=%u\n",
46573- atomic_read(&fscache_n_retrievals),
46574- atomic_read(&fscache_n_retrievals_ok),
46575- atomic_read(&fscache_n_retrievals_wait),
46576- atomic_read(&fscache_n_retrievals_nodata),
46577- atomic_read(&fscache_n_retrievals_nobufs),
46578- atomic_read(&fscache_n_retrievals_intr),
46579- atomic_read(&fscache_n_retrievals_nomem));
46580+ atomic_read_unchecked(&fscache_n_retrievals),
46581+ atomic_read_unchecked(&fscache_n_retrievals_ok),
46582+ atomic_read_unchecked(&fscache_n_retrievals_wait),
46583+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
46584+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
46585+ atomic_read_unchecked(&fscache_n_retrievals_intr),
46586+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
46587 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
46588- atomic_read(&fscache_n_retrieval_ops),
46589- atomic_read(&fscache_n_retrieval_op_waits),
46590- atomic_read(&fscache_n_retrievals_object_dead));
46591+ atomic_read_unchecked(&fscache_n_retrieval_ops),
46592+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
46593+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
46594
46595 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
46596- atomic_read(&fscache_n_stores),
46597- atomic_read(&fscache_n_stores_ok),
46598- atomic_read(&fscache_n_stores_again),
46599- atomic_read(&fscache_n_stores_nobufs),
46600- atomic_read(&fscache_n_stores_oom));
46601+ atomic_read_unchecked(&fscache_n_stores),
46602+ atomic_read_unchecked(&fscache_n_stores_ok),
46603+ atomic_read_unchecked(&fscache_n_stores_again),
46604+ atomic_read_unchecked(&fscache_n_stores_nobufs),
46605+ atomic_read_unchecked(&fscache_n_stores_oom));
46606 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
46607- atomic_read(&fscache_n_store_ops),
46608- atomic_read(&fscache_n_store_calls),
46609- atomic_read(&fscache_n_store_pages),
46610- atomic_read(&fscache_n_store_radix_deletes),
46611- atomic_read(&fscache_n_store_pages_over_limit));
46612+ atomic_read_unchecked(&fscache_n_store_ops),
46613+ atomic_read_unchecked(&fscache_n_store_calls),
46614+ atomic_read_unchecked(&fscache_n_store_pages),
46615+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
46616+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
46617
46618 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
46619- atomic_read(&fscache_n_store_vmscan_not_storing),
46620- atomic_read(&fscache_n_store_vmscan_gone),
46621- atomic_read(&fscache_n_store_vmscan_busy),
46622- atomic_read(&fscache_n_store_vmscan_cancelled));
46623+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
46624+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
46625+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
46626+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
46627
46628 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
46629- atomic_read(&fscache_n_op_pend),
46630- atomic_read(&fscache_n_op_run),
46631- atomic_read(&fscache_n_op_enqueue),
46632- atomic_read(&fscache_n_op_cancelled),
46633- atomic_read(&fscache_n_op_rejected));
46634+ atomic_read_unchecked(&fscache_n_op_pend),
46635+ atomic_read_unchecked(&fscache_n_op_run),
46636+ atomic_read_unchecked(&fscache_n_op_enqueue),
46637+ atomic_read_unchecked(&fscache_n_op_cancelled),
46638+ atomic_read_unchecked(&fscache_n_op_rejected));
46639 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
46640- atomic_read(&fscache_n_op_deferred_release),
46641- atomic_read(&fscache_n_op_release),
46642- atomic_read(&fscache_n_op_gc));
46643+ atomic_read_unchecked(&fscache_n_op_deferred_release),
46644+ atomic_read_unchecked(&fscache_n_op_release),
46645+ atomic_read_unchecked(&fscache_n_op_gc));
46646
46647 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
46648 atomic_read(&fscache_n_cop_alloc_object),
46649diff -urNp linux-2.6.32.46/fs/fs_struct.c linux-2.6.32.46/fs/fs_struct.c
46650--- linux-2.6.32.46/fs/fs_struct.c 2011-03-27 14:31:47.000000000 -0400
46651+++ linux-2.6.32.46/fs/fs_struct.c 2011-04-17 15:56:46.000000000 -0400
46652@@ -4,6 +4,7 @@
46653 #include <linux/path.h>
46654 #include <linux/slab.h>
46655 #include <linux/fs_struct.h>
46656+#include <linux/grsecurity.h>
46657
46658 /*
46659 * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
46660@@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, s
46661 old_root = fs->root;
46662 fs->root = *path;
46663 path_get(path);
46664+ gr_set_chroot_entries(current, path);
46665 write_unlock(&fs->lock);
46666 if (old_root.dentry)
46667 path_put(&old_root);
46668@@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_roo
46669 && fs->root.mnt == old_root->mnt) {
46670 path_get(new_root);
46671 fs->root = *new_root;
46672+ gr_set_chroot_entries(p, new_root);
46673 count++;
46674 }
46675 if (fs->pwd.dentry == old_root->dentry
46676@@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk)
46677 task_lock(tsk);
46678 write_lock(&fs->lock);
46679 tsk->fs = NULL;
46680- kill = !--fs->users;
46681+ gr_clear_chroot_entries(tsk);
46682+ kill = !atomic_dec_return(&fs->users);
46683 write_unlock(&fs->lock);
46684 task_unlock(tsk);
46685 if (kill)
46686@@ -102,7 +106,7 @@ struct fs_struct *copy_fs_struct(struct
46687 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
46688 /* We don't need to lock fs - think why ;-) */
46689 if (fs) {
46690- fs->users = 1;
46691+ atomic_set(&fs->users, 1);
46692 fs->in_exec = 0;
46693 rwlock_init(&fs->lock);
46694 fs->umask = old->umask;
46695@@ -127,8 +131,9 @@ int unshare_fs_struct(void)
46696
46697 task_lock(current);
46698 write_lock(&fs->lock);
46699- kill = !--fs->users;
46700+ kill = !atomic_dec_return(&fs->users);
46701 current->fs = new_fs;
46702+ gr_set_chroot_entries(current, &new_fs->root);
46703 write_unlock(&fs->lock);
46704 task_unlock(current);
46705
46706@@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask);
46707
46708 /* to be mentioned only in INIT_TASK */
46709 struct fs_struct init_fs = {
46710- .users = 1,
46711+ .users = ATOMIC_INIT(1),
46712 .lock = __RW_LOCK_UNLOCKED(init_fs.lock),
46713 .umask = 0022,
46714 };
46715@@ -162,12 +167,13 @@ void daemonize_fs_struct(void)
46716 task_lock(current);
46717
46718 write_lock(&init_fs.lock);
46719- init_fs.users++;
46720+ atomic_inc(&init_fs.users);
46721 write_unlock(&init_fs.lock);
46722
46723 write_lock(&fs->lock);
46724 current->fs = &init_fs;
46725- kill = !--fs->users;
46726+ gr_set_chroot_entries(current, &current->fs->root);
46727+ kill = !atomic_dec_return(&fs->users);
46728 write_unlock(&fs->lock);
46729
46730 task_unlock(current);
46731diff -urNp linux-2.6.32.46/fs/fuse/cuse.c linux-2.6.32.46/fs/fuse/cuse.c
46732--- linux-2.6.32.46/fs/fuse/cuse.c 2011-03-27 14:31:47.000000000 -0400
46733+++ linux-2.6.32.46/fs/fuse/cuse.c 2011-08-05 20:33:55.000000000 -0400
46734@@ -576,10 +576,12 @@ static int __init cuse_init(void)
46735 INIT_LIST_HEAD(&cuse_conntbl[i]);
46736
46737 /* inherit and extend fuse_dev_operations */
46738- cuse_channel_fops = fuse_dev_operations;
46739- cuse_channel_fops.owner = THIS_MODULE;
46740- cuse_channel_fops.open = cuse_channel_open;
46741- cuse_channel_fops.release = cuse_channel_release;
46742+ pax_open_kernel();
46743+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
46744+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
46745+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
46746+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
46747+ pax_close_kernel();
46748
46749 cuse_class = class_create(THIS_MODULE, "cuse");
46750 if (IS_ERR(cuse_class))
46751diff -urNp linux-2.6.32.46/fs/fuse/dev.c linux-2.6.32.46/fs/fuse/dev.c
46752--- linux-2.6.32.46/fs/fuse/dev.c 2011-08-29 22:24:44.000000000 -0400
46753+++ linux-2.6.32.46/fs/fuse/dev.c 2011-08-29 22:25:07.000000000 -0400
46754@@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struc
46755 {
46756 struct fuse_notify_inval_entry_out outarg;
46757 int err = -EINVAL;
46758- char buf[FUSE_NAME_MAX+1];
46759+ char *buf = NULL;
46760 struct qstr name;
46761
46762 if (size < sizeof(outarg))
46763@@ -899,6 +899,11 @@ static int fuse_notify_inval_entry(struc
46764 if (outarg.namelen > FUSE_NAME_MAX)
46765 goto err;
46766
46767+ err = -ENOMEM;
46768+ buf = kmalloc(FUSE_NAME_MAX+1, GFP_KERNEL);
46769+ if (!buf)
46770+ goto err;
46771+
46772 err = -EINVAL;
46773 if (size != sizeof(outarg) + outarg.namelen + 1)
46774 goto err;
46775@@ -914,17 +919,15 @@ static int fuse_notify_inval_entry(struc
46776
46777 down_read(&fc->killsb);
46778 err = -ENOENT;
46779- if (!fc->sb)
46780- goto err_unlock;
46781-
46782- err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
46783-
46784-err_unlock:
46785+ if (fc->sb)
46786+ err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
46787 up_read(&fc->killsb);
46788+ kfree(buf);
46789 return err;
46790
46791 err:
46792 fuse_copy_finish(cs);
46793+ kfree(buf);
46794 return err;
46795 }
46796
46797diff -urNp linux-2.6.32.46/fs/fuse/dir.c linux-2.6.32.46/fs/fuse/dir.c
46798--- linux-2.6.32.46/fs/fuse/dir.c 2011-03-27 14:31:47.000000000 -0400
46799+++ linux-2.6.32.46/fs/fuse/dir.c 2011-04-17 15:56:46.000000000 -0400
46800@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
46801 return link;
46802 }
46803
46804-static void free_link(char *link)
46805+static void free_link(const char *link)
46806 {
46807 if (!IS_ERR(link))
46808 free_page((unsigned long) link);
46809diff -urNp linux-2.6.32.46/fs/gfs2/ops_inode.c linux-2.6.32.46/fs/gfs2/ops_inode.c
46810--- linux-2.6.32.46/fs/gfs2/ops_inode.c 2011-03-27 14:31:47.000000000 -0400
46811+++ linux-2.6.32.46/fs/gfs2/ops_inode.c 2011-05-16 21:46:57.000000000 -0400
46812@@ -752,6 +752,8 @@ static int gfs2_rename(struct inode *odi
46813 unsigned int x;
46814 int error;
46815
46816+ pax_track_stack();
46817+
46818 if (ndentry->d_inode) {
46819 nip = GFS2_I(ndentry->d_inode);
46820 if (ip == nip)
46821diff -urNp linux-2.6.32.46/fs/gfs2/sys.c linux-2.6.32.46/fs/gfs2/sys.c
46822--- linux-2.6.32.46/fs/gfs2/sys.c 2011-03-27 14:31:47.000000000 -0400
46823+++ linux-2.6.32.46/fs/gfs2/sys.c 2011-04-17 15:56:46.000000000 -0400
46824@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
46825 return a->store ? a->store(sdp, buf, len) : len;
46826 }
46827
46828-static struct sysfs_ops gfs2_attr_ops = {
46829+static const struct sysfs_ops gfs2_attr_ops = {
46830 .show = gfs2_attr_show,
46831 .store = gfs2_attr_store,
46832 };
46833@@ -584,7 +584,7 @@ static int gfs2_uevent(struct kset *kset
46834 return 0;
46835 }
46836
46837-static struct kset_uevent_ops gfs2_uevent_ops = {
46838+static const struct kset_uevent_ops gfs2_uevent_ops = {
46839 .uevent = gfs2_uevent,
46840 };
46841
46842diff -urNp linux-2.6.32.46/fs/hfsplus/catalog.c linux-2.6.32.46/fs/hfsplus/catalog.c
46843--- linux-2.6.32.46/fs/hfsplus/catalog.c 2011-03-27 14:31:47.000000000 -0400
46844+++ linux-2.6.32.46/fs/hfsplus/catalog.c 2011-05-16 21:46:57.000000000 -0400
46845@@ -157,6 +157,8 @@ int hfsplus_find_cat(struct super_block
46846 int err;
46847 u16 type;
46848
46849+ pax_track_stack();
46850+
46851 hfsplus_cat_build_key(sb, fd->search_key, cnid, NULL);
46852 err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry));
46853 if (err)
46854@@ -186,6 +188,8 @@ int hfsplus_create_cat(u32 cnid, struct
46855 int entry_size;
46856 int err;
46857
46858+ pax_track_stack();
46859+
46860 dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n", str->name, cnid, inode->i_nlink);
46861 sb = dir->i_sb;
46862 hfs_find_init(HFSPLUS_SB(sb).cat_tree, &fd);
46863@@ -318,6 +322,8 @@ int hfsplus_rename_cat(u32 cnid,
46864 int entry_size, type;
46865 int err = 0;
46866
46867+ pax_track_stack();
46868+
46869 dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name,
46870 dst_dir->i_ino, dst_name->name);
46871 sb = src_dir->i_sb;
46872diff -urNp linux-2.6.32.46/fs/hfsplus/dir.c linux-2.6.32.46/fs/hfsplus/dir.c
46873--- linux-2.6.32.46/fs/hfsplus/dir.c 2011-03-27 14:31:47.000000000 -0400
46874+++ linux-2.6.32.46/fs/hfsplus/dir.c 2011-05-16 21:46:57.000000000 -0400
46875@@ -121,6 +121,8 @@ static int hfsplus_readdir(struct file *
46876 struct hfsplus_readdir_data *rd;
46877 u16 type;
46878
46879+ pax_track_stack();
46880+
46881 if (filp->f_pos >= inode->i_size)
46882 return 0;
46883
46884diff -urNp linux-2.6.32.46/fs/hfsplus/inode.c linux-2.6.32.46/fs/hfsplus/inode.c
46885--- linux-2.6.32.46/fs/hfsplus/inode.c 2011-03-27 14:31:47.000000000 -0400
46886+++ linux-2.6.32.46/fs/hfsplus/inode.c 2011-05-16 21:46:57.000000000 -0400
46887@@ -399,6 +399,8 @@ int hfsplus_cat_read_inode(struct inode
46888 int res = 0;
46889 u16 type;
46890
46891+ pax_track_stack();
46892+
46893 type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
46894
46895 HFSPLUS_I(inode).dev = 0;
46896@@ -461,6 +463,8 @@ int hfsplus_cat_write_inode(struct inode
46897 struct hfs_find_data fd;
46898 hfsplus_cat_entry entry;
46899
46900+ pax_track_stack();
46901+
46902 if (HFSPLUS_IS_RSRC(inode))
46903 main_inode = HFSPLUS_I(inode).rsrc_inode;
46904
46905diff -urNp linux-2.6.32.46/fs/hfsplus/ioctl.c linux-2.6.32.46/fs/hfsplus/ioctl.c
46906--- linux-2.6.32.46/fs/hfsplus/ioctl.c 2011-03-27 14:31:47.000000000 -0400
46907+++ linux-2.6.32.46/fs/hfsplus/ioctl.c 2011-05-16 21:46:57.000000000 -0400
46908@@ -101,6 +101,8 @@ int hfsplus_setxattr(struct dentry *dent
46909 struct hfsplus_cat_file *file;
46910 int res;
46911
46912+ pax_track_stack();
46913+
46914 if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
46915 return -EOPNOTSUPP;
46916
46917@@ -143,6 +145,8 @@ ssize_t hfsplus_getxattr(struct dentry *
46918 struct hfsplus_cat_file *file;
46919 ssize_t res = 0;
46920
46921+ pax_track_stack();
46922+
46923 if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
46924 return -EOPNOTSUPP;
46925
46926diff -urNp linux-2.6.32.46/fs/hfsplus/super.c linux-2.6.32.46/fs/hfsplus/super.c
46927--- linux-2.6.32.46/fs/hfsplus/super.c 2011-03-27 14:31:47.000000000 -0400
46928+++ linux-2.6.32.46/fs/hfsplus/super.c 2011-05-16 21:46:57.000000000 -0400
46929@@ -312,6 +312,8 @@ static int hfsplus_fill_super(struct sup
46930 struct nls_table *nls = NULL;
46931 int err = -EINVAL;
46932
46933+ pax_track_stack();
46934+
46935 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
46936 if (!sbi)
46937 return -ENOMEM;
46938diff -urNp linux-2.6.32.46/fs/hugetlbfs/inode.c linux-2.6.32.46/fs/hugetlbfs/inode.c
46939--- linux-2.6.32.46/fs/hugetlbfs/inode.c 2011-03-27 14:31:47.000000000 -0400
46940+++ linux-2.6.32.46/fs/hugetlbfs/inode.c 2011-04-17 15:56:46.000000000 -0400
46941@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
46942 .kill_sb = kill_litter_super,
46943 };
46944
46945-static struct vfsmount *hugetlbfs_vfsmount;
46946+struct vfsmount *hugetlbfs_vfsmount;
46947
46948 static int can_do_hugetlb_shm(void)
46949 {
46950diff -urNp linux-2.6.32.46/fs/ioctl.c linux-2.6.32.46/fs/ioctl.c
46951--- linux-2.6.32.46/fs/ioctl.c 2011-03-27 14:31:47.000000000 -0400
46952+++ linux-2.6.32.46/fs/ioctl.c 2011-04-17 15:56:46.000000000 -0400
46953@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
46954 u64 phys, u64 len, u32 flags)
46955 {
46956 struct fiemap_extent extent;
46957- struct fiemap_extent *dest = fieinfo->fi_extents_start;
46958+ struct fiemap_extent __user *dest = fieinfo->fi_extents_start;
46959
46960 /* only count the extents */
46961 if (fieinfo->fi_extents_max == 0) {
46962@@ -207,7 +207,7 @@ static int ioctl_fiemap(struct file *fil
46963
46964 fieinfo.fi_flags = fiemap.fm_flags;
46965 fieinfo.fi_extents_max = fiemap.fm_extent_count;
46966- fieinfo.fi_extents_start = (struct fiemap_extent *)(arg + sizeof(fiemap));
46967+ fieinfo.fi_extents_start = (struct fiemap_extent __user *)(arg + sizeof(fiemap));
46968
46969 if (fiemap.fm_extent_count != 0 &&
46970 !access_ok(VERIFY_WRITE, fieinfo.fi_extents_start,
46971@@ -220,7 +220,7 @@ static int ioctl_fiemap(struct file *fil
46972 error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len);
46973 fiemap.fm_flags = fieinfo.fi_flags;
46974 fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;
46975- if (copy_to_user((char *)arg, &fiemap, sizeof(fiemap)))
46976+ if (copy_to_user((__force char __user *)arg, &fiemap, sizeof(fiemap)))
46977 error = -EFAULT;
46978
46979 return error;
46980diff -urNp linux-2.6.32.46/fs/jbd/checkpoint.c linux-2.6.32.46/fs/jbd/checkpoint.c
46981--- linux-2.6.32.46/fs/jbd/checkpoint.c 2011-03-27 14:31:47.000000000 -0400
46982+++ linux-2.6.32.46/fs/jbd/checkpoint.c 2011-05-16 21:46:57.000000000 -0400
46983@@ -348,6 +348,8 @@ int log_do_checkpoint(journal_t *journal
46984 tid_t this_tid;
46985 int result;
46986
46987+ pax_track_stack();
46988+
46989 jbd_debug(1, "Start checkpoint\n");
46990
46991 /*
46992diff -urNp linux-2.6.32.46/fs/jffs2/compr_rtime.c linux-2.6.32.46/fs/jffs2/compr_rtime.c
46993--- linux-2.6.32.46/fs/jffs2/compr_rtime.c 2011-03-27 14:31:47.000000000 -0400
46994+++ linux-2.6.32.46/fs/jffs2/compr_rtime.c 2011-05-16 21:46:57.000000000 -0400
46995@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
46996 int outpos = 0;
46997 int pos=0;
46998
46999+ pax_track_stack();
47000+
47001 memset(positions,0,sizeof(positions));
47002
47003 while (pos < (*sourcelen) && outpos <= (*dstlen)-2) {
47004@@ -79,6 +81,8 @@ static int jffs2_rtime_decompress(unsign
47005 int outpos = 0;
47006 int pos=0;
47007
47008+ pax_track_stack();
47009+
47010 memset(positions,0,sizeof(positions));
47011
47012 while (outpos<destlen) {
47013diff -urNp linux-2.6.32.46/fs/jffs2/compr_rubin.c linux-2.6.32.46/fs/jffs2/compr_rubin.c
47014--- linux-2.6.32.46/fs/jffs2/compr_rubin.c 2011-03-27 14:31:47.000000000 -0400
47015+++ linux-2.6.32.46/fs/jffs2/compr_rubin.c 2011-05-16 21:46:57.000000000 -0400
47016@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
47017 int ret;
47018 uint32_t mysrclen, mydstlen;
47019
47020+ pax_track_stack();
47021+
47022 mysrclen = *sourcelen;
47023 mydstlen = *dstlen - 8;
47024
47025diff -urNp linux-2.6.32.46/fs/jffs2/erase.c linux-2.6.32.46/fs/jffs2/erase.c
47026--- linux-2.6.32.46/fs/jffs2/erase.c 2011-03-27 14:31:47.000000000 -0400
47027+++ linux-2.6.32.46/fs/jffs2/erase.c 2011-04-17 15:56:46.000000000 -0400
47028@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
47029 struct jffs2_unknown_node marker = {
47030 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
47031 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
47032- .totlen = cpu_to_je32(c->cleanmarker_size)
47033+ .totlen = cpu_to_je32(c->cleanmarker_size),
47034+ .hdr_crc = cpu_to_je32(0)
47035 };
47036
47037 jffs2_prealloc_raw_node_refs(c, jeb, 1);
47038diff -urNp linux-2.6.32.46/fs/jffs2/wbuf.c linux-2.6.32.46/fs/jffs2/wbuf.c
47039--- linux-2.6.32.46/fs/jffs2/wbuf.c 2011-03-27 14:31:47.000000000 -0400
47040+++ linux-2.6.32.46/fs/jffs2/wbuf.c 2011-04-17 15:56:46.000000000 -0400
47041@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
47042 {
47043 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
47044 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
47045- .totlen = constant_cpu_to_je32(8)
47046+ .totlen = constant_cpu_to_je32(8),
47047+ .hdr_crc = constant_cpu_to_je32(0)
47048 };
47049
47050 /*
47051diff -urNp linux-2.6.32.46/fs/jffs2/xattr.c linux-2.6.32.46/fs/jffs2/xattr.c
47052--- linux-2.6.32.46/fs/jffs2/xattr.c 2011-03-27 14:31:47.000000000 -0400
47053+++ linux-2.6.32.46/fs/jffs2/xattr.c 2011-05-16 21:46:57.000000000 -0400
47054@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct
47055
47056 BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
47057
47058+ pax_track_stack();
47059+
47060 /* Phase.1 : Merge same xref */
47061 for (i=0; i < XREF_TMPHASH_SIZE; i++)
47062 xref_tmphash[i] = NULL;
47063diff -urNp linux-2.6.32.46/fs/jfs/super.c linux-2.6.32.46/fs/jfs/super.c
47064--- linux-2.6.32.46/fs/jfs/super.c 2011-03-27 14:31:47.000000000 -0400
47065+++ linux-2.6.32.46/fs/jfs/super.c 2011-06-07 18:06:04.000000000 -0400
47066@@ -793,7 +793,7 @@ static int __init init_jfs_fs(void)
47067
47068 jfs_inode_cachep =
47069 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
47070- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
47071+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
47072 init_once);
47073 if (jfs_inode_cachep == NULL)
47074 return -ENOMEM;
47075diff -urNp linux-2.6.32.46/fs/Kconfig.binfmt linux-2.6.32.46/fs/Kconfig.binfmt
47076--- linux-2.6.32.46/fs/Kconfig.binfmt 2011-03-27 14:31:47.000000000 -0400
47077+++ linux-2.6.32.46/fs/Kconfig.binfmt 2011-04-17 15:56:46.000000000 -0400
47078@@ -86,7 +86,7 @@ config HAVE_AOUT
47079
47080 config BINFMT_AOUT
47081 tristate "Kernel support for a.out and ECOFF binaries"
47082- depends on HAVE_AOUT
47083+ depends on HAVE_AOUT && BROKEN
47084 ---help---
47085 A.out (Assembler.OUTput) is a set of formats for libraries and
47086 executables used in the earliest versions of UNIX. Linux used
47087diff -urNp linux-2.6.32.46/fs/libfs.c linux-2.6.32.46/fs/libfs.c
47088--- linux-2.6.32.46/fs/libfs.c 2011-03-27 14:31:47.000000000 -0400
47089+++ linux-2.6.32.46/fs/libfs.c 2011-05-11 18:25:15.000000000 -0400
47090@@ -157,12 +157,20 @@ int dcache_readdir(struct file * filp, v
47091
47092 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
47093 struct dentry *next;
47094+ char d_name[sizeof(next->d_iname)];
47095+ const unsigned char *name;
47096+
47097 next = list_entry(p, struct dentry, d_u.d_child);
47098 if (d_unhashed(next) || !next->d_inode)
47099 continue;
47100
47101 spin_unlock(&dcache_lock);
47102- if (filldir(dirent, next->d_name.name,
47103+ name = next->d_name.name;
47104+ if (name == next->d_iname) {
47105+ memcpy(d_name, name, next->d_name.len);
47106+ name = d_name;
47107+ }
47108+ if (filldir(dirent, name,
47109 next->d_name.len, filp->f_pos,
47110 next->d_inode->i_ino,
47111 dt_type(next->d_inode)) < 0)
47112diff -urNp linux-2.6.32.46/fs/lockd/clntproc.c linux-2.6.32.46/fs/lockd/clntproc.c
47113--- linux-2.6.32.46/fs/lockd/clntproc.c 2011-03-27 14:31:47.000000000 -0400
47114+++ linux-2.6.32.46/fs/lockd/clntproc.c 2011-05-16 21:46:57.000000000 -0400
47115@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
47116 /*
47117 * Cookie counter for NLM requests
47118 */
47119-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
47120+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
47121
47122 void nlmclnt_next_cookie(struct nlm_cookie *c)
47123 {
47124- u32 cookie = atomic_inc_return(&nlm_cookie);
47125+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
47126
47127 memcpy(c->data, &cookie, 4);
47128 c->len=4;
47129@@ -621,6 +621,8 @@ nlmclnt_reclaim(struct nlm_host *host, s
47130 struct nlm_rqst reqst, *req;
47131 int status;
47132
47133+ pax_track_stack();
47134+
47135 req = &reqst;
47136 memset(req, 0, sizeof(*req));
47137 locks_init_lock(&req->a_args.lock.fl);
47138diff -urNp linux-2.6.32.46/fs/lockd/svc.c linux-2.6.32.46/fs/lockd/svc.c
47139--- linux-2.6.32.46/fs/lockd/svc.c 2011-03-27 14:31:47.000000000 -0400
47140+++ linux-2.6.32.46/fs/lockd/svc.c 2011-04-17 15:56:46.000000000 -0400
47141@@ -43,7 +43,7 @@
47142
47143 static struct svc_program nlmsvc_program;
47144
47145-struct nlmsvc_binding * nlmsvc_ops;
47146+const struct nlmsvc_binding * nlmsvc_ops;
47147 EXPORT_SYMBOL_GPL(nlmsvc_ops);
47148
47149 static DEFINE_MUTEX(nlmsvc_mutex);
47150diff -urNp linux-2.6.32.46/fs/locks.c linux-2.6.32.46/fs/locks.c
47151--- linux-2.6.32.46/fs/locks.c 2011-03-27 14:31:47.000000000 -0400
47152+++ linux-2.6.32.46/fs/locks.c 2011-07-06 19:47:11.000000000 -0400
47153@@ -145,10 +145,28 @@ static LIST_HEAD(blocked_list);
47154
47155 static struct kmem_cache *filelock_cache __read_mostly;
47156
47157+static void locks_init_lock_always(struct file_lock *fl)
47158+{
47159+ fl->fl_next = NULL;
47160+ fl->fl_fasync = NULL;
47161+ fl->fl_owner = NULL;
47162+ fl->fl_pid = 0;
47163+ fl->fl_nspid = NULL;
47164+ fl->fl_file = NULL;
47165+ fl->fl_flags = 0;
47166+ fl->fl_type = 0;
47167+ fl->fl_start = fl->fl_end = 0;
47168+}
47169+
47170 /* Allocate an empty lock structure. */
47171 static struct file_lock *locks_alloc_lock(void)
47172 {
47173- return kmem_cache_alloc(filelock_cache, GFP_KERNEL);
47174+ struct file_lock *fl = kmem_cache_alloc(filelock_cache, GFP_KERNEL);
47175+
47176+ if (fl)
47177+ locks_init_lock_always(fl);
47178+
47179+ return fl;
47180 }
47181
47182 void locks_release_private(struct file_lock *fl)
47183@@ -183,17 +201,9 @@ void locks_init_lock(struct file_lock *f
47184 INIT_LIST_HEAD(&fl->fl_link);
47185 INIT_LIST_HEAD(&fl->fl_block);
47186 init_waitqueue_head(&fl->fl_wait);
47187- fl->fl_next = NULL;
47188- fl->fl_fasync = NULL;
47189- fl->fl_owner = NULL;
47190- fl->fl_pid = 0;
47191- fl->fl_nspid = NULL;
47192- fl->fl_file = NULL;
47193- fl->fl_flags = 0;
47194- fl->fl_type = 0;
47195- fl->fl_start = fl->fl_end = 0;
47196 fl->fl_ops = NULL;
47197 fl->fl_lmops = NULL;
47198+ locks_init_lock_always(fl);
47199 }
47200
47201 EXPORT_SYMBOL(locks_init_lock);
47202@@ -2007,16 +2017,16 @@ void locks_remove_flock(struct file *fil
47203 return;
47204
47205 if (filp->f_op && filp->f_op->flock) {
47206- struct file_lock fl = {
47207+ struct file_lock flock = {
47208 .fl_pid = current->tgid,
47209 .fl_file = filp,
47210 .fl_flags = FL_FLOCK,
47211 .fl_type = F_UNLCK,
47212 .fl_end = OFFSET_MAX,
47213 };
47214- filp->f_op->flock(filp, F_SETLKW, &fl);
47215- if (fl.fl_ops && fl.fl_ops->fl_release_private)
47216- fl.fl_ops->fl_release_private(&fl);
47217+ filp->f_op->flock(filp, F_SETLKW, &flock);
47218+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
47219+ flock.fl_ops->fl_release_private(&flock);
47220 }
47221
47222 lock_kernel();
47223diff -urNp linux-2.6.32.46/fs/mbcache.c linux-2.6.32.46/fs/mbcache.c
47224--- linux-2.6.32.46/fs/mbcache.c 2011-03-27 14:31:47.000000000 -0400
47225+++ linux-2.6.32.46/fs/mbcache.c 2011-08-05 20:33:55.000000000 -0400
47226@@ -266,9 +266,9 @@ mb_cache_create(const char *name, struct
47227 if (!cache)
47228 goto fail;
47229 cache->c_name = name;
47230- cache->c_op.free = NULL;
47231+ *(void **)&cache->c_op.free = NULL;
47232 if (cache_op)
47233- cache->c_op.free = cache_op->free;
47234+ *(void **)&cache->c_op.free = cache_op->free;
47235 atomic_set(&cache->c_entry_count, 0);
47236 cache->c_bucket_bits = bucket_bits;
47237 #ifdef MB_CACHE_INDEXES_COUNT
47238diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
47239--- linux-2.6.32.46/fs/namei.c 2011-03-27 14:31:47.000000000 -0400
47240+++ linux-2.6.32.46/fs/namei.c 2011-10-06 03:36:41.000000000 -0400
47241@@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
47242 return ret;
47243
47244 /*
47245- * Read/write DACs are always overridable.
47246- * Executable DACs are overridable if at least one exec bit is set.
47247- */
47248- if (!(mask & MAY_EXEC) || execute_ok(inode))
47249- if (capable(CAP_DAC_OVERRIDE))
47250- return 0;
47251-
47252- /*
47253 * Searching includes executable on directories, else just read.
47254 */
47255 mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
47256@@ -239,6 +231,14 @@ int generic_permission(struct inode *ino
47257 if (capable(CAP_DAC_READ_SEARCH))
47258 return 0;
47259
47260+ /*
47261+ * Read/write DACs are always overridable.
47262+ * Executable DACs are overridable if at least one exec bit is set.
47263+ */
47264+ if (!(mask & MAY_EXEC) || execute_ok(inode))
47265+ if (capable(CAP_DAC_OVERRIDE))
47266+ return 0;
47267+
47268 return -EACCES;
47269 }
47270
47271@@ -458,7 +458,8 @@ static int exec_permission_lite(struct i
47272 if (!ret)
47273 goto ok;
47274
47275- if (capable(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH))
47276+ if (capable_nolog(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH) ||
47277+ capable(CAP_DAC_OVERRIDE))
47278 goto ok;
47279
47280 return ret;
47281@@ -638,7 +639,7 @@ static __always_inline int __do_follow_l
47282 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
47283 error = PTR_ERR(cookie);
47284 if (!IS_ERR(cookie)) {
47285- char *s = nd_get_link(nd);
47286+ const char *s = nd_get_link(nd);
47287 error = 0;
47288 if (s)
47289 error = __vfs_follow_link(nd, s);
47290@@ -669,6 +670,18 @@ static inline int do_follow_link(struct
47291 err = security_inode_follow_link(path->dentry, nd);
47292 if (err)
47293 goto loop;
47294+
47295+ if (gr_handle_follow_link(path->dentry->d_parent->d_inode,
47296+ path->dentry->d_inode, path->dentry, nd->path.mnt)) {
47297+ err = -EACCES;
47298+ goto loop;
47299+ }
47300+
47301+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
47302+ err = -ENOENT;
47303+ goto loop;
47304+ }
47305+
47306 current->link_count++;
47307 current->total_link_count++;
47308 nd->depth++;
47309@@ -1016,11 +1029,18 @@ return_reval:
47310 break;
47311 }
47312 return_base:
47313+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47314+ path_put(&nd->path);
47315+ return -ENOENT;
47316+ }
47317 return 0;
47318 out_dput:
47319 path_put_conditional(&next, nd);
47320 break;
47321 }
47322+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
47323+ err = -ENOENT;
47324+
47325 path_put(&nd->path);
47326 return_err:
47327 return err;
47328@@ -1091,13 +1111,20 @@ static int do_path_lookup(int dfd, const
47329 int retval = path_init(dfd, name, flags, nd);
47330 if (!retval)
47331 retval = path_walk(name, nd);
47332- if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry &&
47333- nd->path.dentry->d_inode))
47334- audit_inode(name, nd->path.dentry);
47335+
47336+ if (likely(!retval)) {
47337+ if (nd->path.dentry && nd->path.dentry->d_inode) {
47338+ if (*name != '/' && !gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
47339+ retval = -ENOENT;
47340+ if (!audit_dummy_context())
47341+ audit_inode(name, nd->path.dentry);
47342+ }
47343+ }
47344 if (nd->root.mnt) {
47345 path_put(&nd->root);
47346 nd->root.mnt = NULL;
47347 }
47348+
47349 return retval;
47350 }
47351
47352@@ -1576,6 +1603,20 @@ int may_open(struct path *path, int acc_
47353 if (error)
47354 goto err_out;
47355
47356+
47357+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode)) {
47358+ error = -EPERM;
47359+ goto err_out;
47360+ }
47361+ if (gr_handle_rawio(inode)) {
47362+ error = -EPERM;
47363+ goto err_out;
47364+ }
47365+ if (!gr_acl_handle_open(dentry, path->mnt, flag)) {
47366+ error = -EACCES;
47367+ goto err_out;
47368+ }
47369+
47370 if (flag & O_TRUNC) {
47371 error = get_write_access(inode);
47372 if (error)
47373@@ -1621,12 +1662,19 @@ static int __open_namei_create(struct na
47374 int error;
47375 struct dentry *dir = nd->path.dentry;
47376
47377+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, flag, mode)) {
47378+ error = -EACCES;
47379+ goto out_unlock;
47380+ }
47381+
47382 if (!IS_POSIXACL(dir->d_inode))
47383 mode &= ~current_umask();
47384 error = security_path_mknod(&nd->path, path->dentry, mode, 0);
47385 if (error)
47386 goto out_unlock;
47387 error = vfs_create(dir->d_inode, path->dentry, mode, nd);
47388+ if (!error)
47389+ gr_handle_create(path->dentry, nd->path.mnt);
47390 out_unlock:
47391 mutex_unlock(&dir->d_inode->i_mutex);
47392 dput(nd->path.dentry);
47393@@ -1709,6 +1757,22 @@ struct file *do_filp_open(int dfd, const
47394 &nd, flag);
47395 if (error)
47396 return ERR_PTR(error);
47397+
47398+ if (gr_handle_rofs_blockwrite(nd.path.dentry, nd.path.mnt, acc_mode)) {
47399+ error = -EPERM;
47400+ goto exit;
47401+ }
47402+
47403+ if (gr_handle_rawio(nd.path.dentry->d_inode)) {
47404+ error = -EPERM;
47405+ goto exit;
47406+ }
47407+
47408+ if (!gr_acl_handle_open(nd.path.dentry, nd.path.mnt, flag)) {
47409+ error = -EACCES;
47410+ goto exit;
47411+ }
47412+
47413 goto ok;
47414 }
47415
47416@@ -1795,6 +1859,14 @@ do_last:
47417 /*
47418 * It already exists.
47419 */
47420+
47421+ /* only check if O_CREAT is specified, all other checks need
47422+ to go into may_open */
47423+ if (gr_handle_fifo(path.dentry, path.mnt, dir, flag, acc_mode)) {
47424+ error = -EACCES;
47425+ goto exit_mutex_unlock;
47426+ }
47427+
47428 mutex_unlock(&dir->d_inode->i_mutex);
47429 audit_inode(pathname, path.dentry);
47430
47431@@ -1887,6 +1959,13 @@ do_link:
47432 error = security_inode_follow_link(path.dentry, &nd);
47433 if (error)
47434 goto exit_dput;
47435+
47436+ if (gr_handle_follow_link(path.dentry->d_parent->d_inode, path.dentry->d_inode,
47437+ path.dentry, nd.path.mnt)) {
47438+ error = -EACCES;
47439+ goto exit_dput;
47440+ }
47441+
47442 error = __do_follow_link(&path, &nd);
47443 if (error) {
47444 /* Does someone understand code flow here? Or it is only
47445@@ -2061,6 +2140,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
47446 error = may_mknod(mode);
47447 if (error)
47448 goto out_dput;
47449+
47450+ if (gr_handle_chroot_mknod(dentry, nd.path.mnt, mode)) {
47451+ error = -EPERM;
47452+ goto out_dput;
47453+ }
47454+
47455+ if (!gr_acl_handle_mknod(dentry, nd.path.dentry, nd.path.mnt, mode)) {
47456+ error = -EACCES;
47457+ goto out_dput;
47458+ }
47459+
47460 error = mnt_want_write(nd.path.mnt);
47461 if (error)
47462 goto out_dput;
47463@@ -2081,6 +2171,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
47464 }
47465 out_drop_write:
47466 mnt_drop_write(nd.path.mnt);
47467+
47468+ if (!error)
47469+ gr_handle_create(dentry, nd.path.mnt);
47470 out_dput:
47471 dput(dentry);
47472 out_unlock:
47473@@ -2134,6 +2227,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
47474 if (IS_ERR(dentry))
47475 goto out_unlock;
47476
47477+ if (!gr_acl_handle_mkdir(dentry, nd.path.dentry, nd.path.mnt)) {
47478+ error = -EACCES;
47479+ goto out_dput;
47480+ }
47481+
47482 if (!IS_POSIXACL(nd.path.dentry->d_inode))
47483 mode &= ~current_umask();
47484 error = mnt_want_write(nd.path.mnt);
47485@@ -2145,6 +2243,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
47486 error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
47487 out_drop_write:
47488 mnt_drop_write(nd.path.mnt);
47489+
47490+ if (!error)
47491+ gr_handle_create(dentry, nd.path.mnt);
47492+
47493 out_dput:
47494 dput(dentry);
47495 out_unlock:
47496@@ -2226,6 +2328,8 @@ static long do_rmdir(int dfd, const char
47497 char * name;
47498 struct dentry *dentry;
47499 struct nameidata nd;
47500+ ino_t saved_ino = 0;
47501+ dev_t saved_dev = 0;
47502
47503 error = user_path_parent(dfd, pathname, &nd, &name);
47504 if (error)
47505@@ -2250,6 +2354,19 @@ static long do_rmdir(int dfd, const char
47506 error = PTR_ERR(dentry);
47507 if (IS_ERR(dentry))
47508 goto exit2;
47509+
47510+ if (dentry->d_inode != NULL) {
47511+ if (dentry->d_inode->i_nlink <= 1) {
47512+ saved_ino = dentry->d_inode->i_ino;
47513+ saved_dev = gr_get_dev_from_dentry(dentry);
47514+ }
47515+
47516+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
47517+ error = -EACCES;
47518+ goto exit3;
47519+ }
47520+ }
47521+
47522 error = mnt_want_write(nd.path.mnt);
47523 if (error)
47524 goto exit3;
47525@@ -2257,6 +2374,8 @@ static long do_rmdir(int dfd, const char
47526 if (error)
47527 goto exit4;
47528 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
47529+ if (!error && (saved_dev || saved_ino))
47530+ gr_handle_delete(saved_ino, saved_dev);
47531 exit4:
47532 mnt_drop_write(nd.path.mnt);
47533 exit3:
47534@@ -2318,6 +2437,8 @@ static long do_unlinkat(int dfd, const c
47535 struct dentry *dentry;
47536 struct nameidata nd;
47537 struct inode *inode = NULL;
47538+ ino_t saved_ino = 0;
47539+ dev_t saved_dev = 0;
47540
47541 error = user_path_parent(dfd, pathname, &nd, &name);
47542 if (error)
47543@@ -2337,8 +2458,19 @@ static long do_unlinkat(int dfd, const c
47544 if (nd.last.name[nd.last.len])
47545 goto slashes;
47546 inode = dentry->d_inode;
47547- if (inode)
47548+ if (inode) {
47549+ if (inode->i_nlink <= 1) {
47550+ saved_ino = inode->i_ino;
47551+ saved_dev = gr_get_dev_from_dentry(dentry);
47552+ }
47553+
47554 atomic_inc(&inode->i_count);
47555+
47556+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
47557+ error = -EACCES;
47558+ goto exit2;
47559+ }
47560+ }
47561 error = mnt_want_write(nd.path.mnt);
47562 if (error)
47563 goto exit2;
47564@@ -2346,6 +2478,8 @@ static long do_unlinkat(int dfd, const c
47565 if (error)
47566 goto exit3;
47567 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
47568+ if (!error && (saved_ino || saved_dev))
47569+ gr_handle_delete(saved_ino, saved_dev);
47570 exit3:
47571 mnt_drop_write(nd.path.mnt);
47572 exit2:
47573@@ -2424,6 +2558,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
47574 if (IS_ERR(dentry))
47575 goto out_unlock;
47576
47577+ if (!gr_acl_handle_symlink(dentry, nd.path.dentry, nd.path.mnt, from)) {
47578+ error = -EACCES;
47579+ goto out_dput;
47580+ }
47581+
47582 error = mnt_want_write(nd.path.mnt);
47583 if (error)
47584 goto out_dput;
47585@@ -2431,6 +2570,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
47586 if (error)
47587 goto out_drop_write;
47588 error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
47589+ if (!error)
47590+ gr_handle_create(dentry, nd.path.mnt);
47591 out_drop_write:
47592 mnt_drop_write(nd.path.mnt);
47593 out_dput:
47594@@ -2524,6 +2665,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
47595 error = PTR_ERR(new_dentry);
47596 if (IS_ERR(new_dentry))
47597 goto out_unlock;
47598+
47599+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
47600+ old_path.dentry->d_inode,
47601+ old_path.dentry->d_inode->i_mode, to)) {
47602+ error = -EACCES;
47603+ goto out_dput;
47604+ }
47605+
47606+ if (!gr_acl_handle_link(new_dentry, nd.path.dentry, nd.path.mnt,
47607+ old_path.dentry, old_path.mnt, to)) {
47608+ error = -EACCES;
47609+ goto out_dput;
47610+ }
47611+
47612 error = mnt_want_write(nd.path.mnt);
47613 if (error)
47614 goto out_dput;
47615@@ -2531,6 +2686,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
47616 if (error)
47617 goto out_drop_write;
47618 error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
47619+ if (!error)
47620+ gr_handle_create(new_dentry, nd.path.mnt);
47621 out_drop_write:
47622 mnt_drop_write(nd.path.mnt);
47623 out_dput:
47624@@ -2708,6 +2865,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
47625 char *to;
47626 int error;
47627
47628+ pax_track_stack();
47629+
47630 error = user_path_parent(olddfd, oldname, &oldnd, &from);
47631 if (error)
47632 goto exit;
47633@@ -2764,6 +2923,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
47634 if (new_dentry == trap)
47635 goto exit5;
47636
47637+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
47638+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
47639+ to);
47640+ if (error)
47641+ goto exit5;
47642+
47643 error = mnt_want_write(oldnd.path.mnt);
47644 if (error)
47645 goto exit5;
47646@@ -2773,6 +2938,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
47647 goto exit6;
47648 error = vfs_rename(old_dir->d_inode, old_dentry,
47649 new_dir->d_inode, new_dentry);
47650+ if (!error)
47651+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
47652+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
47653 exit6:
47654 mnt_drop_write(oldnd.path.mnt);
47655 exit5:
47656@@ -2798,6 +2966,8 @@ SYSCALL_DEFINE2(rename, const char __use
47657
47658 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
47659 {
47660+ char tmpbuf[64];
47661+ const char *newlink;
47662 int len;
47663
47664 len = PTR_ERR(link);
47665@@ -2807,7 +2977,14 @@ int vfs_readlink(struct dentry *dentry,
47666 len = strlen(link);
47667 if (len > (unsigned) buflen)
47668 len = buflen;
47669- if (copy_to_user(buffer, link, len))
47670+
47671+ if (len < sizeof(tmpbuf)) {
47672+ memcpy(tmpbuf, link, len);
47673+ newlink = tmpbuf;
47674+ } else
47675+ newlink = link;
47676+
47677+ if (copy_to_user(buffer, newlink, len))
47678 len = -EFAULT;
47679 out:
47680 return len;
47681diff -urNp linux-2.6.32.46/fs/namespace.c linux-2.6.32.46/fs/namespace.c
47682--- linux-2.6.32.46/fs/namespace.c 2011-03-27 14:31:47.000000000 -0400
47683+++ linux-2.6.32.46/fs/namespace.c 2011-04-17 15:56:46.000000000 -0400
47684@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
47685 if (!(sb->s_flags & MS_RDONLY))
47686 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
47687 up_write(&sb->s_umount);
47688+
47689+ gr_log_remount(mnt->mnt_devname, retval);
47690+
47691 return retval;
47692 }
47693
47694@@ -1104,6 +1107,9 @@ static int do_umount(struct vfsmount *mn
47695 security_sb_umount_busy(mnt);
47696 up_write(&namespace_sem);
47697 release_mounts(&umount_list);
47698+
47699+ gr_log_unmount(mnt->mnt_devname, retval);
47700+
47701 return retval;
47702 }
47703
47704@@ -1962,6 +1968,16 @@ long do_mount(char *dev_name, char *dir_
47705 if (retval)
47706 goto dput_out;
47707
47708+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
47709+ retval = -EPERM;
47710+ goto dput_out;
47711+ }
47712+
47713+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
47714+ retval = -EPERM;
47715+ goto dput_out;
47716+ }
47717+
47718 if (flags & MS_REMOUNT)
47719 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
47720 data_page);
47721@@ -1976,6 +1992,9 @@ long do_mount(char *dev_name, char *dir_
47722 dev_name, data_page);
47723 dput_out:
47724 path_put(&path);
47725+
47726+ gr_log_mount(dev_name, dir_name, retval);
47727+
47728 return retval;
47729 }
47730
47731@@ -2182,6 +2201,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
47732 goto out1;
47733 }
47734
47735+ if (gr_handle_chroot_pivot()) {
47736+ error = -EPERM;
47737+ path_put(&old);
47738+ goto out1;
47739+ }
47740+
47741 read_lock(&current->fs->lock);
47742 root = current->fs->root;
47743 path_get(&current->fs->root);
47744diff -urNp linux-2.6.32.46/fs/ncpfs/dir.c linux-2.6.32.46/fs/ncpfs/dir.c
47745--- linux-2.6.32.46/fs/ncpfs/dir.c 2011-03-27 14:31:47.000000000 -0400
47746+++ linux-2.6.32.46/fs/ncpfs/dir.c 2011-05-16 21:46:57.000000000 -0400
47747@@ -275,6 +275,8 @@ __ncp_lookup_validate(struct dentry *den
47748 int res, val = 0, len;
47749 __u8 __name[NCP_MAXPATHLEN + 1];
47750
47751+ pax_track_stack();
47752+
47753 parent = dget_parent(dentry);
47754 dir = parent->d_inode;
47755
47756@@ -799,6 +801,8 @@ static struct dentry *ncp_lookup(struct
47757 int error, res, len;
47758 __u8 __name[NCP_MAXPATHLEN + 1];
47759
47760+ pax_track_stack();
47761+
47762 lock_kernel();
47763 error = -EIO;
47764 if (!ncp_conn_valid(server))
47765@@ -883,10 +887,12 @@ int ncp_create_new(struct inode *dir, st
47766 int error, result, len;
47767 int opmode;
47768 __u8 __name[NCP_MAXPATHLEN + 1];
47769-
47770+
47771 PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n",
47772 dentry->d_parent->d_name.name, dentry->d_name.name, mode);
47773
47774+ pax_track_stack();
47775+
47776 error = -EIO;
47777 lock_kernel();
47778 if (!ncp_conn_valid(server))
47779@@ -952,6 +958,8 @@ static int ncp_mkdir(struct inode *dir,
47780 int error, len;
47781 __u8 __name[NCP_MAXPATHLEN + 1];
47782
47783+ pax_track_stack();
47784+
47785 DPRINTK("ncp_mkdir: making %s/%s\n",
47786 dentry->d_parent->d_name.name, dentry->d_name.name);
47787
47788@@ -960,6 +968,8 @@ static int ncp_mkdir(struct inode *dir,
47789 if (!ncp_conn_valid(server))
47790 goto out;
47791
47792+ pax_track_stack();
47793+
47794 ncp_age_dentry(server, dentry);
47795 len = sizeof(__name);
47796 error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
47797@@ -1114,6 +1124,8 @@ static int ncp_rename(struct inode *old_
47798 int old_len, new_len;
47799 __u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
47800
47801+ pax_track_stack();
47802+
47803 DPRINTK("ncp_rename: %s/%s to %s/%s\n",
47804 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
47805 new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
47806diff -urNp linux-2.6.32.46/fs/ncpfs/inode.c linux-2.6.32.46/fs/ncpfs/inode.c
47807--- linux-2.6.32.46/fs/ncpfs/inode.c 2011-03-27 14:31:47.000000000 -0400
47808+++ linux-2.6.32.46/fs/ncpfs/inode.c 2011-05-16 21:46:57.000000000 -0400
47809@@ -445,6 +445,8 @@ static int ncp_fill_super(struct super_b
47810 #endif
47811 struct ncp_entry_info finfo;
47812
47813+ pax_track_stack();
47814+
47815 data.wdog_pid = NULL;
47816 server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
47817 if (!server)
47818diff -urNp linux-2.6.32.46/fs/nfs/inode.c linux-2.6.32.46/fs/nfs/inode.c
47819--- linux-2.6.32.46/fs/nfs/inode.c 2011-05-10 22:12:01.000000000 -0400
47820+++ linux-2.6.32.46/fs/nfs/inode.c 2011-07-06 19:53:33.000000000 -0400
47821@@ -156,7 +156,7 @@ static void nfs_zap_caches_locked(struct
47822 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
47823 nfsi->attrtimeo_timestamp = jiffies;
47824
47825- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
47826+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
47827 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
47828 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
47829 else
47830@@ -973,16 +973,16 @@ static int nfs_size_need_update(const st
47831 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
47832 }
47833
47834-static atomic_long_t nfs_attr_generation_counter;
47835+static atomic_long_unchecked_t nfs_attr_generation_counter;
47836
47837 static unsigned long nfs_read_attr_generation_counter(void)
47838 {
47839- return atomic_long_read(&nfs_attr_generation_counter);
47840+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
47841 }
47842
47843 unsigned long nfs_inc_attr_generation_counter(void)
47844 {
47845- return atomic_long_inc_return(&nfs_attr_generation_counter);
47846+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
47847 }
47848
47849 void nfs_fattr_init(struct nfs_fattr *fattr)
47850diff -urNp linux-2.6.32.46/fs/nfsd/lockd.c linux-2.6.32.46/fs/nfsd/lockd.c
47851--- linux-2.6.32.46/fs/nfsd/lockd.c 2011-04-17 17:00:52.000000000 -0400
47852+++ linux-2.6.32.46/fs/nfsd/lockd.c 2011-04-17 17:03:15.000000000 -0400
47853@@ -66,7 +66,7 @@ nlm_fclose(struct file *filp)
47854 fput(filp);
47855 }
47856
47857-static struct nlmsvc_binding nfsd_nlm_ops = {
47858+static const struct nlmsvc_binding nfsd_nlm_ops = {
47859 .fopen = nlm_fopen, /* open file for locking */
47860 .fclose = nlm_fclose, /* close file */
47861 };
47862diff -urNp linux-2.6.32.46/fs/nfsd/nfs4state.c linux-2.6.32.46/fs/nfsd/nfs4state.c
47863--- linux-2.6.32.46/fs/nfsd/nfs4state.c 2011-03-27 14:31:47.000000000 -0400
47864+++ linux-2.6.32.46/fs/nfsd/nfs4state.c 2011-05-16 21:46:57.000000000 -0400
47865@@ -3457,6 +3457,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
47866 unsigned int cmd;
47867 int err;
47868
47869+ pax_track_stack();
47870+
47871 dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
47872 (long long) lock->lk_offset,
47873 (long long) lock->lk_length);
47874diff -urNp linux-2.6.32.46/fs/nfsd/nfs4xdr.c linux-2.6.32.46/fs/nfsd/nfs4xdr.c
47875--- linux-2.6.32.46/fs/nfsd/nfs4xdr.c 2011-03-27 14:31:47.000000000 -0400
47876+++ linux-2.6.32.46/fs/nfsd/nfs4xdr.c 2011-05-16 21:46:57.000000000 -0400
47877@@ -1751,6 +1751,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
47878 struct nfsd4_compoundres *resp = rqstp->rq_resp;
47879 u32 minorversion = resp->cstate.minorversion;
47880
47881+ pax_track_stack();
47882+
47883 BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
47884 BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
47885 BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
47886diff -urNp linux-2.6.32.46/fs/nfsd/vfs.c linux-2.6.32.46/fs/nfsd/vfs.c
47887--- linux-2.6.32.46/fs/nfsd/vfs.c 2011-05-10 22:12:01.000000000 -0400
47888+++ linux-2.6.32.46/fs/nfsd/vfs.c 2011-10-06 09:37:14.000000000 -0400
47889@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
47890 } else {
47891 oldfs = get_fs();
47892 set_fs(KERNEL_DS);
47893- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
47894+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
47895 set_fs(oldfs);
47896 }
47897
47898@@ -1060,7 +1060,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
47899
47900 /* Write the data. */
47901 oldfs = get_fs(); set_fs(KERNEL_DS);
47902- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
47903+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
47904 set_fs(oldfs);
47905 if (host_err < 0)
47906 goto out_nfserr;
47907@@ -1542,7 +1542,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
47908 */
47909
47910 oldfs = get_fs(); set_fs(KERNEL_DS);
47911- host_err = inode->i_op->readlink(dentry, buf, *lenp);
47912+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
47913 set_fs(oldfs);
47914
47915 if (host_err < 0)
47916diff -urNp linux-2.6.32.46/fs/nilfs2/ioctl.c linux-2.6.32.46/fs/nilfs2/ioctl.c
47917--- linux-2.6.32.46/fs/nilfs2/ioctl.c 2011-03-27 14:31:47.000000000 -0400
47918+++ linux-2.6.32.46/fs/nilfs2/ioctl.c 2011-05-04 17:56:28.000000000 -0400
47919@@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(st
47920 unsigned int cmd, void __user *argp)
47921 {
47922 struct nilfs_argv argv[5];
47923- const static size_t argsz[5] = {
47924+ static const size_t argsz[5] = {
47925 sizeof(struct nilfs_vdesc),
47926 sizeof(struct nilfs_period),
47927 sizeof(__u64),
47928diff -urNp linux-2.6.32.46/fs/notify/dnotify/dnotify.c linux-2.6.32.46/fs/notify/dnotify/dnotify.c
47929--- linux-2.6.32.46/fs/notify/dnotify/dnotify.c 2011-03-27 14:31:47.000000000 -0400
47930+++ linux-2.6.32.46/fs/notify/dnotify/dnotify.c 2011-04-17 15:56:46.000000000 -0400
47931@@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsn
47932 kmem_cache_free(dnotify_mark_entry_cache, dnentry);
47933 }
47934
47935-static struct fsnotify_ops dnotify_fsnotify_ops = {
47936+static const struct fsnotify_ops dnotify_fsnotify_ops = {
47937 .handle_event = dnotify_handle_event,
47938 .should_send_event = dnotify_should_send_event,
47939 .free_group_priv = NULL,
47940diff -urNp linux-2.6.32.46/fs/notify/notification.c linux-2.6.32.46/fs/notify/notification.c
47941--- linux-2.6.32.46/fs/notify/notification.c 2011-03-27 14:31:47.000000000 -0400
47942+++ linux-2.6.32.46/fs/notify/notification.c 2011-05-04 17:56:28.000000000 -0400
47943@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
47944 * get set to 0 so it will never get 'freed'
47945 */
47946 static struct fsnotify_event q_overflow_event;
47947-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47948+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47949
47950 /**
47951 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
47952@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = A
47953 */
47954 u32 fsnotify_get_cookie(void)
47955 {
47956- return atomic_inc_return(&fsnotify_sync_cookie);
47957+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
47958 }
47959 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
47960
47961diff -urNp linux-2.6.32.46/fs/ntfs/dir.c linux-2.6.32.46/fs/ntfs/dir.c
47962--- linux-2.6.32.46/fs/ntfs/dir.c 2011-03-27 14:31:47.000000000 -0400
47963+++ linux-2.6.32.46/fs/ntfs/dir.c 2011-04-17 15:56:46.000000000 -0400
47964@@ -1328,7 +1328,7 @@ find_next_index_buffer:
47965 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
47966 ~(s64)(ndir->itype.index.block_size - 1)));
47967 /* Bounds checks. */
47968- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47969+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47970 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
47971 "inode 0x%lx or driver bug.", vdir->i_ino);
47972 goto err_out;
47973diff -urNp linux-2.6.32.46/fs/ntfs/file.c linux-2.6.32.46/fs/ntfs/file.c
47974--- linux-2.6.32.46/fs/ntfs/file.c 2011-03-27 14:31:47.000000000 -0400
47975+++ linux-2.6.32.46/fs/ntfs/file.c 2011-04-17 15:56:46.000000000 -0400
47976@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
47977 #endif /* NTFS_RW */
47978 };
47979
47980-const struct file_operations ntfs_empty_file_ops = {};
47981+const struct file_operations ntfs_empty_file_ops __read_only;
47982
47983-const struct inode_operations ntfs_empty_inode_ops = {};
47984+const struct inode_operations ntfs_empty_inode_ops __read_only;
47985diff -urNp linux-2.6.32.46/fs/ocfs2/cluster/masklog.c linux-2.6.32.46/fs/ocfs2/cluster/masklog.c
47986--- linux-2.6.32.46/fs/ocfs2/cluster/masklog.c 2011-03-27 14:31:47.000000000 -0400
47987+++ linux-2.6.32.46/fs/ocfs2/cluster/masklog.c 2011-04-17 15:56:46.000000000 -0400
47988@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
47989 return mlog_mask_store(mlog_attr->mask, buf, count);
47990 }
47991
47992-static struct sysfs_ops mlog_attr_ops = {
47993+static const struct sysfs_ops mlog_attr_ops = {
47994 .show = mlog_show,
47995 .store = mlog_store,
47996 };
47997diff -urNp linux-2.6.32.46/fs/ocfs2/localalloc.c linux-2.6.32.46/fs/ocfs2/localalloc.c
47998--- linux-2.6.32.46/fs/ocfs2/localalloc.c 2011-03-27 14:31:47.000000000 -0400
47999+++ linux-2.6.32.46/fs/ocfs2/localalloc.c 2011-04-17 15:56:46.000000000 -0400
48000@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
48001 goto bail;
48002 }
48003
48004- atomic_inc(&osb->alloc_stats.moves);
48005+ atomic_inc_unchecked(&osb->alloc_stats.moves);
48006
48007 status = 0;
48008 bail:
48009diff -urNp linux-2.6.32.46/fs/ocfs2/namei.c linux-2.6.32.46/fs/ocfs2/namei.c
48010--- linux-2.6.32.46/fs/ocfs2/namei.c 2011-03-27 14:31:47.000000000 -0400
48011+++ linux-2.6.32.46/fs/ocfs2/namei.c 2011-05-16 21:46:57.000000000 -0400
48012@@ -1043,6 +1043,8 @@ static int ocfs2_rename(struct inode *ol
48013 struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
48014 struct ocfs2_dir_lookup_result target_insert = { NULL, };
48015
48016+ pax_track_stack();
48017+
48018 /* At some point it might be nice to break this function up a
48019 * bit. */
48020
48021diff -urNp linux-2.6.32.46/fs/ocfs2/ocfs2.h linux-2.6.32.46/fs/ocfs2/ocfs2.h
48022--- linux-2.6.32.46/fs/ocfs2/ocfs2.h 2011-03-27 14:31:47.000000000 -0400
48023+++ linux-2.6.32.46/fs/ocfs2/ocfs2.h 2011-04-17 15:56:46.000000000 -0400
48024@@ -217,11 +217,11 @@ enum ocfs2_vol_state
48025
48026 struct ocfs2_alloc_stats
48027 {
48028- atomic_t moves;
48029- atomic_t local_data;
48030- atomic_t bitmap_data;
48031- atomic_t bg_allocs;
48032- atomic_t bg_extends;
48033+ atomic_unchecked_t moves;
48034+ atomic_unchecked_t local_data;
48035+ atomic_unchecked_t bitmap_data;
48036+ atomic_unchecked_t bg_allocs;
48037+ atomic_unchecked_t bg_extends;
48038 };
48039
48040 enum ocfs2_local_alloc_state
48041diff -urNp linux-2.6.32.46/fs/ocfs2/suballoc.c linux-2.6.32.46/fs/ocfs2/suballoc.c
48042--- linux-2.6.32.46/fs/ocfs2/suballoc.c 2011-03-27 14:31:47.000000000 -0400
48043+++ linux-2.6.32.46/fs/ocfs2/suballoc.c 2011-04-17 15:56:46.000000000 -0400
48044@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
48045 mlog_errno(status);
48046 goto bail;
48047 }
48048- atomic_inc(&osb->alloc_stats.bg_extends);
48049+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
48050
48051 /* You should never ask for this much metadata */
48052 BUG_ON(bits_wanted >
48053@@ -1654,7 +1654,7 @@ int ocfs2_claim_metadata(struct ocfs2_su
48054 mlog_errno(status);
48055 goto bail;
48056 }
48057- atomic_inc(&osb->alloc_stats.bg_allocs);
48058+ atomic_inc_unchecked(&osb->alloc_stats.bg_allocs);
48059
48060 *blkno_start = bg_blkno + (u64) *suballoc_bit_start;
48061 ac->ac_bits_given += (*num_bits);
48062@@ -1728,7 +1728,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s
48063 mlog_errno(status);
48064 goto bail;
48065 }
48066- atomic_inc(&osb->alloc_stats.bg_allocs);
48067+ atomic_inc_unchecked(&osb->alloc_stats.bg_allocs);
48068
48069 BUG_ON(num_bits != 1);
48070
48071@@ -1830,7 +1830,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
48072 cluster_start,
48073 num_clusters);
48074 if (!status)
48075- atomic_inc(&osb->alloc_stats.local_data);
48076+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
48077 } else {
48078 if (min_clusters > (osb->bitmap_cpg - 1)) {
48079 /* The only paths asking for contiguousness
48080@@ -1858,7 +1858,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
48081 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
48082 bg_blkno,
48083 bg_bit_off);
48084- atomic_inc(&osb->alloc_stats.bitmap_data);
48085+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
48086 }
48087 }
48088 if (status < 0) {
48089diff -urNp linux-2.6.32.46/fs/ocfs2/super.c linux-2.6.32.46/fs/ocfs2/super.c
48090--- linux-2.6.32.46/fs/ocfs2/super.c 2011-03-27 14:31:47.000000000 -0400
48091+++ linux-2.6.32.46/fs/ocfs2/super.c 2011-04-17 15:56:46.000000000 -0400
48092@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
48093 "%10s => GlobalAllocs: %d LocalAllocs: %d "
48094 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
48095 "Stats",
48096- atomic_read(&osb->alloc_stats.bitmap_data),
48097- atomic_read(&osb->alloc_stats.local_data),
48098- atomic_read(&osb->alloc_stats.bg_allocs),
48099- atomic_read(&osb->alloc_stats.moves),
48100- atomic_read(&osb->alloc_stats.bg_extends));
48101+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
48102+ atomic_read_unchecked(&osb->alloc_stats.local_data),
48103+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
48104+ atomic_read_unchecked(&osb->alloc_stats.moves),
48105+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
48106
48107 out += snprintf(buf + out, len - out,
48108 "%10s => State: %u Descriptor: %llu Size: %u bits "
48109@@ -2002,11 +2002,11 @@ static int ocfs2_initialize_super(struct
48110 spin_lock_init(&osb->osb_xattr_lock);
48111 ocfs2_init_inode_steal_slot(osb);
48112
48113- atomic_set(&osb->alloc_stats.moves, 0);
48114- atomic_set(&osb->alloc_stats.local_data, 0);
48115- atomic_set(&osb->alloc_stats.bitmap_data, 0);
48116- atomic_set(&osb->alloc_stats.bg_allocs, 0);
48117- atomic_set(&osb->alloc_stats.bg_extends, 0);
48118+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
48119+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
48120+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
48121+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
48122+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
48123
48124 /* Copy the blockcheck stats from the superblock probe */
48125 osb->osb_ecc_stats = *stats;
48126diff -urNp linux-2.6.32.46/fs/open.c linux-2.6.32.46/fs/open.c
48127--- linux-2.6.32.46/fs/open.c 2011-03-27 14:31:47.000000000 -0400
48128+++ linux-2.6.32.46/fs/open.c 2011-09-13 16:03:56.000000000 -0400
48129@@ -275,6 +275,10 @@ static long do_sys_truncate(const char _
48130 error = locks_verify_truncate(inode, NULL, length);
48131 if (!error)
48132 error = security_path_truncate(&path, length, 0);
48133+
48134+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
48135+ error = -EACCES;
48136+
48137 if (!error) {
48138 vfs_dq_init(inode);
48139 error = do_truncate(path.dentry, length, 0, NULL);
48140@@ -511,6 +515,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
48141 if (__mnt_is_readonly(path.mnt))
48142 res = -EROFS;
48143
48144+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
48145+ res = -EACCES;
48146+
48147 out_path_release:
48148 path_put(&path);
48149 out:
48150@@ -537,6 +544,8 @@ SYSCALL_DEFINE1(chdir, const char __user
48151 if (error)
48152 goto dput_and_out;
48153
48154+ gr_log_chdir(path.dentry, path.mnt);
48155+
48156 set_fs_pwd(current->fs, &path);
48157
48158 dput_and_out:
48159@@ -563,6 +572,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
48160 goto out_putf;
48161
48162 error = inode_permission(inode, MAY_EXEC | MAY_ACCESS);
48163+
48164+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
48165+ error = -EPERM;
48166+
48167+ if (!error)
48168+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
48169+
48170 if (!error)
48171 set_fs_pwd(current->fs, &file->f_path);
48172 out_putf:
48173@@ -588,7 +604,13 @@ SYSCALL_DEFINE1(chroot, const char __use
48174 if (!capable(CAP_SYS_CHROOT))
48175 goto dput_and_out;
48176
48177+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
48178+ goto dput_and_out;
48179+
48180 set_fs_root(current->fs, &path);
48181+
48182+ gr_handle_chroot_chdir(&path);
48183+
48184 error = 0;
48185 dput_and_out:
48186 path_put(&path);
48187@@ -616,12 +638,27 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
48188 err = mnt_want_write_file(file);
48189 if (err)
48190 goto out_putf;
48191+
48192 mutex_lock(&inode->i_mutex);
48193+
48194+ if (!gr_acl_handle_fchmod(dentry, file->f_path.mnt, mode)) {
48195+ err = -EACCES;
48196+ goto out_unlock;
48197+ }
48198+
48199 if (mode == (mode_t) -1)
48200 mode = inode->i_mode;
48201+
48202+ if (gr_handle_chroot_chmod(dentry, file->f_path.mnt, mode)) {
48203+ err = -EPERM;
48204+ goto out_unlock;
48205+ }
48206+
48207 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
48208 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
48209 err = notify_change(dentry, &newattrs);
48210+
48211+out_unlock:
48212 mutex_unlock(&inode->i_mutex);
48213 mnt_drop_write(file->f_path.mnt);
48214 out_putf:
48215@@ -645,12 +682,27 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
48216 error = mnt_want_write(path.mnt);
48217 if (error)
48218 goto dput_and_out;
48219+
48220 mutex_lock(&inode->i_mutex);
48221+
48222+ if (!gr_acl_handle_chmod(path.dentry, path.mnt, mode)) {
48223+ error = -EACCES;
48224+ goto out_unlock;
48225+ }
48226+
48227 if (mode == (mode_t) -1)
48228 mode = inode->i_mode;
48229+
48230+ if (gr_handle_chroot_chmod(path.dentry, path.mnt, mode)) {
48231+ error = -EACCES;
48232+ goto out_unlock;
48233+ }
48234+
48235 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
48236 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
48237 error = notify_change(path.dentry, &newattrs);
48238+
48239+out_unlock:
48240 mutex_unlock(&inode->i_mutex);
48241 mnt_drop_write(path.mnt);
48242 dput_and_out:
48243@@ -664,12 +716,15 @@ SYSCALL_DEFINE2(chmod, const char __user
48244 return sys_fchmodat(AT_FDCWD, filename, mode);
48245 }
48246
48247-static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
48248+static int chown_common(struct dentry * dentry, uid_t user, gid_t group, struct vfsmount *mnt)
48249 {
48250 struct inode *inode = dentry->d_inode;
48251 int error;
48252 struct iattr newattrs;
48253
48254+ if (!gr_acl_handle_chown(dentry, mnt))
48255+ return -EACCES;
48256+
48257 newattrs.ia_valid = ATTR_CTIME;
48258 if (user != (uid_t) -1) {
48259 newattrs.ia_valid |= ATTR_UID;
48260@@ -700,7 +755,7 @@ SYSCALL_DEFINE3(chown, const char __user
48261 error = mnt_want_write(path.mnt);
48262 if (error)
48263 goto out_release;
48264- error = chown_common(path.dentry, user, group);
48265+ error = chown_common(path.dentry, user, group, path.mnt);
48266 mnt_drop_write(path.mnt);
48267 out_release:
48268 path_put(&path);
48269@@ -725,7 +780,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
48270 error = mnt_want_write(path.mnt);
48271 if (error)
48272 goto out_release;
48273- error = chown_common(path.dentry, user, group);
48274+ error = chown_common(path.dentry, user, group, path.mnt);
48275 mnt_drop_write(path.mnt);
48276 out_release:
48277 path_put(&path);
48278@@ -744,7 +799,7 @@ SYSCALL_DEFINE3(lchown, const char __use
48279 error = mnt_want_write(path.mnt);
48280 if (error)
48281 goto out_release;
48282- error = chown_common(path.dentry, user, group);
48283+ error = chown_common(path.dentry, user, group, path.mnt);
48284 mnt_drop_write(path.mnt);
48285 out_release:
48286 path_put(&path);
48287@@ -767,7 +822,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd
48288 goto out_fput;
48289 dentry = file->f_path.dentry;
48290 audit_inode(NULL, dentry);
48291- error = chown_common(dentry, user, group);
48292+ error = chown_common(dentry, user, group, file->f_path.mnt);
48293 mnt_drop_write(file->f_path.mnt);
48294 out_fput:
48295 fput(file);
48296@@ -1036,7 +1091,10 @@ long do_sys_open(int dfd, const char __u
48297 if (!IS_ERR(tmp)) {
48298 fd = get_unused_fd_flags(flags);
48299 if (fd >= 0) {
48300- struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
48301+ struct file *f;
48302+ /* don't allow to be set by userland */
48303+ flags &= ~FMODE_GREXEC;
48304+ f = do_filp_open(dfd, tmp, flags, mode, 0);
48305 if (IS_ERR(f)) {
48306 put_unused_fd(fd);
48307 fd = PTR_ERR(f);
48308diff -urNp linux-2.6.32.46/fs/partitions/ldm.c linux-2.6.32.46/fs/partitions/ldm.c
48309--- linux-2.6.32.46/fs/partitions/ldm.c 2011-06-25 12:55:34.000000000 -0400
48310+++ linux-2.6.32.46/fs/partitions/ldm.c 2011-06-25 12:56:37.000000000 -0400
48311@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
48312 ldm_error ("A VBLK claims to have %d parts.", num);
48313 return false;
48314 }
48315+
48316 if (rec >= num) {
48317 ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
48318 return false;
48319@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data
48320 goto found;
48321 }
48322
48323- f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
48324+ f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
48325 if (!f) {
48326 ldm_crit ("Out of memory.");
48327 return false;
48328diff -urNp linux-2.6.32.46/fs/partitions/mac.c linux-2.6.32.46/fs/partitions/mac.c
48329--- linux-2.6.32.46/fs/partitions/mac.c 2011-03-27 14:31:47.000000000 -0400
48330+++ linux-2.6.32.46/fs/partitions/mac.c 2011-04-17 15:56:46.000000000 -0400
48331@@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio
48332 return 0; /* not a MacOS disk */
48333 }
48334 blocks_in_map = be32_to_cpu(part->map_count);
48335+ printk(" [mac]");
48336 if (blocks_in_map < 0 || blocks_in_map >= DISK_MAX_PARTS) {
48337 put_dev_sector(sect);
48338 return 0;
48339 }
48340- printk(" [mac]");
48341 for (slot = 1; slot <= blocks_in_map; ++slot) {
48342 int pos = slot * secsize;
48343 put_dev_sector(sect);
48344diff -urNp linux-2.6.32.46/fs/pipe.c linux-2.6.32.46/fs/pipe.c
48345--- linux-2.6.32.46/fs/pipe.c 2011-03-27 14:31:47.000000000 -0400
48346+++ linux-2.6.32.46/fs/pipe.c 2011-04-23 13:37:17.000000000 -0400
48347@@ -401,9 +401,9 @@ redo:
48348 }
48349 if (bufs) /* More to do? */
48350 continue;
48351- if (!pipe->writers)
48352+ if (!atomic_read(&pipe->writers))
48353 break;
48354- if (!pipe->waiting_writers) {
48355+ if (!atomic_read(&pipe->waiting_writers)) {
48356 /* syscall merging: Usually we must not sleep
48357 * if O_NONBLOCK is set, or if we got some data.
48358 * But if a writer sleeps in kernel space, then
48359@@ -462,7 +462,7 @@ pipe_write(struct kiocb *iocb, const str
48360 mutex_lock(&inode->i_mutex);
48361 pipe = inode->i_pipe;
48362
48363- if (!pipe->readers) {
48364+ if (!atomic_read(&pipe->readers)) {
48365 send_sig(SIGPIPE, current, 0);
48366 ret = -EPIPE;
48367 goto out;
48368@@ -511,7 +511,7 @@ redo1:
48369 for (;;) {
48370 int bufs;
48371
48372- if (!pipe->readers) {
48373+ if (!atomic_read(&pipe->readers)) {
48374 send_sig(SIGPIPE, current, 0);
48375 if (!ret)
48376 ret = -EPIPE;
48377@@ -597,9 +597,9 @@ redo2:
48378 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
48379 do_wakeup = 0;
48380 }
48381- pipe->waiting_writers++;
48382+ atomic_inc(&pipe->waiting_writers);
48383 pipe_wait(pipe);
48384- pipe->waiting_writers--;
48385+ atomic_dec(&pipe->waiting_writers);
48386 }
48387 out:
48388 mutex_unlock(&inode->i_mutex);
48389@@ -666,7 +666,7 @@ pipe_poll(struct file *filp, poll_table
48390 mask = 0;
48391 if (filp->f_mode & FMODE_READ) {
48392 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
48393- if (!pipe->writers && filp->f_version != pipe->w_counter)
48394+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
48395 mask |= POLLHUP;
48396 }
48397
48398@@ -676,7 +676,7 @@ pipe_poll(struct file *filp, poll_table
48399 * Most Unices do not set POLLERR for FIFOs but on Linux they
48400 * behave exactly like pipes for poll().
48401 */
48402- if (!pipe->readers)
48403+ if (!atomic_read(&pipe->readers))
48404 mask |= POLLERR;
48405 }
48406
48407@@ -690,10 +690,10 @@ pipe_release(struct inode *inode, int de
48408
48409 mutex_lock(&inode->i_mutex);
48410 pipe = inode->i_pipe;
48411- pipe->readers -= decr;
48412- pipe->writers -= decw;
48413+ atomic_sub(decr, &pipe->readers);
48414+ atomic_sub(decw, &pipe->writers);
48415
48416- if (!pipe->readers && !pipe->writers) {
48417+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
48418 free_pipe_info(inode);
48419 } else {
48420 wake_up_interruptible_sync(&pipe->wait);
48421@@ -783,7 +783,7 @@ pipe_read_open(struct inode *inode, stru
48422
48423 if (inode->i_pipe) {
48424 ret = 0;
48425- inode->i_pipe->readers++;
48426+ atomic_inc(&inode->i_pipe->readers);
48427 }
48428
48429 mutex_unlock(&inode->i_mutex);
48430@@ -800,7 +800,7 @@ pipe_write_open(struct inode *inode, str
48431
48432 if (inode->i_pipe) {
48433 ret = 0;
48434- inode->i_pipe->writers++;
48435+ atomic_inc(&inode->i_pipe->writers);
48436 }
48437
48438 mutex_unlock(&inode->i_mutex);
48439@@ -818,9 +818,9 @@ pipe_rdwr_open(struct inode *inode, stru
48440 if (inode->i_pipe) {
48441 ret = 0;
48442 if (filp->f_mode & FMODE_READ)
48443- inode->i_pipe->readers++;
48444+ atomic_inc(&inode->i_pipe->readers);
48445 if (filp->f_mode & FMODE_WRITE)
48446- inode->i_pipe->writers++;
48447+ atomic_inc(&inode->i_pipe->writers);
48448 }
48449
48450 mutex_unlock(&inode->i_mutex);
48451@@ -905,7 +905,7 @@ void free_pipe_info(struct inode *inode)
48452 inode->i_pipe = NULL;
48453 }
48454
48455-static struct vfsmount *pipe_mnt __read_mostly;
48456+struct vfsmount *pipe_mnt __read_mostly;
48457 static int pipefs_delete_dentry(struct dentry *dentry)
48458 {
48459 /*
48460@@ -945,7 +945,8 @@ static struct inode * get_pipe_inode(voi
48461 goto fail_iput;
48462 inode->i_pipe = pipe;
48463
48464- pipe->readers = pipe->writers = 1;
48465+ atomic_set(&pipe->readers, 1);
48466+ atomic_set(&pipe->writers, 1);
48467 inode->i_fop = &rdwr_pipefifo_fops;
48468
48469 /*
48470diff -urNp linux-2.6.32.46/fs/proc/array.c linux-2.6.32.46/fs/proc/array.c
48471--- linux-2.6.32.46/fs/proc/array.c 2011-03-27 14:31:47.000000000 -0400
48472+++ linux-2.6.32.46/fs/proc/array.c 2011-05-16 21:46:57.000000000 -0400
48473@@ -60,6 +60,7 @@
48474 #include <linux/tty.h>
48475 #include <linux/string.h>
48476 #include <linux/mman.h>
48477+#include <linux/grsecurity.h>
48478 #include <linux/proc_fs.h>
48479 #include <linux/ioport.h>
48480 #include <linux/uaccess.h>
48481@@ -321,6 +322,21 @@ static inline void task_context_switch_c
48482 p->nivcsw);
48483 }
48484
48485+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
48486+static inline void task_pax(struct seq_file *m, struct task_struct *p)
48487+{
48488+ if (p->mm)
48489+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
48490+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
48491+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
48492+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
48493+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
48494+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
48495+ else
48496+ seq_printf(m, "PaX:\t-----\n");
48497+}
48498+#endif
48499+
48500 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48501 struct pid *pid, struct task_struct *task)
48502 {
48503@@ -337,9 +353,24 @@ int proc_pid_status(struct seq_file *m,
48504 task_cap(m, task);
48505 cpuset_task_status_allowed(m, task);
48506 task_context_switch_counts(m, task);
48507+
48508+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
48509+ task_pax(m, task);
48510+#endif
48511+
48512+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
48513+ task_grsec_rbac(m, task);
48514+#endif
48515+
48516 return 0;
48517 }
48518
48519+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48520+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48521+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48522+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48523+#endif
48524+
48525 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48526 struct pid *pid, struct task_struct *task, int whole)
48527 {
48528@@ -358,9 +389,11 @@ static int do_task_stat(struct seq_file
48529 cputime_t cutime, cstime, utime, stime;
48530 cputime_t cgtime, gtime;
48531 unsigned long rsslim = 0;
48532- char tcomm[sizeof(task->comm)];
48533+ char tcomm[sizeof(task->comm)] = { 0 };
48534 unsigned long flags;
48535
48536+ pax_track_stack();
48537+
48538 state = *get_task_state(task);
48539 vsize = eip = esp = 0;
48540 permitted = ptrace_may_access(task, PTRACE_MODE_READ);
48541@@ -433,6 +466,19 @@ static int do_task_stat(struct seq_file
48542 gtime = task_gtime(task);
48543 }
48544
48545+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48546+ if (PAX_RAND_FLAGS(mm)) {
48547+ eip = 0;
48548+ esp = 0;
48549+ wchan = 0;
48550+ }
48551+#endif
48552+#ifdef CONFIG_GRKERNSEC_HIDESYM
48553+ wchan = 0;
48554+ eip =0;
48555+ esp =0;
48556+#endif
48557+
48558 /* scale priority and nice values from timeslices to -20..20 */
48559 /* to make it look like a "normal" Unix priority/nice value */
48560 priority = task_prio(task);
48561@@ -473,9 +519,15 @@ static int do_task_stat(struct seq_file
48562 vsize,
48563 mm ? get_mm_rss(mm) : 0,
48564 rsslim,
48565+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48566+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
48567+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
48568+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
48569+#else
48570 mm ? (permitted ? mm->start_code : 1) : 0,
48571 mm ? (permitted ? mm->end_code : 1) : 0,
48572 (permitted && mm) ? mm->start_stack : 0,
48573+#endif
48574 esp,
48575 eip,
48576 /* The signal information here is obsolete.
48577@@ -528,3 +580,18 @@ int proc_pid_statm(struct seq_file *m, s
48578
48579 return 0;
48580 }
48581+
48582+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48583+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
48584+{
48585+ u32 curr_ip = 0;
48586+ unsigned long flags;
48587+
48588+ if (lock_task_sighand(task, &flags)) {
48589+ curr_ip = task->signal->curr_ip;
48590+ unlock_task_sighand(task, &flags);
48591+ }
48592+
48593+ return sprintf(buffer, "%pI4\n", &curr_ip);
48594+}
48595+#endif
48596diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c
48597--- linux-2.6.32.46/fs/proc/base.c 2011-08-09 18:35:30.000000000 -0400
48598+++ linux-2.6.32.46/fs/proc/base.c 2011-09-13 14:51:06.000000000 -0400
48599@@ -102,6 +102,22 @@ struct pid_entry {
48600 union proc_op op;
48601 };
48602
48603+struct getdents_callback {
48604+ struct linux_dirent __user * current_dir;
48605+ struct linux_dirent __user * previous;
48606+ struct file * file;
48607+ int count;
48608+ int error;
48609+};
48610+
48611+static int gr_fake_filldir(void * __buf, const char *name, int namlen,
48612+ loff_t offset, u64 ino, unsigned int d_type)
48613+{
48614+ struct getdents_callback * buf = (struct getdents_callback *) __buf;
48615+ buf->error = -EINVAL;
48616+ return 0;
48617+}
48618+
48619 #define NOD(NAME, MODE, IOP, FOP, OP) { \
48620 .name = (NAME), \
48621 .len = sizeof(NAME) - 1, \
48622@@ -213,6 +229,9 @@ static int check_mem_permission(struct t
48623 if (task == current)
48624 return 0;
48625
48626+ if (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))
48627+ return -EPERM;
48628+
48629 /*
48630 * If current is actively ptrace'ing, and would also be
48631 * permitted to freshly attach with ptrace now, permit it.
48632@@ -260,6 +279,9 @@ static int proc_pid_cmdline(struct task_
48633 if (!mm->arg_end)
48634 goto out_mm; /* Shh! No looking before we're done */
48635
48636+ if (gr_acl_handle_procpidmem(task))
48637+ goto out_mm;
48638+
48639 len = mm->arg_end - mm->arg_start;
48640
48641 if (len > PAGE_SIZE)
48642@@ -287,12 +309,28 @@ out:
48643 return res;
48644 }
48645
48646+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48647+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48648+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48649+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48650+#endif
48651+
48652 static int proc_pid_auxv(struct task_struct *task, char *buffer)
48653 {
48654 int res = 0;
48655 struct mm_struct *mm = get_task_mm(task);
48656 if (mm) {
48657 unsigned int nwords = 0;
48658+
48659+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48660+ /* allow if we're currently ptracing this task */
48661+ if (PAX_RAND_FLAGS(mm) &&
48662+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
48663+ mmput(mm);
48664+ return 0;
48665+ }
48666+#endif
48667+
48668 do {
48669 nwords += 2;
48670 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
48671@@ -306,7 +344,7 @@ static int proc_pid_auxv(struct task_str
48672 }
48673
48674
48675-#ifdef CONFIG_KALLSYMS
48676+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48677 /*
48678 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
48679 * Returns the resolved symbol. If that fails, simply return the address.
48680@@ -328,7 +366,7 @@ static int proc_pid_wchan(struct task_st
48681 }
48682 #endif /* CONFIG_KALLSYMS */
48683
48684-#ifdef CONFIG_STACKTRACE
48685+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48686
48687 #define MAX_STACK_TRACE_DEPTH 64
48688
48689@@ -522,7 +560,7 @@ static int proc_pid_limits(struct task_s
48690 return count;
48691 }
48692
48693-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48694+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48695 static int proc_pid_syscall(struct task_struct *task, char *buffer)
48696 {
48697 long nr;
48698@@ -547,7 +585,7 @@ static int proc_pid_syscall(struct task_
48699 /************************************************************************/
48700
48701 /* permission checks */
48702-static int proc_fd_access_allowed(struct inode *inode)
48703+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
48704 {
48705 struct task_struct *task;
48706 int allowed = 0;
48707@@ -557,7 +595,10 @@ static int proc_fd_access_allowed(struct
48708 */
48709 task = get_proc_task(inode);
48710 if (task) {
48711- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48712+ if (log)
48713+ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
48714+ else
48715+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48716 put_task_struct(task);
48717 }
48718 return allowed;
48719@@ -936,6 +977,9 @@ static ssize_t environ_read(struct file
48720 if (!task)
48721 goto out_no_task;
48722
48723+ if (gr_acl_handle_procpidmem(task))
48724+ goto out;
48725+
48726 if (!ptrace_may_access(task, PTRACE_MODE_READ))
48727 goto out;
48728
48729@@ -1350,7 +1394,7 @@ static void *proc_pid_follow_link(struct
48730 path_put(&nd->path);
48731
48732 /* Are we allowed to snoop on the tasks file descriptors? */
48733- if (!proc_fd_access_allowed(inode))
48734+ if (!proc_fd_access_allowed(inode,0))
48735 goto out;
48736
48737 error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
48738@@ -1390,8 +1434,18 @@ static int proc_pid_readlink(struct dent
48739 struct path path;
48740
48741 /* Are we allowed to snoop on the tasks file descriptors? */
48742- if (!proc_fd_access_allowed(inode))
48743- goto out;
48744+ /* logging this is needed for learning on chromium to work properly,
48745+ but we don't want to flood the logs from 'ps' which does a readlink
48746+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
48747+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
48748+ */
48749+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
48750+ if (!proc_fd_access_allowed(inode,0))
48751+ goto out;
48752+ } else {
48753+ if (!proc_fd_access_allowed(inode,1))
48754+ goto out;
48755+ }
48756
48757 error = PROC_I(inode)->op.proc_get_link(inode, &path);
48758 if (error)
48759@@ -1456,7 +1510,11 @@ static struct inode *proc_pid_make_inode
48760 rcu_read_lock();
48761 cred = __task_cred(task);
48762 inode->i_uid = cred->euid;
48763+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48764+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48765+#else
48766 inode->i_gid = cred->egid;
48767+#endif
48768 rcu_read_unlock();
48769 }
48770 security_task_to_inode(task, inode);
48771@@ -1474,6 +1532,9 @@ static int pid_getattr(struct vfsmount *
48772 struct inode *inode = dentry->d_inode;
48773 struct task_struct *task;
48774 const struct cred *cred;
48775+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48776+ const struct cred *tmpcred = current_cred();
48777+#endif
48778
48779 generic_fillattr(inode, stat);
48780
48781@@ -1481,13 +1542,41 @@ static int pid_getattr(struct vfsmount *
48782 stat->uid = 0;
48783 stat->gid = 0;
48784 task = pid_task(proc_pid(inode), PIDTYPE_PID);
48785+
48786+ if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
48787+ rcu_read_unlock();
48788+ return -ENOENT;
48789+ }
48790+
48791 if (task) {
48792+ cred = __task_cred(task);
48793+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48794+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
48795+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48796+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48797+#endif
48798+ ) {
48799+#endif
48800 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48801+#ifdef CONFIG_GRKERNSEC_PROC_USER
48802+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48803+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48804+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48805+#endif
48806 task_dumpable(task)) {
48807- cred = __task_cred(task);
48808 stat->uid = cred->euid;
48809+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48810+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
48811+#else
48812 stat->gid = cred->egid;
48813+#endif
48814 }
48815+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48816+ } else {
48817+ rcu_read_unlock();
48818+ return -ENOENT;
48819+ }
48820+#endif
48821 }
48822 rcu_read_unlock();
48823 return 0;
48824@@ -1518,11 +1607,20 @@ static int pid_revalidate(struct dentry
48825
48826 if (task) {
48827 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48828+#ifdef CONFIG_GRKERNSEC_PROC_USER
48829+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48830+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48831+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48832+#endif
48833 task_dumpable(task)) {
48834 rcu_read_lock();
48835 cred = __task_cred(task);
48836 inode->i_uid = cred->euid;
48837+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48838+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48839+#else
48840 inode->i_gid = cred->egid;
48841+#endif
48842 rcu_read_unlock();
48843 } else {
48844 inode->i_uid = 0;
48845@@ -1643,7 +1741,8 @@ static int proc_fd_info(struct inode *in
48846 int fd = proc_fd(inode);
48847
48848 if (task) {
48849- files = get_files_struct(task);
48850+ if (!gr_acl_handle_procpidmem(task))
48851+ files = get_files_struct(task);
48852 put_task_struct(task);
48853 }
48854 if (files) {
48855@@ -1895,12 +1994,22 @@ static const struct file_operations proc
48856 static int proc_fd_permission(struct inode *inode, int mask)
48857 {
48858 int rv;
48859+ struct task_struct *task;
48860
48861 rv = generic_permission(inode, mask, NULL);
48862- if (rv == 0)
48863- return 0;
48864+
48865 if (task_pid(current) == proc_pid(inode))
48866 rv = 0;
48867+
48868+ task = get_proc_task(inode);
48869+ if (task == NULL)
48870+ return rv;
48871+
48872+ if (gr_acl_handle_procpidmem(task))
48873+ rv = -EACCES;
48874+
48875+ put_task_struct(task);
48876+
48877 return rv;
48878 }
48879
48880@@ -2009,6 +2118,9 @@ static struct dentry *proc_pident_lookup
48881 if (!task)
48882 goto out_no_task;
48883
48884+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48885+ goto out;
48886+
48887 /*
48888 * Yes, it does not scale. And it should not. Don't add
48889 * new entries into /proc/<tgid>/ without very good reasons.
48890@@ -2053,6 +2165,9 @@ static int proc_pident_readdir(struct fi
48891 if (!task)
48892 goto out_no_task;
48893
48894+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48895+ goto out;
48896+
48897 ret = 0;
48898 i = filp->f_pos;
48899 switch (i) {
48900@@ -2320,7 +2435,7 @@ static void *proc_self_follow_link(struc
48901 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
48902 void *cookie)
48903 {
48904- char *s = nd_get_link(nd);
48905+ const char *s = nd_get_link(nd);
48906 if (!IS_ERR(s))
48907 __putname(s);
48908 }
48909@@ -2522,7 +2637,7 @@ static const struct pid_entry tgid_base_
48910 #ifdef CONFIG_SCHED_DEBUG
48911 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
48912 #endif
48913-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48914+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48915 INF("syscall", S_IRUSR, proc_pid_syscall),
48916 #endif
48917 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48918@@ -2547,10 +2662,10 @@ static const struct pid_entry tgid_base_
48919 #ifdef CONFIG_SECURITY
48920 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48921 #endif
48922-#ifdef CONFIG_KALLSYMS
48923+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48924 INF("wchan", S_IRUGO, proc_pid_wchan),
48925 #endif
48926-#ifdef CONFIG_STACKTRACE
48927+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48928 ONE("stack", S_IRUSR, proc_pid_stack),
48929 #endif
48930 #ifdef CONFIG_SCHEDSTATS
48931@@ -2580,6 +2695,9 @@ static const struct pid_entry tgid_base_
48932 #ifdef CONFIG_TASK_IO_ACCOUNTING
48933 INF("io", S_IRUSR, proc_tgid_io_accounting),
48934 #endif
48935+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48936+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
48937+#endif
48938 };
48939
48940 static int proc_tgid_base_readdir(struct file * filp,
48941@@ -2704,7 +2822,14 @@ static struct dentry *proc_pid_instantia
48942 if (!inode)
48943 goto out;
48944
48945+#ifdef CONFIG_GRKERNSEC_PROC_USER
48946+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
48947+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48948+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48949+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
48950+#else
48951 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
48952+#endif
48953 inode->i_op = &proc_tgid_base_inode_operations;
48954 inode->i_fop = &proc_tgid_base_operations;
48955 inode->i_flags|=S_IMMUTABLE;
48956@@ -2746,7 +2871,11 @@ struct dentry *proc_pid_lookup(struct in
48957 if (!task)
48958 goto out;
48959
48960+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48961+ goto out_put_task;
48962+
48963 result = proc_pid_instantiate(dir, dentry, task, NULL);
48964+out_put_task:
48965 put_task_struct(task);
48966 out:
48967 return result;
48968@@ -2811,6 +2940,11 @@ int proc_pid_readdir(struct file * filp,
48969 {
48970 unsigned int nr;
48971 struct task_struct *reaper;
48972+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48973+ const struct cred *tmpcred = current_cred();
48974+ const struct cred *itercred;
48975+#endif
48976+ filldir_t __filldir = filldir;
48977 struct tgid_iter iter;
48978 struct pid_namespace *ns;
48979
48980@@ -2834,8 +2968,27 @@ int proc_pid_readdir(struct file * filp,
48981 for (iter = next_tgid(ns, iter);
48982 iter.task;
48983 iter.tgid += 1, iter = next_tgid(ns, iter)) {
48984+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48985+ rcu_read_lock();
48986+ itercred = __task_cred(iter.task);
48987+#endif
48988+ if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
48989+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48990+ || (tmpcred->uid && (itercred->uid != tmpcred->uid)
48991+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48992+ && !in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48993+#endif
48994+ )
48995+#endif
48996+ )
48997+ __filldir = &gr_fake_filldir;
48998+ else
48999+ __filldir = filldir;
49000+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49001+ rcu_read_unlock();
49002+#endif
49003 filp->f_pos = iter.tgid + TGID_OFFSET;
49004- if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
49005+ if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
49006 put_task_struct(iter.task);
49007 goto out;
49008 }
49009@@ -2861,7 +3014,7 @@ static const struct pid_entry tid_base_s
49010 #ifdef CONFIG_SCHED_DEBUG
49011 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
49012 #endif
49013-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
49014+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
49015 INF("syscall", S_IRUSR, proc_pid_syscall),
49016 #endif
49017 INF("cmdline", S_IRUGO, proc_pid_cmdline),
49018@@ -2885,10 +3038,10 @@ static const struct pid_entry tid_base_s
49019 #ifdef CONFIG_SECURITY
49020 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
49021 #endif
49022-#ifdef CONFIG_KALLSYMS
49023+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
49024 INF("wchan", S_IRUGO, proc_pid_wchan),
49025 #endif
49026-#ifdef CONFIG_STACKTRACE
49027+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
49028 ONE("stack", S_IRUSR, proc_pid_stack),
49029 #endif
49030 #ifdef CONFIG_SCHEDSTATS
49031diff -urNp linux-2.6.32.46/fs/proc/cmdline.c linux-2.6.32.46/fs/proc/cmdline.c
49032--- linux-2.6.32.46/fs/proc/cmdline.c 2011-03-27 14:31:47.000000000 -0400
49033+++ linux-2.6.32.46/fs/proc/cmdline.c 2011-04-17 15:56:46.000000000 -0400
49034@@ -23,7 +23,11 @@ static const struct file_operations cmdl
49035
49036 static int __init proc_cmdline_init(void)
49037 {
49038+#ifdef CONFIG_GRKERNSEC_PROC_ADD
49039+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
49040+#else
49041 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
49042+#endif
49043 return 0;
49044 }
49045 module_init(proc_cmdline_init);
49046diff -urNp linux-2.6.32.46/fs/proc/devices.c linux-2.6.32.46/fs/proc/devices.c
49047--- linux-2.6.32.46/fs/proc/devices.c 2011-03-27 14:31:47.000000000 -0400
49048+++ linux-2.6.32.46/fs/proc/devices.c 2011-04-17 15:56:46.000000000 -0400
49049@@ -64,7 +64,11 @@ static const struct file_operations proc
49050
49051 static int __init proc_devices_init(void)
49052 {
49053+#ifdef CONFIG_GRKERNSEC_PROC_ADD
49054+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
49055+#else
49056 proc_create("devices", 0, NULL, &proc_devinfo_operations);
49057+#endif
49058 return 0;
49059 }
49060 module_init(proc_devices_init);
49061diff -urNp linux-2.6.32.46/fs/proc/inode.c linux-2.6.32.46/fs/proc/inode.c
49062--- linux-2.6.32.46/fs/proc/inode.c 2011-03-27 14:31:47.000000000 -0400
49063+++ linux-2.6.32.46/fs/proc/inode.c 2011-04-17 15:56:46.000000000 -0400
49064@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
49065 if (de->mode) {
49066 inode->i_mode = de->mode;
49067 inode->i_uid = de->uid;
49068+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
49069+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
49070+#else
49071 inode->i_gid = de->gid;
49072+#endif
49073 }
49074 if (de->size)
49075 inode->i_size = de->size;
49076diff -urNp linux-2.6.32.46/fs/proc/internal.h linux-2.6.32.46/fs/proc/internal.h
49077--- linux-2.6.32.46/fs/proc/internal.h 2011-03-27 14:31:47.000000000 -0400
49078+++ linux-2.6.32.46/fs/proc/internal.h 2011-04-17 15:56:46.000000000 -0400
49079@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
49080 struct pid *pid, struct task_struct *task);
49081 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
49082 struct pid *pid, struct task_struct *task);
49083+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
49084+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
49085+#endif
49086 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
49087
49088 extern const struct file_operations proc_maps_operations;
49089diff -urNp linux-2.6.32.46/fs/proc/Kconfig linux-2.6.32.46/fs/proc/Kconfig
49090--- linux-2.6.32.46/fs/proc/Kconfig 2011-03-27 14:31:47.000000000 -0400
49091+++ linux-2.6.32.46/fs/proc/Kconfig 2011-04-17 15:56:46.000000000 -0400
49092@@ -30,12 +30,12 @@ config PROC_FS
49093
49094 config PROC_KCORE
49095 bool "/proc/kcore support" if !ARM
49096- depends on PROC_FS && MMU
49097+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
49098
49099 config PROC_VMCORE
49100 bool "/proc/vmcore support (EXPERIMENTAL)"
49101- depends on PROC_FS && CRASH_DUMP
49102- default y
49103+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
49104+ default n
49105 help
49106 Exports the dump image of crashed kernel in ELF format.
49107
49108@@ -59,8 +59,8 @@ config PROC_SYSCTL
49109 limited in memory.
49110
49111 config PROC_PAGE_MONITOR
49112- default y
49113- depends on PROC_FS && MMU
49114+ default n
49115+ depends on PROC_FS && MMU && !GRKERNSEC
49116 bool "Enable /proc page monitoring" if EMBEDDED
49117 help
49118 Various /proc files exist to monitor process memory utilization:
49119diff -urNp linux-2.6.32.46/fs/proc/kcore.c linux-2.6.32.46/fs/proc/kcore.c
49120--- linux-2.6.32.46/fs/proc/kcore.c 2011-03-27 14:31:47.000000000 -0400
49121+++ linux-2.6.32.46/fs/proc/kcore.c 2011-05-16 21:46:57.000000000 -0400
49122@@ -320,6 +320,8 @@ static void elf_kcore_store_hdr(char *bu
49123 off_t offset = 0;
49124 struct kcore_list *m;
49125
49126+ pax_track_stack();
49127+
49128 /* setup ELF header */
49129 elf = (struct elfhdr *) bufp;
49130 bufp += sizeof(struct elfhdr);
49131@@ -477,9 +479,10 @@ read_kcore(struct file *file, char __use
49132 * the addresses in the elf_phdr on our list.
49133 */
49134 start = kc_offset_to_vaddr(*fpos - elf_buflen);
49135- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
49136+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
49137+ if (tsz > buflen)
49138 tsz = buflen;
49139-
49140+
49141 while (buflen) {
49142 struct kcore_list *m;
49143
49144@@ -508,20 +511,23 @@ read_kcore(struct file *file, char __use
49145 kfree(elf_buf);
49146 } else {
49147 if (kern_addr_valid(start)) {
49148- unsigned long n;
49149+ char *elf_buf;
49150+ mm_segment_t oldfs;
49151
49152- n = copy_to_user(buffer, (char *)start, tsz);
49153- /*
49154- * We cannot distingush between fault on source
49155- * and fault on destination. When this happens
49156- * we clear too and hope it will trigger the
49157- * EFAULT again.
49158- */
49159- if (n) {
49160- if (clear_user(buffer + tsz - n,
49161- n))
49162+ elf_buf = kmalloc(tsz, GFP_KERNEL);
49163+ if (!elf_buf)
49164+ return -ENOMEM;
49165+ oldfs = get_fs();
49166+ set_fs(KERNEL_DS);
49167+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
49168+ set_fs(oldfs);
49169+ if (copy_to_user(buffer, elf_buf, tsz)) {
49170+ kfree(elf_buf);
49171 return -EFAULT;
49172+ }
49173 }
49174+ set_fs(oldfs);
49175+ kfree(elf_buf);
49176 } else {
49177 if (clear_user(buffer, tsz))
49178 return -EFAULT;
49179@@ -541,6 +547,9 @@ read_kcore(struct file *file, char __use
49180
49181 static int open_kcore(struct inode *inode, struct file *filp)
49182 {
49183+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
49184+ return -EPERM;
49185+#endif
49186 if (!capable(CAP_SYS_RAWIO))
49187 return -EPERM;
49188 if (kcore_need_update)
49189diff -urNp linux-2.6.32.46/fs/proc/meminfo.c linux-2.6.32.46/fs/proc/meminfo.c
49190--- linux-2.6.32.46/fs/proc/meminfo.c 2011-03-27 14:31:47.000000000 -0400
49191+++ linux-2.6.32.46/fs/proc/meminfo.c 2011-05-16 21:46:57.000000000 -0400
49192@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
49193 unsigned long pages[NR_LRU_LISTS];
49194 int lru;
49195
49196+ pax_track_stack();
49197+
49198 /*
49199 * display in kilobytes.
49200 */
49201@@ -149,7 +151,7 @@ static int meminfo_proc_show(struct seq_
49202 vmi.used >> 10,
49203 vmi.largest_chunk >> 10
49204 #ifdef CONFIG_MEMORY_FAILURE
49205- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
49206+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
49207 #endif
49208 );
49209
49210diff -urNp linux-2.6.32.46/fs/proc/nommu.c linux-2.6.32.46/fs/proc/nommu.c
49211--- linux-2.6.32.46/fs/proc/nommu.c 2011-03-27 14:31:47.000000000 -0400
49212+++ linux-2.6.32.46/fs/proc/nommu.c 2011-04-17 15:56:46.000000000 -0400
49213@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
49214 if (len < 1)
49215 len = 1;
49216 seq_printf(m, "%*c", len, ' ');
49217- seq_path(m, &file->f_path, "");
49218+ seq_path(m, &file->f_path, "\n\\");
49219 }
49220
49221 seq_putc(m, '\n');
49222diff -urNp linux-2.6.32.46/fs/proc/proc_net.c linux-2.6.32.46/fs/proc/proc_net.c
49223--- linux-2.6.32.46/fs/proc/proc_net.c 2011-03-27 14:31:47.000000000 -0400
49224+++ linux-2.6.32.46/fs/proc/proc_net.c 2011-04-17 15:56:46.000000000 -0400
49225@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
49226 struct task_struct *task;
49227 struct nsproxy *ns;
49228 struct net *net = NULL;
49229+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49230+ const struct cred *cred = current_cred();
49231+#endif
49232+
49233+#ifdef CONFIG_GRKERNSEC_PROC_USER
49234+ if (cred->fsuid)
49235+ return net;
49236+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49237+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
49238+ return net;
49239+#endif
49240
49241 rcu_read_lock();
49242 task = pid_task(proc_pid(dir), PIDTYPE_PID);
49243diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sysctl.c
49244--- linux-2.6.32.46/fs/proc/proc_sysctl.c 2011-03-27 14:31:47.000000000 -0400
49245+++ linux-2.6.32.46/fs/proc/proc_sysctl.c 2011-04-17 15:56:46.000000000 -0400
49246@@ -7,6 +7,8 @@
49247 #include <linux/security.h>
49248 #include "internal.h"
49249
49250+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
49251+
49252 static const struct dentry_operations proc_sys_dentry_operations;
49253 static const struct file_operations proc_sys_file_operations;
49254 static const struct inode_operations proc_sys_inode_operations;
49255@@ -109,6 +111,9 @@ static struct dentry *proc_sys_lookup(st
49256 if (!p)
49257 goto out;
49258
49259+ if (gr_handle_sysctl(p, MAY_EXEC))
49260+ goto out;
49261+
49262 err = ERR_PTR(-ENOMEM);
49263 inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
49264 if (h)
49265@@ -228,6 +233,9 @@ static int scan(struct ctl_table_header
49266 if (*pos < file->f_pos)
49267 continue;
49268
49269+ if (gr_handle_sysctl(table, 0))
49270+ continue;
49271+
49272 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
49273 if (res)
49274 return res;
49275@@ -344,6 +352,9 @@ static int proc_sys_getattr(struct vfsmo
49276 if (IS_ERR(head))
49277 return PTR_ERR(head);
49278
49279+ if (table && gr_handle_sysctl(table, MAY_EXEC))
49280+ return -ENOENT;
49281+
49282 generic_fillattr(inode, stat);
49283 if (table)
49284 stat->mode = (stat->mode & S_IFMT) | table->mode;
49285diff -urNp linux-2.6.32.46/fs/proc/root.c linux-2.6.32.46/fs/proc/root.c
49286--- linux-2.6.32.46/fs/proc/root.c 2011-03-27 14:31:47.000000000 -0400
49287+++ linux-2.6.32.46/fs/proc/root.c 2011-04-17 15:56:46.000000000 -0400
49288@@ -134,7 +134,15 @@ void __init proc_root_init(void)
49289 #ifdef CONFIG_PROC_DEVICETREE
49290 proc_device_tree_init();
49291 #endif
49292+#ifdef CONFIG_GRKERNSEC_PROC_ADD
49293+#ifdef CONFIG_GRKERNSEC_PROC_USER
49294+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
49295+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49296+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
49297+#endif
49298+#else
49299 proc_mkdir("bus", NULL);
49300+#endif
49301 proc_sys_init();
49302 }
49303
49304diff -urNp linux-2.6.32.46/fs/proc/task_mmu.c linux-2.6.32.46/fs/proc/task_mmu.c
49305--- linux-2.6.32.46/fs/proc/task_mmu.c 2011-03-27 14:31:47.000000000 -0400
49306+++ linux-2.6.32.46/fs/proc/task_mmu.c 2011-04-23 13:38:09.000000000 -0400
49307@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
49308 "VmStk:\t%8lu kB\n"
49309 "VmExe:\t%8lu kB\n"
49310 "VmLib:\t%8lu kB\n"
49311- "VmPTE:\t%8lu kB\n",
49312- hiwater_vm << (PAGE_SHIFT-10),
49313+ "VmPTE:\t%8lu kB\n"
49314+
49315+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
49316+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
49317+#endif
49318+
49319+ ,hiwater_vm << (PAGE_SHIFT-10),
49320 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
49321 mm->locked_vm << (PAGE_SHIFT-10),
49322 hiwater_rss << (PAGE_SHIFT-10),
49323 total_rss << (PAGE_SHIFT-10),
49324 data << (PAGE_SHIFT-10),
49325 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
49326- (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10);
49327+ (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10
49328+
49329+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
49330+ , mm->context.user_cs_base, mm->context.user_cs_limit
49331+#endif
49332+
49333+ );
49334 }
49335
49336 unsigned long task_vsize(struct mm_struct *mm)
49337@@ -175,7 +186,8 @@ static void m_stop(struct seq_file *m, v
49338 struct proc_maps_private *priv = m->private;
49339 struct vm_area_struct *vma = v;
49340
49341- vma_stop(priv, vma);
49342+ if (!IS_ERR(vma))
49343+ vma_stop(priv, vma);
49344 if (priv->task)
49345 put_task_struct(priv->task);
49346 }
49347@@ -199,6 +211,12 @@ static int do_maps_open(struct inode *in
49348 return ret;
49349 }
49350
49351+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49352+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
49353+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
49354+ _mm->pax_flags & MF_PAX_SEGMEXEC))
49355+#endif
49356+
49357 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49358 {
49359 struct mm_struct *mm = vma->vm_mm;
49360@@ -206,7 +224,6 @@ static void show_map_vma(struct seq_file
49361 int flags = vma->vm_flags;
49362 unsigned long ino = 0;
49363 unsigned long long pgoff = 0;
49364- unsigned long start;
49365 dev_t dev = 0;
49366 int len;
49367
49368@@ -217,20 +234,23 @@ static void show_map_vma(struct seq_file
49369 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
49370 }
49371
49372- /* We don't show the stack guard page in /proc/maps */
49373- start = vma->vm_start;
49374- if (vma->vm_flags & VM_GROWSDOWN)
49375- if (!vma_stack_continue(vma->vm_prev, vma->vm_start))
49376- start += PAGE_SIZE;
49377-
49378 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
49379- start,
49380+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49381+ PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start,
49382+ PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end,
49383+#else
49384+ vma->vm_start,
49385 vma->vm_end,
49386+#endif
49387 flags & VM_READ ? 'r' : '-',
49388 flags & VM_WRITE ? 'w' : '-',
49389 flags & VM_EXEC ? 'x' : '-',
49390 flags & VM_MAYSHARE ? 's' : 'p',
49391+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49392+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
49393+#else
49394 pgoff,
49395+#endif
49396 MAJOR(dev), MINOR(dev), ino, &len);
49397
49398 /*
49399@@ -239,7 +259,7 @@ static void show_map_vma(struct seq_file
49400 */
49401 if (file) {
49402 pad_len_spaces(m, len);
49403- seq_path(m, &file->f_path, "\n");
49404+ seq_path(m, &file->f_path, "\n\\");
49405 } else {
49406 const char *name = arch_vma_name(vma);
49407 if (!name) {
49408@@ -247,8 +267,9 @@ static void show_map_vma(struct seq_file
49409 if (vma->vm_start <= mm->brk &&
49410 vma->vm_end >= mm->start_brk) {
49411 name = "[heap]";
49412- } else if (vma->vm_start <= mm->start_stack &&
49413- vma->vm_end >= mm->start_stack) {
49414+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
49415+ (vma->vm_start <= mm->start_stack &&
49416+ vma->vm_end >= mm->start_stack)) {
49417 name = "[stack]";
49418 }
49419 } else {
49420@@ -391,9 +412,16 @@ static int show_smap(struct seq_file *m,
49421 };
49422
49423 memset(&mss, 0, sizeof mss);
49424- mss.vma = vma;
49425- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49426- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49427+
49428+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49429+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
49430+#endif
49431+ mss.vma = vma;
49432+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49433+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49434+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49435+ }
49436+#endif
49437
49438 show_map_vma(m, vma);
49439
49440@@ -409,7 +437,11 @@ static int show_smap(struct seq_file *m,
49441 "Swap: %8lu kB\n"
49442 "KernelPageSize: %8lu kB\n"
49443 "MMUPageSize: %8lu kB\n",
49444+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49445+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
49446+#else
49447 (vma->vm_end - vma->vm_start) >> 10,
49448+#endif
49449 mss.resident >> 10,
49450 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
49451 mss.shared_clean >> 10,
49452diff -urNp linux-2.6.32.46/fs/proc/task_nommu.c linux-2.6.32.46/fs/proc/task_nommu.c
49453--- linux-2.6.32.46/fs/proc/task_nommu.c 2011-03-27 14:31:47.000000000 -0400
49454+++ linux-2.6.32.46/fs/proc/task_nommu.c 2011-04-17 15:56:46.000000000 -0400
49455@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
49456 else
49457 bytes += kobjsize(mm);
49458
49459- if (current->fs && current->fs->users > 1)
49460+ if (current->fs && atomic_read(&current->fs->users) > 1)
49461 sbytes += kobjsize(current->fs);
49462 else
49463 bytes += kobjsize(current->fs);
49464@@ -154,7 +154,7 @@ static int nommu_vma_show(struct seq_fil
49465 if (len < 1)
49466 len = 1;
49467 seq_printf(m, "%*c", len, ' ');
49468- seq_path(m, &file->f_path, "");
49469+ seq_path(m, &file->f_path, "\n\\");
49470 }
49471
49472 seq_putc(m, '\n');
49473diff -urNp linux-2.6.32.46/fs/readdir.c linux-2.6.32.46/fs/readdir.c
49474--- linux-2.6.32.46/fs/readdir.c 2011-03-27 14:31:47.000000000 -0400
49475+++ linux-2.6.32.46/fs/readdir.c 2011-10-06 09:37:14.000000000 -0400
49476@@ -16,6 +16,7 @@
49477 #include <linux/security.h>
49478 #include <linux/syscalls.h>
49479 #include <linux/unistd.h>
49480+#include <linux/namei.h>
49481
49482 #include <asm/uaccess.h>
49483
49484@@ -67,6 +68,7 @@ struct old_linux_dirent {
49485
49486 struct readdir_callback {
49487 struct old_linux_dirent __user * dirent;
49488+ struct file * file;
49489 int result;
49490 };
49491
49492@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, cons
49493 buf->result = -EOVERFLOW;
49494 return -EOVERFLOW;
49495 }
49496+
49497+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49498+ return 0;
49499+
49500 buf->result++;
49501 dirent = buf->dirent;
49502 if (!access_ok(VERIFY_WRITE, dirent,
49503@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned in
49504
49505 buf.result = 0;
49506 buf.dirent = dirent;
49507+ buf.file = file;
49508
49509 error = vfs_readdir(file, fillonedir, &buf);
49510 if (buf.result)
49511@@ -142,6 +149,7 @@ struct linux_dirent {
49512 struct getdents_callback {
49513 struct linux_dirent __user * current_dir;
49514 struct linux_dirent __user * previous;
49515+ struct file * file;
49516 int count;
49517 int error;
49518 };
49519@@ -162,6 +170,10 @@ static int filldir(void * __buf, const c
49520 buf->error = -EOVERFLOW;
49521 return -EOVERFLOW;
49522 }
49523+
49524+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49525+ return 0;
49526+
49527 dirent = buf->previous;
49528 if (dirent) {
49529 if (__put_user(offset, &dirent->d_off))
49530@@ -209,6 +221,7 @@ SYSCALL_DEFINE3(getdents, unsigned int,
49531 buf.previous = NULL;
49532 buf.count = count;
49533 buf.error = 0;
49534+ buf.file = file;
49535
49536 error = vfs_readdir(file, filldir, &buf);
49537 if (error >= 0)
49538@@ -228,6 +241,7 @@ out:
49539 struct getdents_callback64 {
49540 struct linux_dirent64 __user * current_dir;
49541 struct linux_dirent64 __user * previous;
49542+ struct file *file;
49543 int count;
49544 int error;
49545 };
49546@@ -242,6 +256,10 @@ static int filldir64(void * __buf, const
49547 buf->error = -EINVAL; /* only used if we fail.. */
49548 if (reclen > buf->count)
49549 return -EINVAL;
49550+
49551+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49552+ return 0;
49553+
49554 dirent = buf->previous;
49555 if (dirent) {
49556 if (__put_user(offset, &dirent->d_off))
49557@@ -289,6 +307,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int
49558
49559 buf.current_dir = dirent;
49560 buf.previous = NULL;
49561+ buf.file = file;
49562 buf.count = count;
49563 buf.error = 0;
49564
49565@@ -297,7 +316,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int
49566 error = buf.error;
49567 lastdirent = buf.previous;
49568 if (lastdirent) {
49569- typeof(lastdirent->d_off) d_off = file->f_pos;
49570+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
49571 if (__put_user(d_off, &lastdirent->d_off))
49572 error = -EFAULT;
49573 else
49574diff -urNp linux-2.6.32.46/fs/reiserfs/dir.c linux-2.6.32.46/fs/reiserfs/dir.c
49575--- linux-2.6.32.46/fs/reiserfs/dir.c 2011-03-27 14:31:47.000000000 -0400
49576+++ linux-2.6.32.46/fs/reiserfs/dir.c 2011-05-16 21:46:57.000000000 -0400
49577@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
49578 struct reiserfs_dir_entry de;
49579 int ret = 0;
49580
49581+ pax_track_stack();
49582+
49583 reiserfs_write_lock(inode->i_sb);
49584
49585 reiserfs_check_lock_depth(inode->i_sb, "readdir");
49586diff -urNp linux-2.6.32.46/fs/reiserfs/do_balan.c linux-2.6.32.46/fs/reiserfs/do_balan.c
49587--- linux-2.6.32.46/fs/reiserfs/do_balan.c 2011-03-27 14:31:47.000000000 -0400
49588+++ linux-2.6.32.46/fs/reiserfs/do_balan.c 2011-04-17 15:56:46.000000000 -0400
49589@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
49590 return;
49591 }
49592
49593- atomic_inc(&(fs_generation(tb->tb_sb)));
49594+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
49595 do_balance_starts(tb);
49596
49597 /* balance leaf returns 0 except if combining L R and S into
49598diff -urNp linux-2.6.32.46/fs/reiserfs/item_ops.c linux-2.6.32.46/fs/reiserfs/item_ops.c
49599--- linux-2.6.32.46/fs/reiserfs/item_ops.c 2011-03-27 14:31:47.000000000 -0400
49600+++ linux-2.6.32.46/fs/reiserfs/item_ops.c 2011-04-17 15:56:46.000000000 -0400
49601@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
49602 vi->vi_index, vi->vi_type, vi->vi_ih);
49603 }
49604
49605-static struct item_operations stat_data_ops = {
49606+static const struct item_operations stat_data_ops = {
49607 .bytes_number = sd_bytes_number,
49608 .decrement_key = sd_decrement_key,
49609 .is_left_mergeable = sd_is_left_mergeable,
49610@@ -196,7 +196,7 @@ static void direct_print_vi(struct virtu
49611 vi->vi_index, vi->vi_type, vi->vi_ih);
49612 }
49613
49614-static struct item_operations direct_ops = {
49615+static const struct item_operations direct_ops = {
49616 .bytes_number = direct_bytes_number,
49617 .decrement_key = direct_decrement_key,
49618 .is_left_mergeable = direct_is_left_mergeable,
49619@@ -341,7 +341,7 @@ static void indirect_print_vi(struct vir
49620 vi->vi_index, vi->vi_type, vi->vi_ih);
49621 }
49622
49623-static struct item_operations indirect_ops = {
49624+static const struct item_operations indirect_ops = {
49625 .bytes_number = indirect_bytes_number,
49626 .decrement_key = indirect_decrement_key,
49627 .is_left_mergeable = indirect_is_left_mergeable,
49628@@ -628,7 +628,7 @@ static void direntry_print_vi(struct vir
49629 printk("\n");
49630 }
49631
49632-static struct item_operations direntry_ops = {
49633+static const struct item_operations direntry_ops = {
49634 .bytes_number = direntry_bytes_number,
49635 .decrement_key = direntry_decrement_key,
49636 .is_left_mergeable = direntry_is_left_mergeable,
49637@@ -724,7 +724,7 @@ static void errcatch_print_vi(struct vir
49638 "Invalid item type observed, run fsck ASAP");
49639 }
49640
49641-static struct item_operations errcatch_ops = {
49642+static const struct item_operations errcatch_ops = {
49643 errcatch_bytes_number,
49644 errcatch_decrement_key,
49645 errcatch_is_left_mergeable,
49646@@ -746,7 +746,7 @@ static struct item_operations errcatch_o
49647 #error Item types must use disk-format assigned values.
49648 #endif
49649
49650-struct item_operations *item_ops[TYPE_ANY + 1] = {
49651+const struct item_operations * const item_ops[TYPE_ANY + 1] = {
49652 &stat_data_ops,
49653 &indirect_ops,
49654 &direct_ops,
49655diff -urNp linux-2.6.32.46/fs/reiserfs/journal.c linux-2.6.32.46/fs/reiserfs/journal.c
49656--- linux-2.6.32.46/fs/reiserfs/journal.c 2011-03-27 14:31:47.000000000 -0400
49657+++ linux-2.6.32.46/fs/reiserfs/journal.c 2011-05-16 21:46:57.000000000 -0400
49658@@ -2329,6 +2329,8 @@ static struct buffer_head *reiserfs_brea
49659 struct buffer_head *bh;
49660 int i, j;
49661
49662+ pax_track_stack();
49663+
49664 bh = __getblk(dev, block, bufsize);
49665 if (buffer_uptodate(bh))
49666 return (bh);
49667diff -urNp linux-2.6.32.46/fs/reiserfs/namei.c linux-2.6.32.46/fs/reiserfs/namei.c
49668--- linux-2.6.32.46/fs/reiserfs/namei.c 2011-03-27 14:31:47.000000000 -0400
49669+++ linux-2.6.32.46/fs/reiserfs/namei.c 2011-05-16 21:46:57.000000000 -0400
49670@@ -1214,6 +1214,8 @@ static int reiserfs_rename(struct inode
49671 unsigned long savelink = 1;
49672 struct timespec ctime;
49673
49674+ pax_track_stack();
49675+
49676 /* three balancings: (1) old name removal, (2) new name insertion
49677 and (3) maybe "save" link insertion
49678 stat data updates: (1) old directory,
49679diff -urNp linux-2.6.32.46/fs/reiserfs/procfs.c linux-2.6.32.46/fs/reiserfs/procfs.c
49680--- linux-2.6.32.46/fs/reiserfs/procfs.c 2011-03-27 14:31:47.000000000 -0400
49681+++ linux-2.6.32.46/fs/reiserfs/procfs.c 2011-05-16 21:46:57.000000000 -0400
49682@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
49683 "SMALL_TAILS " : "NO_TAILS ",
49684 replay_only(sb) ? "REPLAY_ONLY " : "",
49685 convert_reiserfs(sb) ? "CONV " : "",
49686- atomic_read(&r->s_generation_counter),
49687+ atomic_read_unchecked(&r->s_generation_counter),
49688 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
49689 SF(s_do_balance), SF(s_unneeded_left_neighbor),
49690 SF(s_good_search_by_key_reada), SF(s_bmaps),
49691@@ -309,6 +309,8 @@ static int show_journal(struct seq_file
49692 struct journal_params *jp = &rs->s_v1.s_journal;
49693 char b[BDEVNAME_SIZE];
49694
49695+ pax_track_stack();
49696+
49697 seq_printf(m, /* on-disk fields */
49698 "jp_journal_1st_block: \t%i\n"
49699 "jp_journal_dev: \t%s[%x]\n"
49700diff -urNp linux-2.6.32.46/fs/reiserfs/stree.c linux-2.6.32.46/fs/reiserfs/stree.c
49701--- linux-2.6.32.46/fs/reiserfs/stree.c 2011-03-27 14:31:47.000000000 -0400
49702+++ linux-2.6.32.46/fs/reiserfs/stree.c 2011-05-16 21:46:57.000000000 -0400
49703@@ -1159,6 +1159,8 @@ int reiserfs_delete_item(struct reiserfs
49704 int iter = 0;
49705 #endif
49706
49707+ pax_track_stack();
49708+
49709 BUG_ON(!th->t_trans_id);
49710
49711 init_tb_struct(th, &s_del_balance, sb, path,
49712@@ -1296,6 +1298,8 @@ void reiserfs_delete_solid_item(struct r
49713 int retval;
49714 int quota_cut_bytes = 0;
49715
49716+ pax_track_stack();
49717+
49718 BUG_ON(!th->t_trans_id);
49719
49720 le_key2cpu_key(&cpu_key, key);
49721@@ -1525,6 +1529,8 @@ int reiserfs_cut_from_item(struct reiser
49722 int quota_cut_bytes;
49723 loff_t tail_pos = 0;
49724
49725+ pax_track_stack();
49726+
49727 BUG_ON(!th->t_trans_id);
49728
49729 init_tb_struct(th, &s_cut_balance, inode->i_sb, path,
49730@@ -1920,6 +1926,8 @@ int reiserfs_paste_into_item(struct reis
49731 int retval;
49732 int fs_gen;
49733
49734+ pax_track_stack();
49735+
49736 BUG_ON(!th->t_trans_id);
49737
49738 fs_gen = get_generation(inode->i_sb);
49739@@ -2007,6 +2015,8 @@ int reiserfs_insert_item(struct reiserfs
49740 int fs_gen = 0;
49741 int quota_bytes = 0;
49742
49743+ pax_track_stack();
49744+
49745 BUG_ON(!th->t_trans_id);
49746
49747 if (inode) { /* Do we count quotas for item? */
49748diff -urNp linux-2.6.32.46/fs/reiserfs/super.c linux-2.6.32.46/fs/reiserfs/super.c
49749--- linux-2.6.32.46/fs/reiserfs/super.c 2011-03-27 14:31:47.000000000 -0400
49750+++ linux-2.6.32.46/fs/reiserfs/super.c 2011-05-16 21:46:57.000000000 -0400
49751@@ -912,6 +912,8 @@ static int reiserfs_parse_options(struct
49752 {.option_name = NULL}
49753 };
49754
49755+ pax_track_stack();
49756+
49757 *blocks = 0;
49758 if (!options || !*options)
49759 /* use default configuration: create tails, journaling on, no
49760diff -urNp linux-2.6.32.46/fs/select.c linux-2.6.32.46/fs/select.c
49761--- linux-2.6.32.46/fs/select.c 2011-03-27 14:31:47.000000000 -0400
49762+++ linux-2.6.32.46/fs/select.c 2011-05-16 21:46:57.000000000 -0400
49763@@ -20,6 +20,7 @@
49764 #include <linux/module.h>
49765 #include <linux/slab.h>
49766 #include <linux/poll.h>
49767+#include <linux/security.h>
49768 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
49769 #include <linux/file.h>
49770 #include <linux/fdtable.h>
49771@@ -401,6 +402,8 @@ int do_select(int n, fd_set_bits *fds, s
49772 int retval, i, timed_out = 0;
49773 unsigned long slack = 0;
49774
49775+ pax_track_stack();
49776+
49777 rcu_read_lock();
49778 retval = max_select_fd(n, fds);
49779 rcu_read_unlock();
49780@@ -529,6 +532,8 @@ int core_sys_select(int n, fd_set __user
49781 /* Allocate small arguments on the stack to save memory and be faster */
49782 long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
49783
49784+ pax_track_stack();
49785+
49786 ret = -EINVAL;
49787 if (n < 0)
49788 goto out_nofds;
49789@@ -821,6 +826,9 @@ int do_sys_poll(struct pollfd __user *uf
49790 struct poll_list *walk = head;
49791 unsigned long todo = nfds;
49792
49793+ pax_track_stack();
49794+
49795+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
49796 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
49797 return -EINVAL;
49798
49799diff -urNp linux-2.6.32.46/fs/seq_file.c linux-2.6.32.46/fs/seq_file.c
49800--- linux-2.6.32.46/fs/seq_file.c 2011-03-27 14:31:47.000000000 -0400
49801+++ linux-2.6.32.46/fs/seq_file.c 2011-08-23 21:22:32.000000000 -0400
49802@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
49803 return 0;
49804 }
49805 if (!m->buf) {
49806- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
49807+ m->size = PAGE_SIZE;
49808+ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
49809 if (!m->buf)
49810 return -ENOMEM;
49811 }
49812@@ -116,7 +117,8 @@ static int traverse(struct seq_file *m,
49813 Eoverflow:
49814 m->op->stop(m, p);
49815 kfree(m->buf);
49816- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
49817+ m->size <<= 1;
49818+ m->buf = kmalloc(m->size, GFP_KERNEL);
49819 return !m->buf ? -ENOMEM : -EAGAIN;
49820 }
49821
49822@@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char
49823 m->version = file->f_version;
49824 /* grab buffer if we didn't have one */
49825 if (!m->buf) {
49826- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
49827+ m->size = PAGE_SIZE;
49828+ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
49829 if (!m->buf)
49830 goto Enomem;
49831 }
49832@@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char
49833 goto Fill;
49834 m->op->stop(m, p);
49835 kfree(m->buf);
49836- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
49837+ m->size <<= 1;
49838+ m->buf = kmalloc(m->size, GFP_KERNEL);
49839 if (!m->buf)
49840 goto Enomem;
49841 m->count = 0;
49842@@ -551,7 +555,7 @@ static void single_stop(struct seq_file
49843 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
49844 void *data)
49845 {
49846- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
49847+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
49848 int res = -ENOMEM;
49849
49850 if (op) {
49851diff -urNp linux-2.6.32.46/fs/smbfs/proc.c linux-2.6.32.46/fs/smbfs/proc.c
49852--- linux-2.6.32.46/fs/smbfs/proc.c 2011-03-27 14:31:47.000000000 -0400
49853+++ linux-2.6.32.46/fs/smbfs/proc.c 2011-08-05 20:33:55.000000000 -0400
49854@@ -266,9 +266,9 @@ int smb_setcodepage(struct smb_sb_info *
49855
49856 out:
49857 if (server->local_nls != NULL && server->remote_nls != NULL)
49858- server->ops->convert = convert_cp;
49859+ *(void **)&server->ops->convert = convert_cp;
49860 else
49861- server->ops->convert = convert_memcpy;
49862+ *(void **)&server->ops->convert = convert_memcpy;
49863
49864 smb_unlock_server(server);
49865 return n;
49866@@ -933,9 +933,9 @@ smb_newconn(struct smb_sb_info *server,
49867
49868 /* FIXME: the win9x code wants to modify these ... (seek/trunc bug) */
49869 if (server->mnt->flags & SMB_MOUNT_OLDATTR) {
49870- server->ops->getattr = smb_proc_getattr_core;
49871+ *(void **)&server->ops->getattr = smb_proc_getattr_core;
49872 } else if (server->mnt->flags & SMB_MOUNT_DIRATTR) {
49873- server->ops->getattr = smb_proc_getattr_ff;
49874+ *(void **)&server->ops->getattr = smb_proc_getattr_ff;
49875 }
49876
49877 /* Decode server capabilities */
49878@@ -3439,7 +3439,7 @@ out:
49879 static void
49880 install_ops(struct smb_ops *dst, struct smb_ops *src)
49881 {
49882- memcpy(dst, src, sizeof(void *) * SMB_OPS_NUM_STATIC);
49883+ memcpy((void *)dst, src, sizeof(void *) * SMB_OPS_NUM_STATIC);
49884 }
49885
49886 /* < LANMAN2 */
49887diff -urNp linux-2.6.32.46/fs/smbfs/symlink.c linux-2.6.32.46/fs/smbfs/symlink.c
49888--- linux-2.6.32.46/fs/smbfs/symlink.c 2011-03-27 14:31:47.000000000 -0400
49889+++ linux-2.6.32.46/fs/smbfs/symlink.c 2011-04-17 15:56:46.000000000 -0400
49890@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
49891
49892 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
49893 {
49894- char *s = nd_get_link(nd);
49895+ const char *s = nd_get_link(nd);
49896 if (!IS_ERR(s))
49897 __putname(s);
49898 }
49899diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c
49900--- linux-2.6.32.46/fs/splice.c 2011-03-27 14:31:47.000000000 -0400
49901+++ linux-2.6.32.46/fs/splice.c 2011-10-06 09:37:14.000000000 -0400
49902@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
49903 pipe_lock(pipe);
49904
49905 for (;;) {
49906- if (!pipe->readers) {
49907+ if (!atomic_read(&pipe->readers)) {
49908 send_sig(SIGPIPE, current, 0);
49909 if (!ret)
49910 ret = -EPIPE;
49911@@ -239,9 +239,9 @@ ssize_t splice_to_pipe(struct pipe_inode
49912 do_wakeup = 0;
49913 }
49914
49915- pipe->waiting_writers++;
49916+ atomic_inc(&pipe->waiting_writers);
49917 pipe_wait(pipe);
49918- pipe->waiting_writers--;
49919+ atomic_dec(&pipe->waiting_writers);
49920 }
49921
49922 pipe_unlock(pipe);
49923@@ -285,6 +285,8 @@ __generic_file_splice_read(struct file *
49924 .spd_release = spd_release_page,
49925 };
49926
49927+ pax_track_stack();
49928+
49929 index = *ppos >> PAGE_CACHE_SHIFT;
49930 loff = *ppos & ~PAGE_CACHE_MASK;
49931 req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
49932@@ -521,7 +523,7 @@ static ssize_t kernel_readv(struct file
49933 old_fs = get_fs();
49934 set_fs(get_ds());
49935 /* The cast to a user pointer is valid due to the set_fs() */
49936- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
49937+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
49938 set_fs(old_fs);
49939
49940 return res;
49941@@ -536,7 +538,7 @@ static ssize_t kernel_write(struct file
49942 old_fs = get_fs();
49943 set_fs(get_ds());
49944 /* The cast to a user pointer is valid due to the set_fs() */
49945- res = vfs_write(file, (const char __user *)buf, count, &pos);
49946+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
49947 set_fs(old_fs);
49948
49949 return res;
49950@@ -565,6 +567,8 @@ ssize_t default_file_splice_read(struct
49951 .spd_release = spd_release_page,
49952 };
49953
49954+ pax_track_stack();
49955+
49956 index = *ppos >> PAGE_CACHE_SHIFT;
49957 offset = *ppos & ~PAGE_CACHE_MASK;
49958 nr_pages = (len + offset + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
49959@@ -578,7 +582,7 @@ ssize_t default_file_splice_read(struct
49960 goto err;
49961
49962 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
49963- vec[i].iov_base = (void __user *) page_address(page);
49964+ vec[i].iov_base = (__force void __user *) page_address(page);
49965 vec[i].iov_len = this_len;
49966 pages[i] = page;
49967 spd.nr_pages++;
49968@@ -800,10 +804,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
49969 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
49970 {
49971 while (!pipe->nrbufs) {
49972- if (!pipe->writers)
49973+ if (!atomic_read(&pipe->writers))
49974 return 0;
49975
49976- if (!pipe->waiting_writers && sd->num_spliced)
49977+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
49978 return 0;
49979
49980 if (sd->flags & SPLICE_F_NONBLOCK)
49981@@ -1140,7 +1144,7 @@ ssize_t splice_direct_to_actor(struct fi
49982 * out of the pipe right after the splice_to_pipe(). So set
49983 * PIPE_READERS appropriately.
49984 */
49985- pipe->readers = 1;
49986+ atomic_set(&pipe->readers, 1);
49987
49988 current->splice_pipe = pipe;
49989 }
49990@@ -1592,6 +1596,8 @@ static long vmsplice_to_pipe(struct file
49991 .spd_release = spd_release_page,
49992 };
49993
49994+ pax_track_stack();
49995+
49996 pipe = pipe_info(file->f_path.dentry->d_inode);
49997 if (!pipe)
49998 return -EBADF;
49999@@ -1700,9 +1706,9 @@ static int ipipe_prep(struct pipe_inode_
50000 ret = -ERESTARTSYS;
50001 break;
50002 }
50003- if (!pipe->writers)
50004+ if (!atomic_read(&pipe->writers))
50005 break;
50006- if (!pipe->waiting_writers) {
50007+ if (!atomic_read(&pipe->waiting_writers)) {
50008 if (flags & SPLICE_F_NONBLOCK) {
50009 ret = -EAGAIN;
50010 break;
50011@@ -1734,7 +1740,7 @@ static int opipe_prep(struct pipe_inode_
50012 pipe_lock(pipe);
50013
50014 while (pipe->nrbufs >= PIPE_BUFFERS) {
50015- if (!pipe->readers) {
50016+ if (!atomic_read(&pipe->readers)) {
50017 send_sig(SIGPIPE, current, 0);
50018 ret = -EPIPE;
50019 break;
50020@@ -1747,9 +1753,9 @@ static int opipe_prep(struct pipe_inode_
50021 ret = -ERESTARTSYS;
50022 break;
50023 }
50024- pipe->waiting_writers++;
50025+ atomic_inc(&pipe->waiting_writers);
50026 pipe_wait(pipe);
50027- pipe->waiting_writers--;
50028+ atomic_dec(&pipe->waiting_writers);
50029 }
50030
50031 pipe_unlock(pipe);
50032@@ -1785,14 +1791,14 @@ retry:
50033 pipe_double_lock(ipipe, opipe);
50034
50035 do {
50036- if (!opipe->readers) {
50037+ if (!atomic_read(&opipe->readers)) {
50038 send_sig(SIGPIPE, current, 0);
50039 if (!ret)
50040 ret = -EPIPE;
50041 break;
50042 }
50043
50044- if (!ipipe->nrbufs && !ipipe->writers)
50045+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
50046 break;
50047
50048 /*
50049@@ -1892,7 +1898,7 @@ static int link_pipe(struct pipe_inode_i
50050 pipe_double_lock(ipipe, opipe);
50051
50052 do {
50053- if (!opipe->readers) {
50054+ if (!atomic_read(&opipe->readers)) {
50055 send_sig(SIGPIPE, current, 0);
50056 if (!ret)
50057 ret = -EPIPE;
50058@@ -1937,7 +1943,7 @@ static int link_pipe(struct pipe_inode_i
50059 * return EAGAIN if we have the potential of some data in the
50060 * future, otherwise just return 0
50061 */
50062- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
50063+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
50064 ret = -EAGAIN;
50065
50066 pipe_unlock(ipipe);
50067diff -urNp linux-2.6.32.46/fs/sysfs/file.c linux-2.6.32.46/fs/sysfs/file.c
50068--- linux-2.6.32.46/fs/sysfs/file.c 2011-03-27 14:31:47.000000000 -0400
50069+++ linux-2.6.32.46/fs/sysfs/file.c 2011-05-04 17:56:20.000000000 -0400
50070@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
50071
50072 struct sysfs_open_dirent {
50073 atomic_t refcnt;
50074- atomic_t event;
50075+ atomic_unchecked_t event;
50076 wait_queue_head_t poll;
50077 struct list_head buffers; /* goes through sysfs_buffer.list */
50078 };
50079@@ -53,7 +53,7 @@ struct sysfs_buffer {
50080 size_t count;
50081 loff_t pos;
50082 char * page;
50083- struct sysfs_ops * ops;
50084+ const struct sysfs_ops * ops;
50085 struct mutex mutex;
50086 int needs_read_fill;
50087 int event;
50088@@ -75,7 +75,7 @@ static int fill_read_buffer(struct dentr
50089 {
50090 struct sysfs_dirent *attr_sd = dentry->d_fsdata;
50091 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
50092- struct sysfs_ops * ops = buffer->ops;
50093+ const struct sysfs_ops * ops = buffer->ops;
50094 int ret = 0;
50095 ssize_t count;
50096
50097@@ -88,7 +88,7 @@ static int fill_read_buffer(struct dentr
50098 if (!sysfs_get_active_two(attr_sd))
50099 return -ENODEV;
50100
50101- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
50102+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
50103 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
50104
50105 sysfs_put_active_two(attr_sd);
50106@@ -199,7 +199,7 @@ flush_write_buffer(struct dentry * dentr
50107 {
50108 struct sysfs_dirent *attr_sd = dentry->d_fsdata;
50109 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
50110- struct sysfs_ops * ops = buffer->ops;
50111+ const struct sysfs_ops * ops = buffer->ops;
50112 int rc;
50113
50114 /* need attr_sd for attr and ops, its parent for kobj */
50115@@ -294,7 +294,7 @@ static int sysfs_get_open_dirent(struct
50116 return -ENOMEM;
50117
50118 atomic_set(&new_od->refcnt, 0);
50119- atomic_set(&new_od->event, 1);
50120+ atomic_set_unchecked(&new_od->event, 1);
50121 init_waitqueue_head(&new_od->poll);
50122 INIT_LIST_HEAD(&new_od->buffers);
50123 goto retry;
50124@@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode
50125 struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
50126 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
50127 struct sysfs_buffer *buffer;
50128- struct sysfs_ops *ops;
50129+ const struct sysfs_ops *ops;
50130 int error = -EACCES;
50131 char *p;
50132
50133@@ -444,7 +444,7 @@ static unsigned int sysfs_poll(struct fi
50134
50135 sysfs_put_active_two(attr_sd);
50136
50137- if (buffer->event != atomic_read(&od->event))
50138+ if (buffer->event != atomic_read_unchecked(&od->event))
50139 goto trigger;
50140
50141 return DEFAULT_POLLMASK;
50142@@ -463,7 +463,7 @@ void sysfs_notify_dirent(struct sysfs_di
50143
50144 od = sd->s_attr.open;
50145 if (od) {
50146- atomic_inc(&od->event);
50147+ atomic_inc_unchecked(&od->event);
50148 wake_up_interruptible(&od->poll);
50149 }
50150
50151diff -urNp linux-2.6.32.46/fs/sysfs/mount.c linux-2.6.32.46/fs/sysfs/mount.c
50152--- linux-2.6.32.46/fs/sysfs/mount.c 2011-03-27 14:31:47.000000000 -0400
50153+++ linux-2.6.32.46/fs/sysfs/mount.c 2011-04-17 15:56:46.000000000 -0400
50154@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
50155 .s_name = "",
50156 .s_count = ATOMIC_INIT(1),
50157 .s_flags = SYSFS_DIR,
50158+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
50159+ .s_mode = S_IFDIR | S_IRWXU,
50160+#else
50161 .s_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
50162+#endif
50163 .s_ino = 1,
50164 };
50165
50166diff -urNp linux-2.6.32.46/fs/sysfs/symlink.c linux-2.6.32.46/fs/sysfs/symlink.c
50167--- linux-2.6.32.46/fs/sysfs/symlink.c 2011-03-27 14:31:47.000000000 -0400
50168+++ linux-2.6.32.46/fs/sysfs/symlink.c 2011-04-17 15:56:46.000000000 -0400
50169@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
50170
50171 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
50172 {
50173- char *page = nd_get_link(nd);
50174+ const char *page = nd_get_link(nd);
50175 if (!IS_ERR(page))
50176 free_page((unsigned long)page);
50177 }
50178diff -urNp linux-2.6.32.46/fs/udf/balloc.c linux-2.6.32.46/fs/udf/balloc.c
50179--- linux-2.6.32.46/fs/udf/balloc.c 2011-03-27 14:31:47.000000000 -0400
50180+++ linux-2.6.32.46/fs/udf/balloc.c 2011-04-17 15:56:46.000000000 -0400
50181@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
50182
50183 mutex_lock(&sbi->s_alloc_mutex);
50184 partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
50185- if (bloc->logicalBlockNum < 0 ||
50186- (bloc->logicalBlockNum + count) >
50187- partmap->s_partition_len) {
50188+ if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
50189 udf_debug("%d < %d || %d + %d > %d\n",
50190 bloc->logicalBlockNum, 0, bloc->logicalBlockNum,
50191 count, partmap->s_partition_len);
50192@@ -436,9 +434,7 @@ static void udf_table_free_blocks(struct
50193
50194 mutex_lock(&sbi->s_alloc_mutex);
50195 partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
50196- if (bloc->logicalBlockNum < 0 ||
50197- (bloc->logicalBlockNum + count) >
50198- partmap->s_partition_len) {
50199+ if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
50200 udf_debug("%d < %d || %d + %d > %d\n",
50201 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
50202 partmap->s_partition_len);
50203diff -urNp linux-2.6.32.46/fs/udf/inode.c linux-2.6.32.46/fs/udf/inode.c
50204--- linux-2.6.32.46/fs/udf/inode.c 2011-03-27 14:31:47.000000000 -0400
50205+++ linux-2.6.32.46/fs/udf/inode.c 2011-05-16 21:46:57.000000000 -0400
50206@@ -484,6 +484,8 @@ static struct buffer_head *inode_getblk(
50207 int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
50208 int lastblock = 0;
50209
50210+ pax_track_stack();
50211+
50212 prev_epos.offset = udf_file_entry_alloc_offset(inode);
50213 prev_epos.block = iinfo->i_location;
50214 prev_epos.bh = NULL;
50215diff -urNp linux-2.6.32.46/fs/udf/misc.c linux-2.6.32.46/fs/udf/misc.c
50216--- linux-2.6.32.46/fs/udf/misc.c 2011-03-27 14:31:47.000000000 -0400
50217+++ linux-2.6.32.46/fs/udf/misc.c 2011-04-23 12:56:11.000000000 -0400
50218@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
50219
50220 u8 udf_tag_checksum(const struct tag *t)
50221 {
50222- u8 *data = (u8 *)t;
50223+ const u8 *data = (const u8 *)t;
50224 u8 checksum = 0;
50225 int i;
50226 for (i = 0; i < sizeof(struct tag); ++i)
50227diff -urNp linux-2.6.32.46/fs/utimes.c linux-2.6.32.46/fs/utimes.c
50228--- linux-2.6.32.46/fs/utimes.c 2011-03-27 14:31:47.000000000 -0400
50229+++ linux-2.6.32.46/fs/utimes.c 2011-04-17 15:56:46.000000000 -0400
50230@@ -1,6 +1,7 @@
50231 #include <linux/compiler.h>
50232 #include <linux/file.h>
50233 #include <linux/fs.h>
50234+#include <linux/security.h>
50235 #include <linux/linkage.h>
50236 #include <linux/mount.h>
50237 #include <linux/namei.h>
50238@@ -101,6 +102,12 @@ static int utimes_common(struct path *pa
50239 goto mnt_drop_write_and_out;
50240 }
50241 }
50242+
50243+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
50244+ error = -EACCES;
50245+ goto mnt_drop_write_and_out;
50246+ }
50247+
50248 mutex_lock(&inode->i_mutex);
50249 error = notify_change(path->dentry, &newattrs);
50250 mutex_unlock(&inode->i_mutex);
50251diff -urNp linux-2.6.32.46/fs/xattr_acl.c linux-2.6.32.46/fs/xattr_acl.c
50252--- linux-2.6.32.46/fs/xattr_acl.c 2011-03-27 14:31:47.000000000 -0400
50253+++ linux-2.6.32.46/fs/xattr_acl.c 2011-04-17 15:56:46.000000000 -0400
50254@@ -17,8 +17,8 @@
50255 struct posix_acl *
50256 posix_acl_from_xattr(const void *value, size_t size)
50257 {
50258- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
50259- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
50260+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
50261+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
50262 int count;
50263 struct posix_acl *acl;
50264 struct posix_acl_entry *acl_e;
50265diff -urNp linux-2.6.32.46/fs/xattr.c linux-2.6.32.46/fs/xattr.c
50266--- linux-2.6.32.46/fs/xattr.c 2011-03-27 14:31:47.000000000 -0400
50267+++ linux-2.6.32.46/fs/xattr.c 2011-04-17 15:56:46.000000000 -0400
50268@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
50269 * Extended attribute SET operations
50270 */
50271 static long
50272-setxattr(struct dentry *d, const char __user *name, const void __user *value,
50273+setxattr(struct path *path, const char __user *name, const void __user *value,
50274 size_t size, int flags)
50275 {
50276 int error;
50277@@ -271,7 +271,13 @@ setxattr(struct dentry *d, const char __
50278 return PTR_ERR(kvalue);
50279 }
50280
50281- error = vfs_setxattr(d, kname, kvalue, size, flags);
50282+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
50283+ error = -EACCES;
50284+ goto out;
50285+ }
50286+
50287+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
50288+out:
50289 kfree(kvalue);
50290 return error;
50291 }
50292@@ -288,7 +294,7 @@ SYSCALL_DEFINE5(setxattr, const char __u
50293 return error;
50294 error = mnt_want_write(path.mnt);
50295 if (!error) {
50296- error = setxattr(path.dentry, name, value, size, flags);
50297+ error = setxattr(&path, name, value, size, flags);
50298 mnt_drop_write(path.mnt);
50299 }
50300 path_put(&path);
50301@@ -307,7 +313,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __
50302 return error;
50303 error = mnt_want_write(path.mnt);
50304 if (!error) {
50305- error = setxattr(path.dentry, name, value, size, flags);
50306+ error = setxattr(&path, name, value, size, flags);
50307 mnt_drop_write(path.mnt);
50308 }
50309 path_put(&path);
50310@@ -318,17 +324,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, cons
50311 const void __user *,value, size_t, size, int, flags)
50312 {
50313 struct file *f;
50314- struct dentry *dentry;
50315 int error = -EBADF;
50316
50317 f = fget(fd);
50318 if (!f)
50319 return error;
50320- dentry = f->f_path.dentry;
50321- audit_inode(NULL, dentry);
50322+ audit_inode(NULL, f->f_path.dentry);
50323 error = mnt_want_write_file(f);
50324 if (!error) {
50325- error = setxattr(dentry, name, value, size, flags);
50326+ error = setxattr(&f->f_path, name, value, size, flags);
50327 mnt_drop_write(f->f_path.mnt);
50328 }
50329 fput(f);
50330diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c
50331--- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-27 14:31:47.000000000 -0400
50332+++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:56:46.000000000 -0400
50333@@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1(
50334 xfs_fsop_geom_t fsgeo;
50335 int error;
50336
50337+ memset(&fsgeo, 0, sizeof(fsgeo));
50338 error = xfs_fs_geometry(mp, &fsgeo, 3);
50339 if (error)
50340 return -error;
50341diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c
50342--- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 17:00:52.000000000 -0400
50343+++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:07:09.000000000 -0400
50344@@ -134,7 +134,7 @@ xfs_find_handle(
50345 }
50346
50347 error = -EFAULT;
50348- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
50349+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
50350 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
50351 goto out_put;
50352
50353@@ -423,7 +423,7 @@ xfs_attrlist_by_handle(
50354 if (IS_ERR(dentry))
50355 return PTR_ERR(dentry);
50356
50357- kbuf = kmalloc(al_hreq.buflen, GFP_KERNEL);
50358+ kbuf = kzalloc(al_hreq.buflen, GFP_KERNEL);
50359 if (!kbuf)
50360 goto out_dput;
50361
50362@@ -697,7 +697,7 @@ xfs_ioc_fsgeometry_v1(
50363 xfs_mount_t *mp,
50364 void __user *arg)
50365 {
50366- xfs_fsop_geom_t fsgeo;
50367+ xfs_fsop_geom_t fsgeo;
50368 int error;
50369
50370 error = xfs_fs_geometry(mp, &fsgeo, 3);
50371diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c
50372--- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c 2011-03-27 14:31:47.000000000 -0400
50373+++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:56:46.000000000 -0400
50374@@ -468,7 +468,7 @@ xfs_vn_put_link(
50375 struct nameidata *nd,
50376 void *p)
50377 {
50378- char *s = nd_get_link(nd);
50379+ const char *s = nd_get_link(nd);
50380
50381 if (!IS_ERR(s))
50382 kfree(s);
50383diff -urNp linux-2.6.32.46/fs/xfs/xfs_bmap.c linux-2.6.32.46/fs/xfs/xfs_bmap.c
50384--- linux-2.6.32.46/fs/xfs/xfs_bmap.c 2011-03-27 14:31:47.000000000 -0400
50385+++ linux-2.6.32.46/fs/xfs/xfs_bmap.c 2011-04-17 15:56:46.000000000 -0400
50386@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
50387 int nmap,
50388 int ret_nmap);
50389 #else
50390-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
50391+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
50392 #endif /* DEBUG */
50393
50394 #if defined(XFS_RW_TRACE)
50395diff -urNp linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c
50396--- linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c 2011-03-27 14:31:47.000000000 -0400
50397+++ linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:07:30.000000000 -0400
50398@@ -779,7 +779,15 @@ xfs_dir2_sf_getdents(
50399 }
50400
50401 ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));
50402- if (filldir(dirent, sfep->name, sfep->namelen,
50403+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
50404+ char name[sfep->namelen];
50405+ memcpy(name, sfep->name, sfep->namelen);
50406+ if (filldir(dirent, name, sfep->namelen,
50407+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
50408+ *offset = off & 0x7fffffff;
50409+ return 0;
50410+ }
50411+ } else if (filldir(dirent, sfep->name, sfep->namelen,
50412 off & 0x7fffffff, ino, DT_UNKNOWN)) {
50413 *offset = off & 0x7fffffff;
50414 return 0;
50415diff -urNp linux-2.6.32.46/grsecurity/gracl_alloc.c linux-2.6.32.46/grsecurity/gracl_alloc.c
50416--- linux-2.6.32.46/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
50417+++ linux-2.6.32.46/grsecurity/gracl_alloc.c 2011-04-17 15:56:46.000000000 -0400
50418@@ -0,0 +1,105 @@
50419+#include <linux/kernel.h>
50420+#include <linux/mm.h>
50421+#include <linux/slab.h>
50422+#include <linux/vmalloc.h>
50423+#include <linux/gracl.h>
50424+#include <linux/grsecurity.h>
50425+
50426+static unsigned long alloc_stack_next = 1;
50427+static unsigned long alloc_stack_size = 1;
50428+static void **alloc_stack;
50429+
50430+static __inline__ int
50431+alloc_pop(void)
50432+{
50433+ if (alloc_stack_next == 1)
50434+ return 0;
50435+
50436+ kfree(alloc_stack[alloc_stack_next - 2]);
50437+
50438+ alloc_stack_next--;
50439+
50440+ return 1;
50441+}
50442+
50443+static __inline__ int
50444+alloc_push(void *buf)
50445+{
50446+ if (alloc_stack_next >= alloc_stack_size)
50447+ return 1;
50448+
50449+ alloc_stack[alloc_stack_next - 1] = buf;
50450+
50451+ alloc_stack_next++;
50452+
50453+ return 0;
50454+}
50455+
50456+void *
50457+acl_alloc(unsigned long len)
50458+{
50459+ void *ret = NULL;
50460+
50461+ if (!len || len > PAGE_SIZE)
50462+ goto out;
50463+
50464+ ret = kmalloc(len, GFP_KERNEL);
50465+
50466+ if (ret) {
50467+ if (alloc_push(ret)) {
50468+ kfree(ret);
50469+ ret = NULL;
50470+ }
50471+ }
50472+
50473+out:
50474+ return ret;
50475+}
50476+
50477+void *
50478+acl_alloc_num(unsigned long num, unsigned long len)
50479+{
50480+ if (!len || (num > (PAGE_SIZE / len)))
50481+ return NULL;
50482+
50483+ return acl_alloc(num * len);
50484+}
50485+
50486+void
50487+acl_free_all(void)
50488+{
50489+ if (gr_acl_is_enabled() || !alloc_stack)
50490+ return;
50491+
50492+ while (alloc_pop()) ;
50493+
50494+ if (alloc_stack) {
50495+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
50496+ kfree(alloc_stack);
50497+ else
50498+ vfree(alloc_stack);
50499+ }
50500+
50501+ alloc_stack = NULL;
50502+ alloc_stack_size = 1;
50503+ alloc_stack_next = 1;
50504+
50505+ return;
50506+}
50507+
50508+int
50509+acl_alloc_stack_init(unsigned long size)
50510+{
50511+ if ((size * sizeof (void *)) <= PAGE_SIZE)
50512+ alloc_stack =
50513+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
50514+ else
50515+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
50516+
50517+ alloc_stack_size = size;
50518+
50519+ if (!alloc_stack)
50520+ return 0;
50521+ else
50522+ return 1;
50523+}
50524diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
50525--- linux-2.6.32.46/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
50526+++ linux-2.6.32.46/grsecurity/gracl.c 2011-07-14 20:02:48.000000000 -0400
50527@@ -0,0 +1,4082 @@
50528+#include <linux/kernel.h>
50529+#include <linux/module.h>
50530+#include <linux/sched.h>
50531+#include <linux/mm.h>
50532+#include <linux/file.h>
50533+#include <linux/fs.h>
50534+#include <linux/namei.h>
50535+#include <linux/mount.h>
50536+#include <linux/tty.h>
50537+#include <linux/proc_fs.h>
50538+#include <linux/smp_lock.h>
50539+#include <linux/slab.h>
50540+#include <linux/vmalloc.h>
50541+#include <linux/types.h>
50542+#include <linux/sysctl.h>
50543+#include <linux/netdevice.h>
50544+#include <linux/ptrace.h>
50545+#include <linux/gracl.h>
50546+#include <linux/gralloc.h>
50547+#include <linux/grsecurity.h>
50548+#include <linux/grinternal.h>
50549+#include <linux/pid_namespace.h>
50550+#include <linux/fdtable.h>
50551+#include <linux/percpu.h>
50552+
50553+#include <asm/uaccess.h>
50554+#include <asm/errno.h>
50555+#include <asm/mman.h>
50556+
50557+static struct acl_role_db acl_role_set;
50558+static struct name_db name_set;
50559+static struct inodev_db inodev_set;
50560+
50561+/* for keeping track of userspace pointers used for subjects, so we
50562+ can share references in the kernel as well
50563+*/
50564+
50565+static struct dentry *real_root;
50566+static struct vfsmount *real_root_mnt;
50567+
50568+static struct acl_subj_map_db subj_map_set;
50569+
50570+static struct acl_role_label *default_role;
50571+
50572+static struct acl_role_label *role_list;
50573+
50574+static u16 acl_sp_role_value;
50575+
50576+extern char *gr_shared_page[4];
50577+static DEFINE_MUTEX(gr_dev_mutex);
50578+DEFINE_RWLOCK(gr_inode_lock);
50579+
50580+struct gr_arg *gr_usermode;
50581+
50582+static unsigned int gr_status __read_only = GR_STATUS_INIT;
50583+
50584+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
50585+extern void gr_clear_learn_entries(void);
50586+
50587+#ifdef CONFIG_GRKERNSEC_RESLOG
50588+extern void gr_log_resource(const struct task_struct *task,
50589+ const int res, const unsigned long wanted, const int gt);
50590+#endif
50591+
50592+unsigned char *gr_system_salt;
50593+unsigned char *gr_system_sum;
50594+
50595+static struct sprole_pw **acl_special_roles = NULL;
50596+static __u16 num_sprole_pws = 0;
50597+
50598+static struct acl_role_label *kernel_role = NULL;
50599+
50600+static unsigned int gr_auth_attempts = 0;
50601+static unsigned long gr_auth_expires = 0UL;
50602+
50603+#ifdef CONFIG_NET
50604+extern struct vfsmount *sock_mnt;
50605+#endif
50606+extern struct vfsmount *pipe_mnt;
50607+extern struct vfsmount *shm_mnt;
50608+#ifdef CONFIG_HUGETLBFS
50609+extern struct vfsmount *hugetlbfs_vfsmount;
50610+#endif
50611+
50612+static struct acl_object_label *fakefs_obj_rw;
50613+static struct acl_object_label *fakefs_obj_rwx;
50614+
50615+extern int gr_init_uidset(void);
50616+extern void gr_free_uidset(void);
50617+extern void gr_remove_uid(uid_t uid);
50618+extern int gr_find_uid(uid_t uid);
50619+
50620+__inline__ int
50621+gr_acl_is_enabled(void)
50622+{
50623+ return (gr_status & GR_READY);
50624+}
50625+
50626+#ifdef CONFIG_BTRFS_FS
50627+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
50628+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
50629+#endif
50630+
50631+static inline dev_t __get_dev(const struct dentry *dentry)
50632+{
50633+#ifdef CONFIG_BTRFS_FS
50634+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
50635+ return get_btrfs_dev_from_inode(dentry->d_inode);
50636+ else
50637+#endif
50638+ return dentry->d_inode->i_sb->s_dev;
50639+}
50640+
50641+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
50642+{
50643+ return __get_dev(dentry);
50644+}
50645+
50646+static char gr_task_roletype_to_char(struct task_struct *task)
50647+{
50648+ switch (task->role->roletype &
50649+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
50650+ GR_ROLE_SPECIAL)) {
50651+ case GR_ROLE_DEFAULT:
50652+ return 'D';
50653+ case GR_ROLE_USER:
50654+ return 'U';
50655+ case GR_ROLE_GROUP:
50656+ return 'G';
50657+ case GR_ROLE_SPECIAL:
50658+ return 'S';
50659+ }
50660+
50661+ return 'X';
50662+}
50663+
50664+char gr_roletype_to_char(void)
50665+{
50666+ return gr_task_roletype_to_char(current);
50667+}
50668+
50669+__inline__ int
50670+gr_acl_tpe_check(void)
50671+{
50672+ if (unlikely(!(gr_status & GR_READY)))
50673+ return 0;
50674+ if (current->role->roletype & GR_ROLE_TPE)
50675+ return 1;
50676+ else
50677+ return 0;
50678+}
50679+
50680+int
50681+gr_handle_rawio(const struct inode *inode)
50682+{
50683+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
50684+ if (inode && S_ISBLK(inode->i_mode) &&
50685+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
50686+ !capable(CAP_SYS_RAWIO))
50687+ return 1;
50688+#endif
50689+ return 0;
50690+}
50691+
50692+static int
50693+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
50694+{
50695+ if (likely(lena != lenb))
50696+ return 0;
50697+
50698+ return !memcmp(a, b, lena);
50699+}
50700+
50701+/* this must be called with vfsmount_lock and dcache_lock held */
50702+
50703+static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
50704+ struct dentry *root, struct vfsmount *rootmnt,
50705+ char *buffer, int buflen)
50706+{
50707+ char * end = buffer+buflen;
50708+ char * retval;
50709+ int namelen;
50710+
50711+ *--end = '\0';
50712+ buflen--;
50713+
50714+ if (buflen < 1)
50715+ goto Elong;
50716+ /* Get '/' right */
50717+ retval = end-1;
50718+ *retval = '/';
50719+
50720+ for (;;) {
50721+ struct dentry * parent;
50722+
50723+ if (dentry == root && vfsmnt == rootmnt)
50724+ break;
50725+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
50726+ /* Global root? */
50727+ if (vfsmnt->mnt_parent == vfsmnt)
50728+ goto global_root;
50729+ dentry = vfsmnt->mnt_mountpoint;
50730+ vfsmnt = vfsmnt->mnt_parent;
50731+ continue;
50732+ }
50733+ parent = dentry->d_parent;
50734+ prefetch(parent);
50735+ namelen = dentry->d_name.len;
50736+ buflen -= namelen + 1;
50737+ if (buflen < 0)
50738+ goto Elong;
50739+ end -= namelen;
50740+ memcpy(end, dentry->d_name.name, namelen);
50741+ *--end = '/';
50742+ retval = end;
50743+ dentry = parent;
50744+ }
50745+
50746+out:
50747+ return retval;
50748+
50749+global_root:
50750+ namelen = dentry->d_name.len;
50751+ buflen -= namelen;
50752+ if (buflen < 0)
50753+ goto Elong;
50754+ retval -= namelen-1; /* hit the slash */
50755+ memcpy(retval, dentry->d_name.name, namelen);
50756+ goto out;
50757+Elong:
50758+ retval = ERR_PTR(-ENAMETOOLONG);
50759+ goto out;
50760+}
50761+
50762+static char *
50763+gen_full_path(struct dentry *dentry, struct vfsmount *vfsmnt,
50764+ struct dentry *root, struct vfsmount *rootmnt, char *buf, int buflen)
50765+{
50766+ char *retval;
50767+
50768+ retval = __our_d_path(dentry, vfsmnt, root, rootmnt, buf, buflen);
50769+ if (unlikely(IS_ERR(retval)))
50770+ retval = strcpy(buf, "<path too long>");
50771+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
50772+ retval[1] = '\0';
50773+
50774+ return retval;
50775+}
50776+
50777+static char *
50778+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
50779+ char *buf, int buflen)
50780+{
50781+ char *res;
50782+
50783+ /* we can use real_root, real_root_mnt, because this is only called
50784+ by the RBAC system */
50785+ res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, real_root, real_root_mnt, buf, buflen);
50786+
50787+ return res;
50788+}
50789+
50790+static char *
50791+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
50792+ char *buf, int buflen)
50793+{
50794+ char *res;
50795+ struct dentry *root;
50796+ struct vfsmount *rootmnt;
50797+ struct task_struct *reaper = &init_task;
50798+
50799+ /* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
50800+ read_lock(&reaper->fs->lock);
50801+ root = dget(reaper->fs->root.dentry);
50802+ rootmnt = mntget(reaper->fs->root.mnt);
50803+ read_unlock(&reaper->fs->lock);
50804+
50805+ spin_lock(&dcache_lock);
50806+ spin_lock(&vfsmount_lock);
50807+ res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
50808+ spin_unlock(&vfsmount_lock);
50809+ spin_unlock(&dcache_lock);
50810+
50811+ dput(root);
50812+ mntput(rootmnt);
50813+ return res;
50814+}
50815+
50816+static char *
50817+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
50818+{
50819+ char *ret;
50820+ spin_lock(&dcache_lock);
50821+ spin_lock(&vfsmount_lock);
50822+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
50823+ PAGE_SIZE);
50824+ spin_unlock(&vfsmount_lock);
50825+ spin_unlock(&dcache_lock);
50826+ return ret;
50827+}
50828+
50829+char *
50830+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
50831+{
50832+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
50833+ PAGE_SIZE);
50834+}
50835+
50836+char *
50837+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
50838+{
50839+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
50840+ PAGE_SIZE);
50841+}
50842+
50843+char *
50844+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
50845+{
50846+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
50847+ PAGE_SIZE);
50848+}
50849+
50850+char *
50851+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
50852+{
50853+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
50854+ PAGE_SIZE);
50855+}
50856+
50857+char *
50858+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
50859+{
50860+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
50861+ PAGE_SIZE);
50862+}
50863+
50864+__inline__ __u32
50865+to_gr_audit(const __u32 reqmode)
50866+{
50867+ /* masks off auditable permission flags, then shifts them to create
50868+ auditing flags, and adds the special case of append auditing if
50869+ we're requesting write */
50870+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
50871+}
50872+
50873+struct acl_subject_label *
50874+lookup_subject_map(const struct acl_subject_label *userp)
50875+{
50876+ unsigned int index = shash(userp, subj_map_set.s_size);
50877+ struct subject_map *match;
50878+
50879+ match = subj_map_set.s_hash[index];
50880+
50881+ while (match && match->user != userp)
50882+ match = match->next;
50883+
50884+ if (match != NULL)
50885+ return match->kernel;
50886+ else
50887+ return NULL;
50888+}
50889+
50890+static void
50891+insert_subj_map_entry(struct subject_map *subjmap)
50892+{
50893+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
50894+ struct subject_map **curr;
50895+
50896+ subjmap->prev = NULL;
50897+
50898+ curr = &subj_map_set.s_hash[index];
50899+ if (*curr != NULL)
50900+ (*curr)->prev = subjmap;
50901+
50902+ subjmap->next = *curr;
50903+ *curr = subjmap;
50904+
50905+ return;
50906+}
50907+
50908+static struct acl_role_label *
50909+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
50910+ const gid_t gid)
50911+{
50912+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
50913+ struct acl_role_label *match;
50914+ struct role_allowed_ip *ipp;
50915+ unsigned int x;
50916+ u32 curr_ip = task->signal->curr_ip;
50917+
50918+ task->signal->saved_ip = curr_ip;
50919+
50920+ match = acl_role_set.r_hash[index];
50921+
50922+ while (match) {
50923+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
50924+ for (x = 0; x < match->domain_child_num; x++) {
50925+ if (match->domain_children[x] == uid)
50926+ goto found;
50927+ }
50928+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
50929+ break;
50930+ match = match->next;
50931+ }
50932+found:
50933+ if (match == NULL) {
50934+ try_group:
50935+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
50936+ match = acl_role_set.r_hash[index];
50937+
50938+ while (match) {
50939+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
50940+ for (x = 0; x < match->domain_child_num; x++) {
50941+ if (match->domain_children[x] == gid)
50942+ goto found2;
50943+ }
50944+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
50945+ break;
50946+ match = match->next;
50947+ }
50948+found2:
50949+ if (match == NULL)
50950+ match = default_role;
50951+ if (match->allowed_ips == NULL)
50952+ return match;
50953+ else {
50954+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
50955+ if (likely
50956+ ((ntohl(curr_ip) & ipp->netmask) ==
50957+ (ntohl(ipp->addr) & ipp->netmask)))
50958+ return match;
50959+ }
50960+ match = default_role;
50961+ }
50962+ } else if (match->allowed_ips == NULL) {
50963+ return match;
50964+ } else {
50965+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
50966+ if (likely
50967+ ((ntohl(curr_ip) & ipp->netmask) ==
50968+ (ntohl(ipp->addr) & ipp->netmask)))
50969+ return match;
50970+ }
50971+ goto try_group;
50972+ }
50973+
50974+ return match;
50975+}
50976+
50977+struct acl_subject_label *
50978+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
50979+ const struct acl_role_label *role)
50980+{
50981+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
50982+ struct acl_subject_label *match;
50983+
50984+ match = role->subj_hash[index];
50985+
50986+ while (match && (match->inode != ino || match->device != dev ||
50987+ (match->mode & GR_DELETED))) {
50988+ match = match->next;
50989+ }
50990+
50991+ if (match && !(match->mode & GR_DELETED))
50992+ return match;
50993+ else
50994+ return NULL;
50995+}
50996+
50997+struct acl_subject_label *
50998+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
50999+ const struct acl_role_label *role)
51000+{
51001+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51002+ struct acl_subject_label *match;
51003+
51004+ match = role->subj_hash[index];
51005+
51006+ while (match && (match->inode != ino || match->device != dev ||
51007+ !(match->mode & GR_DELETED))) {
51008+ match = match->next;
51009+ }
51010+
51011+ if (match && (match->mode & GR_DELETED))
51012+ return match;
51013+ else
51014+ return NULL;
51015+}
51016+
51017+static struct acl_object_label *
51018+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
51019+ const struct acl_subject_label *subj)
51020+{
51021+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51022+ struct acl_object_label *match;
51023+
51024+ match = subj->obj_hash[index];
51025+
51026+ while (match && (match->inode != ino || match->device != dev ||
51027+ (match->mode & GR_DELETED))) {
51028+ match = match->next;
51029+ }
51030+
51031+ if (match && !(match->mode & GR_DELETED))
51032+ return match;
51033+ else
51034+ return NULL;
51035+}
51036+
51037+static struct acl_object_label *
51038+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
51039+ const struct acl_subject_label *subj)
51040+{
51041+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51042+ struct acl_object_label *match;
51043+
51044+ match = subj->obj_hash[index];
51045+
51046+ while (match && (match->inode != ino || match->device != dev ||
51047+ !(match->mode & GR_DELETED))) {
51048+ match = match->next;
51049+ }
51050+
51051+ if (match && (match->mode & GR_DELETED))
51052+ return match;
51053+
51054+ match = subj->obj_hash[index];
51055+
51056+ while (match && (match->inode != ino || match->device != dev ||
51057+ (match->mode & GR_DELETED))) {
51058+ match = match->next;
51059+ }
51060+
51061+ if (match && !(match->mode & GR_DELETED))
51062+ return match;
51063+ else
51064+ return NULL;
51065+}
51066+
51067+static struct name_entry *
51068+lookup_name_entry(const char *name)
51069+{
51070+ unsigned int len = strlen(name);
51071+ unsigned int key = full_name_hash(name, len);
51072+ unsigned int index = key % name_set.n_size;
51073+ struct name_entry *match;
51074+
51075+ match = name_set.n_hash[index];
51076+
51077+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
51078+ match = match->next;
51079+
51080+ return match;
51081+}
51082+
51083+static struct name_entry *
51084+lookup_name_entry_create(const char *name)
51085+{
51086+ unsigned int len = strlen(name);
51087+ unsigned int key = full_name_hash(name, len);
51088+ unsigned int index = key % name_set.n_size;
51089+ struct name_entry *match;
51090+
51091+ match = name_set.n_hash[index];
51092+
51093+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51094+ !match->deleted))
51095+ match = match->next;
51096+
51097+ if (match && match->deleted)
51098+ return match;
51099+
51100+ match = name_set.n_hash[index];
51101+
51102+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51103+ match->deleted))
51104+ match = match->next;
51105+
51106+ if (match && !match->deleted)
51107+ return match;
51108+ else
51109+ return NULL;
51110+}
51111+
51112+static struct inodev_entry *
51113+lookup_inodev_entry(const ino_t ino, const dev_t dev)
51114+{
51115+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
51116+ struct inodev_entry *match;
51117+
51118+ match = inodev_set.i_hash[index];
51119+
51120+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
51121+ match = match->next;
51122+
51123+ return match;
51124+}
51125+
51126+static void
51127+insert_inodev_entry(struct inodev_entry *entry)
51128+{
51129+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
51130+ inodev_set.i_size);
51131+ struct inodev_entry **curr;
51132+
51133+ entry->prev = NULL;
51134+
51135+ curr = &inodev_set.i_hash[index];
51136+ if (*curr != NULL)
51137+ (*curr)->prev = entry;
51138+
51139+ entry->next = *curr;
51140+ *curr = entry;
51141+
51142+ return;
51143+}
51144+
51145+static void
51146+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
51147+{
51148+ unsigned int index =
51149+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
51150+ struct acl_role_label **curr;
51151+ struct acl_role_label *tmp;
51152+
51153+ curr = &acl_role_set.r_hash[index];
51154+
51155+ /* if role was already inserted due to domains and already has
51156+ a role in the same bucket as it attached, then we need to
51157+ combine these two buckets
51158+ */
51159+ if (role->next) {
51160+ tmp = role->next;
51161+ while (tmp->next)
51162+ tmp = tmp->next;
51163+ tmp->next = *curr;
51164+ } else
51165+ role->next = *curr;
51166+ *curr = role;
51167+
51168+ return;
51169+}
51170+
51171+static void
51172+insert_acl_role_label(struct acl_role_label *role)
51173+{
51174+ int i;
51175+
51176+ if (role_list == NULL) {
51177+ role_list = role;
51178+ role->prev = NULL;
51179+ } else {
51180+ role->prev = role_list;
51181+ role_list = role;
51182+ }
51183+
51184+ /* used for hash chains */
51185+ role->next = NULL;
51186+
51187+ if (role->roletype & GR_ROLE_DOMAIN) {
51188+ for (i = 0; i < role->domain_child_num; i++)
51189+ __insert_acl_role_label(role, role->domain_children[i]);
51190+ } else
51191+ __insert_acl_role_label(role, role->uidgid);
51192+}
51193+
51194+static int
51195+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
51196+{
51197+ struct name_entry **curr, *nentry;
51198+ struct inodev_entry *ientry;
51199+ unsigned int len = strlen(name);
51200+ unsigned int key = full_name_hash(name, len);
51201+ unsigned int index = key % name_set.n_size;
51202+
51203+ curr = &name_set.n_hash[index];
51204+
51205+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
51206+ curr = &((*curr)->next);
51207+
51208+ if (*curr != NULL)
51209+ return 1;
51210+
51211+ nentry = acl_alloc(sizeof (struct name_entry));
51212+ if (nentry == NULL)
51213+ return 0;
51214+ ientry = acl_alloc(sizeof (struct inodev_entry));
51215+ if (ientry == NULL)
51216+ return 0;
51217+ ientry->nentry = nentry;
51218+
51219+ nentry->key = key;
51220+ nentry->name = name;
51221+ nentry->inode = inode;
51222+ nentry->device = device;
51223+ nentry->len = len;
51224+ nentry->deleted = deleted;
51225+
51226+ nentry->prev = NULL;
51227+ curr = &name_set.n_hash[index];
51228+ if (*curr != NULL)
51229+ (*curr)->prev = nentry;
51230+ nentry->next = *curr;
51231+ *curr = nentry;
51232+
51233+ /* insert us into the table searchable by inode/dev */
51234+ insert_inodev_entry(ientry);
51235+
51236+ return 1;
51237+}
51238+
51239+static void
51240+insert_acl_obj_label(struct acl_object_label *obj,
51241+ struct acl_subject_label *subj)
51242+{
51243+ unsigned int index =
51244+ fhash(obj->inode, obj->device, subj->obj_hash_size);
51245+ struct acl_object_label **curr;
51246+
51247+
51248+ obj->prev = NULL;
51249+
51250+ curr = &subj->obj_hash[index];
51251+ if (*curr != NULL)
51252+ (*curr)->prev = obj;
51253+
51254+ obj->next = *curr;
51255+ *curr = obj;
51256+
51257+ return;
51258+}
51259+
51260+static void
51261+insert_acl_subj_label(struct acl_subject_label *obj,
51262+ struct acl_role_label *role)
51263+{
51264+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
51265+ struct acl_subject_label **curr;
51266+
51267+ obj->prev = NULL;
51268+
51269+ curr = &role->subj_hash[index];
51270+ if (*curr != NULL)
51271+ (*curr)->prev = obj;
51272+
51273+ obj->next = *curr;
51274+ *curr = obj;
51275+
51276+ return;
51277+}
51278+
51279+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
51280+
51281+static void *
51282+create_table(__u32 * len, int elementsize)
51283+{
51284+ unsigned int table_sizes[] = {
51285+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
51286+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
51287+ 4194301, 8388593, 16777213, 33554393, 67108859
51288+ };
51289+ void *newtable = NULL;
51290+ unsigned int pwr = 0;
51291+
51292+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
51293+ table_sizes[pwr] <= *len)
51294+ pwr++;
51295+
51296+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
51297+ return newtable;
51298+
51299+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
51300+ newtable =
51301+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
51302+ else
51303+ newtable = vmalloc(table_sizes[pwr] * elementsize);
51304+
51305+ *len = table_sizes[pwr];
51306+
51307+ return newtable;
51308+}
51309+
51310+static int
51311+init_variables(const struct gr_arg *arg)
51312+{
51313+ struct task_struct *reaper = &init_task;
51314+ unsigned int stacksize;
51315+
51316+ subj_map_set.s_size = arg->role_db.num_subjects;
51317+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
51318+ name_set.n_size = arg->role_db.num_objects;
51319+ inodev_set.i_size = arg->role_db.num_objects;
51320+
51321+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
51322+ !name_set.n_size || !inodev_set.i_size)
51323+ return 1;
51324+
51325+ if (!gr_init_uidset())
51326+ return 1;
51327+
51328+ /* set up the stack that holds allocation info */
51329+
51330+ stacksize = arg->role_db.num_pointers + 5;
51331+
51332+ if (!acl_alloc_stack_init(stacksize))
51333+ return 1;
51334+
51335+ /* grab reference for the real root dentry and vfsmount */
51336+ read_lock(&reaper->fs->lock);
51337+ real_root = dget(reaper->fs->root.dentry);
51338+ real_root_mnt = mntget(reaper->fs->root.mnt);
51339+ read_unlock(&reaper->fs->lock);
51340+
51341+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51342+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root), real_root->d_inode->i_ino);
51343+#endif
51344+
51345+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
51346+ if (fakefs_obj_rw == NULL)
51347+ return 1;
51348+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
51349+
51350+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
51351+ if (fakefs_obj_rwx == NULL)
51352+ return 1;
51353+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
51354+
51355+ subj_map_set.s_hash =
51356+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
51357+ acl_role_set.r_hash =
51358+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
51359+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
51360+ inodev_set.i_hash =
51361+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
51362+
51363+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
51364+ !name_set.n_hash || !inodev_set.i_hash)
51365+ return 1;
51366+
51367+ memset(subj_map_set.s_hash, 0,
51368+ sizeof(struct subject_map *) * subj_map_set.s_size);
51369+ memset(acl_role_set.r_hash, 0,
51370+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
51371+ memset(name_set.n_hash, 0,
51372+ sizeof (struct name_entry *) * name_set.n_size);
51373+ memset(inodev_set.i_hash, 0,
51374+ sizeof (struct inodev_entry *) * inodev_set.i_size);
51375+
51376+ return 0;
51377+}
51378+
51379+/* free information not needed after startup
51380+ currently contains user->kernel pointer mappings for subjects
51381+*/
51382+
51383+static void
51384+free_init_variables(void)
51385+{
51386+ __u32 i;
51387+
51388+ if (subj_map_set.s_hash) {
51389+ for (i = 0; i < subj_map_set.s_size; i++) {
51390+ if (subj_map_set.s_hash[i]) {
51391+ kfree(subj_map_set.s_hash[i]);
51392+ subj_map_set.s_hash[i] = NULL;
51393+ }
51394+ }
51395+
51396+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
51397+ PAGE_SIZE)
51398+ kfree(subj_map_set.s_hash);
51399+ else
51400+ vfree(subj_map_set.s_hash);
51401+ }
51402+
51403+ return;
51404+}
51405+
51406+static void
51407+free_variables(void)
51408+{
51409+ struct acl_subject_label *s;
51410+ struct acl_role_label *r;
51411+ struct task_struct *task, *task2;
51412+ unsigned int x;
51413+
51414+ gr_clear_learn_entries();
51415+
51416+ read_lock(&tasklist_lock);
51417+ do_each_thread(task2, task) {
51418+ task->acl_sp_role = 0;
51419+ task->acl_role_id = 0;
51420+ task->acl = NULL;
51421+ task->role = NULL;
51422+ } while_each_thread(task2, task);
51423+ read_unlock(&tasklist_lock);
51424+
51425+ /* release the reference to the real root dentry and vfsmount */
51426+ if (real_root)
51427+ dput(real_root);
51428+ real_root = NULL;
51429+ if (real_root_mnt)
51430+ mntput(real_root_mnt);
51431+ real_root_mnt = NULL;
51432+
51433+ /* free all object hash tables */
51434+
51435+ FOR_EACH_ROLE_START(r)
51436+ if (r->subj_hash == NULL)
51437+ goto next_role;
51438+ FOR_EACH_SUBJECT_START(r, s, x)
51439+ if (s->obj_hash == NULL)
51440+ break;
51441+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51442+ kfree(s->obj_hash);
51443+ else
51444+ vfree(s->obj_hash);
51445+ FOR_EACH_SUBJECT_END(s, x)
51446+ FOR_EACH_NESTED_SUBJECT_START(r, s)
51447+ if (s->obj_hash == NULL)
51448+ break;
51449+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51450+ kfree(s->obj_hash);
51451+ else
51452+ vfree(s->obj_hash);
51453+ FOR_EACH_NESTED_SUBJECT_END(s)
51454+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
51455+ kfree(r->subj_hash);
51456+ else
51457+ vfree(r->subj_hash);
51458+ r->subj_hash = NULL;
51459+next_role:
51460+ FOR_EACH_ROLE_END(r)
51461+
51462+ acl_free_all();
51463+
51464+ if (acl_role_set.r_hash) {
51465+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
51466+ PAGE_SIZE)
51467+ kfree(acl_role_set.r_hash);
51468+ else
51469+ vfree(acl_role_set.r_hash);
51470+ }
51471+ if (name_set.n_hash) {
51472+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
51473+ PAGE_SIZE)
51474+ kfree(name_set.n_hash);
51475+ else
51476+ vfree(name_set.n_hash);
51477+ }
51478+
51479+ if (inodev_set.i_hash) {
51480+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
51481+ PAGE_SIZE)
51482+ kfree(inodev_set.i_hash);
51483+ else
51484+ vfree(inodev_set.i_hash);
51485+ }
51486+
51487+ gr_free_uidset();
51488+
51489+ memset(&name_set, 0, sizeof (struct name_db));
51490+ memset(&inodev_set, 0, sizeof (struct inodev_db));
51491+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
51492+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
51493+
51494+ default_role = NULL;
51495+ role_list = NULL;
51496+
51497+ return;
51498+}
51499+
51500+static __u32
51501+count_user_objs(struct acl_object_label *userp)
51502+{
51503+ struct acl_object_label o_tmp;
51504+ __u32 num = 0;
51505+
51506+ while (userp) {
51507+ if (copy_from_user(&o_tmp, userp,
51508+ sizeof (struct acl_object_label)))
51509+ break;
51510+
51511+ userp = o_tmp.prev;
51512+ num++;
51513+ }
51514+
51515+ return num;
51516+}
51517+
51518+static struct acl_subject_label *
51519+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
51520+
51521+static int
51522+copy_user_glob(struct acl_object_label *obj)
51523+{
51524+ struct acl_object_label *g_tmp, **guser;
51525+ unsigned int len;
51526+ char *tmp;
51527+
51528+ if (obj->globbed == NULL)
51529+ return 0;
51530+
51531+ guser = &obj->globbed;
51532+ while (*guser) {
51533+ g_tmp = (struct acl_object_label *)
51534+ acl_alloc(sizeof (struct acl_object_label));
51535+ if (g_tmp == NULL)
51536+ return -ENOMEM;
51537+
51538+ if (copy_from_user(g_tmp, *guser,
51539+ sizeof (struct acl_object_label)))
51540+ return -EFAULT;
51541+
51542+ len = strnlen_user(g_tmp->filename, PATH_MAX);
51543+
51544+ if (!len || len >= PATH_MAX)
51545+ return -EINVAL;
51546+
51547+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51548+ return -ENOMEM;
51549+
51550+ if (copy_from_user(tmp, g_tmp->filename, len))
51551+ return -EFAULT;
51552+ tmp[len-1] = '\0';
51553+ g_tmp->filename = tmp;
51554+
51555+ *guser = g_tmp;
51556+ guser = &(g_tmp->next);
51557+ }
51558+
51559+ return 0;
51560+}
51561+
51562+static int
51563+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
51564+ struct acl_role_label *role)
51565+{
51566+ struct acl_object_label *o_tmp;
51567+ unsigned int len;
51568+ int ret;
51569+ char *tmp;
51570+
51571+ while (userp) {
51572+ if ((o_tmp = (struct acl_object_label *)
51573+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
51574+ return -ENOMEM;
51575+
51576+ if (copy_from_user(o_tmp, userp,
51577+ sizeof (struct acl_object_label)))
51578+ return -EFAULT;
51579+
51580+ userp = o_tmp->prev;
51581+
51582+ len = strnlen_user(o_tmp->filename, PATH_MAX);
51583+
51584+ if (!len || len >= PATH_MAX)
51585+ return -EINVAL;
51586+
51587+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51588+ return -ENOMEM;
51589+
51590+ if (copy_from_user(tmp, o_tmp->filename, len))
51591+ return -EFAULT;
51592+ tmp[len-1] = '\0';
51593+ o_tmp->filename = tmp;
51594+
51595+ insert_acl_obj_label(o_tmp, subj);
51596+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
51597+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
51598+ return -ENOMEM;
51599+
51600+ ret = copy_user_glob(o_tmp);
51601+ if (ret)
51602+ return ret;
51603+
51604+ if (o_tmp->nested) {
51605+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
51606+ if (IS_ERR(o_tmp->nested))
51607+ return PTR_ERR(o_tmp->nested);
51608+
51609+ /* insert into nested subject list */
51610+ o_tmp->nested->next = role->hash->first;
51611+ role->hash->first = o_tmp->nested;
51612+ }
51613+ }
51614+
51615+ return 0;
51616+}
51617+
51618+static __u32
51619+count_user_subjs(struct acl_subject_label *userp)
51620+{
51621+ struct acl_subject_label s_tmp;
51622+ __u32 num = 0;
51623+
51624+ while (userp) {
51625+ if (copy_from_user(&s_tmp, userp,
51626+ sizeof (struct acl_subject_label)))
51627+ break;
51628+
51629+ userp = s_tmp.prev;
51630+ /* do not count nested subjects against this count, since
51631+ they are not included in the hash table, but are
51632+ attached to objects. We have already counted
51633+ the subjects in userspace for the allocation
51634+ stack
51635+ */
51636+ if (!(s_tmp.mode & GR_NESTED))
51637+ num++;
51638+ }
51639+
51640+ return num;
51641+}
51642+
51643+static int
51644+copy_user_allowedips(struct acl_role_label *rolep)
51645+{
51646+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
51647+
51648+ ruserip = rolep->allowed_ips;
51649+
51650+ while (ruserip) {
51651+ rlast = rtmp;
51652+
51653+ if ((rtmp = (struct role_allowed_ip *)
51654+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
51655+ return -ENOMEM;
51656+
51657+ if (copy_from_user(rtmp, ruserip,
51658+ sizeof (struct role_allowed_ip)))
51659+ return -EFAULT;
51660+
51661+ ruserip = rtmp->prev;
51662+
51663+ if (!rlast) {
51664+ rtmp->prev = NULL;
51665+ rolep->allowed_ips = rtmp;
51666+ } else {
51667+ rlast->next = rtmp;
51668+ rtmp->prev = rlast;
51669+ }
51670+
51671+ if (!ruserip)
51672+ rtmp->next = NULL;
51673+ }
51674+
51675+ return 0;
51676+}
51677+
51678+static int
51679+copy_user_transitions(struct acl_role_label *rolep)
51680+{
51681+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
51682+
51683+ unsigned int len;
51684+ char *tmp;
51685+
51686+ rusertp = rolep->transitions;
51687+
51688+ while (rusertp) {
51689+ rlast = rtmp;
51690+
51691+ if ((rtmp = (struct role_transition *)
51692+ acl_alloc(sizeof (struct role_transition))) == NULL)
51693+ return -ENOMEM;
51694+
51695+ if (copy_from_user(rtmp, rusertp,
51696+ sizeof (struct role_transition)))
51697+ return -EFAULT;
51698+
51699+ rusertp = rtmp->prev;
51700+
51701+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
51702+
51703+ if (!len || len >= GR_SPROLE_LEN)
51704+ return -EINVAL;
51705+
51706+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51707+ return -ENOMEM;
51708+
51709+ if (copy_from_user(tmp, rtmp->rolename, len))
51710+ return -EFAULT;
51711+ tmp[len-1] = '\0';
51712+ rtmp->rolename = tmp;
51713+
51714+ if (!rlast) {
51715+ rtmp->prev = NULL;
51716+ rolep->transitions = rtmp;
51717+ } else {
51718+ rlast->next = rtmp;
51719+ rtmp->prev = rlast;
51720+ }
51721+
51722+ if (!rusertp)
51723+ rtmp->next = NULL;
51724+ }
51725+
51726+ return 0;
51727+}
51728+
51729+static struct acl_subject_label *
51730+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
51731+{
51732+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
51733+ unsigned int len;
51734+ char *tmp;
51735+ __u32 num_objs;
51736+ struct acl_ip_label **i_tmp, *i_utmp2;
51737+ struct gr_hash_struct ghash;
51738+ struct subject_map *subjmap;
51739+ unsigned int i_num;
51740+ int err;
51741+
51742+ s_tmp = lookup_subject_map(userp);
51743+
51744+ /* we've already copied this subject into the kernel, just return
51745+ the reference to it, and don't copy it over again
51746+ */
51747+ if (s_tmp)
51748+ return(s_tmp);
51749+
51750+ if ((s_tmp = (struct acl_subject_label *)
51751+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
51752+ return ERR_PTR(-ENOMEM);
51753+
51754+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
51755+ if (subjmap == NULL)
51756+ return ERR_PTR(-ENOMEM);
51757+
51758+ subjmap->user = userp;
51759+ subjmap->kernel = s_tmp;
51760+ insert_subj_map_entry(subjmap);
51761+
51762+ if (copy_from_user(s_tmp, userp,
51763+ sizeof (struct acl_subject_label)))
51764+ return ERR_PTR(-EFAULT);
51765+
51766+ len = strnlen_user(s_tmp->filename, PATH_MAX);
51767+
51768+ if (!len || len >= PATH_MAX)
51769+ return ERR_PTR(-EINVAL);
51770+
51771+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51772+ return ERR_PTR(-ENOMEM);
51773+
51774+ if (copy_from_user(tmp, s_tmp->filename, len))
51775+ return ERR_PTR(-EFAULT);
51776+ tmp[len-1] = '\0';
51777+ s_tmp->filename = tmp;
51778+
51779+ if (!strcmp(s_tmp->filename, "/"))
51780+ role->root_label = s_tmp;
51781+
51782+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
51783+ return ERR_PTR(-EFAULT);
51784+
51785+ /* copy user and group transition tables */
51786+
51787+ if (s_tmp->user_trans_num) {
51788+ uid_t *uidlist;
51789+
51790+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
51791+ if (uidlist == NULL)
51792+ return ERR_PTR(-ENOMEM);
51793+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
51794+ return ERR_PTR(-EFAULT);
51795+
51796+ s_tmp->user_transitions = uidlist;
51797+ }
51798+
51799+ if (s_tmp->group_trans_num) {
51800+ gid_t *gidlist;
51801+
51802+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
51803+ if (gidlist == NULL)
51804+ return ERR_PTR(-ENOMEM);
51805+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
51806+ return ERR_PTR(-EFAULT);
51807+
51808+ s_tmp->group_transitions = gidlist;
51809+ }
51810+
51811+ /* set up object hash table */
51812+ num_objs = count_user_objs(ghash.first);
51813+
51814+ s_tmp->obj_hash_size = num_objs;
51815+ s_tmp->obj_hash =
51816+ (struct acl_object_label **)
51817+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
51818+
51819+ if (!s_tmp->obj_hash)
51820+ return ERR_PTR(-ENOMEM);
51821+
51822+ memset(s_tmp->obj_hash, 0,
51823+ s_tmp->obj_hash_size *
51824+ sizeof (struct acl_object_label *));
51825+
51826+ /* add in objects */
51827+ err = copy_user_objs(ghash.first, s_tmp, role);
51828+
51829+ if (err)
51830+ return ERR_PTR(err);
51831+
51832+ /* set pointer for parent subject */
51833+ if (s_tmp->parent_subject) {
51834+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
51835+
51836+ if (IS_ERR(s_tmp2))
51837+ return s_tmp2;
51838+
51839+ s_tmp->parent_subject = s_tmp2;
51840+ }
51841+
51842+ /* add in ip acls */
51843+
51844+ if (!s_tmp->ip_num) {
51845+ s_tmp->ips = NULL;
51846+ goto insert;
51847+ }
51848+
51849+ i_tmp =
51850+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
51851+ sizeof (struct acl_ip_label *));
51852+
51853+ if (!i_tmp)
51854+ return ERR_PTR(-ENOMEM);
51855+
51856+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
51857+ *(i_tmp + i_num) =
51858+ (struct acl_ip_label *)
51859+ acl_alloc(sizeof (struct acl_ip_label));
51860+ if (!*(i_tmp + i_num))
51861+ return ERR_PTR(-ENOMEM);
51862+
51863+ if (copy_from_user
51864+ (&i_utmp2, s_tmp->ips + i_num,
51865+ sizeof (struct acl_ip_label *)))
51866+ return ERR_PTR(-EFAULT);
51867+
51868+ if (copy_from_user
51869+ (*(i_tmp + i_num), i_utmp2,
51870+ sizeof (struct acl_ip_label)))
51871+ return ERR_PTR(-EFAULT);
51872+
51873+ if ((*(i_tmp + i_num))->iface == NULL)
51874+ continue;
51875+
51876+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
51877+ if (!len || len >= IFNAMSIZ)
51878+ return ERR_PTR(-EINVAL);
51879+ tmp = acl_alloc(len);
51880+ if (tmp == NULL)
51881+ return ERR_PTR(-ENOMEM);
51882+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
51883+ return ERR_PTR(-EFAULT);
51884+ (*(i_tmp + i_num))->iface = tmp;
51885+ }
51886+
51887+ s_tmp->ips = i_tmp;
51888+
51889+insert:
51890+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
51891+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
51892+ return ERR_PTR(-ENOMEM);
51893+
51894+ return s_tmp;
51895+}
51896+
51897+static int
51898+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
51899+{
51900+ struct acl_subject_label s_pre;
51901+ struct acl_subject_label * ret;
51902+ int err;
51903+
51904+ while (userp) {
51905+ if (copy_from_user(&s_pre, userp,
51906+ sizeof (struct acl_subject_label)))
51907+ return -EFAULT;
51908+
51909+ /* do not add nested subjects here, add
51910+ while parsing objects
51911+ */
51912+
51913+ if (s_pre.mode & GR_NESTED) {
51914+ userp = s_pre.prev;
51915+ continue;
51916+ }
51917+
51918+ ret = do_copy_user_subj(userp, role);
51919+
51920+ err = PTR_ERR(ret);
51921+ if (IS_ERR(ret))
51922+ return err;
51923+
51924+ insert_acl_subj_label(ret, role);
51925+
51926+ userp = s_pre.prev;
51927+ }
51928+
51929+ return 0;
51930+}
51931+
51932+static int
51933+copy_user_acl(struct gr_arg *arg)
51934+{
51935+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
51936+ struct sprole_pw *sptmp;
51937+ struct gr_hash_struct *ghash;
51938+ uid_t *domainlist;
51939+ unsigned int r_num;
51940+ unsigned int len;
51941+ char *tmp;
51942+ int err = 0;
51943+ __u16 i;
51944+ __u32 num_subjs;
51945+
51946+ /* we need a default and kernel role */
51947+ if (arg->role_db.num_roles < 2)
51948+ return -EINVAL;
51949+
51950+ /* copy special role authentication info from userspace */
51951+
51952+ num_sprole_pws = arg->num_sprole_pws;
51953+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
51954+
51955+ if (!acl_special_roles) {
51956+ err = -ENOMEM;
51957+ goto cleanup;
51958+ }
51959+
51960+ for (i = 0; i < num_sprole_pws; i++) {
51961+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
51962+ if (!sptmp) {
51963+ err = -ENOMEM;
51964+ goto cleanup;
51965+ }
51966+ if (copy_from_user(sptmp, arg->sprole_pws + i,
51967+ sizeof (struct sprole_pw))) {
51968+ err = -EFAULT;
51969+ goto cleanup;
51970+ }
51971+
51972+ len =
51973+ strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
51974+
51975+ if (!len || len >= GR_SPROLE_LEN) {
51976+ err = -EINVAL;
51977+ goto cleanup;
51978+ }
51979+
51980+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
51981+ err = -ENOMEM;
51982+ goto cleanup;
51983+ }
51984+
51985+ if (copy_from_user(tmp, sptmp->rolename, len)) {
51986+ err = -EFAULT;
51987+ goto cleanup;
51988+ }
51989+ tmp[len-1] = '\0';
51990+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51991+ printk(KERN_ALERT "Copying special role %s\n", tmp);
51992+#endif
51993+ sptmp->rolename = tmp;
51994+ acl_special_roles[i] = sptmp;
51995+ }
51996+
51997+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
51998+
51999+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
52000+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
52001+
52002+ if (!r_tmp) {
52003+ err = -ENOMEM;
52004+ goto cleanup;
52005+ }
52006+
52007+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
52008+ sizeof (struct acl_role_label *))) {
52009+ err = -EFAULT;
52010+ goto cleanup;
52011+ }
52012+
52013+ if (copy_from_user(r_tmp, r_utmp2,
52014+ sizeof (struct acl_role_label))) {
52015+ err = -EFAULT;
52016+ goto cleanup;
52017+ }
52018+
52019+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
52020+
52021+ if (!len || len >= PATH_MAX) {
52022+ err = -EINVAL;
52023+ goto cleanup;
52024+ }
52025+
52026+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
52027+ err = -ENOMEM;
52028+ goto cleanup;
52029+ }
52030+ if (copy_from_user(tmp, r_tmp->rolename, len)) {
52031+ err = -EFAULT;
52032+ goto cleanup;
52033+ }
52034+ tmp[len-1] = '\0';
52035+ r_tmp->rolename = tmp;
52036+
52037+ if (!strcmp(r_tmp->rolename, "default")
52038+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
52039+ default_role = r_tmp;
52040+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
52041+ kernel_role = r_tmp;
52042+ }
52043+
52044+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
52045+ err = -ENOMEM;
52046+ goto cleanup;
52047+ }
52048+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
52049+ err = -EFAULT;
52050+ goto cleanup;
52051+ }
52052+
52053+ r_tmp->hash = ghash;
52054+
52055+ num_subjs = count_user_subjs(r_tmp->hash->first);
52056+
52057+ r_tmp->subj_hash_size = num_subjs;
52058+ r_tmp->subj_hash =
52059+ (struct acl_subject_label **)
52060+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
52061+
52062+ if (!r_tmp->subj_hash) {
52063+ err = -ENOMEM;
52064+ goto cleanup;
52065+ }
52066+
52067+ err = copy_user_allowedips(r_tmp);
52068+ if (err)
52069+ goto cleanup;
52070+
52071+ /* copy domain info */
52072+ if (r_tmp->domain_children != NULL) {
52073+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
52074+ if (domainlist == NULL) {
52075+ err = -ENOMEM;
52076+ goto cleanup;
52077+ }
52078+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
52079+ err = -EFAULT;
52080+ goto cleanup;
52081+ }
52082+ r_tmp->domain_children = domainlist;
52083+ }
52084+
52085+ err = copy_user_transitions(r_tmp);
52086+ if (err)
52087+ goto cleanup;
52088+
52089+ memset(r_tmp->subj_hash, 0,
52090+ r_tmp->subj_hash_size *
52091+ sizeof (struct acl_subject_label *));
52092+
52093+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
52094+
52095+ if (err)
52096+ goto cleanup;
52097+
52098+ /* set nested subject list to null */
52099+ r_tmp->hash->first = NULL;
52100+
52101+ insert_acl_role_label(r_tmp);
52102+ }
52103+
52104+ goto return_err;
52105+ cleanup:
52106+ free_variables();
52107+ return_err:
52108+ return err;
52109+
52110+}
52111+
52112+static int
52113+gracl_init(struct gr_arg *args)
52114+{
52115+ int error = 0;
52116+
52117+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
52118+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
52119+
52120+ if (init_variables(args)) {
52121+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
52122+ error = -ENOMEM;
52123+ free_variables();
52124+ goto out;
52125+ }
52126+
52127+ error = copy_user_acl(args);
52128+ free_init_variables();
52129+ if (error) {
52130+ free_variables();
52131+ goto out;
52132+ }
52133+
52134+ if ((error = gr_set_acls(0))) {
52135+ free_variables();
52136+ goto out;
52137+ }
52138+
52139+ pax_open_kernel();
52140+ gr_status |= GR_READY;
52141+ pax_close_kernel();
52142+
52143+ out:
52144+ return error;
52145+}
52146+
52147+/* derived from glibc fnmatch() 0: match, 1: no match*/
52148+
52149+static int
52150+glob_match(const char *p, const char *n)
52151+{
52152+ char c;
52153+
52154+ while ((c = *p++) != '\0') {
52155+ switch (c) {
52156+ case '?':
52157+ if (*n == '\0')
52158+ return 1;
52159+ else if (*n == '/')
52160+ return 1;
52161+ break;
52162+ case '\\':
52163+ if (*n != c)
52164+ return 1;
52165+ break;
52166+ case '*':
52167+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
52168+ if (*n == '/')
52169+ return 1;
52170+ else if (c == '?') {
52171+ if (*n == '\0')
52172+ return 1;
52173+ else
52174+ ++n;
52175+ }
52176+ }
52177+ if (c == '\0') {
52178+ return 0;
52179+ } else {
52180+ const char *endp;
52181+
52182+ if ((endp = strchr(n, '/')) == NULL)
52183+ endp = n + strlen(n);
52184+
52185+ if (c == '[') {
52186+ for (--p; n < endp; ++n)
52187+ if (!glob_match(p, n))
52188+ return 0;
52189+ } else if (c == '/') {
52190+ while (*n != '\0' && *n != '/')
52191+ ++n;
52192+ if (*n == '/' && !glob_match(p, n + 1))
52193+ return 0;
52194+ } else {
52195+ for (--p; n < endp; ++n)
52196+ if (*n == c && !glob_match(p, n))
52197+ return 0;
52198+ }
52199+
52200+ return 1;
52201+ }
52202+ case '[':
52203+ {
52204+ int not;
52205+ char cold;
52206+
52207+ if (*n == '\0' || *n == '/')
52208+ return 1;
52209+
52210+ not = (*p == '!' || *p == '^');
52211+ if (not)
52212+ ++p;
52213+
52214+ c = *p++;
52215+ for (;;) {
52216+ unsigned char fn = (unsigned char)*n;
52217+
52218+ if (c == '\0')
52219+ return 1;
52220+ else {
52221+ if (c == fn)
52222+ goto matched;
52223+ cold = c;
52224+ c = *p++;
52225+
52226+ if (c == '-' && *p != ']') {
52227+ unsigned char cend = *p++;
52228+
52229+ if (cend == '\0')
52230+ return 1;
52231+
52232+ if (cold <= fn && fn <= cend)
52233+ goto matched;
52234+
52235+ c = *p++;
52236+ }
52237+ }
52238+
52239+ if (c == ']')
52240+ break;
52241+ }
52242+ if (!not)
52243+ return 1;
52244+ break;
52245+ matched:
52246+ while (c != ']') {
52247+ if (c == '\0')
52248+ return 1;
52249+
52250+ c = *p++;
52251+ }
52252+ if (not)
52253+ return 1;
52254+ }
52255+ break;
52256+ default:
52257+ if (c != *n)
52258+ return 1;
52259+ }
52260+
52261+ ++n;
52262+ }
52263+
52264+ if (*n == '\0')
52265+ return 0;
52266+
52267+ if (*n == '/')
52268+ return 0;
52269+
52270+ return 1;
52271+}
52272+
52273+static struct acl_object_label *
52274+chk_glob_label(struct acl_object_label *globbed,
52275+ struct dentry *dentry, struct vfsmount *mnt, char **path)
52276+{
52277+ struct acl_object_label *tmp;
52278+
52279+ if (*path == NULL)
52280+ *path = gr_to_filename_nolock(dentry, mnt);
52281+
52282+ tmp = globbed;
52283+
52284+ while (tmp) {
52285+ if (!glob_match(tmp->filename, *path))
52286+ return tmp;
52287+ tmp = tmp->next;
52288+ }
52289+
52290+ return NULL;
52291+}
52292+
52293+static struct acl_object_label *
52294+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52295+ const ino_t curr_ino, const dev_t curr_dev,
52296+ const struct acl_subject_label *subj, char **path, const int checkglob)
52297+{
52298+ struct acl_subject_label *tmpsubj;
52299+ struct acl_object_label *retval;
52300+ struct acl_object_label *retval2;
52301+
52302+ tmpsubj = (struct acl_subject_label *) subj;
52303+ read_lock(&gr_inode_lock);
52304+ do {
52305+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
52306+ if (retval) {
52307+ if (checkglob && retval->globbed) {
52308+ retval2 = chk_glob_label(retval->globbed, (struct dentry *)orig_dentry,
52309+ (struct vfsmount *)orig_mnt, path);
52310+ if (retval2)
52311+ retval = retval2;
52312+ }
52313+ break;
52314+ }
52315+ } while ((tmpsubj = tmpsubj->parent_subject));
52316+ read_unlock(&gr_inode_lock);
52317+
52318+ return retval;
52319+}
52320+
52321+static __inline__ struct acl_object_label *
52322+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52323+ const struct dentry *curr_dentry,
52324+ const struct acl_subject_label *subj, char **path, const int checkglob)
52325+{
52326+ int newglob = checkglob;
52327+
52328+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
52329+ as we don't want a / * rule to match instead of the / object
52330+ don't do this for create lookups that call this function though, since they're looking up
52331+ on the parent and thus need globbing checks on all paths
52332+ */
52333+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
52334+ newglob = GR_NO_GLOB;
52335+
52336+ return __full_lookup(orig_dentry, orig_mnt,
52337+ curr_dentry->d_inode->i_ino,
52338+ __get_dev(curr_dentry), subj, path, newglob);
52339+}
52340+
52341+static struct acl_object_label *
52342+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52343+ const struct acl_subject_label *subj, char *path, const int checkglob)
52344+{
52345+ struct dentry *dentry = (struct dentry *) l_dentry;
52346+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52347+ struct acl_object_label *retval;
52348+
52349+ spin_lock(&dcache_lock);
52350+ spin_lock(&vfsmount_lock);
52351+
52352+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
52353+#ifdef CONFIG_NET
52354+ mnt == sock_mnt ||
52355+#endif
52356+#ifdef CONFIG_HUGETLBFS
52357+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
52358+#endif
52359+ /* ignore Eric Biederman */
52360+ IS_PRIVATE(l_dentry->d_inode))) {
52361+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
52362+ goto out;
52363+ }
52364+
52365+ for (;;) {
52366+ if (dentry == real_root && mnt == real_root_mnt)
52367+ break;
52368+
52369+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52370+ if (mnt->mnt_parent == mnt)
52371+ break;
52372+
52373+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52374+ if (retval != NULL)
52375+ goto out;
52376+
52377+ dentry = mnt->mnt_mountpoint;
52378+ mnt = mnt->mnt_parent;
52379+ continue;
52380+ }
52381+
52382+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52383+ if (retval != NULL)
52384+ goto out;
52385+
52386+ dentry = dentry->d_parent;
52387+ }
52388+
52389+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52390+
52391+ if (retval == NULL)
52392+ retval = full_lookup(l_dentry, l_mnt, real_root, subj, &path, checkglob);
52393+out:
52394+ spin_unlock(&vfsmount_lock);
52395+ spin_unlock(&dcache_lock);
52396+
52397+ BUG_ON(retval == NULL);
52398+
52399+ return retval;
52400+}
52401+
52402+static __inline__ struct acl_object_label *
52403+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52404+ const struct acl_subject_label *subj)
52405+{
52406+ char *path = NULL;
52407+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
52408+}
52409+
52410+static __inline__ struct acl_object_label *
52411+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52412+ const struct acl_subject_label *subj)
52413+{
52414+ char *path = NULL;
52415+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
52416+}
52417+
52418+static __inline__ struct acl_object_label *
52419+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52420+ const struct acl_subject_label *subj, char *path)
52421+{
52422+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
52423+}
52424+
52425+static struct acl_subject_label *
52426+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52427+ const struct acl_role_label *role)
52428+{
52429+ struct dentry *dentry = (struct dentry *) l_dentry;
52430+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52431+ struct acl_subject_label *retval;
52432+
52433+ spin_lock(&dcache_lock);
52434+ spin_lock(&vfsmount_lock);
52435+
52436+ for (;;) {
52437+ if (dentry == real_root && mnt == real_root_mnt)
52438+ break;
52439+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52440+ if (mnt->mnt_parent == mnt)
52441+ break;
52442+
52443+ read_lock(&gr_inode_lock);
52444+ retval =
52445+ lookup_acl_subj_label(dentry->d_inode->i_ino,
52446+ __get_dev(dentry), role);
52447+ read_unlock(&gr_inode_lock);
52448+ if (retval != NULL)
52449+ goto out;
52450+
52451+ dentry = mnt->mnt_mountpoint;
52452+ mnt = mnt->mnt_parent;
52453+ continue;
52454+ }
52455+
52456+ read_lock(&gr_inode_lock);
52457+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52458+ __get_dev(dentry), role);
52459+ read_unlock(&gr_inode_lock);
52460+ if (retval != NULL)
52461+ goto out;
52462+
52463+ dentry = dentry->d_parent;
52464+ }
52465+
52466+ read_lock(&gr_inode_lock);
52467+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52468+ __get_dev(dentry), role);
52469+ read_unlock(&gr_inode_lock);
52470+
52471+ if (unlikely(retval == NULL)) {
52472+ read_lock(&gr_inode_lock);
52473+ retval = lookup_acl_subj_label(real_root->d_inode->i_ino,
52474+ __get_dev(real_root), role);
52475+ read_unlock(&gr_inode_lock);
52476+ }
52477+out:
52478+ spin_unlock(&vfsmount_lock);
52479+ spin_unlock(&dcache_lock);
52480+
52481+ BUG_ON(retval == NULL);
52482+
52483+ return retval;
52484+}
52485+
52486+static void
52487+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
52488+{
52489+ struct task_struct *task = current;
52490+ const struct cred *cred = current_cred();
52491+
52492+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52493+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52494+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52495+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
52496+
52497+ return;
52498+}
52499+
52500+static void
52501+gr_log_learn_sysctl(const char *path, const __u32 mode)
52502+{
52503+ struct task_struct *task = current;
52504+ const struct cred *cred = current_cred();
52505+
52506+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52507+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52508+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52509+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
52510+
52511+ return;
52512+}
52513+
52514+static void
52515+gr_log_learn_id_change(const char type, const unsigned int real,
52516+ const unsigned int effective, const unsigned int fs)
52517+{
52518+ struct task_struct *task = current;
52519+ const struct cred *cred = current_cred();
52520+
52521+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
52522+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52523+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52524+ type, real, effective, fs, &task->signal->saved_ip);
52525+
52526+ return;
52527+}
52528+
52529+__u32
52530+gr_check_link(const struct dentry * new_dentry,
52531+ const struct dentry * parent_dentry,
52532+ const struct vfsmount * parent_mnt,
52533+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
52534+{
52535+ struct acl_object_label *obj;
52536+ __u32 oldmode, newmode;
52537+ __u32 needmode;
52538+
52539+ if (unlikely(!(gr_status & GR_READY)))
52540+ return (GR_CREATE | GR_LINK);
52541+
52542+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
52543+ oldmode = obj->mode;
52544+
52545+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
52546+ oldmode |= (GR_CREATE | GR_LINK);
52547+
52548+ needmode = GR_CREATE | GR_AUDIT_CREATE | GR_SUPPRESS;
52549+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
52550+ needmode |= GR_SETID | GR_AUDIT_SETID;
52551+
52552+ newmode =
52553+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
52554+ oldmode | needmode);
52555+
52556+ needmode = newmode & (GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC |
52557+ GR_SETID | GR_READ | GR_FIND | GR_DELETE |
52558+ GR_INHERIT | GR_AUDIT_INHERIT);
52559+
52560+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID) && !(newmode & GR_SETID))
52561+ goto bad;
52562+
52563+ if ((oldmode & needmode) != needmode)
52564+ goto bad;
52565+
52566+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
52567+ if ((newmode & needmode) != needmode)
52568+ goto bad;
52569+
52570+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
52571+ return newmode;
52572+bad:
52573+ needmode = oldmode;
52574+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
52575+ needmode |= GR_SETID;
52576+
52577+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
52578+ gr_log_learn(old_dentry, old_mnt, needmode);
52579+ return (GR_CREATE | GR_LINK);
52580+ } else if (newmode & GR_SUPPRESS)
52581+ return GR_SUPPRESS;
52582+ else
52583+ return 0;
52584+}
52585+
52586+__u32
52587+gr_search_file(const struct dentry * dentry, const __u32 mode,
52588+ const struct vfsmount * mnt)
52589+{
52590+ __u32 retval = mode;
52591+ struct acl_subject_label *curracl;
52592+ struct acl_object_label *currobj;
52593+
52594+ if (unlikely(!(gr_status & GR_READY)))
52595+ return (mode & ~GR_AUDITS);
52596+
52597+ curracl = current->acl;
52598+
52599+ currobj = chk_obj_label(dentry, mnt, curracl);
52600+ retval = currobj->mode & mode;
52601+
52602+ /* if we're opening a specified transfer file for writing
52603+ (e.g. /dev/initctl), then transfer our role to init
52604+ */
52605+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
52606+ current->role->roletype & GR_ROLE_PERSIST)) {
52607+ struct task_struct *task = init_pid_ns.child_reaper;
52608+
52609+ if (task->role != current->role) {
52610+ task->acl_sp_role = 0;
52611+ task->acl_role_id = current->acl_role_id;
52612+ task->role = current->role;
52613+ rcu_read_lock();
52614+ read_lock(&grsec_exec_file_lock);
52615+ gr_apply_subject_to_task(task);
52616+ read_unlock(&grsec_exec_file_lock);
52617+ rcu_read_unlock();
52618+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
52619+ }
52620+ }
52621+
52622+ if (unlikely
52623+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
52624+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
52625+ __u32 new_mode = mode;
52626+
52627+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
52628+
52629+ retval = new_mode;
52630+
52631+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
52632+ new_mode |= GR_INHERIT;
52633+
52634+ if (!(mode & GR_NOLEARN))
52635+ gr_log_learn(dentry, mnt, new_mode);
52636+ }
52637+
52638+ return retval;
52639+}
52640+
52641+__u32
52642+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
52643+ const struct vfsmount * mnt, const __u32 mode)
52644+{
52645+ struct name_entry *match;
52646+ struct acl_object_label *matchpo;
52647+ struct acl_subject_label *curracl;
52648+ char *path;
52649+ __u32 retval;
52650+
52651+ if (unlikely(!(gr_status & GR_READY)))
52652+ return (mode & ~GR_AUDITS);
52653+
52654+ preempt_disable();
52655+ path = gr_to_filename_rbac(new_dentry, mnt);
52656+ match = lookup_name_entry_create(path);
52657+
52658+ if (!match)
52659+ goto check_parent;
52660+
52661+ curracl = current->acl;
52662+
52663+ read_lock(&gr_inode_lock);
52664+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
52665+ read_unlock(&gr_inode_lock);
52666+
52667+ if (matchpo) {
52668+ if ((matchpo->mode & mode) !=
52669+ (mode & ~(GR_AUDITS | GR_SUPPRESS))
52670+ && curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
52671+ __u32 new_mode = mode;
52672+
52673+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
52674+
52675+ gr_log_learn(new_dentry, mnt, new_mode);
52676+
52677+ preempt_enable();
52678+ return new_mode;
52679+ }
52680+ preempt_enable();
52681+ return (matchpo->mode & mode);
52682+ }
52683+
52684+ check_parent:
52685+ curracl = current->acl;
52686+
52687+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
52688+ retval = matchpo->mode & mode;
52689+
52690+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
52691+ && (curracl->mode & (GR_LEARN | GR_INHERITLEARN))) {
52692+ __u32 new_mode = mode;
52693+
52694+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
52695+
52696+ gr_log_learn(new_dentry, mnt, new_mode);
52697+ preempt_enable();
52698+ return new_mode;
52699+ }
52700+
52701+ preempt_enable();
52702+ return retval;
52703+}
52704+
52705+int
52706+gr_check_hidden_task(const struct task_struct *task)
52707+{
52708+ if (unlikely(!(gr_status & GR_READY)))
52709+ return 0;
52710+
52711+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
52712+ return 1;
52713+
52714+ return 0;
52715+}
52716+
52717+int
52718+gr_check_protected_task(const struct task_struct *task)
52719+{
52720+ if (unlikely(!(gr_status & GR_READY) || !task))
52721+ return 0;
52722+
52723+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
52724+ task->acl != current->acl)
52725+ return 1;
52726+
52727+ return 0;
52728+}
52729+
52730+int
52731+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
52732+{
52733+ struct task_struct *p;
52734+ int ret = 0;
52735+
52736+ if (unlikely(!(gr_status & GR_READY) || !pid))
52737+ return ret;
52738+
52739+ read_lock(&tasklist_lock);
52740+ do_each_pid_task(pid, type, p) {
52741+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
52742+ p->acl != current->acl) {
52743+ ret = 1;
52744+ goto out;
52745+ }
52746+ } while_each_pid_task(pid, type, p);
52747+out:
52748+ read_unlock(&tasklist_lock);
52749+
52750+ return ret;
52751+}
52752+
52753+void
52754+gr_copy_label(struct task_struct *tsk)
52755+{
52756+ tsk->signal->used_accept = 0;
52757+ tsk->acl_sp_role = 0;
52758+ tsk->acl_role_id = current->acl_role_id;
52759+ tsk->acl = current->acl;
52760+ tsk->role = current->role;
52761+ tsk->signal->curr_ip = current->signal->curr_ip;
52762+ tsk->signal->saved_ip = current->signal->saved_ip;
52763+ if (current->exec_file)
52764+ get_file(current->exec_file);
52765+ tsk->exec_file = current->exec_file;
52766+ tsk->is_writable = current->is_writable;
52767+ if (unlikely(current->signal->used_accept)) {
52768+ current->signal->curr_ip = 0;
52769+ current->signal->saved_ip = 0;
52770+ }
52771+
52772+ return;
52773+}
52774+
52775+static void
52776+gr_set_proc_res(struct task_struct *task)
52777+{
52778+ struct acl_subject_label *proc;
52779+ unsigned short i;
52780+
52781+ proc = task->acl;
52782+
52783+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
52784+ return;
52785+
52786+ for (i = 0; i < RLIM_NLIMITS; i++) {
52787+ if (!(proc->resmask & (1 << i)))
52788+ continue;
52789+
52790+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
52791+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
52792+ }
52793+
52794+ return;
52795+}
52796+
52797+extern int __gr_process_user_ban(struct user_struct *user);
52798+
52799+int
52800+gr_check_user_change(int real, int effective, int fs)
52801+{
52802+ unsigned int i;
52803+ __u16 num;
52804+ uid_t *uidlist;
52805+ int curuid;
52806+ int realok = 0;
52807+ int effectiveok = 0;
52808+ int fsok = 0;
52809+
52810+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
52811+ struct user_struct *user;
52812+
52813+ if (real == -1)
52814+ goto skipit;
52815+
52816+ user = find_user(real);
52817+ if (user == NULL)
52818+ goto skipit;
52819+
52820+ if (__gr_process_user_ban(user)) {
52821+ /* for find_user */
52822+ free_uid(user);
52823+ return 1;
52824+ }
52825+
52826+ /* for find_user */
52827+ free_uid(user);
52828+
52829+skipit:
52830+#endif
52831+
52832+ if (unlikely(!(gr_status & GR_READY)))
52833+ return 0;
52834+
52835+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
52836+ gr_log_learn_id_change('u', real, effective, fs);
52837+
52838+ num = current->acl->user_trans_num;
52839+ uidlist = current->acl->user_transitions;
52840+
52841+ if (uidlist == NULL)
52842+ return 0;
52843+
52844+ if (real == -1)
52845+ realok = 1;
52846+ if (effective == -1)
52847+ effectiveok = 1;
52848+ if (fs == -1)
52849+ fsok = 1;
52850+
52851+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
52852+ for (i = 0; i < num; i++) {
52853+ curuid = (int)uidlist[i];
52854+ if (real == curuid)
52855+ realok = 1;
52856+ if (effective == curuid)
52857+ effectiveok = 1;
52858+ if (fs == curuid)
52859+ fsok = 1;
52860+ }
52861+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
52862+ for (i = 0; i < num; i++) {
52863+ curuid = (int)uidlist[i];
52864+ if (real == curuid)
52865+ break;
52866+ if (effective == curuid)
52867+ break;
52868+ if (fs == curuid)
52869+ break;
52870+ }
52871+ /* not in deny list */
52872+ if (i == num) {
52873+ realok = 1;
52874+ effectiveok = 1;
52875+ fsok = 1;
52876+ }
52877+ }
52878+
52879+ if (realok && effectiveok && fsok)
52880+ return 0;
52881+ else {
52882+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
52883+ return 1;
52884+ }
52885+}
52886+
52887+int
52888+gr_check_group_change(int real, int effective, int fs)
52889+{
52890+ unsigned int i;
52891+ __u16 num;
52892+ gid_t *gidlist;
52893+ int curgid;
52894+ int realok = 0;
52895+ int effectiveok = 0;
52896+ int fsok = 0;
52897+
52898+ if (unlikely(!(gr_status & GR_READY)))
52899+ return 0;
52900+
52901+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
52902+ gr_log_learn_id_change('g', real, effective, fs);
52903+
52904+ num = current->acl->group_trans_num;
52905+ gidlist = current->acl->group_transitions;
52906+
52907+ if (gidlist == NULL)
52908+ return 0;
52909+
52910+ if (real == -1)
52911+ realok = 1;
52912+ if (effective == -1)
52913+ effectiveok = 1;
52914+ if (fs == -1)
52915+ fsok = 1;
52916+
52917+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
52918+ for (i = 0; i < num; i++) {
52919+ curgid = (int)gidlist[i];
52920+ if (real == curgid)
52921+ realok = 1;
52922+ if (effective == curgid)
52923+ effectiveok = 1;
52924+ if (fs == curgid)
52925+ fsok = 1;
52926+ }
52927+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
52928+ for (i = 0; i < num; i++) {
52929+ curgid = (int)gidlist[i];
52930+ if (real == curgid)
52931+ break;
52932+ if (effective == curgid)
52933+ break;
52934+ if (fs == curgid)
52935+ break;
52936+ }
52937+ /* not in deny list */
52938+ if (i == num) {
52939+ realok = 1;
52940+ effectiveok = 1;
52941+ fsok = 1;
52942+ }
52943+ }
52944+
52945+ if (realok && effectiveok && fsok)
52946+ return 0;
52947+ else {
52948+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
52949+ return 1;
52950+ }
52951+}
52952+
52953+void
52954+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
52955+{
52956+ struct acl_role_label *role = task->role;
52957+ struct acl_subject_label *subj = NULL;
52958+ struct acl_object_label *obj;
52959+ struct file *filp;
52960+
52961+ if (unlikely(!(gr_status & GR_READY)))
52962+ return;
52963+
52964+ filp = task->exec_file;
52965+
52966+ /* kernel process, we'll give them the kernel role */
52967+ if (unlikely(!filp)) {
52968+ task->role = kernel_role;
52969+ task->acl = kernel_role->root_label;
52970+ return;
52971+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
52972+ role = lookup_acl_role_label(task, uid, gid);
52973+
52974+ /* perform subject lookup in possibly new role
52975+ we can use this result below in the case where role == task->role
52976+ */
52977+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
52978+
52979+ /* if we changed uid/gid, but result in the same role
52980+ and are using inheritance, don't lose the inherited subject
52981+ if current subject is other than what normal lookup
52982+ would result in, we arrived via inheritance, don't
52983+ lose subject
52984+ */
52985+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
52986+ (subj == task->acl)))
52987+ task->acl = subj;
52988+
52989+ task->role = role;
52990+
52991+ task->is_writable = 0;
52992+
52993+ /* ignore additional mmap checks for processes that are writable
52994+ by the default ACL */
52995+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
52996+ if (unlikely(obj->mode & GR_WRITE))
52997+ task->is_writable = 1;
52998+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
52999+ if (unlikely(obj->mode & GR_WRITE))
53000+ task->is_writable = 1;
53001+
53002+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53003+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53004+#endif
53005+
53006+ gr_set_proc_res(task);
53007+
53008+ return;
53009+}
53010+
53011+int
53012+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
53013+ const int unsafe_share)
53014+{
53015+ struct task_struct *task = current;
53016+ struct acl_subject_label *newacl;
53017+ struct acl_object_label *obj;
53018+ __u32 retmode;
53019+
53020+ if (unlikely(!(gr_status & GR_READY)))
53021+ return 0;
53022+
53023+ newacl = chk_subj_label(dentry, mnt, task->role);
53024+
53025+ task_lock(task);
53026+ if ((((task->ptrace & PT_PTRACED) || unsafe_share) &&
53027+ !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
53028+ !(task->role->roletype & GR_ROLE_GOD) &&
53029+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
53030+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN)))) {
53031+ task_unlock(task);
53032+ if (unsafe_share)
53033+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
53034+ else
53035+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
53036+ return -EACCES;
53037+ }
53038+ task_unlock(task);
53039+
53040+ obj = chk_obj_label(dentry, mnt, task->acl);
53041+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
53042+
53043+ if (!(task->acl->mode & GR_INHERITLEARN) &&
53044+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
53045+ if (obj->nested)
53046+ task->acl = obj->nested;
53047+ else
53048+ task->acl = newacl;
53049+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
53050+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
53051+
53052+ task->is_writable = 0;
53053+
53054+ /* ignore additional mmap checks for processes that are writable
53055+ by the default ACL */
53056+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
53057+ if (unlikely(obj->mode & GR_WRITE))
53058+ task->is_writable = 1;
53059+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
53060+ if (unlikely(obj->mode & GR_WRITE))
53061+ task->is_writable = 1;
53062+
53063+ gr_set_proc_res(task);
53064+
53065+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53066+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53067+#endif
53068+ return 0;
53069+}
53070+
53071+/* always called with valid inodev ptr */
53072+static void
53073+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
53074+{
53075+ struct acl_object_label *matchpo;
53076+ struct acl_subject_label *matchps;
53077+ struct acl_subject_label *subj;
53078+ struct acl_role_label *role;
53079+ unsigned int x;
53080+
53081+ FOR_EACH_ROLE_START(role)
53082+ FOR_EACH_SUBJECT_START(role, subj, x)
53083+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
53084+ matchpo->mode |= GR_DELETED;
53085+ FOR_EACH_SUBJECT_END(subj,x)
53086+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53087+ if (subj->inode == ino && subj->device == dev)
53088+ subj->mode |= GR_DELETED;
53089+ FOR_EACH_NESTED_SUBJECT_END(subj)
53090+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
53091+ matchps->mode |= GR_DELETED;
53092+ FOR_EACH_ROLE_END(role)
53093+
53094+ inodev->nentry->deleted = 1;
53095+
53096+ return;
53097+}
53098+
53099+void
53100+gr_handle_delete(const ino_t ino, const dev_t dev)
53101+{
53102+ struct inodev_entry *inodev;
53103+
53104+ if (unlikely(!(gr_status & GR_READY)))
53105+ return;
53106+
53107+ write_lock(&gr_inode_lock);
53108+ inodev = lookup_inodev_entry(ino, dev);
53109+ if (inodev != NULL)
53110+ do_handle_delete(inodev, ino, dev);
53111+ write_unlock(&gr_inode_lock);
53112+
53113+ return;
53114+}
53115+
53116+static void
53117+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
53118+ const ino_t newinode, const dev_t newdevice,
53119+ struct acl_subject_label *subj)
53120+{
53121+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
53122+ struct acl_object_label *match;
53123+
53124+ match = subj->obj_hash[index];
53125+
53126+ while (match && (match->inode != oldinode ||
53127+ match->device != olddevice ||
53128+ !(match->mode & GR_DELETED)))
53129+ match = match->next;
53130+
53131+ if (match && (match->inode == oldinode)
53132+ && (match->device == olddevice)
53133+ && (match->mode & GR_DELETED)) {
53134+ if (match->prev == NULL) {
53135+ subj->obj_hash[index] = match->next;
53136+ if (match->next != NULL)
53137+ match->next->prev = NULL;
53138+ } else {
53139+ match->prev->next = match->next;
53140+ if (match->next != NULL)
53141+ match->next->prev = match->prev;
53142+ }
53143+ match->prev = NULL;
53144+ match->next = NULL;
53145+ match->inode = newinode;
53146+ match->device = newdevice;
53147+ match->mode &= ~GR_DELETED;
53148+
53149+ insert_acl_obj_label(match, subj);
53150+ }
53151+
53152+ return;
53153+}
53154+
53155+static void
53156+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
53157+ const ino_t newinode, const dev_t newdevice,
53158+ struct acl_role_label *role)
53159+{
53160+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
53161+ struct acl_subject_label *match;
53162+
53163+ match = role->subj_hash[index];
53164+
53165+ while (match && (match->inode != oldinode ||
53166+ match->device != olddevice ||
53167+ !(match->mode & GR_DELETED)))
53168+ match = match->next;
53169+
53170+ if (match && (match->inode == oldinode)
53171+ && (match->device == olddevice)
53172+ && (match->mode & GR_DELETED)) {
53173+ if (match->prev == NULL) {
53174+ role->subj_hash[index] = match->next;
53175+ if (match->next != NULL)
53176+ match->next->prev = NULL;
53177+ } else {
53178+ match->prev->next = match->next;
53179+ if (match->next != NULL)
53180+ match->next->prev = match->prev;
53181+ }
53182+ match->prev = NULL;
53183+ match->next = NULL;
53184+ match->inode = newinode;
53185+ match->device = newdevice;
53186+ match->mode &= ~GR_DELETED;
53187+
53188+ insert_acl_subj_label(match, role);
53189+ }
53190+
53191+ return;
53192+}
53193+
53194+static void
53195+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
53196+ const ino_t newinode, const dev_t newdevice)
53197+{
53198+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
53199+ struct inodev_entry *match;
53200+
53201+ match = inodev_set.i_hash[index];
53202+
53203+ while (match && (match->nentry->inode != oldinode ||
53204+ match->nentry->device != olddevice || !match->nentry->deleted))
53205+ match = match->next;
53206+
53207+ if (match && (match->nentry->inode == oldinode)
53208+ && (match->nentry->device == olddevice) &&
53209+ match->nentry->deleted) {
53210+ if (match->prev == NULL) {
53211+ inodev_set.i_hash[index] = match->next;
53212+ if (match->next != NULL)
53213+ match->next->prev = NULL;
53214+ } else {
53215+ match->prev->next = match->next;
53216+ if (match->next != NULL)
53217+ match->next->prev = match->prev;
53218+ }
53219+ match->prev = NULL;
53220+ match->next = NULL;
53221+ match->nentry->inode = newinode;
53222+ match->nentry->device = newdevice;
53223+ match->nentry->deleted = 0;
53224+
53225+ insert_inodev_entry(match);
53226+ }
53227+
53228+ return;
53229+}
53230+
53231+static void
53232+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
53233+ const struct vfsmount *mnt)
53234+{
53235+ struct acl_subject_label *subj;
53236+ struct acl_role_label *role;
53237+ unsigned int x;
53238+ ino_t inode = dentry->d_inode->i_ino;
53239+ dev_t dev = __get_dev(dentry);
53240+
53241+ FOR_EACH_ROLE_START(role)
53242+ update_acl_subj_label(matchn->inode, matchn->device,
53243+ inode, dev, role);
53244+
53245+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53246+ if ((subj->inode == inode) && (subj->device == dev)) {
53247+ subj->inode = inode;
53248+ subj->device = dev;
53249+ }
53250+ FOR_EACH_NESTED_SUBJECT_END(subj)
53251+ FOR_EACH_SUBJECT_START(role, subj, x)
53252+ update_acl_obj_label(matchn->inode, matchn->device,
53253+ inode, dev, subj);
53254+ FOR_EACH_SUBJECT_END(subj,x)
53255+ FOR_EACH_ROLE_END(role)
53256+
53257+ update_inodev_entry(matchn->inode, matchn->device, inode, dev);
53258+
53259+ return;
53260+}
53261+
53262+void
53263+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
53264+{
53265+ struct name_entry *matchn;
53266+
53267+ if (unlikely(!(gr_status & GR_READY)))
53268+ return;
53269+
53270+ preempt_disable();
53271+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
53272+
53273+ if (unlikely((unsigned long)matchn)) {
53274+ write_lock(&gr_inode_lock);
53275+ do_handle_create(matchn, dentry, mnt);
53276+ write_unlock(&gr_inode_lock);
53277+ }
53278+ preempt_enable();
53279+
53280+ return;
53281+}
53282+
53283+void
53284+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
53285+ struct dentry *old_dentry,
53286+ struct dentry *new_dentry,
53287+ struct vfsmount *mnt, const __u8 replace)
53288+{
53289+ struct name_entry *matchn;
53290+ struct inodev_entry *inodev;
53291+ ino_t oldinode = old_dentry->d_inode->i_ino;
53292+ dev_t olddev = __get_dev(old_dentry);
53293+
53294+ /* vfs_rename swaps the name and parent link for old_dentry and
53295+ new_dentry
53296+ at this point, old_dentry has the new name, parent link, and inode
53297+ for the renamed file
53298+ if a file is being replaced by a rename, new_dentry has the inode
53299+ and name for the replaced file
53300+ */
53301+
53302+ if (unlikely(!(gr_status & GR_READY)))
53303+ return;
53304+
53305+ preempt_disable();
53306+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
53307+
53308+ /* we wouldn't have to check d_inode if it weren't for
53309+ NFS silly-renaming
53310+ */
53311+
53312+ write_lock(&gr_inode_lock);
53313+ if (unlikely(replace && new_dentry->d_inode)) {
53314+ ino_t newinode = new_dentry->d_inode->i_ino;
53315+ dev_t newdev = __get_dev(new_dentry);
53316+ inodev = lookup_inodev_entry(newinode, newdev);
53317+ if (inodev != NULL && (new_dentry->d_inode->i_nlink <= 1))
53318+ do_handle_delete(inodev, newinode, newdev);
53319+ }
53320+
53321+ inodev = lookup_inodev_entry(oldinode, olddev);
53322+ if (inodev != NULL && (old_dentry->d_inode->i_nlink <= 1))
53323+ do_handle_delete(inodev, oldinode, olddev);
53324+
53325+ if (unlikely((unsigned long)matchn))
53326+ do_handle_create(matchn, old_dentry, mnt);
53327+
53328+ write_unlock(&gr_inode_lock);
53329+ preempt_enable();
53330+
53331+ return;
53332+}
53333+
53334+static int
53335+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
53336+ unsigned char **sum)
53337+{
53338+ struct acl_role_label *r;
53339+ struct role_allowed_ip *ipp;
53340+ struct role_transition *trans;
53341+ unsigned int i;
53342+ int found = 0;
53343+ u32 curr_ip = current->signal->curr_ip;
53344+
53345+ current->signal->saved_ip = curr_ip;
53346+
53347+ /* check transition table */
53348+
53349+ for (trans = current->role->transitions; trans; trans = trans->next) {
53350+ if (!strcmp(rolename, trans->rolename)) {
53351+ found = 1;
53352+ break;
53353+ }
53354+ }
53355+
53356+ if (!found)
53357+ return 0;
53358+
53359+ /* handle special roles that do not require authentication
53360+ and check ip */
53361+
53362+ FOR_EACH_ROLE_START(r)
53363+ if (!strcmp(rolename, r->rolename) &&
53364+ (r->roletype & GR_ROLE_SPECIAL)) {
53365+ found = 0;
53366+ if (r->allowed_ips != NULL) {
53367+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
53368+ if ((ntohl(curr_ip) & ipp->netmask) ==
53369+ (ntohl(ipp->addr) & ipp->netmask))
53370+ found = 1;
53371+ }
53372+ } else
53373+ found = 2;
53374+ if (!found)
53375+ return 0;
53376+
53377+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
53378+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
53379+ *salt = NULL;
53380+ *sum = NULL;
53381+ return 1;
53382+ }
53383+ }
53384+ FOR_EACH_ROLE_END(r)
53385+
53386+ for (i = 0; i < num_sprole_pws; i++) {
53387+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
53388+ *salt = acl_special_roles[i]->salt;
53389+ *sum = acl_special_roles[i]->sum;
53390+ return 1;
53391+ }
53392+ }
53393+
53394+ return 0;
53395+}
53396+
53397+static void
53398+assign_special_role(char *rolename)
53399+{
53400+ struct acl_object_label *obj;
53401+ struct acl_role_label *r;
53402+ struct acl_role_label *assigned = NULL;
53403+ struct task_struct *tsk;
53404+ struct file *filp;
53405+
53406+ FOR_EACH_ROLE_START(r)
53407+ if (!strcmp(rolename, r->rolename) &&
53408+ (r->roletype & GR_ROLE_SPECIAL)) {
53409+ assigned = r;
53410+ break;
53411+ }
53412+ FOR_EACH_ROLE_END(r)
53413+
53414+ if (!assigned)
53415+ return;
53416+
53417+ read_lock(&tasklist_lock);
53418+ read_lock(&grsec_exec_file_lock);
53419+
53420+ tsk = current->real_parent;
53421+ if (tsk == NULL)
53422+ goto out_unlock;
53423+
53424+ filp = tsk->exec_file;
53425+ if (filp == NULL)
53426+ goto out_unlock;
53427+
53428+ tsk->is_writable = 0;
53429+
53430+ tsk->acl_sp_role = 1;
53431+ tsk->acl_role_id = ++acl_sp_role_value;
53432+ tsk->role = assigned;
53433+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
53434+
53435+ /* ignore additional mmap checks for processes that are writable
53436+ by the default ACL */
53437+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53438+ if (unlikely(obj->mode & GR_WRITE))
53439+ tsk->is_writable = 1;
53440+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
53441+ if (unlikely(obj->mode & GR_WRITE))
53442+ tsk->is_writable = 1;
53443+
53444+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53445+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
53446+#endif
53447+
53448+out_unlock:
53449+ read_unlock(&grsec_exec_file_lock);
53450+ read_unlock(&tasklist_lock);
53451+ return;
53452+}
53453+
53454+int gr_check_secure_terminal(struct task_struct *task)
53455+{
53456+ struct task_struct *p, *p2, *p3;
53457+ struct files_struct *files;
53458+ struct fdtable *fdt;
53459+ struct file *our_file = NULL, *file;
53460+ int i;
53461+
53462+ if (task->signal->tty == NULL)
53463+ return 1;
53464+
53465+ files = get_files_struct(task);
53466+ if (files != NULL) {
53467+ rcu_read_lock();
53468+ fdt = files_fdtable(files);
53469+ for (i=0; i < fdt->max_fds; i++) {
53470+ file = fcheck_files(files, i);
53471+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
53472+ get_file(file);
53473+ our_file = file;
53474+ }
53475+ }
53476+ rcu_read_unlock();
53477+ put_files_struct(files);
53478+ }
53479+
53480+ if (our_file == NULL)
53481+ return 1;
53482+
53483+ read_lock(&tasklist_lock);
53484+ do_each_thread(p2, p) {
53485+ files = get_files_struct(p);
53486+ if (files == NULL ||
53487+ (p->signal && p->signal->tty == task->signal->tty)) {
53488+ if (files != NULL)
53489+ put_files_struct(files);
53490+ continue;
53491+ }
53492+ rcu_read_lock();
53493+ fdt = files_fdtable(files);
53494+ for (i=0; i < fdt->max_fds; i++) {
53495+ file = fcheck_files(files, i);
53496+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
53497+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
53498+ p3 = task;
53499+ while (p3->pid > 0) {
53500+ if (p3 == p)
53501+ break;
53502+ p3 = p3->real_parent;
53503+ }
53504+ if (p3 == p)
53505+ break;
53506+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
53507+ gr_handle_alertkill(p);
53508+ rcu_read_unlock();
53509+ put_files_struct(files);
53510+ read_unlock(&tasklist_lock);
53511+ fput(our_file);
53512+ return 0;
53513+ }
53514+ }
53515+ rcu_read_unlock();
53516+ put_files_struct(files);
53517+ } while_each_thread(p2, p);
53518+ read_unlock(&tasklist_lock);
53519+
53520+ fput(our_file);
53521+ return 1;
53522+}
53523+
53524+ssize_t
53525+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
53526+{
53527+ struct gr_arg_wrapper uwrap;
53528+ unsigned char *sprole_salt = NULL;
53529+ unsigned char *sprole_sum = NULL;
53530+ int error = sizeof (struct gr_arg_wrapper);
53531+ int error2 = 0;
53532+
53533+ mutex_lock(&gr_dev_mutex);
53534+
53535+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
53536+ error = -EPERM;
53537+ goto out;
53538+ }
53539+
53540+ if (count != sizeof (struct gr_arg_wrapper)) {
53541+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
53542+ error = -EINVAL;
53543+ goto out;
53544+ }
53545+
53546+
53547+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
53548+ gr_auth_expires = 0;
53549+ gr_auth_attempts = 0;
53550+ }
53551+
53552+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
53553+ error = -EFAULT;
53554+ goto out;
53555+ }
53556+
53557+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
53558+ error = -EINVAL;
53559+ goto out;
53560+ }
53561+
53562+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
53563+ error = -EFAULT;
53564+ goto out;
53565+ }
53566+
53567+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
53568+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
53569+ time_after(gr_auth_expires, get_seconds())) {
53570+ error = -EBUSY;
53571+ goto out;
53572+ }
53573+
53574+ /* if non-root trying to do anything other than use a special role,
53575+ do not attempt authentication, do not count towards authentication
53576+ locking
53577+ */
53578+
53579+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
53580+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
53581+ current_uid()) {
53582+ error = -EPERM;
53583+ goto out;
53584+ }
53585+
53586+ /* ensure pw and special role name are null terminated */
53587+
53588+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
53589+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
53590+
53591+ /* Okay.
53592+ * We have our enough of the argument structure..(we have yet
53593+ * to copy_from_user the tables themselves) . Copy the tables
53594+ * only if we need them, i.e. for loading operations. */
53595+
53596+ switch (gr_usermode->mode) {
53597+ case GR_STATUS:
53598+ if (gr_status & GR_READY) {
53599+ error = 1;
53600+ if (!gr_check_secure_terminal(current))
53601+ error = 3;
53602+ } else
53603+ error = 2;
53604+ goto out;
53605+ case GR_SHUTDOWN:
53606+ if ((gr_status & GR_READY)
53607+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
53608+ pax_open_kernel();
53609+ gr_status &= ~GR_READY;
53610+ pax_close_kernel();
53611+
53612+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
53613+ free_variables();
53614+ memset(gr_usermode, 0, sizeof (struct gr_arg));
53615+ memset(gr_system_salt, 0, GR_SALT_LEN);
53616+ memset(gr_system_sum, 0, GR_SHA_LEN);
53617+ } else if (gr_status & GR_READY) {
53618+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
53619+ error = -EPERM;
53620+ } else {
53621+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
53622+ error = -EAGAIN;
53623+ }
53624+ break;
53625+ case GR_ENABLE:
53626+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
53627+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
53628+ else {
53629+ if (gr_status & GR_READY)
53630+ error = -EAGAIN;
53631+ else
53632+ error = error2;
53633+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
53634+ }
53635+ break;
53636+ case GR_RELOAD:
53637+ if (!(gr_status & GR_READY)) {
53638+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
53639+ error = -EAGAIN;
53640+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
53641+ lock_kernel();
53642+
53643+ pax_open_kernel();
53644+ gr_status &= ~GR_READY;
53645+ pax_close_kernel();
53646+
53647+ free_variables();
53648+ if (!(error2 = gracl_init(gr_usermode))) {
53649+ unlock_kernel();
53650+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
53651+ } else {
53652+ unlock_kernel();
53653+ error = error2;
53654+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
53655+ }
53656+ } else {
53657+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
53658+ error = -EPERM;
53659+ }
53660+ break;
53661+ case GR_SEGVMOD:
53662+ if (unlikely(!(gr_status & GR_READY))) {
53663+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
53664+ error = -EAGAIN;
53665+ break;
53666+ }
53667+
53668+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
53669+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
53670+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
53671+ struct acl_subject_label *segvacl;
53672+ segvacl =
53673+ lookup_acl_subj_label(gr_usermode->segv_inode,
53674+ gr_usermode->segv_device,
53675+ current->role);
53676+ if (segvacl) {
53677+ segvacl->crashes = 0;
53678+ segvacl->expires = 0;
53679+ }
53680+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
53681+ gr_remove_uid(gr_usermode->segv_uid);
53682+ }
53683+ } else {
53684+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
53685+ error = -EPERM;
53686+ }
53687+ break;
53688+ case GR_SPROLE:
53689+ case GR_SPROLEPAM:
53690+ if (unlikely(!(gr_status & GR_READY))) {
53691+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
53692+ error = -EAGAIN;
53693+ break;
53694+ }
53695+
53696+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
53697+ current->role->expires = 0;
53698+ current->role->auth_attempts = 0;
53699+ }
53700+
53701+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
53702+ time_after(current->role->expires, get_seconds())) {
53703+ error = -EBUSY;
53704+ goto out;
53705+ }
53706+
53707+ if (lookup_special_role_auth
53708+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
53709+ && ((!sprole_salt && !sprole_sum)
53710+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
53711+ char *p = "";
53712+ assign_special_role(gr_usermode->sp_role);
53713+ read_lock(&tasklist_lock);
53714+ if (current->real_parent)
53715+ p = current->real_parent->role->rolename;
53716+ read_unlock(&tasklist_lock);
53717+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
53718+ p, acl_sp_role_value);
53719+ } else {
53720+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
53721+ error = -EPERM;
53722+ if(!(current->role->auth_attempts++))
53723+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
53724+
53725+ goto out;
53726+ }
53727+ break;
53728+ case GR_UNSPROLE:
53729+ if (unlikely(!(gr_status & GR_READY))) {
53730+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
53731+ error = -EAGAIN;
53732+ break;
53733+ }
53734+
53735+ if (current->role->roletype & GR_ROLE_SPECIAL) {
53736+ char *p = "";
53737+ int i = 0;
53738+
53739+ read_lock(&tasklist_lock);
53740+ if (current->real_parent) {
53741+ p = current->real_parent->role->rolename;
53742+ i = current->real_parent->acl_role_id;
53743+ }
53744+ read_unlock(&tasklist_lock);
53745+
53746+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
53747+ gr_set_acls(1);
53748+ } else {
53749+ error = -EPERM;
53750+ goto out;
53751+ }
53752+ break;
53753+ default:
53754+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
53755+ error = -EINVAL;
53756+ break;
53757+ }
53758+
53759+ if (error != -EPERM)
53760+ goto out;
53761+
53762+ if(!(gr_auth_attempts++))
53763+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
53764+
53765+ out:
53766+ mutex_unlock(&gr_dev_mutex);
53767+ return error;
53768+}
53769+
53770+/* must be called with
53771+ rcu_read_lock();
53772+ read_lock(&tasklist_lock);
53773+ read_lock(&grsec_exec_file_lock);
53774+*/
53775+int gr_apply_subject_to_task(struct task_struct *task)
53776+{
53777+ struct acl_object_label *obj;
53778+ char *tmpname;
53779+ struct acl_subject_label *tmpsubj;
53780+ struct file *filp;
53781+ struct name_entry *nmatch;
53782+
53783+ filp = task->exec_file;
53784+ if (filp == NULL)
53785+ return 0;
53786+
53787+ /* the following is to apply the correct subject
53788+ on binaries running when the RBAC system
53789+ is enabled, when the binaries have been
53790+ replaced or deleted since their execution
53791+ -----
53792+ when the RBAC system starts, the inode/dev
53793+ from exec_file will be one the RBAC system
53794+ is unaware of. It only knows the inode/dev
53795+ of the present file on disk, or the absence
53796+ of it.
53797+ */
53798+ preempt_disable();
53799+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
53800+
53801+ nmatch = lookup_name_entry(tmpname);
53802+ preempt_enable();
53803+ tmpsubj = NULL;
53804+ if (nmatch) {
53805+ if (nmatch->deleted)
53806+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
53807+ else
53808+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
53809+ if (tmpsubj != NULL)
53810+ task->acl = tmpsubj;
53811+ }
53812+ if (tmpsubj == NULL)
53813+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
53814+ task->role);
53815+ if (task->acl) {
53816+ task->is_writable = 0;
53817+ /* ignore additional mmap checks for processes that are writable
53818+ by the default ACL */
53819+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53820+ if (unlikely(obj->mode & GR_WRITE))
53821+ task->is_writable = 1;
53822+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
53823+ if (unlikely(obj->mode & GR_WRITE))
53824+ task->is_writable = 1;
53825+
53826+ gr_set_proc_res(task);
53827+
53828+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53829+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53830+#endif
53831+ } else {
53832+ return 1;
53833+ }
53834+
53835+ return 0;
53836+}
53837+
53838+int
53839+gr_set_acls(const int type)
53840+{
53841+ struct task_struct *task, *task2;
53842+ struct acl_role_label *role = current->role;
53843+ __u16 acl_role_id = current->acl_role_id;
53844+ const struct cred *cred;
53845+ int ret;
53846+
53847+ rcu_read_lock();
53848+ read_lock(&tasklist_lock);
53849+ read_lock(&grsec_exec_file_lock);
53850+ do_each_thread(task2, task) {
53851+ /* check to see if we're called from the exit handler,
53852+ if so, only replace ACLs that have inherited the admin
53853+ ACL */
53854+
53855+ if (type && (task->role != role ||
53856+ task->acl_role_id != acl_role_id))
53857+ continue;
53858+
53859+ task->acl_role_id = 0;
53860+ task->acl_sp_role = 0;
53861+
53862+ if (task->exec_file) {
53863+ cred = __task_cred(task);
53864+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
53865+
53866+ ret = gr_apply_subject_to_task(task);
53867+ if (ret) {
53868+ read_unlock(&grsec_exec_file_lock);
53869+ read_unlock(&tasklist_lock);
53870+ rcu_read_unlock();
53871+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
53872+ return ret;
53873+ }
53874+ } else {
53875+ // it's a kernel process
53876+ task->role = kernel_role;
53877+ task->acl = kernel_role->root_label;
53878+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
53879+ task->acl->mode &= ~GR_PROCFIND;
53880+#endif
53881+ }
53882+ } while_each_thread(task2, task);
53883+ read_unlock(&grsec_exec_file_lock);
53884+ read_unlock(&tasklist_lock);
53885+ rcu_read_unlock();
53886+
53887+ return 0;
53888+}
53889+
53890+void
53891+gr_learn_resource(const struct task_struct *task,
53892+ const int res, const unsigned long wanted, const int gt)
53893+{
53894+ struct acl_subject_label *acl;
53895+ const struct cred *cred;
53896+
53897+ if (unlikely((gr_status & GR_READY) &&
53898+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
53899+ goto skip_reslog;
53900+
53901+#ifdef CONFIG_GRKERNSEC_RESLOG
53902+ gr_log_resource(task, res, wanted, gt);
53903+#endif
53904+ skip_reslog:
53905+
53906+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
53907+ return;
53908+
53909+ acl = task->acl;
53910+
53911+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
53912+ !(acl->resmask & (1 << (unsigned short) res))))
53913+ return;
53914+
53915+ if (wanted >= acl->res[res].rlim_cur) {
53916+ unsigned long res_add;
53917+
53918+ res_add = wanted;
53919+ switch (res) {
53920+ case RLIMIT_CPU:
53921+ res_add += GR_RLIM_CPU_BUMP;
53922+ break;
53923+ case RLIMIT_FSIZE:
53924+ res_add += GR_RLIM_FSIZE_BUMP;
53925+ break;
53926+ case RLIMIT_DATA:
53927+ res_add += GR_RLIM_DATA_BUMP;
53928+ break;
53929+ case RLIMIT_STACK:
53930+ res_add += GR_RLIM_STACK_BUMP;
53931+ break;
53932+ case RLIMIT_CORE:
53933+ res_add += GR_RLIM_CORE_BUMP;
53934+ break;
53935+ case RLIMIT_RSS:
53936+ res_add += GR_RLIM_RSS_BUMP;
53937+ break;
53938+ case RLIMIT_NPROC:
53939+ res_add += GR_RLIM_NPROC_BUMP;
53940+ break;
53941+ case RLIMIT_NOFILE:
53942+ res_add += GR_RLIM_NOFILE_BUMP;
53943+ break;
53944+ case RLIMIT_MEMLOCK:
53945+ res_add += GR_RLIM_MEMLOCK_BUMP;
53946+ break;
53947+ case RLIMIT_AS:
53948+ res_add += GR_RLIM_AS_BUMP;
53949+ break;
53950+ case RLIMIT_LOCKS:
53951+ res_add += GR_RLIM_LOCKS_BUMP;
53952+ break;
53953+ case RLIMIT_SIGPENDING:
53954+ res_add += GR_RLIM_SIGPENDING_BUMP;
53955+ break;
53956+ case RLIMIT_MSGQUEUE:
53957+ res_add += GR_RLIM_MSGQUEUE_BUMP;
53958+ break;
53959+ case RLIMIT_NICE:
53960+ res_add += GR_RLIM_NICE_BUMP;
53961+ break;
53962+ case RLIMIT_RTPRIO:
53963+ res_add += GR_RLIM_RTPRIO_BUMP;
53964+ break;
53965+ case RLIMIT_RTTIME:
53966+ res_add += GR_RLIM_RTTIME_BUMP;
53967+ break;
53968+ }
53969+
53970+ acl->res[res].rlim_cur = res_add;
53971+
53972+ if (wanted > acl->res[res].rlim_max)
53973+ acl->res[res].rlim_max = res_add;
53974+
53975+ /* only log the subject filename, since resource logging is supported for
53976+ single-subject learning only */
53977+ rcu_read_lock();
53978+ cred = __task_cred(task);
53979+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
53980+ task->role->roletype, cred->uid, cred->gid, acl->filename,
53981+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
53982+ "", (unsigned long) res, &task->signal->saved_ip);
53983+ rcu_read_unlock();
53984+ }
53985+
53986+ return;
53987+}
53988+
53989+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
53990+void
53991+pax_set_initial_flags(struct linux_binprm *bprm)
53992+{
53993+ struct task_struct *task = current;
53994+ struct acl_subject_label *proc;
53995+ unsigned long flags;
53996+
53997+ if (unlikely(!(gr_status & GR_READY)))
53998+ return;
53999+
54000+ flags = pax_get_flags(task);
54001+
54002+ proc = task->acl;
54003+
54004+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
54005+ flags &= ~MF_PAX_PAGEEXEC;
54006+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
54007+ flags &= ~MF_PAX_SEGMEXEC;
54008+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
54009+ flags &= ~MF_PAX_RANDMMAP;
54010+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
54011+ flags &= ~MF_PAX_EMUTRAMP;
54012+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
54013+ flags &= ~MF_PAX_MPROTECT;
54014+
54015+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
54016+ flags |= MF_PAX_PAGEEXEC;
54017+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
54018+ flags |= MF_PAX_SEGMEXEC;
54019+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
54020+ flags |= MF_PAX_RANDMMAP;
54021+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
54022+ flags |= MF_PAX_EMUTRAMP;
54023+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
54024+ flags |= MF_PAX_MPROTECT;
54025+
54026+ pax_set_flags(task, flags);
54027+
54028+ return;
54029+}
54030+#endif
54031+
54032+#ifdef CONFIG_SYSCTL
54033+/* Eric Biederman likes breaking userland ABI and every inode-based security
54034+ system to save 35kb of memory */
54035+
54036+/* we modify the passed in filename, but adjust it back before returning */
54037+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
54038+{
54039+ struct name_entry *nmatch;
54040+ char *p, *lastp = NULL;
54041+ struct acl_object_label *obj = NULL, *tmp;
54042+ struct acl_subject_label *tmpsubj;
54043+ char c = '\0';
54044+
54045+ read_lock(&gr_inode_lock);
54046+
54047+ p = name + len - 1;
54048+ do {
54049+ nmatch = lookup_name_entry(name);
54050+ if (lastp != NULL)
54051+ *lastp = c;
54052+
54053+ if (nmatch == NULL)
54054+ goto next_component;
54055+ tmpsubj = current->acl;
54056+ do {
54057+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
54058+ if (obj != NULL) {
54059+ tmp = obj->globbed;
54060+ while (tmp) {
54061+ if (!glob_match(tmp->filename, name)) {
54062+ obj = tmp;
54063+ goto found_obj;
54064+ }
54065+ tmp = tmp->next;
54066+ }
54067+ goto found_obj;
54068+ }
54069+ } while ((tmpsubj = tmpsubj->parent_subject));
54070+next_component:
54071+ /* end case */
54072+ if (p == name)
54073+ break;
54074+
54075+ while (*p != '/')
54076+ p--;
54077+ if (p == name)
54078+ lastp = p + 1;
54079+ else {
54080+ lastp = p;
54081+ p--;
54082+ }
54083+ c = *lastp;
54084+ *lastp = '\0';
54085+ } while (1);
54086+found_obj:
54087+ read_unlock(&gr_inode_lock);
54088+ /* obj returned will always be non-null */
54089+ return obj;
54090+}
54091+
54092+/* returns 0 when allowing, non-zero on error
54093+ op of 0 is used for readdir, so we don't log the names of hidden files
54094+*/
54095+__u32
54096+gr_handle_sysctl(const struct ctl_table *table, const int op)
54097+{
54098+ ctl_table *tmp;
54099+ const char *proc_sys = "/proc/sys";
54100+ char *path;
54101+ struct acl_object_label *obj;
54102+ unsigned short len = 0, pos = 0, depth = 0, i;
54103+ __u32 err = 0;
54104+ __u32 mode = 0;
54105+
54106+ if (unlikely(!(gr_status & GR_READY)))
54107+ return 0;
54108+
54109+ /* for now, ignore operations on non-sysctl entries if it's not a
54110+ readdir*/
54111+ if (table->child != NULL && op != 0)
54112+ return 0;
54113+
54114+ mode |= GR_FIND;
54115+ /* it's only a read if it's an entry, read on dirs is for readdir */
54116+ if (op & MAY_READ)
54117+ mode |= GR_READ;
54118+ if (op & MAY_WRITE)
54119+ mode |= GR_WRITE;
54120+
54121+ preempt_disable();
54122+
54123+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
54124+
54125+ /* it's only a read/write if it's an actual entry, not a dir
54126+ (which are opened for readdir)
54127+ */
54128+
54129+ /* convert the requested sysctl entry into a pathname */
54130+
54131+ for (tmp = (ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54132+ len += strlen(tmp->procname);
54133+ len++;
54134+ depth++;
54135+ }
54136+
54137+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
54138+ /* deny */
54139+ goto out;
54140+ }
54141+
54142+ memset(path, 0, PAGE_SIZE);
54143+
54144+ memcpy(path, proc_sys, strlen(proc_sys));
54145+
54146+ pos += strlen(proc_sys);
54147+
54148+ for (; depth > 0; depth--) {
54149+ path[pos] = '/';
54150+ pos++;
54151+ for (i = 1, tmp = (ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54152+ if (depth == i) {
54153+ memcpy(path + pos, tmp->procname,
54154+ strlen(tmp->procname));
54155+ pos += strlen(tmp->procname);
54156+ }
54157+ i++;
54158+ }
54159+ }
54160+
54161+ obj = gr_lookup_by_name(path, pos);
54162+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
54163+
54164+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
54165+ ((err & mode) != mode))) {
54166+ __u32 new_mode = mode;
54167+
54168+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
54169+
54170+ err = 0;
54171+ gr_log_learn_sysctl(path, new_mode);
54172+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
54173+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
54174+ err = -ENOENT;
54175+ } else if (!(err & GR_FIND)) {
54176+ err = -ENOENT;
54177+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
54178+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
54179+ path, (mode & GR_READ) ? " reading" : "",
54180+ (mode & GR_WRITE) ? " writing" : "");
54181+ err = -EACCES;
54182+ } else if ((err & mode) != mode) {
54183+ err = -EACCES;
54184+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
54185+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
54186+ path, (mode & GR_READ) ? " reading" : "",
54187+ (mode & GR_WRITE) ? " writing" : "");
54188+ err = 0;
54189+ } else
54190+ err = 0;
54191+
54192+ out:
54193+ preempt_enable();
54194+
54195+ return err;
54196+}
54197+#endif
54198+
54199+int
54200+gr_handle_proc_ptrace(struct task_struct *task)
54201+{
54202+ struct file *filp;
54203+ struct task_struct *tmp = task;
54204+ struct task_struct *curtemp = current;
54205+ __u32 retmode;
54206+
54207+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54208+ if (unlikely(!(gr_status & GR_READY)))
54209+ return 0;
54210+#endif
54211+
54212+ read_lock(&tasklist_lock);
54213+ read_lock(&grsec_exec_file_lock);
54214+ filp = task->exec_file;
54215+
54216+ while (tmp->pid > 0) {
54217+ if (tmp == curtemp)
54218+ break;
54219+ tmp = tmp->real_parent;
54220+ }
54221+
54222+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54223+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
54224+ read_unlock(&grsec_exec_file_lock);
54225+ read_unlock(&tasklist_lock);
54226+ return 1;
54227+ }
54228+
54229+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54230+ if (!(gr_status & GR_READY)) {
54231+ read_unlock(&grsec_exec_file_lock);
54232+ read_unlock(&tasklist_lock);
54233+ return 0;
54234+ }
54235+#endif
54236+
54237+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
54238+ read_unlock(&grsec_exec_file_lock);
54239+ read_unlock(&tasklist_lock);
54240+
54241+ if (retmode & GR_NOPTRACE)
54242+ return 1;
54243+
54244+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
54245+ && (current->acl != task->acl || (current->acl != current->role->root_label
54246+ && current->pid != task->pid)))
54247+ return 1;
54248+
54249+ return 0;
54250+}
54251+
54252+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
54253+{
54254+ if (unlikely(!(gr_status & GR_READY)))
54255+ return;
54256+
54257+ if (!(current->role->roletype & GR_ROLE_GOD))
54258+ return;
54259+
54260+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
54261+ p->role->rolename, gr_task_roletype_to_char(p),
54262+ p->acl->filename);
54263+}
54264+
54265+int
54266+gr_handle_ptrace(struct task_struct *task, const long request)
54267+{
54268+ struct task_struct *tmp = task;
54269+ struct task_struct *curtemp = current;
54270+ __u32 retmode;
54271+
54272+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54273+ if (unlikely(!(gr_status & GR_READY)))
54274+ return 0;
54275+#endif
54276+
54277+ read_lock(&tasklist_lock);
54278+ while (tmp->pid > 0) {
54279+ if (tmp == curtemp)
54280+ break;
54281+ tmp = tmp->real_parent;
54282+ }
54283+
54284+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54285+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
54286+ read_unlock(&tasklist_lock);
54287+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54288+ return 1;
54289+ }
54290+ read_unlock(&tasklist_lock);
54291+
54292+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54293+ if (!(gr_status & GR_READY))
54294+ return 0;
54295+#endif
54296+
54297+ read_lock(&grsec_exec_file_lock);
54298+ if (unlikely(!task->exec_file)) {
54299+ read_unlock(&grsec_exec_file_lock);
54300+ return 0;
54301+ }
54302+
54303+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
54304+ read_unlock(&grsec_exec_file_lock);
54305+
54306+ if (retmode & GR_NOPTRACE) {
54307+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54308+ return 1;
54309+ }
54310+
54311+ if (retmode & GR_PTRACERD) {
54312+ switch (request) {
54313+ case PTRACE_POKETEXT:
54314+ case PTRACE_POKEDATA:
54315+ case PTRACE_POKEUSR:
54316+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
54317+ case PTRACE_SETREGS:
54318+ case PTRACE_SETFPREGS:
54319+#endif
54320+#ifdef CONFIG_X86
54321+ case PTRACE_SETFPXREGS:
54322+#endif
54323+#ifdef CONFIG_ALTIVEC
54324+ case PTRACE_SETVRREGS:
54325+#endif
54326+ return 1;
54327+ default:
54328+ return 0;
54329+ }
54330+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
54331+ !(current->role->roletype & GR_ROLE_GOD) &&
54332+ (current->acl != task->acl)) {
54333+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54334+ return 1;
54335+ }
54336+
54337+ return 0;
54338+}
54339+
54340+static int is_writable_mmap(const struct file *filp)
54341+{
54342+ struct task_struct *task = current;
54343+ struct acl_object_label *obj, *obj2;
54344+
54345+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
54346+ !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode) && (filp->f_path.mnt != shm_mnt || (filp->f_path.dentry->d_inode->i_nlink > 0))) {
54347+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54348+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
54349+ task->role->root_label);
54350+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
54351+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
54352+ return 1;
54353+ }
54354+ }
54355+ return 0;
54356+}
54357+
54358+int
54359+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
54360+{
54361+ __u32 mode;
54362+
54363+ if (unlikely(!file || !(prot & PROT_EXEC)))
54364+ return 1;
54365+
54366+ if (is_writable_mmap(file))
54367+ return 0;
54368+
54369+ mode =
54370+ gr_search_file(file->f_path.dentry,
54371+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54372+ file->f_path.mnt);
54373+
54374+ if (!gr_tpe_allow(file))
54375+ return 0;
54376+
54377+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54378+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54379+ return 0;
54380+ } else if (unlikely(!(mode & GR_EXEC))) {
54381+ return 0;
54382+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54383+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54384+ return 1;
54385+ }
54386+
54387+ return 1;
54388+}
54389+
54390+int
54391+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
54392+{
54393+ __u32 mode;
54394+
54395+ if (unlikely(!file || !(prot & PROT_EXEC)))
54396+ return 1;
54397+
54398+ if (is_writable_mmap(file))
54399+ return 0;
54400+
54401+ mode =
54402+ gr_search_file(file->f_path.dentry,
54403+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54404+ file->f_path.mnt);
54405+
54406+ if (!gr_tpe_allow(file))
54407+ return 0;
54408+
54409+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54410+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54411+ return 0;
54412+ } else if (unlikely(!(mode & GR_EXEC))) {
54413+ return 0;
54414+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54415+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54416+ return 1;
54417+ }
54418+
54419+ return 1;
54420+}
54421+
54422+void
54423+gr_acl_handle_psacct(struct task_struct *task, const long code)
54424+{
54425+ unsigned long runtime;
54426+ unsigned long cputime;
54427+ unsigned int wday, cday;
54428+ __u8 whr, chr;
54429+ __u8 wmin, cmin;
54430+ __u8 wsec, csec;
54431+ struct timespec timeval;
54432+
54433+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
54434+ !(task->acl->mode & GR_PROCACCT)))
54435+ return;
54436+
54437+ do_posix_clock_monotonic_gettime(&timeval);
54438+ runtime = timeval.tv_sec - task->start_time.tv_sec;
54439+ wday = runtime / (3600 * 24);
54440+ runtime -= wday * (3600 * 24);
54441+ whr = runtime / 3600;
54442+ runtime -= whr * 3600;
54443+ wmin = runtime / 60;
54444+ runtime -= wmin * 60;
54445+ wsec = runtime;
54446+
54447+ cputime = (task->utime + task->stime) / HZ;
54448+ cday = cputime / (3600 * 24);
54449+ cputime -= cday * (3600 * 24);
54450+ chr = cputime / 3600;
54451+ cputime -= chr * 3600;
54452+ cmin = cputime / 60;
54453+ cputime -= cmin * 60;
54454+ csec = cputime;
54455+
54456+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
54457+
54458+ return;
54459+}
54460+
54461+void gr_set_kernel_label(struct task_struct *task)
54462+{
54463+ if (gr_status & GR_READY) {
54464+ task->role = kernel_role;
54465+ task->acl = kernel_role->root_label;
54466+ }
54467+ return;
54468+}
54469+
54470+#ifdef CONFIG_TASKSTATS
54471+int gr_is_taskstats_denied(int pid)
54472+{
54473+ struct task_struct *task;
54474+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54475+ const struct cred *cred;
54476+#endif
54477+ int ret = 0;
54478+
54479+ /* restrict taskstats viewing to un-chrooted root users
54480+ who have the 'view' subject flag if the RBAC system is enabled
54481+ */
54482+
54483+ rcu_read_lock();
54484+ read_lock(&tasklist_lock);
54485+ task = find_task_by_vpid(pid);
54486+ if (task) {
54487+#ifdef CONFIG_GRKERNSEC_CHROOT
54488+ if (proc_is_chrooted(task))
54489+ ret = -EACCES;
54490+#endif
54491+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54492+ cred = __task_cred(task);
54493+#ifdef CONFIG_GRKERNSEC_PROC_USER
54494+ if (cred->uid != 0)
54495+ ret = -EACCES;
54496+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54497+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
54498+ ret = -EACCES;
54499+#endif
54500+#endif
54501+ if (gr_status & GR_READY) {
54502+ if (!(task->acl->mode & GR_VIEW))
54503+ ret = -EACCES;
54504+ }
54505+ } else
54506+ ret = -ENOENT;
54507+
54508+ read_unlock(&tasklist_lock);
54509+ rcu_read_unlock();
54510+
54511+ return ret;
54512+}
54513+#endif
54514+
54515+/* AUXV entries are filled via a descendant of search_binary_handler
54516+ after we've already applied the subject for the target
54517+*/
54518+int gr_acl_enable_at_secure(void)
54519+{
54520+ if (unlikely(!(gr_status & GR_READY)))
54521+ return 0;
54522+
54523+ if (current->acl->mode & GR_ATSECURE)
54524+ return 1;
54525+
54526+ return 0;
54527+}
54528+
54529+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
54530+{
54531+ struct task_struct *task = current;
54532+ struct dentry *dentry = file->f_path.dentry;
54533+ struct vfsmount *mnt = file->f_path.mnt;
54534+ struct acl_object_label *obj, *tmp;
54535+ struct acl_subject_label *subj;
54536+ unsigned int bufsize;
54537+ int is_not_root;
54538+ char *path;
54539+ dev_t dev = __get_dev(dentry);
54540+
54541+ if (unlikely(!(gr_status & GR_READY)))
54542+ return 1;
54543+
54544+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
54545+ return 1;
54546+
54547+ /* ignore Eric Biederman */
54548+ if (IS_PRIVATE(dentry->d_inode))
54549+ return 1;
54550+
54551+ subj = task->acl;
54552+ do {
54553+ obj = lookup_acl_obj_label(ino, dev, subj);
54554+ if (obj != NULL)
54555+ return (obj->mode & GR_FIND) ? 1 : 0;
54556+ } while ((subj = subj->parent_subject));
54557+
54558+ /* this is purely an optimization since we're looking for an object
54559+ for the directory we're doing a readdir on
54560+ if it's possible for any globbed object to match the entry we're
54561+ filling into the directory, then the object we find here will be
54562+ an anchor point with attached globbed objects
54563+ */
54564+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
54565+ if (obj->globbed == NULL)
54566+ return (obj->mode & GR_FIND) ? 1 : 0;
54567+
54568+ is_not_root = ((obj->filename[0] == '/') &&
54569+ (obj->filename[1] == '\0')) ? 0 : 1;
54570+ bufsize = PAGE_SIZE - namelen - is_not_root;
54571+
54572+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
54573+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
54574+ return 1;
54575+
54576+ preempt_disable();
54577+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
54578+ bufsize);
54579+
54580+ bufsize = strlen(path);
54581+
54582+ /* if base is "/", don't append an additional slash */
54583+ if (is_not_root)
54584+ *(path + bufsize) = '/';
54585+ memcpy(path + bufsize + is_not_root, name, namelen);
54586+ *(path + bufsize + namelen + is_not_root) = '\0';
54587+
54588+ tmp = obj->globbed;
54589+ while (tmp) {
54590+ if (!glob_match(tmp->filename, path)) {
54591+ preempt_enable();
54592+ return (tmp->mode & GR_FIND) ? 1 : 0;
54593+ }
54594+ tmp = tmp->next;
54595+ }
54596+ preempt_enable();
54597+ return (obj->mode & GR_FIND) ? 1 : 0;
54598+}
54599+
54600+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
54601+EXPORT_SYMBOL(gr_acl_is_enabled);
54602+#endif
54603+EXPORT_SYMBOL(gr_learn_resource);
54604+EXPORT_SYMBOL(gr_set_kernel_label);
54605+#ifdef CONFIG_SECURITY
54606+EXPORT_SYMBOL(gr_check_user_change);
54607+EXPORT_SYMBOL(gr_check_group_change);
54608+#endif
54609+
54610diff -urNp linux-2.6.32.46/grsecurity/gracl_cap.c linux-2.6.32.46/grsecurity/gracl_cap.c
54611--- linux-2.6.32.46/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
54612+++ linux-2.6.32.46/grsecurity/gracl_cap.c 2011-09-14 08:53:50.000000000 -0400
54613@@ -0,0 +1,101 @@
54614+#include <linux/kernel.h>
54615+#include <linux/module.h>
54616+#include <linux/sched.h>
54617+#include <linux/gracl.h>
54618+#include <linux/grsecurity.h>
54619+#include <linux/grinternal.h>
54620+
54621+extern const char *captab_log[];
54622+extern int captab_log_entries;
54623+
54624+int
54625+gr_acl_is_capable(const int cap)
54626+{
54627+ struct task_struct *task = current;
54628+ const struct cred *cred = current_cred();
54629+ struct acl_subject_label *curracl;
54630+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
54631+ kernel_cap_t cap_audit = __cap_empty_set;
54632+
54633+ if (!gr_acl_is_enabled())
54634+ return 1;
54635+
54636+ curracl = task->acl;
54637+
54638+ cap_drop = curracl->cap_lower;
54639+ cap_mask = curracl->cap_mask;
54640+ cap_audit = curracl->cap_invert_audit;
54641+
54642+ while ((curracl = curracl->parent_subject)) {
54643+ /* if the cap isn't specified in the current computed mask but is specified in the
54644+ current level subject, and is lowered in the current level subject, then add
54645+ it to the set of dropped capabilities
54646+ otherwise, add the current level subject's mask to the current computed mask
54647+ */
54648+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
54649+ cap_raise(cap_mask, cap);
54650+ if (cap_raised(curracl->cap_lower, cap))
54651+ cap_raise(cap_drop, cap);
54652+ if (cap_raised(curracl->cap_invert_audit, cap))
54653+ cap_raise(cap_audit, cap);
54654+ }
54655+ }
54656+
54657+ if (!cap_raised(cap_drop, cap)) {
54658+ if (cap_raised(cap_audit, cap))
54659+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
54660+ return 1;
54661+ }
54662+
54663+ curracl = task->acl;
54664+
54665+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
54666+ && cap_raised(cred->cap_effective, cap)) {
54667+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
54668+ task->role->roletype, cred->uid,
54669+ cred->gid, task->exec_file ?
54670+ gr_to_filename(task->exec_file->f_path.dentry,
54671+ task->exec_file->f_path.mnt) : curracl->filename,
54672+ curracl->filename, 0UL,
54673+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
54674+ return 1;
54675+ }
54676+
54677+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
54678+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
54679+ return 0;
54680+}
54681+
54682+int
54683+gr_acl_is_capable_nolog(const int cap)
54684+{
54685+ struct acl_subject_label *curracl;
54686+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
54687+
54688+ if (!gr_acl_is_enabled())
54689+ return 1;
54690+
54691+ curracl = current->acl;
54692+
54693+ cap_drop = curracl->cap_lower;
54694+ cap_mask = curracl->cap_mask;
54695+
54696+ while ((curracl = curracl->parent_subject)) {
54697+ /* if the cap isn't specified in the current computed mask but is specified in the
54698+ current level subject, and is lowered in the current level subject, then add
54699+ it to the set of dropped capabilities
54700+ otherwise, add the current level subject's mask to the current computed mask
54701+ */
54702+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
54703+ cap_raise(cap_mask, cap);
54704+ if (cap_raised(curracl->cap_lower, cap))
54705+ cap_raise(cap_drop, cap);
54706+ }
54707+ }
54708+
54709+ if (!cap_raised(cap_drop, cap))
54710+ return 1;
54711+
54712+ return 0;
54713+}
54714+
54715diff -urNp linux-2.6.32.46/grsecurity/gracl_fs.c linux-2.6.32.46/grsecurity/gracl_fs.c
54716--- linux-2.6.32.46/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
54717+++ linux-2.6.32.46/grsecurity/gracl_fs.c 2011-04-17 15:56:46.000000000 -0400
54718@@ -0,0 +1,431 @@
54719+#include <linux/kernel.h>
54720+#include <linux/sched.h>
54721+#include <linux/types.h>
54722+#include <linux/fs.h>
54723+#include <linux/file.h>
54724+#include <linux/stat.h>
54725+#include <linux/grsecurity.h>
54726+#include <linux/grinternal.h>
54727+#include <linux/gracl.h>
54728+
54729+__u32
54730+gr_acl_handle_hidden_file(const struct dentry * dentry,
54731+ const struct vfsmount * mnt)
54732+{
54733+ __u32 mode;
54734+
54735+ if (unlikely(!dentry->d_inode))
54736+ return GR_FIND;
54737+
54738+ mode =
54739+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
54740+
54741+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
54742+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
54743+ return mode;
54744+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
54745+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
54746+ return 0;
54747+ } else if (unlikely(!(mode & GR_FIND)))
54748+ return 0;
54749+
54750+ return GR_FIND;
54751+}
54752+
54753+__u32
54754+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
54755+ const int fmode)
54756+{
54757+ __u32 reqmode = GR_FIND;
54758+ __u32 mode;
54759+
54760+ if (unlikely(!dentry->d_inode))
54761+ return reqmode;
54762+
54763+ if (unlikely(fmode & O_APPEND))
54764+ reqmode |= GR_APPEND;
54765+ else if (unlikely(fmode & FMODE_WRITE))
54766+ reqmode |= GR_WRITE;
54767+ if (likely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY)))
54768+ reqmode |= GR_READ;
54769+ if ((fmode & FMODE_GREXEC) && (fmode & FMODE_EXEC))
54770+ reqmode &= ~GR_READ;
54771+ mode =
54772+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
54773+ mnt);
54774+
54775+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
54776+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
54777+ reqmode & GR_READ ? " reading" : "",
54778+ reqmode & GR_WRITE ? " writing" : reqmode &
54779+ GR_APPEND ? " appending" : "");
54780+ return reqmode;
54781+ } else
54782+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
54783+ {
54784+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
54785+ reqmode & GR_READ ? " reading" : "",
54786+ reqmode & GR_WRITE ? " writing" : reqmode &
54787+ GR_APPEND ? " appending" : "");
54788+ return 0;
54789+ } else if (unlikely((mode & reqmode) != reqmode))
54790+ return 0;
54791+
54792+ return reqmode;
54793+}
54794+
54795+__u32
54796+gr_acl_handle_creat(const struct dentry * dentry,
54797+ const struct dentry * p_dentry,
54798+ const struct vfsmount * p_mnt, const int fmode,
54799+ const int imode)
54800+{
54801+ __u32 reqmode = GR_WRITE | GR_CREATE;
54802+ __u32 mode;
54803+
54804+ if (unlikely(fmode & O_APPEND))
54805+ reqmode |= GR_APPEND;
54806+ if (unlikely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY)))
54807+ reqmode |= GR_READ;
54808+ if (unlikely((fmode & O_CREAT) && (imode & (S_ISUID | S_ISGID))))
54809+ reqmode |= GR_SETID;
54810+
54811+ mode =
54812+ gr_check_create(dentry, p_dentry, p_mnt,
54813+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
54814+
54815+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
54816+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
54817+ reqmode & GR_READ ? " reading" : "",
54818+ reqmode & GR_WRITE ? " writing" : reqmode &
54819+ GR_APPEND ? " appending" : "");
54820+ return reqmode;
54821+ } else
54822+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
54823+ {
54824+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
54825+ reqmode & GR_READ ? " reading" : "",
54826+ reqmode & GR_WRITE ? " writing" : reqmode &
54827+ GR_APPEND ? " appending" : "");
54828+ return 0;
54829+ } else if (unlikely((mode & reqmode) != reqmode))
54830+ return 0;
54831+
54832+ return reqmode;
54833+}
54834+
54835+__u32
54836+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
54837+ const int fmode)
54838+{
54839+ __u32 mode, reqmode = GR_FIND;
54840+
54841+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
54842+ reqmode |= GR_EXEC;
54843+ if (fmode & S_IWOTH)
54844+ reqmode |= GR_WRITE;
54845+ if (fmode & S_IROTH)
54846+ reqmode |= GR_READ;
54847+
54848+ mode =
54849+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
54850+ mnt);
54851+
54852+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
54853+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
54854+ reqmode & GR_READ ? " reading" : "",
54855+ reqmode & GR_WRITE ? " writing" : "",
54856+ reqmode & GR_EXEC ? " executing" : "");
54857+ return reqmode;
54858+ } else
54859+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
54860+ {
54861+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
54862+ reqmode & GR_READ ? " reading" : "",
54863+ reqmode & GR_WRITE ? " writing" : "",
54864+ reqmode & GR_EXEC ? " executing" : "");
54865+ return 0;
54866+ } else if (unlikely((mode & reqmode) != reqmode))
54867+ return 0;
54868+
54869+ return reqmode;
54870+}
54871+
54872+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
54873+{
54874+ __u32 mode;
54875+
54876+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
54877+
54878+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
54879+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
54880+ return mode;
54881+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
54882+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
54883+ return 0;
54884+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
54885+ return 0;
54886+
54887+ return (reqmode);
54888+}
54889+
54890+__u32
54891+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
54892+{
54893+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
54894+}
54895+
54896+__u32
54897+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
54898+{
54899+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
54900+}
54901+
54902+__u32
54903+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
54904+{
54905+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
54906+}
54907+
54908+__u32
54909+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
54910+{
54911+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
54912+}
54913+
54914+__u32
54915+gr_acl_handle_fchmod(const struct dentry *dentry, const struct vfsmount *mnt,
54916+ mode_t mode)
54917+{
54918+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
54919+ return 1;
54920+
54921+ if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
54922+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
54923+ GR_FCHMOD_ACL_MSG);
54924+ } else {
54925+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_FCHMOD_ACL_MSG);
54926+ }
54927+}
54928+
54929+__u32
54930+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
54931+ mode_t mode)
54932+{
54933+ if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
54934+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
54935+ GR_CHMOD_ACL_MSG);
54936+ } else {
54937+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
54938+ }
54939+}
54940+
54941+__u32
54942+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
54943+{
54944+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
54945+}
54946+
54947+__u32
54948+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
54949+{
54950+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
54951+}
54952+
54953+__u32
54954+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
54955+{
54956+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
54957+}
54958+
54959+__u32
54960+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
54961+{
54962+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
54963+ GR_UNIXCONNECT_ACL_MSG);
54964+}
54965+
54966+/* hardlinks require at minimum create permission,
54967+ any additional privilege required is based on the
54968+ privilege of the file being linked to
54969+*/
54970+__u32
54971+gr_acl_handle_link(const struct dentry * new_dentry,
54972+ const struct dentry * parent_dentry,
54973+ const struct vfsmount * parent_mnt,
54974+ const struct dentry * old_dentry,
54975+ const struct vfsmount * old_mnt, const char *to)
54976+{
54977+ __u32 mode;
54978+ __u32 needmode = GR_CREATE | GR_LINK;
54979+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
54980+
54981+ mode =
54982+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
54983+ old_mnt);
54984+
54985+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
54986+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
54987+ return mode;
54988+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
54989+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
54990+ return 0;
54991+ } else if (unlikely((mode & needmode) != needmode))
54992+ return 0;
54993+
54994+ return 1;
54995+}
54996+
54997+__u32
54998+gr_acl_handle_symlink(const struct dentry * new_dentry,
54999+ const struct dentry * parent_dentry,
55000+ const struct vfsmount * parent_mnt, const char *from)
55001+{
55002+ __u32 needmode = GR_WRITE | GR_CREATE;
55003+ __u32 mode;
55004+
55005+ mode =
55006+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
55007+ GR_CREATE | GR_AUDIT_CREATE |
55008+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
55009+
55010+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
55011+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55012+ return mode;
55013+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55014+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55015+ return 0;
55016+ } else if (unlikely((mode & needmode) != needmode))
55017+ return 0;
55018+
55019+ return (GR_WRITE | GR_CREATE);
55020+}
55021+
55022+static __u32 generic_fs_create_handler(const struct dentry *new_dentry, const struct dentry *parent_dentry, const struct vfsmount *parent_mnt, __u32 reqmode, const char *fmt)
55023+{
55024+ __u32 mode;
55025+
55026+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55027+
55028+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55029+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
55030+ return mode;
55031+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55032+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
55033+ return 0;
55034+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55035+ return 0;
55036+
55037+ return (reqmode);
55038+}
55039+
55040+__u32
55041+gr_acl_handle_mknod(const struct dentry * new_dentry,
55042+ const struct dentry * parent_dentry,
55043+ const struct vfsmount * parent_mnt,
55044+ const int mode)
55045+{
55046+ __u32 reqmode = GR_WRITE | GR_CREATE;
55047+ if (unlikely(mode & (S_ISUID | S_ISGID)))
55048+ reqmode |= GR_SETID;
55049+
55050+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55051+ reqmode, GR_MKNOD_ACL_MSG);
55052+}
55053+
55054+__u32
55055+gr_acl_handle_mkdir(const struct dentry *new_dentry,
55056+ const struct dentry *parent_dentry,
55057+ const struct vfsmount *parent_mnt)
55058+{
55059+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55060+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
55061+}
55062+
55063+#define RENAME_CHECK_SUCCESS(old, new) \
55064+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
55065+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
55066+
55067+int
55068+gr_acl_handle_rename(struct dentry *new_dentry,
55069+ struct dentry *parent_dentry,
55070+ const struct vfsmount *parent_mnt,
55071+ struct dentry *old_dentry,
55072+ struct inode *old_parent_inode,
55073+ struct vfsmount *old_mnt, const char *newname)
55074+{
55075+ __u32 comp1, comp2;
55076+ int error = 0;
55077+
55078+ if (unlikely(!gr_acl_is_enabled()))
55079+ return 0;
55080+
55081+ if (!new_dentry->d_inode) {
55082+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
55083+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
55084+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
55085+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
55086+ GR_DELETE | GR_AUDIT_DELETE |
55087+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55088+ GR_SUPPRESS, old_mnt);
55089+ } else {
55090+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
55091+ GR_CREATE | GR_DELETE |
55092+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
55093+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55094+ GR_SUPPRESS, parent_mnt);
55095+ comp2 =
55096+ gr_search_file(old_dentry,
55097+ GR_READ | GR_WRITE | GR_AUDIT_READ |
55098+ GR_DELETE | GR_AUDIT_DELETE |
55099+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
55100+ }
55101+
55102+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
55103+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
55104+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55105+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
55106+ && !(comp2 & GR_SUPPRESS)) {
55107+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55108+ error = -EACCES;
55109+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
55110+ error = -EACCES;
55111+
55112+ return error;
55113+}
55114+
55115+void
55116+gr_acl_handle_exit(void)
55117+{
55118+ u16 id;
55119+ char *rolename;
55120+ struct file *exec_file;
55121+
55122+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
55123+ !(current->role->roletype & GR_ROLE_PERSIST))) {
55124+ id = current->acl_role_id;
55125+ rolename = current->role->rolename;
55126+ gr_set_acls(1);
55127+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
55128+ }
55129+
55130+ write_lock(&grsec_exec_file_lock);
55131+ exec_file = current->exec_file;
55132+ current->exec_file = NULL;
55133+ write_unlock(&grsec_exec_file_lock);
55134+
55135+ if (exec_file)
55136+ fput(exec_file);
55137+}
55138+
55139+int
55140+gr_acl_handle_procpidmem(const struct task_struct *task)
55141+{
55142+ if (unlikely(!gr_acl_is_enabled()))
55143+ return 0;
55144+
55145+ if (task != current && task->acl->mode & GR_PROTPROCFD)
55146+ return -EACCES;
55147+
55148+ return 0;
55149+}
55150diff -urNp linux-2.6.32.46/grsecurity/gracl_ip.c linux-2.6.32.46/grsecurity/gracl_ip.c
55151--- linux-2.6.32.46/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
55152+++ linux-2.6.32.46/grsecurity/gracl_ip.c 2011-04-17 15:56:46.000000000 -0400
55153@@ -0,0 +1,382 @@
55154+#include <linux/kernel.h>
55155+#include <asm/uaccess.h>
55156+#include <asm/errno.h>
55157+#include <net/sock.h>
55158+#include <linux/file.h>
55159+#include <linux/fs.h>
55160+#include <linux/net.h>
55161+#include <linux/in.h>
55162+#include <linux/skbuff.h>
55163+#include <linux/ip.h>
55164+#include <linux/udp.h>
55165+#include <linux/smp_lock.h>
55166+#include <linux/types.h>
55167+#include <linux/sched.h>
55168+#include <linux/netdevice.h>
55169+#include <linux/inetdevice.h>
55170+#include <linux/gracl.h>
55171+#include <linux/grsecurity.h>
55172+#include <linux/grinternal.h>
55173+
55174+#define GR_BIND 0x01
55175+#define GR_CONNECT 0x02
55176+#define GR_INVERT 0x04
55177+#define GR_BINDOVERRIDE 0x08
55178+#define GR_CONNECTOVERRIDE 0x10
55179+#define GR_SOCK_FAMILY 0x20
55180+
55181+static const char * gr_protocols[IPPROTO_MAX] = {
55182+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
55183+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
55184+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
55185+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
55186+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
55187+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
55188+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
55189+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
55190+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
55191+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
55192+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
55193+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
55194+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
55195+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
55196+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
55197+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
55198+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
55199+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
55200+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
55201+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
55202+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
55203+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
55204+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
55205+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
55206+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
55207+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
55208+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
55209+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
55210+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
55211+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
55212+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
55213+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
55214+ };
55215+
55216+static const char * gr_socktypes[SOCK_MAX] = {
55217+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
55218+ "unknown:7", "unknown:8", "unknown:9", "packet"
55219+ };
55220+
55221+static const char * gr_sockfamilies[AF_MAX+1] = {
55222+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
55223+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
55224+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
55225+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154"
55226+ };
55227+
55228+const char *
55229+gr_proto_to_name(unsigned char proto)
55230+{
55231+ return gr_protocols[proto];
55232+}
55233+
55234+const char *
55235+gr_socktype_to_name(unsigned char type)
55236+{
55237+ return gr_socktypes[type];
55238+}
55239+
55240+const char *
55241+gr_sockfamily_to_name(unsigned char family)
55242+{
55243+ return gr_sockfamilies[family];
55244+}
55245+
55246+int
55247+gr_search_socket(const int domain, const int type, const int protocol)
55248+{
55249+ struct acl_subject_label *curr;
55250+ const struct cred *cred = current_cred();
55251+
55252+ if (unlikely(!gr_acl_is_enabled()))
55253+ goto exit;
55254+
55255+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
55256+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
55257+ goto exit; // let the kernel handle it
55258+
55259+ curr = current->acl;
55260+
55261+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
55262+ /* the family is allowed, if this is PF_INET allow it only if
55263+ the extra sock type/protocol checks pass */
55264+ if (domain == PF_INET)
55265+ goto inet_check;
55266+ goto exit;
55267+ } else {
55268+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55269+ __u32 fakeip = 0;
55270+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55271+ current->role->roletype, cred->uid,
55272+ cred->gid, current->exec_file ?
55273+ gr_to_filename(current->exec_file->f_path.dentry,
55274+ current->exec_file->f_path.mnt) :
55275+ curr->filename, curr->filename,
55276+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
55277+ &current->signal->saved_ip);
55278+ goto exit;
55279+ }
55280+ goto exit_fail;
55281+ }
55282+
55283+inet_check:
55284+ /* the rest of this checking is for IPv4 only */
55285+ if (!curr->ips)
55286+ goto exit;
55287+
55288+ if ((curr->ip_type & (1 << type)) &&
55289+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
55290+ goto exit;
55291+
55292+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55293+ /* we don't place acls on raw sockets , and sometimes
55294+ dgram/ip sockets are opened for ioctl and not
55295+ bind/connect, so we'll fake a bind learn log */
55296+ if (type == SOCK_RAW || type == SOCK_PACKET) {
55297+ __u32 fakeip = 0;
55298+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55299+ current->role->roletype, cred->uid,
55300+ cred->gid, current->exec_file ?
55301+ gr_to_filename(current->exec_file->f_path.dentry,
55302+ current->exec_file->f_path.mnt) :
55303+ curr->filename, curr->filename,
55304+ &fakeip, 0, type,
55305+ protocol, GR_CONNECT, &current->signal->saved_ip);
55306+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
55307+ __u32 fakeip = 0;
55308+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55309+ current->role->roletype, cred->uid,
55310+ cred->gid, current->exec_file ?
55311+ gr_to_filename(current->exec_file->f_path.dentry,
55312+ current->exec_file->f_path.mnt) :
55313+ curr->filename, curr->filename,
55314+ &fakeip, 0, type,
55315+ protocol, GR_BIND, &current->signal->saved_ip);
55316+ }
55317+ /* we'll log when they use connect or bind */
55318+ goto exit;
55319+ }
55320+
55321+exit_fail:
55322+ if (domain == PF_INET)
55323+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
55324+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
55325+ else
55326+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
55327+ gr_socktype_to_name(type), protocol);
55328+
55329+ return 0;
55330+exit:
55331+ return 1;
55332+}
55333+
55334+int check_ip_policy(struct acl_ip_label *ip, __u32 ip_addr, __u16 ip_port, __u8 protocol, const int mode, const int type, __u32 our_addr, __u32 our_netmask)
55335+{
55336+ if ((ip->mode & mode) &&
55337+ (ip_port >= ip->low) &&
55338+ (ip_port <= ip->high) &&
55339+ ((ntohl(ip_addr) & our_netmask) ==
55340+ (ntohl(our_addr) & our_netmask))
55341+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
55342+ && (ip->type & (1 << type))) {
55343+ if (ip->mode & GR_INVERT)
55344+ return 2; // specifically denied
55345+ else
55346+ return 1; // allowed
55347+ }
55348+
55349+ return 0; // not specifically allowed, may continue parsing
55350+}
55351+
55352+static int
55353+gr_search_connectbind(const int full_mode, struct sock *sk,
55354+ struct sockaddr_in *addr, const int type)
55355+{
55356+ char iface[IFNAMSIZ] = {0};
55357+ struct acl_subject_label *curr;
55358+ struct acl_ip_label *ip;
55359+ struct inet_sock *isk;
55360+ struct net_device *dev;
55361+ struct in_device *idev;
55362+ unsigned long i;
55363+ int ret;
55364+ int mode = full_mode & (GR_BIND | GR_CONNECT);
55365+ __u32 ip_addr = 0;
55366+ __u32 our_addr;
55367+ __u32 our_netmask;
55368+ char *p;
55369+ __u16 ip_port = 0;
55370+ const struct cred *cred = current_cred();
55371+
55372+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
55373+ return 0;
55374+
55375+ curr = current->acl;
55376+ isk = inet_sk(sk);
55377+
55378+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
55379+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
55380+ addr->sin_addr.s_addr = curr->inaddr_any_override;
55381+ if ((full_mode & GR_CONNECT) && isk->saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
55382+ struct sockaddr_in saddr;
55383+ int err;
55384+
55385+ saddr.sin_family = AF_INET;
55386+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
55387+ saddr.sin_port = isk->sport;
55388+
55389+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
55390+ if (err)
55391+ return err;
55392+
55393+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
55394+ if (err)
55395+ return err;
55396+ }
55397+
55398+ if (!curr->ips)
55399+ return 0;
55400+
55401+ ip_addr = addr->sin_addr.s_addr;
55402+ ip_port = ntohs(addr->sin_port);
55403+
55404+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55405+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55406+ current->role->roletype, cred->uid,
55407+ cred->gid, current->exec_file ?
55408+ gr_to_filename(current->exec_file->f_path.dentry,
55409+ current->exec_file->f_path.mnt) :
55410+ curr->filename, curr->filename,
55411+ &ip_addr, ip_port, type,
55412+ sk->sk_protocol, mode, &current->signal->saved_ip);
55413+ return 0;
55414+ }
55415+
55416+ for (i = 0; i < curr->ip_num; i++) {
55417+ ip = *(curr->ips + i);
55418+ if (ip->iface != NULL) {
55419+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
55420+ p = strchr(iface, ':');
55421+ if (p != NULL)
55422+ *p = '\0';
55423+ dev = dev_get_by_name(sock_net(sk), iface);
55424+ if (dev == NULL)
55425+ continue;
55426+ idev = in_dev_get(dev);
55427+ if (idev == NULL) {
55428+ dev_put(dev);
55429+ continue;
55430+ }
55431+ rcu_read_lock();
55432+ for_ifa(idev) {
55433+ if (!strcmp(ip->iface, ifa->ifa_label)) {
55434+ our_addr = ifa->ifa_address;
55435+ our_netmask = 0xffffffff;
55436+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
55437+ if (ret == 1) {
55438+ rcu_read_unlock();
55439+ in_dev_put(idev);
55440+ dev_put(dev);
55441+ return 0;
55442+ } else if (ret == 2) {
55443+ rcu_read_unlock();
55444+ in_dev_put(idev);
55445+ dev_put(dev);
55446+ goto denied;
55447+ }
55448+ }
55449+ } endfor_ifa(idev);
55450+ rcu_read_unlock();
55451+ in_dev_put(idev);
55452+ dev_put(dev);
55453+ } else {
55454+ our_addr = ip->addr;
55455+ our_netmask = ip->netmask;
55456+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
55457+ if (ret == 1)
55458+ return 0;
55459+ else if (ret == 2)
55460+ goto denied;
55461+ }
55462+ }
55463+
55464+denied:
55465+ if (mode == GR_BIND)
55466+ gr_log_int5_str2(GR_DONT_AUDIT, GR_BIND_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol));
55467+ else if (mode == GR_CONNECT)
55468+ gr_log_int5_str2(GR_DONT_AUDIT, GR_CONNECT_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol));
55469+
55470+ return -EACCES;
55471+}
55472+
55473+int
55474+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
55475+{
55476+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
55477+}
55478+
55479+int
55480+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
55481+{
55482+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
55483+}
55484+
55485+int gr_search_listen(struct socket *sock)
55486+{
55487+ struct sock *sk = sock->sk;
55488+ struct sockaddr_in addr;
55489+
55490+ addr.sin_addr.s_addr = inet_sk(sk)->saddr;
55491+ addr.sin_port = inet_sk(sk)->sport;
55492+
55493+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
55494+}
55495+
55496+int gr_search_accept(struct socket *sock)
55497+{
55498+ struct sock *sk = sock->sk;
55499+ struct sockaddr_in addr;
55500+
55501+ addr.sin_addr.s_addr = inet_sk(sk)->saddr;
55502+ addr.sin_port = inet_sk(sk)->sport;
55503+
55504+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
55505+}
55506+
55507+int
55508+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
55509+{
55510+ if (addr)
55511+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
55512+ else {
55513+ struct sockaddr_in sin;
55514+ const struct inet_sock *inet = inet_sk(sk);
55515+
55516+ sin.sin_addr.s_addr = inet->daddr;
55517+ sin.sin_port = inet->dport;
55518+
55519+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
55520+ }
55521+}
55522+
55523+int
55524+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
55525+{
55526+ struct sockaddr_in sin;
55527+
55528+ if (unlikely(skb->len < sizeof (struct udphdr)))
55529+ return 0; // skip this packet
55530+
55531+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
55532+ sin.sin_port = udp_hdr(skb)->source;
55533+
55534+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
55535+}
55536diff -urNp linux-2.6.32.46/grsecurity/gracl_learn.c linux-2.6.32.46/grsecurity/gracl_learn.c
55537--- linux-2.6.32.46/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
55538+++ linux-2.6.32.46/grsecurity/gracl_learn.c 2011-07-14 21:02:03.000000000 -0400
55539@@ -0,0 +1,208 @@
55540+#include <linux/kernel.h>
55541+#include <linux/mm.h>
55542+#include <linux/sched.h>
55543+#include <linux/poll.h>
55544+#include <linux/smp_lock.h>
55545+#include <linux/string.h>
55546+#include <linux/file.h>
55547+#include <linux/types.h>
55548+#include <linux/vmalloc.h>
55549+#include <linux/grinternal.h>
55550+
55551+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
55552+ size_t count, loff_t *ppos);
55553+extern int gr_acl_is_enabled(void);
55554+
55555+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
55556+static int gr_learn_attached;
55557+
55558+/* use a 512k buffer */
55559+#define LEARN_BUFFER_SIZE (512 * 1024)
55560+
55561+static DEFINE_SPINLOCK(gr_learn_lock);
55562+static DEFINE_MUTEX(gr_learn_user_mutex);
55563+
55564+/* we need to maintain two buffers, so that the kernel context of grlearn
55565+ uses a semaphore around the userspace copying, and the other kernel contexts
55566+ use a spinlock when copying into the buffer, since they cannot sleep
55567+*/
55568+static char *learn_buffer;
55569+static char *learn_buffer_user;
55570+static int learn_buffer_len;
55571+static int learn_buffer_user_len;
55572+
55573+static ssize_t
55574+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
55575+{
55576+ DECLARE_WAITQUEUE(wait, current);
55577+ ssize_t retval = 0;
55578+
55579+ add_wait_queue(&learn_wait, &wait);
55580+ set_current_state(TASK_INTERRUPTIBLE);
55581+ do {
55582+ mutex_lock(&gr_learn_user_mutex);
55583+ spin_lock(&gr_learn_lock);
55584+ if (learn_buffer_len)
55585+ break;
55586+ spin_unlock(&gr_learn_lock);
55587+ mutex_unlock(&gr_learn_user_mutex);
55588+ if (file->f_flags & O_NONBLOCK) {
55589+ retval = -EAGAIN;
55590+ goto out;
55591+ }
55592+ if (signal_pending(current)) {
55593+ retval = -ERESTARTSYS;
55594+ goto out;
55595+ }
55596+
55597+ schedule();
55598+ } while (1);
55599+
55600+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
55601+ learn_buffer_user_len = learn_buffer_len;
55602+ retval = learn_buffer_len;
55603+ learn_buffer_len = 0;
55604+
55605+ spin_unlock(&gr_learn_lock);
55606+
55607+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
55608+ retval = -EFAULT;
55609+
55610+ mutex_unlock(&gr_learn_user_mutex);
55611+out:
55612+ set_current_state(TASK_RUNNING);
55613+ remove_wait_queue(&learn_wait, &wait);
55614+ return retval;
55615+}
55616+
55617+static unsigned int
55618+poll_learn(struct file * file, poll_table * wait)
55619+{
55620+ poll_wait(file, &learn_wait, wait);
55621+
55622+ if (learn_buffer_len)
55623+ return (POLLIN | POLLRDNORM);
55624+
55625+ return 0;
55626+}
55627+
55628+void
55629+gr_clear_learn_entries(void)
55630+{
55631+ char *tmp;
55632+
55633+ mutex_lock(&gr_learn_user_mutex);
55634+ spin_lock(&gr_learn_lock);
55635+ tmp = learn_buffer;
55636+ learn_buffer = NULL;
55637+ spin_unlock(&gr_learn_lock);
55638+ if (tmp)
55639+ vfree(tmp);
55640+ if (learn_buffer_user != NULL) {
55641+ vfree(learn_buffer_user);
55642+ learn_buffer_user = NULL;
55643+ }
55644+ learn_buffer_len = 0;
55645+ mutex_unlock(&gr_learn_user_mutex);
55646+
55647+ return;
55648+}
55649+
55650+void
55651+gr_add_learn_entry(const char *fmt, ...)
55652+{
55653+ va_list args;
55654+ unsigned int len;
55655+
55656+ if (!gr_learn_attached)
55657+ return;
55658+
55659+ spin_lock(&gr_learn_lock);
55660+
55661+ /* leave a gap at the end so we know when it's "full" but don't have to
55662+ compute the exact length of the string we're trying to append
55663+ */
55664+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
55665+ spin_unlock(&gr_learn_lock);
55666+ wake_up_interruptible(&learn_wait);
55667+ return;
55668+ }
55669+ if (learn_buffer == NULL) {
55670+ spin_unlock(&gr_learn_lock);
55671+ return;
55672+ }
55673+
55674+ va_start(args, fmt);
55675+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
55676+ va_end(args);
55677+
55678+ learn_buffer_len += len + 1;
55679+
55680+ spin_unlock(&gr_learn_lock);
55681+ wake_up_interruptible(&learn_wait);
55682+
55683+ return;
55684+}
55685+
55686+static int
55687+open_learn(struct inode *inode, struct file *file)
55688+{
55689+ if (file->f_mode & FMODE_READ && gr_learn_attached)
55690+ return -EBUSY;
55691+ if (file->f_mode & FMODE_READ) {
55692+ int retval = 0;
55693+ mutex_lock(&gr_learn_user_mutex);
55694+ if (learn_buffer == NULL)
55695+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
55696+ if (learn_buffer_user == NULL)
55697+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
55698+ if (learn_buffer == NULL) {
55699+ retval = -ENOMEM;
55700+ goto out_error;
55701+ }
55702+ if (learn_buffer_user == NULL) {
55703+ retval = -ENOMEM;
55704+ goto out_error;
55705+ }
55706+ learn_buffer_len = 0;
55707+ learn_buffer_user_len = 0;
55708+ gr_learn_attached = 1;
55709+out_error:
55710+ mutex_unlock(&gr_learn_user_mutex);
55711+ return retval;
55712+ }
55713+ return 0;
55714+}
55715+
55716+static int
55717+close_learn(struct inode *inode, struct file *file)
55718+{
55719+ if (file->f_mode & FMODE_READ) {
55720+ char *tmp = NULL;
55721+ mutex_lock(&gr_learn_user_mutex);
55722+ spin_lock(&gr_learn_lock);
55723+ tmp = learn_buffer;
55724+ learn_buffer = NULL;
55725+ spin_unlock(&gr_learn_lock);
55726+ if (tmp)
55727+ vfree(tmp);
55728+ if (learn_buffer_user != NULL) {
55729+ vfree(learn_buffer_user);
55730+ learn_buffer_user = NULL;
55731+ }
55732+ learn_buffer_len = 0;
55733+ learn_buffer_user_len = 0;
55734+ gr_learn_attached = 0;
55735+ mutex_unlock(&gr_learn_user_mutex);
55736+ }
55737+
55738+ return 0;
55739+}
55740+
55741+const struct file_operations grsec_fops = {
55742+ .read = read_learn,
55743+ .write = write_grsec_handler,
55744+ .open = open_learn,
55745+ .release = close_learn,
55746+ .poll = poll_learn,
55747+};
55748diff -urNp linux-2.6.32.46/grsecurity/gracl_res.c linux-2.6.32.46/grsecurity/gracl_res.c
55749--- linux-2.6.32.46/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
55750+++ linux-2.6.32.46/grsecurity/gracl_res.c 2011-04-17 15:56:46.000000000 -0400
55751@@ -0,0 +1,67 @@
55752+#include <linux/kernel.h>
55753+#include <linux/sched.h>
55754+#include <linux/gracl.h>
55755+#include <linux/grinternal.h>
55756+
55757+static const char *restab_log[] = {
55758+ [RLIMIT_CPU] = "RLIMIT_CPU",
55759+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
55760+ [RLIMIT_DATA] = "RLIMIT_DATA",
55761+ [RLIMIT_STACK] = "RLIMIT_STACK",
55762+ [RLIMIT_CORE] = "RLIMIT_CORE",
55763+ [RLIMIT_RSS] = "RLIMIT_RSS",
55764+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
55765+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
55766+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
55767+ [RLIMIT_AS] = "RLIMIT_AS",
55768+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
55769+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
55770+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
55771+ [RLIMIT_NICE] = "RLIMIT_NICE",
55772+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
55773+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
55774+ [GR_CRASH_RES] = "RLIMIT_CRASH"
55775+};
55776+
55777+void
55778+gr_log_resource(const struct task_struct *task,
55779+ const int res, const unsigned long wanted, const int gt)
55780+{
55781+ const struct cred *cred;
55782+ unsigned long rlim;
55783+
55784+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
55785+ return;
55786+
55787+ // not yet supported resource
55788+ if (unlikely(!restab_log[res]))
55789+ return;
55790+
55791+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
55792+ rlim = task->signal->rlim[res].rlim_max;
55793+ else
55794+ rlim = task->signal->rlim[res].rlim_cur;
55795+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
55796+ return;
55797+
55798+ rcu_read_lock();
55799+ cred = __task_cred(task);
55800+
55801+ if (res == RLIMIT_NPROC &&
55802+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
55803+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
55804+ goto out_rcu_unlock;
55805+ else if (res == RLIMIT_MEMLOCK &&
55806+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
55807+ goto out_rcu_unlock;
55808+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
55809+ goto out_rcu_unlock;
55810+ rcu_read_unlock();
55811+
55812+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
55813+
55814+ return;
55815+out_rcu_unlock:
55816+ rcu_read_unlock();
55817+ return;
55818+}
55819diff -urNp linux-2.6.32.46/grsecurity/gracl_segv.c linux-2.6.32.46/grsecurity/gracl_segv.c
55820--- linux-2.6.32.46/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
55821+++ linux-2.6.32.46/grsecurity/gracl_segv.c 2011-04-17 15:56:46.000000000 -0400
55822@@ -0,0 +1,284 @@
55823+#include <linux/kernel.h>
55824+#include <linux/mm.h>
55825+#include <asm/uaccess.h>
55826+#include <asm/errno.h>
55827+#include <asm/mman.h>
55828+#include <net/sock.h>
55829+#include <linux/file.h>
55830+#include <linux/fs.h>
55831+#include <linux/net.h>
55832+#include <linux/in.h>
55833+#include <linux/smp_lock.h>
55834+#include <linux/slab.h>
55835+#include <linux/types.h>
55836+#include <linux/sched.h>
55837+#include <linux/timer.h>
55838+#include <linux/gracl.h>
55839+#include <linux/grsecurity.h>
55840+#include <linux/grinternal.h>
55841+
55842+static struct crash_uid *uid_set;
55843+static unsigned short uid_used;
55844+static DEFINE_SPINLOCK(gr_uid_lock);
55845+extern rwlock_t gr_inode_lock;
55846+extern struct acl_subject_label *
55847+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
55848+ struct acl_role_label *role);
55849+extern int gr_fake_force_sig(int sig, struct task_struct *t);
55850+
55851+int
55852+gr_init_uidset(void)
55853+{
55854+ uid_set =
55855+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
55856+ uid_used = 0;
55857+
55858+ return uid_set ? 1 : 0;
55859+}
55860+
55861+void
55862+gr_free_uidset(void)
55863+{
55864+ if (uid_set)
55865+ kfree(uid_set);
55866+
55867+ return;
55868+}
55869+
55870+int
55871+gr_find_uid(const uid_t uid)
55872+{
55873+ struct crash_uid *tmp = uid_set;
55874+ uid_t buid;
55875+ int low = 0, high = uid_used - 1, mid;
55876+
55877+ while (high >= low) {
55878+ mid = (low + high) >> 1;
55879+ buid = tmp[mid].uid;
55880+ if (buid == uid)
55881+ return mid;
55882+ if (buid > uid)
55883+ high = mid - 1;
55884+ if (buid < uid)
55885+ low = mid + 1;
55886+ }
55887+
55888+ return -1;
55889+}
55890+
55891+static __inline__ void
55892+gr_insertsort(void)
55893+{
55894+ unsigned short i, j;
55895+ struct crash_uid index;
55896+
55897+ for (i = 1; i < uid_used; i++) {
55898+ index = uid_set[i];
55899+ j = i;
55900+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
55901+ uid_set[j] = uid_set[j - 1];
55902+ j--;
55903+ }
55904+ uid_set[j] = index;
55905+ }
55906+
55907+ return;
55908+}
55909+
55910+static __inline__ void
55911+gr_insert_uid(const uid_t uid, const unsigned long expires)
55912+{
55913+ int loc;
55914+
55915+ if (uid_used == GR_UIDTABLE_MAX)
55916+ return;
55917+
55918+ loc = gr_find_uid(uid);
55919+
55920+ if (loc >= 0) {
55921+ uid_set[loc].expires = expires;
55922+ return;
55923+ }
55924+
55925+ uid_set[uid_used].uid = uid;
55926+ uid_set[uid_used].expires = expires;
55927+ uid_used++;
55928+
55929+ gr_insertsort();
55930+
55931+ return;
55932+}
55933+
55934+void
55935+gr_remove_uid(const unsigned short loc)
55936+{
55937+ unsigned short i;
55938+
55939+ for (i = loc + 1; i < uid_used; i++)
55940+ uid_set[i - 1] = uid_set[i];
55941+
55942+ uid_used--;
55943+
55944+ return;
55945+}
55946+
55947+int
55948+gr_check_crash_uid(const uid_t uid)
55949+{
55950+ int loc;
55951+ int ret = 0;
55952+
55953+ if (unlikely(!gr_acl_is_enabled()))
55954+ return 0;
55955+
55956+ spin_lock(&gr_uid_lock);
55957+ loc = gr_find_uid(uid);
55958+
55959+ if (loc < 0)
55960+ goto out_unlock;
55961+
55962+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
55963+ gr_remove_uid(loc);
55964+ else
55965+ ret = 1;
55966+
55967+out_unlock:
55968+ spin_unlock(&gr_uid_lock);
55969+ return ret;
55970+}
55971+
55972+static __inline__ int
55973+proc_is_setxid(const struct cred *cred)
55974+{
55975+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
55976+ cred->uid != cred->fsuid)
55977+ return 1;
55978+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
55979+ cred->gid != cred->fsgid)
55980+ return 1;
55981+
55982+ return 0;
55983+}
55984+
55985+void
55986+gr_handle_crash(struct task_struct *task, const int sig)
55987+{
55988+ struct acl_subject_label *curr;
55989+ struct acl_subject_label *curr2;
55990+ struct task_struct *tsk, *tsk2;
55991+ const struct cred *cred;
55992+ const struct cred *cred2;
55993+
55994+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
55995+ return;
55996+
55997+ if (unlikely(!gr_acl_is_enabled()))
55998+ return;
55999+
56000+ curr = task->acl;
56001+
56002+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
56003+ return;
56004+
56005+ if (time_before_eq(curr->expires, get_seconds())) {
56006+ curr->expires = 0;
56007+ curr->crashes = 0;
56008+ }
56009+
56010+ curr->crashes++;
56011+
56012+ if (!curr->expires)
56013+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
56014+
56015+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56016+ time_after(curr->expires, get_seconds())) {
56017+ rcu_read_lock();
56018+ cred = __task_cred(task);
56019+ if (cred->uid && proc_is_setxid(cred)) {
56020+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56021+ spin_lock(&gr_uid_lock);
56022+ gr_insert_uid(cred->uid, curr->expires);
56023+ spin_unlock(&gr_uid_lock);
56024+ curr->expires = 0;
56025+ curr->crashes = 0;
56026+ read_lock(&tasklist_lock);
56027+ do_each_thread(tsk2, tsk) {
56028+ cred2 = __task_cred(tsk);
56029+ if (tsk != task && cred2->uid == cred->uid)
56030+ gr_fake_force_sig(SIGKILL, tsk);
56031+ } while_each_thread(tsk2, tsk);
56032+ read_unlock(&tasklist_lock);
56033+ } else {
56034+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56035+ read_lock(&tasklist_lock);
56036+ do_each_thread(tsk2, tsk) {
56037+ if (likely(tsk != task)) {
56038+ curr2 = tsk->acl;
56039+
56040+ if (curr2->device == curr->device &&
56041+ curr2->inode == curr->inode)
56042+ gr_fake_force_sig(SIGKILL, tsk);
56043+ }
56044+ } while_each_thread(tsk2, tsk);
56045+ read_unlock(&tasklist_lock);
56046+ }
56047+ rcu_read_unlock();
56048+ }
56049+
56050+ return;
56051+}
56052+
56053+int
56054+gr_check_crash_exec(const struct file *filp)
56055+{
56056+ struct acl_subject_label *curr;
56057+
56058+ if (unlikely(!gr_acl_is_enabled()))
56059+ return 0;
56060+
56061+ read_lock(&gr_inode_lock);
56062+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
56063+ filp->f_path.dentry->d_inode->i_sb->s_dev,
56064+ current->role);
56065+ read_unlock(&gr_inode_lock);
56066+
56067+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
56068+ (!curr->crashes && !curr->expires))
56069+ return 0;
56070+
56071+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56072+ time_after(curr->expires, get_seconds()))
56073+ return 1;
56074+ else if (time_before_eq(curr->expires, get_seconds())) {
56075+ curr->crashes = 0;
56076+ curr->expires = 0;
56077+ }
56078+
56079+ return 0;
56080+}
56081+
56082+void
56083+gr_handle_alertkill(struct task_struct *task)
56084+{
56085+ struct acl_subject_label *curracl;
56086+ __u32 curr_ip;
56087+ struct task_struct *p, *p2;
56088+
56089+ if (unlikely(!gr_acl_is_enabled()))
56090+ return;
56091+
56092+ curracl = task->acl;
56093+ curr_ip = task->signal->curr_ip;
56094+
56095+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
56096+ read_lock(&tasklist_lock);
56097+ do_each_thread(p2, p) {
56098+ if (p->signal->curr_ip == curr_ip)
56099+ gr_fake_force_sig(SIGKILL, p);
56100+ } while_each_thread(p2, p);
56101+ read_unlock(&tasklist_lock);
56102+ } else if (curracl->mode & GR_KILLPROC)
56103+ gr_fake_force_sig(SIGKILL, task);
56104+
56105+ return;
56106+}
56107diff -urNp linux-2.6.32.46/grsecurity/gracl_shm.c linux-2.6.32.46/grsecurity/gracl_shm.c
56108--- linux-2.6.32.46/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
56109+++ linux-2.6.32.46/grsecurity/gracl_shm.c 2011-04-17 15:56:46.000000000 -0400
56110@@ -0,0 +1,40 @@
56111+#include <linux/kernel.h>
56112+#include <linux/mm.h>
56113+#include <linux/sched.h>
56114+#include <linux/file.h>
56115+#include <linux/ipc.h>
56116+#include <linux/gracl.h>
56117+#include <linux/grsecurity.h>
56118+#include <linux/grinternal.h>
56119+
56120+int
56121+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56122+ const time_t shm_createtime, const uid_t cuid, const int shmid)
56123+{
56124+ struct task_struct *task;
56125+
56126+ if (!gr_acl_is_enabled())
56127+ return 1;
56128+
56129+ rcu_read_lock();
56130+ read_lock(&tasklist_lock);
56131+
56132+ task = find_task_by_vpid(shm_cprid);
56133+
56134+ if (unlikely(!task))
56135+ task = find_task_by_vpid(shm_lapid);
56136+
56137+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
56138+ (task->pid == shm_lapid)) &&
56139+ (task->acl->mode & GR_PROTSHM) &&
56140+ (task->acl != current->acl))) {
56141+ read_unlock(&tasklist_lock);
56142+ rcu_read_unlock();
56143+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
56144+ return 0;
56145+ }
56146+ read_unlock(&tasklist_lock);
56147+ rcu_read_unlock();
56148+
56149+ return 1;
56150+}
56151diff -urNp linux-2.6.32.46/grsecurity/grsec_chdir.c linux-2.6.32.46/grsecurity/grsec_chdir.c
56152--- linux-2.6.32.46/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
56153+++ linux-2.6.32.46/grsecurity/grsec_chdir.c 2011-04-17 15:56:46.000000000 -0400
56154@@ -0,0 +1,19 @@
56155+#include <linux/kernel.h>
56156+#include <linux/sched.h>
56157+#include <linux/fs.h>
56158+#include <linux/file.h>
56159+#include <linux/grsecurity.h>
56160+#include <linux/grinternal.h>
56161+
56162+void
56163+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
56164+{
56165+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56166+ if ((grsec_enable_chdir && grsec_enable_group &&
56167+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
56168+ !grsec_enable_group)) {
56169+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
56170+ }
56171+#endif
56172+ return;
56173+}
56174diff -urNp linux-2.6.32.46/grsecurity/grsec_chroot.c linux-2.6.32.46/grsecurity/grsec_chroot.c
56175--- linux-2.6.32.46/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
56176+++ linux-2.6.32.46/grsecurity/grsec_chroot.c 2011-09-15 06:48:16.000000000 -0400
56177@@ -0,0 +1,386 @@
56178+#include <linux/kernel.h>
56179+#include <linux/module.h>
56180+#include <linux/sched.h>
56181+#include <linux/file.h>
56182+#include <linux/fs.h>
56183+#include <linux/mount.h>
56184+#include <linux/types.h>
56185+#include <linux/pid_namespace.h>
56186+#include <linux/grsecurity.h>
56187+#include <linux/grinternal.h>
56188+
56189+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
56190+{
56191+#ifdef CONFIG_GRKERNSEC
56192+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
56193+ path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
56194+ task->gr_is_chrooted = 1;
56195+ else
56196+ task->gr_is_chrooted = 0;
56197+
56198+ task->gr_chroot_dentry = path->dentry;
56199+#endif
56200+ return;
56201+}
56202+
56203+void gr_clear_chroot_entries(struct task_struct *task)
56204+{
56205+#ifdef CONFIG_GRKERNSEC
56206+ task->gr_is_chrooted = 0;
56207+ task->gr_chroot_dentry = NULL;
56208+#endif
56209+ return;
56210+}
56211+
56212+int
56213+gr_handle_chroot_unix(const pid_t pid)
56214+{
56215+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56216+ struct task_struct *p;
56217+
56218+ if (unlikely(!grsec_enable_chroot_unix))
56219+ return 1;
56220+
56221+ if (likely(!proc_is_chrooted(current)))
56222+ return 1;
56223+
56224+ rcu_read_lock();
56225+ read_lock(&tasklist_lock);
56226+
56227+ p = find_task_by_vpid_unrestricted(pid);
56228+ if (unlikely(p && !have_same_root(current, p))) {
56229+ read_unlock(&tasklist_lock);
56230+ rcu_read_unlock();
56231+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
56232+ return 0;
56233+ }
56234+ read_unlock(&tasklist_lock);
56235+ rcu_read_unlock();
56236+#endif
56237+ return 1;
56238+}
56239+
56240+int
56241+gr_handle_chroot_nice(void)
56242+{
56243+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56244+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
56245+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
56246+ return -EPERM;
56247+ }
56248+#endif
56249+ return 0;
56250+}
56251+
56252+int
56253+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
56254+{
56255+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56256+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
56257+ && proc_is_chrooted(current)) {
56258+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
56259+ return -EACCES;
56260+ }
56261+#endif
56262+ return 0;
56263+}
56264+
56265+int
56266+gr_handle_chroot_rawio(const struct inode *inode)
56267+{
56268+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56269+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
56270+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
56271+ return 1;
56272+#endif
56273+ return 0;
56274+}
56275+
56276+int
56277+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
56278+{
56279+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56280+ struct task_struct *p;
56281+ int ret = 0;
56282+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
56283+ return ret;
56284+
56285+ read_lock(&tasklist_lock);
56286+ do_each_pid_task(pid, type, p) {
56287+ if (!have_same_root(current, p)) {
56288+ ret = 1;
56289+ goto out;
56290+ }
56291+ } while_each_pid_task(pid, type, p);
56292+out:
56293+ read_unlock(&tasklist_lock);
56294+ return ret;
56295+#endif
56296+ return 0;
56297+}
56298+
56299+int
56300+gr_pid_is_chrooted(struct task_struct *p)
56301+{
56302+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56303+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
56304+ return 0;
56305+
56306+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
56307+ !have_same_root(current, p)) {
56308+ return 1;
56309+ }
56310+#endif
56311+ return 0;
56312+}
56313+
56314+EXPORT_SYMBOL(gr_pid_is_chrooted);
56315+
56316+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
56317+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
56318+{
56319+ struct dentry *dentry = (struct dentry *)u_dentry;
56320+ struct vfsmount *mnt = (struct vfsmount *)u_mnt;
56321+ struct dentry *realroot;
56322+ struct vfsmount *realrootmnt;
56323+ struct dentry *currentroot;
56324+ struct vfsmount *currentmnt;
56325+ struct task_struct *reaper = &init_task;
56326+ int ret = 1;
56327+
56328+ read_lock(&reaper->fs->lock);
56329+ realrootmnt = mntget(reaper->fs->root.mnt);
56330+ realroot = dget(reaper->fs->root.dentry);
56331+ read_unlock(&reaper->fs->lock);
56332+
56333+ read_lock(&current->fs->lock);
56334+ currentmnt = mntget(current->fs->root.mnt);
56335+ currentroot = dget(current->fs->root.dentry);
56336+ read_unlock(&current->fs->lock);
56337+
56338+ spin_lock(&dcache_lock);
56339+ for (;;) {
56340+ if (unlikely((dentry == realroot && mnt == realrootmnt)
56341+ || (dentry == currentroot && mnt == currentmnt)))
56342+ break;
56343+ if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
56344+ if (mnt->mnt_parent == mnt)
56345+ break;
56346+ dentry = mnt->mnt_mountpoint;
56347+ mnt = mnt->mnt_parent;
56348+ continue;
56349+ }
56350+ dentry = dentry->d_parent;
56351+ }
56352+ spin_unlock(&dcache_lock);
56353+
56354+ dput(currentroot);
56355+ mntput(currentmnt);
56356+
56357+ /* access is outside of chroot */
56358+ if (dentry == realroot && mnt == realrootmnt)
56359+ ret = 0;
56360+
56361+ dput(realroot);
56362+ mntput(realrootmnt);
56363+ return ret;
56364+}
56365+#endif
56366+
56367+int
56368+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
56369+{
56370+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
56371+ if (!grsec_enable_chroot_fchdir)
56372+ return 1;
56373+
56374+ if (!proc_is_chrooted(current))
56375+ return 1;
56376+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
56377+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
56378+ return 0;
56379+ }
56380+#endif
56381+ return 1;
56382+}
56383+
56384+int
56385+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56386+ const time_t shm_createtime)
56387+{
56388+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
56389+ struct task_struct *p;
56390+ time_t starttime;
56391+
56392+ if (unlikely(!grsec_enable_chroot_shmat))
56393+ return 1;
56394+
56395+ if (likely(!proc_is_chrooted(current)))
56396+ return 1;
56397+
56398+ rcu_read_lock();
56399+ read_lock(&tasklist_lock);
56400+
56401+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
56402+ starttime = p->start_time.tv_sec;
56403+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
56404+ if (have_same_root(current, p)) {
56405+ goto allow;
56406+ } else {
56407+ read_unlock(&tasklist_lock);
56408+ rcu_read_unlock();
56409+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
56410+ return 0;
56411+ }
56412+ }
56413+ /* creator exited, pid reuse, fall through to next check */
56414+ }
56415+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
56416+ if (unlikely(!have_same_root(current, p))) {
56417+ read_unlock(&tasklist_lock);
56418+ rcu_read_unlock();
56419+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
56420+ return 0;
56421+ }
56422+ }
56423+
56424+allow:
56425+ read_unlock(&tasklist_lock);
56426+ rcu_read_unlock();
56427+#endif
56428+ return 1;
56429+}
56430+
56431+void
56432+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
56433+{
56434+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
56435+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
56436+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
56437+#endif
56438+ return;
56439+}
56440+
56441+int
56442+gr_handle_chroot_mknod(const struct dentry *dentry,
56443+ const struct vfsmount *mnt, const int mode)
56444+{
56445+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
56446+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
56447+ proc_is_chrooted(current)) {
56448+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
56449+ return -EPERM;
56450+ }
56451+#endif
56452+ return 0;
56453+}
56454+
56455+int
56456+gr_handle_chroot_mount(const struct dentry *dentry,
56457+ const struct vfsmount *mnt, const char *dev_name)
56458+{
56459+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
56460+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
56461+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none" , dentry, mnt);
56462+ return -EPERM;
56463+ }
56464+#endif
56465+ return 0;
56466+}
56467+
56468+int
56469+gr_handle_chroot_pivot(void)
56470+{
56471+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
56472+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
56473+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
56474+ return -EPERM;
56475+ }
56476+#endif
56477+ return 0;
56478+}
56479+
56480+int
56481+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
56482+{
56483+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
56484+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
56485+ !gr_is_outside_chroot(dentry, mnt)) {
56486+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
56487+ return -EPERM;
56488+ }
56489+#endif
56490+ return 0;
56491+}
56492+
56493+extern const char *captab_log[];
56494+extern int captab_log_entries;
56495+
56496+int
56497+gr_chroot_is_capable(const int cap)
56498+{
56499+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56500+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
56501+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
56502+ if (cap_raised(chroot_caps, cap)) {
56503+ const struct cred *creds = current_cred();
56504+ if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
56505+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
56506+ }
56507+ return 0;
56508+ }
56509+ }
56510+#endif
56511+ return 1;
56512+}
56513+
56514+int
56515+gr_chroot_is_capable_nolog(const int cap)
56516+{
56517+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56518+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
56519+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
56520+ if (cap_raised(chroot_caps, cap)) {
56521+ return 0;
56522+ }
56523+ }
56524+#endif
56525+ return 1;
56526+}
56527+
56528+int
56529+gr_handle_chroot_sysctl(const int op)
56530+{
56531+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
56532+ if (grsec_enable_chroot_sysctl && proc_is_chrooted(current)
56533+ && (op & MAY_WRITE))
56534+ return -EACCES;
56535+#endif
56536+ return 0;
56537+}
56538+
56539+void
56540+gr_handle_chroot_chdir(struct path *path)
56541+{
56542+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
56543+ if (grsec_enable_chroot_chdir)
56544+ set_fs_pwd(current->fs, path);
56545+#endif
56546+ return;
56547+}
56548+
56549+int
56550+gr_handle_chroot_chmod(const struct dentry *dentry,
56551+ const struct vfsmount *mnt, const int mode)
56552+{
56553+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
56554+ /* allow chmod +s on directories, but not on files */
56555+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
56556+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
56557+ proc_is_chrooted(current)) {
56558+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
56559+ return -EPERM;
56560+ }
56561+#endif
56562+ return 0;
56563+}
56564diff -urNp linux-2.6.32.46/grsecurity/grsec_disabled.c linux-2.6.32.46/grsecurity/grsec_disabled.c
56565--- linux-2.6.32.46/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
56566+++ linux-2.6.32.46/grsecurity/grsec_disabled.c 2011-09-24 08:13:29.000000000 -0400
56567@@ -0,0 +1,433 @@
56568+#include <linux/kernel.h>
56569+#include <linux/module.h>
56570+#include <linux/sched.h>
56571+#include <linux/file.h>
56572+#include <linux/fs.h>
56573+#include <linux/kdev_t.h>
56574+#include <linux/net.h>
56575+#include <linux/in.h>
56576+#include <linux/ip.h>
56577+#include <linux/skbuff.h>
56578+#include <linux/sysctl.h>
56579+
56580+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
56581+void
56582+pax_set_initial_flags(struct linux_binprm *bprm)
56583+{
56584+ return;
56585+}
56586+#endif
56587+
56588+#ifdef CONFIG_SYSCTL
56589+__u32
56590+gr_handle_sysctl(const struct ctl_table * table, const int op)
56591+{
56592+ return 0;
56593+}
56594+#endif
56595+
56596+#ifdef CONFIG_TASKSTATS
56597+int gr_is_taskstats_denied(int pid)
56598+{
56599+ return 0;
56600+}
56601+#endif
56602+
56603+int
56604+gr_acl_is_enabled(void)
56605+{
56606+ return 0;
56607+}
56608+
56609+int
56610+gr_handle_rawio(const struct inode *inode)
56611+{
56612+ return 0;
56613+}
56614+
56615+void
56616+gr_acl_handle_psacct(struct task_struct *task, const long code)
56617+{
56618+ return;
56619+}
56620+
56621+int
56622+gr_handle_ptrace(struct task_struct *task, const long request)
56623+{
56624+ return 0;
56625+}
56626+
56627+int
56628+gr_handle_proc_ptrace(struct task_struct *task)
56629+{
56630+ return 0;
56631+}
56632+
56633+void
56634+gr_learn_resource(const struct task_struct *task,
56635+ const int res, const unsigned long wanted, const int gt)
56636+{
56637+ return;
56638+}
56639+
56640+int
56641+gr_set_acls(const int type)
56642+{
56643+ return 0;
56644+}
56645+
56646+int
56647+gr_check_hidden_task(const struct task_struct *tsk)
56648+{
56649+ return 0;
56650+}
56651+
56652+int
56653+gr_check_protected_task(const struct task_struct *task)
56654+{
56655+ return 0;
56656+}
56657+
56658+int
56659+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
56660+{
56661+ return 0;
56662+}
56663+
56664+void
56665+gr_copy_label(struct task_struct *tsk)
56666+{
56667+ return;
56668+}
56669+
56670+void
56671+gr_set_pax_flags(struct task_struct *task)
56672+{
56673+ return;
56674+}
56675+
56676+int
56677+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
56678+ const int unsafe_share)
56679+{
56680+ return 0;
56681+}
56682+
56683+void
56684+gr_handle_delete(const ino_t ino, const dev_t dev)
56685+{
56686+ return;
56687+}
56688+
56689+void
56690+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
56691+{
56692+ return;
56693+}
56694+
56695+void
56696+gr_handle_crash(struct task_struct *task, const int sig)
56697+{
56698+ return;
56699+}
56700+
56701+int
56702+gr_check_crash_exec(const struct file *filp)
56703+{
56704+ return 0;
56705+}
56706+
56707+int
56708+gr_check_crash_uid(const uid_t uid)
56709+{
56710+ return 0;
56711+}
56712+
56713+void
56714+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
56715+ struct dentry *old_dentry,
56716+ struct dentry *new_dentry,
56717+ struct vfsmount *mnt, const __u8 replace)
56718+{
56719+ return;
56720+}
56721+
56722+int
56723+gr_search_socket(const int family, const int type, const int protocol)
56724+{
56725+ return 1;
56726+}
56727+
56728+int
56729+gr_search_connectbind(const int mode, const struct socket *sock,
56730+ const struct sockaddr_in *addr)
56731+{
56732+ return 0;
56733+}
56734+
56735+void
56736+gr_handle_alertkill(struct task_struct *task)
56737+{
56738+ return;
56739+}
56740+
56741+__u32
56742+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
56743+{
56744+ return 1;
56745+}
56746+
56747+__u32
56748+gr_acl_handle_hidden_file(const struct dentry * dentry,
56749+ const struct vfsmount * mnt)
56750+{
56751+ return 1;
56752+}
56753+
56754+__u32
56755+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
56756+ const int fmode)
56757+{
56758+ return 1;
56759+}
56760+
56761+__u32
56762+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
56763+{
56764+ return 1;
56765+}
56766+
56767+__u32
56768+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
56769+{
56770+ return 1;
56771+}
56772+
56773+int
56774+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
56775+ unsigned int *vm_flags)
56776+{
56777+ return 1;
56778+}
56779+
56780+__u32
56781+gr_acl_handle_truncate(const struct dentry * dentry,
56782+ const struct vfsmount * mnt)
56783+{
56784+ return 1;
56785+}
56786+
56787+__u32
56788+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
56789+{
56790+ return 1;
56791+}
56792+
56793+__u32
56794+gr_acl_handle_access(const struct dentry * dentry,
56795+ const struct vfsmount * mnt, const int fmode)
56796+{
56797+ return 1;
56798+}
56799+
56800+__u32
56801+gr_acl_handle_fchmod(const struct dentry * dentry, const struct vfsmount * mnt,
56802+ mode_t mode)
56803+{
56804+ return 1;
56805+}
56806+
56807+__u32
56808+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
56809+ mode_t mode)
56810+{
56811+ return 1;
56812+}
56813+
56814+__u32
56815+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
56816+{
56817+ return 1;
56818+}
56819+
56820+__u32
56821+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
56822+{
56823+ return 1;
56824+}
56825+
56826+void
56827+grsecurity_init(void)
56828+{
56829+ return;
56830+}
56831+
56832+__u32
56833+gr_acl_handle_mknod(const struct dentry * new_dentry,
56834+ const struct dentry * parent_dentry,
56835+ const struct vfsmount * parent_mnt,
56836+ const int mode)
56837+{
56838+ return 1;
56839+}
56840+
56841+__u32
56842+gr_acl_handle_mkdir(const struct dentry * new_dentry,
56843+ const struct dentry * parent_dentry,
56844+ const struct vfsmount * parent_mnt)
56845+{
56846+ return 1;
56847+}
56848+
56849+__u32
56850+gr_acl_handle_symlink(const struct dentry * new_dentry,
56851+ const struct dentry * parent_dentry,
56852+ const struct vfsmount * parent_mnt, const char *from)
56853+{
56854+ return 1;
56855+}
56856+
56857+__u32
56858+gr_acl_handle_link(const struct dentry * new_dentry,
56859+ const struct dentry * parent_dentry,
56860+ const struct vfsmount * parent_mnt,
56861+ const struct dentry * old_dentry,
56862+ const struct vfsmount * old_mnt, const char *to)
56863+{
56864+ return 1;
56865+}
56866+
56867+int
56868+gr_acl_handle_rename(const struct dentry *new_dentry,
56869+ const struct dentry *parent_dentry,
56870+ const struct vfsmount *parent_mnt,
56871+ const struct dentry *old_dentry,
56872+ const struct inode *old_parent_inode,
56873+ const struct vfsmount *old_mnt, const char *newname)
56874+{
56875+ return 0;
56876+}
56877+
56878+int
56879+gr_acl_handle_filldir(const struct file *file, const char *name,
56880+ const int namelen, const ino_t ino)
56881+{
56882+ return 1;
56883+}
56884+
56885+int
56886+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56887+ const time_t shm_createtime, const uid_t cuid, const int shmid)
56888+{
56889+ return 1;
56890+}
56891+
56892+int
56893+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
56894+{
56895+ return 0;
56896+}
56897+
56898+int
56899+gr_search_accept(const struct socket *sock)
56900+{
56901+ return 0;
56902+}
56903+
56904+int
56905+gr_search_listen(const struct socket *sock)
56906+{
56907+ return 0;
56908+}
56909+
56910+int
56911+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
56912+{
56913+ return 0;
56914+}
56915+
56916+__u32
56917+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
56918+{
56919+ return 1;
56920+}
56921+
56922+__u32
56923+gr_acl_handle_creat(const struct dentry * dentry,
56924+ const struct dentry * p_dentry,
56925+ const struct vfsmount * p_mnt, const int fmode,
56926+ const int imode)
56927+{
56928+ return 1;
56929+}
56930+
56931+void
56932+gr_acl_handle_exit(void)
56933+{
56934+ return;
56935+}
56936+
56937+int
56938+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
56939+{
56940+ return 1;
56941+}
56942+
56943+void
56944+gr_set_role_label(const uid_t uid, const gid_t gid)
56945+{
56946+ return;
56947+}
56948+
56949+int
56950+gr_acl_handle_procpidmem(const struct task_struct *task)
56951+{
56952+ return 0;
56953+}
56954+
56955+int
56956+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
56957+{
56958+ return 0;
56959+}
56960+
56961+int
56962+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
56963+{
56964+ return 0;
56965+}
56966+
56967+void
56968+gr_set_kernel_label(struct task_struct *task)
56969+{
56970+ return;
56971+}
56972+
56973+int
56974+gr_check_user_change(int real, int effective, int fs)
56975+{
56976+ return 0;
56977+}
56978+
56979+int
56980+gr_check_group_change(int real, int effective, int fs)
56981+{
56982+ return 0;
56983+}
56984+
56985+int gr_acl_enable_at_secure(void)
56986+{
56987+ return 0;
56988+}
56989+
56990+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
56991+{
56992+ return dentry->d_inode->i_sb->s_dev;
56993+}
56994+
56995+EXPORT_SYMBOL(gr_learn_resource);
56996+EXPORT_SYMBOL(gr_set_kernel_label);
56997+#ifdef CONFIG_SECURITY
56998+EXPORT_SYMBOL(gr_check_user_change);
56999+EXPORT_SYMBOL(gr_check_group_change);
57000+#endif
57001diff -urNp linux-2.6.32.46/grsecurity/grsec_exec.c linux-2.6.32.46/grsecurity/grsec_exec.c
57002--- linux-2.6.32.46/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
57003+++ linux-2.6.32.46/grsecurity/grsec_exec.c 2011-09-13 22:54:27.000000000 -0400
57004@@ -0,0 +1,204 @@
57005+#include <linux/kernel.h>
57006+#include <linux/sched.h>
57007+#include <linux/file.h>
57008+#include <linux/binfmts.h>
57009+#include <linux/smp_lock.h>
57010+#include <linux/fs.h>
57011+#include <linux/types.h>
57012+#include <linux/grdefs.h>
57013+#include <linux/grinternal.h>
57014+#include <linux/capability.h>
57015+#include <linux/compat.h>
57016+#include <linux/module.h>
57017+
57018+#include <asm/uaccess.h>
57019+
57020+#ifdef CONFIG_GRKERNSEC_EXECLOG
57021+static char gr_exec_arg_buf[132];
57022+static DEFINE_MUTEX(gr_exec_arg_mutex);
57023+#endif
57024+
57025+void
57026+gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv)
57027+{
57028+#ifdef CONFIG_GRKERNSEC_EXECLOG
57029+ char *grarg = gr_exec_arg_buf;
57030+ unsigned int i, x, execlen = 0;
57031+ char c;
57032+
57033+ if (!((grsec_enable_execlog && grsec_enable_group &&
57034+ in_group_p(grsec_audit_gid))
57035+ || (grsec_enable_execlog && !grsec_enable_group)))
57036+ return;
57037+
57038+ mutex_lock(&gr_exec_arg_mutex);
57039+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
57040+
57041+ if (unlikely(argv == NULL))
57042+ goto log;
57043+
57044+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
57045+ const char __user *p;
57046+ unsigned int len;
57047+
57048+ if (copy_from_user(&p, argv + i, sizeof(p)))
57049+ goto log;
57050+ if (!p)
57051+ goto log;
57052+ len = strnlen_user(p, 128 - execlen);
57053+ if (len > 128 - execlen)
57054+ len = 128 - execlen;
57055+ else if (len > 0)
57056+ len--;
57057+ if (copy_from_user(grarg + execlen, p, len))
57058+ goto log;
57059+
57060+ /* rewrite unprintable characters */
57061+ for (x = 0; x < len; x++) {
57062+ c = *(grarg + execlen + x);
57063+ if (c < 32 || c > 126)
57064+ *(grarg + execlen + x) = ' ';
57065+ }
57066+
57067+ execlen += len;
57068+ *(grarg + execlen) = ' ';
57069+ *(grarg + execlen + 1) = '\0';
57070+ execlen++;
57071+ }
57072+
57073+ log:
57074+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
57075+ bprm->file->f_path.mnt, grarg);
57076+ mutex_unlock(&gr_exec_arg_mutex);
57077+#endif
57078+ return;
57079+}
57080+
57081+#ifdef CONFIG_COMPAT
57082+void
57083+gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv)
57084+{
57085+#ifdef CONFIG_GRKERNSEC_EXECLOG
57086+ char *grarg = gr_exec_arg_buf;
57087+ unsigned int i, x, execlen = 0;
57088+ char c;
57089+
57090+ if (!((grsec_enable_execlog && grsec_enable_group &&
57091+ in_group_p(grsec_audit_gid))
57092+ || (grsec_enable_execlog && !grsec_enable_group)))
57093+ return;
57094+
57095+ mutex_lock(&gr_exec_arg_mutex);
57096+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
57097+
57098+ if (unlikely(argv == NULL))
57099+ goto log;
57100+
57101+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
57102+ compat_uptr_t p;
57103+ unsigned int len;
57104+
57105+ if (get_user(p, argv + i))
57106+ goto log;
57107+ len = strnlen_user(compat_ptr(p), 128 - execlen);
57108+ if (len > 128 - execlen)
57109+ len = 128 - execlen;
57110+ else if (len > 0)
57111+ len--;
57112+ else
57113+ goto log;
57114+ if (copy_from_user(grarg + execlen, compat_ptr(p), len))
57115+ goto log;
57116+
57117+ /* rewrite unprintable characters */
57118+ for (x = 0; x < len; x++) {
57119+ c = *(grarg + execlen + x);
57120+ if (c < 32 || c > 126)
57121+ *(grarg + execlen + x) = ' ';
57122+ }
57123+
57124+ execlen += len;
57125+ *(grarg + execlen) = ' ';
57126+ *(grarg + execlen + 1) = '\0';
57127+ execlen++;
57128+ }
57129+
57130+ log:
57131+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
57132+ bprm->file->f_path.mnt, grarg);
57133+ mutex_unlock(&gr_exec_arg_mutex);
57134+#endif
57135+ return;
57136+}
57137+#endif
57138+
57139+#ifdef CONFIG_GRKERNSEC
57140+extern int gr_acl_is_capable(const int cap);
57141+extern int gr_acl_is_capable_nolog(const int cap);
57142+extern int gr_chroot_is_capable(const int cap);
57143+extern int gr_chroot_is_capable_nolog(const int cap);
57144+#endif
57145+
57146+const char *captab_log[] = {
57147+ "CAP_CHOWN",
57148+ "CAP_DAC_OVERRIDE",
57149+ "CAP_DAC_READ_SEARCH",
57150+ "CAP_FOWNER",
57151+ "CAP_FSETID",
57152+ "CAP_KILL",
57153+ "CAP_SETGID",
57154+ "CAP_SETUID",
57155+ "CAP_SETPCAP",
57156+ "CAP_LINUX_IMMUTABLE",
57157+ "CAP_NET_BIND_SERVICE",
57158+ "CAP_NET_BROADCAST",
57159+ "CAP_NET_ADMIN",
57160+ "CAP_NET_RAW",
57161+ "CAP_IPC_LOCK",
57162+ "CAP_IPC_OWNER",
57163+ "CAP_SYS_MODULE",
57164+ "CAP_SYS_RAWIO",
57165+ "CAP_SYS_CHROOT",
57166+ "CAP_SYS_PTRACE",
57167+ "CAP_SYS_PACCT",
57168+ "CAP_SYS_ADMIN",
57169+ "CAP_SYS_BOOT",
57170+ "CAP_SYS_NICE",
57171+ "CAP_SYS_RESOURCE",
57172+ "CAP_SYS_TIME",
57173+ "CAP_SYS_TTY_CONFIG",
57174+ "CAP_MKNOD",
57175+ "CAP_LEASE",
57176+ "CAP_AUDIT_WRITE",
57177+ "CAP_AUDIT_CONTROL",
57178+ "CAP_SETFCAP",
57179+ "CAP_MAC_OVERRIDE",
57180+ "CAP_MAC_ADMIN"
57181+};
57182+
57183+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
57184+
57185+int gr_is_capable(const int cap)
57186+{
57187+#ifdef CONFIG_GRKERNSEC
57188+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
57189+ return 1;
57190+ return 0;
57191+#else
57192+ return 1;
57193+#endif
57194+}
57195+
57196+int gr_is_capable_nolog(const int cap)
57197+{
57198+#ifdef CONFIG_GRKERNSEC
57199+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
57200+ return 1;
57201+ return 0;
57202+#else
57203+ return 1;
57204+#endif
57205+}
57206+
57207+EXPORT_SYMBOL(gr_is_capable);
57208+EXPORT_SYMBOL(gr_is_capable_nolog);
57209diff -urNp linux-2.6.32.46/grsecurity/grsec_fifo.c linux-2.6.32.46/grsecurity/grsec_fifo.c
57210--- linux-2.6.32.46/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
57211+++ linux-2.6.32.46/grsecurity/grsec_fifo.c 2011-04-17 15:56:46.000000000 -0400
57212@@ -0,0 +1,24 @@
57213+#include <linux/kernel.h>
57214+#include <linux/sched.h>
57215+#include <linux/fs.h>
57216+#include <linux/file.h>
57217+#include <linux/grinternal.h>
57218+
57219+int
57220+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
57221+ const struct dentry *dir, const int flag, const int acc_mode)
57222+{
57223+#ifdef CONFIG_GRKERNSEC_FIFO
57224+ const struct cred *cred = current_cred();
57225+
57226+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
57227+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
57228+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
57229+ (cred->fsuid != dentry->d_inode->i_uid)) {
57230+ if (!inode_permission(dentry->d_inode, acc_mode))
57231+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
57232+ return -EACCES;
57233+ }
57234+#endif
57235+ return 0;
57236+}
57237diff -urNp linux-2.6.32.46/grsecurity/grsec_fork.c linux-2.6.32.46/grsecurity/grsec_fork.c
57238--- linux-2.6.32.46/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
57239+++ linux-2.6.32.46/grsecurity/grsec_fork.c 2011-04-17 15:56:46.000000000 -0400
57240@@ -0,0 +1,23 @@
57241+#include <linux/kernel.h>
57242+#include <linux/sched.h>
57243+#include <linux/grsecurity.h>
57244+#include <linux/grinternal.h>
57245+#include <linux/errno.h>
57246+
57247+void
57248+gr_log_forkfail(const int retval)
57249+{
57250+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57251+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
57252+ switch (retval) {
57253+ case -EAGAIN:
57254+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
57255+ break;
57256+ case -ENOMEM:
57257+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
57258+ break;
57259+ }
57260+ }
57261+#endif
57262+ return;
57263+}
57264diff -urNp linux-2.6.32.46/grsecurity/grsec_init.c linux-2.6.32.46/grsecurity/grsec_init.c
57265--- linux-2.6.32.46/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
57266+++ linux-2.6.32.46/grsecurity/grsec_init.c 2011-08-11 19:57:42.000000000 -0400
57267@@ -0,0 +1,270 @@
57268+#include <linux/kernel.h>
57269+#include <linux/sched.h>
57270+#include <linux/mm.h>
57271+#include <linux/smp_lock.h>
57272+#include <linux/gracl.h>
57273+#include <linux/slab.h>
57274+#include <linux/vmalloc.h>
57275+#include <linux/percpu.h>
57276+#include <linux/module.h>
57277+
57278+int grsec_enable_brute;
57279+int grsec_enable_link;
57280+int grsec_enable_dmesg;
57281+int grsec_enable_harden_ptrace;
57282+int grsec_enable_fifo;
57283+int grsec_enable_execlog;
57284+int grsec_enable_signal;
57285+int grsec_enable_forkfail;
57286+int grsec_enable_audit_ptrace;
57287+int grsec_enable_time;
57288+int grsec_enable_audit_textrel;
57289+int grsec_enable_group;
57290+int grsec_audit_gid;
57291+int grsec_enable_chdir;
57292+int grsec_enable_mount;
57293+int grsec_enable_rofs;
57294+int grsec_enable_chroot_findtask;
57295+int grsec_enable_chroot_mount;
57296+int grsec_enable_chroot_shmat;
57297+int grsec_enable_chroot_fchdir;
57298+int grsec_enable_chroot_double;
57299+int grsec_enable_chroot_pivot;
57300+int grsec_enable_chroot_chdir;
57301+int grsec_enable_chroot_chmod;
57302+int grsec_enable_chroot_mknod;
57303+int grsec_enable_chroot_nice;
57304+int grsec_enable_chroot_execlog;
57305+int grsec_enable_chroot_caps;
57306+int grsec_enable_chroot_sysctl;
57307+int grsec_enable_chroot_unix;
57308+int grsec_enable_tpe;
57309+int grsec_tpe_gid;
57310+int grsec_enable_blackhole;
57311+#ifdef CONFIG_IPV6_MODULE
57312+EXPORT_SYMBOL(grsec_enable_blackhole);
57313+#endif
57314+int grsec_lastack_retries;
57315+int grsec_enable_tpe_all;
57316+int grsec_enable_tpe_invert;
57317+int grsec_enable_socket_all;
57318+int grsec_socket_all_gid;
57319+int grsec_enable_socket_client;
57320+int grsec_socket_client_gid;
57321+int grsec_enable_socket_server;
57322+int grsec_socket_server_gid;
57323+int grsec_resource_logging;
57324+int grsec_disable_privio;
57325+int grsec_enable_log_rwxmaps;
57326+int grsec_lock;
57327+
57328+DEFINE_SPINLOCK(grsec_alert_lock);
57329+unsigned long grsec_alert_wtime = 0;
57330+unsigned long grsec_alert_fyet = 0;
57331+
57332+DEFINE_SPINLOCK(grsec_audit_lock);
57333+
57334+DEFINE_RWLOCK(grsec_exec_file_lock);
57335+
57336+char *gr_shared_page[4];
57337+
57338+char *gr_alert_log_fmt;
57339+char *gr_audit_log_fmt;
57340+char *gr_alert_log_buf;
57341+char *gr_audit_log_buf;
57342+
57343+extern struct gr_arg *gr_usermode;
57344+extern unsigned char *gr_system_salt;
57345+extern unsigned char *gr_system_sum;
57346+
57347+void __init
57348+grsecurity_init(void)
57349+{
57350+ int j;
57351+ /* create the per-cpu shared pages */
57352+
57353+#ifdef CONFIG_X86
57354+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
57355+#endif
57356+
57357+ for (j = 0; j < 4; j++) {
57358+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
57359+ if (gr_shared_page[j] == NULL) {
57360+ panic("Unable to allocate grsecurity shared page");
57361+ return;
57362+ }
57363+ }
57364+
57365+ /* allocate log buffers */
57366+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
57367+ if (!gr_alert_log_fmt) {
57368+ panic("Unable to allocate grsecurity alert log format buffer");
57369+ return;
57370+ }
57371+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
57372+ if (!gr_audit_log_fmt) {
57373+ panic("Unable to allocate grsecurity audit log format buffer");
57374+ return;
57375+ }
57376+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
57377+ if (!gr_alert_log_buf) {
57378+ panic("Unable to allocate grsecurity alert log buffer");
57379+ return;
57380+ }
57381+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
57382+ if (!gr_audit_log_buf) {
57383+ panic("Unable to allocate grsecurity audit log buffer");
57384+ return;
57385+ }
57386+
57387+ /* allocate memory for authentication structure */
57388+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
57389+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
57390+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
57391+
57392+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
57393+ panic("Unable to allocate grsecurity authentication structure");
57394+ return;
57395+ }
57396+
57397+
57398+#ifdef CONFIG_GRKERNSEC_IO
57399+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
57400+ grsec_disable_privio = 1;
57401+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
57402+ grsec_disable_privio = 1;
57403+#else
57404+ grsec_disable_privio = 0;
57405+#endif
57406+#endif
57407+
57408+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
57409+ /* for backward compatibility, tpe_invert always defaults to on if
57410+ enabled in the kernel
57411+ */
57412+ grsec_enable_tpe_invert = 1;
57413+#endif
57414+
57415+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
57416+#ifndef CONFIG_GRKERNSEC_SYSCTL
57417+ grsec_lock = 1;
57418+#endif
57419+
57420+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
57421+ grsec_enable_audit_textrel = 1;
57422+#endif
57423+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
57424+ grsec_enable_log_rwxmaps = 1;
57425+#endif
57426+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
57427+ grsec_enable_group = 1;
57428+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
57429+#endif
57430+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
57431+ grsec_enable_chdir = 1;
57432+#endif
57433+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
57434+ grsec_enable_harden_ptrace = 1;
57435+#endif
57436+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
57437+ grsec_enable_mount = 1;
57438+#endif
57439+#ifdef CONFIG_GRKERNSEC_LINK
57440+ grsec_enable_link = 1;
57441+#endif
57442+#ifdef CONFIG_GRKERNSEC_BRUTE
57443+ grsec_enable_brute = 1;
57444+#endif
57445+#ifdef CONFIG_GRKERNSEC_DMESG
57446+ grsec_enable_dmesg = 1;
57447+#endif
57448+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
57449+ grsec_enable_blackhole = 1;
57450+ grsec_lastack_retries = 4;
57451+#endif
57452+#ifdef CONFIG_GRKERNSEC_FIFO
57453+ grsec_enable_fifo = 1;
57454+#endif
57455+#ifdef CONFIG_GRKERNSEC_EXECLOG
57456+ grsec_enable_execlog = 1;
57457+#endif
57458+#ifdef CONFIG_GRKERNSEC_SIGNAL
57459+ grsec_enable_signal = 1;
57460+#endif
57461+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57462+ grsec_enable_forkfail = 1;
57463+#endif
57464+#ifdef CONFIG_GRKERNSEC_TIME
57465+ grsec_enable_time = 1;
57466+#endif
57467+#ifdef CONFIG_GRKERNSEC_RESLOG
57468+ grsec_resource_logging = 1;
57469+#endif
57470+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57471+ grsec_enable_chroot_findtask = 1;
57472+#endif
57473+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
57474+ grsec_enable_chroot_unix = 1;
57475+#endif
57476+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
57477+ grsec_enable_chroot_mount = 1;
57478+#endif
57479+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
57480+ grsec_enable_chroot_fchdir = 1;
57481+#endif
57482+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
57483+ grsec_enable_chroot_shmat = 1;
57484+#endif
57485+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
57486+ grsec_enable_audit_ptrace = 1;
57487+#endif
57488+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
57489+ grsec_enable_chroot_double = 1;
57490+#endif
57491+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
57492+ grsec_enable_chroot_pivot = 1;
57493+#endif
57494+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
57495+ grsec_enable_chroot_chdir = 1;
57496+#endif
57497+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
57498+ grsec_enable_chroot_chmod = 1;
57499+#endif
57500+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
57501+ grsec_enable_chroot_mknod = 1;
57502+#endif
57503+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57504+ grsec_enable_chroot_nice = 1;
57505+#endif
57506+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
57507+ grsec_enable_chroot_execlog = 1;
57508+#endif
57509+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57510+ grsec_enable_chroot_caps = 1;
57511+#endif
57512+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
57513+ grsec_enable_chroot_sysctl = 1;
57514+#endif
57515+#ifdef CONFIG_GRKERNSEC_TPE
57516+ grsec_enable_tpe = 1;
57517+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
57518+#ifdef CONFIG_GRKERNSEC_TPE_ALL
57519+ grsec_enable_tpe_all = 1;
57520+#endif
57521+#endif
57522+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
57523+ grsec_enable_socket_all = 1;
57524+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
57525+#endif
57526+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
57527+ grsec_enable_socket_client = 1;
57528+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
57529+#endif
57530+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
57531+ grsec_enable_socket_server = 1;
57532+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
57533+#endif
57534+#endif
57535+
57536+ return;
57537+}
57538diff -urNp linux-2.6.32.46/grsecurity/grsec_link.c linux-2.6.32.46/grsecurity/grsec_link.c
57539--- linux-2.6.32.46/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
57540+++ linux-2.6.32.46/grsecurity/grsec_link.c 2011-04-17 15:56:46.000000000 -0400
57541@@ -0,0 +1,43 @@
57542+#include <linux/kernel.h>
57543+#include <linux/sched.h>
57544+#include <linux/fs.h>
57545+#include <linux/file.h>
57546+#include <linux/grinternal.h>
57547+
57548+int
57549+gr_handle_follow_link(const struct inode *parent,
57550+ const struct inode *inode,
57551+ const struct dentry *dentry, const struct vfsmount *mnt)
57552+{
57553+#ifdef CONFIG_GRKERNSEC_LINK
57554+ const struct cred *cred = current_cred();
57555+
57556+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
57557+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
57558+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
57559+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
57560+ return -EACCES;
57561+ }
57562+#endif
57563+ return 0;
57564+}
57565+
57566+int
57567+gr_handle_hardlink(const struct dentry *dentry,
57568+ const struct vfsmount *mnt,
57569+ struct inode *inode, const int mode, const char *to)
57570+{
57571+#ifdef CONFIG_GRKERNSEC_LINK
57572+ const struct cred *cred = current_cred();
57573+
57574+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
57575+ (!S_ISREG(mode) || (mode & S_ISUID) ||
57576+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
57577+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
57578+ !capable(CAP_FOWNER) && cred->uid) {
57579+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
57580+ return -EPERM;
57581+ }
57582+#endif
57583+ return 0;
57584+}
57585diff -urNp linux-2.6.32.46/grsecurity/grsec_log.c linux-2.6.32.46/grsecurity/grsec_log.c
57586--- linux-2.6.32.46/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
57587+++ linux-2.6.32.46/grsecurity/grsec_log.c 2011-09-26 10:44:49.000000000 -0400
57588@@ -0,0 +1,315 @@
57589+#include <linux/kernel.h>
57590+#include <linux/sched.h>
57591+#include <linux/file.h>
57592+#include <linux/tty.h>
57593+#include <linux/fs.h>
57594+#include <linux/grinternal.h>
57595+
57596+#ifdef CONFIG_TREE_PREEMPT_RCU
57597+#define DISABLE_PREEMPT() preempt_disable()
57598+#define ENABLE_PREEMPT() preempt_enable()
57599+#else
57600+#define DISABLE_PREEMPT()
57601+#define ENABLE_PREEMPT()
57602+#endif
57603+
57604+#define BEGIN_LOCKS(x) \
57605+ DISABLE_PREEMPT(); \
57606+ rcu_read_lock(); \
57607+ read_lock(&tasklist_lock); \
57608+ read_lock(&grsec_exec_file_lock); \
57609+ if (x != GR_DO_AUDIT) \
57610+ spin_lock(&grsec_alert_lock); \
57611+ else \
57612+ spin_lock(&grsec_audit_lock)
57613+
57614+#define END_LOCKS(x) \
57615+ if (x != GR_DO_AUDIT) \
57616+ spin_unlock(&grsec_alert_lock); \
57617+ else \
57618+ spin_unlock(&grsec_audit_lock); \
57619+ read_unlock(&grsec_exec_file_lock); \
57620+ read_unlock(&tasklist_lock); \
57621+ rcu_read_unlock(); \
57622+ ENABLE_PREEMPT(); \
57623+ if (x == GR_DONT_AUDIT) \
57624+ gr_handle_alertkill(current)
57625+
57626+enum {
57627+ FLOODING,
57628+ NO_FLOODING
57629+};
57630+
57631+extern char *gr_alert_log_fmt;
57632+extern char *gr_audit_log_fmt;
57633+extern char *gr_alert_log_buf;
57634+extern char *gr_audit_log_buf;
57635+
57636+static int gr_log_start(int audit)
57637+{
57638+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
57639+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
57640+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
57641+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
57642+ unsigned long curr_secs = get_seconds();
57643+
57644+ if (audit == GR_DO_AUDIT)
57645+ goto set_fmt;
57646+
57647+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
57648+ grsec_alert_wtime = curr_secs;
57649+ grsec_alert_fyet = 0;
57650+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
57651+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
57652+ grsec_alert_fyet++;
57653+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
57654+ grsec_alert_wtime = curr_secs;
57655+ grsec_alert_fyet++;
57656+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
57657+ return FLOODING;
57658+ }
57659+ else return FLOODING;
57660+
57661+set_fmt:
57662+#endif
57663+ memset(buf, 0, PAGE_SIZE);
57664+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
57665+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
57666+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
57667+ } else if (current->signal->curr_ip) {
57668+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
57669+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
57670+ } else if (gr_acl_is_enabled()) {
57671+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
57672+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
57673+ } else {
57674+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
57675+ strcpy(buf, fmt);
57676+ }
57677+
57678+ return NO_FLOODING;
57679+}
57680+
57681+static void gr_log_middle(int audit, const char *msg, va_list ap)
57682+ __attribute__ ((format (printf, 2, 0)));
57683+
57684+static void gr_log_middle(int audit, const char *msg, va_list ap)
57685+{
57686+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
57687+ unsigned int len = strlen(buf);
57688+
57689+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
57690+
57691+ return;
57692+}
57693+
57694+static void gr_log_middle_varargs(int audit, const char *msg, ...)
57695+ __attribute__ ((format (printf, 2, 3)));
57696+
57697+static void gr_log_middle_varargs(int audit, const char *msg, ...)
57698+{
57699+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
57700+ unsigned int len = strlen(buf);
57701+ va_list ap;
57702+
57703+ va_start(ap, msg);
57704+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
57705+ va_end(ap);
57706+
57707+ return;
57708+}
57709+
57710+static void gr_log_end(int audit)
57711+{
57712+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
57713+ unsigned int len = strlen(buf);
57714+
57715+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
57716+ printk("%s\n", buf);
57717+
57718+ return;
57719+}
57720+
57721+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
57722+{
57723+ int logtype;
57724+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
57725+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
57726+ void *voidptr = NULL;
57727+ int num1 = 0, num2 = 0;
57728+ unsigned long ulong1 = 0, ulong2 = 0;
57729+ struct dentry *dentry = NULL;
57730+ struct vfsmount *mnt = NULL;
57731+ struct file *file = NULL;
57732+ struct task_struct *task = NULL;
57733+ const struct cred *cred, *pcred;
57734+ va_list ap;
57735+
57736+ BEGIN_LOCKS(audit);
57737+ logtype = gr_log_start(audit);
57738+ if (logtype == FLOODING) {
57739+ END_LOCKS(audit);
57740+ return;
57741+ }
57742+ va_start(ap, argtypes);
57743+ switch (argtypes) {
57744+ case GR_TTYSNIFF:
57745+ task = va_arg(ap, struct task_struct *);
57746+ gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid);
57747+ break;
57748+ case GR_SYSCTL_HIDDEN:
57749+ str1 = va_arg(ap, char *);
57750+ gr_log_middle_varargs(audit, msg, result, str1);
57751+ break;
57752+ case GR_RBAC:
57753+ dentry = va_arg(ap, struct dentry *);
57754+ mnt = va_arg(ap, struct vfsmount *);
57755+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
57756+ break;
57757+ case GR_RBAC_STR:
57758+ dentry = va_arg(ap, struct dentry *);
57759+ mnt = va_arg(ap, struct vfsmount *);
57760+ str1 = va_arg(ap, char *);
57761+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
57762+ break;
57763+ case GR_STR_RBAC:
57764+ str1 = va_arg(ap, char *);
57765+ dentry = va_arg(ap, struct dentry *);
57766+ mnt = va_arg(ap, struct vfsmount *);
57767+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
57768+ break;
57769+ case GR_RBAC_MODE2:
57770+ dentry = va_arg(ap, struct dentry *);
57771+ mnt = va_arg(ap, struct vfsmount *);
57772+ str1 = va_arg(ap, char *);
57773+ str2 = va_arg(ap, char *);
57774+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
57775+ break;
57776+ case GR_RBAC_MODE3:
57777+ dentry = va_arg(ap, struct dentry *);
57778+ mnt = va_arg(ap, struct vfsmount *);
57779+ str1 = va_arg(ap, char *);
57780+ str2 = va_arg(ap, char *);
57781+ str3 = va_arg(ap, char *);
57782+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
57783+ break;
57784+ case GR_FILENAME:
57785+ dentry = va_arg(ap, struct dentry *);
57786+ mnt = va_arg(ap, struct vfsmount *);
57787+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
57788+ break;
57789+ case GR_STR_FILENAME:
57790+ str1 = va_arg(ap, char *);
57791+ dentry = va_arg(ap, struct dentry *);
57792+ mnt = va_arg(ap, struct vfsmount *);
57793+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
57794+ break;
57795+ case GR_FILENAME_STR:
57796+ dentry = va_arg(ap, struct dentry *);
57797+ mnt = va_arg(ap, struct vfsmount *);
57798+ str1 = va_arg(ap, char *);
57799+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
57800+ break;
57801+ case GR_FILENAME_TWO_INT:
57802+ dentry = va_arg(ap, struct dentry *);
57803+ mnt = va_arg(ap, struct vfsmount *);
57804+ num1 = va_arg(ap, int);
57805+ num2 = va_arg(ap, int);
57806+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
57807+ break;
57808+ case GR_FILENAME_TWO_INT_STR:
57809+ dentry = va_arg(ap, struct dentry *);
57810+ mnt = va_arg(ap, struct vfsmount *);
57811+ num1 = va_arg(ap, int);
57812+ num2 = va_arg(ap, int);
57813+ str1 = va_arg(ap, char *);
57814+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
57815+ break;
57816+ case GR_TEXTREL:
57817+ file = va_arg(ap, struct file *);
57818+ ulong1 = va_arg(ap, unsigned long);
57819+ ulong2 = va_arg(ap, unsigned long);
57820+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
57821+ break;
57822+ case GR_PTRACE:
57823+ task = va_arg(ap, struct task_struct *);
57824+ gr_log_middle_varargs(audit, msg, task->exec_file ? gr_to_filename(task->exec_file->f_path.dentry, task->exec_file->f_path.mnt) : "(none)", task->comm, task->pid);
57825+ break;
57826+ case GR_RESOURCE:
57827+ task = va_arg(ap, struct task_struct *);
57828+ cred = __task_cred(task);
57829+ pcred = __task_cred(task->real_parent);
57830+ ulong1 = va_arg(ap, unsigned long);
57831+ str1 = va_arg(ap, char *);
57832+ ulong2 = va_arg(ap, unsigned long);
57833+ gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
57834+ break;
57835+ case GR_CAP:
57836+ task = va_arg(ap, struct task_struct *);
57837+ cred = __task_cred(task);
57838+ pcred = __task_cred(task->real_parent);
57839+ str1 = va_arg(ap, char *);
57840+ gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
57841+ break;
57842+ case GR_SIG:
57843+ str1 = va_arg(ap, char *);
57844+ voidptr = va_arg(ap, void *);
57845+ gr_log_middle_varargs(audit, msg, str1, voidptr);
57846+ break;
57847+ case GR_SIG2:
57848+ task = va_arg(ap, struct task_struct *);
57849+ cred = __task_cred(task);
57850+ pcred = __task_cred(task->real_parent);
57851+ num1 = va_arg(ap, int);
57852+ gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
57853+ break;
57854+ case GR_CRASH1:
57855+ task = va_arg(ap, struct task_struct *);
57856+ cred = __task_cred(task);
57857+ pcred = __task_cred(task->real_parent);
57858+ ulong1 = va_arg(ap, unsigned long);
57859+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, cred->uid, ulong1);
57860+ break;
57861+ case GR_CRASH2:
57862+ task = va_arg(ap, struct task_struct *);
57863+ cred = __task_cred(task);
57864+ pcred = __task_cred(task->real_parent);
57865+ ulong1 = va_arg(ap, unsigned long);
57866+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1);
57867+ break;
57868+ case GR_RWXMAP:
57869+ file = va_arg(ap, struct file *);
57870+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
57871+ break;
57872+ case GR_PSACCT:
57873+ {
57874+ unsigned int wday, cday;
57875+ __u8 whr, chr;
57876+ __u8 wmin, cmin;
57877+ __u8 wsec, csec;
57878+ char cur_tty[64] = { 0 };
57879+ char parent_tty[64] = { 0 };
57880+
57881+ task = va_arg(ap, struct task_struct *);
57882+ wday = va_arg(ap, unsigned int);
57883+ cday = va_arg(ap, unsigned int);
57884+ whr = va_arg(ap, int);
57885+ chr = va_arg(ap, int);
57886+ wmin = va_arg(ap, int);
57887+ cmin = va_arg(ap, int);
57888+ wsec = va_arg(ap, int);
57889+ csec = va_arg(ap, int);
57890+ ulong1 = va_arg(ap, unsigned long);
57891+ cred = __task_cred(task);
57892+ pcred = __task_cred(task->real_parent);
57893+
57894+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, &task->real_parent->signal->curr_ip, tty_name(task->real_parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid);
57895+ }
57896+ break;
57897+ default:
57898+ gr_log_middle(audit, msg, ap);
57899+ }
57900+ va_end(ap);
57901+ gr_log_end(audit);
57902+ END_LOCKS(audit);
57903+}
57904diff -urNp linux-2.6.32.46/grsecurity/grsec_mem.c linux-2.6.32.46/grsecurity/grsec_mem.c
57905--- linux-2.6.32.46/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
57906+++ linux-2.6.32.46/grsecurity/grsec_mem.c 2011-04-17 15:56:46.000000000 -0400
57907@@ -0,0 +1,33 @@
57908+#include <linux/kernel.h>
57909+#include <linux/sched.h>
57910+#include <linux/mm.h>
57911+#include <linux/mman.h>
57912+#include <linux/grinternal.h>
57913+
57914+void
57915+gr_handle_ioperm(void)
57916+{
57917+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
57918+ return;
57919+}
57920+
57921+void
57922+gr_handle_iopl(void)
57923+{
57924+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
57925+ return;
57926+}
57927+
57928+void
57929+gr_handle_mem_readwrite(u64 from, u64 to)
57930+{
57931+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
57932+ return;
57933+}
57934+
57935+void
57936+gr_handle_vm86(void)
57937+{
57938+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
57939+ return;
57940+}
57941diff -urNp linux-2.6.32.46/grsecurity/grsec_mount.c linux-2.6.32.46/grsecurity/grsec_mount.c
57942--- linux-2.6.32.46/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
57943+++ linux-2.6.32.46/grsecurity/grsec_mount.c 2011-06-20 19:47:03.000000000 -0400
57944@@ -0,0 +1,62 @@
57945+#include <linux/kernel.h>
57946+#include <linux/sched.h>
57947+#include <linux/mount.h>
57948+#include <linux/grsecurity.h>
57949+#include <linux/grinternal.h>
57950+
57951+void
57952+gr_log_remount(const char *devname, const int retval)
57953+{
57954+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
57955+ if (grsec_enable_mount && (retval >= 0))
57956+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
57957+#endif
57958+ return;
57959+}
57960+
57961+void
57962+gr_log_unmount(const char *devname, const int retval)
57963+{
57964+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
57965+ if (grsec_enable_mount && (retval >= 0))
57966+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
57967+#endif
57968+ return;
57969+}
57970+
57971+void
57972+gr_log_mount(const char *from, const char *to, const int retval)
57973+{
57974+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
57975+ if (grsec_enable_mount && (retval >= 0))
57976+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
57977+#endif
57978+ return;
57979+}
57980+
57981+int
57982+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
57983+{
57984+#ifdef CONFIG_GRKERNSEC_ROFS
57985+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
57986+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
57987+ return -EPERM;
57988+ } else
57989+ return 0;
57990+#endif
57991+ return 0;
57992+}
57993+
57994+int
57995+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
57996+{
57997+#ifdef CONFIG_GRKERNSEC_ROFS
57998+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
57999+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
58000+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
58001+ return -EPERM;
58002+ } else
58003+ return 0;
58004+#endif
58005+ return 0;
58006+}
58007diff -urNp linux-2.6.32.46/grsecurity/grsec_pax.c linux-2.6.32.46/grsecurity/grsec_pax.c
58008--- linux-2.6.32.46/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
58009+++ linux-2.6.32.46/grsecurity/grsec_pax.c 2011-04-17 15:56:46.000000000 -0400
58010@@ -0,0 +1,36 @@
58011+#include <linux/kernel.h>
58012+#include <linux/sched.h>
58013+#include <linux/mm.h>
58014+#include <linux/file.h>
58015+#include <linux/grinternal.h>
58016+#include <linux/grsecurity.h>
58017+
58018+void
58019+gr_log_textrel(struct vm_area_struct * vma)
58020+{
58021+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58022+ if (grsec_enable_audit_textrel)
58023+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
58024+#endif
58025+ return;
58026+}
58027+
58028+void
58029+gr_log_rwxmmap(struct file *file)
58030+{
58031+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58032+ if (grsec_enable_log_rwxmaps)
58033+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
58034+#endif
58035+ return;
58036+}
58037+
58038+void
58039+gr_log_rwxmprotect(struct file *file)
58040+{
58041+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58042+ if (grsec_enable_log_rwxmaps)
58043+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
58044+#endif
58045+ return;
58046+}
58047diff -urNp linux-2.6.32.46/grsecurity/grsec_ptrace.c linux-2.6.32.46/grsecurity/grsec_ptrace.c
58048--- linux-2.6.32.46/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
58049+++ linux-2.6.32.46/grsecurity/grsec_ptrace.c 2011-04-17 15:56:46.000000000 -0400
58050@@ -0,0 +1,14 @@
58051+#include <linux/kernel.h>
58052+#include <linux/sched.h>
58053+#include <linux/grinternal.h>
58054+#include <linux/grsecurity.h>
58055+
58056+void
58057+gr_audit_ptrace(struct task_struct *task)
58058+{
58059+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58060+ if (grsec_enable_audit_ptrace)
58061+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
58062+#endif
58063+ return;
58064+}
58065diff -urNp linux-2.6.32.46/grsecurity/grsec_sig.c linux-2.6.32.46/grsecurity/grsec_sig.c
58066--- linux-2.6.32.46/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
58067+++ linux-2.6.32.46/grsecurity/grsec_sig.c 2011-06-29 19:40:31.000000000 -0400
58068@@ -0,0 +1,205 @@
58069+#include <linux/kernel.h>
58070+#include <linux/sched.h>
58071+#include <linux/delay.h>
58072+#include <linux/grsecurity.h>
58073+#include <linux/grinternal.h>
58074+#include <linux/hardirq.h>
58075+
58076+char *signames[] = {
58077+ [SIGSEGV] = "Segmentation fault",
58078+ [SIGILL] = "Illegal instruction",
58079+ [SIGABRT] = "Abort",
58080+ [SIGBUS] = "Invalid alignment/Bus error"
58081+};
58082+
58083+void
58084+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
58085+{
58086+#ifdef CONFIG_GRKERNSEC_SIGNAL
58087+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
58088+ (sig == SIGABRT) || (sig == SIGBUS))) {
58089+ if (t->pid == current->pid) {
58090+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
58091+ } else {
58092+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
58093+ }
58094+ }
58095+#endif
58096+ return;
58097+}
58098+
58099+int
58100+gr_handle_signal(const struct task_struct *p, const int sig)
58101+{
58102+#ifdef CONFIG_GRKERNSEC
58103+ if (current->pid > 1 && gr_check_protected_task(p)) {
58104+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
58105+ return -EPERM;
58106+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
58107+ return -EPERM;
58108+ }
58109+#endif
58110+ return 0;
58111+}
58112+
58113+#ifdef CONFIG_GRKERNSEC
58114+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
58115+
58116+int gr_fake_force_sig(int sig, struct task_struct *t)
58117+{
58118+ unsigned long int flags;
58119+ int ret, blocked, ignored;
58120+ struct k_sigaction *action;
58121+
58122+ spin_lock_irqsave(&t->sighand->siglock, flags);
58123+ action = &t->sighand->action[sig-1];
58124+ ignored = action->sa.sa_handler == SIG_IGN;
58125+ blocked = sigismember(&t->blocked, sig);
58126+ if (blocked || ignored) {
58127+ action->sa.sa_handler = SIG_DFL;
58128+ if (blocked) {
58129+ sigdelset(&t->blocked, sig);
58130+ recalc_sigpending_and_wake(t);
58131+ }
58132+ }
58133+ if (action->sa.sa_handler == SIG_DFL)
58134+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
58135+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
58136+
58137+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
58138+
58139+ return ret;
58140+}
58141+#endif
58142+
58143+#ifdef CONFIG_GRKERNSEC_BRUTE
58144+#define GR_USER_BAN_TIME (15 * 60)
58145+
58146+static int __get_dumpable(unsigned long mm_flags)
58147+{
58148+ int ret;
58149+
58150+ ret = mm_flags & MMF_DUMPABLE_MASK;
58151+ return (ret >= 2) ? 2 : ret;
58152+}
58153+#endif
58154+
58155+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
58156+{
58157+#ifdef CONFIG_GRKERNSEC_BRUTE
58158+ uid_t uid = 0;
58159+
58160+ if (!grsec_enable_brute)
58161+ return;
58162+
58163+ rcu_read_lock();
58164+ read_lock(&tasklist_lock);
58165+ read_lock(&grsec_exec_file_lock);
58166+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
58167+ p->real_parent->brute = 1;
58168+ else {
58169+ const struct cred *cred = __task_cred(p), *cred2;
58170+ struct task_struct *tsk, *tsk2;
58171+
58172+ if (!__get_dumpable(mm_flags) && cred->uid) {
58173+ struct user_struct *user;
58174+
58175+ uid = cred->uid;
58176+
58177+ /* this is put upon execution past expiration */
58178+ user = find_user(uid);
58179+ if (user == NULL)
58180+ goto unlock;
58181+ user->banned = 1;
58182+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
58183+ if (user->ban_expires == ~0UL)
58184+ user->ban_expires--;
58185+
58186+ do_each_thread(tsk2, tsk) {
58187+ cred2 = __task_cred(tsk);
58188+ if (tsk != p && cred2->uid == uid)
58189+ gr_fake_force_sig(SIGKILL, tsk);
58190+ } while_each_thread(tsk2, tsk);
58191+ }
58192+ }
58193+unlock:
58194+ read_unlock(&grsec_exec_file_lock);
58195+ read_unlock(&tasklist_lock);
58196+ rcu_read_unlock();
58197+
58198+ if (uid)
58199+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
58200+#endif
58201+ return;
58202+}
58203+
58204+void gr_handle_brute_check(void)
58205+{
58206+#ifdef CONFIG_GRKERNSEC_BRUTE
58207+ if (current->brute)
58208+ msleep(30 * 1000);
58209+#endif
58210+ return;
58211+}
58212+
58213+void gr_handle_kernel_exploit(void)
58214+{
58215+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
58216+ const struct cred *cred;
58217+ struct task_struct *tsk, *tsk2;
58218+ struct user_struct *user;
58219+ uid_t uid;
58220+
58221+ if (in_irq() || in_serving_softirq() || in_nmi())
58222+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
58223+
58224+ uid = current_uid();
58225+
58226+ if (uid == 0)
58227+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
58228+ else {
58229+ /* kill all the processes of this user, hold a reference
58230+ to their creds struct, and prevent them from creating
58231+ another process until system reset
58232+ */
58233+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
58234+ /* we intentionally leak this ref */
58235+ user = get_uid(current->cred->user);
58236+ if (user) {
58237+ user->banned = 1;
58238+ user->ban_expires = ~0UL;
58239+ }
58240+
58241+ read_lock(&tasklist_lock);
58242+ do_each_thread(tsk2, tsk) {
58243+ cred = __task_cred(tsk);
58244+ if (cred->uid == uid)
58245+ gr_fake_force_sig(SIGKILL, tsk);
58246+ } while_each_thread(tsk2, tsk);
58247+ read_unlock(&tasklist_lock);
58248+ }
58249+#endif
58250+}
58251+
58252+int __gr_process_user_ban(struct user_struct *user)
58253+{
58254+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58255+ if (unlikely(user->banned)) {
58256+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
58257+ user->banned = 0;
58258+ user->ban_expires = 0;
58259+ free_uid(user);
58260+ } else
58261+ return -EPERM;
58262+ }
58263+#endif
58264+ return 0;
58265+}
58266+
58267+int gr_process_user_ban(void)
58268+{
58269+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58270+ return __gr_process_user_ban(current->cred->user);
58271+#endif
58272+ return 0;
58273+}
58274diff -urNp linux-2.6.32.46/grsecurity/grsec_sock.c linux-2.6.32.46/grsecurity/grsec_sock.c
58275--- linux-2.6.32.46/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
58276+++ linux-2.6.32.46/grsecurity/grsec_sock.c 2011-04-17 15:56:46.000000000 -0400
58277@@ -0,0 +1,275 @@
58278+#include <linux/kernel.h>
58279+#include <linux/module.h>
58280+#include <linux/sched.h>
58281+#include <linux/file.h>
58282+#include <linux/net.h>
58283+#include <linux/in.h>
58284+#include <linux/ip.h>
58285+#include <net/sock.h>
58286+#include <net/inet_sock.h>
58287+#include <linux/grsecurity.h>
58288+#include <linux/grinternal.h>
58289+#include <linux/gracl.h>
58290+
58291+kernel_cap_t gr_cap_rtnetlink(struct sock *sock);
58292+EXPORT_SYMBOL(gr_cap_rtnetlink);
58293+
58294+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
58295+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
58296+
58297+EXPORT_SYMBOL(gr_search_udp_recvmsg);
58298+EXPORT_SYMBOL(gr_search_udp_sendmsg);
58299+
58300+#ifdef CONFIG_UNIX_MODULE
58301+EXPORT_SYMBOL(gr_acl_handle_unix);
58302+EXPORT_SYMBOL(gr_acl_handle_mknod);
58303+EXPORT_SYMBOL(gr_handle_chroot_unix);
58304+EXPORT_SYMBOL(gr_handle_create);
58305+#endif
58306+
58307+#ifdef CONFIG_GRKERNSEC
58308+#define gr_conn_table_size 32749
58309+struct conn_table_entry {
58310+ struct conn_table_entry *next;
58311+ struct signal_struct *sig;
58312+};
58313+
58314+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
58315+DEFINE_SPINLOCK(gr_conn_table_lock);
58316+
58317+extern const char * gr_socktype_to_name(unsigned char type);
58318+extern const char * gr_proto_to_name(unsigned char proto);
58319+extern const char * gr_sockfamily_to_name(unsigned char family);
58320+
58321+static __inline__ int
58322+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
58323+{
58324+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
58325+}
58326+
58327+static __inline__ int
58328+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
58329+ __u16 sport, __u16 dport)
58330+{
58331+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
58332+ sig->gr_sport == sport && sig->gr_dport == dport))
58333+ return 1;
58334+ else
58335+ return 0;
58336+}
58337+
58338+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
58339+{
58340+ struct conn_table_entry **match;
58341+ unsigned int index;
58342+
58343+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
58344+ sig->gr_sport, sig->gr_dport,
58345+ gr_conn_table_size);
58346+
58347+ newent->sig = sig;
58348+
58349+ match = &gr_conn_table[index];
58350+ newent->next = *match;
58351+ *match = newent;
58352+
58353+ return;
58354+}
58355+
58356+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
58357+{
58358+ struct conn_table_entry *match, *last = NULL;
58359+ unsigned int index;
58360+
58361+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
58362+ sig->gr_sport, sig->gr_dport,
58363+ gr_conn_table_size);
58364+
58365+ match = gr_conn_table[index];
58366+ while (match && !conn_match(match->sig,
58367+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
58368+ sig->gr_dport)) {
58369+ last = match;
58370+ match = match->next;
58371+ }
58372+
58373+ if (match) {
58374+ if (last)
58375+ last->next = match->next;
58376+ else
58377+ gr_conn_table[index] = NULL;
58378+ kfree(match);
58379+ }
58380+
58381+ return;
58382+}
58383+
58384+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
58385+ __u16 sport, __u16 dport)
58386+{
58387+ struct conn_table_entry *match;
58388+ unsigned int index;
58389+
58390+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
58391+
58392+ match = gr_conn_table[index];
58393+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
58394+ match = match->next;
58395+
58396+ if (match)
58397+ return match->sig;
58398+ else
58399+ return NULL;
58400+}
58401+
58402+#endif
58403+
58404+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
58405+{
58406+#ifdef CONFIG_GRKERNSEC
58407+ struct signal_struct *sig = task->signal;
58408+ struct conn_table_entry *newent;
58409+
58410+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
58411+ if (newent == NULL)
58412+ return;
58413+ /* no bh lock needed since we are called with bh disabled */
58414+ spin_lock(&gr_conn_table_lock);
58415+ gr_del_task_from_ip_table_nolock(sig);
58416+ sig->gr_saddr = inet->rcv_saddr;
58417+ sig->gr_daddr = inet->daddr;
58418+ sig->gr_sport = inet->sport;
58419+ sig->gr_dport = inet->dport;
58420+ gr_add_to_task_ip_table_nolock(sig, newent);
58421+ spin_unlock(&gr_conn_table_lock);
58422+#endif
58423+ return;
58424+}
58425+
58426+void gr_del_task_from_ip_table(struct task_struct *task)
58427+{
58428+#ifdef CONFIG_GRKERNSEC
58429+ spin_lock_bh(&gr_conn_table_lock);
58430+ gr_del_task_from_ip_table_nolock(task->signal);
58431+ spin_unlock_bh(&gr_conn_table_lock);
58432+#endif
58433+ return;
58434+}
58435+
58436+void
58437+gr_attach_curr_ip(const struct sock *sk)
58438+{
58439+#ifdef CONFIG_GRKERNSEC
58440+ struct signal_struct *p, *set;
58441+ const struct inet_sock *inet = inet_sk(sk);
58442+
58443+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
58444+ return;
58445+
58446+ set = current->signal;
58447+
58448+ spin_lock_bh(&gr_conn_table_lock);
58449+ p = gr_lookup_task_ip_table(inet->daddr, inet->rcv_saddr,
58450+ inet->dport, inet->sport);
58451+ if (unlikely(p != NULL)) {
58452+ set->curr_ip = p->curr_ip;
58453+ set->used_accept = 1;
58454+ gr_del_task_from_ip_table_nolock(p);
58455+ spin_unlock_bh(&gr_conn_table_lock);
58456+ return;
58457+ }
58458+ spin_unlock_bh(&gr_conn_table_lock);
58459+
58460+ set->curr_ip = inet->daddr;
58461+ set->used_accept = 1;
58462+#endif
58463+ return;
58464+}
58465+
58466+int
58467+gr_handle_sock_all(const int family, const int type, const int protocol)
58468+{
58469+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
58470+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
58471+ (family != AF_UNIX)) {
58472+ if (family == AF_INET)
58473+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
58474+ else
58475+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
58476+ return -EACCES;
58477+ }
58478+#endif
58479+ return 0;
58480+}
58481+
58482+int
58483+gr_handle_sock_server(const struct sockaddr *sck)
58484+{
58485+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58486+ if (grsec_enable_socket_server &&
58487+ in_group_p(grsec_socket_server_gid) &&
58488+ sck && (sck->sa_family != AF_UNIX) &&
58489+ (sck->sa_family != AF_LOCAL)) {
58490+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
58491+ return -EACCES;
58492+ }
58493+#endif
58494+ return 0;
58495+}
58496+
58497+int
58498+gr_handle_sock_server_other(const struct sock *sck)
58499+{
58500+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58501+ if (grsec_enable_socket_server &&
58502+ in_group_p(grsec_socket_server_gid) &&
58503+ sck && (sck->sk_family != AF_UNIX) &&
58504+ (sck->sk_family != AF_LOCAL)) {
58505+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
58506+ return -EACCES;
58507+ }
58508+#endif
58509+ return 0;
58510+}
58511+
58512+int
58513+gr_handle_sock_client(const struct sockaddr *sck)
58514+{
58515+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
58516+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
58517+ sck && (sck->sa_family != AF_UNIX) &&
58518+ (sck->sa_family != AF_LOCAL)) {
58519+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
58520+ return -EACCES;
58521+ }
58522+#endif
58523+ return 0;
58524+}
58525+
58526+kernel_cap_t
58527+gr_cap_rtnetlink(struct sock *sock)
58528+{
58529+#ifdef CONFIG_GRKERNSEC
58530+ if (!gr_acl_is_enabled())
58531+ return current_cap();
58532+ else if (sock->sk_protocol == NETLINK_ISCSI &&
58533+ cap_raised(current_cap(), CAP_SYS_ADMIN) &&
58534+ gr_is_capable(CAP_SYS_ADMIN))
58535+ return current_cap();
58536+ else if (sock->sk_protocol == NETLINK_AUDIT &&
58537+ cap_raised(current_cap(), CAP_AUDIT_WRITE) &&
58538+ gr_is_capable(CAP_AUDIT_WRITE) &&
58539+ cap_raised(current_cap(), CAP_AUDIT_CONTROL) &&
58540+ gr_is_capable(CAP_AUDIT_CONTROL))
58541+ return current_cap();
58542+ else if (cap_raised(current_cap(), CAP_NET_ADMIN) &&
58543+ ((sock->sk_protocol == NETLINK_ROUTE) ?
58544+ gr_is_capable_nolog(CAP_NET_ADMIN) :
58545+ gr_is_capable(CAP_NET_ADMIN)))
58546+ return current_cap();
58547+ else
58548+ return __cap_empty_set;
58549+#else
58550+ return current_cap();
58551+#endif
58552+}
58553diff -urNp linux-2.6.32.46/grsecurity/grsec_sysctl.c linux-2.6.32.46/grsecurity/grsec_sysctl.c
58554--- linux-2.6.32.46/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
58555+++ linux-2.6.32.46/grsecurity/grsec_sysctl.c 2011-08-11 19:57:54.000000000 -0400
58556@@ -0,0 +1,479 @@
58557+#include <linux/kernel.h>
58558+#include <linux/sched.h>
58559+#include <linux/sysctl.h>
58560+#include <linux/grsecurity.h>
58561+#include <linux/grinternal.h>
58562+
58563+int
58564+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
58565+{
58566+#ifdef CONFIG_GRKERNSEC_SYSCTL
58567+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
58568+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
58569+ return -EACCES;
58570+ }
58571+#endif
58572+ return 0;
58573+}
58574+
58575+#ifdef CONFIG_GRKERNSEC_ROFS
58576+static int __maybe_unused one = 1;
58577+#endif
58578+
58579+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
58580+ctl_table grsecurity_table[] = {
58581+#ifdef CONFIG_GRKERNSEC_SYSCTL
58582+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
58583+#ifdef CONFIG_GRKERNSEC_IO
58584+ {
58585+ .ctl_name = CTL_UNNUMBERED,
58586+ .procname = "disable_priv_io",
58587+ .data = &grsec_disable_privio,
58588+ .maxlen = sizeof(int),
58589+ .mode = 0600,
58590+ .proc_handler = &proc_dointvec,
58591+ },
58592+#endif
58593+#endif
58594+#ifdef CONFIG_GRKERNSEC_LINK
58595+ {
58596+ .ctl_name = CTL_UNNUMBERED,
58597+ .procname = "linking_restrictions",
58598+ .data = &grsec_enable_link,
58599+ .maxlen = sizeof(int),
58600+ .mode = 0600,
58601+ .proc_handler = &proc_dointvec,
58602+ },
58603+#endif
58604+#ifdef CONFIG_GRKERNSEC_BRUTE
58605+ {
58606+ .ctl_name = CTL_UNNUMBERED,
58607+ .procname = "deter_bruteforce",
58608+ .data = &grsec_enable_brute,
58609+ .maxlen = sizeof(int),
58610+ .mode = 0600,
58611+ .proc_handler = &proc_dointvec,
58612+ },
58613+#endif
58614+#ifdef CONFIG_GRKERNSEC_FIFO
58615+ {
58616+ .ctl_name = CTL_UNNUMBERED,
58617+ .procname = "fifo_restrictions",
58618+ .data = &grsec_enable_fifo,
58619+ .maxlen = sizeof(int),
58620+ .mode = 0600,
58621+ .proc_handler = &proc_dointvec,
58622+ },
58623+#endif
58624+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
58625+ {
58626+ .ctl_name = CTL_UNNUMBERED,
58627+ .procname = "ip_blackhole",
58628+ .data = &grsec_enable_blackhole,
58629+ .maxlen = sizeof(int),
58630+ .mode = 0600,
58631+ .proc_handler = &proc_dointvec,
58632+ },
58633+ {
58634+ .ctl_name = CTL_UNNUMBERED,
58635+ .procname = "lastack_retries",
58636+ .data = &grsec_lastack_retries,
58637+ .maxlen = sizeof(int),
58638+ .mode = 0600,
58639+ .proc_handler = &proc_dointvec,
58640+ },
58641+#endif
58642+#ifdef CONFIG_GRKERNSEC_EXECLOG
58643+ {
58644+ .ctl_name = CTL_UNNUMBERED,
58645+ .procname = "exec_logging",
58646+ .data = &grsec_enable_execlog,
58647+ .maxlen = sizeof(int),
58648+ .mode = 0600,
58649+ .proc_handler = &proc_dointvec,
58650+ },
58651+#endif
58652+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58653+ {
58654+ .ctl_name = CTL_UNNUMBERED,
58655+ .procname = "rwxmap_logging",
58656+ .data = &grsec_enable_log_rwxmaps,
58657+ .maxlen = sizeof(int),
58658+ .mode = 0600,
58659+ .proc_handler = &proc_dointvec,
58660+ },
58661+#endif
58662+#ifdef CONFIG_GRKERNSEC_SIGNAL
58663+ {
58664+ .ctl_name = CTL_UNNUMBERED,
58665+ .procname = "signal_logging",
58666+ .data = &grsec_enable_signal,
58667+ .maxlen = sizeof(int),
58668+ .mode = 0600,
58669+ .proc_handler = &proc_dointvec,
58670+ },
58671+#endif
58672+#ifdef CONFIG_GRKERNSEC_FORKFAIL
58673+ {
58674+ .ctl_name = CTL_UNNUMBERED,
58675+ .procname = "forkfail_logging",
58676+ .data = &grsec_enable_forkfail,
58677+ .maxlen = sizeof(int),
58678+ .mode = 0600,
58679+ .proc_handler = &proc_dointvec,
58680+ },
58681+#endif
58682+#ifdef CONFIG_GRKERNSEC_TIME
58683+ {
58684+ .ctl_name = CTL_UNNUMBERED,
58685+ .procname = "timechange_logging",
58686+ .data = &grsec_enable_time,
58687+ .maxlen = sizeof(int),
58688+ .mode = 0600,
58689+ .proc_handler = &proc_dointvec,
58690+ },
58691+#endif
58692+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
58693+ {
58694+ .ctl_name = CTL_UNNUMBERED,
58695+ .procname = "chroot_deny_shmat",
58696+ .data = &grsec_enable_chroot_shmat,
58697+ .maxlen = sizeof(int),
58698+ .mode = 0600,
58699+ .proc_handler = &proc_dointvec,
58700+ },
58701+#endif
58702+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
58703+ {
58704+ .ctl_name = CTL_UNNUMBERED,
58705+ .procname = "chroot_deny_unix",
58706+ .data = &grsec_enable_chroot_unix,
58707+ .maxlen = sizeof(int),
58708+ .mode = 0600,
58709+ .proc_handler = &proc_dointvec,
58710+ },
58711+#endif
58712+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
58713+ {
58714+ .ctl_name = CTL_UNNUMBERED,
58715+ .procname = "chroot_deny_mount",
58716+ .data = &grsec_enable_chroot_mount,
58717+ .maxlen = sizeof(int),
58718+ .mode = 0600,
58719+ .proc_handler = &proc_dointvec,
58720+ },
58721+#endif
58722+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
58723+ {
58724+ .ctl_name = CTL_UNNUMBERED,
58725+ .procname = "chroot_deny_fchdir",
58726+ .data = &grsec_enable_chroot_fchdir,
58727+ .maxlen = sizeof(int),
58728+ .mode = 0600,
58729+ .proc_handler = &proc_dointvec,
58730+ },
58731+#endif
58732+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
58733+ {
58734+ .ctl_name = CTL_UNNUMBERED,
58735+ .procname = "chroot_deny_chroot",
58736+ .data = &grsec_enable_chroot_double,
58737+ .maxlen = sizeof(int),
58738+ .mode = 0600,
58739+ .proc_handler = &proc_dointvec,
58740+ },
58741+#endif
58742+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
58743+ {
58744+ .ctl_name = CTL_UNNUMBERED,
58745+ .procname = "chroot_deny_pivot",
58746+ .data = &grsec_enable_chroot_pivot,
58747+ .maxlen = sizeof(int),
58748+ .mode = 0600,
58749+ .proc_handler = &proc_dointvec,
58750+ },
58751+#endif
58752+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
58753+ {
58754+ .ctl_name = CTL_UNNUMBERED,
58755+ .procname = "chroot_enforce_chdir",
58756+ .data = &grsec_enable_chroot_chdir,
58757+ .maxlen = sizeof(int),
58758+ .mode = 0600,
58759+ .proc_handler = &proc_dointvec,
58760+ },
58761+#endif
58762+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
58763+ {
58764+ .ctl_name = CTL_UNNUMBERED,
58765+ .procname = "chroot_deny_chmod",
58766+ .data = &grsec_enable_chroot_chmod,
58767+ .maxlen = sizeof(int),
58768+ .mode = 0600,
58769+ .proc_handler = &proc_dointvec,
58770+ },
58771+#endif
58772+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
58773+ {
58774+ .ctl_name = CTL_UNNUMBERED,
58775+ .procname = "chroot_deny_mknod",
58776+ .data = &grsec_enable_chroot_mknod,
58777+ .maxlen = sizeof(int),
58778+ .mode = 0600,
58779+ .proc_handler = &proc_dointvec,
58780+ },
58781+#endif
58782+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
58783+ {
58784+ .ctl_name = CTL_UNNUMBERED,
58785+ .procname = "chroot_restrict_nice",
58786+ .data = &grsec_enable_chroot_nice,
58787+ .maxlen = sizeof(int),
58788+ .mode = 0600,
58789+ .proc_handler = &proc_dointvec,
58790+ },
58791+#endif
58792+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
58793+ {
58794+ .ctl_name = CTL_UNNUMBERED,
58795+ .procname = "chroot_execlog",
58796+ .data = &grsec_enable_chroot_execlog,
58797+ .maxlen = sizeof(int),
58798+ .mode = 0600,
58799+ .proc_handler = &proc_dointvec,
58800+ },
58801+#endif
58802+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58803+ {
58804+ .ctl_name = CTL_UNNUMBERED,
58805+ .procname = "chroot_caps",
58806+ .data = &grsec_enable_chroot_caps,
58807+ .maxlen = sizeof(int),
58808+ .mode = 0600,
58809+ .proc_handler = &proc_dointvec,
58810+ },
58811+#endif
58812+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
58813+ {
58814+ .ctl_name = CTL_UNNUMBERED,
58815+ .procname = "chroot_deny_sysctl",
58816+ .data = &grsec_enable_chroot_sysctl,
58817+ .maxlen = sizeof(int),
58818+ .mode = 0600,
58819+ .proc_handler = &proc_dointvec,
58820+ },
58821+#endif
58822+#ifdef CONFIG_GRKERNSEC_TPE
58823+ {
58824+ .ctl_name = CTL_UNNUMBERED,
58825+ .procname = "tpe",
58826+ .data = &grsec_enable_tpe,
58827+ .maxlen = sizeof(int),
58828+ .mode = 0600,
58829+ .proc_handler = &proc_dointvec,
58830+ },
58831+ {
58832+ .ctl_name = CTL_UNNUMBERED,
58833+ .procname = "tpe_gid",
58834+ .data = &grsec_tpe_gid,
58835+ .maxlen = sizeof(int),
58836+ .mode = 0600,
58837+ .proc_handler = &proc_dointvec,
58838+ },
58839+#endif
58840+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
58841+ {
58842+ .ctl_name = CTL_UNNUMBERED,
58843+ .procname = "tpe_invert",
58844+ .data = &grsec_enable_tpe_invert,
58845+ .maxlen = sizeof(int),
58846+ .mode = 0600,
58847+ .proc_handler = &proc_dointvec,
58848+ },
58849+#endif
58850+#ifdef CONFIG_GRKERNSEC_TPE_ALL
58851+ {
58852+ .ctl_name = CTL_UNNUMBERED,
58853+ .procname = "tpe_restrict_all",
58854+ .data = &grsec_enable_tpe_all,
58855+ .maxlen = sizeof(int),
58856+ .mode = 0600,
58857+ .proc_handler = &proc_dointvec,
58858+ },
58859+#endif
58860+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
58861+ {
58862+ .ctl_name = CTL_UNNUMBERED,
58863+ .procname = "socket_all",
58864+ .data = &grsec_enable_socket_all,
58865+ .maxlen = sizeof(int),
58866+ .mode = 0600,
58867+ .proc_handler = &proc_dointvec,
58868+ },
58869+ {
58870+ .ctl_name = CTL_UNNUMBERED,
58871+ .procname = "socket_all_gid",
58872+ .data = &grsec_socket_all_gid,
58873+ .maxlen = sizeof(int),
58874+ .mode = 0600,
58875+ .proc_handler = &proc_dointvec,
58876+ },
58877+#endif
58878+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
58879+ {
58880+ .ctl_name = CTL_UNNUMBERED,
58881+ .procname = "socket_client",
58882+ .data = &grsec_enable_socket_client,
58883+ .maxlen = sizeof(int),
58884+ .mode = 0600,
58885+ .proc_handler = &proc_dointvec,
58886+ },
58887+ {
58888+ .ctl_name = CTL_UNNUMBERED,
58889+ .procname = "socket_client_gid",
58890+ .data = &grsec_socket_client_gid,
58891+ .maxlen = sizeof(int),
58892+ .mode = 0600,
58893+ .proc_handler = &proc_dointvec,
58894+ },
58895+#endif
58896+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58897+ {
58898+ .ctl_name = CTL_UNNUMBERED,
58899+ .procname = "socket_server",
58900+ .data = &grsec_enable_socket_server,
58901+ .maxlen = sizeof(int),
58902+ .mode = 0600,
58903+ .proc_handler = &proc_dointvec,
58904+ },
58905+ {
58906+ .ctl_name = CTL_UNNUMBERED,
58907+ .procname = "socket_server_gid",
58908+ .data = &grsec_socket_server_gid,
58909+ .maxlen = sizeof(int),
58910+ .mode = 0600,
58911+ .proc_handler = &proc_dointvec,
58912+ },
58913+#endif
58914+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
58915+ {
58916+ .ctl_name = CTL_UNNUMBERED,
58917+ .procname = "audit_group",
58918+ .data = &grsec_enable_group,
58919+ .maxlen = sizeof(int),
58920+ .mode = 0600,
58921+ .proc_handler = &proc_dointvec,
58922+ },
58923+ {
58924+ .ctl_name = CTL_UNNUMBERED,
58925+ .procname = "audit_gid",
58926+ .data = &grsec_audit_gid,
58927+ .maxlen = sizeof(int),
58928+ .mode = 0600,
58929+ .proc_handler = &proc_dointvec,
58930+ },
58931+#endif
58932+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
58933+ {
58934+ .ctl_name = CTL_UNNUMBERED,
58935+ .procname = "audit_chdir",
58936+ .data = &grsec_enable_chdir,
58937+ .maxlen = sizeof(int),
58938+ .mode = 0600,
58939+ .proc_handler = &proc_dointvec,
58940+ },
58941+#endif
58942+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58943+ {
58944+ .ctl_name = CTL_UNNUMBERED,
58945+ .procname = "audit_mount",
58946+ .data = &grsec_enable_mount,
58947+ .maxlen = sizeof(int),
58948+ .mode = 0600,
58949+ .proc_handler = &proc_dointvec,
58950+ },
58951+#endif
58952+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58953+ {
58954+ .ctl_name = CTL_UNNUMBERED,
58955+ .procname = "audit_textrel",
58956+ .data = &grsec_enable_audit_textrel,
58957+ .maxlen = sizeof(int),
58958+ .mode = 0600,
58959+ .proc_handler = &proc_dointvec,
58960+ },
58961+#endif
58962+#ifdef CONFIG_GRKERNSEC_DMESG
58963+ {
58964+ .ctl_name = CTL_UNNUMBERED,
58965+ .procname = "dmesg",
58966+ .data = &grsec_enable_dmesg,
58967+ .maxlen = sizeof(int),
58968+ .mode = 0600,
58969+ .proc_handler = &proc_dointvec,
58970+ },
58971+#endif
58972+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
58973+ {
58974+ .ctl_name = CTL_UNNUMBERED,
58975+ .procname = "chroot_findtask",
58976+ .data = &grsec_enable_chroot_findtask,
58977+ .maxlen = sizeof(int),
58978+ .mode = 0600,
58979+ .proc_handler = &proc_dointvec,
58980+ },
58981+#endif
58982+#ifdef CONFIG_GRKERNSEC_RESLOG
58983+ {
58984+ .ctl_name = CTL_UNNUMBERED,
58985+ .procname = "resource_logging",
58986+ .data = &grsec_resource_logging,
58987+ .maxlen = sizeof(int),
58988+ .mode = 0600,
58989+ .proc_handler = &proc_dointvec,
58990+ },
58991+#endif
58992+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58993+ {
58994+ .ctl_name = CTL_UNNUMBERED,
58995+ .procname = "audit_ptrace",
58996+ .data = &grsec_enable_audit_ptrace,
58997+ .maxlen = sizeof(int),
58998+ .mode = 0600,
58999+ .proc_handler = &proc_dointvec,
59000+ },
59001+#endif
59002+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59003+ {
59004+ .ctl_name = CTL_UNNUMBERED,
59005+ .procname = "harden_ptrace",
59006+ .data = &grsec_enable_harden_ptrace,
59007+ .maxlen = sizeof(int),
59008+ .mode = 0600,
59009+ .proc_handler = &proc_dointvec,
59010+ },
59011+#endif
59012+ {
59013+ .ctl_name = CTL_UNNUMBERED,
59014+ .procname = "grsec_lock",
59015+ .data = &grsec_lock,
59016+ .maxlen = sizeof(int),
59017+ .mode = 0600,
59018+ .proc_handler = &proc_dointvec,
59019+ },
59020+#endif
59021+#ifdef CONFIG_GRKERNSEC_ROFS
59022+ {
59023+ .ctl_name = CTL_UNNUMBERED,
59024+ .procname = "romount_protect",
59025+ .data = &grsec_enable_rofs,
59026+ .maxlen = sizeof(int),
59027+ .mode = 0600,
59028+ .proc_handler = &proc_dointvec_minmax,
59029+ .extra1 = &one,
59030+ .extra2 = &one,
59031+ },
59032+#endif
59033+ { .ctl_name = 0 }
59034+};
59035+#endif
59036diff -urNp linux-2.6.32.46/grsecurity/grsec_time.c linux-2.6.32.46/grsecurity/grsec_time.c
59037--- linux-2.6.32.46/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
59038+++ linux-2.6.32.46/grsecurity/grsec_time.c 2011-04-17 15:56:46.000000000 -0400
59039@@ -0,0 +1,16 @@
59040+#include <linux/kernel.h>
59041+#include <linux/sched.h>
59042+#include <linux/grinternal.h>
59043+#include <linux/module.h>
59044+
59045+void
59046+gr_log_timechange(void)
59047+{
59048+#ifdef CONFIG_GRKERNSEC_TIME
59049+ if (grsec_enable_time)
59050+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
59051+#endif
59052+ return;
59053+}
59054+
59055+EXPORT_SYMBOL(gr_log_timechange);
59056diff -urNp linux-2.6.32.46/grsecurity/grsec_tpe.c linux-2.6.32.46/grsecurity/grsec_tpe.c
59057--- linux-2.6.32.46/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
59058+++ linux-2.6.32.46/grsecurity/grsec_tpe.c 2011-04-17 15:56:46.000000000 -0400
59059@@ -0,0 +1,39 @@
59060+#include <linux/kernel.h>
59061+#include <linux/sched.h>
59062+#include <linux/file.h>
59063+#include <linux/fs.h>
59064+#include <linux/grinternal.h>
59065+
59066+extern int gr_acl_tpe_check(void);
59067+
59068+int
59069+gr_tpe_allow(const struct file *file)
59070+{
59071+#ifdef CONFIG_GRKERNSEC
59072+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
59073+ const struct cred *cred = current_cred();
59074+
59075+ if (cred->uid && ((grsec_enable_tpe &&
59076+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59077+ ((grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid)) ||
59078+ (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid)))
59079+#else
59080+ in_group_p(grsec_tpe_gid)
59081+#endif
59082+ ) || gr_acl_tpe_check()) &&
59083+ (inode->i_uid || (!inode->i_uid && ((inode->i_mode & S_IWGRP) ||
59084+ (inode->i_mode & S_IWOTH))))) {
59085+ gr_log_fs_generic(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, file->f_path.dentry, file->f_path.mnt);
59086+ return 0;
59087+ }
59088+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59089+ if (cred->uid && grsec_enable_tpe && grsec_enable_tpe_all &&
59090+ ((inode->i_uid && (inode->i_uid != cred->uid)) ||
59091+ (inode->i_mode & S_IWGRP) || (inode->i_mode & S_IWOTH))) {
59092+ gr_log_fs_generic(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, file->f_path.dentry, file->f_path.mnt);
59093+ return 0;
59094+ }
59095+#endif
59096+#endif
59097+ return 1;
59098+}
59099diff -urNp linux-2.6.32.46/grsecurity/grsum.c linux-2.6.32.46/grsecurity/grsum.c
59100--- linux-2.6.32.46/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
59101+++ linux-2.6.32.46/grsecurity/grsum.c 2011-04-17 15:56:46.000000000 -0400
59102@@ -0,0 +1,61 @@
59103+#include <linux/err.h>
59104+#include <linux/kernel.h>
59105+#include <linux/sched.h>
59106+#include <linux/mm.h>
59107+#include <linux/scatterlist.h>
59108+#include <linux/crypto.h>
59109+#include <linux/gracl.h>
59110+
59111+
59112+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
59113+#error "crypto and sha256 must be built into the kernel"
59114+#endif
59115+
59116+int
59117+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
59118+{
59119+ char *p;
59120+ struct crypto_hash *tfm;
59121+ struct hash_desc desc;
59122+ struct scatterlist sg;
59123+ unsigned char temp_sum[GR_SHA_LEN];
59124+ volatile int retval = 0;
59125+ volatile int dummy = 0;
59126+ unsigned int i;
59127+
59128+ sg_init_table(&sg, 1);
59129+
59130+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
59131+ if (IS_ERR(tfm)) {
59132+ /* should never happen, since sha256 should be built in */
59133+ return 1;
59134+ }
59135+
59136+ desc.tfm = tfm;
59137+ desc.flags = 0;
59138+
59139+ crypto_hash_init(&desc);
59140+
59141+ p = salt;
59142+ sg_set_buf(&sg, p, GR_SALT_LEN);
59143+ crypto_hash_update(&desc, &sg, sg.length);
59144+
59145+ p = entry->pw;
59146+ sg_set_buf(&sg, p, strlen(p));
59147+
59148+ crypto_hash_update(&desc, &sg, sg.length);
59149+
59150+ crypto_hash_final(&desc, temp_sum);
59151+
59152+ memset(entry->pw, 0, GR_PW_LEN);
59153+
59154+ for (i = 0; i < GR_SHA_LEN; i++)
59155+ if (sum[i] != temp_sum[i])
59156+ retval = 1;
59157+ else
59158+ dummy = 1; // waste a cycle
59159+
59160+ crypto_free_hash(tfm);
59161+
59162+ return retval;
59163+}
59164diff -urNp linux-2.6.32.46/grsecurity/Kconfig linux-2.6.32.46/grsecurity/Kconfig
59165--- linux-2.6.32.46/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
59166+++ linux-2.6.32.46/grsecurity/Kconfig 2011-09-15 00:00:38.000000000 -0400
59167@@ -0,0 +1,1037 @@
59168+#
59169+# grecurity configuration
59170+#
59171+
59172+menu "Grsecurity"
59173+
59174+config GRKERNSEC
59175+ bool "Grsecurity"
59176+ select CRYPTO
59177+ select CRYPTO_SHA256
59178+ help
59179+ If you say Y here, you will be able to configure many features
59180+ that will enhance the security of your system. It is highly
59181+ recommended that you say Y here and read through the help
59182+ for each option so that you fully understand the features and
59183+ can evaluate their usefulness for your machine.
59184+
59185+choice
59186+ prompt "Security Level"
59187+ depends on GRKERNSEC
59188+ default GRKERNSEC_CUSTOM
59189+
59190+config GRKERNSEC_LOW
59191+ bool "Low"
59192+ select GRKERNSEC_LINK
59193+ select GRKERNSEC_FIFO
59194+ select GRKERNSEC_RANDNET
59195+ select GRKERNSEC_DMESG
59196+ select GRKERNSEC_CHROOT
59197+ select GRKERNSEC_CHROOT_CHDIR
59198+
59199+ help
59200+ If you choose this option, several of the grsecurity options will
59201+ be enabled that will give you greater protection against a number
59202+ of attacks, while assuring that none of your software will have any
59203+ conflicts with the additional security measures. If you run a lot
59204+ of unusual software, or you are having problems with the higher
59205+ security levels, you should say Y here. With this option, the
59206+ following features are enabled:
59207+
59208+ - Linking restrictions
59209+ - FIFO restrictions
59210+ - Restricted dmesg
59211+ - Enforced chdir("/") on chroot
59212+ - Runtime module disabling
59213+
59214+config GRKERNSEC_MEDIUM
59215+ bool "Medium"
59216+ select PAX
59217+ select PAX_EI_PAX
59218+ select PAX_PT_PAX_FLAGS
59219+ select PAX_HAVE_ACL_FLAGS
59220+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
59221+ select GRKERNSEC_CHROOT
59222+ select GRKERNSEC_CHROOT_SYSCTL
59223+ select GRKERNSEC_LINK
59224+ select GRKERNSEC_FIFO
59225+ select GRKERNSEC_DMESG
59226+ select GRKERNSEC_RANDNET
59227+ select GRKERNSEC_FORKFAIL
59228+ select GRKERNSEC_TIME
59229+ select GRKERNSEC_SIGNAL
59230+ select GRKERNSEC_CHROOT
59231+ select GRKERNSEC_CHROOT_UNIX
59232+ select GRKERNSEC_CHROOT_MOUNT
59233+ select GRKERNSEC_CHROOT_PIVOT
59234+ select GRKERNSEC_CHROOT_DOUBLE
59235+ select GRKERNSEC_CHROOT_CHDIR
59236+ select GRKERNSEC_CHROOT_MKNOD
59237+ select GRKERNSEC_PROC
59238+ select GRKERNSEC_PROC_USERGROUP
59239+ select PAX_RANDUSTACK
59240+ select PAX_ASLR
59241+ select PAX_RANDMMAP
59242+ select PAX_REFCOUNT if (X86 || SPARC64)
59243+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
59244+
59245+ help
59246+ If you say Y here, several features in addition to those included
59247+ in the low additional security level will be enabled. These
59248+ features provide even more security to your system, though in rare
59249+ cases they may be incompatible with very old or poorly written
59250+ software. If you enable this option, make sure that your auth
59251+ service (identd) is running as gid 1001. With this option,
59252+ the following features (in addition to those provided in the
59253+ low additional security level) will be enabled:
59254+
59255+ - Failed fork logging
59256+ - Time change logging
59257+ - Signal logging
59258+ - Deny mounts in chroot
59259+ - Deny double chrooting
59260+ - Deny sysctl writes in chroot
59261+ - Deny mknod in chroot
59262+ - Deny access to abstract AF_UNIX sockets out of chroot
59263+ - Deny pivot_root in chroot
59264+ - Denied writes of /dev/kmem, /dev/mem, and /dev/port
59265+ - /proc restrictions with special GID set to 10 (usually wheel)
59266+ - Address Space Layout Randomization (ASLR)
59267+ - Prevent exploitation of most refcount overflows
59268+ - Bounds checking of copying between the kernel and userland
59269+
59270+config GRKERNSEC_HIGH
59271+ bool "High"
59272+ select GRKERNSEC_LINK
59273+ select GRKERNSEC_FIFO
59274+ select GRKERNSEC_DMESG
59275+ select GRKERNSEC_FORKFAIL
59276+ select GRKERNSEC_TIME
59277+ select GRKERNSEC_SIGNAL
59278+ select GRKERNSEC_CHROOT
59279+ select GRKERNSEC_CHROOT_SHMAT
59280+ select GRKERNSEC_CHROOT_UNIX
59281+ select GRKERNSEC_CHROOT_MOUNT
59282+ select GRKERNSEC_CHROOT_FCHDIR
59283+ select GRKERNSEC_CHROOT_PIVOT
59284+ select GRKERNSEC_CHROOT_DOUBLE
59285+ select GRKERNSEC_CHROOT_CHDIR
59286+ select GRKERNSEC_CHROOT_MKNOD
59287+ select GRKERNSEC_CHROOT_CAPS
59288+ select GRKERNSEC_CHROOT_SYSCTL
59289+ select GRKERNSEC_CHROOT_FINDTASK
59290+ select GRKERNSEC_SYSFS_RESTRICT
59291+ select GRKERNSEC_PROC
59292+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
59293+ select GRKERNSEC_HIDESYM
59294+ select GRKERNSEC_BRUTE
59295+ select GRKERNSEC_PROC_USERGROUP
59296+ select GRKERNSEC_KMEM
59297+ select GRKERNSEC_RESLOG
59298+ select GRKERNSEC_RANDNET
59299+ select GRKERNSEC_PROC_ADD
59300+ select GRKERNSEC_CHROOT_CHMOD
59301+ select GRKERNSEC_CHROOT_NICE
59302+ select GRKERNSEC_AUDIT_MOUNT
59303+ select GRKERNSEC_MODHARDEN if (MODULES)
59304+ select GRKERNSEC_HARDEN_PTRACE
59305+ select GRKERNSEC_VM86 if (X86_32)
59306+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
59307+ select PAX
59308+ select PAX_RANDUSTACK
59309+ select PAX_ASLR
59310+ select PAX_RANDMMAP
59311+ select PAX_NOEXEC
59312+ select PAX_MPROTECT
59313+ select PAX_EI_PAX
59314+ select PAX_PT_PAX_FLAGS
59315+ select PAX_HAVE_ACL_FLAGS
59316+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
59317+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
59318+ select PAX_RANDKSTACK if (X86_TSC && X86)
59319+ select PAX_SEGMEXEC if (X86_32)
59320+ select PAX_PAGEEXEC
59321+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
59322+ select PAX_EMUTRAMP if (PARISC)
59323+ select PAX_EMUSIGRT if (PARISC)
59324+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
59325+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
59326+ select PAX_REFCOUNT if (X86 || SPARC64)
59327+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
59328+ help
59329+ If you say Y here, many of the features of grsecurity will be
59330+ enabled, which will protect you against many kinds of attacks
59331+ against your system. The heightened security comes at a cost
59332+ of an increased chance of incompatibilities with rare software
59333+ on your machine. Since this security level enables PaX, you should
59334+ view <http://pax.grsecurity.net> and read about the PaX
59335+ project. While you are there, download chpax and run it on
59336+ binaries that cause problems with PaX. Also remember that
59337+ since the /proc restrictions are enabled, you must run your
59338+ identd as gid 1001. This security level enables the following
59339+ features in addition to those listed in the low and medium
59340+ security levels:
59341+
59342+ - Additional /proc restrictions
59343+ - Chmod restrictions in chroot
59344+ - No signals, ptrace, or viewing of processes outside of chroot
59345+ - Capability restrictions in chroot
59346+ - Deny fchdir out of chroot
59347+ - Priority restrictions in chroot
59348+ - Segmentation-based implementation of PaX
59349+ - Mprotect restrictions
59350+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
59351+ - Kernel stack randomization
59352+ - Mount/unmount/remount logging
59353+ - Kernel symbol hiding
59354+ - Prevention of memory exhaustion-based exploits
59355+ - Hardening of module auto-loading
59356+ - Ptrace restrictions
59357+ - Restricted vm86 mode
59358+ - Restricted sysfs/debugfs
59359+ - Active kernel exploit response
59360+
59361+config GRKERNSEC_CUSTOM
59362+ bool "Custom"
59363+ help
59364+ If you say Y here, you will be able to configure every grsecurity
59365+ option, which allows you to enable many more features that aren't
59366+ covered in the basic security levels. These additional features
59367+ include TPE, socket restrictions, and the sysctl system for
59368+ grsecurity. It is advised that you read through the help for
59369+ each option to determine its usefulness in your situation.
59370+
59371+endchoice
59372+
59373+menu "Address Space Protection"
59374+depends on GRKERNSEC
59375+
59376+config GRKERNSEC_KMEM
59377+ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
59378+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
59379+ help
59380+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
59381+ be written to via mmap or otherwise to modify the running kernel.
59382+ /dev/port will also not be allowed to be opened. If you have module
59383+ support disabled, enabling this will close up four ways that are
59384+ currently used to insert malicious code into the running kernel.
59385+ Even with all these features enabled, we still highly recommend that
59386+ you use the RBAC system, as it is still possible for an attacker to
59387+ modify the running kernel through privileged I/O granted by ioperm/iopl.
59388+ If you are not using XFree86, you may be able to stop this additional
59389+ case by enabling the 'Disable privileged I/O' option. Though nothing
59390+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
59391+ but only to video memory, which is the only writing we allow in this
59392+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
59393+ not be allowed to mprotect it with PROT_WRITE later.
59394+ It is highly recommended that you say Y here if you meet all the
59395+ conditions above.
59396+
59397+config GRKERNSEC_VM86
59398+ bool "Restrict VM86 mode"
59399+ depends on X86_32
59400+
59401+ help
59402+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
59403+ make use of a special execution mode on 32bit x86 processors called
59404+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
59405+ video cards and will still work with this option enabled. The purpose
59406+ of the option is to prevent exploitation of emulation errors in
59407+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
59408+ Nearly all users should be able to enable this option.
59409+
59410+config GRKERNSEC_IO
59411+ bool "Disable privileged I/O"
59412+ depends on X86
59413+ select RTC_CLASS
59414+ select RTC_INTF_DEV
59415+ select RTC_DRV_CMOS
59416+
59417+ help
59418+ If you say Y here, all ioperm and iopl calls will return an error.
59419+ Ioperm and iopl can be used to modify the running kernel.
59420+ Unfortunately, some programs need this access to operate properly,
59421+ the most notable of which are XFree86 and hwclock. hwclock can be
59422+ remedied by having RTC support in the kernel, so real-time
59423+ clock support is enabled if this option is enabled, to ensure
59424+ that hwclock operates correctly. XFree86 still will not
59425+ operate correctly with this option enabled, so DO NOT CHOOSE Y
59426+ IF YOU USE XFree86. If you use XFree86 and you still want to
59427+ protect your kernel against modification, use the RBAC system.
59428+
59429+config GRKERNSEC_PROC_MEMMAP
59430+ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
59431+ default y if (PAX_NOEXEC || PAX_ASLR)
59432+ depends on PAX_NOEXEC || PAX_ASLR
59433+ help
59434+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
59435+ give no information about the addresses of its mappings if
59436+ PaX features that rely on random addresses are enabled on the task.
59437+ If you use PaX it is greatly recommended that you say Y here as it
59438+ closes up a hole that makes the full ASLR useless for suid
59439+ binaries.
59440+
59441+config GRKERNSEC_BRUTE
59442+ bool "Deter exploit bruteforcing"
59443+ help
59444+ If you say Y here, attempts to bruteforce exploits against forking
59445+ daemons such as apache or sshd, as well as against suid/sgid binaries
59446+ will be deterred. When a child of a forking daemon is killed by PaX
59447+ or crashes due to an illegal instruction or other suspicious signal,
59448+ the parent process will be delayed 30 seconds upon every subsequent
59449+ fork until the administrator is able to assess the situation and
59450+ restart the daemon.
59451+ In the suid/sgid case, the attempt is logged, the user has all their
59452+ processes terminated, and they are prevented from executing any further
59453+ processes for 15 minutes.
59454+ It is recommended that you also enable signal logging in the auditing
59455+ section so that logs are generated when a process triggers a suspicious
59456+ signal.
59457+ If the sysctl option is enabled, a sysctl option with name
59458+ "deter_bruteforce" is created.
59459+
59460+config GRKERNSEC_MODHARDEN
59461+ bool "Harden module auto-loading"
59462+ depends on MODULES
59463+ help
59464+ If you say Y here, module auto-loading in response to use of some
59465+ feature implemented by an unloaded module will be restricted to
59466+ root users. Enabling this option helps defend against attacks
59467+ by unprivileged users who abuse the auto-loading behavior to
59468+ cause a vulnerable module to load that is then exploited.
59469+
59470+ If this option prevents a legitimate use of auto-loading for a
59471+ non-root user, the administrator can execute modprobe manually
59472+ with the exact name of the module mentioned in the alert log.
59473+ Alternatively, the administrator can add the module to the list
59474+ of modules loaded at boot by modifying init scripts.
59475+
59476+ Modification of init scripts will most likely be needed on
59477+ Ubuntu servers with encrypted home directory support enabled,
59478+ as the first non-root user logging in will cause the ecb(aes),
59479+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
59480+
59481+config GRKERNSEC_HIDESYM
59482+ bool "Hide kernel symbols"
59483+ help
59484+ If you say Y here, getting information on loaded modules, and
59485+ displaying all kernel symbols through a syscall will be restricted
59486+ to users with CAP_SYS_MODULE. For software compatibility reasons,
59487+ /proc/kallsyms will be restricted to the root user. The RBAC
59488+ system can hide that entry even from root.
59489+
59490+ This option also prevents leaking of kernel addresses through
59491+ several /proc entries.
59492+
59493+ Note that this option is only effective provided the following
59494+ conditions are met:
59495+ 1) The kernel using grsecurity is not precompiled by some distribution
59496+ 2) You have also enabled GRKERNSEC_DMESG
59497+ 3) You are using the RBAC system and hiding other files such as your
59498+ kernel image and System.map. Alternatively, enabling this option
59499+ causes the permissions on /boot, /lib/modules, and the kernel
59500+ source directory to change at compile time to prevent
59501+ reading by non-root users.
59502+ If the above conditions are met, this option will aid in providing a
59503+ useful protection against local kernel exploitation of overflows
59504+ and arbitrary read/write vulnerabilities.
59505+
59506+config GRKERNSEC_KERN_LOCKOUT
59507+ bool "Active kernel exploit response"
59508+ depends on X86 || ARM || PPC || SPARC
59509+ help
59510+ If you say Y here, when a PaX alert is triggered due to suspicious
59511+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
59512+ or an OOPs occurs due to bad memory accesses, instead of just
59513+ terminating the offending process (and potentially allowing
59514+ a subsequent exploit from the same user), we will take one of two
59515+ actions:
59516+ If the user was root, we will panic the system
59517+ If the user was non-root, we will log the attempt, terminate
59518+ all processes owned by the user, then prevent them from creating
59519+ any new processes until the system is restarted
59520+ This deters repeated kernel exploitation/bruteforcing attempts
59521+ and is useful for later forensics.
59522+
59523+endmenu
59524+menu "Role Based Access Control Options"
59525+depends on GRKERNSEC
59526+
59527+config GRKERNSEC_RBAC_DEBUG
59528+ bool
59529+
59530+config GRKERNSEC_NO_RBAC
59531+ bool "Disable RBAC system"
59532+ help
59533+ If you say Y here, the /dev/grsec device will be removed from the kernel,
59534+ preventing the RBAC system from being enabled. You should only say Y
59535+ here if you have no intention of using the RBAC system, so as to prevent
59536+ an attacker with root access from misusing the RBAC system to hide files
59537+ and processes when loadable module support and /dev/[k]mem have been
59538+ locked down.
59539+
59540+config GRKERNSEC_ACL_HIDEKERN
59541+ bool "Hide kernel processes"
59542+ help
59543+ If you say Y here, all kernel threads will be hidden to all
59544+ processes but those whose subject has the "view hidden processes"
59545+ flag.
59546+
59547+config GRKERNSEC_ACL_MAXTRIES
59548+ int "Maximum tries before password lockout"
59549+ default 3
59550+ help
59551+ This option enforces the maximum number of times a user can attempt
59552+ to authorize themselves with the grsecurity RBAC system before being
59553+ denied the ability to attempt authorization again for a specified time.
59554+ The lower the number, the harder it will be to brute-force a password.
59555+
59556+config GRKERNSEC_ACL_TIMEOUT
59557+ int "Time to wait after max password tries, in seconds"
59558+ default 30
59559+ help
59560+ This option specifies the time the user must wait after attempting to
59561+ authorize to the RBAC system with the maximum number of invalid
59562+ passwords. The higher the number, the harder it will be to brute-force
59563+ a password.
59564+
59565+endmenu
59566+menu "Filesystem Protections"
59567+depends on GRKERNSEC
59568+
59569+config GRKERNSEC_PROC
59570+ bool "Proc restrictions"
59571+ help
59572+ If you say Y here, the permissions of the /proc filesystem
59573+ will be altered to enhance system security and privacy. You MUST
59574+ choose either a user only restriction or a user and group restriction.
59575+ Depending upon the option you choose, you can either restrict users to
59576+ see only the processes they themselves run, or choose a group that can
59577+ view all processes and files normally restricted to root if you choose
59578+ the "restrict to user only" option. NOTE: If you're running identd as
59579+ a non-root user, you will have to run it as the group you specify here.
59580+
59581+config GRKERNSEC_PROC_USER
59582+ bool "Restrict /proc to user only"
59583+ depends on GRKERNSEC_PROC
59584+ help
59585+ If you say Y here, non-root users will only be able to view their own
59586+ processes, and restricts them from viewing network-related information,
59587+ and viewing kernel symbol and module information.
59588+
59589+config GRKERNSEC_PROC_USERGROUP
59590+ bool "Allow special group"
59591+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
59592+ help
59593+ If you say Y here, you will be able to select a group that will be
59594+ able to view all processes and network-related information. If you've
59595+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
59596+ remain hidden. This option is useful if you want to run identd as
59597+ a non-root user.
59598+
59599+config GRKERNSEC_PROC_GID
59600+ int "GID for special group"
59601+ depends on GRKERNSEC_PROC_USERGROUP
59602+ default 1001
59603+
59604+config GRKERNSEC_PROC_ADD
59605+ bool "Additional restrictions"
59606+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
59607+ help
59608+ If you say Y here, additional restrictions will be placed on
59609+ /proc that keep normal users from viewing device information and
59610+ slabinfo information that could be useful for exploits.
59611+
59612+config GRKERNSEC_LINK
59613+ bool "Linking restrictions"
59614+ help
59615+ If you say Y here, /tmp race exploits will be prevented, since users
59616+ will no longer be able to follow symlinks owned by other users in
59617+ world-writable +t directories (e.g. /tmp), unless the owner of the
59618+ symlink is the owner of the directory. users will also not be
59619+ able to hardlink to files they do not own. If the sysctl option is
59620+ enabled, a sysctl option with name "linking_restrictions" is created.
59621+
59622+config GRKERNSEC_FIFO
59623+ bool "FIFO restrictions"
59624+ help
59625+ If you say Y here, users will not be able to write to FIFOs they don't
59626+ own in world-writable +t directories (e.g. /tmp), unless the owner of
59627+ the FIFO is the same owner of the directory it's held in. If the sysctl
59628+ option is enabled, a sysctl option with name "fifo_restrictions" is
59629+ created.
59630+
59631+config GRKERNSEC_SYSFS_RESTRICT
59632+ bool "Sysfs/debugfs restriction"
59633+ depends on SYSFS
59634+ help
59635+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
59636+ any filesystem normally mounted under it (e.g. debugfs) will only
59637+ be accessible by root. These filesystems generally provide access
59638+ to hardware and debug information that isn't appropriate for unprivileged
59639+ users of the system. Sysfs and debugfs have also become a large source
59640+ of new vulnerabilities, ranging from infoleaks to local compromise.
59641+ There has been very little oversight with an eye toward security involved
59642+ in adding new exporters of information to these filesystems, so their
59643+ use is discouraged.
59644+ This option is equivalent to a chmod 0700 of the mount paths.
59645+
59646+config GRKERNSEC_ROFS
59647+ bool "Runtime read-only mount protection"
59648+ help
59649+ If you say Y here, a sysctl option with name "romount_protect" will
59650+ be created. By setting this option to 1 at runtime, filesystems
59651+ will be protected in the following ways:
59652+ * No new writable mounts will be allowed
59653+ * Existing read-only mounts won't be able to be remounted read/write
59654+ * Write operations will be denied on all block devices
59655+ This option acts independently of grsec_lock: once it is set to 1,
59656+ it cannot be turned off. Therefore, please be mindful of the resulting
59657+ behavior if this option is enabled in an init script on a read-only
59658+ filesystem. This feature is mainly intended for secure embedded systems.
59659+
59660+config GRKERNSEC_CHROOT
59661+ bool "Chroot jail restrictions"
59662+ help
59663+ If you say Y here, you will be able to choose several options that will
59664+ make breaking out of a chrooted jail much more difficult. If you
59665+ encounter no software incompatibilities with the following options, it
59666+ is recommended that you enable each one.
59667+
59668+config GRKERNSEC_CHROOT_MOUNT
59669+ bool "Deny mounts"
59670+ depends on GRKERNSEC_CHROOT
59671+ help
59672+ If you say Y here, processes inside a chroot will not be able to
59673+ mount or remount filesystems. If the sysctl option is enabled, a
59674+ sysctl option with name "chroot_deny_mount" is created.
59675+
59676+config GRKERNSEC_CHROOT_DOUBLE
59677+ bool "Deny double-chroots"
59678+ depends on GRKERNSEC_CHROOT
59679+ help
59680+ If you say Y here, processes inside a chroot will not be able to chroot
59681+ again outside the chroot. This is a widely used method of breaking
59682+ out of a chroot jail and should not be allowed. If the sysctl
59683+ option is enabled, a sysctl option with name
59684+ "chroot_deny_chroot" is created.
59685+
59686+config GRKERNSEC_CHROOT_PIVOT
59687+ bool "Deny pivot_root in chroot"
59688+ depends on GRKERNSEC_CHROOT
59689+ help
59690+ If you say Y here, processes inside a chroot will not be able to use
59691+ a function called pivot_root() that was introduced in Linux 2.3.41. It
59692+ works similar to chroot in that it changes the root filesystem. This
59693+ function could be misused in a chrooted process to attempt to break out
59694+ of the chroot, and therefore should not be allowed. If the sysctl
59695+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
59696+ created.
59697+
59698+config GRKERNSEC_CHROOT_CHDIR
59699+ bool "Enforce chdir(\"/\") on all chroots"
59700+ depends on GRKERNSEC_CHROOT
59701+ help
59702+ If you say Y here, the current working directory of all newly-chrooted
59703+ applications will be set to the the root directory of the chroot.
59704+ The man page on chroot(2) states:
59705+ Note that this call does not change the current working
59706+ directory, so that `.' can be outside the tree rooted at
59707+ `/'. In particular, the super-user can escape from a
59708+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
59709+
59710+ It is recommended that you say Y here, since it's not known to break
59711+ any software. If the sysctl option is enabled, a sysctl option with
59712+ name "chroot_enforce_chdir" is created.
59713+
59714+config GRKERNSEC_CHROOT_CHMOD
59715+ bool "Deny (f)chmod +s"
59716+ depends on GRKERNSEC_CHROOT
59717+ help
59718+ If you say Y here, processes inside a chroot will not be able to chmod
59719+ or fchmod files to make them have suid or sgid bits. This protects
59720+ against another published method of breaking a chroot. If the sysctl
59721+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
59722+ created.
59723+
59724+config GRKERNSEC_CHROOT_FCHDIR
59725+ bool "Deny fchdir out of chroot"
59726+ depends on GRKERNSEC_CHROOT
59727+ help
59728+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
59729+ to a file descriptor of the chrooting process that points to a directory
59730+ outside the filesystem will be stopped. If the sysctl option
59731+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
59732+
59733+config GRKERNSEC_CHROOT_MKNOD
59734+ bool "Deny mknod"
59735+ depends on GRKERNSEC_CHROOT
59736+ help
59737+ If you say Y here, processes inside a chroot will not be allowed to
59738+ mknod. The problem with using mknod inside a chroot is that it
59739+ would allow an attacker to create a device entry that is the same
59740+ as one on the physical root of your system, which could range from
59741+ anything from the console device to a device for your harddrive (which
59742+ they could then use to wipe the drive or steal data). It is recommended
59743+ that you say Y here, unless you run into software incompatibilities.
59744+ If the sysctl option is enabled, a sysctl option with name
59745+ "chroot_deny_mknod" is created.
59746+
59747+config GRKERNSEC_CHROOT_SHMAT
59748+ bool "Deny shmat() out of chroot"
59749+ depends on GRKERNSEC_CHROOT
59750+ help
59751+ If you say Y here, processes inside a chroot will not be able to attach
59752+ to shared memory segments that were created outside of the chroot jail.
59753+ It is recommended that you say Y here. If the sysctl option is enabled,
59754+ a sysctl option with name "chroot_deny_shmat" is created.
59755+
59756+config GRKERNSEC_CHROOT_UNIX
59757+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
59758+ depends on GRKERNSEC_CHROOT
59759+ help
59760+ If you say Y here, processes inside a chroot will not be able to
59761+ connect to abstract (meaning not belonging to a filesystem) Unix
59762+ domain sockets that were bound outside of a chroot. It is recommended
59763+ that you say Y here. If the sysctl option is enabled, a sysctl option
59764+ with name "chroot_deny_unix" is created.
59765+
59766+config GRKERNSEC_CHROOT_FINDTASK
59767+ bool "Protect outside processes"
59768+ depends on GRKERNSEC_CHROOT
59769+ help
59770+ If you say Y here, processes inside a chroot will not be able to
59771+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
59772+ getsid, or view any process outside of the chroot. If the sysctl
59773+ option is enabled, a sysctl option with name "chroot_findtask" is
59774+ created.
59775+
59776+config GRKERNSEC_CHROOT_NICE
59777+ bool "Restrict priority changes"
59778+ depends on GRKERNSEC_CHROOT
59779+ help
59780+ If you say Y here, processes inside a chroot will not be able to raise
59781+ the priority of processes in the chroot, or alter the priority of
59782+ processes outside the chroot. This provides more security than simply
59783+ removing CAP_SYS_NICE from the process' capability set. If the
59784+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
59785+ is created.
59786+
59787+config GRKERNSEC_CHROOT_SYSCTL
59788+ bool "Deny sysctl writes"
59789+ depends on GRKERNSEC_CHROOT
59790+ help
59791+ If you say Y here, an attacker in a chroot will not be able to
59792+ write to sysctl entries, either by sysctl(2) or through a /proc
59793+ interface. It is strongly recommended that you say Y here. If the
59794+ sysctl option is enabled, a sysctl option with name
59795+ "chroot_deny_sysctl" is created.
59796+
59797+config GRKERNSEC_CHROOT_CAPS
59798+ bool "Capability restrictions"
59799+ depends on GRKERNSEC_CHROOT
59800+ help
59801+ If you say Y here, the capabilities on all processes within a
59802+ chroot jail will be lowered to stop module insertion, raw i/o,
59803+ system and net admin tasks, rebooting the system, modifying immutable
59804+ files, modifying IPC owned by another, and changing the system time.
59805+ This is left an option because it can break some apps. Disable this
59806+ if your chrooted apps are having problems performing those kinds of
59807+ tasks. If the sysctl option is enabled, a sysctl option with
59808+ name "chroot_caps" is created.
59809+
59810+endmenu
59811+menu "Kernel Auditing"
59812+depends on GRKERNSEC
59813+
59814+config GRKERNSEC_AUDIT_GROUP
59815+ bool "Single group for auditing"
59816+ help
59817+ If you say Y here, the exec, chdir, and (un)mount logging features
59818+ will only operate on a group you specify. This option is recommended
59819+ if you only want to watch certain users instead of having a large
59820+ amount of logs from the entire system. If the sysctl option is enabled,
59821+ a sysctl option with name "audit_group" is created.
59822+
59823+config GRKERNSEC_AUDIT_GID
59824+ int "GID for auditing"
59825+ depends on GRKERNSEC_AUDIT_GROUP
59826+ default 1007
59827+
59828+config GRKERNSEC_EXECLOG
59829+ bool "Exec logging"
59830+ help
59831+ If you say Y here, all execve() calls will be logged (since the
59832+ other exec*() calls are frontends to execve(), all execution
59833+ will be logged). Useful for shell-servers that like to keep track
59834+ of their users. If the sysctl option is enabled, a sysctl option with
59835+ name "exec_logging" is created.
59836+ WARNING: This option when enabled will produce a LOT of logs, especially
59837+ on an active system.
59838+
59839+config GRKERNSEC_RESLOG
59840+ bool "Resource logging"
59841+ help
59842+ If you say Y here, all attempts to overstep resource limits will
59843+ be logged with the resource name, the requested size, and the current
59844+ limit. It is highly recommended that you say Y here. If the sysctl
59845+ option is enabled, a sysctl option with name "resource_logging" is
59846+ created. If the RBAC system is enabled, the sysctl value is ignored.
59847+
59848+config GRKERNSEC_CHROOT_EXECLOG
59849+ bool "Log execs within chroot"
59850+ help
59851+ If you say Y here, all executions inside a chroot jail will be logged
59852+ to syslog. This can cause a large amount of logs if certain
59853+ applications (eg. djb's daemontools) are installed on the system, and
59854+ is therefore left as an option. If the sysctl option is enabled, a
59855+ sysctl option with name "chroot_execlog" is created.
59856+
59857+config GRKERNSEC_AUDIT_PTRACE
59858+ bool "Ptrace logging"
59859+ help
59860+ If you say Y here, all attempts to attach to a process via ptrace
59861+ will be logged. If the sysctl option is enabled, a sysctl option
59862+ with name "audit_ptrace" is created.
59863+
59864+config GRKERNSEC_AUDIT_CHDIR
59865+ bool "Chdir logging"
59866+ help
59867+ If you say Y here, all chdir() calls will be logged. If the sysctl
59868+ option is enabled, a sysctl option with name "audit_chdir" is created.
59869+
59870+config GRKERNSEC_AUDIT_MOUNT
59871+ bool "(Un)Mount logging"
59872+ help
59873+ If you say Y here, all mounts and unmounts will be logged. If the
59874+ sysctl option is enabled, a sysctl option with name "audit_mount" is
59875+ created.
59876+
59877+config GRKERNSEC_SIGNAL
59878+ bool "Signal logging"
59879+ help
59880+ If you say Y here, certain important signals will be logged, such as
59881+ SIGSEGV, which will as a result inform you of when a error in a program
59882+ occurred, which in some cases could mean a possible exploit attempt.
59883+ If the sysctl option is enabled, a sysctl option with name
59884+ "signal_logging" is created.
59885+
59886+config GRKERNSEC_FORKFAIL
59887+ bool "Fork failure logging"
59888+ help
59889+ If you say Y here, all failed fork() attempts will be logged.
59890+ This could suggest a fork bomb, or someone attempting to overstep
59891+ their process limit. If the sysctl option is enabled, a sysctl option
59892+ with name "forkfail_logging" is created.
59893+
59894+config GRKERNSEC_TIME
59895+ bool "Time change logging"
59896+ help
59897+ If you say Y here, any changes of the system clock will be logged.
59898+ If the sysctl option is enabled, a sysctl option with name
59899+ "timechange_logging" is created.
59900+
59901+config GRKERNSEC_PROC_IPADDR
59902+ bool "/proc/<pid>/ipaddr support"
59903+ help
59904+ If you say Y here, a new entry will be added to each /proc/<pid>
59905+ directory that contains the IP address of the person using the task.
59906+ The IP is carried across local TCP and AF_UNIX stream sockets.
59907+ This information can be useful for IDS/IPSes to perform remote response
59908+ to a local attack. The entry is readable by only the owner of the
59909+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
59910+ the RBAC system), and thus does not create privacy concerns.
59911+
59912+config GRKERNSEC_RWXMAP_LOG
59913+ bool 'Denied RWX mmap/mprotect logging'
59914+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
59915+ help
59916+ If you say Y here, calls to mmap() and mprotect() with explicit
59917+ usage of PROT_WRITE and PROT_EXEC together will be logged when
59918+ denied by the PAX_MPROTECT feature. If the sysctl option is
59919+ enabled, a sysctl option with name "rwxmap_logging" is created.
59920+
59921+config GRKERNSEC_AUDIT_TEXTREL
59922+ bool 'ELF text relocations logging (READ HELP)'
59923+ depends on PAX_MPROTECT
59924+ help
59925+ If you say Y here, text relocations will be logged with the filename
59926+ of the offending library or binary. The purpose of the feature is
59927+ to help Linux distribution developers get rid of libraries and
59928+ binaries that need text relocations which hinder the future progress
59929+ of PaX. Only Linux distribution developers should say Y here, and
59930+ never on a production machine, as this option creates an information
59931+ leak that could aid an attacker in defeating the randomization of
59932+ a single memory region. If the sysctl option is enabled, a sysctl
59933+ option with name "audit_textrel" is created.
59934+
59935+endmenu
59936+
59937+menu "Executable Protections"
59938+depends on GRKERNSEC
59939+
59940+config GRKERNSEC_DMESG
59941+ bool "Dmesg(8) restriction"
59942+ help
59943+ If you say Y here, non-root users will not be able to use dmesg(8)
59944+ to view up to the last 4kb of messages in the kernel's log buffer.
59945+ The kernel's log buffer often contains kernel addresses and other
59946+ identifying information useful to an attacker in fingerprinting a
59947+ system for a targeted exploit.
59948+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
59949+ created.
59950+
59951+config GRKERNSEC_HARDEN_PTRACE
59952+ bool "Deter ptrace-based process snooping"
59953+ help
59954+ If you say Y here, TTY sniffers and other malicious monitoring
59955+ programs implemented through ptrace will be defeated. If you
59956+ have been using the RBAC system, this option has already been
59957+ enabled for several years for all users, with the ability to make
59958+ fine-grained exceptions.
59959+
59960+ This option only affects the ability of non-root users to ptrace
59961+ processes that are not a descendent of the ptracing process.
59962+ This means that strace ./binary and gdb ./binary will still work,
59963+ but attaching to arbitrary processes will not. If the sysctl
59964+ option is enabled, a sysctl option with name "harden_ptrace" is
59965+ created.
59966+
59967+config GRKERNSEC_TPE
59968+ bool "Trusted Path Execution (TPE)"
59969+ help
59970+ If you say Y here, you will be able to choose a gid to add to the
59971+ supplementary groups of users you want to mark as "untrusted."
59972+ These users will not be able to execute any files that are not in
59973+ root-owned directories writable only by root. If the sysctl option
59974+ is enabled, a sysctl option with name "tpe" is created.
59975+
59976+config GRKERNSEC_TPE_ALL
59977+ bool "Partially restrict all non-root users"
59978+ depends on GRKERNSEC_TPE
59979+ help
59980+ If you say Y here, all non-root users will be covered under
59981+ a weaker TPE restriction. This is separate from, and in addition to,
59982+ the main TPE options that you have selected elsewhere. Thus, if a
59983+ "trusted" GID is chosen, this restriction applies to even that GID.
59984+ Under this restriction, all non-root users will only be allowed to
59985+ execute files in directories they own that are not group or
59986+ world-writable, or in directories owned by root and writable only by
59987+ root. If the sysctl option is enabled, a sysctl option with name
59988+ "tpe_restrict_all" is created.
59989+
59990+config GRKERNSEC_TPE_INVERT
59991+ bool "Invert GID option"
59992+ depends on GRKERNSEC_TPE
59993+ help
59994+ If you say Y here, the group you specify in the TPE configuration will
59995+ decide what group TPE restrictions will be *disabled* for. This
59996+ option is useful if you want TPE restrictions to be applied to most
59997+ users on the system. If the sysctl option is enabled, a sysctl option
59998+ with name "tpe_invert" is created. Unlike other sysctl options, this
59999+ entry will default to on for backward-compatibility.
60000+
60001+config GRKERNSEC_TPE_GID
60002+ int "GID for untrusted users"
60003+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
60004+ default 1005
60005+ help
60006+ Setting this GID determines what group TPE restrictions will be
60007+ *enabled* for. If the sysctl option is enabled, a sysctl option
60008+ with name "tpe_gid" is created.
60009+
60010+config GRKERNSEC_TPE_GID
60011+ int "GID for trusted users"
60012+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
60013+ default 1005
60014+ help
60015+ Setting this GID determines what group TPE restrictions will be
60016+ *disabled* for. If the sysctl option is enabled, a sysctl option
60017+ with name "tpe_gid" is created.
60018+
60019+endmenu
60020+menu "Network Protections"
60021+depends on GRKERNSEC
60022+
60023+config GRKERNSEC_RANDNET
60024+ bool "Larger entropy pools"
60025+ help
60026+ If you say Y here, the entropy pools used for many features of Linux
60027+ and grsecurity will be doubled in size. Since several grsecurity
60028+ features use additional randomness, it is recommended that you say Y
60029+ here. Saying Y here has a similar effect as modifying
60030+ /proc/sys/kernel/random/poolsize.
60031+
60032+config GRKERNSEC_BLACKHOLE
60033+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
60034+ depends on NET
60035+ help
60036+ If you say Y here, neither TCP resets nor ICMP
60037+ destination-unreachable packets will be sent in response to packets
60038+ sent to ports for which no associated listening process exists.
60039+ This feature supports both IPV4 and IPV6 and exempts the
60040+ loopback interface from blackholing. Enabling this feature
60041+ makes a host more resilient to DoS attacks and reduces network
60042+ visibility against scanners.
60043+
60044+ The blackhole feature as-implemented is equivalent to the FreeBSD
60045+ blackhole feature, as it prevents RST responses to all packets, not
60046+ just SYNs. Under most application behavior this causes no
60047+ problems, but applications (like haproxy) may not close certain
60048+ connections in a way that cleanly terminates them on the remote
60049+ end, leaving the remote host in LAST_ACK state. Because of this
60050+ side-effect and to prevent intentional LAST_ACK DoSes, this
60051+ feature also adds automatic mitigation against such attacks.
60052+ The mitigation drastically reduces the amount of time a socket
60053+ can spend in LAST_ACK state. If you're using haproxy and not
60054+ all servers it connects to have this option enabled, consider
60055+ disabling this feature on the haproxy host.
60056+
60057+ If the sysctl option is enabled, two sysctl options with names
60058+ "ip_blackhole" and "lastack_retries" will be created.
60059+ While "ip_blackhole" takes the standard zero/non-zero on/off
60060+ toggle, "lastack_retries" uses the same kinds of values as
60061+ "tcp_retries1" and "tcp_retries2". The default value of 4
60062+ prevents a socket from lasting more than 45 seconds in LAST_ACK
60063+ state.
60064+
60065+config GRKERNSEC_SOCKET
60066+ bool "Socket restrictions"
60067+ depends on NET
60068+ help
60069+ If you say Y here, you will be able to choose from several options.
60070+ If you assign a GID on your system and add it to the supplementary
60071+ groups of users you want to restrict socket access to, this patch
60072+ will perform up to three things, based on the option(s) you choose.
60073+
60074+config GRKERNSEC_SOCKET_ALL
60075+ bool "Deny any sockets to group"
60076+ depends on GRKERNSEC_SOCKET
60077+ help
60078+ If you say Y here, you will be able to choose a GID of whose users will
60079+ be unable to connect to other hosts from your machine or run server
60080+ applications from your machine. If the sysctl option is enabled, a
60081+ sysctl option with name "socket_all" is created.
60082+
60083+config GRKERNSEC_SOCKET_ALL_GID
60084+ int "GID to deny all sockets for"
60085+ depends on GRKERNSEC_SOCKET_ALL
60086+ default 1004
60087+ help
60088+ Here you can choose the GID to disable socket access for. Remember to
60089+ add the users you want socket access disabled for to the GID
60090+ specified here. If the sysctl option is enabled, a sysctl option
60091+ with name "socket_all_gid" is created.
60092+
60093+config GRKERNSEC_SOCKET_CLIENT
60094+ bool "Deny client sockets to group"
60095+ depends on GRKERNSEC_SOCKET
60096+ help
60097+ If you say Y here, you will be able to choose a GID of whose users will
60098+ be unable to connect to other hosts from your machine, but will be
60099+ able to run servers. If this option is enabled, all users in the group
60100+ you specify will have to use passive mode when initiating ftp transfers
60101+ from the shell on your machine. If the sysctl option is enabled, a
60102+ sysctl option with name "socket_client" is created.
60103+
60104+config GRKERNSEC_SOCKET_CLIENT_GID
60105+ int "GID to deny client sockets for"
60106+ depends on GRKERNSEC_SOCKET_CLIENT
60107+ default 1003
60108+ help
60109+ Here you can choose the GID to disable client socket access for.
60110+ Remember to add the users you want client socket access disabled for to
60111+ the GID specified here. If the sysctl option is enabled, a sysctl
60112+ option with name "socket_client_gid" is created.
60113+
60114+config GRKERNSEC_SOCKET_SERVER
60115+ bool "Deny server sockets to group"
60116+ depends on GRKERNSEC_SOCKET
60117+ help
60118+ If you say Y here, you will be able to choose a GID of whose users will
60119+ be unable to run server applications from your machine. If the sysctl
60120+ option is enabled, a sysctl option with name "socket_server" is created.
60121+
60122+config GRKERNSEC_SOCKET_SERVER_GID
60123+ int "GID to deny server sockets for"
60124+ depends on GRKERNSEC_SOCKET_SERVER
60125+ default 1002
60126+ help
60127+ Here you can choose the GID to disable server socket access for.
60128+ Remember to add the users you want server socket access disabled for to
60129+ the GID specified here. If the sysctl option is enabled, a sysctl
60130+ option with name "socket_server_gid" is created.
60131+
60132+endmenu
60133+menu "Sysctl support"
60134+depends on GRKERNSEC && SYSCTL
60135+
60136+config GRKERNSEC_SYSCTL
60137+ bool "Sysctl support"
60138+ help
60139+ If you say Y here, you will be able to change the options that
60140+ grsecurity runs with at bootup, without having to recompile your
60141+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
60142+ to enable (1) or disable (0) various features. All the sysctl entries
60143+ are mutable until the "grsec_lock" entry is set to a non-zero value.
60144+ All features enabled in the kernel configuration are disabled at boot
60145+ if you do not say Y to the "Turn on features by default" option.
60146+ All options should be set at startup, and the grsec_lock entry should
60147+ be set to a non-zero value after all the options are set.
60148+ *THIS IS EXTREMELY IMPORTANT*
60149+
60150+config GRKERNSEC_SYSCTL_DISTRO
60151+ bool "Extra sysctl support for distro makers (READ HELP)"
60152+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
60153+ help
60154+ If you say Y here, additional sysctl options will be created
60155+ for features that affect processes running as root. Therefore,
60156+ it is critical when using this option that the grsec_lock entry be
60157+ enabled after boot. Only distros with prebuilt kernel packages
60158+ with this option enabled that can ensure grsec_lock is enabled
60159+ after boot should use this option.
60160+ *Failure to set grsec_lock after boot makes all grsec features
60161+ this option covers useless*
60162+
60163+ Currently this option creates the following sysctl entries:
60164+ "Disable Privileged I/O": "disable_priv_io"
60165+
60166+config GRKERNSEC_SYSCTL_ON
60167+ bool "Turn on features by default"
60168+ depends on GRKERNSEC_SYSCTL
60169+ help
60170+ If you say Y here, instead of having all features enabled in the
60171+ kernel configuration disabled at boot time, the features will be
60172+ enabled at boot time. It is recommended you say Y here unless
60173+ there is some reason you would want all sysctl-tunable features to
60174+ be disabled by default. As mentioned elsewhere, it is important
60175+ to enable the grsec_lock entry once you have finished modifying
60176+ the sysctl entries.
60177+
60178+endmenu
60179+menu "Logging Options"
60180+depends on GRKERNSEC
60181+
60182+config GRKERNSEC_FLOODTIME
60183+ int "Seconds in between log messages (minimum)"
60184+ default 10
60185+ help
60186+ This option allows you to enforce the number of seconds between
60187+ grsecurity log messages. The default should be suitable for most
60188+ people, however, if you choose to change it, choose a value small enough
60189+ to allow informative logs to be produced, but large enough to
60190+ prevent flooding.
60191+
60192+config GRKERNSEC_FLOODBURST
60193+ int "Number of messages in a burst (maximum)"
60194+ default 6
60195+ help
60196+ This option allows you to choose the maximum number of messages allowed
60197+ within the flood time interval you chose in a separate option. The
60198+ default should be suitable for most people, however if you find that
60199+ many of your logs are being interpreted as flooding, you may want to
60200+ raise this value.
60201+
60202+endmenu
60203+
60204+endmenu
60205diff -urNp linux-2.6.32.46/grsecurity/Makefile linux-2.6.32.46/grsecurity/Makefile
60206--- linux-2.6.32.46/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
60207+++ linux-2.6.32.46/grsecurity/Makefile 2011-09-14 23:29:39.000000000 -0400
60208@@ -0,0 +1,35 @@
60209+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
60210+# during 2001-2009 it has been completely redesigned by Brad Spengler
60211+# into an RBAC system
60212+#
60213+# All code in this directory and various hooks inserted throughout the kernel
60214+# are copyright Brad Spengler - Open Source Security, Inc., and released
60215+# under the GPL v2 or higher
60216+
60217+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
60218+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
60219+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
60220+
60221+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
60222+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
60223+ gracl_learn.o grsec_log.o
60224+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
60225+
60226+ifdef CONFIG_NET
60227+obj-y += grsec_sock.o
60228+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
60229+endif
60230+
60231+ifndef CONFIG_GRKERNSEC
60232+obj-y += grsec_disabled.o
60233+endif
60234+
60235+ifdef CONFIG_GRKERNSEC_HIDESYM
60236+extra-y := grsec_hidesym.o
60237+$(obj)/grsec_hidesym.o:
60238+ @-chmod -f 500 /boot
60239+ @-chmod -f 500 /lib/modules
60240+ @-chmod -f 500 /lib64/modules
60241+ @-chmod -f 700 .
60242+ @echo ' grsec: protected kernel image paths'
60243+endif
60244diff -urNp linux-2.6.32.46/include/acpi/acpi_bus.h linux-2.6.32.46/include/acpi/acpi_bus.h
60245--- linux-2.6.32.46/include/acpi/acpi_bus.h 2011-03-27 14:31:47.000000000 -0400
60246+++ linux-2.6.32.46/include/acpi/acpi_bus.h 2011-08-05 20:33:55.000000000 -0400
60247@@ -107,7 +107,7 @@ struct acpi_device_ops {
60248 acpi_op_bind bind;
60249 acpi_op_unbind unbind;
60250 acpi_op_notify notify;
60251-};
60252+} __no_const;
60253
60254 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
60255
60256diff -urNp linux-2.6.32.46/include/acpi/acpi_drivers.h linux-2.6.32.46/include/acpi/acpi_drivers.h
60257--- linux-2.6.32.46/include/acpi/acpi_drivers.h 2011-03-27 14:31:47.000000000 -0400
60258+++ linux-2.6.32.46/include/acpi/acpi_drivers.h 2011-04-17 15:56:46.000000000 -0400
60259@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
60260 Dock Station
60261 -------------------------------------------------------------------------- */
60262 struct acpi_dock_ops {
60263- acpi_notify_handler handler;
60264- acpi_notify_handler uevent;
60265+ const acpi_notify_handler handler;
60266+ const acpi_notify_handler uevent;
60267 };
60268
60269 #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
60270@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle ha
60271 extern int register_dock_notifier(struct notifier_block *nb);
60272 extern void unregister_dock_notifier(struct notifier_block *nb);
60273 extern int register_hotplug_dock_device(acpi_handle handle,
60274- struct acpi_dock_ops *ops,
60275+ const struct acpi_dock_ops *ops,
60276 void *context);
60277 extern void unregister_hotplug_dock_device(acpi_handle handle);
60278 #else
60279@@ -144,7 +144,7 @@ static inline void unregister_dock_notif
60280 {
60281 }
60282 static inline int register_hotplug_dock_device(acpi_handle handle,
60283- struct acpi_dock_ops *ops,
60284+ const struct acpi_dock_ops *ops,
60285 void *context)
60286 {
60287 return -ENODEV;
60288diff -urNp linux-2.6.32.46/include/asm-generic/atomic-long.h linux-2.6.32.46/include/asm-generic/atomic-long.h
60289--- linux-2.6.32.46/include/asm-generic/atomic-long.h 2011-03-27 14:31:47.000000000 -0400
60290+++ linux-2.6.32.46/include/asm-generic/atomic-long.h 2011-07-13 22:21:25.000000000 -0400
60291@@ -22,6 +22,12 @@
60292
60293 typedef atomic64_t atomic_long_t;
60294
60295+#ifdef CONFIG_PAX_REFCOUNT
60296+typedef atomic64_unchecked_t atomic_long_unchecked_t;
60297+#else
60298+typedef atomic64_t atomic_long_unchecked_t;
60299+#endif
60300+
60301 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
60302
60303 static inline long atomic_long_read(atomic_long_t *l)
60304@@ -31,6 +37,15 @@ static inline long atomic_long_read(atom
60305 return (long)atomic64_read(v);
60306 }
60307
60308+#ifdef CONFIG_PAX_REFCOUNT
60309+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
60310+{
60311+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60312+
60313+ return (long)atomic64_read_unchecked(v);
60314+}
60315+#endif
60316+
60317 static inline void atomic_long_set(atomic_long_t *l, long i)
60318 {
60319 atomic64_t *v = (atomic64_t *)l;
60320@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomi
60321 atomic64_set(v, i);
60322 }
60323
60324+#ifdef CONFIG_PAX_REFCOUNT
60325+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
60326+{
60327+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60328+
60329+ atomic64_set_unchecked(v, i);
60330+}
60331+#endif
60332+
60333 static inline void atomic_long_inc(atomic_long_t *l)
60334 {
60335 atomic64_t *v = (atomic64_t *)l;
60336@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomi
60337 atomic64_inc(v);
60338 }
60339
60340+#ifdef CONFIG_PAX_REFCOUNT
60341+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
60342+{
60343+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60344+
60345+ atomic64_inc_unchecked(v);
60346+}
60347+#endif
60348+
60349 static inline void atomic_long_dec(atomic_long_t *l)
60350 {
60351 atomic64_t *v = (atomic64_t *)l;
60352@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomi
60353 atomic64_dec(v);
60354 }
60355
60356+#ifdef CONFIG_PAX_REFCOUNT
60357+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
60358+{
60359+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60360+
60361+ atomic64_dec_unchecked(v);
60362+}
60363+#endif
60364+
60365 static inline void atomic_long_add(long i, atomic_long_t *l)
60366 {
60367 atomic64_t *v = (atomic64_t *)l;
60368@@ -59,6 +101,15 @@ static inline void atomic_long_add(long
60369 atomic64_add(i, v);
60370 }
60371
60372+#ifdef CONFIG_PAX_REFCOUNT
60373+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
60374+{
60375+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60376+
60377+ atomic64_add_unchecked(i, v);
60378+}
60379+#endif
60380+
60381 static inline void atomic_long_sub(long i, atomic_long_t *l)
60382 {
60383 atomic64_t *v = (atomic64_t *)l;
60384@@ -115,6 +166,15 @@ static inline long atomic_long_inc_retur
60385 return (long)atomic64_inc_return(v);
60386 }
60387
60388+#ifdef CONFIG_PAX_REFCOUNT
60389+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
60390+{
60391+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60392+
60393+ return (long)atomic64_inc_return_unchecked(v);
60394+}
60395+#endif
60396+
60397 static inline long atomic_long_dec_return(atomic_long_t *l)
60398 {
60399 atomic64_t *v = (atomic64_t *)l;
60400@@ -140,6 +200,12 @@ static inline long atomic_long_add_unles
60401
60402 typedef atomic_t atomic_long_t;
60403
60404+#ifdef CONFIG_PAX_REFCOUNT
60405+typedef atomic_unchecked_t atomic_long_unchecked_t;
60406+#else
60407+typedef atomic_t atomic_long_unchecked_t;
60408+#endif
60409+
60410 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
60411 static inline long atomic_long_read(atomic_long_t *l)
60412 {
60413@@ -148,6 +214,15 @@ static inline long atomic_long_read(atom
60414 return (long)atomic_read(v);
60415 }
60416
60417+#ifdef CONFIG_PAX_REFCOUNT
60418+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
60419+{
60420+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60421+
60422+ return (long)atomic_read_unchecked(v);
60423+}
60424+#endif
60425+
60426 static inline void atomic_long_set(atomic_long_t *l, long i)
60427 {
60428 atomic_t *v = (atomic_t *)l;
60429@@ -155,6 +230,15 @@ static inline void atomic_long_set(atomi
60430 atomic_set(v, i);
60431 }
60432
60433+#ifdef CONFIG_PAX_REFCOUNT
60434+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
60435+{
60436+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60437+
60438+ atomic_set_unchecked(v, i);
60439+}
60440+#endif
60441+
60442 static inline void atomic_long_inc(atomic_long_t *l)
60443 {
60444 atomic_t *v = (atomic_t *)l;
60445@@ -162,6 +246,15 @@ static inline void atomic_long_inc(atomi
60446 atomic_inc(v);
60447 }
60448
60449+#ifdef CONFIG_PAX_REFCOUNT
60450+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
60451+{
60452+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60453+
60454+ atomic_inc_unchecked(v);
60455+}
60456+#endif
60457+
60458 static inline void atomic_long_dec(atomic_long_t *l)
60459 {
60460 atomic_t *v = (atomic_t *)l;
60461@@ -169,6 +262,15 @@ static inline void atomic_long_dec(atomi
60462 atomic_dec(v);
60463 }
60464
60465+#ifdef CONFIG_PAX_REFCOUNT
60466+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
60467+{
60468+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60469+
60470+ atomic_dec_unchecked(v);
60471+}
60472+#endif
60473+
60474 static inline void atomic_long_add(long i, atomic_long_t *l)
60475 {
60476 atomic_t *v = (atomic_t *)l;
60477@@ -176,6 +278,15 @@ static inline void atomic_long_add(long
60478 atomic_add(i, v);
60479 }
60480
60481+#ifdef CONFIG_PAX_REFCOUNT
60482+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
60483+{
60484+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60485+
60486+ atomic_add_unchecked(i, v);
60487+}
60488+#endif
60489+
60490 static inline void atomic_long_sub(long i, atomic_long_t *l)
60491 {
60492 atomic_t *v = (atomic_t *)l;
60493@@ -232,6 +343,15 @@ static inline long atomic_long_inc_retur
60494 return (long)atomic_inc_return(v);
60495 }
60496
60497+#ifdef CONFIG_PAX_REFCOUNT
60498+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
60499+{
60500+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60501+
60502+ return (long)atomic_inc_return_unchecked(v);
60503+}
60504+#endif
60505+
60506 static inline long atomic_long_dec_return(atomic_long_t *l)
60507 {
60508 atomic_t *v = (atomic_t *)l;
60509@@ -255,4 +375,47 @@ static inline long atomic_long_add_unles
60510
60511 #endif /* BITS_PER_LONG == 64 */
60512
60513+#ifdef CONFIG_PAX_REFCOUNT
60514+static inline void pax_refcount_needs_these_functions(void)
60515+{
60516+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
60517+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
60518+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
60519+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
60520+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
60521+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
60522+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
60523+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
60524+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
60525+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
60526+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
60527+
60528+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
60529+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
60530+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
60531+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
60532+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
60533+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
60534+}
60535+#else
60536+#define atomic_read_unchecked(v) atomic_read(v)
60537+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
60538+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
60539+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
60540+#define atomic_inc_unchecked(v) atomic_inc(v)
60541+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
60542+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
60543+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
60544+#define atomic_dec_unchecked(v) atomic_dec(v)
60545+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
60546+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
60547+
60548+#define atomic_long_read_unchecked(v) atomic_long_read(v)
60549+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
60550+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
60551+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
60552+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
60553+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
60554+#endif
60555+
60556 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
60557diff -urNp linux-2.6.32.46/include/asm-generic/bug.h linux-2.6.32.46/include/asm-generic/bug.h
60558--- linux-2.6.32.46/include/asm-generic/bug.h 2011-07-13 17:23:04.000000000 -0400
60559+++ linux-2.6.32.46/include/asm-generic/bug.h 2011-08-21 17:56:07.000000000 -0400
60560@@ -105,11 +105,11 @@ extern void warn_slowpath_null(const cha
60561
60562 #else /* !CONFIG_BUG */
60563 #ifndef HAVE_ARCH_BUG
60564-#define BUG() do {} while(0)
60565+#define BUG() do { for (;;) ; } while(0)
60566 #endif
60567
60568 #ifndef HAVE_ARCH_BUG_ON
60569-#define BUG_ON(condition) do { if (condition) ; } while(0)
60570+#define BUG_ON(condition) do { if (condition) for (;;) ; } while(0)
60571 #endif
60572
60573 #ifndef HAVE_ARCH_WARN_ON
60574diff -urNp linux-2.6.32.46/include/asm-generic/cache.h linux-2.6.32.46/include/asm-generic/cache.h
60575--- linux-2.6.32.46/include/asm-generic/cache.h 2011-03-27 14:31:47.000000000 -0400
60576+++ linux-2.6.32.46/include/asm-generic/cache.h 2011-07-06 19:53:33.000000000 -0400
60577@@ -6,7 +6,7 @@
60578 * cache lines need to provide their own cache.h.
60579 */
60580
60581-#define L1_CACHE_SHIFT 5
60582-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
60583+#define L1_CACHE_SHIFT 5UL
60584+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
60585
60586 #endif /* __ASM_GENERIC_CACHE_H */
60587diff -urNp linux-2.6.32.46/include/asm-generic/dma-mapping-common.h linux-2.6.32.46/include/asm-generic/dma-mapping-common.h
60588--- linux-2.6.32.46/include/asm-generic/dma-mapping-common.h 2011-03-27 14:31:47.000000000 -0400
60589+++ linux-2.6.32.46/include/asm-generic/dma-mapping-common.h 2011-04-17 15:56:46.000000000 -0400
60590@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
60591 enum dma_data_direction dir,
60592 struct dma_attrs *attrs)
60593 {
60594- struct dma_map_ops *ops = get_dma_ops(dev);
60595+ const struct dma_map_ops *ops = get_dma_ops(dev);
60596 dma_addr_t addr;
60597
60598 kmemcheck_mark_initialized(ptr, size);
60599@@ -30,7 +30,7 @@ static inline void dma_unmap_single_attr
60600 enum dma_data_direction dir,
60601 struct dma_attrs *attrs)
60602 {
60603- struct dma_map_ops *ops = get_dma_ops(dev);
60604+ const struct dma_map_ops *ops = get_dma_ops(dev);
60605
60606 BUG_ON(!valid_dma_direction(dir));
60607 if (ops->unmap_page)
60608@@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struc
60609 int nents, enum dma_data_direction dir,
60610 struct dma_attrs *attrs)
60611 {
60612- struct dma_map_ops *ops = get_dma_ops(dev);
60613+ const struct dma_map_ops *ops = get_dma_ops(dev);
60614 int i, ents;
60615 struct scatterlist *s;
60616
60617@@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(st
60618 int nents, enum dma_data_direction dir,
60619 struct dma_attrs *attrs)
60620 {
60621- struct dma_map_ops *ops = get_dma_ops(dev);
60622+ const struct dma_map_ops *ops = get_dma_ops(dev);
60623
60624 BUG_ON(!valid_dma_direction(dir));
60625 debug_dma_unmap_sg(dev, sg, nents, dir);
60626@@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(st
60627 size_t offset, size_t size,
60628 enum dma_data_direction dir)
60629 {
60630- struct dma_map_ops *ops = get_dma_ops(dev);
60631+ const struct dma_map_ops *ops = get_dma_ops(dev);
60632 dma_addr_t addr;
60633
60634 kmemcheck_mark_initialized(page_address(page) + offset, size);
60635@@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(st
60636 static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
60637 size_t size, enum dma_data_direction dir)
60638 {
60639- struct dma_map_ops *ops = get_dma_ops(dev);
60640+ const struct dma_map_ops *ops = get_dma_ops(dev);
60641
60642 BUG_ON(!valid_dma_direction(dir));
60643 if (ops->unmap_page)
60644@@ -97,7 +97,7 @@ static inline void dma_sync_single_for_c
60645 size_t size,
60646 enum dma_data_direction dir)
60647 {
60648- struct dma_map_ops *ops = get_dma_ops(dev);
60649+ const struct dma_map_ops *ops = get_dma_ops(dev);
60650
60651 BUG_ON(!valid_dma_direction(dir));
60652 if (ops->sync_single_for_cpu)
60653@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_d
60654 dma_addr_t addr, size_t size,
60655 enum dma_data_direction dir)
60656 {
60657- struct dma_map_ops *ops = get_dma_ops(dev);
60658+ const struct dma_map_ops *ops = get_dma_ops(dev);
60659
60660 BUG_ON(!valid_dma_direction(dir));
60661 if (ops->sync_single_for_device)
60662@@ -123,7 +123,7 @@ static inline void dma_sync_single_range
60663 size_t size,
60664 enum dma_data_direction dir)
60665 {
60666- struct dma_map_ops *ops = get_dma_ops(dev);
60667+ const struct dma_map_ops *ops = get_dma_ops(dev);
60668
60669 BUG_ON(!valid_dma_direction(dir));
60670 if (ops->sync_single_range_for_cpu) {
60671@@ -140,7 +140,7 @@ static inline void dma_sync_single_range
60672 size_t size,
60673 enum dma_data_direction dir)
60674 {
60675- struct dma_map_ops *ops = get_dma_ops(dev);
60676+ const struct dma_map_ops *ops = get_dma_ops(dev);
60677
60678 BUG_ON(!valid_dma_direction(dir));
60679 if (ops->sync_single_range_for_device) {
60680@@ -155,7 +155,7 @@ static inline void
60681 dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
60682 int nelems, enum dma_data_direction dir)
60683 {
60684- struct dma_map_ops *ops = get_dma_ops(dev);
60685+ const struct dma_map_ops *ops = get_dma_ops(dev);
60686
60687 BUG_ON(!valid_dma_direction(dir));
60688 if (ops->sync_sg_for_cpu)
60689@@ -167,7 +167,7 @@ static inline void
60690 dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
60691 int nelems, enum dma_data_direction dir)
60692 {
60693- struct dma_map_ops *ops = get_dma_ops(dev);
60694+ const struct dma_map_ops *ops = get_dma_ops(dev);
60695
60696 BUG_ON(!valid_dma_direction(dir));
60697 if (ops->sync_sg_for_device)
60698diff -urNp linux-2.6.32.46/include/asm-generic/emergency-restart.h linux-2.6.32.46/include/asm-generic/emergency-restart.h
60699--- linux-2.6.32.46/include/asm-generic/emergency-restart.h 2011-03-27 14:31:47.000000000 -0400
60700+++ linux-2.6.32.46/include/asm-generic/emergency-restart.h 2011-08-21 19:17:17.000000000 -0400
60701@@ -1,7 +1,7 @@
60702 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
60703 #define _ASM_GENERIC_EMERGENCY_RESTART_H
60704
60705-static inline void machine_emergency_restart(void)
60706+static inline __noreturn void machine_emergency_restart(void)
60707 {
60708 machine_restart(NULL);
60709 }
60710diff -urNp linux-2.6.32.46/include/asm-generic/futex.h linux-2.6.32.46/include/asm-generic/futex.h
60711--- linux-2.6.32.46/include/asm-generic/futex.h 2011-03-27 14:31:47.000000000 -0400
60712+++ linux-2.6.32.46/include/asm-generic/futex.h 2011-04-17 15:56:46.000000000 -0400
60713@@ -6,7 +6,7 @@
60714 #include <asm/errno.h>
60715
60716 static inline int
60717-futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
60718+futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
60719 {
60720 int op = (encoded_op >> 28) & 7;
60721 int cmp = (encoded_op >> 24) & 15;
60722@@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op,
60723 }
60724
60725 static inline int
60726-futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
60727+futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval, int newval)
60728 {
60729 return -ENOSYS;
60730 }
60731diff -urNp linux-2.6.32.46/include/asm-generic/int-l64.h linux-2.6.32.46/include/asm-generic/int-l64.h
60732--- linux-2.6.32.46/include/asm-generic/int-l64.h 2011-03-27 14:31:47.000000000 -0400
60733+++ linux-2.6.32.46/include/asm-generic/int-l64.h 2011-04-17 15:56:46.000000000 -0400
60734@@ -46,6 +46,8 @@ typedef unsigned int u32;
60735 typedef signed long s64;
60736 typedef unsigned long u64;
60737
60738+typedef unsigned int intoverflow_t __attribute__ ((mode(TI)));
60739+
60740 #define S8_C(x) x
60741 #define U8_C(x) x ## U
60742 #define S16_C(x) x
60743diff -urNp linux-2.6.32.46/include/asm-generic/int-ll64.h linux-2.6.32.46/include/asm-generic/int-ll64.h
60744--- linux-2.6.32.46/include/asm-generic/int-ll64.h 2011-03-27 14:31:47.000000000 -0400
60745+++ linux-2.6.32.46/include/asm-generic/int-ll64.h 2011-04-17 15:56:46.000000000 -0400
60746@@ -51,6 +51,8 @@ typedef unsigned int u32;
60747 typedef signed long long s64;
60748 typedef unsigned long long u64;
60749
60750+typedef unsigned long long intoverflow_t;
60751+
60752 #define S8_C(x) x
60753 #define U8_C(x) x ## U
60754 #define S16_C(x) x
60755diff -urNp linux-2.6.32.46/include/asm-generic/kmap_types.h linux-2.6.32.46/include/asm-generic/kmap_types.h
60756--- linux-2.6.32.46/include/asm-generic/kmap_types.h 2011-03-27 14:31:47.000000000 -0400
60757+++ linux-2.6.32.46/include/asm-generic/kmap_types.h 2011-04-17 15:56:46.000000000 -0400
60758@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
60759 KMAP_D(16) KM_IRQ_PTE,
60760 KMAP_D(17) KM_NMI,
60761 KMAP_D(18) KM_NMI_PTE,
60762-KMAP_D(19) KM_TYPE_NR
60763+KMAP_D(19) KM_CLEARPAGE,
60764+KMAP_D(20) KM_TYPE_NR
60765 };
60766
60767 #undef KMAP_D
60768diff -urNp linux-2.6.32.46/include/asm-generic/pgtable.h linux-2.6.32.46/include/asm-generic/pgtable.h
60769--- linux-2.6.32.46/include/asm-generic/pgtable.h 2011-03-27 14:31:47.000000000 -0400
60770+++ linux-2.6.32.46/include/asm-generic/pgtable.h 2011-04-17 15:56:46.000000000 -0400
60771@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
60772 unsigned long size);
60773 #endif
60774
60775+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
60776+static inline unsigned long pax_open_kernel(void) { return 0; }
60777+#endif
60778+
60779+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
60780+static inline unsigned long pax_close_kernel(void) { return 0; }
60781+#endif
60782+
60783 #endif /* !__ASSEMBLY__ */
60784
60785 #endif /* _ASM_GENERIC_PGTABLE_H */
60786diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h
60787--- linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h 2011-03-27 14:31:47.000000000 -0400
60788+++ linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:56:46.000000000 -0400
60789@@ -1,14 +1,19 @@
60790 #ifndef _PGTABLE_NOPMD_H
60791 #define _PGTABLE_NOPMD_H
60792
60793-#ifndef __ASSEMBLY__
60794-
60795 #include <asm-generic/pgtable-nopud.h>
60796
60797-struct mm_struct;
60798-
60799 #define __PAGETABLE_PMD_FOLDED
60800
60801+#define PMD_SHIFT PUD_SHIFT
60802+#define PTRS_PER_PMD 1
60803+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
60804+#define PMD_MASK (~(PMD_SIZE-1))
60805+
60806+#ifndef __ASSEMBLY__
60807+
60808+struct mm_struct;
60809+
60810 /*
60811 * Having the pmd type consist of a pud gets the size right, and allows
60812 * us to conceptually access the pud entry that this pmd is folded into
60813@@ -16,11 +21,6 @@ struct mm_struct;
60814 */
60815 typedef struct { pud_t pud; } pmd_t;
60816
60817-#define PMD_SHIFT PUD_SHIFT
60818-#define PTRS_PER_PMD 1
60819-#define PMD_SIZE (1UL << PMD_SHIFT)
60820-#define PMD_MASK (~(PMD_SIZE-1))
60821-
60822 /*
60823 * The "pud_xxx()" functions here are trivial for a folded two-level
60824 * setup: the pmd is never bad, and a pmd always exists (as it's folded
60825diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopud.h linux-2.6.32.46/include/asm-generic/pgtable-nopud.h
60826--- linux-2.6.32.46/include/asm-generic/pgtable-nopud.h 2011-03-27 14:31:47.000000000 -0400
60827+++ linux-2.6.32.46/include/asm-generic/pgtable-nopud.h 2011-04-17 15:56:46.000000000 -0400
60828@@ -1,10 +1,15 @@
60829 #ifndef _PGTABLE_NOPUD_H
60830 #define _PGTABLE_NOPUD_H
60831
60832-#ifndef __ASSEMBLY__
60833-
60834 #define __PAGETABLE_PUD_FOLDED
60835
60836+#define PUD_SHIFT PGDIR_SHIFT
60837+#define PTRS_PER_PUD 1
60838+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
60839+#define PUD_MASK (~(PUD_SIZE-1))
60840+
60841+#ifndef __ASSEMBLY__
60842+
60843 /*
60844 * Having the pud type consist of a pgd gets the size right, and allows
60845 * us to conceptually access the pgd entry that this pud is folded into
60846@@ -12,11 +17,6 @@
60847 */
60848 typedef struct { pgd_t pgd; } pud_t;
60849
60850-#define PUD_SHIFT PGDIR_SHIFT
60851-#define PTRS_PER_PUD 1
60852-#define PUD_SIZE (1UL << PUD_SHIFT)
60853-#define PUD_MASK (~(PUD_SIZE-1))
60854-
60855 /*
60856 * The "pgd_xxx()" functions here are trivial for a folded two-level
60857 * setup: the pud is never bad, and a pud always exists (as it's folded
60858diff -urNp linux-2.6.32.46/include/asm-generic/vmlinux.lds.h linux-2.6.32.46/include/asm-generic/vmlinux.lds.h
60859--- linux-2.6.32.46/include/asm-generic/vmlinux.lds.h 2011-03-27 14:31:47.000000000 -0400
60860+++ linux-2.6.32.46/include/asm-generic/vmlinux.lds.h 2011-04-17 15:56:46.000000000 -0400
60861@@ -199,6 +199,7 @@
60862 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
60863 VMLINUX_SYMBOL(__start_rodata) = .; \
60864 *(.rodata) *(.rodata.*) \
60865+ *(.data.read_only) \
60866 *(__vermagic) /* Kernel version magic */ \
60867 *(__markers_strings) /* Markers: strings */ \
60868 *(__tracepoints_strings)/* Tracepoints: strings */ \
60869@@ -656,22 +657,24 @@
60870 * section in the linker script will go there too. @phdr should have
60871 * a leading colon.
60872 *
60873- * Note that this macros defines __per_cpu_load as an absolute symbol.
60874+ * Note that this macros defines per_cpu_load as an absolute symbol.
60875 * If there is no need to put the percpu section at a predetermined
60876 * address, use PERCPU().
60877 */
60878 #define PERCPU_VADDR(vaddr, phdr) \
60879- VMLINUX_SYMBOL(__per_cpu_load) = .; \
60880- .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
60881+ per_cpu_load = .; \
60882+ .data.percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
60883 - LOAD_OFFSET) { \
60884+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
60885 VMLINUX_SYMBOL(__per_cpu_start) = .; \
60886 *(.data.percpu.first) \
60887- *(.data.percpu.page_aligned) \
60888 *(.data.percpu) \
60889+ . = ALIGN(PAGE_SIZE); \
60890+ *(.data.percpu.page_aligned) \
60891 *(.data.percpu.shared_aligned) \
60892 VMLINUX_SYMBOL(__per_cpu_end) = .; \
60893 } phdr \
60894- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu);
60895+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data.percpu);
60896
60897 /**
60898 * PERCPU - define output section for percpu area, simple version
60899diff -urNp linux-2.6.32.46/include/drm/drm_crtc_helper.h linux-2.6.32.46/include/drm/drm_crtc_helper.h
60900--- linux-2.6.32.46/include/drm/drm_crtc_helper.h 2011-03-27 14:31:47.000000000 -0400
60901+++ linux-2.6.32.46/include/drm/drm_crtc_helper.h 2011-08-05 20:33:55.000000000 -0400
60902@@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs {
60903
60904 /* reload the current crtc LUT */
60905 void (*load_lut)(struct drm_crtc *crtc);
60906-};
60907+} __no_const;
60908
60909 struct drm_encoder_helper_funcs {
60910 void (*dpms)(struct drm_encoder *encoder, int mode);
60911@@ -85,7 +85,7 @@ struct drm_encoder_helper_funcs {
60912 struct drm_connector *connector);
60913 /* disable encoder when not in use - more explicit than dpms off */
60914 void (*disable)(struct drm_encoder *encoder);
60915-};
60916+} __no_const;
60917
60918 struct drm_connector_helper_funcs {
60919 int (*get_modes)(struct drm_connector *connector);
60920diff -urNp linux-2.6.32.46/include/drm/drmP.h linux-2.6.32.46/include/drm/drmP.h
60921--- linux-2.6.32.46/include/drm/drmP.h 2011-03-27 14:31:47.000000000 -0400
60922+++ linux-2.6.32.46/include/drm/drmP.h 2011-04-17 15:56:46.000000000 -0400
60923@@ -71,6 +71,7 @@
60924 #include <linux/workqueue.h>
60925 #include <linux/poll.h>
60926 #include <asm/pgalloc.h>
60927+#include <asm/local.h>
60928 #include "drm.h"
60929
60930 #include <linux/idr.h>
60931@@ -814,7 +815,7 @@ struct drm_driver {
60932 void (*vgaarb_irq)(struct drm_device *dev, bool state);
60933
60934 /* Driver private ops for this object */
60935- struct vm_operations_struct *gem_vm_ops;
60936+ const struct vm_operations_struct *gem_vm_ops;
60937
60938 int major;
60939 int minor;
60940@@ -917,7 +918,7 @@ struct drm_device {
60941
60942 /** \name Usage Counters */
60943 /*@{ */
60944- int open_count; /**< Outstanding files open */
60945+ local_t open_count; /**< Outstanding files open */
60946 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
60947 atomic_t vma_count; /**< Outstanding vma areas open */
60948 int buf_use; /**< Buffers in use -- cannot alloc */
60949@@ -928,7 +929,7 @@ struct drm_device {
60950 /*@{ */
60951 unsigned long counters;
60952 enum drm_stat_type types[15];
60953- atomic_t counts[15];
60954+ atomic_unchecked_t counts[15];
60955 /*@} */
60956
60957 struct list_head filelist;
60958@@ -1016,7 +1017,7 @@ struct drm_device {
60959 struct pci_controller *hose;
60960 #endif
60961 struct drm_sg_mem *sg; /**< Scatter gather memory */
60962- unsigned int num_crtcs; /**< Number of CRTCs on this device */
60963+ unsigned int num_crtcs; /**< Number of CRTCs on this device */
60964 void *dev_private; /**< device private data */
60965 void *mm_private;
60966 struct address_space *dev_mapping;
60967@@ -1042,11 +1043,11 @@ struct drm_device {
60968 spinlock_t object_name_lock;
60969 struct idr object_name_idr;
60970 atomic_t object_count;
60971- atomic_t object_memory;
60972+ atomic_unchecked_t object_memory;
60973 atomic_t pin_count;
60974- atomic_t pin_memory;
60975+ atomic_unchecked_t pin_memory;
60976 atomic_t gtt_count;
60977- atomic_t gtt_memory;
60978+ atomic_unchecked_t gtt_memory;
60979 uint32_t gtt_total;
60980 uint32_t invalidate_domains; /* domains pending invalidation */
60981 uint32_t flush_domains; /* domains pending flush */
60982diff -urNp linux-2.6.32.46/include/drm/ttm/ttm_memory.h linux-2.6.32.46/include/drm/ttm/ttm_memory.h
60983--- linux-2.6.32.46/include/drm/ttm/ttm_memory.h 2011-03-27 14:31:47.000000000 -0400
60984+++ linux-2.6.32.46/include/drm/ttm/ttm_memory.h 2011-08-05 20:33:55.000000000 -0400
60985@@ -47,7 +47,7 @@
60986
60987 struct ttm_mem_shrink {
60988 int (*do_shrink) (struct ttm_mem_shrink *);
60989-};
60990+} __no_const;
60991
60992 /**
60993 * struct ttm_mem_global - Global memory accounting structure.
60994diff -urNp linux-2.6.32.46/include/linux/a.out.h linux-2.6.32.46/include/linux/a.out.h
60995--- linux-2.6.32.46/include/linux/a.out.h 2011-03-27 14:31:47.000000000 -0400
60996+++ linux-2.6.32.46/include/linux/a.out.h 2011-04-17 15:56:46.000000000 -0400
60997@@ -39,6 +39,14 @@ enum machine_type {
60998 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
60999 };
61000
61001+/* Constants for the N_FLAGS field */
61002+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
61003+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
61004+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
61005+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
61006+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
61007+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
61008+
61009 #if !defined (N_MAGIC)
61010 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
61011 #endif
61012diff -urNp linux-2.6.32.46/include/linux/atmdev.h linux-2.6.32.46/include/linux/atmdev.h
61013--- linux-2.6.32.46/include/linux/atmdev.h 2011-03-27 14:31:47.000000000 -0400
61014+++ linux-2.6.32.46/include/linux/atmdev.h 2011-04-17 15:56:46.000000000 -0400
61015@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
61016 #endif
61017
61018 struct k_atm_aal_stats {
61019-#define __HANDLE_ITEM(i) atomic_t i
61020+#define __HANDLE_ITEM(i) atomic_unchecked_t i
61021 __AAL_STAT_ITEMS
61022 #undef __HANDLE_ITEM
61023 };
61024diff -urNp linux-2.6.32.46/include/linux/backlight.h linux-2.6.32.46/include/linux/backlight.h
61025--- linux-2.6.32.46/include/linux/backlight.h 2011-03-27 14:31:47.000000000 -0400
61026+++ linux-2.6.32.46/include/linux/backlight.h 2011-04-17 15:56:46.000000000 -0400
61027@@ -36,18 +36,18 @@ struct backlight_device;
61028 struct fb_info;
61029
61030 struct backlight_ops {
61031- unsigned int options;
61032+ const unsigned int options;
61033
61034 #define BL_CORE_SUSPENDRESUME (1 << 0)
61035
61036 /* Notify the backlight driver some property has changed */
61037- int (*update_status)(struct backlight_device *);
61038+ int (* const update_status)(struct backlight_device *);
61039 /* Return the current backlight brightness (accounting for power,
61040 fb_blank etc.) */
61041- int (*get_brightness)(struct backlight_device *);
61042+ int (* const get_brightness)(struct backlight_device *);
61043 /* Check if given framebuffer device is the one bound to this backlight;
61044 return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */
61045- int (*check_fb)(struct fb_info *);
61046+ int (* const check_fb)(struct fb_info *);
61047 };
61048
61049 /* This structure defines all the properties of a backlight */
61050@@ -86,7 +86,7 @@ struct backlight_device {
61051 registered this device has been unloaded, and if class_get_devdata()
61052 points to something in the body of that driver, it is also invalid. */
61053 struct mutex ops_lock;
61054- struct backlight_ops *ops;
61055+ const struct backlight_ops *ops;
61056
61057 /* The framebuffer notifier block */
61058 struct notifier_block fb_notif;
61059@@ -103,7 +103,7 @@ static inline void backlight_update_stat
61060 }
61061
61062 extern struct backlight_device *backlight_device_register(const char *name,
61063- struct device *dev, void *devdata, struct backlight_ops *ops);
61064+ struct device *dev, void *devdata, const struct backlight_ops *ops);
61065 extern void backlight_device_unregister(struct backlight_device *bd);
61066 extern void backlight_force_update(struct backlight_device *bd,
61067 enum backlight_update_reason reason);
61068diff -urNp linux-2.6.32.46/include/linux/binfmts.h linux-2.6.32.46/include/linux/binfmts.h
61069--- linux-2.6.32.46/include/linux/binfmts.h 2011-04-17 17:00:52.000000000 -0400
61070+++ linux-2.6.32.46/include/linux/binfmts.h 2011-04-17 15:56:46.000000000 -0400
61071@@ -83,6 +83,7 @@ struct linux_binfmt {
61072 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
61073 int (*load_shlib)(struct file *);
61074 int (*core_dump)(long signr, struct pt_regs *regs, struct file *file, unsigned long limit);
61075+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
61076 unsigned long min_coredump; /* minimal dump size */
61077 int hasvdso;
61078 };
61079diff -urNp linux-2.6.32.46/include/linux/blkdev.h linux-2.6.32.46/include/linux/blkdev.h
61080--- linux-2.6.32.46/include/linux/blkdev.h 2011-03-27 14:31:47.000000000 -0400
61081+++ linux-2.6.32.46/include/linux/blkdev.h 2011-08-26 20:27:21.000000000 -0400
61082@@ -1278,7 +1278,7 @@ struct block_device_operations {
61083 int (*revalidate_disk) (struct gendisk *);
61084 int (*getgeo)(struct block_device *, struct hd_geometry *);
61085 struct module *owner;
61086-};
61087+} __do_const;
61088
61089 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
61090 unsigned long);
61091diff -urNp linux-2.6.32.46/include/linux/blktrace_api.h linux-2.6.32.46/include/linux/blktrace_api.h
61092--- linux-2.6.32.46/include/linux/blktrace_api.h 2011-03-27 14:31:47.000000000 -0400
61093+++ linux-2.6.32.46/include/linux/blktrace_api.h 2011-05-04 17:56:28.000000000 -0400
61094@@ -160,7 +160,7 @@ struct blk_trace {
61095 struct dentry *dir;
61096 struct dentry *dropped_file;
61097 struct dentry *msg_file;
61098- atomic_t dropped;
61099+ atomic_unchecked_t dropped;
61100 };
61101
61102 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
61103diff -urNp linux-2.6.32.46/include/linux/byteorder/little_endian.h linux-2.6.32.46/include/linux/byteorder/little_endian.h
61104--- linux-2.6.32.46/include/linux/byteorder/little_endian.h 2011-03-27 14:31:47.000000000 -0400
61105+++ linux-2.6.32.46/include/linux/byteorder/little_endian.h 2011-04-17 15:56:46.000000000 -0400
61106@@ -42,51 +42,51 @@
61107
61108 static inline __le64 __cpu_to_le64p(const __u64 *p)
61109 {
61110- return (__force __le64)*p;
61111+ return (__force const __le64)*p;
61112 }
61113 static inline __u64 __le64_to_cpup(const __le64 *p)
61114 {
61115- return (__force __u64)*p;
61116+ return (__force const __u64)*p;
61117 }
61118 static inline __le32 __cpu_to_le32p(const __u32 *p)
61119 {
61120- return (__force __le32)*p;
61121+ return (__force const __le32)*p;
61122 }
61123 static inline __u32 __le32_to_cpup(const __le32 *p)
61124 {
61125- return (__force __u32)*p;
61126+ return (__force const __u32)*p;
61127 }
61128 static inline __le16 __cpu_to_le16p(const __u16 *p)
61129 {
61130- return (__force __le16)*p;
61131+ return (__force const __le16)*p;
61132 }
61133 static inline __u16 __le16_to_cpup(const __le16 *p)
61134 {
61135- return (__force __u16)*p;
61136+ return (__force const __u16)*p;
61137 }
61138 static inline __be64 __cpu_to_be64p(const __u64 *p)
61139 {
61140- return (__force __be64)__swab64p(p);
61141+ return (__force const __be64)__swab64p(p);
61142 }
61143 static inline __u64 __be64_to_cpup(const __be64 *p)
61144 {
61145- return __swab64p((__u64 *)p);
61146+ return __swab64p((const __u64 *)p);
61147 }
61148 static inline __be32 __cpu_to_be32p(const __u32 *p)
61149 {
61150- return (__force __be32)__swab32p(p);
61151+ return (__force const __be32)__swab32p(p);
61152 }
61153 static inline __u32 __be32_to_cpup(const __be32 *p)
61154 {
61155- return __swab32p((__u32 *)p);
61156+ return __swab32p((const __u32 *)p);
61157 }
61158 static inline __be16 __cpu_to_be16p(const __u16 *p)
61159 {
61160- return (__force __be16)__swab16p(p);
61161+ return (__force const __be16)__swab16p(p);
61162 }
61163 static inline __u16 __be16_to_cpup(const __be16 *p)
61164 {
61165- return __swab16p((__u16 *)p);
61166+ return __swab16p((const __u16 *)p);
61167 }
61168 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
61169 #define __le64_to_cpus(x) do { (void)(x); } while (0)
61170diff -urNp linux-2.6.32.46/include/linux/cache.h linux-2.6.32.46/include/linux/cache.h
61171--- linux-2.6.32.46/include/linux/cache.h 2011-03-27 14:31:47.000000000 -0400
61172+++ linux-2.6.32.46/include/linux/cache.h 2011-04-17 15:56:46.000000000 -0400
61173@@ -16,6 +16,10 @@
61174 #define __read_mostly
61175 #endif
61176
61177+#ifndef __read_only
61178+#define __read_only __read_mostly
61179+#endif
61180+
61181 #ifndef ____cacheline_aligned
61182 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
61183 #endif
61184diff -urNp linux-2.6.32.46/include/linux/capability.h linux-2.6.32.46/include/linux/capability.h
61185--- linux-2.6.32.46/include/linux/capability.h 2011-03-27 14:31:47.000000000 -0400
61186+++ linux-2.6.32.46/include/linux/capability.h 2011-04-17 15:56:46.000000000 -0400
61187@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
61188 (security_real_capable_noaudit((t), (cap)) == 0)
61189
61190 extern int capable(int cap);
61191+int capable_nolog(int cap);
61192
61193 /* audit system wants to get cap info from files as well */
61194 struct dentry;
61195diff -urNp linux-2.6.32.46/include/linux/compiler-gcc4.h linux-2.6.32.46/include/linux/compiler-gcc4.h
61196--- linux-2.6.32.46/include/linux/compiler-gcc4.h 2011-03-27 14:31:47.000000000 -0400
61197+++ linux-2.6.32.46/include/linux/compiler-gcc4.h 2011-08-26 20:19:09.000000000 -0400
61198@@ -36,4 +36,16 @@
61199 the kernel context */
61200 #define __cold __attribute__((__cold__))
61201
61202+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
61203+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
61204+#define __bos0(ptr) __bos((ptr), 0)
61205+#define __bos1(ptr) __bos((ptr), 1)
61206+
61207+#if __GNUC_MINOR__ >= 5
61208+#ifdef CONSTIFY_PLUGIN
61209+#define __no_const __attribute__((no_const))
61210+#define __do_const __attribute__((do_const))
61211+#endif
61212+#endif
61213+
61214 #endif
61215diff -urNp linux-2.6.32.46/include/linux/compiler.h linux-2.6.32.46/include/linux/compiler.h
61216--- linux-2.6.32.46/include/linux/compiler.h 2011-03-27 14:31:47.000000000 -0400
61217+++ linux-2.6.32.46/include/linux/compiler.h 2011-10-06 09:37:14.000000000 -0400
61218@@ -5,11 +5,14 @@
61219
61220 #ifdef __CHECKER__
61221 # define __user __attribute__((noderef, address_space(1)))
61222+# define __force_user __force __user
61223 # define __kernel /* default address space */
61224+# define __force_kernel __force __kernel
61225 # define __safe __attribute__((safe))
61226 # define __force __attribute__((force))
61227 # define __nocast __attribute__((nocast))
61228 # define __iomem __attribute__((noderef, address_space(2)))
61229+# define __force_iomem __force __iomem
61230 # define __acquires(x) __attribute__((context(x,0,1)))
61231 # define __releases(x) __attribute__((context(x,1,0)))
61232 # define __acquire(x) __context__(x,1)
61233@@ -17,13 +20,34 @@
61234 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
61235 extern void __chk_user_ptr(const volatile void __user *);
61236 extern void __chk_io_ptr(const volatile void __iomem *);
61237+#elif defined(CHECKER_PLUGIN)
61238+//# define __user
61239+//# define __force_user
61240+//# define __kernel
61241+//# define __force_kernel
61242+# define __safe
61243+# define __force
61244+# define __nocast
61245+# define __iomem
61246+# define __force_iomem
61247+# define __chk_user_ptr(x) (void)0
61248+# define __chk_io_ptr(x) (void)0
61249+# define __builtin_warning(x, y...) (1)
61250+# define __acquires(x)
61251+# define __releases(x)
61252+# define __acquire(x) (void)0
61253+# define __release(x) (void)0
61254+# define __cond_lock(x,c) (c)
61255 #else
61256 # define __user
61257+# define __force_user
61258 # define __kernel
61259+# define __force_kernel
61260 # define __safe
61261 # define __force
61262 # define __nocast
61263 # define __iomem
61264+# define __force_iomem
61265 # define __chk_user_ptr(x) (void)0
61266 # define __chk_io_ptr(x) (void)0
61267 # define __builtin_warning(x, y...) (1)
61268@@ -247,6 +271,14 @@ void ftrace_likely_update(struct ftrace_
61269 # define __attribute_const__ /* unimplemented */
61270 #endif
61271
61272+#ifndef __no_const
61273+# define __no_const
61274+#endif
61275+
61276+#ifndef __do_const
61277+# define __do_const
61278+#endif
61279+
61280 /*
61281 * Tell gcc if a function is cold. The compiler will assume any path
61282 * directly leading to the call is unlikely.
61283@@ -256,6 +288,22 @@ void ftrace_likely_update(struct ftrace_
61284 #define __cold
61285 #endif
61286
61287+#ifndef __alloc_size
61288+#define __alloc_size(...)
61289+#endif
61290+
61291+#ifndef __bos
61292+#define __bos(ptr, arg)
61293+#endif
61294+
61295+#ifndef __bos0
61296+#define __bos0(ptr)
61297+#endif
61298+
61299+#ifndef __bos1
61300+#define __bos1(ptr)
61301+#endif
61302+
61303 /* Simple shorthand for a section definition */
61304 #ifndef __section
61305 # define __section(S) __attribute__ ((__section__(#S)))
61306@@ -278,6 +326,7 @@ void ftrace_likely_update(struct ftrace_
61307 * use is to mediate communication between process-level code and irq/NMI
61308 * handlers, all running on the same CPU.
61309 */
61310-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
61311+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
61312+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
61313
61314 #endif /* __LINUX_COMPILER_H */
61315diff -urNp linux-2.6.32.46/include/linux/crypto.h linux-2.6.32.46/include/linux/crypto.h
61316--- linux-2.6.32.46/include/linux/crypto.h 2011-03-27 14:31:47.000000000 -0400
61317+++ linux-2.6.32.46/include/linux/crypto.h 2011-08-05 20:33:55.000000000 -0400
61318@@ -394,7 +394,7 @@ struct cipher_tfm {
61319 const u8 *key, unsigned int keylen);
61320 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
61321 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
61322-};
61323+} __no_const;
61324
61325 struct hash_tfm {
61326 int (*init)(struct hash_desc *desc);
61327@@ -415,13 +415,13 @@ struct compress_tfm {
61328 int (*cot_decompress)(struct crypto_tfm *tfm,
61329 const u8 *src, unsigned int slen,
61330 u8 *dst, unsigned int *dlen);
61331-};
61332+} __no_const;
61333
61334 struct rng_tfm {
61335 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
61336 unsigned int dlen);
61337 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
61338-};
61339+} __no_const;
61340
61341 #define crt_ablkcipher crt_u.ablkcipher
61342 #define crt_aead crt_u.aead
61343diff -urNp linux-2.6.32.46/include/linux/dcache.h linux-2.6.32.46/include/linux/dcache.h
61344--- linux-2.6.32.46/include/linux/dcache.h 2011-03-27 14:31:47.000000000 -0400
61345+++ linux-2.6.32.46/include/linux/dcache.h 2011-04-23 13:34:46.000000000 -0400
61346@@ -119,6 +119,8 @@ struct dentry {
61347 unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */
61348 };
61349
61350+#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname))
61351+
61352 /*
61353 * dentry->d_lock spinlock nesting subclasses:
61354 *
61355diff -urNp linux-2.6.32.46/include/linux/decompress/mm.h linux-2.6.32.46/include/linux/decompress/mm.h
61356--- linux-2.6.32.46/include/linux/decompress/mm.h 2011-03-27 14:31:47.000000000 -0400
61357+++ linux-2.6.32.46/include/linux/decompress/mm.h 2011-04-17 15:56:46.000000000 -0400
61358@@ -78,7 +78,7 @@ static void free(void *where)
61359 * warnings when not needed (indeed large_malloc / large_free are not
61360 * needed by inflate */
61361
61362-#define malloc(a) kmalloc(a, GFP_KERNEL)
61363+#define malloc(a) kmalloc((a), GFP_KERNEL)
61364 #define free(a) kfree(a)
61365
61366 #define large_malloc(a) vmalloc(a)
61367diff -urNp linux-2.6.32.46/include/linux/dma-mapping.h linux-2.6.32.46/include/linux/dma-mapping.h
61368--- linux-2.6.32.46/include/linux/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400
61369+++ linux-2.6.32.46/include/linux/dma-mapping.h 2011-08-26 20:19:09.000000000 -0400
61370@@ -16,51 +16,51 @@ enum dma_data_direction {
61371 };
61372
61373 struct dma_map_ops {
61374- void* (*alloc_coherent)(struct device *dev, size_t size,
61375+ void* (* const alloc_coherent)(struct device *dev, size_t size,
61376 dma_addr_t *dma_handle, gfp_t gfp);
61377- void (*free_coherent)(struct device *dev, size_t size,
61378+ void (* const free_coherent)(struct device *dev, size_t size,
61379 void *vaddr, dma_addr_t dma_handle);
61380- dma_addr_t (*map_page)(struct device *dev, struct page *page,
61381+ dma_addr_t (* const map_page)(struct device *dev, struct page *page,
61382 unsigned long offset, size_t size,
61383 enum dma_data_direction dir,
61384 struct dma_attrs *attrs);
61385- void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
61386+ void (* const unmap_page)(struct device *dev, dma_addr_t dma_handle,
61387 size_t size, enum dma_data_direction dir,
61388 struct dma_attrs *attrs);
61389- int (*map_sg)(struct device *dev, struct scatterlist *sg,
61390+ int (* const map_sg)(struct device *dev, struct scatterlist *sg,
61391 int nents, enum dma_data_direction dir,
61392 struct dma_attrs *attrs);
61393- void (*unmap_sg)(struct device *dev,
61394+ void (* const unmap_sg)(struct device *dev,
61395 struct scatterlist *sg, int nents,
61396 enum dma_data_direction dir,
61397 struct dma_attrs *attrs);
61398- void (*sync_single_for_cpu)(struct device *dev,
61399+ void (* const sync_single_for_cpu)(struct device *dev,
61400 dma_addr_t dma_handle, size_t size,
61401 enum dma_data_direction dir);
61402- void (*sync_single_for_device)(struct device *dev,
61403+ void (* const sync_single_for_device)(struct device *dev,
61404 dma_addr_t dma_handle, size_t size,
61405 enum dma_data_direction dir);
61406- void (*sync_single_range_for_cpu)(struct device *dev,
61407+ void (* const sync_single_range_for_cpu)(struct device *dev,
61408 dma_addr_t dma_handle,
61409 unsigned long offset,
61410 size_t size,
61411 enum dma_data_direction dir);
61412- void (*sync_single_range_for_device)(struct device *dev,
61413+ void (* const sync_single_range_for_device)(struct device *dev,
61414 dma_addr_t dma_handle,
61415 unsigned long offset,
61416 size_t size,
61417 enum dma_data_direction dir);
61418- void (*sync_sg_for_cpu)(struct device *dev,
61419+ void (* const sync_sg_for_cpu)(struct device *dev,
61420 struct scatterlist *sg, int nents,
61421 enum dma_data_direction dir);
61422- void (*sync_sg_for_device)(struct device *dev,
61423+ void (* const sync_sg_for_device)(struct device *dev,
61424 struct scatterlist *sg, int nents,
61425 enum dma_data_direction dir);
61426- int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
61427- int (*dma_supported)(struct device *dev, u64 mask);
61428+ int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr);
61429+ int (* const dma_supported)(struct device *dev, u64 mask);
61430 int (*set_dma_mask)(struct device *dev, u64 mask);
61431 int is_phys;
61432-};
61433+} __do_const;
61434
61435 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
61436
61437diff -urNp linux-2.6.32.46/include/linux/dst.h linux-2.6.32.46/include/linux/dst.h
61438--- linux-2.6.32.46/include/linux/dst.h 2011-03-27 14:31:47.000000000 -0400
61439+++ linux-2.6.32.46/include/linux/dst.h 2011-04-17 15:56:46.000000000 -0400
61440@@ -380,7 +380,7 @@ struct dst_node
61441 struct thread_pool *pool;
61442
61443 /* Transaction IDs live here */
61444- atomic_long_t gen;
61445+ atomic_long_unchecked_t gen;
61446
61447 /*
61448 * How frequently and how many times transaction
61449diff -urNp linux-2.6.32.46/include/linux/elf.h linux-2.6.32.46/include/linux/elf.h
61450--- linux-2.6.32.46/include/linux/elf.h 2011-03-27 14:31:47.000000000 -0400
61451+++ linux-2.6.32.46/include/linux/elf.h 2011-04-17 15:56:46.000000000 -0400
61452@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
61453 #define PT_GNU_EH_FRAME 0x6474e550
61454
61455 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
61456+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
61457+
61458+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
61459+
61460+/* Constants for the e_flags field */
61461+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
61462+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
61463+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
61464+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
61465+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
61466+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
61467
61468 /* These constants define the different elf file types */
61469 #define ET_NONE 0
61470@@ -84,6 +95,8 @@ typedef __s64 Elf64_Sxword;
61471 #define DT_DEBUG 21
61472 #define DT_TEXTREL 22
61473 #define DT_JMPREL 23
61474+#define DT_FLAGS 30
61475+ #define DF_TEXTREL 0x00000004
61476 #define DT_ENCODING 32
61477 #define OLD_DT_LOOS 0x60000000
61478 #define DT_LOOS 0x6000000d
61479@@ -230,6 +243,19 @@ typedef struct elf64_hdr {
61480 #define PF_W 0x2
61481 #define PF_X 0x1
61482
61483+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
61484+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
61485+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
61486+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
61487+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
61488+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
61489+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
61490+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
61491+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
61492+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
61493+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
61494+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
61495+
61496 typedef struct elf32_phdr{
61497 Elf32_Word p_type;
61498 Elf32_Off p_offset;
61499@@ -322,6 +348,8 @@ typedef struct elf64_shdr {
61500 #define EI_OSABI 7
61501 #define EI_PAD 8
61502
61503+#define EI_PAX 14
61504+
61505 #define ELFMAG0 0x7f /* EI_MAG */
61506 #define ELFMAG1 'E'
61507 #define ELFMAG2 'L'
61508@@ -386,6 +414,7 @@ extern Elf32_Dyn _DYNAMIC [];
61509 #define elf_phdr elf32_phdr
61510 #define elf_note elf32_note
61511 #define elf_addr_t Elf32_Off
61512+#define elf_dyn Elf32_Dyn
61513
61514 #else
61515
61516@@ -394,6 +423,7 @@ extern Elf64_Dyn _DYNAMIC [];
61517 #define elf_phdr elf64_phdr
61518 #define elf_note elf64_note
61519 #define elf_addr_t Elf64_Off
61520+#define elf_dyn Elf64_Dyn
61521
61522 #endif
61523
61524diff -urNp linux-2.6.32.46/include/linux/fscache-cache.h linux-2.6.32.46/include/linux/fscache-cache.h
61525--- linux-2.6.32.46/include/linux/fscache-cache.h 2011-03-27 14:31:47.000000000 -0400
61526+++ linux-2.6.32.46/include/linux/fscache-cache.h 2011-05-04 17:56:28.000000000 -0400
61527@@ -116,7 +116,7 @@ struct fscache_operation {
61528 #endif
61529 };
61530
61531-extern atomic_t fscache_op_debug_id;
61532+extern atomic_unchecked_t fscache_op_debug_id;
61533 extern const struct slow_work_ops fscache_op_slow_work_ops;
61534
61535 extern void fscache_enqueue_operation(struct fscache_operation *);
61536@@ -134,7 +134,7 @@ static inline void fscache_operation_ini
61537 fscache_operation_release_t release)
61538 {
61539 atomic_set(&op->usage, 1);
61540- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
61541+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
61542 op->release = release;
61543 INIT_LIST_HEAD(&op->pend_link);
61544 fscache_set_op_state(op, "Init");
61545diff -urNp linux-2.6.32.46/include/linux/fs.h linux-2.6.32.46/include/linux/fs.h
61546--- linux-2.6.32.46/include/linux/fs.h 2011-07-13 17:23:04.000000000 -0400
61547+++ linux-2.6.32.46/include/linux/fs.h 2011-08-26 20:19:09.000000000 -0400
61548@@ -90,6 +90,11 @@ struct inodes_stat_t {
61549 /* Expect random access pattern */
61550 #define FMODE_RANDOM ((__force fmode_t)4096)
61551
61552+/* Hack for grsec so as not to require read permission simply to execute
61553+ * a binary
61554+ */
61555+#define FMODE_GREXEC ((__force fmode_t)0x2000000)
61556+
61557 /*
61558 * The below are the various read and write types that we support. Some of
61559 * them include behavioral modifiers that send information down to the
61560@@ -568,41 +573,41 @@ typedef int (*read_actor_t)(read_descrip
61561 unsigned long, unsigned long);
61562
61563 struct address_space_operations {
61564- int (*writepage)(struct page *page, struct writeback_control *wbc);
61565- int (*readpage)(struct file *, struct page *);
61566- void (*sync_page)(struct page *);
61567+ int (* const writepage)(struct page *page, struct writeback_control *wbc);
61568+ int (* const readpage)(struct file *, struct page *);
61569+ void (* const sync_page)(struct page *);
61570
61571 /* Write back some dirty pages from this mapping. */
61572- int (*writepages)(struct address_space *, struct writeback_control *);
61573+ int (* const writepages)(struct address_space *, struct writeback_control *);
61574
61575 /* Set a page dirty. Return true if this dirtied it */
61576- int (*set_page_dirty)(struct page *page);
61577+ int (* const set_page_dirty)(struct page *page);
61578
61579- int (*readpages)(struct file *filp, struct address_space *mapping,
61580+ int (* const readpages)(struct file *filp, struct address_space *mapping,
61581 struct list_head *pages, unsigned nr_pages);
61582
61583- int (*write_begin)(struct file *, struct address_space *mapping,
61584+ int (* const write_begin)(struct file *, struct address_space *mapping,
61585 loff_t pos, unsigned len, unsigned flags,
61586 struct page **pagep, void **fsdata);
61587- int (*write_end)(struct file *, struct address_space *mapping,
61588+ int (* const write_end)(struct file *, struct address_space *mapping,
61589 loff_t pos, unsigned len, unsigned copied,
61590 struct page *page, void *fsdata);
61591
61592 /* Unfortunately this kludge is needed for FIBMAP. Don't use it */
61593- sector_t (*bmap)(struct address_space *, sector_t);
61594- void (*invalidatepage) (struct page *, unsigned long);
61595- int (*releasepage) (struct page *, gfp_t);
61596- ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
61597+ sector_t (* const bmap)(struct address_space *, sector_t);
61598+ void (* const invalidatepage) (struct page *, unsigned long);
61599+ int (* const releasepage) (struct page *, gfp_t);
61600+ ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
61601 loff_t offset, unsigned long nr_segs);
61602- int (*get_xip_mem)(struct address_space *, pgoff_t, int,
61603+ int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
61604 void **, unsigned long *);
61605 /* migrate the contents of a page to the specified target */
61606- int (*migratepage) (struct address_space *,
61607+ int (* const migratepage) (struct address_space *,
61608 struct page *, struct page *);
61609- int (*launder_page) (struct page *);
61610- int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
61611+ int (* const launder_page) (struct page *);
61612+ int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
61613 unsigned long);
61614- int (*error_remove_page)(struct address_space *, struct page *);
61615+ int (* const error_remove_page)(struct address_space *, struct page *);
61616 };
61617
61618 /*
61619@@ -1031,19 +1036,19 @@ static inline int file_check_writeable(s
61620 typedef struct files_struct *fl_owner_t;
61621
61622 struct file_lock_operations {
61623- void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
61624- void (*fl_release_private)(struct file_lock *);
61625+ void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
61626+ void (* const fl_release_private)(struct file_lock *);
61627 };
61628
61629 struct lock_manager_operations {
61630- int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
61631- void (*fl_notify)(struct file_lock *); /* unblock callback */
61632- int (*fl_grant)(struct file_lock *, struct file_lock *, int);
61633- void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
61634- void (*fl_release_private)(struct file_lock *);
61635- void (*fl_break)(struct file_lock *);
61636- int (*fl_mylease)(struct file_lock *, struct file_lock *);
61637- int (*fl_change)(struct file_lock **, int);
61638+ int (* const fl_compare_owner)(struct file_lock *, struct file_lock *);
61639+ void (* const fl_notify)(struct file_lock *); /* unblock callback */
61640+ int (* const fl_grant)(struct file_lock *, struct file_lock *, int);
61641+ void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
61642+ void (* const fl_release_private)(struct file_lock *);
61643+ void (* const fl_break)(struct file_lock *);
61644+ int (* const fl_mylease)(struct file_lock *, struct file_lock *);
61645+ int (* const fl_change)(struct file_lock **, int);
61646 };
61647
61648 struct lock_manager {
61649@@ -1442,7 +1447,7 @@ struct fiemap_extent_info {
61650 unsigned int fi_flags; /* Flags as passed from user */
61651 unsigned int fi_extents_mapped; /* Number of mapped extents */
61652 unsigned int fi_extents_max; /* Size of fiemap_extent array */
61653- struct fiemap_extent *fi_extents_start; /* Start of fiemap_extent
61654+ struct fiemap_extent __user *fi_extents_start; /* Start of fiemap_extent
61655 * array */
61656 };
61657 int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
61658@@ -1512,7 +1517,8 @@ struct file_operations {
61659 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
61660 ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
61661 int (*setlease)(struct file *, long, struct file_lock **);
61662-};
61663+} __do_const;
61664+typedef struct file_operations __no_const file_operations_no_const;
61665
61666 struct inode_operations {
61667 int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
61668@@ -1559,30 +1565,30 @@ extern ssize_t vfs_writev(struct file *,
61669 unsigned long, loff_t *);
61670
61671 struct super_operations {
61672- struct inode *(*alloc_inode)(struct super_block *sb);
61673- void (*destroy_inode)(struct inode *);
61674+ struct inode *(* const alloc_inode)(struct super_block *sb);
61675+ void (* const destroy_inode)(struct inode *);
61676
61677- void (*dirty_inode) (struct inode *);
61678- int (*write_inode) (struct inode *, int);
61679- void (*drop_inode) (struct inode *);
61680- void (*delete_inode) (struct inode *);
61681- void (*put_super) (struct super_block *);
61682- void (*write_super) (struct super_block *);
61683- int (*sync_fs)(struct super_block *sb, int wait);
61684- int (*freeze_fs) (struct super_block *);
61685- int (*unfreeze_fs) (struct super_block *);
61686- int (*statfs) (struct dentry *, struct kstatfs *);
61687- int (*remount_fs) (struct super_block *, int *, char *);
61688- void (*clear_inode) (struct inode *);
61689- void (*umount_begin) (struct super_block *);
61690+ void (* const dirty_inode) (struct inode *);
61691+ int (* const write_inode) (struct inode *, int);
61692+ void (* const drop_inode) (struct inode *);
61693+ void (* const delete_inode) (struct inode *);
61694+ void (* const put_super) (struct super_block *);
61695+ void (* const write_super) (struct super_block *);
61696+ int (* const sync_fs)(struct super_block *sb, int wait);
61697+ int (* const freeze_fs) (struct super_block *);
61698+ int (* const unfreeze_fs) (struct super_block *);
61699+ int (* const statfs) (struct dentry *, struct kstatfs *);
61700+ int (* const remount_fs) (struct super_block *, int *, char *);
61701+ void (* const clear_inode) (struct inode *);
61702+ void (* const umount_begin) (struct super_block *);
61703
61704- int (*show_options)(struct seq_file *, struct vfsmount *);
61705- int (*show_stats)(struct seq_file *, struct vfsmount *);
61706+ int (* const show_options)(struct seq_file *, struct vfsmount *);
61707+ int (* const show_stats)(struct seq_file *, struct vfsmount *);
61708 #ifdef CONFIG_QUOTA
61709- ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
61710- ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
61711+ ssize_t (* const quota_read)(struct super_block *, int, char *, size_t, loff_t);
61712+ ssize_t (* const quota_write)(struct super_block *, int, const char *, size_t, loff_t);
61713 #endif
61714- int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
61715+ int (* const bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
61716 };
61717
61718 /*
61719diff -urNp linux-2.6.32.46/include/linux/fs_struct.h linux-2.6.32.46/include/linux/fs_struct.h
61720--- linux-2.6.32.46/include/linux/fs_struct.h 2011-03-27 14:31:47.000000000 -0400
61721+++ linux-2.6.32.46/include/linux/fs_struct.h 2011-04-17 15:56:46.000000000 -0400
61722@@ -4,7 +4,7 @@
61723 #include <linux/path.h>
61724
61725 struct fs_struct {
61726- int users;
61727+ atomic_t users;
61728 rwlock_t lock;
61729 int umask;
61730 int in_exec;
61731diff -urNp linux-2.6.32.46/include/linux/ftrace_event.h linux-2.6.32.46/include/linux/ftrace_event.h
61732--- linux-2.6.32.46/include/linux/ftrace_event.h 2011-03-27 14:31:47.000000000 -0400
61733+++ linux-2.6.32.46/include/linux/ftrace_event.h 2011-05-04 17:56:28.000000000 -0400
61734@@ -163,7 +163,7 @@ extern int trace_define_field(struct ftr
61735 int filter_type);
61736 extern int trace_define_common_fields(struct ftrace_event_call *call);
61737
61738-#define is_signed_type(type) (((type)(-1)) < 0)
61739+#define is_signed_type(type) (((type)(-1)) < (type)1)
61740
61741 int trace_set_clr_event(const char *system, const char *event, int set);
61742
61743diff -urNp linux-2.6.32.46/include/linux/genhd.h linux-2.6.32.46/include/linux/genhd.h
61744--- linux-2.6.32.46/include/linux/genhd.h 2011-03-27 14:31:47.000000000 -0400
61745+++ linux-2.6.32.46/include/linux/genhd.h 2011-04-17 15:56:46.000000000 -0400
61746@@ -161,7 +161,7 @@ struct gendisk {
61747
61748 struct timer_rand_state *random;
61749
61750- atomic_t sync_io; /* RAID */
61751+ atomic_unchecked_t sync_io; /* RAID */
61752 struct work_struct async_notify;
61753 #ifdef CONFIG_BLK_DEV_INTEGRITY
61754 struct blk_integrity *integrity;
61755diff -urNp linux-2.6.32.46/include/linux/gracl.h linux-2.6.32.46/include/linux/gracl.h
61756--- linux-2.6.32.46/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
61757+++ linux-2.6.32.46/include/linux/gracl.h 2011-04-17 15:56:46.000000000 -0400
61758@@ -0,0 +1,317 @@
61759+#ifndef GR_ACL_H
61760+#define GR_ACL_H
61761+
61762+#include <linux/grdefs.h>
61763+#include <linux/resource.h>
61764+#include <linux/capability.h>
61765+#include <linux/dcache.h>
61766+#include <asm/resource.h>
61767+
61768+/* Major status information */
61769+
61770+#define GR_VERSION "grsecurity 2.2.2"
61771+#define GRSECURITY_VERSION 0x2202
61772+
61773+enum {
61774+ GR_SHUTDOWN = 0,
61775+ GR_ENABLE = 1,
61776+ GR_SPROLE = 2,
61777+ GR_RELOAD = 3,
61778+ GR_SEGVMOD = 4,
61779+ GR_STATUS = 5,
61780+ GR_UNSPROLE = 6,
61781+ GR_PASSSET = 7,
61782+ GR_SPROLEPAM = 8,
61783+};
61784+
61785+/* Password setup definitions
61786+ * kernel/grhash.c */
61787+enum {
61788+ GR_PW_LEN = 128,
61789+ GR_SALT_LEN = 16,
61790+ GR_SHA_LEN = 32,
61791+};
61792+
61793+enum {
61794+ GR_SPROLE_LEN = 64,
61795+};
61796+
61797+enum {
61798+ GR_NO_GLOB = 0,
61799+ GR_REG_GLOB,
61800+ GR_CREATE_GLOB
61801+};
61802+
61803+#define GR_NLIMITS 32
61804+
61805+/* Begin Data Structures */
61806+
61807+struct sprole_pw {
61808+ unsigned char *rolename;
61809+ unsigned char salt[GR_SALT_LEN];
61810+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
61811+};
61812+
61813+struct name_entry {
61814+ __u32 key;
61815+ ino_t inode;
61816+ dev_t device;
61817+ char *name;
61818+ __u16 len;
61819+ __u8 deleted;
61820+ struct name_entry *prev;
61821+ struct name_entry *next;
61822+};
61823+
61824+struct inodev_entry {
61825+ struct name_entry *nentry;
61826+ struct inodev_entry *prev;
61827+ struct inodev_entry *next;
61828+};
61829+
61830+struct acl_role_db {
61831+ struct acl_role_label **r_hash;
61832+ __u32 r_size;
61833+};
61834+
61835+struct inodev_db {
61836+ struct inodev_entry **i_hash;
61837+ __u32 i_size;
61838+};
61839+
61840+struct name_db {
61841+ struct name_entry **n_hash;
61842+ __u32 n_size;
61843+};
61844+
61845+struct crash_uid {
61846+ uid_t uid;
61847+ unsigned long expires;
61848+};
61849+
61850+struct gr_hash_struct {
61851+ void **table;
61852+ void **nametable;
61853+ void *first;
61854+ __u32 table_size;
61855+ __u32 used_size;
61856+ int type;
61857+};
61858+
61859+/* Userspace Grsecurity ACL data structures */
61860+
61861+struct acl_subject_label {
61862+ char *filename;
61863+ ino_t inode;
61864+ dev_t device;
61865+ __u32 mode;
61866+ kernel_cap_t cap_mask;
61867+ kernel_cap_t cap_lower;
61868+ kernel_cap_t cap_invert_audit;
61869+
61870+ struct rlimit res[GR_NLIMITS];
61871+ __u32 resmask;
61872+
61873+ __u8 user_trans_type;
61874+ __u8 group_trans_type;
61875+ uid_t *user_transitions;
61876+ gid_t *group_transitions;
61877+ __u16 user_trans_num;
61878+ __u16 group_trans_num;
61879+
61880+ __u32 sock_families[2];
61881+ __u32 ip_proto[8];
61882+ __u32 ip_type;
61883+ struct acl_ip_label **ips;
61884+ __u32 ip_num;
61885+ __u32 inaddr_any_override;
61886+
61887+ __u32 crashes;
61888+ unsigned long expires;
61889+
61890+ struct acl_subject_label *parent_subject;
61891+ struct gr_hash_struct *hash;
61892+ struct acl_subject_label *prev;
61893+ struct acl_subject_label *next;
61894+
61895+ struct acl_object_label **obj_hash;
61896+ __u32 obj_hash_size;
61897+ __u16 pax_flags;
61898+};
61899+
61900+struct role_allowed_ip {
61901+ __u32 addr;
61902+ __u32 netmask;
61903+
61904+ struct role_allowed_ip *prev;
61905+ struct role_allowed_ip *next;
61906+};
61907+
61908+struct role_transition {
61909+ char *rolename;
61910+
61911+ struct role_transition *prev;
61912+ struct role_transition *next;
61913+};
61914+
61915+struct acl_role_label {
61916+ char *rolename;
61917+ uid_t uidgid;
61918+ __u16 roletype;
61919+
61920+ __u16 auth_attempts;
61921+ unsigned long expires;
61922+
61923+ struct acl_subject_label *root_label;
61924+ struct gr_hash_struct *hash;
61925+
61926+ struct acl_role_label *prev;
61927+ struct acl_role_label *next;
61928+
61929+ struct role_transition *transitions;
61930+ struct role_allowed_ip *allowed_ips;
61931+ uid_t *domain_children;
61932+ __u16 domain_child_num;
61933+
61934+ struct acl_subject_label **subj_hash;
61935+ __u32 subj_hash_size;
61936+};
61937+
61938+struct user_acl_role_db {
61939+ struct acl_role_label **r_table;
61940+ __u32 num_pointers; /* Number of allocations to track */
61941+ __u32 num_roles; /* Number of roles */
61942+ __u32 num_domain_children; /* Number of domain children */
61943+ __u32 num_subjects; /* Number of subjects */
61944+ __u32 num_objects; /* Number of objects */
61945+};
61946+
61947+struct acl_object_label {
61948+ char *filename;
61949+ ino_t inode;
61950+ dev_t device;
61951+ __u32 mode;
61952+
61953+ struct acl_subject_label *nested;
61954+ struct acl_object_label *globbed;
61955+
61956+ /* next two structures not used */
61957+
61958+ struct acl_object_label *prev;
61959+ struct acl_object_label *next;
61960+};
61961+
61962+struct acl_ip_label {
61963+ char *iface;
61964+ __u32 addr;
61965+ __u32 netmask;
61966+ __u16 low, high;
61967+ __u8 mode;
61968+ __u32 type;
61969+ __u32 proto[8];
61970+
61971+ /* next two structures not used */
61972+
61973+ struct acl_ip_label *prev;
61974+ struct acl_ip_label *next;
61975+};
61976+
61977+struct gr_arg {
61978+ struct user_acl_role_db role_db;
61979+ unsigned char pw[GR_PW_LEN];
61980+ unsigned char salt[GR_SALT_LEN];
61981+ unsigned char sum[GR_SHA_LEN];
61982+ unsigned char sp_role[GR_SPROLE_LEN];
61983+ struct sprole_pw *sprole_pws;
61984+ dev_t segv_device;
61985+ ino_t segv_inode;
61986+ uid_t segv_uid;
61987+ __u16 num_sprole_pws;
61988+ __u16 mode;
61989+};
61990+
61991+struct gr_arg_wrapper {
61992+ struct gr_arg *arg;
61993+ __u32 version;
61994+ __u32 size;
61995+};
61996+
61997+struct subject_map {
61998+ struct acl_subject_label *user;
61999+ struct acl_subject_label *kernel;
62000+ struct subject_map *prev;
62001+ struct subject_map *next;
62002+};
62003+
62004+struct acl_subj_map_db {
62005+ struct subject_map **s_hash;
62006+ __u32 s_size;
62007+};
62008+
62009+/* End Data Structures Section */
62010+
62011+/* Hash functions generated by empirical testing by Brad Spengler
62012+ Makes good use of the low bits of the inode. Generally 0-1 times
62013+ in loop for successful match. 0-3 for unsuccessful match.
62014+ Shift/add algorithm with modulus of table size and an XOR*/
62015+
62016+static __inline__ unsigned int
62017+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
62018+{
62019+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
62020+}
62021+
62022+ static __inline__ unsigned int
62023+shash(const struct acl_subject_label *userp, const unsigned int sz)
62024+{
62025+ return ((const unsigned long)userp % sz);
62026+}
62027+
62028+static __inline__ unsigned int
62029+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
62030+{
62031+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
62032+}
62033+
62034+static __inline__ unsigned int
62035+nhash(const char *name, const __u16 len, const unsigned int sz)
62036+{
62037+ return full_name_hash((const unsigned char *)name, len) % sz;
62038+}
62039+
62040+#define FOR_EACH_ROLE_START(role) \
62041+ role = role_list; \
62042+ while (role) {
62043+
62044+#define FOR_EACH_ROLE_END(role) \
62045+ role = role->prev; \
62046+ }
62047+
62048+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
62049+ subj = NULL; \
62050+ iter = 0; \
62051+ while (iter < role->subj_hash_size) { \
62052+ if (subj == NULL) \
62053+ subj = role->subj_hash[iter]; \
62054+ if (subj == NULL) { \
62055+ iter++; \
62056+ continue; \
62057+ }
62058+
62059+#define FOR_EACH_SUBJECT_END(subj,iter) \
62060+ subj = subj->next; \
62061+ if (subj == NULL) \
62062+ iter++; \
62063+ }
62064+
62065+
62066+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
62067+ subj = role->hash->first; \
62068+ while (subj != NULL) {
62069+
62070+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
62071+ subj = subj->next; \
62072+ }
62073+
62074+#endif
62075+
62076diff -urNp linux-2.6.32.46/include/linux/gralloc.h linux-2.6.32.46/include/linux/gralloc.h
62077--- linux-2.6.32.46/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
62078+++ linux-2.6.32.46/include/linux/gralloc.h 2011-04-17 15:56:46.000000000 -0400
62079@@ -0,0 +1,9 @@
62080+#ifndef __GRALLOC_H
62081+#define __GRALLOC_H
62082+
62083+void acl_free_all(void);
62084+int acl_alloc_stack_init(unsigned long size);
62085+void *acl_alloc(unsigned long len);
62086+void *acl_alloc_num(unsigned long num, unsigned long len);
62087+
62088+#endif
62089diff -urNp linux-2.6.32.46/include/linux/grdefs.h linux-2.6.32.46/include/linux/grdefs.h
62090--- linux-2.6.32.46/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
62091+++ linux-2.6.32.46/include/linux/grdefs.h 2011-06-11 16:20:26.000000000 -0400
62092@@ -0,0 +1,140 @@
62093+#ifndef GRDEFS_H
62094+#define GRDEFS_H
62095+
62096+/* Begin grsecurity status declarations */
62097+
62098+enum {
62099+ GR_READY = 0x01,
62100+ GR_STATUS_INIT = 0x00 // disabled state
62101+};
62102+
62103+/* Begin ACL declarations */
62104+
62105+/* Role flags */
62106+
62107+enum {
62108+ GR_ROLE_USER = 0x0001,
62109+ GR_ROLE_GROUP = 0x0002,
62110+ GR_ROLE_DEFAULT = 0x0004,
62111+ GR_ROLE_SPECIAL = 0x0008,
62112+ GR_ROLE_AUTH = 0x0010,
62113+ GR_ROLE_NOPW = 0x0020,
62114+ GR_ROLE_GOD = 0x0040,
62115+ GR_ROLE_LEARN = 0x0080,
62116+ GR_ROLE_TPE = 0x0100,
62117+ GR_ROLE_DOMAIN = 0x0200,
62118+ GR_ROLE_PAM = 0x0400,
62119+ GR_ROLE_PERSIST = 0x800
62120+};
62121+
62122+/* ACL Subject and Object mode flags */
62123+enum {
62124+ GR_DELETED = 0x80000000
62125+};
62126+
62127+/* ACL Object-only mode flags */
62128+enum {
62129+ GR_READ = 0x00000001,
62130+ GR_APPEND = 0x00000002,
62131+ GR_WRITE = 0x00000004,
62132+ GR_EXEC = 0x00000008,
62133+ GR_FIND = 0x00000010,
62134+ GR_INHERIT = 0x00000020,
62135+ GR_SETID = 0x00000040,
62136+ GR_CREATE = 0x00000080,
62137+ GR_DELETE = 0x00000100,
62138+ GR_LINK = 0x00000200,
62139+ GR_AUDIT_READ = 0x00000400,
62140+ GR_AUDIT_APPEND = 0x00000800,
62141+ GR_AUDIT_WRITE = 0x00001000,
62142+ GR_AUDIT_EXEC = 0x00002000,
62143+ GR_AUDIT_FIND = 0x00004000,
62144+ GR_AUDIT_INHERIT= 0x00008000,
62145+ GR_AUDIT_SETID = 0x00010000,
62146+ GR_AUDIT_CREATE = 0x00020000,
62147+ GR_AUDIT_DELETE = 0x00040000,
62148+ GR_AUDIT_LINK = 0x00080000,
62149+ GR_PTRACERD = 0x00100000,
62150+ GR_NOPTRACE = 0x00200000,
62151+ GR_SUPPRESS = 0x00400000,
62152+ GR_NOLEARN = 0x00800000,
62153+ GR_INIT_TRANSFER= 0x01000000
62154+};
62155+
62156+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
62157+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
62158+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
62159+
62160+/* ACL subject-only mode flags */
62161+enum {
62162+ GR_KILL = 0x00000001,
62163+ GR_VIEW = 0x00000002,
62164+ GR_PROTECTED = 0x00000004,
62165+ GR_LEARN = 0x00000008,
62166+ GR_OVERRIDE = 0x00000010,
62167+ /* just a placeholder, this mode is only used in userspace */
62168+ GR_DUMMY = 0x00000020,
62169+ GR_PROTSHM = 0x00000040,
62170+ GR_KILLPROC = 0x00000080,
62171+ GR_KILLIPPROC = 0x00000100,
62172+ /* just a placeholder, this mode is only used in userspace */
62173+ GR_NOTROJAN = 0x00000200,
62174+ GR_PROTPROCFD = 0x00000400,
62175+ GR_PROCACCT = 0x00000800,
62176+ GR_RELAXPTRACE = 0x00001000,
62177+ GR_NESTED = 0x00002000,
62178+ GR_INHERITLEARN = 0x00004000,
62179+ GR_PROCFIND = 0x00008000,
62180+ GR_POVERRIDE = 0x00010000,
62181+ GR_KERNELAUTH = 0x00020000,
62182+ GR_ATSECURE = 0x00040000,
62183+ GR_SHMEXEC = 0x00080000
62184+};
62185+
62186+enum {
62187+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
62188+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
62189+ GR_PAX_ENABLE_MPROTECT = 0x0004,
62190+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
62191+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
62192+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
62193+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
62194+ GR_PAX_DISABLE_MPROTECT = 0x0400,
62195+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
62196+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
62197+};
62198+
62199+enum {
62200+ GR_ID_USER = 0x01,
62201+ GR_ID_GROUP = 0x02,
62202+};
62203+
62204+enum {
62205+ GR_ID_ALLOW = 0x01,
62206+ GR_ID_DENY = 0x02,
62207+};
62208+
62209+#define GR_CRASH_RES 31
62210+#define GR_UIDTABLE_MAX 500
62211+
62212+/* begin resource learning section */
62213+enum {
62214+ GR_RLIM_CPU_BUMP = 60,
62215+ GR_RLIM_FSIZE_BUMP = 50000,
62216+ GR_RLIM_DATA_BUMP = 10000,
62217+ GR_RLIM_STACK_BUMP = 1000,
62218+ GR_RLIM_CORE_BUMP = 10000,
62219+ GR_RLIM_RSS_BUMP = 500000,
62220+ GR_RLIM_NPROC_BUMP = 1,
62221+ GR_RLIM_NOFILE_BUMP = 5,
62222+ GR_RLIM_MEMLOCK_BUMP = 50000,
62223+ GR_RLIM_AS_BUMP = 500000,
62224+ GR_RLIM_LOCKS_BUMP = 2,
62225+ GR_RLIM_SIGPENDING_BUMP = 5,
62226+ GR_RLIM_MSGQUEUE_BUMP = 10000,
62227+ GR_RLIM_NICE_BUMP = 1,
62228+ GR_RLIM_RTPRIO_BUMP = 1,
62229+ GR_RLIM_RTTIME_BUMP = 1000000
62230+};
62231+
62232+#endif
62233diff -urNp linux-2.6.32.46/include/linux/grinternal.h linux-2.6.32.46/include/linux/grinternal.h
62234--- linux-2.6.32.46/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
62235+++ linux-2.6.32.46/include/linux/grinternal.h 2011-08-11 19:58:37.000000000 -0400
62236@@ -0,0 +1,217 @@
62237+#ifndef __GRINTERNAL_H
62238+#define __GRINTERNAL_H
62239+
62240+#ifdef CONFIG_GRKERNSEC
62241+
62242+#include <linux/fs.h>
62243+#include <linux/mnt_namespace.h>
62244+#include <linux/nsproxy.h>
62245+#include <linux/gracl.h>
62246+#include <linux/grdefs.h>
62247+#include <linux/grmsg.h>
62248+
62249+void gr_add_learn_entry(const char *fmt, ...)
62250+ __attribute__ ((format (printf, 1, 2)));
62251+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
62252+ const struct vfsmount *mnt);
62253+__u32 gr_check_create(const struct dentry *new_dentry,
62254+ const struct dentry *parent,
62255+ const struct vfsmount *mnt, const __u32 mode);
62256+int gr_check_protected_task(const struct task_struct *task);
62257+__u32 to_gr_audit(const __u32 reqmode);
62258+int gr_set_acls(const int type);
62259+int gr_apply_subject_to_task(struct task_struct *task);
62260+int gr_acl_is_enabled(void);
62261+char gr_roletype_to_char(void);
62262+
62263+void gr_handle_alertkill(struct task_struct *task);
62264+char *gr_to_filename(const struct dentry *dentry,
62265+ const struct vfsmount *mnt);
62266+char *gr_to_filename1(const struct dentry *dentry,
62267+ const struct vfsmount *mnt);
62268+char *gr_to_filename2(const struct dentry *dentry,
62269+ const struct vfsmount *mnt);
62270+char *gr_to_filename3(const struct dentry *dentry,
62271+ const struct vfsmount *mnt);
62272+
62273+extern int grsec_enable_harden_ptrace;
62274+extern int grsec_enable_link;
62275+extern int grsec_enable_fifo;
62276+extern int grsec_enable_shm;
62277+extern int grsec_enable_execlog;
62278+extern int grsec_enable_signal;
62279+extern int grsec_enable_audit_ptrace;
62280+extern int grsec_enable_forkfail;
62281+extern int grsec_enable_time;
62282+extern int grsec_enable_rofs;
62283+extern int grsec_enable_chroot_shmat;
62284+extern int grsec_enable_chroot_mount;
62285+extern int grsec_enable_chroot_double;
62286+extern int grsec_enable_chroot_pivot;
62287+extern int grsec_enable_chroot_chdir;
62288+extern int grsec_enable_chroot_chmod;
62289+extern int grsec_enable_chroot_mknod;
62290+extern int grsec_enable_chroot_fchdir;
62291+extern int grsec_enable_chroot_nice;
62292+extern int grsec_enable_chroot_execlog;
62293+extern int grsec_enable_chroot_caps;
62294+extern int grsec_enable_chroot_sysctl;
62295+extern int grsec_enable_chroot_unix;
62296+extern int grsec_enable_tpe;
62297+extern int grsec_tpe_gid;
62298+extern int grsec_enable_tpe_all;
62299+extern int grsec_enable_tpe_invert;
62300+extern int grsec_enable_socket_all;
62301+extern int grsec_socket_all_gid;
62302+extern int grsec_enable_socket_client;
62303+extern int grsec_socket_client_gid;
62304+extern int grsec_enable_socket_server;
62305+extern int grsec_socket_server_gid;
62306+extern int grsec_audit_gid;
62307+extern int grsec_enable_group;
62308+extern int grsec_enable_audit_textrel;
62309+extern int grsec_enable_log_rwxmaps;
62310+extern int grsec_enable_mount;
62311+extern int grsec_enable_chdir;
62312+extern int grsec_resource_logging;
62313+extern int grsec_enable_blackhole;
62314+extern int grsec_lastack_retries;
62315+extern int grsec_enable_brute;
62316+extern int grsec_lock;
62317+
62318+extern spinlock_t grsec_alert_lock;
62319+extern unsigned long grsec_alert_wtime;
62320+extern unsigned long grsec_alert_fyet;
62321+
62322+extern spinlock_t grsec_audit_lock;
62323+
62324+extern rwlock_t grsec_exec_file_lock;
62325+
62326+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
62327+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
62328+ (tsk)->exec_file->f_vfsmnt) : "/")
62329+
62330+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
62331+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
62332+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
62333+
62334+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
62335+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
62336+ (tsk)->exec_file->f_vfsmnt) : "/")
62337+
62338+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
62339+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
62340+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
62341+
62342+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
62343+
62344+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
62345+
62346+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
62347+ (task)->pid, (cred)->uid, \
62348+ (cred)->euid, (cred)->gid, (cred)->egid, \
62349+ gr_parent_task_fullpath(task), \
62350+ (task)->real_parent->comm, (task)->real_parent->pid, \
62351+ (pcred)->uid, (pcred)->euid, \
62352+ (pcred)->gid, (pcred)->egid
62353+
62354+#define GR_CHROOT_CAPS {{ \
62355+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
62356+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
62357+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
62358+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
62359+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
62360+ CAP_TO_MASK(CAP_IPC_OWNER) , 0 }}
62361+
62362+#define security_learn(normal_msg,args...) \
62363+({ \
62364+ read_lock(&grsec_exec_file_lock); \
62365+ gr_add_learn_entry(normal_msg "\n", ## args); \
62366+ read_unlock(&grsec_exec_file_lock); \
62367+})
62368+
62369+enum {
62370+ GR_DO_AUDIT,
62371+ GR_DONT_AUDIT,
62372+ GR_DONT_AUDIT_GOOD
62373+};
62374+
62375+enum {
62376+ GR_TTYSNIFF,
62377+ GR_RBAC,
62378+ GR_RBAC_STR,
62379+ GR_STR_RBAC,
62380+ GR_RBAC_MODE2,
62381+ GR_RBAC_MODE3,
62382+ GR_FILENAME,
62383+ GR_SYSCTL_HIDDEN,
62384+ GR_NOARGS,
62385+ GR_ONE_INT,
62386+ GR_ONE_INT_TWO_STR,
62387+ GR_ONE_STR,
62388+ GR_STR_INT,
62389+ GR_TWO_STR_INT,
62390+ GR_TWO_INT,
62391+ GR_TWO_U64,
62392+ GR_THREE_INT,
62393+ GR_FIVE_INT_TWO_STR,
62394+ GR_TWO_STR,
62395+ GR_THREE_STR,
62396+ GR_FOUR_STR,
62397+ GR_STR_FILENAME,
62398+ GR_FILENAME_STR,
62399+ GR_FILENAME_TWO_INT,
62400+ GR_FILENAME_TWO_INT_STR,
62401+ GR_TEXTREL,
62402+ GR_PTRACE,
62403+ GR_RESOURCE,
62404+ GR_CAP,
62405+ GR_SIG,
62406+ GR_SIG2,
62407+ GR_CRASH1,
62408+ GR_CRASH2,
62409+ GR_PSACCT,
62410+ GR_RWXMAP
62411+};
62412+
62413+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
62414+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
62415+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
62416+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
62417+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
62418+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
62419+#define gr_log_fs_rbac_mode3(audit, msg, dentry, mnt, str1, str2, str3) gr_log_varargs(audit, msg, GR_RBAC_MODE3, dentry, mnt, str1, str2, str3)
62420+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
62421+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
62422+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
62423+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
62424+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
62425+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
62426+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
62427+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
62428+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
62429+#define gr_log_int5_str2(audit, msg, num1, num2, str1, str2) gr_log_varargs(audit, msg, GR_FIVE_INT_TWO_STR, num1, num2, str1, str2)
62430+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
62431+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
62432+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
62433+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
62434+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
62435+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
62436+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
62437+#define gr_log_fs_int2_str(audit, msg, dentry, mnt, num1, num2, str) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT_STR, dentry, mnt, num1, num2, str)
62438+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
62439+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
62440+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
62441+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
62442+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
62443+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
62444+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
62445+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
62446+#define gr_log_procacct(audit, msg, task, num1, num2, num3, num4, num5, num6, num7, num8, num9) gr_log_varargs(audit, msg, GR_PSACCT, task, num1, num2, num3, num4, num5, num6, num7, num8, num9)
62447+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
62448+
62449+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
62450+
62451+#endif
62452+
62453+#endif
62454diff -urNp linux-2.6.32.46/include/linux/grmsg.h linux-2.6.32.46/include/linux/grmsg.h
62455--- linux-2.6.32.46/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
62456+++ linux-2.6.32.46/include/linux/grmsg.h 2011-09-13 15:44:53.000000000 -0400
62457@@ -0,0 +1,108 @@
62458+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
62459+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
62460+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
62461+#define GR_STOPMOD_MSG "denied modification of module state by "
62462+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
62463+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
62464+#define GR_IOPERM_MSG "denied use of ioperm() by "
62465+#define GR_IOPL_MSG "denied use of iopl() by "
62466+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
62467+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
62468+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
62469+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
62470+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
62471+#define GR_LEARN_AUDIT_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%lu\t%lu\t%.4095s\t%lu\t%pI4"
62472+#define GR_ID_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%c\t%d\t%d\t%d\t%pI4"
62473+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
62474+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
62475+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
62476+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
62477+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
62478+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
62479+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
62480+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
62481+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
62482+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
62483+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
62484+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
62485+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
62486+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
62487+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
62488+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
62489+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
62490+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
62491+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
62492+#define GR_EXEC_TPE_MSG "denied untrusted exec of %.950s by "
62493+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
62494+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
62495+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
62496+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
62497+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
62498+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
62499+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
62500+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
62501+#define GR_FCHMOD_ACL_MSG "%s fchmod of %.950s by "
62502+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
62503+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
62504+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
62505+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
62506+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
62507+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
62508+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
62509+#define GR_DISABLED_ACL_MSG "Error loading %s, trying to run kernel with acls disabled. To disable acls at startup use <kernel image name> gracl=off from your boot loader"
62510+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbaged by "
62511+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
62512+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
62513+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
62514+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
62515+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
62516+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
62517+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
62518+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
62519+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
62520+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
62521+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
62522+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
62523+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
62524+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
62525+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
62526+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
62527+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
62528+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
62529+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
62530+#define GR_FAILFORK_MSG "failed fork with errno %s by "
62531+#define GR_NICE_CHROOT_MSG "denied priority change by "
62532+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
62533+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
62534+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
62535+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
62536+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
62537+#define GR_TIME_MSG "time set by "
62538+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
62539+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
62540+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
62541+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
62542+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
62543+#define GR_BIND_MSG "denied bind() by "
62544+#define GR_CONNECT_MSG "denied connect() by "
62545+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
62546+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
62547+#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%pI4\t%u\t%u\t%u\t%u\t%pI4"
62548+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
62549+#define GR_CAP_ACL_MSG "use of %s denied for "
62550+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
62551+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
62552+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
62553+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
62554+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
62555+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
62556+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
62557+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
62558+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
62559+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
62560+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
62561+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
62562+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
62563+#define GR_VM86_MSG "denied use of vm86 by "
62564+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
62565+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
62566diff -urNp linux-2.6.32.46/include/linux/grsecurity.h linux-2.6.32.46/include/linux/grsecurity.h
62567--- linux-2.6.32.46/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
62568+++ linux-2.6.32.46/include/linux/grsecurity.h 2011-09-13 16:03:42.000000000 -0400
62569@@ -0,0 +1,216 @@
62570+#ifndef GR_SECURITY_H
62571+#define GR_SECURITY_H
62572+#include <linux/fs.h>
62573+#include <linux/fs_struct.h>
62574+#include <linux/binfmts.h>
62575+#include <linux/gracl.h>
62576+#include <linux/compat.h>
62577+
62578+/* notify of brain-dead configs */
62579+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
62580+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
62581+#endif
62582+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
62583+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
62584+#endif
62585+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_EI_PAX) && !defined(CONFIG_PAX_PT_PAX_FLAGS)
62586+#error "CONFIG_PAX_NOEXEC enabled, but neither CONFIG_PAX_EI_PAX nor CONFIG_PAX_PT_PAX_FLAGS are enabled."
62587+#endif
62588+#if defined(CONFIG_PAX_ASLR) && (defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)) && !defined(CONFIG_PAX_EI_PAX) && !defined(CONFIG_PAX_PT_PAX_FLAGS)
62589+#error "CONFIG_PAX_ASLR enabled, but neither CONFIG_PAX_EI_PAX nor CONFIG_PAX_PT_PAX_FLAGS are enabled."
62590+#endif
62591+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
62592+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
62593+#endif
62594+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
62595+#error "CONFIG_PAX enabled, but no PaX options are enabled."
62596+#endif
62597+
62598+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
62599+void gr_handle_brute_check(void);
62600+void gr_handle_kernel_exploit(void);
62601+int gr_process_user_ban(void);
62602+
62603+char gr_roletype_to_char(void);
62604+
62605+int gr_acl_enable_at_secure(void);
62606+
62607+int gr_check_user_change(int real, int effective, int fs);
62608+int gr_check_group_change(int real, int effective, int fs);
62609+
62610+void gr_del_task_from_ip_table(struct task_struct *p);
62611+
62612+int gr_pid_is_chrooted(struct task_struct *p);
62613+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
62614+int gr_handle_chroot_nice(void);
62615+int gr_handle_chroot_sysctl(const int op);
62616+int gr_handle_chroot_setpriority(struct task_struct *p,
62617+ const int niceval);
62618+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
62619+int gr_handle_chroot_chroot(const struct dentry *dentry,
62620+ const struct vfsmount *mnt);
62621+void gr_handle_chroot_chdir(struct path *path);
62622+int gr_handle_chroot_chmod(const struct dentry *dentry,
62623+ const struct vfsmount *mnt, const int mode);
62624+int gr_handle_chroot_mknod(const struct dentry *dentry,
62625+ const struct vfsmount *mnt, const int mode);
62626+int gr_handle_chroot_mount(const struct dentry *dentry,
62627+ const struct vfsmount *mnt,
62628+ const char *dev_name);
62629+int gr_handle_chroot_pivot(void);
62630+int gr_handle_chroot_unix(const pid_t pid);
62631+
62632+int gr_handle_rawio(const struct inode *inode);
62633+
62634+void gr_handle_ioperm(void);
62635+void gr_handle_iopl(void);
62636+
62637+int gr_tpe_allow(const struct file *file);
62638+
62639+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
62640+void gr_clear_chroot_entries(struct task_struct *task);
62641+
62642+void gr_log_forkfail(const int retval);
62643+void gr_log_timechange(void);
62644+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
62645+void gr_log_chdir(const struct dentry *dentry,
62646+ const struct vfsmount *mnt);
62647+void gr_log_chroot_exec(const struct dentry *dentry,
62648+ const struct vfsmount *mnt);
62649+void gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv);
62650+#ifdef CONFIG_COMPAT
62651+void gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv);
62652+#endif
62653+void gr_log_remount(const char *devname, const int retval);
62654+void gr_log_unmount(const char *devname, const int retval);
62655+void gr_log_mount(const char *from, const char *to, const int retval);
62656+void gr_log_textrel(struct vm_area_struct *vma);
62657+void gr_log_rwxmmap(struct file *file);
62658+void gr_log_rwxmprotect(struct file *file);
62659+
62660+int gr_handle_follow_link(const struct inode *parent,
62661+ const struct inode *inode,
62662+ const struct dentry *dentry,
62663+ const struct vfsmount *mnt);
62664+int gr_handle_fifo(const struct dentry *dentry,
62665+ const struct vfsmount *mnt,
62666+ const struct dentry *dir, const int flag,
62667+ const int acc_mode);
62668+int gr_handle_hardlink(const struct dentry *dentry,
62669+ const struct vfsmount *mnt,
62670+ struct inode *inode,
62671+ const int mode, const char *to);
62672+
62673+int gr_is_capable(const int cap);
62674+int gr_is_capable_nolog(const int cap);
62675+void gr_learn_resource(const struct task_struct *task, const int limit,
62676+ const unsigned long wanted, const int gt);
62677+void gr_copy_label(struct task_struct *tsk);
62678+void gr_handle_crash(struct task_struct *task, const int sig);
62679+int gr_handle_signal(const struct task_struct *p, const int sig);
62680+int gr_check_crash_uid(const uid_t uid);
62681+int gr_check_protected_task(const struct task_struct *task);
62682+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
62683+int gr_acl_handle_mmap(const struct file *file,
62684+ const unsigned long prot);
62685+int gr_acl_handle_mprotect(const struct file *file,
62686+ const unsigned long prot);
62687+int gr_check_hidden_task(const struct task_struct *tsk);
62688+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
62689+ const struct vfsmount *mnt);
62690+__u32 gr_acl_handle_utime(const struct dentry *dentry,
62691+ const struct vfsmount *mnt);
62692+__u32 gr_acl_handle_access(const struct dentry *dentry,
62693+ const struct vfsmount *mnt, const int fmode);
62694+__u32 gr_acl_handle_fchmod(const struct dentry *dentry,
62695+ const struct vfsmount *mnt, mode_t mode);
62696+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
62697+ const struct vfsmount *mnt, mode_t mode);
62698+__u32 gr_acl_handle_chown(const struct dentry *dentry,
62699+ const struct vfsmount *mnt);
62700+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
62701+ const struct vfsmount *mnt);
62702+int gr_handle_ptrace(struct task_struct *task, const long request);
62703+int gr_handle_proc_ptrace(struct task_struct *task);
62704+__u32 gr_acl_handle_execve(const struct dentry *dentry,
62705+ const struct vfsmount *mnt);
62706+int gr_check_crash_exec(const struct file *filp);
62707+int gr_acl_is_enabled(void);
62708+void gr_set_kernel_label(struct task_struct *task);
62709+void gr_set_role_label(struct task_struct *task, const uid_t uid,
62710+ const gid_t gid);
62711+int gr_set_proc_label(const struct dentry *dentry,
62712+ const struct vfsmount *mnt,
62713+ const int unsafe_share);
62714+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
62715+ const struct vfsmount *mnt);
62716+__u32 gr_acl_handle_open(const struct dentry *dentry,
62717+ const struct vfsmount *mnt, const int fmode);
62718+__u32 gr_acl_handle_creat(const struct dentry *dentry,
62719+ const struct dentry *p_dentry,
62720+ const struct vfsmount *p_mnt, const int fmode,
62721+ const int imode);
62722+void gr_handle_create(const struct dentry *dentry,
62723+ const struct vfsmount *mnt);
62724+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
62725+ const struct dentry *parent_dentry,
62726+ const struct vfsmount *parent_mnt,
62727+ const int mode);
62728+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
62729+ const struct dentry *parent_dentry,
62730+ const struct vfsmount *parent_mnt);
62731+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
62732+ const struct vfsmount *mnt);
62733+void gr_handle_delete(const ino_t ino, const dev_t dev);
62734+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
62735+ const struct vfsmount *mnt);
62736+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
62737+ const struct dentry *parent_dentry,
62738+ const struct vfsmount *parent_mnt,
62739+ const char *from);
62740+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
62741+ const struct dentry *parent_dentry,
62742+ const struct vfsmount *parent_mnt,
62743+ const struct dentry *old_dentry,
62744+ const struct vfsmount *old_mnt, const char *to);
62745+int gr_acl_handle_rename(struct dentry *new_dentry,
62746+ struct dentry *parent_dentry,
62747+ const struct vfsmount *parent_mnt,
62748+ struct dentry *old_dentry,
62749+ struct inode *old_parent_inode,
62750+ struct vfsmount *old_mnt, const char *newname);
62751+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
62752+ struct dentry *old_dentry,
62753+ struct dentry *new_dentry,
62754+ struct vfsmount *mnt, const __u8 replace);
62755+__u32 gr_check_link(const struct dentry *new_dentry,
62756+ const struct dentry *parent_dentry,
62757+ const struct vfsmount *parent_mnt,
62758+ const struct dentry *old_dentry,
62759+ const struct vfsmount *old_mnt);
62760+int gr_acl_handle_filldir(const struct file *file, const char *name,
62761+ const unsigned int namelen, const ino_t ino);
62762+
62763+__u32 gr_acl_handle_unix(const struct dentry *dentry,
62764+ const struct vfsmount *mnt);
62765+void gr_acl_handle_exit(void);
62766+void gr_acl_handle_psacct(struct task_struct *task, const long code);
62767+int gr_acl_handle_procpidmem(const struct task_struct *task);
62768+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
62769+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
62770+void gr_audit_ptrace(struct task_struct *task);
62771+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
62772+
62773+#ifdef CONFIG_GRKERNSEC
62774+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
62775+void gr_handle_vm86(void);
62776+void gr_handle_mem_readwrite(u64 from, u64 to);
62777+
62778+extern int grsec_enable_dmesg;
62779+extern int grsec_disable_privio;
62780+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
62781+extern int grsec_enable_chroot_findtask;
62782+#endif
62783+#endif
62784+
62785+#endif
62786diff -urNp linux-2.6.32.46/include/linux/hdpu_features.h linux-2.6.32.46/include/linux/hdpu_features.h
62787--- linux-2.6.32.46/include/linux/hdpu_features.h 2011-03-27 14:31:47.000000000 -0400
62788+++ linux-2.6.32.46/include/linux/hdpu_features.h 2011-04-17 15:56:46.000000000 -0400
62789@@ -3,7 +3,7 @@
62790 struct cpustate_t {
62791 spinlock_t lock;
62792 int excl;
62793- int open_count;
62794+ atomic_t open_count;
62795 unsigned char cached_val;
62796 int inited;
62797 unsigned long *set_addr;
62798diff -urNp linux-2.6.32.46/include/linux/highmem.h linux-2.6.32.46/include/linux/highmem.h
62799--- linux-2.6.32.46/include/linux/highmem.h 2011-03-27 14:31:47.000000000 -0400
62800+++ linux-2.6.32.46/include/linux/highmem.h 2011-04-17 15:56:46.000000000 -0400
62801@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
62802 kunmap_atomic(kaddr, KM_USER0);
62803 }
62804
62805+static inline void sanitize_highpage(struct page *page)
62806+{
62807+ void *kaddr;
62808+ unsigned long flags;
62809+
62810+ local_irq_save(flags);
62811+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
62812+ clear_page(kaddr);
62813+ kunmap_atomic(kaddr, KM_CLEARPAGE);
62814+ local_irq_restore(flags);
62815+}
62816+
62817 static inline void zero_user_segments(struct page *page,
62818 unsigned start1, unsigned end1,
62819 unsigned start2, unsigned end2)
62820diff -urNp linux-2.6.32.46/include/linux/i2c.h linux-2.6.32.46/include/linux/i2c.h
62821--- linux-2.6.32.46/include/linux/i2c.h 2011-03-27 14:31:47.000000000 -0400
62822+++ linux-2.6.32.46/include/linux/i2c.h 2011-08-23 21:22:38.000000000 -0400
62823@@ -325,6 +325,7 @@ struct i2c_algorithm {
62824 /* To determine what the adapter supports */
62825 u32 (*functionality) (struct i2c_adapter *);
62826 };
62827+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
62828
62829 /*
62830 * i2c_adapter is the structure used to identify a physical i2c bus along
62831diff -urNp linux-2.6.32.46/include/linux/i2o.h linux-2.6.32.46/include/linux/i2o.h
62832--- linux-2.6.32.46/include/linux/i2o.h 2011-03-27 14:31:47.000000000 -0400
62833+++ linux-2.6.32.46/include/linux/i2o.h 2011-05-04 17:56:28.000000000 -0400
62834@@ -564,7 +564,7 @@ struct i2o_controller {
62835 struct i2o_device *exec; /* Executive */
62836 #if BITS_PER_LONG == 64
62837 spinlock_t context_list_lock; /* lock for context_list */
62838- atomic_t context_list_counter; /* needed for unique contexts */
62839+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
62840 struct list_head context_list; /* list of context id's
62841 and pointers */
62842 #endif
62843diff -urNp linux-2.6.32.46/include/linux/init_task.h linux-2.6.32.46/include/linux/init_task.h
62844--- linux-2.6.32.46/include/linux/init_task.h 2011-03-27 14:31:47.000000000 -0400
62845+++ linux-2.6.32.46/include/linux/init_task.h 2011-05-18 20:44:59.000000000 -0400
62846@@ -83,6 +83,12 @@ extern struct group_info init_groups;
62847 #define INIT_IDS
62848 #endif
62849
62850+#ifdef CONFIG_X86
62851+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
62852+#else
62853+#define INIT_TASK_THREAD_INFO
62854+#endif
62855+
62856 #ifdef CONFIG_SECURITY_FILE_CAPABILITIES
62857 /*
62858 * Because of the reduced scope of CAP_SETPCAP when filesystem
62859@@ -156,6 +162,7 @@ extern struct cred init_cred;
62860 __MUTEX_INITIALIZER(tsk.cred_guard_mutex), \
62861 .comm = "swapper", \
62862 .thread = INIT_THREAD, \
62863+ INIT_TASK_THREAD_INFO \
62864 .fs = &init_fs, \
62865 .files = &init_files, \
62866 .signal = &init_signals, \
62867diff -urNp linux-2.6.32.46/include/linux/intel-iommu.h linux-2.6.32.46/include/linux/intel-iommu.h
62868--- linux-2.6.32.46/include/linux/intel-iommu.h 2011-03-27 14:31:47.000000000 -0400
62869+++ linux-2.6.32.46/include/linux/intel-iommu.h 2011-08-05 20:33:55.000000000 -0400
62870@@ -296,7 +296,7 @@ struct iommu_flush {
62871 u8 fm, u64 type);
62872 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
62873 unsigned int size_order, u64 type);
62874-};
62875+} __no_const;
62876
62877 enum {
62878 SR_DMAR_FECTL_REG,
62879diff -urNp linux-2.6.32.46/include/linux/interrupt.h linux-2.6.32.46/include/linux/interrupt.h
62880--- linux-2.6.32.46/include/linux/interrupt.h 2011-06-25 12:55:35.000000000 -0400
62881+++ linux-2.6.32.46/include/linux/interrupt.h 2011-06-25 12:56:37.000000000 -0400
62882@@ -363,7 +363,7 @@ enum
62883 /* map softirq index to softirq name. update 'softirq_to_name' in
62884 * kernel/softirq.c when adding a new softirq.
62885 */
62886-extern char *softirq_to_name[NR_SOFTIRQS];
62887+extern const char * const softirq_to_name[NR_SOFTIRQS];
62888
62889 /* softirq mask and active fields moved to irq_cpustat_t in
62890 * asm/hardirq.h to get better cache usage. KAO
62891@@ -371,12 +371,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
62892
62893 struct softirq_action
62894 {
62895- void (*action)(struct softirq_action *);
62896+ void (*action)(void);
62897 };
62898
62899 asmlinkage void do_softirq(void);
62900 asmlinkage void __do_softirq(void);
62901-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
62902+extern void open_softirq(int nr, void (*action)(void));
62903 extern void softirq_init(void);
62904 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
62905 extern void raise_softirq_irqoff(unsigned int nr);
62906diff -urNp linux-2.6.32.46/include/linux/irq.h linux-2.6.32.46/include/linux/irq.h
62907--- linux-2.6.32.46/include/linux/irq.h 2011-03-27 14:31:47.000000000 -0400
62908+++ linux-2.6.32.46/include/linux/irq.h 2011-04-17 15:56:46.000000000 -0400
62909@@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq,
62910 static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
62911 bool boot)
62912 {
62913+#ifdef CONFIG_CPUMASK_OFFSTACK
62914 gfp_t gfp = GFP_ATOMIC;
62915
62916 if (boot)
62917 gfp = GFP_NOWAIT;
62918
62919-#ifdef CONFIG_CPUMASK_OFFSTACK
62920 if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
62921 return false;
62922
62923diff -urNp linux-2.6.32.46/include/linux/kallsyms.h linux-2.6.32.46/include/linux/kallsyms.h
62924--- linux-2.6.32.46/include/linux/kallsyms.h 2011-03-27 14:31:47.000000000 -0400
62925+++ linux-2.6.32.46/include/linux/kallsyms.h 2011-04-17 15:56:46.000000000 -0400
62926@@ -15,7 +15,8 @@
62927
62928 struct module;
62929
62930-#ifdef CONFIG_KALLSYMS
62931+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
62932+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
62933 /* Lookup the address for a symbol. Returns 0 if not found. */
62934 unsigned long kallsyms_lookup_name(const char *name);
62935
62936@@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(un
62937 /* Stupid that this does nothing, but I didn't create this mess. */
62938 #define __print_symbol(fmt, addr)
62939 #endif /*CONFIG_KALLSYMS*/
62940+#else /* when included by kallsyms.c, vsnprintf.c, or
62941+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
62942+extern void __print_symbol(const char *fmt, unsigned long address);
62943+extern int sprint_symbol(char *buffer, unsigned long address);
62944+const char *kallsyms_lookup(unsigned long addr,
62945+ unsigned long *symbolsize,
62946+ unsigned long *offset,
62947+ char **modname, char *namebuf);
62948+#endif
62949
62950 /* This macro allows us to keep printk typechecking */
62951 static void __check_printsym_format(const char *fmt, ...)
62952diff -urNp linux-2.6.32.46/include/linux/kgdb.h linux-2.6.32.46/include/linux/kgdb.h
62953--- linux-2.6.32.46/include/linux/kgdb.h 2011-03-27 14:31:47.000000000 -0400
62954+++ linux-2.6.32.46/include/linux/kgdb.h 2011-08-26 20:25:20.000000000 -0400
62955@@ -74,8 +74,8 @@ void kgdb_breakpoint(void);
62956
62957 extern int kgdb_connected;
62958
62959-extern atomic_t kgdb_setting_breakpoint;
62960-extern atomic_t kgdb_cpu_doing_single_step;
62961+extern atomic_unchecked_t kgdb_setting_breakpoint;
62962+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
62963
62964 extern struct task_struct *kgdb_usethread;
62965 extern struct task_struct *kgdb_contthread;
62966@@ -235,7 +235,7 @@ struct kgdb_arch {
62967 int (*remove_hw_breakpoint)(unsigned long, int, enum kgdb_bptype);
62968 void (*remove_all_hw_break)(void);
62969 void (*correct_hw_break)(void);
62970-};
62971+} __do_const;
62972
62973 /**
62974 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
62975@@ -257,14 +257,14 @@ struct kgdb_io {
62976 int (*init) (void);
62977 void (*pre_exception) (void);
62978 void (*post_exception) (void);
62979-};
62980+} __do_const;
62981
62982-extern struct kgdb_arch arch_kgdb_ops;
62983+extern const struct kgdb_arch arch_kgdb_ops;
62984
62985 extern unsigned long __weak kgdb_arch_pc(int exception, struct pt_regs *regs);
62986
62987-extern int kgdb_register_io_module(struct kgdb_io *local_kgdb_io_ops);
62988-extern void kgdb_unregister_io_module(struct kgdb_io *local_kgdb_io_ops);
62989+extern int kgdb_register_io_module(const struct kgdb_io *local_kgdb_io_ops);
62990+extern void kgdb_unregister_io_module(const struct kgdb_io *local_kgdb_io_ops);
62991
62992 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
62993 extern int kgdb_mem2hex(char *mem, char *buf, int count);
62994diff -urNp linux-2.6.32.46/include/linux/kmod.h linux-2.6.32.46/include/linux/kmod.h
62995--- linux-2.6.32.46/include/linux/kmod.h 2011-03-27 14:31:47.000000000 -0400
62996+++ linux-2.6.32.46/include/linux/kmod.h 2011-04-17 15:56:46.000000000 -0400
62997@@ -31,6 +31,8 @@
62998 * usually useless though. */
62999 extern int __request_module(bool wait, const char *name, ...) \
63000 __attribute__((format(printf, 2, 3)));
63001+extern int ___request_module(bool wait, char *param_name, const char *name, ...) \
63002+ __attribute__((format(printf, 3, 4)));
63003 #define request_module(mod...) __request_module(true, mod)
63004 #define request_module_nowait(mod...) __request_module(false, mod)
63005 #define try_then_request_module(x, mod...) \
63006diff -urNp linux-2.6.32.46/include/linux/kobject.h linux-2.6.32.46/include/linux/kobject.h
63007--- linux-2.6.32.46/include/linux/kobject.h 2011-03-27 14:31:47.000000000 -0400
63008+++ linux-2.6.32.46/include/linux/kobject.h 2011-04-17 15:56:46.000000000 -0400
63009@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
63010
63011 struct kobj_type {
63012 void (*release)(struct kobject *kobj);
63013- struct sysfs_ops *sysfs_ops;
63014+ const struct sysfs_ops *sysfs_ops;
63015 struct attribute **default_attrs;
63016 };
63017
63018@@ -118,9 +118,9 @@ struct kobj_uevent_env {
63019 };
63020
63021 struct kset_uevent_ops {
63022- int (*filter)(struct kset *kset, struct kobject *kobj);
63023- const char *(*name)(struct kset *kset, struct kobject *kobj);
63024- int (*uevent)(struct kset *kset, struct kobject *kobj,
63025+ int (* const filter)(struct kset *kset, struct kobject *kobj);
63026+ const char *(* const name)(struct kset *kset, struct kobject *kobj);
63027+ int (* const uevent)(struct kset *kset, struct kobject *kobj,
63028 struct kobj_uevent_env *env);
63029 };
63030
63031@@ -132,7 +132,7 @@ struct kobj_attribute {
63032 const char *buf, size_t count);
63033 };
63034
63035-extern struct sysfs_ops kobj_sysfs_ops;
63036+extern const struct sysfs_ops kobj_sysfs_ops;
63037
63038 /**
63039 * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
63040@@ -155,14 +155,14 @@ struct kset {
63041 struct list_head list;
63042 spinlock_t list_lock;
63043 struct kobject kobj;
63044- struct kset_uevent_ops *uevent_ops;
63045+ const struct kset_uevent_ops *uevent_ops;
63046 };
63047
63048 extern void kset_init(struct kset *kset);
63049 extern int __must_check kset_register(struct kset *kset);
63050 extern void kset_unregister(struct kset *kset);
63051 extern struct kset * __must_check kset_create_and_add(const char *name,
63052- struct kset_uevent_ops *u,
63053+ const struct kset_uevent_ops *u,
63054 struct kobject *parent_kobj);
63055
63056 static inline struct kset *to_kset(struct kobject *kobj)
63057diff -urNp linux-2.6.32.46/include/linux/kvm_host.h linux-2.6.32.46/include/linux/kvm_host.h
63058--- linux-2.6.32.46/include/linux/kvm_host.h 2011-03-27 14:31:47.000000000 -0400
63059+++ linux-2.6.32.46/include/linux/kvm_host.h 2011-04-17 15:56:46.000000000 -0400
63060@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
63061 void vcpu_load(struct kvm_vcpu *vcpu);
63062 void vcpu_put(struct kvm_vcpu *vcpu);
63063
63064-int kvm_init(void *opaque, unsigned int vcpu_size,
63065+int kvm_init(const void *opaque, unsigned int vcpu_size,
63066 struct module *module);
63067 void kvm_exit(void);
63068
63069@@ -316,7 +316,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
63070 struct kvm_guest_debug *dbg);
63071 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
63072
63073-int kvm_arch_init(void *opaque);
63074+int kvm_arch_init(const void *opaque);
63075 void kvm_arch_exit(void);
63076
63077 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
63078diff -urNp linux-2.6.32.46/include/linux/libata.h linux-2.6.32.46/include/linux/libata.h
63079--- linux-2.6.32.46/include/linux/libata.h 2011-03-27 14:31:47.000000000 -0400
63080+++ linux-2.6.32.46/include/linux/libata.h 2011-08-26 20:19:09.000000000 -0400
63081@@ -525,11 +525,11 @@ struct ata_ioports {
63082
63083 struct ata_host {
63084 spinlock_t lock;
63085- struct device *dev;
63086+ struct device *dev;
63087 void __iomem * const *iomap;
63088 unsigned int n_ports;
63089 void *private_data;
63090- struct ata_port_operations *ops;
63091+ const struct ata_port_operations *ops;
63092 unsigned long flags;
63093 #ifdef CONFIG_ATA_ACPI
63094 acpi_handle acpi_handle;
63095@@ -710,7 +710,7 @@ struct ata_link {
63096
63097 struct ata_port {
63098 struct Scsi_Host *scsi_host; /* our co-allocated scsi host */
63099- struct ata_port_operations *ops;
63100+ const struct ata_port_operations *ops;
63101 spinlock_t *lock;
63102 /* Flags owned by the EH context. Only EH should touch these once the
63103 port is active */
63104@@ -884,7 +884,7 @@ struct ata_port_operations {
63105 * fields must be pointers.
63106 */
63107 const struct ata_port_operations *inherits;
63108-};
63109+} __do_const;
63110
63111 struct ata_port_info {
63112 unsigned long flags;
63113@@ -892,7 +892,7 @@ struct ata_port_info {
63114 unsigned long pio_mask;
63115 unsigned long mwdma_mask;
63116 unsigned long udma_mask;
63117- struct ata_port_operations *port_ops;
63118+ const struct ata_port_operations *port_ops;
63119 void *private_data;
63120 };
63121
63122@@ -916,7 +916,7 @@ extern const unsigned long sata_deb_timi
63123 extern const unsigned long sata_deb_timing_hotplug[];
63124 extern const unsigned long sata_deb_timing_long[];
63125
63126-extern struct ata_port_operations ata_dummy_port_ops;
63127+extern const struct ata_port_operations ata_dummy_port_ops;
63128 extern const struct ata_port_info ata_dummy_port_info;
63129
63130 static inline const unsigned long *
63131@@ -962,7 +962,7 @@ extern int ata_host_activate(struct ata_
63132 struct scsi_host_template *sht);
63133 extern void ata_host_detach(struct ata_host *host);
63134 extern void ata_host_init(struct ata_host *, struct device *,
63135- unsigned long, struct ata_port_operations *);
63136+ unsigned long, const struct ata_port_operations *);
63137 extern int ata_scsi_detect(struct scsi_host_template *sht);
63138 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
63139 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
63140diff -urNp linux-2.6.32.46/include/linux/lockd/bind.h linux-2.6.32.46/include/linux/lockd/bind.h
63141--- linux-2.6.32.46/include/linux/lockd/bind.h 2011-03-27 14:31:47.000000000 -0400
63142+++ linux-2.6.32.46/include/linux/lockd/bind.h 2011-04-17 15:56:46.000000000 -0400
63143@@ -23,13 +23,13 @@ struct svc_rqst;
63144 * This is the set of functions for lockd->nfsd communication
63145 */
63146 struct nlmsvc_binding {
63147- __be32 (*fopen)(struct svc_rqst *,
63148+ __be32 (* const fopen)(struct svc_rqst *,
63149 struct nfs_fh *,
63150 struct file **);
63151- void (*fclose)(struct file *);
63152+ void (* const fclose)(struct file *);
63153 };
63154
63155-extern struct nlmsvc_binding * nlmsvc_ops;
63156+extern const struct nlmsvc_binding * nlmsvc_ops;
63157
63158 /*
63159 * Similar to nfs_client_initdata, but without the NFS-specific
63160diff -urNp linux-2.6.32.46/include/linux/mca.h linux-2.6.32.46/include/linux/mca.h
63161--- linux-2.6.32.46/include/linux/mca.h 2011-03-27 14:31:47.000000000 -0400
63162+++ linux-2.6.32.46/include/linux/mca.h 2011-08-05 20:33:55.000000000 -0400
63163@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
63164 int region);
63165 void * (*mca_transform_memory)(struct mca_device *,
63166 void *memory);
63167-};
63168+} __no_const;
63169
63170 struct mca_bus {
63171 u64 default_dma_mask;
63172diff -urNp linux-2.6.32.46/include/linux/memory.h linux-2.6.32.46/include/linux/memory.h
63173--- linux-2.6.32.46/include/linux/memory.h 2011-03-27 14:31:47.000000000 -0400
63174+++ linux-2.6.32.46/include/linux/memory.h 2011-08-05 20:33:55.000000000 -0400
63175@@ -108,7 +108,7 @@ struct memory_accessor {
63176 size_t count);
63177 ssize_t (*write)(struct memory_accessor *, const char *buf,
63178 off_t offset, size_t count);
63179-};
63180+} __no_const;
63181
63182 /*
63183 * Kernel text modification mutex, used for code patching. Users of this lock
63184diff -urNp linux-2.6.32.46/include/linux/mm.h linux-2.6.32.46/include/linux/mm.h
63185--- linux-2.6.32.46/include/linux/mm.h 2011-03-27 14:31:47.000000000 -0400
63186+++ linux-2.6.32.46/include/linux/mm.h 2011-04-17 15:56:46.000000000 -0400
63187@@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void
63188
63189 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
63190 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
63191+
63192+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
63193+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
63194+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
63195+#else
63196 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
63197+#endif
63198+
63199 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
63200 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
63201
63202@@ -841,12 +848,6 @@ int set_page_dirty(struct page *page);
63203 int set_page_dirty_lock(struct page *page);
63204 int clear_page_dirty_for_io(struct page *page);
63205
63206-/* Is the vma a continuation of the stack vma above it? */
63207-static inline int vma_stack_continue(struct vm_area_struct *vma, unsigned long addr)
63208-{
63209- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
63210-}
63211-
63212 extern unsigned long move_page_tables(struct vm_area_struct *vma,
63213 unsigned long old_addr, struct vm_area_struct *new_vma,
63214 unsigned long new_addr, unsigned long len);
63215@@ -890,6 +891,8 @@ struct shrinker {
63216 extern void register_shrinker(struct shrinker *);
63217 extern void unregister_shrinker(struct shrinker *);
63218
63219+pgprot_t vm_get_page_prot(unsigned long vm_flags);
63220+
63221 int vma_wants_writenotify(struct vm_area_struct *vma);
63222
63223 extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
63224@@ -1162,6 +1165,7 @@ out:
63225 }
63226
63227 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
63228+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
63229
63230 extern unsigned long do_brk(unsigned long, unsigned long);
63231
63232@@ -1218,6 +1222,10 @@ extern struct vm_area_struct * find_vma(
63233 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
63234 struct vm_area_struct **pprev);
63235
63236+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
63237+extern void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
63238+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
63239+
63240 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
63241 NULL if none. Assume start_addr < end_addr. */
63242 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
63243@@ -1234,7 +1242,6 @@ static inline unsigned long vma_pages(st
63244 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
63245 }
63246
63247-pgprot_t vm_get_page_prot(unsigned long vm_flags);
63248 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
63249 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
63250 unsigned long pfn, unsigned long size, pgprot_t);
63251@@ -1332,7 +1339,13 @@ extern void memory_failure(unsigned long
63252 extern int __memory_failure(unsigned long pfn, int trapno, int ref);
63253 extern int sysctl_memory_failure_early_kill;
63254 extern int sysctl_memory_failure_recovery;
63255-extern atomic_long_t mce_bad_pages;
63256+extern atomic_long_unchecked_t mce_bad_pages;
63257+
63258+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
63259+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
63260+#else
63261+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
63262+#endif
63263
63264 #endif /* __KERNEL__ */
63265 #endif /* _LINUX_MM_H */
63266diff -urNp linux-2.6.32.46/include/linux/mm_types.h linux-2.6.32.46/include/linux/mm_types.h
63267--- linux-2.6.32.46/include/linux/mm_types.h 2011-03-27 14:31:47.000000000 -0400
63268+++ linux-2.6.32.46/include/linux/mm_types.h 2011-04-17 15:56:46.000000000 -0400
63269@@ -186,6 +186,8 @@ struct vm_area_struct {
63270 #ifdef CONFIG_NUMA
63271 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
63272 #endif
63273+
63274+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
63275 };
63276
63277 struct core_thread {
63278@@ -287,6 +289,24 @@ struct mm_struct {
63279 #ifdef CONFIG_MMU_NOTIFIER
63280 struct mmu_notifier_mm *mmu_notifier_mm;
63281 #endif
63282+
63283+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63284+ unsigned long pax_flags;
63285+#endif
63286+
63287+#ifdef CONFIG_PAX_DLRESOLVE
63288+ unsigned long call_dl_resolve;
63289+#endif
63290+
63291+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
63292+ unsigned long call_syscall;
63293+#endif
63294+
63295+#ifdef CONFIG_PAX_ASLR
63296+ unsigned long delta_mmap; /* randomized offset */
63297+ unsigned long delta_stack; /* randomized offset */
63298+#endif
63299+
63300 };
63301
63302 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
63303diff -urNp linux-2.6.32.46/include/linux/mmu_notifier.h linux-2.6.32.46/include/linux/mmu_notifier.h
63304--- linux-2.6.32.46/include/linux/mmu_notifier.h 2011-03-27 14:31:47.000000000 -0400
63305+++ linux-2.6.32.46/include/linux/mmu_notifier.h 2011-04-17 15:56:46.000000000 -0400
63306@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
63307 */
63308 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
63309 ({ \
63310- pte_t __pte; \
63311+ pte_t ___pte; \
63312 struct vm_area_struct *___vma = __vma; \
63313 unsigned long ___address = __address; \
63314- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
63315+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
63316 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
63317- __pte; \
63318+ ___pte; \
63319 })
63320
63321 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
63322diff -urNp linux-2.6.32.46/include/linux/mmzone.h linux-2.6.32.46/include/linux/mmzone.h
63323--- linux-2.6.32.46/include/linux/mmzone.h 2011-03-27 14:31:47.000000000 -0400
63324+++ linux-2.6.32.46/include/linux/mmzone.h 2011-04-17 15:56:46.000000000 -0400
63325@@ -350,7 +350,7 @@ struct zone {
63326 unsigned long flags; /* zone flags, see below */
63327
63328 /* Zone statistics */
63329- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
63330+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
63331
63332 /*
63333 * prev_priority holds the scanning priority for this zone. It is
63334diff -urNp linux-2.6.32.46/include/linux/mod_devicetable.h linux-2.6.32.46/include/linux/mod_devicetable.h
63335--- linux-2.6.32.46/include/linux/mod_devicetable.h 2011-03-27 14:31:47.000000000 -0400
63336+++ linux-2.6.32.46/include/linux/mod_devicetable.h 2011-04-17 15:56:46.000000000 -0400
63337@@ -12,7 +12,7 @@
63338 typedef unsigned long kernel_ulong_t;
63339 #endif
63340
63341-#define PCI_ANY_ID (~0)
63342+#define PCI_ANY_ID ((__u16)~0)
63343
63344 struct pci_device_id {
63345 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
63346@@ -131,7 +131,7 @@ struct usb_device_id {
63347 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
63348 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
63349
63350-#define HID_ANY_ID (~0)
63351+#define HID_ANY_ID (~0U)
63352
63353 struct hid_device_id {
63354 __u16 bus;
63355diff -urNp linux-2.6.32.46/include/linux/module.h linux-2.6.32.46/include/linux/module.h
63356--- linux-2.6.32.46/include/linux/module.h 2011-03-27 14:31:47.000000000 -0400
63357+++ linux-2.6.32.46/include/linux/module.h 2011-08-05 20:33:55.000000000 -0400
63358@@ -16,6 +16,7 @@
63359 #include <linux/kobject.h>
63360 #include <linux/moduleparam.h>
63361 #include <linux/tracepoint.h>
63362+#include <linux/fs.h>
63363
63364 #include <asm/local.h>
63365 #include <asm/module.h>
63366@@ -287,16 +288,16 @@ struct module
63367 int (*init)(void);
63368
63369 /* If this is non-NULL, vfree after init() returns */
63370- void *module_init;
63371+ void *module_init_rx, *module_init_rw;
63372
63373 /* Here is the actual code + data, vfree'd on unload. */
63374- void *module_core;
63375+ void *module_core_rx, *module_core_rw;
63376
63377 /* Here are the sizes of the init and core sections */
63378- unsigned int init_size, core_size;
63379+ unsigned int init_size_rw, core_size_rw;
63380
63381 /* The size of the executable code in each section. */
63382- unsigned int init_text_size, core_text_size;
63383+ unsigned int init_size_rx, core_size_rx;
63384
63385 /* Arch-specific module values */
63386 struct mod_arch_specific arch;
63387@@ -345,6 +346,10 @@ struct module
63388 #ifdef CONFIG_EVENT_TRACING
63389 struct ftrace_event_call *trace_events;
63390 unsigned int num_trace_events;
63391+ struct file_operations trace_id;
63392+ struct file_operations trace_enable;
63393+ struct file_operations trace_format;
63394+ struct file_operations trace_filter;
63395 #endif
63396 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
63397 unsigned long *ftrace_callsites;
63398@@ -393,16 +398,46 @@ struct module *__module_address(unsigned
63399 bool is_module_address(unsigned long addr);
63400 bool is_module_text_address(unsigned long addr);
63401
63402+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
63403+{
63404+
63405+#ifdef CONFIG_PAX_KERNEXEC
63406+ if (ktla_ktva(addr) >= (unsigned long)start &&
63407+ ktla_ktva(addr) < (unsigned long)start + size)
63408+ return 1;
63409+#endif
63410+
63411+ return ((void *)addr >= start && (void *)addr < start + size);
63412+}
63413+
63414+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
63415+{
63416+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
63417+}
63418+
63419+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
63420+{
63421+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
63422+}
63423+
63424+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
63425+{
63426+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
63427+}
63428+
63429+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
63430+{
63431+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
63432+}
63433+
63434 static inline int within_module_core(unsigned long addr, struct module *mod)
63435 {
63436- return (unsigned long)mod->module_core <= addr &&
63437- addr < (unsigned long)mod->module_core + mod->core_size;
63438+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
63439 }
63440
63441 static inline int within_module_init(unsigned long addr, struct module *mod)
63442 {
63443- return (unsigned long)mod->module_init <= addr &&
63444- addr < (unsigned long)mod->module_init + mod->init_size;
63445+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
63446 }
63447
63448 /* Search for module by name: must hold module_mutex. */
63449diff -urNp linux-2.6.32.46/include/linux/moduleloader.h linux-2.6.32.46/include/linux/moduleloader.h
63450--- linux-2.6.32.46/include/linux/moduleloader.h 2011-03-27 14:31:47.000000000 -0400
63451+++ linux-2.6.32.46/include/linux/moduleloader.h 2011-04-17 15:56:46.000000000 -0400
63452@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
63453 sections. Returns NULL on failure. */
63454 void *module_alloc(unsigned long size);
63455
63456+#ifdef CONFIG_PAX_KERNEXEC
63457+void *module_alloc_exec(unsigned long size);
63458+#else
63459+#define module_alloc_exec(x) module_alloc(x)
63460+#endif
63461+
63462 /* Free memory returned from module_alloc. */
63463 void module_free(struct module *mod, void *module_region);
63464
63465+#ifdef CONFIG_PAX_KERNEXEC
63466+void module_free_exec(struct module *mod, void *module_region);
63467+#else
63468+#define module_free_exec(x, y) module_free((x), (y))
63469+#endif
63470+
63471 /* Apply the given relocation to the (simplified) ELF. Return -error
63472 or 0. */
63473 int apply_relocate(Elf_Shdr *sechdrs,
63474diff -urNp linux-2.6.32.46/include/linux/moduleparam.h linux-2.6.32.46/include/linux/moduleparam.h
63475--- linux-2.6.32.46/include/linux/moduleparam.h 2011-03-27 14:31:47.000000000 -0400
63476+++ linux-2.6.32.46/include/linux/moduleparam.h 2011-04-17 15:56:46.000000000 -0400
63477@@ -132,7 +132,7 @@ struct kparam_array
63478
63479 /* Actually copy string: maxlen param is usually sizeof(string). */
63480 #define module_param_string(name, string, len, perm) \
63481- static const struct kparam_string __param_string_##name \
63482+ static const struct kparam_string __param_string_##name __used \
63483 = { len, string }; \
63484 __module_param_call(MODULE_PARAM_PREFIX, name, \
63485 param_set_copystring, param_get_string, \
63486@@ -211,7 +211,7 @@ extern int param_get_invbool(char *buffe
63487
63488 /* Comma-separated array: *nump is set to number they actually specified. */
63489 #define module_param_array_named(name, array, type, nump, perm) \
63490- static const struct kparam_array __param_arr_##name \
63491+ static const struct kparam_array __param_arr_##name __used \
63492 = { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
63493 sizeof(array[0]), array }; \
63494 __module_param_call(MODULE_PARAM_PREFIX, name, \
63495diff -urNp linux-2.6.32.46/include/linux/mutex.h linux-2.6.32.46/include/linux/mutex.h
63496--- linux-2.6.32.46/include/linux/mutex.h 2011-03-27 14:31:47.000000000 -0400
63497+++ linux-2.6.32.46/include/linux/mutex.h 2011-04-17 15:56:46.000000000 -0400
63498@@ -51,7 +51,7 @@ struct mutex {
63499 spinlock_t wait_lock;
63500 struct list_head wait_list;
63501 #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
63502- struct thread_info *owner;
63503+ struct task_struct *owner;
63504 #endif
63505 #ifdef CONFIG_DEBUG_MUTEXES
63506 const char *name;
63507diff -urNp linux-2.6.32.46/include/linux/namei.h linux-2.6.32.46/include/linux/namei.h
63508--- linux-2.6.32.46/include/linux/namei.h 2011-03-27 14:31:47.000000000 -0400
63509+++ linux-2.6.32.46/include/linux/namei.h 2011-04-17 15:56:46.000000000 -0400
63510@@ -22,7 +22,7 @@ struct nameidata {
63511 unsigned int flags;
63512 int last_type;
63513 unsigned depth;
63514- char *saved_names[MAX_NESTED_LINKS + 1];
63515+ const char *saved_names[MAX_NESTED_LINKS + 1];
63516
63517 /* Intent data */
63518 union {
63519@@ -84,12 +84,12 @@ extern int follow_up(struct path *);
63520 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
63521 extern void unlock_rename(struct dentry *, struct dentry *);
63522
63523-static inline void nd_set_link(struct nameidata *nd, char *path)
63524+static inline void nd_set_link(struct nameidata *nd, const char *path)
63525 {
63526 nd->saved_names[nd->depth] = path;
63527 }
63528
63529-static inline char *nd_get_link(struct nameidata *nd)
63530+static inline const char *nd_get_link(const struct nameidata *nd)
63531 {
63532 return nd->saved_names[nd->depth];
63533 }
63534diff -urNp linux-2.6.32.46/include/linux/netdevice.h linux-2.6.32.46/include/linux/netdevice.h
63535--- linux-2.6.32.46/include/linux/netdevice.h 2011-08-09 18:35:30.000000000 -0400
63536+++ linux-2.6.32.46/include/linux/netdevice.h 2011-08-23 21:22:38.000000000 -0400
63537@@ -637,6 +637,7 @@ struct net_device_ops {
63538 u16 xid);
63539 #endif
63540 };
63541+typedef struct net_device_ops __no_const net_device_ops_no_const;
63542
63543 /*
63544 * The DEVICE structure.
63545diff -urNp linux-2.6.32.46/include/linux/netfilter/xt_gradm.h linux-2.6.32.46/include/linux/netfilter/xt_gradm.h
63546--- linux-2.6.32.46/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
63547+++ linux-2.6.32.46/include/linux/netfilter/xt_gradm.h 2011-04-17 15:56:46.000000000 -0400
63548@@ -0,0 +1,9 @@
63549+#ifndef _LINUX_NETFILTER_XT_GRADM_H
63550+#define _LINUX_NETFILTER_XT_GRADM_H 1
63551+
63552+struct xt_gradm_mtinfo {
63553+ __u16 flags;
63554+ __u16 invflags;
63555+};
63556+
63557+#endif
63558diff -urNp linux-2.6.32.46/include/linux/nodemask.h linux-2.6.32.46/include/linux/nodemask.h
63559--- linux-2.6.32.46/include/linux/nodemask.h 2011-03-27 14:31:47.000000000 -0400
63560+++ linux-2.6.32.46/include/linux/nodemask.h 2011-04-17 15:56:46.000000000 -0400
63561@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
63562
63563 #define any_online_node(mask) \
63564 ({ \
63565- int node; \
63566- for_each_node_mask(node, (mask)) \
63567- if (node_online(node)) \
63568+ int __node; \
63569+ for_each_node_mask(__node, (mask)) \
63570+ if (node_online(__node)) \
63571 break; \
63572- node; \
63573+ __node; \
63574 })
63575
63576 #define num_online_nodes() num_node_state(N_ONLINE)
63577diff -urNp linux-2.6.32.46/include/linux/oprofile.h linux-2.6.32.46/include/linux/oprofile.h
63578--- linux-2.6.32.46/include/linux/oprofile.h 2011-03-27 14:31:47.000000000 -0400
63579+++ linux-2.6.32.46/include/linux/oprofile.h 2011-04-17 15:56:46.000000000 -0400
63580@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
63581 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
63582 char const * name, ulong * val);
63583
63584-/** Create a file for read-only access to an atomic_t. */
63585+/** Create a file for read-only access to an atomic_unchecked_t. */
63586 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
63587- char const * name, atomic_t * val);
63588+ char const * name, atomic_unchecked_t * val);
63589
63590 /** create a directory */
63591 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
63592diff -urNp linux-2.6.32.46/include/linux/pagemap.h linux-2.6.32.46/include/linux/pagemap.h
63593--- linux-2.6.32.46/include/linux/pagemap.h 2011-03-27 14:31:47.000000000 -0400
63594+++ linux-2.6.32.46/include/linux/pagemap.h 2011-08-17 19:36:28.000000000 -0400
63595@@ -425,6 +425,7 @@ static inline int fault_in_pages_readabl
63596 if (((unsigned long)uaddr & PAGE_MASK) !=
63597 ((unsigned long)end & PAGE_MASK))
63598 ret = __get_user(c, end);
63599+ (void)c;
63600 }
63601 return ret;
63602 }
63603diff -urNp linux-2.6.32.46/include/linux/perf_event.h linux-2.6.32.46/include/linux/perf_event.h
63604--- linux-2.6.32.46/include/linux/perf_event.h 2011-03-27 14:31:47.000000000 -0400
63605+++ linux-2.6.32.46/include/linux/perf_event.h 2011-05-04 17:56:28.000000000 -0400
63606@@ -476,7 +476,7 @@ struct hw_perf_event {
63607 struct hrtimer hrtimer;
63608 };
63609 };
63610- atomic64_t prev_count;
63611+ atomic64_unchecked_t prev_count;
63612 u64 sample_period;
63613 u64 last_period;
63614 atomic64_t period_left;
63615@@ -557,7 +557,7 @@ struct perf_event {
63616 const struct pmu *pmu;
63617
63618 enum perf_event_active_state state;
63619- atomic64_t count;
63620+ atomic64_unchecked_t count;
63621
63622 /*
63623 * These are the total time in nanoseconds that the event
63624@@ -595,8 +595,8 @@ struct perf_event {
63625 * These accumulate total time (in nanoseconds) that children
63626 * events have been enabled and running, respectively.
63627 */
63628- atomic64_t child_total_time_enabled;
63629- atomic64_t child_total_time_running;
63630+ atomic64_unchecked_t child_total_time_enabled;
63631+ atomic64_unchecked_t child_total_time_running;
63632
63633 /*
63634 * Protect attach/detach and child_list:
63635diff -urNp linux-2.6.32.46/include/linux/pipe_fs_i.h linux-2.6.32.46/include/linux/pipe_fs_i.h
63636--- linux-2.6.32.46/include/linux/pipe_fs_i.h 2011-03-27 14:31:47.000000000 -0400
63637+++ linux-2.6.32.46/include/linux/pipe_fs_i.h 2011-04-17 15:56:46.000000000 -0400
63638@@ -46,9 +46,9 @@ struct pipe_inode_info {
63639 wait_queue_head_t wait;
63640 unsigned int nrbufs, curbuf;
63641 struct page *tmp_page;
63642- unsigned int readers;
63643- unsigned int writers;
63644- unsigned int waiting_writers;
63645+ atomic_t readers;
63646+ atomic_t writers;
63647+ atomic_t waiting_writers;
63648 unsigned int r_counter;
63649 unsigned int w_counter;
63650 struct fasync_struct *fasync_readers;
63651diff -urNp linux-2.6.32.46/include/linux/poison.h linux-2.6.32.46/include/linux/poison.h
63652--- linux-2.6.32.46/include/linux/poison.h 2011-03-27 14:31:47.000000000 -0400
63653+++ linux-2.6.32.46/include/linux/poison.h 2011-04-17 15:56:46.000000000 -0400
63654@@ -19,8 +19,8 @@
63655 * under normal circumstances, used to verify that nobody uses
63656 * non-initialized list entries.
63657 */
63658-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
63659-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
63660+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
63661+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
63662
63663 /********** include/linux/timer.h **********/
63664 /*
63665diff -urNp linux-2.6.32.46/include/linux/posix-timers.h linux-2.6.32.46/include/linux/posix-timers.h
63666--- linux-2.6.32.46/include/linux/posix-timers.h 2011-03-27 14:31:47.000000000 -0400
63667+++ linux-2.6.32.46/include/linux/posix-timers.h 2011-08-05 20:33:55.000000000 -0400
63668@@ -67,7 +67,7 @@ struct k_itimer {
63669 };
63670
63671 struct k_clock {
63672- int res; /* in nanoseconds */
63673+ const int res; /* in nanoseconds */
63674 int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
63675 int (*clock_set) (const clockid_t which_clock, struct timespec * tp);
63676 int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
63677diff -urNp linux-2.6.32.46/include/linux/preempt.h linux-2.6.32.46/include/linux/preempt.h
63678--- linux-2.6.32.46/include/linux/preempt.h 2011-03-27 14:31:47.000000000 -0400
63679+++ linux-2.6.32.46/include/linux/preempt.h 2011-08-05 20:33:55.000000000 -0400
63680@@ -110,7 +110,7 @@ struct preempt_ops {
63681 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
63682 void (*sched_out)(struct preempt_notifier *notifier,
63683 struct task_struct *next);
63684-};
63685+} __no_const;
63686
63687 /**
63688 * preempt_notifier - key for installing preemption notifiers
63689diff -urNp linux-2.6.32.46/include/linux/proc_fs.h linux-2.6.32.46/include/linux/proc_fs.h
63690--- linux-2.6.32.46/include/linux/proc_fs.h 2011-03-27 14:31:47.000000000 -0400
63691+++ linux-2.6.32.46/include/linux/proc_fs.h 2011-08-05 20:33:55.000000000 -0400
63692@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
63693 return proc_create_data(name, mode, parent, proc_fops, NULL);
63694 }
63695
63696+static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
63697+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
63698+{
63699+#ifdef CONFIG_GRKERNSEC_PROC_USER
63700+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
63701+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63702+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
63703+#else
63704+ return proc_create_data(name, mode, parent, proc_fops, NULL);
63705+#endif
63706+}
63707+
63708+
63709 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
63710 mode_t mode, struct proc_dir_entry *base,
63711 read_proc_t *read_proc, void * data)
63712@@ -256,7 +269,7 @@ union proc_op {
63713 int (*proc_show)(struct seq_file *m,
63714 struct pid_namespace *ns, struct pid *pid,
63715 struct task_struct *task);
63716-};
63717+} __no_const;
63718
63719 struct ctl_table_header;
63720 struct ctl_table;
63721diff -urNp linux-2.6.32.46/include/linux/ptrace.h linux-2.6.32.46/include/linux/ptrace.h
63722--- linux-2.6.32.46/include/linux/ptrace.h 2011-03-27 14:31:47.000000000 -0400
63723+++ linux-2.6.32.46/include/linux/ptrace.h 2011-04-17 15:56:46.000000000 -0400
63724@@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_
63725 extern void exit_ptrace(struct task_struct *tracer);
63726 #define PTRACE_MODE_READ 1
63727 #define PTRACE_MODE_ATTACH 2
63728-/* Returns 0 on success, -errno on denial. */
63729-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
63730 /* Returns true on success, false on denial. */
63731 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
63732+/* Returns true on success, false on denial. */
63733+extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
63734
63735 static inline int ptrace_reparented(struct task_struct *child)
63736 {
63737diff -urNp linux-2.6.32.46/include/linux/random.h linux-2.6.32.46/include/linux/random.h
63738--- linux-2.6.32.46/include/linux/random.h 2011-08-16 20:37:25.000000000 -0400
63739+++ linux-2.6.32.46/include/linux/random.h 2011-08-07 19:48:09.000000000 -0400
63740@@ -63,6 +63,11 @@ unsigned long randomize_range(unsigned l
63741 u32 random32(void);
63742 void srandom32(u32 seed);
63743
63744+static inline unsigned long pax_get_random_long(void)
63745+{
63746+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
63747+}
63748+
63749 #endif /* __KERNEL___ */
63750
63751 #endif /* _LINUX_RANDOM_H */
63752diff -urNp linux-2.6.32.46/include/linux/reboot.h linux-2.6.32.46/include/linux/reboot.h
63753--- linux-2.6.32.46/include/linux/reboot.h 2011-03-27 14:31:47.000000000 -0400
63754+++ linux-2.6.32.46/include/linux/reboot.h 2011-05-22 23:02:06.000000000 -0400
63755@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
63756 * Architecture-specific implementations of sys_reboot commands.
63757 */
63758
63759-extern void machine_restart(char *cmd);
63760-extern void machine_halt(void);
63761-extern void machine_power_off(void);
63762+extern void machine_restart(char *cmd) __noreturn;
63763+extern void machine_halt(void) __noreturn;
63764+extern void machine_power_off(void) __noreturn;
63765
63766 extern void machine_shutdown(void);
63767 struct pt_regs;
63768@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struc
63769 */
63770
63771 extern void kernel_restart_prepare(char *cmd);
63772-extern void kernel_restart(char *cmd);
63773-extern void kernel_halt(void);
63774-extern void kernel_power_off(void);
63775+extern void kernel_restart(char *cmd) __noreturn;
63776+extern void kernel_halt(void) __noreturn;
63777+extern void kernel_power_off(void) __noreturn;
63778
63779 void ctrl_alt_del(void);
63780
63781@@ -75,7 +75,7 @@ extern int orderly_poweroff(bool force);
63782 * Emergency restart, callable from an interrupt handler.
63783 */
63784
63785-extern void emergency_restart(void);
63786+extern void emergency_restart(void) __noreturn;
63787 #include <asm/emergency-restart.h>
63788
63789 #endif
63790diff -urNp linux-2.6.32.46/include/linux/reiserfs_fs.h linux-2.6.32.46/include/linux/reiserfs_fs.h
63791--- linux-2.6.32.46/include/linux/reiserfs_fs.h 2011-03-27 14:31:47.000000000 -0400
63792+++ linux-2.6.32.46/include/linux/reiserfs_fs.h 2011-04-17 15:56:46.000000000 -0400
63793@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
63794 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
63795
63796 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
63797-#define get_generation(s) atomic_read (&fs_generation(s))
63798+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
63799 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
63800 #define __fs_changed(gen,s) (gen != get_generation (s))
63801 #define fs_changed(gen,s) ({cond_resched(); __fs_changed(gen, s);})
63802@@ -1534,24 +1534,24 @@ static inline struct super_block *sb_fro
63803 */
63804
63805 struct item_operations {
63806- int (*bytes_number) (struct item_head * ih, int block_size);
63807- void (*decrement_key) (struct cpu_key *);
63808- int (*is_left_mergeable) (struct reiserfs_key * ih,
63809+ int (* const bytes_number) (struct item_head * ih, int block_size);
63810+ void (* const decrement_key) (struct cpu_key *);
63811+ int (* const is_left_mergeable) (struct reiserfs_key * ih,
63812 unsigned long bsize);
63813- void (*print_item) (struct item_head *, char *item);
63814- void (*check_item) (struct item_head *, char *item);
63815+ void (* const print_item) (struct item_head *, char *item);
63816+ void (* const check_item) (struct item_head *, char *item);
63817
63818- int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi,
63819+ int (* const create_vi) (struct virtual_node * vn, struct virtual_item * vi,
63820 int is_affected, int insert_size);
63821- int (*check_left) (struct virtual_item * vi, int free,
63822+ int (* const check_left) (struct virtual_item * vi, int free,
63823 int start_skip, int end_skip);
63824- int (*check_right) (struct virtual_item * vi, int free);
63825- int (*part_size) (struct virtual_item * vi, int from, int to);
63826- int (*unit_num) (struct virtual_item * vi);
63827- void (*print_vi) (struct virtual_item * vi);
63828+ int (* const check_right) (struct virtual_item * vi, int free);
63829+ int (* const part_size) (struct virtual_item * vi, int from, int to);
63830+ int (* const unit_num) (struct virtual_item * vi);
63831+ void (* const print_vi) (struct virtual_item * vi);
63832 };
63833
63834-extern struct item_operations *item_ops[TYPE_ANY + 1];
63835+extern const struct item_operations * const item_ops[TYPE_ANY + 1];
63836
63837 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
63838 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
63839diff -urNp linux-2.6.32.46/include/linux/reiserfs_fs_sb.h linux-2.6.32.46/include/linux/reiserfs_fs_sb.h
63840--- linux-2.6.32.46/include/linux/reiserfs_fs_sb.h 2011-03-27 14:31:47.000000000 -0400
63841+++ linux-2.6.32.46/include/linux/reiserfs_fs_sb.h 2011-04-17 15:56:46.000000000 -0400
63842@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
63843 /* Comment? -Hans */
63844 wait_queue_head_t s_wait;
63845 /* To be obsoleted soon by per buffer seals.. -Hans */
63846- atomic_t s_generation_counter; // increased by one every time the
63847+ atomic_unchecked_t s_generation_counter; // increased by one every time the
63848 // tree gets re-balanced
63849 unsigned long s_properties; /* File system properties. Currently holds
63850 on-disk FS format */
63851diff -urNp linux-2.6.32.46/include/linux/relay.h linux-2.6.32.46/include/linux/relay.h
63852--- linux-2.6.32.46/include/linux/relay.h 2011-03-27 14:31:47.000000000 -0400
63853+++ linux-2.6.32.46/include/linux/relay.h 2011-08-05 20:33:55.000000000 -0400
63854@@ -159,7 +159,7 @@ struct rchan_callbacks
63855 * The callback should return 0 if successful, negative if not.
63856 */
63857 int (*remove_buf_file)(struct dentry *dentry);
63858-};
63859+} __no_const;
63860
63861 /*
63862 * CONFIG_RELAY kernel API, kernel/relay.c
63863diff -urNp linux-2.6.32.46/include/linux/rfkill.h linux-2.6.32.46/include/linux/rfkill.h
63864--- linux-2.6.32.46/include/linux/rfkill.h 2011-03-27 14:31:47.000000000 -0400
63865+++ linux-2.6.32.46/include/linux/rfkill.h 2011-08-23 21:22:38.000000000 -0400
63866@@ -144,6 +144,7 @@ struct rfkill_ops {
63867 void (*query)(struct rfkill *rfkill, void *data);
63868 int (*set_block)(void *data, bool blocked);
63869 };
63870+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
63871
63872 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
63873 /**
63874diff -urNp linux-2.6.32.46/include/linux/sched.h linux-2.6.32.46/include/linux/sched.h
63875--- linux-2.6.32.46/include/linux/sched.h 2011-03-27 14:31:47.000000000 -0400
63876+++ linux-2.6.32.46/include/linux/sched.h 2011-08-11 19:48:55.000000000 -0400
63877@@ -101,6 +101,7 @@ struct bio;
63878 struct fs_struct;
63879 struct bts_context;
63880 struct perf_event_context;
63881+struct linux_binprm;
63882
63883 /*
63884 * List of flags we want to share for kernel threads,
63885@@ -350,7 +351,7 @@ extern signed long schedule_timeout_kill
63886 extern signed long schedule_timeout_uninterruptible(signed long timeout);
63887 asmlinkage void __schedule(void);
63888 asmlinkage void schedule(void);
63889-extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
63890+extern int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner);
63891
63892 struct nsproxy;
63893 struct user_namespace;
63894@@ -371,9 +372,12 @@ struct user_namespace;
63895 #define DEFAULT_MAX_MAP_COUNT (USHORT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
63896
63897 extern int sysctl_max_map_count;
63898+extern unsigned long sysctl_heap_stack_gap;
63899
63900 #include <linux/aio.h>
63901
63902+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
63903+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
63904 extern unsigned long
63905 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
63906 unsigned long, unsigned long);
63907@@ -666,6 +670,16 @@ struct signal_struct {
63908 struct tty_audit_buf *tty_audit_buf;
63909 #endif
63910
63911+#ifdef CONFIG_GRKERNSEC
63912+ u32 curr_ip;
63913+ u32 saved_ip;
63914+ u32 gr_saddr;
63915+ u32 gr_daddr;
63916+ u16 gr_sport;
63917+ u16 gr_dport;
63918+ u8 used_accept:1;
63919+#endif
63920+
63921 int oom_adj; /* OOM kill score adjustment (bit shift) */
63922 };
63923
63924@@ -723,6 +737,11 @@ struct user_struct {
63925 struct key *session_keyring; /* UID's default session keyring */
63926 #endif
63927
63928+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63929+ unsigned int banned;
63930+ unsigned long ban_expires;
63931+#endif
63932+
63933 /* Hash table maintenance information */
63934 struct hlist_node uidhash_node;
63935 uid_t uid;
63936@@ -1328,8 +1347,8 @@ struct task_struct {
63937 struct list_head thread_group;
63938
63939 struct completion *vfork_done; /* for vfork() */
63940- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
63941- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63942+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
63943+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63944
63945 cputime_t utime, stime, utimescaled, stimescaled;
63946 cputime_t gtime;
63947@@ -1343,16 +1362,6 @@ struct task_struct {
63948 struct task_cputime cputime_expires;
63949 struct list_head cpu_timers[3];
63950
63951-/* process credentials */
63952- const struct cred *real_cred; /* objective and real subjective task
63953- * credentials (COW) */
63954- const struct cred *cred; /* effective (overridable) subjective task
63955- * credentials (COW) */
63956- struct mutex cred_guard_mutex; /* guard against foreign influences on
63957- * credential calculations
63958- * (notably. ptrace) */
63959- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63960-
63961 char comm[TASK_COMM_LEN]; /* executable name excluding path
63962 - access with [gs]et_task_comm (which lock
63963 it with task_lock())
63964@@ -1369,6 +1378,10 @@ struct task_struct {
63965 #endif
63966 /* CPU-specific state of this task */
63967 struct thread_struct thread;
63968+/* thread_info moved to task_struct */
63969+#ifdef CONFIG_X86
63970+ struct thread_info tinfo;
63971+#endif
63972 /* filesystem information */
63973 struct fs_struct *fs;
63974 /* open file information */
63975@@ -1436,6 +1449,15 @@ struct task_struct {
63976 int hardirq_context;
63977 int softirq_context;
63978 #endif
63979+
63980+/* process credentials */
63981+ const struct cred *real_cred; /* objective and real subjective task
63982+ * credentials (COW) */
63983+ struct mutex cred_guard_mutex; /* guard against foreign influences on
63984+ * credential calculations
63985+ * (notably. ptrace) */
63986+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63987+
63988 #ifdef CONFIG_LOCKDEP
63989 # define MAX_LOCK_DEPTH 48UL
63990 u64 curr_chain_key;
63991@@ -1456,6 +1478,9 @@ struct task_struct {
63992
63993 struct backing_dev_info *backing_dev_info;
63994
63995+ const struct cred *cred; /* effective (overridable) subjective task
63996+ * credentials (COW) */
63997+
63998 struct io_context *io_context;
63999
64000 unsigned long ptrace_message;
64001@@ -1519,6 +1544,21 @@ struct task_struct {
64002 unsigned long default_timer_slack_ns;
64003
64004 struct list_head *scm_work_list;
64005+
64006+#ifdef CONFIG_GRKERNSEC
64007+ /* grsecurity */
64008+ struct dentry *gr_chroot_dentry;
64009+ struct acl_subject_label *acl;
64010+ struct acl_role_label *role;
64011+ struct file *exec_file;
64012+ u16 acl_role_id;
64013+ /* is this the task that authenticated to the special role */
64014+ u8 acl_sp_role;
64015+ u8 is_writable;
64016+ u8 brute;
64017+ u8 gr_is_chrooted;
64018+#endif
64019+
64020 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
64021 /* Index of current stored adress in ret_stack */
64022 int curr_ret_stack;
64023@@ -1542,6 +1582,57 @@ struct task_struct {
64024 #endif /* CONFIG_TRACING */
64025 };
64026
64027+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
64028+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
64029+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
64030+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
64031+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
64032+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
64033+
64034+#ifdef CONFIG_PAX_SOFTMODE
64035+extern int pax_softmode;
64036+#endif
64037+
64038+extern int pax_check_flags(unsigned long *);
64039+
64040+/* if tsk != current then task_lock must be held on it */
64041+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
64042+static inline unsigned long pax_get_flags(struct task_struct *tsk)
64043+{
64044+ if (likely(tsk->mm))
64045+ return tsk->mm->pax_flags;
64046+ else
64047+ return 0UL;
64048+}
64049+
64050+/* if tsk != current then task_lock must be held on it */
64051+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
64052+{
64053+ if (likely(tsk->mm)) {
64054+ tsk->mm->pax_flags = flags;
64055+ return 0;
64056+ }
64057+ return -EINVAL;
64058+}
64059+#endif
64060+
64061+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
64062+extern void pax_set_initial_flags(struct linux_binprm *bprm);
64063+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
64064+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
64065+#endif
64066+
64067+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
64068+extern void pax_report_insns(void *pc, void *sp);
64069+extern void pax_report_refcount_overflow(struct pt_regs *regs);
64070+extern NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) ATTRIB_NORET;
64071+
64072+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
64073+extern void pax_track_stack(void);
64074+#else
64075+static inline void pax_track_stack(void) {}
64076+#endif
64077+
64078 /* Future-safe accessor for struct task_struct's cpus_allowed. */
64079 #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
64080
64081@@ -1740,7 +1831,7 @@ extern void thread_group_times(struct ta
64082 #define PF_DUMPCORE 0x00000200 /* dumped core */
64083 #define PF_SIGNALED 0x00000400 /* killed by a signal */
64084 #define PF_MEMALLOC 0x00000800 /* Allocating memory */
64085-#define PF_FLUSHER 0x00001000 /* responsible for disk writeback */
64086+#define PF_NPROC_EXCEEDED 0x00001000 /* set_user noticed that RLIMIT_NPROC was exceeded */
64087 #define PF_USED_MATH 0x00002000 /* if unset the fpu must be initialized before use */
64088 #define PF_FREEZING 0x00004000 /* freeze in progress. do not account to load */
64089 #define PF_NOFREEZE 0x00008000 /* this thread should not be frozen */
64090@@ -1978,7 +2069,9 @@ void yield(void);
64091 extern struct exec_domain default_exec_domain;
64092
64093 union thread_union {
64094+#ifndef CONFIG_X86
64095 struct thread_info thread_info;
64096+#endif
64097 unsigned long stack[THREAD_SIZE/sizeof(long)];
64098 };
64099
64100@@ -2011,6 +2104,7 @@ extern struct pid_namespace init_pid_ns;
64101 */
64102
64103 extern struct task_struct *find_task_by_vpid(pid_t nr);
64104+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
64105 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
64106 struct pid_namespace *ns);
64107
64108@@ -2155,7 +2249,7 @@ extern void __cleanup_sighand(struct sig
64109 extern void exit_itimers(struct signal_struct *);
64110 extern void flush_itimer_signals(void);
64111
64112-extern NORET_TYPE void do_group_exit(int);
64113+extern NORET_TYPE void do_group_exit(int) ATTRIB_NORET;
64114
64115 extern void daemonize(const char *, ...);
64116 extern int allow_signal(int);
64117@@ -2284,13 +2378,17 @@ static inline unsigned long *end_of_stac
64118
64119 #endif
64120
64121-static inline int object_is_on_stack(void *obj)
64122+static inline int object_starts_on_stack(void *obj)
64123 {
64124- void *stack = task_stack_page(current);
64125+ const void *stack = task_stack_page(current);
64126
64127 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
64128 }
64129
64130+#ifdef CONFIG_PAX_USERCOPY
64131+extern int object_is_on_stack(const void *obj, unsigned long len);
64132+#endif
64133+
64134 extern void thread_info_cache_init(void);
64135
64136 #ifdef CONFIG_DEBUG_STACK_USAGE
64137diff -urNp linux-2.6.32.46/include/linux/screen_info.h linux-2.6.32.46/include/linux/screen_info.h
64138--- linux-2.6.32.46/include/linux/screen_info.h 2011-03-27 14:31:47.000000000 -0400
64139+++ linux-2.6.32.46/include/linux/screen_info.h 2011-04-17 15:56:46.000000000 -0400
64140@@ -42,7 +42,8 @@ struct screen_info {
64141 __u16 pages; /* 0x32 */
64142 __u16 vesa_attributes; /* 0x34 */
64143 __u32 capabilities; /* 0x36 */
64144- __u8 _reserved[6]; /* 0x3a */
64145+ __u16 vesapm_size; /* 0x3a */
64146+ __u8 _reserved[4]; /* 0x3c */
64147 } __attribute__((packed));
64148
64149 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
64150diff -urNp linux-2.6.32.46/include/linux/security.h linux-2.6.32.46/include/linux/security.h
64151--- linux-2.6.32.46/include/linux/security.h 2011-03-27 14:31:47.000000000 -0400
64152+++ linux-2.6.32.46/include/linux/security.h 2011-04-17 15:56:46.000000000 -0400
64153@@ -34,6 +34,7 @@
64154 #include <linux/key.h>
64155 #include <linux/xfrm.h>
64156 #include <linux/gfp.h>
64157+#include <linux/grsecurity.h>
64158 #include <net/flow.h>
64159
64160 /* Maximum number of letters for an LSM name string */
64161diff -urNp linux-2.6.32.46/include/linux/seq_file.h linux-2.6.32.46/include/linux/seq_file.h
64162--- linux-2.6.32.46/include/linux/seq_file.h 2011-03-27 14:31:47.000000000 -0400
64163+++ linux-2.6.32.46/include/linux/seq_file.h 2011-08-23 21:22:38.000000000 -0400
64164@@ -32,6 +32,7 @@ struct seq_operations {
64165 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
64166 int (*show) (struct seq_file *m, void *v);
64167 };
64168+typedef struct seq_operations __no_const seq_operations_no_const;
64169
64170 #define SEQ_SKIP 1
64171
64172diff -urNp linux-2.6.32.46/include/linux/shm.h linux-2.6.32.46/include/linux/shm.h
64173--- linux-2.6.32.46/include/linux/shm.h 2011-03-27 14:31:47.000000000 -0400
64174+++ linux-2.6.32.46/include/linux/shm.h 2011-04-17 15:56:46.000000000 -0400
64175@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
64176 pid_t shm_cprid;
64177 pid_t shm_lprid;
64178 struct user_struct *mlock_user;
64179+#ifdef CONFIG_GRKERNSEC
64180+ time_t shm_createtime;
64181+ pid_t shm_lapid;
64182+#endif
64183 };
64184
64185 /* shm_mode upper byte flags */
64186diff -urNp linux-2.6.32.46/include/linux/skbuff.h linux-2.6.32.46/include/linux/skbuff.h
64187--- linux-2.6.32.46/include/linux/skbuff.h 2011-03-27 14:31:47.000000000 -0400
64188+++ linux-2.6.32.46/include/linux/skbuff.h 2011-08-21 15:27:56.000000000 -0400
64189@@ -14,6 +14,7 @@
64190 #ifndef _LINUX_SKBUFF_H
64191 #define _LINUX_SKBUFF_H
64192
64193+#include <linux/const.h>
64194 #include <linux/kernel.h>
64195 #include <linux/kmemcheck.h>
64196 #include <linux/compiler.h>
64197@@ -544,7 +545,7 @@ static inline union skb_shared_tx *skb_t
64198 */
64199 static inline int skb_queue_empty(const struct sk_buff_head *list)
64200 {
64201- return list->next == (struct sk_buff *)list;
64202+ return list->next == (const struct sk_buff *)list;
64203 }
64204
64205 /**
64206@@ -557,7 +558,7 @@ static inline int skb_queue_empty(const
64207 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
64208 const struct sk_buff *skb)
64209 {
64210- return (skb->next == (struct sk_buff *) list);
64211+ return (skb->next == (const struct sk_buff *) list);
64212 }
64213
64214 /**
64215@@ -570,7 +571,7 @@ static inline bool skb_queue_is_last(con
64216 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
64217 const struct sk_buff *skb)
64218 {
64219- return (skb->prev == (struct sk_buff *) list);
64220+ return (skb->prev == (const struct sk_buff *) list);
64221 }
64222
64223 /**
64224@@ -1367,7 +1368,7 @@ static inline int skb_network_offset(con
64225 * headroom, you should not reduce this.
64226 */
64227 #ifndef NET_SKB_PAD
64228-#define NET_SKB_PAD 32
64229+#define NET_SKB_PAD (_AC(32,UL))
64230 #endif
64231
64232 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
64233diff -urNp linux-2.6.32.46/include/linux/slab_def.h linux-2.6.32.46/include/linux/slab_def.h
64234--- linux-2.6.32.46/include/linux/slab_def.h 2011-03-27 14:31:47.000000000 -0400
64235+++ linux-2.6.32.46/include/linux/slab_def.h 2011-05-04 17:56:28.000000000 -0400
64236@@ -69,10 +69,10 @@ struct kmem_cache {
64237 unsigned long node_allocs;
64238 unsigned long node_frees;
64239 unsigned long node_overflow;
64240- atomic_t allochit;
64241- atomic_t allocmiss;
64242- atomic_t freehit;
64243- atomic_t freemiss;
64244+ atomic_unchecked_t allochit;
64245+ atomic_unchecked_t allocmiss;
64246+ atomic_unchecked_t freehit;
64247+ atomic_unchecked_t freemiss;
64248
64249 /*
64250 * If debugging is enabled, then the allocator can add additional
64251diff -urNp linux-2.6.32.46/include/linux/slab.h linux-2.6.32.46/include/linux/slab.h
64252--- linux-2.6.32.46/include/linux/slab.h 2011-03-27 14:31:47.000000000 -0400
64253+++ linux-2.6.32.46/include/linux/slab.h 2011-04-17 15:56:46.000000000 -0400
64254@@ -11,12 +11,20 @@
64255
64256 #include <linux/gfp.h>
64257 #include <linux/types.h>
64258+#include <linux/err.h>
64259
64260 /*
64261 * Flags to pass to kmem_cache_create().
64262 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
64263 */
64264 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
64265+
64266+#ifdef CONFIG_PAX_USERCOPY
64267+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
64268+#else
64269+#define SLAB_USERCOPY 0x00000000UL
64270+#endif
64271+
64272 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
64273 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
64274 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
64275@@ -82,10 +90,13 @@
64276 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
64277 * Both make kfree a no-op.
64278 */
64279-#define ZERO_SIZE_PTR ((void *)16)
64280+#define ZERO_SIZE_PTR \
64281+({ \
64282+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
64283+ (void *)(-MAX_ERRNO-1L); \
64284+})
64285
64286-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
64287- (unsigned long)ZERO_SIZE_PTR)
64288+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
64289
64290 /*
64291 * struct kmem_cache related prototypes
64292@@ -138,6 +149,7 @@ void * __must_check krealloc(const void
64293 void kfree(const void *);
64294 void kzfree(const void *);
64295 size_t ksize(const void *);
64296+void check_object_size(const void *ptr, unsigned long n, bool to);
64297
64298 /*
64299 * Allocator specific definitions. These are mainly used to establish optimized
64300@@ -328,4 +340,37 @@ static inline void *kzalloc_node(size_t
64301
64302 void __init kmem_cache_init_late(void);
64303
64304+#define kmalloc(x, y) \
64305+({ \
64306+ void *___retval; \
64307+ intoverflow_t ___x = (intoverflow_t)x; \
64308+ if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n"))\
64309+ ___retval = NULL; \
64310+ else \
64311+ ___retval = kmalloc((size_t)___x, (y)); \
64312+ ___retval; \
64313+})
64314+
64315+#define kmalloc_node(x, y, z) \
64316+({ \
64317+ void *___retval; \
64318+ intoverflow_t ___x = (intoverflow_t)x; \
64319+ if (WARN(___x > ULONG_MAX, "kmalloc_node size overflow\n"))\
64320+ ___retval = NULL; \
64321+ else \
64322+ ___retval = kmalloc_node((size_t)___x, (y), (z));\
64323+ ___retval; \
64324+})
64325+
64326+#define kzalloc(x, y) \
64327+({ \
64328+ void *___retval; \
64329+ intoverflow_t ___x = (intoverflow_t)x; \
64330+ if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n"))\
64331+ ___retval = NULL; \
64332+ else \
64333+ ___retval = kzalloc((size_t)___x, (y)); \
64334+ ___retval; \
64335+})
64336+
64337 #endif /* _LINUX_SLAB_H */
64338diff -urNp linux-2.6.32.46/include/linux/slub_def.h linux-2.6.32.46/include/linux/slub_def.h
64339--- linux-2.6.32.46/include/linux/slub_def.h 2011-03-27 14:31:47.000000000 -0400
64340+++ linux-2.6.32.46/include/linux/slub_def.h 2011-08-05 20:33:55.000000000 -0400
64341@@ -86,7 +86,7 @@ struct kmem_cache {
64342 struct kmem_cache_order_objects max;
64343 struct kmem_cache_order_objects min;
64344 gfp_t allocflags; /* gfp flags to use on each alloc */
64345- int refcount; /* Refcount for slab cache destroy */
64346+ atomic_t refcount; /* Refcount for slab cache destroy */
64347 void (*ctor)(void *);
64348 int inuse; /* Offset to metadata */
64349 int align; /* Alignment */
64350@@ -215,7 +215,7 @@ static __always_inline struct kmem_cache
64351 #endif
64352
64353 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
64354-void *__kmalloc(size_t size, gfp_t flags);
64355+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
64356
64357 #ifdef CONFIG_KMEMTRACE
64358 extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);
64359diff -urNp linux-2.6.32.46/include/linux/sonet.h linux-2.6.32.46/include/linux/sonet.h
64360--- linux-2.6.32.46/include/linux/sonet.h 2011-03-27 14:31:47.000000000 -0400
64361+++ linux-2.6.32.46/include/linux/sonet.h 2011-04-17 15:56:46.000000000 -0400
64362@@ -61,7 +61,7 @@ struct sonet_stats {
64363 #include <asm/atomic.h>
64364
64365 struct k_sonet_stats {
64366-#define __HANDLE_ITEM(i) atomic_t i
64367+#define __HANDLE_ITEM(i) atomic_unchecked_t i
64368 __SONET_ITEMS
64369 #undef __HANDLE_ITEM
64370 };
64371diff -urNp linux-2.6.32.46/include/linux/sunrpc/cache.h linux-2.6.32.46/include/linux/sunrpc/cache.h
64372--- linux-2.6.32.46/include/linux/sunrpc/cache.h 2011-03-27 14:31:47.000000000 -0400
64373+++ linux-2.6.32.46/include/linux/sunrpc/cache.h 2011-08-05 20:33:55.000000000 -0400
64374@@ -125,7 +125,7 @@ struct cache_detail {
64375 */
64376 struct cache_req {
64377 struct cache_deferred_req *(*defer)(struct cache_req *req);
64378-};
64379+} __no_const;
64380 /* this must be embedded in a deferred_request that is being
64381 * delayed awaiting cache-fill
64382 */
64383diff -urNp linux-2.6.32.46/include/linux/sunrpc/clnt.h linux-2.6.32.46/include/linux/sunrpc/clnt.h
64384--- linux-2.6.32.46/include/linux/sunrpc/clnt.h 2011-03-27 14:31:47.000000000 -0400
64385+++ linux-2.6.32.46/include/linux/sunrpc/clnt.h 2011-04-17 15:56:46.000000000 -0400
64386@@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por
64387 {
64388 switch (sap->sa_family) {
64389 case AF_INET:
64390- return ntohs(((struct sockaddr_in *)sap)->sin_port);
64391+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
64392 case AF_INET6:
64393- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
64394+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
64395 }
64396 return 0;
64397 }
64398@@ -202,7 +202,7 @@ static inline bool __rpc_cmp_addr4(const
64399 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
64400 const struct sockaddr *src)
64401 {
64402- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
64403+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
64404 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
64405
64406 dsin->sin_family = ssin->sin_family;
64407@@ -299,7 +299,7 @@ static inline u32 rpc_get_scope_id(const
64408 if (sa->sa_family != AF_INET6)
64409 return 0;
64410
64411- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
64412+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
64413 }
64414
64415 #endif /* __KERNEL__ */
64416diff -urNp linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h
64417--- linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h 2011-03-27 14:31:47.000000000 -0400
64418+++ linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h 2011-05-04 17:56:28.000000000 -0400
64419@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
64420 extern unsigned int svcrdma_max_requests;
64421 extern unsigned int svcrdma_max_req_size;
64422
64423-extern atomic_t rdma_stat_recv;
64424-extern atomic_t rdma_stat_read;
64425-extern atomic_t rdma_stat_write;
64426-extern atomic_t rdma_stat_sq_starve;
64427-extern atomic_t rdma_stat_rq_starve;
64428-extern atomic_t rdma_stat_rq_poll;
64429-extern atomic_t rdma_stat_rq_prod;
64430-extern atomic_t rdma_stat_sq_poll;
64431-extern atomic_t rdma_stat_sq_prod;
64432+extern atomic_unchecked_t rdma_stat_recv;
64433+extern atomic_unchecked_t rdma_stat_read;
64434+extern atomic_unchecked_t rdma_stat_write;
64435+extern atomic_unchecked_t rdma_stat_sq_starve;
64436+extern atomic_unchecked_t rdma_stat_rq_starve;
64437+extern atomic_unchecked_t rdma_stat_rq_poll;
64438+extern atomic_unchecked_t rdma_stat_rq_prod;
64439+extern atomic_unchecked_t rdma_stat_sq_poll;
64440+extern atomic_unchecked_t rdma_stat_sq_prod;
64441
64442 #define RPCRDMA_VERSION 1
64443
64444diff -urNp linux-2.6.32.46/include/linux/suspend.h linux-2.6.32.46/include/linux/suspend.h
64445--- linux-2.6.32.46/include/linux/suspend.h 2011-03-27 14:31:47.000000000 -0400
64446+++ linux-2.6.32.46/include/linux/suspend.h 2011-04-17 15:56:46.000000000 -0400
64447@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
64448 * which require special recovery actions in that situation.
64449 */
64450 struct platform_suspend_ops {
64451- int (*valid)(suspend_state_t state);
64452- int (*begin)(suspend_state_t state);
64453- int (*prepare)(void);
64454- int (*prepare_late)(void);
64455- int (*enter)(suspend_state_t state);
64456- void (*wake)(void);
64457- void (*finish)(void);
64458- void (*end)(void);
64459- void (*recover)(void);
64460+ int (* const valid)(suspend_state_t state);
64461+ int (* const begin)(suspend_state_t state);
64462+ int (* const prepare)(void);
64463+ int (* const prepare_late)(void);
64464+ int (* const enter)(suspend_state_t state);
64465+ void (* const wake)(void);
64466+ void (* const finish)(void);
64467+ void (* const end)(void);
64468+ void (* const recover)(void);
64469 };
64470
64471 #ifdef CONFIG_SUSPEND
64472@@ -120,7 +120,7 @@ struct platform_suspend_ops {
64473 * suspend_set_ops - set platform dependent suspend operations
64474 * @ops: The new suspend operations to set.
64475 */
64476-extern void suspend_set_ops(struct platform_suspend_ops *ops);
64477+extern void suspend_set_ops(const struct platform_suspend_ops *ops);
64478 extern int suspend_valid_only_mem(suspend_state_t state);
64479
64480 /**
64481@@ -145,7 +145,7 @@ extern int pm_suspend(suspend_state_t st
64482 #else /* !CONFIG_SUSPEND */
64483 #define suspend_valid_only_mem NULL
64484
64485-static inline void suspend_set_ops(struct platform_suspend_ops *ops) {}
64486+static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
64487 static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
64488 #endif /* !CONFIG_SUSPEND */
64489
64490@@ -215,16 +215,16 @@ extern void mark_free_pages(struct zone
64491 * platforms which require special recovery actions in that situation.
64492 */
64493 struct platform_hibernation_ops {
64494- int (*begin)(void);
64495- void (*end)(void);
64496- int (*pre_snapshot)(void);
64497- void (*finish)(void);
64498- int (*prepare)(void);
64499- int (*enter)(void);
64500- void (*leave)(void);
64501- int (*pre_restore)(void);
64502- void (*restore_cleanup)(void);
64503- void (*recover)(void);
64504+ int (* const begin)(void);
64505+ void (* const end)(void);
64506+ int (* const pre_snapshot)(void);
64507+ void (* const finish)(void);
64508+ int (* const prepare)(void);
64509+ int (* const enter)(void);
64510+ void (* const leave)(void);
64511+ int (* const pre_restore)(void);
64512+ void (* const restore_cleanup)(void);
64513+ void (* const recover)(void);
64514 };
64515
64516 #ifdef CONFIG_HIBERNATION
64517@@ -243,7 +243,7 @@ extern void swsusp_set_page_free(struct
64518 extern void swsusp_unset_page_free(struct page *);
64519 extern unsigned long get_safe_page(gfp_t gfp_mask);
64520
64521-extern void hibernation_set_ops(struct platform_hibernation_ops *ops);
64522+extern void hibernation_set_ops(const struct platform_hibernation_ops *ops);
64523 extern int hibernate(void);
64524 extern bool system_entering_hibernation(void);
64525 #else /* CONFIG_HIBERNATION */
64526@@ -251,7 +251,7 @@ static inline int swsusp_page_is_forbidd
64527 static inline void swsusp_set_page_free(struct page *p) {}
64528 static inline void swsusp_unset_page_free(struct page *p) {}
64529
64530-static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {}
64531+static inline void hibernation_set_ops(const struct platform_hibernation_ops *ops) {}
64532 static inline int hibernate(void) { return -ENOSYS; }
64533 static inline bool system_entering_hibernation(void) { return false; }
64534 #endif /* CONFIG_HIBERNATION */
64535diff -urNp linux-2.6.32.46/include/linux/sysctl.h linux-2.6.32.46/include/linux/sysctl.h
64536--- linux-2.6.32.46/include/linux/sysctl.h 2011-03-27 14:31:47.000000000 -0400
64537+++ linux-2.6.32.46/include/linux/sysctl.h 2011-04-17 15:56:46.000000000 -0400
64538@@ -164,7 +164,11 @@ enum
64539 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
64540 };
64541
64542-
64543+#ifdef CONFIG_PAX_SOFTMODE
64544+enum {
64545+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
64546+};
64547+#endif
64548
64549 /* CTL_VM names: */
64550 enum
64551@@ -982,6 +986,8 @@ typedef int proc_handler (struct ctl_tab
64552
64553 extern int proc_dostring(struct ctl_table *, int,
64554 void __user *, size_t *, loff_t *);
64555+extern int proc_dostring_modpriv(struct ctl_table *, int,
64556+ void __user *, size_t *, loff_t *);
64557 extern int proc_dointvec(struct ctl_table *, int,
64558 void __user *, size_t *, loff_t *);
64559 extern int proc_dointvec_minmax(struct ctl_table *, int,
64560@@ -1003,6 +1009,7 @@ extern int do_sysctl (int __user *name,
64561
64562 extern ctl_handler sysctl_data;
64563 extern ctl_handler sysctl_string;
64564+extern ctl_handler sysctl_string_modpriv;
64565 extern ctl_handler sysctl_intvec;
64566 extern ctl_handler sysctl_jiffies;
64567 extern ctl_handler sysctl_ms_jiffies;
64568diff -urNp linux-2.6.32.46/include/linux/sysfs.h linux-2.6.32.46/include/linux/sysfs.h
64569--- linux-2.6.32.46/include/linux/sysfs.h 2011-03-27 14:31:47.000000000 -0400
64570+++ linux-2.6.32.46/include/linux/sysfs.h 2011-04-17 15:56:46.000000000 -0400
64571@@ -75,8 +75,8 @@ struct bin_attribute {
64572 };
64573
64574 struct sysfs_ops {
64575- ssize_t (*show)(struct kobject *, struct attribute *,char *);
64576- ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t);
64577+ ssize_t (* const show)(struct kobject *, struct attribute *,char *);
64578+ ssize_t (* const store)(struct kobject *,struct attribute *,const char *, size_t);
64579 };
64580
64581 struct sysfs_dirent;
64582diff -urNp linux-2.6.32.46/include/linux/thread_info.h linux-2.6.32.46/include/linux/thread_info.h
64583--- linux-2.6.32.46/include/linux/thread_info.h 2011-03-27 14:31:47.000000000 -0400
64584+++ linux-2.6.32.46/include/linux/thread_info.h 2011-04-17 15:56:46.000000000 -0400
64585@@ -23,7 +23,7 @@ struct restart_block {
64586 };
64587 /* For futex_wait and futex_wait_requeue_pi */
64588 struct {
64589- u32 *uaddr;
64590+ u32 __user *uaddr;
64591 u32 val;
64592 u32 flags;
64593 u32 bitset;
64594diff -urNp linux-2.6.32.46/include/linux/tty.h linux-2.6.32.46/include/linux/tty.h
64595--- linux-2.6.32.46/include/linux/tty.h 2011-03-27 14:31:47.000000000 -0400
64596+++ linux-2.6.32.46/include/linux/tty.h 2011-08-05 20:33:55.000000000 -0400
64597@@ -493,7 +493,6 @@ extern void tty_ldisc_begin(void);
64598 /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
64599 extern void tty_ldisc_enable(struct tty_struct *tty);
64600
64601-
64602 /* n_tty.c */
64603 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
64604
64605diff -urNp linux-2.6.32.46/include/linux/tty_ldisc.h linux-2.6.32.46/include/linux/tty_ldisc.h
64606--- linux-2.6.32.46/include/linux/tty_ldisc.h 2011-03-27 14:31:47.000000000 -0400
64607+++ linux-2.6.32.46/include/linux/tty_ldisc.h 2011-04-17 15:56:46.000000000 -0400
64608@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
64609
64610 struct module *owner;
64611
64612- int refcount;
64613+ atomic_t refcount;
64614 };
64615
64616 struct tty_ldisc {
64617diff -urNp linux-2.6.32.46/include/linux/types.h linux-2.6.32.46/include/linux/types.h
64618--- linux-2.6.32.46/include/linux/types.h 2011-03-27 14:31:47.000000000 -0400
64619+++ linux-2.6.32.46/include/linux/types.h 2011-04-17 15:56:46.000000000 -0400
64620@@ -191,10 +191,26 @@ typedef struct {
64621 volatile int counter;
64622 } atomic_t;
64623
64624+#ifdef CONFIG_PAX_REFCOUNT
64625+typedef struct {
64626+ volatile int counter;
64627+} atomic_unchecked_t;
64628+#else
64629+typedef atomic_t atomic_unchecked_t;
64630+#endif
64631+
64632 #ifdef CONFIG_64BIT
64633 typedef struct {
64634 volatile long counter;
64635 } atomic64_t;
64636+
64637+#ifdef CONFIG_PAX_REFCOUNT
64638+typedef struct {
64639+ volatile long counter;
64640+} atomic64_unchecked_t;
64641+#else
64642+typedef atomic64_t atomic64_unchecked_t;
64643+#endif
64644 #endif
64645
64646 struct ustat {
64647diff -urNp linux-2.6.32.46/include/linux/uaccess.h linux-2.6.32.46/include/linux/uaccess.h
64648--- linux-2.6.32.46/include/linux/uaccess.h 2011-03-27 14:31:47.000000000 -0400
64649+++ linux-2.6.32.46/include/linux/uaccess.h 2011-10-06 09:37:14.000000000 -0400
64650@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
64651 long ret; \
64652 mm_segment_t old_fs = get_fs(); \
64653 \
64654- set_fs(KERNEL_DS); \
64655 pagefault_disable(); \
64656- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
64657- pagefault_enable(); \
64658+ set_fs(KERNEL_DS); \
64659+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
64660 set_fs(old_fs); \
64661+ pagefault_enable(); \
64662 ret; \
64663 })
64664
64665@@ -93,7 +93,7 @@ static inline unsigned long __copy_from_
64666 * Safely read from address @src to the buffer at @dst. If a kernel fault
64667 * happens, handle that and return -EFAULT.
64668 */
64669-extern long probe_kernel_read(void *dst, void *src, size_t size);
64670+extern long probe_kernel_read(void *dst, const void *src, size_t size);
64671
64672 /*
64673 * probe_kernel_write(): safely attempt to write to a location
64674@@ -104,6 +104,6 @@ extern long probe_kernel_read(void *dst,
64675 * Safely write to address @dst from the buffer at @src. If a kernel fault
64676 * happens, handle that and return -EFAULT.
64677 */
64678-extern long probe_kernel_write(void *dst, void *src, size_t size);
64679+extern long probe_kernel_write(void *dst, const void *src, size_t size);
64680
64681 #endif /* __LINUX_UACCESS_H__ */
64682diff -urNp linux-2.6.32.46/include/linux/unaligned/access_ok.h linux-2.6.32.46/include/linux/unaligned/access_ok.h
64683--- linux-2.6.32.46/include/linux/unaligned/access_ok.h 2011-03-27 14:31:47.000000000 -0400
64684+++ linux-2.6.32.46/include/linux/unaligned/access_ok.h 2011-04-17 15:56:46.000000000 -0400
64685@@ -6,32 +6,32 @@
64686
64687 static inline u16 get_unaligned_le16(const void *p)
64688 {
64689- return le16_to_cpup((__le16 *)p);
64690+ return le16_to_cpup((const __le16 *)p);
64691 }
64692
64693 static inline u32 get_unaligned_le32(const void *p)
64694 {
64695- return le32_to_cpup((__le32 *)p);
64696+ return le32_to_cpup((const __le32 *)p);
64697 }
64698
64699 static inline u64 get_unaligned_le64(const void *p)
64700 {
64701- return le64_to_cpup((__le64 *)p);
64702+ return le64_to_cpup((const __le64 *)p);
64703 }
64704
64705 static inline u16 get_unaligned_be16(const void *p)
64706 {
64707- return be16_to_cpup((__be16 *)p);
64708+ return be16_to_cpup((const __be16 *)p);
64709 }
64710
64711 static inline u32 get_unaligned_be32(const void *p)
64712 {
64713- return be32_to_cpup((__be32 *)p);
64714+ return be32_to_cpup((const __be32 *)p);
64715 }
64716
64717 static inline u64 get_unaligned_be64(const void *p)
64718 {
64719- return be64_to_cpup((__be64 *)p);
64720+ return be64_to_cpup((const __be64 *)p);
64721 }
64722
64723 static inline void put_unaligned_le16(u16 val, void *p)
64724diff -urNp linux-2.6.32.46/include/linux/vermagic.h linux-2.6.32.46/include/linux/vermagic.h
64725--- linux-2.6.32.46/include/linux/vermagic.h 2011-03-27 14:31:47.000000000 -0400
64726+++ linux-2.6.32.46/include/linux/vermagic.h 2011-10-08 08:17:48.000000000 -0400
64727@@ -26,9 +26,28 @@
64728 #define MODULE_ARCH_VERMAGIC ""
64729 #endif
64730
64731+#ifdef CONFIG_PAX_REFCOUNT
64732+#define MODULE_PAX_REFCOUNT "REFCOUNT "
64733+#else
64734+#define MODULE_PAX_REFCOUNT ""
64735+#endif
64736+
64737+#ifdef CONSTIFY_PLUGIN
64738+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
64739+#else
64740+#define MODULE_CONSTIFY_PLUGIN ""
64741+#endif
64742+
64743+#ifdef CONFIG_GRKERNSEC
64744+#define MODULE_GRSEC "GRSEC "
64745+#else
64746+#define MODULE_GRSEC ""
64747+#endif
64748+
64749 #define VERMAGIC_STRING \
64750 UTS_RELEASE " " \
64751 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
64752 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
64753- MODULE_ARCH_VERMAGIC
64754+ MODULE_ARCH_VERMAGIC \
64755+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_GRSEC
64756
64757diff -urNp linux-2.6.32.46/include/linux/vmalloc.h linux-2.6.32.46/include/linux/vmalloc.h
64758--- linux-2.6.32.46/include/linux/vmalloc.h 2011-03-27 14:31:47.000000000 -0400
64759+++ linux-2.6.32.46/include/linux/vmalloc.h 2011-04-17 15:56:46.000000000 -0400
64760@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
64761 #define VM_MAP 0x00000004 /* vmap()ed pages */
64762 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
64763 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
64764+
64765+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
64766+#define VM_KERNEXEC 0x00000020 /* allocate from executable kernel memory range */
64767+#endif
64768+
64769 /* bits [20..32] reserved for arch specific ioremap internals */
64770
64771 /*
64772@@ -123,4 +128,81 @@ struct vm_struct **pcpu_get_vm_areas(con
64773
64774 void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
64775
64776+#define vmalloc(x) \
64777+({ \
64778+ void *___retval; \
64779+ intoverflow_t ___x = (intoverflow_t)x; \
64780+ if (WARN(___x > ULONG_MAX, "vmalloc size overflow\n")) \
64781+ ___retval = NULL; \
64782+ else \
64783+ ___retval = vmalloc((unsigned long)___x); \
64784+ ___retval; \
64785+})
64786+
64787+#define __vmalloc(x, y, z) \
64788+({ \
64789+ void *___retval; \
64790+ intoverflow_t ___x = (intoverflow_t)x; \
64791+ if (WARN(___x > ULONG_MAX, "__vmalloc size overflow\n"))\
64792+ ___retval = NULL; \
64793+ else \
64794+ ___retval = __vmalloc((unsigned long)___x, (y), (z));\
64795+ ___retval; \
64796+})
64797+
64798+#define vmalloc_user(x) \
64799+({ \
64800+ void *___retval; \
64801+ intoverflow_t ___x = (intoverflow_t)x; \
64802+ if (WARN(___x > ULONG_MAX, "vmalloc_user size overflow\n"))\
64803+ ___retval = NULL; \
64804+ else \
64805+ ___retval = vmalloc_user((unsigned long)___x); \
64806+ ___retval; \
64807+})
64808+
64809+#define vmalloc_exec(x) \
64810+({ \
64811+ void *___retval; \
64812+ intoverflow_t ___x = (intoverflow_t)x; \
64813+ if (WARN(___x > ULONG_MAX, "vmalloc_exec size overflow\n"))\
64814+ ___retval = NULL; \
64815+ else \
64816+ ___retval = vmalloc_exec((unsigned long)___x); \
64817+ ___retval; \
64818+})
64819+
64820+#define vmalloc_node(x, y) \
64821+({ \
64822+ void *___retval; \
64823+ intoverflow_t ___x = (intoverflow_t)x; \
64824+ if (WARN(___x > ULONG_MAX, "vmalloc_node size overflow\n"))\
64825+ ___retval = NULL; \
64826+ else \
64827+ ___retval = vmalloc_node((unsigned long)___x, (y));\
64828+ ___retval; \
64829+})
64830+
64831+#define vmalloc_32(x) \
64832+({ \
64833+ void *___retval; \
64834+ intoverflow_t ___x = (intoverflow_t)x; \
64835+ if (WARN(___x > ULONG_MAX, "vmalloc_32 size overflow\n"))\
64836+ ___retval = NULL; \
64837+ else \
64838+ ___retval = vmalloc_32((unsigned long)___x); \
64839+ ___retval; \
64840+})
64841+
64842+#define vmalloc_32_user(x) \
64843+({ \
64844+ void *___retval; \
64845+ intoverflow_t ___x = (intoverflow_t)x; \
64846+ if (WARN(___x > ULONG_MAX, "vmalloc_32_user size overflow\n"))\
64847+ ___retval = NULL; \
64848+ else \
64849+ ___retval = vmalloc_32_user((unsigned long)___x);\
64850+ ___retval; \
64851+})
64852+
64853 #endif /* _LINUX_VMALLOC_H */
64854diff -urNp linux-2.6.32.46/include/linux/vmstat.h linux-2.6.32.46/include/linux/vmstat.h
64855--- linux-2.6.32.46/include/linux/vmstat.h 2011-03-27 14:31:47.000000000 -0400
64856+++ linux-2.6.32.46/include/linux/vmstat.h 2011-04-17 15:56:46.000000000 -0400
64857@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
64858 /*
64859 * Zone based page accounting with per cpu differentials.
64860 */
64861-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64862+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64863
64864 static inline void zone_page_state_add(long x, struct zone *zone,
64865 enum zone_stat_item item)
64866 {
64867- atomic_long_add(x, &zone->vm_stat[item]);
64868- atomic_long_add(x, &vm_stat[item]);
64869+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
64870+ atomic_long_add_unchecked(x, &vm_stat[item]);
64871 }
64872
64873 static inline unsigned long global_page_state(enum zone_stat_item item)
64874 {
64875- long x = atomic_long_read(&vm_stat[item]);
64876+ long x = atomic_long_read_unchecked(&vm_stat[item]);
64877 #ifdef CONFIG_SMP
64878 if (x < 0)
64879 x = 0;
64880@@ -158,7 +158,7 @@ static inline unsigned long global_page_
64881 static inline unsigned long zone_page_state(struct zone *zone,
64882 enum zone_stat_item item)
64883 {
64884- long x = atomic_long_read(&zone->vm_stat[item]);
64885+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64886 #ifdef CONFIG_SMP
64887 if (x < 0)
64888 x = 0;
64889@@ -175,7 +175,7 @@ static inline unsigned long zone_page_st
64890 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
64891 enum zone_stat_item item)
64892 {
64893- long x = atomic_long_read(&zone->vm_stat[item]);
64894+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64895
64896 #ifdef CONFIG_SMP
64897 int cpu;
64898@@ -264,8 +264,8 @@ static inline void __mod_zone_page_state
64899
64900 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
64901 {
64902- atomic_long_inc(&zone->vm_stat[item]);
64903- atomic_long_inc(&vm_stat[item]);
64904+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
64905+ atomic_long_inc_unchecked(&vm_stat[item]);
64906 }
64907
64908 static inline void __inc_zone_page_state(struct page *page,
64909@@ -276,8 +276,8 @@ static inline void __inc_zone_page_state
64910
64911 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
64912 {
64913- atomic_long_dec(&zone->vm_stat[item]);
64914- atomic_long_dec(&vm_stat[item]);
64915+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
64916+ atomic_long_dec_unchecked(&vm_stat[item]);
64917 }
64918
64919 static inline void __dec_zone_page_state(struct page *page,
64920diff -urNp linux-2.6.32.46/include/media/saa7146_vv.h linux-2.6.32.46/include/media/saa7146_vv.h
64921--- linux-2.6.32.46/include/media/saa7146_vv.h 2011-03-27 14:31:47.000000000 -0400
64922+++ linux-2.6.32.46/include/media/saa7146_vv.h 2011-08-23 21:22:38.000000000 -0400
64923@@ -167,7 +167,7 @@ struct saa7146_ext_vv
64924 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
64925
64926 /* the extension can override this */
64927- struct v4l2_ioctl_ops ops;
64928+ v4l2_ioctl_ops_no_const ops;
64929 /* pointer to the saa7146 core ops */
64930 const struct v4l2_ioctl_ops *core_ops;
64931
64932diff -urNp linux-2.6.32.46/include/media/v4l2-dev.h linux-2.6.32.46/include/media/v4l2-dev.h
64933--- linux-2.6.32.46/include/media/v4l2-dev.h 2011-03-27 14:31:47.000000000 -0400
64934+++ linux-2.6.32.46/include/media/v4l2-dev.h 2011-10-08 08:14:40.000000000 -0400
64935@@ -34,7 +34,7 @@ struct v4l2_device;
64936 #define V4L2_FL_UNREGISTERED (0)
64937
64938 struct v4l2_file_operations {
64939- struct module *owner;
64940+ struct module * const owner;
64941 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
64942 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
64943 unsigned int (*poll) (struct file *, struct poll_table_struct *);
64944@@ -46,6 +46,7 @@ struct v4l2_file_operations {
64945 int (*open) (struct file *);
64946 int (*release) (struct file *);
64947 };
64948+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
64949
64950 /*
64951 * Newer version of video_device, handled by videodev2.c
64952diff -urNp linux-2.6.32.46/include/media/v4l2-device.h linux-2.6.32.46/include/media/v4l2-device.h
64953--- linux-2.6.32.46/include/media/v4l2-device.h 2011-03-27 14:31:47.000000000 -0400
64954+++ linux-2.6.32.46/include/media/v4l2-device.h 2011-05-04 17:56:28.000000000 -0400
64955@@ -71,7 +71,7 @@ int __must_check v4l2_device_register(st
64956 this function returns 0. If the name ends with a digit (e.g. cx18),
64957 then the name will be set to cx18-0 since cx180 looks really odd. */
64958 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
64959- atomic_t *instance);
64960+ atomic_unchecked_t *instance);
64961
64962 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
64963 Since the parent disappears this ensures that v4l2_dev doesn't have an
64964diff -urNp linux-2.6.32.46/include/media/v4l2-ioctl.h linux-2.6.32.46/include/media/v4l2-ioctl.h
64965--- linux-2.6.32.46/include/media/v4l2-ioctl.h 2011-03-27 14:31:47.000000000 -0400
64966+++ linux-2.6.32.46/include/media/v4l2-ioctl.h 2011-08-23 21:22:38.000000000 -0400
64967@@ -243,6 +243,7 @@ struct v4l2_ioctl_ops {
64968 long (*vidioc_default) (struct file *file, void *fh,
64969 int cmd, void *arg);
64970 };
64971+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
64972
64973
64974 /* v4l debugging and diagnostics */
64975diff -urNp linux-2.6.32.46/include/net/flow.h linux-2.6.32.46/include/net/flow.h
64976--- linux-2.6.32.46/include/net/flow.h 2011-03-27 14:31:47.000000000 -0400
64977+++ linux-2.6.32.46/include/net/flow.h 2011-05-04 17:56:28.000000000 -0400
64978@@ -92,7 +92,7 @@ typedef int (*flow_resolve_t)(struct net
64979 extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
64980 u8 dir, flow_resolve_t resolver);
64981 extern void flow_cache_flush(void);
64982-extern atomic_t flow_cache_genid;
64983+extern atomic_unchecked_t flow_cache_genid;
64984
64985 static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
64986 {
64987diff -urNp linux-2.6.32.46/include/net/inetpeer.h linux-2.6.32.46/include/net/inetpeer.h
64988--- linux-2.6.32.46/include/net/inetpeer.h 2011-03-27 14:31:47.000000000 -0400
64989+++ linux-2.6.32.46/include/net/inetpeer.h 2011-04-17 15:56:46.000000000 -0400
64990@@ -24,7 +24,7 @@ struct inet_peer
64991 __u32 dtime; /* the time of last use of not
64992 * referenced entries */
64993 atomic_t refcnt;
64994- atomic_t rid; /* Frag reception counter */
64995+ atomic_unchecked_t rid; /* Frag reception counter */
64996 __u32 tcp_ts;
64997 unsigned long tcp_ts_stamp;
64998 };
64999diff -urNp linux-2.6.32.46/include/net/ip_vs.h linux-2.6.32.46/include/net/ip_vs.h
65000--- linux-2.6.32.46/include/net/ip_vs.h 2011-03-27 14:31:47.000000000 -0400
65001+++ linux-2.6.32.46/include/net/ip_vs.h 2011-05-04 17:56:28.000000000 -0400
65002@@ -365,7 +365,7 @@ struct ip_vs_conn {
65003 struct ip_vs_conn *control; /* Master control connection */
65004 atomic_t n_control; /* Number of controlled ones */
65005 struct ip_vs_dest *dest; /* real server */
65006- atomic_t in_pkts; /* incoming packet counter */
65007+ atomic_unchecked_t in_pkts; /* incoming packet counter */
65008
65009 /* packet transmitter for different forwarding methods. If it
65010 mangles the packet, it must return NF_DROP or better NF_STOLEN,
65011@@ -466,7 +466,7 @@ struct ip_vs_dest {
65012 union nf_inet_addr addr; /* IP address of the server */
65013 __be16 port; /* port number of the server */
65014 volatile unsigned flags; /* dest status flags */
65015- atomic_t conn_flags; /* flags to copy to conn */
65016+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
65017 atomic_t weight; /* server weight */
65018
65019 atomic_t refcnt; /* reference counter */
65020diff -urNp linux-2.6.32.46/include/net/irda/ircomm_core.h linux-2.6.32.46/include/net/irda/ircomm_core.h
65021--- linux-2.6.32.46/include/net/irda/ircomm_core.h 2011-03-27 14:31:47.000000000 -0400
65022+++ linux-2.6.32.46/include/net/irda/ircomm_core.h 2011-08-05 20:33:55.000000000 -0400
65023@@ -51,7 +51,7 @@ typedef struct {
65024 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
65025 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
65026 struct ircomm_info *);
65027-} call_t;
65028+} __no_const call_t;
65029
65030 struct ircomm_cb {
65031 irda_queue_t queue;
65032diff -urNp linux-2.6.32.46/include/net/irda/ircomm_tty.h linux-2.6.32.46/include/net/irda/ircomm_tty.h
65033--- linux-2.6.32.46/include/net/irda/ircomm_tty.h 2011-03-27 14:31:47.000000000 -0400
65034+++ linux-2.6.32.46/include/net/irda/ircomm_tty.h 2011-04-17 15:56:46.000000000 -0400
65035@@ -35,6 +35,7 @@
65036 #include <linux/termios.h>
65037 #include <linux/timer.h>
65038 #include <linux/tty.h> /* struct tty_struct */
65039+#include <asm/local.h>
65040
65041 #include <net/irda/irias_object.h>
65042 #include <net/irda/ircomm_core.h>
65043@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
65044 unsigned short close_delay;
65045 unsigned short closing_wait; /* time to wait before closing */
65046
65047- int open_count;
65048- int blocked_open; /* # of blocked opens */
65049+ local_t open_count;
65050+ local_t blocked_open; /* # of blocked opens */
65051
65052 /* Protect concurent access to :
65053 * o self->open_count
65054diff -urNp linux-2.6.32.46/include/net/iucv/af_iucv.h linux-2.6.32.46/include/net/iucv/af_iucv.h
65055--- linux-2.6.32.46/include/net/iucv/af_iucv.h 2011-03-27 14:31:47.000000000 -0400
65056+++ linux-2.6.32.46/include/net/iucv/af_iucv.h 2011-05-04 17:56:28.000000000 -0400
65057@@ -87,7 +87,7 @@ struct iucv_sock {
65058 struct iucv_sock_list {
65059 struct hlist_head head;
65060 rwlock_t lock;
65061- atomic_t autobind_name;
65062+ atomic_unchecked_t autobind_name;
65063 };
65064
65065 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
65066diff -urNp linux-2.6.32.46/include/net/lapb.h linux-2.6.32.46/include/net/lapb.h
65067--- linux-2.6.32.46/include/net/lapb.h 2011-03-27 14:31:47.000000000 -0400
65068+++ linux-2.6.32.46/include/net/lapb.h 2011-08-05 20:33:55.000000000 -0400
65069@@ -95,7 +95,7 @@ struct lapb_cb {
65070 struct sk_buff_head write_queue;
65071 struct sk_buff_head ack_queue;
65072 unsigned char window;
65073- struct lapb_register_struct callbacks;
65074+ struct lapb_register_struct *callbacks;
65075
65076 /* FRMR control information */
65077 struct lapb_frame frmr_data;
65078diff -urNp linux-2.6.32.46/include/net/neighbour.h linux-2.6.32.46/include/net/neighbour.h
65079--- linux-2.6.32.46/include/net/neighbour.h 2011-03-27 14:31:47.000000000 -0400
65080+++ linux-2.6.32.46/include/net/neighbour.h 2011-08-26 20:29:08.000000000 -0400
65081@@ -131,7 +131,7 @@ struct neigh_ops
65082 int (*connected_output)(struct sk_buff*);
65083 int (*hh_output)(struct sk_buff*);
65084 int (*queue_xmit)(struct sk_buff*);
65085-};
65086+} __do_const;
65087
65088 struct pneigh_entry
65089 {
65090diff -urNp linux-2.6.32.46/include/net/netlink.h linux-2.6.32.46/include/net/netlink.h
65091--- linux-2.6.32.46/include/net/netlink.h 2011-07-13 17:23:04.000000000 -0400
65092+++ linux-2.6.32.46/include/net/netlink.h 2011-08-21 18:08:11.000000000 -0400
65093@@ -335,7 +335,7 @@ static inline int nlmsg_ok(const struct
65094 {
65095 return (remaining >= (int) sizeof(struct nlmsghdr) &&
65096 nlh->nlmsg_len >= sizeof(struct nlmsghdr) &&
65097- nlh->nlmsg_len <= remaining);
65098+ nlh->nlmsg_len <= (unsigned int)remaining);
65099 }
65100
65101 /**
65102@@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
65103 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
65104 {
65105 if (mark)
65106- skb_trim(skb, (unsigned char *) mark - skb->data);
65107+ skb_trim(skb, (const unsigned char *) mark - skb->data);
65108 }
65109
65110 /**
65111diff -urNp linux-2.6.32.46/include/net/netns/ipv4.h linux-2.6.32.46/include/net/netns/ipv4.h
65112--- linux-2.6.32.46/include/net/netns/ipv4.h 2011-03-27 14:31:47.000000000 -0400
65113+++ linux-2.6.32.46/include/net/netns/ipv4.h 2011-05-04 17:56:28.000000000 -0400
65114@@ -54,7 +54,7 @@ struct netns_ipv4 {
65115 int current_rt_cache_rebuild_count;
65116
65117 struct timer_list rt_secret_timer;
65118- atomic_t rt_genid;
65119+ atomic_unchecked_t rt_genid;
65120
65121 #ifdef CONFIG_IP_MROUTE
65122 struct sock *mroute_sk;
65123diff -urNp linux-2.6.32.46/include/net/sctp/sctp.h linux-2.6.32.46/include/net/sctp/sctp.h
65124--- linux-2.6.32.46/include/net/sctp/sctp.h 2011-03-27 14:31:47.000000000 -0400
65125+++ linux-2.6.32.46/include/net/sctp/sctp.h 2011-04-17 15:56:46.000000000 -0400
65126@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
65127
65128 #else /* SCTP_DEBUG */
65129
65130-#define SCTP_DEBUG_PRINTK(whatever...)
65131-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
65132+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
65133+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
65134 #define SCTP_ENABLE_DEBUG
65135 #define SCTP_DISABLE_DEBUG
65136 #define SCTP_ASSERT(expr, str, func)
65137diff -urNp linux-2.6.32.46/include/net/secure_seq.h linux-2.6.32.46/include/net/secure_seq.h
65138--- linux-2.6.32.46/include/net/secure_seq.h 2011-08-16 20:37:25.000000000 -0400
65139+++ linux-2.6.32.46/include/net/secure_seq.h 2011-08-07 19:48:09.000000000 -0400
65140@@ -7,14 +7,14 @@ extern __u32 secure_ip_id(__be32 daddr);
65141 extern __u32 secure_ipv6_id(const __be32 daddr[4]);
65142 extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
65143 extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
65144- __be16 dport);
65145+ __be16 dport);
65146 extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
65147 __be16 sport, __be16 dport);
65148 extern __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
65149- __be16 sport, __be16 dport);
65150+ __be16 sport, __be16 dport);
65151 extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
65152- __be16 sport, __be16 dport);
65153+ __be16 sport, __be16 dport);
65154 extern u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
65155- __be16 sport, __be16 dport);
65156+ __be16 sport, __be16 dport);
65157
65158 #endif /* _NET_SECURE_SEQ */
65159diff -urNp linux-2.6.32.46/include/net/sock.h linux-2.6.32.46/include/net/sock.h
65160--- linux-2.6.32.46/include/net/sock.h 2011-03-27 14:31:47.000000000 -0400
65161+++ linux-2.6.32.46/include/net/sock.h 2011-08-21 17:24:37.000000000 -0400
65162@@ -272,7 +272,7 @@ struct sock {
65163 rwlock_t sk_callback_lock;
65164 int sk_err,
65165 sk_err_soft;
65166- atomic_t sk_drops;
65167+ atomic_unchecked_t sk_drops;
65168 unsigned short sk_ack_backlog;
65169 unsigned short sk_max_ack_backlog;
65170 __u32 sk_priority;
65171@@ -737,7 +737,7 @@ static inline void sk_refcnt_debug_relea
65172 extern void sock_prot_inuse_add(struct net *net, struct proto *prot, int inc);
65173 extern int sock_prot_inuse_get(struct net *net, struct proto *proto);
65174 #else
65175-static void inline sock_prot_inuse_add(struct net *net, struct proto *prot,
65176+static inline void sock_prot_inuse_add(struct net *net, struct proto *prot,
65177 int inc)
65178 {
65179 }
65180diff -urNp linux-2.6.32.46/include/net/tcp.h linux-2.6.32.46/include/net/tcp.h
65181--- linux-2.6.32.46/include/net/tcp.h 2011-03-27 14:31:47.000000000 -0400
65182+++ linux-2.6.32.46/include/net/tcp.h 2011-08-23 21:29:10.000000000 -0400
65183@@ -1444,8 +1444,8 @@ enum tcp_seq_states {
65184 struct tcp_seq_afinfo {
65185 char *name;
65186 sa_family_t family;
65187- struct file_operations seq_fops;
65188- struct seq_operations seq_ops;
65189+ file_operations_no_const seq_fops;
65190+ seq_operations_no_const seq_ops;
65191 };
65192
65193 struct tcp_iter_state {
65194diff -urNp linux-2.6.32.46/include/net/udp.h linux-2.6.32.46/include/net/udp.h
65195--- linux-2.6.32.46/include/net/udp.h 2011-03-27 14:31:47.000000000 -0400
65196+++ linux-2.6.32.46/include/net/udp.h 2011-08-23 21:29:34.000000000 -0400
65197@@ -187,8 +187,8 @@ struct udp_seq_afinfo {
65198 char *name;
65199 sa_family_t family;
65200 struct udp_table *udp_table;
65201- struct file_operations seq_fops;
65202- struct seq_operations seq_ops;
65203+ file_operations_no_const seq_fops;
65204+ seq_operations_no_const seq_ops;
65205 };
65206
65207 struct udp_iter_state {
65208diff -urNp linux-2.6.32.46/include/rdma/iw_cm.h linux-2.6.32.46/include/rdma/iw_cm.h
65209--- linux-2.6.32.46/include/rdma/iw_cm.h 2011-03-27 14:31:47.000000000 -0400
65210+++ linux-2.6.32.46/include/rdma/iw_cm.h 2011-08-05 20:33:55.000000000 -0400
65211@@ -129,7 +129,7 @@ struct iw_cm_verbs {
65212 int backlog);
65213
65214 int (*destroy_listen)(struct iw_cm_id *cm_id);
65215-};
65216+} __no_const;
65217
65218 /**
65219 * iw_create_cm_id - Create an IW CM identifier.
65220diff -urNp linux-2.6.32.46/include/scsi/libfc.h linux-2.6.32.46/include/scsi/libfc.h
65221--- linux-2.6.32.46/include/scsi/libfc.h 2011-03-27 14:31:47.000000000 -0400
65222+++ linux-2.6.32.46/include/scsi/libfc.h 2011-08-23 21:22:38.000000000 -0400
65223@@ -675,6 +675,7 @@ struct libfc_function_template {
65224 */
65225 void (*disc_stop_final) (struct fc_lport *);
65226 };
65227+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
65228
65229 /* information used by the discovery layer */
65230 struct fc_disc {
65231@@ -707,7 +708,7 @@ struct fc_lport {
65232 struct fc_disc disc;
65233
65234 /* Operational Information */
65235- struct libfc_function_template tt;
65236+ libfc_function_template_no_const tt;
65237 u8 link_up;
65238 u8 qfull;
65239 enum fc_lport_state state;
65240diff -urNp linux-2.6.32.46/include/scsi/scsi_device.h linux-2.6.32.46/include/scsi/scsi_device.h
65241--- linux-2.6.32.46/include/scsi/scsi_device.h 2011-04-17 17:00:52.000000000 -0400
65242+++ linux-2.6.32.46/include/scsi/scsi_device.h 2011-05-04 17:56:28.000000000 -0400
65243@@ -156,9 +156,9 @@ struct scsi_device {
65244 unsigned int max_device_blocked; /* what device_blocked counts down from */
65245 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
65246
65247- atomic_t iorequest_cnt;
65248- atomic_t iodone_cnt;
65249- atomic_t ioerr_cnt;
65250+ atomic_unchecked_t iorequest_cnt;
65251+ atomic_unchecked_t iodone_cnt;
65252+ atomic_unchecked_t ioerr_cnt;
65253
65254 struct device sdev_gendev,
65255 sdev_dev;
65256diff -urNp linux-2.6.32.46/include/scsi/scsi_transport_fc.h linux-2.6.32.46/include/scsi/scsi_transport_fc.h
65257--- linux-2.6.32.46/include/scsi/scsi_transport_fc.h 2011-03-27 14:31:47.000000000 -0400
65258+++ linux-2.6.32.46/include/scsi/scsi_transport_fc.h 2011-08-26 20:19:09.000000000 -0400
65259@@ -708,7 +708,7 @@ struct fc_function_template {
65260 unsigned long show_host_system_hostname:1;
65261
65262 unsigned long disable_target_scan:1;
65263-};
65264+} __do_const;
65265
65266
65267 /**
65268diff -urNp linux-2.6.32.46/include/sound/ac97_codec.h linux-2.6.32.46/include/sound/ac97_codec.h
65269--- linux-2.6.32.46/include/sound/ac97_codec.h 2011-03-27 14:31:47.000000000 -0400
65270+++ linux-2.6.32.46/include/sound/ac97_codec.h 2011-04-17 15:56:46.000000000 -0400
65271@@ -419,15 +419,15 @@
65272 struct snd_ac97;
65273
65274 struct snd_ac97_build_ops {
65275- int (*build_3d) (struct snd_ac97 *ac97);
65276- int (*build_specific) (struct snd_ac97 *ac97);
65277- int (*build_spdif) (struct snd_ac97 *ac97);
65278- int (*build_post_spdif) (struct snd_ac97 *ac97);
65279+ int (* const build_3d) (struct snd_ac97 *ac97);
65280+ int (* const build_specific) (struct snd_ac97 *ac97);
65281+ int (* const build_spdif) (struct snd_ac97 *ac97);
65282+ int (* const build_post_spdif) (struct snd_ac97 *ac97);
65283 #ifdef CONFIG_PM
65284- void (*suspend) (struct snd_ac97 *ac97);
65285- void (*resume) (struct snd_ac97 *ac97);
65286+ void (* const suspend) (struct snd_ac97 *ac97);
65287+ void (* const resume) (struct snd_ac97 *ac97);
65288 #endif
65289- void (*update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */
65290+ void (* const update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */
65291 };
65292
65293 struct snd_ac97_bus_ops {
65294@@ -477,7 +477,7 @@ struct snd_ac97_template {
65295
65296 struct snd_ac97 {
65297 /* -- lowlevel (hardware) driver specific -- */
65298- struct snd_ac97_build_ops * build_ops;
65299+ const struct snd_ac97_build_ops * build_ops;
65300 void *private_data;
65301 void (*private_free) (struct snd_ac97 *ac97);
65302 /* --- */
65303diff -urNp linux-2.6.32.46/include/sound/ak4xxx-adda.h linux-2.6.32.46/include/sound/ak4xxx-adda.h
65304--- linux-2.6.32.46/include/sound/ak4xxx-adda.h 2011-03-27 14:31:47.000000000 -0400
65305+++ linux-2.6.32.46/include/sound/ak4xxx-adda.h 2011-08-05 20:33:55.000000000 -0400
65306@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
65307 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
65308 unsigned char val);
65309 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
65310-};
65311+} __no_const;
65312
65313 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
65314
65315diff -urNp linux-2.6.32.46/include/sound/hwdep.h linux-2.6.32.46/include/sound/hwdep.h
65316--- linux-2.6.32.46/include/sound/hwdep.h 2011-03-27 14:31:47.000000000 -0400
65317+++ linux-2.6.32.46/include/sound/hwdep.h 2011-08-05 20:33:55.000000000 -0400
65318@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
65319 struct snd_hwdep_dsp_status *status);
65320 int (*dsp_load)(struct snd_hwdep *hw,
65321 struct snd_hwdep_dsp_image *image);
65322-};
65323+} __no_const;
65324
65325 struct snd_hwdep {
65326 struct snd_card *card;
65327diff -urNp linux-2.6.32.46/include/sound/info.h linux-2.6.32.46/include/sound/info.h
65328--- linux-2.6.32.46/include/sound/info.h 2011-03-27 14:31:47.000000000 -0400
65329+++ linux-2.6.32.46/include/sound/info.h 2011-08-05 20:33:55.000000000 -0400
65330@@ -44,7 +44,7 @@ struct snd_info_entry_text {
65331 struct snd_info_buffer *buffer);
65332 void (*write)(struct snd_info_entry *entry,
65333 struct snd_info_buffer *buffer);
65334-};
65335+} __no_const;
65336
65337 struct snd_info_entry_ops {
65338 int (*open)(struct snd_info_entry *entry,
65339diff -urNp linux-2.6.32.46/include/sound/pcm.h linux-2.6.32.46/include/sound/pcm.h
65340--- linux-2.6.32.46/include/sound/pcm.h 2011-03-27 14:31:47.000000000 -0400
65341+++ linux-2.6.32.46/include/sound/pcm.h 2011-08-23 21:22:38.000000000 -0400
65342@@ -80,6 +80,7 @@ struct snd_pcm_ops {
65343 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
65344 int (*ack)(struct snd_pcm_substream *substream);
65345 };
65346+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
65347
65348 /*
65349 *
65350diff -urNp linux-2.6.32.46/include/sound/sb16_csp.h linux-2.6.32.46/include/sound/sb16_csp.h
65351--- linux-2.6.32.46/include/sound/sb16_csp.h 2011-03-27 14:31:47.000000000 -0400
65352+++ linux-2.6.32.46/include/sound/sb16_csp.h 2011-08-05 20:33:55.000000000 -0400
65353@@ -139,7 +139,7 @@ struct snd_sb_csp_ops {
65354 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
65355 int (*csp_stop) (struct snd_sb_csp * p);
65356 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
65357-};
65358+} __no_const;
65359
65360 /*
65361 * CSP private data
65362diff -urNp linux-2.6.32.46/include/sound/ymfpci.h linux-2.6.32.46/include/sound/ymfpci.h
65363--- linux-2.6.32.46/include/sound/ymfpci.h 2011-03-27 14:31:47.000000000 -0400
65364+++ linux-2.6.32.46/include/sound/ymfpci.h 2011-05-04 17:56:28.000000000 -0400
65365@@ -358,7 +358,7 @@ struct snd_ymfpci {
65366 spinlock_t reg_lock;
65367 spinlock_t voice_lock;
65368 wait_queue_head_t interrupt_sleep;
65369- atomic_t interrupt_sleep_count;
65370+ atomic_unchecked_t interrupt_sleep_count;
65371 struct snd_info_entry *proc_entry;
65372 const struct firmware *dsp_microcode;
65373 const struct firmware *controller_microcode;
65374diff -urNp linux-2.6.32.46/include/trace/events/irq.h linux-2.6.32.46/include/trace/events/irq.h
65375--- linux-2.6.32.46/include/trace/events/irq.h 2011-03-27 14:31:47.000000000 -0400
65376+++ linux-2.6.32.46/include/trace/events/irq.h 2011-04-17 15:56:46.000000000 -0400
65377@@ -34,7 +34,7 @@
65378 */
65379 TRACE_EVENT(irq_handler_entry,
65380
65381- TP_PROTO(int irq, struct irqaction *action),
65382+ TP_PROTO(int irq, const struct irqaction *action),
65383
65384 TP_ARGS(irq, action),
65385
65386@@ -64,7 +64,7 @@ TRACE_EVENT(irq_handler_entry,
65387 */
65388 TRACE_EVENT(irq_handler_exit,
65389
65390- TP_PROTO(int irq, struct irqaction *action, int ret),
65391+ TP_PROTO(int irq, const struct irqaction *action, int ret),
65392
65393 TP_ARGS(irq, action, ret),
65394
65395@@ -95,7 +95,7 @@ TRACE_EVENT(irq_handler_exit,
65396 */
65397 TRACE_EVENT(softirq_entry,
65398
65399- TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
65400+ TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
65401
65402 TP_ARGS(h, vec),
65403
65404@@ -124,7 +124,7 @@ TRACE_EVENT(softirq_entry,
65405 */
65406 TRACE_EVENT(softirq_exit,
65407
65408- TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
65409+ TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
65410
65411 TP_ARGS(h, vec),
65412
65413diff -urNp linux-2.6.32.46/include/video/uvesafb.h linux-2.6.32.46/include/video/uvesafb.h
65414--- linux-2.6.32.46/include/video/uvesafb.h 2011-03-27 14:31:47.000000000 -0400
65415+++ linux-2.6.32.46/include/video/uvesafb.h 2011-04-17 15:56:46.000000000 -0400
65416@@ -177,6 +177,7 @@ struct uvesafb_par {
65417 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
65418 u8 pmi_setpal; /* PMI for palette changes */
65419 u16 *pmi_base; /* protected mode interface location */
65420+ u8 *pmi_code; /* protected mode code location */
65421 void *pmi_start;
65422 void *pmi_pal;
65423 u8 *vbe_state_orig; /*
65424diff -urNp linux-2.6.32.46/init/do_mounts.c linux-2.6.32.46/init/do_mounts.c
65425--- linux-2.6.32.46/init/do_mounts.c 2011-03-27 14:31:47.000000000 -0400
65426+++ linux-2.6.32.46/init/do_mounts.c 2011-04-17 15:56:46.000000000 -0400
65427@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
65428
65429 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
65430 {
65431- int err = sys_mount(name, "/root", fs, flags, data);
65432+ int err = sys_mount((__force char __user *)name, (__force char __user *)"/root", (__force char __user *)fs, flags, (__force void __user *)data);
65433 if (err)
65434 return err;
65435
65436- sys_chdir("/root");
65437+ sys_chdir((__force const char __user *)"/root");
65438 ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
65439 printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
65440 current->fs->pwd.mnt->mnt_sb->s_type->name,
65441@@ -311,18 +311,18 @@ void __init change_floppy(char *fmt, ...
65442 va_start(args, fmt);
65443 vsprintf(buf, fmt, args);
65444 va_end(args);
65445- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
65446+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
65447 if (fd >= 0) {
65448 sys_ioctl(fd, FDEJECT, 0);
65449 sys_close(fd);
65450 }
65451 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
65452- fd = sys_open("/dev/console", O_RDWR, 0);
65453+ fd = sys_open((char __user *)"/dev/console", O_RDWR, 0);
65454 if (fd >= 0) {
65455 sys_ioctl(fd, TCGETS, (long)&termios);
65456 termios.c_lflag &= ~ICANON;
65457 sys_ioctl(fd, TCSETSF, (long)&termios);
65458- sys_read(fd, &c, 1);
65459+ sys_read(fd, (char __user *)&c, 1);
65460 termios.c_lflag |= ICANON;
65461 sys_ioctl(fd, TCSETSF, (long)&termios);
65462 sys_close(fd);
65463@@ -416,6 +416,6 @@ void __init prepare_namespace(void)
65464 mount_root();
65465 out:
65466 devtmpfs_mount("dev");
65467- sys_mount(".", "/", NULL, MS_MOVE, NULL);
65468- sys_chroot(".");
65469+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
65470+ sys_chroot((__force char __user *)".");
65471 }
65472diff -urNp linux-2.6.32.46/init/do_mounts.h linux-2.6.32.46/init/do_mounts.h
65473--- linux-2.6.32.46/init/do_mounts.h 2011-03-27 14:31:47.000000000 -0400
65474+++ linux-2.6.32.46/init/do_mounts.h 2011-10-06 09:37:14.000000000 -0400
65475@@ -15,15 +15,15 @@ extern int root_mountflags;
65476
65477 static inline int create_dev(char *name, dev_t dev)
65478 {
65479- sys_unlink(name);
65480- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
65481+ sys_unlink((char __force_user *)name);
65482+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
65483 }
65484
65485 #if BITS_PER_LONG == 32
65486 static inline u32 bstat(char *name)
65487 {
65488 struct stat64 stat;
65489- if (sys_stat64(name, &stat) != 0)
65490+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
65491 return 0;
65492 if (!S_ISBLK(stat.st_mode))
65493 return 0;
65494@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
65495 static inline u32 bstat(char *name)
65496 {
65497 struct stat stat;
65498- if (sys_newstat(name, &stat) != 0)
65499+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
65500 return 0;
65501 if (!S_ISBLK(stat.st_mode))
65502 return 0;
65503diff -urNp linux-2.6.32.46/init/do_mounts_initrd.c linux-2.6.32.46/init/do_mounts_initrd.c
65504--- linux-2.6.32.46/init/do_mounts_initrd.c 2011-03-27 14:31:47.000000000 -0400
65505+++ linux-2.6.32.46/init/do_mounts_initrd.c 2011-10-06 09:37:14.000000000 -0400
65506@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
65507 sys_close(old_fd);sys_close(root_fd);
65508 sys_close(0);sys_close(1);sys_close(2);
65509 sys_setsid();
65510- (void) sys_open("/dev/console",O_RDWR,0);
65511+ (void) sys_open((__force const char __user *)"/dev/console",O_RDWR,0);
65512 (void) sys_dup(0);
65513 (void) sys_dup(0);
65514 return kernel_execve(shell, argv, envp_init);
65515@@ -47,13 +47,13 @@ static void __init handle_initrd(void)
65516 create_dev("/dev/root.old", Root_RAM0);
65517 /* mount initrd on rootfs' /root */
65518 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
65519- sys_mkdir("/old", 0700);
65520- root_fd = sys_open("/", 0, 0);
65521- old_fd = sys_open("/old", 0, 0);
65522+ sys_mkdir((const char __force_user *)"/old", 0700);
65523+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
65524+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
65525 /* move initrd over / and chdir/chroot in initrd root */
65526- sys_chdir("/root");
65527- sys_mount(".", "/", NULL, MS_MOVE, NULL);
65528- sys_chroot(".");
65529+ sys_chdir((const char __force_user *)"/root");
65530+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
65531+ sys_chroot((const char __force_user *)".");
65532
65533 /*
65534 * In case that a resume from disk is carried out by linuxrc or one of
65535@@ -70,15 +70,15 @@ static void __init handle_initrd(void)
65536
65537 /* move initrd to rootfs' /old */
65538 sys_fchdir(old_fd);
65539- sys_mount("/", ".", NULL, MS_MOVE, NULL);
65540+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
65541 /* switch root and cwd back to / of rootfs */
65542 sys_fchdir(root_fd);
65543- sys_chroot(".");
65544+ sys_chroot((const char __force_user *)".");
65545 sys_close(old_fd);
65546 sys_close(root_fd);
65547
65548 if (new_decode_dev(real_root_dev) == Root_RAM0) {
65549- sys_chdir("/old");
65550+ sys_chdir((const char __force_user *)"/old");
65551 return;
65552 }
65553
65554@@ -86,17 +86,17 @@ static void __init handle_initrd(void)
65555 mount_root();
65556
65557 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
65558- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
65559+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
65560 if (!error)
65561 printk("okay\n");
65562 else {
65563- int fd = sys_open("/dev/root.old", O_RDWR, 0);
65564+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
65565 if (error == -ENOENT)
65566 printk("/initrd does not exist. Ignored.\n");
65567 else
65568 printk("failed\n");
65569 printk(KERN_NOTICE "Unmounting old root\n");
65570- sys_umount("/old", MNT_DETACH);
65571+ sys_umount((char __force_user *)"/old", MNT_DETACH);
65572 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
65573 if (fd < 0) {
65574 error = fd;
65575@@ -119,11 +119,11 @@ int __init initrd_load(void)
65576 * mounted in the normal path.
65577 */
65578 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
65579- sys_unlink("/initrd.image");
65580+ sys_unlink((const char __force_user *)"/initrd.image");
65581 handle_initrd();
65582 return 1;
65583 }
65584 }
65585- sys_unlink("/initrd.image");
65586+ sys_unlink((const char __force_user *)"/initrd.image");
65587 return 0;
65588 }
65589diff -urNp linux-2.6.32.46/init/do_mounts_md.c linux-2.6.32.46/init/do_mounts_md.c
65590--- linux-2.6.32.46/init/do_mounts_md.c 2011-03-27 14:31:47.000000000 -0400
65591+++ linux-2.6.32.46/init/do_mounts_md.c 2011-10-06 09:37:14.000000000 -0400
65592@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
65593 partitioned ? "_d" : "", minor,
65594 md_setup_args[ent].device_names);
65595
65596- fd = sys_open(name, 0, 0);
65597+ fd = sys_open((char __force_user *)name, 0, 0);
65598 if (fd < 0) {
65599 printk(KERN_ERR "md: open failed - cannot start "
65600 "array %s\n", name);
65601@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
65602 * array without it
65603 */
65604 sys_close(fd);
65605- fd = sys_open(name, 0, 0);
65606+ fd = sys_open((char __force_user *)name, 0, 0);
65607 sys_ioctl(fd, BLKRRPART, 0);
65608 }
65609 sys_close(fd);
65610@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
65611
65612 wait_for_device_probe();
65613
65614- fd = sys_open("/dev/md0", 0, 0);
65615+ fd = sys_open((__force char __user *)"/dev/md0", 0, 0);
65616 if (fd >= 0) {
65617 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
65618 sys_close(fd);
65619diff -urNp linux-2.6.32.46/init/initramfs.c linux-2.6.32.46/init/initramfs.c
65620--- linux-2.6.32.46/init/initramfs.c 2011-03-27 14:31:47.000000000 -0400
65621+++ linux-2.6.32.46/init/initramfs.c 2011-10-06 09:37:14.000000000 -0400
65622@@ -74,7 +74,7 @@ static void __init free_hash(void)
65623 }
65624 }
65625
65626-static long __init do_utime(char __user *filename, time_t mtime)
65627+static long __init do_utime(__force char __user *filename, time_t mtime)
65628 {
65629 struct timespec t[2];
65630
65631@@ -109,7 +109,7 @@ static void __init dir_utime(void)
65632 struct dir_entry *de, *tmp;
65633 list_for_each_entry_safe(de, tmp, &dir_list, list) {
65634 list_del(&de->list);
65635- do_utime(de->name, de->mtime);
65636+ do_utime((char __force_user *)de->name, de->mtime);
65637 kfree(de->name);
65638 kfree(de);
65639 }
65640@@ -271,7 +271,7 @@ static int __init maybe_link(void)
65641 if (nlink >= 2) {
65642 char *old = find_link(major, minor, ino, mode, collected);
65643 if (old)
65644- return (sys_link(old, collected) < 0) ? -1 : 1;
65645+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
65646 }
65647 return 0;
65648 }
65649@@ -280,11 +280,11 @@ static void __init clean_path(char *path
65650 {
65651 struct stat st;
65652
65653- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
65654+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
65655 if (S_ISDIR(st.st_mode))
65656- sys_rmdir(path);
65657+ sys_rmdir((char __force_user *)path);
65658 else
65659- sys_unlink(path);
65660+ sys_unlink((char __force_user *)path);
65661 }
65662 }
65663
65664@@ -305,7 +305,7 @@ static int __init do_name(void)
65665 int openflags = O_WRONLY|O_CREAT;
65666 if (ml != 1)
65667 openflags |= O_TRUNC;
65668- wfd = sys_open(collected, openflags, mode);
65669+ wfd = sys_open((char __force_user *)collected, openflags, mode);
65670
65671 if (wfd >= 0) {
65672 sys_fchown(wfd, uid, gid);
65673@@ -317,17 +317,17 @@ static int __init do_name(void)
65674 }
65675 }
65676 } else if (S_ISDIR(mode)) {
65677- sys_mkdir(collected, mode);
65678- sys_chown(collected, uid, gid);
65679- sys_chmod(collected, mode);
65680+ sys_mkdir((char __force_user *)collected, mode);
65681+ sys_chown((char __force_user *)collected, uid, gid);
65682+ sys_chmod((char __force_user *)collected, mode);
65683 dir_add(collected, mtime);
65684 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
65685 S_ISFIFO(mode) || S_ISSOCK(mode)) {
65686 if (maybe_link() == 0) {
65687- sys_mknod(collected, mode, rdev);
65688- sys_chown(collected, uid, gid);
65689- sys_chmod(collected, mode);
65690- do_utime(collected, mtime);
65691+ sys_mknod((char __force_user *)collected, mode, rdev);
65692+ sys_chown((char __force_user *)collected, uid, gid);
65693+ sys_chmod((char __force_user *)collected, mode);
65694+ do_utime((char __force_user *)collected, mtime);
65695 }
65696 }
65697 return 0;
65698@@ -336,15 +336,15 @@ static int __init do_name(void)
65699 static int __init do_copy(void)
65700 {
65701 if (count >= body_len) {
65702- sys_write(wfd, victim, body_len);
65703+ sys_write(wfd, (char __force_user *)victim, body_len);
65704 sys_close(wfd);
65705- do_utime(vcollected, mtime);
65706+ do_utime((char __force_user *)vcollected, mtime);
65707 kfree(vcollected);
65708 eat(body_len);
65709 state = SkipIt;
65710 return 0;
65711 } else {
65712- sys_write(wfd, victim, count);
65713+ sys_write(wfd, (char __force_user *)victim, count);
65714 body_len -= count;
65715 eat(count);
65716 return 1;
65717@@ -355,9 +355,9 @@ static int __init do_symlink(void)
65718 {
65719 collected[N_ALIGN(name_len) + body_len] = '\0';
65720 clean_path(collected, 0);
65721- sys_symlink(collected + N_ALIGN(name_len), collected);
65722- sys_lchown(collected, uid, gid);
65723- do_utime(collected, mtime);
65724+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
65725+ sys_lchown((char __force_user *)collected, uid, gid);
65726+ do_utime((char __force_user *)collected, mtime);
65727 state = SkipIt;
65728 next_state = Reset;
65729 return 0;
65730diff -urNp linux-2.6.32.46/init/Kconfig linux-2.6.32.46/init/Kconfig
65731--- linux-2.6.32.46/init/Kconfig 2011-05-10 22:12:01.000000000 -0400
65732+++ linux-2.6.32.46/init/Kconfig 2011-05-10 22:12:34.000000000 -0400
65733@@ -1004,7 +1004,7 @@ config SLUB_DEBUG
65734
65735 config COMPAT_BRK
65736 bool "Disable heap randomization"
65737- default y
65738+ default n
65739 help
65740 Randomizing heap placement makes heap exploits harder, but it
65741 also breaks ancient binaries (including anything libc5 based).
65742diff -urNp linux-2.6.32.46/init/main.c linux-2.6.32.46/init/main.c
65743--- linux-2.6.32.46/init/main.c 2011-05-10 22:12:01.000000000 -0400
65744+++ linux-2.6.32.46/init/main.c 2011-10-06 09:37:14.000000000 -0400
65745@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
65746 #ifdef CONFIG_TC
65747 extern void tc_init(void);
65748 #endif
65749+extern void grsecurity_init(void);
65750
65751 enum system_states system_state __read_mostly;
65752 EXPORT_SYMBOL(system_state);
65753@@ -183,6 +184,49 @@ static int __init set_reset_devices(char
65754
65755 __setup("reset_devices", set_reset_devices);
65756
65757+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
65758+extern char pax_enter_kernel_user[];
65759+extern char pax_exit_kernel_user[];
65760+extern pgdval_t clone_pgd_mask;
65761+#endif
65762+
65763+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
65764+static int __init setup_pax_nouderef(char *str)
65765+{
65766+#ifdef CONFIG_X86_32
65767+ unsigned int cpu;
65768+ struct desc_struct *gdt;
65769+
65770+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
65771+ gdt = get_cpu_gdt_table(cpu);
65772+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
65773+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
65774+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
65775+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
65776+ }
65777+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
65778+#else
65779+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
65780+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
65781+ clone_pgd_mask = ~(pgdval_t)0UL;
65782+#endif
65783+
65784+ return 0;
65785+}
65786+early_param("pax_nouderef", setup_pax_nouderef);
65787+#endif
65788+
65789+#ifdef CONFIG_PAX_SOFTMODE
65790+int pax_softmode;
65791+
65792+static int __init setup_pax_softmode(char *str)
65793+{
65794+ get_option(&str, &pax_softmode);
65795+ return 1;
65796+}
65797+__setup("pax_softmode=", setup_pax_softmode);
65798+#endif
65799+
65800 static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
65801 char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
65802 static const char *panic_later, *panic_param;
65803@@ -705,52 +749,53 @@ int initcall_debug;
65804 core_param(initcall_debug, initcall_debug, bool, 0644);
65805
65806 static char msgbuf[64];
65807-static struct boot_trace_call call;
65808-static struct boot_trace_ret ret;
65809+static struct boot_trace_call trace_call;
65810+static struct boot_trace_ret trace_ret;
65811
65812 int do_one_initcall(initcall_t fn)
65813 {
65814 int count = preempt_count();
65815 ktime_t calltime, delta, rettime;
65816+ const char *msg1 = "", *msg2 = "";
65817
65818 if (initcall_debug) {
65819- call.caller = task_pid_nr(current);
65820- printk("calling %pF @ %i\n", fn, call.caller);
65821+ trace_call.caller = task_pid_nr(current);
65822+ printk("calling %pF @ %i\n", fn, trace_call.caller);
65823 calltime = ktime_get();
65824- trace_boot_call(&call, fn);
65825+ trace_boot_call(&trace_call, fn);
65826 enable_boot_trace();
65827 }
65828
65829- ret.result = fn();
65830+ trace_ret.result = fn();
65831
65832 if (initcall_debug) {
65833 disable_boot_trace();
65834 rettime = ktime_get();
65835 delta = ktime_sub(rettime, calltime);
65836- ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
65837- trace_boot_ret(&ret, fn);
65838+ trace_ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
65839+ trace_boot_ret(&trace_ret, fn);
65840 printk("initcall %pF returned %d after %Ld usecs\n", fn,
65841- ret.result, ret.duration);
65842+ trace_ret.result, trace_ret.duration);
65843 }
65844
65845 msgbuf[0] = 0;
65846
65847- if (ret.result && ret.result != -ENODEV && initcall_debug)
65848- sprintf(msgbuf, "error code %d ", ret.result);
65849+ if (trace_ret.result && trace_ret.result != -ENODEV && initcall_debug)
65850+ sprintf(msgbuf, "error code %d ", trace_ret.result);
65851
65852 if (preempt_count() != count) {
65853- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
65854+ msg1 = " preemption imbalance";
65855 preempt_count() = count;
65856 }
65857 if (irqs_disabled()) {
65858- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
65859+ msg2 = " disabled interrupts";
65860 local_irq_enable();
65861 }
65862- if (msgbuf[0]) {
65863- printk("initcall %pF returned with %s\n", fn, msgbuf);
65864+ if (msgbuf[0] || *msg1 || *msg2) {
65865+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
65866 }
65867
65868- return ret.result;
65869+ return trace_ret.result;
65870 }
65871
65872
65873@@ -893,11 +938,13 @@ static int __init kernel_init(void * unu
65874 if (!ramdisk_execute_command)
65875 ramdisk_execute_command = "/init";
65876
65877- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
65878+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
65879 ramdisk_execute_command = NULL;
65880 prepare_namespace();
65881 }
65882
65883+ grsecurity_init();
65884+
65885 /*
65886 * Ok, we have completed the initial bootup, and
65887 * we're essentially up and running. Get rid of the
65888diff -urNp linux-2.6.32.46/init/noinitramfs.c linux-2.6.32.46/init/noinitramfs.c
65889--- linux-2.6.32.46/init/noinitramfs.c 2011-03-27 14:31:47.000000000 -0400
65890+++ linux-2.6.32.46/init/noinitramfs.c 2011-04-17 15:56:46.000000000 -0400
65891@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
65892 {
65893 int err;
65894
65895- err = sys_mkdir("/dev", 0755);
65896+ err = sys_mkdir((const char __user *)"/dev", 0755);
65897 if (err < 0)
65898 goto out;
65899
65900@@ -39,7 +39,7 @@ static int __init default_rootfs(void)
65901 if (err < 0)
65902 goto out;
65903
65904- err = sys_mkdir("/root", 0700);
65905+ err = sys_mkdir((const char __user *)"/root", 0700);
65906 if (err < 0)
65907 goto out;
65908
65909diff -urNp linux-2.6.32.46/ipc/mqueue.c linux-2.6.32.46/ipc/mqueue.c
65910--- linux-2.6.32.46/ipc/mqueue.c 2011-03-27 14:31:47.000000000 -0400
65911+++ linux-2.6.32.46/ipc/mqueue.c 2011-04-17 15:56:46.000000000 -0400
65912@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
65913 mq_bytes = (mq_msg_tblsz +
65914 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
65915
65916+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
65917 spin_lock(&mq_lock);
65918 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
65919 u->mq_bytes + mq_bytes >
65920diff -urNp linux-2.6.32.46/ipc/msg.c linux-2.6.32.46/ipc/msg.c
65921--- linux-2.6.32.46/ipc/msg.c 2011-03-27 14:31:47.000000000 -0400
65922+++ linux-2.6.32.46/ipc/msg.c 2011-08-05 20:33:55.000000000 -0400
65923@@ -310,18 +310,19 @@ static inline int msg_security(struct ke
65924 return security_msg_queue_associate(msq, msgflg);
65925 }
65926
65927+static struct ipc_ops msg_ops = {
65928+ .getnew = newque,
65929+ .associate = msg_security,
65930+ .more_checks = NULL
65931+};
65932+
65933 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
65934 {
65935 struct ipc_namespace *ns;
65936- struct ipc_ops msg_ops;
65937 struct ipc_params msg_params;
65938
65939 ns = current->nsproxy->ipc_ns;
65940
65941- msg_ops.getnew = newque;
65942- msg_ops.associate = msg_security;
65943- msg_ops.more_checks = NULL;
65944-
65945 msg_params.key = key;
65946 msg_params.flg = msgflg;
65947
65948diff -urNp linux-2.6.32.46/ipc/sem.c linux-2.6.32.46/ipc/sem.c
65949--- linux-2.6.32.46/ipc/sem.c 2011-03-27 14:31:47.000000000 -0400
65950+++ linux-2.6.32.46/ipc/sem.c 2011-08-05 20:33:55.000000000 -0400
65951@@ -309,10 +309,15 @@ static inline int sem_more_checks(struct
65952 return 0;
65953 }
65954
65955+static struct ipc_ops sem_ops = {
65956+ .getnew = newary,
65957+ .associate = sem_security,
65958+ .more_checks = sem_more_checks
65959+};
65960+
65961 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65962 {
65963 struct ipc_namespace *ns;
65964- struct ipc_ops sem_ops;
65965 struct ipc_params sem_params;
65966
65967 ns = current->nsproxy->ipc_ns;
65968@@ -320,10 +325,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int,
65969 if (nsems < 0 || nsems > ns->sc_semmsl)
65970 return -EINVAL;
65971
65972- sem_ops.getnew = newary;
65973- sem_ops.associate = sem_security;
65974- sem_ops.more_checks = sem_more_checks;
65975-
65976 sem_params.key = key;
65977 sem_params.flg = semflg;
65978 sem_params.u.nsems = nsems;
65979@@ -671,6 +672,8 @@ static int semctl_main(struct ipc_namesp
65980 ushort* sem_io = fast_sem_io;
65981 int nsems;
65982
65983+ pax_track_stack();
65984+
65985 sma = sem_lock_check(ns, semid);
65986 if (IS_ERR(sma))
65987 return PTR_ERR(sma);
65988@@ -1071,6 +1074,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid,
65989 unsigned long jiffies_left = 0;
65990 struct ipc_namespace *ns;
65991
65992+ pax_track_stack();
65993+
65994 ns = current->nsproxy->ipc_ns;
65995
65996 if (nsops < 1 || semid < 0)
65997diff -urNp linux-2.6.32.46/ipc/shm.c linux-2.6.32.46/ipc/shm.c
65998--- linux-2.6.32.46/ipc/shm.c 2011-03-27 14:31:47.000000000 -0400
65999+++ linux-2.6.32.46/ipc/shm.c 2011-08-05 20:33:55.000000000 -0400
66000@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
66001 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
66002 #endif
66003
66004+#ifdef CONFIG_GRKERNSEC
66005+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
66006+ const time_t shm_createtime, const uid_t cuid,
66007+ const int shmid);
66008+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
66009+ const time_t shm_createtime);
66010+#endif
66011+
66012 void shm_init_ns(struct ipc_namespace *ns)
66013 {
66014 ns->shm_ctlmax = SHMMAX;
66015@@ -396,6 +404,14 @@ static int newseg(struct ipc_namespace *
66016 shp->shm_lprid = 0;
66017 shp->shm_atim = shp->shm_dtim = 0;
66018 shp->shm_ctim = get_seconds();
66019+#ifdef CONFIG_GRKERNSEC
66020+ {
66021+ struct timespec timeval;
66022+ do_posix_clock_monotonic_gettime(&timeval);
66023+
66024+ shp->shm_createtime = timeval.tv_sec;
66025+ }
66026+#endif
66027 shp->shm_segsz = size;
66028 shp->shm_nattch = 0;
66029 shp->shm_file = file;
66030@@ -446,18 +462,19 @@ static inline int shm_more_checks(struct
66031 return 0;
66032 }
66033
66034+static struct ipc_ops shm_ops = {
66035+ .getnew = newseg,
66036+ .associate = shm_security,
66037+ .more_checks = shm_more_checks
66038+};
66039+
66040 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
66041 {
66042 struct ipc_namespace *ns;
66043- struct ipc_ops shm_ops;
66044 struct ipc_params shm_params;
66045
66046 ns = current->nsproxy->ipc_ns;
66047
66048- shm_ops.getnew = newseg;
66049- shm_ops.associate = shm_security;
66050- shm_ops.more_checks = shm_more_checks;
66051-
66052 shm_params.key = key;
66053 shm_params.flg = shmflg;
66054 shm_params.u.size = size;
66055@@ -880,9 +897,21 @@ long do_shmat(int shmid, char __user *sh
66056 if (err)
66057 goto out_unlock;
66058
66059+#ifdef CONFIG_GRKERNSEC
66060+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
66061+ shp->shm_perm.cuid, shmid) ||
66062+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
66063+ err = -EACCES;
66064+ goto out_unlock;
66065+ }
66066+#endif
66067+
66068 path.dentry = dget(shp->shm_file->f_path.dentry);
66069 path.mnt = shp->shm_file->f_path.mnt;
66070 shp->shm_nattch++;
66071+#ifdef CONFIG_GRKERNSEC
66072+ shp->shm_lapid = current->pid;
66073+#endif
66074 size = i_size_read(path.dentry->d_inode);
66075 shm_unlock(shp);
66076
66077diff -urNp linux-2.6.32.46/kernel/acct.c linux-2.6.32.46/kernel/acct.c
66078--- linux-2.6.32.46/kernel/acct.c 2011-03-27 14:31:47.000000000 -0400
66079+++ linux-2.6.32.46/kernel/acct.c 2011-10-06 09:37:14.000000000 -0400
66080@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
66081 */
66082 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
66083 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
66084- file->f_op->write(file, (char *)&ac,
66085+ file->f_op->write(file, (char __force_user *)&ac,
66086 sizeof(acct_t), &file->f_pos);
66087 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
66088 set_fs(fs);
66089diff -urNp linux-2.6.32.46/kernel/audit.c linux-2.6.32.46/kernel/audit.c
66090--- linux-2.6.32.46/kernel/audit.c 2011-03-27 14:31:47.000000000 -0400
66091+++ linux-2.6.32.46/kernel/audit.c 2011-05-04 17:56:28.000000000 -0400
66092@@ -110,7 +110,7 @@ u32 audit_sig_sid = 0;
66093 3) suppressed due to audit_rate_limit
66094 4) suppressed due to audit_backlog_limit
66095 */
66096-static atomic_t audit_lost = ATOMIC_INIT(0);
66097+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
66098
66099 /* The netlink socket. */
66100 static struct sock *audit_sock;
66101@@ -232,7 +232,7 @@ void audit_log_lost(const char *message)
66102 unsigned long now;
66103 int print;
66104
66105- atomic_inc(&audit_lost);
66106+ atomic_inc_unchecked(&audit_lost);
66107
66108 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
66109
66110@@ -251,7 +251,7 @@ void audit_log_lost(const char *message)
66111 printk(KERN_WARNING
66112 "audit: audit_lost=%d audit_rate_limit=%d "
66113 "audit_backlog_limit=%d\n",
66114- atomic_read(&audit_lost),
66115+ atomic_read_unchecked(&audit_lost),
66116 audit_rate_limit,
66117 audit_backlog_limit);
66118 audit_panic(message);
66119@@ -691,7 +691,7 @@ static int audit_receive_msg(struct sk_b
66120 status_set.pid = audit_pid;
66121 status_set.rate_limit = audit_rate_limit;
66122 status_set.backlog_limit = audit_backlog_limit;
66123- status_set.lost = atomic_read(&audit_lost);
66124+ status_set.lost = atomic_read_unchecked(&audit_lost);
66125 status_set.backlog = skb_queue_len(&audit_skb_queue);
66126 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
66127 &status_set, sizeof(status_set));
66128@@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_b
66129 spin_unlock_irq(&tsk->sighand->siglock);
66130 }
66131 read_unlock(&tasklist_lock);
66132- audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_TTY_GET, 0, 0,
66133- &s, sizeof(s));
66134+
66135+ if (!err)
66136+ audit_send_reply(NETLINK_CB(skb).pid, seq,
66137+ AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
66138 break;
66139 }
66140 case AUDIT_TTY_SET: {
66141diff -urNp linux-2.6.32.46/kernel/auditsc.c linux-2.6.32.46/kernel/auditsc.c
66142--- linux-2.6.32.46/kernel/auditsc.c 2011-03-27 14:31:47.000000000 -0400
66143+++ linux-2.6.32.46/kernel/auditsc.c 2011-05-04 17:56:28.000000000 -0400
66144@@ -2113,7 +2113,7 @@ int auditsc_get_stamp(struct audit_conte
66145 }
66146
66147 /* global counter which is incremented every time something logs in */
66148-static atomic_t session_id = ATOMIC_INIT(0);
66149+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
66150
66151 /**
66152 * audit_set_loginuid - set a task's audit_context loginuid
66153@@ -2126,7 +2126,7 @@ static atomic_t session_id = ATOMIC_INIT
66154 */
66155 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
66156 {
66157- unsigned int sessionid = atomic_inc_return(&session_id);
66158+ unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
66159 struct audit_context *context = task->audit_context;
66160
66161 if (context && context->in_syscall) {
66162diff -urNp linux-2.6.32.46/kernel/capability.c linux-2.6.32.46/kernel/capability.c
66163--- linux-2.6.32.46/kernel/capability.c 2011-03-27 14:31:47.000000000 -0400
66164+++ linux-2.6.32.46/kernel/capability.c 2011-04-17 15:56:46.000000000 -0400
66165@@ -305,10 +305,26 @@ int capable(int cap)
66166 BUG();
66167 }
66168
66169- if (security_capable(cap) == 0) {
66170+ if (security_capable(cap) == 0 && gr_is_capable(cap)) {
66171 current->flags |= PF_SUPERPRIV;
66172 return 1;
66173 }
66174 return 0;
66175 }
66176+
66177+int capable_nolog(int cap)
66178+{
66179+ if (unlikely(!cap_valid(cap))) {
66180+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
66181+ BUG();
66182+ }
66183+
66184+ if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
66185+ current->flags |= PF_SUPERPRIV;
66186+ return 1;
66187+ }
66188+ return 0;
66189+}
66190+
66191 EXPORT_SYMBOL(capable);
66192+EXPORT_SYMBOL(capable_nolog);
66193diff -urNp linux-2.6.32.46/kernel/cgroup.c linux-2.6.32.46/kernel/cgroup.c
66194--- linux-2.6.32.46/kernel/cgroup.c 2011-03-27 14:31:47.000000000 -0400
66195+++ linux-2.6.32.46/kernel/cgroup.c 2011-05-16 21:46:57.000000000 -0400
66196@@ -536,6 +536,8 @@ static struct css_set *find_css_set(
66197 struct hlist_head *hhead;
66198 struct cg_cgroup_link *link;
66199
66200+ pax_track_stack();
66201+
66202 /* First see if we already have a cgroup group that matches
66203 * the desired set */
66204 read_lock(&css_set_lock);
66205diff -urNp linux-2.6.32.46/kernel/compat.c linux-2.6.32.46/kernel/compat.c
66206--- linux-2.6.32.46/kernel/compat.c 2011-03-27 14:31:47.000000000 -0400
66207+++ linux-2.6.32.46/kernel/compat.c 2011-10-06 09:37:14.000000000 -0400
66208@@ -108,7 +108,7 @@ static long compat_nanosleep_restart(str
66209 mm_segment_t oldfs;
66210 long ret;
66211
66212- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
66213+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
66214 oldfs = get_fs();
66215 set_fs(KERNEL_DS);
66216 ret = hrtimer_nanosleep_restart(restart);
66217@@ -140,7 +140,7 @@ asmlinkage long compat_sys_nanosleep(str
66218 oldfs = get_fs();
66219 set_fs(KERNEL_DS);
66220 ret = hrtimer_nanosleep(&tu,
66221- rmtp ? (struct timespec __user *)&rmt : NULL,
66222+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
66223 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
66224 set_fs(oldfs);
66225
66226@@ -247,7 +247,7 @@ asmlinkage long compat_sys_sigpending(co
66227 mm_segment_t old_fs = get_fs();
66228
66229 set_fs(KERNEL_DS);
66230- ret = sys_sigpending((old_sigset_t __user *) &s);
66231+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
66232 set_fs(old_fs);
66233 if (ret == 0)
66234 ret = put_user(s, set);
66235@@ -266,8 +266,8 @@ asmlinkage long compat_sys_sigprocmask(i
66236 old_fs = get_fs();
66237 set_fs(KERNEL_DS);
66238 ret = sys_sigprocmask(how,
66239- set ? (old_sigset_t __user *) &s : NULL,
66240- oset ? (old_sigset_t __user *) &s : NULL);
66241+ set ? (old_sigset_t __force_user *) &s : NULL,
66242+ oset ? (old_sigset_t __force_user *) &s : NULL);
66243 set_fs(old_fs);
66244 if (ret == 0)
66245 if (oset)
66246@@ -310,7 +310,7 @@ asmlinkage long compat_sys_old_getrlimit
66247 mm_segment_t old_fs = get_fs();
66248
66249 set_fs(KERNEL_DS);
66250- ret = sys_old_getrlimit(resource, &r);
66251+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
66252 set_fs(old_fs);
66253
66254 if (!ret) {
66255@@ -385,7 +385,7 @@ asmlinkage long compat_sys_getrusage(int
66256 mm_segment_t old_fs = get_fs();
66257
66258 set_fs(KERNEL_DS);
66259- ret = sys_getrusage(who, (struct rusage __user *) &r);
66260+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
66261 set_fs(old_fs);
66262
66263 if (ret)
66264@@ -412,8 +412,8 @@ compat_sys_wait4(compat_pid_t pid, compa
66265 set_fs (KERNEL_DS);
66266 ret = sys_wait4(pid,
66267 (stat_addr ?
66268- (unsigned int __user *) &status : NULL),
66269- options, (struct rusage __user *) &r);
66270+ (unsigned int __force_user *) &status : NULL),
66271+ options, (struct rusage __force_user *) &r);
66272 set_fs (old_fs);
66273
66274 if (ret > 0) {
66275@@ -438,8 +438,8 @@ asmlinkage long compat_sys_waitid(int wh
66276 memset(&info, 0, sizeof(info));
66277
66278 set_fs(KERNEL_DS);
66279- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
66280- uru ? (struct rusage __user *)&ru : NULL);
66281+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
66282+ uru ? (struct rusage __force_user *)&ru : NULL);
66283 set_fs(old_fs);
66284
66285 if ((ret < 0) || (info.si_signo == 0))
66286@@ -569,8 +569,8 @@ long compat_sys_timer_settime(timer_t ti
66287 oldfs = get_fs();
66288 set_fs(KERNEL_DS);
66289 err = sys_timer_settime(timer_id, flags,
66290- (struct itimerspec __user *) &newts,
66291- (struct itimerspec __user *) &oldts);
66292+ (struct itimerspec __force_user *) &newts,
66293+ (struct itimerspec __force_user *) &oldts);
66294 set_fs(oldfs);
66295 if (!err && old && put_compat_itimerspec(old, &oldts))
66296 return -EFAULT;
66297@@ -587,7 +587,7 @@ long compat_sys_timer_gettime(timer_t ti
66298 oldfs = get_fs();
66299 set_fs(KERNEL_DS);
66300 err = sys_timer_gettime(timer_id,
66301- (struct itimerspec __user *) &ts);
66302+ (struct itimerspec __force_user *) &ts);
66303 set_fs(oldfs);
66304 if (!err && put_compat_itimerspec(setting, &ts))
66305 return -EFAULT;
66306@@ -606,7 +606,7 @@ long compat_sys_clock_settime(clockid_t
66307 oldfs = get_fs();
66308 set_fs(KERNEL_DS);
66309 err = sys_clock_settime(which_clock,
66310- (struct timespec __user *) &ts);
66311+ (struct timespec __force_user *) &ts);
66312 set_fs(oldfs);
66313 return err;
66314 }
66315@@ -621,7 +621,7 @@ long compat_sys_clock_gettime(clockid_t
66316 oldfs = get_fs();
66317 set_fs(KERNEL_DS);
66318 err = sys_clock_gettime(which_clock,
66319- (struct timespec __user *) &ts);
66320+ (struct timespec __force_user *) &ts);
66321 set_fs(oldfs);
66322 if (!err && put_compat_timespec(&ts, tp))
66323 return -EFAULT;
66324@@ -638,7 +638,7 @@ long compat_sys_clock_getres(clockid_t w
66325 oldfs = get_fs();
66326 set_fs(KERNEL_DS);
66327 err = sys_clock_getres(which_clock,
66328- (struct timespec __user *) &ts);
66329+ (struct timespec __force_user *) &ts);
66330 set_fs(oldfs);
66331 if (!err && tp && put_compat_timespec(&ts, tp))
66332 return -EFAULT;
66333@@ -650,9 +650,9 @@ static long compat_clock_nanosleep_resta
66334 long err;
66335 mm_segment_t oldfs;
66336 struct timespec tu;
66337- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
66338+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
66339
66340- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
66341+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
66342 oldfs = get_fs();
66343 set_fs(KERNEL_DS);
66344 err = clock_nanosleep_restart(restart);
66345@@ -684,8 +684,8 @@ long compat_sys_clock_nanosleep(clockid_
66346 oldfs = get_fs();
66347 set_fs(KERNEL_DS);
66348 err = sys_clock_nanosleep(which_clock, flags,
66349- (struct timespec __user *) &in,
66350- (struct timespec __user *) &out);
66351+ (struct timespec __force_user *) &in,
66352+ (struct timespec __force_user *) &out);
66353 set_fs(oldfs);
66354
66355 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
66356diff -urNp linux-2.6.32.46/kernel/configs.c linux-2.6.32.46/kernel/configs.c
66357--- linux-2.6.32.46/kernel/configs.c 2011-03-27 14:31:47.000000000 -0400
66358+++ linux-2.6.32.46/kernel/configs.c 2011-04-17 15:56:46.000000000 -0400
66359@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
66360 struct proc_dir_entry *entry;
66361
66362 /* create the current config file */
66363+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66364+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
66365+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
66366+ &ikconfig_file_ops);
66367+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66368+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
66369+ &ikconfig_file_ops);
66370+#endif
66371+#else
66372 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
66373 &ikconfig_file_ops);
66374+#endif
66375+
66376 if (!entry)
66377 return -ENOMEM;
66378
66379diff -urNp linux-2.6.32.46/kernel/cpu.c linux-2.6.32.46/kernel/cpu.c
66380--- linux-2.6.32.46/kernel/cpu.c 2011-03-27 14:31:47.000000000 -0400
66381+++ linux-2.6.32.46/kernel/cpu.c 2011-04-17 15:56:46.000000000 -0400
66382@@ -19,7 +19,7 @@
66383 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
66384 static DEFINE_MUTEX(cpu_add_remove_lock);
66385
66386-static __cpuinitdata RAW_NOTIFIER_HEAD(cpu_chain);
66387+static RAW_NOTIFIER_HEAD(cpu_chain);
66388
66389 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
66390 * Should always be manipulated under cpu_add_remove_lock
66391diff -urNp linux-2.6.32.46/kernel/cred.c linux-2.6.32.46/kernel/cred.c
66392--- linux-2.6.32.46/kernel/cred.c 2011-03-27 14:31:47.000000000 -0400
66393+++ linux-2.6.32.46/kernel/cred.c 2011-08-11 19:49:38.000000000 -0400
66394@@ -160,6 +160,8 @@ static void put_cred_rcu(struct rcu_head
66395 */
66396 void __put_cred(struct cred *cred)
66397 {
66398+ pax_track_stack();
66399+
66400 kdebug("__put_cred(%p{%d,%d})", cred,
66401 atomic_read(&cred->usage),
66402 read_cred_subscribers(cred));
66403@@ -184,6 +186,8 @@ void exit_creds(struct task_struct *tsk)
66404 {
66405 struct cred *cred;
66406
66407+ pax_track_stack();
66408+
66409 kdebug("exit_creds(%u,%p,%p,{%d,%d})", tsk->pid, tsk->real_cred, tsk->cred,
66410 atomic_read(&tsk->cred->usage),
66411 read_cred_subscribers(tsk->cred));
66412@@ -222,6 +226,8 @@ const struct cred *get_task_cred(struct
66413 {
66414 const struct cred *cred;
66415
66416+ pax_track_stack();
66417+
66418 rcu_read_lock();
66419
66420 do {
66421@@ -241,6 +247,8 @@ struct cred *cred_alloc_blank(void)
66422 {
66423 struct cred *new;
66424
66425+ pax_track_stack();
66426+
66427 new = kmem_cache_zalloc(cred_jar, GFP_KERNEL);
66428 if (!new)
66429 return NULL;
66430@@ -289,6 +297,8 @@ struct cred *prepare_creds(void)
66431 const struct cred *old;
66432 struct cred *new;
66433
66434+ pax_track_stack();
66435+
66436 validate_process_creds();
66437
66438 new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
66439@@ -335,6 +345,8 @@ struct cred *prepare_exec_creds(void)
66440 struct thread_group_cred *tgcred = NULL;
66441 struct cred *new;
66442
66443+ pax_track_stack();
66444+
66445 #ifdef CONFIG_KEYS
66446 tgcred = kmalloc(sizeof(*tgcred), GFP_KERNEL);
66447 if (!tgcred)
66448@@ -441,6 +453,8 @@ int copy_creds(struct task_struct *p, un
66449 struct cred *new;
66450 int ret;
66451
66452+ pax_track_stack();
66453+
66454 mutex_init(&p->cred_guard_mutex);
66455
66456 if (
66457@@ -528,6 +542,8 @@ int commit_creds(struct cred *new)
66458 struct task_struct *task = current;
66459 const struct cred *old = task->real_cred;
66460
66461+ pax_track_stack();
66462+
66463 kdebug("commit_creds(%p{%d,%d})", new,
66464 atomic_read(&new->usage),
66465 read_cred_subscribers(new));
66466@@ -544,6 +560,8 @@ int commit_creds(struct cred *new)
66467
66468 get_cred(new); /* we will require a ref for the subj creds too */
66469
66470+ gr_set_role_label(task, new->uid, new->gid);
66471+
66472 /* dumpability changes */
66473 if (old->euid != new->euid ||
66474 old->egid != new->egid ||
66475@@ -563,10 +581,8 @@ int commit_creds(struct cred *new)
66476 key_fsgid_changed(task);
66477
66478 /* do it
66479- * - What if a process setreuid()'s and this brings the
66480- * new uid over his NPROC rlimit? We can check this now
66481- * cheaply with the new uid cache, so if it matters
66482- * we should be checking for it. -DaveM
66483+ * RLIMIT_NPROC limits on user->processes have already been checked
66484+ * in set_user().
66485 */
66486 alter_cred_subscribers(new, 2);
66487 if (new->user != old->user)
66488@@ -606,6 +622,8 @@ EXPORT_SYMBOL(commit_creds);
66489 */
66490 void abort_creds(struct cred *new)
66491 {
66492+ pax_track_stack();
66493+
66494 kdebug("abort_creds(%p{%d,%d})", new,
66495 atomic_read(&new->usage),
66496 read_cred_subscribers(new));
66497@@ -629,6 +647,8 @@ const struct cred *override_creds(const
66498 {
66499 const struct cred *old = current->cred;
66500
66501+ pax_track_stack();
66502+
66503 kdebug("override_creds(%p{%d,%d})", new,
66504 atomic_read(&new->usage),
66505 read_cred_subscribers(new));
66506@@ -658,6 +678,8 @@ void revert_creds(const struct cred *old
66507 {
66508 const struct cred *override = current->cred;
66509
66510+ pax_track_stack();
66511+
66512 kdebug("revert_creds(%p{%d,%d})", old,
66513 atomic_read(&old->usage),
66514 read_cred_subscribers(old));
66515@@ -704,6 +726,8 @@ struct cred *prepare_kernel_cred(struct
66516 const struct cred *old;
66517 struct cred *new;
66518
66519+ pax_track_stack();
66520+
66521 new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
66522 if (!new)
66523 return NULL;
66524@@ -758,6 +782,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
66525 */
66526 int set_security_override(struct cred *new, u32 secid)
66527 {
66528+ pax_track_stack();
66529+
66530 return security_kernel_act_as(new, secid);
66531 }
66532 EXPORT_SYMBOL(set_security_override);
66533@@ -777,6 +803,8 @@ int set_security_override_from_ctx(struc
66534 u32 secid;
66535 int ret;
66536
66537+ pax_track_stack();
66538+
66539 ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
66540 if (ret < 0)
66541 return ret;
66542diff -urNp linux-2.6.32.46/kernel/exit.c linux-2.6.32.46/kernel/exit.c
66543--- linux-2.6.32.46/kernel/exit.c 2011-03-27 14:31:47.000000000 -0400
66544+++ linux-2.6.32.46/kernel/exit.c 2011-08-17 19:19:50.000000000 -0400
66545@@ -55,6 +55,10 @@
66546 #include <asm/pgtable.h>
66547 #include <asm/mmu_context.h>
66548
66549+#ifdef CONFIG_GRKERNSEC
66550+extern rwlock_t grsec_exec_file_lock;
66551+#endif
66552+
66553 static void exit_mm(struct task_struct * tsk);
66554
66555 static void __unhash_process(struct task_struct *p)
66556@@ -174,6 +178,10 @@ void release_task(struct task_struct * p
66557 struct task_struct *leader;
66558 int zap_leader;
66559 repeat:
66560+#ifdef CONFIG_NET
66561+ gr_del_task_from_ip_table(p);
66562+#endif
66563+
66564 tracehook_prepare_release_task(p);
66565 /* don't need to get the RCU readlock here - the process is dead and
66566 * can't be modifying its own credentials */
66567@@ -341,11 +349,22 @@ static void reparent_to_kthreadd(void)
66568 {
66569 write_lock_irq(&tasklist_lock);
66570
66571+#ifdef CONFIG_GRKERNSEC
66572+ write_lock(&grsec_exec_file_lock);
66573+ if (current->exec_file) {
66574+ fput(current->exec_file);
66575+ current->exec_file = NULL;
66576+ }
66577+ write_unlock(&grsec_exec_file_lock);
66578+#endif
66579+
66580 ptrace_unlink(current);
66581 /* Reparent to init */
66582 current->real_parent = current->parent = kthreadd_task;
66583 list_move_tail(&current->sibling, &current->real_parent->children);
66584
66585+ gr_set_kernel_label(current);
66586+
66587 /* Set the exit signal to SIGCHLD so we signal init on exit */
66588 current->exit_signal = SIGCHLD;
66589
66590@@ -397,7 +416,7 @@ int allow_signal(int sig)
66591 * know it'll be handled, so that they don't get converted to
66592 * SIGKILL or just silently dropped.
66593 */
66594- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
66595+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
66596 recalc_sigpending();
66597 spin_unlock_irq(&current->sighand->siglock);
66598 return 0;
66599@@ -433,6 +452,17 @@ void daemonize(const char *name, ...)
66600 vsnprintf(current->comm, sizeof(current->comm), name, args);
66601 va_end(args);
66602
66603+#ifdef CONFIG_GRKERNSEC
66604+ write_lock(&grsec_exec_file_lock);
66605+ if (current->exec_file) {
66606+ fput(current->exec_file);
66607+ current->exec_file = NULL;
66608+ }
66609+ write_unlock(&grsec_exec_file_lock);
66610+#endif
66611+
66612+ gr_set_kernel_label(current);
66613+
66614 /*
66615 * If we were started as result of loading a module, close all of the
66616 * user space pages. We don't need them, and if we didn't close them
66617@@ -897,17 +927,17 @@ NORET_TYPE void do_exit(long code)
66618 struct task_struct *tsk = current;
66619 int group_dead;
66620
66621- profile_task_exit(tsk);
66622-
66623- WARN_ON(atomic_read(&tsk->fs_excl));
66624-
66625+ /*
66626+ * Check this first since set_fs() below depends on
66627+ * current_thread_info(), which we better not access when we're in
66628+ * interrupt context. Other than that, we want to do the set_fs()
66629+ * as early as possible.
66630+ */
66631 if (unlikely(in_interrupt()))
66632 panic("Aiee, killing interrupt handler!");
66633- if (unlikely(!tsk->pid))
66634- panic("Attempted to kill the idle task!");
66635
66636 /*
66637- * If do_exit is called because this processes oopsed, it's possible
66638+ * If do_exit is called because this processes Oops'ed, it's possible
66639 * that get_fs() was left as KERNEL_DS, so reset it to USER_DS before
66640 * continuing. Amongst other possible reasons, this is to prevent
66641 * mm_release()->clear_child_tid() from writing to a user-controlled
66642@@ -915,6 +945,13 @@ NORET_TYPE void do_exit(long code)
66643 */
66644 set_fs(USER_DS);
66645
66646+ profile_task_exit(tsk);
66647+
66648+ WARN_ON(atomic_read(&tsk->fs_excl));
66649+
66650+ if (unlikely(!tsk->pid))
66651+ panic("Attempted to kill the idle task!");
66652+
66653 tracehook_report_exit(&code);
66654
66655 validate_creds_for_do_exit(tsk);
66656@@ -973,6 +1010,9 @@ NORET_TYPE void do_exit(long code)
66657 tsk->exit_code = code;
66658 taskstats_exit(tsk, group_dead);
66659
66660+ gr_acl_handle_psacct(tsk, code);
66661+ gr_acl_handle_exit();
66662+
66663 exit_mm(tsk);
66664
66665 if (group_dead)
66666@@ -1188,7 +1228,7 @@ static int wait_task_zombie(struct wait_
66667
66668 if (unlikely(wo->wo_flags & WNOWAIT)) {
66669 int exit_code = p->exit_code;
66670- int why, status;
66671+ int why;
66672
66673 get_task_struct(p);
66674 read_unlock(&tasklist_lock);
66675diff -urNp linux-2.6.32.46/kernel/fork.c linux-2.6.32.46/kernel/fork.c
66676--- linux-2.6.32.46/kernel/fork.c 2011-03-27 14:31:47.000000000 -0400
66677+++ linux-2.6.32.46/kernel/fork.c 2011-08-11 19:50:07.000000000 -0400
66678@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
66679 *stackend = STACK_END_MAGIC; /* for overflow detection */
66680
66681 #ifdef CONFIG_CC_STACKPROTECTOR
66682- tsk->stack_canary = get_random_int();
66683+ tsk->stack_canary = pax_get_random_long();
66684 #endif
66685
66686 /* One for us, one for whoever does the "release_task()" (usually parent) */
66687@@ -293,8 +293,8 @@ static int dup_mmap(struct mm_struct *mm
66688 mm->locked_vm = 0;
66689 mm->mmap = NULL;
66690 mm->mmap_cache = NULL;
66691- mm->free_area_cache = oldmm->mmap_base;
66692- mm->cached_hole_size = ~0UL;
66693+ mm->free_area_cache = oldmm->free_area_cache;
66694+ mm->cached_hole_size = oldmm->cached_hole_size;
66695 mm->map_count = 0;
66696 cpumask_clear(mm_cpumask(mm));
66697 mm->mm_rb = RB_ROOT;
66698@@ -335,6 +335,7 @@ static int dup_mmap(struct mm_struct *mm
66699 tmp->vm_flags &= ~VM_LOCKED;
66700 tmp->vm_mm = mm;
66701 tmp->vm_next = tmp->vm_prev = NULL;
66702+ tmp->vm_mirror = NULL;
66703 anon_vma_link(tmp);
66704 file = tmp->vm_file;
66705 if (file) {
66706@@ -384,6 +385,31 @@ static int dup_mmap(struct mm_struct *mm
66707 if (retval)
66708 goto out;
66709 }
66710+
66711+#ifdef CONFIG_PAX_SEGMEXEC
66712+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
66713+ struct vm_area_struct *mpnt_m;
66714+
66715+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
66716+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
66717+
66718+ if (!mpnt->vm_mirror)
66719+ continue;
66720+
66721+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
66722+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
66723+ mpnt->vm_mirror = mpnt_m;
66724+ } else {
66725+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
66726+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
66727+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
66728+ mpnt->vm_mirror->vm_mirror = mpnt;
66729+ }
66730+ }
66731+ BUG_ON(mpnt_m);
66732+ }
66733+#endif
66734+
66735 /* a new mm has just been created */
66736 arch_dup_mmap(oldmm, mm);
66737 retval = 0;
66738@@ -734,13 +760,14 @@ static int copy_fs(unsigned long clone_f
66739 write_unlock(&fs->lock);
66740 return -EAGAIN;
66741 }
66742- fs->users++;
66743+ atomic_inc(&fs->users);
66744 write_unlock(&fs->lock);
66745 return 0;
66746 }
66747 tsk->fs = copy_fs_struct(fs);
66748 if (!tsk->fs)
66749 return -ENOMEM;
66750+ gr_set_chroot_entries(tsk, &tsk->fs->root);
66751 return 0;
66752 }
66753
66754@@ -1033,12 +1060,16 @@ static struct task_struct *copy_process(
66755 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
66756 #endif
66757 retval = -EAGAIN;
66758+
66759+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
66760+
66761 if (atomic_read(&p->real_cred->user->processes) >=
66762 p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
66763- if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
66764- p->real_cred->user != INIT_USER)
66765+ if (p->real_cred->user != INIT_USER &&
66766+ !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN))
66767 goto bad_fork_free;
66768 }
66769+ current->flags &= ~PF_NPROC_EXCEEDED;
66770
66771 retval = copy_creds(p, clone_flags);
66772 if (retval < 0)
66773@@ -1183,6 +1214,8 @@ static struct task_struct *copy_process(
66774 goto bad_fork_free_pid;
66775 }
66776
66777+ gr_copy_label(p);
66778+
66779 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
66780 /*
66781 * Clear TID on mm_release()?
66782@@ -1333,6 +1366,8 @@ bad_fork_cleanup_count:
66783 bad_fork_free:
66784 free_task(p);
66785 fork_out:
66786+ gr_log_forkfail(retval);
66787+
66788 return ERR_PTR(retval);
66789 }
66790
66791@@ -1426,6 +1461,8 @@ long do_fork(unsigned long clone_flags,
66792 if (clone_flags & CLONE_PARENT_SETTID)
66793 put_user(nr, parent_tidptr);
66794
66795+ gr_handle_brute_check();
66796+
66797 if (clone_flags & CLONE_VFORK) {
66798 p->vfork_done = &vfork;
66799 init_completion(&vfork);
66800@@ -1558,7 +1595,7 @@ static int unshare_fs(unsigned long unsh
66801 return 0;
66802
66803 /* don't need lock here; in the worst case we'll do useless copy */
66804- if (fs->users == 1)
66805+ if (atomic_read(&fs->users) == 1)
66806 return 0;
66807
66808 *new_fsp = copy_fs_struct(fs);
66809@@ -1681,7 +1718,8 @@ SYSCALL_DEFINE1(unshare, unsigned long,
66810 fs = current->fs;
66811 write_lock(&fs->lock);
66812 current->fs = new_fs;
66813- if (--fs->users)
66814+ gr_set_chroot_entries(current, &current->fs->root);
66815+ if (atomic_dec_return(&fs->users))
66816 new_fs = NULL;
66817 else
66818 new_fs = fs;
66819diff -urNp linux-2.6.32.46/kernel/futex.c linux-2.6.32.46/kernel/futex.c
66820--- linux-2.6.32.46/kernel/futex.c 2011-08-29 22:24:44.000000000 -0400
66821+++ linux-2.6.32.46/kernel/futex.c 2011-08-29 22:25:07.000000000 -0400
66822@@ -54,6 +54,7 @@
66823 #include <linux/mount.h>
66824 #include <linux/pagemap.h>
66825 #include <linux/syscalls.h>
66826+#include <linux/ptrace.h>
66827 #include <linux/signal.h>
66828 #include <linux/module.h>
66829 #include <linux/magic.h>
66830@@ -223,6 +224,11 @@ get_futex_key(u32 __user *uaddr, int fsh
66831 struct page *page;
66832 int err, ro = 0;
66833
66834+#ifdef CONFIG_PAX_SEGMEXEC
66835+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
66836+ return -EFAULT;
66837+#endif
66838+
66839 /*
66840 * The futex address must be "naturally" aligned.
66841 */
66842@@ -1819,6 +1825,8 @@ static int futex_wait(u32 __user *uaddr,
66843 struct futex_q q;
66844 int ret;
66845
66846+ pax_track_stack();
66847+
66848 if (!bitset)
66849 return -EINVAL;
66850
66851@@ -1871,7 +1879,7 @@ retry:
66852
66853 restart = &current_thread_info()->restart_block;
66854 restart->fn = futex_wait_restart;
66855- restart->futex.uaddr = (u32 *)uaddr;
66856+ restart->futex.uaddr = uaddr;
66857 restart->futex.val = val;
66858 restart->futex.time = abs_time->tv64;
66859 restart->futex.bitset = bitset;
66860@@ -2233,6 +2241,8 @@ static int futex_wait_requeue_pi(u32 __u
66861 struct futex_q q;
66862 int res, ret;
66863
66864+ pax_track_stack();
66865+
66866 if (!bitset)
66867 return -EINVAL;
66868
66869@@ -2407,7 +2417,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
66870 {
66871 struct robust_list_head __user *head;
66872 unsigned long ret;
66873+#ifndef CONFIG_GRKERNSEC_PROC_MEMMAP
66874 const struct cred *cred = current_cred(), *pcred;
66875+#endif
66876
66877 if (!futex_cmpxchg_enabled)
66878 return -ENOSYS;
66879@@ -2423,11 +2435,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
66880 if (!p)
66881 goto err_unlock;
66882 ret = -EPERM;
66883+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66884+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
66885+ goto err_unlock;
66886+#else
66887 pcred = __task_cred(p);
66888 if (cred->euid != pcred->euid &&
66889 cred->euid != pcred->uid &&
66890 !capable(CAP_SYS_PTRACE))
66891 goto err_unlock;
66892+#endif
66893 head = p->robust_list;
66894 rcu_read_unlock();
66895 }
66896@@ -2489,7 +2506,7 @@ retry:
66897 */
66898 static inline int fetch_robust_entry(struct robust_list __user **entry,
66899 struct robust_list __user * __user *head,
66900- int *pi)
66901+ unsigned int *pi)
66902 {
66903 unsigned long uentry;
66904
66905@@ -2670,6 +2687,7 @@ static int __init futex_init(void)
66906 {
66907 u32 curval;
66908 int i;
66909+ mm_segment_t oldfs;
66910
66911 /*
66912 * This will fail and we want it. Some arch implementations do
66913@@ -2681,7 +2699,10 @@ static int __init futex_init(void)
66914 * implementation, the non functional ones will return
66915 * -ENOSYS.
66916 */
66917+ oldfs = get_fs();
66918+ set_fs(USER_DS);
66919 curval = cmpxchg_futex_value_locked(NULL, 0, 0);
66920+ set_fs(oldfs);
66921 if (curval == -EFAULT)
66922 futex_cmpxchg_enabled = 1;
66923
66924diff -urNp linux-2.6.32.46/kernel/futex_compat.c linux-2.6.32.46/kernel/futex_compat.c
66925--- linux-2.6.32.46/kernel/futex_compat.c 2011-03-27 14:31:47.000000000 -0400
66926+++ linux-2.6.32.46/kernel/futex_compat.c 2011-04-17 15:56:46.000000000 -0400
66927@@ -10,6 +10,7 @@
66928 #include <linux/compat.h>
66929 #include <linux/nsproxy.h>
66930 #include <linux/futex.h>
66931+#include <linux/ptrace.h>
66932
66933 #include <asm/uaccess.h>
66934
66935@@ -135,7 +136,10 @@ compat_sys_get_robust_list(int pid, comp
66936 {
66937 struct compat_robust_list_head __user *head;
66938 unsigned long ret;
66939- const struct cred *cred = current_cred(), *pcred;
66940+#ifndef CONFIG_GRKERNSEC_PROC_MEMMAP
66941+ const struct cred *cred = current_cred();
66942+ const struct cred *pcred;
66943+#endif
66944
66945 if (!futex_cmpxchg_enabled)
66946 return -ENOSYS;
66947@@ -151,11 +155,16 @@ compat_sys_get_robust_list(int pid, comp
66948 if (!p)
66949 goto err_unlock;
66950 ret = -EPERM;
66951+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66952+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
66953+ goto err_unlock;
66954+#else
66955 pcred = __task_cred(p);
66956 if (cred->euid != pcred->euid &&
66957 cred->euid != pcred->uid &&
66958 !capable(CAP_SYS_PTRACE))
66959 goto err_unlock;
66960+#endif
66961 head = p->compat_robust_list;
66962 read_unlock(&tasklist_lock);
66963 }
66964diff -urNp linux-2.6.32.46/kernel/gcov/base.c linux-2.6.32.46/kernel/gcov/base.c
66965--- linux-2.6.32.46/kernel/gcov/base.c 2011-03-27 14:31:47.000000000 -0400
66966+++ linux-2.6.32.46/kernel/gcov/base.c 2011-04-17 15:56:46.000000000 -0400
66967@@ -102,11 +102,6 @@ void gcov_enable_events(void)
66968 }
66969
66970 #ifdef CONFIG_MODULES
66971-static inline int within(void *addr, void *start, unsigned long size)
66972-{
66973- return ((addr >= start) && (addr < start + size));
66974-}
66975-
66976 /* Update list and generate events when modules are unloaded. */
66977 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66978 void *data)
66979@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct n
66980 prev = NULL;
66981 /* Remove entries located in module from linked list. */
66982 for (info = gcov_info_head; info; info = info->next) {
66983- if (within(info, mod->module_core, mod->core_size)) {
66984+ if (within_module_core_rw((unsigned long)info, mod)) {
66985 if (prev)
66986 prev->next = info->next;
66987 else
66988diff -urNp linux-2.6.32.46/kernel/hrtimer.c linux-2.6.32.46/kernel/hrtimer.c
66989--- linux-2.6.32.46/kernel/hrtimer.c 2011-03-27 14:31:47.000000000 -0400
66990+++ linux-2.6.32.46/kernel/hrtimer.c 2011-04-17 15:56:46.000000000 -0400
66991@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
66992 local_irq_restore(flags);
66993 }
66994
66995-static void run_hrtimer_softirq(struct softirq_action *h)
66996+static void run_hrtimer_softirq(void)
66997 {
66998 hrtimer_peek_ahead_timers();
66999 }
67000diff -urNp linux-2.6.32.46/kernel/kallsyms.c linux-2.6.32.46/kernel/kallsyms.c
67001--- linux-2.6.32.46/kernel/kallsyms.c 2011-03-27 14:31:47.000000000 -0400
67002+++ linux-2.6.32.46/kernel/kallsyms.c 2011-04-17 15:56:46.000000000 -0400
67003@@ -11,6 +11,9 @@
67004 * Changed the compression method from stem compression to "table lookup"
67005 * compression (see scripts/kallsyms.c for a more complete description)
67006 */
67007+#ifdef CONFIG_GRKERNSEC_HIDESYM
67008+#define __INCLUDED_BY_HIDESYM 1
67009+#endif
67010 #include <linux/kallsyms.h>
67011 #include <linux/module.h>
67012 #include <linux/init.h>
67013@@ -51,12 +54,33 @@ extern const unsigned long kallsyms_mark
67014
67015 static inline int is_kernel_inittext(unsigned long addr)
67016 {
67017+ if (system_state != SYSTEM_BOOTING)
67018+ return 0;
67019+
67020 if (addr >= (unsigned long)_sinittext
67021 && addr <= (unsigned long)_einittext)
67022 return 1;
67023 return 0;
67024 }
67025
67026+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
67027+#ifdef CONFIG_MODULES
67028+static inline int is_module_text(unsigned long addr)
67029+{
67030+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
67031+ return 1;
67032+
67033+ addr = ktla_ktva(addr);
67034+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
67035+}
67036+#else
67037+static inline int is_module_text(unsigned long addr)
67038+{
67039+ return 0;
67040+}
67041+#endif
67042+#endif
67043+
67044 static inline int is_kernel_text(unsigned long addr)
67045 {
67046 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
67047@@ -67,13 +91,28 @@ static inline int is_kernel_text(unsigne
67048
67049 static inline int is_kernel(unsigned long addr)
67050 {
67051+
67052+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
67053+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
67054+ return 1;
67055+
67056+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
67057+#else
67058 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
67059+#endif
67060+
67061 return 1;
67062 return in_gate_area_no_task(addr);
67063 }
67064
67065 static int is_ksym_addr(unsigned long addr)
67066 {
67067+
67068+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
67069+ if (is_module_text(addr))
67070+ return 0;
67071+#endif
67072+
67073 if (all_var)
67074 return is_kernel(addr);
67075
67076@@ -413,7 +452,6 @@ static unsigned long get_ksymbol_core(st
67077
67078 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
67079 {
67080- iter->name[0] = '\0';
67081 iter->nameoff = get_symbol_offset(new_pos);
67082 iter->pos = new_pos;
67083 }
67084@@ -461,6 +499,11 @@ static int s_show(struct seq_file *m, vo
67085 {
67086 struct kallsym_iter *iter = m->private;
67087
67088+#ifdef CONFIG_GRKERNSEC_HIDESYM
67089+ if (current_uid())
67090+ return 0;
67091+#endif
67092+
67093 /* Some debugging symbols have no name. Ignore them. */
67094 if (!iter->name[0])
67095 return 0;
67096@@ -501,7 +544,7 @@ static int kallsyms_open(struct inode *i
67097 struct kallsym_iter *iter;
67098 int ret;
67099
67100- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
67101+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
67102 if (!iter)
67103 return -ENOMEM;
67104 reset_iter(iter, 0);
67105diff -urNp linux-2.6.32.46/kernel/kexec.c linux-2.6.32.46/kernel/kexec.c
67106--- linux-2.6.32.46/kernel/kexec.c 2011-03-27 14:31:47.000000000 -0400
67107+++ linux-2.6.32.46/kernel/kexec.c 2011-10-06 09:37:14.000000000 -0400
67108@@ -1028,7 +1028,8 @@ asmlinkage long compat_sys_kexec_load(un
67109 unsigned long flags)
67110 {
67111 struct compat_kexec_segment in;
67112- struct kexec_segment out, __user *ksegments;
67113+ struct kexec_segment out;
67114+ struct kexec_segment __user *ksegments;
67115 unsigned long i, result;
67116
67117 /* Don't allow clients that don't understand the native
67118diff -urNp linux-2.6.32.46/kernel/kgdb.c linux-2.6.32.46/kernel/kgdb.c
67119--- linux-2.6.32.46/kernel/kgdb.c 2011-04-17 17:00:52.000000000 -0400
67120+++ linux-2.6.32.46/kernel/kgdb.c 2011-05-04 17:56:20.000000000 -0400
67121@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
67122 /* Guard for recursive entry */
67123 static int exception_level;
67124
67125-static struct kgdb_io *kgdb_io_ops;
67126+static const struct kgdb_io *kgdb_io_ops;
67127 static DEFINE_SPINLOCK(kgdb_registration_lock);
67128
67129 /* kgdb console driver is loaded */
67130@@ -123,7 +123,7 @@ atomic_t kgdb_active = ATOMIC_INIT(-1)
67131 */
67132 static atomic_t passive_cpu_wait[NR_CPUS];
67133 static atomic_t cpu_in_kgdb[NR_CPUS];
67134-atomic_t kgdb_setting_breakpoint;
67135+atomic_unchecked_t kgdb_setting_breakpoint;
67136
67137 struct task_struct *kgdb_usethread;
67138 struct task_struct *kgdb_contthread;
67139@@ -140,7 +140,7 @@ static unsigned long gdb_regs[(NUMREGBY
67140 sizeof(unsigned long)];
67141
67142 /* to keep track of the CPU which is doing the single stepping*/
67143-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
67144+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
67145
67146 /*
67147 * If you are debugging a problem where roundup (the collection of
67148@@ -815,7 +815,7 @@ static int kgdb_io_ready(int print_wait)
67149 return 0;
67150 if (kgdb_connected)
67151 return 1;
67152- if (atomic_read(&kgdb_setting_breakpoint))
67153+ if (atomic_read_unchecked(&kgdb_setting_breakpoint))
67154 return 1;
67155 if (print_wait)
67156 printk(KERN_CRIT "KGDB: Waiting for remote debugger\n");
67157@@ -1426,8 +1426,8 @@ acquirelock:
67158 * instance of the exception handler wanted to come into the
67159 * debugger on a different CPU via a single step
67160 */
67161- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
67162- atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
67163+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
67164+ atomic_read_unchecked(&kgdb_cpu_doing_single_step) != cpu) {
67165
67166 atomic_set(&kgdb_active, -1);
67167 touch_softlockup_watchdog();
67168@@ -1634,7 +1634,7 @@ static void kgdb_initial_breakpoint(void
67169 *
67170 * Register it with the KGDB core.
67171 */
67172-int kgdb_register_io_module(struct kgdb_io *new_kgdb_io_ops)
67173+int kgdb_register_io_module(const struct kgdb_io *new_kgdb_io_ops)
67174 {
67175 int err;
67176
67177@@ -1679,7 +1679,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
67178 *
67179 * Unregister it with the KGDB core.
67180 */
67181-void kgdb_unregister_io_module(struct kgdb_io *old_kgdb_io_ops)
67182+void kgdb_unregister_io_module(const struct kgdb_io *old_kgdb_io_ops)
67183 {
67184 BUG_ON(kgdb_connected);
67185
67186@@ -1712,11 +1712,11 @@ EXPORT_SYMBOL_GPL(kgdb_unregister_io_mod
67187 */
67188 void kgdb_breakpoint(void)
67189 {
67190- atomic_set(&kgdb_setting_breakpoint, 1);
67191+ atomic_set_unchecked(&kgdb_setting_breakpoint, 1);
67192 wmb(); /* Sync point before breakpoint */
67193 arch_kgdb_breakpoint();
67194 wmb(); /* Sync point after breakpoint */
67195- atomic_set(&kgdb_setting_breakpoint, 0);
67196+ atomic_set_unchecked(&kgdb_setting_breakpoint, 0);
67197 }
67198 EXPORT_SYMBOL_GPL(kgdb_breakpoint);
67199
67200diff -urNp linux-2.6.32.46/kernel/kmod.c linux-2.6.32.46/kernel/kmod.c
67201--- linux-2.6.32.46/kernel/kmod.c 2011-03-27 14:31:47.000000000 -0400
67202+++ linux-2.6.32.46/kernel/kmod.c 2011-10-06 09:37:14.000000000 -0400
67203@@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
67204 * If module auto-loading support is disabled then this function
67205 * becomes a no-operation.
67206 */
67207-int __request_module(bool wait, const char *fmt, ...)
67208+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
67209 {
67210- va_list args;
67211 char module_name[MODULE_NAME_LEN];
67212 unsigned int max_modprobes;
67213 int ret;
67214- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
67215+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
67216 static char *envp[] = { "HOME=/",
67217 "TERM=linux",
67218 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
67219@@ -84,12 +83,24 @@ int __request_module(bool wait, const ch
67220 if (ret)
67221 return ret;
67222
67223- va_start(args, fmt);
67224- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
67225- va_end(args);
67226+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
67227 if (ret >= MODULE_NAME_LEN)
67228 return -ENAMETOOLONG;
67229
67230+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67231+ if (!current_uid()) {
67232+ /* hack to workaround consolekit/udisks stupidity */
67233+ read_lock(&tasklist_lock);
67234+ if (!strcmp(current->comm, "mount") &&
67235+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
67236+ read_unlock(&tasklist_lock);
67237+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
67238+ return -EPERM;
67239+ }
67240+ read_unlock(&tasklist_lock);
67241+ }
67242+#endif
67243+
67244 /* If modprobe needs a service that is in a module, we get a recursive
67245 * loop. Limit the number of running kmod threads to max_threads/2 or
67246 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
67247@@ -121,6 +132,48 @@ int __request_module(bool wait, const ch
67248 atomic_dec(&kmod_concurrent);
67249 return ret;
67250 }
67251+
67252+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
67253+{
67254+ va_list args;
67255+ int ret;
67256+
67257+ va_start(args, fmt);
67258+ ret = ____request_module(wait, module_param, fmt, args);
67259+ va_end(args);
67260+
67261+ return ret;
67262+}
67263+
67264+int __request_module(bool wait, const char *fmt, ...)
67265+{
67266+ va_list args;
67267+ int ret;
67268+
67269+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67270+ if (current_uid()) {
67271+ char module_param[MODULE_NAME_LEN];
67272+
67273+ memset(module_param, 0, sizeof(module_param));
67274+
67275+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
67276+
67277+ va_start(args, fmt);
67278+ ret = ____request_module(wait, module_param, fmt, args);
67279+ va_end(args);
67280+
67281+ return ret;
67282+ }
67283+#endif
67284+
67285+ va_start(args, fmt);
67286+ ret = ____request_module(wait, NULL, fmt, args);
67287+ va_end(args);
67288+
67289+ return ret;
67290+}
67291+
67292+
67293 EXPORT_SYMBOL(__request_module);
67294 #endif /* CONFIG_MODULES */
67295
67296@@ -226,7 +279,7 @@ static int wait_for_helper(void *data)
67297 *
67298 * Thus the __user pointer cast is valid here.
67299 */
67300- sys_wait4(pid, (int __user *)&ret, 0, NULL);
67301+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
67302
67303 /*
67304 * If ret is 0, either ____call_usermodehelper failed and the
67305diff -urNp linux-2.6.32.46/kernel/kprobes.c linux-2.6.32.46/kernel/kprobes.c
67306--- linux-2.6.32.46/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400
67307+++ linux-2.6.32.46/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400
67308@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
67309 * kernel image and loaded module images reside. This is required
67310 * so x86_64 can correctly handle the %rip-relative fixups.
67311 */
67312- kip->insns = module_alloc(PAGE_SIZE);
67313+ kip->insns = module_alloc_exec(PAGE_SIZE);
67314 if (!kip->insns) {
67315 kfree(kip);
67316 return NULL;
67317@@ -220,7 +220,7 @@ static int __kprobes collect_one_slot(st
67318 */
67319 if (!list_is_singular(&kprobe_insn_pages)) {
67320 list_del(&kip->list);
67321- module_free(NULL, kip->insns);
67322+ module_free_exec(NULL, kip->insns);
67323 kfree(kip);
67324 }
67325 return 1;
67326@@ -1189,7 +1189,7 @@ static int __init init_kprobes(void)
67327 {
67328 int i, err = 0;
67329 unsigned long offset = 0, size = 0;
67330- char *modname, namebuf[128];
67331+ char *modname, namebuf[KSYM_NAME_LEN];
67332 const char *symbol_name;
67333 void *addr;
67334 struct kprobe_blackpoint *kb;
67335@@ -1304,7 +1304,7 @@ static int __kprobes show_kprobe_addr(st
67336 const char *sym = NULL;
67337 unsigned int i = *(loff_t *) v;
67338 unsigned long offset = 0;
67339- char *modname, namebuf[128];
67340+ char *modname, namebuf[KSYM_NAME_LEN];
67341
67342 head = &kprobe_table[i];
67343 preempt_disable();
67344diff -urNp linux-2.6.32.46/kernel/lockdep.c linux-2.6.32.46/kernel/lockdep.c
67345--- linux-2.6.32.46/kernel/lockdep.c 2011-06-25 12:55:35.000000000 -0400
67346+++ linux-2.6.32.46/kernel/lockdep.c 2011-06-25 12:56:37.000000000 -0400
67347@@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t
67348 /*
67349 * Various lockdep statistics:
67350 */
67351-atomic_t chain_lookup_hits;
67352-atomic_t chain_lookup_misses;
67353-atomic_t hardirqs_on_events;
67354-atomic_t hardirqs_off_events;
67355-atomic_t redundant_hardirqs_on;
67356-atomic_t redundant_hardirqs_off;
67357-atomic_t softirqs_on_events;
67358-atomic_t softirqs_off_events;
67359-atomic_t redundant_softirqs_on;
67360-atomic_t redundant_softirqs_off;
67361-atomic_t nr_unused_locks;
67362-atomic_t nr_cyclic_checks;
67363-atomic_t nr_find_usage_forwards_checks;
67364-atomic_t nr_find_usage_backwards_checks;
67365+atomic_unchecked_t chain_lookup_hits;
67366+atomic_unchecked_t chain_lookup_misses;
67367+atomic_unchecked_t hardirqs_on_events;
67368+atomic_unchecked_t hardirqs_off_events;
67369+atomic_unchecked_t redundant_hardirqs_on;
67370+atomic_unchecked_t redundant_hardirqs_off;
67371+atomic_unchecked_t softirqs_on_events;
67372+atomic_unchecked_t softirqs_off_events;
67373+atomic_unchecked_t redundant_softirqs_on;
67374+atomic_unchecked_t redundant_softirqs_off;
67375+atomic_unchecked_t nr_unused_locks;
67376+atomic_unchecked_t nr_cyclic_checks;
67377+atomic_unchecked_t nr_find_usage_forwards_checks;
67378+atomic_unchecked_t nr_find_usage_backwards_checks;
67379 #endif
67380
67381 /*
67382@@ -577,6 +577,10 @@ static int static_obj(void *obj)
67383 int i;
67384 #endif
67385
67386+#ifdef CONFIG_PAX_KERNEXEC
67387+ start = ktla_ktva(start);
67388+#endif
67389+
67390 /*
67391 * static variable?
67392 */
67393@@ -592,8 +596,7 @@ static int static_obj(void *obj)
67394 */
67395 for_each_possible_cpu(i) {
67396 start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
67397- end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
67398- + per_cpu_offset(i);
67399+ end = start + PERCPU_ENOUGH_ROOM;
67400
67401 if ((addr >= start) && (addr < end))
67402 return 1;
67403@@ -710,6 +713,7 @@ register_lock_class(struct lockdep_map *
67404 if (!static_obj(lock->key)) {
67405 debug_locks_off();
67406 printk("INFO: trying to register non-static key.\n");
67407+ printk("lock:%pS key:%pS.\n", lock, lock->key);
67408 printk("the code is fine but needs lockdep annotation.\n");
67409 printk("turning off the locking correctness validator.\n");
67410 dump_stack();
67411@@ -2751,7 +2755,7 @@ static int __lock_acquire(struct lockdep
67412 if (!class)
67413 return 0;
67414 }
67415- debug_atomic_inc((atomic_t *)&class->ops);
67416+ debug_atomic_inc((atomic_unchecked_t *)&class->ops);
67417 if (very_verbose(class)) {
67418 printk("\nacquire class [%p] %s", class->key, class->name);
67419 if (class->name_version > 1)
67420diff -urNp linux-2.6.32.46/kernel/lockdep_internals.h linux-2.6.32.46/kernel/lockdep_internals.h
67421--- linux-2.6.32.46/kernel/lockdep_internals.h 2011-03-27 14:31:47.000000000 -0400
67422+++ linux-2.6.32.46/kernel/lockdep_internals.h 2011-04-17 15:56:46.000000000 -0400
67423@@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_
67424 /*
67425 * Various lockdep statistics:
67426 */
67427-extern atomic_t chain_lookup_hits;
67428-extern atomic_t chain_lookup_misses;
67429-extern atomic_t hardirqs_on_events;
67430-extern atomic_t hardirqs_off_events;
67431-extern atomic_t redundant_hardirqs_on;
67432-extern atomic_t redundant_hardirqs_off;
67433-extern atomic_t softirqs_on_events;
67434-extern atomic_t softirqs_off_events;
67435-extern atomic_t redundant_softirqs_on;
67436-extern atomic_t redundant_softirqs_off;
67437-extern atomic_t nr_unused_locks;
67438-extern atomic_t nr_cyclic_checks;
67439-extern atomic_t nr_cyclic_check_recursions;
67440-extern atomic_t nr_find_usage_forwards_checks;
67441-extern atomic_t nr_find_usage_forwards_recursions;
67442-extern atomic_t nr_find_usage_backwards_checks;
67443-extern atomic_t nr_find_usage_backwards_recursions;
67444-# define debug_atomic_inc(ptr) atomic_inc(ptr)
67445-# define debug_atomic_dec(ptr) atomic_dec(ptr)
67446-# define debug_atomic_read(ptr) atomic_read(ptr)
67447+extern atomic_unchecked_t chain_lookup_hits;
67448+extern atomic_unchecked_t chain_lookup_misses;
67449+extern atomic_unchecked_t hardirqs_on_events;
67450+extern atomic_unchecked_t hardirqs_off_events;
67451+extern atomic_unchecked_t redundant_hardirqs_on;
67452+extern atomic_unchecked_t redundant_hardirqs_off;
67453+extern atomic_unchecked_t softirqs_on_events;
67454+extern atomic_unchecked_t softirqs_off_events;
67455+extern atomic_unchecked_t redundant_softirqs_on;
67456+extern atomic_unchecked_t redundant_softirqs_off;
67457+extern atomic_unchecked_t nr_unused_locks;
67458+extern atomic_unchecked_t nr_cyclic_checks;
67459+extern atomic_unchecked_t nr_cyclic_check_recursions;
67460+extern atomic_unchecked_t nr_find_usage_forwards_checks;
67461+extern atomic_unchecked_t nr_find_usage_forwards_recursions;
67462+extern atomic_unchecked_t nr_find_usage_backwards_checks;
67463+extern atomic_unchecked_t nr_find_usage_backwards_recursions;
67464+# define debug_atomic_inc(ptr) atomic_inc_unchecked(ptr)
67465+# define debug_atomic_dec(ptr) atomic_dec_unchecked(ptr)
67466+# define debug_atomic_read(ptr) atomic_read_unchecked(ptr)
67467 #else
67468 # define debug_atomic_inc(ptr) do { } while (0)
67469 # define debug_atomic_dec(ptr) do { } while (0)
67470diff -urNp linux-2.6.32.46/kernel/lockdep_proc.c linux-2.6.32.46/kernel/lockdep_proc.c
67471--- linux-2.6.32.46/kernel/lockdep_proc.c 2011-03-27 14:31:47.000000000 -0400
67472+++ linux-2.6.32.46/kernel/lockdep_proc.c 2011-04-17 15:56:46.000000000 -0400
67473@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
67474
67475 static void print_name(struct seq_file *m, struct lock_class *class)
67476 {
67477- char str[128];
67478+ char str[KSYM_NAME_LEN];
67479 const char *name = class->name;
67480
67481 if (!name) {
67482diff -urNp linux-2.6.32.46/kernel/module.c linux-2.6.32.46/kernel/module.c
67483--- linux-2.6.32.46/kernel/module.c 2011-03-27 14:31:47.000000000 -0400
67484+++ linux-2.6.32.46/kernel/module.c 2011-04-29 18:52:40.000000000 -0400
67485@@ -55,6 +55,7 @@
67486 #include <linux/async.h>
67487 #include <linux/percpu.h>
67488 #include <linux/kmemleak.h>
67489+#include <linux/grsecurity.h>
67490
67491 #define CREATE_TRACE_POINTS
67492 #include <trace/events/module.h>
67493@@ -89,7 +90,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
67494 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
67495
67496 /* Bounds of module allocation, for speeding __module_address */
67497-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
67498+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
67499+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
67500
67501 int register_module_notifier(struct notifier_block * nb)
67502 {
67503@@ -245,7 +247,7 @@ bool each_symbol(bool (*fn)(const struct
67504 return true;
67505
67506 list_for_each_entry_rcu(mod, &modules, list) {
67507- struct symsearch arr[] = {
67508+ struct symsearch modarr[] = {
67509 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
67510 NOT_GPL_ONLY, false },
67511 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
67512@@ -267,7 +269,7 @@ bool each_symbol(bool (*fn)(const struct
67513 #endif
67514 };
67515
67516- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
67517+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
67518 return true;
67519 }
67520 return false;
67521@@ -442,7 +444,7 @@ static void *percpu_modalloc(unsigned lo
67522 void *ptr;
67523 int cpu;
67524
67525- if (align > PAGE_SIZE) {
67526+ if (align-1 >= PAGE_SIZE) {
67527 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
67528 name, align, PAGE_SIZE);
67529 align = PAGE_SIZE;
67530@@ -1158,7 +1160,7 @@ static const struct kernel_symbol *resol
67531 * /sys/module/foo/sections stuff
67532 * J. Corbet <corbet@lwn.net>
67533 */
67534-#if defined(CONFIG_KALLSYMS) && defined(CONFIG_SYSFS)
67535+#if defined(CONFIG_KALLSYMS) && defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67536
67537 static inline bool sect_empty(const Elf_Shdr *sect)
67538 {
67539@@ -1545,7 +1547,8 @@ static void free_module(struct module *m
67540 destroy_params(mod->kp, mod->num_kp);
67541
67542 /* This may be NULL, but that's OK */
67543- module_free(mod, mod->module_init);
67544+ module_free(mod, mod->module_init_rw);
67545+ module_free_exec(mod, mod->module_init_rx);
67546 kfree(mod->args);
67547 if (mod->percpu)
67548 percpu_modfree(mod->percpu);
67549@@ -1554,10 +1557,12 @@ static void free_module(struct module *m
67550 percpu_modfree(mod->refptr);
67551 #endif
67552 /* Free lock-classes: */
67553- lockdep_free_key_range(mod->module_core, mod->core_size);
67554+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
67555+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
67556
67557 /* Finally, free the core (containing the module structure) */
67558- module_free(mod, mod->module_core);
67559+ module_free_exec(mod, mod->module_core_rx);
67560+ module_free(mod, mod->module_core_rw);
67561
67562 #ifdef CONFIG_MPU
67563 update_protections(current->mm);
67564@@ -1628,8 +1633,32 @@ static int simplify_symbols(Elf_Shdr *se
67565 unsigned int i, n = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
67566 int ret = 0;
67567 const struct kernel_symbol *ksym;
67568+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67569+ int is_fs_load = 0;
67570+ int register_filesystem_found = 0;
67571+ char *p;
67572+
67573+ p = strstr(mod->args, "grsec_modharden_fs");
67574+
67575+ if (p) {
67576+ char *endptr = p + strlen("grsec_modharden_fs");
67577+ /* copy \0 as well */
67578+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
67579+ is_fs_load = 1;
67580+ }
67581+#endif
67582+
67583
67584 for (i = 1; i < n; i++) {
67585+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67586+ const char *name = strtab + sym[i].st_name;
67587+
67588+ /* it's a real shame this will never get ripped and copied
67589+ upstream! ;(
67590+ */
67591+ if (is_fs_load && !strcmp(name, "register_filesystem"))
67592+ register_filesystem_found = 1;
67593+#endif
67594 switch (sym[i].st_shndx) {
67595 case SHN_COMMON:
67596 /* We compiled with -fno-common. These are not
67597@@ -1651,7 +1680,9 @@ static int simplify_symbols(Elf_Shdr *se
67598 strtab + sym[i].st_name, mod);
67599 /* Ok if resolved. */
67600 if (ksym) {
67601+ pax_open_kernel();
67602 sym[i].st_value = ksym->value;
67603+ pax_close_kernel();
67604 break;
67605 }
67606
67607@@ -1670,11 +1701,20 @@ static int simplify_symbols(Elf_Shdr *se
67608 secbase = (unsigned long)mod->percpu;
67609 else
67610 secbase = sechdrs[sym[i].st_shndx].sh_addr;
67611+ pax_open_kernel();
67612 sym[i].st_value += secbase;
67613+ pax_close_kernel();
67614 break;
67615 }
67616 }
67617
67618+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67619+ if (is_fs_load && !register_filesystem_found) {
67620+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
67621+ ret = -EPERM;
67622+ }
67623+#endif
67624+
67625 return ret;
67626 }
67627
67628@@ -1731,11 +1771,12 @@ static void layout_sections(struct modul
67629 || s->sh_entsize != ~0UL
67630 || strstarts(secstrings + s->sh_name, ".init"))
67631 continue;
67632- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
67633+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67634+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
67635+ else
67636+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
67637 DEBUGP("\t%s\n", secstrings + s->sh_name);
67638 }
67639- if (m == 0)
67640- mod->core_text_size = mod->core_size;
67641 }
67642
67643 DEBUGP("Init section allocation order:\n");
67644@@ -1748,12 +1789,13 @@ static void layout_sections(struct modul
67645 || s->sh_entsize != ~0UL
67646 || !strstarts(secstrings + s->sh_name, ".init"))
67647 continue;
67648- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
67649- | INIT_OFFSET_MASK);
67650+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67651+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
67652+ else
67653+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
67654+ s->sh_entsize |= INIT_OFFSET_MASK;
67655 DEBUGP("\t%s\n", secstrings + s->sh_name);
67656 }
67657- if (m == 0)
67658- mod->init_text_size = mod->init_size;
67659 }
67660 }
67661
67662@@ -1857,9 +1899,8 @@ static int is_exported(const char *name,
67663
67664 /* As per nm */
67665 static char elf_type(const Elf_Sym *sym,
67666- Elf_Shdr *sechdrs,
67667- const char *secstrings,
67668- struct module *mod)
67669+ const Elf_Shdr *sechdrs,
67670+ const char *secstrings)
67671 {
67672 if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
67673 if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
67674@@ -1934,7 +1975,7 @@ static unsigned long layout_symtab(struc
67675
67676 /* Put symbol section at end of init part of module. */
67677 symsect->sh_flags |= SHF_ALLOC;
67678- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
67679+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
67680 symindex) | INIT_OFFSET_MASK;
67681 DEBUGP("\t%s\n", secstrings + symsect->sh_name);
67682
67683@@ -1951,19 +1992,19 @@ static unsigned long layout_symtab(struc
67684 }
67685
67686 /* Append room for core symbols at end of core part. */
67687- symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
67688- mod->core_size = symoffs + ndst * sizeof(Elf_Sym);
67689+ symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
67690+ mod->core_size_rx = symoffs + ndst * sizeof(Elf_Sym);
67691
67692 /* Put string table section at end of init part of module. */
67693 strsect->sh_flags |= SHF_ALLOC;
67694- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
67695+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
67696 strindex) | INIT_OFFSET_MASK;
67697 DEBUGP("\t%s\n", secstrings + strsect->sh_name);
67698
67699 /* Append room for core symbols' strings at end of core part. */
67700- *pstroffs = mod->core_size;
67701+ *pstroffs = mod->core_size_rx;
67702 __set_bit(0, strmap);
67703- mod->core_size += bitmap_weight(strmap, strsect->sh_size);
67704+ mod->core_size_rx += bitmap_weight(strmap, strsect->sh_size);
67705
67706 return symoffs;
67707 }
67708@@ -1987,12 +2028,14 @@ static void add_kallsyms(struct module *
67709 mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
67710 mod->strtab = (void *)sechdrs[strindex].sh_addr;
67711
67712+ pax_open_kernel();
67713+
67714 /* Set types up while we still have access to sections. */
67715 for (i = 0; i < mod->num_symtab; i++)
67716 mod->symtab[i].st_info
67717- = elf_type(&mod->symtab[i], sechdrs, secstrings, mod);
67718+ = elf_type(&mod->symtab[i], sechdrs, secstrings);
67719
67720- mod->core_symtab = dst = mod->module_core + symoffs;
67721+ mod->core_symtab = dst = mod->module_core_rx + symoffs;
67722 src = mod->symtab;
67723 *dst = *src;
67724 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
67725@@ -2004,10 +2047,12 @@ static void add_kallsyms(struct module *
67726 }
67727 mod->core_num_syms = ndst;
67728
67729- mod->core_strtab = s = mod->module_core + stroffs;
67730+ mod->core_strtab = s = mod->module_core_rx + stroffs;
67731 for (*s = 0, i = 1; i < sechdrs[strindex].sh_size; ++i)
67732 if (test_bit(i, strmap))
67733 *++s = mod->strtab[i];
67734+
67735+ pax_close_kernel();
67736 }
67737 #else
67738 static inline unsigned long layout_symtab(struct module *mod,
67739@@ -2044,16 +2089,30 @@ static void dynamic_debug_setup(struct _
67740 #endif
67741 }
67742
67743-static void *module_alloc_update_bounds(unsigned long size)
67744+static void *module_alloc_update_bounds_rw(unsigned long size)
67745 {
67746 void *ret = module_alloc(size);
67747
67748 if (ret) {
67749 /* Update module bounds. */
67750- if ((unsigned long)ret < module_addr_min)
67751- module_addr_min = (unsigned long)ret;
67752- if ((unsigned long)ret + size > module_addr_max)
67753- module_addr_max = (unsigned long)ret + size;
67754+ if ((unsigned long)ret < module_addr_min_rw)
67755+ module_addr_min_rw = (unsigned long)ret;
67756+ if ((unsigned long)ret + size > module_addr_max_rw)
67757+ module_addr_max_rw = (unsigned long)ret + size;
67758+ }
67759+ return ret;
67760+}
67761+
67762+static void *module_alloc_update_bounds_rx(unsigned long size)
67763+{
67764+ void *ret = module_alloc_exec(size);
67765+
67766+ if (ret) {
67767+ /* Update module bounds. */
67768+ if ((unsigned long)ret < module_addr_min_rx)
67769+ module_addr_min_rx = (unsigned long)ret;
67770+ if ((unsigned long)ret + size > module_addr_max_rx)
67771+ module_addr_max_rx = (unsigned long)ret + size;
67772 }
67773 return ret;
67774 }
67775@@ -2065,8 +2124,8 @@ static void kmemleak_load_module(struct
67776 unsigned int i;
67777
67778 /* only scan the sections containing data */
67779- kmemleak_scan_area(mod->module_core, (unsigned long)mod -
67780- (unsigned long)mod->module_core,
67781+ kmemleak_scan_area(mod->module_core_rw, (unsigned long)mod -
67782+ (unsigned long)mod->module_core_rw,
67783 sizeof(struct module), GFP_KERNEL);
67784
67785 for (i = 1; i < hdr->e_shnum; i++) {
67786@@ -2076,8 +2135,8 @@ static void kmemleak_load_module(struct
67787 && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0)
67788 continue;
67789
67790- kmemleak_scan_area(mod->module_core, sechdrs[i].sh_addr -
67791- (unsigned long)mod->module_core,
67792+ kmemleak_scan_area(mod->module_core_rw, sechdrs[i].sh_addr -
67793+ (unsigned long)mod->module_core_rw,
67794 sechdrs[i].sh_size, GFP_KERNEL);
67795 }
67796 }
67797@@ -2263,7 +2322,7 @@ static noinline struct module *load_modu
67798 secstrings, &stroffs, strmap);
67799
67800 /* Do the allocs. */
67801- ptr = module_alloc_update_bounds(mod->core_size);
67802+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
67803 /*
67804 * The pointer to this block is stored in the module structure
67805 * which is inside the block. Just mark it as not being a
67806@@ -2274,23 +2333,47 @@ static noinline struct module *load_modu
67807 err = -ENOMEM;
67808 goto free_percpu;
67809 }
67810- memset(ptr, 0, mod->core_size);
67811- mod->module_core = ptr;
67812+ memset(ptr, 0, mod->core_size_rw);
67813+ mod->module_core_rw = ptr;
67814
67815- ptr = module_alloc_update_bounds(mod->init_size);
67816+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
67817 /*
67818 * The pointer to this block is stored in the module structure
67819 * which is inside the block. This block doesn't need to be
67820 * scanned as it contains data and code that will be freed
67821 * after the module is initialized.
67822 */
67823- kmemleak_ignore(ptr);
67824- if (!ptr && mod->init_size) {
67825+ kmemleak_not_leak(ptr);
67826+ if (!ptr && mod->init_size_rw) {
67827+ err = -ENOMEM;
67828+ goto free_core_rw;
67829+ }
67830+ memset(ptr, 0, mod->init_size_rw);
67831+ mod->module_init_rw = ptr;
67832+
67833+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
67834+ kmemleak_not_leak(ptr);
67835+ if (!ptr) {
67836 err = -ENOMEM;
67837- goto free_core;
67838+ goto free_init_rw;
67839 }
67840- memset(ptr, 0, mod->init_size);
67841- mod->module_init = ptr;
67842+
67843+ pax_open_kernel();
67844+ memset(ptr, 0, mod->core_size_rx);
67845+ pax_close_kernel();
67846+ mod->module_core_rx = ptr;
67847+
67848+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
67849+ kmemleak_not_leak(ptr);
67850+ if (!ptr && mod->init_size_rx) {
67851+ err = -ENOMEM;
67852+ goto free_core_rx;
67853+ }
67854+
67855+ pax_open_kernel();
67856+ memset(ptr, 0, mod->init_size_rx);
67857+ pax_close_kernel();
67858+ mod->module_init_rx = ptr;
67859
67860 /* Transfer each section which specifies SHF_ALLOC */
67861 DEBUGP("final section addresses:\n");
67862@@ -2300,17 +2383,45 @@ static noinline struct module *load_modu
67863 if (!(sechdrs[i].sh_flags & SHF_ALLOC))
67864 continue;
67865
67866- if (sechdrs[i].sh_entsize & INIT_OFFSET_MASK)
67867- dest = mod->module_init
67868- + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
67869- else
67870- dest = mod->module_core + sechdrs[i].sh_entsize;
67871+ if (sechdrs[i].sh_entsize & INIT_OFFSET_MASK) {
67872+ if ((sechdrs[i].sh_flags & SHF_WRITE) || !(sechdrs[i].sh_flags & SHF_ALLOC))
67873+ dest = mod->module_init_rw
67874+ + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
67875+ else
67876+ dest = mod->module_init_rx
67877+ + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
67878+ } else {
67879+ if ((sechdrs[i].sh_flags & SHF_WRITE) || !(sechdrs[i].sh_flags & SHF_ALLOC))
67880+ dest = mod->module_core_rw + sechdrs[i].sh_entsize;
67881+ else
67882+ dest = mod->module_core_rx + sechdrs[i].sh_entsize;
67883+ }
67884+
67885+ if (sechdrs[i].sh_type != SHT_NOBITS) {
67886
67887- if (sechdrs[i].sh_type != SHT_NOBITS)
67888- memcpy(dest, (void *)sechdrs[i].sh_addr,
67889- sechdrs[i].sh_size);
67890+#ifdef CONFIG_PAX_KERNEXEC
67891+#ifdef CONFIG_X86_64
67892+ if ((sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_EXECINSTR))
67893+ set_memory_x((unsigned long)dest, (sechdrs[i].sh_size + PAGE_SIZE) >> PAGE_SHIFT);
67894+#endif
67895+ if (!(sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_ALLOC)) {
67896+ pax_open_kernel();
67897+ memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
67898+ pax_close_kernel();
67899+ } else
67900+#endif
67901+
67902+ memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
67903+ }
67904 /* Update sh_addr to point to copy in image. */
67905- sechdrs[i].sh_addr = (unsigned long)dest;
67906+
67907+#ifdef CONFIG_PAX_KERNEXEC
67908+ if (sechdrs[i].sh_flags & SHF_EXECINSTR)
67909+ sechdrs[i].sh_addr = ktva_ktla((unsigned long)dest);
67910+ else
67911+#endif
67912+
67913+ sechdrs[i].sh_addr = (unsigned long)dest;
67914 DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name);
67915 }
67916 /* Module has been moved. */
67917@@ -2322,7 +2433,7 @@ static noinline struct module *load_modu
67918 mod->name);
67919 if (!mod->refptr) {
67920 err = -ENOMEM;
67921- goto free_init;
67922+ goto free_init_rx;
67923 }
67924 #endif
67925 /* Now we've moved module, initialize linked lists, etc. */
67926@@ -2351,6 +2462,31 @@ static noinline struct module *load_modu
67927 /* Set up MODINFO_ATTR fields */
67928 setup_modinfo(mod, sechdrs, infoindex);
67929
67930+ mod->args = args;
67931+
67932+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67933+ {
67934+ char *p, *p2;
67935+
67936+ if (strstr(mod->args, "grsec_modharden_netdev")) {
67937+ printk(KERN_ALERT "grsec: denied auto-loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%.64s instead.", mod->name);
67938+ err = -EPERM;
67939+ goto cleanup;
67940+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
67941+ p += strlen("grsec_modharden_normal");
67942+ p2 = strstr(p, "_");
67943+ if (p2) {
67944+ *p2 = '\0';
67945+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
67946+ *p2 = '_';
67947+ }
67948+ err = -EPERM;
67949+ goto cleanup;
67950+ }
67951+ }
67952+#endif
67953+
67954+
67955 /* Fix up syms, so that st_value is a pointer to location. */
67956 err = simplify_symbols(sechdrs, symindex, strtab, versindex, pcpuindex,
67957 mod);
67958@@ -2431,8 +2567,8 @@ static noinline struct module *load_modu
67959
67960 /* Now do relocations. */
67961 for (i = 1; i < hdr->e_shnum; i++) {
67962- const char *strtab = (char *)sechdrs[strindex].sh_addr;
67963 unsigned int info = sechdrs[i].sh_info;
67964+ strtab = (char *)sechdrs[strindex].sh_addr;
67965
67966 /* Not a valid relocation section? */
67967 if (info >= hdr->e_shnum)
67968@@ -2493,16 +2629,15 @@ static noinline struct module *load_modu
67969 * Do it before processing of module parameters, so the module
67970 * can provide parameter accessor functions of its own.
67971 */
67972- if (mod->module_init)
67973- flush_icache_range((unsigned long)mod->module_init,
67974- (unsigned long)mod->module_init
67975- + mod->init_size);
67976- flush_icache_range((unsigned long)mod->module_core,
67977- (unsigned long)mod->module_core + mod->core_size);
67978+ if (mod->module_init_rx)
67979+ flush_icache_range((unsigned long)mod->module_init_rx,
67980+ (unsigned long)mod->module_init_rx
67981+ + mod->init_size_rx);
67982+ flush_icache_range((unsigned long)mod->module_core_rx,
67983+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
67984
67985 set_fs(old_fs);
67986
67987- mod->args = args;
67988 if (section_addr(hdr, sechdrs, secstrings, "__obsparm"))
67989 printk(KERN_WARNING "%s: Ignoring obsolete parameters\n",
67990 mod->name);
67991@@ -2546,12 +2681,16 @@ static noinline struct module *load_modu
67992 free_unload:
67993 module_unload_free(mod);
67994 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
67995+ free_init_rx:
67996 percpu_modfree(mod->refptr);
67997- free_init:
67998 #endif
67999- module_free(mod, mod->module_init);
68000- free_core:
68001- module_free(mod, mod->module_core);
68002+ module_free_exec(mod, mod->module_init_rx);
68003+ free_core_rx:
68004+ module_free_exec(mod, mod->module_core_rx);
68005+ free_init_rw:
68006+ module_free(mod, mod->module_init_rw);
68007+ free_core_rw:
68008+ module_free(mod, mod->module_core_rw);
68009 /* mod will be freed with core. Don't access it beyond this line! */
68010 free_percpu:
68011 if (percpu)
68012@@ -2653,10 +2792,12 @@ SYSCALL_DEFINE3(init_module, void __user
68013 mod->symtab = mod->core_symtab;
68014 mod->strtab = mod->core_strtab;
68015 #endif
68016- module_free(mod, mod->module_init);
68017- mod->module_init = NULL;
68018- mod->init_size = 0;
68019- mod->init_text_size = 0;
68020+ module_free(mod, mod->module_init_rw);
68021+ module_free_exec(mod, mod->module_init_rx);
68022+ mod->module_init_rw = NULL;
68023+ mod->module_init_rx = NULL;
68024+ mod->init_size_rw = 0;
68025+ mod->init_size_rx = 0;
68026 mutex_unlock(&module_mutex);
68027
68028 return 0;
68029@@ -2687,10 +2828,16 @@ static const char *get_ksymbol(struct mo
68030 unsigned long nextval;
68031
68032 /* At worse, next value is at end of module */
68033- if (within_module_init(addr, mod))
68034- nextval = (unsigned long)mod->module_init+mod->init_text_size;
68035+ if (within_module_init_rx(addr, mod))
68036+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
68037+ else if (within_module_init_rw(addr, mod))
68038+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
68039+ else if (within_module_core_rx(addr, mod))
68040+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
68041+ else if (within_module_core_rw(addr, mod))
68042+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
68043 else
68044- nextval = (unsigned long)mod->module_core+mod->core_text_size;
68045+ return NULL;
68046
68047 /* Scan for closest preceeding symbol, and next symbol. (ELF
68048 starts real symbols at 1). */
68049@@ -2936,7 +3083,7 @@ static int m_show(struct seq_file *m, vo
68050 char buf[8];
68051
68052 seq_printf(m, "%s %u",
68053- mod->name, mod->init_size + mod->core_size);
68054+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
68055 print_unload_info(m, mod);
68056
68057 /* Informative for users. */
68058@@ -2945,7 +3092,7 @@ static int m_show(struct seq_file *m, vo
68059 mod->state == MODULE_STATE_COMING ? "Loading":
68060 "Live");
68061 /* Used by oprofile and other similar tools. */
68062- seq_printf(m, " 0x%p", mod->module_core);
68063+ seq_printf(m, " 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
68064
68065 /* Taints info */
68066 if (mod->taints)
68067@@ -2981,7 +3128,17 @@ static const struct file_operations proc
68068
68069 static int __init proc_modules_init(void)
68070 {
68071+#ifndef CONFIG_GRKERNSEC_HIDESYM
68072+#ifdef CONFIG_GRKERNSEC_PROC_USER
68073+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
68074+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68075+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
68076+#else
68077 proc_create("modules", 0, NULL, &proc_modules_operations);
68078+#endif
68079+#else
68080+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
68081+#endif
68082 return 0;
68083 }
68084 module_init(proc_modules_init);
68085@@ -3040,12 +3197,12 @@ struct module *__module_address(unsigned
68086 {
68087 struct module *mod;
68088
68089- if (addr < module_addr_min || addr > module_addr_max)
68090+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
68091+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
68092 return NULL;
68093
68094 list_for_each_entry_rcu(mod, &modules, list)
68095- if (within_module_core(addr, mod)
68096- || within_module_init(addr, mod))
68097+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
68098 return mod;
68099 return NULL;
68100 }
68101@@ -3079,11 +3236,20 @@ bool is_module_text_address(unsigned lon
68102 */
68103 struct module *__module_text_address(unsigned long addr)
68104 {
68105- struct module *mod = __module_address(addr);
68106+ struct module *mod;
68107+
68108+#ifdef CONFIG_X86_32
68109+ addr = ktla_ktva(addr);
68110+#endif
68111+
68112+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
68113+ return NULL;
68114+
68115+ mod = __module_address(addr);
68116+
68117 if (mod) {
68118 /* Make sure it's within the text section. */
68119- if (!within(addr, mod->module_init, mod->init_text_size)
68120- && !within(addr, mod->module_core, mod->core_text_size))
68121+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
68122 mod = NULL;
68123 }
68124 return mod;
68125diff -urNp linux-2.6.32.46/kernel/mutex.c linux-2.6.32.46/kernel/mutex.c
68126--- linux-2.6.32.46/kernel/mutex.c 2011-03-27 14:31:47.000000000 -0400
68127+++ linux-2.6.32.46/kernel/mutex.c 2011-04-17 15:56:46.000000000 -0400
68128@@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock,
68129 */
68130
68131 for (;;) {
68132- struct thread_info *owner;
68133+ struct task_struct *owner;
68134
68135 /*
68136 * If we own the BKL, then don't spin. The owner of
68137@@ -214,7 +214,7 @@ __mutex_lock_common(struct mutex *lock,
68138 spin_lock_mutex(&lock->wait_lock, flags);
68139
68140 debug_mutex_lock_common(lock, &waiter);
68141- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
68142+ debug_mutex_add_waiter(lock, &waiter, task);
68143
68144 /* add waiting tasks to the end of the waitqueue (FIFO): */
68145 list_add_tail(&waiter.list, &lock->wait_list);
68146@@ -243,8 +243,7 @@ __mutex_lock_common(struct mutex *lock,
68147 * TASK_UNINTERRUPTIBLE case.)
68148 */
68149 if (unlikely(signal_pending_state(state, task))) {
68150- mutex_remove_waiter(lock, &waiter,
68151- task_thread_info(task));
68152+ mutex_remove_waiter(lock, &waiter, task);
68153 mutex_release(&lock->dep_map, 1, ip);
68154 spin_unlock_mutex(&lock->wait_lock, flags);
68155
68156@@ -265,7 +264,7 @@ __mutex_lock_common(struct mutex *lock,
68157 done:
68158 lock_acquired(&lock->dep_map, ip);
68159 /* got the lock - rejoice! */
68160- mutex_remove_waiter(lock, &waiter, current_thread_info());
68161+ mutex_remove_waiter(lock, &waiter, task);
68162 mutex_set_owner(lock);
68163
68164 /* set it to 0 if there are no waiters left: */
68165diff -urNp linux-2.6.32.46/kernel/mutex-debug.c linux-2.6.32.46/kernel/mutex-debug.c
68166--- linux-2.6.32.46/kernel/mutex-debug.c 2011-03-27 14:31:47.000000000 -0400
68167+++ linux-2.6.32.46/kernel/mutex-debug.c 2011-04-17 15:56:46.000000000 -0400
68168@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
68169 }
68170
68171 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68172- struct thread_info *ti)
68173+ struct task_struct *task)
68174 {
68175 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
68176
68177 /* Mark the current thread as blocked on the lock: */
68178- ti->task->blocked_on = waiter;
68179+ task->blocked_on = waiter;
68180 }
68181
68182 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68183- struct thread_info *ti)
68184+ struct task_struct *task)
68185 {
68186 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
68187- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
68188- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
68189- ti->task->blocked_on = NULL;
68190+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
68191+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
68192+ task->blocked_on = NULL;
68193
68194 list_del_init(&waiter->list);
68195 waiter->task = NULL;
68196@@ -75,7 +75,7 @@ void debug_mutex_unlock(struct mutex *lo
68197 return;
68198
68199 DEBUG_LOCKS_WARN_ON(lock->magic != lock);
68200- DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
68201+ DEBUG_LOCKS_WARN_ON(lock->owner != current);
68202 DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
68203 mutex_clear_owner(lock);
68204 }
68205diff -urNp linux-2.6.32.46/kernel/mutex-debug.h linux-2.6.32.46/kernel/mutex-debug.h
68206--- linux-2.6.32.46/kernel/mutex-debug.h 2011-03-27 14:31:47.000000000 -0400
68207+++ linux-2.6.32.46/kernel/mutex-debug.h 2011-04-17 15:56:46.000000000 -0400
68208@@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru
68209 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
68210 extern void debug_mutex_add_waiter(struct mutex *lock,
68211 struct mutex_waiter *waiter,
68212- struct thread_info *ti);
68213+ struct task_struct *task);
68214 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68215- struct thread_info *ti);
68216+ struct task_struct *task);
68217 extern void debug_mutex_unlock(struct mutex *lock);
68218 extern void debug_mutex_init(struct mutex *lock, const char *name,
68219 struct lock_class_key *key);
68220
68221 static inline void mutex_set_owner(struct mutex *lock)
68222 {
68223- lock->owner = current_thread_info();
68224+ lock->owner = current;
68225 }
68226
68227 static inline void mutex_clear_owner(struct mutex *lock)
68228diff -urNp linux-2.6.32.46/kernel/mutex.h linux-2.6.32.46/kernel/mutex.h
68229--- linux-2.6.32.46/kernel/mutex.h 2011-03-27 14:31:47.000000000 -0400
68230+++ linux-2.6.32.46/kernel/mutex.h 2011-04-17 15:56:46.000000000 -0400
68231@@ -19,7 +19,7 @@
68232 #ifdef CONFIG_SMP
68233 static inline void mutex_set_owner(struct mutex *lock)
68234 {
68235- lock->owner = current_thread_info();
68236+ lock->owner = current;
68237 }
68238
68239 static inline void mutex_clear_owner(struct mutex *lock)
68240diff -urNp linux-2.6.32.46/kernel/panic.c linux-2.6.32.46/kernel/panic.c
68241--- linux-2.6.32.46/kernel/panic.c 2011-03-27 14:31:47.000000000 -0400
68242+++ linux-2.6.32.46/kernel/panic.c 2011-04-17 15:56:46.000000000 -0400
68243@@ -352,7 +352,7 @@ static void warn_slowpath_common(const c
68244 const char *board;
68245
68246 printk(KERN_WARNING "------------[ cut here ]------------\n");
68247- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
68248+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
68249 board = dmi_get_system_info(DMI_PRODUCT_NAME);
68250 if (board)
68251 printk(KERN_WARNING "Hardware name: %s\n", board);
68252@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
68253 */
68254 void __stack_chk_fail(void)
68255 {
68256- panic("stack-protector: Kernel stack is corrupted in: %p\n",
68257+ dump_stack();
68258+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
68259 __builtin_return_address(0));
68260 }
68261 EXPORT_SYMBOL(__stack_chk_fail);
68262diff -urNp linux-2.6.32.46/kernel/params.c linux-2.6.32.46/kernel/params.c
68263--- linux-2.6.32.46/kernel/params.c 2011-03-27 14:31:47.000000000 -0400
68264+++ linux-2.6.32.46/kernel/params.c 2011-04-17 15:56:46.000000000 -0400
68265@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
68266 return ret;
68267 }
68268
68269-static struct sysfs_ops module_sysfs_ops = {
68270+static const struct sysfs_ops module_sysfs_ops = {
68271 .show = module_attr_show,
68272 .store = module_attr_store,
68273 };
68274@@ -739,7 +739,7 @@ static int uevent_filter(struct kset *ks
68275 return 0;
68276 }
68277
68278-static struct kset_uevent_ops module_uevent_ops = {
68279+static const struct kset_uevent_ops module_uevent_ops = {
68280 .filter = uevent_filter,
68281 };
68282
68283diff -urNp linux-2.6.32.46/kernel/perf_event.c linux-2.6.32.46/kernel/perf_event.c
68284--- linux-2.6.32.46/kernel/perf_event.c 2011-08-09 18:35:30.000000000 -0400
68285+++ linux-2.6.32.46/kernel/perf_event.c 2011-10-06 09:37:14.000000000 -0400
68286@@ -77,7 +77,7 @@ int sysctl_perf_event_mlock __read_mostl
68287 */
68288 int sysctl_perf_event_sample_rate __read_mostly = 100000;
68289
68290-static atomic64_t perf_event_id;
68291+static atomic64_unchecked_t perf_event_id;
68292
68293 /*
68294 * Lock for (sysadmin-configurable) event reservations:
68295@@ -1094,9 +1094,9 @@ static void __perf_event_sync_stat(struc
68296 * In order to keep per-task stats reliable we need to flip the event
68297 * values when we flip the contexts.
68298 */
68299- value = atomic64_read(&next_event->count);
68300- value = atomic64_xchg(&event->count, value);
68301- atomic64_set(&next_event->count, value);
68302+ value = atomic64_read_unchecked(&next_event->count);
68303+ value = atomic64_xchg_unchecked(&event->count, value);
68304+ atomic64_set_unchecked(&next_event->count, value);
68305
68306 swap(event->total_time_enabled, next_event->total_time_enabled);
68307 swap(event->total_time_running, next_event->total_time_running);
68308@@ -1552,7 +1552,7 @@ static u64 perf_event_read(struct perf_e
68309 update_event_times(event);
68310 }
68311
68312- return atomic64_read(&event->count);
68313+ return atomic64_read_unchecked(&event->count);
68314 }
68315
68316 /*
68317@@ -1790,11 +1790,11 @@ static int perf_event_read_group(struct
68318 values[n++] = 1 + leader->nr_siblings;
68319 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
68320 values[n++] = leader->total_time_enabled +
68321- atomic64_read(&leader->child_total_time_enabled);
68322+ atomic64_read_unchecked(&leader->child_total_time_enabled);
68323 }
68324 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
68325 values[n++] = leader->total_time_running +
68326- atomic64_read(&leader->child_total_time_running);
68327+ atomic64_read_unchecked(&leader->child_total_time_running);
68328 }
68329
68330 size = n * sizeof(u64);
68331@@ -1829,11 +1829,11 @@ static int perf_event_read_one(struct pe
68332 values[n++] = perf_event_read_value(event);
68333 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
68334 values[n++] = event->total_time_enabled +
68335- atomic64_read(&event->child_total_time_enabled);
68336+ atomic64_read_unchecked(&event->child_total_time_enabled);
68337 }
68338 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
68339 values[n++] = event->total_time_running +
68340- atomic64_read(&event->child_total_time_running);
68341+ atomic64_read_unchecked(&event->child_total_time_running);
68342 }
68343 if (read_format & PERF_FORMAT_ID)
68344 values[n++] = primary_event_id(event);
68345@@ -1903,7 +1903,7 @@ static unsigned int perf_poll(struct fil
68346 static void perf_event_reset(struct perf_event *event)
68347 {
68348 (void)perf_event_read(event);
68349- atomic64_set(&event->count, 0);
68350+ atomic64_set_unchecked(&event->count, 0);
68351 perf_event_update_userpage(event);
68352 }
68353
68354@@ -2079,15 +2079,15 @@ void perf_event_update_userpage(struct p
68355 ++userpg->lock;
68356 barrier();
68357 userpg->index = perf_event_index(event);
68358- userpg->offset = atomic64_read(&event->count);
68359+ userpg->offset = atomic64_read_unchecked(&event->count);
68360 if (event->state == PERF_EVENT_STATE_ACTIVE)
68361- userpg->offset -= atomic64_read(&event->hw.prev_count);
68362+ userpg->offset -= atomic64_read_unchecked(&event->hw.prev_count);
68363
68364 userpg->time_enabled = event->total_time_enabled +
68365- atomic64_read(&event->child_total_time_enabled);
68366+ atomic64_read_unchecked(&event->child_total_time_enabled);
68367
68368 userpg->time_running = event->total_time_running +
68369- atomic64_read(&event->child_total_time_running);
68370+ atomic64_read_unchecked(&event->child_total_time_running);
68371
68372 barrier();
68373 ++userpg->lock;
68374@@ -2903,14 +2903,14 @@ static void perf_output_read_one(struct
68375 u64 values[4];
68376 int n = 0;
68377
68378- values[n++] = atomic64_read(&event->count);
68379+ values[n++] = atomic64_read_unchecked(&event->count);
68380 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
68381 values[n++] = event->total_time_enabled +
68382- atomic64_read(&event->child_total_time_enabled);
68383+ atomic64_read_unchecked(&event->child_total_time_enabled);
68384 }
68385 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
68386 values[n++] = event->total_time_running +
68387- atomic64_read(&event->child_total_time_running);
68388+ atomic64_read_unchecked(&event->child_total_time_running);
68389 }
68390 if (read_format & PERF_FORMAT_ID)
68391 values[n++] = primary_event_id(event);
68392@@ -2940,7 +2940,7 @@ static void perf_output_read_group(struc
68393 if (leader != event)
68394 leader->pmu->read(leader);
68395
68396- values[n++] = atomic64_read(&leader->count);
68397+ values[n++] = atomic64_read_unchecked(&leader->count);
68398 if (read_format & PERF_FORMAT_ID)
68399 values[n++] = primary_event_id(leader);
68400
68401@@ -2952,7 +2952,7 @@ static void perf_output_read_group(struc
68402 if (sub != event)
68403 sub->pmu->read(sub);
68404
68405- values[n++] = atomic64_read(&sub->count);
68406+ values[n++] = atomic64_read_unchecked(&sub->count);
68407 if (read_format & PERF_FORMAT_ID)
68408 values[n++] = primary_event_id(sub);
68409
68410@@ -3525,12 +3525,12 @@ static void perf_event_mmap_event(struct
68411 * need to add enough zero bytes after the string to handle
68412 * the 64bit alignment we do later.
68413 */
68414- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
68415+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
68416 if (!buf) {
68417 name = strncpy(tmp, "//enomem", sizeof(tmp));
68418 goto got_name;
68419 }
68420- name = d_path(&file->f_path, buf, PATH_MAX);
68421+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
68422 if (IS_ERR(name)) {
68423 name = strncpy(tmp, "//toolong", sizeof(tmp));
68424 goto got_name;
68425@@ -3783,7 +3783,7 @@ static void perf_swevent_add(struct perf
68426 {
68427 struct hw_perf_event *hwc = &event->hw;
68428
68429- atomic64_add(nr, &event->count);
68430+ atomic64_add_unchecked(nr, &event->count);
68431
68432 if (!hwc->sample_period)
68433 return;
68434@@ -4040,9 +4040,9 @@ static void cpu_clock_perf_event_update(
68435 u64 now;
68436
68437 now = cpu_clock(cpu);
68438- prev = atomic64_read(&event->hw.prev_count);
68439- atomic64_set(&event->hw.prev_count, now);
68440- atomic64_add(now - prev, &event->count);
68441+ prev = atomic64_read_unchecked(&event->hw.prev_count);
68442+ atomic64_set_unchecked(&event->hw.prev_count, now);
68443+ atomic64_add_unchecked(now - prev, &event->count);
68444 }
68445
68446 static int cpu_clock_perf_event_enable(struct perf_event *event)
68447@@ -4050,7 +4050,7 @@ static int cpu_clock_perf_event_enable(s
68448 struct hw_perf_event *hwc = &event->hw;
68449 int cpu = raw_smp_processor_id();
68450
68451- atomic64_set(&hwc->prev_count, cpu_clock(cpu));
68452+ atomic64_set_unchecked(&hwc->prev_count, cpu_clock(cpu));
68453 perf_swevent_start_hrtimer(event);
68454
68455 return 0;
68456@@ -4082,9 +4082,9 @@ static void task_clock_perf_event_update
68457 u64 prev;
68458 s64 delta;
68459
68460- prev = atomic64_xchg(&event->hw.prev_count, now);
68461+ prev = atomic64_xchg_unchecked(&event->hw.prev_count, now);
68462 delta = now - prev;
68463- atomic64_add(delta, &event->count);
68464+ atomic64_add_unchecked(delta, &event->count);
68465 }
68466
68467 static int task_clock_perf_event_enable(struct perf_event *event)
68468@@ -4094,7 +4094,7 @@ static int task_clock_perf_event_enable(
68469
68470 now = event->ctx->time;
68471
68472- atomic64_set(&hwc->prev_count, now);
68473+ atomic64_set_unchecked(&hwc->prev_count, now);
68474
68475 perf_swevent_start_hrtimer(event);
68476
68477@@ -4289,7 +4289,7 @@ perf_event_alloc(struct perf_event_attr
68478 event->parent = parent_event;
68479
68480 event->ns = get_pid_ns(current->nsproxy->pid_ns);
68481- event->id = atomic64_inc_return(&perf_event_id);
68482+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
68483
68484 event->state = PERF_EVENT_STATE_INACTIVE;
68485
68486@@ -4720,15 +4720,15 @@ static void sync_child_event(struct perf
68487 if (child_event->attr.inherit_stat)
68488 perf_event_read_event(child_event, child);
68489
68490- child_val = atomic64_read(&child_event->count);
68491+ child_val = atomic64_read_unchecked(&child_event->count);
68492
68493 /*
68494 * Add back the child's count to the parent's count:
68495 */
68496- atomic64_add(child_val, &parent_event->count);
68497- atomic64_add(child_event->total_time_enabled,
68498+ atomic64_add_unchecked(child_val, &parent_event->count);
68499+ atomic64_add_unchecked(child_event->total_time_enabled,
68500 &parent_event->child_total_time_enabled);
68501- atomic64_add(child_event->total_time_running,
68502+ atomic64_add_unchecked(child_event->total_time_running,
68503 &parent_event->child_total_time_running);
68504
68505 /*
68506diff -urNp linux-2.6.32.46/kernel/pid.c linux-2.6.32.46/kernel/pid.c
68507--- linux-2.6.32.46/kernel/pid.c 2011-04-22 19:16:29.000000000 -0400
68508+++ linux-2.6.32.46/kernel/pid.c 2011-08-21 19:11:29.000000000 -0400
68509@@ -33,6 +33,7 @@
68510 #include <linux/rculist.h>
68511 #include <linux/bootmem.h>
68512 #include <linux/hash.h>
68513+#include <linux/security.h>
68514 #include <linux/pid_namespace.h>
68515 #include <linux/init_task.h>
68516 #include <linux/syscalls.h>
68517@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT
68518
68519 int pid_max = PID_MAX_DEFAULT;
68520
68521-#define RESERVED_PIDS 300
68522+#define RESERVED_PIDS 500
68523
68524 int pid_max_min = RESERVED_PIDS + 1;
68525 int pid_max_max = PID_MAX_LIMIT;
68526@@ -383,7 +384,14 @@ EXPORT_SYMBOL(pid_task);
68527 */
68528 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
68529 {
68530- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
68531+ struct task_struct *task;
68532+
68533+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
68534+
68535+ if (gr_pid_is_chrooted(task))
68536+ return NULL;
68537+
68538+ return task;
68539 }
68540
68541 struct task_struct *find_task_by_vpid(pid_t vnr)
68542@@ -391,6 +399,11 @@ struct task_struct *find_task_by_vpid(pi
68543 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
68544 }
68545
68546+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
68547+{
68548+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
68549+}
68550+
68551 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
68552 {
68553 struct pid *pid;
68554diff -urNp linux-2.6.32.46/kernel/posix-cpu-timers.c linux-2.6.32.46/kernel/posix-cpu-timers.c
68555--- linux-2.6.32.46/kernel/posix-cpu-timers.c 2011-03-27 14:31:47.000000000 -0400
68556+++ linux-2.6.32.46/kernel/posix-cpu-timers.c 2011-08-06 09:33:44.000000000 -0400
68557@@ -6,6 +6,7 @@
68558 #include <linux/posix-timers.h>
68559 #include <linux/errno.h>
68560 #include <linux/math64.h>
68561+#include <linux/security.h>
68562 #include <asm/uaccess.h>
68563 #include <linux/kernel_stat.h>
68564 #include <trace/events/timer.h>
68565@@ -1697,7 +1698,7 @@ static long thread_cpu_nsleep_restart(st
68566
68567 static __init int init_posix_cpu_timers(void)
68568 {
68569- struct k_clock process = {
68570+ static struct k_clock process = {
68571 .clock_getres = process_cpu_clock_getres,
68572 .clock_get = process_cpu_clock_get,
68573 .clock_set = do_posix_clock_nosettime,
68574@@ -1705,7 +1706,7 @@ static __init int init_posix_cpu_timers(
68575 .nsleep = process_cpu_nsleep,
68576 .nsleep_restart = process_cpu_nsleep_restart,
68577 };
68578- struct k_clock thread = {
68579+ static struct k_clock thread = {
68580 .clock_getres = thread_cpu_clock_getres,
68581 .clock_get = thread_cpu_clock_get,
68582 .clock_set = do_posix_clock_nosettime,
68583diff -urNp linux-2.6.32.46/kernel/posix-timers.c linux-2.6.32.46/kernel/posix-timers.c
68584--- linux-2.6.32.46/kernel/posix-timers.c 2011-03-27 14:31:47.000000000 -0400
68585+++ linux-2.6.32.46/kernel/posix-timers.c 2011-08-23 20:22:38.000000000 -0400
68586@@ -42,6 +42,7 @@
68587 #include <linux/compiler.h>
68588 #include <linux/idr.h>
68589 #include <linux/posix-timers.h>
68590+#include <linux/grsecurity.h>
68591 #include <linux/syscalls.h>
68592 #include <linux/wait.h>
68593 #include <linux/workqueue.h>
68594@@ -131,7 +132,7 @@ static DEFINE_SPINLOCK(idr_lock);
68595 * which we beg off on and pass to do_sys_settimeofday().
68596 */
68597
68598-static struct k_clock posix_clocks[MAX_CLOCKS];
68599+static struct k_clock *posix_clocks[MAX_CLOCKS];
68600
68601 /*
68602 * These ones are defined below.
68603@@ -157,8 +158,8 @@ static inline void unlock_timer(struct k
68604 */
68605 #define CLOCK_DISPATCH(clock, call, arglist) \
68606 ((clock) < 0 ? posix_cpu_##call arglist : \
68607- (posix_clocks[clock].call != NULL \
68608- ? (*posix_clocks[clock].call) arglist : common_##call arglist))
68609+ (posix_clocks[clock]->call != NULL \
68610+ ? (*posix_clocks[clock]->call) arglist : common_##call arglist))
68611
68612 /*
68613 * Default clock hook functions when the struct k_clock passed
68614@@ -172,7 +173,7 @@ static inline int common_clock_getres(co
68615 struct timespec *tp)
68616 {
68617 tp->tv_sec = 0;
68618- tp->tv_nsec = posix_clocks[which_clock].res;
68619+ tp->tv_nsec = posix_clocks[which_clock]->res;
68620 return 0;
68621 }
68622
68623@@ -217,9 +218,11 @@ static inline int invalid_clockid(const
68624 return 0;
68625 if ((unsigned) which_clock >= MAX_CLOCKS)
68626 return 1;
68627- if (posix_clocks[which_clock].clock_getres != NULL)
68628+ if (posix_clocks[which_clock] == NULL)
68629 return 0;
68630- if (posix_clocks[which_clock].res != 0)
68631+ if (posix_clocks[which_clock]->clock_getres != NULL)
68632+ return 0;
68633+ if (posix_clocks[which_clock]->res != 0)
68634 return 0;
68635 return 1;
68636 }
68637@@ -266,29 +269,29 @@ int posix_get_coarse_res(const clockid_t
68638 */
68639 static __init int init_posix_timers(void)
68640 {
68641- struct k_clock clock_realtime = {
68642+ static struct k_clock clock_realtime = {
68643 .clock_getres = hrtimer_get_res,
68644 };
68645- struct k_clock clock_monotonic = {
68646+ static struct k_clock clock_monotonic = {
68647 .clock_getres = hrtimer_get_res,
68648 .clock_get = posix_ktime_get_ts,
68649 .clock_set = do_posix_clock_nosettime,
68650 };
68651- struct k_clock clock_monotonic_raw = {
68652+ static struct k_clock clock_monotonic_raw = {
68653 .clock_getres = hrtimer_get_res,
68654 .clock_get = posix_get_monotonic_raw,
68655 .clock_set = do_posix_clock_nosettime,
68656 .timer_create = no_timer_create,
68657 .nsleep = no_nsleep,
68658 };
68659- struct k_clock clock_realtime_coarse = {
68660+ static struct k_clock clock_realtime_coarse = {
68661 .clock_getres = posix_get_coarse_res,
68662 .clock_get = posix_get_realtime_coarse,
68663 .clock_set = do_posix_clock_nosettime,
68664 .timer_create = no_timer_create,
68665 .nsleep = no_nsleep,
68666 };
68667- struct k_clock clock_monotonic_coarse = {
68668+ static struct k_clock clock_monotonic_coarse = {
68669 .clock_getres = posix_get_coarse_res,
68670 .clock_get = posix_get_monotonic_coarse,
68671 .clock_set = do_posix_clock_nosettime,
68672@@ -296,6 +299,8 @@ static __init int init_posix_timers(void
68673 .nsleep = no_nsleep,
68674 };
68675
68676+ pax_track_stack();
68677+
68678 register_posix_clock(CLOCK_REALTIME, &clock_realtime);
68679 register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
68680 register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);
68681@@ -484,7 +489,7 @@ void register_posix_clock(const clockid_
68682 return;
68683 }
68684
68685- posix_clocks[clock_id] = *new_clock;
68686+ posix_clocks[clock_id] = new_clock;
68687 }
68688 EXPORT_SYMBOL_GPL(register_posix_clock);
68689
68690@@ -948,6 +953,13 @@ SYSCALL_DEFINE2(clock_settime, const clo
68691 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
68692 return -EFAULT;
68693
68694+ /* only the CLOCK_REALTIME clock can be set, all other clocks
68695+ have their clock_set fptr set to a nosettime dummy function
68696+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
68697+ call common_clock_set, which calls do_sys_settimeofday, which
68698+ we hook
68699+ */
68700+
68701 return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
68702 }
68703
68704diff -urNp linux-2.6.32.46/kernel/power/hibernate.c linux-2.6.32.46/kernel/power/hibernate.c
68705--- linux-2.6.32.46/kernel/power/hibernate.c 2011-03-27 14:31:47.000000000 -0400
68706+++ linux-2.6.32.46/kernel/power/hibernate.c 2011-04-17 15:56:46.000000000 -0400
68707@@ -48,14 +48,14 @@ enum {
68708
68709 static int hibernation_mode = HIBERNATION_SHUTDOWN;
68710
68711-static struct platform_hibernation_ops *hibernation_ops;
68712+static const struct platform_hibernation_ops *hibernation_ops;
68713
68714 /**
68715 * hibernation_set_ops - set the global hibernate operations
68716 * @ops: the hibernation operations to use in subsequent hibernation transitions
68717 */
68718
68719-void hibernation_set_ops(struct platform_hibernation_ops *ops)
68720+void hibernation_set_ops(const struct platform_hibernation_ops *ops)
68721 {
68722 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
68723 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
68724diff -urNp linux-2.6.32.46/kernel/power/poweroff.c linux-2.6.32.46/kernel/power/poweroff.c
68725--- linux-2.6.32.46/kernel/power/poweroff.c 2011-03-27 14:31:47.000000000 -0400
68726+++ linux-2.6.32.46/kernel/power/poweroff.c 2011-04-17 15:56:46.000000000 -0400
68727@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
68728 .enable_mask = SYSRQ_ENABLE_BOOT,
68729 };
68730
68731-static int pm_sysrq_init(void)
68732+static int __init pm_sysrq_init(void)
68733 {
68734 register_sysrq_key('o', &sysrq_poweroff_op);
68735 return 0;
68736diff -urNp linux-2.6.32.46/kernel/power/process.c linux-2.6.32.46/kernel/power/process.c
68737--- linux-2.6.32.46/kernel/power/process.c 2011-03-27 14:31:47.000000000 -0400
68738+++ linux-2.6.32.46/kernel/power/process.c 2011-04-17 15:56:46.000000000 -0400
68739@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
68740 struct timeval start, end;
68741 u64 elapsed_csecs64;
68742 unsigned int elapsed_csecs;
68743+ bool timedout = false;
68744
68745 do_gettimeofday(&start);
68746
68747 end_time = jiffies + TIMEOUT;
68748 do {
68749 todo = 0;
68750+ if (time_after(jiffies, end_time))
68751+ timedout = true;
68752 read_lock(&tasklist_lock);
68753 do_each_thread(g, p) {
68754 if (frozen(p) || !freezeable(p))
68755@@ -57,15 +60,17 @@ static int try_to_freeze_tasks(bool sig_
68756 * It is "frozen enough". If the task does wake
68757 * up, it will immediately call try_to_freeze.
68758 */
68759- if (!task_is_stopped_or_traced(p) &&
68760- !freezer_should_skip(p))
68761+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
68762 todo++;
68763+ if (timedout) {
68764+ printk(KERN_ERR "Task refusing to freeze:\n");
68765+ sched_show_task(p);
68766+ }
68767+ }
68768 } while_each_thread(g, p);
68769 read_unlock(&tasklist_lock);
68770 yield(); /* Yield is okay here */
68771- if (time_after(jiffies, end_time))
68772- break;
68773- } while (todo);
68774+ } while (todo && !timedout);
68775
68776 do_gettimeofday(&end);
68777 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
68778diff -urNp linux-2.6.32.46/kernel/power/suspend.c linux-2.6.32.46/kernel/power/suspend.c
68779--- linux-2.6.32.46/kernel/power/suspend.c 2011-03-27 14:31:47.000000000 -0400
68780+++ linux-2.6.32.46/kernel/power/suspend.c 2011-04-17 15:56:46.000000000 -0400
68781@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
68782 [PM_SUSPEND_MEM] = "mem",
68783 };
68784
68785-static struct platform_suspend_ops *suspend_ops;
68786+static const struct platform_suspend_ops *suspend_ops;
68787
68788 /**
68789 * suspend_set_ops - Set the global suspend method table.
68790 * @ops: Pointer to ops structure.
68791 */
68792-void suspend_set_ops(struct platform_suspend_ops *ops)
68793+void suspend_set_ops(const struct platform_suspend_ops *ops)
68794 {
68795 mutex_lock(&pm_mutex);
68796 suspend_ops = ops;
68797diff -urNp linux-2.6.32.46/kernel/printk.c linux-2.6.32.46/kernel/printk.c
68798--- linux-2.6.32.46/kernel/printk.c 2011-03-27 14:31:47.000000000 -0400
68799+++ linux-2.6.32.46/kernel/printk.c 2011-04-17 15:56:46.000000000 -0400
68800@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
68801 char c;
68802 int error = 0;
68803
68804+#ifdef CONFIG_GRKERNSEC_DMESG
68805+ if (grsec_enable_dmesg && !capable(CAP_SYS_ADMIN))
68806+ return -EPERM;
68807+#endif
68808+
68809 error = security_syslog(type);
68810 if (error)
68811 return error;
68812diff -urNp linux-2.6.32.46/kernel/profile.c linux-2.6.32.46/kernel/profile.c
68813--- linux-2.6.32.46/kernel/profile.c 2011-03-27 14:31:47.000000000 -0400
68814+++ linux-2.6.32.46/kernel/profile.c 2011-05-04 17:56:28.000000000 -0400
68815@@ -39,7 +39,7 @@ struct profile_hit {
68816 /* Oprofile timer tick hook */
68817 static int (*timer_hook)(struct pt_regs *) __read_mostly;
68818
68819-static atomic_t *prof_buffer;
68820+static atomic_unchecked_t *prof_buffer;
68821 static unsigned long prof_len, prof_shift;
68822
68823 int prof_on __read_mostly;
68824@@ -283,7 +283,7 @@ static void profile_flip_buffers(void)
68825 hits[i].pc = 0;
68826 continue;
68827 }
68828- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68829+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68830 hits[i].hits = hits[i].pc = 0;
68831 }
68832 }
68833@@ -346,9 +346,9 @@ void profile_hits(int type, void *__pc,
68834 * Add the current hit(s) and flush the write-queue out
68835 * to the global buffer:
68836 */
68837- atomic_add(nr_hits, &prof_buffer[pc]);
68838+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
68839 for (i = 0; i < NR_PROFILE_HIT; ++i) {
68840- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68841+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68842 hits[i].pc = hits[i].hits = 0;
68843 }
68844 out:
68845@@ -426,7 +426,7 @@ void profile_hits(int type, void *__pc,
68846 if (prof_on != type || !prof_buffer)
68847 return;
68848 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
68849- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68850+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68851 }
68852 #endif /* !CONFIG_SMP */
68853 EXPORT_SYMBOL_GPL(profile_hits);
68854@@ -517,7 +517,7 @@ read_profile(struct file *file, char __u
68855 return -EFAULT;
68856 buf++; p++; count--; read++;
68857 }
68858- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
68859+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
68860 if (copy_to_user(buf, (void *)pnt, count))
68861 return -EFAULT;
68862 read += count;
68863@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file
68864 }
68865 #endif
68866 profile_discard_flip_buffers();
68867- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
68868+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
68869 return count;
68870 }
68871
68872diff -urNp linux-2.6.32.46/kernel/ptrace.c linux-2.6.32.46/kernel/ptrace.c
68873--- linux-2.6.32.46/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400
68874+++ linux-2.6.32.46/kernel/ptrace.c 2011-05-22 23:02:06.000000000 -0400
68875@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru
68876 return ret;
68877 }
68878
68879-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
68880+static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
68881+ unsigned int log)
68882 {
68883 const struct cred *cred = current_cred(), *tcred;
68884
68885@@ -141,7 +142,9 @@ int __ptrace_may_access(struct task_stru
68886 cred->gid != tcred->egid ||
68887 cred->gid != tcred->sgid ||
68888 cred->gid != tcred->gid) &&
68889- !capable(CAP_SYS_PTRACE)) {
68890+ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
68891+ (log && !capable(CAP_SYS_PTRACE)))
68892+ ) {
68893 rcu_read_unlock();
68894 return -EPERM;
68895 }
68896@@ -149,7 +152,9 @@ int __ptrace_may_access(struct task_stru
68897 smp_rmb();
68898 if (task->mm)
68899 dumpable = get_dumpable(task->mm);
68900- if (!dumpable && !capable(CAP_SYS_PTRACE))
68901+ if (!dumpable &&
68902+ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
68903+ (log && !capable(CAP_SYS_PTRACE))))
68904 return -EPERM;
68905
68906 return security_ptrace_access_check(task, mode);
68907@@ -159,7 +164,16 @@ bool ptrace_may_access(struct task_struc
68908 {
68909 int err;
68910 task_lock(task);
68911- err = __ptrace_may_access(task, mode);
68912+ err = __ptrace_may_access(task, mode, 0);
68913+ task_unlock(task);
68914+ return !err;
68915+}
68916+
68917+bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
68918+{
68919+ int err;
68920+ task_lock(task);
68921+ err = __ptrace_may_access(task, mode, 1);
68922 task_unlock(task);
68923 return !err;
68924 }
68925@@ -186,7 +200,7 @@ int ptrace_attach(struct task_struct *ta
68926 goto out;
68927
68928 task_lock(task);
68929- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
68930+ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
68931 task_unlock(task);
68932 if (retval)
68933 goto unlock_creds;
68934@@ -199,7 +213,7 @@ int ptrace_attach(struct task_struct *ta
68935 goto unlock_tasklist;
68936
68937 task->ptrace = PT_PTRACED;
68938- if (capable(CAP_SYS_PTRACE))
68939+ if (capable_nolog(CAP_SYS_PTRACE))
68940 task->ptrace |= PT_PTRACE_CAP;
68941
68942 __ptrace_link(task, current);
68943@@ -351,6 +365,8 @@ int ptrace_readdata(struct task_struct *
68944 {
68945 int copied = 0;
68946
68947+ pax_track_stack();
68948+
68949 while (len > 0) {
68950 char buf[128];
68951 int this_len, retval;
68952@@ -376,6 +392,8 @@ int ptrace_writedata(struct task_struct
68953 {
68954 int copied = 0;
68955
68956+ pax_track_stack();
68957+
68958 while (len > 0) {
68959 char buf[128];
68960 int this_len, retval;
68961@@ -517,6 +535,8 @@ int ptrace_request(struct task_struct *c
68962 int ret = -EIO;
68963 siginfo_t siginfo;
68964
68965+ pax_track_stack();
68966+
68967 switch (request) {
68968 case PTRACE_PEEKTEXT:
68969 case PTRACE_PEEKDATA:
68970@@ -532,18 +552,18 @@ int ptrace_request(struct task_struct *c
68971 ret = ptrace_setoptions(child, data);
68972 break;
68973 case PTRACE_GETEVENTMSG:
68974- ret = put_user(child->ptrace_message, (unsigned long __user *) data);
68975+ ret = put_user(child->ptrace_message, (__force unsigned long __user *) data);
68976 break;
68977
68978 case PTRACE_GETSIGINFO:
68979 ret = ptrace_getsiginfo(child, &siginfo);
68980 if (!ret)
68981- ret = copy_siginfo_to_user((siginfo_t __user *) data,
68982+ ret = copy_siginfo_to_user((__force siginfo_t __user *) data,
68983 &siginfo);
68984 break;
68985
68986 case PTRACE_SETSIGINFO:
68987- if (copy_from_user(&siginfo, (siginfo_t __user *) data,
68988+ if (copy_from_user(&siginfo, (__force siginfo_t __user *) data,
68989 sizeof siginfo))
68990 ret = -EFAULT;
68991 else
68992@@ -621,14 +641,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
68993 goto out;
68994 }
68995
68996+ if (gr_handle_ptrace(child, request)) {
68997+ ret = -EPERM;
68998+ goto out_put_task_struct;
68999+ }
69000+
69001 if (request == PTRACE_ATTACH) {
69002 ret = ptrace_attach(child);
69003 /*
69004 * Some architectures need to do book-keeping after
69005 * a ptrace attach.
69006 */
69007- if (!ret)
69008+ if (!ret) {
69009 arch_ptrace_attach(child);
69010+ gr_audit_ptrace(child);
69011+ }
69012 goto out_put_task_struct;
69013 }
69014
69015@@ -653,7 +680,7 @@ int generic_ptrace_peekdata(struct task_
69016 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
69017 if (copied != sizeof(tmp))
69018 return -EIO;
69019- return put_user(tmp, (unsigned long __user *)data);
69020+ return put_user(tmp, (__force unsigned long __user *)data);
69021 }
69022
69023 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
69024@@ -675,6 +702,8 @@ int compat_ptrace_request(struct task_st
69025 siginfo_t siginfo;
69026 int ret;
69027
69028+ pax_track_stack();
69029+
69030 switch (request) {
69031 case PTRACE_PEEKTEXT:
69032 case PTRACE_PEEKDATA:
69033@@ -740,14 +769,21 @@ asmlinkage long compat_sys_ptrace(compat
69034 goto out;
69035 }
69036
69037+ if (gr_handle_ptrace(child, request)) {
69038+ ret = -EPERM;
69039+ goto out_put_task_struct;
69040+ }
69041+
69042 if (request == PTRACE_ATTACH) {
69043 ret = ptrace_attach(child);
69044 /*
69045 * Some architectures need to do book-keeping after
69046 * a ptrace attach.
69047 */
69048- if (!ret)
69049+ if (!ret) {
69050 arch_ptrace_attach(child);
69051+ gr_audit_ptrace(child);
69052+ }
69053 goto out_put_task_struct;
69054 }
69055
69056diff -urNp linux-2.6.32.46/kernel/rcutorture.c linux-2.6.32.46/kernel/rcutorture.c
69057--- linux-2.6.32.46/kernel/rcutorture.c 2011-03-27 14:31:47.000000000 -0400
69058+++ linux-2.6.32.46/kernel/rcutorture.c 2011-05-04 17:56:28.000000000 -0400
69059@@ -118,12 +118,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
69060 { 0 };
69061 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
69062 { 0 };
69063-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
69064-static atomic_t n_rcu_torture_alloc;
69065-static atomic_t n_rcu_torture_alloc_fail;
69066-static atomic_t n_rcu_torture_free;
69067-static atomic_t n_rcu_torture_mberror;
69068-static atomic_t n_rcu_torture_error;
69069+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
69070+static atomic_unchecked_t n_rcu_torture_alloc;
69071+static atomic_unchecked_t n_rcu_torture_alloc_fail;
69072+static atomic_unchecked_t n_rcu_torture_free;
69073+static atomic_unchecked_t n_rcu_torture_mberror;
69074+static atomic_unchecked_t n_rcu_torture_error;
69075 static long n_rcu_torture_timers;
69076 static struct list_head rcu_torture_removed;
69077 static cpumask_var_t shuffle_tmp_mask;
69078@@ -187,11 +187,11 @@ rcu_torture_alloc(void)
69079
69080 spin_lock_bh(&rcu_torture_lock);
69081 if (list_empty(&rcu_torture_freelist)) {
69082- atomic_inc(&n_rcu_torture_alloc_fail);
69083+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
69084 spin_unlock_bh(&rcu_torture_lock);
69085 return NULL;
69086 }
69087- atomic_inc(&n_rcu_torture_alloc);
69088+ atomic_inc_unchecked(&n_rcu_torture_alloc);
69089 p = rcu_torture_freelist.next;
69090 list_del_init(p);
69091 spin_unlock_bh(&rcu_torture_lock);
69092@@ -204,7 +204,7 @@ rcu_torture_alloc(void)
69093 static void
69094 rcu_torture_free(struct rcu_torture *p)
69095 {
69096- atomic_inc(&n_rcu_torture_free);
69097+ atomic_inc_unchecked(&n_rcu_torture_free);
69098 spin_lock_bh(&rcu_torture_lock);
69099 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
69100 spin_unlock_bh(&rcu_torture_lock);
69101@@ -319,7 +319,7 @@ rcu_torture_cb(struct rcu_head *p)
69102 i = rp->rtort_pipe_count;
69103 if (i > RCU_TORTURE_PIPE_LEN)
69104 i = RCU_TORTURE_PIPE_LEN;
69105- atomic_inc(&rcu_torture_wcount[i]);
69106+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
69107 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
69108 rp->rtort_mbtest = 0;
69109 rcu_torture_free(rp);
69110@@ -359,7 +359,7 @@ static void rcu_sync_torture_deferred_fr
69111 i = rp->rtort_pipe_count;
69112 if (i > RCU_TORTURE_PIPE_LEN)
69113 i = RCU_TORTURE_PIPE_LEN;
69114- atomic_inc(&rcu_torture_wcount[i]);
69115+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
69116 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
69117 rp->rtort_mbtest = 0;
69118 list_del(&rp->rtort_free);
69119@@ -653,7 +653,7 @@ rcu_torture_writer(void *arg)
69120 i = old_rp->rtort_pipe_count;
69121 if (i > RCU_TORTURE_PIPE_LEN)
69122 i = RCU_TORTURE_PIPE_LEN;
69123- atomic_inc(&rcu_torture_wcount[i]);
69124+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
69125 old_rp->rtort_pipe_count++;
69126 cur_ops->deferred_free(old_rp);
69127 }
69128@@ -718,7 +718,7 @@ static void rcu_torture_timer(unsigned l
69129 return;
69130 }
69131 if (p->rtort_mbtest == 0)
69132- atomic_inc(&n_rcu_torture_mberror);
69133+ atomic_inc_unchecked(&n_rcu_torture_mberror);
69134 spin_lock(&rand_lock);
69135 cur_ops->read_delay(&rand);
69136 n_rcu_torture_timers++;
69137@@ -776,7 +776,7 @@ rcu_torture_reader(void *arg)
69138 continue;
69139 }
69140 if (p->rtort_mbtest == 0)
69141- atomic_inc(&n_rcu_torture_mberror);
69142+ atomic_inc_unchecked(&n_rcu_torture_mberror);
69143 cur_ops->read_delay(&rand);
69144 preempt_disable();
69145 pipe_count = p->rtort_pipe_count;
69146@@ -834,17 +834,17 @@ rcu_torture_printk(char *page)
69147 rcu_torture_current,
69148 rcu_torture_current_version,
69149 list_empty(&rcu_torture_freelist),
69150- atomic_read(&n_rcu_torture_alloc),
69151- atomic_read(&n_rcu_torture_alloc_fail),
69152- atomic_read(&n_rcu_torture_free),
69153- atomic_read(&n_rcu_torture_mberror),
69154+ atomic_read_unchecked(&n_rcu_torture_alloc),
69155+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
69156+ atomic_read_unchecked(&n_rcu_torture_free),
69157+ atomic_read_unchecked(&n_rcu_torture_mberror),
69158 n_rcu_torture_timers);
69159- if (atomic_read(&n_rcu_torture_mberror) != 0)
69160+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0)
69161 cnt += sprintf(&page[cnt], " !!!");
69162 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
69163 if (i > 1) {
69164 cnt += sprintf(&page[cnt], "!!! ");
69165- atomic_inc(&n_rcu_torture_error);
69166+ atomic_inc_unchecked(&n_rcu_torture_error);
69167 WARN_ON_ONCE(1);
69168 }
69169 cnt += sprintf(&page[cnt], "Reader Pipe: ");
69170@@ -858,7 +858,7 @@ rcu_torture_printk(char *page)
69171 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
69172 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
69173 cnt += sprintf(&page[cnt], " %d",
69174- atomic_read(&rcu_torture_wcount[i]));
69175+ atomic_read_unchecked(&rcu_torture_wcount[i]));
69176 }
69177 cnt += sprintf(&page[cnt], "\n");
69178 if (cur_ops->stats)
69179@@ -1084,7 +1084,7 @@ rcu_torture_cleanup(void)
69180
69181 if (cur_ops->cleanup)
69182 cur_ops->cleanup();
69183- if (atomic_read(&n_rcu_torture_error))
69184+ if (atomic_read_unchecked(&n_rcu_torture_error))
69185 rcu_torture_print_module_parms("End of test: FAILURE");
69186 else
69187 rcu_torture_print_module_parms("End of test: SUCCESS");
69188@@ -1138,13 +1138,13 @@ rcu_torture_init(void)
69189
69190 rcu_torture_current = NULL;
69191 rcu_torture_current_version = 0;
69192- atomic_set(&n_rcu_torture_alloc, 0);
69193- atomic_set(&n_rcu_torture_alloc_fail, 0);
69194- atomic_set(&n_rcu_torture_free, 0);
69195- atomic_set(&n_rcu_torture_mberror, 0);
69196- atomic_set(&n_rcu_torture_error, 0);
69197+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
69198+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
69199+ atomic_set_unchecked(&n_rcu_torture_free, 0);
69200+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
69201+ atomic_set_unchecked(&n_rcu_torture_error, 0);
69202 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
69203- atomic_set(&rcu_torture_wcount[i], 0);
69204+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
69205 for_each_possible_cpu(cpu) {
69206 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
69207 per_cpu(rcu_torture_count, cpu)[i] = 0;
69208diff -urNp linux-2.6.32.46/kernel/rcutree.c linux-2.6.32.46/kernel/rcutree.c
69209--- linux-2.6.32.46/kernel/rcutree.c 2011-03-27 14:31:47.000000000 -0400
69210+++ linux-2.6.32.46/kernel/rcutree.c 2011-04-17 15:56:46.000000000 -0400
69211@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
69212 /*
69213 * Do softirq processing for the current CPU.
69214 */
69215-static void rcu_process_callbacks(struct softirq_action *unused)
69216+static void rcu_process_callbacks(void)
69217 {
69218 /*
69219 * Memory references from any prior RCU read-side critical sections
69220diff -urNp linux-2.6.32.46/kernel/rcutree_plugin.h linux-2.6.32.46/kernel/rcutree_plugin.h
69221--- linux-2.6.32.46/kernel/rcutree_plugin.h 2011-03-27 14:31:47.000000000 -0400
69222+++ linux-2.6.32.46/kernel/rcutree_plugin.h 2011-04-17 15:56:46.000000000 -0400
69223@@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi
69224 */
69225 void __rcu_read_lock(void)
69226 {
69227- ACCESS_ONCE(current->rcu_read_lock_nesting)++;
69228+ ACCESS_ONCE_RW(current->rcu_read_lock_nesting)++;
69229 barrier(); /* needed if we ever invoke rcu_read_lock in rcutree.c */
69230 }
69231 EXPORT_SYMBOL_GPL(__rcu_read_lock);
69232@@ -251,7 +251,7 @@ void __rcu_read_unlock(void)
69233 struct task_struct *t = current;
69234
69235 barrier(); /* needed if we ever invoke rcu_read_unlock in rcutree.c */
69236- if (--ACCESS_ONCE(t->rcu_read_lock_nesting) == 0 &&
69237+ if (--ACCESS_ONCE_RW(t->rcu_read_lock_nesting) == 0 &&
69238 unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
69239 rcu_read_unlock_special(t);
69240 }
69241diff -urNp linux-2.6.32.46/kernel/relay.c linux-2.6.32.46/kernel/relay.c
69242--- linux-2.6.32.46/kernel/relay.c 2011-03-27 14:31:47.000000000 -0400
69243+++ linux-2.6.32.46/kernel/relay.c 2011-05-16 21:46:57.000000000 -0400
69244@@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
69245 unsigned int flags,
69246 int *nonpad_ret)
69247 {
69248- unsigned int pidx, poff, total_len, subbuf_pages, nr_pages, ret;
69249+ unsigned int pidx, poff, total_len, subbuf_pages, nr_pages;
69250 struct rchan_buf *rbuf = in->private_data;
69251 unsigned int subbuf_size = rbuf->chan->subbuf_size;
69252 uint64_t pos = (uint64_t) *ppos;
69253@@ -1241,6 +1241,9 @@ static int subbuf_splice_actor(struct fi
69254 .ops = &relay_pipe_buf_ops,
69255 .spd_release = relay_page_release,
69256 };
69257+ ssize_t ret;
69258+
69259+ pax_track_stack();
69260
69261 if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
69262 return 0;
69263diff -urNp linux-2.6.32.46/kernel/resource.c linux-2.6.32.46/kernel/resource.c
69264--- linux-2.6.32.46/kernel/resource.c 2011-03-27 14:31:47.000000000 -0400
69265+++ linux-2.6.32.46/kernel/resource.c 2011-04-17 15:56:46.000000000 -0400
69266@@ -132,8 +132,18 @@ static const struct file_operations proc
69267
69268 static int __init ioresources_init(void)
69269 {
69270+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69271+#ifdef CONFIG_GRKERNSEC_PROC_USER
69272+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
69273+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
69274+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69275+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
69276+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
69277+#endif
69278+#else
69279 proc_create("ioports", 0, NULL, &proc_ioports_operations);
69280 proc_create("iomem", 0, NULL, &proc_iomem_operations);
69281+#endif
69282 return 0;
69283 }
69284 __initcall(ioresources_init);
69285diff -urNp linux-2.6.32.46/kernel/rtmutex.c linux-2.6.32.46/kernel/rtmutex.c
69286--- linux-2.6.32.46/kernel/rtmutex.c 2011-03-27 14:31:47.000000000 -0400
69287+++ linux-2.6.32.46/kernel/rtmutex.c 2011-04-17 15:56:46.000000000 -0400
69288@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
69289 */
69290 spin_lock_irqsave(&pendowner->pi_lock, flags);
69291
69292- WARN_ON(!pendowner->pi_blocked_on);
69293+ BUG_ON(!pendowner->pi_blocked_on);
69294 WARN_ON(pendowner->pi_blocked_on != waiter);
69295 WARN_ON(pendowner->pi_blocked_on->lock != lock);
69296
69297diff -urNp linux-2.6.32.46/kernel/rtmutex-tester.c linux-2.6.32.46/kernel/rtmutex-tester.c
69298--- linux-2.6.32.46/kernel/rtmutex-tester.c 2011-03-27 14:31:47.000000000 -0400
69299+++ linux-2.6.32.46/kernel/rtmutex-tester.c 2011-05-04 17:56:28.000000000 -0400
69300@@ -21,7 +21,7 @@
69301 #define MAX_RT_TEST_MUTEXES 8
69302
69303 static spinlock_t rttest_lock;
69304-static atomic_t rttest_event;
69305+static atomic_unchecked_t rttest_event;
69306
69307 struct test_thread_data {
69308 int opcode;
69309@@ -64,7 +64,7 @@ static int handle_op(struct test_thread_
69310
69311 case RTTEST_LOCKCONT:
69312 td->mutexes[td->opdata] = 1;
69313- td->event = atomic_add_return(1, &rttest_event);
69314+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69315 return 0;
69316
69317 case RTTEST_RESET:
69318@@ -82,7 +82,7 @@ static int handle_op(struct test_thread_
69319 return 0;
69320
69321 case RTTEST_RESETEVENT:
69322- atomic_set(&rttest_event, 0);
69323+ atomic_set_unchecked(&rttest_event, 0);
69324 return 0;
69325
69326 default:
69327@@ -99,9 +99,9 @@ static int handle_op(struct test_thread_
69328 return ret;
69329
69330 td->mutexes[id] = 1;
69331- td->event = atomic_add_return(1, &rttest_event);
69332+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69333 rt_mutex_lock(&mutexes[id]);
69334- td->event = atomic_add_return(1, &rttest_event);
69335+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69336 td->mutexes[id] = 4;
69337 return 0;
69338
69339@@ -112,9 +112,9 @@ static int handle_op(struct test_thread_
69340 return ret;
69341
69342 td->mutexes[id] = 1;
69343- td->event = atomic_add_return(1, &rttest_event);
69344+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69345 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
69346- td->event = atomic_add_return(1, &rttest_event);
69347+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69348 td->mutexes[id] = ret ? 0 : 4;
69349 return ret ? -EINTR : 0;
69350
69351@@ -123,9 +123,9 @@ static int handle_op(struct test_thread_
69352 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
69353 return ret;
69354
69355- td->event = atomic_add_return(1, &rttest_event);
69356+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69357 rt_mutex_unlock(&mutexes[id]);
69358- td->event = atomic_add_return(1, &rttest_event);
69359+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69360 td->mutexes[id] = 0;
69361 return 0;
69362
69363@@ -187,7 +187,7 @@ void schedule_rt_mutex_test(struct rt_mu
69364 break;
69365
69366 td->mutexes[dat] = 2;
69367- td->event = atomic_add_return(1, &rttest_event);
69368+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69369 break;
69370
69371 case RTTEST_LOCKBKL:
69372@@ -208,7 +208,7 @@ void schedule_rt_mutex_test(struct rt_mu
69373 return;
69374
69375 td->mutexes[dat] = 3;
69376- td->event = atomic_add_return(1, &rttest_event);
69377+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69378 break;
69379
69380 case RTTEST_LOCKNOWAIT:
69381@@ -220,7 +220,7 @@ void schedule_rt_mutex_test(struct rt_mu
69382 return;
69383
69384 td->mutexes[dat] = 1;
69385- td->event = atomic_add_return(1, &rttest_event);
69386+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69387 return;
69388
69389 case RTTEST_LOCKBKL:
69390diff -urNp linux-2.6.32.46/kernel/sched.c linux-2.6.32.46/kernel/sched.c
69391--- linux-2.6.32.46/kernel/sched.c 2011-03-27 14:31:47.000000000 -0400
69392+++ linux-2.6.32.46/kernel/sched.c 2011-08-21 19:29:25.000000000 -0400
69393@@ -2764,9 +2764,10 @@ void wake_up_new_task(struct task_struct
69394 {
69395 unsigned long flags;
69396 struct rq *rq;
69397- int cpu = get_cpu();
69398
69399 #ifdef CONFIG_SMP
69400+ int cpu = get_cpu();
69401+
69402 rq = task_rq_lock(p, &flags);
69403 p->state = TASK_WAKING;
69404
69405@@ -5043,7 +5044,7 @@ out:
69406 * In CONFIG_NO_HZ case, the idle load balance owner will do the
69407 * rebalancing for all the cpus for whom scheduler ticks are stopped.
69408 */
69409-static void run_rebalance_domains(struct softirq_action *h)
69410+static void run_rebalance_domains(void)
69411 {
69412 int this_cpu = smp_processor_id();
69413 struct rq *this_rq = cpu_rq(this_cpu);
69414@@ -5700,6 +5701,8 @@ asmlinkage void __sched schedule(void)
69415 struct rq *rq;
69416 int cpu;
69417
69418+ pax_track_stack();
69419+
69420 need_resched:
69421 preempt_disable();
69422 cpu = smp_processor_id();
69423@@ -5770,7 +5773,7 @@ EXPORT_SYMBOL(schedule);
69424 * Look out! "owner" is an entirely speculative pointer
69425 * access and not reliable.
69426 */
69427-int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
69428+int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner)
69429 {
69430 unsigned int cpu;
69431 struct rq *rq;
69432@@ -5784,10 +5787,10 @@ int mutex_spin_on_owner(struct mutex *lo
69433 * DEBUG_PAGEALLOC could have unmapped it if
69434 * the mutex owner just released it and exited.
69435 */
69436- if (probe_kernel_address(&owner->cpu, cpu))
69437+ if (probe_kernel_address(&task_thread_info(owner)->cpu, cpu))
69438 return 0;
69439 #else
69440- cpu = owner->cpu;
69441+ cpu = task_thread_info(owner)->cpu;
69442 #endif
69443
69444 /*
69445@@ -5816,7 +5819,7 @@ int mutex_spin_on_owner(struct mutex *lo
69446 /*
69447 * Is that owner really running on that cpu?
69448 */
69449- if (task_thread_info(rq->curr) != owner || need_resched())
69450+ if (rq->curr != owner || need_resched())
69451 return 0;
69452
69453 cpu_relax();
69454@@ -6359,6 +6362,8 @@ int can_nice(const struct task_struct *p
69455 /* convert nice value [19,-20] to rlimit style value [1,40] */
69456 int nice_rlim = 20 - nice;
69457
69458+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
69459+
69460 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
69461 capable(CAP_SYS_NICE));
69462 }
69463@@ -6392,7 +6397,8 @@ SYSCALL_DEFINE1(nice, int, increment)
69464 if (nice > 19)
69465 nice = 19;
69466
69467- if (increment < 0 && !can_nice(current, nice))
69468+ if (increment < 0 && (!can_nice(current, nice) ||
69469+ gr_handle_chroot_nice()))
69470 return -EPERM;
69471
69472 retval = security_task_setnice(current, nice);
69473@@ -8774,7 +8780,7 @@ static void init_sched_groups_power(int
69474 long power;
69475 int weight;
69476
69477- WARN_ON(!sd || !sd->groups);
69478+ BUG_ON(!sd || !sd->groups);
69479
69480 if (cpu != group_first_cpu(sd->groups))
69481 return;
69482diff -urNp linux-2.6.32.46/kernel/signal.c linux-2.6.32.46/kernel/signal.c
69483--- linux-2.6.32.46/kernel/signal.c 2011-04-17 17:00:52.000000000 -0400
69484+++ linux-2.6.32.46/kernel/signal.c 2011-08-16 21:15:58.000000000 -0400
69485@@ -41,12 +41,12 @@
69486
69487 static struct kmem_cache *sigqueue_cachep;
69488
69489-static void __user *sig_handler(struct task_struct *t, int sig)
69490+static __sighandler_t sig_handler(struct task_struct *t, int sig)
69491 {
69492 return t->sighand->action[sig - 1].sa.sa_handler;
69493 }
69494
69495-static int sig_handler_ignored(void __user *handler, int sig)
69496+static int sig_handler_ignored(__sighandler_t handler, int sig)
69497 {
69498 /* Is it explicitly or implicitly ignored? */
69499 return handler == SIG_IGN ||
69500@@ -56,7 +56,7 @@ static int sig_handler_ignored(void __us
69501 static int sig_task_ignored(struct task_struct *t, int sig,
69502 int from_ancestor_ns)
69503 {
69504- void __user *handler;
69505+ __sighandler_t handler;
69506
69507 handler = sig_handler(t, sig);
69508
69509@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
69510 */
69511 user = get_uid(__task_cred(t)->user);
69512 atomic_inc(&user->sigpending);
69513+
69514+ if (!override_rlimit)
69515+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
69516 if (override_rlimit ||
69517 atomic_read(&user->sigpending) <=
69518 t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur)
69519@@ -327,7 +330,7 @@ flush_signal_handlers(struct task_struct
69520
69521 int unhandled_signal(struct task_struct *tsk, int sig)
69522 {
69523- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
69524+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
69525 if (is_global_init(tsk))
69526 return 1;
69527 if (handler != SIG_IGN && handler != SIG_DFL)
69528@@ -627,6 +630,13 @@ static int check_kill_permission(int sig
69529 }
69530 }
69531
69532+ /* allow glibc communication via tgkill to other threads in our
69533+ thread group */
69534+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
69535+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
69536+ && gr_handle_signal(t, sig))
69537+ return -EPERM;
69538+
69539 return security_task_kill(t, info, sig, 0);
69540 }
69541
69542@@ -968,7 +978,7 @@ __group_send_sig_info(int sig, struct si
69543 return send_signal(sig, info, p, 1);
69544 }
69545
69546-static int
69547+int
69548 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69549 {
69550 return send_signal(sig, info, t, 0);
69551@@ -1005,6 +1015,7 @@ force_sig_info(int sig, struct siginfo *
69552 unsigned long int flags;
69553 int ret, blocked, ignored;
69554 struct k_sigaction *action;
69555+ int is_unhandled = 0;
69556
69557 spin_lock_irqsave(&t->sighand->siglock, flags);
69558 action = &t->sighand->action[sig-1];
69559@@ -1019,9 +1030,18 @@ force_sig_info(int sig, struct siginfo *
69560 }
69561 if (action->sa.sa_handler == SIG_DFL)
69562 t->signal->flags &= ~SIGNAL_UNKILLABLE;
69563+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
69564+ is_unhandled = 1;
69565 ret = specific_send_sig_info(sig, info, t);
69566 spin_unlock_irqrestore(&t->sighand->siglock, flags);
69567
69568+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
69569+ normal operation */
69570+ if (is_unhandled) {
69571+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
69572+ gr_handle_crash(t, sig);
69573+ }
69574+
69575 return ret;
69576 }
69577
69578@@ -1081,8 +1101,11 @@ int group_send_sig_info(int sig, struct
69579 {
69580 int ret = check_kill_permission(sig, info, p);
69581
69582- if (!ret && sig)
69583+ if (!ret && sig) {
69584 ret = do_send_sig_info(sig, info, p, true);
69585+ if (!ret)
69586+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
69587+ }
69588
69589 return ret;
69590 }
69591@@ -1644,6 +1667,8 @@ void ptrace_notify(int exit_code)
69592 {
69593 siginfo_t info;
69594
69595+ pax_track_stack();
69596+
69597 BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
69598
69599 memset(&info, 0, sizeof info);
69600@@ -2275,7 +2300,15 @@ do_send_specific(pid_t tgid, pid_t pid,
69601 int error = -ESRCH;
69602
69603 rcu_read_lock();
69604- p = find_task_by_vpid(pid);
69605+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
69606+ /* allow glibc communication via tgkill to other threads in our
69607+ thread group */
69608+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
69609+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
69610+ p = find_task_by_vpid_unrestricted(pid);
69611+ else
69612+#endif
69613+ p = find_task_by_vpid(pid);
69614 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
69615 error = check_kill_permission(sig, info, p);
69616 /*
69617diff -urNp linux-2.6.32.46/kernel/smp.c linux-2.6.32.46/kernel/smp.c
69618--- linux-2.6.32.46/kernel/smp.c 2011-03-27 14:31:47.000000000 -0400
69619+++ linux-2.6.32.46/kernel/smp.c 2011-04-17 15:56:46.000000000 -0400
69620@@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void
69621 }
69622 EXPORT_SYMBOL(smp_call_function);
69623
69624-void ipi_call_lock(void)
69625+void ipi_call_lock(void) __acquires(call_function.lock)
69626 {
69627 spin_lock(&call_function.lock);
69628 }
69629
69630-void ipi_call_unlock(void)
69631+void ipi_call_unlock(void) __releases(call_function.lock)
69632 {
69633 spin_unlock(&call_function.lock);
69634 }
69635
69636-void ipi_call_lock_irq(void)
69637+void ipi_call_lock_irq(void) __acquires(call_function.lock)
69638 {
69639 spin_lock_irq(&call_function.lock);
69640 }
69641
69642-void ipi_call_unlock_irq(void)
69643+void ipi_call_unlock_irq(void) __releases(call_function.lock)
69644 {
69645 spin_unlock_irq(&call_function.lock);
69646 }
69647diff -urNp linux-2.6.32.46/kernel/softirq.c linux-2.6.32.46/kernel/softirq.c
69648--- linux-2.6.32.46/kernel/softirq.c 2011-03-27 14:31:47.000000000 -0400
69649+++ linux-2.6.32.46/kernel/softirq.c 2011-08-05 20:33:55.000000000 -0400
69650@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
69651
69652 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
69653
69654-char *softirq_to_name[NR_SOFTIRQS] = {
69655+const char * const softirq_to_name[NR_SOFTIRQS] = {
69656 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
69657 "TASKLET", "SCHED", "HRTIMER", "RCU"
69658 };
69659@@ -206,7 +206,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
69660
69661 asmlinkage void __do_softirq(void)
69662 {
69663- struct softirq_action *h;
69664+ const struct softirq_action *h;
69665 __u32 pending;
69666 int max_restart = MAX_SOFTIRQ_RESTART;
69667 int cpu;
69668@@ -233,7 +233,7 @@ restart:
69669 kstat_incr_softirqs_this_cpu(h - softirq_vec);
69670
69671 trace_softirq_entry(h, softirq_vec);
69672- h->action(h);
69673+ h->action();
69674 trace_softirq_exit(h, softirq_vec);
69675 if (unlikely(prev_count != preempt_count())) {
69676 printk(KERN_ERR "huh, entered softirq %td %s %p"
69677@@ -363,9 +363,11 @@ void raise_softirq(unsigned int nr)
69678 local_irq_restore(flags);
69679 }
69680
69681-void open_softirq(int nr, void (*action)(struct softirq_action *))
69682+void open_softirq(int nr, void (*action)(void))
69683 {
69684- softirq_vec[nr].action = action;
69685+ pax_open_kernel();
69686+ *(void **)&softirq_vec[nr].action = action;
69687+ pax_close_kernel();
69688 }
69689
69690 /*
69691@@ -419,7 +421,7 @@ void __tasklet_hi_schedule_first(struct
69692
69693 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
69694
69695-static void tasklet_action(struct softirq_action *a)
69696+static void tasklet_action(void)
69697 {
69698 struct tasklet_struct *list;
69699
69700@@ -454,7 +456,7 @@ static void tasklet_action(struct softir
69701 }
69702 }
69703
69704-static void tasklet_hi_action(struct softirq_action *a)
69705+static void tasklet_hi_action(void)
69706 {
69707 struct tasklet_struct *list;
69708
69709diff -urNp linux-2.6.32.46/kernel/sys.c linux-2.6.32.46/kernel/sys.c
69710--- linux-2.6.32.46/kernel/sys.c 2011-03-27 14:31:47.000000000 -0400
69711+++ linux-2.6.32.46/kernel/sys.c 2011-08-11 19:51:54.000000000 -0400
69712@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
69713 error = -EACCES;
69714 goto out;
69715 }
69716+
69717+ if (gr_handle_chroot_setpriority(p, niceval)) {
69718+ error = -EACCES;
69719+ goto out;
69720+ }
69721+
69722 no_nice = security_task_setnice(p, niceval);
69723 if (no_nice) {
69724 error = no_nice;
69725@@ -190,10 +196,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
69726 !(user = find_user(who)))
69727 goto out_unlock; /* No processes for this user */
69728
69729- do_each_thread(g, p)
69730+ do_each_thread(g, p) {
69731 if (__task_cred(p)->uid == who)
69732 error = set_one_prio(p, niceval, error);
69733- while_each_thread(g, p);
69734+ } while_each_thread(g, p);
69735 if (who != cred->uid)
69736 free_uid(user); /* For find_user() */
69737 break;
69738@@ -253,13 +259,13 @@ SYSCALL_DEFINE2(getpriority, int, which,
69739 !(user = find_user(who)))
69740 goto out_unlock; /* No processes for this user */
69741
69742- do_each_thread(g, p)
69743+ do_each_thread(g, p) {
69744 if (__task_cred(p)->uid == who) {
69745 niceval = 20 - task_nice(p);
69746 if (niceval > retval)
69747 retval = niceval;
69748 }
69749- while_each_thread(g, p);
69750+ } while_each_thread(g, p);
69751 if (who != cred->uid)
69752 free_uid(user); /* for find_user() */
69753 break;
69754@@ -509,6 +515,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
69755 goto error;
69756 }
69757
69758+ if (gr_check_group_change(new->gid, new->egid, -1))
69759+ goto error;
69760+
69761 if (rgid != (gid_t) -1 ||
69762 (egid != (gid_t) -1 && egid != old->gid))
69763 new->sgid = new->egid;
69764@@ -542,6 +551,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
69765 goto error;
69766
69767 retval = -EPERM;
69768+
69769+ if (gr_check_group_change(gid, gid, gid))
69770+ goto error;
69771+
69772 if (capable(CAP_SETGID))
69773 new->gid = new->egid = new->sgid = new->fsgid = gid;
69774 else if (gid == old->gid || gid == old->sgid)
69775@@ -567,12 +580,19 @@ static int set_user(struct cred *new)
69776 if (!new_user)
69777 return -EAGAIN;
69778
69779+ /*
69780+ * We don't fail in case of NPROC limit excess here because too many
69781+ * poorly written programs don't check set*uid() return code, assuming
69782+ * it never fails if called by root. We may still enforce NPROC limit
69783+ * for programs doing set*uid()+execve() by harmlessly deferring the
69784+ * failure to the execve() stage.
69785+ */
69786 if (atomic_read(&new_user->processes) >=
69787 current->signal->rlim[RLIMIT_NPROC].rlim_cur &&
69788- new_user != INIT_USER) {
69789- free_uid(new_user);
69790- return -EAGAIN;
69791- }
69792+ new_user != INIT_USER)
69793+ current->flags |= PF_NPROC_EXCEEDED;
69794+ else
69795+ current->flags &= ~PF_NPROC_EXCEEDED;
69796
69797 free_uid(new->user);
69798 new->user = new_user;
69799@@ -627,6 +647,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
69800 goto error;
69801 }
69802
69803+ if (gr_check_user_change(new->uid, new->euid, -1))
69804+ goto error;
69805+
69806 if (new->uid != old->uid) {
69807 retval = set_user(new);
69808 if (retval < 0)
69809@@ -675,6 +698,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
69810 goto error;
69811
69812 retval = -EPERM;
69813+
69814+ if (gr_check_crash_uid(uid))
69815+ goto error;
69816+ if (gr_check_user_change(uid, uid, uid))
69817+ goto error;
69818+
69819 if (capable(CAP_SETUID)) {
69820 new->suid = new->uid = uid;
69821 if (uid != old->uid) {
69822@@ -732,6 +761,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid,
69823 goto error;
69824 }
69825
69826+ if (gr_check_user_change(ruid, euid, -1))
69827+ goto error;
69828+
69829 if (ruid != (uid_t) -1) {
69830 new->uid = ruid;
69831 if (ruid != old->uid) {
69832@@ -800,6 +832,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid,
69833 goto error;
69834 }
69835
69836+ if (gr_check_group_change(rgid, egid, -1))
69837+ goto error;
69838+
69839 if (rgid != (gid_t) -1)
69840 new->gid = rgid;
69841 if (egid != (gid_t) -1)
69842@@ -849,6 +884,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69843 if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0)
69844 goto error;
69845
69846+ if (gr_check_user_change(-1, -1, uid))
69847+ goto error;
69848+
69849 if (uid == old->uid || uid == old->euid ||
69850 uid == old->suid || uid == old->fsuid ||
69851 capable(CAP_SETUID)) {
69852@@ -889,6 +927,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
69853 if (gid == old->gid || gid == old->egid ||
69854 gid == old->sgid || gid == old->fsgid ||
69855 capable(CAP_SETGID)) {
69856+ if (gr_check_group_change(-1, -1, gid))
69857+ goto error;
69858+
69859 if (gid != old_fsgid) {
69860 new->fsgid = gid;
69861 goto change_okay;
69862@@ -1454,7 +1495,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
69863 error = get_dumpable(me->mm);
69864 break;
69865 case PR_SET_DUMPABLE:
69866- if (arg2 < 0 || arg2 > 1) {
69867+ if (arg2 > 1) {
69868 error = -EINVAL;
69869 break;
69870 }
69871diff -urNp linux-2.6.32.46/kernel/sysctl.c linux-2.6.32.46/kernel/sysctl.c
69872--- linux-2.6.32.46/kernel/sysctl.c 2011-03-27 14:31:47.000000000 -0400
69873+++ linux-2.6.32.46/kernel/sysctl.c 2011-04-17 15:56:46.000000000 -0400
69874@@ -63,6 +63,13 @@
69875 static int deprecated_sysctl_warning(struct __sysctl_args *args);
69876
69877 #if defined(CONFIG_SYSCTL)
69878+#include <linux/grsecurity.h>
69879+#include <linux/grinternal.h>
69880+
69881+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
69882+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
69883+ const int op);
69884+extern int gr_handle_chroot_sysctl(const int op);
69885
69886 /* External variables not in a header file. */
69887 extern int C_A_D;
69888@@ -168,6 +175,7 @@ static int proc_do_cad_pid(struct ctl_ta
69889 static int proc_taint(struct ctl_table *table, int write,
69890 void __user *buffer, size_t *lenp, loff_t *ppos);
69891 #endif
69892+extern ctl_table grsecurity_table[];
69893
69894 static struct ctl_table root_table[];
69895 static struct ctl_table_root sysctl_table_root;
69896@@ -200,6 +208,21 @@ extern struct ctl_table epoll_table[];
69897 int sysctl_legacy_va_layout;
69898 #endif
69899
69900+#ifdef CONFIG_PAX_SOFTMODE
69901+static ctl_table pax_table[] = {
69902+ {
69903+ .ctl_name = CTL_UNNUMBERED,
69904+ .procname = "softmode",
69905+ .data = &pax_softmode,
69906+ .maxlen = sizeof(unsigned int),
69907+ .mode = 0600,
69908+ .proc_handler = &proc_dointvec,
69909+ },
69910+
69911+ { .ctl_name = 0 }
69912+};
69913+#endif
69914+
69915 extern int prove_locking;
69916 extern int lock_stat;
69917
69918@@ -251,6 +274,24 @@ static int max_wakeup_granularity_ns = N
69919 #endif
69920
69921 static struct ctl_table kern_table[] = {
69922+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
69923+ {
69924+ .ctl_name = CTL_UNNUMBERED,
69925+ .procname = "grsecurity",
69926+ .mode = 0500,
69927+ .child = grsecurity_table,
69928+ },
69929+#endif
69930+
69931+#ifdef CONFIG_PAX_SOFTMODE
69932+ {
69933+ .ctl_name = CTL_UNNUMBERED,
69934+ .procname = "pax",
69935+ .mode = 0500,
69936+ .child = pax_table,
69937+ },
69938+#endif
69939+
69940 {
69941 .ctl_name = CTL_UNNUMBERED,
69942 .procname = "sched_child_runs_first",
69943@@ -567,8 +608,8 @@ static struct ctl_table kern_table[] = {
69944 .data = &modprobe_path,
69945 .maxlen = KMOD_PATH_LEN,
69946 .mode = 0644,
69947- .proc_handler = &proc_dostring,
69948- .strategy = &sysctl_string,
69949+ .proc_handler = &proc_dostring_modpriv,
69950+ .strategy = &sysctl_string_modpriv,
69951 },
69952 {
69953 .ctl_name = CTL_UNNUMBERED,
69954@@ -1247,6 +1288,13 @@ static struct ctl_table vm_table[] = {
69955 .mode = 0644,
69956 .proc_handler = &proc_dointvec
69957 },
69958+ {
69959+ .procname = "heap_stack_gap",
69960+ .data = &sysctl_heap_stack_gap,
69961+ .maxlen = sizeof(sysctl_heap_stack_gap),
69962+ .mode = 0644,
69963+ .proc_handler = proc_doulongvec_minmax,
69964+ },
69965 #else
69966 {
69967 .ctl_name = CTL_UNNUMBERED,
69968@@ -1803,6 +1851,8 @@ static int do_sysctl_strategy(struct ctl
69969 return 0;
69970 }
69971
69972+static int sysctl_perm_nochk(struct ctl_table_root *root, struct ctl_table *table, int op);
69973+
69974 static int parse_table(int __user *name, int nlen,
69975 void __user *oldval, size_t __user *oldlenp,
69976 void __user *newval, size_t newlen,
69977@@ -1821,7 +1871,7 @@ repeat:
69978 if (n == table->ctl_name) {
69979 int error;
69980 if (table->child) {
69981- if (sysctl_perm(root, table, MAY_EXEC))
69982+ if (sysctl_perm_nochk(root, table, MAY_EXEC))
69983 return -EPERM;
69984 name++;
69985 nlen--;
69986@@ -1906,6 +1956,33 @@ int sysctl_perm(struct ctl_table_root *r
69987 int error;
69988 int mode;
69989
69990+ if (table->parent != NULL && table->parent->procname != NULL &&
69991+ table->procname != NULL &&
69992+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
69993+ return -EACCES;
69994+ if (gr_handle_chroot_sysctl(op))
69995+ return -EACCES;
69996+ error = gr_handle_sysctl(table, op);
69997+ if (error)
69998+ return error;
69999+
70000+ error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
70001+ if (error)
70002+ return error;
70003+
70004+ if (root->permissions)
70005+ mode = root->permissions(root, current->nsproxy, table);
70006+ else
70007+ mode = table->mode;
70008+
70009+ return test_perm(mode, op);
70010+}
70011+
70012+int sysctl_perm_nochk(struct ctl_table_root *root, struct ctl_table *table, int op)
70013+{
70014+ int error;
70015+ int mode;
70016+
70017 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
70018 if (error)
70019 return error;
70020@@ -2335,6 +2412,16 @@ int proc_dostring(struct ctl_table *tabl
70021 buffer, lenp, ppos);
70022 }
70023
70024+int proc_dostring_modpriv(struct ctl_table *table, int write,
70025+ void __user *buffer, size_t *lenp, loff_t *ppos)
70026+{
70027+ if (write && !capable(CAP_SYS_MODULE))
70028+ return -EPERM;
70029+
70030+ return _proc_do_string(table->data, table->maxlen, write,
70031+ buffer, lenp, ppos);
70032+}
70033+
70034
70035 static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp,
70036 int *valp,
70037@@ -2609,7 +2696,7 @@ static int __do_proc_doulongvec_minmax(v
70038 vleft = table->maxlen / sizeof(unsigned long);
70039 left = *lenp;
70040
70041- for (; left && vleft--; i++, min++, max++, first=0) {
70042+ for (; left && vleft--; i++, first=0) {
70043 if (write) {
70044 while (left) {
70045 char c;
70046@@ -2910,6 +2997,12 @@ int proc_dostring(struct ctl_table *tabl
70047 return -ENOSYS;
70048 }
70049
70050+int proc_dostring_modpriv(struct ctl_table *table, int write,
70051+ void __user *buffer, size_t *lenp, loff_t *ppos)
70052+{
70053+ return -ENOSYS;
70054+}
70055+
70056 int proc_dointvec(struct ctl_table *table, int write,
70057 void __user *buffer, size_t *lenp, loff_t *ppos)
70058 {
70059@@ -3038,6 +3131,16 @@ int sysctl_string(struct ctl_table *tabl
70060 return 1;
70061 }
70062
70063+int sysctl_string_modpriv(struct ctl_table *table,
70064+ void __user *oldval, size_t __user *oldlenp,
70065+ void __user *newval, size_t newlen)
70066+{
70067+ if (newval && newlen && !capable(CAP_SYS_MODULE))
70068+ return -EPERM;
70069+
70070+ return sysctl_string(table, oldval, oldlenp, newval, newlen);
70071+}
70072+
70073 /*
70074 * This function makes sure that all of the integers in the vector
70075 * are between the minimum and maximum values given in the arrays
70076@@ -3182,6 +3285,13 @@ int sysctl_string(struct ctl_table *tabl
70077 return -ENOSYS;
70078 }
70079
70080+int sysctl_string_modpriv(struct ctl_table *table,
70081+ void __user *oldval, size_t __user *oldlenp,
70082+ void __user *newval, size_t newlen)
70083+{
70084+ return -ENOSYS;
70085+}
70086+
70087 int sysctl_intvec(struct ctl_table *table,
70088 void __user *oldval, size_t __user *oldlenp,
70089 void __user *newval, size_t newlen)
70090@@ -3246,6 +3356,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
70091 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
70092 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
70093 EXPORT_SYMBOL(proc_dostring);
70094+EXPORT_SYMBOL(proc_dostring_modpriv);
70095 EXPORT_SYMBOL(proc_doulongvec_minmax);
70096 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
70097 EXPORT_SYMBOL(register_sysctl_table);
70098@@ -3254,5 +3365,6 @@ EXPORT_SYMBOL(sysctl_intvec);
70099 EXPORT_SYMBOL(sysctl_jiffies);
70100 EXPORT_SYMBOL(sysctl_ms_jiffies);
70101 EXPORT_SYMBOL(sysctl_string);
70102+EXPORT_SYMBOL(sysctl_string_modpriv);
70103 EXPORT_SYMBOL(sysctl_data);
70104 EXPORT_SYMBOL(unregister_sysctl_table);
70105diff -urNp linux-2.6.32.46/kernel/sysctl_check.c linux-2.6.32.46/kernel/sysctl_check.c
70106--- linux-2.6.32.46/kernel/sysctl_check.c 2011-03-27 14:31:47.000000000 -0400
70107+++ linux-2.6.32.46/kernel/sysctl_check.c 2011-04-17 15:56:46.000000000 -0400
70108@@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n
70109 } else {
70110 if ((table->strategy == sysctl_data) ||
70111 (table->strategy == sysctl_string) ||
70112+ (table->strategy == sysctl_string_modpriv) ||
70113 (table->strategy == sysctl_intvec) ||
70114 (table->strategy == sysctl_jiffies) ||
70115 (table->strategy == sysctl_ms_jiffies) ||
70116 (table->proc_handler == proc_dostring) ||
70117+ (table->proc_handler == proc_dostring_modpriv) ||
70118 (table->proc_handler == proc_dointvec) ||
70119 (table->proc_handler == proc_dointvec_minmax) ||
70120 (table->proc_handler == proc_dointvec_jiffies) ||
70121diff -urNp linux-2.6.32.46/kernel/taskstats.c linux-2.6.32.46/kernel/taskstats.c
70122--- linux-2.6.32.46/kernel/taskstats.c 2011-07-13 17:23:04.000000000 -0400
70123+++ linux-2.6.32.46/kernel/taskstats.c 2011-07-13 17:23:19.000000000 -0400
70124@@ -26,9 +26,12 @@
70125 #include <linux/cgroup.h>
70126 #include <linux/fs.h>
70127 #include <linux/file.h>
70128+#include <linux/grsecurity.h>
70129 #include <net/genetlink.h>
70130 #include <asm/atomic.h>
70131
70132+extern int gr_is_taskstats_denied(int pid);
70133+
70134 /*
70135 * Maximum length of a cpumask that can be specified in
70136 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
70137@@ -442,6 +445,9 @@ static int taskstats_user_cmd(struct sk_
70138 size_t size;
70139 cpumask_var_t mask;
70140
70141+ if (gr_is_taskstats_denied(current->pid))
70142+ return -EACCES;
70143+
70144 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
70145 return -ENOMEM;
70146
70147diff -urNp linux-2.6.32.46/kernel/time/tick-broadcast.c linux-2.6.32.46/kernel/time/tick-broadcast.c
70148--- linux-2.6.32.46/kernel/time/tick-broadcast.c 2011-05-23 16:56:59.000000000 -0400
70149+++ linux-2.6.32.46/kernel/time/tick-broadcast.c 2011-05-23 16:57:13.000000000 -0400
70150@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
70151 * then clear the broadcast bit.
70152 */
70153 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
70154- int cpu = smp_processor_id();
70155+ cpu = smp_processor_id();
70156
70157 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
70158 tick_broadcast_clear_oneshot(cpu);
70159diff -urNp linux-2.6.32.46/kernel/time/timekeeping.c linux-2.6.32.46/kernel/time/timekeeping.c
70160--- linux-2.6.32.46/kernel/time/timekeeping.c 2011-06-25 12:55:35.000000000 -0400
70161+++ linux-2.6.32.46/kernel/time/timekeeping.c 2011-06-25 12:56:37.000000000 -0400
70162@@ -14,6 +14,7 @@
70163 #include <linux/init.h>
70164 #include <linux/mm.h>
70165 #include <linux/sched.h>
70166+#include <linux/grsecurity.h>
70167 #include <linux/sysdev.h>
70168 #include <linux/clocksource.h>
70169 #include <linux/jiffies.h>
70170@@ -180,7 +181,7 @@ void update_xtime_cache(u64 nsec)
70171 */
70172 struct timespec ts = xtime;
70173 timespec_add_ns(&ts, nsec);
70174- ACCESS_ONCE(xtime_cache) = ts;
70175+ ACCESS_ONCE_RW(xtime_cache) = ts;
70176 }
70177
70178 /* must hold xtime_lock */
70179@@ -333,6 +334,8 @@ int do_settimeofday(struct timespec *tv)
70180 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
70181 return -EINVAL;
70182
70183+ gr_log_timechange();
70184+
70185 write_seqlock_irqsave(&xtime_lock, flags);
70186
70187 timekeeping_forward_now();
70188diff -urNp linux-2.6.32.46/kernel/time/timer_list.c linux-2.6.32.46/kernel/time/timer_list.c
70189--- linux-2.6.32.46/kernel/time/timer_list.c 2011-03-27 14:31:47.000000000 -0400
70190+++ linux-2.6.32.46/kernel/time/timer_list.c 2011-04-17 15:56:46.000000000 -0400
70191@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
70192
70193 static void print_name_offset(struct seq_file *m, void *sym)
70194 {
70195+#ifdef CONFIG_GRKERNSEC_HIDESYM
70196+ SEQ_printf(m, "<%p>", NULL);
70197+#else
70198 char symname[KSYM_NAME_LEN];
70199
70200 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
70201 SEQ_printf(m, "<%p>", sym);
70202 else
70203 SEQ_printf(m, "%s", symname);
70204+#endif
70205 }
70206
70207 static void
70208@@ -112,7 +116,11 @@ next_one:
70209 static void
70210 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
70211 {
70212+#ifdef CONFIG_GRKERNSEC_HIDESYM
70213+ SEQ_printf(m, " .base: %p\n", NULL);
70214+#else
70215 SEQ_printf(m, " .base: %p\n", base);
70216+#endif
70217 SEQ_printf(m, " .index: %d\n",
70218 base->index);
70219 SEQ_printf(m, " .resolution: %Lu nsecs\n",
70220@@ -289,7 +297,11 @@ static int __init init_timer_list_procfs
70221 {
70222 struct proc_dir_entry *pe;
70223
70224+#ifdef CONFIG_GRKERNSEC_PROC_ADD
70225+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
70226+#else
70227 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
70228+#endif
70229 if (!pe)
70230 return -ENOMEM;
70231 return 0;
70232diff -urNp linux-2.6.32.46/kernel/time/timer_stats.c linux-2.6.32.46/kernel/time/timer_stats.c
70233--- linux-2.6.32.46/kernel/time/timer_stats.c 2011-03-27 14:31:47.000000000 -0400
70234+++ linux-2.6.32.46/kernel/time/timer_stats.c 2011-05-04 17:56:28.000000000 -0400
70235@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
70236 static unsigned long nr_entries;
70237 static struct entry entries[MAX_ENTRIES];
70238
70239-static atomic_t overflow_count;
70240+static atomic_unchecked_t overflow_count;
70241
70242 /*
70243 * The entries are in a hash-table, for fast lookup:
70244@@ -140,7 +140,7 @@ static void reset_entries(void)
70245 nr_entries = 0;
70246 memset(entries, 0, sizeof(entries));
70247 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
70248- atomic_set(&overflow_count, 0);
70249+ atomic_set_unchecked(&overflow_count, 0);
70250 }
70251
70252 static struct entry *alloc_entry(void)
70253@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *time
70254 if (likely(entry))
70255 entry->count++;
70256 else
70257- atomic_inc(&overflow_count);
70258+ atomic_inc_unchecked(&overflow_count);
70259
70260 out_unlock:
70261 spin_unlock_irqrestore(lock, flags);
70262@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
70263
70264 static void print_name_offset(struct seq_file *m, unsigned long addr)
70265 {
70266+#ifdef CONFIG_GRKERNSEC_HIDESYM
70267+ seq_printf(m, "<%p>", NULL);
70268+#else
70269 char symname[KSYM_NAME_LEN];
70270
70271 if (lookup_symbol_name(addr, symname) < 0)
70272 seq_printf(m, "<%p>", (void *)addr);
70273 else
70274 seq_printf(m, "%s", symname);
70275+#endif
70276 }
70277
70278 static int tstats_show(struct seq_file *m, void *v)
70279@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *
70280
70281 seq_puts(m, "Timer Stats Version: v0.2\n");
70282 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
70283- if (atomic_read(&overflow_count))
70284+ if (atomic_read_unchecked(&overflow_count))
70285 seq_printf(m, "Overflow: %d entries\n",
70286- atomic_read(&overflow_count));
70287+ atomic_read_unchecked(&overflow_count));
70288
70289 for (i = 0; i < nr_entries; i++) {
70290 entry = entries + i;
70291@@ -415,7 +419,11 @@ static int __init init_tstats_procfs(voi
70292 {
70293 struct proc_dir_entry *pe;
70294
70295+#ifdef CONFIG_GRKERNSEC_PROC_ADD
70296+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
70297+#else
70298 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
70299+#endif
70300 if (!pe)
70301 return -ENOMEM;
70302 return 0;
70303diff -urNp linux-2.6.32.46/kernel/time.c linux-2.6.32.46/kernel/time.c
70304--- linux-2.6.32.46/kernel/time.c 2011-03-27 14:31:47.000000000 -0400
70305+++ linux-2.6.32.46/kernel/time.c 2011-04-17 15:56:46.000000000 -0400
70306@@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec
70307 return error;
70308
70309 if (tz) {
70310+ /* we log in do_settimeofday called below, so don't log twice
70311+ */
70312+ if (!tv)
70313+ gr_log_timechange();
70314+
70315 /* SMP safe, global irq locking makes it work. */
70316 sys_tz = *tz;
70317 update_vsyscall_tz();
70318@@ -240,7 +245,7 @@ EXPORT_SYMBOL(current_fs_time);
70319 * Avoid unnecessary multiplications/divisions in the
70320 * two most common HZ cases:
70321 */
70322-unsigned int inline jiffies_to_msecs(const unsigned long j)
70323+inline unsigned int jiffies_to_msecs(const unsigned long j)
70324 {
70325 #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
70326 return (MSEC_PER_SEC / HZ) * j;
70327@@ -256,7 +261,7 @@ unsigned int inline jiffies_to_msecs(con
70328 }
70329 EXPORT_SYMBOL(jiffies_to_msecs);
70330
70331-unsigned int inline jiffies_to_usecs(const unsigned long j)
70332+inline unsigned int jiffies_to_usecs(const unsigned long j)
70333 {
70334 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
70335 return (USEC_PER_SEC / HZ) * j;
70336diff -urNp linux-2.6.32.46/kernel/timer.c linux-2.6.32.46/kernel/timer.c
70337--- linux-2.6.32.46/kernel/timer.c 2011-03-27 14:31:47.000000000 -0400
70338+++ linux-2.6.32.46/kernel/timer.c 2011-04-17 15:56:46.000000000 -0400
70339@@ -1213,7 +1213,7 @@ void update_process_times(int user_tick)
70340 /*
70341 * This function runs timers and the timer-tq in bottom half context.
70342 */
70343-static void run_timer_softirq(struct softirq_action *h)
70344+static void run_timer_softirq(void)
70345 {
70346 struct tvec_base *base = __get_cpu_var(tvec_bases);
70347
70348diff -urNp linux-2.6.32.46/kernel/trace/blktrace.c linux-2.6.32.46/kernel/trace/blktrace.c
70349--- linux-2.6.32.46/kernel/trace/blktrace.c 2011-03-27 14:31:47.000000000 -0400
70350+++ linux-2.6.32.46/kernel/trace/blktrace.c 2011-05-04 17:56:28.000000000 -0400
70351@@ -313,7 +313,7 @@ static ssize_t blk_dropped_read(struct f
70352 struct blk_trace *bt = filp->private_data;
70353 char buf[16];
70354
70355- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
70356+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
70357
70358 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
70359 }
70360@@ -376,7 +376,7 @@ static int blk_subbuf_start_callback(str
70361 return 1;
70362
70363 bt = buf->chan->private_data;
70364- atomic_inc(&bt->dropped);
70365+ atomic_inc_unchecked(&bt->dropped);
70366 return 0;
70367 }
70368
70369@@ -477,7 +477,7 @@ int do_blk_trace_setup(struct request_qu
70370
70371 bt->dir = dir;
70372 bt->dev = dev;
70373- atomic_set(&bt->dropped, 0);
70374+ atomic_set_unchecked(&bt->dropped, 0);
70375
70376 ret = -EIO;
70377 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
70378diff -urNp linux-2.6.32.46/kernel/trace/ftrace.c linux-2.6.32.46/kernel/trace/ftrace.c
70379--- linux-2.6.32.46/kernel/trace/ftrace.c 2011-06-25 12:55:35.000000000 -0400
70380+++ linux-2.6.32.46/kernel/trace/ftrace.c 2011-06-25 12:56:37.000000000 -0400
70381@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod,
70382
70383 ip = rec->ip;
70384
70385+ ret = ftrace_arch_code_modify_prepare();
70386+ FTRACE_WARN_ON(ret);
70387+ if (ret)
70388+ return 0;
70389+
70390 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
70391+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
70392 if (ret) {
70393 ftrace_bug(ret, ip);
70394 rec->flags |= FTRACE_FL_FAILED;
70395- return 0;
70396 }
70397- return 1;
70398+ return ret ? 0 : 1;
70399 }
70400
70401 /*
70402diff -urNp linux-2.6.32.46/kernel/trace/ring_buffer.c linux-2.6.32.46/kernel/trace/ring_buffer.c
70403--- linux-2.6.32.46/kernel/trace/ring_buffer.c 2011-03-27 14:31:47.000000000 -0400
70404+++ linux-2.6.32.46/kernel/trace/ring_buffer.c 2011-04-17 15:56:46.000000000 -0400
70405@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
70406 * the reader page). But if the next page is a header page,
70407 * its flags will be non zero.
70408 */
70409-static int inline
70410+static inline int
70411 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
70412 struct buffer_page *page, struct list_head *list)
70413 {
70414diff -urNp linux-2.6.32.46/kernel/trace/trace.c linux-2.6.32.46/kernel/trace/trace.c
70415--- linux-2.6.32.46/kernel/trace/trace.c 2011-03-27 14:31:47.000000000 -0400
70416+++ linux-2.6.32.46/kernel/trace/trace.c 2011-05-16 21:46:57.000000000 -0400
70417@@ -3193,6 +3193,8 @@ static ssize_t tracing_splice_read_pipe(
70418 size_t rem;
70419 unsigned int i;
70420
70421+ pax_track_stack();
70422+
70423 /* copy the tracer to avoid using a global lock all around */
70424 mutex_lock(&trace_types_lock);
70425 if (unlikely(old_tracer != current_trace && current_trace)) {
70426@@ -3659,6 +3661,8 @@ tracing_buffers_splice_read(struct file
70427 int entries, size, i;
70428 size_t ret;
70429
70430+ pax_track_stack();
70431+
70432 if (*ppos & (PAGE_SIZE - 1)) {
70433 WARN_ONCE(1, "Ftrace: previous read must page-align\n");
70434 return -EINVAL;
70435@@ -3816,10 +3820,9 @@ static const struct file_operations trac
70436 };
70437 #endif
70438
70439-static struct dentry *d_tracer;
70440-
70441 struct dentry *tracing_init_dentry(void)
70442 {
70443+ static struct dentry *d_tracer;
70444 static int once;
70445
70446 if (d_tracer)
70447@@ -3839,10 +3842,9 @@ struct dentry *tracing_init_dentry(void)
70448 return d_tracer;
70449 }
70450
70451-static struct dentry *d_percpu;
70452-
70453 struct dentry *tracing_dentry_percpu(void)
70454 {
70455+ static struct dentry *d_percpu;
70456 static int once;
70457 struct dentry *d_tracer;
70458
70459diff -urNp linux-2.6.32.46/kernel/trace/trace_events.c linux-2.6.32.46/kernel/trace/trace_events.c
70460--- linux-2.6.32.46/kernel/trace/trace_events.c 2011-03-27 14:31:47.000000000 -0400
70461+++ linux-2.6.32.46/kernel/trace/trace_events.c 2011-08-05 20:33:55.000000000 -0400
70462@@ -951,13 +951,10 @@ static LIST_HEAD(ftrace_module_file_list
70463 * Modules must own their file_operations to keep up with
70464 * reference counting.
70465 */
70466+
70467 struct ftrace_module_file_ops {
70468 struct list_head list;
70469 struct module *mod;
70470- struct file_operations id;
70471- struct file_operations enable;
70472- struct file_operations format;
70473- struct file_operations filter;
70474 };
70475
70476 static void remove_subsystem_dir(const char *name)
70477@@ -1004,17 +1001,12 @@ trace_create_file_ops(struct module *mod
70478
70479 file_ops->mod = mod;
70480
70481- file_ops->id = ftrace_event_id_fops;
70482- file_ops->id.owner = mod;
70483-
70484- file_ops->enable = ftrace_enable_fops;
70485- file_ops->enable.owner = mod;
70486-
70487- file_ops->filter = ftrace_event_filter_fops;
70488- file_ops->filter.owner = mod;
70489-
70490- file_ops->format = ftrace_event_format_fops;
70491- file_ops->format.owner = mod;
70492+ pax_open_kernel();
70493+ *(void **)&mod->trace_id.owner = mod;
70494+ *(void **)&mod->trace_enable.owner = mod;
70495+ *(void **)&mod->trace_filter.owner = mod;
70496+ *(void **)&mod->trace_format.owner = mod;
70497+ pax_close_kernel();
70498
70499 list_add(&file_ops->list, &ftrace_module_file_list);
70500
70501@@ -1063,8 +1055,8 @@ static void trace_module_add_events(stru
70502 call->mod = mod;
70503 list_add(&call->list, &ftrace_events);
70504 event_create_dir(call, d_events,
70505- &file_ops->id, &file_ops->enable,
70506- &file_ops->filter, &file_ops->format);
70507+ &mod->trace_id, &mod->trace_enable,
70508+ &mod->trace_filter, &mod->trace_format);
70509 }
70510 }
70511
70512diff -urNp linux-2.6.32.46/kernel/trace/trace_mmiotrace.c linux-2.6.32.46/kernel/trace/trace_mmiotrace.c
70513--- linux-2.6.32.46/kernel/trace/trace_mmiotrace.c 2011-03-27 14:31:47.000000000 -0400
70514+++ linux-2.6.32.46/kernel/trace/trace_mmiotrace.c 2011-05-04 17:56:28.000000000 -0400
70515@@ -23,7 +23,7 @@ struct header_iter {
70516 static struct trace_array *mmio_trace_array;
70517 static bool overrun_detected;
70518 static unsigned long prev_overruns;
70519-static atomic_t dropped_count;
70520+static atomic_unchecked_t dropped_count;
70521
70522 static void mmio_reset_data(struct trace_array *tr)
70523 {
70524@@ -126,7 +126,7 @@ static void mmio_close(struct trace_iter
70525
70526 static unsigned long count_overruns(struct trace_iterator *iter)
70527 {
70528- unsigned long cnt = atomic_xchg(&dropped_count, 0);
70529+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
70530 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
70531
70532 if (over > prev_overruns)
70533@@ -316,7 +316,7 @@ static void __trace_mmiotrace_rw(struct
70534 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
70535 sizeof(*entry), 0, pc);
70536 if (!event) {
70537- atomic_inc(&dropped_count);
70538+ atomic_inc_unchecked(&dropped_count);
70539 return;
70540 }
70541 entry = ring_buffer_event_data(event);
70542@@ -346,7 +346,7 @@ static void __trace_mmiotrace_map(struct
70543 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
70544 sizeof(*entry), 0, pc);
70545 if (!event) {
70546- atomic_inc(&dropped_count);
70547+ atomic_inc_unchecked(&dropped_count);
70548 return;
70549 }
70550 entry = ring_buffer_event_data(event);
70551diff -urNp linux-2.6.32.46/kernel/trace/trace_output.c linux-2.6.32.46/kernel/trace/trace_output.c
70552--- linux-2.6.32.46/kernel/trace/trace_output.c 2011-03-27 14:31:47.000000000 -0400
70553+++ linux-2.6.32.46/kernel/trace/trace_output.c 2011-04-17 15:56:46.000000000 -0400
70554@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
70555 return 0;
70556 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
70557 if (!IS_ERR(p)) {
70558- p = mangle_path(s->buffer + s->len, p, "\n");
70559+ p = mangle_path(s->buffer + s->len, p, "\n\\");
70560 if (p) {
70561 s->len = p - s->buffer;
70562 return 1;
70563diff -urNp linux-2.6.32.46/kernel/trace/trace_stack.c linux-2.6.32.46/kernel/trace/trace_stack.c
70564--- linux-2.6.32.46/kernel/trace/trace_stack.c 2011-03-27 14:31:47.000000000 -0400
70565+++ linux-2.6.32.46/kernel/trace/trace_stack.c 2011-04-17 15:56:46.000000000 -0400
70566@@ -50,7 +50,7 @@ static inline void check_stack(void)
70567 return;
70568
70569 /* we do not handle interrupt stacks yet */
70570- if (!object_is_on_stack(&this_size))
70571+ if (!object_starts_on_stack(&this_size))
70572 return;
70573
70574 local_irq_save(flags);
70575diff -urNp linux-2.6.32.46/kernel/trace/trace_workqueue.c linux-2.6.32.46/kernel/trace/trace_workqueue.c
70576--- linux-2.6.32.46/kernel/trace/trace_workqueue.c 2011-03-27 14:31:47.000000000 -0400
70577+++ linux-2.6.32.46/kernel/trace/trace_workqueue.c 2011-04-17 15:56:46.000000000 -0400
70578@@ -21,7 +21,7 @@ struct cpu_workqueue_stats {
70579 int cpu;
70580 pid_t pid;
70581 /* Can be inserted from interrupt or user context, need to be atomic */
70582- atomic_t inserted;
70583+ atomic_unchecked_t inserted;
70584 /*
70585 * Don't need to be atomic, works are serialized in a single workqueue thread
70586 * on a single CPU.
70587@@ -58,7 +58,7 @@ probe_workqueue_insertion(struct task_st
70588 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
70589 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
70590 if (node->pid == wq_thread->pid) {
70591- atomic_inc(&node->inserted);
70592+ atomic_inc_unchecked(&node->inserted);
70593 goto found;
70594 }
70595 }
70596@@ -205,7 +205,7 @@ static int workqueue_stat_show(struct se
70597 tsk = get_pid_task(pid, PIDTYPE_PID);
70598 if (tsk) {
70599 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
70600- atomic_read(&cws->inserted), cws->executed,
70601+ atomic_read_unchecked(&cws->inserted), cws->executed,
70602 tsk->comm);
70603 put_task_struct(tsk);
70604 }
70605diff -urNp linux-2.6.32.46/kernel/user.c linux-2.6.32.46/kernel/user.c
70606--- linux-2.6.32.46/kernel/user.c 2011-03-27 14:31:47.000000000 -0400
70607+++ linux-2.6.32.46/kernel/user.c 2011-04-17 15:56:46.000000000 -0400
70608@@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use
70609 spin_lock_irq(&uidhash_lock);
70610 up = uid_hash_find(uid, hashent);
70611 if (up) {
70612+ put_user_ns(ns);
70613 key_put(new->uid_keyring);
70614 key_put(new->session_keyring);
70615 kmem_cache_free(uid_cachep, new);
70616diff -urNp linux-2.6.32.46/lib/bitmap.c linux-2.6.32.46/lib/bitmap.c
70617--- linux-2.6.32.46/lib/bitmap.c 2011-03-27 14:31:47.000000000 -0400
70618+++ linux-2.6.32.46/lib/bitmap.c 2011-10-06 09:37:14.000000000 -0400
70619@@ -341,7 +341,7 @@ int __bitmap_parse(const char *buf, unsi
70620 {
70621 int c, old_c, totaldigits, ndigits, nchunks, nbits;
70622 u32 chunk;
70623- const char __user *ubuf = buf;
70624+ const char __user *ubuf = (const char __force_user *)buf;
70625
70626 bitmap_zero(maskp, nmaskbits);
70627
70628@@ -426,7 +426,7 @@ int bitmap_parse_user(const char __user
70629 {
70630 if (!access_ok(VERIFY_READ, ubuf, ulen))
70631 return -EFAULT;
70632- return __bitmap_parse((const char *)ubuf, ulen, 1, maskp, nmaskbits);
70633+ return __bitmap_parse((const char __force_kernel *)ubuf, ulen, 1, maskp, nmaskbits);
70634 }
70635 EXPORT_SYMBOL(bitmap_parse_user);
70636
70637diff -urNp linux-2.6.32.46/lib/bug.c linux-2.6.32.46/lib/bug.c
70638--- linux-2.6.32.46/lib/bug.c 2011-03-27 14:31:47.000000000 -0400
70639+++ linux-2.6.32.46/lib/bug.c 2011-04-17 15:56:46.000000000 -0400
70640@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
70641 return BUG_TRAP_TYPE_NONE;
70642
70643 bug = find_bug(bugaddr);
70644+ if (!bug)
70645+ return BUG_TRAP_TYPE_NONE;
70646
70647 printk(KERN_EMERG "------------[ cut here ]------------\n");
70648
70649diff -urNp linux-2.6.32.46/lib/debugobjects.c linux-2.6.32.46/lib/debugobjects.c
70650--- linux-2.6.32.46/lib/debugobjects.c 2011-07-13 17:23:04.000000000 -0400
70651+++ linux-2.6.32.46/lib/debugobjects.c 2011-07-13 17:23:19.000000000 -0400
70652@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
70653 if (limit > 4)
70654 return;
70655
70656- is_on_stack = object_is_on_stack(addr);
70657+ is_on_stack = object_starts_on_stack(addr);
70658 if (is_on_stack == onstack)
70659 return;
70660
70661diff -urNp linux-2.6.32.46/lib/devres.c linux-2.6.32.46/lib/devres.c
70662--- linux-2.6.32.46/lib/devres.c 2011-03-27 14:31:47.000000000 -0400
70663+++ linux-2.6.32.46/lib/devres.c 2011-10-06 09:37:14.000000000 -0400
70664@@ -80,7 +80,7 @@ void devm_iounmap(struct device *dev, vo
70665 {
70666 iounmap(addr);
70667 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
70668- (void *)addr));
70669+ (void __force *)addr));
70670 }
70671 EXPORT_SYMBOL(devm_iounmap);
70672
70673@@ -140,7 +140,7 @@ void devm_ioport_unmap(struct device *de
70674 {
70675 ioport_unmap(addr);
70676 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
70677- devm_ioport_map_match, (void *)addr));
70678+ devm_ioport_map_match, (void __force *)addr));
70679 }
70680 EXPORT_SYMBOL(devm_ioport_unmap);
70681
70682diff -urNp linux-2.6.32.46/lib/dma-debug.c linux-2.6.32.46/lib/dma-debug.c
70683--- linux-2.6.32.46/lib/dma-debug.c 2011-03-27 14:31:47.000000000 -0400
70684+++ linux-2.6.32.46/lib/dma-debug.c 2011-04-17 15:56:46.000000000 -0400
70685@@ -861,7 +861,7 @@ out:
70686
70687 static void check_for_stack(struct device *dev, void *addr)
70688 {
70689- if (object_is_on_stack(addr))
70690+ if (object_starts_on_stack(addr))
70691 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
70692 "stack [addr=%p]\n", addr);
70693 }
70694diff -urNp linux-2.6.32.46/lib/idr.c linux-2.6.32.46/lib/idr.c
70695--- linux-2.6.32.46/lib/idr.c 2011-03-27 14:31:47.000000000 -0400
70696+++ linux-2.6.32.46/lib/idr.c 2011-04-17 15:56:46.000000000 -0400
70697@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
70698 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
70699
70700 /* if already at the top layer, we need to grow */
70701- if (id >= 1 << (idp->layers * IDR_BITS)) {
70702+ if (id >= (1 << (idp->layers * IDR_BITS))) {
70703 *starting_id = id;
70704 return IDR_NEED_TO_GROW;
70705 }
70706diff -urNp linux-2.6.32.46/lib/inflate.c linux-2.6.32.46/lib/inflate.c
70707--- linux-2.6.32.46/lib/inflate.c 2011-03-27 14:31:47.000000000 -0400
70708+++ linux-2.6.32.46/lib/inflate.c 2011-04-17 15:56:46.000000000 -0400
70709@@ -266,7 +266,7 @@ static void free(void *where)
70710 malloc_ptr = free_mem_ptr;
70711 }
70712 #else
70713-#define malloc(a) kmalloc(a, GFP_KERNEL)
70714+#define malloc(a) kmalloc((a), GFP_KERNEL)
70715 #define free(a) kfree(a)
70716 #endif
70717
70718diff -urNp linux-2.6.32.46/lib/Kconfig.debug linux-2.6.32.46/lib/Kconfig.debug
70719--- linux-2.6.32.46/lib/Kconfig.debug 2011-03-27 14:31:47.000000000 -0400
70720+++ linux-2.6.32.46/lib/Kconfig.debug 2011-04-17 15:56:46.000000000 -0400
70721@@ -905,7 +905,7 @@ config LATENCYTOP
70722 select STACKTRACE
70723 select SCHEDSTATS
70724 select SCHED_DEBUG
70725- depends on HAVE_LATENCYTOP_SUPPORT
70726+ depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
70727 help
70728 Enable this option if you want to use the LatencyTOP tool
70729 to find out which userspace is blocking on what kernel operations.
70730diff -urNp linux-2.6.32.46/lib/kobject.c linux-2.6.32.46/lib/kobject.c
70731--- linux-2.6.32.46/lib/kobject.c 2011-03-27 14:31:47.000000000 -0400
70732+++ linux-2.6.32.46/lib/kobject.c 2011-04-17 15:56:46.000000000 -0400
70733@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
70734 return ret;
70735 }
70736
70737-struct sysfs_ops kobj_sysfs_ops = {
70738+const struct sysfs_ops kobj_sysfs_ops = {
70739 .show = kobj_attr_show,
70740 .store = kobj_attr_store,
70741 };
70742@@ -789,7 +789,7 @@ static struct kobj_type kset_ktype = {
70743 * If the kset was not able to be created, NULL will be returned.
70744 */
70745 static struct kset *kset_create(const char *name,
70746- struct kset_uevent_ops *uevent_ops,
70747+ const struct kset_uevent_ops *uevent_ops,
70748 struct kobject *parent_kobj)
70749 {
70750 struct kset *kset;
70751@@ -832,7 +832,7 @@ static struct kset *kset_create(const ch
70752 * If the kset was not able to be created, NULL will be returned.
70753 */
70754 struct kset *kset_create_and_add(const char *name,
70755- struct kset_uevent_ops *uevent_ops,
70756+ const struct kset_uevent_ops *uevent_ops,
70757 struct kobject *parent_kobj)
70758 {
70759 struct kset *kset;
70760diff -urNp linux-2.6.32.46/lib/kobject_uevent.c linux-2.6.32.46/lib/kobject_uevent.c
70761--- linux-2.6.32.46/lib/kobject_uevent.c 2011-03-27 14:31:47.000000000 -0400
70762+++ linux-2.6.32.46/lib/kobject_uevent.c 2011-04-17 15:56:46.000000000 -0400
70763@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
70764 const char *subsystem;
70765 struct kobject *top_kobj;
70766 struct kset *kset;
70767- struct kset_uevent_ops *uevent_ops;
70768+ const struct kset_uevent_ops *uevent_ops;
70769 u64 seq;
70770 int i = 0;
70771 int retval = 0;
70772diff -urNp linux-2.6.32.46/lib/kref.c linux-2.6.32.46/lib/kref.c
70773--- linux-2.6.32.46/lib/kref.c 2011-03-27 14:31:47.000000000 -0400
70774+++ linux-2.6.32.46/lib/kref.c 2011-04-17 15:56:46.000000000 -0400
70775@@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
70776 */
70777 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
70778 {
70779- WARN_ON(release == NULL);
70780+ BUG_ON(release == NULL);
70781 WARN_ON(release == (void (*)(struct kref *))kfree);
70782
70783 if (atomic_dec_and_test(&kref->refcount)) {
70784diff -urNp linux-2.6.32.46/lib/parser.c linux-2.6.32.46/lib/parser.c
70785--- linux-2.6.32.46/lib/parser.c 2011-03-27 14:31:47.000000000 -0400
70786+++ linux-2.6.32.46/lib/parser.c 2011-04-17 15:56:46.000000000 -0400
70787@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
70788 char *buf;
70789 int ret;
70790
70791- buf = kmalloc(s->to - s->from + 1, GFP_KERNEL);
70792+ buf = kmalloc((s->to - s->from) + 1, GFP_KERNEL);
70793 if (!buf)
70794 return -ENOMEM;
70795 memcpy(buf, s->from, s->to - s->from);
70796diff -urNp linux-2.6.32.46/lib/radix-tree.c linux-2.6.32.46/lib/radix-tree.c
70797--- linux-2.6.32.46/lib/radix-tree.c 2011-03-27 14:31:47.000000000 -0400
70798+++ linux-2.6.32.46/lib/radix-tree.c 2011-04-17 15:56:46.000000000 -0400
70799@@ -81,7 +81,7 @@ struct radix_tree_preload {
70800 int nr;
70801 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
70802 };
70803-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
70804+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
70805
70806 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
70807 {
70808diff -urNp linux-2.6.32.46/lib/random32.c linux-2.6.32.46/lib/random32.c
70809--- linux-2.6.32.46/lib/random32.c 2011-03-27 14:31:47.000000000 -0400
70810+++ linux-2.6.32.46/lib/random32.c 2011-04-17 15:56:46.000000000 -0400
70811@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
70812 */
70813 static inline u32 __seed(u32 x, u32 m)
70814 {
70815- return (x < m) ? x + m : x;
70816+ return (x <= m) ? x + m + 1 : x;
70817 }
70818
70819 /**
70820diff -urNp linux-2.6.32.46/lib/vsprintf.c linux-2.6.32.46/lib/vsprintf.c
70821--- linux-2.6.32.46/lib/vsprintf.c 2011-03-27 14:31:47.000000000 -0400
70822+++ linux-2.6.32.46/lib/vsprintf.c 2011-04-17 15:56:46.000000000 -0400
70823@@ -16,6 +16,9 @@
70824 * - scnprintf and vscnprintf
70825 */
70826
70827+#ifdef CONFIG_GRKERNSEC_HIDESYM
70828+#define __INCLUDED_BY_HIDESYM 1
70829+#endif
70830 #include <stdarg.h>
70831 #include <linux/module.h>
70832 #include <linux/types.h>
70833@@ -546,12 +549,12 @@ static char *number(char *buf, char *end
70834 return buf;
70835 }
70836
70837-static char *string(char *buf, char *end, char *s, struct printf_spec spec)
70838+static char *string(char *buf, char *end, const char *s, struct printf_spec spec)
70839 {
70840 int len, i;
70841
70842 if ((unsigned long)s < PAGE_SIZE)
70843- s = "<NULL>";
70844+ s = "(null)";
70845
70846 len = strnlen(s, spec.precision);
70847
70848@@ -581,7 +584,7 @@ static char *symbol_string(char *buf, ch
70849 unsigned long value = (unsigned long) ptr;
70850 #ifdef CONFIG_KALLSYMS
70851 char sym[KSYM_SYMBOL_LEN];
70852- if (ext != 'f' && ext != 's')
70853+ if (ext != 'f' && ext != 's' && ext != 'a')
70854 sprint_symbol(sym, value);
70855 else
70856 kallsyms_lookup(value, NULL, NULL, NULL, sym);
70857@@ -801,6 +804,8 @@ static char *ip4_addr_string(char *buf,
70858 * - 'f' For simple symbolic function names without offset
70859 * - 'S' For symbolic direct pointers with offset
70860 * - 's' For symbolic direct pointers without offset
70861+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
70862+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
70863 * - 'R' For a struct resource pointer, it prints the range of
70864 * addresses (not the name nor the flags)
70865 * - 'M' For a 6-byte MAC address, it prints the address in the
70866@@ -822,7 +827,7 @@ static char *pointer(const char *fmt, ch
70867 struct printf_spec spec)
70868 {
70869 if (!ptr)
70870- return string(buf, end, "(null)", spec);
70871+ return string(buf, end, "(nil)", spec);
70872
70873 switch (*fmt) {
70874 case 'F':
70875@@ -831,6 +836,14 @@ static char *pointer(const char *fmt, ch
70876 case 's':
70877 /* Fallthrough */
70878 case 'S':
70879+#ifdef CONFIG_GRKERNSEC_HIDESYM
70880+ break;
70881+#else
70882+ return symbol_string(buf, end, ptr, spec, *fmt);
70883+#endif
70884+ case 'a':
70885+ /* Fallthrough */
70886+ case 'A':
70887 return symbol_string(buf, end, ptr, spec, *fmt);
70888 case 'R':
70889 return resource_string(buf, end, ptr, spec);
70890@@ -1445,7 +1458,7 @@ do { \
70891 size_t len;
70892 if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
70893 || (unsigned long)save_str < PAGE_SIZE)
70894- save_str = "<NULL>";
70895+ save_str = "(null)";
70896 len = strlen(save_str);
70897 if (str + len + 1 < end)
70898 memcpy(str, save_str, len + 1);
70899@@ -1555,11 +1568,11 @@ int bstr_printf(char *buf, size_t size,
70900 typeof(type) value; \
70901 if (sizeof(type) == 8) { \
70902 args = PTR_ALIGN(args, sizeof(u32)); \
70903- *(u32 *)&value = *(u32 *)args; \
70904- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
70905+ *(u32 *)&value = *(const u32 *)args; \
70906+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
70907 } else { \
70908 args = PTR_ALIGN(args, sizeof(type)); \
70909- value = *(typeof(type) *)args; \
70910+ value = *(const typeof(type) *)args; \
70911 } \
70912 args += sizeof(type); \
70913 value; \
70914@@ -1622,7 +1635,7 @@ int bstr_printf(char *buf, size_t size,
70915 const char *str_arg = args;
70916 size_t len = strlen(str_arg);
70917 args += len + 1;
70918- str = string(str, end, (char *)str_arg, spec);
70919+ str = string(str, end, str_arg, spec);
70920 break;
70921 }
70922
70923diff -urNp linux-2.6.32.46/localversion-grsec linux-2.6.32.46/localversion-grsec
70924--- linux-2.6.32.46/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
70925+++ linux-2.6.32.46/localversion-grsec 2011-04-17 15:56:46.000000000 -0400
70926@@ -0,0 +1 @@
70927+-grsec
70928diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.46/Makefile
70929--- linux-2.6.32.46/Makefile 2011-08-29 22:24:44.000000000 -0400
70930+++ linux-2.6.32.46/Makefile 2011-10-08 08:14:40.000000000 -0400
70931@@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
70932
70933 HOSTCC = gcc
70934 HOSTCXX = g++
70935-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
70936-HOSTCXXFLAGS = -O2
70937+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
70938+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
70939+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
70940
70941 # Decide whether to build built-in, modular, or both.
70942 # Normally, just do built-in.
70943@@ -342,10 +343,12 @@ LINUXINCLUDE := -Iinclude \
70944 KBUILD_CPPFLAGS := -D__KERNEL__
70945
70946 KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
70947+ -W -Wno-unused-parameter -Wno-missing-field-initializers \
70948 -fno-strict-aliasing -fno-common \
70949 -Werror-implicit-function-declaration \
70950 -Wno-format-security \
70951 -fno-delete-null-pointer-checks
70952+KBUILD_CFLAGS += $(call cc-option, -Wno-empty-body)
70953 KBUILD_AFLAGS := -D__ASSEMBLY__
70954
70955 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
70956@@ -376,8 +379,8 @@ export RCS_TAR_IGNORE := --exclude SCCS
70957 # Rules shared between *config targets and build targets
70958
70959 # Basic helpers built in scripts/
70960-PHONY += scripts_basic
70961-scripts_basic:
70962+PHONY += scripts_basic gcc-plugins
70963+scripts_basic: gcc-plugins
70964 $(Q)$(MAKE) $(build)=scripts/basic
70965
70966 # To avoid any implicit rule to kick in, define an empty command.
70967@@ -403,7 +406,7 @@ endif
70968 # of make so .config is not included in this case either (for *config).
70969
70970 no-dot-config-targets := clean mrproper distclean \
70971- cscope TAGS tags help %docs check% \
70972+ cscope gtags TAGS tags help %docs check% \
70973 include/linux/version.h headers_% \
70974 kernelrelease kernelversion
70975
70976@@ -526,6 +529,36 @@ else
70977 KBUILD_CFLAGS += -O2
70978 endif
70979
70980+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
70981+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
70982+ifdef CONFIG_PAX_MEMORY_STACKLEAK
70983+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
70984+endif
70985+ifdef CONFIG_KALLOCSTAT_PLUGIN
70986+KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
70987+endif
70988+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
70989+KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
70990+endif
70991+ifdef CONFIG_CHECKER_PLUGIN
70992+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
70993+CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
70994+endif
70995+endif
70996+GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
70997+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN
70998+gcc-plugins:
70999+ $(Q)$(MAKE) $(build)=tools/gcc
71000+else
71001+gcc-plugins:
71002+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
71003+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev.))
71004+else
71005+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
71006+endif
71007+ $(Q)echo "PAX_MEMORY_STACKLEAK and constification will be less secure"
71008+endif
71009+
71010 include $(srctree)/arch/$(SRCARCH)/Makefile
71011
71012 ifneq ($(CONFIG_FRAME_WARN),0)
71013@@ -644,7 +677,7 @@ export mod_strip_cmd
71014
71015
71016 ifeq ($(KBUILD_EXTMOD),)
71017-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
71018+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
71019
71020 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
71021 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
71022@@ -865,6 +898,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
71023
71024 # The actual objects are generated when descending,
71025 # make sure no implicit rule kicks in
71026+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
71027 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
71028
71029 # Handle descending into subdirectories listed in $(vmlinux-dirs)
71030@@ -874,7 +908,7 @@ $(sort $(vmlinux-init) $(vmlinux-main))
71031 # Error messages still appears in the original language
71032
71033 PHONY += $(vmlinux-dirs)
71034-$(vmlinux-dirs): prepare scripts
71035+$(vmlinux-dirs): gcc-plugins prepare scripts
71036 $(Q)$(MAKE) $(build)=$@
71037
71038 # Build the kernel release string
71039@@ -983,6 +1017,7 @@ prepare0: archprepare FORCE
71040 $(Q)$(MAKE) $(build)=. missing-syscalls
71041
71042 # All the preparing..
71043+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
71044 prepare: prepare0
71045
71046 # The asm symlink changes when $(ARCH) changes.
71047@@ -1124,6 +1159,7 @@ all: modules
71048 # using awk while concatenating to the final file.
71049
71050 PHONY += modules
71051+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
71052 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
71053 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
71054 @$(kecho) ' Building modules, stage 2.';
71055@@ -1133,7 +1169,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_B
71056
71057 # Target to prepare building external modules
71058 PHONY += modules_prepare
71059-modules_prepare: prepare scripts
71060+modules_prepare: gcc-plugins prepare scripts
71061
71062 # Target to install modules
71063 PHONY += modules_install
71064@@ -1198,7 +1234,7 @@ MRPROPER_FILES += .config .config.old in
71065 include/linux/autoconf.h include/linux/version.h \
71066 include/linux/utsrelease.h \
71067 include/linux/bounds.h include/asm*/asm-offsets.h \
71068- Module.symvers Module.markers tags TAGS cscope*
71069+ Module.symvers Module.markers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
71070
71071 # clean - Delete most, but leave enough to build external modules
71072 #
71073@@ -1242,7 +1278,7 @@ distclean: mrproper
71074 @find $(srctree) $(RCS_FIND_IGNORE) \
71075 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
71076 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
71077- -o -name '.*.rej' -o -size 0 \
71078+ -o -name '.*.rej' -o -name '*.so' -o -size 0 \
71079 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
71080 -type f -print | xargs rm -f
71081
71082@@ -1289,6 +1325,7 @@ help:
71083 @echo ' modules_prepare - Set up for building external modules'
71084 @echo ' tags/TAGS - Generate tags file for editors'
71085 @echo ' cscope - Generate cscope index'
71086+ @echo ' gtags - Generate GNU GLOBAL index'
71087 @echo ' kernelrelease - Output the release version string'
71088 @echo ' kernelversion - Output the version stored in Makefile'
71089 @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
71090@@ -1390,6 +1427,7 @@ PHONY += $(module-dirs) modules
71091 $(module-dirs): crmodverdir $(objtree)/Module.symvers
71092 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
71093
71094+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
71095 modules: $(module-dirs)
71096 @$(kecho) ' Building modules, stage 2.';
71097 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
71098@@ -1445,7 +1483,7 @@ endif # KBUILD_EXTMOD
71099 quiet_cmd_tags = GEN $@
71100 cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
71101
71102-tags TAGS cscope: FORCE
71103+tags TAGS cscope gtags: FORCE
71104 $(call cmd,tags)
71105
71106 # Scripts to check various things for consistency
71107@@ -1510,17 +1548,19 @@ else
71108 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
71109 endif
71110
71111-%.s: %.c prepare scripts FORCE
71112+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
71113+%.s: %.c gcc-plugins prepare scripts FORCE
71114 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
71115 %.i: %.c prepare scripts FORCE
71116 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
71117-%.o: %.c prepare scripts FORCE
71118+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
71119+%.o: %.c gcc-plugins prepare scripts FORCE
71120 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
71121 %.lst: %.c prepare scripts FORCE
71122 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
71123-%.s: %.S prepare scripts FORCE
71124+%.s: %.S gcc-plugins prepare scripts FORCE
71125 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
71126-%.o: %.S prepare scripts FORCE
71127+%.o: %.S gcc-plugins prepare scripts FORCE
71128 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
71129 %.symtypes: %.c prepare scripts FORCE
71130 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
71131@@ -1530,11 +1570,13 @@ endif
71132 $(cmd_crmodverdir)
71133 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
71134 $(build)=$(build-dir)
71135-%/: prepare scripts FORCE
71136+%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
71137+%/: gcc-plugins prepare scripts FORCE
71138 $(cmd_crmodverdir)
71139 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
71140 $(build)=$(build-dir)
71141-%.ko: prepare scripts FORCE
71142+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
71143+%.ko: gcc-plugins prepare scripts FORCE
71144 $(cmd_crmodverdir)
71145 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
71146 $(build)=$(build-dir) $(@:.ko=.o)
71147diff -urNp linux-2.6.32.46/mm/backing-dev.c linux-2.6.32.46/mm/backing-dev.c
71148--- linux-2.6.32.46/mm/backing-dev.c 2011-03-27 14:31:47.000000000 -0400
71149+++ linux-2.6.32.46/mm/backing-dev.c 2011-08-11 19:48:17.000000000 -0400
71150@@ -272,7 +272,7 @@ static void bdi_task_init(struct backing
71151 list_add_tail_rcu(&wb->list, &bdi->wb_list);
71152 spin_unlock(&bdi->wb_lock);
71153
71154- tsk->flags |= PF_FLUSHER | PF_SWAPWRITE;
71155+ tsk->flags |= PF_SWAPWRITE;
71156 set_freezable();
71157
71158 /*
71159@@ -484,7 +484,7 @@ static void bdi_add_to_pending(struct rc
71160 * Add the default flusher task that gets created for any bdi
71161 * that has dirty data pending writeout
71162 */
71163-void static bdi_add_default_flusher_task(struct backing_dev_info *bdi)
71164+static void bdi_add_default_flusher_task(struct backing_dev_info *bdi)
71165 {
71166 if (!bdi_cap_writeback_dirty(bdi))
71167 return;
71168diff -urNp linux-2.6.32.46/mm/filemap.c linux-2.6.32.46/mm/filemap.c
71169--- linux-2.6.32.46/mm/filemap.c 2011-03-27 14:31:47.000000000 -0400
71170+++ linux-2.6.32.46/mm/filemap.c 2011-04-17 15:56:46.000000000 -0400
71171@@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file
71172 struct address_space *mapping = file->f_mapping;
71173
71174 if (!mapping->a_ops->readpage)
71175- return -ENOEXEC;
71176+ return -ENODEV;
71177 file_accessed(file);
71178 vma->vm_ops = &generic_file_vm_ops;
71179 vma->vm_flags |= VM_CAN_NONLINEAR;
71180@@ -2027,6 +2027,7 @@ inline int generic_write_checks(struct f
71181 *pos = i_size_read(inode);
71182
71183 if (limit != RLIM_INFINITY) {
71184+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
71185 if (*pos >= limit) {
71186 send_sig(SIGXFSZ, current, 0);
71187 return -EFBIG;
71188diff -urNp linux-2.6.32.46/mm/fremap.c linux-2.6.32.46/mm/fremap.c
71189--- linux-2.6.32.46/mm/fremap.c 2011-03-27 14:31:47.000000000 -0400
71190+++ linux-2.6.32.46/mm/fremap.c 2011-04-17 15:56:46.000000000 -0400
71191@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
71192 retry:
71193 vma = find_vma(mm, start);
71194
71195+#ifdef CONFIG_PAX_SEGMEXEC
71196+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
71197+ goto out;
71198+#endif
71199+
71200 /*
71201 * Make sure the vma is shared, that it supports prefaulting,
71202 * and that the remapped range is valid and fully within
71203@@ -221,7 +226,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
71204 /*
71205 * drop PG_Mlocked flag for over-mapped range
71206 */
71207- unsigned int saved_flags = vma->vm_flags;
71208+ unsigned long saved_flags = vma->vm_flags;
71209 munlock_vma_pages_range(vma, start, start + size);
71210 vma->vm_flags = saved_flags;
71211 }
71212diff -urNp linux-2.6.32.46/mm/highmem.c linux-2.6.32.46/mm/highmem.c
71213--- linux-2.6.32.46/mm/highmem.c 2011-03-27 14:31:47.000000000 -0400
71214+++ linux-2.6.32.46/mm/highmem.c 2011-04-17 15:56:46.000000000 -0400
71215@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
71216 * So no dangers, even with speculative execution.
71217 */
71218 page = pte_page(pkmap_page_table[i]);
71219+ pax_open_kernel();
71220 pte_clear(&init_mm, (unsigned long)page_address(page),
71221 &pkmap_page_table[i]);
71222-
71223+ pax_close_kernel();
71224 set_page_address(page, NULL);
71225 need_flush = 1;
71226 }
71227@@ -177,9 +178,11 @@ start:
71228 }
71229 }
71230 vaddr = PKMAP_ADDR(last_pkmap_nr);
71231+
71232+ pax_open_kernel();
71233 set_pte_at(&init_mm, vaddr,
71234 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
71235-
71236+ pax_close_kernel();
71237 pkmap_count[last_pkmap_nr] = 1;
71238 set_page_address(page, (void *)vaddr);
71239
71240diff -urNp linux-2.6.32.46/mm/hugetlb.c linux-2.6.32.46/mm/hugetlb.c
71241--- linux-2.6.32.46/mm/hugetlb.c 2011-07-13 17:23:04.000000000 -0400
71242+++ linux-2.6.32.46/mm/hugetlb.c 2011-07-13 17:23:19.000000000 -0400
71243@@ -1933,6 +1933,26 @@ static int unmap_ref_private(struct mm_s
71244 return 1;
71245 }
71246
71247+#ifdef CONFIG_PAX_SEGMEXEC
71248+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
71249+{
71250+ struct mm_struct *mm = vma->vm_mm;
71251+ struct vm_area_struct *vma_m;
71252+ unsigned long address_m;
71253+ pte_t *ptep_m;
71254+
71255+ vma_m = pax_find_mirror_vma(vma);
71256+ if (!vma_m)
71257+ return;
71258+
71259+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71260+ address_m = address + SEGMEXEC_TASK_SIZE;
71261+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
71262+ get_page(page_m);
71263+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
71264+}
71265+#endif
71266+
71267 static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
71268 unsigned long address, pte_t *ptep, pte_t pte,
71269 struct page *pagecache_page)
71270@@ -2004,6 +2024,11 @@ retry_avoidcopy:
71271 huge_ptep_clear_flush(vma, address, ptep);
71272 set_huge_pte_at(mm, address, ptep,
71273 make_huge_pte(vma, new_page, 1));
71274+
71275+#ifdef CONFIG_PAX_SEGMEXEC
71276+ pax_mirror_huge_pte(vma, address, new_page);
71277+#endif
71278+
71279 /* Make the old page be freed below */
71280 new_page = old_page;
71281 }
71282@@ -2135,6 +2160,10 @@ retry:
71283 && (vma->vm_flags & VM_SHARED)));
71284 set_huge_pte_at(mm, address, ptep, new_pte);
71285
71286+#ifdef CONFIG_PAX_SEGMEXEC
71287+ pax_mirror_huge_pte(vma, address, page);
71288+#endif
71289+
71290 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
71291 /* Optimization, do the COW without a second fault */
71292 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
71293@@ -2163,6 +2192,28 @@ int hugetlb_fault(struct mm_struct *mm,
71294 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
71295 struct hstate *h = hstate_vma(vma);
71296
71297+#ifdef CONFIG_PAX_SEGMEXEC
71298+ struct vm_area_struct *vma_m;
71299+
71300+ vma_m = pax_find_mirror_vma(vma);
71301+ if (vma_m) {
71302+ unsigned long address_m;
71303+
71304+ if (vma->vm_start > vma_m->vm_start) {
71305+ address_m = address;
71306+ address -= SEGMEXEC_TASK_SIZE;
71307+ vma = vma_m;
71308+ h = hstate_vma(vma);
71309+ } else
71310+ address_m = address + SEGMEXEC_TASK_SIZE;
71311+
71312+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
71313+ return VM_FAULT_OOM;
71314+ address_m &= HPAGE_MASK;
71315+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
71316+ }
71317+#endif
71318+
71319 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
71320 if (!ptep)
71321 return VM_FAULT_OOM;
71322diff -urNp linux-2.6.32.46/mm/internal.h linux-2.6.32.46/mm/internal.h
71323--- linux-2.6.32.46/mm/internal.h 2011-03-27 14:31:47.000000000 -0400
71324+++ linux-2.6.32.46/mm/internal.h 2011-07-09 09:13:08.000000000 -0400
71325@@ -49,6 +49,7 @@ extern void putback_lru_page(struct page
71326 * in mm/page_alloc.c
71327 */
71328 extern void __free_pages_bootmem(struct page *page, unsigned int order);
71329+extern void free_compound_page(struct page *page);
71330 extern void prep_compound_page(struct page *page, unsigned long order);
71331
71332
71333diff -urNp linux-2.6.32.46/mm/Kconfig linux-2.6.32.46/mm/Kconfig
71334--- linux-2.6.32.46/mm/Kconfig 2011-03-27 14:31:47.000000000 -0400
71335+++ linux-2.6.32.46/mm/Kconfig 2011-04-17 15:56:46.000000000 -0400
71336@@ -228,7 +228,7 @@ config KSM
71337 config DEFAULT_MMAP_MIN_ADDR
71338 int "Low address space to protect from user allocation"
71339 depends on MMU
71340- default 4096
71341+ default 65536
71342 help
71343 This is the portion of low virtual memory which should be protected
71344 from userspace allocation. Keeping a user from writing to low pages
71345diff -urNp linux-2.6.32.46/mm/kmemleak.c linux-2.6.32.46/mm/kmemleak.c
71346--- linux-2.6.32.46/mm/kmemleak.c 2011-06-25 12:55:35.000000000 -0400
71347+++ linux-2.6.32.46/mm/kmemleak.c 2011-06-25 12:56:37.000000000 -0400
71348@@ -358,7 +358,7 @@ static void print_unreferenced(struct se
71349
71350 for (i = 0; i < object->trace_len; i++) {
71351 void *ptr = (void *)object->trace[i];
71352- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
71353+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
71354 }
71355 }
71356
71357diff -urNp linux-2.6.32.46/mm/maccess.c linux-2.6.32.46/mm/maccess.c
71358--- linux-2.6.32.46/mm/maccess.c 2011-03-27 14:31:47.000000000 -0400
71359+++ linux-2.6.32.46/mm/maccess.c 2011-10-06 09:37:14.000000000 -0400
71360@@ -14,7 +14,7 @@
71361 * Safely read from address @src to the buffer at @dst. If a kernel fault
71362 * happens, handle that and return -EFAULT.
71363 */
71364-long probe_kernel_read(void *dst, void *src, size_t size)
71365+long probe_kernel_read(void *dst, const void *src, size_t size)
71366 {
71367 long ret;
71368 mm_segment_t old_fs = get_fs();
71369@@ -22,7 +22,7 @@ long probe_kernel_read(void *dst, void *
71370 set_fs(KERNEL_DS);
71371 pagefault_disable();
71372 ret = __copy_from_user_inatomic(dst,
71373- (__force const void __user *)src, size);
71374+ (const void __force_user *)src, size);
71375 pagefault_enable();
71376 set_fs(old_fs);
71377
71378@@ -39,14 +39,14 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);
71379 * Safely write to address @dst from the buffer at @src. If a kernel fault
71380 * happens, handle that and return -EFAULT.
71381 */
71382-long notrace __weak probe_kernel_write(void *dst, void *src, size_t size)
71383+long notrace __weak probe_kernel_write(void *dst, const void *src, size_t size)
71384 {
71385 long ret;
71386 mm_segment_t old_fs = get_fs();
71387
71388 set_fs(KERNEL_DS);
71389 pagefault_disable();
71390- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
71391+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
71392 pagefault_enable();
71393 set_fs(old_fs);
71394
71395diff -urNp linux-2.6.32.46/mm/madvise.c linux-2.6.32.46/mm/madvise.c
71396--- linux-2.6.32.46/mm/madvise.c 2011-03-27 14:31:47.000000000 -0400
71397+++ linux-2.6.32.46/mm/madvise.c 2011-04-17 15:56:46.000000000 -0400
71398@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
71399 pgoff_t pgoff;
71400 unsigned long new_flags = vma->vm_flags;
71401
71402+#ifdef CONFIG_PAX_SEGMEXEC
71403+ struct vm_area_struct *vma_m;
71404+#endif
71405+
71406 switch (behavior) {
71407 case MADV_NORMAL:
71408 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
71409@@ -103,6 +107,13 @@ success:
71410 /*
71411 * vm_flags is protected by the mmap_sem held in write mode.
71412 */
71413+
71414+#ifdef CONFIG_PAX_SEGMEXEC
71415+ vma_m = pax_find_mirror_vma(vma);
71416+ if (vma_m)
71417+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
71418+#endif
71419+
71420 vma->vm_flags = new_flags;
71421
71422 out:
71423@@ -161,6 +172,11 @@ static long madvise_dontneed(struct vm_a
71424 struct vm_area_struct ** prev,
71425 unsigned long start, unsigned long end)
71426 {
71427+
71428+#ifdef CONFIG_PAX_SEGMEXEC
71429+ struct vm_area_struct *vma_m;
71430+#endif
71431+
71432 *prev = vma;
71433 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
71434 return -EINVAL;
71435@@ -173,6 +189,21 @@ static long madvise_dontneed(struct vm_a
71436 zap_page_range(vma, start, end - start, &details);
71437 } else
71438 zap_page_range(vma, start, end - start, NULL);
71439+
71440+#ifdef CONFIG_PAX_SEGMEXEC
71441+ vma_m = pax_find_mirror_vma(vma);
71442+ if (vma_m) {
71443+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
71444+ struct zap_details details = {
71445+ .nonlinear_vma = vma_m,
71446+ .last_index = ULONG_MAX,
71447+ };
71448+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
71449+ } else
71450+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
71451+ }
71452+#endif
71453+
71454 return 0;
71455 }
71456
71457@@ -359,6 +390,16 @@ SYSCALL_DEFINE3(madvise, unsigned long,
71458 if (end < start)
71459 goto out;
71460
71461+#ifdef CONFIG_PAX_SEGMEXEC
71462+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
71463+ if (end > SEGMEXEC_TASK_SIZE)
71464+ goto out;
71465+ } else
71466+#endif
71467+
71468+ if (end > TASK_SIZE)
71469+ goto out;
71470+
71471 error = 0;
71472 if (end == start)
71473 goto out;
71474diff -urNp linux-2.6.32.46/mm/memory.c linux-2.6.32.46/mm/memory.c
71475--- linux-2.6.32.46/mm/memory.c 2011-07-13 17:23:04.000000000 -0400
71476+++ linux-2.6.32.46/mm/memory.c 2011-07-13 17:23:23.000000000 -0400
71477@@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
71478 return;
71479
71480 pmd = pmd_offset(pud, start);
71481+
71482+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
71483 pud_clear(pud);
71484 pmd_free_tlb(tlb, pmd, start);
71485+#endif
71486+
71487 }
71488
71489 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
71490@@ -219,9 +223,12 @@ static inline void free_pud_range(struct
71491 if (end - 1 > ceiling - 1)
71492 return;
71493
71494+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
71495 pud = pud_offset(pgd, start);
71496 pgd_clear(pgd);
71497 pud_free_tlb(tlb, pud, start);
71498+#endif
71499+
71500 }
71501
71502 /*
71503@@ -1251,10 +1258,10 @@ int __get_user_pages(struct task_struct
71504 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
71505 i = 0;
71506
71507- do {
71508+ while (nr_pages) {
71509 struct vm_area_struct *vma;
71510
71511- vma = find_extend_vma(mm, start);
71512+ vma = find_vma(mm, start);
71513 if (!vma && in_gate_area(tsk, start)) {
71514 unsigned long pg = start & PAGE_MASK;
71515 struct vm_area_struct *gate_vma = get_gate_vma(tsk);
71516@@ -1306,7 +1313,7 @@ int __get_user_pages(struct task_struct
71517 continue;
71518 }
71519
71520- if (!vma ||
71521+ if (!vma || start < vma->vm_start ||
71522 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
71523 !(vm_flags & vma->vm_flags))
71524 return i ? : -EFAULT;
71525@@ -1381,7 +1388,7 @@ int __get_user_pages(struct task_struct
71526 start += PAGE_SIZE;
71527 nr_pages--;
71528 } while (nr_pages && start < vma->vm_end);
71529- } while (nr_pages);
71530+ }
71531 return i;
71532 }
71533
71534@@ -1526,6 +1533,10 @@ static int insert_page(struct vm_area_st
71535 page_add_file_rmap(page);
71536 set_pte_at(mm, addr, pte, mk_pte(page, prot));
71537
71538+#ifdef CONFIG_PAX_SEGMEXEC
71539+ pax_mirror_file_pte(vma, addr, page, ptl);
71540+#endif
71541+
71542 retval = 0;
71543 pte_unmap_unlock(pte, ptl);
71544 return retval;
71545@@ -1560,10 +1571,22 @@ out:
71546 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
71547 struct page *page)
71548 {
71549+
71550+#ifdef CONFIG_PAX_SEGMEXEC
71551+ struct vm_area_struct *vma_m;
71552+#endif
71553+
71554 if (addr < vma->vm_start || addr >= vma->vm_end)
71555 return -EFAULT;
71556 if (!page_count(page))
71557 return -EINVAL;
71558+
71559+#ifdef CONFIG_PAX_SEGMEXEC
71560+ vma_m = pax_find_mirror_vma(vma);
71561+ if (vma_m)
71562+ vma_m->vm_flags |= VM_INSERTPAGE;
71563+#endif
71564+
71565 vma->vm_flags |= VM_INSERTPAGE;
71566 return insert_page(vma, addr, page, vma->vm_page_prot);
71567 }
71568@@ -1649,6 +1672,7 @@ int vm_insert_mixed(struct vm_area_struc
71569 unsigned long pfn)
71570 {
71571 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
71572+ BUG_ON(vma->vm_mirror);
71573
71574 if (addr < vma->vm_start || addr >= vma->vm_end)
71575 return -EFAULT;
71576@@ -1977,6 +2001,186 @@ static inline void cow_user_page(struct
71577 copy_user_highpage(dst, src, va, vma);
71578 }
71579
71580+#ifdef CONFIG_PAX_SEGMEXEC
71581+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
71582+{
71583+ struct mm_struct *mm = vma->vm_mm;
71584+ spinlock_t *ptl;
71585+ pte_t *pte, entry;
71586+
71587+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
71588+ entry = *pte;
71589+ if (!pte_present(entry)) {
71590+ if (!pte_none(entry)) {
71591+ BUG_ON(pte_file(entry));
71592+ free_swap_and_cache(pte_to_swp_entry(entry));
71593+ pte_clear_not_present_full(mm, address, pte, 0);
71594+ }
71595+ } else {
71596+ struct page *page;
71597+
71598+ flush_cache_page(vma, address, pte_pfn(entry));
71599+ entry = ptep_clear_flush(vma, address, pte);
71600+ BUG_ON(pte_dirty(entry));
71601+ page = vm_normal_page(vma, address, entry);
71602+ if (page) {
71603+ update_hiwater_rss(mm);
71604+ if (PageAnon(page))
71605+ dec_mm_counter(mm, anon_rss);
71606+ else
71607+ dec_mm_counter(mm, file_rss);
71608+ page_remove_rmap(page);
71609+ page_cache_release(page);
71610+ }
71611+ }
71612+ pte_unmap_unlock(pte, ptl);
71613+}
71614+
71615+/* PaX: if vma is mirrored, synchronize the mirror's PTE
71616+ *
71617+ * the ptl of the lower mapped page is held on entry and is not released on exit
71618+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
71619+ */
71620+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71621+{
71622+ struct mm_struct *mm = vma->vm_mm;
71623+ unsigned long address_m;
71624+ spinlock_t *ptl_m;
71625+ struct vm_area_struct *vma_m;
71626+ pmd_t *pmd_m;
71627+ pte_t *pte_m, entry_m;
71628+
71629+ BUG_ON(!page_m || !PageAnon(page_m));
71630+
71631+ vma_m = pax_find_mirror_vma(vma);
71632+ if (!vma_m)
71633+ return;
71634+
71635+ BUG_ON(!PageLocked(page_m));
71636+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71637+ address_m = address + SEGMEXEC_TASK_SIZE;
71638+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71639+ pte_m = pte_offset_map_nested(pmd_m, address_m);
71640+ ptl_m = pte_lockptr(mm, pmd_m);
71641+ if (ptl != ptl_m) {
71642+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71643+ if (!pte_none(*pte_m))
71644+ goto out;
71645+ }
71646+
71647+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71648+ page_cache_get(page_m);
71649+ page_add_anon_rmap(page_m, vma_m, address_m);
71650+ inc_mm_counter(mm, anon_rss);
71651+ set_pte_at(mm, address_m, pte_m, entry_m);
71652+ update_mmu_cache(vma_m, address_m, entry_m);
71653+out:
71654+ if (ptl != ptl_m)
71655+ spin_unlock(ptl_m);
71656+ pte_unmap_nested(pte_m);
71657+ unlock_page(page_m);
71658+}
71659+
71660+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71661+{
71662+ struct mm_struct *mm = vma->vm_mm;
71663+ unsigned long address_m;
71664+ spinlock_t *ptl_m;
71665+ struct vm_area_struct *vma_m;
71666+ pmd_t *pmd_m;
71667+ pte_t *pte_m, entry_m;
71668+
71669+ BUG_ON(!page_m || PageAnon(page_m));
71670+
71671+ vma_m = pax_find_mirror_vma(vma);
71672+ if (!vma_m)
71673+ return;
71674+
71675+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71676+ address_m = address + SEGMEXEC_TASK_SIZE;
71677+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71678+ pte_m = pte_offset_map_nested(pmd_m, address_m);
71679+ ptl_m = pte_lockptr(mm, pmd_m);
71680+ if (ptl != ptl_m) {
71681+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71682+ if (!pte_none(*pte_m))
71683+ goto out;
71684+ }
71685+
71686+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71687+ page_cache_get(page_m);
71688+ page_add_file_rmap(page_m);
71689+ inc_mm_counter(mm, file_rss);
71690+ set_pte_at(mm, address_m, pte_m, entry_m);
71691+ update_mmu_cache(vma_m, address_m, entry_m);
71692+out:
71693+ if (ptl != ptl_m)
71694+ spin_unlock(ptl_m);
71695+ pte_unmap_nested(pte_m);
71696+}
71697+
71698+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
71699+{
71700+ struct mm_struct *mm = vma->vm_mm;
71701+ unsigned long address_m;
71702+ spinlock_t *ptl_m;
71703+ struct vm_area_struct *vma_m;
71704+ pmd_t *pmd_m;
71705+ pte_t *pte_m, entry_m;
71706+
71707+ vma_m = pax_find_mirror_vma(vma);
71708+ if (!vma_m)
71709+ return;
71710+
71711+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71712+ address_m = address + SEGMEXEC_TASK_SIZE;
71713+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71714+ pte_m = pte_offset_map_nested(pmd_m, address_m);
71715+ ptl_m = pte_lockptr(mm, pmd_m);
71716+ if (ptl != ptl_m) {
71717+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71718+ if (!pte_none(*pte_m))
71719+ goto out;
71720+ }
71721+
71722+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
71723+ set_pte_at(mm, address_m, pte_m, entry_m);
71724+out:
71725+ if (ptl != ptl_m)
71726+ spin_unlock(ptl_m);
71727+ pte_unmap_nested(pte_m);
71728+}
71729+
71730+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
71731+{
71732+ struct page *page_m;
71733+ pte_t entry;
71734+
71735+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
71736+ goto out;
71737+
71738+ entry = *pte;
71739+ page_m = vm_normal_page(vma, address, entry);
71740+ if (!page_m)
71741+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
71742+ else if (PageAnon(page_m)) {
71743+ if (pax_find_mirror_vma(vma)) {
71744+ pte_unmap_unlock(pte, ptl);
71745+ lock_page(page_m);
71746+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
71747+ if (pte_same(entry, *pte))
71748+ pax_mirror_anon_pte(vma, address, page_m, ptl);
71749+ else
71750+ unlock_page(page_m);
71751+ }
71752+ } else
71753+ pax_mirror_file_pte(vma, address, page_m, ptl);
71754+
71755+out:
71756+ pte_unmap_unlock(pte, ptl);
71757+}
71758+#endif
71759+
71760 /*
71761 * This routine handles present pages, when users try to write
71762 * to a shared page. It is done by copying the page to a new address
71763@@ -2156,6 +2360,12 @@ gotten:
71764 */
71765 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71766 if (likely(pte_same(*page_table, orig_pte))) {
71767+
71768+#ifdef CONFIG_PAX_SEGMEXEC
71769+ if (pax_find_mirror_vma(vma))
71770+ BUG_ON(!trylock_page(new_page));
71771+#endif
71772+
71773 if (old_page) {
71774 if (!PageAnon(old_page)) {
71775 dec_mm_counter(mm, file_rss);
71776@@ -2207,6 +2417,10 @@ gotten:
71777 page_remove_rmap(old_page);
71778 }
71779
71780+#ifdef CONFIG_PAX_SEGMEXEC
71781+ pax_mirror_anon_pte(vma, address, new_page, ptl);
71782+#endif
71783+
71784 /* Free the old page.. */
71785 new_page = old_page;
71786 ret |= VM_FAULT_WRITE;
71787@@ -2606,6 +2820,11 @@ static int do_swap_page(struct mm_struct
71788 swap_free(entry);
71789 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
71790 try_to_free_swap(page);
71791+
71792+#ifdef CONFIG_PAX_SEGMEXEC
71793+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
71794+#endif
71795+
71796 unlock_page(page);
71797
71798 if (flags & FAULT_FLAG_WRITE) {
71799@@ -2617,6 +2836,11 @@ static int do_swap_page(struct mm_struct
71800
71801 /* No need to invalidate - it was non-present before */
71802 update_mmu_cache(vma, address, pte);
71803+
71804+#ifdef CONFIG_PAX_SEGMEXEC
71805+ pax_mirror_anon_pte(vma, address, page, ptl);
71806+#endif
71807+
71808 unlock:
71809 pte_unmap_unlock(page_table, ptl);
71810 out:
71811@@ -2632,40 +2856,6 @@ out_release:
71812 }
71813
71814 /*
71815- * This is like a special single-page "expand_{down|up}wards()",
71816- * except we must first make sure that 'address{-|+}PAGE_SIZE'
71817- * doesn't hit another vma.
71818- */
71819-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
71820-{
71821- address &= PAGE_MASK;
71822- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
71823- struct vm_area_struct *prev = vma->vm_prev;
71824-
71825- /*
71826- * Is there a mapping abutting this one below?
71827- *
71828- * That's only ok if it's the same stack mapping
71829- * that has gotten split..
71830- */
71831- if (prev && prev->vm_end == address)
71832- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
71833-
71834- expand_stack(vma, address - PAGE_SIZE);
71835- }
71836- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
71837- struct vm_area_struct *next = vma->vm_next;
71838-
71839- /* As VM_GROWSDOWN but s/below/above/ */
71840- if (next && next->vm_start == address + PAGE_SIZE)
71841- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
71842-
71843- expand_upwards(vma, address + PAGE_SIZE);
71844- }
71845- return 0;
71846-}
71847-
71848-/*
71849 * We enter with non-exclusive mmap_sem (to exclude vma changes,
71850 * but allow concurrent faults), and pte mapped but not yet locked.
71851 * We return with mmap_sem still held, but pte unmapped and unlocked.
71852@@ -2674,27 +2864,23 @@ static int do_anonymous_page(struct mm_s
71853 unsigned long address, pte_t *page_table, pmd_t *pmd,
71854 unsigned int flags)
71855 {
71856- struct page *page;
71857+ struct page *page = NULL;
71858 spinlock_t *ptl;
71859 pte_t entry;
71860
71861- pte_unmap(page_table);
71862-
71863- /* Check if we need to add a guard page to the stack */
71864- if (check_stack_guard_page(vma, address) < 0)
71865- return VM_FAULT_SIGBUS;
71866-
71867- /* Use the zero-page for reads */
71868 if (!(flags & FAULT_FLAG_WRITE)) {
71869 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
71870 vma->vm_page_prot));
71871- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71872+ ptl = pte_lockptr(mm, pmd);
71873+ spin_lock(ptl);
71874 if (!pte_none(*page_table))
71875 goto unlock;
71876 goto setpte;
71877 }
71878
71879 /* Allocate our own private page. */
71880+ pte_unmap(page_table);
71881+
71882 if (unlikely(anon_vma_prepare(vma)))
71883 goto oom;
71884 page = alloc_zeroed_user_highpage_movable(vma, address);
71885@@ -2713,6 +2899,11 @@ static int do_anonymous_page(struct mm_s
71886 if (!pte_none(*page_table))
71887 goto release;
71888
71889+#ifdef CONFIG_PAX_SEGMEXEC
71890+ if (pax_find_mirror_vma(vma))
71891+ BUG_ON(!trylock_page(page));
71892+#endif
71893+
71894 inc_mm_counter(mm, anon_rss);
71895 page_add_new_anon_rmap(page, vma, address);
71896 setpte:
71897@@ -2720,6 +2911,12 @@ setpte:
71898
71899 /* No need to invalidate - it was non-present before */
71900 update_mmu_cache(vma, address, entry);
71901+
71902+#ifdef CONFIG_PAX_SEGMEXEC
71903+ if (page)
71904+ pax_mirror_anon_pte(vma, address, page, ptl);
71905+#endif
71906+
71907 unlock:
71908 pte_unmap_unlock(page_table, ptl);
71909 return 0;
71910@@ -2862,6 +3059,12 @@ static int __do_fault(struct mm_struct *
71911 */
71912 /* Only go through if we didn't race with anybody else... */
71913 if (likely(pte_same(*page_table, orig_pte))) {
71914+
71915+#ifdef CONFIG_PAX_SEGMEXEC
71916+ if (anon && pax_find_mirror_vma(vma))
71917+ BUG_ON(!trylock_page(page));
71918+#endif
71919+
71920 flush_icache_page(vma, page);
71921 entry = mk_pte(page, vma->vm_page_prot);
71922 if (flags & FAULT_FLAG_WRITE)
71923@@ -2881,6 +3084,14 @@ static int __do_fault(struct mm_struct *
71924
71925 /* no need to invalidate: a not-present page won't be cached */
71926 update_mmu_cache(vma, address, entry);
71927+
71928+#ifdef CONFIG_PAX_SEGMEXEC
71929+ if (anon)
71930+ pax_mirror_anon_pte(vma, address, page, ptl);
71931+ else
71932+ pax_mirror_file_pte(vma, address, page, ptl);
71933+#endif
71934+
71935 } else {
71936 if (charged)
71937 mem_cgroup_uncharge_page(page);
71938@@ -3028,6 +3239,12 @@ static inline int handle_pte_fault(struc
71939 if (flags & FAULT_FLAG_WRITE)
71940 flush_tlb_page(vma, address);
71941 }
71942+
71943+#ifdef CONFIG_PAX_SEGMEXEC
71944+ pax_mirror_pte(vma, address, pte, pmd, ptl);
71945+ return 0;
71946+#endif
71947+
71948 unlock:
71949 pte_unmap_unlock(pte, ptl);
71950 return 0;
71951@@ -3044,6 +3261,10 @@ int handle_mm_fault(struct mm_struct *mm
71952 pmd_t *pmd;
71953 pte_t *pte;
71954
71955+#ifdef CONFIG_PAX_SEGMEXEC
71956+ struct vm_area_struct *vma_m;
71957+#endif
71958+
71959 __set_current_state(TASK_RUNNING);
71960
71961 count_vm_event(PGFAULT);
71962@@ -3051,6 +3272,34 @@ int handle_mm_fault(struct mm_struct *mm
71963 if (unlikely(is_vm_hugetlb_page(vma)))
71964 return hugetlb_fault(mm, vma, address, flags);
71965
71966+#ifdef CONFIG_PAX_SEGMEXEC
71967+ vma_m = pax_find_mirror_vma(vma);
71968+ if (vma_m) {
71969+ unsigned long address_m;
71970+ pgd_t *pgd_m;
71971+ pud_t *pud_m;
71972+ pmd_t *pmd_m;
71973+
71974+ if (vma->vm_start > vma_m->vm_start) {
71975+ address_m = address;
71976+ address -= SEGMEXEC_TASK_SIZE;
71977+ vma = vma_m;
71978+ } else
71979+ address_m = address + SEGMEXEC_TASK_SIZE;
71980+
71981+ pgd_m = pgd_offset(mm, address_m);
71982+ pud_m = pud_alloc(mm, pgd_m, address_m);
71983+ if (!pud_m)
71984+ return VM_FAULT_OOM;
71985+ pmd_m = pmd_alloc(mm, pud_m, address_m);
71986+ if (!pmd_m)
71987+ return VM_FAULT_OOM;
71988+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, pmd_m, address_m))
71989+ return VM_FAULT_OOM;
71990+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
71991+ }
71992+#endif
71993+
71994 pgd = pgd_offset(mm, address);
71995 pud = pud_alloc(mm, pgd, address);
71996 if (!pud)
71997@@ -3148,7 +3397,7 @@ static int __init gate_vma_init(void)
71998 gate_vma.vm_start = FIXADDR_USER_START;
71999 gate_vma.vm_end = FIXADDR_USER_END;
72000 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
72001- gate_vma.vm_page_prot = __P101;
72002+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
72003 /*
72004 * Make sure the vDSO gets into every core dump.
72005 * Dumping its contents makes post-mortem fully interpretable later
72006diff -urNp linux-2.6.32.46/mm/memory-failure.c linux-2.6.32.46/mm/memory-failure.c
72007--- linux-2.6.32.46/mm/memory-failure.c 2011-03-27 14:31:47.000000000 -0400
72008+++ linux-2.6.32.46/mm/memory-failure.c 2011-10-06 09:37:14.000000000 -0400
72009@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
72010
72011 int sysctl_memory_failure_recovery __read_mostly = 1;
72012
72013-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
72014+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
72015
72016 /*
72017 * Send all the processes who have the page mapped an ``action optional''
72018@@ -64,7 +64,7 @@ static int kill_proc_ao(struct task_stru
72019 si.si_signo = SIGBUS;
72020 si.si_errno = 0;
72021 si.si_code = BUS_MCEERR_AO;
72022- si.si_addr = (void *)addr;
72023+ si.si_addr = (void __user *)addr;
72024 #ifdef __ARCH_SI_TRAPNO
72025 si.si_trapno = trapno;
72026 #endif
72027@@ -745,7 +745,7 @@ int __memory_failure(unsigned long pfn,
72028 return 0;
72029 }
72030
72031- atomic_long_add(1, &mce_bad_pages);
72032+ atomic_long_add_unchecked(1, &mce_bad_pages);
72033
72034 /*
72035 * We need/can do nothing about count=0 pages.
72036diff -urNp linux-2.6.32.46/mm/mempolicy.c linux-2.6.32.46/mm/mempolicy.c
72037--- linux-2.6.32.46/mm/mempolicy.c 2011-03-27 14:31:47.000000000 -0400
72038+++ linux-2.6.32.46/mm/mempolicy.c 2011-04-17 15:56:46.000000000 -0400
72039@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
72040 struct vm_area_struct *next;
72041 int err;
72042
72043+#ifdef CONFIG_PAX_SEGMEXEC
72044+ struct vm_area_struct *vma_m;
72045+#endif
72046+
72047 err = 0;
72048 for (; vma && vma->vm_start < end; vma = next) {
72049 next = vma->vm_next;
72050@@ -584,6 +588,16 @@ static int mbind_range(struct vm_area_st
72051 err = policy_vma(vma, new);
72052 if (err)
72053 break;
72054+
72055+#ifdef CONFIG_PAX_SEGMEXEC
72056+ vma_m = pax_find_mirror_vma(vma);
72057+ if (vma_m) {
72058+ err = policy_vma(vma_m, new);
72059+ if (err)
72060+ break;
72061+ }
72062+#endif
72063+
72064 }
72065 return err;
72066 }
72067@@ -1002,6 +1016,17 @@ static long do_mbind(unsigned long start
72068
72069 if (end < start)
72070 return -EINVAL;
72071+
72072+#ifdef CONFIG_PAX_SEGMEXEC
72073+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
72074+ if (end > SEGMEXEC_TASK_SIZE)
72075+ return -EINVAL;
72076+ } else
72077+#endif
72078+
72079+ if (end > TASK_SIZE)
72080+ return -EINVAL;
72081+
72082 if (end == start)
72083 return 0;
72084
72085@@ -1207,6 +1232,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
72086 if (!mm)
72087 return -EINVAL;
72088
72089+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
72090+ if (mm != current->mm &&
72091+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
72092+ err = -EPERM;
72093+ goto out;
72094+ }
72095+#endif
72096+
72097 /*
72098 * Check if this process has the right to modify the specified
72099 * process. The right exists if the process has administrative
72100@@ -1216,8 +1249,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
72101 rcu_read_lock();
72102 tcred = __task_cred(task);
72103 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
72104- cred->uid != tcred->suid && cred->uid != tcred->uid &&
72105- !capable(CAP_SYS_NICE)) {
72106+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
72107 rcu_read_unlock();
72108 err = -EPERM;
72109 goto out;
72110@@ -2396,7 +2428,7 @@ int show_numa_map(struct seq_file *m, vo
72111
72112 if (file) {
72113 seq_printf(m, " file=");
72114- seq_path(m, &file->f_path, "\n\t= ");
72115+ seq_path(m, &file->f_path, "\n\t\\= ");
72116 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
72117 seq_printf(m, " heap");
72118 } else if (vma->vm_start <= mm->start_stack &&
72119diff -urNp linux-2.6.32.46/mm/migrate.c linux-2.6.32.46/mm/migrate.c
72120--- linux-2.6.32.46/mm/migrate.c 2011-07-13 17:23:04.000000000 -0400
72121+++ linux-2.6.32.46/mm/migrate.c 2011-07-13 17:23:23.000000000 -0400
72122@@ -916,6 +916,8 @@ static int do_pages_move(struct mm_struc
72123 unsigned long chunk_start;
72124 int err;
72125
72126+ pax_track_stack();
72127+
72128 task_nodes = cpuset_mems_allowed(task);
72129
72130 err = -ENOMEM;
72131@@ -1106,6 +1108,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
72132 if (!mm)
72133 return -EINVAL;
72134
72135+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
72136+ if (mm != current->mm &&
72137+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
72138+ err = -EPERM;
72139+ goto out;
72140+ }
72141+#endif
72142+
72143 /*
72144 * Check if this process has the right to modify the specified
72145 * process. The right exists if the process has administrative
72146@@ -1115,8 +1125,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
72147 rcu_read_lock();
72148 tcred = __task_cred(task);
72149 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
72150- cred->uid != tcred->suid && cred->uid != tcred->uid &&
72151- !capable(CAP_SYS_NICE)) {
72152+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
72153 rcu_read_unlock();
72154 err = -EPERM;
72155 goto out;
72156diff -urNp linux-2.6.32.46/mm/mlock.c linux-2.6.32.46/mm/mlock.c
72157--- linux-2.6.32.46/mm/mlock.c 2011-03-27 14:31:47.000000000 -0400
72158+++ linux-2.6.32.46/mm/mlock.c 2011-04-17 15:56:46.000000000 -0400
72159@@ -13,6 +13,7 @@
72160 #include <linux/pagemap.h>
72161 #include <linux/mempolicy.h>
72162 #include <linux/syscalls.h>
72163+#include <linux/security.h>
72164 #include <linux/sched.h>
72165 #include <linux/module.h>
72166 #include <linux/rmap.h>
72167@@ -138,13 +139,6 @@ void munlock_vma_page(struct page *page)
72168 }
72169 }
72170
72171-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
72172-{
72173- return (vma->vm_flags & VM_GROWSDOWN) &&
72174- (vma->vm_start == addr) &&
72175- !vma_stack_continue(vma->vm_prev, addr);
72176-}
72177-
72178 /**
72179 * __mlock_vma_pages_range() - mlock a range of pages in the vma.
72180 * @vma: target vma
72181@@ -177,12 +171,6 @@ static long __mlock_vma_pages_range(stru
72182 if (vma->vm_flags & VM_WRITE)
72183 gup_flags |= FOLL_WRITE;
72184
72185- /* We don't try to access the guard page of a stack vma */
72186- if (stack_guard_page(vma, start)) {
72187- addr += PAGE_SIZE;
72188- nr_pages--;
72189- }
72190-
72191 while (nr_pages > 0) {
72192 int i;
72193
72194@@ -440,7 +428,7 @@ static int do_mlock(unsigned long start,
72195 {
72196 unsigned long nstart, end, tmp;
72197 struct vm_area_struct * vma, * prev;
72198- int error;
72199+ int error = -EINVAL;
72200
72201 len = PAGE_ALIGN(len);
72202 end = start + len;
72203@@ -448,6 +436,9 @@ static int do_mlock(unsigned long start,
72204 return -EINVAL;
72205 if (end == start)
72206 return 0;
72207+ if (end > TASK_SIZE)
72208+ return -EINVAL;
72209+
72210 vma = find_vma_prev(current->mm, start, &prev);
72211 if (!vma || vma->vm_start > start)
72212 return -ENOMEM;
72213@@ -458,6 +449,11 @@ static int do_mlock(unsigned long start,
72214 for (nstart = start ; ; ) {
72215 unsigned int newflags;
72216
72217+#ifdef CONFIG_PAX_SEGMEXEC
72218+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
72219+ break;
72220+#endif
72221+
72222 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
72223
72224 newflags = vma->vm_flags | VM_LOCKED;
72225@@ -507,6 +503,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
72226 lock_limit >>= PAGE_SHIFT;
72227
72228 /* check against resource limits */
72229+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
72230 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
72231 error = do_mlock(start, len, 1);
72232 up_write(&current->mm->mmap_sem);
72233@@ -528,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long,
72234 static int do_mlockall(int flags)
72235 {
72236 struct vm_area_struct * vma, * prev = NULL;
72237- unsigned int def_flags = 0;
72238
72239 if (flags & MCL_FUTURE)
72240- def_flags = VM_LOCKED;
72241- current->mm->def_flags = def_flags;
72242+ current->mm->def_flags |= VM_LOCKED;
72243+ else
72244+ current->mm->def_flags &= ~VM_LOCKED;
72245 if (flags == MCL_FUTURE)
72246 goto out;
72247
72248 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
72249- unsigned int newflags;
72250+ unsigned long newflags;
72251+
72252+#ifdef CONFIG_PAX_SEGMEXEC
72253+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
72254+ break;
72255+#endif
72256
72257+ BUG_ON(vma->vm_end > TASK_SIZE);
72258 newflags = vma->vm_flags | VM_LOCKED;
72259 if (!(flags & MCL_CURRENT))
72260 newflags &= ~VM_LOCKED;
72261@@ -570,6 +573,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
72262 lock_limit >>= PAGE_SHIFT;
72263
72264 ret = -ENOMEM;
72265+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
72266 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
72267 capable(CAP_IPC_LOCK))
72268 ret = do_mlockall(flags);
72269diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c
72270--- linux-2.6.32.46/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400
72271+++ linux-2.6.32.46/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400
72272@@ -45,6 +45,16 @@
72273 #define arch_rebalance_pgtables(addr, len) (addr)
72274 #endif
72275
72276+static inline void verify_mm_writelocked(struct mm_struct *mm)
72277+{
72278+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
72279+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
72280+ up_read(&mm->mmap_sem);
72281+ BUG();
72282+ }
72283+#endif
72284+}
72285+
72286 static void unmap_region(struct mm_struct *mm,
72287 struct vm_area_struct *vma, struct vm_area_struct *prev,
72288 unsigned long start, unsigned long end);
72289@@ -70,22 +80,32 @@ static void unmap_region(struct mm_struc
72290 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
72291 *
72292 */
72293-pgprot_t protection_map[16] = {
72294+pgprot_t protection_map[16] __read_only = {
72295 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
72296 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
72297 };
72298
72299 pgprot_t vm_get_page_prot(unsigned long vm_flags)
72300 {
72301- return __pgprot(pgprot_val(protection_map[vm_flags &
72302+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
72303 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
72304 pgprot_val(arch_vm_get_page_prot(vm_flags)));
72305+
72306+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72307+ if (!nx_enabled &&
72308+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
72309+ (vm_flags & (VM_READ | VM_WRITE)))
72310+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
72311+#endif
72312+
72313+ return prot;
72314 }
72315 EXPORT_SYMBOL(vm_get_page_prot);
72316
72317 int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
72318 int sysctl_overcommit_ratio = 50; /* default is 50% */
72319 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
72320+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
72321 struct percpu_counter vm_committed_as;
72322
72323 /*
72324@@ -231,6 +251,7 @@ static struct vm_area_struct *remove_vma
72325 struct vm_area_struct *next = vma->vm_next;
72326
72327 might_sleep();
72328+ BUG_ON(vma->vm_mirror);
72329 if (vma->vm_ops && vma->vm_ops->close)
72330 vma->vm_ops->close(vma);
72331 if (vma->vm_file) {
72332@@ -267,6 +288,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
72333 * not page aligned -Ram Gupta
72334 */
72335 rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
72336+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
72337 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
72338 (mm->end_data - mm->start_data) > rlim)
72339 goto out;
72340@@ -704,6 +726,12 @@ static int
72341 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
72342 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
72343 {
72344+
72345+#ifdef CONFIG_PAX_SEGMEXEC
72346+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
72347+ return 0;
72348+#endif
72349+
72350 if (is_mergeable_vma(vma, file, vm_flags) &&
72351 is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
72352 if (vma->vm_pgoff == vm_pgoff)
72353@@ -723,6 +751,12 @@ static int
72354 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
72355 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
72356 {
72357+
72358+#ifdef CONFIG_PAX_SEGMEXEC
72359+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
72360+ return 0;
72361+#endif
72362+
72363 if (is_mergeable_vma(vma, file, vm_flags) &&
72364 is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
72365 pgoff_t vm_pglen;
72366@@ -765,12 +799,19 @@ can_vma_merge_after(struct vm_area_struc
72367 struct vm_area_struct *vma_merge(struct mm_struct *mm,
72368 struct vm_area_struct *prev, unsigned long addr,
72369 unsigned long end, unsigned long vm_flags,
72370- struct anon_vma *anon_vma, struct file *file,
72371+ struct anon_vma *anon_vma, struct file *file,
72372 pgoff_t pgoff, struct mempolicy *policy)
72373 {
72374 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
72375 struct vm_area_struct *area, *next;
72376
72377+#ifdef CONFIG_PAX_SEGMEXEC
72378+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
72379+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
72380+
72381+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
72382+#endif
72383+
72384 /*
72385 * We later require that vma->vm_flags == vm_flags,
72386 * so this tests vma->vm_flags & VM_SPECIAL, too.
72387@@ -786,6 +827,15 @@ struct vm_area_struct *vma_merge(struct
72388 if (next && next->vm_end == end) /* cases 6, 7, 8 */
72389 next = next->vm_next;
72390
72391+#ifdef CONFIG_PAX_SEGMEXEC
72392+ if (prev)
72393+ prev_m = pax_find_mirror_vma(prev);
72394+ if (area)
72395+ area_m = pax_find_mirror_vma(area);
72396+ if (next)
72397+ next_m = pax_find_mirror_vma(next);
72398+#endif
72399+
72400 /*
72401 * Can it merge with the predecessor?
72402 */
72403@@ -805,9 +855,24 @@ struct vm_area_struct *vma_merge(struct
72404 /* cases 1, 6 */
72405 vma_adjust(prev, prev->vm_start,
72406 next->vm_end, prev->vm_pgoff, NULL);
72407- } else /* cases 2, 5, 7 */
72408+
72409+#ifdef CONFIG_PAX_SEGMEXEC
72410+ if (prev_m)
72411+ vma_adjust(prev_m, prev_m->vm_start,
72412+ next_m->vm_end, prev_m->vm_pgoff, NULL);
72413+#endif
72414+
72415+ } else { /* cases 2, 5, 7 */
72416 vma_adjust(prev, prev->vm_start,
72417 end, prev->vm_pgoff, NULL);
72418+
72419+#ifdef CONFIG_PAX_SEGMEXEC
72420+ if (prev_m)
72421+ vma_adjust(prev_m, prev_m->vm_start,
72422+ end_m, prev_m->vm_pgoff, NULL);
72423+#endif
72424+
72425+ }
72426 return prev;
72427 }
72428
72429@@ -818,12 +883,27 @@ struct vm_area_struct *vma_merge(struct
72430 mpol_equal(policy, vma_policy(next)) &&
72431 can_vma_merge_before(next, vm_flags,
72432 anon_vma, file, pgoff+pglen)) {
72433- if (prev && addr < prev->vm_end) /* case 4 */
72434+ if (prev && addr < prev->vm_end) { /* case 4 */
72435 vma_adjust(prev, prev->vm_start,
72436 addr, prev->vm_pgoff, NULL);
72437- else /* cases 3, 8 */
72438+
72439+#ifdef CONFIG_PAX_SEGMEXEC
72440+ if (prev_m)
72441+ vma_adjust(prev_m, prev_m->vm_start,
72442+ addr_m, prev_m->vm_pgoff, NULL);
72443+#endif
72444+
72445+ } else { /* cases 3, 8 */
72446 vma_adjust(area, addr, next->vm_end,
72447 next->vm_pgoff - pglen, NULL);
72448+
72449+#ifdef CONFIG_PAX_SEGMEXEC
72450+ if (area_m)
72451+ vma_adjust(area_m, addr_m, next_m->vm_end,
72452+ next_m->vm_pgoff - pglen, NULL);
72453+#endif
72454+
72455+ }
72456 return area;
72457 }
72458
72459@@ -898,14 +978,11 @@ none:
72460 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
72461 struct file *file, long pages)
72462 {
72463- const unsigned long stack_flags
72464- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
72465-
72466 if (file) {
72467 mm->shared_vm += pages;
72468 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
72469 mm->exec_vm += pages;
72470- } else if (flags & stack_flags)
72471+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
72472 mm->stack_vm += pages;
72473 if (flags & (VM_RESERVED|VM_IO))
72474 mm->reserved_vm += pages;
72475@@ -932,7 +1009,7 @@ unsigned long do_mmap_pgoff(struct file
72476 * (the exception is when the underlying filesystem is noexec
72477 * mounted, in which case we dont add PROT_EXEC.)
72478 */
72479- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
72480+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
72481 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
72482 prot |= PROT_EXEC;
72483
72484@@ -958,7 +1035,7 @@ unsigned long do_mmap_pgoff(struct file
72485 /* Obtain the address to map to. we verify (or select) it and ensure
72486 * that it represents a valid section of the address space.
72487 */
72488- addr = get_unmapped_area(file, addr, len, pgoff, flags);
72489+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
72490 if (addr & ~PAGE_MASK)
72491 return addr;
72492
72493@@ -969,6 +1046,36 @@ unsigned long do_mmap_pgoff(struct file
72494 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
72495 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
72496
72497+#ifdef CONFIG_PAX_MPROTECT
72498+ if (mm->pax_flags & MF_PAX_MPROTECT) {
72499+#ifndef CONFIG_PAX_MPROTECT_COMPAT
72500+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
72501+ gr_log_rwxmmap(file);
72502+
72503+#ifdef CONFIG_PAX_EMUPLT
72504+ vm_flags &= ~VM_EXEC;
72505+#else
72506+ return -EPERM;
72507+#endif
72508+
72509+ }
72510+
72511+ if (!(vm_flags & VM_EXEC))
72512+ vm_flags &= ~VM_MAYEXEC;
72513+#else
72514+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
72515+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
72516+#endif
72517+ else
72518+ vm_flags &= ~VM_MAYWRITE;
72519+ }
72520+#endif
72521+
72522+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72523+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
72524+ vm_flags &= ~VM_PAGEEXEC;
72525+#endif
72526+
72527 if (flags & MAP_LOCKED)
72528 if (!can_do_mlock())
72529 return -EPERM;
72530@@ -980,6 +1087,7 @@ unsigned long do_mmap_pgoff(struct file
72531 locked += mm->locked_vm;
72532 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
72533 lock_limit >>= PAGE_SHIFT;
72534+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72535 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
72536 return -EAGAIN;
72537 }
72538@@ -1053,6 +1161,9 @@ unsigned long do_mmap_pgoff(struct file
72539 if (error)
72540 return error;
72541
72542+ if (!gr_acl_handle_mmap(file, prot))
72543+ return -EACCES;
72544+
72545 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
72546 }
72547 EXPORT_SYMBOL(do_mmap_pgoff);
72548@@ -1065,10 +1176,10 @@ EXPORT_SYMBOL(do_mmap_pgoff);
72549 */
72550 int vma_wants_writenotify(struct vm_area_struct *vma)
72551 {
72552- unsigned int vm_flags = vma->vm_flags;
72553+ unsigned long vm_flags = vma->vm_flags;
72554
72555 /* If it was private or non-writable, the write bit is already clear */
72556- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
72557+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
72558 return 0;
72559
72560 /* The backer wishes to know when pages are first written to? */
72561@@ -1117,14 +1228,24 @@ unsigned long mmap_region(struct file *f
72562 unsigned long charged = 0;
72563 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
72564
72565+#ifdef CONFIG_PAX_SEGMEXEC
72566+ struct vm_area_struct *vma_m = NULL;
72567+#endif
72568+
72569+ /*
72570+ * mm->mmap_sem is required to protect against another thread
72571+ * changing the mappings in case we sleep.
72572+ */
72573+ verify_mm_writelocked(mm);
72574+
72575 /* Clear old maps */
72576 error = -ENOMEM;
72577-munmap_back:
72578 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72579 if (vma && vma->vm_start < addr + len) {
72580 if (do_munmap(mm, addr, len))
72581 return -ENOMEM;
72582- goto munmap_back;
72583+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72584+ BUG_ON(vma && vma->vm_start < addr + len);
72585 }
72586
72587 /* Check against address space limit. */
72588@@ -1173,6 +1294,16 @@ munmap_back:
72589 goto unacct_error;
72590 }
72591
72592+#ifdef CONFIG_PAX_SEGMEXEC
72593+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
72594+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72595+ if (!vma_m) {
72596+ error = -ENOMEM;
72597+ goto free_vma;
72598+ }
72599+ }
72600+#endif
72601+
72602 vma->vm_mm = mm;
72603 vma->vm_start = addr;
72604 vma->vm_end = addr + len;
72605@@ -1195,6 +1326,19 @@ munmap_back:
72606 error = file->f_op->mmap(file, vma);
72607 if (error)
72608 goto unmap_and_free_vma;
72609+
72610+#ifdef CONFIG_PAX_SEGMEXEC
72611+ if (vma_m && (vm_flags & VM_EXECUTABLE))
72612+ added_exe_file_vma(mm);
72613+#endif
72614+
72615+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72616+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
72617+ vma->vm_flags |= VM_PAGEEXEC;
72618+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
72619+ }
72620+#endif
72621+
72622 if (vm_flags & VM_EXECUTABLE)
72623 added_exe_file_vma(mm);
72624
72625@@ -1218,6 +1362,11 @@ munmap_back:
72626 vma_link(mm, vma, prev, rb_link, rb_parent);
72627 file = vma->vm_file;
72628
72629+#ifdef CONFIG_PAX_SEGMEXEC
72630+ if (vma_m)
72631+ pax_mirror_vma(vma_m, vma);
72632+#endif
72633+
72634 /* Once vma denies write, undo our temporary denial count */
72635 if (correct_wcount)
72636 atomic_inc(&inode->i_writecount);
72637@@ -1226,6 +1375,7 @@ out:
72638
72639 mm->total_vm += len >> PAGE_SHIFT;
72640 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
72641+ track_exec_limit(mm, addr, addr + len, vm_flags);
72642 if (vm_flags & VM_LOCKED) {
72643 /*
72644 * makes pages present; downgrades, drops, reacquires mmap_sem
72645@@ -1248,6 +1398,12 @@ unmap_and_free_vma:
72646 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
72647 charged = 0;
72648 free_vma:
72649+
72650+#ifdef CONFIG_PAX_SEGMEXEC
72651+ if (vma_m)
72652+ kmem_cache_free(vm_area_cachep, vma_m);
72653+#endif
72654+
72655 kmem_cache_free(vm_area_cachep, vma);
72656 unacct_error:
72657 if (charged)
72658@@ -1255,6 +1411,44 @@ unacct_error:
72659 return error;
72660 }
72661
72662+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
72663+{
72664+ if (!vma) {
72665+#ifdef CONFIG_STACK_GROWSUP
72666+ if (addr > sysctl_heap_stack_gap)
72667+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
72668+ else
72669+ vma = find_vma(current->mm, 0);
72670+ if (vma && (vma->vm_flags & VM_GROWSUP))
72671+ return false;
72672+#endif
72673+ return true;
72674+ }
72675+
72676+ if (addr + len > vma->vm_start)
72677+ return false;
72678+
72679+ if (vma->vm_flags & VM_GROWSDOWN)
72680+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
72681+#ifdef CONFIG_STACK_GROWSUP
72682+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
72683+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
72684+#endif
72685+
72686+ return true;
72687+}
72688+
72689+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
72690+{
72691+ if (vma->vm_start < len)
72692+ return -ENOMEM;
72693+ if (!(vma->vm_flags & VM_GROWSDOWN))
72694+ return vma->vm_start - len;
72695+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
72696+ return vma->vm_start - len - sysctl_heap_stack_gap;
72697+ return -ENOMEM;
72698+}
72699+
72700 /* Get an address range which is currently unmapped.
72701 * For shmat() with addr=0.
72702 *
72703@@ -1281,18 +1475,23 @@ arch_get_unmapped_area(struct file *filp
72704 if (flags & MAP_FIXED)
72705 return addr;
72706
72707+#ifdef CONFIG_PAX_RANDMMAP
72708+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72709+#endif
72710+
72711 if (addr) {
72712 addr = PAGE_ALIGN(addr);
72713- vma = find_vma(mm, addr);
72714- if (TASK_SIZE - len >= addr &&
72715- (!vma || addr + len <= vma->vm_start))
72716- return addr;
72717+ if (TASK_SIZE - len >= addr) {
72718+ vma = find_vma(mm, addr);
72719+ if (check_heap_stack_gap(vma, addr, len))
72720+ return addr;
72721+ }
72722 }
72723 if (len > mm->cached_hole_size) {
72724- start_addr = addr = mm->free_area_cache;
72725+ start_addr = addr = mm->free_area_cache;
72726 } else {
72727- start_addr = addr = TASK_UNMAPPED_BASE;
72728- mm->cached_hole_size = 0;
72729+ start_addr = addr = mm->mmap_base;
72730+ mm->cached_hole_size = 0;
72731 }
72732
72733 full_search:
72734@@ -1303,34 +1502,40 @@ full_search:
72735 * Start a new search - just in case we missed
72736 * some holes.
72737 */
72738- if (start_addr != TASK_UNMAPPED_BASE) {
72739- addr = TASK_UNMAPPED_BASE;
72740- start_addr = addr;
72741+ if (start_addr != mm->mmap_base) {
72742+ start_addr = addr = mm->mmap_base;
72743 mm->cached_hole_size = 0;
72744 goto full_search;
72745 }
72746 return -ENOMEM;
72747 }
72748- if (!vma || addr + len <= vma->vm_start) {
72749- /*
72750- * Remember the place where we stopped the search:
72751- */
72752- mm->free_area_cache = addr + len;
72753- return addr;
72754- }
72755+ if (check_heap_stack_gap(vma, addr, len))
72756+ break;
72757 if (addr + mm->cached_hole_size < vma->vm_start)
72758 mm->cached_hole_size = vma->vm_start - addr;
72759 addr = vma->vm_end;
72760 }
72761+
72762+ /*
72763+ * Remember the place where we stopped the search:
72764+ */
72765+ mm->free_area_cache = addr + len;
72766+ return addr;
72767 }
72768 #endif
72769
72770 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
72771 {
72772+
72773+#ifdef CONFIG_PAX_SEGMEXEC
72774+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72775+ return;
72776+#endif
72777+
72778 /*
72779 * Is this a new hole at the lowest possible address?
72780 */
72781- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
72782+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
72783 mm->free_area_cache = addr;
72784 mm->cached_hole_size = ~0UL;
72785 }
72786@@ -1348,7 +1553,7 @@ arch_get_unmapped_area_topdown(struct fi
72787 {
72788 struct vm_area_struct *vma;
72789 struct mm_struct *mm = current->mm;
72790- unsigned long addr = addr0;
72791+ unsigned long base = mm->mmap_base, addr = addr0;
72792
72793 /* requested length too big for entire address space */
72794 if (len > TASK_SIZE)
72795@@ -1357,13 +1562,18 @@ arch_get_unmapped_area_topdown(struct fi
72796 if (flags & MAP_FIXED)
72797 return addr;
72798
72799+#ifdef CONFIG_PAX_RANDMMAP
72800+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72801+#endif
72802+
72803 /* requesting a specific address */
72804 if (addr) {
72805 addr = PAGE_ALIGN(addr);
72806- vma = find_vma(mm, addr);
72807- if (TASK_SIZE - len >= addr &&
72808- (!vma || addr + len <= vma->vm_start))
72809- return addr;
72810+ if (TASK_SIZE - len >= addr) {
72811+ vma = find_vma(mm, addr);
72812+ if (check_heap_stack_gap(vma, addr, len))
72813+ return addr;
72814+ }
72815 }
72816
72817 /* check if free_area_cache is useful for us */
72818@@ -1378,7 +1588,7 @@ arch_get_unmapped_area_topdown(struct fi
72819 /* make sure it can fit in the remaining address space */
72820 if (addr > len) {
72821 vma = find_vma(mm, addr-len);
72822- if (!vma || addr <= vma->vm_start)
72823+ if (check_heap_stack_gap(vma, addr - len, len))
72824 /* remember the address as a hint for next time */
72825 return (mm->free_area_cache = addr-len);
72826 }
72827@@ -1395,7 +1605,7 @@ arch_get_unmapped_area_topdown(struct fi
72828 * return with success:
72829 */
72830 vma = find_vma(mm, addr);
72831- if (!vma || addr+len <= vma->vm_start)
72832+ if (check_heap_stack_gap(vma, addr, len))
72833 /* remember the address as a hint for next time */
72834 return (mm->free_area_cache = addr);
72835
72836@@ -1404,8 +1614,8 @@ arch_get_unmapped_area_topdown(struct fi
72837 mm->cached_hole_size = vma->vm_start - addr;
72838
72839 /* try just below the current vma->vm_start */
72840- addr = vma->vm_start-len;
72841- } while (len < vma->vm_start);
72842+ addr = skip_heap_stack_gap(vma, len);
72843+ } while (!IS_ERR_VALUE(addr));
72844
72845 bottomup:
72846 /*
72847@@ -1414,13 +1624,21 @@ bottomup:
72848 * can happen with large stack limits and large mmap()
72849 * allocations.
72850 */
72851+ mm->mmap_base = TASK_UNMAPPED_BASE;
72852+
72853+#ifdef CONFIG_PAX_RANDMMAP
72854+ if (mm->pax_flags & MF_PAX_RANDMMAP)
72855+ mm->mmap_base += mm->delta_mmap;
72856+#endif
72857+
72858+ mm->free_area_cache = mm->mmap_base;
72859 mm->cached_hole_size = ~0UL;
72860- mm->free_area_cache = TASK_UNMAPPED_BASE;
72861 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
72862 /*
72863 * Restore the topdown base:
72864 */
72865- mm->free_area_cache = mm->mmap_base;
72866+ mm->mmap_base = base;
72867+ mm->free_area_cache = base;
72868 mm->cached_hole_size = ~0UL;
72869
72870 return addr;
72871@@ -1429,6 +1647,12 @@ bottomup:
72872
72873 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72874 {
72875+
72876+#ifdef CONFIG_PAX_SEGMEXEC
72877+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72878+ return;
72879+#endif
72880+
72881 /*
72882 * Is this a new hole at the highest possible address?
72883 */
72884@@ -1436,8 +1660,10 @@ void arch_unmap_area_topdown(struct mm_s
72885 mm->free_area_cache = addr;
72886
72887 /* dont allow allocations above current base */
72888- if (mm->free_area_cache > mm->mmap_base)
72889+ if (mm->free_area_cache > mm->mmap_base) {
72890 mm->free_area_cache = mm->mmap_base;
72891+ mm->cached_hole_size = ~0UL;
72892+ }
72893 }
72894
72895 unsigned long
72896@@ -1545,6 +1771,27 @@ out:
72897 return prev ? prev->vm_next : vma;
72898 }
72899
72900+#ifdef CONFIG_PAX_SEGMEXEC
72901+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
72902+{
72903+ struct vm_area_struct *vma_m;
72904+
72905+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
72906+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
72907+ BUG_ON(vma->vm_mirror);
72908+ return NULL;
72909+ }
72910+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
72911+ vma_m = vma->vm_mirror;
72912+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
72913+ BUG_ON(vma->vm_file != vma_m->vm_file);
72914+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
72915+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff || vma->anon_vma != vma_m->anon_vma);
72916+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
72917+ return vma_m;
72918+}
72919+#endif
72920+
72921 /*
72922 * Verify that the stack growth is acceptable and
72923 * update accounting. This is shared with both the
72924@@ -1561,6 +1808,7 @@ static int acct_stack_growth(struct vm_a
72925 return -ENOMEM;
72926
72927 /* Stack limit test */
72928+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
72929 if (size > rlim[RLIMIT_STACK].rlim_cur)
72930 return -ENOMEM;
72931
72932@@ -1570,6 +1818,7 @@ static int acct_stack_growth(struct vm_a
72933 unsigned long limit;
72934 locked = mm->locked_vm + grow;
72935 limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
72936+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72937 if (locked > limit && !capable(CAP_IPC_LOCK))
72938 return -ENOMEM;
72939 }
72940@@ -1600,37 +1849,48 @@ static int acct_stack_growth(struct vm_a
72941 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
72942 * vma is the last one with address > vma->vm_end. Have to extend vma.
72943 */
72944+#ifndef CONFIG_IA64
72945+static
72946+#endif
72947 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72948 {
72949 int error;
72950+ bool locknext;
72951
72952 if (!(vma->vm_flags & VM_GROWSUP))
72953 return -EFAULT;
72954
72955+ /* Also guard against wrapping around to address 0. */
72956+ if (address < PAGE_ALIGN(address+1))
72957+ address = PAGE_ALIGN(address+1);
72958+ else
72959+ return -ENOMEM;
72960+
72961 /*
72962 * We must make sure the anon_vma is allocated
72963 * so that the anon_vma locking is not a noop.
72964 */
72965 if (unlikely(anon_vma_prepare(vma)))
72966 return -ENOMEM;
72967+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
72968+ if (locknext && anon_vma_prepare(vma->vm_next))
72969+ return -ENOMEM;
72970 anon_vma_lock(vma);
72971+ if (locknext)
72972+ anon_vma_lock(vma->vm_next);
72973
72974 /*
72975 * vma->vm_start/vm_end cannot change under us because the caller
72976 * is required to hold the mmap_sem in read mode. We need the
72977- * anon_vma lock to serialize against concurrent expand_stacks.
72978- * Also guard against wrapping around to address 0.
72979+ * anon_vma locks to serialize against concurrent expand_stacks
72980+ * and expand_upwards.
72981 */
72982- if (address < PAGE_ALIGN(address+4))
72983- address = PAGE_ALIGN(address+4);
72984- else {
72985- anon_vma_unlock(vma);
72986- return -ENOMEM;
72987- }
72988 error = 0;
72989
72990 /* Somebody else might have raced and expanded it already */
72991- if (address > vma->vm_end) {
72992+ if (vma->vm_next && (vma->vm_next->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && vma->vm_next->vm_start - address < sysctl_heap_stack_gap)
72993+ error = -ENOMEM;
72994+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
72995 unsigned long size, grow;
72996
72997 size = address - vma->vm_start;
72998@@ -1640,6 +1900,8 @@ int expand_upwards(struct vm_area_struct
72999 if (!error)
73000 vma->vm_end = address;
73001 }
73002+ if (locknext)
73003+ anon_vma_unlock(vma->vm_next);
73004 anon_vma_unlock(vma);
73005 return error;
73006 }
73007@@ -1652,6 +1914,8 @@ static int expand_downwards(struct vm_ar
73008 unsigned long address)
73009 {
73010 int error;
73011+ bool lockprev = false;
73012+ struct vm_area_struct *prev;
73013
73014 /*
73015 * We must make sure the anon_vma is allocated
73016@@ -1665,6 +1929,15 @@ static int expand_downwards(struct vm_ar
73017 if (error)
73018 return error;
73019
73020+ prev = vma->vm_prev;
73021+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
73022+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
73023+#endif
73024+ if (lockprev && anon_vma_prepare(prev))
73025+ return -ENOMEM;
73026+ if (lockprev)
73027+ anon_vma_lock(prev);
73028+
73029 anon_vma_lock(vma);
73030
73031 /*
73032@@ -1674,9 +1947,17 @@ static int expand_downwards(struct vm_ar
73033 */
73034
73035 /* Somebody else might have raced and expanded it already */
73036- if (address < vma->vm_start) {
73037+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
73038+ error = -ENOMEM;
73039+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
73040 unsigned long size, grow;
73041
73042+#ifdef CONFIG_PAX_SEGMEXEC
73043+ struct vm_area_struct *vma_m;
73044+
73045+ vma_m = pax_find_mirror_vma(vma);
73046+#endif
73047+
73048 size = vma->vm_end - address;
73049 grow = (vma->vm_start - address) >> PAGE_SHIFT;
73050
73051@@ -1684,9 +1965,20 @@ static int expand_downwards(struct vm_ar
73052 if (!error) {
73053 vma->vm_start = address;
73054 vma->vm_pgoff -= grow;
73055+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
73056+
73057+#ifdef CONFIG_PAX_SEGMEXEC
73058+ if (vma_m) {
73059+ vma_m->vm_start -= grow << PAGE_SHIFT;
73060+ vma_m->vm_pgoff -= grow;
73061+ }
73062+#endif
73063+
73064 }
73065 }
73066 anon_vma_unlock(vma);
73067+ if (lockprev)
73068+ anon_vma_unlock(prev);
73069 return error;
73070 }
73071
73072@@ -1762,6 +2054,13 @@ static void remove_vma_list(struct mm_st
73073 do {
73074 long nrpages = vma_pages(vma);
73075
73076+#ifdef CONFIG_PAX_SEGMEXEC
73077+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
73078+ vma = remove_vma(vma);
73079+ continue;
73080+ }
73081+#endif
73082+
73083 mm->total_vm -= nrpages;
73084 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
73085 vma = remove_vma(vma);
73086@@ -1807,6 +2106,16 @@ detach_vmas_to_be_unmapped(struct mm_str
73087 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
73088 vma->vm_prev = NULL;
73089 do {
73090+
73091+#ifdef CONFIG_PAX_SEGMEXEC
73092+ if (vma->vm_mirror) {
73093+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
73094+ vma->vm_mirror->vm_mirror = NULL;
73095+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
73096+ vma->vm_mirror = NULL;
73097+ }
73098+#endif
73099+
73100 rb_erase(&vma->vm_rb, &mm->mm_rb);
73101 mm->map_count--;
73102 tail_vma = vma;
73103@@ -1834,10 +2143,25 @@ int split_vma(struct mm_struct * mm, str
73104 struct mempolicy *pol;
73105 struct vm_area_struct *new;
73106
73107+#ifdef CONFIG_PAX_SEGMEXEC
73108+ struct vm_area_struct *vma_m, *new_m = NULL;
73109+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
73110+#endif
73111+
73112 if (is_vm_hugetlb_page(vma) && (addr &
73113 ~(huge_page_mask(hstate_vma(vma)))))
73114 return -EINVAL;
73115
73116+#ifdef CONFIG_PAX_SEGMEXEC
73117+ vma_m = pax_find_mirror_vma(vma);
73118+
73119+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
73120+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
73121+ if (mm->map_count >= sysctl_max_map_count-1)
73122+ return -ENOMEM;
73123+ } else
73124+#endif
73125+
73126 if (mm->map_count >= sysctl_max_map_count)
73127 return -ENOMEM;
73128
73129@@ -1845,6 +2169,16 @@ int split_vma(struct mm_struct * mm, str
73130 if (!new)
73131 return -ENOMEM;
73132
73133+#ifdef CONFIG_PAX_SEGMEXEC
73134+ if (vma_m) {
73135+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
73136+ if (!new_m) {
73137+ kmem_cache_free(vm_area_cachep, new);
73138+ return -ENOMEM;
73139+ }
73140+ }
73141+#endif
73142+
73143 /* most fields are the same, copy all, and then fixup */
73144 *new = *vma;
73145
73146@@ -1855,8 +2189,29 @@ int split_vma(struct mm_struct * mm, str
73147 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
73148 }
73149
73150+#ifdef CONFIG_PAX_SEGMEXEC
73151+ if (vma_m) {
73152+ *new_m = *vma_m;
73153+ new_m->vm_mirror = new;
73154+ new->vm_mirror = new_m;
73155+
73156+ if (new_below)
73157+ new_m->vm_end = addr_m;
73158+ else {
73159+ new_m->vm_start = addr_m;
73160+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
73161+ }
73162+ }
73163+#endif
73164+
73165 pol = mpol_dup(vma_policy(vma));
73166 if (IS_ERR(pol)) {
73167+
73168+#ifdef CONFIG_PAX_SEGMEXEC
73169+ if (new_m)
73170+ kmem_cache_free(vm_area_cachep, new_m);
73171+#endif
73172+
73173 kmem_cache_free(vm_area_cachep, new);
73174 return PTR_ERR(pol);
73175 }
73176@@ -1877,6 +2232,28 @@ int split_vma(struct mm_struct * mm, str
73177 else
73178 vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
73179
73180+#ifdef CONFIG_PAX_SEGMEXEC
73181+ if (vma_m) {
73182+ mpol_get(pol);
73183+ vma_set_policy(new_m, pol);
73184+
73185+ if (new_m->vm_file) {
73186+ get_file(new_m->vm_file);
73187+ if (vma_m->vm_flags & VM_EXECUTABLE)
73188+ added_exe_file_vma(mm);
73189+ }
73190+
73191+ if (new_m->vm_ops && new_m->vm_ops->open)
73192+ new_m->vm_ops->open(new_m);
73193+
73194+ if (new_below)
73195+ vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
73196+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
73197+ else
73198+ vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
73199+ }
73200+#endif
73201+
73202 return 0;
73203 }
73204
73205@@ -1885,11 +2262,30 @@ int split_vma(struct mm_struct * mm, str
73206 * work. This now handles partial unmappings.
73207 * Jeremy Fitzhardinge <jeremy@goop.org>
73208 */
73209+#ifdef CONFIG_PAX_SEGMEXEC
73210+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
73211+{
73212+ int ret = __do_munmap(mm, start, len);
73213+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
73214+ return ret;
73215+
73216+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
73217+}
73218+
73219+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
73220+#else
73221 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
73222+#endif
73223 {
73224 unsigned long end;
73225 struct vm_area_struct *vma, *prev, *last;
73226
73227+ /*
73228+ * mm->mmap_sem is required to protect against another thread
73229+ * changing the mappings in case we sleep.
73230+ */
73231+ verify_mm_writelocked(mm);
73232+
73233 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
73234 return -EINVAL;
73235
73236@@ -1953,6 +2349,8 @@ int do_munmap(struct mm_struct *mm, unsi
73237 /* Fix up all other VM information */
73238 remove_vma_list(mm, vma);
73239
73240+ track_exec_limit(mm, start, end, 0UL);
73241+
73242 return 0;
73243 }
73244
73245@@ -1965,22 +2363,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
73246
73247 profile_munmap(addr);
73248
73249+#ifdef CONFIG_PAX_SEGMEXEC
73250+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
73251+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
73252+ return -EINVAL;
73253+#endif
73254+
73255 down_write(&mm->mmap_sem);
73256 ret = do_munmap(mm, addr, len);
73257 up_write(&mm->mmap_sem);
73258 return ret;
73259 }
73260
73261-static inline void verify_mm_writelocked(struct mm_struct *mm)
73262-{
73263-#ifdef CONFIG_DEBUG_VM
73264- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
73265- WARN_ON(1);
73266- up_read(&mm->mmap_sem);
73267- }
73268-#endif
73269-}
73270-
73271 /*
73272 * this is really a simplified "do_mmap". it only handles
73273 * anonymous maps. eventually we may be able to do some
73274@@ -1994,6 +2388,7 @@ unsigned long do_brk(unsigned long addr,
73275 struct rb_node ** rb_link, * rb_parent;
73276 pgoff_t pgoff = addr >> PAGE_SHIFT;
73277 int error;
73278+ unsigned long charged;
73279
73280 len = PAGE_ALIGN(len);
73281 if (!len)
73282@@ -2005,16 +2400,30 @@ unsigned long do_brk(unsigned long addr,
73283
73284 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
73285
73286+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
73287+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
73288+ flags &= ~VM_EXEC;
73289+
73290+#ifdef CONFIG_PAX_MPROTECT
73291+ if (mm->pax_flags & MF_PAX_MPROTECT)
73292+ flags &= ~VM_MAYEXEC;
73293+#endif
73294+
73295+ }
73296+#endif
73297+
73298 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
73299 if (error & ~PAGE_MASK)
73300 return error;
73301
73302+ charged = len >> PAGE_SHIFT;
73303+
73304 /*
73305 * mlock MCL_FUTURE?
73306 */
73307 if (mm->def_flags & VM_LOCKED) {
73308 unsigned long locked, lock_limit;
73309- locked = len >> PAGE_SHIFT;
73310+ locked = charged;
73311 locked += mm->locked_vm;
73312 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
73313 lock_limit >>= PAGE_SHIFT;
73314@@ -2031,22 +2440,22 @@ unsigned long do_brk(unsigned long addr,
73315 /*
73316 * Clear old maps. this also does some error checking for us
73317 */
73318- munmap_back:
73319 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
73320 if (vma && vma->vm_start < addr + len) {
73321 if (do_munmap(mm, addr, len))
73322 return -ENOMEM;
73323- goto munmap_back;
73324+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
73325+ BUG_ON(vma && vma->vm_start < addr + len);
73326 }
73327
73328 /* Check against address space limits *after* clearing old maps... */
73329- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
73330+ if (!may_expand_vm(mm, charged))
73331 return -ENOMEM;
73332
73333 if (mm->map_count > sysctl_max_map_count)
73334 return -ENOMEM;
73335
73336- if (security_vm_enough_memory(len >> PAGE_SHIFT))
73337+ if (security_vm_enough_memory(charged))
73338 return -ENOMEM;
73339
73340 /* Can we just expand an old private anonymous mapping? */
73341@@ -2060,7 +2469,7 @@ unsigned long do_brk(unsigned long addr,
73342 */
73343 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73344 if (!vma) {
73345- vm_unacct_memory(len >> PAGE_SHIFT);
73346+ vm_unacct_memory(charged);
73347 return -ENOMEM;
73348 }
73349
73350@@ -2072,11 +2481,12 @@ unsigned long do_brk(unsigned long addr,
73351 vma->vm_page_prot = vm_get_page_prot(flags);
73352 vma_link(mm, vma, prev, rb_link, rb_parent);
73353 out:
73354- mm->total_vm += len >> PAGE_SHIFT;
73355+ mm->total_vm += charged;
73356 if (flags & VM_LOCKED) {
73357 if (!mlock_vma_pages_range(vma, addr, addr + len))
73358- mm->locked_vm += (len >> PAGE_SHIFT);
73359+ mm->locked_vm += charged;
73360 }
73361+ track_exec_limit(mm, addr, addr + len, flags);
73362 return addr;
73363 }
73364
73365@@ -2123,8 +2533,10 @@ void exit_mmap(struct mm_struct *mm)
73366 * Walk the list again, actually closing and freeing it,
73367 * with preemption enabled, without holding any MM locks.
73368 */
73369- while (vma)
73370+ while (vma) {
73371+ vma->vm_mirror = NULL;
73372 vma = remove_vma(vma);
73373+ }
73374
73375 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
73376 }
73377@@ -2138,6 +2550,10 @@ int insert_vm_struct(struct mm_struct *
73378 struct vm_area_struct * __vma, * prev;
73379 struct rb_node ** rb_link, * rb_parent;
73380
73381+#ifdef CONFIG_PAX_SEGMEXEC
73382+ struct vm_area_struct *vma_m = NULL;
73383+#endif
73384+
73385 /*
73386 * The vm_pgoff of a purely anonymous vma should be irrelevant
73387 * until its first write fault, when page's anon_vma and index
73388@@ -2160,7 +2576,22 @@ int insert_vm_struct(struct mm_struct *
73389 if ((vma->vm_flags & VM_ACCOUNT) &&
73390 security_vm_enough_memory_mm(mm, vma_pages(vma)))
73391 return -ENOMEM;
73392+
73393+#ifdef CONFIG_PAX_SEGMEXEC
73394+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
73395+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73396+ if (!vma_m)
73397+ return -ENOMEM;
73398+ }
73399+#endif
73400+
73401 vma_link(mm, vma, prev, rb_link, rb_parent);
73402+
73403+#ifdef CONFIG_PAX_SEGMEXEC
73404+ if (vma_m)
73405+ pax_mirror_vma(vma_m, vma);
73406+#endif
73407+
73408 return 0;
73409 }
73410
73411@@ -2178,6 +2609,8 @@ struct vm_area_struct *copy_vma(struct v
73412 struct rb_node **rb_link, *rb_parent;
73413 struct mempolicy *pol;
73414
73415+ BUG_ON(vma->vm_mirror);
73416+
73417 /*
73418 * If anonymous vma has not yet been faulted, update new pgoff
73419 * to match new location, to increase its chance of merging.
73420@@ -2221,6 +2654,35 @@ struct vm_area_struct *copy_vma(struct v
73421 return new_vma;
73422 }
73423
73424+#ifdef CONFIG_PAX_SEGMEXEC
73425+void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
73426+{
73427+ struct vm_area_struct *prev_m;
73428+ struct rb_node **rb_link_m, *rb_parent_m;
73429+ struct mempolicy *pol_m;
73430+
73431+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
73432+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
73433+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
73434+ *vma_m = *vma;
73435+ pol_m = vma_policy(vma_m);
73436+ mpol_get(pol_m);
73437+ vma_set_policy(vma_m, pol_m);
73438+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
73439+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
73440+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
73441+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
73442+ if (vma_m->vm_file)
73443+ get_file(vma_m->vm_file);
73444+ if (vma_m->vm_ops && vma_m->vm_ops->open)
73445+ vma_m->vm_ops->open(vma_m);
73446+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
73447+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
73448+ vma_m->vm_mirror = vma;
73449+ vma->vm_mirror = vma_m;
73450+}
73451+#endif
73452+
73453 /*
73454 * Return true if the calling process may expand its vm space by the passed
73455 * number of pages
73456@@ -2231,7 +2693,7 @@ int may_expand_vm(struct mm_struct *mm,
73457 unsigned long lim;
73458
73459 lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
73460-
73461+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
73462 if (cur + npages > lim)
73463 return 0;
73464 return 1;
73465@@ -2301,6 +2763,22 @@ int install_special_mapping(struct mm_st
73466 vma->vm_start = addr;
73467 vma->vm_end = addr + len;
73468
73469+#ifdef CONFIG_PAX_MPROTECT
73470+ if (mm->pax_flags & MF_PAX_MPROTECT) {
73471+#ifndef CONFIG_PAX_MPROTECT_COMPAT
73472+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
73473+ return -EPERM;
73474+ if (!(vm_flags & VM_EXEC))
73475+ vm_flags &= ~VM_MAYEXEC;
73476+#else
73477+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
73478+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
73479+#endif
73480+ else
73481+ vm_flags &= ~VM_MAYWRITE;
73482+ }
73483+#endif
73484+
73485 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
73486 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
73487
73488diff -urNp linux-2.6.32.46/mm/mprotect.c linux-2.6.32.46/mm/mprotect.c
73489--- linux-2.6.32.46/mm/mprotect.c 2011-03-27 14:31:47.000000000 -0400
73490+++ linux-2.6.32.46/mm/mprotect.c 2011-04-17 15:56:46.000000000 -0400
73491@@ -24,10 +24,16 @@
73492 #include <linux/mmu_notifier.h>
73493 #include <linux/migrate.h>
73494 #include <linux/perf_event.h>
73495+
73496+#ifdef CONFIG_PAX_MPROTECT
73497+#include <linux/elf.h>
73498+#endif
73499+
73500 #include <asm/uaccess.h>
73501 #include <asm/pgtable.h>
73502 #include <asm/cacheflush.h>
73503 #include <asm/tlbflush.h>
73504+#include <asm/mmu_context.h>
73505
73506 #ifndef pgprot_modify
73507 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
73508@@ -132,6 +138,48 @@ static void change_protection(struct vm_
73509 flush_tlb_range(vma, start, end);
73510 }
73511
73512+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73513+/* called while holding the mmap semaphor for writing except stack expansion */
73514+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
73515+{
73516+ unsigned long oldlimit, newlimit = 0UL;
73517+
73518+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || nx_enabled)
73519+ return;
73520+
73521+ spin_lock(&mm->page_table_lock);
73522+ oldlimit = mm->context.user_cs_limit;
73523+ if ((prot & VM_EXEC) && oldlimit < end)
73524+ /* USER_CS limit moved up */
73525+ newlimit = end;
73526+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
73527+ /* USER_CS limit moved down */
73528+ newlimit = start;
73529+
73530+ if (newlimit) {
73531+ mm->context.user_cs_limit = newlimit;
73532+
73533+#ifdef CONFIG_SMP
73534+ wmb();
73535+ cpus_clear(mm->context.cpu_user_cs_mask);
73536+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
73537+#endif
73538+
73539+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
73540+ }
73541+ spin_unlock(&mm->page_table_lock);
73542+ if (newlimit == end) {
73543+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
73544+
73545+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
73546+ if (is_vm_hugetlb_page(vma))
73547+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
73548+ else
73549+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
73550+ }
73551+}
73552+#endif
73553+
73554 int
73555 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73556 unsigned long start, unsigned long end, unsigned long newflags)
73557@@ -144,11 +192,29 @@ mprotect_fixup(struct vm_area_struct *vm
73558 int error;
73559 int dirty_accountable = 0;
73560
73561+#ifdef CONFIG_PAX_SEGMEXEC
73562+ struct vm_area_struct *vma_m = NULL;
73563+ unsigned long start_m, end_m;
73564+
73565+ start_m = start + SEGMEXEC_TASK_SIZE;
73566+ end_m = end + SEGMEXEC_TASK_SIZE;
73567+#endif
73568+
73569 if (newflags == oldflags) {
73570 *pprev = vma;
73571 return 0;
73572 }
73573
73574+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
73575+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
73576+
73577+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
73578+ return -ENOMEM;
73579+
73580+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
73581+ return -ENOMEM;
73582+ }
73583+
73584 /*
73585 * If we make a private mapping writable we increase our commit;
73586 * but (without finer accounting) cannot reduce our commit if we
73587@@ -165,6 +231,38 @@ mprotect_fixup(struct vm_area_struct *vm
73588 }
73589 }
73590
73591+#ifdef CONFIG_PAX_SEGMEXEC
73592+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
73593+ if (start != vma->vm_start) {
73594+ error = split_vma(mm, vma, start, 1);
73595+ if (error)
73596+ goto fail;
73597+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
73598+ *pprev = (*pprev)->vm_next;
73599+ }
73600+
73601+ if (end != vma->vm_end) {
73602+ error = split_vma(mm, vma, end, 0);
73603+ if (error)
73604+ goto fail;
73605+ }
73606+
73607+ if (pax_find_mirror_vma(vma)) {
73608+ error = __do_munmap(mm, start_m, end_m - start_m);
73609+ if (error)
73610+ goto fail;
73611+ } else {
73612+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73613+ if (!vma_m) {
73614+ error = -ENOMEM;
73615+ goto fail;
73616+ }
73617+ vma->vm_flags = newflags;
73618+ pax_mirror_vma(vma_m, vma);
73619+ }
73620+ }
73621+#endif
73622+
73623 /*
73624 * First try to merge with previous and/or next vma.
73625 */
73626@@ -195,9 +293,21 @@ success:
73627 * vm_flags and vm_page_prot are protected by the mmap_sem
73628 * held in write mode.
73629 */
73630+
73631+#ifdef CONFIG_PAX_SEGMEXEC
73632+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
73633+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
73634+#endif
73635+
73636 vma->vm_flags = newflags;
73637+
73638+#ifdef CONFIG_PAX_MPROTECT
73639+ if (mm->binfmt && mm->binfmt->handle_mprotect)
73640+ mm->binfmt->handle_mprotect(vma, newflags);
73641+#endif
73642+
73643 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
73644- vm_get_page_prot(newflags));
73645+ vm_get_page_prot(vma->vm_flags));
73646
73647 if (vma_wants_writenotify(vma)) {
73648 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
73649@@ -239,6 +349,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
73650 end = start + len;
73651 if (end <= start)
73652 return -ENOMEM;
73653+
73654+#ifdef CONFIG_PAX_SEGMEXEC
73655+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
73656+ if (end > SEGMEXEC_TASK_SIZE)
73657+ return -EINVAL;
73658+ } else
73659+#endif
73660+
73661+ if (end > TASK_SIZE)
73662+ return -EINVAL;
73663+
73664 if (!arch_validate_prot(prot))
73665 return -EINVAL;
73666
73667@@ -246,7 +367,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
73668 /*
73669 * Does the application expect PROT_READ to imply PROT_EXEC:
73670 */
73671- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
73672+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
73673 prot |= PROT_EXEC;
73674
73675 vm_flags = calc_vm_prot_bits(prot);
73676@@ -278,6 +399,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
73677 if (start > vma->vm_start)
73678 prev = vma;
73679
73680+#ifdef CONFIG_PAX_MPROTECT
73681+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
73682+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
73683+#endif
73684+
73685 for (nstart = start ; ; ) {
73686 unsigned long newflags;
73687
73688@@ -287,6 +413,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
73689
73690 /* newflags >> 4 shift VM_MAY% in place of VM_% */
73691 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
73692+ if (prot & (PROT_WRITE | PROT_EXEC))
73693+ gr_log_rwxmprotect(vma->vm_file);
73694+
73695+ error = -EACCES;
73696+ goto out;
73697+ }
73698+
73699+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
73700 error = -EACCES;
73701 goto out;
73702 }
73703@@ -301,6 +435,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
73704 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
73705 if (error)
73706 goto out;
73707+
73708+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
73709+
73710 nstart = tmp;
73711
73712 if (nstart < prev->vm_end)
73713diff -urNp linux-2.6.32.46/mm/mremap.c linux-2.6.32.46/mm/mremap.c
73714--- linux-2.6.32.46/mm/mremap.c 2011-04-17 17:00:52.000000000 -0400
73715+++ linux-2.6.32.46/mm/mremap.c 2011-04-17 17:03:58.000000000 -0400
73716@@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str
73717 continue;
73718 pte = ptep_clear_flush(vma, old_addr, old_pte);
73719 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
73720+
73721+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73722+ if (!nx_enabled && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
73723+ pte = pte_exprotect(pte);
73724+#endif
73725+
73726 set_pte_at(mm, new_addr, new_pte, pte);
73727 }
73728
73729@@ -271,6 +277,11 @@ static struct vm_area_struct *vma_to_res
73730 if (is_vm_hugetlb_page(vma))
73731 goto Einval;
73732
73733+#ifdef CONFIG_PAX_SEGMEXEC
73734+ if (pax_find_mirror_vma(vma))
73735+ goto Einval;
73736+#endif
73737+
73738 /* We can't remap across vm area boundaries */
73739 if (old_len > vma->vm_end - addr)
73740 goto Efault;
73741@@ -327,20 +338,25 @@ static unsigned long mremap_to(unsigned
73742 unsigned long ret = -EINVAL;
73743 unsigned long charged = 0;
73744 unsigned long map_flags;
73745+ unsigned long pax_task_size = TASK_SIZE;
73746
73747 if (new_addr & ~PAGE_MASK)
73748 goto out;
73749
73750- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
73751+#ifdef CONFIG_PAX_SEGMEXEC
73752+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73753+ pax_task_size = SEGMEXEC_TASK_SIZE;
73754+#endif
73755+
73756+ pax_task_size -= PAGE_SIZE;
73757+
73758+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
73759 goto out;
73760
73761 /* Check if the location we're moving into overlaps the
73762 * old location at all, and fail if it does.
73763 */
73764- if ((new_addr <= addr) && (new_addr+new_len) > addr)
73765- goto out;
73766-
73767- if ((addr <= new_addr) && (addr+old_len) > new_addr)
73768+ if (addr + old_len > new_addr && new_addr + new_len > addr)
73769 goto out;
73770
73771 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73772@@ -412,6 +428,7 @@ unsigned long do_mremap(unsigned long ad
73773 struct vm_area_struct *vma;
73774 unsigned long ret = -EINVAL;
73775 unsigned long charged = 0;
73776+ unsigned long pax_task_size = TASK_SIZE;
73777
73778 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
73779 goto out;
73780@@ -430,6 +447,17 @@ unsigned long do_mremap(unsigned long ad
73781 if (!new_len)
73782 goto out;
73783
73784+#ifdef CONFIG_PAX_SEGMEXEC
73785+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73786+ pax_task_size = SEGMEXEC_TASK_SIZE;
73787+#endif
73788+
73789+ pax_task_size -= PAGE_SIZE;
73790+
73791+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
73792+ old_len > pax_task_size || addr > pax_task_size-old_len)
73793+ goto out;
73794+
73795 if (flags & MREMAP_FIXED) {
73796 if (flags & MREMAP_MAYMOVE)
73797 ret = mremap_to(addr, old_len, new_addr, new_len);
73798@@ -476,6 +504,7 @@ unsigned long do_mremap(unsigned long ad
73799 addr + new_len);
73800 }
73801 ret = addr;
73802+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
73803 goto out;
73804 }
73805 }
73806@@ -502,7 +531,13 @@ unsigned long do_mremap(unsigned long ad
73807 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73808 if (ret)
73809 goto out;
73810+
73811+ map_flags = vma->vm_flags;
73812 ret = move_vma(vma, addr, old_len, new_len, new_addr);
73813+ if (!(ret & ~PAGE_MASK)) {
73814+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
73815+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
73816+ }
73817 }
73818 out:
73819 if (ret & ~PAGE_MASK)
73820diff -urNp linux-2.6.32.46/mm/nommu.c linux-2.6.32.46/mm/nommu.c
73821--- linux-2.6.32.46/mm/nommu.c 2011-03-27 14:31:47.000000000 -0400
73822+++ linux-2.6.32.46/mm/nommu.c 2011-04-17 15:56:46.000000000 -0400
73823@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
73824 int sysctl_overcommit_ratio = 50; /* default is 50% */
73825 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
73826 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
73827-int heap_stack_gap = 0;
73828
73829 atomic_long_t mmap_pages_allocated;
73830
73831@@ -761,15 +760,6 @@ struct vm_area_struct *find_vma(struct m
73832 EXPORT_SYMBOL(find_vma);
73833
73834 /*
73835- * find a VMA
73836- * - we don't extend stack VMAs under NOMMU conditions
73837- */
73838-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
73839-{
73840- return find_vma(mm, addr);
73841-}
73842-
73843-/*
73844 * expand a stack to a given address
73845 * - not supported under NOMMU conditions
73846 */
73847diff -urNp linux-2.6.32.46/mm/page_alloc.c linux-2.6.32.46/mm/page_alloc.c
73848--- linux-2.6.32.46/mm/page_alloc.c 2011-06-25 12:55:35.000000000 -0400
73849+++ linux-2.6.32.46/mm/page_alloc.c 2011-07-09 09:13:08.000000000 -0400
73850@@ -289,7 +289,7 @@ out:
73851 * This usage means that zero-order pages may not be compound.
73852 */
73853
73854-static void free_compound_page(struct page *page)
73855+void free_compound_page(struct page *page)
73856 {
73857 __free_pages_ok(page, compound_order(page));
73858 }
73859@@ -587,6 +587,10 @@ static void __free_pages_ok(struct page
73860 int bad = 0;
73861 int wasMlocked = __TestClearPageMlocked(page);
73862
73863+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73864+ unsigned long index = 1UL << order;
73865+#endif
73866+
73867 kmemcheck_free_shadow(page, order);
73868
73869 for (i = 0 ; i < (1 << order) ; ++i)
73870@@ -599,6 +603,12 @@ static void __free_pages_ok(struct page
73871 debug_check_no_obj_freed(page_address(page),
73872 PAGE_SIZE << order);
73873 }
73874+
73875+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73876+ for (; index; --index)
73877+ sanitize_highpage(page + index - 1);
73878+#endif
73879+
73880 arch_free_page(page, order);
73881 kernel_map_pages(page, 1 << order, 0);
73882
73883@@ -702,8 +712,10 @@ static int prep_new_page(struct page *pa
73884 arch_alloc_page(page, order);
73885 kernel_map_pages(page, 1 << order, 1);
73886
73887+#ifndef CONFIG_PAX_MEMORY_SANITIZE
73888 if (gfp_flags & __GFP_ZERO)
73889 prep_zero_page(page, order, gfp_flags);
73890+#endif
73891
73892 if (order && (gfp_flags & __GFP_COMP))
73893 prep_compound_page(page, order);
73894@@ -1097,6 +1109,11 @@ static void free_hot_cold_page(struct pa
73895 debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
73896 debug_check_no_obj_freed(page_address(page), PAGE_SIZE);
73897 }
73898+
73899+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73900+ sanitize_highpage(page);
73901+#endif
73902+
73903 arch_free_page(page, 0);
73904 kernel_map_pages(page, 1, 0);
73905
73906@@ -2179,6 +2196,8 @@ void show_free_areas(void)
73907 int cpu;
73908 struct zone *zone;
73909
73910+ pax_track_stack();
73911+
73912 for_each_populated_zone(zone) {
73913 show_node(zone);
73914 printk("%s per-cpu:\n", zone->name);
73915@@ -3736,7 +3755,7 @@ static void __init setup_usemap(struct p
73916 zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
73917 }
73918 #else
73919-static void inline setup_usemap(struct pglist_data *pgdat,
73920+static inline void setup_usemap(struct pglist_data *pgdat,
73921 struct zone *zone, unsigned long zonesize) {}
73922 #endif /* CONFIG_SPARSEMEM */
73923
73924diff -urNp linux-2.6.32.46/mm/percpu.c linux-2.6.32.46/mm/percpu.c
73925--- linux-2.6.32.46/mm/percpu.c 2011-03-27 14:31:47.000000000 -0400
73926+++ linux-2.6.32.46/mm/percpu.c 2011-04-17 15:56:46.000000000 -0400
73927@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
73928 static unsigned int pcpu_last_unit_cpu __read_mostly;
73929
73930 /* the address of the first chunk which starts with the kernel static area */
73931-void *pcpu_base_addr __read_mostly;
73932+void *pcpu_base_addr __read_only;
73933 EXPORT_SYMBOL_GPL(pcpu_base_addr);
73934
73935 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
73936diff -urNp linux-2.6.32.46/mm/rmap.c linux-2.6.32.46/mm/rmap.c
73937--- linux-2.6.32.46/mm/rmap.c 2011-03-27 14:31:47.000000000 -0400
73938+++ linux-2.6.32.46/mm/rmap.c 2011-04-17 15:56:46.000000000 -0400
73939@@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
73940 /* page_table_lock to protect against threads */
73941 spin_lock(&mm->page_table_lock);
73942 if (likely(!vma->anon_vma)) {
73943+
73944+#ifdef CONFIG_PAX_SEGMEXEC
73945+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
73946+
73947+ if (vma_m) {
73948+ BUG_ON(vma_m->anon_vma);
73949+ vma_m->anon_vma = anon_vma;
73950+ list_add_tail(&vma_m->anon_vma_node, &anon_vma->head);
73951+ }
73952+#endif
73953+
73954 vma->anon_vma = anon_vma;
73955 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
73956 allocated = NULL;
73957diff -urNp linux-2.6.32.46/mm/shmem.c linux-2.6.32.46/mm/shmem.c
73958--- linux-2.6.32.46/mm/shmem.c 2011-03-27 14:31:47.000000000 -0400
73959+++ linux-2.6.32.46/mm/shmem.c 2011-05-18 20:09:37.000000000 -0400
73960@@ -31,7 +31,7 @@
73961 #include <linux/swap.h>
73962 #include <linux/ima.h>
73963
73964-static struct vfsmount *shm_mnt;
73965+struct vfsmount *shm_mnt;
73966
73967 #ifdef CONFIG_SHMEM
73968 /*
73969@@ -1061,6 +1061,8 @@ static int shmem_writepage(struct page *
73970 goto unlock;
73971 }
73972 entry = shmem_swp_entry(info, index, NULL);
73973+ if (!entry)
73974+ goto unlock;
73975 if (entry->val) {
73976 /*
73977 * The more uptodate page coming down from a stacked
73978@@ -1144,6 +1146,8 @@ static struct page *shmem_swapin(swp_ent
73979 struct vm_area_struct pvma;
73980 struct page *page;
73981
73982+ pax_track_stack();
73983+
73984 spol = mpol_cond_copy(&mpol,
73985 mpol_shared_policy_lookup(&info->policy, idx));
73986
73987@@ -1962,7 +1966,7 @@ static int shmem_symlink(struct inode *d
73988
73989 info = SHMEM_I(inode);
73990 inode->i_size = len-1;
73991- if (len <= (char *)inode - (char *)info) {
73992+ if (len <= (char *)inode - (char *)info && len <= 64) {
73993 /* do it inline */
73994 memcpy(info, symname, len);
73995 inode->i_op = &shmem_symlink_inline_operations;
73996@@ -2310,8 +2314,7 @@ int shmem_fill_super(struct super_block
73997 int err = -ENOMEM;
73998
73999 /* Round up to L1_CACHE_BYTES to resist false sharing */
74000- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
74001- L1_CACHE_BYTES), GFP_KERNEL);
74002+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
74003 if (!sbinfo)
74004 return -ENOMEM;
74005
74006diff -urNp linux-2.6.32.46/mm/slab.c linux-2.6.32.46/mm/slab.c
74007--- linux-2.6.32.46/mm/slab.c 2011-03-27 14:31:47.000000000 -0400
74008+++ linux-2.6.32.46/mm/slab.c 2011-05-04 17:56:20.000000000 -0400
74009@@ -174,7 +174,7 @@
74010
74011 /* Legal flag mask for kmem_cache_create(). */
74012 #if DEBUG
74013-# define CREATE_MASK (SLAB_RED_ZONE | \
74014+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
74015 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
74016 SLAB_CACHE_DMA | \
74017 SLAB_STORE_USER | \
74018@@ -182,7 +182,7 @@
74019 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
74020 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
74021 #else
74022-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
74023+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
74024 SLAB_CACHE_DMA | \
74025 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
74026 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
74027@@ -308,7 +308,7 @@ struct kmem_list3 {
74028 * Need this for bootstrapping a per node allocator.
74029 */
74030 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
74031-struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
74032+struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
74033 #define CACHE_CACHE 0
74034 #define SIZE_AC MAX_NUMNODES
74035 #define SIZE_L3 (2 * MAX_NUMNODES)
74036@@ -409,10 +409,10 @@ static void kmem_list3_init(struct kmem_
74037 if ((x)->max_freeable < i) \
74038 (x)->max_freeable = i; \
74039 } while (0)
74040-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
74041-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
74042-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
74043-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
74044+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
74045+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
74046+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
74047+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
74048 #else
74049 #define STATS_INC_ACTIVE(x) do { } while (0)
74050 #define STATS_DEC_ACTIVE(x) do { } while (0)
74051@@ -558,7 +558,7 @@ static inline void *index_to_obj(struct
74052 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
74053 */
74054 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
74055- const struct slab *slab, void *obj)
74056+ const struct slab *slab, const void *obj)
74057 {
74058 u32 offset = (obj - slab->s_mem);
74059 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
74060@@ -1453,7 +1453,7 @@ void __init kmem_cache_init(void)
74061 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
74062 sizes[INDEX_AC].cs_size,
74063 ARCH_KMALLOC_MINALIGN,
74064- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
74065+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
74066 NULL);
74067
74068 if (INDEX_AC != INDEX_L3) {
74069@@ -1461,7 +1461,7 @@ void __init kmem_cache_init(void)
74070 kmem_cache_create(names[INDEX_L3].name,
74071 sizes[INDEX_L3].cs_size,
74072 ARCH_KMALLOC_MINALIGN,
74073- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
74074+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
74075 NULL);
74076 }
74077
74078@@ -1479,7 +1479,7 @@ void __init kmem_cache_init(void)
74079 sizes->cs_cachep = kmem_cache_create(names->name,
74080 sizes->cs_size,
74081 ARCH_KMALLOC_MINALIGN,
74082- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
74083+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
74084 NULL);
74085 }
74086 #ifdef CONFIG_ZONE_DMA
74087@@ -4211,10 +4211,10 @@ static int s_show(struct seq_file *m, vo
74088 }
74089 /* cpu stats */
74090 {
74091- unsigned long allochit = atomic_read(&cachep->allochit);
74092- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
74093- unsigned long freehit = atomic_read(&cachep->freehit);
74094- unsigned long freemiss = atomic_read(&cachep->freemiss);
74095+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
74096+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
74097+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
74098+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
74099
74100 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
74101 allochit, allocmiss, freehit, freemiss);
74102@@ -4471,15 +4471,66 @@ static const struct file_operations proc
74103
74104 static int __init slab_proc_init(void)
74105 {
74106- proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
74107+ mode_t gr_mode = S_IRUGO;
74108+
74109+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74110+ gr_mode = S_IRUSR;
74111+#endif
74112+
74113+ proc_create("slabinfo",S_IWUSR|gr_mode,NULL,&proc_slabinfo_operations);
74114 #ifdef CONFIG_DEBUG_SLAB_LEAK
74115- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
74116+ proc_create("slab_allocators", gr_mode, NULL, &proc_slabstats_operations);
74117 #endif
74118 return 0;
74119 }
74120 module_init(slab_proc_init);
74121 #endif
74122
74123+void check_object_size(const void *ptr, unsigned long n, bool to)
74124+{
74125+
74126+#ifdef CONFIG_PAX_USERCOPY
74127+ struct page *page;
74128+ struct kmem_cache *cachep = NULL;
74129+ struct slab *slabp;
74130+ unsigned int objnr;
74131+ unsigned long offset;
74132+
74133+ if (!n)
74134+ return;
74135+
74136+ if (ZERO_OR_NULL_PTR(ptr))
74137+ goto report;
74138+
74139+ if (!virt_addr_valid(ptr))
74140+ return;
74141+
74142+ page = virt_to_head_page(ptr);
74143+
74144+ if (!PageSlab(page)) {
74145+ if (object_is_on_stack(ptr, n) == -1)
74146+ goto report;
74147+ return;
74148+ }
74149+
74150+ cachep = page_get_cache(page);
74151+ if (!(cachep->flags & SLAB_USERCOPY))
74152+ goto report;
74153+
74154+ slabp = page_get_slab(page);
74155+ objnr = obj_to_index(cachep, slabp, ptr);
74156+ BUG_ON(objnr >= cachep->num);
74157+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
74158+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
74159+ return;
74160+
74161+report:
74162+ pax_report_usercopy(ptr, n, to, cachep ? cachep->name : NULL);
74163+#endif
74164+
74165+}
74166+EXPORT_SYMBOL(check_object_size);
74167+
74168 /**
74169 * ksize - get the actual amount of memory allocated for a given object
74170 * @objp: Pointer to the object
74171diff -urNp linux-2.6.32.46/mm/slob.c linux-2.6.32.46/mm/slob.c
74172--- linux-2.6.32.46/mm/slob.c 2011-03-27 14:31:47.000000000 -0400
74173+++ linux-2.6.32.46/mm/slob.c 2011-07-06 19:53:33.000000000 -0400
74174@@ -29,7 +29,7 @@
74175 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
74176 * alloc_pages() directly, allocating compound pages so the page order
74177 * does not have to be separately tracked, and also stores the exact
74178- * allocation size in page->private so that it can be used to accurately
74179+ * allocation size in slob_page->size so that it can be used to accurately
74180 * provide ksize(). These objects are detected in kfree() because slob_page()
74181 * is false for them.
74182 *
74183@@ -58,6 +58,7 @@
74184 */
74185
74186 #include <linux/kernel.h>
74187+#include <linux/sched.h>
74188 #include <linux/slab.h>
74189 #include <linux/mm.h>
74190 #include <linux/swap.h> /* struct reclaim_state */
74191@@ -100,7 +101,8 @@ struct slob_page {
74192 unsigned long flags; /* mandatory */
74193 atomic_t _count; /* mandatory */
74194 slobidx_t units; /* free units left in page */
74195- unsigned long pad[2];
74196+ unsigned long pad[1];
74197+ unsigned long size; /* size when >=PAGE_SIZE */
74198 slob_t *free; /* first free slob_t in page */
74199 struct list_head list; /* linked list of free pages */
74200 };
74201@@ -133,7 +135,7 @@ static LIST_HEAD(free_slob_large);
74202 */
74203 static inline int is_slob_page(struct slob_page *sp)
74204 {
74205- return PageSlab((struct page *)sp);
74206+ return PageSlab((struct page *)sp) && !sp->size;
74207 }
74208
74209 static inline void set_slob_page(struct slob_page *sp)
74210@@ -148,7 +150,7 @@ static inline void clear_slob_page(struc
74211
74212 static inline struct slob_page *slob_page(const void *addr)
74213 {
74214- return (struct slob_page *)virt_to_page(addr);
74215+ return (struct slob_page *)virt_to_head_page(addr);
74216 }
74217
74218 /*
74219@@ -208,7 +210,7 @@ static void set_slob(slob_t *s, slobidx_
74220 /*
74221 * Return the size of a slob block.
74222 */
74223-static slobidx_t slob_units(slob_t *s)
74224+static slobidx_t slob_units(const slob_t *s)
74225 {
74226 if (s->units > 0)
74227 return s->units;
74228@@ -218,7 +220,7 @@ static slobidx_t slob_units(slob_t *s)
74229 /*
74230 * Return the next free slob block pointer after this one.
74231 */
74232-static slob_t *slob_next(slob_t *s)
74233+static slob_t *slob_next(const slob_t *s)
74234 {
74235 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
74236 slobidx_t next;
74237@@ -233,7 +235,7 @@ static slob_t *slob_next(slob_t *s)
74238 /*
74239 * Returns true if s is the last free block in its page.
74240 */
74241-static int slob_last(slob_t *s)
74242+static int slob_last(const slob_t *s)
74243 {
74244 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
74245 }
74246@@ -252,6 +254,7 @@ static void *slob_new_pages(gfp_t gfp, i
74247 if (!page)
74248 return NULL;
74249
74250+ set_slob_page(page);
74251 return page_address(page);
74252 }
74253
74254@@ -368,11 +371,11 @@ static void *slob_alloc(size_t size, gfp
74255 if (!b)
74256 return NULL;
74257 sp = slob_page(b);
74258- set_slob_page(sp);
74259
74260 spin_lock_irqsave(&slob_lock, flags);
74261 sp->units = SLOB_UNITS(PAGE_SIZE);
74262 sp->free = b;
74263+ sp->size = 0;
74264 INIT_LIST_HEAD(&sp->list);
74265 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
74266 set_slob_page_free(sp, slob_list);
74267@@ -475,10 +478,9 @@ out:
74268 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
74269 #endif
74270
74271-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74272+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
74273 {
74274- unsigned int *m;
74275- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74276+ slob_t *m;
74277 void *ret;
74278
74279 lockdep_trace_alloc(gfp);
74280@@ -491,7 +493,10 @@ void *__kmalloc_node(size_t size, gfp_t
74281
74282 if (!m)
74283 return NULL;
74284- *m = size;
74285+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
74286+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
74287+ m[0].units = size;
74288+ m[1].units = align;
74289 ret = (void *)m + align;
74290
74291 trace_kmalloc_node(_RET_IP_, ret,
74292@@ -501,16 +506,25 @@ void *__kmalloc_node(size_t size, gfp_t
74293
74294 ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
74295 if (ret) {
74296- struct page *page;
74297- page = virt_to_page(ret);
74298- page->private = size;
74299+ struct slob_page *sp;
74300+ sp = slob_page(ret);
74301+ sp->size = size;
74302 }
74303
74304 trace_kmalloc_node(_RET_IP_, ret,
74305 size, PAGE_SIZE << order, gfp, node);
74306 }
74307
74308- kmemleak_alloc(ret, size, 1, gfp);
74309+ return ret;
74310+}
74311+
74312+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74313+{
74314+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74315+ void *ret = __kmalloc_node_align(size, gfp, node, align);
74316+
74317+ if (!ZERO_OR_NULL_PTR(ret))
74318+ kmemleak_alloc(ret, size, 1, gfp);
74319 return ret;
74320 }
74321 EXPORT_SYMBOL(__kmalloc_node);
74322@@ -528,13 +542,88 @@ void kfree(const void *block)
74323 sp = slob_page(block);
74324 if (is_slob_page(sp)) {
74325 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74326- unsigned int *m = (unsigned int *)(block - align);
74327- slob_free(m, *m + align);
74328- } else
74329+ slob_t *m = (slob_t *)(block - align);
74330+ slob_free(m, m[0].units + align);
74331+ } else {
74332+ clear_slob_page(sp);
74333+ free_slob_page(sp);
74334+ sp->size = 0;
74335 put_page(&sp->page);
74336+ }
74337 }
74338 EXPORT_SYMBOL(kfree);
74339
74340+void check_object_size(const void *ptr, unsigned long n, bool to)
74341+{
74342+
74343+#ifdef CONFIG_PAX_USERCOPY
74344+ struct slob_page *sp;
74345+ const slob_t *free;
74346+ const void *base;
74347+ unsigned long flags;
74348+
74349+ if (!n)
74350+ return;
74351+
74352+ if (ZERO_OR_NULL_PTR(ptr))
74353+ goto report;
74354+
74355+ if (!virt_addr_valid(ptr))
74356+ return;
74357+
74358+ sp = slob_page(ptr);
74359+ if (!PageSlab((struct page*)sp)) {
74360+ if (object_is_on_stack(ptr, n) == -1)
74361+ goto report;
74362+ return;
74363+ }
74364+
74365+ if (sp->size) {
74366+ base = page_address(&sp->page);
74367+ if (base <= ptr && n <= sp->size - (ptr - base))
74368+ return;
74369+ goto report;
74370+ }
74371+
74372+ /* some tricky double walking to find the chunk */
74373+ spin_lock_irqsave(&slob_lock, flags);
74374+ base = (void *)((unsigned long)ptr & PAGE_MASK);
74375+ free = sp->free;
74376+
74377+ while (!slob_last(free) && (void *)free <= ptr) {
74378+ base = free + slob_units(free);
74379+ free = slob_next(free);
74380+ }
74381+
74382+ while (base < (void *)free) {
74383+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
74384+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
74385+ int offset;
74386+
74387+ if (ptr < base + align)
74388+ break;
74389+
74390+ offset = ptr - base - align;
74391+ if (offset >= m) {
74392+ base += size;
74393+ continue;
74394+ }
74395+
74396+ if (n > m - offset)
74397+ break;
74398+
74399+ spin_unlock_irqrestore(&slob_lock, flags);
74400+ return;
74401+ }
74402+
74403+ spin_unlock_irqrestore(&slob_lock, flags);
74404+report:
74405+ pax_report_usercopy(ptr, n, to, NULL);
74406+#endif
74407+
74408+}
74409+EXPORT_SYMBOL(check_object_size);
74410+
74411 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
74412 size_t ksize(const void *block)
74413 {
74414@@ -547,10 +636,10 @@ size_t ksize(const void *block)
74415 sp = slob_page(block);
74416 if (is_slob_page(sp)) {
74417 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74418- unsigned int *m = (unsigned int *)(block - align);
74419- return SLOB_UNITS(*m) * SLOB_UNIT;
74420+ slob_t *m = (slob_t *)(block - align);
74421+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
74422 } else
74423- return sp->page.private;
74424+ return sp->size;
74425 }
74426 EXPORT_SYMBOL(ksize);
74427
74428@@ -566,8 +655,13 @@ struct kmem_cache *kmem_cache_create(con
74429 {
74430 struct kmem_cache *c;
74431
74432+#ifdef CONFIG_PAX_USERCOPY
74433+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
74434+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
74435+#else
74436 c = slob_alloc(sizeof(struct kmem_cache),
74437 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
74438+#endif
74439
74440 if (c) {
74441 c->name = name;
74442@@ -605,17 +699,25 @@ void *kmem_cache_alloc_node(struct kmem_
74443 {
74444 void *b;
74445
74446+#ifdef CONFIG_PAX_USERCOPY
74447+ b = __kmalloc_node_align(c->size, flags, node, c->align);
74448+#else
74449 if (c->size < PAGE_SIZE) {
74450 b = slob_alloc(c->size, flags, c->align, node);
74451 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74452 SLOB_UNITS(c->size) * SLOB_UNIT,
74453 flags, node);
74454 } else {
74455+ struct slob_page *sp;
74456+
74457 b = slob_new_pages(flags, get_order(c->size), node);
74458+ sp = slob_page(b);
74459+ sp->size = c->size;
74460 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74461 PAGE_SIZE << get_order(c->size),
74462 flags, node);
74463 }
74464+#endif
74465
74466 if (c->ctor)
74467 c->ctor(b);
74468@@ -627,10 +729,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
74469
74470 static void __kmem_cache_free(void *b, int size)
74471 {
74472- if (size < PAGE_SIZE)
74473+ struct slob_page *sp = slob_page(b);
74474+
74475+ if (is_slob_page(sp))
74476 slob_free(b, size);
74477- else
74478+ else {
74479+ clear_slob_page(sp);
74480+ free_slob_page(sp);
74481+ sp->size = 0;
74482 slob_free_pages(b, get_order(size));
74483+ }
74484 }
74485
74486 static void kmem_rcu_free(struct rcu_head *head)
74487@@ -643,18 +751,32 @@ static void kmem_rcu_free(struct rcu_hea
74488
74489 void kmem_cache_free(struct kmem_cache *c, void *b)
74490 {
74491+ int size = c->size;
74492+
74493+#ifdef CONFIG_PAX_USERCOPY
74494+ if (size + c->align < PAGE_SIZE) {
74495+ size += c->align;
74496+ b -= c->align;
74497+ }
74498+#endif
74499+
74500 kmemleak_free_recursive(b, c->flags);
74501 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
74502 struct slob_rcu *slob_rcu;
74503- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
74504+ slob_rcu = b + (size - sizeof(struct slob_rcu));
74505 INIT_RCU_HEAD(&slob_rcu->head);
74506- slob_rcu->size = c->size;
74507+ slob_rcu->size = size;
74508 call_rcu(&slob_rcu->head, kmem_rcu_free);
74509 } else {
74510- __kmem_cache_free(b, c->size);
74511+ __kmem_cache_free(b, size);
74512 }
74513
74514+#ifdef CONFIG_PAX_USERCOPY
74515+ trace_kfree(_RET_IP_, b);
74516+#else
74517 trace_kmem_cache_free(_RET_IP_, b);
74518+#endif
74519+
74520 }
74521 EXPORT_SYMBOL(kmem_cache_free);
74522
74523diff -urNp linux-2.6.32.46/mm/slub.c linux-2.6.32.46/mm/slub.c
74524--- linux-2.6.32.46/mm/slub.c 2011-03-27 14:31:47.000000000 -0400
74525+++ linux-2.6.32.46/mm/slub.c 2011-09-25 22:23:01.000000000 -0400
74526@@ -201,7 +201,7 @@ struct track {
74527
74528 enum track_item { TRACK_ALLOC, TRACK_FREE };
74529
74530-#ifdef CONFIG_SLUB_DEBUG
74531+#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74532 static int sysfs_slab_add(struct kmem_cache *);
74533 static int sysfs_slab_alias(struct kmem_cache *, const char *);
74534 static void sysfs_slab_remove(struct kmem_cache *);
74535@@ -410,7 +410,7 @@ static void print_track(const char *s, s
74536 if (!t->addr)
74537 return;
74538
74539- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
74540+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
74541 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
74542 }
74543
74544@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
74545
74546 page = virt_to_head_page(x);
74547
74548+ BUG_ON(!PageSlab(page));
74549+
74550 slab_free(s, page, x, _RET_IP_);
74551
74552 trace_kmem_cache_free(_RET_IP_, x);
74553@@ -1937,7 +1939,7 @@ static int slub_min_objects;
74554 * Merge control. If this is set then no merging of slab caches will occur.
74555 * (Could be removed. This was introduced to pacify the merge skeptics.)
74556 */
74557-static int slub_nomerge;
74558+static int slub_nomerge = 1;
74559
74560 /*
74561 * Calculate the order of allocation given an slab object size.
74562@@ -2493,7 +2495,7 @@ static int kmem_cache_open(struct kmem_c
74563 * list to avoid pounding the page allocator excessively.
74564 */
74565 set_min_partial(s, ilog2(s->size));
74566- s->refcount = 1;
74567+ atomic_set(&s->refcount, 1);
74568 #ifdef CONFIG_NUMA
74569 s->remote_node_defrag_ratio = 1000;
74570 #endif
74571@@ -2630,8 +2632,7 @@ static inline int kmem_cache_close(struc
74572 void kmem_cache_destroy(struct kmem_cache *s)
74573 {
74574 down_write(&slub_lock);
74575- s->refcount--;
74576- if (!s->refcount) {
74577+ if (atomic_dec_and_test(&s->refcount)) {
74578 list_del(&s->list);
74579 up_write(&slub_lock);
74580 if (kmem_cache_close(s)) {
74581@@ -2691,12 +2692,10 @@ static int __init setup_slub_nomerge(cha
74582 __setup("slub_nomerge", setup_slub_nomerge);
74583
74584 static struct kmem_cache *create_kmalloc_cache(struct kmem_cache *s,
74585- const char *name, int size, gfp_t gfp_flags)
74586+ const char *name, int size, gfp_t gfp_flags, unsigned int flags)
74587 {
74588- unsigned int flags = 0;
74589-
74590 if (gfp_flags & SLUB_DMA)
74591- flags = SLAB_CACHE_DMA;
74592+ flags |= SLAB_CACHE_DMA;
74593
74594 /*
74595 * This function is called with IRQs disabled during early-boot on
74596@@ -2915,6 +2914,46 @@ void *__kmalloc_node(size_t size, gfp_t
74597 EXPORT_SYMBOL(__kmalloc_node);
74598 #endif
74599
74600+void check_object_size(const void *ptr, unsigned long n, bool to)
74601+{
74602+
74603+#ifdef CONFIG_PAX_USERCOPY
74604+ struct page *page;
74605+ struct kmem_cache *s = NULL;
74606+ unsigned long offset;
74607+
74608+ if (!n)
74609+ return;
74610+
74611+ if (ZERO_OR_NULL_PTR(ptr))
74612+ goto report;
74613+
74614+ if (!virt_addr_valid(ptr))
74615+ return;
74616+
74617+ page = get_object_page(ptr);
74618+
74619+ if (!page) {
74620+ if (object_is_on_stack(ptr, n) == -1)
74621+ goto report;
74622+ return;
74623+ }
74624+
74625+ s = page->slab;
74626+ if (!(s->flags & SLAB_USERCOPY))
74627+ goto report;
74628+
74629+ offset = (ptr - page_address(page)) % s->size;
74630+ if (offset <= s->objsize && n <= s->objsize - offset)
74631+ return;
74632+
74633+report:
74634+ pax_report_usercopy(ptr, n, to, s ? s->name : NULL);
74635+#endif
74636+
74637+}
74638+EXPORT_SYMBOL(check_object_size);
74639+
74640 size_t ksize(const void *object)
74641 {
74642 struct page *page;
74643@@ -3185,8 +3224,8 @@ void __init kmem_cache_init(void)
74644 * kmem_cache_open for slab_state == DOWN.
74645 */
74646 create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node",
74647- sizeof(struct kmem_cache_node), GFP_NOWAIT);
74648- kmalloc_caches[0].refcount = -1;
74649+ sizeof(struct kmem_cache_node), GFP_NOWAIT, 0);
74650+ atomic_set(&kmalloc_caches[0].refcount, -1);
74651 caches++;
74652
74653 hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
74654@@ -3198,18 +3237,18 @@ void __init kmem_cache_init(void)
74655 /* Caches that are not of the two-to-the-power-of size */
74656 if (KMALLOC_MIN_SIZE <= 32) {
74657 create_kmalloc_cache(&kmalloc_caches[1],
74658- "kmalloc-96", 96, GFP_NOWAIT);
74659+ "kmalloc-96", 96, GFP_NOWAIT, SLAB_USERCOPY);
74660 caches++;
74661 }
74662 if (KMALLOC_MIN_SIZE <= 64) {
74663 create_kmalloc_cache(&kmalloc_caches[2],
74664- "kmalloc-192", 192, GFP_NOWAIT);
74665+ "kmalloc-192", 192, GFP_NOWAIT, SLAB_USERCOPY);
74666 caches++;
74667 }
74668
74669 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
74670 create_kmalloc_cache(&kmalloc_caches[i],
74671- "kmalloc", 1 << i, GFP_NOWAIT);
74672+ "kmalloc", 1 << i, GFP_NOWAIT, SLAB_USERCOPY);
74673 caches++;
74674 }
74675
74676@@ -3293,7 +3332,7 @@ static int slab_unmergeable(struct kmem_
74677 /*
74678 * We may have set a slab to be unmergeable during bootstrap.
74679 */
74680- if (s->refcount < 0)
74681+ if (atomic_read(&s->refcount) < 0)
74682 return 1;
74683
74684 return 0;
74685@@ -3353,7 +3392,7 @@ struct kmem_cache *kmem_cache_create(con
74686 if (s) {
74687 int cpu;
74688
74689- s->refcount++;
74690+ atomic_inc(&s->refcount);
74691 /*
74692 * Adjust the object sizes so that we clear
74693 * the complete object on kzalloc.
74694@@ -3372,7 +3411,7 @@ struct kmem_cache *kmem_cache_create(con
74695
74696 if (sysfs_slab_alias(s, name)) {
74697 down_write(&slub_lock);
74698- s->refcount--;
74699+ atomic_dec(&s->refcount);
74700 up_write(&slub_lock);
74701 goto err;
74702 }
74703@@ -4101,7 +4140,7 @@ SLAB_ATTR_RO(ctor);
74704
74705 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
74706 {
74707- return sprintf(buf, "%d\n", s->refcount - 1);
74708+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
74709 }
74710 SLAB_ATTR_RO(aliases);
74711
74712@@ -4503,7 +4542,7 @@ static void kmem_cache_release(struct ko
74713 kfree(s);
74714 }
74715
74716-static struct sysfs_ops slab_sysfs_ops = {
74717+static const struct sysfs_ops slab_sysfs_ops = {
74718 .show = slab_attr_show,
74719 .store = slab_attr_store,
74720 };
74721@@ -4522,7 +4561,7 @@ static int uevent_filter(struct kset *ks
74722 return 0;
74723 }
74724
74725-static struct kset_uevent_ops slab_uevent_ops = {
74726+static const struct kset_uevent_ops slab_uevent_ops = {
74727 .filter = uevent_filter,
74728 };
74729
74730@@ -4564,6 +4603,7 @@ static char *create_unique_id(struct kme
74731 return name;
74732 }
74733
74734+#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74735 static int sysfs_slab_add(struct kmem_cache *s)
74736 {
74737 int err;
74738@@ -4619,6 +4659,7 @@ static void sysfs_slab_remove(struct kme
74739 kobject_del(&s->kobj);
74740 kobject_put(&s->kobj);
74741 }
74742+#endif
74743
74744 /*
74745 * Need to buffer aliases during bootup until sysfs becomes
74746@@ -4632,6 +4673,7 @@ struct saved_alias {
74747
74748 static struct saved_alias *alias_list;
74749
74750+#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74751 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74752 {
74753 struct saved_alias *al;
74754@@ -4654,6 +4696,7 @@ static int sysfs_slab_alias(struct kmem_
74755 alias_list = al;
74756 return 0;
74757 }
74758+#endif
74759
74760 static int __init slab_sysfs_init(void)
74761 {
74762@@ -4785,7 +4828,13 @@ static const struct file_operations proc
74763
74764 static int __init slab_proc_init(void)
74765 {
74766- proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations);
74767+ mode_t gr_mode = S_IRUGO;
74768+
74769+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74770+ gr_mode = S_IRUSR;
74771+#endif
74772+
74773+ proc_create("slabinfo", gr_mode, NULL, &proc_slabinfo_operations);
74774 return 0;
74775 }
74776 module_init(slab_proc_init);
74777diff -urNp linux-2.6.32.46/mm/swap.c linux-2.6.32.46/mm/swap.c
74778--- linux-2.6.32.46/mm/swap.c 2011-03-27 14:31:47.000000000 -0400
74779+++ linux-2.6.32.46/mm/swap.c 2011-07-09 09:15:19.000000000 -0400
74780@@ -30,6 +30,7 @@
74781 #include <linux/notifier.h>
74782 #include <linux/backing-dev.h>
74783 #include <linux/memcontrol.h>
74784+#include <linux/hugetlb.h>
74785
74786 #include "internal.h"
74787
74788@@ -65,6 +66,8 @@ static void put_compound_page(struct pag
74789 compound_page_dtor *dtor;
74790
74791 dtor = get_compound_page_dtor(page);
74792+ if (!PageHuge(page))
74793+ BUG_ON(dtor != free_compound_page);
74794 (*dtor)(page);
74795 }
74796 }
74797diff -urNp linux-2.6.32.46/mm/util.c linux-2.6.32.46/mm/util.c
74798--- linux-2.6.32.46/mm/util.c 2011-03-27 14:31:47.000000000 -0400
74799+++ linux-2.6.32.46/mm/util.c 2011-04-17 15:56:46.000000000 -0400
74800@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
74801 void arch_pick_mmap_layout(struct mm_struct *mm)
74802 {
74803 mm->mmap_base = TASK_UNMAPPED_BASE;
74804+
74805+#ifdef CONFIG_PAX_RANDMMAP
74806+ if (mm->pax_flags & MF_PAX_RANDMMAP)
74807+ mm->mmap_base += mm->delta_mmap;
74808+#endif
74809+
74810 mm->get_unmapped_area = arch_get_unmapped_area;
74811 mm->unmap_area = arch_unmap_area;
74812 }
74813diff -urNp linux-2.6.32.46/mm/vmalloc.c linux-2.6.32.46/mm/vmalloc.c
74814--- linux-2.6.32.46/mm/vmalloc.c 2011-08-29 22:24:44.000000000 -0400
74815+++ linux-2.6.32.46/mm/vmalloc.c 2011-08-29 22:25:07.000000000 -0400
74816@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
74817
74818 pte = pte_offset_kernel(pmd, addr);
74819 do {
74820- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74821- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74822+
74823+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74824+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
74825+ BUG_ON(!pte_exec(*pte));
74826+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
74827+ continue;
74828+ }
74829+#endif
74830+
74831+ {
74832+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74833+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74834+ }
74835 } while (pte++, addr += PAGE_SIZE, addr != end);
74836 }
74837
74838@@ -92,6 +103,7 @@ static int vmap_pte_range(pmd_t *pmd, un
74839 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
74840 {
74841 pte_t *pte;
74842+ int ret = -ENOMEM;
74843
74844 /*
74845 * nr is a running index into the array which helps higher level
74846@@ -101,17 +113,32 @@ static int vmap_pte_range(pmd_t *pmd, un
74847 pte = pte_alloc_kernel(pmd, addr);
74848 if (!pte)
74849 return -ENOMEM;
74850+
74851+ pax_open_kernel();
74852 do {
74853 struct page *page = pages[*nr];
74854
74855- if (WARN_ON(!pte_none(*pte)))
74856- return -EBUSY;
74857- if (WARN_ON(!page))
74858- return -ENOMEM;
74859+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74860+ if (!(pgprot_val(prot) & _PAGE_NX))
74861+ BUG_ON(!pte_exec(*pte) || pte_pfn(*pte) != __pa(addr) >> PAGE_SHIFT);
74862+ else
74863+#endif
74864+
74865+ if (WARN_ON(!pte_none(*pte))) {
74866+ ret = -EBUSY;
74867+ goto out;
74868+ }
74869+ if (WARN_ON(!page)) {
74870+ ret = -ENOMEM;
74871+ goto out;
74872+ }
74873 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
74874 (*nr)++;
74875 } while (pte++, addr += PAGE_SIZE, addr != end);
74876- return 0;
74877+ ret = 0;
74878+out:
74879+ pax_close_kernel();
74880+ return ret;
74881 }
74882
74883 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74884@@ -192,11 +219,20 @@ int is_vmalloc_or_module_addr(const void
74885 * and fall back on vmalloc() if that fails. Others
74886 * just put it in the vmalloc space.
74887 */
74888-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
74889+#ifdef CONFIG_MODULES
74890+#ifdef MODULES_VADDR
74891 unsigned long addr = (unsigned long)x;
74892 if (addr >= MODULES_VADDR && addr < MODULES_END)
74893 return 1;
74894 #endif
74895+
74896+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74897+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
74898+ return 1;
74899+#endif
74900+
74901+#endif
74902+
74903 return is_vmalloc_addr(x);
74904 }
74905
74906@@ -217,8 +253,14 @@ struct page *vmalloc_to_page(const void
74907
74908 if (!pgd_none(*pgd)) {
74909 pud_t *pud = pud_offset(pgd, addr);
74910+#ifdef CONFIG_X86
74911+ if (!pud_large(*pud))
74912+#endif
74913 if (!pud_none(*pud)) {
74914 pmd_t *pmd = pmd_offset(pud, addr);
74915+#ifdef CONFIG_X86
74916+ if (!pmd_large(*pmd))
74917+#endif
74918 if (!pmd_none(*pmd)) {
74919 pte_t *ptep, pte;
74920
74921@@ -292,13 +334,13 @@ static void __insert_vmap_area(struct vm
74922 struct rb_node *tmp;
74923
74924 while (*p) {
74925- struct vmap_area *tmp;
74926+ struct vmap_area *varea;
74927
74928 parent = *p;
74929- tmp = rb_entry(parent, struct vmap_area, rb_node);
74930- if (va->va_start < tmp->va_end)
74931+ varea = rb_entry(parent, struct vmap_area, rb_node);
74932+ if (va->va_start < varea->va_end)
74933 p = &(*p)->rb_left;
74934- else if (va->va_end > tmp->va_start)
74935+ else if (va->va_end > varea->va_start)
74936 p = &(*p)->rb_right;
74937 else
74938 BUG();
74939@@ -1233,6 +1275,16 @@ static struct vm_struct *__get_vm_area_n
74940 struct vm_struct *area;
74941
74942 BUG_ON(in_interrupt());
74943+
74944+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74945+ if (flags & VM_KERNEXEC) {
74946+ if (start != VMALLOC_START || end != VMALLOC_END)
74947+ return NULL;
74948+ start = (unsigned long)MODULES_EXEC_VADDR;
74949+ end = (unsigned long)MODULES_EXEC_END;
74950+ }
74951+#endif
74952+
74953 if (flags & VM_IOREMAP) {
74954 int bit = fls(size);
74955
74956@@ -1458,6 +1510,11 @@ void *vmap(struct page **pages, unsigned
74957 if (count > totalram_pages)
74958 return NULL;
74959
74960+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74961+ if (!(pgprot_val(prot) & _PAGE_NX))
74962+ flags |= VM_KERNEXEC;
74963+#endif
74964+
74965 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
74966 __builtin_return_address(0));
74967 if (!area)
74968@@ -1568,6 +1625,13 @@ static void *__vmalloc_node(unsigned lon
74969 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
74970 return NULL;
74971
74972+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74973+ if (!(pgprot_val(prot) & _PAGE_NX))
74974+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_KERNEXEC, VMALLOC_START, VMALLOC_END,
74975+ node, gfp_mask, caller);
74976+ else
74977+#endif
74978+
74979 area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START,
74980 VMALLOC_END, node, gfp_mask, caller);
74981
74982@@ -1586,6 +1650,7 @@ static void *__vmalloc_node(unsigned lon
74983 return addr;
74984 }
74985
74986+#undef __vmalloc
74987 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
74988 {
74989 return __vmalloc_node(size, 1, gfp_mask, prot, -1,
74990@@ -1602,6 +1667,7 @@ EXPORT_SYMBOL(__vmalloc);
74991 * For tight control over page level allocator and protection flags
74992 * use __vmalloc() instead.
74993 */
74994+#undef vmalloc
74995 void *vmalloc(unsigned long size)
74996 {
74997 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
74998@@ -1616,6 +1682,7 @@ EXPORT_SYMBOL(vmalloc);
74999 * The resulting memory area is zeroed so it can be mapped to userspace
75000 * without leaking data.
75001 */
75002+#undef vmalloc_user
75003 void *vmalloc_user(unsigned long size)
75004 {
75005 struct vm_struct *area;
75006@@ -1643,6 +1710,7 @@ EXPORT_SYMBOL(vmalloc_user);
75007 * For tight control over page level allocator and protection flags
75008 * use __vmalloc() instead.
75009 */
75010+#undef vmalloc_node
75011 void *vmalloc_node(unsigned long size, int node)
75012 {
75013 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
75014@@ -1665,10 +1733,10 @@ EXPORT_SYMBOL(vmalloc_node);
75015 * For tight control over page level allocator and protection flags
75016 * use __vmalloc() instead.
75017 */
75018-
75019+#undef vmalloc_exec
75020 void *vmalloc_exec(unsigned long size)
75021 {
75022- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
75023+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
75024 -1, __builtin_return_address(0));
75025 }
75026
75027@@ -1687,6 +1755,7 @@ void *vmalloc_exec(unsigned long size)
75028 * Allocate enough 32bit PA addressable pages to cover @size from the
75029 * page level allocator and map them into contiguous kernel virtual space.
75030 */
75031+#undef vmalloc_32
75032 void *vmalloc_32(unsigned long size)
75033 {
75034 return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
75035@@ -1701,6 +1770,7 @@ EXPORT_SYMBOL(vmalloc_32);
75036 * The resulting memory area is 32bit addressable and zeroed so it can be
75037 * mapped to userspace without leaking data.
75038 */
75039+#undef vmalloc_32_user
75040 void *vmalloc_32_user(unsigned long size)
75041 {
75042 struct vm_struct *area;
75043@@ -1965,6 +2035,8 @@ int remap_vmalloc_range(struct vm_area_s
75044 unsigned long uaddr = vma->vm_start;
75045 unsigned long usize = vma->vm_end - vma->vm_start;
75046
75047+ BUG_ON(vma->vm_mirror);
75048+
75049 if ((PAGE_SIZE-1) & (unsigned long)addr)
75050 return -EINVAL;
75051
75052diff -urNp linux-2.6.32.46/mm/vmstat.c linux-2.6.32.46/mm/vmstat.c
75053--- linux-2.6.32.46/mm/vmstat.c 2011-03-27 14:31:47.000000000 -0400
75054+++ linux-2.6.32.46/mm/vmstat.c 2011-04-17 15:56:46.000000000 -0400
75055@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
75056 *
75057 * vm_stat contains the global counters
75058 */
75059-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
75060+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
75061 EXPORT_SYMBOL(vm_stat);
75062
75063 #ifdef CONFIG_SMP
75064@@ -324,7 +324,7 @@ void refresh_cpu_vm_stats(int cpu)
75065 v = p->vm_stat_diff[i];
75066 p->vm_stat_diff[i] = 0;
75067 local_irq_restore(flags);
75068- atomic_long_add(v, &zone->vm_stat[i]);
75069+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
75070 global_diff[i] += v;
75071 #ifdef CONFIG_NUMA
75072 /* 3 seconds idle till flush */
75073@@ -362,7 +362,7 @@ void refresh_cpu_vm_stats(int cpu)
75074
75075 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
75076 if (global_diff[i])
75077- atomic_long_add(global_diff[i], &vm_stat[i]);
75078+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
75079 }
75080
75081 #endif
75082@@ -953,10 +953,20 @@ static int __init setup_vmstat(void)
75083 start_cpu_timer(cpu);
75084 #endif
75085 #ifdef CONFIG_PROC_FS
75086- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
75087- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
75088- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
75089- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
75090+ {
75091+ mode_t gr_mode = S_IRUGO;
75092+#ifdef CONFIG_GRKERNSEC_PROC_ADD
75093+ gr_mode = S_IRUSR;
75094+#endif
75095+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
75096+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
75097+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
75098+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
75099+#else
75100+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
75101+#endif
75102+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
75103+ }
75104 #endif
75105 return 0;
75106 }
75107diff -urNp linux-2.6.32.46/net/8021q/vlan.c linux-2.6.32.46/net/8021q/vlan.c
75108--- linux-2.6.32.46/net/8021q/vlan.c 2011-03-27 14:31:47.000000000 -0400
75109+++ linux-2.6.32.46/net/8021q/vlan.c 2011-04-17 15:56:46.000000000 -0400
75110@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
75111 err = -EPERM;
75112 if (!capable(CAP_NET_ADMIN))
75113 break;
75114- if ((args.u.name_type >= 0) &&
75115- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
75116+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
75117 struct vlan_net *vn;
75118
75119 vn = net_generic(net, vlan_net_id);
75120diff -urNp linux-2.6.32.46/net/9p/trans_fd.c linux-2.6.32.46/net/9p/trans_fd.c
75121--- linux-2.6.32.46/net/9p/trans_fd.c 2011-03-27 14:31:47.000000000 -0400
75122+++ linux-2.6.32.46/net/9p/trans_fd.c 2011-10-06 09:37:14.000000000 -0400
75123@@ -419,7 +419,7 @@ static int p9_fd_write(struct p9_client
75124 oldfs = get_fs();
75125 set_fs(get_ds());
75126 /* The cast to a user pointer is valid due to the set_fs() */
75127- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
75128+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
75129 set_fs(oldfs);
75130
75131 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
75132diff -urNp linux-2.6.32.46/net/atm/atm_misc.c linux-2.6.32.46/net/atm/atm_misc.c
75133--- linux-2.6.32.46/net/atm/atm_misc.c 2011-03-27 14:31:47.000000000 -0400
75134+++ linux-2.6.32.46/net/atm/atm_misc.c 2011-04-17 15:56:46.000000000 -0400
75135@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
75136 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
75137 return 1;
75138 atm_return(vcc,truesize);
75139- atomic_inc(&vcc->stats->rx_drop);
75140+ atomic_inc_unchecked(&vcc->stats->rx_drop);
75141 return 0;
75142 }
75143
75144@@ -41,7 +41,7 @@ struct sk_buff *atm_alloc_charge(struct
75145 }
75146 }
75147 atm_return(vcc,guess);
75148- atomic_inc(&vcc->stats->rx_drop);
75149+ atomic_inc_unchecked(&vcc->stats->rx_drop);
75150 return NULL;
75151 }
75152
75153@@ -88,7 +88,7 @@ int atm_pcr_goal(const struct atm_trafpr
75154
75155 void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats *to)
75156 {
75157-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
75158+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
75159 __SONET_ITEMS
75160 #undef __HANDLE_ITEM
75161 }
75162@@ -96,7 +96,7 @@ void sonet_copy_stats(struct k_sonet_sta
75163
75164 void sonet_subtract_stats(struct k_sonet_stats *from,struct sonet_stats *to)
75165 {
75166-#define __HANDLE_ITEM(i) atomic_sub(to->i,&from->i)
75167+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
75168 __SONET_ITEMS
75169 #undef __HANDLE_ITEM
75170 }
75171diff -urNp linux-2.6.32.46/net/atm/lec.h linux-2.6.32.46/net/atm/lec.h
75172--- linux-2.6.32.46/net/atm/lec.h 2011-03-27 14:31:47.000000000 -0400
75173+++ linux-2.6.32.46/net/atm/lec.h 2011-08-05 20:33:55.000000000 -0400
75174@@ -48,7 +48,7 @@ struct lane2_ops {
75175 const u8 *tlvs, u32 sizeoftlvs);
75176 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
75177 const u8 *tlvs, u32 sizeoftlvs);
75178-};
75179+} __no_const;
75180
75181 /*
75182 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
75183diff -urNp linux-2.6.32.46/net/atm/mpc.h linux-2.6.32.46/net/atm/mpc.h
75184--- linux-2.6.32.46/net/atm/mpc.h 2011-03-27 14:31:47.000000000 -0400
75185+++ linux-2.6.32.46/net/atm/mpc.h 2011-08-23 21:22:38.000000000 -0400
75186@@ -33,7 +33,7 @@ struct mpoa_client {
75187 struct mpc_parameters parameters; /* parameters for this client */
75188
75189 const struct net_device_ops *old_ops;
75190- struct net_device_ops new_ops;
75191+ net_device_ops_no_const new_ops;
75192 };
75193
75194
75195diff -urNp linux-2.6.32.46/net/atm/mpoa_caches.c linux-2.6.32.46/net/atm/mpoa_caches.c
75196--- linux-2.6.32.46/net/atm/mpoa_caches.c 2011-03-27 14:31:47.000000000 -0400
75197+++ linux-2.6.32.46/net/atm/mpoa_caches.c 2011-05-16 21:46:57.000000000 -0400
75198@@ -498,6 +498,8 @@ static void clear_expired(struct mpoa_cl
75199 struct timeval now;
75200 struct k_message msg;
75201
75202+ pax_track_stack();
75203+
75204 do_gettimeofday(&now);
75205
75206 write_lock_irq(&client->egress_lock);
75207diff -urNp linux-2.6.32.46/net/atm/proc.c linux-2.6.32.46/net/atm/proc.c
75208--- linux-2.6.32.46/net/atm/proc.c 2011-03-27 14:31:47.000000000 -0400
75209+++ linux-2.6.32.46/net/atm/proc.c 2011-04-17 15:56:46.000000000 -0400
75210@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
75211 const struct k_atm_aal_stats *stats)
75212 {
75213 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
75214- atomic_read(&stats->tx),atomic_read(&stats->tx_err),
75215- atomic_read(&stats->rx),atomic_read(&stats->rx_err),
75216- atomic_read(&stats->rx_drop));
75217+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
75218+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
75219+ atomic_read_unchecked(&stats->rx_drop));
75220 }
75221
75222 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
75223@@ -188,7 +188,12 @@ static void vcc_info(struct seq_file *se
75224 {
75225 struct sock *sk = sk_atm(vcc);
75226
75227+#ifdef CONFIG_GRKERNSEC_HIDESYM
75228+ seq_printf(seq, "%p ", NULL);
75229+#else
75230 seq_printf(seq, "%p ", vcc);
75231+#endif
75232+
75233 if (!vcc->dev)
75234 seq_printf(seq, "Unassigned ");
75235 else
75236@@ -214,7 +219,11 @@ static void svc_info(struct seq_file *se
75237 {
75238 if (!vcc->dev)
75239 seq_printf(seq, sizeof(void *) == 4 ?
75240+#ifdef CONFIG_GRKERNSEC_HIDESYM
75241+ "N/A@%p%10s" : "N/A@%p%2s", NULL, "");
75242+#else
75243 "N/A@%p%10s" : "N/A@%p%2s", vcc, "");
75244+#endif
75245 else
75246 seq_printf(seq, "%3d %3d %5d ",
75247 vcc->dev->number, vcc->vpi, vcc->vci);
75248diff -urNp linux-2.6.32.46/net/atm/resources.c linux-2.6.32.46/net/atm/resources.c
75249--- linux-2.6.32.46/net/atm/resources.c 2011-03-27 14:31:47.000000000 -0400
75250+++ linux-2.6.32.46/net/atm/resources.c 2011-04-17 15:56:46.000000000 -0400
75251@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
75252 static void copy_aal_stats(struct k_atm_aal_stats *from,
75253 struct atm_aal_stats *to)
75254 {
75255-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
75256+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
75257 __AAL_STAT_ITEMS
75258 #undef __HANDLE_ITEM
75259 }
75260@@ -170,7 +170,7 @@ static void copy_aal_stats(struct k_atm_
75261 static void subtract_aal_stats(struct k_atm_aal_stats *from,
75262 struct atm_aal_stats *to)
75263 {
75264-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
75265+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
75266 __AAL_STAT_ITEMS
75267 #undef __HANDLE_ITEM
75268 }
75269diff -urNp linux-2.6.32.46/net/bluetooth/l2cap.c linux-2.6.32.46/net/bluetooth/l2cap.c
75270--- linux-2.6.32.46/net/bluetooth/l2cap.c 2011-03-27 14:31:47.000000000 -0400
75271+++ linux-2.6.32.46/net/bluetooth/l2cap.c 2011-06-25 14:36:21.000000000 -0400
75272@@ -1885,7 +1885,7 @@ static int l2cap_sock_getsockopt_old(str
75273 err = -ENOTCONN;
75274 break;
75275 }
75276-
75277+ memset(&cinfo, 0, sizeof(cinfo));
75278 cinfo.hci_handle = l2cap_pi(sk)->conn->hcon->handle;
75279 memcpy(cinfo.dev_class, l2cap_pi(sk)->conn->hcon->dev_class, 3);
75280
75281@@ -2719,7 +2719,7 @@ static inline int l2cap_config_req(struc
75282
75283 /* Reject if config buffer is too small. */
75284 len = cmd_len - sizeof(*req);
75285- if (l2cap_pi(sk)->conf_len + len > sizeof(l2cap_pi(sk)->conf_req)) {
75286+ if (len < 0 || l2cap_pi(sk)->conf_len + len > sizeof(l2cap_pi(sk)->conf_req)) {
75287 l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
75288 l2cap_build_conf_rsp(sk, rsp,
75289 L2CAP_CONF_REJECT, flags), rsp);
75290diff -urNp linux-2.6.32.46/net/bluetooth/rfcomm/sock.c linux-2.6.32.46/net/bluetooth/rfcomm/sock.c
75291--- linux-2.6.32.46/net/bluetooth/rfcomm/sock.c 2011-03-27 14:31:47.000000000 -0400
75292+++ linux-2.6.32.46/net/bluetooth/rfcomm/sock.c 2011-06-12 06:35:00.000000000 -0400
75293@@ -878,6 +878,7 @@ static int rfcomm_sock_getsockopt_old(st
75294
75295 l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk;
75296
75297+ memset(&cinfo, 0, sizeof(cinfo));
75298 cinfo.hci_handle = l2cap_pi(l2cap_sk)->conn->hcon->handle;
75299 memcpy(cinfo.dev_class, l2cap_pi(l2cap_sk)->conn->hcon->dev_class, 3);
75300
75301diff -urNp linux-2.6.32.46/net/bridge/br_private.h linux-2.6.32.46/net/bridge/br_private.h
75302--- linux-2.6.32.46/net/bridge/br_private.h 2011-08-09 18:35:30.000000000 -0400
75303+++ linux-2.6.32.46/net/bridge/br_private.h 2011-08-09 18:34:01.000000000 -0400
75304@@ -255,7 +255,7 @@ extern void br_ifinfo_notify(int event,
75305
75306 #ifdef CONFIG_SYSFS
75307 /* br_sysfs_if.c */
75308-extern struct sysfs_ops brport_sysfs_ops;
75309+extern const struct sysfs_ops brport_sysfs_ops;
75310 extern int br_sysfs_addif(struct net_bridge_port *p);
75311
75312 /* br_sysfs_br.c */
75313diff -urNp linux-2.6.32.46/net/bridge/br_stp_if.c linux-2.6.32.46/net/bridge/br_stp_if.c
75314--- linux-2.6.32.46/net/bridge/br_stp_if.c 2011-03-27 14:31:47.000000000 -0400
75315+++ linux-2.6.32.46/net/bridge/br_stp_if.c 2011-04-17 15:56:46.000000000 -0400
75316@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
75317 char *envp[] = { NULL };
75318
75319 if (br->stp_enabled == BR_USER_STP) {
75320- r = call_usermodehelper(BR_STP_PROG, argv, envp, 1);
75321+ r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC);
75322 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
75323 br->dev->name, r);
75324
75325diff -urNp linux-2.6.32.46/net/bridge/br_sysfs_if.c linux-2.6.32.46/net/bridge/br_sysfs_if.c
75326--- linux-2.6.32.46/net/bridge/br_sysfs_if.c 2011-03-27 14:31:47.000000000 -0400
75327+++ linux-2.6.32.46/net/bridge/br_sysfs_if.c 2011-04-17 15:56:46.000000000 -0400
75328@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
75329 return ret;
75330 }
75331
75332-struct sysfs_ops brport_sysfs_ops = {
75333+const struct sysfs_ops brport_sysfs_ops = {
75334 .show = brport_show,
75335 .store = brport_store,
75336 };
75337diff -urNp linux-2.6.32.46/net/bridge/netfilter/ebtables.c linux-2.6.32.46/net/bridge/netfilter/ebtables.c
75338--- linux-2.6.32.46/net/bridge/netfilter/ebtables.c 2011-04-17 17:00:52.000000000 -0400
75339+++ linux-2.6.32.46/net/bridge/netfilter/ebtables.c 2011-05-16 21:46:57.000000000 -0400
75340@@ -1337,6 +1337,8 @@ static int copy_everything_to_user(struc
75341 unsigned int entries_size, nentries;
75342 char *entries;
75343
75344+ pax_track_stack();
75345+
75346 if (cmd == EBT_SO_GET_ENTRIES) {
75347 entries_size = t->private->entries_size;
75348 nentries = t->private->nentries;
75349diff -urNp linux-2.6.32.46/net/can/bcm.c linux-2.6.32.46/net/can/bcm.c
75350--- linux-2.6.32.46/net/can/bcm.c 2011-05-10 22:12:01.000000000 -0400
75351+++ linux-2.6.32.46/net/can/bcm.c 2011-05-10 22:12:34.000000000 -0400
75352@@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file
75353 struct bcm_sock *bo = bcm_sk(sk);
75354 struct bcm_op *op;
75355
75356+#ifdef CONFIG_GRKERNSEC_HIDESYM
75357+ seq_printf(m, ">>> socket %p", NULL);
75358+ seq_printf(m, " / sk %p", NULL);
75359+ seq_printf(m, " / bo %p", NULL);
75360+#else
75361 seq_printf(m, ">>> socket %p", sk->sk_socket);
75362 seq_printf(m, " / sk %p", sk);
75363 seq_printf(m, " / bo %p", bo);
75364+#endif
75365 seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
75366 seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
75367 seq_printf(m, " <<<\n");
75368diff -urNp linux-2.6.32.46/net/compat.c linux-2.6.32.46/net/compat.c
75369--- linux-2.6.32.46/net/compat.c 2011-03-27 14:31:47.000000000 -0400
75370+++ linux-2.6.32.46/net/compat.c 2011-10-06 09:37:14.000000000 -0400
75371@@ -69,9 +69,9 @@ int get_compat_msghdr(struct msghdr *kms
75372 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
75373 __get_user(kmsg->msg_flags, &umsg->msg_flags))
75374 return -EFAULT;
75375- kmsg->msg_name = compat_ptr(tmp1);
75376- kmsg->msg_iov = compat_ptr(tmp2);
75377- kmsg->msg_control = compat_ptr(tmp3);
75378+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
75379+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
75380+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
75381 return 0;
75382 }
75383
75384@@ -94,7 +94,7 @@ int verify_compat_iovec(struct msghdr *k
75385 kern_msg->msg_name = NULL;
75386
75387 tot_len = iov_from_user_compat_to_kern(kern_iov,
75388- (struct compat_iovec __user *)kern_msg->msg_iov,
75389+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
75390 kern_msg->msg_iovlen);
75391 if (tot_len >= 0)
75392 kern_msg->msg_iov = kern_iov;
75393@@ -114,20 +114,20 @@ int verify_compat_iovec(struct msghdr *k
75394
75395 #define CMSG_COMPAT_FIRSTHDR(msg) \
75396 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
75397- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
75398+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
75399 (struct compat_cmsghdr __user *)NULL)
75400
75401 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
75402 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
75403 (ucmlen) <= (unsigned long) \
75404 ((mhdr)->msg_controllen - \
75405- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
75406+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
75407
75408 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
75409 struct compat_cmsghdr __user *cmsg, int cmsg_len)
75410 {
75411 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
75412- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
75413+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
75414 msg->msg_controllen)
75415 return NULL;
75416 return (struct compat_cmsghdr __user *)ptr;
75417@@ -219,7 +219,7 @@ int put_cmsg_compat(struct msghdr *kmsg,
75418 {
75419 struct compat_timeval ctv;
75420 struct compat_timespec cts[3];
75421- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75422+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75423 struct compat_cmsghdr cmhdr;
75424 int cmlen;
75425
75426@@ -271,7 +271,7 @@ int put_cmsg_compat(struct msghdr *kmsg,
75427
75428 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
75429 {
75430- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75431+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75432 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
75433 int fdnum = scm->fp->count;
75434 struct file **fp = scm->fp->fp;
75435@@ -433,7 +433,7 @@ static int do_get_sock_timeout(struct so
75436 len = sizeof(ktime);
75437 old_fs = get_fs();
75438 set_fs(KERNEL_DS);
75439- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
75440+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
75441 set_fs(old_fs);
75442
75443 if (!err) {
75444@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *so
75445 case MCAST_JOIN_GROUP:
75446 case MCAST_LEAVE_GROUP:
75447 {
75448- struct compat_group_req __user *gr32 = (void *)optval;
75449+ struct compat_group_req __user *gr32 = (void __user *)optval;
75450 struct group_req __user *kgr =
75451 compat_alloc_user_space(sizeof(struct group_req));
75452 u32 interface;
75453@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *so
75454 case MCAST_BLOCK_SOURCE:
75455 case MCAST_UNBLOCK_SOURCE:
75456 {
75457- struct compat_group_source_req __user *gsr32 = (void *)optval;
75458+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
75459 struct group_source_req __user *kgsr = compat_alloc_user_space(
75460 sizeof(struct group_source_req));
75461 u32 interface;
75462@@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *so
75463 }
75464 case MCAST_MSFILTER:
75465 {
75466- struct compat_group_filter __user *gf32 = (void *)optval;
75467+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75468 struct group_filter __user *kgf;
75469 u32 interface, fmode, numsrc;
75470
75471diff -urNp linux-2.6.32.46/net/core/dev.c linux-2.6.32.46/net/core/dev.c
75472--- linux-2.6.32.46/net/core/dev.c 2011-04-17 17:00:52.000000000 -0400
75473+++ linux-2.6.32.46/net/core/dev.c 2011-08-05 20:33:55.000000000 -0400
75474@@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const cha
75475 if (no_module && capable(CAP_NET_ADMIN))
75476 no_module = request_module("netdev-%s", name);
75477 if (no_module && capable(CAP_SYS_MODULE)) {
75478+#ifdef CONFIG_GRKERNSEC_MODHARDEN
75479+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
75480+#else
75481 if (!request_module("%s", name))
75482 pr_err("Loading kernel module for a network device "
75483 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
75484 "instead\n", name);
75485+#endif
75486 }
75487 }
75488 EXPORT_SYMBOL(dev_load);
75489@@ -1654,7 +1658,7 @@ static inline int illegal_highdma(struct
75490
75491 struct dev_gso_cb {
75492 void (*destructor)(struct sk_buff *skb);
75493-};
75494+} __no_const;
75495
75496 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
75497
75498@@ -2063,7 +2067,7 @@ int netif_rx_ni(struct sk_buff *skb)
75499 }
75500 EXPORT_SYMBOL(netif_rx_ni);
75501
75502-static void net_tx_action(struct softirq_action *h)
75503+static void net_tx_action(void)
75504 {
75505 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75506
75507@@ -2826,7 +2830,7 @@ void netif_napi_del(struct napi_struct *
75508 EXPORT_SYMBOL(netif_napi_del);
75509
75510
75511-static void net_rx_action(struct softirq_action *h)
75512+static void net_rx_action(void)
75513 {
75514 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
75515 unsigned long time_limit = jiffies + 2;
75516diff -urNp linux-2.6.32.46/net/core/flow.c linux-2.6.32.46/net/core/flow.c
75517--- linux-2.6.32.46/net/core/flow.c 2011-03-27 14:31:47.000000000 -0400
75518+++ linux-2.6.32.46/net/core/flow.c 2011-05-04 17:56:20.000000000 -0400
75519@@ -35,11 +35,11 @@ struct flow_cache_entry {
75520 atomic_t *object_ref;
75521 };
75522
75523-atomic_t flow_cache_genid = ATOMIC_INIT(0);
75524+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
75525
75526 static u32 flow_hash_shift;
75527 #define flow_hash_size (1 << flow_hash_shift)
75528-static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL };
75529+static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables);
75530
75531 #define flow_table(cpu) (per_cpu(flow_tables, cpu))
75532
75533@@ -52,7 +52,7 @@ struct flow_percpu_info {
75534 u32 hash_rnd;
75535 int count;
75536 };
75537-static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 };
75538+static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info);
75539
75540 #define flow_hash_rnd_recalc(cpu) \
75541 (per_cpu(flow_hash_info, cpu).hash_rnd_recalc)
75542@@ -69,7 +69,7 @@ struct flow_flush_info {
75543 atomic_t cpuleft;
75544 struct completion completion;
75545 };
75546-static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL };
75547+static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets);
75548
75549 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
75550
75551@@ -190,7 +190,7 @@ void *flow_cache_lookup(struct net *net,
75552 if (fle->family == family &&
75553 fle->dir == dir &&
75554 flow_key_compare(key, &fle->key) == 0) {
75555- if (fle->genid == atomic_read(&flow_cache_genid)) {
75556+ if (fle->genid == atomic_read_unchecked(&flow_cache_genid)) {
75557 void *ret = fle->object;
75558
75559 if (ret)
75560@@ -228,7 +228,7 @@ nocache:
75561 err = resolver(net, key, family, dir, &obj, &obj_ref);
75562
75563 if (fle && !err) {
75564- fle->genid = atomic_read(&flow_cache_genid);
75565+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
75566
75567 if (fle->object)
75568 atomic_dec(fle->object_ref);
75569@@ -258,7 +258,7 @@ static void flow_cache_flush_tasklet(uns
75570
75571 fle = flow_table(cpu)[i];
75572 for (; fle; fle = fle->next) {
75573- unsigned genid = atomic_read(&flow_cache_genid);
75574+ unsigned genid = atomic_read_unchecked(&flow_cache_genid);
75575
75576 if (!fle->object || fle->genid == genid)
75577 continue;
75578diff -urNp linux-2.6.32.46/net/core/rtnetlink.c linux-2.6.32.46/net/core/rtnetlink.c
75579--- linux-2.6.32.46/net/core/rtnetlink.c 2011-03-27 14:31:47.000000000 -0400
75580+++ linux-2.6.32.46/net/core/rtnetlink.c 2011-08-05 20:33:55.000000000 -0400
75581@@ -57,7 +57,7 @@ struct rtnl_link
75582 {
75583 rtnl_doit_func doit;
75584 rtnl_dumpit_func dumpit;
75585-};
75586+} __no_const;
75587
75588 static DEFINE_MUTEX(rtnl_mutex);
75589
75590diff -urNp linux-2.6.32.46/net/core/scm.c linux-2.6.32.46/net/core/scm.c
75591--- linux-2.6.32.46/net/core/scm.c 2011-03-27 14:31:47.000000000 -0400
75592+++ linux-2.6.32.46/net/core/scm.c 2011-10-06 09:37:14.000000000 -0400
75593@@ -190,7 +190,7 @@ error:
75594 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75595 {
75596 struct cmsghdr __user *cm
75597- = (__force struct cmsghdr __user *)msg->msg_control;
75598+ = (struct cmsghdr __force_user *)msg->msg_control;
75599 struct cmsghdr cmhdr;
75600 int cmlen = CMSG_LEN(len);
75601 int err;
75602@@ -213,7 +213,7 @@ int put_cmsg(struct msghdr * msg, int le
75603 err = -EFAULT;
75604 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
75605 goto out;
75606- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
75607+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
75608 goto out;
75609 cmlen = CMSG_SPACE(len);
75610 if (msg->msg_controllen < cmlen)
75611@@ -228,7 +228,7 @@ out:
75612 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75613 {
75614 struct cmsghdr __user *cm
75615- = (__force struct cmsghdr __user*)msg->msg_control;
75616+ = (struct cmsghdr __force_user *)msg->msg_control;
75617
75618 int fdmax = 0;
75619 int fdnum = scm->fp->count;
75620@@ -248,7 +248,7 @@ void scm_detach_fds(struct msghdr *msg,
75621 if (fdnum < fdmax)
75622 fdmax = fdnum;
75623
75624- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
75625+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
75626 i++, cmfptr++)
75627 {
75628 int new_fd;
75629diff -urNp linux-2.6.32.46/net/core/secure_seq.c linux-2.6.32.46/net/core/secure_seq.c
75630--- linux-2.6.32.46/net/core/secure_seq.c 2011-08-16 20:37:25.000000000 -0400
75631+++ linux-2.6.32.46/net/core/secure_seq.c 2011-08-07 19:48:09.000000000 -0400
75632@@ -57,7 +57,7 @@ __u32 secure_tcpv6_sequence_number(__be3
75633 EXPORT_SYMBOL(secure_tcpv6_sequence_number);
75634
75635 u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
75636- __be16 dport)
75637+ __be16 dport)
75638 {
75639 u32 secret[MD5_MESSAGE_BYTES / 4];
75640 u32 hash[MD5_DIGEST_WORDS];
75641@@ -71,7 +71,6 @@ u32 secure_ipv6_port_ephemeral(const __b
75642 secret[i] = net_secret[i];
75643
75644 md5_transform(hash, secret);
75645-
75646 return hash[0];
75647 }
75648 #endif
75649diff -urNp linux-2.6.32.46/net/core/skbuff.c linux-2.6.32.46/net/core/skbuff.c
75650--- linux-2.6.32.46/net/core/skbuff.c 2011-03-27 14:31:47.000000000 -0400
75651+++ linux-2.6.32.46/net/core/skbuff.c 2011-05-16 21:46:57.000000000 -0400
75652@@ -1544,6 +1544,8 @@ int skb_splice_bits(struct sk_buff *skb,
75653 struct sk_buff *frag_iter;
75654 struct sock *sk = skb->sk;
75655
75656+ pax_track_stack();
75657+
75658 /*
75659 * __skb_splice_bits() only fails if the output has no room left,
75660 * so no point in going over the frag_list for the error case.
75661diff -urNp linux-2.6.32.46/net/core/sock.c linux-2.6.32.46/net/core/sock.c
75662--- linux-2.6.32.46/net/core/sock.c 2011-03-27 14:31:47.000000000 -0400
75663+++ linux-2.6.32.46/net/core/sock.c 2011-05-04 17:56:20.000000000 -0400
75664@@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock,
75665 break;
75666
75667 case SO_PEERCRED:
75668+ {
75669+ struct ucred peercred;
75670 if (len > sizeof(sk->sk_peercred))
75671 len = sizeof(sk->sk_peercred);
75672- if (copy_to_user(optval, &sk->sk_peercred, len))
75673+ peercred = sk->sk_peercred;
75674+ if (copy_to_user(optval, &peercred, len))
75675 return -EFAULT;
75676 goto lenout;
75677+ }
75678
75679 case SO_PEERNAME:
75680 {
75681@@ -1892,7 +1896,7 @@ void sock_init_data(struct socket *sock,
75682 */
75683 smp_wmb();
75684 atomic_set(&sk->sk_refcnt, 1);
75685- atomic_set(&sk->sk_drops, 0);
75686+ atomic_set_unchecked(&sk->sk_drops, 0);
75687 }
75688 EXPORT_SYMBOL(sock_init_data);
75689
75690diff -urNp linux-2.6.32.46/net/decnet/sysctl_net_decnet.c linux-2.6.32.46/net/decnet/sysctl_net_decnet.c
75691--- linux-2.6.32.46/net/decnet/sysctl_net_decnet.c 2011-03-27 14:31:47.000000000 -0400
75692+++ linux-2.6.32.46/net/decnet/sysctl_net_decnet.c 2011-04-17 15:56:46.000000000 -0400
75693@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
75694
75695 if (len > *lenp) len = *lenp;
75696
75697- if (copy_to_user(buffer, addr, len))
75698+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
75699 return -EFAULT;
75700
75701 *lenp = len;
75702@@ -327,7 +327,7 @@ static int dn_def_dev_handler(ctl_table
75703
75704 if (len > *lenp) len = *lenp;
75705
75706- if (copy_to_user(buffer, devname, len))
75707+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
75708 return -EFAULT;
75709
75710 *lenp = len;
75711diff -urNp linux-2.6.32.46/net/econet/Kconfig linux-2.6.32.46/net/econet/Kconfig
75712--- linux-2.6.32.46/net/econet/Kconfig 2011-03-27 14:31:47.000000000 -0400
75713+++ linux-2.6.32.46/net/econet/Kconfig 2011-04-17 15:56:46.000000000 -0400
75714@@ -4,7 +4,7 @@
75715
75716 config ECONET
75717 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
75718- depends on EXPERIMENTAL && INET
75719+ depends on EXPERIMENTAL && INET && BROKEN
75720 ---help---
75721 Econet is a fairly old and slow networking protocol mainly used by
75722 Acorn computers to access file and print servers. It uses native
75723diff -urNp linux-2.6.32.46/net/ieee802154/dgram.c linux-2.6.32.46/net/ieee802154/dgram.c
75724--- linux-2.6.32.46/net/ieee802154/dgram.c 2011-03-27 14:31:47.000000000 -0400
75725+++ linux-2.6.32.46/net/ieee802154/dgram.c 2011-05-04 17:56:28.000000000 -0400
75726@@ -318,7 +318,7 @@ out:
75727 static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb)
75728 {
75729 if (sock_queue_rcv_skb(sk, skb) < 0) {
75730- atomic_inc(&sk->sk_drops);
75731+ atomic_inc_unchecked(&sk->sk_drops);
75732 kfree_skb(skb);
75733 return NET_RX_DROP;
75734 }
75735diff -urNp linux-2.6.32.46/net/ieee802154/raw.c linux-2.6.32.46/net/ieee802154/raw.c
75736--- linux-2.6.32.46/net/ieee802154/raw.c 2011-03-27 14:31:47.000000000 -0400
75737+++ linux-2.6.32.46/net/ieee802154/raw.c 2011-05-04 17:56:28.000000000 -0400
75738@@ -206,7 +206,7 @@ out:
75739 static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
75740 {
75741 if (sock_queue_rcv_skb(sk, skb) < 0) {
75742- atomic_inc(&sk->sk_drops);
75743+ atomic_inc_unchecked(&sk->sk_drops);
75744 kfree_skb(skb);
75745 return NET_RX_DROP;
75746 }
75747diff -urNp linux-2.6.32.46/net/ipv4/inet_diag.c linux-2.6.32.46/net/ipv4/inet_diag.c
75748--- linux-2.6.32.46/net/ipv4/inet_diag.c 2011-07-13 17:23:04.000000000 -0400
75749+++ linux-2.6.32.46/net/ipv4/inet_diag.c 2011-06-20 19:31:13.000000000 -0400
75750@@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc
75751 r->idiag_retrans = 0;
75752
75753 r->id.idiag_if = sk->sk_bound_dev_if;
75754+#ifdef CONFIG_GRKERNSEC_HIDESYM
75755+ r->id.idiag_cookie[0] = 0;
75756+ r->id.idiag_cookie[1] = 0;
75757+#else
75758 r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
75759 r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
75760+#endif
75761
75762 r->id.idiag_sport = inet->sport;
75763 r->id.idiag_dport = inet->dport;
75764@@ -200,8 +205,15 @@ static int inet_twsk_diag_fill(struct in
75765 r->idiag_family = tw->tw_family;
75766 r->idiag_retrans = 0;
75767 r->id.idiag_if = tw->tw_bound_dev_if;
75768+
75769+#ifdef CONFIG_GRKERNSEC_HIDESYM
75770+ r->id.idiag_cookie[0] = 0;
75771+ r->id.idiag_cookie[1] = 0;
75772+#else
75773 r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
75774 r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
75775+#endif
75776+
75777 r->id.idiag_sport = tw->tw_sport;
75778 r->id.idiag_dport = tw->tw_dport;
75779 r->id.idiag_src[0] = tw->tw_rcv_saddr;
75780@@ -284,12 +296,14 @@ static int inet_diag_get_exact(struct sk
75781 if (sk == NULL)
75782 goto unlock;
75783
75784+#ifndef CONFIG_GRKERNSEC_HIDESYM
75785 err = -ESTALE;
75786 if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
75787 req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
75788 ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
75789 (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
75790 goto out;
75791+#endif
75792
75793 err = -ENOMEM;
75794 rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
75795@@ -579,8 +593,14 @@ static int inet_diag_fill_req(struct sk_
75796 r->idiag_retrans = req->retrans;
75797
75798 r->id.idiag_if = sk->sk_bound_dev_if;
75799+
75800+#ifdef CONFIG_GRKERNSEC_HIDESYM
75801+ r->id.idiag_cookie[0] = 0;
75802+ r->id.idiag_cookie[1] = 0;
75803+#else
75804 r->id.idiag_cookie[0] = (u32)(unsigned long)req;
75805 r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
75806+#endif
75807
75808 tmo = req->expires - jiffies;
75809 if (tmo < 0)
75810diff -urNp linux-2.6.32.46/net/ipv4/inet_hashtables.c linux-2.6.32.46/net/ipv4/inet_hashtables.c
75811--- linux-2.6.32.46/net/ipv4/inet_hashtables.c 2011-08-16 20:37:25.000000000 -0400
75812+++ linux-2.6.32.46/net/ipv4/inet_hashtables.c 2011-08-16 20:42:30.000000000 -0400
75813@@ -18,12 +18,15 @@
75814 #include <linux/sched.h>
75815 #include <linux/slab.h>
75816 #include <linux/wait.h>
75817+#include <linux/security.h>
75818
75819 #include <net/inet_connection_sock.h>
75820 #include <net/inet_hashtables.h>
75821 #include <net/secure_seq.h>
75822 #include <net/ip.h>
75823
75824+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
75825+
75826 /*
75827 * Allocate and initialize a new local port bind bucket.
75828 * The bindhash mutex for snum's hash chain must be held here.
75829@@ -491,6 +494,8 @@ ok:
75830 }
75831 spin_unlock(&head->lock);
75832
75833+ gr_update_task_in_ip_table(current, inet_sk(sk));
75834+
75835 if (tw) {
75836 inet_twsk_deschedule(tw, death_row);
75837 inet_twsk_put(tw);
75838diff -urNp linux-2.6.32.46/net/ipv4/inetpeer.c linux-2.6.32.46/net/ipv4/inetpeer.c
75839--- linux-2.6.32.46/net/ipv4/inetpeer.c 2011-08-16 20:37:25.000000000 -0400
75840+++ linux-2.6.32.46/net/ipv4/inetpeer.c 2011-08-07 19:48:09.000000000 -0400
75841@@ -367,6 +367,8 @@ struct inet_peer *inet_getpeer(__be32 da
75842 struct inet_peer *p, *n;
75843 struct inet_peer **stack[PEER_MAXDEPTH], ***stackptr;
75844
75845+ pax_track_stack();
75846+
75847 /* Look up for the address quickly. */
75848 read_lock_bh(&peer_pool_lock);
75849 p = lookup(daddr, NULL);
75850@@ -390,7 +392,7 @@ struct inet_peer *inet_getpeer(__be32 da
75851 return NULL;
75852 n->v4daddr = daddr;
75853 atomic_set(&n->refcnt, 1);
75854- atomic_set(&n->rid, 0);
75855+ atomic_set_unchecked(&n->rid, 0);
75856 n->ip_id_count = secure_ip_id(daddr);
75857 n->tcp_ts_stamp = 0;
75858
75859diff -urNp linux-2.6.32.46/net/ipv4/ipconfig.c linux-2.6.32.46/net/ipv4/ipconfig.c
75860--- linux-2.6.32.46/net/ipv4/ipconfig.c 2011-03-27 14:31:47.000000000 -0400
75861+++ linux-2.6.32.46/net/ipv4/ipconfig.c 2011-10-06 09:37:14.000000000 -0400
75862@@ -295,7 +295,7 @@ static int __init ic_devinet_ioctl(unsig
75863
75864 mm_segment_t oldfs = get_fs();
75865 set_fs(get_ds());
75866- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75867+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75868 set_fs(oldfs);
75869 return res;
75870 }
75871@@ -306,7 +306,7 @@ static int __init ic_dev_ioctl(unsigned
75872
75873 mm_segment_t oldfs = get_fs();
75874 set_fs(get_ds());
75875- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75876+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75877 set_fs(oldfs);
75878 return res;
75879 }
75880@@ -317,7 +317,7 @@ static int __init ic_route_ioctl(unsigne
75881
75882 mm_segment_t oldfs = get_fs();
75883 set_fs(get_ds());
75884- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
75885+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
75886 set_fs(oldfs);
75887 return res;
75888 }
75889diff -urNp linux-2.6.32.46/net/ipv4/ip_fragment.c linux-2.6.32.46/net/ipv4/ip_fragment.c
75890--- linux-2.6.32.46/net/ipv4/ip_fragment.c 2011-03-27 14:31:47.000000000 -0400
75891+++ linux-2.6.32.46/net/ipv4/ip_fragment.c 2011-04-17 15:56:46.000000000 -0400
75892@@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct
75893 return 0;
75894
75895 start = qp->rid;
75896- end = atomic_inc_return(&peer->rid);
75897+ end = atomic_inc_return_unchecked(&peer->rid);
75898 qp->rid = end;
75899
75900 rc = qp->q.fragments && (end - start) > max;
75901diff -urNp linux-2.6.32.46/net/ipv4/ip_sockglue.c linux-2.6.32.46/net/ipv4/ip_sockglue.c
75902--- linux-2.6.32.46/net/ipv4/ip_sockglue.c 2011-03-27 14:31:47.000000000 -0400
75903+++ linux-2.6.32.46/net/ipv4/ip_sockglue.c 2011-10-06 09:37:14.000000000 -0400
75904@@ -1015,6 +1015,8 @@ static int do_ip_getsockopt(struct sock
75905 int val;
75906 int len;
75907
75908+ pax_track_stack();
75909+
75910 if (level != SOL_IP)
75911 return -EOPNOTSUPP;
75912
75913@@ -1173,7 +1175,7 @@ static int do_ip_getsockopt(struct sock
75914 if (sk->sk_type != SOCK_STREAM)
75915 return -ENOPROTOOPT;
75916
75917- msg.msg_control = optval;
75918+ msg.msg_control = (void __force_kernel *)optval;
75919 msg.msg_controllen = len;
75920 msg.msg_flags = 0;
75921
75922diff -urNp linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c
75923--- linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:00:52.000000000 -0400
75924+++ linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:04:18.000000000 -0400
75925@@ -934,6 +934,7 @@ static int get_info(struct net *net, voi
75926 private = &tmp;
75927 }
75928 #endif
75929+ memset(&info, 0, sizeof(info));
75930 info.valid_hooks = t->valid_hooks;
75931 memcpy(info.hook_entry, private->hook_entry,
75932 sizeof(info.hook_entry));
75933diff -urNp linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c
75934--- linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c 2011-03-27 14:31:47.000000000 -0400
75935+++ linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c 2011-08-21 18:42:53.000000000 -0400
75936@@ -286,6 +286,9 @@ ipq_mangle_ipv4(ipq_verdict_msg_t *v, st
75937
75938 if (v->data_len < sizeof(*user_iph))
75939 return 0;
75940+ if (v->data_len > 65535)
75941+ return -EMSGSIZE;
75942+
75943 diff = v->data_len - e->skb->len;
75944 if (diff < 0) {
75945 if (pskb_trim(e->skb, v->data_len))
75946@@ -409,7 +412,8 @@ ipq_dev_drop(int ifindex)
75947 static inline void
75948 __ipq_rcv_skb(struct sk_buff *skb)
75949 {
75950- int status, type, pid, flags, nlmsglen, skblen;
75951+ int status, type, pid, flags;
75952+ unsigned int nlmsglen, skblen;
75953 struct nlmsghdr *nlh;
75954
75955 skblen = skb->len;
75956diff -urNp linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c
75957--- linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:00:52.000000000 -0400
75958+++ linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:04:18.000000000 -0400
75959@@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi
75960 private = &tmp;
75961 }
75962 #endif
75963+ memset(&info, 0, sizeof(info));
75964 info.valid_hooks = t->valid_hooks;
75965 memcpy(info.hook_entry, private->hook_entry,
75966 sizeof(info.hook_entry));
75967diff -urNp linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c
75968--- linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-27 14:31:47.000000000 -0400
75969+++ linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15:56:46.000000000 -0400
75970@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
75971
75972 *len = 0;
75973
75974- *octets = kmalloc(eoc - ctx->pointer, GFP_ATOMIC);
75975+ *octets = kmalloc((eoc - ctx->pointer), GFP_ATOMIC);
75976 if (*octets == NULL) {
75977 if (net_ratelimit())
75978 printk("OOM in bsalg (%d)\n", __LINE__);
75979diff -urNp linux-2.6.32.46/net/ipv4/raw.c linux-2.6.32.46/net/ipv4/raw.c
75980--- linux-2.6.32.46/net/ipv4/raw.c 2011-03-27 14:31:47.000000000 -0400
75981+++ linux-2.6.32.46/net/ipv4/raw.c 2011-08-14 11:46:51.000000000 -0400
75982@@ -292,7 +292,7 @@ static int raw_rcv_skb(struct sock * sk,
75983 /* Charge it to the socket. */
75984
75985 if (sock_queue_rcv_skb(sk, skb) < 0) {
75986- atomic_inc(&sk->sk_drops);
75987+ atomic_inc_unchecked(&sk->sk_drops);
75988 kfree_skb(skb);
75989 return NET_RX_DROP;
75990 }
75991@@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk,
75992 int raw_rcv(struct sock *sk, struct sk_buff *skb)
75993 {
75994 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
75995- atomic_inc(&sk->sk_drops);
75996+ atomic_inc_unchecked(&sk->sk_drops);
75997 kfree_skb(skb);
75998 return NET_RX_DROP;
75999 }
76000@@ -724,16 +724,23 @@ static int raw_init(struct sock *sk)
76001
76002 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
76003 {
76004+ struct icmp_filter filter;
76005+
76006+ if (optlen < 0)
76007+ return -EINVAL;
76008 if (optlen > sizeof(struct icmp_filter))
76009 optlen = sizeof(struct icmp_filter);
76010- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
76011+ if (copy_from_user(&filter, optval, optlen))
76012 return -EFAULT;
76013+ raw_sk(sk)->filter = filter;
76014+
76015 return 0;
76016 }
76017
76018 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
76019 {
76020 int len, ret = -EFAULT;
76021+ struct icmp_filter filter;
76022
76023 if (get_user(len, optlen))
76024 goto out;
76025@@ -743,8 +750,9 @@ static int raw_geticmpfilter(struct sock
76026 if (len > sizeof(struct icmp_filter))
76027 len = sizeof(struct icmp_filter);
76028 ret = -EFAULT;
76029- if (put_user(len, optlen) ||
76030- copy_to_user(optval, &raw_sk(sk)->filter, len))
76031+ filter = raw_sk(sk)->filter;
76032+ if (put_user(len, optlen) || len > sizeof filter ||
76033+ copy_to_user(optval, &filter, len))
76034 goto out;
76035 ret = 0;
76036 out: return ret;
76037@@ -954,7 +962,13 @@ static void raw_sock_seq_show(struct seq
76038 sk_wmem_alloc_get(sp),
76039 sk_rmem_alloc_get(sp),
76040 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76041- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76042+ atomic_read(&sp->sk_refcnt),
76043+#ifdef CONFIG_GRKERNSEC_HIDESYM
76044+ NULL,
76045+#else
76046+ sp,
76047+#endif
76048+ atomic_read_unchecked(&sp->sk_drops));
76049 }
76050
76051 static int raw_seq_show(struct seq_file *seq, void *v)
76052diff -urNp linux-2.6.32.46/net/ipv4/route.c linux-2.6.32.46/net/ipv4/route.c
76053--- linux-2.6.32.46/net/ipv4/route.c 2011-08-16 20:37:25.000000000 -0400
76054+++ linux-2.6.32.46/net/ipv4/route.c 2011-08-07 19:48:09.000000000 -0400
76055@@ -269,7 +269,7 @@ static inline unsigned int rt_hash(__be3
76056
76057 static inline int rt_genid(struct net *net)
76058 {
76059- return atomic_read(&net->ipv4.rt_genid);
76060+ return atomic_read_unchecked(&net->ipv4.rt_genid);
76061 }
76062
76063 #ifdef CONFIG_PROC_FS
76064@@ -889,7 +889,7 @@ static void rt_cache_invalidate(struct n
76065 unsigned char shuffle;
76066
76067 get_random_bytes(&shuffle, sizeof(shuffle));
76068- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
76069+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
76070 }
76071
76072 /*
76073@@ -3357,7 +3357,7 @@ static __net_initdata struct pernet_oper
76074
76075 static __net_init int rt_secret_timer_init(struct net *net)
76076 {
76077- atomic_set(&net->ipv4.rt_genid,
76078+ atomic_set_unchecked(&net->ipv4.rt_genid,
76079 (int) ((num_physpages ^ (num_physpages>>8)) ^
76080 (jiffies ^ (jiffies >> 7))));
76081
76082diff -urNp linux-2.6.32.46/net/ipv4/tcp.c linux-2.6.32.46/net/ipv4/tcp.c
76083--- linux-2.6.32.46/net/ipv4/tcp.c 2011-03-27 14:31:47.000000000 -0400
76084+++ linux-2.6.32.46/net/ipv4/tcp.c 2011-05-16 21:46:57.000000000 -0400
76085@@ -2085,6 +2085,8 @@ static int do_tcp_setsockopt(struct sock
76086 int val;
76087 int err = 0;
76088
76089+ pax_track_stack();
76090+
76091 /* This is a string value all the others are int's */
76092 if (optname == TCP_CONGESTION) {
76093 char name[TCP_CA_NAME_MAX];
76094@@ -2355,6 +2357,8 @@ static int do_tcp_getsockopt(struct sock
76095 struct tcp_sock *tp = tcp_sk(sk);
76096 int val, len;
76097
76098+ pax_track_stack();
76099+
76100 if (get_user(len, optlen))
76101 return -EFAULT;
76102
76103diff -urNp linux-2.6.32.46/net/ipv4/tcp_ipv4.c linux-2.6.32.46/net/ipv4/tcp_ipv4.c
76104--- linux-2.6.32.46/net/ipv4/tcp_ipv4.c 2011-08-16 20:37:25.000000000 -0400
76105+++ linux-2.6.32.46/net/ipv4/tcp_ipv4.c 2011-08-23 21:22:32.000000000 -0400
76106@@ -85,6 +85,9 @@
76107 int sysctl_tcp_tw_reuse __read_mostly;
76108 int sysctl_tcp_low_latency __read_mostly;
76109
76110+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76111+extern int grsec_enable_blackhole;
76112+#endif
76113
76114 #ifdef CONFIG_TCP_MD5SIG
76115 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
76116@@ -1543,6 +1546,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
76117 return 0;
76118
76119 reset:
76120+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76121+ if (!grsec_enable_blackhole)
76122+#endif
76123 tcp_v4_send_reset(rsk, skb);
76124 discard:
76125 kfree_skb(skb);
76126@@ -1604,12 +1610,20 @@ int tcp_v4_rcv(struct sk_buff *skb)
76127 TCP_SKB_CB(skb)->sacked = 0;
76128
76129 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76130- if (!sk)
76131+ if (!sk) {
76132+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76133+ ret = 1;
76134+#endif
76135 goto no_tcp_socket;
76136+ }
76137
76138 process:
76139- if (sk->sk_state == TCP_TIME_WAIT)
76140+ if (sk->sk_state == TCP_TIME_WAIT) {
76141+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76142+ ret = 2;
76143+#endif
76144 goto do_time_wait;
76145+ }
76146
76147 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
76148 goto discard_and_relse;
76149@@ -1651,6 +1665,10 @@ no_tcp_socket:
76150 bad_packet:
76151 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76152 } else {
76153+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76154+ if (!grsec_enable_blackhole || (ret == 1 &&
76155+ (skb->dev->flags & IFF_LOOPBACK)))
76156+#endif
76157 tcp_v4_send_reset(NULL, skb);
76158 }
76159
76160@@ -2238,7 +2256,11 @@ static void get_openreq4(struct sock *sk
76161 0, /* non standard timer */
76162 0, /* open_requests have no inode */
76163 atomic_read(&sk->sk_refcnt),
76164+#ifdef CONFIG_GRKERNSEC_HIDESYM
76165+ NULL,
76166+#else
76167 req,
76168+#endif
76169 len);
76170 }
76171
76172@@ -2280,7 +2302,12 @@ static void get_tcp4_sock(struct sock *s
76173 sock_i_uid(sk),
76174 icsk->icsk_probes_out,
76175 sock_i_ino(sk),
76176- atomic_read(&sk->sk_refcnt), sk,
76177+ atomic_read(&sk->sk_refcnt),
76178+#ifdef CONFIG_GRKERNSEC_HIDESYM
76179+ NULL,
76180+#else
76181+ sk,
76182+#endif
76183 jiffies_to_clock_t(icsk->icsk_rto),
76184 jiffies_to_clock_t(icsk->icsk_ack.ato),
76185 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
76186@@ -2308,7 +2335,13 @@ static void get_timewait4_sock(struct in
76187 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
76188 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
76189 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76190- atomic_read(&tw->tw_refcnt), tw, len);
76191+ atomic_read(&tw->tw_refcnt),
76192+#ifdef CONFIG_GRKERNSEC_HIDESYM
76193+ NULL,
76194+#else
76195+ tw,
76196+#endif
76197+ len);
76198 }
76199
76200 #define TMPSZ 150
76201diff -urNp linux-2.6.32.46/net/ipv4/tcp_minisocks.c linux-2.6.32.46/net/ipv4/tcp_minisocks.c
76202--- linux-2.6.32.46/net/ipv4/tcp_minisocks.c 2011-03-27 14:31:47.000000000 -0400
76203+++ linux-2.6.32.46/net/ipv4/tcp_minisocks.c 2011-04-17 15:56:46.000000000 -0400
76204@@ -26,6 +26,10 @@
76205 #include <net/inet_common.h>
76206 #include <net/xfrm.h>
76207
76208+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76209+extern int grsec_enable_blackhole;
76210+#endif
76211+
76212 #ifdef CONFIG_SYSCTL
76213 #define SYNC_INIT 0 /* let the user enable it */
76214 #else
76215@@ -672,6 +676,10 @@ listen_overflow:
76216
76217 embryonic_reset:
76218 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
76219+
76220+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76221+ if (!grsec_enable_blackhole)
76222+#endif
76223 if (!(flg & TCP_FLAG_RST))
76224 req->rsk_ops->send_reset(sk, skb);
76225
76226diff -urNp linux-2.6.32.46/net/ipv4/tcp_output.c linux-2.6.32.46/net/ipv4/tcp_output.c
76227--- linux-2.6.32.46/net/ipv4/tcp_output.c 2011-03-27 14:31:47.000000000 -0400
76228+++ linux-2.6.32.46/net/ipv4/tcp_output.c 2011-05-16 21:46:57.000000000 -0400
76229@@ -2234,6 +2234,8 @@ struct sk_buff *tcp_make_synack(struct s
76230 __u8 *md5_hash_location;
76231 int mss;
76232
76233+ pax_track_stack();
76234+
76235 skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1, GFP_ATOMIC);
76236 if (skb == NULL)
76237 return NULL;
76238diff -urNp linux-2.6.32.46/net/ipv4/tcp_probe.c linux-2.6.32.46/net/ipv4/tcp_probe.c
76239--- linux-2.6.32.46/net/ipv4/tcp_probe.c 2011-03-27 14:31:47.000000000 -0400
76240+++ linux-2.6.32.46/net/ipv4/tcp_probe.c 2011-04-17 15:56:46.000000000 -0400
76241@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
76242 if (cnt + width >= len)
76243 break;
76244
76245- if (copy_to_user(buf + cnt, tbuf, width))
76246+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
76247 return -EFAULT;
76248 cnt += width;
76249 }
76250diff -urNp linux-2.6.32.46/net/ipv4/tcp_timer.c linux-2.6.32.46/net/ipv4/tcp_timer.c
76251--- linux-2.6.32.46/net/ipv4/tcp_timer.c 2011-03-27 14:31:47.000000000 -0400
76252+++ linux-2.6.32.46/net/ipv4/tcp_timer.c 2011-04-17 15:56:46.000000000 -0400
76253@@ -21,6 +21,10 @@
76254 #include <linux/module.h>
76255 #include <net/tcp.h>
76256
76257+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76258+extern int grsec_lastack_retries;
76259+#endif
76260+
76261 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
76262 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
76263 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
76264@@ -164,6 +168,13 @@ static int tcp_write_timeout(struct sock
76265 }
76266 }
76267
76268+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76269+ if ((sk->sk_state == TCP_LAST_ACK) &&
76270+ (grsec_lastack_retries > 0) &&
76271+ (grsec_lastack_retries < retry_until))
76272+ retry_until = grsec_lastack_retries;
76273+#endif
76274+
76275 if (retransmits_timed_out(sk, retry_until)) {
76276 /* Has it gone just too far? */
76277 tcp_write_err(sk);
76278diff -urNp linux-2.6.32.46/net/ipv4/udp.c linux-2.6.32.46/net/ipv4/udp.c
76279--- linux-2.6.32.46/net/ipv4/udp.c 2011-07-13 17:23:04.000000000 -0400
76280+++ linux-2.6.32.46/net/ipv4/udp.c 2011-08-23 21:22:32.000000000 -0400
76281@@ -86,6 +86,7 @@
76282 #include <linux/types.h>
76283 #include <linux/fcntl.h>
76284 #include <linux/module.h>
76285+#include <linux/security.h>
76286 #include <linux/socket.h>
76287 #include <linux/sockios.h>
76288 #include <linux/igmp.h>
76289@@ -106,6 +107,10 @@
76290 #include <net/xfrm.h>
76291 #include "udp_impl.h"
76292
76293+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76294+extern int grsec_enable_blackhole;
76295+#endif
76296+
76297 struct udp_table udp_table;
76298 EXPORT_SYMBOL(udp_table);
76299
76300@@ -371,6 +376,9 @@ found:
76301 return s;
76302 }
76303
76304+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
76305+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
76306+
76307 /*
76308 * This routine is called by the ICMP module when it gets some
76309 * sort of error condition. If err < 0 then the socket should
76310@@ -639,9 +647,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
76311 dport = usin->sin_port;
76312 if (dport == 0)
76313 return -EINVAL;
76314+
76315+ err = gr_search_udp_sendmsg(sk, usin);
76316+ if (err)
76317+ return err;
76318 } else {
76319 if (sk->sk_state != TCP_ESTABLISHED)
76320 return -EDESTADDRREQ;
76321+
76322+ err = gr_search_udp_sendmsg(sk, NULL);
76323+ if (err)
76324+ return err;
76325+
76326 daddr = inet->daddr;
76327 dport = inet->dport;
76328 /* Open fast path for connected socket.
76329@@ -945,6 +962,10 @@ try_again:
76330 if (!skb)
76331 goto out;
76332
76333+ err = gr_search_udp_recvmsg(sk, skb);
76334+ if (err)
76335+ goto out_free;
76336+
76337 ulen = skb->len - sizeof(struct udphdr);
76338 copied = len;
76339 if (copied > ulen)
76340@@ -1068,7 +1089,7 @@ static int __udp_queue_rcv_skb(struct so
76341 if (rc == -ENOMEM) {
76342 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
76343 is_udplite);
76344- atomic_inc(&sk->sk_drops);
76345+ atomic_inc_unchecked(&sk->sk_drops);
76346 }
76347 goto drop;
76348 }
76349@@ -1338,6 +1359,9 @@ int __udp4_lib_rcv(struct sk_buff *skb,
76350 goto csum_error;
76351
76352 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
76353+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76354+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76355+#endif
76356 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
76357
76358 /*
76359@@ -1758,8 +1782,13 @@ static void udp4_format_sock(struct sock
76360 sk_wmem_alloc_get(sp),
76361 sk_rmem_alloc_get(sp),
76362 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76363- atomic_read(&sp->sk_refcnt), sp,
76364- atomic_read(&sp->sk_drops), len);
76365+ atomic_read(&sp->sk_refcnt),
76366+#ifdef CONFIG_GRKERNSEC_HIDESYM
76367+ NULL,
76368+#else
76369+ sp,
76370+#endif
76371+ atomic_read_unchecked(&sp->sk_drops), len);
76372 }
76373
76374 int udp4_seq_show(struct seq_file *seq, void *v)
76375diff -urNp linux-2.6.32.46/net/ipv6/addrconf.c linux-2.6.32.46/net/ipv6/addrconf.c
76376--- linux-2.6.32.46/net/ipv6/addrconf.c 2011-05-10 22:12:02.000000000 -0400
76377+++ linux-2.6.32.46/net/ipv6/addrconf.c 2011-10-06 09:37:14.000000000 -0400
76378@@ -2053,7 +2053,7 @@ int addrconf_set_dstaddr(struct net *net
76379 p.iph.ihl = 5;
76380 p.iph.protocol = IPPROTO_IPV6;
76381 p.iph.ttl = 64;
76382- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
76383+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
76384
76385 if (ops->ndo_do_ioctl) {
76386 mm_segment_t oldfs = get_fs();
76387diff -urNp linux-2.6.32.46/net/ipv6/inet6_connection_sock.c linux-2.6.32.46/net/ipv6/inet6_connection_sock.c
76388--- linux-2.6.32.46/net/ipv6/inet6_connection_sock.c 2011-03-27 14:31:47.000000000 -0400
76389+++ linux-2.6.32.46/net/ipv6/inet6_connection_sock.c 2011-05-04 17:56:28.000000000 -0400
76390@@ -152,7 +152,7 @@ void __inet6_csk_dst_store(struct sock *
76391 #ifdef CONFIG_XFRM
76392 {
76393 struct rt6_info *rt = (struct rt6_info *)dst;
76394- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
76395+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
76396 }
76397 #endif
76398 }
76399@@ -167,7 +167,7 @@ struct dst_entry *__inet6_csk_dst_check(
76400 #ifdef CONFIG_XFRM
76401 if (dst) {
76402 struct rt6_info *rt = (struct rt6_info *)dst;
76403- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
76404+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
76405 sk->sk_dst_cache = NULL;
76406 dst_release(dst);
76407 dst = NULL;
76408diff -urNp linux-2.6.32.46/net/ipv6/inet6_hashtables.c linux-2.6.32.46/net/ipv6/inet6_hashtables.c
76409--- linux-2.6.32.46/net/ipv6/inet6_hashtables.c 2011-08-16 20:37:25.000000000 -0400
76410+++ linux-2.6.32.46/net/ipv6/inet6_hashtables.c 2011-08-07 19:48:09.000000000 -0400
76411@@ -119,7 +119,7 @@ out:
76412 }
76413 EXPORT_SYMBOL(__inet6_lookup_established);
76414
76415-static int inline compute_score(struct sock *sk, struct net *net,
76416+static inline int compute_score(struct sock *sk, struct net *net,
76417 const unsigned short hnum,
76418 const struct in6_addr *daddr,
76419 const int dif)
76420diff -urNp linux-2.6.32.46/net/ipv6/ip6_tunnel.c linux-2.6.32.46/net/ipv6/ip6_tunnel.c
76421--- linux-2.6.32.46/net/ipv6/ip6_tunnel.c 2011-08-09 18:35:30.000000000 -0400
76422+++ linux-2.6.32.46/net/ipv6/ip6_tunnel.c 2011-08-24 18:52:25.000000000 -0400
76423@@ -1466,7 +1466,7 @@ static int __init ip6_tunnel_init(void)
76424 {
76425 int err;
76426
76427- err = register_pernet_device(&ip6_tnl_net_ops);
76428+ err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops);
76429 if (err < 0)
76430 goto out_pernet;
76431
76432@@ -1487,7 +1487,7 @@ static int __init ip6_tunnel_init(void)
76433 out_ip6ip6:
76434 xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET);
76435 out_ip4ip6:
76436- unregister_pernet_device(&ip6_tnl_net_ops);
76437+ unregister_pernet_gen_device(ip6_tnl_net_id, &ip6_tnl_net_ops);
76438 out_pernet:
76439 return err;
76440 }
76441diff -urNp linux-2.6.32.46/net/ipv6/ipv6_sockglue.c linux-2.6.32.46/net/ipv6/ipv6_sockglue.c
76442--- linux-2.6.32.46/net/ipv6/ipv6_sockglue.c 2011-03-27 14:31:47.000000000 -0400
76443+++ linux-2.6.32.46/net/ipv6/ipv6_sockglue.c 2011-10-06 09:37:16.000000000 -0400
76444@@ -130,6 +130,8 @@ static int do_ipv6_setsockopt(struct soc
76445 int val, valbool;
76446 int retv = -ENOPROTOOPT;
76447
76448+ pax_track_stack();
76449+
76450 if (optval == NULL)
76451 val=0;
76452 else {
76453@@ -881,6 +883,8 @@ static int do_ipv6_getsockopt(struct soc
76454 int len;
76455 int val;
76456
76457+ pax_track_stack();
76458+
76459 if (ip6_mroute_opt(optname))
76460 return ip6_mroute_getsockopt(sk, optname, optval, optlen);
76461
76462@@ -922,7 +926,7 @@ static int do_ipv6_getsockopt(struct soc
76463 if (sk->sk_type != SOCK_STREAM)
76464 return -ENOPROTOOPT;
76465
76466- msg.msg_control = optval;
76467+ msg.msg_control = (void __force_kernel *)optval;
76468 msg.msg_controllen = len;
76469 msg.msg_flags = 0;
76470
76471diff -urNp linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c
76472--- linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c 2011-03-27 14:31:47.000000000 -0400
76473+++ linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c 2011-08-21 18:43:32.000000000 -0400
76474@@ -287,6 +287,9 @@ ipq_mangle_ipv6(ipq_verdict_msg_t *v, st
76475
76476 if (v->data_len < sizeof(*user_iph))
76477 return 0;
76478+ if (v->data_len > 65535)
76479+ return -EMSGSIZE;
76480+
76481 diff = v->data_len - e->skb->len;
76482 if (diff < 0) {
76483 if (pskb_trim(e->skb, v->data_len))
76484@@ -411,7 +414,8 @@ ipq_dev_drop(int ifindex)
76485 static inline void
76486 __ipq_rcv_skb(struct sk_buff *skb)
76487 {
76488- int status, type, pid, flags, nlmsglen, skblen;
76489+ int status, type, pid, flags;
76490+ unsigned int nlmsglen, skblen;
76491 struct nlmsghdr *nlh;
76492
76493 skblen = skb->len;
76494diff -urNp linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c
76495--- linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:00:52.000000000 -0400
76496+++ linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:04:18.000000000 -0400
76497@@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi
76498 private = &tmp;
76499 }
76500 #endif
76501+ memset(&info, 0, sizeof(info));
76502 info.valid_hooks = t->valid_hooks;
76503 memcpy(info.hook_entry, private->hook_entry,
76504 sizeof(info.hook_entry));
76505diff -urNp linux-2.6.32.46/net/ipv6/raw.c linux-2.6.32.46/net/ipv6/raw.c
76506--- linux-2.6.32.46/net/ipv6/raw.c 2011-03-27 14:31:47.000000000 -0400
76507+++ linux-2.6.32.46/net/ipv6/raw.c 2011-08-14 11:48:20.000000000 -0400
76508@@ -375,14 +375,14 @@ static inline int rawv6_rcv_skb(struct s
76509 {
76510 if ((raw6_sk(sk)->checksum || sk->sk_filter) &&
76511 skb_checksum_complete(skb)) {
76512- atomic_inc(&sk->sk_drops);
76513+ atomic_inc_unchecked(&sk->sk_drops);
76514 kfree_skb(skb);
76515 return NET_RX_DROP;
76516 }
76517
76518 /* Charge it to the socket. */
76519 if (sock_queue_rcv_skb(sk,skb)<0) {
76520- atomic_inc(&sk->sk_drops);
76521+ atomic_inc_unchecked(&sk->sk_drops);
76522 kfree_skb(skb);
76523 return NET_RX_DROP;
76524 }
76525@@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk
76526 struct raw6_sock *rp = raw6_sk(sk);
76527
76528 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
76529- atomic_inc(&sk->sk_drops);
76530+ atomic_inc_unchecked(&sk->sk_drops);
76531 kfree_skb(skb);
76532 return NET_RX_DROP;
76533 }
76534@@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk
76535
76536 if (inet->hdrincl) {
76537 if (skb_checksum_complete(skb)) {
76538- atomic_inc(&sk->sk_drops);
76539+ atomic_inc_unchecked(&sk->sk_drops);
76540 kfree_skb(skb);
76541 return NET_RX_DROP;
76542 }
76543@@ -518,7 +518,7 @@ csum_copy_err:
76544 as some normal condition.
76545 */
76546 err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
76547- atomic_inc(&sk->sk_drops);
76548+ atomic_inc_unchecked(&sk->sk_drops);
76549 goto out;
76550 }
76551
76552@@ -600,7 +600,7 @@ out:
76553 return err;
76554 }
76555
76556-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
76557+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
76558 struct flowi *fl, struct rt6_info *rt,
76559 unsigned int flags)
76560 {
76561@@ -738,6 +738,8 @@ static int rawv6_sendmsg(struct kiocb *i
76562 u16 proto;
76563 int err;
76564
76565+ pax_track_stack();
76566+
76567 /* Rough check on arithmetic overflow,
76568 better check is made in ip6_append_data().
76569 */
76570@@ -916,12 +918,17 @@ do_confirm:
76571 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
76572 char __user *optval, int optlen)
76573 {
76574+ struct icmp6_filter filter;
76575+
76576 switch (optname) {
76577 case ICMPV6_FILTER:
76578+ if (optlen < 0)
76579+ return -EINVAL;
76580 if (optlen > sizeof(struct icmp6_filter))
76581 optlen = sizeof(struct icmp6_filter);
76582- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
76583+ if (copy_from_user(&filter, optval, optlen))
76584 return -EFAULT;
76585+ raw6_sk(sk)->filter = filter;
76586 return 0;
76587 default:
76588 return -ENOPROTOOPT;
76589@@ -934,6 +941,7 @@ static int rawv6_geticmpfilter(struct so
76590 char __user *optval, int __user *optlen)
76591 {
76592 int len;
76593+ struct icmp6_filter filter;
76594
76595 switch (optname) {
76596 case ICMPV6_FILTER:
76597@@ -945,7 +953,8 @@ static int rawv6_geticmpfilter(struct so
76598 len = sizeof(struct icmp6_filter);
76599 if (put_user(len, optlen))
76600 return -EFAULT;
76601- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
76602+ filter = raw6_sk(sk)->filter;
76603+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
76604 return -EFAULT;
76605 return 0;
76606 default:
76607@@ -1241,7 +1250,13 @@ static void raw6_sock_seq_show(struct se
76608 0, 0L, 0,
76609 sock_i_uid(sp), 0,
76610 sock_i_ino(sp),
76611- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76612+ atomic_read(&sp->sk_refcnt),
76613+#ifdef CONFIG_GRKERNSEC_HIDESYM
76614+ NULL,
76615+#else
76616+ sp,
76617+#endif
76618+ atomic_read_unchecked(&sp->sk_drops));
76619 }
76620
76621 static int raw6_seq_show(struct seq_file *seq, void *v)
76622diff -urNp linux-2.6.32.46/net/ipv6/tcp_ipv6.c linux-2.6.32.46/net/ipv6/tcp_ipv6.c
76623--- linux-2.6.32.46/net/ipv6/tcp_ipv6.c 2011-08-16 20:37:25.000000000 -0400
76624+++ linux-2.6.32.46/net/ipv6/tcp_ipv6.c 2011-08-07 19:48:09.000000000 -0400
76625@@ -89,6 +89,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
76626 }
76627 #endif
76628
76629+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76630+extern int grsec_enable_blackhole;
76631+#endif
76632+
76633 static void tcp_v6_hash(struct sock *sk)
76634 {
76635 if (sk->sk_state != TCP_CLOSE) {
76636@@ -1579,6 +1583,9 @@ static int tcp_v6_do_rcv(struct sock *sk
76637 return 0;
76638
76639 reset:
76640+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76641+ if (!grsec_enable_blackhole)
76642+#endif
76643 tcp_v6_send_reset(sk, skb);
76644 discard:
76645 if (opt_skb)
76646@@ -1656,12 +1663,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
76647 TCP_SKB_CB(skb)->sacked = 0;
76648
76649 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76650- if (!sk)
76651+ if (!sk) {
76652+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76653+ ret = 1;
76654+#endif
76655 goto no_tcp_socket;
76656+ }
76657
76658 process:
76659- if (sk->sk_state == TCP_TIME_WAIT)
76660+ if (sk->sk_state == TCP_TIME_WAIT) {
76661+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76662+ ret = 2;
76663+#endif
76664 goto do_time_wait;
76665+ }
76666
76667 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
76668 goto discard_and_relse;
76669@@ -1701,6 +1716,10 @@ no_tcp_socket:
76670 bad_packet:
76671 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76672 } else {
76673+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76674+ if (!grsec_enable_blackhole || (ret == 1 &&
76675+ (skb->dev->flags & IFF_LOOPBACK)))
76676+#endif
76677 tcp_v6_send_reset(NULL, skb);
76678 }
76679
76680@@ -1916,7 +1935,13 @@ static void get_openreq6(struct seq_file
76681 uid,
76682 0, /* non standard timer */
76683 0, /* open_requests have no inode */
76684- 0, req);
76685+ 0,
76686+#ifdef CONFIG_GRKERNSEC_HIDESYM
76687+ NULL
76688+#else
76689+ req
76690+#endif
76691+ );
76692 }
76693
76694 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76695@@ -1966,7 +1991,12 @@ static void get_tcp6_sock(struct seq_fil
76696 sock_i_uid(sp),
76697 icsk->icsk_probes_out,
76698 sock_i_ino(sp),
76699- atomic_read(&sp->sk_refcnt), sp,
76700+ atomic_read(&sp->sk_refcnt),
76701+#ifdef CONFIG_GRKERNSEC_HIDESYM
76702+ NULL,
76703+#else
76704+ sp,
76705+#endif
76706 jiffies_to_clock_t(icsk->icsk_rto),
76707 jiffies_to_clock_t(icsk->icsk_ack.ato),
76708 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
76709@@ -2001,7 +2031,13 @@ static void get_timewait6_sock(struct se
76710 dest->s6_addr32[2], dest->s6_addr32[3], destp,
76711 tw->tw_substate, 0, 0,
76712 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76713- atomic_read(&tw->tw_refcnt), tw);
76714+ atomic_read(&tw->tw_refcnt),
76715+#ifdef CONFIG_GRKERNSEC_HIDESYM
76716+ NULL
76717+#else
76718+ tw
76719+#endif
76720+ );
76721 }
76722
76723 static int tcp6_seq_show(struct seq_file *seq, void *v)
76724diff -urNp linux-2.6.32.46/net/ipv6/udp.c linux-2.6.32.46/net/ipv6/udp.c
76725--- linux-2.6.32.46/net/ipv6/udp.c 2011-07-13 17:23:04.000000000 -0400
76726+++ linux-2.6.32.46/net/ipv6/udp.c 2011-07-13 17:23:27.000000000 -0400
76727@@ -49,6 +49,10 @@
76728 #include <linux/seq_file.h>
76729 #include "udp_impl.h"
76730
76731+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76732+extern int grsec_enable_blackhole;
76733+#endif
76734+
76735 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
76736 {
76737 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
76738@@ -391,7 +395,7 @@ int udpv6_queue_rcv_skb(struct sock * sk
76739 if (rc == -ENOMEM) {
76740 UDP6_INC_STATS_BH(sock_net(sk),
76741 UDP_MIB_RCVBUFERRORS, is_udplite);
76742- atomic_inc(&sk->sk_drops);
76743+ atomic_inc_unchecked(&sk->sk_drops);
76744 }
76745 goto drop;
76746 }
76747@@ -590,6 +594,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
76748 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
76749 proto == IPPROTO_UDPLITE);
76750
76751+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76752+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76753+#endif
76754 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
76755
76756 kfree_skb(skb);
76757@@ -1209,8 +1216,13 @@ static void udp6_sock_seq_show(struct se
76758 0, 0L, 0,
76759 sock_i_uid(sp), 0,
76760 sock_i_ino(sp),
76761- atomic_read(&sp->sk_refcnt), sp,
76762- atomic_read(&sp->sk_drops));
76763+ atomic_read(&sp->sk_refcnt),
76764+#ifdef CONFIG_GRKERNSEC_HIDESYM
76765+ NULL,
76766+#else
76767+ sp,
76768+#endif
76769+ atomic_read_unchecked(&sp->sk_drops));
76770 }
76771
76772 int udp6_seq_show(struct seq_file *seq, void *v)
76773diff -urNp linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c
76774--- linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c 2011-03-27 14:31:47.000000000 -0400
76775+++ linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:56:46.000000000 -0400
76776@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
76777 add_wait_queue(&self->open_wait, &wait);
76778
76779 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
76780- __FILE__,__LINE__, tty->driver->name, self->open_count );
76781+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76782
76783 /* As far as I can see, we protect open_count - Jean II */
76784 spin_lock_irqsave(&self->spinlock, flags);
76785 if (!tty_hung_up_p(filp)) {
76786 extra_count = 1;
76787- self->open_count--;
76788+ local_dec(&self->open_count);
76789 }
76790 spin_unlock_irqrestore(&self->spinlock, flags);
76791- self->blocked_open++;
76792+ local_inc(&self->blocked_open);
76793
76794 while (1) {
76795 if (tty->termios->c_cflag & CBAUD) {
76796@@ -329,7 +329,7 @@ static int ircomm_tty_block_til_ready(st
76797 }
76798
76799 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
76800- __FILE__,__LINE__, tty->driver->name, self->open_count );
76801+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76802
76803 schedule();
76804 }
76805@@ -340,13 +340,13 @@ static int ircomm_tty_block_til_ready(st
76806 if (extra_count) {
76807 /* ++ is not atomic, so this should be protected - Jean II */
76808 spin_lock_irqsave(&self->spinlock, flags);
76809- self->open_count++;
76810+ local_inc(&self->open_count);
76811 spin_unlock_irqrestore(&self->spinlock, flags);
76812 }
76813- self->blocked_open--;
76814+ local_dec(&self->blocked_open);
76815
76816 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
76817- __FILE__,__LINE__, tty->driver->name, self->open_count);
76818+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
76819
76820 if (!retval)
76821 self->flags |= ASYNC_NORMAL_ACTIVE;
76822@@ -415,14 +415,14 @@ static int ircomm_tty_open(struct tty_st
76823 }
76824 /* ++ is not atomic, so this should be protected - Jean II */
76825 spin_lock_irqsave(&self->spinlock, flags);
76826- self->open_count++;
76827+ local_inc(&self->open_count);
76828
76829 tty->driver_data = self;
76830 self->tty = tty;
76831 spin_unlock_irqrestore(&self->spinlock, flags);
76832
76833 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
76834- self->line, self->open_count);
76835+ self->line, local_read(&self->open_count));
76836
76837 /* Not really used by us, but lets do it anyway */
76838 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
76839@@ -511,7 +511,7 @@ static void ircomm_tty_close(struct tty_
76840 return;
76841 }
76842
76843- if ((tty->count == 1) && (self->open_count != 1)) {
76844+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
76845 /*
76846 * Uh, oh. tty->count is 1, which means that the tty
76847 * structure will be freed. state->count should always
76848@@ -521,16 +521,16 @@ static void ircomm_tty_close(struct tty_
76849 */
76850 IRDA_DEBUG(0, "%s(), bad serial port count; "
76851 "tty->count is 1, state->count is %d\n", __func__ ,
76852- self->open_count);
76853- self->open_count = 1;
76854+ local_read(&self->open_count));
76855+ local_set(&self->open_count, 1);
76856 }
76857
76858- if (--self->open_count < 0) {
76859+ if (local_dec_return(&self->open_count) < 0) {
76860 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
76861- __func__, self->line, self->open_count);
76862- self->open_count = 0;
76863+ __func__, self->line, local_read(&self->open_count));
76864+ local_set(&self->open_count, 0);
76865 }
76866- if (self->open_count) {
76867+ if (local_read(&self->open_count)) {
76868 spin_unlock_irqrestore(&self->spinlock, flags);
76869
76870 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
76871@@ -562,7 +562,7 @@ static void ircomm_tty_close(struct tty_
76872 tty->closing = 0;
76873 self->tty = NULL;
76874
76875- if (self->blocked_open) {
76876+ if (local_read(&self->blocked_open)) {
76877 if (self->close_delay)
76878 schedule_timeout_interruptible(self->close_delay);
76879 wake_up_interruptible(&self->open_wait);
76880@@ -1017,7 +1017,7 @@ static void ircomm_tty_hangup(struct tty
76881 spin_lock_irqsave(&self->spinlock, flags);
76882 self->flags &= ~ASYNC_NORMAL_ACTIVE;
76883 self->tty = NULL;
76884- self->open_count = 0;
76885+ local_set(&self->open_count, 0);
76886 spin_unlock_irqrestore(&self->spinlock, flags);
76887
76888 wake_up_interruptible(&self->open_wait);
76889@@ -1369,7 +1369,7 @@ static void ircomm_tty_line_info(struct
76890 seq_putc(m, '\n');
76891
76892 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
76893- seq_printf(m, "Open count: %d\n", self->open_count);
76894+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
76895 seq_printf(m, "Max data size: %d\n", self->max_data_size);
76896 seq_printf(m, "Max header size: %d\n", self->max_header_size);
76897
76898diff -urNp linux-2.6.32.46/net/iucv/af_iucv.c linux-2.6.32.46/net/iucv/af_iucv.c
76899--- linux-2.6.32.46/net/iucv/af_iucv.c 2011-03-27 14:31:47.000000000 -0400
76900+++ linux-2.6.32.46/net/iucv/af_iucv.c 2011-05-04 17:56:28.000000000 -0400
76901@@ -651,10 +651,10 @@ static int iucv_sock_autobind(struct soc
76902
76903 write_lock_bh(&iucv_sk_list.lock);
76904
76905- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
76906+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76907 while (__iucv_get_sock_by_name(name)) {
76908 sprintf(name, "%08x",
76909- atomic_inc_return(&iucv_sk_list.autobind_name));
76910+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76911 }
76912
76913 write_unlock_bh(&iucv_sk_list.lock);
76914diff -urNp linux-2.6.32.46/net/key/af_key.c linux-2.6.32.46/net/key/af_key.c
76915--- linux-2.6.32.46/net/key/af_key.c 2011-03-27 14:31:47.000000000 -0400
76916+++ linux-2.6.32.46/net/key/af_key.c 2011-05-16 21:46:57.000000000 -0400
76917@@ -2489,6 +2489,8 @@ static int pfkey_migrate(struct sock *sk
76918 struct xfrm_migrate m[XFRM_MAX_DEPTH];
76919 struct xfrm_kmaddress k;
76920
76921+ pax_track_stack();
76922+
76923 if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC - 1],
76924 ext_hdrs[SADB_EXT_ADDRESS_DST - 1]) ||
76925 !ext_hdrs[SADB_X_EXT_POLICY - 1]) {
76926@@ -3660,7 +3662,11 @@ static int pfkey_seq_show(struct seq_fil
76927 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
76928 else
76929 seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n",
76930+#ifdef CONFIG_GRKERNSEC_HIDESYM
76931+ NULL,
76932+#else
76933 s,
76934+#endif
76935 atomic_read(&s->sk_refcnt),
76936 sk_rmem_alloc_get(s),
76937 sk_wmem_alloc_get(s),
76938diff -urNp linux-2.6.32.46/net/lapb/lapb_iface.c linux-2.6.32.46/net/lapb/lapb_iface.c
76939--- linux-2.6.32.46/net/lapb/lapb_iface.c 2011-03-27 14:31:47.000000000 -0400
76940+++ linux-2.6.32.46/net/lapb/lapb_iface.c 2011-08-05 20:33:55.000000000 -0400
76941@@ -157,7 +157,7 @@ int lapb_register(struct net_device *dev
76942 goto out;
76943
76944 lapb->dev = dev;
76945- lapb->callbacks = *callbacks;
76946+ lapb->callbacks = callbacks;
76947
76948 __lapb_insert_cb(lapb);
76949
76950@@ -379,32 +379,32 @@ int lapb_data_received(struct net_device
76951
76952 void lapb_connect_confirmation(struct lapb_cb *lapb, int reason)
76953 {
76954- if (lapb->callbacks.connect_confirmation)
76955- lapb->callbacks.connect_confirmation(lapb->dev, reason);
76956+ if (lapb->callbacks->connect_confirmation)
76957+ lapb->callbacks->connect_confirmation(lapb->dev, reason);
76958 }
76959
76960 void lapb_connect_indication(struct lapb_cb *lapb, int reason)
76961 {
76962- if (lapb->callbacks.connect_indication)
76963- lapb->callbacks.connect_indication(lapb->dev, reason);
76964+ if (lapb->callbacks->connect_indication)
76965+ lapb->callbacks->connect_indication(lapb->dev, reason);
76966 }
76967
76968 void lapb_disconnect_confirmation(struct lapb_cb *lapb, int reason)
76969 {
76970- if (lapb->callbacks.disconnect_confirmation)
76971- lapb->callbacks.disconnect_confirmation(lapb->dev, reason);
76972+ if (lapb->callbacks->disconnect_confirmation)
76973+ lapb->callbacks->disconnect_confirmation(lapb->dev, reason);
76974 }
76975
76976 void lapb_disconnect_indication(struct lapb_cb *lapb, int reason)
76977 {
76978- if (lapb->callbacks.disconnect_indication)
76979- lapb->callbacks.disconnect_indication(lapb->dev, reason);
76980+ if (lapb->callbacks->disconnect_indication)
76981+ lapb->callbacks->disconnect_indication(lapb->dev, reason);
76982 }
76983
76984 int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
76985 {
76986- if (lapb->callbacks.data_indication)
76987- return lapb->callbacks.data_indication(lapb->dev, skb);
76988+ if (lapb->callbacks->data_indication)
76989+ return lapb->callbacks->data_indication(lapb->dev, skb);
76990
76991 kfree_skb(skb);
76992 return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
76993@@ -414,8 +414,8 @@ int lapb_data_transmit(struct lapb_cb *l
76994 {
76995 int used = 0;
76996
76997- if (lapb->callbacks.data_transmit) {
76998- lapb->callbacks.data_transmit(lapb->dev, skb);
76999+ if (lapb->callbacks->data_transmit) {
77000+ lapb->callbacks->data_transmit(lapb->dev, skb);
77001 used = 1;
77002 }
77003
77004diff -urNp linux-2.6.32.46/net/mac80211/cfg.c linux-2.6.32.46/net/mac80211/cfg.c
77005--- linux-2.6.32.46/net/mac80211/cfg.c 2011-03-27 14:31:47.000000000 -0400
77006+++ linux-2.6.32.46/net/mac80211/cfg.c 2011-04-17 15:56:46.000000000 -0400
77007@@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(st
77008 return err;
77009 }
77010
77011-struct cfg80211_ops mac80211_config_ops = {
77012+const struct cfg80211_ops mac80211_config_ops = {
77013 .add_virtual_intf = ieee80211_add_iface,
77014 .del_virtual_intf = ieee80211_del_iface,
77015 .change_virtual_intf = ieee80211_change_iface,
77016diff -urNp linux-2.6.32.46/net/mac80211/cfg.h linux-2.6.32.46/net/mac80211/cfg.h
77017--- linux-2.6.32.46/net/mac80211/cfg.h 2011-03-27 14:31:47.000000000 -0400
77018+++ linux-2.6.32.46/net/mac80211/cfg.h 2011-04-17 15:56:46.000000000 -0400
77019@@ -4,6 +4,6 @@
77020 #ifndef __CFG_H
77021 #define __CFG_H
77022
77023-extern struct cfg80211_ops mac80211_config_ops;
77024+extern const struct cfg80211_ops mac80211_config_ops;
77025
77026 #endif /* __CFG_H */
77027diff -urNp linux-2.6.32.46/net/mac80211/debugfs_key.c linux-2.6.32.46/net/mac80211/debugfs_key.c
77028--- linux-2.6.32.46/net/mac80211/debugfs_key.c 2011-03-27 14:31:47.000000000 -0400
77029+++ linux-2.6.32.46/net/mac80211/debugfs_key.c 2011-04-17 15:56:46.000000000 -0400
77030@@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file
77031 size_t count, loff_t *ppos)
77032 {
77033 struct ieee80211_key *key = file->private_data;
77034- int i, res, bufsize = 2 * key->conf.keylen + 2;
77035+ int i, bufsize = 2 * key->conf.keylen + 2;
77036 char *buf = kmalloc(bufsize, GFP_KERNEL);
77037 char *p = buf;
77038+ ssize_t res;
77039+
77040+ if (buf == NULL)
77041+ return -ENOMEM;
77042
77043 for (i = 0; i < key->conf.keylen; i++)
77044 p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
77045diff -urNp linux-2.6.32.46/net/mac80211/debugfs_sta.c linux-2.6.32.46/net/mac80211/debugfs_sta.c
77046--- linux-2.6.32.46/net/mac80211/debugfs_sta.c 2011-03-27 14:31:47.000000000 -0400
77047+++ linux-2.6.32.46/net/mac80211/debugfs_sta.c 2011-05-16 21:46:57.000000000 -0400
77048@@ -124,6 +124,8 @@ static ssize_t sta_agg_status_read(struc
77049 int i;
77050 struct sta_info *sta = file->private_data;
77051
77052+ pax_track_stack();
77053+
77054 spin_lock_bh(&sta->lock);
77055 p += scnprintf(p, sizeof(buf)+buf-p, "next dialog_token is %#02x\n",
77056 sta->ampdu_mlme.dialog_token_allocator + 1);
77057diff -urNp linux-2.6.32.46/net/mac80211/ieee80211_i.h linux-2.6.32.46/net/mac80211/ieee80211_i.h
77058--- linux-2.6.32.46/net/mac80211/ieee80211_i.h 2011-03-27 14:31:47.000000000 -0400
77059+++ linux-2.6.32.46/net/mac80211/ieee80211_i.h 2011-04-17 15:56:46.000000000 -0400
77060@@ -25,6 +25,7 @@
77061 #include <linux/etherdevice.h>
77062 #include <net/cfg80211.h>
77063 #include <net/mac80211.h>
77064+#include <asm/local.h>
77065 #include "key.h"
77066 #include "sta_info.h"
77067
77068@@ -635,7 +636,7 @@ struct ieee80211_local {
77069 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
77070 spinlock_t queue_stop_reason_lock;
77071
77072- int open_count;
77073+ local_t open_count;
77074 int monitors, cooked_mntrs;
77075 /* number of interfaces with corresponding FIF_ flags */
77076 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
77077diff -urNp linux-2.6.32.46/net/mac80211/iface.c linux-2.6.32.46/net/mac80211/iface.c
77078--- linux-2.6.32.46/net/mac80211/iface.c 2011-03-27 14:31:47.000000000 -0400
77079+++ linux-2.6.32.46/net/mac80211/iface.c 2011-04-17 15:56:46.000000000 -0400
77080@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
77081 break;
77082 }
77083
77084- if (local->open_count == 0) {
77085+ if (local_read(&local->open_count) == 0) {
77086 res = drv_start(local);
77087 if (res)
77088 goto err_del_bss;
77089@@ -196,7 +196,7 @@ static int ieee80211_open(struct net_dev
77090 * Validate the MAC address for this device.
77091 */
77092 if (!is_valid_ether_addr(dev->dev_addr)) {
77093- if (!local->open_count)
77094+ if (!local_read(&local->open_count))
77095 drv_stop(local);
77096 return -EADDRNOTAVAIL;
77097 }
77098@@ -292,7 +292,7 @@ static int ieee80211_open(struct net_dev
77099
77100 hw_reconf_flags |= __ieee80211_recalc_idle(local);
77101
77102- local->open_count++;
77103+ local_inc(&local->open_count);
77104 if (hw_reconf_flags) {
77105 ieee80211_hw_config(local, hw_reconf_flags);
77106 /*
77107@@ -320,7 +320,7 @@ static int ieee80211_open(struct net_dev
77108 err_del_interface:
77109 drv_remove_interface(local, &conf);
77110 err_stop:
77111- if (!local->open_count)
77112+ if (!local_read(&local->open_count))
77113 drv_stop(local);
77114 err_del_bss:
77115 sdata->bss = NULL;
77116@@ -420,7 +420,7 @@ static int ieee80211_stop(struct net_dev
77117 WARN_ON(!list_empty(&sdata->u.ap.vlans));
77118 }
77119
77120- local->open_count--;
77121+ local_dec(&local->open_count);
77122
77123 switch (sdata->vif.type) {
77124 case NL80211_IFTYPE_AP_VLAN:
77125@@ -526,7 +526,7 @@ static int ieee80211_stop(struct net_dev
77126
77127 ieee80211_recalc_ps(local, -1);
77128
77129- if (local->open_count == 0) {
77130+ if (local_read(&local->open_count) == 0) {
77131 ieee80211_clear_tx_pending(local);
77132 ieee80211_stop_device(local);
77133
77134diff -urNp linux-2.6.32.46/net/mac80211/main.c linux-2.6.32.46/net/mac80211/main.c
77135--- linux-2.6.32.46/net/mac80211/main.c 2011-05-10 22:12:02.000000000 -0400
77136+++ linux-2.6.32.46/net/mac80211/main.c 2011-05-10 22:12:34.000000000 -0400
77137@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
77138 local->hw.conf.power_level = power;
77139 }
77140
77141- if (changed && local->open_count) {
77142+ if (changed && local_read(&local->open_count)) {
77143 ret = drv_config(local, changed);
77144 /*
77145 * Goal:
77146diff -urNp linux-2.6.32.46/net/mac80211/mlme.c linux-2.6.32.46/net/mac80211/mlme.c
77147--- linux-2.6.32.46/net/mac80211/mlme.c 2011-08-09 18:35:30.000000000 -0400
77148+++ linux-2.6.32.46/net/mac80211/mlme.c 2011-08-09 18:34:01.000000000 -0400
77149@@ -1438,6 +1438,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
77150 bool have_higher_than_11mbit = false, newsta = false;
77151 u16 ap_ht_cap_flags;
77152
77153+ pax_track_stack();
77154+
77155 /*
77156 * AssocResp and ReassocResp have identical structure, so process both
77157 * of them in this function.
77158diff -urNp linux-2.6.32.46/net/mac80211/pm.c linux-2.6.32.46/net/mac80211/pm.c
77159--- linux-2.6.32.46/net/mac80211/pm.c 2011-03-27 14:31:47.000000000 -0400
77160+++ linux-2.6.32.46/net/mac80211/pm.c 2011-04-17 15:56:46.000000000 -0400
77161@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
77162 }
77163
77164 /* stop hardware - this must stop RX */
77165- if (local->open_count)
77166+ if (local_read(&local->open_count))
77167 ieee80211_stop_device(local);
77168
77169 local->suspended = true;
77170diff -urNp linux-2.6.32.46/net/mac80211/rate.c linux-2.6.32.46/net/mac80211/rate.c
77171--- linux-2.6.32.46/net/mac80211/rate.c 2011-03-27 14:31:47.000000000 -0400
77172+++ linux-2.6.32.46/net/mac80211/rate.c 2011-04-17 15:56:46.000000000 -0400
77173@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
77174 struct rate_control_ref *ref, *old;
77175
77176 ASSERT_RTNL();
77177- if (local->open_count)
77178+ if (local_read(&local->open_count))
77179 return -EBUSY;
77180
77181 ref = rate_control_alloc(name, local);
77182diff -urNp linux-2.6.32.46/net/mac80211/tx.c linux-2.6.32.46/net/mac80211/tx.c
77183--- linux-2.6.32.46/net/mac80211/tx.c 2011-03-27 14:31:47.000000000 -0400
77184+++ linux-2.6.32.46/net/mac80211/tx.c 2011-04-17 15:56:46.000000000 -0400
77185@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
77186 return cpu_to_le16(dur);
77187 }
77188
77189-static int inline is_ieee80211_device(struct ieee80211_local *local,
77190+static inline int is_ieee80211_device(struct ieee80211_local *local,
77191 struct net_device *dev)
77192 {
77193 return local == wdev_priv(dev->ieee80211_ptr);
77194diff -urNp linux-2.6.32.46/net/mac80211/util.c linux-2.6.32.46/net/mac80211/util.c
77195--- linux-2.6.32.46/net/mac80211/util.c 2011-03-27 14:31:47.000000000 -0400
77196+++ linux-2.6.32.46/net/mac80211/util.c 2011-04-17 15:56:46.000000000 -0400
77197@@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
77198 local->resuming = true;
77199
77200 /* restart hardware */
77201- if (local->open_count) {
77202+ if (local_read(&local->open_count)) {
77203 /*
77204 * Upon resume hardware can sometimes be goofy due to
77205 * various platform / driver / bus issues, so restarting
77206diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c
77207--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c 2011-03-27 14:31:47.000000000 -0400
77208+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c 2011-05-17 19:26:34.000000000 -0400
77209@@ -564,7 +564,7 @@ static const struct file_operations ip_v
77210 .open = ip_vs_app_open,
77211 .read = seq_read,
77212 .llseek = seq_lseek,
77213- .release = seq_release,
77214+ .release = seq_release_net,
77215 };
77216 #endif
77217
77218diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c
77219--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c 2011-03-27 14:31:47.000000000 -0400
77220+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c 2011-05-17 19:26:34.000000000 -0400
77221@@ -453,10 +453,10 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
77222 /* if the connection is not template and is created
77223 * by sync, preserve the activity flag.
77224 */
77225- cp->flags |= atomic_read(&dest->conn_flags) &
77226+ cp->flags |= atomic_read_unchecked(&dest->conn_flags) &
77227 (~IP_VS_CONN_F_INACTIVE);
77228 else
77229- cp->flags |= atomic_read(&dest->conn_flags);
77230+ cp->flags |= atomic_read_unchecked(&dest->conn_flags);
77231 cp->dest = dest;
77232
77233 IP_VS_DBG_BUF(7, "Bind-dest %s c:%s:%d v:%s:%d "
77234@@ -723,7 +723,7 @@ ip_vs_conn_new(int af, int proto, const
77235 atomic_set(&cp->refcnt, 1);
77236
77237 atomic_set(&cp->n_control, 0);
77238- atomic_set(&cp->in_pkts, 0);
77239+ atomic_set_unchecked(&cp->in_pkts, 0);
77240
77241 atomic_inc(&ip_vs_conn_count);
77242 if (flags & IP_VS_CONN_F_NO_CPORT)
77243@@ -871,7 +871,7 @@ static const struct file_operations ip_v
77244 .open = ip_vs_conn_open,
77245 .read = seq_read,
77246 .llseek = seq_lseek,
77247- .release = seq_release,
77248+ .release = seq_release_net,
77249 };
77250
77251 static const char *ip_vs_origin_name(unsigned flags)
77252@@ -934,7 +934,7 @@ static const struct file_operations ip_v
77253 .open = ip_vs_conn_sync_open,
77254 .read = seq_read,
77255 .llseek = seq_lseek,
77256- .release = seq_release,
77257+ .release = seq_release_net,
77258 };
77259
77260 #endif
77261@@ -961,7 +961,7 @@ static inline int todrop_entry(struct ip
77262
77263 /* Don't drop the entry if its number of incoming packets is not
77264 located in [0, 8] */
77265- i = atomic_read(&cp->in_pkts);
77266+ i = atomic_read_unchecked(&cp->in_pkts);
77267 if (i > 8 || i < 0) return 0;
77268
77269 if (!todrop_rate[i]) return 0;
77270diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c
77271--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c 2011-03-27 14:31:47.000000000 -0400
77272+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c 2011-05-04 17:56:28.000000000 -0400
77273@@ -485,7 +485,7 @@ int ip_vs_leave(struct ip_vs_service *sv
77274 ret = cp->packet_xmit(skb, cp, pp);
77275 /* do not touch skb anymore */
77276
77277- atomic_inc(&cp->in_pkts);
77278+ atomic_inc_unchecked(&cp->in_pkts);
77279 ip_vs_conn_put(cp);
77280 return ret;
77281 }
77282@@ -1357,7 +1357,7 @@ ip_vs_in(unsigned int hooknum, struct sk
77283 * Sync connection if it is about to close to
77284 * encorage the standby servers to update the connections timeout
77285 */
77286- pkts = atomic_add_return(1, &cp->in_pkts);
77287+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77288 if (af == AF_INET &&
77289 (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
77290 (((cp->protocol != IPPROTO_TCP ||
77291diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c
77292--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c 2011-03-27 14:31:47.000000000 -0400
77293+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-17 19:26:34.000000000 -0400
77294@@ -792,7 +792,7 @@ __ip_vs_update_dest(struct ip_vs_service
77295 ip_vs_rs_hash(dest);
77296 write_unlock_bh(&__ip_vs_rs_lock);
77297 }
77298- atomic_set(&dest->conn_flags, conn_flags);
77299+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
77300
77301 /* bind the service */
77302 if (!dest->svc) {
77303@@ -1888,7 +1888,7 @@ static int ip_vs_info_seq_show(struct se
77304 " %-7s %-6d %-10d %-10d\n",
77305 &dest->addr.in6,
77306 ntohs(dest->port),
77307- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77308+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77309 atomic_read(&dest->weight),
77310 atomic_read(&dest->activeconns),
77311 atomic_read(&dest->inactconns));
77312@@ -1899,7 +1899,7 @@ static int ip_vs_info_seq_show(struct se
77313 "%-7s %-6d %-10d %-10d\n",
77314 ntohl(dest->addr.ip),
77315 ntohs(dest->port),
77316- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77317+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77318 atomic_read(&dest->weight),
77319 atomic_read(&dest->activeconns),
77320 atomic_read(&dest->inactconns));
77321@@ -1927,7 +1927,7 @@ static const struct file_operations ip_v
77322 .open = ip_vs_info_open,
77323 .read = seq_read,
77324 .llseek = seq_lseek,
77325- .release = seq_release_private,
77326+ .release = seq_release_net,
77327 };
77328
77329 #endif
77330@@ -1976,7 +1976,7 @@ static const struct file_operations ip_v
77331 .open = ip_vs_stats_seq_open,
77332 .read = seq_read,
77333 .llseek = seq_lseek,
77334- .release = single_release,
77335+ .release = single_release_net,
77336 };
77337
77338 #endif
77339@@ -2292,7 +2292,7 @@ __ip_vs_get_dest_entries(const struct ip
77340
77341 entry.addr = dest->addr.ip;
77342 entry.port = dest->port;
77343- entry.conn_flags = atomic_read(&dest->conn_flags);
77344+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
77345 entry.weight = atomic_read(&dest->weight);
77346 entry.u_threshold = dest->u_threshold;
77347 entry.l_threshold = dest->l_threshold;
77348@@ -2353,6 +2353,8 @@ do_ip_vs_get_ctl(struct sock *sk, int cm
77349 unsigned char arg[128];
77350 int ret = 0;
77351
77352+ pax_track_stack();
77353+
77354 if (!capable(CAP_NET_ADMIN))
77355 return -EPERM;
77356
77357@@ -2802,7 +2804,7 @@ static int ip_vs_genl_fill_dest(struct s
77358 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
77359
77360 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
77361- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77362+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77363 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
77364 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
77365 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
77366diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c
77367--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c 2011-03-27 14:31:47.000000000 -0400
77368+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c 2011-05-04 17:56:28.000000000 -0400
77369@@ -438,7 +438,7 @@ static void ip_vs_process_message(const
77370
77371 if (opt)
77372 memcpy(&cp->in_seq, opt, sizeof(*opt));
77373- atomic_set(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
77374+ atomic_set_unchecked(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
77375 cp->state = state;
77376 cp->old_state = cp->state;
77377 /*
77378diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c
77379--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c 2011-03-27 14:31:47.000000000 -0400
77380+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c 2011-05-04 17:56:28.000000000 -0400
77381@@ -875,7 +875,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
77382 else
77383 rc = NF_ACCEPT;
77384 /* do not touch skb anymore */
77385- atomic_inc(&cp->in_pkts);
77386+ atomic_inc_unchecked(&cp->in_pkts);
77387 goto out;
77388 }
77389
77390@@ -949,7 +949,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb,
77391 else
77392 rc = NF_ACCEPT;
77393 /* do not touch skb anymore */
77394- atomic_inc(&cp->in_pkts);
77395+ atomic_inc_unchecked(&cp->in_pkts);
77396 goto out;
77397 }
77398
77399diff -urNp linux-2.6.32.46/net/netfilter/Kconfig linux-2.6.32.46/net/netfilter/Kconfig
77400--- linux-2.6.32.46/net/netfilter/Kconfig 2011-03-27 14:31:47.000000000 -0400
77401+++ linux-2.6.32.46/net/netfilter/Kconfig 2011-04-17 15:56:46.000000000 -0400
77402@@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
77403
77404 To compile it as a module, choose M here. If unsure, say N.
77405
77406+config NETFILTER_XT_MATCH_GRADM
77407+ tristate '"gradm" match support'
77408+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
77409+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
77410+ ---help---
77411+ The gradm match allows to match on grsecurity RBAC being enabled.
77412+ It is useful when iptables rules are applied early on bootup to
77413+ prevent connections to the machine (except from a trusted host)
77414+ while the RBAC system is disabled.
77415+
77416 config NETFILTER_XT_MATCH_HASHLIMIT
77417 tristate '"hashlimit" match support'
77418 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
77419diff -urNp linux-2.6.32.46/net/netfilter/Makefile linux-2.6.32.46/net/netfilter/Makefile
77420--- linux-2.6.32.46/net/netfilter/Makefile 2011-03-27 14:31:47.000000000 -0400
77421+++ linux-2.6.32.46/net/netfilter/Makefile 2011-04-17 15:56:46.000000000 -0400
77422@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
77423 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
77424 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
77425 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
77426+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
77427 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
77428 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
77429 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
77430diff -urNp linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c
77431--- linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c 2011-03-27 14:31:47.000000000 -0400
77432+++ linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:56:46.000000000 -0400
77433@@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt
77434 static int
77435 ctnetlink_parse_tuple(const struct nlattr * const cda[],
77436 struct nf_conntrack_tuple *tuple,
77437- enum ctattr_tuple type, u_int8_t l3num)
77438+ enum ctattr_type type, u_int8_t l3num)
77439 {
77440 struct nlattr *tb[CTA_TUPLE_MAX+1];
77441 int err;
77442diff -urNp linux-2.6.32.46/net/netfilter/nfnetlink_log.c linux-2.6.32.46/net/netfilter/nfnetlink_log.c
77443--- linux-2.6.32.46/net/netfilter/nfnetlink_log.c 2011-03-27 14:31:47.000000000 -0400
77444+++ linux-2.6.32.46/net/netfilter/nfnetlink_log.c 2011-05-04 17:56:28.000000000 -0400
77445@@ -68,7 +68,7 @@ struct nfulnl_instance {
77446 };
77447
77448 static DEFINE_RWLOCK(instances_lock);
77449-static atomic_t global_seq;
77450+static atomic_unchecked_t global_seq;
77451
77452 #define INSTANCE_BUCKETS 16
77453 static struct hlist_head instance_table[INSTANCE_BUCKETS];
77454@@ -493,7 +493,7 @@ __build_packet_message(struct nfulnl_ins
77455 /* global sequence number */
77456 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
77457 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
77458- htonl(atomic_inc_return(&global_seq)));
77459+ htonl(atomic_inc_return_unchecked(&global_seq)));
77460
77461 if (data_len) {
77462 struct nlattr *nla;
77463diff -urNp linux-2.6.32.46/net/netfilter/xt_gradm.c linux-2.6.32.46/net/netfilter/xt_gradm.c
77464--- linux-2.6.32.46/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
77465+++ linux-2.6.32.46/net/netfilter/xt_gradm.c 2011-04-17 15:56:46.000000000 -0400
77466@@ -0,0 +1,51 @@
77467+/*
77468+ * gradm match for netfilter
77469