]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.2.2-3.2.5-201202061800.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-3.2.5-201202061800.patch
CommitLineData
e2fd9d66
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index dfa6fc6..0095943 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -5,6 +5,7 @@
6 *.cis
7 *.cpio
8 *.csp
9+*.dbg
10 *.dsp
11 *.dvi
12 *.elf
13@@ -14,6 +15,7 @@
14 *.gcov
15 *.gen.S
16 *.gif
17+*.gmo
18 *.grep
19 *.grp
20 *.gz
21@@ -48,9 +50,11 @@
22 *.tab.h
23 *.tex
24 *.ver
25+*.vim
26 *.xml
27 *.xz
28 *_MODULES
29+*_reg_safe.h
30 *_vga16.c
31 *~
32 \#*#
33@@ -70,6 +74,7 @@ Kerntypes
34 Module.markers
35 Module.symvers
36 PENDING
37+PERF*
38 SCCS
39 System.map*
40 TAGS
41@@ -93,19 +98,24 @@ bounds.h
42 bsetup
43 btfixupprep
44 build
45+builtin-policy.h
46 bvmlinux
47 bzImage*
48 capability_names.h
49 capflags.c
50 classlist.h*
51+clut_vga16.c
52+common-cmds.h
53 comp*.log
54 compile.h*
55 conf
56 config
57 config-*
58 config_data.h*
59+config.c
60 config.mak
61 config.mak.autogen
62+config.tmp
63 conmakehash
64 consolemap_deftbl.c*
65 cpustr.h
66@@ -119,6 +129,7 @@ dslm
67 elf2ecoff
68 elfconfig.h*
69 evergreen_reg_safe.h
70+exception_policy.conf
71 fixdep
72 flask.h
73 fore200e_mkfirm
74@@ -126,12 +137,15 @@ fore200e_pca_fw.c*
75 gconf
76 gconf.glade.h
77 gen-devlist
78+gen-kdb_cmds.c
79 gen_crc32table
80 gen_init_cpio
81 generated
82 genheaders
83 genksyms
84 *_gray256.c
85+hash
86+hid-example
87 hpet_example
88 hugepage-mmap
89 hugepage-shm
90@@ -146,7 +160,7 @@ int32.c
91 int4.c
92 int8.c
93 kallsyms
94-kconfig
95+kern_constants.h
96 keywords.c
97 ksym.c*
98 ksym.h*
99@@ -154,7 +168,6 @@ kxgettext
100 lkc_defs.h
101 lex.c
102 lex.*.c
103-linux
104 logo_*.c
105 logo_*_clut224.c
106 logo_*_mono.c
107@@ -166,14 +179,15 @@ machtypes.h
108 map
109 map_hugetlb
110 maui_boot.h
111-media
112 mconf
113+mdp
114 miboot*
115 mk_elfconfig
116 mkboot
117 mkbugboot
118 mkcpustr
119 mkdep
120+mkpiggy
121 mkprep
122 mkregtable
123 mktables
124@@ -209,6 +223,7 @@ r300_reg_safe.h
125 r420_reg_safe.h
126 r600_reg_safe.h
127 recordmcount
128+regdb.c
129 relocs
130 rlim_names.h
131 rn50_reg_safe.h
132@@ -219,6 +234,7 @@ setup
133 setup.bin
134 setup.elf
135 sImage
136+slabinfo
137 sm_tbl*
138 split-include
139 syscalltab.h
140@@ -229,6 +245,7 @@ tftpboot.img
141 timeconst.h
142 times.h*
143 trix_boot.h
144+user_constants.h
145 utsrelease.h*
146 vdso-syms.lds
147 vdso.lds
148@@ -246,7 +263,9 @@ vmlinux
149 vmlinux-*
150 vmlinux.aout
151 vmlinux.bin.all
152+vmlinux.bin.bz2
153 vmlinux.lds
154+vmlinux.relocs
155 vmlinuz
156 voffset.h
157 vsyscall.lds
158@@ -254,9 +273,11 @@ vsyscall_32.lds
159 wanxlfw.inc
160 uImage
161 unifdef
162+utsrelease.h
163 wakeup.bin
164 wakeup.elf
165 wakeup.lds
166 zImage*
167 zconf.hash.c
168+zconf.lex.c
169 zoffset.h
170diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
171index 81c287f..d456d02 100644
172--- a/Documentation/kernel-parameters.txt
173+++ b/Documentation/kernel-parameters.txt
174@@ -1935,6 +1935,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
175 the specified number of seconds. This is to be used if
176 your oopses keep scrolling off the screen.
177
178+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
179+ virtualization environments that don't cope well with the
180+ expand down segment used by UDEREF on X86-32 or the frequent
181+ page table updates on X86-64.
182+
183+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
184+
185 pcbit= [HW,ISDN]
186
187 pcd. [PARIDE]
188diff --git a/Makefile b/Makefile
189index e9dd0ff..e4c0733 100644
190--- a/Makefile
191+++ b/Makefile
192@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
193
194 HOSTCC = gcc
195 HOSTCXX = g++
196-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
197-HOSTCXXFLAGS = -O2
198+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
199+HOSTCLFAGS += $(call cc-option, -Wno-empty-body)
200+HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
201
202 # Decide whether to build built-in, modular, or both.
203 # Normally, just do built-in.
204@@ -407,8 +408,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exc
205 # Rules shared between *config targets and build targets
206
207 # Basic helpers built in scripts/
208-PHONY += scripts_basic
209-scripts_basic:
210+PHONY += scripts_basic gcc-plugins
211+scripts_basic: gcc-plugins
212 $(Q)$(MAKE) $(build)=scripts/basic
213 $(Q)rm -f .tmp_quiet_recordmcount
214
215@@ -564,6 +565,46 @@ else
216 KBUILD_CFLAGS += -O2
217 endif
218
219+ifndef DISABLE_PAX_PLUGINS
220+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
221+ifndef DISABLE_PAX_CONSTIFY_PLUGIN
222+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
223+endif
224+ifdef CONFIG_PAX_MEMORY_STACKLEAK
225+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
226+STACKLEAK_PLUGIN += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
227+endif
228+ifdef CONFIG_KALLOCSTAT_PLUGIN
229+KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
230+endif
231+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
232+KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
233+KERNEXEC_PLUGIN += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD)
234+endif
235+ifdef CONFIG_CHECKER_PLUGIN
236+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
237+CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
238+endif
239+endif
240+GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
241+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN
242+ifeq ($(KBUILD_EXTMOD),)
243+gcc-plugins:
244+ $(Q)$(MAKE) $(build)=tools/gcc
245+else
246+gcc-plugins: ;
247+endif
248+else
249+gcc-plugins:
250+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
251+ $(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. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
252+else
253+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
254+endif
255+ $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
256+endif
257+endif
258+
259 include $(srctree)/arch/$(SRCARCH)/Makefile
260
261 ifneq ($(CONFIG_FRAME_WARN),0)
262@@ -708,7 +749,7 @@ export mod_strip_cmd
263
264
265 ifeq ($(KBUILD_EXTMOD),)
266-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
267+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
268
269 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
270 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
271@@ -932,6 +973,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
272
273 # The actual objects are generated when descending,
274 # make sure no implicit rule kicks in
275+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
276 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
277
278 # Handle descending into subdirectories listed in $(vmlinux-dirs)
279@@ -941,7 +983,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
280 # Error messages still appears in the original language
281
282 PHONY += $(vmlinux-dirs)
283-$(vmlinux-dirs): prepare scripts
284+$(vmlinux-dirs): gcc-plugins prepare scripts
285 $(Q)$(MAKE) $(build)=$@
286
287 # Store (new) KERNELRELASE string in include/config/kernel.release
288@@ -985,6 +1027,7 @@ prepare0: archprepare FORCE
289 $(Q)$(MAKE) $(build)=.
290
291 # All the preparing..
292+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
293 prepare: prepare0
294
295 # Generate some files
296@@ -1086,6 +1129,7 @@ all: modules
297 # using awk while concatenating to the final file.
298
299 PHONY += modules
300+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
301 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
302 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
303 @$(kecho) ' Building modules, stage 2.';
304@@ -1101,7 +1145,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
305
306 # Target to prepare building external modules
307 PHONY += modules_prepare
308-modules_prepare: prepare scripts
309+modules_prepare: gcc-plugins prepare scripts
310
311 # Target to install modules
312 PHONY += modules_install
313@@ -1198,6 +1242,7 @@ distclean: mrproper
314 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
315 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
316 -o -name '.*.rej' \
317+ -o -name '.*.rej' -o -name '*.so' \
318 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
319 -type f -print | xargs rm -f
320
321@@ -1358,6 +1403,7 @@ PHONY += $(module-dirs) modules
322 $(module-dirs): crmodverdir $(objtree)/Module.symvers
323 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
324
325+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
326 modules: $(module-dirs)
327 @$(kecho) ' Building modules, stage 2.';
328 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
329@@ -1484,17 +1530,19 @@ else
330 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
331 endif
332
333-%.s: %.c prepare scripts FORCE
334+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
335+%.s: %.c gcc-plugins prepare scripts FORCE
336 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
337 %.i: %.c prepare scripts FORCE
338 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
339-%.o: %.c prepare scripts FORCE
340+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
341+%.o: %.c gcc-plugins prepare scripts FORCE
342 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
343 %.lst: %.c prepare scripts FORCE
344 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
345-%.s: %.S prepare scripts FORCE
346+%.s: %.S gcc-plugins prepare scripts FORCE
347 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
348-%.o: %.S prepare scripts FORCE
349+%.o: %.S gcc-plugins prepare scripts FORCE
350 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
351 %.symtypes: %.c prepare scripts FORCE
352 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
353@@ -1504,11 +1552,13 @@ endif
354 $(cmd_crmodverdir)
355 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
356 $(build)=$(build-dir)
357-%/: prepare scripts FORCE
358+%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
359+%/: gcc-plugins prepare scripts FORCE
360 $(cmd_crmodverdir)
361 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
362 $(build)=$(build-dir)
363-%.ko: prepare scripts FORCE
364+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
365+%.ko: gcc-plugins prepare scripts FORCE
366 $(cmd_crmodverdir)
367 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
368 $(build)=$(build-dir) $(@:.ko=.o)
369diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
370index da5449e..7418343 100644
371--- a/arch/alpha/include/asm/elf.h
372+++ b/arch/alpha/include/asm/elf.h
373@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
374
375 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
376
377+#ifdef CONFIG_PAX_ASLR
378+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
379+
380+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
381+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
382+#endif
383+
384 /* $0 is set by ld.so to a pointer to a function which might be
385 registered using atexit. This provides a mean for the dynamic
386 linker to call DT_FINI functions for shared libraries that have
387diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
388index de98a73..bd4f1f8 100644
389--- a/arch/alpha/include/asm/pgtable.h
390+++ b/arch/alpha/include/asm/pgtable.h
391@@ -101,6 +101,17 @@ struct vm_area_struct;
392 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
393 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
394 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
395+
396+#ifdef CONFIG_PAX_PAGEEXEC
397+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
398+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
399+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
400+#else
401+# define PAGE_SHARED_NOEXEC PAGE_SHARED
402+# define PAGE_COPY_NOEXEC PAGE_COPY
403+# define PAGE_READONLY_NOEXEC PAGE_READONLY
404+#endif
405+
406 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
407
408 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
409diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
410index 2fd00b7..cfd5069 100644
411--- a/arch/alpha/kernel/module.c
412+++ b/arch/alpha/kernel/module.c
413@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
414
415 /* The small sections were sorted to the end of the segment.
416 The following should definitely cover them. */
417- gp = (u64)me->module_core + me->core_size - 0x8000;
418+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
419 got = sechdrs[me->arch.gotsecindex].sh_addr;
420
421 for (i = 0; i < n; i++) {
422diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
423index 01e8715..be0e80f 100644
424--- a/arch/alpha/kernel/osf_sys.c
425+++ b/arch/alpha/kernel/osf_sys.c
426@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
427 /* At this point: (!vma || addr < vma->vm_end). */
428 if (limit - len < addr)
429 return -ENOMEM;
430- if (!vma || addr + len <= vma->vm_start)
431+ if (check_heap_stack_gap(vma, addr, len))
432 return addr;
433 addr = vma->vm_end;
434 vma = vma->vm_next;
435@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
436 merely specific addresses, but regions of memory -- perhaps
437 this feature should be incorporated into all ports? */
438
439+#ifdef CONFIG_PAX_RANDMMAP
440+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
441+#endif
442+
443 if (addr) {
444 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
445 if (addr != (unsigned long) -ENOMEM)
446@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
447 }
448
449 /* Next, try allocating at TASK_UNMAPPED_BASE. */
450- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
451- len, limit);
452+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
453+
454 if (addr != (unsigned long) -ENOMEM)
455 return addr;
456
457diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
458index fadd5f8..904e73a 100644
459--- a/arch/alpha/mm/fault.c
460+++ b/arch/alpha/mm/fault.c
461@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
462 __reload_thread(pcb);
463 }
464
465+#ifdef CONFIG_PAX_PAGEEXEC
466+/*
467+ * PaX: decide what to do with offenders (regs->pc = fault address)
468+ *
469+ * returns 1 when task should be killed
470+ * 2 when patched PLT trampoline was detected
471+ * 3 when unpatched PLT trampoline was detected
472+ */
473+static int pax_handle_fetch_fault(struct pt_regs *regs)
474+{
475+
476+#ifdef CONFIG_PAX_EMUPLT
477+ int err;
478+
479+ do { /* PaX: patched PLT emulation #1 */
480+ unsigned int ldah, ldq, jmp;
481+
482+ err = get_user(ldah, (unsigned int *)regs->pc);
483+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
484+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
485+
486+ if (err)
487+ break;
488+
489+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
490+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
491+ jmp == 0x6BFB0000U)
492+ {
493+ unsigned long r27, addr;
494+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
495+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
496+
497+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
498+ err = get_user(r27, (unsigned long *)addr);
499+ if (err)
500+ break;
501+
502+ regs->r27 = r27;
503+ regs->pc = r27;
504+ return 2;
505+ }
506+ } while (0);
507+
508+ do { /* PaX: patched PLT emulation #2 */
509+ unsigned int ldah, lda, br;
510+
511+ err = get_user(ldah, (unsigned int *)regs->pc);
512+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
513+ err |= get_user(br, (unsigned int *)(regs->pc+8));
514+
515+ if (err)
516+ break;
517+
518+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
519+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
520+ (br & 0xFFE00000U) == 0xC3E00000U)
521+ {
522+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
523+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
524+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
525+
526+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
527+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
528+ return 2;
529+ }
530+ } while (0);
531+
532+ do { /* PaX: unpatched PLT emulation */
533+ unsigned int br;
534+
535+ err = get_user(br, (unsigned int *)regs->pc);
536+
537+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
538+ unsigned int br2, ldq, nop, jmp;
539+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
540+
541+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
542+ err = get_user(br2, (unsigned int *)addr);
543+ err |= get_user(ldq, (unsigned int *)(addr+4));
544+ err |= get_user(nop, (unsigned int *)(addr+8));
545+ err |= get_user(jmp, (unsigned int *)(addr+12));
546+ err |= get_user(resolver, (unsigned long *)(addr+16));
547+
548+ if (err)
549+ break;
550+
551+ if (br2 == 0xC3600000U &&
552+ ldq == 0xA77B000CU &&
553+ nop == 0x47FF041FU &&
554+ jmp == 0x6B7B0000U)
555+ {
556+ regs->r28 = regs->pc+4;
557+ regs->r27 = addr+16;
558+ regs->pc = resolver;
559+ return 3;
560+ }
561+ }
562+ } while (0);
563+#endif
564+
565+ return 1;
566+}
567+
568+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
569+{
570+ unsigned long i;
571+
572+ printk(KERN_ERR "PAX: bytes at PC: ");
573+ for (i = 0; i < 5; i++) {
574+ unsigned int c;
575+ if (get_user(c, (unsigned int *)pc+i))
576+ printk(KERN_CONT "???????? ");
577+ else
578+ printk(KERN_CONT "%08x ", c);
579+ }
580+ printk("\n");
581+}
582+#endif
583
584 /*
585 * This routine handles page faults. It determines the address,
586@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
587 good_area:
588 si_code = SEGV_ACCERR;
589 if (cause < 0) {
590- if (!(vma->vm_flags & VM_EXEC))
591+ if (!(vma->vm_flags & VM_EXEC)) {
592+
593+#ifdef CONFIG_PAX_PAGEEXEC
594+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
595+ goto bad_area;
596+
597+ up_read(&mm->mmap_sem);
598+ switch (pax_handle_fetch_fault(regs)) {
599+
600+#ifdef CONFIG_PAX_EMUPLT
601+ case 2:
602+ case 3:
603+ return;
604+#endif
605+
606+ }
607+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
608+ do_group_exit(SIGKILL);
609+#else
610 goto bad_area;
611+#endif
612+
613+ }
614 } else if (!cause) {
615 /* Allow reads even for write-only mappings */
616 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
617diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
618index 86976d0..8a57797 100644
619--- a/arch/arm/include/asm/atomic.h
620+++ b/arch/arm/include/asm/atomic.h
621@@ -239,6 +239,14 @@ typedef struct {
622 u64 __aligned(8) counter;
623 } atomic64_t;
624
625+#ifdef CONFIG_PAX_REFCOUNT
626+typedef struct {
627+ u64 __aligned(8) counter;
628+} atomic64_unchecked_t;
629+#else
630+typedef atomic64_t atomic64_unchecked_t;
631+#endif
632+
633 #define ATOMIC64_INIT(i) { (i) }
634
635 static inline u64 atomic64_read(atomic64_t *v)
636diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
637index 0e9ce8d..6ef1e03 100644
638--- a/arch/arm/include/asm/elf.h
639+++ b/arch/arm/include/asm/elf.h
640@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
641 the loader. We need to make sure that it is out of the way of the program
642 that it will "exec", and that there is sufficient room for the brk. */
643
644-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
645+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
646+
647+#ifdef CONFIG_PAX_ASLR
648+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
649+
650+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
651+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
652+#endif
653
654 /* When the program starts, a1 contains a pointer to a function to be
655 registered with atexit, as per the SVR4 ABI. A value of 0 means we
656@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
657 extern void elf_set_personality(const struct elf32_hdr *);
658 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
659
660-struct mm_struct;
661-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
662-#define arch_randomize_brk arch_randomize_brk
663-
664 extern int vectors_user_mapping(void);
665 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
666 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
667diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
668index e51b1e8..32a3113 100644
669--- a/arch/arm/include/asm/kmap_types.h
670+++ b/arch/arm/include/asm/kmap_types.h
671@@ -21,6 +21,7 @@ enum km_type {
672 KM_L1_CACHE,
673 KM_L2_CACHE,
674 KM_KDB,
675+ KM_CLEARPAGE,
676 KM_TYPE_NR
677 };
678
679diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
680index b293616..96310e5 100644
681--- a/arch/arm/include/asm/uaccess.h
682+++ b/arch/arm/include/asm/uaccess.h
683@@ -22,6 +22,8 @@
684 #define VERIFY_READ 0
685 #define VERIFY_WRITE 1
686
687+extern void check_object_size(const void *ptr, unsigned long n, bool to);
688+
689 /*
690 * The exception table consists of pairs of addresses: the first is the
691 * address of an instruction that is allowed to fault, and the second is
692@@ -387,8 +389,23 @@ do { \
693
694
695 #ifdef CONFIG_MMU
696-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
697-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
698+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
699+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
700+
701+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
702+{
703+ if (!__builtin_constant_p(n))
704+ check_object_size(to, n, false);
705+ return ___copy_from_user(to, from, n);
706+}
707+
708+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
709+{
710+ if (!__builtin_constant_p(n))
711+ check_object_size(from, n, true);
712+ return ___copy_to_user(to, from, n);
713+}
714+
715 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
716 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
717 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
718@@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
719
720 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
721 {
722+ if ((long)n < 0)
723+ return n;
724+
725 if (access_ok(VERIFY_READ, from, n))
726 n = __copy_from_user(to, from, n);
727 else /* security hole - plug it */
728@@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
729
730 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
731 {
732+ if ((long)n < 0)
733+ return n;
734+
735 if (access_ok(VERIFY_WRITE, to, n))
736 n = __copy_to_user(to, from, n);
737 return n;
738diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
739index 5b0bce6..becd81c 100644
740--- a/arch/arm/kernel/armksyms.c
741+++ b/arch/arm/kernel/armksyms.c
742@@ -95,8 +95,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
743 #ifdef CONFIG_MMU
744 EXPORT_SYMBOL(copy_page);
745
746-EXPORT_SYMBOL(__copy_from_user);
747-EXPORT_SYMBOL(__copy_to_user);
748+EXPORT_SYMBOL(___copy_from_user);
749+EXPORT_SYMBOL(___copy_to_user);
750 EXPORT_SYMBOL(__clear_user);
751
752 EXPORT_SYMBOL(__get_user_1);
753diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
754index 3d0c6fb..3dcae52 100644
755--- a/arch/arm/kernel/process.c
756+++ b/arch/arm/kernel/process.c
757@@ -28,7 +28,6 @@
758 #include <linux/tick.h>
759 #include <linux/utsname.h>
760 #include <linux/uaccess.h>
761-#include <linux/random.h>
762 #include <linux/hw_breakpoint.h>
763 #include <linux/cpuidle.h>
764
765@@ -484,12 +483,6 @@ unsigned long get_wchan(struct task_struct *p)
766 return 0;
767 }
768
769-unsigned long arch_randomize_brk(struct mm_struct *mm)
770-{
771- unsigned long range_end = mm->brk + 0x02000000;
772- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
773-}
774-
775 #ifdef CONFIG_MMU
776 /*
777 * The vectors page is always readable from user space for the
778diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
779index 99a5727..a3d5bb1 100644
780--- a/arch/arm/kernel/traps.c
781+++ b/arch/arm/kernel/traps.c
782@@ -259,6 +259,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
783
784 static DEFINE_RAW_SPINLOCK(die_lock);
785
786+extern void gr_handle_kernel_exploit(void);
787+
788 /*
789 * This function is protected against re-entrancy.
790 */
791@@ -288,6 +290,9 @@ void die(const char *str, struct pt_regs *regs, int err)
792 panic("Fatal exception in interrupt");
793 if (panic_on_oops)
794 panic("Fatal exception");
795+
796+ gr_handle_kernel_exploit();
797+
798 if (ret != NOTIFY_STOP)
799 do_exit(SIGSEGV);
800 }
801diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
802index 66a477a..bee61d3 100644
803--- a/arch/arm/lib/copy_from_user.S
804+++ b/arch/arm/lib/copy_from_user.S
805@@ -16,7 +16,7 @@
806 /*
807 * Prototype:
808 *
809- * size_t __copy_from_user(void *to, const void *from, size_t n)
810+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
811 *
812 * Purpose:
813 *
814@@ -84,11 +84,11 @@
815
816 .text
817
818-ENTRY(__copy_from_user)
819+ENTRY(___copy_from_user)
820
821 #include "copy_template.S"
822
823-ENDPROC(__copy_from_user)
824+ENDPROC(___copy_from_user)
825
826 .pushsection .fixup,"ax"
827 .align 0
828diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
829index d066df6..df28194 100644
830--- a/arch/arm/lib/copy_to_user.S
831+++ b/arch/arm/lib/copy_to_user.S
832@@ -16,7 +16,7 @@
833 /*
834 * Prototype:
835 *
836- * size_t __copy_to_user(void *to, const void *from, size_t n)
837+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
838 *
839 * Purpose:
840 *
841@@ -88,11 +88,11 @@
842 .text
843
844 ENTRY(__copy_to_user_std)
845-WEAK(__copy_to_user)
846+WEAK(___copy_to_user)
847
848 #include "copy_template.S"
849
850-ENDPROC(__copy_to_user)
851+ENDPROC(___copy_to_user)
852 ENDPROC(__copy_to_user_std)
853
854 .pushsection .fixup,"ax"
855diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
856index d0ece2a..5ae2f39 100644
857--- a/arch/arm/lib/uaccess.S
858+++ b/arch/arm/lib/uaccess.S
859@@ -20,7 +20,7 @@
860
861 #define PAGE_SHIFT 12
862
863-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
864+/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
865 * Purpose : copy a block to user memory from kernel memory
866 * Params : to - user memory
867 * : from - kernel memory
868@@ -40,7 +40,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault
869 sub r2, r2, ip
870 b .Lc2u_dest_aligned
871
872-ENTRY(__copy_to_user)
873+ENTRY(___copy_to_user)
874 stmfd sp!, {r2, r4 - r7, lr}
875 cmp r2, #4
876 blt .Lc2u_not_enough
877@@ -278,14 +278,14 @@ USER( T(strgeb) r3, [r0], #1) @ May fault
878 ldrgtb r3, [r1], #0
879 USER( T(strgtb) r3, [r0], #1) @ May fault
880 b .Lc2u_finished
881-ENDPROC(__copy_to_user)
882+ENDPROC(___copy_to_user)
883
884 .pushsection .fixup,"ax"
885 .align 0
886 9001: ldmfd sp!, {r0, r4 - r7, pc}
887 .popsection
888
889-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
890+/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
891 * Purpose : copy a block from user memory to kernel memory
892 * Params : to - kernel memory
893 * : from - user memory
894@@ -304,7 +304,7 @@ USER( T(ldrgtb) r3, [r1], #1) @ May fault
895 sub r2, r2, ip
896 b .Lcfu_dest_aligned
897
898-ENTRY(__copy_from_user)
899+ENTRY(___copy_from_user)
900 stmfd sp!, {r0, r2, r4 - r7, lr}
901 cmp r2, #4
902 blt .Lcfu_not_enough
903@@ -544,7 +544,7 @@ USER( T(ldrgeb) r3, [r1], #1) @ May fault
904 USER( T(ldrgtb) r3, [r1], #1) @ May fault
905 strgtb r3, [r0], #1
906 b .Lcfu_finished
907-ENDPROC(__copy_from_user)
908+ENDPROC(___copy_from_user)
909
910 .pushsection .fixup,"ax"
911 .align 0
912diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
913index 025f742..8432b08 100644
914--- a/arch/arm/lib/uaccess_with_memcpy.c
915+++ b/arch/arm/lib/uaccess_with_memcpy.c
916@@ -104,7 +104,7 @@ out:
917 }
918
919 unsigned long
920-__copy_to_user(void __user *to, const void *from, unsigned long n)
921+___copy_to_user(void __user *to, const void *from, unsigned long n)
922 {
923 /*
924 * This test is stubbed out of the main function above to keep
925diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
926index 2b2d51c..0127490 100644
927--- a/arch/arm/mach-ux500/mbox-db5500.c
928+++ b/arch/arm/mach-ux500/mbox-db5500.c
929@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev,
930 return sprintf(buf, "0x%X\n", mbox_value);
931 }
932
933-static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
934+static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
935
936 static int mbox_show(struct seq_file *s, void *data)
937 {
938diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
939index aa33949..b242a2f 100644
940--- a/arch/arm/mm/fault.c
941+++ b/arch/arm/mm/fault.c
942@@ -183,6 +183,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
943 }
944 #endif
945
946+#ifdef CONFIG_PAX_PAGEEXEC
947+ if (fsr & FSR_LNX_PF) {
948+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
949+ do_group_exit(SIGKILL);
950+ }
951+#endif
952+
953 tsk->thread.address = addr;
954 tsk->thread.error_code = fsr;
955 tsk->thread.trap_no = 14;
956@@ -384,6 +391,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
957 }
958 #endif /* CONFIG_MMU */
959
960+#ifdef CONFIG_PAX_PAGEEXEC
961+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
962+{
963+ long i;
964+
965+ printk(KERN_ERR "PAX: bytes at PC: ");
966+ for (i = 0; i < 20; i++) {
967+ unsigned char c;
968+ if (get_user(c, (__force unsigned char __user *)pc+i))
969+ printk(KERN_CONT "?? ");
970+ else
971+ printk(KERN_CONT "%02x ", c);
972+ }
973+ printk("\n");
974+
975+ printk(KERN_ERR "PAX: bytes at SP-4: ");
976+ for (i = -1; i < 20; i++) {
977+ unsigned long c;
978+ if (get_user(c, (__force unsigned long __user *)sp+i))
979+ printk(KERN_CONT "???????? ");
980+ else
981+ printk(KERN_CONT "%08lx ", c);
982+ }
983+ printk("\n");
984+}
985+#endif
986+
987 /*
988 * First Level Translation Fault Handler
989 *
990diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
991index 44b628e..623ee2a 100644
992--- a/arch/arm/mm/mmap.c
993+++ b/arch/arm/mm/mmap.c
994@@ -54,6 +54,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
995 if (len > TASK_SIZE)
996 return -ENOMEM;
997
998+#ifdef CONFIG_PAX_RANDMMAP
999+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1000+#endif
1001+
1002 if (addr) {
1003 if (do_align)
1004 addr = COLOUR_ALIGN(addr, pgoff);
1005@@ -61,15 +65,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1006 addr = PAGE_ALIGN(addr);
1007
1008 vma = find_vma(mm, addr);
1009- if (TASK_SIZE - len >= addr &&
1010- (!vma || addr + len <= vma->vm_start))
1011+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1012 return addr;
1013 }
1014 if (len > mm->cached_hole_size) {
1015- start_addr = addr = mm->free_area_cache;
1016+ start_addr = addr = mm->free_area_cache;
1017 } else {
1018- start_addr = addr = TASK_UNMAPPED_BASE;
1019- mm->cached_hole_size = 0;
1020+ start_addr = addr = mm->mmap_base;
1021+ mm->cached_hole_size = 0;
1022 }
1023 /* 8 bits of randomness in 20 address space bits */
1024 if ((current->flags & PF_RANDOMIZE) &&
1025@@ -89,14 +92,14 @@ full_search:
1026 * Start a new search - just in case we missed
1027 * some holes.
1028 */
1029- if (start_addr != TASK_UNMAPPED_BASE) {
1030- start_addr = addr = TASK_UNMAPPED_BASE;
1031+ if (start_addr != mm->mmap_base) {
1032+ start_addr = addr = mm->mmap_base;
1033 mm->cached_hole_size = 0;
1034 goto full_search;
1035 }
1036 return -ENOMEM;
1037 }
1038- if (!vma || addr + len <= vma->vm_start) {
1039+ if (check_heap_stack_gap(vma, addr, len)) {
1040 /*
1041 * Remember the place where we stopped the search:
1042 */
1043diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
1044index 3b3159b..425ea94 100644
1045--- a/arch/avr32/include/asm/elf.h
1046+++ b/arch/avr32/include/asm/elf.h
1047@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
1048 the loader. We need to make sure that it is out of the way of the program
1049 that it will "exec", and that there is sufficient room for the brk. */
1050
1051-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1052+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1053
1054+#ifdef CONFIG_PAX_ASLR
1055+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
1056+
1057+#define PAX_DELTA_MMAP_LEN 15
1058+#define PAX_DELTA_STACK_LEN 15
1059+#endif
1060
1061 /* This yields a mask that user programs can use to figure out what
1062 instruction set this CPU supports. This could be done in user space,
1063diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
1064index b7f5c68..556135c 100644
1065--- a/arch/avr32/include/asm/kmap_types.h
1066+++ b/arch/avr32/include/asm/kmap_types.h
1067@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
1068 D(11) KM_IRQ1,
1069 D(12) KM_SOFTIRQ0,
1070 D(13) KM_SOFTIRQ1,
1071-D(14) KM_TYPE_NR
1072+D(14) KM_CLEARPAGE,
1073+D(15) KM_TYPE_NR
1074 };
1075
1076 #undef D
1077diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
1078index f7040a1..db9f300 100644
1079--- a/arch/avr32/mm/fault.c
1080+++ b/arch/avr32/mm/fault.c
1081@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
1082
1083 int exception_trace = 1;
1084
1085+#ifdef CONFIG_PAX_PAGEEXEC
1086+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1087+{
1088+ unsigned long i;
1089+
1090+ printk(KERN_ERR "PAX: bytes at PC: ");
1091+ for (i = 0; i < 20; i++) {
1092+ unsigned char c;
1093+ if (get_user(c, (unsigned char *)pc+i))
1094+ printk(KERN_CONT "???????? ");
1095+ else
1096+ printk(KERN_CONT "%02x ", c);
1097+ }
1098+ printk("\n");
1099+}
1100+#endif
1101+
1102 /*
1103 * This routine handles page faults. It determines the address and the
1104 * problem, and then passes it off to one of the appropriate routines.
1105@@ -156,6 +173,16 @@ bad_area:
1106 up_read(&mm->mmap_sem);
1107
1108 if (user_mode(regs)) {
1109+
1110+#ifdef CONFIG_PAX_PAGEEXEC
1111+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
1112+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
1113+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
1114+ do_group_exit(SIGKILL);
1115+ }
1116+ }
1117+#endif
1118+
1119 if (exception_trace && printk_ratelimit())
1120 printk("%s%s[%d]: segfault at %08lx pc %08lx "
1121 "sp %08lx ecr %lu\n",
1122diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
1123index f8e16b2..c73ff79 100644
1124--- a/arch/frv/include/asm/kmap_types.h
1125+++ b/arch/frv/include/asm/kmap_types.h
1126@@ -23,6 +23,7 @@ enum km_type {
1127 KM_IRQ1,
1128 KM_SOFTIRQ0,
1129 KM_SOFTIRQ1,
1130+ KM_CLEARPAGE,
1131 KM_TYPE_NR
1132 };
1133
1134diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
1135index 385fd30..6c3d97e 100644
1136--- a/arch/frv/mm/elf-fdpic.c
1137+++ b/arch/frv/mm/elf-fdpic.c
1138@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1139 if (addr) {
1140 addr = PAGE_ALIGN(addr);
1141 vma = find_vma(current->mm, addr);
1142- if (TASK_SIZE - len >= addr &&
1143- (!vma || addr + len <= vma->vm_start))
1144+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1145 goto success;
1146 }
1147
1148@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1149 for (; vma; vma = vma->vm_next) {
1150 if (addr > limit)
1151 break;
1152- if (addr + len <= vma->vm_start)
1153+ if (check_heap_stack_gap(vma, addr, len))
1154 goto success;
1155 addr = vma->vm_end;
1156 }
1157@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1158 for (; vma; vma = vma->vm_next) {
1159 if (addr > limit)
1160 break;
1161- if (addr + len <= vma->vm_start)
1162+ if (check_heap_stack_gap(vma, addr, len))
1163 goto success;
1164 addr = vma->vm_end;
1165 }
1166diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
1167index b5298eb..67c6e62 100644
1168--- a/arch/ia64/include/asm/elf.h
1169+++ b/arch/ia64/include/asm/elf.h
1170@@ -42,6 +42,13 @@
1171 */
1172 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
1173
1174+#ifdef CONFIG_PAX_ASLR
1175+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
1176+
1177+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1178+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1179+#endif
1180+
1181 #define PT_IA_64_UNWIND 0x70000001
1182
1183 /* IA-64 relocations: */
1184diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
1185index 1a97af3..7529d31 100644
1186--- a/arch/ia64/include/asm/pgtable.h
1187+++ b/arch/ia64/include/asm/pgtable.h
1188@@ -12,7 +12,7 @@
1189 * David Mosberger-Tang <davidm@hpl.hp.com>
1190 */
1191
1192-
1193+#include <linux/const.h>
1194 #include <asm/mman.h>
1195 #include <asm/page.h>
1196 #include <asm/processor.h>
1197@@ -143,6 +143,17 @@
1198 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1199 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1200 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
1201+
1202+#ifdef CONFIG_PAX_PAGEEXEC
1203+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
1204+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1205+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1206+#else
1207+# define PAGE_SHARED_NOEXEC PAGE_SHARED
1208+# define PAGE_READONLY_NOEXEC PAGE_READONLY
1209+# define PAGE_COPY_NOEXEC PAGE_COPY
1210+#endif
1211+
1212 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
1213 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
1214 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
1215diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
1216index b77768d..e0795eb 100644
1217--- a/arch/ia64/include/asm/spinlock.h
1218+++ b/arch/ia64/include/asm/spinlock.h
1219@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
1220 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
1221
1222 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
1223- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
1224+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
1225 }
1226
1227 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
1228diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
1229index 449c8c0..432a3d2 100644
1230--- a/arch/ia64/include/asm/uaccess.h
1231+++ b/arch/ia64/include/asm/uaccess.h
1232@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
1233 const void *__cu_from = (from); \
1234 long __cu_len = (n); \
1235 \
1236- if (__access_ok(__cu_to, __cu_len, get_fs())) \
1237+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
1238 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
1239 __cu_len; \
1240 })
1241@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
1242 long __cu_len = (n); \
1243 \
1244 __chk_user_ptr(__cu_from); \
1245- if (__access_ok(__cu_from, __cu_len, get_fs())) \
1246+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
1247 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
1248 __cu_len; \
1249 })
1250diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
1251index 24603be..948052d 100644
1252--- a/arch/ia64/kernel/module.c
1253+++ b/arch/ia64/kernel/module.c
1254@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
1255 void
1256 module_free (struct module *mod, void *module_region)
1257 {
1258- if (mod && mod->arch.init_unw_table &&
1259- module_region == mod->module_init) {
1260+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
1261 unw_remove_unwind_table(mod->arch.init_unw_table);
1262 mod->arch.init_unw_table = NULL;
1263 }
1264@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
1265 }
1266
1267 static inline int
1268+in_init_rx (const struct module *mod, uint64_t addr)
1269+{
1270+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
1271+}
1272+
1273+static inline int
1274+in_init_rw (const struct module *mod, uint64_t addr)
1275+{
1276+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
1277+}
1278+
1279+static inline int
1280 in_init (const struct module *mod, uint64_t addr)
1281 {
1282- return addr - (uint64_t) mod->module_init < mod->init_size;
1283+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
1284+}
1285+
1286+static inline int
1287+in_core_rx (const struct module *mod, uint64_t addr)
1288+{
1289+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
1290+}
1291+
1292+static inline int
1293+in_core_rw (const struct module *mod, uint64_t addr)
1294+{
1295+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
1296 }
1297
1298 static inline int
1299 in_core (const struct module *mod, uint64_t addr)
1300 {
1301- return addr - (uint64_t) mod->module_core < mod->core_size;
1302+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
1303 }
1304
1305 static inline int
1306@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
1307 break;
1308
1309 case RV_BDREL:
1310- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
1311+ if (in_init_rx(mod, val))
1312+ val -= (uint64_t) mod->module_init_rx;
1313+ else if (in_init_rw(mod, val))
1314+ val -= (uint64_t) mod->module_init_rw;
1315+ else if (in_core_rx(mod, val))
1316+ val -= (uint64_t) mod->module_core_rx;
1317+ else if (in_core_rw(mod, val))
1318+ val -= (uint64_t) mod->module_core_rw;
1319 break;
1320
1321 case RV_LTV:
1322@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
1323 * addresses have been selected...
1324 */
1325 uint64_t gp;
1326- if (mod->core_size > MAX_LTOFF)
1327+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
1328 /*
1329 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
1330 * at the end of the module.
1331 */
1332- gp = mod->core_size - MAX_LTOFF / 2;
1333+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
1334 else
1335- gp = mod->core_size / 2;
1336- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
1337+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
1338+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
1339 mod->arch.gp = gp;
1340 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
1341 }
1342diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
1343index 609d500..7dde2a8 100644
1344--- a/arch/ia64/kernel/sys_ia64.c
1345+++ b/arch/ia64/kernel/sys_ia64.c
1346@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
1347 if (REGION_NUMBER(addr) == RGN_HPAGE)
1348 addr = 0;
1349 #endif
1350+
1351+#ifdef CONFIG_PAX_RANDMMAP
1352+ if (mm->pax_flags & MF_PAX_RANDMMAP)
1353+ addr = mm->free_area_cache;
1354+ else
1355+#endif
1356+
1357 if (!addr)
1358 addr = mm->free_area_cache;
1359
1360@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
1361 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
1362 /* At this point: (!vma || addr < vma->vm_end). */
1363 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
1364- if (start_addr != TASK_UNMAPPED_BASE) {
1365+ if (start_addr != mm->mmap_base) {
1366 /* Start a new search --- just in case we missed some holes. */
1367- addr = TASK_UNMAPPED_BASE;
1368+ addr = mm->mmap_base;
1369 goto full_search;
1370 }
1371 return -ENOMEM;
1372 }
1373- if (!vma || addr + len <= vma->vm_start) {
1374+ if (check_heap_stack_gap(vma, addr, len)) {
1375 /* Remember the address where we stopped this search: */
1376 mm->free_area_cache = addr + len;
1377 return addr;
1378diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
1379index 53c0ba0..2accdde 100644
1380--- a/arch/ia64/kernel/vmlinux.lds.S
1381+++ b/arch/ia64/kernel/vmlinux.lds.S
1382@@ -199,7 +199,7 @@ SECTIONS {
1383 /* Per-cpu data: */
1384 . = ALIGN(PERCPU_PAGE_SIZE);
1385 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
1386- __phys_per_cpu_start = __per_cpu_load;
1387+ __phys_per_cpu_start = per_cpu_load;
1388 /*
1389 * ensure percpu data fits
1390 * into percpu page size
1391diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
1392index 20b3593..1ce77f0 100644
1393--- a/arch/ia64/mm/fault.c
1394+++ b/arch/ia64/mm/fault.c
1395@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned long address)
1396 return pte_present(pte);
1397 }
1398
1399+#ifdef CONFIG_PAX_PAGEEXEC
1400+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1401+{
1402+ unsigned long i;
1403+
1404+ printk(KERN_ERR "PAX: bytes at PC: ");
1405+ for (i = 0; i < 8; i++) {
1406+ unsigned int c;
1407+ if (get_user(c, (unsigned int *)pc+i))
1408+ printk(KERN_CONT "???????? ");
1409+ else
1410+ printk(KERN_CONT "%08x ", c);
1411+ }
1412+ printk("\n");
1413+}
1414+#endif
1415+
1416 void __kprobes
1417 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
1418 {
1419@@ -146,9 +163,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
1420 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
1421 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
1422
1423- if ((vma->vm_flags & mask) != mask)
1424+ if ((vma->vm_flags & mask) != mask) {
1425+
1426+#ifdef CONFIG_PAX_PAGEEXEC
1427+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
1428+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
1429+ goto bad_area;
1430+
1431+ up_read(&mm->mmap_sem);
1432+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
1433+ do_group_exit(SIGKILL);
1434+ }
1435+#endif
1436+
1437 goto bad_area;
1438
1439+ }
1440+
1441 /*
1442 * If for any reason at all we couldn't handle the fault, make
1443 * sure we exit gracefully rather than endlessly redo the
1444diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
1445index 5ca674b..e0e1b70 100644
1446--- a/arch/ia64/mm/hugetlbpage.c
1447+++ b/arch/ia64/mm/hugetlbpage.c
1448@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
1449 /* At this point: (!vmm || addr < vmm->vm_end). */
1450 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
1451 return -ENOMEM;
1452- if (!vmm || (addr + len) <= vmm->vm_start)
1453+ if (check_heap_stack_gap(vmm, addr, len))
1454 return addr;
1455 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
1456 }
1457diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
1458index 00cb0e2..2ad8024 100644
1459--- a/arch/ia64/mm/init.c
1460+++ b/arch/ia64/mm/init.c
1461@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
1462 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1463 vma->vm_end = vma->vm_start + PAGE_SIZE;
1464 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
1465+
1466+#ifdef CONFIG_PAX_PAGEEXEC
1467+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
1468+ vma->vm_flags &= ~VM_EXEC;
1469+
1470+#ifdef CONFIG_PAX_MPROTECT
1471+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
1472+ vma->vm_flags &= ~VM_MAYEXEC;
1473+#endif
1474+
1475+ }
1476+#endif
1477+
1478 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1479 down_write(&current->mm->mmap_sem);
1480 if (insert_vm_struct(current->mm, vma)) {
1481diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
1482index 82abd15..d95ae5d 100644
1483--- a/arch/m32r/lib/usercopy.c
1484+++ b/arch/m32r/lib/usercopy.c
1485@@ -14,6 +14,9 @@
1486 unsigned long
1487 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
1488 {
1489+ if ((long)n < 0)
1490+ return n;
1491+
1492 prefetch(from);
1493 if (access_ok(VERIFY_WRITE, to, n))
1494 __copy_user(to,from,n);
1495@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
1496 unsigned long
1497 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
1498 {
1499+ if ((long)n < 0)
1500+ return n;
1501+
1502 prefetchw(to);
1503 if (access_ok(VERIFY_READ, from, n))
1504 __copy_user_zeroing(to,from,n);
1505diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
1506index 455c0ac..ad65fbe 100644
1507--- a/arch/mips/include/asm/elf.h
1508+++ b/arch/mips/include/asm/elf.h
1509@@ -372,13 +372,16 @@ extern const char *__elf_platform;
1510 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1511 #endif
1512
1513+#ifdef CONFIG_PAX_ASLR
1514+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
1515+
1516+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1517+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1518+#endif
1519+
1520 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1521 struct linux_binprm;
1522 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
1523 int uses_interp);
1524
1525-struct mm_struct;
1526-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1527-#define arch_randomize_brk arch_randomize_brk
1528-
1529 #endif /* _ASM_ELF_H */
1530diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
1531index e59cd1a..8e329d6 100644
1532--- a/arch/mips/include/asm/page.h
1533+++ b/arch/mips/include/asm/page.h
1534@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
1535 #ifdef CONFIG_CPU_MIPS32
1536 typedef struct { unsigned long pte_low, pte_high; } pte_t;
1537 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
1538- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
1539+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
1540 #else
1541 typedef struct { unsigned long long pte; } pte_t;
1542 #define pte_val(x) ((x).pte)
1543diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
1544index 6018c80..7c37203 100644
1545--- a/arch/mips/include/asm/system.h
1546+++ b/arch/mips/include/asm/system.h
1547@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1548 */
1549 #define __ARCH_WANT_UNLOCKED_CTXSW
1550
1551-extern unsigned long arch_align_stack(unsigned long sp);
1552+#define arch_align_stack(x) ((x) & ~0xfUL)
1553
1554 #endif /* _ASM_SYSTEM_H */
1555diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
1556index 9fdd8bc..4bd7f1a 100644
1557--- a/arch/mips/kernel/binfmt_elfn32.c
1558+++ b/arch/mips/kernel/binfmt_elfn32.c
1559@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
1560 #undef ELF_ET_DYN_BASE
1561 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
1562
1563+#ifdef CONFIG_PAX_ASLR
1564+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
1565+
1566+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1567+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1568+#endif
1569+
1570 #include <asm/processor.h>
1571 #include <linux/module.h>
1572 #include <linux/elfcore.h>
1573diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
1574index ff44823..97f8906 100644
1575--- a/arch/mips/kernel/binfmt_elfo32.c
1576+++ b/arch/mips/kernel/binfmt_elfo32.c
1577@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
1578 #undef ELF_ET_DYN_BASE
1579 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
1580
1581+#ifdef CONFIG_PAX_ASLR
1582+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
1583+
1584+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1585+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1586+#endif
1587+
1588 #include <asm/processor.h>
1589
1590 /*
1591diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
1592index c47f96e..661d418 100644
1593--- a/arch/mips/kernel/process.c
1594+++ b/arch/mips/kernel/process.c
1595@@ -481,15 +481,3 @@ unsigned long get_wchan(struct task_struct *task)
1596 out:
1597 return pc;
1598 }
1599-
1600-/*
1601- * Don't forget that the stack pointer must be aligned on a 8 bytes
1602- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
1603- */
1604-unsigned long arch_align_stack(unsigned long sp)
1605-{
1606- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
1607- sp -= get_random_int() & ~PAGE_MASK;
1608-
1609- return sp & ALMASK;
1610-}
1611diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
1612index 937cf33..adb39bb 100644
1613--- a/arch/mips/mm/fault.c
1614+++ b/arch/mips/mm/fault.c
1615@@ -28,6 +28,23 @@
1616 #include <asm/highmem.h> /* For VMALLOC_END */
1617 #include <linux/kdebug.h>
1618
1619+#ifdef CONFIG_PAX_PAGEEXEC
1620+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1621+{
1622+ unsigned long i;
1623+
1624+ printk(KERN_ERR "PAX: bytes at PC: ");
1625+ for (i = 0; i < 5; i++) {
1626+ unsigned int c;
1627+ if (get_user(c, (unsigned int *)pc+i))
1628+ printk(KERN_CONT "???????? ");
1629+ else
1630+ printk(KERN_CONT "%08x ", c);
1631+ }
1632+ printk("\n");
1633+}
1634+#endif
1635+
1636 /*
1637 * This routine handles page faults. It determines the address,
1638 * and the problem, and then passes it off to one of the appropriate
1639diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
1640index 302d779..7d35bf8 100644
1641--- a/arch/mips/mm/mmap.c
1642+++ b/arch/mips/mm/mmap.c
1643@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
1644 do_color_align = 1;
1645
1646 /* requesting a specific address */
1647+
1648+#ifdef CONFIG_PAX_RANDMMAP
1649+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
1650+#endif
1651+
1652 if (addr) {
1653 if (do_color_align)
1654 addr = COLOUR_ALIGN(addr, pgoff);
1655@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
1656 addr = PAGE_ALIGN(addr);
1657
1658 vma = find_vma(mm, addr);
1659- if (TASK_SIZE - len >= addr &&
1660- (!vma || addr + len <= vma->vm_start))
1661+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
1662 return addr;
1663 }
1664
1665@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
1666 /* At this point: (!vma || addr < vma->vm_end). */
1667 if (TASK_SIZE - len < addr)
1668 return -ENOMEM;
1669- if (!vma || addr + len <= vma->vm_start)
1670+ if (check_heap_stack_gap(vmm, addr, len))
1671 return addr;
1672 addr = vma->vm_end;
1673 if (do_color_align)
1674@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
1675 /* make sure it can fit in the remaining address space */
1676 if (likely(addr > len)) {
1677 vma = find_vma(mm, addr - len);
1678- if (!vma || addr <= vma->vm_start) {
1679+ if (check_heap_stack_gap(vmm, addr - len, len))
1680 /* cache the address as a hint for next time */
1681 return mm->free_area_cache = addr - len;
1682 }
1683@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
1684 * return with success:
1685 */
1686 vma = find_vma(mm, addr);
1687- if (likely(!vma || addr + len <= vma->vm_start)) {
1688+ if (check_heap_stack_gap(vmm, addr, len)) {
1689 /* cache the address as a hint for next time */
1690 return mm->free_area_cache = addr;
1691 }
1692@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
1693 mm->unmap_area = arch_unmap_area_topdown;
1694 }
1695 }
1696-
1697-static inline unsigned long brk_rnd(void)
1698-{
1699- unsigned long rnd = get_random_int();
1700-
1701- rnd = rnd << PAGE_SHIFT;
1702- /* 8MB for 32bit, 256MB for 64bit */
1703- if (TASK_IS_32BIT_ADDR)
1704- rnd = rnd & 0x7ffffful;
1705- else
1706- rnd = rnd & 0xffffffful;
1707-
1708- return rnd;
1709-}
1710-
1711-unsigned long arch_randomize_brk(struct mm_struct *mm)
1712-{
1713- unsigned long base = mm->brk;
1714- unsigned long ret;
1715-
1716- ret = PAGE_ALIGN(base + brk_rnd());
1717-
1718- if (ret < mm->brk)
1719- return mm->brk;
1720-
1721- return ret;
1722-}
1723diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
1724index 19f6cb1..6c78cf2 100644
1725--- a/arch/parisc/include/asm/elf.h
1726+++ b/arch/parisc/include/asm/elf.h
1727@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
1728
1729 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
1730
1731+#ifdef CONFIG_PAX_ASLR
1732+#define PAX_ELF_ET_DYN_BASE 0x10000UL
1733+
1734+#define PAX_DELTA_MMAP_LEN 16
1735+#define PAX_DELTA_STACK_LEN 16
1736+#endif
1737+
1738 /* This yields a mask that user programs can use to figure out what
1739 instruction set this CPU supports. This could be done in user space,
1740 but it's not easy, and we've already done it here. */
1741diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
1742index 22dadeb..f6c2be4 100644
1743--- a/arch/parisc/include/asm/pgtable.h
1744+++ b/arch/parisc/include/asm/pgtable.h
1745@@ -210,6 +210,17 @@ struct vm_area_struct;
1746 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
1747 #define PAGE_COPY PAGE_EXECREAD
1748 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
1749+
1750+#ifdef CONFIG_PAX_PAGEEXEC
1751+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
1752+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
1753+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
1754+#else
1755+# define PAGE_SHARED_NOEXEC PAGE_SHARED
1756+# define PAGE_COPY_NOEXEC PAGE_COPY
1757+# define PAGE_READONLY_NOEXEC PAGE_READONLY
1758+#endif
1759+
1760 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
1761 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
1762 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
1763diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
1764index 5e34ccf..672bc9c 100644
1765--- a/arch/parisc/kernel/module.c
1766+++ b/arch/parisc/kernel/module.c
1767@@ -98,16 +98,38 @@
1768
1769 /* three functions to determine where in the module core
1770 * or init pieces the location is */
1771+static inline int in_init_rx(struct module *me, void *loc)
1772+{
1773+ return (loc >= me->module_init_rx &&
1774+ loc < (me->module_init_rx + me->init_size_rx));
1775+}
1776+
1777+static inline int in_init_rw(struct module *me, void *loc)
1778+{
1779+ return (loc >= me->module_init_rw &&
1780+ loc < (me->module_init_rw + me->init_size_rw));
1781+}
1782+
1783 static inline int in_init(struct module *me, void *loc)
1784 {
1785- return (loc >= me->module_init &&
1786- loc <= (me->module_init + me->init_size));
1787+ return in_init_rx(me, loc) || in_init_rw(me, loc);
1788+}
1789+
1790+static inline int in_core_rx(struct module *me, void *loc)
1791+{
1792+ return (loc >= me->module_core_rx &&
1793+ loc < (me->module_core_rx + me->core_size_rx));
1794+}
1795+
1796+static inline int in_core_rw(struct module *me, void *loc)
1797+{
1798+ return (loc >= me->module_core_rw &&
1799+ loc < (me->module_core_rw + me->core_size_rw));
1800 }
1801
1802 static inline int in_core(struct module *me, void *loc)
1803 {
1804- return (loc >= me->module_core &&
1805- loc <= (me->module_core + me->core_size));
1806+ return in_core_rx(me, loc) || in_core_rw(me, loc);
1807 }
1808
1809 static inline int in_local(struct module *me, void *loc)
1810@@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
1811 }
1812
1813 /* align things a bit */
1814- me->core_size = ALIGN(me->core_size, 16);
1815- me->arch.got_offset = me->core_size;
1816- me->core_size += gots * sizeof(struct got_entry);
1817+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
1818+ me->arch.got_offset = me->core_size_rw;
1819+ me->core_size_rw += gots * sizeof(struct got_entry);
1820
1821- me->core_size = ALIGN(me->core_size, 16);
1822- me->arch.fdesc_offset = me->core_size;
1823- me->core_size += fdescs * sizeof(Elf_Fdesc);
1824+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
1825+ me->arch.fdesc_offset = me->core_size_rw;
1826+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
1827
1828 me->arch.got_max = gots;
1829 me->arch.fdesc_max = fdescs;
1830@@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
1831
1832 BUG_ON(value == 0);
1833
1834- got = me->module_core + me->arch.got_offset;
1835+ got = me->module_core_rw + me->arch.got_offset;
1836 for (i = 0; got[i].addr; i++)
1837 if (got[i].addr == value)
1838 goto out;
1839@@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
1840 #ifdef CONFIG_64BIT
1841 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
1842 {
1843- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
1844+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
1845
1846 if (!value) {
1847 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
1848@@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
1849
1850 /* Create new one */
1851 fdesc->addr = value;
1852- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
1853+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
1854 return (Elf_Addr)fdesc;
1855 }
1856 #endif /* CONFIG_64BIT */
1857@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
1858
1859 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
1860 end = table + sechdrs[me->arch.unwind_section].sh_size;
1861- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
1862+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
1863
1864 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
1865 me->arch.unwind_section, table, end, gp);
1866diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
1867index c9b9322..02d8940 100644
1868--- a/arch/parisc/kernel/sys_parisc.c
1869+++ b/arch/parisc/kernel/sys_parisc.c
1870@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
1871 /* At this point: (!vma || addr < vma->vm_end). */
1872 if (TASK_SIZE - len < addr)
1873 return -ENOMEM;
1874- if (!vma || addr + len <= vma->vm_start)
1875+ if (check_heap_stack_gap(vma, addr, len))
1876 return addr;
1877 addr = vma->vm_end;
1878 }
1879@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
1880 /* At this point: (!vma || addr < vma->vm_end). */
1881 if (TASK_SIZE - len < addr)
1882 return -ENOMEM;
1883- if (!vma || addr + len <= vma->vm_start)
1884+ if (check_heap_stack_gap(vma, addr, len))
1885 return addr;
1886 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
1887 if (addr < vma->vm_end) /* handle wraparound */
1888@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
1889 if (flags & MAP_FIXED)
1890 return addr;
1891 if (!addr)
1892- addr = TASK_UNMAPPED_BASE;
1893+ addr = current->mm->mmap_base;
1894
1895 if (filp) {
1896 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
1897diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
1898index f19e660..414fe24 100644
1899--- a/arch/parisc/kernel/traps.c
1900+++ b/arch/parisc/kernel/traps.c
1901@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
1902
1903 down_read(&current->mm->mmap_sem);
1904 vma = find_vma(current->mm,regs->iaoq[0]);
1905- if (vma && (regs->iaoq[0] >= vma->vm_start)
1906- && (vma->vm_flags & VM_EXEC)) {
1907-
1908+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
1909 fault_address = regs->iaoq[0];
1910 fault_space = regs->iasq[0];
1911
1912diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
1913index 18162ce..94de376 100644
1914--- a/arch/parisc/mm/fault.c
1915+++ b/arch/parisc/mm/fault.c
1916@@ -15,6 +15,7 @@
1917 #include <linux/sched.h>
1918 #include <linux/interrupt.h>
1919 #include <linux/module.h>
1920+#include <linux/unistd.h>
1921
1922 #include <asm/uaccess.h>
1923 #include <asm/traps.h>
1924@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
1925 static unsigned long
1926 parisc_acctyp(unsigned long code, unsigned int inst)
1927 {
1928- if (code == 6 || code == 16)
1929+ if (code == 6 || code == 7 || code == 16)
1930 return VM_EXEC;
1931
1932 switch (inst & 0xf0000000) {
1933@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
1934 }
1935 #endif
1936
1937+#ifdef CONFIG_PAX_PAGEEXEC
1938+/*
1939+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
1940+ *
1941+ * returns 1 when task should be killed
1942+ * 2 when rt_sigreturn trampoline was detected
1943+ * 3 when unpatched PLT trampoline was detected
1944+ */
1945+static int pax_handle_fetch_fault(struct pt_regs *regs)
1946+{
1947+
1948+#ifdef CONFIG_PAX_EMUPLT
1949+ int err;
1950+
1951+ do { /* PaX: unpatched PLT emulation */
1952+ unsigned int bl, depwi;
1953+
1954+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
1955+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
1956+
1957+ if (err)
1958+ break;
1959+
1960+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
1961+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
1962+
1963+ err = get_user(ldw, (unsigned int *)addr);
1964+ err |= get_user(bv, (unsigned int *)(addr+4));
1965+ err |= get_user(ldw2, (unsigned int *)(addr+8));
1966+
1967+ if (err)
1968+ break;
1969+
1970+ if (ldw == 0x0E801096U &&
1971+ bv == 0xEAC0C000U &&
1972+ ldw2 == 0x0E881095U)
1973+ {
1974+ unsigned int resolver, map;
1975+
1976+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
1977+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
1978+ if (err)
1979+ break;
1980+
1981+ regs->gr[20] = instruction_pointer(regs)+8;
1982+ regs->gr[21] = map;
1983+ regs->gr[22] = resolver;
1984+ regs->iaoq[0] = resolver | 3UL;
1985+ regs->iaoq[1] = regs->iaoq[0] + 4;
1986+ return 3;
1987+ }
1988+ }
1989+ } while (0);
1990+#endif
1991+
1992+#ifdef CONFIG_PAX_EMUTRAMP
1993+
1994+#ifndef CONFIG_PAX_EMUSIGRT
1995+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
1996+ return 1;
1997+#endif
1998+
1999+ do { /* PaX: rt_sigreturn emulation */
2000+ unsigned int ldi1, ldi2, bel, nop;
2001+
2002+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
2003+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
2004+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
2005+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
2006+
2007+ if (err)
2008+ break;
2009+
2010+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
2011+ ldi2 == 0x3414015AU &&
2012+ bel == 0xE4008200U &&
2013+ nop == 0x08000240U)
2014+ {
2015+ regs->gr[25] = (ldi1 & 2) >> 1;
2016+ regs->gr[20] = __NR_rt_sigreturn;
2017+ regs->gr[31] = regs->iaoq[1] + 16;
2018+ regs->sr[0] = regs->iasq[1];
2019+ regs->iaoq[0] = 0x100UL;
2020+ regs->iaoq[1] = regs->iaoq[0] + 4;
2021+ regs->iasq[0] = regs->sr[2];
2022+ regs->iasq[1] = regs->sr[2];
2023+ return 2;
2024+ }
2025+ } while (0);
2026+#endif
2027+
2028+ return 1;
2029+}
2030+
2031+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2032+{
2033+ unsigned long i;
2034+
2035+ printk(KERN_ERR "PAX: bytes at PC: ");
2036+ for (i = 0; i < 5; i++) {
2037+ unsigned int c;
2038+ if (get_user(c, (unsigned int *)pc+i))
2039+ printk(KERN_CONT "???????? ");
2040+ else
2041+ printk(KERN_CONT "%08x ", c);
2042+ }
2043+ printk("\n");
2044+}
2045+#endif
2046+
2047 int fixup_exception(struct pt_regs *regs)
2048 {
2049 const struct exception_table_entry *fix;
2050@@ -192,8 +303,33 @@ good_area:
2051
2052 acc_type = parisc_acctyp(code,regs->iir);
2053
2054- if ((vma->vm_flags & acc_type) != acc_type)
2055+ if ((vma->vm_flags & acc_type) != acc_type) {
2056+
2057+#ifdef CONFIG_PAX_PAGEEXEC
2058+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
2059+ (address & ~3UL) == instruction_pointer(regs))
2060+ {
2061+ up_read(&mm->mmap_sem);
2062+ switch (pax_handle_fetch_fault(regs)) {
2063+
2064+#ifdef CONFIG_PAX_EMUPLT
2065+ case 3:
2066+ return;
2067+#endif
2068+
2069+#ifdef CONFIG_PAX_EMUTRAMP
2070+ case 2:
2071+ return;
2072+#endif
2073+
2074+ }
2075+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
2076+ do_group_exit(SIGKILL);
2077+ }
2078+#endif
2079+
2080 goto bad_area;
2081+ }
2082
2083 /*
2084 * If for any reason at all we couldn't handle the fault, make
2085diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
2086index 3bf9cca..e7457d0 100644
2087--- a/arch/powerpc/include/asm/elf.h
2088+++ b/arch/powerpc/include/asm/elf.h
2089@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
2090 the loader. We need to make sure that it is out of the way of the program
2091 that it will "exec", and that there is sufficient room for the brk. */
2092
2093-extern unsigned long randomize_et_dyn(unsigned long base);
2094-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
2095+#define ELF_ET_DYN_BASE (0x20000000)
2096+
2097+#ifdef CONFIG_PAX_ASLR
2098+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
2099+
2100+#ifdef __powerpc64__
2101+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
2102+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
2103+#else
2104+#define PAX_DELTA_MMAP_LEN 15
2105+#define PAX_DELTA_STACK_LEN 15
2106+#endif
2107+#endif
2108
2109 /*
2110 * Our registers are always unsigned longs, whether we're a 32 bit
2111@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2112 (0x7ff >> (PAGE_SHIFT - 12)) : \
2113 (0x3ffff >> (PAGE_SHIFT - 12)))
2114
2115-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2116-#define arch_randomize_brk arch_randomize_brk
2117-
2118 #endif /* __KERNEL__ */
2119
2120 /*
2121diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
2122index bca8fdc..61e9580 100644
2123--- a/arch/powerpc/include/asm/kmap_types.h
2124+++ b/arch/powerpc/include/asm/kmap_types.h
2125@@ -27,6 +27,7 @@ enum km_type {
2126 KM_PPC_SYNC_PAGE,
2127 KM_PPC_SYNC_ICACHE,
2128 KM_KDB,
2129+ KM_CLEARPAGE,
2130 KM_TYPE_NR
2131 };
2132
2133diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
2134index d4a7f64..451de1c 100644
2135--- a/arch/powerpc/include/asm/mman.h
2136+++ b/arch/powerpc/include/asm/mman.h
2137@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
2138 }
2139 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
2140
2141-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
2142+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
2143 {
2144 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
2145 }
2146diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
2147index dd9c4fd..a2ced87 100644
2148--- a/arch/powerpc/include/asm/page.h
2149+++ b/arch/powerpc/include/asm/page.h
2150@@ -141,8 +141,9 @@ extern phys_addr_t kernstart_addr;
2151 * and needs to be executable. This means the whole heap ends
2152 * up being executable.
2153 */
2154-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
2155- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2156+#define VM_DATA_DEFAULT_FLAGS32 \
2157+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
2158+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2159
2160 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
2161 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2162@@ -170,6 +171,9 @@ extern phys_addr_t kernstart_addr;
2163 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
2164 #endif
2165
2166+#define ktla_ktva(addr) (addr)
2167+#define ktva_ktla(addr) (addr)
2168+
2169 /*
2170 * Use the top bit of the higher-level page table entries to indicate whether
2171 * the entries we point to contain hugepages. This works because we know that
2172diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
2173index fb40ede..d3ce956 100644
2174--- a/arch/powerpc/include/asm/page_64.h
2175+++ b/arch/powerpc/include/asm/page_64.h
2176@@ -144,15 +144,18 @@ do { \
2177 * stack by default, so in the absence of a PT_GNU_STACK program header
2178 * we turn execute permission off.
2179 */
2180-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
2181- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2182+#define VM_STACK_DEFAULT_FLAGS32 \
2183+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
2184+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2185
2186 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
2187 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2188
2189+#ifndef CONFIG_PAX_PAGEEXEC
2190 #define VM_STACK_DEFAULT_FLAGS \
2191 (is_32bit_task() ? \
2192 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
2193+#endif
2194
2195 #include <asm-generic/getorder.h>
2196
2197diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
2198index 88b0bd9..e32bc67 100644
2199--- a/arch/powerpc/include/asm/pgtable.h
2200+++ b/arch/powerpc/include/asm/pgtable.h
2201@@ -2,6 +2,7 @@
2202 #define _ASM_POWERPC_PGTABLE_H
2203 #ifdef __KERNEL__
2204
2205+#include <linux/const.h>
2206 #ifndef __ASSEMBLY__
2207 #include <asm/processor.h> /* For TASK_SIZE */
2208 #include <asm/mmu.h>
2209diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
2210index 4aad413..85d86bf 100644
2211--- a/arch/powerpc/include/asm/pte-hash32.h
2212+++ b/arch/powerpc/include/asm/pte-hash32.h
2213@@ -21,6 +21,7 @@
2214 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
2215 #define _PAGE_USER 0x004 /* usermode access allowed */
2216 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
2217+#define _PAGE_EXEC _PAGE_GUARDED
2218 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
2219 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
2220 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
2221diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
2222index 559da19..7e5835c 100644
2223--- a/arch/powerpc/include/asm/reg.h
2224+++ b/arch/powerpc/include/asm/reg.h
2225@@ -212,6 +212,7 @@
2226 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
2227 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
2228 #define DSISR_NOHPTE 0x40000000 /* no translation found */
2229+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
2230 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
2231 #define DSISR_ISSTORE 0x02000000 /* access was a store */
2232 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
2233diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
2234index e30a13d..2b7d994 100644
2235--- a/arch/powerpc/include/asm/system.h
2236+++ b/arch/powerpc/include/asm/system.h
2237@@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
2238 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
2239 #endif
2240
2241-extern unsigned long arch_align_stack(unsigned long sp);
2242+#define arch_align_stack(x) ((x) & ~0xfUL)
2243
2244 /* Used in very early kernel initialization. */
2245 extern unsigned long reloc_offset(void);
2246diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
2247index bd0fb84..a42a14b 100644
2248--- a/arch/powerpc/include/asm/uaccess.h
2249+++ b/arch/powerpc/include/asm/uaccess.h
2250@@ -13,6 +13,8 @@
2251 #define VERIFY_READ 0
2252 #define VERIFY_WRITE 1
2253
2254+extern void check_object_size(const void *ptr, unsigned long n, bool to);
2255+
2256 /*
2257 * The fs value determines whether argument validity checking should be
2258 * performed or not. If get_fs() == USER_DS, checking is performed, with
2259@@ -327,52 +329,6 @@ do { \
2260 extern unsigned long __copy_tofrom_user(void __user *to,
2261 const void __user *from, unsigned long size);
2262
2263-#ifndef __powerpc64__
2264-
2265-static inline unsigned long copy_from_user(void *to,
2266- const void __user *from, unsigned long n)
2267-{
2268- unsigned long over;
2269-
2270- if (access_ok(VERIFY_READ, from, n))
2271- return __copy_tofrom_user((__force void __user *)to, from, n);
2272- if ((unsigned long)from < TASK_SIZE) {
2273- over = (unsigned long)from + n - TASK_SIZE;
2274- return __copy_tofrom_user((__force void __user *)to, from,
2275- n - over) + over;
2276- }
2277- return n;
2278-}
2279-
2280-static inline unsigned long copy_to_user(void __user *to,
2281- const void *from, unsigned long n)
2282-{
2283- unsigned long over;
2284-
2285- if (access_ok(VERIFY_WRITE, to, n))
2286- return __copy_tofrom_user(to, (__force void __user *)from, n);
2287- if ((unsigned long)to < TASK_SIZE) {
2288- over = (unsigned long)to + n - TASK_SIZE;
2289- return __copy_tofrom_user(to, (__force void __user *)from,
2290- n - over) + over;
2291- }
2292- return n;
2293-}
2294-
2295-#else /* __powerpc64__ */
2296-
2297-#define __copy_in_user(to, from, size) \
2298- __copy_tofrom_user((to), (from), (size))
2299-
2300-extern unsigned long copy_from_user(void *to, const void __user *from,
2301- unsigned long n);
2302-extern unsigned long copy_to_user(void __user *to, const void *from,
2303- unsigned long n);
2304-extern unsigned long copy_in_user(void __user *to, const void __user *from,
2305- unsigned long n);
2306-
2307-#endif /* __powerpc64__ */
2308-
2309 static inline unsigned long __copy_from_user_inatomic(void *to,
2310 const void __user *from, unsigned long n)
2311 {
2312@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
2313 if (ret == 0)
2314 return 0;
2315 }
2316+
2317+ if (!__builtin_constant_p(n))
2318+ check_object_size(to, n, false);
2319+
2320 return __copy_tofrom_user((__force void __user *)to, from, n);
2321 }
2322
2323@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
2324 if (ret == 0)
2325 return 0;
2326 }
2327+
2328+ if (!__builtin_constant_p(n))
2329+ check_object_size(from, n, true);
2330+
2331 return __copy_tofrom_user(to, (__force const void __user *)from, n);
2332 }
2333
2334@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
2335 return __copy_to_user_inatomic(to, from, size);
2336 }
2337
2338+#ifndef __powerpc64__
2339+
2340+static inline unsigned long __must_check copy_from_user(void *to,
2341+ const void __user *from, unsigned long n)
2342+{
2343+ unsigned long over;
2344+
2345+ if ((long)n < 0)
2346+ return n;
2347+
2348+ if (access_ok(VERIFY_READ, from, n)) {
2349+ if (!__builtin_constant_p(n))
2350+ check_object_size(to, n, false);
2351+ return __copy_tofrom_user((__force void __user *)to, from, n);
2352+ }
2353+ if ((unsigned long)from < TASK_SIZE) {
2354+ over = (unsigned long)from + n - TASK_SIZE;
2355+ if (!__builtin_constant_p(n - over))
2356+ check_object_size(to, n - over, false);
2357+ return __copy_tofrom_user((__force void __user *)to, from,
2358+ n - over) + over;
2359+ }
2360+ return n;
2361+}
2362+
2363+static inline unsigned long __must_check copy_to_user(void __user *to,
2364+ const void *from, unsigned long n)
2365+{
2366+ unsigned long over;
2367+
2368+ if ((long)n < 0)
2369+ return n;
2370+
2371+ if (access_ok(VERIFY_WRITE, to, n)) {
2372+ if (!__builtin_constant_p(n))
2373+ check_object_size(from, n, true);
2374+ return __copy_tofrom_user(to, (__force void __user *)from, n);
2375+ }
2376+ if ((unsigned long)to < TASK_SIZE) {
2377+ over = (unsigned long)to + n - TASK_SIZE;
2378+ if (!__builtin_constant_p(n))
2379+ check_object_size(from, n - over, true);
2380+ return __copy_tofrom_user(to, (__force void __user *)from,
2381+ n - over) + over;
2382+ }
2383+ return n;
2384+}
2385+
2386+#else /* __powerpc64__ */
2387+
2388+#define __copy_in_user(to, from, size) \
2389+ __copy_tofrom_user((to), (from), (size))
2390+
2391+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2392+{
2393+ if ((long)n < 0 || n > INT_MAX)
2394+ return n;
2395+
2396+ if (!__builtin_constant_p(n))
2397+ check_object_size(to, n, false);
2398+
2399+ if (likely(access_ok(VERIFY_READ, from, n)))
2400+ n = __copy_from_user(to, from, n);
2401+ else
2402+ memset(to, 0, n);
2403+ return n;
2404+}
2405+
2406+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2407+{
2408+ if ((long)n < 0 || n > INT_MAX)
2409+ return n;
2410+
2411+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
2412+ if (!__builtin_constant_p(n))
2413+ check_object_size(from, n, true);
2414+ n = __copy_to_user(to, from, n);
2415+ }
2416+ return n;
2417+}
2418+
2419+extern unsigned long copy_in_user(void __user *to, const void __user *from,
2420+ unsigned long n);
2421+
2422+#endif /* __powerpc64__ */
2423+
2424 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2425
2426 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2427diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
2428index 429983c..7af363b 100644
2429--- a/arch/powerpc/kernel/exceptions-64e.S
2430+++ b/arch/powerpc/kernel/exceptions-64e.S
2431@@ -587,6 +587,7 @@ storage_fault_common:
2432 std r14,_DAR(r1)
2433 std r15,_DSISR(r1)
2434 addi r3,r1,STACK_FRAME_OVERHEAD
2435+ bl .save_nvgprs
2436 mr r4,r14
2437 mr r5,r15
2438 ld r14,PACA_EXGEN+EX_R14(r13)
2439@@ -596,8 +597,7 @@ storage_fault_common:
2440 cmpdi r3,0
2441 bne- 1f
2442 b .ret_from_except_lite
2443-1: bl .save_nvgprs
2444- mr r5,r3
2445+1: mr r5,r3
2446 addi r3,r1,STACK_FRAME_OVERHEAD
2447 ld r4,_DAR(r1)
2448 bl .bad_page_fault
2449diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
2450index cf9c69b..ebc9640 100644
2451--- a/arch/powerpc/kernel/exceptions-64s.S
2452+++ b/arch/powerpc/kernel/exceptions-64s.S
2453@@ -1004,10 +1004,10 @@ handle_page_fault:
2454 11: ld r4,_DAR(r1)
2455 ld r5,_DSISR(r1)
2456 addi r3,r1,STACK_FRAME_OVERHEAD
2457+ bl .save_nvgprs
2458 bl .do_page_fault
2459 cmpdi r3,0
2460 beq+ 13f
2461- bl .save_nvgprs
2462 mr r5,r3
2463 addi r3,r1,STACK_FRAME_OVERHEAD
2464 lwz r4,_DAR(r1)
2465diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
2466index 0b6d796..d760ddb 100644
2467--- a/arch/powerpc/kernel/module_32.c
2468+++ b/arch/powerpc/kernel/module_32.c
2469@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
2470 me->arch.core_plt_section = i;
2471 }
2472 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
2473- printk("Module doesn't contain .plt or .init.plt sections.\n");
2474+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
2475 return -ENOEXEC;
2476 }
2477
2478@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
2479
2480 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
2481 /* Init, or core PLT? */
2482- if (location >= mod->module_core
2483- && location < mod->module_core + mod->core_size)
2484+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
2485+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
2486 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
2487- else
2488+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
2489+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
2490 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
2491+ else {
2492+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
2493+ return ~0UL;
2494+ }
2495
2496 /* Find this entry, or if that fails, the next avail. entry */
2497 while (entry->jump[0]) {
2498diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
2499index 6457574..08b28d3 100644
2500--- a/arch/powerpc/kernel/process.c
2501+++ b/arch/powerpc/kernel/process.c
2502@@ -660,8 +660,8 @@ void show_regs(struct pt_regs * regs)
2503 * Lookup NIP late so we have the best change of getting the
2504 * above info out without failing
2505 */
2506- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
2507- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
2508+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
2509+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
2510 #endif
2511 show_stack(current, (unsigned long *) regs->gpr[1]);
2512 if (!user_mode(regs))
2513@@ -1165,10 +1165,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
2514 newsp = stack[0];
2515 ip = stack[STACK_FRAME_LR_SAVE];
2516 if (!firstframe || ip != lr) {
2517- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
2518+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
2519 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
2520 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
2521- printk(" (%pS)",
2522+ printk(" (%pA)",
2523 (void *)current->ret_stack[curr_frame].ret);
2524 curr_frame--;
2525 }
2526@@ -1188,7 +1188,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
2527 struct pt_regs *regs = (struct pt_regs *)
2528 (sp + STACK_FRAME_OVERHEAD);
2529 lr = regs->link;
2530- printk("--- Exception: %lx at %pS\n LR = %pS\n",
2531+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
2532 regs->trap, (void *)regs->nip, (void *)lr);
2533 firstframe = 1;
2534 }
2535@@ -1263,58 +1263,3 @@ void thread_info_cache_init(void)
2536 }
2537
2538 #endif /* THREAD_SHIFT < PAGE_SHIFT */
2539-
2540-unsigned long arch_align_stack(unsigned long sp)
2541-{
2542- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2543- sp -= get_random_int() & ~PAGE_MASK;
2544- return sp & ~0xf;
2545-}
2546-
2547-static inline unsigned long brk_rnd(void)
2548-{
2549- unsigned long rnd = 0;
2550-
2551- /* 8MB for 32bit, 1GB for 64bit */
2552- if (is_32bit_task())
2553- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
2554- else
2555- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
2556-
2557- return rnd << PAGE_SHIFT;
2558-}
2559-
2560-unsigned long arch_randomize_brk(struct mm_struct *mm)
2561-{
2562- unsigned long base = mm->brk;
2563- unsigned long ret;
2564-
2565-#ifdef CONFIG_PPC_STD_MMU_64
2566- /*
2567- * If we are using 1TB segments and we are allowed to randomise
2568- * the heap, we can put it above 1TB so it is backed by a 1TB
2569- * segment. Otherwise the heap will be in the bottom 1TB
2570- * which always uses 256MB segments and this may result in a
2571- * performance penalty.
2572- */
2573- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
2574- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
2575-#endif
2576-
2577- ret = PAGE_ALIGN(base + brk_rnd());
2578-
2579- if (ret < mm->brk)
2580- return mm->brk;
2581-
2582- return ret;
2583-}
2584-
2585-unsigned long randomize_et_dyn(unsigned long base)
2586-{
2587- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
2588-
2589- if (ret < base)
2590- return base;
2591-
2592- return ret;
2593-}
2594diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
2595index 836a5a1..27289a3 100644
2596--- a/arch/powerpc/kernel/signal_32.c
2597+++ b/arch/powerpc/kernel/signal_32.c
2598@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
2599 /* Save user registers on the stack */
2600 frame = &rt_sf->uc.uc_mcontext;
2601 addr = frame;
2602- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
2603+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
2604 if (save_user_regs(regs, frame, 0, 1))
2605 goto badframe;
2606 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2607diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
2608index a50b5ec..547078a 100644
2609--- a/arch/powerpc/kernel/signal_64.c
2610+++ b/arch/powerpc/kernel/signal_64.c
2611@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
2612 current->thread.fpscr.val = 0;
2613
2614 /* Set up to return from userspace. */
2615- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
2616+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
2617 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2618 } else {
2619 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2620diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
2621index 5459d14..10f8070 100644
2622--- a/arch/powerpc/kernel/traps.c
2623+++ b/arch/powerpc/kernel/traps.c
2624@@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
2625 static inline void pmac_backlight_unblank(void) { }
2626 #endif
2627
2628+extern void gr_handle_kernel_exploit(void);
2629+
2630 int die(const char *str, struct pt_regs *regs, long err)
2631 {
2632 static struct {
2633@@ -171,6 +173,8 @@ int die(const char *str, struct pt_regs *regs, long err)
2634 if (panic_on_oops)
2635 panic("Fatal exception");
2636
2637+ gr_handle_kernel_exploit();
2638+
2639 oops_exit();
2640 do_exit(err);
2641
2642diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
2643index 7d14bb6..1305601 100644
2644--- a/arch/powerpc/kernel/vdso.c
2645+++ b/arch/powerpc/kernel/vdso.c
2646@@ -35,6 +35,7 @@
2647 #include <asm/firmware.h>
2648 #include <asm/vdso.h>
2649 #include <asm/vdso_datapage.h>
2650+#include <asm/mman.h>
2651
2652 #include "setup.h"
2653
2654@@ -219,7 +220,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2655 vdso_base = VDSO32_MBASE;
2656 #endif
2657
2658- current->mm->context.vdso_base = 0;
2659+ current->mm->context.vdso_base = ~0UL;
2660
2661 /* vDSO has a problem and was disabled, just don't "enable" it for the
2662 * process
2663@@ -239,7 +240,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2664 vdso_base = get_unmapped_area(NULL, vdso_base,
2665 (vdso_pages << PAGE_SHIFT) +
2666 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
2667- 0, 0);
2668+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
2669 if (IS_ERR_VALUE(vdso_base)) {
2670 rc = vdso_base;
2671 goto fail_mmapsem;
2672diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
2673index 5eea6f3..5d10396 100644
2674--- a/arch/powerpc/lib/usercopy_64.c
2675+++ b/arch/powerpc/lib/usercopy_64.c
2676@@ -9,22 +9,6 @@
2677 #include <linux/module.h>
2678 #include <asm/uaccess.h>
2679
2680-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
2681-{
2682- if (likely(access_ok(VERIFY_READ, from, n)))
2683- n = __copy_from_user(to, from, n);
2684- else
2685- memset(to, 0, n);
2686- return n;
2687-}
2688-
2689-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
2690-{
2691- if (likely(access_ok(VERIFY_WRITE, to, n)))
2692- n = __copy_to_user(to, from, n);
2693- return n;
2694-}
2695-
2696 unsigned long copy_in_user(void __user *to, const void __user *from,
2697 unsigned long n)
2698 {
2699@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
2700 return n;
2701 }
2702
2703-EXPORT_SYMBOL(copy_from_user);
2704-EXPORT_SYMBOL(copy_to_user);
2705 EXPORT_SYMBOL(copy_in_user);
2706
2707diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
2708index 5efe8c9..db9ceef 100644
2709--- a/arch/powerpc/mm/fault.c
2710+++ b/arch/powerpc/mm/fault.c
2711@@ -32,6 +32,10 @@
2712 #include <linux/perf_event.h>
2713 #include <linux/magic.h>
2714 #include <linux/ratelimit.h>
2715+#include <linux/slab.h>
2716+#include <linux/pagemap.h>
2717+#include <linux/compiler.h>
2718+#include <linux/unistd.h>
2719
2720 #include <asm/firmware.h>
2721 #include <asm/page.h>
2722@@ -43,6 +47,7 @@
2723 #include <asm/tlbflush.h>
2724 #include <asm/siginfo.h>
2725 #include <mm/mmu_decl.h>
2726+#include <asm/ptrace.h>
2727
2728 #ifdef CONFIG_KPROBES
2729 static inline int notify_page_fault(struct pt_regs *regs)
2730@@ -66,6 +71,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
2731 }
2732 #endif
2733
2734+#ifdef CONFIG_PAX_PAGEEXEC
2735+/*
2736+ * PaX: decide what to do with offenders (regs->nip = fault address)
2737+ *
2738+ * returns 1 when task should be killed
2739+ */
2740+static int pax_handle_fetch_fault(struct pt_regs *regs)
2741+{
2742+ return 1;
2743+}
2744+
2745+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2746+{
2747+ unsigned long i;
2748+
2749+ printk(KERN_ERR "PAX: bytes at PC: ");
2750+ for (i = 0; i < 5; i++) {
2751+ unsigned int c;
2752+ if (get_user(c, (unsigned int __user *)pc+i))
2753+ printk(KERN_CONT "???????? ");
2754+ else
2755+ printk(KERN_CONT "%08x ", c);
2756+ }
2757+ printk("\n");
2758+}
2759+#endif
2760+
2761 /*
2762 * Check whether the instruction at regs->nip is a store using
2763 * an update addressing form which will update r1.
2764@@ -136,7 +168,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
2765 * indicate errors in DSISR but can validly be set in SRR1.
2766 */
2767 if (trap == 0x400)
2768- error_code &= 0x48200000;
2769+ error_code &= 0x58200000;
2770 else
2771 is_write = error_code & DSISR_ISSTORE;
2772 #else
2773@@ -259,7 +291,7 @@ good_area:
2774 * "undefined". Of those that can be set, this is the only
2775 * one which seems bad.
2776 */
2777- if (error_code & 0x10000000)
2778+ if (error_code & DSISR_GUARDED)
2779 /* Guarded storage error. */
2780 goto bad_area;
2781 #endif /* CONFIG_8xx */
2782@@ -274,7 +306,7 @@ good_area:
2783 * processors use the same I/D cache coherency mechanism
2784 * as embedded.
2785 */
2786- if (error_code & DSISR_PROTFAULT)
2787+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
2788 goto bad_area;
2789 #endif /* CONFIG_PPC_STD_MMU */
2790
2791@@ -343,6 +375,23 @@ bad_area:
2792 bad_area_nosemaphore:
2793 /* User mode accesses cause a SIGSEGV */
2794 if (user_mode(regs)) {
2795+
2796+#ifdef CONFIG_PAX_PAGEEXEC
2797+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
2798+#ifdef CONFIG_PPC_STD_MMU
2799+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
2800+#else
2801+ if (is_exec && regs->nip == address) {
2802+#endif
2803+ switch (pax_handle_fetch_fault(regs)) {
2804+ }
2805+
2806+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
2807+ do_group_exit(SIGKILL);
2808+ }
2809+ }
2810+#endif
2811+
2812 _exception(SIGSEGV, regs, code, address);
2813 return 0;
2814 }
2815diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
2816index 5a783d8..c23e14b 100644
2817--- a/arch/powerpc/mm/mmap_64.c
2818+++ b/arch/powerpc/mm/mmap_64.c
2819@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
2820 */
2821 if (mmap_is_legacy()) {
2822 mm->mmap_base = TASK_UNMAPPED_BASE;
2823+
2824+#ifdef CONFIG_PAX_RANDMMAP
2825+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2826+ mm->mmap_base += mm->delta_mmap;
2827+#endif
2828+
2829 mm->get_unmapped_area = arch_get_unmapped_area;
2830 mm->unmap_area = arch_unmap_area;
2831 } else {
2832 mm->mmap_base = mmap_base();
2833+
2834+#ifdef CONFIG_PAX_RANDMMAP
2835+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2836+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
2837+#endif
2838+
2839 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2840 mm->unmap_area = arch_unmap_area_topdown;
2841 }
2842diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
2843index 73709f7..6b90313 100644
2844--- a/arch/powerpc/mm/slice.c
2845+++ b/arch/powerpc/mm/slice.c
2846@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
2847 if ((mm->task_size - len) < addr)
2848 return 0;
2849 vma = find_vma(mm, addr);
2850- return (!vma || (addr + len) <= vma->vm_start);
2851+ return check_heap_stack_gap(vma, addr, len);
2852 }
2853
2854 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
2855@@ -256,7 +256,7 @@ full_search:
2856 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
2857 continue;
2858 }
2859- if (!vma || addr + len <= vma->vm_start) {
2860+ if (check_heap_stack_gap(vma, addr, len)) {
2861 /*
2862 * Remember the place where we stopped the search:
2863 */
2864@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
2865 }
2866 }
2867
2868- addr = mm->mmap_base;
2869- while (addr > len) {
2870+ if (mm->mmap_base < len)
2871+ addr = -ENOMEM;
2872+ else
2873+ addr = mm->mmap_base - len;
2874+
2875+ while (!IS_ERR_VALUE(addr)) {
2876 /* Go down by chunk size */
2877- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
2878+ addr = _ALIGN_DOWN(addr, 1ul << pshift);
2879
2880 /* Check for hit with different page size */
2881 mask = slice_range_to_mask(addr, len);
2882@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
2883 * return with success:
2884 */
2885 vma = find_vma(mm, addr);
2886- if (!vma || (addr + len) <= vma->vm_start) {
2887+ if (check_heap_stack_gap(vma, addr, len)) {
2888 /* remember the address as a hint for next time */
2889 if (use_cache)
2890 mm->free_area_cache = addr;
2891@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
2892 mm->cached_hole_size = vma->vm_start - addr;
2893
2894 /* try just below the current vma->vm_start */
2895- addr = vma->vm_start;
2896+ addr = skip_heap_stack_gap(vma, len);
2897 }
2898
2899 /*
2900@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
2901 if (fixed && addr > (mm->task_size - len))
2902 return -EINVAL;
2903
2904+#ifdef CONFIG_PAX_RANDMMAP
2905+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
2906+ addr = 0;
2907+#endif
2908+
2909 /* If hint, make sure it matches our alignment restrictions */
2910 if (!fixed && addr) {
2911 addr = _ALIGN_UP(addr, 1ul << pshift);
2912diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
2913index 547f1a6..3fff354 100644
2914--- a/arch/s390/include/asm/elf.h
2915+++ b/arch/s390/include/asm/elf.h
2916@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
2917 the loader. We need to make sure that it is out of the way of the program
2918 that it will "exec", and that there is sufficient room for the brk. */
2919
2920-extern unsigned long randomize_et_dyn(unsigned long base);
2921-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
2922+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
2923+
2924+#ifdef CONFIG_PAX_ASLR
2925+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
2926+
2927+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 )
2928+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 )
2929+#endif
2930
2931 /* This yields a mask that user programs can use to figure out what
2932 instruction set this CPU supports. */
2933@@ -211,7 +217,4 @@ struct linux_binprm;
2934 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
2935 int arch_setup_additional_pages(struct linux_binprm *, int);
2936
2937-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2938-#define arch_randomize_brk arch_randomize_brk
2939-
2940 #endif
2941diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
2942index ef573c1..75a1ce6 100644
2943--- a/arch/s390/include/asm/system.h
2944+++ b/arch/s390/include/asm/system.h
2945@@ -262,7 +262,7 @@ extern void (*_machine_restart)(char *command);
2946 extern void (*_machine_halt)(void);
2947 extern void (*_machine_power_off)(void);
2948
2949-extern unsigned long arch_align_stack(unsigned long sp);
2950+#define arch_align_stack(x) ((x) & ~0xfUL)
2951
2952 static inline int tprot(unsigned long addr)
2953 {
2954diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
2955index 2b23885..e136e31 100644
2956--- a/arch/s390/include/asm/uaccess.h
2957+++ b/arch/s390/include/asm/uaccess.h
2958@@ -235,6 +235,10 @@ static inline unsigned long __must_check
2959 copy_to_user(void __user *to, const void *from, unsigned long n)
2960 {
2961 might_fault();
2962+
2963+ if ((long)n < 0)
2964+ return n;
2965+
2966 if (access_ok(VERIFY_WRITE, to, n))
2967 n = __copy_to_user(to, from, n);
2968 return n;
2969@@ -260,6 +264,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
2970 static inline unsigned long __must_check
2971 __copy_from_user(void *to, const void __user *from, unsigned long n)
2972 {
2973+ if ((long)n < 0)
2974+ return n;
2975+
2976 if (__builtin_constant_p(n) && (n <= 256))
2977 return uaccess.copy_from_user_small(n, from, to);
2978 else
2979@@ -294,6 +301,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
2980 unsigned int sz = __compiletime_object_size(to);
2981
2982 might_fault();
2983+
2984+ if ((long)n < 0)
2985+ return n;
2986+
2987 if (unlikely(sz != -1 && sz < n)) {
2988 copy_from_user_overflow();
2989 return n;
2990diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
2991index dfcb343..eda788a 100644
2992--- a/arch/s390/kernel/module.c
2993+++ b/arch/s390/kernel/module.c
2994@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
2995
2996 /* Increase core size by size of got & plt and set start
2997 offsets for got and plt. */
2998- me->core_size = ALIGN(me->core_size, 4);
2999- me->arch.got_offset = me->core_size;
3000- me->core_size += me->arch.got_size;
3001- me->arch.plt_offset = me->core_size;
3002- me->core_size += me->arch.plt_size;
3003+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
3004+ me->arch.got_offset = me->core_size_rw;
3005+ me->core_size_rw += me->arch.got_size;
3006+ me->arch.plt_offset = me->core_size_rx;
3007+ me->core_size_rx += me->arch.plt_size;
3008 return 0;
3009 }
3010
3011@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3012 if (info->got_initialized == 0) {
3013 Elf_Addr *gotent;
3014
3015- gotent = me->module_core + me->arch.got_offset +
3016+ gotent = me->module_core_rw + me->arch.got_offset +
3017 info->got_offset;
3018 *gotent = val;
3019 info->got_initialized = 1;
3020@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3021 else if (r_type == R_390_GOTENT ||
3022 r_type == R_390_GOTPLTENT)
3023 *(unsigned int *) loc =
3024- (val + (Elf_Addr) me->module_core - loc) >> 1;
3025+ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
3026 else if (r_type == R_390_GOT64 ||
3027 r_type == R_390_GOTPLT64)
3028 *(unsigned long *) loc = val;
3029@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3030 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
3031 if (info->plt_initialized == 0) {
3032 unsigned int *ip;
3033- ip = me->module_core + me->arch.plt_offset +
3034+ ip = me->module_core_rx + me->arch.plt_offset +
3035 info->plt_offset;
3036 #ifndef CONFIG_64BIT
3037 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
3038@@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3039 val - loc + 0xffffUL < 0x1ffffeUL) ||
3040 (r_type == R_390_PLT32DBL &&
3041 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
3042- val = (Elf_Addr) me->module_core +
3043+ val = (Elf_Addr) me->module_core_rx +
3044 me->arch.plt_offset +
3045 info->plt_offset;
3046 val += rela->r_addend - loc;
3047@@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3048 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
3049 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
3050 val = val + rela->r_addend -
3051- ((Elf_Addr) me->module_core + me->arch.got_offset);
3052+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
3053 if (r_type == R_390_GOTOFF16)
3054 *(unsigned short *) loc = val;
3055 else if (r_type == R_390_GOTOFF32)
3056@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3057 break;
3058 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
3059 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
3060- val = (Elf_Addr) me->module_core + me->arch.got_offset +
3061+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
3062 rela->r_addend - loc;
3063 if (r_type == R_390_GOTPC)
3064 *(unsigned int *) loc = val;
3065diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
3066index 9451b21..ed8956f 100644
3067--- a/arch/s390/kernel/process.c
3068+++ b/arch/s390/kernel/process.c
3069@@ -321,39 +321,3 @@ unsigned long get_wchan(struct task_struct *p)
3070 }
3071 return 0;
3072 }
3073-
3074-unsigned long arch_align_stack(unsigned long sp)
3075-{
3076- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
3077- sp -= get_random_int() & ~PAGE_MASK;
3078- return sp & ~0xf;
3079-}
3080-
3081-static inline unsigned long brk_rnd(void)
3082-{
3083- /* 8MB for 32bit, 1GB for 64bit */
3084- if (is_32bit_task())
3085- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
3086- else
3087- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
3088-}
3089-
3090-unsigned long arch_randomize_brk(struct mm_struct *mm)
3091-{
3092- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
3093-
3094- if (ret < mm->brk)
3095- return mm->brk;
3096- return ret;
3097-}
3098-
3099-unsigned long randomize_et_dyn(unsigned long base)
3100-{
3101- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
3102-
3103- if (!(current->flags & PF_RANDOMIZE))
3104- return base;
3105- if (ret < base)
3106- return base;
3107- return ret;
3108-}
3109diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
3110index f09c748..cf9ec1d 100644
3111--- a/arch/s390/mm/mmap.c
3112+++ b/arch/s390/mm/mmap.c
3113@@ -92,10 +92,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
3114 */
3115 if (mmap_is_legacy()) {
3116 mm->mmap_base = TASK_UNMAPPED_BASE;
3117+
3118+#ifdef CONFIG_PAX_RANDMMAP
3119+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3120+ mm->mmap_base += mm->delta_mmap;
3121+#endif
3122+
3123 mm->get_unmapped_area = arch_get_unmapped_area;
3124 mm->unmap_area = arch_unmap_area;
3125 } else {
3126 mm->mmap_base = mmap_base();
3127+
3128+#ifdef CONFIG_PAX_RANDMMAP
3129+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3130+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
3131+#endif
3132+
3133 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3134 mm->unmap_area = arch_unmap_area_topdown;
3135 }
3136@@ -167,10 +179,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
3137 */
3138 if (mmap_is_legacy()) {
3139 mm->mmap_base = TASK_UNMAPPED_BASE;
3140+
3141+#ifdef CONFIG_PAX_RANDMMAP
3142+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3143+ mm->mmap_base += mm->delta_mmap;
3144+#endif
3145+
3146 mm->get_unmapped_area = s390_get_unmapped_area;
3147 mm->unmap_area = arch_unmap_area;
3148 } else {
3149 mm->mmap_base = mmap_base();
3150+
3151+#ifdef CONFIG_PAX_RANDMMAP
3152+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3153+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
3154+#endif
3155+
3156 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
3157 mm->unmap_area = arch_unmap_area_topdown;
3158 }
3159diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
3160index 589d5c7..669e274 100644
3161--- a/arch/score/include/asm/system.h
3162+++ b/arch/score/include/asm/system.h
3163@@ -17,7 +17,7 @@ do { \
3164 #define finish_arch_switch(prev) do {} while (0)
3165
3166 typedef void (*vi_handler_t)(void);
3167-extern unsigned long arch_align_stack(unsigned long sp);
3168+#define arch_align_stack(x) (x)
3169
3170 #define mb() barrier()
3171 #define rmb() barrier()
3172diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
3173index 25d0803..d6c8e36 100644
3174--- a/arch/score/kernel/process.c
3175+++ b/arch/score/kernel/process.c
3176@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
3177
3178 return task_pt_regs(task)->cp0_epc;
3179 }
3180-
3181-unsigned long arch_align_stack(unsigned long sp)
3182-{
3183- return sp;
3184-}
3185diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
3186index afeb710..d1d1289 100644
3187--- a/arch/sh/mm/mmap.c
3188+++ b/arch/sh/mm/mmap.c
3189@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
3190 addr = PAGE_ALIGN(addr);
3191
3192 vma = find_vma(mm, addr);
3193- if (TASK_SIZE - len >= addr &&
3194- (!vma || addr + len <= vma->vm_start))
3195+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
3196 return addr;
3197 }
3198
3199@@ -106,7 +105,7 @@ full_search:
3200 }
3201 return -ENOMEM;
3202 }
3203- if (likely(!vma || addr + len <= vma->vm_start)) {
3204+ if (likely(check_heap_stack_gap(vma, addr, len))) {
3205 /*
3206 * Remember the place where we stopped the search:
3207 */
3208@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
3209 addr = PAGE_ALIGN(addr);
3210
3211 vma = find_vma(mm, addr);
3212- if (TASK_SIZE - len >= addr &&
3213- (!vma || addr + len <= vma->vm_start))
3214+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
3215 return addr;
3216 }
3217
3218@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
3219 /* make sure it can fit in the remaining address space */
3220 if (likely(addr > len)) {
3221 vma = find_vma(mm, addr-len);
3222- if (!vma || addr <= vma->vm_start) {
3223+ if (check_heap_stack_gap(vma, addr - len, len)) {
3224 /* remember the address as a hint for next time */
3225 return (mm->free_area_cache = addr-len);
3226 }
3227@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
3228 if (unlikely(mm->mmap_base < len))
3229 goto bottomup;
3230
3231- addr = mm->mmap_base-len;
3232- if (do_colour_align)
3233- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
3234+ addr = mm->mmap_base - len;
3235
3236 do {
3237+ if (do_colour_align)
3238+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
3239 /*
3240 * Lookup failure means no vma is above this address,
3241 * else if new region fits below vma->vm_start,
3242 * return with success:
3243 */
3244 vma = find_vma(mm, addr);
3245- if (likely(!vma || addr+len <= vma->vm_start)) {
3246+ if (likely(check_heap_stack_gap(vma, addr, len))) {
3247 /* remember the address as a hint for next time */
3248 return (mm->free_area_cache = addr);
3249 }
3250@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
3251 mm->cached_hole_size = vma->vm_start - addr;
3252
3253 /* try just below the current vma->vm_start */
3254- addr = vma->vm_start-len;
3255- if (do_colour_align)
3256- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
3257- } while (likely(len < vma->vm_start));
3258+ addr = skip_heap_stack_gap(vma, len);
3259+ } while (!IS_ERR_VALUE(addr));
3260
3261 bottomup:
3262 /*
3263diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
3264index ad1fb5d..fc5315b 100644
3265--- a/arch/sparc/Makefile
3266+++ b/arch/sparc/Makefile
3267@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
3268 # Export what is needed by arch/sparc/boot/Makefile
3269 export VMLINUX_INIT VMLINUX_MAIN
3270 VMLINUX_INIT := $(head-y) $(init-y)
3271-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
3272+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
3273 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
3274 VMLINUX_MAIN += $(drivers-y) $(net-y)
3275
3276diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
3277index 9f421df..b81fc12 100644
3278--- a/arch/sparc/include/asm/atomic_64.h
3279+++ b/arch/sparc/include/asm/atomic_64.h
3280@@ -14,18 +14,40 @@
3281 #define ATOMIC64_INIT(i) { (i) }
3282
3283 #define atomic_read(v) (*(volatile int *)&(v)->counter)
3284+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
3285+{
3286+ return v->counter;
3287+}
3288 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
3289+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
3290+{
3291+ return v->counter;
3292+}
3293
3294 #define atomic_set(v, i) (((v)->counter) = i)
3295+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
3296+{
3297+ v->counter = i;
3298+}
3299 #define atomic64_set(v, i) (((v)->counter) = i)
3300+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
3301+{
3302+ v->counter = i;
3303+}
3304
3305 extern void atomic_add(int, atomic_t *);
3306+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
3307 extern void atomic64_add(long, atomic64_t *);
3308+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
3309 extern void atomic_sub(int, atomic_t *);
3310+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
3311 extern void atomic64_sub(long, atomic64_t *);
3312+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
3313
3314 extern int atomic_add_ret(int, atomic_t *);
3315+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
3316 extern long atomic64_add_ret(long, atomic64_t *);
3317+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
3318 extern int atomic_sub_ret(int, atomic_t *);
3319 extern long atomic64_sub_ret(long, atomic64_t *);
3320
3321@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
3322 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
3323
3324 #define atomic_inc_return(v) atomic_add_ret(1, v)
3325+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
3326+{
3327+ return atomic_add_ret_unchecked(1, v);
3328+}
3329 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
3330+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
3331+{
3332+ return atomic64_add_ret_unchecked(1, v);
3333+}
3334
3335 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
3336 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
3337
3338 #define atomic_add_return(i, v) atomic_add_ret(i, v)
3339+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
3340+{
3341+ return atomic_add_ret_unchecked(i, v);
3342+}
3343 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
3344+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
3345+{
3346+ return atomic64_add_ret_unchecked(i, v);
3347+}
3348
3349 /*
3350 * atomic_inc_and_test - increment and test
3351@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
3352 * other cases.
3353 */
3354 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
3355+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
3356+{
3357+ return atomic_inc_return_unchecked(v) == 0;
3358+}
3359 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
3360
3361 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
3362@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
3363 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
3364
3365 #define atomic_inc(v) atomic_add(1, v)
3366+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
3367+{
3368+ atomic_add_unchecked(1, v);
3369+}
3370 #define atomic64_inc(v) atomic64_add(1, v)
3371+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
3372+{
3373+ atomic64_add_unchecked(1, v);
3374+}
3375
3376 #define atomic_dec(v) atomic_sub(1, v)
3377+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
3378+{
3379+ atomic_sub_unchecked(1, v);
3380+}
3381 #define atomic64_dec(v) atomic64_sub(1, v)
3382+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
3383+{
3384+ atomic64_sub_unchecked(1, v);
3385+}
3386
3387 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
3388 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
3389
3390 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
3391+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
3392+{
3393+ return cmpxchg(&v->counter, old, new);
3394+}
3395 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
3396+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
3397+{
3398+ return xchg(&v->counter, new);
3399+}
3400
3401 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
3402 {
3403- int c, old;
3404+ int c, old, new;
3405 c = atomic_read(v);
3406 for (;;) {
3407- if (unlikely(c == (u)))
3408+ if (unlikely(c == u))
3409 break;
3410- old = atomic_cmpxchg((v), c, c + (a));
3411+
3412+ asm volatile("addcc %2, %0, %0\n"
3413+
3414+#ifdef CONFIG_PAX_REFCOUNT
3415+ "tvs %%icc, 6\n"
3416+#endif
3417+
3418+ : "=r" (new)
3419+ : "0" (c), "ir" (a)
3420+ : "cc");
3421+
3422+ old = atomic_cmpxchg(v, c, new);
3423 if (likely(old == c))
3424 break;
3425 c = old;
3426@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
3427 #define atomic64_cmpxchg(v, o, n) \
3428 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
3429 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
3430+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
3431+{
3432+ return xchg(&v->counter, new);
3433+}
3434
3435 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
3436 {
3437- long c, old;
3438+ long c, old, new;
3439 c = atomic64_read(v);
3440 for (;;) {
3441- if (unlikely(c == (u)))
3442+ if (unlikely(c == u))
3443 break;
3444- old = atomic64_cmpxchg((v), c, c + (a));
3445+
3446+ asm volatile("addcc %2, %0, %0\n"
3447+
3448+#ifdef CONFIG_PAX_REFCOUNT
3449+ "tvs %%xcc, 6\n"
3450+#endif
3451+
3452+ : "=r" (new)
3453+ : "0" (c), "ir" (a)
3454+ : "cc");
3455+
3456+ old = atomic64_cmpxchg(v, c, new);
3457 if (likely(old == c))
3458 break;
3459 c = old;
3460 }
3461- return c != (u);
3462+ return c != u;
3463 }
3464
3465 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3466diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
3467index 69358b5..17b4745 100644
3468--- a/arch/sparc/include/asm/cache.h
3469+++ b/arch/sparc/include/asm/cache.h
3470@@ -10,7 +10,7 @@
3471 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
3472
3473 #define L1_CACHE_SHIFT 5
3474-#define L1_CACHE_BYTES 32
3475+#define L1_CACHE_BYTES 32UL
3476
3477 #ifdef CONFIG_SPARC32
3478 #define SMP_CACHE_BYTES_SHIFT 5
3479diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
3480index 4269ca6..e3da77f 100644
3481--- a/arch/sparc/include/asm/elf_32.h
3482+++ b/arch/sparc/include/asm/elf_32.h
3483@@ -114,6 +114,13 @@ typedef struct {
3484
3485 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
3486
3487+#ifdef CONFIG_PAX_ASLR
3488+#define PAX_ELF_ET_DYN_BASE 0x10000UL
3489+
3490+#define PAX_DELTA_MMAP_LEN 16
3491+#define PAX_DELTA_STACK_LEN 16
3492+#endif
3493+
3494 /* This yields a mask that user programs can use to figure out what
3495 instruction set this cpu supports. This can NOT be done in userspace
3496 on Sparc. */
3497diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
3498index 7df8b7f..4946269 100644
3499--- a/arch/sparc/include/asm/elf_64.h
3500+++ b/arch/sparc/include/asm/elf_64.h
3501@@ -180,6 +180,13 @@ typedef struct {
3502 #define ELF_ET_DYN_BASE 0x0000010000000000UL
3503 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
3504
3505+#ifdef CONFIG_PAX_ASLR
3506+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
3507+
3508+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
3509+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
3510+#endif
3511+
3512 extern unsigned long sparc64_elf_hwcap;
3513 #define ELF_HWCAP sparc64_elf_hwcap
3514
3515diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
3516index a790cc6..091ed94 100644
3517--- a/arch/sparc/include/asm/pgtable_32.h
3518+++ b/arch/sparc/include/asm/pgtable_32.h
3519@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
3520 BTFIXUPDEF_INT(page_none)
3521 BTFIXUPDEF_INT(page_copy)
3522 BTFIXUPDEF_INT(page_readonly)
3523+
3524+#ifdef CONFIG_PAX_PAGEEXEC
3525+BTFIXUPDEF_INT(page_shared_noexec)
3526+BTFIXUPDEF_INT(page_copy_noexec)
3527+BTFIXUPDEF_INT(page_readonly_noexec)
3528+#endif
3529+
3530 BTFIXUPDEF_INT(page_kernel)
3531
3532 #define PMD_SHIFT SUN4C_PMD_SHIFT
3533@@ -66,6 +73,16 @@ extern pgprot_t PAGE_SHARED;
3534 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
3535 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
3536
3537+#ifdef CONFIG_PAX_PAGEEXEC
3538+extern pgprot_t PAGE_SHARED_NOEXEC;
3539+# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
3540+# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
3541+#else
3542+# define PAGE_SHARED_NOEXEC PAGE_SHARED
3543+# define PAGE_COPY_NOEXEC PAGE_COPY
3544+# define PAGE_READONLY_NOEXEC PAGE_READONLY
3545+#endif
3546+
3547 extern unsigned long page_kernel;
3548
3549 #ifdef MODULE
3550diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
3551index f6ae2b2..b03ffc7 100644
3552--- a/arch/sparc/include/asm/pgtsrmmu.h
3553+++ b/arch/sparc/include/asm/pgtsrmmu.h
3554@@ -115,6 +115,13 @@
3555 SRMMU_EXEC | SRMMU_REF)
3556 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
3557 SRMMU_EXEC | SRMMU_REF)
3558+
3559+#ifdef CONFIG_PAX_PAGEEXEC
3560+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
3561+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
3562+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
3563+#endif
3564+
3565 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
3566 SRMMU_DIRTY | SRMMU_REF)
3567
3568diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
3569index 9689176..63c18ea 100644
3570--- a/arch/sparc/include/asm/spinlock_64.h
3571+++ b/arch/sparc/include/asm/spinlock_64.h
3572@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
3573
3574 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
3575
3576-static void inline arch_read_lock(arch_rwlock_t *lock)
3577+static inline void arch_read_lock(arch_rwlock_t *lock)
3578 {
3579 unsigned long tmp1, tmp2;
3580
3581 __asm__ __volatile__ (
3582 "1: ldsw [%2], %0\n"
3583 " brlz,pn %0, 2f\n"
3584-"4: add %0, 1, %1\n"
3585+"4: addcc %0, 1, %1\n"
3586+
3587+#ifdef CONFIG_PAX_REFCOUNT
3588+" tvs %%icc, 6\n"
3589+#endif
3590+
3591 " cas [%2], %0, %1\n"
3592 " cmp %0, %1\n"
3593 " bne,pn %%icc, 1b\n"
3594@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
3595 " .previous"
3596 : "=&r" (tmp1), "=&r" (tmp2)
3597 : "r" (lock)
3598- : "memory");
3599+ : "memory", "cc");
3600 }
3601
3602-static int inline arch_read_trylock(arch_rwlock_t *lock)
3603+static inline int arch_read_trylock(arch_rwlock_t *lock)
3604 {
3605 int tmp1, tmp2;
3606
3607@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
3608 "1: ldsw [%2], %0\n"
3609 " brlz,a,pn %0, 2f\n"
3610 " mov 0, %0\n"
3611-" add %0, 1, %1\n"
3612+" addcc %0, 1, %1\n"
3613+
3614+#ifdef CONFIG_PAX_REFCOUNT
3615+" tvs %%icc, 6\n"
3616+#endif
3617+
3618 " cas [%2], %0, %1\n"
3619 " cmp %0, %1\n"
3620 " bne,pn %%icc, 1b\n"
3621@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
3622 return tmp1;
3623 }
3624
3625-static void inline arch_read_unlock(arch_rwlock_t *lock)
3626+static inline void arch_read_unlock(arch_rwlock_t *lock)
3627 {
3628 unsigned long tmp1, tmp2;
3629
3630 __asm__ __volatile__(
3631 "1: lduw [%2], %0\n"
3632-" sub %0, 1, %1\n"
3633+" subcc %0, 1, %1\n"
3634+
3635+#ifdef CONFIG_PAX_REFCOUNT
3636+" tvs %%icc, 6\n"
3637+#endif
3638+
3639 " cas [%2], %0, %1\n"
3640 " cmp %0, %1\n"
3641 " bne,pn %%xcc, 1b\n"
3642@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
3643 : "memory");
3644 }
3645
3646-static void inline arch_write_lock(arch_rwlock_t *lock)
3647+static inline void arch_write_lock(arch_rwlock_t *lock)
3648 {
3649 unsigned long mask, tmp1, tmp2;
3650
3651@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
3652 : "memory");
3653 }
3654
3655-static void inline arch_write_unlock(arch_rwlock_t *lock)
3656+static inline void arch_write_unlock(arch_rwlock_t *lock)
3657 {
3658 __asm__ __volatile__(
3659 " stw %%g0, [%0]"
3660@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
3661 : "memory");
3662 }
3663
3664-static int inline arch_write_trylock(arch_rwlock_t *lock)
3665+static inline int arch_write_trylock(arch_rwlock_t *lock)
3666 {
3667 unsigned long mask, tmp1, tmp2, result;
3668
3669diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
3670index fa57532..e1a4c53 100644
3671--- a/arch/sparc/include/asm/thread_info_32.h
3672+++ b/arch/sparc/include/asm/thread_info_32.h
3673@@ -50,6 +50,8 @@ struct thread_info {
3674 unsigned long w_saved;
3675
3676 struct restart_block restart_block;
3677+
3678+ unsigned long lowest_stack;
3679 };
3680
3681 /*
3682diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
3683index 60d86be..952dea1 100644
3684--- a/arch/sparc/include/asm/thread_info_64.h
3685+++ b/arch/sparc/include/asm/thread_info_64.h
3686@@ -63,6 +63,8 @@ struct thread_info {
3687 struct pt_regs *kern_una_regs;
3688 unsigned int kern_una_insn;
3689
3690+ unsigned long lowest_stack;
3691+
3692 unsigned long fpregs[0] __attribute__ ((aligned(64)));
3693 };
3694
3695diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
3696index e88fbe5..96b0ce5 100644
3697--- a/arch/sparc/include/asm/uaccess.h
3698+++ b/arch/sparc/include/asm/uaccess.h
3699@@ -1,5 +1,13 @@
3700 #ifndef ___ASM_SPARC_UACCESS_H
3701 #define ___ASM_SPARC_UACCESS_H
3702+
3703+#ifdef __KERNEL__
3704+#ifndef __ASSEMBLY__
3705+#include <linux/types.h>
3706+extern void check_object_size(const void *ptr, unsigned long n, bool to);
3707+#endif
3708+#endif
3709+
3710 #if defined(__sparc__) && defined(__arch64__)
3711 #include <asm/uaccess_64.h>
3712 #else
3713diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
3714index 8303ac4..07f333d 100644
3715--- a/arch/sparc/include/asm/uaccess_32.h
3716+++ b/arch/sparc/include/asm/uaccess_32.h
3717@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
3718
3719 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
3720 {
3721- if (n && __access_ok((unsigned long) to, n))
3722+ if ((long)n < 0)
3723+ return n;
3724+
3725+ if (n && __access_ok((unsigned long) to, n)) {
3726+ if (!__builtin_constant_p(n))
3727+ check_object_size(from, n, true);
3728 return __copy_user(to, (__force void __user *) from, n);
3729- else
3730+ } else
3731 return n;
3732 }
3733
3734 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
3735 {
3736+ if ((long)n < 0)
3737+ return n;
3738+
3739+ if (!__builtin_constant_p(n))
3740+ check_object_size(from, n, true);
3741+
3742 return __copy_user(to, (__force void __user *) from, n);
3743 }
3744
3745 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
3746 {
3747- if (n && __access_ok((unsigned long) from, n))
3748+ if ((long)n < 0)
3749+ return n;
3750+
3751+ if (n && __access_ok((unsigned long) from, n)) {
3752+ if (!__builtin_constant_p(n))
3753+ check_object_size(to, n, false);
3754 return __copy_user((__force void __user *) to, from, n);
3755- else
3756+ } else
3757 return n;
3758 }
3759
3760 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
3761 {
3762+ if ((long)n < 0)
3763+ return n;
3764+
3765 return __copy_user((__force void __user *) to, from, n);
3766 }
3767
3768diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
3769index 3e1449f..5293a0e 100644
3770--- a/arch/sparc/include/asm/uaccess_64.h
3771+++ b/arch/sparc/include/asm/uaccess_64.h
3772@@ -10,6 +10,7 @@
3773 #include <linux/compiler.h>
3774 #include <linux/string.h>
3775 #include <linux/thread_info.h>
3776+#include <linux/kernel.h>
3777 #include <asm/asi.h>
3778 #include <asm/system.h>
3779 #include <asm/spitfire.h>
3780@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
3781 static inline unsigned long __must_check
3782 copy_from_user(void *to, const void __user *from, unsigned long size)
3783 {
3784- unsigned long ret = ___copy_from_user(to, from, size);
3785+ unsigned long ret;
3786
3787+ if ((long)size < 0 || size > INT_MAX)
3788+ return size;
3789+
3790+ if (!__builtin_constant_p(size))
3791+ check_object_size(to, size, false);
3792+
3793+ ret = ___copy_from_user(to, from, size);
3794 if (unlikely(ret))
3795 ret = copy_from_user_fixup(to, from, size);
3796
3797@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
3798 static inline unsigned long __must_check
3799 copy_to_user(void __user *to, const void *from, unsigned long size)
3800 {
3801- unsigned long ret = ___copy_to_user(to, from, size);
3802+ unsigned long ret;
3803
3804+ if ((long)size < 0 || size > INT_MAX)
3805+ return size;
3806+
3807+ if (!__builtin_constant_p(size))
3808+ check_object_size(from, size, true);
3809+
3810+ ret = ___copy_to_user(to, from, size);
3811 if (unlikely(ret))
3812 ret = copy_to_user_fixup(to, from, size);
3813 return ret;
3814diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
3815index cb85458..e063f17 100644
3816--- a/arch/sparc/kernel/Makefile
3817+++ b/arch/sparc/kernel/Makefile
3818@@ -3,7 +3,7 @@
3819 #
3820
3821 asflags-y := -ansi
3822-ccflags-y := -Werror
3823+#ccflags-y := -Werror
3824
3825 extra-y := head_$(BITS).o
3826 extra-y += init_task.o
3827diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
3828index f793742..4d880af 100644
3829--- a/arch/sparc/kernel/process_32.c
3830+++ b/arch/sparc/kernel/process_32.c
3831@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
3832 rw->ins[4], rw->ins[5],
3833 rw->ins[6],
3834 rw->ins[7]);
3835- printk("%pS\n", (void *) rw->ins[7]);
3836+ printk("%pA\n", (void *) rw->ins[7]);
3837 rw = (struct reg_window32 *) rw->ins[6];
3838 }
3839 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
3840@@ -271,14 +271,14 @@ void show_regs(struct pt_regs *r)
3841
3842 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
3843 r->psr, r->pc, r->npc, r->y, print_tainted());
3844- printk("PC: <%pS>\n", (void *) r->pc);
3845+ printk("PC: <%pA>\n", (void *) r->pc);
3846 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
3847 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
3848 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
3849 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
3850 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
3851 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
3852- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
3853+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
3854
3855 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
3856 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
3857@@ -313,7 +313,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
3858 rw = (struct reg_window32 *) fp;
3859 pc = rw->ins[7];
3860 printk("[%08lx : ", pc);
3861- printk("%pS ] ", (void *) pc);
3862+ printk("%pA ] ", (void *) pc);
3863 fp = rw->ins[6];
3864 } while (++count < 16);
3865 printk("\n");
3866diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
3867index 3739a06..48b2ff0 100644
3868--- a/arch/sparc/kernel/process_64.c
3869+++ b/arch/sparc/kernel/process_64.c
3870@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_regs *regs)
3871 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
3872 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
3873 if (regs->tstate & TSTATE_PRIV)
3874- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
3875+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
3876 }
3877
3878 void show_regs(struct pt_regs *regs)
3879 {
3880 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
3881 regs->tpc, regs->tnpc, regs->y, print_tainted());
3882- printk("TPC: <%pS>\n", (void *) regs->tpc);
3883+ printk("TPC: <%pA>\n", (void *) regs->tpc);
3884 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
3885 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
3886 regs->u_regs[3]);
3887@@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs)
3888 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
3889 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
3890 regs->u_regs[15]);
3891- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
3892+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
3893 show_regwindow(regs);
3894 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
3895 }
3896@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void)
3897 ((tp && tp->task) ? tp->task->pid : -1));
3898
3899 if (gp->tstate & TSTATE_PRIV) {
3900- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
3901+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
3902 (void *) gp->tpc,
3903 (void *) gp->o7,
3904 (void *) gp->i7,
3905diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
3906index 42b282f..28ce9f2 100644
3907--- a/arch/sparc/kernel/sys_sparc_32.c
3908+++ b/arch/sparc/kernel/sys_sparc_32.c
3909@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
3910 if (ARCH_SUN4C && len > 0x20000000)
3911 return -ENOMEM;
3912 if (!addr)
3913- addr = TASK_UNMAPPED_BASE;
3914+ addr = current->mm->mmap_base;
3915
3916 if (flags & MAP_SHARED)
3917 addr = COLOUR_ALIGN(addr);
3918@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
3919 }
3920 if (TASK_SIZE - PAGE_SIZE - len < addr)
3921 return -ENOMEM;
3922- if (!vmm || addr + len <= vmm->vm_start)
3923+ if (check_heap_stack_gap(vmm, addr, len))
3924 return addr;
3925 addr = vmm->vm_end;
3926 if (flags & MAP_SHARED)
3927diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
3928index 441521a..b767073 100644
3929--- a/arch/sparc/kernel/sys_sparc_64.c
3930+++ b/arch/sparc/kernel/sys_sparc_64.c
3931@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
3932 /* We do not accept a shared mapping if it would violate
3933 * cache aliasing constraints.
3934 */
3935- if ((flags & MAP_SHARED) &&
3936+ if ((filp || (flags & MAP_SHARED)) &&
3937 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
3938 return -EINVAL;
3939 return addr;
3940@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
3941 if (filp || (flags & MAP_SHARED))
3942 do_color_align = 1;
3943
3944+#ifdef CONFIG_PAX_RANDMMAP
3945+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
3946+#endif
3947+
3948 if (addr) {
3949 if (do_color_align)
3950 addr = COLOUR_ALIGN(addr, pgoff);
3951@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
3952 addr = PAGE_ALIGN(addr);
3953
3954 vma = find_vma(mm, addr);
3955- if (task_size - len >= addr &&
3956- (!vma || addr + len <= vma->vm_start))
3957+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
3958 return addr;
3959 }
3960
3961 if (len > mm->cached_hole_size) {
3962- start_addr = addr = mm->free_area_cache;
3963+ start_addr = addr = mm->free_area_cache;
3964 } else {
3965- start_addr = addr = TASK_UNMAPPED_BASE;
3966+ start_addr = addr = mm->mmap_base;
3967 mm->cached_hole_size = 0;
3968 }
3969
3970@@ -174,14 +177,14 @@ full_search:
3971 vma = find_vma(mm, VA_EXCLUDE_END);
3972 }
3973 if (unlikely(task_size < addr)) {
3974- if (start_addr != TASK_UNMAPPED_BASE) {
3975- start_addr = addr = TASK_UNMAPPED_BASE;
3976+ if (start_addr != mm->mmap_base) {
3977+ start_addr = addr = mm->mmap_base;
3978 mm->cached_hole_size = 0;
3979 goto full_search;
3980 }
3981 return -ENOMEM;
3982 }
3983- if (likely(!vma || addr + len <= vma->vm_start)) {
3984+ if (likely(check_heap_stack_gap(vma, addr, len))) {
3985 /*
3986 * Remember the place where we stopped the search:
3987 */
3988@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
3989 /* We do not accept a shared mapping if it would violate
3990 * cache aliasing constraints.
3991 */
3992- if ((flags & MAP_SHARED) &&
3993+ if ((filp || (flags & MAP_SHARED)) &&
3994 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
3995 return -EINVAL;
3996 return addr;
3997@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
3998 addr = PAGE_ALIGN(addr);
3999
4000 vma = find_vma(mm, addr);
4001- if (task_size - len >= addr &&
4002- (!vma || addr + len <= vma->vm_start))
4003+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
4004 return addr;
4005 }
4006
4007@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4008 /* make sure it can fit in the remaining address space */
4009 if (likely(addr > len)) {
4010 vma = find_vma(mm, addr-len);
4011- if (!vma || addr <= vma->vm_start) {
4012+ if (check_heap_stack_gap(vma, addr - len, len)) {
4013 /* remember the address as a hint for next time */
4014 return (mm->free_area_cache = addr-len);
4015 }
4016@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4017 if (unlikely(mm->mmap_base < len))
4018 goto bottomup;
4019
4020- addr = mm->mmap_base-len;
4021- if (do_color_align)
4022- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4023+ addr = mm->mmap_base - len;
4024
4025 do {
4026+ if (do_color_align)
4027+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4028 /*
4029 * Lookup failure means no vma is above this address,
4030 * else if new region fits below vma->vm_start,
4031 * return with success:
4032 */
4033 vma = find_vma(mm, addr);
4034- if (likely(!vma || addr+len <= vma->vm_start)) {
4035+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4036 /* remember the address as a hint for next time */
4037 return (mm->free_area_cache = addr);
4038 }
4039@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4040 mm->cached_hole_size = vma->vm_start - addr;
4041
4042 /* try just below the current vma->vm_start */
4043- addr = vma->vm_start-len;
4044- if (do_color_align)
4045- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4046- } while (likely(len < vma->vm_start));
4047+ addr = skip_heap_stack_gap(vma, len);
4048+ } while (!IS_ERR_VALUE(addr));
4049
4050 bottomup:
4051 /*
4052@@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4053 gap == RLIM_INFINITY ||
4054 sysctl_legacy_va_layout) {
4055 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4056+
4057+#ifdef CONFIG_PAX_RANDMMAP
4058+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4059+ mm->mmap_base += mm->delta_mmap;
4060+#endif
4061+
4062 mm->get_unmapped_area = arch_get_unmapped_area;
4063 mm->unmap_area = arch_unmap_area;
4064 } else {
4065@@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4066 gap = (task_size / 6 * 5);
4067
4068 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
4069+
4070+#ifdef CONFIG_PAX_RANDMMAP
4071+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4072+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4073+#endif
4074+
4075 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4076 mm->unmap_area = arch_unmap_area_topdown;
4077 }
4078diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
4079index 591f20c..0f1b925 100644
4080--- a/arch/sparc/kernel/traps_32.c
4081+++ b/arch/sparc/kernel/traps_32.c
4082@@ -45,6 +45,8 @@ static void instruction_dump(unsigned long *pc)
4083 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
4084 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
4085
4086+extern void gr_handle_kernel_exploit(void);
4087+
4088 void die_if_kernel(char *str, struct pt_regs *regs)
4089 {
4090 static int die_counter;
4091@@ -77,15 +79,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
4092 count++ < 30 &&
4093 (((unsigned long) rw) >= PAGE_OFFSET) &&
4094 !(((unsigned long) rw) & 0x7)) {
4095- printk("Caller[%08lx]: %pS\n", rw->ins[7],
4096+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
4097 (void *) rw->ins[7]);
4098 rw = (struct reg_window32 *)rw->ins[6];
4099 }
4100 }
4101 printk("Instruction DUMP:");
4102 instruction_dump ((unsigned long *) regs->pc);
4103- if(regs->psr & PSR_PS)
4104+ if(regs->psr & PSR_PS) {
4105+ gr_handle_kernel_exploit();
4106 do_exit(SIGKILL);
4107+ }
4108 do_exit(SIGSEGV);
4109 }
4110
4111diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
4112index 0cbdaa4..438e4c9 100644
4113--- a/arch/sparc/kernel/traps_64.c
4114+++ b/arch/sparc/kernel/traps_64.c
4115@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
4116 i + 1,
4117 p->trapstack[i].tstate, p->trapstack[i].tpc,
4118 p->trapstack[i].tnpc, p->trapstack[i].tt);
4119- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
4120+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
4121 }
4122 }
4123
4124@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
4125
4126 lvl -= 0x100;
4127 if (regs->tstate & TSTATE_PRIV) {
4128+
4129+#ifdef CONFIG_PAX_REFCOUNT
4130+ if (lvl == 6)
4131+ pax_report_refcount_overflow(regs);
4132+#endif
4133+
4134 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
4135 die_if_kernel(buffer, regs);
4136 }
4137@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
4138 void bad_trap_tl1(struct pt_regs *regs, long lvl)
4139 {
4140 char buffer[32];
4141-
4142+
4143 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
4144 0, lvl, SIGTRAP) == NOTIFY_STOP)
4145 return;
4146
4147+#ifdef CONFIG_PAX_REFCOUNT
4148+ if (lvl == 6)
4149+ pax_report_refcount_overflow(regs);
4150+#endif
4151+
4152 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
4153
4154 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
4155@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
4156 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
4157 printk("%s" "ERROR(%d): ",
4158 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
4159- printk("TPC<%pS>\n", (void *) regs->tpc);
4160+ printk("TPC<%pA>\n", (void *) regs->tpc);
4161 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
4162 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
4163 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
4164@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
4165 smp_processor_id(),
4166 (type & 0x1) ? 'I' : 'D',
4167 regs->tpc);
4168- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
4169+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
4170 panic("Irrecoverable Cheetah+ parity error.");
4171 }
4172
4173@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
4174 smp_processor_id(),
4175 (type & 0x1) ? 'I' : 'D',
4176 regs->tpc);
4177- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
4178+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
4179 }
4180
4181 struct sun4v_error_entry {
4182@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
4183
4184 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
4185 regs->tpc, tl);
4186- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
4187+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
4188 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
4189- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
4190+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
4191 (void *) regs->u_regs[UREG_I7]);
4192 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
4193 "pte[%lx] error[%lx]\n",
4194@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
4195
4196 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
4197 regs->tpc, tl);
4198- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
4199+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
4200 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
4201- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
4202+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
4203 (void *) regs->u_regs[UREG_I7]);
4204 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
4205 "pte[%lx] error[%lx]\n",
4206@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
4207 fp = (unsigned long)sf->fp + STACK_BIAS;
4208 }
4209
4210- printk(" [%016lx] %pS\n", pc, (void *) pc);
4211+ printk(" [%016lx] %pA\n", pc, (void *) pc);
4212 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
4213 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
4214 int index = tsk->curr_ret_stack;
4215 if (tsk->ret_stack && index >= graph) {
4216 pc = tsk->ret_stack[index - graph].ret;
4217- printk(" [%016lx] %pS\n", pc, (void *) pc);
4218+ printk(" [%016lx] %pA\n", pc, (void *) pc);
4219 graph++;
4220 }
4221 }
4222@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
4223 return (struct reg_window *) (fp + STACK_BIAS);
4224 }
4225
4226+extern void gr_handle_kernel_exploit(void);
4227+
4228 void die_if_kernel(char *str, struct pt_regs *regs)
4229 {
4230 static int die_counter;
4231@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
4232 while (rw &&
4233 count++ < 30 &&
4234 kstack_valid(tp, (unsigned long) rw)) {
4235- printk("Caller[%016lx]: %pS\n", rw->ins[7],
4236+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
4237 (void *) rw->ins[7]);
4238
4239 rw = kernel_stack_up(rw);
4240@@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
4241 }
4242 user_instruction_dump ((unsigned int __user *) regs->tpc);
4243 }
4244- if (regs->tstate & TSTATE_PRIV)
4245+ if (regs->tstate & TSTATE_PRIV) {
4246+ gr_handle_kernel_exploit();
4247 do_exit(SIGKILL);
4248+ }
4249 do_exit(SIGSEGV);
4250 }
4251 EXPORT_SYMBOL(die_if_kernel);
4252diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
4253index 76e4ac1..78f8bb1 100644
4254--- a/arch/sparc/kernel/unaligned_64.c
4255+++ b/arch/sparc/kernel/unaligned_64.c
4256@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs *regs)
4257 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
4258
4259 if (__ratelimit(&ratelimit)) {
4260- printk("Kernel unaligned access at TPC[%lx] %pS\n",
4261+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
4262 regs->tpc, (void *) regs->tpc);
4263 }
4264 }
4265diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
4266index a3fc437..fea9957 100644
4267--- a/arch/sparc/lib/Makefile
4268+++ b/arch/sparc/lib/Makefile
4269@@ -2,7 +2,7 @@
4270 #
4271
4272 asflags-y := -ansi -DST_DIV0=0x02
4273-ccflags-y := -Werror
4274+#ccflags-y := -Werror
4275
4276 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
4277 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
4278diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
4279index 59186e0..f747d7a 100644
4280--- a/arch/sparc/lib/atomic_64.S
4281+++ b/arch/sparc/lib/atomic_64.S
4282@@ -18,7 +18,12 @@
4283 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
4284 BACKOFF_SETUP(%o2)
4285 1: lduw [%o1], %g1
4286- add %g1, %o0, %g7
4287+ addcc %g1, %o0, %g7
4288+
4289+#ifdef CONFIG_PAX_REFCOUNT
4290+ tvs %icc, 6
4291+#endif
4292+
4293 cas [%o1], %g1, %g7
4294 cmp %g1, %g7
4295 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
4296@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
4297 2: BACKOFF_SPIN(%o2, %o3, 1b)
4298 .size atomic_add, .-atomic_add
4299
4300+ .globl atomic_add_unchecked
4301+ .type atomic_add_unchecked,#function
4302+atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
4303+ BACKOFF_SETUP(%o2)
4304+1: lduw [%o1], %g1
4305+ add %g1, %o0, %g7
4306+ cas [%o1], %g1, %g7
4307+ cmp %g1, %g7
4308+ bne,pn %icc, 2f
4309+ nop
4310+ retl
4311+ nop
4312+2: BACKOFF_SPIN(%o2, %o3, 1b)
4313+ .size atomic_add_unchecked, .-atomic_add_unchecked
4314+
4315 .globl atomic_sub
4316 .type atomic_sub,#function
4317 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
4318 BACKOFF_SETUP(%o2)
4319 1: lduw [%o1], %g1
4320- sub %g1, %o0, %g7
4321+ subcc %g1, %o0, %g7
4322+
4323+#ifdef CONFIG_PAX_REFCOUNT
4324+ tvs %icc, 6
4325+#endif
4326+
4327 cas [%o1], %g1, %g7
4328 cmp %g1, %g7
4329 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
4330@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
4331 2: BACKOFF_SPIN(%o2, %o3, 1b)
4332 .size atomic_sub, .-atomic_sub
4333
4334+ .globl atomic_sub_unchecked
4335+ .type atomic_sub_unchecked,#function
4336+atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
4337+ BACKOFF_SETUP(%o2)
4338+1: lduw [%o1], %g1
4339+ sub %g1, %o0, %g7
4340+ cas [%o1], %g1, %g7
4341+ cmp %g1, %g7
4342+ bne,pn %icc, 2f
4343+ nop
4344+ retl
4345+ nop
4346+2: BACKOFF_SPIN(%o2, %o3, 1b)
4347+ .size atomic_sub_unchecked, .-atomic_sub_unchecked
4348+
4349 .globl atomic_add_ret
4350 .type atomic_add_ret,#function
4351 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
4352 BACKOFF_SETUP(%o2)
4353 1: lduw [%o1], %g1
4354- add %g1, %o0, %g7
4355+ addcc %g1, %o0, %g7
4356+
4357+#ifdef CONFIG_PAX_REFCOUNT
4358+ tvs %icc, 6
4359+#endif
4360+
4361 cas [%o1], %g1, %g7
4362 cmp %g1, %g7
4363 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
4364@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
4365 2: BACKOFF_SPIN(%o2, %o3, 1b)
4366 .size atomic_add_ret, .-atomic_add_ret
4367
4368+ .globl atomic_add_ret_unchecked
4369+ .type atomic_add_ret_unchecked,#function
4370+atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
4371+ BACKOFF_SETUP(%o2)
4372+1: lduw [%o1], %g1
4373+ addcc %g1, %o0, %g7
4374+ cas [%o1], %g1, %g7
4375+ cmp %g1, %g7
4376+ bne,pn %icc, 2f
4377+ add %g7, %o0, %g7
4378+ sra %g7, 0, %o0
4379+ retl
4380+ nop
4381+2: BACKOFF_SPIN(%o2, %o3, 1b)
4382+ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
4383+
4384 .globl atomic_sub_ret
4385 .type atomic_sub_ret,#function
4386 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
4387 BACKOFF_SETUP(%o2)
4388 1: lduw [%o1], %g1
4389- sub %g1, %o0, %g7
4390+ subcc %g1, %o0, %g7
4391+
4392+#ifdef CONFIG_PAX_REFCOUNT
4393+ tvs %icc, 6
4394+#endif
4395+
4396 cas [%o1], %g1, %g7
4397 cmp %g1, %g7
4398 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
4399@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
4400 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
4401 BACKOFF_SETUP(%o2)
4402 1: ldx [%o1], %g1
4403- add %g1, %o0, %g7
4404+ addcc %g1, %o0, %g7
4405+
4406+#ifdef CONFIG_PAX_REFCOUNT
4407+ tvs %xcc, 6
4408+#endif
4409+
4410 casx [%o1], %g1, %g7
4411 cmp %g1, %g7
4412 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
4413@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
4414 2: BACKOFF_SPIN(%o2, %o3, 1b)
4415 .size atomic64_add, .-atomic64_add
4416
4417+ .globl atomic64_add_unchecked
4418+ .type atomic64_add_unchecked,#function
4419+atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
4420+ BACKOFF_SETUP(%o2)
4421+1: ldx [%o1], %g1
4422+ addcc %g1, %o0, %g7
4423+ casx [%o1], %g1, %g7
4424+ cmp %g1, %g7
4425+ bne,pn %xcc, 2f
4426+ nop
4427+ retl
4428+ nop
4429+2: BACKOFF_SPIN(%o2, %o3, 1b)
4430+ .size atomic64_add_unchecked, .-atomic64_add_unchecked
4431+
4432 .globl atomic64_sub
4433 .type atomic64_sub,#function
4434 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
4435 BACKOFF_SETUP(%o2)
4436 1: ldx [%o1], %g1
4437- sub %g1, %o0, %g7
4438+ subcc %g1, %o0, %g7
4439+
4440+#ifdef CONFIG_PAX_REFCOUNT
4441+ tvs %xcc, 6
4442+#endif
4443+
4444 casx [%o1], %g1, %g7
4445 cmp %g1, %g7
4446 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
4447@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
4448 2: BACKOFF_SPIN(%o2, %o3, 1b)
4449 .size atomic64_sub, .-atomic64_sub
4450
4451+ .globl atomic64_sub_unchecked
4452+ .type atomic64_sub_unchecked,#function
4453+atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
4454+ BACKOFF_SETUP(%o2)
4455+1: ldx [%o1], %g1
4456+ subcc %g1, %o0, %g7
4457+ casx [%o1], %g1, %g7
4458+ cmp %g1, %g7
4459+ bne,pn %xcc, 2f
4460+ nop
4461+ retl
4462+ nop
4463+2: BACKOFF_SPIN(%o2, %o3, 1b)
4464+ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
4465+
4466 .globl atomic64_add_ret
4467 .type atomic64_add_ret,#function
4468 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
4469 BACKOFF_SETUP(%o2)
4470 1: ldx [%o1], %g1
4471- add %g1, %o0, %g7
4472+ addcc %g1, %o0, %g7
4473+
4474+#ifdef CONFIG_PAX_REFCOUNT
4475+ tvs %xcc, 6
4476+#endif
4477+
4478 casx [%o1], %g1, %g7
4479 cmp %g1, %g7
4480 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
4481@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
4482 2: BACKOFF_SPIN(%o2, %o3, 1b)
4483 .size atomic64_add_ret, .-atomic64_add_ret
4484
4485+ .globl atomic64_add_ret_unchecked
4486+ .type atomic64_add_ret_unchecked,#function
4487+atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
4488+ BACKOFF_SETUP(%o2)
4489+1: ldx [%o1], %g1
4490+ addcc %g1, %o0, %g7
4491+ casx [%o1], %g1, %g7
4492+ cmp %g1, %g7
4493+ bne,pn %xcc, 2f
4494+ add %g7, %o0, %g7
4495+ mov %g7, %o0
4496+ retl
4497+ nop
4498+2: BACKOFF_SPIN(%o2, %o3, 1b)
4499+ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
4500+
4501 .globl atomic64_sub_ret
4502 .type atomic64_sub_ret,#function
4503 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
4504 BACKOFF_SETUP(%o2)
4505 1: ldx [%o1], %g1
4506- sub %g1, %o0, %g7
4507+ subcc %g1, %o0, %g7
4508+
4509+#ifdef CONFIG_PAX_REFCOUNT
4510+ tvs %xcc, 6
4511+#endif
4512+
4513 casx [%o1], %g1, %g7
4514 cmp %g1, %g7
4515 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
4516diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
4517index 1b30bb3..b4a16c7 100644
4518--- a/arch/sparc/lib/ksyms.c
4519+++ b/arch/sparc/lib/ksyms.c
4520@@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
4521
4522 /* Atomic counter implementation. */
4523 EXPORT_SYMBOL(atomic_add);
4524+EXPORT_SYMBOL(atomic_add_unchecked);
4525 EXPORT_SYMBOL(atomic_add_ret);
4526+EXPORT_SYMBOL(atomic_add_ret_unchecked);
4527 EXPORT_SYMBOL(atomic_sub);
4528+EXPORT_SYMBOL(atomic_sub_unchecked);
4529 EXPORT_SYMBOL(atomic_sub_ret);
4530 EXPORT_SYMBOL(atomic64_add);
4531+EXPORT_SYMBOL(atomic64_add_unchecked);
4532 EXPORT_SYMBOL(atomic64_add_ret);
4533+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
4534 EXPORT_SYMBOL(atomic64_sub);
4535+EXPORT_SYMBOL(atomic64_sub_unchecked);
4536 EXPORT_SYMBOL(atomic64_sub_ret);
4537
4538 /* Atomic bit operations. */
4539diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
4540index 301421c..e2535d1 100644
4541--- a/arch/sparc/mm/Makefile
4542+++ b/arch/sparc/mm/Makefile
4543@@ -2,7 +2,7 @@
4544 #
4545
4546 asflags-y := -ansi
4547-ccflags-y := -Werror
4548+#ccflags-y := -Werror
4549
4550 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
4551 obj-y += fault_$(BITS).o
4552diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
4553index 8023fd7..c8e89e9 100644
4554--- a/arch/sparc/mm/fault_32.c
4555+++ b/arch/sparc/mm/fault_32.c
4556@@ -21,6 +21,9 @@
4557 #include <linux/perf_event.h>
4558 #include <linux/interrupt.h>
4559 #include <linux/kdebug.h>
4560+#include <linux/slab.h>
4561+#include <linux/pagemap.h>
4562+#include <linux/compiler.h>
4563
4564 #include <asm/system.h>
4565 #include <asm/page.h>
4566@@ -208,6 +211,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
4567 return safe_compute_effective_address(regs, insn);
4568 }
4569
4570+#ifdef CONFIG_PAX_PAGEEXEC
4571+#ifdef CONFIG_PAX_DLRESOLVE
4572+static void pax_emuplt_close(struct vm_area_struct *vma)
4573+{
4574+ vma->vm_mm->call_dl_resolve = 0UL;
4575+}
4576+
4577+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
4578+{
4579+ unsigned int *kaddr;
4580+
4581+ vmf->page = alloc_page(GFP_HIGHUSER);
4582+ if (!vmf->page)
4583+ return VM_FAULT_OOM;
4584+
4585+ kaddr = kmap(vmf->page);
4586+ memset(kaddr, 0, PAGE_SIZE);
4587+ kaddr[0] = 0x9DE3BFA8U; /* save */
4588+ flush_dcache_page(vmf->page);
4589+ kunmap(vmf->page);
4590+ return VM_FAULT_MAJOR;
4591+}
4592+
4593+static const struct vm_operations_struct pax_vm_ops = {
4594+ .close = pax_emuplt_close,
4595+ .fault = pax_emuplt_fault
4596+};
4597+
4598+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
4599+{
4600+ int ret;
4601+
4602+ INIT_LIST_HEAD(&vma->anon_vma_chain);
4603+ vma->vm_mm = current->mm;
4604+ vma->vm_start = addr;
4605+ vma->vm_end = addr + PAGE_SIZE;
4606+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
4607+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
4608+ vma->vm_ops = &pax_vm_ops;
4609+
4610+ ret = insert_vm_struct(current->mm, vma);
4611+ if (ret)
4612+ return ret;
4613+
4614+ ++current->mm->total_vm;
4615+ return 0;
4616+}
4617+#endif
4618+
4619+/*
4620+ * PaX: decide what to do with offenders (regs->pc = fault address)
4621+ *
4622+ * returns 1 when task should be killed
4623+ * 2 when patched PLT trampoline was detected
4624+ * 3 when unpatched PLT trampoline was detected
4625+ */
4626+static int pax_handle_fetch_fault(struct pt_regs *regs)
4627+{
4628+
4629+#ifdef CONFIG_PAX_EMUPLT
4630+ int err;
4631+
4632+ do { /* PaX: patched PLT emulation #1 */
4633+ unsigned int sethi1, sethi2, jmpl;
4634+
4635+ err = get_user(sethi1, (unsigned int *)regs->pc);
4636+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
4637+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
4638+
4639+ if (err)
4640+ break;
4641+
4642+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
4643+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
4644+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
4645+ {
4646+ unsigned int addr;
4647+
4648+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
4649+ addr = regs->u_regs[UREG_G1];
4650+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
4651+ regs->pc = addr;
4652+ regs->npc = addr+4;
4653+ return 2;
4654+ }
4655+ } while (0);
4656+
4657+ { /* PaX: patched PLT emulation #2 */
4658+ unsigned int ba;
4659+
4660+ err = get_user(ba, (unsigned int *)regs->pc);
4661+
4662+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
4663+ unsigned int addr;
4664+
4665+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
4666+ regs->pc = addr;
4667+ regs->npc = addr+4;
4668+ return 2;
4669+ }
4670+ }
4671+
4672+ do { /* PaX: patched PLT emulation #3 */
4673+ unsigned int sethi, jmpl, nop;
4674+
4675+ err = get_user(sethi, (unsigned int *)regs->pc);
4676+ err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
4677+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
4678+
4679+ if (err)
4680+ break;
4681+
4682+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
4683+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
4684+ nop == 0x01000000U)
4685+ {
4686+ unsigned int addr;
4687+
4688+ addr = (sethi & 0x003FFFFFU) << 10;
4689+ regs->u_regs[UREG_G1] = addr;
4690+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
4691+ regs->pc = addr;
4692+ regs->npc = addr+4;
4693+ return 2;
4694+ }
4695+ } while (0);
4696+
4697+ do { /* PaX: unpatched PLT emulation step 1 */
4698+ unsigned int sethi, ba, nop;
4699+
4700+ err = get_user(sethi, (unsigned int *)regs->pc);
4701+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
4702+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
4703+
4704+ if (err)
4705+ break;
4706+
4707+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
4708+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
4709+ nop == 0x01000000U)
4710+ {
4711+ unsigned int addr, save, call;
4712+
4713+ if ((ba & 0xFFC00000U) == 0x30800000U)
4714+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
4715+ else
4716+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
4717+
4718+ err = get_user(save, (unsigned int *)addr);
4719+ err |= get_user(call, (unsigned int *)(addr+4));
4720+ err |= get_user(nop, (unsigned int *)(addr+8));
4721+ if (err)
4722+ break;
4723+
4724+#ifdef CONFIG_PAX_DLRESOLVE
4725+ if (save == 0x9DE3BFA8U &&
4726+ (call & 0xC0000000U) == 0x40000000U &&
4727+ nop == 0x01000000U)
4728+ {
4729+ struct vm_area_struct *vma;
4730+ unsigned long call_dl_resolve;
4731+
4732+ down_read(&current->mm->mmap_sem);
4733+ call_dl_resolve = current->mm->call_dl_resolve;
4734+ up_read(&current->mm->mmap_sem);
4735+ if (likely(call_dl_resolve))
4736+ goto emulate;
4737+
4738+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
4739+
4740+ down_write(&current->mm->mmap_sem);
4741+ if (current->mm->call_dl_resolve) {
4742+ call_dl_resolve = current->mm->call_dl_resolve;
4743+ up_write(&current->mm->mmap_sem);
4744+ if (vma)
4745+ kmem_cache_free(vm_area_cachep, vma);
4746+ goto emulate;
4747+ }
4748+
4749+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
4750+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
4751+ up_write(&current->mm->mmap_sem);
4752+ if (vma)
4753+ kmem_cache_free(vm_area_cachep, vma);
4754+ return 1;
4755+ }
4756+
4757+ if (pax_insert_vma(vma, call_dl_resolve)) {
4758+ up_write(&current->mm->mmap_sem);
4759+ kmem_cache_free(vm_area_cachep, vma);
4760+ return 1;
4761+ }
4762+
4763+ current->mm->call_dl_resolve = call_dl_resolve;
4764+ up_write(&current->mm->mmap_sem);
4765+
4766+emulate:
4767+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
4768+ regs->pc = call_dl_resolve;
4769+ regs->npc = addr+4;
4770+ return 3;
4771+ }
4772+#endif
4773+
4774+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
4775+ if ((save & 0xFFC00000U) == 0x05000000U &&
4776+ (call & 0xFFFFE000U) == 0x85C0A000U &&
4777+ nop == 0x01000000U)
4778+ {
4779+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
4780+ regs->u_regs[UREG_G2] = addr + 4;
4781+ addr = (save & 0x003FFFFFU) << 10;
4782+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
4783+ regs->pc = addr;
4784+ regs->npc = addr+4;
4785+ return 3;
4786+ }
4787+ }
4788+ } while (0);
4789+
4790+ do { /* PaX: unpatched PLT emulation step 2 */
4791+ unsigned int save, call, nop;
4792+
4793+ err = get_user(save, (unsigned int *)(regs->pc-4));
4794+ err |= get_user(call, (unsigned int *)regs->pc);
4795+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
4796+ if (err)
4797+ break;
4798+
4799+ if (save == 0x9DE3BFA8U &&
4800+ (call & 0xC0000000U) == 0x40000000U &&
4801+ nop == 0x01000000U)
4802+ {
4803+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
4804+
4805+ regs->u_regs[UREG_RETPC] = regs->pc;
4806+ regs->pc = dl_resolve;
4807+ regs->npc = dl_resolve+4;
4808+ return 3;
4809+ }
4810+ } while (0);
4811+#endif
4812+
4813+ return 1;
4814+}
4815+
4816+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4817+{
4818+ unsigned long i;
4819+
4820+ printk(KERN_ERR "PAX: bytes at PC: ");
4821+ for (i = 0; i < 8; i++) {
4822+ unsigned int c;
4823+ if (get_user(c, (unsigned int *)pc+i))
4824+ printk(KERN_CONT "???????? ");
4825+ else
4826+ printk(KERN_CONT "%08x ", c);
4827+ }
4828+ printk("\n");
4829+}
4830+#endif
4831+
4832 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
4833 int text_fault)
4834 {
4835@@ -280,6 +545,24 @@ good_area:
4836 if(!(vma->vm_flags & VM_WRITE))
4837 goto bad_area;
4838 } else {
4839+
4840+#ifdef CONFIG_PAX_PAGEEXEC
4841+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
4842+ up_read(&mm->mmap_sem);
4843+ switch (pax_handle_fetch_fault(regs)) {
4844+
4845+#ifdef CONFIG_PAX_EMUPLT
4846+ case 2:
4847+ case 3:
4848+ return;
4849+#endif
4850+
4851+ }
4852+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
4853+ do_group_exit(SIGKILL);
4854+ }
4855+#endif
4856+
4857 /* Allow reads even for write-only mappings */
4858 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
4859 goto bad_area;
4860diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
4861index 504c062..6fcb9c6 100644
4862--- a/arch/sparc/mm/fault_64.c
4863+++ b/arch/sparc/mm/fault_64.c
4864@@ -21,6 +21,9 @@
4865 #include <linux/kprobes.h>
4866 #include <linux/kdebug.h>
4867 #include <linux/percpu.h>
4868+#include <linux/slab.h>
4869+#include <linux/pagemap.h>
4870+#include <linux/compiler.h>
4871
4872 #include <asm/page.h>
4873 #include <asm/pgtable.h>
4874@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
4875 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
4876 regs->tpc);
4877 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
4878- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
4879+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
4880 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
4881 dump_stack();
4882 unhandled_fault(regs->tpc, current, regs);
4883@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
4884 show_regs(regs);
4885 }
4886
4887+#ifdef CONFIG_PAX_PAGEEXEC
4888+#ifdef CONFIG_PAX_DLRESOLVE
4889+static void pax_emuplt_close(struct vm_area_struct *vma)
4890+{
4891+ vma->vm_mm->call_dl_resolve = 0UL;
4892+}
4893+
4894+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
4895+{
4896+ unsigned int *kaddr;
4897+
4898+ vmf->page = alloc_page(GFP_HIGHUSER);
4899+ if (!vmf->page)
4900+ return VM_FAULT_OOM;
4901+
4902+ kaddr = kmap(vmf->page);
4903+ memset(kaddr, 0, PAGE_SIZE);
4904+ kaddr[0] = 0x9DE3BFA8U; /* save */
4905+ flush_dcache_page(vmf->page);
4906+ kunmap(vmf->page);
4907+ return VM_FAULT_MAJOR;
4908+}
4909+
4910+static const struct vm_operations_struct pax_vm_ops = {
4911+ .close = pax_emuplt_close,
4912+ .fault = pax_emuplt_fault
4913+};
4914+
4915+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
4916+{
4917+ int ret;
4918+
4919+ INIT_LIST_HEAD(&vma->anon_vma_chain);
4920+ vma->vm_mm = current->mm;
4921+ vma->vm_start = addr;
4922+ vma->vm_end = addr + PAGE_SIZE;
4923+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
4924+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
4925+ vma->vm_ops = &pax_vm_ops;
4926+
4927+ ret = insert_vm_struct(current->mm, vma);
4928+ if (ret)
4929+ return ret;
4930+
4931+ ++current->mm->total_vm;
4932+ return 0;
4933+}
4934+#endif
4935+
4936+/*
4937+ * PaX: decide what to do with offenders (regs->tpc = fault address)
4938+ *
4939+ * returns 1 when task should be killed
4940+ * 2 when patched PLT trampoline was detected
4941+ * 3 when unpatched PLT trampoline was detected
4942+ */
4943+static int pax_handle_fetch_fault(struct pt_regs *regs)
4944+{
4945+
4946+#ifdef CONFIG_PAX_EMUPLT
4947+ int err;
4948+
4949+ do { /* PaX: patched PLT emulation #1 */
4950+ unsigned int sethi1, sethi2, jmpl;
4951+
4952+ err = get_user(sethi1, (unsigned int *)regs->tpc);
4953+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
4954+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
4955+
4956+ if (err)
4957+ break;
4958+
4959+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
4960+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
4961+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
4962+ {
4963+ unsigned long addr;
4964+
4965+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
4966+ addr = regs->u_regs[UREG_G1];
4967+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
4968+
4969+ if (test_thread_flag(TIF_32BIT))
4970+ addr &= 0xFFFFFFFFUL;
4971+
4972+ regs->tpc = addr;
4973+ regs->tnpc = addr+4;
4974+ return 2;
4975+ }
4976+ } while (0);
4977+
4978+ { /* PaX: patched PLT emulation #2 */
4979+ unsigned int ba;
4980+
4981+ err = get_user(ba, (unsigned int *)regs->tpc);
4982+
4983+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
4984+ unsigned long addr;
4985+
4986+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
4987+
4988+ if (test_thread_flag(TIF_32BIT))
4989+ addr &= 0xFFFFFFFFUL;
4990+
4991+ regs->tpc = addr;
4992+ regs->tnpc = addr+4;
4993+ return 2;
4994+ }
4995+ }
4996+
4997+ do { /* PaX: patched PLT emulation #3 */
4998+ unsigned int sethi, jmpl, nop;
4999+
5000+ err = get_user(sethi, (unsigned int *)regs->tpc);
5001+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
5002+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
5003+
5004+ if (err)
5005+ break;
5006+
5007+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5008+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
5009+ nop == 0x01000000U)
5010+ {
5011+ unsigned long addr;
5012+
5013+ addr = (sethi & 0x003FFFFFU) << 10;
5014+ regs->u_regs[UREG_G1] = addr;
5015+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
5016+
5017+ if (test_thread_flag(TIF_32BIT))
5018+ addr &= 0xFFFFFFFFUL;
5019+
5020+ regs->tpc = addr;
5021+ regs->tnpc = addr+4;
5022+ return 2;
5023+ }
5024+ } while (0);
5025+
5026+ do { /* PaX: patched PLT emulation #4 */
5027+ unsigned int sethi, mov1, call, mov2;
5028+
5029+ err = get_user(sethi, (unsigned int *)regs->tpc);
5030+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
5031+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
5032+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
5033+
5034+ if (err)
5035+ break;
5036+
5037+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5038+ mov1 == 0x8210000FU &&
5039+ (call & 0xC0000000U) == 0x40000000U &&
5040+ mov2 == 0x9E100001U)
5041+ {
5042+ unsigned long addr;
5043+
5044+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
5045+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
5046+
5047+ if (test_thread_flag(TIF_32BIT))
5048+ addr &= 0xFFFFFFFFUL;
5049+
5050+ regs->tpc = addr;
5051+ regs->tnpc = addr+4;
5052+ return 2;
5053+ }
5054+ } while (0);
5055+
5056+ do { /* PaX: patched PLT emulation #5 */
5057+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
5058+
5059+ err = get_user(sethi, (unsigned int *)regs->tpc);
5060+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
5061+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
5062+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
5063+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
5064+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
5065+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
5066+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
5067+
5068+ if (err)
5069+ break;
5070+
5071+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5072+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
5073+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
5074+ (or1 & 0xFFFFE000U) == 0x82106000U &&
5075+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
5076+ sllx == 0x83287020U &&
5077+ jmpl == 0x81C04005U &&
5078+ nop == 0x01000000U)
5079+ {
5080+ unsigned long addr;
5081+
5082+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
5083+ regs->u_regs[UREG_G1] <<= 32;
5084+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
5085+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
5086+ regs->tpc = addr;
5087+ regs->tnpc = addr+4;
5088+ return 2;
5089+ }
5090+ } while (0);
5091+
5092+ do { /* PaX: patched PLT emulation #6 */
5093+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
5094+
5095+ err = get_user(sethi, (unsigned int *)regs->tpc);
5096+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
5097+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
5098+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
5099+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
5100+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
5101+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
5102+
5103+ if (err)
5104+ break;
5105+
5106+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5107+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
5108+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
5109+ sllx == 0x83287020U &&
5110+ (or & 0xFFFFE000U) == 0x8A116000U &&
5111+ jmpl == 0x81C04005U &&
5112+ nop == 0x01000000U)
5113+ {
5114+ unsigned long addr;
5115+
5116+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
5117+ regs->u_regs[UREG_G1] <<= 32;
5118+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
5119+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
5120+ regs->tpc = addr;
5121+ regs->tnpc = addr+4;
5122+ return 2;
5123+ }
5124+ } while (0);
5125+
5126+ do { /* PaX: unpatched PLT emulation step 1 */
5127+ unsigned int sethi, ba, nop;
5128+
5129+ err = get_user(sethi, (unsigned int *)regs->tpc);
5130+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
5131+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
5132+
5133+ if (err)
5134+ break;
5135+
5136+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5137+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
5138+ nop == 0x01000000U)
5139+ {
5140+ unsigned long addr;
5141+ unsigned int save, call;
5142+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
5143+
5144+ if ((ba & 0xFFC00000U) == 0x30800000U)
5145+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
5146+ else
5147+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
5148+
5149+ if (test_thread_flag(TIF_32BIT))
5150+ addr &= 0xFFFFFFFFUL;
5151+
5152+ err = get_user(save, (unsigned int *)addr);
5153+ err |= get_user(call, (unsigned int *)(addr+4));
5154+ err |= get_user(nop, (unsigned int *)(addr+8));
5155+ if (err)
5156+ break;
5157+
5158+#ifdef CONFIG_PAX_DLRESOLVE
5159+ if (save == 0x9DE3BFA8U &&
5160+ (call & 0xC0000000U) == 0x40000000U &&
5161+ nop == 0x01000000U)
5162+ {
5163+ struct vm_area_struct *vma;
5164+ unsigned long call_dl_resolve;
5165+
5166+ down_read(&current->mm->mmap_sem);
5167+ call_dl_resolve = current->mm->call_dl_resolve;
5168+ up_read(&current->mm->mmap_sem);
5169+ if (likely(call_dl_resolve))
5170+ goto emulate;
5171+
5172+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
5173+
5174+ down_write(&current->mm->mmap_sem);
5175+ if (current->mm->call_dl_resolve) {
5176+ call_dl_resolve = current->mm->call_dl_resolve;
5177+ up_write(&current->mm->mmap_sem);
5178+ if (vma)
5179+ kmem_cache_free(vm_area_cachep, vma);
5180+ goto emulate;
5181+ }
5182+
5183+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
5184+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
5185+ up_write(&current->mm->mmap_sem);
5186+ if (vma)
5187+ kmem_cache_free(vm_area_cachep, vma);
5188+ return 1;
5189+ }
5190+
5191+ if (pax_insert_vma(vma, call_dl_resolve)) {
5192+ up_write(&current->mm->mmap_sem);
5193+ kmem_cache_free(vm_area_cachep, vma);
5194+ return 1;
5195+ }
5196+
5197+ current->mm->call_dl_resolve = call_dl_resolve;
5198+ up_write(&current->mm->mmap_sem);
5199+
5200+emulate:
5201+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
5202+ regs->tpc = call_dl_resolve;
5203+ regs->tnpc = addr+4;
5204+ return 3;
5205+ }
5206+#endif
5207+
5208+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
5209+ if ((save & 0xFFC00000U) == 0x05000000U &&
5210+ (call & 0xFFFFE000U) == 0x85C0A000U &&
5211+ nop == 0x01000000U)
5212+ {
5213+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
5214+ regs->u_regs[UREG_G2] = addr + 4;
5215+ addr = (save & 0x003FFFFFU) << 10;
5216+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
5217+
5218+ if (test_thread_flag(TIF_32BIT))
5219+ addr &= 0xFFFFFFFFUL;
5220+
5221+ regs->tpc = addr;
5222+ regs->tnpc = addr+4;
5223+ return 3;
5224+ }
5225+
5226+ /* PaX: 64-bit PLT stub */
5227+ err = get_user(sethi1, (unsigned int *)addr);
5228+ err |= get_user(sethi2, (unsigned int *)(addr+4));
5229+ err |= get_user(or1, (unsigned int *)(addr+8));
5230+ err |= get_user(or2, (unsigned int *)(addr+12));
5231+ err |= get_user(sllx, (unsigned int *)(addr+16));
5232+ err |= get_user(add, (unsigned int *)(addr+20));
5233+ err |= get_user(jmpl, (unsigned int *)(addr+24));
5234+ err |= get_user(nop, (unsigned int *)(addr+28));
5235+ if (err)
5236+ break;
5237+
5238+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
5239+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
5240+ (or1 & 0xFFFFE000U) == 0x88112000U &&
5241+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
5242+ sllx == 0x89293020U &&
5243+ add == 0x8A010005U &&
5244+ jmpl == 0x89C14000U &&
5245+ nop == 0x01000000U)
5246+ {
5247+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
5248+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
5249+ regs->u_regs[UREG_G4] <<= 32;
5250+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
5251+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
5252+ regs->u_regs[UREG_G4] = addr + 24;
5253+ addr = regs->u_regs[UREG_G5];
5254+ regs->tpc = addr;
5255+ regs->tnpc = addr+4;
5256+ return 3;
5257+ }
5258+ }
5259+ } while (0);
5260+
5261+#ifdef CONFIG_PAX_DLRESOLVE
5262+ do { /* PaX: unpatched PLT emulation step 2 */
5263+ unsigned int save, call, nop;
5264+
5265+ err = get_user(save, (unsigned int *)(regs->tpc-4));
5266+ err |= get_user(call, (unsigned int *)regs->tpc);
5267+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
5268+ if (err)
5269+ break;
5270+
5271+ if (save == 0x9DE3BFA8U &&
5272+ (call & 0xC0000000U) == 0x40000000U &&
5273+ nop == 0x01000000U)
5274+ {
5275+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
5276+
5277+ if (test_thread_flag(TIF_32BIT))
5278+ dl_resolve &= 0xFFFFFFFFUL;
5279+
5280+ regs->u_regs[UREG_RETPC] = regs->tpc;
5281+ regs->tpc = dl_resolve;
5282+ regs->tnpc = dl_resolve+4;
5283+ return 3;
5284+ }
5285+ } while (0);
5286+#endif
5287+
5288+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
5289+ unsigned int sethi, ba, nop;
5290+
5291+ err = get_user(sethi, (unsigned int *)regs->tpc);
5292+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
5293+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
5294+
5295+ if (err)
5296+ break;
5297+
5298+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5299+ (ba & 0xFFF00000U) == 0x30600000U &&
5300+ nop == 0x01000000U)
5301+ {
5302+ unsigned long addr;
5303+
5304+ addr = (sethi & 0x003FFFFFU) << 10;
5305+ regs->u_regs[UREG_G1] = addr;
5306+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
5307+
5308+ if (test_thread_flag(TIF_32BIT))
5309+ addr &= 0xFFFFFFFFUL;
5310+
5311+ regs->tpc = addr;
5312+ regs->tnpc = addr+4;
5313+ return 2;
5314+ }
5315+ } while (0);
5316+
5317+#endif
5318+
5319+ return 1;
5320+}
5321+
5322+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5323+{
5324+ unsigned long i;
5325+
5326+ printk(KERN_ERR "PAX: bytes at PC: ");
5327+ for (i = 0; i < 8; i++) {
5328+ unsigned int c;
5329+ if (get_user(c, (unsigned int *)pc+i))
5330+ printk(KERN_CONT "???????? ");
5331+ else
5332+ printk(KERN_CONT "%08x ", c);
5333+ }
5334+ printk("\n");
5335+}
5336+#endif
5337+
5338 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
5339 {
5340 struct mm_struct *mm = current->mm;
5341@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
5342 if (!vma)
5343 goto bad_area;
5344
5345+#ifdef CONFIG_PAX_PAGEEXEC
5346+ /* PaX: detect ITLB misses on non-exec pages */
5347+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
5348+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
5349+ {
5350+ if (address != regs->tpc)
5351+ goto good_area;
5352+
5353+ up_read(&mm->mmap_sem);
5354+ switch (pax_handle_fetch_fault(regs)) {
5355+
5356+#ifdef CONFIG_PAX_EMUPLT
5357+ case 2:
5358+ case 3:
5359+ return;
5360+#endif
5361+
5362+ }
5363+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
5364+ do_group_exit(SIGKILL);
5365+ }
5366+#endif
5367+
5368 /* Pure DTLB misses do not tell us whether the fault causing
5369 * load/store/atomic was a write or not, it only says that there
5370 * was no match. So in such a case we (carefully) read the
5371diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
5372index 07e1453..0a7d9e9 100644
5373--- a/arch/sparc/mm/hugetlbpage.c
5374+++ b/arch/sparc/mm/hugetlbpage.c
5375@@ -67,7 +67,7 @@ full_search:
5376 }
5377 return -ENOMEM;
5378 }
5379- if (likely(!vma || addr + len <= vma->vm_start)) {
5380+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5381 /*
5382 * Remember the place where we stopped the search:
5383 */
5384@@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5385 /* make sure it can fit in the remaining address space */
5386 if (likely(addr > len)) {
5387 vma = find_vma(mm, addr-len);
5388- if (!vma || addr <= vma->vm_start) {
5389+ if (check_heap_stack_gap(vma, addr - len, len)) {
5390 /* remember the address as a hint for next time */
5391 return (mm->free_area_cache = addr-len);
5392 }
5393@@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5394 if (unlikely(mm->mmap_base < len))
5395 goto bottomup;
5396
5397- addr = (mm->mmap_base-len) & HPAGE_MASK;
5398+ addr = mm->mmap_base - len;
5399
5400 do {
5401+ addr &= HPAGE_MASK;
5402 /*
5403 * Lookup failure means no vma is above this address,
5404 * else if new region fits below vma->vm_start,
5405 * return with success:
5406 */
5407 vma = find_vma(mm, addr);
5408- if (likely(!vma || addr+len <= vma->vm_start)) {
5409+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5410 /* remember the address as a hint for next time */
5411 return (mm->free_area_cache = addr);
5412 }
5413@@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5414 mm->cached_hole_size = vma->vm_start - addr;
5415
5416 /* try just below the current vma->vm_start */
5417- addr = (vma->vm_start-len) & HPAGE_MASK;
5418- } while (likely(len < vma->vm_start));
5419+ addr = skip_heap_stack_gap(vma, len);
5420+ } while (!IS_ERR_VALUE(addr));
5421
5422 bottomup:
5423 /*
5424@@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
5425 if (addr) {
5426 addr = ALIGN(addr, HPAGE_SIZE);
5427 vma = find_vma(mm, addr);
5428- if (task_size - len >= addr &&
5429- (!vma || addr + len <= vma->vm_start))
5430+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5431 return addr;
5432 }
5433 if (mm->get_unmapped_area == arch_get_unmapped_area)
5434diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
5435index 7b00de6..78239f4 100644
5436--- a/arch/sparc/mm/init_32.c
5437+++ b/arch/sparc/mm/init_32.c
5438@@ -316,6 +316,9 @@ extern void device_scan(void);
5439 pgprot_t PAGE_SHARED __read_mostly;
5440 EXPORT_SYMBOL(PAGE_SHARED);
5441
5442+pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
5443+EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
5444+
5445 void __init paging_init(void)
5446 {
5447 switch(sparc_cpu_model) {
5448@@ -344,17 +347,17 @@ void __init paging_init(void)
5449
5450 /* Initialize the protection map with non-constant, MMU dependent values. */
5451 protection_map[0] = PAGE_NONE;
5452- protection_map[1] = PAGE_READONLY;
5453- protection_map[2] = PAGE_COPY;
5454- protection_map[3] = PAGE_COPY;
5455+ protection_map[1] = PAGE_READONLY_NOEXEC;
5456+ protection_map[2] = PAGE_COPY_NOEXEC;
5457+ protection_map[3] = PAGE_COPY_NOEXEC;
5458 protection_map[4] = PAGE_READONLY;
5459 protection_map[5] = PAGE_READONLY;
5460 protection_map[6] = PAGE_COPY;
5461 protection_map[7] = PAGE_COPY;
5462 protection_map[8] = PAGE_NONE;
5463- protection_map[9] = PAGE_READONLY;
5464- protection_map[10] = PAGE_SHARED;
5465- protection_map[11] = PAGE_SHARED;
5466+ protection_map[9] = PAGE_READONLY_NOEXEC;
5467+ protection_map[10] = PAGE_SHARED_NOEXEC;
5468+ protection_map[11] = PAGE_SHARED_NOEXEC;
5469 protection_map[12] = PAGE_READONLY;
5470 protection_map[13] = PAGE_READONLY;
5471 protection_map[14] = PAGE_SHARED;
5472diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
5473index cbef74e..c38fead 100644
5474--- a/arch/sparc/mm/srmmu.c
5475+++ b/arch/sparc/mm/srmmu.c
5476@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
5477 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
5478 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
5479 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
5480+
5481+#ifdef CONFIG_PAX_PAGEEXEC
5482+ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
5483+ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
5484+ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
5485+#endif
5486+
5487 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
5488 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
5489
5490diff --git a/arch/um/Makefile b/arch/um/Makefile
5491index 7730af6..cce5b19 100644
5492--- a/arch/um/Makefile
5493+++ b/arch/um/Makefile
5494@@ -61,6 +61,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
5495 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
5496 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
5497
5498+ifdef CONSTIFY_PLUGIN
5499+USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
5500+endif
5501+
5502 #This will adjust *FLAGS accordingly to the platform.
5503 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
5504
5505diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
5506index 6c03acd..a5e0215 100644
5507--- a/arch/um/include/asm/kmap_types.h
5508+++ b/arch/um/include/asm/kmap_types.h
5509@@ -23,6 +23,7 @@ enum km_type {
5510 KM_IRQ1,
5511 KM_SOFTIRQ0,
5512 KM_SOFTIRQ1,
5513+ KM_CLEARPAGE,
5514 KM_TYPE_NR
5515 };
5516
5517diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
5518index 7cfc3ce..cbd1a58 100644
5519--- a/arch/um/include/asm/page.h
5520+++ b/arch/um/include/asm/page.h
5521@@ -14,6 +14,9 @@
5522 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
5523 #define PAGE_MASK (~(PAGE_SIZE-1))
5524
5525+#define ktla_ktva(addr) (addr)
5526+#define ktva_ktla(addr) (addr)
5527+
5528 #ifndef __ASSEMBLY__
5529
5530 struct page;
5531diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
5532index c533835..84db18e 100644
5533--- a/arch/um/kernel/process.c
5534+++ b/arch/um/kernel/process.c
5535@@ -406,22 +406,6 @@ int singlestepping(void * t)
5536 return 2;
5537 }
5538
5539-/*
5540- * Only x86 and x86_64 have an arch_align_stack().
5541- * All other arches have "#define arch_align_stack(x) (x)"
5542- * in their asm/system.h
5543- * As this is included in UML from asm-um/system-generic.h,
5544- * we can use it to behave as the subarch does.
5545- */
5546-#ifndef arch_align_stack
5547-unsigned long arch_align_stack(unsigned long sp)
5548-{
5549- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
5550- sp -= get_random_int() % 8192;
5551- return sp & ~0xf;
5552-}
5553-#endif
5554-
5555 unsigned long get_wchan(struct task_struct *p)
5556 {
5557 unsigned long stack_page, sp, ip;
5558diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
5559index efb4294..61bc18c 100644
5560--- a/arch/x86/Kconfig
5561+++ b/arch/x86/Kconfig
5562@@ -235,7 +235,7 @@ config X86_HT
5563
5564 config X86_32_LAZY_GS
5565 def_bool y
5566- depends on X86_32 && !CC_STACKPROTECTOR
5567+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
5568
5569 config ARCH_HWEIGHT_CFLAGS
5570 string
5571@@ -1022,7 +1022,7 @@ choice
5572
5573 config NOHIGHMEM
5574 bool "off"
5575- depends on !X86_NUMAQ
5576+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
5577 ---help---
5578 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
5579 However, the address space of 32-bit x86 processors is only 4
5580@@ -1059,7 +1059,7 @@ config NOHIGHMEM
5581
5582 config HIGHMEM4G
5583 bool "4GB"
5584- depends on !X86_NUMAQ
5585+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
5586 ---help---
5587 Select this if you have a 32-bit processor and between 1 and 4
5588 gigabytes of physical RAM.
5589@@ -1113,7 +1113,7 @@ config PAGE_OFFSET
5590 hex
5591 default 0xB0000000 if VMSPLIT_3G_OPT
5592 default 0x80000000 if VMSPLIT_2G
5593- default 0x78000000 if VMSPLIT_2G_OPT
5594+ default 0x70000000 if VMSPLIT_2G_OPT
5595 default 0x40000000 if VMSPLIT_1G
5596 default 0xC0000000
5597 depends on X86_32
5598@@ -1496,6 +1496,7 @@ config SECCOMP
5599
5600 config CC_STACKPROTECTOR
5601 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
5602+ depends on X86_64 || !PAX_MEMORY_UDEREF
5603 ---help---
5604 This option turns on the -fstack-protector GCC feature. This
5605 feature puts, at the beginning of functions, a canary value on
5606@@ -1553,6 +1554,7 @@ config KEXEC_JUMP
5607 config PHYSICAL_START
5608 hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
5609 default "0x1000000"
5610+ range 0x400000 0x40000000
5611 ---help---
5612 This gives the physical address where the kernel is loaded.
5613
5614@@ -1616,6 +1618,7 @@ config X86_NEED_RELOCS
5615 config PHYSICAL_ALIGN
5616 hex "Alignment value to which kernel should be aligned" if X86_32
5617 default "0x1000000"
5618+ range 0x400000 0x1000000 if PAX_KERNEXEC
5619 range 0x2000 0x1000000
5620 ---help---
5621 This value puts the alignment restrictions on physical address
5622@@ -1647,9 +1650,10 @@ config HOTPLUG_CPU
5623 Say N if you want to disable CPU hotplug.
5624
5625 config COMPAT_VDSO
5626- def_bool y
5627+ def_bool n
5628 prompt "Compat VDSO support"
5629 depends on X86_32 || IA32_EMULATION
5630+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
5631 ---help---
5632 Map the 32-bit VDSO to the predictable old-style address too.
5633
5634diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
5635index e3ca7e0..b30b28a 100644
5636--- a/arch/x86/Kconfig.cpu
5637+++ b/arch/x86/Kconfig.cpu
5638@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
5639
5640 config X86_F00F_BUG
5641 def_bool y
5642- depends on M586MMX || M586TSC || M586 || M486 || M386
5643+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
5644
5645 config X86_INVD_BUG
5646 def_bool y
5647@@ -365,7 +365,7 @@ config X86_POPAD_OK
5648
5649 config X86_ALIGNMENT_16
5650 def_bool y
5651- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
5652+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
5653
5654 config X86_INTEL_USERCOPY
5655 def_bool y
5656@@ -411,7 +411,7 @@ config X86_CMPXCHG64
5657 # generates cmov.
5658 config X86_CMOV
5659 def_bool y
5660- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
5661+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
5662
5663 config X86_MINIMUM_CPU_FAMILY
5664 int
5665diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
5666index bf56e17..05f9891 100644
5667--- a/arch/x86/Kconfig.debug
5668+++ b/arch/x86/Kconfig.debug
5669@@ -81,7 +81,7 @@ config X86_PTDUMP
5670 config DEBUG_RODATA
5671 bool "Write protect kernel read-only data structures"
5672 default y
5673- depends on DEBUG_KERNEL
5674+ depends on DEBUG_KERNEL && BROKEN
5675 ---help---
5676 Mark the kernel read-only data as write-protected in the pagetables,
5677 in order to catch accidental (and incorrect) writes to such const
5678@@ -99,7 +99,7 @@ config DEBUG_RODATA_TEST
5679
5680 config DEBUG_SET_MODULE_RONX
5681 bool "Set loadable kernel module data as NX and text as RO"
5682- depends on MODULES
5683+ depends on MODULES && BROKEN
5684 ---help---
5685 This option helps catch unintended modifications to loadable
5686 kernel module's text and read-only data. It also prevents execution
5687diff --git a/arch/x86/Makefile b/arch/x86/Makefile
5688index b02e509..2631e48 100644
5689--- a/arch/x86/Makefile
5690+++ b/arch/x86/Makefile
5691@@ -46,6 +46,7 @@ else
5692 UTS_MACHINE := x86_64
5693 CHECKFLAGS += -D__x86_64__ -m64
5694
5695+ biarch := $(call cc-option,-m64)
5696 KBUILD_AFLAGS += -m64
5697 KBUILD_CFLAGS += -m64
5698
5699@@ -195,3 +196,12 @@ define archhelp
5700 echo ' FDARGS="..." arguments for the booted kernel'
5701 echo ' FDINITRD=file initrd for the booted kernel'
5702 endef
5703+
5704+define OLD_LD
5705+
5706+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
5707+*** Please upgrade your binutils to 2.18 or newer
5708+endef
5709+
5710+archprepare:
5711+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
5712diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
5713index 95365a8..52f857b 100644
5714--- a/arch/x86/boot/Makefile
5715+++ b/arch/x86/boot/Makefile
5716@@ -63,6 +63,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
5717 $(call cc-option, -fno-stack-protector) \
5718 $(call cc-option, -mpreferred-stack-boundary=2)
5719 KBUILD_CFLAGS += $(call cc-option, -m32)
5720+ifdef CONSTIFY_PLUGIN
5721+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
5722+endif
5723 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
5724 GCOV_PROFILE := n
5725
5726diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
5727index 878e4b9..20537ab 100644
5728--- a/arch/x86/boot/bitops.h
5729+++ b/arch/x86/boot/bitops.h
5730@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
5731 u8 v;
5732 const u32 *p = (const u32 *)addr;
5733
5734- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
5735+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
5736 return v;
5737 }
5738
5739@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
5740
5741 static inline void set_bit(int nr, void *addr)
5742 {
5743- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
5744+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
5745 }
5746
5747 #endif /* BOOT_BITOPS_H */
5748diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
5749index c7093bd..d4247ffe0 100644
5750--- a/arch/x86/boot/boot.h
5751+++ b/arch/x86/boot/boot.h
5752@@ -85,7 +85,7 @@ static inline void io_delay(void)
5753 static inline u16 ds(void)
5754 {
5755 u16 seg;
5756- asm("movw %%ds,%0" : "=rm" (seg));
5757+ asm volatile("movw %%ds,%0" : "=rm" (seg));
5758 return seg;
5759 }
5760
5761@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
5762 static inline int memcmp(const void *s1, const void *s2, size_t len)
5763 {
5764 u8 diff;
5765- asm("repe; cmpsb; setnz %0"
5766+ asm volatile("repe; cmpsb; setnz %0"
5767 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
5768 return diff;
5769 }
5770diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
5771index 09664ef..edc5d03 100644
5772--- a/arch/x86/boot/compressed/Makefile
5773+++ b/arch/x86/boot/compressed/Makefile
5774@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
5775 KBUILD_CFLAGS += $(cflags-y)
5776 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
5777 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
5778+ifdef CONSTIFY_PLUGIN
5779+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
5780+endif
5781
5782 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
5783 GCOV_PROFILE := n
5784diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
5785index 67a655a..b924059 100644
5786--- a/arch/x86/boot/compressed/head_32.S
5787+++ b/arch/x86/boot/compressed/head_32.S
5788@@ -76,7 +76,7 @@ ENTRY(startup_32)
5789 notl %eax
5790 andl %eax, %ebx
5791 #else
5792- movl $LOAD_PHYSICAL_ADDR, %ebx
5793+ movl $____LOAD_PHYSICAL_ADDR, %ebx
5794 #endif
5795
5796 /* Target address to relocate to for decompression */
5797@@ -162,7 +162,7 @@ relocated:
5798 * and where it was actually loaded.
5799 */
5800 movl %ebp, %ebx
5801- subl $LOAD_PHYSICAL_ADDR, %ebx
5802+ subl $____LOAD_PHYSICAL_ADDR, %ebx
5803 jz 2f /* Nothing to be done if loaded at compiled addr. */
5804 /*
5805 * Process relocations.
5806@@ -170,8 +170,7 @@ relocated:
5807
5808 1: subl $4, %edi
5809 movl (%edi), %ecx
5810- testl %ecx, %ecx
5811- jz 2f
5812+ jecxz 2f
5813 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
5814 jmp 1b
5815 2:
5816diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
5817index 35af09d..99c9676 100644
5818--- a/arch/x86/boot/compressed/head_64.S
5819+++ b/arch/x86/boot/compressed/head_64.S
5820@@ -91,7 +91,7 @@ ENTRY(startup_32)
5821 notl %eax
5822 andl %eax, %ebx
5823 #else
5824- movl $LOAD_PHYSICAL_ADDR, %ebx
5825+ movl $____LOAD_PHYSICAL_ADDR, %ebx
5826 #endif
5827
5828 /* Target address to relocate to for decompression */
5829@@ -233,7 +233,7 @@ ENTRY(startup_64)
5830 notq %rax
5831 andq %rax, %rbp
5832 #else
5833- movq $LOAD_PHYSICAL_ADDR, %rbp
5834+ movq $____LOAD_PHYSICAL_ADDR, %rbp
5835 #endif
5836
5837 /* Target address to relocate to for decompression */
5838diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
5839index 3a19d04..7c1d55a 100644
5840--- a/arch/x86/boot/compressed/misc.c
5841+++ b/arch/x86/boot/compressed/misc.c
5842@@ -310,7 +310,7 @@ static void parse_elf(void *output)
5843 case PT_LOAD:
5844 #ifdef CONFIG_RELOCATABLE
5845 dest = output;
5846- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
5847+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
5848 #else
5849 dest = (void *)(phdr->p_paddr);
5850 #endif
5851@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
5852 error("Destination address too large");
5853 #endif
5854 #ifndef CONFIG_RELOCATABLE
5855- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
5856+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
5857 error("Wrong destination address");
5858 #endif
5859
5860diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
5861index 89bbf4e..869908e 100644
5862--- a/arch/x86/boot/compressed/relocs.c
5863+++ b/arch/x86/boot/compressed/relocs.c
5864@@ -13,8 +13,11 @@
5865
5866 static void die(char *fmt, ...);
5867
5868+#include "../../../../include/generated/autoconf.h"
5869+
5870 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
5871 static Elf32_Ehdr ehdr;
5872+static Elf32_Phdr *phdr;
5873 static unsigned long reloc_count, reloc_idx;
5874 static unsigned long *relocs;
5875
5876@@ -270,9 +273,39 @@ static void read_ehdr(FILE *fp)
5877 }
5878 }
5879
5880+static void read_phdrs(FILE *fp)
5881+{
5882+ unsigned int i;
5883+
5884+ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
5885+ if (!phdr) {
5886+ die("Unable to allocate %d program headers\n",
5887+ ehdr.e_phnum);
5888+ }
5889+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
5890+ die("Seek to %d failed: %s\n",
5891+ ehdr.e_phoff, strerror(errno));
5892+ }
5893+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
5894+ die("Cannot read ELF program headers: %s\n",
5895+ strerror(errno));
5896+ }
5897+ for(i = 0; i < ehdr.e_phnum; i++) {
5898+ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
5899+ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
5900+ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
5901+ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
5902+ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
5903+ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
5904+ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
5905+ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
5906+ }
5907+
5908+}
5909+
5910 static void read_shdrs(FILE *fp)
5911 {
5912- int i;
5913+ unsigned int i;
5914 Elf32_Shdr shdr;
5915
5916 secs = calloc(ehdr.e_shnum, sizeof(struct section));
5917@@ -307,7 +340,7 @@ static void read_shdrs(FILE *fp)
5918
5919 static void read_strtabs(FILE *fp)
5920 {
5921- int i;
5922+ unsigned int i;
5923 for (i = 0; i < ehdr.e_shnum; i++) {
5924 struct section *sec = &secs[i];
5925 if (sec->shdr.sh_type != SHT_STRTAB) {
5926@@ -332,7 +365,7 @@ static void read_strtabs(FILE *fp)
5927
5928 static void read_symtabs(FILE *fp)
5929 {
5930- int i,j;
5931+ unsigned int i,j;
5932 for (i = 0; i < ehdr.e_shnum; i++) {
5933 struct section *sec = &secs[i];
5934 if (sec->shdr.sh_type != SHT_SYMTAB) {
5935@@ -365,7 +398,9 @@ static void read_symtabs(FILE *fp)
5936
5937 static void read_relocs(FILE *fp)
5938 {
5939- int i,j;
5940+ unsigned int i,j;
5941+ uint32_t base;
5942+
5943 for (i = 0; i < ehdr.e_shnum; i++) {
5944 struct section *sec = &secs[i];
5945 if (sec->shdr.sh_type != SHT_REL) {
5946@@ -385,9 +420,18 @@ static void read_relocs(FILE *fp)
5947 die("Cannot read symbol table: %s\n",
5948 strerror(errno));
5949 }
5950+ base = 0;
5951+ for (j = 0; j < ehdr.e_phnum; j++) {
5952+ if (phdr[j].p_type != PT_LOAD )
5953+ continue;
5954+ 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)
5955+ continue;
5956+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
5957+ break;
5958+ }
5959 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
5960 Elf32_Rel *rel = &sec->reltab[j];
5961- rel->r_offset = elf32_to_cpu(rel->r_offset);
5962+ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
5963 rel->r_info = elf32_to_cpu(rel->r_info);
5964 }
5965 }
5966@@ -396,14 +440,14 @@ static void read_relocs(FILE *fp)
5967
5968 static void print_absolute_symbols(void)
5969 {
5970- int i;
5971+ unsigned int i;
5972 printf("Absolute symbols\n");
5973 printf(" Num: Value Size Type Bind Visibility Name\n");
5974 for (i = 0; i < ehdr.e_shnum; i++) {
5975 struct section *sec = &secs[i];
5976 char *sym_strtab;
5977 Elf32_Sym *sh_symtab;
5978- int j;
5979+ unsigned int j;
5980
5981 if (sec->shdr.sh_type != SHT_SYMTAB) {
5982 continue;
5983@@ -431,14 +475,14 @@ static void print_absolute_symbols(void)
5984
5985 static void print_absolute_relocs(void)
5986 {
5987- int i, printed = 0;
5988+ unsigned int i, printed = 0;
5989
5990 for (i = 0; i < ehdr.e_shnum; i++) {
5991 struct section *sec = &secs[i];
5992 struct section *sec_applies, *sec_symtab;
5993 char *sym_strtab;
5994 Elf32_Sym *sh_symtab;
5995- int j;
5996+ unsigned int j;
5997 if (sec->shdr.sh_type != SHT_REL) {
5998 continue;
5999 }
6000@@ -499,13 +543,13 @@ static void print_absolute_relocs(void)
6001
6002 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
6003 {
6004- int i;
6005+ unsigned int i;
6006 /* Walk through the relocations */
6007 for (i = 0; i < ehdr.e_shnum; i++) {
6008 char *sym_strtab;
6009 Elf32_Sym *sh_symtab;
6010 struct section *sec_applies, *sec_symtab;
6011- int j;
6012+ unsigned int j;
6013 struct section *sec = &secs[i];
6014
6015 if (sec->shdr.sh_type != SHT_REL) {
6016@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
6017 !is_rel_reloc(sym_name(sym_strtab, sym))) {
6018 continue;
6019 }
6020+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
6021+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
6022+ continue;
6023+
6024+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
6025+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
6026+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
6027+ continue;
6028+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
6029+ continue;
6030+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
6031+ continue;
6032+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
6033+ continue;
6034+#endif
6035+
6036 switch (r_type) {
6037 case R_386_NONE:
6038 case R_386_PC32:
6039@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb)
6040
6041 static void emit_relocs(int as_text)
6042 {
6043- int i;
6044+ unsigned int i;
6045 /* Count how many relocations I have and allocate space for them. */
6046 reloc_count = 0;
6047 walk_relocs(count_reloc);
6048@@ -665,6 +725,7 @@ int main(int argc, char **argv)
6049 fname, strerror(errno));
6050 }
6051 read_ehdr(fp);
6052+ read_phdrs(fp);
6053 read_shdrs(fp);
6054 read_strtabs(fp);
6055 read_symtabs(fp);
6056diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
6057index 4d3ff03..e4972ff 100644
6058--- a/arch/x86/boot/cpucheck.c
6059+++ b/arch/x86/boot/cpucheck.c
6060@@ -74,7 +74,7 @@ static int has_fpu(void)
6061 u16 fcw = -1, fsw = -1;
6062 u32 cr0;
6063
6064- asm("movl %%cr0,%0" : "=r" (cr0));
6065+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
6066 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
6067 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
6068 asm volatile("movl %0,%%cr0" : : "r" (cr0));
6069@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
6070 {
6071 u32 f0, f1;
6072
6073- asm("pushfl ; "
6074+ asm volatile("pushfl ; "
6075 "pushfl ; "
6076 "popl %0 ; "
6077 "movl %0,%1 ; "
6078@@ -115,7 +115,7 @@ static void get_flags(void)
6079 set_bit(X86_FEATURE_FPU, cpu.flags);
6080
6081 if (has_eflag(X86_EFLAGS_ID)) {
6082- asm("cpuid"
6083+ asm volatile("cpuid"
6084 : "=a" (max_intel_level),
6085 "=b" (cpu_vendor[0]),
6086 "=d" (cpu_vendor[1]),
6087@@ -124,7 +124,7 @@ static void get_flags(void)
6088
6089 if (max_intel_level >= 0x00000001 &&
6090 max_intel_level <= 0x0000ffff) {
6091- asm("cpuid"
6092+ asm volatile("cpuid"
6093 : "=a" (tfms),
6094 "=c" (cpu.flags[4]),
6095 "=d" (cpu.flags[0])
6096@@ -136,7 +136,7 @@ static void get_flags(void)
6097 cpu.model += ((tfms >> 16) & 0xf) << 4;
6098 }
6099
6100- asm("cpuid"
6101+ asm volatile("cpuid"
6102 : "=a" (max_amd_level)
6103 : "a" (0x80000000)
6104 : "ebx", "ecx", "edx");
6105@@ -144,7 +144,7 @@ static void get_flags(void)
6106 if (max_amd_level >= 0x80000001 &&
6107 max_amd_level <= 0x8000ffff) {
6108 u32 eax = 0x80000001;
6109- asm("cpuid"
6110+ asm volatile("cpuid"
6111 : "+a" (eax),
6112 "=c" (cpu.flags[6]),
6113 "=d" (cpu.flags[1])
6114@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
6115 u32 ecx = MSR_K7_HWCR;
6116 u32 eax, edx;
6117
6118- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6119+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6120 eax &= ~(1 << 15);
6121- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6122+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6123
6124 get_flags(); /* Make sure it really did something */
6125 err = check_flags();
6126@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
6127 u32 ecx = MSR_VIA_FCR;
6128 u32 eax, edx;
6129
6130- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6131+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6132 eax |= (1<<1)|(1<<7);
6133- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6134+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6135
6136 set_bit(X86_FEATURE_CX8, cpu.flags);
6137 err = check_flags();
6138@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
6139 u32 eax, edx;
6140 u32 level = 1;
6141
6142- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6143- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
6144- asm("cpuid"
6145+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
6146+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
6147+ asm volatile("cpuid"
6148 : "+a" (level), "=d" (cpu.flags[0])
6149 : : "ecx", "ebx");
6150- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6151+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
6152
6153 err = check_flags();
6154 }
6155diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
6156index bdb4d45..0476680 100644
6157--- a/arch/x86/boot/header.S
6158+++ b/arch/x86/boot/header.S
6159@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical pointer to
6160 # single linked list of
6161 # struct setup_data
6162
6163-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
6164+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
6165
6166 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
6167 #define VO_INIT_SIZE (VO__end - VO__text)
6168diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
6169index db75d07..8e6d0af 100644
6170--- a/arch/x86/boot/memory.c
6171+++ b/arch/x86/boot/memory.c
6172@@ -19,7 +19,7 @@
6173
6174 static int detect_memory_e820(void)
6175 {
6176- int count = 0;
6177+ unsigned int count = 0;
6178 struct biosregs ireg, oreg;
6179 struct e820entry *desc = boot_params.e820_map;
6180 static struct e820entry buf; /* static so it is zeroed */
6181diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
6182index 11e8c6e..fdbb1ed 100644
6183--- a/arch/x86/boot/video-vesa.c
6184+++ b/arch/x86/boot/video-vesa.c
6185@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
6186
6187 boot_params.screen_info.vesapm_seg = oreg.es;
6188 boot_params.screen_info.vesapm_off = oreg.di;
6189+ boot_params.screen_info.vesapm_size = oreg.cx;
6190 }
6191
6192 /*
6193diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
6194index 43eda28..5ab5fdb 100644
6195--- a/arch/x86/boot/video.c
6196+++ b/arch/x86/boot/video.c
6197@@ -96,7 +96,7 @@ static void store_mode_params(void)
6198 static unsigned int get_entry(void)
6199 {
6200 char entry_buf[4];
6201- int i, len = 0;
6202+ unsigned int i, len = 0;
6203 int key;
6204 unsigned int v;
6205
6206diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
6207index 5b577d5..3c1fed4 100644
6208--- a/arch/x86/crypto/aes-x86_64-asm_64.S
6209+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
6210@@ -8,6 +8,8 @@
6211 * including this sentence is retained in full.
6212 */
6213
6214+#include <asm/alternative-asm.h>
6215+
6216 .extern crypto_ft_tab
6217 .extern crypto_it_tab
6218 .extern crypto_fl_tab
6219@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
6220 je B192; \
6221 leaq 32(r9),r9;
6222
6223+#define ret pax_force_retaddr 0, 1; ret
6224+
6225 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
6226 movq r1,r2; \
6227 movq r3,r4; \
6228diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
6229index be6d9e3..21fbbca 100644
6230--- a/arch/x86/crypto/aesni-intel_asm.S
6231+++ b/arch/x86/crypto/aesni-intel_asm.S
6232@@ -31,6 +31,7 @@
6233
6234 #include <linux/linkage.h>
6235 #include <asm/inst.h>
6236+#include <asm/alternative-asm.h>
6237
6238 #ifdef __x86_64__
6239 .data
6240@@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
6241 pop %r14
6242 pop %r13
6243 pop %r12
6244+ pax_force_retaddr 0, 1
6245 ret
6246+ENDPROC(aesni_gcm_dec)
6247
6248
6249 /*****************************************************************************
6250@@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
6251 pop %r14
6252 pop %r13
6253 pop %r12
6254+ pax_force_retaddr 0, 1
6255 ret
6256+ENDPROC(aesni_gcm_enc)
6257
6258 #endif
6259
6260@@ -1714,6 +1719,7 @@ _key_expansion_256a:
6261 pxor %xmm1, %xmm0
6262 movaps %xmm0, (TKEYP)
6263 add $0x10, TKEYP
6264+ pax_force_retaddr_bts
6265 ret
6266
6267 .align 4
6268@@ -1738,6 +1744,7 @@ _key_expansion_192a:
6269 shufps $0b01001110, %xmm2, %xmm1
6270 movaps %xmm1, 0x10(TKEYP)
6271 add $0x20, TKEYP
6272+ pax_force_retaddr_bts
6273 ret
6274
6275 .align 4
6276@@ -1757,6 +1764,7 @@ _key_expansion_192b:
6277
6278 movaps %xmm0, (TKEYP)
6279 add $0x10, TKEYP
6280+ pax_force_retaddr_bts
6281 ret
6282
6283 .align 4
6284@@ -1769,6 +1777,7 @@ _key_expansion_256b:
6285 pxor %xmm1, %xmm2
6286 movaps %xmm2, (TKEYP)
6287 add $0x10, TKEYP
6288+ pax_force_retaddr_bts
6289 ret
6290
6291 /*
6292@@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
6293 #ifndef __x86_64__
6294 popl KEYP
6295 #endif
6296+ pax_force_retaddr 0, 1
6297 ret
6298+ENDPROC(aesni_set_key)
6299
6300 /*
6301 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
6302@@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
6303 popl KLEN
6304 popl KEYP
6305 #endif
6306+ pax_force_retaddr 0, 1
6307 ret
6308+ENDPROC(aesni_enc)
6309
6310 /*
6311 * _aesni_enc1: internal ABI
6312@@ -1959,6 +1972,7 @@ _aesni_enc1:
6313 AESENC KEY STATE
6314 movaps 0x70(TKEYP), KEY
6315 AESENCLAST KEY STATE
6316+ pax_force_retaddr_bts
6317 ret
6318
6319 /*
6320@@ -2067,6 +2081,7 @@ _aesni_enc4:
6321 AESENCLAST KEY STATE2
6322 AESENCLAST KEY STATE3
6323 AESENCLAST KEY STATE4
6324+ pax_force_retaddr_bts
6325 ret
6326
6327 /*
6328@@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
6329 popl KLEN
6330 popl KEYP
6331 #endif
6332+ pax_force_retaddr 0, 1
6333 ret
6334+ENDPROC(aesni_dec)
6335
6336 /*
6337 * _aesni_dec1: internal ABI
6338@@ -2146,6 +2163,7 @@ _aesni_dec1:
6339 AESDEC KEY STATE
6340 movaps 0x70(TKEYP), KEY
6341 AESDECLAST KEY STATE
6342+ pax_force_retaddr_bts
6343 ret
6344
6345 /*
6346@@ -2254,6 +2272,7 @@ _aesni_dec4:
6347 AESDECLAST KEY STATE2
6348 AESDECLAST KEY STATE3
6349 AESDECLAST KEY STATE4
6350+ pax_force_retaddr_bts
6351 ret
6352
6353 /*
6354@@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
6355 popl KEYP
6356 popl LEN
6357 #endif
6358+ pax_force_retaddr 0, 1
6359 ret
6360+ENDPROC(aesni_ecb_enc)
6361
6362 /*
6363 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
6364@@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
6365 popl KEYP
6366 popl LEN
6367 #endif
6368+ pax_force_retaddr 0, 1
6369 ret
6370+ENDPROC(aesni_ecb_dec)
6371
6372 /*
6373 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
6374@@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
6375 popl LEN
6376 popl IVP
6377 #endif
6378+ pax_force_retaddr 0, 1
6379 ret
6380+ENDPROC(aesni_cbc_enc)
6381
6382 /*
6383 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
6384@@ -2498,7 +2523,9 @@ ENTRY(aesni_cbc_dec)
6385 popl LEN
6386 popl IVP
6387 #endif
6388+ pax_force_retaddr 0, 1
6389 ret
6390+ENDPROC(aesni_cbc_dec)
6391
6392 #ifdef __x86_64__
6393 .align 16
6394@@ -2524,6 +2551,7 @@ _aesni_inc_init:
6395 mov $1, TCTR_LOW
6396 MOVQ_R64_XMM TCTR_LOW INC
6397 MOVQ_R64_XMM CTR TCTR_LOW
6398+ pax_force_retaddr_bts
6399 ret
6400
6401 /*
6402@@ -2552,6 +2580,7 @@ _aesni_inc:
6403 .Linc_low:
6404 movaps CTR, IV
6405 PSHUFB_XMM BSWAP_MASK IV
6406+ pax_force_retaddr_bts
6407 ret
6408
6409 /*
6410@@ -2612,5 +2641,7 @@ ENTRY(aesni_ctr_enc)
6411 .Lctr_enc_ret:
6412 movups IV, (IVP)
6413 .Lctr_enc_just_ret:
6414+ pax_force_retaddr 0, 1
6415 ret
6416+ENDPROC(aesni_ctr_enc)
6417 #endif
6418diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
6419index 391d245..67f35c2 100644
6420--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
6421+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
6422@@ -20,6 +20,8 @@
6423 *
6424 */
6425
6426+#include <asm/alternative-asm.h>
6427+
6428 .file "blowfish-x86_64-asm.S"
6429 .text
6430
6431@@ -151,9 +153,11 @@ __blowfish_enc_blk:
6432 jnz __enc_xor;
6433
6434 write_block();
6435+ pax_force_retaddr 0, 1
6436 ret;
6437 __enc_xor:
6438 xor_block();
6439+ pax_force_retaddr 0, 1
6440 ret;
6441
6442 .align 8
6443@@ -188,6 +192,7 @@ blowfish_dec_blk:
6444
6445 movq %r11, %rbp;
6446
6447+ pax_force_retaddr 0, 1
6448 ret;
6449
6450 /**********************************************************************
6451@@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
6452
6453 popq %rbx;
6454 popq %rbp;
6455+ pax_force_retaddr 0, 1
6456 ret;
6457
6458 __enc_xor4:
6459@@ -349,6 +355,7 @@ __enc_xor4:
6460
6461 popq %rbx;
6462 popq %rbp;
6463+ pax_force_retaddr 0, 1
6464 ret;
6465
6466 .align 8
6467@@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
6468 popq %rbx;
6469 popq %rbp;
6470
6471+ pax_force_retaddr 0, 1
6472 ret;
6473
6474diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
6475index 6214a9b..1f4fc9a 100644
6476--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
6477+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
6478@@ -1,3 +1,5 @@
6479+#include <asm/alternative-asm.h>
6480+
6481 # enter ECRYPT_encrypt_bytes
6482 .text
6483 .p2align 5
6484@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
6485 add %r11,%rsp
6486 mov %rdi,%rax
6487 mov %rsi,%rdx
6488+ pax_force_retaddr 0, 1
6489 ret
6490 # bytesatleast65:
6491 ._bytesatleast65:
6492@@ -891,6 +894,7 @@ ECRYPT_keysetup:
6493 add %r11,%rsp
6494 mov %rdi,%rax
6495 mov %rsi,%rdx
6496+ pax_force_retaddr
6497 ret
6498 # enter ECRYPT_ivsetup
6499 .text
6500@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
6501 add %r11,%rsp
6502 mov %rdi,%rax
6503 mov %rsi,%rdx
6504+ pax_force_retaddr
6505 ret
6506diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
6507index b2c2f57..8470cab 100644
6508--- a/arch/x86/crypto/sha1_ssse3_asm.S
6509+++ b/arch/x86/crypto/sha1_ssse3_asm.S
6510@@ -28,6 +28,8 @@
6511 * (at your option) any later version.
6512 */
6513
6514+#include <asm/alternative-asm.h>
6515+
6516 #define CTX %rdi // arg1
6517 #define BUF %rsi // arg2
6518 #define CNT %rdx // arg3
6519@@ -104,6 +106,7 @@
6520 pop %r12
6521 pop %rbp
6522 pop %rbx
6523+ pax_force_retaddr 0, 1
6524 ret
6525
6526 .size \name, .-\name
6527diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
6528index 5b012a2..36d5364 100644
6529--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
6530+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
6531@@ -20,6 +20,8 @@
6532 *
6533 */
6534
6535+#include <asm/alternative-asm.h>
6536+
6537 .file "twofish-x86_64-asm-3way.S"
6538 .text
6539
6540@@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
6541 popq %r13;
6542 popq %r14;
6543 popq %r15;
6544+ pax_force_retaddr 0, 1
6545 ret;
6546
6547 __enc_xor3:
6548@@ -271,6 +274,7 @@ __enc_xor3:
6549 popq %r13;
6550 popq %r14;
6551 popq %r15;
6552+ pax_force_retaddr 0, 1
6553 ret;
6554
6555 .global twofish_dec_blk_3way
6556@@ -312,5 +316,6 @@ twofish_dec_blk_3way:
6557 popq %r13;
6558 popq %r14;
6559 popq %r15;
6560+ pax_force_retaddr 0, 1
6561 ret;
6562
6563diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
6564index 7bcf3fc..f53832f 100644
6565--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
6566+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
6567@@ -21,6 +21,7 @@
6568 .text
6569
6570 #include <asm/asm-offsets.h>
6571+#include <asm/alternative-asm.h>
6572
6573 #define a_offset 0
6574 #define b_offset 4
6575@@ -268,6 +269,7 @@ twofish_enc_blk:
6576
6577 popq R1
6578 movq $1,%rax
6579+ pax_force_retaddr 0, 1
6580 ret
6581
6582 twofish_dec_blk:
6583@@ -319,4 +321,5 @@ twofish_dec_blk:
6584
6585 popq R1
6586 movq $1,%rax
6587+ pax_force_retaddr 0, 1
6588 ret
6589diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
6590index fd84387..0b4af7d 100644
6591--- a/arch/x86/ia32/ia32_aout.c
6592+++ b/arch/x86/ia32/ia32_aout.c
6593@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
6594 unsigned long dump_start, dump_size;
6595 struct user32 dump;
6596
6597+ memset(&dump, 0, sizeof(dump));
6598+
6599 fs = get_fs();
6600 set_fs(KERNEL_DS);
6601 has_dumped = 1;
6602diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
6603index 6557769..ef6ae89 100644
6604--- a/arch/x86/ia32/ia32_signal.c
6605+++ b/arch/x86/ia32/ia32_signal.c
6606@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
6607 }
6608 seg = get_fs();
6609 set_fs(KERNEL_DS);
6610- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
6611+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
6612 set_fs(seg);
6613 if (ret >= 0 && uoss_ptr) {
6614 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
6615@@ -370,7 +370,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
6616 */
6617 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
6618 size_t frame_size,
6619- void **fpstate)
6620+ void __user **fpstate)
6621 {
6622 unsigned long sp;
6623
6624@@ -391,7 +391,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
6625
6626 if (used_math()) {
6627 sp = sp - sig_xstate_ia32_size;
6628- *fpstate = (struct _fpstate_ia32 *) sp;
6629+ *fpstate = (struct _fpstate_ia32 __user *) sp;
6630 if (save_i387_xstate_ia32(*fpstate) < 0)
6631 return (void __user *) -1L;
6632 }
6633@@ -399,7 +399,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
6634 sp -= frame_size;
6635 /* Align the stack pointer according to the i386 ABI,
6636 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
6637- sp = ((sp + 4) & -16ul) - 4;
6638+ sp = ((sp - 12) & -16ul) - 4;
6639 return (void __user *) sp;
6640 }
6641
6642@@ -457,7 +457,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
6643 * These are actually not used anymore, but left because some
6644 * gdb versions depend on them as a marker.
6645 */
6646- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
6647+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
6648 } put_user_catch(err);
6649
6650 if (err)
6651@@ -499,7 +499,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
6652 0xb8,
6653 __NR_ia32_rt_sigreturn,
6654 0x80cd,
6655- 0,
6656+ 0
6657 };
6658
6659 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
6660@@ -529,16 +529,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
6661
6662 if (ka->sa.sa_flags & SA_RESTORER)
6663 restorer = ka->sa.sa_restorer;
6664+ else if (current->mm->context.vdso)
6665+ /* Return stub is in 32bit vsyscall page */
6666+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
6667 else
6668- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
6669- rt_sigreturn);
6670+ restorer = &frame->retcode;
6671 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
6672
6673 /*
6674 * Not actually used anymore, but left because some gdb
6675 * versions need it.
6676 */
6677- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
6678+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
6679 } put_user_catch(err);
6680
6681 if (err)
6682diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
6683index a6253ec..4ad2120 100644
6684--- a/arch/x86/ia32/ia32entry.S
6685+++ b/arch/x86/ia32/ia32entry.S
6686@@ -13,7 +13,9 @@
6687 #include <asm/thread_info.h>
6688 #include <asm/segment.h>
6689 #include <asm/irqflags.h>
6690+#include <asm/pgtable.h>
6691 #include <linux/linkage.h>
6692+#include <asm/alternative-asm.h>
6693
6694 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
6695 #include <linux/elf-em.h>
6696@@ -95,6 +97,32 @@ ENTRY(native_irq_enable_sysexit)
6697 ENDPROC(native_irq_enable_sysexit)
6698 #endif
6699
6700+ .macro pax_enter_kernel_user
6701+ pax_set_fptr_mask
6702+#ifdef CONFIG_PAX_MEMORY_UDEREF
6703+ call pax_enter_kernel_user
6704+#endif
6705+ .endm
6706+
6707+ .macro pax_exit_kernel_user
6708+#ifdef CONFIG_PAX_MEMORY_UDEREF
6709+ call pax_exit_kernel_user
6710+#endif
6711+#ifdef CONFIG_PAX_RANDKSTACK
6712+ pushq %rax
6713+ pushq %r11
6714+ call pax_randomize_kstack
6715+ popq %r11
6716+ popq %rax
6717+#endif
6718+ .endm
6719+
6720+.macro pax_erase_kstack
6721+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
6722+ call pax_erase_kstack
6723+#endif
6724+.endm
6725+
6726 /*
6727 * 32bit SYSENTER instruction entry.
6728 *
6729@@ -121,12 +149,6 @@ ENTRY(ia32_sysenter_target)
6730 CFI_REGISTER rsp,rbp
6731 SWAPGS_UNSAFE_STACK
6732 movq PER_CPU_VAR(kernel_stack), %rsp
6733- addq $(KERNEL_STACK_OFFSET),%rsp
6734- /*
6735- * No need to follow this irqs on/off section: the syscall
6736- * disabled irqs, here we enable it straight after entry:
6737- */
6738- ENABLE_INTERRUPTS(CLBR_NONE)
6739 movl %ebp,%ebp /* zero extension */
6740 pushq_cfi $__USER32_DS
6741 /*CFI_REL_OFFSET ss,0*/
6742@@ -134,25 +156,39 @@ ENTRY(ia32_sysenter_target)
6743 CFI_REL_OFFSET rsp,0
6744 pushfq_cfi
6745 /*CFI_REL_OFFSET rflags,0*/
6746- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
6747- CFI_REGISTER rip,r10
6748+ orl $X86_EFLAGS_IF,(%rsp)
6749+ GET_THREAD_INFO(%r11)
6750+ movl TI_sysenter_return(%r11), %r11d
6751+ CFI_REGISTER rip,r11
6752 pushq_cfi $__USER32_CS
6753 /*CFI_REL_OFFSET cs,0*/
6754 movl %eax, %eax
6755- pushq_cfi %r10
6756+ pushq_cfi %r11
6757 CFI_REL_OFFSET rip,0
6758 pushq_cfi %rax
6759 cld
6760 SAVE_ARGS 0,1,0
6761+ pax_enter_kernel_user
6762+ /*
6763+ * No need to follow this irqs on/off section: the syscall
6764+ * disabled irqs, here we enable it straight after entry:
6765+ */
6766+ ENABLE_INTERRUPTS(CLBR_NONE)
6767 /* no need to do an access_ok check here because rbp has been
6768 32bit zero extended */
6769+
6770+#ifdef CONFIG_PAX_MEMORY_UDEREF
6771+ mov $PAX_USER_SHADOW_BASE,%r11
6772+ add %r11,%rbp
6773+#endif
6774+
6775 1: movl (%rbp),%ebp
6776 .section __ex_table,"a"
6777 .quad 1b,ia32_badarg
6778 .previous
6779- GET_THREAD_INFO(%r10)
6780- orl $TS_COMPAT,TI_status(%r10)
6781- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
6782+ GET_THREAD_INFO(%r11)
6783+ orl $TS_COMPAT,TI_status(%r11)
6784+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
6785 CFI_REMEMBER_STATE
6786 jnz sysenter_tracesys
6787 cmpq $(IA32_NR_syscalls-1),%rax
6788@@ -162,13 +198,15 @@ sysenter_do_call:
6789 sysenter_dispatch:
6790 call *ia32_sys_call_table(,%rax,8)
6791 movq %rax,RAX-ARGOFFSET(%rsp)
6792- GET_THREAD_INFO(%r10)
6793+ GET_THREAD_INFO(%r11)
6794 DISABLE_INTERRUPTS(CLBR_NONE)
6795 TRACE_IRQS_OFF
6796- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
6797+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
6798 jnz sysexit_audit
6799 sysexit_from_sys_call:
6800- andl $~TS_COMPAT,TI_status(%r10)
6801+ pax_exit_kernel_user
6802+ pax_erase_kstack
6803+ andl $~TS_COMPAT,TI_status(%r11)
6804 /* clear IF, that popfq doesn't enable interrupts early */
6805 andl $~0x200,EFLAGS-R11(%rsp)
6806 movl RIP-R11(%rsp),%edx /* User %eip */
6807@@ -194,6 +232,9 @@ sysexit_from_sys_call:
6808 movl %eax,%esi /* 2nd arg: syscall number */
6809 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
6810 call audit_syscall_entry
6811+
6812+ pax_erase_kstack
6813+
6814 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
6815 cmpq $(IA32_NR_syscalls-1),%rax
6816 ja ia32_badsys
6817@@ -205,7 +246,7 @@ sysexit_from_sys_call:
6818 .endm
6819
6820 .macro auditsys_exit exit
6821- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
6822+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
6823 jnz ia32_ret_from_sys_call
6824 TRACE_IRQS_ON
6825 sti
6826@@ -215,12 +256,12 @@ sysexit_from_sys_call:
6827 movzbl %al,%edi /* zero-extend that into %edi */
6828 inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
6829 call audit_syscall_exit
6830- GET_THREAD_INFO(%r10)
6831+ GET_THREAD_INFO(%r11)
6832 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */
6833 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
6834 cli
6835 TRACE_IRQS_OFF
6836- testl %edi,TI_flags(%r10)
6837+ testl %edi,TI_flags(%r11)
6838 jz \exit
6839 CLEAR_RREGS -ARGOFFSET
6840 jmp int_with_check
6841@@ -238,7 +279,7 @@ sysexit_audit:
6842
6843 sysenter_tracesys:
6844 #ifdef CONFIG_AUDITSYSCALL
6845- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
6846+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
6847 jz sysenter_auditsys
6848 #endif
6849 SAVE_REST
6850@@ -246,6 +287,9 @@ sysenter_tracesys:
6851 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
6852 movq %rsp,%rdi /* &pt_regs -> arg1 */
6853 call syscall_trace_enter
6854+
6855+ pax_erase_kstack
6856+
6857 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
6858 RESTORE_REST
6859 cmpq $(IA32_NR_syscalls-1),%rax
6860@@ -277,19 +321,20 @@ ENDPROC(ia32_sysenter_target)
6861 ENTRY(ia32_cstar_target)
6862 CFI_STARTPROC32 simple
6863 CFI_SIGNAL_FRAME
6864- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
6865+ CFI_DEF_CFA rsp,0
6866 CFI_REGISTER rip,rcx
6867 /*CFI_REGISTER rflags,r11*/
6868 SWAPGS_UNSAFE_STACK
6869 movl %esp,%r8d
6870 CFI_REGISTER rsp,r8
6871 movq PER_CPU_VAR(kernel_stack),%rsp
6872+ SAVE_ARGS 8*6,0,0
6873+ pax_enter_kernel_user
6874 /*
6875 * No need to follow this irqs on/off section: the syscall
6876 * disabled irqs and here we enable it straight after entry:
6877 */
6878 ENABLE_INTERRUPTS(CLBR_NONE)
6879- SAVE_ARGS 8,0,0
6880 movl %eax,%eax /* zero extension */
6881 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
6882 movq %rcx,RIP-ARGOFFSET(%rsp)
6883@@ -305,13 +350,19 @@ ENTRY(ia32_cstar_target)
6884 /* no need to do an access_ok check here because r8 has been
6885 32bit zero extended */
6886 /* hardware stack frame is complete now */
6887+
6888+#ifdef CONFIG_PAX_MEMORY_UDEREF
6889+ mov $PAX_USER_SHADOW_BASE,%r11
6890+ add %r11,%r8
6891+#endif
6892+
6893 1: movl (%r8),%r9d
6894 .section __ex_table,"a"
6895 .quad 1b,ia32_badarg
6896 .previous
6897- GET_THREAD_INFO(%r10)
6898- orl $TS_COMPAT,TI_status(%r10)
6899- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
6900+ GET_THREAD_INFO(%r11)
6901+ orl $TS_COMPAT,TI_status(%r11)
6902+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
6903 CFI_REMEMBER_STATE
6904 jnz cstar_tracesys
6905 cmpq $IA32_NR_syscalls-1,%rax
6906@@ -321,13 +372,15 @@ cstar_do_call:
6907 cstar_dispatch:
6908 call *ia32_sys_call_table(,%rax,8)
6909 movq %rax,RAX-ARGOFFSET(%rsp)
6910- GET_THREAD_INFO(%r10)
6911+ GET_THREAD_INFO(%r11)
6912 DISABLE_INTERRUPTS(CLBR_NONE)
6913 TRACE_IRQS_OFF
6914- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
6915+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
6916 jnz sysretl_audit
6917 sysretl_from_sys_call:
6918- andl $~TS_COMPAT,TI_status(%r10)
6919+ pax_exit_kernel_user
6920+ pax_erase_kstack
6921+ andl $~TS_COMPAT,TI_status(%r11)
6922 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
6923 movl RIP-ARGOFFSET(%rsp),%ecx
6924 CFI_REGISTER rip,rcx
6925@@ -355,7 +408,7 @@ sysretl_audit:
6926
6927 cstar_tracesys:
6928 #ifdef CONFIG_AUDITSYSCALL
6929- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
6930+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
6931 jz cstar_auditsys
6932 #endif
6933 xchgl %r9d,%ebp
6934@@ -364,6 +417,9 @@ cstar_tracesys:
6935 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
6936 movq %rsp,%rdi /* &pt_regs -> arg1 */
6937 call syscall_trace_enter
6938+
6939+ pax_erase_kstack
6940+
6941 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
6942 RESTORE_REST
6943 xchgl %ebp,%r9d
6944@@ -409,20 +465,21 @@ ENTRY(ia32_syscall)
6945 CFI_REL_OFFSET rip,RIP-RIP
6946 PARAVIRT_ADJUST_EXCEPTION_FRAME
6947 SWAPGS
6948- /*
6949- * No need to follow this irqs on/off section: the syscall
6950- * disabled irqs and here we enable it straight after entry:
6951- */
6952- ENABLE_INTERRUPTS(CLBR_NONE)
6953 movl %eax,%eax
6954 pushq_cfi %rax
6955 cld
6956 /* note the registers are not zero extended to the sf.
6957 this could be a problem. */
6958 SAVE_ARGS 0,1,0
6959- GET_THREAD_INFO(%r10)
6960- orl $TS_COMPAT,TI_status(%r10)
6961- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
6962+ pax_enter_kernel_user
6963+ /*
6964+ * No need to follow this irqs on/off section: the syscall
6965+ * disabled irqs and here we enable it straight after entry:
6966+ */
6967+ ENABLE_INTERRUPTS(CLBR_NONE)
6968+ GET_THREAD_INFO(%r11)
6969+ orl $TS_COMPAT,TI_status(%r11)
6970+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
6971 jnz ia32_tracesys
6972 cmpq $(IA32_NR_syscalls-1),%rax
6973 ja ia32_badsys
6974@@ -441,6 +498,9 @@ ia32_tracesys:
6975 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
6976 movq %rsp,%rdi /* &pt_regs -> arg1 */
6977 call syscall_trace_enter
6978+
6979+ pax_erase_kstack
6980+
6981 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
6982 RESTORE_REST
6983 cmpq $(IA32_NR_syscalls-1),%rax
6984@@ -455,6 +515,7 @@ ia32_badsys:
6985
6986 quiet_ni_syscall:
6987 movq $-ENOSYS,%rax
6988+ pax_force_retaddr
6989 ret
6990 CFI_ENDPROC
6991
6992diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
6993index f6f5c53..b358b28 100644
6994--- a/arch/x86/ia32/sys_ia32.c
6995+++ b/arch/x86/ia32/sys_ia32.c
6996@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
6997 */
6998 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
6999 {
7000- typeof(ubuf->st_uid) uid = 0;
7001- typeof(ubuf->st_gid) gid = 0;
7002+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
7003+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
7004 SET_UID(uid, stat->uid);
7005 SET_GID(gid, stat->gid);
7006 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
7007@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
7008 }
7009 set_fs(KERNEL_DS);
7010 ret = sys_rt_sigprocmask(how,
7011- set ? (sigset_t __user *)&s : NULL,
7012- oset ? (sigset_t __user *)&s : NULL,
7013+ set ? (sigset_t __force_user *)&s : NULL,
7014+ oset ? (sigset_t __force_user *)&s : NULL,
7015 sigsetsize);
7016 set_fs(old_fs);
7017 if (ret)
7018@@ -332,7 +332,7 @@ asmlinkage long sys32_alarm(unsigned int seconds)
7019 return alarm_setitimer(seconds);
7020 }
7021
7022-asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
7023+asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
7024 int options)
7025 {
7026 return compat_sys_wait4(pid, stat_addr, options, NULL);
7027@@ -353,7 +353,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
7028 mm_segment_t old_fs = get_fs();
7029
7030 set_fs(KERNEL_DS);
7031- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
7032+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
7033 set_fs(old_fs);
7034 if (put_compat_timespec(&t, interval))
7035 return -EFAULT;
7036@@ -369,7 +369,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
7037 mm_segment_t old_fs = get_fs();
7038
7039 set_fs(KERNEL_DS);
7040- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
7041+ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
7042 set_fs(old_fs);
7043 if (!ret) {
7044 switch (_NSIG_WORDS) {
7045@@ -394,7 +394,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
7046 if (copy_siginfo_from_user32(&info, uinfo))
7047 return -EFAULT;
7048 set_fs(KERNEL_DS);
7049- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
7050+ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
7051 set_fs(old_fs);
7052 return ret;
7053 }
7054@@ -439,7 +439,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
7055 return -EFAULT;
7056
7057 set_fs(KERNEL_DS);
7058- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
7059+ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
7060 count);
7061 set_fs(old_fs);
7062
7063diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
7064index 091508b..e245ff2 100644
7065--- a/arch/x86/include/asm/alternative-asm.h
7066+++ b/arch/x86/include/asm/alternative-asm.h
7067@@ -4,10 +4,10 @@
7068
7069 #ifdef CONFIG_SMP
7070 .macro LOCK_PREFIX
7071-1: lock
7072+672: lock
7073 .section .smp_locks,"a"
7074 .balign 4
7075- .long 1b - .
7076+ .long 672b - .
7077 .previous
7078 .endm
7079 #else
7080@@ -15,6 +15,45 @@
7081 .endm
7082 #endif
7083
7084+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
7085+ .macro pax_force_retaddr_bts rip=0
7086+ btsq $63,\rip(%rsp)
7087+ .endm
7088+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
7089+ .macro pax_force_retaddr rip=0, reload=0
7090+ btsq $63,\rip(%rsp)
7091+ .endm
7092+ .macro pax_force_fptr ptr
7093+ btsq $63,\ptr
7094+ .endm
7095+ .macro pax_set_fptr_mask
7096+ .endm
7097+#endif
7098+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
7099+ .macro pax_force_retaddr rip=0, reload=0
7100+ .if \reload
7101+ pax_set_fptr_mask
7102+ .endif
7103+ orq %r10,\rip(%rsp)
7104+ .endm
7105+ .macro pax_force_fptr ptr
7106+ orq %r10,\ptr
7107+ .endm
7108+ .macro pax_set_fptr_mask
7109+ movabs $0x8000000000000000,%r10
7110+ .endm
7111+#endif
7112+#else
7113+ .macro pax_force_retaddr rip=0, reload=0
7114+ .endm
7115+ .macro pax_force_fptr ptr
7116+ .endm
7117+ .macro pax_force_retaddr_bts rip=0
7118+ .endm
7119+ .macro pax_set_fptr_mask
7120+ .endm
7121+#endif
7122+
7123 .macro altinstruction_entry orig alt feature orig_len alt_len
7124 .long \orig - .
7125 .long \alt - .
7126diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
7127index 37ad100..7d47faa 100644
7128--- a/arch/x86/include/asm/alternative.h
7129+++ b/arch/x86/include/asm/alternative.h
7130@@ -89,7 +89,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
7131 ".section .discard,\"aw\",@progbits\n" \
7132 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
7133 ".previous\n" \
7134- ".section .altinstr_replacement, \"ax\"\n" \
7135+ ".section .altinstr_replacement, \"a\"\n" \
7136 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
7137 ".previous"
7138
7139diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
7140index 1a6c09a..fec2432 100644
7141--- a/arch/x86/include/asm/apic.h
7142+++ b/arch/x86/include/asm/apic.h
7143@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
7144
7145 #ifdef CONFIG_X86_LOCAL_APIC
7146
7147-extern unsigned int apic_verbosity;
7148+extern int apic_verbosity;
7149 extern int local_apic_timer_c2_ok;
7150
7151 extern int disable_apic;
7152diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
7153index 20370c6..a2eb9b0 100644
7154--- a/arch/x86/include/asm/apm.h
7155+++ b/arch/x86/include/asm/apm.h
7156@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
7157 __asm__ __volatile__(APM_DO_ZERO_SEGS
7158 "pushl %%edi\n\t"
7159 "pushl %%ebp\n\t"
7160- "lcall *%%cs:apm_bios_entry\n\t"
7161+ "lcall *%%ss:apm_bios_entry\n\t"
7162 "setc %%al\n\t"
7163 "popl %%ebp\n\t"
7164 "popl %%edi\n\t"
7165@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
7166 __asm__ __volatile__(APM_DO_ZERO_SEGS
7167 "pushl %%edi\n\t"
7168 "pushl %%ebp\n\t"
7169- "lcall *%%cs:apm_bios_entry\n\t"
7170+ "lcall *%%ss:apm_bios_entry\n\t"
7171 "setc %%bl\n\t"
7172 "popl %%ebp\n\t"
7173 "popl %%edi\n\t"
7174diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
7175index 58cb6d4..ca9010d 100644
7176--- a/arch/x86/include/asm/atomic.h
7177+++ b/arch/x86/include/asm/atomic.h
7178@@ -22,7 +22,18 @@
7179 */
7180 static inline int atomic_read(const atomic_t *v)
7181 {
7182- return (*(volatile int *)&(v)->counter);
7183+ return (*(volatile const int *)&(v)->counter);
7184+}
7185+
7186+/**
7187+ * atomic_read_unchecked - read atomic variable
7188+ * @v: pointer of type atomic_unchecked_t
7189+ *
7190+ * Atomically reads the value of @v.
7191+ */
7192+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
7193+{
7194+ return (*(volatile const int *)&(v)->counter);
7195 }
7196
7197 /**
7198@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
7199 }
7200
7201 /**
7202+ * atomic_set_unchecked - set atomic variable
7203+ * @v: pointer of type atomic_unchecked_t
7204+ * @i: required value
7205+ *
7206+ * Atomically sets the value of @v to @i.
7207+ */
7208+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7209+{
7210+ v->counter = i;
7211+}
7212+
7213+/**
7214 * atomic_add - add integer to atomic variable
7215 * @i: integer value to add
7216 * @v: pointer of type atomic_t
7217@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
7218 */
7219 static inline void atomic_add(int i, atomic_t *v)
7220 {
7221- asm volatile(LOCK_PREFIX "addl %1,%0"
7222+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
7223+
7224+#ifdef CONFIG_PAX_REFCOUNT
7225+ "jno 0f\n"
7226+ LOCK_PREFIX "subl %1,%0\n"
7227+ "int $4\n0:\n"
7228+ _ASM_EXTABLE(0b, 0b)
7229+#endif
7230+
7231+ : "+m" (v->counter)
7232+ : "ir" (i));
7233+}
7234+
7235+/**
7236+ * atomic_add_unchecked - add integer to atomic variable
7237+ * @i: integer value to add
7238+ * @v: pointer of type atomic_unchecked_t
7239+ *
7240+ * Atomically adds @i to @v.
7241+ */
7242+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
7243+{
7244+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
7245 : "+m" (v->counter)
7246 : "ir" (i));
7247 }
7248@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
7249 */
7250 static inline void atomic_sub(int i, atomic_t *v)
7251 {
7252- asm volatile(LOCK_PREFIX "subl %1,%0"
7253+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
7254+
7255+#ifdef CONFIG_PAX_REFCOUNT
7256+ "jno 0f\n"
7257+ LOCK_PREFIX "addl %1,%0\n"
7258+ "int $4\n0:\n"
7259+ _ASM_EXTABLE(0b, 0b)
7260+#endif
7261+
7262+ : "+m" (v->counter)
7263+ : "ir" (i));
7264+}
7265+
7266+/**
7267+ * atomic_sub_unchecked - subtract integer from atomic variable
7268+ * @i: integer value to subtract
7269+ * @v: pointer of type atomic_unchecked_t
7270+ *
7271+ * Atomically subtracts @i from @v.
7272+ */
7273+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
7274+{
7275+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
7276 : "+m" (v->counter)
7277 : "ir" (i));
7278 }
7279@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
7280 {
7281 unsigned char c;
7282
7283- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
7284+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
7285+
7286+#ifdef CONFIG_PAX_REFCOUNT
7287+ "jno 0f\n"
7288+ LOCK_PREFIX "addl %2,%0\n"
7289+ "int $4\n0:\n"
7290+ _ASM_EXTABLE(0b, 0b)
7291+#endif
7292+
7293+ "sete %1\n"
7294 : "+m" (v->counter), "=qm" (c)
7295 : "ir" (i) : "memory");
7296 return c;
7297@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
7298 */
7299 static inline void atomic_inc(atomic_t *v)
7300 {
7301- asm volatile(LOCK_PREFIX "incl %0"
7302+ asm volatile(LOCK_PREFIX "incl %0\n"
7303+
7304+#ifdef CONFIG_PAX_REFCOUNT
7305+ "jno 0f\n"
7306+ LOCK_PREFIX "decl %0\n"
7307+ "int $4\n0:\n"
7308+ _ASM_EXTABLE(0b, 0b)
7309+#endif
7310+
7311+ : "+m" (v->counter));
7312+}
7313+
7314+/**
7315+ * atomic_inc_unchecked - increment atomic variable
7316+ * @v: pointer of type atomic_unchecked_t
7317+ *
7318+ * Atomically increments @v by 1.
7319+ */
7320+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7321+{
7322+ asm volatile(LOCK_PREFIX "incl %0\n"
7323 : "+m" (v->counter));
7324 }
7325
7326@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
7327 */
7328 static inline void atomic_dec(atomic_t *v)
7329 {
7330- asm volatile(LOCK_PREFIX "decl %0"
7331+ asm volatile(LOCK_PREFIX "decl %0\n"
7332+
7333+#ifdef CONFIG_PAX_REFCOUNT
7334+ "jno 0f\n"
7335+ LOCK_PREFIX "incl %0\n"
7336+ "int $4\n0:\n"
7337+ _ASM_EXTABLE(0b, 0b)
7338+#endif
7339+
7340+ : "+m" (v->counter));
7341+}
7342+
7343+/**
7344+ * atomic_dec_unchecked - decrement atomic variable
7345+ * @v: pointer of type atomic_unchecked_t
7346+ *
7347+ * Atomically decrements @v by 1.
7348+ */
7349+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
7350+{
7351+ asm volatile(LOCK_PREFIX "decl %0\n"
7352 : "+m" (v->counter));
7353 }
7354
7355@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
7356 {
7357 unsigned char c;
7358
7359- asm volatile(LOCK_PREFIX "decl %0; sete %1"
7360+ asm volatile(LOCK_PREFIX "decl %0\n"
7361+
7362+#ifdef CONFIG_PAX_REFCOUNT
7363+ "jno 0f\n"
7364+ LOCK_PREFIX "incl %0\n"
7365+ "int $4\n0:\n"
7366+ _ASM_EXTABLE(0b, 0b)
7367+#endif
7368+
7369+ "sete %1\n"
7370 : "+m" (v->counter), "=qm" (c)
7371 : : "memory");
7372 return c != 0;
7373@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
7374 {
7375 unsigned char c;
7376
7377- asm volatile(LOCK_PREFIX "incl %0; sete %1"
7378+ asm volatile(LOCK_PREFIX "incl %0\n"
7379+
7380+#ifdef CONFIG_PAX_REFCOUNT
7381+ "jno 0f\n"
7382+ LOCK_PREFIX "decl %0\n"
7383+ "int $4\n0:\n"
7384+ _ASM_EXTABLE(0b, 0b)
7385+#endif
7386+
7387+ "sete %1\n"
7388+ : "+m" (v->counter), "=qm" (c)
7389+ : : "memory");
7390+ return c != 0;
7391+}
7392+
7393+/**
7394+ * atomic_inc_and_test_unchecked - increment and test
7395+ * @v: pointer of type atomic_unchecked_t
7396+ *
7397+ * Atomically increments @v by 1
7398+ * and returns true if the result is zero, or false for all
7399+ * other cases.
7400+ */
7401+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7402+{
7403+ unsigned char c;
7404+
7405+ asm volatile(LOCK_PREFIX "incl %0\n"
7406+ "sete %1\n"
7407 : "+m" (v->counter), "=qm" (c)
7408 : : "memory");
7409 return c != 0;
7410@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
7411 {
7412 unsigned char c;
7413
7414- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
7415+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
7416+
7417+#ifdef CONFIG_PAX_REFCOUNT
7418+ "jno 0f\n"
7419+ LOCK_PREFIX "subl %2,%0\n"
7420+ "int $4\n0:\n"
7421+ _ASM_EXTABLE(0b, 0b)
7422+#endif
7423+
7424+ "sets %1\n"
7425 : "+m" (v->counter), "=qm" (c)
7426 : "ir" (i) : "memory");
7427 return c;
7428@@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
7429 goto no_xadd;
7430 #endif
7431 /* Modern 486+ processor */
7432- return i + xadd(&v->counter, i);
7433+ return i + xadd_check_overflow(&v->counter, i);
7434
7435 #ifdef CONFIG_M386
7436 no_xadd: /* Legacy 386 processor */
7437@@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
7438 }
7439
7440 /**
7441+ * atomic_add_return_unchecked - add integer and return
7442+ * @i: integer value to add
7443+ * @v: pointer of type atomic_unchecked_t
7444+ *
7445+ * Atomically adds @i to @v and returns @i + @v
7446+ */
7447+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
7448+{
7449+#ifdef CONFIG_M386
7450+ int __i;
7451+ unsigned long flags;
7452+ if (unlikely(boot_cpu_data.x86 <= 3))
7453+ goto no_xadd;
7454+#endif
7455+ /* Modern 486+ processor */
7456+ return i + xadd(&v->counter, i);
7457+
7458+#ifdef CONFIG_M386
7459+no_xadd: /* Legacy 386 processor */
7460+ raw_local_irq_save(flags);
7461+ __i = atomic_read_unchecked(v);
7462+ atomic_set_unchecked(v, i + __i);
7463+ raw_local_irq_restore(flags);
7464+ return i + __i;
7465+#endif
7466+}
7467+
7468+/**
7469 * atomic_sub_return - subtract integer and return
7470 * @v: pointer of type atomic_t
7471 * @i: integer value to subtract
7472@@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
7473 }
7474
7475 #define atomic_inc_return(v) (atomic_add_return(1, v))
7476+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7477+{
7478+ return atomic_add_return_unchecked(1, v);
7479+}
7480 #define atomic_dec_return(v) (atomic_sub_return(1, v))
7481
7482 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
7483@@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
7484 return cmpxchg(&v->counter, old, new);
7485 }
7486
7487+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7488+{
7489+ return cmpxchg(&v->counter, old, new);
7490+}
7491+
7492 static inline int atomic_xchg(atomic_t *v, int new)
7493 {
7494 return xchg(&v->counter, new);
7495 }
7496
7497+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7498+{
7499+ return xchg(&v->counter, new);
7500+}
7501+
7502 /**
7503 * __atomic_add_unless - add unless the number is already a given value
7504 * @v: pointer of type atomic_t
7505@@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
7506 */
7507 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
7508 {
7509- int c, old;
7510+ int c, old, new;
7511 c = atomic_read(v);
7512 for (;;) {
7513- if (unlikely(c == (u)))
7514+ if (unlikely(c == u))
7515 break;
7516- old = atomic_cmpxchg((v), c, c + (a));
7517+
7518+ asm volatile("addl %2,%0\n"
7519+
7520+#ifdef CONFIG_PAX_REFCOUNT
7521+ "jno 0f\n"
7522+ "subl %2,%0\n"
7523+ "int $4\n0:\n"
7524+ _ASM_EXTABLE(0b, 0b)
7525+#endif
7526+
7527+ : "=r" (new)
7528+ : "0" (c), "ir" (a));
7529+
7530+ old = atomic_cmpxchg(v, c, new);
7531 if (likely(old == c))
7532 break;
7533 c = old;
7534@@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
7535 return c;
7536 }
7537
7538+/**
7539+ * atomic_inc_not_zero_hint - increment if not null
7540+ * @v: pointer of type atomic_t
7541+ * @hint: probable value of the atomic before the increment
7542+ *
7543+ * This version of atomic_inc_not_zero() gives a hint of probable
7544+ * value of the atomic. This helps processor to not read the memory
7545+ * before doing the atomic read/modify/write cycle, lowering
7546+ * number of bus transactions on some arches.
7547+ *
7548+ * Returns: 0 if increment was not done, 1 otherwise.
7549+ */
7550+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
7551+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
7552+{
7553+ int val, c = hint, new;
7554+
7555+ /* sanity test, should be removed by compiler if hint is a constant */
7556+ if (!hint)
7557+ return __atomic_add_unless(v, 1, 0);
7558+
7559+ do {
7560+ asm volatile("incl %0\n"
7561+
7562+#ifdef CONFIG_PAX_REFCOUNT
7563+ "jno 0f\n"
7564+ "decl %0\n"
7565+ "int $4\n0:\n"
7566+ _ASM_EXTABLE(0b, 0b)
7567+#endif
7568+
7569+ : "=r" (new)
7570+ : "0" (c));
7571+
7572+ val = atomic_cmpxchg(v, c, new);
7573+ if (val == c)
7574+ return 1;
7575+ c = val;
7576+ } while (c);
7577+
7578+ return 0;
7579+}
7580
7581 /*
7582 * atomic_dec_if_positive - decrement by 1 if old value positive
7583diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
7584index 24098aa..1e37723 100644
7585--- a/arch/x86/include/asm/atomic64_32.h
7586+++ b/arch/x86/include/asm/atomic64_32.h
7587@@ -12,6 +12,14 @@ typedef struct {
7588 u64 __aligned(8) counter;
7589 } atomic64_t;
7590
7591+#ifdef CONFIG_PAX_REFCOUNT
7592+typedef struct {
7593+ u64 __aligned(8) counter;
7594+} atomic64_unchecked_t;
7595+#else
7596+typedef atomic64_t atomic64_unchecked_t;
7597+#endif
7598+
7599 #define ATOMIC64_INIT(val) { (val) }
7600
7601 #ifdef CONFIG_X86_CMPXCHG64
7602@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
7603 }
7604
7605 /**
7606+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
7607+ * @p: pointer to type atomic64_unchecked_t
7608+ * @o: expected value
7609+ * @n: new value
7610+ *
7611+ * Atomically sets @v to @n if it was equal to @o and returns
7612+ * the old value.
7613+ */
7614+
7615+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
7616+{
7617+ return cmpxchg64(&v->counter, o, n);
7618+}
7619+
7620+/**
7621 * atomic64_xchg - xchg atomic64 variable
7622 * @v: pointer to type atomic64_t
7623 * @n: value to assign
7624@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i)
7625 }
7626
7627 /**
7628+ * atomic64_set_unchecked - set atomic64 variable
7629+ * @v: pointer to type atomic64_unchecked_t
7630+ * @n: value to assign
7631+ *
7632+ * Atomically sets the value of @v to @n.
7633+ */
7634+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
7635+{
7636+ unsigned high = (unsigned)(i >> 32);
7637+ unsigned low = (unsigned)i;
7638+ asm volatile(ATOMIC64_ALTERNATIVE(set)
7639+ : "+b" (low), "+c" (high)
7640+ : "S" (v)
7641+ : "eax", "edx", "memory"
7642+ );
7643+}
7644+
7645+/**
7646 * atomic64_read - read atomic64 variable
7647 * @v: pointer to type atomic64_t
7648 *
7649@@ -93,6 +134,22 @@ static inline long long atomic64_read(atomic64_t *v)
7650 }
7651
7652 /**
7653+ * atomic64_read_unchecked - read atomic64 variable
7654+ * @v: pointer to type atomic64_unchecked_t
7655+ *
7656+ * Atomically reads the value of @v and returns it.
7657+ */
7658+static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
7659+{
7660+ long long r;
7661+ asm volatile(ATOMIC64_ALTERNATIVE(read_unchecked)
7662+ : "=A" (r), "+c" (v)
7663+ : : "memory"
7664+ );
7665+ return r;
7666+ }
7667+
7668+/**
7669 * atomic64_add_return - add and return
7670 * @i: integer value to add
7671 * @v: pointer to type atomic64_t
7672@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
7673 return i;
7674 }
7675
7676+/**
7677+ * atomic64_add_return_unchecked - add and return
7678+ * @i: integer value to add
7679+ * @v: pointer to type atomic64_unchecked_t
7680+ *
7681+ * Atomically adds @i to @v and returns @i + *@v
7682+ */
7683+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
7684+{
7685+ asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
7686+ : "+A" (i), "+c" (v)
7687+ : : "memory"
7688+ );
7689+ return i;
7690+}
7691+
7692 /*
7693 * Other variants with different arithmetic operators:
7694 */
7695@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v)
7696 return a;
7697 }
7698
7699+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
7700+{
7701+ long long a;
7702+ asm volatile(ATOMIC64_ALTERNATIVE(inc_return_unchecked)
7703+ : "=A" (a)
7704+ : "S" (v)
7705+ : "memory", "ecx"
7706+ );
7707+ return a;
7708+}
7709+
7710 static inline long long atomic64_dec_return(atomic64_t *v)
7711 {
7712 long long a;
7713@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
7714 }
7715
7716 /**
7717+ * atomic64_add_unchecked - add integer to atomic64 variable
7718+ * @i: integer value to add
7719+ * @v: pointer to type atomic64_unchecked_t
7720+ *
7721+ * Atomically adds @i to @v.
7722+ */
7723+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
7724+{
7725+ asm volatile(ATOMIC64_ALTERNATIVE_(add_unchecked, add_return_unchecked)
7726+ : "+A" (i), "+c" (v)
7727+ : : "memory"
7728+ );
7729+ return i;
7730+}
7731+
7732+/**
7733 * atomic64_sub - subtract the atomic64 variable
7734 * @i: integer value to subtract
7735 * @v: pointer to type atomic64_t
7736diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
7737index 0e1cbfc..5623683 100644
7738--- a/arch/x86/include/asm/atomic64_64.h
7739+++ b/arch/x86/include/asm/atomic64_64.h
7740@@ -18,7 +18,19 @@
7741 */
7742 static inline long atomic64_read(const atomic64_t *v)
7743 {
7744- return (*(volatile long *)&(v)->counter);
7745+ return (*(volatile const long *)&(v)->counter);
7746+}
7747+
7748+/**
7749+ * atomic64_read_unchecked - read atomic64 variable
7750+ * @v: pointer of type atomic64_unchecked_t
7751+ *
7752+ * Atomically reads the value of @v.
7753+ * Doesn't imply a read memory barrier.
7754+ */
7755+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7756+{
7757+ return (*(volatile const long *)&(v)->counter);
7758 }
7759
7760 /**
7761@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
7762 }
7763
7764 /**
7765+ * atomic64_set_unchecked - set atomic64 variable
7766+ * @v: pointer to type atomic64_unchecked_t
7767+ * @i: required value
7768+ *
7769+ * Atomically sets the value of @v to @i.
7770+ */
7771+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7772+{
7773+ v->counter = i;
7774+}
7775+
7776+/**
7777 * atomic64_add - add integer to atomic64 variable
7778 * @i: integer value to add
7779 * @v: pointer to type atomic64_t
7780@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
7781 */
7782 static inline void atomic64_add(long i, atomic64_t *v)
7783 {
7784+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
7785+
7786+#ifdef CONFIG_PAX_REFCOUNT
7787+ "jno 0f\n"
7788+ LOCK_PREFIX "subq %1,%0\n"
7789+ "int $4\n0:\n"
7790+ _ASM_EXTABLE(0b, 0b)
7791+#endif
7792+
7793+ : "=m" (v->counter)
7794+ : "er" (i), "m" (v->counter));
7795+}
7796+
7797+/**
7798+ * atomic64_add_unchecked - add integer to atomic64 variable
7799+ * @i: integer value to add
7800+ * @v: pointer to type atomic64_unchecked_t
7801+ *
7802+ * Atomically adds @i to @v.
7803+ */
7804+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
7805+{
7806 asm volatile(LOCK_PREFIX "addq %1,%0"
7807 : "=m" (v->counter)
7808 : "er" (i), "m" (v->counter));
7809@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
7810 */
7811 static inline void atomic64_sub(long i, atomic64_t *v)
7812 {
7813- asm volatile(LOCK_PREFIX "subq %1,%0"
7814+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
7815+
7816+#ifdef CONFIG_PAX_REFCOUNT
7817+ "jno 0f\n"
7818+ LOCK_PREFIX "addq %1,%0\n"
7819+ "int $4\n0:\n"
7820+ _ASM_EXTABLE(0b, 0b)
7821+#endif
7822+
7823+ : "=m" (v->counter)
7824+ : "er" (i), "m" (v->counter));
7825+}
7826+
7827+/**
7828+ * atomic64_sub_unchecked - subtract the atomic64 variable
7829+ * @i: integer value to subtract
7830+ * @v: pointer to type atomic64_unchecked_t
7831+ *
7832+ * Atomically subtracts @i from @v.
7833+ */
7834+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
7835+{
7836+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
7837 : "=m" (v->counter)
7838 : "er" (i), "m" (v->counter));
7839 }
7840@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
7841 {
7842 unsigned char c;
7843
7844- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
7845+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
7846+
7847+#ifdef CONFIG_PAX_REFCOUNT
7848+ "jno 0f\n"
7849+ LOCK_PREFIX "addq %2,%0\n"
7850+ "int $4\n0:\n"
7851+ _ASM_EXTABLE(0b, 0b)
7852+#endif
7853+
7854+ "sete %1\n"
7855 : "=m" (v->counter), "=qm" (c)
7856 : "er" (i), "m" (v->counter) : "memory");
7857 return c;
7858@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
7859 */
7860 static inline void atomic64_inc(atomic64_t *v)
7861 {
7862+ asm volatile(LOCK_PREFIX "incq %0\n"
7863+
7864+#ifdef CONFIG_PAX_REFCOUNT
7865+ "jno 0f\n"
7866+ LOCK_PREFIX "decq %0\n"
7867+ "int $4\n0:\n"
7868+ _ASM_EXTABLE(0b, 0b)
7869+#endif
7870+
7871+ : "=m" (v->counter)
7872+ : "m" (v->counter));
7873+}
7874+
7875+/**
7876+ * atomic64_inc_unchecked - increment atomic64 variable
7877+ * @v: pointer to type atomic64_unchecked_t
7878+ *
7879+ * Atomically increments @v by 1.
7880+ */
7881+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
7882+{
7883 asm volatile(LOCK_PREFIX "incq %0"
7884 : "=m" (v->counter)
7885 : "m" (v->counter));
7886@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
7887 */
7888 static inline void atomic64_dec(atomic64_t *v)
7889 {
7890- asm volatile(LOCK_PREFIX "decq %0"
7891+ asm volatile(LOCK_PREFIX "decq %0\n"
7892+
7893+#ifdef CONFIG_PAX_REFCOUNT
7894+ "jno 0f\n"
7895+ LOCK_PREFIX "incq %0\n"
7896+ "int $4\n0:\n"
7897+ _ASM_EXTABLE(0b, 0b)
7898+#endif
7899+
7900+ : "=m" (v->counter)
7901+ : "m" (v->counter));
7902+}
7903+
7904+/**
7905+ * atomic64_dec_unchecked - decrement atomic64 variable
7906+ * @v: pointer to type atomic64_t
7907+ *
7908+ * Atomically decrements @v by 1.
7909+ */
7910+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
7911+{
7912+ asm volatile(LOCK_PREFIX "decq %0\n"
7913 : "=m" (v->counter)
7914 : "m" (v->counter));
7915 }
7916@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
7917 {
7918 unsigned char c;
7919
7920- asm volatile(LOCK_PREFIX "decq %0; sete %1"
7921+ asm volatile(LOCK_PREFIX "decq %0\n"
7922+
7923+#ifdef CONFIG_PAX_REFCOUNT
7924+ "jno 0f\n"
7925+ LOCK_PREFIX "incq %0\n"
7926+ "int $4\n0:\n"
7927+ _ASM_EXTABLE(0b, 0b)
7928+#endif
7929+
7930+ "sete %1\n"
7931 : "=m" (v->counter), "=qm" (c)
7932 : "m" (v->counter) : "memory");
7933 return c != 0;
7934@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
7935 {
7936 unsigned char c;
7937
7938- asm volatile(LOCK_PREFIX "incq %0; sete %1"
7939+ asm volatile(LOCK_PREFIX "incq %0\n"
7940+
7941+#ifdef CONFIG_PAX_REFCOUNT
7942+ "jno 0f\n"
7943+ LOCK_PREFIX "decq %0\n"
7944+ "int $4\n0:\n"
7945+ _ASM_EXTABLE(0b, 0b)
7946+#endif
7947+
7948+ "sete %1\n"
7949 : "=m" (v->counter), "=qm" (c)
7950 : "m" (v->counter) : "memory");
7951 return c != 0;
7952@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
7953 {
7954 unsigned char c;
7955
7956- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
7957+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
7958+
7959+#ifdef CONFIG_PAX_REFCOUNT
7960+ "jno 0f\n"
7961+ LOCK_PREFIX "subq %2,%0\n"
7962+ "int $4\n0:\n"
7963+ _ASM_EXTABLE(0b, 0b)
7964+#endif
7965+
7966+ "sets %1\n"
7967 : "=m" (v->counter), "=qm" (c)
7968 : "er" (i), "m" (v->counter) : "memory");
7969 return c;
7970@@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
7971 */
7972 static inline long atomic64_add_return(long i, atomic64_t *v)
7973 {
7974+ return i + xadd_check_overflow(&v->counter, i);
7975+}
7976+
7977+/**
7978+ * atomic64_add_return_unchecked - add and return
7979+ * @i: integer value to add
7980+ * @v: pointer to type atomic64_unchecked_t
7981+ *
7982+ * Atomically adds @i to @v and returns @i + @v
7983+ */
7984+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
7985+{
7986 return i + xadd(&v->counter, i);
7987 }
7988
7989@@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
7990 }
7991
7992 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
7993+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
7994+{
7995+ return atomic64_add_return_unchecked(1, v);
7996+}
7997 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
7998
7999 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
8000@@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
8001 return cmpxchg(&v->counter, old, new);
8002 }
8003
8004+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8005+{
8006+ return cmpxchg(&v->counter, old, new);
8007+}
8008+
8009 static inline long atomic64_xchg(atomic64_t *v, long new)
8010 {
8011 return xchg(&v->counter, new);
8012@@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
8013 */
8014 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
8015 {
8016- long c, old;
8017+ long c, old, new;
8018 c = atomic64_read(v);
8019 for (;;) {
8020- if (unlikely(c == (u)))
8021+ if (unlikely(c == u))
8022 break;
8023- old = atomic64_cmpxchg((v), c, c + (a));
8024+
8025+ asm volatile("add %2,%0\n"
8026+
8027+#ifdef CONFIG_PAX_REFCOUNT
8028+ "jno 0f\n"
8029+ "sub %2,%0\n"
8030+ "int $4\n0:\n"
8031+ _ASM_EXTABLE(0b, 0b)
8032+#endif
8033+
8034+ : "=r" (new)
8035+ : "0" (c), "ir" (a));
8036+
8037+ old = atomic64_cmpxchg(v, c, new);
8038 if (likely(old == c))
8039 break;
8040 c = old;
8041 }
8042- return c != (u);
8043+ return c != u;
8044 }
8045
8046 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
8047diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
8048index 1775d6e..b65017f 100644
8049--- a/arch/x86/include/asm/bitops.h
8050+++ b/arch/x86/include/asm/bitops.h
8051@@ -38,7 +38,7 @@
8052 * a mask operation on a byte.
8053 */
8054 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
8055-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
8056+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
8057 #define CONST_MASK(nr) (1 << ((nr) & 7))
8058
8059 /**
8060diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
8061index 5e1a2ee..c9f9533 100644
8062--- a/arch/x86/include/asm/boot.h
8063+++ b/arch/x86/include/asm/boot.h
8064@@ -11,10 +11,15 @@
8065 #include <asm/pgtable_types.h>
8066
8067 /* Physical address where kernel should be loaded. */
8068-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
8069+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
8070 + (CONFIG_PHYSICAL_ALIGN - 1)) \
8071 & ~(CONFIG_PHYSICAL_ALIGN - 1))
8072
8073+#ifndef __ASSEMBLY__
8074+extern unsigned char __LOAD_PHYSICAL_ADDR[];
8075+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
8076+#endif
8077+
8078 /* Minimum kernel alignment, as a power of two */
8079 #ifdef CONFIG_X86_64
8080 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
8081diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
8082index 48f99f1..d78ebf9 100644
8083--- a/arch/x86/include/asm/cache.h
8084+++ b/arch/x86/include/asm/cache.h
8085@@ -5,12 +5,13 @@
8086
8087 /* L1 cache line size */
8088 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
8089-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8090+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8091
8092 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
8093+#define __read_only __attribute__((__section__(".data..read_only")))
8094
8095 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
8096-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
8097+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
8098
8099 #ifdef CONFIG_X86_VSMP
8100 #ifdef CONFIG_SMP
8101diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
8102index 4e12668..501d239 100644
8103--- a/arch/x86/include/asm/cacheflush.h
8104+++ b/arch/x86/include/asm/cacheflush.h
8105@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
8106 unsigned long pg_flags = pg->flags & _PGMT_MASK;
8107
8108 if (pg_flags == _PGMT_DEFAULT)
8109- return -1;
8110+ return ~0UL;
8111 else if (pg_flags == _PGMT_WC)
8112 return _PAGE_CACHE_WC;
8113 else if (pg_flags == _PGMT_UC_MINUS)
8114diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
8115index 46fc474..b02b0f9 100644
8116--- a/arch/x86/include/asm/checksum_32.h
8117+++ b/arch/x86/include/asm/checksum_32.h
8118@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
8119 int len, __wsum sum,
8120 int *src_err_ptr, int *dst_err_ptr);
8121
8122+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
8123+ int len, __wsum sum,
8124+ int *src_err_ptr, int *dst_err_ptr);
8125+
8126+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
8127+ int len, __wsum sum,
8128+ int *src_err_ptr, int *dst_err_ptr);
8129+
8130 /*
8131 * Note: when you get a NULL pointer exception here this means someone
8132 * passed in an incorrect kernel address to one of these functions.
8133@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
8134 int *err_ptr)
8135 {
8136 might_sleep();
8137- return csum_partial_copy_generic((__force void *)src, dst,
8138+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
8139 len, sum, err_ptr, NULL);
8140 }
8141
8142@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
8143 {
8144 might_sleep();
8145 if (access_ok(VERIFY_WRITE, dst, len))
8146- return csum_partial_copy_generic(src, (__force void *)dst,
8147+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
8148 len, sum, NULL, err_ptr);
8149
8150 if (len)
8151diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
8152index 5d3acdf..6447a02 100644
8153--- a/arch/x86/include/asm/cmpxchg.h
8154+++ b/arch/x86/include/asm/cmpxchg.h
8155@@ -14,6 +14,8 @@ extern void __cmpxchg_wrong_size(void)
8156 __compiletime_error("Bad argument size for cmpxchg");
8157 extern void __xadd_wrong_size(void)
8158 __compiletime_error("Bad argument size for xadd");
8159+extern void __xadd_check_overflow_wrong_size(void)
8160+ __compiletime_error("Bad argument size for xadd_check_overflow");
8161
8162 /*
8163 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
8164@@ -195,6 +197,34 @@ extern void __xadd_wrong_size(void)
8165 __ret; \
8166 })
8167
8168+#define __xadd_check_overflow(ptr, inc, lock) \
8169+ ({ \
8170+ __typeof__ (*(ptr)) __ret = (inc); \
8171+ switch (sizeof(*(ptr))) { \
8172+ case __X86_CASE_L: \
8173+ asm volatile (lock "xaddl %0, %1\n" \
8174+ "jno 0f\n" \
8175+ "mov %0,%1\n" \
8176+ "int $4\n0:\n" \
8177+ _ASM_EXTABLE(0b, 0b) \
8178+ : "+r" (__ret), "+m" (*(ptr)) \
8179+ : : "memory", "cc"); \
8180+ break; \
8181+ case __X86_CASE_Q: \
8182+ asm volatile (lock "xaddq %q0, %1\n" \
8183+ "jno 0f\n" \
8184+ "mov %0,%1\n" \
8185+ "int $4\n0:\n" \
8186+ _ASM_EXTABLE(0b, 0b) \
8187+ : "+r" (__ret), "+m" (*(ptr)) \
8188+ : : "memory", "cc"); \
8189+ break; \
8190+ default: \
8191+ __xadd_check_overflow_wrong_size(); \
8192+ } \
8193+ __ret; \
8194+ })
8195+
8196 /*
8197 * xadd() adds "inc" to "*ptr" and atomically returns the previous
8198 * value of "*ptr".
8199@@ -207,4 +237,6 @@ extern void __xadd_wrong_size(void)
8200 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
8201 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
8202
8203+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
8204+
8205 #endif /* ASM_X86_CMPXCHG_H */
8206diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
8207index f3444f7..051a196 100644
8208--- a/arch/x86/include/asm/cpufeature.h
8209+++ b/arch/x86/include/asm/cpufeature.h
8210@@ -363,7 +363,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
8211 ".section .discard,\"aw\",@progbits\n"
8212 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
8213 ".previous\n"
8214- ".section .altinstr_replacement,\"ax\"\n"
8215+ ".section .altinstr_replacement,\"a\"\n"
8216 "3: movb $1,%0\n"
8217 "4:\n"
8218 ".previous\n"
8219diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
8220index 41935fa..3b40db8 100644
8221--- a/arch/x86/include/asm/desc.h
8222+++ b/arch/x86/include/asm/desc.h
8223@@ -4,6 +4,7 @@
8224 #include <asm/desc_defs.h>
8225 #include <asm/ldt.h>
8226 #include <asm/mmu.h>
8227+#include <asm/pgtable.h>
8228
8229 #include <linux/smp.h>
8230
8231@@ -16,6 +17,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
8232
8233 desc->type = (info->read_exec_only ^ 1) << 1;
8234 desc->type |= info->contents << 2;
8235+ desc->type |= info->seg_not_present ^ 1;
8236
8237 desc->s = 1;
8238 desc->dpl = 0x3;
8239@@ -34,17 +36,12 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
8240 }
8241
8242 extern struct desc_ptr idt_descr;
8243-extern gate_desc idt_table[];
8244-
8245-struct gdt_page {
8246- struct desc_struct gdt[GDT_ENTRIES];
8247-} __attribute__((aligned(PAGE_SIZE)));
8248-
8249-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
8250+extern gate_desc idt_table[256];
8251
8252+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
8253 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
8254 {
8255- return per_cpu(gdt_page, cpu).gdt;
8256+ return cpu_gdt_table[cpu];
8257 }
8258
8259 #ifdef CONFIG_X86_64
8260@@ -69,8 +66,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
8261 unsigned long base, unsigned dpl, unsigned flags,
8262 unsigned short seg)
8263 {
8264- gate->a = (seg << 16) | (base & 0xffff);
8265- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
8266+ gate->gate.offset_low = base;
8267+ gate->gate.seg = seg;
8268+ gate->gate.reserved = 0;
8269+ gate->gate.type = type;
8270+ gate->gate.s = 0;
8271+ gate->gate.dpl = dpl;
8272+ gate->gate.p = 1;
8273+ gate->gate.offset_high = base >> 16;
8274 }
8275
8276 #endif
8277@@ -115,12 +118,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
8278
8279 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
8280 {
8281+ pax_open_kernel();
8282 memcpy(&idt[entry], gate, sizeof(*gate));
8283+ pax_close_kernel();
8284 }
8285
8286 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
8287 {
8288+ pax_open_kernel();
8289 memcpy(&ldt[entry], desc, 8);
8290+ pax_close_kernel();
8291 }
8292
8293 static inline void
8294@@ -134,7 +141,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
8295 default: size = sizeof(*gdt); break;
8296 }
8297
8298+ pax_open_kernel();
8299 memcpy(&gdt[entry], desc, size);
8300+ pax_close_kernel();
8301 }
8302
8303 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
8304@@ -207,7 +216,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
8305
8306 static inline void native_load_tr_desc(void)
8307 {
8308+ pax_open_kernel();
8309 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
8310+ pax_close_kernel();
8311 }
8312
8313 static inline void native_load_gdt(const struct desc_ptr *dtr)
8314@@ -244,8 +255,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
8315 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
8316 unsigned int i;
8317
8318+ pax_open_kernel();
8319 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
8320 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
8321+ pax_close_kernel();
8322 }
8323
8324 #define _LDT_empty(info) \
8325@@ -307,7 +320,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
8326 desc->limit = (limit >> 16) & 0xf;
8327 }
8328
8329-static inline void _set_gate(int gate, unsigned type, void *addr,
8330+static inline void _set_gate(int gate, unsigned type, const void *addr,
8331 unsigned dpl, unsigned ist, unsigned seg)
8332 {
8333 gate_desc s;
8334@@ -326,7 +339,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
8335 * Pentium F0 0F bugfix can have resulted in the mapped
8336 * IDT being write-protected.
8337 */
8338-static inline void set_intr_gate(unsigned int n, void *addr)
8339+static inline void set_intr_gate(unsigned int n, const void *addr)
8340 {
8341 BUG_ON((unsigned)n > 0xFF);
8342 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
8343@@ -356,19 +369,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
8344 /*
8345 * This routine sets up an interrupt gate at directory privilege level 3.
8346 */
8347-static inline void set_system_intr_gate(unsigned int n, void *addr)
8348+static inline void set_system_intr_gate(unsigned int n, const void *addr)
8349 {
8350 BUG_ON((unsigned)n > 0xFF);
8351 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
8352 }
8353
8354-static inline void set_system_trap_gate(unsigned int n, void *addr)
8355+static inline void set_system_trap_gate(unsigned int n, const void *addr)
8356 {
8357 BUG_ON((unsigned)n > 0xFF);
8358 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
8359 }
8360
8361-static inline void set_trap_gate(unsigned int n, void *addr)
8362+static inline void set_trap_gate(unsigned int n, const void *addr)
8363 {
8364 BUG_ON((unsigned)n > 0xFF);
8365 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
8366@@ -377,19 +390,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
8367 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
8368 {
8369 BUG_ON((unsigned)n > 0xFF);
8370- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
8371+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
8372 }
8373
8374-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
8375+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
8376 {
8377 BUG_ON((unsigned)n > 0xFF);
8378 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
8379 }
8380
8381-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
8382+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
8383 {
8384 BUG_ON((unsigned)n > 0xFF);
8385 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
8386 }
8387
8388+#ifdef CONFIG_X86_32
8389+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
8390+{
8391+ struct desc_struct d;
8392+
8393+ if (likely(limit))
8394+ limit = (limit - 1UL) >> PAGE_SHIFT;
8395+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
8396+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
8397+}
8398+#endif
8399+
8400 #endif /* _ASM_X86_DESC_H */
8401diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
8402index 278441f..b95a174 100644
8403--- a/arch/x86/include/asm/desc_defs.h
8404+++ b/arch/x86/include/asm/desc_defs.h
8405@@ -31,6 +31,12 @@ struct desc_struct {
8406 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
8407 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
8408 };
8409+ struct {
8410+ u16 offset_low;
8411+ u16 seg;
8412+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
8413+ unsigned offset_high: 16;
8414+ } gate;
8415 };
8416 } __attribute__((packed));
8417
8418diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
8419index 908b969..a1f4eb4 100644
8420--- a/arch/x86/include/asm/e820.h
8421+++ b/arch/x86/include/asm/e820.h
8422@@ -69,7 +69,7 @@ struct e820map {
8423 #define ISA_START_ADDRESS 0xa0000
8424 #define ISA_END_ADDRESS 0x100000
8425
8426-#define BIOS_BEGIN 0x000a0000
8427+#define BIOS_BEGIN 0x000c0000
8428 #define BIOS_END 0x00100000
8429
8430 #define BIOS_ROM_BASE 0xffe00000
8431diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
8432index 5f962df..7289f09 100644
8433--- a/arch/x86/include/asm/elf.h
8434+++ b/arch/x86/include/asm/elf.h
8435@@ -238,7 +238,25 @@ extern int force_personality32;
8436 the loader. We need to make sure that it is out of the way of the program
8437 that it will "exec", and that there is sufficient room for the brk. */
8438
8439+#ifdef CONFIG_PAX_SEGMEXEC
8440+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
8441+#else
8442 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
8443+#endif
8444+
8445+#ifdef CONFIG_PAX_ASLR
8446+#ifdef CONFIG_X86_32
8447+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
8448+
8449+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
8450+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
8451+#else
8452+#define PAX_ELF_ET_DYN_BASE 0x400000UL
8453+
8454+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
8455+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
8456+#endif
8457+#endif
8458
8459 /* This yields a mask that user programs can use to figure out what
8460 instruction set this CPU supports. This could be done in user space,
8461@@ -291,9 +309,7 @@ do { \
8462
8463 #define ARCH_DLINFO \
8464 do { \
8465- if (vdso_enabled) \
8466- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
8467- (unsigned long)current->mm->context.vdso); \
8468+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
8469 } while (0)
8470
8471 #define AT_SYSINFO 32
8472@@ -304,7 +320,7 @@ do { \
8473
8474 #endif /* !CONFIG_X86_32 */
8475
8476-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
8477+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
8478
8479 #define VDSO_ENTRY \
8480 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
8481@@ -318,9 +334,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8482 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
8483 #define compat_arch_setup_additional_pages syscall32_setup_pages
8484
8485-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8486-#define arch_randomize_brk arch_randomize_brk
8487-
8488 /*
8489 * True on X86_32 or when emulating IA32 on X86_64
8490 */
8491diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
8492index cc70c1c..d96d011 100644
8493--- a/arch/x86/include/asm/emergency-restart.h
8494+++ b/arch/x86/include/asm/emergency-restart.h
8495@@ -15,6 +15,6 @@ enum reboot_type {
8496
8497 extern enum reboot_type reboot_type;
8498
8499-extern void machine_emergency_restart(void);
8500+extern void machine_emergency_restart(void) __noreturn;
8501
8502 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
8503diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
8504index d09bb03..4ea4194 100644
8505--- a/arch/x86/include/asm/futex.h
8506+++ b/arch/x86/include/asm/futex.h
8507@@ -12,16 +12,18 @@
8508 #include <asm/system.h>
8509
8510 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
8511+ typecheck(u32 __user *, uaddr); \
8512 asm volatile("1:\t" insn "\n" \
8513 "2:\t.section .fixup,\"ax\"\n" \
8514 "3:\tmov\t%3, %1\n" \
8515 "\tjmp\t2b\n" \
8516 "\t.previous\n" \
8517 _ASM_EXTABLE(1b, 3b) \
8518- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
8519+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
8520 : "i" (-EFAULT), "0" (oparg), "1" (0))
8521
8522 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
8523+ typecheck(u32 __user *, uaddr); \
8524 asm volatile("1:\tmovl %2, %0\n" \
8525 "\tmovl\t%0, %3\n" \
8526 "\t" insn "\n" \
8527@@ -34,7 +36,7 @@
8528 _ASM_EXTABLE(1b, 4b) \
8529 _ASM_EXTABLE(2b, 4b) \
8530 : "=&a" (oldval), "=&r" (ret), \
8531- "+m" (*uaddr), "=&r" (tem) \
8532+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
8533 : "r" (oparg), "i" (-EFAULT), "1" (0))
8534
8535 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
8536@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
8537
8538 switch (op) {
8539 case FUTEX_OP_SET:
8540- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
8541+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
8542 break;
8543 case FUTEX_OP_ADD:
8544- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
8545+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
8546 uaddr, oparg);
8547 break;
8548 case FUTEX_OP_OR:
8549@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
8550 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
8551 return -EFAULT;
8552
8553- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
8554+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
8555 "2:\t.section .fixup, \"ax\"\n"
8556 "3:\tmov %3, %0\n"
8557 "\tjmp 2b\n"
8558 "\t.previous\n"
8559 _ASM_EXTABLE(1b, 3b)
8560- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
8561+ : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
8562 : "i" (-EFAULT), "r" (newval), "1" (oldval)
8563 : "memory"
8564 );
8565diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
8566index eb92a6e..b98b2f4 100644
8567--- a/arch/x86/include/asm/hw_irq.h
8568+++ b/arch/x86/include/asm/hw_irq.h
8569@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
8570 extern void enable_IO_APIC(void);
8571
8572 /* Statistics */
8573-extern atomic_t irq_err_count;
8574-extern atomic_t irq_mis_count;
8575+extern atomic_unchecked_t irq_err_count;
8576+extern atomic_unchecked_t irq_mis_count;
8577
8578 /* EISA */
8579 extern void eisa_set_level_irq(unsigned int irq);
8580diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
8581index c9e09ea..73888df 100644
8582--- a/arch/x86/include/asm/i387.h
8583+++ b/arch/x86/include/asm/i387.h
8584@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
8585 {
8586 int err;
8587
8588+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
8589+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
8590+ fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
8591+#endif
8592+
8593 /* See comment in fxsave() below. */
8594 #ifdef CONFIG_AS_FXSAVEQ
8595 asm volatile("1: fxrstorq %[fx]\n\t"
8596@@ -121,6 +126,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
8597 {
8598 int err;
8599
8600+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
8601+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
8602+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
8603+#endif
8604+
8605 /*
8606 * Clear the bytes not touched by the fxsave and reserved
8607 * for the SW usage.
8608@@ -213,13 +223,8 @@ static inline void fpu_fxsave(struct fpu *fpu)
8609 #endif /* CONFIG_X86_64 */
8610
8611 /* We need a safe address that is cheap to find and that is already
8612- in L1 during context switch. The best choices are unfortunately
8613- different for UP and SMP */
8614-#ifdef CONFIG_SMP
8615-#define safe_address (__per_cpu_offset[0])
8616-#else
8617-#define safe_address (kstat_cpu(0).cpustat.user)
8618-#endif
8619+ in L1 during context switch. */
8620+#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
8621
8622 /*
8623 * These must be called with preempt disabled
8624@@ -312,7 +317,7 @@ static inline void kernel_fpu_begin(void)
8625 struct thread_info *me = current_thread_info();
8626 preempt_disable();
8627 if (me->status & TS_USEDFPU)
8628- __save_init_fpu(me->task);
8629+ __save_init_fpu(current);
8630 else
8631 clts();
8632 }
8633diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
8634index d8e8eef..99f81ae 100644
8635--- a/arch/x86/include/asm/io.h
8636+++ b/arch/x86/include/asm/io.h
8637@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
8638
8639 #include <linux/vmalloc.h>
8640
8641+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
8642+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
8643+{
8644+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
8645+}
8646+
8647+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
8648+{
8649+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
8650+}
8651+
8652 /*
8653 * Convert a virtual cached pointer to an uncached pointer
8654 */
8655diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
8656index bba3cf8..06bc8da 100644
8657--- a/arch/x86/include/asm/irqflags.h
8658+++ b/arch/x86/include/asm/irqflags.h
8659@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
8660 sti; \
8661 sysexit
8662
8663+#define GET_CR0_INTO_RDI mov %cr0, %rdi
8664+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
8665+#define GET_CR3_INTO_RDI mov %cr3, %rdi
8666+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
8667+
8668 #else
8669 #define INTERRUPT_RETURN iret
8670 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
8671diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
8672index 5478825..839e88c 100644
8673--- a/arch/x86/include/asm/kprobes.h
8674+++ b/arch/x86/include/asm/kprobes.h
8675@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
8676 #define RELATIVEJUMP_SIZE 5
8677 #define RELATIVECALL_OPCODE 0xe8
8678 #define RELATIVE_ADDR_SIZE 4
8679-#define MAX_STACK_SIZE 64
8680-#define MIN_STACK_SIZE(ADDR) \
8681- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
8682- THREAD_SIZE - (unsigned long)(ADDR))) \
8683- ? (MAX_STACK_SIZE) \
8684- : (((unsigned long)current_thread_info()) + \
8685- THREAD_SIZE - (unsigned long)(ADDR)))
8686+#define MAX_STACK_SIZE 64UL
8687+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
8688
8689 #define flush_insn_slot(p) do { } while (0)
8690
8691diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
8692index b4973f4..7c4d3fc 100644
8693--- a/arch/x86/include/asm/kvm_host.h
8694+++ b/arch/x86/include/asm/kvm_host.h
8695@@ -459,7 +459,7 @@ struct kvm_arch {
8696 unsigned int n_requested_mmu_pages;
8697 unsigned int n_max_mmu_pages;
8698 unsigned int indirect_shadow_pages;
8699- atomic_t invlpg_counter;
8700+ atomic_unchecked_t invlpg_counter;
8701 struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
8702 /*
8703 * Hash table of struct kvm_mmu_page.
8704@@ -638,7 +638,7 @@ struct kvm_x86_ops {
8705 int (*check_intercept)(struct kvm_vcpu *vcpu,
8706 struct x86_instruction_info *info,
8707 enum x86_intercept_stage stage);
8708-};
8709+} __do_const;
8710
8711 struct kvm_arch_async_pf {
8712 u32 token;
8713diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
8714index 9cdae5d..300d20f 100644
8715--- a/arch/x86/include/asm/local.h
8716+++ b/arch/x86/include/asm/local.h
8717@@ -18,26 +18,58 @@ typedef struct {
8718
8719 static inline void local_inc(local_t *l)
8720 {
8721- asm volatile(_ASM_INC "%0"
8722+ asm volatile(_ASM_INC "%0\n"
8723+
8724+#ifdef CONFIG_PAX_REFCOUNT
8725+ "jno 0f\n"
8726+ _ASM_DEC "%0\n"
8727+ "int $4\n0:\n"
8728+ _ASM_EXTABLE(0b, 0b)
8729+#endif
8730+
8731 : "+m" (l->a.counter));
8732 }
8733
8734 static inline void local_dec(local_t *l)
8735 {
8736- asm volatile(_ASM_DEC "%0"
8737+ asm volatile(_ASM_DEC "%0\n"
8738+
8739+#ifdef CONFIG_PAX_REFCOUNT
8740+ "jno 0f\n"
8741+ _ASM_INC "%0\n"
8742+ "int $4\n0:\n"
8743+ _ASM_EXTABLE(0b, 0b)
8744+#endif
8745+
8746 : "+m" (l->a.counter));
8747 }
8748
8749 static inline void local_add(long i, local_t *l)
8750 {
8751- asm volatile(_ASM_ADD "%1,%0"
8752+ asm volatile(_ASM_ADD "%1,%0\n"
8753+
8754+#ifdef CONFIG_PAX_REFCOUNT
8755+ "jno 0f\n"
8756+ _ASM_SUB "%1,%0\n"
8757+ "int $4\n0:\n"
8758+ _ASM_EXTABLE(0b, 0b)
8759+#endif
8760+
8761 : "+m" (l->a.counter)
8762 : "ir" (i));
8763 }
8764
8765 static inline void local_sub(long i, local_t *l)
8766 {
8767- asm volatile(_ASM_SUB "%1,%0"
8768+ asm volatile(_ASM_SUB "%1,%0\n"
8769+
8770+#ifdef CONFIG_PAX_REFCOUNT
8771+ "jno 0f\n"
8772+ _ASM_ADD "%1,%0\n"
8773+ "int $4\n0:\n"
8774+ _ASM_EXTABLE(0b, 0b)
8775+#endif
8776+
8777 : "+m" (l->a.counter)
8778 : "ir" (i));
8779 }
8780@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
8781 {
8782 unsigned char c;
8783
8784- asm volatile(_ASM_SUB "%2,%0; sete %1"
8785+ asm volatile(_ASM_SUB "%2,%0\n"
8786+
8787+#ifdef CONFIG_PAX_REFCOUNT
8788+ "jno 0f\n"
8789+ _ASM_ADD "%2,%0\n"
8790+ "int $4\n0:\n"
8791+ _ASM_EXTABLE(0b, 0b)
8792+#endif
8793+
8794+ "sete %1\n"
8795 : "+m" (l->a.counter), "=qm" (c)
8796 : "ir" (i) : "memory");
8797 return c;
8798@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
8799 {
8800 unsigned char c;
8801
8802- asm volatile(_ASM_DEC "%0; sete %1"
8803+ asm volatile(_ASM_DEC "%0\n"
8804+
8805+#ifdef CONFIG_PAX_REFCOUNT
8806+ "jno 0f\n"
8807+ _ASM_INC "%0\n"
8808+ "int $4\n0:\n"
8809+ _ASM_EXTABLE(0b, 0b)
8810+#endif
8811+
8812+ "sete %1\n"
8813 : "+m" (l->a.counter), "=qm" (c)
8814 : : "memory");
8815 return c != 0;
8816@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
8817 {
8818 unsigned char c;
8819
8820- asm volatile(_ASM_INC "%0; sete %1"
8821+ asm volatile(_ASM_INC "%0\n"
8822+
8823+#ifdef CONFIG_PAX_REFCOUNT
8824+ "jno 0f\n"
8825+ _ASM_DEC "%0\n"
8826+ "int $4\n0:\n"
8827+ _ASM_EXTABLE(0b, 0b)
8828+#endif
8829+
8830+ "sete %1\n"
8831 : "+m" (l->a.counter), "=qm" (c)
8832 : : "memory");
8833 return c != 0;
8834@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
8835 {
8836 unsigned char c;
8837
8838- asm volatile(_ASM_ADD "%2,%0; sets %1"
8839+ asm volatile(_ASM_ADD "%2,%0\n"
8840+
8841+#ifdef CONFIG_PAX_REFCOUNT
8842+ "jno 0f\n"
8843+ _ASM_SUB "%2,%0\n"
8844+ "int $4\n0:\n"
8845+ _ASM_EXTABLE(0b, 0b)
8846+#endif
8847+
8848+ "sets %1\n"
8849 : "+m" (l->a.counter), "=qm" (c)
8850 : "ir" (i) : "memory");
8851 return c;
8852@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
8853 #endif
8854 /* Modern 486+ processor */
8855 __i = i;
8856- asm volatile(_ASM_XADD "%0, %1;"
8857+ asm volatile(_ASM_XADD "%0, %1\n"
8858+
8859+#ifdef CONFIG_PAX_REFCOUNT
8860+ "jno 0f\n"
8861+ _ASM_MOV "%0,%1\n"
8862+ "int $4\n0:\n"
8863+ _ASM_EXTABLE(0b, 0b)
8864+#endif
8865+
8866 : "+r" (i), "+m" (l->a.counter)
8867 : : "memory");
8868 return i + __i;
8869diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
8870index 593e51d..fa69c9a 100644
8871--- a/arch/x86/include/asm/mman.h
8872+++ b/arch/x86/include/asm/mman.h
8873@@ -5,4 +5,14 @@
8874
8875 #include <asm-generic/mman.h>
8876
8877+#ifdef __KERNEL__
8878+#ifndef __ASSEMBLY__
8879+#ifdef CONFIG_X86_32
8880+#define arch_mmap_check i386_mmap_check
8881+int i386_mmap_check(unsigned long addr, unsigned long len,
8882+ unsigned long flags);
8883+#endif
8884+#endif
8885+#endif
8886+
8887 #endif /* _ASM_X86_MMAN_H */
8888diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
8889index 5f55e69..e20bfb1 100644
8890--- a/arch/x86/include/asm/mmu.h
8891+++ b/arch/x86/include/asm/mmu.h
8892@@ -9,7 +9,7 @@
8893 * we put the segment information here.
8894 */
8895 typedef struct {
8896- void *ldt;
8897+ struct desc_struct *ldt;
8898 int size;
8899
8900 #ifdef CONFIG_X86_64
8901@@ -18,7 +18,19 @@ typedef struct {
8902 #endif
8903
8904 struct mutex lock;
8905- void *vdso;
8906+ unsigned long vdso;
8907+
8908+#ifdef CONFIG_X86_32
8909+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
8910+ unsigned long user_cs_base;
8911+ unsigned long user_cs_limit;
8912+
8913+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
8914+ cpumask_t cpu_user_cs_mask;
8915+#endif
8916+
8917+#endif
8918+#endif
8919 } mm_context_t;
8920
8921 #ifdef CONFIG_SMP
8922diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
8923index 6902152..399f3a2 100644
8924--- a/arch/x86/include/asm/mmu_context.h
8925+++ b/arch/x86/include/asm/mmu_context.h
8926@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
8927
8928 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
8929 {
8930+
8931+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
8932+ unsigned int i;
8933+ pgd_t *pgd;
8934+
8935+ pax_open_kernel();
8936+ pgd = get_cpu_pgd(smp_processor_id());
8937+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
8938+ set_pgd_batched(pgd+i, native_make_pgd(0));
8939+ pax_close_kernel();
8940+#endif
8941+
8942 #ifdef CONFIG_SMP
8943 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
8944 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
8945@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
8946 struct task_struct *tsk)
8947 {
8948 unsigned cpu = smp_processor_id();
8949+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
8950+ int tlbstate = TLBSTATE_OK;
8951+#endif
8952
8953 if (likely(prev != next)) {
8954 #ifdef CONFIG_SMP
8955+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
8956+ tlbstate = percpu_read(cpu_tlbstate.state);
8957+#endif
8958 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
8959 percpu_write(cpu_tlbstate.active_mm, next);
8960 #endif
8961 cpumask_set_cpu(cpu, mm_cpumask(next));
8962
8963 /* Re-load page tables */
8964+#ifdef CONFIG_PAX_PER_CPU_PGD
8965+ pax_open_kernel();
8966+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
8967+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
8968+ pax_close_kernel();
8969+ load_cr3(get_cpu_pgd(cpu));
8970+#else
8971 load_cr3(next->pgd);
8972+#endif
8973
8974 /* stop flush ipis for the previous mm */
8975 cpumask_clear_cpu(cpu, mm_cpumask(prev));
8976@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
8977 */
8978 if (unlikely(prev->context.ldt != next->context.ldt))
8979 load_LDT_nolock(&next->context);
8980- }
8981+
8982+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
8983+ if (!(__supported_pte_mask & _PAGE_NX)) {
8984+ smp_mb__before_clear_bit();
8985+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
8986+ smp_mb__after_clear_bit();
8987+ cpu_set(cpu, next->context.cpu_user_cs_mask);
8988+ }
8989+#endif
8990+
8991+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
8992+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
8993+ prev->context.user_cs_limit != next->context.user_cs_limit))
8994+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
8995 #ifdef CONFIG_SMP
8996+ else if (unlikely(tlbstate != TLBSTATE_OK))
8997+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
8998+#endif
8999+#endif
9000+
9001+ }
9002 else {
9003+
9004+#ifdef CONFIG_PAX_PER_CPU_PGD
9005+ pax_open_kernel();
9006+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
9007+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
9008+ pax_close_kernel();
9009+ load_cr3(get_cpu_pgd(cpu));
9010+#endif
9011+
9012+#ifdef CONFIG_SMP
9013 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
9014 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
9015
9016@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
9017 * tlb flush IPI delivery. We must reload CR3
9018 * to make sure to use no freed page tables.
9019 */
9020+
9021+#ifndef CONFIG_PAX_PER_CPU_PGD
9022 load_cr3(next->pgd);
9023+#endif
9024+
9025 load_LDT_nolock(&next->context);
9026+
9027+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
9028+ if (!(__supported_pte_mask & _PAGE_NX))
9029+ cpu_set(cpu, next->context.cpu_user_cs_mask);
9030+#endif
9031+
9032+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
9033+#ifdef CONFIG_PAX_PAGEEXEC
9034+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
9035+#endif
9036+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
9037+#endif
9038+
9039 }
9040+#endif
9041 }
9042-#endif
9043 }
9044
9045 #define activate_mm(prev, next) \
9046diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
9047index 9eae775..c914fea 100644
9048--- a/arch/x86/include/asm/module.h
9049+++ b/arch/x86/include/asm/module.h
9050@@ -5,6 +5,7 @@
9051
9052 #ifdef CONFIG_X86_64
9053 /* X86_64 does not define MODULE_PROC_FAMILY */
9054+#define MODULE_PROC_FAMILY ""
9055 #elif defined CONFIG_M386
9056 #define MODULE_PROC_FAMILY "386 "
9057 #elif defined CONFIG_M486
9058@@ -59,8 +60,20 @@
9059 #error unknown processor family
9060 #endif
9061
9062-#ifdef CONFIG_X86_32
9063-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
9064+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
9065+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
9066+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
9067+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
9068+#else
9069+#define MODULE_PAX_KERNEXEC ""
9070 #endif
9071
9072+#ifdef CONFIG_PAX_MEMORY_UDEREF
9073+#define MODULE_PAX_UDEREF "UDEREF "
9074+#else
9075+#define MODULE_PAX_UDEREF ""
9076+#endif
9077+
9078+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
9079+
9080 #endif /* _ASM_X86_MODULE_H */
9081diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
9082index 7639dbf..e08a58c 100644
9083--- a/arch/x86/include/asm/page_64_types.h
9084+++ b/arch/x86/include/asm/page_64_types.h
9085@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
9086
9087 /* duplicated to the one in bootmem.h */
9088 extern unsigned long max_pfn;
9089-extern unsigned long phys_base;
9090+extern const unsigned long phys_base;
9091
9092 extern unsigned long __phys_addr(unsigned long);
9093 #define __phys_reloc_hide(x) (x)
9094diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
9095index a7d2db9..edb023e 100644
9096--- a/arch/x86/include/asm/paravirt.h
9097+++ b/arch/x86/include/asm/paravirt.h
9098@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
9099 val);
9100 }
9101
9102+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
9103+{
9104+ pgdval_t val = native_pgd_val(pgd);
9105+
9106+ if (sizeof(pgdval_t) > sizeof(long))
9107+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
9108+ val, (u64)val >> 32);
9109+ else
9110+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
9111+ val);
9112+}
9113+
9114 static inline void pgd_clear(pgd_t *pgdp)
9115 {
9116 set_pgd(pgdp, __pgd(0));
9117@@ -748,6 +760,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
9118 pv_mmu_ops.set_fixmap(idx, phys, flags);
9119 }
9120
9121+#ifdef CONFIG_PAX_KERNEXEC
9122+static inline unsigned long pax_open_kernel(void)
9123+{
9124+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
9125+}
9126+
9127+static inline unsigned long pax_close_kernel(void)
9128+{
9129+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
9130+}
9131+#else
9132+static inline unsigned long pax_open_kernel(void) { return 0; }
9133+static inline unsigned long pax_close_kernel(void) { return 0; }
9134+#endif
9135+
9136 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
9137
9138 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
9139@@ -964,7 +991,7 @@ extern void default_banner(void);
9140
9141 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
9142 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
9143-#define PARA_INDIRECT(addr) *%cs:addr
9144+#define PARA_INDIRECT(addr) *%ss:addr
9145 #endif
9146
9147 #define INTERRUPT_RETURN \
9148@@ -1041,6 +1068,21 @@ extern void default_banner(void);
9149 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
9150 CLBR_NONE, \
9151 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
9152+
9153+#define GET_CR0_INTO_RDI \
9154+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
9155+ mov %rax,%rdi
9156+
9157+#define SET_RDI_INTO_CR0 \
9158+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
9159+
9160+#define GET_CR3_INTO_RDI \
9161+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
9162+ mov %rax,%rdi
9163+
9164+#define SET_RDI_INTO_CR3 \
9165+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
9166+
9167 #endif /* CONFIG_X86_32 */
9168
9169 #endif /* __ASSEMBLY__ */
9170diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
9171index 8e8b9a4..f07d725 100644
9172--- a/arch/x86/include/asm/paravirt_types.h
9173+++ b/arch/x86/include/asm/paravirt_types.h
9174@@ -84,20 +84,20 @@ struct pv_init_ops {
9175 */
9176 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
9177 unsigned long addr, unsigned len);
9178-};
9179+} __no_const;
9180
9181
9182 struct pv_lazy_ops {
9183 /* Set deferred update mode, used for batching operations. */
9184 void (*enter)(void);
9185 void (*leave)(void);
9186-};
9187+} __no_const;
9188
9189 struct pv_time_ops {
9190 unsigned long long (*sched_clock)(void);
9191 unsigned long long (*steal_clock)(int cpu);
9192 unsigned long (*get_tsc_khz)(void);
9193-};
9194+} __no_const;
9195
9196 struct pv_cpu_ops {
9197 /* hooks for various privileged instructions */
9198@@ -193,7 +193,7 @@ struct pv_cpu_ops {
9199
9200 void (*start_context_switch)(struct task_struct *prev);
9201 void (*end_context_switch)(struct task_struct *next);
9202-};
9203+} __no_const;
9204
9205 struct pv_irq_ops {
9206 /*
9207@@ -224,7 +224,7 @@ struct pv_apic_ops {
9208 unsigned long start_eip,
9209 unsigned long start_esp);
9210 #endif
9211-};
9212+} __no_const;
9213
9214 struct pv_mmu_ops {
9215 unsigned long (*read_cr2)(void);
9216@@ -313,6 +313,7 @@ struct pv_mmu_ops {
9217 struct paravirt_callee_save make_pud;
9218
9219 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
9220+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
9221 #endif /* PAGETABLE_LEVELS == 4 */
9222 #endif /* PAGETABLE_LEVELS >= 3 */
9223
9224@@ -324,6 +325,12 @@ struct pv_mmu_ops {
9225 an mfn. We can tell which is which from the index. */
9226 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
9227 phys_addr_t phys, pgprot_t flags);
9228+
9229+#ifdef CONFIG_PAX_KERNEXEC
9230+ unsigned long (*pax_open_kernel)(void);
9231+ unsigned long (*pax_close_kernel)(void);
9232+#endif
9233+
9234 };
9235
9236 struct arch_spinlock;
9237@@ -334,7 +341,7 @@ struct pv_lock_ops {
9238 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
9239 int (*spin_trylock)(struct arch_spinlock *lock);
9240 void (*spin_unlock)(struct arch_spinlock *lock);
9241-};
9242+} __no_const;
9243
9244 /* This contains all the paravirt structures: we get a convenient
9245 * number for each function using the offset which we use to indicate
9246diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
9247index b4389a4..b7ff22c 100644
9248--- a/arch/x86/include/asm/pgalloc.h
9249+++ b/arch/x86/include/asm/pgalloc.h
9250@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
9251 pmd_t *pmd, pte_t *pte)
9252 {
9253 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
9254+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
9255+}
9256+
9257+static inline void pmd_populate_user(struct mm_struct *mm,
9258+ pmd_t *pmd, pte_t *pte)
9259+{
9260+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
9261 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
9262 }
9263
9264diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
9265index 98391db..8f6984e 100644
9266--- a/arch/x86/include/asm/pgtable-2level.h
9267+++ b/arch/x86/include/asm/pgtable-2level.h
9268@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
9269
9270 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
9271 {
9272+ pax_open_kernel();
9273 *pmdp = pmd;
9274+ pax_close_kernel();
9275 }
9276
9277 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
9278diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
9279index effff47..f9e4035 100644
9280--- a/arch/x86/include/asm/pgtable-3level.h
9281+++ b/arch/x86/include/asm/pgtable-3level.h
9282@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
9283
9284 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
9285 {
9286+ pax_open_kernel();
9287 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
9288+ pax_close_kernel();
9289 }
9290
9291 static inline void native_set_pud(pud_t *pudp, pud_t pud)
9292 {
9293+ pax_open_kernel();
9294 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
9295+ pax_close_kernel();
9296 }
9297
9298 /*
9299diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
9300index 18601c8..3d716d1 100644
9301--- a/arch/x86/include/asm/pgtable.h
9302+++ b/arch/x86/include/asm/pgtable.h
9303@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
9304
9305 #ifndef __PAGETABLE_PUD_FOLDED
9306 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
9307+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
9308 #define pgd_clear(pgd) native_pgd_clear(pgd)
9309 #endif
9310
9311@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
9312
9313 #define arch_end_context_switch(prev) do {} while(0)
9314
9315+#define pax_open_kernel() native_pax_open_kernel()
9316+#define pax_close_kernel() native_pax_close_kernel()
9317 #endif /* CONFIG_PARAVIRT */
9318
9319+#define __HAVE_ARCH_PAX_OPEN_KERNEL
9320+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
9321+
9322+#ifdef CONFIG_PAX_KERNEXEC
9323+static inline unsigned long native_pax_open_kernel(void)
9324+{
9325+ unsigned long cr0;
9326+
9327+ preempt_disable();
9328+ barrier();
9329+ cr0 = read_cr0() ^ X86_CR0_WP;
9330+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
9331+ write_cr0(cr0);
9332+ return cr0 ^ X86_CR0_WP;
9333+}
9334+
9335+static inline unsigned long native_pax_close_kernel(void)
9336+{
9337+ unsigned long cr0;
9338+
9339+ cr0 = read_cr0() ^ X86_CR0_WP;
9340+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
9341+ write_cr0(cr0);
9342+ barrier();
9343+ preempt_enable_no_resched();
9344+ return cr0 ^ X86_CR0_WP;
9345+}
9346+#else
9347+static inline unsigned long native_pax_open_kernel(void) { return 0; }
9348+static inline unsigned long native_pax_close_kernel(void) { return 0; }
9349+#endif
9350+
9351 /*
9352 * The following only work if pte_present() is true.
9353 * Undefined behaviour if not..
9354 */
9355+static inline int pte_user(pte_t pte)
9356+{
9357+ return pte_val(pte) & _PAGE_USER;
9358+}
9359+
9360 static inline int pte_dirty(pte_t pte)
9361 {
9362 return pte_flags(pte) & _PAGE_DIRTY;
9363@@ -196,9 +236,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
9364 return pte_clear_flags(pte, _PAGE_RW);
9365 }
9366
9367+static inline pte_t pte_mkread(pte_t pte)
9368+{
9369+ return __pte(pte_val(pte) | _PAGE_USER);
9370+}
9371+
9372 static inline pte_t pte_mkexec(pte_t pte)
9373 {
9374- return pte_clear_flags(pte, _PAGE_NX);
9375+#ifdef CONFIG_X86_PAE
9376+ if (__supported_pte_mask & _PAGE_NX)
9377+ return pte_clear_flags(pte, _PAGE_NX);
9378+ else
9379+#endif
9380+ return pte_set_flags(pte, _PAGE_USER);
9381+}
9382+
9383+static inline pte_t pte_exprotect(pte_t pte)
9384+{
9385+#ifdef CONFIG_X86_PAE
9386+ if (__supported_pte_mask & _PAGE_NX)
9387+ return pte_set_flags(pte, _PAGE_NX);
9388+ else
9389+#endif
9390+ return pte_clear_flags(pte, _PAGE_USER);
9391 }
9392
9393 static inline pte_t pte_mkdirty(pte_t pte)
9394@@ -390,6 +450,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
9395 #endif
9396
9397 #ifndef __ASSEMBLY__
9398+
9399+#ifdef CONFIG_PAX_PER_CPU_PGD
9400+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
9401+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
9402+{
9403+ return cpu_pgd[cpu];
9404+}
9405+#endif
9406+
9407 #include <linux/mm_types.h>
9408
9409 static inline int pte_none(pte_t pte)
9410@@ -560,7 +629,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
9411
9412 static inline int pgd_bad(pgd_t pgd)
9413 {
9414- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
9415+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
9416 }
9417
9418 static inline int pgd_none(pgd_t pgd)
9419@@ -583,7 +652,12 @@ static inline int pgd_none(pgd_t pgd)
9420 * pgd_offset() returns a (pgd_t *)
9421 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
9422 */
9423-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
9424+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
9425+
9426+#ifdef CONFIG_PAX_PER_CPU_PGD
9427+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
9428+#endif
9429+
9430 /*
9431 * a shortcut which implies the use of the kernel's pgd, instead
9432 * of a process's
9433@@ -594,6 +668,20 @@ static inline int pgd_none(pgd_t pgd)
9434 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
9435 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
9436
9437+#ifdef CONFIG_X86_32
9438+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
9439+#else
9440+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
9441+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
9442+
9443+#ifdef CONFIG_PAX_MEMORY_UDEREF
9444+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
9445+#else
9446+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
9447+#endif
9448+
9449+#endif
9450+
9451 #ifndef __ASSEMBLY__
9452
9453 extern int direct_gbpages;
9454@@ -758,11 +846,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
9455 * dst and src can be on the same page, but the range must not overlap,
9456 * and must not cross a page boundary.
9457 */
9458-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
9459+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
9460 {
9461- memcpy(dst, src, count * sizeof(pgd_t));
9462+ pax_open_kernel();
9463+ while (count--)
9464+ *dst++ = *src++;
9465+ pax_close_kernel();
9466 }
9467
9468+#ifdef CONFIG_PAX_PER_CPU_PGD
9469+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
9470+#endif
9471+
9472+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
9473+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
9474+#else
9475+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
9476+#endif
9477
9478 #include <asm-generic/pgtable.h>
9479 #endif /* __ASSEMBLY__ */
9480diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
9481index 0c92113..34a77c6 100644
9482--- a/arch/x86/include/asm/pgtable_32.h
9483+++ b/arch/x86/include/asm/pgtable_32.h
9484@@ -25,9 +25,6 @@
9485 struct mm_struct;
9486 struct vm_area_struct;
9487
9488-extern pgd_t swapper_pg_dir[1024];
9489-extern pgd_t initial_page_table[1024];
9490-
9491 static inline void pgtable_cache_init(void) { }
9492 static inline void check_pgt_cache(void) { }
9493 void paging_init(void);
9494@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
9495 # include <asm/pgtable-2level.h>
9496 #endif
9497
9498+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
9499+extern pgd_t initial_page_table[PTRS_PER_PGD];
9500+#ifdef CONFIG_X86_PAE
9501+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
9502+#endif
9503+
9504 #if defined(CONFIG_HIGHPTE)
9505 #define pte_offset_map(dir, address) \
9506 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
9507@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
9508 /* Clear a kernel PTE and flush it from the TLB */
9509 #define kpte_clear_flush(ptep, vaddr) \
9510 do { \
9511+ pax_open_kernel(); \
9512 pte_clear(&init_mm, (vaddr), (ptep)); \
9513+ pax_close_kernel(); \
9514 __flush_tlb_one((vaddr)); \
9515 } while (0)
9516
9517@@ -74,6 +79,9 @@ do { \
9518
9519 #endif /* !__ASSEMBLY__ */
9520
9521+#define HAVE_ARCH_UNMAPPED_AREA
9522+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
9523+
9524 /*
9525 * kern_addr_valid() is (1) for FLATMEM and (0) for
9526 * SPARSEMEM and DISCONTIGMEM
9527diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
9528index ed5903b..c7fe163 100644
9529--- a/arch/x86/include/asm/pgtable_32_types.h
9530+++ b/arch/x86/include/asm/pgtable_32_types.h
9531@@ -8,7 +8,7 @@
9532 */
9533 #ifdef CONFIG_X86_PAE
9534 # include <asm/pgtable-3level_types.h>
9535-# define PMD_SIZE (1UL << PMD_SHIFT)
9536+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
9537 # define PMD_MASK (~(PMD_SIZE - 1))
9538 #else
9539 # include <asm/pgtable-2level_types.h>
9540@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
9541 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
9542 #endif
9543
9544+#ifdef CONFIG_PAX_KERNEXEC
9545+#ifndef __ASSEMBLY__
9546+extern unsigned char MODULES_EXEC_VADDR[];
9547+extern unsigned char MODULES_EXEC_END[];
9548+#endif
9549+#include <asm/boot.h>
9550+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
9551+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
9552+#else
9553+#define ktla_ktva(addr) (addr)
9554+#define ktva_ktla(addr) (addr)
9555+#endif
9556+
9557 #define MODULES_VADDR VMALLOC_START
9558 #define MODULES_END VMALLOC_END
9559 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
9560diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
9561index 975f709..107976d 100644
9562--- a/arch/x86/include/asm/pgtable_64.h
9563+++ b/arch/x86/include/asm/pgtable_64.h
9564@@ -16,10 +16,14 @@
9565
9566 extern pud_t level3_kernel_pgt[512];
9567 extern pud_t level3_ident_pgt[512];
9568+extern pud_t level3_vmalloc_start_pgt[512];
9569+extern pud_t level3_vmalloc_end_pgt[512];
9570+extern pud_t level3_vmemmap_pgt[512];
9571+extern pud_t level2_vmemmap_pgt[512];
9572 extern pmd_t level2_kernel_pgt[512];
9573 extern pmd_t level2_fixmap_pgt[512];
9574-extern pmd_t level2_ident_pgt[512];
9575-extern pgd_t init_level4_pgt[];
9576+extern pmd_t level2_ident_pgt[512*2];
9577+extern pgd_t init_level4_pgt[512];
9578
9579 #define swapper_pg_dir init_level4_pgt
9580
9581@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
9582
9583 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
9584 {
9585+ pax_open_kernel();
9586 *pmdp = pmd;
9587+ pax_close_kernel();
9588 }
9589
9590 static inline void native_pmd_clear(pmd_t *pmd)
9591@@ -107,6 +113,13 @@ static inline void native_pud_clear(pud_t *pud)
9592
9593 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
9594 {
9595+ pax_open_kernel();
9596+ *pgdp = pgd;
9597+ pax_close_kernel();
9598+}
9599+
9600+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
9601+{
9602 *pgdp = pgd;
9603 }
9604
9605diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
9606index 766ea16..5b96cb3 100644
9607--- a/arch/x86/include/asm/pgtable_64_types.h
9608+++ b/arch/x86/include/asm/pgtable_64_types.h
9609@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
9610 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
9611 #define MODULES_END _AC(0xffffffffff000000, UL)
9612 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
9613+#define MODULES_EXEC_VADDR MODULES_VADDR
9614+#define MODULES_EXEC_END MODULES_END
9615+
9616+#define ktla_ktva(addr) (addr)
9617+#define ktva_ktla(addr) (addr)
9618
9619 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
9620diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
9621index 013286a..8b42f4f 100644
9622--- a/arch/x86/include/asm/pgtable_types.h
9623+++ b/arch/x86/include/asm/pgtable_types.h
9624@@ -16,13 +16,12 @@
9625 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
9626 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
9627 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
9628-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
9629+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
9630 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
9631 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
9632 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
9633-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
9634-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
9635-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
9636+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
9637+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
9638 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
9639
9640 /* If _PAGE_BIT_PRESENT is clear, we use these: */
9641@@ -40,7 +39,6 @@
9642 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
9643 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
9644 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
9645-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
9646 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
9647 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
9648 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
9649@@ -57,8 +55,10 @@
9650
9651 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
9652 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
9653-#else
9654+#elif defined(CONFIG_KMEMCHECK)
9655 #define _PAGE_NX (_AT(pteval_t, 0))
9656+#else
9657+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
9658 #endif
9659
9660 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
9661@@ -96,6 +96,9 @@
9662 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
9663 _PAGE_ACCESSED)
9664
9665+#define PAGE_READONLY_NOEXEC PAGE_READONLY
9666+#define PAGE_SHARED_NOEXEC PAGE_SHARED
9667+
9668 #define __PAGE_KERNEL_EXEC \
9669 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
9670 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
9671@@ -106,7 +109,7 @@
9672 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
9673 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
9674 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
9675-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
9676+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
9677 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
9678 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
9679 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
9680@@ -168,8 +171,8 @@
9681 * bits are combined, this will alow user to access the high address mapped
9682 * VDSO in the presence of CONFIG_COMPAT_VDSO
9683 */
9684-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
9685-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
9686+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
9687+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
9688 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
9689 #endif
9690
9691@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
9692 {
9693 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
9694 }
9695+#endif
9696
9697+#if PAGETABLE_LEVELS == 3
9698+#include <asm-generic/pgtable-nopud.h>
9699+#endif
9700+
9701+#if PAGETABLE_LEVELS == 2
9702+#include <asm-generic/pgtable-nopmd.h>
9703+#endif
9704+
9705+#ifndef __ASSEMBLY__
9706 #if PAGETABLE_LEVELS > 3
9707 typedef struct { pudval_t pud; } pud_t;
9708
9709@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
9710 return pud.pud;
9711 }
9712 #else
9713-#include <asm-generic/pgtable-nopud.h>
9714-
9715 static inline pudval_t native_pud_val(pud_t pud)
9716 {
9717 return native_pgd_val(pud.pgd);
9718@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
9719 return pmd.pmd;
9720 }
9721 #else
9722-#include <asm-generic/pgtable-nopmd.h>
9723-
9724 static inline pmdval_t native_pmd_val(pmd_t pmd)
9725 {
9726 return native_pgd_val(pmd.pud.pgd);
9727@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
9728
9729 extern pteval_t __supported_pte_mask;
9730 extern void set_nx(void);
9731-extern int nx_enabled;
9732
9733 #define pgprot_writecombine pgprot_writecombine
9734 extern pgprot_t pgprot_writecombine(pgprot_t prot);
9735diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
9736index b650435..eefa566 100644
9737--- a/arch/x86/include/asm/processor.h
9738+++ b/arch/x86/include/asm/processor.h
9739@@ -268,7 +268,7 @@ struct tss_struct {
9740
9741 } ____cacheline_aligned;
9742
9743-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
9744+extern struct tss_struct init_tss[NR_CPUS];
9745
9746 /*
9747 * Save the original ist values for checking stack pointers during debugging
9748@@ -860,11 +860,18 @@ static inline void spin_lock_prefetch(const void *x)
9749 */
9750 #define TASK_SIZE PAGE_OFFSET
9751 #define TASK_SIZE_MAX TASK_SIZE
9752+
9753+#ifdef CONFIG_PAX_SEGMEXEC
9754+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
9755+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
9756+#else
9757 #define STACK_TOP TASK_SIZE
9758-#define STACK_TOP_MAX STACK_TOP
9759+#endif
9760+
9761+#define STACK_TOP_MAX TASK_SIZE
9762
9763 #define INIT_THREAD { \
9764- .sp0 = sizeof(init_stack) + (long)&init_stack, \
9765+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
9766 .vm86_info = NULL, \
9767 .sysenter_cs = __KERNEL_CS, \
9768 .io_bitmap_ptr = NULL, \
9769@@ -878,7 +885,7 @@ static inline void spin_lock_prefetch(const void *x)
9770 */
9771 #define INIT_TSS { \
9772 .x86_tss = { \
9773- .sp0 = sizeof(init_stack) + (long)&init_stack, \
9774+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
9775 .ss0 = __KERNEL_DS, \
9776 .ss1 = __KERNEL_CS, \
9777 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
9778@@ -889,11 +896,7 @@ static inline void spin_lock_prefetch(const void *x)
9779 extern unsigned long thread_saved_pc(struct task_struct *tsk);
9780
9781 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
9782-#define KSTK_TOP(info) \
9783-({ \
9784- unsigned long *__ptr = (unsigned long *)(info); \
9785- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
9786-})
9787+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
9788
9789 /*
9790 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
9791@@ -908,7 +911,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
9792 #define task_pt_regs(task) \
9793 ({ \
9794 struct pt_regs *__regs__; \
9795- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
9796+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
9797 __regs__ - 1; \
9798 })
9799
9800@@ -918,13 +921,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
9801 /*
9802 * User space process size. 47bits minus one guard page.
9803 */
9804-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
9805+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
9806
9807 /* This decides where the kernel will search for a free chunk of vm
9808 * space during mmap's.
9809 */
9810 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
9811- 0xc0000000 : 0xFFFFe000)
9812+ 0xc0000000 : 0xFFFFf000)
9813
9814 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
9815 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
9816@@ -935,11 +938,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
9817 #define STACK_TOP_MAX TASK_SIZE_MAX
9818
9819 #define INIT_THREAD { \
9820- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
9821+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
9822 }
9823
9824 #define INIT_TSS { \
9825- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
9826+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
9827 }
9828
9829 /*
9830@@ -961,6 +964,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
9831 */
9832 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
9833
9834+#ifdef CONFIG_PAX_SEGMEXEC
9835+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
9836+#endif
9837+
9838 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
9839
9840 /* Get/set a process' ability to use the timestamp counter instruction */
9841diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
9842index 3566454..4bdfb8c 100644
9843--- a/arch/x86/include/asm/ptrace.h
9844+++ b/arch/x86/include/asm/ptrace.h
9845@@ -156,28 +156,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
9846 }
9847
9848 /*
9849- * user_mode_vm(regs) determines whether a register set came from user mode.
9850+ * user_mode(regs) determines whether a register set came from user mode.
9851 * This is true if V8086 mode was enabled OR if the register set was from
9852 * protected mode with RPL-3 CS value. This tricky test checks that with
9853 * one comparison. Many places in the kernel can bypass this full check
9854- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
9855+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
9856+ * be used.
9857 */
9858-static inline int user_mode(struct pt_regs *regs)
9859+static inline int user_mode_novm(struct pt_regs *regs)
9860 {
9861 #ifdef CONFIG_X86_32
9862 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
9863 #else
9864- return !!(regs->cs & 3);
9865+ return !!(regs->cs & SEGMENT_RPL_MASK);
9866 #endif
9867 }
9868
9869-static inline int user_mode_vm(struct pt_regs *regs)
9870+static inline int user_mode(struct pt_regs *regs)
9871 {
9872 #ifdef CONFIG_X86_32
9873 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
9874 USER_RPL;
9875 #else
9876- return user_mode(regs);
9877+ return user_mode_novm(regs);
9878 #endif
9879 }
9880
9881@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_regs *regs)
9882 #ifdef CONFIG_X86_64
9883 static inline bool user_64bit_mode(struct pt_regs *regs)
9884 {
9885+ unsigned long cs = regs->cs & 0xffff;
9886 #ifndef CONFIG_PARAVIRT
9887 /*
9888 * On non-paravirt systems, this is the only long mode CPL 3
9889 * selector. We do not allow long mode selectors in the LDT.
9890 */
9891- return regs->cs == __USER_CS;
9892+ return cs == __USER_CS;
9893 #else
9894 /* Headers are too twisted for this to go in paravirt.h. */
9895- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
9896+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
9897 #endif
9898 }
9899 #endif
9900diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
9901index 92f29706..a79cbbb 100644
9902--- a/arch/x86/include/asm/reboot.h
9903+++ b/arch/x86/include/asm/reboot.h
9904@@ -6,19 +6,19 @@
9905 struct pt_regs;
9906
9907 struct machine_ops {
9908- void (*restart)(char *cmd);
9909- void (*halt)(void);
9910- void (*power_off)(void);
9911+ void (* __noreturn restart)(char *cmd);
9912+ void (* __noreturn halt)(void);
9913+ void (* __noreturn power_off)(void);
9914 void (*shutdown)(void);
9915 void (*crash_shutdown)(struct pt_regs *);
9916- void (*emergency_restart)(void);
9917-};
9918+ void (* __noreturn emergency_restart)(void);
9919+} __no_const;
9920
9921 extern struct machine_ops machine_ops;
9922
9923 void native_machine_crash_shutdown(struct pt_regs *regs);
9924 void native_machine_shutdown(void);
9925-void machine_real_restart(unsigned int type);
9926+void machine_real_restart(unsigned int type) __noreturn;
9927 /* These must match dispatch_table in reboot_32.S */
9928 #define MRR_BIOS 0
9929 #define MRR_APM 1
9930diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
9931index 2dbe4a7..ce1db00 100644
9932--- a/arch/x86/include/asm/rwsem.h
9933+++ b/arch/x86/include/asm/rwsem.h
9934@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
9935 {
9936 asm volatile("# beginning down_read\n\t"
9937 LOCK_PREFIX _ASM_INC "(%1)\n\t"
9938+
9939+#ifdef CONFIG_PAX_REFCOUNT
9940+ "jno 0f\n"
9941+ LOCK_PREFIX _ASM_DEC "(%1)\n"
9942+ "int $4\n0:\n"
9943+ _ASM_EXTABLE(0b, 0b)
9944+#endif
9945+
9946 /* adds 0x00000001 */
9947 " jns 1f\n"
9948 " call call_rwsem_down_read_failed\n"
9949@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
9950 "1:\n\t"
9951 " mov %1,%2\n\t"
9952 " add %3,%2\n\t"
9953+
9954+#ifdef CONFIG_PAX_REFCOUNT
9955+ "jno 0f\n"
9956+ "sub %3,%2\n"
9957+ "int $4\n0:\n"
9958+ _ASM_EXTABLE(0b, 0b)
9959+#endif
9960+
9961 " jle 2f\n\t"
9962 LOCK_PREFIX " cmpxchg %2,%0\n\t"
9963 " jnz 1b\n\t"
9964@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
9965 long tmp;
9966 asm volatile("# beginning down_write\n\t"
9967 LOCK_PREFIX " xadd %1,(%2)\n\t"
9968+
9969+#ifdef CONFIG_PAX_REFCOUNT
9970+ "jno 0f\n"
9971+ "mov %1,(%2)\n"
9972+ "int $4\n0:\n"
9973+ _ASM_EXTABLE(0b, 0b)
9974+#endif
9975+
9976 /* adds 0xffff0001, returns the old value */
9977 " test %1,%1\n\t"
9978 /* was the count 0 before? */
9979@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
9980 long tmp;
9981 asm volatile("# beginning __up_read\n\t"
9982 LOCK_PREFIX " xadd %1,(%2)\n\t"
9983+
9984+#ifdef CONFIG_PAX_REFCOUNT
9985+ "jno 0f\n"
9986+ "mov %1,(%2)\n"
9987+ "int $4\n0:\n"
9988+ _ASM_EXTABLE(0b, 0b)
9989+#endif
9990+
9991 /* subtracts 1, returns the old value */
9992 " jns 1f\n\t"
9993 " call call_rwsem_wake\n" /* expects old value in %edx */
9994@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
9995 long tmp;
9996 asm volatile("# beginning __up_write\n\t"
9997 LOCK_PREFIX " xadd %1,(%2)\n\t"
9998+
9999+#ifdef CONFIG_PAX_REFCOUNT
10000+ "jno 0f\n"
10001+ "mov %1,(%2)\n"
10002+ "int $4\n0:\n"
10003+ _ASM_EXTABLE(0b, 0b)
10004+#endif
10005+
10006 /* subtracts 0xffff0001, returns the old value */
10007 " jns 1f\n\t"
10008 " call call_rwsem_wake\n" /* expects old value in %edx */
10009@@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
10010 {
10011 asm volatile("# beginning __downgrade_write\n\t"
10012 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
10013+
10014+#ifdef CONFIG_PAX_REFCOUNT
10015+ "jno 0f\n"
10016+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
10017+ "int $4\n0:\n"
10018+ _ASM_EXTABLE(0b, 0b)
10019+#endif
10020+
10021 /*
10022 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
10023 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
10024@@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
10025 */
10026 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
10027 {
10028- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
10029+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
10030+
10031+#ifdef CONFIG_PAX_REFCOUNT
10032+ "jno 0f\n"
10033+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
10034+ "int $4\n0:\n"
10035+ _ASM_EXTABLE(0b, 0b)
10036+#endif
10037+
10038 : "+m" (sem->count)
10039 : "er" (delta));
10040 }
10041@@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
10042 */
10043 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
10044 {
10045- return delta + xadd(&sem->count, delta);
10046+ return delta + xadd_check_overflow(&sem->count, delta);
10047 }
10048
10049 #endif /* __KERNEL__ */
10050diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
10051index 5e64171..f58957e 100644
10052--- a/arch/x86/include/asm/segment.h
10053+++ b/arch/x86/include/asm/segment.h
10054@@ -64,10 +64,15 @@
10055 * 26 - ESPFIX small SS
10056 * 27 - per-cpu [ offset to per-cpu data area ]
10057 * 28 - stack_canary-20 [ for stack protector ]
10058- * 29 - unused
10059- * 30 - unused
10060+ * 29 - PCI BIOS CS
10061+ * 30 - PCI BIOS DS
10062 * 31 - TSS for double fault handler
10063 */
10064+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
10065+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
10066+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
10067+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
10068+
10069 #define GDT_ENTRY_TLS_MIN 6
10070 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
10071
10072@@ -79,6 +84,8 @@
10073
10074 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
10075
10076+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
10077+
10078 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
10079
10080 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
10081@@ -104,6 +111,12 @@
10082 #define __KERNEL_STACK_CANARY 0
10083 #endif
10084
10085+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
10086+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
10087+
10088+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
10089+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
10090+
10091 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
10092
10093 /*
10094@@ -141,7 +154,7 @@
10095 */
10096
10097 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
10098-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
10099+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
10100
10101
10102 #else
10103@@ -165,6 +178,8 @@
10104 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
10105 #define __USER32_DS __USER_DS
10106
10107+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
10108+
10109 #define GDT_ENTRY_TSS 8 /* needs two entries */
10110 #define GDT_ENTRY_LDT 10 /* needs two entries */
10111 #define GDT_ENTRY_TLS_MIN 12
10112@@ -185,6 +200,7 @@
10113 #endif
10114
10115 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
10116+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
10117 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
10118 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
10119 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
10120diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
10121index 73b11bc..d4a3b63 100644
10122--- a/arch/x86/include/asm/smp.h
10123+++ b/arch/x86/include/asm/smp.h
10124@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
10125 /* cpus sharing the last level cache: */
10126 DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
10127 DECLARE_PER_CPU(u16, cpu_llc_id);
10128-DECLARE_PER_CPU(int, cpu_number);
10129+DECLARE_PER_CPU(unsigned int, cpu_number);
10130
10131 static inline struct cpumask *cpu_sibling_mask(int cpu)
10132 {
10133@@ -77,7 +77,7 @@ struct smp_ops {
10134
10135 void (*send_call_func_ipi)(const struct cpumask *mask);
10136 void (*send_call_func_single_ipi)(int cpu);
10137-};
10138+} __no_const;
10139
10140 /* Globals due to paravirt */
10141 extern void set_cpu_sibling_map(int cpu);
10142@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitdata;
10143 extern int safe_smp_processor_id(void);
10144
10145 #elif defined(CONFIG_X86_64_SMP)
10146-#define raw_smp_processor_id() (percpu_read(cpu_number))
10147-
10148-#define stack_smp_processor_id() \
10149-({ \
10150- struct thread_info *ti; \
10151- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
10152- ti->cpu; \
10153-})
10154+#define raw_smp_processor_id() (percpu_read(cpu_number))
10155+#define stack_smp_processor_id() raw_smp_processor_id()
10156 #define safe_smp_processor_id() smp_processor_id()
10157
10158 #endif
10159diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
10160index 972c260..43ab1fd 100644
10161--- a/arch/x86/include/asm/spinlock.h
10162+++ b/arch/x86/include/asm/spinlock.h
10163@@ -188,6 +188,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
10164 static inline void arch_read_lock(arch_rwlock_t *rw)
10165 {
10166 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
10167+
10168+#ifdef CONFIG_PAX_REFCOUNT
10169+ "jno 0f\n"
10170+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
10171+ "int $4\n0:\n"
10172+ _ASM_EXTABLE(0b, 0b)
10173+#endif
10174+
10175 "jns 1f\n"
10176 "call __read_lock_failed\n\t"
10177 "1:\n"
10178@@ -197,6 +205,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
10179 static inline void arch_write_lock(arch_rwlock_t *rw)
10180 {
10181 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
10182+
10183+#ifdef CONFIG_PAX_REFCOUNT
10184+ "jno 0f\n"
10185+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
10186+ "int $4\n0:\n"
10187+ _ASM_EXTABLE(0b, 0b)
10188+#endif
10189+
10190 "jz 1f\n"
10191 "call __write_lock_failed\n\t"
10192 "1:\n"
10193@@ -226,13 +242,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
10194
10195 static inline void arch_read_unlock(arch_rwlock_t *rw)
10196 {
10197- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
10198+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
10199+
10200+#ifdef CONFIG_PAX_REFCOUNT
10201+ "jno 0f\n"
10202+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
10203+ "int $4\n0:\n"
10204+ _ASM_EXTABLE(0b, 0b)
10205+#endif
10206+
10207 :"+m" (rw->lock) : : "memory");
10208 }
10209
10210 static inline void arch_write_unlock(arch_rwlock_t *rw)
10211 {
10212- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
10213+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
10214+
10215+#ifdef CONFIG_PAX_REFCOUNT
10216+ "jno 0f\n"
10217+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
10218+ "int $4\n0:\n"
10219+ _ASM_EXTABLE(0b, 0b)
10220+#endif
10221+
10222 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
10223 }
10224
10225diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
10226index 1575177..cb23f52 100644
10227--- a/arch/x86/include/asm/stackprotector.h
10228+++ b/arch/x86/include/asm/stackprotector.h
10229@@ -48,7 +48,7 @@
10230 * head_32 for boot CPU and setup_per_cpu_areas() for others.
10231 */
10232 #define GDT_STACK_CANARY_INIT \
10233- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
10234+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
10235
10236 /*
10237 * Initialize the stackprotector canary value.
10238@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
10239
10240 static inline void load_stack_canary_segment(void)
10241 {
10242-#ifdef CONFIG_X86_32
10243+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
10244 asm volatile ("mov %0, %%gs" : : "r" (0));
10245 #endif
10246 }
10247diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
10248index 70bbe39..4ae2bd4 100644
10249--- a/arch/x86/include/asm/stacktrace.h
10250+++ b/arch/x86/include/asm/stacktrace.h
10251@@ -11,28 +11,20 @@
10252
10253 extern int kstack_depth_to_print;
10254
10255-struct thread_info;
10256+struct task_struct;
10257 struct stacktrace_ops;
10258
10259-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
10260- unsigned long *stack,
10261- unsigned long bp,
10262- const struct stacktrace_ops *ops,
10263- void *data,
10264- unsigned long *end,
10265- int *graph);
10266+typedef unsigned long walk_stack_t(struct task_struct *task,
10267+ void *stack_start,
10268+ unsigned long *stack,
10269+ unsigned long bp,
10270+ const struct stacktrace_ops *ops,
10271+ void *data,
10272+ unsigned long *end,
10273+ int *graph);
10274
10275-extern unsigned long
10276-print_context_stack(struct thread_info *tinfo,
10277- unsigned long *stack, unsigned long bp,
10278- const struct stacktrace_ops *ops, void *data,
10279- unsigned long *end, int *graph);
10280-
10281-extern unsigned long
10282-print_context_stack_bp(struct thread_info *tinfo,
10283- unsigned long *stack, unsigned long bp,
10284- const struct stacktrace_ops *ops, void *data,
10285- unsigned long *end, int *graph);
10286+extern walk_stack_t print_context_stack;
10287+extern walk_stack_t print_context_stack_bp;
10288
10289 /* Generic stack tracer with callbacks */
10290
10291@@ -40,7 +32,7 @@ struct stacktrace_ops {
10292 void (*address)(void *data, unsigned long address, int reliable);
10293 /* On negative return stop dumping */
10294 int (*stack)(void *data, char *name);
10295- walk_stack_t walk_stack;
10296+ walk_stack_t *walk_stack;
10297 };
10298
10299 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
10300diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
10301index cb23852..2dde194 100644
10302--- a/arch/x86/include/asm/sys_ia32.h
10303+++ b/arch/x86/include/asm/sys_ia32.h
10304@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int, compat_sigset_t __user *,
10305 compat_sigset_t __user *, unsigned int);
10306 asmlinkage long sys32_alarm(unsigned int);
10307
10308-asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
10309+asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
10310 asmlinkage long sys32_sysfs(int, u32, u32);
10311
10312 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
10313diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
10314index 2d2f01c..f985723 100644
10315--- a/arch/x86/include/asm/system.h
10316+++ b/arch/x86/include/asm/system.h
10317@@ -129,7 +129,7 @@ do { \
10318 "call __switch_to\n\t" \
10319 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
10320 __switch_canary \
10321- "movq %P[thread_info](%%rsi),%%r8\n\t" \
10322+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
10323 "movq %%rax,%%rdi\n\t" \
10324 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
10325 "jnz ret_from_fork\n\t" \
10326@@ -140,7 +140,7 @@ do { \
10327 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
10328 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
10329 [_tif_fork] "i" (_TIF_FORK), \
10330- [thread_info] "i" (offsetof(struct task_struct, stack)), \
10331+ [thread_info] "m" (current_tinfo), \
10332 [current_task] "m" (current_task) \
10333 __switch_canary_iparam \
10334 : "memory", "cc" __EXTRA_CLOBBER)
10335@@ -200,7 +200,7 @@ static inline unsigned long get_limit(unsigned long segment)
10336 {
10337 unsigned long __limit;
10338 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
10339- return __limit + 1;
10340+ return __limit;
10341 }
10342
10343 static inline void native_clts(void)
10344@@ -397,13 +397,13 @@ void enable_hlt(void);
10345
10346 void cpu_idle_wait(void);
10347
10348-extern unsigned long arch_align_stack(unsigned long sp);
10349+#define arch_align_stack(x) ((x) & ~0xfUL)
10350 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
10351
10352 void default_idle(void);
10353 bool set_pm_idle_to_default(void);
10354
10355-void stop_this_cpu(void *dummy);
10356+void stop_this_cpu(void *dummy) __noreturn;
10357
10358 /*
10359 * Force strict CPU ordering.
10360diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
10361index a1fe5c1..ee326d8 100644
10362--- a/arch/x86/include/asm/thread_info.h
10363+++ b/arch/x86/include/asm/thread_info.h
10364@@ -10,6 +10,7 @@
10365 #include <linux/compiler.h>
10366 #include <asm/page.h>
10367 #include <asm/types.h>
10368+#include <asm/percpu.h>
10369
10370 /*
10371 * low level task data that entry.S needs immediate access to
10372@@ -24,7 +25,6 @@ struct exec_domain;
10373 #include <linux/atomic.h>
10374
10375 struct thread_info {
10376- struct task_struct *task; /* main task structure */
10377 struct exec_domain *exec_domain; /* execution domain */
10378 __u32 flags; /* low level flags */
10379 __u32 status; /* thread synchronous flags */
10380@@ -34,18 +34,12 @@ struct thread_info {
10381 mm_segment_t addr_limit;
10382 struct restart_block restart_block;
10383 void __user *sysenter_return;
10384-#ifdef CONFIG_X86_32
10385- unsigned long previous_esp; /* ESP of the previous stack in
10386- case of nested (IRQ) stacks
10387- */
10388- __u8 supervisor_stack[0];
10389-#endif
10390+ unsigned long lowest_stack;
10391 int uaccess_err;
10392 };
10393
10394-#define INIT_THREAD_INFO(tsk) \
10395+#define INIT_THREAD_INFO \
10396 { \
10397- .task = &tsk, \
10398 .exec_domain = &default_exec_domain, \
10399 .flags = 0, \
10400 .cpu = 0, \
10401@@ -56,7 +50,7 @@ struct thread_info {
10402 }, \
10403 }
10404
10405-#define init_thread_info (init_thread_union.thread_info)
10406+#define init_thread_info (init_thread_union.stack)
10407 #define init_stack (init_thread_union.stack)
10408
10409 #else /* !__ASSEMBLY__ */
10410@@ -170,45 +164,40 @@ struct thread_info {
10411 ret; \
10412 })
10413
10414-#ifdef CONFIG_X86_32
10415-
10416-#define STACK_WARN (THREAD_SIZE/8)
10417-/*
10418- * macros/functions for gaining access to the thread information structure
10419- *
10420- * preempt_count needs to be 1 initially, until the scheduler is functional.
10421- */
10422-#ifndef __ASSEMBLY__
10423-
10424-
10425-/* how to get the current stack pointer from C */
10426-register unsigned long current_stack_pointer asm("esp") __used;
10427-
10428-/* how to get the thread information struct from C */
10429-static inline struct thread_info *current_thread_info(void)
10430-{
10431- return (struct thread_info *)
10432- (current_stack_pointer & ~(THREAD_SIZE - 1));
10433-}
10434-
10435-#else /* !__ASSEMBLY__ */
10436-
10437+#ifdef __ASSEMBLY__
10438 /* how to get the thread information struct from ASM */
10439 #define GET_THREAD_INFO(reg) \
10440- movl $-THREAD_SIZE, reg; \
10441- andl %esp, reg
10442+ mov PER_CPU_VAR(current_tinfo), reg
10443
10444 /* use this one if reg already contains %esp */
10445-#define GET_THREAD_INFO_WITH_ESP(reg) \
10446- andl $-THREAD_SIZE, reg
10447+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
10448+#else
10449+/* how to get the thread information struct from C */
10450+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
10451+
10452+static __always_inline struct thread_info *current_thread_info(void)
10453+{
10454+ return percpu_read_stable(current_tinfo);
10455+}
10456+#endif
10457+
10458+#ifdef CONFIG_X86_32
10459+
10460+#define STACK_WARN (THREAD_SIZE/8)
10461+/*
10462+ * macros/functions for gaining access to the thread information structure
10463+ *
10464+ * preempt_count needs to be 1 initially, until the scheduler is functional.
10465+ */
10466+#ifndef __ASSEMBLY__
10467+
10468+/* how to get the current stack pointer from C */
10469+register unsigned long current_stack_pointer asm("esp") __used;
10470
10471 #endif
10472
10473 #else /* X86_32 */
10474
10475-#include <asm/percpu.h>
10476-#define KERNEL_STACK_OFFSET (5*8)
10477-
10478 /*
10479 * macros/functions for gaining access to the thread information structure
10480 * preempt_count needs to be 1 initially, until the scheduler is functional.
10481@@ -216,21 +205,8 @@ static inline struct thread_info *current_thread_info(void)
10482 #ifndef __ASSEMBLY__
10483 DECLARE_PER_CPU(unsigned long, kernel_stack);
10484
10485-static inline struct thread_info *current_thread_info(void)
10486-{
10487- struct thread_info *ti;
10488- ti = (void *)(percpu_read_stable(kernel_stack) +
10489- KERNEL_STACK_OFFSET - THREAD_SIZE);
10490- return ti;
10491-}
10492-
10493-#else /* !__ASSEMBLY__ */
10494-
10495-/* how to get the thread information struct from ASM */
10496-#define GET_THREAD_INFO(reg) \
10497- movq PER_CPU_VAR(kernel_stack),reg ; \
10498- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
10499-
10500+/* how to get the current stack pointer from C */
10501+register unsigned long current_stack_pointer asm("rsp") __used;
10502 #endif
10503
10504 #endif /* !X86_32 */
10505@@ -266,5 +242,16 @@ extern void arch_task_cache_init(void);
10506 extern void free_thread_info(struct thread_info *ti);
10507 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
10508 #define arch_task_cache_init arch_task_cache_init
10509+
10510+#define __HAVE_THREAD_FUNCTIONS
10511+#define task_thread_info(task) (&(task)->tinfo)
10512+#define task_stack_page(task) ((task)->stack)
10513+#define setup_thread_stack(p, org) do {} while (0)
10514+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
10515+
10516+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
10517+extern struct task_struct *alloc_task_struct_node(int node);
10518+extern void free_task_struct(struct task_struct *);
10519+
10520 #endif
10521 #endif /* _ASM_X86_THREAD_INFO_H */
10522diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
10523index 36361bf..324f262 100644
10524--- a/arch/x86/include/asm/uaccess.h
10525+++ b/arch/x86/include/asm/uaccess.h
10526@@ -7,12 +7,15 @@
10527 #include <linux/compiler.h>
10528 #include <linux/thread_info.h>
10529 #include <linux/string.h>
10530+#include <linux/sched.h>
10531 #include <asm/asm.h>
10532 #include <asm/page.h>
10533
10534 #define VERIFY_READ 0
10535 #define VERIFY_WRITE 1
10536
10537+extern void check_object_size(const void *ptr, unsigned long n, bool to);
10538+
10539 /*
10540 * The fs value determines whether argument validity checking should be
10541 * performed or not. If get_fs() == USER_DS, checking is performed, with
10542@@ -28,7 +31,12 @@
10543
10544 #define get_ds() (KERNEL_DS)
10545 #define get_fs() (current_thread_info()->addr_limit)
10546+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
10547+void __set_fs(mm_segment_t x);
10548+void set_fs(mm_segment_t x);
10549+#else
10550 #define set_fs(x) (current_thread_info()->addr_limit = (x))
10551+#endif
10552
10553 #define segment_eq(a, b) ((a).seg == (b).seg)
10554
10555@@ -76,7 +84,33 @@
10556 * checks that the pointer is in the user space range - after calling
10557 * this function, memory access functions may still return -EFAULT.
10558 */
10559-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
10560+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
10561+#define access_ok(type, addr, size) \
10562+({ \
10563+ long __size = size; \
10564+ unsigned long __addr = (unsigned long)addr; \
10565+ unsigned long __addr_ao = __addr & PAGE_MASK; \
10566+ unsigned long __end_ao = __addr + __size - 1; \
10567+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
10568+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
10569+ while(__addr_ao <= __end_ao) { \
10570+ char __c_ao; \
10571+ __addr_ao += PAGE_SIZE; \
10572+ if (__size > PAGE_SIZE) \
10573+ cond_resched(); \
10574+ if (__get_user(__c_ao, (char __user *)__addr)) \
10575+ break; \
10576+ if (type != VERIFY_WRITE) { \
10577+ __addr = __addr_ao; \
10578+ continue; \
10579+ } \
10580+ if (__put_user(__c_ao, (char __user *)__addr)) \
10581+ break; \
10582+ __addr = __addr_ao; \
10583+ } \
10584+ } \
10585+ __ret_ao; \
10586+})
10587
10588 /*
10589 * The exception table consists of pairs of addresses: the first is the
10590@@ -182,12 +216,20 @@ extern int __get_user_bad(void);
10591 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
10592 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
10593
10594-
10595+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
10596+#define __copyuser_seg "gs;"
10597+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
10598+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
10599+#else
10600+#define __copyuser_seg
10601+#define __COPYUSER_SET_ES
10602+#define __COPYUSER_RESTORE_ES
10603+#endif
10604
10605 #ifdef CONFIG_X86_32
10606 #define __put_user_asm_u64(x, addr, err, errret) \
10607- asm volatile("1: movl %%eax,0(%2)\n" \
10608- "2: movl %%edx,4(%2)\n" \
10609+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
10610+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
10611 "3:\n" \
10612 ".section .fixup,\"ax\"\n" \
10613 "4: movl %3,%0\n" \
10614@@ -199,8 +241,8 @@ extern int __get_user_bad(void);
10615 : "A" (x), "r" (addr), "i" (errret), "0" (err))
10616
10617 #define __put_user_asm_ex_u64(x, addr) \
10618- asm volatile("1: movl %%eax,0(%1)\n" \
10619- "2: movl %%edx,4(%1)\n" \
10620+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
10621+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
10622 "3:\n" \
10623 _ASM_EXTABLE(1b, 2b - 1b) \
10624 _ASM_EXTABLE(2b, 3b - 2b) \
10625@@ -252,7 +294,7 @@ extern void __put_user_8(void);
10626 __typeof__(*(ptr)) __pu_val; \
10627 __chk_user_ptr(ptr); \
10628 might_fault(); \
10629- __pu_val = x; \
10630+ __pu_val = (x); \
10631 switch (sizeof(*(ptr))) { \
10632 case 1: \
10633 __put_user_x(1, __pu_val, ptr, __ret_pu); \
10634@@ -373,7 +415,7 @@ do { \
10635 } while (0)
10636
10637 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
10638- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
10639+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
10640 "2:\n" \
10641 ".section .fixup,\"ax\"\n" \
10642 "3: mov %3,%0\n" \
10643@@ -381,7 +423,7 @@ do { \
10644 " jmp 2b\n" \
10645 ".previous\n" \
10646 _ASM_EXTABLE(1b, 3b) \
10647- : "=r" (err), ltype(x) \
10648+ : "=r" (err), ltype (x) \
10649 : "m" (__m(addr)), "i" (errret), "0" (err))
10650
10651 #define __get_user_size_ex(x, ptr, size) \
10652@@ -406,7 +448,7 @@ do { \
10653 } while (0)
10654
10655 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
10656- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
10657+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
10658 "2:\n" \
10659 _ASM_EXTABLE(1b, 2b - 1b) \
10660 : ltype(x) : "m" (__m(addr)))
10661@@ -423,13 +465,24 @@ do { \
10662 int __gu_err; \
10663 unsigned long __gu_val; \
10664 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
10665- (x) = (__force __typeof__(*(ptr)))__gu_val; \
10666+ (x) = (__typeof__(*(ptr)))__gu_val; \
10667 __gu_err; \
10668 })
10669
10670 /* FIXME: this hack is definitely wrong -AK */
10671 struct __large_struct { unsigned long buf[100]; };
10672-#define __m(x) (*(struct __large_struct __user *)(x))
10673+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10674+#define ____m(x) \
10675+({ \
10676+ unsigned long ____x = (unsigned long)(x); \
10677+ if (____x < PAX_USER_SHADOW_BASE) \
10678+ ____x += PAX_USER_SHADOW_BASE; \
10679+ (void __user *)____x; \
10680+})
10681+#else
10682+#define ____m(x) (x)
10683+#endif
10684+#define __m(x) (*(struct __large_struct __user *)____m(x))
10685
10686 /*
10687 * Tell gcc we read from memory instead of writing: this is because
10688@@ -437,7 +490,7 @@ struct __large_struct { unsigned long buf[100]; };
10689 * aliasing issues.
10690 */
10691 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
10692- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
10693+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
10694 "2:\n" \
10695 ".section .fixup,\"ax\"\n" \
10696 "3: mov %3,%0\n" \
10697@@ -445,10 +498,10 @@ struct __large_struct { unsigned long buf[100]; };
10698 ".previous\n" \
10699 _ASM_EXTABLE(1b, 3b) \
10700 : "=r"(err) \
10701- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
10702+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
10703
10704 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
10705- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
10706+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
10707 "2:\n" \
10708 _ASM_EXTABLE(1b, 2b - 1b) \
10709 : : ltype(x), "m" (__m(addr)))
10710@@ -487,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
10711 * On error, the variable @x is set to zero.
10712 */
10713
10714+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10715+#define __get_user(x, ptr) get_user((x), (ptr))
10716+#else
10717 #define __get_user(x, ptr) \
10718 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
10719+#endif
10720
10721 /**
10722 * __put_user: - Write a simple value into user space, with less checking.
10723@@ -510,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
10724 * Returns zero on success, or -EFAULT on error.
10725 */
10726
10727+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10728+#define __put_user(x, ptr) put_user((x), (ptr))
10729+#else
10730 #define __put_user(x, ptr) \
10731 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
10732+#endif
10733
10734 #define __get_user_unaligned __get_user
10735 #define __put_user_unaligned __put_user
10736@@ -529,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
10737 #define get_user_ex(x, ptr) do { \
10738 unsigned long __gue_val; \
10739 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
10740- (x) = (__force __typeof__(*(ptr)))__gue_val; \
10741+ (x) = (__typeof__(*(ptr)))__gue_val; \
10742 } while (0)
10743
10744 #ifdef CONFIG_X86_WP_WORKS_OK
10745diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
10746index 566e803..b9521e9 100644
10747--- a/arch/x86/include/asm/uaccess_32.h
10748+++ b/arch/x86/include/asm/uaccess_32.h
10749@@ -43,6 +43,9 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
10750 static __always_inline unsigned long __must_check
10751 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
10752 {
10753+ if ((long)n < 0)
10754+ return n;
10755+
10756 if (__builtin_constant_p(n)) {
10757 unsigned long ret;
10758
10759@@ -61,6 +64,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
10760 return ret;
10761 }
10762 }
10763+ if (!__builtin_constant_p(n))
10764+ check_object_size(from, n, true);
10765 return __copy_to_user_ll(to, from, n);
10766 }
10767
10768@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
10769 __copy_to_user(void __user *to, const void *from, unsigned long n)
10770 {
10771 might_fault();
10772+
10773 return __copy_to_user_inatomic(to, from, n);
10774 }
10775
10776 static __always_inline unsigned long
10777 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
10778 {
10779+ if ((long)n < 0)
10780+ return n;
10781+
10782 /* Avoid zeroing the tail if the copy fails..
10783 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
10784 * but as the zeroing behaviour is only significant when n is not
10785@@ -137,6 +146,10 @@ static __always_inline unsigned long
10786 __copy_from_user(void *to, const void __user *from, unsigned long n)
10787 {
10788 might_fault();
10789+
10790+ if ((long)n < 0)
10791+ return n;
10792+
10793 if (__builtin_constant_p(n)) {
10794 unsigned long ret;
10795
10796@@ -152,6 +165,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
10797 return ret;
10798 }
10799 }
10800+ if (!__builtin_constant_p(n))
10801+ check_object_size(to, n, false);
10802 return __copy_from_user_ll(to, from, n);
10803 }
10804
10805@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
10806 const void __user *from, unsigned long n)
10807 {
10808 might_fault();
10809+
10810+ if ((long)n < 0)
10811+ return n;
10812+
10813 if (__builtin_constant_p(n)) {
10814 unsigned long ret;
10815
10816@@ -181,15 +200,19 @@ static __always_inline unsigned long
10817 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
10818 unsigned long n)
10819 {
10820- return __copy_from_user_ll_nocache_nozero(to, from, n);
10821+ if ((long)n < 0)
10822+ return n;
10823+
10824+ return __copy_from_user_ll_nocache_nozero(to, from, n);
10825 }
10826
10827-unsigned long __must_check copy_to_user(void __user *to,
10828- const void *from, unsigned long n);
10829-unsigned long __must_check _copy_from_user(void *to,
10830- const void __user *from,
10831- unsigned long n);
10832-
10833+extern void copy_to_user_overflow(void)
10834+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
10835+ __compiletime_error("copy_to_user() buffer size is not provably correct")
10836+#else
10837+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
10838+#endif
10839+;
10840
10841 extern void copy_from_user_overflow(void)
10842 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
10843@@ -199,17 +222,61 @@ extern void copy_from_user_overflow(void)
10844 #endif
10845 ;
10846
10847-static inline unsigned long __must_check copy_from_user(void *to,
10848- const void __user *from,
10849- unsigned long n)
10850+/**
10851+ * copy_to_user: - Copy a block of data into user space.
10852+ * @to: Destination address, in user space.
10853+ * @from: Source address, in kernel space.
10854+ * @n: Number of bytes to copy.
10855+ *
10856+ * Context: User context only. This function may sleep.
10857+ *
10858+ * Copy data from kernel space to user space.
10859+ *
10860+ * Returns number of bytes that could not be copied.
10861+ * On success, this will be zero.
10862+ */
10863+static inline unsigned long __must_check
10864+copy_to_user(void __user *to, const void *from, unsigned long n)
10865+{
10866+ int sz = __compiletime_object_size(from);
10867+
10868+ if (unlikely(sz != -1 && sz < n))
10869+ copy_to_user_overflow();
10870+ else if (access_ok(VERIFY_WRITE, to, n))
10871+ n = __copy_to_user(to, from, n);
10872+ return n;
10873+}
10874+
10875+/**
10876+ * copy_from_user: - Copy a block of data from user space.
10877+ * @to: Destination address, in kernel space.
10878+ * @from: Source address, in user space.
10879+ * @n: Number of bytes to copy.
10880+ *
10881+ * Context: User context only. This function may sleep.
10882+ *
10883+ * Copy data from user space to kernel space.
10884+ *
10885+ * Returns number of bytes that could not be copied.
10886+ * On success, this will be zero.
10887+ *
10888+ * If some data could not be copied, this function will pad the copied
10889+ * data to the requested size using zero bytes.
10890+ */
10891+static inline unsigned long __must_check
10892+copy_from_user(void *to, const void __user *from, unsigned long n)
10893 {
10894 int sz = __compiletime_object_size(to);
10895
10896- if (likely(sz == -1 || sz >= n))
10897- n = _copy_from_user(to, from, n);
10898- else
10899+ if (unlikely(sz != -1 && sz < n))
10900 copy_from_user_overflow();
10901-
10902+ else if (access_ok(VERIFY_READ, from, n))
10903+ n = __copy_from_user(to, from, n);
10904+ else if ((long)n > 0) {
10905+ if (!__builtin_constant_p(n))
10906+ check_object_size(to, n, false);
10907+ memset(to, 0, n);
10908+ }
10909 return n;
10910 }
10911
10912diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
10913index 1c66d30..23ab77d 100644
10914--- a/arch/x86/include/asm/uaccess_64.h
10915+++ b/arch/x86/include/asm/uaccess_64.h
10916@@ -10,6 +10,9 @@
10917 #include <asm/alternative.h>
10918 #include <asm/cpufeature.h>
10919 #include <asm/page.h>
10920+#include <asm/pgtable.h>
10921+
10922+#define set_fs(x) (current_thread_info()->addr_limit = (x))
10923
10924 /*
10925 * Copy To/From Userspace
10926@@ -17,12 +20,12 @@
10927
10928 /* Handles exceptions in both to and from, but doesn't do access_ok */
10929 __must_check unsigned long
10930-copy_user_generic_string(void *to, const void *from, unsigned len);
10931+copy_user_generic_string(void *to, const void *from, unsigned long len);
10932 __must_check unsigned long
10933-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
10934+copy_user_generic_unrolled(void *to, const void *from, unsigned long len);
10935
10936 static __always_inline __must_check unsigned long
10937-copy_user_generic(void *to, const void *from, unsigned len)
10938+copy_user_generic(void *to, const void *from, unsigned long len)
10939 {
10940 unsigned ret;
10941
10942@@ -36,138 +39,222 @@ copy_user_generic(void *to, const void *from, unsigned len)
10943 return ret;
10944 }
10945
10946+static __always_inline __must_check unsigned long
10947+__copy_to_user(void __user *to, const void *from, unsigned long len);
10948+static __always_inline __must_check unsigned long
10949+__copy_from_user(void *to, const void __user *from, unsigned long len);
10950 __must_check unsigned long
10951-_copy_to_user(void __user *to, const void *from, unsigned len);
10952-__must_check unsigned long
10953-_copy_from_user(void *to, const void __user *from, unsigned len);
10954-__must_check unsigned long
10955-copy_in_user(void __user *to, const void __user *from, unsigned len);
10956+copy_in_user(void __user *to, const void __user *from, unsigned long len);
10957
10958 static inline unsigned long __must_check copy_from_user(void *to,
10959 const void __user *from,
10960 unsigned long n)
10961 {
10962- int sz = __compiletime_object_size(to);
10963-
10964 might_fault();
10965- if (likely(sz == -1 || sz >= n))
10966- n = _copy_from_user(to, from, n);
10967-#ifdef CONFIG_DEBUG_VM
10968- else
10969- WARN(1, "Buffer overflow detected!\n");
10970-#endif
10971+
10972+ if (access_ok(VERIFY_READ, from, n))
10973+ n = __copy_from_user(to, from, n);
10974+ else if (n < INT_MAX) {
10975+ if (!__builtin_constant_p(n))
10976+ check_object_size(to, n, false);
10977+ memset(to, 0, n);
10978+ }
10979 return n;
10980 }
10981
10982 static __always_inline __must_check
10983-int copy_to_user(void __user *dst, const void *src, unsigned size)
10984+int copy_to_user(void __user *dst, const void *src, unsigned long size)
10985 {
10986 might_fault();
10987
10988- return _copy_to_user(dst, src, size);
10989+ if (access_ok(VERIFY_WRITE, dst, size))
10990+ size = __copy_to_user(dst, src, size);
10991+ return size;
10992 }
10993
10994 static __always_inline __must_check
10995-int __copy_from_user(void *dst, const void __user *src, unsigned size)
10996+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
10997 {
10998- int ret = 0;
10999+ int sz = __compiletime_object_size(dst);
11000+ unsigned ret = 0;
11001
11002 might_fault();
11003- if (!__builtin_constant_p(size))
11004- return copy_user_generic(dst, (__force void *)src, size);
11005+
11006+ if (size > INT_MAX)
11007+ return size;
11008+
11009+#ifdef CONFIG_PAX_MEMORY_UDEREF
11010+ if (!__access_ok(VERIFY_READ, src, size))
11011+ return size;
11012+#endif
11013+
11014+ if (unlikely(sz != -1 && sz < size)) {
11015+#ifdef CONFIG_DEBUG_VM
11016+ WARN(1, "Buffer overflow detected!\n");
11017+#endif
11018+ return size;
11019+ }
11020+
11021+ if (!__builtin_constant_p(size)) {
11022+ check_object_size(dst, size, false);
11023+
11024+#ifdef CONFIG_PAX_MEMORY_UDEREF
11025+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11026+ src += PAX_USER_SHADOW_BASE;
11027+#endif
11028+
11029+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
11030+ }
11031 switch (size) {
11032- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
11033+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
11034 ret, "b", "b", "=q", 1);
11035 return ret;
11036- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
11037+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
11038 ret, "w", "w", "=r", 2);
11039 return ret;
11040- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
11041+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
11042 ret, "l", "k", "=r", 4);
11043 return ret;
11044- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
11045+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
11046 ret, "q", "", "=r", 8);
11047 return ret;
11048 case 10:
11049- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
11050+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
11051 ret, "q", "", "=r", 10);
11052 if (unlikely(ret))
11053 return ret;
11054 __get_user_asm(*(u16 *)(8 + (char *)dst),
11055- (u16 __user *)(8 + (char __user *)src),
11056+ (const u16 __user *)(8 + (const char __user *)src),
11057 ret, "w", "w", "=r", 2);
11058 return ret;
11059 case 16:
11060- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
11061+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
11062 ret, "q", "", "=r", 16);
11063 if (unlikely(ret))
11064 return ret;
11065 __get_user_asm(*(u64 *)(8 + (char *)dst),
11066- (u64 __user *)(8 + (char __user *)src),
11067+ (const u64 __user *)(8 + (const char __user *)src),
11068 ret, "q", "", "=r", 8);
11069 return ret;
11070 default:
11071- return copy_user_generic(dst, (__force void *)src, size);
11072+
11073+#ifdef CONFIG_PAX_MEMORY_UDEREF
11074+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11075+ src += PAX_USER_SHADOW_BASE;
11076+#endif
11077+
11078+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
11079 }
11080 }
11081
11082 static __always_inline __must_check
11083-int __copy_to_user(void __user *dst, const void *src, unsigned size)
11084+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
11085 {
11086- int ret = 0;
11087+ int sz = __compiletime_object_size(src);
11088+ unsigned ret = 0;
11089
11090 might_fault();
11091- if (!__builtin_constant_p(size))
11092- return copy_user_generic((__force void *)dst, src, size);
11093+
11094+ if (size > INT_MAX)
11095+ return size;
11096+
11097+#ifdef CONFIG_PAX_MEMORY_UDEREF
11098+ if (!__access_ok(VERIFY_WRITE, dst, size))
11099+ return size;
11100+#endif
11101+
11102+ if (unlikely(sz != -1 && sz < size)) {
11103+#ifdef CONFIG_DEBUG_VM
11104+ WARN(1, "Buffer overflow detected!\n");
11105+#endif
11106+ return size;
11107+ }
11108+
11109+ if (!__builtin_constant_p(size)) {
11110+ check_object_size(src, size, true);
11111+
11112+#ifdef CONFIG_PAX_MEMORY_UDEREF
11113+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11114+ dst += PAX_USER_SHADOW_BASE;
11115+#endif
11116+
11117+ return copy_user_generic((__force_kernel void *)dst, src, size);
11118+ }
11119 switch (size) {
11120- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
11121+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
11122 ret, "b", "b", "iq", 1);
11123 return ret;
11124- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
11125+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
11126 ret, "w", "w", "ir", 2);
11127 return ret;
11128- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
11129+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
11130 ret, "l", "k", "ir", 4);
11131 return ret;
11132- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
11133+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
11134 ret, "q", "", "er", 8);
11135 return ret;
11136 case 10:
11137- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
11138+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
11139 ret, "q", "", "er", 10);
11140 if (unlikely(ret))
11141 return ret;
11142 asm("":::"memory");
11143- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
11144+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
11145 ret, "w", "w", "ir", 2);
11146 return ret;
11147 case 16:
11148- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
11149+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
11150 ret, "q", "", "er", 16);
11151 if (unlikely(ret))
11152 return ret;
11153 asm("":::"memory");
11154- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
11155+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
11156 ret, "q", "", "er", 8);
11157 return ret;
11158 default:
11159- return copy_user_generic((__force void *)dst, src, size);
11160+
11161+#ifdef CONFIG_PAX_MEMORY_UDEREF
11162+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11163+ dst += PAX_USER_SHADOW_BASE;
11164+#endif
11165+
11166+ return copy_user_generic((__force_kernel void *)dst, src, size);
11167 }
11168 }
11169
11170 static __always_inline __must_check
11171-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
11172+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
11173 {
11174- int ret = 0;
11175+ unsigned ret = 0;
11176
11177 might_fault();
11178- if (!__builtin_constant_p(size))
11179- return copy_user_generic((__force void *)dst,
11180- (__force void *)src, size);
11181+
11182+ if (size > INT_MAX)
11183+ return size;
11184+
11185+#ifdef CONFIG_PAX_MEMORY_UDEREF
11186+ if (!__access_ok(VERIFY_READ, src, size))
11187+ return size;
11188+ if (!__access_ok(VERIFY_WRITE, dst, size))
11189+ return size;
11190+#endif
11191+
11192+ if (!__builtin_constant_p(size)) {
11193+
11194+#ifdef CONFIG_PAX_MEMORY_UDEREF
11195+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11196+ src += PAX_USER_SHADOW_BASE;
11197+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11198+ dst += PAX_USER_SHADOW_BASE;
11199+#endif
11200+
11201+ return copy_user_generic((__force_kernel void *)dst,
11202+ (__force_kernel const void *)src, size);
11203+ }
11204 switch (size) {
11205 case 1: {
11206 u8 tmp;
11207- __get_user_asm(tmp, (u8 __user *)src,
11208+ __get_user_asm(tmp, (const u8 __user *)src,
11209 ret, "b", "b", "=q", 1);
11210 if (likely(!ret))
11211 __put_user_asm(tmp, (u8 __user *)dst,
11212@@ -176,7 +263,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
11213 }
11214 case 2: {
11215 u16 tmp;
11216- __get_user_asm(tmp, (u16 __user *)src,
11217+ __get_user_asm(tmp, (const u16 __user *)src,
11218 ret, "w", "w", "=r", 2);
11219 if (likely(!ret))
11220 __put_user_asm(tmp, (u16 __user *)dst,
11221@@ -186,7 +273,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
11222
11223 case 4: {
11224 u32 tmp;
11225- __get_user_asm(tmp, (u32 __user *)src,
11226+ __get_user_asm(tmp, (const u32 __user *)src,
11227 ret, "l", "k", "=r", 4);
11228 if (likely(!ret))
11229 __put_user_asm(tmp, (u32 __user *)dst,
11230@@ -195,7 +282,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
11231 }
11232 case 8: {
11233 u64 tmp;
11234- __get_user_asm(tmp, (u64 __user *)src,
11235+ __get_user_asm(tmp, (const u64 __user *)src,
11236 ret, "q", "", "=r", 8);
11237 if (likely(!ret))
11238 __put_user_asm(tmp, (u64 __user *)dst,
11239@@ -203,8 +290,16 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
11240 return ret;
11241 }
11242 default:
11243- return copy_user_generic((__force void *)dst,
11244- (__force void *)src, size);
11245+
11246+#ifdef CONFIG_PAX_MEMORY_UDEREF
11247+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11248+ src += PAX_USER_SHADOW_BASE;
11249+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11250+ dst += PAX_USER_SHADOW_BASE;
11251+#endif
11252+
11253+ return copy_user_generic((__force_kernel void *)dst,
11254+ (__force_kernel const void *)src, size);
11255 }
11256 }
11257
11258@@ -219,35 +314,72 @@ __must_check unsigned long clear_user(void __user *mem, unsigned long len);
11259 __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
11260
11261 static __must_check __always_inline int
11262-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
11263+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
11264 {
11265- return copy_user_generic(dst, (__force const void *)src, size);
11266+ if (size > INT_MAX)
11267+ return size;
11268+
11269+#ifdef CONFIG_PAX_MEMORY_UDEREF
11270+ if (!__access_ok(VERIFY_READ, src, size))
11271+ return size;
11272+
11273+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
11274+ src += PAX_USER_SHADOW_BASE;
11275+#endif
11276+
11277+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
11278 }
11279
11280-static __must_check __always_inline int
11281-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
11282+static __must_check __always_inline unsigned long
11283+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
11284 {
11285- return copy_user_generic((__force void *)dst, src, size);
11286+ if (size > INT_MAX)
11287+ return size;
11288+
11289+#ifdef CONFIG_PAX_MEMORY_UDEREF
11290+ if (!__access_ok(VERIFY_WRITE, dst, size))
11291+ return size;
11292+
11293+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
11294+ dst += PAX_USER_SHADOW_BASE;
11295+#endif
11296+
11297+ return copy_user_generic((__force_kernel void *)dst, src, size);
11298 }
11299
11300-extern long __copy_user_nocache(void *dst, const void __user *src,
11301- unsigned size, int zerorest);
11302+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
11303+ unsigned long size, int zerorest);
11304
11305-static inline int
11306-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
11307+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
11308 {
11309 might_sleep();
11310+
11311+ if (size > INT_MAX)
11312+ return size;
11313+
11314+#ifdef CONFIG_PAX_MEMORY_UDEREF
11315+ if (!__access_ok(VERIFY_READ, src, size))
11316+ return size;
11317+#endif
11318+
11319 return __copy_user_nocache(dst, src, size, 1);
11320 }
11321
11322-static inline int
11323-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
11324- unsigned size)
11325+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
11326+ unsigned long size)
11327 {
11328+ if (size > INT_MAX)
11329+ return size;
11330+
11331+#ifdef CONFIG_PAX_MEMORY_UDEREF
11332+ if (!__access_ok(VERIFY_READ, src, size))
11333+ return size;
11334+#endif
11335+
11336 return __copy_user_nocache(dst, src, size, 0);
11337 }
11338
11339-unsigned long
11340-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
11341+extern unsigned long
11342+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest);
11343
11344 #endif /* _ASM_X86_UACCESS_64_H */
11345diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
11346index bb05228..d763d5b 100644
11347--- a/arch/x86/include/asm/vdso.h
11348+++ b/arch/x86/include/asm/vdso.h
11349@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
11350 #define VDSO32_SYMBOL(base, name) \
11351 ({ \
11352 extern const char VDSO32_##name[]; \
11353- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
11354+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
11355 })
11356 #endif
11357
11358diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
11359index 1971e65..1e3559b 100644
11360--- a/arch/x86/include/asm/x86_init.h
11361+++ b/arch/x86/include/asm/x86_init.h
11362@@ -28,7 +28,7 @@ struct x86_init_mpparse {
11363 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
11364 void (*find_smp_config)(void);
11365 void (*get_smp_config)(unsigned int early);
11366-};
11367+} __no_const;
11368
11369 /**
11370 * struct x86_init_resources - platform specific resource related ops
11371@@ -42,7 +42,7 @@ struct x86_init_resources {
11372 void (*probe_roms)(void);
11373 void (*reserve_resources)(void);
11374 char *(*memory_setup)(void);
11375-};
11376+} __no_const;
11377
11378 /**
11379 * struct x86_init_irqs - platform specific interrupt setup
11380@@ -55,7 +55,7 @@ struct x86_init_irqs {
11381 void (*pre_vector_init)(void);
11382 void (*intr_init)(void);
11383 void (*trap_init)(void);
11384-};
11385+} __no_const;
11386
11387 /**
11388 * struct x86_init_oem - oem platform specific customizing functions
11389@@ -65,7 +65,7 @@ struct x86_init_irqs {
11390 struct x86_init_oem {
11391 void (*arch_setup)(void);
11392 void (*banner)(void);
11393-};
11394+} __no_const;
11395
11396 /**
11397 * struct x86_init_mapping - platform specific initial kernel pagetable setup
11398@@ -76,7 +76,7 @@ struct x86_init_oem {
11399 */
11400 struct x86_init_mapping {
11401 void (*pagetable_reserve)(u64 start, u64 end);
11402-};
11403+} __no_const;
11404
11405 /**
11406 * struct x86_init_paging - platform specific paging functions
11407@@ -86,7 +86,7 @@ struct x86_init_mapping {
11408 struct x86_init_paging {
11409 void (*pagetable_setup_start)(pgd_t *base);
11410 void (*pagetable_setup_done)(pgd_t *base);
11411-};
11412+} __no_const;
11413
11414 /**
11415 * struct x86_init_timers - platform specific timer setup
11416@@ -101,7 +101,7 @@ struct x86_init_timers {
11417 void (*tsc_pre_init)(void);
11418 void (*timer_init)(void);
11419 void (*wallclock_init)(void);
11420-};
11421+} __no_const;
11422
11423 /**
11424 * struct x86_init_iommu - platform specific iommu setup
11425@@ -109,7 +109,7 @@ struct x86_init_timers {
11426 */
11427 struct x86_init_iommu {
11428 int (*iommu_init)(void);
11429-};
11430+} __no_const;
11431
11432 /**
11433 * struct x86_init_pci - platform specific pci init functions
11434@@ -123,7 +123,7 @@ struct x86_init_pci {
11435 int (*init)(void);
11436 void (*init_irq)(void);
11437 void (*fixup_irqs)(void);
11438-};
11439+} __no_const;
11440
11441 /**
11442 * struct x86_init_ops - functions for platform specific setup
11443@@ -139,7 +139,7 @@ struct x86_init_ops {
11444 struct x86_init_timers timers;
11445 struct x86_init_iommu iommu;
11446 struct x86_init_pci pci;
11447-};
11448+} __no_const;
11449
11450 /**
11451 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
11452@@ -147,7 +147,7 @@ struct x86_init_ops {
11453 */
11454 struct x86_cpuinit_ops {
11455 void (*setup_percpu_clockev)(void);
11456-};
11457+} __no_const;
11458
11459 /**
11460 * struct x86_platform_ops - platform specific runtime functions
11461@@ -169,7 +169,7 @@ struct x86_platform_ops {
11462 void (*nmi_init)(void);
11463 unsigned char (*get_nmi_reason)(void);
11464 int (*i8042_detect)(void);
11465-};
11466+} __no_const;
11467
11468 struct pci_dev;
11469
11470@@ -177,7 +177,7 @@ struct x86_msi_ops {
11471 int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
11472 void (*teardown_msi_irq)(unsigned int irq);
11473 void (*teardown_msi_irqs)(struct pci_dev *dev);
11474-};
11475+} __no_const;
11476
11477 extern struct x86_init_ops x86_init;
11478 extern struct x86_cpuinit_ops x86_cpuinit;
11479diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
11480index c6ce245..ffbdab7 100644
11481--- a/arch/x86/include/asm/xsave.h
11482+++ b/arch/x86/include/asm/xsave.h
11483@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
11484 {
11485 int err;
11486
11487+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11488+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
11489+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
11490+#endif
11491+
11492 /*
11493 * Clear the xsave header first, so that reserved fields are
11494 * initialized to zero.
11495@@ -96,10 +101,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
11496 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
11497 {
11498 int err;
11499- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
11500+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
11501 u32 lmask = mask;
11502 u32 hmask = mask >> 32;
11503
11504+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11505+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
11506+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
11507+#endif
11508+
11509 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
11510 "2:\n"
11511 ".section .fixup,\"ax\"\n"
11512diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
11513index 6a564ac..9b1340c 100644
11514--- a/arch/x86/kernel/acpi/realmode/Makefile
11515+++ b/arch/x86/kernel/acpi/realmode/Makefile
11516@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
11517 $(call cc-option, -fno-stack-protector) \
11518 $(call cc-option, -mpreferred-stack-boundary=2)
11519 KBUILD_CFLAGS += $(call cc-option, -m32)
11520+ifdef CONSTIFY_PLUGIN
11521+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
11522+endif
11523 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
11524 GCOV_PROFILE := n
11525
11526diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
11527index b4fd836..4358fe3 100644
11528--- a/arch/x86/kernel/acpi/realmode/wakeup.S
11529+++ b/arch/x86/kernel/acpi/realmode/wakeup.S
11530@@ -108,6 +108,9 @@ wakeup_code:
11531 /* Do any other stuff... */
11532
11533 #ifndef CONFIG_64BIT
11534+ /* Recheck NX bit overrides (64bit path does this in trampoline */
11535+ call verify_cpu
11536+
11537 /* This could also be done in C code... */
11538 movl pmode_cr3, %eax
11539 movl %eax, %cr3
11540@@ -131,6 +134,7 @@ wakeup_code:
11541 movl pmode_cr0, %eax
11542 movl %eax, %cr0
11543 jmp pmode_return
11544+# include "../../verify_cpu.S"
11545 #else
11546 pushw $0
11547 pushw trampoline_segment
11548diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
11549index 103b6ab..2004d0a 100644
11550--- a/arch/x86/kernel/acpi/sleep.c
11551+++ b/arch/x86/kernel/acpi/sleep.c
11552@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
11553 header->trampoline_segment = trampoline_address() >> 4;
11554 #ifdef CONFIG_SMP
11555 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
11556+
11557+ pax_open_kernel();
11558 early_gdt_descr.address =
11559 (unsigned long)get_cpu_gdt_table(smp_processor_id());
11560+ pax_close_kernel();
11561+
11562 initial_gs = per_cpu_offset(smp_processor_id());
11563 #endif
11564 initial_code = (unsigned long)wakeup_long64;
11565diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
11566index 13ab720..95d5442 100644
11567--- a/arch/x86/kernel/acpi/wakeup_32.S
11568+++ b/arch/x86/kernel/acpi/wakeup_32.S
11569@@ -30,13 +30,11 @@ wakeup_pmode_return:
11570 # and restore the stack ... but you need gdt for this to work
11571 movl saved_context_esp, %esp
11572
11573- movl %cs:saved_magic, %eax
11574- cmpl $0x12345678, %eax
11575+ cmpl $0x12345678, saved_magic
11576 jne bogus_magic
11577
11578 # jump to place where we left off
11579- movl saved_eip, %eax
11580- jmp *%eax
11581+ jmp *(saved_eip)
11582
11583 bogus_magic:
11584 jmp bogus_magic
11585diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
11586index 1f84794..e23f862 100644
11587--- a/arch/x86/kernel/alternative.c
11588+++ b/arch/x86/kernel/alternative.c
11589@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
11590 */
11591 for (a = start; a < end; a++) {
11592 instr = (u8 *)&a->instr_offset + a->instr_offset;
11593+
11594+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
11595+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
11596+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
11597+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
11598+#endif
11599+
11600 replacement = (u8 *)&a->repl_offset + a->repl_offset;
11601 BUG_ON(a->replacementlen > a->instrlen);
11602 BUG_ON(a->instrlen > sizeof(insnbuf));
11603@@ -307,10 +314,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
11604 for (poff = start; poff < end; poff++) {
11605 u8 *ptr = (u8 *)poff + *poff;
11606
11607+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
11608+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
11609+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
11610+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
11611+#endif
11612+
11613 if (!*poff || ptr < text || ptr >= text_end)
11614 continue;
11615 /* turn DS segment override prefix into lock prefix */
11616- if (*ptr == 0x3e)
11617+ if (*ktla_ktva(ptr) == 0x3e)
11618 text_poke(ptr, ((unsigned char []){0xf0}), 1);
11619 };
11620 mutex_unlock(&text_mutex);
11621@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
11622 for (poff = start; poff < end; poff++) {
11623 u8 *ptr = (u8 *)poff + *poff;
11624
11625+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
11626+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
11627+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
11628+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
11629+#endif
11630+
11631 if (!*poff || ptr < text || ptr >= text_end)
11632 continue;
11633 /* turn lock prefix into DS segment override prefix */
11634- if (*ptr == 0xf0)
11635+ if (*ktla_ktva(ptr) == 0xf0)
11636 text_poke(ptr, ((unsigned char []){0x3E}), 1);
11637 };
11638 mutex_unlock(&text_mutex);
11639@@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
11640
11641 BUG_ON(p->len > MAX_PATCH_LEN);
11642 /* prep the buffer with the original instructions */
11643- memcpy(insnbuf, p->instr, p->len);
11644+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
11645 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
11646 (unsigned long)p->instr, p->len);
11647
11648@@ -568,7 +587,7 @@ void __init alternative_instructions(void)
11649 if (smp_alt_once)
11650 free_init_pages("SMP alternatives",
11651 (unsigned long)__smp_locks,
11652- (unsigned long)__smp_locks_end);
11653+ PAGE_ALIGN((unsigned long)__smp_locks_end));
11654
11655 restart_nmi();
11656 }
11657@@ -585,13 +604,17 @@ void __init alternative_instructions(void)
11658 * instructions. And on the local CPU you need to be protected again NMI or MCE
11659 * handlers seeing an inconsistent instruction while you patch.
11660 */
11661-void *__init_or_module text_poke_early(void *addr, const void *opcode,
11662+void *__kprobes text_poke_early(void *addr, const void *opcode,
11663 size_t len)
11664 {
11665 unsigned long flags;
11666 local_irq_save(flags);
11667- memcpy(addr, opcode, len);
11668+
11669+ pax_open_kernel();
11670+ memcpy(ktla_ktva(addr), opcode, len);
11671 sync_core();
11672+ pax_close_kernel();
11673+
11674 local_irq_restore(flags);
11675 /* Could also do a CLFLUSH here to speed up CPU recovery; but
11676 that causes hangs on some VIA CPUs. */
11677@@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
11678 */
11679 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
11680 {
11681- unsigned long flags;
11682- char *vaddr;
11683+ unsigned char *vaddr = ktla_ktva(addr);
11684 struct page *pages[2];
11685- int i;
11686+ size_t i;
11687
11688 if (!core_kernel_text((unsigned long)addr)) {
11689- pages[0] = vmalloc_to_page(addr);
11690- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
11691+ pages[0] = vmalloc_to_page(vaddr);
11692+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
11693 } else {
11694- pages[0] = virt_to_page(addr);
11695+ pages[0] = virt_to_page(vaddr);
11696 WARN_ON(!PageReserved(pages[0]));
11697- pages[1] = virt_to_page(addr + PAGE_SIZE);
11698+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
11699 }
11700 BUG_ON(!pages[0]);
11701- local_irq_save(flags);
11702- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
11703- if (pages[1])
11704- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
11705- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
11706- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
11707- clear_fixmap(FIX_TEXT_POKE0);
11708- if (pages[1])
11709- clear_fixmap(FIX_TEXT_POKE1);
11710- local_flush_tlb();
11711- sync_core();
11712- /* Could also do a CLFLUSH here to speed up CPU recovery; but
11713- that causes hangs on some VIA CPUs. */
11714+ text_poke_early(addr, opcode, len);
11715 for (i = 0; i < len; i++)
11716- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
11717- local_irq_restore(flags);
11718+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
11719 return addr;
11720 }
11721
11722diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
11723index f98d84c..e402a69 100644
11724--- a/arch/x86/kernel/apic/apic.c
11725+++ b/arch/x86/kernel/apic/apic.c
11726@@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
11727 /*
11728 * Debug level, exported for io_apic.c
11729 */
11730-unsigned int apic_verbosity;
11731+int apic_verbosity;
11732
11733 int pic_mode;
11734
11735@@ -1853,7 +1853,7 @@ void smp_error_interrupt(struct pt_regs *regs)
11736 apic_write(APIC_ESR, 0);
11737 v1 = apic_read(APIC_ESR);
11738 ack_APIC_irq();
11739- atomic_inc(&irq_err_count);
11740+ atomic_inc_unchecked(&irq_err_count);
11741
11742 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
11743 smp_processor_id(), v0 , v1);
11744diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
11745index 6d939d7..0697fcc 100644
11746--- a/arch/x86/kernel/apic/io_apic.c
11747+++ b/arch/x86/kernel/apic/io_apic.c
11748@@ -1096,7 +1096,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
11749 }
11750 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
11751
11752-void lock_vector_lock(void)
11753+void lock_vector_lock(void) __acquires(vector_lock)
11754 {
11755 /* Used to the online set of cpus does not change
11756 * during assign_irq_vector.
11757@@ -1104,7 +1104,7 @@ void lock_vector_lock(void)
11758 raw_spin_lock(&vector_lock);
11759 }
11760
11761-void unlock_vector_lock(void)
11762+void unlock_vector_lock(void) __releases(vector_lock)
11763 {
11764 raw_spin_unlock(&vector_lock);
11765 }
11766@@ -2510,7 +2510,7 @@ static void ack_apic_edge(struct irq_data *data)
11767 ack_APIC_irq();
11768 }
11769
11770-atomic_t irq_mis_count;
11771+atomic_unchecked_t irq_mis_count;
11772
11773 static void ack_apic_level(struct irq_data *data)
11774 {
11775@@ -2576,7 +2576,7 @@ static void ack_apic_level(struct irq_data *data)
11776 * at the cpu.
11777 */
11778 if (!(v & (1 << (i & 0x1f)))) {
11779- atomic_inc(&irq_mis_count);
11780+ atomic_inc_unchecked(&irq_mis_count);
11781
11782 eoi_ioapic_irq(irq, cfg);
11783 }
11784diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
11785index a46bd38..6b906d7 100644
11786--- a/arch/x86/kernel/apm_32.c
11787+++ b/arch/x86/kernel/apm_32.c
11788@@ -411,7 +411,7 @@ static DEFINE_MUTEX(apm_mutex);
11789 * This is for buggy BIOS's that refer to (real mode) segment 0x40
11790 * even though they are called in protected mode.
11791 */
11792-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
11793+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
11794 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
11795
11796 static const char driver_version[] = "1.16ac"; /* no spaces */
11797@@ -589,7 +589,10 @@ static long __apm_bios_call(void *_call)
11798 BUG_ON(cpu != 0);
11799 gdt = get_cpu_gdt_table(cpu);
11800 save_desc_40 = gdt[0x40 / 8];
11801+
11802+ pax_open_kernel();
11803 gdt[0x40 / 8] = bad_bios_desc;
11804+ pax_close_kernel();
11805
11806 apm_irq_save(flags);
11807 APM_DO_SAVE_SEGS;
11808@@ -598,7 +601,11 @@ static long __apm_bios_call(void *_call)
11809 &call->esi);
11810 APM_DO_RESTORE_SEGS;
11811 apm_irq_restore(flags);
11812+
11813+ pax_open_kernel();
11814 gdt[0x40 / 8] = save_desc_40;
11815+ pax_close_kernel();
11816+
11817 put_cpu();
11818
11819 return call->eax & 0xff;
11820@@ -665,7 +672,10 @@ static long __apm_bios_call_simple(void *_call)
11821 BUG_ON(cpu != 0);
11822 gdt = get_cpu_gdt_table(cpu);
11823 save_desc_40 = gdt[0x40 / 8];
11824+
11825+ pax_open_kernel();
11826 gdt[0x40 / 8] = bad_bios_desc;
11827+ pax_close_kernel();
11828
11829 apm_irq_save(flags);
11830 APM_DO_SAVE_SEGS;
11831@@ -673,7 +683,11 @@ static long __apm_bios_call_simple(void *_call)
11832 &call->eax);
11833 APM_DO_RESTORE_SEGS;
11834 apm_irq_restore(flags);
11835+
11836+ pax_open_kernel();
11837 gdt[0x40 / 8] = save_desc_40;
11838+ pax_close_kernel();
11839+
11840 put_cpu();
11841 return error;
11842 }
11843@@ -2347,12 +2361,15 @@ static int __init apm_init(void)
11844 * code to that CPU.
11845 */
11846 gdt = get_cpu_gdt_table(0);
11847+
11848+ pax_open_kernel();
11849 set_desc_base(&gdt[APM_CS >> 3],
11850 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
11851 set_desc_base(&gdt[APM_CS_16 >> 3],
11852 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
11853 set_desc_base(&gdt[APM_DS >> 3],
11854 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
11855+ pax_close_kernel();
11856
11857 proc_create("apm", 0, NULL, &apm_file_ops);
11858
11859diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
11860index 4f13faf..87db5d2 100644
11861--- a/arch/x86/kernel/asm-offsets.c
11862+++ b/arch/x86/kernel/asm-offsets.c
11863@@ -33,6 +33,8 @@ void common(void) {
11864 OFFSET(TI_status, thread_info, status);
11865 OFFSET(TI_addr_limit, thread_info, addr_limit);
11866 OFFSET(TI_preempt_count, thread_info, preempt_count);
11867+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
11868+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
11869
11870 BLANK();
11871 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
11872@@ -53,8 +55,26 @@ void common(void) {
11873 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
11874 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
11875 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
11876+
11877+#ifdef CONFIG_PAX_KERNEXEC
11878+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
11879 #endif
11880
11881+#ifdef CONFIG_PAX_MEMORY_UDEREF
11882+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
11883+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
11884+#ifdef CONFIG_X86_64
11885+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
11886+#endif
11887+#endif
11888+
11889+#endif
11890+
11891+ BLANK();
11892+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
11893+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
11894+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
11895+
11896 #ifdef CONFIG_XEN
11897 BLANK();
11898 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
11899diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
11900index e72a119..6e2955d 100644
11901--- a/arch/x86/kernel/asm-offsets_64.c
11902+++ b/arch/x86/kernel/asm-offsets_64.c
11903@@ -69,6 +69,7 @@ int main(void)
11904 BLANK();
11905 #undef ENTRY
11906
11907+ DEFINE(TSS_size, sizeof(struct tss_struct));
11908 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
11909 BLANK();
11910
11911diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
11912index 25f24dc..4094a7f 100644
11913--- a/arch/x86/kernel/cpu/Makefile
11914+++ b/arch/x86/kernel/cpu/Makefile
11915@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
11916 CFLAGS_REMOVE_perf_event.o = -pg
11917 endif
11918
11919-# Make sure load_percpu_segment has no stackprotector
11920-nostackp := $(call cc-option, -fno-stack-protector)
11921-CFLAGS_common.o := $(nostackp)
11922-
11923 obj-y := intel_cacheinfo.o scattered.o topology.o
11924 obj-y += proc.o capflags.o powerflags.o common.o
11925 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
11926diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
11927index 0bab2b1..d0a1bf8 100644
11928--- a/arch/x86/kernel/cpu/amd.c
11929+++ b/arch/x86/kernel/cpu/amd.c
11930@@ -664,7 +664,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
11931 unsigned int size)
11932 {
11933 /* AMD errata T13 (order #21922) */
11934- if ((c->x86 == 6)) {
11935+ if (c->x86 == 6) {
11936 /* Duron Rev A0 */
11937 if (c->x86_model == 3 && c->x86_mask == 0)
11938 size = 64;
11939diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
11940index aa003b1..47ea638 100644
11941--- a/arch/x86/kernel/cpu/common.c
11942+++ b/arch/x86/kernel/cpu/common.c
11943@@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
11944
11945 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
11946
11947-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
11948-#ifdef CONFIG_X86_64
11949- /*
11950- * We need valid kernel segments for data and code in long mode too
11951- * IRET will check the segment types kkeil 2000/10/28
11952- * Also sysret mandates a special GDT layout
11953- *
11954- * TLS descriptors are currently at a different place compared to i386.
11955- * Hopefully nobody expects them at a fixed place (Wine?)
11956- */
11957- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
11958- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
11959- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
11960- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
11961- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
11962- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
11963-#else
11964- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
11965- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
11966- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
11967- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
11968- /*
11969- * Segments used for calling PnP BIOS have byte granularity.
11970- * They code segments and data segments have fixed 64k limits,
11971- * the transfer segment sizes are set at run time.
11972- */
11973- /* 32-bit code */
11974- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
11975- /* 16-bit code */
11976- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
11977- /* 16-bit data */
11978- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
11979- /* 16-bit data */
11980- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
11981- /* 16-bit data */
11982- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
11983- /*
11984- * The APM segments have byte granularity and their bases
11985- * are set at run time. All have 64k limits.
11986- */
11987- /* 32-bit code */
11988- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
11989- /* 16-bit code */
11990- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
11991- /* data */
11992- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
11993-
11994- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
11995- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
11996- GDT_STACK_CANARY_INIT
11997-#endif
11998-} };
11999-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
12000-
12001 static int __init x86_xsave_setup(char *s)
12002 {
12003 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
12004@@ -372,7 +318,7 @@ void switch_to_new_gdt(int cpu)
12005 {
12006 struct desc_ptr gdt_descr;
12007
12008- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
12009+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
12010 gdt_descr.size = GDT_SIZE - 1;
12011 load_gdt(&gdt_descr);
12012 /* Reload the per-cpu base */
12013@@ -844,6 +790,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
12014 /* Filter out anything that depends on CPUID levels we don't have */
12015 filter_cpuid_features(c, true);
12016
12017+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
12018+ setup_clear_cpu_cap(X86_FEATURE_SEP);
12019+#endif
12020+
12021 /* If the model name is still unset, do table lookup. */
12022 if (!c->x86_model_id[0]) {
12023 const char *p;
12024@@ -1024,6 +974,9 @@ static __init int setup_disablecpuid(char *arg)
12025 }
12026 __setup("clearcpuid=", setup_disablecpuid);
12027
12028+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
12029+EXPORT_PER_CPU_SYMBOL(current_tinfo);
12030+
12031 #ifdef CONFIG_X86_64
12032 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
12033
12034@@ -1039,7 +992,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
12035 EXPORT_PER_CPU_SYMBOL(current_task);
12036
12037 DEFINE_PER_CPU(unsigned long, kernel_stack) =
12038- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
12039+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
12040 EXPORT_PER_CPU_SYMBOL(kernel_stack);
12041
12042 DEFINE_PER_CPU(char *, irq_stack_ptr) =
12043@@ -1104,7 +1057,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
12044 {
12045 memset(regs, 0, sizeof(struct pt_regs));
12046 regs->fs = __KERNEL_PERCPU;
12047- regs->gs = __KERNEL_STACK_CANARY;
12048+ savesegment(gs, regs->gs);
12049
12050 return regs;
12051 }
12052@@ -1159,7 +1112,7 @@ void __cpuinit cpu_init(void)
12053 int i;
12054
12055 cpu = stack_smp_processor_id();
12056- t = &per_cpu(init_tss, cpu);
12057+ t = init_tss + cpu;
12058 oist = &per_cpu(orig_ist, cpu);
12059
12060 #ifdef CONFIG_NUMA
12061@@ -1185,7 +1138,7 @@ void __cpuinit cpu_init(void)
12062 switch_to_new_gdt(cpu);
12063 loadsegment(fs, 0);
12064
12065- load_idt((const struct desc_ptr *)&idt_descr);
12066+ load_idt(&idt_descr);
12067
12068 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
12069 syscall_init();
12070@@ -1194,7 +1147,6 @@ void __cpuinit cpu_init(void)
12071 wrmsrl(MSR_KERNEL_GS_BASE, 0);
12072 barrier();
12073
12074- x86_configure_nx();
12075 if (cpu != 0)
12076 enable_x2apic();
12077
12078@@ -1248,7 +1200,7 @@ void __cpuinit cpu_init(void)
12079 {
12080 int cpu = smp_processor_id();
12081 struct task_struct *curr = current;
12082- struct tss_struct *t = &per_cpu(init_tss, cpu);
12083+ struct tss_struct *t = init_tss + cpu;
12084 struct thread_struct *thread = &curr->thread;
12085
12086 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
12087diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
12088index 5231312..a78a987 100644
12089--- a/arch/x86/kernel/cpu/intel.c
12090+++ b/arch/x86/kernel/cpu/intel.c
12091@@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
12092 * Update the IDT descriptor and reload the IDT so that
12093 * it uses the read-only mapped virtual address.
12094 */
12095- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
12096+ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
12097 load_idt(&idt_descr);
12098 }
12099 #endif
12100diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
12101index 2af127d..8ff7ac0 100644
12102--- a/arch/x86/kernel/cpu/mcheck/mce.c
12103+++ b/arch/x86/kernel/cpu/mcheck/mce.c
12104@@ -42,6 +42,7 @@
12105 #include <asm/processor.h>
12106 #include <asm/mce.h>
12107 #include <asm/msr.h>
12108+#include <asm/local.h>
12109
12110 #include "mce-internal.h"
12111
12112@@ -202,7 +203,7 @@ static void print_mce(struct mce *m)
12113 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
12114 m->cs, m->ip);
12115
12116- if (m->cs == __KERNEL_CS)
12117+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
12118 print_symbol("{%s}", m->ip);
12119 pr_cont("\n");
12120 }
12121@@ -235,10 +236,10 @@ static void print_mce(struct mce *m)
12122
12123 #define PANIC_TIMEOUT 5 /* 5 seconds */
12124
12125-static atomic_t mce_paniced;
12126+static atomic_unchecked_t mce_paniced;
12127
12128 static int fake_panic;
12129-static atomic_t mce_fake_paniced;
12130+static atomic_unchecked_t mce_fake_paniced;
12131
12132 /* Panic in progress. Enable interrupts and wait for final IPI */
12133 static void wait_for_panic(void)
12134@@ -262,7 +263,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
12135 /*
12136 * Make sure only one CPU runs in machine check panic
12137 */
12138- if (atomic_inc_return(&mce_paniced) > 1)
12139+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
12140 wait_for_panic();
12141 barrier();
12142
12143@@ -270,7 +271,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
12144 console_verbose();
12145 } else {
12146 /* Don't log too much for fake panic */
12147- if (atomic_inc_return(&mce_fake_paniced) > 1)
12148+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
12149 return;
12150 }
12151 /* First print corrected ones that are still unlogged */
12152@@ -610,7 +611,7 @@ static int mce_timed_out(u64 *t)
12153 * might have been modified by someone else.
12154 */
12155 rmb();
12156- if (atomic_read(&mce_paniced))
12157+ if (atomic_read_unchecked(&mce_paniced))
12158 wait_for_panic();
12159 if (!monarch_timeout)
12160 goto out;
12161@@ -1398,7 +1399,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
12162 }
12163
12164 /* Call the installed machine check handler for this CPU setup. */
12165-void (*machine_check_vector)(struct pt_regs *, long error_code) =
12166+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
12167 unexpected_machine_check;
12168
12169 /*
12170@@ -1421,7 +1422,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
12171 return;
12172 }
12173
12174+ pax_open_kernel();
12175 machine_check_vector = do_machine_check;
12176+ pax_close_kernel();
12177
12178 __mcheck_cpu_init_generic();
12179 __mcheck_cpu_init_vendor(c);
12180@@ -1435,7 +1438,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
12181 */
12182
12183 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
12184-static int mce_chrdev_open_count; /* #times opened */
12185+static local_t mce_chrdev_open_count; /* #times opened */
12186 static int mce_chrdev_open_exclu; /* already open exclusive? */
12187
12188 static int mce_chrdev_open(struct inode *inode, struct file *file)
12189@@ -1443,7 +1446,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
12190 spin_lock(&mce_chrdev_state_lock);
12191
12192 if (mce_chrdev_open_exclu ||
12193- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
12194+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
12195 spin_unlock(&mce_chrdev_state_lock);
12196
12197 return -EBUSY;
12198@@ -1451,7 +1454,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
12199
12200 if (file->f_flags & O_EXCL)
12201 mce_chrdev_open_exclu = 1;
12202- mce_chrdev_open_count++;
12203+ local_inc(&mce_chrdev_open_count);
12204
12205 spin_unlock(&mce_chrdev_state_lock);
12206
12207@@ -1462,7 +1465,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
12208 {
12209 spin_lock(&mce_chrdev_state_lock);
12210
12211- mce_chrdev_open_count--;
12212+ local_dec(&mce_chrdev_open_count);
12213 mce_chrdev_open_exclu = 0;
12214
12215 spin_unlock(&mce_chrdev_state_lock);
12216@@ -2171,7 +2174,7 @@ struct dentry *mce_get_debugfs_dir(void)
12217 static void mce_reset(void)
12218 {
12219 cpu_missing = 0;
12220- atomic_set(&mce_fake_paniced, 0);
12221+ atomic_set_unchecked(&mce_fake_paniced, 0);
12222 atomic_set(&mce_executing, 0);
12223 atomic_set(&mce_callin, 0);
12224 atomic_set(&global_nwo, 0);
12225diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
12226index 5c0e653..0882b0a 100644
12227--- a/arch/x86/kernel/cpu/mcheck/p5.c
12228+++ b/arch/x86/kernel/cpu/mcheck/p5.c
12229@@ -12,6 +12,7 @@
12230 #include <asm/system.h>
12231 #include <asm/mce.h>
12232 #include <asm/msr.h>
12233+#include <asm/pgtable.h>
12234
12235 /* By default disabled */
12236 int mce_p5_enabled __read_mostly;
12237@@ -50,7 +51,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
12238 if (!cpu_has(c, X86_FEATURE_MCE))
12239 return;
12240
12241+ pax_open_kernel();
12242 machine_check_vector = pentium_machine_check;
12243+ pax_close_kernel();
12244 /* Make sure the vector pointer is visible before we enable MCEs: */
12245 wmb();
12246
12247diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
12248index 54060f5..c1a7577 100644
12249--- a/arch/x86/kernel/cpu/mcheck/winchip.c
12250+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
12251@@ -11,6 +11,7 @@
12252 #include <asm/system.h>
12253 #include <asm/mce.h>
12254 #include <asm/msr.h>
12255+#include <asm/pgtable.h>
12256
12257 /* Machine check handler for WinChip C6: */
12258 static void winchip_machine_check(struct pt_regs *regs, long error_code)
12259@@ -24,7 +25,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
12260 {
12261 u32 lo, hi;
12262
12263+ pax_open_kernel();
12264 machine_check_vector = winchip_machine_check;
12265+ pax_close_kernel();
12266 /* Make sure the vector pointer is visible before we enable MCEs: */
12267 wmb();
12268
12269diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
12270index 6b96110..0da73eb 100644
12271--- a/arch/x86/kernel/cpu/mtrr/main.c
12272+++ b/arch/x86/kernel/cpu/mtrr/main.c
12273@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
12274 u64 size_or_mask, size_and_mask;
12275 static bool mtrr_aps_delayed_init;
12276
12277-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
12278+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
12279
12280 const struct mtrr_ops *mtrr_if;
12281
12282diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
12283index df5e41f..816c719 100644
12284--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
12285+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
12286@@ -25,7 +25,7 @@ struct mtrr_ops {
12287 int (*validate_add_page)(unsigned long base, unsigned long size,
12288 unsigned int type);
12289 int (*have_wrcomb)(void);
12290-};
12291+} __do_const;
12292
12293 extern int generic_get_free_region(unsigned long base, unsigned long size,
12294 int replace_reg);
12295diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
12296index 2bda212..78cc605 100644
12297--- a/arch/x86/kernel/cpu/perf_event.c
12298+++ b/arch/x86/kernel/cpu/perf_event.c
12299@@ -1529,7 +1529,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
12300 break;
12301
12302 perf_callchain_store(entry, frame.return_address);
12303- fp = frame.next_frame;
12304+ fp = (const void __force_user *)frame.next_frame;
12305 }
12306 }
12307
12308diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
12309index 13ad899..f642b9a 100644
12310--- a/arch/x86/kernel/crash.c
12311+++ b/arch/x86/kernel/crash.c
12312@@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
12313 {
12314 #ifdef CONFIG_X86_32
12315 struct pt_regs fixed_regs;
12316-#endif
12317
12318-#ifdef CONFIG_X86_32
12319- if (!user_mode_vm(regs)) {
12320+ if (!user_mode(regs)) {
12321 crash_fixup_ss_esp(&fixed_regs, regs);
12322 regs = &fixed_regs;
12323 }
12324diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
12325index 37250fe..bf2ec74 100644
12326--- a/arch/x86/kernel/doublefault_32.c
12327+++ b/arch/x86/kernel/doublefault_32.c
12328@@ -11,7 +11,7 @@
12329
12330 #define DOUBLEFAULT_STACKSIZE (1024)
12331 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
12332-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
12333+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
12334
12335 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
12336
12337@@ -21,7 +21,7 @@ static void doublefault_fn(void)
12338 unsigned long gdt, tss;
12339
12340 store_gdt(&gdt_desc);
12341- gdt = gdt_desc.address;
12342+ gdt = (unsigned long)gdt_desc.address;
12343
12344 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
12345
12346@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
12347 /* 0x2 bit is always set */
12348 .flags = X86_EFLAGS_SF | 0x2,
12349 .sp = STACK_START,
12350- .es = __USER_DS,
12351+ .es = __KERNEL_DS,
12352 .cs = __KERNEL_CS,
12353 .ss = __KERNEL_DS,
12354- .ds = __USER_DS,
12355+ .ds = __KERNEL_DS,
12356 .fs = __KERNEL_PERCPU,
12357
12358 .__cr3 = __pa_nodebug(swapper_pg_dir),
12359diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
12360index 1aae78f..aab3a3d 100644
12361--- a/arch/x86/kernel/dumpstack.c
12362+++ b/arch/x86/kernel/dumpstack.c
12363@@ -2,6 +2,9 @@
12364 * Copyright (C) 1991, 1992 Linus Torvalds
12365 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
12366 */
12367+#ifdef CONFIG_GRKERNSEC_HIDESYM
12368+#define __INCLUDED_BY_HIDESYM 1
12369+#endif
12370 #include <linux/kallsyms.h>
12371 #include <linux/kprobes.h>
12372 #include <linux/uaccess.h>
12373@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable)
12374 static void
12375 print_ftrace_graph_addr(unsigned long addr, void *data,
12376 const struct stacktrace_ops *ops,
12377- struct thread_info *tinfo, int *graph)
12378+ struct task_struct *task, int *graph)
12379 {
12380- struct task_struct *task = tinfo->task;
12381 unsigned long ret_addr;
12382 int index = task->curr_ret_stack;
12383
12384@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
12385 static inline void
12386 print_ftrace_graph_addr(unsigned long addr, void *data,
12387 const struct stacktrace_ops *ops,
12388- struct thread_info *tinfo, int *graph)
12389+ struct task_struct *task, int *graph)
12390 { }
12391 #endif
12392
12393@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
12394 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
12395 */
12396
12397-static inline int valid_stack_ptr(struct thread_info *tinfo,
12398- void *p, unsigned int size, void *end)
12399+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
12400 {
12401- void *t = tinfo;
12402 if (end) {
12403 if (p < end && p >= (end-THREAD_SIZE))
12404 return 1;
12405@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
12406 }
12407
12408 unsigned long
12409-print_context_stack(struct thread_info *tinfo,
12410+print_context_stack(struct task_struct *task, void *stack_start,
12411 unsigned long *stack, unsigned long bp,
12412 const struct stacktrace_ops *ops, void *data,
12413 unsigned long *end, int *graph)
12414 {
12415 struct stack_frame *frame = (struct stack_frame *)bp;
12416
12417- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
12418+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
12419 unsigned long addr;
12420
12421 addr = *stack;
12422@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo,
12423 } else {
12424 ops->address(data, addr, 0);
12425 }
12426- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
12427+ print_ftrace_graph_addr(addr, data, ops, task, graph);
12428 }
12429 stack++;
12430 }
12431@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
12432 EXPORT_SYMBOL_GPL(print_context_stack);
12433
12434 unsigned long
12435-print_context_stack_bp(struct thread_info *tinfo,
12436+print_context_stack_bp(struct task_struct *task, void *stack_start,
12437 unsigned long *stack, unsigned long bp,
12438 const struct stacktrace_ops *ops, void *data,
12439 unsigned long *end, int *graph)
12440@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo,
12441 struct stack_frame *frame = (struct stack_frame *)bp;
12442 unsigned long *ret_addr = &frame->return_address;
12443
12444- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
12445+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
12446 unsigned long addr = *ret_addr;
12447
12448 if (!__kernel_text_address(addr))
12449@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
12450 ops->address(data, addr, 1);
12451 frame = frame->next_frame;
12452 ret_addr = &frame->return_address;
12453- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
12454+ print_ftrace_graph_addr(addr, data, ops, task, graph);
12455 }
12456
12457 return (unsigned long)frame;
12458@@ -186,7 +186,7 @@ void dump_stack(void)
12459
12460 bp = stack_frame(current, NULL);
12461 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
12462- current->pid, current->comm, print_tainted(),
12463+ task_pid_nr(current), current->comm, print_tainted(),
12464 init_utsname()->release,
12465 (int)strcspn(init_utsname()->version, " "),
12466 init_utsname()->version);
12467@@ -222,6 +222,8 @@ unsigned __kprobes long oops_begin(void)
12468 }
12469 EXPORT_SYMBOL_GPL(oops_begin);
12470
12471+extern void gr_handle_kernel_exploit(void);
12472+
12473 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
12474 {
12475 if (regs && kexec_should_crash(current))
12476@@ -243,7 +245,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
12477 panic("Fatal exception in interrupt");
12478 if (panic_on_oops)
12479 panic("Fatal exception");
12480- do_exit(signr);
12481+
12482+ gr_handle_kernel_exploit();
12483+
12484+ do_group_exit(signr);
12485 }
12486
12487 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
12488@@ -269,7 +274,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
12489
12490 show_registers(regs);
12491 #ifdef CONFIG_X86_32
12492- if (user_mode_vm(regs)) {
12493+ if (user_mode(regs)) {
12494 sp = regs->sp;
12495 ss = regs->ss & 0xffff;
12496 } else {
12497@@ -297,7 +302,7 @@ void die(const char *str, struct pt_regs *regs, long err)
12498 unsigned long flags = oops_begin();
12499 int sig = SIGSEGV;
12500
12501- if (!user_mode_vm(regs))
12502+ if (!user_mode(regs))
12503 report_bug(regs->ip, regs);
12504
12505 if (__die(str, regs, err))
12506diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
12507index c99f9ed..2a15d80 100644
12508--- a/arch/x86/kernel/dumpstack_32.c
12509+++ b/arch/x86/kernel/dumpstack_32.c
12510@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
12511 bp = stack_frame(task, regs);
12512
12513 for (;;) {
12514- struct thread_info *context;
12515+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
12516
12517- context = (struct thread_info *)
12518- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
12519- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
12520+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
12521
12522- stack = (unsigned long *)context->previous_esp;
12523- if (!stack)
12524+ if (stack_start == task_stack_page(task))
12525 break;
12526+ stack = *(unsigned long **)stack_start;
12527 if (ops->stack(data, "IRQ") < 0)
12528 break;
12529 touch_nmi_watchdog();
12530@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs)
12531 * When in-kernel, we also print out the stack and code at the
12532 * time of the fault..
12533 */
12534- if (!user_mode_vm(regs)) {
12535+ if (!user_mode(regs)) {
12536 unsigned int code_prologue = code_bytes * 43 / 64;
12537 unsigned int code_len = code_bytes;
12538 unsigned char c;
12539 u8 *ip;
12540+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
12541
12542 printk(KERN_EMERG "Stack:\n");
12543 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
12544
12545 printk(KERN_EMERG "Code: ");
12546
12547- ip = (u8 *)regs->ip - code_prologue;
12548+ ip = (u8 *)regs->ip - code_prologue + cs_base;
12549 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
12550 /* try starting at IP */
12551- ip = (u8 *)regs->ip;
12552+ ip = (u8 *)regs->ip + cs_base;
12553 code_len = code_len - code_prologue + 1;
12554 }
12555 for (i = 0; i < code_len; i++, ip++) {
12556@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs)
12557 printk(KERN_CONT " Bad EIP value.");
12558 break;
12559 }
12560- if (ip == (u8 *)regs->ip)
12561+ if (ip == (u8 *)regs->ip + cs_base)
12562 printk(KERN_CONT "<%02x> ", c);
12563 else
12564 printk(KERN_CONT "%02x ", c);
12565@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
12566 {
12567 unsigned short ud2;
12568
12569+ ip = ktla_ktva(ip);
12570 if (ip < PAGE_OFFSET)
12571 return 0;
12572 if (probe_kernel_address((unsigned short *)ip, ud2))
12573@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
12574
12575 return ud2 == 0x0b0f;
12576 }
12577+
12578+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
12579+void pax_check_alloca(unsigned long size)
12580+{
12581+ unsigned long sp = (unsigned long)&sp, stack_left;
12582+
12583+ /* all kernel stacks are of the same size */
12584+ stack_left = sp & (THREAD_SIZE - 1);
12585+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
12586+}
12587+EXPORT_SYMBOL(pax_check_alloca);
12588+#endif
12589diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
12590index 6d728d9..279514e 100644
12591--- a/arch/x86/kernel/dumpstack_64.c
12592+++ b/arch/x86/kernel/dumpstack_64.c
12593@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
12594 unsigned long *irq_stack_end =
12595 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
12596 unsigned used = 0;
12597- struct thread_info *tinfo;
12598 int graph = 0;
12599 unsigned long dummy;
12600+ void *stack_start;
12601
12602 if (!task)
12603 task = current;
12604@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
12605 * current stack address. If the stacks consist of nested
12606 * exceptions
12607 */
12608- tinfo = task_thread_info(task);
12609 for (;;) {
12610 char *id;
12611 unsigned long *estack_end;
12612+
12613 estack_end = in_exception_stack(cpu, (unsigned long)stack,
12614 &used, &id);
12615
12616@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
12617 if (ops->stack(data, id) < 0)
12618 break;
12619
12620- bp = ops->walk_stack(tinfo, stack, bp, ops,
12621+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
12622 data, estack_end, &graph);
12623 ops->stack(data, "<EOE>");
12624 /*
12625@@ -172,7 +172,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
12626 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
12627 if (ops->stack(data, "IRQ") < 0)
12628 break;
12629- bp = ops->walk_stack(tinfo, stack, bp,
12630+ bp = ops->walk_stack(task, irq_stack, stack, bp,
12631 ops, data, irq_stack_end, &graph);
12632 /*
12633 * We link to the next stack (which would be
12634@@ -191,7 +191,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
12635 /*
12636 * This handles the process stack:
12637 */
12638- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
12639+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
12640+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
12641 put_cpu();
12642 }
12643 EXPORT_SYMBOL(dump_trace);
12644@@ -305,3 +306,50 @@ int is_valid_bugaddr(unsigned long ip)
12645
12646 return ud2 == 0x0b0f;
12647 }
12648+
12649+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
12650+void pax_check_alloca(unsigned long size)
12651+{
12652+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
12653+ unsigned cpu, used;
12654+ char *id;
12655+
12656+ /* check the process stack first */
12657+ stack_start = (unsigned long)task_stack_page(current);
12658+ stack_end = stack_start + THREAD_SIZE;
12659+ if (likely(stack_start <= sp && sp < stack_end)) {
12660+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
12661+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
12662+ return;
12663+ }
12664+
12665+ cpu = get_cpu();
12666+
12667+ /* check the irq stacks */
12668+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
12669+ stack_start = stack_end - IRQ_STACK_SIZE;
12670+ if (stack_start <= sp && sp < stack_end) {
12671+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
12672+ put_cpu();
12673+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
12674+ return;
12675+ }
12676+
12677+ /* check the exception stacks */
12678+ used = 0;
12679+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
12680+ stack_start = stack_end - EXCEPTION_STKSZ;
12681+ if (stack_end && stack_start <= sp && sp < stack_end) {
12682+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
12683+ put_cpu();
12684+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
12685+ return;
12686+ }
12687+
12688+ put_cpu();
12689+
12690+ /* unknown stack */
12691+ BUG();
12692+}
12693+EXPORT_SYMBOL(pax_check_alloca);
12694+#endif
12695diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
12696index cd28a35..c72ed9a 100644
12697--- a/arch/x86/kernel/early_printk.c
12698+++ b/arch/x86/kernel/early_printk.c
12699@@ -7,6 +7,7 @@
12700 #include <linux/pci_regs.h>
12701 #include <linux/pci_ids.h>
12702 #include <linux/errno.h>
12703+#include <linux/sched.h>
12704 #include <asm/io.h>
12705 #include <asm/processor.h>
12706 #include <asm/fcntl.h>
12707diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
12708index f3f6f53..0841b66 100644
12709--- a/arch/x86/kernel/entry_32.S
12710+++ b/arch/x86/kernel/entry_32.S
12711@@ -186,13 +186,146 @@
12712 /*CFI_REL_OFFSET gs, PT_GS*/
12713 .endm
12714 .macro SET_KERNEL_GS reg
12715+
12716+#ifdef CONFIG_CC_STACKPROTECTOR
12717 movl $(__KERNEL_STACK_CANARY), \reg
12718+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
12719+ movl $(__USER_DS), \reg
12720+#else
12721+ xorl \reg, \reg
12722+#endif
12723+
12724 movl \reg, %gs
12725 .endm
12726
12727 #endif /* CONFIG_X86_32_LAZY_GS */
12728
12729-.macro SAVE_ALL
12730+.macro pax_enter_kernel
12731+#ifdef CONFIG_PAX_KERNEXEC
12732+ call pax_enter_kernel
12733+#endif
12734+.endm
12735+
12736+.macro pax_exit_kernel
12737+#ifdef CONFIG_PAX_KERNEXEC
12738+ call pax_exit_kernel
12739+#endif
12740+.endm
12741+
12742+#ifdef CONFIG_PAX_KERNEXEC
12743+ENTRY(pax_enter_kernel)
12744+#ifdef CONFIG_PARAVIRT
12745+ pushl %eax
12746+ pushl %ecx
12747+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
12748+ mov %eax, %esi
12749+#else
12750+ mov %cr0, %esi
12751+#endif
12752+ bts $16, %esi
12753+ jnc 1f
12754+ mov %cs, %esi
12755+ cmp $__KERNEL_CS, %esi
12756+ jz 3f
12757+ ljmp $__KERNEL_CS, $3f
12758+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
12759+2:
12760+#ifdef CONFIG_PARAVIRT
12761+ mov %esi, %eax
12762+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
12763+#else
12764+ mov %esi, %cr0
12765+#endif
12766+3:
12767+#ifdef CONFIG_PARAVIRT
12768+ popl %ecx
12769+ popl %eax
12770+#endif
12771+ ret
12772+ENDPROC(pax_enter_kernel)
12773+
12774+ENTRY(pax_exit_kernel)
12775+#ifdef CONFIG_PARAVIRT
12776+ pushl %eax
12777+ pushl %ecx
12778+#endif
12779+ mov %cs, %esi
12780+ cmp $__KERNEXEC_KERNEL_CS, %esi
12781+ jnz 2f
12782+#ifdef CONFIG_PARAVIRT
12783+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
12784+ mov %eax, %esi
12785+#else
12786+ mov %cr0, %esi
12787+#endif
12788+ btr $16, %esi
12789+ ljmp $__KERNEL_CS, $1f
12790+1:
12791+#ifdef CONFIG_PARAVIRT
12792+ mov %esi, %eax
12793+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
12794+#else
12795+ mov %esi, %cr0
12796+#endif
12797+2:
12798+#ifdef CONFIG_PARAVIRT
12799+ popl %ecx
12800+ popl %eax
12801+#endif
12802+ ret
12803+ENDPROC(pax_exit_kernel)
12804+#endif
12805+
12806+.macro pax_erase_kstack
12807+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
12808+ call pax_erase_kstack
12809+#endif
12810+.endm
12811+
12812+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
12813+/*
12814+ * ebp: thread_info
12815+ * ecx, edx: can be clobbered
12816+ */
12817+ENTRY(pax_erase_kstack)
12818+ pushl %edi
12819+ pushl %eax
12820+
12821+ mov TI_lowest_stack(%ebp), %edi
12822+ mov $-0xBEEF, %eax
12823+ std
12824+
12825+1: mov %edi, %ecx
12826+ and $THREAD_SIZE_asm - 1, %ecx
12827+ shr $2, %ecx
12828+ repne scasl
12829+ jecxz 2f
12830+
12831+ cmp $2*16, %ecx
12832+ jc 2f
12833+
12834+ mov $2*16, %ecx
12835+ repe scasl
12836+ jecxz 2f
12837+ jne 1b
12838+
12839+2: cld
12840+ mov %esp, %ecx
12841+ sub %edi, %ecx
12842+ shr $2, %ecx
12843+ rep stosl
12844+
12845+ mov TI_task_thread_sp0(%ebp), %edi
12846+ sub $128, %edi
12847+ mov %edi, TI_lowest_stack(%ebp)
12848+
12849+ popl %eax
12850+ popl %edi
12851+ ret
12852+ENDPROC(pax_erase_kstack)
12853+#endif
12854+
12855+.macro __SAVE_ALL _DS
12856 cld
12857 PUSH_GS
12858 pushl_cfi %fs
12859@@ -215,7 +348,7 @@
12860 CFI_REL_OFFSET ecx, 0
12861 pushl_cfi %ebx
12862 CFI_REL_OFFSET ebx, 0
12863- movl $(__USER_DS), %edx
12864+ movl $\_DS, %edx
12865 movl %edx, %ds
12866 movl %edx, %es
12867 movl $(__KERNEL_PERCPU), %edx
12868@@ -223,6 +356,15 @@
12869 SET_KERNEL_GS %edx
12870 .endm
12871
12872+.macro SAVE_ALL
12873+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
12874+ __SAVE_ALL __KERNEL_DS
12875+ pax_enter_kernel
12876+#else
12877+ __SAVE_ALL __USER_DS
12878+#endif
12879+.endm
12880+
12881 .macro RESTORE_INT_REGS
12882 popl_cfi %ebx
12883 CFI_RESTORE ebx
12884@@ -308,7 +450,7 @@ ENTRY(ret_from_fork)
12885 popfl_cfi
12886 jmp syscall_exit
12887 CFI_ENDPROC
12888-END(ret_from_fork)
12889+ENDPROC(ret_from_fork)
12890
12891 /*
12892 * Interrupt exit functions should be protected against kprobes
12893@@ -333,7 +475,15 @@ check_userspace:
12894 movb PT_CS(%esp), %al
12895 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
12896 cmpl $USER_RPL, %eax
12897+
12898+#ifdef CONFIG_PAX_KERNEXEC
12899+ jae resume_userspace
12900+
12901+ PAX_EXIT_KERNEL
12902+ jmp resume_kernel
12903+#else
12904 jb resume_kernel # not returning to v8086 or userspace
12905+#endif
12906
12907 ENTRY(resume_userspace)
12908 LOCKDEP_SYS_EXIT
12909@@ -345,8 +495,8 @@ ENTRY(resume_userspace)
12910 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
12911 # int/exception return?
12912 jne work_pending
12913- jmp restore_all
12914-END(ret_from_exception)
12915+ jmp restore_all_pax
12916+ENDPROC(ret_from_exception)
12917
12918 #ifdef CONFIG_PREEMPT
12919 ENTRY(resume_kernel)
12920@@ -361,7 +511,7 @@ need_resched:
12921 jz restore_all
12922 call preempt_schedule_irq
12923 jmp need_resched
12924-END(resume_kernel)
12925+ENDPROC(resume_kernel)
12926 #endif
12927 CFI_ENDPROC
12928 /*
12929@@ -395,23 +545,34 @@ sysenter_past_esp:
12930 /*CFI_REL_OFFSET cs, 0*/
12931 /*
12932 * Push current_thread_info()->sysenter_return to the stack.
12933- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
12934- * pushed above; +8 corresponds to copy_thread's esp0 setting.
12935 */
12936- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
12937+ pushl_cfi $0
12938 CFI_REL_OFFSET eip, 0
12939
12940 pushl_cfi %eax
12941 SAVE_ALL
12942+ GET_THREAD_INFO(%ebp)
12943+ movl TI_sysenter_return(%ebp),%ebp
12944+ movl %ebp,PT_EIP(%esp)
12945 ENABLE_INTERRUPTS(CLBR_NONE)
12946
12947 /*
12948 * Load the potential sixth argument from user stack.
12949 * Careful about security.
12950 */
12951+ movl PT_OLDESP(%esp),%ebp
12952+
12953+#ifdef CONFIG_PAX_MEMORY_UDEREF
12954+ mov PT_OLDSS(%esp),%ds
12955+1: movl %ds:(%ebp),%ebp
12956+ push %ss
12957+ pop %ds
12958+#else
12959 cmpl $__PAGE_OFFSET-3,%ebp
12960 jae syscall_fault
12961 1: movl (%ebp),%ebp
12962+#endif
12963+
12964 movl %ebp,PT_EBP(%esp)
12965 .section __ex_table,"a"
12966 .align 4
12967@@ -434,12 +595,24 @@ sysenter_do_call:
12968 testl $_TIF_ALLWORK_MASK, %ecx
12969 jne sysexit_audit
12970 sysenter_exit:
12971+
12972+#ifdef CONFIG_PAX_RANDKSTACK
12973+ pushl_cfi %eax
12974+ movl %esp, %eax
12975+ call pax_randomize_kstack
12976+ popl_cfi %eax
12977+#endif
12978+
12979+ pax_erase_kstack
12980+
12981 /* if something modifies registers it must also disable sysexit */
12982 movl PT_EIP(%esp), %edx
12983 movl PT_OLDESP(%esp), %ecx
12984 xorl %ebp,%ebp
12985 TRACE_IRQS_ON
12986 1: mov PT_FS(%esp), %fs
12987+2: mov PT_DS(%esp), %ds
12988+3: mov PT_ES(%esp), %es
12989 PTGS_TO_GS
12990 ENABLE_INTERRUPTS_SYSEXIT
12991
12992@@ -456,6 +629,9 @@ sysenter_audit:
12993 movl %eax,%edx /* 2nd arg: syscall number */
12994 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
12995 call audit_syscall_entry
12996+
12997+ pax_erase_kstack
12998+
12999 pushl_cfi %ebx
13000 movl PT_EAX(%esp),%eax /* reload syscall number */
13001 jmp sysenter_do_call
13002@@ -482,11 +658,17 @@ sysexit_audit:
13003
13004 CFI_ENDPROC
13005 .pushsection .fixup,"ax"
13006-2: movl $0,PT_FS(%esp)
13007+4: movl $0,PT_FS(%esp)
13008+ jmp 1b
13009+5: movl $0,PT_DS(%esp)
13010+ jmp 1b
13011+6: movl $0,PT_ES(%esp)
13012 jmp 1b
13013 .section __ex_table,"a"
13014 .align 4
13015- .long 1b,2b
13016+ .long 1b,4b
13017+ .long 2b,5b
13018+ .long 3b,6b
13019 .popsection
13020 PTGS_TO_GS_EX
13021 ENDPROC(ia32_sysenter_target)
13022@@ -519,6 +701,15 @@ syscall_exit:
13023 testl $_TIF_ALLWORK_MASK, %ecx # current->work
13024 jne syscall_exit_work
13025
13026+restore_all_pax:
13027+
13028+#ifdef CONFIG_PAX_RANDKSTACK
13029+ movl %esp, %eax
13030+ call pax_randomize_kstack
13031+#endif
13032+
13033+ pax_erase_kstack
13034+
13035 restore_all:
13036 TRACE_IRQS_IRET
13037 restore_all_notrace:
13038@@ -578,14 +769,34 @@ ldt_ss:
13039 * compensating for the offset by changing to the ESPFIX segment with
13040 * a base address that matches for the difference.
13041 */
13042-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
13043+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
13044 mov %esp, %edx /* load kernel esp */
13045 mov PT_OLDESP(%esp), %eax /* load userspace esp */
13046 mov %dx, %ax /* eax: new kernel esp */
13047 sub %eax, %edx /* offset (low word is 0) */
13048+#ifdef CONFIG_SMP
13049+ movl PER_CPU_VAR(cpu_number), %ebx
13050+ shll $PAGE_SHIFT_asm, %ebx
13051+ addl $cpu_gdt_table, %ebx
13052+#else
13053+ movl $cpu_gdt_table, %ebx
13054+#endif
13055 shr $16, %edx
13056- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
13057- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
13058+
13059+#ifdef CONFIG_PAX_KERNEXEC
13060+ mov %cr0, %esi
13061+ btr $16, %esi
13062+ mov %esi, %cr0
13063+#endif
13064+
13065+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
13066+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
13067+
13068+#ifdef CONFIG_PAX_KERNEXEC
13069+ bts $16, %esi
13070+ mov %esi, %cr0
13071+#endif
13072+
13073 pushl_cfi $__ESPFIX_SS
13074 pushl_cfi %eax /* new kernel esp */
13075 /* Disable interrupts, but do not irqtrace this section: we
13076@@ -614,34 +825,28 @@ work_resched:
13077 movl TI_flags(%ebp), %ecx
13078 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
13079 # than syscall tracing?
13080- jz restore_all
13081+ jz restore_all_pax
13082 testb $_TIF_NEED_RESCHED, %cl
13083 jnz work_resched
13084
13085 work_notifysig: # deal with pending signals and
13086 # notify-resume requests
13087+ movl %esp, %eax
13088 #ifdef CONFIG_VM86
13089 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
13090- movl %esp, %eax
13091- jne work_notifysig_v86 # returning to kernel-space or
13092+ jz 1f # returning to kernel-space or
13093 # vm86-space
13094- xorl %edx, %edx
13095- call do_notify_resume
13096- jmp resume_userspace_sig
13097
13098- ALIGN
13099-work_notifysig_v86:
13100 pushl_cfi %ecx # save ti_flags for do_notify_resume
13101 call save_v86_state # %eax contains pt_regs pointer
13102 popl_cfi %ecx
13103 movl %eax, %esp
13104-#else
13105- movl %esp, %eax
13106+1:
13107 #endif
13108 xorl %edx, %edx
13109 call do_notify_resume
13110 jmp resume_userspace_sig
13111-END(work_pending)
13112+ENDPROC(work_pending)
13113
13114 # perform syscall exit tracing
13115 ALIGN
13116@@ -649,11 +854,14 @@ syscall_trace_entry:
13117 movl $-ENOSYS,PT_EAX(%esp)
13118 movl %esp, %eax
13119 call syscall_trace_enter
13120+
13121+ pax_erase_kstack
13122+
13123 /* What it returned is what we'll actually use. */
13124 cmpl $(nr_syscalls), %eax
13125 jnae syscall_call
13126 jmp syscall_exit
13127-END(syscall_trace_entry)
13128+ENDPROC(syscall_trace_entry)
13129
13130 # perform syscall exit tracing
13131 ALIGN
13132@@ -666,20 +874,24 @@ syscall_exit_work:
13133 movl %esp, %eax
13134 call syscall_trace_leave
13135 jmp resume_userspace
13136-END(syscall_exit_work)
13137+ENDPROC(syscall_exit_work)
13138 CFI_ENDPROC
13139
13140 RING0_INT_FRAME # can't unwind into user space anyway
13141 syscall_fault:
13142+#ifdef CONFIG_PAX_MEMORY_UDEREF
13143+ push %ss
13144+ pop %ds
13145+#endif
13146 GET_THREAD_INFO(%ebp)
13147 movl $-EFAULT,PT_EAX(%esp)
13148 jmp resume_userspace
13149-END(syscall_fault)
13150+ENDPROC(syscall_fault)
13151
13152 syscall_badsys:
13153 movl $-ENOSYS,PT_EAX(%esp)
13154 jmp resume_userspace
13155-END(syscall_badsys)
13156+ENDPROC(syscall_badsys)
13157 CFI_ENDPROC
13158 /*
13159 * End of kprobes section
13160@@ -753,6 +965,36 @@ ptregs_clone:
13161 CFI_ENDPROC
13162 ENDPROC(ptregs_clone)
13163
13164+ ALIGN;
13165+ENTRY(kernel_execve)
13166+ CFI_STARTPROC
13167+ pushl_cfi %ebp
13168+ sub $PT_OLDSS+4,%esp
13169+ pushl_cfi %edi
13170+ pushl_cfi %ecx
13171+ pushl_cfi %eax
13172+ lea 3*4(%esp),%edi
13173+ mov $PT_OLDSS/4+1,%ecx
13174+ xorl %eax,%eax
13175+ rep stosl
13176+ popl_cfi %eax
13177+ popl_cfi %ecx
13178+ popl_cfi %edi
13179+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
13180+ pushl_cfi %esp
13181+ call sys_execve
13182+ add $4,%esp
13183+ CFI_ADJUST_CFA_OFFSET -4
13184+ GET_THREAD_INFO(%ebp)
13185+ test %eax,%eax
13186+ jz syscall_exit
13187+ add $PT_OLDSS+4,%esp
13188+ CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
13189+ popl_cfi %ebp
13190+ ret
13191+ CFI_ENDPROC
13192+ENDPROC(kernel_execve)
13193+
13194 .macro FIXUP_ESPFIX_STACK
13195 /*
13196 * Switch back for ESPFIX stack to the normal zerobased stack
13197@@ -762,8 +1004,15 @@ ENDPROC(ptregs_clone)
13198 * normal stack and adjusts ESP with the matching offset.
13199 */
13200 /* fixup the stack */
13201- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
13202- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
13203+#ifdef CONFIG_SMP
13204+ movl PER_CPU_VAR(cpu_number), %ebx
13205+ shll $PAGE_SHIFT_asm, %ebx
13206+ addl $cpu_gdt_table, %ebx
13207+#else
13208+ movl $cpu_gdt_table, %ebx
13209+#endif
13210+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
13211+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
13212 shl $16, %eax
13213 addl %esp, %eax /* the adjusted stack pointer */
13214 pushl_cfi $__KERNEL_DS
13215@@ -816,7 +1065,7 @@ vector=vector+1
13216 .endr
13217 2: jmp common_interrupt
13218 .endr
13219-END(irq_entries_start)
13220+ENDPROC(irq_entries_start)
13221
13222 .previous
13223 END(interrupt)
13224@@ -864,7 +1113,7 @@ ENTRY(coprocessor_error)
13225 pushl_cfi $do_coprocessor_error
13226 jmp error_code
13227 CFI_ENDPROC
13228-END(coprocessor_error)
13229+ENDPROC(coprocessor_error)
13230
13231 ENTRY(simd_coprocessor_error)
13232 RING0_INT_FRAME
13233@@ -885,7 +1134,7 @@ ENTRY(simd_coprocessor_error)
13234 #endif
13235 jmp error_code
13236 CFI_ENDPROC
13237-END(simd_coprocessor_error)
13238+ENDPROC(simd_coprocessor_error)
13239
13240 ENTRY(device_not_available)
13241 RING0_INT_FRAME
13242@@ -893,7 +1142,7 @@ ENTRY(device_not_available)
13243 pushl_cfi $do_device_not_available
13244 jmp error_code
13245 CFI_ENDPROC
13246-END(device_not_available)
13247+ENDPROC(device_not_available)
13248
13249 #ifdef CONFIG_PARAVIRT
13250 ENTRY(native_iret)
13251@@ -902,12 +1151,12 @@ ENTRY(native_iret)
13252 .align 4
13253 .long native_iret, iret_exc
13254 .previous
13255-END(native_iret)
13256+ENDPROC(native_iret)
13257
13258 ENTRY(native_irq_enable_sysexit)
13259 sti
13260 sysexit
13261-END(native_irq_enable_sysexit)
13262+ENDPROC(native_irq_enable_sysexit)
13263 #endif
13264
13265 ENTRY(overflow)
13266@@ -916,7 +1165,7 @@ ENTRY(overflow)
13267 pushl_cfi $do_overflow
13268 jmp error_code
13269 CFI_ENDPROC
13270-END(overflow)
13271+ENDPROC(overflow)
13272
13273 ENTRY(bounds)
13274 RING0_INT_FRAME
13275@@ -924,7 +1173,7 @@ ENTRY(bounds)
13276 pushl_cfi $do_bounds
13277 jmp error_code
13278 CFI_ENDPROC
13279-END(bounds)
13280+ENDPROC(bounds)
13281
13282 ENTRY(invalid_op)
13283 RING0_INT_FRAME
13284@@ -932,7 +1181,7 @@ ENTRY(invalid_op)
13285 pushl_cfi $do_invalid_op
13286 jmp error_code
13287 CFI_ENDPROC
13288-END(invalid_op)
13289+ENDPROC(invalid_op)
13290
13291 ENTRY(coprocessor_segment_overrun)
13292 RING0_INT_FRAME
13293@@ -940,35 +1189,35 @@ ENTRY(coprocessor_segment_overrun)
13294 pushl_cfi $do_coprocessor_segment_overrun
13295 jmp error_code
13296 CFI_ENDPROC
13297-END(coprocessor_segment_overrun)
13298+ENDPROC(coprocessor_segment_overrun)
13299
13300 ENTRY(invalid_TSS)
13301 RING0_EC_FRAME
13302 pushl_cfi $do_invalid_TSS
13303 jmp error_code
13304 CFI_ENDPROC
13305-END(invalid_TSS)
13306+ENDPROC(invalid_TSS)
13307
13308 ENTRY(segment_not_present)
13309 RING0_EC_FRAME
13310 pushl_cfi $do_segment_not_present
13311 jmp error_code
13312 CFI_ENDPROC
13313-END(segment_not_present)
13314+ENDPROC(segment_not_present)
13315
13316 ENTRY(stack_segment)
13317 RING0_EC_FRAME
13318 pushl_cfi $do_stack_segment
13319 jmp error_code
13320 CFI_ENDPROC
13321-END(stack_segment)
13322+ENDPROC(stack_segment)
13323
13324 ENTRY(alignment_check)
13325 RING0_EC_FRAME
13326 pushl_cfi $do_alignment_check
13327 jmp error_code
13328 CFI_ENDPROC
13329-END(alignment_check)
13330+ENDPROC(alignment_check)
13331
13332 ENTRY(divide_error)
13333 RING0_INT_FRAME
13334@@ -976,7 +1225,7 @@ ENTRY(divide_error)
13335 pushl_cfi $do_divide_error
13336 jmp error_code
13337 CFI_ENDPROC
13338-END(divide_error)
13339+ENDPROC(divide_error)
13340
13341 #ifdef CONFIG_X86_MCE
13342 ENTRY(machine_check)
13343@@ -985,7 +1234,7 @@ ENTRY(machine_check)
13344 pushl_cfi machine_check_vector
13345 jmp error_code
13346 CFI_ENDPROC
13347-END(machine_check)
13348+ENDPROC(machine_check)
13349 #endif
13350
13351 ENTRY(spurious_interrupt_bug)
13352@@ -994,7 +1243,7 @@ ENTRY(spurious_interrupt_bug)
13353 pushl_cfi $do_spurious_interrupt_bug
13354 jmp error_code
13355 CFI_ENDPROC
13356-END(spurious_interrupt_bug)
13357+ENDPROC(spurious_interrupt_bug)
13358 /*
13359 * End of kprobes section
13360 */
13361@@ -1109,7 +1358,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
13362
13363 ENTRY(mcount)
13364 ret
13365-END(mcount)
13366+ENDPROC(mcount)
13367
13368 ENTRY(ftrace_caller)
13369 cmpl $0, function_trace_stop
13370@@ -1138,7 +1387,7 @@ ftrace_graph_call:
13371 .globl ftrace_stub
13372 ftrace_stub:
13373 ret
13374-END(ftrace_caller)
13375+ENDPROC(ftrace_caller)
13376
13377 #else /* ! CONFIG_DYNAMIC_FTRACE */
13378
13379@@ -1174,7 +1423,7 @@ trace:
13380 popl %ecx
13381 popl %eax
13382 jmp ftrace_stub
13383-END(mcount)
13384+ENDPROC(mcount)
13385 #endif /* CONFIG_DYNAMIC_FTRACE */
13386 #endif /* CONFIG_FUNCTION_TRACER */
13387
13388@@ -1195,7 +1444,7 @@ ENTRY(ftrace_graph_caller)
13389 popl %ecx
13390 popl %eax
13391 ret
13392-END(ftrace_graph_caller)
13393+ENDPROC(ftrace_graph_caller)
13394
13395 .globl return_to_handler
13396 return_to_handler:
13397@@ -1209,7 +1458,6 @@ return_to_handler:
13398 jmp *%ecx
13399 #endif
13400
13401-.section .rodata,"a"
13402 #include "syscall_table_32.S"
13403
13404 syscall_table_size=(.-sys_call_table)
13405@@ -1255,15 +1503,18 @@ error_code:
13406 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
13407 REG_TO_PTGS %ecx
13408 SET_KERNEL_GS %ecx
13409- movl $(__USER_DS), %ecx
13410+ movl $(__KERNEL_DS), %ecx
13411 movl %ecx, %ds
13412 movl %ecx, %es
13413+
13414+ pax_enter_kernel
13415+
13416 TRACE_IRQS_OFF
13417 movl %esp,%eax # pt_regs pointer
13418 call *%edi
13419 jmp ret_from_exception
13420 CFI_ENDPROC
13421-END(page_fault)
13422+ENDPROC(page_fault)
13423
13424 /*
13425 * Debug traps and NMI can happen at the one SYSENTER instruction
13426@@ -1305,7 +1556,7 @@ debug_stack_correct:
13427 call do_debug
13428 jmp ret_from_exception
13429 CFI_ENDPROC
13430-END(debug)
13431+ENDPROC(debug)
13432
13433 /*
13434 * NMI is doubly nasty. It can happen _while_ we're handling
13435@@ -1342,6 +1593,9 @@ nmi_stack_correct:
13436 xorl %edx,%edx # zero error code
13437 movl %esp,%eax # pt_regs pointer
13438 call do_nmi
13439+
13440+ pax_exit_kernel
13441+
13442 jmp restore_all_notrace
13443 CFI_ENDPROC
13444
13445@@ -1378,12 +1632,15 @@ nmi_espfix_stack:
13446 FIXUP_ESPFIX_STACK # %eax == %esp
13447 xorl %edx,%edx # zero error code
13448 call do_nmi
13449+
13450+ pax_exit_kernel
13451+
13452 RESTORE_REGS
13453 lss 12+4(%esp), %esp # back to espfix stack
13454 CFI_ADJUST_CFA_OFFSET -24
13455 jmp irq_return
13456 CFI_ENDPROC
13457-END(nmi)
13458+ENDPROC(nmi)
13459
13460 ENTRY(int3)
13461 RING0_INT_FRAME
13462@@ -1395,14 +1652,14 @@ ENTRY(int3)
13463 call do_int3
13464 jmp ret_from_exception
13465 CFI_ENDPROC
13466-END(int3)
13467+ENDPROC(int3)
13468
13469 ENTRY(general_protection)
13470 RING0_EC_FRAME
13471 pushl_cfi $do_general_protection
13472 jmp error_code
13473 CFI_ENDPROC
13474-END(general_protection)
13475+ENDPROC(general_protection)
13476
13477 #ifdef CONFIG_KVM_GUEST
13478 ENTRY(async_page_fault)
13479@@ -1410,7 +1667,7 @@ ENTRY(async_page_fault)
13480 pushl_cfi $do_async_page_fault
13481 jmp error_code
13482 CFI_ENDPROC
13483-END(async_page_fault)
13484+ENDPROC(async_page_fault)
13485 #endif
13486
13487 /*
13488diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
13489index faf8d5e..f58c441 100644
13490--- a/arch/x86/kernel/entry_64.S
13491+++ b/arch/x86/kernel/entry_64.S
13492@@ -55,6 +55,8 @@
13493 #include <asm/paravirt.h>
13494 #include <asm/ftrace.h>
13495 #include <asm/percpu.h>
13496+#include <asm/pgtable.h>
13497+#include <asm/alternative-asm.h>
13498
13499 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
13500 #include <linux/elf-em.h>
13501@@ -68,8 +70,9 @@
13502 #ifdef CONFIG_FUNCTION_TRACER
13503 #ifdef CONFIG_DYNAMIC_FTRACE
13504 ENTRY(mcount)
13505+ pax_force_retaddr
13506 retq
13507-END(mcount)
13508+ENDPROC(mcount)
13509
13510 ENTRY(ftrace_caller)
13511 cmpl $0, function_trace_stop
13512@@ -92,8 +95,9 @@ GLOBAL(ftrace_graph_call)
13513 #endif
13514
13515 GLOBAL(ftrace_stub)
13516+ pax_force_retaddr
13517 retq
13518-END(ftrace_caller)
13519+ENDPROC(ftrace_caller)
13520
13521 #else /* ! CONFIG_DYNAMIC_FTRACE */
13522 ENTRY(mcount)
13523@@ -112,6 +116,7 @@ ENTRY(mcount)
13524 #endif
13525
13526 GLOBAL(ftrace_stub)
13527+ pax_force_retaddr
13528 retq
13529
13530 trace:
13531@@ -121,12 +126,13 @@ trace:
13532 movq 8(%rbp), %rsi
13533 subq $MCOUNT_INSN_SIZE, %rdi
13534
13535+ pax_force_fptr ftrace_trace_function
13536 call *ftrace_trace_function
13537
13538 MCOUNT_RESTORE_FRAME
13539
13540 jmp ftrace_stub
13541-END(mcount)
13542+ENDPROC(mcount)
13543 #endif /* CONFIG_DYNAMIC_FTRACE */
13544 #endif /* CONFIG_FUNCTION_TRACER */
13545
13546@@ -146,8 +152,9 @@ ENTRY(ftrace_graph_caller)
13547
13548 MCOUNT_RESTORE_FRAME
13549
13550+ pax_force_retaddr
13551 retq
13552-END(ftrace_graph_caller)
13553+ENDPROC(ftrace_graph_caller)
13554
13555 GLOBAL(return_to_handler)
13556 subq $24, %rsp
13557@@ -163,6 +170,7 @@ GLOBAL(return_to_handler)
13558 movq 8(%rsp), %rdx
13559 movq (%rsp), %rax
13560 addq $24, %rsp
13561+ pax_force_fptr %rdi
13562 jmp *%rdi
13563 #endif
13564
13565@@ -178,6 +186,282 @@ ENTRY(native_usergs_sysret64)
13566 ENDPROC(native_usergs_sysret64)
13567 #endif /* CONFIG_PARAVIRT */
13568
13569+ .macro ljmpq sel, off
13570+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
13571+ .byte 0x48; ljmp *1234f(%rip)
13572+ .pushsection .rodata
13573+ .align 16
13574+ 1234: .quad \off; .word \sel
13575+ .popsection
13576+#else
13577+ pushq $\sel
13578+ pushq $\off
13579+ lretq
13580+#endif
13581+ .endm
13582+
13583+ .macro pax_enter_kernel
13584+ pax_set_fptr_mask
13585+#ifdef CONFIG_PAX_KERNEXEC
13586+ call pax_enter_kernel
13587+#endif
13588+ .endm
13589+
13590+ .macro pax_exit_kernel
13591+#ifdef CONFIG_PAX_KERNEXEC
13592+ call pax_exit_kernel
13593+#endif
13594+ .endm
13595+
13596+#ifdef CONFIG_PAX_KERNEXEC
13597+ENTRY(pax_enter_kernel)
13598+ pushq %rdi
13599+
13600+#ifdef CONFIG_PARAVIRT
13601+ PV_SAVE_REGS(CLBR_RDI)
13602+#endif
13603+
13604+ GET_CR0_INTO_RDI
13605+ bts $16,%rdi
13606+ jnc 3f
13607+ mov %cs,%edi
13608+ cmp $__KERNEL_CS,%edi
13609+ jnz 2f
13610+1:
13611+
13612+#ifdef CONFIG_PARAVIRT
13613+ PV_RESTORE_REGS(CLBR_RDI)
13614+#endif
13615+
13616+ popq %rdi
13617+ pax_force_retaddr
13618+ retq
13619+
13620+2: ljmpq __KERNEL_CS,1f
13621+3: ljmpq __KERNEXEC_KERNEL_CS,4f
13622+4: SET_RDI_INTO_CR0
13623+ jmp 1b
13624+ENDPROC(pax_enter_kernel)
13625+
13626+ENTRY(pax_exit_kernel)
13627+ pushq %rdi
13628+
13629+#ifdef CONFIG_PARAVIRT
13630+ PV_SAVE_REGS(CLBR_RDI)
13631+#endif
13632+
13633+ mov %cs,%rdi
13634+ cmp $__KERNEXEC_KERNEL_CS,%edi
13635+ jz 2f
13636+1:
13637+
13638+#ifdef CONFIG_PARAVIRT
13639+ PV_RESTORE_REGS(CLBR_RDI);
13640+#endif
13641+
13642+ popq %rdi
13643+ pax_force_retaddr
13644+ retq
13645+
13646+2: GET_CR0_INTO_RDI
13647+ btr $16,%rdi
13648+ ljmpq __KERNEL_CS,3f
13649+3: SET_RDI_INTO_CR0
13650+ jmp 1b
13651+#ifdef CONFIG_PARAVIRT
13652+ PV_RESTORE_REGS(CLBR_RDI);
13653+#endif
13654+
13655+ popq %rdi
13656+ pax_force_retaddr
13657+ retq
13658+ENDPROC(pax_exit_kernel)
13659+#endif
13660+
13661+ .macro pax_enter_kernel_user
13662+ pax_set_fptr_mask
13663+#ifdef CONFIG_PAX_MEMORY_UDEREF
13664+ call pax_enter_kernel_user
13665+#endif
13666+ .endm
13667+
13668+ .macro pax_exit_kernel_user
13669+#ifdef CONFIG_PAX_MEMORY_UDEREF
13670+ call pax_exit_kernel_user
13671+#endif
13672+#ifdef CONFIG_PAX_RANDKSTACK
13673+ pushq %rax
13674+ call pax_randomize_kstack
13675+ popq %rax
13676+#endif
13677+ .endm
13678+
13679+#ifdef CONFIG_PAX_MEMORY_UDEREF
13680+ENTRY(pax_enter_kernel_user)
13681+ pushq %rdi
13682+ pushq %rbx
13683+
13684+#ifdef CONFIG_PARAVIRT
13685+ PV_SAVE_REGS(CLBR_RDI)
13686+#endif
13687+
13688+ GET_CR3_INTO_RDI
13689+ mov %rdi,%rbx
13690+ add $__START_KERNEL_map,%rbx
13691+ sub phys_base(%rip),%rbx
13692+
13693+#ifdef CONFIG_PARAVIRT
13694+ pushq %rdi
13695+ cmpl $0, pv_info+PARAVIRT_enabled
13696+ jz 1f
13697+ i = 0
13698+ .rept USER_PGD_PTRS
13699+ mov i*8(%rbx),%rsi
13700+ mov $0,%sil
13701+ lea i*8(%rbx),%rdi
13702+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
13703+ i = i + 1
13704+ .endr
13705+ jmp 2f
13706+1:
13707+#endif
13708+
13709+ i = 0
13710+ .rept USER_PGD_PTRS
13711+ movb $0,i*8(%rbx)
13712+ i = i + 1
13713+ .endr
13714+
13715+#ifdef CONFIG_PARAVIRT
13716+2: popq %rdi
13717+#endif
13718+ SET_RDI_INTO_CR3
13719+
13720+#ifdef CONFIG_PAX_KERNEXEC
13721+ GET_CR0_INTO_RDI
13722+ bts $16,%rdi
13723+ SET_RDI_INTO_CR0
13724+#endif
13725+
13726+#ifdef CONFIG_PARAVIRT
13727+ PV_RESTORE_REGS(CLBR_RDI)
13728+#endif
13729+
13730+ popq %rbx
13731+ popq %rdi
13732+ pax_force_retaddr
13733+ retq
13734+ENDPROC(pax_enter_kernel_user)
13735+
13736+ENTRY(pax_exit_kernel_user)
13737+ push %rdi
13738+
13739+#ifdef CONFIG_PARAVIRT
13740+ pushq %rbx
13741+ PV_SAVE_REGS(CLBR_RDI)
13742+#endif
13743+
13744+#ifdef CONFIG_PAX_KERNEXEC
13745+ GET_CR0_INTO_RDI
13746+ btr $16,%rdi
13747+ SET_RDI_INTO_CR0
13748+#endif
13749+
13750+ GET_CR3_INTO_RDI
13751+ add $__START_KERNEL_map,%rdi
13752+ sub phys_base(%rip),%rdi
13753+
13754+#ifdef CONFIG_PARAVIRT
13755+ cmpl $0, pv_info+PARAVIRT_enabled
13756+ jz 1f
13757+ mov %rdi,%rbx
13758+ i = 0
13759+ .rept USER_PGD_PTRS
13760+ mov i*8(%rbx),%rsi
13761+ mov $0x67,%sil
13762+ lea i*8(%rbx),%rdi
13763+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
13764+ i = i + 1
13765+ .endr
13766+ jmp 2f
13767+1:
13768+#endif
13769+
13770+ i = 0
13771+ .rept USER_PGD_PTRS
13772+ movb $0x67,i*8(%rdi)
13773+ i = i + 1
13774+ .endr
13775+
13776+#ifdef CONFIG_PARAVIRT
13777+2: PV_RESTORE_REGS(CLBR_RDI)
13778+ popq %rbx
13779+#endif
13780+
13781+ popq %rdi
13782+ pax_force_retaddr
13783+ retq
13784+ENDPROC(pax_exit_kernel_user)
13785+#endif
13786+
13787+.macro pax_erase_kstack
13788+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
13789+ call pax_erase_kstack
13790+#endif
13791+.endm
13792+
13793+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
13794+/*
13795+ * r11: thread_info
13796+ * rcx, rdx: can be clobbered
13797+ */
13798+ENTRY(pax_erase_kstack)
13799+ pushq %rdi
13800+ pushq %rax
13801+ pushq %r11
13802+
13803+ GET_THREAD_INFO(%r11)
13804+ mov TI_lowest_stack(%r11), %rdi
13805+ mov $-0xBEEF, %rax
13806+ std
13807+
13808+1: mov %edi, %ecx
13809+ and $THREAD_SIZE_asm - 1, %ecx
13810+ shr $3, %ecx
13811+ repne scasq
13812+ jecxz 2f
13813+
13814+ cmp $2*8, %ecx
13815+ jc 2f
13816+
13817+ mov $2*8, %ecx
13818+ repe scasq
13819+ jecxz 2f
13820+ jne 1b
13821+
13822+2: cld
13823+ mov %esp, %ecx
13824+ sub %edi, %ecx
13825+
13826+ cmp $THREAD_SIZE_asm, %rcx
13827+ jb 3f
13828+ ud2
13829+3:
13830+
13831+ shr $3, %ecx
13832+ rep stosq
13833+
13834+ mov TI_task_thread_sp0(%r11), %rdi
13835+ sub $256, %rdi
13836+ mov %rdi, TI_lowest_stack(%r11)
13837+
13838+ popq %r11
13839+ popq %rax
13840+ popq %rdi
13841+ pax_force_retaddr
13842+ ret
13843+ENDPROC(pax_erase_kstack)
13844+#endif
13845
13846 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
13847 #ifdef CONFIG_TRACE_IRQFLAGS
13848@@ -231,8 +515,8 @@ ENDPROC(native_usergs_sysret64)
13849 .endm
13850
13851 .macro UNFAKE_STACK_FRAME
13852- addq $8*6, %rsp
13853- CFI_ADJUST_CFA_OFFSET -(6*8)
13854+ addq $8*6 + ARG_SKIP, %rsp
13855+ CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
13856 .endm
13857
13858 /*
13859@@ -319,7 +603,7 @@ ENDPROC(native_usergs_sysret64)
13860 movq %rsp, %rsi
13861
13862 leaq -RBP(%rsp),%rdi /* arg1 for handler */
13863- testl $3, CS(%rdi)
13864+ testb $3, CS(%rdi)
13865 je 1f
13866 SWAPGS
13867 /*
13868@@ -355,9 +639,10 @@ ENTRY(save_rest)
13869 movq_cfi r15, R15+16
13870 movq %r11, 8(%rsp) /* return address */
13871 FIXUP_TOP_OF_STACK %r11, 16
13872+ pax_force_retaddr
13873 ret
13874 CFI_ENDPROC
13875-END(save_rest)
13876+ENDPROC(save_rest)
13877
13878 /* save complete stack frame */
13879 .pushsection .kprobes.text, "ax"
13880@@ -386,9 +671,10 @@ ENTRY(save_paranoid)
13881 js 1f /* negative -> in kernel */
13882 SWAPGS
13883 xorl %ebx,%ebx
13884-1: ret
13885+1: pax_force_retaddr_bts
13886+ ret
13887 CFI_ENDPROC
13888-END(save_paranoid)
13889+ENDPROC(save_paranoid)
13890 .popsection
13891
13892 /*
13893@@ -410,7 +696,7 @@ ENTRY(ret_from_fork)
13894
13895 RESTORE_REST
13896
13897- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
13898+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
13899 je int_ret_from_sys_call
13900
13901 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
13902@@ -420,7 +706,7 @@ ENTRY(ret_from_fork)
13903 jmp ret_from_sys_call # go to the SYSRET fastpath
13904
13905 CFI_ENDPROC
13906-END(ret_from_fork)
13907+ENDPROC(ret_from_fork)
13908
13909 /*
13910 * System call entry. Up to 6 arguments in registers are supported.
13911@@ -456,7 +742,7 @@ END(ret_from_fork)
13912 ENTRY(system_call)
13913 CFI_STARTPROC simple
13914 CFI_SIGNAL_FRAME
13915- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
13916+ CFI_DEF_CFA rsp,0
13917 CFI_REGISTER rip,rcx
13918 /*CFI_REGISTER rflags,r11*/
13919 SWAPGS_UNSAFE_STACK
13920@@ -469,12 +755,13 @@ ENTRY(system_call_after_swapgs)
13921
13922 movq %rsp,PER_CPU_VAR(old_rsp)
13923 movq PER_CPU_VAR(kernel_stack),%rsp
13924+ SAVE_ARGS 8*6,0
13925+ pax_enter_kernel_user
13926 /*
13927 * No need to follow this irqs off/on section - it's straight
13928 * and short:
13929 */
13930 ENABLE_INTERRUPTS(CLBR_NONE)
13931- SAVE_ARGS 8,0
13932 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
13933 movq %rcx,RIP-ARGOFFSET(%rsp)
13934 CFI_REL_OFFSET rip,RIP-ARGOFFSET
13935@@ -484,7 +771,7 @@ ENTRY(system_call_after_swapgs)
13936 system_call_fastpath:
13937 cmpq $__NR_syscall_max,%rax
13938 ja badsys
13939- movq %r10,%rcx
13940+ movq R10-ARGOFFSET(%rsp),%rcx
13941 call *sys_call_table(,%rax,8) # XXX: rip relative
13942 movq %rax,RAX-ARGOFFSET(%rsp)
13943 /*
13944@@ -503,6 +790,8 @@ sysret_check:
13945 andl %edi,%edx
13946 jnz sysret_careful
13947 CFI_REMEMBER_STATE
13948+ pax_exit_kernel_user
13949+ pax_erase_kstack
13950 /*
13951 * sysretq will re-enable interrupts:
13952 */
13953@@ -554,14 +843,18 @@ badsys:
13954 * jump back to the normal fast path.
13955 */
13956 auditsys:
13957- movq %r10,%r9 /* 6th arg: 4th syscall arg */
13958+ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
13959 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
13960 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
13961 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
13962 movq %rax,%rsi /* 2nd arg: syscall number */
13963 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
13964 call audit_syscall_entry
13965+
13966+ pax_erase_kstack
13967+
13968 LOAD_ARGS 0 /* reload call-clobbered registers */
13969+ pax_set_fptr_mask
13970 jmp system_call_fastpath
13971
13972 /*
13973@@ -591,16 +884,20 @@ tracesys:
13974 FIXUP_TOP_OF_STACK %rdi
13975 movq %rsp,%rdi
13976 call syscall_trace_enter
13977+
13978+ pax_erase_kstack
13979+
13980 /*
13981 * Reload arg registers from stack in case ptrace changed them.
13982 * We don't reload %rax because syscall_trace_enter() returned
13983 * the value it wants us to use in the table lookup.
13984 */
13985 LOAD_ARGS ARGOFFSET, 1
13986+ pax_set_fptr_mask
13987 RESTORE_REST
13988 cmpq $__NR_syscall_max,%rax
13989 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
13990- movq %r10,%rcx /* fixup for C */
13991+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
13992 call *sys_call_table(,%rax,8)
13993 movq %rax,RAX-ARGOFFSET(%rsp)
13994 /* Use IRET because user could have changed frame */
13995@@ -612,7 +909,7 @@ tracesys:
13996 GLOBAL(int_ret_from_sys_call)
13997 DISABLE_INTERRUPTS(CLBR_NONE)
13998 TRACE_IRQS_OFF
13999- testl $3,CS-ARGOFFSET(%rsp)
14000+ testb $3,CS-ARGOFFSET(%rsp)
14001 je retint_restore_args
14002 movl $_TIF_ALLWORK_MASK,%edi
14003 /* edi: mask to check */
14004@@ -669,7 +966,7 @@ int_restore_rest:
14005 TRACE_IRQS_OFF
14006 jmp int_with_check
14007 CFI_ENDPROC
14008-END(system_call)
14009+ENDPROC(system_call)
14010
14011 /*
14012 * Certain special system calls that need to save a complete full stack frame.
14013@@ -685,7 +982,7 @@ ENTRY(\label)
14014 call \func
14015 jmp ptregscall_common
14016 CFI_ENDPROC
14017-END(\label)
14018+ENDPROC(\label)
14019 .endm
14020
14021 PTREGSCALL stub_clone, sys_clone, %r8
14022@@ -703,9 +1000,10 @@ ENTRY(ptregscall_common)
14023 movq_cfi_restore R12+8, r12
14024 movq_cfi_restore RBP+8, rbp
14025 movq_cfi_restore RBX+8, rbx
14026+ pax_force_retaddr
14027 ret $REST_SKIP /* pop extended registers */
14028 CFI_ENDPROC
14029-END(ptregscall_common)
14030+ENDPROC(ptregscall_common)
14031
14032 ENTRY(stub_execve)
14033 CFI_STARTPROC
14034@@ -720,7 +1018,7 @@ ENTRY(stub_execve)
14035 RESTORE_REST
14036 jmp int_ret_from_sys_call
14037 CFI_ENDPROC
14038-END(stub_execve)
14039+ENDPROC(stub_execve)
14040
14041 /*
14042 * sigreturn is special because it needs to restore all registers on return.
14043@@ -738,7 +1036,7 @@ ENTRY(stub_rt_sigreturn)
14044 RESTORE_REST
14045 jmp int_ret_from_sys_call
14046 CFI_ENDPROC
14047-END(stub_rt_sigreturn)
14048+ENDPROC(stub_rt_sigreturn)
14049
14050 /*
14051 * Build the entry stubs and pointer table with some assembler magic.
14052@@ -773,7 +1071,7 @@ vector=vector+1
14053 2: jmp common_interrupt
14054 .endr
14055 CFI_ENDPROC
14056-END(irq_entries_start)
14057+ENDPROC(irq_entries_start)
14058
14059 .previous
14060 END(interrupt)
14061@@ -793,6 +1091,16 @@ END(interrupt)
14062 subq $ORIG_RAX-RBP, %rsp
14063 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
14064 SAVE_ARGS_IRQ
14065+#ifdef CONFIG_PAX_MEMORY_UDEREF
14066+ testb $3, CS(%rdi)
14067+ jnz 1f
14068+ pax_enter_kernel
14069+ jmp 2f
14070+1: pax_enter_kernel_user
14071+2:
14072+#else
14073+ pax_enter_kernel
14074+#endif
14075 call \func
14076 .endm
14077
14078@@ -824,7 +1132,7 @@ ret_from_intr:
14079
14080 exit_intr:
14081 GET_THREAD_INFO(%rcx)
14082- testl $3,CS-ARGOFFSET(%rsp)
14083+ testb $3,CS-ARGOFFSET(%rsp)
14084 je retint_kernel
14085
14086 /* Interrupt came from user space */
14087@@ -846,12 +1154,16 @@ retint_swapgs: /* return to user-space */
14088 * The iretq could re-enable interrupts:
14089 */
14090 DISABLE_INTERRUPTS(CLBR_ANY)
14091+ pax_exit_kernel_user
14092+ pax_erase_kstack
14093 TRACE_IRQS_IRETQ
14094 SWAPGS
14095 jmp restore_args
14096
14097 retint_restore_args: /* return to kernel space */
14098 DISABLE_INTERRUPTS(CLBR_ANY)
14099+ pax_exit_kernel
14100+ pax_force_retaddr RIP-ARGOFFSET
14101 /*
14102 * The iretq could re-enable interrupts:
14103 */
14104@@ -940,7 +1252,7 @@ ENTRY(retint_kernel)
14105 #endif
14106
14107 CFI_ENDPROC
14108-END(common_interrupt)
14109+ENDPROC(common_interrupt)
14110 /*
14111 * End of kprobes section
14112 */
14113@@ -956,7 +1268,7 @@ ENTRY(\sym)
14114 interrupt \do_sym
14115 jmp ret_from_intr
14116 CFI_ENDPROC
14117-END(\sym)
14118+ENDPROC(\sym)
14119 .endm
14120
14121 #ifdef CONFIG_SMP
14122@@ -1021,12 +1333,22 @@ ENTRY(\sym)
14123 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14124 call error_entry
14125 DEFAULT_FRAME 0
14126+#ifdef CONFIG_PAX_MEMORY_UDEREF
14127+ testb $3, CS(%rsp)
14128+ jnz 1f
14129+ pax_enter_kernel
14130+ jmp 2f
14131+1: pax_enter_kernel_user
14132+2:
14133+#else
14134+ pax_enter_kernel
14135+#endif
14136 movq %rsp,%rdi /* pt_regs pointer */
14137 xorl %esi,%esi /* no error code */
14138 call \do_sym
14139 jmp error_exit /* %ebx: no swapgs flag */
14140 CFI_ENDPROC
14141-END(\sym)
14142+ENDPROC(\sym)
14143 .endm
14144
14145 .macro paranoidzeroentry sym do_sym
14146@@ -1038,15 +1360,25 @@ ENTRY(\sym)
14147 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14148 call save_paranoid
14149 TRACE_IRQS_OFF
14150+#ifdef CONFIG_PAX_MEMORY_UDEREF
14151+ testb $3, CS(%rsp)
14152+ jnz 1f
14153+ pax_enter_kernel
14154+ jmp 2f
14155+1: pax_enter_kernel_user
14156+2:
14157+#else
14158+ pax_enter_kernel
14159+#endif
14160 movq %rsp,%rdi /* pt_regs pointer */
14161 xorl %esi,%esi /* no error code */
14162 call \do_sym
14163 jmp paranoid_exit /* %ebx: no swapgs flag */
14164 CFI_ENDPROC
14165-END(\sym)
14166+ENDPROC(\sym)
14167 .endm
14168
14169-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
14170+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
14171 .macro paranoidzeroentry_ist sym do_sym ist
14172 ENTRY(\sym)
14173 INTR_FRAME
14174@@ -1056,14 +1388,30 @@ ENTRY(\sym)
14175 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14176 call save_paranoid
14177 TRACE_IRQS_OFF
14178+#ifdef CONFIG_PAX_MEMORY_UDEREF
14179+ testb $3, CS(%rsp)
14180+ jnz 1f
14181+ pax_enter_kernel
14182+ jmp 2f
14183+1: pax_enter_kernel_user
14184+2:
14185+#else
14186+ pax_enter_kernel
14187+#endif
14188 movq %rsp,%rdi /* pt_regs pointer */
14189 xorl %esi,%esi /* no error code */
14190+#ifdef CONFIG_SMP
14191+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
14192+ lea init_tss(%r12), %r12
14193+#else
14194+ lea init_tss(%rip), %r12
14195+#endif
14196 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
14197 call \do_sym
14198 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
14199 jmp paranoid_exit /* %ebx: no swapgs flag */
14200 CFI_ENDPROC
14201-END(\sym)
14202+ENDPROC(\sym)
14203 .endm
14204
14205 .macro errorentry sym do_sym
14206@@ -1074,13 +1422,23 @@ ENTRY(\sym)
14207 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14208 call error_entry
14209 DEFAULT_FRAME 0
14210+#ifdef CONFIG_PAX_MEMORY_UDEREF
14211+ testb $3, CS(%rsp)
14212+ jnz 1f
14213+ pax_enter_kernel
14214+ jmp 2f
14215+1: pax_enter_kernel_user
14216+2:
14217+#else
14218+ pax_enter_kernel
14219+#endif
14220 movq %rsp,%rdi /* pt_regs pointer */
14221 movq ORIG_RAX(%rsp),%rsi /* get error code */
14222 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
14223 call \do_sym
14224 jmp error_exit /* %ebx: no swapgs flag */
14225 CFI_ENDPROC
14226-END(\sym)
14227+ENDPROC(\sym)
14228 .endm
14229
14230 /* error code is on the stack already */
14231@@ -1093,13 +1451,23 @@ ENTRY(\sym)
14232 call save_paranoid
14233 DEFAULT_FRAME 0
14234 TRACE_IRQS_OFF
14235+#ifdef CONFIG_PAX_MEMORY_UDEREF
14236+ testb $3, CS(%rsp)
14237+ jnz 1f
14238+ pax_enter_kernel
14239+ jmp 2f
14240+1: pax_enter_kernel_user
14241+2:
14242+#else
14243+ pax_enter_kernel
14244+#endif
14245 movq %rsp,%rdi /* pt_regs pointer */
14246 movq ORIG_RAX(%rsp),%rsi /* get error code */
14247 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
14248 call \do_sym
14249 jmp paranoid_exit /* %ebx: no swapgs flag */
14250 CFI_ENDPROC
14251-END(\sym)
14252+ENDPROC(\sym)
14253 .endm
14254
14255 zeroentry divide_error do_divide_error
14256@@ -1129,9 +1497,10 @@ gs_change:
14257 2: mfence /* workaround */
14258 SWAPGS
14259 popfq_cfi
14260+ pax_force_retaddr
14261 ret
14262 CFI_ENDPROC
14263-END(native_load_gs_index)
14264+ENDPROC(native_load_gs_index)
14265
14266 .section __ex_table,"a"
14267 .align 8
14268@@ -1153,13 +1522,14 @@ ENTRY(kernel_thread_helper)
14269 * Here we are in the child and the registers are set as they were
14270 * at kernel_thread() invocation in the parent.
14271 */
14272+ pax_force_fptr %rsi
14273 call *%rsi
14274 # exit
14275 mov %eax, %edi
14276 call do_exit
14277 ud2 # padding for call trace
14278 CFI_ENDPROC
14279-END(kernel_thread_helper)
14280+ENDPROC(kernel_thread_helper)
14281
14282 /*
14283 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
14284@@ -1186,11 +1556,11 @@ ENTRY(kernel_execve)
14285 RESTORE_REST
14286 testq %rax,%rax
14287 je int_ret_from_sys_call
14288- RESTORE_ARGS
14289 UNFAKE_STACK_FRAME
14290+ pax_force_retaddr
14291 ret
14292 CFI_ENDPROC
14293-END(kernel_execve)
14294+ENDPROC(kernel_execve)
14295
14296 /* Call softirq on interrupt stack. Interrupts are off. */
14297 ENTRY(call_softirq)
14298@@ -1208,9 +1578,10 @@ ENTRY(call_softirq)
14299 CFI_DEF_CFA_REGISTER rsp
14300 CFI_ADJUST_CFA_OFFSET -8
14301 decl PER_CPU_VAR(irq_count)
14302+ pax_force_retaddr
14303 ret
14304 CFI_ENDPROC
14305-END(call_softirq)
14306+ENDPROC(call_softirq)
14307
14308 #ifdef CONFIG_XEN
14309 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
14310@@ -1248,7 +1619,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
14311 decl PER_CPU_VAR(irq_count)
14312 jmp error_exit
14313 CFI_ENDPROC
14314-END(xen_do_hypervisor_callback)
14315+ENDPROC(xen_do_hypervisor_callback)
14316
14317 /*
14318 * Hypervisor uses this for application faults while it executes.
14319@@ -1307,7 +1678,7 @@ ENTRY(xen_failsafe_callback)
14320 SAVE_ALL
14321 jmp error_exit
14322 CFI_ENDPROC
14323-END(xen_failsafe_callback)
14324+ENDPROC(xen_failsafe_callback)
14325
14326 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
14327 xen_hvm_callback_vector xen_evtchn_do_upcall
14328@@ -1356,16 +1727,31 @@ ENTRY(paranoid_exit)
14329 TRACE_IRQS_OFF
14330 testl %ebx,%ebx /* swapgs needed? */
14331 jnz paranoid_restore
14332- testl $3,CS(%rsp)
14333+ testb $3,CS(%rsp)
14334 jnz paranoid_userspace
14335+#ifdef CONFIG_PAX_MEMORY_UDEREF
14336+ pax_exit_kernel
14337+ TRACE_IRQS_IRETQ 0
14338+ SWAPGS_UNSAFE_STACK
14339+ RESTORE_ALL 8
14340+ pax_force_retaddr_bts
14341+ jmp irq_return
14342+#endif
14343 paranoid_swapgs:
14344+#ifdef CONFIG_PAX_MEMORY_UDEREF
14345+ pax_exit_kernel_user
14346+#else
14347+ pax_exit_kernel
14348+#endif
14349 TRACE_IRQS_IRETQ 0
14350 SWAPGS_UNSAFE_STACK
14351 RESTORE_ALL 8
14352 jmp irq_return
14353 paranoid_restore:
14354+ pax_exit_kernel
14355 TRACE_IRQS_IRETQ 0
14356 RESTORE_ALL 8
14357+ pax_force_retaddr_bts
14358 jmp irq_return
14359 paranoid_userspace:
14360 GET_THREAD_INFO(%rcx)
14361@@ -1394,7 +1780,7 @@ paranoid_schedule:
14362 TRACE_IRQS_OFF
14363 jmp paranoid_userspace
14364 CFI_ENDPROC
14365-END(paranoid_exit)
14366+ENDPROC(paranoid_exit)
14367
14368 /*
14369 * Exception entry point. This expects an error code/orig_rax on the stack.
14370@@ -1421,12 +1807,13 @@ ENTRY(error_entry)
14371 movq_cfi r14, R14+8
14372 movq_cfi r15, R15+8
14373 xorl %ebx,%ebx
14374- testl $3,CS+8(%rsp)
14375+ testb $3,CS+8(%rsp)
14376 je error_kernelspace
14377 error_swapgs:
14378 SWAPGS
14379 error_sti:
14380 TRACE_IRQS_OFF
14381+ pax_force_retaddr_bts
14382 ret
14383
14384 /*
14385@@ -1453,7 +1840,7 @@ bstep_iret:
14386 movq %rcx,RIP+8(%rsp)
14387 jmp error_swapgs
14388 CFI_ENDPROC
14389-END(error_entry)
14390+ENDPROC(error_entry)
14391
14392
14393 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
14394@@ -1473,7 +1860,7 @@ ENTRY(error_exit)
14395 jnz retint_careful
14396 jmp retint_swapgs
14397 CFI_ENDPROC
14398-END(error_exit)
14399+ENDPROC(error_exit)
14400
14401
14402 /* runs on exception stack */
14403@@ -1485,6 +1872,16 @@ ENTRY(nmi)
14404 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14405 call save_paranoid
14406 DEFAULT_FRAME 0
14407+#ifdef CONFIG_PAX_MEMORY_UDEREF
14408+ testb $3, CS(%rsp)
14409+ jnz 1f
14410+ pax_enter_kernel
14411+ jmp 2f
14412+1: pax_enter_kernel_user
14413+2:
14414+#else
14415+ pax_enter_kernel
14416+#endif
14417 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
14418 movq %rsp,%rdi
14419 movq $-1,%rsi
14420@@ -1495,12 +1892,28 @@ ENTRY(nmi)
14421 DISABLE_INTERRUPTS(CLBR_NONE)
14422 testl %ebx,%ebx /* swapgs needed? */
14423 jnz nmi_restore
14424- testl $3,CS(%rsp)
14425+ testb $3,CS(%rsp)
14426 jnz nmi_userspace
14427+#ifdef CONFIG_PAX_MEMORY_UDEREF
14428+ pax_exit_kernel
14429+ SWAPGS_UNSAFE_STACK
14430+ RESTORE_ALL 8
14431+ pax_force_retaddr_bts
14432+ jmp irq_return
14433+#endif
14434 nmi_swapgs:
14435+#ifdef CONFIG_PAX_MEMORY_UDEREF
14436+ pax_exit_kernel_user
14437+#else
14438+ pax_exit_kernel
14439+#endif
14440 SWAPGS_UNSAFE_STACK
14441+ RESTORE_ALL 8
14442+ jmp irq_return
14443 nmi_restore:
14444+ pax_exit_kernel
14445 RESTORE_ALL 8
14446+ pax_force_retaddr_bts
14447 jmp irq_return
14448 nmi_userspace:
14449 GET_THREAD_INFO(%rcx)
14450@@ -1529,14 +1942,14 @@ nmi_schedule:
14451 jmp paranoid_exit
14452 CFI_ENDPROC
14453 #endif
14454-END(nmi)
14455+ENDPROC(nmi)
14456
14457 ENTRY(ignore_sysret)
14458 CFI_STARTPROC
14459 mov $-ENOSYS,%eax
14460 sysret
14461 CFI_ENDPROC
14462-END(ignore_sysret)
14463+ENDPROC(ignore_sysret)
14464
14465 /*
14466 * End of kprobes section
14467diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
14468index c9a281f..ce2f317 100644
14469--- a/arch/x86/kernel/ftrace.c
14470+++ b/arch/x86/kernel/ftrace.c
14471@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */
14472 static const void *mod_code_newcode; /* holds the text to write to the IP */
14473
14474 static unsigned nmi_wait_count;
14475-static atomic_t nmi_update_count = ATOMIC_INIT(0);
14476+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
14477
14478 int ftrace_arch_read_dyn_info(char *buf, int size)
14479 {
14480@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
14481
14482 r = snprintf(buf, size, "%u %u",
14483 nmi_wait_count,
14484- atomic_read(&nmi_update_count));
14485+ atomic_read_unchecked(&nmi_update_count));
14486 return r;
14487 }
14488
14489@@ -177,8 +177,10 @@ void ftrace_nmi_enter(void)
14490
14491 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
14492 smp_rmb();
14493+ pax_open_kernel();
14494 ftrace_mod_code();
14495- atomic_inc(&nmi_update_count);
14496+ pax_close_kernel();
14497+ atomic_inc_unchecked(&nmi_update_count);
14498 }
14499 /* Must have previous changes seen before executions */
14500 smp_mb();
14501@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
14502 {
14503 unsigned char replaced[MCOUNT_INSN_SIZE];
14504
14505+ ip = ktla_ktva(ip);
14506+
14507 /*
14508 * Note: Due to modules and __init, code can
14509 * disappear and change, we need to protect against faulting
14510@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
14511 unsigned char old[MCOUNT_INSN_SIZE], *new;
14512 int ret;
14513
14514- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
14515+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
14516 new = ftrace_call_replace(ip, (unsigned long)func);
14517 ret = ftrace_modify_code(ip, old, new);
14518
14519@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip,
14520 {
14521 unsigned char code[MCOUNT_INSN_SIZE];
14522
14523+ ip = ktla_ktva(ip);
14524+
14525 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
14526 return -EFAULT;
14527
14528diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
14529index 3bb0850..55a56f4 100644
14530--- a/arch/x86/kernel/head32.c
14531+++ b/arch/x86/kernel/head32.c
14532@@ -19,6 +19,7 @@
14533 #include <asm/io_apic.h>
14534 #include <asm/bios_ebda.h>
14535 #include <asm/tlbflush.h>
14536+#include <asm/boot.h>
14537
14538 static void __init i386_default_early_setup(void)
14539 {
14540@@ -33,7 +34,7 @@ void __init i386_start_kernel(void)
14541 {
14542 memblock_init();
14543
14544- memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
14545+ memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
14546
14547 #ifdef CONFIG_BLK_DEV_INITRD
14548 /* Reserve INITRD */
14549diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
14550index ce0be7c..c41476e 100644
14551--- a/arch/x86/kernel/head_32.S
14552+++ b/arch/x86/kernel/head_32.S
14553@@ -25,6 +25,12 @@
14554 /* Physical address */
14555 #define pa(X) ((X) - __PAGE_OFFSET)
14556
14557+#ifdef CONFIG_PAX_KERNEXEC
14558+#define ta(X) (X)
14559+#else
14560+#define ta(X) ((X) - __PAGE_OFFSET)
14561+#endif
14562+
14563 /*
14564 * References to members of the new_cpu_data structure.
14565 */
14566@@ -54,11 +60,7 @@
14567 * and small than max_low_pfn, otherwise will waste some page table entries
14568 */
14569
14570-#if PTRS_PER_PMD > 1
14571-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
14572-#else
14573-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
14574-#endif
14575+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
14576
14577 /* Number of possible pages in the lowmem region */
14578 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
14579@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
14580 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
14581
14582 /*
14583+ * Real beginning of normal "text" segment
14584+ */
14585+ENTRY(stext)
14586+ENTRY(_stext)
14587+
14588+/*
14589 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
14590 * %esi points to the real-mode code as a 32-bit pointer.
14591 * CS and DS must be 4 GB flat segments, but we don't depend on
14592@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
14593 * can.
14594 */
14595 __HEAD
14596+
14597+#ifdef CONFIG_PAX_KERNEXEC
14598+ jmp startup_32
14599+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
14600+.fill PAGE_SIZE-5,1,0xcc
14601+#endif
14602+
14603 ENTRY(startup_32)
14604 movl pa(stack_start),%ecx
14605
14606@@ -105,6 +120,57 @@ ENTRY(startup_32)
14607 2:
14608 leal -__PAGE_OFFSET(%ecx),%esp
14609
14610+#ifdef CONFIG_SMP
14611+ movl $pa(cpu_gdt_table),%edi
14612+ movl $__per_cpu_load,%eax
14613+ movw %ax,__KERNEL_PERCPU + 2(%edi)
14614+ rorl $16,%eax
14615+ movb %al,__KERNEL_PERCPU + 4(%edi)
14616+ movb %ah,__KERNEL_PERCPU + 7(%edi)
14617+ movl $__per_cpu_end - 1,%eax
14618+ subl $__per_cpu_start,%eax
14619+ movw %ax,__KERNEL_PERCPU + 0(%edi)
14620+#endif
14621+
14622+#ifdef CONFIG_PAX_MEMORY_UDEREF
14623+ movl $NR_CPUS,%ecx
14624+ movl $pa(cpu_gdt_table),%edi
14625+1:
14626+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
14627+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
14628+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
14629+ addl $PAGE_SIZE_asm,%edi
14630+ loop 1b
14631+#endif
14632+
14633+#ifdef CONFIG_PAX_KERNEXEC
14634+ movl $pa(boot_gdt),%edi
14635+ movl $__LOAD_PHYSICAL_ADDR,%eax
14636+ movw %ax,__BOOT_CS + 2(%edi)
14637+ rorl $16,%eax
14638+ movb %al,__BOOT_CS + 4(%edi)
14639+ movb %ah,__BOOT_CS + 7(%edi)
14640+ rorl $16,%eax
14641+
14642+ ljmp $(__BOOT_CS),$1f
14643+1:
14644+
14645+ movl $NR_CPUS,%ecx
14646+ movl $pa(cpu_gdt_table),%edi
14647+ addl $__PAGE_OFFSET,%eax
14648+1:
14649+ movw %ax,__KERNEL_CS + 2(%edi)
14650+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
14651+ rorl $16,%eax
14652+ movb %al,__KERNEL_CS + 4(%edi)
14653+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
14654+ movb %ah,__KERNEL_CS + 7(%edi)
14655+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
14656+ rorl $16,%eax
14657+ addl $PAGE_SIZE_asm,%edi
14658+ loop 1b
14659+#endif
14660+
14661 /*
14662 * Clear BSS first so that there are no surprises...
14663 */
14664@@ -195,8 +261,11 @@ ENTRY(startup_32)
14665 movl %eax, pa(max_pfn_mapped)
14666
14667 /* Do early initialization of the fixmap area */
14668- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
14669- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
14670+#ifdef CONFIG_COMPAT_VDSO
14671+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
14672+#else
14673+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
14674+#endif
14675 #else /* Not PAE */
14676
14677 page_pde_offset = (__PAGE_OFFSET >> 20);
14678@@ -226,8 +295,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
14679 movl %eax, pa(max_pfn_mapped)
14680
14681 /* Do early initialization of the fixmap area */
14682- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
14683- movl %eax,pa(initial_page_table+0xffc)
14684+#ifdef CONFIG_COMPAT_VDSO
14685+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
14686+#else
14687+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
14688+#endif
14689 #endif
14690
14691 #ifdef CONFIG_PARAVIRT
14692@@ -241,9 +313,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
14693 cmpl $num_subarch_entries, %eax
14694 jae bad_subarch
14695
14696- movl pa(subarch_entries)(,%eax,4), %eax
14697- subl $__PAGE_OFFSET, %eax
14698- jmp *%eax
14699+ jmp *pa(subarch_entries)(,%eax,4)
14700
14701 bad_subarch:
14702 WEAK(lguest_entry)
14703@@ -255,10 +325,10 @@ WEAK(xen_entry)
14704 __INITDATA
14705
14706 subarch_entries:
14707- .long default_entry /* normal x86/PC */
14708- .long lguest_entry /* lguest hypervisor */
14709- .long xen_entry /* Xen hypervisor */
14710- .long default_entry /* Moorestown MID */
14711+ .long ta(default_entry) /* normal x86/PC */
14712+ .long ta(lguest_entry) /* lguest hypervisor */
14713+ .long ta(xen_entry) /* Xen hypervisor */
14714+ .long ta(default_entry) /* Moorestown MID */
14715 num_subarch_entries = (. - subarch_entries) / 4
14716 .previous
14717 #else
14718@@ -312,6 +382,7 @@ default_entry:
14719 orl %edx,%eax
14720 movl %eax,%cr4
14721
14722+#ifdef CONFIG_X86_PAE
14723 testb $X86_CR4_PAE, %al # check if PAE is enabled
14724 jz 6f
14725
14726@@ -340,6 +411,9 @@ default_entry:
14727 /* Make changes effective */
14728 wrmsr
14729
14730+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
14731+#endif
14732+
14733 6:
14734
14735 /*
14736@@ -443,7 +517,7 @@ is386: movl $2,%ecx # set MP
14737 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
14738 movl %eax,%ss # after changing gdt.
14739
14740- movl $(__USER_DS),%eax # DS/ES contains default USER segment
14741+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
14742 movl %eax,%ds
14743 movl %eax,%es
14744
14745@@ -457,15 +531,22 @@ is386: movl $2,%ecx # set MP
14746 */
14747 cmpb $0,ready
14748 jne 1f
14749- movl $gdt_page,%eax
14750+ movl $cpu_gdt_table,%eax
14751 movl $stack_canary,%ecx
14752+#ifdef CONFIG_SMP
14753+ addl $__per_cpu_load,%ecx
14754+#endif
14755 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
14756 shrl $16, %ecx
14757 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
14758 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
14759 1:
14760-#endif
14761 movl $(__KERNEL_STACK_CANARY),%eax
14762+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14763+ movl $(__USER_DS),%eax
14764+#else
14765+ xorl %eax,%eax
14766+#endif
14767 movl %eax,%gs
14768
14769 xorl %eax,%eax # Clear LDT
14770@@ -558,22 +639,22 @@ early_page_fault:
14771 jmp early_fault
14772
14773 early_fault:
14774- cld
14775 #ifdef CONFIG_PRINTK
14776+ cmpl $1,%ss:early_recursion_flag
14777+ je hlt_loop
14778+ incl %ss:early_recursion_flag
14779+ cld
14780 pusha
14781 movl $(__KERNEL_DS),%eax
14782 movl %eax,%ds
14783 movl %eax,%es
14784- cmpl $2,early_recursion_flag
14785- je hlt_loop
14786- incl early_recursion_flag
14787 movl %cr2,%eax
14788 pushl %eax
14789 pushl %edx /* trapno */
14790 pushl $fault_msg
14791 call printk
14792+; call dump_stack
14793 #endif
14794- call dump_stack
14795 hlt_loop:
14796 hlt
14797 jmp hlt_loop
14798@@ -581,8 +662,11 @@ hlt_loop:
14799 /* This is the default interrupt "handler" :-) */
14800 ALIGN
14801 ignore_int:
14802- cld
14803 #ifdef CONFIG_PRINTK
14804+ cmpl $2,%ss:early_recursion_flag
14805+ je hlt_loop
14806+ incl %ss:early_recursion_flag
14807+ cld
14808 pushl %eax
14809 pushl %ecx
14810 pushl %edx
14811@@ -591,9 +675,6 @@ ignore_int:
14812 movl $(__KERNEL_DS),%eax
14813 movl %eax,%ds
14814 movl %eax,%es
14815- cmpl $2,early_recursion_flag
14816- je hlt_loop
14817- incl early_recursion_flag
14818 pushl 16(%esp)
14819 pushl 24(%esp)
14820 pushl 32(%esp)
14821@@ -622,29 +703,43 @@ ENTRY(initial_code)
14822 /*
14823 * BSS section
14824 */
14825-__PAGE_ALIGNED_BSS
14826- .align PAGE_SIZE
14827 #ifdef CONFIG_X86_PAE
14828+.section .initial_pg_pmd,"a",@progbits
14829 initial_pg_pmd:
14830 .fill 1024*KPMDS,4,0
14831 #else
14832+.section .initial_page_table,"a",@progbits
14833 ENTRY(initial_page_table)
14834 .fill 1024,4,0
14835 #endif
14836+.section .initial_pg_fixmap,"a",@progbits
14837 initial_pg_fixmap:
14838 .fill 1024,4,0
14839+.section .empty_zero_page,"a",@progbits
14840 ENTRY(empty_zero_page)
14841 .fill 4096,1,0
14842+.section .swapper_pg_dir,"a",@progbits
14843 ENTRY(swapper_pg_dir)
14844+#ifdef CONFIG_X86_PAE
14845+ .fill 4,8,0
14846+#else
14847 .fill 1024,4,0
14848+#endif
14849+
14850+/*
14851+ * The IDT has to be page-aligned to simplify the Pentium
14852+ * F0 0F bug workaround.. We have a special link segment
14853+ * for this.
14854+ */
14855+.section .idt,"a",@progbits
14856+ENTRY(idt_table)
14857+ .fill 256,8,0
14858
14859 /*
14860 * This starts the data section.
14861 */
14862 #ifdef CONFIG_X86_PAE
14863-__PAGE_ALIGNED_DATA
14864- /* Page-aligned for the benefit of paravirt? */
14865- .align PAGE_SIZE
14866+.section .initial_page_table,"a",@progbits
14867 ENTRY(initial_page_table)
14868 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
14869 # if KPMDS == 3
14870@@ -663,18 +758,27 @@ ENTRY(initial_page_table)
14871 # error "Kernel PMDs should be 1, 2 or 3"
14872 # endif
14873 .align PAGE_SIZE /* needs to be page-sized too */
14874+
14875+#ifdef CONFIG_PAX_PER_CPU_PGD
14876+ENTRY(cpu_pgd)
14877+ .rept NR_CPUS
14878+ .fill 4,8,0
14879+ .endr
14880+#endif
14881+
14882 #endif
14883
14884 .data
14885 .balign 4
14886 ENTRY(stack_start)
14887- .long init_thread_union+THREAD_SIZE
14888+ .long init_thread_union+THREAD_SIZE-8
14889
14890+ready: .byte 0
14891+
14892+.section .rodata,"a",@progbits
14893 early_recursion_flag:
14894 .long 0
14895
14896-ready: .byte 0
14897-
14898 int_msg:
14899 .asciz "Unknown interrupt or fault at: %p %p %p\n"
14900
14901@@ -707,7 +811,7 @@ fault_msg:
14902 .word 0 # 32 bit align gdt_desc.address
14903 boot_gdt_descr:
14904 .word __BOOT_DS+7
14905- .long boot_gdt - __PAGE_OFFSET
14906+ .long pa(boot_gdt)
14907
14908 .word 0 # 32-bit align idt_desc.address
14909 idt_descr:
14910@@ -718,7 +822,7 @@ idt_descr:
14911 .word 0 # 32 bit align gdt_desc.address
14912 ENTRY(early_gdt_descr)
14913 .word GDT_ENTRIES*8-1
14914- .long gdt_page /* Overwritten for secondary CPUs */
14915+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
14916
14917 /*
14918 * The boot_gdt must mirror the equivalent in setup.S and is
14919@@ -727,5 +831,65 @@ ENTRY(early_gdt_descr)
14920 .align L1_CACHE_BYTES
14921 ENTRY(boot_gdt)
14922 .fill GDT_ENTRY_BOOT_CS,8,0
14923- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
14924- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
14925+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
14926+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
14927+
14928+ .align PAGE_SIZE_asm
14929+ENTRY(cpu_gdt_table)
14930+ .rept NR_CPUS
14931+ .quad 0x0000000000000000 /* NULL descriptor */
14932+ .quad 0x0000000000000000 /* 0x0b reserved */
14933+ .quad 0x0000000000000000 /* 0x13 reserved */
14934+ .quad 0x0000000000000000 /* 0x1b reserved */
14935+
14936+#ifdef CONFIG_PAX_KERNEXEC
14937+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
14938+#else
14939+ .quad 0x0000000000000000 /* 0x20 unused */
14940+#endif
14941+
14942+ .quad 0x0000000000000000 /* 0x28 unused */
14943+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
14944+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
14945+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
14946+ .quad 0x0000000000000000 /* 0x4b reserved */
14947+ .quad 0x0000000000000000 /* 0x53 reserved */
14948+ .quad 0x0000000000000000 /* 0x5b reserved */
14949+
14950+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
14951+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
14952+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
14953+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
14954+
14955+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
14956+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
14957+
14958+ /*
14959+ * Segments used for calling PnP BIOS have byte granularity.
14960+ * The code segments and data segments have fixed 64k limits,
14961+ * the transfer segment sizes are set at run time.
14962+ */
14963+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
14964+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
14965+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
14966+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
14967+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
14968+
14969+ /*
14970+ * The APM segments have byte granularity and their bases
14971+ * are set at run time. All have 64k limits.
14972+ */
14973+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
14974+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
14975+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
14976+
14977+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
14978+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
14979+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
14980+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
14981+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
14982+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
14983+
14984+ /* Be sure this is zeroed to avoid false validations in Xen */
14985+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
14986+ .endr
14987diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
14988index e11e394..9aebc5d 100644
14989--- a/arch/x86/kernel/head_64.S
14990+++ b/arch/x86/kernel/head_64.S
14991@@ -19,6 +19,8 @@
14992 #include <asm/cache.h>
14993 #include <asm/processor-flags.h>
14994 #include <asm/percpu.h>
14995+#include <asm/cpufeature.h>
14996+#include <asm/alternative-asm.h>
14997
14998 #ifdef CONFIG_PARAVIRT
14999 #include <asm/asm-offsets.h>
15000@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
15001 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
15002 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
15003 L3_START_KERNEL = pud_index(__START_KERNEL_map)
15004+L4_VMALLOC_START = pgd_index(VMALLOC_START)
15005+L3_VMALLOC_START = pud_index(VMALLOC_START)
15006+L4_VMALLOC_END = pgd_index(VMALLOC_END)
15007+L3_VMALLOC_END = pud_index(VMALLOC_END)
15008+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
15009+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
15010
15011 .text
15012 __HEAD
15013@@ -85,35 +93,23 @@ startup_64:
15014 */
15015 addq %rbp, init_level4_pgt + 0(%rip)
15016 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
15017+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
15018+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
15019+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
15020 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
15021
15022 addq %rbp, level3_ident_pgt + 0(%rip)
15023+#ifndef CONFIG_XEN
15024+ addq %rbp, level3_ident_pgt + 8(%rip)
15025+#endif
15026
15027- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
15028- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
15029+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
15030+
15031+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
15032+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
15033
15034 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
15035-
15036- /* Add an Identity mapping if I am above 1G */
15037- leaq _text(%rip), %rdi
15038- andq $PMD_PAGE_MASK, %rdi
15039-
15040- movq %rdi, %rax
15041- shrq $PUD_SHIFT, %rax
15042- andq $(PTRS_PER_PUD - 1), %rax
15043- jz ident_complete
15044-
15045- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
15046- leaq level3_ident_pgt(%rip), %rbx
15047- movq %rdx, 0(%rbx, %rax, 8)
15048-
15049- movq %rdi, %rax
15050- shrq $PMD_SHIFT, %rax
15051- andq $(PTRS_PER_PMD - 1), %rax
15052- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
15053- leaq level2_spare_pgt(%rip), %rbx
15054- movq %rdx, 0(%rbx, %rax, 8)
15055-ident_complete:
15056+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
15057
15058 /*
15059 * Fixup the kernel text+data virtual addresses. Note that
15060@@ -160,8 +156,8 @@ ENTRY(secondary_startup_64)
15061 * after the boot processor executes this code.
15062 */
15063
15064- /* Enable PAE mode and PGE */
15065- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
15066+ /* Enable PAE mode and PSE/PGE */
15067+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
15068 movq %rax, %cr4
15069
15070 /* Setup early boot stage 4 level pagetables. */
15071@@ -183,9 +179,17 @@ ENTRY(secondary_startup_64)
15072 movl $MSR_EFER, %ecx
15073 rdmsr
15074 btsl $_EFER_SCE, %eax /* Enable System Call */
15075- btl $20,%edi /* No Execute supported? */
15076+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
15077 jnc 1f
15078 btsl $_EFER_NX, %eax
15079+ leaq init_level4_pgt(%rip), %rdi
15080+#ifndef CONFIG_EFI
15081+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
15082+#endif
15083+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
15084+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
15085+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
15086+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
15087 1: wrmsr /* Make changes effective */
15088
15089 /* Setup cr0 */
15090@@ -247,6 +251,7 @@ ENTRY(secondary_startup_64)
15091 * jump. In addition we need to ensure %cs is set so we make this
15092 * a far return.
15093 */
15094+ pax_set_fptr_mask
15095 movq initial_code(%rip),%rax
15096 pushq $0 # fake return address to stop unwinder
15097 pushq $__KERNEL_CS # set correct cs
15098@@ -269,7 +274,7 @@ ENTRY(secondary_startup_64)
15099 bad_address:
15100 jmp bad_address
15101
15102- .section ".init.text","ax"
15103+ __INIT
15104 #ifdef CONFIG_EARLY_PRINTK
15105 .globl early_idt_handlers
15106 early_idt_handlers:
15107@@ -314,18 +319,23 @@ ENTRY(early_idt_handler)
15108 #endif /* EARLY_PRINTK */
15109 1: hlt
15110 jmp 1b
15111+ .previous
15112
15113 #ifdef CONFIG_EARLY_PRINTK
15114+ __INITDATA
15115 early_recursion_flag:
15116 .long 0
15117+ .previous
15118
15119+ .section .rodata,"a",@progbits
15120 early_idt_msg:
15121 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
15122 early_idt_ripmsg:
15123 .asciz "RIP %s\n"
15124+ .previous
15125 #endif /* CONFIG_EARLY_PRINTK */
15126- .previous
15127
15128+ .section .rodata,"a",@progbits
15129 #define NEXT_PAGE(name) \
15130 .balign PAGE_SIZE; \
15131 ENTRY(name)
15132@@ -338,7 +348,6 @@ ENTRY(name)
15133 i = i + 1 ; \
15134 .endr
15135
15136- .data
15137 /*
15138 * This default setting generates an ident mapping at address 0x100000
15139 * and a mapping for the kernel that precisely maps virtual address
15140@@ -349,13 +358,41 @@ NEXT_PAGE(init_level4_pgt)
15141 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15142 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
15143 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15144+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
15145+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
15146+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
15147+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
15148+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
15149+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
15150 .org init_level4_pgt + L4_START_KERNEL*8, 0
15151 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
15152 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
15153
15154+#ifdef CONFIG_PAX_PER_CPU_PGD
15155+NEXT_PAGE(cpu_pgd)
15156+ .rept NR_CPUS
15157+ .fill 512,8,0
15158+ .endr
15159+#endif
15160+
15161 NEXT_PAGE(level3_ident_pgt)
15162 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15163+#ifdef CONFIG_XEN
15164 .fill 511,8,0
15165+#else
15166+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
15167+ .fill 510,8,0
15168+#endif
15169+
15170+NEXT_PAGE(level3_vmalloc_start_pgt)
15171+ .fill 512,8,0
15172+
15173+NEXT_PAGE(level3_vmalloc_end_pgt)
15174+ .fill 512,8,0
15175+
15176+NEXT_PAGE(level3_vmemmap_pgt)
15177+ .fill L3_VMEMMAP_START,8,0
15178+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
15179
15180 NEXT_PAGE(level3_kernel_pgt)
15181 .fill L3_START_KERNEL,8,0
15182@@ -363,20 +400,23 @@ NEXT_PAGE(level3_kernel_pgt)
15183 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
15184 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
15185
15186+NEXT_PAGE(level2_vmemmap_pgt)
15187+ .fill 512,8,0
15188+
15189 NEXT_PAGE(level2_fixmap_pgt)
15190- .fill 506,8,0
15191- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
15192- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
15193- .fill 5,8,0
15194+ .fill 507,8,0
15195+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
15196+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
15197+ .fill 4,8,0
15198
15199-NEXT_PAGE(level1_fixmap_pgt)
15200+NEXT_PAGE(level1_vsyscall_pgt)
15201 .fill 512,8,0
15202
15203-NEXT_PAGE(level2_ident_pgt)
15204- /* Since I easily can, map the first 1G.
15205+ /* Since I easily can, map the first 2G.
15206 * Don't set NX because code runs from these pages.
15207 */
15208- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
15209+NEXT_PAGE(level2_ident_pgt)
15210+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
15211
15212 NEXT_PAGE(level2_kernel_pgt)
15213 /*
15214@@ -389,33 +429,55 @@ NEXT_PAGE(level2_kernel_pgt)
15215 * If you want to increase this then increase MODULES_VADDR
15216 * too.)
15217 */
15218- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
15219- KERNEL_IMAGE_SIZE/PMD_SIZE)
15220-
15221-NEXT_PAGE(level2_spare_pgt)
15222- .fill 512, 8, 0
15223+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
15224
15225 #undef PMDS
15226 #undef NEXT_PAGE
15227
15228- .data
15229+ .align PAGE_SIZE
15230+ENTRY(cpu_gdt_table)
15231+ .rept NR_CPUS
15232+ .quad 0x0000000000000000 /* NULL descriptor */
15233+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
15234+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
15235+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
15236+ .quad 0x00cffb000000ffff /* __USER32_CS */
15237+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
15238+ .quad 0x00affb000000ffff /* __USER_CS */
15239+
15240+#ifdef CONFIG_PAX_KERNEXEC
15241+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
15242+#else
15243+ .quad 0x0 /* unused */
15244+#endif
15245+
15246+ .quad 0,0 /* TSS */
15247+ .quad 0,0 /* LDT */
15248+ .quad 0,0,0 /* three TLS descriptors */
15249+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
15250+ /* asm/segment.h:GDT_ENTRIES must match this */
15251+
15252+ /* zero the remaining page */
15253+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
15254+ .endr
15255+
15256 .align 16
15257 .globl early_gdt_descr
15258 early_gdt_descr:
15259 .word GDT_ENTRIES*8-1
15260 early_gdt_descr_base:
15261- .quad INIT_PER_CPU_VAR(gdt_page)
15262+ .quad cpu_gdt_table
15263
15264 ENTRY(phys_base)
15265 /* This must match the first entry in level2_kernel_pgt */
15266 .quad 0x0000000000000000
15267
15268 #include "../../x86/xen/xen-head.S"
15269-
15270- .section .bss, "aw", @nobits
15271+
15272+ .section .rodata,"a",@progbits
15273 .align L1_CACHE_BYTES
15274 ENTRY(idt_table)
15275- .skip IDT_ENTRIES * 16
15276+ .fill 512,8,0
15277
15278 __PAGE_ALIGNED_BSS
15279 .align PAGE_SIZE
15280diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
15281index 9c3bd4a..e1d9b35 100644
15282--- a/arch/x86/kernel/i386_ksyms_32.c
15283+++ b/arch/x86/kernel/i386_ksyms_32.c
15284@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
15285 EXPORT_SYMBOL(cmpxchg8b_emu);
15286 #endif
15287
15288+EXPORT_SYMBOL_GPL(cpu_gdt_table);
15289+
15290 /* Networking helper routines. */
15291 EXPORT_SYMBOL(csum_partial_copy_generic);
15292+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
15293+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
15294
15295 EXPORT_SYMBOL(__get_user_1);
15296 EXPORT_SYMBOL(__get_user_2);
15297@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
15298
15299 EXPORT_SYMBOL(csum_partial);
15300 EXPORT_SYMBOL(empty_zero_page);
15301+
15302+#ifdef CONFIG_PAX_KERNEXEC
15303+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
15304+#endif
15305diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
15306index 6104852..6114160 100644
15307--- a/arch/x86/kernel/i8259.c
15308+++ b/arch/x86/kernel/i8259.c
15309@@ -210,7 +210,7 @@ spurious_8259A_irq:
15310 "spurious 8259A interrupt: IRQ%d.\n", irq);
15311 spurious_irq_mask |= irqmask;
15312 }
15313- atomic_inc(&irq_err_count);
15314+ atomic_inc_unchecked(&irq_err_count);
15315 /*
15316 * Theoretically we do not have to handle this IRQ,
15317 * but in Linux this does not cause problems and is
15318diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
15319index 43e9ccf..44ccf6f 100644
15320--- a/arch/x86/kernel/init_task.c
15321+++ b/arch/x86/kernel/init_task.c
15322@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
15323 * way process stacks are handled. This is done by having a special
15324 * "init_task" linker map entry..
15325 */
15326-union thread_union init_thread_union __init_task_data =
15327- { INIT_THREAD_INFO(init_task) };
15328+union thread_union init_thread_union __init_task_data;
15329
15330 /*
15331 * Initial task structure.
15332@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
15333 * section. Since TSS's are completely CPU-local, we want them
15334 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
15335 */
15336-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
15337-
15338+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
15339+EXPORT_SYMBOL(init_tss);
15340diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
15341index 8c96897..be66bfa 100644
15342--- a/arch/x86/kernel/ioport.c
15343+++ b/arch/x86/kernel/ioport.c
15344@@ -6,6 +6,7 @@
15345 #include <linux/sched.h>
15346 #include <linux/kernel.h>
15347 #include <linux/capability.h>
15348+#include <linux/security.h>
15349 #include <linux/errno.h>
15350 #include <linux/types.h>
15351 #include <linux/ioport.h>
15352@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
15353
15354 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
15355 return -EINVAL;
15356+#ifdef CONFIG_GRKERNSEC_IO
15357+ if (turn_on && grsec_disable_privio) {
15358+ gr_handle_ioperm();
15359+ return -EPERM;
15360+ }
15361+#endif
15362 if (turn_on && !capable(CAP_SYS_RAWIO))
15363 return -EPERM;
15364
15365@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
15366 * because the ->io_bitmap_max value must match the bitmap
15367 * contents:
15368 */
15369- tss = &per_cpu(init_tss, get_cpu());
15370+ tss = init_tss + get_cpu();
15371
15372 if (turn_on)
15373 bitmap_clear(t->io_bitmap_ptr, from, num);
15374@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
15375 return -EINVAL;
15376 /* Trying to gain more privileges? */
15377 if (level > old) {
15378+#ifdef CONFIG_GRKERNSEC_IO
15379+ if (grsec_disable_privio) {
15380+ gr_handle_iopl();
15381+ return -EPERM;
15382+ }
15383+#endif
15384 if (!capable(CAP_SYS_RAWIO))
15385 return -EPERM;
15386 }
15387diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
15388index 429e0c9..17b3ece 100644
15389--- a/arch/x86/kernel/irq.c
15390+++ b/arch/x86/kernel/irq.c
15391@@ -18,7 +18,7 @@
15392 #include <asm/mce.h>
15393 #include <asm/hw_irq.h>
15394
15395-atomic_t irq_err_count;
15396+atomic_unchecked_t irq_err_count;
15397
15398 /* Function pointer for generic interrupt vector handling */
15399 void (*x86_platform_ipi_callback)(void) = NULL;
15400@@ -117,9 +117,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
15401 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
15402 seq_printf(p, " Machine check polls\n");
15403 #endif
15404- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
15405+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
15406 #if defined(CONFIG_X86_IO_APIC)
15407- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
15408+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
15409 #endif
15410 return 0;
15411 }
15412@@ -159,10 +159,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
15413
15414 u64 arch_irq_stat(void)
15415 {
15416- u64 sum = atomic_read(&irq_err_count);
15417+ u64 sum = atomic_read_unchecked(&irq_err_count);
15418
15419 #ifdef CONFIG_X86_IO_APIC
15420- sum += atomic_read(&irq_mis_count);
15421+ sum += atomic_read_unchecked(&irq_mis_count);
15422 #endif
15423 return sum;
15424 }
15425diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
15426index 7209070..cbcd71a 100644
15427--- a/arch/x86/kernel/irq_32.c
15428+++ b/arch/x86/kernel/irq_32.c
15429@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
15430 __asm__ __volatile__("andl %%esp,%0" :
15431 "=r" (sp) : "0" (THREAD_SIZE - 1));
15432
15433- return sp < (sizeof(struct thread_info) + STACK_WARN);
15434+ return sp < STACK_WARN;
15435 }
15436
15437 static void print_stack_overflow(void)
15438@@ -54,8 +54,8 @@ static inline void print_stack_overflow(void) { }
15439 * per-CPU IRQ handling contexts (thread information and stack)
15440 */
15441 union irq_ctx {
15442- struct thread_info tinfo;
15443- u32 stack[THREAD_SIZE/sizeof(u32)];
15444+ unsigned long previous_esp;
15445+ u32 stack[THREAD_SIZE/sizeof(u32)];
15446 } __attribute__((aligned(THREAD_SIZE)));
15447
15448 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
15449@@ -75,10 +75,9 @@ static void call_on_stack(void *func, void *stack)
15450 static inline int
15451 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15452 {
15453- union irq_ctx *curctx, *irqctx;
15454+ union irq_ctx *irqctx;
15455 u32 *isp, arg1, arg2;
15456
15457- curctx = (union irq_ctx *) current_thread_info();
15458 irqctx = __this_cpu_read(hardirq_ctx);
15459
15460 /*
15461@@ -87,21 +86,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15462 * handler) we can't do that and just have to keep using the
15463 * current stack (which is the irq stack already after all)
15464 */
15465- if (unlikely(curctx == irqctx))
15466+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
15467 return 0;
15468
15469 /* build the stack frame on the IRQ stack */
15470- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
15471- irqctx->tinfo.task = curctx->tinfo.task;
15472- irqctx->tinfo.previous_esp = current_stack_pointer;
15473+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
15474+ irqctx->previous_esp = current_stack_pointer;
15475
15476- /*
15477- * Copy the softirq bits in preempt_count so that the
15478- * softirq checks work in the hardirq context.
15479- */
15480- irqctx->tinfo.preempt_count =
15481- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
15482- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
15483+#ifdef CONFIG_PAX_MEMORY_UDEREF
15484+ __set_fs(MAKE_MM_SEG(0));
15485+#endif
15486
15487 if (unlikely(overflow))
15488 call_on_stack(print_stack_overflow, isp);
15489@@ -113,6 +107,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15490 : "0" (irq), "1" (desc), "2" (isp),
15491 "D" (desc->handle_irq)
15492 : "memory", "cc", "ecx");
15493+
15494+#ifdef CONFIG_PAX_MEMORY_UDEREF
15495+ __set_fs(current_thread_info()->addr_limit);
15496+#endif
15497+
15498 return 1;
15499 }
15500
15501@@ -121,29 +120,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15502 */
15503 void __cpuinit irq_ctx_init(int cpu)
15504 {
15505- union irq_ctx *irqctx;
15506-
15507 if (per_cpu(hardirq_ctx, cpu))
15508 return;
15509
15510- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
15511- THREAD_FLAGS,
15512- THREAD_ORDER));
15513- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
15514- irqctx->tinfo.cpu = cpu;
15515- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
15516- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
15517-
15518- per_cpu(hardirq_ctx, cpu) = irqctx;
15519-
15520- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
15521- THREAD_FLAGS,
15522- THREAD_ORDER));
15523- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
15524- irqctx->tinfo.cpu = cpu;
15525- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
15526-
15527- per_cpu(softirq_ctx, cpu) = irqctx;
15528+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
15529+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
15530
15531 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
15532 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
15533@@ -152,7 +133,6 @@ void __cpuinit irq_ctx_init(int cpu)
15534 asmlinkage void do_softirq(void)
15535 {
15536 unsigned long flags;
15537- struct thread_info *curctx;
15538 union irq_ctx *irqctx;
15539 u32 *isp;
15540
15541@@ -162,15 +142,22 @@ asmlinkage void do_softirq(void)
15542 local_irq_save(flags);
15543
15544 if (local_softirq_pending()) {
15545- curctx = current_thread_info();
15546 irqctx = __this_cpu_read(softirq_ctx);
15547- irqctx->tinfo.task = curctx->task;
15548- irqctx->tinfo.previous_esp = current_stack_pointer;
15549+ irqctx->previous_esp = current_stack_pointer;
15550
15551 /* build the stack frame on the softirq stack */
15552- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
15553+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
15554+
15555+#ifdef CONFIG_PAX_MEMORY_UDEREF
15556+ __set_fs(MAKE_MM_SEG(0));
15557+#endif
15558
15559 call_on_stack(__do_softirq, isp);
15560+
15561+#ifdef CONFIG_PAX_MEMORY_UDEREF
15562+ __set_fs(current_thread_info()->addr_limit);
15563+#endif
15564+
15565 /*
15566 * Shouldn't happen, we returned above if in_interrupt():
15567 */
15568diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
15569index 69bca46..0bac999 100644
15570--- a/arch/x86/kernel/irq_64.c
15571+++ b/arch/x86/kernel/irq_64.c
15572@@ -38,7 +38,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
15573 #ifdef CONFIG_DEBUG_STACKOVERFLOW
15574 u64 curbase = (u64)task_stack_page(current);
15575
15576- if (user_mode_vm(regs))
15577+ if (user_mode(regs))
15578 return;
15579
15580 WARN_ONCE(regs->sp >= curbase &&
15581diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
15582index faba577..93b9e71 100644
15583--- a/arch/x86/kernel/kgdb.c
15584+++ b/arch/x86/kernel/kgdb.c
15585@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
15586 #ifdef CONFIG_X86_32
15587 switch (regno) {
15588 case GDB_SS:
15589- if (!user_mode_vm(regs))
15590+ if (!user_mode(regs))
15591 *(unsigned long *)mem = __KERNEL_DS;
15592 break;
15593 case GDB_SP:
15594- if (!user_mode_vm(regs))
15595+ if (!user_mode(regs))
15596 *(unsigned long *)mem = kernel_stack_pointer(regs);
15597 break;
15598 case GDB_GS:
15599@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
15600 case 'k':
15601 /* clear the trace bit */
15602 linux_regs->flags &= ~X86_EFLAGS_TF;
15603- atomic_set(&kgdb_cpu_doing_single_step, -1);
15604+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
15605
15606 /* set the trace bit if we're stepping */
15607 if (remcomInBuffer[0] == 's') {
15608 linux_regs->flags |= X86_EFLAGS_TF;
15609- atomic_set(&kgdb_cpu_doing_single_step,
15610+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
15611 raw_smp_processor_id());
15612 }
15613
15614@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
15615
15616 switch (cmd) {
15617 case DIE_DEBUG:
15618- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
15619+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
15620 if (user_mode(regs))
15621 return single_step_cont(regs, args);
15622 break;
15623diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
15624index 7da647d..5d3c4c1 100644
15625--- a/arch/x86/kernel/kprobes.c
15626+++ b/arch/x86/kernel/kprobes.c
15627@@ -118,8 +118,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
15628 } __attribute__((packed)) *insn;
15629
15630 insn = (struct __arch_relative_insn *)from;
15631+
15632+ pax_open_kernel();
15633 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
15634 insn->op = op;
15635+ pax_close_kernel();
15636 }
15637
15638 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
15639@@ -156,7 +159,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
15640 kprobe_opcode_t opcode;
15641 kprobe_opcode_t *orig_opcodes = opcodes;
15642
15643- if (search_exception_tables((unsigned long)opcodes))
15644+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
15645 return 0; /* Page fault may occur on this address. */
15646
15647 retry:
15648@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
15649 }
15650 }
15651 insn_get_length(&insn);
15652+ pax_open_kernel();
15653 memcpy(dest, insn.kaddr, insn.length);
15654+ pax_close_kernel();
15655
15656 #ifdef CONFIG_X86_64
15657 if (insn_rip_relative(&insn)) {
15658@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
15659 (u8 *) dest;
15660 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
15661 disp = (u8 *) dest + insn_offset_displacement(&insn);
15662+ pax_open_kernel();
15663 *(s32 *) disp = (s32) newdisp;
15664+ pax_close_kernel();
15665 }
15666 #endif
15667 return insn.length;
15668@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
15669 */
15670 __copy_instruction(p->ainsn.insn, p->addr, 0);
15671
15672- if (can_boost(p->addr))
15673+ if (can_boost(ktla_ktva(p->addr)))
15674 p->ainsn.boostable = 0;
15675 else
15676 p->ainsn.boostable = -1;
15677
15678- p->opcode = *p->addr;
15679+ p->opcode = *(ktla_ktva(p->addr));
15680 }
15681
15682 int __kprobes arch_prepare_kprobe(struct kprobe *p)
15683@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
15684 * nor set current_kprobe, because it doesn't use single
15685 * stepping.
15686 */
15687- regs->ip = (unsigned long)p->ainsn.insn;
15688+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
15689 preempt_enable_no_resched();
15690 return;
15691 }
15692@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
15693 if (p->opcode == BREAKPOINT_INSTRUCTION)
15694 regs->ip = (unsigned long)p->addr;
15695 else
15696- regs->ip = (unsigned long)p->ainsn.insn;
15697+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
15698 }
15699
15700 /*
15701@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
15702 setup_singlestep(p, regs, kcb, 0);
15703 return 1;
15704 }
15705- } else if (*addr != BREAKPOINT_INSTRUCTION) {
15706+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
15707 /*
15708 * The breakpoint instruction was removed right
15709 * after we hit it. Another cpu has removed
15710@@ -683,6 +690,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
15711 " movq %rax, 152(%rsp)\n"
15712 RESTORE_REGS_STRING
15713 " popfq\n"
15714+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
15715+ " btsq $63,(%rsp)\n"
15716+#endif
15717 #else
15718 " pushf\n"
15719 SAVE_REGS_STRING
15720@@ -820,7 +830,7 @@ static void __kprobes resume_execution(struct kprobe *p,
15721 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
15722 {
15723 unsigned long *tos = stack_addr(regs);
15724- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
15725+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
15726 unsigned long orig_ip = (unsigned long)p->addr;
15727 kprobe_opcode_t *insn = p->ainsn.insn;
15728
15729@@ -1002,7 +1012,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
15730 struct die_args *args = data;
15731 int ret = NOTIFY_DONE;
15732
15733- if (args->regs && user_mode_vm(args->regs))
15734+ if (args->regs && user_mode(args->regs))
15735 return ret;
15736
15737 switch (val) {
15738@@ -1384,7 +1394,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
15739 * Verify if the address gap is in 2GB range, because this uses
15740 * a relative jump.
15741 */
15742- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
15743+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
15744 if (abs(rel) > 0x7fffffff)
15745 return -ERANGE;
15746
15747@@ -1405,11 +1415,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
15748 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
15749
15750 /* Set probe function call */
15751- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
15752+ synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
15753
15754 /* Set returning jmp instruction at the tail of out-of-line buffer */
15755 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
15756- (u8 *)op->kp.addr + op->optinsn.size);
15757+ (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
15758
15759 flush_icache_range((unsigned long) buf,
15760 (unsigned long) buf + TMPL_END_IDX +
15761@@ -1431,7 +1441,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
15762 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
15763
15764 /* Backup instructions which will be replaced by jump address */
15765- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
15766+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
15767 RELATIVE_ADDR_SIZE);
15768
15769 insn_buf[0] = RELATIVEJUMP_OPCODE;
15770diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
15771index a9c2116..a52d4fc 100644
15772--- a/arch/x86/kernel/kvm.c
15773+++ b/arch/x86/kernel/kvm.c
15774@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(void)
15775 pv_mmu_ops.set_pud = kvm_set_pud;
15776 #if PAGETABLE_LEVELS == 4
15777 pv_mmu_ops.set_pgd = kvm_set_pgd;
15778+ pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
15779 #endif
15780 #endif
15781 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
15782diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
15783index ea69726..604d066 100644
15784--- a/arch/x86/kernel/ldt.c
15785+++ b/arch/x86/kernel/ldt.c
15786@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
15787 if (reload) {
15788 #ifdef CONFIG_SMP
15789 preempt_disable();
15790- load_LDT(pc);
15791+ load_LDT_nolock(pc);
15792 if (!cpumask_equal(mm_cpumask(current->mm),
15793 cpumask_of(smp_processor_id())))
15794 smp_call_function(flush_ldt, current->mm, 1);
15795 preempt_enable();
15796 #else
15797- load_LDT(pc);
15798+ load_LDT_nolock(pc);
15799 #endif
15800 }
15801 if (oldsize) {
15802@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
15803 return err;
15804
15805 for (i = 0; i < old->size; i++)
15806- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
15807+ write_ldt_entry(new->ldt, i, old->ldt + i);
15808 return 0;
15809 }
15810
15811@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
15812 retval = copy_ldt(&mm->context, &old_mm->context);
15813 mutex_unlock(&old_mm->context.lock);
15814 }
15815+
15816+ if (tsk == current) {
15817+ mm->context.vdso = 0;
15818+
15819+#ifdef CONFIG_X86_32
15820+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
15821+ mm->context.user_cs_base = 0UL;
15822+ mm->context.user_cs_limit = ~0UL;
15823+
15824+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
15825+ cpus_clear(mm->context.cpu_user_cs_mask);
15826+#endif
15827+
15828+#endif
15829+#endif
15830+
15831+ }
15832+
15833 return retval;
15834 }
15835
15836@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
15837 }
15838 }
15839
15840+#ifdef CONFIG_PAX_SEGMEXEC
15841+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
15842+ error = -EINVAL;
15843+ goto out_unlock;
15844+ }
15845+#endif
15846+
15847 fill_ldt(&ldt, &ldt_info);
15848 if (oldmode)
15849 ldt.avl = 0;
15850diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
15851index a3fa43b..8966f4c 100644
15852--- a/arch/x86/kernel/machine_kexec_32.c
15853+++ b/arch/x86/kernel/machine_kexec_32.c
15854@@ -27,7 +27,7 @@
15855 #include <asm/cacheflush.h>
15856 #include <asm/debugreg.h>
15857
15858-static void set_idt(void *newidt, __u16 limit)
15859+static void set_idt(struct desc_struct *newidt, __u16 limit)
15860 {
15861 struct desc_ptr curidt;
15862
15863@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
15864 }
15865
15866
15867-static void set_gdt(void *newgdt, __u16 limit)
15868+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
15869 {
15870 struct desc_ptr curgdt;
15871
15872@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
15873 }
15874
15875 control_page = page_address(image->control_code_page);
15876- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
15877+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
15878
15879 relocate_kernel_ptr = control_page;
15880 page_list[PA_CONTROL_PAGE] = __pa(control_page);
15881diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
15882index 3ca42d0..7cff8cc 100644
15883--- a/arch/x86/kernel/microcode_intel.c
15884+++ b/arch/x86/kernel/microcode_intel.c
15885@@ -436,13 +436,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
15886
15887 static int get_ucode_user(void *to, const void *from, size_t n)
15888 {
15889- return copy_from_user(to, from, n);
15890+ return copy_from_user(to, (const void __force_user *)from, n);
15891 }
15892
15893 static enum ucode_state
15894 request_microcode_user(int cpu, const void __user *buf, size_t size)
15895 {
15896- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
15897+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
15898 }
15899
15900 static void microcode_fini_cpu(int cpu)
15901diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
15902index 925179f..267ac7a 100644
15903--- a/arch/x86/kernel/module.c
15904+++ b/arch/x86/kernel/module.c
15905@@ -36,15 +36,60 @@
15906 #define DEBUGP(fmt...)
15907 #endif
15908
15909-void *module_alloc(unsigned long size)
15910+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
15911 {
15912- if (PAGE_ALIGN(size) > MODULES_LEN)
15913+ if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
15914 return NULL;
15915 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
15916- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
15917+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
15918 -1, __builtin_return_address(0));
15919 }
15920
15921+void *module_alloc(unsigned long size)
15922+{
15923+
15924+#ifdef CONFIG_PAX_KERNEXEC
15925+ return __module_alloc(size, PAGE_KERNEL);
15926+#else
15927+ return __module_alloc(size, PAGE_KERNEL_EXEC);
15928+#endif
15929+
15930+}
15931+
15932+#ifdef CONFIG_PAX_KERNEXEC
15933+#ifdef CONFIG_X86_32
15934+void *module_alloc_exec(unsigned long size)
15935+{
15936+ struct vm_struct *area;
15937+
15938+ if (size == 0)
15939+ return NULL;
15940+
15941+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
15942+ return area ? area->addr : NULL;
15943+}
15944+EXPORT_SYMBOL(module_alloc_exec);
15945+
15946+void module_free_exec(struct module *mod, void *module_region)
15947+{
15948+ vunmap(module_region);
15949+}
15950+EXPORT_SYMBOL(module_free_exec);
15951+#else
15952+void module_free_exec(struct module *mod, void *module_region)
15953+{
15954+ module_free(mod, module_region);
15955+}
15956+EXPORT_SYMBOL(module_free_exec);
15957+
15958+void *module_alloc_exec(unsigned long size)
15959+{
15960+ return __module_alloc(size, PAGE_KERNEL_RX);
15961+}
15962+EXPORT_SYMBOL(module_alloc_exec);
15963+#endif
15964+#endif
15965+
15966 #ifdef CONFIG_X86_32
15967 int apply_relocate(Elf32_Shdr *sechdrs,
15968 const char *strtab,
15969@@ -55,14 +100,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
15970 unsigned int i;
15971 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
15972 Elf32_Sym *sym;
15973- uint32_t *location;
15974+ uint32_t *plocation, location;
15975
15976 DEBUGP("Applying relocate section %u to %u\n", relsec,
15977 sechdrs[relsec].sh_info);
15978 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
15979 /* This is where to make the change */
15980- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
15981- + rel[i].r_offset;
15982+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
15983+ location = (uint32_t)plocation;
15984+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
15985+ plocation = ktla_ktva((void *)plocation);
15986 /* This is the symbol it is referring to. Note that all
15987 undefined symbols have been resolved. */
15988 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
15989@@ -71,11 +118,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
15990 switch (ELF32_R_TYPE(rel[i].r_info)) {
15991 case R_386_32:
15992 /* We add the value into the location given */
15993- *location += sym->st_value;
15994+ pax_open_kernel();
15995+ *plocation += sym->st_value;
15996+ pax_close_kernel();
15997 break;
15998 case R_386_PC32:
15999 /* Add the value, subtract its postition */
16000- *location += sym->st_value - (uint32_t)location;
16001+ pax_open_kernel();
16002+ *plocation += sym->st_value - location;
16003+ pax_close_kernel();
16004 break;
16005 default:
16006 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
16007@@ -120,21 +171,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
16008 case R_X86_64_NONE:
16009 break;
16010 case R_X86_64_64:
16011+ pax_open_kernel();
16012 *(u64 *)loc = val;
16013+ pax_close_kernel();
16014 break;
16015 case R_X86_64_32:
16016+ pax_open_kernel();
16017 *(u32 *)loc = val;
16018+ pax_close_kernel();
16019 if (val != *(u32 *)loc)
16020 goto overflow;
16021 break;
16022 case R_X86_64_32S:
16023+ pax_open_kernel();
16024 *(s32 *)loc = val;
16025+ pax_close_kernel();
16026 if ((s64)val != *(s32 *)loc)
16027 goto overflow;
16028 break;
16029 case R_X86_64_PC32:
16030 val -= (u64)loc;
16031+ pax_open_kernel();
16032 *(u32 *)loc = val;
16033+ pax_close_kernel();
16034+
16035 #if 0
16036 if ((s64)val != *(s32 *)loc)
16037 goto overflow;
16038diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
16039index e88f37b..1353db6 100644
16040--- a/arch/x86/kernel/nmi.c
16041+++ b/arch/x86/kernel/nmi.c
16042@@ -408,6 +408,17 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
16043 dotraplinkage notrace __kprobes void
16044 do_nmi(struct pt_regs *regs, long error_code)
16045 {
16046+
16047+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
16048+ if (!user_mode(regs)) {
16049+ unsigned long cs = regs->cs & 0xFFFF;
16050+ unsigned long ip = ktva_ktla(regs->ip);
16051+
16052+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
16053+ regs->ip = ip;
16054+ }
16055+#endif
16056+
16057 nmi_enter();
16058
16059 inc_irq_stat(__nmi_count);
16060diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
16061index 676b8c7..870ba04 100644
16062--- a/arch/x86/kernel/paravirt-spinlocks.c
16063+++ b/arch/x86/kernel/paravirt-spinlocks.c
16064@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
16065 arch_spin_lock(lock);
16066 }
16067
16068-struct pv_lock_ops pv_lock_ops = {
16069+struct pv_lock_ops pv_lock_ops __read_only = {
16070 #ifdef CONFIG_SMP
16071 .spin_is_locked = __ticket_spin_is_locked,
16072 .spin_is_contended = __ticket_spin_is_contended,
16073diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
16074index d90272e..6bb013b 100644
16075--- a/arch/x86/kernel/paravirt.c
16076+++ b/arch/x86/kernel/paravirt.c
16077@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
16078 {
16079 return x;
16080 }
16081+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
16082+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
16083+#endif
16084
16085 void __init default_banner(void)
16086 {
16087@@ -145,15 +148,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
16088 if (opfunc == NULL)
16089 /* If there's no function, patch it with a ud2a (BUG) */
16090 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
16091- else if (opfunc == _paravirt_nop)
16092+ else if (opfunc == (void *)_paravirt_nop)
16093 /* If the operation is a nop, then nop the callsite */
16094 ret = paravirt_patch_nop();
16095
16096 /* identity functions just return their single argument */
16097- else if (opfunc == _paravirt_ident_32)
16098+ else if (opfunc == (void *)_paravirt_ident_32)
16099 ret = paravirt_patch_ident_32(insnbuf, len);
16100- else if (opfunc == _paravirt_ident_64)
16101+ else if (opfunc == (void *)_paravirt_ident_64)
16102 ret = paravirt_patch_ident_64(insnbuf, len);
16103+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
16104+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
16105+ ret = paravirt_patch_ident_64(insnbuf, len);
16106+#endif
16107
16108 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
16109 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
16110@@ -178,7 +185,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
16111 if (insn_len > len || start == NULL)
16112 insn_len = len;
16113 else
16114- memcpy(insnbuf, start, insn_len);
16115+ memcpy(insnbuf, ktla_ktva(start), insn_len);
16116
16117 return insn_len;
16118 }
16119@@ -302,7 +309,7 @@ void arch_flush_lazy_mmu_mode(void)
16120 preempt_enable();
16121 }
16122
16123-struct pv_info pv_info = {
16124+struct pv_info pv_info __read_only = {
16125 .name = "bare hardware",
16126 .paravirt_enabled = 0,
16127 .kernel_rpl = 0,
16128@@ -313,16 +320,16 @@ struct pv_info pv_info = {
16129 #endif
16130 };
16131
16132-struct pv_init_ops pv_init_ops = {
16133+struct pv_init_ops pv_init_ops __read_only = {
16134 .patch = native_patch,
16135 };
16136
16137-struct pv_time_ops pv_time_ops = {
16138+struct pv_time_ops pv_time_ops __read_only = {
16139 .sched_clock = native_sched_clock,
16140 .steal_clock = native_steal_clock,
16141 };
16142
16143-struct pv_irq_ops pv_irq_ops = {
16144+struct pv_irq_ops pv_irq_ops __read_only = {
16145 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
16146 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
16147 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
16148@@ -334,7 +341,7 @@ struct pv_irq_ops pv_irq_ops = {
16149 #endif
16150 };
16151
16152-struct pv_cpu_ops pv_cpu_ops = {
16153+struct pv_cpu_ops pv_cpu_ops __read_only = {
16154 .cpuid = native_cpuid,
16155 .get_debugreg = native_get_debugreg,
16156 .set_debugreg = native_set_debugreg,
16157@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
16158 .end_context_switch = paravirt_nop,
16159 };
16160
16161-struct pv_apic_ops pv_apic_ops = {
16162+struct pv_apic_ops pv_apic_ops __read_only = {
16163 #ifdef CONFIG_X86_LOCAL_APIC
16164 .startup_ipi_hook = paravirt_nop,
16165 #endif
16166 };
16167
16168-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
16169+#ifdef CONFIG_X86_32
16170+#ifdef CONFIG_X86_PAE
16171+/* 64-bit pagetable entries */
16172+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
16173+#else
16174 /* 32-bit pagetable entries */
16175 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
16176+#endif
16177 #else
16178 /* 64-bit pagetable entries */
16179 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
16180 #endif
16181
16182-struct pv_mmu_ops pv_mmu_ops = {
16183+struct pv_mmu_ops pv_mmu_ops __read_only = {
16184
16185 .read_cr2 = native_read_cr2,
16186 .write_cr2 = native_write_cr2,
16187@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
16188 .make_pud = PTE_IDENT,
16189
16190 .set_pgd = native_set_pgd,
16191+ .set_pgd_batched = native_set_pgd_batched,
16192 #endif
16193 #endif /* PAGETABLE_LEVELS >= 3 */
16194
16195@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
16196 },
16197
16198 .set_fixmap = native_set_fixmap,
16199+
16200+#ifdef CONFIG_PAX_KERNEXEC
16201+ .pax_open_kernel = native_pax_open_kernel,
16202+ .pax_close_kernel = native_pax_close_kernel,
16203+#endif
16204+
16205 };
16206
16207 EXPORT_SYMBOL_GPL(pv_time_ops);
16208diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
16209index 35ccf75..7a15747 100644
16210--- a/arch/x86/kernel/pci-iommu_table.c
16211+++ b/arch/x86/kernel/pci-iommu_table.c
16212@@ -2,7 +2,7 @@
16213 #include <asm/iommu_table.h>
16214 #include <linux/string.h>
16215 #include <linux/kallsyms.h>
16216-
16217+#include <linux/sched.h>
16218
16219 #define DEBUG 1
16220
16221diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
16222index ee5d4fb..426649b 100644
16223--- a/arch/x86/kernel/process.c
16224+++ b/arch/x86/kernel/process.c
16225@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
16226
16227 void free_thread_info(struct thread_info *ti)
16228 {
16229- free_thread_xstate(ti->task);
16230 free_pages((unsigned long)ti, THREAD_ORDER);
16231 }
16232
16233+static struct kmem_cache *task_struct_cachep;
16234+
16235 void arch_task_cache_init(void)
16236 {
16237- task_xstate_cachep =
16238- kmem_cache_create("task_xstate", xstate_size,
16239+ /* create a slab on which task_structs can be allocated */
16240+ task_struct_cachep =
16241+ kmem_cache_create("task_struct", sizeof(struct task_struct),
16242+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
16243+
16244+ task_xstate_cachep =
16245+ kmem_cache_create("task_xstate", xstate_size,
16246 __alignof__(union thread_xstate),
16247- SLAB_PANIC | SLAB_NOTRACK, NULL);
16248+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
16249+}
16250+
16251+struct task_struct *alloc_task_struct_node(int node)
16252+{
16253+ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
16254+}
16255+
16256+void free_task_struct(struct task_struct *task)
16257+{
16258+ free_thread_xstate(task);
16259+ kmem_cache_free(task_struct_cachep, task);
16260 }
16261
16262 /*
16263@@ -70,7 +87,7 @@ void exit_thread(void)
16264 unsigned long *bp = t->io_bitmap_ptr;
16265
16266 if (bp) {
16267- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
16268+ struct tss_struct *tss = init_tss + get_cpu();
16269
16270 t->io_bitmap_ptr = NULL;
16271 clear_thread_flag(TIF_IO_BITMAP);
16272@@ -106,7 +123,7 @@ void show_regs_common(void)
16273
16274 printk(KERN_CONT "\n");
16275 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
16276- current->pid, current->comm, print_tainted(),
16277+ task_pid_nr(current), current->comm, print_tainted(),
16278 init_utsname()->release,
16279 (int)strcspn(init_utsname()->version, " "),
16280 init_utsname()->version);
16281@@ -120,6 +137,9 @@ void flush_thread(void)
16282 {
16283 struct task_struct *tsk = current;
16284
16285+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
16286+ loadsegment(gs, 0);
16287+#endif
16288 flush_ptrace_hw_breakpoint(tsk);
16289 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
16290 /*
16291@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
16292 regs.di = (unsigned long) arg;
16293
16294 #ifdef CONFIG_X86_32
16295- regs.ds = __USER_DS;
16296- regs.es = __USER_DS;
16297+ regs.ds = __KERNEL_DS;
16298+ regs.es = __KERNEL_DS;
16299 regs.fs = __KERNEL_PERCPU;
16300- regs.gs = __KERNEL_STACK_CANARY;
16301+ savesegment(gs, regs.gs);
16302 #else
16303 regs.ss = __KERNEL_DS;
16304 #endif
16305@@ -411,7 +431,7 @@ bool set_pm_idle_to_default(void)
16306
16307 return ret;
16308 }
16309-void stop_this_cpu(void *dummy)
16310+__noreturn void stop_this_cpu(void *dummy)
16311 {
16312 local_irq_disable();
16313 /*
16314@@ -653,16 +673,37 @@ static int __init idle_setup(char *str)
16315 }
16316 early_param("idle", idle_setup);
16317
16318-unsigned long arch_align_stack(unsigned long sp)
16319+#ifdef CONFIG_PAX_RANDKSTACK
16320+void pax_randomize_kstack(struct pt_regs *regs)
16321 {
16322- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
16323- sp -= get_random_int() % 8192;
16324- return sp & ~0xf;
16325-}
16326+ struct thread_struct *thread = &current->thread;
16327+ unsigned long time;
16328
16329-unsigned long arch_randomize_brk(struct mm_struct *mm)
16330-{
16331- unsigned long range_end = mm->brk + 0x02000000;
16332- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
16333-}
16334+ if (!randomize_va_space)
16335+ return;
16336+
16337+ if (v8086_mode(regs))
16338+ return;
16339
16340+ rdtscl(time);
16341+
16342+ /* P4 seems to return a 0 LSB, ignore it */
16343+#ifdef CONFIG_MPENTIUM4
16344+ time &= 0x3EUL;
16345+ time <<= 2;
16346+#elif defined(CONFIG_X86_64)
16347+ time &= 0xFUL;
16348+ time <<= 4;
16349+#else
16350+ time &= 0x1FUL;
16351+ time <<= 3;
16352+#endif
16353+
16354+ thread->sp0 ^= time;
16355+ load_sp0(init_tss + smp_processor_id(), thread);
16356+
16357+#ifdef CONFIG_X86_64
16358+ percpu_write(kernel_stack, thread->sp0);
16359+#endif
16360+}
16361+#endif
16362diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
16363index 795b79f..063767a 100644
16364--- a/arch/x86/kernel/process_32.c
16365+++ b/arch/x86/kernel/process_32.c
16366@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
16367 unsigned long thread_saved_pc(struct task_struct *tsk)
16368 {
16369 return ((unsigned long *)tsk->thread.sp)[3];
16370+//XXX return tsk->thread.eip;
16371 }
16372
16373 #ifndef CONFIG_SMP
16374@@ -130,15 +131,14 @@ void __show_regs(struct pt_regs *regs, int all)
16375 unsigned long sp;
16376 unsigned short ss, gs;
16377
16378- if (user_mode_vm(regs)) {
16379+ if (user_mode(regs)) {
16380 sp = regs->sp;
16381 ss = regs->ss & 0xffff;
16382- gs = get_user_gs(regs);
16383 } else {
16384 sp = kernel_stack_pointer(regs);
16385 savesegment(ss, ss);
16386- savesegment(gs, gs);
16387 }
16388+ gs = get_user_gs(regs);
16389
16390 show_regs_common();
16391
16392@@ -200,13 +200,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
16393 struct task_struct *tsk;
16394 int err;
16395
16396- childregs = task_pt_regs(p);
16397+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
16398 *childregs = *regs;
16399 childregs->ax = 0;
16400 childregs->sp = sp;
16401
16402 p->thread.sp = (unsigned long) childregs;
16403 p->thread.sp0 = (unsigned long) (childregs+1);
16404+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
16405
16406 p->thread.ip = (unsigned long) ret_from_fork;
16407
16408@@ -296,7 +297,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16409 struct thread_struct *prev = &prev_p->thread,
16410 *next = &next_p->thread;
16411 int cpu = smp_processor_id();
16412- struct tss_struct *tss = &per_cpu(init_tss, cpu);
16413+ struct tss_struct *tss = init_tss + cpu;
16414 bool preload_fpu;
16415
16416 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
16417@@ -331,6 +332,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16418 */
16419 lazy_save_gs(prev->gs);
16420
16421+#ifdef CONFIG_PAX_MEMORY_UDEREF
16422+ __set_fs(task_thread_info(next_p)->addr_limit);
16423+#endif
16424+
16425 /*
16426 * Load the per-thread Thread-Local Storage descriptor.
16427 */
16428@@ -366,6 +371,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16429 */
16430 arch_end_context_switch(next_p);
16431
16432+ percpu_write(current_task, next_p);
16433+ percpu_write(current_tinfo, &next_p->tinfo);
16434+
16435 if (preload_fpu)
16436 __math_state_restore();
16437
16438@@ -375,8 +383,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16439 if (prev->gs | next->gs)
16440 lazy_load_gs(next->gs);
16441
16442- percpu_write(current_task, next_p);
16443-
16444 return prev_p;
16445 }
16446
16447@@ -406,4 +412,3 @@ unsigned long get_wchan(struct task_struct *p)
16448 } while (count++ < 16);
16449 return 0;
16450 }
16451-
16452diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
16453index 3bd7e6e..90b2bcf 100644
16454--- a/arch/x86/kernel/process_64.c
16455+++ b/arch/x86/kernel/process_64.c
16456@@ -89,7 +89,7 @@ static void __exit_idle(void)
16457 void exit_idle(void)
16458 {
16459 /* idle loop has pid 0 */
16460- if (current->pid)
16461+ if (task_pid_nr(current))
16462 return;
16463 __exit_idle();
16464 }
16465@@ -264,8 +264,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
16466 struct pt_regs *childregs;
16467 struct task_struct *me = current;
16468
16469- childregs = ((struct pt_regs *)
16470- (THREAD_SIZE + task_stack_page(p))) - 1;
16471+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
16472 *childregs = *regs;
16473
16474 childregs->ax = 0;
16475@@ -277,6 +276,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
16476 p->thread.sp = (unsigned long) childregs;
16477 p->thread.sp0 = (unsigned long) (childregs+1);
16478 p->thread.usersp = me->thread.usersp;
16479+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
16480
16481 set_tsk_thread_flag(p, TIF_FORK);
16482
16483@@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16484 struct thread_struct *prev = &prev_p->thread;
16485 struct thread_struct *next = &next_p->thread;
16486 int cpu = smp_processor_id();
16487- struct tss_struct *tss = &per_cpu(init_tss, cpu);
16488+ struct tss_struct *tss = init_tss + cpu;
16489 unsigned fsindex, gsindex;
16490 bool preload_fpu;
16491
16492@@ -475,10 +475,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16493 prev->usersp = percpu_read(old_rsp);
16494 percpu_write(old_rsp, next->usersp);
16495 percpu_write(current_task, next_p);
16496+ percpu_write(current_tinfo, &next_p->tinfo);
16497
16498- percpu_write(kernel_stack,
16499- (unsigned long)task_stack_page(next_p) +
16500- THREAD_SIZE - KERNEL_STACK_OFFSET);
16501+ percpu_write(kernel_stack, next->sp0);
16502
16503 /*
16504 * Now maybe reload the debug registers and handle I/O bitmaps
16505@@ -540,12 +539,11 @@ unsigned long get_wchan(struct task_struct *p)
16506 if (!p || p == current || p->state == TASK_RUNNING)
16507 return 0;
16508 stack = (unsigned long)task_stack_page(p);
16509- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
16510+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
16511 return 0;
16512 fp = *(u64 *)(p->thread.sp);
16513 do {
16514- if (fp < (unsigned long)stack ||
16515- fp >= (unsigned long)stack+THREAD_SIZE)
16516+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
16517 return 0;
16518 ip = *(u64 *)(fp+8);
16519 if (!in_sched_functions(ip))
16520diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
16521index 8252879..d3219e0 100644
16522--- a/arch/x86/kernel/ptrace.c
16523+++ b/arch/x86/kernel/ptrace.c
16524@@ -822,7 +822,7 @@ long arch_ptrace(struct task_struct *child, long request,
16525 unsigned long addr, unsigned long data)
16526 {
16527 int ret;
16528- unsigned long __user *datap = (unsigned long __user *)data;
16529+ unsigned long __user *datap = (__force unsigned long __user *)data;
16530
16531 switch (request) {
16532 /* read the word at location addr in the USER area. */
16533@@ -907,14 +907,14 @@ long arch_ptrace(struct task_struct *child, long request,
16534 if ((int) addr < 0)
16535 return -EIO;
16536 ret = do_get_thread_area(child, addr,
16537- (struct user_desc __user *)data);
16538+ (__force struct user_desc __user *) data);
16539 break;
16540
16541 case PTRACE_SET_THREAD_AREA:
16542 if ((int) addr < 0)
16543 return -EIO;
16544 ret = do_set_thread_area(child, addr,
16545- (struct user_desc __user *)data, 0);
16546+ (__force struct user_desc __user *) data, 0);
16547 break;
16548 #endif
16549
16550@@ -1331,7 +1331,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
16551 memset(info, 0, sizeof(*info));
16552 info->si_signo = SIGTRAP;
16553 info->si_code = si_code;
16554- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
16555+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
16556 }
16557
16558 void user_single_step_siginfo(struct task_struct *tsk,
16559diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
16560index 42eb330..139955c 100644
16561--- a/arch/x86/kernel/pvclock.c
16562+++ b/arch/x86/kernel/pvclock.c
16563@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
16564 return pv_tsc_khz;
16565 }
16566
16567-static atomic64_t last_value = ATOMIC64_INIT(0);
16568+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
16569
16570 void pvclock_resume(void)
16571 {
16572- atomic64_set(&last_value, 0);
16573+ atomic64_set_unchecked(&last_value, 0);
16574 }
16575
16576 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
16577@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
16578 * updating at the same time, and one of them could be slightly behind,
16579 * making the assumption that last_value always go forward fail to hold.
16580 */
16581- last = atomic64_read(&last_value);
16582+ last = atomic64_read_unchecked(&last_value);
16583 do {
16584 if (ret < last)
16585 return last;
16586- last = atomic64_cmpxchg(&last_value, last, ret);
16587+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
16588 } while (unlikely(last != ret));
16589
16590 return ret;
16591diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
16592index 37a458b..e63d183 100644
16593--- a/arch/x86/kernel/reboot.c
16594+++ b/arch/x86/kernel/reboot.c
16595@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
16596 EXPORT_SYMBOL(pm_power_off);
16597
16598 static const struct desc_ptr no_idt = {};
16599-static int reboot_mode;
16600+static unsigned short reboot_mode;
16601 enum reboot_type reboot_type = BOOT_ACPI;
16602 int reboot_force;
16603
16604@@ -324,13 +324,17 @@ core_initcall(reboot_init);
16605 extern const unsigned char machine_real_restart_asm[];
16606 extern const u64 machine_real_restart_gdt[3];
16607
16608-void machine_real_restart(unsigned int type)
16609+__noreturn void machine_real_restart(unsigned int type)
16610 {
16611 void *restart_va;
16612 unsigned long restart_pa;
16613- void (*restart_lowmem)(unsigned int);
16614+ void (* __noreturn restart_lowmem)(unsigned int);
16615 u64 *lowmem_gdt;
16616
16617+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
16618+ struct desc_struct *gdt;
16619+#endif
16620+
16621 local_irq_disable();
16622
16623 /* Write zero to CMOS register number 0x0f, which the BIOS POST
16624@@ -356,14 +360,14 @@ void machine_real_restart(unsigned int type)
16625 boot)". This seems like a fairly standard thing that gets set by
16626 REBOOT.COM programs, and the previous reset routine did this
16627 too. */
16628- *((unsigned short *)0x472) = reboot_mode;
16629+ *(unsigned short *)(__va(0x472)) = reboot_mode;
16630
16631 /* Patch the GDT in the low memory trampoline */
16632 lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
16633
16634 restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
16635 restart_pa = virt_to_phys(restart_va);
16636- restart_lowmem = (void (*)(unsigned int))restart_pa;
16637+ restart_lowmem = (void *)restart_pa;
16638
16639 /* GDT[0]: GDT self-pointer */
16640 lowmem_gdt[0] =
16641@@ -374,7 +378,33 @@ void machine_real_restart(unsigned int type)
16642 GDT_ENTRY(0x009b, restart_pa, 0xffff);
16643
16644 /* Jump to the identity-mapped low memory code */
16645+
16646+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
16647+ gdt = get_cpu_gdt_table(smp_processor_id());
16648+ pax_open_kernel();
16649+#ifdef CONFIG_PAX_MEMORY_UDEREF
16650+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
16651+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
16652+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
16653+#endif
16654+#ifdef CONFIG_PAX_KERNEXEC
16655+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
16656+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
16657+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
16658+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
16659+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
16660+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
16661+#endif
16662+ pax_close_kernel();
16663+#endif
16664+
16665+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
16666+ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
16667+ unreachable();
16668+#else
16669 restart_lowmem(type);
16670+#endif
16671+
16672 }
16673 #ifdef CONFIG_APM_MODULE
16674 EXPORT_SYMBOL(machine_real_restart);
16675@@ -540,7 +570,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
16676 * try to force a triple fault and then cycle between hitting the keyboard
16677 * controller and doing that
16678 */
16679-static void native_machine_emergency_restart(void)
16680+__noreturn static void native_machine_emergency_restart(void)
16681 {
16682 int i;
16683 int attempt = 0;
16684@@ -664,13 +694,13 @@ void native_machine_shutdown(void)
16685 #endif
16686 }
16687
16688-static void __machine_emergency_restart(int emergency)
16689+static __noreturn void __machine_emergency_restart(int emergency)
16690 {
16691 reboot_emergency = emergency;
16692 machine_ops.emergency_restart();
16693 }
16694
16695-static void native_machine_restart(char *__unused)
16696+static __noreturn void native_machine_restart(char *__unused)
16697 {
16698 printk("machine restart\n");
16699
16700@@ -679,7 +709,7 @@ static void native_machine_restart(char *__unused)
16701 __machine_emergency_restart(0);
16702 }
16703
16704-static void native_machine_halt(void)
16705+static __noreturn void native_machine_halt(void)
16706 {
16707 /* stop other cpus and apics */
16708 machine_shutdown();
16709@@ -690,7 +720,7 @@ static void native_machine_halt(void)
16710 stop_this_cpu(NULL);
16711 }
16712
16713-static void native_machine_power_off(void)
16714+__noreturn static void native_machine_power_off(void)
16715 {
16716 if (pm_power_off) {
16717 if (!reboot_force)
16718@@ -699,6 +729,7 @@ static void native_machine_power_off(void)
16719 }
16720 /* a fallback in case there is no PM info available */
16721 tboot_shutdown(TB_SHUTDOWN_HALT);
16722+ unreachable();
16723 }
16724
16725 struct machine_ops machine_ops = {
16726diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
16727index 7a6f3b3..bed145d7 100644
16728--- a/arch/x86/kernel/relocate_kernel_64.S
16729+++ b/arch/x86/kernel/relocate_kernel_64.S
16730@@ -11,6 +11,7 @@
16731 #include <asm/kexec.h>
16732 #include <asm/processor-flags.h>
16733 #include <asm/pgtable_types.h>
16734+#include <asm/alternative-asm.h>
16735
16736 /*
16737 * Must be relocatable PIC code callable as a C function
16738@@ -160,13 +161,14 @@ identity_mapped:
16739 xorq %rbp, %rbp
16740 xorq %r8, %r8
16741 xorq %r9, %r9
16742- xorq %r10, %r9
16743+ xorq %r10, %r10
16744 xorq %r11, %r11
16745 xorq %r12, %r12
16746 xorq %r13, %r13
16747 xorq %r14, %r14
16748 xorq %r15, %r15
16749
16750+ pax_force_retaddr 0, 1
16751 ret
16752
16753 1:
16754diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
16755index cf0ef98..e3f780b 100644
16756--- a/arch/x86/kernel/setup.c
16757+++ b/arch/x86/kernel/setup.c
16758@@ -447,7 +447,7 @@ static void __init parse_setup_data(void)
16759
16760 switch (data->type) {
16761 case SETUP_E820_EXT:
16762- parse_e820_ext(data);
16763+ parse_e820_ext((struct setup_data __force_kernel *)data);
16764 break;
16765 case SETUP_DTB:
16766 add_dtb(pa_data);
16767@@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
16768 * area (640->1Mb) as ram even though it is not.
16769 * take them out.
16770 */
16771- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
16772+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
16773 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
16774 }
16775
16776@@ -773,14 +773,14 @@ void __init setup_arch(char **cmdline_p)
16777
16778 if (!boot_params.hdr.root_flags)
16779 root_mountflags &= ~MS_RDONLY;
16780- init_mm.start_code = (unsigned long) _text;
16781- init_mm.end_code = (unsigned long) _etext;
16782+ init_mm.start_code = ktla_ktva((unsigned long) _text);
16783+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
16784 init_mm.end_data = (unsigned long) _edata;
16785 init_mm.brk = _brk_end;
16786
16787- code_resource.start = virt_to_phys(_text);
16788- code_resource.end = virt_to_phys(_etext)-1;
16789- data_resource.start = virt_to_phys(_etext);
16790+ code_resource.start = virt_to_phys(ktla_ktva(_text));
16791+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
16792+ data_resource.start = virt_to_phys(_sdata);
16793 data_resource.end = virt_to_phys(_edata)-1;
16794 bss_resource.start = virt_to_phys(&__bss_start);
16795 bss_resource.end = virt_to_phys(&__bss_stop)-1;
16796diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
16797index 71f4727..16dc9f7 100644
16798--- a/arch/x86/kernel/setup_percpu.c
16799+++ b/arch/x86/kernel/setup_percpu.c
16800@@ -21,19 +21,17 @@
16801 #include <asm/cpu.h>
16802 #include <asm/stackprotector.h>
16803
16804-DEFINE_PER_CPU(int, cpu_number);
16805+#ifdef CONFIG_SMP
16806+DEFINE_PER_CPU(unsigned int, cpu_number);
16807 EXPORT_PER_CPU_SYMBOL(cpu_number);
16808+#endif
16809
16810-#ifdef CONFIG_X86_64
16811 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
16812-#else
16813-#define BOOT_PERCPU_OFFSET 0
16814-#endif
16815
16816 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
16817 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
16818
16819-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
16820+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
16821 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
16822 };
16823 EXPORT_SYMBOL(__per_cpu_offset);
16824@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
16825 {
16826 #ifdef CONFIG_X86_32
16827 struct desc_struct gdt;
16828+ unsigned long base = per_cpu_offset(cpu);
16829
16830- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
16831- 0x2 | DESCTYPE_S, 0x8);
16832- gdt.s = 1;
16833+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
16834+ 0x83 | DESCTYPE_S, 0xC);
16835 write_gdt_entry(get_cpu_gdt_table(cpu),
16836 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
16837 #endif
16838@@ -207,6 +205,11 @@ void __init setup_per_cpu_areas(void)
16839 /* alrighty, percpu areas up and running */
16840 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
16841 for_each_possible_cpu(cpu) {
16842+#ifdef CONFIG_CC_STACKPROTECTOR
16843+#ifdef CONFIG_X86_32
16844+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
16845+#endif
16846+#endif
16847 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
16848 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
16849 per_cpu(cpu_number, cpu) = cpu;
16850@@ -247,6 +250,12 @@ void __init setup_per_cpu_areas(void)
16851 */
16852 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
16853 #endif
16854+#ifdef CONFIG_CC_STACKPROTECTOR
16855+#ifdef CONFIG_X86_32
16856+ if (!cpu)
16857+ per_cpu(stack_canary.canary, cpu) = canary;
16858+#endif
16859+#endif
16860 /*
16861 * Up to this point, the boot CPU has been using .init.data
16862 * area. Reload any changed state for the boot CPU.
16863diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
16864index 54ddaeb2..22c3bdc 100644
16865--- a/arch/x86/kernel/signal.c
16866+++ b/arch/x86/kernel/signal.c
16867@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
16868 * Align the stack pointer according to the i386 ABI,
16869 * i.e. so that on function entry ((sp + 4) & 15) == 0.
16870 */
16871- sp = ((sp + 4) & -16ul) - 4;
16872+ sp = ((sp - 12) & -16ul) - 4;
16873 #else /* !CONFIG_X86_32 */
16874 sp = round_down(sp, 16) - 8;
16875 #endif
16876@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
16877 * Return an always-bogus address instead so we will die with SIGSEGV.
16878 */
16879 if (onsigstack && !likely(on_sig_stack(sp)))
16880- return (void __user *)-1L;
16881+ return (__force void __user *)-1L;
16882
16883 /* save i387 state */
16884 if (used_math() && save_i387_xstate(*fpstate) < 0)
16885- return (void __user *)-1L;
16886+ return (__force void __user *)-1L;
16887
16888 return (void __user *)sp;
16889 }
16890@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
16891 }
16892
16893 if (current->mm->context.vdso)
16894- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
16895+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
16896 else
16897- restorer = &frame->retcode;
16898+ restorer = (void __user *)&frame->retcode;
16899 if (ka->sa.sa_flags & SA_RESTORER)
16900 restorer = ka->sa.sa_restorer;
16901
16902@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
16903 * reasons and because gdb uses it as a signature to notice
16904 * signal handler stack frames.
16905 */
16906- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
16907+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
16908
16909 if (err)
16910 return -EFAULT;
16911@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
16912 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
16913
16914 /* Set up to return from userspace. */
16915- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
16916+ if (current->mm->context.vdso)
16917+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
16918+ else
16919+ restorer = (void __user *)&frame->retcode;
16920 if (ka->sa.sa_flags & SA_RESTORER)
16921 restorer = ka->sa.sa_restorer;
16922 put_user_ex(restorer, &frame->pretcode);
16923@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
16924 * reasons and because gdb uses it as a signature to notice
16925 * signal handler stack frames.
16926 */
16927- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
16928+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
16929 } put_user_catch(err);
16930
16931 if (err)
16932@@ -769,7 +772,7 @@ static void do_signal(struct pt_regs *regs)
16933 * X86_32: vm86 regs switched out by assembly code before reaching
16934 * here, so testing against kernel CS suffices.
16935 */
16936- if (!user_mode(regs))
16937+ if (!user_mode_novm(regs))
16938 return;
16939
16940 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
16941diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
16942index 9f548cb..caf76f7 100644
16943--- a/arch/x86/kernel/smpboot.c
16944+++ b/arch/x86/kernel/smpboot.c
16945@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
16946 set_idle_for_cpu(cpu, c_idle.idle);
16947 do_rest:
16948 per_cpu(current_task, cpu) = c_idle.idle;
16949+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
16950 #ifdef CONFIG_X86_32
16951 /* Stack for startup_32 can be just as for start_secondary onwards */
16952 irq_ctx_init(cpu);
16953 #else
16954 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
16955 initial_gs = per_cpu_offset(cpu);
16956- per_cpu(kernel_stack, cpu) =
16957- (unsigned long)task_stack_page(c_idle.idle) -
16958- KERNEL_STACK_OFFSET + THREAD_SIZE;
16959+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
16960 #endif
16961+
16962+ pax_open_kernel();
16963 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
16964+ pax_close_kernel();
16965+
16966 initial_code = (unsigned long)start_secondary;
16967 stack_start = c_idle.idle->thread.sp;
16968
16969@@ -861,6 +864,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
16970
16971 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
16972
16973+#ifdef CONFIG_PAX_PER_CPU_PGD
16974+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
16975+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
16976+ KERNEL_PGD_PTRS);
16977+#endif
16978+
16979 err = do_boot_cpu(apicid, cpu);
16980 if (err) {
16981 pr_debug("do_boot_cpu failed %d\n", err);
16982diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
16983index c346d11..d43b163 100644
16984--- a/arch/x86/kernel/step.c
16985+++ b/arch/x86/kernel/step.c
16986@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
16987 struct desc_struct *desc;
16988 unsigned long base;
16989
16990- seg &= ~7UL;
16991+ seg >>= 3;
16992
16993 mutex_lock(&child->mm->context.lock);
16994- if (unlikely((seg >> 3) >= child->mm->context.size))
16995+ if (unlikely(seg >= child->mm->context.size))
16996 addr = -1L; /* bogus selector, access would fault */
16997 else {
16998 desc = child->mm->context.ldt + seg;
16999@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
17000 addr += base;
17001 }
17002 mutex_unlock(&child->mm->context.lock);
17003- }
17004+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
17005+ addr = ktla_ktva(addr);
17006
17007 return addr;
17008 }
17009@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
17010 unsigned char opcode[15];
17011 unsigned long addr = convert_ip_to_linear(child, regs);
17012
17013+ if (addr == -EINVAL)
17014+ return 0;
17015+
17016 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
17017 for (i = 0; i < copied; i++) {
17018 switch (opcode[i]) {
17019diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
17020index 0b0cb5f..db6b9ed 100644
17021--- a/arch/x86/kernel/sys_i386_32.c
17022+++ b/arch/x86/kernel/sys_i386_32.c
17023@@ -24,17 +24,224 @@
17024
17025 #include <asm/syscalls.h>
17026
17027-/*
17028- * Do a system call from kernel instead of calling sys_execve so we
17029- * end up with proper pt_regs.
17030- */
17031-int kernel_execve(const char *filename,
17032- const char *const argv[],
17033- const char *const envp[])
17034+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
17035 {
17036- long __res;
17037- asm volatile ("int $0x80"
17038- : "=a" (__res)
17039- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
17040- return __res;
17041+ unsigned long pax_task_size = TASK_SIZE;
17042+
17043+#ifdef CONFIG_PAX_SEGMEXEC
17044+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
17045+ pax_task_size = SEGMEXEC_TASK_SIZE;
17046+#endif
17047+
17048+ if (len > pax_task_size || addr > pax_task_size - len)
17049+ return -EINVAL;
17050+
17051+ return 0;
17052+}
17053+
17054+unsigned long
17055+arch_get_unmapped_area(struct file *filp, unsigned long addr,
17056+ unsigned long len, unsigned long pgoff, unsigned long flags)
17057+{
17058+ struct mm_struct *mm = current->mm;
17059+ struct vm_area_struct *vma;
17060+ unsigned long start_addr, pax_task_size = TASK_SIZE;
17061+
17062+#ifdef CONFIG_PAX_SEGMEXEC
17063+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17064+ pax_task_size = SEGMEXEC_TASK_SIZE;
17065+#endif
17066+
17067+ pax_task_size -= PAGE_SIZE;
17068+
17069+ if (len > pax_task_size)
17070+ return -ENOMEM;
17071+
17072+ if (flags & MAP_FIXED)
17073+ return addr;
17074+
17075+#ifdef CONFIG_PAX_RANDMMAP
17076+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17077+#endif
17078+
17079+ if (addr) {
17080+ addr = PAGE_ALIGN(addr);
17081+ if (pax_task_size - len >= addr) {
17082+ vma = find_vma(mm, addr);
17083+ if (check_heap_stack_gap(vma, addr, len))
17084+ return addr;
17085+ }
17086+ }
17087+ if (len > mm->cached_hole_size) {
17088+ start_addr = addr = mm->free_area_cache;
17089+ } else {
17090+ start_addr = addr = mm->mmap_base;
17091+ mm->cached_hole_size = 0;
17092+ }
17093+
17094+#ifdef CONFIG_PAX_PAGEEXEC
17095+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
17096+ start_addr = 0x00110000UL;
17097+
17098+#ifdef CONFIG_PAX_RANDMMAP
17099+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17100+ start_addr += mm->delta_mmap & 0x03FFF000UL;
17101+#endif
17102+
17103+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
17104+ start_addr = addr = mm->mmap_base;
17105+ else
17106+ addr = start_addr;
17107+ }
17108+#endif
17109+
17110+full_search:
17111+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
17112+ /* At this point: (!vma || addr < vma->vm_end). */
17113+ if (pax_task_size - len < addr) {
17114+ /*
17115+ * Start a new search - just in case we missed
17116+ * some holes.
17117+ */
17118+ if (start_addr != mm->mmap_base) {
17119+ start_addr = addr = mm->mmap_base;
17120+ mm->cached_hole_size = 0;
17121+ goto full_search;
17122+ }
17123+ return -ENOMEM;
17124+ }
17125+ if (check_heap_stack_gap(vma, addr, len))
17126+ break;
17127+ if (addr + mm->cached_hole_size < vma->vm_start)
17128+ mm->cached_hole_size = vma->vm_start - addr;
17129+ addr = vma->vm_end;
17130+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
17131+ start_addr = addr = mm->mmap_base;
17132+ mm->cached_hole_size = 0;
17133+ goto full_search;
17134+ }
17135+ }
17136+
17137+ /*
17138+ * Remember the place where we stopped the search:
17139+ */
17140+ mm->free_area_cache = addr + len;
17141+ return addr;
17142+}
17143+
17144+unsigned long
17145+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17146+ const unsigned long len, const unsigned long pgoff,
17147+ const unsigned long flags)
17148+{
17149+ struct vm_area_struct *vma;
17150+ struct mm_struct *mm = current->mm;
17151+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
17152+
17153+#ifdef CONFIG_PAX_SEGMEXEC
17154+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17155+ pax_task_size = SEGMEXEC_TASK_SIZE;
17156+#endif
17157+
17158+ pax_task_size -= PAGE_SIZE;
17159+
17160+ /* requested length too big for entire address space */
17161+ if (len > pax_task_size)
17162+ return -ENOMEM;
17163+
17164+ if (flags & MAP_FIXED)
17165+ return addr;
17166+
17167+#ifdef CONFIG_PAX_PAGEEXEC
17168+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
17169+ goto bottomup;
17170+#endif
17171+
17172+#ifdef CONFIG_PAX_RANDMMAP
17173+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17174+#endif
17175+
17176+ /* requesting a specific address */
17177+ if (addr) {
17178+ addr = PAGE_ALIGN(addr);
17179+ if (pax_task_size - len >= addr) {
17180+ vma = find_vma(mm, addr);
17181+ if (check_heap_stack_gap(vma, addr, len))
17182+ return addr;
17183+ }
17184+ }
17185+
17186+ /* check if free_area_cache is useful for us */
17187+ if (len <= mm->cached_hole_size) {
17188+ mm->cached_hole_size = 0;
17189+ mm->free_area_cache = mm->mmap_base;
17190+ }
17191+
17192+ /* either no address requested or can't fit in requested address hole */
17193+ addr = mm->free_area_cache;
17194+
17195+ /* make sure it can fit in the remaining address space */
17196+ if (addr > len) {
17197+ vma = find_vma(mm, addr-len);
17198+ if (check_heap_stack_gap(vma, addr - len, len))
17199+ /* remember the address as a hint for next time */
17200+ return (mm->free_area_cache = addr-len);
17201+ }
17202+
17203+ if (mm->mmap_base < len)
17204+ goto bottomup;
17205+
17206+ addr = mm->mmap_base-len;
17207+
17208+ do {
17209+ /*
17210+ * Lookup failure means no vma is above this address,
17211+ * else if new region fits below vma->vm_start,
17212+ * return with success:
17213+ */
17214+ vma = find_vma(mm, addr);
17215+ if (check_heap_stack_gap(vma, addr, len))
17216+ /* remember the address as a hint for next time */
17217+ return (mm->free_area_cache = addr);
17218+
17219+ /* remember the largest hole we saw so far */
17220+ if (addr + mm->cached_hole_size < vma->vm_start)
17221+ mm->cached_hole_size = vma->vm_start - addr;
17222+
17223+ /* try just below the current vma->vm_start */
17224+ addr = skip_heap_stack_gap(vma, len);
17225+ } while (!IS_ERR_VALUE(addr));
17226+
17227+bottomup:
17228+ /*
17229+ * A failed mmap() very likely causes application failure,
17230+ * so fall back to the bottom-up function here. This scenario
17231+ * can happen with large stack limits and large mmap()
17232+ * allocations.
17233+ */
17234+
17235+#ifdef CONFIG_PAX_SEGMEXEC
17236+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17237+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
17238+ else
17239+#endif
17240+
17241+ mm->mmap_base = TASK_UNMAPPED_BASE;
17242+
17243+#ifdef CONFIG_PAX_RANDMMAP
17244+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17245+ mm->mmap_base += mm->delta_mmap;
17246+#endif
17247+
17248+ mm->free_area_cache = mm->mmap_base;
17249+ mm->cached_hole_size = ~0UL;
17250+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
17251+ /*
17252+ * Restore the topdown base:
17253+ */
17254+ mm->mmap_base = base;
17255+ mm->free_area_cache = base;
17256+ mm->cached_hole_size = ~0UL;
17257+
17258+ return addr;
17259 }
17260diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
17261index 0514890..3dbebce 100644
17262--- a/arch/x86/kernel/sys_x86_64.c
17263+++ b/arch/x86/kernel/sys_x86_64.c
17264@@ -95,8 +95,8 @@ out:
17265 return error;
17266 }
17267
17268-static void find_start_end(unsigned long flags, unsigned long *begin,
17269- unsigned long *end)
17270+static void find_start_end(struct mm_struct *mm, unsigned long flags,
17271+ unsigned long *begin, unsigned long *end)
17272 {
17273 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
17274 unsigned long new_begin;
17275@@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
17276 *begin = new_begin;
17277 }
17278 } else {
17279- *begin = TASK_UNMAPPED_BASE;
17280+ *begin = mm->mmap_base;
17281 *end = TASK_SIZE;
17282 }
17283 }
17284@@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
17285 if (flags & MAP_FIXED)
17286 return addr;
17287
17288- find_start_end(flags, &begin, &end);
17289+ find_start_end(mm, flags, &begin, &end);
17290
17291 if (len > end)
17292 return -ENOMEM;
17293
17294+#ifdef CONFIG_PAX_RANDMMAP
17295+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17296+#endif
17297+
17298 if (addr) {
17299 addr = PAGE_ALIGN(addr);
17300 vma = find_vma(mm, addr);
17301- if (end - len >= addr &&
17302- (!vma || addr + len <= vma->vm_start))
17303+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
17304 return addr;
17305 }
17306 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
17307@@ -172,7 +175,7 @@ full_search:
17308 }
17309 return -ENOMEM;
17310 }
17311- if (!vma || addr + len <= vma->vm_start) {
17312+ if (check_heap_stack_gap(vma, addr, len)) {
17313 /*
17314 * Remember the place where we stopped the search:
17315 */
17316@@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17317 {
17318 struct vm_area_struct *vma;
17319 struct mm_struct *mm = current->mm;
17320- unsigned long addr = addr0;
17321+ unsigned long base = mm->mmap_base, addr = addr0;
17322
17323 /* requested length too big for entire address space */
17324 if (len > TASK_SIZE)
17325@@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17326 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
17327 goto bottomup;
17328
17329+#ifdef CONFIG_PAX_RANDMMAP
17330+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17331+#endif
17332+
17333 /* requesting a specific address */
17334 if (addr) {
17335 addr = PAGE_ALIGN(addr);
17336- vma = find_vma(mm, addr);
17337- if (TASK_SIZE - len >= addr &&
17338- (!vma || addr + len <= vma->vm_start))
17339- return addr;
17340+ if (TASK_SIZE - len >= addr) {
17341+ vma = find_vma(mm, addr);
17342+ if (check_heap_stack_gap(vma, addr, len))
17343+ return addr;
17344+ }
17345 }
17346
17347 /* check if free_area_cache is useful for us */
17348@@ -232,7 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17349 ALIGN_TOPDOWN);
17350
17351 vma = find_vma(mm, tmp_addr);
17352- if (!vma || tmp_addr + len <= vma->vm_start)
17353+ if (check_heap_stack_gap(vma, tmp_addr, len))
17354 /* remember the address as a hint for next time */
17355 return mm->free_area_cache = tmp_addr;
17356 }
17357@@ -251,7 +259,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17358 * return with success:
17359 */
17360 vma = find_vma(mm, addr);
17361- if (!vma || addr+len <= vma->vm_start)
17362+ if (check_heap_stack_gap(vma, addr, len))
17363 /* remember the address as a hint for next time */
17364 return mm->free_area_cache = addr;
17365
17366@@ -260,8 +268,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17367 mm->cached_hole_size = vma->vm_start - addr;
17368
17369 /* try just below the current vma->vm_start */
17370- addr = vma->vm_start-len;
17371- } while (len < vma->vm_start);
17372+ addr = skip_heap_stack_gap(vma, len);
17373+ } while (!IS_ERR_VALUE(addr));
17374
17375 bottomup:
17376 /*
17377@@ -270,13 +278,21 @@ bottomup:
17378 * can happen with large stack limits and large mmap()
17379 * allocations.
17380 */
17381+ mm->mmap_base = TASK_UNMAPPED_BASE;
17382+
17383+#ifdef CONFIG_PAX_RANDMMAP
17384+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17385+ mm->mmap_base += mm->delta_mmap;
17386+#endif
17387+
17388+ mm->free_area_cache = mm->mmap_base;
17389 mm->cached_hole_size = ~0UL;
17390- mm->free_area_cache = TASK_UNMAPPED_BASE;
17391 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
17392 /*
17393 * Restore the topdown base:
17394 */
17395- mm->free_area_cache = mm->mmap_base;
17396+ mm->mmap_base = base;
17397+ mm->free_area_cache = base;
17398 mm->cached_hole_size = ~0UL;
17399
17400 return addr;
17401diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
17402index 9a0e312..e6f66f2 100644
17403--- a/arch/x86/kernel/syscall_table_32.S
17404+++ b/arch/x86/kernel/syscall_table_32.S
17405@@ -1,3 +1,4 @@
17406+.section .rodata,"a",@progbits
17407 ENTRY(sys_call_table)
17408 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
17409 .long sys_exit
17410diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
17411index e2410e2..4fe3fbc 100644
17412--- a/arch/x86/kernel/tboot.c
17413+++ b/arch/x86/kernel/tboot.c
17414@@ -219,7 +219,7 @@ static int tboot_setup_sleep(void)
17415
17416 void tboot_shutdown(u32 shutdown_type)
17417 {
17418- void (*shutdown)(void);
17419+ void (* __noreturn shutdown)(void);
17420
17421 if (!tboot_enabled())
17422 return;
17423@@ -241,7 +241,7 @@ void tboot_shutdown(u32 shutdown_type)
17424
17425 switch_to_tboot_pt();
17426
17427- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
17428+ shutdown = (void *)tboot->shutdown_entry;
17429 shutdown();
17430
17431 /* should not reach here */
17432@@ -298,7 +298,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
17433 tboot_shutdown(acpi_shutdown_map[sleep_state]);
17434 }
17435
17436-static atomic_t ap_wfs_count;
17437+static atomic_unchecked_t ap_wfs_count;
17438
17439 static int tboot_wait_for_aps(int num_aps)
17440 {
17441@@ -322,9 +322,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
17442 {
17443 switch (action) {
17444 case CPU_DYING:
17445- atomic_inc(&ap_wfs_count);
17446+ atomic_inc_unchecked(&ap_wfs_count);
17447 if (num_online_cpus() == 1)
17448- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
17449+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
17450 return NOTIFY_BAD;
17451 break;
17452 }
17453@@ -343,7 +343,7 @@ static __init int tboot_late_init(void)
17454
17455 tboot_create_trampoline();
17456
17457- atomic_set(&ap_wfs_count, 0);
17458+ atomic_set_unchecked(&ap_wfs_count, 0);
17459 register_hotcpu_notifier(&tboot_cpu_notifier);
17460 return 0;
17461 }
17462diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
17463index dd5fbf4..b7f2232 100644
17464--- a/arch/x86/kernel/time.c
17465+++ b/arch/x86/kernel/time.c
17466@@ -31,9 +31,9 @@ unsigned long profile_pc(struct pt_regs *regs)
17467 {
17468 unsigned long pc = instruction_pointer(regs);
17469
17470- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
17471+ if (!user_mode(regs) && in_lock_functions(pc)) {
17472 #ifdef CONFIG_FRAME_POINTER
17473- return *(unsigned long *)(regs->bp + sizeof(long));
17474+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
17475 #else
17476 unsigned long *sp =
17477 (unsigned long *)kernel_stack_pointer(regs);
17478@@ -42,11 +42,17 @@ unsigned long profile_pc(struct pt_regs *regs)
17479 * or above a saved flags. Eflags has bits 22-31 zero,
17480 * kernel addresses don't.
17481 */
17482+
17483+#ifdef CONFIG_PAX_KERNEXEC
17484+ return ktla_ktva(sp[0]);
17485+#else
17486 if (sp[0] >> 22)
17487 return sp[0];
17488 if (sp[1] >> 22)
17489 return sp[1];
17490 #endif
17491+
17492+#endif
17493 }
17494 return pc;
17495 }
17496diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
17497index 6bb7b85..dd853e1 100644
17498--- a/arch/x86/kernel/tls.c
17499+++ b/arch/x86/kernel/tls.c
17500@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
17501 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
17502 return -EINVAL;
17503
17504+#ifdef CONFIG_PAX_SEGMEXEC
17505+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
17506+ return -EINVAL;
17507+#endif
17508+
17509 set_tls_desc(p, idx, &info, 1);
17510
17511 return 0;
17512diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
17513index 451c0a7..e57f551 100644
17514--- a/arch/x86/kernel/trampoline_32.S
17515+++ b/arch/x86/kernel/trampoline_32.S
17516@@ -32,6 +32,12 @@
17517 #include <asm/segment.h>
17518 #include <asm/page_types.h>
17519
17520+#ifdef CONFIG_PAX_KERNEXEC
17521+#define ta(X) (X)
17522+#else
17523+#define ta(X) ((X) - __PAGE_OFFSET)
17524+#endif
17525+
17526 #ifdef CONFIG_SMP
17527
17528 .section ".x86_trampoline","a"
17529@@ -62,7 +68,7 @@ r_base = .
17530 inc %ax # protected mode (PE) bit
17531 lmsw %ax # into protected mode
17532 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
17533- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
17534+ ljmpl $__BOOT_CS, $ta(startup_32_smp)
17535
17536 # These need to be in the same 64K segment as the above;
17537 # hence we don't use the boot_gdt_descr defined in head.S
17538diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
17539index 09ff517..df19fbff 100644
17540--- a/arch/x86/kernel/trampoline_64.S
17541+++ b/arch/x86/kernel/trampoline_64.S
17542@@ -90,7 +90,7 @@ startup_32:
17543 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
17544 movl %eax, %ds
17545
17546- movl $X86_CR4_PAE, %eax
17547+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
17548 movl %eax, %cr4 # Enable PAE mode
17549
17550 # Setup trampoline 4 level pagetables
17551@@ -138,7 +138,7 @@ tidt:
17552 # so the kernel can live anywhere
17553 .balign 4
17554 tgdt:
17555- .short tgdt_end - tgdt # gdt limit
17556+ .short tgdt_end - tgdt - 1 # gdt limit
17557 .long tgdt - r_base
17558 .short 0
17559 .quad 0x00cf9b000000ffff # __KERNEL32_CS
17560diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
17561index a8e3eb8..c9dbd7d 100644
17562--- a/arch/x86/kernel/traps.c
17563+++ b/arch/x86/kernel/traps.c
17564@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
17565
17566 /* Do we ignore FPU interrupts ? */
17567 char ignore_fpu_irq;
17568-
17569-/*
17570- * The IDT has to be page-aligned to simplify the Pentium
17571- * F0 0F bug workaround.
17572- */
17573-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
17574 #endif
17575
17576 DECLARE_BITMAP(used_vectors, NR_VECTORS);
17577@@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
17578 }
17579
17580 static void __kprobes
17581-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
17582+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
17583 long error_code, siginfo_t *info)
17584 {
17585 struct task_struct *tsk = current;
17586
17587 #ifdef CONFIG_X86_32
17588- if (regs->flags & X86_VM_MASK) {
17589+ if (v8086_mode(regs)) {
17590 /*
17591 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
17592 * On nmi (interrupt 2), do_trap should not be called.
17593@@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
17594 }
17595 #endif
17596
17597- if (!user_mode(regs))
17598+ if (!user_mode_novm(regs))
17599 goto kernel_trap;
17600
17601 #ifdef CONFIG_X86_32
17602@@ -148,7 +142,7 @@ trap_signal:
17603 printk_ratelimit()) {
17604 printk(KERN_INFO
17605 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
17606- tsk->comm, tsk->pid, str,
17607+ tsk->comm, task_pid_nr(tsk), str,
17608 regs->ip, regs->sp, error_code);
17609 print_vma_addr(" in ", regs->ip);
17610 printk("\n");
17611@@ -165,8 +159,20 @@ kernel_trap:
17612 if (!fixup_exception(regs)) {
17613 tsk->thread.error_code = error_code;
17614 tsk->thread.trap_no = trapnr;
17615+
17616+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17617+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
17618+ str = "PAX: suspicious stack segment fault";
17619+#endif
17620+
17621 die(str, regs, error_code);
17622 }
17623+
17624+#ifdef CONFIG_PAX_REFCOUNT
17625+ if (trapnr == 4)
17626+ pax_report_refcount_overflow(regs);
17627+#endif
17628+
17629 return;
17630
17631 #ifdef CONFIG_X86_32
17632@@ -255,14 +261,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
17633 conditional_sti(regs);
17634
17635 #ifdef CONFIG_X86_32
17636- if (regs->flags & X86_VM_MASK)
17637+ if (v8086_mode(regs))
17638 goto gp_in_vm86;
17639 #endif
17640
17641 tsk = current;
17642- if (!user_mode(regs))
17643+ if (!user_mode_novm(regs))
17644 goto gp_in_kernel;
17645
17646+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17647+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
17648+ struct mm_struct *mm = tsk->mm;
17649+ unsigned long limit;
17650+
17651+ down_write(&mm->mmap_sem);
17652+ limit = mm->context.user_cs_limit;
17653+ if (limit < TASK_SIZE) {
17654+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
17655+ up_write(&mm->mmap_sem);
17656+ return;
17657+ }
17658+ up_write(&mm->mmap_sem);
17659+ }
17660+#endif
17661+
17662 tsk->thread.error_code = error_code;
17663 tsk->thread.trap_no = 13;
17664
17665@@ -295,6 +317,13 @@ gp_in_kernel:
17666 if (notify_die(DIE_GPF, "general protection fault", regs,
17667 error_code, 13, SIGSEGV) == NOTIFY_STOP)
17668 return;
17669+
17670+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17671+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
17672+ die("PAX: suspicious general protection fault", regs, error_code);
17673+ else
17674+#endif
17675+
17676 die("general protection fault", regs, error_code);
17677 }
17678
17679@@ -414,7 +443,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
17680 /* It's safe to allow irq's after DR6 has been saved */
17681 preempt_conditional_sti(regs);
17682
17683- if (regs->flags & X86_VM_MASK) {
17684+ if (v8086_mode(regs)) {
17685 handle_vm86_trap((struct kernel_vm86_regs *) regs,
17686 error_code, 1);
17687 preempt_conditional_cli(regs);
17688@@ -428,7 +457,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
17689 * We already checked v86 mode above, so we can check for kernel mode
17690 * by just checking the CPL of CS.
17691 */
17692- if ((dr6 & DR_STEP) && !user_mode(regs)) {
17693+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
17694 tsk->thread.debugreg6 &= ~DR_STEP;
17695 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
17696 regs->flags &= ~X86_EFLAGS_TF;
17697@@ -457,7 +486,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
17698 return;
17699 conditional_sti(regs);
17700
17701- if (!user_mode_vm(regs))
17702+ if (!user_mode(regs))
17703 {
17704 if (!fixup_exception(regs)) {
17705 task->thread.error_code = error_code;
17706@@ -568,7 +597,7 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
17707 void __math_state_restore(void)
17708 {
17709 struct thread_info *thread = current_thread_info();
17710- struct task_struct *tsk = thread->task;
17711+ struct task_struct *tsk = current;
17712
17713 /*
17714 * Paranoid restore. send a SIGSEGV if we fail to restore the state.
17715@@ -595,8 +624,7 @@ void __math_state_restore(void)
17716 */
17717 asmlinkage void math_state_restore(void)
17718 {
17719- struct thread_info *thread = current_thread_info();
17720- struct task_struct *tsk = thread->task;
17721+ struct task_struct *tsk = current;
17722
17723 if (!tsk_used_math(tsk)) {
17724 local_irq_enable();
17725diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
17726index b9242ba..50c5edd 100644
17727--- a/arch/x86/kernel/verify_cpu.S
17728+++ b/arch/x86/kernel/verify_cpu.S
17729@@ -20,6 +20,7 @@
17730 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
17731 * arch/x86/kernel/trampoline_64.S: secondary processor verification
17732 * arch/x86/kernel/head_32.S: processor startup
17733+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
17734 *
17735 * verify_cpu, returns the status of longmode and SSE in register %eax.
17736 * 0: Success 1: Failure
17737diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
17738index 863f875..4307295 100644
17739--- a/arch/x86/kernel/vm86_32.c
17740+++ b/arch/x86/kernel/vm86_32.c
17741@@ -41,6 +41,7 @@
17742 #include <linux/ptrace.h>
17743 #include <linux/audit.h>
17744 #include <linux/stddef.h>
17745+#include <linux/grsecurity.h>
17746
17747 #include <asm/uaccess.h>
17748 #include <asm/io.h>
17749@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
17750 do_exit(SIGSEGV);
17751 }
17752
17753- tss = &per_cpu(init_tss, get_cpu());
17754+ tss = init_tss + get_cpu();
17755 current->thread.sp0 = current->thread.saved_sp0;
17756 current->thread.sysenter_cs = __KERNEL_CS;
17757 load_sp0(tss, &current->thread);
17758@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
17759 struct task_struct *tsk;
17760 int tmp, ret = -EPERM;
17761
17762+#ifdef CONFIG_GRKERNSEC_VM86
17763+ if (!capable(CAP_SYS_RAWIO)) {
17764+ gr_handle_vm86();
17765+ goto out;
17766+ }
17767+#endif
17768+
17769 tsk = current;
17770 if (tsk->thread.saved_sp0)
17771 goto out;
17772@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
17773 int tmp, ret;
17774 struct vm86plus_struct __user *v86;
17775
17776+#ifdef CONFIG_GRKERNSEC_VM86
17777+ if (!capable(CAP_SYS_RAWIO)) {
17778+ gr_handle_vm86();
17779+ ret = -EPERM;
17780+ goto out;
17781+ }
17782+#endif
17783+
17784 tsk = current;
17785 switch (cmd) {
17786 case VM86_REQUEST_IRQ:
17787@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
17788 tsk->thread.saved_fs = info->regs32->fs;
17789 tsk->thread.saved_gs = get_user_gs(info->regs32);
17790
17791- tss = &per_cpu(init_tss, get_cpu());
17792+ tss = init_tss + get_cpu();
17793 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
17794 if (cpu_has_sep)
17795 tsk->thread.sysenter_cs = 0;
17796@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
17797 goto cannot_handle;
17798 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
17799 goto cannot_handle;
17800- intr_ptr = (unsigned long __user *) (i << 2);
17801+ intr_ptr = (__force unsigned long __user *) (i << 2);
17802 if (get_user(segoffs, intr_ptr))
17803 goto cannot_handle;
17804 if ((segoffs >> 16) == BIOSSEG)
17805diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
17806index 0f703f1..9e15f64 100644
17807--- a/arch/x86/kernel/vmlinux.lds.S
17808+++ b/arch/x86/kernel/vmlinux.lds.S
17809@@ -26,6 +26,13 @@
17810 #include <asm/page_types.h>
17811 #include <asm/cache.h>
17812 #include <asm/boot.h>
17813+#include <asm/segment.h>
17814+
17815+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17816+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
17817+#else
17818+#define __KERNEL_TEXT_OFFSET 0
17819+#endif
17820
17821 #undef i386 /* in case the preprocessor is a 32bit one */
17822
17823@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
17824
17825 PHDRS {
17826 text PT_LOAD FLAGS(5); /* R_E */
17827+#ifdef CONFIG_X86_32
17828+ module PT_LOAD FLAGS(5); /* R_E */
17829+#endif
17830+#ifdef CONFIG_XEN
17831+ rodata PT_LOAD FLAGS(5); /* R_E */
17832+#else
17833+ rodata PT_LOAD FLAGS(4); /* R__ */
17834+#endif
17835 data PT_LOAD FLAGS(6); /* RW_ */
17836-#ifdef CONFIG_X86_64
17837+ init.begin PT_LOAD FLAGS(6); /* RW_ */
17838 #ifdef CONFIG_SMP
17839 percpu PT_LOAD FLAGS(6); /* RW_ */
17840 #endif
17841+ text.init PT_LOAD FLAGS(5); /* R_E */
17842+ text.exit PT_LOAD FLAGS(5); /* R_E */
17843 init PT_LOAD FLAGS(7); /* RWE */
17844-#endif
17845 note PT_NOTE FLAGS(0); /* ___ */
17846 }
17847
17848 SECTIONS
17849 {
17850 #ifdef CONFIG_X86_32
17851- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
17852- phys_startup_32 = startup_32 - LOAD_OFFSET;
17853+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
17854 #else
17855- . = __START_KERNEL;
17856- phys_startup_64 = startup_64 - LOAD_OFFSET;
17857+ . = __START_KERNEL;
17858 #endif
17859
17860 /* Text and read-only data */
17861- .text : AT(ADDR(.text) - LOAD_OFFSET) {
17862- _text = .;
17863+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
17864 /* bootstrapping code */
17865+#ifdef CONFIG_X86_32
17866+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
17867+#else
17868+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
17869+#endif
17870+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
17871+ _text = .;
17872 HEAD_TEXT
17873 #ifdef CONFIG_X86_32
17874 . = ALIGN(PAGE_SIZE);
17875@@ -108,13 +128,47 @@ SECTIONS
17876 IRQENTRY_TEXT
17877 *(.fixup)
17878 *(.gnu.warning)
17879- /* End of text section */
17880- _etext = .;
17881 } :text = 0x9090
17882
17883- NOTES :text :note
17884+ . += __KERNEL_TEXT_OFFSET;
17885
17886- EXCEPTION_TABLE(16) :text = 0x9090
17887+#ifdef CONFIG_X86_32
17888+ . = ALIGN(PAGE_SIZE);
17889+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
17890+
17891+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
17892+ MODULES_EXEC_VADDR = .;
17893+ BYTE(0)
17894+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
17895+ . = ALIGN(HPAGE_SIZE);
17896+ MODULES_EXEC_END = . - 1;
17897+#endif
17898+
17899+ } :module
17900+#endif
17901+
17902+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
17903+ /* End of text section */
17904+ _etext = . - __KERNEL_TEXT_OFFSET;
17905+ }
17906+
17907+#ifdef CONFIG_X86_32
17908+ . = ALIGN(PAGE_SIZE);
17909+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
17910+ *(.idt)
17911+ . = ALIGN(PAGE_SIZE);
17912+ *(.empty_zero_page)
17913+ *(.initial_pg_fixmap)
17914+ *(.initial_pg_pmd)
17915+ *(.initial_page_table)
17916+ *(.swapper_pg_dir)
17917+ } :rodata
17918+#endif
17919+
17920+ . = ALIGN(PAGE_SIZE);
17921+ NOTES :rodata :note
17922+
17923+ EXCEPTION_TABLE(16) :rodata
17924
17925 #if defined(CONFIG_DEBUG_RODATA)
17926 /* .text should occupy whole number of pages */
17927@@ -126,16 +180,20 @@ SECTIONS
17928
17929 /* Data */
17930 .data : AT(ADDR(.data) - LOAD_OFFSET) {
17931+
17932+#ifdef CONFIG_PAX_KERNEXEC
17933+ . = ALIGN(HPAGE_SIZE);
17934+#else
17935+ . = ALIGN(PAGE_SIZE);
17936+#endif
17937+
17938 /* Start of data section */
17939 _sdata = .;
17940
17941 /* init_task */
17942 INIT_TASK_DATA(THREAD_SIZE)
17943
17944-#ifdef CONFIG_X86_32
17945- /* 32 bit has nosave before _edata */
17946 NOSAVE_DATA
17947-#endif
17948
17949 PAGE_ALIGNED_DATA(PAGE_SIZE)
17950
17951@@ -176,12 +234,19 @@ SECTIONS
17952 #endif /* CONFIG_X86_64 */
17953
17954 /* Init code and data - will be freed after init */
17955- . = ALIGN(PAGE_SIZE);
17956 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
17957+ BYTE(0)
17958+
17959+#ifdef CONFIG_PAX_KERNEXEC
17960+ . = ALIGN(HPAGE_SIZE);
17961+#else
17962+ . = ALIGN(PAGE_SIZE);
17963+#endif
17964+
17965 __init_begin = .; /* paired with __init_end */
17966- }
17967+ } :init.begin
17968
17969-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
17970+#ifdef CONFIG_SMP
17971 /*
17972 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
17973 * output PHDR, so the next output section - .init.text - should
17974@@ -190,12 +255,27 @@ SECTIONS
17975 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
17976 #endif
17977
17978- INIT_TEXT_SECTION(PAGE_SIZE)
17979-#ifdef CONFIG_X86_64
17980- :init
17981-#endif
17982+ . = ALIGN(PAGE_SIZE);
17983+ init_begin = .;
17984+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
17985+ VMLINUX_SYMBOL(_sinittext) = .;
17986+ INIT_TEXT
17987+ VMLINUX_SYMBOL(_einittext) = .;
17988+ . = ALIGN(PAGE_SIZE);
17989+ } :text.init
17990
17991- INIT_DATA_SECTION(16)
17992+ /*
17993+ * .exit.text is discard at runtime, not link time, to deal with
17994+ * references from .altinstructions and .eh_frame
17995+ */
17996+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
17997+ EXIT_TEXT
17998+ . = ALIGN(16);
17999+ } :text.exit
18000+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
18001+
18002+ . = ALIGN(PAGE_SIZE);
18003+ INIT_DATA_SECTION(16) :init
18004
18005 /*
18006 * Code and data for a variety of lowlevel trampolines, to be
18007@@ -269,19 +349,12 @@ SECTIONS
18008 }
18009
18010 . = ALIGN(8);
18011- /*
18012- * .exit.text is discard at runtime, not link time, to deal with
18013- * references from .altinstructions and .eh_frame
18014- */
18015- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
18016- EXIT_TEXT
18017- }
18018
18019 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
18020 EXIT_DATA
18021 }
18022
18023-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
18024+#ifndef CONFIG_SMP
18025 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
18026 #endif
18027
18028@@ -300,16 +373,10 @@ SECTIONS
18029 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
18030 __smp_locks = .;
18031 *(.smp_locks)
18032- . = ALIGN(PAGE_SIZE);
18033 __smp_locks_end = .;
18034+ . = ALIGN(PAGE_SIZE);
18035 }
18036
18037-#ifdef CONFIG_X86_64
18038- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
18039- NOSAVE_DATA
18040- }
18041-#endif
18042-
18043 /* BSS */
18044 . = ALIGN(PAGE_SIZE);
18045 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
18046@@ -325,6 +392,7 @@ SECTIONS
18047 __brk_base = .;
18048 . += 64 * 1024; /* 64k alignment slop space */
18049 *(.brk_reservation) /* areas brk users have reserved */
18050+ . = ALIGN(HPAGE_SIZE);
18051 __brk_limit = .;
18052 }
18053
18054@@ -351,13 +419,12 @@ SECTIONS
18055 * for the boot processor.
18056 */
18057 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
18058-INIT_PER_CPU(gdt_page);
18059 INIT_PER_CPU(irq_stack_union);
18060
18061 /*
18062 * Build-time check on the image size:
18063 */
18064-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
18065+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
18066 "kernel image bigger than KERNEL_IMAGE_SIZE");
18067
18068 #ifdef CONFIG_SMP
18069diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
18070index e4d4a22..47ee71f 100644
18071--- a/arch/x86/kernel/vsyscall_64.c
18072+++ b/arch/x86/kernel/vsyscall_64.c
18073@@ -57,15 +57,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
18074 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
18075 };
18076
18077-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
18078+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
18079
18080 static int __init vsyscall_setup(char *str)
18081 {
18082 if (str) {
18083 if (!strcmp("emulate", str))
18084 vsyscall_mode = EMULATE;
18085- else if (!strcmp("native", str))
18086- vsyscall_mode = NATIVE;
18087 else if (!strcmp("none", str))
18088 vsyscall_mode = NONE;
18089 else
18090@@ -178,7 +176,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
18091
18092 tsk = current;
18093 if (seccomp_mode(&tsk->seccomp))
18094- do_exit(SIGKILL);
18095+ do_group_exit(SIGKILL);
18096
18097 switch (vsyscall_nr) {
18098 case 0:
18099@@ -220,8 +218,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
18100 return true;
18101
18102 sigsegv:
18103- force_sig(SIGSEGV, current);
18104- return true;
18105+ do_group_exit(SIGKILL);
18106 }
18107
18108 /*
18109@@ -274,10 +271,7 @@ void __init map_vsyscall(void)
18110 extern char __vvar_page;
18111 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
18112
18113- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
18114- vsyscall_mode == NATIVE
18115- ? PAGE_KERNEL_VSYSCALL
18116- : PAGE_KERNEL_VVAR);
18117+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
18118 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
18119 (unsigned long)VSYSCALL_START);
18120
18121diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
18122index 9796c2f..f686fbf 100644
18123--- a/arch/x86/kernel/x8664_ksyms_64.c
18124+++ b/arch/x86/kernel/x8664_ksyms_64.c
18125@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
18126 EXPORT_SYMBOL(copy_user_generic_string);
18127 EXPORT_SYMBOL(copy_user_generic_unrolled);
18128 EXPORT_SYMBOL(__copy_user_nocache);
18129-EXPORT_SYMBOL(_copy_from_user);
18130-EXPORT_SYMBOL(_copy_to_user);
18131
18132 EXPORT_SYMBOL(copy_page);
18133 EXPORT_SYMBOL(clear_page);
18134diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
18135index a391134..d0b63b6e 100644
18136--- a/arch/x86/kernel/xsave.c
18137+++ b/arch/x86/kernel/xsave.c
18138@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
18139 fx_sw_user->xstate_size > fx_sw_user->extended_size)
18140 return -EINVAL;
18141
18142- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
18143+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
18144 fx_sw_user->extended_size -
18145 FP_XSTATE_MAGIC2_SIZE));
18146 if (err)
18147@@ -267,7 +267,7 @@ fx_only:
18148 * the other extended state.
18149 */
18150 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
18151- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
18152+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
18153 }
18154
18155 /*
18156@@ -299,7 +299,7 @@ int restore_i387_xstate(void __user *buf)
18157 if (use_xsave())
18158 err = restore_user_xstate(buf);
18159 else
18160- err = fxrstor_checking((__force struct i387_fxsave_struct *)
18161+ err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
18162 buf);
18163 if (unlikely(err)) {
18164 /*
18165diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
18166index f1e3be1..588efc8 100644
18167--- a/arch/x86/kvm/emulate.c
18168+++ b/arch/x86/kvm/emulate.c
18169@@ -249,6 +249,7 @@ struct gprefix {
18170
18171 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
18172 do { \
18173+ unsigned long _tmp; \
18174 __asm__ __volatile__ ( \
18175 _PRE_EFLAGS("0", "4", "2") \
18176 _op _suffix " %"_x"3,%1; " \
18177@@ -263,8 +264,6 @@ struct gprefix {
18178 /* Raw emulation: instruction has two explicit operands. */
18179 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
18180 do { \
18181- unsigned long _tmp; \
18182- \
18183 switch ((ctxt)->dst.bytes) { \
18184 case 2: \
18185 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
18186@@ -280,7 +279,6 @@ struct gprefix {
18187
18188 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
18189 do { \
18190- unsigned long _tmp; \
18191 switch ((ctxt)->dst.bytes) { \
18192 case 1: \
18193 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
18194diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
18195index 54abb40..a192606 100644
18196--- a/arch/x86/kvm/lapic.c
18197+++ b/arch/x86/kvm/lapic.c
18198@@ -53,7 +53,7 @@
18199 #define APIC_BUS_CYCLE_NS 1
18200
18201 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
18202-#define apic_debug(fmt, arg...)
18203+#define apic_debug(fmt, arg...) do {} while (0)
18204
18205 #define APIC_LVT_NUM 6
18206 /* 14 is the version for Xeon and Pentium 8.4.8*/
18207diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
18208index f1b36cf..af8a124 100644
18209--- a/arch/x86/kvm/mmu.c
18210+++ b/arch/x86/kvm/mmu.c
18211@@ -3555,7 +3555,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
18212
18213 pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
18214
18215- invlpg_counter = atomic_read(&vcpu->kvm->arch.invlpg_counter);
18216+ invlpg_counter = atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter);
18217
18218 /*
18219 * Assume that the pte write on a page table of the same type
18220@@ -3587,7 +3587,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
18221 }
18222
18223 spin_lock(&vcpu->kvm->mmu_lock);
18224- if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
18225+ if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
18226 gentry = 0;
18227 kvm_mmu_free_some_pages(vcpu);
18228 ++vcpu->kvm->stat.mmu_pte_write;
18229diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
18230index 9299410..ade2f9b 100644
18231--- a/arch/x86/kvm/paging_tmpl.h
18232+++ b/arch/x86/kvm/paging_tmpl.h
18233@@ -197,7 +197,7 @@ retry_walk:
18234 if (unlikely(kvm_is_error_hva(host_addr)))
18235 goto error;
18236
18237- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
18238+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
18239 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
18240 goto error;
18241
18242@@ -705,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)
18243 if (need_flush)
18244 kvm_flush_remote_tlbs(vcpu->kvm);
18245
18246- atomic_inc(&vcpu->kvm->arch.invlpg_counter);
18247+ atomic_inc_unchecked(&vcpu->kvm->arch.invlpg_counter);
18248
18249 spin_unlock(&vcpu->kvm->mmu_lock);
18250
18251diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
18252index e32243e..a6e6172 100644
18253--- a/arch/x86/kvm/svm.c
18254+++ b/arch/x86/kvm/svm.c
18255@@ -3400,7 +3400,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
18256 int cpu = raw_smp_processor_id();
18257
18258 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
18259+
18260+ pax_open_kernel();
18261 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
18262+ pax_close_kernel();
18263+
18264 load_TR_desc();
18265 }
18266
18267@@ -3778,6 +3782,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
18268 #endif
18269 #endif
18270
18271+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
18272+ __set_fs(current_thread_info()->addr_limit);
18273+#endif
18274+
18275 reload_tss(vcpu);
18276
18277 local_irq_disable();
18278diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
18279index 579a0b5..ed7bbf9 100644
18280--- a/arch/x86/kvm/vmx.c
18281+++ b/arch/x86/kvm/vmx.c
18282@@ -1305,7 +1305,11 @@ static void reload_tss(void)
18283 struct desc_struct *descs;
18284
18285 descs = (void *)gdt->address;
18286+
18287+ pax_open_kernel();
18288 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
18289+ pax_close_kernel();
18290+
18291 load_TR_desc();
18292 }
18293
18294@@ -2633,8 +2637,11 @@ static __init int hardware_setup(void)
18295 if (!cpu_has_vmx_flexpriority())
18296 flexpriority_enabled = 0;
18297
18298- if (!cpu_has_vmx_tpr_shadow())
18299- kvm_x86_ops->update_cr8_intercept = NULL;
18300+ if (!cpu_has_vmx_tpr_shadow()) {
18301+ pax_open_kernel();
18302+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
18303+ pax_close_kernel();
18304+ }
18305
18306 if (enable_ept && !cpu_has_vmx_ept_2m_page())
18307 kvm_disable_largepages();
18308@@ -3648,7 +3655,7 @@ static void vmx_set_constant_host_state(void)
18309 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
18310
18311 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
18312- vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
18313+ vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
18314
18315 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
18316 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
18317@@ -6169,6 +6176,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
18318 "jmp .Lkvm_vmx_return \n\t"
18319 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
18320 ".Lkvm_vmx_return: "
18321+
18322+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18323+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
18324+ ".Lkvm_vmx_return2: "
18325+#endif
18326+
18327 /* Save guest registers, load host registers, keep flags */
18328 "mov %0, %c[wordsize](%%"R"sp) \n\t"
18329 "pop %0 \n\t"
18330@@ -6217,6 +6230,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
18331 #endif
18332 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
18333 [wordsize]"i"(sizeof(ulong))
18334+
18335+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18336+ ,[cs]"i"(__KERNEL_CS)
18337+#endif
18338+
18339 : "cc", "memory"
18340 , R"ax", R"bx", R"di", R"si"
18341 #ifdef CONFIG_X86_64
18342@@ -6245,7 +6263,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
18343 }
18344 }
18345
18346- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
18347+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
18348+
18349+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18350+ loadsegment(fs, __KERNEL_PERCPU);
18351+#endif
18352+
18353+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
18354+ __set_fs(current_thread_info()->addr_limit);
18355+#endif
18356+
18357 vmx->loaded_vmcs->launched = 1;
18358
18359 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
18360diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
18361index 4c938da..4ddef65 100644
18362--- a/arch/x86/kvm/x86.c
18363+++ b/arch/x86/kvm/x86.c
18364@@ -1345,8 +1345,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
18365 {
18366 struct kvm *kvm = vcpu->kvm;
18367 int lm = is_long_mode(vcpu);
18368- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
18369- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
18370+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
18371+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
18372 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
18373 : kvm->arch.xen_hvm_config.blob_size_32;
18374 u32 page_num = data & ~PAGE_MASK;
18375@@ -2165,6 +2165,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
18376 if (n < msr_list.nmsrs)
18377 goto out;
18378 r = -EFAULT;
18379+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
18380+ goto out;
18381 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
18382 num_msrs_to_save * sizeof(u32)))
18383 goto out;
18384@@ -2340,15 +2342,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
18385 struct kvm_cpuid2 *cpuid,
18386 struct kvm_cpuid_entry2 __user *entries)
18387 {
18388- int r;
18389+ int r, i;
18390
18391 r = -E2BIG;
18392 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
18393 goto out;
18394 r = -EFAULT;
18395- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
18396- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
18397+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
18398 goto out;
18399+ for (i = 0; i < cpuid->nent; ++i) {
18400+ struct kvm_cpuid_entry2 cpuid_entry;
18401+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
18402+ goto out;
18403+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
18404+ }
18405 vcpu->arch.cpuid_nent = cpuid->nent;
18406 kvm_apic_set_version(vcpu);
18407 kvm_x86_ops->cpuid_update(vcpu);
18408@@ -2363,15 +2370,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
18409 struct kvm_cpuid2 *cpuid,
18410 struct kvm_cpuid_entry2 __user *entries)
18411 {
18412- int r;
18413+ int r, i;
18414
18415 r = -E2BIG;
18416 if (cpuid->nent < vcpu->arch.cpuid_nent)
18417 goto out;
18418 r = -EFAULT;
18419- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
18420- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
18421+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
18422 goto out;
18423+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
18424+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
18425+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
18426+ goto out;
18427+ }
18428 return 0;
18429
18430 out:
18431@@ -2746,7 +2757,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
18432 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
18433 struct kvm_interrupt *irq)
18434 {
18435- if (irq->irq < 0 || irq->irq >= 256)
18436+ if (irq->irq >= 256)
18437 return -EINVAL;
18438 if (irqchip_in_kernel(vcpu->kvm))
18439 return -ENXIO;
18440@@ -5162,7 +5173,7 @@ static void kvm_set_mmio_spte_mask(void)
18441 kvm_mmu_set_mmio_spte_mask(mask);
18442 }
18443
18444-int kvm_arch_init(void *opaque)
18445+int kvm_arch_init(const void *opaque)
18446 {
18447 int r;
18448 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
18449diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
18450index cf4603b..7cdde38 100644
18451--- a/arch/x86/lguest/boot.c
18452+++ b/arch/x86/lguest/boot.c
18453@@ -1195,9 +1195,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
18454 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
18455 * Launcher to reboot us.
18456 */
18457-static void lguest_restart(char *reason)
18458+static __noreturn void lguest_restart(char *reason)
18459 {
18460 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
18461+ BUG();
18462 }
18463
18464 /*G:050
18465diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
18466index 042f682..c92afb6 100644
18467--- a/arch/x86/lib/atomic64_32.c
18468+++ b/arch/x86/lib/atomic64_32.c
18469@@ -8,18 +8,30 @@
18470
18471 long long atomic64_read_cx8(long long, const atomic64_t *v);
18472 EXPORT_SYMBOL(atomic64_read_cx8);
18473+long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v);
18474+EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
18475 long long atomic64_set_cx8(long long, const atomic64_t *v);
18476 EXPORT_SYMBOL(atomic64_set_cx8);
18477+long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
18478+EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
18479 long long atomic64_xchg_cx8(long long, unsigned high);
18480 EXPORT_SYMBOL(atomic64_xchg_cx8);
18481 long long atomic64_add_return_cx8(long long a, atomic64_t *v);
18482 EXPORT_SYMBOL(atomic64_add_return_cx8);
18483+long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
18484+EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
18485 long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
18486 EXPORT_SYMBOL(atomic64_sub_return_cx8);
18487+long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
18488+EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
18489 long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
18490 EXPORT_SYMBOL(atomic64_inc_return_cx8);
18491+long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
18492+EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
18493 long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
18494 EXPORT_SYMBOL(atomic64_dec_return_cx8);
18495+long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
18496+EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
18497 long long atomic64_dec_if_positive_cx8(atomic64_t *v);
18498 EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
18499 int atomic64_inc_not_zero_cx8(atomic64_t *v);
18500@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
18501 #ifndef CONFIG_X86_CMPXCHG64
18502 long long atomic64_read_386(long long, const atomic64_t *v);
18503 EXPORT_SYMBOL(atomic64_read_386);
18504+long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
18505+EXPORT_SYMBOL(atomic64_read_unchecked_386);
18506 long long atomic64_set_386(long long, const atomic64_t *v);
18507 EXPORT_SYMBOL(atomic64_set_386);
18508+long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
18509+EXPORT_SYMBOL(atomic64_set_unchecked_386);
18510 long long atomic64_xchg_386(long long, unsigned high);
18511 EXPORT_SYMBOL(atomic64_xchg_386);
18512 long long atomic64_add_return_386(long long a, atomic64_t *v);
18513 EXPORT_SYMBOL(atomic64_add_return_386);
18514+long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
18515+EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
18516 long long atomic64_sub_return_386(long long a, atomic64_t *v);
18517 EXPORT_SYMBOL(atomic64_sub_return_386);
18518+long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
18519+EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
18520 long long atomic64_inc_return_386(long long a, atomic64_t *v);
18521 EXPORT_SYMBOL(atomic64_inc_return_386);
18522+long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
18523+EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
18524 long long atomic64_dec_return_386(long long a, atomic64_t *v);
18525 EXPORT_SYMBOL(atomic64_dec_return_386);
18526+long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
18527+EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
18528 long long atomic64_add_386(long long a, atomic64_t *v);
18529 EXPORT_SYMBOL(atomic64_add_386);
18530+long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
18531+EXPORT_SYMBOL(atomic64_add_unchecked_386);
18532 long long atomic64_sub_386(long long a, atomic64_t *v);
18533 EXPORT_SYMBOL(atomic64_sub_386);
18534+long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
18535+EXPORT_SYMBOL(atomic64_sub_unchecked_386);
18536 long long atomic64_inc_386(long long a, atomic64_t *v);
18537 EXPORT_SYMBOL(atomic64_inc_386);
18538+long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
18539+EXPORT_SYMBOL(atomic64_inc_unchecked_386);
18540 long long atomic64_dec_386(long long a, atomic64_t *v);
18541 EXPORT_SYMBOL(atomic64_dec_386);
18542+long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
18543+EXPORT_SYMBOL(atomic64_dec_unchecked_386);
18544 long long atomic64_dec_if_positive_386(atomic64_t *v);
18545 EXPORT_SYMBOL(atomic64_dec_if_positive_386);
18546 int atomic64_inc_not_zero_386(atomic64_t *v);
18547diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
18548index e8e7e0d..56fd1b0 100644
18549--- a/arch/x86/lib/atomic64_386_32.S
18550+++ b/arch/x86/lib/atomic64_386_32.S
18551@@ -48,6 +48,10 @@ BEGIN(read)
18552 movl (v), %eax
18553 movl 4(v), %edx
18554 RET_ENDP
18555+BEGIN(read_unchecked)
18556+ movl (v), %eax
18557+ movl 4(v), %edx
18558+RET_ENDP
18559 #undef v
18560
18561 #define v %esi
18562@@ -55,6 +59,10 @@ BEGIN(set)
18563 movl %ebx, (v)
18564 movl %ecx, 4(v)
18565 RET_ENDP
18566+BEGIN(set_unchecked)
18567+ movl %ebx, (v)
18568+ movl %ecx, 4(v)
18569+RET_ENDP
18570 #undef v
18571
18572 #define v %esi
18573@@ -70,6 +78,20 @@ RET_ENDP
18574 BEGIN(add)
18575 addl %eax, (v)
18576 adcl %edx, 4(v)
18577+
18578+#ifdef CONFIG_PAX_REFCOUNT
18579+ jno 0f
18580+ subl %eax, (v)
18581+ sbbl %edx, 4(v)
18582+ int $4
18583+0:
18584+ _ASM_EXTABLE(0b, 0b)
18585+#endif
18586+
18587+RET_ENDP
18588+BEGIN(add_unchecked)
18589+ addl %eax, (v)
18590+ adcl %edx, 4(v)
18591 RET_ENDP
18592 #undef v
18593
18594@@ -77,6 +99,24 @@ RET_ENDP
18595 BEGIN(add_return)
18596 addl (v), %eax
18597 adcl 4(v), %edx
18598+
18599+#ifdef CONFIG_PAX_REFCOUNT
18600+ into
18601+1234:
18602+ _ASM_EXTABLE(1234b, 2f)
18603+#endif
18604+
18605+ movl %eax, (v)
18606+ movl %edx, 4(v)
18607+
18608+#ifdef CONFIG_PAX_REFCOUNT
18609+2:
18610+#endif
18611+
18612+RET_ENDP
18613+BEGIN(add_return_unchecked)
18614+ addl (v), %eax
18615+ adcl 4(v), %edx
18616 movl %eax, (v)
18617 movl %edx, 4(v)
18618 RET_ENDP
18619@@ -86,6 +126,20 @@ RET_ENDP
18620 BEGIN(sub)
18621 subl %eax, (v)
18622 sbbl %edx, 4(v)
18623+
18624+#ifdef CONFIG_PAX_REFCOUNT
18625+ jno 0f
18626+ addl %eax, (v)
18627+ adcl %edx, 4(v)
18628+ int $4
18629+0:
18630+ _ASM_EXTABLE(0b, 0b)
18631+#endif
18632+
18633+RET_ENDP
18634+BEGIN(sub_unchecked)
18635+ subl %eax, (v)
18636+ sbbl %edx, 4(v)
18637 RET_ENDP
18638 #undef v
18639
18640@@ -96,6 +150,27 @@ BEGIN(sub_return)
18641 sbbl $0, %edx
18642 addl (v), %eax
18643 adcl 4(v), %edx
18644+
18645+#ifdef CONFIG_PAX_REFCOUNT
18646+ into
18647+1234:
18648+ _ASM_EXTABLE(1234b, 2f)
18649+#endif
18650+
18651+ movl %eax, (v)
18652+ movl %edx, 4(v)
18653+
18654+#ifdef CONFIG_PAX_REFCOUNT
18655+2:
18656+#endif
18657+
18658+RET_ENDP
18659+BEGIN(sub_return_unchecked)
18660+ negl %edx
18661+ negl %eax
18662+ sbbl $0, %edx
18663+ addl (v), %eax
18664+ adcl 4(v), %edx
18665 movl %eax, (v)
18666 movl %edx, 4(v)
18667 RET_ENDP
18668@@ -105,6 +180,20 @@ RET_ENDP
18669 BEGIN(inc)
18670 addl $1, (v)
18671 adcl $0, 4(v)
18672+
18673+#ifdef CONFIG_PAX_REFCOUNT
18674+ jno 0f
18675+ subl $1, (v)
18676+ sbbl $0, 4(v)
18677+ int $4
18678+0:
18679+ _ASM_EXTABLE(0b, 0b)
18680+#endif
18681+
18682+RET_ENDP
18683+BEGIN(inc_unchecked)
18684+ addl $1, (v)
18685+ adcl $0, 4(v)
18686 RET_ENDP
18687 #undef v
18688
18689@@ -114,6 +203,26 @@ BEGIN(inc_return)
18690 movl 4(v), %edx
18691 addl $1, %eax
18692 adcl $0, %edx
18693+
18694+#ifdef CONFIG_PAX_REFCOUNT
18695+ into
18696+1234:
18697+ _ASM_EXTABLE(1234b, 2f)
18698+#endif
18699+
18700+ movl %eax, (v)
18701+ movl %edx, 4(v)
18702+
18703+#ifdef CONFIG_PAX_REFCOUNT
18704+2:
18705+#endif
18706+
18707+RET_ENDP
18708+BEGIN(inc_return_unchecked)
18709+ movl (v), %eax
18710+ movl 4(v), %edx
18711+ addl $1, %eax
18712+ adcl $0, %edx
18713 movl %eax, (v)
18714 movl %edx, 4(v)
18715 RET_ENDP
18716@@ -123,6 +232,20 @@ RET_ENDP
18717 BEGIN(dec)
18718 subl $1, (v)
18719 sbbl $0, 4(v)
18720+
18721+#ifdef CONFIG_PAX_REFCOUNT
18722+ jno 0f
18723+ addl $1, (v)
18724+ adcl $0, 4(v)
18725+ int $4
18726+0:
18727+ _ASM_EXTABLE(0b, 0b)
18728+#endif
18729+
18730+RET_ENDP
18731+BEGIN(dec_unchecked)
18732+ subl $1, (v)
18733+ sbbl $0, 4(v)
18734 RET_ENDP
18735 #undef v
18736
18737@@ -132,6 +255,26 @@ BEGIN(dec_return)
18738 movl 4(v), %edx
18739 subl $1, %eax
18740 sbbl $0, %edx
18741+
18742+#ifdef CONFIG_PAX_REFCOUNT
18743+ into
18744+1234:
18745+ _ASM_EXTABLE(1234b, 2f)
18746+#endif
18747+
18748+ movl %eax, (v)
18749+ movl %edx, 4(v)
18750+
18751+#ifdef CONFIG_PAX_REFCOUNT
18752+2:
18753+#endif
18754+
18755+RET_ENDP
18756+BEGIN(dec_return_unchecked)
18757+ movl (v), %eax
18758+ movl 4(v), %edx
18759+ subl $1, %eax
18760+ sbbl $0, %edx
18761 movl %eax, (v)
18762 movl %edx, 4(v)
18763 RET_ENDP
18764@@ -143,6 +286,13 @@ BEGIN(add_unless)
18765 adcl %edx, %edi
18766 addl (v), %eax
18767 adcl 4(v), %edx
18768+
18769+#ifdef CONFIG_PAX_REFCOUNT
18770+ into
18771+1234:
18772+ _ASM_EXTABLE(1234b, 2f)
18773+#endif
18774+
18775 cmpl %eax, %esi
18776 je 3f
18777 1:
18778@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
18779 1:
18780 addl $1, %eax
18781 adcl $0, %edx
18782+
18783+#ifdef CONFIG_PAX_REFCOUNT
18784+ into
18785+1234:
18786+ _ASM_EXTABLE(1234b, 2f)
18787+#endif
18788+
18789 movl %eax, (v)
18790 movl %edx, 4(v)
18791 movl $1, %eax
18792@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
18793 movl 4(v), %edx
18794 subl $1, %eax
18795 sbbl $0, %edx
18796+
18797+#ifdef CONFIG_PAX_REFCOUNT
18798+ into
18799+1234:
18800+ _ASM_EXTABLE(1234b, 1f)
18801+#endif
18802+
18803 js 1f
18804 movl %eax, (v)
18805 movl %edx, 4(v)
18806diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
18807index 391a083..d658e9f 100644
18808--- a/arch/x86/lib/atomic64_cx8_32.S
18809+++ b/arch/x86/lib/atomic64_cx8_32.S
18810@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
18811 CFI_STARTPROC
18812
18813 read64 %ecx
18814+ pax_force_retaddr
18815 ret
18816 CFI_ENDPROC
18817 ENDPROC(atomic64_read_cx8)
18818
18819+ENTRY(atomic64_read_unchecked_cx8)
18820+ CFI_STARTPROC
18821+
18822+ read64 %ecx
18823+ pax_force_retaddr
18824+ ret
18825+ CFI_ENDPROC
18826+ENDPROC(atomic64_read_unchecked_cx8)
18827+
18828 ENTRY(atomic64_set_cx8)
18829 CFI_STARTPROC
18830
18831@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
18832 cmpxchg8b (%esi)
18833 jne 1b
18834
18835+ pax_force_retaddr
18836 ret
18837 CFI_ENDPROC
18838 ENDPROC(atomic64_set_cx8)
18839
18840+ENTRY(atomic64_set_unchecked_cx8)
18841+ CFI_STARTPROC
18842+
18843+1:
18844+/* we don't need LOCK_PREFIX since aligned 64-bit writes
18845+ * are atomic on 586 and newer */
18846+ cmpxchg8b (%esi)
18847+ jne 1b
18848+
18849+ pax_force_retaddr
18850+ ret
18851+ CFI_ENDPROC
18852+ENDPROC(atomic64_set_unchecked_cx8)
18853+
18854 ENTRY(atomic64_xchg_cx8)
18855 CFI_STARTPROC
18856
18857@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
18858 cmpxchg8b (%esi)
18859 jne 1b
18860
18861+ pax_force_retaddr
18862 ret
18863 CFI_ENDPROC
18864 ENDPROC(atomic64_xchg_cx8)
18865
18866-.macro addsub_return func ins insc
18867-ENTRY(atomic64_\func\()_return_cx8)
18868+.macro addsub_return func ins insc unchecked=""
18869+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
18870 CFI_STARTPROC
18871 SAVE ebp
18872 SAVE ebx
18873@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
18874 movl %edx, %ecx
18875 \ins\()l %esi, %ebx
18876 \insc\()l %edi, %ecx
18877+
18878+.ifb \unchecked
18879+#ifdef CONFIG_PAX_REFCOUNT
18880+ into
18881+2:
18882+ _ASM_EXTABLE(2b, 3f)
18883+#endif
18884+.endif
18885+
18886 LOCK_PREFIX
18887 cmpxchg8b (%ebp)
18888 jne 1b
18889-
18890-10:
18891 movl %ebx, %eax
18892 movl %ecx, %edx
18893+
18894+.ifb \unchecked
18895+#ifdef CONFIG_PAX_REFCOUNT
18896+3:
18897+#endif
18898+.endif
18899+
18900 RESTORE edi
18901 RESTORE esi
18902 RESTORE ebx
18903 RESTORE ebp
18904+ pax_force_retaddr
18905 ret
18906 CFI_ENDPROC
18907-ENDPROC(atomic64_\func\()_return_cx8)
18908+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
18909 .endm
18910
18911 addsub_return add add adc
18912 addsub_return sub sub sbb
18913+addsub_return add add adc _unchecked
18914+addsub_return sub sub sbb _unchecked
18915
18916-.macro incdec_return func ins insc
18917-ENTRY(atomic64_\func\()_return_cx8)
18918+.macro incdec_return func ins insc unchecked
18919+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
18920 CFI_STARTPROC
18921 SAVE ebx
18922
18923@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
18924 movl %edx, %ecx
18925 \ins\()l $1, %ebx
18926 \insc\()l $0, %ecx
18927+
18928+.ifb \unchecked
18929+#ifdef CONFIG_PAX_REFCOUNT
18930+ into
18931+2:
18932+ _ASM_EXTABLE(2b, 3f)
18933+#endif
18934+.endif
18935+
18936 LOCK_PREFIX
18937 cmpxchg8b (%esi)
18938 jne 1b
18939
18940-10:
18941 movl %ebx, %eax
18942 movl %ecx, %edx
18943+
18944+.ifb \unchecked
18945+#ifdef CONFIG_PAX_REFCOUNT
18946+3:
18947+#endif
18948+.endif
18949+
18950 RESTORE ebx
18951+ pax_force_retaddr
18952 ret
18953 CFI_ENDPROC
18954-ENDPROC(atomic64_\func\()_return_cx8)
18955+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
18956 .endm
18957
18958 incdec_return inc add adc
18959 incdec_return dec sub sbb
18960+incdec_return inc add adc _unchecked
18961+incdec_return dec sub sbb _unchecked
18962
18963 ENTRY(atomic64_dec_if_positive_cx8)
18964 CFI_STARTPROC
18965@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
18966 movl %edx, %ecx
18967 subl $1, %ebx
18968 sbb $0, %ecx
18969+
18970+#ifdef CONFIG_PAX_REFCOUNT
18971+ into
18972+1234:
18973+ _ASM_EXTABLE(1234b, 2f)
18974+#endif
18975+
18976 js 2f
18977 LOCK_PREFIX
18978 cmpxchg8b (%esi)
18979@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
18980 movl %ebx, %eax
18981 movl %ecx, %edx
18982 RESTORE ebx
18983+ pax_force_retaddr
18984 ret
18985 CFI_ENDPROC
18986 ENDPROC(atomic64_dec_if_positive_cx8)
18987@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
18988 movl %edx, %ecx
18989 addl %esi, %ebx
18990 adcl %edi, %ecx
18991+
18992+#ifdef CONFIG_PAX_REFCOUNT
18993+ into
18994+1234:
18995+ _ASM_EXTABLE(1234b, 3f)
18996+#endif
18997+
18998 LOCK_PREFIX
18999 cmpxchg8b (%ebp)
19000 jne 1b
19001@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
19002 CFI_ADJUST_CFA_OFFSET -8
19003 RESTORE ebx
19004 RESTORE ebp
19005+ pax_force_retaddr
19006 ret
19007 4:
19008 cmpl %edx, 4(%esp)
19009@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
19010 movl %edx, %ecx
19011 addl $1, %ebx
19012 adcl $0, %ecx
19013+
19014+#ifdef CONFIG_PAX_REFCOUNT
19015+ into
19016+1234:
19017+ _ASM_EXTABLE(1234b, 3f)
19018+#endif
19019+
19020 LOCK_PREFIX
19021 cmpxchg8b (%esi)
19022 jne 1b
19023@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
19024 movl $1, %eax
19025 3:
19026 RESTORE ebx
19027+ pax_force_retaddr
19028 ret
19029 4:
19030 testl %edx, %edx
19031diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
19032index 78d16a5..fbcf666 100644
19033--- a/arch/x86/lib/checksum_32.S
19034+++ b/arch/x86/lib/checksum_32.S
19035@@ -28,7 +28,8 @@
19036 #include <linux/linkage.h>
19037 #include <asm/dwarf2.h>
19038 #include <asm/errno.h>
19039-
19040+#include <asm/segment.h>
19041+
19042 /*
19043 * computes a partial checksum, e.g. for TCP/UDP fragments
19044 */
19045@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
19046
19047 #define ARGBASE 16
19048 #define FP 12
19049-
19050-ENTRY(csum_partial_copy_generic)
19051+
19052+ENTRY(csum_partial_copy_generic_to_user)
19053 CFI_STARTPROC
19054+
19055+#ifdef CONFIG_PAX_MEMORY_UDEREF
19056+ pushl_cfi %gs
19057+ popl_cfi %es
19058+ jmp csum_partial_copy_generic
19059+#endif
19060+
19061+ENTRY(csum_partial_copy_generic_from_user)
19062+
19063+#ifdef CONFIG_PAX_MEMORY_UDEREF
19064+ pushl_cfi %gs
19065+ popl_cfi %ds
19066+#endif
19067+
19068+ENTRY(csum_partial_copy_generic)
19069 subl $4,%esp
19070 CFI_ADJUST_CFA_OFFSET 4
19071 pushl_cfi %edi
19072@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
19073 jmp 4f
19074 SRC(1: movw (%esi), %bx )
19075 addl $2, %esi
19076-DST( movw %bx, (%edi) )
19077+DST( movw %bx, %es:(%edi) )
19078 addl $2, %edi
19079 addw %bx, %ax
19080 adcl $0, %eax
19081@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
19082 SRC(1: movl (%esi), %ebx )
19083 SRC( movl 4(%esi), %edx )
19084 adcl %ebx, %eax
19085-DST( movl %ebx, (%edi) )
19086+DST( movl %ebx, %es:(%edi) )
19087 adcl %edx, %eax
19088-DST( movl %edx, 4(%edi) )
19089+DST( movl %edx, %es:4(%edi) )
19090
19091 SRC( movl 8(%esi), %ebx )
19092 SRC( movl 12(%esi), %edx )
19093 adcl %ebx, %eax
19094-DST( movl %ebx, 8(%edi) )
19095+DST( movl %ebx, %es:8(%edi) )
19096 adcl %edx, %eax
19097-DST( movl %edx, 12(%edi) )
19098+DST( movl %edx, %es:12(%edi) )
19099
19100 SRC( movl 16(%esi), %ebx )
19101 SRC( movl 20(%esi), %edx )
19102 adcl %ebx, %eax
19103-DST( movl %ebx, 16(%edi) )
19104+DST( movl %ebx, %es:16(%edi) )
19105 adcl %edx, %eax
19106-DST( movl %edx, 20(%edi) )
19107+DST( movl %edx, %es:20(%edi) )
19108
19109 SRC( movl 24(%esi), %ebx )
19110 SRC( movl 28(%esi), %edx )
19111 adcl %ebx, %eax
19112-DST( movl %ebx, 24(%edi) )
19113+DST( movl %ebx, %es:24(%edi) )
19114 adcl %edx, %eax
19115-DST( movl %edx, 28(%edi) )
19116+DST( movl %edx, %es:28(%edi) )
19117
19118 lea 32(%esi), %esi
19119 lea 32(%edi), %edi
19120@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
19121 shrl $2, %edx # This clears CF
19122 SRC(3: movl (%esi), %ebx )
19123 adcl %ebx, %eax
19124-DST( movl %ebx, (%edi) )
19125+DST( movl %ebx, %es:(%edi) )
19126 lea 4(%esi), %esi
19127 lea 4(%edi), %edi
19128 dec %edx
19129@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
19130 jb 5f
19131 SRC( movw (%esi), %cx )
19132 leal 2(%esi), %esi
19133-DST( movw %cx, (%edi) )
19134+DST( movw %cx, %es:(%edi) )
19135 leal 2(%edi), %edi
19136 je 6f
19137 shll $16,%ecx
19138 SRC(5: movb (%esi), %cl )
19139-DST( movb %cl, (%edi) )
19140+DST( movb %cl, %es:(%edi) )
19141 6: addl %ecx, %eax
19142 adcl $0, %eax
19143 7:
19144@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
19145
19146 6001:
19147 movl ARGBASE+20(%esp), %ebx # src_err_ptr
19148- movl $-EFAULT, (%ebx)
19149+ movl $-EFAULT, %ss:(%ebx)
19150
19151 # zero the complete destination - computing the rest
19152 # is too much work
19153@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
19154
19155 6002:
19156 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
19157- movl $-EFAULT,(%ebx)
19158+ movl $-EFAULT,%ss:(%ebx)
19159 jmp 5000b
19160
19161 .previous
19162
19163+ pushl_cfi %ss
19164+ popl_cfi %ds
19165+ pushl_cfi %ss
19166+ popl_cfi %es
19167 popl_cfi %ebx
19168 CFI_RESTORE ebx
19169 popl_cfi %esi
19170@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
19171 popl_cfi %ecx # equivalent to addl $4,%esp
19172 ret
19173 CFI_ENDPROC
19174-ENDPROC(csum_partial_copy_generic)
19175+ENDPROC(csum_partial_copy_generic_to_user)
19176
19177 #else
19178
19179 /* Version for PentiumII/PPro */
19180
19181 #define ROUND1(x) \
19182+ nop; nop; nop; \
19183 SRC(movl x(%esi), %ebx ) ; \
19184 addl %ebx, %eax ; \
19185- DST(movl %ebx, x(%edi) ) ;
19186+ DST(movl %ebx, %es:x(%edi)) ;
19187
19188 #define ROUND(x) \
19189+ nop; nop; nop; \
19190 SRC(movl x(%esi), %ebx ) ; \
19191 adcl %ebx, %eax ; \
19192- DST(movl %ebx, x(%edi) ) ;
19193+ DST(movl %ebx, %es:x(%edi)) ;
19194
19195 #define ARGBASE 12
19196-
19197-ENTRY(csum_partial_copy_generic)
19198+
19199+ENTRY(csum_partial_copy_generic_to_user)
19200 CFI_STARTPROC
19201+
19202+#ifdef CONFIG_PAX_MEMORY_UDEREF
19203+ pushl_cfi %gs
19204+ popl_cfi %es
19205+ jmp csum_partial_copy_generic
19206+#endif
19207+
19208+ENTRY(csum_partial_copy_generic_from_user)
19209+
19210+#ifdef CONFIG_PAX_MEMORY_UDEREF
19211+ pushl_cfi %gs
19212+ popl_cfi %ds
19213+#endif
19214+
19215+ENTRY(csum_partial_copy_generic)
19216 pushl_cfi %ebx
19217 CFI_REL_OFFSET ebx, 0
19218 pushl_cfi %edi
19219@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
19220 subl %ebx, %edi
19221 lea -1(%esi),%edx
19222 andl $-32,%edx
19223- lea 3f(%ebx,%ebx), %ebx
19224+ lea 3f(%ebx,%ebx,2), %ebx
19225 testl %esi, %esi
19226 jmp *%ebx
19227 1: addl $64,%esi
19228@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
19229 jb 5f
19230 SRC( movw (%esi), %dx )
19231 leal 2(%esi), %esi
19232-DST( movw %dx, (%edi) )
19233+DST( movw %dx, %es:(%edi) )
19234 leal 2(%edi), %edi
19235 je 6f
19236 shll $16,%edx
19237 5:
19238 SRC( movb (%esi), %dl )
19239-DST( movb %dl, (%edi) )
19240+DST( movb %dl, %es:(%edi) )
19241 6: addl %edx, %eax
19242 adcl $0, %eax
19243 7:
19244 .section .fixup, "ax"
19245 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
19246- movl $-EFAULT, (%ebx)
19247+ movl $-EFAULT, %ss:(%ebx)
19248 # zero the complete destination (computing the rest is too much work)
19249 movl ARGBASE+8(%esp),%edi # dst
19250 movl ARGBASE+12(%esp),%ecx # len
19251@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
19252 rep; stosb
19253 jmp 7b
19254 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
19255- movl $-EFAULT, (%ebx)
19256+ movl $-EFAULT, %ss:(%ebx)
19257 jmp 7b
19258 .previous
19259
19260+#ifdef CONFIG_PAX_MEMORY_UDEREF
19261+ pushl_cfi %ss
19262+ popl_cfi %ds
19263+ pushl_cfi %ss
19264+ popl_cfi %es
19265+#endif
19266+
19267 popl_cfi %esi
19268 CFI_RESTORE esi
19269 popl_cfi %edi
19270@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
19271 CFI_RESTORE ebx
19272 ret
19273 CFI_ENDPROC
19274-ENDPROC(csum_partial_copy_generic)
19275+ENDPROC(csum_partial_copy_generic_to_user)
19276
19277 #undef ROUND
19278 #undef ROUND1
19279diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
19280index f2145cf..cea889d 100644
19281--- a/arch/x86/lib/clear_page_64.S
19282+++ b/arch/x86/lib/clear_page_64.S
19283@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
19284 movl $4096/8,%ecx
19285 xorl %eax,%eax
19286 rep stosq
19287+ pax_force_retaddr
19288 ret
19289 CFI_ENDPROC
19290 ENDPROC(clear_page_c)
19291@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
19292 movl $4096,%ecx
19293 xorl %eax,%eax
19294 rep stosb
19295+ pax_force_retaddr
19296 ret
19297 CFI_ENDPROC
19298 ENDPROC(clear_page_c_e)
19299@@ -43,6 +45,7 @@ ENTRY(clear_page)
19300 leaq 64(%rdi),%rdi
19301 jnz .Lloop
19302 nop
19303+ pax_force_retaddr
19304 ret
19305 CFI_ENDPROC
19306 .Lclear_page_end:
19307@@ -58,7 +61,7 @@ ENDPROC(clear_page)
19308
19309 #include <asm/cpufeature.h>
19310
19311- .section .altinstr_replacement,"ax"
19312+ .section .altinstr_replacement,"a"
19313 1: .byte 0xeb /* jmp <disp8> */
19314 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
19315 2: .byte 0xeb /* jmp <disp8> */
19316diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
19317index 1e572c5..2a162cd 100644
19318--- a/arch/x86/lib/cmpxchg16b_emu.S
19319+++ b/arch/x86/lib/cmpxchg16b_emu.S
19320@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
19321
19322 popf
19323 mov $1, %al
19324+ pax_force_retaddr
19325 ret
19326
19327 not_same:
19328 popf
19329 xor %al,%al
19330+ pax_force_retaddr
19331 ret
19332
19333 CFI_ENDPROC
19334diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
19335index 01c805b..dccb07f 100644
19336--- a/arch/x86/lib/copy_page_64.S
19337+++ b/arch/x86/lib/copy_page_64.S
19338@@ -9,6 +9,7 @@ copy_page_c:
19339 CFI_STARTPROC
19340 movl $4096/8,%ecx
19341 rep movsq
19342+ pax_force_retaddr
19343 ret
19344 CFI_ENDPROC
19345 ENDPROC(copy_page_c)
19346@@ -39,7 +40,7 @@ ENTRY(copy_page)
19347 movq 16 (%rsi), %rdx
19348 movq 24 (%rsi), %r8
19349 movq 32 (%rsi), %r9
19350- movq 40 (%rsi), %r10
19351+ movq 40 (%rsi), %r13
19352 movq 48 (%rsi), %r11
19353 movq 56 (%rsi), %r12
19354
19355@@ -50,7 +51,7 @@ ENTRY(copy_page)
19356 movq %rdx, 16 (%rdi)
19357 movq %r8, 24 (%rdi)
19358 movq %r9, 32 (%rdi)
19359- movq %r10, 40 (%rdi)
19360+ movq %r13, 40 (%rdi)
19361 movq %r11, 48 (%rdi)
19362 movq %r12, 56 (%rdi)
19363
19364@@ -69,7 +70,7 @@ ENTRY(copy_page)
19365 movq 16 (%rsi), %rdx
19366 movq 24 (%rsi), %r8
19367 movq 32 (%rsi), %r9
19368- movq 40 (%rsi), %r10
19369+ movq 40 (%rsi), %r13
19370 movq 48 (%rsi), %r11
19371 movq 56 (%rsi), %r12
19372
19373@@ -78,7 +79,7 @@ ENTRY(copy_page)
19374 movq %rdx, 16 (%rdi)
19375 movq %r8, 24 (%rdi)
19376 movq %r9, 32 (%rdi)
19377- movq %r10, 40 (%rdi)
19378+ movq %r13, 40 (%rdi)
19379 movq %r11, 48 (%rdi)
19380 movq %r12, 56 (%rdi)
19381
19382@@ -95,6 +96,7 @@ ENTRY(copy_page)
19383 CFI_RESTORE r13
19384 addq $3*8,%rsp
19385 CFI_ADJUST_CFA_OFFSET -3*8
19386+ pax_force_retaddr
19387 ret
19388 .Lcopy_page_end:
19389 CFI_ENDPROC
19390@@ -105,7 +107,7 @@ ENDPROC(copy_page)
19391
19392 #include <asm/cpufeature.h>
19393
19394- .section .altinstr_replacement,"ax"
19395+ .section .altinstr_replacement,"a"
19396 1: .byte 0xeb /* jmp <disp8> */
19397 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
19398 2:
19399diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
19400index 0248402..821c786 100644
19401--- a/arch/x86/lib/copy_user_64.S
19402+++ b/arch/x86/lib/copy_user_64.S
19403@@ -16,6 +16,7 @@
19404 #include <asm/thread_info.h>
19405 #include <asm/cpufeature.h>
19406 #include <asm/alternative-asm.h>
19407+#include <asm/pgtable.h>
19408
19409 /*
19410 * By placing feature2 after feature1 in altinstructions section, we logically
19411@@ -29,7 +30,7 @@
19412 .byte 0xe9 /* 32bit jump */
19413 .long \orig-1f /* by default jump to orig */
19414 1:
19415- .section .altinstr_replacement,"ax"
19416+ .section .altinstr_replacement,"a"
19417 2: .byte 0xe9 /* near jump with 32bit immediate */
19418 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
19419 3: .byte 0xe9 /* near jump with 32bit immediate */
19420@@ -71,47 +72,20 @@
19421 #endif
19422 .endm
19423
19424-/* Standard copy_to_user with segment limit checking */
19425-ENTRY(_copy_to_user)
19426- CFI_STARTPROC
19427- GET_THREAD_INFO(%rax)
19428- movq %rdi,%rcx
19429- addq %rdx,%rcx
19430- jc bad_to_user
19431- cmpq TI_addr_limit(%rax),%rcx
19432- ja bad_to_user
19433- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
19434- copy_user_generic_unrolled,copy_user_generic_string, \
19435- copy_user_enhanced_fast_string
19436- CFI_ENDPROC
19437-ENDPROC(_copy_to_user)
19438-
19439-/* Standard copy_from_user with segment limit checking */
19440-ENTRY(_copy_from_user)
19441- CFI_STARTPROC
19442- GET_THREAD_INFO(%rax)
19443- movq %rsi,%rcx
19444- addq %rdx,%rcx
19445- jc bad_from_user
19446- cmpq TI_addr_limit(%rax),%rcx
19447- ja bad_from_user
19448- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
19449- copy_user_generic_unrolled,copy_user_generic_string, \
19450- copy_user_enhanced_fast_string
19451- CFI_ENDPROC
19452-ENDPROC(_copy_from_user)
19453-
19454 .section .fixup,"ax"
19455 /* must zero dest */
19456 ENTRY(bad_from_user)
19457 bad_from_user:
19458 CFI_STARTPROC
19459+ testl %edx,%edx
19460+ js bad_to_user
19461 movl %edx,%ecx
19462 xorl %eax,%eax
19463 rep
19464 stosb
19465 bad_to_user:
19466 movl %edx,%eax
19467+ pax_force_retaddr
19468 ret
19469 CFI_ENDPROC
19470 ENDPROC(bad_from_user)
19471@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
19472 jz 17f
19473 1: movq (%rsi),%r8
19474 2: movq 1*8(%rsi),%r9
19475-3: movq 2*8(%rsi),%r10
19476+3: movq 2*8(%rsi),%rax
19477 4: movq 3*8(%rsi),%r11
19478 5: movq %r8,(%rdi)
19479 6: movq %r9,1*8(%rdi)
19480-7: movq %r10,2*8(%rdi)
19481+7: movq %rax,2*8(%rdi)
19482 8: movq %r11,3*8(%rdi)
19483 9: movq 4*8(%rsi),%r8
19484 10: movq 5*8(%rsi),%r9
19485-11: movq 6*8(%rsi),%r10
19486+11: movq 6*8(%rsi),%rax
19487 12: movq 7*8(%rsi),%r11
19488 13: movq %r8,4*8(%rdi)
19489 14: movq %r9,5*8(%rdi)
19490-15: movq %r10,6*8(%rdi)
19491+15: movq %rax,6*8(%rdi)
19492 16: movq %r11,7*8(%rdi)
19493 leaq 64(%rsi),%rsi
19494 leaq 64(%rdi),%rdi
19495@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
19496 decl %ecx
19497 jnz 21b
19498 23: xor %eax,%eax
19499+ pax_force_retaddr
19500 ret
19501
19502 .section .fixup,"ax"
19503@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
19504 3: rep
19505 movsb
19506 4: xorl %eax,%eax
19507+ pax_force_retaddr
19508 ret
19509
19510 .section .fixup,"ax"
19511@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
19512 1: rep
19513 movsb
19514 2: xorl %eax,%eax
19515+ pax_force_retaddr
19516 ret
19517
19518 .section .fixup,"ax"
19519diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
19520index cb0c112..e3a6895 100644
19521--- a/arch/x86/lib/copy_user_nocache_64.S
19522+++ b/arch/x86/lib/copy_user_nocache_64.S
19523@@ -8,12 +8,14 @@
19524
19525 #include <linux/linkage.h>
19526 #include <asm/dwarf2.h>
19527+#include <asm/alternative-asm.h>
19528
19529 #define FIX_ALIGNMENT 1
19530
19531 #include <asm/current.h>
19532 #include <asm/asm-offsets.h>
19533 #include <asm/thread_info.h>
19534+#include <asm/pgtable.h>
19535
19536 .macro ALIGN_DESTINATION
19537 #ifdef FIX_ALIGNMENT
19538@@ -50,6 +52,15 @@
19539 */
19540 ENTRY(__copy_user_nocache)
19541 CFI_STARTPROC
19542+
19543+#ifdef CONFIG_PAX_MEMORY_UDEREF
19544+ mov $PAX_USER_SHADOW_BASE,%rcx
19545+ cmp %rcx,%rsi
19546+ jae 1f
19547+ add %rcx,%rsi
19548+1:
19549+#endif
19550+
19551 cmpl $8,%edx
19552 jb 20f /* less then 8 bytes, go to byte copy loop */
19553 ALIGN_DESTINATION
19554@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
19555 jz 17f
19556 1: movq (%rsi),%r8
19557 2: movq 1*8(%rsi),%r9
19558-3: movq 2*8(%rsi),%r10
19559+3: movq 2*8(%rsi),%rax
19560 4: movq 3*8(%rsi),%r11
19561 5: movnti %r8,(%rdi)
19562 6: movnti %r9,1*8(%rdi)
19563-7: movnti %r10,2*8(%rdi)
19564+7: movnti %rax,2*8(%rdi)
19565 8: movnti %r11,3*8(%rdi)
19566 9: movq 4*8(%rsi),%r8
19567 10: movq 5*8(%rsi),%r9
19568-11: movq 6*8(%rsi),%r10
19569+11: movq 6*8(%rsi),%rax
19570 12: movq 7*8(%rsi),%r11
19571 13: movnti %r8,4*8(%rdi)
19572 14: movnti %r9,5*8(%rdi)
19573-15: movnti %r10,6*8(%rdi)
19574+15: movnti %rax,6*8(%rdi)
19575 16: movnti %r11,7*8(%rdi)
19576 leaq 64(%rsi),%rsi
19577 leaq 64(%rdi),%rdi
19578@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
19579 jnz 21b
19580 23: xorl %eax,%eax
19581 sfence
19582+ pax_force_retaddr
19583 ret
19584
19585 .section .fixup,"ax"
19586diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
19587index fb903b7..c92b7f7 100644
19588--- a/arch/x86/lib/csum-copy_64.S
19589+++ b/arch/x86/lib/csum-copy_64.S
19590@@ -8,6 +8,7 @@
19591 #include <linux/linkage.h>
19592 #include <asm/dwarf2.h>
19593 #include <asm/errno.h>
19594+#include <asm/alternative-asm.h>
19595
19596 /*
19597 * Checksum copy with exception handling.
19598@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
19599 CFI_RESTORE rbp
19600 addq $7*8, %rsp
19601 CFI_ADJUST_CFA_OFFSET -7*8
19602+ pax_force_retaddr 0, 1
19603 ret
19604 CFI_RESTORE_STATE
19605
19606diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
19607index 459b58a..9570bc7 100644
19608--- a/arch/x86/lib/csum-wrappers_64.c
19609+++ b/arch/x86/lib/csum-wrappers_64.c
19610@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
19611 len -= 2;
19612 }
19613 }
19614- isum = csum_partial_copy_generic((__force const void *)src,
19615+
19616+#ifdef CONFIG_PAX_MEMORY_UDEREF
19617+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
19618+ src += PAX_USER_SHADOW_BASE;
19619+#endif
19620+
19621+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
19622 dst, len, isum, errp, NULL);
19623 if (unlikely(*errp))
19624 goto out_err;
19625@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
19626 }
19627
19628 *errp = 0;
19629- return csum_partial_copy_generic(src, (void __force *)dst,
19630+
19631+#ifdef CONFIG_PAX_MEMORY_UDEREF
19632+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
19633+ dst += PAX_USER_SHADOW_BASE;
19634+#endif
19635+
19636+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
19637 len, isum, NULL, errp);
19638 }
19639 EXPORT_SYMBOL(csum_partial_copy_to_user);
19640diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
19641index 51f1504..ddac4c1 100644
19642--- a/arch/x86/lib/getuser.S
19643+++ b/arch/x86/lib/getuser.S
19644@@ -33,15 +33,38 @@
19645 #include <asm/asm-offsets.h>
19646 #include <asm/thread_info.h>
19647 #include <asm/asm.h>
19648+#include <asm/segment.h>
19649+#include <asm/pgtable.h>
19650+#include <asm/alternative-asm.h>
19651+
19652+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19653+#define __copyuser_seg gs;
19654+#else
19655+#define __copyuser_seg
19656+#endif
19657
19658 .text
19659 ENTRY(__get_user_1)
19660 CFI_STARTPROC
19661+
19662+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
19663 GET_THREAD_INFO(%_ASM_DX)
19664 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
19665 jae bad_get_user
19666-1: movzb (%_ASM_AX),%edx
19667+
19668+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19669+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
19670+ cmp %_ASM_DX,%_ASM_AX
19671+ jae 1234f
19672+ add %_ASM_DX,%_ASM_AX
19673+1234:
19674+#endif
19675+
19676+#endif
19677+
19678+1: __copyuser_seg movzb (%_ASM_AX),%edx
19679 xor %eax,%eax
19680+ pax_force_retaddr
19681 ret
19682 CFI_ENDPROC
19683 ENDPROC(__get_user_1)
19684@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
19685 ENTRY(__get_user_2)
19686 CFI_STARTPROC
19687 add $1,%_ASM_AX
19688+
19689+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
19690 jc bad_get_user
19691 GET_THREAD_INFO(%_ASM_DX)
19692 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
19693 jae bad_get_user
19694-2: movzwl -1(%_ASM_AX),%edx
19695+
19696+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19697+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
19698+ cmp %_ASM_DX,%_ASM_AX
19699+ jae 1234f
19700+ add %_ASM_DX,%_ASM_AX
19701+1234:
19702+#endif
19703+
19704+#endif
19705+
19706+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
19707 xor %eax,%eax
19708+ pax_force_retaddr
19709 ret
19710 CFI_ENDPROC
19711 ENDPROC(__get_user_2)
19712@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
19713 ENTRY(__get_user_4)
19714 CFI_STARTPROC
19715 add $3,%_ASM_AX
19716+
19717+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
19718 jc bad_get_user
19719 GET_THREAD_INFO(%_ASM_DX)
19720 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
19721 jae bad_get_user
19722-3: mov -3(%_ASM_AX),%edx
19723+
19724+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19725+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
19726+ cmp %_ASM_DX,%_ASM_AX
19727+ jae 1234f
19728+ add %_ASM_DX,%_ASM_AX
19729+1234:
19730+#endif
19731+
19732+#endif
19733+
19734+3: __copyuser_seg mov -3(%_ASM_AX),%edx
19735 xor %eax,%eax
19736+ pax_force_retaddr
19737 ret
19738 CFI_ENDPROC
19739 ENDPROC(__get_user_4)
19740@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
19741 GET_THREAD_INFO(%_ASM_DX)
19742 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
19743 jae bad_get_user
19744+
19745+#ifdef CONFIG_PAX_MEMORY_UDEREF
19746+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
19747+ cmp %_ASM_DX,%_ASM_AX
19748+ jae 1234f
19749+ add %_ASM_DX,%_ASM_AX
19750+1234:
19751+#endif
19752+
19753 4: movq -7(%_ASM_AX),%_ASM_DX
19754 xor %eax,%eax
19755+ pax_force_retaddr
19756 ret
19757 CFI_ENDPROC
19758 ENDPROC(__get_user_8)
19759@@ -91,6 +152,7 @@ bad_get_user:
19760 CFI_STARTPROC
19761 xor %edx,%edx
19762 mov $(-EFAULT),%_ASM_AX
19763+ pax_force_retaddr
19764 ret
19765 CFI_ENDPROC
19766 END(bad_get_user)
19767diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
19768index 374562e..a75830b 100644
19769--- a/arch/x86/lib/insn.c
19770+++ b/arch/x86/lib/insn.c
19771@@ -21,6 +21,11 @@
19772 #include <linux/string.h>
19773 #include <asm/inat.h>
19774 #include <asm/insn.h>
19775+#ifdef __KERNEL__
19776+#include <asm/pgtable_types.h>
19777+#else
19778+#define ktla_ktva(addr) addr
19779+#endif
19780
19781 /* Verify next sizeof(t) bytes can be on the same instruction */
19782 #define validate_next(t, insn, n) \
19783@@ -49,8 +54,8 @@
19784 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
19785 {
19786 memset(insn, 0, sizeof(*insn));
19787- insn->kaddr = kaddr;
19788- insn->next_byte = kaddr;
19789+ insn->kaddr = ktla_ktva(kaddr);
19790+ insn->next_byte = ktla_ktva(kaddr);
19791 insn->x86_64 = x86_64 ? 1 : 0;
19792 insn->opnd_bytes = 4;
19793 if (x86_64)
19794diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
19795index 05a95e7..326f2fa 100644
19796--- a/arch/x86/lib/iomap_copy_64.S
19797+++ b/arch/x86/lib/iomap_copy_64.S
19798@@ -17,6 +17,7 @@
19799
19800 #include <linux/linkage.h>
19801 #include <asm/dwarf2.h>
19802+#include <asm/alternative-asm.h>
19803
19804 /*
19805 * override generic version in lib/iomap_copy.c
19806@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
19807 CFI_STARTPROC
19808 movl %edx,%ecx
19809 rep movsd
19810+ pax_force_retaddr
19811 ret
19812 CFI_ENDPROC
19813 ENDPROC(__iowrite32_copy)
19814diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
19815index efbf2a0..8893637 100644
19816--- a/arch/x86/lib/memcpy_64.S
19817+++ b/arch/x86/lib/memcpy_64.S
19818@@ -34,6 +34,7 @@
19819 rep movsq
19820 movl %edx, %ecx
19821 rep movsb
19822+ pax_force_retaddr
19823 ret
19824 .Lmemcpy_e:
19825 .previous
19826@@ -51,6 +52,7 @@
19827
19828 movl %edx, %ecx
19829 rep movsb
19830+ pax_force_retaddr
19831 ret
19832 .Lmemcpy_e_e:
19833 .previous
19834@@ -81,13 +83,13 @@ ENTRY(memcpy)
19835 */
19836 movq 0*8(%rsi), %r8
19837 movq 1*8(%rsi), %r9
19838- movq 2*8(%rsi), %r10
19839+ movq 2*8(%rsi), %rcx
19840 movq 3*8(%rsi), %r11
19841 leaq 4*8(%rsi), %rsi
19842
19843 movq %r8, 0*8(%rdi)
19844 movq %r9, 1*8(%rdi)
19845- movq %r10, 2*8(%rdi)
19846+ movq %rcx, 2*8(%rdi)
19847 movq %r11, 3*8(%rdi)
19848 leaq 4*8(%rdi), %rdi
19849 jae .Lcopy_forward_loop
19850@@ -110,12 +112,12 @@ ENTRY(memcpy)
19851 subq $0x20, %rdx
19852 movq -1*8(%rsi), %r8
19853 movq -2*8(%rsi), %r9
19854- movq -3*8(%rsi), %r10
19855+ movq -3*8(%rsi), %rcx
19856 movq -4*8(%rsi), %r11
19857 leaq -4*8(%rsi), %rsi
19858 movq %r8, -1*8(%rdi)
19859 movq %r9, -2*8(%rdi)
19860- movq %r10, -3*8(%rdi)
19861+ movq %rcx, -3*8(%rdi)
19862 movq %r11, -4*8(%rdi)
19863 leaq -4*8(%rdi), %rdi
19864 jae .Lcopy_backward_loop
19865@@ -135,12 +137,13 @@ ENTRY(memcpy)
19866 */
19867 movq 0*8(%rsi), %r8
19868 movq 1*8(%rsi), %r9
19869- movq -2*8(%rsi, %rdx), %r10
19870+ movq -2*8(%rsi, %rdx), %rcx
19871 movq -1*8(%rsi, %rdx), %r11
19872 movq %r8, 0*8(%rdi)
19873 movq %r9, 1*8(%rdi)
19874- movq %r10, -2*8(%rdi, %rdx)
19875+ movq %rcx, -2*8(%rdi, %rdx)
19876 movq %r11, -1*8(%rdi, %rdx)
19877+ pax_force_retaddr
19878 retq
19879 .p2align 4
19880 .Lless_16bytes:
19881@@ -153,6 +156,7 @@ ENTRY(memcpy)
19882 movq -1*8(%rsi, %rdx), %r9
19883 movq %r8, 0*8(%rdi)
19884 movq %r9, -1*8(%rdi, %rdx)
19885+ pax_force_retaddr
19886 retq
19887 .p2align 4
19888 .Lless_8bytes:
19889@@ -166,6 +170,7 @@ ENTRY(memcpy)
19890 movl -4(%rsi, %rdx), %r8d
19891 movl %ecx, (%rdi)
19892 movl %r8d, -4(%rdi, %rdx)
19893+ pax_force_retaddr
19894 retq
19895 .p2align 4
19896 .Lless_3bytes:
19897@@ -183,6 +188,7 @@ ENTRY(memcpy)
19898 jnz .Lloop_1
19899
19900 .Lend:
19901+ pax_force_retaddr
19902 retq
19903 CFI_ENDPROC
19904 ENDPROC(memcpy)
19905diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
19906index ee16461..c39c199 100644
19907--- a/arch/x86/lib/memmove_64.S
19908+++ b/arch/x86/lib/memmove_64.S
19909@@ -61,13 +61,13 @@ ENTRY(memmove)
19910 5:
19911 sub $0x20, %rdx
19912 movq 0*8(%rsi), %r11
19913- movq 1*8(%rsi), %r10
19914+ movq 1*8(%rsi), %rcx
19915 movq 2*8(%rsi), %r9
19916 movq 3*8(%rsi), %r8
19917 leaq 4*8(%rsi), %rsi
19918
19919 movq %r11, 0*8(%rdi)
19920- movq %r10, 1*8(%rdi)
19921+ movq %rcx, 1*8(%rdi)
19922 movq %r9, 2*8(%rdi)
19923 movq %r8, 3*8(%rdi)
19924 leaq 4*8(%rdi), %rdi
19925@@ -81,10 +81,10 @@ ENTRY(memmove)
19926 4:
19927 movq %rdx, %rcx
19928 movq -8(%rsi, %rdx), %r11
19929- lea -8(%rdi, %rdx), %r10
19930+ lea -8(%rdi, %rdx), %r9
19931 shrq $3, %rcx
19932 rep movsq
19933- movq %r11, (%r10)
19934+ movq %r11, (%r9)
19935 jmp 13f
19936 .Lmemmove_end_forward:
19937
19938@@ -95,14 +95,14 @@ ENTRY(memmove)
19939 7:
19940 movq %rdx, %rcx
19941 movq (%rsi), %r11
19942- movq %rdi, %r10
19943+ movq %rdi, %r9
19944 leaq -8(%rsi, %rdx), %rsi
19945 leaq -8(%rdi, %rdx), %rdi
19946 shrq $3, %rcx
19947 std
19948 rep movsq
19949 cld
19950- movq %r11, (%r10)
19951+ movq %r11, (%r9)
19952 jmp 13f
19953
19954 /*
19955@@ -127,13 +127,13 @@ ENTRY(memmove)
19956 8:
19957 subq $0x20, %rdx
19958 movq -1*8(%rsi), %r11
19959- movq -2*8(%rsi), %r10
19960+ movq -2*8(%rsi), %rcx
19961 movq -3*8(%rsi), %r9
19962 movq -4*8(%rsi), %r8
19963 leaq -4*8(%rsi), %rsi
19964
19965 movq %r11, -1*8(%rdi)
19966- movq %r10, -2*8(%rdi)
19967+ movq %rcx, -2*8(%rdi)
19968 movq %r9, -3*8(%rdi)
19969 movq %r8, -4*8(%rdi)
19970 leaq -4*8(%rdi), %rdi
19971@@ -151,11 +151,11 @@ ENTRY(memmove)
19972 * Move data from 16 bytes to 31 bytes.
19973 */
19974 movq 0*8(%rsi), %r11
19975- movq 1*8(%rsi), %r10
19976+ movq 1*8(%rsi), %rcx
19977 movq -2*8(%rsi, %rdx), %r9
19978 movq -1*8(%rsi, %rdx), %r8
19979 movq %r11, 0*8(%rdi)
19980- movq %r10, 1*8(%rdi)
19981+ movq %rcx, 1*8(%rdi)
19982 movq %r9, -2*8(%rdi, %rdx)
19983 movq %r8, -1*8(%rdi, %rdx)
19984 jmp 13f
19985@@ -167,9 +167,9 @@ ENTRY(memmove)
19986 * Move data from 8 bytes to 15 bytes.
19987 */
19988 movq 0*8(%rsi), %r11
19989- movq -1*8(%rsi, %rdx), %r10
19990+ movq -1*8(%rsi, %rdx), %r9
19991 movq %r11, 0*8(%rdi)
19992- movq %r10, -1*8(%rdi, %rdx)
19993+ movq %r9, -1*8(%rdi, %rdx)
19994 jmp 13f
19995 10:
19996 cmpq $4, %rdx
19997@@ -178,9 +178,9 @@ ENTRY(memmove)
19998 * Move data from 4 bytes to 7 bytes.
19999 */
20000 movl (%rsi), %r11d
20001- movl -4(%rsi, %rdx), %r10d
20002+ movl -4(%rsi, %rdx), %r9d
20003 movl %r11d, (%rdi)
20004- movl %r10d, -4(%rdi, %rdx)
20005+ movl %r9d, -4(%rdi, %rdx)
20006 jmp 13f
20007 11:
20008 cmp $2, %rdx
20009@@ -189,9 +189,9 @@ ENTRY(memmove)
20010 * Move data from 2 bytes to 3 bytes.
20011 */
20012 movw (%rsi), %r11w
20013- movw -2(%rsi, %rdx), %r10w
20014+ movw -2(%rsi, %rdx), %r9w
20015 movw %r11w, (%rdi)
20016- movw %r10w, -2(%rdi, %rdx)
20017+ movw %r9w, -2(%rdi, %rdx)
20018 jmp 13f
20019 12:
20020 cmp $1, %rdx
20021@@ -202,6 +202,7 @@ ENTRY(memmove)
20022 movb (%rsi), %r11b
20023 movb %r11b, (%rdi)
20024 13:
20025+ pax_force_retaddr
20026 retq
20027 CFI_ENDPROC
20028
20029@@ -210,6 +211,7 @@ ENTRY(memmove)
20030 /* Forward moving data. */
20031 movq %rdx, %rcx
20032 rep movsb
20033+ pax_force_retaddr
20034 retq
20035 .Lmemmove_end_forward_efs:
20036 .previous
20037diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
20038index 79bd454..dff325a 100644
20039--- a/arch/x86/lib/memset_64.S
20040+++ b/arch/x86/lib/memset_64.S
20041@@ -31,6 +31,7 @@
20042 movl %r8d,%ecx
20043 rep stosb
20044 movq %r9,%rax
20045+ pax_force_retaddr
20046 ret
20047 .Lmemset_e:
20048 .previous
20049@@ -53,6 +54,7 @@
20050 movl %edx,%ecx
20051 rep stosb
20052 movq %r9,%rax
20053+ pax_force_retaddr
20054 ret
20055 .Lmemset_e_e:
20056 .previous
20057@@ -60,13 +62,13 @@
20058 ENTRY(memset)
20059 ENTRY(__memset)
20060 CFI_STARTPROC
20061- movq %rdi,%r10
20062 movq %rdx,%r11
20063
20064 /* expand byte value */
20065 movzbl %sil,%ecx
20066 movabs $0x0101010101010101,%rax
20067 mul %rcx /* with rax, clobbers rdx */
20068+ movq %rdi,%rdx
20069
20070 /* align dst */
20071 movl %edi,%r9d
20072@@ -120,7 +122,8 @@ ENTRY(__memset)
20073 jnz .Lloop_1
20074
20075 .Lende:
20076- movq %r10,%rax
20077+ movq %rdx,%rax
20078+ pax_force_retaddr
20079 ret
20080
20081 CFI_RESTORE_STATE
20082diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
20083index c9f2d9b..e7fd2c0 100644
20084--- a/arch/x86/lib/mmx_32.c
20085+++ b/arch/x86/lib/mmx_32.c
20086@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
20087 {
20088 void *p;
20089 int i;
20090+ unsigned long cr0;
20091
20092 if (unlikely(in_interrupt()))
20093 return __memcpy(to, from, len);
20094@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
20095 kernel_fpu_begin();
20096
20097 __asm__ __volatile__ (
20098- "1: prefetch (%0)\n" /* This set is 28 bytes */
20099- " prefetch 64(%0)\n"
20100- " prefetch 128(%0)\n"
20101- " prefetch 192(%0)\n"
20102- " prefetch 256(%0)\n"
20103+ "1: prefetch (%1)\n" /* This set is 28 bytes */
20104+ " prefetch 64(%1)\n"
20105+ " prefetch 128(%1)\n"
20106+ " prefetch 192(%1)\n"
20107+ " prefetch 256(%1)\n"
20108 "2: \n"
20109 ".section .fixup, \"ax\"\n"
20110- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20111+ "3: \n"
20112+
20113+#ifdef CONFIG_PAX_KERNEXEC
20114+ " movl %%cr0, %0\n"
20115+ " movl %0, %%eax\n"
20116+ " andl $0xFFFEFFFF, %%eax\n"
20117+ " movl %%eax, %%cr0\n"
20118+#endif
20119+
20120+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20121+
20122+#ifdef CONFIG_PAX_KERNEXEC
20123+ " movl %0, %%cr0\n"
20124+#endif
20125+
20126 " jmp 2b\n"
20127 ".previous\n"
20128 _ASM_EXTABLE(1b, 3b)
20129- : : "r" (from));
20130+ : "=&r" (cr0) : "r" (from) : "ax");
20131
20132 for ( ; i > 5; i--) {
20133 __asm__ __volatile__ (
20134- "1: prefetch 320(%0)\n"
20135- "2: movq (%0), %%mm0\n"
20136- " movq 8(%0), %%mm1\n"
20137- " movq 16(%0), %%mm2\n"
20138- " movq 24(%0), %%mm3\n"
20139- " movq %%mm0, (%1)\n"
20140- " movq %%mm1, 8(%1)\n"
20141- " movq %%mm2, 16(%1)\n"
20142- " movq %%mm3, 24(%1)\n"
20143- " movq 32(%0), %%mm0\n"
20144- " movq 40(%0), %%mm1\n"
20145- " movq 48(%0), %%mm2\n"
20146- " movq 56(%0), %%mm3\n"
20147- " movq %%mm0, 32(%1)\n"
20148- " movq %%mm1, 40(%1)\n"
20149- " movq %%mm2, 48(%1)\n"
20150- " movq %%mm3, 56(%1)\n"
20151+ "1: prefetch 320(%1)\n"
20152+ "2: movq (%1), %%mm0\n"
20153+ " movq 8(%1), %%mm1\n"
20154+ " movq 16(%1), %%mm2\n"
20155+ " movq 24(%1), %%mm3\n"
20156+ " movq %%mm0, (%2)\n"
20157+ " movq %%mm1, 8(%2)\n"
20158+ " movq %%mm2, 16(%2)\n"
20159+ " movq %%mm3, 24(%2)\n"
20160+ " movq 32(%1), %%mm0\n"
20161+ " movq 40(%1), %%mm1\n"
20162+ " movq 48(%1), %%mm2\n"
20163+ " movq 56(%1), %%mm3\n"
20164+ " movq %%mm0, 32(%2)\n"
20165+ " movq %%mm1, 40(%2)\n"
20166+ " movq %%mm2, 48(%2)\n"
20167+ " movq %%mm3, 56(%2)\n"
20168 ".section .fixup, \"ax\"\n"
20169- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20170+ "3:\n"
20171+
20172+#ifdef CONFIG_PAX_KERNEXEC
20173+ " movl %%cr0, %0\n"
20174+ " movl %0, %%eax\n"
20175+ " andl $0xFFFEFFFF, %%eax\n"
20176+ " movl %%eax, %%cr0\n"
20177+#endif
20178+
20179+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20180+
20181+#ifdef CONFIG_PAX_KERNEXEC
20182+ " movl %0, %%cr0\n"
20183+#endif
20184+
20185 " jmp 2b\n"
20186 ".previous\n"
20187 _ASM_EXTABLE(1b, 3b)
20188- : : "r" (from), "r" (to) : "memory");
20189+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20190
20191 from += 64;
20192 to += 64;
20193@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
20194 static void fast_copy_page(void *to, void *from)
20195 {
20196 int i;
20197+ unsigned long cr0;
20198
20199 kernel_fpu_begin();
20200
20201@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
20202 * but that is for later. -AV
20203 */
20204 __asm__ __volatile__(
20205- "1: prefetch (%0)\n"
20206- " prefetch 64(%0)\n"
20207- " prefetch 128(%0)\n"
20208- " prefetch 192(%0)\n"
20209- " prefetch 256(%0)\n"
20210+ "1: prefetch (%1)\n"
20211+ " prefetch 64(%1)\n"
20212+ " prefetch 128(%1)\n"
20213+ " prefetch 192(%1)\n"
20214+ " prefetch 256(%1)\n"
20215 "2: \n"
20216 ".section .fixup, \"ax\"\n"
20217- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20218+ "3: \n"
20219+
20220+#ifdef CONFIG_PAX_KERNEXEC
20221+ " movl %%cr0, %0\n"
20222+ " movl %0, %%eax\n"
20223+ " andl $0xFFFEFFFF, %%eax\n"
20224+ " movl %%eax, %%cr0\n"
20225+#endif
20226+
20227+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20228+
20229+#ifdef CONFIG_PAX_KERNEXEC
20230+ " movl %0, %%cr0\n"
20231+#endif
20232+
20233 " jmp 2b\n"
20234 ".previous\n"
20235- _ASM_EXTABLE(1b, 3b) : : "r" (from));
20236+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
20237
20238 for (i = 0; i < (4096-320)/64; i++) {
20239 __asm__ __volatile__ (
20240- "1: prefetch 320(%0)\n"
20241- "2: movq (%0), %%mm0\n"
20242- " movntq %%mm0, (%1)\n"
20243- " movq 8(%0), %%mm1\n"
20244- " movntq %%mm1, 8(%1)\n"
20245- " movq 16(%0), %%mm2\n"
20246- " movntq %%mm2, 16(%1)\n"
20247- " movq 24(%0), %%mm3\n"
20248- " movntq %%mm3, 24(%1)\n"
20249- " movq 32(%0), %%mm4\n"
20250- " movntq %%mm4, 32(%1)\n"
20251- " movq 40(%0), %%mm5\n"
20252- " movntq %%mm5, 40(%1)\n"
20253- " movq 48(%0), %%mm6\n"
20254- " movntq %%mm6, 48(%1)\n"
20255- " movq 56(%0), %%mm7\n"
20256- " movntq %%mm7, 56(%1)\n"
20257+ "1: prefetch 320(%1)\n"
20258+ "2: movq (%1), %%mm0\n"
20259+ " movntq %%mm0, (%2)\n"
20260+ " movq 8(%1), %%mm1\n"
20261+ " movntq %%mm1, 8(%2)\n"
20262+ " movq 16(%1), %%mm2\n"
20263+ " movntq %%mm2, 16(%2)\n"
20264+ " movq 24(%1), %%mm3\n"
20265+ " movntq %%mm3, 24(%2)\n"
20266+ " movq 32(%1), %%mm4\n"
20267+ " movntq %%mm4, 32(%2)\n"
20268+ " movq 40(%1), %%mm5\n"
20269+ " movntq %%mm5, 40(%2)\n"
20270+ " movq 48(%1), %%mm6\n"
20271+ " movntq %%mm6, 48(%2)\n"
20272+ " movq 56(%1), %%mm7\n"
20273+ " movntq %%mm7, 56(%2)\n"
20274 ".section .fixup, \"ax\"\n"
20275- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20276+ "3:\n"
20277+
20278+#ifdef CONFIG_PAX_KERNEXEC
20279+ " movl %%cr0, %0\n"
20280+ " movl %0, %%eax\n"
20281+ " andl $0xFFFEFFFF, %%eax\n"
20282+ " movl %%eax, %%cr0\n"
20283+#endif
20284+
20285+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20286+
20287+#ifdef CONFIG_PAX_KERNEXEC
20288+ " movl %0, %%cr0\n"
20289+#endif
20290+
20291 " jmp 2b\n"
20292 ".previous\n"
20293- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
20294+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20295
20296 from += 64;
20297 to += 64;
20298@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
20299 static void fast_copy_page(void *to, void *from)
20300 {
20301 int i;
20302+ unsigned long cr0;
20303
20304 kernel_fpu_begin();
20305
20306 __asm__ __volatile__ (
20307- "1: prefetch (%0)\n"
20308- " prefetch 64(%0)\n"
20309- " prefetch 128(%0)\n"
20310- " prefetch 192(%0)\n"
20311- " prefetch 256(%0)\n"
20312+ "1: prefetch (%1)\n"
20313+ " prefetch 64(%1)\n"
20314+ " prefetch 128(%1)\n"
20315+ " prefetch 192(%1)\n"
20316+ " prefetch 256(%1)\n"
20317 "2: \n"
20318 ".section .fixup, \"ax\"\n"
20319- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20320+ "3: \n"
20321+
20322+#ifdef CONFIG_PAX_KERNEXEC
20323+ " movl %%cr0, %0\n"
20324+ " movl %0, %%eax\n"
20325+ " andl $0xFFFEFFFF, %%eax\n"
20326+ " movl %%eax, %%cr0\n"
20327+#endif
20328+
20329+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20330+
20331+#ifdef CONFIG_PAX_KERNEXEC
20332+ " movl %0, %%cr0\n"
20333+#endif
20334+
20335 " jmp 2b\n"
20336 ".previous\n"
20337- _ASM_EXTABLE(1b, 3b) : : "r" (from));
20338+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
20339
20340 for (i = 0; i < 4096/64; i++) {
20341 __asm__ __volatile__ (
20342- "1: prefetch 320(%0)\n"
20343- "2: movq (%0), %%mm0\n"
20344- " movq 8(%0), %%mm1\n"
20345- " movq 16(%0), %%mm2\n"
20346- " movq 24(%0), %%mm3\n"
20347- " movq %%mm0, (%1)\n"
20348- " movq %%mm1, 8(%1)\n"
20349- " movq %%mm2, 16(%1)\n"
20350- " movq %%mm3, 24(%1)\n"
20351- " movq 32(%0), %%mm0\n"
20352- " movq 40(%0), %%mm1\n"
20353- " movq 48(%0), %%mm2\n"
20354- " movq 56(%0), %%mm3\n"
20355- " movq %%mm0, 32(%1)\n"
20356- " movq %%mm1, 40(%1)\n"
20357- " movq %%mm2, 48(%1)\n"
20358- " movq %%mm3, 56(%1)\n"
20359+ "1: prefetch 320(%1)\n"
20360+ "2: movq (%1), %%mm0\n"
20361+ " movq 8(%1), %%mm1\n"
20362+ " movq 16(%1), %%mm2\n"
20363+ " movq 24(%1), %%mm3\n"
20364+ " movq %%mm0, (%2)\n"
20365+ " movq %%mm1, 8(%2)\n"
20366+ " movq %%mm2, 16(%2)\n"
20367+ " movq %%mm3, 24(%2)\n"
20368+ " movq 32(%1), %%mm0\n"
20369+ " movq 40(%1), %%mm1\n"
20370+ " movq 48(%1), %%mm2\n"
20371+ " movq 56(%1), %%mm3\n"
20372+ " movq %%mm0, 32(%2)\n"
20373+ " movq %%mm1, 40(%2)\n"
20374+ " movq %%mm2, 48(%2)\n"
20375+ " movq %%mm3, 56(%2)\n"
20376 ".section .fixup, \"ax\"\n"
20377- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20378+ "3:\n"
20379+
20380+#ifdef CONFIG_PAX_KERNEXEC
20381+ " movl %%cr0, %0\n"
20382+ " movl %0, %%eax\n"
20383+ " andl $0xFFFEFFFF, %%eax\n"
20384+ " movl %%eax, %%cr0\n"
20385+#endif
20386+
20387+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20388+
20389+#ifdef CONFIG_PAX_KERNEXEC
20390+ " movl %0, %%cr0\n"
20391+#endif
20392+
20393 " jmp 2b\n"
20394 ".previous\n"
20395 _ASM_EXTABLE(1b, 3b)
20396- : : "r" (from), "r" (to) : "memory");
20397+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20398
20399 from += 64;
20400 to += 64;
20401diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
20402index 69fa106..adda88b 100644
20403--- a/arch/x86/lib/msr-reg.S
20404+++ b/arch/x86/lib/msr-reg.S
20405@@ -3,6 +3,7 @@
20406 #include <asm/dwarf2.h>
20407 #include <asm/asm.h>
20408 #include <asm/msr.h>
20409+#include <asm/alternative-asm.h>
20410
20411 #ifdef CONFIG_X86_64
20412 /*
20413@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
20414 CFI_STARTPROC
20415 pushq_cfi %rbx
20416 pushq_cfi %rbp
20417- movq %rdi, %r10 /* Save pointer */
20418+ movq %rdi, %r9 /* Save pointer */
20419 xorl %r11d, %r11d /* Return value */
20420 movl (%rdi), %eax
20421 movl 4(%rdi), %ecx
20422@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
20423 movl 28(%rdi), %edi
20424 CFI_REMEMBER_STATE
20425 1: \op
20426-2: movl %eax, (%r10)
20427+2: movl %eax, (%r9)
20428 movl %r11d, %eax /* Return value */
20429- movl %ecx, 4(%r10)
20430- movl %edx, 8(%r10)
20431- movl %ebx, 12(%r10)
20432- movl %ebp, 20(%r10)
20433- movl %esi, 24(%r10)
20434- movl %edi, 28(%r10)
20435+ movl %ecx, 4(%r9)
20436+ movl %edx, 8(%r9)
20437+ movl %ebx, 12(%r9)
20438+ movl %ebp, 20(%r9)
20439+ movl %esi, 24(%r9)
20440+ movl %edi, 28(%r9)
20441 popq_cfi %rbp
20442 popq_cfi %rbx
20443+ pax_force_retaddr
20444 ret
20445 3:
20446 CFI_RESTORE_STATE
20447diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
20448index 36b0d15..d381858 100644
20449--- a/arch/x86/lib/putuser.S
20450+++ b/arch/x86/lib/putuser.S
20451@@ -15,7 +15,9 @@
20452 #include <asm/thread_info.h>
20453 #include <asm/errno.h>
20454 #include <asm/asm.h>
20455-
20456+#include <asm/segment.h>
20457+#include <asm/pgtable.h>
20458+#include <asm/alternative-asm.h>
20459
20460 /*
20461 * __put_user_X
20462@@ -29,52 +31,119 @@
20463 * as they get called from within inline assembly.
20464 */
20465
20466-#define ENTER CFI_STARTPROC ; \
20467- GET_THREAD_INFO(%_ASM_BX)
20468-#define EXIT ret ; \
20469+#define ENTER CFI_STARTPROC
20470+#define EXIT pax_force_retaddr; ret ; \
20471 CFI_ENDPROC
20472
20473+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20474+#define _DEST %_ASM_CX,%_ASM_BX
20475+#else
20476+#define _DEST %_ASM_CX
20477+#endif
20478+
20479+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20480+#define __copyuser_seg gs;
20481+#else
20482+#define __copyuser_seg
20483+#endif
20484+
20485 .text
20486 ENTRY(__put_user_1)
20487 ENTER
20488+
20489+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20490+ GET_THREAD_INFO(%_ASM_BX)
20491 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
20492 jae bad_put_user
20493-1: movb %al,(%_ASM_CX)
20494+
20495+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20496+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20497+ cmp %_ASM_BX,%_ASM_CX
20498+ jb 1234f
20499+ xor %ebx,%ebx
20500+1234:
20501+#endif
20502+
20503+#endif
20504+
20505+1: __copyuser_seg movb %al,(_DEST)
20506 xor %eax,%eax
20507 EXIT
20508 ENDPROC(__put_user_1)
20509
20510 ENTRY(__put_user_2)
20511 ENTER
20512+
20513+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20514+ GET_THREAD_INFO(%_ASM_BX)
20515 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20516 sub $1,%_ASM_BX
20517 cmp %_ASM_BX,%_ASM_CX
20518 jae bad_put_user
20519-2: movw %ax,(%_ASM_CX)
20520+
20521+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20522+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20523+ cmp %_ASM_BX,%_ASM_CX
20524+ jb 1234f
20525+ xor %ebx,%ebx
20526+1234:
20527+#endif
20528+
20529+#endif
20530+
20531+2: __copyuser_seg movw %ax,(_DEST)
20532 xor %eax,%eax
20533 EXIT
20534 ENDPROC(__put_user_2)
20535
20536 ENTRY(__put_user_4)
20537 ENTER
20538+
20539+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20540+ GET_THREAD_INFO(%_ASM_BX)
20541 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20542 sub $3,%_ASM_BX
20543 cmp %_ASM_BX,%_ASM_CX
20544 jae bad_put_user
20545-3: movl %eax,(%_ASM_CX)
20546+
20547+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20548+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20549+ cmp %_ASM_BX,%_ASM_CX
20550+ jb 1234f
20551+ xor %ebx,%ebx
20552+1234:
20553+#endif
20554+
20555+#endif
20556+
20557+3: __copyuser_seg movl %eax,(_DEST)
20558 xor %eax,%eax
20559 EXIT
20560 ENDPROC(__put_user_4)
20561
20562 ENTRY(__put_user_8)
20563 ENTER
20564+
20565+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20566+ GET_THREAD_INFO(%_ASM_BX)
20567 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20568 sub $7,%_ASM_BX
20569 cmp %_ASM_BX,%_ASM_CX
20570 jae bad_put_user
20571-4: mov %_ASM_AX,(%_ASM_CX)
20572+
20573+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20574+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20575+ cmp %_ASM_BX,%_ASM_CX
20576+ jb 1234f
20577+ xor %ebx,%ebx
20578+1234:
20579+#endif
20580+
20581+#endif
20582+
20583+4: __copyuser_seg mov %_ASM_AX,(_DEST)
20584 #ifdef CONFIG_X86_32
20585-5: movl %edx,4(%_ASM_CX)
20586+5: __copyuser_seg movl %edx,4(_DEST)
20587 #endif
20588 xor %eax,%eax
20589 EXIT
20590diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
20591index 1cad221..de671ee 100644
20592--- a/arch/x86/lib/rwlock.S
20593+++ b/arch/x86/lib/rwlock.S
20594@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
20595 FRAME
20596 0: LOCK_PREFIX
20597 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
20598+
20599+#ifdef CONFIG_PAX_REFCOUNT
20600+ jno 1234f
20601+ LOCK_PREFIX
20602+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
20603+ int $4
20604+1234:
20605+ _ASM_EXTABLE(1234b, 1234b)
20606+#endif
20607+
20608 1: rep; nop
20609 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
20610 jne 1b
20611 LOCK_PREFIX
20612 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
20613+
20614+#ifdef CONFIG_PAX_REFCOUNT
20615+ jno 1234f
20616+ LOCK_PREFIX
20617+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
20618+ int $4
20619+1234:
20620+ _ASM_EXTABLE(1234b, 1234b)
20621+#endif
20622+
20623 jnz 0b
20624 ENDFRAME
20625+ pax_force_retaddr
20626 ret
20627 CFI_ENDPROC
20628 END(__write_lock_failed)
20629@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
20630 FRAME
20631 0: LOCK_PREFIX
20632 READ_LOCK_SIZE(inc) (%__lock_ptr)
20633+
20634+#ifdef CONFIG_PAX_REFCOUNT
20635+ jno 1234f
20636+ LOCK_PREFIX
20637+ READ_LOCK_SIZE(dec) (%__lock_ptr)
20638+ int $4
20639+1234:
20640+ _ASM_EXTABLE(1234b, 1234b)
20641+#endif
20642+
20643 1: rep; nop
20644 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
20645 js 1b
20646 LOCK_PREFIX
20647 READ_LOCK_SIZE(dec) (%__lock_ptr)
20648+
20649+#ifdef CONFIG_PAX_REFCOUNT
20650+ jno 1234f
20651+ LOCK_PREFIX
20652+ READ_LOCK_SIZE(inc) (%__lock_ptr)
20653+ int $4
20654+1234:
20655+ _ASM_EXTABLE(1234b, 1234b)
20656+#endif
20657+
20658 js 0b
20659 ENDFRAME
20660+ pax_force_retaddr
20661 ret
20662 CFI_ENDPROC
20663 END(__read_lock_failed)
20664diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
20665index 5dff5f0..cadebf4 100644
20666--- a/arch/x86/lib/rwsem.S
20667+++ b/arch/x86/lib/rwsem.S
20668@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
20669 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
20670 CFI_RESTORE __ASM_REG(dx)
20671 restore_common_regs
20672+ pax_force_retaddr
20673 ret
20674 CFI_ENDPROC
20675 ENDPROC(call_rwsem_down_read_failed)
20676@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
20677 movq %rax,%rdi
20678 call rwsem_down_write_failed
20679 restore_common_regs
20680+ pax_force_retaddr
20681 ret
20682 CFI_ENDPROC
20683 ENDPROC(call_rwsem_down_write_failed)
20684@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
20685 movq %rax,%rdi
20686 call rwsem_wake
20687 restore_common_regs
20688-1: ret
20689+1: pax_force_retaddr
20690+ ret
20691 CFI_ENDPROC
20692 ENDPROC(call_rwsem_wake)
20693
20694@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
20695 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
20696 CFI_RESTORE __ASM_REG(dx)
20697 restore_common_regs
20698+ pax_force_retaddr
20699 ret
20700 CFI_ENDPROC
20701 ENDPROC(call_rwsem_downgrade_wake)
20702diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
20703index a63efd6..ccecad8 100644
20704--- a/arch/x86/lib/thunk_64.S
20705+++ b/arch/x86/lib/thunk_64.S
20706@@ -8,6 +8,7 @@
20707 #include <linux/linkage.h>
20708 #include <asm/dwarf2.h>
20709 #include <asm/calling.h>
20710+#include <asm/alternative-asm.h>
20711
20712 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
20713 .macro THUNK name, func, put_ret_addr_in_rdi=0
20714@@ -41,5 +42,6 @@
20715 SAVE_ARGS
20716 restore:
20717 RESTORE_ARGS
20718+ pax_force_retaddr
20719 ret
20720 CFI_ENDPROC
20721diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
20722index e218d5d..35679b4 100644
20723--- a/arch/x86/lib/usercopy_32.c
20724+++ b/arch/x86/lib/usercopy_32.c
20725@@ -43,7 +43,7 @@ do { \
20726 __asm__ __volatile__( \
20727 " testl %1,%1\n" \
20728 " jz 2f\n" \
20729- "0: lodsb\n" \
20730+ "0: "__copyuser_seg"lodsb\n" \
20731 " stosb\n" \
20732 " testb %%al,%%al\n" \
20733 " jz 1f\n" \
20734@@ -128,10 +128,12 @@ do { \
20735 int __d0; \
20736 might_fault(); \
20737 __asm__ __volatile__( \
20738+ __COPYUSER_SET_ES \
20739 "0: rep; stosl\n" \
20740 " movl %2,%0\n" \
20741 "1: rep; stosb\n" \
20742 "2:\n" \
20743+ __COPYUSER_RESTORE_ES \
20744 ".section .fixup,\"ax\"\n" \
20745 "3: lea 0(%2,%0,4),%0\n" \
20746 " jmp 2b\n" \
20747@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
20748 might_fault();
20749
20750 __asm__ __volatile__(
20751+ __COPYUSER_SET_ES
20752 " testl %0, %0\n"
20753 " jz 3f\n"
20754 " andl %0,%%ecx\n"
20755@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
20756 " subl %%ecx,%0\n"
20757 " addl %0,%%eax\n"
20758 "1:\n"
20759+ __COPYUSER_RESTORE_ES
20760 ".section .fixup,\"ax\"\n"
20761 "2: xorl %%eax,%%eax\n"
20762 " jmp 1b\n"
20763@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
20764
20765 #ifdef CONFIG_X86_INTEL_USERCOPY
20766 static unsigned long
20767-__copy_user_intel(void __user *to, const void *from, unsigned long size)
20768+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
20769 {
20770 int d0, d1;
20771 __asm__ __volatile__(
20772@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
20773 " .align 2,0x90\n"
20774 "3: movl 0(%4), %%eax\n"
20775 "4: movl 4(%4), %%edx\n"
20776- "5: movl %%eax, 0(%3)\n"
20777- "6: movl %%edx, 4(%3)\n"
20778+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
20779+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
20780 "7: movl 8(%4), %%eax\n"
20781 "8: movl 12(%4),%%edx\n"
20782- "9: movl %%eax, 8(%3)\n"
20783- "10: movl %%edx, 12(%3)\n"
20784+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
20785+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
20786 "11: movl 16(%4), %%eax\n"
20787 "12: movl 20(%4), %%edx\n"
20788- "13: movl %%eax, 16(%3)\n"
20789- "14: movl %%edx, 20(%3)\n"
20790+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
20791+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
20792 "15: movl 24(%4), %%eax\n"
20793 "16: movl 28(%4), %%edx\n"
20794- "17: movl %%eax, 24(%3)\n"
20795- "18: movl %%edx, 28(%3)\n"
20796+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
20797+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
20798 "19: movl 32(%4), %%eax\n"
20799 "20: movl 36(%4), %%edx\n"
20800- "21: movl %%eax, 32(%3)\n"
20801- "22: movl %%edx, 36(%3)\n"
20802+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
20803+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
20804 "23: movl 40(%4), %%eax\n"
20805 "24: movl 44(%4), %%edx\n"
20806- "25: movl %%eax, 40(%3)\n"
20807- "26: movl %%edx, 44(%3)\n"
20808+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
20809+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
20810 "27: movl 48(%4), %%eax\n"
20811 "28: movl 52(%4), %%edx\n"
20812- "29: movl %%eax, 48(%3)\n"
20813- "30: movl %%edx, 52(%3)\n"
20814+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
20815+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
20816 "31: movl 56(%4), %%eax\n"
20817 "32: movl 60(%4), %%edx\n"
20818- "33: movl %%eax, 56(%3)\n"
20819- "34: movl %%edx, 60(%3)\n"
20820+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
20821+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
20822 " addl $-64, %0\n"
20823 " addl $64, %4\n"
20824 " addl $64, %3\n"
20825@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
20826 " shrl $2, %0\n"
20827 " andl $3, %%eax\n"
20828 " cld\n"
20829+ __COPYUSER_SET_ES
20830 "99: rep; movsl\n"
20831 "36: movl %%eax, %0\n"
20832 "37: rep; movsb\n"
20833 "100:\n"
20834+ __COPYUSER_RESTORE_ES
20835+ ".section .fixup,\"ax\"\n"
20836+ "101: lea 0(%%eax,%0,4),%0\n"
20837+ " jmp 100b\n"
20838+ ".previous\n"
20839+ ".section __ex_table,\"a\"\n"
20840+ " .align 4\n"
20841+ " .long 1b,100b\n"
20842+ " .long 2b,100b\n"
20843+ " .long 3b,100b\n"
20844+ " .long 4b,100b\n"
20845+ " .long 5b,100b\n"
20846+ " .long 6b,100b\n"
20847+ " .long 7b,100b\n"
20848+ " .long 8b,100b\n"
20849+ " .long 9b,100b\n"
20850+ " .long 10b,100b\n"
20851+ " .long 11b,100b\n"
20852+ " .long 12b,100b\n"
20853+ " .long 13b,100b\n"
20854+ " .long 14b,100b\n"
20855+ " .long 15b,100b\n"
20856+ " .long 16b,100b\n"
20857+ " .long 17b,100b\n"
20858+ " .long 18b,100b\n"
20859+ " .long 19b,100b\n"
20860+ " .long 20b,100b\n"
20861+ " .long 21b,100b\n"
20862+ " .long 22b,100b\n"
20863+ " .long 23b,100b\n"
20864+ " .long 24b,100b\n"
20865+ " .long 25b,100b\n"
20866+ " .long 26b,100b\n"
20867+ " .long 27b,100b\n"
20868+ " .long 28b,100b\n"
20869+ " .long 29b,100b\n"
20870+ " .long 30b,100b\n"
20871+ " .long 31b,100b\n"
20872+ " .long 32b,100b\n"
20873+ " .long 33b,100b\n"
20874+ " .long 34b,100b\n"
20875+ " .long 35b,100b\n"
20876+ " .long 36b,100b\n"
20877+ " .long 37b,100b\n"
20878+ " .long 99b,101b\n"
20879+ ".previous"
20880+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
20881+ : "1"(to), "2"(from), "0"(size)
20882+ : "eax", "edx", "memory");
20883+ return size;
20884+}
20885+
20886+static unsigned long
20887+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
20888+{
20889+ int d0, d1;
20890+ __asm__ __volatile__(
20891+ " .align 2,0x90\n"
20892+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
20893+ " cmpl $67, %0\n"
20894+ " jbe 3f\n"
20895+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
20896+ " .align 2,0x90\n"
20897+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
20898+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
20899+ "5: movl %%eax, 0(%3)\n"
20900+ "6: movl %%edx, 4(%3)\n"
20901+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
20902+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
20903+ "9: movl %%eax, 8(%3)\n"
20904+ "10: movl %%edx, 12(%3)\n"
20905+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
20906+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
20907+ "13: movl %%eax, 16(%3)\n"
20908+ "14: movl %%edx, 20(%3)\n"
20909+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
20910+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
20911+ "17: movl %%eax, 24(%3)\n"
20912+ "18: movl %%edx, 28(%3)\n"
20913+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
20914+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
20915+ "21: movl %%eax, 32(%3)\n"
20916+ "22: movl %%edx, 36(%3)\n"
20917+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
20918+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
20919+ "25: movl %%eax, 40(%3)\n"
20920+ "26: movl %%edx, 44(%3)\n"
20921+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
20922+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
20923+ "29: movl %%eax, 48(%3)\n"
20924+ "30: movl %%edx, 52(%3)\n"
20925+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
20926+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
20927+ "33: movl %%eax, 56(%3)\n"
20928+ "34: movl %%edx, 60(%3)\n"
20929+ " addl $-64, %0\n"
20930+ " addl $64, %4\n"
20931+ " addl $64, %3\n"
20932+ " cmpl $63, %0\n"
20933+ " ja 1b\n"
20934+ "35: movl %0, %%eax\n"
20935+ " shrl $2, %0\n"
20936+ " andl $3, %%eax\n"
20937+ " cld\n"
20938+ "99: rep; "__copyuser_seg" movsl\n"
20939+ "36: movl %%eax, %0\n"
20940+ "37: rep; "__copyuser_seg" movsb\n"
20941+ "100:\n"
20942 ".section .fixup,\"ax\"\n"
20943 "101: lea 0(%%eax,%0,4),%0\n"
20944 " jmp 100b\n"
20945@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
20946 int d0, d1;
20947 __asm__ __volatile__(
20948 " .align 2,0x90\n"
20949- "0: movl 32(%4), %%eax\n"
20950+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
20951 " cmpl $67, %0\n"
20952 " jbe 2f\n"
20953- "1: movl 64(%4), %%eax\n"
20954+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
20955 " .align 2,0x90\n"
20956- "2: movl 0(%4), %%eax\n"
20957- "21: movl 4(%4), %%edx\n"
20958+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
20959+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
20960 " movl %%eax, 0(%3)\n"
20961 " movl %%edx, 4(%3)\n"
20962- "3: movl 8(%4), %%eax\n"
20963- "31: movl 12(%4),%%edx\n"
20964+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
20965+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
20966 " movl %%eax, 8(%3)\n"
20967 " movl %%edx, 12(%3)\n"
20968- "4: movl 16(%4), %%eax\n"
20969- "41: movl 20(%4), %%edx\n"
20970+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
20971+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
20972 " movl %%eax, 16(%3)\n"
20973 " movl %%edx, 20(%3)\n"
20974- "10: movl 24(%4), %%eax\n"
20975- "51: movl 28(%4), %%edx\n"
20976+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
20977+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
20978 " movl %%eax, 24(%3)\n"
20979 " movl %%edx, 28(%3)\n"
20980- "11: movl 32(%4), %%eax\n"
20981- "61: movl 36(%4), %%edx\n"
20982+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
20983+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
20984 " movl %%eax, 32(%3)\n"
20985 " movl %%edx, 36(%3)\n"
20986- "12: movl 40(%4), %%eax\n"
20987- "71: movl 44(%4), %%edx\n"
20988+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
20989+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
20990 " movl %%eax, 40(%3)\n"
20991 " movl %%edx, 44(%3)\n"
20992- "13: movl 48(%4), %%eax\n"
20993- "81: movl 52(%4), %%edx\n"
20994+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
20995+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
20996 " movl %%eax, 48(%3)\n"
20997 " movl %%edx, 52(%3)\n"
20998- "14: movl 56(%4), %%eax\n"
20999- "91: movl 60(%4), %%edx\n"
21000+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21001+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21002 " movl %%eax, 56(%3)\n"
21003 " movl %%edx, 60(%3)\n"
21004 " addl $-64, %0\n"
21005@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
21006 " shrl $2, %0\n"
21007 " andl $3, %%eax\n"
21008 " cld\n"
21009- "6: rep; movsl\n"
21010+ "6: rep; "__copyuser_seg" movsl\n"
21011 " movl %%eax,%0\n"
21012- "7: rep; movsb\n"
21013+ "7: rep; "__copyuser_seg" movsb\n"
21014 "8:\n"
21015 ".section .fixup,\"ax\"\n"
21016 "9: lea 0(%%eax,%0,4),%0\n"
21017@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
21018
21019 __asm__ __volatile__(
21020 " .align 2,0x90\n"
21021- "0: movl 32(%4), %%eax\n"
21022+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
21023 " cmpl $67, %0\n"
21024 " jbe 2f\n"
21025- "1: movl 64(%4), %%eax\n"
21026+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
21027 " .align 2,0x90\n"
21028- "2: movl 0(%4), %%eax\n"
21029- "21: movl 4(%4), %%edx\n"
21030+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
21031+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
21032 " movnti %%eax, 0(%3)\n"
21033 " movnti %%edx, 4(%3)\n"
21034- "3: movl 8(%4), %%eax\n"
21035- "31: movl 12(%4),%%edx\n"
21036+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
21037+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
21038 " movnti %%eax, 8(%3)\n"
21039 " movnti %%edx, 12(%3)\n"
21040- "4: movl 16(%4), %%eax\n"
21041- "41: movl 20(%4), %%edx\n"
21042+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
21043+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
21044 " movnti %%eax, 16(%3)\n"
21045 " movnti %%edx, 20(%3)\n"
21046- "10: movl 24(%4), %%eax\n"
21047- "51: movl 28(%4), %%edx\n"
21048+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
21049+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
21050 " movnti %%eax, 24(%3)\n"
21051 " movnti %%edx, 28(%3)\n"
21052- "11: movl 32(%4), %%eax\n"
21053- "61: movl 36(%4), %%edx\n"
21054+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
21055+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
21056 " movnti %%eax, 32(%3)\n"
21057 " movnti %%edx, 36(%3)\n"
21058- "12: movl 40(%4), %%eax\n"
21059- "71: movl 44(%4), %%edx\n"
21060+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
21061+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
21062 " movnti %%eax, 40(%3)\n"
21063 " movnti %%edx, 44(%3)\n"
21064- "13: movl 48(%4), %%eax\n"
21065- "81: movl 52(%4), %%edx\n"
21066+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
21067+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
21068 " movnti %%eax, 48(%3)\n"
21069 " movnti %%edx, 52(%3)\n"
21070- "14: movl 56(%4), %%eax\n"
21071- "91: movl 60(%4), %%edx\n"
21072+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21073+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21074 " movnti %%eax, 56(%3)\n"
21075 " movnti %%edx, 60(%3)\n"
21076 " addl $-64, %0\n"
21077@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
21078 " shrl $2, %0\n"
21079 " andl $3, %%eax\n"
21080 " cld\n"
21081- "6: rep; movsl\n"
21082+ "6: rep; "__copyuser_seg" movsl\n"
21083 " movl %%eax,%0\n"
21084- "7: rep; movsb\n"
21085+ "7: rep; "__copyuser_seg" movsb\n"
21086 "8:\n"
21087 ".section .fixup,\"ax\"\n"
21088 "9: lea 0(%%eax,%0,4),%0\n"
21089@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
21090
21091 __asm__ __volatile__(
21092 " .align 2,0x90\n"
21093- "0: movl 32(%4), %%eax\n"
21094+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
21095 " cmpl $67, %0\n"
21096 " jbe 2f\n"
21097- "1: movl 64(%4), %%eax\n"
21098+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
21099 " .align 2,0x90\n"
21100- "2: movl 0(%4), %%eax\n"
21101- "21: movl 4(%4), %%edx\n"
21102+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
21103+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
21104 " movnti %%eax, 0(%3)\n"
21105 " movnti %%edx, 4(%3)\n"
21106- "3: movl 8(%4), %%eax\n"
21107- "31: movl 12(%4),%%edx\n"
21108+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
21109+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
21110 " movnti %%eax, 8(%3)\n"
21111 " movnti %%edx, 12(%3)\n"
21112- "4: movl 16(%4), %%eax\n"
21113- "41: movl 20(%4), %%edx\n"
21114+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
21115+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
21116 " movnti %%eax, 16(%3)\n"
21117 " movnti %%edx, 20(%3)\n"
21118- "10: movl 24(%4), %%eax\n"
21119- "51: movl 28(%4), %%edx\n"
21120+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
21121+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
21122 " movnti %%eax, 24(%3)\n"
21123 " movnti %%edx, 28(%3)\n"
21124- "11: movl 32(%4), %%eax\n"
21125- "61: movl 36(%4), %%edx\n"
21126+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
21127+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
21128 " movnti %%eax, 32(%3)\n"
21129 " movnti %%edx, 36(%3)\n"
21130- "12: movl 40(%4), %%eax\n"
21131- "71: movl 44(%4), %%edx\n"
21132+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
21133+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
21134 " movnti %%eax, 40(%3)\n"
21135 " movnti %%edx, 44(%3)\n"
21136- "13: movl 48(%4), %%eax\n"
21137- "81: movl 52(%4), %%edx\n"
21138+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
21139+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
21140 " movnti %%eax, 48(%3)\n"
21141 " movnti %%edx, 52(%3)\n"
21142- "14: movl 56(%4), %%eax\n"
21143- "91: movl 60(%4), %%edx\n"
21144+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21145+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21146 " movnti %%eax, 56(%3)\n"
21147 " movnti %%edx, 60(%3)\n"
21148 " addl $-64, %0\n"
21149@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
21150 " shrl $2, %0\n"
21151 " andl $3, %%eax\n"
21152 " cld\n"
21153- "6: rep; movsl\n"
21154+ "6: rep; "__copyuser_seg" movsl\n"
21155 " movl %%eax,%0\n"
21156- "7: rep; movsb\n"
21157+ "7: rep; "__copyuser_seg" movsb\n"
21158 "8:\n"
21159 ".section .fixup,\"ax\"\n"
21160 "9: lea 0(%%eax,%0,4),%0\n"
21161@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
21162 */
21163 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
21164 unsigned long size);
21165-unsigned long __copy_user_intel(void __user *to, const void *from,
21166+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
21167+ unsigned long size);
21168+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
21169 unsigned long size);
21170 unsigned long __copy_user_zeroing_intel_nocache(void *to,
21171 const void __user *from, unsigned long size);
21172 #endif /* CONFIG_X86_INTEL_USERCOPY */
21173
21174 /* Generic arbitrary sized copy. */
21175-#define __copy_user(to, from, size) \
21176+#define __copy_user(to, from, size, prefix, set, restore) \
21177 do { \
21178 int __d0, __d1, __d2; \
21179 __asm__ __volatile__( \
21180+ set \
21181 " cmp $7,%0\n" \
21182 " jbe 1f\n" \
21183 " movl %1,%0\n" \
21184 " negl %0\n" \
21185 " andl $7,%0\n" \
21186 " subl %0,%3\n" \
21187- "4: rep; movsb\n" \
21188+ "4: rep; "prefix"movsb\n" \
21189 " movl %3,%0\n" \
21190 " shrl $2,%0\n" \
21191 " andl $3,%3\n" \
21192 " .align 2,0x90\n" \
21193- "0: rep; movsl\n" \
21194+ "0: rep; "prefix"movsl\n" \
21195 " movl %3,%0\n" \
21196- "1: rep; movsb\n" \
21197+ "1: rep; "prefix"movsb\n" \
21198 "2:\n" \
21199+ restore \
21200 ".section .fixup,\"ax\"\n" \
21201 "5: addl %3,%0\n" \
21202 " jmp 2b\n" \
21203@@ -682,14 +799,14 @@ do { \
21204 " negl %0\n" \
21205 " andl $7,%0\n" \
21206 " subl %0,%3\n" \
21207- "4: rep; movsb\n" \
21208+ "4: rep; "__copyuser_seg"movsb\n" \
21209 " movl %3,%0\n" \
21210 " shrl $2,%0\n" \
21211 " andl $3,%3\n" \
21212 " .align 2,0x90\n" \
21213- "0: rep; movsl\n" \
21214+ "0: rep; "__copyuser_seg"movsl\n" \
21215 " movl %3,%0\n" \
21216- "1: rep; movsb\n" \
21217+ "1: rep; "__copyuser_seg"movsb\n" \
21218 "2:\n" \
21219 ".section .fixup,\"ax\"\n" \
21220 "5: addl %3,%0\n" \
21221@@ -775,9 +892,9 @@ survive:
21222 }
21223 #endif
21224 if (movsl_is_ok(to, from, n))
21225- __copy_user(to, from, n);
21226+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
21227 else
21228- n = __copy_user_intel(to, from, n);
21229+ n = __generic_copy_to_user_intel(to, from, n);
21230 return n;
21231 }
21232 EXPORT_SYMBOL(__copy_to_user_ll);
21233@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
21234 unsigned long n)
21235 {
21236 if (movsl_is_ok(to, from, n))
21237- __copy_user(to, from, n);
21238+ __copy_user(to, from, n, __copyuser_seg, "", "");
21239 else
21240- n = __copy_user_intel((void __user *)to,
21241- (const void *)from, n);
21242+ n = __generic_copy_from_user_intel(to, from, n);
21243 return n;
21244 }
21245 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
21246@@ -827,65 +943,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
21247 if (n > 64 && cpu_has_xmm2)
21248 n = __copy_user_intel_nocache(to, from, n);
21249 else
21250- __copy_user(to, from, n);
21251+ __copy_user(to, from, n, __copyuser_seg, "", "");
21252 #else
21253- __copy_user(to, from, n);
21254+ __copy_user(to, from, n, __copyuser_seg, "", "");
21255 #endif
21256 return n;
21257 }
21258 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
21259
21260-/**
21261- * copy_to_user: - Copy a block of data into user space.
21262- * @to: Destination address, in user space.
21263- * @from: Source address, in kernel space.
21264- * @n: Number of bytes to copy.
21265- *
21266- * Context: User context only. This function may sleep.
21267- *
21268- * Copy data from kernel space to user space.
21269- *
21270- * Returns number of bytes that could not be copied.
21271- * On success, this will be zero.
21272- */
21273-unsigned long
21274-copy_to_user(void __user *to, const void *from, unsigned long n)
21275-{
21276- if (access_ok(VERIFY_WRITE, to, n))
21277- n = __copy_to_user(to, from, n);
21278- return n;
21279-}
21280-EXPORT_SYMBOL(copy_to_user);
21281-
21282-/**
21283- * copy_from_user: - Copy a block of data from user space.
21284- * @to: Destination address, in kernel space.
21285- * @from: Source address, in user space.
21286- * @n: Number of bytes to copy.
21287- *
21288- * Context: User context only. This function may sleep.
21289- *
21290- * Copy data from user space to kernel space.
21291- *
21292- * Returns number of bytes that could not be copied.
21293- * On success, this will be zero.
21294- *
21295- * If some data could not be copied, this function will pad the copied
21296- * data to the requested size using zero bytes.
21297- */
21298-unsigned long
21299-_copy_from_user(void *to, const void __user *from, unsigned long n)
21300-{
21301- if (access_ok(VERIFY_READ, from, n))
21302- n = __copy_from_user(to, from, n);
21303- else
21304- memset(to, 0, n);
21305- return n;
21306-}
21307-EXPORT_SYMBOL(_copy_from_user);
21308-
21309 void copy_from_user_overflow(void)
21310 {
21311 WARN(1, "Buffer overflow detected!\n");
21312 }
21313 EXPORT_SYMBOL(copy_from_user_overflow);
21314+
21315+void copy_to_user_overflow(void)
21316+{
21317+ WARN(1, "Buffer overflow detected!\n");
21318+}
21319+EXPORT_SYMBOL(copy_to_user_overflow);
21320+
21321+#ifdef CONFIG_PAX_MEMORY_UDEREF
21322+void __set_fs(mm_segment_t x)
21323+{
21324+ switch (x.seg) {
21325+ case 0:
21326+ loadsegment(gs, 0);
21327+ break;
21328+ case TASK_SIZE_MAX:
21329+ loadsegment(gs, __USER_DS);
21330+ break;
21331+ case -1UL:
21332+ loadsegment(gs, __KERNEL_DS);
21333+ break;
21334+ default:
21335+ BUG();
21336+ }
21337+ return;
21338+}
21339+EXPORT_SYMBOL(__set_fs);
21340+
21341+void set_fs(mm_segment_t x)
21342+{
21343+ current_thread_info()->addr_limit = x;
21344+ __set_fs(x);
21345+}
21346+EXPORT_SYMBOL(set_fs);
21347+#endif
21348diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
21349index b7c2849..8633ad8 100644
21350--- a/arch/x86/lib/usercopy_64.c
21351+++ b/arch/x86/lib/usercopy_64.c
21352@@ -42,6 +42,12 @@ long
21353 __strncpy_from_user(char *dst, const char __user *src, long count)
21354 {
21355 long res;
21356+
21357+#ifdef CONFIG_PAX_MEMORY_UDEREF
21358+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21359+ src += PAX_USER_SHADOW_BASE;
21360+#endif
21361+
21362 __do_strncpy_from_user(dst, src, count, res);
21363 return res;
21364 }
21365@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
21366 {
21367 long __d0;
21368 might_fault();
21369+
21370+#ifdef CONFIG_PAX_MEMORY_UDEREF
21371+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
21372+ addr += PAX_USER_SHADOW_BASE;
21373+#endif
21374+
21375 /* no memory constraint because it doesn't change any memory gcc knows
21376 about */
21377 asm volatile(
21378@@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
21379 }
21380 EXPORT_SYMBOL(strlen_user);
21381
21382-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
21383+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
21384 {
21385- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
21386- return copy_user_generic((__force void *)to, (__force void *)from, len);
21387- }
21388- return len;
21389+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
21390+
21391+#ifdef CONFIG_PAX_MEMORY_UDEREF
21392+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
21393+ to += PAX_USER_SHADOW_BASE;
21394+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
21395+ from += PAX_USER_SHADOW_BASE;
21396+#endif
21397+
21398+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
21399+ }
21400+ return len;
21401 }
21402 EXPORT_SYMBOL(copy_in_user);
21403
21404@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
21405 * it is not necessary to optimize tail handling.
21406 */
21407 unsigned long
21408-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
21409+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
21410 {
21411 char c;
21412 unsigned zero_len;
21413diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
21414index d0474ad..36e9257 100644
21415--- a/arch/x86/mm/extable.c
21416+++ b/arch/x86/mm/extable.c
21417@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs)
21418 const struct exception_table_entry *fixup;
21419
21420 #ifdef CONFIG_PNPBIOS
21421- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
21422+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
21423 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
21424 extern u32 pnp_bios_is_utter_crap;
21425 pnp_bios_is_utter_crap = 1;
21426diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
21427index 5db0490..13bd09c 100644
21428--- a/arch/x86/mm/fault.c
21429+++ b/arch/x86/mm/fault.c
21430@@ -13,11 +13,18 @@
21431 #include <linux/perf_event.h> /* perf_sw_event */
21432 #include <linux/hugetlb.h> /* hstate_index_to_shift */
21433 #include <linux/prefetch.h> /* prefetchw */
21434+#include <linux/unistd.h>
21435+#include <linux/compiler.h>
21436
21437 #include <asm/traps.h> /* dotraplinkage, ... */
21438 #include <asm/pgalloc.h> /* pgd_*(), ... */
21439 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
21440 #include <asm/fixmap.h> /* VSYSCALL_START */
21441+#include <asm/tlbflush.h>
21442+
21443+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21444+#include <asm/stacktrace.h>
21445+#endif
21446
21447 /*
21448 * Page fault error code bits:
21449@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
21450 int ret = 0;
21451
21452 /* kprobe_running() needs smp_processor_id() */
21453- if (kprobes_built_in() && !user_mode_vm(regs)) {
21454+ if (kprobes_built_in() && !user_mode(regs)) {
21455 preempt_disable();
21456 if (kprobe_running() && kprobe_fault_handler(regs, 14))
21457 ret = 1;
21458@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
21459 return !instr_lo || (instr_lo>>1) == 1;
21460 case 0x00:
21461 /* Prefetch instruction is 0x0F0D or 0x0F18 */
21462- if (probe_kernel_address(instr, opcode))
21463+ if (user_mode(regs)) {
21464+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
21465+ return 0;
21466+ } else if (probe_kernel_address(instr, opcode))
21467 return 0;
21468
21469 *prefetch = (instr_lo == 0xF) &&
21470@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
21471 while (instr < max_instr) {
21472 unsigned char opcode;
21473
21474- if (probe_kernel_address(instr, opcode))
21475+ if (user_mode(regs)) {
21476+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
21477+ break;
21478+ } else if (probe_kernel_address(instr, opcode))
21479 break;
21480
21481 instr++;
21482@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
21483 force_sig_info(si_signo, &info, tsk);
21484 }
21485
21486+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
21487+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
21488+#endif
21489+
21490+#ifdef CONFIG_PAX_EMUTRAMP
21491+static int pax_handle_fetch_fault(struct pt_regs *regs);
21492+#endif
21493+
21494+#ifdef CONFIG_PAX_PAGEEXEC
21495+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
21496+{
21497+ pgd_t *pgd;
21498+ pud_t *pud;
21499+ pmd_t *pmd;
21500+
21501+ pgd = pgd_offset(mm, address);
21502+ if (!pgd_present(*pgd))
21503+ return NULL;
21504+ pud = pud_offset(pgd, address);
21505+ if (!pud_present(*pud))
21506+ return NULL;
21507+ pmd = pmd_offset(pud, address);
21508+ if (!pmd_present(*pmd))
21509+ return NULL;
21510+ return pmd;
21511+}
21512+#endif
21513+
21514 DEFINE_SPINLOCK(pgd_lock);
21515 LIST_HEAD(pgd_list);
21516
21517@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
21518 for (address = VMALLOC_START & PMD_MASK;
21519 address >= TASK_SIZE && address < FIXADDR_TOP;
21520 address += PMD_SIZE) {
21521+
21522+#ifdef CONFIG_PAX_PER_CPU_PGD
21523+ unsigned long cpu;
21524+#else
21525 struct page *page;
21526+#endif
21527
21528 spin_lock(&pgd_lock);
21529+
21530+#ifdef CONFIG_PAX_PER_CPU_PGD
21531+ for (cpu = 0; cpu < NR_CPUS; ++cpu) {
21532+ pgd_t *pgd = get_cpu_pgd(cpu);
21533+ pmd_t *ret;
21534+#else
21535 list_for_each_entry(page, &pgd_list, lru) {
21536+ pgd_t *pgd = page_address(page);
21537 spinlock_t *pgt_lock;
21538 pmd_t *ret;
21539
21540@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
21541 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
21542
21543 spin_lock(pgt_lock);
21544- ret = vmalloc_sync_one(page_address(page), address);
21545+#endif
21546+
21547+ ret = vmalloc_sync_one(pgd, address);
21548+
21549+#ifndef CONFIG_PAX_PER_CPU_PGD
21550 spin_unlock(pgt_lock);
21551+#endif
21552
21553 if (!ret)
21554 break;
21555@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
21556 * an interrupt in the middle of a task switch..
21557 */
21558 pgd_paddr = read_cr3();
21559+
21560+#ifdef CONFIG_PAX_PER_CPU_PGD
21561+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
21562+#endif
21563+
21564 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
21565 if (!pmd_k)
21566 return -1;
21567@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
21568 * happen within a race in page table update. In the later
21569 * case just flush:
21570 */
21571+
21572+#ifdef CONFIG_PAX_PER_CPU_PGD
21573+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
21574+ pgd = pgd_offset_cpu(smp_processor_id(), address);
21575+#else
21576 pgd = pgd_offset(current->active_mm, address);
21577+#endif
21578+
21579 pgd_ref = pgd_offset_k(address);
21580 if (pgd_none(*pgd_ref))
21581 return -1;
21582@@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
21583 static int is_errata100(struct pt_regs *regs, unsigned long address)
21584 {
21585 #ifdef CONFIG_X86_64
21586- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
21587+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
21588 return 1;
21589 #endif
21590 return 0;
21591@@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
21592 }
21593
21594 static const char nx_warning[] = KERN_CRIT
21595-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
21596+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
21597
21598 static void
21599 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
21600@@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
21601 if (!oops_may_print())
21602 return;
21603
21604- if (error_code & PF_INSTR) {
21605+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
21606 unsigned int level;
21607
21608 pte_t *pte = lookup_address(address, &level);
21609
21610 if (pte && pte_present(*pte) && !pte_exec(*pte))
21611- printk(nx_warning, current_uid());
21612+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
21613 }
21614
21615+#ifdef CONFIG_PAX_KERNEXEC
21616+ if (init_mm.start_code <= address && address < init_mm.end_code) {
21617+ if (current->signal->curr_ip)
21618+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
21619+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
21620+ else
21621+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
21622+ current->comm, task_pid_nr(current), current_uid(), current_euid());
21623+ }
21624+#endif
21625+
21626 printk(KERN_ALERT "BUG: unable to handle kernel ");
21627 if (address < PAGE_SIZE)
21628 printk(KERN_CONT "NULL pointer dereference");
21629@@ -739,6 +820,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
21630 }
21631 #endif
21632
21633+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
21634+ if (pax_is_fetch_fault(regs, error_code, address)) {
21635+
21636+#ifdef CONFIG_PAX_EMUTRAMP
21637+ switch (pax_handle_fetch_fault(regs)) {
21638+ case 2:
21639+ return;
21640+ }
21641+#endif
21642+
21643+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
21644+ do_group_exit(SIGKILL);
21645+ }
21646+#endif
21647+
21648 if (unlikely(show_unhandled_signals))
21649 show_signal_msg(regs, error_code, address, tsk);
21650
21651@@ -835,7 +931,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
21652 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
21653 printk(KERN_ERR
21654 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
21655- tsk->comm, tsk->pid, address);
21656+ tsk->comm, task_pid_nr(tsk), address);
21657 code = BUS_MCEERR_AR;
21658 }
21659 #endif
21660@@ -890,6 +986,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
21661 return 1;
21662 }
21663
21664+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
21665+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
21666+{
21667+ pte_t *pte;
21668+ pmd_t *pmd;
21669+ spinlock_t *ptl;
21670+ unsigned char pte_mask;
21671+
21672+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
21673+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
21674+ return 0;
21675+
21676+ /* PaX: it's our fault, let's handle it if we can */
21677+
21678+ /* PaX: take a look at read faults before acquiring any locks */
21679+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
21680+ /* instruction fetch attempt from a protected page in user mode */
21681+ up_read(&mm->mmap_sem);
21682+
21683+#ifdef CONFIG_PAX_EMUTRAMP
21684+ switch (pax_handle_fetch_fault(regs)) {
21685+ case 2:
21686+ return 1;
21687+ }
21688+#endif
21689+
21690+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
21691+ do_group_exit(SIGKILL);
21692+ }
21693+
21694+ pmd = pax_get_pmd(mm, address);
21695+ if (unlikely(!pmd))
21696+ return 0;
21697+
21698+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
21699+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
21700+ pte_unmap_unlock(pte, ptl);
21701+ return 0;
21702+ }
21703+
21704+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
21705+ /* write attempt to a protected page in user mode */
21706+ pte_unmap_unlock(pte, ptl);
21707+ return 0;
21708+ }
21709+
21710+#ifdef CONFIG_SMP
21711+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
21712+#else
21713+ if (likely(address > get_limit(regs->cs)))
21714+#endif
21715+ {
21716+ set_pte(pte, pte_mkread(*pte));
21717+ __flush_tlb_one(address);
21718+ pte_unmap_unlock(pte, ptl);
21719+ up_read(&mm->mmap_sem);
21720+ return 1;
21721+ }
21722+
21723+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
21724+
21725+ /*
21726+ * PaX: fill DTLB with user rights and retry
21727+ */
21728+ __asm__ __volatile__ (
21729+ "orb %2,(%1)\n"
21730+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
21731+/*
21732+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
21733+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
21734+ * page fault when examined during a TLB load attempt. this is true not only
21735+ * for PTEs holding a non-present entry but also present entries that will
21736+ * raise a page fault (such as those set up by PaX, or the copy-on-write
21737+ * mechanism). in effect it means that we do *not* need to flush the TLBs
21738+ * for our target pages since their PTEs are simply not in the TLBs at all.
21739+
21740+ * the best thing in omitting it is that we gain around 15-20% speed in the
21741+ * fast path of the page fault handler and can get rid of tracing since we
21742+ * can no longer flush unintended entries.
21743+ */
21744+ "invlpg (%0)\n"
21745+#endif
21746+ __copyuser_seg"testb $0,(%0)\n"
21747+ "xorb %3,(%1)\n"
21748+ :
21749+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
21750+ : "memory", "cc");
21751+ pte_unmap_unlock(pte, ptl);
21752+ up_read(&mm->mmap_sem);
21753+ return 1;
21754+}
21755+#endif
21756+
21757 /*
21758 * Handle a spurious fault caused by a stale TLB entry.
21759 *
21760@@ -962,6 +1151,9 @@ int show_unhandled_signals = 1;
21761 static inline int
21762 access_error(unsigned long error_code, struct vm_area_struct *vma)
21763 {
21764+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
21765+ return 1;
21766+
21767 if (error_code & PF_WRITE) {
21768 /* write, present and write, not present: */
21769 if (unlikely(!(vma->vm_flags & VM_WRITE)))
21770@@ -995,18 +1187,32 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
21771 {
21772 struct vm_area_struct *vma;
21773 struct task_struct *tsk;
21774- unsigned long address;
21775 struct mm_struct *mm;
21776 int fault;
21777 int write = error_code & PF_WRITE;
21778 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
21779 (write ? FAULT_FLAG_WRITE : 0);
21780
21781- tsk = current;
21782- mm = tsk->mm;
21783-
21784 /* Get the faulting address: */
21785- address = read_cr2();
21786+ unsigned long address = read_cr2();
21787+
21788+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21789+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
21790+ if (!search_exception_tables(regs->ip)) {
21791+ bad_area_nosemaphore(regs, error_code, address);
21792+ return;
21793+ }
21794+ if (address < PAX_USER_SHADOW_BASE) {
21795+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
21796+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
21797+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
21798+ } else
21799+ address -= PAX_USER_SHADOW_BASE;
21800+ }
21801+#endif
21802+
21803+ tsk = current;
21804+ mm = tsk->mm;
21805
21806 /*
21807 * Detect and handle instructions that would cause a page fault for
21808@@ -1067,7 +1273,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
21809 * User-mode registers count as a user access even for any
21810 * potential system fault or CPU buglet:
21811 */
21812- if (user_mode_vm(regs)) {
21813+ if (user_mode(regs)) {
21814 local_irq_enable();
21815 error_code |= PF_USER;
21816 } else {
21817@@ -1122,6 +1328,11 @@ retry:
21818 might_sleep();
21819 }
21820
21821+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
21822+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
21823+ return;
21824+#endif
21825+
21826 vma = find_vma(mm, address);
21827 if (unlikely(!vma)) {
21828 bad_area(regs, error_code, address);
21829@@ -1133,18 +1344,24 @@ retry:
21830 bad_area(regs, error_code, address);
21831 return;
21832 }
21833- if (error_code & PF_USER) {
21834- /*
21835- * Accessing the stack below %sp is always a bug.
21836- * The large cushion allows instructions like enter
21837- * and pusha to work. ("enter $65535, $31" pushes
21838- * 32 pointers and then decrements %sp by 65535.)
21839- */
21840- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
21841- bad_area(regs, error_code, address);
21842- return;
21843- }
21844+ /*
21845+ * Accessing the stack below %sp is always a bug.
21846+ * The large cushion allows instructions like enter
21847+ * and pusha to work. ("enter $65535, $31" pushes
21848+ * 32 pointers and then decrements %sp by 65535.)
21849+ */
21850+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
21851+ bad_area(regs, error_code, address);
21852+ return;
21853 }
21854+
21855+#ifdef CONFIG_PAX_SEGMEXEC
21856+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
21857+ bad_area(regs, error_code, address);
21858+ return;
21859+ }
21860+#endif
21861+
21862 if (unlikely(expand_stack(vma, address))) {
21863 bad_area(regs, error_code, address);
21864 return;
21865@@ -1199,3 +1416,292 @@ good_area:
21866
21867 up_read(&mm->mmap_sem);
21868 }
21869+
21870+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
21871+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
21872+{
21873+ struct mm_struct *mm = current->mm;
21874+ unsigned long ip = regs->ip;
21875+
21876+ if (v8086_mode(regs))
21877+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
21878+
21879+#ifdef CONFIG_PAX_PAGEEXEC
21880+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
21881+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
21882+ return true;
21883+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
21884+ return true;
21885+ return false;
21886+ }
21887+#endif
21888+
21889+#ifdef CONFIG_PAX_SEGMEXEC
21890+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
21891+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
21892+ return true;
21893+ return false;
21894+ }
21895+#endif
21896+
21897+ return false;
21898+}
21899+#endif
21900+
21901+#ifdef CONFIG_PAX_EMUTRAMP
21902+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
21903+{
21904+ int err;
21905+
21906+ do { /* PaX: libffi trampoline emulation */
21907+ unsigned char mov, jmp;
21908+ unsigned int addr1, addr2;
21909+
21910+#ifdef CONFIG_X86_64
21911+ if ((regs->ip + 9) >> 32)
21912+ break;
21913+#endif
21914+
21915+ err = get_user(mov, (unsigned char __user *)regs->ip);
21916+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
21917+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
21918+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
21919+
21920+ if (err)
21921+ break;
21922+
21923+ if (mov == 0xB8 && jmp == 0xE9) {
21924+ regs->ax = addr1;
21925+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
21926+ return 2;
21927+ }
21928+ } while (0);
21929+
21930+ do { /* PaX: gcc trampoline emulation #1 */
21931+ unsigned char mov1, mov2;
21932+ unsigned short jmp;
21933+ unsigned int addr1, addr2;
21934+
21935+#ifdef CONFIG_X86_64
21936+ if ((regs->ip + 11) >> 32)
21937+ break;
21938+#endif
21939+
21940+ err = get_user(mov1, (unsigned char __user *)regs->ip);
21941+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
21942+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
21943+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
21944+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
21945+
21946+ if (err)
21947+ break;
21948+
21949+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
21950+ regs->cx = addr1;
21951+ regs->ax = addr2;
21952+ regs->ip = addr2;
21953+ return 2;
21954+ }
21955+ } while (0);
21956+
21957+ do { /* PaX: gcc trampoline emulation #2 */
21958+ unsigned char mov, jmp;
21959+ unsigned int addr1, addr2;
21960+
21961+#ifdef CONFIG_X86_64
21962+ if ((regs->ip + 9) >> 32)
21963+ break;
21964+#endif
21965+
21966+ err = get_user(mov, (unsigned char __user *)regs->ip);
21967+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
21968+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
21969+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
21970+
21971+ if (err)
21972+ break;
21973+
21974+ if (mov == 0xB9 && jmp == 0xE9) {
21975+ regs->cx = addr1;
21976+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
21977+ return 2;
21978+ }
21979+ } while (0);
21980+
21981+ return 1; /* PaX in action */
21982+}
21983+
21984+#ifdef CONFIG_X86_64
21985+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
21986+{
21987+ int err;
21988+
21989+ do { /* PaX: libffi trampoline emulation */
21990+ unsigned short mov1, mov2, jmp1;
21991+ unsigned char stcclc, jmp2;
21992+ unsigned long addr1, addr2;
21993+
21994+ err = get_user(mov1, (unsigned short __user *)regs->ip);
21995+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
21996+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
21997+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
21998+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
21999+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
22000+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
22001+
22002+ if (err)
22003+ break;
22004+
22005+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
22006+ regs->r11 = addr1;
22007+ regs->r10 = addr2;
22008+ if (stcclc == 0xF8)
22009+ regs->flags &= ~X86_EFLAGS_CF;
22010+ else
22011+ regs->flags |= X86_EFLAGS_CF;
22012+ regs->ip = addr1;
22013+ return 2;
22014+ }
22015+ } while (0);
22016+
22017+ do { /* PaX: gcc trampoline emulation #1 */
22018+ unsigned short mov1, mov2, jmp1;
22019+ unsigned char jmp2;
22020+ unsigned int addr1;
22021+ unsigned long addr2;
22022+
22023+ err = get_user(mov1, (unsigned short __user *)regs->ip);
22024+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
22025+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
22026+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
22027+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
22028+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
22029+
22030+ if (err)
22031+ break;
22032+
22033+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
22034+ regs->r11 = addr1;
22035+ regs->r10 = addr2;
22036+ regs->ip = addr1;
22037+ return 2;
22038+ }
22039+ } while (0);
22040+
22041+ do { /* PaX: gcc trampoline emulation #2 */
22042+ unsigned short mov1, mov2, jmp1;
22043+ unsigned char jmp2;
22044+ unsigned long addr1, addr2;
22045+
22046+ err = get_user(mov1, (unsigned short __user *)regs->ip);
22047+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
22048+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
22049+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
22050+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
22051+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
22052+
22053+ if (err)
22054+ break;
22055+
22056+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
22057+ regs->r11 = addr1;
22058+ regs->r10 = addr2;
22059+ regs->ip = addr1;
22060+ return 2;
22061+ }
22062+ } while (0);
22063+
22064+ return 1; /* PaX in action */
22065+}
22066+#endif
22067+
22068+/*
22069+ * PaX: decide what to do with offenders (regs->ip = fault address)
22070+ *
22071+ * returns 1 when task should be killed
22072+ * 2 when gcc trampoline was detected
22073+ */
22074+static int pax_handle_fetch_fault(struct pt_regs *regs)
22075+{
22076+ if (v8086_mode(regs))
22077+ return 1;
22078+
22079+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
22080+ return 1;
22081+
22082+#ifdef CONFIG_X86_32
22083+ return pax_handle_fetch_fault_32(regs);
22084+#else
22085+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
22086+ return pax_handle_fetch_fault_32(regs);
22087+ else
22088+ return pax_handle_fetch_fault_64(regs);
22089+#endif
22090+}
22091+#endif
22092+
22093+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
22094+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
22095+{
22096+ long i;
22097+
22098+ printk(KERN_ERR "PAX: bytes at PC: ");
22099+ for (i = 0; i < 20; i++) {
22100+ unsigned char c;
22101+ if (get_user(c, (unsigned char __force_user *)pc+i))
22102+ printk(KERN_CONT "?? ");
22103+ else
22104+ printk(KERN_CONT "%02x ", c);
22105+ }
22106+ printk("\n");
22107+
22108+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
22109+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
22110+ unsigned long c;
22111+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
22112+#ifdef CONFIG_X86_32
22113+ printk(KERN_CONT "???????? ");
22114+#else
22115+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
22116+ printk(KERN_CONT "???????? ???????? ");
22117+ else
22118+ printk(KERN_CONT "???????????????? ");
22119+#endif
22120+ } else {
22121+#ifdef CONFIG_X86_64
22122+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
22123+ printk(KERN_CONT "%08x ", (unsigned int)c);
22124+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
22125+ } else
22126+#endif
22127+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
22128+ }
22129+ }
22130+ printk("\n");
22131+}
22132+#endif
22133+
22134+/**
22135+ * probe_kernel_write(): safely attempt to write to a location
22136+ * @dst: address to write to
22137+ * @src: pointer to the data that shall be written
22138+ * @size: size of the data chunk
22139+ *
22140+ * Safely write to address @dst from the buffer at @src. If a kernel fault
22141+ * happens, handle that and return -EFAULT.
22142+ */
22143+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
22144+{
22145+ long ret;
22146+ mm_segment_t old_fs = get_fs();
22147+
22148+ set_fs(KERNEL_DS);
22149+ pagefault_disable();
22150+ pax_open_kernel();
22151+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
22152+ pax_close_kernel();
22153+ pagefault_enable();
22154+ set_fs(old_fs);
22155+
22156+ return ret ? -EFAULT : 0;
22157+}
22158diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
22159index dd74e46..7d26398 100644
22160--- a/arch/x86/mm/gup.c
22161+++ b/arch/x86/mm/gup.c
22162@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
22163 addr = start;
22164 len = (unsigned long) nr_pages << PAGE_SHIFT;
22165 end = start + len;
22166- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
22167+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
22168 (void __user *)start, len)))
22169 return 0;
22170
22171diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
22172index f4f29b1..5cac4fb 100644
22173--- a/arch/x86/mm/highmem_32.c
22174+++ b/arch/x86/mm/highmem_32.c
22175@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
22176 idx = type + KM_TYPE_NR*smp_processor_id();
22177 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
22178 BUG_ON(!pte_none(*(kmap_pte-idx)));
22179+
22180+ pax_open_kernel();
22181 set_pte(kmap_pte-idx, mk_pte(page, prot));
22182+ pax_close_kernel();
22183+
22184 arch_flush_lazy_mmu_mode();
22185
22186 return (void *)vaddr;
22187diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
22188index f581a18..29efd37 100644
22189--- a/arch/x86/mm/hugetlbpage.c
22190+++ b/arch/x86/mm/hugetlbpage.c
22191@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
22192 struct hstate *h = hstate_file(file);
22193 struct mm_struct *mm = current->mm;
22194 struct vm_area_struct *vma;
22195- unsigned long start_addr;
22196+ unsigned long start_addr, pax_task_size = TASK_SIZE;
22197+
22198+#ifdef CONFIG_PAX_SEGMEXEC
22199+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22200+ pax_task_size = SEGMEXEC_TASK_SIZE;
22201+#endif
22202+
22203+ pax_task_size -= PAGE_SIZE;
22204
22205 if (len > mm->cached_hole_size) {
22206- start_addr = mm->free_area_cache;
22207+ start_addr = mm->free_area_cache;
22208 } else {
22209- start_addr = TASK_UNMAPPED_BASE;
22210- mm->cached_hole_size = 0;
22211+ start_addr = mm->mmap_base;
22212+ mm->cached_hole_size = 0;
22213 }
22214
22215 full_search:
22216@@ -280,26 +287,27 @@ full_search:
22217
22218 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
22219 /* At this point: (!vma || addr < vma->vm_end). */
22220- if (TASK_SIZE - len < addr) {
22221+ if (pax_task_size - len < addr) {
22222 /*
22223 * Start a new search - just in case we missed
22224 * some holes.
22225 */
22226- if (start_addr != TASK_UNMAPPED_BASE) {
22227- start_addr = TASK_UNMAPPED_BASE;
22228+ if (start_addr != mm->mmap_base) {
22229+ start_addr = mm->mmap_base;
22230 mm->cached_hole_size = 0;
22231 goto full_search;
22232 }
22233 return -ENOMEM;
22234 }
22235- if (!vma || addr + len <= vma->vm_start) {
22236- mm->free_area_cache = addr + len;
22237- return addr;
22238- }
22239+ if (check_heap_stack_gap(vma, addr, len))
22240+ break;
22241 if (addr + mm->cached_hole_size < vma->vm_start)
22242 mm->cached_hole_size = vma->vm_start - addr;
22243 addr = ALIGN(vma->vm_end, huge_page_size(h));
22244 }
22245+
22246+ mm->free_area_cache = addr + len;
22247+ return addr;
22248 }
22249
22250 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
22251@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
22252 {
22253 struct hstate *h = hstate_file(file);
22254 struct mm_struct *mm = current->mm;
22255- struct vm_area_struct *vma, *prev_vma;
22256- unsigned long base = mm->mmap_base, addr = addr0;
22257+ struct vm_area_struct *vma;
22258+ unsigned long base = mm->mmap_base, addr;
22259 unsigned long largest_hole = mm->cached_hole_size;
22260- int first_time = 1;
22261
22262 /* don't allow allocations above current base */
22263 if (mm->free_area_cache > base)
22264@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
22265 largest_hole = 0;
22266 mm->free_area_cache = base;
22267 }
22268-try_again:
22269+
22270 /* make sure it can fit in the remaining address space */
22271 if (mm->free_area_cache < len)
22272 goto fail;
22273
22274 /* either no address requested or can't fit in requested address hole */
22275- addr = (mm->free_area_cache - len) & huge_page_mask(h);
22276+ addr = (mm->free_area_cache - len);
22277 do {
22278+ addr &= huge_page_mask(h);
22279+ vma = find_vma(mm, addr);
22280 /*
22281 * Lookup failure means no vma is above this address,
22282 * i.e. return with success:
22283- */
22284- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
22285- return addr;
22286-
22287- /*
22288 * new region fits between prev_vma->vm_end and
22289 * vma->vm_start, use it:
22290 */
22291- if (addr + len <= vma->vm_start &&
22292- (!prev_vma || (addr >= prev_vma->vm_end))) {
22293+ if (check_heap_stack_gap(vma, addr, len)) {
22294 /* remember the address as a hint for next time */
22295- mm->cached_hole_size = largest_hole;
22296- return (mm->free_area_cache = addr);
22297- } else {
22298- /* pull free_area_cache down to the first hole */
22299- if (mm->free_area_cache == vma->vm_end) {
22300- mm->free_area_cache = vma->vm_start;
22301- mm->cached_hole_size = largest_hole;
22302- }
22303+ mm->cached_hole_size = largest_hole;
22304+ return (mm->free_area_cache = addr);
22305+ }
22306+ /* pull free_area_cache down to the first hole */
22307+ if (mm->free_area_cache == vma->vm_end) {
22308+ mm->free_area_cache = vma->vm_start;
22309+ mm->cached_hole_size = largest_hole;
22310 }
22311
22312 /* remember the largest hole we saw so far */
22313 if (addr + largest_hole < vma->vm_start)
22314- largest_hole = vma->vm_start - addr;
22315+ largest_hole = vma->vm_start - addr;
22316
22317 /* try just below the current vma->vm_start */
22318- addr = (vma->vm_start - len) & huge_page_mask(h);
22319- } while (len <= vma->vm_start);
22320+ addr = skip_heap_stack_gap(vma, len);
22321+ } while (!IS_ERR_VALUE(addr));
22322
22323 fail:
22324 /*
22325- * if hint left us with no space for the requested
22326- * mapping then try again:
22327- */
22328- if (first_time) {
22329- mm->free_area_cache = base;
22330- largest_hole = 0;
22331- first_time = 0;
22332- goto try_again;
22333- }
22334- /*
22335 * A failed mmap() very likely causes application failure,
22336 * so fall back to the bottom-up function here. This scenario
22337 * can happen with large stack limits and large mmap()
22338 * allocations.
22339 */
22340- mm->free_area_cache = TASK_UNMAPPED_BASE;
22341+
22342+#ifdef CONFIG_PAX_SEGMEXEC
22343+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22344+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
22345+ else
22346+#endif
22347+
22348+ mm->mmap_base = TASK_UNMAPPED_BASE;
22349+
22350+#ifdef CONFIG_PAX_RANDMMAP
22351+ if (mm->pax_flags & MF_PAX_RANDMMAP)
22352+ mm->mmap_base += mm->delta_mmap;
22353+#endif
22354+
22355+ mm->free_area_cache = mm->mmap_base;
22356 mm->cached_hole_size = ~0UL;
22357 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
22358 len, pgoff, flags);
22359@@ -386,6 +392,7 @@ fail:
22360 /*
22361 * Restore the topdown base:
22362 */
22363+ mm->mmap_base = base;
22364 mm->free_area_cache = base;
22365 mm->cached_hole_size = ~0UL;
22366
22367@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
22368 struct hstate *h = hstate_file(file);
22369 struct mm_struct *mm = current->mm;
22370 struct vm_area_struct *vma;
22371+ unsigned long pax_task_size = TASK_SIZE;
22372
22373 if (len & ~huge_page_mask(h))
22374 return -EINVAL;
22375- if (len > TASK_SIZE)
22376+
22377+#ifdef CONFIG_PAX_SEGMEXEC
22378+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22379+ pax_task_size = SEGMEXEC_TASK_SIZE;
22380+#endif
22381+
22382+ pax_task_size -= PAGE_SIZE;
22383+
22384+ if (len > pax_task_size)
22385 return -ENOMEM;
22386
22387 if (flags & MAP_FIXED) {
22388@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
22389 if (addr) {
22390 addr = ALIGN(addr, huge_page_size(h));
22391 vma = find_vma(mm, addr);
22392- if (TASK_SIZE - len >= addr &&
22393- (!vma || addr + len <= vma->vm_start))
22394+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
22395 return addr;
22396 }
22397 if (mm->get_unmapped_area == arch_get_unmapped_area)
22398diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
22399index 87488b9..a55509f 100644
22400--- a/arch/x86/mm/init.c
22401+++ b/arch/x86/mm/init.c
22402@@ -15,6 +15,7 @@
22403 #include <asm/tlbflush.h>
22404 #include <asm/tlb.h>
22405 #include <asm/proto.h>
22406+#include <asm/desc.h>
22407
22408 unsigned long __initdata pgt_buf_start;
22409 unsigned long __meminitdata pgt_buf_end;
22410@@ -31,7 +32,7 @@ int direct_gbpages
22411 static void __init find_early_table_space(unsigned long end, int use_pse,
22412 int use_gbpages)
22413 {
22414- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
22415+ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
22416 phys_addr_t base;
22417
22418 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
22419@@ -312,8 +313,29 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
22420 */
22421 int devmem_is_allowed(unsigned long pagenr)
22422 {
22423+#ifdef CONFIG_GRKERNSEC_KMEM
22424+ /* allow BDA */
22425+ if (!pagenr)
22426+ return 1;
22427+ /* allow EBDA */
22428+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
22429+ return 1;
22430+#else
22431+ if (!pagenr)
22432+ return 1;
22433+#ifdef CONFIG_VM86
22434+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
22435+ return 1;
22436+#endif
22437+#endif
22438+
22439+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
22440+ return 1;
22441+#ifdef CONFIG_GRKERNSEC_KMEM
22442+ /* throw out everything else below 1MB */
22443 if (pagenr <= 256)
22444- return 1;
22445+ return 0;
22446+#endif
22447 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
22448 return 0;
22449 if (!page_is_ram(pagenr))
22450@@ -372,6 +394,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
22451
22452 void free_initmem(void)
22453 {
22454+
22455+#ifdef CONFIG_PAX_KERNEXEC
22456+#ifdef CONFIG_X86_32
22457+ /* PaX: limit KERNEL_CS to actual size */
22458+ unsigned long addr, limit;
22459+ struct desc_struct d;
22460+ int cpu;
22461+
22462+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
22463+ limit = (limit - 1UL) >> PAGE_SHIFT;
22464+
22465+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
22466+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
22467+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
22468+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
22469+ }
22470+
22471+ /* PaX: make KERNEL_CS read-only */
22472+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
22473+ if (!paravirt_enabled())
22474+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
22475+/*
22476+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
22477+ pgd = pgd_offset_k(addr);
22478+ pud = pud_offset(pgd, addr);
22479+ pmd = pmd_offset(pud, addr);
22480+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
22481+ }
22482+*/
22483+#ifdef CONFIG_X86_PAE
22484+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
22485+/*
22486+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
22487+ pgd = pgd_offset_k(addr);
22488+ pud = pud_offset(pgd, addr);
22489+ pmd = pmd_offset(pud, addr);
22490+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
22491+ }
22492+*/
22493+#endif
22494+
22495+#ifdef CONFIG_MODULES
22496+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
22497+#endif
22498+
22499+#else
22500+ pgd_t *pgd;
22501+ pud_t *pud;
22502+ pmd_t *pmd;
22503+ unsigned long addr, end;
22504+
22505+ /* PaX: make kernel code/rodata read-only, rest non-executable */
22506+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
22507+ pgd = pgd_offset_k(addr);
22508+ pud = pud_offset(pgd, addr);
22509+ pmd = pmd_offset(pud, addr);
22510+ if (!pmd_present(*pmd))
22511+ continue;
22512+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
22513+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
22514+ else
22515+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
22516+ }
22517+
22518+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
22519+ end = addr + KERNEL_IMAGE_SIZE;
22520+ for (; addr < end; addr += PMD_SIZE) {
22521+ pgd = pgd_offset_k(addr);
22522+ pud = pud_offset(pgd, addr);
22523+ pmd = pmd_offset(pud, addr);
22524+ if (!pmd_present(*pmd))
22525+ continue;
22526+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
22527+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
22528+ }
22529+#endif
22530+
22531+ flush_tlb_all();
22532+#endif
22533+
22534 free_init_pages("unused kernel memory",
22535 (unsigned long)(&__init_begin),
22536 (unsigned long)(&__init_end));
22537diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
22538index 29f7c6d..b46b35b 100644
22539--- a/arch/x86/mm/init_32.c
22540+++ b/arch/x86/mm/init_32.c
22541@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
22542 }
22543
22544 /*
22545- * Creates a middle page table and puts a pointer to it in the
22546- * given global directory entry. This only returns the gd entry
22547- * in non-PAE compilation mode, since the middle layer is folded.
22548- */
22549-static pmd_t * __init one_md_table_init(pgd_t *pgd)
22550-{
22551- pud_t *pud;
22552- pmd_t *pmd_table;
22553-
22554-#ifdef CONFIG_X86_PAE
22555- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
22556- if (after_bootmem)
22557- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
22558- else
22559- pmd_table = (pmd_t *)alloc_low_page();
22560- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
22561- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
22562- pud = pud_offset(pgd, 0);
22563- BUG_ON(pmd_table != pmd_offset(pud, 0));
22564-
22565- return pmd_table;
22566- }
22567-#endif
22568- pud = pud_offset(pgd, 0);
22569- pmd_table = pmd_offset(pud, 0);
22570-
22571- return pmd_table;
22572-}
22573-
22574-/*
22575 * Create a page table and place a pointer to it in a middle page
22576 * directory entry:
22577 */
22578@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
22579 page_table = (pte_t *)alloc_low_page();
22580
22581 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
22582+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
22583+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
22584+#else
22585 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
22586+#endif
22587 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
22588 }
22589
22590 return pte_offset_kernel(pmd, 0);
22591 }
22592
22593+static pmd_t * __init one_md_table_init(pgd_t *pgd)
22594+{
22595+ pud_t *pud;
22596+ pmd_t *pmd_table;
22597+
22598+ pud = pud_offset(pgd, 0);
22599+ pmd_table = pmd_offset(pud, 0);
22600+
22601+ return pmd_table;
22602+}
22603+
22604 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
22605 {
22606 int pgd_idx = pgd_index(vaddr);
22607@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
22608 int pgd_idx, pmd_idx;
22609 unsigned long vaddr;
22610 pgd_t *pgd;
22611+ pud_t *pud;
22612 pmd_t *pmd;
22613 pte_t *pte = NULL;
22614
22615@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
22616 pgd = pgd_base + pgd_idx;
22617
22618 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
22619- pmd = one_md_table_init(pgd);
22620- pmd = pmd + pmd_index(vaddr);
22621+ pud = pud_offset(pgd, vaddr);
22622+ pmd = pmd_offset(pud, vaddr);
22623+
22624+#ifdef CONFIG_X86_PAE
22625+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
22626+#endif
22627+
22628 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
22629 pmd++, pmd_idx++) {
22630 pte = page_table_kmap_check(one_page_table_init(pmd),
22631@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
22632 }
22633 }
22634
22635-static inline int is_kernel_text(unsigned long addr)
22636+static inline int is_kernel_text(unsigned long start, unsigned long end)
22637 {
22638- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
22639- return 1;
22640- return 0;
22641+ if ((start > ktla_ktva((unsigned long)_etext) ||
22642+ end <= ktla_ktva((unsigned long)_stext)) &&
22643+ (start > ktla_ktva((unsigned long)_einittext) ||
22644+ end <= ktla_ktva((unsigned long)_sinittext)) &&
22645+
22646+#ifdef CONFIG_ACPI_SLEEP
22647+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
22648+#endif
22649+
22650+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
22651+ return 0;
22652+ return 1;
22653 }
22654
22655 /*
22656@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
22657 unsigned long last_map_addr = end;
22658 unsigned long start_pfn, end_pfn;
22659 pgd_t *pgd_base = swapper_pg_dir;
22660- int pgd_idx, pmd_idx, pte_ofs;
22661+ unsigned int pgd_idx, pmd_idx, pte_ofs;
22662 unsigned long pfn;
22663 pgd_t *pgd;
22664+ pud_t *pud;
22665 pmd_t *pmd;
22666 pte_t *pte;
22667 unsigned pages_2m, pages_4k;
22668@@ -281,8 +282,13 @@ repeat:
22669 pfn = start_pfn;
22670 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
22671 pgd = pgd_base + pgd_idx;
22672- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
22673- pmd = one_md_table_init(pgd);
22674+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
22675+ pud = pud_offset(pgd, 0);
22676+ pmd = pmd_offset(pud, 0);
22677+
22678+#ifdef CONFIG_X86_PAE
22679+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
22680+#endif
22681
22682 if (pfn >= end_pfn)
22683 continue;
22684@@ -294,14 +300,13 @@ repeat:
22685 #endif
22686 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
22687 pmd++, pmd_idx++) {
22688- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
22689+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
22690
22691 /*
22692 * Map with big pages if possible, otherwise
22693 * create normal page tables:
22694 */
22695 if (use_pse) {
22696- unsigned int addr2;
22697 pgprot_t prot = PAGE_KERNEL_LARGE;
22698 /*
22699 * first pass will use the same initial
22700@@ -311,11 +316,7 @@ repeat:
22701 __pgprot(PTE_IDENT_ATTR |
22702 _PAGE_PSE);
22703
22704- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
22705- PAGE_OFFSET + PAGE_SIZE-1;
22706-
22707- if (is_kernel_text(addr) ||
22708- is_kernel_text(addr2))
22709+ if (is_kernel_text(address, address + PMD_SIZE))
22710 prot = PAGE_KERNEL_LARGE_EXEC;
22711
22712 pages_2m++;
22713@@ -332,7 +333,7 @@ repeat:
22714 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
22715 pte += pte_ofs;
22716 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
22717- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
22718+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
22719 pgprot_t prot = PAGE_KERNEL;
22720 /*
22721 * first pass will use the same initial
22722@@ -340,7 +341,7 @@ repeat:
22723 */
22724 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
22725
22726- if (is_kernel_text(addr))
22727+ if (is_kernel_text(address, address + PAGE_SIZE))
22728 prot = PAGE_KERNEL_EXEC;
22729
22730 pages_4k++;
22731@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
22732
22733 pud = pud_offset(pgd, va);
22734 pmd = pmd_offset(pud, va);
22735- if (!pmd_present(*pmd))
22736+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
22737 break;
22738
22739 pte = pte_offset_kernel(pmd, va);
22740@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_range_init(void)
22741
22742 static void __init pagetable_init(void)
22743 {
22744- pgd_t *pgd_base = swapper_pg_dir;
22745-
22746- permanent_kmaps_init(pgd_base);
22747+ permanent_kmaps_init(swapper_pg_dir);
22748 }
22749
22750-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
22751+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
22752 EXPORT_SYMBOL_GPL(__supported_pte_mask);
22753
22754 /* user-defined highmem size */
22755@@ -757,6 +756,12 @@ void __init mem_init(void)
22756
22757 pci_iommu_alloc();
22758
22759+#ifdef CONFIG_PAX_PER_CPU_PGD
22760+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
22761+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
22762+ KERNEL_PGD_PTRS);
22763+#endif
22764+
22765 #ifdef CONFIG_FLATMEM
22766 BUG_ON(!mem_map);
22767 #endif
22768@@ -774,7 +779,7 @@ void __init mem_init(void)
22769 set_highmem_pages_init();
22770
22771 codesize = (unsigned long) &_etext - (unsigned long) &_text;
22772- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
22773+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
22774 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
22775
22776 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
22777@@ -815,10 +820,10 @@ void __init mem_init(void)
22778 ((unsigned long)&__init_end -
22779 (unsigned long)&__init_begin) >> 10,
22780
22781- (unsigned long)&_etext, (unsigned long)&_edata,
22782- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
22783+ (unsigned long)&_sdata, (unsigned long)&_edata,
22784+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
22785
22786- (unsigned long)&_text, (unsigned long)&_etext,
22787+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
22788 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
22789
22790 /*
22791@@ -896,6 +901,7 @@ void set_kernel_text_rw(void)
22792 if (!kernel_set_to_readonly)
22793 return;
22794
22795+ start = ktla_ktva(start);
22796 pr_debug("Set kernel text: %lx - %lx for read write\n",
22797 start, start+size);
22798
22799@@ -910,6 +916,7 @@ void set_kernel_text_ro(void)
22800 if (!kernel_set_to_readonly)
22801 return;
22802
22803+ start = ktla_ktva(start);
22804 pr_debug("Set kernel text: %lx - %lx for read only\n",
22805 start, start+size);
22806
22807@@ -938,6 +945,7 @@ void mark_rodata_ro(void)
22808 unsigned long start = PFN_ALIGN(_text);
22809 unsigned long size = PFN_ALIGN(_etext) - start;
22810
22811+ start = ktla_ktva(start);
22812 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
22813 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
22814 size >> 10);
22815diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
22816index bbaaa00..16dffad 100644
22817--- a/arch/x86/mm/init_64.c
22818+++ b/arch/x86/mm/init_64.c
22819@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpages_on);
22820 * around without checking the pgd every time.
22821 */
22822
22823-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
22824+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
22825 EXPORT_SYMBOL_GPL(__supported_pte_mask);
22826
22827 int force_personality32;
22828@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
22829
22830 for (address = start; address <= end; address += PGDIR_SIZE) {
22831 const pgd_t *pgd_ref = pgd_offset_k(address);
22832+
22833+#ifdef CONFIG_PAX_PER_CPU_PGD
22834+ unsigned long cpu;
22835+#else
22836 struct page *page;
22837+#endif
22838
22839 if (pgd_none(*pgd_ref))
22840 continue;
22841
22842 spin_lock(&pgd_lock);
22843+
22844+#ifdef CONFIG_PAX_PER_CPU_PGD
22845+ for (cpu = 0; cpu < NR_CPUS; ++cpu) {
22846+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
22847+#else
22848 list_for_each_entry(page, &pgd_list, lru) {
22849 pgd_t *pgd;
22850 spinlock_t *pgt_lock;
22851@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
22852 /* the pgt_lock only for Xen */
22853 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
22854 spin_lock(pgt_lock);
22855+#endif
22856
22857 if (pgd_none(*pgd))
22858 set_pgd(pgd, *pgd_ref);
22859@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
22860 BUG_ON(pgd_page_vaddr(*pgd)
22861 != pgd_page_vaddr(*pgd_ref));
22862
22863+#ifndef CONFIG_PAX_PER_CPU_PGD
22864 spin_unlock(pgt_lock);
22865+#endif
22866+
22867 }
22868 spin_unlock(&pgd_lock);
22869 }
22870@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
22871 pmd = fill_pmd(pud, vaddr);
22872 pte = fill_pte(pmd, vaddr);
22873
22874+ pax_open_kernel();
22875 set_pte(pte, new_pte);
22876+ pax_close_kernel();
22877
22878 /*
22879 * It's enough to flush this one mapping.
22880@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
22881 pgd = pgd_offset_k((unsigned long)__va(phys));
22882 if (pgd_none(*pgd)) {
22883 pud = (pud_t *) spp_getpage();
22884- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
22885- _PAGE_USER));
22886+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
22887 }
22888 pud = pud_offset(pgd, (unsigned long)__va(phys));
22889 if (pud_none(*pud)) {
22890 pmd = (pmd_t *) spp_getpage();
22891- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
22892- _PAGE_USER));
22893+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
22894 }
22895 pmd = pmd_offset(pud, phys);
22896 BUG_ON(!pmd_none(*pmd));
22897@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
22898 if (pfn >= pgt_buf_top)
22899 panic("alloc_low_page: ran out of memory");
22900
22901- adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
22902+ adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
22903 clear_page(adr);
22904 *phys = pfn * PAGE_SIZE;
22905 return adr;
22906@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *virt)
22907
22908 phys = __pa(virt);
22909 left = phys & (PAGE_SIZE - 1);
22910- adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
22911+ adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
22912 adr = (void *)(((unsigned long)adr) | left);
22913
22914 return adr;
22915@@ -693,6 +707,12 @@ void __init mem_init(void)
22916
22917 pci_iommu_alloc();
22918
22919+#ifdef CONFIG_PAX_PER_CPU_PGD
22920+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
22921+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
22922+ KERNEL_PGD_PTRS);
22923+#endif
22924+
22925 /* clear_bss() already clear the empty_zero_page */
22926
22927 reservedpages = 0;
22928@@ -853,8 +873,8 @@ int kern_addr_valid(unsigned long addr)
22929 static struct vm_area_struct gate_vma = {
22930 .vm_start = VSYSCALL_START,
22931 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
22932- .vm_page_prot = PAGE_READONLY_EXEC,
22933- .vm_flags = VM_READ | VM_EXEC
22934+ .vm_page_prot = PAGE_READONLY,
22935+ .vm_flags = VM_READ
22936 };
22937
22938 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
22939@@ -888,7 +908,7 @@ int in_gate_area_no_mm(unsigned long addr)
22940
22941 const char *arch_vma_name(struct vm_area_struct *vma)
22942 {
22943- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
22944+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
22945 return "[vdso]";
22946 if (vma == &gate_vma)
22947 return "[vsyscall]";
22948diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
22949index 7b179b4..6bd1777 100644
22950--- a/arch/x86/mm/iomap_32.c
22951+++ b/arch/x86/mm/iomap_32.c
22952@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
22953 type = kmap_atomic_idx_push();
22954 idx = type + KM_TYPE_NR * smp_processor_id();
22955 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
22956+
22957+ pax_open_kernel();
22958 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
22959+ pax_close_kernel();
22960+
22961 arch_flush_lazy_mmu_mode();
22962
22963 return (void *)vaddr;
22964diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
22965index be1ef57..55f0160 100644
22966--- a/arch/x86/mm/ioremap.c
22967+++ b/arch/x86/mm/ioremap.c
22968@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
22969 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
22970 int is_ram = page_is_ram(pfn);
22971
22972- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
22973+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
22974 return NULL;
22975 WARN_ON_ONCE(is_ram);
22976 }
22977@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
22978
22979 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
22980 if (page_is_ram(start >> PAGE_SHIFT))
22981+#ifdef CONFIG_HIGHMEM
22982+ if ((start >> PAGE_SHIFT) < max_low_pfn)
22983+#endif
22984 return __va(phys);
22985
22986 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
22987@@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
22988 early_param("early_ioremap_debug", early_ioremap_debug_setup);
22989
22990 static __initdata int after_paging_init;
22991-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
22992+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
22993
22994 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
22995 {
22996@@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
22997 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
22998
22999 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
23000- memset(bm_pte, 0, sizeof(bm_pte));
23001- pmd_populate_kernel(&init_mm, pmd, bm_pte);
23002+ pmd_populate_user(&init_mm, pmd, bm_pte);
23003
23004 /*
23005 * The boot-ioremap range spans multiple pmds, for which
23006diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
23007index d87dd6d..bf3fa66 100644
23008--- a/arch/x86/mm/kmemcheck/kmemcheck.c
23009+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
23010@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
23011 * memory (e.g. tracked pages)? For now, we need this to avoid
23012 * invoking kmemcheck for PnP BIOS calls.
23013 */
23014- if (regs->flags & X86_VM_MASK)
23015+ if (v8086_mode(regs))
23016 return false;
23017- if (regs->cs != __KERNEL_CS)
23018+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
23019 return false;
23020
23021 pte = kmemcheck_pte_lookup(address);
23022diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
23023index 845df68..1d8d29f 100644
23024--- a/arch/x86/mm/mmap.c
23025+++ b/arch/x86/mm/mmap.c
23026@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
23027 * Leave an at least ~128 MB hole with possible stack randomization.
23028 */
23029 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
23030-#define MAX_GAP (TASK_SIZE/6*5)
23031+#define MAX_GAP (pax_task_size/6*5)
23032
23033 static int mmap_is_legacy(void)
23034 {
23035@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
23036 return rnd << PAGE_SHIFT;
23037 }
23038
23039-static unsigned long mmap_base(void)
23040+static unsigned long mmap_base(struct mm_struct *mm)
23041 {
23042 unsigned long gap = rlimit(RLIMIT_STACK);
23043+ unsigned long pax_task_size = TASK_SIZE;
23044+
23045+#ifdef CONFIG_PAX_SEGMEXEC
23046+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
23047+ pax_task_size = SEGMEXEC_TASK_SIZE;
23048+#endif
23049
23050 if (gap < MIN_GAP)
23051 gap = MIN_GAP;
23052 else if (gap > MAX_GAP)
23053 gap = MAX_GAP;
23054
23055- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
23056+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
23057 }
23058
23059 /*
23060 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
23061 * does, but not when emulating X86_32
23062 */
23063-static unsigned long mmap_legacy_base(void)
23064+static unsigned long mmap_legacy_base(struct mm_struct *mm)
23065 {
23066- if (mmap_is_ia32())
23067+ if (mmap_is_ia32()) {
23068+
23069+#ifdef CONFIG_PAX_SEGMEXEC
23070+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
23071+ return SEGMEXEC_TASK_UNMAPPED_BASE;
23072+ else
23073+#endif
23074+
23075 return TASK_UNMAPPED_BASE;
23076- else
23077+ } else
23078 return TASK_UNMAPPED_BASE + mmap_rnd();
23079 }
23080
23081@@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
23082 void arch_pick_mmap_layout(struct mm_struct *mm)
23083 {
23084 if (mmap_is_legacy()) {
23085- mm->mmap_base = mmap_legacy_base();
23086+ mm->mmap_base = mmap_legacy_base(mm);
23087+
23088+#ifdef CONFIG_PAX_RANDMMAP
23089+ if (mm->pax_flags & MF_PAX_RANDMMAP)
23090+ mm->mmap_base += mm->delta_mmap;
23091+#endif
23092+
23093 mm->get_unmapped_area = arch_get_unmapped_area;
23094 mm->unmap_area = arch_unmap_area;
23095 } else {
23096- mm->mmap_base = mmap_base();
23097+ mm->mmap_base = mmap_base(mm);
23098+
23099+#ifdef CONFIG_PAX_RANDMMAP
23100+ if (mm->pax_flags & MF_PAX_RANDMMAP)
23101+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
23102+#endif
23103+
23104 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
23105 mm->unmap_area = arch_unmap_area_topdown;
23106 }
23107diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
23108index de54b9b..799051e 100644
23109--- a/arch/x86/mm/mmio-mod.c
23110+++ b/arch/x86/mm/mmio-mod.c
23111@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
23112 break;
23113 default:
23114 {
23115- unsigned char *ip = (unsigned char *)instptr;
23116+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
23117 my_trace->opcode = MMIO_UNKNOWN_OP;
23118 my_trace->width = 0;
23119 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
23120@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
23121 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
23122 void __iomem *addr)
23123 {
23124- static atomic_t next_id;
23125+ static atomic_unchecked_t next_id;
23126 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
23127 /* These are page-unaligned. */
23128 struct mmiotrace_map map = {
23129@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
23130 .private = trace
23131 },
23132 .phys = offset,
23133- .id = atomic_inc_return(&next_id)
23134+ .id = atomic_inc_return_unchecked(&next_id)
23135 };
23136 map.map_id = trace->id;
23137
23138diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
23139index b008656..773eac2 100644
23140--- a/arch/x86/mm/pageattr-test.c
23141+++ b/arch/x86/mm/pageattr-test.c
23142@@ -36,7 +36,7 @@ enum {
23143
23144 static int pte_testbit(pte_t pte)
23145 {
23146- return pte_flags(pte) & _PAGE_UNUSED1;
23147+ return pte_flags(pte) & _PAGE_CPA_TEST;
23148 }
23149
23150 struct split_state {
23151diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
23152index f9e5267..6f6e27f 100644
23153--- a/arch/x86/mm/pageattr.c
23154+++ b/arch/x86/mm/pageattr.c
23155@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
23156 */
23157 #ifdef CONFIG_PCI_BIOS
23158 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
23159- pgprot_val(forbidden) |= _PAGE_NX;
23160+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23161 #endif
23162
23163 /*
23164@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
23165 * Does not cover __inittext since that is gone later on. On
23166 * 64bit we do not enforce !NX on the low mapping
23167 */
23168- if (within(address, (unsigned long)_text, (unsigned long)_etext))
23169- pgprot_val(forbidden) |= _PAGE_NX;
23170+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
23171+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23172
23173+#ifdef CONFIG_DEBUG_RODATA
23174 /*
23175 * The .rodata section needs to be read-only. Using the pfn
23176 * catches all aliases.
23177@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
23178 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
23179 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
23180 pgprot_val(forbidden) |= _PAGE_RW;
23181+#endif
23182
23183 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
23184 /*
23185@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
23186 }
23187 #endif
23188
23189+#ifdef CONFIG_PAX_KERNEXEC
23190+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
23191+ pgprot_val(forbidden) |= _PAGE_RW;
23192+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23193+ }
23194+#endif
23195+
23196 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
23197
23198 return prot;
23199@@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
23200 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
23201 {
23202 /* change init_mm */
23203+ pax_open_kernel();
23204 set_pte_atomic(kpte, pte);
23205+
23206 #ifdef CONFIG_X86_32
23207 if (!SHARED_KERNEL_PMD) {
23208+
23209+#ifdef CONFIG_PAX_PER_CPU_PGD
23210+ unsigned long cpu;
23211+#else
23212 struct page *page;
23213+#endif
23214
23215+#ifdef CONFIG_PAX_PER_CPU_PGD
23216+ for (cpu = 0; cpu < NR_CPUS; ++cpu) {
23217+ pgd_t *pgd = get_cpu_pgd(cpu);
23218+#else
23219 list_for_each_entry(page, &pgd_list, lru) {
23220- pgd_t *pgd;
23221+ pgd_t *pgd = (pgd_t *)page_address(page);
23222+#endif
23223+
23224 pud_t *pud;
23225 pmd_t *pmd;
23226
23227- pgd = (pgd_t *)page_address(page) + pgd_index(address);
23228+ pgd += pgd_index(address);
23229 pud = pud_offset(pgd, address);
23230 pmd = pmd_offset(pud, address);
23231 set_pte_atomic((pte_t *)pmd, pte);
23232 }
23233 }
23234 #endif
23235+ pax_close_kernel();
23236 }
23237
23238 static int
23239diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
23240index f6ff57b..481690f 100644
23241--- a/arch/x86/mm/pat.c
23242+++ b/arch/x86/mm/pat.c
23243@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
23244
23245 if (!entry) {
23246 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
23247- current->comm, current->pid, start, end);
23248+ current->comm, task_pid_nr(current), start, end);
23249 return -EINVAL;
23250 }
23251
23252@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
23253 while (cursor < to) {
23254 if (!devmem_is_allowed(pfn)) {
23255 printk(KERN_INFO
23256- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
23257- current->comm, from, to);
23258+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
23259+ current->comm, from, to, cursor);
23260 return 0;
23261 }
23262 cursor += PAGE_SIZE;
23263@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
23264 printk(KERN_INFO
23265 "%s:%d ioremap_change_attr failed %s "
23266 "for %Lx-%Lx\n",
23267- current->comm, current->pid,
23268+ current->comm, task_pid_nr(current),
23269 cattr_name(flags),
23270 base, (unsigned long long)(base + size));
23271 return -EINVAL;
23272@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
23273 if (want_flags != flags) {
23274 printk(KERN_WARNING
23275 "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
23276- current->comm, current->pid,
23277+ current->comm, task_pid_nr(current),
23278 cattr_name(want_flags),
23279 (unsigned long long)paddr,
23280 (unsigned long long)(paddr + size),
23281@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
23282 free_memtype(paddr, paddr + size);
23283 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
23284 " for %Lx-%Lx, got %s\n",
23285- current->comm, current->pid,
23286+ current->comm, task_pid_nr(current),
23287 cattr_name(want_flags),
23288 (unsigned long long)paddr,
23289 (unsigned long long)(paddr + size),
23290diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
23291index 9f0614d..92ae64a 100644
23292--- a/arch/x86/mm/pf_in.c
23293+++ b/arch/x86/mm/pf_in.c
23294@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
23295 int i;
23296 enum reason_type rv = OTHERS;
23297
23298- p = (unsigned char *)ins_addr;
23299+ p = (unsigned char *)ktla_ktva(ins_addr);
23300 p += skip_prefix(p, &prf);
23301 p += get_opcode(p, &opcode);
23302
23303@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
23304 struct prefix_bits prf;
23305 int i;
23306
23307- p = (unsigned char *)ins_addr;
23308+ p = (unsigned char *)ktla_ktva(ins_addr);
23309 p += skip_prefix(p, &prf);
23310 p += get_opcode(p, &opcode);
23311
23312@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
23313 struct prefix_bits prf;
23314 int i;
23315
23316- p = (unsigned char *)ins_addr;
23317+ p = (unsigned char *)ktla_ktva(ins_addr);
23318 p += skip_prefix(p, &prf);
23319 p += get_opcode(p, &opcode);
23320
23321@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
23322 struct prefix_bits prf;
23323 int i;
23324
23325- p = (unsigned char *)ins_addr;
23326+ p = (unsigned char *)ktla_ktva(ins_addr);
23327 p += skip_prefix(p, &prf);
23328 p += get_opcode(p, &opcode);
23329 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
23330@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
23331 struct prefix_bits prf;
23332 int i;
23333
23334- p = (unsigned char *)ins_addr;
23335+ p = (unsigned char *)ktla_ktva(ins_addr);
23336 p += skip_prefix(p, &prf);
23337 p += get_opcode(p, &opcode);
23338 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
23339diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
23340index 8573b83..6372501 100644
23341--- a/arch/x86/mm/pgtable.c
23342+++ b/arch/x86/mm/pgtable.c
23343@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *pgd)
23344 list_del(&page->lru);
23345 }
23346
23347-#define UNSHARED_PTRS_PER_PGD \
23348- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
23349+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23350+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
23351
23352+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
23353+{
23354+ while (count--)
23355+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
23356+}
23357+#endif
23358
23359+#ifdef CONFIG_PAX_PER_CPU_PGD
23360+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
23361+{
23362+ while (count--)
23363+
23364+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23365+ *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
23366+#else
23367+ *dst++ = *src++;
23368+#endif
23369+
23370+}
23371+#endif
23372+
23373+#ifdef CONFIG_X86_64
23374+#define pxd_t pud_t
23375+#define pyd_t pgd_t
23376+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
23377+#define pxd_free(mm, pud) pud_free((mm), (pud))
23378+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
23379+#define pyd_offset(mm ,address) pgd_offset((mm), (address))
23380+#define PYD_SIZE PGDIR_SIZE
23381+#else
23382+#define pxd_t pmd_t
23383+#define pyd_t pud_t
23384+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
23385+#define pxd_free(mm, pud) pmd_free((mm), (pud))
23386+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
23387+#define pyd_offset(mm ,address) pud_offset((mm), (address))
23388+#define PYD_SIZE PUD_SIZE
23389+#endif
23390+
23391+#ifdef CONFIG_PAX_PER_CPU_PGD
23392+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
23393+static inline void pgd_dtor(pgd_t *pgd) {}
23394+#else
23395 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
23396 {
23397 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
23398@@ -128,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
23399 pgd_list_del(pgd);
23400 spin_unlock(&pgd_lock);
23401 }
23402+#endif
23403
23404 /*
23405 * List of all pgd's needed for non-PAE so it can invalidate entries
23406@@ -140,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
23407 * -- wli
23408 */
23409
23410-#ifdef CONFIG_X86_PAE
23411+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
23412 /*
23413 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
23414 * updating the top-level pagetable entries to guarantee the
23415@@ -152,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
23416 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
23417 * and initialize the kernel pmds here.
23418 */
23419-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
23420+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
23421
23422 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
23423 {
23424@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
23425 */
23426 flush_tlb_mm(mm);
23427 }
23428+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
23429+#define PREALLOCATED_PXDS USER_PGD_PTRS
23430 #else /* !CONFIG_X86_PAE */
23431
23432 /* No need to prepopulate any pagetable entries in non-PAE modes. */
23433-#define PREALLOCATED_PMDS 0
23434+#define PREALLOCATED_PXDS 0
23435
23436 #endif /* CONFIG_X86_PAE */
23437
23438-static void free_pmds(pmd_t *pmds[])
23439+static void free_pxds(pxd_t *pxds[])
23440 {
23441 int i;
23442
23443- for(i = 0; i < PREALLOCATED_PMDS; i++)
23444- if (pmds[i])
23445- free_page((unsigned long)pmds[i]);
23446+ for(i = 0; i < PREALLOCATED_PXDS; i++)
23447+ if (pxds[i])
23448+ free_page((unsigned long)pxds[i]);
23449 }
23450
23451-static int preallocate_pmds(pmd_t *pmds[])
23452+static int preallocate_pxds(pxd_t *pxds[])
23453 {
23454 int i;
23455 bool failed = false;
23456
23457- for(i = 0; i < PREALLOCATED_PMDS; i++) {
23458- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
23459- if (pmd == NULL)
23460+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
23461+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
23462+ if (pxd == NULL)
23463 failed = true;
23464- pmds[i] = pmd;
23465+ pxds[i] = pxd;
23466 }
23467
23468 if (failed) {
23469- free_pmds(pmds);
23470+ free_pxds(pxds);
23471 return -ENOMEM;
23472 }
23473
23474@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[])
23475 * preallocate which never got a corresponding vma will need to be
23476 * freed manually.
23477 */
23478-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
23479+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
23480 {
23481 int i;
23482
23483- for(i = 0; i < PREALLOCATED_PMDS; i++) {
23484+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
23485 pgd_t pgd = pgdp[i];
23486
23487 if (pgd_val(pgd) != 0) {
23488- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
23489+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
23490
23491- pgdp[i] = native_make_pgd(0);
23492+ set_pgd(pgdp + i, native_make_pgd(0));
23493
23494- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
23495- pmd_free(mm, pmd);
23496+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
23497+ pxd_free(mm, pxd);
23498 }
23499 }
23500 }
23501
23502-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
23503+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
23504 {
23505- pud_t *pud;
23506+ pyd_t *pyd;
23507 unsigned long addr;
23508 int i;
23509
23510- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
23511+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
23512 return;
23513
23514- pud = pud_offset(pgd, 0);
23515+#ifdef CONFIG_X86_64
23516+ pyd = pyd_offset(mm, 0L);
23517+#else
23518+ pyd = pyd_offset(pgd, 0L);
23519+#endif
23520
23521- for (addr = i = 0; i < PREALLOCATED_PMDS;
23522- i++, pud++, addr += PUD_SIZE) {
23523- pmd_t *pmd = pmds[i];
23524+ for (addr = i = 0; i < PREALLOCATED_PXDS;
23525+ i++, pyd++, addr += PYD_SIZE) {
23526+ pxd_t *pxd = pxds[i];
23527
23528 if (i >= KERNEL_PGD_BOUNDARY)
23529- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
23530- sizeof(pmd_t) * PTRS_PER_PMD);
23531+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
23532+ sizeof(pxd_t) * PTRS_PER_PMD);
23533
23534- pud_populate(mm, pud, pmd);
23535+ pyd_populate(mm, pyd, pxd);
23536 }
23537 }
23538
23539 pgd_t *pgd_alloc(struct mm_struct *mm)
23540 {
23541 pgd_t *pgd;
23542- pmd_t *pmds[PREALLOCATED_PMDS];
23543+ pxd_t *pxds[PREALLOCATED_PXDS];
23544
23545 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
23546
23547@@ -265,11 +314,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
23548
23549 mm->pgd = pgd;
23550
23551- if (preallocate_pmds(pmds) != 0)
23552+ if (preallocate_pxds(pxds) != 0)
23553 goto out_free_pgd;
23554
23555 if (paravirt_pgd_alloc(mm) != 0)
23556- goto out_free_pmds;
23557+ goto out_free_pxds;
23558
23559 /*
23560 * Make sure that pre-populating the pmds is atomic with
23561@@ -279,14 +328,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
23562 spin_lock(&pgd_lock);
23563
23564 pgd_ctor(mm, pgd);
23565- pgd_prepopulate_pmd(mm, pgd, pmds);
23566+ pgd_prepopulate_pxd(mm, pgd, pxds);
23567
23568 spin_unlock(&pgd_lock);
23569
23570 return pgd;
23571
23572-out_free_pmds:
23573- free_pmds(pmds);
23574+out_free_pxds:
23575+ free_pxds(pxds);
23576 out_free_pgd:
23577 free_page((unsigned long)pgd);
23578 out:
23579@@ -295,7 +344,7 @@ out:
23580
23581 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
23582 {
23583- pgd_mop_up_pmds(mm, pgd);
23584+ pgd_mop_up_pxds(mm, pgd);
23585 pgd_dtor(pgd);
23586 paravirt_pgd_free(mm, pgd);
23587 free_page((unsigned long)pgd);
23588diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
23589index cac7184..09a39fa 100644
23590--- a/arch/x86/mm/pgtable_32.c
23591+++ b/arch/x86/mm/pgtable_32.c
23592@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
23593 return;
23594 }
23595 pte = pte_offset_kernel(pmd, vaddr);
23596+
23597+ pax_open_kernel();
23598 if (pte_val(pteval))
23599 set_pte_at(&init_mm, vaddr, pte, pteval);
23600 else
23601 pte_clear(&init_mm, vaddr, pte);
23602+ pax_close_kernel();
23603
23604 /*
23605 * It's enough to flush this one mapping.
23606diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
23607index 410531d..0f16030 100644
23608--- a/arch/x86/mm/setup_nx.c
23609+++ b/arch/x86/mm/setup_nx.c
23610@@ -5,8 +5,10 @@
23611 #include <asm/pgtable.h>
23612 #include <asm/proto.h>
23613
23614+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
23615 static int disable_nx __cpuinitdata;
23616
23617+#ifndef CONFIG_PAX_PAGEEXEC
23618 /*
23619 * noexec = on|off
23620 *
23621@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
23622 return 0;
23623 }
23624 early_param("noexec", noexec_setup);
23625+#endif
23626+
23627+#endif
23628
23629 void __cpuinit x86_configure_nx(void)
23630 {
23631+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
23632 if (cpu_has_nx && !disable_nx)
23633 __supported_pte_mask |= _PAGE_NX;
23634 else
23635+#endif
23636 __supported_pte_mask &= ~_PAGE_NX;
23637 }
23638
23639diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
23640index d6c0418..06a0ad5 100644
23641--- a/arch/x86/mm/tlb.c
23642+++ b/arch/x86/mm/tlb.c
23643@@ -65,7 +65,11 @@ void leave_mm(int cpu)
23644 BUG();
23645 cpumask_clear_cpu(cpu,
23646 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
23647+
23648+#ifndef CONFIG_PAX_PER_CPU_PGD
23649 load_cr3(swapper_pg_dir);
23650+#endif
23651+
23652 }
23653 EXPORT_SYMBOL_GPL(leave_mm);
23654
23655diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
23656index 6687022..ceabcfa 100644
23657--- a/arch/x86/net/bpf_jit.S
23658+++ b/arch/x86/net/bpf_jit.S
23659@@ -9,6 +9,7 @@
23660 */
23661 #include <linux/linkage.h>
23662 #include <asm/dwarf2.h>
23663+#include <asm/alternative-asm.h>
23664
23665 /*
23666 * Calling convention :
23667@@ -35,6 +36,7 @@ sk_load_word:
23668 jle bpf_slow_path_word
23669 mov (SKBDATA,%rsi),%eax
23670 bswap %eax /* ntohl() */
23671+ pax_force_retaddr
23672 ret
23673
23674
23675@@ -53,6 +55,7 @@ sk_load_half:
23676 jle bpf_slow_path_half
23677 movzwl (SKBDATA,%rsi),%eax
23678 rol $8,%ax # ntohs()
23679+ pax_force_retaddr
23680 ret
23681
23682 sk_load_byte_ind:
23683@@ -66,6 +69,7 @@ sk_load_byte:
23684 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
23685 jle bpf_slow_path_byte
23686 movzbl (SKBDATA,%rsi),%eax
23687+ pax_force_retaddr
23688 ret
23689
23690 /**
23691@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
23692 movzbl (SKBDATA,%rsi),%ebx
23693 and $15,%bl
23694 shl $2,%bl
23695+ pax_force_retaddr
23696 ret
23697 CFI_ENDPROC
23698 ENDPROC(sk_load_byte_msh)
23699@@ -91,6 +96,7 @@ bpf_error:
23700 xor %eax,%eax
23701 mov -8(%rbp),%rbx
23702 leaveq
23703+ pax_force_retaddr
23704 ret
23705
23706 /* rsi contains offset and can be scratched */
23707@@ -113,6 +119,7 @@ bpf_slow_path_word:
23708 js bpf_error
23709 mov -12(%rbp),%eax
23710 bswap %eax
23711+ pax_force_retaddr
23712 ret
23713
23714 bpf_slow_path_half:
23715@@ -121,12 +128,14 @@ bpf_slow_path_half:
23716 mov -12(%rbp),%ax
23717 rol $8,%ax
23718 movzwl %ax,%eax
23719+ pax_force_retaddr
23720 ret
23721
23722 bpf_slow_path_byte:
23723 bpf_slow_path_common(1)
23724 js bpf_error
23725 movzbl -12(%rbp),%eax
23726+ pax_force_retaddr
23727 ret
23728
23729 bpf_slow_path_byte_msh:
23730@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
23731 and $15,%al
23732 shl $2,%al
23733 xchg %eax,%ebx
23734+ pax_force_retaddr
23735 ret
23736diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
23737index 7c1b765..3d8ea45 100644
23738--- a/arch/x86/net/bpf_jit_comp.c
23739+++ b/arch/x86/net/bpf_jit_comp.c
23740@@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void *start, void *end)
23741 set_fs(old_fs);
23742 }
23743
23744+struct bpf_jit_work {
23745+ struct work_struct work;
23746+ void *image;
23747+};
23748
23749 void bpf_jit_compile(struct sk_filter *fp)
23750 {
23751@@ -141,6 +145,10 @@ void bpf_jit_compile(struct sk_filter *fp)
23752 if (addrs == NULL)
23753 return;
23754
23755+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
23756+ if (!fp->work)
23757+ goto out;
23758+
23759 /* Before first pass, make a rough estimation of addrs[]
23760 * each bpf instruction is translated to less than 64 bytes
23761 */
23762@@ -476,7 +484,7 @@ void bpf_jit_compile(struct sk_filter *fp)
23763 func = sk_load_word;
23764 common_load: seen |= SEEN_DATAREF;
23765 if ((int)K < 0)
23766- goto out;
23767+ goto error;
23768 t_offset = func - (image + addrs[i]);
23769 EMIT1_off32(0xbe, K); /* mov imm32,%esi */
23770 EMIT1_off32(0xe8, t_offset); /* call */
23771@@ -586,17 +594,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
23772 break;
23773 default:
23774 /* hmm, too complex filter, give up with jit compiler */
23775- goto out;
23776+ goto error;
23777 }
23778 ilen = prog - temp;
23779 if (image) {
23780 if (unlikely(proglen + ilen > oldproglen)) {
23781 pr_err("bpb_jit_compile fatal error\n");
23782- kfree(addrs);
23783- module_free(NULL, image);
23784- return;
23785+ module_free_exec(NULL, image);
23786+ goto error;
23787 }
23788+ pax_open_kernel();
23789 memcpy(image + proglen, temp, ilen);
23790+ pax_close_kernel();
23791 }
23792 proglen += ilen;
23793 addrs[i] = proglen;
23794@@ -617,11 +626,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
23795 break;
23796 }
23797 if (proglen == oldproglen) {
23798- image = module_alloc(max_t(unsigned int,
23799- proglen,
23800- sizeof(struct work_struct)));
23801+ image = module_alloc_exec(proglen);
23802 if (!image)
23803- goto out;
23804+ goto error;
23805 }
23806 oldproglen = proglen;
23807 }
23808@@ -637,7 +644,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
23809 bpf_flush_icache(image, image + proglen);
23810
23811 fp->bpf_func = (void *)image;
23812- }
23813+ } else
23814+error:
23815+ kfree(fp->work);
23816+
23817 out:
23818 kfree(addrs);
23819 return;
23820@@ -645,18 +655,20 @@ out:
23821
23822 static void jit_free_defer(struct work_struct *arg)
23823 {
23824- module_free(NULL, arg);
23825+ module_free_exec(NULL, ((struct bpf_jit_work*)arg)->image);
23826+ kfree(arg);
23827 }
23828
23829 /* run from softirq, we must use a work_struct to call
23830- * module_free() from process context
23831+ * module_free_exec() from process context
23832 */
23833 void bpf_jit_free(struct sk_filter *fp)
23834 {
23835 if (fp->bpf_func != sk_run_filter) {
23836- struct work_struct *work = (struct work_struct *)fp->bpf_func;
23837+ struct work_struct *work = &fp->work->work;
23838
23839 INIT_WORK(work, jit_free_defer);
23840+ fp->work->image = fp->bpf_func;
23841 schedule_work(work);
23842 }
23843 }
23844diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
23845index bff89df..377758a 100644
23846--- a/arch/x86/oprofile/backtrace.c
23847+++ b/arch/x86/oprofile/backtrace.c
23848@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
23849 struct stack_frame_ia32 *fp;
23850 unsigned long bytes;
23851
23852- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
23853+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
23854 if (bytes != sizeof(bufhead))
23855 return NULL;
23856
23857- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
23858+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
23859
23860 oprofile_add_trace(bufhead[0].return_address);
23861
23862@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
23863 struct stack_frame bufhead[2];
23864 unsigned long bytes;
23865
23866- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
23867+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
23868 if (bytes != sizeof(bufhead))
23869 return NULL;
23870
23871@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
23872 {
23873 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
23874
23875- if (!user_mode_vm(regs)) {
23876+ if (!user_mode(regs)) {
23877 unsigned long stack = kernel_stack_pointer(regs);
23878 if (depth)
23879 dump_trace(NULL, regs, (unsigned long *)stack, 0,
23880diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
23881index cb29191..036766d 100644
23882--- a/arch/x86/pci/mrst.c
23883+++ b/arch/x86/pci/mrst.c
23884@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
23885 printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
23886 pci_mmcfg_late_init();
23887 pcibios_enable_irq = mrst_pci_irq_enable;
23888- pci_root_ops = pci_mrst_ops;
23889+ pax_open_kernel();
23890+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
23891+ pax_close_kernel();
23892 /* Continue with standard init */
23893 return 1;
23894 }
23895diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
23896index db0e9a5..8844dea 100644
23897--- a/arch/x86/pci/pcbios.c
23898+++ b/arch/x86/pci/pcbios.c
23899@@ -79,50 +79,93 @@ union bios32 {
23900 static struct {
23901 unsigned long address;
23902 unsigned short segment;
23903-} bios32_indirect = { 0, __KERNEL_CS };
23904+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
23905
23906 /*
23907 * Returns the entry point for the given service, NULL on error
23908 */
23909
23910-static unsigned long bios32_service(unsigned long service)
23911+static unsigned long __devinit bios32_service(unsigned long service)
23912 {
23913 unsigned char return_code; /* %al */
23914 unsigned long address; /* %ebx */
23915 unsigned long length; /* %ecx */
23916 unsigned long entry; /* %edx */
23917 unsigned long flags;
23918+ struct desc_struct d, *gdt;
23919
23920 local_irq_save(flags);
23921- __asm__("lcall *(%%edi); cld"
23922+
23923+ gdt = get_cpu_gdt_table(smp_processor_id());
23924+
23925+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
23926+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
23927+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
23928+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
23929+
23930+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
23931 : "=a" (return_code),
23932 "=b" (address),
23933 "=c" (length),
23934 "=d" (entry)
23935 : "0" (service),
23936 "1" (0),
23937- "D" (&bios32_indirect));
23938+ "D" (&bios32_indirect),
23939+ "r"(__PCIBIOS_DS)
23940+ : "memory");
23941+
23942+ pax_open_kernel();
23943+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
23944+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
23945+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
23946+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
23947+ pax_close_kernel();
23948+
23949 local_irq_restore(flags);
23950
23951 switch (return_code) {
23952- case 0:
23953- return address + entry;
23954- case 0x80: /* Not present */
23955- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
23956- return 0;
23957- default: /* Shouldn't happen */
23958- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
23959- service, return_code);
23960+ case 0: {
23961+ int cpu;
23962+ unsigned char flags;
23963+
23964+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
23965+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
23966+ printk(KERN_WARNING "bios32_service: not valid\n");
23967 return 0;
23968+ }
23969+ address = address + PAGE_OFFSET;
23970+ length += 16UL; /* some BIOSs underreport this... */
23971+ flags = 4;
23972+ if (length >= 64*1024*1024) {
23973+ length >>= PAGE_SHIFT;
23974+ flags |= 8;
23975+ }
23976+
23977+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
23978+ gdt = get_cpu_gdt_table(cpu);
23979+ pack_descriptor(&d, address, length, 0x9b, flags);
23980+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
23981+ pack_descriptor(&d, address, length, 0x93, flags);
23982+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
23983+ }
23984+ return entry;
23985+ }
23986+ case 0x80: /* Not present */
23987+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
23988+ return 0;
23989+ default: /* Shouldn't happen */
23990+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
23991+ service, return_code);
23992+ return 0;
23993 }
23994 }
23995
23996 static struct {
23997 unsigned long address;
23998 unsigned short segment;
23999-} pci_indirect = { 0, __KERNEL_CS };
24000+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
24001
24002-static int pci_bios_present;
24003+static int pci_bios_present __read_only;
24004
24005 static int __devinit check_pcibios(void)
24006 {
24007@@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
24008 unsigned long flags, pcibios_entry;
24009
24010 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
24011- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
24012+ pci_indirect.address = pcibios_entry;
24013
24014 local_irq_save(flags);
24015- __asm__(
24016- "lcall *(%%edi); cld\n\t"
24017+ __asm__("movw %w6, %%ds\n\t"
24018+ "lcall *%%ss:(%%edi); cld\n\t"
24019+ "push %%ss\n\t"
24020+ "pop %%ds\n\t"
24021 "jc 1f\n\t"
24022 "xor %%ah, %%ah\n"
24023 "1:"
24024@@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
24025 "=b" (ebx),
24026 "=c" (ecx)
24027 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
24028- "D" (&pci_indirect)
24029+ "D" (&pci_indirect),
24030+ "r" (__PCIBIOS_DS)
24031 : "memory");
24032 local_irq_restore(flags);
24033
24034@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24035
24036 switch (len) {
24037 case 1:
24038- __asm__("lcall *(%%esi); cld\n\t"
24039+ __asm__("movw %w6, %%ds\n\t"
24040+ "lcall *%%ss:(%%esi); cld\n\t"
24041+ "push %%ss\n\t"
24042+ "pop %%ds\n\t"
24043 "jc 1f\n\t"
24044 "xor %%ah, %%ah\n"
24045 "1:"
24046@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24047 : "1" (PCIBIOS_READ_CONFIG_BYTE),
24048 "b" (bx),
24049 "D" ((long)reg),
24050- "S" (&pci_indirect));
24051+ "S" (&pci_indirect),
24052+ "r" (__PCIBIOS_DS));
24053 /*
24054 * Zero-extend the result beyond 8 bits, do not trust the
24055 * BIOS having done it:
24056@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24057 *value &= 0xff;
24058 break;
24059 case 2:
24060- __asm__("lcall *(%%esi); cld\n\t"
24061+ __asm__("movw %w6, %%ds\n\t"
24062+ "lcall *%%ss:(%%esi); cld\n\t"
24063+ "push %%ss\n\t"
24064+ "pop %%ds\n\t"
24065 "jc 1f\n\t"
24066 "xor %%ah, %%ah\n"
24067 "1:"
24068@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24069 : "1" (PCIBIOS_READ_CONFIG_WORD),
24070 "b" (bx),
24071 "D" ((long)reg),
24072- "S" (&pci_indirect));
24073+ "S" (&pci_indirect),
24074+ "r" (__PCIBIOS_DS));
24075 /*
24076 * Zero-extend the result beyond 16 bits, do not trust the
24077 * BIOS having done it:
24078@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24079 *value &= 0xffff;
24080 break;
24081 case 4:
24082- __asm__("lcall *(%%esi); cld\n\t"
24083+ __asm__("movw %w6, %%ds\n\t"
24084+ "lcall *%%ss:(%%esi); cld\n\t"
24085+ "push %%ss\n\t"
24086+ "pop %%ds\n\t"
24087 "jc 1f\n\t"
24088 "xor %%ah, %%ah\n"
24089 "1:"
24090@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24091 : "1" (PCIBIOS_READ_CONFIG_DWORD),
24092 "b" (bx),
24093 "D" ((long)reg),
24094- "S" (&pci_indirect));
24095+ "S" (&pci_indirect),
24096+ "r" (__PCIBIOS_DS));
24097 break;
24098 }
24099
24100@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
24101
24102 switch (len) {
24103 case 1:
24104- __asm__("lcall *(%%esi); cld\n\t"
24105+ __asm__("movw %w6, %%ds\n\t"
24106+ "lcall *%%ss:(%%esi); cld\n\t"
24107+ "push %%ss\n\t"
24108+ "pop %%ds\n\t"
24109 "jc 1f\n\t"
24110 "xor %%ah, %%ah\n"
24111 "1:"
24112@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
24113 "c" (value),
24114 "b" (bx),
24115 "D" ((long)reg),
24116- "S" (&pci_indirect));
24117+ "S" (&pci_indirect),
24118+ "r" (__PCIBIOS_DS));
24119 break;
24120 case 2:
24121- __asm__("lcall *(%%esi); cld\n\t"
24122+ __asm__("movw %w6, %%ds\n\t"
24123+ "lcall *%%ss:(%%esi); cld\n\t"
24124+ "push %%ss\n\t"
24125+ "pop %%ds\n\t"
24126 "jc 1f\n\t"
24127 "xor %%ah, %%ah\n"
24128 "1:"
24129@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
24130 "c" (value),
24131 "b" (bx),
24132 "D" ((long)reg),
24133- "S" (&pci_indirect));
24134+ "S" (&pci_indirect),
24135+ "r" (__PCIBIOS_DS));
24136 break;
24137 case 4:
24138- __asm__("lcall *(%%esi); cld\n\t"
24139+ __asm__("movw %w6, %%ds\n\t"
24140+ "lcall *%%ss:(%%esi); cld\n\t"
24141+ "push %%ss\n\t"
24142+ "pop %%ds\n\t"
24143 "jc 1f\n\t"
24144 "xor %%ah, %%ah\n"
24145 "1:"
24146@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
24147 "c" (value),
24148 "b" (bx),
24149 "D" ((long)reg),
24150- "S" (&pci_indirect));
24151+ "S" (&pci_indirect),
24152+ "r" (__PCIBIOS_DS));
24153 break;
24154 }
24155
24156@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
24157
24158 DBG("PCI: Fetching IRQ routing table... ");
24159 __asm__("push %%es\n\t"
24160+ "movw %w8, %%ds\n\t"
24161 "push %%ds\n\t"
24162 "pop %%es\n\t"
24163- "lcall *(%%esi); cld\n\t"
24164+ "lcall *%%ss:(%%esi); cld\n\t"
24165 "pop %%es\n\t"
24166+ "push %%ss\n\t"
24167+ "pop %%ds\n"
24168 "jc 1f\n\t"
24169 "xor %%ah, %%ah\n"
24170 "1:"
24171@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
24172 "1" (0),
24173 "D" ((long) &opt),
24174 "S" (&pci_indirect),
24175- "m" (opt)
24176+ "m" (opt),
24177+ "r" (__PCIBIOS_DS)
24178 : "memory");
24179 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
24180 if (ret & 0xff00)
24181@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
24182 {
24183 int ret;
24184
24185- __asm__("lcall *(%%esi); cld\n\t"
24186+ __asm__("movw %w5, %%ds\n\t"
24187+ "lcall *%%ss:(%%esi); cld\n\t"
24188+ "push %%ss\n\t"
24189+ "pop %%ds\n"
24190 "jc 1f\n\t"
24191 "xor %%ah, %%ah\n"
24192 "1:"
24193@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
24194 : "0" (PCIBIOS_SET_PCI_HW_INT),
24195 "b" ((dev->bus->number << 8) | dev->devfn),
24196 "c" ((irq << 8) | (pin + 10)),
24197- "S" (&pci_indirect));
24198+ "S" (&pci_indirect),
24199+ "r" (__PCIBIOS_DS));
24200 return !(ret & 0xff00);
24201 }
24202 EXPORT_SYMBOL(pcibios_set_irq_routing);
24203diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
24204index 40e4469..1ab536e 100644
24205--- a/arch/x86/platform/efi/efi_32.c
24206+++ b/arch/x86/platform/efi/efi_32.c
24207@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
24208 {
24209 struct desc_ptr gdt_descr;
24210
24211+#ifdef CONFIG_PAX_KERNEXEC
24212+ struct desc_struct d;
24213+#endif
24214+
24215 local_irq_save(efi_rt_eflags);
24216
24217 load_cr3(initial_page_table);
24218 __flush_tlb_all();
24219
24220+#ifdef CONFIG_PAX_KERNEXEC
24221+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
24222+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
24223+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
24224+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
24225+#endif
24226+
24227 gdt_descr.address = __pa(get_cpu_gdt_table(0));
24228 gdt_descr.size = GDT_SIZE - 1;
24229 load_gdt(&gdt_descr);
24230@@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
24231 {
24232 struct desc_ptr gdt_descr;
24233
24234+#ifdef CONFIG_PAX_KERNEXEC
24235+ struct desc_struct d;
24236+
24237+ memset(&d, 0, sizeof d);
24238+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
24239+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
24240+#endif
24241+
24242 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
24243 gdt_descr.size = GDT_SIZE - 1;
24244 load_gdt(&gdt_descr);
24245diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
24246index fbe66e6..c5c0dd2 100644
24247--- a/arch/x86/platform/efi/efi_stub_32.S
24248+++ b/arch/x86/platform/efi/efi_stub_32.S
24249@@ -6,7 +6,9 @@
24250 */
24251
24252 #include <linux/linkage.h>
24253+#include <linux/init.h>
24254 #include <asm/page_types.h>
24255+#include <asm/segment.h>
24256
24257 /*
24258 * efi_call_phys(void *, ...) is a function with variable parameters.
24259@@ -20,7 +22,7 @@
24260 * service functions will comply with gcc calling convention, too.
24261 */
24262
24263-.text
24264+__INIT
24265 ENTRY(efi_call_phys)
24266 /*
24267 * 0. The function can only be called in Linux kernel. So CS has been
24268@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
24269 * The mapping of lower virtual memory has been created in prelog and
24270 * epilog.
24271 */
24272- movl $1f, %edx
24273- subl $__PAGE_OFFSET, %edx
24274- jmp *%edx
24275+ movl $(__KERNEXEC_EFI_DS), %edx
24276+ mov %edx, %ds
24277+ mov %edx, %es
24278+ mov %edx, %ss
24279+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
24280 1:
24281
24282 /*
24283@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
24284 * parameter 2, ..., param n. To make things easy, we save the return
24285 * address of efi_call_phys in a global variable.
24286 */
24287- popl %edx
24288- movl %edx, saved_return_addr
24289- /* get the function pointer into ECX*/
24290- popl %ecx
24291- movl %ecx, efi_rt_function_ptr
24292- movl $2f, %edx
24293- subl $__PAGE_OFFSET, %edx
24294- pushl %edx
24295+ popl (saved_return_addr)
24296+ popl (efi_rt_function_ptr)
24297
24298 /*
24299 * 3. Clear PG bit in %CR0.
24300@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
24301 /*
24302 * 5. Call the physical function.
24303 */
24304- jmp *%ecx
24305+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
24306
24307-2:
24308 /*
24309 * 6. After EFI runtime service returns, control will return to
24310 * following instruction. We'd better readjust stack pointer first.
24311@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
24312 movl %cr0, %edx
24313 orl $0x80000000, %edx
24314 movl %edx, %cr0
24315- jmp 1f
24316-1:
24317+
24318 /*
24319 * 8. Now restore the virtual mode from flat mode by
24320 * adding EIP with PAGE_OFFSET.
24321 */
24322- movl $1f, %edx
24323- jmp *%edx
24324+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
24325 1:
24326+ movl $(__KERNEL_DS), %edx
24327+ mov %edx, %ds
24328+ mov %edx, %es
24329+ mov %edx, %ss
24330
24331 /*
24332 * 9. Balance the stack. And because EAX contain the return value,
24333 * we'd better not clobber it.
24334 */
24335- leal efi_rt_function_ptr, %edx
24336- movl (%edx), %ecx
24337- pushl %ecx
24338+ pushl (efi_rt_function_ptr)
24339
24340 /*
24341- * 10. Push the saved return address onto the stack and return.
24342+ * 10. Return to the saved return address.
24343 */
24344- leal saved_return_addr, %edx
24345- movl (%edx), %ecx
24346- pushl %ecx
24347- ret
24348+ jmpl *(saved_return_addr)
24349 ENDPROC(efi_call_phys)
24350 .previous
24351
24352-.data
24353+__INITDATA
24354 saved_return_addr:
24355 .long 0
24356 efi_rt_function_ptr:
24357diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
24358index 4c07cca..2c8427d 100644
24359--- a/arch/x86/platform/efi/efi_stub_64.S
24360+++ b/arch/x86/platform/efi/efi_stub_64.S
24361@@ -7,6 +7,7 @@
24362 */
24363
24364 #include <linux/linkage.h>
24365+#include <asm/alternative-asm.h>
24366
24367 #define SAVE_XMM \
24368 mov %rsp, %rax; \
24369@@ -40,6 +41,7 @@ ENTRY(efi_call0)
24370 call *%rdi
24371 addq $32, %rsp
24372 RESTORE_XMM
24373+ pax_force_retaddr 0, 1
24374 ret
24375 ENDPROC(efi_call0)
24376
24377@@ -50,6 +52,7 @@ ENTRY(efi_call1)
24378 call *%rdi
24379 addq $32, %rsp
24380 RESTORE_XMM
24381+ pax_force_retaddr 0, 1
24382 ret
24383 ENDPROC(efi_call1)
24384
24385@@ -60,6 +63,7 @@ ENTRY(efi_call2)
24386 call *%rdi
24387 addq $32, %rsp
24388 RESTORE_XMM
24389+ pax_force_retaddr 0, 1
24390 ret
24391 ENDPROC(efi_call2)
24392
24393@@ -71,6 +75,7 @@ ENTRY(efi_call3)
24394 call *%rdi
24395 addq $32, %rsp
24396 RESTORE_XMM
24397+ pax_force_retaddr 0, 1
24398 ret
24399 ENDPROC(efi_call3)
24400
24401@@ -83,6 +88,7 @@ ENTRY(efi_call4)
24402 call *%rdi
24403 addq $32, %rsp
24404 RESTORE_XMM
24405+ pax_force_retaddr 0, 1
24406 ret
24407 ENDPROC(efi_call4)
24408
24409@@ -96,6 +102,7 @@ ENTRY(efi_call5)
24410 call *%rdi
24411 addq $48, %rsp
24412 RESTORE_XMM
24413+ pax_force_retaddr 0, 1
24414 ret
24415 ENDPROC(efi_call5)
24416
24417@@ -112,5 +119,6 @@ ENTRY(efi_call6)
24418 call *%rdi
24419 addq $48, %rsp
24420 RESTORE_XMM
24421+ pax_force_retaddr 0, 1
24422 ret
24423 ENDPROC(efi_call6)
24424diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
24425index ad4ec1c..686479e 100644
24426--- a/arch/x86/platform/mrst/mrst.c
24427+++ b/arch/x86/platform/mrst/mrst.c
24428@@ -76,18 +76,20 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
24429 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
24430 int sfi_mrtc_num;
24431
24432-static void mrst_power_off(void)
24433+static __noreturn void mrst_power_off(void)
24434 {
24435 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
24436 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 1);
24437+ BUG();
24438 }
24439
24440-static void mrst_reboot(void)
24441+static __noreturn void mrst_reboot(void)
24442 {
24443 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
24444 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
24445 else
24446 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
24447+ BUG();
24448 }
24449
24450 /* parse all the mtimer info to a static mtimer array */
24451diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
24452index f10c0af..3ec1f95 100644
24453--- a/arch/x86/power/cpu.c
24454+++ b/arch/x86/power/cpu.c
24455@@ -131,7 +131,7 @@ static void do_fpu_end(void)
24456 static void fix_processor_context(void)
24457 {
24458 int cpu = smp_processor_id();
24459- struct tss_struct *t = &per_cpu(init_tss, cpu);
24460+ struct tss_struct *t = init_tss + cpu;
24461
24462 set_tss_desc(cpu, t); /*
24463 * This just modifies memory; should not be
24464@@ -141,7 +141,9 @@ static void fix_processor_context(void)
24465 */
24466
24467 #ifdef CONFIG_X86_64
24468+ pax_open_kernel();
24469 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
24470+ pax_close_kernel();
24471
24472 syscall_init(); /* This sets MSR_*STAR and related */
24473 #endif
24474diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
24475index 5d17950..2253fc9 100644
24476--- a/arch/x86/vdso/Makefile
24477+++ b/arch/x86/vdso/Makefile
24478@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
24479 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
24480 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
24481
24482-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
24483+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
24484 GCOV_PROFILE := n
24485
24486 #
24487diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
24488index 468d591..8e80a0a 100644
24489--- a/arch/x86/vdso/vdso32-setup.c
24490+++ b/arch/x86/vdso/vdso32-setup.c
24491@@ -25,6 +25,7 @@
24492 #include <asm/tlbflush.h>
24493 #include <asm/vdso.h>
24494 #include <asm/proto.h>
24495+#include <asm/mman.h>
24496
24497 enum {
24498 VDSO_DISABLED = 0,
24499@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
24500 void enable_sep_cpu(void)
24501 {
24502 int cpu = get_cpu();
24503- struct tss_struct *tss = &per_cpu(init_tss, cpu);
24504+ struct tss_struct *tss = init_tss + cpu;
24505
24506 if (!boot_cpu_has(X86_FEATURE_SEP)) {
24507 put_cpu();
24508@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
24509 gate_vma.vm_start = FIXADDR_USER_START;
24510 gate_vma.vm_end = FIXADDR_USER_END;
24511 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
24512- gate_vma.vm_page_prot = __P101;
24513+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
24514 /*
24515 * Make sure the vDSO gets into every core dump.
24516 * Dumping its contents makes post-mortem fully interpretable later
24517@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
24518 if (compat)
24519 addr = VDSO_HIGH_BASE;
24520 else {
24521- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
24522+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
24523 if (IS_ERR_VALUE(addr)) {
24524 ret = addr;
24525 goto up_fail;
24526 }
24527 }
24528
24529- current->mm->context.vdso = (void *)addr;
24530+ current->mm->context.vdso = addr;
24531
24532 if (compat_uses_vma || !compat) {
24533 /*
24534@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
24535 }
24536
24537 current_thread_info()->sysenter_return =
24538- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
24539+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
24540
24541 up_fail:
24542 if (ret)
24543- current->mm->context.vdso = NULL;
24544+ current->mm->context.vdso = 0;
24545
24546 up_write(&mm->mmap_sem);
24547
24548@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
24549
24550 const char *arch_vma_name(struct vm_area_struct *vma)
24551 {
24552- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
24553+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
24554 return "[vdso]";
24555+
24556+#ifdef CONFIG_PAX_SEGMEXEC
24557+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
24558+ return "[vdso]";
24559+#endif
24560+
24561 return NULL;
24562 }
24563
24564@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
24565 * Check to see if the corresponding task was created in compat vdso
24566 * mode.
24567 */
24568- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
24569+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
24570 return &gate_vma;
24571 return NULL;
24572 }
24573diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
24574index 153407c..611cba9 100644
24575--- a/arch/x86/vdso/vma.c
24576+++ b/arch/x86/vdso/vma.c
24577@@ -16,8 +16,6 @@
24578 #include <asm/vdso.h>
24579 #include <asm/page.h>
24580
24581-unsigned int __read_mostly vdso_enabled = 1;
24582-
24583 extern char vdso_start[], vdso_end[];
24584 extern unsigned short vdso_sync_cpuid;
24585
24586@@ -96,7 +94,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
24587 * unaligned here as a result of stack start randomization.
24588 */
24589 addr = PAGE_ALIGN(addr);
24590- addr = align_addr(addr, NULL, ALIGN_VDSO);
24591
24592 return addr;
24593 }
24594@@ -106,40 +103,35 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
24595 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
24596 {
24597 struct mm_struct *mm = current->mm;
24598- unsigned long addr;
24599+ unsigned long addr = 0;
24600 int ret;
24601
24602- if (!vdso_enabled)
24603- return 0;
24604-
24605 down_write(&mm->mmap_sem);
24606+
24607+#ifdef CONFIG_PAX_RANDMMAP
24608+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
24609+#endif
24610+
24611 addr = vdso_addr(mm->start_stack, vdso_size);
24612+ addr = align_addr(addr, NULL, ALIGN_VDSO);
24613 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
24614 if (IS_ERR_VALUE(addr)) {
24615 ret = addr;
24616 goto up_fail;
24617 }
24618
24619- current->mm->context.vdso = (void *)addr;
24620+ mm->context.vdso = addr;
24621
24622 ret = install_special_mapping(mm, addr, vdso_size,
24623 VM_READ|VM_EXEC|
24624 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
24625 VM_ALWAYSDUMP,
24626 vdso_pages);
24627- if (ret) {
24628- current->mm->context.vdso = NULL;
24629- goto up_fail;
24630- }
24631+
24632+ if (ret)
24633+ mm->context.vdso = 0;
24634
24635 up_fail:
24636 up_write(&mm->mmap_sem);
24637 return ret;
24638 }
24639-
24640-static __init int vdso_setup(char *s)
24641-{
24642- vdso_enabled = simple_strtoul(s, NULL, 0);
24643- return 0;
24644-}
24645-__setup("vdso=", vdso_setup);
24646diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
24647index 1f92865..c843b20 100644
24648--- a/arch/x86/xen/enlighten.c
24649+++ b/arch/x86/xen/enlighten.c
24650@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
24651
24652 struct shared_info xen_dummy_shared_info;
24653
24654-void *xen_initial_gdt;
24655-
24656 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
24657 __read_mostly int xen_have_vector_callback;
24658 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
24659@@ -1029,7 +1027,7 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
24660 #endif
24661 };
24662
24663-static void xen_reboot(int reason)
24664+static __noreturn void xen_reboot(int reason)
24665 {
24666 struct sched_shutdown r = { .reason = reason };
24667
24668@@ -1037,17 +1035,17 @@ static void xen_reboot(int reason)
24669 BUG();
24670 }
24671
24672-static void xen_restart(char *msg)
24673+static __noreturn void xen_restart(char *msg)
24674 {
24675 xen_reboot(SHUTDOWN_reboot);
24676 }
24677
24678-static void xen_emergency_restart(void)
24679+static __noreturn void xen_emergency_restart(void)
24680 {
24681 xen_reboot(SHUTDOWN_reboot);
24682 }
24683
24684-static void xen_machine_halt(void)
24685+static __noreturn void xen_machine_halt(void)
24686 {
24687 xen_reboot(SHUTDOWN_poweroff);
24688 }
24689@@ -1153,7 +1151,17 @@ asmlinkage void __init xen_start_kernel(void)
24690 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
24691
24692 /* Work out if we support NX */
24693- x86_configure_nx();
24694+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
24695+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
24696+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
24697+ unsigned l, h;
24698+
24699+ __supported_pte_mask |= _PAGE_NX;
24700+ rdmsr(MSR_EFER, l, h);
24701+ l |= EFER_NX;
24702+ wrmsr(MSR_EFER, l, h);
24703+ }
24704+#endif
24705
24706 xen_setup_features();
24707
24708@@ -1184,13 +1192,6 @@ asmlinkage void __init xen_start_kernel(void)
24709
24710 machine_ops = xen_machine_ops;
24711
24712- /*
24713- * The only reliable way to retain the initial address of the
24714- * percpu gdt_page is to remember it here, so we can go and
24715- * mark it RW later, when the initial percpu area is freed.
24716- */
24717- xen_initial_gdt = &per_cpu(gdt_page, 0);
24718-
24719 xen_smp_init();
24720
24721 #ifdef CONFIG_ACPI_NUMA
24722diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
24723index 87f6673..e2555a6 100644
24724--- a/arch/x86/xen/mmu.c
24725+++ b/arch/x86/xen/mmu.c
24726@@ -1733,6 +1733,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
24727 convert_pfn_mfn(init_level4_pgt);
24728 convert_pfn_mfn(level3_ident_pgt);
24729 convert_pfn_mfn(level3_kernel_pgt);
24730+ convert_pfn_mfn(level3_vmalloc_start_pgt);
24731+ convert_pfn_mfn(level3_vmalloc_end_pgt);
24732+ convert_pfn_mfn(level3_vmemmap_pgt);
24733
24734 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
24735 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
24736@@ -1751,7 +1754,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
24737 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
24738 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
24739 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
24740+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
24741+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
24742+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
24743 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
24744+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
24745 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
24746 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
24747
24748@@ -1962,6 +1969,7 @@ static void __init xen_post_allocator_init(void)
24749 pv_mmu_ops.set_pud = xen_set_pud;
24750 #if PAGETABLE_LEVELS == 4
24751 pv_mmu_ops.set_pgd = xen_set_pgd;
24752+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
24753 #endif
24754
24755 /* This will work as long as patching hasn't happened yet
24756@@ -2043,6 +2051,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
24757 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
24758 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
24759 .set_pgd = xen_set_pgd_hyper,
24760+ .set_pgd_batched = xen_set_pgd_hyper,
24761
24762 .alloc_pud = xen_alloc_pmd_init,
24763 .release_pud = xen_release_pmd_init,
24764diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
24765index 041d4fe..7666b7e 100644
24766--- a/arch/x86/xen/smp.c
24767+++ b/arch/x86/xen/smp.c
24768@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
24769 {
24770 BUG_ON(smp_processor_id() != 0);
24771 native_smp_prepare_boot_cpu();
24772-
24773- /* We've switched to the "real" per-cpu gdt, so make sure the
24774- old memory can be recycled */
24775- make_lowmem_page_readwrite(xen_initial_gdt);
24776-
24777 xen_filter_cpu_maps();
24778 xen_setup_vcpu_info_placement();
24779 }
24780@@ -275,12 +270,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
24781 gdt = get_cpu_gdt_table(cpu);
24782
24783 ctxt->flags = VGCF_IN_KERNEL;
24784- ctxt->user_regs.ds = __USER_DS;
24785- ctxt->user_regs.es = __USER_DS;
24786+ ctxt->user_regs.ds = __KERNEL_DS;
24787+ ctxt->user_regs.es = __KERNEL_DS;
24788 ctxt->user_regs.ss = __KERNEL_DS;
24789 #ifdef CONFIG_X86_32
24790 ctxt->user_regs.fs = __KERNEL_PERCPU;
24791- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
24792+ savesegment(gs, ctxt->user_regs.gs);
24793 #else
24794 ctxt->gs_base_kernel = per_cpu_offset(cpu);
24795 #endif
24796@@ -331,13 +326,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
24797 int rc;
24798
24799 per_cpu(current_task, cpu) = idle;
24800+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
24801 #ifdef CONFIG_X86_32
24802 irq_ctx_init(cpu);
24803 #else
24804 clear_tsk_thread_flag(idle, TIF_FORK);
24805- per_cpu(kernel_stack, cpu) =
24806- (unsigned long)task_stack_page(idle) -
24807- KERNEL_STACK_OFFSET + THREAD_SIZE;
24808+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
24809 #endif
24810 xen_setup_runstate_info(cpu);
24811 xen_setup_timer(cpu);
24812diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
24813index b040b0e..8cc4fe0 100644
24814--- a/arch/x86/xen/xen-asm_32.S
24815+++ b/arch/x86/xen/xen-asm_32.S
24816@@ -83,14 +83,14 @@ ENTRY(xen_iret)
24817 ESP_OFFSET=4 # bytes pushed onto stack
24818
24819 /*
24820- * Store vcpu_info pointer for easy access. Do it this way to
24821- * avoid having to reload %fs
24822+ * Store vcpu_info pointer for easy access.
24823 */
24824 #ifdef CONFIG_SMP
24825- GET_THREAD_INFO(%eax)
24826- movl TI_cpu(%eax), %eax
24827- movl __per_cpu_offset(,%eax,4), %eax
24828- mov xen_vcpu(%eax), %eax
24829+ push %fs
24830+ mov $(__KERNEL_PERCPU), %eax
24831+ mov %eax, %fs
24832+ mov PER_CPU_VAR(xen_vcpu), %eax
24833+ pop %fs
24834 #else
24835 movl xen_vcpu, %eax
24836 #endif
24837diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
24838index aaa7291..3f77960 100644
24839--- a/arch/x86/xen/xen-head.S
24840+++ b/arch/x86/xen/xen-head.S
24841@@ -19,6 +19,17 @@ ENTRY(startup_xen)
24842 #ifdef CONFIG_X86_32
24843 mov %esi,xen_start_info
24844 mov $init_thread_union+THREAD_SIZE,%esp
24845+#ifdef CONFIG_SMP
24846+ movl $cpu_gdt_table,%edi
24847+ movl $__per_cpu_load,%eax
24848+ movw %ax,__KERNEL_PERCPU + 2(%edi)
24849+ rorl $16,%eax
24850+ movb %al,__KERNEL_PERCPU + 4(%edi)
24851+ movb %ah,__KERNEL_PERCPU + 7(%edi)
24852+ movl $__per_cpu_end - 1,%eax
24853+ subl $__per_cpu_start,%eax
24854+ movw %ax,__KERNEL_PERCPU + 0(%edi)
24855+#endif
24856 #else
24857 mov %rsi,xen_start_info
24858 mov $init_thread_union+THREAD_SIZE,%rsp
24859diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
24860index b095739..8c17bcd 100644
24861--- a/arch/x86/xen/xen-ops.h
24862+++ b/arch/x86/xen/xen-ops.h
24863@@ -10,8 +10,6 @@
24864 extern const char xen_hypervisor_callback[];
24865 extern const char xen_failsafe_callback[];
24866
24867-extern void *xen_initial_gdt;
24868-
24869 struct trap_info;
24870 void xen_copy_trap_info(struct trap_info *traps);
24871
24872diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
24873index 58916af..9cb880b 100644
24874--- a/block/blk-iopoll.c
24875+++ b/block/blk-iopoll.c
24876@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
24877 }
24878 EXPORT_SYMBOL(blk_iopoll_complete);
24879
24880-static void blk_iopoll_softirq(struct softirq_action *h)
24881+static void blk_iopoll_softirq(void)
24882 {
24883 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
24884 int rearm = 0, budget = blk_iopoll_budget;
24885diff --git a/block/blk-map.c b/block/blk-map.c
24886index 623e1cd..ca1e109 100644
24887--- a/block/blk-map.c
24888+++ b/block/blk-map.c
24889@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
24890 if (!len || !kbuf)
24891 return -EINVAL;
24892
24893- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
24894+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
24895 if (do_copy)
24896 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
24897 else
24898diff --git a/block/blk-softirq.c b/block/blk-softirq.c
24899index 1366a89..e17f54b 100644
24900--- a/block/blk-softirq.c
24901+++ b/block/blk-softirq.c
24902@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
24903 * Softirq action handler - move entries to local list and loop over them
24904 * while passing them to the queue registered handler.
24905 */
24906-static void blk_done_softirq(struct softirq_action *h)
24907+static void blk_done_softirq(void)
24908 {
24909 struct list_head *cpu_list, local_list;
24910
24911diff --git a/block/bsg.c b/block/bsg.c
24912index 702f131..37808bf 100644
24913--- a/block/bsg.c
24914+++ b/block/bsg.c
24915@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
24916 struct sg_io_v4 *hdr, struct bsg_device *bd,
24917 fmode_t has_write_perm)
24918 {
24919+ unsigned char tmpcmd[sizeof(rq->__cmd)];
24920+ unsigned char *cmdptr;
24921+
24922 if (hdr->request_len > BLK_MAX_CDB) {
24923 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
24924 if (!rq->cmd)
24925 return -ENOMEM;
24926- }
24927+ cmdptr = rq->cmd;
24928+ } else
24929+ cmdptr = tmpcmd;
24930
24931- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
24932+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
24933 hdr->request_len))
24934 return -EFAULT;
24935
24936+ if (cmdptr != rq->cmd)
24937+ memcpy(rq->cmd, cmdptr, hdr->request_len);
24938+
24939 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
24940 if (blk_verify_command(rq->cmd, has_write_perm))
24941 return -EPERM;
24942diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
24943index 7b72502..646105c 100644
24944--- a/block/compat_ioctl.c
24945+++ b/block/compat_ioctl.c
24946@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
24947 err |= __get_user(f->spec1, &uf->spec1);
24948 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
24949 err |= __get_user(name, &uf->name);
24950- f->name = compat_ptr(name);
24951+ f->name = (void __force_kernel *)compat_ptr(name);
24952 if (err) {
24953 err = -EFAULT;
24954 goto out;
24955diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
24956index 688be8a..8a37d98 100644
24957--- a/block/scsi_ioctl.c
24958+++ b/block/scsi_ioctl.c
24959@@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
24960 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
24961 struct sg_io_hdr *hdr, fmode_t mode)
24962 {
24963- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
24964+ unsigned char tmpcmd[sizeof(rq->__cmd)];
24965+ unsigned char *cmdptr;
24966+
24967+ if (rq->cmd != rq->__cmd)
24968+ cmdptr = rq->cmd;
24969+ else
24970+ cmdptr = tmpcmd;
24971+
24972+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
24973 return -EFAULT;
24974+
24975+ if (cmdptr != rq->cmd)
24976+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
24977+
24978 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
24979 return -EPERM;
24980
24981@@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
24982 int err;
24983 unsigned int in_len, out_len, bytes, opcode, cmdlen;
24984 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
24985+ unsigned char tmpcmd[sizeof(rq->__cmd)];
24986+ unsigned char *cmdptr;
24987
24988 if (!sic)
24989 return -EINVAL;
24990@@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
24991 */
24992 err = -EFAULT;
24993 rq->cmd_len = cmdlen;
24994- if (copy_from_user(rq->cmd, sic->data, cmdlen))
24995+
24996+ if (rq->cmd != rq->__cmd)
24997+ cmdptr = rq->cmd;
24998+ else
24999+ cmdptr = tmpcmd;
25000+
25001+ if (copy_from_user(cmdptr, sic->data, cmdlen))
25002 goto error;
25003
25004+ if (rq->cmd != cmdptr)
25005+ memcpy(rq->cmd, cmdptr, cmdlen);
25006+
25007 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
25008 goto error;
25009
25010diff --git a/crypto/cryptd.c b/crypto/cryptd.c
25011index 671d4d6..5f24030 100644
25012--- a/crypto/cryptd.c
25013+++ b/crypto/cryptd.c
25014@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
25015
25016 struct cryptd_blkcipher_request_ctx {
25017 crypto_completion_t complete;
25018-};
25019+} __no_const;
25020
25021 struct cryptd_hash_ctx {
25022 struct crypto_shash *child;
25023@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
25024
25025 struct cryptd_aead_request_ctx {
25026 crypto_completion_t complete;
25027-};
25028+} __no_const;
25029
25030 static void cryptd_queue_worker(struct work_struct *work);
25031
25032diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
25033index 5d41894..22021e4 100644
25034--- a/drivers/acpi/apei/cper.c
25035+++ b/drivers/acpi/apei/cper.c
25036@@ -38,12 +38,12 @@
25037 */
25038 u64 cper_next_record_id(void)
25039 {
25040- static atomic64_t seq;
25041+ static atomic64_unchecked_t seq;
25042
25043- if (!atomic64_read(&seq))
25044- atomic64_set(&seq, ((u64)get_seconds()) << 32);
25045+ if (!atomic64_read_unchecked(&seq))
25046+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
25047
25048- return atomic64_inc_return(&seq);
25049+ return atomic64_inc_return_unchecked(&seq);
25050 }
25051 EXPORT_SYMBOL_GPL(cper_next_record_id);
25052
25053diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
25054index 6c47ae9..8ab9132 100644
25055--- a/drivers/acpi/ec_sys.c
25056+++ b/drivers/acpi/ec_sys.c
25057@@ -12,6 +12,7 @@
25058 #include <linux/acpi.h>
25059 #include <linux/debugfs.h>
25060 #include <linux/module.h>
25061+#include <asm/uaccess.h>
25062 #include "internal.h"
25063
25064 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
25065@@ -40,7 +41,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
25066 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
25067 */
25068 unsigned int size = EC_SPACE_SIZE;
25069- u8 *data = (u8 *) buf;
25070+ u8 data;
25071 loff_t init_off = *off;
25072 int err = 0;
25073
25074@@ -53,9 +54,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
25075 size = count;
25076
25077 while (size) {
25078- err = ec_read(*off, &data[*off - init_off]);
25079+ err = ec_read(*off, &data);
25080 if (err)
25081 return err;
25082+ if (put_user(data, &buf[*off - init_off]))
25083+ return -EFAULT;
25084 *off += 1;
25085 size--;
25086 }
25087@@ -71,7 +74,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
25088
25089 unsigned int size = count;
25090 loff_t init_off = *off;
25091- u8 *data = (u8 *) buf;
25092 int err = 0;
25093
25094 if (*off >= EC_SPACE_SIZE)
25095@@ -82,7 +84,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
25096 }
25097
25098 while (size) {
25099- u8 byte_write = data[*off - init_off];
25100+ u8 byte_write;
25101+ if (get_user(byte_write, &buf[*off - init_off]))
25102+ return -EFAULT;
25103 err = ec_write(*off, byte_write);
25104 if (err)
25105 return err;
25106diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
25107index 251c7b62..000462d 100644
25108--- a/drivers/acpi/proc.c
25109+++ b/drivers/acpi/proc.c
25110@@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
25111 size_t count, loff_t * ppos)
25112 {
25113 struct list_head *node, *next;
25114- char strbuf[5];
25115- char str[5] = "";
25116- unsigned int len = count;
25117+ char strbuf[5] = {0};
25118
25119- if (len > 4)
25120- len = 4;
25121- if (len < 0)
25122+ if (count > 4)
25123+ count = 4;
25124+ if (copy_from_user(strbuf, buffer, count))
25125 return -EFAULT;
25126-
25127- if (copy_from_user(strbuf, buffer, len))
25128- return -EFAULT;
25129- strbuf[len] = '\0';
25130- sscanf(strbuf, "%s", str);
25131+ strbuf[count] = '\0';
25132
25133 mutex_lock(&acpi_device_lock);
25134 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
25135@@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
25136 if (!dev->wakeup.flags.valid)
25137 continue;
25138
25139- if (!strncmp(dev->pnp.bus_id, str, 4)) {
25140+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
25141 if (device_can_wakeup(&dev->dev)) {
25142 bool enable = !device_may_wakeup(&dev->dev);
25143 device_set_wakeup_enable(&dev->dev, enable);
25144diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
25145index 9d7bc9f..a6fc091 100644
25146--- a/drivers/acpi/processor_driver.c
25147+++ b/drivers/acpi/processor_driver.c
25148@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
25149 return 0;
25150 #endif
25151
25152- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
25153+ BUG_ON(pr->id >= nr_cpu_ids);
25154
25155 /*
25156 * Buggy BIOS check
25157diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
25158index c04ad68..0b99473 100644
25159--- a/drivers/ata/libata-core.c
25160+++ b/drivers/ata/libata-core.c
25161@@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
25162 struct ata_port *ap;
25163 unsigned int tag;
25164
25165- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25166+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25167 ap = qc->ap;
25168
25169 qc->flags = 0;
25170@@ -4749,7 +4749,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
25171 struct ata_port *ap;
25172 struct ata_link *link;
25173
25174- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25175+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25176 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
25177 ap = qc->ap;
25178 link = qc->dev->link;
25179@@ -5754,6 +5754,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
25180 return;
25181
25182 spin_lock(&lock);
25183+ pax_open_kernel();
25184
25185 for (cur = ops->inherits; cur; cur = cur->inherits) {
25186 void **inherit = (void **)cur;
25187@@ -5767,8 +5768,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
25188 if (IS_ERR(*pp))
25189 *pp = NULL;
25190
25191- ops->inherits = NULL;
25192+ *(struct ata_port_operations **)&ops->inherits = NULL;
25193
25194+ pax_close_kernel();
25195 spin_unlock(&lock);
25196 }
25197
25198diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
25199index e8574bb..f9f6a72 100644
25200--- a/drivers/ata/pata_arasan_cf.c
25201+++ b/drivers/ata/pata_arasan_cf.c
25202@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
25203 /* Handle platform specific quirks */
25204 if (pdata->quirk) {
25205 if (pdata->quirk & CF_BROKEN_PIO) {
25206- ap->ops->set_piomode = NULL;
25207+ pax_open_kernel();
25208+ *(void **)&ap->ops->set_piomode = NULL;
25209+ pax_close_kernel();
25210 ap->pio_mask = 0;
25211 }
25212 if (pdata->quirk & CF_BROKEN_MWDMA)
25213diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
25214index f9b983a..887b9d8 100644
25215--- a/drivers/atm/adummy.c
25216+++ b/drivers/atm/adummy.c
25217@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
25218 vcc->pop(vcc, skb);
25219 else
25220 dev_kfree_skb_any(skb);
25221- atomic_inc(&vcc->stats->tx);
25222+ atomic_inc_unchecked(&vcc->stats->tx);
25223
25224 return 0;
25225 }
25226diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
25227index f8f41e0..1f987dd 100644
25228--- a/drivers/atm/ambassador.c
25229+++ b/drivers/atm/ambassador.c
25230@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
25231 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
25232
25233 // VC layer stats
25234- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
25235+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
25236
25237 // free the descriptor
25238 kfree (tx_descr);
25239@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
25240 dump_skb ("<<<", vc, skb);
25241
25242 // VC layer stats
25243- atomic_inc(&atm_vcc->stats->rx);
25244+ atomic_inc_unchecked(&atm_vcc->stats->rx);
25245 __net_timestamp(skb);
25246 // end of our responsibility
25247 atm_vcc->push (atm_vcc, skb);
25248@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
25249 } else {
25250 PRINTK (KERN_INFO, "dropped over-size frame");
25251 // should we count this?
25252- atomic_inc(&atm_vcc->stats->rx_drop);
25253+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
25254 }
25255
25256 } else {
25257@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
25258 }
25259
25260 if (check_area (skb->data, skb->len)) {
25261- atomic_inc(&atm_vcc->stats->tx_err);
25262+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
25263 return -ENOMEM; // ?
25264 }
25265
25266diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
25267index b22d71c..d6e1049 100644
25268--- a/drivers/atm/atmtcp.c
25269+++ b/drivers/atm/atmtcp.c
25270@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
25271 if (vcc->pop) vcc->pop(vcc,skb);
25272 else dev_kfree_skb(skb);
25273 if (dev_data) return 0;
25274- atomic_inc(&vcc->stats->tx_err);
25275+ atomic_inc_unchecked(&vcc->stats->tx_err);
25276 return -ENOLINK;
25277 }
25278 size = skb->len+sizeof(struct atmtcp_hdr);
25279@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
25280 if (!new_skb) {
25281 if (vcc->pop) vcc->pop(vcc,skb);
25282 else dev_kfree_skb(skb);
25283- atomic_inc(&vcc->stats->tx_err);
25284+ atomic_inc_unchecked(&vcc->stats->tx_err);
25285 return -ENOBUFS;
25286 }
25287 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
25288@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
25289 if (vcc->pop) vcc->pop(vcc,skb);
25290 else dev_kfree_skb(skb);
25291 out_vcc->push(out_vcc,new_skb);
25292- atomic_inc(&vcc->stats->tx);
25293- atomic_inc(&out_vcc->stats->rx);
25294+ atomic_inc_unchecked(&vcc->stats->tx);
25295+ atomic_inc_unchecked(&out_vcc->stats->rx);
25296 return 0;
25297 }
25298
25299@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
25300 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
25301 read_unlock(&vcc_sklist_lock);
25302 if (!out_vcc) {
25303- atomic_inc(&vcc->stats->tx_err);
25304+ atomic_inc_unchecked(&vcc->stats->tx_err);
25305 goto done;
25306 }
25307 skb_pull(skb,sizeof(struct atmtcp_hdr));
25308@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
25309 __net_timestamp(new_skb);
25310 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
25311 out_vcc->push(out_vcc,new_skb);
25312- atomic_inc(&vcc->stats->tx);
25313- atomic_inc(&out_vcc->stats->rx);
25314+ atomic_inc_unchecked(&vcc->stats->tx);
25315+ atomic_inc_unchecked(&out_vcc->stats->rx);
25316 done:
25317 if (vcc->pop) vcc->pop(vcc,skb);
25318 else dev_kfree_skb(skb);
25319diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
25320index 956e9ac..133516d 100644
25321--- a/drivers/atm/eni.c
25322+++ b/drivers/atm/eni.c
25323@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
25324 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
25325 vcc->dev->number);
25326 length = 0;
25327- atomic_inc(&vcc->stats->rx_err);
25328+ atomic_inc_unchecked(&vcc->stats->rx_err);
25329 }
25330 else {
25331 length = ATM_CELL_SIZE-1; /* no HEC */
25332@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
25333 size);
25334 }
25335 eff = length = 0;
25336- atomic_inc(&vcc->stats->rx_err);
25337+ atomic_inc_unchecked(&vcc->stats->rx_err);
25338 }
25339 else {
25340 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
25341@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
25342 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
25343 vcc->dev->number,vcc->vci,length,size << 2,descr);
25344 length = eff = 0;
25345- atomic_inc(&vcc->stats->rx_err);
25346+ atomic_inc_unchecked(&vcc->stats->rx_err);
25347 }
25348 }
25349 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
25350@@ -771,7 +771,7 @@ rx_dequeued++;
25351 vcc->push(vcc,skb);
25352 pushed++;
25353 }
25354- atomic_inc(&vcc->stats->rx);
25355+ atomic_inc_unchecked(&vcc->stats->rx);
25356 }
25357 wake_up(&eni_dev->rx_wait);
25358 }
25359@@ -1229,7 +1229,7 @@ static void dequeue_tx(struct atm_dev *dev)
25360 PCI_DMA_TODEVICE);
25361 if (vcc->pop) vcc->pop(vcc,skb);
25362 else dev_kfree_skb_irq(skb);
25363- atomic_inc(&vcc->stats->tx);
25364+ atomic_inc_unchecked(&vcc->stats->tx);
25365 wake_up(&eni_dev->tx_wait);
25366 dma_complete++;
25367 }
25368@@ -1569,7 +1569,7 @@ tx_complete++;
25369 /*--------------------------------- entries ---------------------------------*/
25370
25371
25372-static const char *media_name[] __devinitdata = {
25373+static const char *media_name[] __devinitconst = {
25374 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
25375 "UTP", "05?", "06?", "07?", /* 4- 7 */
25376 "TAXI","09?", "10?", "11?", /* 8-11 */
25377diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
25378index 5072f8a..fa52520d 100644
25379--- a/drivers/atm/firestream.c
25380+++ b/drivers/atm/firestream.c
25381@@ -750,7 +750,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
25382 }
25383 }
25384
25385- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
25386+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
25387
25388 fs_dprintk (FS_DEBUG_TXMEM, "i");
25389 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
25390@@ -817,7 +817,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
25391 #endif
25392 skb_put (skb, qe->p1 & 0xffff);
25393 ATM_SKB(skb)->vcc = atm_vcc;
25394- atomic_inc(&atm_vcc->stats->rx);
25395+ atomic_inc_unchecked(&atm_vcc->stats->rx);
25396 __net_timestamp(skb);
25397 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
25398 atm_vcc->push (atm_vcc, skb);
25399@@ -838,12 +838,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
25400 kfree (pe);
25401 }
25402 if (atm_vcc)
25403- atomic_inc(&atm_vcc->stats->rx_drop);
25404+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
25405 break;
25406 case 0x1f: /* Reassembly abort: no buffers. */
25407 /* Silently increment error counter. */
25408 if (atm_vcc)
25409- atomic_inc(&atm_vcc->stats->rx_drop);
25410+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
25411 break;
25412 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
25413 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
25414diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
25415index 361f5ae..7fc552d 100644
25416--- a/drivers/atm/fore200e.c
25417+++ b/drivers/atm/fore200e.c
25418@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
25419 #endif
25420 /* check error condition */
25421 if (*entry->status & STATUS_ERROR)
25422- atomic_inc(&vcc->stats->tx_err);
25423+ atomic_inc_unchecked(&vcc->stats->tx_err);
25424 else
25425- atomic_inc(&vcc->stats->tx);
25426+ atomic_inc_unchecked(&vcc->stats->tx);
25427 }
25428 }
25429
25430@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
25431 if (skb == NULL) {
25432 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
25433
25434- atomic_inc(&vcc->stats->rx_drop);
25435+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25436 return -ENOMEM;
25437 }
25438
25439@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
25440
25441 dev_kfree_skb_any(skb);
25442
25443- atomic_inc(&vcc->stats->rx_drop);
25444+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25445 return -ENOMEM;
25446 }
25447
25448 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
25449
25450 vcc->push(vcc, skb);
25451- atomic_inc(&vcc->stats->rx);
25452+ atomic_inc_unchecked(&vcc->stats->rx);
25453
25454 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
25455
25456@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
25457 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
25458 fore200e->atm_dev->number,
25459 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
25460- atomic_inc(&vcc->stats->rx_err);
25461+ atomic_inc_unchecked(&vcc->stats->rx_err);
25462 }
25463 }
25464
25465@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
25466 goto retry_here;
25467 }
25468
25469- atomic_inc(&vcc->stats->tx_err);
25470+ atomic_inc_unchecked(&vcc->stats->tx_err);
25471
25472 fore200e->tx_sat++;
25473 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
25474diff --git a/drivers/atm/he.c b/drivers/atm/he.c
25475index 9a51df4..f3bb5f8 100644
25476--- a/drivers/atm/he.c
25477+++ b/drivers/atm/he.c
25478@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
25479
25480 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
25481 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
25482- atomic_inc(&vcc->stats->rx_drop);
25483+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25484 goto return_host_buffers;
25485 }
25486
25487@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
25488 RBRQ_LEN_ERR(he_dev->rbrq_head)
25489 ? "LEN_ERR" : "",
25490 vcc->vpi, vcc->vci);
25491- atomic_inc(&vcc->stats->rx_err);
25492+ atomic_inc_unchecked(&vcc->stats->rx_err);
25493 goto return_host_buffers;
25494 }
25495
25496@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
25497 vcc->push(vcc, skb);
25498 spin_lock(&he_dev->global_lock);
25499
25500- atomic_inc(&vcc->stats->rx);
25501+ atomic_inc_unchecked(&vcc->stats->rx);
25502
25503 return_host_buffers:
25504 ++pdus_assembled;
25505@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
25506 tpd->vcc->pop(tpd->vcc, tpd->skb);
25507 else
25508 dev_kfree_skb_any(tpd->skb);
25509- atomic_inc(&tpd->vcc->stats->tx_err);
25510+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
25511 }
25512 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
25513 return;
25514@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25515 vcc->pop(vcc, skb);
25516 else
25517 dev_kfree_skb_any(skb);
25518- atomic_inc(&vcc->stats->tx_err);
25519+ atomic_inc_unchecked(&vcc->stats->tx_err);
25520 return -EINVAL;
25521 }
25522
25523@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25524 vcc->pop(vcc, skb);
25525 else
25526 dev_kfree_skb_any(skb);
25527- atomic_inc(&vcc->stats->tx_err);
25528+ atomic_inc_unchecked(&vcc->stats->tx_err);
25529 return -EINVAL;
25530 }
25531 #endif
25532@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25533 vcc->pop(vcc, skb);
25534 else
25535 dev_kfree_skb_any(skb);
25536- atomic_inc(&vcc->stats->tx_err);
25537+ atomic_inc_unchecked(&vcc->stats->tx_err);
25538 spin_unlock_irqrestore(&he_dev->global_lock, flags);
25539 return -ENOMEM;
25540 }
25541@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25542 vcc->pop(vcc, skb);
25543 else
25544 dev_kfree_skb_any(skb);
25545- atomic_inc(&vcc->stats->tx_err);
25546+ atomic_inc_unchecked(&vcc->stats->tx_err);
25547 spin_unlock_irqrestore(&he_dev->global_lock, flags);
25548 return -ENOMEM;
25549 }
25550@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25551 __enqueue_tpd(he_dev, tpd, cid);
25552 spin_unlock_irqrestore(&he_dev->global_lock, flags);
25553
25554- atomic_inc(&vcc->stats->tx);
25555+ atomic_inc_unchecked(&vcc->stats->tx);
25556
25557 return 0;
25558 }
25559diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
25560index b812103..e391a49 100644
25561--- a/drivers/atm/horizon.c
25562+++ b/drivers/atm/horizon.c
25563@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
25564 {
25565 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
25566 // VC layer stats
25567- atomic_inc(&vcc->stats->rx);
25568+ atomic_inc_unchecked(&vcc->stats->rx);
25569 __net_timestamp(skb);
25570 // end of our responsibility
25571 vcc->push (vcc, skb);
25572@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
25573 dev->tx_iovec = NULL;
25574
25575 // VC layer stats
25576- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
25577+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
25578
25579 // free the skb
25580 hrz_kfree_skb (skb);
25581diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
25582index 1c05212..c28e200 100644
25583--- a/drivers/atm/idt77252.c
25584+++ b/drivers/atm/idt77252.c
25585@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
25586 else
25587 dev_kfree_skb(skb);
25588
25589- atomic_inc(&vcc->stats->tx);
25590+ atomic_inc_unchecked(&vcc->stats->tx);
25591 }
25592
25593 atomic_dec(&scq->used);
25594@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25595 if ((sb = dev_alloc_skb(64)) == NULL) {
25596 printk("%s: Can't allocate buffers for aal0.\n",
25597 card->name);
25598- atomic_add(i, &vcc->stats->rx_drop);
25599+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
25600 break;
25601 }
25602 if (!atm_charge(vcc, sb->truesize)) {
25603 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
25604 card->name);
25605- atomic_add(i - 1, &vcc->stats->rx_drop);
25606+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
25607 dev_kfree_skb(sb);
25608 break;
25609 }
25610@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25611 ATM_SKB(sb)->vcc = vcc;
25612 __net_timestamp(sb);
25613 vcc->push(vcc, sb);
25614- atomic_inc(&vcc->stats->rx);
25615+ atomic_inc_unchecked(&vcc->stats->rx);
25616
25617 cell += ATM_CELL_PAYLOAD;
25618 }
25619@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25620 "(CDC: %08x)\n",
25621 card->name, len, rpp->len, readl(SAR_REG_CDC));
25622 recycle_rx_pool_skb(card, rpp);
25623- atomic_inc(&vcc->stats->rx_err);
25624+ atomic_inc_unchecked(&vcc->stats->rx_err);
25625 return;
25626 }
25627 if (stat & SAR_RSQE_CRC) {
25628 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
25629 recycle_rx_pool_skb(card, rpp);
25630- atomic_inc(&vcc->stats->rx_err);
25631+ atomic_inc_unchecked(&vcc->stats->rx_err);
25632 return;
25633 }
25634 if (skb_queue_len(&rpp->queue) > 1) {
25635@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25636 RXPRINTK("%s: Can't alloc RX skb.\n",
25637 card->name);
25638 recycle_rx_pool_skb(card, rpp);
25639- atomic_inc(&vcc->stats->rx_err);
25640+ atomic_inc_unchecked(&vcc->stats->rx_err);
25641 return;
25642 }
25643 if (!atm_charge(vcc, skb->truesize)) {
25644@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25645 __net_timestamp(skb);
25646
25647 vcc->push(vcc, skb);
25648- atomic_inc(&vcc->stats->rx);
25649+ atomic_inc_unchecked(&vcc->stats->rx);
25650
25651 return;
25652 }
25653@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25654 __net_timestamp(skb);
25655
25656 vcc->push(vcc, skb);
25657- atomic_inc(&vcc->stats->rx);
25658+ atomic_inc_unchecked(&vcc->stats->rx);
25659
25660 if (skb->truesize > SAR_FB_SIZE_3)
25661 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
25662@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
25663 if (vcc->qos.aal != ATM_AAL0) {
25664 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
25665 card->name, vpi, vci);
25666- atomic_inc(&vcc->stats->rx_drop);
25667+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25668 goto drop;
25669 }
25670
25671 if ((sb = dev_alloc_skb(64)) == NULL) {
25672 printk("%s: Can't allocate buffers for AAL0.\n",
25673 card->name);
25674- atomic_inc(&vcc->stats->rx_err);
25675+ atomic_inc_unchecked(&vcc->stats->rx_err);
25676 goto drop;
25677 }
25678
25679@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
25680 ATM_SKB(sb)->vcc = vcc;
25681 __net_timestamp(sb);
25682 vcc->push(vcc, sb);
25683- atomic_inc(&vcc->stats->rx);
25684+ atomic_inc_unchecked(&vcc->stats->rx);
25685
25686 drop:
25687 skb_pull(queue, 64);
25688@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
25689
25690 if (vc == NULL) {
25691 printk("%s: NULL connection in send().\n", card->name);
25692- atomic_inc(&vcc->stats->tx_err);
25693+ atomic_inc_unchecked(&vcc->stats->tx_err);
25694 dev_kfree_skb(skb);
25695 return -EINVAL;
25696 }
25697 if (!test_bit(VCF_TX, &vc->flags)) {
25698 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
25699- atomic_inc(&vcc->stats->tx_err);
25700+ atomic_inc_unchecked(&vcc->stats->tx_err);
25701 dev_kfree_skb(skb);
25702 return -EINVAL;
25703 }
25704@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
25705 break;
25706 default:
25707 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
25708- atomic_inc(&vcc->stats->tx_err);
25709+ atomic_inc_unchecked(&vcc->stats->tx_err);
25710 dev_kfree_skb(skb);
25711 return -EINVAL;
25712 }
25713
25714 if (skb_shinfo(skb)->nr_frags != 0) {
25715 printk("%s: No scatter-gather yet.\n", card->name);
25716- atomic_inc(&vcc->stats->tx_err);
25717+ atomic_inc_unchecked(&vcc->stats->tx_err);
25718 dev_kfree_skb(skb);
25719 return -EINVAL;
25720 }
25721@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
25722
25723 err = queue_skb(card, vc, skb, oam);
25724 if (err) {
25725- atomic_inc(&vcc->stats->tx_err);
25726+ atomic_inc_unchecked(&vcc->stats->tx_err);
25727 dev_kfree_skb(skb);
25728 return err;
25729 }
25730@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
25731 skb = dev_alloc_skb(64);
25732 if (!skb) {
25733 printk("%s: Out of memory in send_oam().\n", card->name);
25734- atomic_inc(&vcc->stats->tx_err);
25735+ atomic_inc_unchecked(&vcc->stats->tx_err);
25736 return -ENOMEM;
25737 }
25738 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
25739diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
25740index 3d0c2b0..45441fa 100644
25741--- a/drivers/atm/iphase.c
25742+++ b/drivers/atm/iphase.c
25743@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
25744 status = (u_short) (buf_desc_ptr->desc_mode);
25745 if (status & (RX_CER | RX_PTE | RX_OFL))
25746 {
25747- atomic_inc(&vcc->stats->rx_err);
25748+ atomic_inc_unchecked(&vcc->stats->rx_err);
25749 IF_ERR(printk("IA: bad packet, dropping it");)
25750 if (status & RX_CER) {
25751 IF_ERR(printk(" cause: packet CRC error\n");)
25752@@ -1169,7 +1169,7 @@ static int rx_pkt(struct atm_dev *dev)
25753 len = dma_addr - buf_addr;
25754 if (len > iadev->rx_buf_sz) {
25755 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
25756- atomic_inc(&vcc->stats->rx_err);
25757+ atomic_inc_unchecked(&vcc->stats->rx_err);
25758 goto out_free_desc;
25759 }
25760
25761@@ -1319,7 +1319,7 @@ static void rx_dle_intr(struct atm_dev *dev)
25762 ia_vcc = INPH_IA_VCC(vcc);
25763 if (ia_vcc == NULL)
25764 {
25765- atomic_inc(&vcc->stats->rx_err);
25766+ atomic_inc_unchecked(&vcc->stats->rx_err);
25767 dev_kfree_skb_any(skb);
25768 atm_return(vcc, atm_guess_pdu2truesize(len));
25769 goto INCR_DLE;
25770@@ -1331,7 +1331,7 @@ static void rx_dle_intr(struct atm_dev *dev)
25771 if ((length > iadev->rx_buf_sz) || (length >
25772 (skb->len - sizeof(struct cpcs_trailer))))
25773 {
25774- atomic_inc(&vcc->stats->rx_err);
25775+ atomic_inc_unchecked(&vcc->stats->rx_err);
25776 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
25777 length, skb->len);)
25778 dev_kfree_skb_any(skb);
25779@@ -1347,7 +1347,7 @@ static void rx_dle_intr(struct atm_dev *dev)
25780
25781 IF_RX(printk("rx_dle_intr: skb push");)
25782 vcc->push(vcc,skb);
25783- atomic_inc(&vcc->stats->rx);
25784+ atomic_inc_unchecked(&vcc->stats->rx);
25785 iadev->rx_pkt_cnt++;
25786 }
25787 INCR_DLE:
25788@@ -2827,15 +2827,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
25789 {
25790 struct k_sonet_stats *stats;
25791 stats = &PRIV(_ia_dev[board])->sonet_stats;
25792- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
25793- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
25794- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
25795- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
25796- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
25797- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
25798- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
25799- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
25800- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
25801+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
25802+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
25803+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
25804+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
25805+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
25806+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
25807+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
25808+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
25809+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
25810 }
25811 ia_cmds.status = 0;
25812 break;
25813@@ -2940,7 +2940,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
25814 if ((desc == 0) || (desc > iadev->num_tx_desc))
25815 {
25816 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
25817- atomic_inc(&vcc->stats->tx);
25818+ atomic_inc_unchecked(&vcc->stats->tx);
25819 if (vcc->pop)
25820 vcc->pop(vcc, skb);
25821 else
25822@@ -3045,14 +3045,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
25823 ATM_DESC(skb) = vcc->vci;
25824 skb_queue_tail(&iadev->tx_dma_q, skb);
25825
25826- atomic_inc(&vcc->stats->tx);
25827+ atomic_inc_unchecked(&vcc->stats->tx);
25828 iadev->tx_pkt_cnt++;
25829 /* Increment transaction counter */
25830 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
25831
25832 #if 0
25833 /* add flow control logic */
25834- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
25835+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
25836 if (iavcc->vc_desc_cnt > 10) {
25837 vcc->tx_quota = vcc->tx_quota * 3 / 4;
25838 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
25839diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
25840index f556969..0da15eb 100644
25841--- a/drivers/atm/lanai.c
25842+++ b/drivers/atm/lanai.c
25843@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
25844 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
25845 lanai_endtx(lanai, lvcc);
25846 lanai_free_skb(lvcc->tx.atmvcc, skb);
25847- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
25848+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
25849 }
25850
25851 /* Try to fill the buffer - don't call unless there is backlog */
25852@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
25853 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
25854 __net_timestamp(skb);
25855 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
25856- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
25857+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
25858 out:
25859 lvcc->rx.buf.ptr = end;
25860 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
25861@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
25862 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
25863 "vcc %d\n", lanai->number, (unsigned int) s, vci);
25864 lanai->stats.service_rxnotaal5++;
25865- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
25866+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
25867 return 0;
25868 }
25869 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
25870@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
25871 int bytes;
25872 read_unlock(&vcc_sklist_lock);
25873 DPRINTK("got trashed rx pdu on vci %d\n", vci);
25874- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
25875+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
25876 lvcc->stats.x.aal5.service_trash++;
25877 bytes = (SERVICE_GET_END(s) * 16) -
25878 (((unsigned long) lvcc->rx.buf.ptr) -
25879@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
25880 }
25881 if (s & SERVICE_STREAM) {
25882 read_unlock(&vcc_sklist_lock);
25883- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
25884+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
25885 lvcc->stats.x.aal5.service_stream++;
25886 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
25887 "PDU on VCI %d!\n", lanai->number, vci);
25888@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
25889 return 0;
25890 }
25891 DPRINTK("got rx crc error on vci %d\n", vci);
25892- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
25893+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
25894 lvcc->stats.x.aal5.service_rxcrc++;
25895 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
25896 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
25897diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
25898index 1c70c45..300718d 100644
25899--- a/drivers/atm/nicstar.c
25900+++ b/drivers/atm/nicstar.c
25901@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
25902 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
25903 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
25904 card->index);
25905- atomic_inc(&vcc->stats->tx_err);
25906+ atomic_inc_unchecked(&vcc->stats->tx_err);
25907 dev_kfree_skb_any(skb);
25908 return -EINVAL;
25909 }
25910@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
25911 if (!vc->tx) {
25912 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
25913 card->index);
25914- atomic_inc(&vcc->stats->tx_err);
25915+ atomic_inc_unchecked(&vcc->stats->tx_err);
25916 dev_kfree_skb_any(skb);
25917 return -EINVAL;
25918 }
25919@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
25920 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
25921 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
25922 card->index);
25923- atomic_inc(&vcc->stats->tx_err);
25924+ atomic_inc_unchecked(&vcc->stats->tx_err);
25925 dev_kfree_skb_any(skb);
25926 return -EINVAL;
25927 }
25928
25929 if (skb_shinfo(skb)->nr_frags != 0) {
25930 printk("nicstar%d: No scatter-gather yet.\n", card->index);
25931- atomic_inc(&vcc->stats->tx_err);
25932+ atomic_inc_unchecked(&vcc->stats->tx_err);
25933 dev_kfree_skb_any(skb);
25934 return -EINVAL;
25935 }
25936@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
25937 }
25938
25939 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
25940- atomic_inc(&vcc->stats->tx_err);
25941+ atomic_inc_unchecked(&vcc->stats->tx_err);
25942 dev_kfree_skb_any(skb);
25943 return -EIO;
25944 }
25945- atomic_inc(&vcc->stats->tx);
25946+ atomic_inc_unchecked(&vcc->stats->tx);
25947
25948 return 0;
25949 }
25950@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25951 printk
25952 ("nicstar%d: Can't allocate buffers for aal0.\n",
25953 card->index);
25954- atomic_add(i, &vcc->stats->rx_drop);
25955+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
25956 break;
25957 }
25958 if (!atm_charge(vcc, sb->truesize)) {
25959 RXPRINTK
25960 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
25961 card->index);
25962- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
25963+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
25964 dev_kfree_skb_any(sb);
25965 break;
25966 }
25967@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25968 ATM_SKB(sb)->vcc = vcc;
25969 __net_timestamp(sb);
25970 vcc->push(vcc, sb);
25971- atomic_inc(&vcc->stats->rx);
25972+ atomic_inc_unchecked(&vcc->stats->rx);
25973 cell += ATM_CELL_PAYLOAD;
25974 }
25975
25976@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25977 if (iovb == NULL) {
25978 printk("nicstar%d: Out of iovec buffers.\n",
25979 card->index);
25980- atomic_inc(&vcc->stats->rx_drop);
25981+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25982 recycle_rx_buf(card, skb);
25983 return;
25984 }
25985@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25986 small or large buffer itself. */
25987 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
25988 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
25989- atomic_inc(&vcc->stats->rx_err);
25990+ atomic_inc_unchecked(&vcc->stats->rx_err);
25991 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
25992 NS_MAX_IOVECS);
25993 NS_PRV_IOVCNT(iovb) = 0;
25994@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25995 ("nicstar%d: Expected a small buffer, and this is not one.\n",
25996 card->index);
25997 which_list(card, skb);
25998- atomic_inc(&vcc->stats->rx_err);
25999+ atomic_inc_unchecked(&vcc->stats->rx_err);
26000 recycle_rx_buf(card, skb);
26001 vc->rx_iov = NULL;
26002 recycle_iov_buf(card, iovb);
26003@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26004 ("nicstar%d: Expected a large buffer, and this is not one.\n",
26005 card->index);
26006 which_list(card, skb);
26007- atomic_inc(&vcc->stats->rx_err);
26008+ atomic_inc_unchecked(&vcc->stats->rx_err);
26009 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
26010 NS_PRV_IOVCNT(iovb));
26011 vc->rx_iov = NULL;
26012@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26013 printk(" - PDU size mismatch.\n");
26014 else
26015 printk(".\n");
26016- atomic_inc(&vcc->stats->rx_err);
26017+ atomic_inc_unchecked(&vcc->stats->rx_err);
26018 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
26019 NS_PRV_IOVCNT(iovb));
26020 vc->rx_iov = NULL;
26021@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26022 /* skb points to a small buffer */
26023 if (!atm_charge(vcc, skb->truesize)) {
26024 push_rxbufs(card, skb);
26025- atomic_inc(&vcc->stats->rx_drop);
26026+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26027 } else {
26028 skb_put(skb, len);
26029 dequeue_sm_buf(card, skb);
26030@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26031 ATM_SKB(skb)->vcc = vcc;
26032 __net_timestamp(skb);
26033 vcc->push(vcc, skb);
26034- atomic_inc(&vcc->stats->rx);
26035+ atomic_inc_unchecked(&vcc->stats->rx);
26036 }
26037 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
26038 struct sk_buff *sb;
26039@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26040 if (len <= NS_SMBUFSIZE) {
26041 if (!atm_charge(vcc, sb->truesize)) {
26042 push_rxbufs(card, sb);
26043- atomic_inc(&vcc->stats->rx_drop);
26044+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26045 } else {
26046 skb_put(sb, len);
26047 dequeue_sm_buf(card, sb);
26048@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26049 ATM_SKB(sb)->vcc = vcc;
26050 __net_timestamp(sb);
26051 vcc->push(vcc, sb);
26052- atomic_inc(&vcc->stats->rx);
26053+ atomic_inc_unchecked(&vcc->stats->rx);
26054 }
26055
26056 push_rxbufs(card, skb);
26057@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26058
26059 if (!atm_charge(vcc, skb->truesize)) {
26060 push_rxbufs(card, skb);
26061- atomic_inc(&vcc->stats->rx_drop);
26062+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26063 } else {
26064 dequeue_lg_buf(card, skb);
26065 #ifdef NS_USE_DESTRUCTORS
26066@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26067 ATM_SKB(skb)->vcc = vcc;
26068 __net_timestamp(skb);
26069 vcc->push(vcc, skb);
26070- atomic_inc(&vcc->stats->rx);
26071+ atomic_inc_unchecked(&vcc->stats->rx);
26072 }
26073
26074 push_rxbufs(card, sb);
26075@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26076 printk
26077 ("nicstar%d: Out of huge buffers.\n",
26078 card->index);
26079- atomic_inc(&vcc->stats->rx_drop);
26080+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26081 recycle_iovec_rx_bufs(card,
26082 (struct iovec *)
26083 iovb->data,
26084@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26085 card->hbpool.count++;
26086 } else
26087 dev_kfree_skb_any(hb);
26088- atomic_inc(&vcc->stats->rx_drop);
26089+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26090 } else {
26091 /* Copy the small buffer to the huge buffer */
26092 sb = (struct sk_buff *)iov->iov_base;
26093@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26094 #endif /* NS_USE_DESTRUCTORS */
26095 __net_timestamp(hb);
26096 vcc->push(vcc, hb);
26097- atomic_inc(&vcc->stats->rx);
26098+ atomic_inc_unchecked(&vcc->stats->rx);
26099 }
26100 }
26101
26102diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
26103index 5d1d076..12fbca4 100644
26104--- a/drivers/atm/solos-pci.c
26105+++ b/drivers/atm/solos-pci.c
26106@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
26107 }
26108 atm_charge(vcc, skb->truesize);
26109 vcc->push(vcc, skb);
26110- atomic_inc(&vcc->stats->rx);
26111+ atomic_inc_unchecked(&vcc->stats->rx);
26112 break;
26113
26114 case PKT_STATUS:
26115@@ -1008,7 +1008,7 @@ static uint32_t fpga_tx(struct solos_card *card)
26116 vcc = SKB_CB(oldskb)->vcc;
26117
26118 if (vcc) {
26119- atomic_inc(&vcc->stats->tx);
26120+ atomic_inc_unchecked(&vcc->stats->tx);
26121 solos_pop(vcc, oldskb);
26122 } else
26123 dev_kfree_skb_irq(oldskb);
26124diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
26125index 90f1ccc..04c4a1e 100644
26126--- a/drivers/atm/suni.c
26127+++ b/drivers/atm/suni.c
26128@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
26129
26130
26131 #define ADD_LIMITED(s,v) \
26132- atomic_add((v),&stats->s); \
26133- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
26134+ atomic_add_unchecked((v),&stats->s); \
26135+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
26136
26137
26138 static void suni_hz(unsigned long from_timer)
26139diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
26140index 5120a96..e2572bd 100644
26141--- a/drivers/atm/uPD98402.c
26142+++ b/drivers/atm/uPD98402.c
26143@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
26144 struct sonet_stats tmp;
26145 int error = 0;
26146
26147- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
26148+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
26149 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
26150 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
26151 if (zero && !error) {
26152@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
26153
26154
26155 #define ADD_LIMITED(s,v) \
26156- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
26157- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
26158- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
26159+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
26160+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
26161+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
26162
26163
26164 static void stat_event(struct atm_dev *dev)
26165@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
26166 if (reason & uPD98402_INT_PFM) stat_event(dev);
26167 if (reason & uPD98402_INT_PCO) {
26168 (void) GET(PCOCR); /* clear interrupt cause */
26169- atomic_add(GET(HECCT),
26170+ atomic_add_unchecked(GET(HECCT),
26171 &PRIV(dev)->sonet_stats.uncorr_hcs);
26172 }
26173 if ((reason & uPD98402_INT_RFO) &&
26174@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
26175 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
26176 uPD98402_INT_LOS),PIMR); /* enable them */
26177 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
26178- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
26179- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
26180- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
26181+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
26182+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
26183+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
26184 return 0;
26185 }
26186
26187diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
26188index d889f56..17eb71e 100644
26189--- a/drivers/atm/zatm.c
26190+++ b/drivers/atm/zatm.c
26191@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
26192 }
26193 if (!size) {
26194 dev_kfree_skb_irq(skb);
26195- if (vcc) atomic_inc(&vcc->stats->rx_err);
26196+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
26197 continue;
26198 }
26199 if (!atm_charge(vcc,skb->truesize)) {
26200@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
26201 skb->len = size;
26202 ATM_SKB(skb)->vcc = vcc;
26203 vcc->push(vcc,skb);
26204- atomic_inc(&vcc->stats->rx);
26205+ atomic_inc_unchecked(&vcc->stats->rx);
26206 }
26207 zout(pos & 0xffff,MTA(mbx));
26208 #if 0 /* probably a stupid idea */
26209@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
26210 skb_queue_head(&zatm_vcc->backlog,skb);
26211 break;
26212 }
26213- atomic_inc(&vcc->stats->tx);
26214+ atomic_inc_unchecked(&vcc->stats->tx);
26215 wake_up(&zatm_vcc->tx_wait);
26216 }
26217
26218diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
26219index a4760e0..51283cf 100644
26220--- a/drivers/base/devtmpfs.c
26221+++ b/drivers/base/devtmpfs.c
26222@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
26223 if (!thread)
26224 return 0;
26225
26226- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
26227+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
26228 if (err)
26229 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
26230 else
26231diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
26232index caf995f..6f76697 100644
26233--- a/drivers/base/power/wakeup.c
26234+++ b/drivers/base/power/wakeup.c
26235@@ -30,14 +30,14 @@ bool events_check_enabled;
26236 * They need to be modified together atomically, so it's better to use one
26237 * atomic variable to hold them both.
26238 */
26239-static atomic_t combined_event_count = ATOMIC_INIT(0);
26240+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
26241
26242 #define IN_PROGRESS_BITS (sizeof(int) * 4)
26243 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
26244
26245 static void split_counters(unsigned int *cnt, unsigned int *inpr)
26246 {
26247- unsigned int comb = atomic_read(&combined_event_count);
26248+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
26249
26250 *cnt = (comb >> IN_PROGRESS_BITS);
26251 *inpr = comb & MAX_IN_PROGRESS;
26252@@ -353,7 +353,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
26253 ws->last_time = ktime_get();
26254
26255 /* Increment the counter of events in progress. */
26256- atomic_inc(&combined_event_count);
26257+ atomic_inc_unchecked(&combined_event_count);
26258 }
26259
26260 /**
26261@@ -443,7 +443,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
26262 * Increment the counter of registered wakeup events and decrement the
26263 * couter of wakeup events in progress simultaneously.
26264 */
26265- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
26266+ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
26267 }
26268
26269 /**
26270diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
26271index b0f553b..77b928b 100644
26272--- a/drivers/block/cciss.c
26273+++ b/drivers/block/cciss.c
26274@@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
26275 int err;
26276 u32 cp;
26277
26278+ memset(&arg64, 0, sizeof(arg64));
26279+
26280 err = 0;
26281 err |=
26282 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
26283@@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
26284 while (!list_empty(&h->reqQ)) {
26285 c = list_entry(h->reqQ.next, CommandList_struct, list);
26286 /* can't do anything if fifo is full */
26287- if ((h->access.fifo_full(h))) {
26288+ if ((h->access->fifo_full(h))) {
26289 dev_warn(&h->pdev->dev, "fifo full\n");
26290 break;
26291 }
26292@@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
26293 h->Qdepth--;
26294
26295 /* Tell the controller execute command */
26296- h->access.submit_command(h, c);
26297+ h->access->submit_command(h, c);
26298
26299 /* Put job onto the completed Q */
26300 addQ(&h->cmpQ, c);
26301@@ -3443,17 +3445,17 @@ startio:
26302
26303 static inline unsigned long get_next_completion(ctlr_info_t *h)
26304 {
26305- return h->access.command_completed(h);
26306+ return h->access->command_completed(h);
26307 }
26308
26309 static inline int interrupt_pending(ctlr_info_t *h)
26310 {
26311- return h->access.intr_pending(h);
26312+ return h->access->intr_pending(h);
26313 }
26314
26315 static inline long interrupt_not_for_us(ctlr_info_t *h)
26316 {
26317- return ((h->access.intr_pending(h) == 0) ||
26318+ return ((h->access->intr_pending(h) == 0) ||
26319 (h->interrupts_enabled == 0));
26320 }
26321
26322@@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
26323 u32 a;
26324
26325 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
26326- return h->access.command_completed(h);
26327+ return h->access->command_completed(h);
26328
26329 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
26330 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
26331@@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
26332 trans_support & CFGTBL_Trans_use_short_tags);
26333
26334 /* Change the access methods to the performant access methods */
26335- h->access = SA5_performant_access;
26336+ h->access = &SA5_performant_access;
26337 h->transMethod = CFGTBL_Trans_Performant;
26338
26339 return;
26340@@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
26341 if (prod_index < 0)
26342 return -ENODEV;
26343 h->product_name = products[prod_index].product_name;
26344- h->access = *(products[prod_index].access);
26345+ h->access = products[prod_index].access;
26346
26347 if (cciss_board_disabled(h)) {
26348 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
26349@@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
26350 }
26351
26352 /* make sure the board interrupts are off */
26353- h->access.set_intr_mask(h, CCISS_INTR_OFF);
26354+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
26355 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
26356 if (rc)
26357 goto clean2;
26358@@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
26359 * fake ones to scoop up any residual completions.
26360 */
26361 spin_lock_irqsave(&h->lock, flags);
26362- h->access.set_intr_mask(h, CCISS_INTR_OFF);
26363+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
26364 spin_unlock_irqrestore(&h->lock, flags);
26365 free_irq(h->intr[h->intr_mode], h);
26366 rc = cciss_request_irq(h, cciss_msix_discard_completions,
26367@@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
26368 dev_info(&h->pdev->dev, "Board READY.\n");
26369 dev_info(&h->pdev->dev,
26370 "Waiting for stale completions to drain.\n");
26371- h->access.set_intr_mask(h, CCISS_INTR_ON);
26372+ h->access->set_intr_mask(h, CCISS_INTR_ON);
26373 msleep(10000);
26374- h->access.set_intr_mask(h, CCISS_INTR_OFF);
26375+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
26376
26377 rc = controller_reset_failed(h->cfgtable);
26378 if (rc)
26379@@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
26380 cciss_scsi_setup(h);
26381
26382 /* Turn the interrupts on so we can service requests */
26383- h->access.set_intr_mask(h, CCISS_INTR_ON);
26384+ h->access->set_intr_mask(h, CCISS_INTR_ON);
26385
26386 /* Get the firmware version */
26387 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
26388@@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
26389 kfree(flush_buf);
26390 if (return_code != IO_OK)
26391 dev_warn(&h->pdev->dev, "Error flushing cache\n");
26392- h->access.set_intr_mask(h, CCISS_INTR_OFF);
26393+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
26394 free_irq(h->intr[h->intr_mode], h);
26395 }
26396
26397diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
26398index 7fda30e..eb5dfe0 100644
26399--- a/drivers/block/cciss.h
26400+++ b/drivers/block/cciss.h
26401@@ -101,7 +101,7 @@ struct ctlr_info
26402 /* information about each logical volume */
26403 drive_info_struct *drv[CISS_MAX_LUN];
26404
26405- struct access_method access;
26406+ struct access_method *access;
26407
26408 /* queue and queue Info */
26409 struct list_head reqQ;
26410diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
26411index 9125bbe..eede5c8 100644
26412--- a/drivers/block/cpqarray.c
26413+++ b/drivers/block/cpqarray.c
26414@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
26415 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
26416 goto Enomem4;
26417 }
26418- hba[i]->access.set_intr_mask(hba[i], 0);
26419+ hba[i]->access->set_intr_mask(hba[i], 0);
26420 if (request_irq(hba[i]->intr, do_ida_intr,
26421 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
26422 {
26423@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
26424 add_timer(&hba[i]->timer);
26425
26426 /* Enable IRQ now that spinlock and rate limit timer are set up */
26427- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
26428+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
26429
26430 for(j=0; j<NWD; j++) {
26431 struct gendisk *disk = ida_gendisk[i][j];
26432@@ -694,7 +694,7 @@ DBGINFO(
26433 for(i=0; i<NR_PRODUCTS; i++) {
26434 if (board_id == products[i].board_id) {
26435 c->product_name = products[i].product_name;
26436- c->access = *(products[i].access);
26437+ c->access = products[i].access;
26438 break;
26439 }
26440 }
26441@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
26442 hba[ctlr]->intr = intr;
26443 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
26444 hba[ctlr]->product_name = products[j].product_name;
26445- hba[ctlr]->access = *(products[j].access);
26446+ hba[ctlr]->access = products[j].access;
26447 hba[ctlr]->ctlr = ctlr;
26448 hba[ctlr]->board_id = board_id;
26449 hba[ctlr]->pci_dev = NULL; /* not PCI */
26450@@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
26451
26452 while((c = h->reqQ) != NULL) {
26453 /* Can't do anything if we're busy */
26454- if (h->access.fifo_full(h) == 0)
26455+ if (h->access->fifo_full(h) == 0)
26456 return;
26457
26458 /* Get the first entry from the request Q */
26459@@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
26460 h->Qdepth--;
26461
26462 /* Tell the controller to do our bidding */
26463- h->access.submit_command(h, c);
26464+ h->access->submit_command(h, c);
26465
26466 /* Get onto the completion Q */
26467 addQ(&h->cmpQ, c);
26468@@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
26469 unsigned long flags;
26470 __u32 a,a1;
26471
26472- istat = h->access.intr_pending(h);
26473+ istat = h->access->intr_pending(h);
26474 /* Is this interrupt for us? */
26475 if (istat == 0)
26476 return IRQ_NONE;
26477@@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
26478 */
26479 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
26480 if (istat & FIFO_NOT_EMPTY) {
26481- while((a = h->access.command_completed(h))) {
26482+ while((a = h->access->command_completed(h))) {
26483 a1 = a; a &= ~3;
26484 if ((c = h->cmpQ) == NULL)
26485 {
26486@@ -1449,11 +1449,11 @@ static int sendcmd(
26487 /*
26488 * Disable interrupt
26489 */
26490- info_p->access.set_intr_mask(info_p, 0);
26491+ info_p->access->set_intr_mask(info_p, 0);
26492 /* Make sure there is room in the command FIFO */
26493 /* Actually it should be completely empty at this time. */
26494 for (i = 200000; i > 0; i--) {
26495- temp = info_p->access.fifo_full(info_p);
26496+ temp = info_p->access->fifo_full(info_p);
26497 if (temp != 0) {
26498 break;
26499 }
26500@@ -1466,7 +1466,7 @@ DBG(
26501 /*
26502 * Send the cmd
26503 */
26504- info_p->access.submit_command(info_p, c);
26505+ info_p->access->submit_command(info_p, c);
26506 complete = pollcomplete(ctlr);
26507
26508 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
26509@@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
26510 * we check the new geometry. Then turn interrupts back on when
26511 * we're done.
26512 */
26513- host->access.set_intr_mask(host, 0);
26514+ host->access->set_intr_mask(host, 0);
26515 getgeometry(ctlr);
26516- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
26517+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
26518
26519 for(i=0; i<NWD; i++) {
26520 struct gendisk *disk = ida_gendisk[ctlr][i];
26521@@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
26522 /* Wait (up to 2 seconds) for a command to complete */
26523
26524 for (i = 200000; i > 0; i--) {
26525- done = hba[ctlr]->access.command_completed(hba[ctlr]);
26526+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
26527 if (done == 0) {
26528 udelay(10); /* a short fixed delay */
26529 } else
26530diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
26531index be73e9d..7fbf140 100644
26532--- a/drivers/block/cpqarray.h
26533+++ b/drivers/block/cpqarray.h
26534@@ -99,7 +99,7 @@ struct ctlr_info {
26535 drv_info_t drv[NWD];
26536 struct proc_dir_entry *proc;
26537
26538- struct access_method access;
26539+ struct access_method *access;
26540
26541 cmdlist_t *reqQ;
26542 cmdlist_t *cmpQ;
26543diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
26544index 9cf2035..bffca95 100644
26545--- a/drivers/block/drbd/drbd_int.h
26546+++ b/drivers/block/drbd/drbd_int.h
26547@@ -736,7 +736,7 @@ struct drbd_request;
26548 struct drbd_epoch {
26549 struct list_head list;
26550 unsigned int barrier_nr;
26551- atomic_t epoch_size; /* increased on every request added. */
26552+ atomic_unchecked_t epoch_size; /* increased on every request added. */
26553 atomic_t active; /* increased on every req. added, and dec on every finished. */
26554 unsigned long flags;
26555 };
26556@@ -1108,7 +1108,7 @@ struct drbd_conf {
26557 void *int_dig_in;
26558 void *int_dig_vv;
26559 wait_queue_head_t seq_wait;
26560- atomic_t packet_seq;
26561+ atomic_unchecked_t packet_seq;
26562 unsigned int peer_seq;
26563 spinlock_t peer_seq_lock;
26564 unsigned int minor;
26565@@ -1617,30 +1617,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
26566
26567 static inline void drbd_tcp_cork(struct socket *sock)
26568 {
26569- int __user val = 1;
26570+ int val = 1;
26571 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
26572- (char __user *)&val, sizeof(val));
26573+ (char __force_user *)&val, sizeof(val));
26574 }
26575
26576 static inline void drbd_tcp_uncork(struct socket *sock)
26577 {
26578- int __user val = 0;
26579+ int val = 0;
26580 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
26581- (char __user *)&val, sizeof(val));
26582+ (char __force_user *)&val, sizeof(val));
26583 }
26584
26585 static inline void drbd_tcp_nodelay(struct socket *sock)
26586 {
26587- int __user val = 1;
26588+ int val = 1;
26589 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
26590- (char __user *)&val, sizeof(val));
26591+ (char __force_user *)&val, sizeof(val));
26592 }
26593
26594 static inline void drbd_tcp_quickack(struct socket *sock)
26595 {
26596- int __user val = 2;
26597+ int val = 2;
26598 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
26599- (char __user *)&val, sizeof(val));
26600+ (char __force_user *)&val, sizeof(val));
26601 }
26602
26603 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
26604diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
26605index 0358e55..bc33689 100644
26606--- a/drivers/block/drbd/drbd_main.c
26607+++ b/drivers/block/drbd/drbd_main.c
26608@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
26609 p.sector = sector;
26610 p.block_id = block_id;
26611 p.blksize = blksize;
26612- p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
26613+ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
26614
26615 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
26616 return false;
26617@@ -2696,7 +2696,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
26618 p.sector = cpu_to_be64(req->sector);
26619 p.block_id = (unsigned long)req;
26620 p.seq_num = cpu_to_be32(req->seq_num =
26621- atomic_add_return(1, &mdev->packet_seq));
26622+ atomic_add_return_unchecked(1, &mdev->packet_seq));
26623
26624 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
26625
26626@@ -2981,7 +2981,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
26627 atomic_set(&mdev->unacked_cnt, 0);
26628 atomic_set(&mdev->local_cnt, 0);
26629 atomic_set(&mdev->net_cnt, 0);
26630- atomic_set(&mdev->packet_seq, 0);
26631+ atomic_set_unchecked(&mdev->packet_seq, 0);
26632 atomic_set(&mdev->pp_in_use, 0);
26633 atomic_set(&mdev->pp_in_use_by_net, 0);
26634 atomic_set(&mdev->rs_sect_in, 0);
26635@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
26636 mdev->receiver.t_state);
26637
26638 /* no need to lock it, I'm the only thread alive */
26639- if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
26640- dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
26641+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
26642+ dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
26643 mdev->al_writ_cnt =
26644 mdev->bm_writ_cnt =
26645 mdev->read_cnt =
26646diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
26647index af2a250..219c74b 100644
26648--- a/drivers/block/drbd/drbd_nl.c
26649+++ b/drivers/block/drbd/drbd_nl.c
26650@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
26651 module_put(THIS_MODULE);
26652 }
26653
26654-static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
26655+static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
26656
26657 static unsigned short *
26658 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
26659@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
26660 cn_reply->id.idx = CN_IDX_DRBD;
26661 cn_reply->id.val = CN_VAL_DRBD;
26662
26663- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
26664+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
26665 cn_reply->ack = 0; /* not used here. */
26666 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
26667 (int)((char *)tl - (char *)reply->tag_list);
26668@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
26669 cn_reply->id.idx = CN_IDX_DRBD;
26670 cn_reply->id.val = CN_VAL_DRBD;
26671
26672- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
26673+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
26674 cn_reply->ack = 0; /* not used here. */
26675 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
26676 (int)((char *)tl - (char *)reply->tag_list);
26677@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
26678 cn_reply->id.idx = CN_IDX_DRBD;
26679 cn_reply->id.val = CN_VAL_DRBD;
26680
26681- cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
26682+ cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
26683 cn_reply->ack = 0; // not used here.
26684 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
26685 (int)((char*)tl - (char*)reply->tag_list);
26686@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
26687 cn_reply->id.idx = CN_IDX_DRBD;
26688 cn_reply->id.val = CN_VAL_DRBD;
26689
26690- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
26691+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
26692 cn_reply->ack = 0; /* not used here. */
26693 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
26694 (int)((char *)tl - (char *)reply->tag_list);
26695diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
26696index 43beaca..4a5b1dd 100644
26697--- a/drivers/block/drbd/drbd_receiver.c
26698+++ b/drivers/block/drbd/drbd_receiver.c
26699@@ -894,7 +894,7 @@ retry:
26700 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
26701 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
26702
26703- atomic_set(&mdev->packet_seq, 0);
26704+ atomic_set_unchecked(&mdev->packet_seq, 0);
26705 mdev->peer_seq = 0;
26706
26707 drbd_thread_start(&mdev->asender);
26708@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
26709 do {
26710 next_epoch = NULL;
26711
26712- epoch_size = atomic_read(&epoch->epoch_size);
26713+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
26714
26715 switch (ev & ~EV_CLEANUP) {
26716 case EV_PUT:
26717@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
26718 rv = FE_DESTROYED;
26719 } else {
26720 epoch->flags = 0;
26721- atomic_set(&epoch->epoch_size, 0);
26722+ atomic_set_unchecked(&epoch->epoch_size, 0);
26723 /* atomic_set(&epoch->active, 0); is already zero */
26724 if (rv == FE_STILL_LIVE)
26725 rv = FE_RECYCLED;
26726@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
26727 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
26728 drbd_flush(mdev);
26729
26730- if (atomic_read(&mdev->current_epoch->epoch_size)) {
26731+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
26732 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
26733 if (epoch)
26734 break;
26735 }
26736
26737 epoch = mdev->current_epoch;
26738- wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
26739+ wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
26740
26741 D_ASSERT(atomic_read(&epoch->active) == 0);
26742 D_ASSERT(epoch->flags == 0);
26743@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
26744 }
26745
26746 epoch->flags = 0;
26747- atomic_set(&epoch->epoch_size, 0);
26748+ atomic_set_unchecked(&epoch->epoch_size, 0);
26749 atomic_set(&epoch->active, 0);
26750
26751 spin_lock(&mdev->epoch_lock);
26752- if (atomic_read(&mdev->current_epoch->epoch_size)) {
26753+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
26754 list_add(&epoch->list, &mdev->current_epoch->list);
26755 mdev->current_epoch = epoch;
26756 mdev->epochs++;
26757@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
26758 spin_unlock(&mdev->peer_seq_lock);
26759
26760 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
26761- atomic_inc(&mdev->current_epoch->epoch_size);
26762+ atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
26763 return drbd_drain_block(mdev, data_size);
26764 }
26765
26766@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
26767
26768 spin_lock(&mdev->epoch_lock);
26769 e->epoch = mdev->current_epoch;
26770- atomic_inc(&e->epoch->epoch_size);
26771+ atomic_inc_unchecked(&e->epoch->epoch_size);
26772 atomic_inc(&e->epoch->active);
26773 spin_unlock(&mdev->epoch_lock);
26774
26775@@ -3885,7 +3885,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
26776 D_ASSERT(list_empty(&mdev->done_ee));
26777
26778 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
26779- atomic_set(&mdev->current_epoch->epoch_size, 0);
26780+ atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
26781 D_ASSERT(list_empty(&mdev->current_epoch->list));
26782 }
26783
26784diff --git a/drivers/block/loop.c b/drivers/block/loop.c
26785index 1e888c9..05cf1b0 100644
26786--- a/drivers/block/loop.c
26787+++ b/drivers/block/loop.c
26788@@ -227,7 +227,7 @@ static int __do_lo_send_write(struct file *file,
26789 mm_segment_t old_fs = get_fs();
26790
26791 set_fs(get_ds());
26792- bw = file->f_op->write(file, buf, len, &pos);
26793+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
26794 set_fs(old_fs);
26795 if (likely(bw == len))
26796 return 0;
26797diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
26798index 4364303..9adf4ee 100644
26799--- a/drivers/char/Kconfig
26800+++ b/drivers/char/Kconfig
26801@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
26802
26803 config DEVKMEM
26804 bool "/dev/kmem virtual device support"
26805- default y
26806+ default n
26807+ depends on !GRKERNSEC_KMEM
26808 help
26809 Say Y here if you want to support the /dev/kmem device. The
26810 /dev/kmem device is rarely used, but can be used for certain
26811@@ -596,6 +597,7 @@ config DEVPORT
26812 bool
26813 depends on !M68K
26814 depends on ISA || PCI
26815+ depends on !GRKERNSEC_KMEM
26816 default y
26817
26818 source "drivers/s390/char/Kconfig"
26819diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
26820index 2e04433..22afc64 100644
26821--- a/drivers/char/agp/frontend.c
26822+++ b/drivers/char/agp/frontend.c
26823@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
26824 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
26825 return -EFAULT;
26826
26827- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
26828+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
26829 return -EFAULT;
26830
26831 client = agp_find_client_by_pid(reserve.pid);
26832diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
26833index 095ab90..afad0a4 100644
26834--- a/drivers/char/briq_panel.c
26835+++ b/drivers/char/briq_panel.c
26836@@ -9,6 +9,7 @@
26837 #include <linux/types.h>
26838 #include <linux/errno.h>
26839 #include <linux/tty.h>
26840+#include <linux/mutex.h>
26841 #include <linux/timer.h>
26842 #include <linux/kernel.h>
26843 #include <linux/wait.h>
26844@@ -34,6 +35,7 @@ static int vfd_is_open;
26845 static unsigned char vfd[40];
26846 static int vfd_cursor;
26847 static unsigned char ledpb, led;
26848+static DEFINE_MUTEX(vfd_mutex);
26849
26850 static void update_vfd(void)
26851 {
26852@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
26853 if (!vfd_is_open)
26854 return -EBUSY;
26855
26856+ mutex_lock(&vfd_mutex);
26857 for (;;) {
26858 char c;
26859 if (!indx)
26860 break;
26861- if (get_user(c, buf))
26862+ if (get_user(c, buf)) {
26863+ mutex_unlock(&vfd_mutex);
26864 return -EFAULT;
26865+ }
26866 if (esc) {
26867 set_led(c);
26868 esc = 0;
26869@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
26870 buf++;
26871 }
26872 update_vfd();
26873+ mutex_unlock(&vfd_mutex);
26874
26875 return len;
26876 }
26877diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
26878index f773a9d..65cd683 100644
26879--- a/drivers/char/genrtc.c
26880+++ b/drivers/char/genrtc.c
26881@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
26882 switch (cmd) {
26883
26884 case RTC_PLL_GET:
26885+ memset(&pll, 0, sizeof(pll));
26886 if (get_rtc_pll(&pll))
26887 return -EINVAL;
26888 else
26889diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
26890index 0833896..cccce52 100644
26891--- a/drivers/char/hpet.c
26892+++ b/drivers/char/hpet.c
26893@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
26894 }
26895
26896 static int
26897-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
26898+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
26899 struct hpet_info *info)
26900 {
26901 struct hpet_timer __iomem *timer;
26902diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
26903index 58c0e63..46c16bf 100644
26904--- a/drivers/char/ipmi/ipmi_msghandler.c
26905+++ b/drivers/char/ipmi/ipmi_msghandler.c
26906@@ -415,7 +415,7 @@ struct ipmi_smi {
26907 struct proc_dir_entry *proc_dir;
26908 char proc_dir_name[10];
26909
26910- atomic_t stats[IPMI_NUM_STATS];
26911+ atomic_unchecked_t stats[IPMI_NUM_STATS];
26912
26913 /*
26914 * run_to_completion duplicate of smb_info, smi_info
26915@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
26916
26917
26918 #define ipmi_inc_stat(intf, stat) \
26919- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
26920+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
26921 #define ipmi_get_stat(intf, stat) \
26922- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
26923+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
26924
26925 static int is_lan_addr(struct ipmi_addr *addr)
26926 {
26927@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
26928 INIT_LIST_HEAD(&intf->cmd_rcvrs);
26929 init_waitqueue_head(&intf->waitq);
26930 for (i = 0; i < IPMI_NUM_STATS; i++)
26931- atomic_set(&intf->stats[i], 0);
26932+ atomic_set_unchecked(&intf->stats[i], 0);
26933
26934 intf->proc_dir = NULL;
26935
26936diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
26937index 9397ab4..d01bee1 100644
26938--- a/drivers/char/ipmi/ipmi_si_intf.c
26939+++ b/drivers/char/ipmi/ipmi_si_intf.c
26940@@ -277,7 +277,7 @@ struct smi_info {
26941 unsigned char slave_addr;
26942
26943 /* Counters and things for the proc filesystem. */
26944- atomic_t stats[SI_NUM_STATS];
26945+ atomic_unchecked_t stats[SI_NUM_STATS];
26946
26947 struct task_struct *thread;
26948
26949@@ -286,9 +286,9 @@ struct smi_info {
26950 };
26951
26952 #define smi_inc_stat(smi, stat) \
26953- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
26954+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
26955 #define smi_get_stat(smi, stat) \
26956- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
26957+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
26958
26959 #define SI_MAX_PARMS 4
26960
26961@@ -3230,7 +3230,7 @@ static int try_smi_init(struct smi_info *new_smi)
26962 atomic_set(&new_smi->req_events, 0);
26963 new_smi->run_to_completion = 0;
26964 for (i = 0; i < SI_NUM_STATS; i++)
26965- atomic_set(&new_smi->stats[i], 0);
26966+ atomic_set_unchecked(&new_smi->stats[i], 0);
26967
26968 new_smi->interrupt_disabled = 1;
26969 atomic_set(&new_smi->stop_operation, 0);
26970diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
26971index 1aeaaba..e018570 100644
26972--- a/drivers/char/mbcs.c
26973+++ b/drivers/char/mbcs.c
26974@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *dev)
26975 return 0;
26976 }
26977
26978-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
26979+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
26980 {
26981 .part_num = MBCS_PART_NUM,
26982 .mfg_num = MBCS_MFG_NUM,
26983diff --git a/drivers/char/mem.c b/drivers/char/mem.c
26984index 1451790..f705c30 100644
26985--- a/drivers/char/mem.c
26986+++ b/drivers/char/mem.c
26987@@ -18,6 +18,7 @@
26988 #include <linux/raw.h>
26989 #include <linux/tty.h>
26990 #include <linux/capability.h>
26991+#include <linux/security.h>
26992 #include <linux/ptrace.h>
26993 #include <linux/device.h>
26994 #include <linux/highmem.h>
26995@@ -35,6 +36,10 @@
26996 # include <linux/efi.h>
26997 #endif
26998
26999+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
27000+extern const struct file_operations grsec_fops;
27001+#endif
27002+
27003 static inline unsigned long size_inside_page(unsigned long start,
27004 unsigned long size)
27005 {
27006@@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
27007
27008 while (cursor < to) {
27009 if (!devmem_is_allowed(pfn)) {
27010+#ifdef CONFIG_GRKERNSEC_KMEM
27011+ gr_handle_mem_readwrite(from, to);
27012+#else
27013 printk(KERN_INFO
27014 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
27015 current->comm, from, to);
27016+#endif
27017 return 0;
27018 }
27019 cursor += PAGE_SIZE;
27020@@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
27021 }
27022 return 1;
27023 }
27024+#elif defined(CONFIG_GRKERNSEC_KMEM)
27025+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
27026+{
27027+ return 0;
27028+}
27029 #else
27030 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
27031 {
27032@@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
27033
27034 while (count > 0) {
27035 unsigned long remaining;
27036+ char *temp;
27037
27038 sz = size_inside_page(p, count);
27039
27040@@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
27041 if (!ptr)
27042 return -EFAULT;
27043
27044- remaining = copy_to_user(buf, ptr, sz);
27045+#ifdef CONFIG_PAX_USERCOPY
27046+ temp = kmalloc(sz, GFP_KERNEL);
27047+ if (!temp) {
27048+ unxlate_dev_mem_ptr(p, ptr);
27049+ return -ENOMEM;
27050+ }
27051+ memcpy(temp, ptr, sz);
27052+#else
27053+ temp = ptr;
27054+#endif
27055+
27056+ remaining = copy_to_user(buf, temp, sz);
27057+
27058+#ifdef CONFIG_PAX_USERCOPY
27059+ kfree(temp);
27060+#endif
27061+
27062 unxlate_dev_mem_ptr(p, ptr);
27063 if (remaining)
27064 return -EFAULT;
27065@@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
27066 size_t count, loff_t *ppos)
27067 {
27068 unsigned long p = *ppos;
27069- ssize_t low_count, read, sz;
27070+ ssize_t low_count, read, sz, err = 0;
27071 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
27072- int err = 0;
27073
27074 read = 0;
27075 if (p < (unsigned long) high_memory) {
27076@@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
27077 }
27078 #endif
27079 while (low_count > 0) {
27080+ char *temp;
27081+
27082 sz = size_inside_page(p, low_count);
27083
27084 /*
27085@@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
27086 */
27087 kbuf = xlate_dev_kmem_ptr((char *)p);
27088
27089- if (copy_to_user(buf, kbuf, sz))
27090+#ifdef CONFIG_PAX_USERCOPY
27091+ temp = kmalloc(sz, GFP_KERNEL);
27092+ if (!temp)
27093+ return -ENOMEM;
27094+ memcpy(temp, kbuf, sz);
27095+#else
27096+ temp = kbuf;
27097+#endif
27098+
27099+ err = copy_to_user(buf, temp, sz);
27100+
27101+#ifdef CONFIG_PAX_USERCOPY
27102+ kfree(temp);
27103+#endif
27104+
27105+ if (err)
27106 return -EFAULT;
27107 buf += sz;
27108 p += sz;
27109@@ -867,6 +914,9 @@ static const struct memdev {
27110 #ifdef CONFIG_CRASH_DUMP
27111 [12] = { "oldmem", 0, &oldmem_fops, NULL },
27112 #endif
27113+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
27114+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
27115+#endif
27116 };
27117
27118 static int memory_open(struct inode *inode, struct file *filp)
27119diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
27120index da3cfee..a5a6606 100644
27121--- a/drivers/char/nvram.c
27122+++ b/drivers/char/nvram.c
27123@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
27124
27125 spin_unlock_irq(&rtc_lock);
27126
27127- if (copy_to_user(buf, contents, tmp - contents))
27128+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
27129 return -EFAULT;
27130
27131 *ppos = i;
27132diff --git a/drivers/char/random.c b/drivers/char/random.c
27133index 6035ab8..bdfe4fd 100644
27134--- a/drivers/char/random.c
27135+++ b/drivers/char/random.c
27136@@ -261,8 +261,13 @@
27137 /*
27138 * Configuration information
27139 */
27140+#ifdef CONFIG_GRKERNSEC_RANDNET
27141+#define INPUT_POOL_WORDS 512
27142+#define OUTPUT_POOL_WORDS 128
27143+#else
27144 #define INPUT_POOL_WORDS 128
27145 #define OUTPUT_POOL_WORDS 32
27146+#endif
27147 #define SEC_XFER_SIZE 512
27148 #define EXTRACT_SIZE 10
27149
27150@@ -300,10 +305,17 @@ static struct poolinfo {
27151 int poolwords;
27152 int tap1, tap2, tap3, tap4, tap5;
27153 } poolinfo_table[] = {
27154+#ifdef CONFIG_GRKERNSEC_RANDNET
27155+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
27156+ { 512, 411, 308, 208, 104, 1 },
27157+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
27158+ { 128, 103, 76, 51, 25, 1 },
27159+#else
27160 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
27161 { 128, 103, 76, 51, 25, 1 },
27162 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
27163 { 32, 26, 20, 14, 7, 1 },
27164+#endif
27165 #if 0
27166 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
27167 { 2048, 1638, 1231, 819, 411, 1 },
27168@@ -909,7 +921,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
27169
27170 extract_buf(r, tmp);
27171 i = min_t(int, nbytes, EXTRACT_SIZE);
27172- if (copy_to_user(buf, tmp, i)) {
27173+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
27174 ret = -EFAULT;
27175 break;
27176 }
27177@@ -1228,7 +1240,7 @@ EXPORT_SYMBOL(generate_random_uuid);
27178 #include <linux/sysctl.h>
27179
27180 static int min_read_thresh = 8, min_write_thresh;
27181-static int max_read_thresh = INPUT_POOL_WORDS * 32;
27182+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
27183 static int max_write_thresh = INPUT_POOL_WORDS * 32;
27184 static char sysctl_bootid[16];
27185
27186diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
27187index 1ee8ce7..b778bef 100644
27188--- a/drivers/char/sonypi.c
27189+++ b/drivers/char/sonypi.c
27190@@ -55,6 +55,7 @@
27191 #include <asm/uaccess.h>
27192 #include <asm/io.h>
27193 #include <asm/system.h>
27194+#include <asm/local.h>
27195
27196 #include <linux/sonypi.h>
27197
27198@@ -491,7 +492,7 @@ static struct sonypi_device {
27199 spinlock_t fifo_lock;
27200 wait_queue_head_t fifo_proc_list;
27201 struct fasync_struct *fifo_async;
27202- int open_count;
27203+ local_t open_count;
27204 int model;
27205 struct input_dev *input_jog_dev;
27206 struct input_dev *input_key_dev;
27207@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
27208 static int sonypi_misc_release(struct inode *inode, struct file *file)
27209 {
27210 mutex_lock(&sonypi_device.lock);
27211- sonypi_device.open_count--;
27212+ local_dec(&sonypi_device.open_count);
27213 mutex_unlock(&sonypi_device.lock);
27214 return 0;
27215 }
27216@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
27217 {
27218 mutex_lock(&sonypi_device.lock);
27219 /* Flush input queue on first open */
27220- if (!sonypi_device.open_count)
27221+ if (!local_read(&sonypi_device.open_count))
27222 kfifo_reset(&sonypi_device.fifo);
27223- sonypi_device.open_count++;
27224+ local_inc(&sonypi_device.open_count);
27225 mutex_unlock(&sonypi_device.lock);
27226
27227 return 0;
27228diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
27229index 361a1df..2471eee 100644
27230--- a/drivers/char/tpm/tpm.c
27231+++ b/drivers/char/tpm/tpm.c
27232@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
27233 chip->vendor.req_complete_val)
27234 goto out_recv;
27235
27236- if ((status == chip->vendor.req_canceled)) {
27237+ if (status == chip->vendor.req_canceled) {
27238 dev_err(chip->dev, "Operation Canceled\n");
27239 rc = -ECANCELED;
27240 goto out;
27241diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
27242index 0636520..169c1d0 100644
27243--- a/drivers/char/tpm/tpm_bios.c
27244+++ b/drivers/char/tpm/tpm_bios.c
27245@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
27246 event = addr;
27247
27248 if ((event->event_type == 0 && event->event_size == 0) ||
27249- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
27250+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
27251 return NULL;
27252
27253 return addr;
27254@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
27255 return NULL;
27256
27257 if ((event->event_type == 0 && event->event_size == 0) ||
27258- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
27259+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
27260 return NULL;
27261
27262 (*pos)++;
27263@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
27264 int i;
27265
27266 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
27267- seq_putc(m, data[i]);
27268+ if (!seq_putc(m, data[i]))
27269+ return -EFAULT;
27270
27271 return 0;
27272 }
27273@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
27274 log->bios_event_log_end = log->bios_event_log + len;
27275
27276 virt = acpi_os_map_memory(start, len);
27277+ if (!virt) {
27278+ kfree(log->bios_event_log);
27279+ log->bios_event_log = NULL;
27280+ return -EFAULT;
27281+ }
27282
27283- memcpy(log->bios_event_log, virt, len);
27284+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
27285
27286 acpi_os_unmap_memory(virt, len);
27287 return 0;
27288diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
27289index 8e3c46d..c139b99 100644
27290--- a/drivers/char/virtio_console.c
27291+++ b/drivers/char/virtio_console.c
27292@@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
27293 if (to_user) {
27294 ssize_t ret;
27295
27296- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
27297+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
27298 if (ret)
27299 return -EFAULT;
27300 } else {
27301@@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
27302 if (!port_has_data(port) && !port->host_connected)
27303 return 0;
27304
27305- return fill_readbuf(port, ubuf, count, true);
27306+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
27307 }
27308
27309 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
27310diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
27311index eb1d864..39ee5a7 100644
27312--- a/drivers/dma/dmatest.c
27313+++ b/drivers/dma/dmatest.c
27314@@ -591,7 +591,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
27315 }
27316 if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
27317 cnt = dmatest_add_threads(dtc, DMA_PQ);
27318- thread_count += cnt > 0 ?: 0;
27319+ thread_count += cnt > 0 ? cnt : 0;
27320 }
27321
27322 pr_info("dmatest: Started %u threads using %s\n",
27323diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
27324index c9eee6d..f9d5280 100644
27325--- a/drivers/edac/amd64_edac.c
27326+++ b/drivers/edac/amd64_edac.c
27327@@ -2685,7 +2685,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
27328 * PCI core identifies what devices are on a system during boot, and then
27329 * inquiry this table to see if this driver is for a given device found.
27330 */
27331-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
27332+static const struct pci_device_id amd64_pci_table[] __devinitconst = {
27333 {
27334 .vendor = PCI_VENDOR_ID_AMD,
27335 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
27336diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
27337index e47e73b..348e0bd 100644
27338--- a/drivers/edac/amd76x_edac.c
27339+++ b/drivers/edac/amd76x_edac.c
27340@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
27341 edac_mc_free(mci);
27342 }
27343
27344-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
27345+static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
27346 {
27347 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27348 AMD762},
27349diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
27350index 1af531a..3a8ff27 100644
27351--- a/drivers/edac/e752x_edac.c
27352+++ b/drivers/edac/e752x_edac.c
27353@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
27354 edac_mc_free(mci);
27355 }
27356
27357-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
27358+static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
27359 {
27360 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27361 E7520},
27362diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
27363index 6ffb6d2..383d8d7 100644
27364--- a/drivers/edac/e7xxx_edac.c
27365+++ b/drivers/edac/e7xxx_edac.c
27366@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
27367 edac_mc_free(mci);
27368 }
27369
27370-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
27371+static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
27372 {
27373 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27374 E7205},
27375diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
27376index 495198a..ac08c85 100644
27377--- a/drivers/edac/edac_pci_sysfs.c
27378+++ b/drivers/edac/edac_pci_sysfs.c
27379@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
27380 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
27381 static int edac_pci_poll_msec = 1000; /* one second workq period */
27382
27383-static atomic_t pci_parity_count = ATOMIC_INIT(0);
27384-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
27385+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
27386+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
27387
27388 static struct kobject *edac_pci_top_main_kobj;
27389 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
27390@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27391 edac_printk(KERN_CRIT, EDAC_PCI,
27392 "Signaled System Error on %s\n",
27393 pci_name(dev));
27394- atomic_inc(&pci_nonparity_count);
27395+ atomic_inc_unchecked(&pci_nonparity_count);
27396 }
27397
27398 if (status & (PCI_STATUS_PARITY)) {
27399@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27400 "Master Data Parity Error on %s\n",
27401 pci_name(dev));
27402
27403- atomic_inc(&pci_parity_count);
27404+ atomic_inc_unchecked(&pci_parity_count);
27405 }
27406
27407 if (status & (PCI_STATUS_DETECTED_PARITY)) {
27408@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27409 "Detected Parity Error on %s\n",
27410 pci_name(dev));
27411
27412- atomic_inc(&pci_parity_count);
27413+ atomic_inc_unchecked(&pci_parity_count);
27414 }
27415 }
27416
27417@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27418 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
27419 "Signaled System Error on %s\n",
27420 pci_name(dev));
27421- atomic_inc(&pci_nonparity_count);
27422+ atomic_inc_unchecked(&pci_nonparity_count);
27423 }
27424
27425 if (status & (PCI_STATUS_PARITY)) {
27426@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27427 "Master Data Parity Error on "
27428 "%s\n", pci_name(dev));
27429
27430- atomic_inc(&pci_parity_count);
27431+ atomic_inc_unchecked(&pci_parity_count);
27432 }
27433
27434 if (status & (PCI_STATUS_DETECTED_PARITY)) {
27435@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27436 "Detected Parity Error on %s\n",
27437 pci_name(dev));
27438
27439- atomic_inc(&pci_parity_count);
27440+ atomic_inc_unchecked(&pci_parity_count);
27441 }
27442 }
27443 }
27444@@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
27445 if (!check_pci_errors)
27446 return;
27447
27448- before_count = atomic_read(&pci_parity_count);
27449+ before_count = atomic_read_unchecked(&pci_parity_count);
27450
27451 /* scan all PCI devices looking for a Parity Error on devices and
27452 * bridges.
27453@@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
27454 /* Only if operator has selected panic on PCI Error */
27455 if (edac_pci_get_panic_on_pe()) {
27456 /* If the count is different 'after' from 'before' */
27457- if (before_count != atomic_read(&pci_parity_count))
27458+ if (before_count != atomic_read_unchecked(&pci_parity_count))
27459 panic("EDAC: PCI Parity Error");
27460 }
27461 }
27462diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
27463index c0510b3..6e2a954 100644
27464--- a/drivers/edac/i3000_edac.c
27465+++ b/drivers/edac/i3000_edac.c
27466@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
27467 edac_mc_free(mci);
27468 }
27469
27470-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
27471+static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
27472 {
27473 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27474 I3000},
27475diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
27476index aa08497..7e6822a 100644
27477--- a/drivers/edac/i3200_edac.c
27478+++ b/drivers/edac/i3200_edac.c
27479@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
27480 edac_mc_free(mci);
27481 }
27482
27483-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
27484+static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
27485 {
27486 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27487 I3200},
27488diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
27489index 4dc3ac2..67d05a6 100644
27490--- a/drivers/edac/i5000_edac.c
27491+++ b/drivers/edac/i5000_edac.c
27492@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
27493 *
27494 * The "E500P" device is the first device supported.
27495 */
27496-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
27497+static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
27498 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
27499 .driver_data = I5000P},
27500
27501diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
27502index bcbdeec..9886d16 100644
27503--- a/drivers/edac/i5100_edac.c
27504+++ b/drivers/edac/i5100_edac.c
27505@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
27506 edac_mc_free(mci);
27507 }
27508
27509-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
27510+static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
27511 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
27512 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
27513 { 0, }
27514diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
27515index 74d6ec34..baff517 100644
27516--- a/drivers/edac/i5400_edac.c
27517+++ b/drivers/edac/i5400_edac.c
27518@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
27519 *
27520 * The "E500P" device is the first device supported.
27521 */
27522-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
27523+static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
27524 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
27525 {0,} /* 0 terminated list. */
27526 };
27527diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
27528index 6104dba..e7ea8e1 100644
27529--- a/drivers/edac/i7300_edac.c
27530+++ b/drivers/edac/i7300_edac.c
27531@@ -1192,7 +1192,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
27532 *
27533 * Has only 8086:360c PCI ID
27534 */
27535-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
27536+static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
27537 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
27538 {0,} /* 0 terminated list. */
27539 };
27540diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
27541index 70ad892..178943c 100644
27542--- a/drivers/edac/i7core_edac.c
27543+++ b/drivers/edac/i7core_edac.c
27544@@ -391,7 +391,7 @@ static const struct pci_id_table pci_dev_table[] = {
27545 /*
27546 * pci_device_id table for which devices we are looking for
27547 */
27548-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
27549+static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
27550 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
27551 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
27552 {0,} /* 0 terminated list. */
27553diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
27554index 4329d39..f3022ef 100644
27555--- a/drivers/edac/i82443bxgx_edac.c
27556+++ b/drivers/edac/i82443bxgx_edac.c
27557@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
27558
27559 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
27560
27561-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
27562+static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
27563 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
27564 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
27565 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
27566diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
27567index 931a057..fd28340 100644
27568--- a/drivers/edac/i82860_edac.c
27569+++ b/drivers/edac/i82860_edac.c
27570@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
27571 edac_mc_free(mci);
27572 }
27573
27574-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
27575+static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
27576 {
27577 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27578 I82860},
27579diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
27580index 33864c6..01edc61 100644
27581--- a/drivers/edac/i82875p_edac.c
27582+++ b/drivers/edac/i82875p_edac.c
27583@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
27584 edac_mc_free(mci);
27585 }
27586
27587-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
27588+static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
27589 {
27590 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27591 I82875P},
27592diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
27593index a5da732..983363b 100644
27594--- a/drivers/edac/i82975x_edac.c
27595+++ b/drivers/edac/i82975x_edac.c
27596@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
27597 edac_mc_free(mci);
27598 }
27599
27600-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
27601+static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
27602 {
27603 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27604 I82975X
27605diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
27606index 0106747..0b40417 100644
27607--- a/drivers/edac/mce_amd.h
27608+++ b/drivers/edac/mce_amd.h
27609@@ -83,7 +83,7 @@ struct amd_decoder_ops {
27610 bool (*dc_mce)(u16, u8);
27611 bool (*ic_mce)(u16, u8);
27612 bool (*nb_mce)(u16, u8);
27613-};
27614+} __no_const;
27615
27616 void amd_report_gart_errors(bool);
27617 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
27618diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
27619index b153674..ad2ba9b 100644
27620--- a/drivers/edac/r82600_edac.c
27621+++ b/drivers/edac/r82600_edac.c
27622@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
27623 edac_mc_free(mci);
27624 }
27625
27626-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
27627+static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
27628 {
27629 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
27630 },
27631diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
27632index 7a402bf..af0b211 100644
27633--- a/drivers/edac/sb_edac.c
27634+++ b/drivers/edac/sb_edac.c
27635@@ -367,7 +367,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
27636 /*
27637 * pci_device_id table for which devices we are looking for
27638 */
27639-static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
27640+static const struct pci_device_id sbridge_pci_tbl[] __devinitconst = {
27641 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
27642 {0,} /* 0 terminated list. */
27643 };
27644diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
27645index b6f47de..c5acf3a 100644
27646--- a/drivers/edac/x38_edac.c
27647+++ b/drivers/edac/x38_edac.c
27648@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
27649 edac_mc_free(mci);
27650 }
27651
27652-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
27653+static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
27654 {
27655 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27656 X38},
27657diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
27658index 85661b0..c784559a 100644
27659--- a/drivers/firewire/core-card.c
27660+++ b/drivers/firewire/core-card.c
27661@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
27662
27663 void fw_core_remove_card(struct fw_card *card)
27664 {
27665- struct fw_card_driver dummy_driver = dummy_driver_template;
27666+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
27667
27668 card->driver->update_phy_reg(card, 4,
27669 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
27670diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
27671index 4799393..37bd3ab 100644
27672--- a/drivers/firewire/core-cdev.c
27673+++ b/drivers/firewire/core-cdev.c
27674@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct client *client,
27675 int ret;
27676
27677 if ((request->channels == 0 && request->bandwidth == 0) ||
27678- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
27679- request->bandwidth < 0)
27680+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
27681 return -EINVAL;
27682
27683 r = kmalloc(sizeof(*r), GFP_KERNEL);
27684diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
27685index 855ab3f..11f4bbd 100644
27686--- a/drivers/firewire/core-transaction.c
27687+++ b/drivers/firewire/core-transaction.c
27688@@ -37,6 +37,7 @@
27689 #include <linux/timer.h>
27690 #include <linux/types.h>
27691 #include <linux/workqueue.h>
27692+#include <linux/sched.h>
27693
27694 #include <asm/byteorder.h>
27695
27696diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
27697index b45be57..5fad18b 100644
27698--- a/drivers/firewire/core.h
27699+++ b/drivers/firewire/core.h
27700@@ -101,6 +101,7 @@ struct fw_card_driver {
27701
27702 int (*stop_iso)(struct fw_iso_context *ctx);
27703 };
27704+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
27705
27706 void fw_card_initialize(struct fw_card *card,
27707 const struct fw_card_driver *driver, struct device *device);
27708diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
27709index 153980b..4b4d046 100644
27710--- a/drivers/firmware/dmi_scan.c
27711+++ b/drivers/firmware/dmi_scan.c
27712@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
27713 }
27714 }
27715 else {
27716- /*
27717- * no iounmap() for that ioremap(); it would be a no-op, but
27718- * it's so early in setup that sucker gets confused into doing
27719- * what it shouldn't if we actually call it.
27720- */
27721 p = dmi_ioremap(0xF0000, 0x10000);
27722 if (p == NULL)
27723 goto error;
27724@@ -723,7 +718,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
27725 if (buf == NULL)
27726 return -1;
27727
27728- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
27729+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
27730
27731 iounmap(buf);
27732 return 0;
27733diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
27734index 98723cb..10ca85b 100644
27735--- a/drivers/gpio/gpio-vr41xx.c
27736+++ b/drivers/gpio/gpio-vr41xx.c
27737@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
27738 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
27739 maskl, pendl, maskh, pendh);
27740
27741- atomic_inc(&irq_err_count);
27742+ atomic_inc_unchecked(&irq_err_count);
27743
27744 return -EINVAL;
27745 }
27746diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
27747index 8323fc3..5c1d755 100644
27748--- a/drivers/gpu/drm/drm_crtc.c
27749+++ b/drivers/gpu/drm/drm_crtc.c
27750@@ -1379,7 +1379,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
27751 */
27752 if ((out_resp->count_modes >= mode_count) && mode_count) {
27753 copied = 0;
27754- mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
27755+ mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
27756 list_for_each_entry(mode, &connector->modes, head) {
27757 drm_crtc_convert_to_umode(&u_mode, mode);
27758 if (copy_to_user(mode_ptr + copied,
27759@@ -1394,8 +1394,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
27760
27761 if ((out_resp->count_props >= props_count) && props_count) {
27762 copied = 0;
27763- prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
27764- prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
27765+ prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
27766+ prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
27767 for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
27768 if (connector->property_ids[i] != 0) {
27769 if (put_user(connector->property_ids[i],
27770@@ -1417,7 +1417,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
27771
27772 if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
27773 copied = 0;
27774- encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
27775+ encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
27776 for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
27777 if (connector->encoder_ids[i] != 0) {
27778 if (put_user(connector->encoder_ids[i],
27779@@ -1576,7 +1576,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
27780 }
27781
27782 for (i = 0; i < crtc_req->count_connectors; i++) {
27783- set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
27784+ set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
27785 if (get_user(out_id, &set_connectors_ptr[i])) {
27786 ret = -EFAULT;
27787 goto out;
27788@@ -1857,7 +1857,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
27789 fb = obj_to_fb(obj);
27790
27791 num_clips = r->num_clips;
27792- clips_ptr = (struct drm_clip_rect *)(unsigned long)r->clips_ptr;
27793+ clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
27794
27795 if (!num_clips != !clips_ptr) {
27796 ret = -EINVAL;
27797@@ -2283,7 +2283,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
27798 out_resp->flags = property->flags;
27799
27800 if ((out_resp->count_values >= value_count) && value_count) {
27801- values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
27802+ values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
27803 for (i = 0; i < value_count; i++) {
27804 if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
27805 ret = -EFAULT;
27806@@ -2296,7 +2296,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
27807 if (property->flags & DRM_MODE_PROP_ENUM) {
27808 if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
27809 copied = 0;
27810- enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
27811+ enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
27812 list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
27813
27814 if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
27815@@ -2319,7 +2319,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
27816 if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
27817 copied = 0;
27818 blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
27819- blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
27820+ blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
27821
27822 list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
27823 if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
27824@@ -2380,7 +2380,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
27825 struct drm_mode_get_blob *out_resp = data;
27826 struct drm_property_blob *blob;
27827 int ret = 0;
27828- void *blob_ptr;
27829+ void __user *blob_ptr;
27830
27831 if (!drm_core_check_feature(dev, DRIVER_MODESET))
27832 return -EINVAL;
27833@@ -2394,7 +2394,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
27834 blob = obj_to_blob(obj);
27835
27836 if (out_resp->length == blob->length) {
27837- blob_ptr = (void *)(unsigned long)out_resp->data;
27838+ blob_ptr = (void __user *)(unsigned long)out_resp->data;
27839 if (copy_to_user(blob_ptr, blob->data, blob->length)){
27840 ret = -EFAULT;
27841 goto done;
27842diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
27843index d2619d7..bd6bd00 100644
27844--- a/drivers/gpu/drm/drm_crtc_helper.c
27845+++ b/drivers/gpu/drm/drm_crtc_helper.c
27846@@ -279,7 +279,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
27847 struct drm_crtc *tmp;
27848 int crtc_mask = 1;
27849
27850- WARN(!crtc, "checking null crtc?\n");
27851+ BUG_ON(!crtc);
27852
27853 dev = crtc->dev;
27854
27855diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
27856index 40c187c..5746164 100644
27857--- a/drivers/gpu/drm/drm_drv.c
27858+++ b/drivers/gpu/drm/drm_drv.c
27859@@ -308,7 +308,7 @@ module_exit(drm_core_exit);
27860 /**
27861 * Copy and IOCTL return string to user space
27862 */
27863-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
27864+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
27865 {
27866 int len;
27867
27868@@ -387,7 +387,7 @@ long drm_ioctl(struct file *filp,
27869
27870 dev = file_priv->minor->dev;
27871 atomic_inc(&dev->ioctl_count);
27872- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
27873+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
27874 ++file_priv->ioctl_count;
27875
27876 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
27877diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
27878index 828bf65..cdaa0e9 100644
27879--- a/drivers/gpu/drm/drm_fops.c
27880+++ b/drivers/gpu/drm/drm_fops.c
27881@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
27882 }
27883
27884 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
27885- atomic_set(&dev->counts[i], 0);
27886+ atomic_set_unchecked(&dev->counts[i], 0);
27887
27888 dev->sigdata.lock = NULL;
27889
27890@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct file *filp)
27891
27892 retcode = drm_open_helper(inode, filp, dev);
27893 if (!retcode) {
27894- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
27895- if (!dev->open_count++)
27896+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
27897+ if (local_inc_return(&dev->open_count) == 1)
27898 retcode = drm_setup(dev);
27899 }
27900 if (!retcode) {
27901@@ -473,7 +473,7 @@ int drm_release(struct inode *inode, struct file *filp)
27902
27903 mutex_lock(&drm_global_mutex);
27904
27905- DRM_DEBUG("open_count = %d\n", dev->open_count);
27906+ DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
27907
27908 if (dev->driver->preclose)
27909 dev->driver->preclose(dev, file_priv);
27910@@ -485,7 +485,7 @@ int drm_release(struct inode *inode, struct file *filp)
27911 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
27912 task_pid_nr(current),
27913 (long)old_encode_dev(file_priv->minor->device),
27914- dev->open_count);
27915+ local_read(&dev->open_count));
27916
27917 /* Release any auth tokens that might point to this file_priv,
27918 (do that under the drm_global_mutex) */
27919@@ -571,8 +571,8 @@ int drm_release(struct inode *inode, struct file *filp)
27920 * End inline drm_release
27921 */
27922
27923- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
27924- if (!--dev->open_count) {
27925+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
27926+ if (local_dec_and_test(&dev->open_count)) {
27927 if (atomic_read(&dev->ioctl_count)) {
27928 DRM_ERROR("Device busy: %d\n",
27929 atomic_read(&dev->ioctl_count));
27930diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
27931index c87dc96..326055d 100644
27932--- a/drivers/gpu/drm/drm_global.c
27933+++ b/drivers/gpu/drm/drm_global.c
27934@@ -36,7 +36,7 @@
27935 struct drm_global_item {
27936 struct mutex mutex;
27937 void *object;
27938- int refcount;
27939+ atomic_t refcount;
27940 };
27941
27942 static struct drm_global_item glob[DRM_GLOBAL_NUM];
27943@@ -49,7 +49,7 @@ void drm_global_init(void)
27944 struct drm_global_item *item = &glob[i];
27945 mutex_init(&item->mutex);
27946 item->object = NULL;
27947- item->refcount = 0;
27948+ atomic_set(&item->refcount, 0);
27949 }
27950 }
27951
27952@@ -59,7 +59,7 @@ void drm_global_release(void)
27953 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
27954 struct drm_global_item *item = &glob[i];
27955 BUG_ON(item->object != NULL);
27956- BUG_ON(item->refcount != 0);
27957+ BUG_ON(atomic_read(&item->refcount) != 0);
27958 }
27959 }
27960
27961@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
27962 void *object;
27963
27964 mutex_lock(&item->mutex);
27965- if (item->refcount == 0) {
27966+ if (atomic_read(&item->refcount) == 0) {
27967 item->object = kzalloc(ref->size, GFP_KERNEL);
27968 if (unlikely(item->object == NULL)) {
27969 ret = -ENOMEM;
27970@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
27971 goto out_err;
27972
27973 }
27974- ++item->refcount;
27975+ atomic_inc(&item->refcount);
27976 ref->object = item->object;
27977 object = item->object;
27978 mutex_unlock(&item->mutex);
27979@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
27980 struct drm_global_item *item = &glob[ref->global_type];
27981
27982 mutex_lock(&item->mutex);
27983- BUG_ON(item->refcount == 0);
27984+ BUG_ON(atomic_read(&item->refcount) == 0);
27985 BUG_ON(ref->object != item->object);
27986- if (--item->refcount == 0) {
27987+ if (atomic_dec_and_test(&item->refcount)) {
27988 ref->release(ref);
27989 item->object = NULL;
27990 }
27991diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
27992index ab1162d..42587b2 100644
27993--- a/drivers/gpu/drm/drm_info.c
27994+++ b/drivers/gpu/drm/drm_info.c
27995@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
27996 struct drm_local_map *map;
27997 struct drm_map_list *r_list;
27998
27999- /* Hardcoded from _DRM_FRAME_BUFFER,
28000- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
28001- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
28002- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
28003+ static const char * const types[] = {
28004+ [_DRM_FRAME_BUFFER] = "FB",
28005+ [_DRM_REGISTERS] = "REG",
28006+ [_DRM_SHM] = "SHM",
28007+ [_DRM_AGP] = "AGP",
28008+ [_DRM_SCATTER_GATHER] = "SG",
28009+ [_DRM_CONSISTENT] = "PCI",
28010+ [_DRM_GEM] = "GEM" };
28011 const char *type;
28012 int i;
28013
28014@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
28015 map = r_list->map;
28016 if (!map)
28017 continue;
28018- if (map->type < 0 || map->type > 5)
28019+ if (map->type >= ARRAY_SIZE(types))
28020 type = "??";
28021 else
28022 type = types[map->type];
28023@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, void *data)
28024 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
28025 vma->vm_flags & VM_LOCKED ? 'l' : '-',
28026 vma->vm_flags & VM_IO ? 'i' : '-',
28027+#ifdef CONFIG_GRKERNSEC_HIDESYM
28028+ 0);
28029+#else
28030 vma->vm_pgoff);
28031+#endif
28032
28033 #if defined(__i386__)
28034 pgprot = pgprot_val(vma->vm_page_prot);
28035diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
28036index ddd70db..40321e6 100644
28037--- a/drivers/gpu/drm/drm_ioc32.c
28038+++ b/drivers/gpu/drm/drm_ioc32.c
28039@@ -456,7 +456,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
28040 request = compat_alloc_user_space(nbytes);
28041 if (!access_ok(VERIFY_WRITE, request, nbytes))
28042 return -EFAULT;
28043- list = (struct drm_buf_desc *) (request + 1);
28044+ list = (struct drm_buf_desc __user *) (request + 1);
28045
28046 if (__put_user(count, &request->count)
28047 || __put_user(list, &request->list))
28048@@ -517,7 +517,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
28049 request = compat_alloc_user_space(nbytes);
28050 if (!access_ok(VERIFY_WRITE, request, nbytes))
28051 return -EFAULT;
28052- list = (struct drm_buf_pub *) (request + 1);
28053+ list = (struct drm_buf_pub __user *) (request + 1);
28054
28055 if (__put_user(count, &request->count)
28056 || __put_user(list, &request->list))
28057diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
28058index 904d7e9..ab88581 100644
28059--- a/drivers/gpu/drm/drm_ioctl.c
28060+++ b/drivers/gpu/drm/drm_ioctl.c
28061@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev, void *data,
28062 stats->data[i].value =
28063 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
28064 else
28065- stats->data[i].value = atomic_read(&dev->counts[i]);
28066+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
28067 stats->data[i].type = dev->types[i];
28068 }
28069
28070diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
28071index 632ae24..244cf4a 100644
28072--- a/drivers/gpu/drm/drm_lock.c
28073+++ b/drivers/gpu/drm/drm_lock.c
28074@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
28075 if (drm_lock_take(&master->lock, lock->context)) {
28076 master->lock.file_priv = file_priv;
28077 master->lock.lock_time = jiffies;
28078- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
28079+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
28080 break; /* Got lock */
28081 }
28082
28083@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
28084 return -EINVAL;
28085 }
28086
28087- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
28088+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
28089
28090 if (drm_lock_free(&master->lock, lock->context)) {
28091 /* FIXME: Should really bail out here. */
28092diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
28093index 8f371e8..9f85d52 100644
28094--- a/drivers/gpu/drm/i810/i810_dma.c
28095+++ b/drivers/gpu/drm/i810/i810_dma.c
28096@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
28097 dma->buflist[vertex->idx],
28098 vertex->discard, vertex->used);
28099
28100- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
28101- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
28102+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
28103+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
28104 sarea_priv->last_enqueue = dev_priv->counter - 1;
28105 sarea_priv->last_dispatch = (int)hw_status[5];
28106
28107@@ -1111,8 +1111,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
28108 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
28109 mc->last_render);
28110
28111- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
28112- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
28113+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
28114+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
28115 sarea_priv->last_enqueue = dev_priv->counter - 1;
28116 sarea_priv->last_dispatch = (int)hw_status[5];
28117
28118diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
28119index c9339f4..f5e1b9d 100644
28120--- a/drivers/gpu/drm/i810/i810_drv.h
28121+++ b/drivers/gpu/drm/i810/i810_drv.h
28122@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
28123 int page_flipping;
28124
28125 wait_queue_head_t irq_queue;
28126- atomic_t irq_received;
28127- atomic_t irq_emitted;
28128+ atomic_unchecked_t irq_received;
28129+ atomic_unchecked_t irq_emitted;
28130
28131 int front_offset;
28132 } drm_i810_private_t;
28133diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
28134index 004b048..7588eba 100644
28135--- a/drivers/gpu/drm/i915/i915_debugfs.c
28136+++ b/drivers/gpu/drm/i915/i915_debugfs.c
28137@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
28138 I915_READ(GTIMR));
28139 }
28140 seq_printf(m, "Interrupts received: %d\n",
28141- atomic_read(&dev_priv->irq_received));
28142+ atomic_read_unchecked(&dev_priv->irq_received));
28143 for (i = 0; i < I915_NUM_RINGS; i++) {
28144 if (IS_GEN6(dev) || IS_GEN7(dev)) {
28145 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
28146@@ -1232,7 +1232,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
28147 return ret;
28148
28149 if (opregion->header)
28150- seq_write(m, opregion->header, OPREGION_SIZE);
28151+ seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
28152
28153 mutex_unlock(&dev->struct_mutex);
28154
28155diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
28156index a9ae374..43c1e9e 100644
28157--- a/drivers/gpu/drm/i915/i915_dma.c
28158+++ b/drivers/gpu/drm/i915/i915_dma.c
28159@@ -1172,7 +1172,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
28160 bool can_switch;
28161
28162 spin_lock(&dev->count_lock);
28163- can_switch = (dev->open_count == 0);
28164+ can_switch = (local_read(&dev->open_count) == 0);
28165 spin_unlock(&dev->count_lock);
28166 return can_switch;
28167 }
28168diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
28169index 554bef7..d24791c 100644
28170--- a/drivers/gpu/drm/i915/i915_drv.h
28171+++ b/drivers/gpu/drm/i915/i915_drv.h
28172@@ -229,7 +229,7 @@ struct drm_i915_display_funcs {
28173 /* render clock increase/decrease */
28174 /* display clock increase/decrease */
28175 /* pll clock increase/decrease */
28176-};
28177+} __no_const;
28178
28179 struct intel_device_info {
28180 u8 gen;
28181@@ -312,7 +312,7 @@ typedef struct drm_i915_private {
28182 int current_page;
28183 int page_flipping;
28184
28185- atomic_t irq_received;
28186+ atomic_unchecked_t irq_received;
28187
28188 /* protects the irq masks */
28189 spinlock_t irq_lock;
28190@@ -887,7 +887,7 @@ struct drm_i915_gem_object {
28191 * will be page flipped away on the next vblank. When it
28192 * reaches 0, dev_priv->pending_flip_queue will be woken up.
28193 */
28194- atomic_t pending_flip;
28195+ atomic_unchecked_t pending_flip;
28196 };
28197
28198 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
28199@@ -1267,7 +1267,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
28200 extern void intel_teardown_gmbus(struct drm_device *dev);
28201 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
28202 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
28203-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
28204+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
28205 {
28206 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
28207 }
28208diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
28209index b9da890..cad1d98 100644
28210--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
28211+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
28212@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
28213 i915_gem_clflush_object(obj);
28214
28215 if (obj->base.pending_write_domain)
28216- cd->flips |= atomic_read(&obj->pending_flip);
28217+ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
28218
28219 /* The actual obj->write_domain will be updated with
28220 * pending_write_domain after we emit the accumulated flush for all
28221@@ -882,9 +882,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
28222
28223 static int
28224 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
28225- int count)
28226+ unsigned int count)
28227 {
28228- int i;
28229+ unsigned int i;
28230
28231 for (i = 0; i < count; i++) {
28232 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
28233diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
28234index b40004b..7c53a75 100644
28235--- a/drivers/gpu/drm/i915/i915_irq.c
28236+++ b/drivers/gpu/drm/i915/i915_irq.c
28237@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
28238 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
28239 struct drm_i915_master_private *master_priv;
28240
28241- atomic_inc(&dev_priv->irq_received);
28242+ atomic_inc_unchecked(&dev_priv->irq_received);
28243
28244 /* disable master interrupt before clearing iir */
28245 de_ier = I915_READ(DEIER);
28246@@ -566,7 +566,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
28247 struct drm_i915_master_private *master_priv;
28248 u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
28249
28250- atomic_inc(&dev_priv->irq_received);
28251+ atomic_inc_unchecked(&dev_priv->irq_received);
28252
28253 if (IS_GEN6(dev))
28254 bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
28255@@ -1231,7 +1231,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
28256 int ret = IRQ_NONE, pipe;
28257 bool blc_event = false;
28258
28259- atomic_inc(&dev_priv->irq_received);
28260+ atomic_inc_unchecked(&dev_priv->irq_received);
28261
28262 iir = I915_READ(IIR);
28263
28264@@ -1743,7 +1743,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
28265 {
28266 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
28267
28268- atomic_set(&dev_priv->irq_received, 0);
28269+ atomic_set_unchecked(&dev_priv->irq_received, 0);
28270
28271 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
28272 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
28273@@ -1931,7 +1931,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
28274 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
28275 int pipe;
28276
28277- atomic_set(&dev_priv->irq_received, 0);
28278+ atomic_set_unchecked(&dev_priv->irq_received, 0);
28279
28280 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
28281 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
28282diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
28283index daa5743..c0757a9 100644
28284--- a/drivers/gpu/drm/i915/intel_display.c
28285+++ b/drivers/gpu/drm/i915/intel_display.c
28286@@ -2230,7 +2230,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
28287
28288 wait_event(dev_priv->pending_flip_queue,
28289 atomic_read(&dev_priv->mm.wedged) ||
28290- atomic_read(&obj->pending_flip) == 0);
28291+ atomic_read_unchecked(&obj->pending_flip) == 0);
28292
28293 /* Big Hammer, we also need to ensure that any pending
28294 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
28295@@ -2851,7 +2851,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
28296 obj = to_intel_framebuffer(crtc->fb)->obj;
28297 dev_priv = crtc->dev->dev_private;
28298 wait_event(dev_priv->pending_flip_queue,
28299- atomic_read(&obj->pending_flip) == 0);
28300+ atomic_read_unchecked(&obj->pending_flip) == 0);
28301 }
28302
28303 static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
28304@@ -6952,7 +6952,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
28305
28306 atomic_clear_mask(1 << intel_crtc->plane,
28307 &obj->pending_flip.counter);
28308- if (atomic_read(&obj->pending_flip) == 0)
28309+ if (atomic_read_unchecked(&obj->pending_flip) == 0)
28310 wake_up(&dev_priv->pending_flip_queue);
28311
28312 schedule_work(&work->work);
28313@@ -7242,7 +7242,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
28314 /* Block clients from rendering to the new back buffer until
28315 * the flip occurs and the object is no longer visible.
28316 */
28317- atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
28318+ atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
28319
28320 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
28321 if (ret)
28322@@ -7256,7 +7256,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
28323 return 0;
28324
28325 cleanup_pending:
28326- atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
28327+ atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
28328 drm_gem_object_unreference(&work->old_fb_obj->base);
28329 drm_gem_object_unreference(&obj->base);
28330 mutex_unlock(&dev->struct_mutex);
28331diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
28332index 54558a0..2d97005 100644
28333--- a/drivers/gpu/drm/mga/mga_drv.h
28334+++ b/drivers/gpu/drm/mga/mga_drv.h
28335@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
28336 u32 clear_cmd;
28337 u32 maccess;
28338
28339- atomic_t vbl_received; /**< Number of vblanks received. */
28340+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
28341 wait_queue_head_t fence_queue;
28342- atomic_t last_fence_retired;
28343+ atomic_unchecked_t last_fence_retired;
28344 u32 next_fence_to_post;
28345
28346 unsigned int fb_cpp;
28347diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
28348index 2581202..f230a8d9 100644
28349--- a/drivers/gpu/drm/mga/mga_irq.c
28350+++ b/drivers/gpu/drm/mga/mga_irq.c
28351@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
28352 if (crtc != 0)
28353 return 0;
28354
28355- return atomic_read(&dev_priv->vbl_received);
28356+ return atomic_read_unchecked(&dev_priv->vbl_received);
28357 }
28358
28359
28360@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
28361 /* VBLANK interrupt */
28362 if (status & MGA_VLINEPEN) {
28363 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
28364- atomic_inc(&dev_priv->vbl_received);
28365+ atomic_inc_unchecked(&dev_priv->vbl_received);
28366 drm_handle_vblank(dev, 0);
28367 handled = 1;
28368 }
28369@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
28370 if ((prim_start & ~0x03) != (prim_end & ~0x03))
28371 MGA_WRITE(MGA_PRIMEND, prim_end);
28372
28373- atomic_inc(&dev_priv->last_fence_retired);
28374+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
28375 DRM_WAKEUP(&dev_priv->fence_queue);
28376 handled = 1;
28377 }
28378@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
28379 * using fences.
28380 */
28381 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
28382- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
28383+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
28384 - *sequence) <= (1 << 23)));
28385
28386 *sequence = cur_fence;
28387diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
28388index 5fc201b..7b032b9 100644
28389--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
28390+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
28391@@ -201,7 +201,7 @@ struct methods {
28392 const char desc[8];
28393 void (*loadbios)(struct drm_device *, uint8_t *);
28394 const bool rw;
28395-};
28396+} __do_const;
28397
28398 static struct methods shadow_methods[] = {
28399 { "PRAMIN", load_vbios_pramin, true },
28400@@ -5474,7 +5474,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
28401 struct bit_table {
28402 const char id;
28403 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
28404-};
28405+} __no_const;
28406
28407 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
28408
28409diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
28410index 4c0be3a..5757582 100644
28411--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
28412+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
28413@@ -238,7 +238,7 @@ struct nouveau_channel {
28414 struct list_head pending;
28415 uint32_t sequence;
28416 uint32_t sequence_ack;
28417- atomic_t last_sequence_irq;
28418+ atomic_unchecked_t last_sequence_irq;
28419 struct nouveau_vma vma;
28420 } fence;
28421
28422@@ -319,7 +319,7 @@ struct nouveau_exec_engine {
28423 u32 handle, u16 class);
28424 void (*set_tile_region)(struct drm_device *dev, int i);
28425 void (*tlb_flush)(struct drm_device *, int engine);
28426-};
28427+} __no_const;
28428
28429 struct nouveau_instmem_engine {
28430 void *priv;
28431@@ -341,13 +341,13 @@ struct nouveau_instmem_engine {
28432 struct nouveau_mc_engine {
28433 int (*init)(struct drm_device *dev);
28434 void (*takedown)(struct drm_device *dev);
28435-};
28436+} __no_const;
28437
28438 struct nouveau_timer_engine {
28439 int (*init)(struct drm_device *dev);
28440 void (*takedown)(struct drm_device *dev);
28441 uint64_t (*read)(struct drm_device *dev);
28442-};
28443+} __no_const;
28444
28445 struct nouveau_fb_engine {
28446 int num_tiles;
28447@@ -558,7 +558,7 @@ struct nouveau_vram_engine {
28448 void (*put)(struct drm_device *, struct nouveau_mem **);
28449
28450 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
28451-};
28452+} __no_const;
28453
28454 struct nouveau_engine {
28455 struct nouveau_instmem_engine instmem;
28456@@ -706,7 +706,7 @@ struct drm_nouveau_private {
28457 struct drm_global_reference mem_global_ref;
28458 struct ttm_bo_global_ref bo_global_ref;
28459 struct ttm_bo_device bdev;
28460- atomic_t validate_sequence;
28461+ atomic_unchecked_t validate_sequence;
28462 } ttm;
28463
28464 struct {
28465diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
28466index 2f6daae..c9d7b9e 100644
28467--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
28468+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
28469@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
28470 if (USE_REFCNT(dev))
28471 sequence = nvchan_rd32(chan, 0x48);
28472 else
28473- sequence = atomic_read(&chan->fence.last_sequence_irq);
28474+ sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq);
28475
28476 if (chan->fence.sequence_ack == sequence)
28477 goto out;
28478@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
28479 return ret;
28480 }
28481
28482- atomic_set(&chan->fence.last_sequence_irq, 0);
28483+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
28484 return 0;
28485 }
28486
28487diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
28488index 5f0bc57..eb9fac8 100644
28489--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
28490+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
28491@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
28492 int trycnt = 0;
28493 int ret, i;
28494
28495- sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
28496+ sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
28497 retry:
28498 if (++trycnt > 100000) {
28499 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
28500diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
28501index d8831ab..0ba8356 100644
28502--- a/drivers/gpu/drm/nouveau/nouveau_state.c
28503+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
28504@@ -542,7 +542,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
28505 bool can_switch;
28506
28507 spin_lock(&dev->count_lock);
28508- can_switch = (dev->open_count == 0);
28509+ can_switch = (local_read(&dev->open_count) == 0);
28510 spin_unlock(&dev->count_lock);
28511 return can_switch;
28512 }
28513diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
28514index dbdea8e..cd6eeeb 100644
28515--- a/drivers/gpu/drm/nouveau/nv04_graph.c
28516+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
28517@@ -554,7 +554,7 @@ static int
28518 nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
28519 u32 class, u32 mthd, u32 data)
28520 {
28521- atomic_set(&chan->fence.last_sequence_irq, data);
28522+ atomic_set_unchecked(&chan->fence.last_sequence_irq, data);
28523 return 0;
28524 }
28525
28526diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
28527index bcac90b..53bfc76 100644
28528--- a/drivers/gpu/drm/r128/r128_cce.c
28529+++ b/drivers/gpu/drm/r128/r128_cce.c
28530@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
28531
28532 /* GH: Simple idle check.
28533 */
28534- atomic_set(&dev_priv->idle_count, 0);
28535+ atomic_set_unchecked(&dev_priv->idle_count, 0);
28536
28537 /* We don't support anything other than bus-mastering ring mode,
28538 * but the ring can be in either AGP or PCI space for the ring
28539diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
28540index 930c71b..499aded 100644
28541--- a/drivers/gpu/drm/r128/r128_drv.h
28542+++ b/drivers/gpu/drm/r128/r128_drv.h
28543@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
28544 int is_pci;
28545 unsigned long cce_buffers_offset;
28546
28547- atomic_t idle_count;
28548+ atomic_unchecked_t idle_count;
28549
28550 int page_flipping;
28551 int current_page;
28552 u32 crtc_offset;
28553 u32 crtc_offset_cntl;
28554
28555- atomic_t vbl_received;
28556+ atomic_unchecked_t vbl_received;
28557
28558 u32 color_fmt;
28559 unsigned int front_offset;
28560diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
28561index 429d5a0..7e899ed 100644
28562--- a/drivers/gpu/drm/r128/r128_irq.c
28563+++ b/drivers/gpu/drm/r128/r128_irq.c
28564@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
28565 if (crtc != 0)
28566 return 0;
28567
28568- return atomic_read(&dev_priv->vbl_received);
28569+ return atomic_read_unchecked(&dev_priv->vbl_received);
28570 }
28571
28572 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
28573@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
28574 /* VBLANK interrupt */
28575 if (status & R128_CRTC_VBLANK_INT) {
28576 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
28577- atomic_inc(&dev_priv->vbl_received);
28578+ atomic_inc_unchecked(&dev_priv->vbl_received);
28579 drm_handle_vblank(dev, 0);
28580 return IRQ_HANDLED;
28581 }
28582diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
28583index a9e33ce..09edd4b 100644
28584--- a/drivers/gpu/drm/r128/r128_state.c
28585+++ b/drivers/gpu/drm/r128/r128_state.c
28586@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
28587
28588 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
28589 {
28590- if (atomic_read(&dev_priv->idle_count) == 0)
28591+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
28592 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
28593 else
28594- atomic_set(&dev_priv->idle_count, 0);
28595+ atomic_set_unchecked(&dev_priv->idle_count, 0);
28596 }
28597
28598 #endif
28599diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
28600index 5a82b6b..9e69c73 100644
28601--- a/drivers/gpu/drm/radeon/mkregtable.c
28602+++ b/drivers/gpu/drm/radeon/mkregtable.c
28603@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
28604 regex_t mask_rex;
28605 regmatch_t match[4];
28606 char buf[1024];
28607- size_t end;
28608+ long end;
28609 int len;
28610 int done = 0;
28611 int r;
28612 unsigned o;
28613 struct offset *offset;
28614 char last_reg_s[10];
28615- int last_reg;
28616+ unsigned long last_reg;
28617
28618 if (regcomp
28619 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
28620diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
28621index 8227e76..ce0b195 100644
28622--- a/drivers/gpu/drm/radeon/radeon.h
28623+++ b/drivers/gpu/drm/radeon/radeon.h
28624@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_device *rdev);
28625 */
28626 struct radeon_fence_driver {
28627 uint32_t scratch_reg;
28628- atomic_t seq;
28629+ atomic_unchecked_t seq;
28630 uint32_t last_seq;
28631 unsigned long last_jiffies;
28632 unsigned long last_timeout;
28633@@ -530,7 +530,7 @@ struct r600_blit_cp_primitives {
28634 int x2, int y2);
28635 void (*draw_auto)(struct radeon_device *rdev);
28636 void (*set_default_state)(struct radeon_device *rdev);
28637-};
28638+} __no_const;
28639
28640 struct r600_blit {
28641 struct mutex mutex;
28642@@ -954,7 +954,7 @@ struct radeon_asic {
28643 void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
28644 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
28645 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
28646-};
28647+} __no_const;
28648
28649 /*
28650 * Asic structures
28651diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
28652index 9b39145..389b93b 100644
28653--- a/drivers/gpu/drm/radeon/radeon_device.c
28654+++ b/drivers/gpu/drm/radeon/radeon_device.c
28655@@ -687,7 +687,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
28656 bool can_switch;
28657
28658 spin_lock(&dev->count_lock);
28659- can_switch = (dev->open_count == 0);
28660+ can_switch = (local_read(&dev->open_count) == 0);
28661 spin_unlock(&dev->count_lock);
28662 return can_switch;
28663 }
28664diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
28665index a1b59ca..86f2d44 100644
28666--- a/drivers/gpu/drm/radeon/radeon_drv.h
28667+++ b/drivers/gpu/drm/radeon/radeon_drv.h
28668@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
28669
28670 /* SW interrupt */
28671 wait_queue_head_t swi_queue;
28672- atomic_t swi_emitted;
28673+ atomic_unchecked_t swi_emitted;
28674 int vblank_crtc;
28675 uint32_t irq_enable_reg;
28676 uint32_t r500_disp_irq_reg;
28677diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
28678index 76ec0e9..6feb1a3 100644
28679--- a/drivers/gpu/drm/radeon/radeon_fence.c
28680+++ b/drivers/gpu/drm/radeon/radeon_fence.c
28681@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
28682 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
28683 return 0;
28684 }
28685- fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
28686+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
28687 if (!rdev->cp.ready)
28688 /* FIXME: cp is not running assume everythings is done right
28689 * away
28690@@ -373,7 +373,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
28691 return r;
28692 }
28693 radeon_fence_write(rdev, 0);
28694- atomic_set(&rdev->fence_drv.seq, 0);
28695+ atomic_set_unchecked(&rdev->fence_drv.seq, 0);
28696 INIT_LIST_HEAD(&rdev->fence_drv.created);
28697 INIT_LIST_HEAD(&rdev->fence_drv.emited);
28698 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
28699diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
28700index 48b7cea..342236f 100644
28701--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
28702+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
28703@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
28704 request = compat_alloc_user_space(sizeof(*request));
28705 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
28706 || __put_user(req32.param, &request->param)
28707- || __put_user((void __user *)(unsigned long)req32.value,
28708+ || __put_user((unsigned long)req32.value,
28709 &request->value))
28710 return -EFAULT;
28711
28712diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
28713index 00da384..32f972d 100644
28714--- a/drivers/gpu/drm/radeon/radeon_irq.c
28715+++ b/drivers/gpu/drm/radeon/radeon_irq.c
28716@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
28717 unsigned int ret;
28718 RING_LOCALS;
28719
28720- atomic_inc(&dev_priv->swi_emitted);
28721- ret = atomic_read(&dev_priv->swi_emitted);
28722+ atomic_inc_unchecked(&dev_priv->swi_emitted);
28723+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
28724
28725 BEGIN_RING(4);
28726 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
28727@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
28728 drm_radeon_private_t *dev_priv =
28729 (drm_radeon_private_t *) dev->dev_private;
28730
28731- atomic_set(&dev_priv->swi_emitted, 0);
28732+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
28733 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
28734
28735 dev->max_vblank_count = 0x001fffff;
28736diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
28737index e8422ae..d22d4a8 100644
28738--- a/drivers/gpu/drm/radeon/radeon_state.c
28739+++ b/drivers/gpu/drm/radeon/radeon_state.c
28740@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
28741 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
28742 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
28743
28744- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
28745+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
28746 sarea_priv->nbox * sizeof(depth_boxes[0])))
28747 return -EFAULT;
28748
28749@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
28750 {
28751 drm_radeon_private_t *dev_priv = dev->dev_private;
28752 drm_radeon_getparam_t *param = data;
28753- int value;
28754+ int value = 0;
28755
28756 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
28757
28758diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
28759index 0b5468b..9c4b308 100644
28760--- a/drivers/gpu/drm/radeon/radeon_ttm.c
28761+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
28762@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
28763 }
28764 if (unlikely(ttm_vm_ops == NULL)) {
28765 ttm_vm_ops = vma->vm_ops;
28766- radeon_ttm_vm_ops = *ttm_vm_ops;
28767- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
28768+ pax_open_kernel();
28769+ memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
28770+ *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
28771+ pax_close_kernel();
28772 }
28773 vma->vm_ops = &radeon_ttm_vm_ops;
28774 return 0;
28775diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
28776index a9049ed..501f284 100644
28777--- a/drivers/gpu/drm/radeon/rs690.c
28778+++ b/drivers/gpu/drm/radeon/rs690.c
28779@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
28780 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
28781 rdev->pm.sideport_bandwidth.full)
28782 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
28783- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
28784+ read_delay_latency.full = dfixed_const(800 * 1000);
28785 read_delay_latency.full = dfixed_div(read_delay_latency,
28786 rdev->pm.igp_sideport_mclk);
28787+ a.full = dfixed_const(370);
28788+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
28789 } else {
28790 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
28791 rdev->pm.k8_bandwidth.full)
28792diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
28793index 727e93d..1565650 100644
28794--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
28795+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
28796@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages(void)
28797 static int ttm_pool_mm_shrink(struct shrinker *shrink,
28798 struct shrink_control *sc)
28799 {
28800- static atomic_t start_pool = ATOMIC_INIT(0);
28801+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
28802 unsigned i;
28803- unsigned pool_offset = atomic_add_return(1, &start_pool);
28804+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
28805 struct ttm_page_pool *pool;
28806 int shrink_pages = sc->nr_to_scan;
28807
28808diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
28809index 9cf87d9..2000b7d 100644
28810--- a/drivers/gpu/drm/via/via_drv.h
28811+++ b/drivers/gpu/drm/via/via_drv.h
28812@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
28813 typedef uint32_t maskarray_t[5];
28814
28815 typedef struct drm_via_irq {
28816- atomic_t irq_received;
28817+ atomic_unchecked_t irq_received;
28818 uint32_t pending_mask;
28819 uint32_t enable_mask;
28820 wait_queue_head_t irq_queue;
28821@@ -75,7 +75,7 @@ typedef struct drm_via_private {
28822 struct timeval last_vblank;
28823 int last_vblank_valid;
28824 unsigned usec_per_vblank;
28825- atomic_t vbl_received;
28826+ atomic_unchecked_t vbl_received;
28827 drm_via_state_t hc_state;
28828 char pci_buf[VIA_PCI_BUF_SIZE];
28829 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
28830diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
28831index d391f48..10c8ca3 100644
28832--- a/drivers/gpu/drm/via/via_irq.c
28833+++ b/drivers/gpu/drm/via/via_irq.c
28834@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
28835 if (crtc != 0)
28836 return 0;
28837
28838- return atomic_read(&dev_priv->vbl_received);
28839+ return atomic_read_unchecked(&dev_priv->vbl_received);
28840 }
28841
28842 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
28843@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
28844
28845 status = VIA_READ(VIA_REG_INTERRUPT);
28846 if (status & VIA_IRQ_VBLANK_PENDING) {
28847- atomic_inc(&dev_priv->vbl_received);
28848- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
28849+ atomic_inc_unchecked(&dev_priv->vbl_received);
28850+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
28851 do_gettimeofday(&cur_vblank);
28852 if (dev_priv->last_vblank_valid) {
28853 dev_priv->usec_per_vblank =
28854@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
28855 dev_priv->last_vblank = cur_vblank;
28856 dev_priv->last_vblank_valid = 1;
28857 }
28858- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
28859+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
28860 DRM_DEBUG("US per vblank is: %u\n",
28861 dev_priv->usec_per_vblank);
28862 }
28863@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
28864
28865 for (i = 0; i < dev_priv->num_irqs; ++i) {
28866 if (status & cur_irq->pending_mask) {
28867- atomic_inc(&cur_irq->irq_received);
28868+ atomic_inc_unchecked(&cur_irq->irq_received);
28869 DRM_WAKEUP(&cur_irq->irq_queue);
28870 handled = 1;
28871 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
28872@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
28873 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
28874 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
28875 masks[irq][4]));
28876- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
28877+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
28878 } else {
28879 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
28880 (((cur_irq_sequence =
28881- atomic_read(&cur_irq->irq_received)) -
28882+ atomic_read_unchecked(&cur_irq->irq_received)) -
28883 *sequence) <= (1 << 23)));
28884 }
28885 *sequence = cur_irq_sequence;
28886@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
28887 }
28888
28889 for (i = 0; i < dev_priv->num_irqs; ++i) {
28890- atomic_set(&cur_irq->irq_received, 0);
28891+ atomic_set_unchecked(&cur_irq->irq_received, 0);
28892 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
28893 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
28894 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
28895@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
28896 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
28897 case VIA_IRQ_RELATIVE:
28898 irqwait->request.sequence +=
28899- atomic_read(&cur_irq->irq_received);
28900+ atomic_read_unchecked(&cur_irq->irq_received);
28901 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
28902 case VIA_IRQ_ABSOLUTE:
28903 break;
28904diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
28905index dc27970..f18b008 100644
28906--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
28907+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
28908@@ -260,7 +260,7 @@ struct vmw_private {
28909 * Fencing and IRQs.
28910 */
28911
28912- atomic_t marker_seq;
28913+ atomic_unchecked_t marker_seq;
28914 wait_queue_head_t fence_queue;
28915 wait_queue_head_t fifo_queue;
28916 int fence_queue_waiters; /* Protected by hw_mutex */
28917diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
28918index a0c2f12..68ae6cb 100644
28919--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
28920+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
28921@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
28922 (unsigned int) min,
28923 (unsigned int) fifo->capabilities);
28924
28925- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
28926+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
28927 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
28928 vmw_marker_queue_init(&fifo->marker_queue);
28929 return vmw_fifo_send_fence(dev_priv, &dummy);
28930@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
28931 if (reserveable)
28932 iowrite32(bytes, fifo_mem +
28933 SVGA_FIFO_RESERVED);
28934- return fifo_mem + (next_cmd >> 2);
28935+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
28936 } else {
28937 need_bounce = true;
28938 }
28939@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
28940
28941 fm = vmw_fifo_reserve(dev_priv, bytes);
28942 if (unlikely(fm == NULL)) {
28943- *seqno = atomic_read(&dev_priv->marker_seq);
28944+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
28945 ret = -ENOMEM;
28946 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
28947 false, 3*HZ);
28948@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
28949 }
28950
28951 do {
28952- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
28953+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
28954 } while (*seqno == 0);
28955
28956 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
28957diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
28958index cabc95f..14b3d77 100644
28959--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
28960+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
28961@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
28962 * emitted. Then the fence is stale and signaled.
28963 */
28964
28965- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
28966+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
28967 > VMW_FENCE_WRAP);
28968
28969 return ret;
28970@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
28971
28972 if (fifo_idle)
28973 down_read(&fifo_state->rwsem);
28974- signal_seq = atomic_read(&dev_priv->marker_seq);
28975+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
28976 ret = 0;
28977
28978 for (;;) {
28979diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
28980index 8a8725c..afed796 100644
28981--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
28982+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
28983@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
28984 while (!vmw_lag_lt(queue, us)) {
28985 spin_lock(&queue->lock);
28986 if (list_empty(&queue->head))
28987- seqno = atomic_read(&dev_priv->marker_seq);
28988+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
28989 else {
28990 marker = list_first_entry(&queue->head,
28991 struct vmw_marker, head);
28992diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
28993index bb656d8..4169fca 100644
28994--- a/drivers/hid/hid-core.c
28995+++ b/drivers/hid/hid-core.c
28996@@ -2012,7 +2012,7 @@ static bool hid_ignore(struct hid_device *hdev)
28997
28998 int hid_add_device(struct hid_device *hdev)
28999 {
29000- static atomic_t id = ATOMIC_INIT(0);
29001+ static atomic_unchecked_t id = ATOMIC_INIT(0);
29002 int ret;
29003
29004 if (WARN_ON(hdev->status & HID_STAT_ADDED))
29005@@ -2027,7 +2027,7 @@ int hid_add_device(struct hid_device *hdev)
29006 /* XXX hack, any other cleaner solution after the driver core
29007 * is converted to allow more than 20 bytes as the device name? */
29008 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
29009- hdev->vendor, hdev->product, atomic_inc_return(&id));
29010+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
29011
29012 hid_debug_register(hdev, dev_name(&hdev->dev));
29013 ret = device_add(&hdev->dev);
29014diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
29015index 4ef02b2..8a96831 100644
29016--- a/drivers/hid/usbhid/hiddev.c
29017+++ b/drivers/hid/usbhid/hiddev.c
29018@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
29019 break;
29020
29021 case HIDIOCAPPLICATION:
29022- if (arg < 0 || arg >= hid->maxapplication)
29023+ if (arg >= hid->maxapplication)
29024 break;
29025
29026 for (i = 0; i < hid->maxcollection; i++)
29027diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
29028index 4065374..10ed7dc 100644
29029--- a/drivers/hv/channel.c
29030+++ b/drivers/hv/channel.c
29031@@ -400,8 +400,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
29032 int ret = 0;
29033 int t;
29034
29035- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
29036- atomic_inc(&vmbus_connection.next_gpadl_handle);
29037+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
29038+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
29039
29040 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
29041 if (ret)
29042diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
29043index 0fb100e..baf87e5 100644
29044--- a/drivers/hv/hv.c
29045+++ b/drivers/hv/hv.c
29046@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
29047 u64 output_address = (output) ? virt_to_phys(output) : 0;
29048 u32 output_address_hi = output_address >> 32;
29049 u32 output_address_lo = output_address & 0xFFFFFFFF;
29050- void *hypercall_page = hv_context.hypercall_page;
29051+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
29052
29053 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
29054 "=a"(hv_status_lo) : "d" (control_hi),
29055diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
29056index 0aee112..b72d21f 100644
29057--- a/drivers/hv/hyperv_vmbus.h
29058+++ b/drivers/hv/hyperv_vmbus.h
29059@@ -556,7 +556,7 @@ enum vmbus_connect_state {
29060 struct vmbus_connection {
29061 enum vmbus_connect_state conn_state;
29062
29063- atomic_t next_gpadl_handle;
29064+ atomic_unchecked_t next_gpadl_handle;
29065
29066 /*
29067 * Represents channel interrupts. Each bit position represents a
29068diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
29069index d2d0a2a..90b8f4d 100644
29070--- a/drivers/hv/vmbus_drv.c
29071+++ b/drivers/hv/vmbus_drv.c
29072@@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
29073 {
29074 int ret = 0;
29075
29076- static atomic_t device_num = ATOMIC_INIT(0);
29077+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
29078
29079 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
29080- atomic_inc_return(&device_num));
29081+ atomic_inc_return_unchecked(&device_num));
29082
29083 child_device_obj->device.bus = &hv_bus;
29084 child_device_obj->device.parent = &hv_acpi_dev->dev;
29085diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
29086index 66f6729..2d6de0a 100644
29087--- a/drivers/hwmon/acpi_power_meter.c
29088+++ b/drivers/hwmon/acpi_power_meter.c
29089@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
29090 return res;
29091
29092 temp /= 1000;
29093- if (temp < 0)
29094- return -EINVAL;
29095
29096 mutex_lock(&resource->lock);
29097 resource->trip[attr->index - 7] = temp;
29098diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
29099index 5357925..6cf0418 100644
29100--- a/drivers/hwmon/sht15.c
29101+++ b/drivers/hwmon/sht15.c
29102@@ -166,7 +166,7 @@ struct sht15_data {
29103 int supply_uV;
29104 bool supply_uV_valid;
29105 struct work_struct update_supply_work;
29106- atomic_t interrupt_handled;
29107+ atomic_unchecked_t interrupt_handled;
29108 };
29109
29110 /**
29111@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
29112 return ret;
29113
29114 gpio_direction_input(data->pdata->gpio_data);
29115- atomic_set(&data->interrupt_handled, 0);
29116+ atomic_set_unchecked(&data->interrupt_handled, 0);
29117
29118 enable_irq(gpio_to_irq(data->pdata->gpio_data));
29119 if (gpio_get_value(data->pdata->gpio_data) == 0) {
29120 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
29121 /* Only relevant if the interrupt hasn't occurred. */
29122- if (!atomic_read(&data->interrupt_handled))
29123+ if (!atomic_read_unchecked(&data->interrupt_handled))
29124 schedule_work(&data->read_work);
29125 }
29126 ret = wait_event_timeout(data->wait_queue,
29127@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
29128
29129 /* First disable the interrupt */
29130 disable_irq_nosync(irq);
29131- atomic_inc(&data->interrupt_handled);
29132+ atomic_inc_unchecked(&data->interrupt_handled);
29133 /* Then schedule a reading work struct */
29134 if (data->state != SHT15_READING_NOTHING)
29135 schedule_work(&data->read_work);
29136@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
29137 * If not, then start the interrupt again - care here as could
29138 * have gone low in meantime so verify it hasn't!
29139 */
29140- atomic_set(&data->interrupt_handled, 0);
29141+ atomic_set_unchecked(&data->interrupt_handled, 0);
29142 enable_irq(gpio_to_irq(data->pdata->gpio_data));
29143 /* If still not occurred or another handler has been scheduled */
29144 if (gpio_get_value(data->pdata->gpio_data)
29145- || atomic_read(&data->interrupt_handled))
29146+ || atomic_read_unchecked(&data->interrupt_handled))
29147 return;
29148 }
29149
29150diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
29151index 378fcb5..5e91fa8 100644
29152--- a/drivers/i2c/busses/i2c-amd756-s4882.c
29153+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
29154@@ -43,7 +43,7 @@
29155 extern struct i2c_adapter amd756_smbus;
29156
29157 static struct i2c_adapter *s4882_adapter;
29158-static struct i2c_algorithm *s4882_algo;
29159+static i2c_algorithm_no_const *s4882_algo;
29160
29161 /* Wrapper access functions for multiplexed SMBus */
29162 static DEFINE_MUTEX(amd756_lock);
29163diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
29164index 29015eb..af2d8e9 100644
29165--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
29166+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
29167@@ -41,7 +41,7 @@
29168 extern struct i2c_adapter *nforce2_smbus;
29169
29170 static struct i2c_adapter *s4985_adapter;
29171-static struct i2c_algorithm *s4985_algo;
29172+static i2c_algorithm_no_const *s4985_algo;
29173
29174 /* Wrapper access functions for multiplexed SMBus */
29175 static DEFINE_MUTEX(nforce2_lock);
29176diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
29177index d7a4833..7fae376 100644
29178--- a/drivers/i2c/i2c-mux.c
29179+++ b/drivers/i2c/i2c-mux.c
29180@@ -28,7 +28,7 @@
29181 /* multiplexer per channel data */
29182 struct i2c_mux_priv {
29183 struct i2c_adapter adap;
29184- struct i2c_algorithm algo;
29185+ i2c_algorithm_no_const algo;
29186
29187 struct i2c_adapter *parent;
29188 void *mux_dev; /* the mux chip/device */
29189diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
29190index 57d00ca..0145194 100644
29191--- a/drivers/ide/aec62xx.c
29192+++ b/drivers/ide/aec62xx.c
29193@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
29194 .cable_detect = atp86x_cable_detect,
29195 };
29196
29197-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
29198+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
29199 { /* 0: AEC6210 */
29200 .name = DRV_NAME,
29201 .init_chipset = init_chipset_aec62xx,
29202diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
29203index 2c8016a..911a27c 100644
29204--- a/drivers/ide/alim15x3.c
29205+++ b/drivers/ide/alim15x3.c
29206@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
29207 .dma_sff_read_status = ide_dma_sff_read_status,
29208 };
29209
29210-static const struct ide_port_info ali15x3_chipset __devinitdata = {
29211+static const struct ide_port_info ali15x3_chipset __devinitconst = {
29212 .name = DRV_NAME,
29213 .init_chipset = init_chipset_ali15x3,
29214 .init_hwif = init_hwif_ali15x3,
29215diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
29216index 3747b25..56fc995 100644
29217--- a/drivers/ide/amd74xx.c
29218+++ b/drivers/ide/amd74xx.c
29219@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
29220 .udma_mask = udma, \
29221 }
29222
29223-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
29224+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
29225 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
29226 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
29227 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
29228diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
29229index 15f0ead..cb43480 100644
29230--- a/drivers/ide/atiixp.c
29231+++ b/drivers/ide/atiixp.c
29232@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
29233 .cable_detect = atiixp_cable_detect,
29234 };
29235
29236-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
29237+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
29238 { /* 0: IXP200/300/400/700 */
29239 .name = DRV_NAME,
29240 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
29241diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
29242index 5f80312..d1fc438 100644
29243--- a/drivers/ide/cmd64x.c
29244+++ b/drivers/ide/cmd64x.c
29245@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
29246 .dma_sff_read_status = ide_dma_sff_read_status,
29247 };
29248
29249-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
29250+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
29251 { /* 0: CMD643 */
29252 .name = DRV_NAME,
29253 .init_chipset = init_chipset_cmd64x,
29254diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
29255index 2c1e5f7..1444762 100644
29256--- a/drivers/ide/cs5520.c
29257+++ b/drivers/ide/cs5520.c
29258@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
29259 .set_dma_mode = cs5520_set_dma_mode,
29260 };
29261
29262-static const struct ide_port_info cyrix_chipset __devinitdata = {
29263+static const struct ide_port_info cyrix_chipset __devinitconst = {
29264 .name = DRV_NAME,
29265 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
29266 .port_ops = &cs5520_port_ops,
29267diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
29268index 4dc4eb9..49b40ad 100644
29269--- a/drivers/ide/cs5530.c
29270+++ b/drivers/ide/cs5530.c
29271@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
29272 .udma_filter = cs5530_udma_filter,
29273 };
29274
29275-static const struct ide_port_info cs5530_chipset __devinitdata = {
29276+static const struct ide_port_info cs5530_chipset __devinitconst = {
29277 .name = DRV_NAME,
29278 .init_chipset = init_chipset_cs5530,
29279 .init_hwif = init_hwif_cs5530,
29280diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
29281index 5059faf..18d4c85 100644
29282--- a/drivers/ide/cs5535.c
29283+++ b/drivers/ide/cs5535.c
29284@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
29285 .cable_detect = cs5535_cable_detect,
29286 };
29287
29288-static const struct ide_port_info cs5535_chipset __devinitdata = {
29289+static const struct ide_port_info cs5535_chipset __devinitconst = {
29290 .name = DRV_NAME,
29291 .port_ops = &cs5535_port_ops,
29292 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
29293diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
29294index 847553f..3ffb49d 100644
29295--- a/drivers/ide/cy82c693.c
29296+++ b/drivers/ide/cy82c693.c
29297@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
29298 .set_dma_mode = cy82c693_set_dma_mode,
29299 };
29300
29301-static const struct ide_port_info cy82c693_chipset __devinitdata = {
29302+static const struct ide_port_info cy82c693_chipset __devinitconst = {
29303 .name = DRV_NAME,
29304 .init_iops = init_iops_cy82c693,
29305 .port_ops = &cy82c693_port_ops,
29306diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
29307index 58c51cd..4aec3b8 100644
29308--- a/drivers/ide/hpt366.c
29309+++ b/drivers/ide/hpt366.c
29310@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
29311 }
29312 };
29313
29314-static const struct hpt_info hpt36x __devinitdata = {
29315+static const struct hpt_info hpt36x __devinitconst = {
29316 .chip_name = "HPT36x",
29317 .chip_type = HPT36x,
29318 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
29319@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
29320 .timings = &hpt36x_timings
29321 };
29322
29323-static const struct hpt_info hpt370 __devinitdata = {
29324+static const struct hpt_info hpt370 __devinitconst = {
29325 .chip_name = "HPT370",
29326 .chip_type = HPT370,
29327 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
29328@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
29329 .timings = &hpt37x_timings
29330 };
29331
29332-static const struct hpt_info hpt370a __devinitdata = {
29333+static const struct hpt_info hpt370a __devinitconst = {
29334 .chip_name = "HPT370A",
29335 .chip_type = HPT370A,
29336 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
29337@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
29338 .timings = &hpt37x_timings
29339 };
29340
29341-static const struct hpt_info hpt374 __devinitdata = {
29342+static const struct hpt_info hpt374 __devinitconst = {
29343 .chip_name = "HPT374",
29344 .chip_type = HPT374,
29345 .udma_mask = ATA_UDMA5,
29346@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
29347 .timings = &hpt37x_timings
29348 };
29349
29350-static const struct hpt_info hpt372 __devinitdata = {
29351+static const struct hpt_info hpt372 __devinitconst = {
29352 .chip_name = "HPT372",
29353 .chip_type = HPT372,
29354 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29355@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
29356 .timings = &hpt37x_timings
29357 };
29358
29359-static const struct hpt_info hpt372a __devinitdata = {
29360+static const struct hpt_info hpt372a __devinitconst = {
29361 .chip_name = "HPT372A",
29362 .chip_type = HPT372A,
29363 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29364@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
29365 .timings = &hpt37x_timings
29366 };
29367
29368-static const struct hpt_info hpt302 __devinitdata = {
29369+static const struct hpt_info hpt302 __devinitconst = {
29370 .chip_name = "HPT302",
29371 .chip_type = HPT302,
29372 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29373@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
29374 .timings = &hpt37x_timings
29375 };
29376
29377-static const struct hpt_info hpt371 __devinitdata = {
29378+static const struct hpt_info hpt371 __devinitconst = {
29379 .chip_name = "HPT371",
29380 .chip_type = HPT371,
29381 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29382@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
29383 .timings = &hpt37x_timings
29384 };
29385
29386-static const struct hpt_info hpt372n __devinitdata = {
29387+static const struct hpt_info hpt372n __devinitconst = {
29388 .chip_name = "HPT372N",
29389 .chip_type = HPT372N,
29390 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29391@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
29392 .timings = &hpt37x_timings
29393 };
29394
29395-static const struct hpt_info hpt302n __devinitdata = {
29396+static const struct hpt_info hpt302n __devinitconst = {
29397 .chip_name = "HPT302N",
29398 .chip_type = HPT302N,
29399 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29400@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
29401 .timings = &hpt37x_timings
29402 };
29403
29404-static const struct hpt_info hpt371n __devinitdata = {
29405+static const struct hpt_info hpt371n __devinitconst = {
29406 .chip_name = "HPT371N",
29407 .chip_type = HPT371N,
29408 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29409@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
29410 .dma_sff_read_status = ide_dma_sff_read_status,
29411 };
29412
29413-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
29414+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
29415 { /* 0: HPT36x */
29416 .name = DRV_NAME,
29417 .init_chipset = init_chipset_hpt366,
29418diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
29419index 8126824..55a2798 100644
29420--- a/drivers/ide/ide-cd.c
29421+++ b/drivers/ide/ide-cd.c
29422@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
29423 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
29424 if ((unsigned long)buf & alignment
29425 || blk_rq_bytes(rq) & q->dma_pad_mask
29426- || object_is_on_stack(buf))
29427+ || object_starts_on_stack(buf))
29428 drive->dma = 0;
29429 }
29430 }
29431diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
29432index a743e68..1cfd674 100644
29433--- a/drivers/ide/ide-pci-generic.c
29434+++ b/drivers/ide/ide-pci-generic.c
29435@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
29436 .udma_mask = ATA_UDMA6, \
29437 }
29438
29439-static const struct ide_port_info generic_chipsets[] __devinitdata = {
29440+static const struct ide_port_info generic_chipsets[] __devinitconst = {
29441 /* 0: Unknown */
29442 DECLARE_GENERIC_PCI_DEV(0),
29443
29444diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
29445index 560e66d..d5dd180 100644
29446--- a/drivers/ide/it8172.c
29447+++ b/drivers/ide/it8172.c
29448@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
29449 .set_dma_mode = it8172_set_dma_mode,
29450 };
29451
29452-static const struct ide_port_info it8172_port_info __devinitdata = {
29453+static const struct ide_port_info it8172_port_info __devinitconst = {
29454 .name = DRV_NAME,
29455 .port_ops = &it8172_port_ops,
29456 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
29457diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
29458index 46816ba..1847aeb 100644
29459--- a/drivers/ide/it8213.c
29460+++ b/drivers/ide/it8213.c
29461@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
29462 .cable_detect = it8213_cable_detect,
29463 };
29464
29465-static const struct ide_port_info it8213_chipset __devinitdata = {
29466+static const struct ide_port_info it8213_chipset __devinitconst = {
29467 .name = DRV_NAME,
29468 .enablebits = { {0x41, 0x80, 0x80} },
29469 .port_ops = &it8213_port_ops,
29470diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
29471index 2e3169f..c5611db 100644
29472--- a/drivers/ide/it821x.c
29473+++ b/drivers/ide/it821x.c
29474@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
29475 .cable_detect = it821x_cable_detect,
29476 };
29477
29478-static const struct ide_port_info it821x_chipset __devinitdata = {
29479+static const struct ide_port_info it821x_chipset __devinitconst = {
29480 .name = DRV_NAME,
29481 .init_chipset = init_chipset_it821x,
29482 .init_hwif = init_hwif_it821x,
29483diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
29484index 74c2c4a..efddd7d 100644
29485--- a/drivers/ide/jmicron.c
29486+++ b/drivers/ide/jmicron.c
29487@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
29488 .cable_detect = jmicron_cable_detect,
29489 };
29490
29491-static const struct ide_port_info jmicron_chipset __devinitdata = {
29492+static const struct ide_port_info jmicron_chipset __devinitconst = {
29493 .name = DRV_NAME,
29494 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
29495 .port_ops = &jmicron_port_ops,
29496diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
29497index 95327a2..73f78d8 100644
29498--- a/drivers/ide/ns87415.c
29499+++ b/drivers/ide/ns87415.c
29500@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
29501 .dma_sff_read_status = superio_dma_sff_read_status,
29502 };
29503
29504-static const struct ide_port_info ns87415_chipset __devinitdata = {
29505+static const struct ide_port_info ns87415_chipset __devinitconst = {
29506 .name = DRV_NAME,
29507 .init_hwif = init_hwif_ns87415,
29508 .tp_ops = &ns87415_tp_ops,
29509diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
29510index 1a53a4c..39edc66 100644
29511--- a/drivers/ide/opti621.c
29512+++ b/drivers/ide/opti621.c
29513@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
29514 .set_pio_mode = opti621_set_pio_mode,
29515 };
29516
29517-static const struct ide_port_info opti621_chipset __devinitdata = {
29518+static const struct ide_port_info opti621_chipset __devinitconst = {
29519 .name = DRV_NAME,
29520 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
29521 .port_ops = &opti621_port_ops,
29522diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
29523index 9546fe2..2e5ceb6 100644
29524--- a/drivers/ide/pdc202xx_new.c
29525+++ b/drivers/ide/pdc202xx_new.c
29526@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
29527 .udma_mask = udma, \
29528 }
29529
29530-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
29531+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
29532 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
29533 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
29534 };
29535diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
29536index 3a35ec6..5634510 100644
29537--- a/drivers/ide/pdc202xx_old.c
29538+++ b/drivers/ide/pdc202xx_old.c
29539@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
29540 .max_sectors = sectors, \
29541 }
29542
29543-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
29544+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
29545 { /* 0: PDC20246 */
29546 .name = DRV_NAME,
29547 .init_chipset = init_chipset_pdc202xx,
29548diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
29549index 1892e81..fe0fd60 100644
29550--- a/drivers/ide/piix.c
29551+++ b/drivers/ide/piix.c
29552@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
29553 .udma_mask = udma, \
29554 }
29555
29556-static const struct ide_port_info piix_pci_info[] __devinitdata = {
29557+static const struct ide_port_info piix_pci_info[] __devinitconst = {
29558 /* 0: MPIIX */
29559 { /*
29560 * MPIIX actually has only a single IDE channel mapped to
29561diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
29562index a6414a8..c04173e 100644
29563--- a/drivers/ide/rz1000.c
29564+++ b/drivers/ide/rz1000.c
29565@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
29566 }
29567 }
29568
29569-static const struct ide_port_info rz1000_chipset __devinitdata = {
29570+static const struct ide_port_info rz1000_chipset __devinitconst = {
29571 .name = DRV_NAME,
29572 .host_flags = IDE_HFLAG_NO_DMA,
29573 };
29574diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
29575index 356b9b5..d4758eb 100644
29576--- a/drivers/ide/sc1200.c
29577+++ b/drivers/ide/sc1200.c
29578@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
29579 .dma_sff_read_status = ide_dma_sff_read_status,
29580 };
29581
29582-static const struct ide_port_info sc1200_chipset __devinitdata = {
29583+static const struct ide_port_info sc1200_chipset __devinitconst = {
29584 .name = DRV_NAME,
29585 .port_ops = &sc1200_port_ops,
29586 .dma_ops = &sc1200_dma_ops,
29587diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
29588index b7f5b0c..9701038 100644
29589--- a/drivers/ide/scc_pata.c
29590+++ b/drivers/ide/scc_pata.c
29591@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
29592 .dma_sff_read_status = scc_dma_sff_read_status,
29593 };
29594
29595-static const struct ide_port_info scc_chipset __devinitdata = {
29596+static const struct ide_port_info scc_chipset __devinitconst = {
29597 .name = "sccIDE",
29598 .init_iops = init_iops_scc,
29599 .init_dma = scc_init_dma,
29600diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
29601index 35fb8da..24d72ef 100644
29602--- a/drivers/ide/serverworks.c
29603+++ b/drivers/ide/serverworks.c
29604@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
29605 .cable_detect = svwks_cable_detect,
29606 };
29607
29608-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
29609+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
29610 { /* 0: OSB4 */
29611 .name = DRV_NAME,
29612 .init_chipset = init_chipset_svwks,
29613diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
29614index ddeda44..46f7e30 100644
29615--- a/drivers/ide/siimage.c
29616+++ b/drivers/ide/siimage.c
29617@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
29618 .udma_mask = ATA_UDMA6, \
29619 }
29620
29621-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
29622+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
29623 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
29624 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
29625 };
29626diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
29627index 4a00225..09e61b4 100644
29628--- a/drivers/ide/sis5513.c
29629+++ b/drivers/ide/sis5513.c
29630@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
29631 .cable_detect = sis_cable_detect,
29632 };
29633
29634-static const struct ide_port_info sis5513_chipset __devinitdata = {
29635+static const struct ide_port_info sis5513_chipset __devinitconst = {
29636 .name = DRV_NAME,
29637 .init_chipset = init_chipset_sis5513,
29638 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
29639diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
29640index f21dc2a..d051cd2 100644
29641--- a/drivers/ide/sl82c105.c
29642+++ b/drivers/ide/sl82c105.c
29643@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
29644 .dma_sff_read_status = ide_dma_sff_read_status,
29645 };
29646
29647-static const struct ide_port_info sl82c105_chipset __devinitdata = {
29648+static const struct ide_port_info sl82c105_chipset __devinitconst = {
29649 .name = DRV_NAME,
29650 .init_chipset = init_chipset_sl82c105,
29651 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
29652diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
29653index 864ffe0..863a5e9 100644
29654--- a/drivers/ide/slc90e66.c
29655+++ b/drivers/ide/slc90e66.c
29656@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
29657 .cable_detect = slc90e66_cable_detect,
29658 };
29659
29660-static const struct ide_port_info slc90e66_chipset __devinitdata = {
29661+static const struct ide_port_info slc90e66_chipset __devinitconst = {
29662 .name = DRV_NAME,
29663 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
29664 .port_ops = &slc90e66_port_ops,
29665diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
29666index 4799d5c..1794678 100644
29667--- a/drivers/ide/tc86c001.c
29668+++ b/drivers/ide/tc86c001.c
29669@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
29670 .dma_sff_read_status = ide_dma_sff_read_status,
29671 };
29672
29673-static const struct ide_port_info tc86c001_chipset __devinitdata = {
29674+static const struct ide_port_info tc86c001_chipset __devinitconst = {
29675 .name = DRV_NAME,
29676 .init_hwif = init_hwif_tc86c001,
29677 .port_ops = &tc86c001_port_ops,
29678diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
29679index 281c914..55ce1b8 100644
29680--- a/drivers/ide/triflex.c
29681+++ b/drivers/ide/triflex.c
29682@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
29683 .set_dma_mode = triflex_set_mode,
29684 };
29685
29686-static const struct ide_port_info triflex_device __devinitdata = {
29687+static const struct ide_port_info triflex_device __devinitconst = {
29688 .name = DRV_NAME,
29689 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
29690 .port_ops = &triflex_port_ops,
29691diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
29692index 4b42ca0..e494a98 100644
29693--- a/drivers/ide/trm290.c
29694+++ b/drivers/ide/trm290.c
29695@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
29696 .dma_check = trm290_dma_check,
29697 };
29698
29699-static const struct ide_port_info trm290_chipset __devinitdata = {
29700+static const struct ide_port_info trm290_chipset __devinitconst = {
29701 .name = DRV_NAME,
29702 .init_hwif = init_hwif_trm290,
29703 .tp_ops = &trm290_tp_ops,
29704diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
29705index f46f49c..eb77678 100644
29706--- a/drivers/ide/via82cxxx.c
29707+++ b/drivers/ide/via82cxxx.c
29708@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
29709 .cable_detect = via82cxxx_cable_detect,
29710 };
29711
29712-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
29713+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
29714 .name = DRV_NAME,
29715 .init_chipset = init_chipset_via82cxxx,
29716 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
29717diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
29718index eb0e2cc..14241c7 100644
29719--- a/drivers/ieee802154/fakehard.c
29720+++ b/drivers/ieee802154/fakehard.c
29721@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
29722 phy->transmit_power = 0xbf;
29723
29724 dev->netdev_ops = &fake_ops;
29725- dev->ml_priv = &fake_mlme;
29726+ dev->ml_priv = (void *)&fake_mlme;
29727
29728 priv = netdev_priv(dev);
29729 priv->phy = phy;
29730diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
29731index 8b72f39..55df4c8 100644
29732--- a/drivers/infiniband/core/cm.c
29733+++ b/drivers/infiniband/core/cm.c
29734@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
29735
29736 struct cm_counter_group {
29737 struct kobject obj;
29738- atomic_long_t counter[CM_ATTR_COUNT];
29739+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
29740 };
29741
29742 struct cm_counter_attribute {
29743@@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
29744 struct ib_mad_send_buf *msg = NULL;
29745 int ret;
29746
29747- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29748+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29749 counter[CM_REQ_COUNTER]);
29750
29751 /* Quick state check to discard duplicate REQs. */
29752@@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
29753 if (!cm_id_priv)
29754 return;
29755
29756- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29757+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29758 counter[CM_REP_COUNTER]);
29759 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
29760 if (ret)
29761@@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
29762 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
29763 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
29764 spin_unlock_irq(&cm_id_priv->lock);
29765- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29766+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29767 counter[CM_RTU_COUNTER]);
29768 goto out;
29769 }
29770@@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
29771 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
29772 dreq_msg->local_comm_id);
29773 if (!cm_id_priv) {
29774- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29775+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29776 counter[CM_DREQ_COUNTER]);
29777 cm_issue_drep(work->port, work->mad_recv_wc);
29778 return -EINVAL;
29779@@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
29780 case IB_CM_MRA_REP_RCVD:
29781 break;
29782 case IB_CM_TIMEWAIT:
29783- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29784+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29785 counter[CM_DREQ_COUNTER]);
29786 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
29787 goto unlock;
29788@@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
29789 cm_free_msg(msg);
29790 goto deref;
29791 case IB_CM_DREQ_RCVD:
29792- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29793+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29794 counter[CM_DREQ_COUNTER]);
29795 goto unlock;
29796 default:
29797@@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
29798 ib_modify_mad(cm_id_priv->av.port->mad_agent,
29799 cm_id_priv->msg, timeout)) {
29800 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
29801- atomic_long_inc(&work->port->
29802+ atomic_long_inc_unchecked(&work->port->
29803 counter_group[CM_RECV_DUPLICATES].
29804 counter[CM_MRA_COUNTER]);
29805 goto out;
29806@@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
29807 break;
29808 case IB_CM_MRA_REQ_RCVD:
29809 case IB_CM_MRA_REP_RCVD:
29810- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29811+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29812 counter[CM_MRA_COUNTER]);
29813 /* fall through */
29814 default:
29815@@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
29816 case IB_CM_LAP_IDLE:
29817 break;
29818 case IB_CM_MRA_LAP_SENT:
29819- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29820+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29821 counter[CM_LAP_COUNTER]);
29822 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
29823 goto unlock;
29824@@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
29825 cm_free_msg(msg);
29826 goto deref;
29827 case IB_CM_LAP_RCVD:
29828- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29829+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29830 counter[CM_LAP_COUNTER]);
29831 goto unlock;
29832 default:
29833@@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
29834 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
29835 if (cur_cm_id_priv) {
29836 spin_unlock_irq(&cm.lock);
29837- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29838+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29839 counter[CM_SIDR_REQ_COUNTER]);
29840 goto out; /* Duplicate message. */
29841 }
29842@@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
29843 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
29844 msg->retries = 1;
29845
29846- atomic_long_add(1 + msg->retries,
29847+ atomic_long_add_unchecked(1 + msg->retries,
29848 &port->counter_group[CM_XMIT].counter[attr_index]);
29849 if (msg->retries)
29850- atomic_long_add(msg->retries,
29851+ atomic_long_add_unchecked(msg->retries,
29852 &port->counter_group[CM_XMIT_RETRIES].
29853 counter[attr_index]);
29854
29855@@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
29856 }
29857
29858 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
29859- atomic_long_inc(&port->counter_group[CM_RECV].
29860+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
29861 counter[attr_id - CM_ATTR_ID_OFFSET]);
29862
29863 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
29864@@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
29865 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
29866
29867 return sprintf(buf, "%ld\n",
29868- atomic_long_read(&group->counter[cm_attr->index]));
29869+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
29870 }
29871
29872 static const struct sysfs_ops cm_counter_ops = {
29873diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
29874index 176c8f9..2627b62 100644
29875--- a/drivers/infiniband/core/fmr_pool.c
29876+++ b/drivers/infiniband/core/fmr_pool.c
29877@@ -98,8 +98,8 @@ struct ib_fmr_pool {
29878
29879 struct task_struct *thread;
29880
29881- atomic_t req_ser;
29882- atomic_t flush_ser;
29883+ atomic_unchecked_t req_ser;
29884+ atomic_unchecked_t flush_ser;
29885
29886 wait_queue_head_t force_wait;
29887 };
29888@@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
29889 struct ib_fmr_pool *pool = pool_ptr;
29890
29891 do {
29892- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
29893+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
29894 ib_fmr_batch_release(pool);
29895
29896- atomic_inc(&pool->flush_ser);
29897+ atomic_inc_unchecked(&pool->flush_ser);
29898 wake_up_interruptible(&pool->force_wait);
29899
29900 if (pool->flush_function)
29901@@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
29902 }
29903
29904 set_current_state(TASK_INTERRUPTIBLE);
29905- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
29906+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
29907 !kthread_should_stop())
29908 schedule();
29909 __set_current_state(TASK_RUNNING);
29910@@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
29911 pool->dirty_watermark = params->dirty_watermark;
29912 pool->dirty_len = 0;
29913 spin_lock_init(&pool->pool_lock);
29914- atomic_set(&pool->req_ser, 0);
29915- atomic_set(&pool->flush_ser, 0);
29916+ atomic_set_unchecked(&pool->req_ser, 0);
29917+ atomic_set_unchecked(&pool->flush_ser, 0);
29918 init_waitqueue_head(&pool->force_wait);
29919
29920 pool->thread = kthread_run(ib_fmr_cleanup_thread,
29921@@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
29922 }
29923 spin_unlock_irq(&pool->pool_lock);
29924
29925- serial = atomic_inc_return(&pool->req_ser);
29926+ serial = atomic_inc_return_unchecked(&pool->req_ser);
29927 wake_up_process(pool->thread);
29928
29929 if (wait_event_interruptible(pool->force_wait,
29930- atomic_read(&pool->flush_ser) - serial >= 0))
29931+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
29932 return -EINTR;
29933
29934 return 0;
29935@@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
29936 } else {
29937 list_add_tail(&fmr->list, &pool->dirty_list);
29938 if (++pool->dirty_len >= pool->dirty_watermark) {
29939- atomic_inc(&pool->req_ser);
29940+ atomic_inc_unchecked(&pool->req_ser);
29941 wake_up_process(pool->thread);
29942 }
29943 }
29944diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
29945index 40c8353..946b0e4 100644
29946--- a/drivers/infiniband/hw/cxgb4/mem.c
29947+++ b/drivers/infiniband/hw/cxgb4/mem.c
29948@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
29949 int err;
29950 struct fw_ri_tpte tpt;
29951 u32 stag_idx;
29952- static atomic_t key;
29953+ static atomic_unchecked_t key;
29954
29955 if (c4iw_fatal_error(rdev))
29956 return -EIO;
29957@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
29958 &rdev->resource.tpt_fifo_lock);
29959 if (!stag_idx)
29960 return -ENOMEM;
29961- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
29962+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
29963 }
29964 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
29965 __func__, stag_state, type, pdid, stag_idx);
29966diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
29967index 79b3dbc..96e5fcc 100644
29968--- a/drivers/infiniband/hw/ipath/ipath_rc.c
29969+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
29970@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
29971 struct ib_atomic_eth *ateth;
29972 struct ipath_ack_entry *e;
29973 u64 vaddr;
29974- atomic64_t *maddr;
29975+ atomic64_unchecked_t *maddr;
29976 u64 sdata;
29977 u32 rkey;
29978 u8 next;
29979@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
29980 IB_ACCESS_REMOTE_ATOMIC)))
29981 goto nack_acc_unlck;
29982 /* Perform atomic OP and save result. */
29983- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
29984+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
29985 sdata = be64_to_cpu(ateth->swap_data);
29986 e = &qp->s_ack_queue[qp->r_head_ack_queue];
29987 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
29988- (u64) atomic64_add_return(sdata, maddr) - sdata :
29989+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
29990 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
29991 be64_to_cpu(ateth->compare_data),
29992 sdata);
29993diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
29994index 1f95bba..9530f87 100644
29995--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
29996+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
29997@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
29998 unsigned long flags;
29999 struct ib_wc wc;
30000 u64 sdata;
30001- atomic64_t *maddr;
30002+ atomic64_unchecked_t *maddr;
30003 enum ib_wc_status send_status;
30004
30005 /*
30006@@ -382,11 +382,11 @@ again:
30007 IB_ACCESS_REMOTE_ATOMIC)))
30008 goto acc_err;
30009 /* Perform atomic OP and save result. */
30010- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
30011+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
30012 sdata = wqe->wr.wr.atomic.compare_add;
30013 *(u64 *) sqp->s_sge.sge.vaddr =
30014 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
30015- (u64) atomic64_add_return(sdata, maddr) - sdata :
30016+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
30017 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
30018 sdata, wqe->wr.wr.atomic.swap);
30019 goto send_comp;
30020diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
30021index 5965b3d..16817fb 100644
30022--- a/drivers/infiniband/hw/nes/nes.c
30023+++ b/drivers/infiniband/hw/nes/nes.c
30024@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
30025 LIST_HEAD(nes_adapter_list);
30026 static LIST_HEAD(nes_dev_list);
30027
30028-atomic_t qps_destroyed;
30029+atomic_unchecked_t qps_destroyed;
30030
30031 static unsigned int ee_flsh_adapter;
30032 static unsigned int sysfs_nonidx_addr;
30033@@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
30034 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
30035 struct nes_adapter *nesadapter = nesdev->nesadapter;
30036
30037- atomic_inc(&qps_destroyed);
30038+ atomic_inc_unchecked(&qps_destroyed);
30039
30040 /* Free the control structures */
30041
30042diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
30043index 568b4f1..5ea3eff 100644
30044--- a/drivers/infiniband/hw/nes/nes.h
30045+++ b/drivers/infiniband/hw/nes/nes.h
30046@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
30047 extern unsigned int wqm_quanta;
30048 extern struct list_head nes_adapter_list;
30049
30050-extern atomic_t cm_connects;
30051-extern atomic_t cm_accepts;
30052-extern atomic_t cm_disconnects;
30053-extern atomic_t cm_closes;
30054-extern atomic_t cm_connecteds;
30055-extern atomic_t cm_connect_reqs;
30056-extern atomic_t cm_rejects;
30057-extern atomic_t mod_qp_timouts;
30058-extern atomic_t qps_created;
30059-extern atomic_t qps_destroyed;
30060-extern atomic_t sw_qps_destroyed;
30061+extern atomic_unchecked_t cm_connects;
30062+extern atomic_unchecked_t cm_accepts;
30063+extern atomic_unchecked_t cm_disconnects;
30064+extern atomic_unchecked_t cm_closes;
30065+extern atomic_unchecked_t cm_connecteds;
30066+extern atomic_unchecked_t cm_connect_reqs;
30067+extern atomic_unchecked_t cm_rejects;
30068+extern atomic_unchecked_t mod_qp_timouts;
30069+extern atomic_unchecked_t qps_created;
30070+extern atomic_unchecked_t qps_destroyed;
30071+extern atomic_unchecked_t sw_qps_destroyed;
30072 extern u32 mh_detected;
30073 extern u32 mh_pauses_sent;
30074 extern u32 cm_packets_sent;
30075@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
30076 extern u32 cm_packets_received;
30077 extern u32 cm_packets_dropped;
30078 extern u32 cm_packets_retrans;
30079-extern atomic_t cm_listens_created;
30080-extern atomic_t cm_listens_destroyed;
30081+extern atomic_unchecked_t cm_listens_created;
30082+extern atomic_unchecked_t cm_listens_destroyed;
30083 extern u32 cm_backlog_drops;
30084-extern atomic_t cm_loopbacks;
30085-extern atomic_t cm_nodes_created;
30086-extern atomic_t cm_nodes_destroyed;
30087-extern atomic_t cm_accel_dropped_pkts;
30088-extern atomic_t cm_resets_recvd;
30089-extern atomic_t pau_qps_created;
30090-extern atomic_t pau_qps_destroyed;
30091+extern atomic_unchecked_t cm_loopbacks;
30092+extern atomic_unchecked_t cm_nodes_created;
30093+extern atomic_unchecked_t cm_nodes_destroyed;
30094+extern atomic_unchecked_t cm_accel_dropped_pkts;
30095+extern atomic_unchecked_t cm_resets_recvd;
30096+extern atomic_unchecked_t pau_qps_created;
30097+extern atomic_unchecked_t pau_qps_destroyed;
30098
30099 extern u32 int_mod_timer_init;
30100 extern u32 int_mod_cq_depth_256;
30101diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
30102index 0a52d72..0642f36 100644
30103--- a/drivers/infiniband/hw/nes/nes_cm.c
30104+++ b/drivers/infiniband/hw/nes/nes_cm.c
30105@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
30106 u32 cm_packets_retrans;
30107 u32 cm_packets_created;
30108 u32 cm_packets_received;
30109-atomic_t cm_listens_created;
30110-atomic_t cm_listens_destroyed;
30111+atomic_unchecked_t cm_listens_created;
30112+atomic_unchecked_t cm_listens_destroyed;
30113 u32 cm_backlog_drops;
30114-atomic_t cm_loopbacks;
30115-atomic_t cm_nodes_created;
30116-atomic_t cm_nodes_destroyed;
30117-atomic_t cm_accel_dropped_pkts;
30118-atomic_t cm_resets_recvd;
30119+atomic_unchecked_t cm_loopbacks;
30120+atomic_unchecked_t cm_nodes_created;
30121+atomic_unchecked_t cm_nodes_destroyed;
30122+atomic_unchecked_t cm_accel_dropped_pkts;
30123+atomic_unchecked_t cm_resets_recvd;
30124
30125 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
30126 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
30127@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
30128
30129 static struct nes_cm_core *g_cm_core;
30130
30131-atomic_t cm_connects;
30132-atomic_t cm_accepts;
30133-atomic_t cm_disconnects;
30134-atomic_t cm_closes;
30135-atomic_t cm_connecteds;
30136-atomic_t cm_connect_reqs;
30137-atomic_t cm_rejects;
30138+atomic_unchecked_t cm_connects;
30139+atomic_unchecked_t cm_accepts;
30140+atomic_unchecked_t cm_disconnects;
30141+atomic_unchecked_t cm_closes;
30142+atomic_unchecked_t cm_connecteds;
30143+atomic_unchecked_t cm_connect_reqs;
30144+atomic_unchecked_t cm_rejects;
30145
30146 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
30147 {
30148@@ -1271,7 +1271,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
30149 kfree(listener);
30150 listener = NULL;
30151 ret = 0;
30152- atomic_inc(&cm_listens_destroyed);
30153+ atomic_inc_unchecked(&cm_listens_destroyed);
30154 } else {
30155 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
30156 }
30157@@ -1473,7 +1473,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
30158 cm_node->rem_mac);
30159
30160 add_hte_node(cm_core, cm_node);
30161- atomic_inc(&cm_nodes_created);
30162+ atomic_inc_unchecked(&cm_nodes_created);
30163
30164 return cm_node;
30165 }
30166@@ -1531,7 +1531,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
30167 }
30168
30169 atomic_dec(&cm_core->node_cnt);
30170- atomic_inc(&cm_nodes_destroyed);
30171+ atomic_inc_unchecked(&cm_nodes_destroyed);
30172 nesqp = cm_node->nesqp;
30173 if (nesqp) {
30174 nesqp->cm_node = NULL;
30175@@ -1595,7 +1595,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
30176
30177 static void drop_packet(struct sk_buff *skb)
30178 {
30179- atomic_inc(&cm_accel_dropped_pkts);
30180+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
30181 dev_kfree_skb_any(skb);
30182 }
30183
30184@@ -1658,7 +1658,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
30185 {
30186
30187 int reset = 0; /* whether to send reset in case of err.. */
30188- atomic_inc(&cm_resets_recvd);
30189+ atomic_inc_unchecked(&cm_resets_recvd);
30190 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
30191 " refcnt=%d\n", cm_node, cm_node->state,
30192 atomic_read(&cm_node->ref_count));
30193@@ -2299,7 +2299,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
30194 rem_ref_cm_node(cm_node->cm_core, cm_node);
30195 return NULL;
30196 }
30197- atomic_inc(&cm_loopbacks);
30198+ atomic_inc_unchecked(&cm_loopbacks);
30199 loopbackremotenode->loopbackpartner = cm_node;
30200 loopbackremotenode->tcp_cntxt.rcv_wscale =
30201 NES_CM_DEFAULT_RCV_WND_SCALE;
30202@@ -2574,7 +2574,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
30203 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
30204 else {
30205 rem_ref_cm_node(cm_core, cm_node);
30206- atomic_inc(&cm_accel_dropped_pkts);
30207+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
30208 dev_kfree_skb_any(skb);
30209 }
30210 break;
30211@@ -2880,7 +2880,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
30212
30213 if ((cm_id) && (cm_id->event_handler)) {
30214 if (issue_disconn) {
30215- atomic_inc(&cm_disconnects);
30216+ atomic_inc_unchecked(&cm_disconnects);
30217 cm_event.event = IW_CM_EVENT_DISCONNECT;
30218 cm_event.status = disconn_status;
30219 cm_event.local_addr = cm_id->local_addr;
30220@@ -2902,7 +2902,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
30221 }
30222
30223 if (issue_close) {
30224- atomic_inc(&cm_closes);
30225+ atomic_inc_unchecked(&cm_closes);
30226 nes_disconnect(nesqp, 1);
30227
30228 cm_id->provider_data = nesqp;
30229@@ -3038,7 +3038,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
30230
30231 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
30232 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
30233- atomic_inc(&cm_accepts);
30234+ atomic_inc_unchecked(&cm_accepts);
30235
30236 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
30237 netdev_refcnt_read(nesvnic->netdev));
30238@@ -3240,7 +3240,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
30239 struct nes_cm_core *cm_core;
30240 u8 *start_buff;
30241
30242- atomic_inc(&cm_rejects);
30243+ atomic_inc_unchecked(&cm_rejects);
30244 cm_node = (struct nes_cm_node *)cm_id->provider_data;
30245 loopback = cm_node->loopbackpartner;
30246 cm_core = cm_node->cm_core;
30247@@ -3300,7 +3300,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
30248 ntohl(cm_id->local_addr.sin_addr.s_addr),
30249 ntohs(cm_id->local_addr.sin_port));
30250
30251- atomic_inc(&cm_connects);
30252+ atomic_inc_unchecked(&cm_connects);
30253 nesqp->active_conn = 1;
30254
30255 /* cache the cm_id in the qp */
30256@@ -3406,7 +3406,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
30257 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
30258 return err;
30259 }
30260- atomic_inc(&cm_listens_created);
30261+ atomic_inc_unchecked(&cm_listens_created);
30262 }
30263
30264 cm_id->add_ref(cm_id);
30265@@ -3507,7 +3507,7 @@ static void cm_event_connected(struct nes_cm_event *event)
30266
30267 if (nesqp->destroyed)
30268 return;
30269- atomic_inc(&cm_connecteds);
30270+ atomic_inc_unchecked(&cm_connecteds);
30271 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
30272 " local port 0x%04X. jiffies = %lu.\n",
30273 nesqp->hwqp.qp_id,
30274@@ -3694,7 +3694,7 @@ static void cm_event_reset(struct nes_cm_event *event)
30275
30276 cm_id->add_ref(cm_id);
30277 ret = cm_id->event_handler(cm_id, &cm_event);
30278- atomic_inc(&cm_closes);
30279+ atomic_inc_unchecked(&cm_closes);
30280 cm_event.event = IW_CM_EVENT_CLOSE;
30281 cm_event.status = 0;
30282 cm_event.provider_data = cm_id->provider_data;
30283@@ -3730,7 +3730,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
30284 return;
30285 cm_id = cm_node->cm_id;
30286
30287- atomic_inc(&cm_connect_reqs);
30288+ atomic_inc_unchecked(&cm_connect_reqs);
30289 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
30290 cm_node, cm_id, jiffies);
30291
30292@@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
30293 return;
30294 cm_id = cm_node->cm_id;
30295
30296- atomic_inc(&cm_connect_reqs);
30297+ atomic_inc_unchecked(&cm_connect_reqs);
30298 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
30299 cm_node, cm_id, jiffies);
30300
30301diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
30302index b3b2a24..7bfaf1e 100644
30303--- a/drivers/infiniband/hw/nes/nes_mgt.c
30304+++ b/drivers/infiniband/hw/nes/nes_mgt.c
30305@@ -40,8 +40,8 @@
30306 #include "nes.h"
30307 #include "nes_mgt.h"
30308
30309-atomic_t pau_qps_created;
30310-atomic_t pau_qps_destroyed;
30311+atomic_unchecked_t pau_qps_created;
30312+atomic_unchecked_t pau_qps_destroyed;
30313
30314 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
30315 {
30316@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
30317 {
30318 struct sk_buff *skb;
30319 unsigned long flags;
30320- atomic_inc(&pau_qps_destroyed);
30321+ atomic_inc_unchecked(&pau_qps_destroyed);
30322
30323 /* Free packets that have not yet been forwarded */
30324 /* Lock is acquired by skb_dequeue when removing the skb */
30325@@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
30326 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
30327 skb_queue_head_init(&nesqp->pau_list);
30328 spin_lock_init(&nesqp->pau_lock);
30329- atomic_inc(&pau_qps_created);
30330+ atomic_inc_unchecked(&pau_qps_created);
30331 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
30332 }
30333
30334diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
30335index c00d2f3..8834298 100644
30336--- a/drivers/infiniband/hw/nes/nes_nic.c
30337+++ b/drivers/infiniband/hw/nes/nes_nic.c
30338@@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
30339 target_stat_values[++index] = mh_detected;
30340 target_stat_values[++index] = mh_pauses_sent;
30341 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
30342- target_stat_values[++index] = atomic_read(&cm_connects);
30343- target_stat_values[++index] = atomic_read(&cm_accepts);
30344- target_stat_values[++index] = atomic_read(&cm_disconnects);
30345- target_stat_values[++index] = atomic_read(&cm_connecteds);
30346- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
30347- target_stat_values[++index] = atomic_read(&cm_rejects);
30348- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
30349- target_stat_values[++index] = atomic_read(&qps_created);
30350- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
30351- target_stat_values[++index] = atomic_read(&qps_destroyed);
30352- target_stat_values[++index] = atomic_read(&cm_closes);
30353+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
30354+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
30355+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
30356+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
30357+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
30358+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
30359+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
30360+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
30361+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
30362+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
30363+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
30364 target_stat_values[++index] = cm_packets_sent;
30365 target_stat_values[++index] = cm_packets_bounced;
30366 target_stat_values[++index] = cm_packets_created;
30367 target_stat_values[++index] = cm_packets_received;
30368 target_stat_values[++index] = cm_packets_dropped;
30369 target_stat_values[++index] = cm_packets_retrans;
30370- target_stat_values[++index] = atomic_read(&cm_listens_created);
30371- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
30372+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
30373+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
30374 target_stat_values[++index] = cm_backlog_drops;
30375- target_stat_values[++index] = atomic_read(&cm_loopbacks);
30376- target_stat_values[++index] = atomic_read(&cm_nodes_created);
30377- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
30378- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
30379- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
30380+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
30381+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
30382+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
30383+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
30384+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
30385 target_stat_values[++index] = nesadapter->free_4kpbl;
30386 target_stat_values[++index] = nesadapter->free_256pbl;
30387 target_stat_values[++index] = int_mod_timer_init;
30388 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
30389 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
30390 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
30391- target_stat_values[++index] = atomic_read(&pau_qps_created);
30392- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
30393+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
30394+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
30395 }
30396
30397 /**
30398diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
30399index 5095bc4..41e8fff 100644
30400--- a/drivers/infiniband/hw/nes/nes_verbs.c
30401+++ b/drivers/infiniband/hw/nes/nes_verbs.c
30402@@ -46,9 +46,9 @@
30403
30404 #include <rdma/ib_umem.h>
30405
30406-atomic_t mod_qp_timouts;
30407-atomic_t qps_created;
30408-atomic_t sw_qps_destroyed;
30409+atomic_unchecked_t mod_qp_timouts;
30410+atomic_unchecked_t qps_created;
30411+atomic_unchecked_t sw_qps_destroyed;
30412
30413 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
30414
30415@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
30416 if (init_attr->create_flags)
30417 return ERR_PTR(-EINVAL);
30418
30419- atomic_inc(&qps_created);
30420+ atomic_inc_unchecked(&qps_created);
30421 switch (init_attr->qp_type) {
30422 case IB_QPT_RC:
30423 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
30424@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
30425 struct iw_cm_event cm_event;
30426 int ret = 0;
30427
30428- atomic_inc(&sw_qps_destroyed);
30429+ atomic_inc_unchecked(&sw_qps_destroyed);
30430 nesqp->destroyed = 1;
30431
30432 /* Blow away the connection if it exists. */
30433diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
30434index b881bdc..c2e360c 100644
30435--- a/drivers/infiniband/hw/qib/qib.h
30436+++ b/drivers/infiniband/hw/qib/qib.h
30437@@ -51,6 +51,7 @@
30438 #include <linux/completion.h>
30439 #include <linux/kref.h>
30440 #include <linux/sched.h>
30441+#include <linux/slab.h>
30442
30443 #include "qib_common.h"
30444 #include "qib_verbs.h"
30445diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
30446index c351aa4..e6967c2 100644
30447--- a/drivers/input/gameport/gameport.c
30448+++ b/drivers/input/gameport/gameport.c
30449@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
30450 */
30451 static void gameport_init_port(struct gameport *gameport)
30452 {
30453- static atomic_t gameport_no = ATOMIC_INIT(0);
30454+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
30455
30456 __module_get(THIS_MODULE);
30457
30458 mutex_init(&gameport->drv_mutex);
30459 device_initialize(&gameport->dev);
30460 dev_set_name(&gameport->dev, "gameport%lu",
30461- (unsigned long)atomic_inc_return(&gameport_no) - 1);
30462+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
30463 gameport->dev.bus = &gameport_bus;
30464 gameport->dev.release = gameport_release_port;
30465 if (gameport->parent)
30466diff --git a/drivers/input/input.c b/drivers/input/input.c
30467index da38d97..2aa0b79 100644
30468--- a/drivers/input/input.c
30469+++ b/drivers/input/input.c
30470@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
30471 */
30472 int input_register_device(struct input_dev *dev)
30473 {
30474- static atomic_t input_no = ATOMIC_INIT(0);
30475+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
30476 struct input_handler *handler;
30477 const char *path;
30478 int error;
30479@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
30480 dev->setkeycode = input_default_setkeycode;
30481
30482 dev_set_name(&dev->dev, "input%ld",
30483- (unsigned long) atomic_inc_return(&input_no) - 1);
30484+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
30485
30486 error = device_add(&dev->dev);
30487 if (error)
30488diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
30489index b8d8611..7a4a04b 100644
30490--- a/drivers/input/joystick/sidewinder.c
30491+++ b/drivers/input/joystick/sidewinder.c
30492@@ -30,6 +30,7 @@
30493 #include <linux/kernel.h>
30494 #include <linux/module.h>
30495 #include <linux/slab.h>
30496+#include <linux/sched.h>
30497 #include <linux/init.h>
30498 #include <linux/input.h>
30499 #include <linux/gameport.h>
30500diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
30501index d728875..844c89b 100644
30502--- a/drivers/input/joystick/xpad.c
30503+++ b/drivers/input/joystick/xpad.c
30504@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
30505
30506 static int xpad_led_probe(struct usb_xpad *xpad)
30507 {
30508- static atomic_t led_seq = ATOMIC_INIT(0);
30509+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
30510 long led_no;
30511 struct xpad_led *led;
30512 struct led_classdev *led_cdev;
30513@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
30514 if (!led)
30515 return -ENOMEM;
30516
30517- led_no = (long)atomic_inc_return(&led_seq) - 1;
30518+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
30519
30520 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
30521 led->xpad = xpad;
30522diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
30523index 0110b5a..d3ad144 100644
30524--- a/drivers/input/mousedev.c
30525+++ b/drivers/input/mousedev.c
30526@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
30527
30528 spin_unlock_irq(&client->packet_lock);
30529
30530- if (copy_to_user(buffer, data, count))
30531+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
30532 return -EFAULT;
30533
30534 return count;
30535diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
30536index ba70058..571d25d 100644
30537--- a/drivers/input/serio/serio.c
30538+++ b/drivers/input/serio/serio.c
30539@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
30540 */
30541 static void serio_init_port(struct serio *serio)
30542 {
30543- static atomic_t serio_no = ATOMIC_INIT(0);
30544+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
30545
30546 __module_get(THIS_MODULE);
30547
30548@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
30549 mutex_init(&serio->drv_mutex);
30550 device_initialize(&serio->dev);
30551 dev_set_name(&serio->dev, "serio%ld",
30552- (long)atomic_inc_return(&serio_no) - 1);
30553+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
30554 serio->dev.bus = &serio_bus;
30555 serio->dev.release = serio_release_port;
30556 serio->dev.groups = serio_device_attr_groups;
30557diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
30558index e44933d..9ba484a 100644
30559--- a/drivers/isdn/capi/capi.c
30560+++ b/drivers/isdn/capi/capi.c
30561@@ -83,8 +83,8 @@ struct capiminor {
30562
30563 struct capi20_appl *ap;
30564 u32 ncci;
30565- atomic_t datahandle;
30566- atomic_t msgid;
30567+ atomic_unchecked_t datahandle;
30568+ atomic_unchecked_t msgid;
30569
30570 struct tty_port port;
30571 int ttyinstop;
30572@@ -397,7 +397,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
30573 capimsg_setu16(s, 2, mp->ap->applid);
30574 capimsg_setu8 (s, 4, CAPI_DATA_B3);
30575 capimsg_setu8 (s, 5, CAPI_RESP);
30576- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
30577+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
30578 capimsg_setu32(s, 8, mp->ncci);
30579 capimsg_setu16(s, 12, datahandle);
30580 }
30581@@ -518,14 +518,14 @@ static void handle_minor_send(struct capiminor *mp)
30582 mp->outbytes -= len;
30583 spin_unlock_bh(&mp->outlock);
30584
30585- datahandle = atomic_inc_return(&mp->datahandle);
30586+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
30587 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
30588 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
30589 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
30590 capimsg_setu16(skb->data, 2, mp->ap->applid);
30591 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
30592 capimsg_setu8 (skb->data, 5, CAPI_REQ);
30593- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
30594+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
30595 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
30596 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
30597 capimsg_setu16(skb->data, 16, len); /* Data length */
30598diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
30599index db621db..825ea1a 100644
30600--- a/drivers/isdn/gigaset/common.c
30601+++ b/drivers/isdn/gigaset/common.c
30602@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
30603 cs->commands_pending = 0;
30604 cs->cur_at_seq = 0;
30605 cs->gotfwver = -1;
30606- cs->open_count = 0;
30607+ local_set(&cs->open_count, 0);
30608 cs->dev = NULL;
30609 cs->tty = NULL;
30610 cs->tty_dev = NULL;
30611diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
30612index 212efaf..f187c6b 100644
30613--- a/drivers/isdn/gigaset/gigaset.h
30614+++ b/drivers/isdn/gigaset/gigaset.h
30615@@ -35,6 +35,7 @@
30616 #include <linux/tty_driver.h>
30617 #include <linux/list.h>
30618 #include <linux/atomic.h>
30619+#include <asm/local.h>
30620
30621 #define GIG_VERSION {0, 5, 0, 0}
30622 #define GIG_COMPAT {0, 4, 0, 0}
30623@@ -433,7 +434,7 @@ struct cardstate {
30624 spinlock_t cmdlock;
30625 unsigned curlen, cmdbytes;
30626
30627- unsigned open_count;
30628+ local_t open_count;
30629 struct tty_struct *tty;
30630 struct tasklet_struct if_wake_tasklet;
30631 unsigned control_state;
30632diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
30633index ee0a549..a7c9798 100644
30634--- a/drivers/isdn/gigaset/interface.c
30635+++ b/drivers/isdn/gigaset/interface.c
30636@@ -163,9 +163,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
30637 }
30638 tty->driver_data = cs;
30639
30640- ++cs->open_count;
30641-
30642- if (cs->open_count == 1) {
30643+ if (local_inc_return(&cs->open_count) == 1) {
30644 spin_lock_irqsave(&cs->lock, flags);
30645 cs->tty = tty;
30646 spin_unlock_irqrestore(&cs->lock, flags);
30647@@ -193,10 +191,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
30648
30649 if (!cs->connected)
30650 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
30651- else if (!cs->open_count)
30652+ else if (!local_read(&cs->open_count))
30653 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30654 else {
30655- if (!--cs->open_count) {
30656+ if (!local_dec_return(&cs->open_count)) {
30657 spin_lock_irqsave(&cs->lock, flags);
30658 cs->tty = NULL;
30659 spin_unlock_irqrestore(&cs->lock, flags);
30660@@ -231,7 +229,7 @@ static int if_ioctl(struct tty_struct *tty,
30661 if (!cs->connected) {
30662 gig_dbg(DEBUG_IF, "not connected");
30663 retval = -ENODEV;
30664- } else if (!cs->open_count)
30665+ } else if (!local_read(&cs->open_count))
30666 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30667 else {
30668 retval = 0;
30669@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
30670 retval = -ENODEV;
30671 goto done;
30672 }
30673- if (!cs->open_count) {
30674+ if (!local_read(&cs->open_count)) {
30675 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30676 retval = -ENODEV;
30677 goto done;
30678@@ -414,7 +412,7 @@ static int if_write_room(struct tty_struct *tty)
30679 if (!cs->connected) {
30680 gig_dbg(DEBUG_IF, "not connected");
30681 retval = -ENODEV;
30682- } else if (!cs->open_count)
30683+ } else if (!local_read(&cs->open_count))
30684 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30685 else if (cs->mstate != MS_LOCKED) {
30686 dev_warn(cs->dev, "can't write to unlocked device\n");
30687@@ -444,7 +442,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
30688
30689 if (!cs->connected)
30690 gig_dbg(DEBUG_IF, "not connected");
30691- else if (!cs->open_count)
30692+ else if (!local_read(&cs->open_count))
30693 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30694 else if (cs->mstate != MS_LOCKED)
30695 dev_warn(cs->dev, "can't write to unlocked device\n");
30696@@ -472,7 +470,7 @@ static void if_throttle(struct tty_struct *tty)
30697
30698 if (!cs->connected)
30699 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
30700- else if (!cs->open_count)
30701+ else if (!local_read(&cs->open_count))
30702 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30703 else
30704 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
30705@@ -496,7 +494,7 @@ static void if_unthrottle(struct tty_struct *tty)
30706
30707 if (!cs->connected)
30708 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
30709- else if (!cs->open_count)
30710+ else if (!local_read(&cs->open_count))
30711 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30712 else
30713 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
30714@@ -527,7 +525,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
30715 goto out;
30716 }
30717
30718- if (!cs->open_count) {
30719+ if (!local_read(&cs->open_count)) {
30720 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30721 goto out;
30722 }
30723diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
30724index 2a57da59..e7a12ed 100644
30725--- a/drivers/isdn/hardware/avm/b1.c
30726+++ b/drivers/isdn/hardware/avm/b1.c
30727@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
30728 }
30729 if (left) {
30730 if (t4file->user) {
30731- if (copy_from_user(buf, dp, left))
30732+ if (left > sizeof buf || copy_from_user(buf, dp, left))
30733 return -EFAULT;
30734 } else {
30735 memcpy(buf, dp, left);
30736@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
30737 }
30738 if (left) {
30739 if (config->user) {
30740- if (copy_from_user(buf, dp, left))
30741+ if (left > sizeof buf || copy_from_user(buf, dp, left))
30742 return -EFAULT;
30743 } else {
30744 memcpy(buf, dp, left);
30745diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
30746index 85784a7..a19ca98 100644
30747--- a/drivers/isdn/hardware/eicon/divasync.h
30748+++ b/drivers/isdn/hardware/eicon/divasync.h
30749@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
30750 } diva_didd_add_adapter_t;
30751 typedef struct _diva_didd_remove_adapter {
30752 IDI_CALL p_request;
30753-} diva_didd_remove_adapter_t;
30754+} __no_const diva_didd_remove_adapter_t;
30755 typedef struct _diva_didd_read_adapter_array {
30756 void * buffer;
30757 dword length;
30758diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
30759index a3bd163..8956575 100644
30760--- a/drivers/isdn/hardware/eicon/xdi_adapter.h
30761+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
30762@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
30763 typedef struct _diva_os_idi_adapter_interface {
30764 diva_init_card_proc_t cleanup_adapter_proc;
30765 diva_cmd_card_proc_t cmd_proc;
30766-} diva_os_idi_adapter_interface_t;
30767+} __no_const diva_os_idi_adapter_interface_t;
30768
30769 typedef struct _diva_os_xdi_adapter {
30770 struct list_head link;
30771diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
30772index 1f355bb..43f1fea 100644
30773--- a/drivers/isdn/icn/icn.c
30774+++ b/drivers/isdn/icn/icn.c
30775@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
30776 if (count > len)
30777 count = len;
30778 if (user) {
30779- if (copy_from_user(msg, buf, count))
30780+ if (count > sizeof msg || copy_from_user(msg, buf, count))
30781 return -EFAULT;
30782 } else
30783 memcpy(msg, buf, count);
30784diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
30785index b5fdcb7..5b6c59f 100644
30786--- a/drivers/lguest/core.c
30787+++ b/drivers/lguest/core.c
30788@@ -92,9 +92,17 @@ static __init int map_switcher(void)
30789 * it's worked so far. The end address needs +1 because __get_vm_area
30790 * allocates an extra guard page, so we need space for that.
30791 */
30792+
30793+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
30794+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
30795+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
30796+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
30797+#else
30798 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
30799 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
30800 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
30801+#endif
30802+
30803 if (!switcher_vma) {
30804 err = -ENOMEM;
30805 printk("lguest: could not map switcher pages high\n");
30806@@ -119,7 +127,7 @@ static __init int map_switcher(void)
30807 * Now the Switcher is mapped at the right address, we can't fail!
30808 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
30809 */
30810- memcpy(switcher_vma->addr, start_switcher_text,
30811+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
30812 end_switcher_text - start_switcher_text);
30813
30814 printk(KERN_INFO "lguest: mapped switcher at %p\n",
30815diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
30816index 65af42f..530c87a 100644
30817--- a/drivers/lguest/x86/core.c
30818+++ b/drivers/lguest/x86/core.c
30819@@ -59,7 +59,7 @@ static struct {
30820 /* Offset from where switcher.S was compiled to where we've copied it */
30821 static unsigned long switcher_offset(void)
30822 {
30823- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
30824+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
30825 }
30826
30827 /* This cpu's struct lguest_pages. */
30828@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
30829 * These copies are pretty cheap, so we do them unconditionally: */
30830 /* Save the current Host top-level page directory.
30831 */
30832+
30833+#ifdef CONFIG_PAX_PER_CPU_PGD
30834+ pages->state.host_cr3 = read_cr3();
30835+#else
30836 pages->state.host_cr3 = __pa(current->mm->pgd);
30837+#endif
30838+
30839 /*
30840 * Set up the Guest's page tables to see this CPU's pages (and no
30841 * other CPU's pages).
30842@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
30843 * compiled-in switcher code and the high-mapped copy we just made.
30844 */
30845 for (i = 0; i < IDT_ENTRIES; i++)
30846- default_idt_entries[i] += switcher_offset();
30847+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
30848
30849 /*
30850 * Set up the Switcher's per-cpu areas.
30851@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
30852 * it will be undisturbed when we switch. To change %cs and jump we
30853 * need this structure to feed to Intel's "lcall" instruction.
30854 */
30855- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
30856+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
30857 lguest_entry.segment = LGUEST_CS;
30858
30859 /*
30860diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
30861index 40634b0..4f5855e 100644
30862--- a/drivers/lguest/x86/switcher_32.S
30863+++ b/drivers/lguest/x86/switcher_32.S
30864@@ -87,6 +87,7 @@
30865 #include <asm/page.h>
30866 #include <asm/segment.h>
30867 #include <asm/lguest.h>
30868+#include <asm/processor-flags.h>
30869
30870 // We mark the start of the code to copy
30871 // It's placed in .text tho it's never run here
30872@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
30873 // Changes type when we load it: damn Intel!
30874 // For after we switch over our page tables
30875 // That entry will be read-only: we'd crash.
30876+
30877+#ifdef CONFIG_PAX_KERNEXEC
30878+ mov %cr0, %edx
30879+ xor $X86_CR0_WP, %edx
30880+ mov %edx, %cr0
30881+#endif
30882+
30883 movl $(GDT_ENTRY_TSS*8), %edx
30884 ltr %dx
30885
30886@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
30887 // Let's clear it again for our return.
30888 // The GDT descriptor of the Host
30889 // Points to the table after two "size" bytes
30890- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
30891+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
30892 // Clear "used" from type field (byte 5, bit 2)
30893- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
30894+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
30895+
30896+#ifdef CONFIG_PAX_KERNEXEC
30897+ mov %cr0, %eax
30898+ xor $X86_CR0_WP, %eax
30899+ mov %eax, %cr0
30900+#endif
30901
30902 // Once our page table's switched, the Guest is live!
30903 // The Host fades as we run this final step.
30904@@ -295,13 +309,12 @@ deliver_to_host:
30905 // I consulted gcc, and it gave
30906 // These instructions, which I gladly credit:
30907 leal (%edx,%ebx,8), %eax
30908- movzwl (%eax),%edx
30909- movl 4(%eax), %eax
30910- xorw %ax, %ax
30911- orl %eax, %edx
30912+ movl 4(%eax), %edx
30913+ movw (%eax), %dx
30914 // Now the address of the handler's in %edx
30915 // We call it now: its "iret" drops us home.
30916- jmp *%edx
30917+ ljmp $__KERNEL_CS, $1f
30918+1: jmp *%edx
30919
30920 // Every interrupt can come to us here
30921 // But we must truly tell each apart.
30922diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
30923index 4daf9e5..b8d1d0f 100644
30924--- a/drivers/macintosh/macio_asic.c
30925+++ b/drivers/macintosh/macio_asic.c
30926@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
30927 * MacIO is matched against any Apple ID, it's probe() function
30928 * will then decide wether it applies or not
30929 */
30930-static const struct pci_device_id __devinitdata pci_ids [] = { {
30931+static const struct pci_device_id __devinitconst pci_ids [] = { {
30932 .vendor = PCI_VENDOR_ID_APPLE,
30933 .device = PCI_ANY_ID,
30934 .subvendor = PCI_ANY_ID,
30935diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
30936index 31c2dc2..a2de7a6 100644
30937--- a/drivers/md/dm-ioctl.c
30938+++ b/drivers/md/dm-ioctl.c
30939@@ -1589,7 +1589,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
30940 cmd == DM_LIST_VERSIONS_CMD)
30941 return 0;
30942
30943- if ((cmd == DM_DEV_CREATE_CMD)) {
30944+ if (cmd == DM_DEV_CREATE_CMD) {
30945 if (!*param->name) {
30946 DMWARN("name not supplied when creating device");
30947 return -EINVAL;
30948diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
30949index 9bfd057..01180bc 100644
30950--- a/drivers/md/dm-raid1.c
30951+++ b/drivers/md/dm-raid1.c
30952@@ -40,7 +40,7 @@ enum dm_raid1_error {
30953
30954 struct mirror {
30955 struct mirror_set *ms;
30956- atomic_t error_count;
30957+ atomic_unchecked_t error_count;
30958 unsigned long error_type;
30959 struct dm_dev *dev;
30960 sector_t offset;
30961@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
30962 struct mirror *m;
30963
30964 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
30965- if (!atomic_read(&m->error_count))
30966+ if (!atomic_read_unchecked(&m->error_count))
30967 return m;
30968
30969 return NULL;
30970@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
30971 * simple way to tell if a device has encountered
30972 * errors.
30973 */
30974- atomic_inc(&m->error_count);
30975+ atomic_inc_unchecked(&m->error_count);
30976
30977 if (test_and_set_bit(error_type, &m->error_type))
30978 return;
30979@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
30980 struct mirror *m = get_default_mirror(ms);
30981
30982 do {
30983- if (likely(!atomic_read(&m->error_count)))
30984+ if (likely(!atomic_read_unchecked(&m->error_count)))
30985 return m;
30986
30987 if (m-- == ms->mirror)
30988@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
30989 {
30990 struct mirror *default_mirror = get_default_mirror(m->ms);
30991
30992- return !atomic_read(&default_mirror->error_count);
30993+ return !atomic_read_unchecked(&default_mirror->error_count);
30994 }
30995
30996 static int mirror_available(struct mirror_set *ms, struct bio *bio)
30997@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
30998 */
30999 if (likely(region_in_sync(ms, region, 1)))
31000 m = choose_mirror(ms, bio->bi_sector);
31001- else if (m && atomic_read(&m->error_count))
31002+ else if (m && atomic_read_unchecked(&m->error_count))
31003 m = NULL;
31004
31005 if (likely(m))
31006@@ -937,7 +937,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
31007 }
31008
31009 ms->mirror[mirror].ms = ms;
31010- atomic_set(&(ms->mirror[mirror].error_count), 0);
31011+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
31012 ms->mirror[mirror].error_type = 0;
31013 ms->mirror[mirror].offset = offset;
31014
31015@@ -1347,7 +1347,7 @@ static void mirror_resume(struct dm_target *ti)
31016 */
31017 static char device_status_char(struct mirror *m)
31018 {
31019- if (!atomic_read(&(m->error_count)))
31020+ if (!atomic_read_unchecked(&(m->error_count)))
31021 return 'A';
31022
31023 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
31024diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
31025index 3d80cf0..b77cc47 100644
31026--- a/drivers/md/dm-stripe.c
31027+++ b/drivers/md/dm-stripe.c
31028@@ -20,7 +20,7 @@ struct stripe {
31029 struct dm_dev *dev;
31030 sector_t physical_start;
31031
31032- atomic_t error_count;
31033+ atomic_unchecked_t error_count;
31034 };
31035
31036 struct stripe_c {
31037@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
31038 kfree(sc);
31039 return r;
31040 }
31041- atomic_set(&(sc->stripe[i].error_count), 0);
31042+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
31043 }
31044
31045 ti->private = sc;
31046@@ -314,7 +314,7 @@ static int stripe_status(struct dm_target *ti,
31047 DMEMIT("%d ", sc->stripes);
31048 for (i = 0; i < sc->stripes; i++) {
31049 DMEMIT("%s ", sc->stripe[i].dev->name);
31050- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
31051+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
31052 'D' : 'A';
31053 }
31054 buffer[i] = '\0';
31055@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
31056 */
31057 for (i = 0; i < sc->stripes; i++)
31058 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
31059- atomic_inc(&(sc->stripe[i].error_count));
31060- if (atomic_read(&(sc->stripe[i].error_count)) <
31061+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
31062+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
31063 DM_IO_ERROR_THRESHOLD)
31064 schedule_work(&sc->trigger_event);
31065 }
31066diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
31067index 8e91321..fd17aef 100644
31068--- a/drivers/md/dm-table.c
31069+++ b/drivers/md/dm-table.c
31070@@ -391,7 +391,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
31071 if (!dev_size)
31072 return 0;
31073
31074- if ((start >= dev_size) || (start + len > dev_size)) {
31075+ if ((start >= dev_size) || (len > dev_size - start)) {
31076 DMWARN("%s: %s too small for target: "
31077 "start=%llu, len=%llu, dev_size=%llu",
31078 dm_device_name(ti->table->md), bdevname(bdev, b),
31079diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
31080index 59c4f04..4c7b661 100644
31081--- a/drivers/md/dm-thin-metadata.c
31082+++ b/drivers/md/dm-thin-metadata.c
31083@@ -431,7 +431,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
31084
31085 pmd->info.tm = tm;
31086 pmd->info.levels = 2;
31087- pmd->info.value_type.context = pmd->data_sm;
31088+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
31089 pmd->info.value_type.size = sizeof(__le64);
31090 pmd->info.value_type.inc = data_block_inc;
31091 pmd->info.value_type.dec = data_block_dec;
31092@@ -450,7 +450,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
31093
31094 pmd->bl_info.tm = tm;
31095 pmd->bl_info.levels = 1;
31096- pmd->bl_info.value_type.context = pmd->data_sm;
31097+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
31098 pmd->bl_info.value_type.size = sizeof(__le64);
31099 pmd->bl_info.value_type.inc = data_block_inc;
31100 pmd->bl_info.value_type.dec = data_block_dec;
31101diff --git a/drivers/md/dm.c b/drivers/md/dm.c
31102index 4720f68..78d1df7 100644
31103--- a/drivers/md/dm.c
31104+++ b/drivers/md/dm.c
31105@@ -177,9 +177,9 @@ struct mapped_device {
31106 /*
31107 * Event handling.
31108 */
31109- atomic_t event_nr;
31110+ atomic_unchecked_t event_nr;
31111 wait_queue_head_t eventq;
31112- atomic_t uevent_seq;
31113+ atomic_unchecked_t uevent_seq;
31114 struct list_head uevent_list;
31115 spinlock_t uevent_lock; /* Protect access to uevent_list */
31116
31117@@ -1845,8 +1845,8 @@ static struct mapped_device *alloc_dev(int minor)
31118 rwlock_init(&md->map_lock);
31119 atomic_set(&md->holders, 1);
31120 atomic_set(&md->open_count, 0);
31121- atomic_set(&md->event_nr, 0);
31122- atomic_set(&md->uevent_seq, 0);
31123+ atomic_set_unchecked(&md->event_nr, 0);
31124+ atomic_set_unchecked(&md->uevent_seq, 0);
31125 INIT_LIST_HEAD(&md->uevent_list);
31126 spin_lock_init(&md->uevent_lock);
31127
31128@@ -1980,7 +1980,7 @@ static void event_callback(void *context)
31129
31130 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
31131
31132- atomic_inc(&md->event_nr);
31133+ atomic_inc_unchecked(&md->event_nr);
31134 wake_up(&md->eventq);
31135 }
31136
31137@@ -2622,18 +2622,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
31138
31139 uint32_t dm_next_uevent_seq(struct mapped_device *md)
31140 {
31141- return atomic_add_return(1, &md->uevent_seq);
31142+ return atomic_add_return_unchecked(1, &md->uevent_seq);
31143 }
31144
31145 uint32_t dm_get_event_nr(struct mapped_device *md)
31146 {
31147- return atomic_read(&md->event_nr);
31148+ return atomic_read_unchecked(&md->event_nr);
31149 }
31150
31151 int dm_wait_event(struct mapped_device *md, int event_nr)
31152 {
31153 return wait_event_interruptible(md->eventq,
31154- (event_nr != atomic_read(&md->event_nr)));
31155+ (event_nr != atomic_read_unchecked(&md->event_nr)));
31156 }
31157
31158 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
31159diff --git a/drivers/md/md.c b/drivers/md/md.c
31160index f47f1f8..b7f559e 100644
31161--- a/drivers/md/md.c
31162+++ b/drivers/md/md.c
31163@@ -278,10 +278,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
31164 * start build, activate spare
31165 */
31166 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
31167-static atomic_t md_event_count;
31168+static atomic_unchecked_t md_event_count;
31169 void md_new_event(struct mddev *mddev)
31170 {
31171- atomic_inc(&md_event_count);
31172+ atomic_inc_unchecked(&md_event_count);
31173 wake_up(&md_event_waiters);
31174 }
31175 EXPORT_SYMBOL_GPL(md_new_event);
31176@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
31177 */
31178 static void md_new_event_inintr(struct mddev *mddev)
31179 {
31180- atomic_inc(&md_event_count);
31181+ atomic_inc_unchecked(&md_event_count);
31182 wake_up(&md_event_waiters);
31183 }
31184
31185@@ -1525,7 +1525,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
31186
31187 rdev->preferred_minor = 0xffff;
31188 rdev->data_offset = le64_to_cpu(sb->data_offset);
31189- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
31190+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
31191
31192 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
31193 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
31194@@ -1742,7 +1742,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
31195 else
31196 sb->resync_offset = cpu_to_le64(0);
31197
31198- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
31199+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
31200
31201 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
31202 sb->size = cpu_to_le64(mddev->dev_sectors);
31203@@ -2639,7 +2639,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
31204 static ssize_t
31205 errors_show(struct md_rdev *rdev, char *page)
31206 {
31207- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
31208+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
31209 }
31210
31211 static ssize_t
31212@@ -2648,7 +2648,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
31213 char *e;
31214 unsigned long n = simple_strtoul(buf, &e, 10);
31215 if (*buf && (*e == 0 || *e == '\n')) {
31216- atomic_set(&rdev->corrected_errors, n);
31217+ atomic_set_unchecked(&rdev->corrected_errors, n);
31218 return len;
31219 }
31220 return -EINVAL;
31221@@ -3039,8 +3039,8 @@ int md_rdev_init(struct md_rdev *rdev)
31222 rdev->sb_loaded = 0;
31223 rdev->bb_page = NULL;
31224 atomic_set(&rdev->nr_pending, 0);
31225- atomic_set(&rdev->read_errors, 0);
31226- atomic_set(&rdev->corrected_errors, 0);
31227+ atomic_set_unchecked(&rdev->read_errors, 0);
31228+ atomic_set_unchecked(&rdev->corrected_errors, 0);
31229
31230 INIT_LIST_HEAD(&rdev->same_set);
31231 init_waitqueue_head(&rdev->blocked_wait);
31232@@ -6683,7 +6683,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
31233
31234 spin_unlock(&pers_lock);
31235 seq_printf(seq, "\n");
31236- seq->poll_event = atomic_read(&md_event_count);
31237+ seq->poll_event = atomic_read_unchecked(&md_event_count);
31238 return 0;
31239 }
31240 if (v == (void*)2) {
31241@@ -6772,7 +6772,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
31242 chunk_kb ? "KB" : "B");
31243 if (bitmap->file) {
31244 seq_printf(seq, ", file: ");
31245- seq_path(seq, &bitmap->file->f_path, " \t\n");
31246+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
31247 }
31248
31249 seq_printf(seq, "\n");
31250@@ -6803,7 +6803,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
31251 return error;
31252
31253 seq = file->private_data;
31254- seq->poll_event = atomic_read(&md_event_count);
31255+ seq->poll_event = atomic_read_unchecked(&md_event_count);
31256 return error;
31257 }
31258
31259@@ -6817,7 +6817,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
31260 /* always allow read */
31261 mask = POLLIN | POLLRDNORM;
31262
31263- if (seq->poll_event != atomic_read(&md_event_count))
31264+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
31265 mask |= POLLERR | POLLPRI;
31266 return mask;
31267 }
31268@@ -6861,7 +6861,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
31269 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
31270 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
31271 (int)part_stat_read(&disk->part0, sectors[1]) -
31272- atomic_read(&disk->sync_io);
31273+ atomic_read_unchecked(&disk->sync_io);
31274 /* sync IO will cause sync_io to increase before the disk_stats
31275 * as sync_io is counted when a request starts, and
31276 * disk_stats is counted when it completes.
31277diff --git a/drivers/md/md.h b/drivers/md/md.h
31278index cf742d9..7c7c745 100644
31279--- a/drivers/md/md.h
31280+++ b/drivers/md/md.h
31281@@ -120,13 +120,13 @@ struct md_rdev {
31282 * only maintained for arrays that
31283 * support hot removal
31284 */
31285- atomic_t read_errors; /* number of consecutive read errors that
31286+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
31287 * we have tried to ignore.
31288 */
31289 struct timespec last_read_error; /* monotonic time since our
31290 * last read error
31291 */
31292- atomic_t corrected_errors; /* number of corrected read errors,
31293+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
31294 * for reporting to userspace and storing
31295 * in superblock.
31296 */
31297@@ -410,7 +410,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
31298
31299 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
31300 {
31301- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
31302+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
31303 }
31304
31305 struct md_personality
31306diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
31307index 50ed53b..4f29d7d 100644
31308--- a/drivers/md/persistent-data/dm-space-map-checker.c
31309+++ b/drivers/md/persistent-data/dm-space-map-checker.c
31310@@ -159,7 +159,7 @@ static void ca_destroy(struct count_array *ca)
31311 /*----------------------------------------------------------------*/
31312
31313 struct sm_checker {
31314- struct dm_space_map sm;
31315+ dm_space_map_no_const sm;
31316
31317 struct count_array old_counts;
31318 struct count_array counts;
31319diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
31320index fc469ba..2d91555 100644
31321--- a/drivers/md/persistent-data/dm-space-map-disk.c
31322+++ b/drivers/md/persistent-data/dm-space-map-disk.c
31323@@ -23,7 +23,7 @@
31324 * Space map interface.
31325 */
31326 struct sm_disk {
31327- struct dm_space_map sm;
31328+ dm_space_map_no_const sm;
31329
31330 struct ll_disk ll;
31331 struct ll_disk old_ll;
31332diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
31333index e89ae5e..062e4c2 100644
31334--- a/drivers/md/persistent-data/dm-space-map-metadata.c
31335+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
31336@@ -43,7 +43,7 @@ struct block_op {
31337 };
31338
31339 struct sm_metadata {
31340- struct dm_space_map sm;
31341+ dm_space_map_no_const sm;
31342
31343 struct ll_disk ll;
31344 struct ll_disk old_ll;
31345diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
31346index 1cbfc6b..56e1dbb 100644
31347--- a/drivers/md/persistent-data/dm-space-map.h
31348+++ b/drivers/md/persistent-data/dm-space-map.h
31349@@ -60,6 +60,7 @@ struct dm_space_map {
31350 int (*root_size)(struct dm_space_map *sm, size_t *result);
31351 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
31352 };
31353+typedef struct dm_space_map __no_const dm_space_map_no_const;
31354
31355 /*----------------------------------------------------------------*/
31356
31357diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
31358index 7d9e071..015b1d5 100644
31359--- a/drivers/md/raid1.c
31360+++ b/drivers/md/raid1.c
31361@@ -1568,7 +1568,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
31362 if (r1_sync_page_io(rdev, sect, s,
31363 bio->bi_io_vec[idx].bv_page,
31364 READ) != 0)
31365- atomic_add(s, &rdev->corrected_errors);
31366+ atomic_add_unchecked(s, &rdev->corrected_errors);
31367 }
31368 sectors -= s;
31369 sect += s;
31370@@ -1781,7 +1781,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
31371 test_bit(In_sync, &rdev->flags)) {
31372 if (r1_sync_page_io(rdev, sect, s,
31373 conf->tmppage, READ)) {
31374- atomic_add(s, &rdev->corrected_errors);
31375+ atomic_add_unchecked(s, &rdev->corrected_errors);
31376 printk(KERN_INFO
31377 "md/raid1:%s: read error corrected "
31378 "(%d sectors at %llu on %s)\n",
31379diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
31380index 685ddf3..955b087 100644
31381--- a/drivers/md/raid10.c
31382+++ b/drivers/md/raid10.c
31383@@ -1440,7 +1440,7 @@ static void end_sync_read(struct bio *bio, int error)
31384 /* The write handler will notice the lack of
31385 * R10BIO_Uptodate and record any errors etc
31386 */
31387- atomic_add(r10_bio->sectors,
31388+ atomic_add_unchecked(r10_bio->sectors,
31389 &conf->mirrors[d].rdev->corrected_errors);
31390
31391 /* for reconstruct, we always reschedule after a read.
31392@@ -1740,7 +1740,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
31393 {
31394 struct timespec cur_time_mon;
31395 unsigned long hours_since_last;
31396- unsigned int read_errors = atomic_read(&rdev->read_errors);
31397+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
31398
31399 ktime_get_ts(&cur_time_mon);
31400
31401@@ -1762,9 +1762,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
31402 * overflowing the shift of read_errors by hours_since_last.
31403 */
31404 if (hours_since_last >= 8 * sizeof(read_errors))
31405- atomic_set(&rdev->read_errors, 0);
31406+ atomic_set_unchecked(&rdev->read_errors, 0);
31407 else
31408- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
31409+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
31410 }
31411
31412 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
31413@@ -1814,8 +1814,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
31414 return;
31415
31416 check_decay_read_errors(mddev, rdev);
31417- atomic_inc(&rdev->read_errors);
31418- if (atomic_read(&rdev->read_errors) > max_read_errors) {
31419+ atomic_inc_unchecked(&rdev->read_errors);
31420+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
31421 char b[BDEVNAME_SIZE];
31422 bdevname(rdev->bdev, b);
31423
31424@@ -1823,7 +1823,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
31425 "md/raid10:%s: %s: Raid device exceeded "
31426 "read_error threshold [cur %d:max %d]\n",
31427 mdname(mddev), b,
31428- atomic_read(&rdev->read_errors), max_read_errors);
31429+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
31430 printk(KERN_NOTICE
31431 "md/raid10:%s: %s: Failing raid device\n",
31432 mdname(mddev), b);
31433@@ -1968,7 +1968,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
31434 (unsigned long long)(
31435 sect + rdev->data_offset),
31436 bdevname(rdev->bdev, b));
31437- atomic_add(s, &rdev->corrected_errors);
31438+ atomic_add_unchecked(s, &rdev->corrected_errors);
31439 }
31440
31441 rdev_dec_pending(rdev, mddev);
31442diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
31443index 858fdbb..b2dac95 100644
31444--- a/drivers/md/raid5.c
31445+++ b/drivers/md/raid5.c
31446@@ -1610,19 +1610,19 @@ static void raid5_end_read_request(struct bio * bi, int error)
31447 (unsigned long long)(sh->sector
31448 + rdev->data_offset),
31449 bdevname(rdev->bdev, b));
31450- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
31451+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
31452 clear_bit(R5_ReadError, &sh->dev[i].flags);
31453 clear_bit(R5_ReWrite, &sh->dev[i].flags);
31454 }
31455- if (atomic_read(&conf->disks[i].rdev->read_errors))
31456- atomic_set(&conf->disks[i].rdev->read_errors, 0);
31457+ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
31458+ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
31459 } else {
31460 const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
31461 int retry = 0;
31462 rdev = conf->disks[i].rdev;
31463
31464 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
31465- atomic_inc(&rdev->read_errors);
31466+ atomic_inc_unchecked(&rdev->read_errors);
31467 if (conf->mddev->degraded >= conf->max_degraded)
31468 printk_ratelimited(
31469 KERN_WARNING
31470@@ -1642,7 +1642,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
31471 (unsigned long long)(sh->sector
31472 + rdev->data_offset),
31473 bdn);
31474- else if (atomic_read(&rdev->read_errors)
31475+ else if (atomic_read_unchecked(&rdev->read_errors)
31476 > conf->max_nr_stripes)
31477 printk(KERN_WARNING
31478 "md/raid:%s: Too many read errors, failing device %s.\n",
31479diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
31480index ba9a643..e474ab5 100644
31481--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
31482+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
31483@@ -1678,7 +1678,7 @@ static struct ddb_info ddb_v6 = {
31484 .subvendor = _subvend, .subdevice = _subdev, \
31485 .driver_data = (unsigned long)&_driverdata }
31486
31487-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
31488+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
31489 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
31490 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
31491 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
31492diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
31493index a7d876f..8c21b61 100644
31494--- a/drivers/media/dvb/dvb-core/dvb_demux.h
31495+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
31496@@ -73,7 +73,7 @@ struct dvb_demux_feed {
31497 union {
31498 dmx_ts_cb ts;
31499 dmx_section_cb sec;
31500- } cb;
31501+ } __no_const cb;
31502
31503 struct dvb_demux *demux;
31504 void *priv;
31505diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
31506index f732877..d38c35a 100644
31507--- a/drivers/media/dvb/dvb-core/dvbdev.c
31508+++ b/drivers/media/dvb/dvb-core/dvbdev.c
31509@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
31510 const struct dvb_device *template, void *priv, int type)
31511 {
31512 struct dvb_device *dvbdev;
31513- struct file_operations *dvbdevfops;
31514+ file_operations_no_const *dvbdevfops;
31515 struct device *clsdev;
31516 int minor;
31517 int id;
31518diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
31519index 9f2a02c..5920f88 100644
31520--- a/drivers/media/dvb/dvb-usb/cxusb.c
31521+++ b/drivers/media/dvb/dvb-usb/cxusb.c
31522@@ -1069,7 +1069,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
31523 struct dib0700_adapter_state {
31524 int (*set_param_save) (struct dvb_frontend *,
31525 struct dvb_frontend_parameters *);
31526-};
31527+} __no_const;
31528
31529 static int dib7070_set_param_override(struct dvb_frontend *fe,
31530 struct dvb_frontend_parameters *fep)
31531diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
31532index f103ec1..5e8968b 100644
31533--- a/drivers/media/dvb/dvb-usb/dw2102.c
31534+++ b/drivers/media/dvb/dvb-usb/dw2102.c
31535@@ -95,7 +95,7 @@ struct su3000_state {
31536
31537 struct s6x0_state {
31538 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
31539-};
31540+} __no_const;
31541
31542 /* debug */
31543 static int dvb_usb_dw2102_debug;
31544diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
31545index 404f63a..4796533 100644
31546--- a/drivers/media/dvb/frontends/dib3000.h
31547+++ b/drivers/media/dvb/frontends/dib3000.h
31548@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
31549 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
31550 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
31551 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
31552-};
31553+} __no_const;
31554
31555 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
31556 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
31557diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
31558index 90bf573..e8463da 100644
31559--- a/drivers/media/dvb/frontends/ds3000.c
31560+++ b/drivers/media/dvb/frontends/ds3000.c
31561@@ -1210,7 +1210,7 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,
31562
31563 for (i = 0; i < 30 ; i++) {
31564 ds3000_read_status(fe, &status);
31565- if (status && FE_HAS_LOCK)
31566+ if (status & FE_HAS_LOCK)
31567 break;
31568
31569 msleep(10);
31570diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
31571index 0564192..75b16f5 100644
31572--- a/drivers/media/dvb/ngene/ngene-cards.c
31573+++ b/drivers/media/dvb/ngene/ngene-cards.c
31574@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780 = {
31575
31576 /****************************************************************************/
31577
31578-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
31579+static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
31580 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
31581 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
31582 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
31583diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
31584index 16a089f..ab1667d 100644
31585--- a/drivers/media/radio/radio-cadet.c
31586+++ b/drivers/media/radio/radio-cadet.c
31587@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
31588 unsigned char readbuf[RDS_BUFFER];
31589 int i = 0;
31590
31591+ if (count > RDS_BUFFER)
31592+ return -EFAULT;
31593 mutex_lock(&dev->lock);
31594 if (dev->rdsstat == 0) {
31595 dev->rdsstat = 1;
31596diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
31597index 61287fc..8b08712 100644
31598--- a/drivers/media/rc/redrat3.c
31599+++ b/drivers/media/rc/redrat3.c
31600@@ -905,7 +905,7 @@ static int redrat3_set_tx_carrier(struct rc_dev *dev, u32 carrier)
31601 return carrier;
31602 }
31603
31604-static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)
31605+static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf, u32 n)
31606 {
31607 struct redrat3_dev *rr3 = rcdev->priv;
31608 struct device *dev = rr3->dev;
31609diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
31610index 9cde353..8c6a1c3 100644
31611--- a/drivers/media/video/au0828/au0828.h
31612+++ b/drivers/media/video/au0828/au0828.h
31613@@ -191,7 +191,7 @@ struct au0828_dev {
31614
31615 /* I2C */
31616 struct i2c_adapter i2c_adap;
31617- struct i2c_algorithm i2c_algo;
31618+ i2c_algorithm_no_const i2c_algo;
31619 struct i2c_client i2c_client;
31620 u32 i2c_rc;
31621
31622diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
31623index 68d1240..46b32eb 100644
31624--- a/drivers/media/video/cx88/cx88-alsa.c
31625+++ b/drivers/media/video/cx88/cx88-alsa.c
31626@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
31627 * Only boards with eeprom and byte 1 at eeprom=1 have it
31628 */
31629
31630-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
31631+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
31632 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
31633 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
31634 {0, }
31635diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
31636index 305e6aa..0143317 100644
31637--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
31638+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
31639@@ -196,7 +196,7 @@ struct pvr2_hdw {
31640
31641 /* I2C stuff */
31642 struct i2c_adapter i2c_adap;
31643- struct i2c_algorithm i2c_algo;
31644+ i2c_algorithm_no_const i2c_algo;
31645 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
31646 int i2c_cx25840_hack_state;
31647 int i2c_linked;
31648diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
31649index a0895bf..b7ebb1b 100644
31650--- a/drivers/media/video/timblogiw.c
31651+++ b/drivers/media/video/timblogiw.c
31652@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
31653
31654 /* Platform device functions */
31655
31656-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
31657+static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
31658 .vidioc_querycap = timblogiw_querycap,
31659 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
31660 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
31661@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
31662 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
31663 };
31664
31665-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
31666+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
31667 .owner = THIS_MODULE,
31668 .open = timblogiw_open,
31669 .release = timblogiw_close,
31670diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
31671index e9c6a60..daf6a33 100644
31672--- a/drivers/message/fusion/mptbase.c
31673+++ b/drivers/message/fusion/mptbase.c
31674@@ -6753,8 +6753,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
31675 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
31676 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
31677
31678+#ifdef CONFIG_GRKERNSEC_HIDESYM
31679+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
31680+#else
31681 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
31682 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
31683+#endif
31684+
31685 /*
31686 * Rounding UP to nearest 4-kB boundary here...
31687 */
31688diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
31689index 9d95042..b808101 100644
31690--- a/drivers/message/fusion/mptsas.c
31691+++ b/drivers/message/fusion/mptsas.c
31692@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
31693 return 0;
31694 }
31695
31696+static inline void
31697+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
31698+{
31699+ if (phy_info->port_details) {
31700+ phy_info->port_details->rphy = rphy;
31701+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
31702+ ioc->name, rphy));
31703+ }
31704+
31705+ if (rphy) {
31706+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
31707+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
31708+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
31709+ ioc->name, rphy, rphy->dev.release));
31710+ }
31711+}
31712+
31713 /* no mutex */
31714 static void
31715 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
31716@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
31717 return NULL;
31718 }
31719
31720-static inline void
31721-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
31722-{
31723- if (phy_info->port_details) {
31724- phy_info->port_details->rphy = rphy;
31725- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
31726- ioc->name, rphy));
31727- }
31728-
31729- if (rphy) {
31730- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
31731- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
31732- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
31733- ioc->name, rphy, rphy->dev.release));
31734- }
31735-}
31736-
31737 static inline struct sas_port *
31738 mptsas_get_port(struct mptsas_phyinfo *phy_info)
31739 {
31740diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
31741index 0c3ced7..1fe34ec 100644
31742--- a/drivers/message/fusion/mptscsih.c
31743+++ b/drivers/message/fusion/mptscsih.c
31744@@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
31745
31746 h = shost_priv(SChost);
31747
31748- if (h) {
31749- if (h->info_kbuf == NULL)
31750- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
31751- return h->info_kbuf;
31752- h->info_kbuf[0] = '\0';
31753+ if (!h)
31754+ return NULL;
31755
31756- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
31757- h->info_kbuf[size-1] = '\0';
31758- }
31759+ if (h->info_kbuf == NULL)
31760+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
31761+ return h->info_kbuf;
31762+ h->info_kbuf[0] = '\0';
31763+
31764+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
31765+ h->info_kbuf[size-1] = '\0';
31766
31767 return h->info_kbuf;
31768 }
31769diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
31770index 07dbeaf..5533142 100644
31771--- a/drivers/message/i2o/i2o_proc.c
31772+++ b/drivers/message/i2o/i2o_proc.c
31773@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
31774 "Array Controller Device"
31775 };
31776
31777-static char *chtostr(u8 * chars, int n)
31778-{
31779- char tmp[256];
31780- tmp[0] = 0;
31781- return strncat(tmp, (char *)chars, n);
31782-}
31783-
31784 static int i2o_report_query_status(struct seq_file *seq, int block_status,
31785 char *group)
31786 {
31787@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
31788
31789 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
31790 seq_printf(seq, "%-#8x", ddm_table.module_id);
31791- seq_printf(seq, "%-29s",
31792- chtostr(ddm_table.module_name_version, 28));
31793+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
31794 seq_printf(seq, "%9d ", ddm_table.data_size);
31795 seq_printf(seq, "%8d", ddm_table.code_size);
31796
31797@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
31798
31799 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
31800 seq_printf(seq, "%-#8x", dst->module_id);
31801- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
31802- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
31803+ seq_printf(seq, "%-.28s", dst->module_name_version);
31804+ seq_printf(seq, "%-.8s", dst->date);
31805 seq_printf(seq, "%8d ", dst->module_size);
31806 seq_printf(seq, "%8d ", dst->mpb_size);
31807 seq_printf(seq, "0x%04x", dst->module_flags);
31808@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
31809 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
31810 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
31811 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
31812- seq_printf(seq, "Vendor info : %s\n",
31813- chtostr((u8 *) (work32 + 2), 16));
31814- seq_printf(seq, "Product info : %s\n",
31815- chtostr((u8 *) (work32 + 6), 16));
31816- seq_printf(seq, "Description : %s\n",
31817- chtostr((u8 *) (work32 + 10), 16));
31818- seq_printf(seq, "Product rev. : %s\n",
31819- chtostr((u8 *) (work32 + 14), 8));
31820+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
31821+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
31822+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
31823+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
31824
31825 seq_printf(seq, "Serial number : ");
31826 print_serial_number(seq, (u8 *) (work32 + 16),
31827@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
31828 }
31829
31830 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
31831- seq_printf(seq, "Module name : %s\n",
31832- chtostr(result.module_name, 24));
31833- seq_printf(seq, "Module revision : %s\n",
31834- chtostr(result.module_rev, 8));
31835+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
31836+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
31837
31838 seq_printf(seq, "Serial number : ");
31839 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
31840@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
31841 return 0;
31842 }
31843
31844- seq_printf(seq, "Device name : %s\n",
31845- chtostr(result.device_name, 64));
31846- seq_printf(seq, "Service name : %s\n",
31847- chtostr(result.service_name, 64));
31848- seq_printf(seq, "Physical name : %s\n",
31849- chtostr(result.physical_location, 64));
31850- seq_printf(seq, "Instance number : %s\n",
31851- chtostr(result.instance_number, 4));
31852+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
31853+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
31854+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
31855+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
31856
31857 return 0;
31858 }
31859diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
31860index a8c08f3..155fe3d 100644
31861--- a/drivers/message/i2o/iop.c
31862+++ b/drivers/message/i2o/iop.c
31863@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
31864
31865 spin_lock_irqsave(&c->context_list_lock, flags);
31866
31867- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
31868- atomic_inc(&c->context_list_counter);
31869+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
31870+ atomic_inc_unchecked(&c->context_list_counter);
31871
31872- entry->context = atomic_read(&c->context_list_counter);
31873+ entry->context = atomic_read_unchecked(&c->context_list_counter);
31874
31875 list_add(&entry->list, &c->context_list);
31876
31877@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
31878
31879 #if BITS_PER_LONG == 64
31880 spin_lock_init(&c->context_list_lock);
31881- atomic_set(&c->context_list_counter, 0);
31882+ atomic_set_unchecked(&c->context_list_counter, 0);
31883 INIT_LIST_HEAD(&c->context_list);
31884 #endif
31885
31886diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
31887index 7ce65f4..e66e9bc 100644
31888--- a/drivers/mfd/abx500-core.c
31889+++ b/drivers/mfd/abx500-core.c
31890@@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
31891
31892 struct abx500_device_entry {
31893 struct list_head list;
31894- struct abx500_ops ops;
31895+ abx500_ops_no_const ops;
31896 struct device *dev;
31897 };
31898
31899diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
31900index 5c2a06a..8fa077c 100644
31901--- a/drivers/mfd/janz-cmodio.c
31902+++ b/drivers/mfd/janz-cmodio.c
31903@@ -13,6 +13,7 @@
31904
31905 #include <linux/kernel.h>
31906 #include <linux/module.h>
31907+#include <linux/slab.h>
31908 #include <linux/init.h>
31909 #include <linux/pci.h>
31910 #include <linux/interrupt.h>
31911diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
31912index 29d12a7..f900ba4 100644
31913--- a/drivers/misc/lis3lv02d/lis3lv02d.c
31914+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
31915@@ -464,7 +464,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
31916 * the lid is closed. This leads to interrupts as soon as a little move
31917 * is done.
31918 */
31919- atomic_inc(&lis3->count);
31920+ atomic_inc_unchecked(&lis3->count);
31921
31922 wake_up_interruptible(&lis3->misc_wait);
31923 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
31924@@ -550,7 +550,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
31925 if (lis3->pm_dev)
31926 pm_runtime_get_sync(lis3->pm_dev);
31927
31928- atomic_set(&lis3->count, 0);
31929+ atomic_set_unchecked(&lis3->count, 0);
31930 return 0;
31931 }
31932
31933@@ -583,7 +583,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
31934 add_wait_queue(&lis3->misc_wait, &wait);
31935 while (true) {
31936 set_current_state(TASK_INTERRUPTIBLE);
31937- data = atomic_xchg(&lis3->count, 0);
31938+ data = atomic_xchg_unchecked(&lis3->count, 0);
31939 if (data)
31940 break;
31941
31942@@ -624,7 +624,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
31943 struct lis3lv02d, miscdev);
31944
31945 poll_wait(file, &lis3->misc_wait, wait);
31946- if (atomic_read(&lis3->count))
31947+ if (atomic_read_unchecked(&lis3->count))
31948 return POLLIN | POLLRDNORM;
31949 return 0;
31950 }
31951diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
31952index 2b1482a..5d33616 100644
31953--- a/drivers/misc/lis3lv02d/lis3lv02d.h
31954+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
31955@@ -266,7 +266,7 @@ struct lis3lv02d {
31956 struct input_polled_dev *idev; /* input device */
31957 struct platform_device *pdev; /* platform device */
31958 struct regulator_bulk_data regulators[2];
31959- atomic_t count; /* interrupt count after last read */
31960+ atomic_unchecked_t count; /* interrupt count after last read */
31961 union axis_conversion ac; /* hw -> logical axis */
31962 int mapped_btns[3];
31963
31964diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
31965index 2f30bad..c4c13d0 100644
31966--- a/drivers/misc/sgi-gru/gruhandles.c
31967+++ b/drivers/misc/sgi-gru/gruhandles.c
31968@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
31969 unsigned long nsec;
31970
31971 nsec = CLKS2NSEC(clks);
31972- atomic_long_inc(&mcs_op_statistics[op].count);
31973- atomic_long_add(nsec, &mcs_op_statistics[op].total);
31974+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
31975+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
31976 if (mcs_op_statistics[op].max < nsec)
31977 mcs_op_statistics[op].max = nsec;
31978 }
31979diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
31980index 7768b87..f8aac38 100644
31981--- a/drivers/misc/sgi-gru/gruprocfs.c
31982+++ b/drivers/misc/sgi-gru/gruprocfs.c
31983@@ -32,9 +32,9 @@
31984
31985 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
31986
31987-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
31988+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
31989 {
31990- unsigned long val = atomic_long_read(v);
31991+ unsigned long val = atomic_long_read_unchecked(v);
31992
31993 seq_printf(s, "%16lu %s\n", val, id);
31994 }
31995@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
31996
31997 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
31998 for (op = 0; op < mcsop_last; op++) {
31999- count = atomic_long_read(&mcs_op_statistics[op].count);
32000- total = atomic_long_read(&mcs_op_statistics[op].total);
32001+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
32002+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
32003 max = mcs_op_statistics[op].max;
32004 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
32005 count ? total / count : 0, max);
32006diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
32007index 5c3ce24..4915ccb 100644
32008--- a/drivers/misc/sgi-gru/grutables.h
32009+++ b/drivers/misc/sgi-gru/grutables.h
32010@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
32011 * GRU statistics.
32012 */
32013 struct gru_stats_s {
32014- atomic_long_t vdata_alloc;
32015- atomic_long_t vdata_free;
32016- atomic_long_t gts_alloc;
32017- atomic_long_t gts_free;
32018- atomic_long_t gms_alloc;
32019- atomic_long_t gms_free;
32020- atomic_long_t gts_double_allocate;
32021- atomic_long_t assign_context;
32022- atomic_long_t assign_context_failed;
32023- atomic_long_t free_context;
32024- atomic_long_t load_user_context;
32025- atomic_long_t load_kernel_context;
32026- atomic_long_t lock_kernel_context;
32027- atomic_long_t unlock_kernel_context;
32028- atomic_long_t steal_user_context;
32029- atomic_long_t steal_kernel_context;
32030- atomic_long_t steal_context_failed;
32031- atomic_long_t nopfn;
32032- atomic_long_t asid_new;
32033- atomic_long_t asid_next;
32034- atomic_long_t asid_wrap;
32035- atomic_long_t asid_reuse;
32036- atomic_long_t intr;
32037- atomic_long_t intr_cbr;
32038- atomic_long_t intr_tfh;
32039- atomic_long_t intr_spurious;
32040- atomic_long_t intr_mm_lock_failed;
32041- atomic_long_t call_os;
32042- atomic_long_t call_os_wait_queue;
32043- atomic_long_t user_flush_tlb;
32044- atomic_long_t user_unload_context;
32045- atomic_long_t user_exception;
32046- atomic_long_t set_context_option;
32047- atomic_long_t check_context_retarget_intr;
32048- atomic_long_t check_context_unload;
32049- atomic_long_t tlb_dropin;
32050- atomic_long_t tlb_preload_page;
32051- atomic_long_t tlb_dropin_fail_no_asid;
32052- atomic_long_t tlb_dropin_fail_upm;
32053- atomic_long_t tlb_dropin_fail_invalid;
32054- atomic_long_t tlb_dropin_fail_range_active;
32055- atomic_long_t tlb_dropin_fail_idle;
32056- atomic_long_t tlb_dropin_fail_fmm;
32057- atomic_long_t tlb_dropin_fail_no_exception;
32058- atomic_long_t tfh_stale_on_fault;
32059- atomic_long_t mmu_invalidate_range;
32060- atomic_long_t mmu_invalidate_page;
32061- atomic_long_t flush_tlb;
32062- atomic_long_t flush_tlb_gru;
32063- atomic_long_t flush_tlb_gru_tgh;
32064- atomic_long_t flush_tlb_gru_zero_asid;
32065+ atomic_long_unchecked_t vdata_alloc;
32066+ atomic_long_unchecked_t vdata_free;
32067+ atomic_long_unchecked_t gts_alloc;
32068+ atomic_long_unchecked_t gts_free;
32069+ atomic_long_unchecked_t gms_alloc;
32070+ atomic_long_unchecked_t gms_free;
32071+ atomic_long_unchecked_t gts_double_allocate;
32072+ atomic_long_unchecked_t assign_context;
32073+ atomic_long_unchecked_t assign_context_failed;
32074+ atomic_long_unchecked_t free_context;
32075+ atomic_long_unchecked_t load_user_context;
32076+ atomic_long_unchecked_t load_kernel_context;
32077+ atomic_long_unchecked_t lock_kernel_context;
32078+ atomic_long_unchecked_t unlock_kernel_context;
32079+ atomic_long_unchecked_t steal_user_context;
32080+ atomic_long_unchecked_t steal_kernel_context;
32081+ atomic_long_unchecked_t steal_context_failed;
32082+ atomic_long_unchecked_t nopfn;
32083+ atomic_long_unchecked_t asid_new;
32084+ atomic_long_unchecked_t asid_next;
32085+ atomic_long_unchecked_t asid_wrap;
32086+ atomic_long_unchecked_t asid_reuse;
32087+ atomic_long_unchecked_t intr;
32088+ atomic_long_unchecked_t intr_cbr;
32089+ atomic_long_unchecked_t intr_tfh;
32090+ atomic_long_unchecked_t intr_spurious;
32091+ atomic_long_unchecked_t intr_mm_lock_failed;
32092+ atomic_long_unchecked_t call_os;
32093+ atomic_long_unchecked_t call_os_wait_queue;
32094+ atomic_long_unchecked_t user_flush_tlb;
32095+ atomic_long_unchecked_t user_unload_context;
32096+ atomic_long_unchecked_t user_exception;
32097+ atomic_long_unchecked_t set_context_option;
32098+ atomic_long_unchecked_t check_context_retarget_intr;
32099+ atomic_long_unchecked_t check_context_unload;
32100+ atomic_long_unchecked_t tlb_dropin;
32101+ atomic_long_unchecked_t tlb_preload_page;
32102+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
32103+ atomic_long_unchecked_t tlb_dropin_fail_upm;
32104+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
32105+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
32106+ atomic_long_unchecked_t tlb_dropin_fail_idle;
32107+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
32108+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
32109+ atomic_long_unchecked_t tfh_stale_on_fault;
32110+ atomic_long_unchecked_t mmu_invalidate_range;
32111+ atomic_long_unchecked_t mmu_invalidate_page;
32112+ atomic_long_unchecked_t flush_tlb;
32113+ atomic_long_unchecked_t flush_tlb_gru;
32114+ atomic_long_unchecked_t flush_tlb_gru_tgh;
32115+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
32116
32117- atomic_long_t copy_gpa;
32118- atomic_long_t read_gpa;
32119+ atomic_long_unchecked_t copy_gpa;
32120+ atomic_long_unchecked_t read_gpa;
32121
32122- atomic_long_t mesq_receive;
32123- atomic_long_t mesq_receive_none;
32124- atomic_long_t mesq_send;
32125- atomic_long_t mesq_send_failed;
32126- atomic_long_t mesq_noop;
32127- atomic_long_t mesq_send_unexpected_error;
32128- atomic_long_t mesq_send_lb_overflow;
32129- atomic_long_t mesq_send_qlimit_reached;
32130- atomic_long_t mesq_send_amo_nacked;
32131- atomic_long_t mesq_send_put_nacked;
32132- atomic_long_t mesq_page_overflow;
32133- atomic_long_t mesq_qf_locked;
32134- atomic_long_t mesq_qf_noop_not_full;
32135- atomic_long_t mesq_qf_switch_head_failed;
32136- atomic_long_t mesq_qf_unexpected_error;
32137- atomic_long_t mesq_noop_unexpected_error;
32138- atomic_long_t mesq_noop_lb_overflow;
32139- atomic_long_t mesq_noop_qlimit_reached;
32140- atomic_long_t mesq_noop_amo_nacked;
32141- atomic_long_t mesq_noop_put_nacked;
32142- atomic_long_t mesq_noop_page_overflow;
32143+ atomic_long_unchecked_t mesq_receive;
32144+ atomic_long_unchecked_t mesq_receive_none;
32145+ atomic_long_unchecked_t mesq_send;
32146+ atomic_long_unchecked_t mesq_send_failed;
32147+ atomic_long_unchecked_t mesq_noop;
32148+ atomic_long_unchecked_t mesq_send_unexpected_error;
32149+ atomic_long_unchecked_t mesq_send_lb_overflow;
32150+ atomic_long_unchecked_t mesq_send_qlimit_reached;
32151+ atomic_long_unchecked_t mesq_send_amo_nacked;
32152+ atomic_long_unchecked_t mesq_send_put_nacked;
32153+ atomic_long_unchecked_t mesq_page_overflow;
32154+ atomic_long_unchecked_t mesq_qf_locked;
32155+ atomic_long_unchecked_t mesq_qf_noop_not_full;
32156+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
32157+ atomic_long_unchecked_t mesq_qf_unexpected_error;
32158+ atomic_long_unchecked_t mesq_noop_unexpected_error;
32159+ atomic_long_unchecked_t mesq_noop_lb_overflow;
32160+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
32161+ atomic_long_unchecked_t mesq_noop_amo_nacked;
32162+ atomic_long_unchecked_t mesq_noop_put_nacked;
32163+ atomic_long_unchecked_t mesq_noop_page_overflow;
32164
32165 };
32166
32167@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
32168 tghop_invalidate, mcsop_last};
32169
32170 struct mcs_op_statistic {
32171- atomic_long_t count;
32172- atomic_long_t total;
32173+ atomic_long_unchecked_t count;
32174+ atomic_long_unchecked_t total;
32175 unsigned long max;
32176 };
32177
32178@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
32179
32180 #define STAT(id) do { \
32181 if (gru_options & OPT_STATS) \
32182- atomic_long_inc(&gru_stats.id); \
32183+ atomic_long_inc_unchecked(&gru_stats.id); \
32184 } while (0)
32185
32186 #ifdef CONFIG_SGI_GRU_DEBUG
32187diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
32188index 851b2f2..a4ec097 100644
32189--- a/drivers/misc/sgi-xp/xp.h
32190+++ b/drivers/misc/sgi-xp/xp.h
32191@@ -289,7 +289,7 @@ struct xpc_interface {
32192 xpc_notify_func, void *);
32193 void (*received) (short, int, void *);
32194 enum xp_retval (*partid_to_nasids) (short, void *);
32195-};
32196+} __no_const;
32197
32198 extern struct xpc_interface xpc_interface;
32199
32200diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
32201index b94d5f7..7f494c5 100644
32202--- a/drivers/misc/sgi-xp/xpc.h
32203+++ b/drivers/misc/sgi-xp/xpc.h
32204@@ -835,6 +835,7 @@ struct xpc_arch_operations {
32205 void (*received_payload) (struct xpc_channel *, void *);
32206 void (*notify_senders_of_disconnect) (struct xpc_channel *);
32207 };
32208+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
32209
32210 /* struct xpc_partition act_state values (for XPC HB) */
32211
32212@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
32213 /* found in xpc_main.c */
32214 extern struct device *xpc_part;
32215 extern struct device *xpc_chan;
32216-extern struct xpc_arch_operations xpc_arch_ops;
32217+extern xpc_arch_operations_no_const xpc_arch_ops;
32218 extern int xpc_disengage_timelimit;
32219 extern int xpc_disengage_timedout;
32220 extern int xpc_activate_IRQ_rcvd;
32221diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
32222index 8d082b4..aa749ae 100644
32223--- a/drivers/misc/sgi-xp/xpc_main.c
32224+++ b/drivers/misc/sgi-xp/xpc_main.c
32225@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
32226 .notifier_call = xpc_system_die,
32227 };
32228
32229-struct xpc_arch_operations xpc_arch_ops;
32230+xpc_arch_operations_no_const xpc_arch_ops;
32231
32232 /*
32233 * Timer function to enforce the timelimit on the partition disengage.
32234diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
32235index 6878a94..fe5c5f1 100644
32236--- a/drivers/mmc/host/sdhci-pci.c
32237+++ b/drivers/mmc/host/sdhci-pci.c
32238@@ -673,7 +673,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
32239 .probe = via_probe,
32240 };
32241
32242-static const struct pci_device_id pci_ids[] __devinitdata = {
32243+static const struct pci_device_id pci_ids[] __devinitconst = {
32244 {
32245 .vendor = PCI_VENDOR_ID_RICOH,
32246 .device = PCI_DEVICE_ID_RICOH_R5C822,
32247diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
32248index e9fad91..0a7a16a 100644
32249--- a/drivers/mtd/devices/doc2000.c
32250+++ b/drivers/mtd/devices/doc2000.c
32251@@ -773,7 +773,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
32252
32253 /* The ECC will not be calculated correctly if less than 512 is written */
32254 /* DBB-
32255- if (len != 0x200 && eccbuf)
32256+ if (len != 0x200)
32257 printk(KERN_WARNING
32258 "ECC needs a full sector write (adr: %lx size %lx)\n",
32259 (long) to, (long) len);
32260diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
32261index a3f7a27..234016e 100644
32262--- a/drivers/mtd/devices/doc2001.c
32263+++ b/drivers/mtd/devices/doc2001.c
32264@@ -392,7 +392,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
32265 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
32266
32267 /* Don't allow read past end of device */
32268- if (from >= this->totlen)
32269+ if (from >= this->totlen || !len)
32270 return -EINVAL;
32271
32272 /* Don't allow a single read to cross a 512-byte block boundary */
32273diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
32274index 3984d48..28aa897 100644
32275--- a/drivers/mtd/nand/denali.c
32276+++ b/drivers/mtd/nand/denali.c
32277@@ -26,6 +26,7 @@
32278 #include <linux/pci.h>
32279 #include <linux/mtd/mtd.h>
32280 #include <linux/module.h>
32281+#include <linux/slab.h>
32282
32283 #include "denali.h"
32284
32285diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
32286index ac40925..483b753 100644
32287--- a/drivers/mtd/nftlmount.c
32288+++ b/drivers/mtd/nftlmount.c
32289@@ -24,6 +24,7 @@
32290 #include <asm/errno.h>
32291 #include <linux/delay.h>
32292 #include <linux/slab.h>
32293+#include <linux/sched.h>
32294 #include <linux/mtd/mtd.h>
32295 #include <linux/mtd/nand.h>
32296 #include <linux/mtd/nftl.h>
32297diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
32298index 6c3fb5a..c542a81 100644
32299--- a/drivers/mtd/ubi/build.c
32300+++ b/drivers/mtd/ubi/build.c
32301@@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
32302 static int __init bytes_str_to_int(const char *str)
32303 {
32304 char *endp;
32305- unsigned long result;
32306+ unsigned long result, scale = 1;
32307
32308 result = simple_strtoul(str, &endp, 0);
32309 if (str == endp || result >= INT_MAX) {
32310@@ -1322,11 +1322,11 @@ static int __init bytes_str_to_int(const char *str)
32311
32312 switch (*endp) {
32313 case 'G':
32314- result *= 1024;
32315+ scale *= 1024;
32316 case 'M':
32317- result *= 1024;
32318+ scale *= 1024;
32319 case 'K':
32320- result *= 1024;
32321+ scale *= 1024;
32322 if (endp[1] == 'i' && endp[2] == 'B')
32323 endp += 2;
32324 case '\0':
32325@@ -1337,7 +1337,13 @@ static int __init bytes_str_to_int(const char *str)
32326 return -EINVAL;
32327 }
32328
32329- return result;
32330+ if ((intoverflow_t)result*scale >= INT_MAX) {
32331+ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
32332+ str);
32333+ return -EINVAL;
32334+ }
32335+
32336+ return result*scale;
32337 }
32338
32339 /**
32340diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
32341index 1feae59..c2a61d2 100644
32342--- a/drivers/net/ethernet/atheros/atlx/atl2.c
32343+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
32344@@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
32345 */
32346
32347 #define ATL2_PARAM(X, desc) \
32348- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
32349+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
32350 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
32351 MODULE_PARM_DESC(X, desc);
32352 #else
32353diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
32354index 9a517c2..a50cfcb 100644
32355--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
32356+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
32357@@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
32358
32359 int (*wait_comp)(struct bnx2x *bp,
32360 struct bnx2x_rx_mode_ramrod_params *p);
32361-};
32362+} __no_const;
32363
32364 /********************** Set multicast group ***********************************/
32365
32366diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
32367index 94b4bd0..73c02de 100644
32368--- a/drivers/net/ethernet/broadcom/tg3.h
32369+++ b/drivers/net/ethernet/broadcom/tg3.h
32370@@ -134,6 +134,7 @@
32371 #define CHIPREV_ID_5750_A0 0x4000
32372 #define CHIPREV_ID_5750_A1 0x4001
32373 #define CHIPREV_ID_5750_A3 0x4003
32374+#define CHIPREV_ID_5750_C1 0x4201
32375 #define CHIPREV_ID_5750_C2 0x4202
32376 #define CHIPREV_ID_5752_A0_HW 0x5000
32377 #define CHIPREV_ID_5752_A0 0x6000
32378diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
32379index c5f5479..2e8c260 100644
32380--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
32381+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
32382@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
32383 */
32384 struct l2t_skb_cb {
32385 arp_failure_handler_func arp_failure_handler;
32386-};
32387+} __no_const;
32388
32389 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
32390
32391diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
32392index 871bcaa..4043505 100644
32393--- a/drivers/net/ethernet/dec/tulip/de4x5.c
32394+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
32395@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
32396 for (i=0; i<ETH_ALEN; i++) {
32397 tmp.addr[i] = dev->dev_addr[i];
32398 }
32399- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
32400+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
32401 break;
32402
32403 case DE4X5_SET_HWADDR: /* Set the hardware address */
32404@@ -5437,7 +5437,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
32405 spin_lock_irqsave(&lp->lock, flags);
32406 memcpy(&statbuf, &lp->pktStats, ioc->len);
32407 spin_unlock_irqrestore(&lp->lock, flags);
32408- if (copy_to_user(ioc->data, &statbuf, ioc->len))
32409+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
32410 return -EFAULT;
32411 break;
32412 }
32413diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
32414index 14d5b61..1398636 100644
32415--- a/drivers/net/ethernet/dec/tulip/eeprom.c
32416+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
32417@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
32418 {NULL}};
32419
32420
32421-static const char *block_name[] __devinitdata = {
32422+static const char *block_name[] __devinitconst = {
32423 "21140 non-MII",
32424 "21140 MII PHY",
32425 "21142 Serial PHY",
32426diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
32427index 4d01219..b58d26d 100644
32428--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
32429+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
32430@@ -236,7 +236,7 @@ struct pci_id_info {
32431 int drv_flags; /* Driver use, intended as capability flags. */
32432 };
32433
32434-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
32435+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
32436 { /* Sometime a Level-One switch card. */
32437 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
32438 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
32439diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
32440index dcd7f7a..ecb7fb3 100644
32441--- a/drivers/net/ethernet/dlink/sundance.c
32442+++ b/drivers/net/ethernet/dlink/sundance.c
32443@@ -218,7 +218,7 @@ enum {
32444 struct pci_id_info {
32445 const char *name;
32446 };
32447-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
32448+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
32449 {"D-Link DFE-550TX FAST Ethernet Adapter"},
32450 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
32451 {"D-Link DFE-580TX 4 port Server Adapter"},
32452diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
32453index bf266a0..e024af7 100644
32454--- a/drivers/net/ethernet/emulex/benet/be_main.c
32455+++ b/drivers/net/ethernet/emulex/benet/be_main.c
32456@@ -397,7 +397,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
32457
32458 if (wrapped)
32459 newacc += 65536;
32460- ACCESS_ONCE(*acc) = newacc;
32461+ ACCESS_ONCE_RW(*acc) = newacc;
32462 }
32463
32464 void be_parse_stats(struct be_adapter *adapter)
32465diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
32466index 61d2bdd..7f1154a 100644
32467--- a/drivers/net/ethernet/fealnx.c
32468+++ b/drivers/net/ethernet/fealnx.c
32469@@ -150,7 +150,7 @@ struct chip_info {
32470 int flags;
32471 };
32472
32473-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
32474+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
32475 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
32476 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
32477 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
32478diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
32479index e1159e5..e18684d 100644
32480--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
32481+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
32482@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
32483 {
32484 struct e1000_hw *hw = &adapter->hw;
32485 struct e1000_mac_info *mac = &hw->mac;
32486- struct e1000_mac_operations *func = &mac->ops;
32487+ e1000_mac_operations_no_const *func = &mac->ops;
32488
32489 /* Set media type */
32490 switch (adapter->pdev->device) {
32491diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
32492index a3e65fd..f451444 100644
32493--- a/drivers/net/ethernet/intel/e1000e/82571.c
32494+++ b/drivers/net/ethernet/intel/e1000e/82571.c
32495@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
32496 {
32497 struct e1000_hw *hw = &adapter->hw;
32498 struct e1000_mac_info *mac = &hw->mac;
32499- struct e1000_mac_operations *func = &mac->ops;
32500+ e1000_mac_operations_no_const *func = &mac->ops;
32501 u32 swsm = 0;
32502 u32 swsm2 = 0;
32503 bool force_clear_smbi = false;
32504diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
32505index 2967039..ca8c40c 100644
32506--- a/drivers/net/ethernet/intel/e1000e/hw.h
32507+++ b/drivers/net/ethernet/intel/e1000e/hw.h
32508@@ -778,6 +778,7 @@ struct e1000_mac_operations {
32509 void (*write_vfta)(struct e1000_hw *, u32, u32);
32510 s32 (*read_mac_addr)(struct e1000_hw *);
32511 };
32512+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
32513
32514 /*
32515 * When to use various PHY register access functions:
32516@@ -818,6 +819,7 @@ struct e1000_phy_operations {
32517 void (*power_up)(struct e1000_hw *);
32518 void (*power_down)(struct e1000_hw *);
32519 };
32520+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
32521
32522 /* Function pointers for the NVM. */
32523 struct e1000_nvm_operations {
32524@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
32525 s32 (*validate)(struct e1000_hw *);
32526 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
32527 };
32528+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
32529
32530 struct e1000_mac_info {
32531- struct e1000_mac_operations ops;
32532+ e1000_mac_operations_no_const ops;
32533 u8 addr[ETH_ALEN];
32534 u8 perm_addr[ETH_ALEN];
32535
32536@@ -872,7 +875,7 @@ struct e1000_mac_info {
32537 };
32538
32539 struct e1000_phy_info {
32540- struct e1000_phy_operations ops;
32541+ e1000_phy_operations_no_const ops;
32542
32543 enum e1000_phy_type type;
32544
32545@@ -906,7 +909,7 @@ struct e1000_phy_info {
32546 };
32547
32548 struct e1000_nvm_info {
32549- struct e1000_nvm_operations ops;
32550+ e1000_nvm_operations_no_const ops;
32551
32552 enum e1000_nvm_type type;
32553 enum e1000_nvm_override override;
32554diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
32555index 4519a13..f97fcd0 100644
32556--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
32557+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
32558@@ -314,6 +314,7 @@ struct e1000_mac_operations {
32559 s32 (*read_mac_addr)(struct e1000_hw *);
32560 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
32561 };
32562+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
32563
32564 struct e1000_phy_operations {
32565 s32 (*acquire)(struct e1000_hw *);
32566@@ -330,6 +331,7 @@ struct e1000_phy_operations {
32567 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
32568 s32 (*write_reg)(struct e1000_hw *, u32, u16);
32569 };
32570+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
32571
32572 struct e1000_nvm_operations {
32573 s32 (*acquire)(struct e1000_hw *);
32574@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
32575 s32 (*update)(struct e1000_hw *);
32576 s32 (*validate)(struct e1000_hw *);
32577 };
32578+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
32579
32580 struct e1000_info {
32581 s32 (*get_invariants)(struct e1000_hw *);
32582@@ -350,7 +353,7 @@ struct e1000_info {
32583 extern const struct e1000_info e1000_82575_info;
32584
32585 struct e1000_mac_info {
32586- struct e1000_mac_operations ops;
32587+ e1000_mac_operations_no_const ops;
32588
32589 u8 addr[6];
32590 u8 perm_addr[6];
32591@@ -388,7 +391,7 @@ struct e1000_mac_info {
32592 };
32593
32594 struct e1000_phy_info {
32595- struct e1000_phy_operations ops;
32596+ e1000_phy_operations_no_const ops;
32597
32598 enum e1000_phy_type type;
32599
32600@@ -423,7 +426,7 @@ struct e1000_phy_info {
32601 };
32602
32603 struct e1000_nvm_info {
32604- struct e1000_nvm_operations ops;
32605+ e1000_nvm_operations_no_const ops;
32606 enum e1000_nvm_type type;
32607 enum e1000_nvm_override override;
32608
32609@@ -468,6 +471,7 @@ struct e1000_mbx_operations {
32610 s32 (*check_for_ack)(struct e1000_hw *, u16);
32611 s32 (*check_for_rst)(struct e1000_hw *, u16);
32612 };
32613+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
32614
32615 struct e1000_mbx_stats {
32616 u32 msgs_tx;
32617@@ -479,7 +483,7 @@ struct e1000_mbx_stats {
32618 };
32619
32620 struct e1000_mbx_info {
32621- struct e1000_mbx_operations ops;
32622+ e1000_mbx_operations_no_const ops;
32623 struct e1000_mbx_stats stats;
32624 u32 timeout;
32625 u32 usec_delay;
32626diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
32627index d7ed58f..64cde36 100644
32628--- a/drivers/net/ethernet/intel/igbvf/vf.h
32629+++ b/drivers/net/ethernet/intel/igbvf/vf.h
32630@@ -189,9 +189,10 @@ struct e1000_mac_operations {
32631 s32 (*read_mac_addr)(struct e1000_hw *);
32632 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
32633 };
32634+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
32635
32636 struct e1000_mac_info {
32637- struct e1000_mac_operations ops;
32638+ e1000_mac_operations_no_const ops;
32639 u8 addr[6];
32640 u8 perm_addr[6];
32641
32642@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
32643 s32 (*check_for_ack)(struct e1000_hw *);
32644 s32 (*check_for_rst)(struct e1000_hw *);
32645 };
32646+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
32647
32648 struct e1000_mbx_stats {
32649 u32 msgs_tx;
32650@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
32651 };
32652
32653 struct e1000_mbx_info {
32654- struct e1000_mbx_operations ops;
32655+ e1000_mbx_operations_no_const ops;
32656 struct e1000_mbx_stats stats;
32657 u32 timeout;
32658 u32 usec_delay;
32659diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
32660index 6c5cca8..de8ef63 100644
32661--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
32662+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
32663@@ -2708,6 +2708,7 @@ struct ixgbe_eeprom_operations {
32664 s32 (*update_checksum)(struct ixgbe_hw *);
32665 u16 (*calc_checksum)(struct ixgbe_hw *);
32666 };
32667+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
32668
32669 struct ixgbe_mac_operations {
32670 s32 (*init_hw)(struct ixgbe_hw *);
32671@@ -2769,6 +2770,7 @@ struct ixgbe_mac_operations {
32672 /* Manageability interface */
32673 s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
32674 };
32675+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
32676
32677 struct ixgbe_phy_operations {
32678 s32 (*identify)(struct ixgbe_hw *);
32679@@ -2788,9 +2790,10 @@ struct ixgbe_phy_operations {
32680 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
32681 s32 (*check_overtemp)(struct ixgbe_hw *);
32682 };
32683+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
32684
32685 struct ixgbe_eeprom_info {
32686- struct ixgbe_eeprom_operations ops;
32687+ ixgbe_eeprom_operations_no_const ops;
32688 enum ixgbe_eeprom_type type;
32689 u32 semaphore_delay;
32690 u16 word_size;
32691@@ -2800,7 +2803,7 @@ struct ixgbe_eeprom_info {
32692
32693 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
32694 struct ixgbe_mac_info {
32695- struct ixgbe_mac_operations ops;
32696+ ixgbe_mac_operations_no_const ops;
32697 enum ixgbe_mac_type type;
32698 u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
32699 u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
32700@@ -2828,7 +2831,7 @@ struct ixgbe_mac_info {
32701 };
32702
32703 struct ixgbe_phy_info {
32704- struct ixgbe_phy_operations ops;
32705+ ixgbe_phy_operations_no_const ops;
32706 struct mdio_if_info mdio;
32707 enum ixgbe_phy_type type;
32708 u32 id;
32709@@ -2856,6 +2859,7 @@ struct ixgbe_mbx_operations {
32710 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
32711 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
32712 };
32713+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
32714
32715 struct ixgbe_mbx_stats {
32716 u32 msgs_tx;
32717@@ -2867,7 +2871,7 @@ struct ixgbe_mbx_stats {
32718 };
32719
32720 struct ixgbe_mbx_info {
32721- struct ixgbe_mbx_operations ops;
32722+ ixgbe_mbx_operations_no_const ops;
32723 struct ixgbe_mbx_stats stats;
32724 u32 timeout;
32725 u32 usec_delay;
32726diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
32727index 10306b4..28df758 100644
32728--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
32729+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
32730@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
32731 s32 (*clear_vfta)(struct ixgbe_hw *);
32732 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
32733 };
32734+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
32735
32736 enum ixgbe_mac_type {
32737 ixgbe_mac_unknown = 0,
32738@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
32739 };
32740
32741 struct ixgbe_mac_info {
32742- struct ixgbe_mac_operations ops;
32743+ ixgbe_mac_operations_no_const ops;
32744 u8 addr[6];
32745 u8 perm_addr[6];
32746
32747@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
32748 s32 (*check_for_ack)(struct ixgbe_hw *);
32749 s32 (*check_for_rst)(struct ixgbe_hw *);
32750 };
32751+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
32752
32753 struct ixgbe_mbx_stats {
32754 u32 msgs_tx;
32755@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
32756 };
32757
32758 struct ixgbe_mbx_info {
32759- struct ixgbe_mbx_operations ops;
32760+ ixgbe_mbx_operations_no_const ops;
32761 struct ixgbe_mbx_stats stats;
32762 u32 timeout;
32763 u32 udelay;
32764diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
32765index 94bbc85..78c12e6 100644
32766--- a/drivers/net/ethernet/mellanox/mlx4/main.c
32767+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
32768@@ -40,6 +40,7 @@
32769 #include <linux/dma-mapping.h>
32770 #include <linux/slab.h>
32771 #include <linux/io-mapping.h>
32772+#include <linux/sched.h>
32773
32774 #include <linux/mlx4/device.h>
32775 #include <linux/mlx4/doorbell.h>
32776diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
32777index 5046a64..71ca936 100644
32778--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
32779+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
32780@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
32781 void (*link_down)(struct __vxge_hw_device *devh);
32782 void (*crit_err)(struct __vxge_hw_device *devh,
32783 enum vxge_hw_event type, u64 ext_data);
32784-};
32785+} __no_const;
32786
32787 /*
32788 * struct __vxge_hw_blockpool_entry - Block private data structure
32789diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
32790index 4a518a3..936b334 100644
32791--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
32792+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
32793@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
32794 struct vxge_hw_mempool_dma *dma_object,
32795 u32 index,
32796 u32 is_last);
32797-};
32798+} __no_const;
32799
32800 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
32801 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
32802diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
32803index c8f47f1..5da9840 100644
32804--- a/drivers/net/ethernet/realtek/r8169.c
32805+++ b/drivers/net/ethernet/realtek/r8169.c
32806@@ -698,17 +698,17 @@ struct rtl8169_private {
32807 struct mdio_ops {
32808 void (*write)(void __iomem *, int, int);
32809 int (*read)(void __iomem *, int);
32810- } mdio_ops;
32811+ } __no_const mdio_ops;
32812
32813 struct pll_power_ops {
32814 void (*down)(struct rtl8169_private *);
32815 void (*up)(struct rtl8169_private *);
32816- } pll_power_ops;
32817+ } __no_const pll_power_ops;
32818
32819 struct jumbo_ops {
32820 void (*enable)(struct rtl8169_private *);
32821 void (*disable)(struct rtl8169_private *);
32822- } jumbo_ops;
32823+ } __no_const jumbo_ops;
32824
32825 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
32826 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
32827diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
32828index 1b4658c..a30dabb 100644
32829--- a/drivers/net/ethernet/sis/sis190.c
32830+++ b/drivers/net/ethernet/sis/sis190.c
32831@@ -1624,7 +1624,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
32832 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
32833 struct net_device *dev)
32834 {
32835- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
32836+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
32837 struct sis190_private *tp = netdev_priv(dev);
32838 struct pci_dev *isa_bridge;
32839 u8 reg, tmp8;
32840diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
32841index edfa15d..002bfa9 100644
32842--- a/drivers/net/ppp/ppp_generic.c
32843+++ b/drivers/net/ppp/ppp_generic.c
32844@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
32845 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
32846 struct ppp_stats stats;
32847 struct ppp_comp_stats cstats;
32848- char *vers;
32849
32850 switch (cmd) {
32851 case SIOCGPPPSTATS:
32852@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
32853 break;
32854
32855 case SIOCGPPPVER:
32856- vers = PPP_VERSION;
32857- if (copy_to_user(addr, vers, strlen(vers) + 1))
32858+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
32859 break;
32860 err = 0;
32861 break;
32862diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
32863index 515f122..41dd273 100644
32864--- a/drivers/net/tokenring/abyss.c
32865+++ b/drivers/net/tokenring/abyss.c
32866@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
32867
32868 static int __init abyss_init (void)
32869 {
32870- abyss_netdev_ops = tms380tr_netdev_ops;
32871+ pax_open_kernel();
32872+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
32873
32874- abyss_netdev_ops.ndo_open = abyss_open;
32875- abyss_netdev_ops.ndo_stop = abyss_close;
32876+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
32877+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
32878+ pax_close_kernel();
32879
32880 return pci_register_driver(&abyss_driver);
32881 }
32882diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
32883index 6153cfd..cf69c1c 100644
32884--- a/drivers/net/tokenring/madgemc.c
32885+++ b/drivers/net/tokenring/madgemc.c
32886@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver = {
32887
32888 static int __init madgemc_init (void)
32889 {
32890- madgemc_netdev_ops = tms380tr_netdev_ops;
32891- madgemc_netdev_ops.ndo_open = madgemc_open;
32892- madgemc_netdev_ops.ndo_stop = madgemc_close;
32893+ pax_open_kernel();
32894+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
32895+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
32896+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
32897+ pax_close_kernel();
32898
32899 return mca_register_driver (&madgemc_driver);
32900 }
32901diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
32902index 8d362e6..f91cc52 100644
32903--- a/drivers/net/tokenring/proteon.c
32904+++ b/drivers/net/tokenring/proteon.c
32905@@ -353,9 +353,11 @@ static int __init proteon_init(void)
32906 struct platform_device *pdev;
32907 int i, num = 0, err = 0;
32908
32909- proteon_netdev_ops = tms380tr_netdev_ops;
32910- proteon_netdev_ops.ndo_open = proteon_open;
32911- proteon_netdev_ops.ndo_stop = tms380tr_close;
32912+ pax_open_kernel();
32913+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
32914+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
32915+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
32916+ pax_close_kernel();
32917
32918 err = platform_driver_register(&proteon_driver);
32919 if (err)
32920diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
32921index 46db5c5..37c1536 100644
32922--- a/drivers/net/tokenring/skisa.c
32923+++ b/drivers/net/tokenring/skisa.c
32924@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
32925 struct platform_device *pdev;
32926 int i, num = 0, err = 0;
32927
32928- sk_isa_netdev_ops = tms380tr_netdev_ops;
32929- sk_isa_netdev_ops.ndo_open = sk_isa_open;
32930- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
32931+ pax_open_kernel();
32932+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
32933+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
32934+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
32935+ pax_close_kernel();
32936
32937 err = platform_driver_register(&sk_isa_driver);
32938 if (err)
32939diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
32940index 304fe78..db112fa 100644
32941--- a/drivers/net/usb/hso.c
32942+++ b/drivers/net/usb/hso.c
32943@@ -71,7 +71,7 @@
32944 #include <asm/byteorder.h>
32945 #include <linux/serial_core.h>
32946 #include <linux/serial.h>
32947-
32948+#include <asm/local.h>
32949
32950 #define MOD_AUTHOR "Option Wireless"
32951 #define MOD_DESCRIPTION "USB High Speed Option driver"
32952@@ -257,7 +257,7 @@ struct hso_serial {
32953
32954 /* from usb_serial_port */
32955 struct tty_struct *tty;
32956- int open_count;
32957+ local_t open_count;
32958 spinlock_t serial_lock;
32959
32960 int (*write_data) (struct hso_serial *serial);
32961@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
32962 struct urb *urb;
32963
32964 urb = serial->rx_urb[0];
32965- if (serial->open_count > 0) {
32966+ if (local_read(&serial->open_count) > 0) {
32967 count = put_rxbuf_data(urb, serial);
32968 if (count == -1)
32969 return;
32970@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
32971 DUMP1(urb->transfer_buffer, urb->actual_length);
32972
32973 /* Anyone listening? */
32974- if (serial->open_count == 0)
32975+ if (local_read(&serial->open_count) == 0)
32976 return;
32977
32978 if (status == 0) {
32979@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
32980 spin_unlock_irq(&serial->serial_lock);
32981
32982 /* check for port already opened, if not set the termios */
32983- serial->open_count++;
32984- if (serial->open_count == 1) {
32985+ if (local_inc_return(&serial->open_count) == 1) {
32986 serial->rx_state = RX_IDLE;
32987 /* Force default termio settings */
32988 _hso_serial_set_termios(tty, NULL);
32989@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
32990 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
32991 if (result) {
32992 hso_stop_serial_device(serial->parent);
32993- serial->open_count--;
32994+ local_dec(&serial->open_count);
32995 kref_put(&serial->parent->ref, hso_serial_ref_free);
32996 }
32997 } else {
32998@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
32999
33000 /* reset the rts and dtr */
33001 /* do the actual close */
33002- serial->open_count--;
33003+ local_dec(&serial->open_count);
33004
33005- if (serial->open_count <= 0) {
33006- serial->open_count = 0;
33007+ if (local_read(&serial->open_count) <= 0) {
33008+ local_set(&serial->open_count, 0);
33009 spin_lock_irq(&serial->serial_lock);
33010 if (serial->tty == tty) {
33011 serial->tty->driver_data = NULL;
33012@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
33013
33014 /* the actual setup */
33015 spin_lock_irqsave(&serial->serial_lock, flags);
33016- if (serial->open_count)
33017+ if (local_read(&serial->open_count))
33018 _hso_serial_set_termios(tty, old);
33019 else
33020 tty->termios = old;
33021@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb)
33022 D1("Pending read interrupt on port %d\n", i);
33023 spin_lock(&serial->serial_lock);
33024 if (serial->rx_state == RX_IDLE &&
33025- serial->open_count > 0) {
33026+ local_read(&serial->open_count) > 0) {
33027 /* Setup and send a ctrl req read on
33028 * port i */
33029 if (!serial->rx_urb_filled[0]) {
33030@@ -3098,7 +3097,7 @@ static int hso_resume(struct usb_interface *iface)
33031 /* Start all serial ports */
33032 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
33033 if (serial_table[i] && (serial_table[i]->interface == iface)) {
33034- if (dev2ser(serial_table[i])->open_count) {
33035+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
33036 result =
33037 hso_start_serial_device(serial_table[i], GFP_NOIO);
33038 hso_kick_transmit(dev2ser(serial_table[i]));
33039diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
33040index e662cbc..8d4a102 100644
33041--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
33042+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
33043@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
33044 * Return with error code if any of the queue indices
33045 * is out of range
33046 */
33047- if (p->ring_index[i] < 0 ||
33048- p->ring_index[i] >= adapter->num_rx_queues)
33049+ if (p->ring_index[i] >= adapter->num_rx_queues)
33050 return -EINVAL;
33051 }
33052
33053diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
33054index 0f9ee46..e2d6e65 100644
33055--- a/drivers/net/wireless/ath/ath.h
33056+++ b/drivers/net/wireless/ath/ath.h
33057@@ -119,6 +119,7 @@ struct ath_ops {
33058 void (*write_flush) (void *);
33059 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
33060 };
33061+typedef struct ath_ops __no_const ath_ops_no_const;
33062
33063 struct ath_common;
33064 struct ath_bus_ops;
33065diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
33066index b592016..fe47870 100644
33067--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
33068+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
33069@@ -183,8 +183,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33070 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
33071 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
33072
33073- ACCESS_ONCE(ads->ds_link) = i->link;
33074- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
33075+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
33076+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
33077
33078 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
33079 ctl6 = SM(i->keytype, AR_EncrType);
33080@@ -198,26 +198,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33081
33082 if ((i->is_first || i->is_last) &&
33083 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
33084- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
33085+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
33086 | set11nTries(i->rates, 1)
33087 | set11nTries(i->rates, 2)
33088 | set11nTries(i->rates, 3)
33089 | (i->dur_update ? AR_DurUpdateEna : 0)
33090 | SM(0, AR_BurstDur);
33091
33092- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
33093+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
33094 | set11nRate(i->rates, 1)
33095 | set11nRate(i->rates, 2)
33096 | set11nRate(i->rates, 3);
33097 } else {
33098- ACCESS_ONCE(ads->ds_ctl2) = 0;
33099- ACCESS_ONCE(ads->ds_ctl3) = 0;
33100+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
33101+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
33102 }
33103
33104 if (!i->is_first) {
33105- ACCESS_ONCE(ads->ds_ctl0) = 0;
33106- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
33107- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
33108+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
33109+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
33110+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
33111 return;
33112 }
33113
33114@@ -242,7 +242,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33115 break;
33116 }
33117
33118- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
33119+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
33120 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
33121 | SM(i->txpower, AR_XmitPower)
33122 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
33123@@ -252,19 +252,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33124 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
33125 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
33126
33127- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
33128- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
33129+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
33130+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
33131
33132 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
33133 return;
33134
33135- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
33136+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
33137 | set11nPktDurRTSCTS(i->rates, 1);
33138
33139- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
33140+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
33141 | set11nPktDurRTSCTS(i->rates, 3);
33142
33143- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
33144+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
33145 | set11nRateFlags(i->rates, 1)
33146 | set11nRateFlags(i->rates, 2)
33147 | set11nRateFlags(i->rates, 3)
33148diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
33149index f5ae3c6..7936af3 100644
33150--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
33151+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
33152@@ -35,47 +35,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33153 (i->qcu << AR_TxQcuNum_S) | 0x17;
33154
33155 checksum += val;
33156- ACCESS_ONCE(ads->info) = val;
33157+ ACCESS_ONCE_RW(ads->info) = val;
33158
33159 checksum += i->link;
33160- ACCESS_ONCE(ads->link) = i->link;
33161+ ACCESS_ONCE_RW(ads->link) = i->link;
33162
33163 checksum += i->buf_addr[0];
33164- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
33165+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
33166 checksum += i->buf_addr[1];
33167- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
33168+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
33169 checksum += i->buf_addr[2];
33170- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
33171+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
33172 checksum += i->buf_addr[3];
33173- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
33174+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
33175
33176 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
33177- ACCESS_ONCE(ads->ctl3) = val;
33178+ ACCESS_ONCE_RW(ads->ctl3) = val;
33179 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
33180- ACCESS_ONCE(ads->ctl5) = val;
33181+ ACCESS_ONCE_RW(ads->ctl5) = val;
33182 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
33183- ACCESS_ONCE(ads->ctl7) = val;
33184+ ACCESS_ONCE_RW(ads->ctl7) = val;
33185 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
33186- ACCESS_ONCE(ads->ctl9) = val;
33187+ ACCESS_ONCE_RW(ads->ctl9) = val;
33188
33189 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
33190- ACCESS_ONCE(ads->ctl10) = checksum;
33191+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
33192
33193 if (i->is_first || i->is_last) {
33194- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
33195+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
33196 | set11nTries(i->rates, 1)
33197 | set11nTries(i->rates, 2)
33198 | set11nTries(i->rates, 3)
33199 | (i->dur_update ? AR_DurUpdateEna : 0)
33200 | SM(0, AR_BurstDur);
33201
33202- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
33203+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
33204 | set11nRate(i->rates, 1)
33205 | set11nRate(i->rates, 2)
33206 | set11nRate(i->rates, 3);
33207 } else {
33208- ACCESS_ONCE(ads->ctl13) = 0;
33209- ACCESS_ONCE(ads->ctl14) = 0;
33210+ ACCESS_ONCE_RW(ads->ctl13) = 0;
33211+ ACCESS_ONCE_RW(ads->ctl14) = 0;
33212 }
33213
33214 ads->ctl20 = 0;
33215@@ -84,17 +84,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33216
33217 ctl17 = SM(i->keytype, AR_EncrType);
33218 if (!i->is_first) {
33219- ACCESS_ONCE(ads->ctl11) = 0;
33220- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
33221- ACCESS_ONCE(ads->ctl15) = 0;
33222- ACCESS_ONCE(ads->ctl16) = 0;
33223- ACCESS_ONCE(ads->ctl17) = ctl17;
33224- ACCESS_ONCE(ads->ctl18) = 0;
33225- ACCESS_ONCE(ads->ctl19) = 0;
33226+ ACCESS_ONCE_RW(ads->ctl11) = 0;
33227+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
33228+ ACCESS_ONCE_RW(ads->ctl15) = 0;
33229+ ACCESS_ONCE_RW(ads->ctl16) = 0;
33230+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
33231+ ACCESS_ONCE_RW(ads->ctl18) = 0;
33232+ ACCESS_ONCE_RW(ads->ctl19) = 0;
33233 return;
33234 }
33235
33236- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
33237+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
33238 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
33239 | SM(i->txpower, AR_XmitPower)
33240 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
33241@@ -130,22 +130,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33242 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
33243 ctl12 |= SM(val, AR_PAPRDChainMask);
33244
33245- ACCESS_ONCE(ads->ctl12) = ctl12;
33246- ACCESS_ONCE(ads->ctl17) = ctl17;
33247+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
33248+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
33249
33250- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
33251+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
33252 | set11nPktDurRTSCTS(i->rates, 1);
33253
33254- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
33255+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
33256 | set11nPktDurRTSCTS(i->rates, 3);
33257
33258- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
33259+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
33260 | set11nRateFlags(i->rates, 1)
33261 | set11nRateFlags(i->rates, 2)
33262 | set11nRateFlags(i->rates, 3)
33263 | SM(i->rtscts_rate, AR_RTSCTSRate);
33264
33265- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
33266+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
33267 }
33268
33269 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
33270diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
33271index f389b3c..7359e18 100644
33272--- a/drivers/net/wireless/ath/ath9k/hw.h
33273+++ b/drivers/net/wireless/ath/ath9k/hw.h
33274@@ -605,7 +605,7 @@ struct ath_hw_private_ops {
33275
33276 /* ANI */
33277 void (*ani_cache_ini_regs)(struct ath_hw *ah);
33278-};
33279+} __no_const;
33280
33281 /**
33282 * struct ath_hw_ops - callbacks used by hardware code and driver code
33283@@ -635,7 +635,7 @@ struct ath_hw_ops {
33284 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
33285 struct ath_hw_antcomb_conf *antconf);
33286
33287-};
33288+} __no_const;
33289
33290 struct ath_nf_limits {
33291 s16 max;
33292@@ -655,7 +655,7 @@ enum ath_cal_list {
33293 #define AH_FASTCC 0x4
33294
33295 struct ath_hw {
33296- struct ath_ops reg_ops;
33297+ ath_ops_no_const reg_ops;
33298
33299 struct ieee80211_hw *hw;
33300 struct ath_common common;
33301diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
33302index bea8524..c677c06 100644
33303--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
33304+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
33305@@ -547,7 +547,7 @@ struct phy_func_ptr {
33306 void (*carrsuppr)(struct brcms_phy *);
33307 s32 (*rxsigpwr)(struct brcms_phy *, s32);
33308 void (*detach)(struct brcms_phy *);
33309-};
33310+} __no_const;
33311
33312 struct brcms_phy {
33313 struct brcms_phy_pub pubpi_ro;
33314diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
33315index 05f2ad1..ae00eea 100644
33316--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
33317+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
33318@@ -3685,7 +3685,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
33319 */
33320 if (iwl3945_mod_params.disable_hw_scan) {
33321 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
33322- iwl3945_hw_ops.hw_scan = NULL;
33323+ pax_open_kernel();
33324+ *(void **)&iwl3945_hw_ops.hw_scan = NULL;
33325+ pax_close_kernel();
33326 }
33327
33328 IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
33329diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
33330index 69a77e2..552b42c 100644
33331--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
33332+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
33333@@ -71,8 +71,8 @@ do { \
33334 } while (0)
33335
33336 #else
33337-#define IWL_DEBUG(m, level, fmt, args...)
33338-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)
33339+#define IWL_DEBUG(m, level, fmt, args...) do {} while (0)
33340+#define IWL_DEBUG_LIMIT(m, level, fmt, args...) do {} while (0)
33341 #define iwl_print_hex_dump(m, level, p, len)
33342 #endif /* CONFIG_IWLWIFI_DEBUG */
33343
33344diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
33345index 523ad55..f8c5dc5 100644
33346--- a/drivers/net/wireless/mac80211_hwsim.c
33347+++ b/drivers/net/wireless/mac80211_hwsim.c
33348@@ -1678,9 +1678,11 @@ static int __init init_mac80211_hwsim(void)
33349 return -EINVAL;
33350
33351 if (fake_hw_scan) {
33352- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
33353- mac80211_hwsim_ops.sw_scan_start = NULL;
33354- mac80211_hwsim_ops.sw_scan_complete = NULL;
33355+ pax_open_kernel();
33356+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
33357+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
33358+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
33359+ pax_close_kernel();
33360 }
33361
33362 spin_lock_init(&hwsim_radio_lock);
33363diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
33364index 30f138b..c904585 100644
33365--- a/drivers/net/wireless/mwifiex/main.h
33366+++ b/drivers/net/wireless/mwifiex/main.h
33367@@ -543,7 +543,7 @@ struct mwifiex_if_ops {
33368 void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
33369 int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
33370 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
33371-};
33372+} __no_const;
33373
33374 struct mwifiex_adapter {
33375 u8 iface_type;
33376diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
33377index 0c13840..a5c3ed6 100644
33378--- a/drivers/net/wireless/rndis_wlan.c
33379+++ b/drivers/net/wireless/rndis_wlan.c
33380@@ -1275,7 +1275,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
33381
33382 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
33383
33384- if (rts_threshold < 0 || rts_threshold > 2347)
33385+ if (rts_threshold > 2347)
33386 rts_threshold = 2347;
33387
33388 tmp = cpu_to_le32(rts_threshold);
33389diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
33390index a77f1bb..c608b2b 100644
33391--- a/drivers/net/wireless/wl1251/wl1251.h
33392+++ b/drivers/net/wireless/wl1251/wl1251.h
33393@@ -266,7 +266,7 @@ struct wl1251_if_operations {
33394 void (*reset)(struct wl1251 *wl);
33395 void (*enable_irq)(struct wl1251 *wl);
33396 void (*disable_irq)(struct wl1251 *wl);
33397-};
33398+} __no_const;
33399
33400 struct wl1251 {
33401 struct ieee80211_hw *hw;
33402diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
33403index f34b5b2..b5abb9f 100644
33404--- a/drivers/oprofile/buffer_sync.c
33405+++ b/drivers/oprofile/buffer_sync.c
33406@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
33407 if (cookie == NO_COOKIE)
33408 offset = pc;
33409 if (cookie == INVALID_COOKIE) {
33410- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
33411+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
33412 offset = pc;
33413 }
33414 if (cookie != last_cookie) {
33415@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
33416 /* add userspace sample */
33417
33418 if (!mm) {
33419- atomic_inc(&oprofile_stats.sample_lost_no_mm);
33420+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
33421 return 0;
33422 }
33423
33424 cookie = lookup_dcookie(mm, s->eip, &offset);
33425
33426 if (cookie == INVALID_COOKIE) {
33427- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
33428+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
33429 return 0;
33430 }
33431
33432@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
33433 /* ignore backtraces if failed to add a sample */
33434 if (state == sb_bt_start) {
33435 state = sb_bt_ignore;
33436- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
33437+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
33438 }
33439 }
33440 release_mm(mm);
33441diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
33442index c0cc4e7..44d4e54 100644
33443--- a/drivers/oprofile/event_buffer.c
33444+++ b/drivers/oprofile/event_buffer.c
33445@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
33446 }
33447
33448 if (buffer_pos == buffer_size) {
33449- atomic_inc(&oprofile_stats.event_lost_overflow);
33450+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
33451 return;
33452 }
33453
33454diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
33455index f8c752e..28bf4fc 100644
33456--- a/drivers/oprofile/oprof.c
33457+++ b/drivers/oprofile/oprof.c
33458@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
33459 if (oprofile_ops.switch_events())
33460 return;
33461
33462- atomic_inc(&oprofile_stats.multiplex_counter);
33463+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
33464 start_switch_worker();
33465 }
33466
33467diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
33468index 917d28e..d62d981 100644
33469--- a/drivers/oprofile/oprofile_stats.c
33470+++ b/drivers/oprofile/oprofile_stats.c
33471@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
33472 cpu_buf->sample_invalid_eip = 0;
33473 }
33474
33475- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
33476- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
33477- atomic_set(&oprofile_stats.event_lost_overflow, 0);
33478- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
33479- atomic_set(&oprofile_stats.multiplex_counter, 0);
33480+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
33481+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
33482+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
33483+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
33484+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
33485 }
33486
33487
33488diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
33489index 38b6fc0..b5cbfce 100644
33490--- a/drivers/oprofile/oprofile_stats.h
33491+++ b/drivers/oprofile/oprofile_stats.h
33492@@ -13,11 +13,11 @@
33493 #include <linux/atomic.h>
33494
33495 struct oprofile_stat_struct {
33496- atomic_t sample_lost_no_mm;
33497- atomic_t sample_lost_no_mapping;
33498- atomic_t bt_lost_no_mapping;
33499- atomic_t event_lost_overflow;
33500- atomic_t multiplex_counter;
33501+ atomic_unchecked_t sample_lost_no_mm;
33502+ atomic_unchecked_t sample_lost_no_mapping;
33503+ atomic_unchecked_t bt_lost_no_mapping;
33504+ atomic_unchecked_t event_lost_overflow;
33505+ atomic_unchecked_t multiplex_counter;
33506 };
33507
33508 extern struct oprofile_stat_struct oprofile_stats;
33509diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
33510index 2f0aa0f..90fab02 100644
33511--- a/drivers/oprofile/oprofilefs.c
33512+++ b/drivers/oprofile/oprofilefs.c
33513@@ -193,7 +193,7 @@ static const struct file_operations atomic_ro_fops = {
33514
33515
33516 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
33517- char const *name, atomic_t *val)
33518+ char const *name, atomic_unchecked_t *val)
33519 {
33520 return __oprofilefs_create_file(sb, root, name,
33521 &atomic_ro_fops, 0444, val);
33522diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
33523index 3f56bc0..707d642 100644
33524--- a/drivers/parport/procfs.c
33525+++ b/drivers/parport/procfs.c
33526@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
33527
33528 *ppos += len;
33529
33530- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
33531+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
33532 }
33533
33534 #ifdef CONFIG_PARPORT_1284
33535@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
33536
33537 *ppos += len;
33538
33539- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
33540+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
33541 }
33542 #endif /* IEEE1284.3 support. */
33543
33544diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
33545index 9fff878..ad0ad53 100644
33546--- a/drivers/pci/hotplug/cpci_hotplug.h
33547+++ b/drivers/pci/hotplug/cpci_hotplug.h
33548@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
33549 int (*hardware_test) (struct slot* slot, u32 value);
33550 u8 (*get_power) (struct slot* slot);
33551 int (*set_power) (struct slot* slot, int value);
33552-};
33553+} __no_const;
33554
33555 struct cpci_hp_controller {
33556 unsigned int irq;
33557diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
33558index 76ba8a1..20ca857 100644
33559--- a/drivers/pci/hotplug/cpqphp_nvram.c
33560+++ b/drivers/pci/hotplug/cpqphp_nvram.c
33561@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
33562
33563 void compaq_nvram_init (void __iomem *rom_start)
33564 {
33565+
33566+#ifndef CONFIG_PAX_KERNEXEC
33567 if (rom_start) {
33568 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
33569 }
33570+#endif
33571+
33572 dbg("int15 entry = %p\n", compaq_int15_entry_point);
33573
33574 /* initialize our int15 lock */
33575diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
33576index 1cfbf22..be96487 100644
33577--- a/drivers/pci/pcie/aspm.c
33578+++ b/drivers/pci/pcie/aspm.c
33579@@ -27,9 +27,9 @@
33580 #define MODULE_PARAM_PREFIX "pcie_aspm."
33581
33582 /* Note: those are not register definitions */
33583-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
33584-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
33585-#define ASPM_STATE_L1 (4) /* L1 state */
33586+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
33587+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
33588+#define ASPM_STATE_L1 (4U) /* L1 state */
33589 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
33590 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
33591
33592diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
33593index 04e74f4..a960176 100644
33594--- a/drivers/pci/probe.c
33595+++ b/drivers/pci/probe.c
33596@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
33597 u32 l, sz, mask;
33598 u16 orig_cmd;
33599
33600- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
33601+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
33602
33603 if (!dev->mmio_always_on) {
33604 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
33605diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
33606index 27911b5..5b6db88 100644
33607--- a/drivers/pci/proc.c
33608+++ b/drivers/pci/proc.c
33609@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
33610 static int __init pci_proc_init(void)
33611 {
33612 struct pci_dev *dev = NULL;
33613+
33614+#ifdef CONFIG_GRKERNSEC_PROC_ADD
33615+#ifdef CONFIG_GRKERNSEC_PROC_USER
33616+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
33617+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
33618+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
33619+#endif
33620+#else
33621 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
33622+#endif
33623 proc_create("devices", 0, proc_bus_pci_dir,
33624 &proc_bus_pci_dev_operations);
33625 proc_initialized = 1;
33626diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
33627index 7b82868..b9344c9 100644
33628--- a/drivers/platform/x86/thinkpad_acpi.c
33629+++ b/drivers/platform/x86/thinkpad_acpi.c
33630@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
33631 return 0;
33632 }
33633
33634-void static hotkey_mask_warn_incomplete_mask(void)
33635+static void hotkey_mask_warn_incomplete_mask(void)
33636 {
33637 /* log only what the user can fix... */
33638 const u32 wantedmask = hotkey_driver_mask &
33639@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
33640 }
33641 }
33642
33643-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33644- struct tp_nvram_state *newn,
33645- const u32 event_mask)
33646-{
33647-
33648 #define TPACPI_COMPARE_KEY(__scancode, __member) \
33649 do { \
33650 if ((event_mask & (1 << __scancode)) && \
33651@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33652 tpacpi_hotkey_send_key(__scancode); \
33653 } while (0)
33654
33655- void issue_volchange(const unsigned int oldvol,
33656- const unsigned int newvol)
33657- {
33658- unsigned int i = oldvol;
33659+static void issue_volchange(const unsigned int oldvol,
33660+ const unsigned int newvol,
33661+ const u32 event_mask)
33662+{
33663+ unsigned int i = oldvol;
33664
33665- while (i > newvol) {
33666- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
33667- i--;
33668- }
33669- while (i < newvol) {
33670- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
33671- i++;
33672- }
33673+ while (i > newvol) {
33674+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
33675+ i--;
33676 }
33677+ while (i < newvol) {
33678+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
33679+ i++;
33680+ }
33681+}
33682
33683- void issue_brightnesschange(const unsigned int oldbrt,
33684- const unsigned int newbrt)
33685- {
33686- unsigned int i = oldbrt;
33687+static void issue_brightnesschange(const unsigned int oldbrt,
33688+ const unsigned int newbrt,
33689+ const u32 event_mask)
33690+{
33691+ unsigned int i = oldbrt;
33692
33693- while (i > newbrt) {
33694- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
33695- i--;
33696- }
33697- while (i < newbrt) {
33698- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
33699- i++;
33700- }
33701+ while (i > newbrt) {
33702+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
33703+ i--;
33704+ }
33705+ while (i < newbrt) {
33706+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
33707+ i++;
33708 }
33709+}
33710
33711+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33712+ struct tp_nvram_state *newn,
33713+ const u32 event_mask)
33714+{
33715 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
33716 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
33717 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
33718@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33719 oldn->volume_level != newn->volume_level) {
33720 /* recently muted, or repeated mute keypress, or
33721 * multiple presses ending in mute */
33722- issue_volchange(oldn->volume_level, newn->volume_level);
33723+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
33724 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
33725 }
33726 } else {
33727@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33728 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
33729 }
33730 if (oldn->volume_level != newn->volume_level) {
33731- issue_volchange(oldn->volume_level, newn->volume_level);
33732+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
33733 } else if (oldn->volume_toggle != newn->volume_toggle) {
33734 /* repeated vol up/down keypress at end of scale ? */
33735 if (newn->volume_level == 0)
33736@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33737 /* handle brightness */
33738 if (oldn->brightness_level != newn->brightness_level) {
33739 issue_brightnesschange(oldn->brightness_level,
33740- newn->brightness_level);
33741+ newn->brightness_level,
33742+ event_mask);
33743 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
33744 /* repeated key presses that didn't change state */
33745 if (newn->brightness_level == 0)
33746@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33747 && !tp_features.bright_unkfw)
33748 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
33749 }
33750+}
33751
33752 #undef TPACPI_COMPARE_KEY
33753 #undef TPACPI_MAY_SEND_KEY
33754-}
33755
33756 /*
33757 * Polling driver
33758diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
33759index b859d16..5cc6b1a 100644
33760--- a/drivers/pnp/pnpbios/bioscalls.c
33761+++ b/drivers/pnp/pnpbios/bioscalls.c
33762@@ -59,7 +59,7 @@ do { \
33763 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
33764 } while(0)
33765
33766-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
33767+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
33768 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
33769
33770 /*
33771@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
33772
33773 cpu = get_cpu();
33774 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
33775+
33776+ pax_open_kernel();
33777 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
33778+ pax_close_kernel();
33779
33780 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
33781 spin_lock_irqsave(&pnp_bios_lock, flags);
33782@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
33783 :"memory");
33784 spin_unlock_irqrestore(&pnp_bios_lock, flags);
33785
33786+ pax_open_kernel();
33787 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
33788+ pax_close_kernel();
33789+
33790 put_cpu();
33791
33792 /* If we get here and this is set then the PnP BIOS faulted on us. */
33793@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
33794 return status;
33795 }
33796
33797-void pnpbios_calls_init(union pnp_bios_install_struct *header)
33798+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
33799 {
33800 int i;
33801
33802@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
33803 pnp_bios_callpoint.offset = header->fields.pm16offset;
33804 pnp_bios_callpoint.segment = PNP_CS16;
33805
33806+ pax_open_kernel();
33807+
33808 for_each_possible_cpu(i) {
33809 struct desc_struct *gdt = get_cpu_gdt_table(i);
33810 if (!gdt)
33811@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
33812 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
33813 (unsigned long)__va(header->fields.pm16dseg));
33814 }
33815+
33816+ pax_close_kernel();
33817 }
33818diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
33819index b0ecacb..7c9da2e 100644
33820--- a/drivers/pnp/resource.c
33821+++ b/drivers/pnp/resource.c
33822@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
33823 return 1;
33824
33825 /* check if the resource is valid */
33826- if (*irq < 0 || *irq > 15)
33827+ if (*irq > 15)
33828 return 0;
33829
33830 /* check if the resource is reserved */
33831@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
33832 return 1;
33833
33834 /* check if the resource is valid */
33835- if (*dma < 0 || *dma == 4 || *dma > 7)
33836+ if (*dma == 4 || *dma > 7)
33837 return 0;
33838
33839 /* check if the resource is reserved */
33840diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
33841index bb16f5b..c751eef 100644
33842--- a/drivers/power/bq27x00_battery.c
33843+++ b/drivers/power/bq27x00_battery.c
33844@@ -67,7 +67,7 @@
33845 struct bq27x00_device_info;
33846 struct bq27x00_access_methods {
33847 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
33848-};
33849+} __no_const;
33850
33851 enum bq27x00_chip { BQ27000, BQ27500 };
33852
33853diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
33854index 33f5d9a..d957d3f 100644
33855--- a/drivers/regulator/max8660.c
33856+++ b/drivers/regulator/max8660.c
33857@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
33858 max8660->shadow_regs[MAX8660_OVER1] = 5;
33859 } else {
33860 /* Otherwise devices can be toggled via software */
33861- max8660_dcdc_ops.enable = max8660_dcdc_enable;
33862- max8660_dcdc_ops.disable = max8660_dcdc_disable;
33863+ pax_open_kernel();
33864+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
33865+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
33866+ pax_close_kernel();
33867 }
33868
33869 /*
33870diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
33871index 023d17d..74ef35b 100644
33872--- a/drivers/regulator/mc13892-regulator.c
33873+++ b/drivers/regulator/mc13892-regulator.c
33874@@ -565,10 +565,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
33875 }
33876 mc13xxx_unlock(mc13892);
33877
33878- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
33879+ pax_open_kernel();
33880+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
33881 = mc13892_vcam_set_mode;
33882- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
33883+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
33884 = mc13892_vcam_get_mode;
33885+ pax_close_kernel();
33886 for (i = 0; i < pdata->num_regulators; i++) {
33887 init_data = &pdata->regulators[i];
33888 priv->regulators[i] = regulator_register(
33889diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
33890index cace6d3..f623fda 100644
33891--- a/drivers/rtc/rtc-dev.c
33892+++ b/drivers/rtc/rtc-dev.c
33893@@ -14,6 +14,7 @@
33894 #include <linux/module.h>
33895 #include <linux/rtc.h>
33896 #include <linux/sched.h>
33897+#include <linux/grsecurity.h>
33898 #include "rtc-core.h"
33899
33900 static dev_t rtc_devt;
33901@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
33902 if (copy_from_user(&tm, uarg, sizeof(tm)))
33903 return -EFAULT;
33904
33905+ gr_log_timechange();
33906+
33907 return rtc_set_time(rtc, &tm);
33908
33909 case RTC_PIE_ON:
33910diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
33911index ffb5878..e6d785c 100644
33912--- a/drivers/scsi/aacraid/aacraid.h
33913+++ b/drivers/scsi/aacraid/aacraid.h
33914@@ -492,7 +492,7 @@ struct adapter_ops
33915 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
33916 /* Administrative operations */
33917 int (*adapter_comm)(struct aac_dev * dev, int comm);
33918-};
33919+} __no_const;
33920
33921 /*
33922 * Define which interrupt handler needs to be installed
33923diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
33924index 705e13e..91c873c 100644
33925--- a/drivers/scsi/aacraid/linit.c
33926+++ b/drivers/scsi/aacraid/linit.c
33927@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
33928 #elif defined(__devinitconst)
33929 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
33930 #else
33931-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
33932+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
33933 #endif
33934 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
33935 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
33936diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
33937index d5ff142..49c0ebb 100644
33938--- a/drivers/scsi/aic94xx/aic94xx_init.c
33939+++ b/drivers/scsi/aic94xx/aic94xx_init.c
33940@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
33941 .lldd_control_phy = asd_control_phy,
33942 };
33943
33944-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
33945+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
33946 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
33947 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
33948 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
33949diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
33950index a796de9..1ef20e1 100644
33951--- a/drivers/scsi/bfa/bfa.h
33952+++ b/drivers/scsi/bfa/bfa.h
33953@@ -196,7 +196,7 @@ struct bfa_hwif_s {
33954 u32 *end);
33955 int cpe_vec_q0;
33956 int rme_vec_q0;
33957-};
33958+} __no_const;
33959 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
33960
33961 struct bfa_faa_cbfn_s {
33962diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
33963index e07bd47..cd1bbbb 100644
33964--- a/drivers/scsi/bfa/bfa_fcpim.c
33965+++ b/drivers/scsi/bfa/bfa_fcpim.c
33966@@ -4121,7 +4121,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
33967
33968 bfa_iotag_attach(fcp);
33969
33970- fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
33971+ fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
33972 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
33973 (fcp->num_itns * sizeof(struct bfa_itn_s));
33974 memset(fcp->itn_arr, 0,
33975@@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
33976 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
33977 {
33978 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
33979- struct bfa_itn_s *itn;
33980+ bfa_itn_s_no_const *itn;
33981
33982 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
33983 itn->isr = isr;
33984diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
33985index 1080bcb..a3b39e3 100644
33986--- a/drivers/scsi/bfa/bfa_fcpim.h
33987+++ b/drivers/scsi/bfa/bfa_fcpim.h
33988@@ -37,6 +37,7 @@ struct bfa_iotag_s {
33989 struct bfa_itn_s {
33990 bfa_isr_func_t isr;
33991 };
33992+typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
33993
33994 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
33995 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
33996@@ -149,7 +150,7 @@ struct bfa_fcp_mod_s {
33997 struct list_head iotag_tio_free_q; /* free IO resources */
33998 struct list_head iotag_unused_q; /* unused IO resources*/
33999 struct bfa_iotag_s *iotag_arr;
34000- struct bfa_itn_s *itn_arr;
34001+ bfa_itn_s_no_const *itn_arr;
34002 int num_ioim_reqs;
34003 int num_fwtio_reqs;
34004 int num_itns;
34005diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
34006index 546d46b..642fa5b 100644
34007--- a/drivers/scsi/bfa/bfa_ioc.h
34008+++ b/drivers/scsi/bfa/bfa_ioc.h
34009@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
34010 bfa_ioc_disable_cbfn_t disable_cbfn;
34011 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
34012 bfa_ioc_reset_cbfn_t reset_cbfn;
34013-};
34014+} __no_const;
34015
34016 /*
34017 * IOC event notification mechanism.
34018@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
34019 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
34020 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
34021 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
34022-};
34023+} __no_const;
34024
34025 /*
34026 * Queue element to wait for room in request queue. FIFO order is
34027diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
34028index 351dc0b..951dc32 100644
34029--- a/drivers/scsi/hosts.c
34030+++ b/drivers/scsi/hosts.c
34031@@ -42,7 +42,7 @@
34032 #include "scsi_logging.h"
34033
34034
34035-static atomic_t scsi_host_next_hn; /* host_no for next new host */
34036+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
34037
34038
34039 static void scsi_host_cls_release(struct device *dev)
34040@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
34041 * subtract one because we increment first then return, but we need to
34042 * know what the next host number was before increment
34043 */
34044- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
34045+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
34046 shost->dma_channel = 0xff;
34047
34048 /* These three are default values which can be overridden */
34049diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
34050index 865d452..e9b7fa7 100644
34051--- a/drivers/scsi/hpsa.c
34052+++ b/drivers/scsi/hpsa.c
34053@@ -505,7 +505,7 @@ static inline u32 next_command(struct ctlr_info *h)
34054 u32 a;
34055
34056 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
34057- return h->access.command_completed(h);
34058+ return h->access->command_completed(h);
34059
34060 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
34061 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
34062@@ -2989,7 +2989,7 @@ static void start_io(struct ctlr_info *h)
34063 while (!list_empty(&h->reqQ)) {
34064 c = list_entry(h->reqQ.next, struct CommandList, list);
34065 /* can't do anything if fifo is full */
34066- if ((h->access.fifo_full(h))) {
34067+ if ((h->access->fifo_full(h))) {
34068 dev_warn(&h->pdev->dev, "fifo full\n");
34069 break;
34070 }
34071@@ -2999,7 +2999,7 @@ static void start_io(struct ctlr_info *h)
34072 h->Qdepth--;
34073
34074 /* Tell the controller execute command */
34075- h->access.submit_command(h, c);
34076+ h->access->submit_command(h, c);
34077
34078 /* Put job onto the completed Q */
34079 addQ(&h->cmpQ, c);
34080@@ -3008,17 +3008,17 @@ static void start_io(struct ctlr_info *h)
34081
34082 static inline unsigned long get_next_completion(struct ctlr_info *h)
34083 {
34084- return h->access.command_completed(h);
34085+ return h->access->command_completed(h);
34086 }
34087
34088 static inline bool interrupt_pending(struct ctlr_info *h)
34089 {
34090- return h->access.intr_pending(h);
34091+ return h->access->intr_pending(h);
34092 }
34093
34094 static inline long interrupt_not_for_us(struct ctlr_info *h)
34095 {
34096- return (h->access.intr_pending(h) == 0) ||
34097+ return (h->access->intr_pending(h) == 0) ||
34098 (h->interrupts_enabled == 0);
34099 }
34100
34101@@ -3917,7 +3917,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
34102 if (prod_index < 0)
34103 return -ENODEV;
34104 h->product_name = products[prod_index].product_name;
34105- h->access = *(products[prod_index].access);
34106+ h->access = products[prod_index].access;
34107
34108 if (hpsa_board_disabled(h->pdev)) {
34109 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
34110@@ -4162,7 +4162,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
34111
34112 assert_spin_locked(&lockup_detector_lock);
34113 remove_ctlr_from_lockup_detector_list(h);
34114- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34115+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34116 spin_lock_irqsave(&h->lock, flags);
34117 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
34118 spin_unlock_irqrestore(&h->lock, flags);
34119@@ -4340,7 +4340,7 @@ reinit_after_soft_reset:
34120 }
34121
34122 /* make sure the board interrupts are off */
34123- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34124+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34125
34126 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
34127 goto clean2;
34128@@ -4374,7 +4374,7 @@ reinit_after_soft_reset:
34129 * fake ones to scoop up any residual completions.
34130 */
34131 spin_lock_irqsave(&h->lock, flags);
34132- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34133+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34134 spin_unlock_irqrestore(&h->lock, flags);
34135 free_irq(h->intr[h->intr_mode], h);
34136 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
34137@@ -4393,9 +4393,9 @@ reinit_after_soft_reset:
34138 dev_info(&h->pdev->dev, "Board READY.\n");
34139 dev_info(&h->pdev->dev,
34140 "Waiting for stale completions to drain.\n");
34141- h->access.set_intr_mask(h, HPSA_INTR_ON);
34142+ h->access->set_intr_mask(h, HPSA_INTR_ON);
34143 msleep(10000);
34144- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34145+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34146
34147 rc = controller_reset_failed(h->cfgtable);
34148 if (rc)
34149@@ -4416,7 +4416,7 @@ reinit_after_soft_reset:
34150 }
34151
34152 /* Turn the interrupts on so we can service requests */
34153- h->access.set_intr_mask(h, HPSA_INTR_ON);
34154+ h->access->set_intr_mask(h, HPSA_INTR_ON);
34155
34156 hpsa_hba_inquiry(h);
34157 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
34158@@ -4468,7 +4468,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
34159 * To write all data in the battery backed cache to disks
34160 */
34161 hpsa_flush_cache(h);
34162- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34163+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34164 free_irq(h->intr[h->intr_mode], h);
34165 #ifdef CONFIG_PCI_MSI
34166 if (h->msix_vector)
34167@@ -4632,7 +4632,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
34168 return;
34169 }
34170 /* Change the access methods to the performant access methods */
34171- h->access = SA5_performant_access;
34172+ h->access = &SA5_performant_access;
34173 h->transMethod = CFGTBL_Trans_Performant;
34174 }
34175
34176diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
34177index 91edafb..a9b88ec 100644
34178--- a/drivers/scsi/hpsa.h
34179+++ b/drivers/scsi/hpsa.h
34180@@ -73,7 +73,7 @@ struct ctlr_info {
34181 unsigned int msix_vector;
34182 unsigned int msi_vector;
34183 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
34184- struct access_method access;
34185+ struct access_method *access;
34186
34187 /* queue and queue Info */
34188 struct list_head reqQ;
34189diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
34190index f2df059..a3a9930 100644
34191--- a/drivers/scsi/ips.h
34192+++ b/drivers/scsi/ips.h
34193@@ -1027,7 +1027,7 @@ typedef struct {
34194 int (*intr)(struct ips_ha *);
34195 void (*enableint)(struct ips_ha *);
34196 uint32_t (*statupd)(struct ips_ha *);
34197-} ips_hw_func_t;
34198+} __no_const ips_hw_func_t;
34199
34200 typedef struct ips_ha {
34201 uint8_t ha_id[IPS_MAX_CHANNELS+1];
34202diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
34203index 9de9db2..1e09660 100644
34204--- a/drivers/scsi/libfc/fc_exch.c
34205+++ b/drivers/scsi/libfc/fc_exch.c
34206@@ -105,12 +105,12 @@ struct fc_exch_mgr {
34207 * all together if not used XXX
34208 */
34209 struct {
34210- atomic_t no_free_exch;
34211- atomic_t no_free_exch_xid;
34212- atomic_t xid_not_found;
34213- atomic_t xid_busy;
34214- atomic_t seq_not_found;
34215- atomic_t non_bls_resp;
34216+ atomic_unchecked_t no_free_exch;
34217+ atomic_unchecked_t no_free_exch_xid;
34218+ atomic_unchecked_t xid_not_found;
34219+ atomic_unchecked_t xid_busy;
34220+ atomic_unchecked_t seq_not_found;
34221+ atomic_unchecked_t non_bls_resp;
34222 } stats;
34223 };
34224
34225@@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
34226 /* allocate memory for exchange */
34227 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
34228 if (!ep) {
34229- atomic_inc(&mp->stats.no_free_exch);
34230+ atomic_inc_unchecked(&mp->stats.no_free_exch);
34231 goto out;
34232 }
34233 memset(ep, 0, sizeof(*ep));
34234@@ -780,7 +780,7 @@ out:
34235 return ep;
34236 err:
34237 spin_unlock_bh(&pool->lock);
34238- atomic_inc(&mp->stats.no_free_exch_xid);
34239+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
34240 mempool_free(ep, mp->ep_pool);
34241 return NULL;
34242 }
34243@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
34244 xid = ntohs(fh->fh_ox_id); /* we originated exch */
34245 ep = fc_exch_find(mp, xid);
34246 if (!ep) {
34247- atomic_inc(&mp->stats.xid_not_found);
34248+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34249 reject = FC_RJT_OX_ID;
34250 goto out;
34251 }
34252@@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
34253 ep = fc_exch_find(mp, xid);
34254 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
34255 if (ep) {
34256- atomic_inc(&mp->stats.xid_busy);
34257+ atomic_inc_unchecked(&mp->stats.xid_busy);
34258 reject = FC_RJT_RX_ID;
34259 goto rel;
34260 }
34261@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
34262 }
34263 xid = ep->xid; /* get our XID */
34264 } else if (!ep) {
34265- atomic_inc(&mp->stats.xid_not_found);
34266+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34267 reject = FC_RJT_RX_ID; /* XID not found */
34268 goto out;
34269 }
34270@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
34271 } else {
34272 sp = &ep->seq;
34273 if (sp->id != fh->fh_seq_id) {
34274- atomic_inc(&mp->stats.seq_not_found);
34275+ atomic_inc_unchecked(&mp->stats.seq_not_found);
34276 if (f_ctl & FC_FC_END_SEQ) {
34277 /*
34278 * Update sequence_id based on incoming last
34279@@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
34280
34281 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
34282 if (!ep) {
34283- atomic_inc(&mp->stats.xid_not_found);
34284+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34285 goto out;
34286 }
34287 if (ep->esb_stat & ESB_ST_COMPLETE) {
34288- atomic_inc(&mp->stats.xid_not_found);
34289+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34290 goto rel;
34291 }
34292 if (ep->rxid == FC_XID_UNKNOWN)
34293 ep->rxid = ntohs(fh->fh_rx_id);
34294 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
34295- atomic_inc(&mp->stats.xid_not_found);
34296+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34297 goto rel;
34298 }
34299 if (ep->did != ntoh24(fh->fh_s_id) &&
34300 ep->did != FC_FID_FLOGI) {
34301- atomic_inc(&mp->stats.xid_not_found);
34302+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34303 goto rel;
34304 }
34305 sof = fr_sof(fp);
34306@@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
34307 sp->ssb_stat |= SSB_ST_RESP;
34308 sp->id = fh->fh_seq_id;
34309 } else if (sp->id != fh->fh_seq_id) {
34310- atomic_inc(&mp->stats.seq_not_found);
34311+ atomic_inc_unchecked(&mp->stats.seq_not_found);
34312 goto rel;
34313 }
34314
34315@@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
34316 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
34317
34318 if (!sp)
34319- atomic_inc(&mp->stats.xid_not_found);
34320+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34321 else
34322- atomic_inc(&mp->stats.non_bls_resp);
34323+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
34324
34325 fc_frame_free(fp);
34326 }
34327diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
34328index db9238f..4378ed2 100644
34329--- a/drivers/scsi/libsas/sas_ata.c
34330+++ b/drivers/scsi/libsas/sas_ata.c
34331@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sata_ops = {
34332 .postreset = ata_std_postreset,
34333 .error_handler = ata_std_error_handler,
34334 .post_internal_cmd = sas_ata_post_internal,
34335- .qc_defer = ata_std_qc_defer,
34336+ .qc_defer = ata_std_qc_defer,
34337 .qc_prep = ata_noop_qc_prep,
34338 .qc_issue = sas_ata_qc_issue,
34339 .qc_fill_rtf = sas_ata_qc_fill_rtf,
34340diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
34341index bb4c8e0..f33d849 100644
34342--- a/drivers/scsi/lpfc/lpfc.h
34343+++ b/drivers/scsi/lpfc/lpfc.h
34344@@ -425,7 +425,7 @@ struct lpfc_vport {
34345 struct dentry *debug_nodelist;
34346 struct dentry *vport_debugfs_root;
34347 struct lpfc_debugfs_trc *disc_trc;
34348- atomic_t disc_trc_cnt;
34349+ atomic_unchecked_t disc_trc_cnt;
34350 #endif
34351 uint8_t stat_data_enabled;
34352 uint8_t stat_data_blocked;
34353@@ -835,8 +835,8 @@ struct lpfc_hba {
34354 struct timer_list fabric_block_timer;
34355 unsigned long bit_flags;
34356 #define FABRIC_COMANDS_BLOCKED 0
34357- atomic_t num_rsrc_err;
34358- atomic_t num_cmd_success;
34359+ atomic_unchecked_t num_rsrc_err;
34360+ atomic_unchecked_t num_cmd_success;
34361 unsigned long last_rsrc_error_time;
34362 unsigned long last_ramp_down_time;
34363 unsigned long last_ramp_up_time;
34364@@ -866,7 +866,7 @@ struct lpfc_hba {
34365
34366 struct dentry *debug_slow_ring_trc;
34367 struct lpfc_debugfs_trc *slow_ring_trc;
34368- atomic_t slow_ring_trc_cnt;
34369+ atomic_unchecked_t slow_ring_trc_cnt;
34370 /* iDiag debugfs sub-directory */
34371 struct dentry *idiag_root;
34372 struct dentry *idiag_pci_cfg;
34373diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
34374index 2838259..a07cfb5 100644
34375--- a/drivers/scsi/lpfc/lpfc_debugfs.c
34376+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
34377@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
34378
34379 #include <linux/debugfs.h>
34380
34381-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
34382+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
34383 static unsigned long lpfc_debugfs_start_time = 0L;
34384
34385 /* iDiag */
34386@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
34387 lpfc_debugfs_enable = 0;
34388
34389 len = 0;
34390- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
34391+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
34392 (lpfc_debugfs_max_disc_trc - 1);
34393 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
34394 dtp = vport->disc_trc + i;
34395@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
34396 lpfc_debugfs_enable = 0;
34397
34398 len = 0;
34399- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
34400+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
34401 (lpfc_debugfs_max_slow_ring_trc - 1);
34402 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
34403 dtp = phba->slow_ring_trc + i;
34404@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
34405 !vport || !vport->disc_trc)
34406 return;
34407
34408- index = atomic_inc_return(&vport->disc_trc_cnt) &
34409+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
34410 (lpfc_debugfs_max_disc_trc - 1);
34411 dtp = vport->disc_trc + index;
34412 dtp->fmt = fmt;
34413 dtp->data1 = data1;
34414 dtp->data2 = data2;
34415 dtp->data3 = data3;
34416- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
34417+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
34418 dtp->jif = jiffies;
34419 #endif
34420 return;
34421@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
34422 !phba || !phba->slow_ring_trc)
34423 return;
34424
34425- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
34426+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
34427 (lpfc_debugfs_max_slow_ring_trc - 1);
34428 dtp = phba->slow_ring_trc + index;
34429 dtp->fmt = fmt;
34430 dtp->data1 = data1;
34431 dtp->data2 = data2;
34432 dtp->data3 = data3;
34433- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
34434+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
34435 dtp->jif = jiffies;
34436 #endif
34437 return;
34438@@ -3986,7 +3986,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
34439 "slow_ring buffer\n");
34440 goto debug_failed;
34441 }
34442- atomic_set(&phba->slow_ring_trc_cnt, 0);
34443+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
34444 memset(phba->slow_ring_trc, 0,
34445 (sizeof(struct lpfc_debugfs_trc) *
34446 lpfc_debugfs_max_slow_ring_trc));
34447@@ -4032,7 +4032,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
34448 "buffer\n");
34449 goto debug_failed;
34450 }
34451- atomic_set(&vport->disc_trc_cnt, 0);
34452+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
34453
34454 snprintf(name, sizeof(name), "discovery_trace");
34455 vport->debug_disc_trc =
34456diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
34457index 55bc4fc..a2a109c 100644
34458--- a/drivers/scsi/lpfc/lpfc_init.c
34459+++ b/drivers/scsi/lpfc/lpfc_init.c
34460@@ -10027,8 +10027,10 @@ lpfc_init(void)
34461 printk(LPFC_COPYRIGHT "\n");
34462
34463 if (lpfc_enable_npiv) {
34464- lpfc_transport_functions.vport_create = lpfc_vport_create;
34465- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
34466+ pax_open_kernel();
34467+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
34468+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
34469+ pax_close_kernel();
34470 }
34471 lpfc_transport_template =
34472 fc_attach_transport(&lpfc_transport_functions);
34473diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
34474index 2e1e54e..1af0a0d 100644
34475--- a/drivers/scsi/lpfc/lpfc_scsi.c
34476+++ b/drivers/scsi/lpfc/lpfc_scsi.c
34477@@ -305,7 +305,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
34478 uint32_t evt_posted;
34479
34480 spin_lock_irqsave(&phba->hbalock, flags);
34481- atomic_inc(&phba->num_rsrc_err);
34482+ atomic_inc_unchecked(&phba->num_rsrc_err);
34483 phba->last_rsrc_error_time = jiffies;
34484
34485 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
34486@@ -346,7 +346,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
34487 unsigned long flags;
34488 struct lpfc_hba *phba = vport->phba;
34489 uint32_t evt_posted;
34490- atomic_inc(&phba->num_cmd_success);
34491+ atomic_inc_unchecked(&phba->num_cmd_success);
34492
34493 if (vport->cfg_lun_queue_depth <= queue_depth)
34494 return;
34495@@ -390,8 +390,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
34496 unsigned long num_rsrc_err, num_cmd_success;
34497 int i;
34498
34499- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
34500- num_cmd_success = atomic_read(&phba->num_cmd_success);
34501+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
34502+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
34503
34504 vports = lpfc_create_vport_work_array(phba);
34505 if (vports != NULL)
34506@@ -411,8 +411,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
34507 }
34508 }
34509 lpfc_destroy_vport_work_array(phba, vports);
34510- atomic_set(&phba->num_rsrc_err, 0);
34511- atomic_set(&phba->num_cmd_success, 0);
34512+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
34513+ atomic_set_unchecked(&phba->num_cmd_success, 0);
34514 }
34515
34516 /**
34517@@ -446,8 +446,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
34518 }
34519 }
34520 lpfc_destroy_vport_work_array(phba, vports);
34521- atomic_set(&phba->num_rsrc_err, 0);
34522- atomic_set(&phba->num_cmd_success, 0);
34523+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
34524+ atomic_set_unchecked(&phba->num_cmd_success, 0);
34525 }
34526
34527 /**
34528diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
34529index 5163edb..7b142bc 100644
34530--- a/drivers/scsi/pmcraid.c
34531+++ b/drivers/scsi/pmcraid.c
34532@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
34533 res->scsi_dev = scsi_dev;
34534 scsi_dev->hostdata = res;
34535 res->change_detected = 0;
34536- atomic_set(&res->read_failures, 0);
34537- atomic_set(&res->write_failures, 0);
34538+ atomic_set_unchecked(&res->read_failures, 0);
34539+ atomic_set_unchecked(&res->write_failures, 0);
34540 rc = 0;
34541 }
34542 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
34543@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
34544
34545 /* If this was a SCSI read/write command keep count of errors */
34546 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
34547- atomic_inc(&res->read_failures);
34548+ atomic_inc_unchecked(&res->read_failures);
34549 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
34550- atomic_inc(&res->write_failures);
34551+ atomic_inc_unchecked(&res->write_failures);
34552
34553 if (!RES_IS_GSCSI(res->cfg_entry) &&
34554 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
34555@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
34556 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
34557 * hrrq_id assigned here in queuecommand
34558 */
34559- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
34560+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
34561 pinstance->num_hrrq;
34562 cmd->cmd_done = pmcraid_io_done;
34563
34564@@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
34565 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
34566 * hrrq_id assigned here in queuecommand
34567 */
34568- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
34569+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
34570 pinstance->num_hrrq;
34571
34572 if (request_size) {
34573@@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
34574
34575 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
34576 /* add resources only after host is added into system */
34577- if (!atomic_read(&pinstance->expose_resources))
34578+ if (!atomic_read_unchecked(&pinstance->expose_resources))
34579 return;
34580
34581 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
34582@@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
34583 init_waitqueue_head(&pinstance->reset_wait_q);
34584
34585 atomic_set(&pinstance->outstanding_cmds, 0);
34586- atomic_set(&pinstance->last_message_id, 0);
34587- atomic_set(&pinstance->expose_resources, 0);
34588+ atomic_set_unchecked(&pinstance->last_message_id, 0);
34589+ atomic_set_unchecked(&pinstance->expose_resources, 0);
34590
34591 INIT_LIST_HEAD(&pinstance->free_res_q);
34592 INIT_LIST_HEAD(&pinstance->used_res_q);
34593@@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
34594 /* Schedule worker thread to handle CCN and take care of adding and
34595 * removing devices to OS
34596 */
34597- atomic_set(&pinstance->expose_resources, 1);
34598+ atomic_set_unchecked(&pinstance->expose_resources, 1);
34599 schedule_work(&pinstance->worker_q);
34600 return rc;
34601
34602diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
34603index ca496c7..9c791d5 100644
34604--- a/drivers/scsi/pmcraid.h
34605+++ b/drivers/scsi/pmcraid.h
34606@@ -748,7 +748,7 @@ struct pmcraid_instance {
34607 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
34608
34609 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
34610- atomic_t last_message_id;
34611+ atomic_unchecked_t last_message_id;
34612
34613 /* configuration table */
34614 struct pmcraid_config_table *cfg_table;
34615@@ -777,7 +777,7 @@ struct pmcraid_instance {
34616 atomic_t outstanding_cmds;
34617
34618 /* should add/delete resources to mid-layer now ?*/
34619- atomic_t expose_resources;
34620+ atomic_unchecked_t expose_resources;
34621
34622
34623
34624@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
34625 struct pmcraid_config_table_entry_ext cfg_entry_ext;
34626 };
34627 struct scsi_device *scsi_dev; /* Link scsi_device structure */
34628- atomic_t read_failures; /* count of failed READ commands */
34629- atomic_t write_failures; /* count of failed WRITE commands */
34630+ atomic_unchecked_t read_failures; /* count of failed READ commands */
34631+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
34632
34633 /* To indicate add/delete/modify during CCN */
34634 u8 change_detected;
34635diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
34636index fcf052c..a8025a4 100644
34637--- a/drivers/scsi/qla2xxx/qla_def.h
34638+++ b/drivers/scsi/qla2xxx/qla_def.h
34639@@ -2244,7 +2244,7 @@ struct isp_operations {
34640 int (*get_flash_version) (struct scsi_qla_host *, void *);
34641 int (*start_scsi) (srb_t *);
34642 int (*abort_isp) (struct scsi_qla_host *);
34643-};
34644+} __no_const;
34645
34646 /* MSI-X Support *************************************************************/
34647
34648diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
34649index fd5edc6..4906148 100644
34650--- a/drivers/scsi/qla4xxx/ql4_def.h
34651+++ b/drivers/scsi/qla4xxx/ql4_def.h
34652@@ -258,7 +258,7 @@ struct ddb_entry {
34653 * (4000 only) */
34654 atomic_t relogin_timer; /* Max Time to wait for
34655 * relogin to complete */
34656- atomic_t relogin_retry_count; /* Num of times relogin has been
34657+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
34658 * retried */
34659 uint32_t default_time2wait; /* Default Min time between
34660 * relogins (+aens) */
34661diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
34662index 4169c8b..a8b896b 100644
34663--- a/drivers/scsi/qla4xxx/ql4_os.c
34664+++ b/drivers/scsi/qla4xxx/ql4_os.c
34665@@ -2104,12 +2104,12 @@ void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
34666 */
34667 if (!iscsi_is_session_online(cls_sess)) {
34668 /* Reset retry relogin timer */
34669- atomic_inc(&ddb_entry->relogin_retry_count);
34670+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
34671 DEBUG2(ql4_printk(KERN_INFO, ha,
34672 "%s: index[%d] relogin timed out-retrying"
34673 " relogin (%d), retry (%d)\n", __func__,
34674 ddb_entry->fw_ddb_index,
34675- atomic_read(&ddb_entry->relogin_retry_count),
34676+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
34677 ddb_entry->default_time2wait + 4));
34678 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
34679 atomic_set(&ddb_entry->retry_relogin_timer,
34680@@ -3835,7 +3835,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
34681
34682 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
34683 atomic_set(&ddb_entry->relogin_timer, 0);
34684- atomic_set(&ddb_entry->relogin_retry_count, 0);
34685+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
34686
34687 ddb_entry->default_relogin_timeout =
34688 le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
34689diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
34690index 2aeb2e9..46e3925 100644
34691--- a/drivers/scsi/scsi.c
34692+++ b/drivers/scsi/scsi.c
34693@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
34694 unsigned long timeout;
34695 int rtn = 0;
34696
34697- atomic_inc(&cmd->device->iorequest_cnt);
34698+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
34699
34700 /* check if the device is still usable */
34701 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
34702diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
34703index f85cfa6..a57c9e8 100644
34704--- a/drivers/scsi/scsi_lib.c
34705+++ b/drivers/scsi/scsi_lib.c
34706@@ -1416,7 +1416,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
34707 shost = sdev->host;
34708 scsi_init_cmd_errh(cmd);
34709 cmd->result = DID_NO_CONNECT << 16;
34710- atomic_inc(&cmd->device->iorequest_cnt);
34711+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
34712
34713 /*
34714 * SCSI request completion path will do scsi_device_unbusy(),
34715@@ -1442,9 +1442,9 @@ static void scsi_softirq_done(struct request *rq)
34716
34717 INIT_LIST_HEAD(&cmd->eh_entry);
34718
34719- atomic_inc(&cmd->device->iodone_cnt);
34720+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
34721 if (cmd->result)
34722- atomic_inc(&cmd->device->ioerr_cnt);
34723+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
34724
34725 disposition = scsi_decide_disposition(cmd);
34726 if (disposition != SUCCESS &&
34727diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
34728index 04c2a27..9d8bd66 100644
34729--- a/drivers/scsi/scsi_sysfs.c
34730+++ b/drivers/scsi/scsi_sysfs.c
34731@@ -660,7 +660,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
34732 char *buf) \
34733 { \
34734 struct scsi_device *sdev = to_scsi_device(dev); \
34735- unsigned long long count = atomic_read(&sdev->field); \
34736+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
34737 return snprintf(buf, 20, "0x%llx\n", count); \
34738 } \
34739 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
34740diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
34741index 84a1fdf..693b0d6 100644
34742--- a/drivers/scsi/scsi_tgt_lib.c
34743+++ b/drivers/scsi/scsi_tgt_lib.c
34744@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
34745 int err;
34746
34747 dprintk("%lx %u\n", uaddr, len);
34748- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
34749+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
34750 if (err) {
34751 /*
34752 * TODO: need to fixup sg_tablesize, max_segment_size,
34753diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
34754index 1b21491..1b7f60e 100644
34755--- a/drivers/scsi/scsi_transport_fc.c
34756+++ b/drivers/scsi/scsi_transport_fc.c
34757@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
34758 * Netlink Infrastructure
34759 */
34760
34761-static atomic_t fc_event_seq;
34762+static atomic_unchecked_t fc_event_seq;
34763
34764 /**
34765 * fc_get_event_number - Obtain the next sequential FC event number
34766@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
34767 u32
34768 fc_get_event_number(void)
34769 {
34770- return atomic_add_return(1, &fc_event_seq);
34771+ return atomic_add_return_unchecked(1, &fc_event_seq);
34772 }
34773 EXPORT_SYMBOL(fc_get_event_number);
34774
34775@@ -645,7 +645,7 @@ static __init int fc_transport_init(void)
34776 {
34777 int error;
34778
34779- atomic_set(&fc_event_seq, 0);
34780+ atomic_set_unchecked(&fc_event_seq, 0);
34781
34782 error = transport_class_register(&fc_host_class);
34783 if (error)
34784@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
34785 char *cp;
34786
34787 *val = simple_strtoul(buf, &cp, 0);
34788- if ((*cp && (*cp != '\n')) || (*val < 0))
34789+ if (*cp && (*cp != '\n'))
34790 return -EINVAL;
34791 /*
34792 * Check for overflow; dev_loss_tmo is u32
34793diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
34794index 96029e6..4d77fa0 100644
34795--- a/drivers/scsi/scsi_transport_iscsi.c
34796+++ b/drivers/scsi/scsi_transport_iscsi.c
34797@@ -79,7 +79,7 @@ struct iscsi_internal {
34798 struct transport_container session_cont;
34799 };
34800
34801-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
34802+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
34803 static struct workqueue_struct *iscsi_eh_timer_workq;
34804
34805 static DEFINE_IDA(iscsi_sess_ida);
34806@@ -1062,7 +1062,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
34807 int err;
34808
34809 ihost = shost->shost_data;
34810- session->sid = atomic_add_return(1, &iscsi_session_nr);
34811+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
34812
34813 if (target_id == ISCSI_MAX_TARGET) {
34814 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
34815@@ -2663,7 +2663,7 @@ static __init int iscsi_transport_init(void)
34816 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
34817 ISCSI_TRANSPORT_VERSION);
34818
34819- atomic_set(&iscsi_session_nr, 0);
34820+ atomic_set_unchecked(&iscsi_session_nr, 0);
34821
34822 err = class_register(&iscsi_transport_class);
34823 if (err)
34824diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
34825index 21a045e..ec89e03 100644
34826--- a/drivers/scsi/scsi_transport_srp.c
34827+++ b/drivers/scsi/scsi_transport_srp.c
34828@@ -33,7 +33,7 @@
34829 #include "scsi_transport_srp_internal.h"
34830
34831 struct srp_host_attrs {
34832- atomic_t next_port_id;
34833+ atomic_unchecked_t next_port_id;
34834 };
34835 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
34836
34837@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
34838 struct Scsi_Host *shost = dev_to_shost(dev);
34839 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
34840
34841- atomic_set(&srp_host->next_port_id, 0);
34842+ atomic_set_unchecked(&srp_host->next_port_id, 0);
34843 return 0;
34844 }
34845
34846@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
34847 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
34848 rport->roles = ids->roles;
34849
34850- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
34851+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
34852 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
34853
34854 transport_setup_device(&rport->dev);
34855diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
34856index 441a1c5..07cece7 100644
34857--- a/drivers/scsi/sg.c
34858+++ b/drivers/scsi/sg.c
34859@@ -1077,7 +1077,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
34860 sdp->disk->disk_name,
34861 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
34862 NULL,
34863- (char *)arg);
34864+ (char __user *)arg);
34865 case BLKTRACESTART:
34866 return blk_trace_startstop(sdp->device->request_queue, 1);
34867 case BLKTRACESTOP:
34868@@ -2312,7 +2312,7 @@ struct sg_proc_leaf {
34869 const struct file_operations * fops;
34870 };
34871
34872-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
34873+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
34874 {"allow_dio", &adio_fops},
34875 {"debug", &debug_fops},
34876 {"def_reserved_size", &dressz_fops},
34877@@ -2327,7 +2327,7 @@ sg_proc_init(void)
34878 {
34879 int k, mask;
34880 int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
34881- struct sg_proc_leaf * leaf;
34882+ const struct sg_proc_leaf * leaf;
34883
34884 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
34885 if (!sg_proc_sgp)
34886diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
34887index f64250e..1ee3049 100644
34888--- a/drivers/spi/spi-dw-pci.c
34889+++ b/drivers/spi/spi-dw-pci.c
34890@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
34891 #define spi_resume NULL
34892 #endif
34893
34894-static const struct pci_device_id pci_ids[] __devinitdata = {
34895+static const struct pci_device_id pci_ids[] __devinitconst = {
34896 /* Intel MID platform SPI controller 0 */
34897 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
34898 {},
34899diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
34900index 77eae99..b7cdcc9 100644
34901--- a/drivers/spi/spi.c
34902+++ b/drivers/spi/spi.c
34903@@ -1024,7 +1024,7 @@ int spi_bus_unlock(struct spi_master *master)
34904 EXPORT_SYMBOL_GPL(spi_bus_unlock);
34905
34906 /* portable code must never pass more than 32 bytes */
34907-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
34908+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
34909
34910 static u8 *buf;
34911
34912diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
34913index 436fe97..4082570 100644
34914--- a/drivers/staging/gma500/power.c
34915+++ b/drivers/staging/gma500/power.c
34916@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
34917 ret = gma_resume_pci(dev->pdev);
34918 if (ret == 0) {
34919 /* FIXME: we want to defer this for Medfield/Oaktrail */
34920- gma_resume_display(dev);
34921+ gma_resume_display(dev->pdev);
34922 psb_irq_preinstall(dev);
34923 psb_irq_postinstall(dev);
34924 pm_runtime_get(&dev->pdev->dev);
34925diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
34926index bafccb3..e3ac78d 100644
34927--- a/drivers/staging/hv/rndis_filter.c
34928+++ b/drivers/staging/hv/rndis_filter.c
34929@@ -42,7 +42,7 @@ struct rndis_device {
34930
34931 enum rndis_device_state state;
34932 bool link_state;
34933- atomic_t new_req_id;
34934+ atomic_unchecked_t new_req_id;
34935
34936 spinlock_t request_lock;
34937 struct list_head req_list;
34938@@ -116,7 +116,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
34939 * template
34940 */
34941 set = &rndis_msg->msg.set_req;
34942- set->req_id = atomic_inc_return(&dev->new_req_id);
34943+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
34944
34945 /* Add to the request list */
34946 spin_lock_irqsave(&dev->request_lock, flags);
34947@@ -646,7 +646,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
34948
34949 /* Setup the rndis set */
34950 halt = &request->request_msg.msg.halt_req;
34951- halt->req_id = atomic_inc_return(&dev->new_req_id);
34952+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
34953
34954 /* Ignore return since this msg is optional. */
34955 rndis_filter_send_request(dev, request);
34956diff --git a/drivers/staging/iio/buffer_generic.h b/drivers/staging/iio/buffer_generic.h
34957index 9e8f010..af9efb5 100644
34958--- a/drivers/staging/iio/buffer_generic.h
34959+++ b/drivers/staging/iio/buffer_generic.h
34960@@ -64,7 +64,7 @@ struct iio_buffer_access_funcs {
34961
34962 int (*is_enabled)(struct iio_buffer *buffer);
34963 int (*enable)(struct iio_buffer *buffer);
34964-};
34965+} __no_const;
34966
34967 /**
34968 * struct iio_buffer_setup_ops - buffer setup related callbacks
34969diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
34970index 8b307b4..a97ac91 100644
34971--- a/drivers/staging/octeon/ethernet-rx.c
34972+++ b/drivers/staging/octeon/ethernet-rx.c
34973@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
34974 /* Increment RX stats for virtual ports */
34975 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
34976 #ifdef CONFIG_64BIT
34977- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
34978- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
34979+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
34980+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
34981 #else
34982- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
34983- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
34984+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
34985+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
34986 #endif
34987 }
34988 netif_receive_skb(skb);
34989@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
34990 dev->name);
34991 */
34992 #ifdef CONFIG_64BIT
34993- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
34994+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
34995 #else
34996- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
34997+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
34998 #endif
34999 dev_kfree_skb_irq(skb);
35000 }
35001diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
35002index 076f866..2308070 100644
35003--- a/drivers/staging/octeon/ethernet.c
35004+++ b/drivers/staging/octeon/ethernet.c
35005@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
35006 * since the RX tasklet also increments it.
35007 */
35008 #ifdef CONFIG_64BIT
35009- atomic64_add(rx_status.dropped_packets,
35010- (atomic64_t *)&priv->stats.rx_dropped);
35011+ atomic64_add_unchecked(rx_status.dropped_packets,
35012+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
35013 #else
35014- atomic_add(rx_status.dropped_packets,
35015- (atomic_t *)&priv->stats.rx_dropped);
35016+ atomic_add_unchecked(rx_status.dropped_packets,
35017+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
35018 #endif
35019 }
35020
35021diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
35022index 7a19555..466456d 100644
35023--- a/drivers/staging/pohmelfs/inode.c
35024+++ b/drivers/staging/pohmelfs/inode.c
35025@@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
35026 mutex_init(&psb->mcache_lock);
35027 psb->mcache_root = RB_ROOT;
35028 psb->mcache_timeout = msecs_to_jiffies(5000);
35029- atomic_long_set(&psb->mcache_gen, 0);
35030+ atomic_long_set_unchecked(&psb->mcache_gen, 0);
35031
35032 psb->trans_max_pages = 100;
35033
35034@@ -1876,7 +1876,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
35035 INIT_LIST_HEAD(&psb->crypto_ready_list);
35036 INIT_LIST_HEAD(&psb->crypto_active_list);
35037
35038- atomic_set(&psb->trans_gen, 1);
35039+ atomic_set_unchecked(&psb->trans_gen, 1);
35040 atomic_long_set(&psb->total_inodes, 0);
35041
35042 mutex_init(&psb->state_lock);
35043diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
35044index e22665c..a2a9390 100644
35045--- a/drivers/staging/pohmelfs/mcache.c
35046+++ b/drivers/staging/pohmelfs/mcache.c
35047@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
35048 m->data = data;
35049 m->start = start;
35050 m->size = size;
35051- m->gen = atomic_long_inc_return(&psb->mcache_gen);
35052+ m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
35053
35054 mutex_lock(&psb->mcache_lock);
35055 err = pohmelfs_mcache_insert(psb, m);
35056diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
35057index 985b6b7..7699e05 100644
35058--- a/drivers/staging/pohmelfs/netfs.h
35059+++ b/drivers/staging/pohmelfs/netfs.h
35060@@ -571,14 +571,14 @@ struct pohmelfs_config;
35061 struct pohmelfs_sb {
35062 struct rb_root mcache_root;
35063 struct mutex mcache_lock;
35064- atomic_long_t mcache_gen;
35065+ atomic_long_unchecked_t mcache_gen;
35066 unsigned long mcache_timeout;
35067
35068 unsigned int idx;
35069
35070 unsigned int trans_retries;
35071
35072- atomic_t trans_gen;
35073+ atomic_unchecked_t trans_gen;
35074
35075 unsigned int crypto_attached_size;
35076 unsigned int crypto_align_size;
35077diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
35078index 06c1a74..866eebc 100644
35079--- a/drivers/staging/pohmelfs/trans.c
35080+++ b/drivers/staging/pohmelfs/trans.c
35081@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
35082 int err;
35083 struct netfs_cmd *cmd = t->iovec.iov_base;
35084
35085- t->gen = atomic_inc_return(&psb->trans_gen);
35086+ t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
35087
35088 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
35089 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
35090diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
35091index 86308a0..feaa925 100644
35092--- a/drivers/staging/rtl8712/rtl871x_io.h
35093+++ b/drivers/staging/rtl8712/rtl871x_io.h
35094@@ -108,7 +108,7 @@ struct _io_ops {
35095 u8 *pmem);
35096 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
35097 u8 *pmem);
35098-};
35099+} __no_const;
35100
35101 struct io_req {
35102 struct list_head list;
35103diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
35104index c7b5e8b..783d6cb 100644
35105--- a/drivers/staging/sbe-2t3e3/netdev.c
35106+++ b/drivers/staging/sbe-2t3e3/netdev.c
35107@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35108 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
35109
35110 if (rlen)
35111- if (copy_to_user(data, &resp, rlen))
35112+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
35113 return -EFAULT;
35114
35115 return 0;
35116diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
35117index be21617..0954e45 100644
35118--- a/drivers/staging/usbip/usbip_common.h
35119+++ b/drivers/staging/usbip/usbip_common.h
35120@@ -289,7 +289,7 @@ struct usbip_device {
35121 void (*shutdown)(struct usbip_device *);
35122 void (*reset)(struct usbip_device *);
35123 void (*unusable)(struct usbip_device *);
35124- } eh_ops;
35125+ } __no_const eh_ops;
35126 };
35127
35128 #if 0
35129diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
35130index 88b3298..3783eee 100644
35131--- a/drivers/staging/usbip/vhci.h
35132+++ b/drivers/staging/usbip/vhci.h
35133@@ -88,7 +88,7 @@ struct vhci_hcd {
35134 unsigned resuming:1;
35135 unsigned long re_timeout;
35136
35137- atomic_t seqnum;
35138+ atomic_unchecked_t seqnum;
35139
35140 /*
35141 * NOTE:
35142diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
35143index 2ee97e2..0420b86 100644
35144--- a/drivers/staging/usbip/vhci_hcd.c
35145+++ b/drivers/staging/usbip/vhci_hcd.c
35146@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
35147 return;
35148 }
35149
35150- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
35151+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
35152 if (priv->seqnum == 0xffff)
35153 dev_info(&urb->dev->dev, "seqnum max\n");
35154
35155@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
35156 return -ENOMEM;
35157 }
35158
35159- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
35160+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
35161 if (unlink->seqnum == 0xffff)
35162 pr_info("seqnum max\n");
35163
35164@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hcd)
35165 vdev->rhport = rhport;
35166 }
35167
35168- atomic_set(&vhci->seqnum, 0);
35169+ atomic_set_unchecked(&vhci->seqnum, 0);
35170 spin_lock_init(&vhci->lock);
35171
35172 hcd->power_budget = 0; /* no limit */
35173diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
35174index 3872b8c..fe6d2f4 100644
35175--- a/drivers/staging/usbip/vhci_rx.c
35176+++ b/drivers/staging/usbip/vhci_rx.c
35177@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
35178 if (!urb) {
35179 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
35180 pr_info("max seqnum %d\n",
35181- atomic_read(&the_controller->seqnum));
35182+ atomic_read_unchecked(&the_controller->seqnum));
35183 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
35184 return;
35185 }
35186diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
35187index 7735027..30eed13 100644
35188--- a/drivers/staging/vt6655/hostap.c
35189+++ b/drivers/staging/vt6655/hostap.c
35190@@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
35191 *
35192 */
35193
35194+static net_device_ops_no_const apdev_netdev_ops;
35195+
35196 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
35197 {
35198 PSDevice apdev_priv;
35199 struct net_device *dev = pDevice->dev;
35200 int ret;
35201- const struct net_device_ops apdev_netdev_ops = {
35202- .ndo_start_xmit = pDevice->tx_80211,
35203- };
35204
35205 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
35206
35207@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
35208 *apdev_priv = *pDevice;
35209 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
35210
35211+ /* only half broken now */
35212+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
35213 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
35214
35215 pDevice->apdev->type = ARPHRD_IEEE80211;
35216diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
35217index 51b5adf..098e320 100644
35218--- a/drivers/staging/vt6656/hostap.c
35219+++ b/drivers/staging/vt6656/hostap.c
35220@@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
35221 *
35222 */
35223
35224+static net_device_ops_no_const apdev_netdev_ops;
35225+
35226 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
35227 {
35228 PSDevice apdev_priv;
35229 struct net_device *dev = pDevice->dev;
35230 int ret;
35231- const struct net_device_ops apdev_netdev_ops = {
35232- .ndo_start_xmit = pDevice->tx_80211,
35233- };
35234
35235 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
35236
35237@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
35238 *apdev_priv = *pDevice;
35239 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
35240
35241+ /* only half broken now */
35242+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
35243 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
35244
35245 pDevice->apdev->type = ARPHRD_IEEE80211;
35246diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
35247index 7843dfd..3db105f 100644
35248--- a/drivers/staging/wlan-ng/hfa384x_usb.c
35249+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
35250@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
35251
35252 struct usbctlx_completor {
35253 int (*complete) (struct usbctlx_completor *);
35254-};
35255+} __no_const;
35256
35257 static int
35258 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
35259diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
35260index 1ca66ea..76f1343 100644
35261--- a/drivers/staging/zcache/tmem.c
35262+++ b/drivers/staging/zcache/tmem.c
35263@@ -39,7 +39,7 @@
35264 * A tmem host implementation must use this function to register callbacks
35265 * for memory allocation.
35266 */
35267-static struct tmem_hostops tmem_hostops;
35268+static tmem_hostops_no_const tmem_hostops;
35269
35270 static void tmem_objnode_tree_init(void);
35271
35272@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
35273 * A tmem host implementation must use this function to register
35274 * callbacks for a page-accessible memory (PAM) implementation
35275 */
35276-static struct tmem_pamops tmem_pamops;
35277+static tmem_pamops_no_const tmem_pamops;
35278
35279 void tmem_register_pamops(struct tmem_pamops *m)
35280 {
35281diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
35282index ed147c4..94fc3c6 100644
35283--- a/drivers/staging/zcache/tmem.h
35284+++ b/drivers/staging/zcache/tmem.h
35285@@ -180,6 +180,7 @@ struct tmem_pamops {
35286 void (*new_obj)(struct tmem_obj *);
35287 int (*replace_in_obj)(void *, struct tmem_obj *);
35288 };
35289+typedef struct tmem_pamops __no_const tmem_pamops_no_const;
35290 extern void tmem_register_pamops(struct tmem_pamops *m);
35291
35292 /* memory allocation methods provided by the host implementation */
35293@@ -189,6 +190,7 @@ struct tmem_hostops {
35294 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
35295 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
35296 };
35297+typedef struct tmem_hostops __no_const tmem_hostops_no_const;
35298 extern void tmem_register_hostops(struct tmem_hostops *m);
35299
35300 /* core tmem accessor functions */
35301diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
35302index 8599545..7761358 100644
35303--- a/drivers/target/iscsi/iscsi_target.c
35304+++ b/drivers/target/iscsi/iscsi_target.c
35305@@ -1364,7 +1364,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
35306 * outstanding_r2ts reaches zero, go ahead and send the delayed
35307 * TASK_ABORTED status.
35308 */
35309- if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
35310+ if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
35311 if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
35312 if (--cmd->outstanding_r2ts < 1) {
35313 iscsit_stop_dataout_timer(cmd);
35314diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
35315index 6845228..df77141 100644
35316--- a/drivers/target/target_core_tmr.c
35317+++ b/drivers/target/target_core_tmr.c
35318@@ -250,7 +250,7 @@ static void core_tmr_drain_task_list(
35319 cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
35320 cmd->t_task_list_num,
35321 atomic_read(&cmd->t_task_cdbs_left),
35322- atomic_read(&cmd->t_task_cdbs_sent),
35323+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
35324 atomic_read(&cmd->t_transport_active),
35325 atomic_read(&cmd->t_transport_stop),
35326 atomic_read(&cmd->t_transport_sent));
35327@@ -281,7 +281,7 @@ static void core_tmr_drain_task_list(
35328 pr_debug("LUN_RESET: got t_transport_active = 1 for"
35329 " task: %p, t_fe_count: %d dev: %p\n", task,
35330 fe_count, dev);
35331- atomic_set(&cmd->t_transport_aborted, 1);
35332+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
35333 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
35334
35335 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
35336@@ -289,7 +289,7 @@ static void core_tmr_drain_task_list(
35337 }
35338 pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
35339 " t_fe_count: %d dev: %p\n", task, fe_count, dev);
35340- atomic_set(&cmd->t_transport_aborted, 1);
35341+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
35342 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
35343
35344 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
35345diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
35346index e87d0eb..856cbcc 100644
35347--- a/drivers/target/target_core_transport.c
35348+++ b/drivers/target/target_core_transport.c
35349@@ -1343,7 +1343,7 @@ struct se_device *transport_add_device_to_core_hba(
35350
35351 dev->queue_depth = dev_limits->queue_depth;
35352 atomic_set(&dev->depth_left, dev->queue_depth);
35353- atomic_set(&dev->dev_ordered_id, 0);
35354+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
35355
35356 se_dev_set_default_attribs(dev, dev_limits);
35357
35358@@ -1530,7 +1530,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
35359 * Used to determine when ORDERED commands should go from
35360 * Dormant to Active status.
35361 */
35362- cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
35363+ cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
35364 smp_mb__after_atomic_inc();
35365 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
35366 cmd->se_ordered_id, cmd->sam_task_attr,
35367@@ -1800,7 +1800,7 @@ static void transport_generic_request_failure(struct se_cmd *cmd)
35368 " t_transport_active: %d t_transport_stop: %d"
35369 " t_transport_sent: %d\n", cmd->t_task_list_num,
35370 atomic_read(&cmd->t_task_cdbs_left),
35371- atomic_read(&cmd->t_task_cdbs_sent),
35372+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
35373 atomic_read(&cmd->t_task_cdbs_ex_left),
35374 atomic_read(&cmd->t_transport_active),
35375 atomic_read(&cmd->t_transport_stop),
35376@@ -2089,9 +2089,9 @@ check_depth:
35377
35378 spin_lock_irqsave(&cmd->t_state_lock, flags);
35379 task->task_flags |= (TF_ACTIVE | TF_SENT);
35380- atomic_inc(&cmd->t_task_cdbs_sent);
35381+ atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
35382
35383- if (atomic_read(&cmd->t_task_cdbs_sent) ==
35384+ if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
35385 cmd->t_task_list_num)
35386 atomic_set(&cmd->t_transport_sent, 1);
35387
35388@@ -4260,7 +4260,7 @@ bool transport_wait_for_tasks(struct se_cmd *cmd)
35389 atomic_set(&cmd->transport_lun_stop, 0);
35390 }
35391 if (!atomic_read(&cmd->t_transport_active) ||
35392- atomic_read(&cmd->t_transport_aborted)) {
35393+ atomic_read_unchecked(&cmd->t_transport_aborted)) {
35394 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
35395 return false;
35396 }
35397@@ -4509,7 +4509,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
35398 {
35399 int ret = 0;
35400
35401- if (atomic_read(&cmd->t_transport_aborted) != 0) {
35402+ if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
35403 if (!send_status ||
35404 (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
35405 return 1;
35406@@ -4546,7 +4546,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
35407 */
35408 if (cmd->data_direction == DMA_TO_DEVICE) {
35409 if (cmd->se_tfo->write_pending_status(cmd) != 0) {
35410- atomic_inc(&cmd->t_transport_aborted);
35411+ atomic_inc_unchecked(&cmd->t_transport_aborted);
35412 smp_mb__after_atomic_inc();
35413 }
35414 }
35415diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
35416index b9040be..e3f5aab 100644
35417--- a/drivers/tty/hvc/hvcs.c
35418+++ b/drivers/tty/hvc/hvcs.c
35419@@ -83,6 +83,7 @@
35420 #include <asm/hvcserver.h>
35421 #include <asm/uaccess.h>
35422 #include <asm/vio.h>
35423+#include <asm/local.h>
35424
35425 /*
35426 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
35427@@ -270,7 +271,7 @@ struct hvcs_struct {
35428 unsigned int index;
35429
35430 struct tty_struct *tty;
35431- int open_count;
35432+ local_t open_count;
35433
35434 /*
35435 * Used to tell the driver kernel_thread what operations need to take
35436@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
35437
35438 spin_lock_irqsave(&hvcsd->lock, flags);
35439
35440- if (hvcsd->open_count > 0) {
35441+ if (local_read(&hvcsd->open_count) > 0) {
35442 spin_unlock_irqrestore(&hvcsd->lock, flags);
35443 printk(KERN_INFO "HVCS: vterm state unchanged. "
35444 "The hvcs device node is still in use.\n");
35445@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
35446 if ((retval = hvcs_partner_connect(hvcsd)))
35447 goto error_release;
35448
35449- hvcsd->open_count = 1;
35450+ local_set(&hvcsd->open_count, 1);
35451 hvcsd->tty = tty;
35452 tty->driver_data = hvcsd;
35453
35454@@ -1179,7 +1180,7 @@ fast_open:
35455
35456 spin_lock_irqsave(&hvcsd->lock, flags);
35457 kref_get(&hvcsd->kref);
35458- hvcsd->open_count++;
35459+ local_inc(&hvcsd->open_count);
35460 hvcsd->todo_mask |= HVCS_SCHED_READ;
35461 spin_unlock_irqrestore(&hvcsd->lock, flags);
35462
35463@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
35464 hvcsd = tty->driver_data;
35465
35466 spin_lock_irqsave(&hvcsd->lock, flags);
35467- if (--hvcsd->open_count == 0) {
35468+ if (local_dec_and_test(&hvcsd->open_count)) {
35469
35470 vio_disable_interrupts(hvcsd->vdev);
35471
35472@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
35473 free_irq(irq, hvcsd);
35474 kref_put(&hvcsd->kref, destroy_hvcs_struct);
35475 return;
35476- } else if (hvcsd->open_count < 0) {
35477+ } else if (local_read(&hvcsd->open_count) < 0) {
35478 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
35479 " is missmanaged.\n",
35480- hvcsd->vdev->unit_address, hvcsd->open_count);
35481+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
35482 }
35483
35484 spin_unlock_irqrestore(&hvcsd->lock, flags);
35485@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struct * tty)
35486
35487 spin_lock_irqsave(&hvcsd->lock, flags);
35488 /* Preserve this so that we know how many kref refs to put */
35489- temp_open_count = hvcsd->open_count;
35490+ temp_open_count = local_read(&hvcsd->open_count);
35491
35492 /*
35493 * Don't kref put inside the spinlock because the destruction
35494@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struct * tty)
35495 hvcsd->tty->driver_data = NULL;
35496 hvcsd->tty = NULL;
35497
35498- hvcsd->open_count = 0;
35499+ local_set(&hvcsd->open_count, 0);
35500
35501 /* This will drop any buffered data on the floor which is OK in a hangup
35502 * scenario. */
35503@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct *tty,
35504 * the middle of a write operation? This is a crummy place to do this
35505 * but we want to keep it all in the spinlock.
35506 */
35507- if (hvcsd->open_count <= 0) {
35508+ if (local_read(&hvcsd->open_count) <= 0) {
35509 spin_unlock_irqrestore(&hvcsd->lock, flags);
35510 return -ENODEV;
35511 }
35512@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_struct *tty)
35513 {
35514 struct hvcs_struct *hvcsd = tty->driver_data;
35515
35516- if (!hvcsd || hvcsd->open_count <= 0)
35517+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
35518 return 0;
35519
35520 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
35521diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
35522index ef92869..f4ebd88 100644
35523--- a/drivers/tty/ipwireless/tty.c
35524+++ b/drivers/tty/ipwireless/tty.c
35525@@ -29,6 +29,7 @@
35526 #include <linux/tty_driver.h>
35527 #include <linux/tty_flip.h>
35528 #include <linux/uaccess.h>
35529+#include <asm/local.h>
35530
35531 #include "tty.h"
35532 #include "network.h"
35533@@ -51,7 +52,7 @@ struct ipw_tty {
35534 int tty_type;
35535 struct ipw_network *network;
35536 struct tty_struct *linux_tty;
35537- int open_count;
35538+ local_t open_count;
35539 unsigned int control_lines;
35540 struct mutex ipw_tty_mutex;
35541 int tx_bytes_queued;
35542@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
35543 mutex_unlock(&tty->ipw_tty_mutex);
35544 return -ENODEV;
35545 }
35546- if (tty->open_count == 0)
35547+ if (local_read(&tty->open_count) == 0)
35548 tty->tx_bytes_queued = 0;
35549
35550- tty->open_count++;
35551+ local_inc(&tty->open_count);
35552
35553 tty->linux_tty = linux_tty;
35554 linux_tty->driver_data = tty;
35555@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
35556
35557 static void do_ipw_close(struct ipw_tty *tty)
35558 {
35559- tty->open_count--;
35560-
35561- if (tty->open_count == 0) {
35562+ if (local_dec_return(&tty->open_count) == 0) {
35563 struct tty_struct *linux_tty = tty->linux_tty;
35564
35565 if (linux_tty != NULL) {
35566@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
35567 return;
35568
35569 mutex_lock(&tty->ipw_tty_mutex);
35570- if (tty->open_count == 0) {
35571+ if (local_read(&tty->open_count) == 0) {
35572 mutex_unlock(&tty->ipw_tty_mutex);
35573 return;
35574 }
35575@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
35576 return;
35577 }
35578
35579- if (!tty->open_count) {
35580+ if (!local_read(&tty->open_count)) {
35581 mutex_unlock(&tty->ipw_tty_mutex);
35582 return;
35583 }
35584@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
35585 return -ENODEV;
35586
35587 mutex_lock(&tty->ipw_tty_mutex);
35588- if (!tty->open_count) {
35589+ if (!local_read(&tty->open_count)) {
35590 mutex_unlock(&tty->ipw_tty_mutex);
35591 return -EINVAL;
35592 }
35593@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
35594 if (!tty)
35595 return -ENODEV;
35596
35597- if (!tty->open_count)
35598+ if (!local_read(&tty->open_count))
35599 return -EINVAL;
35600
35601 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
35602@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
35603 if (!tty)
35604 return 0;
35605
35606- if (!tty->open_count)
35607+ if (!local_read(&tty->open_count))
35608 return 0;
35609
35610 return tty->tx_bytes_queued;
35611@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
35612 if (!tty)
35613 return -ENODEV;
35614
35615- if (!tty->open_count)
35616+ if (!local_read(&tty->open_count))
35617 return -EINVAL;
35618
35619 return get_control_lines(tty);
35620@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
35621 if (!tty)
35622 return -ENODEV;
35623
35624- if (!tty->open_count)
35625+ if (!local_read(&tty->open_count))
35626 return -EINVAL;
35627
35628 return set_control_lines(tty, set, clear);
35629@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
35630 if (!tty)
35631 return -ENODEV;
35632
35633- if (!tty->open_count)
35634+ if (!local_read(&tty->open_count))
35635 return -EINVAL;
35636
35637 /* FIXME: Exactly how is the tty object locked here .. */
35638@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
35639 against a parallel ioctl etc */
35640 mutex_lock(&ttyj->ipw_tty_mutex);
35641 }
35642- while (ttyj->open_count)
35643+ while (local_read(&ttyj->open_count))
35644 do_ipw_close(ttyj);
35645 ipwireless_disassociate_network_ttys(network,
35646 ttyj->channel_idx);
35647diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
35648index fc7bbba..9527e93 100644
35649--- a/drivers/tty/n_gsm.c
35650+++ b/drivers/tty/n_gsm.c
35651@@ -1629,7 +1629,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
35652 kref_init(&dlci->ref);
35653 mutex_init(&dlci->mutex);
35654 dlci->fifo = &dlci->_fifo;
35655- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
35656+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
35657 kfree(dlci);
35658 return NULL;
35659 }
35660diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
35661index 39d6ab6..eb97f41 100644
35662--- a/drivers/tty/n_tty.c
35663+++ b/drivers/tty/n_tty.c
35664@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
35665 {
35666 *ops = tty_ldisc_N_TTY;
35667 ops->owner = NULL;
35668- ops->refcount = ops->flags = 0;
35669+ atomic_set(&ops->refcount, 0);
35670+ ops->flags = 0;
35671 }
35672 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
35673diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
35674index e18604b..a7d5a11 100644
35675--- a/drivers/tty/pty.c
35676+++ b/drivers/tty/pty.c
35677@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
35678 register_sysctl_table(pty_root_table);
35679
35680 /* Now create the /dev/ptmx special device */
35681+ pax_open_kernel();
35682 tty_default_fops(&ptmx_fops);
35683- ptmx_fops.open = ptmx_open;
35684+ *(void **)&ptmx_fops.open = ptmx_open;
35685+ pax_close_kernel();
35686
35687 cdev_init(&ptmx_cdev, &ptmx_fops);
35688 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
35689diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
35690index 2b42a01..32a2ed3 100644
35691--- a/drivers/tty/serial/kgdboc.c
35692+++ b/drivers/tty/serial/kgdboc.c
35693@@ -24,8 +24,9 @@
35694 #define MAX_CONFIG_LEN 40
35695
35696 static struct kgdb_io kgdboc_io_ops;
35697+static struct kgdb_io kgdboc_io_ops_console;
35698
35699-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
35700+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
35701 static int configured = -1;
35702
35703 static char config[MAX_CONFIG_LEN];
35704@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
35705 kgdboc_unregister_kbd();
35706 if (configured == 1)
35707 kgdb_unregister_io_module(&kgdboc_io_ops);
35708+ else if (configured == 2)
35709+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
35710 }
35711
35712 static int configure_kgdboc(void)
35713@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
35714 int err;
35715 char *cptr = config;
35716 struct console *cons;
35717+ int is_console = 0;
35718
35719 err = kgdboc_option_setup(config);
35720 if (err || !strlen(config) || isspace(config[0]))
35721 goto noconfig;
35722
35723 err = -ENODEV;
35724- kgdboc_io_ops.is_console = 0;
35725 kgdb_tty_driver = NULL;
35726
35727 kgdboc_use_kms = 0;
35728@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
35729 int idx;
35730 if (cons->device && cons->device(cons, &idx) == p &&
35731 idx == tty_line) {
35732- kgdboc_io_ops.is_console = 1;
35733+ is_console = 1;
35734 break;
35735 }
35736 cons = cons->next;
35737@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
35738 kgdb_tty_line = tty_line;
35739
35740 do_register:
35741- err = kgdb_register_io_module(&kgdboc_io_ops);
35742+ if (is_console) {
35743+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
35744+ configured = 2;
35745+ } else {
35746+ err = kgdb_register_io_module(&kgdboc_io_ops);
35747+ configured = 1;
35748+ }
35749 if (err)
35750 goto noconfig;
35751
35752- configured = 1;
35753-
35754 return 0;
35755
35756 noconfig:
35757@@ -213,7 +220,7 @@ noconfig:
35758 static int __init init_kgdboc(void)
35759 {
35760 /* Already configured? */
35761- if (configured == 1)
35762+ if (configured >= 1)
35763 return 0;
35764
35765 return configure_kgdboc();
35766@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
35767 if (config[len - 1] == '\n')
35768 config[len - 1] = '\0';
35769
35770- if (configured == 1)
35771+ if (configured >= 1)
35772 cleanup_kgdboc();
35773
35774 /* Go and configure with the new params. */
35775@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
35776 .post_exception = kgdboc_post_exp_handler,
35777 };
35778
35779+static struct kgdb_io kgdboc_io_ops_console = {
35780+ .name = "kgdboc",
35781+ .read_char = kgdboc_get_char,
35782+ .write_char = kgdboc_put_char,
35783+ .pre_exception = kgdboc_pre_exp_handler,
35784+ .post_exception = kgdboc_post_exp_handler,
35785+ .is_console = 1
35786+};
35787+
35788 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
35789 /* This is only available if kgdboc is a built in for early debugging */
35790 static int __init kgdboc_early_init(char *opt)
35791diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
35792index 05085be..67eadb0 100644
35793--- a/drivers/tty/tty_io.c
35794+++ b/drivers/tty/tty_io.c
35795@@ -3240,7 +3240,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
35796
35797 void tty_default_fops(struct file_operations *fops)
35798 {
35799- *fops = tty_fops;
35800+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
35801 }
35802
35803 /*
35804diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
35805index 8e0924f..4204eb4 100644
35806--- a/drivers/tty/tty_ldisc.c
35807+++ b/drivers/tty/tty_ldisc.c
35808@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *ld)
35809 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
35810 struct tty_ldisc_ops *ldo = ld->ops;
35811
35812- ldo->refcount--;
35813+ atomic_dec(&ldo->refcount);
35814 module_put(ldo->owner);
35815 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
35816
35817@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
35818 spin_lock_irqsave(&tty_ldisc_lock, flags);
35819 tty_ldiscs[disc] = new_ldisc;
35820 new_ldisc->num = disc;
35821- new_ldisc->refcount = 0;
35822+ atomic_set(&new_ldisc->refcount, 0);
35823 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
35824
35825 return ret;
35826@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
35827 return -EINVAL;
35828
35829 spin_lock_irqsave(&tty_ldisc_lock, flags);
35830- if (tty_ldiscs[disc]->refcount)
35831+ if (atomic_read(&tty_ldiscs[disc]->refcount))
35832 ret = -EBUSY;
35833 else
35834 tty_ldiscs[disc] = NULL;
35835@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
35836 if (ldops) {
35837 ret = ERR_PTR(-EAGAIN);
35838 if (try_module_get(ldops->owner)) {
35839- ldops->refcount++;
35840+ atomic_inc(&ldops->refcount);
35841 ret = ldops;
35842 }
35843 }
35844@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
35845 unsigned long flags;
35846
35847 spin_lock_irqsave(&tty_ldisc_lock, flags);
35848- ldops->refcount--;
35849+ atomic_dec(&ldops->refcount);
35850 module_put(ldops->owner);
35851 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
35852 }
35853diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
35854index a605549..6bd3c96 100644
35855--- a/drivers/tty/vt/keyboard.c
35856+++ b/drivers/tty/vt/keyboard.c
35857@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
35858 kbd->kbdmode == VC_OFF) &&
35859 value != KVAL(K_SAK))
35860 return; /* SAK is allowed even in raw mode */
35861+
35862+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
35863+ {
35864+ void *func = fn_handler[value];
35865+ if (func == fn_show_state || func == fn_show_ptregs ||
35866+ func == fn_show_mem)
35867+ return;
35868+ }
35869+#endif
35870+
35871 fn_handler[value](vc);
35872 }
35873
35874diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
35875index 5e096f4..0da1363 100644
35876--- a/drivers/tty/vt/vt_ioctl.c
35877+++ b/drivers/tty/vt/vt_ioctl.c
35878@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
35879 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
35880 return -EFAULT;
35881
35882- if (!capable(CAP_SYS_TTY_CONFIG))
35883- perm = 0;
35884-
35885 switch (cmd) {
35886 case KDGKBENT:
35887 key_map = key_maps[s];
35888@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
35889 val = (i ? K_HOLE : K_NOSUCHMAP);
35890 return put_user(val, &user_kbe->kb_value);
35891 case KDSKBENT:
35892+ if (!capable(CAP_SYS_TTY_CONFIG))
35893+ perm = 0;
35894+
35895 if (!perm)
35896 return -EPERM;
35897 if (!i && v == K_NOSUCHMAP) {
35898@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
35899 int i, j, k;
35900 int ret;
35901
35902- if (!capable(CAP_SYS_TTY_CONFIG))
35903- perm = 0;
35904-
35905 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
35906 if (!kbs) {
35907 ret = -ENOMEM;
35908@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
35909 kfree(kbs);
35910 return ((p && *p) ? -EOVERFLOW : 0);
35911 case KDSKBSENT:
35912+ if (!capable(CAP_SYS_TTY_CONFIG))
35913+ perm = 0;
35914+
35915 if (!perm) {
35916 ret = -EPERM;
35917 goto reterr;
35918diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
35919index a783d53..cb30d94 100644
35920--- a/drivers/uio/uio.c
35921+++ b/drivers/uio/uio.c
35922@@ -25,6 +25,7 @@
35923 #include <linux/kobject.h>
35924 #include <linux/cdev.h>
35925 #include <linux/uio_driver.h>
35926+#include <asm/local.h>
35927
35928 #define UIO_MAX_DEVICES (1U << MINORBITS)
35929
35930@@ -32,10 +33,10 @@ struct uio_device {
35931 struct module *owner;
35932 struct device *dev;
35933 int minor;
35934- atomic_t event;
35935+ atomic_unchecked_t event;
35936 struct fasync_struct *async_queue;
35937 wait_queue_head_t wait;
35938- int vma_count;
35939+ local_t vma_count;
35940 struct uio_info *info;
35941 struct kobject *map_dir;
35942 struct kobject *portio_dir;
35943@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
35944 struct device_attribute *attr, char *buf)
35945 {
35946 struct uio_device *idev = dev_get_drvdata(dev);
35947- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
35948+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
35949 }
35950
35951 static struct device_attribute uio_class_attributes[] = {
35952@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
35953 {
35954 struct uio_device *idev = info->uio_dev;
35955
35956- atomic_inc(&idev->event);
35957+ atomic_inc_unchecked(&idev->event);
35958 wake_up_interruptible(&idev->wait);
35959 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
35960 }
35961@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
35962 }
35963
35964 listener->dev = idev;
35965- listener->event_count = atomic_read(&idev->event);
35966+ listener->event_count = atomic_read_unchecked(&idev->event);
35967 filep->private_data = listener;
35968
35969 if (idev->info->open) {
35970@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
35971 return -EIO;
35972
35973 poll_wait(filep, &idev->wait, wait);
35974- if (listener->event_count != atomic_read(&idev->event))
35975+ if (listener->event_count != atomic_read_unchecked(&idev->event))
35976 return POLLIN | POLLRDNORM;
35977 return 0;
35978 }
35979@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
35980 do {
35981 set_current_state(TASK_INTERRUPTIBLE);
35982
35983- event_count = atomic_read(&idev->event);
35984+ event_count = atomic_read_unchecked(&idev->event);
35985 if (event_count != listener->event_count) {
35986 if (copy_to_user(buf, &event_count, count))
35987 retval = -EFAULT;
35988@@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
35989 static void uio_vma_open(struct vm_area_struct *vma)
35990 {
35991 struct uio_device *idev = vma->vm_private_data;
35992- idev->vma_count++;
35993+ local_inc(&idev->vma_count);
35994 }
35995
35996 static void uio_vma_close(struct vm_area_struct *vma)
35997 {
35998 struct uio_device *idev = vma->vm_private_data;
35999- idev->vma_count--;
36000+ local_dec(&idev->vma_count);
36001 }
36002
36003 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
36004@@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
36005 idev->owner = owner;
36006 idev->info = info;
36007 init_waitqueue_head(&idev->wait);
36008- atomic_set(&idev->event, 0);
36009+ atomic_set_unchecked(&idev->event, 0);
36010
36011 ret = uio_get_minor(idev);
36012 if (ret)
36013diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
36014index a845f8b..4f54072 100644
36015--- a/drivers/usb/atm/cxacru.c
36016+++ b/drivers/usb/atm/cxacru.c
36017@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
36018 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
36019 if (ret < 2)
36020 return -EINVAL;
36021- if (index < 0 || index > 0x7f)
36022+ if (index > 0x7f)
36023 return -EINVAL;
36024 pos += tmp;
36025
36026diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
36027index d3448ca..d2864ca 100644
36028--- a/drivers/usb/atm/usbatm.c
36029+++ b/drivers/usb/atm/usbatm.c
36030@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36031 if (printk_ratelimit())
36032 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
36033 __func__, vpi, vci);
36034- atomic_inc(&vcc->stats->rx_err);
36035+ atomic_inc_unchecked(&vcc->stats->rx_err);
36036 return;
36037 }
36038
36039@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36040 if (length > ATM_MAX_AAL5_PDU) {
36041 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
36042 __func__, length, vcc);
36043- atomic_inc(&vcc->stats->rx_err);
36044+ atomic_inc_unchecked(&vcc->stats->rx_err);
36045 goto out;
36046 }
36047
36048@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36049 if (sarb->len < pdu_length) {
36050 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
36051 __func__, pdu_length, sarb->len, vcc);
36052- atomic_inc(&vcc->stats->rx_err);
36053+ atomic_inc_unchecked(&vcc->stats->rx_err);
36054 goto out;
36055 }
36056
36057 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
36058 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
36059 __func__, vcc);
36060- atomic_inc(&vcc->stats->rx_err);
36061+ atomic_inc_unchecked(&vcc->stats->rx_err);
36062 goto out;
36063 }
36064
36065@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36066 if (printk_ratelimit())
36067 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
36068 __func__, length);
36069- atomic_inc(&vcc->stats->rx_drop);
36070+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36071 goto out;
36072 }
36073
36074@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36075
36076 vcc->push(vcc, skb);
36077
36078- atomic_inc(&vcc->stats->rx);
36079+ atomic_inc_unchecked(&vcc->stats->rx);
36080 out:
36081 skb_trim(sarb, 0);
36082 }
36083@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
36084 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
36085
36086 usbatm_pop(vcc, skb);
36087- atomic_inc(&vcc->stats->tx);
36088+ atomic_inc_unchecked(&vcc->stats->tx);
36089
36090 skb = skb_dequeue(&instance->sndqueue);
36091 }
36092@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
36093 if (!left--)
36094 return sprintf(page,
36095 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
36096- atomic_read(&atm_dev->stats.aal5.tx),
36097- atomic_read(&atm_dev->stats.aal5.tx_err),
36098- atomic_read(&atm_dev->stats.aal5.rx),
36099- atomic_read(&atm_dev->stats.aal5.rx_err),
36100- atomic_read(&atm_dev->stats.aal5.rx_drop));
36101+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
36102+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
36103+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
36104+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
36105+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
36106
36107 if (!left--) {
36108 if (instance->disconnected)
36109diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
36110index d956965..4179a77 100644
36111--- a/drivers/usb/core/devices.c
36112+++ b/drivers/usb/core/devices.c
36113@@ -126,7 +126,7 @@ static const char format_endpt[] =
36114 * time it gets called.
36115 */
36116 static struct device_connect_event {
36117- atomic_t count;
36118+ atomic_unchecked_t count;
36119 wait_queue_head_t wait;
36120 } device_event = {
36121 .count = ATOMIC_INIT(1),
36122@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
36123
36124 void usbfs_conn_disc_event(void)
36125 {
36126- atomic_add(2, &device_event.count);
36127+ atomic_add_unchecked(2, &device_event.count);
36128 wake_up(&device_event.wait);
36129 }
36130
36131@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
36132
36133 poll_wait(file, &device_event.wait, wait);
36134
36135- event_count = atomic_read(&device_event.count);
36136+ event_count = atomic_read_unchecked(&device_event.count);
36137 if (file->f_version != event_count) {
36138 file->f_version = event_count;
36139 return POLLIN | POLLRDNORM;
36140diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
36141index b3bdfed..a9460e0 100644
36142--- a/drivers/usb/core/message.c
36143+++ b/drivers/usb/core/message.c
36144@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device *udev, int index)
36145 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
36146 if (buf) {
36147 len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
36148- if (len > 0) {
36149- smallbuf = kmalloc(++len, GFP_NOIO);
36150+ if (len++ > 0) {
36151+ smallbuf = kmalloc(len, GFP_NOIO);
36152 if (!smallbuf)
36153 return buf;
36154 memcpy(smallbuf, buf, len);
36155diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
36156index 1fc8f12..20647c1 100644
36157--- a/drivers/usb/early/ehci-dbgp.c
36158+++ b/drivers/usb/early/ehci-dbgp.c
36159@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
36160
36161 #ifdef CONFIG_KGDB
36162 static struct kgdb_io kgdbdbgp_io_ops;
36163-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
36164+static struct kgdb_io kgdbdbgp_io_ops_console;
36165+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
36166 #else
36167 #define dbgp_kgdb_mode (0)
36168 #endif
36169@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
36170 .write_char = kgdbdbgp_write_char,
36171 };
36172
36173+static struct kgdb_io kgdbdbgp_io_ops_console = {
36174+ .name = "kgdbdbgp",
36175+ .read_char = kgdbdbgp_read_char,
36176+ .write_char = kgdbdbgp_write_char,
36177+ .is_console = 1
36178+};
36179+
36180 static int kgdbdbgp_wait_time;
36181
36182 static int __init kgdbdbgp_parse_config(char *str)
36183@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
36184 ptr++;
36185 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
36186 }
36187- kgdb_register_io_module(&kgdbdbgp_io_ops);
36188- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
36189+ if (early_dbgp_console.index != -1)
36190+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
36191+ else
36192+ kgdb_register_io_module(&kgdbdbgp_io_ops);
36193
36194 return 0;
36195 }
36196diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
36197index d6bea3e..60b250e 100644
36198--- a/drivers/usb/wusbcore/wa-hc.h
36199+++ b/drivers/usb/wusbcore/wa-hc.h
36200@@ -192,7 +192,7 @@ struct wahc {
36201 struct list_head xfer_delayed_list;
36202 spinlock_t xfer_list_lock;
36203 struct work_struct xfer_work;
36204- atomic_t xfer_id_count;
36205+ atomic_unchecked_t xfer_id_count;
36206 };
36207
36208
36209@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
36210 INIT_LIST_HEAD(&wa->xfer_delayed_list);
36211 spin_lock_init(&wa->xfer_list_lock);
36212 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
36213- atomic_set(&wa->xfer_id_count, 1);
36214+ atomic_set_unchecked(&wa->xfer_id_count, 1);
36215 }
36216
36217 /**
36218diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
36219index 57c01ab..8a05959 100644
36220--- a/drivers/usb/wusbcore/wa-xfer.c
36221+++ b/drivers/usb/wusbcore/wa-xfer.c
36222@@ -296,7 +296,7 @@ out:
36223 */
36224 static void wa_xfer_id_init(struct wa_xfer *xfer)
36225 {
36226- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
36227+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
36228 }
36229
36230 /*
36231diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
36232index c14c42b..f955cc2 100644
36233--- a/drivers/vhost/vhost.c
36234+++ b/drivers/vhost/vhost.c
36235@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
36236 return 0;
36237 }
36238
36239-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
36240+static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
36241 {
36242 struct file *eventfp, *filep = NULL,
36243 *pollstart = NULL, *pollstop = NULL;
36244diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
36245index b0b2ac3..89a4399 100644
36246--- a/drivers/video/aty/aty128fb.c
36247+++ b/drivers/video/aty/aty128fb.c
36248@@ -148,7 +148,7 @@ enum {
36249 };
36250
36251 /* Must match above enum */
36252-static const char *r128_family[] __devinitdata = {
36253+static const char *r128_family[] __devinitconst = {
36254 "AGP",
36255 "PCI",
36256 "PRO AGP",
36257diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
36258index 5c3960d..15cf8fc 100644
36259--- a/drivers/video/fbcmap.c
36260+++ b/drivers/video/fbcmap.c
36261@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
36262 rc = -ENODEV;
36263 goto out;
36264 }
36265- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
36266- !info->fbops->fb_setcmap)) {
36267+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
36268 rc = -EINVAL;
36269 goto out1;
36270 }
36271diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
36272index ad93629..e020fc3 100644
36273--- a/drivers/video/fbmem.c
36274+++ b/drivers/video/fbmem.c
36275@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
36276 image->dx += image->width + 8;
36277 }
36278 } else if (rotate == FB_ROTATE_UD) {
36279- for (x = 0; x < num && image->dx >= 0; x++) {
36280+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
36281 info->fbops->fb_imageblit(info, image);
36282 image->dx -= image->width + 8;
36283 }
36284@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
36285 image->dy += image->height + 8;
36286 }
36287 } else if (rotate == FB_ROTATE_CCW) {
36288- for (x = 0; x < num && image->dy >= 0; x++) {
36289+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
36290 info->fbops->fb_imageblit(info, image);
36291 image->dy -= image->height + 8;
36292 }
36293@@ -1143,7 +1143,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
36294 return -EFAULT;
36295 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
36296 return -EINVAL;
36297- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
36298+ if (con2fb.framebuffer >= FB_MAX)
36299 return -EINVAL;
36300 if (!registered_fb[con2fb.framebuffer])
36301 request_module("fb%d", con2fb.framebuffer);
36302diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
36303index 5a5d092..265c5ed 100644
36304--- a/drivers/video/geode/gx1fb_core.c
36305+++ b/drivers/video/geode/gx1fb_core.c
36306@@ -29,7 +29,7 @@ static int crt_option = 1;
36307 static char panel_option[32] = "";
36308
36309 /* Modes relevant to the GX1 (taken from modedb.c) */
36310-static const struct fb_videomode __devinitdata gx1_modedb[] = {
36311+static const struct fb_videomode __devinitconst gx1_modedb[] = {
36312 /* 640x480-60 VESA */
36313 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
36314 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
36315diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
36316index 0fad23f..0e9afa4 100644
36317--- a/drivers/video/gxt4500.c
36318+++ b/drivers/video/gxt4500.c
36319@@ -156,7 +156,7 @@ struct gxt4500_par {
36320 static char *mode_option;
36321
36322 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
36323-static const struct fb_videomode defaultmode __devinitdata = {
36324+static const struct fb_videomode defaultmode __devinitconst = {
36325 .refresh = 60,
36326 .xres = 1280,
36327 .yres = 1024,
36328@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
36329 return 0;
36330 }
36331
36332-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
36333+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
36334 .id = "IBM GXT4500P",
36335 .type = FB_TYPE_PACKED_PIXELS,
36336 .visual = FB_VISUAL_PSEUDOCOLOR,
36337diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
36338index 7672d2e..b56437f 100644
36339--- a/drivers/video/i810/i810_accel.c
36340+++ b/drivers/video/i810/i810_accel.c
36341@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
36342 }
36343 }
36344 printk("ringbuffer lockup!!!\n");
36345+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
36346 i810_report_error(mmio);
36347 par->dev_flags |= LOCKUP;
36348 info->pixmap.scan_align = 1;
36349diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
36350index 318f6fb..9a389c1 100644
36351--- a/drivers/video/i810/i810_main.c
36352+++ b/drivers/video/i810/i810_main.c
36353@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
36354 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
36355
36356 /* PCI */
36357-static const char *i810_pci_list[] __devinitdata = {
36358+static const char *i810_pci_list[] __devinitconst = {
36359 "Intel(R) 810 Framebuffer Device" ,
36360 "Intel(R) 810-DC100 Framebuffer Device" ,
36361 "Intel(R) 810E Framebuffer Device" ,
36362diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
36363index de36693..3c63fc2 100644
36364--- a/drivers/video/jz4740_fb.c
36365+++ b/drivers/video/jz4740_fb.c
36366@@ -136,7 +136,7 @@ struct jzfb {
36367 uint32_t pseudo_palette[16];
36368 };
36369
36370-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
36371+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
36372 .id = "JZ4740 FB",
36373 .type = FB_TYPE_PACKED_PIXELS,
36374 .visual = FB_VISUAL_TRUECOLOR,
36375diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
36376index 3c14e43..eafa544 100644
36377--- a/drivers/video/logo/logo_linux_clut224.ppm
36378+++ b/drivers/video/logo/logo_linux_clut224.ppm
36379@@ -1,1604 +1,1123 @@
36380 P3
36381-# Standard 224-color Linux logo
36382 80 80
36383 255
36384- 0 0 0 0 0 0 0 0 0 0 0 0
36385- 0 0 0 0 0 0 0 0 0 0 0 0
36386- 0 0 0 0 0 0 0 0 0 0 0 0
36387- 0 0 0 0 0 0 0 0 0 0 0 0
36388- 0 0 0 0 0 0 0 0 0 0 0 0
36389- 0 0 0 0 0 0 0 0 0 0 0 0
36390- 0 0 0 0 0 0 0 0 0 0 0 0
36391- 0 0 0 0 0 0 0 0 0 0 0 0
36392- 0 0 0 0 0 0 0 0 0 0 0 0
36393- 6 6 6 6 6 6 10 10 10 10 10 10
36394- 10 10 10 6 6 6 6 6 6 6 6 6
36395- 0 0 0 0 0 0 0 0 0 0 0 0
36396- 0 0 0 0 0 0 0 0 0 0 0 0
36397- 0 0 0 0 0 0 0 0 0 0 0 0
36398- 0 0 0 0 0 0 0 0 0 0 0 0
36399- 0 0 0 0 0 0 0 0 0 0 0 0
36400- 0 0 0 0 0 0 0 0 0 0 0 0
36401- 0 0 0 0 0 0 0 0 0 0 0 0
36402- 0 0 0 0 0 0 0 0 0 0 0 0
36403- 0 0 0 0 0 0 0 0 0 0 0 0
36404- 0 0 0 0 0 0 0 0 0 0 0 0
36405- 0 0 0 0 0 0 0 0 0 0 0 0
36406- 0 0 0 0 0 0 0 0 0 0 0 0
36407- 0 0 0 0 0 0 0 0 0 0 0 0
36408- 0 0 0 0 0 0 0 0 0 0 0 0
36409- 0 0 0 0 0 0 0 0 0 0 0 0
36410- 0 0 0 0 0 0 0 0 0 0 0 0
36411- 0 0 0 0 0 0 0 0 0 0 0 0
36412- 0 0 0 6 6 6 10 10 10 14 14 14
36413- 22 22 22 26 26 26 30 30 30 34 34 34
36414- 30 30 30 30 30 30 26 26 26 18 18 18
36415- 14 14 14 10 10 10 6 6 6 0 0 0
36416- 0 0 0 0 0 0 0 0 0 0 0 0
36417- 0 0 0 0 0 0 0 0 0 0 0 0
36418- 0 0 0 0 0 0 0 0 0 0 0 0
36419- 0 0 0 0 0 0 0 0 0 0 0 0
36420- 0 0 0 0 0 0 0 0 0 0 0 0
36421- 0 0 0 0 0 0 0 0 0 0 0 0
36422- 0 0 0 0 0 0 0 0 0 0 0 0
36423- 0 0 0 0 0 0 0 0 0 0 0 0
36424- 0 0 0 0 0 0 0 0 0 0 0 0
36425- 0 0 0 0 0 1 0 0 1 0 0 0
36426- 0 0 0 0 0 0 0 0 0 0 0 0
36427- 0 0 0 0 0 0 0 0 0 0 0 0
36428- 0 0 0 0 0 0 0 0 0 0 0 0
36429- 0 0 0 0 0 0 0 0 0 0 0 0
36430- 0 0 0 0 0 0 0 0 0 0 0 0
36431- 0 0 0 0 0 0 0 0 0 0 0 0
36432- 6 6 6 14 14 14 26 26 26 42 42 42
36433- 54 54 54 66 66 66 78 78 78 78 78 78
36434- 78 78 78 74 74 74 66 66 66 54 54 54
36435- 42 42 42 26 26 26 18 18 18 10 10 10
36436- 6 6 6 0 0 0 0 0 0 0 0 0
36437- 0 0 0 0 0 0 0 0 0 0 0 0
36438- 0 0 0 0 0 0 0 0 0 0 0 0
36439- 0 0 0 0 0 0 0 0 0 0 0 0
36440- 0 0 0 0 0 0 0 0 0 0 0 0
36441- 0 0 0 0 0 0 0 0 0 0 0 0
36442- 0 0 0 0 0 0 0 0 0 0 0 0
36443- 0 0 0 0 0 0 0 0 0 0 0 0
36444- 0 0 0 0 0 0 0 0 0 0 0 0
36445- 0 0 1 0 0 0 0 0 0 0 0 0
36446- 0 0 0 0 0 0 0 0 0 0 0 0
36447- 0 0 0 0 0 0 0 0 0 0 0 0
36448- 0 0 0 0 0 0 0 0 0 0 0 0
36449- 0 0 0 0 0 0 0 0 0 0 0 0
36450- 0 0 0 0 0 0 0 0 0 0 0 0
36451- 0 0 0 0 0 0 0 0 0 10 10 10
36452- 22 22 22 42 42 42 66 66 66 86 86 86
36453- 66 66 66 38 38 38 38 38 38 22 22 22
36454- 26 26 26 34 34 34 54 54 54 66 66 66
36455- 86 86 86 70 70 70 46 46 46 26 26 26
36456- 14 14 14 6 6 6 0 0 0 0 0 0
36457- 0 0 0 0 0 0 0 0 0 0 0 0
36458- 0 0 0 0 0 0 0 0 0 0 0 0
36459- 0 0 0 0 0 0 0 0 0 0 0 0
36460- 0 0 0 0 0 0 0 0 0 0 0 0
36461- 0 0 0 0 0 0 0 0 0 0 0 0
36462- 0 0 0 0 0 0 0 0 0 0 0 0
36463- 0 0 0 0 0 0 0 0 0 0 0 0
36464- 0 0 0 0 0 0 0 0 0 0 0 0
36465- 0 0 1 0 0 1 0 0 1 0 0 0
36466- 0 0 0 0 0 0 0 0 0 0 0 0
36467- 0 0 0 0 0 0 0 0 0 0 0 0
36468- 0 0 0 0 0 0 0 0 0 0 0 0
36469- 0 0 0 0 0 0 0 0 0 0 0 0
36470- 0 0 0 0 0 0 0 0 0 0 0 0
36471- 0 0 0 0 0 0 10 10 10 26 26 26
36472- 50 50 50 82 82 82 58 58 58 6 6 6
36473- 2 2 6 2 2 6 2 2 6 2 2 6
36474- 2 2 6 2 2 6 2 2 6 2 2 6
36475- 6 6 6 54 54 54 86 86 86 66 66 66
36476- 38 38 38 18 18 18 6 6 6 0 0 0
36477- 0 0 0 0 0 0 0 0 0 0 0 0
36478- 0 0 0 0 0 0 0 0 0 0 0 0
36479- 0 0 0 0 0 0 0 0 0 0 0 0
36480- 0 0 0 0 0 0 0 0 0 0 0 0
36481- 0 0 0 0 0 0 0 0 0 0 0 0
36482- 0 0 0 0 0 0 0 0 0 0 0 0
36483- 0 0 0 0 0 0 0 0 0 0 0 0
36484- 0 0 0 0 0 0 0 0 0 0 0 0
36485- 0 0 0 0 0 0 0 0 0 0 0 0
36486- 0 0 0 0 0 0 0 0 0 0 0 0
36487- 0 0 0 0 0 0 0 0 0 0 0 0
36488- 0 0 0 0 0 0 0 0 0 0 0 0
36489- 0 0 0 0 0 0 0 0 0 0 0 0
36490- 0 0 0 0 0 0 0 0 0 0 0 0
36491- 0 0 0 6 6 6 22 22 22 50 50 50
36492- 78 78 78 34 34 34 2 2 6 2 2 6
36493- 2 2 6 2 2 6 2 2 6 2 2 6
36494- 2 2 6 2 2 6 2 2 6 2 2 6
36495- 2 2 6 2 2 6 6 6 6 70 70 70
36496- 78 78 78 46 46 46 22 22 22 6 6 6
36497- 0 0 0 0 0 0 0 0 0 0 0 0
36498- 0 0 0 0 0 0 0 0 0 0 0 0
36499- 0 0 0 0 0 0 0 0 0 0 0 0
36500- 0 0 0 0 0 0 0 0 0 0 0 0
36501- 0 0 0 0 0 0 0 0 0 0 0 0
36502- 0 0 0 0 0 0 0 0 0 0 0 0
36503- 0 0 0 0 0 0 0 0 0 0 0 0
36504- 0 0 0 0 0 0 0 0 0 0 0 0
36505- 0 0 1 0 0 1 0 0 1 0 0 0
36506- 0 0 0 0 0 0 0 0 0 0 0 0
36507- 0 0 0 0 0 0 0 0 0 0 0 0
36508- 0 0 0 0 0 0 0 0 0 0 0 0
36509- 0 0 0 0 0 0 0 0 0 0 0 0
36510- 0 0 0 0 0 0 0 0 0 0 0 0
36511- 6 6 6 18 18 18 42 42 42 82 82 82
36512- 26 26 26 2 2 6 2 2 6 2 2 6
36513- 2 2 6 2 2 6 2 2 6 2 2 6
36514- 2 2 6 2 2 6 2 2 6 14 14 14
36515- 46 46 46 34 34 34 6 6 6 2 2 6
36516- 42 42 42 78 78 78 42 42 42 18 18 18
36517- 6 6 6 0 0 0 0 0 0 0 0 0
36518- 0 0 0 0 0 0 0 0 0 0 0 0
36519- 0 0 0 0 0 0 0 0 0 0 0 0
36520- 0 0 0 0 0 0 0 0 0 0 0 0
36521- 0 0 0 0 0 0 0 0 0 0 0 0
36522- 0 0 0 0 0 0 0 0 0 0 0 0
36523- 0 0 0 0 0 0 0 0 0 0 0 0
36524- 0 0 0 0 0 0 0 0 0 0 0 0
36525- 0 0 1 0 0 0 0 0 1 0 0 0
36526- 0 0 0 0 0 0 0 0 0 0 0 0
36527- 0 0 0 0 0 0 0 0 0 0 0 0
36528- 0 0 0 0 0 0 0 0 0 0 0 0
36529- 0 0 0 0 0 0 0 0 0 0 0 0
36530- 0 0 0 0 0 0 0 0 0 0 0 0
36531- 10 10 10 30 30 30 66 66 66 58 58 58
36532- 2 2 6 2 2 6 2 2 6 2 2 6
36533- 2 2 6 2 2 6 2 2 6 2 2 6
36534- 2 2 6 2 2 6 2 2 6 26 26 26
36535- 86 86 86 101 101 101 46 46 46 10 10 10
36536- 2 2 6 58 58 58 70 70 70 34 34 34
36537- 10 10 10 0 0 0 0 0 0 0 0 0
36538- 0 0 0 0 0 0 0 0 0 0 0 0
36539- 0 0 0 0 0 0 0 0 0 0 0 0
36540- 0 0 0 0 0 0 0 0 0 0 0 0
36541- 0 0 0 0 0 0 0 0 0 0 0 0
36542- 0 0 0 0 0 0 0 0 0 0 0 0
36543- 0 0 0 0 0 0 0 0 0 0 0 0
36544- 0 0 0 0 0 0 0 0 0 0 0 0
36545- 0 0 1 0 0 1 0 0 1 0 0 0
36546- 0 0 0 0 0 0 0 0 0 0 0 0
36547- 0 0 0 0 0 0 0 0 0 0 0 0
36548- 0 0 0 0 0 0 0 0 0 0 0 0
36549- 0 0 0 0 0 0 0 0 0 0 0 0
36550- 0 0 0 0 0 0 0 0 0 0 0 0
36551- 14 14 14 42 42 42 86 86 86 10 10 10
36552- 2 2 6 2 2 6 2 2 6 2 2 6
36553- 2 2 6 2 2 6 2 2 6 2 2 6
36554- 2 2 6 2 2 6 2 2 6 30 30 30
36555- 94 94 94 94 94 94 58 58 58 26 26 26
36556- 2 2 6 6 6 6 78 78 78 54 54 54
36557- 22 22 22 6 6 6 0 0 0 0 0 0
36558- 0 0 0 0 0 0 0 0 0 0 0 0
36559- 0 0 0 0 0 0 0 0 0 0 0 0
36560- 0 0 0 0 0 0 0 0 0 0 0 0
36561- 0 0 0 0 0 0 0 0 0 0 0 0
36562- 0 0 0 0 0 0 0 0 0 0 0 0
36563- 0 0 0 0 0 0 0 0 0 0 0 0
36564- 0 0 0 0 0 0 0 0 0 0 0 0
36565- 0 0 0 0 0 0 0 0 0 0 0 0
36566- 0 0 0 0 0 0 0 0 0 0 0 0
36567- 0 0 0 0 0 0 0 0 0 0 0 0
36568- 0 0 0 0 0 0 0 0 0 0 0 0
36569- 0 0 0 0 0 0 0 0 0 0 0 0
36570- 0 0 0 0 0 0 0 0 0 6 6 6
36571- 22 22 22 62 62 62 62 62 62 2 2 6
36572- 2 2 6 2 2 6 2 2 6 2 2 6
36573- 2 2 6 2 2 6 2 2 6 2 2 6
36574- 2 2 6 2 2 6 2 2 6 26 26 26
36575- 54 54 54 38 38 38 18 18 18 10 10 10
36576- 2 2 6 2 2 6 34 34 34 82 82 82
36577- 38 38 38 14 14 14 0 0 0 0 0 0
36578- 0 0 0 0 0 0 0 0 0 0 0 0
36579- 0 0 0 0 0 0 0 0 0 0 0 0
36580- 0 0 0 0 0 0 0 0 0 0 0 0
36581- 0 0 0 0 0 0 0 0 0 0 0 0
36582- 0 0 0 0 0 0 0 0 0 0 0 0
36583- 0 0 0 0 0 0 0 0 0 0 0 0
36584- 0 0 0 0 0 0 0 0 0 0 0 0
36585- 0 0 0 0 0 1 0 0 1 0 0 0
36586- 0 0 0 0 0 0 0 0 0 0 0 0
36587- 0 0 0 0 0 0 0 0 0 0 0 0
36588- 0 0 0 0 0 0 0 0 0 0 0 0
36589- 0 0 0 0 0 0 0 0 0 0 0 0
36590- 0 0 0 0 0 0 0 0 0 6 6 6
36591- 30 30 30 78 78 78 30 30 30 2 2 6
36592- 2 2 6 2 2 6 2 2 6 2 2 6
36593- 2 2 6 2 2 6 2 2 6 2 2 6
36594- 2 2 6 2 2 6 2 2 6 10 10 10
36595- 10 10 10 2 2 6 2 2 6 2 2 6
36596- 2 2 6 2 2 6 2 2 6 78 78 78
36597- 50 50 50 18 18 18 6 6 6 0 0 0
36598- 0 0 0 0 0 0 0 0 0 0 0 0
36599- 0 0 0 0 0 0 0 0 0 0 0 0
36600- 0 0 0 0 0 0 0 0 0 0 0 0
36601- 0 0 0 0 0 0 0 0 0 0 0 0
36602- 0 0 0 0 0 0 0 0 0 0 0 0
36603- 0 0 0 0 0 0 0 0 0 0 0 0
36604- 0 0 0 0 0 0 0 0 0 0 0 0
36605- 0 0 1 0 0 0 0 0 0 0 0 0
36606- 0 0 0 0 0 0 0 0 0 0 0 0
36607- 0 0 0 0 0 0 0 0 0 0 0 0
36608- 0 0 0 0 0 0 0 0 0 0 0 0
36609- 0 0 0 0 0 0 0 0 0 0 0 0
36610- 0 0 0 0 0 0 0 0 0 10 10 10
36611- 38 38 38 86 86 86 14 14 14 2 2 6
36612- 2 2 6 2 2 6 2 2 6 2 2 6
36613- 2 2 6 2 2 6 2 2 6 2 2 6
36614- 2 2 6 2 2 6 2 2 6 2 2 6
36615- 2 2 6 2 2 6 2 2 6 2 2 6
36616- 2 2 6 2 2 6 2 2 6 54 54 54
36617- 66 66 66 26 26 26 6 6 6 0 0 0
36618- 0 0 0 0 0 0 0 0 0 0 0 0
36619- 0 0 0 0 0 0 0 0 0 0 0 0
36620- 0 0 0 0 0 0 0 0 0 0 0 0
36621- 0 0 0 0 0 0 0 0 0 0 0 0
36622- 0 0 0 0 0 0 0 0 0 0 0 0
36623- 0 0 0 0 0 0 0 0 0 0 0 0
36624- 0 0 0 0 0 0 0 0 0 0 0 0
36625- 0 0 0 0 0 1 0 0 1 0 0 0
36626- 0 0 0 0 0 0 0 0 0 0 0 0
36627- 0 0 0 0 0 0 0 0 0 0 0 0
36628- 0 0 0 0 0 0 0 0 0 0 0 0
36629- 0 0 0 0 0 0 0 0 0 0 0 0
36630- 0 0 0 0 0 0 0 0 0 14 14 14
36631- 42 42 42 82 82 82 2 2 6 2 2 6
36632- 2 2 6 6 6 6 10 10 10 2 2 6
36633- 2 2 6 2 2 6 2 2 6 2 2 6
36634- 2 2 6 2 2 6 2 2 6 6 6 6
36635- 14 14 14 10 10 10 2 2 6 2 2 6
36636- 2 2 6 2 2 6 2 2 6 18 18 18
36637- 82 82 82 34 34 34 10 10 10 0 0 0
36638- 0 0 0 0 0 0 0 0 0 0 0 0
36639- 0 0 0 0 0 0 0 0 0 0 0 0
36640- 0 0 0 0 0 0 0 0 0 0 0 0
36641- 0 0 0 0 0 0 0 0 0 0 0 0
36642- 0 0 0 0 0 0 0 0 0 0 0 0
36643- 0 0 0 0 0 0 0 0 0 0 0 0
36644- 0 0 0 0 0 0 0 0 0 0 0 0
36645- 0 0 1 0 0 0 0 0 0 0 0 0
36646- 0 0 0 0 0 0 0 0 0 0 0 0
36647- 0 0 0 0 0 0 0 0 0 0 0 0
36648- 0 0 0 0 0 0 0 0 0 0 0 0
36649- 0 0 0 0 0 0 0 0 0 0 0 0
36650- 0 0 0 0 0 0 0 0 0 14 14 14
36651- 46 46 46 86 86 86 2 2 6 2 2 6
36652- 6 6 6 6 6 6 22 22 22 34 34 34
36653- 6 6 6 2 2 6 2 2 6 2 2 6
36654- 2 2 6 2 2 6 18 18 18 34 34 34
36655- 10 10 10 50 50 50 22 22 22 2 2 6
36656- 2 2 6 2 2 6 2 2 6 10 10 10
36657- 86 86 86 42 42 42 14 14 14 0 0 0
36658- 0 0 0 0 0 0 0 0 0 0 0 0
36659- 0 0 0 0 0 0 0 0 0 0 0 0
36660- 0 0 0 0 0 0 0 0 0 0 0 0
36661- 0 0 0 0 0 0 0 0 0 0 0 0
36662- 0 0 0 0 0 0 0 0 0 0 0 0
36663- 0 0 0 0 0 0 0 0 0 0 0 0
36664- 0 0 0 0 0 0 0 0 0 0 0 0
36665- 0 0 1 0 0 1 0 0 1 0 0 0
36666- 0 0 0 0 0 0 0 0 0 0 0 0
36667- 0 0 0 0 0 0 0 0 0 0 0 0
36668- 0 0 0 0 0 0 0 0 0 0 0 0
36669- 0 0 0 0 0 0 0 0 0 0 0 0
36670- 0 0 0 0 0 0 0 0 0 14 14 14
36671- 46 46 46 86 86 86 2 2 6 2 2 6
36672- 38 38 38 116 116 116 94 94 94 22 22 22
36673- 22 22 22 2 2 6 2 2 6 2 2 6
36674- 14 14 14 86 86 86 138 138 138 162 162 162
36675-154 154 154 38 38 38 26 26 26 6 6 6
36676- 2 2 6 2 2 6 2 2 6 2 2 6
36677- 86 86 86 46 46 46 14 14 14 0 0 0
36678- 0 0 0 0 0 0 0 0 0 0 0 0
36679- 0 0 0 0 0 0 0 0 0 0 0 0
36680- 0 0 0 0 0 0 0 0 0 0 0 0
36681- 0 0 0 0 0 0 0 0 0 0 0 0
36682- 0 0 0 0 0 0 0 0 0 0 0 0
36683- 0 0 0 0 0 0 0 0 0 0 0 0
36684- 0 0 0 0 0 0 0 0 0 0 0 0
36685- 0 0 0 0 0 0 0 0 0 0 0 0
36686- 0 0 0 0 0 0 0 0 0 0 0 0
36687- 0 0 0 0 0 0 0 0 0 0 0 0
36688- 0 0 0 0 0 0 0 0 0 0 0 0
36689- 0 0 0 0 0 0 0 0 0 0 0 0
36690- 0 0 0 0 0 0 0 0 0 14 14 14
36691- 46 46 46 86 86 86 2 2 6 14 14 14
36692-134 134 134 198 198 198 195 195 195 116 116 116
36693- 10 10 10 2 2 6 2 2 6 6 6 6
36694-101 98 89 187 187 187 210 210 210 218 218 218
36695-214 214 214 134 134 134 14 14 14 6 6 6
36696- 2 2 6 2 2 6 2 2 6 2 2 6
36697- 86 86 86 50 50 50 18 18 18 6 6 6
36698- 0 0 0 0 0 0 0 0 0 0 0 0
36699- 0 0 0 0 0 0 0 0 0 0 0 0
36700- 0 0 0 0 0 0 0 0 0 0 0 0
36701- 0 0 0 0 0 0 0 0 0 0 0 0
36702- 0 0 0 0 0 0 0 0 0 0 0 0
36703- 0 0 0 0 0 0 0 0 0 0 0 0
36704- 0 0 0 0 0 0 0 0 1 0 0 0
36705- 0 0 1 0 0 1 0 0 1 0 0 0
36706- 0 0 0 0 0 0 0 0 0 0 0 0
36707- 0 0 0 0 0 0 0 0 0 0 0 0
36708- 0 0 0 0 0 0 0 0 0 0 0 0
36709- 0 0 0 0 0 0 0 0 0 0 0 0
36710- 0 0 0 0 0 0 0 0 0 14 14 14
36711- 46 46 46 86 86 86 2 2 6 54 54 54
36712-218 218 218 195 195 195 226 226 226 246 246 246
36713- 58 58 58 2 2 6 2 2 6 30 30 30
36714-210 210 210 253 253 253 174 174 174 123 123 123
36715-221 221 221 234 234 234 74 74 74 2 2 6
36716- 2 2 6 2 2 6 2 2 6 2 2 6
36717- 70 70 70 58 58 58 22 22 22 6 6 6
36718- 0 0 0 0 0 0 0 0 0 0 0 0
36719- 0 0 0 0 0 0 0 0 0 0 0 0
36720- 0 0 0 0 0 0 0 0 0 0 0 0
36721- 0 0 0 0 0 0 0 0 0 0 0 0
36722- 0 0 0 0 0 0 0 0 0 0 0 0
36723- 0 0 0 0 0 0 0 0 0 0 0 0
36724- 0 0 0 0 0 0 0 0 0 0 0 0
36725- 0 0 0 0 0 0 0 0 0 0 0 0
36726- 0 0 0 0 0 0 0 0 0 0 0 0
36727- 0 0 0 0 0 0 0 0 0 0 0 0
36728- 0 0 0 0 0 0 0 0 0 0 0 0
36729- 0 0 0 0 0 0 0 0 0 0 0 0
36730- 0 0 0 0 0 0 0 0 0 14 14 14
36731- 46 46 46 82 82 82 2 2 6 106 106 106
36732-170 170 170 26 26 26 86 86 86 226 226 226
36733-123 123 123 10 10 10 14 14 14 46 46 46
36734-231 231 231 190 190 190 6 6 6 70 70 70
36735- 90 90 90 238 238 238 158 158 158 2 2 6
36736- 2 2 6 2 2 6 2 2 6 2 2 6
36737- 70 70 70 58 58 58 22 22 22 6 6 6
36738- 0 0 0 0 0 0 0 0 0 0 0 0
36739- 0 0 0 0 0 0 0 0 0 0 0 0
36740- 0 0 0 0 0 0 0 0 0 0 0 0
36741- 0 0 0 0 0 0 0 0 0 0 0 0
36742- 0 0 0 0 0 0 0 0 0 0 0 0
36743- 0 0 0 0 0 0 0 0 0 0 0 0
36744- 0 0 0 0 0 0 0 0 1 0 0 0
36745- 0 0 1 0 0 1 0 0 1 0 0 0
36746- 0 0 0 0 0 0 0 0 0 0 0 0
36747- 0 0 0 0 0 0 0 0 0 0 0 0
36748- 0 0 0 0 0 0 0 0 0 0 0 0
36749- 0 0 0 0 0 0 0 0 0 0 0 0
36750- 0 0 0 0 0 0 0 0 0 14 14 14
36751- 42 42 42 86 86 86 6 6 6 116 116 116
36752-106 106 106 6 6 6 70 70 70 149 149 149
36753-128 128 128 18 18 18 38 38 38 54 54 54
36754-221 221 221 106 106 106 2 2 6 14 14 14
36755- 46 46 46 190 190 190 198 198 198 2 2 6
36756- 2 2 6 2 2 6 2 2 6 2 2 6
36757- 74 74 74 62 62 62 22 22 22 6 6 6
36758- 0 0 0 0 0 0 0 0 0 0 0 0
36759- 0 0 0 0 0 0 0 0 0 0 0 0
36760- 0 0 0 0 0 0 0 0 0 0 0 0
36761- 0 0 0 0 0 0 0 0 0 0 0 0
36762- 0 0 0 0 0 0 0 0 0 0 0 0
36763- 0 0 0 0 0 0 0 0 0 0 0 0
36764- 0 0 0 0 0 0 0 0 1 0 0 0
36765- 0 0 1 0 0 0 0 0 1 0 0 0
36766- 0 0 0 0 0 0 0 0 0 0 0 0
36767- 0 0 0 0 0 0 0 0 0 0 0 0
36768- 0 0 0 0 0 0 0 0 0 0 0 0
36769- 0 0 0 0 0 0 0 0 0 0 0 0
36770- 0 0 0 0 0 0 0 0 0 14 14 14
36771- 42 42 42 94 94 94 14 14 14 101 101 101
36772-128 128 128 2 2 6 18 18 18 116 116 116
36773-118 98 46 121 92 8 121 92 8 98 78 10
36774-162 162 162 106 106 106 2 2 6 2 2 6
36775- 2 2 6 195 195 195 195 195 195 6 6 6
36776- 2 2 6 2 2 6 2 2 6 2 2 6
36777- 74 74 74 62 62 62 22 22 22 6 6 6
36778- 0 0 0 0 0 0 0 0 0 0 0 0
36779- 0 0 0 0 0 0 0 0 0 0 0 0
36780- 0 0 0 0 0 0 0 0 0 0 0 0
36781- 0 0 0 0 0 0 0 0 0 0 0 0
36782- 0 0 0 0 0 0 0 0 0 0 0 0
36783- 0 0 0 0 0 0 0 0 0 0 0 0
36784- 0 0 0 0 0 0 0 0 1 0 0 1
36785- 0 0 1 0 0 0 0 0 1 0 0 0
36786- 0 0 0 0 0 0 0 0 0 0 0 0
36787- 0 0 0 0 0 0 0 0 0 0 0 0
36788- 0 0 0 0 0 0 0 0 0 0 0 0
36789- 0 0 0 0 0 0 0 0 0 0 0 0
36790- 0 0 0 0 0 0 0 0 0 10 10 10
36791- 38 38 38 90 90 90 14 14 14 58 58 58
36792-210 210 210 26 26 26 54 38 6 154 114 10
36793-226 170 11 236 186 11 225 175 15 184 144 12
36794-215 174 15 175 146 61 37 26 9 2 2 6
36795- 70 70 70 246 246 246 138 138 138 2 2 6
36796- 2 2 6 2 2 6 2 2 6 2 2 6
36797- 70 70 70 66 66 66 26 26 26 6 6 6
36798- 0 0 0 0 0 0 0 0 0 0 0 0
36799- 0 0 0 0 0 0 0 0 0 0 0 0
36800- 0 0 0 0 0 0 0 0 0 0 0 0
36801- 0 0 0 0 0 0 0 0 0 0 0 0
36802- 0 0 0 0 0 0 0 0 0 0 0 0
36803- 0 0 0 0 0 0 0 0 0 0 0 0
36804- 0 0 0 0 0 0 0 0 0 0 0 0
36805- 0 0 0 0 0 0 0 0 0 0 0 0
36806- 0 0 0 0 0 0 0 0 0 0 0 0
36807- 0 0 0 0 0 0 0 0 0 0 0 0
36808- 0 0 0 0 0 0 0 0 0 0 0 0
36809- 0 0 0 0 0 0 0 0 0 0 0 0
36810- 0 0 0 0 0 0 0 0 0 10 10 10
36811- 38 38 38 86 86 86 14 14 14 10 10 10
36812-195 195 195 188 164 115 192 133 9 225 175 15
36813-239 182 13 234 190 10 232 195 16 232 200 30
36814-245 207 45 241 208 19 232 195 16 184 144 12
36815-218 194 134 211 206 186 42 42 42 2 2 6
36816- 2 2 6 2 2 6 2 2 6 2 2 6
36817- 50 50 50 74 74 74 30 30 30 6 6 6
36818- 0 0 0 0 0 0 0 0 0 0 0 0
36819- 0 0 0 0 0 0 0 0 0 0 0 0
36820- 0 0 0 0 0 0 0 0 0 0 0 0
36821- 0 0 0 0 0 0 0 0 0 0 0 0
36822- 0 0 0 0 0 0 0 0 0 0 0 0
36823- 0 0 0 0 0 0 0 0 0 0 0 0
36824- 0 0 0 0 0 0 0 0 0 0 0 0
36825- 0 0 0 0 0 0 0 0 0 0 0 0
36826- 0 0 0 0 0 0 0 0 0 0 0 0
36827- 0 0 0 0 0 0 0 0 0 0 0 0
36828- 0 0 0 0 0 0 0 0 0 0 0 0
36829- 0 0 0 0 0 0 0 0 0 0 0 0
36830- 0 0 0 0 0 0 0 0 0 10 10 10
36831- 34 34 34 86 86 86 14 14 14 2 2 6
36832-121 87 25 192 133 9 219 162 10 239 182 13
36833-236 186 11 232 195 16 241 208 19 244 214 54
36834-246 218 60 246 218 38 246 215 20 241 208 19
36835-241 208 19 226 184 13 121 87 25 2 2 6
36836- 2 2 6 2 2 6 2 2 6 2 2 6
36837- 50 50 50 82 82 82 34 34 34 10 10 10
36838- 0 0 0 0 0 0 0 0 0 0 0 0
36839- 0 0 0 0 0 0 0 0 0 0 0 0
36840- 0 0 0 0 0 0 0 0 0 0 0 0
36841- 0 0 0 0 0 0 0 0 0 0 0 0
36842- 0 0 0 0 0 0 0 0 0 0 0 0
36843- 0 0 0 0 0 0 0 0 0 0 0 0
36844- 0 0 0 0 0 0 0 0 0 0 0 0
36845- 0 0 0 0 0 0 0 0 0 0 0 0
36846- 0 0 0 0 0 0 0 0 0 0 0 0
36847- 0 0 0 0 0 0 0 0 0 0 0 0
36848- 0 0 0 0 0 0 0 0 0 0 0 0
36849- 0 0 0 0 0 0 0 0 0 0 0 0
36850- 0 0 0 0 0 0 0 0 0 10 10 10
36851- 34 34 34 82 82 82 30 30 30 61 42 6
36852-180 123 7 206 145 10 230 174 11 239 182 13
36853-234 190 10 238 202 15 241 208 19 246 218 74
36854-246 218 38 246 215 20 246 215 20 246 215 20
36855-226 184 13 215 174 15 184 144 12 6 6 6
36856- 2 2 6 2 2 6 2 2 6 2 2 6
36857- 26 26 26 94 94 94 42 42 42 14 14 14
36858- 0 0 0 0 0 0 0 0 0 0 0 0
36859- 0 0 0 0 0 0 0 0 0 0 0 0
36860- 0 0 0 0 0 0 0 0 0 0 0 0
36861- 0 0 0 0 0 0 0 0 0 0 0 0
36862- 0 0 0 0 0 0 0 0 0 0 0 0
36863- 0 0 0 0 0 0 0 0 0 0 0 0
36864- 0 0 0 0 0 0 0 0 0 0 0 0
36865- 0 0 0 0 0 0 0 0 0 0 0 0
36866- 0 0 0 0 0 0 0 0 0 0 0 0
36867- 0 0 0 0 0 0 0 0 0 0 0 0
36868- 0 0 0 0 0 0 0 0 0 0 0 0
36869- 0 0 0 0 0 0 0 0 0 0 0 0
36870- 0 0 0 0 0 0 0 0 0 10 10 10
36871- 30 30 30 78 78 78 50 50 50 104 69 6
36872-192 133 9 216 158 10 236 178 12 236 186 11
36873-232 195 16 241 208 19 244 214 54 245 215 43
36874-246 215 20 246 215 20 241 208 19 198 155 10
36875-200 144 11 216 158 10 156 118 10 2 2 6
36876- 2 2 6 2 2 6 2 2 6 2 2 6
36877- 6 6 6 90 90 90 54 54 54 18 18 18
36878- 6 6 6 0 0 0 0 0 0 0 0 0
36879- 0 0 0 0 0 0 0 0 0 0 0 0
36880- 0 0 0 0 0 0 0 0 0 0 0 0
36881- 0 0 0 0 0 0 0 0 0 0 0 0
36882- 0 0 0 0 0 0 0 0 0 0 0 0
36883- 0 0 0 0 0 0 0 0 0 0 0 0
36884- 0 0 0 0 0 0 0 0 0 0 0 0
36885- 0 0 0 0 0 0 0 0 0 0 0 0
36886- 0 0 0 0 0 0 0 0 0 0 0 0
36887- 0 0 0 0 0 0 0 0 0 0 0 0
36888- 0 0 0 0 0 0 0 0 0 0 0 0
36889- 0 0 0 0 0 0 0 0 0 0 0 0
36890- 0 0 0 0 0 0 0 0 0 10 10 10
36891- 30 30 30 78 78 78 46 46 46 22 22 22
36892-137 92 6 210 162 10 239 182 13 238 190 10
36893-238 202 15 241 208 19 246 215 20 246 215 20
36894-241 208 19 203 166 17 185 133 11 210 150 10
36895-216 158 10 210 150 10 102 78 10 2 2 6
36896- 6 6 6 54 54 54 14 14 14 2 2 6
36897- 2 2 6 62 62 62 74 74 74 30 30 30
36898- 10 10 10 0 0 0 0 0 0 0 0 0
36899- 0 0 0 0 0 0 0 0 0 0 0 0
36900- 0 0 0 0 0 0 0 0 0 0 0 0
36901- 0 0 0 0 0 0 0 0 0 0 0 0
36902- 0 0 0 0 0 0 0 0 0 0 0 0
36903- 0 0 0 0 0 0 0 0 0 0 0 0
36904- 0 0 0 0 0 0 0 0 0 0 0 0
36905- 0 0 0 0 0 0 0 0 0 0 0 0
36906- 0 0 0 0 0 0 0 0 0 0 0 0
36907- 0 0 0 0 0 0 0 0 0 0 0 0
36908- 0 0 0 0 0 0 0 0 0 0 0 0
36909- 0 0 0 0 0 0 0 0 0 0 0 0
36910- 0 0 0 0 0 0 0 0 0 10 10 10
36911- 34 34 34 78 78 78 50 50 50 6 6 6
36912- 94 70 30 139 102 15 190 146 13 226 184 13
36913-232 200 30 232 195 16 215 174 15 190 146 13
36914-168 122 10 192 133 9 210 150 10 213 154 11
36915-202 150 34 182 157 106 101 98 89 2 2 6
36916- 2 2 6 78 78 78 116 116 116 58 58 58
36917- 2 2 6 22 22 22 90 90 90 46 46 46
36918- 18 18 18 6 6 6 0 0 0 0 0 0
36919- 0 0 0 0 0 0 0 0 0 0 0 0
36920- 0 0 0 0 0 0 0 0 0 0 0 0
36921- 0 0 0 0 0 0 0 0 0 0 0 0
36922- 0 0 0 0 0 0 0 0 0 0 0 0
36923- 0 0 0 0 0 0 0 0 0 0 0 0
36924- 0 0 0 0 0 0 0 0 0 0 0 0
36925- 0 0 0 0 0 0 0 0 0 0 0 0
36926- 0 0 0 0 0 0 0 0 0 0 0 0
36927- 0 0 0 0 0 0 0 0 0 0 0 0
36928- 0 0 0 0 0 0 0 0 0 0 0 0
36929- 0 0 0 0 0 0 0 0 0 0 0 0
36930- 0 0 0 0 0 0 0 0 0 10 10 10
36931- 38 38 38 86 86 86 50 50 50 6 6 6
36932-128 128 128 174 154 114 156 107 11 168 122 10
36933-198 155 10 184 144 12 197 138 11 200 144 11
36934-206 145 10 206 145 10 197 138 11 188 164 115
36935-195 195 195 198 198 198 174 174 174 14 14 14
36936- 2 2 6 22 22 22 116 116 116 116 116 116
36937- 22 22 22 2 2 6 74 74 74 70 70 70
36938- 30 30 30 10 10 10 0 0 0 0 0 0
36939- 0 0 0 0 0 0 0 0 0 0 0 0
36940- 0 0 0 0 0 0 0 0 0 0 0 0
36941- 0 0 0 0 0 0 0 0 0 0 0 0
36942- 0 0 0 0 0 0 0 0 0 0 0 0
36943- 0 0 0 0 0 0 0 0 0 0 0 0
36944- 0 0 0 0 0 0 0 0 0 0 0 0
36945- 0 0 0 0 0 0 0 0 0 0 0 0
36946- 0 0 0 0 0 0 0 0 0 0 0 0
36947- 0 0 0 0 0 0 0 0 0 0 0 0
36948- 0 0 0 0 0 0 0 0 0 0 0 0
36949- 0 0 0 0 0 0 0 0 0 0 0 0
36950- 0 0 0 0 0 0 6 6 6 18 18 18
36951- 50 50 50 101 101 101 26 26 26 10 10 10
36952-138 138 138 190 190 190 174 154 114 156 107 11
36953-197 138 11 200 144 11 197 138 11 192 133 9
36954-180 123 7 190 142 34 190 178 144 187 187 187
36955-202 202 202 221 221 221 214 214 214 66 66 66
36956- 2 2 6 2 2 6 50 50 50 62 62 62
36957- 6 6 6 2 2 6 10 10 10 90 90 90
36958- 50 50 50 18 18 18 6 6 6 0 0 0
36959- 0 0 0 0 0 0 0 0 0 0 0 0
36960- 0 0 0 0 0 0 0 0 0 0 0 0
36961- 0 0 0 0 0 0 0 0 0 0 0 0
36962- 0 0 0 0 0 0 0 0 0 0 0 0
36963- 0 0 0 0 0 0 0 0 0 0 0 0
36964- 0 0 0 0 0 0 0 0 0 0 0 0
36965- 0 0 0 0 0 0 0 0 0 0 0 0
36966- 0 0 0 0 0 0 0 0 0 0 0 0
36967- 0 0 0 0 0 0 0 0 0 0 0 0
36968- 0 0 0 0 0 0 0 0 0 0 0 0
36969- 0 0 0 0 0 0 0 0 0 0 0 0
36970- 0 0 0 0 0 0 10 10 10 34 34 34
36971- 74 74 74 74 74 74 2 2 6 6 6 6
36972-144 144 144 198 198 198 190 190 190 178 166 146
36973-154 121 60 156 107 11 156 107 11 168 124 44
36974-174 154 114 187 187 187 190 190 190 210 210 210
36975-246 246 246 253 253 253 253 253 253 182 182 182
36976- 6 6 6 2 2 6 2 2 6 2 2 6
36977- 2 2 6 2 2 6 2 2 6 62 62 62
36978- 74 74 74 34 34 34 14 14 14 0 0 0
36979- 0 0 0 0 0 0 0 0 0 0 0 0
36980- 0 0 0 0 0 0 0 0 0 0 0 0
36981- 0 0 0 0 0 0 0 0 0 0 0 0
36982- 0 0 0 0 0 0 0 0 0 0 0 0
36983- 0 0 0 0 0 0 0 0 0 0 0 0
36984- 0 0 0 0 0 0 0 0 0 0 0 0
36985- 0 0 0 0 0 0 0 0 0 0 0 0
36986- 0 0 0 0 0 0 0 0 0 0 0 0
36987- 0 0 0 0 0 0 0 0 0 0 0 0
36988- 0 0 0 0 0 0 0 0 0 0 0 0
36989- 0 0 0 0 0 0 0 0 0 0 0 0
36990- 0 0 0 10 10 10 22 22 22 54 54 54
36991- 94 94 94 18 18 18 2 2 6 46 46 46
36992-234 234 234 221 221 221 190 190 190 190 190 190
36993-190 190 190 187 187 187 187 187 187 190 190 190
36994-190 190 190 195 195 195 214 214 214 242 242 242
36995-253 253 253 253 253 253 253 253 253 253 253 253
36996- 82 82 82 2 2 6 2 2 6 2 2 6
36997- 2 2 6 2 2 6 2 2 6 14 14 14
36998- 86 86 86 54 54 54 22 22 22 6 6 6
36999- 0 0 0 0 0 0 0 0 0 0 0 0
37000- 0 0 0 0 0 0 0 0 0 0 0 0
37001- 0 0 0 0 0 0 0 0 0 0 0 0
37002- 0 0 0 0 0 0 0 0 0 0 0 0
37003- 0 0 0 0 0 0 0 0 0 0 0 0
37004- 0 0 0 0 0 0 0 0 0 0 0 0
37005- 0 0 0 0 0 0 0 0 0 0 0 0
37006- 0 0 0 0 0 0 0 0 0 0 0 0
37007- 0 0 0 0 0 0 0 0 0 0 0 0
37008- 0 0 0 0 0 0 0 0 0 0 0 0
37009- 0 0 0 0 0 0 0 0 0 0 0 0
37010- 6 6 6 18 18 18 46 46 46 90 90 90
37011- 46 46 46 18 18 18 6 6 6 182 182 182
37012-253 253 253 246 246 246 206 206 206 190 190 190
37013-190 190 190 190 190 190 190 190 190 190 190 190
37014-206 206 206 231 231 231 250 250 250 253 253 253
37015-253 253 253 253 253 253 253 253 253 253 253 253
37016-202 202 202 14 14 14 2 2 6 2 2 6
37017- 2 2 6 2 2 6 2 2 6 2 2 6
37018- 42 42 42 86 86 86 42 42 42 18 18 18
37019- 6 6 6 0 0 0 0 0 0 0 0 0
37020- 0 0 0 0 0 0 0 0 0 0 0 0
37021- 0 0 0 0 0 0 0 0 0 0 0 0
37022- 0 0 0 0 0 0 0 0 0 0 0 0
37023- 0 0 0 0 0 0 0 0 0 0 0 0
37024- 0 0 0 0 0 0 0 0 0 0 0 0
37025- 0 0 0 0 0 0 0 0 0 0 0 0
37026- 0 0 0 0 0 0 0 0 0 0 0 0
37027- 0 0 0 0 0 0 0 0 0 0 0 0
37028- 0 0 0 0 0 0 0 0 0 0 0 0
37029- 0 0 0 0 0 0 0 0 0 6 6 6
37030- 14 14 14 38 38 38 74 74 74 66 66 66
37031- 2 2 6 6 6 6 90 90 90 250 250 250
37032-253 253 253 253 253 253 238 238 238 198 198 198
37033-190 190 190 190 190 190 195 195 195 221 221 221
37034-246 246 246 253 253 253 253 253 253 253 253 253
37035-253 253 253 253 253 253 253 253 253 253 253 253
37036-253 253 253 82 82 82 2 2 6 2 2 6
37037- 2 2 6 2 2 6 2 2 6 2 2 6
37038- 2 2 6 78 78 78 70 70 70 34 34 34
37039- 14 14 14 6 6 6 0 0 0 0 0 0
37040- 0 0 0 0 0 0 0 0 0 0 0 0
37041- 0 0 0 0 0 0 0 0 0 0 0 0
37042- 0 0 0 0 0 0 0 0 0 0 0 0
37043- 0 0 0 0 0 0 0 0 0 0 0 0
37044- 0 0 0 0 0 0 0 0 0 0 0 0
37045- 0 0 0 0 0 0 0 0 0 0 0 0
37046- 0 0 0 0 0 0 0 0 0 0 0 0
37047- 0 0 0 0 0 0 0 0 0 0 0 0
37048- 0 0 0 0 0 0 0 0 0 0 0 0
37049- 0 0 0 0 0 0 0 0 0 14 14 14
37050- 34 34 34 66 66 66 78 78 78 6 6 6
37051- 2 2 6 18 18 18 218 218 218 253 253 253
37052-253 253 253 253 253 253 253 253 253 246 246 246
37053-226 226 226 231 231 231 246 246 246 253 253 253
37054-253 253 253 253 253 253 253 253 253 253 253 253
37055-253 253 253 253 253 253 253 253 253 253 253 253
37056-253 253 253 178 178 178 2 2 6 2 2 6
37057- 2 2 6 2 2 6 2 2 6 2 2 6
37058- 2 2 6 18 18 18 90 90 90 62 62 62
37059- 30 30 30 10 10 10 0 0 0 0 0 0
37060- 0 0 0 0 0 0 0 0 0 0 0 0
37061- 0 0 0 0 0 0 0 0 0 0 0 0
37062- 0 0 0 0 0 0 0 0 0 0 0 0
37063- 0 0 0 0 0 0 0 0 0 0 0 0
37064- 0 0 0 0 0 0 0 0 0 0 0 0
37065- 0 0 0 0 0 0 0 0 0 0 0 0
37066- 0 0 0 0 0 0 0 0 0 0 0 0
37067- 0 0 0 0 0 0 0 0 0 0 0 0
37068- 0 0 0 0 0 0 0 0 0 0 0 0
37069- 0 0 0 0 0 0 10 10 10 26 26 26
37070- 58 58 58 90 90 90 18 18 18 2 2 6
37071- 2 2 6 110 110 110 253 253 253 253 253 253
37072-253 253 253 253 253 253 253 253 253 253 253 253
37073-250 250 250 253 253 253 253 253 253 253 253 253
37074-253 253 253 253 253 253 253 253 253 253 253 253
37075-253 253 253 253 253 253 253 253 253 253 253 253
37076-253 253 253 231 231 231 18 18 18 2 2 6
37077- 2 2 6 2 2 6 2 2 6 2 2 6
37078- 2 2 6 2 2 6 18 18 18 94 94 94
37079- 54 54 54 26 26 26 10 10 10 0 0 0
37080- 0 0 0 0 0 0 0 0 0 0 0 0
37081- 0 0 0 0 0 0 0 0 0 0 0 0
37082- 0 0 0 0 0 0 0 0 0 0 0 0
37083- 0 0 0 0 0 0 0 0 0 0 0 0
37084- 0 0 0 0 0 0 0 0 0 0 0 0
37085- 0 0 0 0 0 0 0 0 0 0 0 0
37086- 0 0 0 0 0 0 0 0 0 0 0 0
37087- 0 0 0 0 0 0 0 0 0 0 0 0
37088- 0 0 0 0 0 0 0 0 0 0 0 0
37089- 0 0 0 6 6 6 22 22 22 50 50 50
37090- 90 90 90 26 26 26 2 2 6 2 2 6
37091- 14 14 14 195 195 195 250 250 250 253 253 253
37092-253 253 253 253 253 253 253 253 253 253 253 253
37093-253 253 253 253 253 253 253 253 253 253 253 253
37094-253 253 253 253 253 253 253 253 253 253 253 253
37095-253 253 253 253 253 253 253 253 253 253 253 253
37096-250 250 250 242 242 242 54 54 54 2 2 6
37097- 2 2 6 2 2 6 2 2 6 2 2 6
37098- 2 2 6 2 2 6 2 2 6 38 38 38
37099- 86 86 86 50 50 50 22 22 22 6 6 6
37100- 0 0 0 0 0 0 0 0 0 0 0 0
37101- 0 0 0 0 0 0 0 0 0 0 0 0
37102- 0 0 0 0 0 0 0 0 0 0 0 0
37103- 0 0 0 0 0 0 0 0 0 0 0 0
37104- 0 0 0 0 0 0 0 0 0 0 0 0
37105- 0 0 0 0 0 0 0 0 0 0 0 0
37106- 0 0 0 0 0 0 0 0 0 0 0 0
37107- 0 0 0 0 0 0 0 0 0 0 0 0
37108- 0 0 0 0 0 0 0 0 0 0 0 0
37109- 6 6 6 14 14 14 38 38 38 82 82 82
37110- 34 34 34 2 2 6 2 2 6 2 2 6
37111- 42 42 42 195 195 195 246 246 246 253 253 253
37112-253 253 253 253 253 253 253 253 253 250 250 250
37113-242 242 242 242 242 242 250 250 250 253 253 253
37114-253 253 253 253 253 253 253 253 253 253 253 253
37115-253 253 253 250 250 250 246 246 246 238 238 238
37116-226 226 226 231 231 231 101 101 101 6 6 6
37117- 2 2 6 2 2 6 2 2 6 2 2 6
37118- 2 2 6 2 2 6 2 2 6 2 2 6
37119- 38 38 38 82 82 82 42 42 42 14 14 14
37120- 6 6 6 0 0 0 0 0 0 0 0 0
37121- 0 0 0 0 0 0 0 0 0 0 0 0
37122- 0 0 0 0 0 0 0 0 0 0 0 0
37123- 0 0 0 0 0 0 0 0 0 0 0 0
37124- 0 0 0 0 0 0 0 0 0 0 0 0
37125- 0 0 0 0 0 0 0 0 0 0 0 0
37126- 0 0 0 0 0 0 0 0 0 0 0 0
37127- 0 0 0 0 0 0 0 0 0 0 0 0
37128- 0 0 0 0 0 0 0 0 0 0 0 0
37129- 10 10 10 26 26 26 62 62 62 66 66 66
37130- 2 2 6 2 2 6 2 2 6 6 6 6
37131- 70 70 70 170 170 170 206 206 206 234 234 234
37132-246 246 246 250 250 250 250 250 250 238 238 238
37133-226 226 226 231 231 231 238 238 238 250 250 250
37134-250 250 250 250 250 250 246 246 246 231 231 231
37135-214 214 214 206 206 206 202 202 202 202 202 202
37136-198 198 198 202 202 202 182 182 182 18 18 18
37137- 2 2 6 2 2 6 2 2 6 2 2 6
37138- 2 2 6 2 2 6 2 2 6 2 2 6
37139- 2 2 6 62 62 62 66 66 66 30 30 30
37140- 10 10 10 0 0 0 0 0 0 0 0 0
37141- 0 0 0 0 0 0 0 0 0 0 0 0
37142- 0 0 0 0 0 0 0 0 0 0 0 0
37143- 0 0 0 0 0 0 0 0 0 0 0 0
37144- 0 0 0 0 0 0 0 0 0 0 0 0
37145- 0 0 0 0 0 0 0 0 0 0 0 0
37146- 0 0 0 0 0 0 0 0 0 0 0 0
37147- 0 0 0 0 0 0 0 0 0 0 0 0
37148- 0 0 0 0 0 0 0 0 0 0 0 0
37149- 14 14 14 42 42 42 82 82 82 18 18 18
37150- 2 2 6 2 2 6 2 2 6 10 10 10
37151- 94 94 94 182 182 182 218 218 218 242 242 242
37152-250 250 250 253 253 253 253 253 253 250 250 250
37153-234 234 234 253 253 253 253 253 253 253 253 253
37154-253 253 253 253 253 253 253 253 253 246 246 246
37155-238 238 238 226 226 226 210 210 210 202 202 202
37156-195 195 195 195 195 195 210 210 210 158 158 158
37157- 6 6 6 14 14 14 50 50 50 14 14 14
37158- 2 2 6 2 2 6 2 2 6 2 2 6
37159- 2 2 6 6 6 6 86 86 86 46 46 46
37160- 18 18 18 6 6 6 0 0 0 0 0 0
37161- 0 0 0 0 0 0 0 0 0 0 0 0
37162- 0 0 0 0 0 0 0 0 0 0 0 0
37163- 0 0 0 0 0 0 0 0 0 0 0 0
37164- 0 0 0 0 0 0 0 0 0 0 0 0
37165- 0 0 0 0 0 0 0 0 0 0 0 0
37166- 0 0 0 0 0 0 0 0 0 0 0 0
37167- 0 0 0 0 0 0 0 0 0 0 0 0
37168- 0 0 0 0 0 0 0 0 0 6 6 6
37169- 22 22 22 54 54 54 70 70 70 2 2 6
37170- 2 2 6 10 10 10 2 2 6 22 22 22
37171-166 166 166 231 231 231 250 250 250 253 253 253
37172-253 253 253 253 253 253 253 253 253 250 250 250
37173-242 242 242 253 253 253 253 253 253 253 253 253
37174-253 253 253 253 253 253 253 253 253 253 253 253
37175-253 253 253 253 253 253 253 253 253 246 246 246
37176-231 231 231 206 206 206 198 198 198 226 226 226
37177- 94 94 94 2 2 6 6 6 6 38 38 38
37178- 30 30 30 2 2 6 2 2 6 2 2 6
37179- 2 2 6 2 2 6 62 62 62 66 66 66
37180- 26 26 26 10 10 10 0 0 0 0 0 0
37181- 0 0 0 0 0 0 0 0 0 0 0 0
37182- 0 0 0 0 0 0 0 0 0 0 0 0
37183- 0 0 0 0 0 0 0 0 0 0 0 0
37184- 0 0 0 0 0 0 0 0 0 0 0 0
37185- 0 0 0 0 0 0 0 0 0 0 0 0
37186- 0 0 0 0 0 0 0 0 0 0 0 0
37187- 0 0 0 0 0 0 0 0 0 0 0 0
37188- 0 0 0 0 0 0 0 0 0 10 10 10
37189- 30 30 30 74 74 74 50 50 50 2 2 6
37190- 26 26 26 26 26 26 2 2 6 106 106 106
37191-238 238 238 253 253 253 253 253 253 253 253 253
37192-253 253 253 253 253 253 253 253 253 253 253 253
37193-253 253 253 253 253 253 253 253 253 253 253 253
37194-253 253 253 253 253 253 253 253 253 253 253 253
37195-253 253 253 253 253 253 253 253 253 253 253 253
37196-253 253 253 246 246 246 218 218 218 202 202 202
37197-210 210 210 14 14 14 2 2 6 2 2 6
37198- 30 30 30 22 22 22 2 2 6 2 2 6
37199- 2 2 6 2 2 6 18 18 18 86 86 86
37200- 42 42 42 14 14 14 0 0 0 0 0 0
37201- 0 0 0 0 0 0 0 0 0 0 0 0
37202- 0 0 0 0 0 0 0 0 0 0 0 0
37203- 0 0 0 0 0 0 0 0 0 0 0 0
37204- 0 0 0 0 0 0 0 0 0 0 0 0
37205- 0 0 0 0 0 0 0 0 0 0 0 0
37206- 0 0 0 0 0 0 0 0 0 0 0 0
37207- 0 0 0 0 0 0 0 0 0 0 0 0
37208- 0 0 0 0 0 0 0 0 0 14 14 14
37209- 42 42 42 90 90 90 22 22 22 2 2 6
37210- 42 42 42 2 2 6 18 18 18 218 218 218
37211-253 253 253 253 253 253 253 253 253 253 253 253
37212-253 253 253 253 253 253 253 253 253 253 253 253
37213-253 253 253 253 253 253 253 253 253 253 253 253
37214-253 253 253 253 253 253 253 253 253 253 253 253
37215-253 253 253 253 253 253 253 253 253 253 253 253
37216-253 253 253 253 253 253 250 250 250 221 221 221
37217-218 218 218 101 101 101 2 2 6 14 14 14
37218- 18 18 18 38 38 38 10 10 10 2 2 6
37219- 2 2 6 2 2 6 2 2 6 78 78 78
37220- 58 58 58 22 22 22 6 6 6 0 0 0
37221- 0 0 0 0 0 0 0 0 0 0 0 0
37222- 0 0 0 0 0 0 0 0 0 0 0 0
37223- 0 0 0 0 0 0 0 0 0 0 0 0
37224- 0 0 0 0 0 0 0 0 0 0 0 0
37225- 0 0 0 0 0 0 0 0 0 0 0 0
37226- 0 0 0 0 0 0 0 0 0 0 0 0
37227- 0 0 0 0 0 0 0 0 0 0 0 0
37228- 0 0 0 0 0 0 6 6 6 18 18 18
37229- 54 54 54 82 82 82 2 2 6 26 26 26
37230- 22 22 22 2 2 6 123 123 123 253 253 253
37231-253 253 253 253 253 253 253 253 253 253 253 253
37232-253 253 253 253 253 253 253 253 253 253 253 253
37233-253 253 253 253 253 253 253 253 253 253 253 253
37234-253 253 253 253 253 253 253 253 253 253 253 253
37235-253 253 253 253 253 253 253 253 253 253 253 253
37236-253 253 253 253 253 253 253 253 253 250 250 250
37237-238 238 238 198 198 198 6 6 6 38 38 38
37238- 58 58 58 26 26 26 38 38 38 2 2 6
37239- 2 2 6 2 2 6 2 2 6 46 46 46
37240- 78 78 78 30 30 30 10 10 10 0 0 0
37241- 0 0 0 0 0 0 0 0 0 0 0 0
37242- 0 0 0 0 0 0 0 0 0 0 0 0
37243- 0 0 0 0 0 0 0 0 0 0 0 0
37244- 0 0 0 0 0 0 0 0 0 0 0 0
37245- 0 0 0 0 0 0 0 0 0 0 0 0
37246- 0 0 0 0 0 0 0 0 0 0 0 0
37247- 0 0 0 0 0 0 0 0 0 0 0 0
37248- 0 0 0 0 0 0 10 10 10 30 30 30
37249- 74 74 74 58 58 58 2 2 6 42 42 42
37250- 2 2 6 22 22 22 231 231 231 253 253 253
37251-253 253 253 253 253 253 253 253 253 253 253 253
37252-253 253 253 253 253 253 253 253 253 250 250 250
37253-253 253 253 253 253 253 253 253 253 253 253 253
37254-253 253 253 253 253 253 253 253 253 253 253 253
37255-253 253 253 253 253 253 253 253 253 253 253 253
37256-253 253 253 253 253 253 253 253 253 253 253 253
37257-253 253 253 246 246 246 46 46 46 38 38 38
37258- 42 42 42 14 14 14 38 38 38 14 14 14
37259- 2 2 6 2 2 6 2 2 6 6 6 6
37260- 86 86 86 46 46 46 14 14 14 0 0 0
37261- 0 0 0 0 0 0 0 0 0 0 0 0
37262- 0 0 0 0 0 0 0 0 0 0 0 0
37263- 0 0 0 0 0 0 0 0 0 0 0 0
37264- 0 0 0 0 0 0 0 0 0 0 0 0
37265- 0 0 0 0 0 0 0 0 0 0 0 0
37266- 0 0 0 0 0 0 0 0 0 0 0 0
37267- 0 0 0 0 0 0 0 0 0 0 0 0
37268- 0 0 0 6 6 6 14 14 14 42 42 42
37269- 90 90 90 18 18 18 18 18 18 26 26 26
37270- 2 2 6 116 116 116 253 253 253 253 253 253
37271-253 253 253 253 253 253 253 253 253 253 253 253
37272-253 253 253 253 253 253 250 250 250 238 238 238
37273-253 253 253 253 253 253 253 253 253 253 253 253
37274-253 253 253 253 253 253 253 253 253 253 253 253
37275-253 253 253 253 253 253 253 253 253 253 253 253
37276-253 253 253 253 253 253 253 253 253 253 253 253
37277-253 253 253 253 253 253 94 94 94 6 6 6
37278- 2 2 6 2 2 6 10 10 10 34 34 34
37279- 2 2 6 2 2 6 2 2 6 2 2 6
37280- 74 74 74 58 58 58 22 22 22 6 6 6
37281- 0 0 0 0 0 0 0 0 0 0 0 0
37282- 0 0 0 0 0 0 0 0 0 0 0 0
37283- 0 0 0 0 0 0 0 0 0 0 0 0
37284- 0 0 0 0 0 0 0 0 0 0 0 0
37285- 0 0 0 0 0 0 0 0 0 0 0 0
37286- 0 0 0 0 0 0 0 0 0 0 0 0
37287- 0 0 0 0 0 0 0 0 0 0 0 0
37288- 0 0 0 10 10 10 26 26 26 66 66 66
37289- 82 82 82 2 2 6 38 38 38 6 6 6
37290- 14 14 14 210 210 210 253 253 253 253 253 253
37291-253 253 253 253 253 253 253 253 253 253 253 253
37292-253 253 253 253 253 253 246 246 246 242 242 242
37293-253 253 253 253 253 253 253 253 253 253 253 253
37294-253 253 253 253 253 253 253 253 253 253 253 253
37295-253 253 253 253 253 253 253 253 253 253 253 253
37296-253 253 253 253 253 253 253 253 253 253 253 253
37297-253 253 253 253 253 253 144 144 144 2 2 6
37298- 2 2 6 2 2 6 2 2 6 46 46 46
37299- 2 2 6 2 2 6 2 2 6 2 2 6
37300- 42 42 42 74 74 74 30 30 30 10 10 10
37301- 0 0 0 0 0 0 0 0 0 0 0 0
37302- 0 0 0 0 0 0 0 0 0 0 0 0
37303- 0 0 0 0 0 0 0 0 0 0 0 0
37304- 0 0 0 0 0 0 0 0 0 0 0 0
37305- 0 0 0 0 0 0 0 0 0 0 0 0
37306- 0 0 0 0 0 0 0 0 0 0 0 0
37307- 0 0 0 0 0 0 0 0 0 0 0 0
37308- 6 6 6 14 14 14 42 42 42 90 90 90
37309- 26 26 26 6 6 6 42 42 42 2 2 6
37310- 74 74 74 250 250 250 253 253 253 253 253 253
37311-253 253 253 253 253 253 253 253 253 253 253 253
37312-253 253 253 253 253 253 242 242 242 242 242 242
37313-253 253 253 253 253 253 253 253 253 253 253 253
37314-253 253 253 253 253 253 253 253 253 253 253 253
37315-253 253 253 253 253 253 253 253 253 253 253 253
37316-253 253 253 253 253 253 253 253 253 253 253 253
37317-253 253 253 253 253 253 182 182 182 2 2 6
37318- 2 2 6 2 2 6 2 2 6 46 46 46
37319- 2 2 6 2 2 6 2 2 6 2 2 6
37320- 10 10 10 86 86 86 38 38 38 10 10 10
37321- 0 0 0 0 0 0 0 0 0 0 0 0
37322- 0 0 0 0 0 0 0 0 0 0 0 0
37323- 0 0 0 0 0 0 0 0 0 0 0 0
37324- 0 0 0 0 0 0 0 0 0 0 0 0
37325- 0 0 0 0 0 0 0 0 0 0 0 0
37326- 0 0 0 0 0 0 0 0 0 0 0 0
37327- 0 0 0 0 0 0 0 0 0 0 0 0
37328- 10 10 10 26 26 26 66 66 66 82 82 82
37329- 2 2 6 22 22 22 18 18 18 2 2 6
37330-149 149 149 253 253 253 253 253 253 253 253 253
37331-253 253 253 253 253 253 253 253 253 253 253 253
37332-253 253 253 253 253 253 234 234 234 242 242 242
37333-253 253 253 253 253 253 253 253 253 253 253 253
37334-253 253 253 253 253 253 253 253 253 253 253 253
37335-253 253 253 253 253 253 253 253 253 253 253 253
37336-253 253 253 253 253 253 253 253 253 253 253 253
37337-253 253 253 253 253 253 206 206 206 2 2 6
37338- 2 2 6 2 2 6 2 2 6 38 38 38
37339- 2 2 6 2 2 6 2 2 6 2 2 6
37340- 6 6 6 86 86 86 46 46 46 14 14 14
37341- 0 0 0 0 0 0 0 0 0 0 0 0
37342- 0 0 0 0 0 0 0 0 0 0 0 0
37343- 0 0 0 0 0 0 0 0 0 0 0 0
37344- 0 0 0 0 0 0 0 0 0 0 0 0
37345- 0 0 0 0 0 0 0 0 0 0 0 0
37346- 0 0 0 0 0 0 0 0 0 0 0 0
37347- 0 0 0 0 0 0 0 0 0 6 6 6
37348- 18 18 18 46 46 46 86 86 86 18 18 18
37349- 2 2 6 34 34 34 10 10 10 6 6 6
37350-210 210 210 253 253 253 253 253 253 253 253 253
37351-253 253 253 253 253 253 253 253 253 253 253 253
37352-253 253 253 253 253 253 234 234 234 242 242 242
37353-253 253 253 253 253 253 253 253 253 253 253 253
37354-253 253 253 253 253 253 253 253 253 253 253 253
37355-253 253 253 253 253 253 253 253 253 253 253 253
37356-253 253 253 253 253 253 253 253 253 253 253 253
37357-253 253 253 253 253 253 221 221 221 6 6 6
37358- 2 2 6 2 2 6 6 6 6 30 30 30
37359- 2 2 6 2 2 6 2 2 6 2 2 6
37360- 2 2 6 82 82 82 54 54 54 18 18 18
37361- 6 6 6 0 0 0 0 0 0 0 0 0
37362- 0 0 0 0 0 0 0 0 0 0 0 0
37363- 0 0 0 0 0 0 0 0 0 0 0 0
37364- 0 0 0 0 0 0 0 0 0 0 0 0
37365- 0 0 0 0 0 0 0 0 0 0 0 0
37366- 0 0 0 0 0 0 0 0 0 0 0 0
37367- 0 0 0 0 0 0 0 0 0 10 10 10
37368- 26 26 26 66 66 66 62 62 62 2 2 6
37369- 2 2 6 38 38 38 10 10 10 26 26 26
37370-238 238 238 253 253 253 253 253 253 253 253 253
37371-253 253 253 253 253 253 253 253 253 253 253 253
37372-253 253 253 253 253 253 231 231 231 238 238 238
37373-253 253 253 253 253 253 253 253 253 253 253 253
37374-253 253 253 253 253 253 253 253 253 253 253 253
37375-253 253 253 253 253 253 253 253 253 253 253 253
37376-253 253 253 253 253 253 253 253 253 253 253 253
37377-253 253 253 253 253 253 231 231 231 6 6 6
37378- 2 2 6 2 2 6 10 10 10 30 30 30
37379- 2 2 6 2 2 6 2 2 6 2 2 6
37380- 2 2 6 66 66 66 58 58 58 22 22 22
37381- 6 6 6 0 0 0 0 0 0 0 0 0
37382- 0 0 0 0 0 0 0 0 0 0 0 0
37383- 0 0 0 0 0 0 0 0 0 0 0 0
37384- 0 0 0 0 0 0 0 0 0 0 0 0
37385- 0 0 0 0 0 0 0 0 0 0 0 0
37386- 0 0 0 0 0 0 0 0 0 0 0 0
37387- 0 0 0 0 0 0 0 0 0 10 10 10
37388- 38 38 38 78 78 78 6 6 6 2 2 6
37389- 2 2 6 46 46 46 14 14 14 42 42 42
37390-246 246 246 253 253 253 253 253 253 253 253 253
37391-253 253 253 253 253 253 253 253 253 253 253 253
37392-253 253 253 253 253 253 231 231 231 242 242 242
37393-253 253 253 253 253 253 253 253 253 253 253 253
37394-253 253 253 253 253 253 253 253 253 253 253 253
37395-253 253 253 253 253 253 253 253 253 253 253 253
37396-253 253 253 253 253 253 253 253 253 253 253 253
37397-253 253 253 253 253 253 234 234 234 10 10 10
37398- 2 2 6 2 2 6 22 22 22 14 14 14
37399- 2 2 6 2 2 6 2 2 6 2 2 6
37400- 2 2 6 66 66 66 62 62 62 22 22 22
37401- 6 6 6 0 0 0 0 0 0 0 0 0
37402- 0 0 0 0 0 0 0 0 0 0 0 0
37403- 0 0 0 0 0 0 0 0 0 0 0 0
37404- 0 0 0 0 0 0 0 0 0 0 0 0
37405- 0 0 0 0 0 0 0 0 0 0 0 0
37406- 0 0 0 0 0 0 0 0 0 0 0 0
37407- 0 0 0 0 0 0 6 6 6 18 18 18
37408- 50 50 50 74 74 74 2 2 6 2 2 6
37409- 14 14 14 70 70 70 34 34 34 62 62 62
37410-250 250 250 253 253 253 253 253 253 253 253 253
37411-253 253 253 253 253 253 253 253 253 253 253 253
37412-253 253 253 253 253 253 231 231 231 246 246 246
37413-253 253 253 253 253 253 253 253 253 253 253 253
37414-253 253 253 253 253 253 253 253 253 253 253 253
37415-253 253 253 253 253 253 253 253 253 253 253 253
37416-253 253 253 253 253 253 253 253 253 253 253 253
37417-253 253 253 253 253 253 234 234 234 14 14 14
37418- 2 2 6 2 2 6 30 30 30 2 2 6
37419- 2 2 6 2 2 6 2 2 6 2 2 6
37420- 2 2 6 66 66 66 62 62 62 22 22 22
37421- 6 6 6 0 0 0 0 0 0 0 0 0
37422- 0 0 0 0 0 0 0 0 0 0 0 0
37423- 0 0 0 0 0 0 0 0 0 0 0 0
37424- 0 0 0 0 0 0 0 0 0 0 0 0
37425- 0 0 0 0 0 0 0 0 0 0 0 0
37426- 0 0 0 0 0 0 0 0 0 0 0 0
37427- 0 0 0 0 0 0 6 6 6 18 18 18
37428- 54 54 54 62 62 62 2 2 6 2 2 6
37429- 2 2 6 30 30 30 46 46 46 70 70 70
37430-250 250 250 253 253 253 253 253 253 253 253 253
37431-253 253 253 253 253 253 253 253 253 253 253 253
37432-253 253 253 253 253 253 231 231 231 246 246 246
37433-253 253 253 253 253 253 253 253 253 253 253 253
37434-253 253 253 253 253 253 253 253 253 253 253 253
37435-253 253 253 253 253 253 253 253 253 253 253 253
37436-253 253 253 253 253 253 253 253 253 253 253 253
37437-253 253 253 253 253 253 226 226 226 10 10 10
37438- 2 2 6 6 6 6 30 30 30 2 2 6
37439- 2 2 6 2 2 6 2 2 6 2 2 6
37440- 2 2 6 66 66 66 58 58 58 22 22 22
37441- 6 6 6 0 0 0 0 0 0 0 0 0
37442- 0 0 0 0 0 0 0 0 0 0 0 0
37443- 0 0 0 0 0 0 0 0 0 0 0 0
37444- 0 0 0 0 0 0 0 0 0 0 0 0
37445- 0 0 0 0 0 0 0 0 0 0 0 0
37446- 0 0 0 0 0 0 0 0 0 0 0 0
37447- 0 0 0 0 0 0 6 6 6 22 22 22
37448- 58 58 58 62 62 62 2 2 6 2 2 6
37449- 2 2 6 2 2 6 30 30 30 78 78 78
37450-250 250 250 253 253 253 253 253 253 253 253 253
37451-253 253 253 253 253 253 253 253 253 253 253 253
37452-253 253 253 253 253 253 231 231 231 246 246 246
37453-253 253 253 253 253 253 253 253 253 253 253 253
37454-253 253 253 253 253 253 253 253 253 253 253 253
37455-253 253 253 253 253 253 253 253 253 253 253 253
37456-253 253 253 253 253 253 253 253 253 253 253 253
37457-253 253 253 253 253 253 206 206 206 2 2 6
37458- 22 22 22 34 34 34 18 14 6 22 22 22
37459- 26 26 26 18 18 18 6 6 6 2 2 6
37460- 2 2 6 82 82 82 54 54 54 18 18 18
37461- 6 6 6 0 0 0 0 0 0 0 0 0
37462- 0 0 0 0 0 0 0 0 0 0 0 0
37463- 0 0 0 0 0 0 0 0 0 0 0 0
37464- 0 0 0 0 0 0 0 0 0 0 0 0
37465- 0 0 0 0 0 0 0 0 0 0 0 0
37466- 0 0 0 0 0 0 0 0 0 0 0 0
37467- 0 0 0 0 0 0 6 6 6 26 26 26
37468- 62 62 62 106 106 106 74 54 14 185 133 11
37469-210 162 10 121 92 8 6 6 6 62 62 62
37470-238 238 238 253 253 253 253 253 253 253 253 253
37471-253 253 253 253 253 253 253 253 253 253 253 253
37472-253 253 253 253 253 253 231 231 231 246 246 246
37473-253 253 253 253 253 253 253 253 253 253 253 253
37474-253 253 253 253 253 253 253 253 253 253 253 253
37475-253 253 253 253 253 253 253 253 253 253 253 253
37476-253 253 253 253 253 253 253 253 253 253 253 253
37477-253 253 253 253 253 253 158 158 158 18 18 18
37478- 14 14 14 2 2 6 2 2 6 2 2 6
37479- 6 6 6 18 18 18 66 66 66 38 38 38
37480- 6 6 6 94 94 94 50 50 50 18 18 18
37481- 6 6 6 0 0 0 0 0 0 0 0 0
37482- 0 0 0 0 0 0 0 0 0 0 0 0
37483- 0 0 0 0 0 0 0 0 0 0 0 0
37484- 0 0 0 0 0 0 0 0 0 0 0 0
37485- 0 0 0 0 0 0 0 0 0 0 0 0
37486- 0 0 0 0 0 0 0 0 0 6 6 6
37487- 10 10 10 10 10 10 18 18 18 38 38 38
37488- 78 78 78 142 134 106 216 158 10 242 186 14
37489-246 190 14 246 190 14 156 118 10 10 10 10
37490- 90 90 90 238 238 238 253 253 253 253 253 253
37491-253 253 253 253 253 253 253 253 253 253 253 253
37492-253 253 253 253 253 253 231 231 231 250 250 250
37493-253 253 253 253 253 253 253 253 253 253 253 253
37494-253 253 253 253 253 253 253 253 253 253 253 253
37495-253 253 253 253 253 253 253 253 253 253 253 253
37496-253 253 253 253 253 253 253 253 253 246 230 190
37497-238 204 91 238 204 91 181 142 44 37 26 9
37498- 2 2 6 2 2 6 2 2 6 2 2 6
37499- 2 2 6 2 2 6 38 38 38 46 46 46
37500- 26 26 26 106 106 106 54 54 54 18 18 18
37501- 6 6 6 0 0 0 0 0 0 0 0 0
37502- 0 0 0 0 0 0 0 0 0 0 0 0
37503- 0 0 0 0 0 0 0 0 0 0 0 0
37504- 0 0 0 0 0 0 0 0 0 0 0 0
37505- 0 0 0 0 0 0 0 0 0 0 0 0
37506- 0 0 0 6 6 6 14 14 14 22 22 22
37507- 30 30 30 38 38 38 50 50 50 70 70 70
37508-106 106 106 190 142 34 226 170 11 242 186 14
37509-246 190 14 246 190 14 246 190 14 154 114 10
37510- 6 6 6 74 74 74 226 226 226 253 253 253
37511-253 253 253 253 253 253 253 253 253 253 253 253
37512-253 253 253 253 253 253 231 231 231 250 250 250
37513-253 253 253 253 253 253 253 253 253 253 253 253
37514-253 253 253 253 253 253 253 253 253 253 253 253
37515-253 253 253 253 253 253 253 253 253 253 253 253
37516-253 253 253 253 253 253 253 253 253 228 184 62
37517-241 196 14 241 208 19 232 195 16 38 30 10
37518- 2 2 6 2 2 6 2 2 6 2 2 6
37519- 2 2 6 6 6 6 30 30 30 26 26 26
37520-203 166 17 154 142 90 66 66 66 26 26 26
37521- 6 6 6 0 0 0 0 0 0 0 0 0
37522- 0 0 0 0 0 0 0 0 0 0 0 0
37523- 0 0 0 0 0 0 0 0 0 0 0 0
37524- 0 0 0 0 0 0 0 0 0 0 0 0
37525- 0 0 0 0 0 0 0 0 0 0 0 0
37526- 6 6 6 18 18 18 38 38 38 58 58 58
37527- 78 78 78 86 86 86 101 101 101 123 123 123
37528-175 146 61 210 150 10 234 174 13 246 186 14
37529-246 190 14 246 190 14 246 190 14 238 190 10
37530-102 78 10 2 2 6 46 46 46 198 198 198
37531-253 253 253 253 253 253 253 253 253 253 253 253
37532-253 253 253 253 253 253 234 234 234 242 242 242
37533-253 253 253 253 253 253 253 253 253 253 253 253
37534-253 253 253 253 253 253 253 253 253 253 253 253
37535-253 253 253 253 253 253 253 253 253 253 253 253
37536-253 253 253 253 253 253 253 253 253 224 178 62
37537-242 186 14 241 196 14 210 166 10 22 18 6
37538- 2 2 6 2 2 6 2 2 6 2 2 6
37539- 2 2 6 2 2 6 6 6 6 121 92 8
37540-238 202 15 232 195 16 82 82 82 34 34 34
37541- 10 10 10 0 0 0 0 0 0 0 0 0
37542- 0 0 0 0 0 0 0 0 0 0 0 0
37543- 0 0 0 0 0 0 0 0 0 0 0 0
37544- 0 0 0 0 0 0 0 0 0 0 0 0
37545- 0 0 0 0 0 0 0 0 0 0 0 0
37546- 14 14 14 38 38 38 70 70 70 154 122 46
37547-190 142 34 200 144 11 197 138 11 197 138 11
37548-213 154 11 226 170 11 242 186 14 246 190 14
37549-246 190 14 246 190 14 246 190 14 246 190 14
37550-225 175 15 46 32 6 2 2 6 22 22 22
37551-158 158 158 250 250 250 253 253 253 253 253 253
37552-253 253 253 253 253 253 253 253 253 253 253 253
37553-253 253 253 253 253 253 253 253 253 253 253 253
37554-253 253 253 253 253 253 253 253 253 253 253 253
37555-253 253 253 253 253 253 253 253 253 253 253 253
37556-253 253 253 250 250 250 242 242 242 224 178 62
37557-239 182 13 236 186 11 213 154 11 46 32 6
37558- 2 2 6 2 2 6 2 2 6 2 2 6
37559- 2 2 6 2 2 6 61 42 6 225 175 15
37560-238 190 10 236 186 11 112 100 78 42 42 42
37561- 14 14 14 0 0 0 0 0 0 0 0 0
37562- 0 0 0 0 0 0 0 0 0 0 0 0
37563- 0 0 0 0 0 0 0 0 0 0 0 0
37564- 0 0 0 0 0 0 0 0 0 0 0 0
37565- 0 0 0 0 0 0 0 0 0 6 6 6
37566- 22 22 22 54 54 54 154 122 46 213 154 11
37567-226 170 11 230 174 11 226 170 11 226 170 11
37568-236 178 12 242 186 14 246 190 14 246 190 14
37569-246 190 14 246 190 14 246 190 14 246 190 14
37570-241 196 14 184 144 12 10 10 10 2 2 6
37571- 6 6 6 116 116 116 242 242 242 253 253 253
37572-253 253 253 253 253 253 253 253 253 253 253 253
37573-253 253 253 253 253 253 253 253 253 253 253 253
37574-253 253 253 253 253 253 253 253 253 253 253 253
37575-253 253 253 253 253 253 253 253 253 253 253 253
37576-253 253 253 231 231 231 198 198 198 214 170 54
37577-236 178 12 236 178 12 210 150 10 137 92 6
37578- 18 14 6 2 2 6 2 2 6 2 2 6
37579- 6 6 6 70 47 6 200 144 11 236 178 12
37580-239 182 13 239 182 13 124 112 88 58 58 58
37581- 22 22 22 6 6 6 0 0 0 0 0 0
37582- 0 0 0 0 0 0 0 0 0 0 0 0
37583- 0 0 0 0 0 0 0 0 0 0 0 0
37584- 0 0 0 0 0 0 0 0 0 0 0 0
37585- 0 0 0 0 0 0 0 0 0 10 10 10
37586- 30 30 30 70 70 70 180 133 36 226 170 11
37587-239 182 13 242 186 14 242 186 14 246 186 14
37588-246 190 14 246 190 14 246 190 14 246 190 14
37589-246 190 14 246 190 14 246 190 14 246 190 14
37590-246 190 14 232 195 16 98 70 6 2 2 6
37591- 2 2 6 2 2 6 66 66 66 221 221 221
37592-253 253 253 253 253 253 253 253 253 253 253 253
37593-253 253 253 253 253 253 253 253 253 253 253 253
37594-253 253 253 253 253 253 253 253 253 253 253 253
37595-253 253 253 253 253 253 253 253 253 253 253 253
37596-253 253 253 206 206 206 198 198 198 214 166 58
37597-230 174 11 230 174 11 216 158 10 192 133 9
37598-163 110 8 116 81 8 102 78 10 116 81 8
37599-167 114 7 197 138 11 226 170 11 239 182 13
37600-242 186 14 242 186 14 162 146 94 78 78 78
37601- 34 34 34 14 14 14 6 6 6 0 0 0
37602- 0 0 0 0 0 0 0 0 0 0 0 0
37603- 0 0 0 0 0 0 0 0 0 0 0 0
37604- 0 0 0 0 0 0 0 0 0 0 0 0
37605- 0 0 0 0 0 0 0 0 0 6 6 6
37606- 30 30 30 78 78 78 190 142 34 226 170 11
37607-239 182 13 246 190 14 246 190 14 246 190 14
37608-246 190 14 246 190 14 246 190 14 246 190 14
37609-246 190 14 246 190 14 246 190 14 246 190 14
37610-246 190 14 241 196 14 203 166 17 22 18 6
37611- 2 2 6 2 2 6 2 2 6 38 38 38
37612-218 218 218 253 253 253 253 253 253 253 253 253
37613-253 253 253 253 253 253 253 253 253 253 253 253
37614-253 253 253 253 253 253 253 253 253 253 253 253
37615-253 253 253 253 253 253 253 253 253 253 253 253
37616-250 250 250 206 206 206 198 198 198 202 162 69
37617-226 170 11 236 178 12 224 166 10 210 150 10
37618-200 144 11 197 138 11 192 133 9 197 138 11
37619-210 150 10 226 170 11 242 186 14 246 190 14
37620-246 190 14 246 186 14 225 175 15 124 112 88
37621- 62 62 62 30 30 30 14 14 14 6 6 6
37622- 0 0 0 0 0 0 0 0 0 0 0 0
37623- 0 0 0 0 0 0 0 0 0 0 0 0
37624- 0 0 0 0 0 0 0 0 0 0 0 0
37625- 0 0 0 0 0 0 0 0 0 10 10 10
37626- 30 30 30 78 78 78 174 135 50 224 166 10
37627-239 182 13 246 190 14 246 190 14 246 190 14
37628-246 190 14 246 190 14 246 190 14 246 190 14
37629-246 190 14 246 190 14 246 190 14 246 190 14
37630-246 190 14 246 190 14 241 196 14 139 102 15
37631- 2 2 6 2 2 6 2 2 6 2 2 6
37632- 78 78 78 250 250 250 253 253 253 253 253 253
37633-253 253 253 253 253 253 253 253 253 253 253 253
37634-253 253 253 253 253 253 253 253 253 253 253 253
37635-253 253 253 253 253 253 253 253 253 253 253 253
37636-250 250 250 214 214 214 198 198 198 190 150 46
37637-219 162 10 236 178 12 234 174 13 224 166 10
37638-216 158 10 213 154 11 213 154 11 216 158 10
37639-226 170 11 239 182 13 246 190 14 246 190 14
37640-246 190 14 246 190 14 242 186 14 206 162 42
37641-101 101 101 58 58 58 30 30 30 14 14 14
37642- 6 6 6 0 0 0 0 0 0 0 0 0
37643- 0 0 0 0 0 0 0 0 0 0 0 0
37644- 0 0 0 0 0 0 0 0 0 0 0 0
37645- 0 0 0 0 0 0 0 0 0 10 10 10
37646- 30 30 30 74 74 74 174 135 50 216 158 10
37647-236 178 12 246 190 14 246 190 14 246 190 14
37648-246 190 14 246 190 14 246 190 14 246 190 14
37649-246 190 14 246 190 14 246 190 14 246 190 14
37650-246 190 14 246 190 14 241 196 14 226 184 13
37651- 61 42 6 2 2 6 2 2 6 2 2 6
37652- 22 22 22 238 238 238 253 253 253 253 253 253
37653-253 253 253 253 253 253 253 253 253 253 253 253
37654-253 253 253 253 253 253 253 253 253 253 253 253
37655-253 253 253 253 253 253 253 253 253 253 253 253
37656-253 253 253 226 226 226 187 187 187 180 133 36
37657-216 158 10 236 178 12 239 182 13 236 178 12
37658-230 174 11 226 170 11 226 170 11 230 174 11
37659-236 178 12 242 186 14 246 190 14 246 190 14
37660-246 190 14 246 190 14 246 186 14 239 182 13
37661-206 162 42 106 106 106 66 66 66 34 34 34
37662- 14 14 14 6 6 6 0 0 0 0 0 0
37663- 0 0 0 0 0 0 0 0 0 0 0 0
37664- 0 0 0 0 0 0 0 0 0 0 0 0
37665- 0 0 0 0 0 0 0 0 0 6 6 6
37666- 26 26 26 70 70 70 163 133 67 213 154 11
37667-236 178 12 246 190 14 246 190 14 246 190 14
37668-246 190 14 246 190 14 246 190 14 246 190 14
37669-246 190 14 246 190 14 246 190 14 246 190 14
37670-246 190 14 246 190 14 246 190 14 241 196 14
37671-190 146 13 18 14 6 2 2 6 2 2 6
37672- 46 46 46 246 246 246 253 253 253 253 253 253
37673-253 253 253 253 253 253 253 253 253 253 253 253
37674-253 253 253 253 253 253 253 253 253 253 253 253
37675-253 253 253 253 253 253 253 253 253 253 253 253
37676-253 253 253 221 221 221 86 86 86 156 107 11
37677-216 158 10 236 178 12 242 186 14 246 186 14
37678-242 186 14 239 182 13 239 182 13 242 186 14
37679-242 186 14 246 186 14 246 190 14 246 190 14
37680-246 190 14 246 190 14 246 190 14 246 190 14
37681-242 186 14 225 175 15 142 122 72 66 66 66
37682- 30 30 30 10 10 10 0 0 0 0 0 0
37683- 0 0 0 0 0 0 0 0 0 0 0 0
37684- 0 0 0 0 0 0 0 0 0 0 0 0
37685- 0 0 0 0 0 0 0 0 0 6 6 6
37686- 26 26 26 70 70 70 163 133 67 210 150 10
37687-236 178 12 246 190 14 246 190 14 246 190 14
37688-246 190 14 246 190 14 246 190 14 246 190 14
37689-246 190 14 246 190 14 246 190 14 246 190 14
37690-246 190 14 246 190 14 246 190 14 246 190 14
37691-232 195 16 121 92 8 34 34 34 106 106 106
37692-221 221 221 253 253 253 253 253 253 253 253 253
37693-253 253 253 253 253 253 253 253 253 253 253 253
37694-253 253 253 253 253 253 253 253 253 253 253 253
37695-253 253 253 253 253 253 253 253 253 253 253 253
37696-242 242 242 82 82 82 18 14 6 163 110 8
37697-216 158 10 236 178 12 242 186 14 246 190 14
37698-246 190 14 246 190 14 246 190 14 246 190 14
37699-246 190 14 246 190 14 246 190 14 246 190 14
37700-246 190 14 246 190 14 246 190 14 246 190 14
37701-246 190 14 246 190 14 242 186 14 163 133 67
37702- 46 46 46 18 18 18 6 6 6 0 0 0
37703- 0 0 0 0 0 0 0 0 0 0 0 0
37704- 0 0 0 0 0 0 0 0 0 0 0 0
37705- 0 0 0 0 0 0 0 0 0 10 10 10
37706- 30 30 30 78 78 78 163 133 67 210 150 10
37707-236 178 12 246 186 14 246 190 14 246 190 14
37708-246 190 14 246 190 14 246 190 14 246 190 14
37709-246 190 14 246 190 14 246 190 14 246 190 14
37710-246 190 14 246 190 14 246 190 14 246 190 14
37711-241 196 14 215 174 15 190 178 144 253 253 253
37712-253 253 253 253 253 253 253 253 253 253 253 253
37713-253 253 253 253 253 253 253 253 253 253 253 253
37714-253 253 253 253 253 253 253 253 253 253 253 253
37715-253 253 253 253 253 253 253 253 253 218 218 218
37716- 58 58 58 2 2 6 22 18 6 167 114 7
37717-216 158 10 236 178 12 246 186 14 246 190 14
37718-246 190 14 246 190 14 246 190 14 246 190 14
37719-246 190 14 246 190 14 246 190 14 246 190 14
37720-246 190 14 246 190 14 246 190 14 246 190 14
37721-246 190 14 246 186 14 242 186 14 190 150 46
37722- 54 54 54 22 22 22 6 6 6 0 0 0
37723- 0 0 0 0 0 0 0 0 0 0 0 0
37724- 0 0 0 0 0 0 0 0 0 0 0 0
37725- 0 0 0 0 0 0 0 0 0 14 14 14
37726- 38 38 38 86 86 86 180 133 36 213 154 11
37727-236 178 12 246 186 14 246 190 14 246 190 14
37728-246 190 14 246 190 14 246 190 14 246 190 14
37729-246 190 14 246 190 14 246 190 14 246 190 14
37730-246 190 14 246 190 14 246 190 14 246 190 14
37731-246 190 14 232 195 16 190 146 13 214 214 214
37732-253 253 253 253 253 253 253 253 253 253 253 253
37733-253 253 253 253 253 253 253 253 253 253 253 253
37734-253 253 253 253 253 253 253 253 253 253 253 253
37735-253 253 253 250 250 250 170 170 170 26 26 26
37736- 2 2 6 2 2 6 37 26 9 163 110 8
37737-219 162 10 239 182 13 246 186 14 246 190 14
37738-246 190 14 246 190 14 246 190 14 246 190 14
37739-246 190 14 246 190 14 246 190 14 246 190 14
37740-246 190 14 246 190 14 246 190 14 246 190 14
37741-246 186 14 236 178 12 224 166 10 142 122 72
37742- 46 46 46 18 18 18 6 6 6 0 0 0
37743- 0 0 0 0 0 0 0 0 0 0 0 0
37744- 0 0 0 0 0 0 0 0 0 0 0 0
37745- 0 0 0 0 0 0 6 6 6 18 18 18
37746- 50 50 50 109 106 95 192 133 9 224 166 10
37747-242 186 14 246 190 14 246 190 14 246 190 14
37748-246 190 14 246 190 14 246 190 14 246 190 14
37749-246 190 14 246 190 14 246 190 14 246 190 14
37750-246 190 14 246 190 14 246 190 14 246 190 14
37751-242 186 14 226 184 13 210 162 10 142 110 46
37752-226 226 226 253 253 253 253 253 253 253 253 253
37753-253 253 253 253 253 253 253 253 253 253 253 253
37754-253 253 253 253 253 253 253 253 253 253 253 253
37755-198 198 198 66 66 66 2 2 6 2 2 6
37756- 2 2 6 2 2 6 50 34 6 156 107 11
37757-219 162 10 239 182 13 246 186 14 246 190 14
37758-246 190 14 246 190 14 246 190 14 246 190 14
37759-246 190 14 246 190 14 246 190 14 246 190 14
37760-246 190 14 246 190 14 246 190 14 242 186 14
37761-234 174 13 213 154 11 154 122 46 66 66 66
37762- 30 30 30 10 10 10 0 0 0 0 0 0
37763- 0 0 0 0 0 0 0 0 0 0 0 0
37764- 0 0 0 0 0 0 0 0 0 0 0 0
37765- 0 0 0 0 0 0 6 6 6 22 22 22
37766- 58 58 58 154 121 60 206 145 10 234 174 13
37767-242 186 14 246 186 14 246 190 14 246 190 14
37768-246 190 14 246 190 14 246 190 14 246 190 14
37769-246 190 14 246 190 14 246 190 14 246 190 14
37770-246 190 14 246 190 14 246 190 14 246 190 14
37771-246 186 14 236 178 12 210 162 10 163 110 8
37772- 61 42 6 138 138 138 218 218 218 250 250 250
37773-253 253 253 253 253 253 253 253 253 250 250 250
37774-242 242 242 210 210 210 144 144 144 66 66 66
37775- 6 6 6 2 2 6 2 2 6 2 2 6
37776- 2 2 6 2 2 6 61 42 6 163 110 8
37777-216 158 10 236 178 12 246 190 14 246 190 14
37778-246 190 14 246 190 14 246 190 14 246 190 14
37779-246 190 14 246 190 14 246 190 14 246 190 14
37780-246 190 14 239 182 13 230 174 11 216 158 10
37781-190 142 34 124 112 88 70 70 70 38 38 38
37782- 18 18 18 6 6 6 0 0 0 0 0 0
37783- 0 0 0 0 0 0 0 0 0 0 0 0
37784- 0 0 0 0 0 0 0 0 0 0 0 0
37785- 0 0 0 0 0 0 6 6 6 22 22 22
37786- 62 62 62 168 124 44 206 145 10 224 166 10
37787-236 178 12 239 182 13 242 186 14 242 186 14
37788-246 186 14 246 190 14 246 190 14 246 190 14
37789-246 190 14 246 190 14 246 190 14 246 190 14
37790-246 190 14 246 190 14 246 190 14 246 190 14
37791-246 190 14 236 178 12 216 158 10 175 118 6
37792- 80 54 7 2 2 6 6 6 6 30 30 30
37793- 54 54 54 62 62 62 50 50 50 38 38 38
37794- 14 14 14 2 2 6 2 2 6 2 2 6
37795- 2 2 6 2 2 6 2 2 6 2 2 6
37796- 2 2 6 6 6 6 80 54 7 167 114 7
37797-213 154 11 236 178 12 246 190 14 246 190 14
37798-246 190 14 246 190 14 246 190 14 246 190 14
37799-246 190 14 242 186 14 239 182 13 239 182 13
37800-230 174 11 210 150 10 174 135 50 124 112 88
37801- 82 82 82 54 54 54 34 34 34 18 18 18
37802- 6 6 6 0 0 0 0 0 0 0 0 0
37803- 0 0 0 0 0 0 0 0 0 0 0 0
37804- 0 0 0 0 0 0 0 0 0 0 0 0
37805- 0 0 0 0 0 0 6 6 6 18 18 18
37806- 50 50 50 158 118 36 192 133 9 200 144 11
37807-216 158 10 219 162 10 224 166 10 226 170 11
37808-230 174 11 236 178 12 239 182 13 239 182 13
37809-242 186 14 246 186 14 246 190 14 246 190 14
37810-246 190 14 246 190 14 246 190 14 246 190 14
37811-246 186 14 230 174 11 210 150 10 163 110 8
37812-104 69 6 10 10 10 2 2 6 2 2 6
37813- 2 2 6 2 2 6 2 2 6 2 2 6
37814- 2 2 6 2 2 6 2 2 6 2 2 6
37815- 2 2 6 2 2 6 2 2 6 2 2 6
37816- 2 2 6 6 6 6 91 60 6 167 114 7
37817-206 145 10 230 174 11 242 186 14 246 190 14
37818-246 190 14 246 190 14 246 186 14 242 186 14
37819-239 182 13 230 174 11 224 166 10 213 154 11
37820-180 133 36 124 112 88 86 86 86 58 58 58
37821- 38 38 38 22 22 22 10 10 10 6 6 6
37822- 0 0 0 0 0 0 0 0 0 0 0 0
37823- 0 0 0 0 0 0 0 0 0 0 0 0
37824- 0 0 0 0 0 0 0 0 0 0 0 0
37825- 0 0 0 0 0 0 0 0 0 14 14 14
37826- 34 34 34 70 70 70 138 110 50 158 118 36
37827-167 114 7 180 123 7 192 133 9 197 138 11
37828-200 144 11 206 145 10 213 154 11 219 162 10
37829-224 166 10 230 174 11 239 182 13 242 186 14
37830-246 186 14 246 186 14 246 186 14 246 186 14
37831-239 182 13 216 158 10 185 133 11 152 99 6
37832-104 69 6 18 14 6 2 2 6 2 2 6
37833- 2 2 6 2 2 6 2 2 6 2 2 6
37834- 2 2 6 2 2 6 2 2 6 2 2 6
37835- 2 2 6 2 2 6 2 2 6 2 2 6
37836- 2 2 6 6 6 6 80 54 7 152 99 6
37837-192 133 9 219 162 10 236 178 12 239 182 13
37838-246 186 14 242 186 14 239 182 13 236 178 12
37839-224 166 10 206 145 10 192 133 9 154 121 60
37840- 94 94 94 62 62 62 42 42 42 22 22 22
37841- 14 14 14 6 6 6 0 0 0 0 0 0
37842- 0 0 0 0 0 0 0 0 0 0 0 0
37843- 0 0 0 0 0 0 0 0 0 0 0 0
37844- 0 0 0 0 0 0 0 0 0 0 0 0
37845- 0 0 0 0 0 0 0 0 0 6 6 6
37846- 18 18 18 34 34 34 58 58 58 78 78 78
37847-101 98 89 124 112 88 142 110 46 156 107 11
37848-163 110 8 167 114 7 175 118 6 180 123 7
37849-185 133 11 197 138 11 210 150 10 219 162 10
37850-226 170 11 236 178 12 236 178 12 234 174 13
37851-219 162 10 197 138 11 163 110 8 130 83 6
37852- 91 60 6 10 10 10 2 2 6 2 2 6
37853- 18 18 18 38 38 38 38 38 38 38 38 38
37854- 38 38 38 38 38 38 38 38 38 38 38 38
37855- 38 38 38 38 38 38 26 26 26 2 2 6
37856- 2 2 6 6 6 6 70 47 6 137 92 6
37857-175 118 6 200 144 11 219 162 10 230 174 11
37858-234 174 13 230 174 11 219 162 10 210 150 10
37859-192 133 9 163 110 8 124 112 88 82 82 82
37860- 50 50 50 30 30 30 14 14 14 6 6 6
37861- 0 0 0 0 0 0 0 0 0 0 0 0
37862- 0 0 0 0 0 0 0 0 0 0 0 0
37863- 0 0 0 0 0 0 0 0 0 0 0 0
37864- 0 0 0 0 0 0 0 0 0 0 0 0
37865- 0 0 0 0 0 0 0 0 0 0 0 0
37866- 6 6 6 14 14 14 22 22 22 34 34 34
37867- 42 42 42 58 58 58 74 74 74 86 86 86
37868-101 98 89 122 102 70 130 98 46 121 87 25
37869-137 92 6 152 99 6 163 110 8 180 123 7
37870-185 133 11 197 138 11 206 145 10 200 144 11
37871-180 123 7 156 107 11 130 83 6 104 69 6
37872- 50 34 6 54 54 54 110 110 110 101 98 89
37873- 86 86 86 82 82 82 78 78 78 78 78 78
37874- 78 78 78 78 78 78 78 78 78 78 78 78
37875- 78 78 78 82 82 82 86 86 86 94 94 94
37876-106 106 106 101 101 101 86 66 34 124 80 6
37877-156 107 11 180 123 7 192 133 9 200 144 11
37878-206 145 10 200 144 11 192 133 9 175 118 6
37879-139 102 15 109 106 95 70 70 70 42 42 42
37880- 22 22 22 10 10 10 0 0 0 0 0 0
37881- 0 0 0 0 0 0 0 0 0 0 0 0
37882- 0 0 0 0 0 0 0 0 0 0 0 0
37883- 0 0 0 0 0 0 0 0 0 0 0 0
37884- 0 0 0 0 0 0 0 0 0 0 0 0
37885- 0 0 0 0 0 0 0 0 0 0 0 0
37886- 0 0 0 0 0 0 6 6 6 10 10 10
37887- 14 14 14 22 22 22 30 30 30 38 38 38
37888- 50 50 50 62 62 62 74 74 74 90 90 90
37889-101 98 89 112 100 78 121 87 25 124 80 6
37890-137 92 6 152 99 6 152 99 6 152 99 6
37891-138 86 6 124 80 6 98 70 6 86 66 30
37892-101 98 89 82 82 82 58 58 58 46 46 46
37893- 38 38 38 34 34 34 34 34 34 34 34 34
37894- 34 34 34 34 34 34 34 34 34 34 34 34
37895- 34 34 34 34 34 34 38 38 38 42 42 42
37896- 54 54 54 82 82 82 94 86 76 91 60 6
37897-134 86 6 156 107 11 167 114 7 175 118 6
37898-175 118 6 167 114 7 152 99 6 121 87 25
37899-101 98 89 62 62 62 34 34 34 18 18 18
37900- 6 6 6 0 0 0 0 0 0 0 0 0
37901- 0 0 0 0 0 0 0 0 0 0 0 0
37902- 0 0 0 0 0 0 0 0 0 0 0 0
37903- 0 0 0 0 0 0 0 0 0 0 0 0
37904- 0 0 0 0 0 0 0 0 0 0 0 0
37905- 0 0 0 0 0 0 0 0 0 0 0 0
37906- 0 0 0 0 0 0 0 0 0 0 0 0
37907- 0 0 0 6 6 6 6 6 6 10 10 10
37908- 18 18 18 22 22 22 30 30 30 42 42 42
37909- 50 50 50 66 66 66 86 86 86 101 98 89
37910-106 86 58 98 70 6 104 69 6 104 69 6
37911-104 69 6 91 60 6 82 62 34 90 90 90
37912- 62 62 62 38 38 38 22 22 22 14 14 14
37913- 10 10 10 10 10 10 10 10 10 10 10 10
37914- 10 10 10 10 10 10 6 6 6 10 10 10
37915- 10 10 10 10 10 10 10 10 10 14 14 14
37916- 22 22 22 42 42 42 70 70 70 89 81 66
37917- 80 54 7 104 69 6 124 80 6 137 92 6
37918-134 86 6 116 81 8 100 82 52 86 86 86
37919- 58 58 58 30 30 30 14 14 14 6 6 6
37920- 0 0 0 0 0 0 0 0 0 0 0 0
37921- 0 0 0 0 0 0 0 0 0 0 0 0
37922- 0 0 0 0 0 0 0 0 0 0 0 0
37923- 0 0 0 0 0 0 0 0 0 0 0 0
37924- 0 0 0 0 0 0 0 0 0 0 0 0
37925- 0 0 0 0 0 0 0 0 0 0 0 0
37926- 0 0 0 0 0 0 0 0 0 0 0 0
37927- 0 0 0 0 0 0 0 0 0 0 0 0
37928- 0 0 0 6 6 6 10 10 10 14 14 14
37929- 18 18 18 26 26 26 38 38 38 54 54 54
37930- 70 70 70 86 86 86 94 86 76 89 81 66
37931- 89 81 66 86 86 86 74 74 74 50 50 50
37932- 30 30 30 14 14 14 6 6 6 0 0 0
37933- 0 0 0 0 0 0 0 0 0 0 0 0
37934- 0 0 0 0 0 0 0 0 0 0 0 0
37935- 0 0 0 0 0 0 0 0 0 0 0 0
37936- 6 6 6 18 18 18 34 34 34 58 58 58
37937- 82 82 82 89 81 66 89 81 66 89 81 66
37938- 94 86 66 94 86 76 74 74 74 50 50 50
37939- 26 26 26 14 14 14 6 6 6 0 0 0
37940- 0 0 0 0 0 0 0 0 0 0 0 0
37941- 0 0 0 0 0 0 0 0 0 0 0 0
37942- 0 0 0 0 0 0 0 0 0 0 0 0
37943- 0 0 0 0 0 0 0 0 0 0 0 0
37944- 0 0 0 0 0 0 0 0 0 0 0 0
37945- 0 0 0 0 0 0 0 0 0 0 0 0
37946- 0 0 0 0 0 0 0 0 0 0 0 0
37947- 0 0 0 0 0 0 0 0 0 0 0 0
37948- 0 0 0 0 0 0 0 0 0 0 0 0
37949- 6 6 6 6 6 6 14 14 14 18 18 18
37950- 30 30 30 38 38 38 46 46 46 54 54 54
37951- 50 50 50 42 42 42 30 30 30 18 18 18
37952- 10 10 10 0 0 0 0 0 0 0 0 0
37953- 0 0 0 0 0 0 0 0 0 0 0 0
37954- 0 0 0 0 0 0 0 0 0 0 0 0
37955- 0 0 0 0 0 0 0 0 0 0 0 0
37956- 0 0 0 6 6 6 14 14 14 26 26 26
37957- 38 38 38 50 50 50 58 58 58 58 58 58
37958- 54 54 54 42 42 42 30 30 30 18 18 18
37959- 10 10 10 0 0 0 0 0 0 0 0 0
37960- 0 0 0 0 0 0 0 0 0 0 0 0
37961- 0 0 0 0 0 0 0 0 0 0 0 0
37962- 0 0 0 0 0 0 0 0 0 0 0 0
37963- 0 0 0 0 0 0 0 0 0 0 0 0
37964- 0 0 0 0 0 0 0 0 0 0 0 0
37965- 0 0 0 0 0 0 0 0 0 0 0 0
37966- 0 0 0 0 0 0 0 0 0 0 0 0
37967- 0 0 0 0 0 0 0 0 0 0 0 0
37968- 0 0 0 0 0 0 0 0 0 0 0 0
37969- 0 0 0 0 0 0 0 0 0 6 6 6
37970- 6 6 6 10 10 10 14 14 14 18 18 18
37971- 18 18 18 14 14 14 10 10 10 6 6 6
37972- 0 0 0 0 0 0 0 0 0 0 0 0
37973- 0 0 0 0 0 0 0 0 0 0 0 0
37974- 0 0 0 0 0 0 0 0 0 0 0 0
37975- 0 0 0 0 0 0 0 0 0 0 0 0
37976- 0 0 0 0 0 0 0 0 0 6 6 6
37977- 14 14 14 18 18 18 22 22 22 22 22 22
37978- 18 18 18 14 14 14 10 10 10 6 6 6
37979- 0 0 0 0 0 0 0 0 0 0 0 0
37980- 0 0 0 0 0 0 0 0 0 0 0 0
37981- 0 0 0 0 0 0 0 0 0 0 0 0
37982- 0 0 0 0 0 0 0 0 0 0 0 0
37983- 0 0 0 0 0 0 0 0 0 0 0 0
37984+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37985+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37986+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37987+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37988+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37989+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37990+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37991+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37992+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37993+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37994+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37995+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37996+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37997+4 4 4 4 4 4
37998+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
37999+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38000+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38001+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38002+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38003+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38004+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38005+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38006+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38007+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38008+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38009+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38010+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38011+4 4 4 4 4 4
38012+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38013+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38014+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38015+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38016+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38017+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38018+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38019+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38020+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38021+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38022+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38023+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38024+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38025+4 4 4 4 4 4
38026+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38027+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38028+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38029+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38030+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38031+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38032+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38033+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38034+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38035+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38036+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38037+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38038+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38039+4 4 4 4 4 4
38040+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38041+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38043+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38044+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38045+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38046+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38047+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38048+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38049+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38050+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38051+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38052+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38053+4 4 4 4 4 4
38054+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38055+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38056+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38057+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38058+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38059+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38060+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38061+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38062+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38063+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38065+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38066+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38067+4 4 4 4 4 4
38068+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38069+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38070+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38071+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38072+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
38073+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
38074+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38075+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38076+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38077+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
38078+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
38079+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
38080+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38081+4 4 4 4 4 4
38082+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38083+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38086+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
38087+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
38088+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38089+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38090+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38091+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
38092+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
38093+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
38094+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38095+4 4 4 4 4 4
38096+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38097+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38100+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
38101+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
38102+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
38103+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38104+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38105+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
38106+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
38107+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
38108+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
38109+4 4 4 4 4 4
38110+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38111+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38113+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
38114+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
38115+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
38116+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
38117+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38118+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
38119+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
38120+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
38121+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
38122+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
38123+4 4 4 4 4 4
38124+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38125+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38126+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38127+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
38128+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
38129+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
38130+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
38131+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
38132+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
38133+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
38134+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
38135+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
38136+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
38137+4 4 4 4 4 4
38138+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38139+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38140+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
38141+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
38142+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
38143+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
38144+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
38145+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
38146+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
38147+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
38148+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
38149+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
38150+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
38151+4 4 4 4 4 4
38152+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38153+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38154+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
38155+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
38156+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
38157+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
38158+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
38159+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
38160+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
38161+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
38162+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
38163+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
38164+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
38165+4 4 4 4 4 4
38166+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38167+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38168+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
38169+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
38170+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
38171+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
38172+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
38173+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
38174+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
38175+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
38176+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
38177+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
38178+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
38179+4 4 4 4 4 4
38180+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38181+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38182+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
38183+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
38184+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
38185+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
38186+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
38187+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
38188+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
38189+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
38190+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
38191+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
38192+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
38193+4 4 4 4 4 4
38194+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38195+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38196+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
38197+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
38198+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
38199+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
38200+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
38201+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
38202+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
38203+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
38204+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
38205+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
38206+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
38207+4 4 4 4 4 4
38208+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38209+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
38210+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
38211+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
38212+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
38213+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
38214+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
38215+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
38216+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
38217+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
38218+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
38219+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
38220+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
38221+4 4 4 4 4 4
38222+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38223+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
38224+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
38225+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
38226+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
38227+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
38228+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
38229+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
38230+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
38231+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
38232+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
38233+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
38234+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
38235+0 0 0 4 4 4
38236+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
38237+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
38238+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
38239+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
38240+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
38241+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
38242+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
38243+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
38244+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
38245+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
38246+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
38247+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
38248+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
38249+2 0 0 0 0 0
38250+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
38251+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
38252+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
38253+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
38254+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
38255+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
38256+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
38257+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
38258+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
38259+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
38260+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
38261+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
38262+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
38263+37 38 37 0 0 0
38264+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
38265+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
38266+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
38267+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
38268+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
38269+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
38270+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
38271+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
38272+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
38273+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
38274+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
38275+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
38276+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
38277+85 115 134 4 0 0
38278+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
38279+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
38280+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
38281+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
38282+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
38283+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
38284+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
38285+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
38286+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
38287+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
38288+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
38289+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
38290+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
38291+60 73 81 4 0 0
38292+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
38293+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
38294+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
38295+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
38296+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
38297+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
38298+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
38299+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
38300+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
38301+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
38302+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
38303+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
38304+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
38305+16 19 21 4 0 0
38306+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
38307+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
38308+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
38309+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
38310+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
38311+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
38312+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
38313+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
38314+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
38315+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
38316+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
38317+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
38318+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
38319+4 0 0 4 3 3
38320+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
38321+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
38322+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
38323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
38324+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
38325+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
38326+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
38327+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
38328+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
38329+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
38330+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
38331+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
38332+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
38333+3 2 2 4 4 4
38334+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
38335+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
38336+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
38337+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
38338+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
38339+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
38340+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
38341+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
38342+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
38343+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
38344+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
38345+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
38346+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
38347+4 4 4 4 4 4
38348+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
38349+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
38350+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
38351+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
38352+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
38353+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
38354+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
38355+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
38356+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
38357+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
38358+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
38359+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
38360+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
38361+4 4 4 4 4 4
38362+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
38363+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
38364+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
38365+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
38366+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
38367+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
38368+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
38369+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
38370+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
38371+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
38372+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
38373+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
38374+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
38375+5 5 5 5 5 5
38376+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
38377+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
38378+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
38379+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
38380+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
38381+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38382+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
38383+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
38384+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
38385+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
38386+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
38387+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
38388+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
38389+5 5 5 4 4 4
38390+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
38391+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
38392+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
38393+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
38394+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
38395+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
38396+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
38397+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
38398+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
38399+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
38400+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
38401+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
38402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38403+4 4 4 4 4 4
38404+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
38405+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
38406+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
38407+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
38408+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
38409+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38410+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38411+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
38412+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
38413+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
38414+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
38415+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
38416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38417+4 4 4 4 4 4
38418+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
38419+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
38420+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
38421+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
38422+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
38423+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
38424+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
38425+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
38426+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
38427+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
38428+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
38429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38431+4 4 4 4 4 4
38432+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
38433+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
38434+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
38435+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
38436+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
38437+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38438+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38439+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
38440+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
38441+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
38442+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
38443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38445+4 4 4 4 4 4
38446+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
38447+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
38448+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
38449+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
38450+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
38451+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
38452+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
38453+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
38454+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
38455+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
38456+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38459+4 4 4 4 4 4
38460+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
38461+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
38462+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
38463+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
38464+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
38465+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
38466+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
38467+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
38468+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
38469+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
38470+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
38471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38473+4 4 4 4 4 4
38474+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
38475+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
38476+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
38477+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
38478+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
38479+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
38480+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
38481+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
38482+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
38483+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
38484+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
38485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38487+4 4 4 4 4 4
38488+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
38489+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
38490+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
38491+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
38492+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
38493+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
38494+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
38495+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
38496+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
38497+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
38498+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38501+4 4 4 4 4 4
38502+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
38503+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
38504+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
38505+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
38506+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38507+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
38508+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
38509+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
38510+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
38511+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
38512+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38515+4 4 4 4 4 4
38516+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
38517+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
38518+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
38519+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
38520+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38521+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
38522+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
38523+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
38524+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
38525+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
38526+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38529+4 4 4 4 4 4
38530+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
38531+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
38532+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
38533+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
38534+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38535+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
38536+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
38537+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
38538+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
38539+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38540+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38542+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38543+4 4 4 4 4 4
38544+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
38545+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
38546+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
38547+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
38548+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
38549+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
38550+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
38551+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
38552+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38553+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38554+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38556+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38557+4 4 4 4 4 4
38558+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
38559+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
38560+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
38561+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
38562+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38563+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
38564+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
38565+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
38566+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
38567+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38568+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38570+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38571+4 4 4 4 4 4
38572+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
38573+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
38574+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
38575+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
38576+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
38577+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
38578+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
38579+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
38580+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38581+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38582+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38584+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38585+4 4 4 4 4 4
38586+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
38587+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
38588+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
38589+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
38590+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
38591+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
38592+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
38593+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
38594+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
38595+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38596+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38598+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38599+4 4 4 4 4 4
38600+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
38601+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
38602+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
38603+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
38604+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
38605+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
38606+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
38607+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
38608+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38609+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38610+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38612+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38613+4 4 4 4 4 4
38614+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
38615+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
38616+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
38617+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
38618+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
38619+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
38620+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
38621+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
38622+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
38623+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38624+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38626+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38627+4 4 4 4 4 4
38628+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
38629+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
38630+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
38631+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
38632+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
38633+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
38634+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
38635+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
38636+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38637+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38638+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38639+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38640+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38641+4 4 4 4 4 4
38642+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
38643+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
38644+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
38645+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
38646+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
38647+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
38648+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
38649+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
38650+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
38651+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38652+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38653+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38654+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38655+4 4 4 4 4 4
38656+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
38657+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
38658+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
38659+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
38660+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
38661+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
38662+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38663+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
38664+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38665+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38666+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38667+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38668+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38669+4 4 4 4 4 4
38670+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
38671+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
38672+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
38673+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
38674+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
38675+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
38676+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38677+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
38678+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
38679+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38680+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38682+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38683+4 4 4 4 4 4
38684+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
38685+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
38686+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
38687+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
38688+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
38689+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
38690+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
38691+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
38692+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
38693+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38694+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38696+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38697+4 4 4 4 4 4
38698+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
38699+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
38700+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
38701+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
38702+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
38703+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
38704+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
38705+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
38706+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
38707+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38708+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38709+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38710+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38711+4 4 4 4 4 4
38712+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
38713+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
38714+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
38715+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
38716+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
38717+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
38718+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
38719+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
38720+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
38721+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38722+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38724+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38725+4 4 4 4 4 4
38726+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
38727+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
38728+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
38729+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
38730+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
38731+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
38732+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
38733+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
38734+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
38735+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38736+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38739+4 4 4 4 4 4
38740+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
38741+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
38742+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
38743+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
38744+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
38745+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
38746+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
38747+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
38748+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
38749+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
38750+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38753+4 4 4 4 4 4
38754+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
38755+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
38756+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
38757+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
38758+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
38759+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
38760+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
38761+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
38762+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
38763+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
38764+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38767+4 4 4 4 4 4
38768+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
38769+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
38770+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
38771+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
38772+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
38773+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
38774+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38775+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
38776+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
38777+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
38778+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
38779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38781+4 4 4 4 4 4
38782+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
38783+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
38784+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
38785+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
38786+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
38787+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
38788+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
38789+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
38790+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
38791+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
38792+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38795+4 4 4 4 4 4
38796+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
38797+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
38798+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
38799+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
38800+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
38801+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
38802+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
38803+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
38804+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
38805+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
38806+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38809+4 4 4 4 4 4
38810+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
38811+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
38812+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
38813+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
38814+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
38815+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
38816+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
38817+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
38818+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
38819+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
38820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38823+4 4 4 4 4 4
38824+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
38825+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
38826+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
38827+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
38828+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
38829+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
38830+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
38831+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
38832+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
38833+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
38834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38837+4 4 4 4 4 4
38838+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
38839+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
38840+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
38841+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
38842+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
38843+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
38844+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
38845+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
38846+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
38847+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
38848+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38849+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38851+4 4 4 4 4 4
38852+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
38853+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
38854+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
38855+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
38856+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
38857+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
38858+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
38859+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
38860+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
38861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38862+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38863+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38865+4 4 4 4 4 4
38866+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
38867+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
38868+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
38869+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
38870+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
38871+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
38872+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
38873+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
38874+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
38875+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38876+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38877+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38879+4 4 4 4 4 4
38880+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
38881+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
38882+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
38883+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
38884+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
38885+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
38886+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
38887+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
38888+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38889+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38890+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38891+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38892+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38893+4 4 4 4 4 4
38894+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
38895+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
38896+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
38897+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
38898+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
38899+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
38900+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
38901+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
38902+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38903+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38904+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38905+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38906+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38907+4 4 4 4 4 4
38908+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
38909+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
38910+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
38911+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
38912+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
38913+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
38914+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
38915+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
38916+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38917+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38918+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38919+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38920+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38921+4 4 4 4 4 4
38922+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
38923+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
38924+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
38925+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
38926+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
38927+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
38928+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
38929+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
38930+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38931+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38932+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38933+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38934+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38935+4 4 4 4 4 4
38936+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38937+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
38938+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
38939+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
38940+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
38941+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
38942+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
38943+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
38944+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38945+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38946+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38947+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38948+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38949+4 4 4 4 4 4
38950+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38951+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
38952+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
38953+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
38954+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
38955+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
38956+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
38957+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
38958+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38959+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38960+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38961+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38962+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38963+4 4 4 4 4 4
38964+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38965+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38966+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
38967+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
38968+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
38969+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
38970+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
38971+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
38972+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38973+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38974+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38975+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38976+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38977+4 4 4 4 4 4
38978+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38979+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38980+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
38981+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
38982+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
38983+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
38984+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
38985+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38986+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38987+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38988+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38989+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38990+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38991+4 4 4 4 4 4
38992+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38993+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38994+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38995+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
38996+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
38997+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
38998+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
38999+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39000+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39001+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39002+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39003+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39004+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39005+4 4 4 4 4 4
39006+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39007+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39008+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39009+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
39010+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
39011+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
39012+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
39013+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39014+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39015+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39016+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39017+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39018+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39019+4 4 4 4 4 4
39020+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39021+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39022+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39023+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
39024+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
39025+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
39026+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
39027+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39028+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39029+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39030+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39031+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39032+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39033+4 4 4 4 4 4
39034+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39035+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39036+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39037+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
39038+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
39039+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
39040+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
39041+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39043+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39044+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39045+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39046+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39047+4 4 4 4 4 4
39048+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39049+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39050+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39051+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39052+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
39053+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
39054+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
39055+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39056+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39057+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39058+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39059+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39060+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39061+4 4 4 4 4 4
39062+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39063+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39065+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39066+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
39067+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
39068+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39069+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39070+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39071+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39072+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39073+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39074+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39075+4 4 4 4 4 4
39076+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39077+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39078+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39079+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39080+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
39081+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
39082+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39083+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39086+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39087+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39088+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39089+4 4 4 4 4 4
39090+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39091+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39092+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39093+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39094+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
39095+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
39096+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39097+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39100+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39101+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39102+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39103+4 4 4 4 4 4
39104diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
39105index 3473e75..c930142 100644
39106--- a/drivers/video/udlfb.c
39107+++ b/drivers/video/udlfb.c
39108@@ -619,11 +619,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
39109 dlfb_urb_completion(urb);
39110
39111 error:
39112- atomic_add(bytes_sent, &dev->bytes_sent);
39113- atomic_add(bytes_identical, &dev->bytes_identical);
39114- atomic_add(width*height*2, &dev->bytes_rendered);
39115+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
39116+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
39117+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
39118 end_cycles = get_cycles();
39119- atomic_add(((unsigned int) ((end_cycles - start_cycles)
39120+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
39121 >> 10)), /* Kcycles */
39122 &dev->cpu_kcycles_used);
39123
39124@@ -744,11 +744,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
39125 dlfb_urb_completion(urb);
39126
39127 error:
39128- atomic_add(bytes_sent, &dev->bytes_sent);
39129- atomic_add(bytes_identical, &dev->bytes_identical);
39130- atomic_add(bytes_rendered, &dev->bytes_rendered);
39131+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
39132+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
39133+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
39134 end_cycles = get_cycles();
39135- atomic_add(((unsigned int) ((end_cycles - start_cycles)
39136+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
39137 >> 10)), /* Kcycles */
39138 &dev->cpu_kcycles_used);
39139 }
39140@@ -1368,7 +1368,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
39141 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39142 struct dlfb_data *dev = fb_info->par;
39143 return snprintf(buf, PAGE_SIZE, "%u\n",
39144- atomic_read(&dev->bytes_rendered));
39145+ atomic_read_unchecked(&dev->bytes_rendered));
39146 }
39147
39148 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
39149@@ -1376,7 +1376,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
39150 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39151 struct dlfb_data *dev = fb_info->par;
39152 return snprintf(buf, PAGE_SIZE, "%u\n",
39153- atomic_read(&dev->bytes_identical));
39154+ atomic_read_unchecked(&dev->bytes_identical));
39155 }
39156
39157 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
39158@@ -1384,7 +1384,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
39159 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39160 struct dlfb_data *dev = fb_info->par;
39161 return snprintf(buf, PAGE_SIZE, "%u\n",
39162- atomic_read(&dev->bytes_sent));
39163+ atomic_read_unchecked(&dev->bytes_sent));
39164 }
39165
39166 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
39167@@ -1392,7 +1392,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
39168 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39169 struct dlfb_data *dev = fb_info->par;
39170 return snprintf(buf, PAGE_SIZE, "%u\n",
39171- atomic_read(&dev->cpu_kcycles_used));
39172+ atomic_read_unchecked(&dev->cpu_kcycles_used));
39173 }
39174
39175 static ssize_t edid_show(
39176@@ -1449,10 +1449,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
39177 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39178 struct dlfb_data *dev = fb_info->par;
39179
39180- atomic_set(&dev->bytes_rendered, 0);
39181- atomic_set(&dev->bytes_identical, 0);
39182- atomic_set(&dev->bytes_sent, 0);
39183- atomic_set(&dev->cpu_kcycles_used, 0);
39184+ atomic_set_unchecked(&dev->bytes_rendered, 0);
39185+ atomic_set_unchecked(&dev->bytes_identical, 0);
39186+ atomic_set_unchecked(&dev->bytes_sent, 0);
39187+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
39188
39189 return count;
39190 }
39191diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
39192index 7f8472c..9842e87 100644
39193--- a/drivers/video/uvesafb.c
39194+++ b/drivers/video/uvesafb.c
39195@@ -19,6 +19,7 @@
39196 #include <linux/io.h>
39197 #include <linux/mutex.h>
39198 #include <linux/slab.h>
39199+#include <linux/moduleloader.h>
39200 #include <video/edid.h>
39201 #include <video/uvesafb.h>
39202 #ifdef CONFIG_X86
39203@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
39204 NULL,
39205 };
39206
39207- return call_usermodehelper(v86d_path, argv, envp, 1);
39208+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
39209 }
39210
39211 /*
39212@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
39213 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
39214 par->pmi_setpal = par->ypan = 0;
39215 } else {
39216+
39217+#ifdef CONFIG_PAX_KERNEXEC
39218+#ifdef CONFIG_MODULES
39219+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
39220+#endif
39221+ if (!par->pmi_code) {
39222+ par->pmi_setpal = par->ypan = 0;
39223+ return 0;
39224+ }
39225+#endif
39226+
39227 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
39228 + task->t.regs.edi);
39229+
39230+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39231+ pax_open_kernel();
39232+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
39233+ pax_close_kernel();
39234+
39235+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
39236+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
39237+#else
39238 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
39239 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
39240+#endif
39241+
39242 printk(KERN_INFO "uvesafb: protected mode interface info at "
39243 "%04x:%04x\n",
39244 (u16)task->t.regs.es, (u16)task->t.regs.edi);
39245@@ -1821,6 +1844,11 @@ out:
39246 if (par->vbe_modes)
39247 kfree(par->vbe_modes);
39248
39249+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39250+ if (par->pmi_code)
39251+ module_free_exec(NULL, par->pmi_code);
39252+#endif
39253+
39254 framebuffer_release(info);
39255 return err;
39256 }
39257@@ -1847,6 +1875,12 @@ static int uvesafb_remove(struct platform_device *dev)
39258 kfree(par->vbe_state_orig);
39259 if (par->vbe_state_saved)
39260 kfree(par->vbe_state_saved);
39261+
39262+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39263+ if (par->pmi_code)
39264+ module_free_exec(NULL, par->pmi_code);
39265+#endif
39266+
39267 }
39268
39269 framebuffer_release(info);
39270diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
39271index 501b340..86bd4cf 100644
39272--- a/drivers/video/vesafb.c
39273+++ b/drivers/video/vesafb.c
39274@@ -9,6 +9,7 @@
39275 */
39276
39277 #include <linux/module.h>
39278+#include <linux/moduleloader.h>
39279 #include <linux/kernel.h>
39280 #include <linux/errno.h>
39281 #include <linux/string.h>
39282@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
39283 static int vram_total __initdata; /* Set total amount of memory */
39284 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
39285 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
39286-static void (*pmi_start)(void) __read_mostly;
39287-static void (*pmi_pal) (void) __read_mostly;
39288+static void (*pmi_start)(void) __read_only;
39289+static void (*pmi_pal) (void) __read_only;
39290 static int depth __read_mostly;
39291 static int vga_compat __read_mostly;
39292 /* --------------------------------------------------------------------- */
39293@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
39294 unsigned int size_vmode;
39295 unsigned int size_remap;
39296 unsigned int size_total;
39297+ void *pmi_code = NULL;
39298
39299 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
39300 return -ENODEV;
39301@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
39302 size_remap = size_total;
39303 vesafb_fix.smem_len = size_remap;
39304
39305-#ifndef __i386__
39306- screen_info.vesapm_seg = 0;
39307-#endif
39308-
39309 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
39310 printk(KERN_WARNING
39311 "vesafb: cannot reserve video memory at 0x%lx\n",
39312@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
39313 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
39314 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
39315
39316+#ifdef __i386__
39317+
39318+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39319+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
39320+ if (!pmi_code)
39321+#elif !defined(CONFIG_PAX_KERNEXEC)
39322+ if (0)
39323+#endif
39324+
39325+#endif
39326+ screen_info.vesapm_seg = 0;
39327+
39328 if (screen_info.vesapm_seg) {
39329- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
39330- screen_info.vesapm_seg,screen_info.vesapm_off);
39331+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
39332+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
39333 }
39334
39335 if (screen_info.vesapm_seg < 0xc000)
39336@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
39337
39338 if (ypan || pmi_setpal) {
39339 unsigned short *pmi_base;
39340+
39341 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
39342- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
39343- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
39344+
39345+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39346+ pax_open_kernel();
39347+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
39348+#else
39349+ pmi_code = pmi_base;
39350+#endif
39351+
39352+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
39353+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
39354+
39355+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39356+ pmi_start = ktva_ktla(pmi_start);
39357+ pmi_pal = ktva_ktla(pmi_pal);
39358+ pax_close_kernel();
39359+#endif
39360+
39361 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
39362 if (pmi_base[3]) {
39363 printk(KERN_INFO "vesafb: pmi: ports = ");
39364@@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
39365 info->node, info->fix.id);
39366 return 0;
39367 err:
39368+
39369+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39370+ module_free_exec(NULL, pmi_code);
39371+#endif
39372+
39373 if (info->screen_base)
39374 iounmap(info->screen_base);
39375 framebuffer_release(info);
39376diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
39377index 88714ae..16c2e11 100644
39378--- a/drivers/video/via/via_clock.h
39379+++ b/drivers/video/via/via_clock.h
39380@@ -56,7 +56,7 @@ struct via_clock {
39381
39382 void (*set_engine_pll_state)(u8 state);
39383 void (*set_engine_pll)(struct via_pll_config config);
39384-};
39385+} __no_const;
39386
39387
39388 static inline u32 get_pll_internal_frequency(u32 ref_freq,
39389diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
39390index e56c934..fc22f4b 100644
39391--- a/drivers/xen/xen-pciback/conf_space.h
39392+++ b/drivers/xen/xen-pciback/conf_space.h
39393@@ -44,15 +44,15 @@ struct config_field {
39394 struct {
39395 conf_dword_write write;
39396 conf_dword_read read;
39397- } dw;
39398+ } __no_const dw;
39399 struct {
39400 conf_word_write write;
39401 conf_word_read read;
39402- } w;
39403+ } __no_const w;
39404 struct {
39405 conf_byte_write write;
39406 conf_byte_read read;
39407- } b;
39408+ } __no_const b;
39409 } u;
39410 struct list_head list;
39411 };
39412diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
39413index 879ed88..bc03a01 100644
39414--- a/fs/9p/vfs_inode.c
39415+++ b/fs/9p/vfs_inode.c
39416@@ -1286,7 +1286,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
39417 void
39418 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
39419 {
39420- char *s = nd_get_link(nd);
39421+ const char *s = nd_get_link(nd);
39422
39423 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
39424 IS_ERR(s) ? "<error>" : s);
39425diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
39426index 79e2ca7..5828ad1 100644
39427--- a/fs/Kconfig.binfmt
39428+++ b/fs/Kconfig.binfmt
39429@@ -86,7 +86,7 @@ config HAVE_AOUT
39430
39431 config BINFMT_AOUT
39432 tristate "Kernel support for a.out and ECOFF binaries"
39433- depends on HAVE_AOUT
39434+ depends on HAVE_AOUT && BROKEN
39435 ---help---
39436 A.out (Assembler.OUTput) is a set of formats for libraries and
39437 executables used in the earliest versions of UNIX. Linux used
39438diff --git a/fs/aio.c b/fs/aio.c
39439index 969beb0..09fab51 100644
39440--- a/fs/aio.c
39441+++ b/fs/aio.c
39442@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx *ctx)
39443 size += sizeof(struct io_event) * nr_events;
39444 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
39445
39446- if (nr_pages < 0)
39447+ if (nr_pages <= 0)
39448 return -EINVAL;
39449
39450 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
39451@@ -1461,22 +1461,27 @@ static ssize_t aio_fsync(struct kiocb *iocb)
39452 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
39453 {
39454 ssize_t ret;
39455+ struct iovec iovstack;
39456
39457 #ifdef CONFIG_COMPAT
39458 if (compat)
39459 ret = compat_rw_copy_check_uvector(type,
39460 (struct compat_iovec __user *)kiocb->ki_buf,
39461- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
39462+ kiocb->ki_nbytes, 1, &iovstack,
39463 &kiocb->ki_iovec, 1);
39464 else
39465 #endif
39466 ret = rw_copy_check_uvector(type,
39467 (struct iovec __user *)kiocb->ki_buf,
39468- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
39469+ kiocb->ki_nbytes, 1, &iovstack,
39470 &kiocb->ki_iovec, 1);
39471 if (ret < 0)
39472 goto out;
39473
39474+ if (kiocb->ki_iovec == &iovstack) {
39475+ kiocb->ki_inline_vec = iovstack;
39476+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
39477+ }
39478 kiocb->ki_nr_segs = kiocb->ki_nbytes;
39479 kiocb->ki_cur_seg = 0;
39480 /* ki_nbytes/left now reflect bytes instead of segs */
39481diff --git a/fs/attr.c b/fs/attr.c
39482index 7ee7ba4..0c61a60 100644
39483--- a/fs/attr.c
39484+++ b/fs/attr.c
39485@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
39486 unsigned long limit;
39487
39488 limit = rlimit(RLIMIT_FSIZE);
39489+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
39490 if (limit != RLIM_INFINITY && offset > limit)
39491 goto out_sig;
39492 if (offset > inode->i_sb->s_maxbytes)
39493diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
39494index e1fbdee..cd5ea56 100644
39495--- a/fs/autofs4/waitq.c
39496+++ b/fs/autofs4/waitq.c
39497@@ -60,7 +60,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
39498 {
39499 unsigned long sigpipe, flags;
39500 mm_segment_t fs;
39501- const char *data = (const char *)addr;
39502+ const char __user *data = (const char __force_user *)addr;
39503 ssize_t wr = 0;
39504
39505 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
39506diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
39507index 8342ca6..82fd192 100644
39508--- a/fs/befs/linuxvfs.c
39509+++ b/fs/befs/linuxvfs.c
39510@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
39511 {
39512 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
39513 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
39514- char *link = nd_get_link(nd);
39515+ const char *link = nd_get_link(nd);
39516 if (!IS_ERR(link))
39517 kfree(link);
39518 }
39519diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
39520index a6395bd..a5b24c4 100644
39521--- a/fs/binfmt_aout.c
39522+++ b/fs/binfmt_aout.c
39523@@ -16,6 +16,7 @@
39524 #include <linux/string.h>
39525 #include <linux/fs.h>
39526 #include <linux/file.h>
39527+#include <linux/security.h>
39528 #include <linux/stat.h>
39529 #include <linux/fcntl.h>
39530 #include <linux/ptrace.h>
39531@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
39532 #endif
39533 # define START_STACK(u) ((void __user *)u.start_stack)
39534
39535+ memset(&dump, 0, sizeof(dump));
39536+
39537 fs = get_fs();
39538 set_fs(KERNEL_DS);
39539 has_dumped = 1;
39540@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
39541
39542 /* If the size of the dump file exceeds the rlimit, then see what would happen
39543 if we wrote the stack, but not the data area. */
39544+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
39545 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
39546 dump.u_dsize = 0;
39547
39548 /* Make sure we have enough room to write the stack and data areas. */
39549+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
39550 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
39551 dump.u_ssize = 0;
39552
39553@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
39554 rlim = rlimit(RLIMIT_DATA);
39555 if (rlim >= RLIM_INFINITY)
39556 rlim = ~0;
39557+
39558+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
39559 if (ex.a_data + ex.a_bss > rlim)
39560 return -ENOMEM;
39561
39562@@ -262,6 +269,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
39563 install_exec_creds(bprm);
39564 current->flags &= ~PF_FORKNOEXEC;
39565
39566+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
39567+ current->mm->pax_flags = 0UL;
39568+#endif
39569+
39570+#ifdef CONFIG_PAX_PAGEEXEC
39571+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
39572+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
39573+
39574+#ifdef CONFIG_PAX_EMUTRAMP
39575+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
39576+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
39577+#endif
39578+
39579+#ifdef CONFIG_PAX_MPROTECT
39580+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
39581+ current->mm->pax_flags |= MF_PAX_MPROTECT;
39582+#endif
39583+
39584+ }
39585+#endif
39586+
39587 if (N_MAGIC(ex) == OMAGIC) {
39588 unsigned long text_addr, map_size;
39589 loff_t pos;
39590@@ -334,7 +362,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
39591
39592 down_write(&current->mm->mmap_sem);
39593 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
39594- PROT_READ | PROT_WRITE | PROT_EXEC,
39595+ PROT_READ | PROT_WRITE,
39596 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
39597 fd_offset + ex.a_text);
39598 up_write(&current->mm->mmap_sem);
39599diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
39600index 21ac5ee..c1090ea 100644
39601--- a/fs/binfmt_elf.c
39602+++ b/fs/binfmt_elf.c
39603@@ -32,6 +32,7 @@
39604 #include <linux/elf.h>
39605 #include <linux/utsname.h>
39606 #include <linux/coredump.h>
39607+#include <linux/xattr.h>
39608 #include <asm/uaccess.h>
39609 #include <asm/param.h>
39610 #include <asm/page.h>
39611@@ -51,6 +52,10 @@ static int elf_core_dump(struct coredump_params *cprm);
39612 #define elf_core_dump NULL
39613 #endif
39614
39615+#ifdef CONFIG_PAX_MPROTECT
39616+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
39617+#endif
39618+
39619 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
39620 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
39621 #else
39622@@ -70,6 +75,11 @@ static struct linux_binfmt elf_format = {
39623 .load_binary = load_elf_binary,
39624 .load_shlib = load_elf_library,
39625 .core_dump = elf_core_dump,
39626+
39627+#ifdef CONFIG_PAX_MPROTECT
39628+ .handle_mprotect= elf_handle_mprotect,
39629+#endif
39630+
39631 .min_coredump = ELF_EXEC_PAGESIZE,
39632 };
39633
39634@@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
39635
39636 static int set_brk(unsigned long start, unsigned long end)
39637 {
39638+ unsigned long e = end;
39639+
39640 start = ELF_PAGEALIGN(start);
39641 end = ELF_PAGEALIGN(end);
39642 if (end > start) {
39643@@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
39644 if (BAD_ADDR(addr))
39645 return addr;
39646 }
39647- current->mm->start_brk = current->mm->brk = end;
39648+ current->mm->start_brk = current->mm->brk = e;
39649 return 0;
39650 }
39651
39652@@ -148,12 +160,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
39653 elf_addr_t __user *u_rand_bytes;
39654 const char *k_platform = ELF_PLATFORM;
39655 const char *k_base_platform = ELF_BASE_PLATFORM;
39656- unsigned char k_rand_bytes[16];
39657+ u32 k_rand_bytes[4];
39658 int items;
39659 elf_addr_t *elf_info;
39660 int ei_index = 0;
39661 const struct cred *cred = current_cred();
39662 struct vm_area_struct *vma;
39663+ unsigned long saved_auxv[AT_VECTOR_SIZE];
39664
39665 /*
39666 * In some cases (e.g. Hyper-Threading), we want to avoid L1
39667@@ -195,8 +208,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
39668 * Generate 16 random bytes for userspace PRNG seeding.
39669 */
39670 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
39671- u_rand_bytes = (elf_addr_t __user *)
39672- STACK_ALLOC(p, sizeof(k_rand_bytes));
39673+ srandom32(k_rand_bytes[0] ^ random32());
39674+ srandom32(k_rand_bytes[1] ^ random32());
39675+ srandom32(k_rand_bytes[2] ^ random32());
39676+ srandom32(k_rand_bytes[3] ^ random32());
39677+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
39678+ u_rand_bytes = (elf_addr_t __user *) p;
39679 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
39680 return -EFAULT;
39681
39682@@ -308,9 +325,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
39683 return -EFAULT;
39684 current->mm->env_end = p;
39685
39686+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
39687+
39688 /* Put the elf_info on the stack in the right place. */
39689 sp = (elf_addr_t __user *)envp + 1;
39690- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
39691+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
39692 return -EFAULT;
39693 return 0;
39694 }
39695@@ -381,10 +400,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
39696 {
39697 struct elf_phdr *elf_phdata;
39698 struct elf_phdr *eppnt;
39699- unsigned long load_addr = 0;
39700+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
39701 int load_addr_set = 0;
39702 unsigned long last_bss = 0, elf_bss = 0;
39703- unsigned long error = ~0UL;
39704+ unsigned long error = -EINVAL;
39705 unsigned long total_size;
39706 int retval, i, size;
39707
39708@@ -430,6 +449,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
39709 goto out_close;
39710 }
39711
39712+#ifdef CONFIG_PAX_SEGMEXEC
39713+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
39714+ pax_task_size = SEGMEXEC_TASK_SIZE;
39715+#endif
39716+
39717 eppnt = elf_phdata;
39718 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
39719 if (eppnt->p_type == PT_LOAD) {
39720@@ -473,8 +497,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
39721 k = load_addr + eppnt->p_vaddr;
39722 if (BAD_ADDR(k) ||
39723 eppnt->p_filesz > eppnt->p_memsz ||
39724- eppnt->p_memsz > TASK_SIZE ||
39725- TASK_SIZE - eppnt->p_memsz < k) {
39726+ eppnt->p_memsz > pax_task_size ||
39727+ pax_task_size - eppnt->p_memsz < k) {
39728 error = -ENOMEM;
39729 goto out_close;
39730 }
39731@@ -528,6 +552,348 @@ out:
39732 return error;
39733 }
39734
39735+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
39736+{
39737+ unsigned long pax_flags = 0UL;
39738+
39739+#ifdef CONFIG_PAX_PT_PAX_FLAGS
39740+
39741+#ifdef CONFIG_PAX_PAGEEXEC
39742+ if (elf_phdata->p_flags & PF_PAGEEXEC)
39743+ pax_flags |= MF_PAX_PAGEEXEC;
39744+#endif
39745+
39746+#ifdef CONFIG_PAX_SEGMEXEC
39747+ if (elf_phdata->p_flags & PF_SEGMEXEC)
39748+ pax_flags |= MF_PAX_SEGMEXEC;
39749+#endif
39750+
39751+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39752+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39753+ if ((__supported_pte_mask & _PAGE_NX))
39754+ pax_flags &= ~MF_PAX_SEGMEXEC;
39755+ else
39756+ pax_flags &= ~MF_PAX_PAGEEXEC;
39757+ }
39758+#endif
39759+
39760+#ifdef CONFIG_PAX_EMUTRAMP
39761+ if (elf_phdata->p_flags & PF_EMUTRAMP)
39762+ pax_flags |= MF_PAX_EMUTRAMP;
39763+#endif
39764+
39765+#ifdef CONFIG_PAX_MPROTECT
39766+ if (elf_phdata->p_flags & PF_MPROTECT)
39767+ pax_flags |= MF_PAX_MPROTECT;
39768+#endif
39769+
39770+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
39771+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
39772+ pax_flags |= MF_PAX_RANDMMAP;
39773+#endif
39774+
39775+#endif
39776+
39777+ return pax_flags;
39778+}
39779+
39780+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
39781+{
39782+ unsigned long pax_flags = 0UL;
39783+
39784+#ifdef CONFIG_PAX_PT_PAX_FLAGS
39785+
39786+#ifdef CONFIG_PAX_PAGEEXEC
39787+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
39788+ pax_flags |= MF_PAX_PAGEEXEC;
39789+#endif
39790+
39791+#ifdef CONFIG_PAX_SEGMEXEC
39792+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
39793+ pax_flags |= MF_PAX_SEGMEXEC;
39794+#endif
39795+
39796+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39797+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39798+ if ((__supported_pte_mask & _PAGE_NX))
39799+ pax_flags &= ~MF_PAX_SEGMEXEC;
39800+ else
39801+ pax_flags &= ~MF_PAX_PAGEEXEC;
39802+ }
39803+#endif
39804+
39805+#ifdef CONFIG_PAX_EMUTRAMP
39806+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
39807+ pax_flags |= MF_PAX_EMUTRAMP;
39808+#endif
39809+
39810+#ifdef CONFIG_PAX_MPROTECT
39811+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
39812+ pax_flags |= MF_PAX_MPROTECT;
39813+#endif
39814+
39815+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
39816+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
39817+ pax_flags |= MF_PAX_RANDMMAP;
39818+#endif
39819+
39820+#endif
39821+
39822+ return pax_flags;
39823+}
39824+
39825+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
39826+{
39827+ unsigned long pax_flags = 0UL;
39828+
39829+#ifdef CONFIG_PAX_EI_PAX
39830+
39831+#ifdef CONFIG_PAX_PAGEEXEC
39832+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
39833+ pax_flags |= MF_PAX_PAGEEXEC;
39834+#endif
39835+
39836+#ifdef CONFIG_PAX_SEGMEXEC
39837+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
39838+ pax_flags |= MF_PAX_SEGMEXEC;
39839+#endif
39840+
39841+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39842+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39843+ if ((__supported_pte_mask & _PAGE_NX))
39844+ pax_flags &= ~MF_PAX_SEGMEXEC;
39845+ else
39846+ pax_flags &= ~MF_PAX_PAGEEXEC;
39847+ }
39848+#endif
39849+
39850+#ifdef CONFIG_PAX_EMUTRAMP
39851+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
39852+ pax_flags |= MF_PAX_EMUTRAMP;
39853+#endif
39854+
39855+#ifdef CONFIG_PAX_MPROTECT
39856+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
39857+ pax_flags |= MF_PAX_MPROTECT;
39858+#endif
39859+
39860+#ifdef CONFIG_PAX_ASLR
39861+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
39862+ pax_flags |= MF_PAX_RANDMMAP;
39863+#endif
39864+
39865+#else
39866+
39867+#ifdef CONFIG_PAX_PAGEEXEC
39868+ pax_flags |= MF_PAX_PAGEEXEC;
39869+#endif
39870+
39871+#ifdef CONFIG_PAX_MPROTECT
39872+ pax_flags |= MF_PAX_MPROTECT;
39873+#endif
39874+
39875+#ifdef CONFIG_PAX_RANDMMAP
39876+ pax_flags |= MF_PAX_RANDMMAP;
39877+#endif
39878+
39879+#ifdef CONFIG_PAX_SEGMEXEC
39880+ if (!(__supported_pte_mask & _PAGE_NX)) {
39881+ pax_flags &= ~MF_PAX_PAGEEXEC;
39882+ pax_flags |= MF_PAX_SEGMEXEC;
39883+ }
39884+#endif
39885+
39886+#endif
39887+
39888+ return pax_flags;
39889+}
39890+
39891+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
39892+{
39893+
39894+#ifdef CONFIG_PAX_PT_PAX_FLAGS
39895+ unsigned long i;
39896+
39897+ for (i = 0UL; i < elf_ex->e_phnum; i++)
39898+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
39899+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
39900+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
39901+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
39902+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
39903+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
39904+ return ~0UL;
39905+
39906+#ifdef CONFIG_PAX_SOFTMODE
39907+ if (pax_softmode)
39908+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
39909+ else
39910+#endif
39911+
39912+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
39913+ break;
39914+ }
39915+#endif
39916+
39917+ return ~0UL;
39918+}
39919+
39920+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
39921+{
39922+ unsigned long pax_flags = 0UL;
39923+
39924+#ifdef CONFIG_PAX_PAGEEXEC
39925+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
39926+ pax_flags |= MF_PAX_PAGEEXEC;
39927+#endif
39928+
39929+#ifdef CONFIG_PAX_SEGMEXEC
39930+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
39931+ pax_flags |= MF_PAX_SEGMEXEC;
39932+#endif
39933+
39934+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39935+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39936+ if ((__supported_pte_mask & _PAGE_NX))
39937+ pax_flags &= ~MF_PAX_SEGMEXEC;
39938+ else
39939+ pax_flags &= ~MF_PAX_PAGEEXEC;
39940+ }
39941+#endif
39942+
39943+#ifdef CONFIG_PAX_EMUTRAMP
39944+ if (pax_flags_softmode & MF_PAX_EMUTRAMP)
39945+ pax_flags |= MF_PAX_EMUTRAMP;
39946+#endif
39947+
39948+#ifdef CONFIG_PAX_MPROTECT
39949+ if (pax_flags_softmode & MF_PAX_MPROTECT)
39950+ pax_flags |= MF_PAX_MPROTECT;
39951+#endif
39952+
39953+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
39954+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
39955+ pax_flags |= MF_PAX_RANDMMAP;
39956+#endif
39957+
39958+ return pax_flags;
39959+}
39960+
39961+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
39962+{
39963+ unsigned long pax_flags = 0UL;
39964+
39965+#ifdef CONFIG_PAX_PAGEEXEC
39966+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
39967+ pax_flags |= MF_PAX_PAGEEXEC;
39968+#endif
39969+
39970+#ifdef CONFIG_PAX_SEGMEXEC
39971+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
39972+ pax_flags |= MF_PAX_SEGMEXEC;
39973+#endif
39974+
39975+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39976+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39977+ if ((__supported_pte_mask & _PAGE_NX))
39978+ pax_flags &= ~MF_PAX_SEGMEXEC;
39979+ else
39980+ pax_flags &= ~MF_PAX_PAGEEXEC;
39981+ }
39982+#endif
39983+
39984+#ifdef CONFIG_PAX_EMUTRAMP
39985+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
39986+ pax_flags |= MF_PAX_EMUTRAMP;
39987+#endif
39988+
39989+#ifdef CONFIG_PAX_MPROTECT
39990+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
39991+ pax_flags |= MF_PAX_MPROTECT;
39992+#endif
39993+
39994+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
39995+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
39996+ pax_flags |= MF_PAX_RANDMMAP;
39997+#endif
39998+
39999+ return pax_flags;
40000+}
40001+
40002+static unsigned long pax_parse_xattr_pax(struct file * const file)
40003+{
40004+
40005+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
40006+ ssize_t xattr_size, i;
40007+ unsigned char xattr_value[5];
40008+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
40009+
40010+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
40011+ if (xattr_size <= 0)
40012+ return ~0UL;
40013+
40014+ for (i = 0; i < xattr_size; i++)
40015+ switch (xattr_value[i]) {
40016+ default:
40017+ return ~0UL;
40018+
40019+#define parse_flag(option1, option2, flag) \
40020+ case option1: \
40021+ pax_flags_hardmode |= MF_PAX_##flag; \
40022+ break; \
40023+ case option2: \
40024+ pax_flags_softmode |= MF_PAX_##flag; \
40025+ break;
40026+
40027+ parse_flag('p', 'P', PAGEEXEC);
40028+ parse_flag('e', 'E', EMUTRAMP);
40029+ parse_flag('m', 'M', MPROTECT);
40030+ parse_flag('r', 'R', RANDMMAP);
40031+ parse_flag('s', 'S', SEGMEXEC);
40032+
40033+#undef parse_flag
40034+ }
40035+
40036+ if (pax_flags_hardmode & pax_flags_softmode)
40037+ return ~0UL;
40038+
40039+#ifdef CONFIG_PAX_SOFTMODE
40040+ if (pax_softmode)
40041+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
40042+ else
40043+#endif
40044+
40045+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
40046+#else
40047+ return ~0UL;
40048+#endif
40049+}
40050+
40051+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
40052+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
40053+{
40054+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
40055+
40056+ pax_flags = pax_parse_ei_pax(elf_ex);
40057+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
40058+ xattr_pax_flags = pax_parse_xattr_pax(file);
40059+
40060+ if (pt_pax_flags == ~0UL)
40061+ pt_pax_flags = xattr_pax_flags;
40062+ else if (xattr_pax_flags == ~0UL)
40063+ xattr_pax_flags = pt_pax_flags;
40064+ if (pt_pax_flags != xattr_pax_flags)
40065+ return -EINVAL;
40066+ if (pt_pax_flags != ~0UL)
40067+ pax_flags = pt_pax_flags;
40068+
40069+ if (0 > pax_check_flags(&pax_flags))
40070+ return -EINVAL;
40071+
40072+ current->mm->pax_flags = pax_flags;
40073+ return 0;
40074+}
40075+#endif
40076+
40077 /*
40078 * These are the functions used to load ELF style executables and shared
40079 * libraries. There is no binary dependent code anywhere else.
40080@@ -544,6 +910,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
40081 {
40082 unsigned int random_variable = 0;
40083
40084+#ifdef CONFIG_PAX_RANDUSTACK
40085+ if (randomize_va_space)
40086+ return stack_top - current->mm->delta_stack;
40087+#endif
40088+
40089 if ((current->flags & PF_RANDOMIZE) &&
40090 !(current->personality & ADDR_NO_RANDOMIZE)) {
40091 random_variable = get_random_int() & STACK_RND_MASK;
40092@@ -562,7 +933,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40093 unsigned long load_addr = 0, load_bias = 0;
40094 int load_addr_set = 0;
40095 char * elf_interpreter = NULL;
40096- unsigned long error;
40097+ unsigned long error = 0;
40098 struct elf_phdr *elf_ppnt, *elf_phdata;
40099 unsigned long elf_bss, elf_brk;
40100 int retval, i;
40101@@ -572,11 +943,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40102 unsigned long start_code, end_code, start_data, end_data;
40103 unsigned long reloc_func_desc __maybe_unused = 0;
40104 int executable_stack = EXSTACK_DEFAULT;
40105- unsigned long def_flags = 0;
40106 struct {
40107 struct elfhdr elf_ex;
40108 struct elfhdr interp_elf_ex;
40109 } *loc;
40110+ unsigned long pax_task_size = TASK_SIZE;
40111
40112 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
40113 if (!loc) {
40114@@ -713,11 +1084,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40115
40116 /* OK, This is the point of no return */
40117 current->flags &= ~PF_FORKNOEXEC;
40118- current->mm->def_flags = def_flags;
40119+
40120+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
40121+ current->mm->pax_flags = 0UL;
40122+#endif
40123+
40124+#ifdef CONFIG_PAX_DLRESOLVE
40125+ current->mm->call_dl_resolve = 0UL;
40126+#endif
40127+
40128+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
40129+ current->mm->call_syscall = 0UL;
40130+#endif
40131+
40132+#ifdef CONFIG_PAX_ASLR
40133+ current->mm->delta_mmap = 0UL;
40134+ current->mm->delta_stack = 0UL;
40135+#endif
40136+
40137+ current->mm->def_flags = 0;
40138+
40139+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
40140+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
40141+ send_sig(SIGKILL, current, 0);
40142+ goto out_free_dentry;
40143+ }
40144+#endif
40145+
40146+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
40147+ pax_set_initial_flags(bprm);
40148+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
40149+ if (pax_set_initial_flags_func)
40150+ (pax_set_initial_flags_func)(bprm);
40151+#endif
40152+
40153+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
40154+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
40155+ current->mm->context.user_cs_limit = PAGE_SIZE;
40156+ current->mm->def_flags |= VM_PAGEEXEC;
40157+ }
40158+#endif
40159+
40160+#ifdef CONFIG_PAX_SEGMEXEC
40161+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
40162+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
40163+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
40164+ pax_task_size = SEGMEXEC_TASK_SIZE;
40165+ current->mm->def_flags |= VM_NOHUGEPAGE;
40166+ }
40167+#endif
40168+
40169+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
40170+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
40171+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
40172+ put_cpu();
40173+ }
40174+#endif
40175
40176 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
40177 may depend on the personality. */
40178 SET_PERSONALITY(loc->elf_ex);
40179+
40180+#ifdef CONFIG_PAX_ASLR
40181+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
40182+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
40183+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
40184+ }
40185+#endif
40186+
40187+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
40188+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
40189+ executable_stack = EXSTACK_DISABLE_X;
40190+ current->personality &= ~READ_IMPLIES_EXEC;
40191+ } else
40192+#endif
40193+
40194 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
40195 current->personality |= READ_IMPLIES_EXEC;
40196
40197@@ -808,6 +1249,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40198 #else
40199 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
40200 #endif
40201+
40202+#ifdef CONFIG_PAX_RANDMMAP
40203+ /* PaX: randomize base address at the default exe base if requested */
40204+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
40205+#ifdef CONFIG_SPARC64
40206+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
40207+#else
40208+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
40209+#endif
40210+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
40211+ elf_flags |= MAP_FIXED;
40212+ }
40213+#endif
40214+
40215 }
40216
40217 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
40218@@ -840,9 +1295,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40219 * allowed task size. Note that p_filesz must always be
40220 * <= p_memsz so it is only necessary to check p_memsz.
40221 */
40222- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
40223- elf_ppnt->p_memsz > TASK_SIZE ||
40224- TASK_SIZE - elf_ppnt->p_memsz < k) {
40225+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
40226+ elf_ppnt->p_memsz > pax_task_size ||
40227+ pax_task_size - elf_ppnt->p_memsz < k) {
40228 /* set_brk can never work. Avoid overflows. */
40229 send_sig(SIGKILL, current, 0);
40230 retval = -EINVAL;
40231@@ -870,6 +1325,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40232 start_data += load_bias;
40233 end_data += load_bias;
40234
40235+#ifdef CONFIG_PAX_RANDMMAP
40236+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
40237+ elf_brk += PAGE_SIZE + ((pax_get_random_long() & ~PAGE_MASK) << 4);
40238+#endif
40239+
40240 /* Calling set_brk effectively mmaps the pages that we need
40241 * for the bss and break sections. We must do this before
40242 * mapping in the interpreter, to make sure it doesn't wind
40243@@ -881,9 +1341,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40244 goto out_free_dentry;
40245 }
40246 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
40247- send_sig(SIGSEGV, current, 0);
40248- retval = -EFAULT; /* Nobody gets to see this, but.. */
40249- goto out_free_dentry;
40250+ /*
40251+ * This bss-zeroing can fail if the ELF
40252+ * file specifies odd protections. So
40253+ * we don't check the return value
40254+ */
40255 }
40256
40257 if (elf_interpreter) {
40258@@ -1098,7 +1560,7 @@ out:
40259 * Decide what to dump of a segment, part, all or none.
40260 */
40261 static unsigned long vma_dump_size(struct vm_area_struct *vma,
40262- unsigned long mm_flags)
40263+ unsigned long mm_flags, long signr)
40264 {
40265 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
40266
40267@@ -1132,7 +1594,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
40268 if (vma->vm_file == NULL)
40269 return 0;
40270
40271- if (FILTER(MAPPED_PRIVATE))
40272+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
40273 goto whole;
40274
40275 /*
40276@@ -1354,9 +1816,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
40277 {
40278 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
40279 int i = 0;
40280- do
40281+ do {
40282 i += 2;
40283- while (auxv[i - 2] != AT_NULL);
40284+ } while (auxv[i - 2] != AT_NULL);
40285 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
40286 }
40287
40288@@ -1862,14 +2324,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
40289 }
40290
40291 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
40292- unsigned long mm_flags)
40293+ struct coredump_params *cprm)
40294 {
40295 struct vm_area_struct *vma;
40296 size_t size = 0;
40297
40298 for (vma = first_vma(current, gate_vma); vma != NULL;
40299 vma = next_vma(vma, gate_vma))
40300- size += vma_dump_size(vma, mm_flags);
40301+ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
40302 return size;
40303 }
40304
40305@@ -1963,7 +2425,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40306
40307 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
40308
40309- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
40310+ offset += elf_core_vma_data_size(gate_vma, cprm);
40311 offset += elf_core_extra_data_size();
40312 e_shoff = offset;
40313
40314@@ -1977,10 +2439,12 @@ static int elf_core_dump(struct coredump_params *cprm)
40315 offset = dataoff;
40316
40317 size += sizeof(*elf);
40318+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
40319 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
40320 goto end_coredump;
40321
40322 size += sizeof(*phdr4note);
40323+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
40324 if (size > cprm->limit
40325 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
40326 goto end_coredump;
40327@@ -1994,7 +2458,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40328 phdr.p_offset = offset;
40329 phdr.p_vaddr = vma->vm_start;
40330 phdr.p_paddr = 0;
40331- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
40332+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
40333 phdr.p_memsz = vma->vm_end - vma->vm_start;
40334 offset += phdr.p_filesz;
40335 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
40336@@ -2005,6 +2469,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40337 phdr.p_align = ELF_EXEC_PAGESIZE;
40338
40339 size += sizeof(phdr);
40340+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
40341 if (size > cprm->limit
40342 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
40343 goto end_coredump;
40344@@ -2029,7 +2494,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40345 unsigned long addr;
40346 unsigned long end;
40347
40348- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
40349+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
40350
40351 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
40352 struct page *page;
40353@@ -2038,6 +2503,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40354 page = get_dump_page(addr);
40355 if (page) {
40356 void *kaddr = kmap(page);
40357+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
40358 stop = ((size += PAGE_SIZE) > cprm->limit) ||
40359 !dump_write(cprm->file, kaddr,
40360 PAGE_SIZE);
40361@@ -2055,6 +2521,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40362
40363 if (e_phnum == PN_XNUM) {
40364 size += sizeof(*shdr4extnum);
40365+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
40366 if (size > cprm->limit
40367 || !dump_write(cprm->file, shdr4extnum,
40368 sizeof(*shdr4extnum)))
40369@@ -2075,6 +2542,97 @@ out:
40370
40371 #endif /* CONFIG_ELF_CORE */
40372
40373+#ifdef CONFIG_PAX_MPROTECT
40374+/* PaX: non-PIC ELF libraries need relocations on their executable segments
40375+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
40376+ * we'll remove VM_MAYWRITE for good on RELRO segments.
40377+ *
40378+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
40379+ * basis because we want to allow the common case and not the special ones.
40380+ */
40381+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
40382+{
40383+ struct elfhdr elf_h;
40384+ struct elf_phdr elf_p;
40385+ unsigned long i;
40386+ unsigned long oldflags;
40387+ bool is_textrel_rw, is_textrel_rx, is_relro;
40388+
40389+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
40390+ return;
40391+
40392+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
40393+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
40394+
40395+#ifdef CONFIG_PAX_ELFRELOCS
40396+ /* possible TEXTREL */
40397+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
40398+ 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);
40399+#else
40400+ is_textrel_rw = false;
40401+ is_textrel_rx = false;
40402+#endif
40403+
40404+ /* possible RELRO */
40405+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
40406+
40407+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
40408+ return;
40409+
40410+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
40411+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
40412+
40413+#ifdef CONFIG_PAX_ETEXECRELOCS
40414+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
40415+#else
40416+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
40417+#endif
40418+
40419+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
40420+ !elf_check_arch(&elf_h) ||
40421+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
40422+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
40423+ return;
40424+
40425+ for (i = 0UL; i < elf_h.e_phnum; i++) {
40426+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
40427+ return;
40428+ switch (elf_p.p_type) {
40429+ case PT_DYNAMIC:
40430+ if (!is_textrel_rw && !is_textrel_rx)
40431+ continue;
40432+ i = 0UL;
40433+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
40434+ elf_dyn dyn;
40435+
40436+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
40437+ return;
40438+ if (dyn.d_tag == DT_NULL)
40439+ return;
40440+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
40441+ gr_log_textrel(vma);
40442+ if (is_textrel_rw)
40443+ vma->vm_flags |= VM_MAYWRITE;
40444+ else
40445+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
40446+ vma->vm_flags &= ~VM_MAYWRITE;
40447+ return;
40448+ }
40449+ i++;
40450+ }
40451+ return;
40452+
40453+ case PT_GNU_RELRO:
40454+ if (!is_relro)
40455+ continue;
40456+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
40457+ vma->vm_flags &= ~VM_MAYWRITE;
40458+ return;
40459+ }
40460+ }
40461+}
40462+#endif
40463+
40464 static int __init init_elf_binfmt(void)
40465 {
40466 return register_binfmt(&elf_format);
40467diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
40468index 1bffbe0..c8c283e 100644
40469--- a/fs/binfmt_flat.c
40470+++ b/fs/binfmt_flat.c
40471@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
40472 realdatastart = (unsigned long) -ENOMEM;
40473 printk("Unable to allocate RAM for process data, errno %d\n",
40474 (int)-realdatastart);
40475+ down_write(&current->mm->mmap_sem);
40476 do_munmap(current->mm, textpos, text_len);
40477+ up_write(&current->mm->mmap_sem);
40478 ret = realdatastart;
40479 goto err;
40480 }
40481@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
40482 }
40483 if (IS_ERR_VALUE(result)) {
40484 printk("Unable to read data+bss, errno %d\n", (int)-result);
40485+ down_write(&current->mm->mmap_sem);
40486 do_munmap(current->mm, textpos, text_len);
40487 do_munmap(current->mm, realdatastart, len);
40488+ up_write(&current->mm->mmap_sem);
40489 ret = result;
40490 goto err;
40491 }
40492@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
40493 }
40494 if (IS_ERR_VALUE(result)) {
40495 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
40496+ down_write(&current->mm->mmap_sem);
40497 do_munmap(current->mm, textpos, text_len + data_len + extra +
40498 MAX_SHARED_LIBS * sizeof(unsigned long));
40499+ up_write(&current->mm->mmap_sem);
40500 ret = result;
40501 goto err;
40502 }
40503diff --git a/fs/bio.c b/fs/bio.c
40504index b1fe82c..84da0a9 100644
40505--- a/fs/bio.c
40506+++ b/fs/bio.c
40507@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
40508 const int read = bio_data_dir(bio) == READ;
40509 struct bio_map_data *bmd = bio->bi_private;
40510 int i;
40511- char *p = bmd->sgvecs[0].iov_base;
40512+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
40513
40514 __bio_for_each_segment(bvec, bio, i, 0) {
40515 char *addr = page_address(bvec->bv_page);
40516diff --git a/fs/block_dev.c b/fs/block_dev.c
40517index b07f1da..9efcb92 100644
40518--- a/fs/block_dev.c
40519+++ b/fs/block_dev.c
40520@@ -681,7 +681,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
40521 else if (bdev->bd_contains == bdev)
40522 return true; /* is a whole device which isn't held */
40523
40524- else if (whole->bd_holder == bd_may_claim)
40525+ else if (whole->bd_holder == (void *)bd_may_claim)
40526 return true; /* is a partition of a device that is being partitioned */
40527 else if (whole->bd_holder != NULL)
40528 return false; /* is a partition of a held device */
40529diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
40530index dede441..f2a2507 100644
40531--- a/fs/btrfs/ctree.c
40532+++ b/fs/btrfs/ctree.c
40533@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
40534 free_extent_buffer(buf);
40535 add_root_to_dirty_list(root);
40536 } else {
40537- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
40538- parent_start = parent->start;
40539- else
40540+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
40541+ if (parent)
40542+ parent_start = parent->start;
40543+ else
40544+ parent_start = 0;
40545+ } else
40546 parent_start = 0;
40547
40548 WARN_ON(trans->transid != btrfs_header_generation(parent));
40549diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
40550index fd1a06d..6e9033d 100644
40551--- a/fs/btrfs/inode.c
40552+++ b/fs/btrfs/inode.c
40553@@ -6895,7 +6895,7 @@ fail:
40554 return -ENOMEM;
40555 }
40556
40557-static int btrfs_getattr(struct vfsmount *mnt,
40558+int btrfs_getattr(struct vfsmount *mnt,
40559 struct dentry *dentry, struct kstat *stat)
40560 {
40561 struct inode *inode = dentry->d_inode;
40562@@ -6909,6 +6909,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
40563 return 0;
40564 }
40565
40566+EXPORT_SYMBOL(btrfs_getattr);
40567+
40568+dev_t get_btrfs_dev_from_inode(struct inode *inode)
40569+{
40570+ return BTRFS_I(inode)->root->anon_dev;
40571+}
40572+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
40573+
40574 /*
40575 * If a file is moved, it will inherit the cow and compression flags of the new
40576 * directory.
40577diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
40578index c04f02c..f5c9e2e 100644
40579--- a/fs/btrfs/ioctl.c
40580+++ b/fs/btrfs/ioctl.c
40581@@ -2733,9 +2733,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
40582 for (i = 0; i < num_types; i++) {
40583 struct btrfs_space_info *tmp;
40584
40585+ /* Don't copy in more than we allocated */
40586 if (!slot_count)
40587 break;
40588
40589+ slot_count--;
40590+
40591 info = NULL;
40592 rcu_read_lock();
40593 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
40594@@ -2757,15 +2760,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
40595 memcpy(dest, &space, sizeof(space));
40596 dest++;
40597 space_args.total_spaces++;
40598- slot_count--;
40599 }
40600- if (!slot_count)
40601- break;
40602 }
40603 up_read(&info->groups_sem);
40604 }
40605
40606- user_dest = (struct btrfs_ioctl_space_info *)
40607+ user_dest = (struct btrfs_ioctl_space_info __user *)
40608 (arg + sizeof(struct btrfs_ioctl_space_args));
40609
40610 if (copy_to_user(user_dest, dest_orig, alloc_size))
40611diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
40612index cfb5543..1ae7347 100644
40613--- a/fs/btrfs/relocation.c
40614+++ b/fs/btrfs/relocation.c
40615@@ -1244,7 +1244,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
40616 }
40617 spin_unlock(&rc->reloc_root_tree.lock);
40618
40619- BUG_ON((struct btrfs_root *)node->data != root);
40620+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
40621
40622 if (!del) {
40623 spin_lock(&rc->reloc_root_tree.lock);
40624diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
40625index 622f469..e8d2d55 100644
40626--- a/fs/cachefiles/bind.c
40627+++ b/fs/cachefiles/bind.c
40628@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
40629 args);
40630
40631 /* start by checking things over */
40632- ASSERT(cache->fstop_percent >= 0 &&
40633- cache->fstop_percent < cache->fcull_percent &&
40634+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
40635 cache->fcull_percent < cache->frun_percent &&
40636 cache->frun_percent < 100);
40637
40638- ASSERT(cache->bstop_percent >= 0 &&
40639- cache->bstop_percent < cache->bcull_percent &&
40640+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
40641 cache->bcull_percent < cache->brun_percent &&
40642 cache->brun_percent < 100);
40643
40644diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
40645index 0a1467b..6a53245 100644
40646--- a/fs/cachefiles/daemon.c
40647+++ b/fs/cachefiles/daemon.c
40648@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
40649 if (n > buflen)
40650 return -EMSGSIZE;
40651
40652- if (copy_to_user(_buffer, buffer, n) != 0)
40653+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
40654 return -EFAULT;
40655
40656 return n;
40657@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
40658 if (test_bit(CACHEFILES_DEAD, &cache->flags))
40659 return -EIO;
40660
40661- if (datalen < 0 || datalen > PAGE_SIZE - 1)
40662+ if (datalen > PAGE_SIZE - 1)
40663 return -EOPNOTSUPP;
40664
40665 /* drag the command string into the kernel so we can parse it */
40666@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
40667 if (args[0] != '%' || args[1] != '\0')
40668 return -EINVAL;
40669
40670- if (fstop < 0 || fstop >= cache->fcull_percent)
40671+ if (fstop >= cache->fcull_percent)
40672 return cachefiles_daemon_range_error(cache, args);
40673
40674 cache->fstop_percent = fstop;
40675@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
40676 if (args[0] != '%' || args[1] != '\0')
40677 return -EINVAL;
40678
40679- if (bstop < 0 || bstop >= cache->bcull_percent)
40680+ if (bstop >= cache->bcull_percent)
40681 return cachefiles_daemon_range_error(cache, args);
40682
40683 cache->bstop_percent = bstop;
40684diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
40685index bd6bc1b..b627b53 100644
40686--- a/fs/cachefiles/internal.h
40687+++ b/fs/cachefiles/internal.h
40688@@ -57,7 +57,7 @@ struct cachefiles_cache {
40689 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
40690 struct rb_root active_nodes; /* active nodes (can't be culled) */
40691 rwlock_t active_lock; /* lock for active_nodes */
40692- atomic_t gravecounter; /* graveyard uniquifier */
40693+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
40694 unsigned frun_percent; /* when to stop culling (% files) */
40695 unsigned fcull_percent; /* when to start culling (% files) */
40696 unsigned fstop_percent; /* when to stop allocating (% files) */
40697@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
40698 * proc.c
40699 */
40700 #ifdef CONFIG_CACHEFILES_HISTOGRAM
40701-extern atomic_t cachefiles_lookup_histogram[HZ];
40702-extern atomic_t cachefiles_mkdir_histogram[HZ];
40703-extern atomic_t cachefiles_create_histogram[HZ];
40704+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
40705+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
40706+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
40707
40708 extern int __init cachefiles_proc_init(void);
40709 extern void cachefiles_proc_cleanup(void);
40710 static inline
40711-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
40712+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
40713 {
40714 unsigned long jif = jiffies - start_jif;
40715 if (jif >= HZ)
40716 jif = HZ - 1;
40717- atomic_inc(&histogram[jif]);
40718+ atomic_inc_unchecked(&histogram[jif]);
40719 }
40720
40721 #else
40722diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
40723index a0358c2..d6137f2 100644
40724--- a/fs/cachefiles/namei.c
40725+++ b/fs/cachefiles/namei.c
40726@@ -318,7 +318,7 @@ try_again:
40727 /* first step is to make up a grave dentry in the graveyard */
40728 sprintf(nbuffer, "%08x%08x",
40729 (uint32_t) get_seconds(),
40730- (uint32_t) atomic_inc_return(&cache->gravecounter));
40731+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
40732
40733 /* do the multiway lock magic */
40734 trap = lock_rename(cache->graveyard, dir);
40735diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
40736index eccd339..4c1d995 100644
40737--- a/fs/cachefiles/proc.c
40738+++ b/fs/cachefiles/proc.c
40739@@ -14,9 +14,9 @@
40740 #include <linux/seq_file.h>
40741 #include "internal.h"
40742
40743-atomic_t cachefiles_lookup_histogram[HZ];
40744-atomic_t cachefiles_mkdir_histogram[HZ];
40745-atomic_t cachefiles_create_histogram[HZ];
40746+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
40747+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
40748+atomic_unchecked_t cachefiles_create_histogram[HZ];
40749
40750 /*
40751 * display the latency histogram
40752@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
40753 return 0;
40754 default:
40755 index = (unsigned long) v - 3;
40756- x = atomic_read(&cachefiles_lookup_histogram[index]);
40757- y = atomic_read(&cachefiles_mkdir_histogram[index]);
40758- z = atomic_read(&cachefiles_create_histogram[index]);
40759+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
40760+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
40761+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
40762 if (x == 0 && y == 0 && z == 0)
40763 return 0;
40764
40765diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
40766index 0e3c092..818480e 100644
40767--- a/fs/cachefiles/rdwr.c
40768+++ b/fs/cachefiles/rdwr.c
40769@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
40770 old_fs = get_fs();
40771 set_fs(KERNEL_DS);
40772 ret = file->f_op->write(
40773- file, (const void __user *) data, len, &pos);
40774+ file, (const void __force_user *) data, len, &pos);
40775 set_fs(old_fs);
40776 kunmap(page);
40777 if (ret != len)
40778diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
40779index 9895400..fa40a7d 100644
40780--- a/fs/ceph/dir.c
40781+++ b/fs/ceph/dir.c
40782@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
40783 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
40784 struct ceph_mds_client *mdsc = fsc->mdsc;
40785 unsigned frag = fpos_frag(filp->f_pos);
40786- int off = fpos_off(filp->f_pos);
40787+ unsigned int off = fpos_off(filp->f_pos);
40788 int err;
40789 u32 ftype;
40790 struct ceph_mds_reply_info_parsed *rinfo;
40791diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
40792index 84e8c07..6170d31 100644
40793--- a/fs/cifs/cifs_debug.c
40794+++ b/fs/cifs/cifs_debug.c
40795@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
40796
40797 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
40798 #ifdef CONFIG_CIFS_STATS2
40799- atomic_set(&totBufAllocCount, 0);
40800- atomic_set(&totSmBufAllocCount, 0);
40801+ atomic_set_unchecked(&totBufAllocCount, 0);
40802+ atomic_set_unchecked(&totSmBufAllocCount, 0);
40803 #endif /* CONFIG_CIFS_STATS2 */
40804 spin_lock(&cifs_tcp_ses_lock);
40805 list_for_each(tmp1, &cifs_tcp_ses_list) {
40806@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
40807 tcon = list_entry(tmp3,
40808 struct cifs_tcon,
40809 tcon_list);
40810- atomic_set(&tcon->num_smbs_sent, 0);
40811- atomic_set(&tcon->num_writes, 0);
40812- atomic_set(&tcon->num_reads, 0);
40813- atomic_set(&tcon->num_oplock_brks, 0);
40814- atomic_set(&tcon->num_opens, 0);
40815- atomic_set(&tcon->num_posixopens, 0);
40816- atomic_set(&tcon->num_posixmkdirs, 0);
40817- atomic_set(&tcon->num_closes, 0);
40818- atomic_set(&tcon->num_deletes, 0);
40819- atomic_set(&tcon->num_mkdirs, 0);
40820- atomic_set(&tcon->num_rmdirs, 0);
40821- atomic_set(&tcon->num_renames, 0);
40822- atomic_set(&tcon->num_t2renames, 0);
40823- atomic_set(&tcon->num_ffirst, 0);
40824- atomic_set(&tcon->num_fnext, 0);
40825- atomic_set(&tcon->num_fclose, 0);
40826- atomic_set(&tcon->num_hardlinks, 0);
40827- atomic_set(&tcon->num_symlinks, 0);
40828- atomic_set(&tcon->num_locks, 0);
40829+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
40830+ atomic_set_unchecked(&tcon->num_writes, 0);
40831+ atomic_set_unchecked(&tcon->num_reads, 0);
40832+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
40833+ atomic_set_unchecked(&tcon->num_opens, 0);
40834+ atomic_set_unchecked(&tcon->num_posixopens, 0);
40835+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
40836+ atomic_set_unchecked(&tcon->num_closes, 0);
40837+ atomic_set_unchecked(&tcon->num_deletes, 0);
40838+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
40839+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
40840+ atomic_set_unchecked(&tcon->num_renames, 0);
40841+ atomic_set_unchecked(&tcon->num_t2renames, 0);
40842+ atomic_set_unchecked(&tcon->num_ffirst, 0);
40843+ atomic_set_unchecked(&tcon->num_fnext, 0);
40844+ atomic_set_unchecked(&tcon->num_fclose, 0);
40845+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
40846+ atomic_set_unchecked(&tcon->num_symlinks, 0);
40847+ atomic_set_unchecked(&tcon->num_locks, 0);
40848 }
40849 }
40850 }
40851@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
40852 smBufAllocCount.counter, cifs_min_small);
40853 #ifdef CONFIG_CIFS_STATS2
40854 seq_printf(m, "Total Large %d Small %d Allocations\n",
40855- atomic_read(&totBufAllocCount),
40856- atomic_read(&totSmBufAllocCount));
40857+ atomic_read_unchecked(&totBufAllocCount),
40858+ atomic_read_unchecked(&totSmBufAllocCount));
40859 #endif /* CONFIG_CIFS_STATS2 */
40860
40861 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
40862@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
40863 if (tcon->need_reconnect)
40864 seq_puts(m, "\tDISCONNECTED ");
40865 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
40866- atomic_read(&tcon->num_smbs_sent),
40867- atomic_read(&tcon->num_oplock_brks));
40868+ atomic_read_unchecked(&tcon->num_smbs_sent),
40869+ atomic_read_unchecked(&tcon->num_oplock_brks));
40870 seq_printf(m, "\nReads: %d Bytes: %lld",
40871- atomic_read(&tcon->num_reads),
40872+ atomic_read_unchecked(&tcon->num_reads),
40873 (long long)(tcon->bytes_read));
40874 seq_printf(m, "\nWrites: %d Bytes: %lld",
40875- atomic_read(&tcon->num_writes),
40876+ atomic_read_unchecked(&tcon->num_writes),
40877 (long long)(tcon->bytes_written));
40878 seq_printf(m, "\nFlushes: %d",
40879- atomic_read(&tcon->num_flushes));
40880+ atomic_read_unchecked(&tcon->num_flushes));
40881 seq_printf(m, "\nLocks: %d HardLinks: %d "
40882 "Symlinks: %d",
40883- atomic_read(&tcon->num_locks),
40884- atomic_read(&tcon->num_hardlinks),
40885- atomic_read(&tcon->num_symlinks));
40886+ atomic_read_unchecked(&tcon->num_locks),
40887+ atomic_read_unchecked(&tcon->num_hardlinks),
40888+ atomic_read_unchecked(&tcon->num_symlinks));
40889 seq_printf(m, "\nOpens: %d Closes: %d "
40890 "Deletes: %d",
40891- atomic_read(&tcon->num_opens),
40892- atomic_read(&tcon->num_closes),
40893- atomic_read(&tcon->num_deletes));
40894+ atomic_read_unchecked(&tcon->num_opens),
40895+ atomic_read_unchecked(&tcon->num_closes),
40896+ atomic_read_unchecked(&tcon->num_deletes));
40897 seq_printf(m, "\nPosix Opens: %d "
40898 "Posix Mkdirs: %d",
40899- atomic_read(&tcon->num_posixopens),
40900- atomic_read(&tcon->num_posixmkdirs));
40901+ atomic_read_unchecked(&tcon->num_posixopens),
40902+ atomic_read_unchecked(&tcon->num_posixmkdirs));
40903 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
40904- atomic_read(&tcon->num_mkdirs),
40905- atomic_read(&tcon->num_rmdirs));
40906+ atomic_read_unchecked(&tcon->num_mkdirs),
40907+ atomic_read_unchecked(&tcon->num_rmdirs));
40908 seq_printf(m, "\nRenames: %d T2 Renames %d",
40909- atomic_read(&tcon->num_renames),
40910- atomic_read(&tcon->num_t2renames));
40911+ atomic_read_unchecked(&tcon->num_renames),
40912+ atomic_read_unchecked(&tcon->num_t2renames));
40913 seq_printf(m, "\nFindFirst: %d FNext %d "
40914 "FClose %d",
40915- atomic_read(&tcon->num_ffirst),
40916- atomic_read(&tcon->num_fnext),
40917- atomic_read(&tcon->num_fclose));
40918+ atomic_read_unchecked(&tcon->num_ffirst),
40919+ atomic_read_unchecked(&tcon->num_fnext),
40920+ atomic_read_unchecked(&tcon->num_fclose));
40921 }
40922 }
40923 }
40924diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
40925index 8f1fe32..38f9e27 100644
40926--- a/fs/cifs/cifsfs.c
40927+++ b/fs/cifs/cifsfs.c
40928@@ -989,7 +989,7 @@ cifs_init_request_bufs(void)
40929 cifs_req_cachep = kmem_cache_create("cifs_request",
40930 CIFSMaxBufSize +
40931 MAX_CIFS_HDR_SIZE, 0,
40932- SLAB_HWCACHE_ALIGN, NULL);
40933+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
40934 if (cifs_req_cachep == NULL)
40935 return -ENOMEM;
40936
40937@@ -1016,7 +1016,7 @@ cifs_init_request_bufs(void)
40938 efficient to alloc 1 per page off the slab compared to 17K (5page)
40939 alloc of large cifs buffers even when page debugging is on */
40940 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
40941- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
40942+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
40943 NULL);
40944 if (cifs_sm_req_cachep == NULL) {
40945 mempool_destroy(cifs_req_poolp);
40946@@ -1101,8 +1101,8 @@ init_cifs(void)
40947 atomic_set(&bufAllocCount, 0);
40948 atomic_set(&smBufAllocCount, 0);
40949 #ifdef CONFIG_CIFS_STATS2
40950- atomic_set(&totBufAllocCount, 0);
40951- atomic_set(&totSmBufAllocCount, 0);
40952+ atomic_set_unchecked(&totBufAllocCount, 0);
40953+ atomic_set_unchecked(&totSmBufAllocCount, 0);
40954 #endif /* CONFIG_CIFS_STATS2 */
40955
40956 atomic_set(&midCount, 0);
40957diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
40958index 8238aa1..0347196 100644
40959--- a/fs/cifs/cifsglob.h
40960+++ b/fs/cifs/cifsglob.h
40961@@ -392,28 +392,28 @@ struct cifs_tcon {
40962 __u16 Flags; /* optional support bits */
40963 enum statusEnum tidStatus;
40964 #ifdef CONFIG_CIFS_STATS
40965- atomic_t num_smbs_sent;
40966- atomic_t num_writes;
40967- atomic_t num_reads;
40968- atomic_t num_flushes;
40969- atomic_t num_oplock_brks;
40970- atomic_t num_opens;
40971- atomic_t num_closes;
40972- atomic_t num_deletes;
40973- atomic_t num_mkdirs;
40974- atomic_t num_posixopens;
40975- atomic_t num_posixmkdirs;
40976- atomic_t num_rmdirs;
40977- atomic_t num_renames;
40978- atomic_t num_t2renames;
40979- atomic_t num_ffirst;
40980- atomic_t num_fnext;
40981- atomic_t num_fclose;
40982- atomic_t num_hardlinks;
40983- atomic_t num_symlinks;
40984- atomic_t num_locks;
40985- atomic_t num_acl_get;
40986- atomic_t num_acl_set;
40987+ atomic_unchecked_t num_smbs_sent;
40988+ atomic_unchecked_t num_writes;
40989+ atomic_unchecked_t num_reads;
40990+ atomic_unchecked_t num_flushes;
40991+ atomic_unchecked_t num_oplock_brks;
40992+ atomic_unchecked_t num_opens;
40993+ atomic_unchecked_t num_closes;
40994+ atomic_unchecked_t num_deletes;
40995+ atomic_unchecked_t num_mkdirs;
40996+ atomic_unchecked_t num_posixopens;
40997+ atomic_unchecked_t num_posixmkdirs;
40998+ atomic_unchecked_t num_rmdirs;
40999+ atomic_unchecked_t num_renames;
41000+ atomic_unchecked_t num_t2renames;
41001+ atomic_unchecked_t num_ffirst;
41002+ atomic_unchecked_t num_fnext;
41003+ atomic_unchecked_t num_fclose;
41004+ atomic_unchecked_t num_hardlinks;
41005+ atomic_unchecked_t num_symlinks;
41006+ atomic_unchecked_t num_locks;
41007+ atomic_unchecked_t num_acl_get;
41008+ atomic_unchecked_t num_acl_set;
41009 #ifdef CONFIG_CIFS_STATS2
41010 unsigned long long time_writes;
41011 unsigned long long time_reads;
41012@@ -628,7 +628,7 @@ convert_delimiter(char *path, char delim)
41013 }
41014
41015 #ifdef CONFIG_CIFS_STATS
41016-#define cifs_stats_inc atomic_inc
41017+#define cifs_stats_inc atomic_inc_unchecked
41018
41019 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
41020 unsigned int bytes)
41021@@ -985,8 +985,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
41022 /* Various Debug counters */
41023 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
41024 #ifdef CONFIG_CIFS_STATS2
41025-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
41026-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
41027+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
41028+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
41029 #endif
41030 GLOBAL_EXTERN atomic_t smBufAllocCount;
41031 GLOBAL_EXTERN atomic_t midCount;
41032diff --git a/fs/cifs/link.c b/fs/cifs/link.c
41033index 6b0e064..94e6c3c 100644
41034--- a/fs/cifs/link.c
41035+++ b/fs/cifs/link.c
41036@@ -600,7 +600,7 @@ symlink_exit:
41037
41038 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
41039 {
41040- char *p = nd_get_link(nd);
41041+ const char *p = nd_get_link(nd);
41042 if (!IS_ERR(p))
41043 kfree(p);
41044 }
41045diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
41046index 703ef5c..2a44ed5 100644
41047--- a/fs/cifs/misc.c
41048+++ b/fs/cifs/misc.c
41049@@ -156,7 +156,7 @@ cifs_buf_get(void)
41050 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
41051 atomic_inc(&bufAllocCount);
41052 #ifdef CONFIG_CIFS_STATS2
41053- atomic_inc(&totBufAllocCount);
41054+ atomic_inc_unchecked(&totBufAllocCount);
41055 #endif /* CONFIG_CIFS_STATS2 */
41056 }
41057
41058@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
41059 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
41060 atomic_inc(&smBufAllocCount);
41061 #ifdef CONFIG_CIFS_STATS2
41062- atomic_inc(&totSmBufAllocCount);
41063+ atomic_inc_unchecked(&totSmBufAllocCount);
41064 #endif /* CONFIG_CIFS_STATS2 */
41065
41066 }
41067diff --git a/fs/coda/cache.c b/fs/coda/cache.c
41068index 6901578..d402eb5 100644
41069--- a/fs/coda/cache.c
41070+++ b/fs/coda/cache.c
41071@@ -24,7 +24,7 @@
41072 #include "coda_linux.h"
41073 #include "coda_cache.h"
41074
41075-static atomic_t permission_epoch = ATOMIC_INIT(0);
41076+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
41077
41078 /* replace or extend an acl cache hit */
41079 void coda_cache_enter(struct inode *inode, int mask)
41080@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
41081 struct coda_inode_info *cii = ITOC(inode);
41082
41083 spin_lock(&cii->c_lock);
41084- cii->c_cached_epoch = atomic_read(&permission_epoch);
41085+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
41086 if (cii->c_uid != current_fsuid()) {
41087 cii->c_uid = current_fsuid();
41088 cii->c_cached_perm = mask;
41089@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
41090 {
41091 struct coda_inode_info *cii = ITOC(inode);
41092 spin_lock(&cii->c_lock);
41093- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
41094+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
41095 spin_unlock(&cii->c_lock);
41096 }
41097
41098 /* remove all acl caches */
41099 void coda_cache_clear_all(struct super_block *sb)
41100 {
41101- atomic_inc(&permission_epoch);
41102+ atomic_inc_unchecked(&permission_epoch);
41103 }
41104
41105
41106@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
41107 spin_lock(&cii->c_lock);
41108 hit = (mask & cii->c_cached_perm) == mask &&
41109 cii->c_uid == current_fsuid() &&
41110- cii->c_cached_epoch == atomic_read(&permission_epoch);
41111+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
41112 spin_unlock(&cii->c_lock);
41113
41114 return hit;
41115diff --git a/fs/compat.c b/fs/compat.c
41116index c987875..08771ca 100644
41117--- a/fs/compat.c
41118+++ b/fs/compat.c
41119@@ -132,8 +132,8 @@ asmlinkage long compat_sys_utimes(const char __user *filename, struct compat_tim
41120 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
41121 {
41122 compat_ino_t ino = stat->ino;
41123- typeof(ubuf->st_uid) uid = 0;
41124- typeof(ubuf->st_gid) gid = 0;
41125+ typeof(((struct compat_stat *)0)->st_uid) uid = 0;
41126+ typeof(((struct compat_stat *)0)->st_gid) gid = 0;
41127 int err;
41128
41129 SET_UID(uid, stat->uid);
41130@@ -504,7 +504,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
41131
41132 set_fs(KERNEL_DS);
41133 /* The __user pointer cast is valid because of the set_fs() */
41134- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
41135+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
41136 set_fs(oldfs);
41137 /* truncating is ok because it's a user address */
41138 if (!ret)
41139@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
41140 goto out;
41141
41142 ret = -EINVAL;
41143- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
41144+ if (nr_segs > UIO_MAXIOV)
41145 goto out;
41146 if (nr_segs > fast_segs) {
41147 ret = -ENOMEM;
41148@@ -845,6 +845,7 @@ struct compat_old_linux_dirent {
41149
41150 struct compat_readdir_callback {
41151 struct compat_old_linux_dirent __user *dirent;
41152+ struct file * file;
41153 int result;
41154 };
41155
41156@@ -862,6 +863,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
41157 buf->result = -EOVERFLOW;
41158 return -EOVERFLOW;
41159 }
41160+
41161+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
41162+ return 0;
41163+
41164 buf->result++;
41165 dirent = buf->dirent;
41166 if (!access_ok(VERIFY_WRITE, dirent,
41167@@ -894,6 +899,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
41168
41169 buf.result = 0;
41170 buf.dirent = dirent;
41171+ buf.file = file;
41172
41173 error = vfs_readdir(file, compat_fillonedir, &buf);
41174 if (buf.result)
41175@@ -914,6 +920,7 @@ struct compat_linux_dirent {
41176 struct compat_getdents_callback {
41177 struct compat_linux_dirent __user *current_dir;
41178 struct compat_linux_dirent __user *previous;
41179+ struct file * file;
41180 int count;
41181 int error;
41182 };
41183@@ -935,6 +942,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
41184 buf->error = -EOVERFLOW;
41185 return -EOVERFLOW;
41186 }
41187+
41188+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
41189+ return 0;
41190+
41191 dirent = buf->previous;
41192 if (dirent) {
41193 if (__put_user(offset, &dirent->d_off))
41194@@ -982,6 +993,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
41195 buf.previous = NULL;
41196 buf.count = count;
41197 buf.error = 0;
41198+ buf.file = file;
41199
41200 error = vfs_readdir(file, compat_filldir, &buf);
41201 if (error >= 0)
41202@@ -1003,6 +1015,7 @@ out:
41203 struct compat_getdents_callback64 {
41204 struct linux_dirent64 __user *current_dir;
41205 struct linux_dirent64 __user *previous;
41206+ struct file * file;
41207 int count;
41208 int error;
41209 };
41210@@ -1019,6 +1032,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
41211 buf->error = -EINVAL; /* only used if we fail.. */
41212 if (reclen > buf->count)
41213 return -EINVAL;
41214+
41215+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
41216+ return 0;
41217+
41218 dirent = buf->previous;
41219
41220 if (dirent) {
41221@@ -1070,13 +1087,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
41222 buf.previous = NULL;
41223 buf.count = count;
41224 buf.error = 0;
41225+ buf.file = file;
41226
41227 error = vfs_readdir(file, compat_filldir64, &buf);
41228 if (error >= 0)
41229 error = buf.error;
41230 lastdirent = buf.previous;
41231 if (lastdirent) {
41232- typeof(lastdirent->d_off) d_off = file->f_pos;
41233+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
41234 if (__put_user_unaligned(d_off, &lastdirent->d_off))
41235 error = -EFAULT;
41236 else
41237diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
41238index 112e45a..b59845b 100644
41239--- a/fs/compat_binfmt_elf.c
41240+++ b/fs/compat_binfmt_elf.c
41241@@ -30,11 +30,13 @@
41242 #undef elf_phdr
41243 #undef elf_shdr
41244 #undef elf_note
41245+#undef elf_dyn
41246 #undef elf_addr_t
41247 #define elfhdr elf32_hdr
41248 #define elf_phdr elf32_phdr
41249 #define elf_shdr elf32_shdr
41250 #define elf_note elf32_note
41251+#define elf_dyn Elf32_Dyn
41252 #define elf_addr_t Elf32_Addr
41253
41254 /*
41255diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
41256index 51352de..93292ff 100644
41257--- a/fs/compat_ioctl.c
41258+++ b/fs/compat_ioctl.c
41259@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
41260
41261 err = get_user(palp, &up->palette);
41262 err |= get_user(length, &up->length);
41263+ if (err)
41264+ return -EFAULT;
41265
41266 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
41267 err = put_user(compat_ptr(palp), &up_native->palette);
41268@@ -621,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
41269 return -EFAULT;
41270 if (__get_user(udata, &ss32->iomem_base))
41271 return -EFAULT;
41272- ss.iomem_base = compat_ptr(udata);
41273+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
41274 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
41275 __get_user(ss.port_high, &ss32->port_high))
41276 return -EFAULT;
41277@@ -796,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
41278 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
41279 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
41280 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
41281- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
41282+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
41283 return -EFAULT;
41284
41285 return ioctl_preallocate(file, p);
41286@@ -1644,8 +1646,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
41287 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
41288 {
41289 unsigned int a, b;
41290- a = *(unsigned int *)p;
41291- b = *(unsigned int *)q;
41292+ a = *(const unsigned int *)p;
41293+ b = *(const unsigned int *)q;
41294 if (a > b)
41295 return 1;
41296 if (a < b)
41297diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
41298index 9a37a9b..35792b6 100644
41299--- a/fs/configfs/dir.c
41300+++ b/fs/configfs/dir.c
41301@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
41302 }
41303 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
41304 struct configfs_dirent *next;
41305- const char * name;
41306+ const unsigned char * name;
41307+ char d_name[sizeof(next->s_dentry->d_iname)];
41308 int len;
41309 struct inode *inode = NULL;
41310
41311@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
41312 continue;
41313
41314 name = configfs_get_name(next);
41315- len = strlen(name);
41316+ if (next->s_dentry && name == next->s_dentry->d_iname) {
41317+ len = next->s_dentry->d_name.len;
41318+ memcpy(d_name, name, len);
41319+ name = d_name;
41320+ } else
41321+ len = strlen(name);
41322
41323 /*
41324 * We'll have a dentry and an inode for
41325diff --git a/fs/dcache.c b/fs/dcache.c
41326index f7908ae..920a680 100644
41327--- a/fs/dcache.c
41328+++ b/fs/dcache.c
41329@@ -3042,7 +3042,7 @@ void __init vfs_caches_init(unsigned long mempages)
41330 mempages -= reserve;
41331
41332 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
41333- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
41334+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
41335
41336 dcache_init();
41337 inode_init();
41338diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
41339index f3a257d..715ac0f 100644
41340--- a/fs/debugfs/inode.c
41341+++ b/fs/debugfs/inode.c
41342@@ -261,7 +261,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
41343 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
41344 {
41345 return debugfs_create_file(name,
41346+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
41347+ S_IFDIR | S_IRWXU,
41348+#else
41349 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
41350+#endif
41351 parent, NULL, NULL);
41352 }
41353 EXPORT_SYMBOL_GPL(debugfs_create_dir);
41354diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
41355index d2039ca..a766407 100644
41356--- a/fs/ecryptfs/inode.c
41357+++ b/fs/ecryptfs/inode.c
41358@@ -691,7 +691,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
41359 old_fs = get_fs();
41360 set_fs(get_ds());
41361 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
41362- (char __user *)lower_buf,
41363+ (char __force_user *)lower_buf,
41364 lower_bufsiz);
41365 set_fs(old_fs);
41366 if (rc < 0)
41367@@ -737,7 +737,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
41368 }
41369 old_fs = get_fs();
41370 set_fs(get_ds());
41371- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
41372+ rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
41373 set_fs(old_fs);
41374 if (rc < 0) {
41375 kfree(buf);
41376@@ -752,7 +752,7 @@ out:
41377 static void
41378 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
41379 {
41380- char *buf = nd_get_link(nd);
41381+ const char *buf = nd_get_link(nd);
41382 if (!IS_ERR(buf)) {
41383 /* Free the char* */
41384 kfree(buf);
41385diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
41386index 0dc5a3d..d3cdeea 100644
41387--- a/fs/ecryptfs/miscdev.c
41388+++ b/fs/ecryptfs/miscdev.c
41389@@ -328,7 +328,7 @@ check_list:
41390 goto out_unlock_msg_ctx;
41391 i = 5;
41392 if (msg_ctx->msg) {
41393- if (copy_to_user(&buf[i], packet_length, packet_length_size))
41394+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
41395 goto out_unlock_msg_ctx;
41396 i += packet_length_size;
41397 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
41398diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
41399index 54eb14c..e51b453 100644
41400--- a/fs/ecryptfs/read_write.c
41401+++ b/fs/ecryptfs/read_write.c
41402@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
41403 return -EIO;
41404 fs_save = get_fs();
41405 set_fs(get_ds());
41406- rc = vfs_write(lower_file, data, size, &offset);
41407+ rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
41408 set_fs(fs_save);
41409 mark_inode_dirty_sync(ecryptfs_inode);
41410 return rc;
41411@@ -130,7 +130,12 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
41412 pgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT);
41413 size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK);
41414 size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page);
41415- size_t total_remaining_bytes = ((offset + size) - pos);
41416+ loff_t total_remaining_bytes = ((offset + size) - pos);
41417+
41418+ if (fatal_signal_pending(current)) {
41419+ rc = -EINTR;
41420+ break;
41421+ }
41422
41423 if (fatal_signal_pending(current)) {
41424 rc = -EINTR;
41425@@ -141,7 +146,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
41426 num_bytes = total_remaining_bytes;
41427 if (pos < offset) {
41428 /* remaining zeros to write, up to destination offset */
41429- size_t total_remaining_zeros = (offset - pos);
41430+ loff_t total_remaining_zeros = (offset - pos);
41431
41432 if (num_bytes > total_remaining_zeros)
41433 num_bytes = total_remaining_zeros;
41434@@ -244,7 +249,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
41435 return -EIO;
41436 fs_save = get_fs();
41437 set_fs(get_ds());
41438- rc = vfs_read(lower_file, data, size, &offset);
41439+ rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
41440 set_fs(fs_save);
41441 return rc;
41442 }
41443diff --git a/fs/exec.c b/fs/exec.c
41444index 3625464..fac01f4 100644
41445--- a/fs/exec.c
41446+++ b/fs/exec.c
41447@@ -55,12 +55,28 @@
41448 #include <linux/pipe_fs_i.h>
41449 #include <linux/oom.h>
41450 #include <linux/compat.h>
41451+#include <linux/random.h>
41452+#include <linux/seq_file.h>
41453+
41454+#ifdef CONFIG_PAX_REFCOUNT
41455+#include <linux/kallsyms.h>
41456+#include <linux/kdebug.h>
41457+#endif
41458
41459 #include <asm/uaccess.h>
41460 #include <asm/mmu_context.h>
41461 #include <asm/tlb.h>
41462 #include "internal.h"
41463
41464+#ifndef CONFIG_PAX_HAVE_ACL_FLAGS
41465+void __weak pax_set_initial_flags(struct linux_binprm *bprm) {}
41466+#endif
41467+
41468+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
41469+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
41470+EXPORT_SYMBOL(pax_set_initial_flags_func);
41471+#endif
41472+
41473 int core_uses_pid;
41474 char core_pattern[CORENAME_MAX_SIZE] = "core";
41475 unsigned int core_pipe_limit;
41476@@ -70,7 +86,7 @@ struct core_name {
41477 char *corename;
41478 int used, size;
41479 };
41480-static atomic_t call_count = ATOMIC_INIT(1);
41481+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
41482
41483 /* The maximal length of core_pattern is also specified in sysctl.c */
41484
41485@@ -188,18 +204,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
41486 int write)
41487 {
41488 struct page *page;
41489- int ret;
41490
41491-#ifdef CONFIG_STACK_GROWSUP
41492- if (write) {
41493- ret = expand_downwards(bprm->vma, pos);
41494- if (ret < 0)
41495- return NULL;
41496- }
41497-#endif
41498- ret = get_user_pages(current, bprm->mm, pos,
41499- 1, write, 1, &page, NULL);
41500- if (ret <= 0)
41501+ if (0 > expand_downwards(bprm->vma, pos))
41502+ return NULL;
41503+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
41504 return NULL;
41505
41506 if (write) {
41507@@ -274,6 +282,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
41508 vma->vm_end = STACK_TOP_MAX;
41509 vma->vm_start = vma->vm_end - PAGE_SIZE;
41510 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
41511+
41512+#ifdef CONFIG_PAX_SEGMEXEC
41513+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
41514+#endif
41515+
41516 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
41517 INIT_LIST_HEAD(&vma->anon_vma_chain);
41518
41519@@ -288,6 +301,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
41520 mm->stack_vm = mm->total_vm = 1;
41521 up_write(&mm->mmap_sem);
41522 bprm->p = vma->vm_end - sizeof(void *);
41523+
41524+#ifdef CONFIG_PAX_RANDUSTACK
41525+ if (randomize_va_space)
41526+ bprm->p ^= (pax_get_random_long() & ~15) & ~PAGE_MASK;
41527+#endif
41528+
41529 return 0;
41530 err:
41531 up_write(&mm->mmap_sem);
41532@@ -396,19 +415,7 @@ err:
41533 return err;
41534 }
41535
41536-struct user_arg_ptr {
41537-#ifdef CONFIG_COMPAT
41538- bool is_compat;
41539-#endif
41540- union {
41541- const char __user *const __user *native;
41542-#ifdef CONFIG_COMPAT
41543- compat_uptr_t __user *compat;
41544-#endif
41545- } ptr;
41546-};
41547-
41548-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
41549+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
41550 {
41551 const char __user *native;
41552
41553@@ -417,14 +424,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
41554 compat_uptr_t compat;
41555
41556 if (get_user(compat, argv.ptr.compat + nr))
41557- return ERR_PTR(-EFAULT);
41558+ return (const char __force_user *)ERR_PTR(-EFAULT);
41559
41560 return compat_ptr(compat);
41561 }
41562 #endif
41563
41564 if (get_user(native, argv.ptr.native + nr))
41565- return ERR_PTR(-EFAULT);
41566+ return (const char __force_user *)ERR_PTR(-EFAULT);
41567
41568 return native;
41569 }
41570@@ -443,7 +450,7 @@ static int count(struct user_arg_ptr argv, int max)
41571 if (!p)
41572 break;
41573
41574- if (IS_ERR(p))
41575+ if (IS_ERR((const char __force_kernel *)p))
41576 return -EFAULT;
41577
41578 if (i++ >= max)
41579@@ -477,7 +484,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
41580
41581 ret = -EFAULT;
41582 str = get_user_arg_ptr(argv, argc);
41583- if (IS_ERR(str))
41584+ if (IS_ERR((const char __force_kernel *)str))
41585 goto out;
41586
41587 len = strnlen_user(str, MAX_ARG_STRLEN);
41588@@ -559,7 +566,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
41589 int r;
41590 mm_segment_t oldfs = get_fs();
41591 struct user_arg_ptr argv = {
41592- .ptr.native = (const char __user *const __user *)__argv,
41593+ .ptr.native = (const char __force_user *const __force_user *)__argv,
41594 };
41595
41596 set_fs(KERNEL_DS);
41597@@ -594,7 +601,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
41598 unsigned long new_end = old_end - shift;
41599 struct mmu_gather tlb;
41600
41601- BUG_ON(new_start > new_end);
41602+ if (new_start >= new_end || new_start < mmap_min_addr)
41603+ return -ENOMEM;
41604
41605 /*
41606 * ensure there are no vmas between where we want to go
41607@@ -603,6 +611,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
41608 if (vma != find_vma(mm, new_start))
41609 return -EFAULT;
41610
41611+#ifdef CONFIG_PAX_SEGMEXEC
41612+ BUG_ON(pax_find_mirror_vma(vma));
41613+#endif
41614+
41615 /*
41616 * cover the whole range: [new_start, old_end)
41617 */
41618@@ -683,10 +695,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
41619 stack_top = arch_align_stack(stack_top);
41620 stack_top = PAGE_ALIGN(stack_top);
41621
41622- if (unlikely(stack_top < mmap_min_addr) ||
41623- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
41624- return -ENOMEM;
41625-
41626 stack_shift = vma->vm_end - stack_top;
41627
41628 bprm->p -= stack_shift;
41629@@ -698,8 +706,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
41630 bprm->exec -= stack_shift;
41631
41632 down_write(&mm->mmap_sem);
41633+
41634+ /* Move stack pages down in memory. */
41635+ if (stack_shift) {
41636+ ret = shift_arg_pages(vma, stack_shift);
41637+ if (ret)
41638+ goto out_unlock;
41639+ }
41640+
41641 vm_flags = VM_STACK_FLAGS;
41642
41643+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
41644+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
41645+ vm_flags &= ~VM_EXEC;
41646+
41647+#ifdef CONFIG_PAX_MPROTECT
41648+ if (mm->pax_flags & MF_PAX_MPROTECT)
41649+ vm_flags &= ~VM_MAYEXEC;
41650+#endif
41651+
41652+ }
41653+#endif
41654+
41655 /*
41656 * Adjust stack execute permissions; explicitly enable for
41657 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
41658@@ -718,13 +746,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
41659 goto out_unlock;
41660 BUG_ON(prev != vma);
41661
41662- /* Move stack pages down in memory. */
41663- if (stack_shift) {
41664- ret = shift_arg_pages(vma, stack_shift);
41665- if (ret)
41666- goto out_unlock;
41667- }
41668-
41669 /* mprotect_fixup is overkill to remove the temporary stack flags */
41670 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
41671
41672@@ -805,7 +826,7 @@ int kernel_read(struct file *file, loff_t offset,
41673 old_fs = get_fs();
41674 set_fs(get_ds());
41675 /* The cast to a user pointer is valid due to the set_fs() */
41676- result = vfs_read(file, (void __user *)addr, count, &pos);
41677+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
41678 set_fs(old_fs);
41679 return result;
41680 }
41681@@ -1247,7 +1268,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
41682 }
41683 rcu_read_unlock();
41684
41685- if (p->fs->users > n_fs) {
41686+ if (atomic_read(&p->fs->users) > n_fs) {
41687 bprm->unsafe |= LSM_UNSAFE_SHARE;
41688 } else {
41689 res = -EAGAIN;
41690@@ -1450,6 +1471,11 @@ static int do_execve_common(const char *filename,
41691 struct user_arg_ptr envp,
41692 struct pt_regs *regs)
41693 {
41694+#ifdef CONFIG_GRKERNSEC
41695+ struct file *old_exec_file;
41696+ struct acl_subject_label *old_acl;
41697+ struct rlimit old_rlim[RLIM_NLIMITS];
41698+#endif
41699 struct linux_binprm *bprm;
41700 struct file *file;
41701 struct files_struct *displaced;
41702@@ -1457,6 +1483,8 @@ static int do_execve_common(const char *filename,
41703 int retval;
41704 const struct cred *cred = current_cred();
41705
41706+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
41707+
41708 /*
41709 * We move the actual failure in case of RLIMIT_NPROC excess from
41710 * set*uid() to execve() because too many poorly written programs
41711@@ -1497,12 +1525,27 @@ static int do_execve_common(const char *filename,
41712 if (IS_ERR(file))
41713 goto out_unmark;
41714
41715+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
41716+ retval = -EPERM;
41717+ goto out_file;
41718+ }
41719+
41720 sched_exec();
41721
41722 bprm->file = file;
41723 bprm->filename = filename;
41724 bprm->interp = filename;
41725
41726+ if (gr_process_user_ban()) {
41727+ retval = -EPERM;
41728+ goto out_file;
41729+ }
41730+
41731+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
41732+ retval = -EACCES;
41733+ goto out_file;
41734+ }
41735+
41736 retval = bprm_mm_init(bprm);
41737 if (retval)
41738 goto out_file;
41739@@ -1532,9 +1575,40 @@ static int do_execve_common(const char *filename,
41740 if (retval < 0)
41741 goto out;
41742
41743+ if (!gr_tpe_allow(file)) {
41744+ retval = -EACCES;
41745+ goto out;
41746+ }
41747+
41748+ if (gr_check_crash_exec(file)) {
41749+ retval = -EACCES;
41750+ goto out;
41751+ }
41752+
41753+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
41754+
41755+ gr_handle_exec_args(bprm, argv);
41756+
41757+#ifdef CONFIG_GRKERNSEC
41758+ old_acl = current->acl;
41759+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
41760+ old_exec_file = current->exec_file;
41761+ get_file(file);
41762+ current->exec_file = file;
41763+#endif
41764+
41765+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
41766+ bprm->unsafe);
41767+ if (retval < 0)
41768+ goto out_fail;
41769+
41770 retval = search_binary_handler(bprm,regs);
41771 if (retval < 0)
41772- goto out;
41773+ goto out_fail;
41774+#ifdef CONFIG_GRKERNSEC
41775+ if (old_exec_file)
41776+ fput(old_exec_file);
41777+#endif
41778
41779 /* execve succeeded */
41780 current->fs->in_exec = 0;
41781@@ -1545,6 +1619,14 @@ static int do_execve_common(const char *filename,
41782 put_files_struct(displaced);
41783 return retval;
41784
41785+out_fail:
41786+#ifdef CONFIG_GRKERNSEC
41787+ current->acl = old_acl;
41788+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
41789+ fput(current->exec_file);
41790+ current->exec_file = old_exec_file;
41791+#endif
41792+
41793 out:
41794 if (bprm->mm) {
41795 acct_arg_size(bprm, 0);
41796@@ -1618,7 +1700,7 @@ static int expand_corename(struct core_name *cn)
41797 {
41798 char *old_corename = cn->corename;
41799
41800- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
41801+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
41802 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
41803
41804 if (!cn->corename) {
41805@@ -1715,7 +1797,7 @@ static int format_corename(struct core_name *cn, long signr)
41806 int pid_in_pattern = 0;
41807 int err = 0;
41808
41809- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
41810+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
41811 cn->corename = kmalloc(cn->size, GFP_KERNEL);
41812 cn->used = 0;
41813
41814@@ -1812,6 +1894,218 @@ out:
41815 return ispipe;
41816 }
41817
41818+int pax_check_flags(unsigned long *flags)
41819+{
41820+ int retval = 0;
41821+
41822+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
41823+ if (*flags & MF_PAX_SEGMEXEC)
41824+ {
41825+ *flags &= ~MF_PAX_SEGMEXEC;
41826+ retval = -EINVAL;
41827+ }
41828+#endif
41829+
41830+ if ((*flags & MF_PAX_PAGEEXEC)
41831+
41832+#ifdef CONFIG_PAX_PAGEEXEC
41833+ && (*flags & MF_PAX_SEGMEXEC)
41834+#endif
41835+
41836+ )
41837+ {
41838+ *flags &= ~MF_PAX_PAGEEXEC;
41839+ retval = -EINVAL;
41840+ }
41841+
41842+ if ((*flags & MF_PAX_MPROTECT)
41843+
41844+#ifdef CONFIG_PAX_MPROTECT
41845+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
41846+#endif
41847+
41848+ )
41849+ {
41850+ *flags &= ~MF_PAX_MPROTECT;
41851+ retval = -EINVAL;
41852+ }
41853+
41854+ if ((*flags & MF_PAX_EMUTRAMP)
41855+
41856+#ifdef CONFIG_PAX_EMUTRAMP
41857+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
41858+#endif
41859+
41860+ )
41861+ {
41862+ *flags &= ~MF_PAX_EMUTRAMP;
41863+ retval = -EINVAL;
41864+ }
41865+
41866+ return retval;
41867+}
41868+
41869+EXPORT_SYMBOL(pax_check_flags);
41870+
41871+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
41872+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
41873+{
41874+ struct task_struct *tsk = current;
41875+ struct mm_struct *mm = current->mm;
41876+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
41877+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
41878+ char *path_exec = NULL;
41879+ char *path_fault = NULL;
41880+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
41881+
41882+ if (buffer_exec && buffer_fault) {
41883+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
41884+
41885+ down_read(&mm->mmap_sem);
41886+ vma = mm->mmap;
41887+ while (vma && (!vma_exec || !vma_fault)) {
41888+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
41889+ vma_exec = vma;
41890+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
41891+ vma_fault = vma;
41892+ vma = vma->vm_next;
41893+ }
41894+ if (vma_exec) {
41895+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
41896+ if (IS_ERR(path_exec))
41897+ path_exec = "<path too long>";
41898+ else {
41899+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
41900+ if (path_exec) {
41901+ *path_exec = 0;
41902+ path_exec = buffer_exec;
41903+ } else
41904+ path_exec = "<path too long>";
41905+ }
41906+ }
41907+ if (vma_fault) {
41908+ start = vma_fault->vm_start;
41909+ end = vma_fault->vm_end;
41910+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
41911+ if (vma_fault->vm_file) {
41912+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
41913+ if (IS_ERR(path_fault))
41914+ path_fault = "<path too long>";
41915+ else {
41916+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
41917+ if (path_fault) {
41918+ *path_fault = 0;
41919+ path_fault = buffer_fault;
41920+ } else
41921+ path_fault = "<path too long>";
41922+ }
41923+ } else
41924+ path_fault = "<anonymous mapping>";
41925+ }
41926+ up_read(&mm->mmap_sem);
41927+ }
41928+ if (tsk->signal->curr_ip)
41929+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
41930+ else
41931+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
41932+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
41933+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
41934+ task_uid(tsk), task_euid(tsk), pc, sp);
41935+ free_page((unsigned long)buffer_exec);
41936+ free_page((unsigned long)buffer_fault);
41937+ pax_report_insns(regs, pc, sp);
41938+ do_coredump(SIGKILL, SIGKILL, regs);
41939+}
41940+#endif
41941+
41942+#ifdef CONFIG_PAX_REFCOUNT
41943+void pax_report_refcount_overflow(struct pt_regs *regs)
41944+{
41945+ if (current->signal->curr_ip)
41946+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
41947+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
41948+ else
41949+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
41950+ current->comm, task_pid_nr(current), current_uid(), current_euid());
41951+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
41952+ show_regs(regs);
41953+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
41954+}
41955+#endif
41956+
41957+#ifdef CONFIG_PAX_USERCOPY
41958+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
41959+int object_is_on_stack(const void *obj, unsigned long len)
41960+{
41961+ const void * const stack = task_stack_page(current);
41962+ const void * const stackend = stack + THREAD_SIZE;
41963+
41964+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
41965+ const void *frame = NULL;
41966+ const void *oldframe;
41967+#endif
41968+
41969+ if (obj + len < obj)
41970+ return -1;
41971+
41972+ if (obj + len <= stack || stackend <= obj)
41973+ return 0;
41974+
41975+ if (obj < stack || stackend < obj + len)
41976+ return -1;
41977+
41978+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
41979+ oldframe = __builtin_frame_address(1);
41980+ if (oldframe)
41981+ frame = __builtin_frame_address(2);
41982+ /*
41983+ low ----------------------------------------------> high
41984+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
41985+ ^----------------^
41986+ allow copies only within here
41987+ */
41988+ while (stack <= frame && frame < stackend) {
41989+ /* if obj + len extends past the last frame, this
41990+ check won't pass and the next frame will be 0,
41991+ causing us to bail out and correctly report
41992+ the copy as invalid
41993+ */
41994+ if (obj + len <= frame)
41995+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
41996+ oldframe = frame;
41997+ frame = *(const void * const *)frame;
41998+ }
41999+ return -1;
42000+#else
42001+ return 1;
42002+#endif
42003+}
42004+
42005+NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
42006+{
42007+ if (current->signal->curr_ip)
42008+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
42009+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
42010+ else
42011+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
42012+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
42013+ dump_stack();
42014+ gr_handle_kernel_exploit();
42015+ do_group_exit(SIGKILL);
42016+}
42017+#endif
42018+
42019+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
42020+void pax_track_stack(void)
42021+{
42022+ unsigned long sp = (unsigned long)&sp;
42023+ if (sp < current_thread_info()->lowest_stack &&
42024+ sp > (unsigned long)task_stack_page(current))
42025+ current_thread_info()->lowest_stack = sp;
42026+}
42027+EXPORT_SYMBOL(pax_track_stack);
42028+#endif
42029+
42030 static int zap_process(struct task_struct *start, int exit_code)
42031 {
42032 struct task_struct *t;
42033@@ -2023,17 +2317,17 @@ static void wait_for_dump_helpers(struct file *file)
42034 pipe = file->f_path.dentry->d_inode->i_pipe;
42035
42036 pipe_lock(pipe);
42037- pipe->readers++;
42038- pipe->writers--;
42039+ atomic_inc(&pipe->readers);
42040+ atomic_dec(&pipe->writers);
42041
42042- while ((pipe->readers > 1) && (!signal_pending(current))) {
42043+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
42044 wake_up_interruptible_sync(&pipe->wait);
42045 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
42046 pipe_wait(pipe);
42047 }
42048
42049- pipe->readers--;
42050- pipe->writers++;
42051+ atomic_dec(&pipe->readers);
42052+ atomic_inc(&pipe->writers);
42053 pipe_unlock(pipe);
42054
42055 }
42056@@ -2094,7 +2388,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
42057 int retval = 0;
42058 int flag = 0;
42059 int ispipe;
42060- static atomic_t core_dump_count = ATOMIC_INIT(0);
42061+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
42062 struct coredump_params cprm = {
42063 .signr = signr,
42064 .regs = regs,
42065@@ -2109,6 +2403,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
42066
42067 audit_core_dumps(signr);
42068
42069+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
42070+ gr_handle_brute_attach(current, cprm.mm_flags);
42071+
42072 binfmt = mm->binfmt;
42073 if (!binfmt || !binfmt->core_dump)
42074 goto fail;
42075@@ -2176,7 +2473,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
42076 }
42077 cprm.limit = RLIM_INFINITY;
42078
42079- dump_count = atomic_inc_return(&core_dump_count);
42080+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
42081 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
42082 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
42083 task_tgid_vnr(current), current->comm);
42084@@ -2203,6 +2500,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
42085 } else {
42086 struct inode *inode;
42087
42088+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
42089+
42090 if (cprm.limit < binfmt->min_coredump)
42091 goto fail_unlock;
42092
42093@@ -2246,7 +2545,7 @@ close_fail:
42094 filp_close(cprm.file, NULL);
42095 fail_dropcount:
42096 if (ispipe)
42097- atomic_dec(&core_dump_count);
42098+ atomic_dec_unchecked(&core_dump_count);
42099 fail_unlock:
42100 kfree(cn.corename);
42101 fail_corename:
42102@@ -2265,7 +2564,7 @@ fail:
42103 */
42104 int dump_write(struct file *file, const void *addr, int nr)
42105 {
42106- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
42107+ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
42108 }
42109 EXPORT_SYMBOL(dump_write);
42110
42111diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
42112index a8cbe1b..fed04cb 100644
42113--- a/fs/ext2/balloc.c
42114+++ b/fs/ext2/balloc.c
42115@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
42116
42117 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
42118 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
42119- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
42120+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
42121 sbi->s_resuid != current_fsuid() &&
42122 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
42123 return 0;
42124diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
42125index a203892..4e64db5 100644
42126--- a/fs/ext3/balloc.c
42127+++ b/fs/ext3/balloc.c
42128@@ -1446,9 +1446,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
42129
42130 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
42131 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
42132- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
42133+ if (free_blocks < root_blocks + 1 &&
42134 !use_reservation && sbi->s_resuid != current_fsuid() &&
42135- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
42136+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)) &&
42137+ !capable_nolog(CAP_SYS_RESOURCE)) {
42138 return 0;
42139 }
42140 return 1;
42141diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
42142index 12ccacd..a6035fce0 100644
42143--- a/fs/ext4/balloc.c
42144+++ b/fs/ext4/balloc.c
42145@@ -436,8 +436,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
42146 /* Hm, nope. Are (enough) root reserved clusters available? */
42147 if (sbi->s_resuid == current_fsuid() ||
42148 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
42149- capable(CAP_SYS_RESOURCE) ||
42150- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
42151+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
42152+ capable_nolog(CAP_SYS_RESOURCE)) {
42153
42154 if (free_clusters >= (nclusters + dirty_clusters))
42155 return 1;
42156diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
42157index 5b0e26a..0aa002d 100644
42158--- a/fs/ext4/ext4.h
42159+++ b/fs/ext4/ext4.h
42160@@ -1208,19 +1208,19 @@ struct ext4_sb_info {
42161 unsigned long s_mb_last_start;
42162
42163 /* stats for buddy allocator */
42164- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
42165- atomic_t s_bal_success; /* we found long enough chunks */
42166- atomic_t s_bal_allocated; /* in blocks */
42167- atomic_t s_bal_ex_scanned; /* total extents scanned */
42168- atomic_t s_bal_goals; /* goal hits */
42169- atomic_t s_bal_breaks; /* too long searches */
42170- atomic_t s_bal_2orders; /* 2^order hits */
42171+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
42172+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
42173+ atomic_unchecked_t s_bal_allocated; /* in blocks */
42174+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
42175+ atomic_unchecked_t s_bal_goals; /* goal hits */
42176+ atomic_unchecked_t s_bal_breaks; /* too long searches */
42177+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
42178 spinlock_t s_bal_lock;
42179 unsigned long s_mb_buddies_generated;
42180 unsigned long long s_mb_generation_time;
42181- atomic_t s_mb_lost_chunks;
42182- atomic_t s_mb_preallocated;
42183- atomic_t s_mb_discarded;
42184+ atomic_unchecked_t s_mb_lost_chunks;
42185+ atomic_unchecked_t s_mb_preallocated;
42186+ atomic_unchecked_t s_mb_discarded;
42187 atomic_t s_lock_busy;
42188
42189 /* locality groups */
42190diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
42191index e2d8be8..c7f0ce9 100644
42192--- a/fs/ext4/mballoc.c
42193+++ b/fs/ext4/mballoc.c
42194@@ -1794,7 +1794,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
42195 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
42196
42197 if (EXT4_SB(sb)->s_mb_stats)
42198- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
42199+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
42200
42201 break;
42202 }
42203@@ -2088,7 +2088,7 @@ repeat:
42204 ac->ac_status = AC_STATUS_CONTINUE;
42205 ac->ac_flags |= EXT4_MB_HINT_FIRST;
42206 cr = 3;
42207- atomic_inc(&sbi->s_mb_lost_chunks);
42208+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
42209 goto repeat;
42210 }
42211 }
42212@@ -2592,25 +2592,25 @@ int ext4_mb_release(struct super_block *sb)
42213 if (sbi->s_mb_stats) {
42214 ext4_msg(sb, KERN_INFO,
42215 "mballoc: %u blocks %u reqs (%u success)",
42216- atomic_read(&sbi->s_bal_allocated),
42217- atomic_read(&sbi->s_bal_reqs),
42218- atomic_read(&sbi->s_bal_success));
42219+ atomic_read_unchecked(&sbi->s_bal_allocated),
42220+ atomic_read_unchecked(&sbi->s_bal_reqs),
42221+ atomic_read_unchecked(&sbi->s_bal_success));
42222 ext4_msg(sb, KERN_INFO,
42223 "mballoc: %u extents scanned, %u goal hits, "
42224 "%u 2^N hits, %u breaks, %u lost",
42225- atomic_read(&sbi->s_bal_ex_scanned),
42226- atomic_read(&sbi->s_bal_goals),
42227- atomic_read(&sbi->s_bal_2orders),
42228- atomic_read(&sbi->s_bal_breaks),
42229- atomic_read(&sbi->s_mb_lost_chunks));
42230+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
42231+ atomic_read_unchecked(&sbi->s_bal_goals),
42232+ atomic_read_unchecked(&sbi->s_bal_2orders),
42233+ atomic_read_unchecked(&sbi->s_bal_breaks),
42234+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
42235 ext4_msg(sb, KERN_INFO,
42236 "mballoc: %lu generated and it took %Lu",
42237 sbi->s_mb_buddies_generated,
42238 sbi->s_mb_generation_time);
42239 ext4_msg(sb, KERN_INFO,
42240 "mballoc: %u preallocated, %u discarded",
42241- atomic_read(&sbi->s_mb_preallocated),
42242- atomic_read(&sbi->s_mb_discarded));
42243+ atomic_read_unchecked(&sbi->s_mb_preallocated),
42244+ atomic_read_unchecked(&sbi->s_mb_discarded));
42245 }
42246
42247 free_percpu(sbi->s_locality_groups);
42248@@ -3096,16 +3096,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
42249 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
42250
42251 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
42252- atomic_inc(&sbi->s_bal_reqs);
42253- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
42254+ atomic_inc_unchecked(&sbi->s_bal_reqs);
42255+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
42256 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
42257- atomic_inc(&sbi->s_bal_success);
42258- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
42259+ atomic_inc_unchecked(&sbi->s_bal_success);
42260+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
42261 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
42262 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
42263- atomic_inc(&sbi->s_bal_goals);
42264+ atomic_inc_unchecked(&sbi->s_bal_goals);
42265 if (ac->ac_found > sbi->s_mb_max_to_scan)
42266- atomic_inc(&sbi->s_bal_breaks);
42267+ atomic_inc_unchecked(&sbi->s_bal_breaks);
42268 }
42269
42270 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
42271@@ -3509,7 +3509,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
42272 trace_ext4_mb_new_inode_pa(ac, pa);
42273
42274 ext4_mb_use_inode_pa(ac, pa);
42275- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
42276+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
42277
42278 ei = EXT4_I(ac->ac_inode);
42279 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
42280@@ -3569,7 +3569,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
42281 trace_ext4_mb_new_group_pa(ac, pa);
42282
42283 ext4_mb_use_group_pa(ac, pa);
42284- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
42285+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
42286
42287 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
42288 lg = ac->ac_lg;
42289@@ -3658,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
42290 * from the bitmap and continue.
42291 */
42292 }
42293- atomic_add(free, &sbi->s_mb_discarded);
42294+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
42295
42296 return err;
42297 }
42298@@ -3676,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
42299 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
42300 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
42301 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
42302- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
42303+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
42304 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
42305
42306 return 0;
42307diff --git a/fs/fcntl.c b/fs/fcntl.c
42308index 22764c7..86372c9 100644
42309--- a/fs/fcntl.c
42310+++ b/fs/fcntl.c
42311@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
42312 if (err)
42313 return err;
42314
42315+ if (gr_handle_chroot_fowner(pid, type))
42316+ return -ENOENT;
42317+ if (gr_check_protected_task_fowner(pid, type))
42318+ return -EACCES;
42319+
42320 f_modown(filp, pid, type, force);
42321 return 0;
42322 }
42323@@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
42324
42325 static int f_setown_ex(struct file *filp, unsigned long arg)
42326 {
42327- struct f_owner_ex * __user owner_p = (void * __user)arg;
42328+ struct f_owner_ex __user *owner_p = (void __user *)arg;
42329 struct f_owner_ex owner;
42330 struct pid *pid;
42331 int type;
42332@@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
42333
42334 static int f_getown_ex(struct file *filp, unsigned long arg)
42335 {
42336- struct f_owner_ex * __user owner_p = (void * __user)arg;
42337+ struct f_owner_ex __user *owner_p = (void __user *)arg;
42338 struct f_owner_ex owner;
42339 int ret = 0;
42340
42341@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
42342 switch (cmd) {
42343 case F_DUPFD:
42344 case F_DUPFD_CLOEXEC:
42345+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
42346 if (arg >= rlimit(RLIMIT_NOFILE))
42347 break;
42348 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
42349diff --git a/fs/fifo.c b/fs/fifo.c
42350index b1a524d..4ee270e 100644
42351--- a/fs/fifo.c
42352+++ b/fs/fifo.c
42353@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
42354 */
42355 filp->f_op = &read_pipefifo_fops;
42356 pipe->r_counter++;
42357- if (pipe->readers++ == 0)
42358+ if (atomic_inc_return(&pipe->readers) == 1)
42359 wake_up_partner(inode);
42360
42361- if (!pipe->writers) {
42362+ if (!atomic_read(&pipe->writers)) {
42363 if ((filp->f_flags & O_NONBLOCK)) {
42364 /* suppress POLLHUP until we have
42365 * seen a writer */
42366@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
42367 * errno=ENXIO when there is no process reading the FIFO.
42368 */
42369 ret = -ENXIO;
42370- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
42371+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
42372 goto err;
42373
42374 filp->f_op = &write_pipefifo_fops;
42375 pipe->w_counter++;
42376- if (!pipe->writers++)
42377+ if (atomic_inc_return(&pipe->writers) == 1)
42378 wake_up_partner(inode);
42379
42380- if (!pipe->readers) {
42381+ if (!atomic_read(&pipe->readers)) {
42382 wait_for_partner(inode, &pipe->r_counter);
42383 if (signal_pending(current))
42384 goto err_wr;
42385@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
42386 */
42387 filp->f_op = &rdwr_pipefifo_fops;
42388
42389- pipe->readers++;
42390- pipe->writers++;
42391+ atomic_inc(&pipe->readers);
42392+ atomic_inc(&pipe->writers);
42393 pipe->r_counter++;
42394 pipe->w_counter++;
42395- if (pipe->readers == 1 || pipe->writers == 1)
42396+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
42397 wake_up_partner(inode);
42398 break;
42399
42400@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
42401 return 0;
42402
42403 err_rd:
42404- if (!--pipe->readers)
42405+ if (atomic_dec_and_test(&pipe->readers))
42406 wake_up_interruptible(&pipe->wait);
42407 ret = -ERESTARTSYS;
42408 goto err;
42409
42410 err_wr:
42411- if (!--pipe->writers)
42412+ if (atomic_dec_and_test(&pipe->writers))
42413 wake_up_interruptible(&pipe->wait);
42414 ret = -ERESTARTSYS;
42415 goto err;
42416
42417 err:
42418- if (!pipe->readers && !pipe->writers)
42419+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
42420 free_pipe_info(inode);
42421
42422 err_nocleanup:
42423diff --git a/fs/file.c b/fs/file.c
42424index 4c6992d..104cdea 100644
42425--- a/fs/file.c
42426+++ b/fs/file.c
42427@@ -15,6 +15,7 @@
42428 #include <linux/slab.h>
42429 #include <linux/vmalloc.h>
42430 #include <linux/file.h>
42431+#include <linux/security.h>
42432 #include <linux/fdtable.h>
42433 #include <linux/bitops.h>
42434 #include <linux/interrupt.h>
42435@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr)
42436 * N.B. For clone tasks sharing a files structure, this test
42437 * will limit the total number of files that can be opened.
42438 */
42439+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
42440 if (nr >= rlimit(RLIMIT_NOFILE))
42441 return -EMFILE;
42442
42443diff --git a/fs/filesystems.c b/fs/filesystems.c
42444index 0845f84..7b4ebef 100644
42445--- a/fs/filesystems.c
42446+++ b/fs/filesystems.c
42447@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(const char *name)
42448 int len = dot ? dot - name : strlen(name);
42449
42450 fs = __get_fs_type(name, len);
42451+
42452+#ifdef CONFIG_GRKERNSEC_MODHARDEN
42453+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
42454+#else
42455 if (!fs && (request_module("%.*s", len, name) == 0))
42456+#endif
42457 fs = __get_fs_type(name, len);
42458
42459 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
42460diff --git a/fs/fs_struct.c b/fs/fs_struct.c
42461index 78b519c..212c0d0 100644
42462--- a/fs/fs_struct.c
42463+++ b/fs/fs_struct.c
42464@@ -4,6 +4,7 @@
42465 #include <linux/path.h>
42466 #include <linux/slab.h>
42467 #include <linux/fs_struct.h>
42468+#include <linux/grsecurity.h>
42469 #include "internal.h"
42470
42471 static inline void path_get_longterm(struct path *path)
42472@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
42473 old_root = fs->root;
42474 fs->root = *path;
42475 path_get_longterm(path);
42476+ gr_set_chroot_entries(current, path);
42477 write_seqcount_end(&fs->seq);
42478 spin_unlock(&fs->lock);
42479 if (old_root.dentry)
42480@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
42481 && fs->root.mnt == old_root->mnt) {
42482 path_get_longterm(new_root);
42483 fs->root = *new_root;
42484+ gr_set_chroot_entries(p, new_root);
42485 count++;
42486 }
42487 if (fs->pwd.dentry == old_root->dentry
42488@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
42489 spin_lock(&fs->lock);
42490 write_seqcount_begin(&fs->seq);
42491 tsk->fs = NULL;
42492- kill = !--fs->users;
42493+ gr_clear_chroot_entries(tsk);
42494+ kill = !atomic_dec_return(&fs->users);
42495 write_seqcount_end(&fs->seq);
42496 spin_unlock(&fs->lock);
42497 task_unlock(tsk);
42498@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
42499 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
42500 /* We don't need to lock fs - think why ;-) */
42501 if (fs) {
42502- fs->users = 1;
42503+ atomic_set(&fs->users, 1);
42504 fs->in_exec = 0;
42505 spin_lock_init(&fs->lock);
42506 seqcount_init(&fs->seq);
42507@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
42508 spin_lock(&old->lock);
42509 fs->root = old->root;
42510 path_get_longterm(&fs->root);
42511+ /* instead of calling gr_set_chroot_entries here,
42512+ we call it from every caller of this function
42513+ */
42514 fs->pwd = old->pwd;
42515 path_get_longterm(&fs->pwd);
42516 spin_unlock(&old->lock);
42517@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
42518
42519 task_lock(current);
42520 spin_lock(&fs->lock);
42521- kill = !--fs->users;
42522+ kill = !atomic_dec_return(&fs->users);
42523 current->fs = new_fs;
42524+ gr_set_chroot_entries(current, &new_fs->root);
42525 spin_unlock(&fs->lock);
42526 task_unlock(current);
42527
42528@@ -170,7 +178,7 @@ EXPORT_SYMBOL(current_umask);
42529
42530 /* to be mentioned only in INIT_TASK */
42531 struct fs_struct init_fs = {
42532- .users = 1,
42533+ .users = ATOMIC_INIT(1),
42534 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
42535 .seq = SEQCNT_ZERO,
42536 .umask = 0022,
42537@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
42538 task_lock(current);
42539
42540 spin_lock(&init_fs.lock);
42541- init_fs.users++;
42542+ atomic_inc(&init_fs.users);
42543 spin_unlock(&init_fs.lock);
42544
42545 spin_lock(&fs->lock);
42546 current->fs = &init_fs;
42547- kill = !--fs->users;
42548+ gr_set_chroot_entries(current, &current->fs->root);
42549+ kill = !atomic_dec_return(&fs->users);
42550 spin_unlock(&fs->lock);
42551
42552 task_unlock(current);
42553diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
42554index 9905350..02eaec4 100644
42555--- a/fs/fscache/cookie.c
42556+++ b/fs/fscache/cookie.c
42557@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
42558 parent ? (char *) parent->def->name : "<no-parent>",
42559 def->name, netfs_data);
42560
42561- fscache_stat(&fscache_n_acquires);
42562+ fscache_stat_unchecked(&fscache_n_acquires);
42563
42564 /* if there's no parent cookie, then we don't create one here either */
42565 if (!parent) {
42566- fscache_stat(&fscache_n_acquires_null);
42567+ fscache_stat_unchecked(&fscache_n_acquires_null);
42568 _leave(" [no parent]");
42569 return NULL;
42570 }
42571@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
42572 /* allocate and initialise a cookie */
42573 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
42574 if (!cookie) {
42575- fscache_stat(&fscache_n_acquires_oom);
42576+ fscache_stat_unchecked(&fscache_n_acquires_oom);
42577 _leave(" [ENOMEM]");
42578 return NULL;
42579 }
42580@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
42581
42582 switch (cookie->def->type) {
42583 case FSCACHE_COOKIE_TYPE_INDEX:
42584- fscache_stat(&fscache_n_cookie_index);
42585+ fscache_stat_unchecked(&fscache_n_cookie_index);
42586 break;
42587 case FSCACHE_COOKIE_TYPE_DATAFILE:
42588- fscache_stat(&fscache_n_cookie_data);
42589+ fscache_stat_unchecked(&fscache_n_cookie_data);
42590 break;
42591 default:
42592- fscache_stat(&fscache_n_cookie_special);
42593+ fscache_stat_unchecked(&fscache_n_cookie_special);
42594 break;
42595 }
42596
42597@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
42598 if (fscache_acquire_non_index_cookie(cookie) < 0) {
42599 atomic_dec(&parent->n_children);
42600 __fscache_cookie_put(cookie);
42601- fscache_stat(&fscache_n_acquires_nobufs);
42602+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
42603 _leave(" = NULL");
42604 return NULL;
42605 }
42606 }
42607
42608- fscache_stat(&fscache_n_acquires_ok);
42609+ fscache_stat_unchecked(&fscache_n_acquires_ok);
42610 _leave(" = %p", cookie);
42611 return cookie;
42612 }
42613@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
42614 cache = fscache_select_cache_for_object(cookie->parent);
42615 if (!cache) {
42616 up_read(&fscache_addremove_sem);
42617- fscache_stat(&fscache_n_acquires_no_cache);
42618+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
42619 _leave(" = -ENOMEDIUM [no cache]");
42620 return -ENOMEDIUM;
42621 }
42622@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
42623 object = cache->ops->alloc_object(cache, cookie);
42624 fscache_stat_d(&fscache_n_cop_alloc_object);
42625 if (IS_ERR(object)) {
42626- fscache_stat(&fscache_n_object_no_alloc);
42627+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
42628 ret = PTR_ERR(object);
42629 goto error;
42630 }
42631
42632- fscache_stat(&fscache_n_object_alloc);
42633+ fscache_stat_unchecked(&fscache_n_object_alloc);
42634
42635 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
42636
42637@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
42638 struct fscache_object *object;
42639 struct hlist_node *_p;
42640
42641- fscache_stat(&fscache_n_updates);
42642+ fscache_stat_unchecked(&fscache_n_updates);
42643
42644 if (!cookie) {
42645- fscache_stat(&fscache_n_updates_null);
42646+ fscache_stat_unchecked(&fscache_n_updates_null);
42647 _leave(" [no cookie]");
42648 return;
42649 }
42650@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
42651 struct fscache_object *object;
42652 unsigned long event;
42653
42654- fscache_stat(&fscache_n_relinquishes);
42655+ fscache_stat_unchecked(&fscache_n_relinquishes);
42656 if (retire)
42657- fscache_stat(&fscache_n_relinquishes_retire);
42658+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
42659
42660 if (!cookie) {
42661- fscache_stat(&fscache_n_relinquishes_null);
42662+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
42663 _leave(" [no cookie]");
42664 return;
42665 }
42666@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
42667
42668 /* wait for the cookie to finish being instantiated (or to fail) */
42669 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
42670- fscache_stat(&fscache_n_relinquishes_waitcrt);
42671+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
42672 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
42673 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
42674 }
42675diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
42676index f6aad48..88dcf26 100644
42677--- a/fs/fscache/internal.h
42678+++ b/fs/fscache/internal.h
42679@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
42680 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
42681 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
42682
42683-extern atomic_t fscache_n_op_pend;
42684-extern atomic_t fscache_n_op_run;
42685-extern atomic_t fscache_n_op_enqueue;
42686-extern atomic_t fscache_n_op_deferred_release;
42687-extern atomic_t fscache_n_op_release;
42688-extern atomic_t fscache_n_op_gc;
42689-extern atomic_t fscache_n_op_cancelled;
42690-extern atomic_t fscache_n_op_rejected;
42691+extern atomic_unchecked_t fscache_n_op_pend;
42692+extern atomic_unchecked_t fscache_n_op_run;
42693+extern atomic_unchecked_t fscache_n_op_enqueue;
42694+extern atomic_unchecked_t fscache_n_op_deferred_release;
42695+extern atomic_unchecked_t fscache_n_op_release;
42696+extern atomic_unchecked_t fscache_n_op_gc;
42697+extern atomic_unchecked_t fscache_n_op_cancelled;
42698+extern atomic_unchecked_t fscache_n_op_rejected;
42699
42700-extern atomic_t fscache_n_attr_changed;
42701-extern atomic_t fscache_n_attr_changed_ok;
42702-extern atomic_t fscache_n_attr_changed_nobufs;
42703-extern atomic_t fscache_n_attr_changed_nomem;
42704-extern atomic_t fscache_n_attr_changed_calls;
42705+extern atomic_unchecked_t fscache_n_attr_changed;
42706+extern atomic_unchecked_t fscache_n_attr_changed_ok;
42707+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
42708+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
42709+extern atomic_unchecked_t fscache_n_attr_changed_calls;
42710
42711-extern atomic_t fscache_n_allocs;
42712-extern atomic_t fscache_n_allocs_ok;
42713-extern atomic_t fscache_n_allocs_wait;
42714-extern atomic_t fscache_n_allocs_nobufs;
42715-extern atomic_t fscache_n_allocs_intr;
42716-extern atomic_t fscache_n_allocs_object_dead;
42717-extern atomic_t fscache_n_alloc_ops;
42718-extern atomic_t fscache_n_alloc_op_waits;
42719+extern atomic_unchecked_t fscache_n_allocs;
42720+extern atomic_unchecked_t fscache_n_allocs_ok;
42721+extern atomic_unchecked_t fscache_n_allocs_wait;
42722+extern atomic_unchecked_t fscache_n_allocs_nobufs;
42723+extern atomic_unchecked_t fscache_n_allocs_intr;
42724+extern atomic_unchecked_t fscache_n_allocs_object_dead;
42725+extern atomic_unchecked_t fscache_n_alloc_ops;
42726+extern atomic_unchecked_t fscache_n_alloc_op_waits;
42727
42728-extern atomic_t fscache_n_retrievals;
42729-extern atomic_t fscache_n_retrievals_ok;
42730-extern atomic_t fscache_n_retrievals_wait;
42731-extern atomic_t fscache_n_retrievals_nodata;
42732-extern atomic_t fscache_n_retrievals_nobufs;
42733-extern atomic_t fscache_n_retrievals_intr;
42734-extern atomic_t fscache_n_retrievals_nomem;
42735-extern atomic_t fscache_n_retrievals_object_dead;
42736-extern atomic_t fscache_n_retrieval_ops;
42737-extern atomic_t fscache_n_retrieval_op_waits;
42738+extern atomic_unchecked_t fscache_n_retrievals;
42739+extern atomic_unchecked_t fscache_n_retrievals_ok;
42740+extern atomic_unchecked_t fscache_n_retrievals_wait;
42741+extern atomic_unchecked_t fscache_n_retrievals_nodata;
42742+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
42743+extern atomic_unchecked_t fscache_n_retrievals_intr;
42744+extern atomic_unchecked_t fscache_n_retrievals_nomem;
42745+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
42746+extern atomic_unchecked_t fscache_n_retrieval_ops;
42747+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
42748
42749-extern atomic_t fscache_n_stores;
42750-extern atomic_t fscache_n_stores_ok;
42751-extern atomic_t fscache_n_stores_again;
42752-extern atomic_t fscache_n_stores_nobufs;
42753-extern atomic_t fscache_n_stores_oom;
42754-extern atomic_t fscache_n_store_ops;
42755-extern atomic_t fscache_n_store_calls;
42756-extern atomic_t fscache_n_store_pages;
42757-extern atomic_t fscache_n_store_radix_deletes;
42758-extern atomic_t fscache_n_store_pages_over_limit;
42759+extern atomic_unchecked_t fscache_n_stores;
42760+extern atomic_unchecked_t fscache_n_stores_ok;
42761+extern atomic_unchecked_t fscache_n_stores_again;
42762+extern atomic_unchecked_t fscache_n_stores_nobufs;
42763+extern atomic_unchecked_t fscache_n_stores_oom;
42764+extern atomic_unchecked_t fscache_n_store_ops;
42765+extern atomic_unchecked_t fscache_n_store_calls;
42766+extern atomic_unchecked_t fscache_n_store_pages;
42767+extern atomic_unchecked_t fscache_n_store_radix_deletes;
42768+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
42769
42770-extern atomic_t fscache_n_store_vmscan_not_storing;
42771-extern atomic_t fscache_n_store_vmscan_gone;
42772-extern atomic_t fscache_n_store_vmscan_busy;
42773-extern atomic_t fscache_n_store_vmscan_cancelled;
42774+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
42775+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
42776+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
42777+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
42778
42779-extern atomic_t fscache_n_marks;
42780-extern atomic_t fscache_n_uncaches;
42781+extern atomic_unchecked_t fscache_n_marks;
42782+extern atomic_unchecked_t fscache_n_uncaches;
42783
42784-extern atomic_t fscache_n_acquires;
42785-extern atomic_t fscache_n_acquires_null;
42786-extern atomic_t fscache_n_acquires_no_cache;
42787-extern atomic_t fscache_n_acquires_ok;
42788-extern atomic_t fscache_n_acquires_nobufs;
42789-extern atomic_t fscache_n_acquires_oom;
42790+extern atomic_unchecked_t fscache_n_acquires;
42791+extern atomic_unchecked_t fscache_n_acquires_null;
42792+extern atomic_unchecked_t fscache_n_acquires_no_cache;
42793+extern atomic_unchecked_t fscache_n_acquires_ok;
42794+extern atomic_unchecked_t fscache_n_acquires_nobufs;
42795+extern atomic_unchecked_t fscache_n_acquires_oom;
42796
42797-extern atomic_t fscache_n_updates;
42798-extern atomic_t fscache_n_updates_null;
42799-extern atomic_t fscache_n_updates_run;
42800+extern atomic_unchecked_t fscache_n_updates;
42801+extern atomic_unchecked_t fscache_n_updates_null;
42802+extern atomic_unchecked_t fscache_n_updates_run;
42803
42804-extern atomic_t fscache_n_relinquishes;
42805-extern atomic_t fscache_n_relinquishes_null;
42806-extern atomic_t fscache_n_relinquishes_waitcrt;
42807-extern atomic_t fscache_n_relinquishes_retire;
42808+extern atomic_unchecked_t fscache_n_relinquishes;
42809+extern atomic_unchecked_t fscache_n_relinquishes_null;
42810+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
42811+extern atomic_unchecked_t fscache_n_relinquishes_retire;
42812
42813-extern atomic_t fscache_n_cookie_index;
42814-extern atomic_t fscache_n_cookie_data;
42815-extern atomic_t fscache_n_cookie_special;
42816+extern atomic_unchecked_t fscache_n_cookie_index;
42817+extern atomic_unchecked_t fscache_n_cookie_data;
42818+extern atomic_unchecked_t fscache_n_cookie_special;
42819
42820-extern atomic_t fscache_n_object_alloc;
42821-extern atomic_t fscache_n_object_no_alloc;
42822-extern atomic_t fscache_n_object_lookups;
42823-extern atomic_t fscache_n_object_lookups_negative;
42824-extern atomic_t fscache_n_object_lookups_positive;
42825-extern atomic_t fscache_n_object_lookups_timed_out;
42826-extern atomic_t fscache_n_object_created;
42827-extern atomic_t fscache_n_object_avail;
42828-extern atomic_t fscache_n_object_dead;
42829+extern atomic_unchecked_t fscache_n_object_alloc;
42830+extern atomic_unchecked_t fscache_n_object_no_alloc;
42831+extern atomic_unchecked_t fscache_n_object_lookups;
42832+extern atomic_unchecked_t fscache_n_object_lookups_negative;
42833+extern atomic_unchecked_t fscache_n_object_lookups_positive;
42834+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
42835+extern atomic_unchecked_t fscache_n_object_created;
42836+extern atomic_unchecked_t fscache_n_object_avail;
42837+extern atomic_unchecked_t fscache_n_object_dead;
42838
42839-extern atomic_t fscache_n_checkaux_none;
42840-extern atomic_t fscache_n_checkaux_okay;
42841-extern atomic_t fscache_n_checkaux_update;
42842-extern atomic_t fscache_n_checkaux_obsolete;
42843+extern atomic_unchecked_t fscache_n_checkaux_none;
42844+extern atomic_unchecked_t fscache_n_checkaux_okay;
42845+extern atomic_unchecked_t fscache_n_checkaux_update;
42846+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
42847
42848 extern atomic_t fscache_n_cop_alloc_object;
42849 extern atomic_t fscache_n_cop_lookup_object;
42850@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
42851 atomic_inc(stat);
42852 }
42853
42854+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
42855+{
42856+ atomic_inc_unchecked(stat);
42857+}
42858+
42859 static inline void fscache_stat_d(atomic_t *stat)
42860 {
42861 atomic_dec(stat);
42862@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
42863
42864 #define __fscache_stat(stat) (NULL)
42865 #define fscache_stat(stat) do {} while (0)
42866+#define fscache_stat_unchecked(stat) do {} while (0)
42867 #define fscache_stat_d(stat) do {} while (0)
42868 #endif
42869
42870diff --git a/fs/fscache/object.c b/fs/fscache/object.c
42871index b6b897c..0ffff9c 100644
42872--- a/fs/fscache/object.c
42873+++ b/fs/fscache/object.c
42874@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
42875 /* update the object metadata on disk */
42876 case FSCACHE_OBJECT_UPDATING:
42877 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
42878- fscache_stat(&fscache_n_updates_run);
42879+ fscache_stat_unchecked(&fscache_n_updates_run);
42880 fscache_stat(&fscache_n_cop_update_object);
42881 object->cache->ops->update_object(object);
42882 fscache_stat_d(&fscache_n_cop_update_object);
42883@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
42884 spin_lock(&object->lock);
42885 object->state = FSCACHE_OBJECT_DEAD;
42886 spin_unlock(&object->lock);
42887- fscache_stat(&fscache_n_object_dead);
42888+ fscache_stat_unchecked(&fscache_n_object_dead);
42889 goto terminal_transit;
42890
42891 /* handle the parent cache of this object being withdrawn from
42892@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
42893 spin_lock(&object->lock);
42894 object->state = FSCACHE_OBJECT_DEAD;
42895 spin_unlock(&object->lock);
42896- fscache_stat(&fscache_n_object_dead);
42897+ fscache_stat_unchecked(&fscache_n_object_dead);
42898 goto terminal_transit;
42899
42900 /* complain about the object being woken up once it is
42901@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
42902 parent->cookie->def->name, cookie->def->name,
42903 object->cache->tag->name);
42904
42905- fscache_stat(&fscache_n_object_lookups);
42906+ fscache_stat_unchecked(&fscache_n_object_lookups);
42907 fscache_stat(&fscache_n_cop_lookup_object);
42908 ret = object->cache->ops->lookup_object(object);
42909 fscache_stat_d(&fscache_n_cop_lookup_object);
42910@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
42911 if (ret == -ETIMEDOUT) {
42912 /* probably stuck behind another object, so move this one to
42913 * the back of the queue */
42914- fscache_stat(&fscache_n_object_lookups_timed_out);
42915+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
42916 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
42917 }
42918
42919@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
42920
42921 spin_lock(&object->lock);
42922 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
42923- fscache_stat(&fscache_n_object_lookups_negative);
42924+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
42925
42926 /* transit here to allow write requests to begin stacking up
42927 * and read requests to begin returning ENODATA */
42928@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
42929 * result, in which case there may be data available */
42930 spin_lock(&object->lock);
42931 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
42932- fscache_stat(&fscache_n_object_lookups_positive);
42933+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
42934
42935 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
42936
42937@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
42938 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
42939 } else {
42940 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
42941- fscache_stat(&fscache_n_object_created);
42942+ fscache_stat_unchecked(&fscache_n_object_created);
42943
42944 object->state = FSCACHE_OBJECT_AVAILABLE;
42945 spin_unlock(&object->lock);
42946@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
42947 fscache_enqueue_dependents(object);
42948
42949 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
42950- fscache_stat(&fscache_n_object_avail);
42951+ fscache_stat_unchecked(&fscache_n_object_avail);
42952
42953 _leave("");
42954 }
42955@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
42956 enum fscache_checkaux result;
42957
42958 if (!object->cookie->def->check_aux) {
42959- fscache_stat(&fscache_n_checkaux_none);
42960+ fscache_stat_unchecked(&fscache_n_checkaux_none);
42961 return FSCACHE_CHECKAUX_OKAY;
42962 }
42963
42964@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
42965 switch (result) {
42966 /* entry okay as is */
42967 case FSCACHE_CHECKAUX_OKAY:
42968- fscache_stat(&fscache_n_checkaux_okay);
42969+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
42970 break;
42971
42972 /* entry requires update */
42973 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
42974- fscache_stat(&fscache_n_checkaux_update);
42975+ fscache_stat_unchecked(&fscache_n_checkaux_update);
42976 break;
42977
42978 /* entry requires deletion */
42979 case FSCACHE_CHECKAUX_OBSOLETE:
42980- fscache_stat(&fscache_n_checkaux_obsolete);
42981+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
42982 break;
42983
42984 default:
42985diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
42986index 30afdfa..2256596 100644
42987--- a/fs/fscache/operation.c
42988+++ b/fs/fscache/operation.c
42989@@ -17,7 +17,7 @@
42990 #include <linux/slab.h>
42991 #include "internal.h"
42992
42993-atomic_t fscache_op_debug_id;
42994+atomic_unchecked_t fscache_op_debug_id;
42995 EXPORT_SYMBOL(fscache_op_debug_id);
42996
42997 /**
42998@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
42999 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
43000 ASSERTCMP(atomic_read(&op->usage), >, 0);
43001
43002- fscache_stat(&fscache_n_op_enqueue);
43003+ fscache_stat_unchecked(&fscache_n_op_enqueue);
43004 switch (op->flags & FSCACHE_OP_TYPE) {
43005 case FSCACHE_OP_ASYNC:
43006 _debug("queue async");
43007@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
43008 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
43009 if (op->processor)
43010 fscache_enqueue_operation(op);
43011- fscache_stat(&fscache_n_op_run);
43012+ fscache_stat_unchecked(&fscache_n_op_run);
43013 }
43014
43015 /*
43016@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
43017 if (object->n_ops > 1) {
43018 atomic_inc(&op->usage);
43019 list_add_tail(&op->pend_link, &object->pending_ops);
43020- fscache_stat(&fscache_n_op_pend);
43021+ fscache_stat_unchecked(&fscache_n_op_pend);
43022 } else if (!list_empty(&object->pending_ops)) {
43023 atomic_inc(&op->usage);
43024 list_add_tail(&op->pend_link, &object->pending_ops);
43025- fscache_stat(&fscache_n_op_pend);
43026+ fscache_stat_unchecked(&fscache_n_op_pend);
43027 fscache_start_operations(object);
43028 } else {
43029 ASSERTCMP(object->n_in_progress, ==, 0);
43030@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
43031 object->n_exclusive++; /* reads and writes must wait */
43032 atomic_inc(&op->usage);
43033 list_add_tail(&op->pend_link, &object->pending_ops);
43034- fscache_stat(&fscache_n_op_pend);
43035+ fscache_stat_unchecked(&fscache_n_op_pend);
43036 ret = 0;
43037 } else {
43038 /* not allowed to submit ops in any other state */
43039@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
43040 if (object->n_exclusive > 0) {
43041 atomic_inc(&op->usage);
43042 list_add_tail(&op->pend_link, &object->pending_ops);
43043- fscache_stat(&fscache_n_op_pend);
43044+ fscache_stat_unchecked(&fscache_n_op_pend);
43045 } else if (!list_empty(&object->pending_ops)) {
43046 atomic_inc(&op->usage);
43047 list_add_tail(&op->pend_link, &object->pending_ops);
43048- fscache_stat(&fscache_n_op_pend);
43049+ fscache_stat_unchecked(&fscache_n_op_pend);
43050 fscache_start_operations(object);
43051 } else {
43052 ASSERTCMP(object->n_exclusive, ==, 0);
43053@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
43054 object->n_ops++;
43055 atomic_inc(&op->usage);
43056 list_add_tail(&op->pend_link, &object->pending_ops);
43057- fscache_stat(&fscache_n_op_pend);
43058+ fscache_stat_unchecked(&fscache_n_op_pend);
43059 ret = 0;
43060 } else if (object->state == FSCACHE_OBJECT_DYING ||
43061 object->state == FSCACHE_OBJECT_LC_DYING ||
43062 object->state == FSCACHE_OBJECT_WITHDRAWING) {
43063- fscache_stat(&fscache_n_op_rejected);
43064+ fscache_stat_unchecked(&fscache_n_op_rejected);
43065 ret = -ENOBUFS;
43066 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
43067 fscache_report_unexpected_submission(object, op, ostate);
43068@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
43069
43070 ret = -EBUSY;
43071 if (!list_empty(&op->pend_link)) {
43072- fscache_stat(&fscache_n_op_cancelled);
43073+ fscache_stat_unchecked(&fscache_n_op_cancelled);
43074 list_del_init(&op->pend_link);
43075 object->n_ops--;
43076 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
43077@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
43078 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
43079 BUG();
43080
43081- fscache_stat(&fscache_n_op_release);
43082+ fscache_stat_unchecked(&fscache_n_op_release);
43083
43084 if (op->release) {
43085 op->release(op);
43086@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
43087 * lock, and defer it otherwise */
43088 if (!spin_trylock(&object->lock)) {
43089 _debug("defer put");
43090- fscache_stat(&fscache_n_op_deferred_release);
43091+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
43092
43093 cache = object->cache;
43094 spin_lock(&cache->op_gc_list_lock);
43095@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
43096
43097 _debug("GC DEFERRED REL OBJ%x OP%x",
43098 object->debug_id, op->debug_id);
43099- fscache_stat(&fscache_n_op_gc);
43100+ fscache_stat_unchecked(&fscache_n_op_gc);
43101
43102 ASSERTCMP(atomic_read(&op->usage), ==, 0);
43103
43104diff --git a/fs/fscache/page.c b/fs/fscache/page.c
43105index 3f7a59b..cf196cc 100644
43106--- a/fs/fscache/page.c
43107+++ b/fs/fscache/page.c
43108@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
43109 val = radix_tree_lookup(&cookie->stores, page->index);
43110 if (!val) {
43111 rcu_read_unlock();
43112- fscache_stat(&fscache_n_store_vmscan_not_storing);
43113+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
43114 __fscache_uncache_page(cookie, page);
43115 return true;
43116 }
43117@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
43118 spin_unlock(&cookie->stores_lock);
43119
43120 if (xpage) {
43121- fscache_stat(&fscache_n_store_vmscan_cancelled);
43122- fscache_stat(&fscache_n_store_radix_deletes);
43123+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
43124+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
43125 ASSERTCMP(xpage, ==, page);
43126 } else {
43127- fscache_stat(&fscache_n_store_vmscan_gone);
43128+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
43129 }
43130
43131 wake_up_bit(&cookie->flags, 0);
43132@@ -107,7 +107,7 @@ page_busy:
43133 /* we might want to wait here, but that could deadlock the allocator as
43134 * the work threads writing to the cache may all end up sleeping
43135 * on memory allocation */
43136- fscache_stat(&fscache_n_store_vmscan_busy);
43137+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
43138 return false;
43139 }
43140 EXPORT_SYMBOL(__fscache_maybe_release_page);
43141@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
43142 FSCACHE_COOKIE_STORING_TAG);
43143 if (!radix_tree_tag_get(&cookie->stores, page->index,
43144 FSCACHE_COOKIE_PENDING_TAG)) {
43145- fscache_stat(&fscache_n_store_radix_deletes);
43146+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
43147 xpage = radix_tree_delete(&cookie->stores, page->index);
43148 }
43149 spin_unlock(&cookie->stores_lock);
43150@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
43151
43152 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
43153
43154- fscache_stat(&fscache_n_attr_changed_calls);
43155+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
43156
43157 if (fscache_object_is_active(object)) {
43158 fscache_stat(&fscache_n_cop_attr_changed);
43159@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
43160
43161 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
43162
43163- fscache_stat(&fscache_n_attr_changed);
43164+ fscache_stat_unchecked(&fscache_n_attr_changed);
43165
43166 op = kzalloc(sizeof(*op), GFP_KERNEL);
43167 if (!op) {
43168- fscache_stat(&fscache_n_attr_changed_nomem);
43169+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
43170 _leave(" = -ENOMEM");
43171 return -ENOMEM;
43172 }
43173@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
43174 if (fscache_submit_exclusive_op(object, op) < 0)
43175 goto nobufs;
43176 spin_unlock(&cookie->lock);
43177- fscache_stat(&fscache_n_attr_changed_ok);
43178+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
43179 fscache_put_operation(op);
43180 _leave(" = 0");
43181 return 0;
43182@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
43183 nobufs:
43184 spin_unlock(&cookie->lock);
43185 kfree(op);
43186- fscache_stat(&fscache_n_attr_changed_nobufs);
43187+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
43188 _leave(" = %d", -ENOBUFS);
43189 return -ENOBUFS;
43190 }
43191@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
43192 /* allocate a retrieval operation and attempt to submit it */
43193 op = kzalloc(sizeof(*op), GFP_NOIO);
43194 if (!op) {
43195- fscache_stat(&fscache_n_retrievals_nomem);
43196+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
43197 return NULL;
43198 }
43199
43200@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
43201 return 0;
43202 }
43203
43204- fscache_stat(&fscache_n_retrievals_wait);
43205+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
43206
43207 jif = jiffies;
43208 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
43209 fscache_wait_bit_interruptible,
43210 TASK_INTERRUPTIBLE) != 0) {
43211- fscache_stat(&fscache_n_retrievals_intr);
43212+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
43213 _leave(" = -ERESTARTSYS");
43214 return -ERESTARTSYS;
43215 }
43216@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
43217 */
43218 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
43219 struct fscache_retrieval *op,
43220- atomic_t *stat_op_waits,
43221- atomic_t *stat_object_dead)
43222+ atomic_unchecked_t *stat_op_waits,
43223+ atomic_unchecked_t *stat_object_dead)
43224 {
43225 int ret;
43226
43227@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
43228 goto check_if_dead;
43229
43230 _debug(">>> WT");
43231- fscache_stat(stat_op_waits);
43232+ fscache_stat_unchecked(stat_op_waits);
43233 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
43234 fscache_wait_bit_interruptible,
43235 TASK_INTERRUPTIBLE) < 0) {
43236@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
43237
43238 check_if_dead:
43239 if (unlikely(fscache_object_is_dead(object))) {
43240- fscache_stat(stat_object_dead);
43241+ fscache_stat_unchecked(stat_object_dead);
43242 return -ENOBUFS;
43243 }
43244 return 0;
43245@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
43246
43247 _enter("%p,%p,,,", cookie, page);
43248
43249- fscache_stat(&fscache_n_retrievals);
43250+ fscache_stat_unchecked(&fscache_n_retrievals);
43251
43252 if (hlist_empty(&cookie->backing_objects))
43253 goto nobufs;
43254@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
43255 goto nobufs_unlock;
43256 spin_unlock(&cookie->lock);
43257
43258- fscache_stat(&fscache_n_retrieval_ops);
43259+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
43260
43261 /* pin the netfs read context in case we need to do the actual netfs
43262 * read because we've encountered a cache read failure */
43263@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
43264
43265 error:
43266 if (ret == -ENOMEM)
43267- fscache_stat(&fscache_n_retrievals_nomem);
43268+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
43269 else if (ret == -ERESTARTSYS)
43270- fscache_stat(&fscache_n_retrievals_intr);
43271+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
43272 else if (ret == -ENODATA)
43273- fscache_stat(&fscache_n_retrievals_nodata);
43274+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
43275 else if (ret < 0)
43276- fscache_stat(&fscache_n_retrievals_nobufs);
43277+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
43278 else
43279- fscache_stat(&fscache_n_retrievals_ok);
43280+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
43281
43282 fscache_put_retrieval(op);
43283 _leave(" = %d", ret);
43284@@ -429,7 +429,7 @@ nobufs_unlock:
43285 spin_unlock(&cookie->lock);
43286 kfree(op);
43287 nobufs:
43288- fscache_stat(&fscache_n_retrievals_nobufs);
43289+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
43290 _leave(" = -ENOBUFS");
43291 return -ENOBUFS;
43292 }
43293@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
43294
43295 _enter("%p,,%d,,,", cookie, *nr_pages);
43296
43297- fscache_stat(&fscache_n_retrievals);
43298+ fscache_stat_unchecked(&fscache_n_retrievals);
43299
43300 if (hlist_empty(&cookie->backing_objects))
43301 goto nobufs;
43302@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
43303 goto nobufs_unlock;
43304 spin_unlock(&cookie->lock);
43305
43306- fscache_stat(&fscache_n_retrieval_ops);
43307+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
43308
43309 /* pin the netfs read context in case we need to do the actual netfs
43310 * read because we've encountered a cache read failure */
43311@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
43312
43313 error:
43314 if (ret == -ENOMEM)
43315- fscache_stat(&fscache_n_retrievals_nomem);
43316+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
43317 else if (ret == -ERESTARTSYS)
43318- fscache_stat(&fscache_n_retrievals_intr);
43319+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
43320 else if (ret == -ENODATA)
43321- fscache_stat(&fscache_n_retrievals_nodata);
43322+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
43323 else if (ret < 0)
43324- fscache_stat(&fscache_n_retrievals_nobufs);
43325+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
43326 else
43327- fscache_stat(&fscache_n_retrievals_ok);
43328+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
43329
43330 fscache_put_retrieval(op);
43331 _leave(" = %d", ret);
43332@@ -545,7 +545,7 @@ nobufs_unlock:
43333 spin_unlock(&cookie->lock);
43334 kfree(op);
43335 nobufs:
43336- fscache_stat(&fscache_n_retrievals_nobufs);
43337+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
43338 _leave(" = -ENOBUFS");
43339 return -ENOBUFS;
43340 }
43341@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
43342
43343 _enter("%p,%p,,,", cookie, page);
43344
43345- fscache_stat(&fscache_n_allocs);
43346+ fscache_stat_unchecked(&fscache_n_allocs);
43347
43348 if (hlist_empty(&cookie->backing_objects))
43349 goto nobufs;
43350@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
43351 goto nobufs_unlock;
43352 spin_unlock(&cookie->lock);
43353
43354- fscache_stat(&fscache_n_alloc_ops);
43355+ fscache_stat_unchecked(&fscache_n_alloc_ops);
43356
43357 ret = fscache_wait_for_retrieval_activation(
43358 object, op,
43359@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
43360
43361 error:
43362 if (ret == -ERESTARTSYS)
43363- fscache_stat(&fscache_n_allocs_intr);
43364+ fscache_stat_unchecked(&fscache_n_allocs_intr);
43365 else if (ret < 0)
43366- fscache_stat(&fscache_n_allocs_nobufs);
43367+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
43368 else
43369- fscache_stat(&fscache_n_allocs_ok);
43370+ fscache_stat_unchecked(&fscache_n_allocs_ok);
43371
43372 fscache_put_retrieval(op);
43373 _leave(" = %d", ret);
43374@@ -625,7 +625,7 @@ nobufs_unlock:
43375 spin_unlock(&cookie->lock);
43376 kfree(op);
43377 nobufs:
43378- fscache_stat(&fscache_n_allocs_nobufs);
43379+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
43380 _leave(" = -ENOBUFS");
43381 return -ENOBUFS;
43382 }
43383@@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
43384
43385 spin_lock(&cookie->stores_lock);
43386
43387- fscache_stat(&fscache_n_store_calls);
43388+ fscache_stat_unchecked(&fscache_n_store_calls);
43389
43390 /* find a page to store */
43391 page = NULL;
43392@@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
43393 page = results[0];
43394 _debug("gang %d [%lx]", n, page->index);
43395 if (page->index > op->store_limit) {
43396- fscache_stat(&fscache_n_store_pages_over_limit);
43397+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
43398 goto superseded;
43399 }
43400
43401@@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
43402 spin_unlock(&cookie->stores_lock);
43403 spin_unlock(&object->lock);
43404
43405- fscache_stat(&fscache_n_store_pages);
43406+ fscache_stat_unchecked(&fscache_n_store_pages);
43407 fscache_stat(&fscache_n_cop_write_page);
43408 ret = object->cache->ops->write_page(op, page);
43409 fscache_stat_d(&fscache_n_cop_write_page);
43410@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
43411 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
43412 ASSERT(PageFsCache(page));
43413
43414- fscache_stat(&fscache_n_stores);
43415+ fscache_stat_unchecked(&fscache_n_stores);
43416
43417 op = kzalloc(sizeof(*op), GFP_NOIO);
43418 if (!op)
43419@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
43420 spin_unlock(&cookie->stores_lock);
43421 spin_unlock(&object->lock);
43422
43423- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
43424+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
43425 op->store_limit = object->store_limit;
43426
43427 if (fscache_submit_op(object, &op->op) < 0)
43428@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
43429
43430 spin_unlock(&cookie->lock);
43431 radix_tree_preload_end();
43432- fscache_stat(&fscache_n_store_ops);
43433- fscache_stat(&fscache_n_stores_ok);
43434+ fscache_stat_unchecked(&fscache_n_store_ops);
43435+ fscache_stat_unchecked(&fscache_n_stores_ok);
43436
43437 /* the work queue now carries its own ref on the object */
43438 fscache_put_operation(&op->op);
43439@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
43440 return 0;
43441
43442 already_queued:
43443- fscache_stat(&fscache_n_stores_again);
43444+ fscache_stat_unchecked(&fscache_n_stores_again);
43445 already_pending:
43446 spin_unlock(&cookie->stores_lock);
43447 spin_unlock(&object->lock);
43448 spin_unlock(&cookie->lock);
43449 radix_tree_preload_end();
43450 kfree(op);
43451- fscache_stat(&fscache_n_stores_ok);
43452+ fscache_stat_unchecked(&fscache_n_stores_ok);
43453 _leave(" = 0");
43454 return 0;
43455
43456@@ -851,14 +851,14 @@ nobufs:
43457 spin_unlock(&cookie->lock);
43458 radix_tree_preload_end();
43459 kfree(op);
43460- fscache_stat(&fscache_n_stores_nobufs);
43461+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
43462 _leave(" = -ENOBUFS");
43463 return -ENOBUFS;
43464
43465 nomem_free:
43466 kfree(op);
43467 nomem:
43468- fscache_stat(&fscache_n_stores_oom);
43469+ fscache_stat_unchecked(&fscache_n_stores_oom);
43470 _leave(" = -ENOMEM");
43471 return -ENOMEM;
43472 }
43473@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
43474 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
43475 ASSERTCMP(page, !=, NULL);
43476
43477- fscache_stat(&fscache_n_uncaches);
43478+ fscache_stat_unchecked(&fscache_n_uncaches);
43479
43480 /* cache withdrawal may beat us to it */
43481 if (!PageFsCache(page))
43482@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
43483 unsigned long loop;
43484
43485 #ifdef CONFIG_FSCACHE_STATS
43486- atomic_add(pagevec->nr, &fscache_n_marks);
43487+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
43488 #endif
43489
43490 for (loop = 0; loop < pagevec->nr; loop++) {
43491diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
43492index 4765190..2a067f2 100644
43493--- a/fs/fscache/stats.c
43494+++ b/fs/fscache/stats.c
43495@@ -18,95 +18,95 @@
43496 /*
43497 * operation counters
43498 */
43499-atomic_t fscache_n_op_pend;
43500-atomic_t fscache_n_op_run;
43501-atomic_t fscache_n_op_enqueue;
43502-atomic_t fscache_n_op_requeue;
43503-atomic_t fscache_n_op_deferred_release;
43504-atomic_t fscache_n_op_release;
43505-atomic_t fscache_n_op_gc;
43506-atomic_t fscache_n_op_cancelled;
43507-atomic_t fscache_n_op_rejected;
43508+atomic_unchecked_t fscache_n_op_pend;
43509+atomic_unchecked_t fscache_n_op_run;
43510+atomic_unchecked_t fscache_n_op_enqueue;
43511+atomic_unchecked_t fscache_n_op_requeue;
43512+atomic_unchecked_t fscache_n_op_deferred_release;
43513+atomic_unchecked_t fscache_n_op_release;
43514+atomic_unchecked_t fscache_n_op_gc;
43515+atomic_unchecked_t fscache_n_op_cancelled;
43516+atomic_unchecked_t fscache_n_op_rejected;
43517
43518-atomic_t fscache_n_attr_changed;
43519-atomic_t fscache_n_attr_changed_ok;
43520-atomic_t fscache_n_attr_changed_nobufs;
43521-atomic_t fscache_n_attr_changed_nomem;
43522-atomic_t fscache_n_attr_changed_calls;
43523+atomic_unchecked_t fscache_n_attr_changed;
43524+atomic_unchecked_t fscache_n_attr_changed_ok;
43525+atomic_unchecked_t fscache_n_attr_changed_nobufs;
43526+atomic_unchecked_t fscache_n_attr_changed_nomem;
43527+atomic_unchecked_t fscache_n_attr_changed_calls;
43528
43529-atomic_t fscache_n_allocs;
43530-atomic_t fscache_n_allocs_ok;
43531-atomic_t fscache_n_allocs_wait;
43532-atomic_t fscache_n_allocs_nobufs;
43533-atomic_t fscache_n_allocs_intr;
43534-atomic_t fscache_n_allocs_object_dead;
43535-atomic_t fscache_n_alloc_ops;
43536-atomic_t fscache_n_alloc_op_waits;
43537+atomic_unchecked_t fscache_n_allocs;
43538+atomic_unchecked_t fscache_n_allocs_ok;
43539+atomic_unchecked_t fscache_n_allocs_wait;
43540+atomic_unchecked_t fscache_n_allocs_nobufs;
43541+atomic_unchecked_t fscache_n_allocs_intr;
43542+atomic_unchecked_t fscache_n_allocs_object_dead;
43543+atomic_unchecked_t fscache_n_alloc_ops;
43544+atomic_unchecked_t fscache_n_alloc_op_waits;
43545
43546-atomic_t fscache_n_retrievals;
43547-atomic_t fscache_n_retrievals_ok;
43548-atomic_t fscache_n_retrievals_wait;
43549-atomic_t fscache_n_retrievals_nodata;
43550-atomic_t fscache_n_retrievals_nobufs;
43551-atomic_t fscache_n_retrievals_intr;
43552-atomic_t fscache_n_retrievals_nomem;
43553-atomic_t fscache_n_retrievals_object_dead;
43554-atomic_t fscache_n_retrieval_ops;
43555-atomic_t fscache_n_retrieval_op_waits;
43556+atomic_unchecked_t fscache_n_retrievals;
43557+atomic_unchecked_t fscache_n_retrievals_ok;
43558+atomic_unchecked_t fscache_n_retrievals_wait;
43559+atomic_unchecked_t fscache_n_retrievals_nodata;
43560+atomic_unchecked_t fscache_n_retrievals_nobufs;
43561+atomic_unchecked_t fscache_n_retrievals_intr;
43562+atomic_unchecked_t fscache_n_retrievals_nomem;
43563+atomic_unchecked_t fscache_n_retrievals_object_dead;
43564+atomic_unchecked_t fscache_n_retrieval_ops;
43565+atomic_unchecked_t fscache_n_retrieval_op_waits;
43566
43567-atomic_t fscache_n_stores;
43568-atomic_t fscache_n_stores_ok;
43569-atomic_t fscache_n_stores_again;
43570-atomic_t fscache_n_stores_nobufs;
43571-atomic_t fscache_n_stores_oom;
43572-atomic_t fscache_n_store_ops;
43573-atomic_t fscache_n_store_calls;
43574-atomic_t fscache_n_store_pages;
43575-atomic_t fscache_n_store_radix_deletes;
43576-atomic_t fscache_n_store_pages_over_limit;
43577+atomic_unchecked_t fscache_n_stores;
43578+atomic_unchecked_t fscache_n_stores_ok;
43579+atomic_unchecked_t fscache_n_stores_again;
43580+atomic_unchecked_t fscache_n_stores_nobufs;
43581+atomic_unchecked_t fscache_n_stores_oom;
43582+atomic_unchecked_t fscache_n_store_ops;
43583+atomic_unchecked_t fscache_n_store_calls;
43584+atomic_unchecked_t fscache_n_store_pages;
43585+atomic_unchecked_t fscache_n_store_radix_deletes;
43586+atomic_unchecked_t fscache_n_store_pages_over_limit;
43587
43588-atomic_t fscache_n_store_vmscan_not_storing;
43589-atomic_t fscache_n_store_vmscan_gone;
43590-atomic_t fscache_n_store_vmscan_busy;
43591-atomic_t fscache_n_store_vmscan_cancelled;
43592+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
43593+atomic_unchecked_t fscache_n_store_vmscan_gone;
43594+atomic_unchecked_t fscache_n_store_vmscan_busy;
43595+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
43596
43597-atomic_t fscache_n_marks;
43598-atomic_t fscache_n_uncaches;
43599+atomic_unchecked_t fscache_n_marks;
43600+atomic_unchecked_t fscache_n_uncaches;
43601
43602-atomic_t fscache_n_acquires;
43603-atomic_t fscache_n_acquires_null;
43604-atomic_t fscache_n_acquires_no_cache;
43605-atomic_t fscache_n_acquires_ok;
43606-atomic_t fscache_n_acquires_nobufs;
43607-atomic_t fscache_n_acquires_oom;
43608+atomic_unchecked_t fscache_n_acquires;
43609+atomic_unchecked_t fscache_n_acquires_null;
43610+atomic_unchecked_t fscache_n_acquires_no_cache;
43611+atomic_unchecked_t fscache_n_acquires_ok;
43612+atomic_unchecked_t fscache_n_acquires_nobufs;
43613+atomic_unchecked_t fscache_n_acquires_oom;
43614
43615-atomic_t fscache_n_updates;
43616-atomic_t fscache_n_updates_null;
43617-atomic_t fscache_n_updates_run;
43618+atomic_unchecked_t fscache_n_updates;
43619+atomic_unchecked_t fscache_n_updates_null;
43620+atomic_unchecked_t fscache_n_updates_run;
43621
43622-atomic_t fscache_n_relinquishes;
43623-atomic_t fscache_n_relinquishes_null;
43624-atomic_t fscache_n_relinquishes_waitcrt;
43625-atomic_t fscache_n_relinquishes_retire;
43626+atomic_unchecked_t fscache_n_relinquishes;
43627+atomic_unchecked_t fscache_n_relinquishes_null;
43628+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
43629+atomic_unchecked_t fscache_n_relinquishes_retire;
43630
43631-atomic_t fscache_n_cookie_index;
43632-atomic_t fscache_n_cookie_data;
43633-atomic_t fscache_n_cookie_special;
43634+atomic_unchecked_t fscache_n_cookie_index;
43635+atomic_unchecked_t fscache_n_cookie_data;
43636+atomic_unchecked_t fscache_n_cookie_special;
43637
43638-atomic_t fscache_n_object_alloc;
43639-atomic_t fscache_n_object_no_alloc;
43640-atomic_t fscache_n_object_lookups;
43641-atomic_t fscache_n_object_lookups_negative;
43642-atomic_t fscache_n_object_lookups_positive;
43643-atomic_t fscache_n_object_lookups_timed_out;
43644-atomic_t fscache_n_object_created;
43645-atomic_t fscache_n_object_avail;
43646-atomic_t fscache_n_object_dead;
43647+atomic_unchecked_t fscache_n_object_alloc;
43648+atomic_unchecked_t fscache_n_object_no_alloc;
43649+atomic_unchecked_t fscache_n_object_lookups;
43650+atomic_unchecked_t fscache_n_object_lookups_negative;
43651+atomic_unchecked_t fscache_n_object_lookups_positive;
43652+atomic_unchecked_t fscache_n_object_lookups_timed_out;
43653+atomic_unchecked_t fscache_n_object_created;
43654+atomic_unchecked_t fscache_n_object_avail;
43655+atomic_unchecked_t fscache_n_object_dead;
43656
43657-atomic_t fscache_n_checkaux_none;
43658-atomic_t fscache_n_checkaux_okay;
43659-atomic_t fscache_n_checkaux_update;
43660-atomic_t fscache_n_checkaux_obsolete;
43661+atomic_unchecked_t fscache_n_checkaux_none;
43662+atomic_unchecked_t fscache_n_checkaux_okay;
43663+atomic_unchecked_t fscache_n_checkaux_update;
43664+atomic_unchecked_t fscache_n_checkaux_obsolete;
43665
43666 atomic_t fscache_n_cop_alloc_object;
43667 atomic_t fscache_n_cop_lookup_object;
43668@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
43669 seq_puts(m, "FS-Cache statistics\n");
43670
43671 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
43672- atomic_read(&fscache_n_cookie_index),
43673- atomic_read(&fscache_n_cookie_data),
43674- atomic_read(&fscache_n_cookie_special));
43675+ atomic_read_unchecked(&fscache_n_cookie_index),
43676+ atomic_read_unchecked(&fscache_n_cookie_data),
43677+ atomic_read_unchecked(&fscache_n_cookie_special));
43678
43679 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
43680- atomic_read(&fscache_n_object_alloc),
43681- atomic_read(&fscache_n_object_no_alloc),
43682- atomic_read(&fscache_n_object_avail),
43683- atomic_read(&fscache_n_object_dead));
43684+ atomic_read_unchecked(&fscache_n_object_alloc),
43685+ atomic_read_unchecked(&fscache_n_object_no_alloc),
43686+ atomic_read_unchecked(&fscache_n_object_avail),
43687+ atomic_read_unchecked(&fscache_n_object_dead));
43688 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
43689- atomic_read(&fscache_n_checkaux_none),
43690- atomic_read(&fscache_n_checkaux_okay),
43691- atomic_read(&fscache_n_checkaux_update),
43692- atomic_read(&fscache_n_checkaux_obsolete));
43693+ atomic_read_unchecked(&fscache_n_checkaux_none),
43694+ atomic_read_unchecked(&fscache_n_checkaux_okay),
43695+ atomic_read_unchecked(&fscache_n_checkaux_update),
43696+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
43697
43698 seq_printf(m, "Pages : mrk=%u unc=%u\n",
43699- atomic_read(&fscache_n_marks),
43700- atomic_read(&fscache_n_uncaches));
43701+ atomic_read_unchecked(&fscache_n_marks),
43702+ atomic_read_unchecked(&fscache_n_uncaches));
43703
43704 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
43705 " oom=%u\n",
43706- atomic_read(&fscache_n_acquires),
43707- atomic_read(&fscache_n_acquires_null),
43708- atomic_read(&fscache_n_acquires_no_cache),
43709- atomic_read(&fscache_n_acquires_ok),
43710- atomic_read(&fscache_n_acquires_nobufs),
43711- atomic_read(&fscache_n_acquires_oom));
43712+ atomic_read_unchecked(&fscache_n_acquires),
43713+ atomic_read_unchecked(&fscache_n_acquires_null),
43714+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
43715+ atomic_read_unchecked(&fscache_n_acquires_ok),
43716+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
43717+ atomic_read_unchecked(&fscache_n_acquires_oom));
43718
43719 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
43720- atomic_read(&fscache_n_object_lookups),
43721- atomic_read(&fscache_n_object_lookups_negative),
43722- atomic_read(&fscache_n_object_lookups_positive),
43723- atomic_read(&fscache_n_object_created),
43724- atomic_read(&fscache_n_object_lookups_timed_out));
43725+ atomic_read_unchecked(&fscache_n_object_lookups),
43726+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
43727+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
43728+ atomic_read_unchecked(&fscache_n_object_created),
43729+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
43730
43731 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
43732- atomic_read(&fscache_n_updates),
43733- atomic_read(&fscache_n_updates_null),
43734- atomic_read(&fscache_n_updates_run));
43735+ atomic_read_unchecked(&fscache_n_updates),
43736+ atomic_read_unchecked(&fscache_n_updates_null),
43737+ atomic_read_unchecked(&fscache_n_updates_run));
43738
43739 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
43740- atomic_read(&fscache_n_relinquishes),
43741- atomic_read(&fscache_n_relinquishes_null),
43742- atomic_read(&fscache_n_relinquishes_waitcrt),
43743- atomic_read(&fscache_n_relinquishes_retire));
43744+ atomic_read_unchecked(&fscache_n_relinquishes),
43745+ atomic_read_unchecked(&fscache_n_relinquishes_null),
43746+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
43747+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
43748
43749 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
43750- atomic_read(&fscache_n_attr_changed),
43751- atomic_read(&fscache_n_attr_changed_ok),
43752- atomic_read(&fscache_n_attr_changed_nobufs),
43753- atomic_read(&fscache_n_attr_changed_nomem),
43754- atomic_read(&fscache_n_attr_changed_calls));
43755+ atomic_read_unchecked(&fscache_n_attr_changed),
43756+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
43757+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
43758+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
43759+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
43760
43761 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
43762- atomic_read(&fscache_n_allocs),
43763- atomic_read(&fscache_n_allocs_ok),
43764- atomic_read(&fscache_n_allocs_wait),
43765- atomic_read(&fscache_n_allocs_nobufs),
43766- atomic_read(&fscache_n_allocs_intr));
43767+ atomic_read_unchecked(&fscache_n_allocs),
43768+ atomic_read_unchecked(&fscache_n_allocs_ok),
43769+ atomic_read_unchecked(&fscache_n_allocs_wait),
43770+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
43771+ atomic_read_unchecked(&fscache_n_allocs_intr));
43772 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
43773- atomic_read(&fscache_n_alloc_ops),
43774- atomic_read(&fscache_n_alloc_op_waits),
43775- atomic_read(&fscache_n_allocs_object_dead));
43776+ atomic_read_unchecked(&fscache_n_alloc_ops),
43777+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
43778+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
43779
43780 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
43781 " int=%u oom=%u\n",
43782- atomic_read(&fscache_n_retrievals),
43783- atomic_read(&fscache_n_retrievals_ok),
43784- atomic_read(&fscache_n_retrievals_wait),
43785- atomic_read(&fscache_n_retrievals_nodata),
43786- atomic_read(&fscache_n_retrievals_nobufs),
43787- atomic_read(&fscache_n_retrievals_intr),
43788- atomic_read(&fscache_n_retrievals_nomem));
43789+ atomic_read_unchecked(&fscache_n_retrievals),
43790+ atomic_read_unchecked(&fscache_n_retrievals_ok),
43791+ atomic_read_unchecked(&fscache_n_retrievals_wait),
43792+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
43793+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
43794+ atomic_read_unchecked(&fscache_n_retrievals_intr),
43795+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
43796 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
43797- atomic_read(&fscache_n_retrieval_ops),
43798- atomic_read(&fscache_n_retrieval_op_waits),
43799- atomic_read(&fscache_n_retrievals_object_dead));
43800+ atomic_read_unchecked(&fscache_n_retrieval_ops),
43801+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
43802+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
43803
43804 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
43805- atomic_read(&fscache_n_stores),
43806- atomic_read(&fscache_n_stores_ok),
43807- atomic_read(&fscache_n_stores_again),
43808- atomic_read(&fscache_n_stores_nobufs),
43809- atomic_read(&fscache_n_stores_oom));
43810+ atomic_read_unchecked(&fscache_n_stores),
43811+ atomic_read_unchecked(&fscache_n_stores_ok),
43812+ atomic_read_unchecked(&fscache_n_stores_again),
43813+ atomic_read_unchecked(&fscache_n_stores_nobufs),
43814+ atomic_read_unchecked(&fscache_n_stores_oom));
43815 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
43816- atomic_read(&fscache_n_store_ops),
43817- atomic_read(&fscache_n_store_calls),
43818- atomic_read(&fscache_n_store_pages),
43819- atomic_read(&fscache_n_store_radix_deletes),
43820- atomic_read(&fscache_n_store_pages_over_limit));
43821+ atomic_read_unchecked(&fscache_n_store_ops),
43822+ atomic_read_unchecked(&fscache_n_store_calls),
43823+ atomic_read_unchecked(&fscache_n_store_pages),
43824+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
43825+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
43826
43827 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
43828- atomic_read(&fscache_n_store_vmscan_not_storing),
43829- atomic_read(&fscache_n_store_vmscan_gone),
43830- atomic_read(&fscache_n_store_vmscan_busy),
43831- atomic_read(&fscache_n_store_vmscan_cancelled));
43832+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
43833+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
43834+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
43835+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
43836
43837 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
43838- atomic_read(&fscache_n_op_pend),
43839- atomic_read(&fscache_n_op_run),
43840- atomic_read(&fscache_n_op_enqueue),
43841- atomic_read(&fscache_n_op_cancelled),
43842- atomic_read(&fscache_n_op_rejected));
43843+ atomic_read_unchecked(&fscache_n_op_pend),
43844+ atomic_read_unchecked(&fscache_n_op_run),
43845+ atomic_read_unchecked(&fscache_n_op_enqueue),
43846+ atomic_read_unchecked(&fscache_n_op_cancelled),
43847+ atomic_read_unchecked(&fscache_n_op_rejected));
43848 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
43849- atomic_read(&fscache_n_op_deferred_release),
43850- atomic_read(&fscache_n_op_release),
43851- atomic_read(&fscache_n_op_gc));
43852+ atomic_read_unchecked(&fscache_n_op_deferred_release),
43853+ atomic_read_unchecked(&fscache_n_op_release),
43854+ atomic_read_unchecked(&fscache_n_op_gc));
43855
43856 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
43857 atomic_read(&fscache_n_cop_alloc_object),
43858diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
43859index 3426521..3b75162 100644
43860--- a/fs/fuse/cuse.c
43861+++ b/fs/fuse/cuse.c
43862@@ -587,10 +587,12 @@ static int __init cuse_init(void)
43863 INIT_LIST_HEAD(&cuse_conntbl[i]);
43864
43865 /* inherit and extend fuse_dev_operations */
43866- cuse_channel_fops = fuse_dev_operations;
43867- cuse_channel_fops.owner = THIS_MODULE;
43868- cuse_channel_fops.open = cuse_channel_open;
43869- cuse_channel_fops.release = cuse_channel_release;
43870+ pax_open_kernel();
43871+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
43872+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
43873+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
43874+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
43875+ pax_close_kernel();
43876
43877 cuse_class = class_create(THIS_MODULE, "cuse");
43878 if (IS_ERR(cuse_class))
43879diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
43880index 2aaf3ea..8e50863 100644
43881--- a/fs/fuse/dev.c
43882+++ b/fs/fuse/dev.c
43883@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
43884 ret = 0;
43885 pipe_lock(pipe);
43886
43887- if (!pipe->readers) {
43888+ if (!atomic_read(&pipe->readers)) {
43889 send_sig(SIGPIPE, current, 0);
43890 if (!ret)
43891 ret = -EPIPE;
43892diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
43893index 9f63e49..d8a64c0 100644
43894--- a/fs/fuse/dir.c
43895+++ b/fs/fuse/dir.c
43896@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *dentry)
43897 return link;
43898 }
43899
43900-static void free_link(char *link)
43901+static void free_link(const char *link)
43902 {
43903 if (!IS_ERR(link))
43904 free_page((unsigned long) link);
43905diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
43906index cfd4959..a780959 100644
43907--- a/fs/gfs2/inode.c
43908+++ b/fs/gfs2/inode.c
43909@@ -1490,7 +1490,7 @@ out:
43910
43911 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
43912 {
43913- char *s = nd_get_link(nd);
43914+ const char *s = nd_get_link(nd);
43915 if (!IS_ERR(s))
43916 kfree(s);
43917 }
43918diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
43919index 0be5a78..9cfb853 100644
43920--- a/fs/hugetlbfs/inode.c
43921+++ b/fs/hugetlbfs/inode.c
43922@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs_fs_type = {
43923 .kill_sb = kill_litter_super,
43924 };
43925
43926-static struct vfsmount *hugetlbfs_vfsmount;
43927+struct vfsmount *hugetlbfs_vfsmount;
43928
43929 static int can_do_hugetlb_shm(void)
43930 {
43931diff --git a/fs/inode.c b/fs/inode.c
43932index ee4e66b..0451521 100644
43933--- a/fs/inode.c
43934+++ b/fs/inode.c
43935@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
43936
43937 #ifdef CONFIG_SMP
43938 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
43939- static atomic_t shared_last_ino;
43940- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
43941+ static atomic_unchecked_t shared_last_ino;
43942+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
43943
43944 res = next - LAST_INO_BATCH;
43945 }
43946diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
43947index e513f19..2ab1351 100644
43948--- a/fs/jffs2/erase.c
43949+++ b/fs/jffs2/erase.c
43950@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
43951 struct jffs2_unknown_node marker = {
43952 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
43953 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
43954- .totlen = cpu_to_je32(c->cleanmarker_size)
43955+ .totlen = cpu_to_je32(c->cleanmarker_size),
43956+ .hdr_crc = cpu_to_je32(0)
43957 };
43958
43959 jffs2_prealloc_raw_node_refs(c, jeb, 1);
43960diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
43961index b09e51d..e482afa 100644
43962--- a/fs/jffs2/wbuf.c
43963+++ b/fs/jffs2/wbuf.c
43964@@ -1011,7 +1011,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
43965 {
43966 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
43967 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
43968- .totlen = constant_cpu_to_je32(8)
43969+ .totlen = constant_cpu_to_je32(8),
43970+ .hdr_crc = constant_cpu_to_je32(0)
43971 };
43972
43973 /*
43974diff --git a/fs/jfs/super.c b/fs/jfs/super.c
43975index a44eff0..462e07d 100644
43976--- a/fs/jfs/super.c
43977+++ b/fs/jfs/super.c
43978@@ -802,7 +802,7 @@ static int __init init_jfs_fs(void)
43979
43980 jfs_inode_cachep =
43981 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
43982- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
43983+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
43984 init_once);
43985 if (jfs_inode_cachep == NULL)
43986 return -ENOMEM;
43987diff --git a/fs/libfs.c b/fs/libfs.c
43988index f6d411e..e82a08d 100644
43989--- a/fs/libfs.c
43990+++ b/fs/libfs.c
43991@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
43992
43993 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
43994 struct dentry *next;
43995+ char d_name[sizeof(next->d_iname)];
43996+ const unsigned char *name;
43997+
43998 next = list_entry(p, struct dentry, d_u.d_child);
43999 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
44000 if (!simple_positive(next)) {
44001@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
44002
44003 spin_unlock(&next->d_lock);
44004 spin_unlock(&dentry->d_lock);
44005- if (filldir(dirent, next->d_name.name,
44006+ name = next->d_name.name;
44007+ if (name == next->d_iname) {
44008+ memcpy(d_name, name, next->d_name.len);
44009+ name = d_name;
44010+ }
44011+ if (filldir(dirent, name,
44012 next->d_name.len, filp->f_pos,
44013 next->d_inode->i_ino,
44014 dt_type(next->d_inode)) < 0)
44015diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
44016index 8392cb8..80d6193 100644
44017--- a/fs/lockd/clntproc.c
44018+++ b/fs/lockd/clntproc.c
44019@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
44020 /*
44021 * Cookie counter for NLM requests
44022 */
44023-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
44024+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
44025
44026 void nlmclnt_next_cookie(struct nlm_cookie *c)
44027 {
44028- u32 cookie = atomic_inc_return(&nlm_cookie);
44029+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
44030
44031 memcpy(c->data, &cookie, 4);
44032 c->len=4;
44033diff --git a/fs/locks.c b/fs/locks.c
44034index 637694b..f84a121 100644
44035--- a/fs/locks.c
44036+++ b/fs/locks.c
44037@@ -2074,16 +2074,16 @@ void locks_remove_flock(struct file *filp)
44038 return;
44039
44040 if (filp->f_op && filp->f_op->flock) {
44041- struct file_lock fl = {
44042+ struct file_lock flock = {
44043 .fl_pid = current->tgid,
44044 .fl_file = filp,
44045 .fl_flags = FL_FLOCK,
44046 .fl_type = F_UNLCK,
44047 .fl_end = OFFSET_MAX,
44048 };
44049- filp->f_op->flock(filp, F_SETLKW, &fl);
44050- if (fl.fl_ops && fl.fl_ops->fl_release_private)
44051- fl.fl_ops->fl_release_private(&fl);
44052+ filp->f_op->flock(filp, F_SETLKW, &flock);
44053+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
44054+ flock.fl_ops->fl_release_private(&flock);
44055 }
44056
44057 lock_flocks();
44058diff --git a/fs/namei.c b/fs/namei.c
44059index 5008f01..90328a7 100644
44060--- a/fs/namei.c
44061+++ b/fs/namei.c
44062@@ -279,16 +279,32 @@ int generic_permission(struct inode *inode, int mask)
44063 if (ret != -EACCES)
44064 return ret;
44065
44066+#ifdef CONFIG_GRKERNSEC
44067+ /* we'll block if we have to log due to a denied capability use */
44068+ if (mask & MAY_NOT_BLOCK)
44069+ return -ECHILD;
44070+#endif
44071+
44072 if (S_ISDIR(inode->i_mode)) {
44073 /* DACs are overridable for directories */
44074- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
44075- return 0;
44076 if (!(mask & MAY_WRITE))
44077- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
44078+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
44079+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
44080 return 0;
44081+ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
44082+ return 0;
44083 return -EACCES;
44084 }
44085 /*
44086+ * Searching includes executable on directories, else just read.
44087+ */
44088+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
44089+ if (mask == MAY_READ)
44090+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
44091+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
44092+ return 0;
44093+
44094+ /*
44095 * Read/write DACs are always overridable.
44096 * Executable DACs are overridable when there is
44097 * at least one exec bit set.
44098@@ -297,14 +313,6 @@ int generic_permission(struct inode *inode, int mask)
44099 if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
44100 return 0;
44101
44102- /*
44103- * Searching includes executable on directories, else just read.
44104- */
44105- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
44106- if (mask == MAY_READ)
44107- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
44108- return 0;
44109-
44110 return -EACCES;
44111 }
44112
44113@@ -653,11 +661,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
44114 return error;
44115 }
44116
44117+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
44118+ dentry->d_inode, dentry, nd->path.mnt)) {
44119+ error = -EACCES;
44120+ *p = ERR_PTR(error); /* no ->put_link(), please */
44121+ path_put(&nd->path);
44122+ return error;
44123+ }
44124+
44125 nd->last_type = LAST_BIND;
44126 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
44127 error = PTR_ERR(*p);
44128 if (!IS_ERR(*p)) {
44129- char *s = nd_get_link(nd);
44130+ const char *s = nd_get_link(nd);
44131 error = 0;
44132 if (s)
44133 error = __vfs_follow_link(nd, s);
44134@@ -1622,6 +1638,21 @@ static int path_lookupat(int dfd, const char *name,
44135 if (!err)
44136 err = complete_walk(nd);
44137
44138+ if (!(nd->flags & LOOKUP_PARENT)) {
44139+#ifdef CONFIG_GRKERNSEC
44140+ if (flags & LOOKUP_RCU) {
44141+ if (!err)
44142+ path_put(&nd->path);
44143+ err = -ECHILD;
44144+ } else
44145+#endif
44146+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
44147+ if (!err)
44148+ path_put(&nd->path);
44149+ err = -ENOENT;
44150+ }
44151+ }
44152+
44153 if (!err && nd->flags & LOOKUP_DIRECTORY) {
44154 if (!nd->inode->i_op->lookup) {
44155 path_put(&nd->path);
44156@@ -1649,6 +1680,15 @@ static int do_path_lookup(int dfd, const char *name,
44157 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
44158
44159 if (likely(!retval)) {
44160+ if (*name != '/' && nd->path.dentry && nd->inode) {
44161+#ifdef CONFIG_GRKERNSEC
44162+ if (flags & LOOKUP_RCU)
44163+ return -ECHILD;
44164+#endif
44165+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
44166+ return -ENOENT;
44167+ }
44168+
44169 if (unlikely(!audit_dummy_context())) {
44170 if (nd->path.dentry && nd->inode)
44171 audit_inode(name, nd->path.dentry);
44172@@ -2046,6 +2086,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
44173 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
44174 return -EPERM;
44175
44176+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
44177+ return -EPERM;
44178+ if (gr_handle_rawio(inode))
44179+ return -EPERM;
44180+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
44181+ return -EACCES;
44182+
44183 return 0;
44184 }
44185
44186@@ -2107,6 +2154,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44187 error = complete_walk(nd);
44188 if (error)
44189 return ERR_PTR(error);
44190+#ifdef CONFIG_GRKERNSEC
44191+ if (nd->flags & LOOKUP_RCU) {
44192+ error = -ECHILD;
44193+ goto exit;
44194+ }
44195+#endif
44196+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
44197+ error = -ENOENT;
44198+ goto exit;
44199+ }
44200 audit_inode(pathname, nd->path.dentry);
44201 if (open_flag & O_CREAT) {
44202 error = -EISDIR;
44203@@ -2117,6 +2174,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44204 error = complete_walk(nd);
44205 if (error)
44206 return ERR_PTR(error);
44207+#ifdef CONFIG_GRKERNSEC
44208+ if (nd->flags & LOOKUP_RCU) {
44209+ error = -ECHILD;
44210+ goto exit;
44211+ }
44212+#endif
44213+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
44214+ error = -ENOENT;
44215+ goto exit;
44216+ }
44217 audit_inode(pathname, dir);
44218 goto ok;
44219 }
44220@@ -2138,6 +2205,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44221 error = complete_walk(nd);
44222 if (error)
44223 return ERR_PTR(-ECHILD);
44224+#ifdef CONFIG_GRKERNSEC
44225+ if (nd->flags & LOOKUP_RCU) {
44226+ error = -ECHILD;
44227+ goto exit;
44228+ }
44229+#endif
44230+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
44231+ error = -ENOENT;
44232+ goto exit;
44233+ }
44234
44235 error = -ENOTDIR;
44236 if (nd->flags & LOOKUP_DIRECTORY) {
44237@@ -2178,6 +2255,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44238 /* Negative dentry, just create the file */
44239 if (!dentry->d_inode) {
44240 int mode = op->mode;
44241+
44242+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
44243+ error = -EACCES;
44244+ goto exit_mutex_unlock;
44245+ }
44246+
44247 if (!IS_POSIXACL(dir->d_inode))
44248 mode &= ~current_umask();
44249 /*
44250@@ -2201,6 +2284,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44251 error = vfs_create(dir->d_inode, dentry, mode, nd);
44252 if (error)
44253 goto exit_mutex_unlock;
44254+ else
44255+ gr_handle_create(path->dentry, path->mnt);
44256 mutex_unlock(&dir->d_inode->i_mutex);
44257 dput(nd->path.dentry);
44258 nd->path.dentry = dentry;
44259@@ -2210,6 +2295,19 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44260 /*
44261 * It already exists.
44262 */
44263+
44264+ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
44265+ error = -ENOENT;
44266+ goto exit_mutex_unlock;
44267+ }
44268+
44269+ /* only check if O_CREAT is specified, all other checks need to go
44270+ into may_open */
44271+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
44272+ error = -EACCES;
44273+ goto exit_mutex_unlock;
44274+ }
44275+
44276 mutex_unlock(&dir->d_inode->i_mutex);
44277 audit_inode(pathname, path->dentry);
44278
44279@@ -2422,6 +2520,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
44280 *path = nd.path;
44281 return dentry;
44282 eexist:
44283+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
44284+ dput(dentry);
44285+ dentry = ERR_PTR(-ENOENT);
44286+ goto fail;
44287+ }
44288 dput(dentry);
44289 dentry = ERR_PTR(-EEXIST);
44290 fail:
44291@@ -2444,6 +2547,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
44292 }
44293 EXPORT_SYMBOL(user_path_create);
44294
44295+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
44296+{
44297+ char *tmp = getname(pathname);
44298+ struct dentry *res;
44299+ if (IS_ERR(tmp))
44300+ return ERR_CAST(tmp);
44301+ res = kern_path_create(dfd, tmp, path, is_dir);
44302+ if (IS_ERR(res))
44303+ putname(tmp);
44304+ else
44305+ *to = tmp;
44306+ return res;
44307+}
44308+
44309 int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
44310 {
44311 int error = may_create(dir, dentry);
44312@@ -2511,6 +2628,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
44313 error = mnt_want_write(path.mnt);
44314 if (error)
44315 goto out_dput;
44316+
44317+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
44318+ error = -EPERM;
44319+ goto out_drop_write;
44320+ }
44321+
44322+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
44323+ error = -EACCES;
44324+ goto out_drop_write;
44325+ }
44326+
44327 error = security_path_mknod(&path, dentry, mode, dev);
44328 if (error)
44329 goto out_drop_write;
44330@@ -2528,6 +2656,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
44331 }
44332 out_drop_write:
44333 mnt_drop_write(path.mnt);
44334+
44335+ if (!error)
44336+ gr_handle_create(dentry, path.mnt);
44337 out_dput:
44338 dput(dentry);
44339 mutex_unlock(&path.dentry->d_inode->i_mutex);
44340@@ -2577,12 +2708,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
44341 error = mnt_want_write(path.mnt);
44342 if (error)
44343 goto out_dput;
44344+
44345+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
44346+ error = -EACCES;
44347+ goto out_drop_write;
44348+ }
44349+
44350 error = security_path_mkdir(&path, dentry, mode);
44351 if (error)
44352 goto out_drop_write;
44353 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
44354 out_drop_write:
44355 mnt_drop_write(path.mnt);
44356+
44357+ if (!error)
44358+ gr_handle_create(dentry, path.mnt);
44359 out_dput:
44360 dput(dentry);
44361 mutex_unlock(&path.dentry->d_inode->i_mutex);
44362@@ -2662,6 +2802,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
44363 char * name;
44364 struct dentry *dentry;
44365 struct nameidata nd;
44366+ ino_t saved_ino = 0;
44367+ dev_t saved_dev = 0;
44368
44369 error = user_path_parent(dfd, pathname, &nd, &name);
44370 if (error)
44371@@ -2690,6 +2832,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
44372 error = -ENOENT;
44373 goto exit3;
44374 }
44375+
44376+ saved_ino = dentry->d_inode->i_ino;
44377+ saved_dev = gr_get_dev_from_dentry(dentry);
44378+
44379+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
44380+ error = -EACCES;
44381+ goto exit3;
44382+ }
44383+
44384 error = mnt_want_write(nd.path.mnt);
44385 if (error)
44386 goto exit3;
44387@@ -2697,6 +2848,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
44388 if (error)
44389 goto exit4;
44390 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
44391+ if (!error && (saved_dev || saved_ino))
44392+ gr_handle_delete(saved_ino, saved_dev);
44393 exit4:
44394 mnt_drop_write(nd.path.mnt);
44395 exit3:
44396@@ -2759,6 +2912,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
44397 struct dentry *dentry;
44398 struct nameidata nd;
44399 struct inode *inode = NULL;
44400+ ino_t saved_ino = 0;
44401+ dev_t saved_dev = 0;
44402
44403 error = user_path_parent(dfd, pathname, &nd, &name);
44404 if (error)
44405@@ -2781,6 +2936,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
44406 if (!inode)
44407 goto slashes;
44408 ihold(inode);
44409+
44410+ if (inode->i_nlink <= 1) {
44411+ saved_ino = inode->i_ino;
44412+ saved_dev = gr_get_dev_from_dentry(dentry);
44413+ }
44414+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
44415+ error = -EACCES;
44416+ goto exit2;
44417+ }
44418+
44419 error = mnt_want_write(nd.path.mnt);
44420 if (error)
44421 goto exit2;
44422@@ -2788,6 +2953,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
44423 if (error)
44424 goto exit3;
44425 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
44426+ if (!error && (saved_ino || saved_dev))
44427+ gr_handle_delete(saved_ino, saved_dev);
44428 exit3:
44429 mnt_drop_write(nd.path.mnt);
44430 exit2:
44431@@ -2863,10 +3030,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
44432 error = mnt_want_write(path.mnt);
44433 if (error)
44434 goto out_dput;
44435+
44436+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
44437+ error = -EACCES;
44438+ goto out_drop_write;
44439+ }
44440+
44441 error = security_path_symlink(&path, dentry, from);
44442 if (error)
44443 goto out_drop_write;
44444 error = vfs_symlink(path.dentry->d_inode, dentry, from);
44445+ if (!error)
44446+ gr_handle_create(dentry, path.mnt);
44447 out_drop_write:
44448 mnt_drop_write(path.mnt);
44449 out_dput:
44450@@ -2938,6 +3113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
44451 {
44452 struct dentry *new_dentry;
44453 struct path old_path, new_path;
44454+ char *to = NULL;
44455 int how = 0;
44456 int error;
44457
44458@@ -2961,7 +3137,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
44459 if (error)
44460 return error;
44461
44462- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
44463+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
44464 error = PTR_ERR(new_dentry);
44465 if (IS_ERR(new_dentry))
44466 goto out;
44467@@ -2972,13 +3148,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
44468 error = mnt_want_write(new_path.mnt);
44469 if (error)
44470 goto out_dput;
44471+
44472+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
44473+ old_path.dentry->d_inode,
44474+ old_path.dentry->d_inode->i_mode, to)) {
44475+ error = -EACCES;
44476+ goto out_drop_write;
44477+ }
44478+
44479+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
44480+ old_path.dentry, old_path.mnt, to)) {
44481+ error = -EACCES;
44482+ goto out_drop_write;
44483+ }
44484+
44485 error = security_path_link(old_path.dentry, &new_path, new_dentry);
44486 if (error)
44487 goto out_drop_write;
44488 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
44489+ if (!error)
44490+ gr_handle_create(new_dentry, new_path.mnt);
44491 out_drop_write:
44492 mnt_drop_write(new_path.mnt);
44493 out_dput:
44494+ putname(to);
44495 dput(new_dentry);
44496 mutex_unlock(&new_path.dentry->d_inode->i_mutex);
44497 path_put(&new_path);
44498@@ -3206,6 +3399,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
44499 if (new_dentry == trap)
44500 goto exit5;
44501
44502+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
44503+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
44504+ to);
44505+ if (error)
44506+ goto exit5;
44507+
44508 error = mnt_want_write(oldnd.path.mnt);
44509 if (error)
44510 goto exit5;
44511@@ -3215,6 +3414,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
44512 goto exit6;
44513 error = vfs_rename(old_dir->d_inode, old_dentry,
44514 new_dir->d_inode, new_dentry);
44515+ if (!error)
44516+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
44517+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
44518 exit6:
44519 mnt_drop_write(oldnd.path.mnt);
44520 exit5:
44521@@ -3240,6 +3442,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
44522
44523 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
44524 {
44525+ char tmpbuf[64];
44526+ const char *newlink;
44527 int len;
44528
44529 len = PTR_ERR(link);
44530@@ -3249,7 +3453,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
44531 len = strlen(link);
44532 if (len > (unsigned) buflen)
44533 len = buflen;
44534- if (copy_to_user(buffer, link, len))
44535+
44536+ if (len < sizeof(tmpbuf)) {
44537+ memcpy(tmpbuf, link, len);
44538+ newlink = tmpbuf;
44539+ } else
44540+ newlink = link;
44541+
44542+ if (copy_to_user(buffer, newlink, len))
44543 len = -EFAULT;
44544 out:
44545 return len;
44546diff --git a/fs/namespace.c b/fs/namespace.c
44547index cfc6d44..b4632a5 100644
44548--- a/fs/namespace.c
44549+++ b/fs/namespace.c
44550@@ -1326,6 +1326,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
44551 if (!(sb->s_flags & MS_RDONLY))
44552 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
44553 up_write(&sb->s_umount);
44554+
44555+ gr_log_remount(mnt->mnt_devname, retval);
44556+
44557 return retval;
44558 }
44559
44560@@ -1345,6 +1348,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
44561 br_write_unlock(vfsmount_lock);
44562 up_write(&namespace_sem);
44563 release_mounts(&umount_list);
44564+
44565+ gr_log_unmount(mnt->mnt_devname, retval);
44566+
44567 return retval;
44568 }
44569
44570@@ -2336,6 +2342,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
44571 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
44572 MS_STRICTATIME);
44573
44574+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
44575+ retval = -EPERM;
44576+ goto dput_out;
44577+ }
44578+
44579+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
44580+ retval = -EPERM;
44581+ goto dput_out;
44582+ }
44583+
44584 if (flags & MS_REMOUNT)
44585 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
44586 data_page);
44587@@ -2350,6 +2366,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
44588 dev_name, data_page);
44589 dput_out:
44590 path_put(&path);
44591+
44592+ gr_log_mount(dev_name, dir_name, retval);
44593+
44594 return retval;
44595 }
44596
44597@@ -2605,6 +2624,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
44598 if (error)
44599 goto out2;
44600
44601+ if (gr_handle_chroot_pivot()) {
44602+ error = -EPERM;
44603+ goto out2;
44604+ }
44605+
44606 get_fs_root(current->fs, &root);
44607 error = lock_mount(&old);
44608 if (error)
44609diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
44610index 3db6b82..a57597e 100644
44611--- a/fs/nfs/blocklayout/blocklayout.c
44612+++ b/fs/nfs/blocklayout/blocklayout.c
44613@@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block_extent *be, sector_t isect)
44614 */
44615 struct parallel_io {
44616 struct kref refcnt;
44617- struct rpc_call_ops call_ops;
44618+ rpc_call_ops_no_const call_ops;
44619 void (*pnfs_callback) (void *data);
44620 void *data;
44621 };
44622diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
44623index 50a15fa..ca113f9 100644
44624--- a/fs/nfs/inode.c
44625+++ b/fs/nfs/inode.c
44626@@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
44627 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
44628 nfsi->attrtimeo_timestamp = jiffies;
44629
44630- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
44631+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
44632 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
44633 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
44634 else
44635@@ -1002,16 +1002,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
44636 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
44637 }
44638
44639-static atomic_long_t nfs_attr_generation_counter;
44640+static atomic_long_unchecked_t nfs_attr_generation_counter;
44641
44642 static unsigned long nfs_read_attr_generation_counter(void)
44643 {
44644- return atomic_long_read(&nfs_attr_generation_counter);
44645+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
44646 }
44647
44648 unsigned long nfs_inc_attr_generation_counter(void)
44649 {
44650- return atomic_long_inc_return(&nfs_attr_generation_counter);
44651+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
44652 }
44653
44654 void nfs_fattr_init(struct nfs_fattr *fattr)
44655diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
44656index 7a2e442..8e544cc 100644
44657--- a/fs/nfsd/vfs.c
44658+++ b/fs/nfsd/vfs.c
44659@@ -914,7 +914,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
44660 } else {
44661 oldfs = get_fs();
44662 set_fs(KERNEL_DS);
44663- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
44664+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
44665 set_fs(oldfs);
44666 }
44667
44668@@ -1018,7 +1018,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
44669
44670 /* Write the data. */
44671 oldfs = get_fs(); set_fs(KERNEL_DS);
44672- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
44673+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
44674 set_fs(oldfs);
44675 if (host_err < 0)
44676 goto out_nfserr;
44677@@ -1553,7 +1553,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
44678 */
44679
44680 oldfs = get_fs(); set_fs(KERNEL_DS);
44681- host_err = inode->i_op->readlink(dentry, buf, *lenp);
44682+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
44683 set_fs(oldfs);
44684
44685 if (host_err < 0)
44686diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
44687index 9fde1c0..14e8827 100644
44688--- a/fs/notify/fanotify/fanotify_user.c
44689+++ b/fs/notify/fanotify/fanotify_user.c
44690@@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
44691 goto out_close_fd;
44692
44693 ret = -EFAULT;
44694- if (copy_to_user(buf, &fanotify_event_metadata,
44695+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
44696+ copy_to_user(buf, &fanotify_event_metadata,
44697 fanotify_event_metadata.event_len))
44698 goto out_kill_access_response;
44699
44700diff --git a/fs/notify/notification.c b/fs/notify/notification.c
44701index ee18815..7aa5d01 100644
44702--- a/fs/notify/notification.c
44703+++ b/fs/notify/notification.c
44704@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
44705 * get set to 0 so it will never get 'freed'
44706 */
44707 static struct fsnotify_event *q_overflow_event;
44708-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
44709+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
44710
44711 /**
44712 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
44713@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
44714 */
44715 u32 fsnotify_get_cookie(void)
44716 {
44717- return atomic_inc_return(&fsnotify_sync_cookie);
44718+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
44719 }
44720 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
44721
44722diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
44723index 99e3610..02c1068 100644
44724--- a/fs/ntfs/dir.c
44725+++ b/fs/ntfs/dir.c
44726@@ -1329,7 +1329,7 @@ find_next_index_buffer:
44727 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
44728 ~(s64)(ndir->itype.index.block_size - 1)));
44729 /* Bounds checks. */
44730- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
44731+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
44732 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
44733 "inode 0x%lx or driver bug.", vdir->i_ino);
44734 goto err_out;
44735diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
44736index c587e2d..3641eaa 100644
44737--- a/fs/ntfs/file.c
44738+++ b/fs/ntfs/file.c
44739@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_inode_ops = {
44740 #endif /* NTFS_RW */
44741 };
44742
44743-const struct file_operations ntfs_empty_file_ops = {};
44744+const struct file_operations ntfs_empty_file_ops __read_only;
44745
44746-const struct inode_operations ntfs_empty_inode_ops = {};
44747+const struct inode_operations ntfs_empty_inode_ops __read_only;
44748diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
44749index 210c352..a174f83 100644
44750--- a/fs/ocfs2/localalloc.c
44751+++ b/fs/ocfs2/localalloc.c
44752@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
44753 goto bail;
44754 }
44755
44756- atomic_inc(&osb->alloc_stats.moves);
44757+ atomic_inc_unchecked(&osb->alloc_stats.moves);
44758
44759 bail:
44760 if (handle)
44761diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
44762index d355e6e..578d905 100644
44763--- a/fs/ocfs2/ocfs2.h
44764+++ b/fs/ocfs2/ocfs2.h
44765@@ -235,11 +235,11 @@ enum ocfs2_vol_state
44766
44767 struct ocfs2_alloc_stats
44768 {
44769- atomic_t moves;
44770- atomic_t local_data;
44771- atomic_t bitmap_data;
44772- atomic_t bg_allocs;
44773- atomic_t bg_extends;
44774+ atomic_unchecked_t moves;
44775+ atomic_unchecked_t local_data;
44776+ atomic_unchecked_t bitmap_data;
44777+ atomic_unchecked_t bg_allocs;
44778+ atomic_unchecked_t bg_extends;
44779 };
44780
44781 enum ocfs2_local_alloc_state
44782diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
44783index ba5d97e..c77db25 100644
44784--- a/fs/ocfs2/suballoc.c
44785+++ b/fs/ocfs2/suballoc.c
44786@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
44787 mlog_errno(status);
44788 goto bail;
44789 }
44790- atomic_inc(&osb->alloc_stats.bg_extends);
44791+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
44792
44793 /* You should never ask for this much metadata */
44794 BUG_ON(bits_wanted >
44795@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
44796 mlog_errno(status);
44797 goto bail;
44798 }
44799- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44800+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44801
44802 *suballoc_loc = res.sr_bg_blkno;
44803 *suballoc_bit_start = res.sr_bit_offset;
44804@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
44805 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
44806 res->sr_bits);
44807
44808- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44809+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44810
44811 BUG_ON(res->sr_bits != 1);
44812
44813@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
44814 mlog_errno(status);
44815 goto bail;
44816 }
44817- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44818+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44819
44820 BUG_ON(res.sr_bits != 1);
44821
44822@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
44823 cluster_start,
44824 num_clusters);
44825 if (!status)
44826- atomic_inc(&osb->alloc_stats.local_data);
44827+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
44828 } else {
44829 if (min_clusters > (osb->bitmap_cpg - 1)) {
44830 /* The only paths asking for contiguousness
44831@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
44832 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
44833 res.sr_bg_blkno,
44834 res.sr_bit_offset);
44835- atomic_inc(&osb->alloc_stats.bitmap_data);
44836+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
44837 *num_clusters = res.sr_bits;
44838 }
44839 }
44840diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
44841index 4994f8b..eaab8eb 100644
44842--- a/fs/ocfs2/super.c
44843+++ b/fs/ocfs2/super.c
44844@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
44845 "%10s => GlobalAllocs: %d LocalAllocs: %d "
44846 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
44847 "Stats",
44848- atomic_read(&osb->alloc_stats.bitmap_data),
44849- atomic_read(&osb->alloc_stats.local_data),
44850- atomic_read(&osb->alloc_stats.bg_allocs),
44851- atomic_read(&osb->alloc_stats.moves),
44852- atomic_read(&osb->alloc_stats.bg_extends));
44853+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
44854+ atomic_read_unchecked(&osb->alloc_stats.local_data),
44855+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
44856+ atomic_read_unchecked(&osb->alloc_stats.moves),
44857+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
44858
44859 out += snprintf(buf + out, len - out,
44860 "%10s => State: %u Descriptor: %llu Size: %u bits "
44861@@ -2119,11 +2119,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
44862 spin_lock_init(&osb->osb_xattr_lock);
44863 ocfs2_init_steal_slots(osb);
44864
44865- atomic_set(&osb->alloc_stats.moves, 0);
44866- atomic_set(&osb->alloc_stats.local_data, 0);
44867- atomic_set(&osb->alloc_stats.bitmap_data, 0);
44868- atomic_set(&osb->alloc_stats.bg_allocs, 0);
44869- atomic_set(&osb->alloc_stats.bg_extends, 0);
44870+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
44871+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
44872+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
44873+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
44874+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
44875
44876 /* Copy the blockcheck stats from the superblock probe */
44877 osb->osb_ecc_stats = *stats;
44878diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
44879index 5d22872..523db20 100644
44880--- a/fs/ocfs2/symlink.c
44881+++ b/fs/ocfs2/symlink.c
44882@@ -142,7 +142,7 @@ bail:
44883
44884 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
44885 {
44886- char *link = nd_get_link(nd);
44887+ const char *link = nd_get_link(nd);
44888 if (!IS_ERR(link))
44889 kfree(link);
44890 }
44891diff --git a/fs/open.c b/fs/open.c
44892index 22c41b5..695cb17 100644
44893--- a/fs/open.c
44894+++ b/fs/open.c
44895@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
44896 error = locks_verify_truncate(inode, NULL, length);
44897 if (!error)
44898 error = security_path_truncate(&path);
44899+
44900+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
44901+ error = -EACCES;
44902+
44903 if (!error)
44904 error = do_truncate(path.dentry, length, 0, NULL);
44905
44906@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
44907 if (__mnt_is_readonly(path.mnt))
44908 res = -EROFS;
44909
44910+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
44911+ res = -EACCES;
44912+
44913 out_path_release:
44914 path_put(&path);
44915 out:
44916@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
44917 if (error)
44918 goto dput_and_out;
44919
44920+ gr_log_chdir(path.dentry, path.mnt);
44921+
44922 set_fs_pwd(current->fs, &path);
44923
44924 dput_and_out:
44925@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
44926 goto out_putf;
44927
44928 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
44929+
44930+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
44931+ error = -EPERM;
44932+
44933+ if (!error)
44934+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
44935+
44936 if (!error)
44937 set_fs_pwd(current->fs, &file->f_path);
44938 out_putf:
44939@@ -438,7 +454,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
44940 if (error)
44941 goto dput_and_out;
44942
44943+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
44944+ goto dput_and_out;
44945+
44946 set_fs_root(current->fs, &path);
44947+
44948+ gr_handle_chroot_chdir(&path);
44949+
44950 error = 0;
44951 dput_and_out:
44952 path_put(&path);
44953@@ -456,6 +478,16 @@ static int chmod_common(struct path *path, umode_t mode)
44954 if (error)
44955 return error;
44956 mutex_lock(&inode->i_mutex);
44957+
44958+ if (!gr_acl_handle_fchmod(path->dentry, path->mnt, mode)) {
44959+ error = -EACCES;
44960+ goto out_unlock;
44961+ }
44962+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
44963+ error = -EACCES;
44964+ goto out_unlock;
44965+ }
44966+
44967 error = security_path_chmod(path->dentry, path->mnt, mode);
44968 if (error)
44969 goto out_unlock;
44970@@ -506,6 +538,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
44971 int error;
44972 struct iattr newattrs;
44973
44974+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
44975+ return -EACCES;
44976+
44977 newattrs.ia_valid = ATTR_CTIME;
44978 if (user != (uid_t) -1) {
44979 newattrs.ia_valid |= ATTR_UID;
44980diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
44981index 6296b40..417c00f 100644
44982--- a/fs/partitions/efi.c
44983+++ b/fs/partitions/efi.c
44984@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
44985 if (!gpt)
44986 return NULL;
44987
44988+ if (!le32_to_cpu(gpt->num_partition_entries))
44989+ return NULL;
44990+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
44991+ if (!pte)
44992+ return NULL;
44993+
44994 count = le32_to_cpu(gpt->num_partition_entries) *
44995 le32_to_cpu(gpt->sizeof_partition_entry);
44996- if (!count)
44997- return NULL;
44998- pte = kzalloc(count, GFP_KERNEL);
44999- if (!pte)
45000- return NULL;
45001-
45002 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
45003 (u8 *) pte,
45004 count) < count) {
45005diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
45006index bd8ae78..539d250 100644
45007--- a/fs/partitions/ldm.c
45008+++ b/fs/partitions/ldm.c
45009@@ -1324,7 +1324,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
45010 goto found;
45011 }
45012
45013- f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
45014+ f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
45015 if (!f) {
45016 ldm_crit ("Out of memory.");
45017 return false;
45018diff --git a/fs/pipe.c b/fs/pipe.c
45019index 4065f07..68c0706 100644
45020--- a/fs/pipe.c
45021+++ b/fs/pipe.c
45022@@ -420,9 +420,9 @@ redo:
45023 }
45024 if (bufs) /* More to do? */
45025 continue;
45026- if (!pipe->writers)
45027+ if (!atomic_read(&pipe->writers))
45028 break;
45029- if (!pipe->waiting_writers) {
45030+ if (!atomic_read(&pipe->waiting_writers)) {
45031 /* syscall merging: Usually we must not sleep
45032 * if O_NONBLOCK is set, or if we got some data.
45033 * But if a writer sleeps in kernel space, then
45034@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
45035 mutex_lock(&inode->i_mutex);
45036 pipe = inode->i_pipe;
45037
45038- if (!pipe->readers) {
45039+ if (!atomic_read(&pipe->readers)) {
45040 send_sig(SIGPIPE, current, 0);
45041 ret = -EPIPE;
45042 goto out;
45043@@ -530,7 +530,7 @@ redo1:
45044 for (;;) {
45045 int bufs;
45046
45047- if (!pipe->readers) {
45048+ if (!atomic_read(&pipe->readers)) {
45049 send_sig(SIGPIPE, current, 0);
45050 if (!ret)
45051 ret = -EPIPE;
45052@@ -616,9 +616,9 @@ redo2:
45053 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
45054 do_wakeup = 0;
45055 }
45056- pipe->waiting_writers++;
45057+ atomic_inc(&pipe->waiting_writers);
45058 pipe_wait(pipe);
45059- pipe->waiting_writers--;
45060+ atomic_dec(&pipe->waiting_writers);
45061 }
45062 out:
45063 mutex_unlock(&inode->i_mutex);
45064@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait)
45065 mask = 0;
45066 if (filp->f_mode & FMODE_READ) {
45067 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
45068- if (!pipe->writers && filp->f_version != pipe->w_counter)
45069+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
45070 mask |= POLLHUP;
45071 }
45072
45073@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait)
45074 * Most Unices do not set POLLERR for FIFOs but on Linux they
45075 * behave exactly like pipes for poll().
45076 */
45077- if (!pipe->readers)
45078+ if (!atomic_read(&pipe->readers))
45079 mask |= POLLERR;
45080 }
45081
45082@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw)
45083
45084 mutex_lock(&inode->i_mutex);
45085 pipe = inode->i_pipe;
45086- pipe->readers -= decr;
45087- pipe->writers -= decw;
45088+ atomic_sub(decr, &pipe->readers);
45089+ atomic_sub(decw, &pipe->writers);
45090
45091- if (!pipe->readers && !pipe->writers) {
45092+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
45093 free_pipe_info(inode);
45094 } else {
45095 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
45096@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
45097
45098 if (inode->i_pipe) {
45099 ret = 0;
45100- inode->i_pipe->readers++;
45101+ atomic_inc(&inode->i_pipe->readers);
45102 }
45103
45104 mutex_unlock(&inode->i_mutex);
45105@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
45106
45107 if (inode->i_pipe) {
45108 ret = 0;
45109- inode->i_pipe->writers++;
45110+ atomic_inc(&inode->i_pipe->writers);
45111 }
45112
45113 mutex_unlock(&inode->i_mutex);
45114@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
45115 if (inode->i_pipe) {
45116 ret = 0;
45117 if (filp->f_mode & FMODE_READ)
45118- inode->i_pipe->readers++;
45119+ atomic_inc(&inode->i_pipe->readers);
45120 if (filp->f_mode & FMODE_WRITE)
45121- inode->i_pipe->writers++;
45122+ atomic_inc(&inode->i_pipe->writers);
45123 }
45124
45125 mutex_unlock(&inode->i_mutex);
45126@@ -931,7 +931,7 @@ void free_pipe_info(struct inode *inode)
45127 inode->i_pipe = NULL;
45128 }
45129
45130-static struct vfsmount *pipe_mnt __read_mostly;
45131+struct vfsmount *pipe_mnt __read_mostly;
45132
45133 /*
45134 * pipefs_dname() is called from d_path().
45135@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(void)
45136 goto fail_iput;
45137 inode->i_pipe = pipe;
45138
45139- pipe->readers = pipe->writers = 1;
45140+ atomic_set(&pipe->readers, 1);
45141+ atomic_set(&pipe->writers, 1);
45142 inode->i_fop = &rdwr_pipefifo_fops;
45143
45144 /*
45145diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
45146index 15af622..0e9f4467 100644
45147--- a/fs/proc/Kconfig
45148+++ b/fs/proc/Kconfig
45149@@ -30,12 +30,12 @@ config PROC_FS
45150
45151 config PROC_KCORE
45152 bool "/proc/kcore support" if !ARM
45153- depends on PROC_FS && MMU
45154+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
45155
45156 config PROC_VMCORE
45157 bool "/proc/vmcore support"
45158- depends on PROC_FS && CRASH_DUMP
45159- default y
45160+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
45161+ default n
45162 help
45163 Exports the dump image of crashed kernel in ELF format.
45164
45165@@ -59,8 +59,8 @@ config PROC_SYSCTL
45166 limited in memory.
45167
45168 config PROC_PAGE_MONITOR
45169- default y
45170- depends on PROC_FS && MMU
45171+ default n
45172+ depends on PROC_FS && MMU && !GRKERNSEC
45173 bool "Enable /proc page monitoring" if EXPERT
45174 help
45175 Various /proc files exist to monitor process memory utilization:
45176diff --git a/fs/proc/array.c b/fs/proc/array.c
45177index 3a1dafd..d41fc37 100644
45178--- a/fs/proc/array.c
45179+++ b/fs/proc/array.c
45180@@ -60,6 +60,7 @@
45181 #include <linux/tty.h>
45182 #include <linux/string.h>
45183 #include <linux/mman.h>
45184+#include <linux/grsecurity.h>
45185 #include <linux/proc_fs.h>
45186 #include <linux/ioport.h>
45187 #include <linux/uaccess.h>
45188@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
45189 seq_putc(m, '\n');
45190 }
45191
45192+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
45193+static inline void task_pax(struct seq_file *m, struct task_struct *p)
45194+{
45195+ if (p->mm)
45196+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
45197+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
45198+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
45199+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
45200+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
45201+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
45202+ else
45203+ seq_printf(m, "PaX:\t-----\n");
45204+}
45205+#endif
45206+
45207 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
45208 struct pid *pid, struct task_struct *task)
45209 {
45210@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
45211 task_cpus_allowed(m, task);
45212 cpuset_task_status_allowed(m, task);
45213 task_context_switch_counts(m, task);
45214+
45215+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
45216+ task_pax(m, task);
45217+#endif
45218+
45219+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
45220+ task_grsec_rbac(m, task);
45221+#endif
45222+
45223 return 0;
45224 }
45225
45226+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45227+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
45228+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
45229+ _mm->pax_flags & MF_PAX_SEGMEXEC))
45230+#endif
45231+
45232 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
45233 struct pid *pid, struct task_struct *task, int whole)
45234 {
45235@@ -449,6 +480,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
45236 gtime = task->gtime;
45237 }
45238
45239+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45240+ if (PAX_RAND_FLAGS(mm)) {
45241+ eip = 0;
45242+ esp = 0;
45243+ wchan = 0;
45244+ }
45245+#endif
45246+#ifdef CONFIG_GRKERNSEC_HIDESYM
45247+ wchan = 0;
45248+ eip =0;
45249+ esp =0;
45250+#endif
45251+
45252 /* scale priority and nice values from timeslices to -20..20 */
45253 /* to make it look like a "normal" Unix priority/nice value */
45254 priority = task_prio(task);
45255@@ -489,9 +533,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
45256 vsize,
45257 mm ? get_mm_rss(mm) : 0,
45258 rsslim,
45259+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45260+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
45261+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
45262+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
45263+#else
45264 mm ? (permitted ? mm->start_code : 1) : 0,
45265 mm ? (permitted ? mm->end_code : 1) : 0,
45266 (permitted && mm) ? mm->start_stack : 0,
45267+#endif
45268 esp,
45269 eip,
45270 /* The signal information here is obsolete.
45271@@ -544,3 +594,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
45272
45273 return 0;
45274 }
45275+
45276+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
45277+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
45278+{
45279+ u32 curr_ip = 0;
45280+ unsigned long flags;
45281+
45282+ if (lock_task_sighand(task, &flags)) {
45283+ curr_ip = task->signal->curr_ip;
45284+ unlock_task_sighand(task, &flags);
45285+ }
45286+
45287+ return sprintf(buffer, "%pI4\n", &curr_ip);
45288+}
45289+#endif
45290diff --git a/fs/proc/base.c b/fs/proc/base.c
45291index 1fc1dca..357b933 100644
45292--- a/fs/proc/base.c
45293+++ b/fs/proc/base.c
45294@@ -107,6 +107,22 @@ struct pid_entry {
45295 union proc_op op;
45296 };
45297
45298+struct getdents_callback {
45299+ struct linux_dirent __user * current_dir;
45300+ struct linux_dirent __user * previous;
45301+ struct file * file;
45302+ int count;
45303+ int error;
45304+};
45305+
45306+static int gr_fake_filldir(void * __buf, const char *name, int namlen,
45307+ loff_t offset, u64 ino, unsigned int d_type)
45308+{
45309+ struct getdents_callback * buf = (struct getdents_callback *) __buf;
45310+ buf->error = -EINVAL;
45311+ return 0;
45312+}
45313+
45314 #define NOD(NAME, MODE, IOP, FOP, OP) { \
45315 .name = (NAME), \
45316 .len = sizeof(NAME) - 1, \
45317@@ -194,26 +210,6 @@ static int proc_root_link(struct inode *inode, struct path *path)
45318 return result;
45319 }
45320
45321-static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
45322-{
45323- struct mm_struct *mm;
45324- int err;
45325-
45326- err = mutex_lock_killable(&task->signal->cred_guard_mutex);
45327- if (err)
45328- return ERR_PTR(err);
45329-
45330- mm = get_task_mm(task);
45331- if (mm && mm != current->mm &&
45332- !ptrace_may_access(task, mode)) {
45333- mmput(mm);
45334- mm = ERR_PTR(-EACCES);
45335- }
45336- mutex_unlock(&task->signal->cred_guard_mutex);
45337-
45338- return mm;
45339-}
45340-
45341 struct mm_struct *mm_for_maps(struct task_struct *task)
45342 {
45343 return mm_access(task, PTRACE_MODE_READ);
45344@@ -229,6 +225,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
45345 if (!mm->arg_end)
45346 goto out_mm; /* Shh! No looking before we're done */
45347
45348+ if (gr_acl_handle_procpidmem(task))
45349+ goto out_mm;
45350+
45351 len = mm->arg_end - mm->arg_start;
45352
45353 if (len > PAGE_SIZE)
45354@@ -256,12 +255,28 @@ out:
45355 return res;
45356 }
45357
45358+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45359+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
45360+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
45361+ _mm->pax_flags & MF_PAX_SEGMEXEC))
45362+#endif
45363+
45364 static int proc_pid_auxv(struct task_struct *task, char *buffer)
45365 {
45366 struct mm_struct *mm = mm_for_maps(task);
45367 int res = PTR_ERR(mm);
45368 if (mm && !IS_ERR(mm)) {
45369 unsigned int nwords = 0;
45370+
45371+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45372+ /* allow if we're currently ptracing this task */
45373+ if (PAX_RAND_FLAGS(mm) &&
45374+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
45375+ mmput(mm);
45376+ return 0;
45377+ }
45378+#endif
45379+
45380 do {
45381 nwords += 2;
45382 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
45383@@ -275,7 +290,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
45384 }
45385
45386
45387-#ifdef CONFIG_KALLSYMS
45388+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45389 /*
45390 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
45391 * Returns the resolved symbol. If that fails, simply return the address.
45392@@ -314,7 +329,7 @@ static void unlock_trace(struct task_struct *task)
45393 mutex_unlock(&task->signal->cred_guard_mutex);
45394 }
45395
45396-#ifdef CONFIG_STACKTRACE
45397+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45398
45399 #define MAX_STACK_TRACE_DEPTH 64
45400
45401@@ -505,7 +520,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
45402 return count;
45403 }
45404
45405-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
45406+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
45407 static int proc_pid_syscall(struct task_struct *task, char *buffer)
45408 {
45409 long nr;
45410@@ -534,7 +549,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
45411 /************************************************************************/
45412
45413 /* permission checks */
45414-static int proc_fd_access_allowed(struct inode *inode)
45415+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
45416 {
45417 struct task_struct *task;
45418 int allowed = 0;
45419@@ -544,7 +559,10 @@ static int proc_fd_access_allowed(struct inode *inode)
45420 */
45421 task = get_proc_task(inode);
45422 if (task) {
45423- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
45424+ if (log)
45425+ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
45426+ else
45427+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
45428 put_task_struct(task);
45429 }
45430 return allowed;
45431@@ -775,6 +793,13 @@ static int mem_open(struct inode* inode, struct file* file)
45432 if (IS_ERR(mm))
45433 return PTR_ERR(mm);
45434
45435+ if (mm) {
45436+ /* ensure this mm_struct can't be freed */
45437+ atomic_inc(&mm->mm_count);
45438+ /* but do not pin its memory */
45439+ mmput(mm);
45440+ }
45441+
45442 /* OK to pass negative loff_t, we can catch out-of-range */
45443 file->f_mode |= FMODE_UNSIGNED_OFFSET;
45444 file->private_data = mm;
45445@@ -782,57 +807,18 @@ static int mem_open(struct inode* inode, struct file* file)
45446 return 0;
45447 }
45448
45449-static ssize_t mem_read(struct file * file, char __user * buf,
45450- size_t count, loff_t *ppos)
45451+static ssize_t mem_rw(struct file *file, char __user *buf,
45452+ size_t count, loff_t *ppos, int write)
45453 {
45454- int ret;
45455- char *page;
45456- unsigned long src = *ppos;
45457 struct mm_struct *mm = file->private_data;
45458-
45459- if (!mm)
45460- return 0;
45461-
45462- page = (char *)__get_free_page(GFP_TEMPORARY);
45463- if (!page)
45464- return -ENOMEM;
45465-
45466- ret = 0;
45467-
45468- while (count > 0) {
45469- int this_len, retval;
45470-
45471- this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
45472- retval = access_remote_vm(mm, src, page, this_len, 0);
45473- if (!retval) {
45474- if (!ret)
45475- ret = -EIO;
45476- break;
45477- }
45478-
45479- if (copy_to_user(buf, page, retval)) {
45480- ret = -EFAULT;
45481- break;
45482- }
45483-
45484- ret += retval;
45485- src += retval;
45486- buf += retval;
45487- count -= retval;
45488- }
45489- *ppos = src;
45490-
45491- free_page((unsigned long) page);
45492- return ret;
45493-}
45494-
45495-static ssize_t mem_write(struct file * file, const char __user *buf,
45496- size_t count, loff_t *ppos)
45497-{
45498- int copied;
45499+ unsigned long addr = *ppos;
45500+ ssize_t copied;
45501 char *page;
45502- unsigned long dst = *ppos;
45503- struct mm_struct *mm = file->private_data;
45504+
45505+#ifdef CONFIG_GRKERNSEC
45506+ if (write)
45507+ return -EPERM;
45508+#endif
45509
45510 if (!mm)
45511 return 0;
45512@@ -842,31 +828,54 @@ static ssize_t mem_write(struct file * file, const char __user *buf,
45513 return -ENOMEM;
45514
45515 copied = 0;
45516+ if (!atomic_inc_not_zero(&mm->mm_users))
45517+ goto free;
45518+
45519 while (count > 0) {
45520- int this_len, retval;
45521+ int this_len = min_t(int, count, PAGE_SIZE);
45522
45523- this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
45524- if (copy_from_user(page, buf, this_len)) {
45525+ if (write && copy_from_user(page, buf, this_len)) {
45526 copied = -EFAULT;
45527 break;
45528 }
45529- retval = access_remote_vm(mm, dst, page, this_len, 1);
45530- if (!retval) {
45531+
45532+ this_len = access_remote_vm(mm, addr, page, this_len, write);
45533+ if (!this_len) {
45534 if (!copied)
45535 copied = -EIO;
45536 break;
45537 }
45538- copied += retval;
45539- buf += retval;
45540- dst += retval;
45541- count -= retval;
45542+
45543+ if (!write && copy_to_user(buf, page, this_len)) {
45544+ copied = -EFAULT;
45545+ break;
45546+ }
45547+
45548+ buf += this_len;
45549+ addr += this_len;
45550+ copied += this_len;
45551+ count -= this_len;
45552 }
45553- *ppos = dst;
45554+ *ppos = addr;
45555
45556+ mmput(mm);
45557+free:
45558 free_page((unsigned long) page);
45559 return copied;
45560 }
45561
45562+static ssize_t mem_read(struct file *file, char __user *buf,
45563+ size_t count, loff_t *ppos)
45564+{
45565+ return mem_rw(file, buf, count, ppos, 0);
45566+}
45567+
45568+static ssize_t mem_write(struct file *file, const char __user *buf,
45569+ size_t count, loff_t *ppos)
45570+{
45571+ return mem_rw(file, (char __user*)buf, count, ppos, 1);
45572+}
45573+
45574 loff_t mem_lseek(struct file *file, loff_t offset, int orig)
45575 {
45576 switch (orig) {
45577@@ -886,8 +895,8 @@ loff_t mem_lseek(struct file *file, loff_t offset, int orig)
45578 static int mem_release(struct inode *inode, struct file *file)
45579 {
45580 struct mm_struct *mm = file->private_data;
45581-
45582- mmput(mm);
45583+ if (mm)
45584+ mmdrop(mm);
45585 return 0;
45586 }
45587
45588@@ -911,6 +920,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
45589 if (!task)
45590 goto out_no_task;
45591
45592+ if (gr_acl_handle_procpidmem(task))
45593+ goto out;
45594+
45595 ret = -ENOMEM;
45596 page = (char *)__get_free_page(GFP_TEMPORARY);
45597 if (!page)
45598@@ -1533,7 +1545,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
45599 path_put(&nd->path);
45600
45601 /* Are we allowed to snoop on the tasks file descriptors? */
45602- if (!proc_fd_access_allowed(inode))
45603+ if (!proc_fd_access_allowed(inode,0))
45604 goto out;
45605
45606 error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
45607@@ -1572,8 +1584,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
45608 struct path path;
45609
45610 /* Are we allowed to snoop on the tasks file descriptors? */
45611- if (!proc_fd_access_allowed(inode))
45612- goto out;
45613+ /* logging this is needed for learning on chromium to work properly,
45614+ but we don't want to flood the logs from 'ps' which does a readlink
45615+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
45616+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
45617+ */
45618+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
45619+ if (!proc_fd_access_allowed(inode,0))
45620+ goto out;
45621+ } else {
45622+ if (!proc_fd_access_allowed(inode,1))
45623+ goto out;
45624+ }
45625
45626 error = PROC_I(inode)->op.proc_get_link(inode, &path);
45627 if (error)
45628@@ -1638,7 +1660,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
45629 rcu_read_lock();
45630 cred = __task_cred(task);
45631 inode->i_uid = cred->euid;
45632+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45633+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
45634+#else
45635 inode->i_gid = cred->egid;
45636+#endif
45637 rcu_read_unlock();
45638 }
45639 security_task_to_inode(task, inode);
45640@@ -1656,6 +1682,9 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
45641 struct inode *inode = dentry->d_inode;
45642 struct task_struct *task;
45643 const struct cred *cred;
45644+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45645+ const struct cred *tmpcred = current_cred();
45646+#endif
45647
45648 generic_fillattr(inode, stat);
45649
45650@@ -1663,13 +1692,41 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
45651 stat->uid = 0;
45652 stat->gid = 0;
45653 task = pid_task(proc_pid(inode), PIDTYPE_PID);
45654+
45655+ if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
45656+ rcu_read_unlock();
45657+ return -ENOENT;
45658+ }
45659+
45660 if (task) {
45661+ cred = __task_cred(task);
45662+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45663+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
45664+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45665+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
45666+#endif
45667+ ) {
45668+#endif
45669 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
45670+#ifdef CONFIG_GRKERNSEC_PROC_USER
45671+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
45672+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45673+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
45674+#endif
45675 task_dumpable(task)) {
45676- cred = __task_cred(task);
45677 stat->uid = cred->euid;
45678+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45679+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
45680+#else
45681 stat->gid = cred->egid;
45682+#endif
45683 }
45684+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45685+ } else {
45686+ rcu_read_unlock();
45687+ return -ENOENT;
45688+ }
45689+#endif
45690 }
45691 rcu_read_unlock();
45692 return 0;
45693@@ -1706,11 +1763,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
45694
45695 if (task) {
45696 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
45697+#ifdef CONFIG_GRKERNSEC_PROC_USER
45698+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
45699+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45700+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
45701+#endif
45702 task_dumpable(task)) {
45703 rcu_read_lock();
45704 cred = __task_cred(task);
45705 inode->i_uid = cred->euid;
45706+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45707+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
45708+#else
45709 inode->i_gid = cred->egid;
45710+#endif
45711 rcu_read_unlock();
45712 } else {
45713 inode->i_uid = 0;
45714@@ -1828,7 +1894,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
45715 int fd = proc_fd(inode);
45716
45717 if (task) {
45718- files = get_files_struct(task);
45719+ if (!gr_acl_handle_procpidmem(task))
45720+ files = get_files_struct(task);
45721 put_task_struct(task);
45722 }
45723 if (files) {
45724@@ -2096,11 +2163,21 @@ static const struct file_operations proc_fd_operations = {
45725 */
45726 static int proc_fd_permission(struct inode *inode, int mask)
45727 {
45728+ struct task_struct *task;
45729 int rv = generic_permission(inode, mask);
45730- if (rv == 0)
45731- return 0;
45732+
45733 if (task_pid(current) == proc_pid(inode))
45734 rv = 0;
45735+
45736+ task = get_proc_task(inode);
45737+ if (task == NULL)
45738+ return rv;
45739+
45740+ if (gr_acl_handle_procpidmem(task))
45741+ rv = -EACCES;
45742+
45743+ put_task_struct(task);
45744+
45745 return rv;
45746 }
45747
45748@@ -2210,6 +2287,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
45749 if (!task)
45750 goto out_no_task;
45751
45752+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
45753+ goto out;
45754+
45755 /*
45756 * Yes, it does not scale. And it should not. Don't add
45757 * new entries into /proc/<tgid>/ without very good reasons.
45758@@ -2254,6 +2334,9 @@ static int proc_pident_readdir(struct file *filp,
45759 if (!task)
45760 goto out_no_task;
45761
45762+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
45763+ goto out;
45764+
45765 ret = 0;
45766 i = filp->f_pos;
45767 switch (i) {
45768@@ -2524,7 +2607,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
45769 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
45770 void *cookie)
45771 {
45772- char *s = nd_get_link(nd);
45773+ const char *s = nd_get_link(nd);
45774 if (!IS_ERR(s))
45775 __putname(s);
45776 }
45777@@ -2722,7 +2805,7 @@ static const struct pid_entry tgid_base_stuff[] = {
45778 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
45779 #endif
45780 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
45781-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
45782+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
45783 INF("syscall", S_IRUGO, proc_pid_syscall),
45784 #endif
45785 INF("cmdline", S_IRUGO, proc_pid_cmdline),
45786@@ -2747,10 +2830,10 @@ static const struct pid_entry tgid_base_stuff[] = {
45787 #ifdef CONFIG_SECURITY
45788 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
45789 #endif
45790-#ifdef CONFIG_KALLSYMS
45791+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45792 INF("wchan", S_IRUGO, proc_pid_wchan),
45793 #endif
45794-#ifdef CONFIG_STACKTRACE
45795+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45796 ONE("stack", S_IRUGO, proc_pid_stack),
45797 #endif
45798 #ifdef CONFIG_SCHEDSTATS
45799@@ -2784,6 +2867,9 @@ static const struct pid_entry tgid_base_stuff[] = {
45800 #ifdef CONFIG_HARDWALL
45801 INF("hardwall", S_IRUGO, proc_pid_hardwall),
45802 #endif
45803+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
45804+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
45805+#endif
45806 };
45807
45808 static int proc_tgid_base_readdir(struct file * filp,
45809@@ -2909,7 +2995,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
45810 if (!inode)
45811 goto out;
45812
45813+#ifdef CONFIG_GRKERNSEC_PROC_USER
45814+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
45815+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45816+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
45817+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
45818+#else
45819 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
45820+#endif
45821 inode->i_op = &proc_tgid_base_inode_operations;
45822 inode->i_fop = &proc_tgid_base_operations;
45823 inode->i_flags|=S_IMMUTABLE;
45824@@ -2951,7 +3044,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
45825 if (!task)
45826 goto out;
45827
45828+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
45829+ goto out_put_task;
45830+
45831 result = proc_pid_instantiate(dir, dentry, task, NULL);
45832+out_put_task:
45833 put_task_struct(task);
45834 out:
45835 return result;
45836@@ -3016,6 +3113,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
45837 {
45838 unsigned int nr;
45839 struct task_struct *reaper;
45840+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45841+ const struct cred *tmpcred = current_cred();
45842+ const struct cred *itercred;
45843+#endif
45844+ filldir_t __filldir = filldir;
45845 struct tgid_iter iter;
45846 struct pid_namespace *ns;
45847
45848@@ -3039,8 +3141,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
45849 for (iter = next_tgid(ns, iter);
45850 iter.task;
45851 iter.tgid += 1, iter = next_tgid(ns, iter)) {
45852+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45853+ rcu_read_lock();
45854+ itercred = __task_cred(iter.task);
45855+#endif
45856+ if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
45857+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45858+ || (tmpcred->uid && (itercred->uid != tmpcred->uid)
45859+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45860+ && !in_group_p(CONFIG_GRKERNSEC_PROC_GID)
45861+#endif
45862+ )
45863+#endif
45864+ )
45865+ __filldir = &gr_fake_filldir;
45866+ else
45867+ __filldir = filldir;
45868+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45869+ rcu_read_unlock();
45870+#endif
45871 filp->f_pos = iter.tgid + TGID_OFFSET;
45872- if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
45873+ if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
45874 put_task_struct(iter.task);
45875 goto out;
45876 }
45877@@ -3068,7 +3189,7 @@ static const struct pid_entry tid_base_stuff[] = {
45878 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
45879 #endif
45880 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
45881-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
45882+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
45883 INF("syscall", S_IRUGO, proc_pid_syscall),
45884 #endif
45885 INF("cmdline", S_IRUGO, proc_pid_cmdline),
45886@@ -3092,10 +3213,10 @@ static const struct pid_entry tid_base_stuff[] = {
45887 #ifdef CONFIG_SECURITY
45888 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
45889 #endif
45890-#ifdef CONFIG_KALLSYMS
45891+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45892 INF("wchan", S_IRUGO, proc_pid_wchan),
45893 #endif
45894-#ifdef CONFIG_STACKTRACE
45895+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45896 ONE("stack", S_IRUGO, proc_pid_stack),
45897 #endif
45898 #ifdef CONFIG_SCHEDSTATS
45899diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
45900index 82676e3..5f8518a 100644
45901--- a/fs/proc/cmdline.c
45902+++ b/fs/proc/cmdline.c
45903@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
45904
45905 static int __init proc_cmdline_init(void)
45906 {
45907+#ifdef CONFIG_GRKERNSEC_PROC_ADD
45908+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
45909+#else
45910 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
45911+#endif
45912 return 0;
45913 }
45914 module_init(proc_cmdline_init);
45915diff --git a/fs/proc/devices.c b/fs/proc/devices.c
45916index b143471..bb105e5 100644
45917--- a/fs/proc/devices.c
45918+++ b/fs/proc/devices.c
45919@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
45920
45921 static int __init proc_devices_init(void)
45922 {
45923+#ifdef CONFIG_GRKERNSEC_PROC_ADD
45924+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
45925+#else
45926 proc_create("devices", 0, NULL, &proc_devinfo_operations);
45927+#endif
45928 return 0;
45929 }
45930 module_init(proc_devices_init);
45931diff --git a/fs/proc/inode.c b/fs/proc/inode.c
45932index 7737c54..7172574 100644
45933--- a/fs/proc/inode.c
45934+++ b/fs/proc/inode.c
45935@@ -18,12 +18,18 @@
45936 #include <linux/module.h>
45937 #include <linux/sysctl.h>
45938 #include <linux/slab.h>
45939+#include <linux/grsecurity.h>
45940
45941 #include <asm/system.h>
45942 #include <asm/uaccess.h>
45943
45944 #include "internal.h"
45945
45946+#ifdef CONFIG_PROC_SYSCTL
45947+extern const struct inode_operations proc_sys_inode_operations;
45948+extern const struct inode_operations proc_sys_dir_operations;
45949+#endif
45950+
45951 static void proc_evict_inode(struct inode *inode)
45952 {
45953 struct proc_dir_entry *de;
45954@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
45955 ns_ops = PROC_I(inode)->ns_ops;
45956 if (ns_ops && ns_ops->put)
45957 ns_ops->put(PROC_I(inode)->ns);
45958+
45959+#ifdef CONFIG_PROC_SYSCTL
45960+ if (inode->i_op == &proc_sys_inode_operations ||
45961+ inode->i_op == &proc_sys_dir_operations)
45962+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
45963+#endif
45964+
45965 }
45966
45967 static struct kmem_cache * proc_inode_cachep;
45968@@ -440,7 +453,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
45969 if (de->mode) {
45970 inode->i_mode = de->mode;
45971 inode->i_uid = de->uid;
45972+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45973+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
45974+#else
45975 inode->i_gid = de->gid;
45976+#endif
45977 }
45978 if (de->size)
45979 inode->i_size = de->size;
45980diff --git a/fs/proc/internal.h b/fs/proc/internal.h
45981index 7838e5c..ff92cbc 100644
45982--- a/fs/proc/internal.h
45983+++ b/fs/proc/internal.h
45984@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
45985 struct pid *pid, struct task_struct *task);
45986 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
45987 struct pid *pid, struct task_struct *task);
45988+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
45989+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
45990+#endif
45991 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
45992
45993 extern const struct file_operations proc_maps_operations;
45994diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
45995index d245cb2..f4e8498 100644
45996--- a/fs/proc/kcore.c
45997+++ b/fs/proc/kcore.c
45998@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
45999 * the addresses in the elf_phdr on our list.
46000 */
46001 start = kc_offset_to_vaddr(*fpos - elf_buflen);
46002- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
46003+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
46004+ if (tsz > buflen)
46005 tsz = buflen;
46006-
46007+
46008 while (buflen) {
46009 struct kcore_list *m;
46010
46011@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
46012 kfree(elf_buf);
46013 } else {
46014 if (kern_addr_valid(start)) {
46015- unsigned long n;
46016+ char *elf_buf;
46017+ mm_segment_t oldfs;
46018
46019- n = copy_to_user(buffer, (char *)start, tsz);
46020- /*
46021- * We cannot distingush between fault on source
46022- * and fault on destination. When this happens
46023- * we clear too and hope it will trigger the
46024- * EFAULT again.
46025- */
46026- if (n) {
46027- if (clear_user(buffer + tsz - n,
46028- n))
46029+ elf_buf = kmalloc(tsz, GFP_KERNEL);
46030+ if (!elf_buf)
46031+ return -ENOMEM;
46032+ oldfs = get_fs();
46033+ set_fs(KERNEL_DS);
46034+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
46035+ set_fs(oldfs);
46036+ if (copy_to_user(buffer, elf_buf, tsz)) {
46037+ kfree(elf_buf);
46038 return -EFAULT;
46039+ }
46040 }
46041+ set_fs(oldfs);
46042+ kfree(elf_buf);
46043 } else {
46044 if (clear_user(buffer, tsz))
46045 return -EFAULT;
46046@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
46047
46048 static int open_kcore(struct inode *inode, struct file *filp)
46049 {
46050+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
46051+ return -EPERM;
46052+#endif
46053 if (!capable(CAP_SYS_RAWIO))
46054 return -EPERM;
46055 if (kcore_need_update)
46056diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
46057index 80e4645..53e5fcf 100644
46058--- a/fs/proc/meminfo.c
46059+++ b/fs/proc/meminfo.c
46060@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
46061 vmi.used >> 10,
46062 vmi.largest_chunk >> 10
46063 #ifdef CONFIG_MEMORY_FAILURE
46064- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
46065+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
46066 #endif
46067 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
46068 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
46069diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
46070index b1822dd..df622cb 100644
46071--- a/fs/proc/nommu.c
46072+++ b/fs/proc/nommu.c
46073@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
46074 if (len < 1)
46075 len = 1;
46076 seq_printf(m, "%*c", len, ' ');
46077- seq_path(m, &file->f_path, "");
46078+ seq_path(m, &file->f_path, "\n\\");
46079 }
46080
46081 seq_putc(m, '\n');
46082diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
46083index f738024..876984a 100644
46084--- a/fs/proc/proc_net.c
46085+++ b/fs/proc/proc_net.c
46086@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
46087 struct task_struct *task;
46088 struct nsproxy *ns;
46089 struct net *net = NULL;
46090+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
46091+ const struct cred *cred = current_cred();
46092+#endif
46093+
46094+#ifdef CONFIG_GRKERNSEC_PROC_USER
46095+ if (cred->fsuid)
46096+ return net;
46097+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
46098+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
46099+ return net;
46100+#endif
46101
46102 rcu_read_lock();
46103 task = pid_task(proc_pid(dir), PIDTYPE_PID);
46104diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
46105index a6b6217..1e0579d 100644
46106--- a/fs/proc/proc_sysctl.c
46107+++ b/fs/proc/proc_sysctl.c
46108@@ -9,11 +9,13 @@
46109 #include <linux/namei.h>
46110 #include "internal.h"
46111
46112+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
46113+
46114 static const struct dentry_operations proc_sys_dentry_operations;
46115 static const struct file_operations proc_sys_file_operations;
46116-static const struct inode_operations proc_sys_inode_operations;
46117+const struct inode_operations proc_sys_inode_operations;
46118 static const struct file_operations proc_sys_dir_file_operations;
46119-static const struct inode_operations proc_sys_dir_operations;
46120+const struct inode_operations proc_sys_dir_operations;
46121
46122 void proc_sys_poll_notify(struct ctl_table_poll *poll)
46123 {
46124@@ -131,8 +133,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
46125
46126 err = NULL;
46127 d_set_d_op(dentry, &proc_sys_dentry_operations);
46128+
46129+ gr_handle_proc_create(dentry, inode);
46130+
46131 d_add(dentry, inode);
46132
46133+ if (gr_handle_sysctl(p, MAY_EXEC))
46134+ err = ERR_PTR(-ENOENT);
46135+
46136 out:
46137 sysctl_head_finish(head);
46138 return err;
46139@@ -163,6 +171,12 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
46140 if (!table->proc_handler)
46141 goto out;
46142
46143+#ifdef CONFIG_GRKERNSEC
46144+ error = -EPERM;
46145+ if (write && !capable(CAP_SYS_ADMIN))
46146+ goto out;
46147+#endif
46148+
46149 /* careful: calling conventions are nasty here */
46150 res = count;
46151 error = table->proc_handler(table, write, buf, &res, ppos);
46152@@ -245,6 +259,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
46153 return -ENOMEM;
46154 } else {
46155 d_set_d_op(child, &proc_sys_dentry_operations);
46156+
46157+ gr_handle_proc_create(child, inode);
46158+
46159 d_add(child, inode);
46160 }
46161 } else {
46162@@ -273,6 +290,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
46163 if (*pos < file->f_pos)
46164 continue;
46165
46166+ if (gr_handle_sysctl(table, 0))
46167+ continue;
46168+
46169 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
46170 if (res)
46171 return res;
46172@@ -398,6 +418,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
46173 if (IS_ERR(head))
46174 return PTR_ERR(head);
46175
46176+ if (table && gr_handle_sysctl(table, MAY_EXEC))
46177+ return -ENOENT;
46178+
46179 generic_fillattr(inode, stat);
46180 if (table)
46181 stat->mode = (stat->mode & S_IFMT) | table->mode;
46182@@ -420,13 +443,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
46183 .llseek = generic_file_llseek,
46184 };
46185
46186-static const struct inode_operations proc_sys_inode_operations = {
46187+const struct inode_operations proc_sys_inode_operations = {
46188 .permission = proc_sys_permission,
46189 .setattr = proc_sys_setattr,
46190 .getattr = proc_sys_getattr,
46191 };
46192
46193-static const struct inode_operations proc_sys_dir_operations = {
46194+const struct inode_operations proc_sys_dir_operations = {
46195 .lookup = proc_sys_lookup,
46196 .permission = proc_sys_permission,
46197 .setattr = proc_sys_setattr,
46198diff --git a/fs/proc/root.c b/fs/proc/root.c
46199index 03102d9..4ae347e 100644
46200--- a/fs/proc/root.c
46201+++ b/fs/proc/root.c
46202@@ -121,7 +121,15 @@ void __init proc_root_init(void)
46203 #ifdef CONFIG_PROC_DEVICETREE
46204 proc_device_tree_init();
46205 #endif
46206+#ifdef CONFIG_GRKERNSEC_PROC_ADD
46207+#ifdef CONFIG_GRKERNSEC_PROC_USER
46208+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
46209+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
46210+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
46211+#endif
46212+#else
46213 proc_mkdir("bus", NULL);
46214+#endif
46215 proc_sys_init();
46216 }
46217
46218diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
46219index 7dcd2a2..d1d9cb6 100644
46220--- a/fs/proc/task_mmu.c
46221+++ b/fs/proc/task_mmu.c
46222@@ -52,8 +52,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
46223 "VmExe:\t%8lu kB\n"
46224 "VmLib:\t%8lu kB\n"
46225 "VmPTE:\t%8lu kB\n"
46226- "VmSwap:\t%8lu kB\n",
46227- hiwater_vm << (PAGE_SHIFT-10),
46228+ "VmSwap:\t%8lu kB\n"
46229+
46230+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
46231+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
46232+#endif
46233+
46234+ ,hiwater_vm << (PAGE_SHIFT-10),
46235 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
46236 mm->locked_vm << (PAGE_SHIFT-10),
46237 mm->pinned_vm << (PAGE_SHIFT-10),
46238@@ -62,7 +67,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
46239 data << (PAGE_SHIFT-10),
46240 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
46241 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
46242- swap << (PAGE_SHIFT-10));
46243+ swap << (PAGE_SHIFT-10)
46244+
46245+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
46246+ , mm->context.user_cs_base, mm->context.user_cs_limit
46247+#endif
46248+
46249+ );
46250 }
46251
46252 unsigned long task_vsize(struct mm_struct *mm)
46253@@ -209,6 +220,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
46254 return ret;
46255 }
46256
46257+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46258+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
46259+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
46260+ _mm->pax_flags & MF_PAX_SEGMEXEC))
46261+#endif
46262+
46263 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46264 {
46265 struct mm_struct *mm = vma->vm_mm;
46266@@ -227,13 +244,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46267 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
46268 }
46269
46270- /* We don't show the stack guard page in /proc/maps */
46271+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46272+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
46273+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
46274+#else
46275 start = vma->vm_start;
46276- if (stack_guard_page_start(vma, start))
46277- start += PAGE_SIZE;
46278 end = vma->vm_end;
46279- if (stack_guard_page_end(vma, end))
46280- end -= PAGE_SIZE;
46281+#endif
46282
46283 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
46284 start,
46285@@ -242,7 +259,11 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46286 flags & VM_WRITE ? 'w' : '-',
46287 flags & VM_EXEC ? 'x' : '-',
46288 flags & VM_MAYSHARE ? 's' : 'p',
46289+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46290+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
46291+#else
46292 pgoff,
46293+#endif
46294 MAJOR(dev), MINOR(dev), ino, &len);
46295
46296 /*
46297@@ -251,7 +272,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46298 */
46299 if (file) {
46300 pad_len_spaces(m, len);
46301- seq_path(m, &file->f_path, "\n");
46302+ seq_path(m, &file->f_path, "\n\\");
46303 } else {
46304 const char *name = arch_vma_name(vma);
46305 if (!name) {
46306@@ -259,8 +280,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46307 if (vma->vm_start <= mm->brk &&
46308 vma->vm_end >= mm->start_brk) {
46309 name = "[heap]";
46310- } else if (vma->vm_start <= mm->start_stack &&
46311- vma->vm_end >= mm->start_stack) {
46312+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
46313+ (vma->vm_start <= mm->start_stack &&
46314+ vma->vm_end >= mm->start_stack)) {
46315 name = "[stack]";
46316 }
46317 } else {
46318@@ -435,11 +457,16 @@ static int show_smap(struct seq_file *m, void *v)
46319 };
46320
46321 memset(&mss, 0, sizeof mss);
46322- mss.vma = vma;
46323- /* mmap_sem is held in m_start */
46324- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
46325- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
46326-
46327+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46328+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
46329+#endif
46330+ mss.vma = vma;
46331+ /* mmap_sem is held in m_start */
46332+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
46333+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
46334+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46335+ }
46336+#endif
46337 show_map_vma(m, vma);
46338
46339 seq_printf(m,
46340@@ -457,7 +484,11 @@ static int show_smap(struct seq_file *m, void *v)
46341 "KernelPageSize: %8lu kB\n"
46342 "MMUPageSize: %8lu kB\n"
46343 "Locked: %8lu kB\n",
46344+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46345+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
46346+#else
46347 (vma->vm_end - vma->vm_start) >> 10,
46348+#endif
46349 mss.resident >> 10,
46350 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
46351 mss.shared_clean >> 10,
46352@@ -1036,7 +1067,7 @@ static int show_numa_map(struct seq_file *m, void *v)
46353
46354 if (file) {
46355 seq_printf(m, " file=");
46356- seq_path(m, &file->f_path, "\n\t= ");
46357+ seq_path(m, &file->f_path, "\n\t\\= ");
46358 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
46359 seq_printf(m, " heap");
46360 } else if (vma->vm_start <= mm->start_stack &&
46361diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
46362index 980de54..2a4db5f 100644
46363--- a/fs/proc/task_nommu.c
46364+++ b/fs/proc/task_nommu.c
46365@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
46366 else
46367 bytes += kobjsize(mm);
46368
46369- if (current->fs && current->fs->users > 1)
46370+ if (current->fs && atomic_read(&current->fs->users) > 1)
46371 sbytes += kobjsize(current->fs);
46372 else
46373 bytes += kobjsize(current->fs);
46374@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
46375
46376 if (file) {
46377 pad_len_spaces(m, len);
46378- seq_path(m, &file->f_path, "");
46379+ seq_path(m, &file->f_path, "\n\\");
46380 } else if (mm) {
46381 if (vma->vm_start <= mm->start_stack &&
46382 vma->vm_end >= mm->start_stack) {
46383diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
46384index d67908b..d13f6a6 100644
46385--- a/fs/quota/netlink.c
46386+++ b/fs/quota/netlink.c
46387@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
46388 void quota_send_warning(short type, unsigned int id, dev_t dev,
46389 const char warntype)
46390 {
46391- static atomic_t seq;
46392+ static atomic_unchecked_t seq;
46393 struct sk_buff *skb;
46394 void *msg_head;
46395 int ret;
46396@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
46397 "VFS: Not enough memory to send quota warning.\n");
46398 return;
46399 }
46400- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
46401+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
46402 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
46403 if (!msg_head) {
46404 printk(KERN_ERR
46405diff --git a/fs/readdir.c b/fs/readdir.c
46406index 356f715..c918d38 100644
46407--- a/fs/readdir.c
46408+++ b/fs/readdir.c
46409@@ -17,6 +17,7 @@
46410 #include <linux/security.h>
46411 #include <linux/syscalls.h>
46412 #include <linux/unistd.h>
46413+#include <linux/namei.h>
46414
46415 #include <asm/uaccess.h>
46416
46417@@ -67,6 +68,7 @@ struct old_linux_dirent {
46418
46419 struct readdir_callback {
46420 struct old_linux_dirent __user * dirent;
46421+ struct file * file;
46422 int result;
46423 };
46424
46425@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
46426 buf->result = -EOVERFLOW;
46427 return -EOVERFLOW;
46428 }
46429+
46430+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
46431+ return 0;
46432+
46433 buf->result++;
46434 dirent = buf->dirent;
46435 if (!access_ok(VERIFY_WRITE, dirent,
46436@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
46437
46438 buf.result = 0;
46439 buf.dirent = dirent;
46440+ buf.file = file;
46441
46442 error = vfs_readdir(file, fillonedir, &buf);
46443 if (buf.result)
46444@@ -142,6 +149,7 @@ struct linux_dirent {
46445 struct getdents_callback {
46446 struct linux_dirent __user * current_dir;
46447 struct linux_dirent __user * previous;
46448+ struct file * file;
46449 int count;
46450 int error;
46451 };
46452@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
46453 buf->error = -EOVERFLOW;
46454 return -EOVERFLOW;
46455 }
46456+
46457+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
46458+ return 0;
46459+
46460 dirent = buf->previous;
46461 if (dirent) {
46462 if (__put_user(offset, &dirent->d_off))
46463@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
46464 buf.previous = NULL;
46465 buf.count = count;
46466 buf.error = 0;
46467+ buf.file = file;
46468
46469 error = vfs_readdir(file, filldir, &buf);
46470 if (error >= 0)
46471@@ -229,6 +242,7 @@ out:
46472 struct getdents_callback64 {
46473 struct linux_dirent64 __user * current_dir;
46474 struct linux_dirent64 __user * previous;
46475+ struct file *file;
46476 int count;
46477 int error;
46478 };
46479@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
46480 buf->error = -EINVAL; /* only used if we fail.. */
46481 if (reclen > buf->count)
46482 return -EINVAL;
46483+
46484+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
46485+ return 0;
46486+
46487 dirent = buf->previous;
46488 if (dirent) {
46489 if (__put_user(offset, &dirent->d_off))
46490@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
46491
46492 buf.current_dir = dirent;
46493 buf.previous = NULL;
46494+ buf.file = file;
46495 buf.count = count;
46496 buf.error = 0;
46497
46498@@ -299,7 +318,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
46499 error = buf.error;
46500 lastdirent = buf.previous;
46501 if (lastdirent) {
46502- typeof(lastdirent->d_off) d_off = file->f_pos;
46503+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
46504 if (__put_user(d_off, &lastdirent->d_off))
46505 error = -EFAULT;
46506 else
46507diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
46508index 60c0804..d814f98 100644
46509--- a/fs/reiserfs/do_balan.c
46510+++ b/fs/reiserfs/do_balan.c
46511@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
46512 return;
46513 }
46514
46515- atomic_inc(&(fs_generation(tb->tb_sb)));
46516+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
46517 do_balance_starts(tb);
46518
46519 /* balance leaf returns 0 except if combining L R and S into
46520diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
46521index 7a99811..a7c96c4 100644
46522--- a/fs/reiserfs/procfs.c
46523+++ b/fs/reiserfs/procfs.c
46524@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
46525 "SMALL_TAILS " : "NO_TAILS ",
46526 replay_only(sb) ? "REPLAY_ONLY " : "",
46527 convert_reiserfs(sb) ? "CONV " : "",
46528- atomic_read(&r->s_generation_counter),
46529+ atomic_read_unchecked(&r->s_generation_counter),
46530 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
46531 SF(s_do_balance), SF(s_unneeded_left_neighbor),
46532 SF(s_good_search_by_key_reada), SF(s_bmaps),
46533diff --git a/fs/select.c b/fs/select.c
46534index d33418f..2a5345e 100644
46535--- a/fs/select.c
46536+++ b/fs/select.c
46537@@ -20,6 +20,7 @@
46538 #include <linux/module.h>
46539 #include <linux/slab.h>
46540 #include <linux/poll.h>
46541+#include <linux/security.h>
46542 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
46543 #include <linux/file.h>
46544 #include <linux/fdtable.h>
46545@@ -837,6 +838,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
46546 struct poll_list *walk = head;
46547 unsigned long todo = nfds;
46548
46549+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
46550 if (nfds > rlimit(RLIMIT_NOFILE))
46551 return -EINVAL;
46552
46553diff --git a/fs/seq_file.c b/fs/seq_file.c
46554index dba43c3..a99fb63 100644
46555--- a/fs/seq_file.c
46556+++ b/fs/seq_file.c
46557@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, loff_t offset)
46558 return 0;
46559 }
46560 if (!m->buf) {
46561- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
46562+ m->size = PAGE_SIZE;
46563+ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
46564 if (!m->buf)
46565 return -ENOMEM;
46566 }
46567@@ -116,7 +117,8 @@ static int traverse(struct seq_file *m, loff_t offset)
46568 Eoverflow:
46569 m->op->stop(m, p);
46570 kfree(m->buf);
46571- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
46572+ m->size <<= 1;
46573+ m->buf = kmalloc(m->size, GFP_KERNEL);
46574 return !m->buf ? -ENOMEM : -EAGAIN;
46575 }
46576
46577@@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
46578 m->version = file->f_version;
46579 /* grab buffer if we didn't have one */
46580 if (!m->buf) {
46581- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
46582+ m->size = PAGE_SIZE;
46583+ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
46584 if (!m->buf)
46585 goto Enomem;
46586 }
46587@@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
46588 goto Fill;
46589 m->op->stop(m, p);
46590 kfree(m->buf);
46591- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
46592+ m->size <<= 1;
46593+ m->buf = kmalloc(m->size, GFP_KERNEL);
46594 if (!m->buf)
46595 goto Enomem;
46596 m->count = 0;
46597@@ -549,7 +553,7 @@ static void single_stop(struct seq_file *p, void *v)
46598 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
46599 void *data)
46600 {
46601- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
46602+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
46603 int res = -ENOMEM;
46604
46605 if (op) {
46606diff --git a/fs/splice.c b/fs/splice.c
46607index fa2defa..8601650 100644
46608--- a/fs/splice.c
46609+++ b/fs/splice.c
46610@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
46611 pipe_lock(pipe);
46612
46613 for (;;) {
46614- if (!pipe->readers) {
46615+ if (!atomic_read(&pipe->readers)) {
46616 send_sig(SIGPIPE, current, 0);
46617 if (!ret)
46618 ret = -EPIPE;
46619@@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
46620 do_wakeup = 0;
46621 }
46622
46623- pipe->waiting_writers++;
46624+ atomic_inc(&pipe->waiting_writers);
46625 pipe_wait(pipe);
46626- pipe->waiting_writers--;
46627+ atomic_dec(&pipe->waiting_writers);
46628 }
46629
46630 pipe_unlock(pipe);
46631@@ -560,7 +560,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
46632 old_fs = get_fs();
46633 set_fs(get_ds());
46634 /* The cast to a user pointer is valid due to the set_fs() */
46635- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
46636+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
46637 set_fs(old_fs);
46638
46639 return res;
46640@@ -575,7 +575,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
46641 old_fs = get_fs();
46642 set_fs(get_ds());
46643 /* The cast to a user pointer is valid due to the set_fs() */
46644- res = vfs_write(file, (const char __user *)buf, count, &pos);
46645+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
46646 set_fs(old_fs);
46647
46648 return res;
46649@@ -626,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
46650 goto err;
46651
46652 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
46653- vec[i].iov_base = (void __user *) page_address(page);
46654+ vec[i].iov_base = (void __force_user *) page_address(page);
46655 vec[i].iov_len = this_len;
46656 spd.pages[i] = page;
46657 spd.nr_pages++;
46658@@ -846,10 +846,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
46659 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
46660 {
46661 while (!pipe->nrbufs) {
46662- if (!pipe->writers)
46663+ if (!atomic_read(&pipe->writers))
46664 return 0;
46665
46666- if (!pipe->waiting_writers && sd->num_spliced)
46667+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
46668 return 0;
46669
46670 if (sd->flags & SPLICE_F_NONBLOCK)
46671@@ -1182,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
46672 * out of the pipe right after the splice_to_pipe(). So set
46673 * PIPE_READERS appropriately.
46674 */
46675- pipe->readers = 1;
46676+ atomic_set(&pipe->readers, 1);
46677
46678 current->splice_pipe = pipe;
46679 }
46680@@ -1734,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
46681 ret = -ERESTARTSYS;
46682 break;
46683 }
46684- if (!pipe->writers)
46685+ if (!atomic_read(&pipe->writers))
46686 break;
46687- if (!pipe->waiting_writers) {
46688+ if (!atomic_read(&pipe->waiting_writers)) {
46689 if (flags & SPLICE_F_NONBLOCK) {
46690 ret = -EAGAIN;
46691 break;
46692@@ -1768,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
46693 pipe_lock(pipe);
46694
46695 while (pipe->nrbufs >= pipe->buffers) {
46696- if (!pipe->readers) {
46697+ if (!atomic_read(&pipe->readers)) {
46698 send_sig(SIGPIPE, current, 0);
46699 ret = -EPIPE;
46700 break;
46701@@ -1781,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
46702 ret = -ERESTARTSYS;
46703 break;
46704 }
46705- pipe->waiting_writers++;
46706+ atomic_inc(&pipe->waiting_writers);
46707 pipe_wait(pipe);
46708- pipe->waiting_writers--;
46709+ atomic_dec(&pipe->waiting_writers);
46710 }
46711
46712 pipe_unlock(pipe);
46713@@ -1819,14 +1819,14 @@ retry:
46714 pipe_double_lock(ipipe, opipe);
46715
46716 do {
46717- if (!opipe->readers) {
46718+ if (!atomic_read(&opipe->readers)) {
46719 send_sig(SIGPIPE, current, 0);
46720 if (!ret)
46721 ret = -EPIPE;
46722 break;
46723 }
46724
46725- if (!ipipe->nrbufs && !ipipe->writers)
46726+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
46727 break;
46728
46729 /*
46730@@ -1923,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
46731 pipe_double_lock(ipipe, opipe);
46732
46733 do {
46734- if (!opipe->readers) {
46735+ if (!atomic_read(&opipe->readers)) {
46736 send_sig(SIGPIPE, current, 0);
46737 if (!ret)
46738 ret = -EPIPE;
46739@@ -1968,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
46740 * return EAGAIN if we have the potential of some data in the
46741 * future, otherwise just return 0
46742 */
46743- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
46744+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
46745 ret = -EAGAIN;
46746
46747 pipe_unlock(ipipe);
46748diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
46749index 7fdf6a7..e6cd8ad 100644
46750--- a/fs/sysfs/dir.c
46751+++ b/fs/sysfs/dir.c
46752@@ -642,6 +642,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
46753 struct sysfs_dirent *sd;
46754 int rc;
46755
46756+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
46757+ const char *parent_name = parent_sd->s_name;
46758+
46759+ mode = S_IFDIR | S_IRWXU;
46760+
46761+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
46762+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
46763+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
46764+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
46765+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
46766+#endif
46767+
46768 /* allocate */
46769 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
46770 if (!sd)
46771diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
46772index 779789a..f58193c 100644
46773--- a/fs/sysfs/file.c
46774+++ b/fs/sysfs/file.c
46775@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
46776
46777 struct sysfs_open_dirent {
46778 atomic_t refcnt;
46779- atomic_t event;
46780+ atomic_unchecked_t event;
46781 wait_queue_head_t poll;
46782 struct list_head buffers; /* goes through sysfs_buffer.list */
46783 };
46784@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
46785 if (!sysfs_get_active(attr_sd))
46786 return -ENODEV;
46787
46788- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
46789+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
46790 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
46791
46792 sysfs_put_active(attr_sd);
46793@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
46794 return -ENOMEM;
46795
46796 atomic_set(&new_od->refcnt, 0);
46797- atomic_set(&new_od->event, 1);
46798+ atomic_set_unchecked(&new_od->event, 1);
46799 init_waitqueue_head(&new_od->poll);
46800 INIT_LIST_HEAD(&new_od->buffers);
46801 goto retry;
46802@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
46803
46804 sysfs_put_active(attr_sd);
46805
46806- if (buffer->event != atomic_read(&od->event))
46807+ if (buffer->event != atomic_read_unchecked(&od->event))
46808 goto trigger;
46809
46810 return DEFAULT_POLLMASK;
46811@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
46812
46813 od = sd->s_attr.open;
46814 if (od) {
46815- atomic_inc(&od->event);
46816+ atomic_inc_unchecked(&od->event);
46817 wake_up_interruptible(&od->poll);
46818 }
46819
46820diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
46821index a7ac78f..02158e1 100644
46822--- a/fs/sysfs/symlink.c
46823+++ b/fs/sysfs/symlink.c
46824@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
46825
46826 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
46827 {
46828- char *page = nd_get_link(nd);
46829+ const char *page = nd_get_link(nd);
46830 if (!IS_ERR(page))
46831 free_page((unsigned long)page);
46832 }
46833diff --git a/fs/udf/misc.c b/fs/udf/misc.c
46834index c175b4d..8f36a16 100644
46835--- a/fs/udf/misc.c
46836+++ b/fs/udf/misc.c
46837@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
46838
46839 u8 udf_tag_checksum(const struct tag *t)
46840 {
46841- u8 *data = (u8 *)t;
46842+ const u8 *data = (const u8 *)t;
46843 u8 checksum = 0;
46844 int i;
46845 for (i = 0; i < sizeof(struct tag); ++i)
46846diff --git a/fs/utimes.c b/fs/utimes.c
46847index ba653f3..06ea4b1 100644
46848--- a/fs/utimes.c
46849+++ b/fs/utimes.c
46850@@ -1,6 +1,7 @@
46851 #include <linux/compiler.h>
46852 #include <linux/file.h>
46853 #include <linux/fs.h>
46854+#include <linux/security.h>
46855 #include <linux/linkage.h>
46856 #include <linux/mount.h>
46857 #include <linux/namei.h>
46858@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
46859 goto mnt_drop_write_and_out;
46860 }
46861 }
46862+
46863+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
46864+ error = -EACCES;
46865+ goto mnt_drop_write_and_out;
46866+ }
46867+
46868 mutex_lock(&inode->i_mutex);
46869 error = notify_change(path->dentry, &newattrs);
46870 mutex_unlock(&inode->i_mutex);
46871diff --git a/fs/xattr.c b/fs/xattr.c
46872index 67583de..c5aad14 100644
46873--- a/fs/xattr.c
46874+++ b/fs/xattr.c
46875@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
46876 * Extended attribute SET operations
46877 */
46878 static long
46879-setxattr(struct dentry *d, const char __user *name, const void __user *value,
46880+setxattr(struct path *path, const char __user *name, const void __user *value,
46881 size_t size, int flags)
46882 {
46883 int error;
46884@@ -339,7 +339,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
46885 return PTR_ERR(kvalue);
46886 }
46887
46888- error = vfs_setxattr(d, kname, kvalue, size, flags);
46889+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
46890+ error = -EACCES;
46891+ goto out;
46892+ }
46893+
46894+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
46895+out:
46896 kfree(kvalue);
46897 return error;
46898 }
46899@@ -356,7 +362,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
46900 return error;
46901 error = mnt_want_write(path.mnt);
46902 if (!error) {
46903- error = setxattr(path.dentry, name, value, size, flags);
46904+ error = setxattr(&path, name, value, size, flags);
46905 mnt_drop_write(path.mnt);
46906 }
46907 path_put(&path);
46908@@ -375,7 +381,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
46909 return error;
46910 error = mnt_want_write(path.mnt);
46911 if (!error) {
46912- error = setxattr(path.dentry, name, value, size, flags);
46913+ error = setxattr(&path, name, value, size, flags);
46914 mnt_drop_write(path.mnt);
46915 }
46916 path_put(&path);
46917@@ -386,17 +392,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
46918 const void __user *,value, size_t, size, int, flags)
46919 {
46920 struct file *f;
46921- struct dentry *dentry;
46922 int error = -EBADF;
46923
46924 f = fget(fd);
46925 if (!f)
46926 return error;
46927- dentry = f->f_path.dentry;
46928- audit_inode(NULL, dentry);
46929+ audit_inode(NULL, f->f_path.dentry);
46930 error = mnt_want_write_file(f);
46931 if (!error) {
46932- error = setxattr(dentry, name, value, size, flags);
46933+ error = setxattr(&f->f_path, name, value, size, flags);
46934 mnt_drop_write(f->f_path.mnt);
46935 }
46936 fput(f);
46937diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
46938index 8d5a506..7f62712 100644
46939--- a/fs/xattr_acl.c
46940+++ b/fs/xattr_acl.c
46941@@ -17,8 +17,8 @@
46942 struct posix_acl *
46943 posix_acl_from_xattr(const void *value, size_t size)
46944 {
46945- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
46946- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
46947+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
46948+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
46949 int count;
46950 struct posix_acl *acl;
46951 struct posix_acl_entry *acl_e;
46952diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
46953index d0ab788..827999b 100644
46954--- a/fs/xfs/xfs_bmap.c
46955+++ b/fs/xfs/xfs_bmap.c
46956@@ -190,7 +190,7 @@ xfs_bmap_validate_ret(
46957 int nmap,
46958 int ret_nmap);
46959 #else
46960-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
46961+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
46962 #endif /* DEBUG */
46963
46964 STATIC int
46965diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
46966index 79d05e8..e3e5861 100644
46967--- a/fs/xfs/xfs_dir2_sf.c
46968+++ b/fs/xfs/xfs_dir2_sf.c
46969@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
46970 }
46971
46972 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
46973- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
46974+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
46975+ char name[sfep->namelen];
46976+ memcpy(name, sfep->name, sfep->namelen);
46977+ if (filldir(dirent, name, sfep->namelen,
46978+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
46979+ *offset = off & 0x7fffffff;
46980+ return 0;
46981+ }
46982+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
46983 off & 0x7fffffff, ino, DT_UNKNOWN)) {
46984 *offset = off & 0x7fffffff;
46985 return 0;
46986diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
46987index d99a905..9f88202 100644
46988--- a/fs/xfs/xfs_ioctl.c
46989+++ b/fs/xfs/xfs_ioctl.c
46990@@ -128,7 +128,7 @@ xfs_find_handle(
46991 }
46992
46993 error = -EFAULT;
46994- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
46995+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
46996 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
46997 goto out_put;
46998
46999diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
47000index 23ce927..e274cc1 100644
47001--- a/fs/xfs/xfs_iops.c
47002+++ b/fs/xfs/xfs_iops.c
47003@@ -447,7 +447,7 @@ xfs_vn_put_link(
47004 struct nameidata *nd,
47005 void *p)
47006 {
47007- char *s = nd_get_link(nd);
47008+ const char *s = nd_get_link(nd);
47009
47010 if (!IS_ERR(s))
47011 kfree(s);
47012diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
47013new file mode 100644
47014index 0000000..dfd3d34
47015--- /dev/null
47016+++ b/grsecurity/Kconfig
47017@@ -0,0 +1,1069 @@
47018+#
47019+# grecurity configuration
47020+#
47021+
47022+menu "Grsecurity"
47023+
47024+config GRKERNSEC
47025+ bool "Grsecurity"
47026+ select CRYPTO
47027+ select CRYPTO_SHA256
47028+ help
47029+ If you say Y here, you will be able to configure many features
47030+ that will enhance the security of your system. It is highly
47031+ recommended that you say Y here and read through the help
47032+ for each option so that you fully understand the features and
47033+ can evaluate their usefulness for your machine.
47034+
47035+choice
47036+ prompt "Security Level"
47037+ depends on GRKERNSEC
47038+ default GRKERNSEC_CUSTOM
47039+
47040+config GRKERNSEC_LOW
47041+ bool "Low"
47042+ select GRKERNSEC_LINK
47043+ select GRKERNSEC_FIFO
47044+ select GRKERNSEC_RANDNET
47045+ select GRKERNSEC_DMESG
47046+ select GRKERNSEC_CHROOT
47047+ select GRKERNSEC_CHROOT_CHDIR
47048+
47049+ help
47050+ If you choose this option, several of the grsecurity options will
47051+ be enabled that will give you greater protection against a number
47052+ of attacks, while assuring that none of your software will have any
47053+ conflicts with the additional security measures. If you run a lot
47054+ of unusual software, or you are having problems with the higher
47055+ security levels, you should say Y here. With this option, the
47056+ following features are enabled:
47057+
47058+ - Linking restrictions
47059+ - FIFO restrictions
47060+ - Restricted dmesg
47061+ - Enforced chdir("/") on chroot
47062+ - Runtime module disabling
47063+
47064+config GRKERNSEC_MEDIUM
47065+ bool "Medium"
47066+ select PAX
47067+ select PAX_EI_PAX
47068+ select PAX_PT_PAX_FLAGS
47069+ select PAX_HAVE_ACL_FLAGS
47070+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
47071+ select GRKERNSEC_CHROOT
47072+ select GRKERNSEC_CHROOT_SYSCTL
47073+ select GRKERNSEC_LINK
47074+ select GRKERNSEC_FIFO
47075+ select GRKERNSEC_DMESG
47076+ select GRKERNSEC_RANDNET
47077+ select GRKERNSEC_FORKFAIL
47078+ select GRKERNSEC_TIME
47079+ select GRKERNSEC_SIGNAL
47080+ select GRKERNSEC_CHROOT
47081+ select GRKERNSEC_CHROOT_UNIX
47082+ select GRKERNSEC_CHROOT_MOUNT
47083+ select GRKERNSEC_CHROOT_PIVOT
47084+ select GRKERNSEC_CHROOT_DOUBLE
47085+ select GRKERNSEC_CHROOT_CHDIR
47086+ select GRKERNSEC_CHROOT_MKNOD
47087+ select GRKERNSEC_PROC
47088+ select GRKERNSEC_PROC_USERGROUP
47089+ select PAX_RANDUSTACK
47090+ select PAX_ASLR
47091+ select PAX_RANDMMAP
47092+ select PAX_REFCOUNT if (X86 || SPARC64)
47093+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
47094+
47095+ help
47096+ If you say Y here, several features in addition to those included
47097+ in the low additional security level will be enabled. These
47098+ features provide even more security to your system, though in rare
47099+ cases they may be incompatible with very old or poorly written
47100+ software. If you enable this option, make sure that your auth
47101+ service (identd) is running as gid 1001. With this option,
47102+ the following features (in addition to those provided in the
47103+ low additional security level) will be enabled:
47104+
47105+ - Failed fork logging
47106+ - Time change logging
47107+ - Signal logging
47108+ - Deny mounts in chroot
47109+ - Deny double chrooting
47110+ - Deny sysctl writes in chroot
47111+ - Deny mknod in chroot
47112+ - Deny access to abstract AF_UNIX sockets out of chroot
47113+ - Deny pivot_root in chroot
47114+ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
47115+ - /proc restrictions with special GID set to 10 (usually wheel)
47116+ - Address Space Layout Randomization (ASLR)
47117+ - Prevent exploitation of most refcount overflows
47118+ - Bounds checking of copying between the kernel and userland
47119+
47120+config GRKERNSEC_HIGH
47121+ bool "High"
47122+ select GRKERNSEC_LINK
47123+ select GRKERNSEC_FIFO
47124+ select GRKERNSEC_DMESG
47125+ select GRKERNSEC_FORKFAIL
47126+ select GRKERNSEC_TIME
47127+ select GRKERNSEC_SIGNAL
47128+ select GRKERNSEC_CHROOT
47129+ select GRKERNSEC_CHROOT_SHMAT
47130+ select GRKERNSEC_CHROOT_UNIX
47131+ select GRKERNSEC_CHROOT_MOUNT
47132+ select GRKERNSEC_CHROOT_FCHDIR
47133+ select GRKERNSEC_CHROOT_PIVOT
47134+ select GRKERNSEC_CHROOT_DOUBLE
47135+ select GRKERNSEC_CHROOT_CHDIR
47136+ select GRKERNSEC_CHROOT_MKNOD
47137+ select GRKERNSEC_CHROOT_CAPS
47138+ select GRKERNSEC_CHROOT_SYSCTL
47139+ select GRKERNSEC_CHROOT_FINDTASK
47140+ select GRKERNSEC_SYSFS_RESTRICT
47141+ select GRKERNSEC_PROC
47142+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
47143+ select GRKERNSEC_HIDESYM
47144+ select GRKERNSEC_BRUTE
47145+ select GRKERNSEC_PROC_USERGROUP
47146+ select GRKERNSEC_KMEM
47147+ select GRKERNSEC_RESLOG
47148+ select GRKERNSEC_RANDNET
47149+ select GRKERNSEC_PROC_ADD
47150+ select GRKERNSEC_CHROOT_CHMOD
47151+ select GRKERNSEC_CHROOT_NICE
47152+ select GRKERNSEC_SETXID
47153+ select GRKERNSEC_AUDIT_MOUNT
47154+ select GRKERNSEC_MODHARDEN if (MODULES)
47155+ select GRKERNSEC_HARDEN_PTRACE
47156+ select GRKERNSEC_PTRACE_READEXEC
47157+ select GRKERNSEC_VM86 if (X86_32)
47158+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
47159+ select PAX
47160+ select PAX_RANDUSTACK
47161+ select PAX_ASLR
47162+ select PAX_RANDMMAP
47163+ select PAX_NOEXEC
47164+ select PAX_MPROTECT
47165+ select PAX_EI_PAX
47166+ select PAX_PT_PAX_FLAGS
47167+ select PAX_HAVE_ACL_FLAGS
47168+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
47169+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
47170+ select PAX_RANDKSTACK if (X86_TSC && X86)
47171+ select PAX_SEGMEXEC if (X86_32)
47172+ select PAX_PAGEEXEC
47173+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
47174+ select PAX_EMUTRAMP if (PARISC)
47175+ select PAX_EMUSIGRT if (PARISC)
47176+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
47177+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
47178+ select PAX_REFCOUNT if (X86 || SPARC64)
47179+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
47180+ help
47181+ If you say Y here, many of the features of grsecurity will be
47182+ enabled, which will protect you against many kinds of attacks
47183+ against your system. The heightened security comes at a cost
47184+ of an increased chance of incompatibilities with rare software
47185+ on your machine. Since this security level enables PaX, you should
47186+ view <http://pax.grsecurity.net> and read about the PaX
47187+ project. While you are there, download chpax and run it on
47188+ binaries that cause problems with PaX. Also remember that
47189+ since the /proc restrictions are enabled, you must run your
47190+ identd as gid 1001. This security level enables the following
47191+ features in addition to those listed in the low and medium
47192+ security levels:
47193+
47194+ - Additional /proc restrictions
47195+ - Chmod restrictions in chroot
47196+ - No signals, ptrace, or viewing of processes outside of chroot
47197+ - Capability restrictions in chroot
47198+ - Deny fchdir out of chroot
47199+ - Priority restrictions in chroot
47200+ - Segmentation-based implementation of PaX
47201+ - Mprotect restrictions
47202+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
47203+ - Kernel stack randomization
47204+ - Mount/unmount/remount logging
47205+ - Kernel symbol hiding
47206+ - Hardening of module auto-loading
47207+ - Ptrace restrictions
47208+ - Restricted vm86 mode
47209+ - Restricted sysfs/debugfs
47210+ - Active kernel exploit response
47211+
47212+config GRKERNSEC_CUSTOM
47213+ bool "Custom"
47214+ help
47215+ If you say Y here, you will be able to configure every grsecurity
47216+ option, which allows you to enable many more features that aren't
47217+ covered in the basic security levels. These additional features
47218+ include TPE, socket restrictions, and the sysctl system for
47219+ grsecurity. It is advised that you read through the help for
47220+ each option to determine its usefulness in your situation.
47221+
47222+endchoice
47223+
47224+menu "Address Space Protection"
47225+depends on GRKERNSEC
47226+
47227+config GRKERNSEC_KMEM
47228+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
47229+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
47230+ help
47231+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
47232+ be written to or read from to modify or leak the contents of the running
47233+ kernel. /dev/port will also not be allowed to be opened. If you have module
47234+ support disabled, enabling this will close up four ways that are
47235+ currently used to insert malicious code into the running kernel.
47236+ Even with all these features enabled, we still highly recommend that
47237+ you use the RBAC system, as it is still possible for an attacker to
47238+ modify the running kernel through privileged I/O granted by ioperm/iopl.
47239+ If you are not using XFree86, you may be able to stop this additional
47240+ case by enabling the 'Disable privileged I/O' option. Though nothing
47241+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
47242+ but only to video memory, which is the only writing we allow in this
47243+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
47244+ not be allowed to mprotect it with PROT_WRITE later.
47245+ It is highly recommended that you say Y here if you meet all the
47246+ conditions above.
47247+
47248+config GRKERNSEC_VM86
47249+ bool "Restrict VM86 mode"
47250+ depends on X86_32
47251+
47252+ help
47253+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
47254+ make use of a special execution mode on 32bit x86 processors called
47255+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
47256+ video cards and will still work with this option enabled. The purpose
47257+ of the option is to prevent exploitation of emulation errors in
47258+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
47259+ Nearly all users should be able to enable this option.
47260+
47261+config GRKERNSEC_IO
47262+ bool "Disable privileged I/O"
47263+ depends on X86
47264+ select RTC_CLASS
47265+ select RTC_INTF_DEV
47266+ select RTC_DRV_CMOS
47267+
47268+ help
47269+ If you say Y here, all ioperm and iopl calls will return an error.
47270+ Ioperm and iopl can be used to modify the running kernel.
47271+ Unfortunately, some programs need this access to operate properly,
47272+ the most notable of which are XFree86 and hwclock. hwclock can be
47273+ remedied by having RTC support in the kernel, so real-time
47274+ clock support is enabled if this option is enabled, to ensure
47275+ that hwclock operates correctly. XFree86 still will not
47276+ operate correctly with this option enabled, so DO NOT CHOOSE Y
47277+ IF YOU USE XFree86. If you use XFree86 and you still want to
47278+ protect your kernel against modification, use the RBAC system.
47279+
47280+config GRKERNSEC_PROC_MEMMAP
47281+ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
47282+ default y if (PAX_NOEXEC || PAX_ASLR)
47283+ depends on PAX_NOEXEC || PAX_ASLR
47284+ help
47285+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
47286+ give no information about the addresses of its mappings if
47287+ PaX features that rely on random addresses are enabled on the task.
47288+ If you use PaX it is greatly recommended that you say Y here as it
47289+ closes up a hole that makes the full ASLR useless for suid
47290+ binaries.
47291+
47292+config GRKERNSEC_BRUTE
47293+ bool "Deter exploit bruteforcing"
47294+ help
47295+ If you say Y here, attempts to bruteforce exploits against forking
47296+ daemons such as apache or sshd, as well as against suid/sgid binaries
47297+ will be deterred. When a child of a forking daemon is killed by PaX
47298+ or crashes due to an illegal instruction or other suspicious signal,
47299+ the parent process will be delayed 30 seconds upon every subsequent
47300+ fork until the administrator is able to assess the situation and
47301+ restart the daemon.
47302+ In the suid/sgid case, the attempt is logged, the user has all their
47303+ processes terminated, and they are prevented from executing any further
47304+ processes for 15 minutes.
47305+ It is recommended that you also enable signal logging in the auditing
47306+ section so that logs are generated when a process triggers a suspicious
47307+ signal.
47308+ If the sysctl option is enabled, a sysctl option with name
47309+ "deter_bruteforce" is created.
47310+
47311+
47312+config GRKERNSEC_MODHARDEN
47313+ bool "Harden module auto-loading"
47314+ depends on MODULES
47315+ help
47316+ If you say Y here, module auto-loading in response to use of some
47317+ feature implemented by an unloaded module will be restricted to
47318+ root users. Enabling this option helps defend against attacks
47319+ by unprivileged users who abuse the auto-loading behavior to
47320+ cause a vulnerable module to load that is then exploited.
47321+
47322+ If this option prevents a legitimate use of auto-loading for a
47323+ non-root user, the administrator can execute modprobe manually
47324+ with the exact name of the module mentioned in the alert log.
47325+ Alternatively, the administrator can add the module to the list
47326+ of modules loaded at boot by modifying init scripts.
47327+
47328+ Modification of init scripts will most likely be needed on
47329+ Ubuntu servers with encrypted home directory support enabled,
47330+ as the first non-root user logging in will cause the ecb(aes),
47331+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
47332+
47333+config GRKERNSEC_HIDESYM
47334+ bool "Hide kernel symbols"
47335+ help
47336+ If you say Y here, getting information on loaded modules, and
47337+ displaying all kernel symbols through a syscall will be restricted
47338+ to users with CAP_SYS_MODULE. For software compatibility reasons,
47339+ /proc/kallsyms will be restricted to the root user. The RBAC
47340+ system can hide that entry even from root.
47341+
47342+ This option also prevents leaking of kernel addresses through
47343+ several /proc entries.
47344+
47345+ Note that this option is only effective provided the following
47346+ conditions are met:
47347+ 1) The kernel using grsecurity is not precompiled by some distribution
47348+ 2) You have also enabled GRKERNSEC_DMESG
47349+ 3) You are using the RBAC system and hiding other files such as your
47350+ kernel image and System.map. Alternatively, enabling this option
47351+ causes the permissions on /boot, /lib/modules, and the kernel
47352+ source directory to change at compile time to prevent
47353+ reading by non-root users.
47354+ If the above conditions are met, this option will aid in providing a
47355+ useful protection against local kernel exploitation of overflows
47356+ and arbitrary read/write vulnerabilities.
47357+
47358+config GRKERNSEC_KERN_LOCKOUT
47359+ bool "Active kernel exploit response"
47360+ depends on X86 || ARM || PPC || SPARC
47361+ help
47362+ If you say Y here, when a PaX alert is triggered due to suspicious
47363+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
47364+ or an OOPs occurs due to bad memory accesses, instead of just
47365+ terminating the offending process (and potentially allowing
47366+ a subsequent exploit from the same user), we will take one of two
47367+ actions:
47368+ If the user was root, we will panic the system
47369+ If the user was non-root, we will log the attempt, terminate
47370+ all processes owned by the user, then prevent them from creating
47371+ any new processes until the system is restarted
47372+ This deters repeated kernel exploitation/bruteforcing attempts
47373+ and is useful for later forensics.
47374+
47375+endmenu
47376+menu "Role Based Access Control Options"
47377+depends on GRKERNSEC
47378+
47379+config GRKERNSEC_RBAC_DEBUG
47380+ bool
47381+
47382+config GRKERNSEC_NO_RBAC
47383+ bool "Disable RBAC system"
47384+ help
47385+ If you say Y here, the /dev/grsec device will be removed from the kernel,
47386+ preventing the RBAC system from being enabled. You should only say Y
47387+ here if you have no intention of using the RBAC system, so as to prevent
47388+ an attacker with root access from misusing the RBAC system to hide files
47389+ and processes when loadable module support and /dev/[k]mem have been
47390+ locked down.
47391+
47392+config GRKERNSEC_ACL_HIDEKERN
47393+ bool "Hide kernel processes"
47394+ help
47395+ If you say Y here, all kernel threads will be hidden to all
47396+ processes but those whose subject has the "view hidden processes"
47397+ flag.
47398+
47399+config GRKERNSEC_ACL_MAXTRIES
47400+ int "Maximum tries before password lockout"
47401+ default 3
47402+ help
47403+ This option enforces the maximum number of times a user can attempt
47404+ to authorize themselves with the grsecurity RBAC system before being
47405+ denied the ability to attempt authorization again for a specified time.
47406+ The lower the number, the harder it will be to brute-force a password.
47407+
47408+config GRKERNSEC_ACL_TIMEOUT
47409+ int "Time to wait after max password tries, in seconds"
47410+ default 30
47411+ help
47412+ This option specifies the time the user must wait after attempting to
47413+ authorize to the RBAC system with the maximum number of invalid
47414+ passwords. The higher the number, the harder it will be to brute-force
47415+ a password.
47416+
47417+endmenu
47418+menu "Filesystem Protections"
47419+depends on GRKERNSEC
47420+
47421+config GRKERNSEC_PROC
47422+ bool "Proc restrictions"
47423+ help
47424+ If you say Y here, the permissions of the /proc filesystem
47425+ will be altered to enhance system security and privacy. You MUST
47426+ choose either a user only restriction or a user and group restriction.
47427+ Depending upon the option you choose, you can either restrict users to
47428+ see only the processes they themselves run, or choose a group that can
47429+ view all processes and files normally restricted to root if you choose
47430+ the "restrict to user only" option. NOTE: If you're running identd as
47431+ a non-root user, you will have to run it as the group you specify here.
47432+
47433+config GRKERNSEC_PROC_USER
47434+ bool "Restrict /proc to user only"
47435+ depends on GRKERNSEC_PROC
47436+ help
47437+ If you say Y here, non-root users will only be able to view their own
47438+ processes, and restricts them from viewing network-related information,
47439+ and viewing kernel symbol and module information.
47440+
47441+config GRKERNSEC_PROC_USERGROUP
47442+ bool "Allow special group"
47443+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
47444+ help
47445+ If you say Y here, you will be able to select a group that will be
47446+ able to view all processes and network-related information. If you've
47447+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
47448+ remain hidden. This option is useful if you want to run identd as
47449+ a non-root user.
47450+
47451+config GRKERNSEC_PROC_GID
47452+ int "GID for special group"
47453+ depends on GRKERNSEC_PROC_USERGROUP
47454+ default 1001
47455+
47456+config GRKERNSEC_PROC_ADD
47457+ bool "Additional restrictions"
47458+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
47459+ help
47460+ If you say Y here, additional restrictions will be placed on
47461+ /proc that keep normal users from viewing device information and
47462+ slabinfo information that could be useful for exploits.
47463+
47464+config GRKERNSEC_LINK
47465+ bool "Linking restrictions"
47466+ help
47467+ If you say Y here, /tmp race exploits will be prevented, since users
47468+ will no longer be able to follow symlinks owned by other users in
47469+ world-writable +t directories (e.g. /tmp), unless the owner of the
47470+ symlink is the owner of the directory. users will also not be
47471+ able to hardlink to files they do not own. If the sysctl option is
47472+ enabled, a sysctl option with name "linking_restrictions" is created.
47473+
47474+config GRKERNSEC_FIFO
47475+ bool "FIFO restrictions"
47476+ help
47477+ If you say Y here, users will not be able to write to FIFOs they don't
47478+ own in world-writable +t directories (e.g. /tmp), unless the owner of
47479+ the FIFO is the same owner of the directory it's held in. If the sysctl
47480+ option is enabled, a sysctl option with name "fifo_restrictions" is
47481+ created.
47482+
47483+config GRKERNSEC_SYSFS_RESTRICT
47484+ bool "Sysfs/debugfs restriction"
47485+ depends on SYSFS
47486+ help
47487+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
47488+ any filesystem normally mounted under it (e.g. debugfs) will be
47489+ mostly accessible only by root. These filesystems generally provide access
47490+ to hardware and debug information that isn't appropriate for unprivileged
47491+ users of the system. Sysfs and debugfs have also become a large source
47492+ of new vulnerabilities, ranging from infoleaks to local compromise.
47493+ There has been very little oversight with an eye toward security involved
47494+ in adding new exporters of information to these filesystems, so their
47495+ use is discouraged.
47496+ For reasons of compatibility, a few directories have been whitelisted
47497+ for access by non-root users:
47498+ /sys/fs/selinux
47499+ /sys/fs/fuse
47500+ /sys/devices/system/cpu
47501+
47502+config GRKERNSEC_ROFS
47503+ bool "Runtime read-only mount protection"
47504+ help
47505+ If you say Y here, a sysctl option with name "romount_protect" will
47506+ be created. By setting this option to 1 at runtime, filesystems
47507+ will be protected in the following ways:
47508+ * No new writable mounts will be allowed
47509+ * Existing read-only mounts won't be able to be remounted read/write
47510+ * Write operations will be denied on all block devices
47511+ This option acts independently of grsec_lock: once it is set to 1,
47512+ it cannot be turned off. Therefore, please be mindful of the resulting
47513+ behavior if this option is enabled in an init script on a read-only
47514+ filesystem. This feature is mainly intended for secure embedded systems.
47515+
47516+config GRKERNSEC_CHROOT
47517+ bool "Chroot jail restrictions"
47518+ help
47519+ If you say Y here, you will be able to choose several options that will
47520+ make breaking out of a chrooted jail much more difficult. If you
47521+ encounter no software incompatibilities with the following options, it
47522+ is recommended that you enable each one.
47523+
47524+config GRKERNSEC_CHROOT_MOUNT
47525+ bool "Deny mounts"
47526+ depends on GRKERNSEC_CHROOT
47527+ help
47528+ If you say Y here, processes inside a chroot will not be able to
47529+ mount or remount filesystems. If the sysctl option is enabled, a
47530+ sysctl option with name "chroot_deny_mount" is created.
47531+
47532+config GRKERNSEC_CHROOT_DOUBLE
47533+ bool "Deny double-chroots"
47534+ depends on GRKERNSEC_CHROOT
47535+ help
47536+ If you say Y here, processes inside a chroot will not be able to chroot
47537+ again outside the chroot. This is a widely used method of breaking
47538+ out of a chroot jail and should not be allowed. If the sysctl
47539+ option is enabled, a sysctl option with name
47540+ "chroot_deny_chroot" is created.
47541+
47542+config GRKERNSEC_CHROOT_PIVOT
47543+ bool "Deny pivot_root in chroot"
47544+ depends on GRKERNSEC_CHROOT
47545+ help
47546+ If you say Y here, processes inside a chroot will not be able to use
47547+ a function called pivot_root() that was introduced in Linux 2.3.41. It
47548+ works similar to chroot in that it changes the root filesystem. This
47549+ function could be misused in a chrooted process to attempt to break out
47550+ of the chroot, and therefore should not be allowed. If the sysctl
47551+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
47552+ created.
47553+
47554+config GRKERNSEC_CHROOT_CHDIR
47555+ bool "Enforce chdir(\"/\") on all chroots"
47556+ depends on GRKERNSEC_CHROOT
47557+ help
47558+ If you say Y here, the current working directory of all newly-chrooted
47559+ applications will be set to the the root directory of the chroot.
47560+ The man page on chroot(2) states:
47561+ Note that this call does not change the current working
47562+ directory, so that `.' can be outside the tree rooted at
47563+ `/'. In particular, the super-user can escape from a
47564+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
47565+
47566+ It is recommended that you say Y here, since it's not known to break
47567+ any software. If the sysctl option is enabled, a sysctl option with
47568+ name "chroot_enforce_chdir" is created.
47569+
47570+config GRKERNSEC_CHROOT_CHMOD
47571+ bool "Deny (f)chmod +s"
47572+ depends on GRKERNSEC_CHROOT
47573+ help
47574+ If you say Y here, processes inside a chroot will not be able to chmod
47575+ or fchmod files to make them have suid or sgid bits. This protects
47576+ against another published method of breaking a chroot. If the sysctl
47577+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
47578+ created.
47579+
47580+config GRKERNSEC_CHROOT_FCHDIR
47581+ bool "Deny fchdir out of chroot"
47582+ depends on GRKERNSEC_CHROOT
47583+ help
47584+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
47585+ to a file descriptor of the chrooting process that points to a directory
47586+ outside the filesystem will be stopped. If the sysctl option
47587+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
47588+
47589+config GRKERNSEC_CHROOT_MKNOD
47590+ bool "Deny mknod"
47591+ depends on GRKERNSEC_CHROOT
47592+ help
47593+ If you say Y here, processes inside a chroot will not be allowed to
47594+ mknod. The problem with using mknod inside a chroot is that it
47595+ would allow an attacker to create a device entry that is the same
47596+ as one on the physical root of your system, which could range from
47597+ anything from the console device to a device for your harddrive (which
47598+ they could then use to wipe the drive or steal data). It is recommended
47599+ that you say Y here, unless you run into software incompatibilities.
47600+ If the sysctl option is enabled, a sysctl option with name
47601+ "chroot_deny_mknod" is created.
47602+
47603+config GRKERNSEC_CHROOT_SHMAT
47604+ bool "Deny shmat() out of chroot"
47605+ depends on GRKERNSEC_CHROOT
47606+ help
47607+ If you say Y here, processes inside a chroot will not be able to attach
47608+ to shared memory segments that were created outside of the chroot jail.
47609+ It is recommended that you say Y here. If the sysctl option is enabled,
47610+ a sysctl option with name "chroot_deny_shmat" is created.
47611+
47612+config GRKERNSEC_CHROOT_UNIX
47613+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
47614+ depends on GRKERNSEC_CHROOT
47615+ help
47616+ If you say Y here, processes inside a chroot will not be able to
47617+ connect to abstract (meaning not belonging to a filesystem) Unix
47618+ domain sockets that were bound outside of a chroot. It is recommended
47619+ that you say Y here. If the sysctl option is enabled, a sysctl option
47620+ with name "chroot_deny_unix" is created.
47621+
47622+config GRKERNSEC_CHROOT_FINDTASK
47623+ bool "Protect outside processes"
47624+ depends on GRKERNSEC_CHROOT
47625+ help
47626+ If you say Y here, processes inside a chroot will not be able to
47627+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
47628+ getsid, or view any process outside of the chroot. If the sysctl
47629+ option is enabled, a sysctl option with name "chroot_findtask" is
47630+ created.
47631+
47632+config GRKERNSEC_CHROOT_NICE
47633+ bool "Restrict priority changes"
47634+ depends on GRKERNSEC_CHROOT
47635+ help
47636+ If you say Y here, processes inside a chroot will not be able to raise
47637+ the priority of processes in the chroot, or alter the priority of
47638+ processes outside the chroot. This provides more security than simply
47639+ removing CAP_SYS_NICE from the process' capability set. If the
47640+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
47641+ is created.
47642+
47643+config GRKERNSEC_CHROOT_SYSCTL
47644+ bool "Deny sysctl writes"
47645+ depends on GRKERNSEC_CHROOT
47646+ help
47647+ If you say Y here, an attacker in a chroot will not be able to
47648+ write to sysctl entries, either by sysctl(2) or through a /proc
47649+ interface. It is strongly recommended that you say Y here. If the
47650+ sysctl option is enabled, a sysctl option with name
47651+ "chroot_deny_sysctl" is created.
47652+
47653+config GRKERNSEC_CHROOT_CAPS
47654+ bool "Capability restrictions"
47655+ depends on GRKERNSEC_CHROOT
47656+ help
47657+ If you say Y here, the capabilities on all processes within a
47658+ chroot jail will be lowered to stop module insertion, raw i/o,
47659+ system and net admin tasks, rebooting the system, modifying immutable
47660+ files, modifying IPC owned by another, and changing the system time.
47661+ This is left an option because it can break some apps. Disable this
47662+ if your chrooted apps are having problems performing those kinds of
47663+ tasks. If the sysctl option is enabled, a sysctl option with
47664+ name "chroot_caps" is created.
47665+
47666+endmenu
47667+menu "Kernel Auditing"
47668+depends on GRKERNSEC
47669+
47670+config GRKERNSEC_AUDIT_GROUP
47671+ bool "Single group for auditing"
47672+ help
47673+ If you say Y here, the exec, chdir, and (un)mount logging features
47674+ will only operate on a group you specify. This option is recommended
47675+ if you only want to watch certain users instead of having a large
47676+ amount of logs from the entire system. If the sysctl option is enabled,
47677+ a sysctl option with name "audit_group" is created.
47678+
47679+config GRKERNSEC_AUDIT_GID
47680+ int "GID for auditing"
47681+ depends on GRKERNSEC_AUDIT_GROUP
47682+ default 1007
47683+
47684+config GRKERNSEC_EXECLOG
47685+ bool "Exec logging"
47686+ help
47687+ If you say Y here, all execve() calls will be logged (since the
47688+ other exec*() calls are frontends to execve(), all execution
47689+ will be logged). Useful for shell-servers that like to keep track
47690+ of their users. If the sysctl option is enabled, a sysctl option with
47691+ name "exec_logging" is created.
47692+ WARNING: This option when enabled will produce a LOT of logs, especially
47693+ on an active system.
47694+
47695+config GRKERNSEC_RESLOG
47696+ bool "Resource logging"
47697+ help
47698+ If you say Y here, all attempts to overstep resource limits will
47699+ be logged with the resource name, the requested size, and the current
47700+ limit. It is highly recommended that you say Y here. If the sysctl
47701+ option is enabled, a sysctl option with name "resource_logging" is
47702+ created. If the RBAC system is enabled, the sysctl value is ignored.
47703+
47704+config GRKERNSEC_CHROOT_EXECLOG
47705+ bool "Log execs within chroot"
47706+ help
47707+ If you say Y here, all executions inside a chroot jail will be logged
47708+ to syslog. This can cause a large amount of logs if certain
47709+ applications (eg. djb's daemontools) are installed on the system, and
47710+ is therefore left as an option. If the sysctl option is enabled, a
47711+ sysctl option with name "chroot_execlog" is created.
47712+
47713+config GRKERNSEC_AUDIT_PTRACE
47714+ bool "Ptrace logging"
47715+ help
47716+ If you say Y here, all attempts to attach to a process via ptrace
47717+ will be logged. If the sysctl option is enabled, a sysctl option
47718+ with name "audit_ptrace" is created.
47719+
47720+config GRKERNSEC_AUDIT_CHDIR
47721+ bool "Chdir logging"
47722+ help
47723+ If you say Y here, all chdir() calls will be logged. If the sysctl
47724+ option is enabled, a sysctl option with name "audit_chdir" is created.
47725+
47726+config GRKERNSEC_AUDIT_MOUNT
47727+ bool "(Un)Mount logging"
47728+ help
47729+ If you say Y here, all mounts and unmounts will be logged. If the
47730+ sysctl option is enabled, a sysctl option with name "audit_mount" is
47731+ created.
47732+
47733+config GRKERNSEC_SIGNAL
47734+ bool "Signal logging"
47735+ help
47736+ If you say Y here, certain important signals will be logged, such as
47737+ SIGSEGV, which will as a result inform you of when a error in a program
47738+ occurred, which in some cases could mean a possible exploit attempt.
47739+ If the sysctl option is enabled, a sysctl option with name
47740+ "signal_logging" is created.
47741+
47742+config GRKERNSEC_FORKFAIL
47743+ bool "Fork failure logging"
47744+ help
47745+ If you say Y here, all failed fork() attempts will be logged.
47746+ This could suggest a fork bomb, or someone attempting to overstep
47747+ their process limit. If the sysctl option is enabled, a sysctl option
47748+ with name "forkfail_logging" is created.
47749+
47750+config GRKERNSEC_TIME
47751+ bool "Time change logging"
47752+ help
47753+ If you say Y here, any changes of the system clock will be logged.
47754+ If the sysctl option is enabled, a sysctl option with name
47755+ "timechange_logging" is created.
47756+
47757+config GRKERNSEC_PROC_IPADDR
47758+ bool "/proc/<pid>/ipaddr support"
47759+ help
47760+ If you say Y here, a new entry will be added to each /proc/<pid>
47761+ directory that contains the IP address of the person using the task.
47762+ The IP is carried across local TCP and AF_UNIX stream sockets.
47763+ This information can be useful for IDS/IPSes to perform remote response
47764+ to a local attack. The entry is readable by only the owner of the
47765+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
47766+ the RBAC system), and thus does not create privacy concerns.
47767+
47768+config GRKERNSEC_RWXMAP_LOG
47769+ bool 'Denied RWX mmap/mprotect logging'
47770+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
47771+ help
47772+ If you say Y here, calls to mmap() and mprotect() with explicit
47773+ usage of PROT_WRITE and PROT_EXEC together will be logged when
47774+ denied by the PAX_MPROTECT feature. If the sysctl option is
47775+ enabled, a sysctl option with name "rwxmap_logging" is created.
47776+
47777+config GRKERNSEC_AUDIT_TEXTREL
47778+ bool 'ELF text relocations logging (READ HELP)'
47779+ depends on PAX_MPROTECT
47780+ help
47781+ If you say Y here, text relocations will be logged with the filename
47782+ of the offending library or binary. The purpose of the feature is
47783+ to help Linux distribution developers get rid of libraries and
47784+ binaries that need text relocations which hinder the future progress
47785+ of PaX. Only Linux distribution developers should say Y here, and
47786+ never on a production machine, as this option creates an information
47787+ leak that could aid an attacker in defeating the randomization of
47788+ a single memory region. If the sysctl option is enabled, a sysctl
47789+ option with name "audit_textrel" is created.
47790+
47791+endmenu
47792+
47793+menu "Executable Protections"
47794+depends on GRKERNSEC
47795+
47796+config GRKERNSEC_DMESG
47797+ bool "Dmesg(8) restriction"
47798+ help
47799+ If you say Y here, non-root users will not be able to use dmesg(8)
47800+ to view up to the last 4kb of messages in the kernel's log buffer.
47801+ The kernel's log buffer often contains kernel addresses and other
47802+ identifying information useful to an attacker in fingerprinting a
47803+ system for a targeted exploit.
47804+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
47805+ created.
47806+
47807+config GRKERNSEC_HARDEN_PTRACE
47808+ bool "Deter ptrace-based process snooping"
47809+ help
47810+ If you say Y here, TTY sniffers and other malicious monitoring
47811+ programs implemented through ptrace will be defeated. If you
47812+ have been using the RBAC system, this option has already been
47813+ enabled for several years for all users, with the ability to make
47814+ fine-grained exceptions.
47815+
47816+ This option only affects the ability of non-root users to ptrace
47817+ processes that are not a descendent of the ptracing process.
47818+ This means that strace ./binary and gdb ./binary will still work,
47819+ but attaching to arbitrary processes will not. If the sysctl
47820+ option is enabled, a sysctl option with name "harden_ptrace" is
47821+ created.
47822+
47823+config GRKERNSEC_PTRACE_READEXEC
47824+ bool "Require read access to ptrace sensitive binaries"
47825+ help
47826+ If you say Y here, unprivileged users will not be able to ptrace unreadable
47827+ binaries. This option is useful in environments that
47828+ remove the read bits (e.g. file mode 4711) from suid binaries to
47829+ prevent infoleaking of their contents. This option adds
47830+ consistency to the use of that file mode, as the binary could normally
47831+ be read out when run without privileges while ptracing.
47832+
47833+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
47834+ is created.
47835+
47836+config GRKERNSEC_SETXID
47837+ bool "Enforce consistent multithreaded privileges"
47838+ help
47839+ If you say Y here, a change from a root uid to a non-root uid
47840+ in a multithreaded application will cause the resulting uids,
47841+ gids, supplementary groups, and capabilities in that thread
47842+ to be propagated to the other threads of the process. In most
47843+ cases this is unnecessary, as glibc will emulate this behavior
47844+ on behalf of the application. Other libcs do not act in the
47845+ same way, allowing the other threads of the process to continue
47846+ running with root privileges. If the sysctl option is enabled,
47847+ a sysctl option with name "consistent_setxid" is created.
47848+
47849+config GRKERNSEC_TPE
47850+ bool "Trusted Path Execution (TPE)"
47851+ help
47852+ If you say Y here, you will be able to choose a gid to add to the
47853+ supplementary groups of users you want to mark as "untrusted."
47854+ These users will not be able to execute any files that are not in
47855+ root-owned directories writable only by root. If the sysctl option
47856+ is enabled, a sysctl option with name "tpe" is created.
47857+
47858+config GRKERNSEC_TPE_ALL
47859+ bool "Partially restrict all non-root users"
47860+ depends on GRKERNSEC_TPE
47861+ help
47862+ If you say Y here, all non-root users will be covered under
47863+ a weaker TPE restriction. This is separate from, and in addition to,
47864+ the main TPE options that you have selected elsewhere. Thus, if a
47865+ "trusted" GID is chosen, this restriction applies to even that GID.
47866+ Under this restriction, all non-root users will only be allowed to
47867+ execute files in directories they own that are not group or
47868+ world-writable, or in directories owned by root and writable only by
47869+ root. If the sysctl option is enabled, a sysctl option with name
47870+ "tpe_restrict_all" is created.
47871+
47872+config GRKERNSEC_TPE_INVERT
47873+ bool "Invert GID option"
47874+ depends on GRKERNSEC_TPE
47875+ help
47876+ If you say Y here, the group you specify in the TPE configuration will
47877+ decide what group TPE restrictions will be *disabled* for. This
47878+ option is useful if you want TPE restrictions to be applied to most
47879+ users on the system. If the sysctl option is enabled, a sysctl option
47880+ with name "tpe_invert" is created. Unlike other sysctl options, this
47881+ entry will default to on for backward-compatibility.
47882+
47883+config GRKERNSEC_TPE_GID
47884+ int "GID for untrusted users"
47885+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
47886+ default 1005
47887+ help
47888+ Setting this GID determines what group TPE restrictions will be
47889+ *enabled* for. If the sysctl option is enabled, a sysctl option
47890+ with name "tpe_gid" is created.
47891+
47892+config GRKERNSEC_TPE_GID
47893+ int "GID for trusted users"
47894+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
47895+ default 1005
47896+ help
47897+ Setting this GID determines what group TPE restrictions will be
47898+ *disabled* for. If the sysctl option is enabled, a sysctl option
47899+ with name "tpe_gid" is created.
47900+
47901+endmenu
47902+menu "Network Protections"
47903+depends on GRKERNSEC
47904+
47905+config GRKERNSEC_RANDNET
47906+ bool "Larger entropy pools"
47907+ help
47908+ If you say Y here, the entropy pools used for many features of Linux
47909+ and grsecurity will be doubled in size. Since several grsecurity
47910+ features use additional randomness, it is recommended that you say Y
47911+ here. Saying Y here has a similar effect as modifying
47912+ /proc/sys/kernel/random/poolsize.
47913+
47914+config GRKERNSEC_BLACKHOLE
47915+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
47916+ depends on NET
47917+ help
47918+ If you say Y here, neither TCP resets nor ICMP
47919+ destination-unreachable packets will be sent in response to packets
47920+ sent to ports for which no associated listening process exists.
47921+ This feature supports both IPV4 and IPV6 and exempts the
47922+ loopback interface from blackholing. Enabling this feature
47923+ makes a host more resilient to DoS attacks and reduces network
47924+ visibility against scanners.
47925+
47926+ The blackhole feature as-implemented is equivalent to the FreeBSD
47927+ blackhole feature, as it prevents RST responses to all packets, not
47928+ just SYNs. Under most application behavior this causes no
47929+ problems, but applications (like haproxy) may not close certain
47930+ connections in a way that cleanly terminates them on the remote
47931+ end, leaving the remote host in LAST_ACK state. Because of this
47932+ side-effect and to prevent intentional LAST_ACK DoSes, this
47933+ feature also adds automatic mitigation against such attacks.
47934+ The mitigation drastically reduces the amount of time a socket
47935+ can spend in LAST_ACK state. If you're using haproxy and not
47936+ all servers it connects to have this option enabled, consider
47937+ disabling this feature on the haproxy host.
47938+
47939+ If the sysctl option is enabled, two sysctl options with names
47940+ "ip_blackhole" and "lastack_retries" will be created.
47941+ While "ip_blackhole" takes the standard zero/non-zero on/off
47942+ toggle, "lastack_retries" uses the same kinds of values as
47943+ "tcp_retries1" and "tcp_retries2". The default value of 4
47944+ prevents a socket from lasting more than 45 seconds in LAST_ACK
47945+ state.
47946+
47947+config GRKERNSEC_SOCKET
47948+ bool "Socket restrictions"
47949+ depends on NET
47950+ help
47951+ If you say Y here, you will be able to choose from several options.
47952+ If you assign a GID on your system and add it to the supplementary
47953+ groups of users you want to restrict socket access to, this patch
47954+ will perform up to three things, based on the option(s) you choose.
47955+
47956+config GRKERNSEC_SOCKET_ALL
47957+ bool "Deny any sockets to group"
47958+ depends on GRKERNSEC_SOCKET
47959+ help
47960+ If you say Y here, you will be able to choose a GID of whose users will
47961+ be unable to connect to other hosts from your machine or run server
47962+ applications from your machine. If the sysctl option is enabled, a
47963+ sysctl option with name "socket_all" is created.
47964+
47965+config GRKERNSEC_SOCKET_ALL_GID
47966+ int "GID to deny all sockets for"
47967+ depends on GRKERNSEC_SOCKET_ALL
47968+ default 1004
47969+ help
47970+ Here you can choose the GID to disable socket access for. Remember to
47971+ add the users you want socket access disabled for to the GID
47972+ specified here. If the sysctl option is enabled, a sysctl option
47973+ with name "socket_all_gid" is created.
47974+
47975+config GRKERNSEC_SOCKET_CLIENT
47976+ bool "Deny client sockets to group"
47977+ depends on GRKERNSEC_SOCKET
47978+ help
47979+ If you say Y here, you will be able to choose a GID of whose users will
47980+ be unable to connect to other hosts from your machine, but will be
47981+ able to run servers. If this option is enabled, all users in the group
47982+ you specify will have to use passive mode when initiating ftp transfers
47983+ from the shell on your machine. If the sysctl option is enabled, a
47984+ sysctl option with name "socket_client" is created.
47985+
47986+config GRKERNSEC_SOCKET_CLIENT_GID
47987+ int "GID to deny client sockets for"
47988+ depends on GRKERNSEC_SOCKET_CLIENT
47989+ default 1003
47990+ help
47991+ Here you can choose the GID to disable client socket access for.
47992+ Remember to add the users you want client socket access disabled for to
47993+ the GID specified here. If the sysctl option is enabled, a sysctl
47994+ option with name "socket_client_gid" is created.
47995+
47996+config GRKERNSEC_SOCKET_SERVER
47997+ bool "Deny server sockets to group"
47998+ depends on GRKERNSEC_SOCKET
47999+ help
48000+ If you say Y here, you will be able to choose a GID of whose users will
48001+ be unable to run server applications from your machine. If the sysctl
48002+ option is enabled, a sysctl option with name "socket_server" is created.
48003+
48004+config GRKERNSEC_SOCKET_SERVER_GID
48005+ int "GID to deny server sockets for"
48006+ depends on GRKERNSEC_SOCKET_SERVER
48007+ default 1002
48008+ help
48009+ Here you can choose the GID to disable server socket access for.
48010+ Remember to add the users you want server socket access disabled for to
48011+ the GID specified here. If the sysctl option is enabled, a sysctl
48012+ option with name "socket_server_gid" is created.
48013+
48014+endmenu
48015+menu "Sysctl support"
48016+depends on GRKERNSEC && SYSCTL
48017+
48018+config GRKERNSEC_SYSCTL
48019+ bool "Sysctl support"
48020+ help
48021+ If you say Y here, you will be able to change the options that
48022+ grsecurity runs with at bootup, without having to recompile your
48023+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
48024+ to enable (1) or disable (0) various features. All the sysctl entries
48025+ are mutable until the "grsec_lock" entry is set to a non-zero value.
48026+ All features enabled in the kernel configuration are disabled at boot
48027+ if you do not say Y to the "Turn on features by default" option.
48028+ All options should be set at startup, and the grsec_lock entry should
48029+ be set to a non-zero value after all the options are set.
48030+ *THIS IS EXTREMELY IMPORTANT*
48031+
48032+config GRKERNSEC_SYSCTL_DISTRO
48033+ bool "Extra sysctl support for distro makers (READ HELP)"
48034+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
48035+ help
48036+ If you say Y here, additional sysctl options will be created
48037+ for features that affect processes running as root. Therefore,
48038+ it is critical when using this option that the grsec_lock entry be
48039+ enabled after boot. Only distros with prebuilt kernel packages
48040+ with this option enabled that can ensure grsec_lock is enabled
48041+ after boot should use this option.
48042+ *Failure to set grsec_lock after boot makes all grsec features
48043+ this option covers useless*
48044+
48045+ Currently this option creates the following sysctl entries:
48046+ "Disable Privileged I/O": "disable_priv_io"
48047+
48048+config GRKERNSEC_SYSCTL_ON
48049+ bool "Turn on features by default"
48050+ depends on GRKERNSEC_SYSCTL
48051+ help
48052+ If you say Y here, instead of having all features enabled in the
48053+ kernel configuration disabled at boot time, the features will be
48054+ enabled at boot time. It is recommended you say Y here unless
48055+ there is some reason you would want all sysctl-tunable features to
48056+ be disabled by default. As mentioned elsewhere, it is important
48057+ to enable the grsec_lock entry once you have finished modifying
48058+ the sysctl entries.
48059+
48060+endmenu
48061+menu "Logging Options"
48062+depends on GRKERNSEC
48063+
48064+config GRKERNSEC_FLOODTIME
48065+ int "Seconds in between log messages (minimum)"
48066+ default 10
48067+ help
48068+ This option allows you to enforce the number of seconds between
48069+ grsecurity log messages. The default should be suitable for most
48070+ people, however, if you choose to change it, choose a value small enough
48071+ to allow informative logs to be produced, but large enough to
48072+ prevent flooding.
48073+
48074+config GRKERNSEC_FLOODBURST
48075+ int "Number of messages in a burst (maximum)"
48076+ default 6
48077+ help
48078+ This option allows you to choose the maximum number of messages allowed
48079+ within the flood time interval you chose in a separate option. The
48080+ default should be suitable for most people, however if you find that
48081+ many of your logs are being interpreted as flooding, you may want to
48082+ raise this value.
48083+
48084+endmenu
48085+
48086+endmenu
48087diff --git a/grsecurity/Makefile b/grsecurity/Makefile
48088new file mode 100644
48089index 0000000..be9ae3a
48090--- /dev/null
48091+++ b/grsecurity/Makefile
48092@@ -0,0 +1,36 @@
48093+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
48094+# during 2001-2009 it has been completely redesigned by Brad Spengler
48095+# into an RBAC system
48096+#
48097+# All code in this directory and various hooks inserted throughout the kernel
48098+# are copyright Brad Spengler - Open Source Security, Inc., and released
48099+# under the GPL v2 or higher
48100+
48101+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
48102+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
48103+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
48104+
48105+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
48106+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
48107+ gracl_learn.o grsec_log.o
48108+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
48109+
48110+ifdef CONFIG_NET
48111+obj-y += grsec_sock.o
48112+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
48113+endif
48114+
48115+ifndef CONFIG_GRKERNSEC
48116+obj-y += grsec_disabled.o
48117+endif
48118+
48119+ifdef CONFIG_GRKERNSEC_HIDESYM
48120+extra-y := grsec_hidesym.o
48121+$(obj)/grsec_hidesym.o:
48122+ @-chmod -f 500 /boot
48123+ @-chmod -f 500 /lib/modules
48124+ @-chmod -f 500 /lib64/modules
48125+ @-chmod -f 500 /lib32/modules
48126+ @-chmod -f 700 .
48127+ @echo ' grsec: protected kernel image paths'
48128+endif
48129diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
48130new file mode 100644
48131index 0000000..d3b423d
48132--- /dev/null
48133+++ b/grsecurity/gracl.c
48134@@ -0,0 +1,4155 @@
48135+#include <linux/kernel.h>
48136+#include <linux/module.h>
48137+#include <linux/sched.h>
48138+#include <linux/mm.h>
48139+#include <linux/file.h>
48140+#include <linux/fs.h>
48141+#include <linux/namei.h>
48142+#include <linux/mount.h>
48143+#include <linux/tty.h>
48144+#include <linux/proc_fs.h>
48145+#include <linux/lglock.h>
48146+#include <linux/slab.h>
48147+#include <linux/vmalloc.h>
48148+#include <linux/types.h>
48149+#include <linux/sysctl.h>
48150+#include <linux/netdevice.h>
48151+#include <linux/ptrace.h>
48152+#include <linux/gracl.h>
48153+#include <linux/gralloc.h>
48154+#include <linux/security.h>
48155+#include <linux/grinternal.h>
48156+#include <linux/pid_namespace.h>
48157+#include <linux/fdtable.h>
48158+#include <linux/percpu.h>
48159+
48160+#include <asm/uaccess.h>
48161+#include <asm/errno.h>
48162+#include <asm/mman.h>
48163+
48164+static struct acl_role_db acl_role_set;
48165+static struct name_db name_set;
48166+static struct inodev_db inodev_set;
48167+
48168+/* for keeping track of userspace pointers used for subjects, so we
48169+ can share references in the kernel as well
48170+*/
48171+
48172+static struct path real_root;
48173+
48174+static struct acl_subj_map_db subj_map_set;
48175+
48176+static struct acl_role_label *default_role;
48177+
48178+static struct acl_role_label *role_list;
48179+
48180+static u16 acl_sp_role_value;
48181+
48182+extern char *gr_shared_page[4];
48183+static DEFINE_MUTEX(gr_dev_mutex);
48184+DEFINE_RWLOCK(gr_inode_lock);
48185+
48186+struct gr_arg *gr_usermode;
48187+
48188+static unsigned int gr_status __read_only = GR_STATUS_INIT;
48189+
48190+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
48191+extern void gr_clear_learn_entries(void);
48192+
48193+#ifdef CONFIG_GRKERNSEC_RESLOG
48194+extern void gr_log_resource(const struct task_struct *task,
48195+ const int res, const unsigned long wanted, const int gt);
48196+#endif
48197+
48198+unsigned char *gr_system_salt;
48199+unsigned char *gr_system_sum;
48200+
48201+static struct sprole_pw **acl_special_roles = NULL;
48202+static __u16 num_sprole_pws = 0;
48203+
48204+static struct acl_role_label *kernel_role = NULL;
48205+
48206+static unsigned int gr_auth_attempts = 0;
48207+static unsigned long gr_auth_expires = 0UL;
48208+
48209+#ifdef CONFIG_NET
48210+extern struct vfsmount *sock_mnt;
48211+#endif
48212+
48213+extern struct vfsmount *pipe_mnt;
48214+extern struct vfsmount *shm_mnt;
48215+#ifdef CONFIG_HUGETLBFS
48216+extern struct vfsmount *hugetlbfs_vfsmount;
48217+#endif
48218+
48219+static struct acl_object_label *fakefs_obj_rw;
48220+static struct acl_object_label *fakefs_obj_rwx;
48221+
48222+extern int gr_init_uidset(void);
48223+extern void gr_free_uidset(void);
48224+extern void gr_remove_uid(uid_t uid);
48225+extern int gr_find_uid(uid_t uid);
48226+
48227+DECLARE_BRLOCK(vfsmount_lock);
48228+
48229+__inline__ int
48230+gr_acl_is_enabled(void)
48231+{
48232+ return (gr_status & GR_READY);
48233+}
48234+
48235+#ifdef CONFIG_BTRFS_FS
48236+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
48237+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
48238+#endif
48239+
48240+static inline dev_t __get_dev(const struct dentry *dentry)
48241+{
48242+#ifdef CONFIG_BTRFS_FS
48243+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
48244+ return get_btrfs_dev_from_inode(dentry->d_inode);
48245+ else
48246+#endif
48247+ return dentry->d_inode->i_sb->s_dev;
48248+}
48249+
48250+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
48251+{
48252+ return __get_dev(dentry);
48253+}
48254+
48255+static char gr_task_roletype_to_char(struct task_struct *task)
48256+{
48257+ switch (task->role->roletype &
48258+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
48259+ GR_ROLE_SPECIAL)) {
48260+ case GR_ROLE_DEFAULT:
48261+ return 'D';
48262+ case GR_ROLE_USER:
48263+ return 'U';
48264+ case GR_ROLE_GROUP:
48265+ return 'G';
48266+ case GR_ROLE_SPECIAL:
48267+ return 'S';
48268+ }
48269+
48270+ return 'X';
48271+}
48272+
48273+char gr_roletype_to_char(void)
48274+{
48275+ return gr_task_roletype_to_char(current);
48276+}
48277+
48278+__inline__ int
48279+gr_acl_tpe_check(void)
48280+{
48281+ if (unlikely(!(gr_status & GR_READY)))
48282+ return 0;
48283+ if (current->role->roletype & GR_ROLE_TPE)
48284+ return 1;
48285+ else
48286+ return 0;
48287+}
48288+
48289+int
48290+gr_handle_rawio(const struct inode *inode)
48291+{
48292+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
48293+ if (inode && S_ISBLK(inode->i_mode) &&
48294+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
48295+ !capable(CAP_SYS_RAWIO))
48296+ return 1;
48297+#endif
48298+ return 0;
48299+}
48300+
48301+static int
48302+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
48303+{
48304+ if (likely(lena != lenb))
48305+ return 0;
48306+
48307+ return !memcmp(a, b, lena);
48308+}
48309+
48310+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
48311+{
48312+ *buflen -= namelen;
48313+ if (*buflen < 0)
48314+ return -ENAMETOOLONG;
48315+ *buffer -= namelen;
48316+ memcpy(*buffer, str, namelen);
48317+ return 0;
48318+}
48319+
48320+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
48321+{
48322+ return prepend(buffer, buflen, name->name, name->len);
48323+}
48324+
48325+static int prepend_path(const struct path *path, struct path *root,
48326+ char **buffer, int *buflen)
48327+{
48328+ struct dentry *dentry = path->dentry;
48329+ struct vfsmount *vfsmnt = path->mnt;
48330+ bool slash = false;
48331+ int error = 0;
48332+
48333+ while (dentry != root->dentry || vfsmnt != root->mnt) {
48334+ struct dentry * parent;
48335+
48336+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
48337+ /* Global root? */
48338+ if (vfsmnt->mnt_parent == vfsmnt) {
48339+ goto out;
48340+ }
48341+ dentry = vfsmnt->mnt_mountpoint;
48342+ vfsmnt = vfsmnt->mnt_parent;
48343+ continue;
48344+ }
48345+ parent = dentry->d_parent;
48346+ prefetch(parent);
48347+ spin_lock(&dentry->d_lock);
48348+ error = prepend_name(buffer, buflen, &dentry->d_name);
48349+ spin_unlock(&dentry->d_lock);
48350+ if (!error)
48351+ error = prepend(buffer, buflen, "/", 1);
48352+ if (error)
48353+ break;
48354+
48355+ slash = true;
48356+ dentry = parent;
48357+ }
48358+
48359+out:
48360+ if (!error && !slash)
48361+ error = prepend(buffer, buflen, "/", 1);
48362+
48363+ return error;
48364+}
48365+
48366+/* this must be called with vfsmount_lock and rename_lock held */
48367+
48368+static char *__our_d_path(const struct path *path, struct path *root,
48369+ char *buf, int buflen)
48370+{
48371+ char *res = buf + buflen;
48372+ int error;
48373+
48374+ prepend(&res, &buflen, "\0", 1);
48375+ error = prepend_path(path, root, &res, &buflen);
48376+ if (error)
48377+ return ERR_PTR(error);
48378+
48379+ return res;
48380+}
48381+
48382+static char *
48383+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
48384+{
48385+ char *retval;
48386+
48387+ retval = __our_d_path(path, root, buf, buflen);
48388+ if (unlikely(IS_ERR(retval)))
48389+ retval = strcpy(buf, "<path too long>");
48390+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
48391+ retval[1] = '\0';
48392+
48393+ return retval;
48394+}
48395+
48396+static char *
48397+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
48398+ char *buf, int buflen)
48399+{
48400+ struct path path;
48401+ char *res;
48402+
48403+ path.dentry = (struct dentry *)dentry;
48404+ path.mnt = (struct vfsmount *)vfsmnt;
48405+
48406+ /* we can use real_root.dentry, real_root.mnt, because this is only called
48407+ by the RBAC system */
48408+ res = gen_full_path(&path, &real_root, buf, buflen);
48409+
48410+ return res;
48411+}
48412+
48413+static char *
48414+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
48415+ char *buf, int buflen)
48416+{
48417+ char *res;
48418+ struct path path;
48419+ struct path root;
48420+ struct task_struct *reaper = &init_task;
48421+
48422+ path.dentry = (struct dentry *)dentry;
48423+ path.mnt = (struct vfsmount *)vfsmnt;
48424+
48425+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
48426+ get_fs_root(reaper->fs, &root);
48427+
48428+ write_seqlock(&rename_lock);
48429+ br_read_lock(vfsmount_lock);
48430+ res = gen_full_path(&path, &root, buf, buflen);
48431+ br_read_unlock(vfsmount_lock);
48432+ write_sequnlock(&rename_lock);
48433+
48434+ path_put(&root);
48435+ return res;
48436+}
48437+
48438+static char *
48439+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
48440+{
48441+ char *ret;
48442+ write_seqlock(&rename_lock);
48443+ br_read_lock(vfsmount_lock);
48444+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
48445+ PAGE_SIZE);
48446+ br_read_unlock(vfsmount_lock);
48447+ write_sequnlock(&rename_lock);
48448+ return ret;
48449+}
48450+
48451+static char *
48452+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
48453+{
48454+ char *ret;
48455+ char *buf;
48456+ int buflen;
48457+
48458+ write_seqlock(&rename_lock);
48459+ br_read_lock(vfsmount_lock);
48460+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
48461+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
48462+ buflen = (int)(ret - buf);
48463+ if (buflen >= 5)
48464+ prepend(&ret, &buflen, "/proc", 5);
48465+ else
48466+ ret = strcpy(buf, "<path too long>");
48467+ br_read_unlock(vfsmount_lock);
48468+ write_sequnlock(&rename_lock);
48469+ return ret;
48470+}
48471+
48472+char *
48473+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
48474+{
48475+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
48476+ PAGE_SIZE);
48477+}
48478+
48479+char *
48480+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
48481+{
48482+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
48483+ PAGE_SIZE);
48484+}
48485+
48486+char *
48487+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
48488+{
48489+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
48490+ PAGE_SIZE);
48491+}
48492+
48493+char *
48494+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
48495+{
48496+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
48497+ PAGE_SIZE);
48498+}
48499+
48500+char *
48501+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
48502+{
48503+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
48504+ PAGE_SIZE);
48505+}
48506+
48507+__inline__ __u32
48508+to_gr_audit(const __u32 reqmode)
48509+{
48510+ /* masks off auditable permission flags, then shifts them to create
48511+ auditing flags, and adds the special case of append auditing if
48512+ we're requesting write */
48513+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
48514+}
48515+
48516+struct acl_subject_label *
48517+lookup_subject_map(const struct acl_subject_label *userp)
48518+{
48519+ unsigned int index = shash(userp, subj_map_set.s_size);
48520+ struct subject_map *match;
48521+
48522+ match = subj_map_set.s_hash[index];
48523+
48524+ while (match && match->user != userp)
48525+ match = match->next;
48526+
48527+ if (match != NULL)
48528+ return match->kernel;
48529+ else
48530+ return NULL;
48531+}
48532+
48533+static void
48534+insert_subj_map_entry(struct subject_map *subjmap)
48535+{
48536+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
48537+ struct subject_map **curr;
48538+
48539+ subjmap->prev = NULL;
48540+
48541+ curr = &subj_map_set.s_hash[index];
48542+ if (*curr != NULL)
48543+ (*curr)->prev = subjmap;
48544+
48545+ subjmap->next = *curr;
48546+ *curr = subjmap;
48547+
48548+ return;
48549+}
48550+
48551+static struct acl_role_label *
48552+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
48553+ const gid_t gid)
48554+{
48555+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
48556+ struct acl_role_label *match;
48557+ struct role_allowed_ip *ipp;
48558+ unsigned int x;
48559+ u32 curr_ip = task->signal->curr_ip;
48560+
48561+ task->signal->saved_ip = curr_ip;
48562+
48563+ match = acl_role_set.r_hash[index];
48564+
48565+ while (match) {
48566+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
48567+ for (x = 0; x < match->domain_child_num; x++) {
48568+ if (match->domain_children[x] == uid)
48569+ goto found;
48570+ }
48571+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
48572+ break;
48573+ match = match->next;
48574+ }
48575+found:
48576+ if (match == NULL) {
48577+ try_group:
48578+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
48579+ match = acl_role_set.r_hash[index];
48580+
48581+ while (match) {
48582+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
48583+ for (x = 0; x < match->domain_child_num; x++) {
48584+ if (match->domain_children[x] == gid)
48585+ goto found2;
48586+ }
48587+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
48588+ break;
48589+ match = match->next;
48590+ }
48591+found2:
48592+ if (match == NULL)
48593+ match = default_role;
48594+ if (match->allowed_ips == NULL)
48595+ return match;
48596+ else {
48597+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
48598+ if (likely
48599+ ((ntohl(curr_ip) & ipp->netmask) ==
48600+ (ntohl(ipp->addr) & ipp->netmask)))
48601+ return match;
48602+ }
48603+ match = default_role;
48604+ }
48605+ } else if (match->allowed_ips == NULL) {
48606+ return match;
48607+ } else {
48608+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
48609+ if (likely
48610+ ((ntohl(curr_ip) & ipp->netmask) ==
48611+ (ntohl(ipp->addr) & ipp->netmask)))
48612+ return match;
48613+ }
48614+ goto try_group;
48615+ }
48616+
48617+ return match;
48618+}
48619+
48620+struct acl_subject_label *
48621+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
48622+ const struct acl_role_label *role)
48623+{
48624+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
48625+ struct acl_subject_label *match;
48626+
48627+ match = role->subj_hash[index];
48628+
48629+ while (match && (match->inode != ino || match->device != dev ||
48630+ (match->mode & GR_DELETED))) {
48631+ match = match->next;
48632+ }
48633+
48634+ if (match && !(match->mode & GR_DELETED))
48635+ return match;
48636+ else
48637+ return NULL;
48638+}
48639+
48640+struct acl_subject_label *
48641+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
48642+ const struct acl_role_label *role)
48643+{
48644+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
48645+ struct acl_subject_label *match;
48646+
48647+ match = role->subj_hash[index];
48648+
48649+ while (match && (match->inode != ino || match->device != dev ||
48650+ !(match->mode & GR_DELETED))) {
48651+ match = match->next;
48652+ }
48653+
48654+ if (match && (match->mode & GR_DELETED))
48655+ return match;
48656+ else
48657+ return NULL;
48658+}
48659+
48660+static struct acl_object_label *
48661+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
48662+ const struct acl_subject_label *subj)
48663+{
48664+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
48665+ struct acl_object_label *match;
48666+
48667+ match = subj->obj_hash[index];
48668+
48669+ while (match && (match->inode != ino || match->device != dev ||
48670+ (match->mode & GR_DELETED))) {
48671+ match = match->next;
48672+ }
48673+
48674+ if (match && !(match->mode & GR_DELETED))
48675+ return match;
48676+ else
48677+ return NULL;
48678+}
48679+
48680+static struct acl_object_label *
48681+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
48682+ const struct acl_subject_label *subj)
48683+{
48684+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
48685+ struct acl_object_label *match;
48686+
48687+ match = subj->obj_hash[index];
48688+
48689+ while (match && (match->inode != ino || match->device != dev ||
48690+ !(match->mode & GR_DELETED))) {
48691+ match = match->next;
48692+ }
48693+
48694+ if (match && (match->mode & GR_DELETED))
48695+ return match;
48696+
48697+ match = subj->obj_hash[index];
48698+
48699+ while (match && (match->inode != ino || match->device != dev ||
48700+ (match->mode & GR_DELETED))) {
48701+ match = match->next;
48702+ }
48703+
48704+ if (match && !(match->mode & GR_DELETED))
48705+ return match;
48706+ else
48707+ return NULL;
48708+}
48709+
48710+static struct name_entry *
48711+lookup_name_entry(const char *name)
48712+{
48713+ unsigned int len = strlen(name);
48714+ unsigned int key = full_name_hash(name, len);
48715+ unsigned int index = key % name_set.n_size;
48716+ struct name_entry *match;
48717+
48718+ match = name_set.n_hash[index];
48719+
48720+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
48721+ match = match->next;
48722+
48723+ return match;
48724+}
48725+
48726+static struct name_entry *
48727+lookup_name_entry_create(const char *name)
48728+{
48729+ unsigned int len = strlen(name);
48730+ unsigned int key = full_name_hash(name, len);
48731+ unsigned int index = key % name_set.n_size;
48732+ struct name_entry *match;
48733+
48734+ match = name_set.n_hash[index];
48735+
48736+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
48737+ !match->deleted))
48738+ match = match->next;
48739+
48740+ if (match && match->deleted)
48741+ return match;
48742+
48743+ match = name_set.n_hash[index];
48744+
48745+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
48746+ match->deleted))
48747+ match = match->next;
48748+
48749+ if (match && !match->deleted)
48750+ return match;
48751+ else
48752+ return NULL;
48753+}
48754+
48755+static struct inodev_entry *
48756+lookup_inodev_entry(const ino_t ino, const dev_t dev)
48757+{
48758+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
48759+ struct inodev_entry *match;
48760+
48761+ match = inodev_set.i_hash[index];
48762+
48763+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
48764+ match = match->next;
48765+
48766+ return match;
48767+}
48768+
48769+static void
48770+insert_inodev_entry(struct inodev_entry *entry)
48771+{
48772+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
48773+ inodev_set.i_size);
48774+ struct inodev_entry **curr;
48775+
48776+ entry->prev = NULL;
48777+
48778+ curr = &inodev_set.i_hash[index];
48779+ if (*curr != NULL)
48780+ (*curr)->prev = entry;
48781+
48782+ entry->next = *curr;
48783+ *curr = entry;
48784+
48785+ return;
48786+}
48787+
48788+static void
48789+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
48790+{
48791+ unsigned int index =
48792+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
48793+ struct acl_role_label **curr;
48794+ struct acl_role_label *tmp;
48795+
48796+ curr = &acl_role_set.r_hash[index];
48797+
48798+ /* if role was already inserted due to domains and already has
48799+ a role in the same bucket as it attached, then we need to
48800+ combine these two buckets
48801+ */
48802+ if (role->next) {
48803+ tmp = role->next;
48804+ while (tmp->next)
48805+ tmp = tmp->next;
48806+ tmp->next = *curr;
48807+ } else
48808+ role->next = *curr;
48809+ *curr = role;
48810+
48811+ return;
48812+}
48813+
48814+static void
48815+insert_acl_role_label(struct acl_role_label *role)
48816+{
48817+ int i;
48818+
48819+ if (role_list == NULL) {
48820+ role_list = role;
48821+ role->prev = NULL;
48822+ } else {
48823+ role->prev = role_list;
48824+ role_list = role;
48825+ }
48826+
48827+ /* used for hash chains */
48828+ role->next = NULL;
48829+
48830+ if (role->roletype & GR_ROLE_DOMAIN) {
48831+ for (i = 0; i < role->domain_child_num; i++)
48832+ __insert_acl_role_label(role, role->domain_children[i]);
48833+ } else
48834+ __insert_acl_role_label(role, role->uidgid);
48835+}
48836+
48837+static int
48838+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
48839+{
48840+ struct name_entry **curr, *nentry;
48841+ struct inodev_entry *ientry;
48842+ unsigned int len = strlen(name);
48843+ unsigned int key = full_name_hash(name, len);
48844+ unsigned int index = key % name_set.n_size;
48845+
48846+ curr = &name_set.n_hash[index];
48847+
48848+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
48849+ curr = &((*curr)->next);
48850+
48851+ if (*curr != NULL)
48852+ return 1;
48853+
48854+ nentry = acl_alloc(sizeof (struct name_entry));
48855+ if (nentry == NULL)
48856+ return 0;
48857+ ientry = acl_alloc(sizeof (struct inodev_entry));
48858+ if (ientry == NULL)
48859+ return 0;
48860+ ientry->nentry = nentry;
48861+
48862+ nentry->key = key;
48863+ nentry->name = name;
48864+ nentry->inode = inode;
48865+ nentry->device = device;
48866+ nentry->len = len;
48867+ nentry->deleted = deleted;
48868+
48869+ nentry->prev = NULL;
48870+ curr = &name_set.n_hash[index];
48871+ if (*curr != NULL)
48872+ (*curr)->prev = nentry;
48873+ nentry->next = *curr;
48874+ *curr = nentry;
48875+
48876+ /* insert us into the table searchable by inode/dev */
48877+ insert_inodev_entry(ientry);
48878+
48879+ return 1;
48880+}
48881+
48882+static void
48883+insert_acl_obj_label(struct acl_object_label *obj,
48884+ struct acl_subject_label *subj)
48885+{
48886+ unsigned int index =
48887+ fhash(obj->inode, obj->device, subj->obj_hash_size);
48888+ struct acl_object_label **curr;
48889+
48890+
48891+ obj->prev = NULL;
48892+
48893+ curr = &subj->obj_hash[index];
48894+ if (*curr != NULL)
48895+ (*curr)->prev = obj;
48896+
48897+ obj->next = *curr;
48898+ *curr = obj;
48899+
48900+ return;
48901+}
48902+
48903+static void
48904+insert_acl_subj_label(struct acl_subject_label *obj,
48905+ struct acl_role_label *role)
48906+{
48907+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
48908+ struct acl_subject_label **curr;
48909+
48910+ obj->prev = NULL;
48911+
48912+ curr = &role->subj_hash[index];
48913+ if (*curr != NULL)
48914+ (*curr)->prev = obj;
48915+
48916+ obj->next = *curr;
48917+ *curr = obj;
48918+
48919+ return;
48920+}
48921+
48922+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
48923+
48924+static void *
48925+create_table(__u32 * len, int elementsize)
48926+{
48927+ unsigned int table_sizes[] = {
48928+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
48929+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
48930+ 4194301, 8388593, 16777213, 33554393, 67108859
48931+ };
48932+ void *newtable = NULL;
48933+ unsigned int pwr = 0;
48934+
48935+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
48936+ table_sizes[pwr] <= *len)
48937+ pwr++;
48938+
48939+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
48940+ return newtable;
48941+
48942+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
48943+ newtable =
48944+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
48945+ else
48946+ newtable = vmalloc(table_sizes[pwr] * elementsize);
48947+
48948+ *len = table_sizes[pwr];
48949+
48950+ return newtable;
48951+}
48952+
48953+static int
48954+init_variables(const struct gr_arg *arg)
48955+{
48956+ struct task_struct *reaper = &init_task;
48957+ unsigned int stacksize;
48958+
48959+ subj_map_set.s_size = arg->role_db.num_subjects;
48960+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
48961+ name_set.n_size = arg->role_db.num_objects;
48962+ inodev_set.i_size = arg->role_db.num_objects;
48963+
48964+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
48965+ !name_set.n_size || !inodev_set.i_size)
48966+ return 1;
48967+
48968+ if (!gr_init_uidset())
48969+ return 1;
48970+
48971+ /* set up the stack that holds allocation info */
48972+
48973+ stacksize = arg->role_db.num_pointers + 5;
48974+
48975+ if (!acl_alloc_stack_init(stacksize))
48976+ return 1;
48977+
48978+ /* grab reference for the real root dentry and vfsmount */
48979+ get_fs_root(reaper->fs, &real_root);
48980+
48981+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
48982+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
48983+#endif
48984+
48985+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
48986+ if (fakefs_obj_rw == NULL)
48987+ return 1;
48988+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
48989+
48990+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
48991+ if (fakefs_obj_rwx == NULL)
48992+ return 1;
48993+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
48994+
48995+ subj_map_set.s_hash =
48996+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
48997+ acl_role_set.r_hash =
48998+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
48999+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
49000+ inodev_set.i_hash =
49001+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
49002+
49003+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
49004+ !name_set.n_hash || !inodev_set.i_hash)
49005+ return 1;
49006+
49007+ memset(subj_map_set.s_hash, 0,
49008+ sizeof(struct subject_map *) * subj_map_set.s_size);
49009+ memset(acl_role_set.r_hash, 0,
49010+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
49011+ memset(name_set.n_hash, 0,
49012+ sizeof (struct name_entry *) * name_set.n_size);
49013+ memset(inodev_set.i_hash, 0,
49014+ sizeof (struct inodev_entry *) * inodev_set.i_size);
49015+
49016+ return 0;
49017+}
49018+
49019+/* free information not needed after startup
49020+ currently contains user->kernel pointer mappings for subjects
49021+*/
49022+
49023+static void
49024+free_init_variables(void)
49025+{
49026+ __u32 i;
49027+
49028+ if (subj_map_set.s_hash) {
49029+ for (i = 0; i < subj_map_set.s_size; i++) {
49030+ if (subj_map_set.s_hash[i]) {
49031+ kfree(subj_map_set.s_hash[i]);
49032+ subj_map_set.s_hash[i] = NULL;
49033+ }
49034+ }
49035+
49036+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
49037+ PAGE_SIZE)
49038+ kfree(subj_map_set.s_hash);
49039+ else
49040+ vfree(subj_map_set.s_hash);
49041+ }
49042+
49043+ return;
49044+}
49045+
49046+static void
49047+free_variables(void)
49048+{
49049+ struct acl_subject_label *s;
49050+ struct acl_role_label *r;
49051+ struct task_struct *task, *task2;
49052+ unsigned int x;
49053+
49054+ gr_clear_learn_entries();
49055+
49056+ read_lock(&tasklist_lock);
49057+ do_each_thread(task2, task) {
49058+ task->acl_sp_role = 0;
49059+ task->acl_role_id = 0;
49060+ task->acl = NULL;
49061+ task->role = NULL;
49062+ } while_each_thread(task2, task);
49063+ read_unlock(&tasklist_lock);
49064+
49065+ /* release the reference to the real root dentry and vfsmount */
49066+ path_put(&real_root);
49067+
49068+ /* free all object hash tables */
49069+
49070+ FOR_EACH_ROLE_START(r)
49071+ if (r->subj_hash == NULL)
49072+ goto next_role;
49073+ FOR_EACH_SUBJECT_START(r, s, x)
49074+ if (s->obj_hash == NULL)
49075+ break;
49076+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
49077+ kfree(s->obj_hash);
49078+ else
49079+ vfree(s->obj_hash);
49080+ FOR_EACH_SUBJECT_END(s, x)
49081+ FOR_EACH_NESTED_SUBJECT_START(r, s)
49082+ if (s->obj_hash == NULL)
49083+ break;
49084+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
49085+ kfree(s->obj_hash);
49086+ else
49087+ vfree(s->obj_hash);
49088+ FOR_EACH_NESTED_SUBJECT_END(s)
49089+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
49090+ kfree(r->subj_hash);
49091+ else
49092+ vfree(r->subj_hash);
49093+ r->subj_hash = NULL;
49094+next_role:
49095+ FOR_EACH_ROLE_END(r)
49096+
49097+ acl_free_all();
49098+
49099+ if (acl_role_set.r_hash) {
49100+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
49101+ PAGE_SIZE)
49102+ kfree(acl_role_set.r_hash);
49103+ else
49104+ vfree(acl_role_set.r_hash);
49105+ }
49106+ if (name_set.n_hash) {
49107+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
49108+ PAGE_SIZE)
49109+ kfree(name_set.n_hash);
49110+ else
49111+ vfree(name_set.n_hash);
49112+ }
49113+
49114+ if (inodev_set.i_hash) {
49115+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
49116+ PAGE_SIZE)
49117+ kfree(inodev_set.i_hash);
49118+ else
49119+ vfree(inodev_set.i_hash);
49120+ }
49121+
49122+ gr_free_uidset();
49123+
49124+ memset(&name_set, 0, sizeof (struct name_db));
49125+ memset(&inodev_set, 0, sizeof (struct inodev_db));
49126+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
49127+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
49128+
49129+ default_role = NULL;
49130+ role_list = NULL;
49131+
49132+ return;
49133+}
49134+
49135+static __u32
49136+count_user_objs(struct acl_object_label *userp)
49137+{
49138+ struct acl_object_label o_tmp;
49139+ __u32 num = 0;
49140+
49141+ while (userp) {
49142+ if (copy_from_user(&o_tmp, userp,
49143+ sizeof (struct acl_object_label)))
49144+ break;
49145+
49146+ userp = o_tmp.prev;
49147+ num++;
49148+ }
49149+
49150+ return num;
49151+}
49152+
49153+static struct acl_subject_label *
49154+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
49155+
49156+static int
49157+copy_user_glob(struct acl_object_label *obj)
49158+{
49159+ struct acl_object_label *g_tmp, **guser;
49160+ unsigned int len;
49161+ char *tmp;
49162+
49163+ if (obj->globbed == NULL)
49164+ return 0;
49165+
49166+ guser = &obj->globbed;
49167+ while (*guser) {
49168+ g_tmp = (struct acl_object_label *)
49169+ acl_alloc(sizeof (struct acl_object_label));
49170+ if (g_tmp == NULL)
49171+ return -ENOMEM;
49172+
49173+ if (copy_from_user(g_tmp, *guser,
49174+ sizeof (struct acl_object_label)))
49175+ return -EFAULT;
49176+
49177+ len = strnlen_user(g_tmp->filename, PATH_MAX);
49178+
49179+ if (!len || len >= PATH_MAX)
49180+ return -EINVAL;
49181+
49182+ if ((tmp = (char *) acl_alloc(len)) == NULL)
49183+ return -ENOMEM;
49184+
49185+ if (copy_from_user(tmp, g_tmp->filename, len))
49186+ return -EFAULT;
49187+ tmp[len-1] = '\0';
49188+ g_tmp->filename = tmp;
49189+
49190+ *guser = g_tmp;
49191+ guser = &(g_tmp->next);
49192+ }
49193+
49194+ return 0;
49195+}
49196+
49197+static int
49198+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
49199+ struct acl_role_label *role)
49200+{
49201+ struct acl_object_label *o_tmp;
49202+ unsigned int len;
49203+ int ret;
49204+ char *tmp;
49205+
49206+ while (userp) {
49207+ if ((o_tmp = (struct acl_object_label *)
49208+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
49209+ return -ENOMEM;
49210+
49211+ if (copy_from_user(o_tmp, userp,
49212+ sizeof (struct acl_object_label)))
49213+ return -EFAULT;
49214+
49215+ userp = o_tmp->prev;
49216+
49217+ len = strnlen_user(o_tmp->filename, PATH_MAX);
49218+
49219+ if (!len || len >= PATH_MAX)
49220+ return -EINVAL;
49221+
49222+ if ((tmp = (char *) acl_alloc(len)) == NULL)
49223+ return -ENOMEM;
49224+
49225+ if (copy_from_user(tmp, o_tmp->filename, len))
49226+ return -EFAULT;
49227+ tmp[len-1] = '\0';
49228+ o_tmp->filename = tmp;
49229+
49230+ insert_acl_obj_label(o_tmp, subj);
49231+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
49232+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
49233+ return -ENOMEM;
49234+
49235+ ret = copy_user_glob(o_tmp);
49236+ if (ret)
49237+ return ret;
49238+
49239+ if (o_tmp->nested) {
49240+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
49241+ if (IS_ERR(o_tmp->nested))
49242+ return PTR_ERR(o_tmp->nested);
49243+
49244+ /* insert into nested subject list */
49245+ o_tmp->nested->next = role->hash->first;
49246+ role->hash->first = o_tmp->nested;
49247+ }
49248+ }
49249+
49250+ return 0;
49251+}
49252+
49253+static __u32
49254+count_user_subjs(struct acl_subject_label *userp)
49255+{
49256+ struct acl_subject_label s_tmp;
49257+ __u32 num = 0;
49258+
49259+ while (userp) {
49260+ if (copy_from_user(&s_tmp, userp,
49261+ sizeof (struct acl_subject_label)))
49262+ break;
49263+
49264+ userp = s_tmp.prev;
49265+ /* do not count nested subjects against this count, since
49266+ they are not included in the hash table, but are
49267+ attached to objects. We have already counted
49268+ the subjects in userspace for the allocation
49269+ stack
49270+ */
49271+ if (!(s_tmp.mode & GR_NESTED))
49272+ num++;
49273+ }
49274+
49275+ return num;
49276+}
49277+
49278+static int
49279+copy_user_allowedips(struct acl_role_label *rolep)
49280+{
49281+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
49282+
49283+ ruserip = rolep->allowed_ips;
49284+
49285+ while (ruserip) {
49286+ rlast = rtmp;
49287+
49288+ if ((rtmp = (struct role_allowed_ip *)
49289+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
49290+ return -ENOMEM;
49291+
49292+ if (copy_from_user(rtmp, ruserip,
49293+ sizeof (struct role_allowed_ip)))
49294+ return -EFAULT;
49295+
49296+ ruserip = rtmp->prev;
49297+
49298+ if (!rlast) {
49299+ rtmp->prev = NULL;
49300+ rolep->allowed_ips = rtmp;
49301+ } else {
49302+ rlast->next = rtmp;
49303+ rtmp->prev = rlast;
49304+ }
49305+
49306+ if (!ruserip)
49307+ rtmp->next = NULL;
49308+ }
49309+
49310+ return 0;
49311+}
49312+
49313+static int
49314+copy_user_transitions(struct acl_role_label *rolep)
49315+{
49316+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
49317+
49318+ unsigned int len;
49319+ char *tmp;
49320+
49321+ rusertp = rolep->transitions;
49322+
49323+ while (rusertp) {
49324+ rlast = rtmp;
49325+
49326+ if ((rtmp = (struct role_transition *)
49327+ acl_alloc(sizeof (struct role_transition))) == NULL)
49328+ return -ENOMEM;
49329+
49330+ if (copy_from_user(rtmp, rusertp,
49331+ sizeof (struct role_transition)))
49332+ return -EFAULT;
49333+
49334+ rusertp = rtmp->prev;
49335+
49336+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
49337+
49338+ if (!len || len >= GR_SPROLE_LEN)
49339+ return -EINVAL;
49340+
49341+ if ((tmp = (char *) acl_alloc(len)) == NULL)
49342+ return -ENOMEM;
49343+
49344+ if (copy_from_user(tmp, rtmp->rolename, len))
49345+ return -EFAULT;
49346+ tmp[len-1] = '\0';
49347+ rtmp->rolename = tmp;
49348+
49349+ if (!rlast) {
49350+ rtmp->prev = NULL;
49351+ rolep->transitions = rtmp;
49352+ } else {
49353+ rlast->next = rtmp;
49354+ rtmp->prev = rlast;
49355+ }
49356+
49357+ if (!rusertp)
49358+ rtmp->next = NULL;
49359+ }
49360+
49361+ return 0;
49362+}
49363+
49364+static struct acl_subject_label *
49365+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
49366+{
49367+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
49368+ unsigned int len;
49369+ char *tmp;
49370+ __u32 num_objs;
49371+ struct acl_ip_label **i_tmp, *i_utmp2;
49372+ struct gr_hash_struct ghash;
49373+ struct subject_map *subjmap;
49374+ unsigned int i_num;
49375+ int err;
49376+
49377+ s_tmp = lookup_subject_map(userp);
49378+
49379+ /* we've already copied this subject into the kernel, just return
49380+ the reference to it, and don't copy it over again
49381+ */
49382+ if (s_tmp)
49383+ return(s_tmp);
49384+
49385+ if ((s_tmp = (struct acl_subject_label *)
49386+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
49387+ return ERR_PTR(-ENOMEM);
49388+
49389+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
49390+ if (subjmap == NULL)
49391+ return ERR_PTR(-ENOMEM);
49392+
49393+ subjmap->user = userp;
49394+ subjmap->kernel = s_tmp;
49395+ insert_subj_map_entry(subjmap);
49396+
49397+ if (copy_from_user(s_tmp, userp,
49398+ sizeof (struct acl_subject_label)))
49399+ return ERR_PTR(-EFAULT);
49400+
49401+ len = strnlen_user(s_tmp->filename, PATH_MAX);
49402+
49403+ if (!len || len >= PATH_MAX)
49404+ return ERR_PTR(-EINVAL);
49405+
49406+ if ((tmp = (char *) acl_alloc(len)) == NULL)
49407+ return ERR_PTR(-ENOMEM);
49408+
49409+ if (copy_from_user(tmp, s_tmp->filename, len))
49410+ return ERR_PTR(-EFAULT);
49411+ tmp[len-1] = '\0';
49412+ s_tmp->filename = tmp;
49413+
49414+ if (!strcmp(s_tmp->filename, "/"))
49415+ role->root_label = s_tmp;
49416+
49417+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
49418+ return ERR_PTR(-EFAULT);
49419+
49420+ /* copy user and group transition tables */
49421+
49422+ if (s_tmp->user_trans_num) {
49423+ uid_t *uidlist;
49424+
49425+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
49426+ if (uidlist == NULL)
49427+ return ERR_PTR(-ENOMEM);
49428+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
49429+ return ERR_PTR(-EFAULT);
49430+
49431+ s_tmp->user_transitions = uidlist;
49432+ }
49433+
49434+ if (s_tmp->group_trans_num) {
49435+ gid_t *gidlist;
49436+
49437+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
49438+ if (gidlist == NULL)
49439+ return ERR_PTR(-ENOMEM);
49440+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
49441+ return ERR_PTR(-EFAULT);
49442+
49443+ s_tmp->group_transitions = gidlist;
49444+ }
49445+
49446+ /* set up object hash table */
49447+ num_objs = count_user_objs(ghash.first);
49448+
49449+ s_tmp->obj_hash_size = num_objs;
49450+ s_tmp->obj_hash =
49451+ (struct acl_object_label **)
49452+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
49453+
49454+ if (!s_tmp->obj_hash)
49455+ return ERR_PTR(-ENOMEM);
49456+
49457+ memset(s_tmp->obj_hash, 0,
49458+ s_tmp->obj_hash_size *
49459+ sizeof (struct acl_object_label *));
49460+
49461+ /* add in objects */
49462+ err = copy_user_objs(ghash.first, s_tmp, role);
49463+
49464+ if (err)
49465+ return ERR_PTR(err);
49466+
49467+ /* set pointer for parent subject */
49468+ if (s_tmp->parent_subject) {
49469+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
49470+
49471+ if (IS_ERR(s_tmp2))
49472+ return s_tmp2;
49473+
49474+ s_tmp->parent_subject = s_tmp2;
49475+ }
49476+
49477+ /* add in ip acls */
49478+
49479+ if (!s_tmp->ip_num) {
49480+ s_tmp->ips = NULL;
49481+ goto insert;
49482+ }
49483+
49484+ i_tmp =
49485+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
49486+ sizeof (struct acl_ip_label *));
49487+
49488+ if (!i_tmp)
49489+ return ERR_PTR(-ENOMEM);
49490+
49491+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
49492+ *(i_tmp + i_num) =
49493+ (struct acl_ip_label *)
49494+ acl_alloc(sizeof (struct acl_ip_label));
49495+ if (!*(i_tmp + i_num))
49496+ return ERR_PTR(-ENOMEM);
49497+
49498+ if (copy_from_user
49499+ (&i_utmp2, s_tmp->ips + i_num,
49500+ sizeof (struct acl_ip_label *)))
49501+ return ERR_PTR(-EFAULT);
49502+
49503+ if (copy_from_user
49504+ (*(i_tmp + i_num), i_utmp2,
49505+ sizeof (struct acl_ip_label)))
49506+ return ERR_PTR(-EFAULT);
49507+
49508+ if ((*(i_tmp + i_num))->iface == NULL)
49509+ continue;
49510+
49511+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
49512+ if (!len || len >= IFNAMSIZ)
49513+ return ERR_PTR(-EINVAL);
49514+ tmp = acl_alloc(len);
49515+ if (tmp == NULL)
49516+ return ERR_PTR(-ENOMEM);
49517+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
49518+ return ERR_PTR(-EFAULT);
49519+ (*(i_tmp + i_num))->iface = tmp;
49520+ }
49521+
49522+ s_tmp->ips = i_tmp;
49523+
49524+insert:
49525+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
49526+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
49527+ return ERR_PTR(-ENOMEM);
49528+
49529+ return s_tmp;
49530+}
49531+
49532+static int
49533+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
49534+{
49535+ struct acl_subject_label s_pre;
49536+ struct acl_subject_label * ret;
49537+ int err;
49538+
49539+ while (userp) {
49540+ if (copy_from_user(&s_pre, userp,
49541+ sizeof (struct acl_subject_label)))
49542+ return -EFAULT;
49543+
49544+ /* do not add nested subjects here, add
49545+ while parsing objects
49546+ */
49547+
49548+ if (s_pre.mode & GR_NESTED) {
49549+ userp = s_pre.prev;
49550+ continue;
49551+ }
49552+
49553+ ret = do_copy_user_subj(userp, role);
49554+
49555+ err = PTR_ERR(ret);
49556+ if (IS_ERR(ret))
49557+ return err;
49558+
49559+ insert_acl_subj_label(ret, role);
49560+
49561+ userp = s_pre.prev;
49562+ }
49563+
49564+ return 0;
49565+}
49566+
49567+static int
49568+copy_user_acl(struct gr_arg *arg)
49569+{
49570+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
49571+ struct sprole_pw *sptmp;
49572+ struct gr_hash_struct *ghash;
49573+ uid_t *domainlist;
49574+ unsigned int r_num;
49575+ unsigned int len;
49576+ char *tmp;
49577+ int err = 0;
49578+ __u16 i;
49579+ __u32 num_subjs;
49580+
49581+ /* we need a default and kernel role */
49582+ if (arg->role_db.num_roles < 2)
49583+ return -EINVAL;
49584+
49585+ /* copy special role authentication info from userspace */
49586+
49587+ num_sprole_pws = arg->num_sprole_pws;
49588+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
49589+
49590+ if (!acl_special_roles) {
49591+ err = -ENOMEM;
49592+ goto cleanup;
49593+ }
49594+
49595+ for (i = 0; i < num_sprole_pws; i++) {
49596+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
49597+ if (!sptmp) {
49598+ err = -ENOMEM;
49599+ goto cleanup;
49600+ }
49601+ if (copy_from_user(sptmp, arg->sprole_pws + i,
49602+ sizeof (struct sprole_pw))) {
49603+ err = -EFAULT;
49604+ goto cleanup;
49605+ }
49606+
49607+ len =
49608+ strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
49609+
49610+ if (!len || len >= GR_SPROLE_LEN) {
49611+ err = -EINVAL;
49612+ goto cleanup;
49613+ }
49614+
49615+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
49616+ err = -ENOMEM;
49617+ goto cleanup;
49618+ }
49619+
49620+ if (copy_from_user(tmp, sptmp->rolename, len)) {
49621+ err = -EFAULT;
49622+ goto cleanup;
49623+ }
49624+ tmp[len-1] = '\0';
49625+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
49626+ printk(KERN_ALERT "Copying special role %s\n", tmp);
49627+#endif
49628+ sptmp->rolename = tmp;
49629+ acl_special_roles[i] = sptmp;
49630+ }
49631+
49632+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
49633+
49634+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
49635+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
49636+
49637+ if (!r_tmp) {
49638+ err = -ENOMEM;
49639+ goto cleanup;
49640+ }
49641+
49642+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
49643+ sizeof (struct acl_role_label *))) {
49644+ err = -EFAULT;
49645+ goto cleanup;
49646+ }
49647+
49648+ if (copy_from_user(r_tmp, r_utmp2,
49649+ sizeof (struct acl_role_label))) {
49650+ err = -EFAULT;
49651+ goto cleanup;
49652+ }
49653+
49654+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
49655+
49656+ if (!len || len >= PATH_MAX) {
49657+ err = -EINVAL;
49658+ goto cleanup;
49659+ }
49660+
49661+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
49662+ err = -ENOMEM;
49663+ goto cleanup;
49664+ }
49665+ if (copy_from_user(tmp, r_tmp->rolename, len)) {
49666+ err = -EFAULT;
49667+ goto cleanup;
49668+ }
49669+ tmp[len-1] = '\0';
49670+ r_tmp->rolename = tmp;
49671+
49672+ if (!strcmp(r_tmp->rolename, "default")
49673+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
49674+ default_role = r_tmp;
49675+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
49676+ kernel_role = r_tmp;
49677+ }
49678+
49679+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
49680+ err = -ENOMEM;
49681+ goto cleanup;
49682+ }
49683+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
49684+ err = -EFAULT;
49685+ goto cleanup;
49686+ }
49687+
49688+ r_tmp->hash = ghash;
49689+
49690+ num_subjs = count_user_subjs(r_tmp->hash->first);
49691+
49692+ r_tmp->subj_hash_size = num_subjs;
49693+ r_tmp->subj_hash =
49694+ (struct acl_subject_label **)
49695+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
49696+
49697+ if (!r_tmp->subj_hash) {
49698+ err = -ENOMEM;
49699+ goto cleanup;
49700+ }
49701+
49702+ err = copy_user_allowedips(r_tmp);
49703+ if (err)
49704+ goto cleanup;
49705+
49706+ /* copy domain info */
49707+ if (r_tmp->domain_children != NULL) {
49708+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
49709+ if (domainlist == NULL) {
49710+ err = -ENOMEM;
49711+ goto cleanup;
49712+ }
49713+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
49714+ err = -EFAULT;
49715+ goto cleanup;
49716+ }
49717+ r_tmp->domain_children = domainlist;
49718+ }
49719+
49720+ err = copy_user_transitions(r_tmp);
49721+ if (err)
49722+ goto cleanup;
49723+
49724+ memset(r_tmp->subj_hash, 0,
49725+ r_tmp->subj_hash_size *
49726+ sizeof (struct acl_subject_label *));
49727+
49728+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
49729+
49730+ if (err)
49731+ goto cleanup;
49732+
49733+ /* set nested subject list to null */
49734+ r_tmp->hash->first = NULL;
49735+
49736+ insert_acl_role_label(r_tmp);
49737+ }
49738+
49739+ goto return_err;
49740+ cleanup:
49741+ free_variables();
49742+ return_err:
49743+ return err;
49744+
49745+}
49746+
49747+static int
49748+gracl_init(struct gr_arg *args)
49749+{
49750+ int error = 0;
49751+
49752+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
49753+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
49754+
49755+ if (init_variables(args)) {
49756+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
49757+ error = -ENOMEM;
49758+ free_variables();
49759+ goto out;
49760+ }
49761+
49762+ error = copy_user_acl(args);
49763+ free_init_variables();
49764+ if (error) {
49765+ free_variables();
49766+ goto out;
49767+ }
49768+
49769+ if ((error = gr_set_acls(0))) {
49770+ free_variables();
49771+ goto out;
49772+ }
49773+
49774+ pax_open_kernel();
49775+ gr_status |= GR_READY;
49776+ pax_close_kernel();
49777+
49778+ out:
49779+ return error;
49780+}
49781+
49782+/* derived from glibc fnmatch() 0: match, 1: no match*/
49783+
49784+static int
49785+glob_match(const char *p, const char *n)
49786+{
49787+ char c;
49788+
49789+ while ((c = *p++) != '\0') {
49790+ switch (c) {
49791+ case '?':
49792+ if (*n == '\0')
49793+ return 1;
49794+ else if (*n == '/')
49795+ return 1;
49796+ break;
49797+ case '\\':
49798+ if (*n != c)
49799+ return 1;
49800+ break;
49801+ case '*':
49802+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
49803+ if (*n == '/')
49804+ return 1;
49805+ else if (c == '?') {
49806+ if (*n == '\0')
49807+ return 1;
49808+ else
49809+ ++n;
49810+ }
49811+ }
49812+ if (c == '\0') {
49813+ return 0;
49814+ } else {
49815+ const char *endp;
49816+
49817+ if ((endp = strchr(n, '/')) == NULL)
49818+ endp = n + strlen(n);
49819+
49820+ if (c == '[') {
49821+ for (--p; n < endp; ++n)
49822+ if (!glob_match(p, n))
49823+ return 0;
49824+ } else if (c == '/') {
49825+ while (*n != '\0' && *n != '/')
49826+ ++n;
49827+ if (*n == '/' && !glob_match(p, n + 1))
49828+ return 0;
49829+ } else {
49830+ for (--p; n < endp; ++n)
49831+ if (*n == c && !glob_match(p, n))
49832+ return 0;
49833+ }
49834+
49835+ return 1;
49836+ }
49837+ case '[':
49838+ {
49839+ int not;
49840+ char cold;
49841+
49842+ if (*n == '\0' || *n == '/')
49843+ return 1;
49844+
49845+ not = (*p == '!' || *p == '^');
49846+ if (not)
49847+ ++p;
49848+
49849+ c = *p++;
49850+ for (;;) {
49851+ unsigned char fn = (unsigned char)*n;
49852+
49853+ if (c == '\0')
49854+ return 1;
49855+ else {
49856+ if (c == fn)
49857+ goto matched;
49858+ cold = c;
49859+ c = *p++;
49860+
49861+ if (c == '-' && *p != ']') {
49862+ unsigned char cend = *p++;
49863+
49864+ if (cend == '\0')
49865+ return 1;
49866+
49867+ if (cold <= fn && fn <= cend)
49868+ goto matched;
49869+
49870+ c = *p++;
49871+ }
49872+ }
49873+
49874+ if (c == ']')
49875+ break;
49876+ }
49877+ if (!not)
49878+ return 1;
49879+ break;
49880+ matched:
49881+ while (c != ']') {
49882+ if (c == '\0')
49883+ return 1;
49884+
49885+ c = *p++;
49886+ }
49887+ if (not)
49888+ return 1;
49889+ }
49890+ break;
49891+ default:
49892+ if (c != *n)
49893+ return 1;
49894+ }
49895+
49896+ ++n;
49897+ }
49898+
49899+ if (*n == '\0')
49900+ return 0;
49901+
49902+ if (*n == '/')
49903+ return 0;
49904+
49905+ return 1;
49906+}
49907+
49908+static struct acl_object_label *
49909+chk_glob_label(struct acl_object_label *globbed,
49910+ struct dentry *dentry, struct vfsmount *mnt, char **path)
49911+{
49912+ struct acl_object_label *tmp;
49913+
49914+ if (*path == NULL)
49915+ *path = gr_to_filename_nolock(dentry, mnt);
49916+
49917+ tmp = globbed;
49918+
49919+ while (tmp) {
49920+ if (!glob_match(tmp->filename, *path))
49921+ return tmp;
49922+ tmp = tmp->next;
49923+ }
49924+
49925+ return NULL;
49926+}
49927+
49928+static struct acl_object_label *
49929+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
49930+ const ino_t curr_ino, const dev_t curr_dev,
49931+ const struct acl_subject_label *subj, char **path, const int checkglob)
49932+{
49933+ struct acl_subject_label *tmpsubj;
49934+ struct acl_object_label *retval;
49935+ struct acl_object_label *retval2;
49936+
49937+ tmpsubj = (struct acl_subject_label *) subj;
49938+ read_lock(&gr_inode_lock);
49939+ do {
49940+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
49941+ if (retval) {
49942+ if (checkglob && retval->globbed) {
49943+ retval2 = chk_glob_label(retval->globbed, (struct dentry *)orig_dentry,
49944+ (struct vfsmount *)orig_mnt, path);
49945+ if (retval2)
49946+ retval = retval2;
49947+ }
49948+ break;
49949+ }
49950+ } while ((tmpsubj = tmpsubj->parent_subject));
49951+ read_unlock(&gr_inode_lock);
49952+
49953+ return retval;
49954+}
49955+
49956+static __inline__ struct acl_object_label *
49957+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
49958+ struct dentry *curr_dentry,
49959+ const struct acl_subject_label *subj, char **path, const int checkglob)
49960+{
49961+ int newglob = checkglob;
49962+ ino_t inode;
49963+ dev_t device;
49964+
49965+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
49966+ as we don't want a / * rule to match instead of the / object
49967+ don't do this for create lookups that call this function though, since they're looking up
49968+ on the parent and thus need globbing checks on all paths
49969+ */
49970+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
49971+ newglob = GR_NO_GLOB;
49972+
49973+ spin_lock(&curr_dentry->d_lock);
49974+ inode = curr_dentry->d_inode->i_ino;
49975+ device = __get_dev(curr_dentry);
49976+ spin_unlock(&curr_dentry->d_lock);
49977+
49978+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
49979+}
49980+
49981+static struct acl_object_label *
49982+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
49983+ const struct acl_subject_label *subj, char *path, const int checkglob)
49984+{
49985+ struct dentry *dentry = (struct dentry *) l_dentry;
49986+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
49987+ struct acl_object_label *retval;
49988+ struct dentry *parent;
49989+
49990+ write_seqlock(&rename_lock);
49991+ br_read_lock(vfsmount_lock);
49992+
49993+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
49994+#ifdef CONFIG_NET
49995+ mnt == sock_mnt ||
49996+#endif
49997+#ifdef CONFIG_HUGETLBFS
49998+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
49999+#endif
50000+ /* ignore Eric Biederman */
50001+ IS_PRIVATE(l_dentry->d_inode))) {
50002+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
50003+ goto out;
50004+ }
50005+
50006+ for (;;) {
50007+ if (dentry == real_root.dentry && mnt == real_root.mnt)
50008+ break;
50009+
50010+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
50011+ if (mnt->mnt_parent == mnt)
50012+ break;
50013+
50014+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
50015+ if (retval != NULL)
50016+ goto out;
50017+
50018+ dentry = mnt->mnt_mountpoint;
50019+ mnt = mnt->mnt_parent;
50020+ continue;
50021+ }
50022+
50023+ parent = dentry->d_parent;
50024+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
50025+ if (retval != NULL)
50026+ goto out;
50027+
50028+ dentry = parent;
50029+ }
50030+
50031+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
50032+
50033+ /* real_root is pinned so we don't have to hold a reference */
50034+ if (retval == NULL)
50035+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
50036+out:
50037+ br_read_unlock(vfsmount_lock);
50038+ write_sequnlock(&rename_lock);
50039+
50040+ BUG_ON(retval == NULL);
50041+
50042+ return retval;
50043+}
50044+
50045+static __inline__ struct acl_object_label *
50046+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50047+ const struct acl_subject_label *subj)
50048+{
50049+ char *path = NULL;
50050+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
50051+}
50052+
50053+static __inline__ struct acl_object_label *
50054+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50055+ const struct acl_subject_label *subj)
50056+{
50057+ char *path = NULL;
50058+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
50059+}
50060+
50061+static __inline__ struct acl_object_label *
50062+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50063+ const struct acl_subject_label *subj, char *path)
50064+{
50065+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
50066+}
50067+
50068+static struct acl_subject_label *
50069+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50070+ const struct acl_role_label *role)
50071+{
50072+ struct dentry *dentry = (struct dentry *) l_dentry;
50073+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
50074+ struct acl_subject_label *retval;
50075+ struct dentry *parent;
50076+
50077+ write_seqlock(&rename_lock);
50078+ br_read_lock(vfsmount_lock);
50079+
50080+ for (;;) {
50081+ if (dentry == real_root.dentry && mnt == real_root.mnt)
50082+ break;
50083+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
50084+ if (mnt->mnt_parent == mnt)
50085+ break;
50086+
50087+ spin_lock(&dentry->d_lock);
50088+ read_lock(&gr_inode_lock);
50089+ retval =
50090+ lookup_acl_subj_label(dentry->d_inode->i_ino,
50091+ __get_dev(dentry), role);
50092+ read_unlock(&gr_inode_lock);
50093+ spin_unlock(&dentry->d_lock);
50094+ if (retval != NULL)
50095+ goto out;
50096+
50097+ dentry = mnt->mnt_mountpoint;
50098+ mnt = mnt->mnt_parent;
50099+ continue;
50100+ }
50101+
50102+ spin_lock(&dentry->d_lock);
50103+ read_lock(&gr_inode_lock);
50104+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
50105+ __get_dev(dentry), role);
50106+ read_unlock(&gr_inode_lock);
50107+ parent = dentry->d_parent;
50108+ spin_unlock(&dentry->d_lock);
50109+
50110+ if (retval != NULL)
50111+ goto out;
50112+
50113+ dentry = parent;
50114+ }
50115+
50116+ spin_lock(&dentry->d_lock);
50117+ read_lock(&gr_inode_lock);
50118+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
50119+ __get_dev(dentry), role);
50120+ read_unlock(&gr_inode_lock);
50121+ spin_unlock(&dentry->d_lock);
50122+
50123+ if (unlikely(retval == NULL)) {
50124+ /* real_root is pinned, we don't need to hold a reference */
50125+ read_lock(&gr_inode_lock);
50126+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
50127+ __get_dev(real_root.dentry), role);
50128+ read_unlock(&gr_inode_lock);
50129+ }
50130+out:
50131+ br_read_unlock(vfsmount_lock);
50132+ write_sequnlock(&rename_lock);
50133+
50134+ BUG_ON(retval == NULL);
50135+
50136+ return retval;
50137+}
50138+
50139+static void
50140+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
50141+{
50142+ struct task_struct *task = current;
50143+ const struct cred *cred = current_cred();
50144+
50145+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
50146+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
50147+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
50148+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
50149+
50150+ return;
50151+}
50152+
50153+static void
50154+gr_log_learn_sysctl(const char *path, const __u32 mode)
50155+{
50156+ struct task_struct *task = current;
50157+ const struct cred *cred = current_cred();
50158+
50159+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
50160+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
50161+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
50162+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
50163+
50164+ return;
50165+}
50166+
50167+static void
50168+gr_log_learn_id_change(const char type, const unsigned int real,
50169+ const unsigned int effective, const unsigned int fs)
50170+{
50171+ struct task_struct *task = current;
50172+ const struct cred *cred = current_cred();
50173+
50174+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
50175+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
50176+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
50177+ type, real, effective, fs, &task->signal->saved_ip);
50178+
50179+ return;
50180+}
50181+
50182+__u32
50183+gr_search_file(const struct dentry * dentry, const __u32 mode,
50184+ const struct vfsmount * mnt)
50185+{
50186+ __u32 retval = mode;
50187+ struct acl_subject_label *curracl;
50188+ struct acl_object_label *currobj;
50189+
50190+ if (unlikely(!(gr_status & GR_READY)))
50191+ return (mode & ~GR_AUDITS);
50192+
50193+ curracl = current->acl;
50194+
50195+ currobj = chk_obj_label(dentry, mnt, curracl);
50196+ retval = currobj->mode & mode;
50197+
50198+ /* if we're opening a specified transfer file for writing
50199+ (e.g. /dev/initctl), then transfer our role to init
50200+ */
50201+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
50202+ current->role->roletype & GR_ROLE_PERSIST)) {
50203+ struct task_struct *task = init_pid_ns.child_reaper;
50204+
50205+ if (task->role != current->role) {
50206+ task->acl_sp_role = 0;
50207+ task->acl_role_id = current->acl_role_id;
50208+ task->role = current->role;
50209+ rcu_read_lock();
50210+ read_lock(&grsec_exec_file_lock);
50211+ gr_apply_subject_to_task(task);
50212+ read_unlock(&grsec_exec_file_lock);
50213+ rcu_read_unlock();
50214+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
50215+ }
50216+ }
50217+
50218+ if (unlikely
50219+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
50220+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
50221+ __u32 new_mode = mode;
50222+
50223+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
50224+
50225+ retval = new_mode;
50226+
50227+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
50228+ new_mode |= GR_INHERIT;
50229+
50230+ if (!(mode & GR_NOLEARN))
50231+ gr_log_learn(dentry, mnt, new_mode);
50232+ }
50233+
50234+ return retval;
50235+}
50236+
50237+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
50238+ const struct dentry *parent,
50239+ const struct vfsmount *mnt)
50240+{
50241+ struct name_entry *match;
50242+ struct acl_object_label *matchpo;
50243+ struct acl_subject_label *curracl;
50244+ char *path;
50245+
50246+ if (unlikely(!(gr_status & GR_READY)))
50247+ return NULL;
50248+
50249+ preempt_disable();
50250+ path = gr_to_filename_rbac(new_dentry, mnt);
50251+ match = lookup_name_entry_create(path);
50252+
50253+ curracl = current->acl;
50254+
50255+ if (match) {
50256+ read_lock(&gr_inode_lock);
50257+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
50258+ read_unlock(&gr_inode_lock);
50259+
50260+ if (matchpo) {
50261+ preempt_enable();
50262+ return matchpo;
50263+ }
50264+ }
50265+
50266+ // lookup parent
50267+
50268+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
50269+
50270+ preempt_enable();
50271+ return matchpo;
50272+}
50273+
50274+__u32
50275+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
50276+ const struct vfsmount * mnt, const __u32 mode)
50277+{
50278+ struct acl_object_label *matchpo;
50279+ __u32 retval;
50280+
50281+ if (unlikely(!(gr_status & GR_READY)))
50282+ return (mode & ~GR_AUDITS);
50283+
50284+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
50285+
50286+ retval = matchpo->mode & mode;
50287+
50288+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
50289+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
50290+ __u32 new_mode = mode;
50291+
50292+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
50293+
50294+ gr_log_learn(new_dentry, mnt, new_mode);
50295+ return new_mode;
50296+ }
50297+
50298+ return retval;
50299+}
50300+
50301+__u32
50302+gr_check_link(const struct dentry * new_dentry,
50303+ const struct dentry * parent_dentry,
50304+ const struct vfsmount * parent_mnt,
50305+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
50306+{
50307+ struct acl_object_label *obj;
50308+ __u32 oldmode, newmode;
50309+ __u32 needmode;
50310+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
50311+ GR_DELETE | GR_INHERIT;
50312+
50313+ if (unlikely(!(gr_status & GR_READY)))
50314+ return (GR_CREATE | GR_LINK);
50315+
50316+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
50317+ oldmode = obj->mode;
50318+
50319+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
50320+ newmode = obj->mode;
50321+
50322+ needmode = newmode & checkmodes;
50323+
50324+ // old name for hardlink must have at least the permissions of the new name
50325+ if ((oldmode & needmode) != needmode)
50326+ goto bad;
50327+
50328+ // if old name had restrictions/auditing, make sure the new name does as well
50329+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
50330+
50331+ // don't allow hardlinking of suid/sgid files without permission
50332+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
50333+ needmode |= GR_SETID;
50334+
50335+ if ((newmode & needmode) != needmode)
50336+ goto bad;
50337+
50338+ // enforce minimum permissions
50339+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
50340+ return newmode;
50341+bad:
50342+ needmode = oldmode;
50343+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
50344+ needmode |= GR_SETID;
50345+
50346+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
50347+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
50348+ return (GR_CREATE | GR_LINK);
50349+ } else if (newmode & GR_SUPPRESS)
50350+ return GR_SUPPRESS;
50351+ else
50352+ return 0;
50353+}
50354+
50355+int
50356+gr_check_hidden_task(const struct task_struct *task)
50357+{
50358+ if (unlikely(!(gr_status & GR_READY)))
50359+ return 0;
50360+
50361+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
50362+ return 1;
50363+
50364+ return 0;
50365+}
50366+
50367+int
50368+gr_check_protected_task(const struct task_struct *task)
50369+{
50370+ if (unlikely(!(gr_status & GR_READY) || !task))
50371+ return 0;
50372+
50373+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
50374+ task->acl != current->acl)
50375+ return 1;
50376+
50377+ return 0;
50378+}
50379+
50380+int
50381+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
50382+{
50383+ struct task_struct *p;
50384+ int ret = 0;
50385+
50386+ if (unlikely(!(gr_status & GR_READY) || !pid))
50387+ return ret;
50388+
50389+ read_lock(&tasklist_lock);
50390+ do_each_pid_task(pid, type, p) {
50391+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
50392+ p->acl != current->acl) {
50393+ ret = 1;
50394+ goto out;
50395+ }
50396+ } while_each_pid_task(pid, type, p);
50397+out:
50398+ read_unlock(&tasklist_lock);
50399+
50400+ return ret;
50401+}
50402+
50403+void
50404+gr_copy_label(struct task_struct *tsk)
50405+{
50406+ tsk->signal->used_accept = 0;
50407+ tsk->acl_sp_role = 0;
50408+ tsk->acl_role_id = current->acl_role_id;
50409+ tsk->acl = current->acl;
50410+ tsk->role = current->role;
50411+ tsk->signal->curr_ip = current->signal->curr_ip;
50412+ tsk->signal->saved_ip = current->signal->saved_ip;
50413+ if (current->exec_file)
50414+ get_file(current->exec_file);
50415+ tsk->exec_file = current->exec_file;
50416+ tsk->is_writable = current->is_writable;
50417+ if (unlikely(current->signal->used_accept)) {
50418+ current->signal->curr_ip = 0;
50419+ current->signal->saved_ip = 0;
50420+ }
50421+
50422+ return;
50423+}
50424+
50425+static void
50426+gr_set_proc_res(struct task_struct *task)
50427+{
50428+ struct acl_subject_label *proc;
50429+ unsigned short i;
50430+
50431+ proc = task->acl;
50432+
50433+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
50434+ return;
50435+
50436+ for (i = 0; i < RLIM_NLIMITS; i++) {
50437+ if (!(proc->resmask & (1 << i)))
50438+ continue;
50439+
50440+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
50441+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
50442+ }
50443+
50444+ return;
50445+}
50446+
50447+extern int __gr_process_user_ban(struct user_struct *user);
50448+
50449+int
50450+gr_check_user_change(int real, int effective, int fs)
50451+{
50452+ unsigned int i;
50453+ __u16 num;
50454+ uid_t *uidlist;
50455+ int curuid;
50456+ int realok = 0;
50457+ int effectiveok = 0;
50458+ int fsok = 0;
50459+
50460+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
50461+ struct user_struct *user;
50462+
50463+ if (real == -1)
50464+ goto skipit;
50465+
50466+ user = find_user(real);
50467+ if (user == NULL)
50468+ goto skipit;
50469+
50470+ if (__gr_process_user_ban(user)) {
50471+ /* for find_user */
50472+ free_uid(user);
50473+ return 1;
50474+ }
50475+
50476+ /* for find_user */
50477+ free_uid(user);
50478+
50479+skipit:
50480+#endif
50481+
50482+ if (unlikely(!(gr_status & GR_READY)))
50483+ return 0;
50484+
50485+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
50486+ gr_log_learn_id_change('u', real, effective, fs);
50487+
50488+ num = current->acl->user_trans_num;
50489+ uidlist = current->acl->user_transitions;
50490+
50491+ if (uidlist == NULL)
50492+ return 0;
50493+
50494+ if (real == -1)
50495+ realok = 1;
50496+ if (effective == -1)
50497+ effectiveok = 1;
50498+ if (fs == -1)
50499+ fsok = 1;
50500+
50501+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
50502+ for (i = 0; i < num; i++) {
50503+ curuid = (int)uidlist[i];
50504+ if (real == curuid)
50505+ realok = 1;
50506+ if (effective == curuid)
50507+ effectiveok = 1;
50508+ if (fs == curuid)
50509+ fsok = 1;
50510+ }
50511+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
50512+ for (i = 0; i < num; i++) {
50513+ curuid = (int)uidlist[i];
50514+ if (real == curuid)
50515+ break;
50516+ if (effective == curuid)
50517+ break;
50518+ if (fs == curuid)
50519+ break;
50520+ }
50521+ /* not in deny list */
50522+ if (i == num) {
50523+ realok = 1;
50524+ effectiveok = 1;
50525+ fsok = 1;
50526+ }
50527+ }
50528+
50529+ if (realok && effectiveok && fsok)
50530+ return 0;
50531+ else {
50532+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
50533+ return 1;
50534+ }
50535+}
50536+
50537+int
50538+gr_check_group_change(int real, int effective, int fs)
50539+{
50540+ unsigned int i;
50541+ __u16 num;
50542+ gid_t *gidlist;
50543+ int curgid;
50544+ int realok = 0;
50545+ int effectiveok = 0;
50546+ int fsok = 0;
50547+
50548+ if (unlikely(!(gr_status & GR_READY)))
50549+ return 0;
50550+
50551+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
50552+ gr_log_learn_id_change('g', real, effective, fs);
50553+
50554+ num = current->acl->group_trans_num;
50555+ gidlist = current->acl->group_transitions;
50556+
50557+ if (gidlist == NULL)
50558+ return 0;
50559+
50560+ if (real == -1)
50561+ realok = 1;
50562+ if (effective == -1)
50563+ effectiveok = 1;
50564+ if (fs == -1)
50565+ fsok = 1;
50566+
50567+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
50568+ for (i = 0; i < num; i++) {
50569+ curgid = (int)gidlist[i];
50570+ if (real == curgid)
50571+ realok = 1;
50572+ if (effective == curgid)
50573+ effectiveok = 1;
50574+ if (fs == curgid)
50575+ fsok = 1;
50576+ }
50577+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
50578+ for (i = 0; i < num; i++) {
50579+ curgid = (int)gidlist[i];
50580+ if (real == curgid)
50581+ break;
50582+ if (effective == curgid)
50583+ break;
50584+ if (fs == curgid)
50585+ break;
50586+ }
50587+ /* not in deny list */
50588+ if (i == num) {
50589+ realok = 1;
50590+ effectiveok = 1;
50591+ fsok = 1;
50592+ }
50593+ }
50594+
50595+ if (realok && effectiveok && fsok)
50596+ return 0;
50597+ else {
50598+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
50599+ return 1;
50600+ }
50601+}
50602+
50603+void
50604+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
50605+{
50606+ struct acl_role_label *role = task->role;
50607+ struct acl_subject_label *subj = NULL;
50608+ struct acl_object_label *obj;
50609+ struct file *filp;
50610+
50611+ if (unlikely(!(gr_status & GR_READY)))
50612+ return;
50613+
50614+ filp = task->exec_file;
50615+
50616+ /* kernel process, we'll give them the kernel role */
50617+ if (unlikely(!filp)) {
50618+ task->role = kernel_role;
50619+ task->acl = kernel_role->root_label;
50620+ return;
50621+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
50622+ role = lookup_acl_role_label(task, uid, gid);
50623+
50624+ /* perform subject lookup in possibly new role
50625+ we can use this result below in the case where role == task->role
50626+ */
50627+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
50628+
50629+ /* if we changed uid/gid, but result in the same role
50630+ and are using inheritance, don't lose the inherited subject
50631+ if current subject is other than what normal lookup
50632+ would result in, we arrived via inheritance, don't
50633+ lose subject
50634+ */
50635+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
50636+ (subj == task->acl)))
50637+ task->acl = subj;
50638+
50639+ task->role = role;
50640+
50641+ task->is_writable = 0;
50642+
50643+ /* ignore additional mmap checks for processes that are writable
50644+ by the default ACL */
50645+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
50646+ if (unlikely(obj->mode & GR_WRITE))
50647+ task->is_writable = 1;
50648+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
50649+ if (unlikely(obj->mode & GR_WRITE))
50650+ task->is_writable = 1;
50651+
50652+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
50653+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
50654+#endif
50655+
50656+ gr_set_proc_res(task);
50657+
50658+ return;
50659+}
50660+
50661+int
50662+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
50663+ const int unsafe_flags)
50664+{
50665+ struct task_struct *task = current;
50666+ struct acl_subject_label *newacl;
50667+ struct acl_object_label *obj;
50668+ __u32 retmode;
50669+
50670+ if (unlikely(!(gr_status & GR_READY)))
50671+ return 0;
50672+
50673+ newacl = chk_subj_label(dentry, mnt, task->role);
50674+
50675+ task_lock(task);
50676+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
50677+ !(task->role->roletype & GR_ROLE_GOD) &&
50678+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
50679+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
50680+ task_unlock(task);
50681+ if (unsafe_flags & LSM_UNSAFE_SHARE)
50682+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
50683+ else
50684+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
50685+ return -EACCES;
50686+ }
50687+ task_unlock(task);
50688+
50689+ obj = chk_obj_label(dentry, mnt, task->acl);
50690+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
50691+
50692+ if (!(task->acl->mode & GR_INHERITLEARN) &&
50693+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
50694+ if (obj->nested)
50695+ task->acl = obj->nested;
50696+ else
50697+ task->acl = newacl;
50698+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
50699+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
50700+
50701+ task->is_writable = 0;
50702+
50703+ /* ignore additional mmap checks for processes that are writable
50704+ by the default ACL */
50705+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
50706+ if (unlikely(obj->mode & GR_WRITE))
50707+ task->is_writable = 1;
50708+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
50709+ if (unlikely(obj->mode & GR_WRITE))
50710+ task->is_writable = 1;
50711+
50712+ gr_set_proc_res(task);
50713+
50714+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
50715+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
50716+#endif
50717+ return 0;
50718+}
50719+
50720+/* always called with valid inodev ptr */
50721+static void
50722+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
50723+{
50724+ struct acl_object_label *matchpo;
50725+ struct acl_subject_label *matchps;
50726+ struct acl_subject_label *subj;
50727+ struct acl_role_label *role;
50728+ unsigned int x;
50729+
50730+ FOR_EACH_ROLE_START(role)
50731+ FOR_EACH_SUBJECT_START(role, subj, x)
50732+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
50733+ matchpo->mode |= GR_DELETED;
50734+ FOR_EACH_SUBJECT_END(subj,x)
50735+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
50736+ if (subj->inode == ino && subj->device == dev)
50737+ subj->mode |= GR_DELETED;
50738+ FOR_EACH_NESTED_SUBJECT_END(subj)
50739+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
50740+ matchps->mode |= GR_DELETED;
50741+ FOR_EACH_ROLE_END(role)
50742+
50743+ inodev->nentry->deleted = 1;
50744+
50745+ return;
50746+}
50747+
50748+void
50749+gr_handle_delete(const ino_t ino, const dev_t dev)
50750+{
50751+ struct inodev_entry *inodev;
50752+
50753+ if (unlikely(!(gr_status & GR_READY)))
50754+ return;
50755+
50756+ write_lock(&gr_inode_lock);
50757+ inodev = lookup_inodev_entry(ino, dev);
50758+ if (inodev != NULL)
50759+ do_handle_delete(inodev, ino, dev);
50760+ write_unlock(&gr_inode_lock);
50761+
50762+ return;
50763+}
50764+
50765+static void
50766+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
50767+ const ino_t newinode, const dev_t newdevice,
50768+ struct acl_subject_label *subj)
50769+{
50770+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
50771+ struct acl_object_label *match;
50772+
50773+ match = subj->obj_hash[index];
50774+
50775+ while (match && (match->inode != oldinode ||
50776+ match->device != olddevice ||
50777+ !(match->mode & GR_DELETED)))
50778+ match = match->next;
50779+
50780+ if (match && (match->inode == oldinode)
50781+ && (match->device == olddevice)
50782+ && (match->mode & GR_DELETED)) {
50783+ if (match->prev == NULL) {
50784+ subj->obj_hash[index] = match->next;
50785+ if (match->next != NULL)
50786+ match->next->prev = NULL;
50787+ } else {
50788+ match->prev->next = match->next;
50789+ if (match->next != NULL)
50790+ match->next->prev = match->prev;
50791+ }
50792+ match->prev = NULL;
50793+ match->next = NULL;
50794+ match->inode = newinode;
50795+ match->device = newdevice;
50796+ match->mode &= ~GR_DELETED;
50797+
50798+ insert_acl_obj_label(match, subj);
50799+ }
50800+
50801+ return;
50802+}
50803+
50804+static void
50805+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
50806+ const ino_t newinode, const dev_t newdevice,
50807+ struct acl_role_label *role)
50808+{
50809+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
50810+ struct acl_subject_label *match;
50811+
50812+ match = role->subj_hash[index];
50813+
50814+ while (match && (match->inode != oldinode ||
50815+ match->device != olddevice ||
50816+ !(match->mode & GR_DELETED)))
50817+ match = match->next;
50818+
50819+ if (match && (match->inode == oldinode)
50820+ && (match->device == olddevice)
50821+ && (match->mode & GR_DELETED)) {
50822+ if (match->prev == NULL) {
50823+ role->subj_hash[index] = match->next;
50824+ if (match->next != NULL)
50825+ match->next->prev = NULL;
50826+ } else {
50827+ match->prev->next = match->next;
50828+ if (match->next != NULL)
50829+ match->next->prev = match->prev;
50830+ }
50831+ match->prev = NULL;
50832+ match->next = NULL;
50833+ match->inode = newinode;
50834+ match->device = newdevice;
50835+ match->mode &= ~GR_DELETED;
50836+
50837+ insert_acl_subj_label(match, role);
50838+ }
50839+
50840+ return;
50841+}
50842+
50843+static void
50844+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
50845+ const ino_t newinode, const dev_t newdevice)
50846+{
50847+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
50848+ struct inodev_entry *match;
50849+
50850+ match = inodev_set.i_hash[index];
50851+
50852+ while (match && (match->nentry->inode != oldinode ||
50853+ match->nentry->device != olddevice || !match->nentry->deleted))
50854+ match = match->next;
50855+
50856+ if (match && (match->nentry->inode == oldinode)
50857+ && (match->nentry->device == olddevice) &&
50858+ match->nentry->deleted) {
50859+ if (match->prev == NULL) {
50860+ inodev_set.i_hash[index] = match->next;
50861+ if (match->next != NULL)
50862+ match->next->prev = NULL;
50863+ } else {
50864+ match->prev->next = match->next;
50865+ if (match->next != NULL)
50866+ match->next->prev = match->prev;
50867+ }
50868+ match->prev = NULL;
50869+ match->next = NULL;
50870+ match->nentry->inode = newinode;
50871+ match->nentry->device = newdevice;
50872+ match->nentry->deleted = 0;
50873+
50874+ insert_inodev_entry(match);
50875+ }
50876+
50877+ return;
50878+}
50879+
50880+static void
50881+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
50882+{
50883+ struct acl_subject_label *subj;
50884+ struct acl_role_label *role;
50885+ unsigned int x;
50886+
50887+ FOR_EACH_ROLE_START(role)
50888+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
50889+
50890+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
50891+ if ((subj->inode == ino) && (subj->device == dev)) {
50892+ subj->inode = ino;
50893+ subj->device = dev;
50894+ }
50895+ FOR_EACH_NESTED_SUBJECT_END(subj)
50896+ FOR_EACH_SUBJECT_START(role, subj, x)
50897+ update_acl_obj_label(matchn->inode, matchn->device,
50898+ ino, dev, subj);
50899+ FOR_EACH_SUBJECT_END(subj,x)
50900+ FOR_EACH_ROLE_END(role)
50901+
50902+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
50903+
50904+ return;
50905+}
50906+
50907+static void
50908+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
50909+ const struct vfsmount *mnt)
50910+{
50911+ ino_t ino = dentry->d_inode->i_ino;
50912+ dev_t dev = __get_dev(dentry);
50913+
50914+ __do_handle_create(matchn, ino, dev);
50915+
50916+ return;
50917+}
50918+
50919+void
50920+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
50921+{
50922+ struct name_entry *matchn;
50923+
50924+ if (unlikely(!(gr_status & GR_READY)))
50925+ return;
50926+
50927+ preempt_disable();
50928+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
50929+
50930+ if (unlikely((unsigned long)matchn)) {
50931+ write_lock(&gr_inode_lock);
50932+ do_handle_create(matchn, dentry, mnt);
50933+ write_unlock(&gr_inode_lock);
50934+ }
50935+ preempt_enable();
50936+
50937+ return;
50938+}
50939+
50940+void
50941+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
50942+{
50943+ struct name_entry *matchn;
50944+
50945+ if (unlikely(!(gr_status & GR_READY)))
50946+ return;
50947+
50948+ preempt_disable();
50949+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
50950+
50951+ if (unlikely((unsigned long)matchn)) {
50952+ write_lock(&gr_inode_lock);
50953+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
50954+ write_unlock(&gr_inode_lock);
50955+ }
50956+ preempt_enable();
50957+
50958+ return;
50959+}
50960+
50961+void
50962+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
50963+ struct dentry *old_dentry,
50964+ struct dentry *new_dentry,
50965+ struct vfsmount *mnt, const __u8 replace)
50966+{
50967+ struct name_entry *matchn;
50968+ struct inodev_entry *inodev;
50969+ struct inode *inode = new_dentry->d_inode;
50970+ ino_t old_ino = old_dentry->d_inode->i_ino;
50971+ dev_t old_dev = __get_dev(old_dentry);
50972+
50973+ /* vfs_rename swaps the name and parent link for old_dentry and
50974+ new_dentry
50975+ at this point, old_dentry has the new name, parent link, and inode
50976+ for the renamed file
50977+ if a file is being replaced by a rename, new_dentry has the inode
50978+ and name for the replaced file
50979+ */
50980+
50981+ if (unlikely(!(gr_status & GR_READY)))
50982+ return;
50983+
50984+ preempt_disable();
50985+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
50986+
50987+ /* we wouldn't have to check d_inode if it weren't for
50988+ NFS silly-renaming
50989+ */
50990+
50991+ write_lock(&gr_inode_lock);
50992+ if (unlikely(replace && inode)) {
50993+ ino_t new_ino = inode->i_ino;
50994+ dev_t new_dev = __get_dev(new_dentry);
50995+
50996+ inodev = lookup_inodev_entry(new_ino, new_dev);
50997+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
50998+ do_handle_delete(inodev, new_ino, new_dev);
50999+ }
51000+
51001+ inodev = lookup_inodev_entry(old_ino, old_dev);
51002+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
51003+ do_handle_delete(inodev, old_ino, old_dev);
51004+
51005+ if (unlikely((unsigned long)matchn))
51006+ do_handle_create(matchn, old_dentry, mnt);
51007+
51008+ write_unlock(&gr_inode_lock);
51009+ preempt_enable();
51010+
51011+ return;
51012+}
51013+
51014+static int
51015+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
51016+ unsigned char **sum)
51017+{
51018+ struct acl_role_label *r;
51019+ struct role_allowed_ip *ipp;
51020+ struct role_transition *trans;
51021+ unsigned int i;
51022+ int found = 0;
51023+ u32 curr_ip = current->signal->curr_ip;
51024+
51025+ current->signal->saved_ip = curr_ip;
51026+
51027+ /* check transition table */
51028+
51029+ for (trans = current->role->transitions; trans; trans = trans->next) {
51030+ if (!strcmp(rolename, trans->rolename)) {
51031+ found = 1;
51032+ break;
51033+ }
51034+ }
51035+
51036+ if (!found)
51037+ return 0;
51038+
51039+ /* handle special roles that do not require authentication
51040+ and check ip */
51041+
51042+ FOR_EACH_ROLE_START(r)
51043+ if (!strcmp(rolename, r->rolename) &&
51044+ (r->roletype & GR_ROLE_SPECIAL)) {
51045+ found = 0;
51046+ if (r->allowed_ips != NULL) {
51047+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
51048+ if ((ntohl(curr_ip) & ipp->netmask) ==
51049+ (ntohl(ipp->addr) & ipp->netmask))
51050+ found = 1;
51051+ }
51052+ } else
51053+ found = 2;
51054+ if (!found)
51055+ return 0;
51056+
51057+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
51058+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
51059+ *salt = NULL;
51060+ *sum = NULL;
51061+ return 1;
51062+ }
51063+ }
51064+ FOR_EACH_ROLE_END(r)
51065+
51066+ for (i = 0; i < num_sprole_pws; i++) {
51067+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
51068+ *salt = acl_special_roles[i]->salt;
51069+ *sum = acl_special_roles[i]->sum;
51070+ return 1;
51071+ }
51072+ }
51073+
51074+ return 0;
51075+}
51076+
51077+static void
51078+assign_special_role(char *rolename)
51079+{
51080+ struct acl_object_label *obj;
51081+ struct acl_role_label *r;
51082+ struct acl_role_label *assigned = NULL;
51083+ struct task_struct *tsk;
51084+ struct file *filp;
51085+
51086+ FOR_EACH_ROLE_START(r)
51087+ if (!strcmp(rolename, r->rolename) &&
51088+ (r->roletype & GR_ROLE_SPECIAL)) {
51089+ assigned = r;
51090+ break;
51091+ }
51092+ FOR_EACH_ROLE_END(r)
51093+
51094+ if (!assigned)
51095+ return;
51096+
51097+ read_lock(&tasklist_lock);
51098+ read_lock(&grsec_exec_file_lock);
51099+
51100+ tsk = current->real_parent;
51101+ if (tsk == NULL)
51102+ goto out_unlock;
51103+
51104+ filp = tsk->exec_file;
51105+ if (filp == NULL)
51106+ goto out_unlock;
51107+
51108+ tsk->is_writable = 0;
51109+
51110+ tsk->acl_sp_role = 1;
51111+ tsk->acl_role_id = ++acl_sp_role_value;
51112+ tsk->role = assigned;
51113+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
51114+
51115+ /* ignore additional mmap checks for processes that are writable
51116+ by the default ACL */
51117+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
51118+ if (unlikely(obj->mode & GR_WRITE))
51119+ tsk->is_writable = 1;
51120+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
51121+ if (unlikely(obj->mode & GR_WRITE))
51122+ tsk->is_writable = 1;
51123+
51124+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51125+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
51126+#endif
51127+
51128+out_unlock:
51129+ read_unlock(&grsec_exec_file_lock);
51130+ read_unlock(&tasklist_lock);
51131+ return;
51132+}
51133+
51134+int gr_check_secure_terminal(struct task_struct *task)
51135+{
51136+ struct task_struct *p, *p2, *p3;
51137+ struct files_struct *files;
51138+ struct fdtable *fdt;
51139+ struct file *our_file = NULL, *file;
51140+ int i;
51141+
51142+ if (task->signal->tty == NULL)
51143+ return 1;
51144+
51145+ files = get_files_struct(task);
51146+ if (files != NULL) {
51147+ rcu_read_lock();
51148+ fdt = files_fdtable(files);
51149+ for (i=0; i < fdt->max_fds; i++) {
51150+ file = fcheck_files(files, i);
51151+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
51152+ get_file(file);
51153+ our_file = file;
51154+ }
51155+ }
51156+ rcu_read_unlock();
51157+ put_files_struct(files);
51158+ }
51159+
51160+ if (our_file == NULL)
51161+ return 1;
51162+
51163+ read_lock(&tasklist_lock);
51164+ do_each_thread(p2, p) {
51165+ files = get_files_struct(p);
51166+ if (files == NULL ||
51167+ (p->signal && p->signal->tty == task->signal->tty)) {
51168+ if (files != NULL)
51169+ put_files_struct(files);
51170+ continue;
51171+ }
51172+ rcu_read_lock();
51173+ fdt = files_fdtable(files);
51174+ for (i=0; i < fdt->max_fds; i++) {
51175+ file = fcheck_files(files, i);
51176+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
51177+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
51178+ p3 = task;
51179+ while (p3->pid > 0) {
51180+ if (p3 == p)
51181+ break;
51182+ p3 = p3->real_parent;
51183+ }
51184+ if (p3 == p)
51185+ break;
51186+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
51187+ gr_handle_alertkill(p);
51188+ rcu_read_unlock();
51189+ put_files_struct(files);
51190+ read_unlock(&tasklist_lock);
51191+ fput(our_file);
51192+ return 0;
51193+ }
51194+ }
51195+ rcu_read_unlock();
51196+ put_files_struct(files);
51197+ } while_each_thread(p2, p);
51198+ read_unlock(&tasklist_lock);
51199+
51200+ fput(our_file);
51201+ return 1;
51202+}
51203+
51204+ssize_t
51205+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
51206+{
51207+ struct gr_arg_wrapper uwrap;
51208+ unsigned char *sprole_salt = NULL;
51209+ unsigned char *sprole_sum = NULL;
51210+ int error = sizeof (struct gr_arg_wrapper);
51211+ int error2 = 0;
51212+
51213+ mutex_lock(&gr_dev_mutex);
51214+
51215+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
51216+ error = -EPERM;
51217+ goto out;
51218+ }
51219+
51220+ if (count != sizeof (struct gr_arg_wrapper)) {
51221+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
51222+ error = -EINVAL;
51223+ goto out;
51224+ }
51225+
51226+
51227+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
51228+ gr_auth_expires = 0;
51229+ gr_auth_attempts = 0;
51230+ }
51231+
51232+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
51233+ error = -EFAULT;
51234+ goto out;
51235+ }
51236+
51237+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
51238+ error = -EINVAL;
51239+ goto out;
51240+ }
51241+
51242+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
51243+ error = -EFAULT;
51244+ goto out;
51245+ }
51246+
51247+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
51248+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
51249+ time_after(gr_auth_expires, get_seconds())) {
51250+ error = -EBUSY;
51251+ goto out;
51252+ }
51253+
51254+ /* if non-root trying to do anything other than use a special role,
51255+ do not attempt authentication, do not count towards authentication
51256+ locking
51257+ */
51258+
51259+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
51260+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
51261+ current_uid()) {
51262+ error = -EPERM;
51263+ goto out;
51264+ }
51265+
51266+ /* ensure pw and special role name are null terminated */
51267+
51268+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
51269+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
51270+
51271+ /* Okay.
51272+ * We have our enough of the argument structure..(we have yet
51273+ * to copy_from_user the tables themselves) . Copy the tables
51274+ * only if we need them, i.e. for loading operations. */
51275+
51276+ switch (gr_usermode->mode) {
51277+ case GR_STATUS:
51278+ if (gr_status & GR_READY) {
51279+ error = 1;
51280+ if (!gr_check_secure_terminal(current))
51281+ error = 3;
51282+ } else
51283+ error = 2;
51284+ goto out;
51285+ case GR_SHUTDOWN:
51286+ if ((gr_status & GR_READY)
51287+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
51288+ pax_open_kernel();
51289+ gr_status &= ~GR_READY;
51290+ pax_close_kernel();
51291+
51292+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
51293+ free_variables();
51294+ memset(gr_usermode, 0, sizeof (struct gr_arg));
51295+ memset(gr_system_salt, 0, GR_SALT_LEN);
51296+ memset(gr_system_sum, 0, GR_SHA_LEN);
51297+ } else if (gr_status & GR_READY) {
51298+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
51299+ error = -EPERM;
51300+ } else {
51301+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
51302+ error = -EAGAIN;
51303+ }
51304+ break;
51305+ case GR_ENABLE:
51306+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
51307+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
51308+ else {
51309+ if (gr_status & GR_READY)
51310+ error = -EAGAIN;
51311+ else
51312+ error = error2;
51313+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
51314+ }
51315+ break;
51316+ case GR_RELOAD:
51317+ if (!(gr_status & GR_READY)) {
51318+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
51319+ error = -EAGAIN;
51320+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
51321+ preempt_disable();
51322+
51323+ pax_open_kernel();
51324+ gr_status &= ~GR_READY;
51325+ pax_close_kernel();
51326+
51327+ free_variables();
51328+ if (!(error2 = gracl_init(gr_usermode))) {
51329+ preempt_enable();
51330+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
51331+ } else {
51332+ preempt_enable();
51333+ error = error2;
51334+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
51335+ }
51336+ } else {
51337+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
51338+ error = -EPERM;
51339+ }
51340+ break;
51341+ case GR_SEGVMOD:
51342+ if (unlikely(!(gr_status & GR_READY))) {
51343+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
51344+ error = -EAGAIN;
51345+ break;
51346+ }
51347+
51348+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
51349+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
51350+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
51351+ struct acl_subject_label *segvacl;
51352+ segvacl =
51353+ lookup_acl_subj_label(gr_usermode->segv_inode,
51354+ gr_usermode->segv_device,
51355+ current->role);
51356+ if (segvacl) {
51357+ segvacl->crashes = 0;
51358+ segvacl->expires = 0;
51359+ }
51360+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
51361+ gr_remove_uid(gr_usermode->segv_uid);
51362+ }
51363+ } else {
51364+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
51365+ error = -EPERM;
51366+ }
51367+ break;
51368+ case GR_SPROLE:
51369+ case GR_SPROLEPAM:
51370+ if (unlikely(!(gr_status & GR_READY))) {
51371+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
51372+ error = -EAGAIN;
51373+ break;
51374+ }
51375+
51376+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
51377+ current->role->expires = 0;
51378+ current->role->auth_attempts = 0;
51379+ }
51380+
51381+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
51382+ time_after(current->role->expires, get_seconds())) {
51383+ error = -EBUSY;
51384+ goto out;
51385+ }
51386+
51387+ if (lookup_special_role_auth
51388+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
51389+ && ((!sprole_salt && !sprole_sum)
51390+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
51391+ char *p = "";
51392+ assign_special_role(gr_usermode->sp_role);
51393+ read_lock(&tasklist_lock);
51394+ if (current->real_parent)
51395+ p = current->real_parent->role->rolename;
51396+ read_unlock(&tasklist_lock);
51397+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
51398+ p, acl_sp_role_value);
51399+ } else {
51400+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
51401+ error = -EPERM;
51402+ if(!(current->role->auth_attempts++))
51403+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
51404+
51405+ goto out;
51406+ }
51407+ break;
51408+ case GR_UNSPROLE:
51409+ if (unlikely(!(gr_status & GR_READY))) {
51410+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
51411+ error = -EAGAIN;
51412+ break;
51413+ }
51414+
51415+ if (current->role->roletype & GR_ROLE_SPECIAL) {
51416+ char *p = "";
51417+ int i = 0;
51418+
51419+ read_lock(&tasklist_lock);
51420+ if (current->real_parent) {
51421+ p = current->real_parent->role->rolename;
51422+ i = current->real_parent->acl_role_id;
51423+ }
51424+ read_unlock(&tasklist_lock);
51425+
51426+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
51427+ gr_set_acls(1);
51428+ } else {
51429+ error = -EPERM;
51430+ goto out;
51431+ }
51432+ break;
51433+ default:
51434+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
51435+ error = -EINVAL;
51436+ break;
51437+ }
51438+
51439+ if (error != -EPERM)
51440+ goto out;
51441+
51442+ if(!(gr_auth_attempts++))
51443+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
51444+
51445+ out:
51446+ mutex_unlock(&gr_dev_mutex);
51447+ return error;
51448+}
51449+
51450+/* must be called with
51451+ rcu_read_lock();
51452+ read_lock(&tasklist_lock);
51453+ read_lock(&grsec_exec_file_lock);
51454+*/
51455+int gr_apply_subject_to_task(struct task_struct *task)
51456+{
51457+ struct acl_object_label *obj;
51458+ char *tmpname;
51459+ struct acl_subject_label *tmpsubj;
51460+ struct file *filp;
51461+ struct name_entry *nmatch;
51462+
51463+ filp = task->exec_file;
51464+ if (filp == NULL)
51465+ return 0;
51466+
51467+ /* the following is to apply the correct subject
51468+ on binaries running when the RBAC system
51469+ is enabled, when the binaries have been
51470+ replaced or deleted since their execution
51471+ -----
51472+ when the RBAC system starts, the inode/dev
51473+ from exec_file will be one the RBAC system
51474+ is unaware of. It only knows the inode/dev
51475+ of the present file on disk, or the absence
51476+ of it.
51477+ */
51478+ preempt_disable();
51479+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
51480+
51481+ nmatch = lookup_name_entry(tmpname);
51482+ preempt_enable();
51483+ tmpsubj = NULL;
51484+ if (nmatch) {
51485+ if (nmatch->deleted)
51486+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
51487+ else
51488+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
51489+ if (tmpsubj != NULL)
51490+ task->acl = tmpsubj;
51491+ }
51492+ if (tmpsubj == NULL)
51493+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
51494+ task->role);
51495+ if (task->acl) {
51496+ task->is_writable = 0;
51497+ /* ignore additional mmap checks for processes that are writable
51498+ by the default ACL */
51499+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
51500+ if (unlikely(obj->mode & GR_WRITE))
51501+ task->is_writable = 1;
51502+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
51503+ if (unlikely(obj->mode & GR_WRITE))
51504+ task->is_writable = 1;
51505+
51506+ gr_set_proc_res(task);
51507+
51508+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51509+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
51510+#endif
51511+ } else {
51512+ return 1;
51513+ }
51514+
51515+ return 0;
51516+}
51517+
51518+int
51519+gr_set_acls(const int type)
51520+{
51521+ struct task_struct *task, *task2;
51522+ struct acl_role_label *role = current->role;
51523+ __u16 acl_role_id = current->acl_role_id;
51524+ const struct cred *cred;
51525+ int ret;
51526+
51527+ rcu_read_lock();
51528+ read_lock(&tasklist_lock);
51529+ read_lock(&grsec_exec_file_lock);
51530+ do_each_thread(task2, task) {
51531+ /* check to see if we're called from the exit handler,
51532+ if so, only replace ACLs that have inherited the admin
51533+ ACL */
51534+
51535+ if (type && (task->role != role ||
51536+ task->acl_role_id != acl_role_id))
51537+ continue;
51538+
51539+ task->acl_role_id = 0;
51540+ task->acl_sp_role = 0;
51541+
51542+ if (task->exec_file) {
51543+ cred = __task_cred(task);
51544+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
51545+ ret = gr_apply_subject_to_task(task);
51546+ if (ret) {
51547+ read_unlock(&grsec_exec_file_lock);
51548+ read_unlock(&tasklist_lock);
51549+ rcu_read_unlock();
51550+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
51551+ return ret;
51552+ }
51553+ } else {
51554+ // it's a kernel process
51555+ task->role = kernel_role;
51556+ task->acl = kernel_role->root_label;
51557+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
51558+ task->acl->mode &= ~GR_PROCFIND;
51559+#endif
51560+ }
51561+ } while_each_thread(task2, task);
51562+ read_unlock(&grsec_exec_file_lock);
51563+ read_unlock(&tasklist_lock);
51564+ rcu_read_unlock();
51565+
51566+ return 0;
51567+}
51568+
51569+void
51570+gr_learn_resource(const struct task_struct *task,
51571+ const int res, const unsigned long wanted, const int gt)
51572+{
51573+ struct acl_subject_label *acl;
51574+ const struct cred *cred;
51575+
51576+ if (unlikely((gr_status & GR_READY) &&
51577+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
51578+ goto skip_reslog;
51579+
51580+#ifdef CONFIG_GRKERNSEC_RESLOG
51581+ gr_log_resource(task, res, wanted, gt);
51582+#endif
51583+ skip_reslog:
51584+
51585+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
51586+ return;
51587+
51588+ acl = task->acl;
51589+
51590+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
51591+ !(acl->resmask & (1 << (unsigned short) res))))
51592+ return;
51593+
51594+ if (wanted >= acl->res[res].rlim_cur) {
51595+ unsigned long res_add;
51596+
51597+ res_add = wanted;
51598+ switch (res) {
51599+ case RLIMIT_CPU:
51600+ res_add += GR_RLIM_CPU_BUMP;
51601+ break;
51602+ case RLIMIT_FSIZE:
51603+ res_add += GR_RLIM_FSIZE_BUMP;
51604+ break;
51605+ case RLIMIT_DATA:
51606+ res_add += GR_RLIM_DATA_BUMP;
51607+ break;
51608+ case RLIMIT_STACK:
51609+ res_add += GR_RLIM_STACK_BUMP;
51610+ break;
51611+ case RLIMIT_CORE:
51612+ res_add += GR_RLIM_CORE_BUMP;
51613+ break;
51614+ case RLIMIT_RSS:
51615+ res_add += GR_RLIM_RSS_BUMP;
51616+ break;
51617+ case RLIMIT_NPROC:
51618+ res_add += GR_RLIM_NPROC_BUMP;
51619+ break;
51620+ case RLIMIT_NOFILE:
51621+ res_add += GR_RLIM_NOFILE_BUMP;
51622+ break;
51623+ case RLIMIT_MEMLOCK:
51624+ res_add += GR_RLIM_MEMLOCK_BUMP;
51625+ break;
51626+ case RLIMIT_AS:
51627+ res_add += GR_RLIM_AS_BUMP;
51628+ break;
51629+ case RLIMIT_LOCKS:
51630+ res_add += GR_RLIM_LOCKS_BUMP;
51631+ break;
51632+ case RLIMIT_SIGPENDING:
51633+ res_add += GR_RLIM_SIGPENDING_BUMP;
51634+ break;
51635+ case RLIMIT_MSGQUEUE:
51636+ res_add += GR_RLIM_MSGQUEUE_BUMP;
51637+ break;
51638+ case RLIMIT_NICE:
51639+ res_add += GR_RLIM_NICE_BUMP;
51640+ break;
51641+ case RLIMIT_RTPRIO:
51642+ res_add += GR_RLIM_RTPRIO_BUMP;
51643+ break;
51644+ case RLIMIT_RTTIME:
51645+ res_add += GR_RLIM_RTTIME_BUMP;
51646+ break;
51647+ }
51648+
51649+ acl->res[res].rlim_cur = res_add;
51650+
51651+ if (wanted > acl->res[res].rlim_max)
51652+ acl->res[res].rlim_max = res_add;
51653+
51654+ /* only log the subject filename, since resource logging is supported for
51655+ single-subject learning only */
51656+ rcu_read_lock();
51657+ cred = __task_cred(task);
51658+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
51659+ task->role->roletype, cred->uid, cred->gid, acl->filename,
51660+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
51661+ "", (unsigned long) res, &task->signal->saved_ip);
51662+ rcu_read_unlock();
51663+ }
51664+
51665+ return;
51666+}
51667+
51668+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
51669+void
51670+pax_set_initial_flags(struct linux_binprm *bprm)
51671+{
51672+ struct task_struct *task = current;
51673+ struct acl_subject_label *proc;
51674+ unsigned long flags;
51675+
51676+ if (unlikely(!(gr_status & GR_READY)))
51677+ return;
51678+
51679+ flags = pax_get_flags(task);
51680+
51681+ proc = task->acl;
51682+
51683+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
51684+ flags &= ~MF_PAX_PAGEEXEC;
51685+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
51686+ flags &= ~MF_PAX_SEGMEXEC;
51687+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
51688+ flags &= ~MF_PAX_RANDMMAP;
51689+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
51690+ flags &= ~MF_PAX_EMUTRAMP;
51691+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
51692+ flags &= ~MF_PAX_MPROTECT;
51693+
51694+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
51695+ flags |= MF_PAX_PAGEEXEC;
51696+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
51697+ flags |= MF_PAX_SEGMEXEC;
51698+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
51699+ flags |= MF_PAX_RANDMMAP;
51700+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
51701+ flags |= MF_PAX_EMUTRAMP;
51702+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
51703+ flags |= MF_PAX_MPROTECT;
51704+
51705+ pax_set_flags(task, flags);
51706+
51707+ return;
51708+}
51709+#endif
51710+
51711+#ifdef CONFIG_SYSCTL
51712+/* Eric Biederman likes breaking userland ABI and every inode-based security
51713+ system to save 35kb of memory */
51714+
51715+/* we modify the passed in filename, but adjust it back before returning */
51716+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
51717+{
51718+ struct name_entry *nmatch;
51719+ char *p, *lastp = NULL;
51720+ struct acl_object_label *obj = NULL, *tmp;
51721+ struct acl_subject_label *tmpsubj;
51722+ char c = '\0';
51723+
51724+ read_lock(&gr_inode_lock);
51725+
51726+ p = name + len - 1;
51727+ do {
51728+ nmatch = lookup_name_entry(name);
51729+ if (lastp != NULL)
51730+ *lastp = c;
51731+
51732+ if (nmatch == NULL)
51733+ goto next_component;
51734+ tmpsubj = current->acl;
51735+ do {
51736+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
51737+ if (obj != NULL) {
51738+ tmp = obj->globbed;
51739+ while (tmp) {
51740+ if (!glob_match(tmp->filename, name)) {
51741+ obj = tmp;
51742+ goto found_obj;
51743+ }
51744+ tmp = tmp->next;
51745+ }
51746+ goto found_obj;
51747+ }
51748+ } while ((tmpsubj = tmpsubj->parent_subject));
51749+next_component:
51750+ /* end case */
51751+ if (p == name)
51752+ break;
51753+
51754+ while (*p != '/')
51755+ p--;
51756+ if (p == name)
51757+ lastp = p + 1;
51758+ else {
51759+ lastp = p;
51760+ p--;
51761+ }
51762+ c = *lastp;
51763+ *lastp = '\0';
51764+ } while (1);
51765+found_obj:
51766+ read_unlock(&gr_inode_lock);
51767+ /* obj returned will always be non-null */
51768+ return obj;
51769+}
51770+
51771+/* returns 0 when allowing, non-zero on error
51772+ op of 0 is used for readdir, so we don't log the names of hidden files
51773+*/
51774+__u32
51775+gr_handle_sysctl(const struct ctl_table *table, const int op)
51776+{
51777+ struct ctl_table *tmp;
51778+ const char *proc_sys = "/proc/sys";
51779+ char *path;
51780+ struct acl_object_label *obj;
51781+ unsigned short len = 0, pos = 0, depth = 0, i;
51782+ __u32 err = 0;
51783+ __u32 mode = 0;
51784+
51785+ if (unlikely(!(gr_status & GR_READY)))
51786+ return 0;
51787+
51788+ /* for now, ignore operations on non-sysctl entries if it's not a
51789+ readdir*/
51790+ if (table->child != NULL && op != 0)
51791+ return 0;
51792+
51793+ mode |= GR_FIND;
51794+ /* it's only a read if it's an entry, read on dirs is for readdir */
51795+ if (op & MAY_READ)
51796+ mode |= GR_READ;
51797+ if (op & MAY_WRITE)
51798+ mode |= GR_WRITE;
51799+
51800+ preempt_disable();
51801+
51802+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
51803+
51804+ /* it's only a read/write if it's an actual entry, not a dir
51805+ (which are opened for readdir)
51806+ */
51807+
51808+ /* convert the requested sysctl entry into a pathname */
51809+
51810+ for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
51811+ len += strlen(tmp->procname);
51812+ len++;
51813+ depth++;
51814+ }
51815+
51816+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
51817+ /* deny */
51818+ goto out;
51819+ }
51820+
51821+ memset(path, 0, PAGE_SIZE);
51822+
51823+ memcpy(path, proc_sys, strlen(proc_sys));
51824+
51825+ pos += strlen(proc_sys);
51826+
51827+ for (; depth > 0; depth--) {
51828+ path[pos] = '/';
51829+ pos++;
51830+ for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
51831+ if (depth == i) {
51832+ memcpy(path + pos, tmp->procname,
51833+ strlen(tmp->procname));
51834+ pos += strlen(tmp->procname);
51835+ }
51836+ i++;
51837+ }
51838+ }
51839+
51840+ obj = gr_lookup_by_name(path, pos);
51841+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
51842+
51843+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
51844+ ((err & mode) != mode))) {
51845+ __u32 new_mode = mode;
51846+
51847+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
51848+
51849+ err = 0;
51850+ gr_log_learn_sysctl(path, new_mode);
51851+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
51852+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
51853+ err = -ENOENT;
51854+ } else if (!(err & GR_FIND)) {
51855+ err = -ENOENT;
51856+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
51857+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
51858+ path, (mode & GR_READ) ? " reading" : "",
51859+ (mode & GR_WRITE) ? " writing" : "");
51860+ err = -EACCES;
51861+ } else if ((err & mode) != mode) {
51862+ err = -EACCES;
51863+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
51864+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
51865+ path, (mode & GR_READ) ? " reading" : "",
51866+ (mode & GR_WRITE) ? " writing" : "");
51867+ err = 0;
51868+ } else
51869+ err = 0;
51870+
51871+ out:
51872+ preempt_enable();
51873+
51874+ return err;
51875+}
51876+#endif
51877+
51878+int
51879+gr_handle_proc_ptrace(struct task_struct *task)
51880+{
51881+ struct file *filp;
51882+ struct task_struct *tmp = task;
51883+ struct task_struct *curtemp = current;
51884+ __u32 retmode;
51885+
51886+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
51887+ if (unlikely(!(gr_status & GR_READY)))
51888+ return 0;
51889+#endif
51890+
51891+ read_lock(&tasklist_lock);
51892+ read_lock(&grsec_exec_file_lock);
51893+ filp = task->exec_file;
51894+
51895+ while (tmp->pid > 0) {
51896+ if (tmp == curtemp)
51897+ break;
51898+ tmp = tmp->real_parent;
51899+ }
51900+
51901+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
51902+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
51903+ read_unlock(&grsec_exec_file_lock);
51904+ read_unlock(&tasklist_lock);
51905+ return 1;
51906+ }
51907+
51908+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
51909+ if (!(gr_status & GR_READY)) {
51910+ read_unlock(&grsec_exec_file_lock);
51911+ read_unlock(&tasklist_lock);
51912+ return 0;
51913+ }
51914+#endif
51915+
51916+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
51917+ read_unlock(&grsec_exec_file_lock);
51918+ read_unlock(&tasklist_lock);
51919+
51920+ if (retmode & GR_NOPTRACE)
51921+ return 1;
51922+
51923+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
51924+ && (current->acl != task->acl || (current->acl != current->role->root_label
51925+ && current->pid != task->pid)))
51926+ return 1;
51927+
51928+ return 0;
51929+}
51930+
51931+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
51932+{
51933+ if (unlikely(!(gr_status & GR_READY)))
51934+ return;
51935+
51936+ if (!(current->role->roletype & GR_ROLE_GOD))
51937+ return;
51938+
51939+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
51940+ p->role->rolename, gr_task_roletype_to_char(p),
51941+ p->acl->filename);
51942+}
51943+
51944+int
51945+gr_handle_ptrace(struct task_struct *task, const long request)
51946+{
51947+ struct task_struct *tmp = task;
51948+ struct task_struct *curtemp = current;
51949+ __u32 retmode;
51950+
51951+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
51952+ if (unlikely(!(gr_status & GR_READY)))
51953+ return 0;
51954+#endif
51955+
51956+ read_lock(&tasklist_lock);
51957+ while (tmp->pid > 0) {
51958+ if (tmp == curtemp)
51959+ break;
51960+ tmp = tmp->real_parent;
51961+ }
51962+
51963+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
51964+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
51965+ read_unlock(&tasklist_lock);
51966+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
51967+ return 1;
51968+ }
51969+ read_unlock(&tasklist_lock);
51970+
51971+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
51972+ if (!(gr_status & GR_READY))
51973+ return 0;
51974+#endif
51975+
51976+ read_lock(&grsec_exec_file_lock);
51977+ if (unlikely(!task->exec_file)) {
51978+ read_unlock(&grsec_exec_file_lock);
51979+ return 0;
51980+ }
51981+
51982+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
51983+ read_unlock(&grsec_exec_file_lock);
51984+
51985+ if (retmode & GR_NOPTRACE) {
51986+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
51987+ return 1;
51988+ }
51989+
51990+ if (retmode & GR_PTRACERD) {
51991+ switch (request) {
51992+ case PTRACE_SEIZE:
51993+ case PTRACE_POKETEXT:
51994+ case PTRACE_POKEDATA:
51995+ case PTRACE_POKEUSR:
51996+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
51997+ case PTRACE_SETREGS:
51998+ case PTRACE_SETFPREGS:
51999+#endif
52000+#ifdef CONFIG_X86
52001+ case PTRACE_SETFPXREGS:
52002+#endif
52003+#ifdef CONFIG_ALTIVEC
52004+ case PTRACE_SETVRREGS:
52005+#endif
52006+ return 1;
52007+ default:
52008+ return 0;
52009+ }
52010+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
52011+ !(current->role->roletype & GR_ROLE_GOD) &&
52012+ (current->acl != task->acl)) {
52013+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
52014+ return 1;
52015+ }
52016+
52017+ return 0;
52018+}
52019+
52020+static int is_writable_mmap(const struct file *filp)
52021+{
52022+ struct task_struct *task = current;
52023+ struct acl_object_label *obj, *obj2;
52024+
52025+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
52026+ !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))) {
52027+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
52028+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
52029+ task->role->root_label);
52030+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
52031+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
52032+ return 1;
52033+ }
52034+ }
52035+ return 0;
52036+}
52037+
52038+int
52039+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
52040+{
52041+ __u32 mode;
52042+
52043+ if (unlikely(!file || !(prot & PROT_EXEC)))
52044+ return 1;
52045+
52046+ if (is_writable_mmap(file))
52047+ return 0;
52048+
52049+ mode =
52050+ gr_search_file(file->f_path.dentry,
52051+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
52052+ file->f_path.mnt);
52053+
52054+ if (!gr_tpe_allow(file))
52055+ return 0;
52056+
52057+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
52058+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
52059+ return 0;
52060+ } else if (unlikely(!(mode & GR_EXEC))) {
52061+ return 0;
52062+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
52063+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
52064+ return 1;
52065+ }
52066+
52067+ return 1;
52068+}
52069+
52070+int
52071+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
52072+{
52073+ __u32 mode;
52074+
52075+ if (unlikely(!file || !(prot & PROT_EXEC)))
52076+ return 1;
52077+
52078+ if (is_writable_mmap(file))
52079+ return 0;
52080+
52081+ mode =
52082+ gr_search_file(file->f_path.dentry,
52083+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
52084+ file->f_path.mnt);
52085+
52086+ if (!gr_tpe_allow(file))
52087+ return 0;
52088+
52089+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
52090+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
52091+ return 0;
52092+ } else if (unlikely(!(mode & GR_EXEC))) {
52093+ return 0;
52094+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
52095+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
52096+ return 1;
52097+ }
52098+
52099+ return 1;
52100+}
52101+
52102+void
52103+gr_acl_handle_psacct(struct task_struct *task, const long code)
52104+{
52105+ unsigned long runtime;
52106+ unsigned long cputime;
52107+ unsigned int wday, cday;
52108+ __u8 whr, chr;
52109+ __u8 wmin, cmin;
52110+ __u8 wsec, csec;
52111+ struct timespec timeval;
52112+
52113+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
52114+ !(task->acl->mode & GR_PROCACCT)))
52115+ return;
52116+
52117+ do_posix_clock_monotonic_gettime(&timeval);
52118+ runtime = timeval.tv_sec - task->start_time.tv_sec;
52119+ wday = runtime / (3600 * 24);
52120+ runtime -= wday * (3600 * 24);
52121+ whr = runtime / 3600;
52122+ runtime -= whr * 3600;
52123+ wmin = runtime / 60;
52124+ runtime -= wmin * 60;
52125+ wsec = runtime;
52126+
52127+ cputime = (task->utime + task->stime) / HZ;
52128+ cday = cputime / (3600 * 24);
52129+ cputime -= cday * (3600 * 24);
52130+ chr = cputime / 3600;
52131+ cputime -= chr * 3600;
52132+ cmin = cputime / 60;
52133+ cputime -= cmin * 60;
52134+ csec = cputime;
52135+
52136+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
52137+
52138+ return;
52139+}
52140+
52141+void gr_set_kernel_label(struct task_struct *task)
52142+{
52143+ if (gr_status & GR_READY) {
52144+ task->role = kernel_role;
52145+ task->acl = kernel_role->root_label;
52146+ }
52147+ return;
52148+}
52149+
52150+#ifdef CONFIG_TASKSTATS
52151+int gr_is_taskstats_denied(int pid)
52152+{
52153+ struct task_struct *task;
52154+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
52155+ const struct cred *cred;
52156+#endif
52157+ int ret = 0;
52158+
52159+ /* restrict taskstats viewing to un-chrooted root users
52160+ who have the 'view' subject flag if the RBAC system is enabled
52161+ */
52162+
52163+ rcu_read_lock();
52164+ read_lock(&tasklist_lock);
52165+ task = find_task_by_vpid(pid);
52166+ if (task) {
52167+#ifdef CONFIG_GRKERNSEC_CHROOT
52168+ if (proc_is_chrooted(task))
52169+ ret = -EACCES;
52170+#endif
52171+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
52172+ cred = __task_cred(task);
52173+#ifdef CONFIG_GRKERNSEC_PROC_USER
52174+ if (cred->uid != 0)
52175+ ret = -EACCES;
52176+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
52177+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
52178+ ret = -EACCES;
52179+#endif
52180+#endif
52181+ if (gr_status & GR_READY) {
52182+ if (!(task->acl->mode & GR_VIEW))
52183+ ret = -EACCES;
52184+ }
52185+ } else
52186+ ret = -ENOENT;
52187+
52188+ read_unlock(&tasklist_lock);
52189+ rcu_read_unlock();
52190+
52191+ return ret;
52192+}
52193+#endif
52194+
52195+/* AUXV entries are filled via a descendant of search_binary_handler
52196+ after we've already applied the subject for the target
52197+*/
52198+int gr_acl_enable_at_secure(void)
52199+{
52200+ if (unlikely(!(gr_status & GR_READY)))
52201+ return 0;
52202+
52203+ if (current->acl->mode & GR_ATSECURE)
52204+ return 1;
52205+
52206+ return 0;
52207+}
52208+
52209+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
52210+{
52211+ struct task_struct *task = current;
52212+ struct dentry *dentry = file->f_path.dentry;
52213+ struct vfsmount *mnt = file->f_path.mnt;
52214+ struct acl_object_label *obj, *tmp;
52215+ struct acl_subject_label *subj;
52216+ unsigned int bufsize;
52217+ int is_not_root;
52218+ char *path;
52219+ dev_t dev = __get_dev(dentry);
52220+
52221+ if (unlikely(!(gr_status & GR_READY)))
52222+ return 1;
52223+
52224+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
52225+ return 1;
52226+
52227+ /* ignore Eric Biederman */
52228+ if (IS_PRIVATE(dentry->d_inode))
52229+ return 1;
52230+
52231+ subj = task->acl;
52232+ do {
52233+ obj = lookup_acl_obj_label(ino, dev, subj);
52234+ if (obj != NULL)
52235+ return (obj->mode & GR_FIND) ? 1 : 0;
52236+ } while ((subj = subj->parent_subject));
52237+
52238+ /* this is purely an optimization since we're looking for an object
52239+ for the directory we're doing a readdir on
52240+ if it's possible for any globbed object to match the entry we're
52241+ filling into the directory, then the object we find here will be
52242+ an anchor point with attached globbed objects
52243+ */
52244+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
52245+ if (obj->globbed == NULL)
52246+ return (obj->mode & GR_FIND) ? 1 : 0;
52247+
52248+ is_not_root = ((obj->filename[0] == '/') &&
52249+ (obj->filename[1] == '\0')) ? 0 : 1;
52250+ bufsize = PAGE_SIZE - namelen - is_not_root;
52251+
52252+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
52253+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
52254+ return 1;
52255+
52256+ preempt_disable();
52257+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
52258+ bufsize);
52259+
52260+ bufsize = strlen(path);
52261+
52262+ /* if base is "/", don't append an additional slash */
52263+ if (is_not_root)
52264+ *(path + bufsize) = '/';
52265+ memcpy(path + bufsize + is_not_root, name, namelen);
52266+ *(path + bufsize + namelen + is_not_root) = '\0';
52267+
52268+ tmp = obj->globbed;
52269+ while (tmp) {
52270+ if (!glob_match(tmp->filename, path)) {
52271+ preempt_enable();
52272+ return (tmp->mode & GR_FIND) ? 1 : 0;
52273+ }
52274+ tmp = tmp->next;
52275+ }
52276+ preempt_enable();
52277+ return (obj->mode & GR_FIND) ? 1 : 0;
52278+}
52279+
52280+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
52281+EXPORT_SYMBOL(gr_acl_is_enabled);
52282+#endif
52283+EXPORT_SYMBOL(gr_learn_resource);
52284+EXPORT_SYMBOL(gr_set_kernel_label);
52285+#ifdef CONFIG_SECURITY
52286+EXPORT_SYMBOL(gr_check_user_change);
52287+EXPORT_SYMBOL(gr_check_group_change);
52288+#endif
52289+
52290diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
52291new file mode 100644
52292index 0000000..34fefda
52293--- /dev/null
52294+++ b/grsecurity/gracl_alloc.c
52295@@ -0,0 +1,105 @@
52296+#include <linux/kernel.h>
52297+#include <linux/mm.h>
52298+#include <linux/slab.h>
52299+#include <linux/vmalloc.h>
52300+#include <linux/gracl.h>
52301+#include <linux/grsecurity.h>
52302+
52303+static unsigned long alloc_stack_next = 1;
52304+static unsigned long alloc_stack_size = 1;
52305+static void **alloc_stack;
52306+
52307+static __inline__ int
52308+alloc_pop(void)
52309+{
52310+ if (alloc_stack_next == 1)
52311+ return 0;
52312+
52313+ kfree(alloc_stack[alloc_stack_next - 2]);
52314+
52315+ alloc_stack_next--;
52316+
52317+ return 1;
52318+}
52319+
52320+static __inline__ int
52321+alloc_push(void *buf)
52322+{
52323+ if (alloc_stack_next >= alloc_stack_size)
52324+ return 1;
52325+
52326+ alloc_stack[alloc_stack_next - 1] = buf;
52327+
52328+ alloc_stack_next++;
52329+
52330+ return 0;
52331+}
52332+
52333+void *
52334+acl_alloc(unsigned long len)
52335+{
52336+ void *ret = NULL;
52337+
52338+ if (!len || len > PAGE_SIZE)
52339+ goto out;
52340+
52341+ ret = kmalloc(len, GFP_KERNEL);
52342+
52343+ if (ret) {
52344+ if (alloc_push(ret)) {
52345+ kfree(ret);
52346+ ret = NULL;
52347+ }
52348+ }
52349+
52350+out:
52351+ return ret;
52352+}
52353+
52354+void *
52355+acl_alloc_num(unsigned long num, unsigned long len)
52356+{
52357+ if (!len || (num > (PAGE_SIZE / len)))
52358+ return NULL;
52359+
52360+ return acl_alloc(num * len);
52361+}
52362+
52363+void
52364+acl_free_all(void)
52365+{
52366+ if (gr_acl_is_enabled() || !alloc_stack)
52367+ return;
52368+
52369+ while (alloc_pop()) ;
52370+
52371+ if (alloc_stack) {
52372+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
52373+ kfree(alloc_stack);
52374+ else
52375+ vfree(alloc_stack);
52376+ }
52377+
52378+ alloc_stack = NULL;
52379+ alloc_stack_size = 1;
52380+ alloc_stack_next = 1;
52381+
52382+ return;
52383+}
52384+
52385+int
52386+acl_alloc_stack_init(unsigned long size)
52387+{
52388+ if ((size * sizeof (void *)) <= PAGE_SIZE)
52389+ alloc_stack =
52390+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
52391+ else
52392+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
52393+
52394+ alloc_stack_size = size;
52395+
52396+ if (!alloc_stack)
52397+ return 0;
52398+ else
52399+ return 1;
52400+}
52401diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
52402new file mode 100644
52403index 0000000..955ddfb
52404--- /dev/null
52405+++ b/grsecurity/gracl_cap.c
52406@@ -0,0 +1,101 @@
52407+#include <linux/kernel.h>
52408+#include <linux/module.h>
52409+#include <linux/sched.h>
52410+#include <linux/gracl.h>
52411+#include <linux/grsecurity.h>
52412+#include <linux/grinternal.h>
52413+
52414+extern const char *captab_log[];
52415+extern int captab_log_entries;
52416+
52417+int
52418+gr_acl_is_capable(const int cap)
52419+{
52420+ struct task_struct *task = current;
52421+ const struct cred *cred = current_cred();
52422+ struct acl_subject_label *curracl;
52423+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
52424+ kernel_cap_t cap_audit = __cap_empty_set;
52425+
52426+ if (!gr_acl_is_enabled())
52427+ return 1;
52428+
52429+ curracl = task->acl;
52430+
52431+ cap_drop = curracl->cap_lower;
52432+ cap_mask = curracl->cap_mask;
52433+ cap_audit = curracl->cap_invert_audit;
52434+
52435+ while ((curracl = curracl->parent_subject)) {
52436+ /* if the cap isn't specified in the current computed mask but is specified in the
52437+ current level subject, and is lowered in the current level subject, then add
52438+ it to the set of dropped capabilities
52439+ otherwise, add the current level subject's mask to the current computed mask
52440+ */
52441+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
52442+ cap_raise(cap_mask, cap);
52443+ if (cap_raised(curracl->cap_lower, cap))
52444+ cap_raise(cap_drop, cap);
52445+ if (cap_raised(curracl->cap_invert_audit, cap))
52446+ cap_raise(cap_audit, cap);
52447+ }
52448+ }
52449+
52450+ if (!cap_raised(cap_drop, cap)) {
52451+ if (cap_raised(cap_audit, cap))
52452+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
52453+ return 1;
52454+ }
52455+
52456+ curracl = task->acl;
52457+
52458+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
52459+ && cap_raised(cred->cap_effective, cap)) {
52460+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
52461+ task->role->roletype, cred->uid,
52462+ cred->gid, task->exec_file ?
52463+ gr_to_filename(task->exec_file->f_path.dentry,
52464+ task->exec_file->f_path.mnt) : curracl->filename,
52465+ curracl->filename, 0UL,
52466+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
52467+ return 1;
52468+ }
52469+
52470+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
52471+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
52472+ return 0;
52473+}
52474+
52475+int
52476+gr_acl_is_capable_nolog(const int cap)
52477+{
52478+ struct acl_subject_label *curracl;
52479+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
52480+
52481+ if (!gr_acl_is_enabled())
52482+ return 1;
52483+
52484+ curracl = current->acl;
52485+
52486+ cap_drop = curracl->cap_lower;
52487+ cap_mask = curracl->cap_mask;
52488+
52489+ while ((curracl = curracl->parent_subject)) {
52490+ /* if the cap isn't specified in the current computed mask but is specified in the
52491+ current level subject, and is lowered in the current level subject, then add
52492+ it to the set of dropped capabilities
52493+ otherwise, add the current level subject's mask to the current computed mask
52494+ */
52495+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
52496+ cap_raise(cap_mask, cap);
52497+ if (cap_raised(curracl->cap_lower, cap))
52498+ cap_raise(cap_drop, cap);
52499+ }
52500+ }
52501+
52502+ if (!cap_raised(cap_drop, cap))
52503+ return 1;
52504+
52505+ return 0;
52506+}
52507+
52508diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
52509new file mode 100644
52510index 0000000..4eda5c3
52511--- /dev/null
52512+++ b/grsecurity/gracl_fs.c
52513@@ -0,0 +1,433 @@
52514+#include <linux/kernel.h>
52515+#include <linux/sched.h>
52516+#include <linux/types.h>
52517+#include <linux/fs.h>
52518+#include <linux/file.h>
52519+#include <linux/stat.h>
52520+#include <linux/grsecurity.h>
52521+#include <linux/grinternal.h>
52522+#include <linux/gracl.h>
52523+
52524+__u32
52525+gr_acl_handle_hidden_file(const struct dentry * dentry,
52526+ const struct vfsmount * mnt)
52527+{
52528+ __u32 mode;
52529+
52530+ if (unlikely(!dentry->d_inode))
52531+ return GR_FIND;
52532+
52533+ mode =
52534+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
52535+
52536+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
52537+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
52538+ return mode;
52539+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
52540+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
52541+ return 0;
52542+ } else if (unlikely(!(mode & GR_FIND)))
52543+ return 0;
52544+
52545+ return GR_FIND;
52546+}
52547+
52548+__u32
52549+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
52550+ int acc_mode)
52551+{
52552+ __u32 reqmode = GR_FIND;
52553+ __u32 mode;
52554+
52555+ if (unlikely(!dentry->d_inode))
52556+ return reqmode;
52557+
52558+ if (acc_mode & MAY_APPEND)
52559+ reqmode |= GR_APPEND;
52560+ else if (acc_mode & MAY_WRITE)
52561+ reqmode |= GR_WRITE;
52562+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
52563+ reqmode |= GR_READ;
52564+
52565+ mode =
52566+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
52567+ mnt);
52568+
52569+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
52570+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
52571+ reqmode & GR_READ ? " reading" : "",
52572+ reqmode & GR_WRITE ? " writing" : reqmode &
52573+ GR_APPEND ? " appending" : "");
52574+ return reqmode;
52575+ } else
52576+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
52577+ {
52578+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
52579+ reqmode & GR_READ ? " reading" : "",
52580+ reqmode & GR_WRITE ? " writing" : reqmode &
52581+ GR_APPEND ? " appending" : "");
52582+ return 0;
52583+ } else if (unlikely((mode & reqmode) != reqmode))
52584+ return 0;
52585+
52586+ return reqmode;
52587+}
52588+
52589+__u32
52590+gr_acl_handle_creat(const struct dentry * dentry,
52591+ const struct dentry * p_dentry,
52592+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
52593+ const int imode)
52594+{
52595+ __u32 reqmode = GR_WRITE | GR_CREATE;
52596+ __u32 mode;
52597+
52598+ if (acc_mode & MAY_APPEND)
52599+ reqmode |= GR_APPEND;
52600+ // if a directory was required or the directory already exists, then
52601+ // don't count this open as a read
52602+ if ((acc_mode & MAY_READ) &&
52603+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
52604+ reqmode |= GR_READ;
52605+ if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
52606+ reqmode |= GR_SETID;
52607+
52608+ mode =
52609+ gr_check_create(dentry, p_dentry, p_mnt,
52610+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
52611+
52612+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
52613+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
52614+ reqmode & GR_READ ? " reading" : "",
52615+ reqmode & GR_WRITE ? " writing" : reqmode &
52616+ GR_APPEND ? " appending" : "");
52617+ return reqmode;
52618+ } else
52619+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
52620+ {
52621+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
52622+ reqmode & GR_READ ? " reading" : "",
52623+ reqmode & GR_WRITE ? " writing" : reqmode &
52624+ GR_APPEND ? " appending" : "");
52625+ return 0;
52626+ } else if (unlikely((mode & reqmode) != reqmode))
52627+ return 0;
52628+
52629+ return reqmode;
52630+}
52631+
52632+__u32
52633+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
52634+ const int fmode)
52635+{
52636+ __u32 mode, reqmode = GR_FIND;
52637+
52638+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
52639+ reqmode |= GR_EXEC;
52640+ if (fmode & S_IWOTH)
52641+ reqmode |= GR_WRITE;
52642+ if (fmode & S_IROTH)
52643+ reqmode |= GR_READ;
52644+
52645+ mode =
52646+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
52647+ mnt);
52648+
52649+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
52650+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
52651+ reqmode & GR_READ ? " reading" : "",
52652+ reqmode & GR_WRITE ? " writing" : "",
52653+ reqmode & GR_EXEC ? " executing" : "");
52654+ return reqmode;
52655+ } else
52656+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
52657+ {
52658+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
52659+ reqmode & GR_READ ? " reading" : "",
52660+ reqmode & GR_WRITE ? " writing" : "",
52661+ reqmode & GR_EXEC ? " executing" : "");
52662+ return 0;
52663+ } else if (unlikely((mode & reqmode) != reqmode))
52664+ return 0;
52665+
52666+ return reqmode;
52667+}
52668+
52669+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
52670+{
52671+ __u32 mode;
52672+
52673+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
52674+
52675+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
52676+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
52677+ return mode;
52678+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
52679+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
52680+ return 0;
52681+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
52682+ return 0;
52683+
52684+ return (reqmode);
52685+}
52686+
52687+__u32
52688+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
52689+{
52690+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
52691+}
52692+
52693+__u32
52694+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
52695+{
52696+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
52697+}
52698+
52699+__u32
52700+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
52701+{
52702+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
52703+}
52704+
52705+__u32
52706+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
52707+{
52708+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
52709+}
52710+
52711+__u32
52712+gr_acl_handle_fchmod(const struct dentry *dentry, const struct vfsmount *mnt,
52713+ mode_t mode)
52714+{
52715+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
52716+ return 1;
52717+
52718+ if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
52719+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
52720+ GR_FCHMOD_ACL_MSG);
52721+ } else {
52722+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_FCHMOD_ACL_MSG);
52723+ }
52724+}
52725+
52726+__u32
52727+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
52728+ mode_t mode)
52729+{
52730+ if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
52731+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
52732+ GR_CHMOD_ACL_MSG);
52733+ } else {
52734+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
52735+ }
52736+}
52737+
52738+__u32
52739+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
52740+{
52741+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
52742+}
52743+
52744+__u32
52745+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
52746+{
52747+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
52748+}
52749+
52750+__u32
52751+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
52752+{
52753+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
52754+}
52755+
52756+__u32
52757+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
52758+{
52759+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
52760+ GR_UNIXCONNECT_ACL_MSG);
52761+}
52762+
52763+/* hardlinks require at minimum create and link permission,
52764+ any additional privilege required is based on the
52765+ privilege of the file being linked to
52766+*/
52767+__u32
52768+gr_acl_handle_link(const struct dentry * new_dentry,
52769+ const struct dentry * parent_dentry,
52770+ const struct vfsmount * parent_mnt,
52771+ const struct dentry * old_dentry,
52772+ const struct vfsmount * old_mnt, const char *to)
52773+{
52774+ __u32 mode;
52775+ __u32 needmode = GR_CREATE | GR_LINK;
52776+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
52777+
52778+ mode =
52779+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
52780+ old_mnt);
52781+
52782+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
52783+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
52784+ return mode;
52785+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
52786+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
52787+ return 0;
52788+ } else if (unlikely((mode & needmode) != needmode))
52789+ return 0;
52790+
52791+ return 1;
52792+}
52793+
52794+__u32
52795+gr_acl_handle_symlink(const struct dentry * new_dentry,
52796+ const struct dentry * parent_dentry,
52797+ const struct vfsmount * parent_mnt, const char *from)
52798+{
52799+ __u32 needmode = GR_WRITE | GR_CREATE;
52800+ __u32 mode;
52801+
52802+ mode =
52803+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
52804+ GR_CREATE | GR_AUDIT_CREATE |
52805+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
52806+
52807+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
52808+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
52809+ return mode;
52810+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
52811+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
52812+ return 0;
52813+ } else if (unlikely((mode & needmode) != needmode))
52814+ return 0;
52815+
52816+ return (GR_WRITE | GR_CREATE);
52817+}
52818+
52819+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)
52820+{
52821+ __u32 mode;
52822+
52823+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
52824+
52825+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
52826+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
52827+ return mode;
52828+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
52829+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
52830+ return 0;
52831+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
52832+ return 0;
52833+
52834+ return (reqmode);
52835+}
52836+
52837+__u32
52838+gr_acl_handle_mknod(const struct dentry * new_dentry,
52839+ const struct dentry * parent_dentry,
52840+ const struct vfsmount * parent_mnt,
52841+ const int mode)
52842+{
52843+ __u32 reqmode = GR_WRITE | GR_CREATE;
52844+ if (unlikely(mode & (S_ISUID | S_ISGID)))
52845+ reqmode |= GR_SETID;
52846+
52847+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
52848+ reqmode, GR_MKNOD_ACL_MSG);
52849+}
52850+
52851+__u32
52852+gr_acl_handle_mkdir(const struct dentry *new_dentry,
52853+ const struct dentry *parent_dentry,
52854+ const struct vfsmount *parent_mnt)
52855+{
52856+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
52857+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
52858+}
52859+
52860+#define RENAME_CHECK_SUCCESS(old, new) \
52861+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
52862+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
52863+
52864+int
52865+gr_acl_handle_rename(struct dentry *new_dentry,
52866+ struct dentry *parent_dentry,
52867+ const struct vfsmount *parent_mnt,
52868+ struct dentry *old_dentry,
52869+ struct inode *old_parent_inode,
52870+ struct vfsmount *old_mnt, const char *newname)
52871+{
52872+ __u32 comp1, comp2;
52873+ int error = 0;
52874+
52875+ if (unlikely(!gr_acl_is_enabled()))
52876+ return 0;
52877+
52878+ if (!new_dentry->d_inode) {
52879+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
52880+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
52881+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
52882+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
52883+ GR_DELETE | GR_AUDIT_DELETE |
52884+ GR_AUDIT_READ | GR_AUDIT_WRITE |
52885+ GR_SUPPRESS, old_mnt);
52886+ } else {
52887+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
52888+ GR_CREATE | GR_DELETE |
52889+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
52890+ GR_AUDIT_READ | GR_AUDIT_WRITE |
52891+ GR_SUPPRESS, parent_mnt);
52892+ comp2 =
52893+ gr_search_file(old_dentry,
52894+ GR_READ | GR_WRITE | GR_AUDIT_READ |
52895+ GR_DELETE | GR_AUDIT_DELETE |
52896+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
52897+ }
52898+
52899+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
52900+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
52901+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
52902+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
52903+ && !(comp2 & GR_SUPPRESS)) {
52904+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
52905+ error = -EACCES;
52906+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
52907+ error = -EACCES;
52908+
52909+ return error;
52910+}
52911+
52912+void
52913+gr_acl_handle_exit(void)
52914+{
52915+ u16 id;
52916+ char *rolename;
52917+ struct file *exec_file;
52918+
52919+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
52920+ !(current->role->roletype & GR_ROLE_PERSIST))) {
52921+ id = current->acl_role_id;
52922+ rolename = current->role->rolename;
52923+ gr_set_acls(1);
52924+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
52925+ }
52926+
52927+ write_lock(&grsec_exec_file_lock);
52928+ exec_file = current->exec_file;
52929+ current->exec_file = NULL;
52930+ write_unlock(&grsec_exec_file_lock);
52931+
52932+ if (exec_file)
52933+ fput(exec_file);
52934+}
52935+
52936+int
52937+gr_acl_handle_procpidmem(const struct task_struct *task)
52938+{
52939+ if (unlikely(!gr_acl_is_enabled()))
52940+ return 0;
52941+
52942+ if (task != current && task->acl->mode & GR_PROTPROCFD)
52943+ return -EACCES;
52944+
52945+ return 0;
52946+}
52947diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
52948new file mode 100644
52949index 0000000..17050ca
52950--- /dev/null
52951+++ b/grsecurity/gracl_ip.c
52952@@ -0,0 +1,381 @@
52953+#include <linux/kernel.h>
52954+#include <asm/uaccess.h>
52955+#include <asm/errno.h>
52956+#include <net/sock.h>
52957+#include <linux/file.h>
52958+#include <linux/fs.h>
52959+#include <linux/net.h>
52960+#include <linux/in.h>
52961+#include <linux/skbuff.h>
52962+#include <linux/ip.h>
52963+#include <linux/udp.h>
52964+#include <linux/types.h>
52965+#include <linux/sched.h>
52966+#include <linux/netdevice.h>
52967+#include <linux/inetdevice.h>
52968+#include <linux/gracl.h>
52969+#include <linux/grsecurity.h>
52970+#include <linux/grinternal.h>
52971+
52972+#define GR_BIND 0x01
52973+#define GR_CONNECT 0x02
52974+#define GR_INVERT 0x04
52975+#define GR_BINDOVERRIDE 0x08
52976+#define GR_CONNECTOVERRIDE 0x10
52977+#define GR_SOCK_FAMILY 0x20
52978+
52979+static const char * gr_protocols[IPPROTO_MAX] = {
52980+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
52981+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
52982+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
52983+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
52984+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
52985+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
52986+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
52987+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
52988+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
52989+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
52990+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
52991+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
52992+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
52993+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
52994+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
52995+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
52996+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
52997+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
52998+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
52999+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
53000+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
53001+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
53002+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
53003+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
53004+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
53005+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
53006+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
53007+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
53008+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
53009+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
53010+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
53011+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
53012+ };
53013+
53014+static const char * gr_socktypes[SOCK_MAX] = {
53015+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
53016+ "unknown:7", "unknown:8", "unknown:9", "packet"
53017+ };
53018+
53019+static const char * gr_sockfamilies[AF_MAX+1] = {
53020+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
53021+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
53022+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
53023+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
53024+ };
53025+
53026+const char *
53027+gr_proto_to_name(unsigned char proto)
53028+{
53029+ return gr_protocols[proto];
53030+}
53031+
53032+const char *
53033+gr_socktype_to_name(unsigned char type)
53034+{
53035+ return gr_socktypes[type];
53036+}
53037+
53038+const char *
53039+gr_sockfamily_to_name(unsigned char family)
53040+{
53041+ return gr_sockfamilies[family];
53042+}
53043+
53044+int
53045+gr_search_socket(const int domain, const int type, const int protocol)
53046+{
53047+ struct acl_subject_label *curr;
53048+ const struct cred *cred = current_cred();
53049+
53050+ if (unlikely(!gr_acl_is_enabled()))
53051+ goto exit;
53052+
53053+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
53054+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
53055+ goto exit; // let the kernel handle it
53056+
53057+ curr = current->acl;
53058+
53059+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
53060+ /* the family is allowed, if this is PF_INET allow it only if
53061+ the extra sock type/protocol checks pass */
53062+ if (domain == PF_INET)
53063+ goto inet_check;
53064+ goto exit;
53065+ } else {
53066+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
53067+ __u32 fakeip = 0;
53068+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
53069+ current->role->roletype, cred->uid,
53070+ cred->gid, current->exec_file ?
53071+ gr_to_filename(current->exec_file->f_path.dentry,
53072+ current->exec_file->f_path.mnt) :
53073+ curr->filename, curr->filename,
53074+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
53075+ &current->signal->saved_ip);
53076+ goto exit;
53077+ }
53078+ goto exit_fail;
53079+ }
53080+
53081+inet_check:
53082+ /* the rest of this checking is for IPv4 only */
53083+ if (!curr->ips)
53084+ goto exit;
53085+
53086+ if ((curr->ip_type & (1 << type)) &&
53087+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
53088+ goto exit;
53089+
53090+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
53091+ /* we don't place acls on raw sockets , and sometimes
53092+ dgram/ip sockets are opened for ioctl and not
53093+ bind/connect, so we'll fake a bind learn log */
53094+ if (type == SOCK_RAW || type == SOCK_PACKET) {
53095+ __u32 fakeip = 0;
53096+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
53097+ current->role->roletype, cred->uid,
53098+ cred->gid, current->exec_file ?
53099+ gr_to_filename(current->exec_file->f_path.dentry,
53100+ current->exec_file->f_path.mnt) :
53101+ curr->filename, curr->filename,
53102+ &fakeip, 0, type,
53103+ protocol, GR_CONNECT, &current->signal->saved_ip);
53104+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
53105+ __u32 fakeip = 0;
53106+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
53107+ current->role->roletype, cred->uid,
53108+ cred->gid, current->exec_file ?
53109+ gr_to_filename(current->exec_file->f_path.dentry,
53110+ current->exec_file->f_path.mnt) :
53111+ curr->filename, curr->filename,
53112+ &fakeip, 0, type,
53113+ protocol, GR_BIND, &current->signal->saved_ip);
53114+ }
53115+ /* we'll log when they use connect or bind */
53116+ goto exit;
53117+ }
53118+
53119+exit_fail:
53120+ if (domain == PF_INET)
53121+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
53122+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
53123+ else
53124+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
53125+ gr_socktype_to_name(type), protocol);
53126+
53127+ return 0;
53128+exit:
53129+ return 1;
53130+}
53131+
53132+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)
53133+{
53134+ if ((ip->mode & mode) &&
53135+ (ip_port >= ip->low) &&
53136+ (ip_port <= ip->high) &&
53137+ ((ntohl(ip_addr) & our_netmask) ==
53138+ (ntohl(our_addr) & our_netmask))
53139+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
53140+ && (ip->type & (1 << type))) {
53141+ if (ip->mode & GR_INVERT)
53142+ return 2; // specifically denied
53143+ else
53144+ return 1; // allowed
53145+ }
53146+
53147+ return 0; // not specifically allowed, may continue parsing
53148+}
53149+
53150+static int
53151+gr_search_connectbind(const int full_mode, struct sock *sk,
53152+ struct sockaddr_in *addr, const int type)
53153+{
53154+ char iface[IFNAMSIZ] = {0};
53155+ struct acl_subject_label *curr;
53156+ struct acl_ip_label *ip;
53157+ struct inet_sock *isk;
53158+ struct net_device *dev;
53159+ struct in_device *idev;
53160+ unsigned long i;
53161+ int ret;
53162+ int mode = full_mode & (GR_BIND | GR_CONNECT);
53163+ __u32 ip_addr = 0;
53164+ __u32 our_addr;
53165+ __u32 our_netmask;
53166+ char *p;
53167+ __u16 ip_port = 0;
53168+ const struct cred *cred = current_cred();
53169+
53170+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
53171+ return 0;
53172+
53173+ curr = current->acl;
53174+ isk = inet_sk(sk);
53175+
53176+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
53177+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
53178+ addr->sin_addr.s_addr = curr->inaddr_any_override;
53179+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
53180+ struct sockaddr_in saddr;
53181+ int err;
53182+
53183+ saddr.sin_family = AF_INET;
53184+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
53185+ saddr.sin_port = isk->inet_sport;
53186+
53187+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
53188+ if (err)
53189+ return err;
53190+
53191+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
53192+ if (err)
53193+ return err;
53194+ }
53195+
53196+ if (!curr->ips)
53197+ return 0;
53198+
53199+ ip_addr = addr->sin_addr.s_addr;
53200+ ip_port = ntohs(addr->sin_port);
53201+
53202+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
53203+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
53204+ current->role->roletype, cred->uid,
53205+ cred->gid, current->exec_file ?
53206+ gr_to_filename(current->exec_file->f_path.dentry,
53207+ current->exec_file->f_path.mnt) :
53208+ curr->filename, curr->filename,
53209+ &ip_addr, ip_port, type,
53210+ sk->sk_protocol, mode, &current->signal->saved_ip);
53211+ return 0;
53212+ }
53213+
53214+ for (i = 0; i < curr->ip_num; i++) {
53215+ ip = *(curr->ips + i);
53216+ if (ip->iface != NULL) {
53217+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
53218+ p = strchr(iface, ':');
53219+ if (p != NULL)
53220+ *p = '\0';
53221+ dev = dev_get_by_name(sock_net(sk), iface);
53222+ if (dev == NULL)
53223+ continue;
53224+ idev = in_dev_get(dev);
53225+ if (idev == NULL) {
53226+ dev_put(dev);
53227+ continue;
53228+ }
53229+ rcu_read_lock();
53230+ for_ifa(idev) {
53231+ if (!strcmp(ip->iface, ifa->ifa_label)) {
53232+ our_addr = ifa->ifa_address;
53233+ our_netmask = 0xffffffff;
53234+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
53235+ if (ret == 1) {
53236+ rcu_read_unlock();
53237+ in_dev_put(idev);
53238+ dev_put(dev);
53239+ return 0;
53240+ } else if (ret == 2) {
53241+ rcu_read_unlock();
53242+ in_dev_put(idev);
53243+ dev_put(dev);
53244+ goto denied;
53245+ }
53246+ }
53247+ } endfor_ifa(idev);
53248+ rcu_read_unlock();
53249+ in_dev_put(idev);
53250+ dev_put(dev);
53251+ } else {
53252+ our_addr = ip->addr;
53253+ our_netmask = ip->netmask;
53254+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
53255+ if (ret == 1)
53256+ return 0;
53257+ else if (ret == 2)
53258+ goto denied;
53259+ }
53260+ }
53261+
53262+denied:
53263+ if (mode == GR_BIND)
53264+ 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));
53265+ else if (mode == GR_CONNECT)
53266+ 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));
53267+
53268+ return -EACCES;
53269+}
53270+
53271+int
53272+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
53273+{
53274+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
53275+}
53276+
53277+int
53278+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
53279+{
53280+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
53281+}
53282+
53283+int gr_search_listen(struct socket *sock)
53284+{
53285+ struct sock *sk = sock->sk;
53286+ struct sockaddr_in addr;
53287+
53288+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
53289+ addr.sin_port = inet_sk(sk)->inet_sport;
53290+
53291+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
53292+}
53293+
53294+int gr_search_accept(struct socket *sock)
53295+{
53296+ struct sock *sk = sock->sk;
53297+ struct sockaddr_in addr;
53298+
53299+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
53300+ addr.sin_port = inet_sk(sk)->inet_sport;
53301+
53302+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
53303+}
53304+
53305+int
53306+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
53307+{
53308+ if (addr)
53309+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
53310+ else {
53311+ struct sockaddr_in sin;
53312+ const struct inet_sock *inet = inet_sk(sk);
53313+
53314+ sin.sin_addr.s_addr = inet->inet_daddr;
53315+ sin.sin_port = inet->inet_dport;
53316+
53317+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
53318+ }
53319+}
53320+
53321+int
53322+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
53323+{
53324+ struct sockaddr_in sin;
53325+
53326+ if (unlikely(skb->len < sizeof (struct udphdr)))
53327+ return 0; // skip this packet
53328+
53329+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
53330+ sin.sin_port = udp_hdr(skb)->source;
53331+
53332+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
53333+}
53334diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
53335new file mode 100644
53336index 0000000..25f54ef
53337--- /dev/null
53338+++ b/grsecurity/gracl_learn.c
53339@@ -0,0 +1,207 @@
53340+#include <linux/kernel.h>
53341+#include <linux/mm.h>
53342+#include <linux/sched.h>
53343+#include <linux/poll.h>
53344+#include <linux/string.h>
53345+#include <linux/file.h>
53346+#include <linux/types.h>
53347+#include <linux/vmalloc.h>
53348+#include <linux/grinternal.h>
53349+
53350+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
53351+ size_t count, loff_t *ppos);
53352+extern int gr_acl_is_enabled(void);
53353+
53354+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
53355+static int gr_learn_attached;
53356+
53357+/* use a 512k buffer */
53358+#define LEARN_BUFFER_SIZE (512 * 1024)
53359+
53360+static DEFINE_SPINLOCK(gr_learn_lock);
53361+static DEFINE_MUTEX(gr_learn_user_mutex);
53362+
53363+/* we need to maintain two buffers, so that the kernel context of grlearn
53364+ uses a semaphore around the userspace copying, and the other kernel contexts
53365+ use a spinlock when copying into the buffer, since they cannot sleep
53366+*/
53367+static char *learn_buffer;
53368+static char *learn_buffer_user;
53369+static int learn_buffer_len;
53370+static int learn_buffer_user_len;
53371+
53372+static ssize_t
53373+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
53374+{
53375+ DECLARE_WAITQUEUE(wait, current);
53376+ ssize_t retval = 0;
53377+
53378+ add_wait_queue(&learn_wait, &wait);
53379+ set_current_state(TASK_INTERRUPTIBLE);
53380+ do {
53381+ mutex_lock(&gr_learn_user_mutex);
53382+ spin_lock(&gr_learn_lock);
53383+ if (learn_buffer_len)
53384+ break;
53385+ spin_unlock(&gr_learn_lock);
53386+ mutex_unlock(&gr_learn_user_mutex);
53387+ if (file->f_flags & O_NONBLOCK) {
53388+ retval = -EAGAIN;
53389+ goto out;
53390+ }
53391+ if (signal_pending(current)) {
53392+ retval = -ERESTARTSYS;
53393+ goto out;
53394+ }
53395+
53396+ schedule();
53397+ } while (1);
53398+
53399+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
53400+ learn_buffer_user_len = learn_buffer_len;
53401+ retval = learn_buffer_len;
53402+ learn_buffer_len = 0;
53403+
53404+ spin_unlock(&gr_learn_lock);
53405+
53406+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
53407+ retval = -EFAULT;
53408+
53409+ mutex_unlock(&gr_learn_user_mutex);
53410+out:
53411+ set_current_state(TASK_RUNNING);
53412+ remove_wait_queue(&learn_wait, &wait);
53413+ return retval;
53414+}
53415+
53416+static unsigned int
53417+poll_learn(struct file * file, poll_table * wait)
53418+{
53419+ poll_wait(file, &learn_wait, wait);
53420+
53421+ if (learn_buffer_len)
53422+ return (POLLIN | POLLRDNORM);
53423+
53424+ return 0;
53425+}
53426+
53427+void
53428+gr_clear_learn_entries(void)
53429+{
53430+ char *tmp;
53431+
53432+ mutex_lock(&gr_learn_user_mutex);
53433+ spin_lock(&gr_learn_lock);
53434+ tmp = learn_buffer;
53435+ learn_buffer = NULL;
53436+ spin_unlock(&gr_learn_lock);
53437+ if (tmp)
53438+ vfree(tmp);
53439+ if (learn_buffer_user != NULL) {
53440+ vfree(learn_buffer_user);
53441+ learn_buffer_user = NULL;
53442+ }
53443+ learn_buffer_len = 0;
53444+ mutex_unlock(&gr_learn_user_mutex);
53445+
53446+ return;
53447+}
53448+
53449+void
53450+gr_add_learn_entry(const char *fmt, ...)
53451+{
53452+ va_list args;
53453+ unsigned int len;
53454+
53455+ if (!gr_learn_attached)
53456+ return;
53457+
53458+ spin_lock(&gr_learn_lock);
53459+
53460+ /* leave a gap at the end so we know when it's "full" but don't have to
53461+ compute the exact length of the string we're trying to append
53462+ */
53463+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
53464+ spin_unlock(&gr_learn_lock);
53465+ wake_up_interruptible(&learn_wait);
53466+ return;
53467+ }
53468+ if (learn_buffer == NULL) {
53469+ spin_unlock(&gr_learn_lock);
53470+ return;
53471+ }
53472+
53473+ va_start(args, fmt);
53474+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
53475+ va_end(args);
53476+
53477+ learn_buffer_len += len + 1;
53478+
53479+ spin_unlock(&gr_learn_lock);
53480+ wake_up_interruptible(&learn_wait);
53481+
53482+ return;
53483+}
53484+
53485+static int
53486+open_learn(struct inode *inode, struct file *file)
53487+{
53488+ if (file->f_mode & FMODE_READ && gr_learn_attached)
53489+ return -EBUSY;
53490+ if (file->f_mode & FMODE_READ) {
53491+ int retval = 0;
53492+ mutex_lock(&gr_learn_user_mutex);
53493+ if (learn_buffer == NULL)
53494+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
53495+ if (learn_buffer_user == NULL)
53496+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
53497+ if (learn_buffer == NULL) {
53498+ retval = -ENOMEM;
53499+ goto out_error;
53500+ }
53501+ if (learn_buffer_user == NULL) {
53502+ retval = -ENOMEM;
53503+ goto out_error;
53504+ }
53505+ learn_buffer_len = 0;
53506+ learn_buffer_user_len = 0;
53507+ gr_learn_attached = 1;
53508+out_error:
53509+ mutex_unlock(&gr_learn_user_mutex);
53510+ return retval;
53511+ }
53512+ return 0;
53513+}
53514+
53515+static int
53516+close_learn(struct inode *inode, struct file *file)
53517+{
53518+ if (file->f_mode & FMODE_READ) {
53519+ char *tmp = NULL;
53520+ mutex_lock(&gr_learn_user_mutex);
53521+ spin_lock(&gr_learn_lock);
53522+ tmp = learn_buffer;
53523+ learn_buffer = NULL;
53524+ spin_unlock(&gr_learn_lock);
53525+ if (tmp)
53526+ vfree(tmp);
53527+ if (learn_buffer_user != NULL) {
53528+ vfree(learn_buffer_user);
53529+ learn_buffer_user = NULL;
53530+ }
53531+ learn_buffer_len = 0;
53532+ learn_buffer_user_len = 0;
53533+ gr_learn_attached = 0;
53534+ mutex_unlock(&gr_learn_user_mutex);
53535+ }
53536+
53537+ return 0;
53538+}
53539+
53540+const struct file_operations grsec_fops = {
53541+ .read = read_learn,
53542+ .write = write_grsec_handler,
53543+ .open = open_learn,
53544+ .release = close_learn,
53545+ .poll = poll_learn,
53546+};
53547diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
53548new file mode 100644
53549index 0000000..39645c9
53550--- /dev/null
53551+++ b/grsecurity/gracl_res.c
53552@@ -0,0 +1,68 @@
53553+#include <linux/kernel.h>
53554+#include <linux/sched.h>
53555+#include <linux/gracl.h>
53556+#include <linux/grinternal.h>
53557+
53558+static const char *restab_log[] = {
53559+ [RLIMIT_CPU] = "RLIMIT_CPU",
53560+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
53561+ [RLIMIT_DATA] = "RLIMIT_DATA",
53562+ [RLIMIT_STACK] = "RLIMIT_STACK",
53563+ [RLIMIT_CORE] = "RLIMIT_CORE",
53564+ [RLIMIT_RSS] = "RLIMIT_RSS",
53565+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
53566+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
53567+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
53568+ [RLIMIT_AS] = "RLIMIT_AS",
53569+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
53570+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
53571+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
53572+ [RLIMIT_NICE] = "RLIMIT_NICE",
53573+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
53574+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
53575+ [GR_CRASH_RES] = "RLIMIT_CRASH"
53576+};
53577+
53578+void
53579+gr_log_resource(const struct task_struct *task,
53580+ const int res, const unsigned long wanted, const int gt)
53581+{
53582+ const struct cred *cred;
53583+ unsigned long rlim;
53584+
53585+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
53586+ return;
53587+
53588+ // not yet supported resource
53589+ if (unlikely(!restab_log[res]))
53590+ return;
53591+
53592+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
53593+ rlim = task_rlimit_max(task, res);
53594+ else
53595+ rlim = task_rlimit(task, res);
53596+
53597+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
53598+ return;
53599+
53600+ rcu_read_lock();
53601+ cred = __task_cred(task);
53602+
53603+ if (res == RLIMIT_NPROC &&
53604+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
53605+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
53606+ goto out_rcu_unlock;
53607+ else if (res == RLIMIT_MEMLOCK &&
53608+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
53609+ goto out_rcu_unlock;
53610+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
53611+ goto out_rcu_unlock;
53612+ rcu_read_unlock();
53613+
53614+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
53615+
53616+ return;
53617+out_rcu_unlock:
53618+ rcu_read_unlock();
53619+ return;
53620+}
53621diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
53622new file mode 100644
53623index 0000000..5556be3
53624--- /dev/null
53625+++ b/grsecurity/gracl_segv.c
53626@@ -0,0 +1,299 @@
53627+#include <linux/kernel.h>
53628+#include <linux/mm.h>
53629+#include <asm/uaccess.h>
53630+#include <asm/errno.h>
53631+#include <asm/mman.h>
53632+#include <net/sock.h>
53633+#include <linux/file.h>
53634+#include <linux/fs.h>
53635+#include <linux/net.h>
53636+#include <linux/in.h>
53637+#include <linux/slab.h>
53638+#include <linux/types.h>
53639+#include <linux/sched.h>
53640+#include <linux/timer.h>
53641+#include <linux/gracl.h>
53642+#include <linux/grsecurity.h>
53643+#include <linux/grinternal.h>
53644+
53645+static struct crash_uid *uid_set;
53646+static unsigned short uid_used;
53647+static DEFINE_SPINLOCK(gr_uid_lock);
53648+extern rwlock_t gr_inode_lock;
53649+extern struct acl_subject_label *
53650+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
53651+ struct acl_role_label *role);
53652+
53653+#ifdef CONFIG_BTRFS_FS
53654+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
53655+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
53656+#endif
53657+
53658+static inline dev_t __get_dev(const struct dentry *dentry)
53659+{
53660+#ifdef CONFIG_BTRFS_FS
53661+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
53662+ return get_btrfs_dev_from_inode(dentry->d_inode);
53663+ else
53664+#endif
53665+ return dentry->d_inode->i_sb->s_dev;
53666+}
53667+
53668+int
53669+gr_init_uidset(void)
53670+{
53671+ uid_set =
53672+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
53673+ uid_used = 0;
53674+
53675+ return uid_set ? 1 : 0;
53676+}
53677+
53678+void
53679+gr_free_uidset(void)
53680+{
53681+ if (uid_set)
53682+ kfree(uid_set);
53683+
53684+ return;
53685+}
53686+
53687+int
53688+gr_find_uid(const uid_t uid)
53689+{
53690+ struct crash_uid *tmp = uid_set;
53691+ uid_t buid;
53692+ int low = 0, high = uid_used - 1, mid;
53693+
53694+ while (high >= low) {
53695+ mid = (low + high) >> 1;
53696+ buid = tmp[mid].uid;
53697+ if (buid == uid)
53698+ return mid;
53699+ if (buid > uid)
53700+ high = mid - 1;
53701+ if (buid < uid)
53702+ low = mid + 1;
53703+ }
53704+
53705+ return -1;
53706+}
53707+
53708+static __inline__ void
53709+gr_insertsort(void)
53710+{
53711+ unsigned short i, j;
53712+ struct crash_uid index;
53713+
53714+ for (i = 1; i < uid_used; i++) {
53715+ index = uid_set[i];
53716+ j = i;
53717+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
53718+ uid_set[j] = uid_set[j - 1];
53719+ j--;
53720+ }
53721+ uid_set[j] = index;
53722+ }
53723+
53724+ return;
53725+}
53726+
53727+static __inline__ void
53728+gr_insert_uid(const uid_t uid, const unsigned long expires)
53729+{
53730+ int loc;
53731+
53732+ if (uid_used == GR_UIDTABLE_MAX)
53733+ return;
53734+
53735+ loc = gr_find_uid(uid);
53736+
53737+ if (loc >= 0) {
53738+ uid_set[loc].expires = expires;
53739+ return;
53740+ }
53741+
53742+ uid_set[uid_used].uid = uid;
53743+ uid_set[uid_used].expires = expires;
53744+ uid_used++;
53745+
53746+ gr_insertsort();
53747+
53748+ return;
53749+}
53750+
53751+void
53752+gr_remove_uid(const unsigned short loc)
53753+{
53754+ unsigned short i;
53755+
53756+ for (i = loc + 1; i < uid_used; i++)
53757+ uid_set[i - 1] = uid_set[i];
53758+
53759+ uid_used--;
53760+
53761+ return;
53762+}
53763+
53764+int
53765+gr_check_crash_uid(const uid_t uid)
53766+{
53767+ int loc;
53768+ int ret = 0;
53769+
53770+ if (unlikely(!gr_acl_is_enabled()))
53771+ return 0;
53772+
53773+ spin_lock(&gr_uid_lock);
53774+ loc = gr_find_uid(uid);
53775+
53776+ if (loc < 0)
53777+ goto out_unlock;
53778+
53779+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
53780+ gr_remove_uid(loc);
53781+ else
53782+ ret = 1;
53783+
53784+out_unlock:
53785+ spin_unlock(&gr_uid_lock);
53786+ return ret;
53787+}
53788+
53789+static __inline__ int
53790+proc_is_setxid(const struct cred *cred)
53791+{
53792+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
53793+ cred->uid != cred->fsuid)
53794+ return 1;
53795+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
53796+ cred->gid != cred->fsgid)
53797+ return 1;
53798+
53799+ return 0;
53800+}
53801+
53802+extern int gr_fake_force_sig(int sig, struct task_struct *t);
53803+
53804+void
53805+gr_handle_crash(struct task_struct *task, const int sig)
53806+{
53807+ struct acl_subject_label *curr;
53808+ struct task_struct *tsk, *tsk2;
53809+ const struct cred *cred;
53810+ const struct cred *cred2;
53811+
53812+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
53813+ return;
53814+
53815+ if (unlikely(!gr_acl_is_enabled()))
53816+ return;
53817+
53818+ curr = task->acl;
53819+
53820+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
53821+ return;
53822+
53823+ if (time_before_eq(curr->expires, get_seconds())) {
53824+ curr->expires = 0;
53825+ curr->crashes = 0;
53826+ }
53827+
53828+ curr->crashes++;
53829+
53830+ if (!curr->expires)
53831+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
53832+
53833+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
53834+ time_after(curr->expires, get_seconds())) {
53835+ rcu_read_lock();
53836+ cred = __task_cred(task);
53837+ if (cred->uid && proc_is_setxid(cred)) {
53838+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
53839+ spin_lock(&gr_uid_lock);
53840+ gr_insert_uid(cred->uid, curr->expires);
53841+ spin_unlock(&gr_uid_lock);
53842+ curr->expires = 0;
53843+ curr->crashes = 0;
53844+ read_lock(&tasklist_lock);
53845+ do_each_thread(tsk2, tsk) {
53846+ cred2 = __task_cred(tsk);
53847+ if (tsk != task && cred2->uid == cred->uid)
53848+ gr_fake_force_sig(SIGKILL, tsk);
53849+ } while_each_thread(tsk2, tsk);
53850+ read_unlock(&tasklist_lock);
53851+ } else {
53852+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
53853+ read_lock(&tasklist_lock);
53854+ read_lock(&grsec_exec_file_lock);
53855+ do_each_thread(tsk2, tsk) {
53856+ if (likely(tsk != task)) {
53857+ // if this thread has the same subject as the one that triggered
53858+ // RES_CRASH and it's the same binary, kill it
53859+ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
53860+ gr_fake_force_sig(SIGKILL, tsk);
53861+ }
53862+ } while_each_thread(tsk2, tsk);
53863+ read_unlock(&grsec_exec_file_lock);
53864+ read_unlock(&tasklist_lock);
53865+ }
53866+ rcu_read_unlock();
53867+ }
53868+
53869+ return;
53870+}
53871+
53872+int
53873+gr_check_crash_exec(const struct file *filp)
53874+{
53875+ struct acl_subject_label *curr;
53876+
53877+ if (unlikely(!gr_acl_is_enabled()))
53878+ return 0;
53879+
53880+ read_lock(&gr_inode_lock);
53881+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
53882+ __get_dev(filp->f_path.dentry),
53883+ current->role);
53884+ read_unlock(&gr_inode_lock);
53885+
53886+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
53887+ (!curr->crashes && !curr->expires))
53888+ return 0;
53889+
53890+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
53891+ time_after(curr->expires, get_seconds()))
53892+ return 1;
53893+ else if (time_before_eq(curr->expires, get_seconds())) {
53894+ curr->crashes = 0;
53895+ curr->expires = 0;
53896+ }
53897+
53898+ return 0;
53899+}
53900+
53901+void
53902+gr_handle_alertkill(struct task_struct *task)
53903+{
53904+ struct acl_subject_label *curracl;
53905+ __u32 curr_ip;
53906+ struct task_struct *p, *p2;
53907+
53908+ if (unlikely(!gr_acl_is_enabled()))
53909+ return;
53910+
53911+ curracl = task->acl;
53912+ curr_ip = task->signal->curr_ip;
53913+
53914+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
53915+ read_lock(&tasklist_lock);
53916+ do_each_thread(p2, p) {
53917+ if (p->signal->curr_ip == curr_ip)
53918+ gr_fake_force_sig(SIGKILL, p);
53919+ } while_each_thread(p2, p);
53920+ read_unlock(&tasklist_lock);
53921+ } else if (curracl->mode & GR_KILLPROC)
53922+ gr_fake_force_sig(SIGKILL, task);
53923+
53924+ return;
53925+}
53926diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
53927new file mode 100644
53928index 0000000..9d83a69
53929--- /dev/null
53930+++ b/grsecurity/gracl_shm.c
53931@@ -0,0 +1,40 @@
53932+#include <linux/kernel.h>
53933+#include <linux/mm.h>
53934+#include <linux/sched.h>
53935+#include <linux/file.h>
53936+#include <linux/ipc.h>
53937+#include <linux/gracl.h>
53938+#include <linux/grsecurity.h>
53939+#include <linux/grinternal.h>
53940+
53941+int
53942+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
53943+ const time_t shm_createtime, const uid_t cuid, const int shmid)
53944+{
53945+ struct task_struct *task;
53946+
53947+ if (!gr_acl_is_enabled())
53948+ return 1;
53949+
53950+ rcu_read_lock();
53951+ read_lock(&tasklist_lock);
53952+
53953+ task = find_task_by_vpid(shm_cprid);
53954+
53955+ if (unlikely(!task))
53956+ task = find_task_by_vpid(shm_lapid);
53957+
53958+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
53959+ (task->pid == shm_lapid)) &&
53960+ (task->acl->mode & GR_PROTSHM) &&
53961+ (task->acl != current->acl))) {
53962+ read_unlock(&tasklist_lock);
53963+ rcu_read_unlock();
53964+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
53965+ return 0;
53966+ }
53967+ read_unlock(&tasklist_lock);
53968+ rcu_read_unlock();
53969+
53970+ return 1;
53971+}
53972diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
53973new file mode 100644
53974index 0000000..bc0be01
53975--- /dev/null
53976+++ b/grsecurity/grsec_chdir.c
53977@@ -0,0 +1,19 @@
53978+#include <linux/kernel.h>
53979+#include <linux/sched.h>
53980+#include <linux/fs.h>
53981+#include <linux/file.h>
53982+#include <linux/grsecurity.h>
53983+#include <linux/grinternal.h>
53984+
53985+void
53986+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
53987+{
53988+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
53989+ if ((grsec_enable_chdir && grsec_enable_group &&
53990+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
53991+ !grsec_enable_group)) {
53992+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
53993+ }
53994+#endif
53995+ return;
53996+}
53997diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
53998new file mode 100644
53999index 0000000..a2dc675
54000--- /dev/null
54001+++ b/grsecurity/grsec_chroot.c
54002@@ -0,0 +1,351 @@
54003+#include <linux/kernel.h>
54004+#include <linux/module.h>
54005+#include <linux/sched.h>
54006+#include <linux/file.h>
54007+#include <linux/fs.h>
54008+#include <linux/mount.h>
54009+#include <linux/types.h>
54010+#include <linux/pid_namespace.h>
54011+#include <linux/grsecurity.h>
54012+#include <linux/grinternal.h>
54013+
54014+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
54015+{
54016+#ifdef CONFIG_GRKERNSEC
54017+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
54018+ path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
54019+ task->gr_is_chrooted = 1;
54020+ else
54021+ task->gr_is_chrooted = 0;
54022+
54023+ task->gr_chroot_dentry = path->dentry;
54024+#endif
54025+ return;
54026+}
54027+
54028+void gr_clear_chroot_entries(struct task_struct *task)
54029+{
54030+#ifdef CONFIG_GRKERNSEC
54031+ task->gr_is_chrooted = 0;
54032+ task->gr_chroot_dentry = NULL;
54033+#endif
54034+ return;
54035+}
54036+
54037+int
54038+gr_handle_chroot_unix(const pid_t pid)
54039+{
54040+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
54041+ struct task_struct *p;
54042+
54043+ if (unlikely(!grsec_enable_chroot_unix))
54044+ return 1;
54045+
54046+ if (likely(!proc_is_chrooted(current)))
54047+ return 1;
54048+
54049+ rcu_read_lock();
54050+ read_lock(&tasklist_lock);
54051+ p = find_task_by_vpid_unrestricted(pid);
54052+ if (unlikely(p && !have_same_root(current, p))) {
54053+ read_unlock(&tasklist_lock);
54054+ rcu_read_unlock();
54055+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
54056+ return 0;
54057+ }
54058+ read_unlock(&tasklist_lock);
54059+ rcu_read_unlock();
54060+#endif
54061+ return 1;
54062+}
54063+
54064+int
54065+gr_handle_chroot_nice(void)
54066+{
54067+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
54068+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
54069+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
54070+ return -EPERM;
54071+ }
54072+#endif
54073+ return 0;
54074+}
54075+
54076+int
54077+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
54078+{
54079+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
54080+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
54081+ && proc_is_chrooted(current)) {
54082+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
54083+ return -EACCES;
54084+ }
54085+#endif
54086+ return 0;
54087+}
54088+
54089+int
54090+gr_handle_chroot_rawio(const struct inode *inode)
54091+{
54092+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
54093+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
54094+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
54095+ return 1;
54096+#endif
54097+ return 0;
54098+}
54099+
54100+int
54101+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
54102+{
54103+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
54104+ struct task_struct *p;
54105+ int ret = 0;
54106+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
54107+ return ret;
54108+
54109+ read_lock(&tasklist_lock);
54110+ do_each_pid_task(pid, type, p) {
54111+ if (!have_same_root(current, p)) {
54112+ ret = 1;
54113+ goto out;
54114+ }
54115+ } while_each_pid_task(pid, type, p);
54116+out:
54117+ read_unlock(&tasklist_lock);
54118+ return ret;
54119+#endif
54120+ return 0;
54121+}
54122+
54123+int
54124+gr_pid_is_chrooted(struct task_struct *p)
54125+{
54126+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
54127+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
54128+ return 0;
54129+
54130+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
54131+ !have_same_root(current, p)) {
54132+ return 1;
54133+ }
54134+#endif
54135+ return 0;
54136+}
54137+
54138+EXPORT_SYMBOL(gr_pid_is_chrooted);
54139+
54140+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
54141+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
54142+{
54143+ struct path path, currentroot;
54144+ int ret = 0;
54145+
54146+ path.dentry = (struct dentry *)u_dentry;
54147+ path.mnt = (struct vfsmount *)u_mnt;
54148+ get_fs_root(current->fs, &currentroot);
54149+ if (path_is_under(&path, &currentroot))
54150+ ret = 1;
54151+ path_put(&currentroot);
54152+
54153+ return ret;
54154+}
54155+#endif
54156+
54157+int
54158+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
54159+{
54160+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
54161+ if (!grsec_enable_chroot_fchdir)
54162+ return 1;
54163+
54164+ if (!proc_is_chrooted(current))
54165+ return 1;
54166+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
54167+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
54168+ return 0;
54169+ }
54170+#endif
54171+ return 1;
54172+}
54173+
54174+int
54175+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
54176+ const time_t shm_createtime)
54177+{
54178+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
54179+ struct task_struct *p;
54180+ time_t starttime;
54181+
54182+ if (unlikely(!grsec_enable_chroot_shmat))
54183+ return 1;
54184+
54185+ if (likely(!proc_is_chrooted(current)))
54186+ return 1;
54187+
54188+ rcu_read_lock();
54189+ read_lock(&tasklist_lock);
54190+
54191+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
54192+ starttime = p->start_time.tv_sec;
54193+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
54194+ if (have_same_root(current, p)) {
54195+ goto allow;
54196+ } else {
54197+ read_unlock(&tasklist_lock);
54198+ rcu_read_unlock();
54199+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
54200+ return 0;
54201+ }
54202+ }
54203+ /* creator exited, pid reuse, fall through to next check */
54204+ }
54205+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
54206+ if (unlikely(!have_same_root(current, p))) {
54207+ read_unlock(&tasklist_lock);
54208+ rcu_read_unlock();
54209+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
54210+ return 0;
54211+ }
54212+ }
54213+
54214+allow:
54215+ read_unlock(&tasklist_lock);
54216+ rcu_read_unlock();
54217+#endif
54218+ return 1;
54219+}
54220+
54221+void
54222+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
54223+{
54224+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
54225+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
54226+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
54227+#endif
54228+ return;
54229+}
54230+
54231+int
54232+gr_handle_chroot_mknod(const struct dentry *dentry,
54233+ const struct vfsmount *mnt, const int mode)
54234+{
54235+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
54236+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
54237+ proc_is_chrooted(current)) {
54238+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
54239+ return -EPERM;
54240+ }
54241+#endif
54242+ return 0;
54243+}
54244+
54245+int
54246+gr_handle_chroot_mount(const struct dentry *dentry,
54247+ const struct vfsmount *mnt, const char *dev_name)
54248+{
54249+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
54250+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
54251+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
54252+ return -EPERM;
54253+ }
54254+#endif
54255+ return 0;
54256+}
54257+
54258+int
54259+gr_handle_chroot_pivot(void)
54260+{
54261+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
54262+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
54263+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
54264+ return -EPERM;
54265+ }
54266+#endif
54267+ return 0;
54268+}
54269+
54270+int
54271+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
54272+{
54273+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
54274+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
54275+ !gr_is_outside_chroot(dentry, mnt)) {
54276+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
54277+ return -EPERM;
54278+ }
54279+#endif
54280+ return 0;
54281+}
54282+
54283+extern const char *captab_log[];
54284+extern int captab_log_entries;
54285+
54286+int
54287+gr_chroot_is_capable(const int cap)
54288+{
54289+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
54290+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
54291+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
54292+ if (cap_raised(chroot_caps, cap)) {
54293+ const struct cred *creds = current_cred();
54294+ if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
54295+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
54296+ }
54297+ return 0;
54298+ }
54299+ }
54300+#endif
54301+ return 1;
54302+}
54303+
54304+int
54305+gr_chroot_is_capable_nolog(const int cap)
54306+{
54307+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
54308+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
54309+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
54310+ if (cap_raised(chroot_caps, cap)) {
54311+ return 0;
54312+ }
54313+ }
54314+#endif
54315+ return 1;
54316+}
54317+
54318+int
54319+gr_handle_chroot_sysctl(const int op)
54320+{
54321+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
54322+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
54323+ proc_is_chrooted(current))
54324+ return -EACCES;
54325+#endif
54326+ return 0;
54327+}
54328+
54329+void
54330+gr_handle_chroot_chdir(struct path *path)
54331+{
54332+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
54333+ if (grsec_enable_chroot_chdir)
54334+ set_fs_pwd(current->fs, path);
54335+#endif
54336+ return;
54337+}
54338+
54339+int
54340+gr_handle_chroot_chmod(const struct dentry *dentry,
54341+ const struct vfsmount *mnt, const int mode)
54342+{
54343+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
54344+ /* allow chmod +s on directories, but not files */
54345+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
54346+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
54347+ proc_is_chrooted(current)) {
54348+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
54349+ return -EPERM;
54350+ }
54351+#endif
54352+ return 0;
54353+}
54354diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
54355new file mode 100644
54356index 0000000..d81a586
54357--- /dev/null
54358+++ b/grsecurity/grsec_disabled.c
54359@@ -0,0 +1,439 @@
54360+#include <linux/kernel.h>
54361+#include <linux/module.h>
54362+#include <linux/sched.h>
54363+#include <linux/file.h>
54364+#include <linux/fs.h>
54365+#include <linux/kdev_t.h>
54366+#include <linux/net.h>
54367+#include <linux/in.h>
54368+#include <linux/ip.h>
54369+#include <linux/skbuff.h>
54370+#include <linux/sysctl.h>
54371+
54372+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
54373+void
54374+pax_set_initial_flags(struct linux_binprm *bprm)
54375+{
54376+ return;
54377+}
54378+#endif
54379+
54380+#ifdef CONFIG_SYSCTL
54381+__u32
54382+gr_handle_sysctl(const struct ctl_table * table, const int op)
54383+{
54384+ return 0;
54385+}
54386+#endif
54387+
54388+#ifdef CONFIG_TASKSTATS
54389+int gr_is_taskstats_denied(int pid)
54390+{
54391+ return 0;
54392+}
54393+#endif
54394+
54395+int
54396+gr_acl_is_enabled(void)
54397+{
54398+ return 0;
54399+}
54400+
54401+void
54402+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
54403+{
54404+ return;
54405+}
54406+
54407+int
54408+gr_handle_rawio(const struct inode *inode)
54409+{
54410+ return 0;
54411+}
54412+
54413+void
54414+gr_acl_handle_psacct(struct task_struct *task, const long code)
54415+{
54416+ return;
54417+}
54418+
54419+int
54420+gr_handle_ptrace(struct task_struct *task, const long request)
54421+{
54422+ return 0;
54423+}
54424+
54425+int
54426+gr_handle_proc_ptrace(struct task_struct *task)
54427+{
54428+ return 0;
54429+}
54430+
54431+void
54432+gr_learn_resource(const struct task_struct *task,
54433+ const int res, const unsigned long wanted, const int gt)
54434+{
54435+ return;
54436+}
54437+
54438+int
54439+gr_set_acls(const int type)
54440+{
54441+ return 0;
54442+}
54443+
54444+int
54445+gr_check_hidden_task(const struct task_struct *tsk)
54446+{
54447+ return 0;
54448+}
54449+
54450+int
54451+gr_check_protected_task(const struct task_struct *task)
54452+{
54453+ return 0;
54454+}
54455+
54456+int
54457+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
54458+{
54459+ return 0;
54460+}
54461+
54462+void
54463+gr_copy_label(struct task_struct *tsk)
54464+{
54465+ return;
54466+}
54467+
54468+void
54469+gr_set_pax_flags(struct task_struct *task)
54470+{
54471+ return;
54472+}
54473+
54474+int
54475+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
54476+ const int unsafe_share)
54477+{
54478+ return 0;
54479+}
54480+
54481+void
54482+gr_handle_delete(const ino_t ino, const dev_t dev)
54483+{
54484+ return;
54485+}
54486+
54487+void
54488+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
54489+{
54490+ return;
54491+}
54492+
54493+void
54494+gr_handle_crash(struct task_struct *task, const int sig)
54495+{
54496+ return;
54497+}
54498+
54499+int
54500+gr_check_crash_exec(const struct file *filp)
54501+{
54502+ return 0;
54503+}
54504+
54505+int
54506+gr_check_crash_uid(const uid_t uid)
54507+{
54508+ return 0;
54509+}
54510+
54511+void
54512+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
54513+ struct dentry *old_dentry,
54514+ struct dentry *new_dentry,
54515+ struct vfsmount *mnt, const __u8 replace)
54516+{
54517+ return;
54518+}
54519+
54520+int
54521+gr_search_socket(const int family, const int type, const int protocol)
54522+{
54523+ return 1;
54524+}
54525+
54526+int
54527+gr_search_connectbind(const int mode, const struct socket *sock,
54528+ const struct sockaddr_in *addr)
54529+{
54530+ return 0;
54531+}
54532+
54533+void
54534+gr_handle_alertkill(struct task_struct *task)
54535+{
54536+ return;
54537+}
54538+
54539+__u32
54540+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
54541+{
54542+ return 1;
54543+}
54544+
54545+__u32
54546+gr_acl_handle_hidden_file(const struct dentry * dentry,
54547+ const struct vfsmount * mnt)
54548+{
54549+ return 1;
54550+}
54551+
54552+__u32
54553+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
54554+ int acc_mode)
54555+{
54556+ return 1;
54557+}
54558+
54559+__u32
54560+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
54561+{
54562+ return 1;
54563+}
54564+
54565+__u32
54566+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
54567+{
54568+ return 1;
54569+}
54570+
54571+int
54572+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
54573+ unsigned int *vm_flags)
54574+{
54575+ return 1;
54576+}
54577+
54578+__u32
54579+gr_acl_handle_truncate(const struct dentry * dentry,
54580+ const struct vfsmount * mnt)
54581+{
54582+ return 1;
54583+}
54584+
54585+__u32
54586+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
54587+{
54588+ return 1;
54589+}
54590+
54591+__u32
54592+gr_acl_handle_access(const struct dentry * dentry,
54593+ const struct vfsmount * mnt, const int fmode)
54594+{
54595+ return 1;
54596+}
54597+
54598+__u32
54599+gr_acl_handle_fchmod(const struct dentry * dentry, const struct vfsmount * mnt,
54600+ mode_t mode)
54601+{
54602+ return 1;
54603+}
54604+
54605+__u32
54606+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
54607+ mode_t mode)
54608+{
54609+ return 1;
54610+}
54611+
54612+__u32
54613+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
54614+{
54615+ return 1;
54616+}
54617+
54618+__u32
54619+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
54620+{
54621+ return 1;
54622+}
54623+
54624+void
54625+grsecurity_init(void)
54626+{
54627+ return;
54628+}
54629+
54630+__u32
54631+gr_acl_handle_mknod(const struct dentry * new_dentry,
54632+ const struct dentry * parent_dentry,
54633+ const struct vfsmount * parent_mnt,
54634+ const int mode)
54635+{
54636+ return 1;
54637+}
54638+
54639+__u32
54640+gr_acl_handle_mkdir(const struct dentry * new_dentry,
54641+ const struct dentry * parent_dentry,
54642+ const struct vfsmount * parent_mnt)
54643+{
54644+ return 1;
54645+}
54646+
54647+__u32
54648+gr_acl_handle_symlink(const struct dentry * new_dentry,
54649+ const struct dentry * parent_dentry,
54650+ const struct vfsmount * parent_mnt, const char *from)
54651+{
54652+ return 1;
54653+}
54654+
54655+__u32
54656+gr_acl_handle_link(const struct dentry * new_dentry,
54657+ const struct dentry * parent_dentry,
54658+ const struct vfsmount * parent_mnt,
54659+ const struct dentry * old_dentry,
54660+ const struct vfsmount * old_mnt, const char *to)
54661+{
54662+ return 1;
54663+}
54664+
54665+int
54666+gr_acl_handle_rename(const struct dentry *new_dentry,
54667+ const struct dentry *parent_dentry,
54668+ const struct vfsmount *parent_mnt,
54669+ const struct dentry *old_dentry,
54670+ const struct inode *old_parent_inode,
54671+ const struct vfsmount *old_mnt, const char *newname)
54672+{
54673+ return 0;
54674+}
54675+
54676+int
54677+gr_acl_handle_filldir(const struct file *file, const char *name,
54678+ const int namelen, const ino_t ino)
54679+{
54680+ return 1;
54681+}
54682+
54683+int
54684+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
54685+ const time_t shm_createtime, const uid_t cuid, const int shmid)
54686+{
54687+ return 1;
54688+}
54689+
54690+int
54691+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
54692+{
54693+ return 0;
54694+}
54695+
54696+int
54697+gr_search_accept(const struct socket *sock)
54698+{
54699+ return 0;
54700+}
54701+
54702+int
54703+gr_search_listen(const struct socket *sock)
54704+{
54705+ return 0;
54706+}
54707+
54708+int
54709+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
54710+{
54711+ return 0;
54712+}
54713+
54714+__u32
54715+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
54716+{
54717+ return 1;
54718+}
54719+
54720+__u32
54721+gr_acl_handle_creat(const struct dentry * dentry,
54722+ const struct dentry * p_dentry,
54723+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
54724+ const int imode)
54725+{
54726+ return 1;
54727+}
54728+
54729+void
54730+gr_acl_handle_exit(void)
54731+{
54732+ return;
54733+}
54734+
54735+int
54736+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
54737+{
54738+ return 1;
54739+}
54740+
54741+void
54742+gr_set_role_label(const uid_t uid, const gid_t gid)
54743+{
54744+ return;
54745+}
54746+
54747+int
54748+gr_acl_handle_procpidmem(const struct task_struct *task)
54749+{
54750+ return 0;
54751+}
54752+
54753+int
54754+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
54755+{
54756+ return 0;
54757+}
54758+
54759+int
54760+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
54761+{
54762+ return 0;
54763+}
54764+
54765+void
54766+gr_set_kernel_label(struct task_struct *task)
54767+{
54768+ return;
54769+}
54770+
54771+int
54772+gr_check_user_change(int real, int effective, int fs)
54773+{
54774+ return 0;
54775+}
54776+
54777+int
54778+gr_check_group_change(int real, int effective, int fs)
54779+{
54780+ return 0;
54781+}
54782+
54783+int gr_acl_enable_at_secure(void)
54784+{
54785+ return 0;
54786+}
54787+
54788+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
54789+{
54790+ return dentry->d_inode->i_sb->s_dev;
54791+}
54792+
54793+EXPORT_SYMBOL(gr_learn_resource);
54794+EXPORT_SYMBOL(gr_set_kernel_label);
54795+#ifdef CONFIG_SECURITY
54796+EXPORT_SYMBOL(gr_check_user_change);
54797+EXPORT_SYMBOL(gr_check_group_change);
54798+#endif
54799diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
54800new file mode 100644
54801index 0000000..2b05ada
54802--- /dev/null
54803+++ b/grsecurity/grsec_exec.c
54804@@ -0,0 +1,146 @@
54805+#include <linux/kernel.h>
54806+#include <linux/sched.h>
54807+#include <linux/file.h>
54808+#include <linux/binfmts.h>
54809+#include <linux/fs.h>
54810+#include <linux/types.h>
54811+#include <linux/grdefs.h>
54812+#include <linux/grsecurity.h>
54813+#include <linux/grinternal.h>
54814+#include <linux/capability.h>
54815+#include <linux/module.h>
54816+
54817+#include <asm/uaccess.h>
54818+
54819+#ifdef CONFIG_GRKERNSEC_EXECLOG
54820+static char gr_exec_arg_buf[132];
54821+static DEFINE_MUTEX(gr_exec_arg_mutex);
54822+#endif
54823+
54824+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
54825+
54826+void
54827+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
54828+{
54829+#ifdef CONFIG_GRKERNSEC_EXECLOG
54830+ char *grarg = gr_exec_arg_buf;
54831+ unsigned int i, x, execlen = 0;
54832+ char c;
54833+
54834+ if (!((grsec_enable_execlog && grsec_enable_group &&
54835+ in_group_p(grsec_audit_gid))
54836+ || (grsec_enable_execlog && !grsec_enable_group)))
54837+ return;
54838+
54839+ mutex_lock(&gr_exec_arg_mutex);
54840+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
54841+
54842+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
54843+ const char __user *p;
54844+ unsigned int len;
54845+
54846+ p = get_user_arg_ptr(argv, i);
54847+ if (IS_ERR(p))
54848+ goto log;
54849+
54850+ len = strnlen_user(p, 128 - execlen);
54851+ if (len > 128 - execlen)
54852+ len = 128 - execlen;
54853+ else if (len > 0)
54854+ len--;
54855+ if (copy_from_user(grarg + execlen, p, len))
54856+ goto log;
54857+
54858+ /* rewrite unprintable characters */
54859+ for (x = 0; x < len; x++) {
54860+ c = *(grarg + execlen + x);
54861+ if (c < 32 || c > 126)
54862+ *(grarg + execlen + x) = ' ';
54863+ }
54864+
54865+ execlen += len;
54866+ *(grarg + execlen) = ' ';
54867+ *(grarg + execlen + 1) = '\0';
54868+ execlen++;
54869+ }
54870+
54871+ log:
54872+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
54873+ bprm->file->f_path.mnt, grarg);
54874+ mutex_unlock(&gr_exec_arg_mutex);
54875+#endif
54876+ return;
54877+}
54878+
54879+#ifdef CONFIG_GRKERNSEC
54880+extern int gr_acl_is_capable(const int cap);
54881+extern int gr_acl_is_capable_nolog(const int cap);
54882+extern int gr_chroot_is_capable(const int cap);
54883+extern int gr_chroot_is_capable_nolog(const int cap);
54884+#endif
54885+
54886+const char *captab_log[] = {
54887+ "CAP_CHOWN",
54888+ "CAP_DAC_OVERRIDE",
54889+ "CAP_DAC_READ_SEARCH",
54890+ "CAP_FOWNER",
54891+ "CAP_FSETID",
54892+ "CAP_KILL",
54893+ "CAP_SETGID",
54894+ "CAP_SETUID",
54895+ "CAP_SETPCAP",
54896+ "CAP_LINUX_IMMUTABLE",
54897+ "CAP_NET_BIND_SERVICE",
54898+ "CAP_NET_BROADCAST",
54899+ "CAP_NET_ADMIN",
54900+ "CAP_NET_RAW",
54901+ "CAP_IPC_LOCK",
54902+ "CAP_IPC_OWNER",
54903+ "CAP_SYS_MODULE",
54904+ "CAP_SYS_RAWIO",
54905+ "CAP_SYS_CHROOT",
54906+ "CAP_SYS_PTRACE",
54907+ "CAP_SYS_PACCT",
54908+ "CAP_SYS_ADMIN",
54909+ "CAP_SYS_BOOT",
54910+ "CAP_SYS_NICE",
54911+ "CAP_SYS_RESOURCE",
54912+ "CAP_SYS_TIME",
54913+ "CAP_SYS_TTY_CONFIG",
54914+ "CAP_MKNOD",
54915+ "CAP_LEASE",
54916+ "CAP_AUDIT_WRITE",
54917+ "CAP_AUDIT_CONTROL",
54918+ "CAP_SETFCAP",
54919+ "CAP_MAC_OVERRIDE",
54920+ "CAP_MAC_ADMIN",
54921+ "CAP_SYSLOG",
54922+ "CAP_WAKE_ALARM"
54923+};
54924+
54925+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
54926+
54927+int gr_is_capable(const int cap)
54928+{
54929+#ifdef CONFIG_GRKERNSEC
54930+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
54931+ return 1;
54932+ return 0;
54933+#else
54934+ return 1;
54935+#endif
54936+}
54937+
54938+int gr_is_capable_nolog(const int cap)
54939+{
54940+#ifdef CONFIG_GRKERNSEC
54941+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
54942+ return 1;
54943+ return 0;
54944+#else
54945+ return 1;
54946+#endif
54947+}
54948+
54949+EXPORT_SYMBOL(gr_is_capable);
54950+EXPORT_SYMBOL(gr_is_capable_nolog);
54951diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
54952new file mode 100644
54953index 0000000..d3ee748
54954--- /dev/null
54955+++ b/grsecurity/grsec_fifo.c
54956@@ -0,0 +1,24 @@
54957+#include <linux/kernel.h>
54958+#include <linux/sched.h>
54959+#include <linux/fs.h>
54960+#include <linux/file.h>
54961+#include <linux/grinternal.h>
54962+
54963+int
54964+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
54965+ const struct dentry *dir, const int flag, const int acc_mode)
54966+{
54967+#ifdef CONFIG_GRKERNSEC_FIFO
54968+ const struct cred *cred = current_cred();
54969+
54970+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
54971+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
54972+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
54973+ (cred->fsuid != dentry->d_inode->i_uid)) {
54974+ if (!inode_permission(dentry->d_inode, acc_mode))
54975+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
54976+ return -EACCES;
54977+ }
54978+#endif
54979+ return 0;
54980+}
54981diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
54982new file mode 100644
54983index 0000000..8ca18bf
54984--- /dev/null
54985+++ b/grsecurity/grsec_fork.c
54986@@ -0,0 +1,23 @@
54987+#include <linux/kernel.h>
54988+#include <linux/sched.h>
54989+#include <linux/grsecurity.h>
54990+#include <linux/grinternal.h>
54991+#include <linux/errno.h>
54992+
54993+void
54994+gr_log_forkfail(const int retval)
54995+{
54996+#ifdef CONFIG_GRKERNSEC_FORKFAIL
54997+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
54998+ switch (retval) {
54999+ case -EAGAIN:
55000+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
55001+ break;
55002+ case -ENOMEM:
55003+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
55004+ break;
55005+ }
55006+ }
55007+#endif
55008+ return;
55009+}
55010diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
55011new file mode 100644
55012index 0000000..01ddde4
55013--- /dev/null
55014+++ b/grsecurity/grsec_init.c
55015@@ -0,0 +1,277 @@
55016+#include <linux/kernel.h>
55017+#include <linux/sched.h>
55018+#include <linux/mm.h>
55019+#include <linux/gracl.h>
55020+#include <linux/slab.h>
55021+#include <linux/vmalloc.h>
55022+#include <linux/percpu.h>
55023+#include <linux/module.h>
55024+
55025+int grsec_enable_ptrace_readexec;
55026+int grsec_enable_setxid;
55027+int grsec_enable_brute;
55028+int grsec_enable_link;
55029+int grsec_enable_dmesg;
55030+int grsec_enable_harden_ptrace;
55031+int grsec_enable_fifo;
55032+int grsec_enable_execlog;
55033+int grsec_enable_signal;
55034+int grsec_enable_forkfail;
55035+int grsec_enable_audit_ptrace;
55036+int grsec_enable_time;
55037+int grsec_enable_audit_textrel;
55038+int grsec_enable_group;
55039+int grsec_audit_gid;
55040+int grsec_enable_chdir;
55041+int grsec_enable_mount;
55042+int grsec_enable_rofs;
55043+int grsec_enable_chroot_findtask;
55044+int grsec_enable_chroot_mount;
55045+int grsec_enable_chroot_shmat;
55046+int grsec_enable_chroot_fchdir;
55047+int grsec_enable_chroot_double;
55048+int grsec_enable_chroot_pivot;
55049+int grsec_enable_chroot_chdir;
55050+int grsec_enable_chroot_chmod;
55051+int grsec_enable_chroot_mknod;
55052+int grsec_enable_chroot_nice;
55053+int grsec_enable_chroot_execlog;
55054+int grsec_enable_chroot_caps;
55055+int grsec_enable_chroot_sysctl;
55056+int grsec_enable_chroot_unix;
55057+int grsec_enable_tpe;
55058+int grsec_tpe_gid;
55059+int grsec_enable_blackhole;
55060+#ifdef CONFIG_IPV6_MODULE
55061+EXPORT_SYMBOL(grsec_enable_blackhole);
55062+#endif
55063+int grsec_lastack_retries;
55064+int grsec_enable_tpe_all;
55065+int grsec_enable_tpe_invert;
55066+int grsec_enable_socket_all;
55067+int grsec_socket_all_gid;
55068+int grsec_enable_socket_client;
55069+int grsec_socket_client_gid;
55070+int grsec_enable_socket_server;
55071+int grsec_socket_server_gid;
55072+int grsec_resource_logging;
55073+int grsec_disable_privio;
55074+int grsec_enable_log_rwxmaps;
55075+int grsec_lock;
55076+
55077+DEFINE_SPINLOCK(grsec_alert_lock);
55078+unsigned long grsec_alert_wtime = 0;
55079+unsigned long grsec_alert_fyet = 0;
55080+
55081+DEFINE_SPINLOCK(grsec_audit_lock);
55082+
55083+DEFINE_RWLOCK(grsec_exec_file_lock);
55084+
55085+char *gr_shared_page[4];
55086+
55087+char *gr_alert_log_fmt;
55088+char *gr_audit_log_fmt;
55089+char *gr_alert_log_buf;
55090+char *gr_audit_log_buf;
55091+
55092+extern struct gr_arg *gr_usermode;
55093+extern unsigned char *gr_system_salt;
55094+extern unsigned char *gr_system_sum;
55095+
55096+void __init
55097+grsecurity_init(void)
55098+{
55099+ int j;
55100+ /* create the per-cpu shared pages */
55101+
55102+#ifdef CONFIG_X86
55103+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
55104+#endif
55105+
55106+ for (j = 0; j < 4; j++) {
55107+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
55108+ if (gr_shared_page[j] == NULL) {
55109+ panic("Unable to allocate grsecurity shared page");
55110+ return;
55111+ }
55112+ }
55113+
55114+ /* allocate log buffers */
55115+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
55116+ if (!gr_alert_log_fmt) {
55117+ panic("Unable to allocate grsecurity alert log format buffer");
55118+ return;
55119+ }
55120+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
55121+ if (!gr_audit_log_fmt) {
55122+ panic("Unable to allocate grsecurity audit log format buffer");
55123+ return;
55124+ }
55125+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
55126+ if (!gr_alert_log_buf) {
55127+ panic("Unable to allocate grsecurity alert log buffer");
55128+ return;
55129+ }
55130+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
55131+ if (!gr_audit_log_buf) {
55132+ panic("Unable to allocate grsecurity audit log buffer");
55133+ return;
55134+ }
55135+
55136+ /* allocate memory for authentication structure */
55137+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
55138+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
55139+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
55140+
55141+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
55142+ panic("Unable to allocate grsecurity authentication structure");
55143+ return;
55144+ }
55145+
55146+
55147+#ifdef CONFIG_GRKERNSEC_IO
55148+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
55149+ grsec_disable_privio = 1;
55150+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
55151+ grsec_disable_privio = 1;
55152+#else
55153+ grsec_disable_privio = 0;
55154+#endif
55155+#endif
55156+
55157+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
55158+ /* for backward compatibility, tpe_invert always defaults to on if
55159+ enabled in the kernel
55160+ */
55161+ grsec_enable_tpe_invert = 1;
55162+#endif
55163+
55164+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
55165+#ifndef CONFIG_GRKERNSEC_SYSCTL
55166+ grsec_lock = 1;
55167+#endif
55168+
55169+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
55170+ grsec_enable_audit_textrel = 1;
55171+#endif
55172+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
55173+ grsec_enable_log_rwxmaps = 1;
55174+#endif
55175+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
55176+ grsec_enable_group = 1;
55177+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
55178+#endif
55179+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
55180+ grsec_enable_ptrace_readexec = 1;
55181+#endif
55182+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
55183+ grsec_enable_chdir = 1;
55184+#endif
55185+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
55186+ grsec_enable_harden_ptrace = 1;
55187+#endif
55188+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
55189+ grsec_enable_mount = 1;
55190+#endif
55191+#ifdef CONFIG_GRKERNSEC_LINK
55192+ grsec_enable_link = 1;
55193+#endif
55194+#ifdef CONFIG_GRKERNSEC_BRUTE
55195+ grsec_enable_brute = 1;
55196+#endif
55197+#ifdef CONFIG_GRKERNSEC_DMESG
55198+ grsec_enable_dmesg = 1;
55199+#endif
55200+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
55201+ grsec_enable_blackhole = 1;
55202+ grsec_lastack_retries = 4;
55203+#endif
55204+#ifdef CONFIG_GRKERNSEC_FIFO
55205+ grsec_enable_fifo = 1;
55206+#endif
55207+#ifdef CONFIG_GRKERNSEC_EXECLOG
55208+ grsec_enable_execlog = 1;
55209+#endif
55210+#ifdef CONFIG_GRKERNSEC_SETXID
55211+ grsec_enable_setxid = 1;
55212+#endif
55213+#ifdef CONFIG_GRKERNSEC_SIGNAL
55214+ grsec_enable_signal = 1;
55215+#endif
55216+#ifdef CONFIG_GRKERNSEC_FORKFAIL
55217+ grsec_enable_forkfail = 1;
55218+#endif
55219+#ifdef CONFIG_GRKERNSEC_TIME
55220+ grsec_enable_time = 1;
55221+#endif
55222+#ifdef CONFIG_GRKERNSEC_RESLOG
55223+ grsec_resource_logging = 1;
55224+#endif
55225+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
55226+ grsec_enable_chroot_findtask = 1;
55227+#endif
55228+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
55229+ grsec_enable_chroot_unix = 1;
55230+#endif
55231+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
55232+ grsec_enable_chroot_mount = 1;
55233+#endif
55234+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
55235+ grsec_enable_chroot_fchdir = 1;
55236+#endif
55237+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
55238+ grsec_enable_chroot_shmat = 1;
55239+#endif
55240+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
55241+ grsec_enable_audit_ptrace = 1;
55242+#endif
55243+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
55244+ grsec_enable_chroot_double = 1;
55245+#endif
55246+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
55247+ grsec_enable_chroot_pivot = 1;
55248+#endif
55249+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
55250+ grsec_enable_chroot_chdir = 1;
55251+#endif
55252+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
55253+ grsec_enable_chroot_chmod = 1;
55254+#endif
55255+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
55256+ grsec_enable_chroot_mknod = 1;
55257+#endif
55258+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
55259+ grsec_enable_chroot_nice = 1;
55260+#endif
55261+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
55262+ grsec_enable_chroot_execlog = 1;
55263+#endif
55264+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
55265+ grsec_enable_chroot_caps = 1;
55266+#endif
55267+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
55268+ grsec_enable_chroot_sysctl = 1;
55269+#endif
55270+#ifdef CONFIG_GRKERNSEC_TPE
55271+ grsec_enable_tpe = 1;
55272+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
55273+#ifdef CONFIG_GRKERNSEC_TPE_ALL
55274+ grsec_enable_tpe_all = 1;
55275+#endif
55276+#endif
55277+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
55278+ grsec_enable_socket_all = 1;
55279+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
55280+#endif
55281+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
55282+ grsec_enable_socket_client = 1;
55283+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
55284+#endif
55285+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
55286+ grsec_enable_socket_server = 1;
55287+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
55288+#endif
55289+#endif
55290+
55291+ return;
55292+}
55293diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
55294new file mode 100644
55295index 0000000..3efe141
55296--- /dev/null
55297+++ b/grsecurity/grsec_link.c
55298@@ -0,0 +1,43 @@
55299+#include <linux/kernel.h>
55300+#include <linux/sched.h>
55301+#include <linux/fs.h>
55302+#include <linux/file.h>
55303+#include <linux/grinternal.h>
55304+
55305+int
55306+gr_handle_follow_link(const struct inode *parent,
55307+ const struct inode *inode,
55308+ const struct dentry *dentry, const struct vfsmount *mnt)
55309+{
55310+#ifdef CONFIG_GRKERNSEC_LINK
55311+ const struct cred *cred = current_cred();
55312+
55313+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
55314+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
55315+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
55316+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
55317+ return -EACCES;
55318+ }
55319+#endif
55320+ return 0;
55321+}
55322+
55323+int
55324+gr_handle_hardlink(const struct dentry *dentry,
55325+ const struct vfsmount *mnt,
55326+ struct inode *inode, const int mode, const char *to)
55327+{
55328+#ifdef CONFIG_GRKERNSEC_LINK
55329+ const struct cred *cred = current_cred();
55330+
55331+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
55332+ (!S_ISREG(mode) || (mode & S_ISUID) ||
55333+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
55334+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
55335+ !capable(CAP_FOWNER) && cred->uid) {
55336+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
55337+ return -EPERM;
55338+ }
55339+#endif
55340+ return 0;
55341+}
55342diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
55343new file mode 100644
55344index 0000000..a45d2e9
55345--- /dev/null
55346+++ b/grsecurity/grsec_log.c
55347@@ -0,0 +1,322 @@
55348+#include <linux/kernel.h>
55349+#include <linux/sched.h>
55350+#include <linux/file.h>
55351+#include <linux/tty.h>
55352+#include <linux/fs.h>
55353+#include <linux/grinternal.h>
55354+
55355+#ifdef CONFIG_TREE_PREEMPT_RCU
55356+#define DISABLE_PREEMPT() preempt_disable()
55357+#define ENABLE_PREEMPT() preempt_enable()
55358+#else
55359+#define DISABLE_PREEMPT()
55360+#define ENABLE_PREEMPT()
55361+#endif
55362+
55363+#define BEGIN_LOCKS(x) \
55364+ DISABLE_PREEMPT(); \
55365+ rcu_read_lock(); \
55366+ read_lock(&tasklist_lock); \
55367+ read_lock(&grsec_exec_file_lock); \
55368+ if (x != GR_DO_AUDIT) \
55369+ spin_lock(&grsec_alert_lock); \
55370+ else \
55371+ spin_lock(&grsec_audit_lock)
55372+
55373+#define END_LOCKS(x) \
55374+ if (x != GR_DO_AUDIT) \
55375+ spin_unlock(&grsec_alert_lock); \
55376+ else \
55377+ spin_unlock(&grsec_audit_lock); \
55378+ read_unlock(&grsec_exec_file_lock); \
55379+ read_unlock(&tasklist_lock); \
55380+ rcu_read_unlock(); \
55381+ ENABLE_PREEMPT(); \
55382+ if (x == GR_DONT_AUDIT) \
55383+ gr_handle_alertkill(current)
55384+
55385+enum {
55386+ FLOODING,
55387+ NO_FLOODING
55388+};
55389+
55390+extern char *gr_alert_log_fmt;
55391+extern char *gr_audit_log_fmt;
55392+extern char *gr_alert_log_buf;
55393+extern char *gr_audit_log_buf;
55394+
55395+static int gr_log_start(int audit)
55396+{
55397+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
55398+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
55399+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
55400+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
55401+ unsigned long curr_secs = get_seconds();
55402+
55403+ if (audit == GR_DO_AUDIT)
55404+ goto set_fmt;
55405+
55406+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
55407+ grsec_alert_wtime = curr_secs;
55408+ grsec_alert_fyet = 0;
55409+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
55410+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
55411+ grsec_alert_fyet++;
55412+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
55413+ grsec_alert_wtime = curr_secs;
55414+ grsec_alert_fyet++;
55415+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
55416+ return FLOODING;
55417+ }
55418+ else return FLOODING;
55419+
55420+set_fmt:
55421+#endif
55422+ memset(buf, 0, PAGE_SIZE);
55423+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
55424+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
55425+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
55426+ } else if (current->signal->curr_ip) {
55427+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
55428+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
55429+ } else if (gr_acl_is_enabled()) {
55430+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
55431+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
55432+ } else {
55433+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
55434+ strcpy(buf, fmt);
55435+ }
55436+
55437+ return NO_FLOODING;
55438+}
55439+
55440+static void gr_log_middle(int audit, const char *msg, va_list ap)
55441+ __attribute__ ((format (printf, 2, 0)));
55442+
55443+static void gr_log_middle(int audit, const char *msg, va_list ap)
55444+{
55445+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
55446+ unsigned int len = strlen(buf);
55447+
55448+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
55449+
55450+ return;
55451+}
55452+
55453+static void gr_log_middle_varargs(int audit, const char *msg, ...)
55454+ __attribute__ ((format (printf, 2, 3)));
55455+
55456+static void gr_log_middle_varargs(int audit, const char *msg, ...)
55457+{
55458+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
55459+ unsigned int len = strlen(buf);
55460+ va_list ap;
55461+
55462+ va_start(ap, msg);
55463+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
55464+ va_end(ap);
55465+
55466+ return;
55467+}
55468+
55469+static void gr_log_end(int audit, int append_default)
55470+{
55471+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
55472+
55473+ if (append_default) {
55474+ unsigned int len = strlen(buf);
55475+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
55476+ }
55477+
55478+ printk("%s\n", buf);
55479+
55480+ return;
55481+}
55482+
55483+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
55484+{
55485+ int logtype;
55486+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
55487+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
55488+ void *voidptr = NULL;
55489+ int num1 = 0, num2 = 0;
55490+ unsigned long ulong1 = 0, ulong2 = 0;
55491+ struct dentry *dentry = NULL;
55492+ struct vfsmount *mnt = NULL;
55493+ struct file *file = NULL;
55494+ struct task_struct *task = NULL;
55495+ const struct cred *cred, *pcred;
55496+ va_list ap;
55497+
55498+ BEGIN_LOCKS(audit);
55499+ logtype = gr_log_start(audit);
55500+ if (logtype == FLOODING) {
55501+ END_LOCKS(audit);
55502+ return;
55503+ }
55504+ va_start(ap, argtypes);
55505+ switch (argtypes) {
55506+ case GR_TTYSNIFF:
55507+ task = va_arg(ap, struct task_struct *);
55508+ 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);
55509+ break;
55510+ case GR_SYSCTL_HIDDEN:
55511+ str1 = va_arg(ap, char *);
55512+ gr_log_middle_varargs(audit, msg, result, str1);
55513+ break;
55514+ case GR_RBAC:
55515+ dentry = va_arg(ap, struct dentry *);
55516+ mnt = va_arg(ap, struct vfsmount *);
55517+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
55518+ break;
55519+ case GR_RBAC_STR:
55520+ dentry = va_arg(ap, struct dentry *);
55521+ mnt = va_arg(ap, struct vfsmount *);
55522+ str1 = va_arg(ap, char *);
55523+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
55524+ break;
55525+ case GR_STR_RBAC:
55526+ str1 = va_arg(ap, char *);
55527+ dentry = va_arg(ap, struct dentry *);
55528+ mnt = va_arg(ap, struct vfsmount *);
55529+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
55530+ break;
55531+ case GR_RBAC_MODE2:
55532+ dentry = va_arg(ap, struct dentry *);
55533+ mnt = va_arg(ap, struct vfsmount *);
55534+ str1 = va_arg(ap, char *);
55535+ str2 = va_arg(ap, char *);
55536+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
55537+ break;
55538+ case GR_RBAC_MODE3:
55539+ dentry = va_arg(ap, struct dentry *);
55540+ mnt = va_arg(ap, struct vfsmount *);
55541+ str1 = va_arg(ap, char *);
55542+ str2 = va_arg(ap, char *);
55543+ str3 = va_arg(ap, char *);
55544+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
55545+ break;
55546+ case GR_FILENAME:
55547+ dentry = va_arg(ap, struct dentry *);
55548+ mnt = va_arg(ap, struct vfsmount *);
55549+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
55550+ break;
55551+ case GR_STR_FILENAME:
55552+ str1 = va_arg(ap, char *);
55553+ dentry = va_arg(ap, struct dentry *);
55554+ mnt = va_arg(ap, struct vfsmount *);
55555+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
55556+ break;
55557+ case GR_FILENAME_STR:
55558+ dentry = va_arg(ap, struct dentry *);
55559+ mnt = va_arg(ap, struct vfsmount *);
55560+ str1 = va_arg(ap, char *);
55561+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
55562+ break;
55563+ case GR_FILENAME_TWO_INT:
55564+ dentry = va_arg(ap, struct dentry *);
55565+ mnt = va_arg(ap, struct vfsmount *);
55566+ num1 = va_arg(ap, int);
55567+ num2 = va_arg(ap, int);
55568+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
55569+ break;
55570+ case GR_FILENAME_TWO_INT_STR:
55571+ dentry = va_arg(ap, struct dentry *);
55572+ mnt = va_arg(ap, struct vfsmount *);
55573+ num1 = va_arg(ap, int);
55574+ num2 = va_arg(ap, int);
55575+ str1 = va_arg(ap, char *);
55576+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
55577+ break;
55578+ case GR_TEXTREL:
55579+ file = va_arg(ap, struct file *);
55580+ ulong1 = va_arg(ap, unsigned long);
55581+ ulong2 = va_arg(ap, unsigned long);
55582+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
55583+ break;
55584+ case GR_PTRACE:
55585+ task = va_arg(ap, struct task_struct *);
55586+ 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);
55587+ break;
55588+ case GR_RESOURCE:
55589+ task = va_arg(ap, struct task_struct *);
55590+ cred = __task_cred(task);
55591+ pcred = __task_cred(task->real_parent);
55592+ ulong1 = va_arg(ap, unsigned long);
55593+ str1 = va_arg(ap, char *);
55594+ ulong2 = va_arg(ap, unsigned long);
55595+ 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);
55596+ break;
55597+ case GR_CAP:
55598+ task = va_arg(ap, struct task_struct *);
55599+ cred = __task_cred(task);
55600+ pcred = __task_cred(task->real_parent);
55601+ str1 = va_arg(ap, char *);
55602+ 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);
55603+ break;
55604+ case GR_SIG:
55605+ str1 = va_arg(ap, char *);
55606+ voidptr = va_arg(ap, void *);
55607+ gr_log_middle_varargs(audit, msg, str1, voidptr);
55608+ break;
55609+ case GR_SIG2:
55610+ task = va_arg(ap, struct task_struct *);
55611+ cred = __task_cred(task);
55612+ pcred = __task_cred(task->real_parent);
55613+ num1 = va_arg(ap, int);
55614+ 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);
55615+ break;
55616+ case GR_CRASH1:
55617+ task = va_arg(ap, struct task_struct *);
55618+ cred = __task_cred(task);
55619+ pcred = __task_cred(task->real_parent);
55620+ ulong1 = va_arg(ap, unsigned long);
55621+ 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);
55622+ break;
55623+ case GR_CRASH2:
55624+ task = va_arg(ap, struct task_struct *);
55625+ cred = __task_cred(task);
55626+ pcred = __task_cred(task->real_parent);
55627+ ulong1 = va_arg(ap, unsigned long);
55628+ 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);
55629+ break;
55630+ case GR_RWXMAP:
55631+ file = va_arg(ap, struct file *);
55632+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
55633+ break;
55634+ case GR_PSACCT:
55635+ {
55636+ unsigned int wday, cday;
55637+ __u8 whr, chr;
55638+ __u8 wmin, cmin;
55639+ __u8 wsec, csec;
55640+ char cur_tty[64] = { 0 };
55641+ char parent_tty[64] = { 0 };
55642+
55643+ task = va_arg(ap, struct task_struct *);
55644+ wday = va_arg(ap, unsigned int);
55645+ cday = va_arg(ap, unsigned int);
55646+ whr = va_arg(ap, int);
55647+ chr = va_arg(ap, int);
55648+ wmin = va_arg(ap, int);
55649+ cmin = va_arg(ap, int);
55650+ wsec = va_arg(ap, int);
55651+ csec = va_arg(ap, int);
55652+ ulong1 = va_arg(ap, unsigned long);
55653+ cred = __task_cred(task);
55654+ pcred = __task_cred(task->real_parent);
55655+
55656+ 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);
55657+ }
55658+ break;
55659+ default:
55660+ gr_log_middle(audit, msg, ap);
55661+ }
55662+ va_end(ap);
55663+ // these don't need DEFAULTSECARGS printed on the end
55664+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
55665+ gr_log_end(audit, 0);
55666+ else
55667+ gr_log_end(audit, 1);
55668+ END_LOCKS(audit);
55669+}
55670diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
55671new file mode 100644
55672index 0000000..6c0416b
55673--- /dev/null
55674+++ b/grsecurity/grsec_mem.c
55675@@ -0,0 +1,33 @@
55676+#include <linux/kernel.h>
55677+#include <linux/sched.h>
55678+#include <linux/mm.h>
55679+#include <linux/mman.h>
55680+#include <linux/grinternal.h>
55681+
55682+void
55683+gr_handle_ioperm(void)
55684+{
55685+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
55686+ return;
55687+}
55688+
55689+void
55690+gr_handle_iopl(void)
55691+{
55692+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
55693+ return;
55694+}
55695+
55696+void
55697+gr_handle_mem_readwrite(u64 from, u64 to)
55698+{
55699+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
55700+ return;
55701+}
55702+
55703+void
55704+gr_handle_vm86(void)
55705+{
55706+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
55707+ return;
55708+}
55709diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
55710new file mode 100644
55711index 0000000..2131422
55712--- /dev/null
55713+++ b/grsecurity/grsec_mount.c
55714@@ -0,0 +1,62 @@
55715+#include <linux/kernel.h>
55716+#include <linux/sched.h>
55717+#include <linux/mount.h>
55718+#include <linux/grsecurity.h>
55719+#include <linux/grinternal.h>
55720+
55721+void
55722+gr_log_remount(const char *devname, const int retval)
55723+{
55724+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
55725+ if (grsec_enable_mount && (retval >= 0))
55726+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
55727+#endif
55728+ return;
55729+}
55730+
55731+void
55732+gr_log_unmount(const char *devname, const int retval)
55733+{
55734+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
55735+ if (grsec_enable_mount && (retval >= 0))
55736+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
55737+#endif
55738+ return;
55739+}
55740+
55741+void
55742+gr_log_mount(const char *from, const char *to, const int retval)
55743+{
55744+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
55745+ if (grsec_enable_mount && (retval >= 0))
55746+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
55747+#endif
55748+ return;
55749+}
55750+
55751+int
55752+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
55753+{
55754+#ifdef CONFIG_GRKERNSEC_ROFS
55755+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
55756+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
55757+ return -EPERM;
55758+ } else
55759+ return 0;
55760+#endif
55761+ return 0;
55762+}
55763+
55764+int
55765+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
55766+{
55767+#ifdef CONFIG_GRKERNSEC_ROFS
55768+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
55769+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
55770+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
55771+ return -EPERM;
55772+ } else
55773+ return 0;
55774+#endif
55775+ return 0;
55776+}
55777diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
55778new file mode 100644
55779index 0000000..a3b12a0
55780--- /dev/null
55781+++ b/grsecurity/grsec_pax.c
55782@@ -0,0 +1,36 @@
55783+#include <linux/kernel.h>
55784+#include <linux/sched.h>
55785+#include <linux/mm.h>
55786+#include <linux/file.h>
55787+#include <linux/grinternal.h>
55788+#include <linux/grsecurity.h>
55789+
55790+void
55791+gr_log_textrel(struct vm_area_struct * vma)
55792+{
55793+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
55794+ if (grsec_enable_audit_textrel)
55795+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
55796+#endif
55797+ return;
55798+}
55799+
55800+void
55801+gr_log_rwxmmap(struct file *file)
55802+{
55803+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
55804+ if (grsec_enable_log_rwxmaps)
55805+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
55806+#endif
55807+ return;
55808+}
55809+
55810+void
55811+gr_log_rwxmprotect(struct file *file)
55812+{
55813+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
55814+ if (grsec_enable_log_rwxmaps)
55815+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
55816+#endif
55817+ return;
55818+}
55819diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
55820new file mode 100644
55821index 0000000..f7f29aa
55822--- /dev/null
55823+++ b/grsecurity/grsec_ptrace.c
55824@@ -0,0 +1,30 @@
55825+#include <linux/kernel.h>
55826+#include <linux/sched.h>
55827+#include <linux/grinternal.h>
55828+#include <linux/security.h>
55829+
55830+void
55831+gr_audit_ptrace(struct task_struct *task)
55832+{
55833+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
55834+ if (grsec_enable_audit_ptrace)
55835+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
55836+#endif
55837+ return;
55838+}
55839+
55840+int
55841+gr_ptrace_readexec(struct file *file, int unsafe_flags)
55842+{
55843+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
55844+ const struct dentry *dentry = file->f_path.dentry;
55845+ const struct vfsmount *mnt = file->f_path.mnt;
55846+
55847+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
55848+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
55849+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
55850+ return -EACCES;
55851+ }
55852+#endif
55853+ return 0;
55854+}
55855diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
55856new file mode 100644
55857index 0000000..7a5b2de
55858--- /dev/null
55859+++ b/grsecurity/grsec_sig.c
55860@@ -0,0 +1,207 @@
55861+#include <linux/kernel.h>
55862+#include <linux/sched.h>
55863+#include <linux/delay.h>
55864+#include <linux/grsecurity.h>
55865+#include <linux/grinternal.h>
55866+#include <linux/hardirq.h>
55867+
55868+char *signames[] = {
55869+ [SIGSEGV] = "Segmentation fault",
55870+ [SIGILL] = "Illegal instruction",
55871+ [SIGABRT] = "Abort",
55872+ [SIGBUS] = "Invalid alignment/Bus error"
55873+};
55874+
55875+void
55876+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
55877+{
55878+#ifdef CONFIG_GRKERNSEC_SIGNAL
55879+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
55880+ (sig == SIGABRT) || (sig == SIGBUS))) {
55881+ if (t->pid == current->pid) {
55882+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
55883+ } else {
55884+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
55885+ }
55886+ }
55887+#endif
55888+ return;
55889+}
55890+
55891+int
55892+gr_handle_signal(const struct task_struct *p, const int sig)
55893+{
55894+#ifdef CONFIG_GRKERNSEC
55895+ /* ignore the 0 signal for protected task checks */
55896+ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
55897+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
55898+ return -EPERM;
55899+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
55900+ return -EPERM;
55901+ }
55902+#endif
55903+ return 0;
55904+}
55905+
55906+#ifdef CONFIG_GRKERNSEC
55907+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
55908+
55909+int gr_fake_force_sig(int sig, struct task_struct *t)
55910+{
55911+ unsigned long int flags;
55912+ int ret, blocked, ignored;
55913+ struct k_sigaction *action;
55914+
55915+ spin_lock_irqsave(&t->sighand->siglock, flags);
55916+ action = &t->sighand->action[sig-1];
55917+ ignored = action->sa.sa_handler == SIG_IGN;
55918+ blocked = sigismember(&t->blocked, sig);
55919+ if (blocked || ignored) {
55920+ action->sa.sa_handler = SIG_DFL;
55921+ if (blocked) {
55922+ sigdelset(&t->blocked, sig);
55923+ recalc_sigpending_and_wake(t);
55924+ }
55925+ }
55926+ if (action->sa.sa_handler == SIG_DFL)
55927+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
55928+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
55929+
55930+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
55931+
55932+ return ret;
55933+}
55934+#endif
55935+
55936+#ifdef CONFIG_GRKERNSEC_BRUTE
55937+#define GR_USER_BAN_TIME (15 * 60)
55938+
55939+static int __get_dumpable(unsigned long mm_flags)
55940+{
55941+ int ret;
55942+
55943+ ret = mm_flags & MMF_DUMPABLE_MASK;
55944+ return (ret >= 2) ? 2 : ret;
55945+}
55946+#endif
55947+
55948+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
55949+{
55950+#ifdef CONFIG_GRKERNSEC_BRUTE
55951+ uid_t uid = 0;
55952+
55953+ if (!grsec_enable_brute)
55954+ return;
55955+
55956+ rcu_read_lock();
55957+ read_lock(&tasklist_lock);
55958+ read_lock(&grsec_exec_file_lock);
55959+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
55960+ p->real_parent->brute = 1;
55961+ else {
55962+ const struct cred *cred = __task_cred(p), *cred2;
55963+ struct task_struct *tsk, *tsk2;
55964+
55965+ if (!__get_dumpable(mm_flags) && cred->uid) {
55966+ struct user_struct *user;
55967+
55968+ uid = cred->uid;
55969+
55970+ /* this is put upon execution past expiration */
55971+ user = find_user(uid);
55972+ if (user == NULL)
55973+ goto unlock;
55974+ user->banned = 1;
55975+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
55976+ if (user->ban_expires == ~0UL)
55977+ user->ban_expires--;
55978+
55979+ do_each_thread(tsk2, tsk) {
55980+ cred2 = __task_cred(tsk);
55981+ if (tsk != p && cred2->uid == uid)
55982+ gr_fake_force_sig(SIGKILL, tsk);
55983+ } while_each_thread(tsk2, tsk);
55984+ }
55985+ }
55986+unlock:
55987+ read_unlock(&grsec_exec_file_lock);
55988+ read_unlock(&tasklist_lock);
55989+ rcu_read_unlock();
55990+
55991+ if (uid)
55992+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
55993+
55994+#endif
55995+ return;
55996+}
55997+
55998+void gr_handle_brute_check(void)
55999+{
56000+#ifdef CONFIG_GRKERNSEC_BRUTE
56001+ if (current->brute)
56002+ msleep(30 * 1000);
56003+#endif
56004+ return;
56005+}
56006+
56007+void gr_handle_kernel_exploit(void)
56008+{
56009+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
56010+ const struct cred *cred;
56011+ struct task_struct *tsk, *tsk2;
56012+ struct user_struct *user;
56013+ uid_t uid;
56014+
56015+ if (in_irq() || in_serving_softirq() || in_nmi())
56016+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
56017+
56018+ uid = current_uid();
56019+
56020+ if (uid == 0)
56021+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
56022+ else {
56023+ /* kill all the processes of this user, hold a reference
56024+ to their creds struct, and prevent them from creating
56025+ another process until system reset
56026+ */
56027+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
56028+ /* we intentionally leak this ref */
56029+ user = get_uid(current->cred->user);
56030+ if (user) {
56031+ user->banned = 1;
56032+ user->ban_expires = ~0UL;
56033+ }
56034+
56035+ read_lock(&tasklist_lock);
56036+ do_each_thread(tsk2, tsk) {
56037+ cred = __task_cred(tsk);
56038+ if (cred->uid == uid)
56039+ gr_fake_force_sig(SIGKILL, tsk);
56040+ } while_each_thread(tsk2, tsk);
56041+ read_unlock(&tasklist_lock);
56042+ }
56043+#endif
56044+}
56045+
56046+int __gr_process_user_ban(struct user_struct *user)
56047+{
56048+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
56049+ if (unlikely(user->banned)) {
56050+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
56051+ user->banned = 0;
56052+ user->ban_expires = 0;
56053+ free_uid(user);
56054+ } else
56055+ return -EPERM;
56056+ }
56057+#endif
56058+ return 0;
56059+}
56060+
56061+int gr_process_user_ban(void)
56062+{
56063+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
56064+ return __gr_process_user_ban(current->cred->user);
56065+#endif
56066+ return 0;
56067+}
56068diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
56069new file mode 100644
56070index 0000000..4030d57
56071--- /dev/null
56072+++ b/grsecurity/grsec_sock.c
56073@@ -0,0 +1,244 @@
56074+#include <linux/kernel.h>
56075+#include <linux/module.h>
56076+#include <linux/sched.h>
56077+#include <linux/file.h>
56078+#include <linux/net.h>
56079+#include <linux/in.h>
56080+#include <linux/ip.h>
56081+#include <net/sock.h>
56082+#include <net/inet_sock.h>
56083+#include <linux/grsecurity.h>
56084+#include <linux/grinternal.h>
56085+#include <linux/gracl.h>
56086+
56087+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
56088+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
56089+
56090+EXPORT_SYMBOL(gr_search_udp_recvmsg);
56091+EXPORT_SYMBOL(gr_search_udp_sendmsg);
56092+
56093+#ifdef CONFIG_UNIX_MODULE
56094+EXPORT_SYMBOL(gr_acl_handle_unix);
56095+EXPORT_SYMBOL(gr_acl_handle_mknod);
56096+EXPORT_SYMBOL(gr_handle_chroot_unix);
56097+EXPORT_SYMBOL(gr_handle_create);
56098+#endif
56099+
56100+#ifdef CONFIG_GRKERNSEC
56101+#define gr_conn_table_size 32749
56102+struct conn_table_entry {
56103+ struct conn_table_entry *next;
56104+ struct signal_struct *sig;
56105+};
56106+
56107+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
56108+DEFINE_SPINLOCK(gr_conn_table_lock);
56109+
56110+extern const char * gr_socktype_to_name(unsigned char type);
56111+extern const char * gr_proto_to_name(unsigned char proto);
56112+extern const char * gr_sockfamily_to_name(unsigned char family);
56113+
56114+static __inline__ int
56115+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
56116+{
56117+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
56118+}
56119+
56120+static __inline__ int
56121+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
56122+ __u16 sport, __u16 dport)
56123+{
56124+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
56125+ sig->gr_sport == sport && sig->gr_dport == dport))
56126+ return 1;
56127+ else
56128+ return 0;
56129+}
56130+
56131+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
56132+{
56133+ struct conn_table_entry **match;
56134+ unsigned int index;
56135+
56136+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
56137+ sig->gr_sport, sig->gr_dport,
56138+ gr_conn_table_size);
56139+
56140+ newent->sig = sig;
56141+
56142+ match = &gr_conn_table[index];
56143+ newent->next = *match;
56144+ *match = newent;
56145+
56146+ return;
56147+}
56148+
56149+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
56150+{
56151+ struct conn_table_entry *match, *last = NULL;
56152+ unsigned int index;
56153+
56154+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
56155+ sig->gr_sport, sig->gr_dport,
56156+ gr_conn_table_size);
56157+
56158+ match = gr_conn_table[index];
56159+ while (match && !conn_match(match->sig,
56160+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
56161+ sig->gr_dport)) {
56162+ last = match;
56163+ match = match->next;
56164+ }
56165+
56166+ if (match) {
56167+ if (last)
56168+ last->next = match->next;
56169+ else
56170+ gr_conn_table[index] = NULL;
56171+ kfree(match);
56172+ }
56173+
56174+ return;
56175+}
56176+
56177+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
56178+ __u16 sport, __u16 dport)
56179+{
56180+ struct conn_table_entry *match;
56181+ unsigned int index;
56182+
56183+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
56184+
56185+ match = gr_conn_table[index];
56186+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
56187+ match = match->next;
56188+
56189+ if (match)
56190+ return match->sig;
56191+ else
56192+ return NULL;
56193+}
56194+
56195+#endif
56196+
56197+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
56198+{
56199+#ifdef CONFIG_GRKERNSEC
56200+ struct signal_struct *sig = task->signal;
56201+ struct conn_table_entry *newent;
56202+
56203+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
56204+ if (newent == NULL)
56205+ return;
56206+ /* no bh lock needed since we are called with bh disabled */
56207+ spin_lock(&gr_conn_table_lock);
56208+ gr_del_task_from_ip_table_nolock(sig);
56209+ sig->gr_saddr = inet->inet_rcv_saddr;
56210+ sig->gr_daddr = inet->inet_daddr;
56211+ sig->gr_sport = inet->inet_sport;
56212+ sig->gr_dport = inet->inet_dport;
56213+ gr_add_to_task_ip_table_nolock(sig, newent);
56214+ spin_unlock(&gr_conn_table_lock);
56215+#endif
56216+ return;
56217+}
56218+
56219+void gr_del_task_from_ip_table(struct task_struct *task)
56220+{
56221+#ifdef CONFIG_GRKERNSEC
56222+ spin_lock_bh(&gr_conn_table_lock);
56223+ gr_del_task_from_ip_table_nolock(task->signal);
56224+ spin_unlock_bh(&gr_conn_table_lock);
56225+#endif
56226+ return;
56227+}
56228+
56229+void
56230+gr_attach_curr_ip(const struct sock *sk)
56231+{
56232+#ifdef CONFIG_GRKERNSEC
56233+ struct signal_struct *p, *set;
56234+ const struct inet_sock *inet = inet_sk(sk);
56235+
56236+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
56237+ return;
56238+
56239+ set = current->signal;
56240+
56241+ spin_lock_bh(&gr_conn_table_lock);
56242+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
56243+ inet->inet_dport, inet->inet_sport);
56244+ if (unlikely(p != NULL)) {
56245+ set->curr_ip = p->curr_ip;
56246+ set->used_accept = 1;
56247+ gr_del_task_from_ip_table_nolock(p);
56248+ spin_unlock_bh(&gr_conn_table_lock);
56249+ return;
56250+ }
56251+ spin_unlock_bh(&gr_conn_table_lock);
56252+
56253+ set->curr_ip = inet->inet_daddr;
56254+ set->used_accept = 1;
56255+#endif
56256+ return;
56257+}
56258+
56259+int
56260+gr_handle_sock_all(const int family, const int type, const int protocol)
56261+{
56262+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
56263+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
56264+ (family != AF_UNIX)) {
56265+ if (family == AF_INET)
56266+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
56267+ else
56268+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
56269+ return -EACCES;
56270+ }
56271+#endif
56272+ return 0;
56273+}
56274+
56275+int
56276+gr_handle_sock_server(const struct sockaddr *sck)
56277+{
56278+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
56279+ if (grsec_enable_socket_server &&
56280+ in_group_p(grsec_socket_server_gid) &&
56281+ sck && (sck->sa_family != AF_UNIX) &&
56282+ (sck->sa_family != AF_LOCAL)) {
56283+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
56284+ return -EACCES;
56285+ }
56286+#endif
56287+ return 0;
56288+}
56289+
56290+int
56291+gr_handle_sock_server_other(const struct sock *sck)
56292+{
56293+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
56294+ if (grsec_enable_socket_server &&
56295+ in_group_p(grsec_socket_server_gid) &&
56296+ sck && (sck->sk_family != AF_UNIX) &&
56297+ (sck->sk_family != AF_LOCAL)) {
56298+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
56299+ return -EACCES;
56300+ }
56301+#endif
56302+ return 0;
56303+}
56304+
56305+int
56306+gr_handle_sock_client(const struct sockaddr *sck)
56307+{
56308+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
56309+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
56310+ sck && (sck->sa_family != AF_UNIX) &&
56311+ (sck->sa_family != AF_LOCAL)) {
56312+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
56313+ return -EACCES;
56314+ }
56315+#endif
56316+ return 0;
56317+}
56318diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
56319new file mode 100644
56320index 0000000..a1aedd7
56321--- /dev/null
56322+++ b/grsecurity/grsec_sysctl.c
56323@@ -0,0 +1,451 @@
56324+#include <linux/kernel.h>
56325+#include <linux/sched.h>
56326+#include <linux/sysctl.h>
56327+#include <linux/grsecurity.h>
56328+#include <linux/grinternal.h>
56329+
56330+int
56331+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
56332+{
56333+#ifdef CONFIG_GRKERNSEC_SYSCTL
56334+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
56335+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
56336+ return -EACCES;
56337+ }
56338+#endif
56339+ return 0;
56340+}
56341+
56342+#ifdef CONFIG_GRKERNSEC_ROFS
56343+static int __maybe_unused one = 1;
56344+#endif
56345+
56346+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
56347+struct ctl_table grsecurity_table[] = {
56348+#ifdef CONFIG_GRKERNSEC_SYSCTL
56349+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
56350+#ifdef CONFIG_GRKERNSEC_IO
56351+ {
56352+ .procname = "disable_priv_io",
56353+ .data = &grsec_disable_privio,
56354+ .maxlen = sizeof(int),
56355+ .mode = 0600,
56356+ .proc_handler = &proc_dointvec,
56357+ },
56358+#endif
56359+#endif
56360+#ifdef CONFIG_GRKERNSEC_LINK
56361+ {
56362+ .procname = "linking_restrictions",
56363+ .data = &grsec_enable_link,
56364+ .maxlen = sizeof(int),
56365+ .mode = 0600,
56366+ .proc_handler = &proc_dointvec,
56367+ },
56368+#endif
56369+#ifdef CONFIG_GRKERNSEC_BRUTE
56370+ {
56371+ .procname = "deter_bruteforce",
56372+ .data = &grsec_enable_brute,
56373+ .maxlen = sizeof(int),
56374+ .mode = 0600,
56375+ .proc_handler = &proc_dointvec,
56376+ },
56377+#endif
56378+#ifdef CONFIG_GRKERNSEC_FIFO
56379+ {
56380+ .procname = "fifo_restrictions",
56381+ .data = &grsec_enable_fifo,
56382+ .maxlen = sizeof(int),
56383+ .mode = 0600,
56384+ .proc_handler = &proc_dointvec,
56385+ },
56386+#endif
56387+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
56388+ {
56389+ .procname = "ptrace_readexec",
56390+ .data = &grsec_enable_ptrace_readexec,
56391+ .maxlen = sizeof(int),
56392+ .mode = 0600,
56393+ .proc_handler = &proc_dointvec,
56394+ },
56395+#endif
56396+#ifdef CONFIG_GRKERNSEC_SETXID
56397+ {
56398+ .procname = "consistent_setxid",
56399+ .data = &grsec_enable_setxid,
56400+ .maxlen = sizeof(int),
56401+ .mode = 0600,
56402+ .proc_handler = &proc_dointvec,
56403+ },
56404+#endif
56405+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
56406+ {
56407+ .procname = "ip_blackhole",
56408+ .data = &grsec_enable_blackhole,
56409+ .maxlen = sizeof(int),
56410+ .mode = 0600,
56411+ .proc_handler = &proc_dointvec,
56412+ },
56413+ {
56414+ .procname = "lastack_retries",
56415+ .data = &grsec_lastack_retries,
56416+ .maxlen = sizeof(int),
56417+ .mode = 0600,
56418+ .proc_handler = &proc_dointvec,
56419+ },
56420+#endif
56421+#ifdef CONFIG_GRKERNSEC_EXECLOG
56422+ {
56423+ .procname = "exec_logging",
56424+ .data = &grsec_enable_execlog,
56425+ .maxlen = sizeof(int),
56426+ .mode = 0600,
56427+ .proc_handler = &proc_dointvec,
56428+ },
56429+#endif
56430+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56431+ {
56432+ .procname = "rwxmap_logging",
56433+ .data = &grsec_enable_log_rwxmaps,
56434+ .maxlen = sizeof(int),
56435+ .mode = 0600,
56436+ .proc_handler = &proc_dointvec,
56437+ },
56438+#endif
56439+#ifdef CONFIG_GRKERNSEC_SIGNAL
56440+ {
56441+ .procname = "signal_logging",
56442+ .data = &grsec_enable_signal,
56443+ .maxlen = sizeof(int),
56444+ .mode = 0600,
56445+ .proc_handler = &proc_dointvec,
56446+ },
56447+#endif
56448+#ifdef CONFIG_GRKERNSEC_FORKFAIL
56449+ {
56450+ .procname = "forkfail_logging",
56451+ .data = &grsec_enable_forkfail,
56452+ .maxlen = sizeof(int),
56453+ .mode = 0600,
56454+ .proc_handler = &proc_dointvec,
56455+ },
56456+#endif
56457+#ifdef CONFIG_GRKERNSEC_TIME
56458+ {
56459+ .procname = "timechange_logging",
56460+ .data = &grsec_enable_time,
56461+ .maxlen = sizeof(int),
56462+ .mode = 0600,
56463+ .proc_handler = &proc_dointvec,
56464+ },
56465+#endif
56466+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
56467+ {
56468+ .procname = "chroot_deny_shmat",
56469+ .data = &grsec_enable_chroot_shmat,
56470+ .maxlen = sizeof(int),
56471+ .mode = 0600,
56472+ .proc_handler = &proc_dointvec,
56473+ },
56474+#endif
56475+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56476+ {
56477+ .procname = "chroot_deny_unix",
56478+ .data = &grsec_enable_chroot_unix,
56479+ .maxlen = sizeof(int),
56480+ .mode = 0600,
56481+ .proc_handler = &proc_dointvec,
56482+ },
56483+#endif
56484+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
56485+ {
56486+ .procname = "chroot_deny_mount",
56487+ .data = &grsec_enable_chroot_mount,
56488+ .maxlen = sizeof(int),
56489+ .mode = 0600,
56490+ .proc_handler = &proc_dointvec,
56491+ },
56492+#endif
56493+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
56494+ {
56495+ .procname = "chroot_deny_fchdir",
56496+ .data = &grsec_enable_chroot_fchdir,
56497+ .maxlen = sizeof(int),
56498+ .mode = 0600,
56499+ .proc_handler = &proc_dointvec,
56500+ },
56501+#endif
56502+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
56503+ {
56504+ .procname = "chroot_deny_chroot",
56505+ .data = &grsec_enable_chroot_double,
56506+ .maxlen = sizeof(int),
56507+ .mode = 0600,
56508+ .proc_handler = &proc_dointvec,
56509+ },
56510+#endif
56511+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
56512+ {
56513+ .procname = "chroot_deny_pivot",
56514+ .data = &grsec_enable_chroot_pivot,
56515+ .maxlen = sizeof(int),
56516+ .mode = 0600,
56517+ .proc_handler = &proc_dointvec,
56518+ },
56519+#endif
56520+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
56521+ {
56522+ .procname = "chroot_enforce_chdir",
56523+ .data = &grsec_enable_chroot_chdir,
56524+ .maxlen = sizeof(int),
56525+ .mode = 0600,
56526+ .proc_handler = &proc_dointvec,
56527+ },
56528+#endif
56529+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
56530+ {
56531+ .procname = "chroot_deny_chmod",
56532+ .data = &grsec_enable_chroot_chmod,
56533+ .maxlen = sizeof(int),
56534+ .mode = 0600,
56535+ .proc_handler = &proc_dointvec,
56536+ },
56537+#endif
56538+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
56539+ {
56540+ .procname = "chroot_deny_mknod",
56541+ .data = &grsec_enable_chroot_mknod,
56542+ .maxlen = sizeof(int),
56543+ .mode = 0600,
56544+ .proc_handler = &proc_dointvec,
56545+ },
56546+#endif
56547+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56548+ {
56549+ .procname = "chroot_restrict_nice",
56550+ .data = &grsec_enable_chroot_nice,
56551+ .maxlen = sizeof(int),
56552+ .mode = 0600,
56553+ .proc_handler = &proc_dointvec,
56554+ },
56555+#endif
56556+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
56557+ {
56558+ .procname = "chroot_execlog",
56559+ .data = &grsec_enable_chroot_execlog,
56560+ .maxlen = sizeof(int),
56561+ .mode = 0600,
56562+ .proc_handler = &proc_dointvec,
56563+ },
56564+#endif
56565+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56566+ {
56567+ .procname = "chroot_caps",
56568+ .data = &grsec_enable_chroot_caps,
56569+ .maxlen = sizeof(int),
56570+ .mode = 0600,
56571+ .proc_handler = &proc_dointvec,
56572+ },
56573+#endif
56574+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
56575+ {
56576+ .procname = "chroot_deny_sysctl",
56577+ .data = &grsec_enable_chroot_sysctl,
56578+ .maxlen = sizeof(int),
56579+ .mode = 0600,
56580+ .proc_handler = &proc_dointvec,
56581+ },
56582+#endif
56583+#ifdef CONFIG_GRKERNSEC_TPE
56584+ {
56585+ .procname = "tpe",
56586+ .data = &grsec_enable_tpe,
56587+ .maxlen = sizeof(int),
56588+ .mode = 0600,
56589+ .proc_handler = &proc_dointvec,
56590+ },
56591+ {
56592+ .procname = "tpe_gid",
56593+ .data = &grsec_tpe_gid,
56594+ .maxlen = sizeof(int),
56595+ .mode = 0600,
56596+ .proc_handler = &proc_dointvec,
56597+ },
56598+#endif
56599+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
56600+ {
56601+ .procname = "tpe_invert",
56602+ .data = &grsec_enable_tpe_invert,
56603+ .maxlen = sizeof(int),
56604+ .mode = 0600,
56605+ .proc_handler = &proc_dointvec,
56606+ },
56607+#endif
56608+#ifdef CONFIG_GRKERNSEC_TPE_ALL
56609+ {
56610+ .procname = "tpe_restrict_all",
56611+ .data = &grsec_enable_tpe_all,
56612+ .maxlen = sizeof(int),
56613+ .mode = 0600,
56614+ .proc_handler = &proc_dointvec,
56615+ },
56616+#endif
56617+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
56618+ {
56619+ .procname = "socket_all",
56620+ .data = &grsec_enable_socket_all,
56621+ .maxlen = sizeof(int),
56622+ .mode = 0600,
56623+ .proc_handler = &proc_dointvec,
56624+ },
56625+ {
56626+ .procname = "socket_all_gid",
56627+ .data = &grsec_socket_all_gid,
56628+ .maxlen = sizeof(int),
56629+ .mode = 0600,
56630+ .proc_handler = &proc_dointvec,
56631+ },
56632+#endif
56633+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
56634+ {
56635+ .procname = "socket_client",
56636+ .data = &grsec_enable_socket_client,
56637+ .maxlen = sizeof(int),
56638+ .mode = 0600,
56639+ .proc_handler = &proc_dointvec,
56640+ },
56641+ {
56642+ .procname = "socket_client_gid",
56643+ .data = &grsec_socket_client_gid,
56644+ .maxlen = sizeof(int),
56645+ .mode = 0600,
56646+ .proc_handler = &proc_dointvec,
56647+ },
56648+#endif
56649+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
56650+ {
56651+ .procname = "socket_server",
56652+ .data = &grsec_enable_socket_server,
56653+ .maxlen = sizeof(int),
56654+ .mode = 0600,
56655+ .proc_handler = &proc_dointvec,
56656+ },
56657+ {
56658+ .procname = "socket_server_gid",
56659+ .data = &grsec_socket_server_gid,
56660+ .maxlen = sizeof(int),
56661+ .mode = 0600,
56662+ .proc_handler = &proc_dointvec,
56663+ },
56664+#endif
56665+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
56666+ {
56667+ .procname = "audit_group",
56668+ .data = &grsec_enable_group,
56669+ .maxlen = sizeof(int),
56670+ .mode = 0600,
56671+ .proc_handler = &proc_dointvec,
56672+ },
56673+ {
56674+ .procname = "audit_gid",
56675+ .data = &grsec_audit_gid,
56676+ .maxlen = sizeof(int),
56677+ .mode = 0600,
56678+ .proc_handler = &proc_dointvec,
56679+ },
56680+#endif
56681+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56682+ {
56683+ .procname = "audit_chdir",
56684+ .data = &grsec_enable_chdir,
56685+ .maxlen = sizeof(int),
56686+ .mode = 0600,
56687+ .proc_handler = &proc_dointvec,
56688+ },
56689+#endif
56690+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
56691+ {
56692+ .procname = "audit_mount",
56693+ .data = &grsec_enable_mount,
56694+ .maxlen = sizeof(int),
56695+ .mode = 0600,
56696+ .proc_handler = &proc_dointvec,
56697+ },
56698+#endif
56699+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
56700+ {
56701+ .procname = "audit_textrel",
56702+ .data = &grsec_enable_audit_textrel,
56703+ .maxlen = sizeof(int),
56704+ .mode = 0600,
56705+ .proc_handler = &proc_dointvec,
56706+ },
56707+#endif
56708+#ifdef CONFIG_GRKERNSEC_DMESG
56709+ {
56710+ .procname = "dmesg",
56711+ .data = &grsec_enable_dmesg,
56712+ .maxlen = sizeof(int),
56713+ .mode = 0600,
56714+ .proc_handler = &proc_dointvec,
56715+ },
56716+#endif
56717+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56718+ {
56719+ .procname = "chroot_findtask",
56720+ .data = &grsec_enable_chroot_findtask,
56721+ .maxlen = sizeof(int),
56722+ .mode = 0600,
56723+ .proc_handler = &proc_dointvec,
56724+ },
56725+#endif
56726+#ifdef CONFIG_GRKERNSEC_RESLOG
56727+ {
56728+ .procname = "resource_logging",
56729+ .data = &grsec_resource_logging,
56730+ .maxlen = sizeof(int),
56731+ .mode = 0600,
56732+ .proc_handler = &proc_dointvec,
56733+ },
56734+#endif
56735+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
56736+ {
56737+ .procname = "audit_ptrace",
56738+ .data = &grsec_enable_audit_ptrace,
56739+ .maxlen = sizeof(int),
56740+ .mode = 0600,
56741+ .proc_handler = &proc_dointvec,
56742+ },
56743+#endif
56744+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
56745+ {
56746+ .procname = "harden_ptrace",
56747+ .data = &grsec_enable_harden_ptrace,
56748+ .maxlen = sizeof(int),
56749+ .mode = 0600,
56750+ .proc_handler = &proc_dointvec,
56751+ },
56752+#endif
56753+ {
56754+ .procname = "grsec_lock",
56755+ .data = &grsec_lock,
56756+ .maxlen = sizeof(int),
56757+ .mode = 0600,
56758+ .proc_handler = &proc_dointvec,
56759+ },
56760+#endif
56761+#ifdef CONFIG_GRKERNSEC_ROFS
56762+ {
56763+ .procname = "romount_protect",
56764+ .data = &grsec_enable_rofs,
56765+ .maxlen = sizeof(int),
56766+ .mode = 0600,
56767+ .proc_handler = &proc_dointvec_minmax,
56768+ .extra1 = &one,
56769+ .extra2 = &one,
56770+ },
56771+#endif
56772+ { }
56773+};
56774+#endif
56775diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
56776new file mode 100644
56777index 0000000..0dc13c3
56778--- /dev/null
56779+++ b/grsecurity/grsec_time.c
56780@@ -0,0 +1,16 @@
56781+#include <linux/kernel.h>
56782+#include <linux/sched.h>
56783+#include <linux/grinternal.h>
56784+#include <linux/module.h>
56785+
56786+void
56787+gr_log_timechange(void)
56788+{
56789+#ifdef CONFIG_GRKERNSEC_TIME
56790+ if (grsec_enable_time)
56791+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
56792+#endif
56793+ return;
56794+}
56795+
56796+EXPORT_SYMBOL(gr_log_timechange);
56797diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
56798new file mode 100644
56799index 0000000..07e0dc0
56800--- /dev/null
56801+++ b/grsecurity/grsec_tpe.c
56802@@ -0,0 +1,73 @@
56803+#include <linux/kernel.h>
56804+#include <linux/sched.h>
56805+#include <linux/file.h>
56806+#include <linux/fs.h>
56807+#include <linux/grinternal.h>
56808+
56809+extern int gr_acl_tpe_check(void);
56810+
56811+int
56812+gr_tpe_allow(const struct file *file)
56813+{
56814+#ifdef CONFIG_GRKERNSEC
56815+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
56816+ const struct cred *cred = current_cred();
56817+ char *msg = NULL;
56818+ char *msg2 = NULL;
56819+
56820+ // never restrict root
56821+ if (!cred->uid)
56822+ return 1;
56823+
56824+ if (grsec_enable_tpe) {
56825+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
56826+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
56827+ msg = "not being in trusted group";
56828+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
56829+ msg = "being in untrusted group";
56830+#else
56831+ if (in_group_p(grsec_tpe_gid))
56832+ msg = "being in untrusted group";
56833+#endif
56834+ }
56835+ if (!msg && gr_acl_tpe_check())
56836+ msg = "being in untrusted role";
56837+
56838+ // not in any affected group/role
56839+ if (!msg)
56840+ goto next_check;
56841+
56842+ if (inode->i_uid)
56843+ msg2 = "file in non-root-owned directory";
56844+ else if (inode->i_mode & S_IWOTH)
56845+ msg2 = "file in world-writable directory";
56846+ else if (inode->i_mode & S_IWGRP)
56847+ msg2 = "file in group-writable directory";
56848+
56849+ if (msg && msg2) {
56850+ char fullmsg[70] = {0};
56851+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
56852+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
56853+ return 0;
56854+ }
56855+ msg = NULL;
56856+next_check:
56857+#ifdef CONFIG_GRKERNSEC_TPE_ALL
56858+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
56859+ return 1;
56860+
56861+ if (inode->i_uid && (inode->i_uid != cred->uid))
56862+ msg = "directory not owned by user";
56863+ else if (inode->i_mode & S_IWOTH)
56864+ msg = "file in world-writable directory";
56865+ else if (inode->i_mode & S_IWGRP)
56866+ msg = "file in group-writable directory";
56867+
56868+ if (msg) {
56869+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
56870+ return 0;
56871+ }
56872+#endif
56873+#endif
56874+ return 1;
56875+}
56876diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
56877new file mode 100644
56878index 0000000..9f7b1ac
56879--- /dev/null
56880+++ b/grsecurity/grsum.c
56881@@ -0,0 +1,61 @@
56882+#include <linux/err.h>
56883+#include <linux/kernel.h>
56884+#include <linux/sched.h>
56885+#include <linux/mm.h>
56886+#include <linux/scatterlist.h>
56887+#include <linux/crypto.h>
56888+#include <linux/gracl.h>
56889+
56890+
56891+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
56892+#error "crypto and sha256 must be built into the kernel"
56893+#endif
56894+
56895+int
56896+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
56897+{
56898+ char *p;
56899+ struct crypto_hash *tfm;
56900+ struct hash_desc desc;
56901+ struct scatterlist sg;
56902+ unsigned char temp_sum[GR_SHA_LEN];
56903+ volatile int retval = 0;
56904+ volatile int dummy = 0;
56905+ unsigned int i;
56906+
56907+ sg_init_table(&sg, 1);
56908+
56909+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
56910+ if (IS_ERR(tfm)) {
56911+ /* should never happen, since sha256 should be built in */
56912+ return 1;
56913+ }
56914+
56915+ desc.tfm = tfm;
56916+ desc.flags = 0;
56917+
56918+ crypto_hash_init(&desc);
56919+
56920+ p = salt;
56921+ sg_set_buf(&sg, p, GR_SALT_LEN);
56922+ crypto_hash_update(&desc, &sg, sg.length);
56923+
56924+ p = entry->pw;
56925+ sg_set_buf(&sg, p, strlen(p));
56926+
56927+ crypto_hash_update(&desc, &sg, sg.length);
56928+
56929+ crypto_hash_final(&desc, temp_sum);
56930+
56931+ memset(entry->pw, 0, GR_PW_LEN);
56932+
56933+ for (i = 0; i < GR_SHA_LEN; i++)
56934+ if (sum[i] != temp_sum[i])
56935+ retval = 1;
56936+ else
56937+ dummy = 1; // waste a cycle
56938+
56939+ crypto_free_hash(tfm);
56940+
56941+ return retval;
56942+}
56943diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
56944index 6cd5b64..f620d2d 100644
56945--- a/include/acpi/acpi_bus.h
56946+++ b/include/acpi/acpi_bus.h
56947@@ -107,7 +107,7 @@ struct acpi_device_ops {
56948 acpi_op_bind bind;
56949 acpi_op_unbind unbind;
56950 acpi_op_notify notify;
56951-};
56952+} __no_const;
56953
56954 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
56955
56956diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
56957index b7babf0..71e4e74 100644
56958--- a/include/asm-generic/atomic-long.h
56959+++ b/include/asm-generic/atomic-long.h
56960@@ -22,6 +22,12 @@
56961
56962 typedef atomic64_t atomic_long_t;
56963
56964+#ifdef CONFIG_PAX_REFCOUNT
56965+typedef atomic64_unchecked_t atomic_long_unchecked_t;
56966+#else
56967+typedef atomic64_t atomic_long_unchecked_t;
56968+#endif
56969+
56970 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
56971
56972 static inline long atomic_long_read(atomic_long_t *l)
56973@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
56974 return (long)atomic64_read(v);
56975 }
56976
56977+#ifdef CONFIG_PAX_REFCOUNT
56978+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
56979+{
56980+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
56981+
56982+ return (long)atomic64_read_unchecked(v);
56983+}
56984+#endif
56985+
56986 static inline void atomic_long_set(atomic_long_t *l, long i)
56987 {
56988 atomic64_t *v = (atomic64_t *)l;
56989@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
56990 atomic64_set(v, i);
56991 }
56992
56993+#ifdef CONFIG_PAX_REFCOUNT
56994+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
56995+{
56996+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
56997+
56998+ atomic64_set_unchecked(v, i);
56999+}
57000+#endif
57001+
57002 static inline void atomic_long_inc(atomic_long_t *l)
57003 {
57004 atomic64_t *v = (atomic64_t *)l;
57005@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
57006 atomic64_inc(v);
57007 }
57008
57009+#ifdef CONFIG_PAX_REFCOUNT
57010+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
57011+{
57012+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57013+
57014+ atomic64_inc_unchecked(v);
57015+}
57016+#endif
57017+
57018 static inline void atomic_long_dec(atomic_long_t *l)
57019 {
57020 atomic64_t *v = (atomic64_t *)l;
57021@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
57022 atomic64_dec(v);
57023 }
57024
57025+#ifdef CONFIG_PAX_REFCOUNT
57026+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
57027+{
57028+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57029+
57030+ atomic64_dec_unchecked(v);
57031+}
57032+#endif
57033+
57034 static inline void atomic_long_add(long i, atomic_long_t *l)
57035 {
57036 atomic64_t *v = (atomic64_t *)l;
57037@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
57038 atomic64_add(i, v);
57039 }
57040
57041+#ifdef CONFIG_PAX_REFCOUNT
57042+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
57043+{
57044+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57045+
57046+ atomic64_add_unchecked(i, v);
57047+}
57048+#endif
57049+
57050 static inline void atomic_long_sub(long i, atomic_long_t *l)
57051 {
57052 atomic64_t *v = (atomic64_t *)l;
57053@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
57054 atomic64_sub(i, v);
57055 }
57056
57057+#ifdef CONFIG_PAX_REFCOUNT
57058+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
57059+{
57060+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57061+
57062+ atomic64_sub_unchecked(i, v);
57063+}
57064+#endif
57065+
57066 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
57067 {
57068 atomic64_t *v = (atomic64_t *)l;
57069@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
57070 return (long)atomic64_inc_return(v);
57071 }
57072
57073+#ifdef CONFIG_PAX_REFCOUNT
57074+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
57075+{
57076+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57077+
57078+ return (long)atomic64_inc_return_unchecked(v);
57079+}
57080+#endif
57081+
57082 static inline long atomic_long_dec_return(atomic_long_t *l)
57083 {
57084 atomic64_t *v = (atomic64_t *)l;
57085@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
57086
57087 typedef atomic_t atomic_long_t;
57088
57089+#ifdef CONFIG_PAX_REFCOUNT
57090+typedef atomic_unchecked_t atomic_long_unchecked_t;
57091+#else
57092+typedef atomic_t atomic_long_unchecked_t;
57093+#endif
57094+
57095 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
57096 static inline long atomic_long_read(atomic_long_t *l)
57097 {
57098@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
57099 return (long)atomic_read(v);
57100 }
57101
57102+#ifdef CONFIG_PAX_REFCOUNT
57103+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
57104+{
57105+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57106+
57107+ return (long)atomic_read_unchecked(v);
57108+}
57109+#endif
57110+
57111 static inline void atomic_long_set(atomic_long_t *l, long i)
57112 {
57113 atomic_t *v = (atomic_t *)l;
57114@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
57115 atomic_set(v, i);
57116 }
57117
57118+#ifdef CONFIG_PAX_REFCOUNT
57119+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
57120+{
57121+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57122+
57123+ atomic_set_unchecked(v, i);
57124+}
57125+#endif
57126+
57127 static inline void atomic_long_inc(atomic_long_t *l)
57128 {
57129 atomic_t *v = (atomic_t *)l;
57130@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
57131 atomic_inc(v);
57132 }
57133
57134+#ifdef CONFIG_PAX_REFCOUNT
57135+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
57136+{
57137+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57138+
57139+ atomic_inc_unchecked(v);
57140+}
57141+#endif
57142+
57143 static inline void atomic_long_dec(atomic_long_t *l)
57144 {
57145 atomic_t *v = (atomic_t *)l;
57146@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
57147 atomic_dec(v);
57148 }
57149
57150+#ifdef CONFIG_PAX_REFCOUNT
57151+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
57152+{
57153+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57154+
57155+ atomic_dec_unchecked(v);
57156+}
57157+#endif
57158+
57159 static inline void atomic_long_add(long i, atomic_long_t *l)
57160 {
57161 atomic_t *v = (atomic_t *)l;
57162@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
57163 atomic_add(i, v);
57164 }
57165
57166+#ifdef CONFIG_PAX_REFCOUNT
57167+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
57168+{
57169+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57170+
57171+ atomic_add_unchecked(i, v);
57172+}
57173+#endif
57174+
57175 static inline void atomic_long_sub(long i, atomic_long_t *l)
57176 {
57177 atomic_t *v = (atomic_t *)l;
57178@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
57179 atomic_sub(i, v);
57180 }
57181
57182+#ifdef CONFIG_PAX_REFCOUNT
57183+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
57184+{
57185+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57186+
57187+ atomic_sub_unchecked(i, v);
57188+}
57189+#endif
57190+
57191 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
57192 {
57193 atomic_t *v = (atomic_t *)l;
57194@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
57195 return (long)atomic_inc_return(v);
57196 }
57197
57198+#ifdef CONFIG_PAX_REFCOUNT
57199+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
57200+{
57201+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57202+
57203+ return (long)atomic_inc_return_unchecked(v);
57204+}
57205+#endif
57206+
57207 static inline long atomic_long_dec_return(atomic_long_t *l)
57208 {
57209 atomic_t *v = (atomic_t *)l;
57210@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
57211
57212 #endif /* BITS_PER_LONG == 64 */
57213
57214+#ifdef CONFIG_PAX_REFCOUNT
57215+static inline void pax_refcount_needs_these_functions(void)
57216+{
57217+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
57218+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
57219+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
57220+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
57221+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
57222+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
57223+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
57224+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
57225+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
57226+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
57227+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
57228+
57229+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
57230+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
57231+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
57232+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
57233+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
57234+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
57235+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
57236+}
57237+#else
57238+#define atomic_read_unchecked(v) atomic_read(v)
57239+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
57240+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
57241+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
57242+#define atomic_inc_unchecked(v) atomic_inc(v)
57243+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
57244+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
57245+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
57246+#define atomic_dec_unchecked(v) atomic_dec(v)
57247+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
57248+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
57249+
57250+#define atomic_long_read_unchecked(v) atomic_long_read(v)
57251+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
57252+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
57253+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
57254+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
57255+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
57256+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
57257+#endif
57258+
57259 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
57260diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
57261index b18ce4f..2ee2843 100644
57262--- a/include/asm-generic/atomic64.h
57263+++ b/include/asm-generic/atomic64.h
57264@@ -16,6 +16,8 @@ typedef struct {
57265 long long counter;
57266 } atomic64_t;
57267
57268+typedef atomic64_t atomic64_unchecked_t;
57269+
57270 #define ATOMIC64_INIT(i) { (i) }
57271
57272 extern long long atomic64_read(const atomic64_t *v);
57273@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
57274 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
57275 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
57276
57277+#define atomic64_read_unchecked(v) atomic64_read(v)
57278+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
57279+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
57280+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
57281+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
57282+#define atomic64_inc_unchecked(v) atomic64_inc(v)
57283+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
57284+#define atomic64_dec_unchecked(v) atomic64_dec(v)
57285+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
57286+
57287 #endif /* _ASM_GENERIC_ATOMIC64_H */
57288diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
57289index 1bfcfe5..e04c5c9 100644
57290--- a/include/asm-generic/cache.h
57291+++ b/include/asm-generic/cache.h
57292@@ -6,7 +6,7 @@
57293 * cache lines need to provide their own cache.h.
57294 */
57295
57296-#define L1_CACHE_SHIFT 5
57297-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
57298+#define L1_CACHE_SHIFT 5UL
57299+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
57300
57301 #endif /* __ASM_GENERIC_CACHE_H */
57302diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
57303index 1ca3efc..e3dc852 100644
57304--- a/include/asm-generic/int-l64.h
57305+++ b/include/asm-generic/int-l64.h
57306@@ -46,6 +46,8 @@ typedef unsigned int u32;
57307 typedef signed long s64;
57308 typedef unsigned long u64;
57309
57310+typedef unsigned int intoverflow_t __attribute__ ((mode(TI)));
57311+
57312 #define S8_C(x) x
57313 #define U8_C(x) x ## U
57314 #define S16_C(x) x
57315diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
57316index f394147..b6152b9 100644
57317--- a/include/asm-generic/int-ll64.h
57318+++ b/include/asm-generic/int-ll64.h
57319@@ -51,6 +51,8 @@ typedef unsigned int u32;
57320 typedef signed long long s64;
57321 typedef unsigned long long u64;
57322
57323+typedef unsigned long long intoverflow_t;
57324+
57325 #define S8_C(x) x
57326 #define U8_C(x) x ## U
57327 #define S16_C(x) x
57328diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
57329index 0232ccb..13d9165 100644
57330--- a/include/asm-generic/kmap_types.h
57331+++ b/include/asm-generic/kmap_types.h
57332@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
57333 KMAP_D(17) KM_NMI,
57334 KMAP_D(18) KM_NMI_PTE,
57335 KMAP_D(19) KM_KDB,
57336+KMAP_D(20) KM_CLEARPAGE,
57337 /*
57338 * Remember to update debug_kmap_atomic() when adding new kmap types!
57339 */
57340-KMAP_D(20) KM_TYPE_NR
57341+KMAP_D(21) KM_TYPE_NR
57342 };
57343
57344 #undef KMAP_D
57345diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
57346index 725612b..9cc513a 100644
57347--- a/include/asm-generic/pgtable-nopmd.h
57348+++ b/include/asm-generic/pgtable-nopmd.h
57349@@ -1,14 +1,19 @@
57350 #ifndef _PGTABLE_NOPMD_H
57351 #define _PGTABLE_NOPMD_H
57352
57353-#ifndef __ASSEMBLY__
57354-
57355 #include <asm-generic/pgtable-nopud.h>
57356
57357-struct mm_struct;
57358-
57359 #define __PAGETABLE_PMD_FOLDED
57360
57361+#define PMD_SHIFT PUD_SHIFT
57362+#define PTRS_PER_PMD 1
57363+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
57364+#define PMD_MASK (~(PMD_SIZE-1))
57365+
57366+#ifndef __ASSEMBLY__
57367+
57368+struct mm_struct;
57369+
57370 /*
57371 * Having the pmd type consist of a pud gets the size right, and allows
57372 * us to conceptually access the pud entry that this pmd is folded into
57373@@ -16,11 +21,6 @@ struct mm_struct;
57374 */
57375 typedef struct { pud_t pud; } pmd_t;
57376
57377-#define PMD_SHIFT PUD_SHIFT
57378-#define PTRS_PER_PMD 1
57379-#define PMD_SIZE (1UL << PMD_SHIFT)
57380-#define PMD_MASK (~(PMD_SIZE-1))
57381-
57382 /*
57383 * The "pud_xxx()" functions here are trivial for a folded two-level
57384 * setup: the pmd is never bad, and a pmd always exists (as it's folded
57385diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
57386index 810431d..ccc3638 100644
57387--- a/include/asm-generic/pgtable-nopud.h
57388+++ b/include/asm-generic/pgtable-nopud.h
57389@@ -1,10 +1,15 @@
57390 #ifndef _PGTABLE_NOPUD_H
57391 #define _PGTABLE_NOPUD_H
57392
57393-#ifndef __ASSEMBLY__
57394-
57395 #define __PAGETABLE_PUD_FOLDED
57396
57397+#define PUD_SHIFT PGDIR_SHIFT
57398+#define PTRS_PER_PUD 1
57399+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
57400+#define PUD_MASK (~(PUD_SIZE-1))
57401+
57402+#ifndef __ASSEMBLY__
57403+
57404 /*
57405 * Having the pud type consist of a pgd gets the size right, and allows
57406 * us to conceptually access the pgd entry that this pud is folded into
57407@@ -12,11 +17,6 @@
57408 */
57409 typedef struct { pgd_t pgd; } pud_t;
57410
57411-#define PUD_SHIFT PGDIR_SHIFT
57412-#define PTRS_PER_PUD 1
57413-#define PUD_SIZE (1UL << PUD_SHIFT)
57414-#define PUD_MASK (~(PUD_SIZE-1))
57415-
57416 /*
57417 * The "pgd_xxx()" functions here are trivial for a folded two-level
57418 * setup: the pud is never bad, and a pud always exists (as it's folded
57419diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
57420index 76bff2b..c7a14e2 100644
57421--- a/include/asm-generic/pgtable.h
57422+++ b/include/asm-generic/pgtable.h
57423@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
57424 #endif /* __HAVE_ARCH_PMD_WRITE */
57425 #endif
57426
57427+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
57428+static inline unsigned long pax_open_kernel(void) { return 0; }
57429+#endif
57430+
57431+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
57432+static inline unsigned long pax_close_kernel(void) { return 0; }
57433+#endif
57434+
57435 #endif /* !__ASSEMBLY__ */
57436
57437 #endif /* _ASM_GENERIC_PGTABLE_H */
57438diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
57439index b5e2e4c..6a5373e 100644
57440--- a/include/asm-generic/vmlinux.lds.h
57441+++ b/include/asm-generic/vmlinux.lds.h
57442@@ -217,6 +217,7 @@
57443 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
57444 VMLINUX_SYMBOL(__start_rodata) = .; \
57445 *(.rodata) *(.rodata.*) \
57446+ *(.data..read_only) \
57447 *(__vermagic) /* Kernel version magic */ \
57448 . = ALIGN(8); \
57449 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
57450@@ -722,17 +723,18 @@
57451 * section in the linker script will go there too. @phdr should have
57452 * a leading colon.
57453 *
57454- * Note that this macros defines __per_cpu_load as an absolute symbol.
57455+ * Note that this macros defines per_cpu_load as an absolute symbol.
57456 * If there is no need to put the percpu section at a predetermined
57457 * address, use PERCPU_SECTION.
57458 */
57459 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
57460- VMLINUX_SYMBOL(__per_cpu_load) = .; \
57461- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
57462+ per_cpu_load = .; \
57463+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
57464 - LOAD_OFFSET) { \
57465+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
57466 PERCPU_INPUT(cacheline) \
57467 } phdr \
57468- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
57469+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
57470
57471 /**
57472 * PERCPU_SECTION - define output section for percpu area, simple version
57473diff --git a/include/drm/drmP.h b/include/drm/drmP.h
57474index bf4b2dc..2d0762f 100644
57475--- a/include/drm/drmP.h
57476+++ b/include/drm/drmP.h
57477@@ -72,6 +72,7 @@
57478 #include <linux/workqueue.h>
57479 #include <linux/poll.h>
57480 #include <asm/pgalloc.h>
57481+#include <asm/local.h>
57482 #include "drm.h"
57483
57484 #include <linux/idr.h>
57485@@ -1038,7 +1039,7 @@ struct drm_device {
57486
57487 /** \name Usage Counters */
57488 /*@{ */
57489- int open_count; /**< Outstanding files open */
57490+ local_t open_count; /**< Outstanding files open */
57491 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
57492 atomic_t vma_count; /**< Outstanding vma areas open */
57493 int buf_use; /**< Buffers in use -- cannot alloc */
57494@@ -1049,7 +1050,7 @@ struct drm_device {
57495 /*@{ */
57496 unsigned long counters;
57497 enum drm_stat_type types[15];
57498- atomic_t counts[15];
57499+ atomic_unchecked_t counts[15];
57500 /*@} */
57501
57502 struct list_head filelist;
57503diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
57504index 73b0712..0b7ef2f 100644
57505--- a/include/drm/drm_crtc_helper.h
57506+++ b/include/drm/drm_crtc_helper.h
57507@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
57508
57509 /* disable crtc when not in use - more explicit than dpms off */
57510 void (*disable)(struct drm_crtc *crtc);
57511-};
57512+} __no_const;
57513
57514 struct drm_encoder_helper_funcs {
57515 void (*dpms)(struct drm_encoder *encoder, int mode);
57516@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
57517 struct drm_connector *connector);
57518 /* disable encoder when not in use - more explicit than dpms off */
57519 void (*disable)(struct drm_encoder *encoder);
57520-};
57521+} __no_const;
57522
57523 struct drm_connector_helper_funcs {
57524 int (*get_modes)(struct drm_connector *connector);
57525diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
57526index 26c1f78..6722682 100644
57527--- a/include/drm/ttm/ttm_memory.h
57528+++ b/include/drm/ttm/ttm_memory.h
57529@@ -47,7 +47,7 @@
57530
57531 struct ttm_mem_shrink {
57532 int (*do_shrink) (struct ttm_mem_shrink *);
57533-};
57534+} __no_const;
57535
57536 /**
57537 * struct ttm_mem_global - Global memory accounting structure.
57538diff --git a/include/linux/a.out.h b/include/linux/a.out.h
57539index e86dfca..40cc55f 100644
57540--- a/include/linux/a.out.h
57541+++ b/include/linux/a.out.h
57542@@ -39,6 +39,14 @@ enum machine_type {
57543 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
57544 };
57545
57546+/* Constants for the N_FLAGS field */
57547+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
57548+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
57549+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
57550+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
57551+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
57552+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
57553+
57554 #if !defined (N_MAGIC)
57555 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
57556 #endif
57557diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
57558index 49a83ca..df96b54 100644
57559--- a/include/linux/atmdev.h
57560+++ b/include/linux/atmdev.h
57561@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
57562 #endif
57563
57564 struct k_atm_aal_stats {
57565-#define __HANDLE_ITEM(i) atomic_t i
57566+#define __HANDLE_ITEM(i) atomic_unchecked_t i
57567 __AAL_STAT_ITEMS
57568 #undef __HANDLE_ITEM
57569 };
57570diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
57571index fd88a39..f4d0bad 100644
57572--- a/include/linux/binfmts.h
57573+++ b/include/linux/binfmts.h
57574@@ -88,6 +88,7 @@ struct linux_binfmt {
57575 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
57576 int (*load_shlib)(struct file *);
57577 int (*core_dump)(struct coredump_params *cprm);
57578+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
57579 unsigned long min_coredump; /* minimal dump size */
57580 };
57581
57582diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
57583index 0ed1eb0..3ab569b 100644
57584--- a/include/linux/blkdev.h
57585+++ b/include/linux/blkdev.h
57586@@ -1315,7 +1315,7 @@ struct block_device_operations {
57587 /* this callback is with swap_lock and sometimes page table lock held */
57588 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
57589 struct module *owner;
57590-};
57591+} __do_const;
57592
57593 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
57594 unsigned long);
57595diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
57596index 4d1a074..88f929a 100644
57597--- a/include/linux/blktrace_api.h
57598+++ b/include/linux/blktrace_api.h
57599@@ -162,7 +162,7 @@ struct blk_trace {
57600 struct dentry *dir;
57601 struct dentry *dropped_file;
57602 struct dentry *msg_file;
57603- atomic_t dropped;
57604+ atomic_unchecked_t dropped;
57605 };
57606
57607 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
57608diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
57609index 83195fb..0b0f77d 100644
57610--- a/include/linux/byteorder/little_endian.h
57611+++ b/include/linux/byteorder/little_endian.h
57612@@ -42,51 +42,51 @@
57613
57614 static inline __le64 __cpu_to_le64p(const __u64 *p)
57615 {
57616- return (__force __le64)*p;
57617+ return (__force const __le64)*p;
57618 }
57619 static inline __u64 __le64_to_cpup(const __le64 *p)
57620 {
57621- return (__force __u64)*p;
57622+ return (__force const __u64)*p;
57623 }
57624 static inline __le32 __cpu_to_le32p(const __u32 *p)
57625 {
57626- return (__force __le32)*p;
57627+ return (__force const __le32)*p;
57628 }
57629 static inline __u32 __le32_to_cpup(const __le32 *p)
57630 {
57631- return (__force __u32)*p;
57632+ return (__force const __u32)*p;
57633 }
57634 static inline __le16 __cpu_to_le16p(const __u16 *p)
57635 {
57636- return (__force __le16)*p;
57637+ return (__force const __le16)*p;
57638 }
57639 static inline __u16 __le16_to_cpup(const __le16 *p)
57640 {
57641- return (__force __u16)*p;
57642+ return (__force const __u16)*p;
57643 }
57644 static inline __be64 __cpu_to_be64p(const __u64 *p)
57645 {
57646- return (__force __be64)__swab64p(p);
57647+ return (__force const __be64)__swab64p(p);
57648 }
57649 static inline __u64 __be64_to_cpup(const __be64 *p)
57650 {
57651- return __swab64p((__u64 *)p);
57652+ return __swab64p((const __u64 *)p);
57653 }
57654 static inline __be32 __cpu_to_be32p(const __u32 *p)
57655 {
57656- return (__force __be32)__swab32p(p);
57657+ return (__force const __be32)__swab32p(p);
57658 }
57659 static inline __u32 __be32_to_cpup(const __be32 *p)
57660 {
57661- return __swab32p((__u32 *)p);
57662+ return __swab32p((const __u32 *)p);
57663 }
57664 static inline __be16 __cpu_to_be16p(const __u16 *p)
57665 {
57666- return (__force __be16)__swab16p(p);
57667+ return (__force const __be16)__swab16p(p);
57668 }
57669 static inline __u16 __be16_to_cpup(const __be16 *p)
57670 {
57671- return __swab16p((__u16 *)p);
57672+ return __swab16p((const __u16 *)p);
57673 }
57674 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
57675 #define __le64_to_cpus(x) do { (void)(x); } while (0)
57676diff --git a/include/linux/cache.h b/include/linux/cache.h
57677index 4c57065..4307975 100644
57678--- a/include/linux/cache.h
57679+++ b/include/linux/cache.h
57680@@ -16,6 +16,10 @@
57681 #define __read_mostly
57682 #endif
57683
57684+#ifndef __read_only
57685+#define __read_only __read_mostly
57686+#endif
57687+
57688 #ifndef ____cacheline_aligned
57689 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
57690 #endif
57691diff --git a/include/linux/capability.h b/include/linux/capability.h
57692index a63d13d..069bfd5 100644
57693--- a/include/linux/capability.h
57694+++ b/include/linux/capability.h
57695@@ -548,6 +548,9 @@ extern bool capable(int cap);
57696 extern bool ns_capable(struct user_namespace *ns, int cap);
57697 extern bool task_ns_capable(struct task_struct *t, int cap);
57698 extern bool nsown_capable(int cap);
57699+extern bool task_ns_capable_nolog(struct task_struct *t, int cap);
57700+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
57701+extern bool capable_nolog(int cap);
57702
57703 /* audit system wants to get cap info from files as well */
57704 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
57705diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
57706index 04ffb2e..6799180 100644
57707--- a/include/linux/cleancache.h
57708+++ b/include/linux/cleancache.h
57709@@ -31,7 +31,7 @@ struct cleancache_ops {
57710 void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
57711 void (*flush_inode)(int, struct cleancache_filekey);
57712 void (*flush_fs)(int);
57713-};
57714+} __no_const;
57715
57716 extern struct cleancache_ops
57717 cleancache_register_ops(struct cleancache_ops *ops);
57718diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
57719index dfadc96..c0e70c1 100644
57720--- a/include/linux/compiler-gcc4.h
57721+++ b/include/linux/compiler-gcc4.h
57722@@ -31,6 +31,12 @@
57723
57724
57725 #if __GNUC_MINOR__ >= 5
57726+
57727+#ifdef CONSTIFY_PLUGIN
57728+#define __no_const __attribute__((no_const))
57729+#define __do_const __attribute__((do_const))
57730+#endif
57731+
57732 /*
57733 * Mark a position in code as unreachable. This can be used to
57734 * suppress control flow warnings after asm blocks that transfer
57735@@ -46,6 +52,11 @@
57736 #define __noclone __attribute__((__noclone__))
57737
57738 #endif
57739+
57740+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
57741+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
57742+#define __bos0(ptr) __bos((ptr), 0)
57743+#define __bos1(ptr) __bos((ptr), 1)
57744 #endif
57745
57746 #if __GNUC_MINOR__ > 0
57747diff --git a/include/linux/compiler.h b/include/linux/compiler.h
57748index 320d6c9..8573a1c 100644
57749--- a/include/linux/compiler.h
57750+++ b/include/linux/compiler.h
57751@@ -5,31 +5,62 @@
57752
57753 #ifdef __CHECKER__
57754 # define __user __attribute__((noderef, address_space(1)))
57755+# define __force_user __force __user
57756 # define __kernel __attribute__((address_space(0)))
57757+# define __force_kernel __force __kernel
57758 # define __safe __attribute__((safe))
57759 # define __force __attribute__((force))
57760 # define __nocast __attribute__((nocast))
57761 # define __iomem __attribute__((noderef, address_space(2)))
57762+# define __force_iomem __force __iomem
57763 # define __acquires(x) __attribute__((context(x,0,1)))
57764 # define __releases(x) __attribute__((context(x,1,0)))
57765 # define __acquire(x) __context__(x,1)
57766 # define __release(x) __context__(x,-1)
57767 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
57768 # define __percpu __attribute__((noderef, address_space(3)))
57769+# define __force_percpu __force __percpu
57770 #ifdef CONFIG_SPARSE_RCU_POINTER
57771 # define __rcu __attribute__((noderef, address_space(4)))
57772+# define __force_rcu __force __rcu
57773 #else
57774 # define __rcu
57775+# define __force_rcu
57776 #endif
57777 extern void __chk_user_ptr(const volatile void __user *);
57778 extern void __chk_io_ptr(const volatile void __iomem *);
57779+#elif defined(CHECKER_PLUGIN)
57780+//# define __user
57781+//# define __force_user
57782+//# define __kernel
57783+//# define __force_kernel
57784+# define __safe
57785+# define __force
57786+# define __nocast
57787+# define __iomem
57788+# define __force_iomem
57789+# define __chk_user_ptr(x) (void)0
57790+# define __chk_io_ptr(x) (void)0
57791+# define __builtin_warning(x, y...) (1)
57792+# define __acquires(x)
57793+# define __releases(x)
57794+# define __acquire(x) (void)0
57795+# define __release(x) (void)0
57796+# define __cond_lock(x,c) (c)
57797+# define __percpu
57798+# define __force_percpu
57799+# define __rcu
57800+# define __force_rcu
57801 #else
57802 # define __user
57803+# define __force_user
57804 # define __kernel
57805+# define __force_kernel
57806 # define __safe
57807 # define __force
57808 # define __nocast
57809 # define __iomem
57810+# define __force_iomem
57811 # define __chk_user_ptr(x) (void)0
57812 # define __chk_io_ptr(x) (void)0
57813 # define __builtin_warning(x, y...) (1)
57814@@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
57815 # define __release(x) (void)0
57816 # define __cond_lock(x,c) (c)
57817 # define __percpu
57818+# define __force_percpu
57819 # define __rcu
57820+# define __force_rcu
57821 #endif
57822
57823 #ifdef __KERNEL__
57824@@ -264,6 +297,14 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
57825 # define __attribute_const__ /* unimplemented */
57826 #endif
57827
57828+#ifndef __no_const
57829+# define __no_const
57830+#endif
57831+
57832+#ifndef __do_const
57833+# define __do_const
57834+#endif
57835+
57836 /*
57837 * Tell gcc if a function is cold. The compiler will assume any path
57838 * directly leading to the call is unlikely.
57839@@ -273,6 +314,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
57840 #define __cold
57841 #endif
57842
57843+#ifndef __alloc_size
57844+#define __alloc_size(...)
57845+#endif
57846+
57847+#ifndef __bos
57848+#define __bos(ptr, arg)
57849+#endif
57850+
57851+#ifndef __bos0
57852+#define __bos0(ptr)
57853+#endif
57854+
57855+#ifndef __bos1
57856+#define __bos1(ptr)
57857+#endif
57858+
57859 /* Simple shorthand for a section definition */
57860 #ifndef __section
57861 # define __section(S) __attribute__ ((__section__(#S)))
57862@@ -306,6 +363,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
57863 * use is to mediate communication between process-level code and irq/NMI
57864 * handlers, all running on the same CPU.
57865 */
57866-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
57867+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
57868+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
57869
57870 #endif /* __LINUX_COMPILER_H */
57871diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
57872index e9eaec5..bfeb9bb 100644
57873--- a/include/linux/cpuset.h
57874+++ b/include/linux/cpuset.h
57875@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void)
57876 * nodemask.
57877 */
57878 smp_mb();
57879- --ACCESS_ONCE(current->mems_allowed_change_disable);
57880+ --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
57881 }
57882
57883 static inline void set_mems_allowed(nodemask_t nodemask)
57884diff --git a/include/linux/cred.h b/include/linux/cred.h
57885index 4030896..8d6f342 100644
57886--- a/include/linux/cred.h
57887+++ b/include/linux/cred.h
57888@@ -207,6 +207,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
57889 static inline void validate_process_creds(void)
57890 {
57891 }
57892+static inline void validate_task_creds(struct task_struct *task)
57893+{
57894+}
57895 #endif
57896
57897 /**
57898diff --git a/include/linux/crypto.h b/include/linux/crypto.h
57899index 8a94217..15d49e3 100644
57900--- a/include/linux/crypto.h
57901+++ b/include/linux/crypto.h
57902@@ -365,7 +365,7 @@ struct cipher_tfm {
57903 const u8 *key, unsigned int keylen);
57904 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
57905 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
57906-};
57907+} __no_const;
57908
57909 struct hash_tfm {
57910 int (*init)(struct hash_desc *desc);
57911@@ -386,13 +386,13 @@ struct compress_tfm {
57912 int (*cot_decompress)(struct crypto_tfm *tfm,
57913 const u8 *src, unsigned int slen,
57914 u8 *dst, unsigned int *dlen);
57915-};
57916+} __no_const;
57917
57918 struct rng_tfm {
57919 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
57920 unsigned int dlen);
57921 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
57922-};
57923+} __no_const;
57924
57925 #define crt_ablkcipher crt_u.ablkcipher
57926 #define crt_aead crt_u.aead
57927diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
57928index 7925bf0..d5143d2 100644
57929--- a/include/linux/decompress/mm.h
57930+++ b/include/linux/decompress/mm.h
57931@@ -77,7 +77,7 @@ static void free(void *where)
57932 * warnings when not needed (indeed large_malloc / large_free are not
57933 * needed by inflate */
57934
57935-#define malloc(a) kmalloc(a, GFP_KERNEL)
57936+#define malloc(a) kmalloc((a), GFP_KERNEL)
57937 #define free(a) kfree(a)
57938
57939 #define large_malloc(a) vmalloc(a)
57940diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
57941index e13117c..e9fc938 100644
57942--- a/include/linux/dma-mapping.h
57943+++ b/include/linux/dma-mapping.h
57944@@ -46,7 +46,7 @@ struct dma_map_ops {
57945 u64 (*get_required_mask)(struct device *dev);
57946 #endif
57947 int is_phys;
57948-};
57949+} __do_const;
57950
57951 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
57952
57953diff --git a/include/linux/efi.h b/include/linux/efi.h
57954index 2362a0b..cfaf8fcc 100644
57955--- a/include/linux/efi.h
57956+++ b/include/linux/efi.h
57957@@ -446,7 +446,7 @@ struct efivar_operations {
57958 efi_get_variable_t *get_variable;
57959 efi_get_next_variable_t *get_next_variable;
57960 efi_set_variable_t *set_variable;
57961-};
57962+} __no_const;
57963
57964 struct efivars {
57965 /*
57966diff --git a/include/linux/elf.h b/include/linux/elf.h
57967index 31f0508..5421c01 100644
57968--- a/include/linux/elf.h
57969+++ b/include/linux/elf.h
57970@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
57971 #define PT_GNU_EH_FRAME 0x6474e550
57972
57973 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
57974+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
57975+
57976+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
57977+
57978+/* Constants for the e_flags field */
57979+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
57980+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
57981+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
57982+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
57983+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
57984+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
57985
57986 /*
57987 * Extended Numbering
57988@@ -106,6 +117,8 @@ typedef __s64 Elf64_Sxword;
57989 #define DT_DEBUG 21
57990 #define DT_TEXTREL 22
57991 #define DT_JMPREL 23
57992+#define DT_FLAGS 30
57993+ #define DF_TEXTREL 0x00000004
57994 #define DT_ENCODING 32
57995 #define OLD_DT_LOOS 0x60000000
57996 #define DT_LOOS 0x6000000d
57997@@ -252,6 +265,19 @@ typedef struct elf64_hdr {
57998 #define PF_W 0x2
57999 #define PF_X 0x1
58000
58001+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
58002+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
58003+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
58004+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
58005+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
58006+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
58007+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
58008+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
58009+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
58010+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
58011+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
58012+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
58013+
58014 typedef struct elf32_phdr{
58015 Elf32_Word p_type;
58016 Elf32_Off p_offset;
58017@@ -344,6 +370,8 @@ typedef struct elf64_shdr {
58018 #define EI_OSABI 7
58019 #define EI_PAD 8
58020
58021+#define EI_PAX 14
58022+
58023 #define ELFMAG0 0x7f /* EI_MAG */
58024 #define ELFMAG1 'E'
58025 #define ELFMAG2 'L'
58026@@ -423,6 +451,7 @@ extern Elf32_Dyn _DYNAMIC [];
58027 #define elf_note elf32_note
58028 #define elf_addr_t Elf32_Off
58029 #define Elf_Half Elf32_Half
58030+#define elf_dyn Elf32_Dyn
58031
58032 #else
58033
58034@@ -433,6 +462,7 @@ extern Elf64_Dyn _DYNAMIC [];
58035 #define elf_note elf64_note
58036 #define elf_addr_t Elf64_Off
58037 #define Elf_Half Elf64_Half
58038+#define elf_dyn Elf64_Dyn
58039
58040 #endif
58041
58042diff --git a/include/linux/filter.h b/include/linux/filter.h
58043index 8eeb205..d59bfa2 100644
58044--- a/include/linux/filter.h
58045+++ b/include/linux/filter.h
58046@@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
58047
58048 struct sk_buff;
58049 struct sock;
58050+struct bpf_jit_work;
58051
58052 struct sk_filter
58053 {
58054@@ -141,6 +142,9 @@ struct sk_filter
58055 unsigned int len; /* Number of filter blocks */
58056 unsigned int (*bpf_func)(const struct sk_buff *skb,
58057 const struct sock_filter *filter);
58058+#ifdef CONFIG_BPF_JIT
58059+ struct bpf_jit_work *work;
58060+#endif
58061 struct rcu_head rcu;
58062 struct sock_filter insns[0];
58063 };
58064diff --git a/include/linux/firewire.h b/include/linux/firewire.h
58065index 84ccf8e..2e9b14c 100644
58066--- a/include/linux/firewire.h
58067+++ b/include/linux/firewire.h
58068@@ -428,7 +428,7 @@ struct fw_iso_context {
58069 union {
58070 fw_iso_callback_t sc;
58071 fw_iso_mc_callback_t mc;
58072- } callback;
58073+ } __no_const callback;
58074 void *callback_data;
58075 };
58076
58077diff --git a/include/linux/fs.h b/include/linux/fs.h
58078index e0bc4ff..d79c2fa 100644
58079--- a/include/linux/fs.h
58080+++ b/include/linux/fs.h
58081@@ -1608,7 +1608,8 @@ struct file_operations {
58082 int (*setlease)(struct file *, long, struct file_lock **);
58083 long (*fallocate)(struct file *file, int mode, loff_t offset,
58084 loff_t len);
58085-};
58086+} __do_const;
58087+typedef struct file_operations __no_const file_operations_no_const;
58088
58089 struct inode_operations {
58090 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
58091diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
58092index 003dc0f..3c4ea97 100644
58093--- a/include/linux/fs_struct.h
58094+++ b/include/linux/fs_struct.h
58095@@ -6,7 +6,7 @@
58096 #include <linux/seqlock.h>
58097
58098 struct fs_struct {
58099- int users;
58100+ atomic_t users;
58101 spinlock_t lock;
58102 seqcount_t seq;
58103 int umask;
58104diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
58105index ce31408..b1ad003 100644
58106--- a/include/linux/fscache-cache.h
58107+++ b/include/linux/fscache-cache.h
58108@@ -102,7 +102,7 @@ struct fscache_operation {
58109 fscache_operation_release_t release;
58110 };
58111
58112-extern atomic_t fscache_op_debug_id;
58113+extern atomic_unchecked_t fscache_op_debug_id;
58114 extern void fscache_op_work_func(struct work_struct *work);
58115
58116 extern void fscache_enqueue_operation(struct fscache_operation *);
58117@@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
58118 {
58119 INIT_WORK(&op->work, fscache_op_work_func);
58120 atomic_set(&op->usage, 1);
58121- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
58122+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
58123 op->processor = processor;
58124 op->release = release;
58125 INIT_LIST_HEAD(&op->pend_link);
58126diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
58127index 2a53f10..0187fdf 100644
58128--- a/include/linux/fsnotify.h
58129+++ b/include/linux/fsnotify.h
58130@@ -314,7 +314,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
58131 */
58132 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
58133 {
58134- return kstrdup(name, GFP_KERNEL);
58135+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
58136 }
58137
58138 /*
58139diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
58140index 91d0e0a3..035666b 100644
58141--- a/include/linux/fsnotify_backend.h
58142+++ b/include/linux/fsnotify_backend.h
58143@@ -105,6 +105,7 @@ struct fsnotify_ops {
58144 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
58145 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
58146 };
58147+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
58148
58149 /*
58150 * A group is a "thing" that wants to receive notification about filesystem
58151diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
58152index c3da42d..c70e0df 100644
58153--- a/include/linux/ftrace_event.h
58154+++ b/include/linux/ftrace_event.h
58155@@ -97,7 +97,7 @@ struct trace_event_functions {
58156 trace_print_func raw;
58157 trace_print_func hex;
58158 trace_print_func binary;
58159-};
58160+} __no_const;
58161
58162 struct trace_event {
58163 struct hlist_node node;
58164@@ -254,7 +254,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
58165 extern int trace_add_event_call(struct ftrace_event_call *call);
58166 extern void trace_remove_event_call(struct ftrace_event_call *call);
58167
58168-#define is_signed_type(type) (((type)(-1)) < 0)
58169+#define is_signed_type(type) (((type)(-1)) < (type)1)
58170
58171 int trace_set_clr_event(const char *system, const char *event, int set);
58172
58173diff --git a/include/linux/genhd.h b/include/linux/genhd.h
58174index 6d18f35..ab71e2c 100644
58175--- a/include/linux/genhd.h
58176+++ b/include/linux/genhd.h
58177@@ -185,7 +185,7 @@ struct gendisk {
58178 struct kobject *slave_dir;
58179
58180 struct timer_rand_state *random;
58181- atomic_t sync_io; /* RAID */
58182+ atomic_unchecked_t sync_io; /* RAID */
58183 struct disk_events *ev;
58184 #ifdef CONFIG_BLK_DEV_INTEGRITY
58185 struct blk_integrity *integrity;
58186diff --git a/include/linux/gracl.h b/include/linux/gracl.h
58187new file mode 100644
58188index 0000000..0dc3943
58189--- /dev/null
58190+++ b/include/linux/gracl.h
58191@@ -0,0 +1,317 @@
58192+#ifndef GR_ACL_H
58193+#define GR_ACL_H
58194+
58195+#include <linux/grdefs.h>
58196+#include <linux/resource.h>
58197+#include <linux/capability.h>
58198+#include <linux/dcache.h>
58199+#include <asm/resource.h>
58200+
58201+/* Major status information */
58202+
58203+#define GR_VERSION "grsecurity 2.2.2"
58204+#define GRSECURITY_VERSION 0x2202
58205+
58206+enum {
58207+ GR_SHUTDOWN = 0,
58208+ GR_ENABLE = 1,
58209+ GR_SPROLE = 2,
58210+ GR_RELOAD = 3,
58211+ GR_SEGVMOD = 4,
58212+ GR_STATUS = 5,
58213+ GR_UNSPROLE = 6,
58214+ GR_PASSSET = 7,
58215+ GR_SPROLEPAM = 8,
58216+};
58217+
58218+/* Password setup definitions
58219+ * kernel/grhash.c */
58220+enum {
58221+ GR_PW_LEN = 128,
58222+ GR_SALT_LEN = 16,
58223+ GR_SHA_LEN = 32,
58224+};
58225+
58226+enum {
58227+ GR_SPROLE_LEN = 64,
58228+};
58229+
58230+enum {
58231+ GR_NO_GLOB = 0,
58232+ GR_REG_GLOB,
58233+ GR_CREATE_GLOB
58234+};
58235+
58236+#define GR_NLIMITS 32
58237+
58238+/* Begin Data Structures */
58239+
58240+struct sprole_pw {
58241+ unsigned char *rolename;
58242+ unsigned char salt[GR_SALT_LEN];
58243+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
58244+};
58245+
58246+struct name_entry {
58247+ __u32 key;
58248+ ino_t inode;
58249+ dev_t device;
58250+ char *name;
58251+ __u16 len;
58252+ __u8 deleted;
58253+ struct name_entry *prev;
58254+ struct name_entry *next;
58255+};
58256+
58257+struct inodev_entry {
58258+ struct name_entry *nentry;
58259+ struct inodev_entry *prev;
58260+ struct inodev_entry *next;
58261+};
58262+
58263+struct acl_role_db {
58264+ struct acl_role_label **r_hash;
58265+ __u32 r_size;
58266+};
58267+
58268+struct inodev_db {
58269+ struct inodev_entry **i_hash;
58270+ __u32 i_size;
58271+};
58272+
58273+struct name_db {
58274+ struct name_entry **n_hash;
58275+ __u32 n_size;
58276+};
58277+
58278+struct crash_uid {
58279+ uid_t uid;
58280+ unsigned long expires;
58281+};
58282+
58283+struct gr_hash_struct {
58284+ void **table;
58285+ void **nametable;
58286+ void *first;
58287+ __u32 table_size;
58288+ __u32 used_size;
58289+ int type;
58290+};
58291+
58292+/* Userspace Grsecurity ACL data structures */
58293+
58294+struct acl_subject_label {
58295+ char *filename;
58296+ ino_t inode;
58297+ dev_t device;
58298+ __u32 mode;
58299+ kernel_cap_t cap_mask;
58300+ kernel_cap_t cap_lower;
58301+ kernel_cap_t cap_invert_audit;
58302+
58303+ struct rlimit res[GR_NLIMITS];
58304+ __u32 resmask;
58305+
58306+ __u8 user_trans_type;
58307+ __u8 group_trans_type;
58308+ uid_t *user_transitions;
58309+ gid_t *group_transitions;
58310+ __u16 user_trans_num;
58311+ __u16 group_trans_num;
58312+
58313+ __u32 sock_families[2];
58314+ __u32 ip_proto[8];
58315+ __u32 ip_type;
58316+ struct acl_ip_label **ips;
58317+ __u32 ip_num;
58318+ __u32 inaddr_any_override;
58319+
58320+ __u32 crashes;
58321+ unsigned long expires;
58322+
58323+ struct acl_subject_label *parent_subject;
58324+ struct gr_hash_struct *hash;
58325+ struct acl_subject_label *prev;
58326+ struct acl_subject_label *next;
58327+
58328+ struct acl_object_label **obj_hash;
58329+ __u32 obj_hash_size;
58330+ __u16 pax_flags;
58331+};
58332+
58333+struct role_allowed_ip {
58334+ __u32 addr;
58335+ __u32 netmask;
58336+
58337+ struct role_allowed_ip *prev;
58338+ struct role_allowed_ip *next;
58339+};
58340+
58341+struct role_transition {
58342+ char *rolename;
58343+
58344+ struct role_transition *prev;
58345+ struct role_transition *next;
58346+};
58347+
58348+struct acl_role_label {
58349+ char *rolename;
58350+ uid_t uidgid;
58351+ __u16 roletype;
58352+
58353+ __u16 auth_attempts;
58354+ unsigned long expires;
58355+
58356+ struct acl_subject_label *root_label;
58357+ struct gr_hash_struct *hash;
58358+
58359+ struct acl_role_label *prev;
58360+ struct acl_role_label *next;
58361+
58362+ struct role_transition *transitions;
58363+ struct role_allowed_ip *allowed_ips;
58364+ uid_t *domain_children;
58365+ __u16 domain_child_num;
58366+
58367+ struct acl_subject_label **subj_hash;
58368+ __u32 subj_hash_size;
58369+};
58370+
58371+struct user_acl_role_db {
58372+ struct acl_role_label **r_table;
58373+ __u32 num_pointers; /* Number of allocations to track */
58374+ __u32 num_roles; /* Number of roles */
58375+ __u32 num_domain_children; /* Number of domain children */
58376+ __u32 num_subjects; /* Number of subjects */
58377+ __u32 num_objects; /* Number of objects */
58378+};
58379+
58380+struct acl_object_label {
58381+ char *filename;
58382+ ino_t inode;
58383+ dev_t device;
58384+ __u32 mode;
58385+
58386+ struct acl_subject_label *nested;
58387+ struct acl_object_label *globbed;
58388+
58389+ /* next two structures not used */
58390+
58391+ struct acl_object_label *prev;
58392+ struct acl_object_label *next;
58393+};
58394+
58395+struct acl_ip_label {
58396+ char *iface;
58397+ __u32 addr;
58398+ __u32 netmask;
58399+ __u16 low, high;
58400+ __u8 mode;
58401+ __u32 type;
58402+ __u32 proto[8];
58403+
58404+ /* next two structures not used */
58405+
58406+ struct acl_ip_label *prev;
58407+ struct acl_ip_label *next;
58408+};
58409+
58410+struct gr_arg {
58411+ struct user_acl_role_db role_db;
58412+ unsigned char pw[GR_PW_LEN];
58413+ unsigned char salt[GR_SALT_LEN];
58414+ unsigned char sum[GR_SHA_LEN];
58415+ unsigned char sp_role[GR_SPROLE_LEN];
58416+ struct sprole_pw *sprole_pws;
58417+ dev_t segv_device;
58418+ ino_t segv_inode;
58419+ uid_t segv_uid;
58420+ __u16 num_sprole_pws;
58421+ __u16 mode;
58422+};
58423+
58424+struct gr_arg_wrapper {
58425+ struct gr_arg *arg;
58426+ __u32 version;
58427+ __u32 size;
58428+};
58429+
58430+struct subject_map {
58431+ struct acl_subject_label *user;
58432+ struct acl_subject_label *kernel;
58433+ struct subject_map *prev;
58434+ struct subject_map *next;
58435+};
58436+
58437+struct acl_subj_map_db {
58438+ struct subject_map **s_hash;
58439+ __u32 s_size;
58440+};
58441+
58442+/* End Data Structures Section */
58443+
58444+/* Hash functions generated by empirical testing by Brad Spengler
58445+ Makes good use of the low bits of the inode. Generally 0-1 times
58446+ in loop for successful match. 0-3 for unsuccessful match.
58447+ Shift/add algorithm with modulus of table size and an XOR*/
58448+
58449+static __inline__ unsigned int
58450+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
58451+{
58452+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
58453+}
58454+
58455+ static __inline__ unsigned int
58456+shash(const struct acl_subject_label *userp, const unsigned int sz)
58457+{
58458+ return ((const unsigned long)userp % sz);
58459+}
58460+
58461+static __inline__ unsigned int
58462+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
58463+{
58464+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
58465+}
58466+
58467+static __inline__ unsigned int
58468+nhash(const char *name, const __u16 len, const unsigned int sz)
58469+{
58470+ return full_name_hash((const unsigned char *)name, len) % sz;
58471+}
58472+
58473+#define FOR_EACH_ROLE_START(role) \
58474+ role = role_list; \
58475+ while (role) {
58476+
58477+#define FOR_EACH_ROLE_END(role) \
58478+ role = role->prev; \
58479+ }
58480+
58481+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
58482+ subj = NULL; \
58483+ iter = 0; \
58484+ while (iter < role->subj_hash_size) { \
58485+ if (subj == NULL) \
58486+ subj = role->subj_hash[iter]; \
58487+ if (subj == NULL) { \
58488+ iter++; \
58489+ continue; \
58490+ }
58491+
58492+#define FOR_EACH_SUBJECT_END(subj,iter) \
58493+ subj = subj->next; \
58494+ if (subj == NULL) \
58495+ iter++; \
58496+ }
58497+
58498+
58499+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
58500+ subj = role->hash->first; \
58501+ while (subj != NULL) {
58502+
58503+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
58504+ subj = subj->next; \
58505+ }
58506+
58507+#endif
58508+
58509diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
58510new file mode 100644
58511index 0000000..323ecf2
58512--- /dev/null
58513+++ b/include/linux/gralloc.h
58514@@ -0,0 +1,9 @@
58515+#ifndef __GRALLOC_H
58516+#define __GRALLOC_H
58517+
58518+void acl_free_all(void);
58519+int acl_alloc_stack_init(unsigned long size);
58520+void *acl_alloc(unsigned long len);
58521+void *acl_alloc_num(unsigned long num, unsigned long len);
58522+
58523+#endif
58524diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
58525new file mode 100644
58526index 0000000..b30e9bc
58527--- /dev/null
58528+++ b/include/linux/grdefs.h
58529@@ -0,0 +1,140 @@
58530+#ifndef GRDEFS_H
58531+#define GRDEFS_H
58532+
58533+/* Begin grsecurity status declarations */
58534+
58535+enum {
58536+ GR_READY = 0x01,
58537+ GR_STATUS_INIT = 0x00 // disabled state
58538+};
58539+
58540+/* Begin ACL declarations */
58541+
58542+/* Role flags */
58543+
58544+enum {
58545+ GR_ROLE_USER = 0x0001,
58546+ GR_ROLE_GROUP = 0x0002,
58547+ GR_ROLE_DEFAULT = 0x0004,
58548+ GR_ROLE_SPECIAL = 0x0008,
58549+ GR_ROLE_AUTH = 0x0010,
58550+ GR_ROLE_NOPW = 0x0020,
58551+ GR_ROLE_GOD = 0x0040,
58552+ GR_ROLE_LEARN = 0x0080,
58553+ GR_ROLE_TPE = 0x0100,
58554+ GR_ROLE_DOMAIN = 0x0200,
58555+ GR_ROLE_PAM = 0x0400,
58556+ GR_ROLE_PERSIST = 0x0800
58557+};
58558+
58559+/* ACL Subject and Object mode flags */
58560+enum {
58561+ GR_DELETED = 0x80000000
58562+};
58563+
58564+/* ACL Object-only mode flags */
58565+enum {
58566+ GR_READ = 0x00000001,
58567+ GR_APPEND = 0x00000002,
58568+ GR_WRITE = 0x00000004,
58569+ GR_EXEC = 0x00000008,
58570+ GR_FIND = 0x00000010,
58571+ GR_INHERIT = 0x00000020,
58572+ GR_SETID = 0x00000040,
58573+ GR_CREATE = 0x00000080,
58574+ GR_DELETE = 0x00000100,
58575+ GR_LINK = 0x00000200,
58576+ GR_AUDIT_READ = 0x00000400,
58577+ GR_AUDIT_APPEND = 0x00000800,
58578+ GR_AUDIT_WRITE = 0x00001000,
58579+ GR_AUDIT_EXEC = 0x00002000,
58580+ GR_AUDIT_FIND = 0x00004000,
58581+ GR_AUDIT_INHERIT= 0x00008000,
58582+ GR_AUDIT_SETID = 0x00010000,
58583+ GR_AUDIT_CREATE = 0x00020000,
58584+ GR_AUDIT_DELETE = 0x00040000,
58585+ GR_AUDIT_LINK = 0x00080000,
58586+ GR_PTRACERD = 0x00100000,
58587+ GR_NOPTRACE = 0x00200000,
58588+ GR_SUPPRESS = 0x00400000,
58589+ GR_NOLEARN = 0x00800000,
58590+ GR_INIT_TRANSFER= 0x01000000
58591+};
58592+
58593+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
58594+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
58595+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
58596+
58597+/* ACL subject-only mode flags */
58598+enum {
58599+ GR_KILL = 0x00000001,
58600+ GR_VIEW = 0x00000002,
58601+ GR_PROTECTED = 0x00000004,
58602+ GR_LEARN = 0x00000008,
58603+ GR_OVERRIDE = 0x00000010,
58604+ /* just a placeholder, this mode is only used in userspace */
58605+ GR_DUMMY = 0x00000020,
58606+ GR_PROTSHM = 0x00000040,
58607+ GR_KILLPROC = 0x00000080,
58608+ GR_KILLIPPROC = 0x00000100,
58609+ /* just a placeholder, this mode is only used in userspace */
58610+ GR_NOTROJAN = 0x00000200,
58611+ GR_PROTPROCFD = 0x00000400,
58612+ GR_PROCACCT = 0x00000800,
58613+ GR_RELAXPTRACE = 0x00001000,
58614+ GR_NESTED = 0x00002000,
58615+ GR_INHERITLEARN = 0x00004000,
58616+ GR_PROCFIND = 0x00008000,
58617+ GR_POVERRIDE = 0x00010000,
58618+ GR_KERNELAUTH = 0x00020000,
58619+ GR_ATSECURE = 0x00040000,
58620+ GR_SHMEXEC = 0x00080000
58621+};
58622+
58623+enum {
58624+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
58625+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
58626+ GR_PAX_ENABLE_MPROTECT = 0x0004,
58627+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
58628+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
58629+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
58630+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
58631+ GR_PAX_DISABLE_MPROTECT = 0x0400,
58632+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
58633+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
58634+};
58635+
58636+enum {
58637+ GR_ID_USER = 0x01,
58638+ GR_ID_GROUP = 0x02,
58639+};
58640+
58641+enum {
58642+ GR_ID_ALLOW = 0x01,
58643+ GR_ID_DENY = 0x02,
58644+};
58645+
58646+#define GR_CRASH_RES 31
58647+#define GR_UIDTABLE_MAX 500
58648+
58649+/* begin resource learning section */
58650+enum {
58651+ GR_RLIM_CPU_BUMP = 60,
58652+ GR_RLIM_FSIZE_BUMP = 50000,
58653+ GR_RLIM_DATA_BUMP = 10000,
58654+ GR_RLIM_STACK_BUMP = 1000,
58655+ GR_RLIM_CORE_BUMP = 10000,
58656+ GR_RLIM_RSS_BUMP = 500000,
58657+ GR_RLIM_NPROC_BUMP = 1,
58658+ GR_RLIM_NOFILE_BUMP = 5,
58659+ GR_RLIM_MEMLOCK_BUMP = 50000,
58660+ GR_RLIM_AS_BUMP = 500000,
58661+ GR_RLIM_LOCKS_BUMP = 2,
58662+ GR_RLIM_SIGPENDING_BUMP = 5,
58663+ GR_RLIM_MSGQUEUE_BUMP = 10000,
58664+ GR_RLIM_NICE_BUMP = 1,
58665+ GR_RLIM_RTPRIO_BUMP = 1,
58666+ GR_RLIM_RTTIME_BUMP = 1000000
58667+};
58668+
58669+#endif
58670diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
58671new file mode 100644
58672index 0000000..da390f1
58673--- /dev/null
58674+++ b/include/linux/grinternal.h
58675@@ -0,0 +1,221 @@
58676+#ifndef __GRINTERNAL_H
58677+#define __GRINTERNAL_H
58678+
58679+#ifdef CONFIG_GRKERNSEC
58680+
58681+#include <linux/fs.h>
58682+#include <linux/mnt_namespace.h>
58683+#include <linux/nsproxy.h>
58684+#include <linux/gracl.h>
58685+#include <linux/grdefs.h>
58686+#include <linux/grmsg.h>
58687+
58688+void gr_add_learn_entry(const char *fmt, ...)
58689+ __attribute__ ((format (printf, 1, 2)));
58690+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
58691+ const struct vfsmount *mnt);
58692+__u32 gr_check_create(const struct dentry *new_dentry,
58693+ const struct dentry *parent,
58694+ const struct vfsmount *mnt, const __u32 mode);
58695+int gr_check_protected_task(const struct task_struct *task);
58696+__u32 to_gr_audit(const __u32 reqmode);
58697+int gr_set_acls(const int type);
58698+int gr_apply_subject_to_task(struct task_struct *task);
58699+int gr_acl_is_enabled(void);
58700+char gr_roletype_to_char(void);
58701+
58702+void gr_handle_alertkill(struct task_struct *task);
58703+char *gr_to_filename(const struct dentry *dentry,
58704+ const struct vfsmount *mnt);
58705+char *gr_to_filename1(const struct dentry *dentry,
58706+ const struct vfsmount *mnt);
58707+char *gr_to_filename2(const struct dentry *dentry,
58708+ const struct vfsmount *mnt);
58709+char *gr_to_filename3(const struct dentry *dentry,
58710+ const struct vfsmount *mnt);
58711+
58712+extern int grsec_enable_ptrace_readexec;
58713+extern int grsec_enable_harden_ptrace;
58714+extern int grsec_enable_link;
58715+extern int grsec_enable_fifo;
58716+extern int grsec_enable_execve;
58717+extern int grsec_enable_shm;
58718+extern int grsec_enable_execlog;
58719+extern int grsec_enable_signal;
58720+extern int grsec_enable_audit_ptrace;
58721+extern int grsec_enable_forkfail;
58722+extern int grsec_enable_time;
58723+extern int grsec_enable_rofs;
58724+extern int grsec_enable_chroot_shmat;
58725+extern int grsec_enable_chroot_mount;
58726+extern int grsec_enable_chroot_double;
58727+extern int grsec_enable_chroot_pivot;
58728+extern int grsec_enable_chroot_chdir;
58729+extern int grsec_enable_chroot_chmod;
58730+extern int grsec_enable_chroot_mknod;
58731+extern int grsec_enable_chroot_fchdir;
58732+extern int grsec_enable_chroot_nice;
58733+extern int grsec_enable_chroot_execlog;
58734+extern int grsec_enable_chroot_caps;
58735+extern int grsec_enable_chroot_sysctl;
58736+extern int grsec_enable_chroot_unix;
58737+extern int grsec_enable_tpe;
58738+extern int grsec_tpe_gid;
58739+extern int grsec_enable_tpe_all;
58740+extern int grsec_enable_tpe_invert;
58741+extern int grsec_enable_socket_all;
58742+extern int grsec_socket_all_gid;
58743+extern int grsec_enable_socket_client;
58744+extern int grsec_socket_client_gid;
58745+extern int grsec_enable_socket_server;
58746+extern int grsec_socket_server_gid;
58747+extern int grsec_audit_gid;
58748+extern int grsec_enable_group;
58749+extern int grsec_enable_audit_textrel;
58750+extern int grsec_enable_log_rwxmaps;
58751+extern int grsec_enable_mount;
58752+extern int grsec_enable_chdir;
58753+extern int grsec_resource_logging;
58754+extern int grsec_enable_blackhole;
58755+extern int grsec_lastack_retries;
58756+extern int grsec_enable_brute;
58757+extern int grsec_lock;
58758+
58759+extern spinlock_t grsec_alert_lock;
58760+extern unsigned long grsec_alert_wtime;
58761+extern unsigned long grsec_alert_fyet;
58762+
58763+extern spinlock_t grsec_audit_lock;
58764+
58765+extern rwlock_t grsec_exec_file_lock;
58766+
58767+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
58768+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
58769+ (tsk)->exec_file->f_vfsmnt) : "/")
58770+
58771+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
58772+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
58773+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
58774+
58775+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
58776+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
58777+ (tsk)->exec_file->f_vfsmnt) : "/")
58778+
58779+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
58780+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
58781+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
58782+
58783+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
58784+
58785+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
58786+
58787+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
58788+ (task)->pid, (cred)->uid, \
58789+ (cred)->euid, (cred)->gid, (cred)->egid, \
58790+ gr_parent_task_fullpath(task), \
58791+ (task)->real_parent->comm, (task)->real_parent->pid, \
58792+ (pcred)->uid, (pcred)->euid, \
58793+ (pcred)->gid, (pcred)->egid
58794+
58795+#define GR_CHROOT_CAPS {{ \
58796+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
58797+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
58798+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
58799+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
58800+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
58801+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
58802+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
58803+
58804+#define security_learn(normal_msg,args...) \
58805+({ \
58806+ read_lock(&grsec_exec_file_lock); \
58807+ gr_add_learn_entry(normal_msg "\n", ## args); \
58808+ read_unlock(&grsec_exec_file_lock); \
58809+})
58810+
58811+enum {
58812+ GR_DO_AUDIT,
58813+ GR_DONT_AUDIT,
58814+ /* used for non-audit messages that we shouldn't kill the task on */
58815+ GR_DONT_AUDIT_GOOD
58816+};
58817+
58818+enum {
58819+ GR_TTYSNIFF,
58820+ GR_RBAC,
58821+ GR_RBAC_STR,
58822+ GR_STR_RBAC,
58823+ GR_RBAC_MODE2,
58824+ GR_RBAC_MODE3,
58825+ GR_FILENAME,
58826+ GR_SYSCTL_HIDDEN,
58827+ GR_NOARGS,
58828+ GR_ONE_INT,
58829+ GR_ONE_INT_TWO_STR,
58830+ GR_ONE_STR,
58831+ GR_STR_INT,
58832+ GR_TWO_STR_INT,
58833+ GR_TWO_INT,
58834+ GR_TWO_U64,
58835+ GR_THREE_INT,
58836+ GR_FIVE_INT_TWO_STR,
58837+ GR_TWO_STR,
58838+ GR_THREE_STR,
58839+ GR_FOUR_STR,
58840+ GR_STR_FILENAME,
58841+ GR_FILENAME_STR,
58842+ GR_FILENAME_TWO_INT,
58843+ GR_FILENAME_TWO_INT_STR,
58844+ GR_TEXTREL,
58845+ GR_PTRACE,
58846+ GR_RESOURCE,
58847+ GR_CAP,
58848+ GR_SIG,
58849+ GR_SIG2,
58850+ GR_CRASH1,
58851+ GR_CRASH2,
58852+ GR_PSACCT,
58853+ GR_RWXMAP
58854+};
58855+
58856+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
58857+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
58858+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
58859+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
58860+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
58861+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
58862+#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)
58863+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
58864+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
58865+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
58866+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
58867+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
58868+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
58869+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
58870+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
58871+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
58872+#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)
58873+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
58874+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
58875+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
58876+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
58877+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
58878+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
58879+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
58880+#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)
58881+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
58882+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
58883+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
58884+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
58885+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
58886+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
58887+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
58888+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
58889+#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)
58890+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
58891+
58892+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
58893+
58894+#endif
58895+
58896+#endif
58897diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
58898new file mode 100644
58899index 0000000..7f62b30
58900--- /dev/null
58901+++ b/include/linux/grmsg.h
58902@@ -0,0 +1,109 @@
58903+#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"
58904+#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"
58905+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
58906+#define GR_STOPMOD_MSG "denied modification of module state by "
58907+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
58908+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
58909+#define GR_IOPERM_MSG "denied use of ioperm() by "
58910+#define GR_IOPL_MSG "denied use of iopl() by "
58911+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
58912+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
58913+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
58914+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
58915+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
58916+#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"
58917+#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"
58918+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
58919+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
58920+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
58921+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
58922+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
58923+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
58924+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
58925+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
58926+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
58927+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
58928+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
58929+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
58930+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
58931+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
58932+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
58933+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
58934+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
58935+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
58936+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
58937+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
58938+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
58939+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
58940+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
58941+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
58942+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
58943+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
58944+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
58945+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
58946+#define GR_FCHMOD_ACL_MSG "%s fchmod of %.950s by "
58947+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
58948+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
58949+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
58950+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
58951+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
58952+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
58953+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
58954+#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"
58955+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbaged by "
58956+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
58957+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
58958+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
58959+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
58960+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
58961+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
58962+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
58963+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
58964+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
58965+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
58966+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
58967+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
58968+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
58969+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
58970+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
58971+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
58972+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
58973+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
58974+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
58975+#define GR_FAILFORK_MSG "failed fork with errno %s by "
58976+#define GR_NICE_CHROOT_MSG "denied priority change by "
58977+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
58978+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
58979+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
58980+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
58981+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
58982+#define GR_TIME_MSG "time set by "
58983+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
58984+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
58985+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
58986+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
58987+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
58988+#define GR_BIND_MSG "denied bind() by "
58989+#define GR_CONNECT_MSG "denied connect() by "
58990+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
58991+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
58992+#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"
58993+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
58994+#define GR_CAP_ACL_MSG "use of %s denied for "
58995+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
58996+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
58997+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
58998+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
58999+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
59000+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
59001+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
59002+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
59003+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
59004+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
59005+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
59006+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
59007+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
59008+#define GR_VM86_MSG "denied use of vm86 by "
59009+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
59010+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
59011+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
59012diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
59013new file mode 100644
59014index 0000000..cb9f1c1
59015--- /dev/null
59016+++ b/include/linux/grsecurity.h
59017@@ -0,0 +1,227 @@
59018+#ifndef GR_SECURITY_H
59019+#define GR_SECURITY_H
59020+#include <linux/fs.h>
59021+#include <linux/fs_struct.h>
59022+#include <linux/binfmts.h>
59023+#include <linux/gracl.h>
59024+
59025+/* notify of brain-dead configs */
59026+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
59027+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
59028+#endif
59029+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
59030+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
59031+#endif
59032+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
59033+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
59034+#endif
59035+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
59036+#error "CONFIG_PAX enabled, but no PaX options are enabled."
59037+#endif
59038+
59039+#include <linux/compat.h>
59040+
59041+struct user_arg_ptr {
59042+#ifdef CONFIG_COMPAT
59043+ bool is_compat;
59044+#endif
59045+ union {
59046+ const char __user *const __user *native;
59047+#ifdef CONFIG_COMPAT
59048+ compat_uptr_t __user *compat;
59049+#endif
59050+ } ptr;
59051+};
59052+
59053+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
59054+void gr_handle_brute_check(void);
59055+void gr_handle_kernel_exploit(void);
59056+int gr_process_user_ban(void);
59057+
59058+char gr_roletype_to_char(void);
59059+
59060+int gr_acl_enable_at_secure(void);
59061+
59062+int gr_check_user_change(int real, int effective, int fs);
59063+int gr_check_group_change(int real, int effective, int fs);
59064+
59065+void gr_del_task_from_ip_table(struct task_struct *p);
59066+
59067+int gr_pid_is_chrooted(struct task_struct *p);
59068+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
59069+int gr_handle_chroot_nice(void);
59070+int gr_handle_chroot_sysctl(const int op);
59071+int gr_handle_chroot_setpriority(struct task_struct *p,
59072+ const int niceval);
59073+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
59074+int gr_handle_chroot_chroot(const struct dentry *dentry,
59075+ const struct vfsmount *mnt);
59076+void gr_handle_chroot_chdir(struct path *path);
59077+int gr_handle_chroot_chmod(const struct dentry *dentry,
59078+ const struct vfsmount *mnt, const int mode);
59079+int gr_handle_chroot_mknod(const struct dentry *dentry,
59080+ const struct vfsmount *mnt, const int mode);
59081+int gr_handle_chroot_mount(const struct dentry *dentry,
59082+ const struct vfsmount *mnt,
59083+ const char *dev_name);
59084+int gr_handle_chroot_pivot(void);
59085+int gr_handle_chroot_unix(const pid_t pid);
59086+
59087+int gr_handle_rawio(const struct inode *inode);
59088+
59089+void gr_handle_ioperm(void);
59090+void gr_handle_iopl(void);
59091+
59092+int gr_tpe_allow(const struct file *file);
59093+
59094+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
59095+void gr_clear_chroot_entries(struct task_struct *task);
59096+
59097+void gr_log_forkfail(const int retval);
59098+void gr_log_timechange(void);
59099+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
59100+void gr_log_chdir(const struct dentry *dentry,
59101+ const struct vfsmount *mnt);
59102+void gr_log_chroot_exec(const struct dentry *dentry,
59103+ const struct vfsmount *mnt);
59104+void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
59105+void gr_log_remount(const char *devname, const int retval);
59106+void gr_log_unmount(const char *devname, const int retval);
59107+void gr_log_mount(const char *from, const char *to, const int retval);
59108+void gr_log_textrel(struct vm_area_struct *vma);
59109+void gr_log_rwxmmap(struct file *file);
59110+void gr_log_rwxmprotect(struct file *file);
59111+
59112+int gr_handle_follow_link(const struct inode *parent,
59113+ const struct inode *inode,
59114+ const struct dentry *dentry,
59115+ const struct vfsmount *mnt);
59116+int gr_handle_fifo(const struct dentry *dentry,
59117+ const struct vfsmount *mnt,
59118+ const struct dentry *dir, const int flag,
59119+ const int acc_mode);
59120+int gr_handle_hardlink(const struct dentry *dentry,
59121+ const struct vfsmount *mnt,
59122+ struct inode *inode,
59123+ const int mode, const char *to);
59124+
59125+int gr_is_capable(const int cap);
59126+int gr_is_capable_nolog(const int cap);
59127+void gr_learn_resource(const struct task_struct *task, const int limit,
59128+ const unsigned long wanted, const int gt);
59129+void gr_copy_label(struct task_struct *tsk);
59130+void gr_handle_crash(struct task_struct *task, const int sig);
59131+int gr_handle_signal(const struct task_struct *p, const int sig);
59132+int gr_check_crash_uid(const uid_t uid);
59133+int gr_check_protected_task(const struct task_struct *task);
59134+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
59135+int gr_acl_handle_mmap(const struct file *file,
59136+ const unsigned long prot);
59137+int gr_acl_handle_mprotect(const struct file *file,
59138+ const unsigned long prot);
59139+int gr_check_hidden_task(const struct task_struct *tsk);
59140+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
59141+ const struct vfsmount *mnt);
59142+__u32 gr_acl_handle_utime(const struct dentry *dentry,
59143+ const struct vfsmount *mnt);
59144+__u32 gr_acl_handle_access(const struct dentry *dentry,
59145+ const struct vfsmount *mnt, const int fmode);
59146+__u32 gr_acl_handle_fchmod(const struct dentry *dentry,
59147+ const struct vfsmount *mnt, mode_t mode);
59148+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
59149+ const struct vfsmount *mnt, mode_t mode);
59150+__u32 gr_acl_handle_chown(const struct dentry *dentry,
59151+ const struct vfsmount *mnt);
59152+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
59153+ const struct vfsmount *mnt);
59154+int gr_handle_ptrace(struct task_struct *task, const long request);
59155+int gr_handle_proc_ptrace(struct task_struct *task);
59156+__u32 gr_acl_handle_execve(const struct dentry *dentry,
59157+ const struct vfsmount *mnt);
59158+int gr_check_crash_exec(const struct file *filp);
59159+int gr_acl_is_enabled(void);
59160+void gr_set_kernel_label(struct task_struct *task);
59161+void gr_set_role_label(struct task_struct *task, const uid_t uid,
59162+ const gid_t gid);
59163+int gr_set_proc_label(const struct dentry *dentry,
59164+ const struct vfsmount *mnt,
59165+ const int unsafe_flags);
59166+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
59167+ const struct vfsmount *mnt);
59168+__u32 gr_acl_handle_open(const struct dentry *dentry,
59169+ const struct vfsmount *mnt, int acc_mode);
59170+__u32 gr_acl_handle_creat(const struct dentry *dentry,
59171+ const struct dentry *p_dentry,
59172+ const struct vfsmount *p_mnt,
59173+ int open_flags, int acc_mode, const int imode);
59174+void gr_handle_create(const struct dentry *dentry,
59175+ const struct vfsmount *mnt);
59176+void gr_handle_proc_create(const struct dentry *dentry,
59177+ const struct inode *inode);
59178+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
59179+ const struct dentry *parent_dentry,
59180+ const struct vfsmount *parent_mnt,
59181+ const int mode);
59182+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
59183+ const struct dentry *parent_dentry,
59184+ const struct vfsmount *parent_mnt);
59185+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
59186+ const struct vfsmount *mnt);
59187+void gr_handle_delete(const ino_t ino, const dev_t dev);
59188+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
59189+ const struct vfsmount *mnt);
59190+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
59191+ const struct dentry *parent_dentry,
59192+ const struct vfsmount *parent_mnt,
59193+ const char *from);
59194+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
59195+ const struct dentry *parent_dentry,
59196+ const struct vfsmount *parent_mnt,
59197+ const struct dentry *old_dentry,
59198+ const struct vfsmount *old_mnt, const char *to);
59199+int gr_acl_handle_rename(struct dentry *new_dentry,
59200+ struct dentry *parent_dentry,
59201+ const struct vfsmount *parent_mnt,
59202+ struct dentry *old_dentry,
59203+ struct inode *old_parent_inode,
59204+ struct vfsmount *old_mnt, const char *newname);
59205+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
59206+ struct dentry *old_dentry,
59207+ struct dentry *new_dentry,
59208+ struct vfsmount *mnt, const __u8 replace);
59209+__u32 gr_check_link(const struct dentry *new_dentry,
59210+ const struct dentry *parent_dentry,
59211+ const struct vfsmount *parent_mnt,
59212+ const struct dentry *old_dentry,
59213+ const struct vfsmount *old_mnt);
59214+int gr_acl_handle_filldir(const struct file *file, const char *name,
59215+ const unsigned int namelen, const ino_t ino);
59216+
59217+__u32 gr_acl_handle_unix(const struct dentry *dentry,
59218+ const struct vfsmount *mnt);
59219+void gr_acl_handle_exit(void);
59220+void gr_acl_handle_psacct(struct task_struct *task, const long code);
59221+int gr_acl_handle_procpidmem(const struct task_struct *task);
59222+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
59223+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
59224+void gr_audit_ptrace(struct task_struct *task);
59225+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
59226+
59227+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
59228+
59229+#ifdef CONFIG_GRKERNSEC
59230+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
59231+void gr_handle_vm86(void);
59232+void gr_handle_mem_readwrite(u64 from, u64 to);
59233+
59234+extern int grsec_enable_dmesg;
59235+extern int grsec_disable_privio;
59236+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59237+extern int grsec_enable_chroot_findtask;
59238+#endif
59239+#ifdef CONFIG_GRKERNSEC_SETXID
59240+extern int grsec_enable_setxid;
59241+#endif
59242+#endif
59243+
59244+#endif
59245diff --git a/include/linux/grsock.h b/include/linux/grsock.h
59246new file mode 100644
59247index 0000000..e7ffaaf
59248--- /dev/null
59249+++ b/include/linux/grsock.h
59250@@ -0,0 +1,19 @@
59251+#ifndef __GRSOCK_H
59252+#define __GRSOCK_H
59253+
59254+extern void gr_attach_curr_ip(const struct sock *sk);
59255+extern int gr_handle_sock_all(const int family, const int type,
59256+ const int protocol);
59257+extern int gr_handle_sock_server(const struct sockaddr *sck);
59258+extern int gr_handle_sock_server_other(const struct sock *sck);
59259+extern int gr_handle_sock_client(const struct sockaddr *sck);
59260+extern int gr_search_connect(struct socket * sock,
59261+ struct sockaddr_in * addr);
59262+extern int gr_search_bind(struct socket * sock,
59263+ struct sockaddr_in * addr);
59264+extern int gr_search_listen(struct socket * sock);
59265+extern int gr_search_accept(struct socket * sock);
59266+extern int gr_search_socket(const int domain, const int type,
59267+ const int protocol);
59268+
59269+#endif
59270diff --git a/include/linux/hid.h b/include/linux/hid.h
59271index c235e4e..f0cf7a0 100644
59272--- a/include/linux/hid.h
59273+++ b/include/linux/hid.h
59274@@ -679,7 +679,7 @@ struct hid_ll_driver {
59275 unsigned int code, int value);
59276
59277 int (*parse)(struct hid_device *hdev);
59278-};
59279+} __no_const;
59280
59281 #define PM_HINT_FULLON 1<<5
59282 #define PM_HINT_NORMAL 1<<1
59283diff --git a/include/linux/highmem.h b/include/linux/highmem.h
59284index 3a93f73..b19d0b3 100644
59285--- a/include/linux/highmem.h
59286+++ b/include/linux/highmem.h
59287@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page)
59288 kunmap_atomic(kaddr, KM_USER0);
59289 }
59290
59291+static inline void sanitize_highpage(struct page *page)
59292+{
59293+ void *kaddr;
59294+ unsigned long flags;
59295+
59296+ local_irq_save(flags);
59297+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
59298+ clear_page(kaddr);
59299+ kunmap_atomic(kaddr, KM_CLEARPAGE);
59300+ local_irq_restore(flags);
59301+}
59302+
59303 static inline void zero_user_segments(struct page *page,
59304 unsigned start1, unsigned end1,
59305 unsigned start2, unsigned end2)
59306diff --git a/include/linux/i2c.h b/include/linux/i2c.h
59307index 07d103a..04ec65b 100644
59308--- a/include/linux/i2c.h
59309+++ b/include/linux/i2c.h
59310@@ -364,6 +364,7 @@ struct i2c_algorithm {
59311 /* To determine what the adapter supports */
59312 u32 (*functionality) (struct i2c_adapter *);
59313 };
59314+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
59315
59316 /*
59317 * i2c_adapter is the structure used to identify a physical i2c bus along
59318diff --git a/include/linux/i2o.h b/include/linux/i2o.h
59319index a6deef4..c56a7f2 100644
59320--- a/include/linux/i2o.h
59321+++ b/include/linux/i2o.h
59322@@ -564,7 +564,7 @@ struct i2o_controller {
59323 struct i2o_device *exec; /* Executive */
59324 #if BITS_PER_LONG == 64
59325 spinlock_t context_list_lock; /* lock for context_list */
59326- atomic_t context_list_counter; /* needed for unique contexts */
59327+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
59328 struct list_head context_list; /* list of context id's
59329 and pointers */
59330 #endif
59331diff --git a/include/linux/init.h b/include/linux/init.h
59332index 9146f39..885354d 100644
59333--- a/include/linux/init.h
59334+++ b/include/linux/init.h
59335@@ -293,13 +293,13 @@ void __init parse_early_options(char *cmdline);
59336
59337 /* Each module must use one module_init(). */
59338 #define module_init(initfn) \
59339- static inline initcall_t __inittest(void) \
59340+ static inline __used initcall_t __inittest(void) \
59341 { return initfn; } \
59342 int init_module(void) __attribute__((alias(#initfn)));
59343
59344 /* This is only required if you want to be unloadable. */
59345 #define module_exit(exitfn) \
59346- static inline exitcall_t __exittest(void) \
59347+ static inline __used exitcall_t __exittest(void) \
59348 { return exitfn; } \
59349 void cleanup_module(void) __attribute__((alias(#exitfn)));
59350
59351diff --git a/include/linux/init_task.h b/include/linux/init_task.h
59352index 32574ee..00d4ef1 100644
59353--- a/include/linux/init_task.h
59354+++ b/include/linux/init_task.h
59355@@ -128,6 +128,12 @@ extern struct cred init_cred;
59356
59357 #define INIT_TASK_COMM "swapper"
59358
59359+#ifdef CONFIG_X86
59360+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
59361+#else
59362+#define INIT_TASK_THREAD_INFO
59363+#endif
59364+
59365 /*
59366 * INIT_TASK is used to set up the first task table, touch at
59367 * your own risk!. Base=0, limit=0x1fffff (=2MB)
59368@@ -166,6 +172,7 @@ extern struct cred init_cred;
59369 RCU_INIT_POINTER(.cred, &init_cred), \
59370 .comm = INIT_TASK_COMM, \
59371 .thread = INIT_THREAD, \
59372+ INIT_TASK_THREAD_INFO \
59373 .fs = &init_fs, \
59374 .files = &init_files, \
59375 .signal = &init_signals, \
59376diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
59377index e6ca56d..8583707 100644
59378--- a/include/linux/intel-iommu.h
59379+++ b/include/linux/intel-iommu.h
59380@@ -296,7 +296,7 @@ struct iommu_flush {
59381 u8 fm, u64 type);
59382 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
59383 unsigned int size_order, u64 type);
59384-};
59385+} __no_const;
59386
59387 enum {
59388 SR_DMAR_FECTL_REG,
59389diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
59390index a64b00e..464d8bc 100644
59391--- a/include/linux/interrupt.h
59392+++ b/include/linux/interrupt.h
59393@@ -441,7 +441,7 @@ enum
59394 /* map softirq index to softirq name. update 'softirq_to_name' in
59395 * kernel/softirq.c when adding a new softirq.
59396 */
59397-extern char *softirq_to_name[NR_SOFTIRQS];
59398+extern const char * const softirq_to_name[NR_SOFTIRQS];
59399
59400 /* softirq mask and active fields moved to irq_cpustat_t in
59401 * asm/hardirq.h to get better cache usage. KAO
59402@@ -449,12 +449,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
59403
59404 struct softirq_action
59405 {
59406- void (*action)(struct softirq_action *);
59407+ void (*action)(void);
59408 };
59409
59410 asmlinkage void do_softirq(void);
59411 asmlinkage void __do_softirq(void);
59412-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
59413+extern void open_softirq(int nr, void (*action)(void));
59414 extern void softirq_init(void);
59415 static inline void __raise_softirq_irqoff(unsigned int nr)
59416 {
59417diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
59418index 3875719..4cd454c 100644
59419--- a/include/linux/kallsyms.h
59420+++ b/include/linux/kallsyms.h
59421@@ -15,7 +15,8 @@
59422
59423 struct module;
59424
59425-#ifdef CONFIG_KALLSYMS
59426+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
59427+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
59428 /* Lookup the address for a symbol. Returns 0 if not found. */
59429 unsigned long kallsyms_lookup_name(const char *name);
59430
59431@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
59432 /* Stupid that this does nothing, but I didn't create this mess. */
59433 #define __print_symbol(fmt, addr)
59434 #endif /*CONFIG_KALLSYMS*/
59435+#else /* when included by kallsyms.c, vsnprintf.c, or
59436+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
59437+extern void __print_symbol(const char *fmt, unsigned long address);
59438+extern int sprint_backtrace(char *buffer, unsigned long address);
59439+extern int sprint_symbol(char *buffer, unsigned long address);
59440+const char *kallsyms_lookup(unsigned long addr,
59441+ unsigned long *symbolsize,
59442+ unsigned long *offset,
59443+ char **modname, char *namebuf);
59444+#endif
59445
59446 /* This macro allows us to keep printk typechecking */
59447 static __printf(1, 2)
59448diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
59449index fa39183..40160be 100644
59450--- a/include/linux/kgdb.h
59451+++ b/include/linux/kgdb.h
59452@@ -53,7 +53,7 @@ extern int kgdb_connected;
59453 extern int kgdb_io_module_registered;
59454
59455 extern atomic_t kgdb_setting_breakpoint;
59456-extern atomic_t kgdb_cpu_doing_single_step;
59457+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
59458
59459 extern struct task_struct *kgdb_usethread;
59460 extern struct task_struct *kgdb_contthread;
59461@@ -251,7 +251,7 @@ struct kgdb_arch {
59462 void (*disable_hw_break)(struct pt_regs *regs);
59463 void (*remove_all_hw_break)(void);
59464 void (*correct_hw_break)(void);
59465-};
59466+} __do_const;
59467
59468 /**
59469 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
59470@@ -276,7 +276,7 @@ struct kgdb_io {
59471 void (*pre_exception) (void);
59472 void (*post_exception) (void);
59473 int is_console;
59474-};
59475+} __do_const;
59476
59477 extern struct kgdb_arch arch_kgdb_ops;
59478
59479diff --git a/include/linux/kmod.h b/include/linux/kmod.h
59480index b16f653..eb908f4 100644
59481--- a/include/linux/kmod.h
59482+++ b/include/linux/kmod.h
59483@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
59484 * usually useless though. */
59485 extern __printf(2, 3)
59486 int __request_module(bool wait, const char *name, ...);
59487+extern __printf(3, 4)
59488+int ___request_module(bool wait, char *param_name, const char *name, ...);
59489 #define request_module(mod...) __request_module(true, mod)
59490 #define request_module_nowait(mod...) __request_module(false, mod)
59491 #define try_then_request_module(x, mod...) \
59492diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
59493index d526231..086e89b 100644
59494--- a/include/linux/kvm_host.h
59495+++ b/include/linux/kvm_host.h
59496@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
59497 void vcpu_load(struct kvm_vcpu *vcpu);
59498 void vcpu_put(struct kvm_vcpu *vcpu);
59499
59500-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
59501+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
59502 struct module *module);
59503 void kvm_exit(void);
59504
59505@@ -454,7 +454,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
59506 struct kvm_guest_debug *dbg);
59507 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
59508
59509-int kvm_arch_init(void *opaque);
59510+int kvm_arch_init(const void *opaque);
59511 void kvm_arch_exit(void);
59512
59513 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
59514diff --git a/include/linux/libata.h b/include/linux/libata.h
59515index cafc09a..d7e7829 100644
59516--- a/include/linux/libata.h
59517+++ b/include/linux/libata.h
59518@@ -909,7 +909,7 @@ struct ata_port_operations {
59519 * fields must be pointers.
59520 */
59521 const struct ata_port_operations *inherits;
59522-};
59523+} __do_const;
59524
59525 struct ata_port_info {
59526 unsigned long flags;
59527diff --git a/include/linux/mca.h b/include/linux/mca.h
59528index 3797270..7765ede 100644
59529--- a/include/linux/mca.h
59530+++ b/include/linux/mca.h
59531@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
59532 int region);
59533 void * (*mca_transform_memory)(struct mca_device *,
59534 void *memory);
59535-};
59536+} __no_const;
59537
59538 struct mca_bus {
59539 u64 default_dma_mask;
59540diff --git a/include/linux/memory.h b/include/linux/memory.h
59541index 935699b..11042cc 100644
59542--- a/include/linux/memory.h
59543+++ b/include/linux/memory.h
59544@@ -144,7 +144,7 @@ struct memory_accessor {
59545 size_t count);
59546 ssize_t (*write)(struct memory_accessor *, const char *buf,
59547 off_t offset, size_t count);
59548-};
59549+} __no_const;
59550
59551 /*
59552 * Kernel text modification mutex, used for code patching. Users of this lock
59553diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
59554index 9970337..9444122 100644
59555--- a/include/linux/mfd/abx500.h
59556+++ b/include/linux/mfd/abx500.h
59557@@ -188,6 +188,7 @@ struct abx500_ops {
59558 int (*event_registers_startup_state_get) (struct device *, u8 *);
59559 int (*startup_irq_enabled) (struct device *, unsigned int);
59560 };
59561+typedef struct abx500_ops __no_const abx500_ops_no_const;
59562
59563 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
59564 void abx500_remove_ops(struct device *dev);
59565diff --git a/include/linux/mm.h b/include/linux/mm.h
59566index 4baadd1..2e0b45e 100644
59567--- a/include/linux/mm.h
59568+++ b/include/linux/mm.h
59569@@ -115,7 +115,14 @@ extern unsigned int kobjsize(const void *objp);
59570
59571 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
59572 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
59573+
59574+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
59575+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
59576+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
59577+#else
59578 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
59579+#endif
59580+
59581 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
59582 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
59583
59584@@ -1012,34 +1019,6 @@ int set_page_dirty(struct page *page);
59585 int set_page_dirty_lock(struct page *page);
59586 int clear_page_dirty_for_io(struct page *page);
59587
59588-/* Is the vma a continuation of the stack vma above it? */
59589-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
59590-{
59591- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
59592-}
59593-
59594-static inline int stack_guard_page_start(struct vm_area_struct *vma,
59595- unsigned long addr)
59596-{
59597- return (vma->vm_flags & VM_GROWSDOWN) &&
59598- (vma->vm_start == addr) &&
59599- !vma_growsdown(vma->vm_prev, addr);
59600-}
59601-
59602-/* Is the vma a continuation of the stack vma below it? */
59603-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
59604-{
59605- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
59606-}
59607-
59608-static inline int stack_guard_page_end(struct vm_area_struct *vma,
59609- unsigned long addr)
59610-{
59611- return (vma->vm_flags & VM_GROWSUP) &&
59612- (vma->vm_end == addr) &&
59613- !vma_growsup(vma->vm_next, addr);
59614-}
59615-
59616 extern unsigned long move_page_tables(struct vm_area_struct *vma,
59617 unsigned long old_addr, struct vm_area_struct *new_vma,
59618 unsigned long new_addr, unsigned long len);
59619@@ -1134,6 +1113,15 @@ static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
59620 }
59621 #endif
59622
59623+#ifdef CONFIG_MMU
59624+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
59625+#else
59626+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
59627+{
59628+ return __pgprot(0);
59629+}
59630+#endif
59631+
59632 int vma_wants_writenotify(struct vm_area_struct *vma);
59633
59634 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
59635@@ -1419,6 +1407,7 @@ out:
59636 }
59637
59638 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
59639+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
59640
59641 extern unsigned long do_brk(unsigned long, unsigned long);
59642
59643@@ -1476,6 +1465,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
59644 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
59645 struct vm_area_struct **pprev);
59646
59647+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
59648+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
59649+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
59650+
59651 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
59652 NULL if none. Assume start_addr < end_addr. */
59653 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
59654@@ -1492,15 +1485,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
59655 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
59656 }
59657
59658-#ifdef CONFIG_MMU
59659-pgprot_t vm_get_page_prot(unsigned long vm_flags);
59660-#else
59661-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
59662-{
59663- return __pgprot(0);
59664-}
59665-#endif
59666-
59667 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
59668 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
59669 unsigned long pfn, unsigned long size, pgprot_t);
59670@@ -1614,7 +1598,7 @@ extern int unpoison_memory(unsigned long pfn);
59671 extern int sysctl_memory_failure_early_kill;
59672 extern int sysctl_memory_failure_recovery;
59673 extern void shake_page(struct page *p, int access);
59674-extern atomic_long_t mce_bad_pages;
59675+extern atomic_long_unchecked_t mce_bad_pages;
59676 extern int soft_offline_page(struct page *page, int flags);
59677
59678 extern void dump_page(struct page *page);
59679@@ -1628,5 +1612,11 @@ extern void copy_user_huge_page(struct page *dst, struct page *src,
59680 unsigned int pages_per_huge_page);
59681 #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
59682
59683+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
59684+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
59685+#else
59686+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
59687+#endif
59688+
59689 #endif /* __KERNEL__ */
59690 #endif /* _LINUX_MM_H */
59691diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
59692index 5b42f1b..759e4b4 100644
59693--- a/include/linux/mm_types.h
59694+++ b/include/linux/mm_types.h
59695@@ -253,6 +253,8 @@ struct vm_area_struct {
59696 #ifdef CONFIG_NUMA
59697 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
59698 #endif
59699+
59700+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
59701 };
59702
59703 struct core_thread {
59704@@ -389,6 +391,24 @@ struct mm_struct {
59705 #ifdef CONFIG_CPUMASK_OFFSTACK
59706 struct cpumask cpumask_allocation;
59707 #endif
59708+
59709+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59710+ unsigned long pax_flags;
59711+#endif
59712+
59713+#ifdef CONFIG_PAX_DLRESOLVE
59714+ unsigned long call_dl_resolve;
59715+#endif
59716+
59717+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
59718+ unsigned long call_syscall;
59719+#endif
59720+
59721+#ifdef CONFIG_PAX_ASLR
59722+ unsigned long delta_mmap; /* randomized offset */
59723+ unsigned long delta_stack; /* randomized offset */
59724+#endif
59725+
59726 };
59727
59728 static inline void mm_init_cpumask(struct mm_struct *mm)
59729diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
59730index 1d1b1e1..2a13c78 100644
59731--- a/include/linux/mmu_notifier.h
59732+++ b/include/linux/mmu_notifier.h
59733@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
59734 */
59735 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
59736 ({ \
59737- pte_t __pte; \
59738+ pte_t ___pte; \
59739 struct vm_area_struct *___vma = __vma; \
59740 unsigned long ___address = __address; \
59741- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
59742+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
59743 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
59744- __pte; \
59745+ ___pte; \
59746 })
59747
59748 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
59749diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
59750index 188cb2f..d78409b 100644
59751--- a/include/linux/mmzone.h
59752+++ b/include/linux/mmzone.h
59753@@ -369,7 +369,7 @@ struct zone {
59754 unsigned long flags; /* zone flags, see below */
59755
59756 /* Zone statistics */
59757- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
59758+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
59759
59760 /*
59761 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
59762diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
59763index 468819c..17b9db3 100644
59764--- a/include/linux/mod_devicetable.h
59765+++ b/include/linux/mod_devicetable.h
59766@@ -12,7 +12,7 @@
59767 typedef unsigned long kernel_ulong_t;
59768 #endif
59769
59770-#define PCI_ANY_ID (~0)
59771+#define PCI_ANY_ID ((__u16)~0)
59772
59773 struct pci_device_id {
59774 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
59775@@ -131,7 +131,7 @@ struct usb_device_id {
59776 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
59777 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
59778
59779-#define HID_ANY_ID (~0)
59780+#define HID_ANY_ID (~0U)
59781
59782 struct hid_device_id {
59783 __u16 bus;
59784diff --git a/include/linux/module.h b/include/linux/module.h
59785index 3cb7839..511cb87 100644
59786--- a/include/linux/module.h
59787+++ b/include/linux/module.h
59788@@ -17,6 +17,7 @@
59789 #include <linux/moduleparam.h>
59790 #include <linux/tracepoint.h>
59791 #include <linux/export.h>
59792+#include <linux/fs.h>
59793
59794 #include <linux/percpu.h>
59795 #include <asm/module.h>
59796@@ -261,19 +262,16 @@ struct module
59797 int (*init)(void);
59798
59799 /* If this is non-NULL, vfree after init() returns */
59800- void *module_init;
59801+ void *module_init_rx, *module_init_rw;
59802
59803 /* Here is the actual code + data, vfree'd on unload. */
59804- void *module_core;
59805+ void *module_core_rx, *module_core_rw;
59806
59807 /* Here are the sizes of the init and core sections */
59808- unsigned int init_size, core_size;
59809+ unsigned int init_size_rw, core_size_rw;
59810
59811 /* The size of the executable code in each section. */
59812- unsigned int init_text_size, core_text_size;
59813-
59814- /* Size of RO sections of the module (text+rodata) */
59815- unsigned int init_ro_size, core_ro_size;
59816+ unsigned int init_size_rx, core_size_rx;
59817
59818 /* Arch-specific module values */
59819 struct mod_arch_specific arch;
59820@@ -329,6 +327,10 @@ struct module
59821 #ifdef CONFIG_EVENT_TRACING
59822 struct ftrace_event_call **trace_events;
59823 unsigned int num_trace_events;
59824+ struct file_operations trace_id;
59825+ struct file_operations trace_enable;
59826+ struct file_operations trace_format;
59827+ struct file_operations trace_filter;
59828 #endif
59829 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
59830 unsigned int num_ftrace_callsites;
59831@@ -379,16 +381,46 @@ bool is_module_address(unsigned long addr);
59832 bool is_module_percpu_address(unsigned long addr);
59833 bool is_module_text_address(unsigned long addr);
59834
59835+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
59836+{
59837+
59838+#ifdef CONFIG_PAX_KERNEXEC
59839+ if (ktla_ktva(addr) >= (unsigned long)start &&
59840+ ktla_ktva(addr) < (unsigned long)start + size)
59841+ return 1;
59842+#endif
59843+
59844+ return ((void *)addr >= start && (void *)addr < start + size);
59845+}
59846+
59847+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
59848+{
59849+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
59850+}
59851+
59852+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
59853+{
59854+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
59855+}
59856+
59857+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
59858+{
59859+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
59860+}
59861+
59862+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
59863+{
59864+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
59865+}
59866+
59867 static inline int within_module_core(unsigned long addr, struct module *mod)
59868 {
59869- return (unsigned long)mod->module_core <= addr &&
59870- addr < (unsigned long)mod->module_core + mod->core_size;
59871+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
59872 }
59873
59874 static inline int within_module_init(unsigned long addr, struct module *mod)
59875 {
59876- return (unsigned long)mod->module_init <= addr &&
59877- addr < (unsigned long)mod->module_init + mod->init_size;
59878+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
59879 }
59880
59881 /* Search for module by name: must hold module_mutex. */
59882diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
59883index b2be02e..6a9fdb1 100644
59884--- a/include/linux/moduleloader.h
59885+++ b/include/linux/moduleloader.h
59886@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
59887 sections. Returns NULL on failure. */
59888 void *module_alloc(unsigned long size);
59889
59890+#ifdef CONFIG_PAX_KERNEXEC
59891+void *module_alloc_exec(unsigned long size);
59892+#else
59893+#define module_alloc_exec(x) module_alloc(x)
59894+#endif
59895+
59896 /* Free memory returned from module_alloc. */
59897 void module_free(struct module *mod, void *module_region);
59898
59899+#ifdef CONFIG_PAX_KERNEXEC
59900+void module_free_exec(struct module *mod, void *module_region);
59901+#else
59902+#define module_free_exec(x, y) module_free((x), (y))
59903+#endif
59904+
59905 /* Apply the given relocation to the (simplified) ELF. Return -error
59906 or 0. */
59907 int apply_relocate(Elf_Shdr *sechdrs,
59908diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
59909index 7939f63..ec6df57 100644
59910--- a/include/linux/moduleparam.h
59911+++ b/include/linux/moduleparam.h
59912@@ -260,7 +260,7 @@ static inline void __kernel_param_unlock(void)
59913 * @len is usually just sizeof(string).
59914 */
59915 #define module_param_string(name, string, len, perm) \
59916- static const struct kparam_string __param_string_##name \
59917+ static const struct kparam_string __param_string_##name __used \
59918 = { len, string }; \
59919 __module_param_call(MODULE_PARAM_PREFIX, name, \
59920 &param_ops_string, \
59921@@ -395,7 +395,7 @@ extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
59922 * module_param_named() for why this might be necessary.
59923 */
59924 #define module_param_array_named(name, array, type, nump, perm) \
59925- static const struct kparam_array __param_arr_##name \
59926+ static const struct kparam_array __param_arr_##name __used \
59927 = { .max = ARRAY_SIZE(array), .num = nump, \
59928 .ops = &param_ops_##type, \
59929 .elemsize = sizeof(array[0]), .elem = array }; \
59930diff --git a/include/linux/namei.h b/include/linux/namei.h
59931index ffc0213..2c1f2cb 100644
59932--- a/include/linux/namei.h
59933+++ b/include/linux/namei.h
59934@@ -24,7 +24,7 @@ struct nameidata {
59935 unsigned seq;
59936 int last_type;
59937 unsigned depth;
59938- char *saved_names[MAX_NESTED_LINKS + 1];
59939+ const char *saved_names[MAX_NESTED_LINKS + 1];
59940
59941 /* Intent data */
59942 union {
59943@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
59944 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
59945 extern void unlock_rename(struct dentry *, struct dentry *);
59946
59947-static inline void nd_set_link(struct nameidata *nd, char *path)
59948+static inline void nd_set_link(struct nameidata *nd, const char *path)
59949 {
59950 nd->saved_names[nd->depth] = path;
59951 }
59952
59953-static inline char *nd_get_link(struct nameidata *nd)
59954+static inline const char *nd_get_link(const struct nameidata *nd)
59955 {
59956 return nd->saved_names[nd->depth];
59957 }
59958diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
59959index a82ad4d..90d15b7 100644
59960--- a/include/linux/netdevice.h
59961+++ b/include/linux/netdevice.h
59962@@ -949,6 +949,7 @@ struct net_device_ops {
59963 int (*ndo_set_features)(struct net_device *dev,
59964 u32 features);
59965 };
59966+typedef struct net_device_ops __no_const net_device_ops_no_const;
59967
59968 /*
59969 * The DEVICE structure.
59970@@ -1088,7 +1089,7 @@ struct net_device {
59971 int iflink;
59972
59973 struct net_device_stats stats;
59974- atomic_long_t rx_dropped; /* dropped packets by core network
59975+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
59976 * Do not use this in drivers.
59977 */
59978
59979diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
59980new file mode 100644
59981index 0000000..33f4af8
59982--- /dev/null
59983+++ b/include/linux/netfilter/xt_gradm.h
59984@@ -0,0 +1,9 @@
59985+#ifndef _LINUX_NETFILTER_XT_GRADM_H
59986+#define _LINUX_NETFILTER_XT_GRADM_H 1
59987+
59988+struct xt_gradm_mtinfo {
59989+ __u16 flags;
59990+ __u16 invflags;
59991+};
59992+
59993+#endif
59994diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
59995index c65a18a..0c05f3a 100644
59996--- a/include/linux/of_pdt.h
59997+++ b/include/linux/of_pdt.h
59998@@ -32,7 +32,7 @@ struct of_pdt_ops {
59999
60000 /* return 0 on success; fill in 'len' with number of bytes in path */
60001 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
60002-};
60003+} __no_const;
60004
60005 extern void *prom_early_alloc(unsigned long size);
60006
60007diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
60008index a4c5624..79d6d88 100644
60009--- a/include/linux/oprofile.h
60010+++ b/include/linux/oprofile.h
60011@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
60012 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
60013 char const * name, ulong * val);
60014
60015-/** Create a file for read-only access to an atomic_t. */
60016+/** Create a file for read-only access to an atomic_unchecked_t. */
60017 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
60018- char const * name, atomic_t * val);
60019+ char const * name, atomic_unchecked_t * val);
60020
60021 /** create a directory */
60022 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
60023diff --git a/include/linux/padata.h b/include/linux/padata.h
60024index 4633b2f..988bc08 100644
60025--- a/include/linux/padata.h
60026+++ b/include/linux/padata.h
60027@@ -129,7 +129,7 @@ struct parallel_data {
60028 struct padata_instance *pinst;
60029 struct padata_parallel_queue __percpu *pqueue;
60030 struct padata_serial_queue __percpu *squeue;
60031- atomic_t seq_nr;
60032+ atomic_unchecked_t seq_nr;
60033 atomic_t reorder_objects;
60034 atomic_t refcnt;
60035 unsigned int max_seq_nr;
60036diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
60037index b1f8912..c955bff 100644
60038--- a/include/linux/perf_event.h
60039+++ b/include/linux/perf_event.h
60040@@ -748,8 +748,8 @@ struct perf_event {
60041
60042 enum perf_event_active_state state;
60043 unsigned int attach_state;
60044- local64_t count;
60045- atomic64_t child_count;
60046+ local64_t count; /* PaX: fix it one day */
60047+ atomic64_unchecked_t child_count;
60048
60049 /*
60050 * These are the total time in nanoseconds that the event
60051@@ -800,8 +800,8 @@ struct perf_event {
60052 * These accumulate total time (in nanoseconds) that children
60053 * events have been enabled and running, respectively.
60054 */
60055- atomic64_t child_total_time_enabled;
60056- atomic64_t child_total_time_running;
60057+ atomic64_unchecked_t child_total_time_enabled;
60058+ atomic64_unchecked_t child_total_time_running;
60059
60060 /*
60061 * Protect attach/detach and child_list:
60062diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
60063index 77257c9..51d473a 100644
60064--- a/include/linux/pipe_fs_i.h
60065+++ b/include/linux/pipe_fs_i.h
60066@@ -46,9 +46,9 @@ struct pipe_buffer {
60067 struct pipe_inode_info {
60068 wait_queue_head_t wait;
60069 unsigned int nrbufs, curbuf, buffers;
60070- unsigned int readers;
60071- unsigned int writers;
60072- unsigned int waiting_writers;
60073+ atomic_t readers;
60074+ atomic_t writers;
60075+ atomic_t waiting_writers;
60076 unsigned int r_counter;
60077 unsigned int w_counter;
60078 struct page *tmp_page;
60079diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
60080index d3085e7..fd01052 100644
60081--- a/include/linux/pm_runtime.h
60082+++ b/include/linux/pm_runtime.h
60083@@ -95,7 +95,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
60084
60085 static inline void pm_runtime_mark_last_busy(struct device *dev)
60086 {
60087- ACCESS_ONCE(dev->power.last_busy) = jiffies;
60088+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
60089 }
60090
60091 #else /* !CONFIG_PM_RUNTIME */
60092diff --git a/include/linux/poison.h b/include/linux/poison.h
60093index 79159de..f1233a9 100644
60094--- a/include/linux/poison.h
60095+++ b/include/linux/poison.h
60096@@ -19,8 +19,8 @@
60097 * under normal circumstances, used to verify that nobody uses
60098 * non-initialized list entries.
60099 */
60100-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
60101-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
60102+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
60103+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
60104
60105 /********** include/linux/timer.h **********/
60106 /*
60107diff --git a/include/linux/preempt.h b/include/linux/preempt.h
60108index 58969b2..ead129b 100644
60109--- a/include/linux/preempt.h
60110+++ b/include/linux/preempt.h
60111@@ -123,7 +123,7 @@ struct preempt_ops {
60112 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
60113 void (*sched_out)(struct preempt_notifier *notifier,
60114 struct task_struct *next);
60115-};
60116+} __no_const;
60117
60118 /**
60119 * preempt_notifier - key for installing preemption notifiers
60120diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
60121index 643b96c..ef55a9c 100644
60122--- a/include/linux/proc_fs.h
60123+++ b/include/linux/proc_fs.h
60124@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
60125 return proc_create_data(name, mode, parent, proc_fops, NULL);
60126 }
60127
60128+static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
60129+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
60130+{
60131+#ifdef CONFIG_GRKERNSEC_PROC_USER
60132+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
60133+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60134+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
60135+#else
60136+ return proc_create_data(name, mode, parent, proc_fops, NULL);
60137+#endif
60138+}
60139+
60140+
60141 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
60142 mode_t mode, struct proc_dir_entry *base,
60143 read_proc_t *read_proc, void * data)
60144@@ -258,7 +271,7 @@ union proc_op {
60145 int (*proc_show)(struct seq_file *m,
60146 struct pid_namespace *ns, struct pid *pid,
60147 struct task_struct *task);
60148-};
60149+} __no_const;
60150
60151 struct ctl_table_header;
60152 struct ctl_table;
60153diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
60154index 800f113..e9ee2e3 100644
60155--- a/include/linux/ptrace.h
60156+++ b/include/linux/ptrace.h
60157@@ -129,10 +129,12 @@ extern void __ptrace_unlink(struct task_struct *child);
60158 extern void exit_ptrace(struct task_struct *tracer);
60159 #define PTRACE_MODE_READ 1
60160 #define PTRACE_MODE_ATTACH 2
60161-/* Returns 0 on success, -errno on denial. */
60162-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
60163 /* Returns true on success, false on denial. */
60164 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
60165+/* Returns true on success, false on denial. */
60166+extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
60167+/* Returns true on success, false on denial. */
60168+extern bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode);
60169
60170 static inline int ptrace_reparented(struct task_struct *child)
60171 {
60172diff --git a/include/linux/random.h b/include/linux/random.h
60173index 8f74538..02a1012 100644
60174--- a/include/linux/random.h
60175+++ b/include/linux/random.h
60176@@ -69,12 +69,17 @@ void srandom32(u32 seed);
60177
60178 u32 prandom32(struct rnd_state *);
60179
60180+static inline unsigned long pax_get_random_long(void)
60181+{
60182+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
60183+}
60184+
60185 /*
60186 * Handle minimum values for seeds
60187 */
60188 static inline u32 __seed(u32 x, u32 m)
60189 {
60190- return (x < m) ? x + m : x;
60191+ return (x <= m) ? x + m + 1 : x;
60192 }
60193
60194 /**
60195diff --git a/include/linux/reboot.h b/include/linux/reboot.h
60196index e0879a7..a12f962 100644
60197--- a/include/linux/reboot.h
60198+++ b/include/linux/reboot.h
60199@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
60200 * Architecture-specific implementations of sys_reboot commands.
60201 */
60202
60203-extern void machine_restart(char *cmd);
60204-extern void machine_halt(void);
60205-extern void machine_power_off(void);
60206+extern void machine_restart(char *cmd) __noreturn;
60207+extern void machine_halt(void) __noreturn;
60208+extern void machine_power_off(void) __noreturn;
60209
60210 extern void machine_shutdown(void);
60211 struct pt_regs;
60212@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
60213 */
60214
60215 extern void kernel_restart_prepare(char *cmd);
60216-extern void kernel_restart(char *cmd);
60217-extern void kernel_halt(void);
60218-extern void kernel_power_off(void);
60219+extern void kernel_restart(char *cmd) __noreturn;
60220+extern void kernel_halt(void) __noreturn;
60221+extern void kernel_power_off(void) __noreturn;
60222
60223 extern int C_A_D; /* for sysctl */
60224 void ctrl_alt_del(void);
60225@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
60226 * Emergency restart, callable from an interrupt handler.
60227 */
60228
60229-extern void emergency_restart(void);
60230+extern void emergency_restart(void) __noreturn;
60231 #include <asm/emergency-restart.h>
60232
60233 #endif
60234diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
60235index 96d465f..b084e05 100644
60236--- a/include/linux/reiserfs_fs.h
60237+++ b/include/linux/reiserfs_fs.h
60238@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
60239 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
60240
60241 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
60242-#define get_generation(s) atomic_read (&fs_generation(s))
60243+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
60244 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
60245 #define __fs_changed(gen,s) (gen != get_generation (s))
60246 #define fs_changed(gen,s) \
60247diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
60248index 52c83b6..18ed7eb 100644
60249--- a/include/linux/reiserfs_fs_sb.h
60250+++ b/include/linux/reiserfs_fs_sb.h
60251@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
60252 /* Comment? -Hans */
60253 wait_queue_head_t s_wait;
60254 /* To be obsoleted soon by per buffer seals.. -Hans */
60255- atomic_t s_generation_counter; // increased by one every time the
60256+ atomic_unchecked_t s_generation_counter; // increased by one every time the
60257 // tree gets re-balanced
60258 unsigned long s_properties; /* File system properties. Currently holds
60259 on-disk FS format */
60260diff --git a/include/linux/relay.h b/include/linux/relay.h
60261index 14a86bc..17d0700 100644
60262--- a/include/linux/relay.h
60263+++ b/include/linux/relay.h
60264@@ -159,7 +159,7 @@ struct rchan_callbacks
60265 * The callback should return 0 if successful, negative if not.
60266 */
60267 int (*remove_buf_file)(struct dentry *dentry);
60268-};
60269+} __no_const;
60270
60271 /*
60272 * CONFIG_RELAY kernel API, kernel/relay.c
60273diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
60274index c6c6084..5bf1212 100644
60275--- a/include/linux/rfkill.h
60276+++ b/include/linux/rfkill.h
60277@@ -147,6 +147,7 @@ struct rfkill_ops {
60278 void (*query)(struct rfkill *rfkill, void *data);
60279 int (*set_block)(void *data, bool blocked);
60280 };
60281+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
60282
60283 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
60284 /**
60285diff --git a/include/linux/rio.h b/include/linux/rio.h
60286index 4d50611..c6858a2 100644
60287--- a/include/linux/rio.h
60288+++ b/include/linux/rio.h
60289@@ -315,7 +315,7 @@ struct rio_ops {
60290 int mbox, void *buffer, size_t len);
60291 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
60292 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
60293-};
60294+} __no_const;
60295
60296 #define RIO_RESOURCE_MEM 0x00000100
60297 #define RIO_RESOURCE_DOORBELL 0x00000200
60298diff --git a/include/linux/rmap.h b/include/linux/rmap.h
60299index 2148b12..519b820 100644
60300--- a/include/linux/rmap.h
60301+++ b/include/linux/rmap.h
60302@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
60303 void anon_vma_init(void); /* create anon_vma_cachep */
60304 int anon_vma_prepare(struct vm_area_struct *);
60305 void unlink_anon_vmas(struct vm_area_struct *);
60306-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
60307-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
60308+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
60309+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
60310 void __anon_vma_link(struct vm_area_struct *);
60311
60312 static inline void anon_vma_merge(struct vm_area_struct *vma,
60313diff --git a/include/linux/sched.h b/include/linux/sched.h
60314index 1c4f3e9..f29cbeb 100644
60315--- a/include/linux/sched.h
60316+++ b/include/linux/sched.h
60317@@ -101,6 +101,7 @@ struct bio_list;
60318 struct fs_struct;
60319 struct perf_event_context;
60320 struct blk_plug;
60321+struct linux_binprm;
60322
60323 /*
60324 * List of flags we want to share for kernel threads,
60325@@ -380,10 +381,13 @@ struct user_namespace;
60326 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
60327
60328 extern int sysctl_max_map_count;
60329+extern unsigned long sysctl_heap_stack_gap;
60330
60331 #include <linux/aio.h>
60332
60333 #ifdef CONFIG_MMU
60334+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
60335+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
60336 extern void arch_pick_mmap_layout(struct mm_struct *mm);
60337 extern unsigned long
60338 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
60339@@ -629,6 +633,17 @@ struct signal_struct {
60340 #ifdef CONFIG_TASKSTATS
60341 struct taskstats *stats;
60342 #endif
60343+
60344+#ifdef CONFIG_GRKERNSEC
60345+ u32 curr_ip;
60346+ u32 saved_ip;
60347+ u32 gr_saddr;
60348+ u32 gr_daddr;
60349+ u16 gr_sport;
60350+ u16 gr_dport;
60351+ u8 used_accept:1;
60352+#endif
60353+
60354 #ifdef CONFIG_AUDIT
60355 unsigned audit_tty;
60356 struct tty_audit_buf *tty_audit_buf;
60357@@ -710,6 +725,11 @@ struct user_struct {
60358 struct key *session_keyring; /* UID's default session keyring */
60359 #endif
60360
60361+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
60362+ unsigned int banned;
60363+ unsigned long ban_expires;
60364+#endif
60365+
60366 /* Hash table maintenance information */
60367 struct hlist_node uidhash_node;
60368 uid_t uid;
60369@@ -1337,8 +1357,8 @@ struct task_struct {
60370 struct list_head thread_group;
60371
60372 struct completion *vfork_done; /* for vfork() */
60373- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
60374- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
60375+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
60376+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
60377
60378 cputime_t utime, stime, utimescaled, stimescaled;
60379 cputime_t gtime;
60380@@ -1354,13 +1374,6 @@ struct task_struct {
60381 struct task_cputime cputime_expires;
60382 struct list_head cpu_timers[3];
60383
60384-/* process credentials */
60385- const struct cred __rcu *real_cred; /* objective and real subjective task
60386- * credentials (COW) */
60387- const struct cred __rcu *cred; /* effective (overridable) subjective task
60388- * credentials (COW) */
60389- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
60390-
60391 char comm[TASK_COMM_LEN]; /* executable name excluding path
60392 - access with [gs]et_task_comm (which lock
60393 it with task_lock())
60394@@ -1377,8 +1390,16 @@ struct task_struct {
60395 #endif
60396 /* CPU-specific state of this task */
60397 struct thread_struct thread;
60398+/* thread_info moved to task_struct */
60399+#ifdef CONFIG_X86
60400+ struct thread_info tinfo;
60401+#endif
60402 /* filesystem information */
60403 struct fs_struct *fs;
60404+
60405+ const struct cred __rcu *cred; /* effective (overridable) subjective task
60406+ * credentials (COW) */
60407+
60408 /* open file information */
60409 struct files_struct *files;
60410 /* namespaces */
60411@@ -1425,6 +1446,11 @@ struct task_struct {
60412 struct rt_mutex_waiter *pi_blocked_on;
60413 #endif
60414
60415+/* process credentials */
60416+ const struct cred __rcu *real_cred; /* objective and real subjective task
60417+ * credentials (COW) */
60418+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
60419+
60420 #ifdef CONFIG_DEBUG_MUTEXES
60421 /* mutex deadlock detection */
60422 struct mutex_waiter *blocked_on;
60423@@ -1540,6 +1566,24 @@ struct task_struct {
60424 unsigned long default_timer_slack_ns;
60425
60426 struct list_head *scm_work_list;
60427+
60428+#ifdef CONFIG_GRKERNSEC
60429+ /* grsecurity */
60430+#ifdef CONFIG_GRKERNSEC_SETXID
60431+ const struct cred *delayed_cred;
60432+#endif
60433+ struct dentry *gr_chroot_dentry;
60434+ struct acl_subject_label *acl;
60435+ struct acl_role_label *role;
60436+ struct file *exec_file;
60437+ u16 acl_role_id;
60438+ /* is this the task that authenticated to the special role */
60439+ u8 acl_sp_role;
60440+ u8 is_writable;
60441+ u8 brute;
60442+ u8 gr_is_chrooted;
60443+#endif
60444+
60445 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
60446 /* Index of current stored address in ret_stack */
60447 int curr_ret_stack;
60448@@ -1574,6 +1618,51 @@ struct task_struct {
60449 #endif
60450 };
60451
60452+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
60453+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
60454+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
60455+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
60456+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
60457+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
60458+
60459+#ifdef CONFIG_PAX_SOFTMODE
60460+extern int pax_softmode;
60461+#endif
60462+
60463+extern int pax_check_flags(unsigned long *);
60464+
60465+/* if tsk != current then task_lock must be held on it */
60466+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
60467+static inline unsigned long pax_get_flags(struct task_struct *tsk)
60468+{
60469+ if (likely(tsk->mm))
60470+ return tsk->mm->pax_flags;
60471+ else
60472+ return 0UL;
60473+}
60474+
60475+/* if tsk != current then task_lock must be held on it */
60476+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
60477+{
60478+ if (likely(tsk->mm)) {
60479+ tsk->mm->pax_flags = flags;
60480+ return 0;
60481+ }
60482+ return -EINVAL;
60483+}
60484+#endif
60485+
60486+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
60487+extern void pax_set_initial_flags(struct linux_binprm *bprm);
60488+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
60489+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
60490+#endif
60491+
60492+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
60493+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
60494+extern void pax_report_refcount_overflow(struct pt_regs *regs);
60495+extern NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) ATTRIB_NORET;
60496+
60497 /* Future-safe accessor for struct task_struct's cpus_allowed. */
60498 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
60499
60500@@ -2081,7 +2170,9 @@ void yield(void);
60501 extern struct exec_domain default_exec_domain;
60502
60503 union thread_union {
60504+#ifndef CONFIG_X86
60505 struct thread_info thread_info;
60506+#endif
60507 unsigned long stack[THREAD_SIZE/sizeof(long)];
60508 };
60509
60510@@ -2114,6 +2205,7 @@ extern struct pid_namespace init_pid_ns;
60511 */
60512
60513 extern struct task_struct *find_task_by_vpid(pid_t nr);
60514+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
60515 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
60516 struct pid_namespace *ns);
60517
60518@@ -2235,6 +2327,12 @@ static inline void mmdrop(struct mm_struct * mm)
60519 extern void mmput(struct mm_struct *);
60520 /* Grab a reference to a task's mm, if it is not already going away */
60521 extern struct mm_struct *get_task_mm(struct task_struct *task);
60522+/*
60523+ * Grab a reference to a task's mm, if it is not already going away
60524+ * and ptrace_may_access with the mode parameter passed to it
60525+ * succeeds.
60526+ */
60527+extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);
60528 /* Remove the current tasks stale references to the old mm_struct */
60529 extern void mm_release(struct task_struct *, struct mm_struct *);
60530 /* Allocate a new mm structure and copy contents from tsk->mm */
60531@@ -2251,7 +2349,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
60532 extern void exit_itimers(struct signal_struct *);
60533 extern void flush_itimer_signals(void);
60534
60535-extern NORET_TYPE void do_group_exit(int);
60536+extern NORET_TYPE void do_group_exit(int) ATTRIB_NORET;
60537
60538 extern void daemonize(const char *, ...);
60539 extern int allow_signal(int);
60540@@ -2416,13 +2514,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
60541
60542 #endif
60543
60544-static inline int object_is_on_stack(void *obj)
60545+static inline int object_starts_on_stack(void *obj)
60546 {
60547- void *stack = task_stack_page(current);
60548+ const void *stack = task_stack_page(current);
60549
60550 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
60551 }
60552
60553+#ifdef CONFIG_PAX_USERCOPY
60554+extern int object_is_on_stack(const void *obj, unsigned long len);
60555+#endif
60556+
60557 extern void thread_info_cache_init(void);
60558
60559 #ifdef CONFIG_DEBUG_STACK_USAGE
60560diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
60561index 899fbb4..1cb4138 100644
60562--- a/include/linux/screen_info.h
60563+++ b/include/linux/screen_info.h
60564@@ -43,7 +43,8 @@ struct screen_info {
60565 __u16 pages; /* 0x32 */
60566 __u16 vesa_attributes; /* 0x34 */
60567 __u32 capabilities; /* 0x36 */
60568- __u8 _reserved[6]; /* 0x3a */
60569+ __u16 vesapm_size; /* 0x3a */
60570+ __u8 _reserved[4]; /* 0x3c */
60571 } __attribute__((packed));
60572
60573 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
60574diff --git a/include/linux/security.h b/include/linux/security.h
60575index e8c619d..e0cbd1c 100644
60576--- a/include/linux/security.h
60577+++ b/include/linux/security.h
60578@@ -37,6 +37,7 @@
60579 #include <linux/xfrm.h>
60580 #include <linux/slab.h>
60581 #include <linux/xattr.h>
60582+#include <linux/grsecurity.h>
60583 #include <net/flow.h>
60584
60585 /* Maximum number of letters for an LSM name string */
60586diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
60587index 0b69a46..e9e5538 100644
60588--- a/include/linux/seq_file.h
60589+++ b/include/linux/seq_file.h
60590@@ -33,6 +33,7 @@ struct seq_operations {
60591 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
60592 int (*show) (struct seq_file *m, void *v);
60593 };
60594+typedef struct seq_operations __no_const seq_operations_no_const;
60595
60596 #define SEQ_SKIP 1
60597
60598diff --git a/include/linux/shm.h b/include/linux/shm.h
60599index 92808b8..c28cac4 100644
60600--- a/include/linux/shm.h
60601+++ b/include/linux/shm.h
60602@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
60603
60604 /* The task created the shm object. NULL if the task is dead. */
60605 struct task_struct *shm_creator;
60606+#ifdef CONFIG_GRKERNSEC
60607+ time_t shm_createtime;
60608+ pid_t shm_lapid;
60609+#endif
60610 };
60611
60612 /* shm_mode upper byte flags */
60613diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
60614index fe86488..1563c1c 100644
60615--- a/include/linux/skbuff.h
60616+++ b/include/linux/skbuff.h
60617@@ -642,7 +642,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
60618 */
60619 static inline int skb_queue_empty(const struct sk_buff_head *list)
60620 {
60621- return list->next == (struct sk_buff *)list;
60622+ return list->next == (const struct sk_buff *)list;
60623 }
60624
60625 /**
60626@@ -655,7 +655,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
60627 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
60628 const struct sk_buff *skb)
60629 {
60630- return skb->next == (struct sk_buff *)list;
60631+ return skb->next == (const struct sk_buff *)list;
60632 }
60633
60634 /**
60635@@ -668,7 +668,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
60636 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
60637 const struct sk_buff *skb)
60638 {
60639- return skb->prev == (struct sk_buff *)list;
60640+ return skb->prev == (const struct sk_buff *)list;
60641 }
60642
60643 /**
60644@@ -1523,7 +1523,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
60645 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
60646 */
60647 #ifndef NET_SKB_PAD
60648-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
60649+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
60650 #endif
60651
60652 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
60653diff --git a/include/linux/slab.h b/include/linux/slab.h
60654index 573c809..e84c132 100644
60655--- a/include/linux/slab.h
60656+++ b/include/linux/slab.h
60657@@ -11,12 +11,20 @@
60658
60659 #include <linux/gfp.h>
60660 #include <linux/types.h>
60661+#include <linux/err.h>
60662
60663 /*
60664 * Flags to pass to kmem_cache_create().
60665 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
60666 */
60667 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
60668+
60669+#ifdef CONFIG_PAX_USERCOPY
60670+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
60671+#else
60672+#define SLAB_USERCOPY 0x00000000UL
60673+#endif
60674+
60675 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
60676 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
60677 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
60678@@ -87,10 +95,13 @@
60679 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
60680 * Both make kfree a no-op.
60681 */
60682-#define ZERO_SIZE_PTR ((void *)16)
60683+#define ZERO_SIZE_PTR \
60684+({ \
60685+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
60686+ (void *)(-MAX_ERRNO-1L); \
60687+})
60688
60689-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
60690- (unsigned long)ZERO_SIZE_PTR)
60691+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
60692
60693 /*
60694 * struct kmem_cache related prototypes
60695@@ -161,6 +172,7 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
60696 void kfree(const void *);
60697 void kzfree(const void *);
60698 size_t ksize(const void *);
60699+void check_object_size(const void *ptr, unsigned long n, bool to);
60700
60701 /*
60702 * Allocator specific definitions. These are mainly used to establish optimized
60703@@ -353,4 +365,59 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
60704
60705 void __init kmem_cache_init_late(void);
60706
60707+#define kmalloc(x, y) \
60708+({ \
60709+ void *___retval; \
60710+ intoverflow_t ___x = (intoverflow_t)x; \
60711+ if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n")) \
60712+ ___retval = NULL; \
60713+ else \
60714+ ___retval = kmalloc((size_t)___x, (y)); \
60715+ ___retval; \
60716+})
60717+
60718+#define kmalloc_node(x, y, z) \
60719+({ \
60720+ void *___retval; \
60721+ intoverflow_t ___x = (intoverflow_t)x; \
60722+ if (WARN(___x > ULONG_MAX, "kmalloc_node size overflow\n"))\
60723+ ___retval = NULL; \
60724+ else \
60725+ ___retval = kmalloc_node((size_t)___x, (y), (z));\
60726+ ___retval; \
60727+})
60728+
60729+#define kzalloc(x, y) \
60730+({ \
60731+ void *___retval; \
60732+ intoverflow_t ___x = (intoverflow_t)x; \
60733+ if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n")) \
60734+ ___retval = NULL; \
60735+ else \
60736+ ___retval = kzalloc((size_t)___x, (y)); \
60737+ ___retval; \
60738+})
60739+
60740+#define __krealloc(x, y, z) \
60741+({ \
60742+ void *___retval; \
60743+ intoverflow_t ___y = (intoverflow_t)y; \
60744+ if (WARN(___y > ULONG_MAX, "__krealloc size overflow\n"))\
60745+ ___retval = NULL; \
60746+ else \
60747+ ___retval = __krealloc((x), (size_t)___y, (z)); \
60748+ ___retval; \
60749+})
60750+
60751+#define krealloc(x, y, z) \
60752+({ \
60753+ void *___retval; \
60754+ intoverflow_t ___y = (intoverflow_t)y; \
60755+ if (WARN(___y > ULONG_MAX, "krealloc size overflow\n")) \
60756+ ___retval = NULL; \
60757+ else \
60758+ ___retval = krealloc((x), (size_t)___y, (z)); \
60759+ ___retval; \
60760+})
60761+
60762 #endif /* _LINUX_SLAB_H */
60763diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
60764index d00e0ba..1b3bf7b 100644
60765--- a/include/linux/slab_def.h
60766+++ b/include/linux/slab_def.h
60767@@ -68,10 +68,10 @@ struct kmem_cache {
60768 unsigned long node_allocs;
60769 unsigned long node_frees;
60770 unsigned long node_overflow;
60771- atomic_t allochit;
60772- atomic_t allocmiss;
60773- atomic_t freehit;
60774- atomic_t freemiss;
60775+ atomic_unchecked_t allochit;
60776+ atomic_unchecked_t allocmiss;
60777+ atomic_unchecked_t freehit;
60778+ atomic_unchecked_t freemiss;
60779
60780 /*
60781 * If debugging is enabled, then the allocator can add additional
60782diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
60783index a32bcfd..53b71f4 100644
60784--- a/include/linux/slub_def.h
60785+++ b/include/linux/slub_def.h
60786@@ -89,7 +89,7 @@ struct kmem_cache {
60787 struct kmem_cache_order_objects max;
60788 struct kmem_cache_order_objects min;
60789 gfp_t allocflags; /* gfp flags to use on each alloc */
60790- int refcount; /* Refcount for slab cache destroy */
60791+ atomic_t refcount; /* Refcount for slab cache destroy */
60792 void (*ctor)(void *);
60793 int inuse; /* Offset to metadata */
60794 int align; /* Alignment */
60795@@ -215,7 +215,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
60796 }
60797
60798 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
60799-void *__kmalloc(size_t size, gfp_t flags);
60800+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
60801
60802 static __always_inline void *
60803 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
60804diff --git a/include/linux/sonet.h b/include/linux/sonet.h
60805index de8832d..0147b46 100644
60806--- a/include/linux/sonet.h
60807+++ b/include/linux/sonet.h
60808@@ -61,7 +61,7 @@ struct sonet_stats {
60809 #include <linux/atomic.h>
60810
60811 struct k_sonet_stats {
60812-#define __HANDLE_ITEM(i) atomic_t i
60813+#define __HANDLE_ITEM(i) atomic_unchecked_t i
60814 __SONET_ITEMS
60815 #undef __HANDLE_ITEM
60816 };
60817diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
60818index 3d8f9c4..69f1c0a 100644
60819--- a/include/linux/sunrpc/clnt.h
60820+++ b/include/linux/sunrpc/clnt.h
60821@@ -172,9 +172,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
60822 {
60823 switch (sap->sa_family) {
60824 case AF_INET:
60825- return ntohs(((struct sockaddr_in *)sap)->sin_port);
60826+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
60827 case AF_INET6:
60828- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
60829+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
60830 }
60831 return 0;
60832 }
60833@@ -207,7 +207,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
60834 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
60835 const struct sockaddr *src)
60836 {
60837- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
60838+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
60839 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
60840
60841 dsin->sin_family = ssin->sin_family;
60842@@ -310,7 +310,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
60843 if (sa->sa_family != AF_INET6)
60844 return 0;
60845
60846- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
60847+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
60848 }
60849
60850 #endif /* __KERNEL__ */
60851diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
60852index e775689..9e206d9 100644
60853--- a/include/linux/sunrpc/sched.h
60854+++ b/include/linux/sunrpc/sched.h
60855@@ -105,6 +105,7 @@ struct rpc_call_ops {
60856 void (*rpc_call_done)(struct rpc_task *, void *);
60857 void (*rpc_release)(void *);
60858 };
60859+typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
60860
60861 struct rpc_task_setup {
60862 struct rpc_task *task;
60863diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
60864index c14fe86..393245e 100644
60865--- a/include/linux/sunrpc/svc_rdma.h
60866+++ b/include/linux/sunrpc/svc_rdma.h
60867@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
60868 extern unsigned int svcrdma_max_requests;
60869 extern unsigned int svcrdma_max_req_size;
60870
60871-extern atomic_t rdma_stat_recv;
60872-extern atomic_t rdma_stat_read;
60873-extern atomic_t rdma_stat_write;
60874-extern atomic_t rdma_stat_sq_starve;
60875-extern atomic_t rdma_stat_rq_starve;
60876-extern atomic_t rdma_stat_rq_poll;
60877-extern atomic_t rdma_stat_rq_prod;
60878-extern atomic_t rdma_stat_sq_poll;
60879-extern atomic_t rdma_stat_sq_prod;
60880+extern atomic_unchecked_t rdma_stat_recv;
60881+extern atomic_unchecked_t rdma_stat_read;
60882+extern atomic_unchecked_t rdma_stat_write;
60883+extern atomic_unchecked_t rdma_stat_sq_starve;
60884+extern atomic_unchecked_t rdma_stat_rq_starve;
60885+extern atomic_unchecked_t rdma_stat_rq_poll;
60886+extern atomic_unchecked_t rdma_stat_rq_prod;
60887+extern atomic_unchecked_t rdma_stat_sq_poll;
60888+extern atomic_unchecked_t rdma_stat_sq_prod;
60889
60890 #define RPCRDMA_VERSION 1
60891
60892diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
60893index 703cfa3..0b8ca72ac 100644
60894--- a/include/linux/sysctl.h
60895+++ b/include/linux/sysctl.h
60896@@ -155,7 +155,11 @@ enum
60897 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
60898 };
60899
60900-
60901+#ifdef CONFIG_PAX_SOFTMODE
60902+enum {
60903+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
60904+};
60905+#endif
60906
60907 /* CTL_VM names: */
60908 enum
60909@@ -968,6 +972,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
60910
60911 extern int proc_dostring(struct ctl_table *, int,
60912 void __user *, size_t *, loff_t *);
60913+extern int proc_dostring_modpriv(struct ctl_table *, int,
60914+ void __user *, size_t *, loff_t *);
60915 extern int proc_dointvec(struct ctl_table *, int,
60916 void __user *, size_t *, loff_t *);
60917 extern int proc_dointvec_minmax(struct ctl_table *, int,
60918diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
60919index a71a292..51bd91d 100644
60920--- a/include/linux/tracehook.h
60921+++ b/include/linux/tracehook.h
60922@@ -54,12 +54,12 @@ struct linux_binprm;
60923 /*
60924 * ptrace report for syscall entry and exit looks identical.
60925 */
60926-static inline void ptrace_report_syscall(struct pt_regs *regs)
60927+static inline int ptrace_report_syscall(struct pt_regs *regs)
60928 {
60929 int ptrace = current->ptrace;
60930
60931 if (!(ptrace & PT_PTRACED))
60932- return;
60933+ return 0;
60934
60935 ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
60936
60937@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
60938 send_sig(current->exit_code, current, 1);
60939 current->exit_code = 0;
60940 }
60941+
60942+ return fatal_signal_pending(current);
60943 }
60944
60945 /**
60946@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
60947 static inline __must_check int tracehook_report_syscall_entry(
60948 struct pt_regs *regs)
60949 {
60950- ptrace_report_syscall(regs);
60951- return 0;
60952+ return ptrace_report_syscall(regs);
60953 }
60954
60955 /**
60956diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
60957index ff7dc08..893e1bd 100644
60958--- a/include/linux/tty_ldisc.h
60959+++ b/include/linux/tty_ldisc.h
60960@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
60961
60962 struct module *owner;
60963
60964- int refcount;
60965+ atomic_t refcount;
60966 };
60967
60968 struct tty_ldisc {
60969diff --git a/include/linux/types.h b/include/linux/types.h
60970index 57a9723..dbe234a 100644
60971--- a/include/linux/types.h
60972+++ b/include/linux/types.h
60973@@ -213,10 +213,26 @@ typedef struct {
60974 int counter;
60975 } atomic_t;
60976
60977+#ifdef CONFIG_PAX_REFCOUNT
60978+typedef struct {
60979+ int counter;
60980+} atomic_unchecked_t;
60981+#else
60982+typedef atomic_t atomic_unchecked_t;
60983+#endif
60984+
60985 #ifdef CONFIG_64BIT
60986 typedef struct {
60987 long counter;
60988 } atomic64_t;
60989+
60990+#ifdef CONFIG_PAX_REFCOUNT
60991+typedef struct {
60992+ long counter;
60993+} atomic64_unchecked_t;
60994+#else
60995+typedef atomic64_t atomic64_unchecked_t;
60996+#endif
60997 #endif
60998
60999 struct list_head {
61000diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
61001index 5ca0951..ab496a5 100644
61002--- a/include/linux/uaccess.h
61003+++ b/include/linux/uaccess.h
61004@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
61005 long ret; \
61006 mm_segment_t old_fs = get_fs(); \
61007 \
61008- set_fs(KERNEL_DS); \
61009 pagefault_disable(); \
61010- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
61011- pagefault_enable(); \
61012+ set_fs(KERNEL_DS); \
61013+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
61014 set_fs(old_fs); \
61015+ pagefault_enable(); \
61016 ret; \
61017 })
61018
61019diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
61020index 99c1b4d..bb94261 100644
61021--- a/include/linux/unaligned/access_ok.h
61022+++ b/include/linux/unaligned/access_ok.h
61023@@ -6,32 +6,32 @@
61024
61025 static inline u16 get_unaligned_le16(const void *p)
61026 {
61027- return le16_to_cpup((__le16 *)p);
61028+ return le16_to_cpup((const __le16 *)p);
61029 }
61030
61031 static inline u32 get_unaligned_le32(const void *p)
61032 {
61033- return le32_to_cpup((__le32 *)p);
61034+ return le32_to_cpup((const __le32 *)p);
61035 }
61036
61037 static inline u64 get_unaligned_le64(const void *p)
61038 {
61039- return le64_to_cpup((__le64 *)p);
61040+ return le64_to_cpup((const __le64 *)p);
61041 }
61042
61043 static inline u16 get_unaligned_be16(const void *p)
61044 {
61045- return be16_to_cpup((__be16 *)p);
61046+ return be16_to_cpup((const __be16 *)p);
61047 }
61048
61049 static inline u32 get_unaligned_be32(const void *p)
61050 {
61051- return be32_to_cpup((__be32 *)p);
61052+ return be32_to_cpup((const __be32 *)p);
61053 }
61054
61055 static inline u64 get_unaligned_be64(const void *p)
61056 {
61057- return be64_to_cpup((__be64 *)p);
61058+ return be64_to_cpup((const __be64 *)p);
61059 }
61060
61061 static inline void put_unaligned_le16(u16 val, void *p)
61062diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
61063index e5a40c3..20ab0f6 100644
61064--- a/include/linux/usb/renesas_usbhs.h
61065+++ b/include/linux/usb/renesas_usbhs.h
61066@@ -39,7 +39,7 @@ enum {
61067 */
61068 struct renesas_usbhs_driver_callback {
61069 int (*notify_hotplug)(struct platform_device *pdev);
61070-};
61071+} __no_const;
61072
61073 /*
61074 * callback functions for platform
61075@@ -89,7 +89,7 @@ struct renesas_usbhs_platform_callback {
61076 * VBUS control is needed for Host
61077 */
61078 int (*set_vbus)(struct platform_device *pdev, int enable);
61079-};
61080+} __no_const;
61081
61082 /*
61083 * parameters for renesas usbhs
61084diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
61085index 6f8fbcf..8259001 100644
61086--- a/include/linux/vermagic.h
61087+++ b/include/linux/vermagic.h
61088@@ -25,9 +25,35 @@
61089 #define MODULE_ARCH_VERMAGIC ""
61090 #endif
61091
61092+#ifdef CONFIG_PAX_REFCOUNT
61093+#define MODULE_PAX_REFCOUNT "REFCOUNT "
61094+#else
61095+#define MODULE_PAX_REFCOUNT ""
61096+#endif
61097+
61098+#ifdef CONSTIFY_PLUGIN
61099+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
61100+#else
61101+#define MODULE_CONSTIFY_PLUGIN ""
61102+#endif
61103+
61104+#ifdef STACKLEAK_PLUGIN
61105+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
61106+#else
61107+#define MODULE_STACKLEAK_PLUGIN ""
61108+#endif
61109+
61110+#ifdef CONFIG_GRKERNSEC
61111+#define MODULE_GRSEC "GRSEC "
61112+#else
61113+#define MODULE_GRSEC ""
61114+#endif
61115+
61116 #define VERMAGIC_STRING \
61117 UTS_RELEASE " " \
61118 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
61119 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
61120- MODULE_ARCH_VERMAGIC
61121+ MODULE_ARCH_VERMAGIC \
61122+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
61123+ MODULE_GRSEC
61124
61125diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
61126index 4bde182..aec92c1 100644
61127--- a/include/linux/vmalloc.h
61128+++ b/include/linux/vmalloc.h
61129@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
61130 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
61131 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
61132 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
61133+
61134+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
61135+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
61136+#endif
61137+
61138 /* bits [20..32] reserved for arch specific ioremap internals */
61139
61140 /*
61141@@ -156,4 +161,103 @@ pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)
61142 # endif
61143 #endif
61144
61145+#define vmalloc(x) \
61146+({ \
61147+ void *___retval; \
61148+ intoverflow_t ___x = (intoverflow_t)x; \
61149+ if (WARN(___x > ULONG_MAX, "vmalloc size overflow\n")) \
61150+ ___retval = NULL; \
61151+ else \
61152+ ___retval = vmalloc((unsigned long)___x); \
61153+ ___retval; \
61154+})
61155+
61156+#define vzalloc(x) \
61157+({ \
61158+ void *___retval; \
61159+ intoverflow_t ___x = (intoverflow_t)x; \
61160+ if (WARN(___x > ULONG_MAX, "vzalloc size overflow\n")) \
61161+ ___retval = NULL; \
61162+ else \
61163+ ___retval = vzalloc((unsigned long)___x); \
61164+ ___retval; \
61165+})
61166+
61167+#define __vmalloc(x, y, z) \
61168+({ \
61169+ void *___retval; \
61170+ intoverflow_t ___x = (intoverflow_t)x; \
61171+ if (WARN(___x > ULONG_MAX, "__vmalloc size overflow\n"))\
61172+ ___retval = NULL; \
61173+ else \
61174+ ___retval = __vmalloc((unsigned long)___x, (y), (z));\
61175+ ___retval; \
61176+})
61177+
61178+#define vmalloc_user(x) \
61179+({ \
61180+ void *___retval; \
61181+ intoverflow_t ___x = (intoverflow_t)x; \
61182+ if (WARN(___x > ULONG_MAX, "vmalloc_user size overflow\n"))\
61183+ ___retval = NULL; \
61184+ else \
61185+ ___retval = vmalloc_user((unsigned long)___x); \
61186+ ___retval; \
61187+})
61188+
61189+#define vmalloc_exec(x) \
61190+({ \
61191+ void *___retval; \
61192+ intoverflow_t ___x = (intoverflow_t)x; \
61193+ if (WARN(___x > ULONG_MAX, "vmalloc_exec size overflow\n"))\
61194+ ___retval = NULL; \
61195+ else \
61196+ ___retval = vmalloc_exec((unsigned long)___x); \
61197+ ___retval; \
61198+})
61199+
61200+#define vmalloc_node(x, y) \
61201+({ \
61202+ void *___retval; \
61203+ intoverflow_t ___x = (intoverflow_t)x; \
61204+ if (WARN(___x > ULONG_MAX, "vmalloc_node size overflow\n"))\
61205+ ___retval = NULL; \
61206+ else \
61207+ ___retval = vmalloc_node((unsigned long)___x, (y));\
61208+ ___retval; \
61209+})
61210+
61211+#define vzalloc_node(x, y) \
61212+({ \
61213+ void *___retval; \
61214+ intoverflow_t ___x = (intoverflow_t)x; \
61215+ if (WARN(___x > ULONG_MAX, "vzalloc_node size overflow\n"))\
61216+ ___retval = NULL; \
61217+ else \
61218+ ___retval = vzalloc_node((unsigned long)___x, (y));\
61219+ ___retval; \
61220+})
61221+
61222+#define vmalloc_32(x) \
61223+({ \
61224+ void *___retval; \
61225+ intoverflow_t ___x = (intoverflow_t)x; \
61226+ if (WARN(___x > ULONG_MAX, "vmalloc_32 size overflow\n"))\
61227+ ___retval = NULL; \
61228+ else \
61229+ ___retval = vmalloc_32((unsigned long)___x); \
61230+ ___retval; \
61231+})
61232+
61233+#define vmalloc_32_user(x) \
61234+({ \
61235+void *___retval; \
61236+ intoverflow_t ___x = (intoverflow_t)x; \
61237+ if (WARN(___x > ULONG_MAX, "vmalloc_32_user size overflow\n"))\
61238+ ___retval = NULL; \
61239+ else \
61240+ ___retval = vmalloc_32_user((unsigned long)___x);\
61241+ ___retval; \
61242+})
61243+
61244 #endif /* _LINUX_VMALLOC_H */
61245diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
61246index 65efb92..137adbb 100644
61247--- a/include/linux/vmstat.h
61248+++ b/include/linux/vmstat.h
61249@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
61250 /*
61251 * Zone based page accounting with per cpu differentials.
61252 */
61253-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
61254+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
61255
61256 static inline void zone_page_state_add(long x, struct zone *zone,
61257 enum zone_stat_item item)
61258 {
61259- atomic_long_add(x, &zone->vm_stat[item]);
61260- atomic_long_add(x, &vm_stat[item]);
61261+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
61262+ atomic_long_add_unchecked(x, &vm_stat[item]);
61263 }
61264
61265 static inline unsigned long global_page_state(enum zone_stat_item item)
61266 {
61267- long x = atomic_long_read(&vm_stat[item]);
61268+ long x = atomic_long_read_unchecked(&vm_stat[item]);
61269 #ifdef CONFIG_SMP
61270 if (x < 0)
61271 x = 0;
61272@@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
61273 static inline unsigned long zone_page_state(struct zone *zone,
61274 enum zone_stat_item item)
61275 {
61276- long x = atomic_long_read(&zone->vm_stat[item]);
61277+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
61278 #ifdef CONFIG_SMP
61279 if (x < 0)
61280 x = 0;
61281@@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
61282 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
61283 enum zone_stat_item item)
61284 {
61285- long x = atomic_long_read(&zone->vm_stat[item]);
61286+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
61287
61288 #ifdef CONFIG_SMP
61289 int cpu;
61290@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
61291
61292 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
61293 {
61294- atomic_long_inc(&zone->vm_stat[item]);
61295- atomic_long_inc(&vm_stat[item]);
61296+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
61297+ atomic_long_inc_unchecked(&vm_stat[item]);
61298 }
61299
61300 static inline void __inc_zone_page_state(struct page *page,
61301@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
61302
61303 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
61304 {
61305- atomic_long_dec(&zone->vm_stat[item]);
61306- atomic_long_dec(&vm_stat[item]);
61307+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
61308+ atomic_long_dec_unchecked(&vm_stat[item]);
61309 }
61310
61311 static inline void __dec_zone_page_state(struct page *page,
61312diff --git a/include/linux/xattr.h b/include/linux/xattr.h
61313index e5d1220..ef6e406 100644
61314--- a/include/linux/xattr.h
61315+++ b/include/linux/xattr.h
61316@@ -57,6 +57,11 @@
61317 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
61318 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
61319
61320+/* User namespace */
61321+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
61322+#define XATTR_PAX_FLAGS_SUFFIX "flags"
61323+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
61324+
61325 #ifdef __KERNEL__
61326
61327 #include <linux/types.h>
61328diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
61329index 4aeff96..b378cdc 100644
61330--- a/include/media/saa7146_vv.h
61331+++ b/include/media/saa7146_vv.h
61332@@ -163,7 +163,7 @@ struct saa7146_ext_vv
61333 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
61334
61335 /* the extension can override this */
61336- struct v4l2_ioctl_ops ops;
61337+ v4l2_ioctl_ops_no_const ops;
61338 /* pointer to the saa7146 core ops */
61339 const struct v4l2_ioctl_ops *core_ops;
61340
61341diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
61342index c7c40f1..4f01585 100644
61343--- a/include/media/v4l2-dev.h
61344+++ b/include/media/v4l2-dev.h
61345@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
61346
61347
61348 struct v4l2_file_operations {
61349- struct module *owner;
61350+ struct module * const owner;
61351 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
61352 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
61353 unsigned int (*poll) (struct file *, struct poll_table_struct *);
61354@@ -68,6 +68,7 @@ struct v4l2_file_operations {
61355 int (*open) (struct file *);
61356 int (*release) (struct file *);
61357 };
61358+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
61359
61360 /*
61361 * Newer version of video_device, handled by videodev2.c
61362diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
61363index 4d1c74a..65e1221 100644
61364--- a/include/media/v4l2-ioctl.h
61365+++ b/include/media/v4l2-ioctl.h
61366@@ -274,7 +274,7 @@ struct v4l2_ioctl_ops {
61367 long (*vidioc_default) (struct file *file, void *fh,
61368 bool valid_prio, int cmd, void *arg);
61369 };
61370-
61371+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
61372
61373 /* v4l debugging and diagnostics */
61374
61375diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
61376index 8d55251..dfe5b0a 100644
61377--- a/include/net/caif/caif_hsi.h
61378+++ b/include/net/caif/caif_hsi.h
61379@@ -98,7 +98,7 @@ struct cfhsi_drv {
61380 void (*rx_done_cb) (struct cfhsi_drv *drv);
61381 void (*wake_up_cb) (struct cfhsi_drv *drv);
61382 void (*wake_down_cb) (struct cfhsi_drv *drv);
61383-};
61384+} __no_const;
61385
61386 /* Structure implemented by HSI device. */
61387 struct cfhsi_dev {
61388diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
61389index 9e5425b..8136ffc 100644
61390--- a/include/net/caif/cfctrl.h
61391+++ b/include/net/caif/cfctrl.h
61392@@ -52,7 +52,7 @@ struct cfctrl_rsp {
61393 void (*radioset_rsp)(void);
61394 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
61395 struct cflayer *client_layer);
61396-};
61397+} __no_const;
61398
61399 /* Link Setup Parameters for CAIF-Links. */
61400 struct cfctrl_link_param {
61401@@ -101,8 +101,8 @@ struct cfctrl_request_info {
61402 struct cfctrl {
61403 struct cfsrvl serv;
61404 struct cfctrl_rsp res;
61405- atomic_t req_seq_no;
61406- atomic_t rsp_seq_no;
61407+ atomic_unchecked_t req_seq_no;
61408+ atomic_unchecked_t rsp_seq_no;
61409 struct list_head list;
61410 /* Protects from simultaneous access to first_req list */
61411 spinlock_t info_list_lock;
61412diff --git a/include/net/flow.h b/include/net/flow.h
61413index 57f15a7..0de26c6 100644
61414--- a/include/net/flow.h
61415+++ b/include/net/flow.h
61416@@ -208,6 +208,6 @@ extern struct flow_cache_object *flow_cache_lookup(
61417
61418 extern void flow_cache_flush(void);
61419 extern void flow_cache_flush_deferred(void);
61420-extern atomic_t flow_cache_genid;
61421+extern atomic_unchecked_t flow_cache_genid;
61422
61423 #endif
61424diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
61425index e9ff3fc..9d3e5c7 100644
61426--- a/include/net/inetpeer.h
61427+++ b/include/net/inetpeer.h
61428@@ -48,8 +48,8 @@ struct inet_peer {
61429 */
61430 union {
61431 struct {
61432- atomic_t rid; /* Frag reception counter */
61433- atomic_t ip_id_count; /* IP ID for the next packet */
61434+ atomic_unchecked_t rid; /* Frag reception counter */
61435+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
61436 __u32 tcp_ts;
61437 __u32 tcp_ts_stamp;
61438 };
61439@@ -113,11 +113,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
61440 more++;
61441 inet_peer_refcheck(p);
61442 do {
61443- old = atomic_read(&p->ip_id_count);
61444+ old = atomic_read_unchecked(&p->ip_id_count);
61445 new = old + more;
61446 if (!new)
61447 new = 1;
61448- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
61449+ } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
61450 return new;
61451 }
61452
61453diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
61454index 10422ef..662570f 100644
61455--- a/include/net/ip_fib.h
61456+++ b/include/net/ip_fib.h
61457@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
61458
61459 #define FIB_RES_SADDR(net, res) \
61460 ((FIB_RES_NH(res).nh_saddr_genid == \
61461- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
61462+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
61463 FIB_RES_NH(res).nh_saddr : \
61464 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
61465 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
61466diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
61467index e5a7b9a..f4fc44b 100644
61468--- a/include/net/ip_vs.h
61469+++ b/include/net/ip_vs.h
61470@@ -509,7 +509,7 @@ struct ip_vs_conn {
61471 struct ip_vs_conn *control; /* Master control connection */
61472 atomic_t n_control; /* Number of controlled ones */
61473 struct ip_vs_dest *dest; /* real server */
61474- atomic_t in_pkts; /* incoming packet counter */
61475+ atomic_unchecked_t in_pkts; /* incoming packet counter */
61476
61477 /* packet transmitter for different forwarding methods. If it
61478 mangles the packet, it must return NF_DROP or better NF_STOLEN,
61479@@ -647,7 +647,7 @@ struct ip_vs_dest {
61480 __be16 port; /* port number of the server */
61481 union nf_inet_addr addr; /* IP address of the server */
61482 volatile unsigned flags; /* dest status flags */
61483- atomic_t conn_flags; /* flags to copy to conn */
61484+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
61485 atomic_t weight; /* server weight */
61486
61487 atomic_t refcnt; /* reference counter */
61488diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
61489index 69b610a..fe3962c 100644
61490--- a/include/net/irda/ircomm_core.h
61491+++ b/include/net/irda/ircomm_core.h
61492@@ -51,7 +51,7 @@ typedef struct {
61493 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
61494 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
61495 struct ircomm_info *);
61496-} call_t;
61497+} __no_const call_t;
61498
61499 struct ircomm_cb {
61500 irda_queue_t queue;
61501diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
61502index 59ba38bc..d515662 100644
61503--- a/include/net/irda/ircomm_tty.h
61504+++ b/include/net/irda/ircomm_tty.h
61505@@ -35,6 +35,7 @@
61506 #include <linux/termios.h>
61507 #include <linux/timer.h>
61508 #include <linux/tty.h> /* struct tty_struct */
61509+#include <asm/local.h>
61510
61511 #include <net/irda/irias_object.h>
61512 #include <net/irda/ircomm_core.h>
61513@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
61514 unsigned short close_delay;
61515 unsigned short closing_wait; /* time to wait before closing */
61516
61517- int open_count;
61518- int blocked_open; /* # of blocked opens */
61519+ local_t open_count;
61520+ local_t blocked_open; /* # of blocked opens */
61521
61522 /* Protect concurent access to :
61523 * o self->open_count
61524diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
61525index f2419cf..473679f 100644
61526--- a/include/net/iucv/af_iucv.h
61527+++ b/include/net/iucv/af_iucv.h
61528@@ -139,7 +139,7 @@ struct iucv_sock {
61529 struct iucv_sock_list {
61530 struct hlist_head head;
61531 rwlock_t lock;
61532- atomic_t autobind_name;
61533+ atomic_unchecked_t autobind_name;
61534 };
61535
61536 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
61537diff --git a/include/net/neighbour.h b/include/net/neighbour.h
61538index 2720884..3aa5c25 100644
61539--- a/include/net/neighbour.h
61540+++ b/include/net/neighbour.h
61541@@ -122,7 +122,7 @@ struct neigh_ops {
61542 void (*error_report)(struct neighbour *, struct sk_buff *);
61543 int (*output)(struct neighbour *, struct sk_buff *);
61544 int (*connected_output)(struct neighbour *, struct sk_buff *);
61545-};
61546+} __do_const;
61547
61548 struct pneigh_entry {
61549 struct pneigh_entry *next;
61550diff --git a/include/net/netlink.h b/include/net/netlink.h
61551index cb1f350..3279d2c 100644
61552--- a/include/net/netlink.h
61553+++ b/include/net/netlink.h
61554@@ -569,7 +569,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
61555 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
61556 {
61557 if (mark)
61558- skb_trim(skb, (unsigned char *) mark - skb->data);
61559+ skb_trim(skb, (const unsigned char *) mark - skb->data);
61560 }
61561
61562 /**
61563diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
61564index d786b4f..4c3dd41 100644
61565--- a/include/net/netns/ipv4.h
61566+++ b/include/net/netns/ipv4.h
61567@@ -56,8 +56,8 @@ struct netns_ipv4 {
61568
61569 unsigned int sysctl_ping_group_range[2];
61570
61571- atomic_t rt_genid;
61572- atomic_t dev_addr_genid;
61573+ atomic_unchecked_t rt_genid;
61574+ atomic_unchecked_t dev_addr_genid;
61575
61576 #ifdef CONFIG_IP_MROUTE
61577 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
61578diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
61579index 6a72a58..e6a127d 100644
61580--- a/include/net/sctp/sctp.h
61581+++ b/include/net/sctp/sctp.h
61582@@ -318,9 +318,9 @@ do { \
61583
61584 #else /* SCTP_DEBUG */
61585
61586-#define SCTP_DEBUG_PRINTK(whatever...)
61587-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
61588-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
61589+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
61590+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
61591+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
61592 #define SCTP_ENABLE_DEBUG
61593 #define SCTP_DISABLE_DEBUG
61594 #define SCTP_ASSERT(expr, str, func)
61595diff --git a/include/net/sock.h b/include/net/sock.h
61596index 32e3937..87a1dbc 100644
61597--- a/include/net/sock.h
61598+++ b/include/net/sock.h
61599@@ -277,7 +277,7 @@ struct sock {
61600 #ifdef CONFIG_RPS
61601 __u32 sk_rxhash;
61602 #endif
61603- atomic_t sk_drops;
61604+ atomic_unchecked_t sk_drops;
61605 int sk_rcvbuf;
61606
61607 struct sk_filter __rcu *sk_filter;
61608@@ -1402,7 +1402,7 @@ static inline void sk_nocaps_add(struct sock *sk, int flags)
61609 }
61610
61611 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
61612- char __user *from, char *to,
61613+ char __user *from, unsigned char *to,
61614 int copy, int offset)
61615 {
61616 if (skb->ip_summed == CHECKSUM_NONE) {
61617diff --git a/include/net/tcp.h b/include/net/tcp.h
61618index bb18c4d..bb87972 100644
61619--- a/include/net/tcp.h
61620+++ b/include/net/tcp.h
61621@@ -1409,7 +1409,7 @@ struct tcp_seq_afinfo {
61622 char *name;
61623 sa_family_t family;
61624 const struct file_operations *seq_fops;
61625- struct seq_operations seq_ops;
61626+ seq_operations_no_const seq_ops;
61627 };
61628
61629 struct tcp_iter_state {
61630diff --git a/include/net/udp.h b/include/net/udp.h
61631index 3b285f4..0219639 100644
61632--- a/include/net/udp.h
61633+++ b/include/net/udp.h
61634@@ -237,7 +237,7 @@ struct udp_seq_afinfo {
61635 sa_family_t family;
61636 struct udp_table *udp_table;
61637 const struct file_operations *seq_fops;
61638- struct seq_operations seq_ops;
61639+ seq_operations_no_const seq_ops;
61640 };
61641
61642 struct udp_iter_state {
61643diff --git a/include/net/xfrm.h b/include/net/xfrm.h
61644index b203e14..1df3991 100644
61645--- a/include/net/xfrm.h
61646+++ b/include/net/xfrm.h
61647@@ -505,7 +505,7 @@ struct xfrm_policy {
61648 struct timer_list timer;
61649
61650 struct flow_cache_object flo;
61651- atomic_t genid;
61652+ atomic_unchecked_t genid;
61653 u32 priority;
61654 u32 index;
61655 struct xfrm_mark mark;
61656diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
61657index 1a046b1..ee0bef0 100644
61658--- a/include/rdma/iw_cm.h
61659+++ b/include/rdma/iw_cm.h
61660@@ -122,7 +122,7 @@ struct iw_cm_verbs {
61661 int backlog);
61662
61663 int (*destroy_listen)(struct iw_cm_id *cm_id);
61664-};
61665+} __no_const;
61666
61667 /**
61668 * iw_create_cm_id - Create an IW CM identifier.
61669diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
61670index 5d1a758..1dbf795 100644
61671--- a/include/scsi/libfc.h
61672+++ b/include/scsi/libfc.h
61673@@ -748,6 +748,7 @@ struct libfc_function_template {
61674 */
61675 void (*disc_stop_final) (struct fc_lport *);
61676 };
61677+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
61678
61679 /**
61680 * struct fc_disc - Discovery context
61681@@ -851,7 +852,7 @@ struct fc_lport {
61682 struct fc_vport *vport;
61683
61684 /* Operational Information */
61685- struct libfc_function_template tt;
61686+ libfc_function_template_no_const tt;
61687 u8 link_up;
61688 u8 qfull;
61689 enum fc_lport_state state;
61690diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
61691index 5591ed5..13eb457 100644
61692--- a/include/scsi/scsi_device.h
61693+++ b/include/scsi/scsi_device.h
61694@@ -161,9 +161,9 @@ struct scsi_device {
61695 unsigned int max_device_blocked; /* what device_blocked counts down from */
61696 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
61697
61698- atomic_t iorequest_cnt;
61699- atomic_t iodone_cnt;
61700- atomic_t ioerr_cnt;
61701+ atomic_unchecked_t iorequest_cnt;
61702+ atomic_unchecked_t iodone_cnt;
61703+ atomic_unchecked_t ioerr_cnt;
61704
61705 struct device sdev_gendev,
61706 sdev_dev;
61707diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
61708index 2a65167..91e01f8 100644
61709--- a/include/scsi/scsi_transport_fc.h
61710+++ b/include/scsi/scsi_transport_fc.h
61711@@ -711,7 +711,7 @@ struct fc_function_template {
61712 unsigned long show_host_system_hostname:1;
61713
61714 unsigned long disable_target_scan:1;
61715-};
61716+} __do_const;
61717
61718
61719 /**
61720diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
61721index 030b87c..98a6954 100644
61722--- a/include/sound/ak4xxx-adda.h
61723+++ b/include/sound/ak4xxx-adda.h
61724@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
61725 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
61726 unsigned char val);
61727 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
61728-};
61729+} __no_const;
61730
61731 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
61732
61733diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
61734index 8c05e47..2b5df97 100644
61735--- a/include/sound/hwdep.h
61736+++ b/include/sound/hwdep.h
61737@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
61738 struct snd_hwdep_dsp_status *status);
61739 int (*dsp_load)(struct snd_hwdep *hw,
61740 struct snd_hwdep_dsp_image *image);
61741-};
61742+} __no_const;
61743
61744 struct snd_hwdep {
61745 struct snd_card *card;
61746diff --git a/include/sound/info.h b/include/sound/info.h
61747index 5492cc4..1a65278 100644
61748--- a/include/sound/info.h
61749+++ b/include/sound/info.h
61750@@ -44,7 +44,7 @@ struct snd_info_entry_text {
61751 struct snd_info_buffer *buffer);
61752 void (*write)(struct snd_info_entry *entry,
61753 struct snd_info_buffer *buffer);
61754-};
61755+} __no_const;
61756
61757 struct snd_info_entry_ops {
61758 int (*open)(struct snd_info_entry *entry,
61759diff --git a/include/sound/pcm.h b/include/sound/pcm.h
61760index 0cf91b2..b70cae4 100644
61761--- a/include/sound/pcm.h
61762+++ b/include/sound/pcm.h
61763@@ -81,6 +81,7 @@ struct snd_pcm_ops {
61764 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
61765 int (*ack)(struct snd_pcm_substream *substream);
61766 };
61767+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
61768
61769 /*
61770 *
61771diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
61772index af1b49e..a5d55a5 100644
61773--- a/include/sound/sb16_csp.h
61774+++ b/include/sound/sb16_csp.h
61775@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
61776 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
61777 int (*csp_stop) (struct snd_sb_csp * p);
61778 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
61779-};
61780+} __no_const;
61781
61782 /*
61783 * CSP private data
61784diff --git a/include/sound/soc.h b/include/sound/soc.h
61785index 11cfb59..e3f93f4 100644
61786--- a/include/sound/soc.h
61787+++ b/include/sound/soc.h
61788@@ -683,7 +683,7 @@ struct snd_soc_platform_driver {
61789 /* platform IO - used for platform DAPM */
61790 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
61791 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
61792-};
61793+} __do_const;
61794
61795 struct snd_soc_platform {
61796 const char *name;
61797diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
61798index 444cd6b..3327cc5 100644
61799--- a/include/sound/ymfpci.h
61800+++ b/include/sound/ymfpci.h
61801@@ -358,7 +358,7 @@ struct snd_ymfpci {
61802 spinlock_t reg_lock;
61803 spinlock_t voice_lock;
61804 wait_queue_head_t interrupt_sleep;
61805- atomic_t interrupt_sleep_count;
61806+ atomic_unchecked_t interrupt_sleep_count;
61807 struct snd_info_entry *proc_entry;
61808 const struct firmware *dsp_microcode;
61809 const struct firmware *controller_microcode;
61810diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
61811index a79886c..b483af6 100644
61812--- a/include/target/target_core_base.h
61813+++ b/include/target/target_core_base.h
61814@@ -346,7 +346,7 @@ struct t10_reservation_ops {
61815 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
61816 int (*t10_pr_register)(struct se_cmd *);
61817 int (*t10_pr_clear)(struct se_cmd *);
61818-};
61819+} __no_const;
61820
61821 struct t10_reservation {
61822 /* Reservation effects all target ports */
61823@@ -465,8 +465,8 @@ struct se_cmd {
61824 atomic_t t_se_count;
61825 atomic_t t_task_cdbs_left;
61826 atomic_t t_task_cdbs_ex_left;
61827- atomic_t t_task_cdbs_sent;
61828- atomic_t t_transport_aborted;
61829+ atomic_unchecked_t t_task_cdbs_sent;
61830+ atomic_unchecked_t t_transport_aborted;
61831 atomic_t t_transport_active;
61832 atomic_t t_transport_complete;
61833 atomic_t t_transport_queue_active;
61834@@ -704,7 +704,7 @@ struct se_device {
61835 /* Active commands on this virtual SE device */
61836 atomic_t simple_cmds;
61837 atomic_t depth_left;
61838- atomic_t dev_ordered_id;
61839+ atomic_unchecked_t dev_ordered_id;
61840 atomic_t execute_tasks;
61841 atomic_t dev_ordered_sync;
61842 atomic_t dev_qf_count;
61843diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
61844index 1c09820..7f5ec79 100644
61845--- a/include/trace/events/irq.h
61846+++ b/include/trace/events/irq.h
61847@@ -36,7 +36,7 @@ struct softirq_action;
61848 */
61849 TRACE_EVENT(irq_handler_entry,
61850
61851- TP_PROTO(int irq, struct irqaction *action),
61852+ TP_PROTO(int irq, const struct irqaction *action),
61853
61854 TP_ARGS(irq, action),
61855
61856@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
61857 */
61858 TRACE_EVENT(irq_handler_exit,
61859
61860- TP_PROTO(int irq, struct irqaction *action, int ret),
61861+ TP_PROTO(int irq, const struct irqaction *action, int ret),
61862
61863 TP_ARGS(irq, action, ret),
61864
61865diff --git a/include/video/udlfb.h b/include/video/udlfb.h
61866index c41f308..6918de3 100644
61867--- a/include/video/udlfb.h
61868+++ b/include/video/udlfb.h
61869@@ -52,10 +52,10 @@ struct dlfb_data {
61870 u32 pseudo_palette[256];
61871 int blank_mode; /*one of FB_BLANK_ */
61872 /* blit-only rendering path metrics, exposed through sysfs */
61873- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
61874- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
61875- atomic_t bytes_sent; /* to usb, after compression including overhead */
61876- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
61877+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
61878+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
61879+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
61880+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
61881 };
61882
61883 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
61884diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
61885index 0993a22..32ba2fe 100644
61886--- a/include/video/uvesafb.h
61887+++ b/include/video/uvesafb.h
61888@@ -177,6 +177,7 @@ struct uvesafb_par {
61889 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
61890 u8 pmi_setpal; /* PMI for palette changes */
61891 u16 *pmi_base; /* protected mode interface location */
61892+ u8 *pmi_code; /* protected mode code location */
61893 void *pmi_start;
61894 void *pmi_pal;
61895 u8 *vbe_state_orig; /*
61896diff --git a/init/Kconfig b/init/Kconfig
61897index 43298f9..2f56c12 100644
61898--- a/init/Kconfig
61899+++ b/init/Kconfig
61900@@ -1214,7 +1214,7 @@ config SLUB_DEBUG
61901
61902 config COMPAT_BRK
61903 bool "Disable heap randomization"
61904- default y
61905+ default n
61906 help
61907 Randomizing heap placement makes heap exploits harder, but it
61908 also breaks ancient binaries (including anything libc5 based).
61909diff --git a/init/do_mounts.c b/init/do_mounts.c
61910index db6e5ee..7677ff7 100644
61911--- a/init/do_mounts.c
61912+++ b/init/do_mounts.c
61913@@ -325,11 +325,11 @@ static void __init get_fs_names(char *page)
61914
61915 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
61916 {
61917- int err = sys_mount(name, "/root", fs, flags, data);
61918+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
61919 if (err)
61920 return err;
61921
61922- sys_chdir((const char __user __force *)"/root");
61923+ sys_chdir((const char __force_user*)"/root");
61924 ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
61925 printk(KERN_INFO
61926 "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
61927@@ -448,18 +448,18 @@ void __init change_floppy(char *fmt, ...)
61928 va_start(args, fmt);
61929 vsprintf(buf, fmt, args);
61930 va_end(args);
61931- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
61932+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
61933 if (fd >= 0) {
61934 sys_ioctl(fd, FDEJECT, 0);
61935 sys_close(fd);
61936 }
61937 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
61938- fd = sys_open("/dev/console", O_RDWR, 0);
61939+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
61940 if (fd >= 0) {
61941 sys_ioctl(fd, TCGETS, (long)&termios);
61942 termios.c_lflag &= ~ICANON;
61943 sys_ioctl(fd, TCSETSF, (long)&termios);
61944- sys_read(fd, &c, 1);
61945+ sys_read(fd, (char __user *)&c, 1);
61946 termios.c_lflag |= ICANON;
61947 sys_ioctl(fd, TCSETSF, (long)&termios);
61948 sys_close(fd);
61949@@ -553,6 +553,6 @@ void __init prepare_namespace(void)
61950 mount_root();
61951 out:
61952 devtmpfs_mount("dev");
61953- sys_mount(".", "/", NULL, MS_MOVE, NULL);
61954- sys_chroot((const char __user __force *)".");
61955+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
61956+ sys_chroot((const char __force_user *)".");
61957 }
61958diff --git a/init/do_mounts.h b/init/do_mounts.h
61959index f5b978a..69dbfe8 100644
61960--- a/init/do_mounts.h
61961+++ b/init/do_mounts.h
61962@@ -15,15 +15,15 @@ extern int root_mountflags;
61963
61964 static inline int create_dev(char *name, dev_t dev)
61965 {
61966- sys_unlink(name);
61967- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
61968+ sys_unlink((char __force_user *)name);
61969+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
61970 }
61971
61972 #if BITS_PER_LONG == 32
61973 static inline u32 bstat(char *name)
61974 {
61975 struct stat64 stat;
61976- if (sys_stat64(name, &stat) != 0)
61977+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
61978 return 0;
61979 if (!S_ISBLK(stat.st_mode))
61980 return 0;
61981@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
61982 static inline u32 bstat(char *name)
61983 {
61984 struct stat stat;
61985- if (sys_newstat(name, &stat) != 0)
61986+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
61987 return 0;
61988 if (!S_ISBLK(stat.st_mode))
61989 return 0;
61990diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
61991index 3098a38..253064e 100644
61992--- a/init/do_mounts_initrd.c
61993+++ b/init/do_mounts_initrd.c
61994@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
61995 create_dev("/dev/root.old", Root_RAM0);
61996 /* mount initrd on rootfs' /root */
61997 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
61998- sys_mkdir("/old", 0700);
61999- root_fd = sys_open("/", 0, 0);
62000- old_fd = sys_open("/old", 0, 0);
62001+ sys_mkdir((const char __force_user *)"/old", 0700);
62002+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
62003+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
62004 /* move initrd over / and chdir/chroot in initrd root */
62005- sys_chdir("/root");
62006- sys_mount(".", "/", NULL, MS_MOVE, NULL);
62007- sys_chroot(".");
62008+ sys_chdir((const char __force_user *)"/root");
62009+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
62010+ sys_chroot((const char __force_user *)".");
62011
62012 /*
62013 * In case that a resume from disk is carried out by linuxrc or one of
62014@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
62015
62016 /* move initrd to rootfs' /old */
62017 sys_fchdir(old_fd);
62018- sys_mount("/", ".", NULL, MS_MOVE, NULL);
62019+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
62020 /* switch root and cwd back to / of rootfs */
62021 sys_fchdir(root_fd);
62022- sys_chroot(".");
62023+ sys_chroot((const char __force_user *)".");
62024 sys_close(old_fd);
62025 sys_close(root_fd);
62026
62027 if (new_decode_dev(real_root_dev) == Root_RAM0) {
62028- sys_chdir("/old");
62029+ sys_chdir((const char __force_user *)"/old");
62030 return;
62031 }
62032
62033@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
62034 mount_root();
62035
62036 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
62037- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
62038+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
62039 if (!error)
62040 printk("okay\n");
62041 else {
62042- int fd = sys_open("/dev/root.old", O_RDWR, 0);
62043+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
62044 if (error == -ENOENT)
62045 printk("/initrd does not exist. Ignored.\n");
62046 else
62047 printk("failed\n");
62048 printk(KERN_NOTICE "Unmounting old root\n");
62049- sys_umount("/old", MNT_DETACH);
62050+ sys_umount((char __force_user *)"/old", MNT_DETACH);
62051 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
62052 if (fd < 0) {
62053 error = fd;
62054@@ -116,11 +116,11 @@ int __init initrd_load(void)
62055 * mounted in the normal path.
62056 */
62057 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
62058- sys_unlink("/initrd.image");
62059+ sys_unlink((const char __force_user *)"/initrd.image");
62060 handle_initrd();
62061 return 1;
62062 }
62063 }
62064- sys_unlink("/initrd.image");
62065+ sys_unlink((const char __force_user *)"/initrd.image");
62066 return 0;
62067 }
62068diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
62069index 32c4799..c27ee74 100644
62070--- a/init/do_mounts_md.c
62071+++ b/init/do_mounts_md.c
62072@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
62073 partitioned ? "_d" : "", minor,
62074 md_setup_args[ent].device_names);
62075
62076- fd = sys_open(name, 0, 0);
62077+ fd = sys_open((char __force_user *)name, 0, 0);
62078 if (fd < 0) {
62079 printk(KERN_ERR "md: open failed - cannot start "
62080 "array %s\n", name);
62081@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
62082 * array without it
62083 */
62084 sys_close(fd);
62085- fd = sys_open(name, 0, 0);
62086+ fd = sys_open((char __force_user *)name, 0, 0);
62087 sys_ioctl(fd, BLKRRPART, 0);
62088 }
62089 sys_close(fd);
62090@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
62091
62092 wait_for_device_probe();
62093
62094- fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
62095+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
62096 if (fd >= 0) {
62097 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
62098 sys_close(fd);
62099diff --git a/init/initramfs.c b/init/initramfs.c
62100index 2531811..040d4d4 100644
62101--- a/init/initramfs.c
62102+++ b/init/initramfs.c
62103@@ -74,7 +74,7 @@ static void __init free_hash(void)
62104 }
62105 }
62106
62107-static long __init do_utime(char __user *filename, time_t mtime)
62108+static long __init do_utime(__force char __user *filename, time_t mtime)
62109 {
62110 struct timespec t[2];
62111
62112@@ -109,7 +109,7 @@ static void __init dir_utime(void)
62113 struct dir_entry *de, *tmp;
62114 list_for_each_entry_safe(de, tmp, &dir_list, list) {
62115 list_del(&de->list);
62116- do_utime(de->name, de->mtime);
62117+ do_utime((char __force_user *)de->name, de->mtime);
62118 kfree(de->name);
62119 kfree(de);
62120 }
62121@@ -271,7 +271,7 @@ static int __init maybe_link(void)
62122 if (nlink >= 2) {
62123 char *old = find_link(major, minor, ino, mode, collected);
62124 if (old)
62125- return (sys_link(old, collected) < 0) ? -1 : 1;
62126+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
62127 }
62128 return 0;
62129 }
62130@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
62131 {
62132 struct stat st;
62133
62134- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
62135+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
62136 if (S_ISDIR(st.st_mode))
62137- sys_rmdir(path);
62138+ sys_rmdir((char __force_user *)path);
62139 else
62140- sys_unlink(path);
62141+ sys_unlink((char __force_user *)path);
62142 }
62143 }
62144
62145@@ -305,7 +305,7 @@ static int __init do_name(void)
62146 int openflags = O_WRONLY|O_CREAT;
62147 if (ml != 1)
62148 openflags |= O_TRUNC;
62149- wfd = sys_open(collected, openflags, mode);
62150+ wfd = sys_open((char __force_user *)collected, openflags, mode);
62151
62152 if (wfd >= 0) {
62153 sys_fchown(wfd, uid, gid);
62154@@ -317,17 +317,17 @@ static int __init do_name(void)
62155 }
62156 }
62157 } else if (S_ISDIR(mode)) {
62158- sys_mkdir(collected, mode);
62159- sys_chown(collected, uid, gid);
62160- sys_chmod(collected, mode);
62161+ sys_mkdir((char __force_user *)collected, mode);
62162+ sys_chown((char __force_user *)collected, uid, gid);
62163+ sys_chmod((char __force_user *)collected, mode);
62164 dir_add(collected, mtime);
62165 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
62166 S_ISFIFO(mode) || S_ISSOCK(mode)) {
62167 if (maybe_link() == 0) {
62168- sys_mknod(collected, mode, rdev);
62169- sys_chown(collected, uid, gid);
62170- sys_chmod(collected, mode);
62171- do_utime(collected, mtime);
62172+ sys_mknod((char __force_user *)collected, mode, rdev);
62173+ sys_chown((char __force_user *)collected, uid, gid);
62174+ sys_chmod((char __force_user *)collected, mode);
62175+ do_utime((char __force_user *)collected, mtime);
62176 }
62177 }
62178 return 0;
62179@@ -336,15 +336,15 @@ static int __init do_name(void)
62180 static int __init do_copy(void)
62181 {
62182 if (count >= body_len) {
62183- sys_write(wfd, victim, body_len);
62184+ sys_write(wfd, (char __force_user *)victim, body_len);
62185 sys_close(wfd);
62186- do_utime(vcollected, mtime);
62187+ do_utime((char __force_user *)vcollected, mtime);
62188 kfree(vcollected);
62189 eat(body_len);
62190 state = SkipIt;
62191 return 0;
62192 } else {
62193- sys_write(wfd, victim, count);
62194+ sys_write(wfd, (char __force_user *)victim, count);
62195 body_len -= count;
62196 eat(count);
62197 return 1;
62198@@ -355,9 +355,9 @@ static int __init do_symlink(void)
62199 {
62200 collected[N_ALIGN(name_len) + body_len] = '\0';
62201 clean_path(collected, 0);
62202- sys_symlink(collected + N_ALIGN(name_len), collected);
62203- sys_lchown(collected, uid, gid);
62204- do_utime(collected, mtime);
62205+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
62206+ sys_lchown((char __force_user *)collected, uid, gid);
62207+ do_utime((char __force_user *)collected, mtime);
62208 state = SkipIt;
62209 next_state = Reset;
62210 return 0;
62211diff --git a/init/main.c b/init/main.c
62212index 217ed23..32e5731 100644
62213--- a/init/main.c
62214+++ b/init/main.c
62215@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
62216 extern void tc_init(void);
62217 #endif
62218
62219+extern void grsecurity_init(void);
62220+
62221 /*
62222 * Debug helper: via this flag we know that we are in 'early bootup code'
62223 * where only the boot processor is running with IRQ disabled. This means
62224@@ -149,6 +151,49 @@ static int __init set_reset_devices(char *str)
62225
62226 __setup("reset_devices", set_reset_devices);
62227
62228+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
62229+extern char pax_enter_kernel_user[];
62230+extern char pax_exit_kernel_user[];
62231+extern pgdval_t clone_pgd_mask;
62232+#endif
62233+
62234+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
62235+static int __init setup_pax_nouderef(char *str)
62236+{
62237+#ifdef CONFIG_X86_32
62238+ unsigned int cpu;
62239+ struct desc_struct *gdt;
62240+
62241+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
62242+ gdt = get_cpu_gdt_table(cpu);
62243+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
62244+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
62245+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
62246+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
62247+ }
62248+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
62249+#else
62250+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
62251+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
62252+ clone_pgd_mask = ~(pgdval_t)0UL;
62253+#endif
62254+
62255+ return 0;
62256+}
62257+early_param("pax_nouderef", setup_pax_nouderef);
62258+#endif
62259+
62260+#ifdef CONFIG_PAX_SOFTMODE
62261+int pax_softmode;
62262+
62263+static int __init setup_pax_softmode(char *str)
62264+{
62265+ get_option(&str, &pax_softmode);
62266+ return 1;
62267+}
62268+__setup("pax_softmode=", setup_pax_softmode);
62269+#endif
62270+
62271 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
62272 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
62273 static const char *panic_later, *panic_param;
62274@@ -681,6 +726,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
62275 {
62276 int count = preempt_count();
62277 int ret;
62278+ const char *msg1 = "", *msg2 = "";
62279
62280 if (initcall_debug)
62281 ret = do_one_initcall_debug(fn);
62282@@ -693,15 +739,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
62283 sprintf(msgbuf, "error code %d ", ret);
62284
62285 if (preempt_count() != count) {
62286- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
62287+ msg1 = " preemption imbalance";
62288 preempt_count() = count;
62289 }
62290 if (irqs_disabled()) {
62291- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
62292+ msg2 = " disabled interrupts";
62293 local_irq_enable();
62294 }
62295- if (msgbuf[0]) {
62296- printk("initcall %pF returned with %s\n", fn, msgbuf);
62297+ if (msgbuf[0] || *msg1 || *msg2) {
62298+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
62299 }
62300
62301 return ret;
62302@@ -820,7 +866,7 @@ static int __init kernel_init(void * unused)
62303 do_basic_setup();
62304
62305 /* Open the /dev/console on the rootfs, this should never fail */
62306- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
62307+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
62308 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
62309
62310 (void) sys_dup(0);
62311@@ -833,11 +879,13 @@ static int __init kernel_init(void * unused)
62312 if (!ramdisk_execute_command)
62313 ramdisk_execute_command = "/init";
62314
62315- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
62316+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
62317 ramdisk_execute_command = NULL;
62318 prepare_namespace();
62319 }
62320
62321+ grsecurity_init();
62322+
62323 /*
62324 * Ok, we have completed the initial bootup, and
62325 * we're essentially up and running. Get rid of the
62326diff --git a/ipc/mqueue.c b/ipc/mqueue.c
62327index 5b4293d..f179875 100644
62328--- a/ipc/mqueue.c
62329+++ b/ipc/mqueue.c
62330@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
62331 mq_bytes = (mq_msg_tblsz +
62332 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
62333
62334+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
62335 spin_lock(&mq_lock);
62336 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
62337 u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
62338diff --git a/ipc/msg.c b/ipc/msg.c
62339index 7385de2..a8180e0 100644
62340--- a/ipc/msg.c
62341+++ b/ipc/msg.c
62342@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
62343 return security_msg_queue_associate(msq, msgflg);
62344 }
62345
62346+static struct ipc_ops msg_ops = {
62347+ .getnew = newque,
62348+ .associate = msg_security,
62349+ .more_checks = NULL
62350+};
62351+
62352 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
62353 {
62354 struct ipc_namespace *ns;
62355- struct ipc_ops msg_ops;
62356 struct ipc_params msg_params;
62357
62358 ns = current->nsproxy->ipc_ns;
62359
62360- msg_ops.getnew = newque;
62361- msg_ops.associate = msg_security;
62362- msg_ops.more_checks = NULL;
62363-
62364 msg_params.key = key;
62365 msg_params.flg = msgflg;
62366
62367diff --git a/ipc/sem.c b/ipc/sem.c
62368index 5215a81..cfc0cac 100644
62369--- a/ipc/sem.c
62370+++ b/ipc/sem.c
62371@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
62372 return 0;
62373 }
62374
62375+static struct ipc_ops sem_ops = {
62376+ .getnew = newary,
62377+ .associate = sem_security,
62378+ .more_checks = sem_more_checks
62379+};
62380+
62381 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
62382 {
62383 struct ipc_namespace *ns;
62384- struct ipc_ops sem_ops;
62385 struct ipc_params sem_params;
62386
62387 ns = current->nsproxy->ipc_ns;
62388@@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
62389 if (nsems < 0 || nsems > ns->sc_semmsl)
62390 return -EINVAL;
62391
62392- sem_ops.getnew = newary;
62393- sem_ops.associate = sem_security;
62394- sem_ops.more_checks = sem_more_checks;
62395-
62396 sem_params.key = key;
62397 sem_params.flg = semflg;
62398 sem_params.u.nsems = nsems;
62399diff --git a/ipc/shm.c b/ipc/shm.c
62400index b76be5b..859e750 100644
62401--- a/ipc/shm.c
62402+++ b/ipc/shm.c
62403@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
62404 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
62405 #endif
62406
62407+#ifdef CONFIG_GRKERNSEC
62408+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
62409+ const time_t shm_createtime, const uid_t cuid,
62410+ const int shmid);
62411+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
62412+ const time_t shm_createtime);
62413+#endif
62414+
62415 void shm_init_ns(struct ipc_namespace *ns)
62416 {
62417 ns->shm_ctlmax = SHMMAX;
62418@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
62419 shp->shm_lprid = 0;
62420 shp->shm_atim = shp->shm_dtim = 0;
62421 shp->shm_ctim = get_seconds();
62422+#ifdef CONFIG_GRKERNSEC
62423+ {
62424+ struct timespec timeval;
62425+ do_posix_clock_monotonic_gettime(&timeval);
62426+
62427+ shp->shm_createtime = timeval.tv_sec;
62428+ }
62429+#endif
62430 shp->shm_segsz = size;
62431 shp->shm_nattch = 0;
62432 shp->shm_file = file;
62433@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
62434 return 0;
62435 }
62436
62437+static struct ipc_ops shm_ops = {
62438+ .getnew = newseg,
62439+ .associate = shm_security,
62440+ .more_checks = shm_more_checks
62441+};
62442+
62443 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
62444 {
62445 struct ipc_namespace *ns;
62446- struct ipc_ops shm_ops;
62447 struct ipc_params shm_params;
62448
62449 ns = current->nsproxy->ipc_ns;
62450
62451- shm_ops.getnew = newseg;
62452- shm_ops.associate = shm_security;
62453- shm_ops.more_checks = shm_more_checks;
62454-
62455 shm_params.key = key;
62456 shm_params.flg = shmflg;
62457 shm_params.u.size = size;
62458@@ -988,6 +1005,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
62459 f_mode = FMODE_READ | FMODE_WRITE;
62460 }
62461 if (shmflg & SHM_EXEC) {
62462+
62463+#ifdef CONFIG_PAX_MPROTECT
62464+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
62465+ goto out;
62466+#endif
62467+
62468 prot |= PROT_EXEC;
62469 acc_mode |= S_IXUGO;
62470 }
62471@@ -1011,9 +1034,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
62472 if (err)
62473 goto out_unlock;
62474
62475+#ifdef CONFIG_GRKERNSEC
62476+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
62477+ shp->shm_perm.cuid, shmid) ||
62478+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
62479+ err = -EACCES;
62480+ goto out_unlock;
62481+ }
62482+#endif
62483+
62484 path = shp->shm_file->f_path;
62485 path_get(&path);
62486 shp->shm_nattch++;
62487+#ifdef CONFIG_GRKERNSEC
62488+ shp->shm_lapid = current->pid;
62489+#endif
62490 size = i_size_read(path.dentry->d_inode);
62491 shm_unlock(shp);
62492
62493diff --git a/kernel/acct.c b/kernel/acct.c
62494index fa7eb3d..7faf116 100644
62495--- a/kernel/acct.c
62496+++ b/kernel/acct.c
62497@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
62498 */
62499 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
62500 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
62501- file->f_op->write(file, (char *)&ac,
62502+ file->f_op->write(file, (char __force_user *)&ac,
62503 sizeof(acct_t), &file->f_pos);
62504 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
62505 set_fs(fs);
62506diff --git a/kernel/audit.c b/kernel/audit.c
62507index 09fae26..ed71d5b 100644
62508--- a/kernel/audit.c
62509+++ b/kernel/audit.c
62510@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
62511 3) suppressed due to audit_rate_limit
62512 4) suppressed due to audit_backlog_limit
62513 */
62514-static atomic_t audit_lost = ATOMIC_INIT(0);
62515+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
62516
62517 /* The netlink socket. */
62518 static struct sock *audit_sock;
62519@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
62520 unsigned long now;
62521 int print;
62522
62523- atomic_inc(&audit_lost);
62524+ atomic_inc_unchecked(&audit_lost);
62525
62526 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
62527
62528@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
62529 printk(KERN_WARNING
62530 "audit: audit_lost=%d audit_rate_limit=%d "
62531 "audit_backlog_limit=%d\n",
62532- atomic_read(&audit_lost),
62533+ atomic_read_unchecked(&audit_lost),
62534 audit_rate_limit,
62535 audit_backlog_limit);
62536 audit_panic(message);
62537@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
62538 status_set.pid = audit_pid;
62539 status_set.rate_limit = audit_rate_limit;
62540 status_set.backlog_limit = audit_backlog_limit;
62541- status_set.lost = atomic_read(&audit_lost);
62542+ status_set.lost = atomic_read_unchecked(&audit_lost);
62543 status_set.backlog = skb_queue_len(&audit_skb_queue);
62544 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
62545 &status_set, sizeof(status_set));
62546@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
62547 avail = audit_expand(ab,
62548 max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
62549 if (!avail)
62550- goto out;
62551+ goto out_va_end;
62552 len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
62553 }
62554- va_end(args2);
62555 if (len > 0)
62556 skb_put(skb, len);
62557+out_va_end:
62558+ va_end(args2);
62559 out:
62560 return;
62561 }
62562diff --git a/kernel/auditsc.c b/kernel/auditsc.c
62563index 47b7fc1..c003c33 100644
62564--- a/kernel/auditsc.c
62565+++ b/kernel/auditsc.c
62566@@ -1166,8 +1166,8 @@ static void audit_log_execve_info(struct audit_context *context,
62567 struct audit_buffer **ab,
62568 struct audit_aux_data_execve *axi)
62569 {
62570- int i;
62571- size_t len, len_sent = 0;
62572+ int i, len;
62573+ size_t len_sent = 0;
62574 const char __user *p;
62575 char *buf;
62576
62577@@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
62578 }
62579
62580 /* global counter which is incremented every time something logs in */
62581-static atomic_t session_id = ATOMIC_INIT(0);
62582+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
62583
62584 /**
62585 * audit_set_loginuid - set a task's audit_context loginuid
62586@@ -2131,7 +2131,7 @@ static atomic_t session_id = ATOMIC_INIT(0);
62587 */
62588 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
62589 {
62590- unsigned int sessionid = atomic_inc_return(&session_id);
62591+ unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
62592 struct audit_context *context = task->audit_context;
62593
62594 if (context && context->in_syscall) {
62595diff --git a/kernel/capability.c b/kernel/capability.c
62596index b463871..fa3ea1f 100644
62597--- a/kernel/capability.c
62598+++ b/kernel/capability.c
62599@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
62600 * before modification is attempted and the application
62601 * fails.
62602 */
62603+ if (tocopy > ARRAY_SIZE(kdata))
62604+ return -EFAULT;
62605+
62606 if (copy_to_user(dataptr, kdata, tocopy
62607 * sizeof(struct __user_cap_data_struct))) {
62608 return -EFAULT;
62609@@ -374,7 +377,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
62610 BUG();
62611 }
62612
62613- if (security_capable(ns, current_cred(), cap) == 0) {
62614+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable(cap)) {
62615 current->flags |= PF_SUPERPRIV;
62616 return true;
62617 }
62618@@ -382,6 +385,27 @@ bool ns_capable(struct user_namespace *ns, int cap)
62619 }
62620 EXPORT_SYMBOL(ns_capable);
62621
62622+bool ns_capable_nolog(struct user_namespace *ns, int cap)
62623+{
62624+ if (unlikely(!cap_valid(cap))) {
62625+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
62626+ BUG();
62627+ }
62628+
62629+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
62630+ current->flags |= PF_SUPERPRIV;
62631+ return true;
62632+ }
62633+ return false;
62634+}
62635+EXPORT_SYMBOL(ns_capable_nolog);
62636+
62637+bool capable_nolog(int cap)
62638+{
62639+ return ns_capable_nolog(&init_user_ns, cap);
62640+}
62641+EXPORT_SYMBOL(capable_nolog);
62642+
62643 /**
62644 * task_ns_capable - Determine whether current task has a superior
62645 * capability targeted at a specific task's user namespace.
62646@@ -396,6 +420,12 @@ bool task_ns_capable(struct task_struct *t, int cap)
62647 }
62648 EXPORT_SYMBOL(task_ns_capable);
62649
62650+bool task_ns_capable_nolog(struct task_struct *t, int cap)
62651+{
62652+ return ns_capable_nolog(task_cred_xxx(t, user)->user_ns, cap);
62653+}
62654+EXPORT_SYMBOL(task_ns_capable_nolog);
62655+
62656 /**
62657 * nsown_capable - Check superior capability to one's own user_ns
62658 * @cap: The capability in question
62659diff --git a/kernel/compat.c b/kernel/compat.c
62660index f346ced..aa2b1f4 100644
62661--- a/kernel/compat.c
62662+++ b/kernel/compat.c
62663@@ -13,6 +13,7 @@
62664
62665 #include <linux/linkage.h>
62666 #include <linux/compat.h>
62667+#include <linux/module.h>
62668 #include <linux/errno.h>
62669 #include <linux/time.h>
62670 #include <linux/signal.h>
62671@@ -168,7 +169,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
62672 mm_segment_t oldfs;
62673 long ret;
62674
62675- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
62676+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
62677 oldfs = get_fs();
62678 set_fs(KERNEL_DS);
62679 ret = hrtimer_nanosleep_restart(restart);
62680@@ -200,7 +201,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
62681 oldfs = get_fs();
62682 set_fs(KERNEL_DS);
62683 ret = hrtimer_nanosleep(&tu,
62684- rmtp ? (struct timespec __user *)&rmt : NULL,
62685+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
62686 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
62687 set_fs(oldfs);
62688
62689@@ -309,7 +310,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
62690 mm_segment_t old_fs = get_fs();
62691
62692 set_fs(KERNEL_DS);
62693- ret = sys_sigpending((old_sigset_t __user *) &s);
62694+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
62695 set_fs(old_fs);
62696 if (ret == 0)
62697 ret = put_user(s, set);
62698@@ -332,8 +333,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
62699 old_fs = get_fs();
62700 set_fs(KERNEL_DS);
62701 ret = sys_sigprocmask(how,
62702- set ? (old_sigset_t __user *) &s : NULL,
62703- oset ? (old_sigset_t __user *) &s : NULL);
62704+ set ? (old_sigset_t __force_user *) &s : NULL,
62705+ oset ? (old_sigset_t __force_user *) &s : NULL);
62706 set_fs(old_fs);
62707 if (ret == 0)
62708 if (oset)
62709@@ -370,7 +371,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
62710 mm_segment_t old_fs = get_fs();
62711
62712 set_fs(KERNEL_DS);
62713- ret = sys_old_getrlimit(resource, &r);
62714+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
62715 set_fs(old_fs);
62716
62717 if (!ret) {
62718@@ -442,7 +443,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
62719 mm_segment_t old_fs = get_fs();
62720
62721 set_fs(KERNEL_DS);
62722- ret = sys_getrusage(who, (struct rusage __user *) &r);
62723+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
62724 set_fs(old_fs);
62725
62726 if (ret)
62727@@ -469,8 +470,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
62728 set_fs (KERNEL_DS);
62729 ret = sys_wait4(pid,
62730 (stat_addr ?
62731- (unsigned int __user *) &status : NULL),
62732- options, (struct rusage __user *) &r);
62733+ (unsigned int __force_user *) &status : NULL),
62734+ options, (struct rusage __force_user *) &r);
62735 set_fs (old_fs);
62736
62737 if (ret > 0) {
62738@@ -495,8 +496,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
62739 memset(&info, 0, sizeof(info));
62740
62741 set_fs(KERNEL_DS);
62742- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
62743- uru ? (struct rusage __user *)&ru : NULL);
62744+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
62745+ uru ? (struct rusage __force_user *)&ru : NULL);
62746 set_fs(old_fs);
62747
62748 if ((ret < 0) || (info.si_signo == 0))
62749@@ -626,8 +627,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
62750 oldfs = get_fs();
62751 set_fs(KERNEL_DS);
62752 err = sys_timer_settime(timer_id, flags,
62753- (struct itimerspec __user *) &newts,
62754- (struct itimerspec __user *) &oldts);
62755+ (struct itimerspec __force_user *) &newts,
62756+ (struct itimerspec __force_user *) &oldts);
62757 set_fs(oldfs);
62758 if (!err && old && put_compat_itimerspec(old, &oldts))
62759 return -EFAULT;
62760@@ -644,7 +645,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
62761 oldfs = get_fs();
62762 set_fs(KERNEL_DS);
62763 err = sys_timer_gettime(timer_id,
62764- (struct itimerspec __user *) &ts);
62765+ (struct itimerspec __force_user *) &ts);
62766 set_fs(oldfs);
62767 if (!err && put_compat_itimerspec(setting, &ts))
62768 return -EFAULT;
62769@@ -663,7 +664,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
62770 oldfs = get_fs();
62771 set_fs(KERNEL_DS);
62772 err = sys_clock_settime(which_clock,
62773- (struct timespec __user *) &ts);
62774+ (struct timespec __force_user *) &ts);
62775 set_fs(oldfs);
62776 return err;
62777 }
62778@@ -678,7 +679,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
62779 oldfs = get_fs();
62780 set_fs(KERNEL_DS);
62781 err = sys_clock_gettime(which_clock,
62782- (struct timespec __user *) &ts);
62783+ (struct timespec __force_user *) &ts);
62784 set_fs(oldfs);
62785 if (!err && put_compat_timespec(&ts, tp))
62786 return -EFAULT;
62787@@ -698,7 +699,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
62788
62789 oldfs = get_fs();
62790 set_fs(KERNEL_DS);
62791- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
62792+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
62793 set_fs(oldfs);
62794
62795 err = compat_put_timex(utp, &txc);
62796@@ -718,7 +719,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
62797 oldfs = get_fs();
62798 set_fs(KERNEL_DS);
62799 err = sys_clock_getres(which_clock,
62800- (struct timespec __user *) &ts);
62801+ (struct timespec __force_user *) &ts);
62802 set_fs(oldfs);
62803 if (!err && tp && put_compat_timespec(&ts, tp))
62804 return -EFAULT;
62805@@ -730,9 +731,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
62806 long err;
62807 mm_segment_t oldfs;
62808 struct timespec tu;
62809- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
62810+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
62811
62812- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
62813+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
62814 oldfs = get_fs();
62815 set_fs(KERNEL_DS);
62816 err = clock_nanosleep_restart(restart);
62817@@ -764,8 +765,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
62818 oldfs = get_fs();
62819 set_fs(KERNEL_DS);
62820 err = sys_clock_nanosleep(which_clock, flags,
62821- (struct timespec __user *) &in,
62822- (struct timespec __user *) &out);
62823+ (struct timespec __force_user *) &in,
62824+ (struct timespec __force_user *) &out);
62825 set_fs(oldfs);
62826
62827 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
62828diff --git a/kernel/configs.c b/kernel/configs.c
62829index 42e8fa0..9e7406b 100644
62830--- a/kernel/configs.c
62831+++ b/kernel/configs.c
62832@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
62833 struct proc_dir_entry *entry;
62834
62835 /* create the current config file */
62836+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
62837+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
62838+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
62839+ &ikconfig_file_ops);
62840+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
62841+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
62842+ &ikconfig_file_ops);
62843+#endif
62844+#else
62845 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
62846 &ikconfig_file_ops);
62847+#endif
62848+
62849 if (!entry)
62850 return -ENOMEM;
62851
62852diff --git a/kernel/cred.c b/kernel/cred.c
62853index 5791612..a3c04dc 100644
62854--- a/kernel/cred.c
62855+++ b/kernel/cred.c
62856@@ -204,6 +204,15 @@ void exit_creds(struct task_struct *tsk)
62857 validate_creds(cred);
62858 put_cred(cred);
62859 }
62860+
62861+#ifdef CONFIG_GRKERNSEC_SETXID
62862+ cred = (struct cred *) tsk->delayed_cred;
62863+ if (cred) {
62864+ tsk->delayed_cred = NULL;
62865+ validate_creds(cred);
62866+ put_cred(cred);
62867+ }
62868+#endif
62869 }
62870
62871 /**
62872@@ -470,7 +479,7 @@ error_put:
62873 * Always returns 0 thus allowing this function to be tail-called at the end
62874 * of, say, sys_setgid().
62875 */
62876-int commit_creds(struct cred *new)
62877+static int __commit_creds(struct cred *new)
62878 {
62879 struct task_struct *task = current;
62880 const struct cred *old = task->real_cred;
62881@@ -489,6 +498,8 @@ int commit_creds(struct cred *new)
62882
62883 get_cred(new); /* we will require a ref for the subj creds too */
62884
62885+ gr_set_role_label(task, new->uid, new->gid);
62886+
62887 /* dumpability changes */
62888 if (old->euid != new->euid ||
62889 old->egid != new->egid ||
62890@@ -538,6 +549,92 @@ int commit_creds(struct cred *new)
62891 put_cred(old);
62892 return 0;
62893 }
62894+#ifdef CONFIG_GRKERNSEC_SETXID
62895+extern int set_user(struct cred *new);
62896+
62897+void gr_delayed_cred_worker(void)
62898+{
62899+ const struct cred *new = current->delayed_cred;
62900+ struct cred *ncred;
62901+
62902+ current->delayed_cred = NULL;
62903+
62904+ if (current_uid() && new != NULL) {
62905+ // from doing get_cred on it when queueing this
62906+ put_cred(new);
62907+ return;
62908+ } else if (new == NULL)
62909+ return;
62910+
62911+ ncred = prepare_creds();
62912+ if (!ncred)
62913+ goto die;
62914+ // uids
62915+ ncred->uid = new->uid;
62916+ ncred->euid = new->euid;
62917+ ncred->suid = new->suid;
62918+ ncred->fsuid = new->fsuid;
62919+ // gids
62920+ ncred->gid = new->gid;
62921+ ncred->egid = new->egid;
62922+ ncred->sgid = new->sgid;
62923+ ncred->fsgid = new->fsgid;
62924+ // groups
62925+ if (set_groups(ncred, new->group_info) < 0) {
62926+ abort_creds(ncred);
62927+ goto die;
62928+ }
62929+ // caps
62930+ ncred->securebits = new->securebits;
62931+ ncred->cap_inheritable = new->cap_inheritable;
62932+ ncred->cap_permitted = new->cap_permitted;
62933+ ncred->cap_effective = new->cap_effective;
62934+ ncred->cap_bset = new->cap_bset;
62935+
62936+ if (set_user(ncred)) {
62937+ abort_creds(ncred);
62938+ goto die;
62939+ }
62940+
62941+ // from doing get_cred on it when queueing this
62942+ put_cred(new);
62943+
62944+ __commit_creds(ncred);
62945+ return;
62946+die:
62947+ // from doing get_cred on it when queueing this
62948+ put_cred(new);
62949+ do_group_exit(SIGKILL);
62950+}
62951+#endif
62952+
62953+int commit_creds(struct cred *new)
62954+{
62955+#ifdef CONFIG_GRKERNSEC_SETXID
62956+ struct task_struct *t;
62957+
62958+ /* we won't get called with tasklist_lock held for writing
62959+ and interrupts disabled as the cred struct in that case is
62960+ init_cred
62961+ */
62962+ if (grsec_enable_setxid && !current_is_single_threaded() &&
62963+ !current_uid() && new->uid) {
62964+ rcu_read_lock();
62965+ read_lock(&tasklist_lock);
62966+ for (t = next_thread(current); t != current;
62967+ t = next_thread(t)) {
62968+ if (t->delayed_cred == NULL) {
62969+ t->delayed_cred = get_cred(new);
62970+ set_tsk_need_resched(t);
62971+ }
62972+ }
62973+ read_unlock(&tasklist_lock);
62974+ rcu_read_unlock();
62975+ }
62976+#endif
62977+ return __commit_creds(new);
62978+}
62979+
62980 EXPORT_SYMBOL(commit_creds);
62981
62982 /**
62983diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
62984index 0d7c087..01b8cef 100644
62985--- a/kernel/debug/debug_core.c
62986+++ b/kernel/debug/debug_core.c
62987@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
62988 */
62989 static atomic_t masters_in_kgdb;
62990 static atomic_t slaves_in_kgdb;
62991-static atomic_t kgdb_break_tasklet_var;
62992+static atomic_unchecked_t kgdb_break_tasklet_var;
62993 atomic_t kgdb_setting_breakpoint;
62994
62995 struct task_struct *kgdb_usethread;
62996@@ -129,7 +129,7 @@ int kgdb_single_step;
62997 static pid_t kgdb_sstep_pid;
62998
62999 /* to keep track of the CPU which is doing the single stepping*/
63000-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
63001+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
63002
63003 /*
63004 * If you are debugging a problem where roundup (the collection of
63005@@ -542,7 +542,7 @@ return_normal:
63006 * kernel will only try for the value of sstep_tries before
63007 * giving up and continuing on.
63008 */
63009- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
63010+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
63011 (kgdb_info[cpu].task &&
63012 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
63013 atomic_set(&kgdb_active, -1);
63014@@ -636,8 +636,8 @@ cpu_master_loop:
63015 }
63016
63017 kgdb_restore:
63018- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
63019- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
63020+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
63021+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
63022 if (kgdb_info[sstep_cpu].task)
63023 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
63024 else
63025@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(void)
63026 static void kgdb_tasklet_bpt(unsigned long ing)
63027 {
63028 kgdb_breakpoint();
63029- atomic_set(&kgdb_break_tasklet_var, 0);
63030+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
63031 }
63032
63033 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
63034
63035 void kgdb_schedule_breakpoint(void)
63036 {
63037- if (atomic_read(&kgdb_break_tasklet_var) ||
63038+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
63039 atomic_read(&kgdb_active) != -1 ||
63040 atomic_read(&kgdb_setting_breakpoint))
63041 return;
63042- atomic_inc(&kgdb_break_tasklet_var);
63043+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
63044 tasklet_schedule(&kgdb_tasklet_breakpoint);
63045 }
63046 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
63047diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
63048index 63786e7..0780cac 100644
63049--- a/kernel/debug/kdb/kdb_main.c
63050+++ b/kernel/debug/kdb/kdb_main.c
63051@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
63052 list_for_each_entry(mod, kdb_modules, list) {
63053
63054 kdb_printf("%-20s%8u 0x%p ", mod->name,
63055- mod->core_size, (void *)mod);
63056+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
63057 #ifdef CONFIG_MODULE_UNLOAD
63058 kdb_printf("%4d ", module_refcount(mod));
63059 #endif
63060@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
63061 kdb_printf(" (Loading)");
63062 else
63063 kdb_printf(" (Live)");
63064- kdb_printf(" 0x%p", mod->module_core);
63065+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
63066
63067 #ifdef CONFIG_MODULE_UNLOAD
63068 {
63069diff --git a/kernel/events/core.c b/kernel/events/core.c
63070index 58690af..d903d75 100644
63071--- a/kernel/events/core.c
63072+++ b/kernel/events/core.c
63073@@ -173,7 +173,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
63074 return 0;
63075 }
63076
63077-static atomic64_t perf_event_id;
63078+static atomic64_unchecked_t perf_event_id;
63079
63080 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
63081 enum event_type_t event_type);
63082@@ -2540,7 +2540,7 @@ static void __perf_event_read(void *info)
63083
63084 static inline u64 perf_event_count(struct perf_event *event)
63085 {
63086- return local64_read(&event->count) + atomic64_read(&event->child_count);
63087+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
63088 }
63089
63090 static u64 perf_event_read(struct perf_event *event)
63091@@ -3065,9 +3065,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
63092 mutex_lock(&event->child_mutex);
63093 total += perf_event_read(event);
63094 *enabled += event->total_time_enabled +
63095- atomic64_read(&event->child_total_time_enabled);
63096+ atomic64_read_unchecked(&event->child_total_time_enabled);
63097 *running += event->total_time_running +
63098- atomic64_read(&event->child_total_time_running);
63099+ atomic64_read_unchecked(&event->child_total_time_running);
63100
63101 list_for_each_entry(child, &event->child_list, child_list) {
63102 total += perf_event_read(child);
63103@@ -3474,10 +3474,10 @@ void perf_event_update_userpage(struct perf_event *event)
63104 userpg->offset -= local64_read(&event->hw.prev_count);
63105
63106 userpg->time_enabled = enabled +
63107- atomic64_read(&event->child_total_time_enabled);
63108+ atomic64_read_unchecked(&event->child_total_time_enabled);
63109
63110 userpg->time_running = running +
63111- atomic64_read(&event->child_total_time_running);
63112+ atomic64_read_unchecked(&event->child_total_time_running);
63113
63114 barrier();
63115 ++userpg->lock;
63116@@ -3906,11 +3906,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
63117 values[n++] = perf_event_count(event);
63118 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
63119 values[n++] = enabled +
63120- atomic64_read(&event->child_total_time_enabled);
63121+ atomic64_read_unchecked(&event->child_total_time_enabled);
63122 }
63123 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
63124 values[n++] = running +
63125- atomic64_read(&event->child_total_time_running);
63126+ atomic64_read_unchecked(&event->child_total_time_running);
63127 }
63128 if (read_format & PERF_FORMAT_ID)
63129 values[n++] = primary_event_id(event);
63130@@ -4561,12 +4561,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
63131 * need to add enough zero bytes after the string to handle
63132 * the 64bit alignment we do later.
63133 */
63134- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
63135+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
63136 if (!buf) {
63137 name = strncpy(tmp, "//enomem", sizeof(tmp));
63138 goto got_name;
63139 }
63140- name = d_path(&file->f_path, buf, PATH_MAX);
63141+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
63142 if (IS_ERR(name)) {
63143 name = strncpy(tmp, "//toolong", sizeof(tmp));
63144 goto got_name;
63145@@ -5921,7 +5921,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
63146 event->parent = parent_event;
63147
63148 event->ns = get_pid_ns(current->nsproxy->pid_ns);
63149- event->id = atomic64_inc_return(&perf_event_id);
63150+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
63151
63152 event->state = PERF_EVENT_STATE_INACTIVE;
63153
63154@@ -6443,10 +6443,10 @@ static void sync_child_event(struct perf_event *child_event,
63155 /*
63156 * Add back the child's count to the parent's count:
63157 */
63158- atomic64_add(child_val, &parent_event->child_count);
63159- atomic64_add(child_event->total_time_enabled,
63160+ atomic64_add_unchecked(child_val, &parent_event->child_count);
63161+ atomic64_add_unchecked(child_event->total_time_enabled,
63162 &parent_event->child_total_time_enabled);
63163- atomic64_add(child_event->total_time_running,
63164+ atomic64_add_unchecked(child_event->total_time_running,
63165 &parent_event->child_total_time_running);
63166
63167 /*
63168diff --git a/kernel/exit.c b/kernel/exit.c
63169index e6e01b9..619f837 100644
63170--- a/kernel/exit.c
63171+++ b/kernel/exit.c
63172@@ -57,6 +57,10 @@
63173 #include <asm/pgtable.h>
63174 #include <asm/mmu_context.h>
63175
63176+#ifdef CONFIG_GRKERNSEC
63177+extern rwlock_t grsec_exec_file_lock;
63178+#endif
63179+
63180 static void exit_mm(struct task_struct * tsk);
63181
63182 static void __unhash_process(struct task_struct *p, bool group_dead)
63183@@ -168,6 +172,10 @@ void release_task(struct task_struct * p)
63184 struct task_struct *leader;
63185 int zap_leader;
63186 repeat:
63187+#ifdef CONFIG_NET
63188+ gr_del_task_from_ip_table(p);
63189+#endif
63190+
63191 /* don't need to get the RCU readlock here - the process is dead and
63192 * can't be modifying its own credentials. But shut RCU-lockdep up */
63193 rcu_read_lock();
63194@@ -380,7 +388,7 @@ int allow_signal(int sig)
63195 * know it'll be handled, so that they don't get converted to
63196 * SIGKILL or just silently dropped.
63197 */
63198- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
63199+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
63200 recalc_sigpending();
63201 spin_unlock_irq(&current->sighand->siglock);
63202 return 0;
63203@@ -416,6 +424,17 @@ void daemonize(const char *name, ...)
63204 vsnprintf(current->comm, sizeof(current->comm), name, args);
63205 va_end(args);
63206
63207+#ifdef CONFIG_GRKERNSEC
63208+ write_lock(&grsec_exec_file_lock);
63209+ if (current->exec_file) {
63210+ fput(current->exec_file);
63211+ current->exec_file = NULL;
63212+ }
63213+ write_unlock(&grsec_exec_file_lock);
63214+#endif
63215+
63216+ gr_set_kernel_label(current);
63217+
63218 /*
63219 * If we were started as result of loading a module, close all of the
63220 * user space pages. We don't need them, and if we didn't close them
63221@@ -893,6 +912,8 @@ NORET_TYPE void do_exit(long code)
63222 struct task_struct *tsk = current;
63223 int group_dead;
63224
63225+ set_fs(USER_DS);
63226+
63227 profile_task_exit(tsk);
63228
63229 WARN_ON(blk_needs_flush_plug(tsk));
63230@@ -909,7 +930,6 @@ NORET_TYPE void do_exit(long code)
63231 * mm_release()->clear_child_tid() from writing to a user-controlled
63232 * kernel address.
63233 */
63234- set_fs(USER_DS);
63235
63236 ptrace_event(PTRACE_EVENT_EXIT, code);
63237
63238@@ -971,6 +991,9 @@ NORET_TYPE void do_exit(long code)
63239 tsk->exit_code = code;
63240 taskstats_exit(tsk, group_dead);
63241
63242+ gr_acl_handle_psacct(tsk, code);
63243+ gr_acl_handle_exit();
63244+
63245 exit_mm(tsk);
63246
63247 if (group_dead)
63248diff --git a/kernel/fork.c b/kernel/fork.c
63249index da4a6a1..0973380 100644
63250--- a/kernel/fork.c
63251+++ b/kernel/fork.c
63252@@ -280,7 +280,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
63253 *stackend = STACK_END_MAGIC; /* for overflow detection */
63254
63255 #ifdef CONFIG_CC_STACKPROTECTOR
63256- tsk->stack_canary = get_random_int();
63257+ tsk->stack_canary = pax_get_random_long();
63258 #endif
63259
63260 /*
63261@@ -304,13 +304,77 @@ out:
63262 }
63263
63264 #ifdef CONFIG_MMU
63265+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
63266+{
63267+ struct vm_area_struct *tmp;
63268+ unsigned long charge;
63269+ struct mempolicy *pol;
63270+ struct file *file;
63271+
63272+ charge = 0;
63273+ if (mpnt->vm_flags & VM_ACCOUNT) {
63274+ unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
63275+ if (security_vm_enough_memory(len))
63276+ goto fail_nomem;
63277+ charge = len;
63278+ }
63279+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
63280+ if (!tmp)
63281+ goto fail_nomem;
63282+ *tmp = *mpnt;
63283+ tmp->vm_mm = mm;
63284+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
63285+ pol = mpol_dup(vma_policy(mpnt));
63286+ if (IS_ERR(pol))
63287+ goto fail_nomem_policy;
63288+ vma_set_policy(tmp, pol);
63289+ if (anon_vma_fork(tmp, mpnt))
63290+ goto fail_nomem_anon_vma_fork;
63291+ tmp->vm_flags &= ~VM_LOCKED;
63292+ tmp->vm_next = tmp->vm_prev = NULL;
63293+ tmp->vm_mirror = NULL;
63294+ file = tmp->vm_file;
63295+ if (file) {
63296+ struct inode *inode = file->f_path.dentry->d_inode;
63297+ struct address_space *mapping = file->f_mapping;
63298+
63299+ get_file(file);
63300+ if (tmp->vm_flags & VM_DENYWRITE)
63301+ atomic_dec(&inode->i_writecount);
63302+ mutex_lock(&mapping->i_mmap_mutex);
63303+ if (tmp->vm_flags & VM_SHARED)
63304+ mapping->i_mmap_writable++;
63305+ flush_dcache_mmap_lock(mapping);
63306+ /* insert tmp into the share list, just after mpnt */
63307+ vma_prio_tree_add(tmp, mpnt);
63308+ flush_dcache_mmap_unlock(mapping);
63309+ mutex_unlock(&mapping->i_mmap_mutex);
63310+ }
63311+
63312+ /*
63313+ * Clear hugetlb-related page reserves for children. This only
63314+ * affects MAP_PRIVATE mappings. Faults generated by the child
63315+ * are not guaranteed to succeed, even if read-only
63316+ */
63317+ if (is_vm_hugetlb_page(tmp))
63318+ reset_vma_resv_huge_pages(tmp);
63319+
63320+ return tmp;
63321+
63322+fail_nomem_anon_vma_fork:
63323+ mpol_put(pol);
63324+fail_nomem_policy:
63325+ kmem_cache_free(vm_area_cachep, tmp);
63326+fail_nomem:
63327+ vm_unacct_memory(charge);
63328+ return NULL;
63329+}
63330+
63331 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63332 {
63333 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
63334 struct rb_node **rb_link, *rb_parent;
63335 int retval;
63336- unsigned long charge;
63337- struct mempolicy *pol;
63338
63339 down_write(&oldmm->mmap_sem);
63340 flush_cache_dup_mm(oldmm);
63341@@ -322,8 +386,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63342 mm->locked_vm = 0;
63343 mm->mmap = NULL;
63344 mm->mmap_cache = NULL;
63345- mm->free_area_cache = oldmm->mmap_base;
63346- mm->cached_hole_size = ~0UL;
63347+ mm->free_area_cache = oldmm->free_area_cache;
63348+ mm->cached_hole_size = oldmm->cached_hole_size;
63349 mm->map_count = 0;
63350 cpumask_clear(mm_cpumask(mm));
63351 mm->mm_rb = RB_ROOT;
63352@@ -339,8 +403,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63353
63354 prev = NULL;
63355 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
63356- struct file *file;
63357-
63358 if (mpnt->vm_flags & VM_DONTCOPY) {
63359 long pages = vma_pages(mpnt);
63360 mm->total_vm -= pages;
63361@@ -348,53 +410,11 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63362 -pages);
63363 continue;
63364 }
63365- charge = 0;
63366- if (mpnt->vm_flags & VM_ACCOUNT) {
63367- unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
63368- if (security_vm_enough_memory(len))
63369- goto fail_nomem;
63370- charge = len;
63371+ tmp = dup_vma(mm, mpnt);
63372+ if (!tmp) {
63373+ retval = -ENOMEM;
63374+ goto out;
63375 }
63376- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
63377- if (!tmp)
63378- goto fail_nomem;
63379- *tmp = *mpnt;
63380- INIT_LIST_HEAD(&tmp->anon_vma_chain);
63381- pol = mpol_dup(vma_policy(mpnt));
63382- retval = PTR_ERR(pol);
63383- if (IS_ERR(pol))
63384- goto fail_nomem_policy;
63385- vma_set_policy(tmp, pol);
63386- tmp->vm_mm = mm;
63387- if (anon_vma_fork(tmp, mpnt))
63388- goto fail_nomem_anon_vma_fork;
63389- tmp->vm_flags &= ~VM_LOCKED;
63390- tmp->vm_next = tmp->vm_prev = NULL;
63391- file = tmp->vm_file;
63392- if (file) {
63393- struct inode *inode = file->f_path.dentry->d_inode;
63394- struct address_space *mapping = file->f_mapping;
63395-
63396- get_file(file);
63397- if (tmp->vm_flags & VM_DENYWRITE)
63398- atomic_dec(&inode->i_writecount);
63399- mutex_lock(&mapping->i_mmap_mutex);
63400- if (tmp->vm_flags & VM_SHARED)
63401- mapping->i_mmap_writable++;
63402- flush_dcache_mmap_lock(mapping);
63403- /* insert tmp into the share list, just after mpnt */
63404- vma_prio_tree_add(tmp, mpnt);
63405- flush_dcache_mmap_unlock(mapping);
63406- mutex_unlock(&mapping->i_mmap_mutex);
63407- }
63408-
63409- /*
63410- * Clear hugetlb-related page reserves for children. This only
63411- * affects MAP_PRIVATE mappings. Faults generated by the child
63412- * are not guaranteed to succeed, even if read-only
63413- */
63414- if (is_vm_hugetlb_page(tmp))
63415- reset_vma_resv_huge_pages(tmp);
63416
63417 /*
63418 * Link in the new vma and copy the page table entries.
63419@@ -417,6 +437,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63420 if (retval)
63421 goto out;
63422 }
63423+
63424+#ifdef CONFIG_PAX_SEGMEXEC
63425+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
63426+ struct vm_area_struct *mpnt_m;
63427+
63428+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
63429+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
63430+
63431+ if (!mpnt->vm_mirror)
63432+ continue;
63433+
63434+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
63435+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
63436+ mpnt->vm_mirror = mpnt_m;
63437+ } else {
63438+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
63439+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
63440+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
63441+ mpnt->vm_mirror->vm_mirror = mpnt;
63442+ }
63443+ }
63444+ BUG_ON(mpnt_m);
63445+ }
63446+#endif
63447+
63448 /* a new mm has just been created */
63449 arch_dup_mmap(oldmm, mm);
63450 retval = 0;
63451@@ -425,14 +470,6 @@ out:
63452 flush_tlb_mm(oldmm);
63453 up_write(&oldmm->mmap_sem);
63454 return retval;
63455-fail_nomem_anon_vma_fork:
63456- mpol_put(pol);
63457-fail_nomem_policy:
63458- kmem_cache_free(vm_area_cachep, tmp);
63459-fail_nomem:
63460- retval = -ENOMEM;
63461- vm_unacct_memory(charge);
63462- goto out;
63463 }
63464
63465 static inline int mm_alloc_pgd(struct mm_struct *mm)
63466@@ -644,6 +681,26 @@ struct mm_struct *get_task_mm(struct task_struct *task)
63467 }
63468 EXPORT_SYMBOL_GPL(get_task_mm);
63469
63470+struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
63471+{
63472+ struct mm_struct *mm;
63473+ int err;
63474+
63475+ err = mutex_lock_killable(&task->signal->cred_guard_mutex);
63476+ if (err)
63477+ return ERR_PTR(err);
63478+
63479+ mm = get_task_mm(task);
63480+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
63481+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
63482+ mmput(mm);
63483+ mm = ERR_PTR(-EACCES);
63484+ }
63485+ mutex_unlock(&task->signal->cred_guard_mutex);
63486+
63487+ return mm;
63488+}
63489+
63490 /* Please note the differences between mmput and mm_release.
63491 * mmput is called whenever we stop holding onto a mm_struct,
63492 * error success whatever.
63493@@ -829,13 +886,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
63494 spin_unlock(&fs->lock);
63495 return -EAGAIN;
63496 }
63497- fs->users++;
63498+ atomic_inc(&fs->users);
63499 spin_unlock(&fs->lock);
63500 return 0;
63501 }
63502 tsk->fs = copy_fs_struct(fs);
63503 if (!tsk->fs)
63504 return -ENOMEM;
63505+ gr_set_chroot_entries(tsk, &tsk->fs->root);
63506 return 0;
63507 }
63508
63509@@ -1097,6 +1155,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
63510 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
63511 #endif
63512 retval = -EAGAIN;
63513+
63514+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
63515+
63516 if (atomic_read(&p->real_cred->user->processes) >=
63517 task_rlimit(p, RLIMIT_NPROC)) {
63518 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
63519@@ -1256,6 +1317,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
63520 if (clone_flags & CLONE_THREAD)
63521 p->tgid = current->tgid;
63522
63523+ gr_copy_label(p);
63524+
63525 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
63526 /*
63527 * Clear TID on mm_release()?
63528@@ -1418,6 +1481,8 @@ bad_fork_cleanup_count:
63529 bad_fork_free:
63530 free_task(p);
63531 fork_out:
63532+ gr_log_forkfail(retval);
63533+
63534 return ERR_PTR(retval);
63535 }
63536
63537@@ -1518,6 +1583,8 @@ long do_fork(unsigned long clone_flags,
63538 if (clone_flags & CLONE_PARENT_SETTID)
63539 put_user(nr, parent_tidptr);
63540
63541+ gr_handle_brute_check();
63542+
63543 if (clone_flags & CLONE_VFORK) {
63544 p->vfork_done = &vfork;
63545 init_completion(&vfork);
63546@@ -1627,7 +1694,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
63547 return 0;
63548
63549 /* don't need lock here; in the worst case we'll do useless copy */
63550- if (fs->users == 1)
63551+ if (atomic_read(&fs->users) == 1)
63552 return 0;
63553
63554 *new_fsp = copy_fs_struct(fs);
63555@@ -1716,7 +1783,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
63556 fs = current->fs;
63557 spin_lock(&fs->lock);
63558 current->fs = new_fs;
63559- if (--fs->users)
63560+ gr_set_chroot_entries(current, &current->fs->root);
63561+ if (atomic_dec_return(&fs->users))
63562 new_fs = NULL;
63563 else
63564 new_fs = fs;
63565diff --git a/kernel/futex.c b/kernel/futex.c
63566index 1614be2..37abc7e 100644
63567--- a/kernel/futex.c
63568+++ b/kernel/futex.c
63569@@ -54,6 +54,7 @@
63570 #include <linux/mount.h>
63571 #include <linux/pagemap.h>
63572 #include <linux/syscalls.h>
63573+#include <linux/ptrace.h>
63574 #include <linux/signal.h>
63575 #include <linux/export.h>
63576 #include <linux/magic.h>
63577@@ -238,6 +239,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
63578 struct page *page, *page_head;
63579 int err, ro = 0;
63580
63581+#ifdef CONFIG_PAX_SEGMEXEC
63582+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
63583+ return -EFAULT;
63584+#endif
63585+
63586 /*
63587 * The futex address must be "naturally" aligned.
63588 */
63589@@ -2459,6 +2465,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
63590 if (!p)
63591 goto err_unlock;
63592 ret = -EPERM;
63593+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63594+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
63595+ goto err_unlock;
63596+#endif
63597 pcred = __task_cred(p);
63598 /* If victim is in different user_ns, then uids are not
63599 comparable, so we must have CAP_SYS_PTRACE */
63600@@ -2724,6 +2734,7 @@ static int __init futex_init(void)
63601 {
63602 u32 curval;
63603 int i;
63604+ mm_segment_t oldfs;
63605
63606 /*
63607 * This will fail and we want it. Some arch implementations do
63608@@ -2735,8 +2746,11 @@ static int __init futex_init(void)
63609 * implementation, the non-functional ones will return
63610 * -ENOSYS.
63611 */
63612+ oldfs = get_fs();
63613+ set_fs(USER_DS);
63614 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
63615 futex_cmpxchg_enabled = 1;
63616+ set_fs(oldfs);
63617
63618 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
63619 plist_head_init(&futex_queues[i].chain);
63620diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
63621index 5f9e689..582d46d 100644
63622--- a/kernel/futex_compat.c
63623+++ b/kernel/futex_compat.c
63624@@ -10,6 +10,7 @@
63625 #include <linux/compat.h>
63626 #include <linux/nsproxy.h>
63627 #include <linux/futex.h>
63628+#include <linux/ptrace.h>
63629
63630 #include <asm/uaccess.h>
63631
63632@@ -136,7 +137,8 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
63633 {
63634 struct compat_robust_list_head __user *head;
63635 unsigned long ret;
63636- const struct cred *cred = current_cred(), *pcred;
63637+ const struct cred *cred = current_cred();
63638+ const struct cred *pcred;
63639
63640 if (!futex_cmpxchg_enabled)
63641 return -ENOSYS;
63642@@ -152,6 +154,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
63643 if (!p)
63644 goto err_unlock;
63645 ret = -EPERM;
63646+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63647+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
63648+ goto err_unlock;
63649+#endif
63650 pcred = __task_cred(p);
63651 /* If victim is in different user_ns, then uids are not
63652 comparable, so we must have CAP_SYS_PTRACE */
63653diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
63654index 9b22d03..6295b62 100644
63655--- a/kernel/gcov/base.c
63656+++ b/kernel/gcov/base.c
63657@@ -102,11 +102,6 @@ void gcov_enable_events(void)
63658 }
63659
63660 #ifdef CONFIG_MODULES
63661-static inline int within(void *addr, void *start, unsigned long size)
63662-{
63663- return ((addr >= start) && (addr < start + size));
63664-}
63665-
63666 /* Update list and generate events when modules are unloaded. */
63667 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
63668 void *data)
63669@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
63670 prev = NULL;
63671 /* Remove entries located in module from linked list. */
63672 for (info = gcov_info_head; info; info = info->next) {
63673- if (within(info, mod->module_core, mod->core_size)) {
63674+ if (within_module_core_rw((unsigned long)info, mod)) {
63675 if (prev)
63676 prev->next = info->next;
63677 else
63678diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
63679index ae34bf5..4e2f3d0 100644
63680--- a/kernel/hrtimer.c
63681+++ b/kernel/hrtimer.c
63682@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
63683 local_irq_restore(flags);
63684 }
63685
63686-static void run_hrtimer_softirq(struct softirq_action *h)
63687+static void run_hrtimer_softirq(void)
63688 {
63689 hrtimer_peek_ahead_timers();
63690 }
63691diff --git a/kernel/jump_label.c b/kernel/jump_label.c
63692index 66ff710..05a5128 100644
63693--- a/kernel/jump_label.c
63694+++ b/kernel/jump_label.c
63695@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
63696
63697 size = (((unsigned long)stop - (unsigned long)start)
63698 / sizeof(struct jump_entry));
63699+ pax_open_kernel();
63700 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
63701+ pax_close_kernel();
63702 }
63703
63704 static void jump_label_update(struct jump_label_key *key, int enable);
63705@@ -303,10 +305,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
63706 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
63707 struct jump_entry *iter;
63708
63709+ pax_open_kernel();
63710 for (iter = iter_start; iter < iter_stop; iter++) {
63711 if (within_module_init(iter->code, mod))
63712 iter->code = 0;
63713 }
63714+ pax_close_kernel();
63715 }
63716
63717 static int
63718diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
63719index 079f1d3..a407562 100644
63720--- a/kernel/kallsyms.c
63721+++ b/kernel/kallsyms.c
63722@@ -11,6 +11,9 @@
63723 * Changed the compression method from stem compression to "table lookup"
63724 * compression (see scripts/kallsyms.c for a more complete description)
63725 */
63726+#ifdef CONFIG_GRKERNSEC_HIDESYM
63727+#define __INCLUDED_BY_HIDESYM 1
63728+#endif
63729 #include <linux/kallsyms.h>
63730 #include <linux/module.h>
63731 #include <linux/init.h>
63732@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
63733
63734 static inline int is_kernel_inittext(unsigned long addr)
63735 {
63736+ if (system_state != SYSTEM_BOOTING)
63737+ return 0;
63738+
63739 if (addr >= (unsigned long)_sinittext
63740 && addr <= (unsigned long)_einittext)
63741 return 1;
63742 return 0;
63743 }
63744
63745+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
63746+#ifdef CONFIG_MODULES
63747+static inline int is_module_text(unsigned long addr)
63748+{
63749+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
63750+ return 1;
63751+
63752+ addr = ktla_ktva(addr);
63753+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
63754+}
63755+#else
63756+static inline int is_module_text(unsigned long addr)
63757+{
63758+ return 0;
63759+}
63760+#endif
63761+#endif
63762+
63763 static inline int is_kernel_text(unsigned long addr)
63764 {
63765 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
63766@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
63767
63768 static inline int is_kernel(unsigned long addr)
63769 {
63770+
63771+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
63772+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
63773+ return 1;
63774+
63775+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
63776+#else
63777 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
63778+#endif
63779+
63780 return 1;
63781 return in_gate_area_no_mm(addr);
63782 }
63783
63784 static int is_ksym_addr(unsigned long addr)
63785 {
63786+
63787+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
63788+ if (is_module_text(addr))
63789+ return 0;
63790+#endif
63791+
63792 if (all_var)
63793 return is_kernel(addr);
63794
63795@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
63796
63797 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
63798 {
63799- iter->name[0] = '\0';
63800 iter->nameoff = get_symbol_offset(new_pos);
63801 iter->pos = new_pos;
63802 }
63803@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, void *p)
63804 {
63805 struct kallsym_iter *iter = m->private;
63806
63807+#ifdef CONFIG_GRKERNSEC_HIDESYM
63808+ if (current_uid())
63809+ return 0;
63810+#endif
63811+
63812 /* Some debugging symbols have no name. Ignore them. */
63813 if (!iter->name[0])
63814 return 0;
63815@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
63816 struct kallsym_iter *iter;
63817 int ret;
63818
63819- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
63820+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
63821 if (!iter)
63822 return -ENOMEM;
63823 reset_iter(iter, 0);
63824diff --git a/kernel/kexec.c b/kernel/kexec.c
63825index dc7bc08..4601964 100644
63826--- a/kernel/kexec.c
63827+++ b/kernel/kexec.c
63828@@ -1048,7 +1048,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
63829 unsigned long flags)
63830 {
63831 struct compat_kexec_segment in;
63832- struct kexec_segment out, __user *ksegments;
63833+ struct kexec_segment out;
63834+ struct kexec_segment __user *ksegments;
63835 unsigned long i, result;
63836
63837 /* Don't allow clients that don't understand the native
63838diff --git a/kernel/kmod.c b/kernel/kmod.c
63839index a4bea97..7a1ae9a 100644
63840--- a/kernel/kmod.c
63841+++ b/kernel/kmod.c
63842@@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
63843 * If module auto-loading support is disabled then this function
63844 * becomes a no-operation.
63845 */
63846-int __request_module(bool wait, const char *fmt, ...)
63847+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
63848 {
63849- va_list args;
63850 char module_name[MODULE_NAME_LEN];
63851 unsigned int max_modprobes;
63852 int ret;
63853- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
63854+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
63855 static char *envp[] = { "HOME=/",
63856 "TERM=linux",
63857 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
63858@@ -88,9 +87,7 @@ int __request_module(bool wait, const char *fmt, ...)
63859 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
63860 static int kmod_loop_msg;
63861
63862- va_start(args, fmt);
63863- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
63864- va_end(args);
63865+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
63866 if (ret >= MODULE_NAME_LEN)
63867 return -ENAMETOOLONG;
63868
63869@@ -98,6 +95,20 @@ int __request_module(bool wait, const char *fmt, ...)
63870 if (ret)
63871 return ret;
63872
63873+#ifdef CONFIG_GRKERNSEC_MODHARDEN
63874+ if (!current_uid()) {
63875+ /* hack to workaround consolekit/udisks stupidity */
63876+ read_lock(&tasklist_lock);
63877+ if (!strcmp(current->comm, "mount") &&
63878+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
63879+ read_unlock(&tasklist_lock);
63880+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
63881+ return -EPERM;
63882+ }
63883+ read_unlock(&tasklist_lock);
63884+ }
63885+#endif
63886+
63887 /* If modprobe needs a service that is in a module, we get a recursive
63888 * loop. Limit the number of running kmod threads to max_threads/2 or
63889 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
63890@@ -133,6 +144,47 @@ int __request_module(bool wait, const char *fmt, ...)
63891 atomic_dec(&kmod_concurrent);
63892 return ret;
63893 }
63894+
63895+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
63896+{
63897+ va_list args;
63898+ int ret;
63899+
63900+ va_start(args, fmt);
63901+ ret = ____request_module(wait, module_param, fmt, args);
63902+ va_end(args);
63903+
63904+ return ret;
63905+}
63906+
63907+int __request_module(bool wait, const char *fmt, ...)
63908+{
63909+ va_list args;
63910+ int ret;
63911+
63912+#ifdef CONFIG_GRKERNSEC_MODHARDEN
63913+ if (current_uid()) {
63914+ char module_param[MODULE_NAME_LEN];
63915+
63916+ memset(module_param, 0, sizeof(module_param));
63917+
63918+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
63919+
63920+ va_start(args, fmt);
63921+ ret = ____request_module(wait, module_param, fmt, args);
63922+ va_end(args);
63923+
63924+ return ret;
63925+ }
63926+#endif
63927+
63928+ va_start(args, fmt);
63929+ ret = ____request_module(wait, NULL, fmt, args);
63930+ va_end(args);
63931+
63932+ return ret;
63933+}
63934+
63935 EXPORT_SYMBOL(__request_module);
63936 #endif /* CONFIG_MODULES */
63937
63938@@ -222,7 +274,7 @@ static int wait_for_helper(void *data)
63939 *
63940 * Thus the __user pointer cast is valid here.
63941 */
63942- sys_wait4(pid, (int __user *)&ret, 0, NULL);
63943+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
63944
63945 /*
63946 * If ret is 0, either ____call_usermodehelper failed and the
63947diff --git a/kernel/kprobes.c b/kernel/kprobes.c
63948index 52fd049..3def6a8 100644
63949--- a/kernel/kprobes.c
63950+++ b/kernel/kprobes.c
63951@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
63952 * kernel image and loaded module images reside. This is required
63953 * so x86_64 can correctly handle the %rip-relative fixups.
63954 */
63955- kip->insns = module_alloc(PAGE_SIZE);
63956+ kip->insns = module_alloc_exec(PAGE_SIZE);
63957 if (!kip->insns) {
63958 kfree(kip);
63959 return NULL;
63960@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
63961 */
63962 if (!list_is_singular(&kip->list)) {
63963 list_del(&kip->list);
63964- module_free(NULL, kip->insns);
63965+ module_free_exec(NULL, kip->insns);
63966 kfree(kip);
63967 }
63968 return 1;
63969@@ -1949,7 +1949,7 @@ static int __init init_kprobes(void)
63970 {
63971 int i, err = 0;
63972 unsigned long offset = 0, size = 0;
63973- char *modname, namebuf[128];
63974+ char *modname, namebuf[KSYM_NAME_LEN];
63975 const char *symbol_name;
63976 void *addr;
63977 struct kprobe_blackpoint *kb;
63978@@ -2075,7 +2075,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
63979 const char *sym = NULL;
63980 unsigned int i = *(loff_t *) v;
63981 unsigned long offset = 0;
63982- char *modname, namebuf[128];
63983+ char *modname, namebuf[KSYM_NAME_LEN];
63984
63985 head = &kprobe_table[i];
63986 preempt_disable();
63987diff --git a/kernel/lockdep.c b/kernel/lockdep.c
63988index b2e08c9..01d8049 100644
63989--- a/kernel/lockdep.c
63990+++ b/kernel/lockdep.c
63991@@ -592,6 +592,10 @@ static int static_obj(void *obj)
63992 end = (unsigned long) &_end,
63993 addr = (unsigned long) obj;
63994
63995+#ifdef CONFIG_PAX_KERNEXEC
63996+ start = ktla_ktva(start);
63997+#endif
63998+
63999 /*
64000 * static variable?
64001 */
64002@@ -731,6 +735,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
64003 if (!static_obj(lock->key)) {
64004 debug_locks_off();
64005 printk("INFO: trying to register non-static key.\n");
64006+ printk("lock:%pS key:%pS.\n", lock, lock->key);
64007 printk("the code is fine but needs lockdep annotation.\n");
64008 printk("turning off the locking correctness validator.\n");
64009 dump_stack();
64010@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
64011 if (!class)
64012 return 0;
64013 }
64014- atomic_inc((atomic_t *)&class->ops);
64015+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
64016 if (very_verbose(class)) {
64017 printk("\nacquire class [%p] %s", class->key, class->name);
64018 if (class->name_version > 1)
64019diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
64020index 91c32a0..b2c71c5 100644
64021--- a/kernel/lockdep_proc.c
64022+++ b/kernel/lockdep_proc.c
64023@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
64024
64025 static void print_name(struct seq_file *m, struct lock_class *class)
64026 {
64027- char str[128];
64028+ char str[KSYM_NAME_LEN];
64029 const char *name = class->name;
64030
64031 if (!name) {
64032diff --git a/kernel/module.c b/kernel/module.c
64033index 178333c..04e3408 100644
64034--- a/kernel/module.c
64035+++ b/kernel/module.c
64036@@ -58,6 +58,7 @@
64037 #include <linux/jump_label.h>
64038 #include <linux/pfn.h>
64039 #include <linux/bsearch.h>
64040+#include <linux/grsecurity.h>
64041
64042 #define CREATE_TRACE_POINTS
64043 #include <trace/events/module.h>
64044@@ -119,7 +120,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
64045
64046 /* Bounds of module allocation, for speeding __module_address.
64047 * Protected by module_mutex. */
64048-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
64049+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
64050+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
64051
64052 int register_module_notifier(struct notifier_block * nb)
64053 {
64054@@ -284,7 +286,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
64055 return true;
64056
64057 list_for_each_entry_rcu(mod, &modules, list) {
64058- struct symsearch arr[] = {
64059+ struct symsearch modarr[] = {
64060 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
64061 NOT_GPL_ONLY, false },
64062 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
64063@@ -306,7 +308,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
64064 #endif
64065 };
64066
64067- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
64068+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
64069 return true;
64070 }
64071 return false;
64072@@ -438,7 +440,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
64073 static int percpu_modalloc(struct module *mod,
64074 unsigned long size, unsigned long align)
64075 {
64076- if (align > PAGE_SIZE) {
64077+ if (align-1 >= PAGE_SIZE) {
64078 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
64079 mod->name, align, PAGE_SIZE);
64080 align = PAGE_SIZE;
64081@@ -1183,7 +1185,7 @@ resolve_symbol_wait(struct module *mod,
64082 */
64083 #ifdef CONFIG_SYSFS
64084
64085-#ifdef CONFIG_KALLSYMS
64086+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
64087 static inline bool sect_empty(const Elf_Shdr *sect)
64088 {
64089 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
64090@@ -1649,21 +1651,21 @@ static void set_section_ro_nx(void *base,
64091
64092 static void unset_module_core_ro_nx(struct module *mod)
64093 {
64094- set_page_attributes(mod->module_core + mod->core_text_size,
64095- mod->module_core + mod->core_size,
64096+ set_page_attributes(mod->module_core_rw,
64097+ mod->module_core_rw + mod->core_size_rw,
64098 set_memory_x);
64099- set_page_attributes(mod->module_core,
64100- mod->module_core + mod->core_ro_size,
64101+ set_page_attributes(mod->module_core_rx,
64102+ mod->module_core_rx + mod->core_size_rx,
64103 set_memory_rw);
64104 }
64105
64106 static void unset_module_init_ro_nx(struct module *mod)
64107 {
64108- set_page_attributes(mod->module_init + mod->init_text_size,
64109- mod->module_init + mod->init_size,
64110+ set_page_attributes(mod->module_init_rw,
64111+ mod->module_init_rw + mod->init_size_rw,
64112 set_memory_x);
64113- set_page_attributes(mod->module_init,
64114- mod->module_init + mod->init_ro_size,
64115+ set_page_attributes(mod->module_init_rx,
64116+ mod->module_init_rx + mod->init_size_rx,
64117 set_memory_rw);
64118 }
64119
64120@@ -1674,14 +1676,14 @@ void set_all_modules_text_rw(void)
64121
64122 mutex_lock(&module_mutex);
64123 list_for_each_entry_rcu(mod, &modules, list) {
64124- if ((mod->module_core) && (mod->core_text_size)) {
64125- set_page_attributes(mod->module_core,
64126- mod->module_core + mod->core_text_size,
64127+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
64128+ set_page_attributes(mod->module_core_rx,
64129+ mod->module_core_rx + mod->core_size_rx,
64130 set_memory_rw);
64131 }
64132- if ((mod->module_init) && (mod->init_text_size)) {
64133- set_page_attributes(mod->module_init,
64134- mod->module_init + mod->init_text_size,
64135+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
64136+ set_page_attributes(mod->module_init_rx,
64137+ mod->module_init_rx + mod->init_size_rx,
64138 set_memory_rw);
64139 }
64140 }
64141@@ -1695,14 +1697,14 @@ void set_all_modules_text_ro(void)
64142
64143 mutex_lock(&module_mutex);
64144 list_for_each_entry_rcu(mod, &modules, list) {
64145- if ((mod->module_core) && (mod->core_text_size)) {
64146- set_page_attributes(mod->module_core,
64147- mod->module_core + mod->core_text_size,
64148+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
64149+ set_page_attributes(mod->module_core_rx,
64150+ mod->module_core_rx + mod->core_size_rx,
64151 set_memory_ro);
64152 }
64153- if ((mod->module_init) && (mod->init_text_size)) {
64154- set_page_attributes(mod->module_init,
64155- mod->module_init + mod->init_text_size,
64156+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
64157+ set_page_attributes(mod->module_init_rx,
64158+ mod->module_init_rx + mod->init_size_rx,
64159 set_memory_ro);
64160 }
64161 }
64162@@ -1748,16 +1750,19 @@ static void free_module(struct module *mod)
64163
64164 /* This may be NULL, but that's OK */
64165 unset_module_init_ro_nx(mod);
64166- module_free(mod, mod->module_init);
64167+ module_free(mod, mod->module_init_rw);
64168+ module_free_exec(mod, mod->module_init_rx);
64169 kfree(mod->args);
64170 percpu_modfree(mod);
64171
64172 /* Free lock-classes: */
64173- lockdep_free_key_range(mod->module_core, mod->core_size);
64174+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
64175+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
64176
64177 /* Finally, free the core (containing the module structure) */
64178 unset_module_core_ro_nx(mod);
64179- module_free(mod, mod->module_core);
64180+ module_free_exec(mod, mod->module_core_rx);
64181+ module_free(mod, mod->module_core_rw);
64182
64183 #ifdef CONFIG_MPU
64184 update_protections(current->mm);
64185@@ -1826,10 +1831,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
64186 unsigned int i;
64187 int ret = 0;
64188 const struct kernel_symbol *ksym;
64189+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64190+ int is_fs_load = 0;
64191+ int register_filesystem_found = 0;
64192+ char *p;
64193+
64194+ p = strstr(mod->args, "grsec_modharden_fs");
64195+ if (p) {
64196+ char *endptr = p + strlen("grsec_modharden_fs");
64197+ /* copy \0 as well */
64198+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
64199+ is_fs_load = 1;
64200+ }
64201+#endif
64202
64203 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
64204 const char *name = info->strtab + sym[i].st_name;
64205
64206+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64207+ /* it's a real shame this will never get ripped and copied
64208+ upstream! ;(
64209+ */
64210+ if (is_fs_load && !strcmp(name, "register_filesystem"))
64211+ register_filesystem_found = 1;
64212+#endif
64213+
64214 switch (sym[i].st_shndx) {
64215 case SHN_COMMON:
64216 /* We compiled with -fno-common. These are not
64217@@ -1850,7 +1876,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
64218 ksym = resolve_symbol_wait(mod, info, name);
64219 /* Ok if resolved. */
64220 if (ksym && !IS_ERR(ksym)) {
64221+ pax_open_kernel();
64222 sym[i].st_value = ksym->value;
64223+ pax_close_kernel();
64224 break;
64225 }
64226
64227@@ -1869,11 +1897,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
64228 secbase = (unsigned long)mod_percpu(mod);
64229 else
64230 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
64231+ pax_open_kernel();
64232 sym[i].st_value += secbase;
64233+ pax_close_kernel();
64234 break;
64235 }
64236 }
64237
64238+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64239+ if (is_fs_load && !register_filesystem_found) {
64240+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
64241+ ret = -EPERM;
64242+ }
64243+#endif
64244+
64245 return ret;
64246 }
64247
64248@@ -1977,22 +2014,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
64249 || s->sh_entsize != ~0UL
64250 || strstarts(sname, ".init"))
64251 continue;
64252- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
64253+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
64254+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
64255+ else
64256+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
64257 DEBUGP("\t%s\n", name);
64258 }
64259- switch (m) {
64260- case 0: /* executable */
64261- mod->core_size = debug_align(mod->core_size);
64262- mod->core_text_size = mod->core_size;
64263- break;
64264- case 1: /* RO: text and ro-data */
64265- mod->core_size = debug_align(mod->core_size);
64266- mod->core_ro_size = mod->core_size;
64267- break;
64268- case 3: /* whole core */
64269- mod->core_size = debug_align(mod->core_size);
64270- break;
64271- }
64272 }
64273
64274 DEBUGP("Init section allocation order:\n");
64275@@ -2006,23 +2033,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
64276 || s->sh_entsize != ~0UL
64277 || !strstarts(sname, ".init"))
64278 continue;
64279- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
64280- | INIT_OFFSET_MASK);
64281+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
64282+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
64283+ else
64284+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
64285+ s->sh_entsize |= INIT_OFFSET_MASK;
64286 DEBUGP("\t%s\n", sname);
64287 }
64288- switch (m) {
64289- case 0: /* executable */
64290- mod->init_size = debug_align(mod->init_size);
64291- mod->init_text_size = mod->init_size;
64292- break;
64293- case 1: /* RO: text and ro-data */
64294- mod->init_size = debug_align(mod->init_size);
64295- mod->init_ro_size = mod->init_size;
64296- break;
64297- case 3: /* whole init */
64298- mod->init_size = debug_align(mod->init_size);
64299- break;
64300- }
64301 }
64302 }
64303
64304@@ -2187,7 +2204,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
64305
64306 /* Put symbol section at end of init part of module. */
64307 symsect->sh_flags |= SHF_ALLOC;
64308- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
64309+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
64310 info->index.sym) | INIT_OFFSET_MASK;
64311 DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
64312
64313@@ -2204,19 +2221,19 @@ static void layout_symtab(struct module *mod, struct load_info *info)
64314 }
64315
64316 /* Append room for core symbols at end of core part. */
64317- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
64318- mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
64319+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
64320+ mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
64321
64322 /* Put string table section at end of init part of module. */
64323 strsect->sh_flags |= SHF_ALLOC;
64324- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
64325+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
64326 info->index.str) | INIT_OFFSET_MASK;
64327 DEBUGP("\t%s\n", info->secstrings + strsect->sh_name);
64328
64329 /* Append room for core symbols' strings at end of core part. */
64330- info->stroffs = mod->core_size;
64331+ info->stroffs = mod->core_size_rx;
64332 __set_bit(0, info->strmap);
64333- mod->core_size += bitmap_weight(info->strmap, strsect->sh_size);
64334+ mod->core_size_rx += bitmap_weight(info->strmap, strsect->sh_size);
64335 }
64336
64337 static void add_kallsyms(struct module *mod, const struct load_info *info)
64338@@ -2232,11 +2249,13 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
64339 /* Make sure we get permanent strtab: don't use info->strtab. */
64340 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
64341
64342+ pax_open_kernel();
64343+
64344 /* Set types up while we still have access to sections. */
64345 for (i = 0; i < mod->num_symtab; i++)
64346 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
64347
64348- mod->core_symtab = dst = mod->module_core + info->symoffs;
64349+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
64350 src = mod->symtab;
64351 *dst = *src;
64352 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
64353@@ -2249,10 +2268,12 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
64354 }
64355 mod->core_num_syms = ndst;
64356
64357- mod->core_strtab = s = mod->module_core + info->stroffs;
64358+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
64359 for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
64360 if (test_bit(i, info->strmap))
64361 *++s = mod->strtab[i];
64362+
64363+ pax_close_kernel();
64364 }
64365 #else
64366 static inline void layout_symtab(struct module *mod, struct load_info *info)
64367@@ -2286,17 +2307,33 @@ void * __weak module_alloc(unsigned long size)
64368 return size == 0 ? NULL : vmalloc_exec(size);
64369 }
64370
64371-static void *module_alloc_update_bounds(unsigned long size)
64372+static void *module_alloc_update_bounds_rw(unsigned long size)
64373 {
64374 void *ret = module_alloc(size);
64375
64376 if (ret) {
64377 mutex_lock(&module_mutex);
64378 /* Update module bounds. */
64379- if ((unsigned long)ret < module_addr_min)
64380- module_addr_min = (unsigned long)ret;
64381- if ((unsigned long)ret + size > module_addr_max)
64382- module_addr_max = (unsigned long)ret + size;
64383+ if ((unsigned long)ret < module_addr_min_rw)
64384+ module_addr_min_rw = (unsigned long)ret;
64385+ if ((unsigned long)ret + size > module_addr_max_rw)
64386+ module_addr_max_rw = (unsigned long)ret + size;
64387+ mutex_unlock(&module_mutex);
64388+ }
64389+ return ret;
64390+}
64391+
64392+static void *module_alloc_update_bounds_rx(unsigned long size)
64393+{
64394+ void *ret = module_alloc_exec(size);
64395+
64396+ if (ret) {
64397+ mutex_lock(&module_mutex);
64398+ /* Update module bounds. */
64399+ if ((unsigned long)ret < module_addr_min_rx)
64400+ module_addr_min_rx = (unsigned long)ret;
64401+ if ((unsigned long)ret + size > module_addr_max_rx)
64402+ module_addr_max_rx = (unsigned long)ret + size;
64403 mutex_unlock(&module_mutex);
64404 }
64405 return ret;
64406@@ -2474,8 +2511,14 @@ static struct module *setup_load_info(struct load_info *info)
64407 static int check_modinfo(struct module *mod, struct load_info *info)
64408 {
64409 const char *modmagic = get_modinfo(info, "vermagic");
64410+ const char *license = get_modinfo(info, "license");
64411 int err;
64412
64413+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
64414+ if (!license || !license_is_gpl_compatible(license))
64415+ return -ENOEXEC;
64416+#endif
64417+
64418 /* This is allowed: modprobe --force will invalidate it. */
64419 if (!modmagic) {
64420 err = try_to_force_load(mod, "bad vermagic");
64421@@ -2498,7 +2541,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
64422 }
64423
64424 /* Set up license info based on the info section */
64425- set_license(mod, get_modinfo(info, "license"));
64426+ set_license(mod, license);
64427
64428 return 0;
64429 }
64430@@ -2592,7 +2635,7 @@ static int move_module(struct module *mod, struct load_info *info)
64431 void *ptr;
64432
64433 /* Do the allocs. */
64434- ptr = module_alloc_update_bounds(mod->core_size);
64435+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
64436 /*
64437 * The pointer to this block is stored in the module structure
64438 * which is inside the block. Just mark it as not being a
64439@@ -2602,23 +2645,50 @@ static int move_module(struct module *mod, struct load_info *info)
64440 if (!ptr)
64441 return -ENOMEM;
64442
64443- memset(ptr, 0, mod->core_size);
64444- mod->module_core = ptr;
64445+ memset(ptr, 0, mod->core_size_rw);
64446+ mod->module_core_rw = ptr;
64447
64448- ptr = module_alloc_update_bounds(mod->init_size);
64449+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
64450 /*
64451 * The pointer to this block is stored in the module structure
64452 * which is inside the block. This block doesn't need to be
64453 * scanned as it contains data and code that will be freed
64454 * after the module is initialized.
64455 */
64456- kmemleak_ignore(ptr);
64457- if (!ptr && mod->init_size) {
64458- module_free(mod, mod->module_core);
64459+ kmemleak_not_leak(ptr);
64460+ if (!ptr && mod->init_size_rw) {
64461+ module_free(mod, mod->module_core_rw);
64462 return -ENOMEM;
64463 }
64464- memset(ptr, 0, mod->init_size);
64465- mod->module_init = ptr;
64466+ memset(ptr, 0, mod->init_size_rw);
64467+ mod->module_init_rw = ptr;
64468+
64469+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
64470+ kmemleak_not_leak(ptr);
64471+ if (!ptr) {
64472+ module_free(mod, mod->module_init_rw);
64473+ module_free(mod, mod->module_core_rw);
64474+ return -ENOMEM;
64475+ }
64476+
64477+ pax_open_kernel();
64478+ memset(ptr, 0, mod->core_size_rx);
64479+ pax_close_kernel();
64480+ mod->module_core_rx = ptr;
64481+
64482+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
64483+ kmemleak_not_leak(ptr);
64484+ if (!ptr && mod->init_size_rx) {
64485+ module_free_exec(mod, mod->module_core_rx);
64486+ module_free(mod, mod->module_init_rw);
64487+ module_free(mod, mod->module_core_rw);
64488+ return -ENOMEM;
64489+ }
64490+
64491+ pax_open_kernel();
64492+ memset(ptr, 0, mod->init_size_rx);
64493+ pax_close_kernel();
64494+ mod->module_init_rx = ptr;
64495
64496 /* Transfer each section which specifies SHF_ALLOC */
64497 DEBUGP("final section addresses:\n");
64498@@ -2629,16 +2699,45 @@ static int move_module(struct module *mod, struct load_info *info)
64499 if (!(shdr->sh_flags & SHF_ALLOC))
64500 continue;
64501
64502- if (shdr->sh_entsize & INIT_OFFSET_MASK)
64503- dest = mod->module_init
64504- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
64505- else
64506- dest = mod->module_core + shdr->sh_entsize;
64507+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
64508+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
64509+ dest = mod->module_init_rw
64510+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
64511+ else
64512+ dest = mod->module_init_rx
64513+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
64514+ } else {
64515+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
64516+ dest = mod->module_core_rw + shdr->sh_entsize;
64517+ else
64518+ dest = mod->module_core_rx + shdr->sh_entsize;
64519+ }
64520+
64521+ if (shdr->sh_type != SHT_NOBITS) {
64522+
64523+#ifdef CONFIG_PAX_KERNEXEC
64524+#ifdef CONFIG_X86_64
64525+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
64526+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
64527+#endif
64528+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
64529+ pax_open_kernel();
64530+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
64531+ pax_close_kernel();
64532+ } else
64533+#endif
64534
64535- if (shdr->sh_type != SHT_NOBITS)
64536 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
64537+ }
64538 /* Update sh_addr to point to copy in image. */
64539- shdr->sh_addr = (unsigned long)dest;
64540+
64541+#ifdef CONFIG_PAX_KERNEXEC
64542+ if (shdr->sh_flags & SHF_EXECINSTR)
64543+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
64544+ else
64545+#endif
64546+
64547+ shdr->sh_addr = (unsigned long)dest;
64548 DEBUGP("\t0x%lx %s\n",
64549 shdr->sh_addr, info->secstrings + shdr->sh_name);
64550 }
64551@@ -2689,12 +2788,12 @@ static void flush_module_icache(const struct module *mod)
64552 * Do it before processing of module parameters, so the module
64553 * can provide parameter accessor functions of its own.
64554 */
64555- if (mod->module_init)
64556- flush_icache_range((unsigned long)mod->module_init,
64557- (unsigned long)mod->module_init
64558- + mod->init_size);
64559- flush_icache_range((unsigned long)mod->module_core,
64560- (unsigned long)mod->module_core + mod->core_size);
64561+ if (mod->module_init_rx)
64562+ flush_icache_range((unsigned long)mod->module_init_rx,
64563+ (unsigned long)mod->module_init_rx
64564+ + mod->init_size_rx);
64565+ flush_icache_range((unsigned long)mod->module_core_rx,
64566+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
64567
64568 set_fs(old_fs);
64569 }
64570@@ -2774,8 +2873,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
64571 {
64572 kfree(info->strmap);
64573 percpu_modfree(mod);
64574- module_free(mod, mod->module_init);
64575- module_free(mod, mod->module_core);
64576+ module_free_exec(mod, mod->module_init_rx);
64577+ module_free_exec(mod, mod->module_core_rx);
64578+ module_free(mod, mod->module_init_rw);
64579+ module_free(mod, mod->module_core_rw);
64580 }
64581
64582 int __weak module_finalize(const Elf_Ehdr *hdr,
64583@@ -2839,9 +2940,38 @@ static struct module *load_module(void __user *umod,
64584 if (err)
64585 goto free_unload;
64586
64587+ /* Now copy in args */
64588+ mod->args = strndup_user(uargs, ~0UL >> 1);
64589+ if (IS_ERR(mod->args)) {
64590+ err = PTR_ERR(mod->args);
64591+ goto free_unload;
64592+ }
64593+
64594 /* Set up MODINFO_ATTR fields */
64595 setup_modinfo(mod, &info);
64596
64597+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64598+ {
64599+ char *p, *p2;
64600+
64601+ if (strstr(mod->args, "grsec_modharden_netdev")) {
64602+ 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);
64603+ err = -EPERM;
64604+ goto free_modinfo;
64605+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
64606+ p += strlen("grsec_modharden_normal");
64607+ p2 = strstr(p, "_");
64608+ if (p2) {
64609+ *p2 = '\0';
64610+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
64611+ *p2 = '_';
64612+ }
64613+ err = -EPERM;
64614+ goto free_modinfo;
64615+ }
64616+ }
64617+#endif
64618+
64619 /* Fix up syms, so that st_value is a pointer to location. */
64620 err = simplify_symbols(mod, &info);
64621 if (err < 0)
64622@@ -2857,13 +2987,6 @@ static struct module *load_module(void __user *umod,
64623
64624 flush_module_icache(mod);
64625
64626- /* Now copy in args */
64627- mod->args = strndup_user(uargs, ~0UL >> 1);
64628- if (IS_ERR(mod->args)) {
64629- err = PTR_ERR(mod->args);
64630- goto free_arch_cleanup;
64631- }
64632-
64633 /* Mark state as coming so strong_try_module_get() ignores us. */
64634 mod->state = MODULE_STATE_COMING;
64635
64636@@ -2921,11 +3044,10 @@ static struct module *load_module(void __user *umod,
64637 unlock:
64638 mutex_unlock(&module_mutex);
64639 synchronize_sched();
64640- kfree(mod->args);
64641- free_arch_cleanup:
64642 module_arch_cleanup(mod);
64643 free_modinfo:
64644 free_modinfo(mod);
64645+ kfree(mod->args);
64646 free_unload:
64647 module_unload_free(mod);
64648 free_module:
64649@@ -2966,16 +3088,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
64650 MODULE_STATE_COMING, mod);
64651
64652 /* Set RO and NX regions for core */
64653- set_section_ro_nx(mod->module_core,
64654- mod->core_text_size,
64655- mod->core_ro_size,
64656- mod->core_size);
64657+ set_section_ro_nx(mod->module_core_rx,
64658+ mod->core_size_rx,
64659+ mod->core_size_rx,
64660+ mod->core_size_rx);
64661
64662 /* Set RO and NX regions for init */
64663- set_section_ro_nx(mod->module_init,
64664- mod->init_text_size,
64665- mod->init_ro_size,
64666- mod->init_size);
64667+ set_section_ro_nx(mod->module_init_rx,
64668+ mod->init_size_rx,
64669+ mod->init_size_rx,
64670+ mod->init_size_rx);
64671
64672 do_mod_ctors(mod);
64673 /* Start the module */
64674@@ -3021,11 +3143,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
64675 mod->strtab = mod->core_strtab;
64676 #endif
64677 unset_module_init_ro_nx(mod);
64678- module_free(mod, mod->module_init);
64679- mod->module_init = NULL;
64680- mod->init_size = 0;
64681- mod->init_ro_size = 0;
64682- mod->init_text_size = 0;
64683+ module_free(mod, mod->module_init_rw);
64684+ module_free_exec(mod, mod->module_init_rx);
64685+ mod->module_init_rw = NULL;
64686+ mod->module_init_rx = NULL;
64687+ mod->init_size_rw = 0;
64688+ mod->init_size_rx = 0;
64689 mutex_unlock(&module_mutex);
64690
64691 return 0;
64692@@ -3056,10 +3179,16 @@ static const char *get_ksymbol(struct module *mod,
64693 unsigned long nextval;
64694
64695 /* At worse, next value is at end of module */
64696- if (within_module_init(addr, mod))
64697- nextval = (unsigned long)mod->module_init+mod->init_text_size;
64698+ if (within_module_init_rx(addr, mod))
64699+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
64700+ else if (within_module_init_rw(addr, mod))
64701+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
64702+ else if (within_module_core_rx(addr, mod))
64703+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
64704+ else if (within_module_core_rw(addr, mod))
64705+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
64706 else
64707- nextval = (unsigned long)mod->module_core+mod->core_text_size;
64708+ return NULL;
64709
64710 /* Scan for closest preceding symbol, and next symbol. (ELF
64711 starts real symbols at 1). */
64712@@ -3307,7 +3436,7 @@ static int m_show(struct seq_file *m, void *p)
64713 char buf[8];
64714
64715 seq_printf(m, "%s %u",
64716- mod->name, mod->init_size + mod->core_size);
64717+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
64718 print_unload_info(m, mod);
64719
64720 /* Informative for users. */
64721@@ -3316,7 +3445,7 @@ static int m_show(struct seq_file *m, void *p)
64722 mod->state == MODULE_STATE_COMING ? "Loading":
64723 "Live");
64724 /* Used by oprofile and other similar tools. */
64725- seq_printf(m, " 0x%pK", mod->module_core);
64726+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
64727
64728 /* Taints info */
64729 if (mod->taints)
64730@@ -3352,7 +3481,17 @@ static const struct file_operations proc_modules_operations = {
64731
64732 static int __init proc_modules_init(void)
64733 {
64734+#ifndef CONFIG_GRKERNSEC_HIDESYM
64735+#ifdef CONFIG_GRKERNSEC_PROC_USER
64736+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
64737+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64738+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
64739+#else
64740 proc_create("modules", 0, NULL, &proc_modules_operations);
64741+#endif
64742+#else
64743+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
64744+#endif
64745 return 0;
64746 }
64747 module_init(proc_modules_init);
64748@@ -3411,12 +3550,12 @@ struct module *__module_address(unsigned long addr)
64749 {
64750 struct module *mod;
64751
64752- if (addr < module_addr_min || addr > module_addr_max)
64753+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
64754+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
64755 return NULL;
64756
64757 list_for_each_entry_rcu(mod, &modules, list)
64758- if (within_module_core(addr, mod)
64759- || within_module_init(addr, mod))
64760+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
64761 return mod;
64762 return NULL;
64763 }
64764@@ -3450,11 +3589,20 @@ bool is_module_text_address(unsigned long addr)
64765 */
64766 struct module *__module_text_address(unsigned long addr)
64767 {
64768- struct module *mod = __module_address(addr);
64769+ struct module *mod;
64770+
64771+#ifdef CONFIG_X86_32
64772+ addr = ktla_ktva(addr);
64773+#endif
64774+
64775+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
64776+ return NULL;
64777+
64778+ mod = __module_address(addr);
64779+
64780 if (mod) {
64781 /* Make sure it's within the text section. */
64782- if (!within(addr, mod->module_init, mod->init_text_size)
64783- && !within(addr, mod->module_core, mod->core_text_size))
64784+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
64785 mod = NULL;
64786 }
64787 return mod;
64788diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
64789index 7e3443f..b2a1e6b 100644
64790--- a/kernel/mutex-debug.c
64791+++ b/kernel/mutex-debug.c
64792@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
64793 }
64794
64795 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
64796- struct thread_info *ti)
64797+ struct task_struct *task)
64798 {
64799 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
64800
64801 /* Mark the current thread as blocked on the lock: */
64802- ti->task->blocked_on = waiter;
64803+ task->blocked_on = waiter;
64804 }
64805
64806 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
64807- struct thread_info *ti)
64808+ struct task_struct *task)
64809 {
64810 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
64811- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
64812- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
64813- ti->task->blocked_on = NULL;
64814+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
64815+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
64816+ task->blocked_on = NULL;
64817
64818 list_del_init(&waiter->list);
64819 waiter->task = NULL;
64820diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
64821index 0799fd3..d06ae3b 100644
64822--- a/kernel/mutex-debug.h
64823+++ b/kernel/mutex-debug.h
64824@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
64825 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
64826 extern void debug_mutex_add_waiter(struct mutex *lock,
64827 struct mutex_waiter *waiter,
64828- struct thread_info *ti);
64829+ struct task_struct *task);
64830 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
64831- struct thread_info *ti);
64832+ struct task_struct *task);
64833 extern void debug_mutex_unlock(struct mutex *lock);
64834 extern void debug_mutex_init(struct mutex *lock, const char *name,
64835 struct lock_class_key *key);
64836diff --git a/kernel/mutex.c b/kernel/mutex.c
64837index 89096dd..f91ebc5 100644
64838--- a/kernel/mutex.c
64839+++ b/kernel/mutex.c
64840@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
64841 spin_lock_mutex(&lock->wait_lock, flags);
64842
64843 debug_mutex_lock_common(lock, &waiter);
64844- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
64845+ debug_mutex_add_waiter(lock, &waiter, task);
64846
64847 /* add waiting tasks to the end of the waitqueue (FIFO): */
64848 list_add_tail(&waiter.list, &lock->wait_list);
64849@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
64850 * TASK_UNINTERRUPTIBLE case.)
64851 */
64852 if (unlikely(signal_pending_state(state, task))) {
64853- mutex_remove_waiter(lock, &waiter,
64854- task_thread_info(task));
64855+ mutex_remove_waiter(lock, &waiter, task);
64856 mutex_release(&lock->dep_map, 1, ip);
64857 spin_unlock_mutex(&lock->wait_lock, flags);
64858
64859@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
64860 done:
64861 lock_acquired(&lock->dep_map, ip);
64862 /* got the lock - rejoice! */
64863- mutex_remove_waiter(lock, &waiter, current_thread_info());
64864+ mutex_remove_waiter(lock, &waiter, task);
64865 mutex_set_owner(lock);
64866
64867 /* set it to 0 if there are no waiters left: */
64868diff --git a/kernel/padata.c b/kernel/padata.c
64869index b452599..5d68f4e 100644
64870--- a/kernel/padata.c
64871+++ b/kernel/padata.c
64872@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
64873 padata->pd = pd;
64874 padata->cb_cpu = cb_cpu;
64875
64876- if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
64877- atomic_set(&pd->seq_nr, -1);
64878+ if (unlikely(atomic_read_unchecked(&pd->seq_nr) == pd->max_seq_nr))
64879+ atomic_set_unchecked(&pd->seq_nr, -1);
64880
64881- padata->seq_nr = atomic_inc_return(&pd->seq_nr);
64882+ padata->seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
64883
64884 target_cpu = padata_cpu_hash(padata);
64885 queue = per_cpu_ptr(pd->pqueue, target_cpu);
64886@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
64887 padata_init_pqueues(pd);
64888 padata_init_squeues(pd);
64889 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
64890- atomic_set(&pd->seq_nr, -1);
64891+ atomic_set_unchecked(&pd->seq_nr, -1);
64892 atomic_set(&pd->reorder_objects, 0);
64893 atomic_set(&pd->refcnt, 0);
64894 pd->pinst = pinst;
64895diff --git a/kernel/panic.c b/kernel/panic.c
64896index b2659360..5972a0f 100644
64897--- a/kernel/panic.c
64898+++ b/kernel/panic.c
64899@@ -78,7 +78,11 @@ NORET_TYPE void panic(const char * fmt, ...)
64900 va_end(args);
64901 printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
64902 #ifdef CONFIG_DEBUG_BUGVERBOSE
64903- dump_stack();
64904+ /*
64905+ * Avoid nested stack-dumping if a panic occurs during oops processing
64906+ */
64907+ if (!oops_in_progress)
64908+ dump_stack();
64909 #endif
64910
64911 /*
64912@@ -373,7 +377,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
64913 const char *board;
64914
64915 printk(KERN_WARNING "------------[ cut here ]------------\n");
64916- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
64917+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
64918 board = dmi_get_system_info(DMI_PRODUCT_NAME);
64919 if (board)
64920 printk(KERN_WARNING "Hardware name: %s\n", board);
64921@@ -428,7 +432,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
64922 */
64923 void __stack_chk_fail(void)
64924 {
64925- panic("stack-protector: Kernel stack is corrupted in: %p\n",
64926+ dump_stack();
64927+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
64928 __builtin_return_address(0));
64929 }
64930 EXPORT_SYMBOL(__stack_chk_fail);
64931diff --git a/kernel/pid.c b/kernel/pid.c
64932index fa5f722..0c93e57 100644
64933--- a/kernel/pid.c
64934+++ b/kernel/pid.c
64935@@ -33,6 +33,7 @@
64936 #include <linux/rculist.h>
64937 #include <linux/bootmem.h>
64938 #include <linux/hash.h>
64939+#include <linux/security.h>
64940 #include <linux/pid_namespace.h>
64941 #include <linux/init_task.h>
64942 #include <linux/syscalls.h>
64943@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
64944
64945 int pid_max = PID_MAX_DEFAULT;
64946
64947-#define RESERVED_PIDS 300
64948+#define RESERVED_PIDS 500
64949
64950 int pid_max_min = RESERVED_PIDS + 1;
64951 int pid_max_max = PID_MAX_LIMIT;
64952@@ -418,10 +419,18 @@ EXPORT_SYMBOL(pid_task);
64953 */
64954 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
64955 {
64956+ struct task_struct *task;
64957+
64958 rcu_lockdep_assert(rcu_read_lock_held(),
64959 "find_task_by_pid_ns() needs rcu_read_lock()"
64960 " protection");
64961- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
64962+
64963+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
64964+
64965+ if (gr_pid_is_chrooted(task))
64966+ return NULL;
64967+
64968+ return task;
64969 }
64970
64971 struct task_struct *find_task_by_vpid(pid_t vnr)
64972@@ -429,6 +438,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
64973 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
64974 }
64975
64976+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
64977+{
64978+ rcu_lockdep_assert(rcu_read_lock_held(),
64979+ "find_task_by_pid_ns() needs rcu_read_lock()"
64980+ " protection");
64981+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
64982+}
64983+
64984 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
64985 {
64986 struct pid *pid;
64987diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
64988index e7cb76d..75eceb3 100644
64989--- a/kernel/posix-cpu-timers.c
64990+++ b/kernel/posix-cpu-timers.c
64991@@ -6,6 +6,7 @@
64992 #include <linux/posix-timers.h>
64993 #include <linux/errno.h>
64994 #include <linux/math64.h>
64995+#include <linux/security.h>
64996 #include <asm/uaccess.h>
64997 #include <linux/kernel_stat.h>
64998 #include <trace/events/timer.h>
64999@@ -1606,14 +1607,14 @@ struct k_clock clock_posix_cpu = {
65000
65001 static __init int init_posix_cpu_timers(void)
65002 {
65003- struct k_clock process = {
65004+ static struct k_clock process = {
65005 .clock_getres = process_cpu_clock_getres,
65006 .clock_get = process_cpu_clock_get,
65007 .timer_create = process_cpu_timer_create,
65008 .nsleep = process_cpu_nsleep,
65009 .nsleep_restart = process_cpu_nsleep_restart,
65010 };
65011- struct k_clock thread = {
65012+ static struct k_clock thread = {
65013 .clock_getres = thread_cpu_clock_getres,
65014 .clock_get = thread_cpu_clock_get,
65015 .timer_create = thread_cpu_timer_create,
65016diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
65017index 69185ae..cc2847a 100644
65018--- a/kernel/posix-timers.c
65019+++ b/kernel/posix-timers.c
65020@@ -43,6 +43,7 @@
65021 #include <linux/idr.h>
65022 #include <linux/posix-clock.h>
65023 #include <linux/posix-timers.h>
65024+#include <linux/grsecurity.h>
65025 #include <linux/syscalls.h>
65026 #include <linux/wait.h>
65027 #include <linux/workqueue.h>
65028@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
65029 * which we beg off on and pass to do_sys_settimeofday().
65030 */
65031
65032-static struct k_clock posix_clocks[MAX_CLOCKS];
65033+static struct k_clock *posix_clocks[MAX_CLOCKS];
65034
65035 /*
65036 * These ones are defined below.
65037@@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
65038 */
65039 static __init int init_posix_timers(void)
65040 {
65041- struct k_clock clock_realtime = {
65042+ static struct k_clock clock_realtime = {
65043 .clock_getres = hrtimer_get_res,
65044 .clock_get = posix_clock_realtime_get,
65045 .clock_set = posix_clock_realtime_set,
65046@@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
65047 .timer_get = common_timer_get,
65048 .timer_del = common_timer_del,
65049 };
65050- struct k_clock clock_monotonic = {
65051+ static struct k_clock clock_monotonic = {
65052 .clock_getres = hrtimer_get_res,
65053 .clock_get = posix_ktime_get_ts,
65054 .nsleep = common_nsleep,
65055@@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
65056 .timer_get = common_timer_get,
65057 .timer_del = common_timer_del,
65058 };
65059- struct k_clock clock_monotonic_raw = {
65060+ static struct k_clock clock_monotonic_raw = {
65061 .clock_getres = hrtimer_get_res,
65062 .clock_get = posix_get_monotonic_raw,
65063 };
65064- struct k_clock clock_realtime_coarse = {
65065+ static struct k_clock clock_realtime_coarse = {
65066 .clock_getres = posix_get_coarse_res,
65067 .clock_get = posix_get_realtime_coarse,
65068 };
65069- struct k_clock clock_monotonic_coarse = {
65070+ static struct k_clock clock_monotonic_coarse = {
65071 .clock_getres = posix_get_coarse_res,
65072 .clock_get = posix_get_monotonic_coarse,
65073 };
65074- struct k_clock clock_boottime = {
65075+ static struct k_clock clock_boottime = {
65076 .clock_getres = hrtimer_get_res,
65077 .clock_get = posix_get_boottime,
65078 .nsleep = common_nsleep,
65079@@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
65080 return;
65081 }
65082
65083- posix_clocks[clock_id] = *new_clock;
65084+ posix_clocks[clock_id] = new_clock;
65085 }
65086 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
65087
65088@@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
65089 return (id & CLOCKFD_MASK) == CLOCKFD ?
65090 &clock_posix_dynamic : &clock_posix_cpu;
65091
65092- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
65093+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
65094 return NULL;
65095- return &posix_clocks[id];
65096+ return posix_clocks[id];
65097 }
65098
65099 static int common_timer_create(struct k_itimer *new_timer)
65100@@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
65101 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
65102 return -EFAULT;
65103
65104+ /* only the CLOCK_REALTIME clock can be set, all other clocks
65105+ have their clock_set fptr set to a nosettime dummy function
65106+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
65107+ call common_clock_set, which calls do_sys_settimeofday, which
65108+ we hook
65109+ */
65110+
65111 return kc->clock_set(which_clock, &new_tp);
65112 }
65113
65114diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
65115index d523593..68197a4 100644
65116--- a/kernel/power/poweroff.c
65117+++ b/kernel/power/poweroff.c
65118@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
65119 .enable_mask = SYSRQ_ENABLE_BOOT,
65120 };
65121
65122-static int pm_sysrq_init(void)
65123+static int __init pm_sysrq_init(void)
65124 {
65125 register_sysrq_key('o', &sysrq_poweroff_op);
65126 return 0;
65127diff --git a/kernel/power/process.c b/kernel/power/process.c
65128index addbbe5..f9e32e0 100644
65129--- a/kernel/power/process.c
65130+++ b/kernel/power/process.c
65131@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_only)
65132 u64 elapsed_csecs64;
65133 unsigned int elapsed_csecs;
65134 bool wakeup = false;
65135+ bool timedout = false;
65136
65137 do_gettimeofday(&start);
65138
65139@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_only)
65140
65141 while (true) {
65142 todo = 0;
65143+ if (time_after(jiffies, end_time))
65144+ timedout = true;
65145 read_lock(&tasklist_lock);
65146 do_each_thread(g, p) {
65147 if (frozen(p) || !freezable(p))
65148@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_only)
65149 * try_to_stop() after schedule() in ptrace/signal
65150 * stop sees TIF_FREEZE.
65151 */
65152- if (!task_is_stopped_or_traced(p) &&
65153- !freezer_should_skip(p))
65154+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
65155 todo++;
65156+ if (timedout) {
65157+ printk(KERN_ERR "Task refusing to freeze:\n");
65158+ sched_show_task(p);
65159+ }
65160+ }
65161 } while_each_thread(g, p);
65162 read_unlock(&tasklist_lock);
65163
65164@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_only)
65165 todo += wq_busy;
65166 }
65167
65168- if (!todo || time_after(jiffies, end_time))
65169+ if (!todo || timedout)
65170 break;
65171
65172 if (pm_wakeup_pending()) {
65173diff --git a/kernel/printk.c b/kernel/printk.c
65174index 7982a0a..2095fdc 100644
65175--- a/kernel/printk.c
65176+++ b/kernel/printk.c
65177@@ -313,6 +313,11 @@ static int check_syslog_permissions(int type, bool from_file)
65178 if (from_file && type != SYSLOG_ACTION_OPEN)
65179 return 0;
65180
65181+#ifdef CONFIG_GRKERNSEC_DMESG
65182+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
65183+ return -EPERM;
65184+#endif
65185+
65186 if (syslog_action_restricted(type)) {
65187 if (capable(CAP_SYSLOG))
65188 return 0;
65189diff --git a/kernel/profile.c b/kernel/profile.c
65190index 76b8e77..a2930e8 100644
65191--- a/kernel/profile.c
65192+++ b/kernel/profile.c
65193@@ -39,7 +39,7 @@ struct profile_hit {
65194 /* Oprofile timer tick hook */
65195 static int (*timer_hook)(struct pt_regs *) __read_mostly;
65196
65197-static atomic_t *prof_buffer;
65198+static atomic_unchecked_t *prof_buffer;
65199 static unsigned long prof_len, prof_shift;
65200
65201 int prof_on __read_mostly;
65202@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
65203 hits[i].pc = 0;
65204 continue;
65205 }
65206- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
65207+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
65208 hits[i].hits = hits[i].pc = 0;
65209 }
65210 }
65211@@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
65212 * Add the current hit(s) and flush the write-queue out
65213 * to the global buffer:
65214 */
65215- atomic_add(nr_hits, &prof_buffer[pc]);
65216+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
65217 for (i = 0; i < NR_PROFILE_HIT; ++i) {
65218- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
65219+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
65220 hits[i].pc = hits[i].hits = 0;
65221 }
65222 out:
65223@@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
65224 {
65225 unsigned long pc;
65226 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
65227- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
65228+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
65229 }
65230 #endif /* !CONFIG_SMP */
65231
65232@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
65233 return -EFAULT;
65234 buf++; p++; count--; read++;
65235 }
65236- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
65237+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
65238 if (copy_to_user(buf, (void *)pnt, count))
65239 return -EFAULT;
65240 read += count;
65241@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
65242 }
65243 #endif
65244 profile_discard_flip_buffers();
65245- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
65246+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
65247 return count;
65248 }
65249
65250diff --git a/kernel/ptrace.c b/kernel/ptrace.c
65251index 78ab24a..332c915 100644
65252--- a/kernel/ptrace.c
65253+++ b/kernel/ptrace.c
65254@@ -172,7 +172,8 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state)
65255 return ret;
65256 }
65257
65258-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
65259+static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
65260+ unsigned int log)
65261 {
65262 const struct cred *cred = current_cred(), *tcred;
65263
65264@@ -198,7 +199,8 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
65265 cred->gid == tcred->sgid &&
65266 cred->gid == tcred->gid))
65267 goto ok;
65268- if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
65269+ if ((!log && ns_capable_nolog(tcred->user->user_ns, CAP_SYS_PTRACE)) ||
65270+ (log && ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)))
65271 goto ok;
65272 rcu_read_unlock();
65273 return -EPERM;
65274@@ -207,7 +209,9 @@ ok:
65275 smp_rmb();
65276 if (task->mm)
65277 dumpable = get_dumpable(task->mm);
65278- if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
65279+ if (!dumpable &&
65280+ ((!log && !task_ns_capable_nolog(task, CAP_SYS_PTRACE)) ||
65281+ (log && !task_ns_capable(task, CAP_SYS_PTRACE))))
65282 return -EPERM;
65283
65284 return security_ptrace_access_check(task, mode);
65285@@ -217,7 +221,21 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
65286 {
65287 int err;
65288 task_lock(task);
65289- err = __ptrace_may_access(task, mode);
65290+ err = __ptrace_may_access(task, mode, 0);
65291+ task_unlock(task);
65292+ return !err;
65293+}
65294+
65295+bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode)
65296+{
65297+ return __ptrace_may_access(task, mode, 0);
65298+}
65299+
65300+bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
65301+{
65302+ int err;
65303+ task_lock(task);
65304+ err = __ptrace_may_access(task, mode, 1);
65305 task_unlock(task);
65306 return !err;
65307 }
65308@@ -262,7 +280,7 @@ static int ptrace_attach(struct task_struct *task, long request,
65309 goto out;
65310
65311 task_lock(task);
65312- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
65313+ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
65314 task_unlock(task);
65315 if (retval)
65316 goto unlock_creds;
65317@@ -277,7 +295,7 @@ static int ptrace_attach(struct task_struct *task, long request,
65318 task->ptrace = PT_PTRACED;
65319 if (seize)
65320 task->ptrace |= PT_SEIZED;
65321- if (task_ns_capable(task, CAP_SYS_PTRACE))
65322+ if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
65323 task->ptrace |= PT_PTRACE_CAP;
65324
65325 __ptrace_link(task, current);
65326@@ -483,7 +501,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
65327 break;
65328 return -EIO;
65329 }
65330- if (copy_to_user(dst, buf, retval))
65331+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
65332 return -EFAULT;
65333 copied += retval;
65334 src += retval;
65335@@ -680,7 +698,7 @@ int ptrace_request(struct task_struct *child, long request,
65336 bool seized = child->ptrace & PT_SEIZED;
65337 int ret = -EIO;
65338 siginfo_t siginfo, *si;
65339- void __user *datavp = (void __user *) data;
65340+ void __user *datavp = (__force void __user *) data;
65341 unsigned long __user *datalp = datavp;
65342 unsigned long flags;
65343
65344@@ -882,14 +900,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
65345 goto out;
65346 }
65347
65348+ if (gr_handle_ptrace(child, request)) {
65349+ ret = -EPERM;
65350+ goto out_put_task_struct;
65351+ }
65352+
65353 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
65354 ret = ptrace_attach(child, request, data);
65355 /*
65356 * Some architectures need to do book-keeping after
65357 * a ptrace attach.
65358 */
65359- if (!ret)
65360+ if (!ret) {
65361 arch_ptrace_attach(child);
65362+ gr_audit_ptrace(child);
65363+ }
65364 goto out_put_task_struct;
65365 }
65366
65367@@ -915,7 +940,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
65368 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
65369 if (copied != sizeof(tmp))
65370 return -EIO;
65371- return put_user(tmp, (unsigned long __user *)data);
65372+ return put_user(tmp, (__force unsigned long __user *)data);
65373 }
65374
65375 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
65376@@ -1025,14 +1050,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
65377 goto out;
65378 }
65379
65380+ if (gr_handle_ptrace(child, request)) {
65381+ ret = -EPERM;
65382+ goto out_put_task_struct;
65383+ }
65384+
65385 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
65386 ret = ptrace_attach(child, request, data);
65387 /*
65388 * Some architectures need to do book-keeping after
65389 * a ptrace attach.
65390 */
65391- if (!ret)
65392+ if (!ret) {
65393 arch_ptrace_attach(child);
65394+ gr_audit_ptrace(child);
65395+ }
65396 goto out_put_task_struct;
65397 }
65398
65399diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
65400index 764825c..3aa6ac4 100644
65401--- a/kernel/rcutorture.c
65402+++ b/kernel/rcutorture.c
65403@@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
65404 { 0 };
65405 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
65406 { 0 };
65407-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
65408-static atomic_t n_rcu_torture_alloc;
65409-static atomic_t n_rcu_torture_alloc_fail;
65410-static atomic_t n_rcu_torture_free;
65411-static atomic_t n_rcu_torture_mberror;
65412-static atomic_t n_rcu_torture_error;
65413+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
65414+static atomic_unchecked_t n_rcu_torture_alloc;
65415+static atomic_unchecked_t n_rcu_torture_alloc_fail;
65416+static atomic_unchecked_t n_rcu_torture_free;
65417+static atomic_unchecked_t n_rcu_torture_mberror;
65418+static atomic_unchecked_t n_rcu_torture_error;
65419 static long n_rcu_torture_boost_ktrerror;
65420 static long n_rcu_torture_boost_rterror;
65421 static long n_rcu_torture_boost_failure;
65422@@ -223,11 +223,11 @@ rcu_torture_alloc(void)
65423
65424 spin_lock_bh(&rcu_torture_lock);
65425 if (list_empty(&rcu_torture_freelist)) {
65426- atomic_inc(&n_rcu_torture_alloc_fail);
65427+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
65428 spin_unlock_bh(&rcu_torture_lock);
65429 return NULL;
65430 }
65431- atomic_inc(&n_rcu_torture_alloc);
65432+ atomic_inc_unchecked(&n_rcu_torture_alloc);
65433 p = rcu_torture_freelist.next;
65434 list_del_init(p);
65435 spin_unlock_bh(&rcu_torture_lock);
65436@@ -240,7 +240,7 @@ rcu_torture_alloc(void)
65437 static void
65438 rcu_torture_free(struct rcu_torture *p)
65439 {
65440- atomic_inc(&n_rcu_torture_free);
65441+ atomic_inc_unchecked(&n_rcu_torture_free);
65442 spin_lock_bh(&rcu_torture_lock);
65443 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
65444 spin_unlock_bh(&rcu_torture_lock);
65445@@ -360,7 +360,7 @@ rcu_torture_cb(struct rcu_head *p)
65446 i = rp->rtort_pipe_count;
65447 if (i > RCU_TORTURE_PIPE_LEN)
65448 i = RCU_TORTURE_PIPE_LEN;
65449- atomic_inc(&rcu_torture_wcount[i]);
65450+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
65451 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
65452 rp->rtort_mbtest = 0;
65453 rcu_torture_free(rp);
65454@@ -407,7 +407,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
65455 i = rp->rtort_pipe_count;
65456 if (i > RCU_TORTURE_PIPE_LEN)
65457 i = RCU_TORTURE_PIPE_LEN;
65458- atomic_inc(&rcu_torture_wcount[i]);
65459+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
65460 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
65461 rp->rtort_mbtest = 0;
65462 list_del(&rp->rtort_free);
65463@@ -872,7 +872,7 @@ rcu_torture_writer(void *arg)
65464 i = old_rp->rtort_pipe_count;
65465 if (i > RCU_TORTURE_PIPE_LEN)
65466 i = RCU_TORTURE_PIPE_LEN;
65467- atomic_inc(&rcu_torture_wcount[i]);
65468+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
65469 old_rp->rtort_pipe_count++;
65470 cur_ops->deferred_free(old_rp);
65471 }
65472@@ -940,7 +940,7 @@ static void rcu_torture_timer(unsigned long unused)
65473 return;
65474 }
65475 if (p->rtort_mbtest == 0)
65476- atomic_inc(&n_rcu_torture_mberror);
65477+ atomic_inc_unchecked(&n_rcu_torture_mberror);
65478 spin_lock(&rand_lock);
65479 cur_ops->read_delay(&rand);
65480 n_rcu_torture_timers++;
65481@@ -1001,7 +1001,7 @@ rcu_torture_reader(void *arg)
65482 continue;
65483 }
65484 if (p->rtort_mbtest == 0)
65485- atomic_inc(&n_rcu_torture_mberror);
65486+ atomic_inc_unchecked(&n_rcu_torture_mberror);
65487 cur_ops->read_delay(&rand);
65488 preempt_disable();
65489 pipe_count = p->rtort_pipe_count;
65490@@ -1060,16 +1060,16 @@ rcu_torture_printk(char *page)
65491 rcu_torture_current,
65492 rcu_torture_current_version,
65493 list_empty(&rcu_torture_freelist),
65494- atomic_read(&n_rcu_torture_alloc),
65495- atomic_read(&n_rcu_torture_alloc_fail),
65496- atomic_read(&n_rcu_torture_free),
65497- atomic_read(&n_rcu_torture_mberror),
65498+ atomic_read_unchecked(&n_rcu_torture_alloc),
65499+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
65500+ atomic_read_unchecked(&n_rcu_torture_free),
65501+ atomic_read_unchecked(&n_rcu_torture_mberror),
65502 n_rcu_torture_boost_ktrerror,
65503 n_rcu_torture_boost_rterror,
65504 n_rcu_torture_boost_failure,
65505 n_rcu_torture_boosts,
65506 n_rcu_torture_timers);
65507- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
65508+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
65509 n_rcu_torture_boost_ktrerror != 0 ||
65510 n_rcu_torture_boost_rterror != 0 ||
65511 n_rcu_torture_boost_failure != 0)
65512@@ -1077,7 +1077,7 @@ rcu_torture_printk(char *page)
65513 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
65514 if (i > 1) {
65515 cnt += sprintf(&page[cnt], "!!! ");
65516- atomic_inc(&n_rcu_torture_error);
65517+ atomic_inc_unchecked(&n_rcu_torture_error);
65518 WARN_ON_ONCE(1);
65519 }
65520 cnt += sprintf(&page[cnt], "Reader Pipe: ");
65521@@ -1091,7 +1091,7 @@ rcu_torture_printk(char *page)
65522 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
65523 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
65524 cnt += sprintf(&page[cnt], " %d",
65525- atomic_read(&rcu_torture_wcount[i]));
65526+ atomic_read_unchecked(&rcu_torture_wcount[i]));
65527 }
65528 cnt += sprintf(&page[cnt], "\n");
65529 if (cur_ops->stats)
65530@@ -1401,7 +1401,7 @@ rcu_torture_cleanup(void)
65531
65532 if (cur_ops->cleanup)
65533 cur_ops->cleanup();
65534- if (atomic_read(&n_rcu_torture_error))
65535+ if (atomic_read_unchecked(&n_rcu_torture_error))
65536 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
65537 else
65538 rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
65539@@ -1465,17 +1465,17 @@ rcu_torture_init(void)
65540
65541 rcu_torture_current = NULL;
65542 rcu_torture_current_version = 0;
65543- atomic_set(&n_rcu_torture_alloc, 0);
65544- atomic_set(&n_rcu_torture_alloc_fail, 0);
65545- atomic_set(&n_rcu_torture_free, 0);
65546- atomic_set(&n_rcu_torture_mberror, 0);
65547- atomic_set(&n_rcu_torture_error, 0);
65548+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
65549+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
65550+ atomic_set_unchecked(&n_rcu_torture_free, 0);
65551+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
65552+ atomic_set_unchecked(&n_rcu_torture_error, 0);
65553 n_rcu_torture_boost_ktrerror = 0;
65554 n_rcu_torture_boost_rterror = 0;
65555 n_rcu_torture_boost_failure = 0;
65556 n_rcu_torture_boosts = 0;
65557 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
65558- atomic_set(&rcu_torture_wcount[i], 0);
65559+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
65560 for_each_possible_cpu(cpu) {
65561 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
65562 per_cpu(rcu_torture_count, cpu)[i] = 0;
65563diff --git a/kernel/rcutree.c b/kernel/rcutree.c
65564index 6b76d81..7afc1b3 100644
65565--- a/kernel/rcutree.c
65566+++ b/kernel/rcutree.c
65567@@ -367,9 +367,9 @@ void rcu_enter_nohz(void)
65568 trace_rcu_dyntick("Start");
65569 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
65570 smp_mb__before_atomic_inc(); /* See above. */
65571- atomic_inc(&rdtp->dynticks);
65572+ atomic_inc_unchecked(&rdtp->dynticks);
65573 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
65574- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
65575+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
65576 local_irq_restore(flags);
65577 }
65578
65579@@ -391,10 +391,10 @@ void rcu_exit_nohz(void)
65580 return;
65581 }
65582 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
65583- atomic_inc(&rdtp->dynticks);
65584+ atomic_inc_unchecked(&rdtp->dynticks);
65585 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
65586 smp_mb__after_atomic_inc(); /* See above. */
65587- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
65588+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
65589 trace_rcu_dyntick("End");
65590 local_irq_restore(flags);
65591 }
65592@@ -411,14 +411,14 @@ void rcu_nmi_enter(void)
65593 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
65594
65595 if (rdtp->dynticks_nmi_nesting == 0 &&
65596- (atomic_read(&rdtp->dynticks) & 0x1))
65597+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
65598 return;
65599 rdtp->dynticks_nmi_nesting++;
65600 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
65601- atomic_inc(&rdtp->dynticks);
65602+ atomic_inc_unchecked(&rdtp->dynticks);
65603 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
65604 smp_mb__after_atomic_inc(); /* See above. */
65605- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
65606+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
65607 }
65608
65609 /**
65610@@ -437,9 +437,9 @@ void rcu_nmi_exit(void)
65611 return;
65612 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
65613 smp_mb__before_atomic_inc(); /* See above. */
65614- atomic_inc(&rdtp->dynticks);
65615+ atomic_inc_unchecked(&rdtp->dynticks);
65616 smp_mb__after_atomic_inc(); /* Force delay to next write. */
65617- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
65618+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
65619 }
65620
65621 /**
65622@@ -474,7 +474,7 @@ void rcu_irq_exit(void)
65623 */
65624 static int dyntick_save_progress_counter(struct rcu_data *rdp)
65625 {
65626- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
65627+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
65628 return 0;
65629 }
65630
65631@@ -489,7 +489,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
65632 unsigned int curr;
65633 unsigned int snap;
65634
65635- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
65636+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
65637 snap = (unsigned int)rdp->dynticks_snap;
65638
65639 /*
65640@@ -1552,7 +1552,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
65641 /*
65642 * Do RCU core processing for the current CPU.
65643 */
65644-static void rcu_process_callbacks(struct softirq_action *unused)
65645+static void rcu_process_callbacks(void)
65646 {
65647 trace_rcu_utilization("Start RCU core");
65648 __rcu_process_callbacks(&rcu_sched_state,
65649diff --git a/kernel/rcutree.h b/kernel/rcutree.h
65650index 849ce9e..74bc9de 100644
65651--- a/kernel/rcutree.h
65652+++ b/kernel/rcutree.h
65653@@ -86,7 +86,7 @@
65654 struct rcu_dynticks {
65655 int dynticks_nesting; /* Track irq/process nesting level. */
65656 int dynticks_nmi_nesting; /* Track NMI nesting level. */
65657- atomic_t dynticks; /* Even value for dynticks-idle, else odd. */
65658+ atomic_unchecked_t dynticks; /* Even value for dynticks-idle, else odd. */
65659 };
65660
65661 /* RCU's kthread states for tracing. */
65662diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
65663index 4b9b9f8..2326053 100644
65664--- a/kernel/rcutree_plugin.h
65665+++ b/kernel/rcutree_plugin.h
65666@@ -842,7 +842,7 @@ void synchronize_rcu_expedited(void)
65667
65668 /* Clean up and exit. */
65669 smp_mb(); /* ensure expedited GP seen before counter increment. */
65670- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
65671+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
65672 unlock_mb_ret:
65673 mutex_unlock(&sync_rcu_preempt_exp_mutex);
65674 mb_ret:
65675@@ -1815,8 +1815,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
65676
65677 #else /* #ifndef CONFIG_SMP */
65678
65679-static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
65680-static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
65681+static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
65682+static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
65683
65684 static int synchronize_sched_expedited_cpu_stop(void *data)
65685 {
65686@@ -1871,7 +1871,7 @@ void synchronize_sched_expedited(void)
65687 int firstsnap, s, snap, trycount = 0;
65688
65689 /* Note that atomic_inc_return() implies full memory barrier. */
65690- firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
65691+ firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
65692 get_online_cpus();
65693
65694 /*
65695@@ -1892,7 +1892,7 @@ void synchronize_sched_expedited(void)
65696 }
65697
65698 /* Check to see if someone else did our work for us. */
65699- s = atomic_read(&sync_sched_expedited_done);
65700+ s = atomic_read_unchecked(&sync_sched_expedited_done);
65701 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
65702 smp_mb(); /* ensure test happens before caller kfree */
65703 return;
65704@@ -1907,7 +1907,7 @@ void synchronize_sched_expedited(void)
65705 * grace period works for us.
65706 */
65707 get_online_cpus();
65708- snap = atomic_read(&sync_sched_expedited_started) - 1;
65709+ snap = atomic_read_unchecked(&sync_sched_expedited_started) - 1;
65710 smp_mb(); /* ensure read is before try_stop_cpus(). */
65711 }
65712
65713@@ -1918,12 +1918,12 @@ void synchronize_sched_expedited(void)
65714 * than we did beat us to the punch.
65715 */
65716 do {
65717- s = atomic_read(&sync_sched_expedited_done);
65718+ s = atomic_read_unchecked(&sync_sched_expedited_done);
65719 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
65720 smp_mb(); /* ensure test happens before caller kfree */
65721 break;
65722 }
65723- } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
65724+ } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
65725
65726 put_online_cpus();
65727 }
65728@@ -1985,7 +1985,7 @@ int rcu_needs_cpu(int cpu)
65729 for_each_online_cpu(thatcpu) {
65730 if (thatcpu == cpu)
65731 continue;
65732- snap = atomic_add_return(0, &per_cpu(rcu_dynticks,
65733+ snap = atomic_add_return_unchecked(0, &per_cpu(rcu_dynticks,
65734 thatcpu).dynticks);
65735 smp_mb(); /* Order sampling of snap with end of grace period. */
65736 if ((snap & 0x1) != 0) {
65737diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
65738index 9feffa4..54058df 100644
65739--- a/kernel/rcutree_trace.c
65740+++ b/kernel/rcutree_trace.c
65741@@ -69,7 +69,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
65742 rdp->qs_pending);
65743 #ifdef CONFIG_NO_HZ
65744 seq_printf(m, " dt=%d/%d/%d df=%lu",
65745- atomic_read(&rdp->dynticks->dynticks),
65746+ atomic_read_unchecked(&rdp->dynticks->dynticks),
65747 rdp->dynticks->dynticks_nesting,
65748 rdp->dynticks->dynticks_nmi_nesting,
65749 rdp->dynticks_fqs);
65750@@ -143,7 +143,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
65751 rdp->qs_pending);
65752 #ifdef CONFIG_NO_HZ
65753 seq_printf(m, ",%d,%d,%d,%lu",
65754- atomic_read(&rdp->dynticks->dynticks),
65755+ atomic_read_unchecked(&rdp->dynticks->dynticks),
65756 rdp->dynticks->dynticks_nesting,
65757 rdp->dynticks->dynticks_nmi_nesting,
65758 rdp->dynticks_fqs);
65759diff --git a/kernel/resource.c b/kernel/resource.c
65760index 7640b3a..5879283 100644
65761--- a/kernel/resource.c
65762+++ b/kernel/resource.c
65763@@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
65764
65765 static int __init ioresources_init(void)
65766 {
65767+#ifdef CONFIG_GRKERNSEC_PROC_ADD
65768+#ifdef CONFIG_GRKERNSEC_PROC_USER
65769+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
65770+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
65771+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65772+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
65773+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
65774+#endif
65775+#else
65776 proc_create("ioports", 0, NULL, &proc_ioports_operations);
65777 proc_create("iomem", 0, NULL, &proc_iomem_operations);
65778+#endif
65779 return 0;
65780 }
65781 __initcall(ioresources_init);
65782diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
65783index 3d9f31c..7fefc9e 100644
65784--- a/kernel/rtmutex-tester.c
65785+++ b/kernel/rtmutex-tester.c
65786@@ -20,7 +20,7 @@
65787 #define MAX_RT_TEST_MUTEXES 8
65788
65789 static spinlock_t rttest_lock;
65790-static atomic_t rttest_event;
65791+static atomic_unchecked_t rttest_event;
65792
65793 struct test_thread_data {
65794 int opcode;
65795@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65796
65797 case RTTEST_LOCKCONT:
65798 td->mutexes[td->opdata] = 1;
65799- td->event = atomic_add_return(1, &rttest_event);
65800+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65801 return 0;
65802
65803 case RTTEST_RESET:
65804@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65805 return 0;
65806
65807 case RTTEST_RESETEVENT:
65808- atomic_set(&rttest_event, 0);
65809+ atomic_set_unchecked(&rttest_event, 0);
65810 return 0;
65811
65812 default:
65813@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65814 return ret;
65815
65816 td->mutexes[id] = 1;
65817- td->event = atomic_add_return(1, &rttest_event);
65818+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65819 rt_mutex_lock(&mutexes[id]);
65820- td->event = atomic_add_return(1, &rttest_event);
65821+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65822 td->mutexes[id] = 4;
65823 return 0;
65824
65825@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65826 return ret;
65827
65828 td->mutexes[id] = 1;
65829- td->event = atomic_add_return(1, &rttest_event);
65830+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65831 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
65832- td->event = atomic_add_return(1, &rttest_event);
65833+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65834 td->mutexes[id] = ret ? 0 : 4;
65835 return ret ? -EINTR : 0;
65836
65837@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65838 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
65839 return ret;
65840
65841- td->event = atomic_add_return(1, &rttest_event);
65842+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65843 rt_mutex_unlock(&mutexes[id]);
65844- td->event = atomic_add_return(1, &rttest_event);
65845+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65846 td->mutexes[id] = 0;
65847 return 0;
65848
65849@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
65850 break;
65851
65852 td->mutexes[dat] = 2;
65853- td->event = atomic_add_return(1, &rttest_event);
65854+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65855 break;
65856
65857 default:
65858@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
65859 return;
65860
65861 td->mutexes[dat] = 3;
65862- td->event = atomic_add_return(1, &rttest_event);
65863+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65864 break;
65865
65866 case RTTEST_LOCKNOWAIT:
65867@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
65868 return;
65869
65870 td->mutexes[dat] = 1;
65871- td->event = atomic_add_return(1, &rttest_event);
65872+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65873 return;
65874
65875 default:
65876diff --git a/kernel/sched.c b/kernel/sched.c
65877index d6b149c..896cbb8 100644
65878--- a/kernel/sched.c
65879+++ b/kernel/sched.c
65880@@ -4389,6 +4389,19 @@ pick_next_task(struct rq *rq)
65881 BUG(); /* the idle class will always have a runnable task */
65882 }
65883
65884+#ifdef CONFIG_GRKERNSEC_SETXID
65885+extern void gr_delayed_cred_worker(void);
65886+static inline void gr_cred_schedule(void)
65887+{
65888+ if (unlikely(current->delayed_cred))
65889+ gr_delayed_cred_worker();
65890+}
65891+#else
65892+static inline void gr_cred_schedule(void)
65893+{
65894+}
65895+#endif
65896+
65897 /*
65898 * __schedule() is the main scheduler function.
65899 */
65900@@ -4408,6 +4421,8 @@ need_resched:
65901
65902 schedule_debug(prev);
65903
65904+ gr_cred_schedule();
65905+
65906 if (sched_feat(HRTICK))
65907 hrtick_clear(rq);
65908
65909@@ -5098,6 +5113,8 @@ int can_nice(const struct task_struct *p, const int nice)
65910 /* convert nice value [19,-20] to rlimit style value [1,40] */
65911 int nice_rlim = 20 - nice;
65912
65913+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
65914+
65915 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
65916 capable(CAP_SYS_NICE));
65917 }
65918@@ -5131,7 +5148,8 @@ SYSCALL_DEFINE1(nice, int, increment)
65919 if (nice > 19)
65920 nice = 19;
65921
65922- if (increment < 0 && !can_nice(current, nice))
65923+ if (increment < 0 && (!can_nice(current, nice) ||
65924+ gr_handle_chroot_nice()))
65925 return -EPERM;
65926
65927 retval = security_task_setnice(current, nice);
65928@@ -5288,6 +5306,7 @@ recheck:
65929 unsigned long rlim_rtprio =
65930 task_rlimit(p, RLIMIT_RTPRIO);
65931
65932+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
65933 /* can't set/change the rt policy */
65934 if (policy != p->policy && !rlim_rtprio)
65935 return -EPERM;
65936diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
65937index 429242f..d7cca82 100644
65938--- a/kernel/sched_autogroup.c
65939+++ b/kernel/sched_autogroup.c
65940@@ -7,7 +7,7 @@
65941
65942 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
65943 static struct autogroup autogroup_default;
65944-static atomic_t autogroup_seq_nr;
65945+static atomic_unchecked_t autogroup_seq_nr;
65946
65947 static void __init autogroup_init(struct task_struct *init_task)
65948 {
65949@@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
65950
65951 kref_init(&ag->kref);
65952 init_rwsem(&ag->lock);
65953- ag->id = atomic_inc_return(&autogroup_seq_nr);
65954+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
65955 ag->tg = tg;
65956 #ifdef CONFIG_RT_GROUP_SCHED
65957 /*
65958diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
65959index 8a39fa3..34f3dbc 100644
65960--- a/kernel/sched_fair.c
65961+++ b/kernel/sched_fair.c
65962@@ -4801,7 +4801,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
65963 * run_rebalance_domains is triggered when needed from the scheduler tick.
65964 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
65965 */
65966-static void run_rebalance_domains(struct softirq_action *h)
65967+static void run_rebalance_domains(void)
65968 {
65969 int this_cpu = smp_processor_id();
65970 struct rq *this_rq = cpu_rq(this_cpu);
65971diff --git a/kernel/signal.c b/kernel/signal.c
65972index 2065515..aed2987 100644
65973--- a/kernel/signal.c
65974+++ b/kernel/signal.c
65975@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep;
65976
65977 int print_fatal_signals __read_mostly;
65978
65979-static void __user *sig_handler(struct task_struct *t, int sig)
65980+static __sighandler_t sig_handler(struct task_struct *t, int sig)
65981 {
65982 return t->sighand->action[sig - 1].sa.sa_handler;
65983 }
65984
65985-static int sig_handler_ignored(void __user *handler, int sig)
65986+static int sig_handler_ignored(__sighandler_t handler, int sig)
65987 {
65988 /* Is it explicitly or implicitly ignored? */
65989 return handler == SIG_IGN ||
65990@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
65991 static int sig_task_ignored(struct task_struct *t, int sig,
65992 int from_ancestor_ns)
65993 {
65994- void __user *handler;
65995+ __sighandler_t handler;
65996
65997 handler = sig_handler(t, sig);
65998
65999@@ -364,6 +364,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
66000 atomic_inc(&user->sigpending);
66001 rcu_read_unlock();
66002
66003+ if (!override_rlimit)
66004+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
66005+
66006 if (override_rlimit ||
66007 atomic_read(&user->sigpending) <=
66008 task_rlimit(t, RLIMIT_SIGPENDING)) {
66009@@ -488,7 +491,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
66010
66011 int unhandled_signal(struct task_struct *tsk, int sig)
66012 {
66013- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
66014+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
66015 if (is_global_init(tsk))
66016 return 1;
66017 if (handler != SIG_IGN && handler != SIG_DFL)
66018@@ -815,6 +818,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
66019 }
66020 }
66021
66022+ /* allow glibc communication via tgkill to other threads in our
66023+ thread group */
66024+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
66025+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
66026+ && gr_handle_signal(t, sig))
66027+ return -EPERM;
66028+
66029 return security_task_kill(t, info, sig, 0);
66030 }
66031
66032@@ -1165,7 +1175,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
66033 return send_signal(sig, info, p, 1);
66034 }
66035
66036-static int
66037+int
66038 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
66039 {
66040 return send_signal(sig, info, t, 0);
66041@@ -1202,6 +1212,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
66042 unsigned long int flags;
66043 int ret, blocked, ignored;
66044 struct k_sigaction *action;
66045+ int is_unhandled = 0;
66046
66047 spin_lock_irqsave(&t->sighand->siglock, flags);
66048 action = &t->sighand->action[sig-1];
66049@@ -1216,9 +1227,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
66050 }
66051 if (action->sa.sa_handler == SIG_DFL)
66052 t->signal->flags &= ~SIGNAL_UNKILLABLE;
66053+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
66054+ is_unhandled = 1;
66055 ret = specific_send_sig_info(sig, info, t);
66056 spin_unlock_irqrestore(&t->sighand->siglock, flags);
66057
66058+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
66059+ normal operation */
66060+ if (is_unhandled) {
66061+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
66062+ gr_handle_crash(t, sig);
66063+ }
66064+
66065 return ret;
66066 }
66067
66068@@ -1285,8 +1305,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
66069 ret = check_kill_permission(sig, info, p);
66070 rcu_read_unlock();
66071
66072- if (!ret && sig)
66073+ if (!ret && sig) {
66074 ret = do_send_sig_info(sig, info, p, true);
66075+ if (!ret)
66076+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
66077+ }
66078
66079 return ret;
66080 }
66081@@ -2754,7 +2777,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
66082 int error = -ESRCH;
66083
66084 rcu_read_lock();
66085- p = find_task_by_vpid(pid);
66086+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
66087+ /* allow glibc communication via tgkill to other threads in our
66088+ thread group */
66089+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
66090+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
66091+ p = find_task_by_vpid_unrestricted(pid);
66092+ else
66093+#endif
66094+ p = find_task_by_vpid(pid);
66095 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
66096 error = check_kill_permission(sig, info, p);
66097 /*
66098diff --git a/kernel/smp.c b/kernel/smp.c
66099index db197d6..17aef0b 100644
66100--- a/kernel/smp.c
66101+++ b/kernel/smp.c
66102@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
66103 }
66104 EXPORT_SYMBOL(smp_call_function);
66105
66106-void ipi_call_lock(void)
66107+void ipi_call_lock(void) __acquires(call_function.lock)
66108 {
66109 raw_spin_lock(&call_function.lock);
66110 }
66111
66112-void ipi_call_unlock(void)
66113+void ipi_call_unlock(void) __releases(call_function.lock)
66114 {
66115 raw_spin_unlock(&call_function.lock);
66116 }
66117
66118-void ipi_call_lock_irq(void)
66119+void ipi_call_lock_irq(void) __acquires(call_function.lock)
66120 {
66121 raw_spin_lock_irq(&call_function.lock);
66122 }
66123
66124-void ipi_call_unlock_irq(void)
66125+void ipi_call_unlock_irq(void) __releases(call_function.lock)
66126 {
66127 raw_spin_unlock_irq(&call_function.lock);
66128 }
66129diff --git a/kernel/softirq.c b/kernel/softirq.c
66130index 2c71d91..1021f81 100644
66131--- a/kernel/softirq.c
66132+++ b/kernel/softirq.c
66133@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
66134
66135 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
66136
66137-char *softirq_to_name[NR_SOFTIRQS] = {
66138+const char * const softirq_to_name[NR_SOFTIRQS] = {
66139 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
66140 "TASKLET", "SCHED", "HRTIMER", "RCU"
66141 };
66142@@ -235,7 +235,7 @@ restart:
66143 kstat_incr_softirqs_this_cpu(vec_nr);
66144
66145 trace_softirq_entry(vec_nr);
66146- h->action(h);
66147+ h->action();
66148 trace_softirq_exit(vec_nr);
66149 if (unlikely(prev_count != preempt_count())) {
66150 printk(KERN_ERR "huh, entered softirq %u %s %p"
66151@@ -385,9 +385,11 @@ void raise_softirq(unsigned int nr)
66152 local_irq_restore(flags);
66153 }
66154
66155-void open_softirq(int nr, void (*action)(struct softirq_action *))
66156+void open_softirq(int nr, void (*action)(void))
66157 {
66158- softirq_vec[nr].action = action;
66159+ pax_open_kernel();
66160+ *(void **)&softirq_vec[nr].action = action;
66161+ pax_close_kernel();
66162 }
66163
66164 /*
66165@@ -441,7 +443,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
66166
66167 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
66168
66169-static void tasklet_action(struct softirq_action *a)
66170+static void tasklet_action(void)
66171 {
66172 struct tasklet_struct *list;
66173
66174@@ -476,7 +478,7 @@ static void tasklet_action(struct softirq_action *a)
66175 }
66176 }
66177
66178-static void tasklet_hi_action(struct softirq_action *a)
66179+static void tasklet_hi_action(void)
66180 {
66181 struct tasklet_struct *list;
66182
66183diff --git a/kernel/sys.c b/kernel/sys.c
66184index 481611f..4665125 100644
66185--- a/kernel/sys.c
66186+++ b/kernel/sys.c
66187@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
66188 error = -EACCES;
66189 goto out;
66190 }
66191+
66192+ if (gr_handle_chroot_setpriority(p, niceval)) {
66193+ error = -EACCES;
66194+ goto out;
66195+ }
66196+
66197 no_nice = security_task_setnice(p, niceval);
66198 if (no_nice) {
66199 error = no_nice;
66200@@ -572,6 +578,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
66201 goto error;
66202 }
66203
66204+ if (gr_check_group_change(new->gid, new->egid, -1))
66205+ goto error;
66206+
66207 if (rgid != (gid_t) -1 ||
66208 (egid != (gid_t) -1 && egid != old->gid))
66209 new->sgid = new->egid;
66210@@ -601,6 +610,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
66211 old = current_cred();
66212
66213 retval = -EPERM;
66214+
66215+ if (gr_check_group_change(gid, gid, gid))
66216+ goto error;
66217+
66218 if (nsown_capable(CAP_SETGID))
66219 new->gid = new->egid = new->sgid = new->fsgid = gid;
66220 else if (gid == old->gid || gid == old->sgid)
66221@@ -618,7 +631,7 @@ error:
66222 /*
66223 * change the user struct in a credentials set to match the new UID
66224 */
66225-static int set_user(struct cred *new)
66226+int set_user(struct cred *new)
66227 {
66228 struct user_struct *new_user;
66229
66230@@ -688,6 +701,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
66231 goto error;
66232 }
66233
66234+ if (gr_check_user_change(new->uid, new->euid, -1))
66235+ goto error;
66236+
66237 if (new->uid != old->uid) {
66238 retval = set_user(new);
66239 if (retval < 0)
66240@@ -732,6 +748,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
66241 old = current_cred();
66242
66243 retval = -EPERM;
66244+
66245+ if (gr_check_crash_uid(uid))
66246+ goto error;
66247+ if (gr_check_user_change(uid, uid, uid))
66248+ goto error;
66249+
66250 if (nsown_capable(CAP_SETUID)) {
66251 new->suid = new->uid = uid;
66252 if (uid != old->uid) {
66253@@ -775,9 +797,18 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
66254
66255 retval = -EPERM;
66256 if (!nsown_capable(CAP_SETUID)) {
66257- if (ruid != (uid_t) -1 && ruid != old->uid &&
66258- ruid != old->euid && ruid != old->suid)
66259- goto error;
66260+ // if RBAC is enabled, require CAP_SETUID to change
66261+ // uid to euid (from a suid binary, for instance)
66262+ // this is a hardening of normal permissions, not
66263+ // weakening
66264+ if (gr_acl_is_enabled()) {
66265+ if (ruid != (uid_t) -1 && ruid != old->uid)
66266+ goto error;
66267+ } else {
66268+ if (ruid != (uid_t) -1 && ruid != old->uid &&
66269+ ruid != old->euid && ruid != old->suid)
66270+ goto error;
66271+ }
66272 if (euid != (uid_t) -1 && euid != old->uid &&
66273 euid != old->euid && euid != old->suid)
66274 goto error;
66275@@ -786,6 +817,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
66276 goto error;
66277 }
66278
66279+ if (gr_check_user_change(ruid, euid, -1))
66280+ goto error;
66281+
66282 if (ruid != (uid_t) -1) {
66283 new->uid = ruid;
66284 if (ruid != old->uid) {
66285@@ -839,9 +873,18 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
66286
66287 retval = -EPERM;
66288 if (!nsown_capable(CAP_SETGID)) {
66289- if (rgid != (gid_t) -1 && rgid != old->gid &&
66290- rgid != old->egid && rgid != old->sgid)
66291- goto error;
66292+ // if RBAC is enabled, require CAP_SETGID to change
66293+ // gid to egid (from a sgid binary, for instance)
66294+ // this is a hardening of normal permissions, not
66295+ // weakening
66296+ if (gr_acl_is_enabled()) {
66297+ if (rgid != (gid_t) -1 && rgid != old->gid)
66298+ goto error;
66299+ } else {
66300+ if (rgid != (gid_t) -1 && rgid != old->gid &&
66301+ rgid != old->egid && rgid != old->sgid)
66302+ goto error;
66303+ }
66304 if (egid != (gid_t) -1 && egid != old->gid &&
66305 egid != old->egid && egid != old->sgid)
66306 goto error;
66307@@ -850,6 +893,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
66308 goto error;
66309 }
66310
66311+ if (gr_check_group_change(rgid, egid, -1))
66312+ goto error;
66313+
66314 if (rgid != (gid_t) -1)
66315 new->gid = rgid;
66316 if (egid != (gid_t) -1)
66317@@ -896,6 +942,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
66318 old = current_cred();
66319 old_fsuid = old->fsuid;
66320
66321+ if (gr_check_user_change(-1, -1, uid))
66322+ goto error;
66323+
66324 if (uid == old->uid || uid == old->euid ||
66325 uid == old->suid || uid == old->fsuid ||
66326 nsown_capable(CAP_SETUID)) {
66327@@ -906,6 +955,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
66328 }
66329 }
66330
66331+error:
66332 abort_creds(new);
66333 return old_fsuid;
66334
66335@@ -932,12 +982,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
66336 if (gid == old->gid || gid == old->egid ||
66337 gid == old->sgid || gid == old->fsgid ||
66338 nsown_capable(CAP_SETGID)) {
66339+ if (gr_check_group_change(-1, -1, gid))
66340+ goto error;
66341+
66342 if (gid != old_fsgid) {
66343 new->fsgid = gid;
66344 goto change_okay;
66345 }
66346 }
66347
66348+error:
66349 abort_creds(new);
66350 return old_fsgid;
66351
66352@@ -1189,7 +1243,10 @@ static int override_release(char __user *release, int len)
66353 }
66354 v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
66355 snprintf(buf, len, "2.6.%u%s", v, rest);
66356- ret = copy_to_user(release, buf, len);
66357+ if (len > sizeof(buf))
66358+ ret = -EFAULT;
66359+ else
66360+ ret = copy_to_user(release, buf, len);
66361 }
66362 return ret;
66363 }
66364@@ -1243,19 +1300,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
66365 return -EFAULT;
66366
66367 down_read(&uts_sem);
66368- error = __copy_to_user(&name->sysname, &utsname()->sysname,
66369+ error = __copy_to_user(name->sysname, &utsname()->sysname,
66370 __OLD_UTS_LEN);
66371 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
66372- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
66373+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
66374 __OLD_UTS_LEN);
66375 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
66376- error |= __copy_to_user(&name->release, &utsname()->release,
66377+ error |= __copy_to_user(name->release, &utsname()->release,
66378 __OLD_UTS_LEN);
66379 error |= __put_user(0, name->release + __OLD_UTS_LEN);
66380- error |= __copy_to_user(&name->version, &utsname()->version,
66381+ error |= __copy_to_user(name->version, &utsname()->version,
66382 __OLD_UTS_LEN);
66383 error |= __put_user(0, name->version + __OLD_UTS_LEN);
66384- error |= __copy_to_user(&name->machine, &utsname()->machine,
66385+ error |= __copy_to_user(name->machine, &utsname()->machine,
66386 __OLD_UTS_LEN);
66387 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
66388 up_read(&uts_sem);
66389@@ -1720,7 +1777,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
66390 error = get_dumpable(me->mm);
66391 break;
66392 case PR_SET_DUMPABLE:
66393- if (arg2 < 0 || arg2 > 1) {
66394+ if (arg2 > 1) {
66395 error = -EINVAL;
66396 break;
66397 }
66398diff --git a/kernel/sysctl.c b/kernel/sysctl.c
66399index ae27196..7506d69 100644
66400--- a/kernel/sysctl.c
66401+++ b/kernel/sysctl.c
66402@@ -86,6 +86,13 @@
66403
66404
66405 #if defined(CONFIG_SYSCTL)
66406+#include <linux/grsecurity.h>
66407+#include <linux/grinternal.h>
66408+
66409+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
66410+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
66411+ const int op);
66412+extern int gr_handle_chroot_sysctl(const int op);
66413
66414 /* External variables not in a header file. */
66415 extern int sysctl_overcommit_memory;
66416@@ -191,6 +198,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
66417 }
66418
66419 #endif
66420+extern struct ctl_table grsecurity_table[];
66421
66422 static struct ctl_table root_table[];
66423 static struct ctl_table_root sysctl_table_root;
66424@@ -220,6 +228,20 @@ extern struct ctl_table epoll_table[];
66425 int sysctl_legacy_va_layout;
66426 #endif
66427
66428+#ifdef CONFIG_PAX_SOFTMODE
66429+static ctl_table pax_table[] = {
66430+ {
66431+ .procname = "softmode",
66432+ .data = &pax_softmode,
66433+ .maxlen = sizeof(unsigned int),
66434+ .mode = 0600,
66435+ .proc_handler = &proc_dointvec,
66436+ },
66437+
66438+ { }
66439+};
66440+#endif
66441+
66442 /* The default sysctl tables: */
66443
66444 static struct ctl_table root_table[] = {
66445@@ -266,6 +288,22 @@ static int max_extfrag_threshold = 1000;
66446 #endif
66447
66448 static struct ctl_table kern_table[] = {
66449+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
66450+ {
66451+ .procname = "grsecurity",
66452+ .mode = 0500,
66453+ .child = grsecurity_table,
66454+ },
66455+#endif
66456+
66457+#ifdef CONFIG_PAX_SOFTMODE
66458+ {
66459+ .procname = "pax",
66460+ .mode = 0500,
66461+ .child = pax_table,
66462+ },
66463+#endif
66464+
66465 {
66466 .procname = "sched_child_runs_first",
66467 .data = &sysctl_sched_child_runs_first,
66468@@ -550,7 +588,7 @@ static struct ctl_table kern_table[] = {
66469 .data = &modprobe_path,
66470 .maxlen = KMOD_PATH_LEN,
66471 .mode = 0644,
66472- .proc_handler = proc_dostring,
66473+ .proc_handler = proc_dostring_modpriv,
66474 },
66475 {
66476 .procname = "modules_disabled",
66477@@ -717,16 +755,20 @@ static struct ctl_table kern_table[] = {
66478 .extra1 = &zero,
66479 .extra2 = &one,
66480 },
66481+#endif
66482 {
66483 .procname = "kptr_restrict",
66484 .data = &kptr_restrict,
66485 .maxlen = sizeof(int),
66486 .mode = 0644,
66487 .proc_handler = proc_dmesg_restrict,
66488+#ifdef CONFIG_GRKERNSEC_HIDESYM
66489+ .extra1 = &two,
66490+#else
66491 .extra1 = &zero,
66492+#endif
66493 .extra2 = &two,
66494 },
66495-#endif
66496 {
66497 .procname = "ngroups_max",
66498 .data = &ngroups_max,
66499@@ -1216,6 +1258,13 @@ static struct ctl_table vm_table[] = {
66500 .proc_handler = proc_dointvec_minmax,
66501 .extra1 = &zero,
66502 },
66503+ {
66504+ .procname = "heap_stack_gap",
66505+ .data = &sysctl_heap_stack_gap,
66506+ .maxlen = sizeof(sysctl_heap_stack_gap),
66507+ .mode = 0644,
66508+ .proc_handler = proc_doulongvec_minmax,
66509+ },
66510 #else
66511 {
66512 .procname = "nr_trim_pages",
66513@@ -1720,6 +1769,17 @@ static int test_perm(int mode, int op)
66514 int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
66515 {
66516 int mode;
66517+ int error;
66518+
66519+ if (table->parent != NULL && table->parent->procname != NULL &&
66520+ table->procname != NULL &&
66521+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
66522+ return -EACCES;
66523+ if (gr_handle_chroot_sysctl(op))
66524+ return -EACCES;
66525+ error = gr_handle_sysctl(table, op);
66526+ if (error)
66527+ return error;
66528
66529 if (root->permissions)
66530 mode = root->permissions(root, current->nsproxy, table);
66531@@ -2124,6 +2184,16 @@ int proc_dostring(struct ctl_table *table, int write,
66532 buffer, lenp, ppos);
66533 }
66534
66535+int proc_dostring_modpriv(struct ctl_table *table, int write,
66536+ void __user *buffer, size_t *lenp, loff_t *ppos)
66537+{
66538+ if (write && !capable(CAP_SYS_MODULE))
66539+ return -EPERM;
66540+
66541+ return _proc_do_string(table->data, table->maxlen, write,
66542+ buffer, lenp, ppos);
66543+}
66544+
66545 static size_t proc_skip_spaces(char **buf)
66546 {
66547 size_t ret;
66548@@ -2229,6 +2299,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
66549 len = strlen(tmp);
66550 if (len > *size)
66551 len = *size;
66552+ if (len > sizeof(tmp))
66553+ len = sizeof(tmp);
66554 if (copy_to_user(*buf, tmp, len))
66555 return -EFAULT;
66556 *size -= len;
66557@@ -2545,8 +2617,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
66558 *i = val;
66559 } else {
66560 val = convdiv * (*i) / convmul;
66561- if (!first)
66562+ if (!first) {
66563 err = proc_put_char(&buffer, &left, '\t');
66564+ if (err)
66565+ break;
66566+ }
66567 err = proc_put_long(&buffer, &left, val, false);
66568 if (err)
66569 break;
66570@@ -2941,6 +3016,12 @@ int proc_dostring(struct ctl_table *table, int write,
66571 return -ENOSYS;
66572 }
66573
66574+int proc_dostring_modpriv(struct ctl_table *table, int write,
66575+ void __user *buffer, size_t *lenp, loff_t *ppos)
66576+{
66577+ return -ENOSYS;
66578+}
66579+
66580 int proc_dointvec(struct ctl_table *table, int write,
66581 void __user *buffer, size_t *lenp, loff_t *ppos)
66582 {
66583@@ -2997,6 +3078,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
66584 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
66585 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
66586 EXPORT_SYMBOL(proc_dostring);
66587+EXPORT_SYMBOL(proc_dostring_modpriv);
66588 EXPORT_SYMBOL(proc_doulongvec_minmax);
66589 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
66590 EXPORT_SYMBOL(register_sysctl_table);
66591diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
66592index a650694..aaeeb20 100644
66593--- a/kernel/sysctl_binary.c
66594+++ b/kernel/sysctl_binary.c
66595@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
66596 int i;
66597
66598 set_fs(KERNEL_DS);
66599- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
66600+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
66601 set_fs(old_fs);
66602 if (result < 0)
66603 goto out_kfree;
66604@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
66605 }
66606
66607 set_fs(KERNEL_DS);
66608- result = vfs_write(file, buffer, str - buffer, &pos);
66609+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
66610 set_fs(old_fs);
66611 if (result < 0)
66612 goto out_kfree;
66613@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
66614 int i;
66615
66616 set_fs(KERNEL_DS);
66617- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
66618+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
66619 set_fs(old_fs);
66620 if (result < 0)
66621 goto out_kfree;
66622@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
66623 }
66624
66625 set_fs(KERNEL_DS);
66626- result = vfs_write(file, buffer, str - buffer, &pos);
66627+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
66628 set_fs(old_fs);
66629 if (result < 0)
66630 goto out_kfree;
66631@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
66632 int i;
66633
66634 set_fs(KERNEL_DS);
66635- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
66636+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
66637 set_fs(old_fs);
66638 if (result < 0)
66639 goto out;
66640@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
66641 __le16 dnaddr;
66642
66643 set_fs(KERNEL_DS);
66644- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
66645+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
66646 set_fs(old_fs);
66647 if (result < 0)
66648 goto out;
66649@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
66650 le16_to_cpu(dnaddr) & 0x3ff);
66651
66652 set_fs(KERNEL_DS);
66653- result = vfs_write(file, buf, len, &pos);
66654+ result = vfs_write(file, (const char __force_user *)buf, len, &pos);
66655 set_fs(old_fs);
66656 if (result < 0)
66657 goto out;
66658diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
66659index 362da65..ab8ef8c 100644
66660--- a/kernel/sysctl_check.c
66661+++ b/kernel/sysctl_check.c
66662@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
66663 set_fail(&fail, table, "Directory with extra2");
66664 } else {
66665 if ((table->proc_handler == proc_dostring) ||
66666+ (table->proc_handler == proc_dostring_modpriv) ||
66667 (table->proc_handler == proc_dointvec) ||
66668 (table->proc_handler == proc_dointvec_minmax) ||
66669 (table->proc_handler == proc_dointvec_jiffies) ||
66670diff --git a/kernel/taskstats.c b/kernel/taskstats.c
66671index e660464..c8b9e67 100644
66672--- a/kernel/taskstats.c
66673+++ b/kernel/taskstats.c
66674@@ -27,9 +27,12 @@
66675 #include <linux/cgroup.h>
66676 #include <linux/fs.h>
66677 #include <linux/file.h>
66678+#include <linux/grsecurity.h>
66679 #include <net/genetlink.h>
66680 #include <linux/atomic.h>
66681
66682+extern int gr_is_taskstats_denied(int pid);
66683+
66684 /*
66685 * Maximum length of a cpumask that can be specified in
66686 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
66687@@ -556,6 +559,9 @@ err:
66688
66689 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
66690 {
66691+ if (gr_is_taskstats_denied(current->pid))
66692+ return -EACCES;
66693+
66694 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
66695 return cmd_attr_register_cpumask(info);
66696 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
66697diff --git a/kernel/time.c b/kernel/time.c
66698index 73e416d..cfc6f69 100644
66699--- a/kernel/time.c
66700+++ b/kernel/time.c
66701@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
66702 return error;
66703
66704 if (tz) {
66705+ /* we log in do_settimeofday called below, so don't log twice
66706+ */
66707+ if (!tv)
66708+ gr_log_timechange();
66709+
66710 /* SMP safe, global irq locking makes it work. */
66711 sys_tz = *tz;
66712 update_vsyscall_tz();
66713diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
66714index 8a46f5d..bbe6f9c 100644
66715--- a/kernel/time/alarmtimer.c
66716+++ b/kernel/time/alarmtimer.c
66717@@ -773,7 +773,7 @@ static int __init alarmtimer_init(void)
66718 struct platform_device *pdev;
66719 int error = 0;
66720 int i;
66721- struct k_clock alarm_clock = {
66722+ static struct k_clock alarm_clock = {
66723 .clock_getres = alarm_clock_getres,
66724 .clock_get = alarm_clock_get,
66725 .timer_create = alarm_timer_create,
66726diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
66727index fd4a7b1..fae5c2a 100644
66728--- a/kernel/time/tick-broadcast.c
66729+++ b/kernel/time/tick-broadcast.c
66730@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
66731 * then clear the broadcast bit.
66732 */
66733 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
66734- int cpu = smp_processor_id();
66735+ cpu = smp_processor_id();
66736
66737 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
66738 tick_broadcast_clear_oneshot(cpu);
66739diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
66740index 2378413..be455fd 100644
66741--- a/kernel/time/timekeeping.c
66742+++ b/kernel/time/timekeeping.c
66743@@ -14,6 +14,7 @@
66744 #include <linux/init.h>
66745 #include <linux/mm.h>
66746 #include <linux/sched.h>
66747+#include <linux/grsecurity.h>
66748 #include <linux/syscore_ops.h>
66749 #include <linux/clocksource.h>
66750 #include <linux/jiffies.h>
66751@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv)
66752 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
66753 return -EINVAL;
66754
66755+ gr_log_timechange();
66756+
66757 write_seqlock_irqsave(&xtime_lock, flags);
66758
66759 timekeeping_forward_now();
66760diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
66761index 3258455..f35227d 100644
66762--- a/kernel/time/timer_list.c
66763+++ b/kernel/time/timer_list.c
66764@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
66765
66766 static void print_name_offset(struct seq_file *m, void *sym)
66767 {
66768+#ifdef CONFIG_GRKERNSEC_HIDESYM
66769+ SEQ_printf(m, "<%p>", NULL);
66770+#else
66771 char symname[KSYM_NAME_LEN];
66772
66773 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
66774 SEQ_printf(m, "<%pK>", sym);
66775 else
66776 SEQ_printf(m, "%s", symname);
66777+#endif
66778 }
66779
66780 static void
66781@@ -112,7 +116,11 @@ next_one:
66782 static void
66783 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
66784 {
66785+#ifdef CONFIG_GRKERNSEC_HIDESYM
66786+ SEQ_printf(m, " .base: %p\n", NULL);
66787+#else
66788 SEQ_printf(m, " .base: %pK\n", base);
66789+#endif
66790 SEQ_printf(m, " .index: %d\n",
66791 base->index);
66792 SEQ_printf(m, " .resolution: %Lu nsecs\n",
66793@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
66794 {
66795 struct proc_dir_entry *pe;
66796
66797+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66798+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
66799+#else
66800 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
66801+#endif
66802 if (!pe)
66803 return -ENOMEM;
66804 return 0;
66805diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
66806index 0b537f2..9e71eca 100644
66807--- a/kernel/time/timer_stats.c
66808+++ b/kernel/time/timer_stats.c
66809@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
66810 static unsigned long nr_entries;
66811 static struct entry entries[MAX_ENTRIES];
66812
66813-static atomic_t overflow_count;
66814+static atomic_unchecked_t overflow_count;
66815
66816 /*
66817 * The entries are in a hash-table, for fast lookup:
66818@@ -140,7 +140,7 @@ static void reset_entries(void)
66819 nr_entries = 0;
66820 memset(entries, 0, sizeof(entries));
66821 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
66822- atomic_set(&overflow_count, 0);
66823+ atomic_set_unchecked(&overflow_count, 0);
66824 }
66825
66826 static struct entry *alloc_entry(void)
66827@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
66828 if (likely(entry))
66829 entry->count++;
66830 else
66831- atomic_inc(&overflow_count);
66832+ atomic_inc_unchecked(&overflow_count);
66833
66834 out_unlock:
66835 raw_spin_unlock_irqrestore(lock, flags);
66836@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
66837
66838 static void print_name_offset(struct seq_file *m, unsigned long addr)
66839 {
66840+#ifdef CONFIG_GRKERNSEC_HIDESYM
66841+ seq_printf(m, "<%p>", NULL);
66842+#else
66843 char symname[KSYM_NAME_LEN];
66844
66845 if (lookup_symbol_name(addr, symname) < 0)
66846 seq_printf(m, "<%p>", (void *)addr);
66847 else
66848 seq_printf(m, "%s", symname);
66849+#endif
66850 }
66851
66852 static int tstats_show(struct seq_file *m, void *v)
66853@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
66854
66855 seq_puts(m, "Timer Stats Version: v0.2\n");
66856 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
66857- if (atomic_read(&overflow_count))
66858+ if (atomic_read_unchecked(&overflow_count))
66859 seq_printf(m, "Overflow: %d entries\n",
66860- atomic_read(&overflow_count));
66861+ atomic_read_unchecked(&overflow_count));
66862
66863 for (i = 0; i < nr_entries; i++) {
66864 entry = entries + i;
66865@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
66866 {
66867 struct proc_dir_entry *pe;
66868
66869+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66870+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
66871+#else
66872 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
66873+#endif
66874 if (!pe)
66875 return -ENOMEM;
66876 return 0;
66877diff --git a/kernel/timer.c b/kernel/timer.c
66878index 9c3c62b..441690e 100644
66879--- a/kernel/timer.c
66880+++ b/kernel/timer.c
66881@@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
66882 /*
66883 * This function runs timers and the timer-tq in bottom half context.
66884 */
66885-static void run_timer_softirq(struct softirq_action *h)
66886+static void run_timer_softirq(void)
66887 {
66888 struct tvec_base *base = __this_cpu_read(tvec_bases);
66889
66890diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
66891index 16fc34a..efd8bb8 100644
66892--- a/kernel/trace/blktrace.c
66893+++ b/kernel/trace/blktrace.c
66894@@ -324,7 +324,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
66895 struct blk_trace *bt = filp->private_data;
66896 char buf[16];
66897
66898- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
66899+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
66900
66901 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
66902 }
66903@@ -389,7 +389,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
66904 return 1;
66905
66906 bt = buf->chan->private_data;
66907- atomic_inc(&bt->dropped);
66908+ atomic_inc_unchecked(&bt->dropped);
66909 return 0;
66910 }
66911
66912@@ -490,7 +490,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
66913
66914 bt->dir = dir;
66915 bt->dev = dev;
66916- atomic_set(&bt->dropped, 0);
66917+ atomic_set_unchecked(&bt->dropped, 0);
66918
66919 ret = -EIO;
66920 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
66921diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
66922index 25b4f4d..6f4772d 100644
66923--- a/kernel/trace/ftrace.c
66924+++ b/kernel/trace/ftrace.c
66925@@ -1587,12 +1587,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
66926 if (unlikely(ftrace_disabled))
66927 return 0;
66928
66929+ ret = ftrace_arch_code_modify_prepare();
66930+ FTRACE_WARN_ON(ret);
66931+ if (ret)
66932+ return 0;
66933+
66934 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
66935+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
66936 if (ret) {
66937 ftrace_bug(ret, ip);
66938- return 0;
66939 }
66940- return 1;
66941+ return ret ? 0 : 1;
66942 }
66943
66944 /*
66945@@ -2608,7 +2613,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
66946
66947 int
66948 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
66949- void *data)
66950+ void *data)
66951 {
66952 struct ftrace_func_probe *entry;
66953 struct ftrace_page *pg;
66954diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
66955index f2bd275..adaf3a2 100644
66956--- a/kernel/trace/trace.c
66957+++ b/kernel/trace/trace.c
66958@@ -4201,10 +4201,9 @@ static const struct file_operations tracing_dyn_info_fops = {
66959 };
66960 #endif
66961
66962-static struct dentry *d_tracer;
66963-
66964 struct dentry *tracing_init_dentry(void)
66965 {
66966+ static struct dentry *d_tracer;
66967 static int once;
66968
66969 if (d_tracer)
66970@@ -4224,10 +4223,9 @@ struct dentry *tracing_init_dentry(void)
66971 return d_tracer;
66972 }
66973
66974-static struct dentry *d_percpu;
66975-
66976 struct dentry *tracing_dentry_percpu(void)
66977 {
66978+ static struct dentry *d_percpu;
66979 static int once;
66980 struct dentry *d_tracer;
66981
66982diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
66983index c212a7f..7b02394 100644
66984--- a/kernel/trace/trace_events.c
66985+++ b/kernel/trace/trace_events.c
66986@@ -1299,10 +1299,6 @@ static LIST_HEAD(ftrace_module_file_list);
66987 struct ftrace_module_file_ops {
66988 struct list_head list;
66989 struct module *mod;
66990- struct file_operations id;
66991- struct file_operations enable;
66992- struct file_operations format;
66993- struct file_operations filter;
66994 };
66995
66996 static struct ftrace_module_file_ops *
66997@@ -1323,17 +1319,12 @@ trace_create_file_ops(struct module *mod)
66998
66999 file_ops->mod = mod;
67000
67001- file_ops->id = ftrace_event_id_fops;
67002- file_ops->id.owner = mod;
67003-
67004- file_ops->enable = ftrace_enable_fops;
67005- file_ops->enable.owner = mod;
67006-
67007- file_ops->filter = ftrace_event_filter_fops;
67008- file_ops->filter.owner = mod;
67009-
67010- file_ops->format = ftrace_event_format_fops;
67011- file_ops->format.owner = mod;
67012+ pax_open_kernel();
67013+ *(void **)&mod->trace_id.owner = mod;
67014+ *(void **)&mod->trace_enable.owner = mod;
67015+ *(void **)&mod->trace_filter.owner = mod;
67016+ *(void **)&mod->trace_format.owner = mod;
67017+ pax_close_kernel();
67018
67019 list_add(&file_ops->list, &ftrace_module_file_list);
67020
67021@@ -1357,8 +1348,8 @@ static void trace_module_add_events(struct module *mod)
67022
67023 for_each_event(call, start, end) {
67024 __trace_add_event_call(*call, mod,
67025- &file_ops->id, &file_ops->enable,
67026- &file_ops->filter, &file_ops->format);
67027+ &mod->trace_id, &mod->trace_enable,
67028+ &mod->trace_filter, &mod->trace_format);
67029 }
67030 }
67031
67032diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
67033index 00d527c..7c5b1a3 100644
67034--- a/kernel/trace/trace_kprobe.c
67035+++ b/kernel/trace/trace_kprobe.c
67036@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
67037 long ret;
67038 int maxlen = get_rloc_len(*(u32 *)dest);
67039 u8 *dst = get_rloc_data(dest);
67040- u8 *src = addr;
67041+ const u8 __user *src = (const u8 __force_user *)addr;
67042 mm_segment_t old_fs = get_fs();
67043 if (!maxlen)
67044 return;
67045@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
67046 pagefault_disable();
67047 do
67048 ret = __copy_from_user_inatomic(dst++, src++, 1);
67049- while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
67050+ while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
67051 dst[-1] = '\0';
67052 pagefault_enable();
67053 set_fs(old_fs);
67054@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
67055 ((u8 *)get_rloc_data(dest))[0] = '\0';
67056 *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
67057 } else
67058- *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
67059+ *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
67060 get_rloc_offs(*(u32 *)dest));
67061 }
67062 /* Return the length of string -- including null terminal byte */
67063@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
67064 set_fs(KERNEL_DS);
67065 pagefault_disable();
67066 do {
67067- ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
67068+ ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
67069 len++;
67070 } while (c && ret == 0 && len < MAX_STRING_SIZE);
67071 pagefault_enable();
67072diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
67073index fd3c8aa..5f324a6 100644
67074--- a/kernel/trace/trace_mmiotrace.c
67075+++ b/kernel/trace/trace_mmiotrace.c
67076@@ -24,7 +24,7 @@ struct header_iter {
67077 static struct trace_array *mmio_trace_array;
67078 static bool overrun_detected;
67079 static unsigned long prev_overruns;
67080-static atomic_t dropped_count;
67081+static atomic_unchecked_t dropped_count;
67082
67083 static void mmio_reset_data(struct trace_array *tr)
67084 {
67085@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
67086
67087 static unsigned long count_overruns(struct trace_iterator *iter)
67088 {
67089- unsigned long cnt = atomic_xchg(&dropped_count, 0);
67090+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
67091 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
67092
67093 if (over > prev_overruns)
67094@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
67095 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
67096 sizeof(*entry), 0, pc);
67097 if (!event) {
67098- atomic_inc(&dropped_count);
67099+ atomic_inc_unchecked(&dropped_count);
67100 return;
67101 }
67102 entry = ring_buffer_event_data(event);
67103@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
67104 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
67105 sizeof(*entry), 0, pc);
67106 if (!event) {
67107- atomic_inc(&dropped_count);
67108+ atomic_inc_unchecked(&dropped_count);
67109 return;
67110 }
67111 entry = ring_buffer_event_data(event);
67112diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
67113index 5199930..26c73a0 100644
67114--- a/kernel/trace/trace_output.c
67115+++ b/kernel/trace/trace_output.c
67116@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
67117
67118 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
67119 if (!IS_ERR(p)) {
67120- p = mangle_path(s->buffer + s->len, p, "\n");
67121+ p = mangle_path(s->buffer + s->len, p, "\n\\");
67122 if (p) {
67123 s->len = p - s->buffer;
67124 return 1;
67125diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
67126index 77575b3..6e623d1 100644
67127--- a/kernel/trace/trace_stack.c
67128+++ b/kernel/trace/trace_stack.c
67129@@ -50,7 +50,7 @@ static inline void check_stack(void)
67130 return;
67131
67132 /* we do not handle interrupt stacks yet */
67133- if (!object_is_on_stack(&this_size))
67134+ if (!object_starts_on_stack(&this_size))
67135 return;
67136
67137 local_irq_save(flags);
67138diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
67139index 209b379..7f76423 100644
67140--- a/kernel/trace/trace_workqueue.c
67141+++ b/kernel/trace/trace_workqueue.c
67142@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
67143 int cpu;
67144 pid_t pid;
67145 /* Can be inserted from interrupt or user context, need to be atomic */
67146- atomic_t inserted;
67147+ atomic_unchecked_t inserted;
67148 /*
67149 * Don't need to be atomic, works are serialized in a single workqueue thread
67150 * on a single CPU.
67151@@ -60,7 +60,7 @@ probe_workqueue_insertion(void *ignore,
67152 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
67153 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
67154 if (node->pid == wq_thread->pid) {
67155- atomic_inc(&node->inserted);
67156+ atomic_inc_unchecked(&node->inserted);
67157 goto found;
67158 }
67159 }
67160@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
67161 tsk = get_pid_task(pid, PIDTYPE_PID);
67162 if (tsk) {
67163 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
67164- atomic_read(&cws->inserted), cws->executed,
67165+ atomic_read_unchecked(&cws->inserted), cws->executed,
67166 tsk->comm);
67167 put_task_struct(tsk);
67168 }
67169diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
67170index 82928f5..92da771 100644
67171--- a/lib/Kconfig.debug
67172+++ b/lib/Kconfig.debug
67173@@ -1103,6 +1103,7 @@ config LATENCYTOP
67174 depends on DEBUG_KERNEL
67175 depends on STACKTRACE_SUPPORT
67176 depends on PROC_FS
67177+ depends on !GRKERNSEC_HIDESYM
67178 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
67179 select KALLSYMS
67180 select KALLSYMS_ALL
67181diff --git a/lib/bitmap.c b/lib/bitmap.c
67182index 0d4a127..33a06c7 100644
67183--- a/lib/bitmap.c
67184+++ b/lib/bitmap.c
67185@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
67186 {
67187 int c, old_c, totaldigits, ndigits, nchunks, nbits;
67188 u32 chunk;
67189- const char __user __force *ubuf = (const char __user __force *)buf;
67190+ const char __user *ubuf = (const char __force_user *)buf;
67191
67192 bitmap_zero(maskp, nmaskbits);
67193
67194@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user *ubuf,
67195 {
67196 if (!access_ok(VERIFY_READ, ubuf, ulen))
67197 return -EFAULT;
67198- return __bitmap_parse((const char __force *)ubuf,
67199+ return __bitmap_parse((const char __force_kernel *)ubuf,
67200 ulen, 1, maskp, nmaskbits);
67201
67202 }
67203@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
67204 {
67205 unsigned a, b;
67206 int c, old_c, totaldigits;
67207- const char __user __force *ubuf = (const char __user __force *)buf;
67208+ const char __user *ubuf = (const char __force_user *)buf;
67209 int exp_digit, in_range;
67210
67211 totaldigits = c = 0;
67212@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __user *ubuf,
67213 {
67214 if (!access_ok(VERIFY_READ, ubuf, ulen))
67215 return -EFAULT;
67216- return __bitmap_parselist((const char __force *)ubuf,
67217+ return __bitmap_parselist((const char __force_kernel *)ubuf,
67218 ulen, 1, maskp, nmaskbits);
67219 }
67220 EXPORT_SYMBOL(bitmap_parselist_user);
67221diff --git a/lib/bug.c b/lib/bug.c
67222index 1955209..cbbb2ad 100644
67223--- a/lib/bug.c
67224+++ b/lib/bug.c
67225@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
67226 return BUG_TRAP_TYPE_NONE;
67227
67228 bug = find_bug(bugaddr);
67229+ if (!bug)
67230+ return BUG_TRAP_TYPE_NONE;
67231
67232 file = NULL;
67233 line = 0;
67234diff --git a/lib/debugobjects.c b/lib/debugobjects.c
67235index a78b7c6..2c73084 100644
67236--- a/lib/debugobjects.c
67237+++ b/lib/debugobjects.c
67238@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
67239 if (limit > 4)
67240 return;
67241
67242- is_on_stack = object_is_on_stack(addr);
67243+ is_on_stack = object_starts_on_stack(addr);
67244 if (is_on_stack == onstack)
67245 return;
67246
67247diff --git a/lib/devres.c b/lib/devres.c
67248index 7c0e953..f642b5c 100644
67249--- a/lib/devres.c
67250+++ b/lib/devres.c
67251@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
67252 void devm_iounmap(struct device *dev, void __iomem *addr)
67253 {
67254 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
67255- (void *)addr));
67256+ (void __force *)addr));
67257 iounmap(addr);
67258 }
67259 EXPORT_SYMBOL(devm_iounmap);
67260@@ -141,7 +141,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
67261 {
67262 ioport_unmap(addr);
67263 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
67264- devm_ioport_map_match, (void *)addr));
67265+ devm_ioport_map_match, (void __force *)addr));
67266 }
67267 EXPORT_SYMBOL(devm_ioport_unmap);
67268
67269diff --git a/lib/dma-debug.c b/lib/dma-debug.c
67270index fea790a..ebb0e82 100644
67271--- a/lib/dma-debug.c
67272+++ b/lib/dma-debug.c
67273@@ -925,7 +925,7 @@ out:
67274
67275 static void check_for_stack(struct device *dev, void *addr)
67276 {
67277- if (object_is_on_stack(addr))
67278+ if (object_starts_on_stack(addr))
67279 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
67280 "stack [addr=%p]\n", addr);
67281 }
67282diff --git a/lib/extable.c b/lib/extable.c
67283index 4cac81e..63e9b8f 100644
67284--- a/lib/extable.c
67285+++ b/lib/extable.c
67286@@ -13,6 +13,7 @@
67287 #include <linux/init.h>
67288 #include <linux/sort.h>
67289 #include <asm/uaccess.h>
67290+#include <asm/pgtable.h>
67291
67292 #ifndef ARCH_HAS_SORT_EXTABLE
67293 /*
67294@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const void *b)
67295 void sort_extable(struct exception_table_entry *start,
67296 struct exception_table_entry *finish)
67297 {
67298+ pax_open_kernel();
67299 sort(start, finish - start, sizeof(struct exception_table_entry),
67300 cmp_ex, NULL);
67301+ pax_close_kernel();
67302 }
67303
67304 #ifdef CONFIG_MODULES
67305diff --git a/lib/inflate.c b/lib/inflate.c
67306index 013a761..c28f3fc 100644
67307--- a/lib/inflate.c
67308+++ b/lib/inflate.c
67309@@ -269,7 +269,7 @@ static void free(void *where)
67310 malloc_ptr = free_mem_ptr;
67311 }
67312 #else
67313-#define malloc(a) kmalloc(a, GFP_KERNEL)
67314+#define malloc(a) kmalloc((a), GFP_KERNEL)
67315 #define free(a) kfree(a)
67316 #endif
67317
67318diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
67319index bd2bea9..6b3c95e 100644
67320--- a/lib/is_single_threaded.c
67321+++ b/lib/is_single_threaded.c
67322@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
67323 struct task_struct *p, *t;
67324 bool ret;
67325
67326+ if (!mm)
67327+ return true;
67328+
67329 if (atomic_read(&task->signal->live) != 1)
67330 return false;
67331
67332diff --git a/lib/kref.c b/lib/kref.c
67333index 3efb882..8492f4c 100644
67334--- a/lib/kref.c
67335+++ b/lib/kref.c
67336@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
67337 */
67338 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
67339 {
67340- WARN_ON(release == NULL);
67341+ BUG_ON(release == NULL);
67342 WARN_ON(release == (void (*)(struct kref *))kfree);
67343
67344 if (atomic_dec_and_test(&kref->refcount)) {
67345diff --git a/lib/radix-tree.c b/lib/radix-tree.c
67346index d9df745..e73c2fe 100644
67347--- a/lib/radix-tree.c
67348+++ b/lib/radix-tree.c
67349@@ -80,7 +80,7 @@ struct radix_tree_preload {
67350 int nr;
67351 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
67352 };
67353-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
67354+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
67355
67356 static inline void *ptr_to_indirect(void *ptr)
67357 {
67358diff --git a/lib/vsprintf.c b/lib/vsprintf.c
67359index 993599e..84dc70e 100644
67360--- a/lib/vsprintf.c
67361+++ b/lib/vsprintf.c
67362@@ -16,6 +16,9 @@
67363 * - scnprintf and vscnprintf
67364 */
67365
67366+#ifdef CONFIG_GRKERNSEC_HIDESYM
67367+#define __INCLUDED_BY_HIDESYM 1
67368+#endif
67369 #include <stdarg.h>
67370 #include <linux/module.h>
67371 #include <linux/types.h>
67372@@ -413,7 +416,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
67373 char sym[KSYM_SYMBOL_LEN];
67374 if (ext == 'B')
67375 sprint_backtrace(sym, value);
67376- else if (ext != 'f' && ext != 's')
67377+ else if (ext != 'f' && ext != 's' && ext != 'a')
67378 sprint_symbol(sym, value);
67379 else
67380 kallsyms_lookup(value, NULL, NULL, NULL, sym);
67381@@ -777,7 +780,11 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
67382 return string(buf, end, uuid, spec);
67383 }
67384
67385+#ifdef CONFIG_GRKERNSEC_HIDESYM
67386+int kptr_restrict __read_mostly = 2;
67387+#else
67388 int kptr_restrict __read_mostly;
67389+#endif
67390
67391 /*
67392 * Show a '%p' thing. A kernel extension is that the '%p' is followed
67393@@ -791,6 +798,8 @@ int kptr_restrict __read_mostly;
67394 * - 'S' For symbolic direct pointers with offset
67395 * - 's' For symbolic direct pointers without offset
67396 * - 'B' For backtraced symbolic direct pointers with offset
67397+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
67398+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
67399 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
67400 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
67401 * - 'M' For a 6-byte MAC address, it prints the address in the
67402@@ -835,12 +844,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
67403 {
67404 if (!ptr && *fmt != 'K') {
67405 /*
67406- * Print (null) with the same width as a pointer so it makes
67407+ * Print (nil) with the same width as a pointer so it makes
67408 * tabular output look nice.
67409 */
67410 if (spec.field_width == -1)
67411 spec.field_width = 2 * sizeof(void *);
67412- return string(buf, end, "(null)", spec);
67413+ return string(buf, end, "(nil)", spec);
67414 }
67415
67416 switch (*fmt) {
67417@@ -850,6 +859,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
67418 /* Fallthrough */
67419 case 'S':
67420 case 's':
67421+#ifdef CONFIG_GRKERNSEC_HIDESYM
67422+ break;
67423+#else
67424+ return symbol_string(buf, end, ptr, spec, *fmt);
67425+#endif
67426+ case 'A':
67427+ case 'a':
67428 case 'B':
67429 return symbol_string(buf, end, ptr, spec, *fmt);
67430 case 'R':
67431@@ -1608,11 +1624,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
67432 typeof(type) value; \
67433 if (sizeof(type) == 8) { \
67434 args = PTR_ALIGN(args, sizeof(u32)); \
67435- *(u32 *)&value = *(u32 *)args; \
67436- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
67437+ *(u32 *)&value = *(const u32 *)args; \
67438+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
67439 } else { \
67440 args = PTR_ALIGN(args, sizeof(type)); \
67441- value = *(typeof(type) *)args; \
67442+ value = *(const typeof(type) *)args; \
67443 } \
67444 args += sizeof(type); \
67445 value; \
67446@@ -1675,7 +1691,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
67447 case FORMAT_TYPE_STR: {
67448 const char *str_arg = args;
67449 args += strlen(str_arg) + 1;
67450- str = string(str, end, (char *)str_arg, spec);
67451+ str = string(str, end, str_arg, spec);
67452 break;
67453 }
67454
67455diff --git a/localversion-grsec b/localversion-grsec
67456new file mode 100644
67457index 0000000..7cd6065
67458--- /dev/null
67459+++ b/localversion-grsec
67460@@ -0,0 +1 @@
67461+-grsec
67462diff --git a/mm/Kconfig b/mm/Kconfig
67463index 011b110..b492af2 100644
67464--- a/mm/Kconfig
67465+++ b/mm/Kconfig
67466@@ -241,10 +241,10 @@ config KSM
67467 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
67468
67469 config DEFAULT_MMAP_MIN_ADDR
67470- int "Low address space to protect from user allocation"
67471+ int "Low address space to protect from user allocation"
67472 depends on MMU
67473- default 4096
67474- help
67475+ default 65536
67476+ help
67477 This is the portion of low virtual memory which should be protected
67478 from userspace allocation. Keeping a user from writing to low pages
67479 can help reduce the impact of kernel NULL pointer bugs.
67480diff --git a/mm/filemap.c b/mm/filemap.c
67481index 90286a4..f441caa 100644
67482--- a/mm/filemap.c
67483+++ b/mm/filemap.c
67484@@ -1770,7 +1770,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
67485 struct address_space *mapping = file->f_mapping;
67486
67487 if (!mapping->a_ops->readpage)
67488- return -ENOEXEC;
67489+ return -ENODEV;
67490 file_accessed(file);
67491 vma->vm_ops = &generic_file_vm_ops;
67492 vma->vm_flags |= VM_CAN_NONLINEAR;
67493@@ -2176,6 +2176,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
67494 *pos = i_size_read(inode);
67495
67496 if (limit != RLIM_INFINITY) {
67497+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
67498 if (*pos >= limit) {
67499 send_sig(SIGXFSZ, current, 0);
67500 return -EFBIG;
67501diff --git a/mm/fremap.c b/mm/fremap.c
67502index 9ed4fd4..c42648d 100644
67503--- a/mm/fremap.c
67504+++ b/mm/fremap.c
67505@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
67506 retry:
67507 vma = find_vma(mm, start);
67508
67509+#ifdef CONFIG_PAX_SEGMEXEC
67510+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
67511+ goto out;
67512+#endif
67513+
67514 /*
67515 * Make sure the vma is shared, that it supports prefaulting,
67516 * and that the remapped range is valid and fully within
67517diff --git a/mm/highmem.c b/mm/highmem.c
67518index 57d82c6..e9e0552 100644
67519--- a/mm/highmem.c
67520+++ b/mm/highmem.c
67521@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
67522 * So no dangers, even with speculative execution.
67523 */
67524 page = pte_page(pkmap_page_table[i]);
67525+ pax_open_kernel();
67526 pte_clear(&init_mm, (unsigned long)page_address(page),
67527 &pkmap_page_table[i]);
67528-
67529+ pax_close_kernel();
67530 set_page_address(page, NULL);
67531 need_flush = 1;
67532 }
67533@@ -186,9 +187,11 @@ start:
67534 }
67535 }
67536 vaddr = PKMAP_ADDR(last_pkmap_nr);
67537+
67538+ pax_open_kernel();
67539 set_pte_at(&init_mm, vaddr,
67540 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
67541-
67542+ pax_close_kernel();
67543 pkmap_count[last_pkmap_nr] = 1;
67544 set_page_address(page, (void *)vaddr);
67545
67546diff --git a/mm/huge_memory.c b/mm/huge_memory.c
67547index 36b3d98..584cb54 100644
67548--- a/mm/huge_memory.c
67549+++ b/mm/huge_memory.c
67550@@ -703,7 +703,7 @@ out:
67551 * run pte_offset_map on the pmd, if an huge pmd could
67552 * materialize from under us from a different thread.
67553 */
67554- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
67555+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
67556 return VM_FAULT_OOM;
67557 /* if an huge pmd materialized from under us just retry later */
67558 if (unlikely(pmd_trans_huge(*pmd)))
67559diff --git a/mm/hugetlb.c b/mm/hugetlb.c
67560index 2316840..b418671 100644
67561--- a/mm/hugetlb.c
67562+++ b/mm/hugetlb.c
67563@@ -2347,6 +2347,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
67564 return 1;
67565 }
67566
67567+#ifdef CONFIG_PAX_SEGMEXEC
67568+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
67569+{
67570+ struct mm_struct *mm = vma->vm_mm;
67571+ struct vm_area_struct *vma_m;
67572+ unsigned long address_m;
67573+ pte_t *ptep_m;
67574+
67575+ vma_m = pax_find_mirror_vma(vma);
67576+ if (!vma_m)
67577+ return;
67578+
67579+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
67580+ address_m = address + SEGMEXEC_TASK_SIZE;
67581+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
67582+ get_page(page_m);
67583+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
67584+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
67585+}
67586+#endif
67587+
67588 /*
67589 * Hugetlb_cow() should be called with page lock of the original hugepage held.
67590 */
67591@@ -2450,6 +2471,11 @@ retry_avoidcopy:
67592 make_huge_pte(vma, new_page, 1));
67593 page_remove_rmap(old_page);
67594 hugepage_add_new_anon_rmap(new_page, vma, address);
67595+
67596+#ifdef CONFIG_PAX_SEGMEXEC
67597+ pax_mirror_huge_pte(vma, address, new_page);
67598+#endif
67599+
67600 /* Make the old page be freed below */
67601 new_page = old_page;
67602 mmu_notifier_invalidate_range_end(mm,
67603@@ -2601,6 +2627,10 @@ retry:
67604 && (vma->vm_flags & VM_SHARED)));
67605 set_huge_pte_at(mm, address, ptep, new_pte);
67606
67607+#ifdef CONFIG_PAX_SEGMEXEC
67608+ pax_mirror_huge_pte(vma, address, page);
67609+#endif
67610+
67611 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
67612 /* Optimization, do the COW without a second fault */
67613 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
67614@@ -2630,6 +2660,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
67615 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
67616 struct hstate *h = hstate_vma(vma);
67617
67618+#ifdef CONFIG_PAX_SEGMEXEC
67619+ struct vm_area_struct *vma_m;
67620+#endif
67621+
67622 ptep = huge_pte_offset(mm, address);
67623 if (ptep) {
67624 entry = huge_ptep_get(ptep);
67625@@ -2641,6 +2675,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
67626 VM_FAULT_SET_HINDEX(h - hstates);
67627 }
67628
67629+#ifdef CONFIG_PAX_SEGMEXEC
67630+ vma_m = pax_find_mirror_vma(vma);
67631+ if (vma_m) {
67632+ unsigned long address_m;
67633+
67634+ if (vma->vm_start > vma_m->vm_start) {
67635+ address_m = address;
67636+ address -= SEGMEXEC_TASK_SIZE;
67637+ vma = vma_m;
67638+ h = hstate_vma(vma);
67639+ } else
67640+ address_m = address + SEGMEXEC_TASK_SIZE;
67641+
67642+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
67643+ return VM_FAULT_OOM;
67644+ address_m &= HPAGE_MASK;
67645+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
67646+ }
67647+#endif
67648+
67649 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
67650 if (!ptep)
67651 return VM_FAULT_OOM;
67652diff --git a/mm/internal.h b/mm/internal.h
67653index 2189af4..f2ca332 100644
67654--- a/mm/internal.h
67655+++ b/mm/internal.h
67656@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
67657 * in mm/page_alloc.c
67658 */
67659 extern void __free_pages_bootmem(struct page *page, unsigned int order);
67660+extern void free_compound_page(struct page *page);
67661 extern void prep_compound_page(struct page *page, unsigned long order);
67662 #ifdef CONFIG_MEMORY_FAILURE
67663 extern bool is_free_buddy_page(struct page *page);
67664diff --git a/mm/kmemleak.c b/mm/kmemleak.c
67665index f3b2a00..61da94d 100644
67666--- a/mm/kmemleak.c
67667+++ b/mm/kmemleak.c
67668@@ -357,7 +357,7 @@ static void print_unreferenced(struct seq_file *seq,
67669
67670 for (i = 0; i < object->trace_len; i++) {
67671 void *ptr = (void *)object->trace[i];
67672- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
67673+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
67674 }
67675 }
67676
67677diff --git a/mm/maccess.c b/mm/maccess.c
67678index d53adf9..03a24bf 100644
67679--- a/mm/maccess.c
67680+++ b/mm/maccess.c
67681@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
67682 set_fs(KERNEL_DS);
67683 pagefault_disable();
67684 ret = __copy_from_user_inatomic(dst,
67685- (__force const void __user *)src, size);
67686+ (const void __force_user *)src, size);
67687 pagefault_enable();
67688 set_fs(old_fs);
67689
67690@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
67691
67692 set_fs(KERNEL_DS);
67693 pagefault_disable();
67694- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
67695+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
67696 pagefault_enable();
67697 set_fs(old_fs);
67698
67699diff --git a/mm/madvise.c b/mm/madvise.c
67700index 74bf193..feb6fd3 100644
67701--- a/mm/madvise.c
67702+++ b/mm/madvise.c
67703@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
67704 pgoff_t pgoff;
67705 unsigned long new_flags = vma->vm_flags;
67706
67707+#ifdef CONFIG_PAX_SEGMEXEC
67708+ struct vm_area_struct *vma_m;
67709+#endif
67710+
67711 switch (behavior) {
67712 case MADV_NORMAL:
67713 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
67714@@ -110,6 +114,13 @@ success:
67715 /*
67716 * vm_flags is protected by the mmap_sem held in write mode.
67717 */
67718+
67719+#ifdef CONFIG_PAX_SEGMEXEC
67720+ vma_m = pax_find_mirror_vma(vma);
67721+ if (vma_m)
67722+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
67723+#endif
67724+
67725 vma->vm_flags = new_flags;
67726
67727 out:
67728@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
67729 struct vm_area_struct ** prev,
67730 unsigned long start, unsigned long end)
67731 {
67732+
67733+#ifdef CONFIG_PAX_SEGMEXEC
67734+ struct vm_area_struct *vma_m;
67735+#endif
67736+
67737 *prev = vma;
67738 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
67739 return -EINVAL;
67740@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
67741 zap_page_range(vma, start, end - start, &details);
67742 } else
67743 zap_page_range(vma, start, end - start, NULL);
67744+
67745+#ifdef CONFIG_PAX_SEGMEXEC
67746+ vma_m = pax_find_mirror_vma(vma);
67747+ if (vma_m) {
67748+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
67749+ struct zap_details details = {
67750+ .nonlinear_vma = vma_m,
67751+ .last_index = ULONG_MAX,
67752+ };
67753+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
67754+ } else
67755+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
67756+ }
67757+#endif
67758+
67759 return 0;
67760 }
67761
67762@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
67763 if (end < start)
67764 goto out;
67765
67766+#ifdef CONFIG_PAX_SEGMEXEC
67767+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
67768+ if (end > SEGMEXEC_TASK_SIZE)
67769+ goto out;
67770+ } else
67771+#endif
67772+
67773+ if (end > TASK_SIZE)
67774+ goto out;
67775+
67776 error = 0;
67777 if (end == start)
67778 goto out;
67779diff --git a/mm/memory-failure.c b/mm/memory-failure.c
67780index 06d3479..0778eef 100644
67781--- a/mm/memory-failure.c
67782+++ b/mm/memory-failure.c
67783@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
67784
67785 int sysctl_memory_failure_recovery __read_mostly = 1;
67786
67787-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
67788+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
67789
67790 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
67791
67792@@ -202,7 +202,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
67793 si.si_signo = SIGBUS;
67794 si.si_errno = 0;
67795 si.si_code = BUS_MCEERR_AO;
67796- si.si_addr = (void *)addr;
67797+ si.si_addr = (void __user *)addr;
67798 #ifdef __ARCH_SI_TRAPNO
67799 si.si_trapno = trapno;
67800 #endif
67801@@ -1010,7 +1010,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
67802 }
67803
67804 nr_pages = 1 << compound_trans_order(hpage);
67805- atomic_long_add(nr_pages, &mce_bad_pages);
67806+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
67807
67808 /*
67809 * We need/can do nothing about count=0 pages.
67810@@ -1040,7 +1040,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
67811 if (!PageHWPoison(hpage)
67812 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
67813 || (p != hpage && TestSetPageHWPoison(hpage))) {
67814- atomic_long_sub(nr_pages, &mce_bad_pages);
67815+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
67816 return 0;
67817 }
67818 set_page_hwpoison_huge_page(hpage);
67819@@ -1098,7 +1098,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
67820 }
67821 if (hwpoison_filter(p)) {
67822 if (TestClearPageHWPoison(p))
67823- atomic_long_sub(nr_pages, &mce_bad_pages);
67824+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
67825 unlock_page(hpage);
67826 put_page(hpage);
67827 return 0;
67828@@ -1315,7 +1315,7 @@ int unpoison_memory(unsigned long pfn)
67829 return 0;
67830 }
67831 if (TestClearPageHWPoison(p))
67832- atomic_long_sub(nr_pages, &mce_bad_pages);
67833+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
67834 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
67835 return 0;
67836 }
67837@@ -1329,7 +1329,7 @@ int unpoison_memory(unsigned long pfn)
67838 */
67839 if (TestClearPageHWPoison(page)) {
67840 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
67841- atomic_long_sub(nr_pages, &mce_bad_pages);
67842+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
67843 freeit = 1;
67844 if (PageHuge(page))
67845 clear_page_hwpoison_huge_page(page);
67846@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
67847 }
67848 done:
67849 if (!PageHWPoison(hpage))
67850- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
67851+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
67852 set_page_hwpoison_huge_page(hpage);
67853 dequeue_hwpoisoned_huge_page(hpage);
67854 /* keep elevated page count for bad page */
67855@@ -1573,7 +1573,7 @@ int soft_offline_page(struct page *page, int flags)
67856 return ret;
67857
67858 done:
67859- atomic_long_add(1, &mce_bad_pages);
67860+ atomic_long_add_unchecked(1, &mce_bad_pages);
67861 SetPageHWPoison(page);
67862 /* keep elevated page count for bad page */
67863 return ret;
67864diff --git a/mm/memory.c b/mm/memory.c
67865index 829d437..3d3926a 100644
67866--- a/mm/memory.c
67867+++ b/mm/memory.c
67868@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
67869 return;
67870
67871 pmd = pmd_offset(pud, start);
67872+
67873+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
67874 pud_clear(pud);
67875 pmd_free_tlb(tlb, pmd, start);
67876+#endif
67877+
67878 }
67879
67880 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
67881@@ -489,9 +493,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
67882 if (end - 1 > ceiling - 1)
67883 return;
67884
67885+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
67886 pud = pud_offset(pgd, start);
67887 pgd_clear(pgd);
67888 pud_free_tlb(tlb, pud, start);
67889+#endif
67890+
67891 }
67892
67893 /*
67894@@ -1566,12 +1573,6 @@ no_page_table:
67895 return page;
67896 }
67897
67898-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
67899-{
67900- return stack_guard_page_start(vma, addr) ||
67901- stack_guard_page_end(vma, addr+PAGE_SIZE);
67902-}
67903-
67904 /**
67905 * __get_user_pages() - pin user pages in memory
67906 * @tsk: task_struct of target task
67907@@ -1644,10 +1645,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
67908 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
67909 i = 0;
67910
67911- do {
67912+ while (nr_pages) {
67913 struct vm_area_struct *vma;
67914
67915- vma = find_extend_vma(mm, start);
67916+ vma = find_vma(mm, start);
67917 if (!vma && in_gate_area(mm, start)) {
67918 unsigned long pg = start & PAGE_MASK;
67919 pgd_t *pgd;
67920@@ -1695,7 +1696,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
67921 goto next_page;
67922 }
67923
67924- if (!vma ||
67925+ if (!vma || start < vma->vm_start ||
67926 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
67927 !(vm_flags & vma->vm_flags))
67928 return i ? : -EFAULT;
67929@@ -1722,11 +1723,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
67930 int ret;
67931 unsigned int fault_flags = 0;
67932
67933- /* For mlock, just skip the stack guard page. */
67934- if (foll_flags & FOLL_MLOCK) {
67935- if (stack_guard_page(vma, start))
67936- goto next_page;
67937- }
67938 if (foll_flags & FOLL_WRITE)
67939 fault_flags |= FAULT_FLAG_WRITE;
67940 if (nonblocking)
67941@@ -1800,7 +1796,7 @@ next_page:
67942 start += PAGE_SIZE;
67943 nr_pages--;
67944 } while (nr_pages && start < vma->vm_end);
67945- } while (nr_pages);
67946+ }
67947 return i;
67948 }
67949 EXPORT_SYMBOL(__get_user_pages);
67950@@ -2007,6 +2003,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
67951 page_add_file_rmap(page);
67952 set_pte_at(mm, addr, pte, mk_pte(page, prot));
67953
67954+#ifdef CONFIG_PAX_SEGMEXEC
67955+ pax_mirror_file_pte(vma, addr, page, ptl);
67956+#endif
67957+
67958 retval = 0;
67959 pte_unmap_unlock(pte, ptl);
67960 return retval;
67961@@ -2041,10 +2041,22 @@ out:
67962 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
67963 struct page *page)
67964 {
67965+
67966+#ifdef CONFIG_PAX_SEGMEXEC
67967+ struct vm_area_struct *vma_m;
67968+#endif
67969+
67970 if (addr < vma->vm_start || addr >= vma->vm_end)
67971 return -EFAULT;
67972 if (!page_count(page))
67973 return -EINVAL;
67974+
67975+#ifdef CONFIG_PAX_SEGMEXEC
67976+ vma_m = pax_find_mirror_vma(vma);
67977+ if (vma_m)
67978+ vma_m->vm_flags |= VM_INSERTPAGE;
67979+#endif
67980+
67981 vma->vm_flags |= VM_INSERTPAGE;
67982 return insert_page(vma, addr, page, vma->vm_page_prot);
67983 }
67984@@ -2130,6 +2142,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
67985 unsigned long pfn)
67986 {
67987 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
67988+ BUG_ON(vma->vm_mirror);
67989
67990 if (addr < vma->vm_start || addr >= vma->vm_end)
67991 return -EFAULT;
67992@@ -2445,6 +2458,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
67993 copy_user_highpage(dst, src, va, vma);
67994 }
67995
67996+#ifdef CONFIG_PAX_SEGMEXEC
67997+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
67998+{
67999+ struct mm_struct *mm = vma->vm_mm;
68000+ spinlock_t *ptl;
68001+ pte_t *pte, entry;
68002+
68003+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
68004+ entry = *pte;
68005+ if (!pte_present(entry)) {
68006+ if (!pte_none(entry)) {
68007+ BUG_ON(pte_file(entry));
68008+ free_swap_and_cache(pte_to_swp_entry(entry));
68009+ pte_clear_not_present_full(mm, address, pte, 0);
68010+ }
68011+ } else {
68012+ struct page *page;
68013+
68014+ flush_cache_page(vma, address, pte_pfn(entry));
68015+ entry = ptep_clear_flush(vma, address, pte);
68016+ BUG_ON(pte_dirty(entry));
68017+ page = vm_normal_page(vma, address, entry);
68018+ if (page) {
68019+ update_hiwater_rss(mm);
68020+ if (PageAnon(page))
68021+ dec_mm_counter_fast(mm, MM_ANONPAGES);
68022+ else
68023+ dec_mm_counter_fast(mm, MM_FILEPAGES);
68024+ page_remove_rmap(page);
68025+ page_cache_release(page);
68026+ }
68027+ }
68028+ pte_unmap_unlock(pte, ptl);
68029+}
68030+
68031+/* PaX: if vma is mirrored, synchronize the mirror's PTE
68032+ *
68033+ * the ptl of the lower mapped page is held on entry and is not released on exit
68034+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
68035+ */
68036+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
68037+{
68038+ struct mm_struct *mm = vma->vm_mm;
68039+ unsigned long address_m;
68040+ spinlock_t *ptl_m;
68041+ struct vm_area_struct *vma_m;
68042+ pmd_t *pmd_m;
68043+ pte_t *pte_m, entry_m;
68044+
68045+ BUG_ON(!page_m || !PageAnon(page_m));
68046+
68047+ vma_m = pax_find_mirror_vma(vma);
68048+ if (!vma_m)
68049+ return;
68050+
68051+ BUG_ON(!PageLocked(page_m));
68052+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
68053+ address_m = address + SEGMEXEC_TASK_SIZE;
68054+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
68055+ pte_m = pte_offset_map(pmd_m, address_m);
68056+ ptl_m = pte_lockptr(mm, pmd_m);
68057+ if (ptl != ptl_m) {
68058+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
68059+ if (!pte_none(*pte_m))
68060+ goto out;
68061+ }
68062+
68063+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
68064+ page_cache_get(page_m);
68065+ page_add_anon_rmap(page_m, vma_m, address_m);
68066+ inc_mm_counter_fast(mm, MM_ANONPAGES);
68067+ set_pte_at(mm, address_m, pte_m, entry_m);
68068+ update_mmu_cache(vma_m, address_m, entry_m);
68069+out:
68070+ if (ptl != ptl_m)
68071+ spin_unlock(ptl_m);
68072+ pte_unmap(pte_m);
68073+ unlock_page(page_m);
68074+}
68075+
68076+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
68077+{
68078+ struct mm_struct *mm = vma->vm_mm;
68079+ unsigned long address_m;
68080+ spinlock_t *ptl_m;
68081+ struct vm_area_struct *vma_m;
68082+ pmd_t *pmd_m;
68083+ pte_t *pte_m, entry_m;
68084+
68085+ BUG_ON(!page_m || PageAnon(page_m));
68086+
68087+ vma_m = pax_find_mirror_vma(vma);
68088+ if (!vma_m)
68089+ return;
68090+
68091+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
68092+ address_m = address + SEGMEXEC_TASK_SIZE;
68093+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
68094+ pte_m = pte_offset_map(pmd_m, address_m);
68095+ ptl_m = pte_lockptr(mm, pmd_m);
68096+ if (ptl != ptl_m) {
68097+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
68098+ if (!pte_none(*pte_m))
68099+ goto out;
68100+ }
68101+
68102+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
68103+ page_cache_get(page_m);
68104+ page_add_file_rmap(page_m);
68105+ inc_mm_counter_fast(mm, MM_FILEPAGES);
68106+ set_pte_at(mm, address_m, pte_m, entry_m);
68107+ update_mmu_cache(vma_m, address_m, entry_m);
68108+out:
68109+ if (ptl != ptl_m)
68110+ spin_unlock(ptl_m);
68111+ pte_unmap(pte_m);
68112+}
68113+
68114+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
68115+{
68116+ struct mm_struct *mm = vma->vm_mm;
68117+ unsigned long address_m;
68118+ spinlock_t *ptl_m;
68119+ struct vm_area_struct *vma_m;
68120+ pmd_t *pmd_m;
68121+ pte_t *pte_m, entry_m;
68122+
68123+ vma_m = pax_find_mirror_vma(vma);
68124+ if (!vma_m)
68125+ return;
68126+
68127+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
68128+ address_m = address + SEGMEXEC_TASK_SIZE;
68129+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
68130+ pte_m = pte_offset_map(pmd_m, address_m);
68131+ ptl_m = pte_lockptr(mm, pmd_m);
68132+ if (ptl != ptl_m) {
68133+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
68134+ if (!pte_none(*pte_m))
68135+ goto out;
68136+ }
68137+
68138+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
68139+ set_pte_at(mm, address_m, pte_m, entry_m);
68140+out:
68141+ if (ptl != ptl_m)
68142+ spin_unlock(ptl_m);
68143+ pte_unmap(pte_m);
68144+}
68145+
68146+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
68147+{
68148+ struct page *page_m;
68149+ pte_t entry;
68150+
68151+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
68152+ goto out;
68153+
68154+ entry = *pte;
68155+ page_m = vm_normal_page(vma, address, entry);
68156+ if (!page_m)
68157+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
68158+ else if (PageAnon(page_m)) {
68159+ if (pax_find_mirror_vma(vma)) {
68160+ pte_unmap_unlock(pte, ptl);
68161+ lock_page(page_m);
68162+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
68163+ if (pte_same(entry, *pte))
68164+ pax_mirror_anon_pte(vma, address, page_m, ptl);
68165+ else
68166+ unlock_page(page_m);
68167+ }
68168+ } else
68169+ pax_mirror_file_pte(vma, address, page_m, ptl);
68170+
68171+out:
68172+ pte_unmap_unlock(pte, ptl);
68173+}
68174+#endif
68175+
68176 /*
68177 * This routine handles present pages, when users try to write
68178 * to a shared page. It is done by copying the page to a new address
68179@@ -2656,6 +2849,12 @@ gotten:
68180 */
68181 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
68182 if (likely(pte_same(*page_table, orig_pte))) {
68183+
68184+#ifdef CONFIG_PAX_SEGMEXEC
68185+ if (pax_find_mirror_vma(vma))
68186+ BUG_ON(!trylock_page(new_page));
68187+#endif
68188+
68189 if (old_page) {
68190 if (!PageAnon(old_page)) {
68191 dec_mm_counter_fast(mm, MM_FILEPAGES);
68192@@ -2707,6 +2906,10 @@ gotten:
68193 page_remove_rmap(old_page);
68194 }
68195
68196+#ifdef CONFIG_PAX_SEGMEXEC
68197+ pax_mirror_anon_pte(vma, address, new_page, ptl);
68198+#endif
68199+
68200 /* Free the old page.. */
68201 new_page = old_page;
68202 ret |= VM_FAULT_WRITE;
68203@@ -2986,6 +3189,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
68204 swap_free(entry);
68205 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
68206 try_to_free_swap(page);
68207+
68208+#ifdef CONFIG_PAX_SEGMEXEC
68209+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
68210+#endif
68211+
68212 unlock_page(page);
68213 if (swapcache) {
68214 /*
68215@@ -3009,6 +3217,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
68216
68217 /* No need to invalidate - it was non-present before */
68218 update_mmu_cache(vma, address, page_table);
68219+
68220+#ifdef CONFIG_PAX_SEGMEXEC
68221+ pax_mirror_anon_pte(vma, address, page, ptl);
68222+#endif
68223+
68224 unlock:
68225 pte_unmap_unlock(page_table, ptl);
68226 out:
68227@@ -3028,40 +3241,6 @@ out_release:
68228 }
68229
68230 /*
68231- * This is like a special single-page "expand_{down|up}wards()",
68232- * except we must first make sure that 'address{-|+}PAGE_SIZE'
68233- * doesn't hit another vma.
68234- */
68235-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
68236-{
68237- address &= PAGE_MASK;
68238- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
68239- struct vm_area_struct *prev = vma->vm_prev;
68240-
68241- /*
68242- * Is there a mapping abutting this one below?
68243- *
68244- * That's only ok if it's the same stack mapping
68245- * that has gotten split..
68246- */
68247- if (prev && prev->vm_end == address)
68248- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
68249-
68250- expand_downwards(vma, address - PAGE_SIZE);
68251- }
68252- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
68253- struct vm_area_struct *next = vma->vm_next;
68254-
68255- /* As VM_GROWSDOWN but s/below/above/ */
68256- if (next && next->vm_start == address + PAGE_SIZE)
68257- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
68258-
68259- expand_upwards(vma, address + PAGE_SIZE);
68260- }
68261- return 0;
68262-}
68263-
68264-/*
68265 * We enter with non-exclusive mmap_sem (to exclude vma changes,
68266 * but allow concurrent faults), and pte mapped but not yet locked.
68267 * We return with mmap_sem still held, but pte unmapped and unlocked.
68268@@ -3070,27 +3249,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
68269 unsigned long address, pte_t *page_table, pmd_t *pmd,
68270 unsigned int flags)
68271 {
68272- struct page *page;
68273+ struct page *page = NULL;
68274 spinlock_t *ptl;
68275 pte_t entry;
68276
68277- pte_unmap(page_table);
68278-
68279- /* Check if we need to add a guard page to the stack */
68280- if (check_stack_guard_page(vma, address) < 0)
68281- return VM_FAULT_SIGBUS;
68282-
68283- /* Use the zero-page for reads */
68284 if (!(flags & FAULT_FLAG_WRITE)) {
68285 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
68286 vma->vm_page_prot));
68287- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
68288+ ptl = pte_lockptr(mm, pmd);
68289+ spin_lock(ptl);
68290 if (!pte_none(*page_table))
68291 goto unlock;
68292 goto setpte;
68293 }
68294
68295 /* Allocate our own private page. */
68296+ pte_unmap(page_table);
68297+
68298 if (unlikely(anon_vma_prepare(vma)))
68299 goto oom;
68300 page = alloc_zeroed_user_highpage_movable(vma, address);
68301@@ -3109,6 +3284,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
68302 if (!pte_none(*page_table))
68303 goto release;
68304
68305+#ifdef CONFIG_PAX_SEGMEXEC
68306+ if (pax_find_mirror_vma(vma))
68307+ BUG_ON(!trylock_page(page));
68308+#endif
68309+
68310 inc_mm_counter_fast(mm, MM_ANONPAGES);
68311 page_add_new_anon_rmap(page, vma, address);
68312 setpte:
68313@@ -3116,6 +3296,12 @@ setpte:
68314
68315 /* No need to invalidate - it was non-present before */
68316 update_mmu_cache(vma, address, page_table);
68317+
68318+#ifdef CONFIG_PAX_SEGMEXEC
68319+ if (page)
68320+ pax_mirror_anon_pte(vma, address, page, ptl);
68321+#endif
68322+
68323 unlock:
68324 pte_unmap_unlock(page_table, ptl);
68325 return 0;
68326@@ -3259,6 +3445,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68327 */
68328 /* Only go through if we didn't race with anybody else... */
68329 if (likely(pte_same(*page_table, orig_pte))) {
68330+
68331+#ifdef CONFIG_PAX_SEGMEXEC
68332+ if (anon && pax_find_mirror_vma(vma))
68333+ BUG_ON(!trylock_page(page));
68334+#endif
68335+
68336 flush_icache_page(vma, page);
68337 entry = mk_pte(page, vma->vm_page_prot);
68338 if (flags & FAULT_FLAG_WRITE)
68339@@ -3278,6 +3470,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68340
68341 /* no need to invalidate: a not-present page won't be cached */
68342 update_mmu_cache(vma, address, page_table);
68343+
68344+#ifdef CONFIG_PAX_SEGMEXEC
68345+ if (anon)
68346+ pax_mirror_anon_pte(vma, address, page, ptl);
68347+ else
68348+ pax_mirror_file_pte(vma, address, page, ptl);
68349+#endif
68350+
68351 } else {
68352 if (cow_page)
68353 mem_cgroup_uncharge_page(cow_page);
68354@@ -3431,6 +3631,12 @@ int handle_pte_fault(struct mm_struct *mm,
68355 if (flags & FAULT_FLAG_WRITE)
68356 flush_tlb_fix_spurious_fault(vma, address);
68357 }
68358+
68359+#ifdef CONFIG_PAX_SEGMEXEC
68360+ pax_mirror_pte(vma, address, pte, pmd, ptl);
68361+ return 0;
68362+#endif
68363+
68364 unlock:
68365 pte_unmap_unlock(pte, ptl);
68366 return 0;
68367@@ -3447,6 +3653,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68368 pmd_t *pmd;
68369 pte_t *pte;
68370
68371+#ifdef CONFIG_PAX_SEGMEXEC
68372+ struct vm_area_struct *vma_m;
68373+#endif
68374+
68375 __set_current_state(TASK_RUNNING);
68376
68377 count_vm_event(PGFAULT);
68378@@ -3458,6 +3668,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68379 if (unlikely(is_vm_hugetlb_page(vma)))
68380 return hugetlb_fault(mm, vma, address, flags);
68381
68382+#ifdef CONFIG_PAX_SEGMEXEC
68383+ vma_m = pax_find_mirror_vma(vma);
68384+ if (vma_m) {
68385+ unsigned long address_m;
68386+ pgd_t *pgd_m;
68387+ pud_t *pud_m;
68388+ pmd_t *pmd_m;
68389+
68390+ if (vma->vm_start > vma_m->vm_start) {
68391+ address_m = address;
68392+ address -= SEGMEXEC_TASK_SIZE;
68393+ vma = vma_m;
68394+ } else
68395+ address_m = address + SEGMEXEC_TASK_SIZE;
68396+
68397+ pgd_m = pgd_offset(mm, address_m);
68398+ pud_m = pud_alloc(mm, pgd_m, address_m);
68399+ if (!pud_m)
68400+ return VM_FAULT_OOM;
68401+ pmd_m = pmd_alloc(mm, pud_m, address_m);
68402+ if (!pmd_m)
68403+ return VM_FAULT_OOM;
68404+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
68405+ return VM_FAULT_OOM;
68406+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
68407+ }
68408+#endif
68409+
68410 pgd = pgd_offset(mm, address);
68411 pud = pud_alloc(mm, pgd, address);
68412 if (!pud)
68413@@ -3487,7 +3725,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68414 * run pte_offset_map on the pmd, if an huge pmd could
68415 * materialize from under us from a different thread.
68416 */
68417- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
68418+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
68419 return VM_FAULT_OOM;
68420 /* if an huge pmd materialized from under us just retry later */
68421 if (unlikely(pmd_trans_huge(*pmd)))
68422@@ -3591,7 +3829,7 @@ static int __init gate_vma_init(void)
68423 gate_vma.vm_start = FIXADDR_USER_START;
68424 gate_vma.vm_end = FIXADDR_USER_END;
68425 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
68426- gate_vma.vm_page_prot = __P101;
68427+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
68428 /*
68429 * Make sure the vDSO gets into every core dump.
68430 * Dumping its contents makes post-mortem fully interpretable later
68431diff --git a/mm/mempolicy.c b/mm/mempolicy.c
68432index c3fdbcb..2e8ef90 100644
68433--- a/mm/mempolicy.c
68434+++ b/mm/mempolicy.c
68435@@ -640,6 +640,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
68436 unsigned long vmstart;
68437 unsigned long vmend;
68438
68439+#ifdef CONFIG_PAX_SEGMEXEC
68440+ struct vm_area_struct *vma_m;
68441+#endif
68442+
68443 vma = find_vma_prev(mm, start, &prev);
68444 if (!vma || vma->vm_start > start)
68445 return -EFAULT;
68446@@ -678,6 +682,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
68447 err = policy_vma(vma, new_pol);
68448 if (err)
68449 goto out;
68450+
68451+#ifdef CONFIG_PAX_SEGMEXEC
68452+ vma_m = pax_find_mirror_vma(vma);
68453+ if (vma_m) {
68454+ err = policy_vma(vma_m, new_pol);
68455+ if (err)
68456+ goto out;
68457+ }
68458+#endif
68459+
68460 }
68461
68462 out:
68463@@ -1111,6 +1125,17 @@ static long do_mbind(unsigned long start, unsigned long len,
68464
68465 if (end < start)
68466 return -EINVAL;
68467+
68468+#ifdef CONFIG_PAX_SEGMEXEC
68469+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
68470+ if (end > SEGMEXEC_TASK_SIZE)
68471+ return -EINVAL;
68472+ } else
68473+#endif
68474+
68475+ if (end > TASK_SIZE)
68476+ return -EINVAL;
68477+
68478 if (end == start)
68479 return 0;
68480
68481@@ -1329,6 +1354,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
68482 if (!mm)
68483 goto out;
68484
68485+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68486+ if (mm != current->mm &&
68487+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
68488+ err = -EPERM;
68489+ goto out;
68490+ }
68491+#endif
68492+
68493 /*
68494 * Check if this process has the right to modify the specified
68495 * process. The right exists if the process has administrative
68496@@ -1338,8 +1371,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
68497 rcu_read_lock();
68498 tcred = __task_cred(task);
68499 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
68500- cred->uid != tcred->suid && cred->uid != tcred->uid &&
68501- !capable(CAP_SYS_NICE)) {
68502+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
68503 rcu_read_unlock();
68504 err = -EPERM;
68505 goto out;
68506diff --git a/mm/migrate.c b/mm/migrate.c
68507index 177aca4..ab3a744 100644
68508--- a/mm/migrate.c
68509+++ b/mm/migrate.c
68510@@ -1313,6 +1313,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
68511 if (!mm)
68512 return -EINVAL;
68513
68514+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68515+ if (mm != current->mm &&
68516+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
68517+ err = -EPERM;
68518+ goto out;
68519+ }
68520+#endif
68521+
68522 /*
68523 * Check if this process has the right to modify the specified
68524 * process. The right exists if the process has administrative
68525@@ -1322,8 +1330,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
68526 rcu_read_lock();
68527 tcred = __task_cred(task);
68528 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
68529- cred->uid != tcred->suid && cred->uid != tcred->uid &&
68530- !capable(CAP_SYS_NICE)) {
68531+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
68532 rcu_read_unlock();
68533 err = -EPERM;
68534 goto out;
68535diff --git a/mm/mlock.c b/mm/mlock.c
68536index 4f4f53b..9511904 100644
68537--- a/mm/mlock.c
68538+++ b/mm/mlock.c
68539@@ -13,6 +13,7 @@
68540 #include <linux/pagemap.h>
68541 #include <linux/mempolicy.h>
68542 #include <linux/syscalls.h>
68543+#include <linux/security.h>
68544 #include <linux/sched.h>
68545 #include <linux/export.h>
68546 #include <linux/rmap.h>
68547@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
68548 return -EINVAL;
68549 if (end == start)
68550 return 0;
68551+ if (end > TASK_SIZE)
68552+ return -EINVAL;
68553+
68554 vma = find_vma_prev(current->mm, start, &prev);
68555 if (!vma || vma->vm_start > start)
68556 return -ENOMEM;
68557@@ -395,6 +399,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
68558 for (nstart = start ; ; ) {
68559 vm_flags_t newflags;
68560
68561+#ifdef CONFIG_PAX_SEGMEXEC
68562+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
68563+ break;
68564+#endif
68565+
68566 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
68567
68568 newflags = vma->vm_flags | VM_LOCKED;
68569@@ -500,6 +509,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
68570 lock_limit >>= PAGE_SHIFT;
68571
68572 /* check against resource limits */
68573+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
68574 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
68575 error = do_mlock(start, len, 1);
68576 up_write(&current->mm->mmap_sem);
68577@@ -523,17 +533,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
68578 static int do_mlockall(int flags)
68579 {
68580 struct vm_area_struct * vma, * prev = NULL;
68581- unsigned int def_flags = 0;
68582
68583 if (flags & MCL_FUTURE)
68584- def_flags = VM_LOCKED;
68585- current->mm->def_flags = def_flags;
68586+ current->mm->def_flags |= VM_LOCKED;
68587+ else
68588+ current->mm->def_flags &= ~VM_LOCKED;
68589 if (flags == MCL_FUTURE)
68590 goto out;
68591
68592 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
68593 vm_flags_t newflags;
68594
68595+#ifdef CONFIG_PAX_SEGMEXEC
68596+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
68597+ break;
68598+#endif
68599+
68600+ BUG_ON(vma->vm_end > TASK_SIZE);
68601 newflags = vma->vm_flags | VM_LOCKED;
68602 if (!(flags & MCL_CURRENT))
68603 newflags &= ~VM_LOCKED;
68604@@ -566,6 +582,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
68605 lock_limit >>= PAGE_SHIFT;
68606
68607 ret = -ENOMEM;
68608+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
68609 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
68610 capable(CAP_IPC_LOCK))
68611 ret = do_mlockall(flags);
68612diff --git a/mm/mmap.c b/mm/mmap.c
68613index eae90af..51ca80b 100644
68614--- a/mm/mmap.c
68615+++ b/mm/mmap.c
68616@@ -46,6 +46,16 @@
68617 #define arch_rebalance_pgtables(addr, len) (addr)
68618 #endif
68619
68620+static inline void verify_mm_writelocked(struct mm_struct *mm)
68621+{
68622+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
68623+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
68624+ up_read(&mm->mmap_sem);
68625+ BUG();
68626+ }
68627+#endif
68628+}
68629+
68630 static void unmap_region(struct mm_struct *mm,
68631 struct vm_area_struct *vma, struct vm_area_struct *prev,
68632 unsigned long start, unsigned long end);
68633@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm,
68634 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
68635 *
68636 */
68637-pgprot_t protection_map[16] = {
68638+pgprot_t protection_map[16] __read_only = {
68639 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
68640 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
68641 };
68642
68643-pgprot_t vm_get_page_prot(unsigned long vm_flags)
68644+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
68645 {
68646- return __pgprot(pgprot_val(protection_map[vm_flags &
68647+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
68648 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
68649 pgprot_val(arch_vm_get_page_prot(vm_flags)));
68650+
68651+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
68652+ if (!(__supported_pte_mask & _PAGE_NX) &&
68653+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
68654+ (vm_flags & (VM_READ | VM_WRITE)))
68655+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
68656+#endif
68657+
68658+ return prot;
68659 }
68660 EXPORT_SYMBOL(vm_get_page_prot);
68661
68662 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
68663 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
68664 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
68665+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
68666 /*
68667 * Make sure vm_committed_as in one cacheline and not cacheline shared with
68668 * other variables. It can be updated by several CPUs frequently.
68669@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
68670 struct vm_area_struct *next = vma->vm_next;
68671
68672 might_sleep();
68673+ BUG_ON(vma->vm_mirror);
68674 if (vma->vm_ops && vma->vm_ops->close)
68675 vma->vm_ops->close(vma);
68676 if (vma->vm_file) {
68677@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
68678 * not page aligned -Ram Gupta
68679 */
68680 rlim = rlimit(RLIMIT_DATA);
68681+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
68682 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
68683 (mm->end_data - mm->start_data) > rlim)
68684 goto out;
68685@@ -689,6 +711,12 @@ static int
68686 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
68687 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
68688 {
68689+
68690+#ifdef CONFIG_PAX_SEGMEXEC
68691+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
68692+ return 0;
68693+#endif
68694+
68695 if (is_mergeable_vma(vma, file, vm_flags) &&
68696 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
68697 if (vma->vm_pgoff == vm_pgoff)
68698@@ -708,6 +736,12 @@ static int
68699 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
68700 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
68701 {
68702+
68703+#ifdef CONFIG_PAX_SEGMEXEC
68704+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
68705+ return 0;
68706+#endif
68707+
68708 if (is_mergeable_vma(vma, file, vm_flags) &&
68709 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
68710 pgoff_t vm_pglen;
68711@@ -750,13 +784,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
68712 struct vm_area_struct *vma_merge(struct mm_struct *mm,
68713 struct vm_area_struct *prev, unsigned long addr,
68714 unsigned long end, unsigned long vm_flags,
68715- struct anon_vma *anon_vma, struct file *file,
68716+ struct anon_vma *anon_vma, struct file *file,
68717 pgoff_t pgoff, struct mempolicy *policy)
68718 {
68719 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
68720 struct vm_area_struct *area, *next;
68721 int err;
68722
68723+#ifdef CONFIG_PAX_SEGMEXEC
68724+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
68725+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
68726+
68727+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
68728+#endif
68729+
68730 /*
68731 * We later require that vma->vm_flags == vm_flags,
68732 * so this tests vma->vm_flags & VM_SPECIAL, too.
68733@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
68734 if (next && next->vm_end == end) /* cases 6, 7, 8 */
68735 next = next->vm_next;
68736
68737+#ifdef CONFIG_PAX_SEGMEXEC
68738+ if (prev)
68739+ prev_m = pax_find_mirror_vma(prev);
68740+ if (area)
68741+ area_m = pax_find_mirror_vma(area);
68742+ if (next)
68743+ next_m = pax_find_mirror_vma(next);
68744+#endif
68745+
68746 /*
68747 * Can it merge with the predecessor?
68748 */
68749@@ -791,9 +841,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
68750 /* cases 1, 6 */
68751 err = vma_adjust(prev, prev->vm_start,
68752 next->vm_end, prev->vm_pgoff, NULL);
68753- } else /* cases 2, 5, 7 */
68754+
68755+#ifdef CONFIG_PAX_SEGMEXEC
68756+ if (!err && prev_m)
68757+ err = vma_adjust(prev_m, prev_m->vm_start,
68758+ next_m->vm_end, prev_m->vm_pgoff, NULL);
68759+#endif
68760+
68761+ } else { /* cases 2, 5, 7 */
68762 err = vma_adjust(prev, prev->vm_start,
68763 end, prev->vm_pgoff, NULL);
68764+
68765+#ifdef CONFIG_PAX_SEGMEXEC
68766+ if (!err && prev_m)
68767+ err = vma_adjust(prev_m, prev_m->vm_start,
68768+ end_m, prev_m->vm_pgoff, NULL);
68769+#endif
68770+
68771+ }
68772 if (err)
68773 return NULL;
68774 khugepaged_enter_vma_merge(prev);
68775@@ -807,12 +872,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
68776 mpol_equal(policy, vma_policy(next)) &&
68777 can_vma_merge_before(next, vm_flags,
68778 anon_vma, file, pgoff+pglen)) {
68779- if (prev && addr < prev->vm_end) /* case 4 */
68780+ if (prev && addr < prev->vm_end) { /* case 4 */
68781 err = vma_adjust(prev, prev->vm_start,
68782 addr, prev->vm_pgoff, NULL);
68783- else /* cases 3, 8 */
68784+
68785+#ifdef CONFIG_PAX_SEGMEXEC
68786+ if (!err && prev_m)
68787+ err = vma_adjust(prev_m, prev_m->vm_start,
68788+ addr_m, prev_m->vm_pgoff, NULL);
68789+#endif
68790+
68791+ } else { /* cases 3, 8 */
68792 err = vma_adjust(area, addr, next->vm_end,
68793 next->vm_pgoff - pglen, NULL);
68794+
68795+#ifdef CONFIG_PAX_SEGMEXEC
68796+ if (!err && area_m)
68797+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
68798+ next_m->vm_pgoff - pglen, NULL);
68799+#endif
68800+
68801+ }
68802 if (err)
68803 return NULL;
68804 khugepaged_enter_vma_merge(area);
68805@@ -921,14 +1001,11 @@ none:
68806 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
68807 struct file *file, long pages)
68808 {
68809- const unsigned long stack_flags
68810- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
68811-
68812 if (file) {
68813 mm->shared_vm += pages;
68814 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
68815 mm->exec_vm += pages;
68816- } else if (flags & stack_flags)
68817+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
68818 mm->stack_vm += pages;
68819 if (flags & (VM_RESERVED|VM_IO))
68820 mm->reserved_vm += pages;
68821@@ -955,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68822 * (the exception is when the underlying filesystem is noexec
68823 * mounted, in which case we dont add PROT_EXEC.)
68824 */
68825- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
68826+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
68827 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
68828 prot |= PROT_EXEC;
68829
68830@@ -981,7 +1058,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68831 /* Obtain the address to map to. we verify (or select) it and ensure
68832 * that it represents a valid section of the address space.
68833 */
68834- addr = get_unmapped_area(file, addr, len, pgoff, flags);
68835+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
68836 if (addr & ~PAGE_MASK)
68837 return addr;
68838
68839@@ -992,6 +1069,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68840 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
68841 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
68842
68843+#ifdef CONFIG_PAX_MPROTECT
68844+ if (mm->pax_flags & MF_PAX_MPROTECT) {
68845+#ifndef CONFIG_PAX_MPROTECT_COMPAT
68846+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
68847+ gr_log_rwxmmap(file);
68848+
68849+#ifdef CONFIG_PAX_EMUPLT
68850+ vm_flags &= ~VM_EXEC;
68851+#else
68852+ return -EPERM;
68853+#endif
68854+
68855+ }
68856+
68857+ if (!(vm_flags & VM_EXEC))
68858+ vm_flags &= ~VM_MAYEXEC;
68859+#else
68860+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
68861+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
68862+#endif
68863+ else
68864+ vm_flags &= ~VM_MAYWRITE;
68865+ }
68866+#endif
68867+
68868+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
68869+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
68870+ vm_flags &= ~VM_PAGEEXEC;
68871+#endif
68872+
68873 if (flags & MAP_LOCKED)
68874 if (!can_do_mlock())
68875 return -EPERM;
68876@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68877 locked += mm->locked_vm;
68878 lock_limit = rlimit(RLIMIT_MEMLOCK);
68879 lock_limit >>= PAGE_SHIFT;
68880+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
68881 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
68882 return -EAGAIN;
68883 }
68884@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68885 if (error)
68886 return error;
68887
68888+ if (!gr_acl_handle_mmap(file, prot))
68889+ return -EACCES;
68890+
68891 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
68892 }
68893 EXPORT_SYMBOL(do_mmap_pgoff);
68894@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
68895 vm_flags_t vm_flags = vma->vm_flags;
68896
68897 /* If it was private or non-writable, the write bit is already clear */
68898- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
68899+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
68900 return 0;
68901
68902 /* The backer wishes to know when pages are first written to? */
68903@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
68904 unsigned long charged = 0;
68905 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
68906
68907+#ifdef CONFIG_PAX_SEGMEXEC
68908+ struct vm_area_struct *vma_m = NULL;
68909+#endif
68910+
68911+ /*
68912+ * mm->mmap_sem is required to protect against another thread
68913+ * changing the mappings in case we sleep.
68914+ */
68915+ verify_mm_writelocked(mm);
68916+
68917 /* Clear old maps */
68918 error = -ENOMEM;
68919-munmap_back:
68920 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
68921 if (vma && vma->vm_start < addr + len) {
68922 if (do_munmap(mm, addr, len))
68923 return -ENOMEM;
68924- goto munmap_back;
68925+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
68926+ BUG_ON(vma && vma->vm_start < addr + len);
68927 }
68928
68929 /* Check against address space limit. */
68930@@ -1258,6 +1379,16 @@ munmap_back:
68931 goto unacct_error;
68932 }
68933
68934+#ifdef CONFIG_PAX_SEGMEXEC
68935+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
68936+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
68937+ if (!vma_m) {
68938+ error = -ENOMEM;
68939+ goto free_vma;
68940+ }
68941+ }
68942+#endif
68943+
68944 vma->vm_mm = mm;
68945 vma->vm_start = addr;
68946 vma->vm_end = addr + len;
68947@@ -1281,6 +1412,19 @@ munmap_back:
68948 error = file->f_op->mmap(file, vma);
68949 if (error)
68950 goto unmap_and_free_vma;
68951+
68952+#ifdef CONFIG_PAX_SEGMEXEC
68953+ if (vma_m && (vm_flags & VM_EXECUTABLE))
68954+ added_exe_file_vma(mm);
68955+#endif
68956+
68957+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
68958+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
68959+ vma->vm_flags |= VM_PAGEEXEC;
68960+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
68961+ }
68962+#endif
68963+
68964 if (vm_flags & VM_EXECUTABLE)
68965 added_exe_file_vma(mm);
68966
68967@@ -1316,6 +1460,11 @@ munmap_back:
68968 vma_link(mm, vma, prev, rb_link, rb_parent);
68969 file = vma->vm_file;
68970
68971+#ifdef CONFIG_PAX_SEGMEXEC
68972+ if (vma_m)
68973+ BUG_ON(pax_mirror_vma(vma_m, vma));
68974+#endif
68975+
68976 /* Once vma denies write, undo our temporary denial count */
68977 if (correct_wcount)
68978 atomic_inc(&inode->i_writecount);
68979@@ -1324,6 +1473,7 @@ out:
68980
68981 mm->total_vm += len >> PAGE_SHIFT;
68982 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
68983+ track_exec_limit(mm, addr, addr + len, vm_flags);
68984 if (vm_flags & VM_LOCKED) {
68985 if (!mlock_vma_pages_range(vma, addr, addr + len))
68986 mm->locked_vm += (len >> PAGE_SHIFT);
68987@@ -1341,6 +1491,12 @@ unmap_and_free_vma:
68988 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
68989 charged = 0;
68990 free_vma:
68991+
68992+#ifdef CONFIG_PAX_SEGMEXEC
68993+ if (vma_m)
68994+ kmem_cache_free(vm_area_cachep, vma_m);
68995+#endif
68996+
68997 kmem_cache_free(vm_area_cachep, vma);
68998 unacct_error:
68999 if (charged)
69000@@ -1348,6 +1504,44 @@ unacct_error:
69001 return error;
69002 }
69003
69004+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
69005+{
69006+ if (!vma) {
69007+#ifdef CONFIG_STACK_GROWSUP
69008+ if (addr > sysctl_heap_stack_gap)
69009+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
69010+ else
69011+ vma = find_vma(current->mm, 0);
69012+ if (vma && (vma->vm_flags & VM_GROWSUP))
69013+ return false;
69014+#endif
69015+ return true;
69016+ }
69017+
69018+ if (addr + len > vma->vm_start)
69019+ return false;
69020+
69021+ if (vma->vm_flags & VM_GROWSDOWN)
69022+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
69023+#ifdef CONFIG_STACK_GROWSUP
69024+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
69025+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
69026+#endif
69027+
69028+ return true;
69029+}
69030+
69031+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
69032+{
69033+ if (vma->vm_start < len)
69034+ return -ENOMEM;
69035+ if (!(vma->vm_flags & VM_GROWSDOWN))
69036+ return vma->vm_start - len;
69037+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
69038+ return vma->vm_start - len - sysctl_heap_stack_gap;
69039+ return -ENOMEM;
69040+}
69041+
69042 /* Get an address range which is currently unmapped.
69043 * For shmat() with addr=0.
69044 *
69045@@ -1374,18 +1568,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
69046 if (flags & MAP_FIXED)
69047 return addr;
69048
69049+#ifdef CONFIG_PAX_RANDMMAP
69050+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
69051+#endif
69052+
69053 if (addr) {
69054 addr = PAGE_ALIGN(addr);
69055- vma = find_vma(mm, addr);
69056- if (TASK_SIZE - len >= addr &&
69057- (!vma || addr + len <= vma->vm_start))
69058- return addr;
69059+ if (TASK_SIZE - len >= addr) {
69060+ vma = find_vma(mm, addr);
69061+ if (check_heap_stack_gap(vma, addr, len))
69062+ return addr;
69063+ }
69064 }
69065 if (len > mm->cached_hole_size) {
69066- start_addr = addr = mm->free_area_cache;
69067+ start_addr = addr = mm->free_area_cache;
69068 } else {
69069- start_addr = addr = TASK_UNMAPPED_BASE;
69070- mm->cached_hole_size = 0;
69071+ start_addr = addr = mm->mmap_base;
69072+ mm->cached_hole_size = 0;
69073 }
69074
69075 full_search:
69076@@ -1396,34 +1595,40 @@ full_search:
69077 * Start a new search - just in case we missed
69078 * some holes.
69079 */
69080- if (start_addr != TASK_UNMAPPED_BASE) {
69081- addr = TASK_UNMAPPED_BASE;
69082- start_addr = addr;
69083+ if (start_addr != mm->mmap_base) {
69084+ start_addr = addr = mm->mmap_base;
69085 mm->cached_hole_size = 0;
69086 goto full_search;
69087 }
69088 return -ENOMEM;
69089 }
69090- if (!vma || addr + len <= vma->vm_start) {
69091- /*
69092- * Remember the place where we stopped the search:
69093- */
69094- mm->free_area_cache = addr + len;
69095- return addr;
69096- }
69097+ if (check_heap_stack_gap(vma, addr, len))
69098+ break;
69099 if (addr + mm->cached_hole_size < vma->vm_start)
69100 mm->cached_hole_size = vma->vm_start - addr;
69101 addr = vma->vm_end;
69102 }
69103+
69104+ /*
69105+ * Remember the place where we stopped the search:
69106+ */
69107+ mm->free_area_cache = addr + len;
69108+ return addr;
69109 }
69110 #endif
69111
69112 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
69113 {
69114+
69115+#ifdef CONFIG_PAX_SEGMEXEC
69116+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
69117+ return;
69118+#endif
69119+
69120 /*
69121 * Is this a new hole at the lowest possible address?
69122 */
69123- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
69124+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
69125 mm->free_area_cache = addr;
69126 mm->cached_hole_size = ~0UL;
69127 }
69128@@ -1441,7 +1646,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69129 {
69130 struct vm_area_struct *vma;
69131 struct mm_struct *mm = current->mm;
69132- unsigned long addr = addr0;
69133+ unsigned long base = mm->mmap_base, addr = addr0;
69134
69135 /* requested length too big for entire address space */
69136 if (len > TASK_SIZE)
69137@@ -1450,13 +1655,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69138 if (flags & MAP_FIXED)
69139 return addr;
69140
69141+#ifdef CONFIG_PAX_RANDMMAP
69142+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
69143+#endif
69144+
69145 /* requesting a specific address */
69146 if (addr) {
69147 addr = PAGE_ALIGN(addr);
69148- vma = find_vma(mm, addr);
69149- if (TASK_SIZE - len >= addr &&
69150- (!vma || addr + len <= vma->vm_start))
69151- return addr;
69152+ if (TASK_SIZE - len >= addr) {
69153+ vma = find_vma(mm, addr);
69154+ if (check_heap_stack_gap(vma, addr, len))
69155+ return addr;
69156+ }
69157 }
69158
69159 /* check if free_area_cache is useful for us */
69160@@ -1471,7 +1681,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69161 /* make sure it can fit in the remaining address space */
69162 if (addr > len) {
69163 vma = find_vma(mm, addr-len);
69164- if (!vma || addr <= vma->vm_start)
69165+ if (check_heap_stack_gap(vma, addr - len, len))
69166 /* remember the address as a hint for next time */
69167 return (mm->free_area_cache = addr-len);
69168 }
69169@@ -1488,7 +1698,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69170 * return with success:
69171 */
69172 vma = find_vma(mm, addr);
69173- if (!vma || addr+len <= vma->vm_start)
69174+ if (check_heap_stack_gap(vma, addr, len))
69175 /* remember the address as a hint for next time */
69176 return (mm->free_area_cache = addr);
69177
69178@@ -1497,8 +1707,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69179 mm->cached_hole_size = vma->vm_start - addr;
69180
69181 /* try just below the current vma->vm_start */
69182- addr = vma->vm_start-len;
69183- } while (len < vma->vm_start);
69184+ addr = skip_heap_stack_gap(vma, len);
69185+ } while (!IS_ERR_VALUE(addr));
69186
69187 bottomup:
69188 /*
69189@@ -1507,13 +1717,21 @@ bottomup:
69190 * can happen with large stack limits and large mmap()
69191 * allocations.
69192 */
69193+ mm->mmap_base = TASK_UNMAPPED_BASE;
69194+
69195+#ifdef CONFIG_PAX_RANDMMAP
69196+ if (mm->pax_flags & MF_PAX_RANDMMAP)
69197+ mm->mmap_base += mm->delta_mmap;
69198+#endif
69199+
69200+ mm->free_area_cache = mm->mmap_base;
69201 mm->cached_hole_size = ~0UL;
69202- mm->free_area_cache = TASK_UNMAPPED_BASE;
69203 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
69204 /*
69205 * Restore the topdown base:
69206 */
69207- mm->free_area_cache = mm->mmap_base;
69208+ mm->mmap_base = base;
69209+ mm->free_area_cache = base;
69210 mm->cached_hole_size = ~0UL;
69211
69212 return addr;
69213@@ -1522,6 +1740,12 @@ bottomup:
69214
69215 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
69216 {
69217+
69218+#ifdef CONFIG_PAX_SEGMEXEC
69219+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
69220+ return;
69221+#endif
69222+
69223 /*
69224 * Is this a new hole at the highest possible address?
69225 */
69226@@ -1529,8 +1753,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
69227 mm->free_area_cache = addr;
69228
69229 /* dont allow allocations above current base */
69230- if (mm->free_area_cache > mm->mmap_base)
69231+ if (mm->free_area_cache > mm->mmap_base) {
69232 mm->free_area_cache = mm->mmap_base;
69233+ mm->cached_hole_size = ~0UL;
69234+ }
69235 }
69236
69237 unsigned long
69238@@ -1638,6 +1864,28 @@ out:
69239 return prev ? prev->vm_next : vma;
69240 }
69241
69242+#ifdef CONFIG_PAX_SEGMEXEC
69243+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
69244+{
69245+ struct vm_area_struct *vma_m;
69246+
69247+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
69248+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
69249+ BUG_ON(vma->vm_mirror);
69250+ return NULL;
69251+ }
69252+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
69253+ vma_m = vma->vm_mirror;
69254+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
69255+ BUG_ON(vma->vm_file != vma_m->vm_file);
69256+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
69257+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
69258+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
69259+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
69260+ return vma_m;
69261+}
69262+#endif
69263+
69264 /*
69265 * Verify that the stack growth is acceptable and
69266 * update accounting. This is shared with both the
69267@@ -1654,6 +1902,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
69268 return -ENOMEM;
69269
69270 /* Stack limit test */
69271+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
69272 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
69273 return -ENOMEM;
69274
69275@@ -1664,6 +1913,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
69276 locked = mm->locked_vm + grow;
69277 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
69278 limit >>= PAGE_SHIFT;
69279+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
69280 if (locked > limit && !capable(CAP_IPC_LOCK))
69281 return -ENOMEM;
69282 }
69283@@ -1694,37 +1944,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
69284 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
69285 * vma is the last one with address > vma->vm_end. Have to extend vma.
69286 */
69287+#ifndef CONFIG_IA64
69288+static
69289+#endif
69290 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
69291 {
69292 int error;
69293+ bool locknext;
69294
69295 if (!(vma->vm_flags & VM_GROWSUP))
69296 return -EFAULT;
69297
69298+ /* Also guard against wrapping around to address 0. */
69299+ if (address < PAGE_ALIGN(address+1))
69300+ address = PAGE_ALIGN(address+1);
69301+ else
69302+ return -ENOMEM;
69303+
69304 /*
69305 * We must make sure the anon_vma is allocated
69306 * so that the anon_vma locking is not a noop.
69307 */
69308 if (unlikely(anon_vma_prepare(vma)))
69309 return -ENOMEM;
69310+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
69311+ if (locknext && anon_vma_prepare(vma->vm_next))
69312+ return -ENOMEM;
69313 vma_lock_anon_vma(vma);
69314+ if (locknext)
69315+ vma_lock_anon_vma(vma->vm_next);
69316
69317 /*
69318 * vma->vm_start/vm_end cannot change under us because the caller
69319 * is required to hold the mmap_sem in read mode. We need the
69320- * anon_vma lock to serialize against concurrent expand_stacks.
69321- * Also guard against wrapping around to address 0.
69322+ * anon_vma locks to serialize against concurrent expand_stacks
69323+ * and expand_upwards.
69324 */
69325- if (address < PAGE_ALIGN(address+4))
69326- address = PAGE_ALIGN(address+4);
69327- else {
69328- vma_unlock_anon_vma(vma);
69329- return -ENOMEM;
69330- }
69331 error = 0;
69332
69333 /* Somebody else might have raced and expanded it already */
69334- if (address > vma->vm_end) {
69335+ 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)
69336+ error = -ENOMEM;
69337+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
69338 unsigned long size, grow;
69339
69340 size = address - vma->vm_start;
69341@@ -1739,6 +2000,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
69342 }
69343 }
69344 }
69345+ if (locknext)
69346+ vma_unlock_anon_vma(vma->vm_next);
69347 vma_unlock_anon_vma(vma);
69348 khugepaged_enter_vma_merge(vma);
69349 return error;
69350@@ -1752,6 +2015,8 @@ int expand_downwards(struct vm_area_struct *vma,
69351 unsigned long address)
69352 {
69353 int error;
69354+ bool lockprev = false;
69355+ struct vm_area_struct *prev;
69356
69357 /*
69358 * We must make sure the anon_vma is allocated
69359@@ -1765,6 +2030,15 @@ int expand_downwards(struct vm_area_struct *vma,
69360 if (error)
69361 return error;
69362
69363+ prev = vma->vm_prev;
69364+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
69365+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
69366+#endif
69367+ if (lockprev && anon_vma_prepare(prev))
69368+ return -ENOMEM;
69369+ if (lockprev)
69370+ vma_lock_anon_vma(prev);
69371+
69372 vma_lock_anon_vma(vma);
69373
69374 /*
69375@@ -1774,9 +2048,17 @@ int expand_downwards(struct vm_area_struct *vma,
69376 */
69377
69378 /* Somebody else might have raced and expanded it already */
69379- if (address < vma->vm_start) {
69380+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
69381+ error = -ENOMEM;
69382+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
69383 unsigned long size, grow;
69384
69385+#ifdef CONFIG_PAX_SEGMEXEC
69386+ struct vm_area_struct *vma_m;
69387+
69388+ vma_m = pax_find_mirror_vma(vma);
69389+#endif
69390+
69391 size = vma->vm_end - address;
69392 grow = (vma->vm_start - address) >> PAGE_SHIFT;
69393
69394@@ -1786,11 +2068,22 @@ int expand_downwards(struct vm_area_struct *vma,
69395 if (!error) {
69396 vma->vm_start = address;
69397 vma->vm_pgoff -= grow;
69398+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
69399+
69400+#ifdef CONFIG_PAX_SEGMEXEC
69401+ if (vma_m) {
69402+ vma_m->vm_start -= grow << PAGE_SHIFT;
69403+ vma_m->vm_pgoff -= grow;
69404+ }
69405+#endif
69406+
69407 perf_event_mmap(vma);
69408 }
69409 }
69410 }
69411 vma_unlock_anon_vma(vma);
69412+ if (lockprev)
69413+ vma_unlock_anon_vma(prev);
69414 khugepaged_enter_vma_merge(vma);
69415 return error;
69416 }
69417@@ -1860,6 +2153,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
69418 do {
69419 long nrpages = vma_pages(vma);
69420
69421+#ifdef CONFIG_PAX_SEGMEXEC
69422+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
69423+ vma = remove_vma(vma);
69424+ continue;
69425+ }
69426+#endif
69427+
69428 mm->total_vm -= nrpages;
69429 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
69430 vma = remove_vma(vma);
69431@@ -1905,6 +2205,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
69432 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
69433 vma->vm_prev = NULL;
69434 do {
69435+
69436+#ifdef CONFIG_PAX_SEGMEXEC
69437+ if (vma->vm_mirror) {
69438+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
69439+ vma->vm_mirror->vm_mirror = NULL;
69440+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
69441+ vma->vm_mirror = NULL;
69442+ }
69443+#endif
69444+
69445 rb_erase(&vma->vm_rb, &mm->mm_rb);
69446 mm->map_count--;
69447 tail_vma = vma;
69448@@ -1933,14 +2243,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69449 struct vm_area_struct *new;
69450 int err = -ENOMEM;
69451
69452+#ifdef CONFIG_PAX_SEGMEXEC
69453+ struct vm_area_struct *vma_m, *new_m = NULL;
69454+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
69455+#endif
69456+
69457 if (is_vm_hugetlb_page(vma) && (addr &
69458 ~(huge_page_mask(hstate_vma(vma)))))
69459 return -EINVAL;
69460
69461+#ifdef CONFIG_PAX_SEGMEXEC
69462+ vma_m = pax_find_mirror_vma(vma);
69463+#endif
69464+
69465 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
69466 if (!new)
69467 goto out_err;
69468
69469+#ifdef CONFIG_PAX_SEGMEXEC
69470+ if (vma_m) {
69471+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
69472+ if (!new_m) {
69473+ kmem_cache_free(vm_area_cachep, new);
69474+ goto out_err;
69475+ }
69476+ }
69477+#endif
69478+
69479 /* most fields are the same, copy all, and then fixup */
69480 *new = *vma;
69481
69482@@ -1953,6 +2282,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69483 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
69484 }
69485
69486+#ifdef CONFIG_PAX_SEGMEXEC
69487+ if (vma_m) {
69488+ *new_m = *vma_m;
69489+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
69490+ new_m->vm_mirror = new;
69491+ new->vm_mirror = new_m;
69492+
69493+ if (new_below)
69494+ new_m->vm_end = addr_m;
69495+ else {
69496+ new_m->vm_start = addr_m;
69497+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
69498+ }
69499+ }
69500+#endif
69501+
69502 pol = mpol_dup(vma_policy(vma));
69503 if (IS_ERR(pol)) {
69504 err = PTR_ERR(pol);
69505@@ -1978,6 +2323,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69506 else
69507 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
69508
69509+#ifdef CONFIG_PAX_SEGMEXEC
69510+ if (!err && vma_m) {
69511+ if (anon_vma_clone(new_m, vma_m))
69512+ goto out_free_mpol;
69513+
69514+ mpol_get(pol);
69515+ vma_set_policy(new_m, pol);
69516+
69517+ if (new_m->vm_file) {
69518+ get_file(new_m->vm_file);
69519+ if (vma_m->vm_flags & VM_EXECUTABLE)
69520+ added_exe_file_vma(mm);
69521+ }
69522+
69523+ if (new_m->vm_ops && new_m->vm_ops->open)
69524+ new_m->vm_ops->open(new_m);
69525+
69526+ if (new_below)
69527+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
69528+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
69529+ else
69530+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
69531+
69532+ if (err) {
69533+ if (new_m->vm_ops && new_m->vm_ops->close)
69534+ new_m->vm_ops->close(new_m);
69535+ if (new_m->vm_file) {
69536+ if (vma_m->vm_flags & VM_EXECUTABLE)
69537+ removed_exe_file_vma(mm);
69538+ fput(new_m->vm_file);
69539+ }
69540+ mpol_put(pol);
69541+ }
69542+ }
69543+#endif
69544+
69545 /* Success. */
69546 if (!err)
69547 return 0;
69548@@ -1990,10 +2371,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69549 removed_exe_file_vma(mm);
69550 fput(new->vm_file);
69551 }
69552- unlink_anon_vmas(new);
69553 out_free_mpol:
69554 mpol_put(pol);
69555 out_free_vma:
69556+
69557+#ifdef CONFIG_PAX_SEGMEXEC
69558+ if (new_m) {
69559+ unlink_anon_vmas(new_m);
69560+ kmem_cache_free(vm_area_cachep, new_m);
69561+ }
69562+#endif
69563+
69564+ unlink_anon_vmas(new);
69565 kmem_cache_free(vm_area_cachep, new);
69566 out_err:
69567 return err;
69568@@ -2006,6 +2395,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69569 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
69570 unsigned long addr, int new_below)
69571 {
69572+
69573+#ifdef CONFIG_PAX_SEGMEXEC
69574+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
69575+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
69576+ if (mm->map_count >= sysctl_max_map_count-1)
69577+ return -ENOMEM;
69578+ } else
69579+#endif
69580+
69581 if (mm->map_count >= sysctl_max_map_count)
69582 return -ENOMEM;
69583
69584@@ -2017,11 +2415,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
69585 * work. This now handles partial unmappings.
69586 * Jeremy Fitzhardinge <jeremy@goop.org>
69587 */
69588+#ifdef CONFIG_PAX_SEGMEXEC
69589 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
69590 {
69591+ int ret = __do_munmap(mm, start, len);
69592+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
69593+ return ret;
69594+
69595+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
69596+}
69597+
69598+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
69599+#else
69600+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
69601+#endif
69602+{
69603 unsigned long end;
69604 struct vm_area_struct *vma, *prev, *last;
69605
69606+ /*
69607+ * mm->mmap_sem is required to protect against another thread
69608+ * changing the mappings in case we sleep.
69609+ */
69610+ verify_mm_writelocked(mm);
69611+
69612 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
69613 return -EINVAL;
69614
69615@@ -2096,6 +2513,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
69616 /* Fix up all other VM information */
69617 remove_vma_list(mm, vma);
69618
69619+ track_exec_limit(mm, start, end, 0UL);
69620+
69621 return 0;
69622 }
69623
69624@@ -2108,22 +2527,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
69625
69626 profile_munmap(addr);
69627
69628+#ifdef CONFIG_PAX_SEGMEXEC
69629+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
69630+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
69631+ return -EINVAL;
69632+#endif
69633+
69634 down_write(&mm->mmap_sem);
69635 ret = do_munmap(mm, addr, len);
69636 up_write(&mm->mmap_sem);
69637 return ret;
69638 }
69639
69640-static inline void verify_mm_writelocked(struct mm_struct *mm)
69641-{
69642-#ifdef CONFIG_DEBUG_VM
69643- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
69644- WARN_ON(1);
69645- up_read(&mm->mmap_sem);
69646- }
69647-#endif
69648-}
69649-
69650 /*
69651 * this is really a simplified "do_mmap". it only handles
69652 * anonymous maps. eventually we may be able to do some
69653@@ -2137,6 +2552,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69654 struct rb_node ** rb_link, * rb_parent;
69655 pgoff_t pgoff = addr >> PAGE_SHIFT;
69656 int error;
69657+ unsigned long charged;
69658
69659 len = PAGE_ALIGN(len);
69660 if (!len)
69661@@ -2148,16 +2564,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69662
69663 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
69664
69665+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
69666+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
69667+ flags &= ~VM_EXEC;
69668+
69669+#ifdef CONFIG_PAX_MPROTECT
69670+ if (mm->pax_flags & MF_PAX_MPROTECT)
69671+ flags &= ~VM_MAYEXEC;
69672+#endif
69673+
69674+ }
69675+#endif
69676+
69677 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
69678 if (error & ~PAGE_MASK)
69679 return error;
69680
69681+ charged = len >> PAGE_SHIFT;
69682+
69683 /*
69684 * mlock MCL_FUTURE?
69685 */
69686 if (mm->def_flags & VM_LOCKED) {
69687 unsigned long locked, lock_limit;
69688- locked = len >> PAGE_SHIFT;
69689+ locked = charged;
69690 locked += mm->locked_vm;
69691 lock_limit = rlimit(RLIMIT_MEMLOCK);
69692 lock_limit >>= PAGE_SHIFT;
69693@@ -2174,22 +2604,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69694 /*
69695 * Clear old maps. this also does some error checking for us
69696 */
69697- munmap_back:
69698 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
69699 if (vma && vma->vm_start < addr + len) {
69700 if (do_munmap(mm, addr, len))
69701 return -ENOMEM;
69702- goto munmap_back;
69703+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
69704+ BUG_ON(vma && vma->vm_start < addr + len);
69705 }
69706
69707 /* Check against address space limits *after* clearing old maps... */
69708- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
69709+ if (!may_expand_vm(mm, charged))
69710 return -ENOMEM;
69711
69712 if (mm->map_count > sysctl_max_map_count)
69713 return -ENOMEM;
69714
69715- if (security_vm_enough_memory(len >> PAGE_SHIFT))
69716+ if (security_vm_enough_memory(charged))
69717 return -ENOMEM;
69718
69719 /* Can we just expand an old private anonymous mapping? */
69720@@ -2203,7 +2633,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69721 */
69722 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
69723 if (!vma) {
69724- vm_unacct_memory(len >> PAGE_SHIFT);
69725+ vm_unacct_memory(charged);
69726 return -ENOMEM;
69727 }
69728
69729@@ -2217,11 +2647,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69730 vma_link(mm, vma, prev, rb_link, rb_parent);
69731 out:
69732 perf_event_mmap(vma);
69733- mm->total_vm += len >> PAGE_SHIFT;
69734+ mm->total_vm += charged;
69735 if (flags & VM_LOCKED) {
69736 if (!mlock_vma_pages_range(vma, addr, addr + len))
69737- mm->locked_vm += (len >> PAGE_SHIFT);
69738+ mm->locked_vm += charged;
69739 }
69740+ track_exec_limit(mm, addr, addr + len, flags);
69741 return addr;
69742 }
69743
69744@@ -2268,8 +2699,10 @@ void exit_mmap(struct mm_struct *mm)
69745 * Walk the list again, actually closing and freeing it,
69746 * with preemption enabled, without holding any MM locks.
69747 */
69748- while (vma)
69749+ while (vma) {
69750+ vma->vm_mirror = NULL;
69751 vma = remove_vma(vma);
69752+ }
69753
69754 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
69755 }
69756@@ -2283,6 +2716,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
69757 struct vm_area_struct * __vma, * prev;
69758 struct rb_node ** rb_link, * rb_parent;
69759
69760+#ifdef CONFIG_PAX_SEGMEXEC
69761+ struct vm_area_struct *vma_m = NULL;
69762+#endif
69763+
69764+ if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
69765+ return -EPERM;
69766+
69767 /*
69768 * The vm_pgoff of a purely anonymous vma should be irrelevant
69769 * until its first write fault, when page's anon_vma and index
69770@@ -2305,7 +2745,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
69771 if ((vma->vm_flags & VM_ACCOUNT) &&
69772 security_vm_enough_memory_mm(mm, vma_pages(vma)))
69773 return -ENOMEM;
69774+
69775+#ifdef CONFIG_PAX_SEGMEXEC
69776+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
69777+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
69778+ if (!vma_m)
69779+ return -ENOMEM;
69780+ }
69781+#endif
69782+
69783 vma_link(mm, vma, prev, rb_link, rb_parent);
69784+
69785+#ifdef CONFIG_PAX_SEGMEXEC
69786+ if (vma_m)
69787+ BUG_ON(pax_mirror_vma(vma_m, vma));
69788+#endif
69789+
69790 return 0;
69791 }
69792
69793@@ -2323,6 +2778,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
69794 struct rb_node **rb_link, *rb_parent;
69795 struct mempolicy *pol;
69796
69797+ BUG_ON(vma->vm_mirror);
69798+
69799 /*
69800 * If anonymous vma has not yet been faulted, update new pgoff
69801 * to match new location, to increase its chance of merging.
69802@@ -2373,6 +2830,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
69803 return NULL;
69804 }
69805
69806+#ifdef CONFIG_PAX_SEGMEXEC
69807+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
69808+{
69809+ struct vm_area_struct *prev_m;
69810+ struct rb_node **rb_link_m, *rb_parent_m;
69811+ struct mempolicy *pol_m;
69812+
69813+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
69814+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
69815+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
69816+ *vma_m = *vma;
69817+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
69818+ if (anon_vma_clone(vma_m, vma))
69819+ return -ENOMEM;
69820+ pol_m = vma_policy(vma_m);
69821+ mpol_get(pol_m);
69822+ vma_set_policy(vma_m, pol_m);
69823+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
69824+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
69825+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
69826+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
69827+ if (vma_m->vm_file)
69828+ get_file(vma_m->vm_file);
69829+ if (vma_m->vm_ops && vma_m->vm_ops->open)
69830+ vma_m->vm_ops->open(vma_m);
69831+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
69832+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
69833+ vma_m->vm_mirror = vma;
69834+ vma->vm_mirror = vma_m;
69835+ return 0;
69836+}
69837+#endif
69838+
69839 /*
69840 * Return true if the calling process may expand its vm space by the passed
69841 * number of pages
69842@@ -2383,7 +2873,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
69843 unsigned long lim;
69844
69845 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
69846-
69847+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
69848 if (cur + npages > lim)
69849 return 0;
69850 return 1;
69851@@ -2454,6 +2944,22 @@ int install_special_mapping(struct mm_struct *mm,
69852 vma->vm_start = addr;
69853 vma->vm_end = addr + len;
69854
69855+#ifdef CONFIG_PAX_MPROTECT
69856+ if (mm->pax_flags & MF_PAX_MPROTECT) {
69857+#ifndef CONFIG_PAX_MPROTECT_COMPAT
69858+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
69859+ return -EPERM;
69860+ if (!(vm_flags & VM_EXEC))
69861+ vm_flags &= ~VM_MAYEXEC;
69862+#else
69863+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
69864+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
69865+#endif
69866+ else
69867+ vm_flags &= ~VM_MAYWRITE;
69868+ }
69869+#endif
69870+
69871 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
69872 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
69873
69874diff --git a/mm/mprotect.c b/mm/mprotect.c
69875index 5a688a2..27e031c 100644
69876--- a/mm/mprotect.c
69877+++ b/mm/mprotect.c
69878@@ -23,10 +23,16 @@
69879 #include <linux/mmu_notifier.h>
69880 #include <linux/migrate.h>
69881 #include <linux/perf_event.h>
69882+
69883+#ifdef CONFIG_PAX_MPROTECT
69884+#include <linux/elf.h>
69885+#endif
69886+
69887 #include <asm/uaccess.h>
69888 #include <asm/pgtable.h>
69889 #include <asm/cacheflush.h>
69890 #include <asm/tlbflush.h>
69891+#include <asm/mmu_context.h>
69892
69893 #ifndef pgprot_modify
69894 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
69895@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
69896 flush_tlb_range(vma, start, end);
69897 }
69898
69899+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
69900+/* called while holding the mmap semaphor for writing except stack expansion */
69901+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
69902+{
69903+ unsigned long oldlimit, newlimit = 0UL;
69904+
69905+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
69906+ return;
69907+
69908+ spin_lock(&mm->page_table_lock);
69909+ oldlimit = mm->context.user_cs_limit;
69910+ if ((prot & VM_EXEC) && oldlimit < end)
69911+ /* USER_CS limit moved up */
69912+ newlimit = end;
69913+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
69914+ /* USER_CS limit moved down */
69915+ newlimit = start;
69916+
69917+ if (newlimit) {
69918+ mm->context.user_cs_limit = newlimit;
69919+
69920+#ifdef CONFIG_SMP
69921+ wmb();
69922+ cpus_clear(mm->context.cpu_user_cs_mask);
69923+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
69924+#endif
69925+
69926+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
69927+ }
69928+ spin_unlock(&mm->page_table_lock);
69929+ if (newlimit == end) {
69930+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
69931+
69932+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
69933+ if (is_vm_hugetlb_page(vma))
69934+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
69935+ else
69936+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
69937+ }
69938+}
69939+#endif
69940+
69941 int
69942 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
69943 unsigned long start, unsigned long end, unsigned long newflags)
69944@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
69945 int error;
69946 int dirty_accountable = 0;
69947
69948+#ifdef CONFIG_PAX_SEGMEXEC
69949+ struct vm_area_struct *vma_m = NULL;
69950+ unsigned long start_m, end_m;
69951+
69952+ start_m = start + SEGMEXEC_TASK_SIZE;
69953+ end_m = end + SEGMEXEC_TASK_SIZE;
69954+#endif
69955+
69956 if (newflags == oldflags) {
69957 *pprev = vma;
69958 return 0;
69959 }
69960
69961+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
69962+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
69963+
69964+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
69965+ return -ENOMEM;
69966+
69967+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
69968+ return -ENOMEM;
69969+ }
69970+
69971 /*
69972 * If we make a private mapping writable we increase our commit;
69973 * but (without finer accounting) cannot reduce our commit if we
69974@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
69975 }
69976 }
69977
69978+#ifdef CONFIG_PAX_SEGMEXEC
69979+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
69980+ if (start != vma->vm_start) {
69981+ error = split_vma(mm, vma, start, 1);
69982+ if (error)
69983+ goto fail;
69984+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
69985+ *pprev = (*pprev)->vm_next;
69986+ }
69987+
69988+ if (end != vma->vm_end) {
69989+ error = split_vma(mm, vma, end, 0);
69990+ if (error)
69991+ goto fail;
69992+ }
69993+
69994+ if (pax_find_mirror_vma(vma)) {
69995+ error = __do_munmap(mm, start_m, end_m - start_m);
69996+ if (error)
69997+ goto fail;
69998+ } else {
69999+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
70000+ if (!vma_m) {
70001+ error = -ENOMEM;
70002+ goto fail;
70003+ }
70004+ vma->vm_flags = newflags;
70005+ error = pax_mirror_vma(vma_m, vma);
70006+ if (error) {
70007+ vma->vm_flags = oldflags;
70008+ goto fail;
70009+ }
70010+ }
70011+ }
70012+#endif
70013+
70014 /*
70015 * First try to merge with previous and/or next vma.
70016 */
70017@@ -204,9 +306,21 @@ success:
70018 * vm_flags and vm_page_prot are protected by the mmap_sem
70019 * held in write mode.
70020 */
70021+
70022+#ifdef CONFIG_PAX_SEGMEXEC
70023+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
70024+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
70025+#endif
70026+
70027 vma->vm_flags = newflags;
70028+
70029+#ifdef CONFIG_PAX_MPROTECT
70030+ if (mm->binfmt && mm->binfmt->handle_mprotect)
70031+ mm->binfmt->handle_mprotect(vma, newflags);
70032+#endif
70033+
70034 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
70035- vm_get_page_prot(newflags));
70036+ vm_get_page_prot(vma->vm_flags));
70037
70038 if (vma_wants_writenotify(vma)) {
70039 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
70040@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70041 end = start + len;
70042 if (end <= start)
70043 return -ENOMEM;
70044+
70045+#ifdef CONFIG_PAX_SEGMEXEC
70046+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
70047+ if (end > SEGMEXEC_TASK_SIZE)
70048+ return -EINVAL;
70049+ } else
70050+#endif
70051+
70052+ if (end > TASK_SIZE)
70053+ return -EINVAL;
70054+
70055 if (!arch_validate_prot(prot))
70056 return -EINVAL;
70057
70058@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70059 /*
70060 * Does the application expect PROT_READ to imply PROT_EXEC:
70061 */
70062- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
70063+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
70064 prot |= PROT_EXEC;
70065
70066 vm_flags = calc_vm_prot_bits(prot);
70067@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70068 if (start > vma->vm_start)
70069 prev = vma;
70070
70071+#ifdef CONFIG_PAX_MPROTECT
70072+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
70073+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
70074+#endif
70075+
70076 for (nstart = start ; ; ) {
70077 unsigned long newflags;
70078
70079@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70080
70081 /* newflags >> 4 shift VM_MAY% in place of VM_% */
70082 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
70083+ if (prot & (PROT_WRITE | PROT_EXEC))
70084+ gr_log_rwxmprotect(vma->vm_file);
70085+
70086+ error = -EACCES;
70087+ goto out;
70088+ }
70089+
70090+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
70091 error = -EACCES;
70092 goto out;
70093 }
70094@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70095 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
70096 if (error)
70097 goto out;
70098+
70099+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
70100+
70101 nstart = tmp;
70102
70103 if (nstart < prev->vm_end)
70104diff --git a/mm/mremap.c b/mm/mremap.c
70105index d6959cb..18a402a 100644
70106--- a/mm/mremap.c
70107+++ b/mm/mremap.c
70108@@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
70109 continue;
70110 pte = ptep_get_and_clear(mm, old_addr, old_pte);
70111 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
70112+
70113+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
70114+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
70115+ pte = pte_exprotect(pte);
70116+#endif
70117+
70118 set_pte_at(mm, new_addr, new_pte, pte);
70119 }
70120
70121@@ -290,6 +296,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
70122 if (is_vm_hugetlb_page(vma))
70123 goto Einval;
70124
70125+#ifdef CONFIG_PAX_SEGMEXEC
70126+ if (pax_find_mirror_vma(vma))
70127+ goto Einval;
70128+#endif
70129+
70130 /* We can't remap across vm area boundaries */
70131 if (old_len > vma->vm_end - addr)
70132 goto Efault;
70133@@ -346,20 +357,25 @@ static unsigned long mremap_to(unsigned long addr,
70134 unsigned long ret = -EINVAL;
70135 unsigned long charged = 0;
70136 unsigned long map_flags;
70137+ unsigned long pax_task_size = TASK_SIZE;
70138
70139 if (new_addr & ~PAGE_MASK)
70140 goto out;
70141
70142- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
70143+#ifdef CONFIG_PAX_SEGMEXEC
70144+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
70145+ pax_task_size = SEGMEXEC_TASK_SIZE;
70146+#endif
70147+
70148+ pax_task_size -= PAGE_SIZE;
70149+
70150+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
70151 goto out;
70152
70153 /* Check if the location we're moving into overlaps the
70154 * old location at all, and fail if it does.
70155 */
70156- if ((new_addr <= addr) && (new_addr+new_len) > addr)
70157- goto out;
70158-
70159- if ((addr <= new_addr) && (addr+old_len) > new_addr)
70160+ if (addr + old_len > new_addr && new_addr + new_len > addr)
70161 goto out;
70162
70163 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
70164@@ -431,6 +447,7 @@ unsigned long do_mremap(unsigned long addr,
70165 struct vm_area_struct *vma;
70166 unsigned long ret = -EINVAL;
70167 unsigned long charged = 0;
70168+ unsigned long pax_task_size = TASK_SIZE;
70169
70170 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
70171 goto out;
70172@@ -449,6 +466,17 @@ unsigned long do_mremap(unsigned long addr,
70173 if (!new_len)
70174 goto out;
70175
70176+#ifdef CONFIG_PAX_SEGMEXEC
70177+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
70178+ pax_task_size = SEGMEXEC_TASK_SIZE;
70179+#endif
70180+
70181+ pax_task_size -= PAGE_SIZE;
70182+
70183+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
70184+ old_len > pax_task_size || addr > pax_task_size-old_len)
70185+ goto out;
70186+
70187 if (flags & MREMAP_FIXED) {
70188 if (flags & MREMAP_MAYMOVE)
70189 ret = mremap_to(addr, old_len, new_addr, new_len);
70190@@ -498,6 +526,7 @@ unsigned long do_mremap(unsigned long addr,
70191 addr + new_len);
70192 }
70193 ret = addr;
70194+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
70195 goto out;
70196 }
70197 }
70198@@ -524,7 +553,13 @@ unsigned long do_mremap(unsigned long addr,
70199 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
70200 if (ret)
70201 goto out;
70202+
70203+ map_flags = vma->vm_flags;
70204 ret = move_vma(vma, addr, old_len, new_len, new_addr);
70205+ if (!(ret & ~PAGE_MASK)) {
70206+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
70207+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
70208+ }
70209 }
70210 out:
70211 if (ret & ~PAGE_MASK)
70212diff --git a/mm/nobootmem.c b/mm/nobootmem.c
70213index 7fa41b4..6087460 100644
70214--- a/mm/nobootmem.c
70215+++ b/mm/nobootmem.c
70216@@ -110,19 +110,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
70217 unsigned long __init free_all_memory_core_early(int nodeid)
70218 {
70219 int i;
70220- u64 start, end;
70221+ u64 start, end, startrange, endrange;
70222 unsigned long count = 0;
70223- struct range *range = NULL;
70224+ struct range *range = NULL, rangerange = { 0, 0 };
70225 int nr_range;
70226
70227 nr_range = get_free_all_memory_range(&range, nodeid);
70228+ startrange = __pa(range) >> PAGE_SHIFT;
70229+ endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
70230
70231 for (i = 0; i < nr_range; i++) {
70232 start = range[i].start;
70233 end = range[i].end;
70234+ if (start <= endrange && startrange < end) {
70235+ BUG_ON(rangerange.start | rangerange.end);
70236+ rangerange = range[i];
70237+ continue;
70238+ }
70239 count += end - start;
70240 __free_pages_memory(start, end);
70241 }
70242+ start = rangerange.start;
70243+ end = rangerange.end;
70244+ count += end - start;
70245+ __free_pages_memory(start, end);
70246
70247 return count;
70248 }
70249diff --git a/mm/nommu.c b/mm/nommu.c
70250index b982290..7d73f53 100644
70251--- a/mm/nommu.c
70252+++ b/mm/nommu.c
70253@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
70254 int sysctl_overcommit_ratio = 50; /* default is 50% */
70255 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
70256 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
70257-int heap_stack_gap = 0;
70258
70259 atomic_long_t mmap_pages_allocated;
70260
70261@@ -825,15 +824,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
70262 EXPORT_SYMBOL(find_vma);
70263
70264 /*
70265- * find a VMA
70266- * - we don't extend stack VMAs under NOMMU conditions
70267- */
70268-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
70269-{
70270- return find_vma(mm, addr);
70271-}
70272-
70273-/*
70274 * expand a stack to a given address
70275 * - not supported under NOMMU conditions
70276 */
70277@@ -1553,6 +1543,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
70278
70279 /* most fields are the same, copy all, and then fixup */
70280 *new = *vma;
70281+ INIT_LIST_HEAD(&new->anon_vma_chain);
70282 *region = *vma->vm_region;
70283 new->vm_region = region;
70284
70285diff --git a/mm/page_alloc.c b/mm/page_alloc.c
70286index 485be89..c059ad3 100644
70287--- a/mm/page_alloc.c
70288+++ b/mm/page_alloc.c
70289@@ -341,7 +341,7 @@ out:
70290 * This usage means that zero-order pages may not be compound.
70291 */
70292
70293-static void free_compound_page(struct page *page)
70294+void free_compound_page(struct page *page)
70295 {
70296 __free_pages_ok(page, compound_order(page));
70297 }
70298@@ -654,6 +654,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
70299 int i;
70300 int bad = 0;
70301
70302+#ifdef CONFIG_PAX_MEMORY_SANITIZE
70303+ unsigned long index = 1UL << order;
70304+#endif
70305+
70306 trace_mm_page_free_direct(page, order);
70307 kmemcheck_free_shadow(page, order);
70308
70309@@ -669,6 +673,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
70310 debug_check_no_obj_freed(page_address(page),
70311 PAGE_SIZE << order);
70312 }
70313+
70314+#ifdef CONFIG_PAX_MEMORY_SANITIZE
70315+ for (; index; --index)
70316+ sanitize_highpage(page + index - 1);
70317+#endif
70318+
70319 arch_free_page(page, order);
70320 kernel_map_pages(page, 1 << order, 0);
70321
70322@@ -784,8 +794,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
70323 arch_alloc_page(page, order);
70324 kernel_map_pages(page, 1 << order, 1);
70325
70326+#ifndef CONFIG_PAX_MEMORY_SANITIZE
70327 if (gfp_flags & __GFP_ZERO)
70328 prep_zero_page(page, order, gfp_flags);
70329+#endif
70330
70331 if (order && (gfp_flags & __GFP_COMP))
70332 prep_compound_page(page, order);
70333@@ -3357,7 +3369,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
70334 unsigned long pfn;
70335
70336 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
70337+#ifdef CONFIG_X86_32
70338+ /* boot failures in VMware 8 on 32bit vanilla since
70339+ this change */
70340+ if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
70341+#else
70342 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
70343+#endif
70344 return 1;
70345 }
70346 return 0;
70347diff --git a/mm/percpu.c b/mm/percpu.c
70348index 716eb4a..8d10419 100644
70349--- a/mm/percpu.c
70350+++ b/mm/percpu.c
70351@@ -121,7 +121,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
70352 static unsigned int pcpu_high_unit_cpu __read_mostly;
70353
70354 /* the address of the first chunk which starts with the kernel static area */
70355-void *pcpu_base_addr __read_mostly;
70356+void *pcpu_base_addr __read_only;
70357 EXPORT_SYMBOL_GPL(pcpu_base_addr);
70358
70359 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
70360diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
70361index e920aa3..137702a 100644
70362--- a/mm/process_vm_access.c
70363+++ b/mm/process_vm_access.c
70364@@ -13,6 +13,7 @@
70365 #include <linux/uio.h>
70366 #include <linux/sched.h>
70367 #include <linux/highmem.h>
70368+#include <linux/security.h>
70369 #include <linux/ptrace.h>
70370 #include <linux/slab.h>
70371 #include <linux/syscalls.h>
70372@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
70373 size_t iov_l_curr_offset = 0;
70374 ssize_t iov_len;
70375
70376+ return -ENOSYS; // PaX: until properly audited
70377+
70378 /*
70379 * Work out how many pages of struct pages we're going to need
70380 * when eventually calling get_user_pages
70381 */
70382 for (i = 0; i < riovcnt; i++) {
70383 iov_len = rvec[i].iov_len;
70384- if (iov_len > 0) {
70385- nr_pages_iov = ((unsigned long)rvec[i].iov_base
70386- + iov_len)
70387- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
70388- / PAGE_SIZE + 1;
70389- nr_pages = max(nr_pages, nr_pages_iov);
70390- }
70391+ if (iov_len <= 0)
70392+ continue;
70393+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
70394+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
70395+ nr_pages = max(nr_pages, nr_pages_iov);
70396 }
70397
70398 if (nr_pages == 0)
70399@@ -298,23 +299,23 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
70400 goto free_proc_pages;
70401 }
70402
70403- task_lock(task);
70404- if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
70405- task_unlock(task);
70406+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
70407 rc = -EPERM;
70408 goto put_task_struct;
70409 }
70410- mm = task->mm;
70411
70412- if (!mm || (task->flags & PF_KTHREAD)) {
70413- task_unlock(task);
70414- rc = -EINVAL;
70415+ mm = mm_access(task, PTRACE_MODE_ATTACH);
70416+ if (!mm || IS_ERR(mm)) {
70417+ rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
70418+ /*
70419+ * Explicitly map EACCES to EPERM as EPERM is a more a
70420+ * appropriate error code for process_vw_readv/writev
70421+ */
70422+ if (rc == -EACCES)
70423+ rc = -EPERM;
70424 goto put_task_struct;
70425 }
70426
70427- atomic_inc(&mm->mm_users);
70428- task_unlock(task);
70429-
70430 for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
70431 rc = process_vm_rw_single_vec(
70432 (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
70433diff --git a/mm/rmap.c b/mm/rmap.c
70434index a4fd368..e0ffec7 100644
70435--- a/mm/rmap.c
70436+++ b/mm/rmap.c
70437@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
70438 struct anon_vma *anon_vma = vma->anon_vma;
70439 struct anon_vma_chain *avc;
70440
70441+#ifdef CONFIG_PAX_SEGMEXEC
70442+ struct anon_vma_chain *avc_m = NULL;
70443+#endif
70444+
70445 might_sleep();
70446 if (unlikely(!anon_vma)) {
70447 struct mm_struct *mm = vma->vm_mm;
70448@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
70449 if (!avc)
70450 goto out_enomem;
70451
70452+#ifdef CONFIG_PAX_SEGMEXEC
70453+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
70454+ if (!avc_m)
70455+ goto out_enomem_free_avc;
70456+#endif
70457+
70458 anon_vma = find_mergeable_anon_vma(vma);
70459 allocated = NULL;
70460 if (!anon_vma) {
70461@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
70462 /* page_table_lock to protect against threads */
70463 spin_lock(&mm->page_table_lock);
70464 if (likely(!vma->anon_vma)) {
70465+
70466+#ifdef CONFIG_PAX_SEGMEXEC
70467+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
70468+
70469+ if (vma_m) {
70470+ BUG_ON(vma_m->anon_vma);
70471+ vma_m->anon_vma = anon_vma;
70472+ avc_m->anon_vma = anon_vma;
70473+ avc_m->vma = vma;
70474+ list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
70475+ list_add(&avc_m->same_anon_vma, &anon_vma->head);
70476+ avc_m = NULL;
70477+ }
70478+#endif
70479+
70480 vma->anon_vma = anon_vma;
70481 avc->anon_vma = anon_vma;
70482 avc->vma = vma;
70483@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
70484
70485 if (unlikely(allocated))
70486 put_anon_vma(allocated);
70487+
70488+#ifdef CONFIG_PAX_SEGMEXEC
70489+ if (unlikely(avc_m))
70490+ anon_vma_chain_free(avc_m);
70491+#endif
70492+
70493 if (unlikely(avc))
70494 anon_vma_chain_free(avc);
70495 }
70496 return 0;
70497
70498 out_enomem_free_avc:
70499+
70500+#ifdef CONFIG_PAX_SEGMEXEC
70501+ if (avc_m)
70502+ anon_vma_chain_free(avc_m);
70503+#endif
70504+
70505 anon_vma_chain_free(avc);
70506 out_enomem:
70507 return -ENOMEM;
70508@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
70509 * Attach the anon_vmas from src to dst.
70510 * Returns 0 on success, -ENOMEM on failure.
70511 */
70512-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
70513+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
70514 {
70515 struct anon_vma_chain *avc, *pavc;
70516 struct anon_vma *root = NULL;
70517@@ -276,7 +313,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
70518 * the corresponding VMA in the parent process is attached to.
70519 * Returns 0 on success, non-zero on failure.
70520 */
70521-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
70522+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
70523 {
70524 struct anon_vma_chain *avc;
70525 struct anon_vma *anon_vma;
70526diff --git a/mm/shmem.c b/mm/shmem.c
70527index 6c253f7..367e20a 100644
70528--- a/mm/shmem.c
70529+++ b/mm/shmem.c
70530@@ -31,7 +31,7 @@
70531 #include <linux/export.h>
70532 #include <linux/swap.h>
70533
70534-static struct vfsmount *shm_mnt;
70535+struct vfsmount *shm_mnt;
70536
70537 #ifdef CONFIG_SHMEM
70538 /*
70539@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
70540 #define BOGO_DIRENT_SIZE 20
70541
70542 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
70543-#define SHORT_SYMLINK_LEN 128
70544+#define SHORT_SYMLINK_LEN 64
70545
70546 struct shmem_xattr {
70547 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
70548@@ -2180,8 +2180,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
70549 int err = -ENOMEM;
70550
70551 /* Round up to L1_CACHE_BYTES to resist false sharing */
70552- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
70553- L1_CACHE_BYTES), GFP_KERNEL);
70554+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
70555 if (!sbinfo)
70556 return -ENOMEM;
70557
70558diff --git a/mm/slab.c b/mm/slab.c
70559index 83311c9a..fcf8f86 100644
70560--- a/mm/slab.c
70561+++ b/mm/slab.c
70562@@ -151,7 +151,7 @@
70563
70564 /* Legal flag mask for kmem_cache_create(). */
70565 #if DEBUG
70566-# define CREATE_MASK (SLAB_RED_ZONE | \
70567+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
70568 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
70569 SLAB_CACHE_DMA | \
70570 SLAB_STORE_USER | \
70571@@ -159,7 +159,7 @@
70572 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
70573 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
70574 #else
70575-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
70576+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
70577 SLAB_CACHE_DMA | \
70578 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
70579 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
70580@@ -288,7 +288,7 @@ struct kmem_list3 {
70581 * Need this for bootstrapping a per node allocator.
70582 */
70583 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
70584-static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
70585+static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
70586 #define CACHE_CACHE 0
70587 #define SIZE_AC MAX_NUMNODES
70588 #define SIZE_L3 (2 * MAX_NUMNODES)
70589@@ -389,10 +389,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
70590 if ((x)->max_freeable < i) \
70591 (x)->max_freeable = i; \
70592 } while (0)
70593-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
70594-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
70595-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
70596-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
70597+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
70598+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
70599+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
70600+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
70601 #else
70602 #define STATS_INC_ACTIVE(x) do { } while (0)
70603 #define STATS_DEC_ACTIVE(x) do { } while (0)
70604@@ -538,7 +538,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
70605 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
70606 */
70607 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
70608- const struct slab *slab, void *obj)
70609+ const struct slab *slab, const void *obj)
70610 {
70611 u32 offset = (obj - slab->s_mem);
70612 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
70613@@ -564,7 +564,7 @@ struct cache_names {
70614 static struct cache_names __initdata cache_names[] = {
70615 #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
70616 #include <linux/kmalloc_sizes.h>
70617- {NULL,}
70618+ {NULL}
70619 #undef CACHE
70620 };
70621
70622@@ -1572,7 +1572,7 @@ void __init kmem_cache_init(void)
70623 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
70624 sizes[INDEX_AC].cs_size,
70625 ARCH_KMALLOC_MINALIGN,
70626- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
70627+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
70628 NULL);
70629
70630 if (INDEX_AC != INDEX_L3) {
70631@@ -1580,7 +1580,7 @@ void __init kmem_cache_init(void)
70632 kmem_cache_create(names[INDEX_L3].name,
70633 sizes[INDEX_L3].cs_size,
70634 ARCH_KMALLOC_MINALIGN,
70635- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
70636+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
70637 NULL);
70638 }
70639
70640@@ -1598,7 +1598,7 @@ void __init kmem_cache_init(void)
70641 sizes->cs_cachep = kmem_cache_create(names->name,
70642 sizes->cs_size,
70643 ARCH_KMALLOC_MINALIGN,
70644- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
70645+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
70646 NULL);
70647 }
70648 #ifdef CONFIG_ZONE_DMA
70649@@ -4322,10 +4322,10 @@ static int s_show(struct seq_file *m, void *p)
70650 }
70651 /* cpu stats */
70652 {
70653- unsigned long allochit = atomic_read(&cachep->allochit);
70654- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
70655- unsigned long freehit = atomic_read(&cachep->freehit);
70656- unsigned long freemiss = atomic_read(&cachep->freemiss);
70657+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
70658+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
70659+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
70660+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
70661
70662 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
70663 allochit, allocmiss, freehit, freemiss);
70664@@ -4584,13 +4584,62 @@ static int __init slab_proc_init(void)
70665 {
70666 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
70667 #ifdef CONFIG_DEBUG_SLAB_LEAK
70668- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
70669+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
70670 #endif
70671 return 0;
70672 }
70673 module_init(slab_proc_init);
70674 #endif
70675
70676+void check_object_size(const void *ptr, unsigned long n, bool to)
70677+{
70678+
70679+#ifdef CONFIG_PAX_USERCOPY
70680+ struct page *page;
70681+ struct kmem_cache *cachep = NULL;
70682+ struct slab *slabp;
70683+ unsigned int objnr;
70684+ unsigned long offset;
70685+ const char *type;
70686+
70687+ if (!n)
70688+ return;
70689+
70690+ type = "<null>";
70691+ if (ZERO_OR_NULL_PTR(ptr))
70692+ goto report;
70693+
70694+ if (!virt_addr_valid(ptr))
70695+ return;
70696+
70697+ page = virt_to_head_page(ptr);
70698+
70699+ type = "<process stack>";
70700+ if (!PageSlab(page)) {
70701+ if (object_is_on_stack(ptr, n) == -1)
70702+ goto report;
70703+ return;
70704+ }
70705+
70706+ cachep = page_get_cache(page);
70707+ type = cachep->name;
70708+ if (!(cachep->flags & SLAB_USERCOPY))
70709+ goto report;
70710+
70711+ slabp = page_get_slab(page);
70712+ objnr = obj_to_index(cachep, slabp, ptr);
70713+ BUG_ON(objnr >= cachep->num);
70714+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
70715+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
70716+ return;
70717+
70718+report:
70719+ pax_report_usercopy(ptr, n, to, type);
70720+#endif
70721+
70722+}
70723+EXPORT_SYMBOL(check_object_size);
70724+
70725 /**
70726 * ksize - get the actual amount of memory allocated for a given object
70727 * @objp: Pointer to the object
70728diff --git a/mm/slob.c b/mm/slob.c
70729index 8105be4..579da9d 100644
70730--- a/mm/slob.c
70731+++ b/mm/slob.c
70732@@ -29,7 +29,7 @@
70733 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
70734 * alloc_pages() directly, allocating compound pages so the page order
70735 * does not have to be separately tracked, and also stores the exact
70736- * allocation size in page->private so that it can be used to accurately
70737+ * allocation size in slob_page->size so that it can be used to accurately
70738 * provide ksize(). These objects are detected in kfree() because slob_page()
70739 * is false for them.
70740 *
70741@@ -58,6 +58,7 @@
70742 */
70743
70744 #include <linux/kernel.h>
70745+#include <linux/sched.h>
70746 #include <linux/slab.h>
70747 #include <linux/mm.h>
70748 #include <linux/swap.h> /* struct reclaim_state */
70749@@ -102,7 +103,8 @@ struct slob_page {
70750 unsigned long flags; /* mandatory */
70751 atomic_t _count; /* mandatory */
70752 slobidx_t units; /* free units left in page */
70753- unsigned long pad[2];
70754+ unsigned long pad[1];
70755+ unsigned long size; /* size when >=PAGE_SIZE */
70756 slob_t *free; /* first free slob_t in page */
70757 struct list_head list; /* linked list of free pages */
70758 };
70759@@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
70760 */
70761 static inline int is_slob_page(struct slob_page *sp)
70762 {
70763- return PageSlab((struct page *)sp);
70764+ return PageSlab((struct page *)sp) && !sp->size;
70765 }
70766
70767 static inline void set_slob_page(struct slob_page *sp)
70768@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
70769
70770 static inline struct slob_page *slob_page(const void *addr)
70771 {
70772- return (struct slob_page *)virt_to_page(addr);
70773+ return (struct slob_page *)virt_to_head_page(addr);
70774 }
70775
70776 /*
70777@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
70778 /*
70779 * Return the size of a slob block.
70780 */
70781-static slobidx_t slob_units(slob_t *s)
70782+static slobidx_t slob_units(const slob_t *s)
70783 {
70784 if (s->units > 0)
70785 return s->units;
70786@@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
70787 /*
70788 * Return the next free slob block pointer after this one.
70789 */
70790-static slob_t *slob_next(slob_t *s)
70791+static slob_t *slob_next(const slob_t *s)
70792 {
70793 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
70794 slobidx_t next;
70795@@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
70796 /*
70797 * Returns true if s is the last free block in its page.
70798 */
70799-static int slob_last(slob_t *s)
70800+static int slob_last(const slob_t *s)
70801 {
70802 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
70803 }
70804@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
70805 if (!page)
70806 return NULL;
70807
70808+ set_slob_page(page);
70809 return page_address(page);
70810 }
70811
70812@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
70813 if (!b)
70814 return NULL;
70815 sp = slob_page(b);
70816- set_slob_page(sp);
70817
70818 spin_lock_irqsave(&slob_lock, flags);
70819 sp->units = SLOB_UNITS(PAGE_SIZE);
70820 sp->free = b;
70821+ sp->size = 0;
70822 INIT_LIST_HEAD(&sp->list);
70823 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
70824 set_slob_page_free(sp, slob_list);
70825@@ -476,10 +479,9 @@ out:
70826 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
70827 */
70828
70829-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
70830+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
70831 {
70832- unsigned int *m;
70833- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
70834+ slob_t *m;
70835 void *ret;
70836
70837 gfp &= gfp_allowed_mask;
70838@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
70839
70840 if (!m)
70841 return NULL;
70842- *m = size;
70843+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
70844+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
70845+ m[0].units = size;
70846+ m[1].units = align;
70847 ret = (void *)m + align;
70848
70849 trace_kmalloc_node(_RET_IP_, ret,
70850@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
70851 gfp |= __GFP_COMP;
70852 ret = slob_new_pages(gfp, order, node);
70853 if (ret) {
70854- struct page *page;
70855- page = virt_to_page(ret);
70856- page->private = size;
70857+ struct slob_page *sp;
70858+ sp = slob_page(ret);
70859+ sp->size = size;
70860 }
70861
70862 trace_kmalloc_node(_RET_IP_, ret,
70863 size, PAGE_SIZE << order, gfp, node);
70864 }
70865
70866- kmemleak_alloc(ret, size, 1, gfp);
70867+ return ret;
70868+}
70869+
70870+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
70871+{
70872+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
70873+ void *ret = __kmalloc_node_align(size, gfp, node, align);
70874+
70875+ if (!ZERO_OR_NULL_PTR(ret))
70876+ kmemleak_alloc(ret, size, 1, gfp);
70877 return ret;
70878 }
70879 EXPORT_SYMBOL(__kmalloc_node);
70880@@ -533,13 +547,92 @@ void kfree(const void *block)
70881 sp = slob_page(block);
70882 if (is_slob_page(sp)) {
70883 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
70884- unsigned int *m = (unsigned int *)(block - align);
70885- slob_free(m, *m + align);
70886- } else
70887+ slob_t *m = (slob_t *)(block - align);
70888+ slob_free(m, m[0].units + align);
70889+ } else {
70890+ clear_slob_page(sp);
70891+ free_slob_page(sp);
70892+ sp->size = 0;
70893 put_page(&sp->page);
70894+ }
70895 }
70896 EXPORT_SYMBOL(kfree);
70897
70898+void check_object_size(const void *ptr, unsigned long n, bool to)
70899+{
70900+
70901+#ifdef CONFIG_PAX_USERCOPY
70902+ struct slob_page *sp;
70903+ const slob_t *free;
70904+ const void *base;
70905+ unsigned long flags;
70906+ const char *type;
70907+
70908+ if (!n)
70909+ return;
70910+
70911+ type = "<null>";
70912+ if (ZERO_OR_NULL_PTR(ptr))
70913+ goto report;
70914+
70915+ if (!virt_addr_valid(ptr))
70916+ return;
70917+
70918+ type = "<process stack>";
70919+ sp = slob_page(ptr);
70920+ if (!PageSlab((struct page*)sp)) {
70921+ if (object_is_on_stack(ptr, n) == -1)
70922+ goto report;
70923+ return;
70924+ }
70925+
70926+ type = "<slob>";
70927+ if (sp->size) {
70928+ base = page_address(&sp->page);
70929+ if (base <= ptr && n <= sp->size - (ptr - base))
70930+ return;
70931+ goto report;
70932+ }
70933+
70934+ /* some tricky double walking to find the chunk */
70935+ spin_lock_irqsave(&slob_lock, flags);
70936+ base = (void *)((unsigned long)ptr & PAGE_MASK);
70937+ free = sp->free;
70938+
70939+ while (!slob_last(free) && (void *)free <= ptr) {
70940+ base = free + slob_units(free);
70941+ free = slob_next(free);
70942+ }
70943+
70944+ while (base < (void *)free) {
70945+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
70946+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
70947+ int offset;
70948+
70949+ if (ptr < base + align)
70950+ break;
70951+
70952+ offset = ptr - base - align;
70953+ if (offset >= m) {
70954+ base += size;
70955+ continue;
70956+ }
70957+
70958+ if (n > m - offset)
70959+ break;
70960+
70961+ spin_unlock_irqrestore(&slob_lock, flags);
70962+ return;
70963+ }
70964+
70965+ spin_unlock_irqrestore(&slob_lock, flags);
70966+report:
70967+ pax_report_usercopy(ptr, n, to, type);
70968+#endif
70969+
70970+}
70971+EXPORT_SYMBOL(check_object_size);
70972+
70973 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
70974 size_t ksize(const void *block)
70975 {
70976@@ -552,10 +645,10 @@ size_t ksize(const void *block)
70977 sp = slob_page(block);
70978 if (is_slob_page(sp)) {
70979 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
70980- unsigned int *m = (unsigned int *)(block - align);
70981- return SLOB_UNITS(*m) * SLOB_UNIT;
70982+ slob_t *m = (slob_t *)(block - align);
70983+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
70984 } else
70985- return sp->page.private;
70986+ return sp->size;
70987 }
70988 EXPORT_SYMBOL(ksize);
70989
70990@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
70991 {
70992 struct kmem_cache *c;
70993
70994+#ifdef CONFIG_PAX_USERCOPY
70995+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
70996+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
70997+#else
70998 c = slob_alloc(sizeof(struct kmem_cache),
70999 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
71000+#endif
71001
71002 if (c) {
71003 c->name = name;
71004@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
71005
71006 lockdep_trace_alloc(flags);
71007
71008+#ifdef CONFIG_PAX_USERCOPY
71009+ b = __kmalloc_node_align(c->size, flags, node, c->align);
71010+#else
71011 if (c->size < PAGE_SIZE) {
71012 b = slob_alloc(c->size, flags, c->align, node);
71013 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
71014 SLOB_UNITS(c->size) * SLOB_UNIT,
71015 flags, node);
71016 } else {
71017+ struct slob_page *sp;
71018+
71019 b = slob_new_pages(flags, get_order(c->size), node);
71020+ sp = slob_page(b);
71021+ sp->size = c->size;
71022 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
71023 PAGE_SIZE << get_order(c->size),
71024 flags, node);
71025 }
71026+#endif
71027
71028 if (c->ctor)
71029 c->ctor(b);
71030@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
71031
71032 static void __kmem_cache_free(void *b, int size)
71033 {
71034- if (size < PAGE_SIZE)
71035+ struct slob_page *sp = slob_page(b);
71036+
71037+ if (is_slob_page(sp))
71038 slob_free(b, size);
71039- else
71040+ else {
71041+ clear_slob_page(sp);
71042+ free_slob_page(sp);
71043+ sp->size = 0;
71044 slob_free_pages(b, get_order(size));
71045+ }
71046 }
71047
71048 static void kmem_rcu_free(struct rcu_head *head)
71049@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_head *head)
71050
71051 void kmem_cache_free(struct kmem_cache *c, void *b)
71052 {
71053+ int size = c->size;
71054+
71055+#ifdef CONFIG_PAX_USERCOPY
71056+ if (size + c->align < PAGE_SIZE) {
71057+ size += c->align;
71058+ b -= c->align;
71059+ }
71060+#endif
71061+
71062 kmemleak_free_recursive(b, c->flags);
71063 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
71064 struct slob_rcu *slob_rcu;
71065- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
71066- slob_rcu->size = c->size;
71067+ slob_rcu = b + (size - sizeof(struct slob_rcu));
71068+ slob_rcu->size = size;
71069 call_rcu(&slob_rcu->head, kmem_rcu_free);
71070 } else {
71071- __kmem_cache_free(b, c->size);
71072+ __kmem_cache_free(b, size);
71073 }
71074
71075+#ifdef CONFIG_PAX_USERCOPY
71076+ trace_kfree(_RET_IP_, b);
71077+#else
71078 trace_kmem_cache_free(_RET_IP_, b);
71079+#endif
71080+
71081 }
71082 EXPORT_SYMBOL(kmem_cache_free);
71083
71084diff --git a/mm/slub.c b/mm/slub.c
71085index 1a919f0..1739c9b 100644
71086--- a/mm/slub.c
71087+++ b/mm/slub.c
71088@@ -208,7 +208,7 @@ struct track {
71089
71090 enum track_item { TRACK_ALLOC, TRACK_FREE };
71091
71092-#ifdef CONFIG_SYSFS
71093+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71094 static int sysfs_slab_add(struct kmem_cache *);
71095 static int sysfs_slab_alias(struct kmem_cache *, const char *);
71096 static void sysfs_slab_remove(struct kmem_cache *);
71097@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
71098 if (!t->addr)
71099 return;
71100
71101- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
71102+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
71103 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
71104 #ifdef CONFIG_STACKTRACE
71105 {
71106@@ -2559,6 +2559,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
71107
71108 page = virt_to_head_page(x);
71109
71110+ BUG_ON(!PageSlab(page));
71111+
71112 slab_free(s, page, x, _RET_IP_);
71113
71114 trace_kmem_cache_free(_RET_IP_, x);
71115@@ -2592,7 +2594,7 @@ static int slub_min_objects;
71116 * Merge control. If this is set then no merging of slab caches will occur.
71117 * (Could be removed. This was introduced to pacify the merge skeptics.)
71118 */
71119-static int slub_nomerge;
71120+static int slub_nomerge = 1;
71121
71122 /*
71123 * Calculate the order of allocation given an slab object size.
71124@@ -3042,7 +3044,7 @@ static int kmem_cache_open(struct kmem_cache *s,
71125 else
71126 s->cpu_partial = 30;
71127
71128- s->refcount = 1;
71129+ atomic_set(&s->refcount, 1);
71130 #ifdef CONFIG_NUMA
71131 s->remote_node_defrag_ratio = 1000;
71132 #endif
71133@@ -3146,8 +3148,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
71134 void kmem_cache_destroy(struct kmem_cache *s)
71135 {
71136 down_write(&slub_lock);
71137- s->refcount--;
71138- if (!s->refcount) {
71139+ if (atomic_dec_and_test(&s->refcount)) {
71140 list_del(&s->list);
71141 up_write(&slub_lock);
71142 if (kmem_cache_close(s)) {
71143@@ -3358,6 +3359,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
71144 EXPORT_SYMBOL(__kmalloc_node);
71145 #endif
71146
71147+void check_object_size(const void *ptr, unsigned long n, bool to)
71148+{
71149+
71150+#ifdef CONFIG_PAX_USERCOPY
71151+ struct page *page;
71152+ struct kmem_cache *s = NULL;
71153+ unsigned long offset;
71154+ const char *type;
71155+
71156+ if (!n)
71157+ return;
71158+
71159+ type = "<null>";
71160+ if (ZERO_OR_NULL_PTR(ptr))
71161+ goto report;
71162+
71163+ if (!virt_addr_valid(ptr))
71164+ return;
71165+
71166+ page = virt_to_head_page(ptr);
71167+
71168+ type = "<process stack>";
71169+ if (!PageSlab(page)) {
71170+ if (object_is_on_stack(ptr, n) == -1)
71171+ goto report;
71172+ return;
71173+ }
71174+
71175+ s = page->slab;
71176+ type = s->name;
71177+ if (!(s->flags & SLAB_USERCOPY))
71178+ goto report;
71179+
71180+ offset = (ptr - page_address(page)) % s->size;
71181+ if (offset <= s->objsize && n <= s->objsize - offset)
71182+ return;
71183+
71184+report:
71185+ pax_report_usercopy(ptr, n, to, type);
71186+#endif
71187+
71188+}
71189+EXPORT_SYMBOL(check_object_size);
71190+
71191 size_t ksize(const void *object)
71192 {
71193 struct page *page;
71194@@ -3632,7 +3677,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
71195 int node;
71196
71197 list_add(&s->list, &slab_caches);
71198- s->refcount = -1;
71199+ atomic_set(&s->refcount, -1);
71200
71201 for_each_node_state(node, N_NORMAL_MEMORY) {
71202 struct kmem_cache_node *n = get_node(s, node);
71203@@ -3749,17 +3794,17 @@ void __init kmem_cache_init(void)
71204
71205 /* Caches that are not of the two-to-the-power-of size */
71206 if (KMALLOC_MIN_SIZE <= 32) {
71207- kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
71208+ kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
71209 caches++;
71210 }
71211
71212 if (KMALLOC_MIN_SIZE <= 64) {
71213- kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
71214+ kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
71215 caches++;
71216 }
71217
71218 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
71219- kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
71220+ kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
71221 caches++;
71222 }
71223
71224@@ -3827,7 +3872,7 @@ static int slab_unmergeable(struct kmem_cache *s)
71225 /*
71226 * We may have set a slab to be unmergeable during bootstrap.
71227 */
71228- if (s->refcount < 0)
71229+ if (atomic_read(&s->refcount) < 0)
71230 return 1;
71231
71232 return 0;
71233@@ -3886,7 +3931,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
71234 down_write(&slub_lock);
71235 s = find_mergeable(size, align, flags, name, ctor);
71236 if (s) {
71237- s->refcount++;
71238+ atomic_inc(&s->refcount);
71239 /*
71240 * Adjust the object sizes so that we clear
71241 * the complete object on kzalloc.
71242@@ -3895,7 +3940,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
71243 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
71244
71245 if (sysfs_slab_alias(s, name)) {
71246- s->refcount--;
71247+ atomic_dec(&s->refcount);
71248 goto err;
71249 }
71250 up_write(&slub_lock);
71251@@ -4023,7 +4068,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
71252 }
71253 #endif
71254
71255-#ifdef CONFIG_SYSFS
71256+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71257 static int count_inuse(struct page *page)
71258 {
71259 return page->inuse;
71260@@ -4410,12 +4455,12 @@ static void resiliency_test(void)
71261 validate_slab_cache(kmalloc_caches[9]);
71262 }
71263 #else
71264-#ifdef CONFIG_SYSFS
71265+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71266 static void resiliency_test(void) {};
71267 #endif
71268 #endif
71269
71270-#ifdef CONFIG_SYSFS
71271+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71272 enum slab_stat_type {
71273 SL_ALL, /* All slabs */
71274 SL_PARTIAL, /* Only partially allocated slabs */
71275@@ -4656,7 +4701,7 @@ SLAB_ATTR_RO(ctor);
71276
71277 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
71278 {
71279- return sprintf(buf, "%d\n", s->refcount - 1);
71280+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
71281 }
71282 SLAB_ATTR_RO(aliases);
71283
71284@@ -5223,6 +5268,7 @@ static char *create_unique_id(struct kmem_cache *s)
71285 return name;
71286 }
71287
71288+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71289 static int sysfs_slab_add(struct kmem_cache *s)
71290 {
71291 int err;
71292@@ -5285,6 +5331,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
71293 kobject_del(&s->kobj);
71294 kobject_put(&s->kobj);
71295 }
71296+#endif
71297
71298 /*
71299 * Need to buffer aliases during bootup until sysfs becomes
71300@@ -5298,6 +5345,7 @@ struct saved_alias {
71301
71302 static struct saved_alias *alias_list;
71303
71304+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71305 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
71306 {
71307 struct saved_alias *al;
71308@@ -5320,6 +5368,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
71309 alias_list = al;
71310 return 0;
71311 }
71312+#endif
71313
71314 static int __init slab_sysfs_init(void)
71315 {
71316diff --git a/mm/swap.c b/mm/swap.c
71317index a91caf7..b887e735 100644
71318--- a/mm/swap.c
71319+++ b/mm/swap.c
71320@@ -31,6 +31,7 @@
71321 #include <linux/backing-dev.h>
71322 #include <linux/memcontrol.h>
71323 #include <linux/gfp.h>
71324+#include <linux/hugetlb.h>
71325
71326 #include "internal.h"
71327
71328@@ -71,6 +72,8 @@ static void __put_compound_page(struct page *page)
71329
71330 __page_cache_release(page);
71331 dtor = get_compound_page_dtor(page);
71332+ if (!PageHuge(page))
71333+ BUG_ON(dtor != free_compound_page);
71334 (*dtor)(page);
71335 }
71336
71337diff --git a/mm/swapfile.c b/mm/swapfile.c
71338index b1cd120..aaae885 100644
71339--- a/mm/swapfile.c
71340+++ b/mm/swapfile.c
71341@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
71342
71343 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
71344 /* Activity counter to indicate that a swapon or swapoff has occurred */
71345-static atomic_t proc_poll_event = ATOMIC_INIT(0);
71346+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
71347
71348 static inline unsigned char swap_count(unsigned char ent)
71349 {
71350@@ -1670,7 +1670,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
71351 }
71352 filp_close(swap_file, NULL);
71353 err = 0;
71354- atomic_inc(&proc_poll_event);
71355+ atomic_inc_unchecked(&proc_poll_event);
71356 wake_up_interruptible(&proc_poll_wait);
71357
71358 out_dput:
71359@@ -1686,8 +1686,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
71360
71361 poll_wait(file, &proc_poll_wait, wait);
71362
71363- if (seq->poll_event != atomic_read(&proc_poll_event)) {
71364- seq->poll_event = atomic_read(&proc_poll_event);
71365+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
71366+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
71367 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
71368 }
71369
71370@@ -1785,7 +1785,7 @@ static int swaps_open(struct inode *inode, struct file *file)
71371 return ret;
71372
71373 seq = file->private_data;
71374- seq->poll_event = atomic_read(&proc_poll_event);
71375+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
71376 return 0;
71377 }
71378
71379@@ -2123,7 +2123,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
71380 (p->flags & SWP_DISCARDABLE) ? "D" : "");
71381
71382 mutex_unlock(&swapon_mutex);
71383- atomic_inc(&proc_poll_event);
71384+ atomic_inc_unchecked(&proc_poll_event);
71385 wake_up_interruptible(&proc_poll_wait);
71386
71387 if (S_ISREG(inode->i_mode))
71388diff --git a/mm/util.c b/mm/util.c
71389index 136ac4f..5117eef 100644
71390--- a/mm/util.c
71391+++ b/mm/util.c
71392@@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
71393 * allocated buffer. Use this if you don't want to free the buffer immediately
71394 * like, for example, with RCU.
71395 */
71396+#undef __krealloc
71397 void *__krealloc(const void *p, size_t new_size, gfp_t flags)
71398 {
71399 void *ret;
71400@@ -147,6 +148,7 @@ EXPORT_SYMBOL(__krealloc);
71401 * behaves exactly like kmalloc(). If @size is 0 and @p is not a
71402 * %NULL pointer, the object pointed to is freed.
71403 */
71404+#undef krealloc
71405 void *krealloc(const void *p, size_t new_size, gfp_t flags)
71406 {
71407 void *ret;
71408@@ -243,6 +245,12 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
71409 void arch_pick_mmap_layout(struct mm_struct *mm)
71410 {
71411 mm->mmap_base = TASK_UNMAPPED_BASE;
71412+
71413+#ifdef CONFIG_PAX_RANDMMAP
71414+ if (mm->pax_flags & MF_PAX_RANDMMAP)
71415+ mm->mmap_base += mm->delta_mmap;
71416+#endif
71417+
71418 mm->get_unmapped_area = arch_get_unmapped_area;
71419 mm->unmap_area = arch_unmap_area;
71420 }
71421diff --git a/mm/vmalloc.c b/mm/vmalloc.c
71422index 27be2f0..0aef2c2 100644
71423--- a/mm/vmalloc.c
71424+++ b/mm/vmalloc.c
71425@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
71426
71427 pte = pte_offset_kernel(pmd, addr);
71428 do {
71429- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
71430- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
71431+
71432+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71433+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
71434+ BUG_ON(!pte_exec(*pte));
71435+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
71436+ continue;
71437+ }
71438+#endif
71439+
71440+ {
71441+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
71442+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
71443+ }
71444 } while (pte++, addr += PAGE_SIZE, addr != end);
71445 }
71446
71447@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
71448 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
71449 {
71450 pte_t *pte;
71451+ int ret = -ENOMEM;
71452
71453 /*
71454 * nr is a running index into the array which helps higher level
71455@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
71456 pte = pte_alloc_kernel(pmd, addr);
71457 if (!pte)
71458 return -ENOMEM;
71459+
71460+ pax_open_kernel();
71461 do {
71462 struct page *page = pages[*nr];
71463
71464- if (WARN_ON(!pte_none(*pte)))
71465- return -EBUSY;
71466- if (WARN_ON(!page))
71467- return -ENOMEM;
71468+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71469+ if (pgprot_val(prot) & _PAGE_NX)
71470+#endif
71471+
71472+ if (WARN_ON(!pte_none(*pte))) {
71473+ ret = -EBUSY;
71474+ goto out;
71475+ }
71476+ if (WARN_ON(!page)) {
71477+ ret = -ENOMEM;
71478+ goto out;
71479+ }
71480 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
71481 (*nr)++;
71482 } while (pte++, addr += PAGE_SIZE, addr != end);
71483- return 0;
71484+ ret = 0;
71485+out:
71486+ pax_close_kernel();
71487+ return ret;
71488 }
71489
71490 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
71491@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
71492 * and fall back on vmalloc() if that fails. Others
71493 * just put it in the vmalloc space.
71494 */
71495-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
71496+#ifdef CONFIG_MODULES
71497+#ifdef MODULES_VADDR
71498 unsigned long addr = (unsigned long)x;
71499 if (addr >= MODULES_VADDR && addr < MODULES_END)
71500 return 1;
71501 #endif
71502+
71503+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71504+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
71505+ return 1;
71506+#endif
71507+
71508+#endif
71509+
71510 return is_vmalloc_addr(x);
71511 }
71512
71513@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
71514
71515 if (!pgd_none(*pgd)) {
71516 pud_t *pud = pud_offset(pgd, addr);
71517+#ifdef CONFIG_X86
71518+ if (!pud_large(*pud))
71519+#endif
71520 if (!pud_none(*pud)) {
71521 pmd_t *pmd = pmd_offset(pud, addr);
71522+#ifdef CONFIG_X86
71523+ if (!pmd_large(*pmd))
71524+#endif
71525 if (!pmd_none(*pmd)) {
71526 pte_t *ptep, pte;
71527
71528@@ -1294,6 +1334,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
71529 struct vm_struct *area;
71530
71531 BUG_ON(in_interrupt());
71532+
71533+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
71534+ if (flags & VM_KERNEXEC) {
71535+ if (start != VMALLOC_START || end != VMALLOC_END)
71536+ return NULL;
71537+ start = (unsigned long)MODULES_EXEC_VADDR;
71538+ end = (unsigned long)MODULES_EXEC_END;
71539+ }
71540+#endif
71541+
71542 if (flags & VM_IOREMAP) {
71543 int bit = fls(size);
71544
71545@@ -1526,6 +1576,11 @@ void *vmap(struct page **pages, unsigned int count,
71546 if (count > totalram_pages)
71547 return NULL;
71548
71549+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
71550+ if (!(pgprot_val(prot) & _PAGE_NX))
71551+ flags |= VM_KERNEXEC;
71552+#endif
71553+
71554 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
71555 __builtin_return_address(0));
71556 if (!area)
71557@@ -1627,6 +1682,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
71558 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
71559 goto fail;
71560
71561+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
71562+ if (!(pgprot_val(prot) & _PAGE_NX))
71563+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
71564+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
71565+ else
71566+#endif
71567+
71568 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
71569 start, end, node, gfp_mask, caller);
71570 if (!area)
71571@@ -1679,6 +1741,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
71572 gfp_mask, prot, node, caller);
71573 }
71574
71575+#undef __vmalloc
71576 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
71577 {
71578 return __vmalloc_node(size, 1, gfp_mask, prot, -1,
71579@@ -1702,6 +1765,7 @@ static inline void *__vmalloc_node_flags(unsigned long size,
71580 * For tight control over page level allocator and protection flags
71581 * use __vmalloc() instead.
71582 */
71583+#undef vmalloc
71584 void *vmalloc(unsigned long size)
71585 {
71586 return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM);
71587@@ -1718,6 +1782,7 @@ EXPORT_SYMBOL(vmalloc);
71588 * For tight control over page level allocator and protection flags
71589 * use __vmalloc() instead.
71590 */
71591+#undef vzalloc
71592 void *vzalloc(unsigned long size)
71593 {
71594 return __vmalloc_node_flags(size, -1,
71595@@ -1732,6 +1797,7 @@ EXPORT_SYMBOL(vzalloc);
71596 * The resulting memory area is zeroed so it can be mapped to userspace
71597 * without leaking data.
71598 */
71599+#undef vmalloc_user
71600 void *vmalloc_user(unsigned long size)
71601 {
71602 struct vm_struct *area;
71603@@ -1759,6 +1825,7 @@ EXPORT_SYMBOL(vmalloc_user);
71604 * For tight control over page level allocator and protection flags
71605 * use __vmalloc() instead.
71606 */
71607+#undef vmalloc_node
71608 void *vmalloc_node(unsigned long size, int node)
71609 {
71610 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
71611@@ -1778,6 +1845,7 @@ EXPORT_SYMBOL(vmalloc_node);
71612 * For tight control over page level allocator and protection flags
71613 * use __vmalloc_node() instead.
71614 */
71615+#undef vzalloc_node
71616 void *vzalloc_node(unsigned long size, int node)
71617 {
71618 return __vmalloc_node_flags(size, node,
71619@@ -1800,10 +1868,10 @@ EXPORT_SYMBOL(vzalloc_node);
71620 * For tight control over page level allocator and protection flags
71621 * use __vmalloc() instead.
71622 */
71623-
71624+#undef vmalloc_exec
71625 void *vmalloc_exec(unsigned long size)
71626 {
71627- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
71628+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
71629 -1, __builtin_return_address(0));
71630 }
71631
71632@@ -1822,6 +1890,7 @@ void *vmalloc_exec(unsigned long size)
71633 * Allocate enough 32bit PA addressable pages to cover @size from the
71634 * page level allocator and map them into contiguous kernel virtual space.
71635 */
71636+#undef vmalloc_32
71637 void *vmalloc_32(unsigned long size)
71638 {
71639 return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
71640@@ -1836,6 +1905,7 @@ EXPORT_SYMBOL(vmalloc_32);
71641 * The resulting memory area is 32bit addressable and zeroed so it can be
71642 * mapped to userspace without leaking data.
71643 */
71644+#undef vmalloc_32_user
71645 void *vmalloc_32_user(unsigned long size)
71646 {
71647 struct vm_struct *area;
71648@@ -2098,6 +2168,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
71649 unsigned long uaddr = vma->vm_start;
71650 unsigned long usize = vma->vm_end - vma->vm_start;
71651
71652+ BUG_ON(vma->vm_mirror);
71653+
71654 if ((PAGE_SIZE-1) & (unsigned long)addr)
71655 return -EINVAL;
71656
71657diff --git a/mm/vmstat.c b/mm/vmstat.c
71658index 8fd603b..cf0d930 100644
71659--- a/mm/vmstat.c
71660+++ b/mm/vmstat.c
71661@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
71662 *
71663 * vm_stat contains the global counters
71664 */
71665-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
71666+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
71667 EXPORT_SYMBOL(vm_stat);
71668
71669 #ifdef CONFIG_SMP
71670@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
71671 v = p->vm_stat_diff[i];
71672 p->vm_stat_diff[i] = 0;
71673 local_irq_restore(flags);
71674- atomic_long_add(v, &zone->vm_stat[i]);
71675+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
71676 global_diff[i] += v;
71677 #ifdef CONFIG_NUMA
71678 /* 3 seconds idle till flush */
71679@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
71680
71681 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
71682 if (global_diff[i])
71683- atomic_long_add(global_diff[i], &vm_stat[i]);
71684+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
71685 }
71686
71687 #endif
71688@@ -1208,10 +1208,20 @@ static int __init setup_vmstat(void)
71689 start_cpu_timer(cpu);
71690 #endif
71691 #ifdef CONFIG_PROC_FS
71692- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
71693- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
71694- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
71695- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
71696+ {
71697+ mode_t gr_mode = S_IRUGO;
71698+#ifdef CONFIG_GRKERNSEC_PROC_ADD
71699+ gr_mode = S_IRUSR;
71700+#endif
71701+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
71702+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
71703+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
71704+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
71705+#else
71706+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
71707+#endif
71708+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
71709+ }
71710 #endif
71711 return 0;
71712 }
71713diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
71714index 5471628..cef8398 100644
71715--- a/net/8021q/vlan.c
71716+++ b/net/8021q/vlan.c
71717@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
71718 err = -EPERM;
71719 if (!capable(CAP_NET_ADMIN))
71720 break;
71721- if ((args.u.name_type >= 0) &&
71722- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
71723+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
71724 struct vlan_net *vn;
71725
71726 vn = net_generic(net, vlan_net_id);
71727diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
71728index fdfdb57..38d368c 100644
71729--- a/net/9p/trans_fd.c
71730+++ b/net/9p/trans_fd.c
71731@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
71732 oldfs = get_fs();
71733 set_fs(get_ds());
71734 /* The cast to a user pointer is valid due to the set_fs() */
71735- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
71736+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
71737 set_fs(oldfs);
71738
71739 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
71740diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
71741index f41f026..fe76ea8 100644
71742--- a/net/atm/atm_misc.c
71743+++ b/net/atm/atm_misc.c
71744@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
71745 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
71746 return 1;
71747 atm_return(vcc, truesize);
71748- atomic_inc(&vcc->stats->rx_drop);
71749+ atomic_inc_unchecked(&vcc->stats->rx_drop);
71750 return 0;
71751 }
71752 EXPORT_SYMBOL(atm_charge);
71753@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
71754 }
71755 }
71756 atm_return(vcc, guess);
71757- atomic_inc(&vcc->stats->rx_drop);
71758+ atomic_inc_unchecked(&vcc->stats->rx_drop);
71759 return NULL;
71760 }
71761 EXPORT_SYMBOL(atm_alloc_charge);
71762@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
71763
71764 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
71765 {
71766-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
71767+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
71768 __SONET_ITEMS
71769 #undef __HANDLE_ITEM
71770 }
71771@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
71772
71773 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
71774 {
71775-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
71776+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
71777 __SONET_ITEMS
71778 #undef __HANDLE_ITEM
71779 }
71780diff --git a/net/atm/lec.h b/net/atm/lec.h
71781index dfc0719..47c5322 100644
71782--- a/net/atm/lec.h
71783+++ b/net/atm/lec.h
71784@@ -48,7 +48,7 @@ struct lane2_ops {
71785 const u8 *tlvs, u32 sizeoftlvs);
71786 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
71787 const u8 *tlvs, u32 sizeoftlvs);
71788-};
71789+} __no_const;
71790
71791 /*
71792 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
71793diff --git a/net/atm/mpc.h b/net/atm/mpc.h
71794index 0919a88..a23d54e 100644
71795--- a/net/atm/mpc.h
71796+++ b/net/atm/mpc.h
71797@@ -33,7 +33,7 @@ struct mpoa_client {
71798 struct mpc_parameters parameters; /* parameters for this client */
71799
71800 const struct net_device_ops *old_ops;
71801- struct net_device_ops new_ops;
71802+ net_device_ops_no_const new_ops;
71803 };
71804
71805
71806diff --git a/net/atm/proc.c b/net/atm/proc.c
71807index 0d020de..011c7bb 100644
71808--- a/net/atm/proc.c
71809+++ b/net/atm/proc.c
71810@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
71811 const struct k_atm_aal_stats *stats)
71812 {
71813 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
71814- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
71815- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
71816- atomic_read(&stats->rx_drop));
71817+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
71818+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
71819+ atomic_read_unchecked(&stats->rx_drop));
71820 }
71821
71822 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
71823diff --git a/net/atm/resources.c b/net/atm/resources.c
71824index 23f45ce..c748f1a 100644
71825--- a/net/atm/resources.c
71826+++ b/net/atm/resources.c
71827@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
71828 static void copy_aal_stats(struct k_atm_aal_stats *from,
71829 struct atm_aal_stats *to)
71830 {
71831-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
71832+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
71833 __AAL_STAT_ITEMS
71834 #undef __HANDLE_ITEM
71835 }
71836@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
71837 static void subtract_aal_stats(struct k_atm_aal_stats *from,
71838 struct atm_aal_stats *to)
71839 {
71840-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
71841+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
71842 __AAL_STAT_ITEMS
71843 #undef __HANDLE_ITEM
71844 }
71845diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
71846index 3512e25..2b33401 100644
71847--- a/net/batman-adv/bat_iv_ogm.c
71848+++ b/net/batman-adv/bat_iv_ogm.c
71849@@ -541,7 +541,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
71850
71851 /* change sequence number to network order */
71852 batman_ogm_packet->seqno =
71853- htonl((uint32_t)atomic_read(&hard_iface->seqno));
71854+ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
71855
71856 batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
71857 batman_ogm_packet->tt_crc = htons((uint16_t)
71858@@ -561,7 +561,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
71859 else
71860 batman_ogm_packet->gw_flags = NO_FLAGS;
71861
71862- atomic_inc(&hard_iface->seqno);
71863+ atomic_inc_unchecked(&hard_iface->seqno);
71864
71865 slide_own_bcast_window(hard_iface);
71866 bat_ogm_queue_add(bat_priv, hard_iface->packet_buff,
71867@@ -922,7 +922,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
71868 return;
71869
71870 /* could be changed by schedule_own_packet() */
71871- if_incoming_seqno = atomic_read(&if_incoming->seqno);
71872+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
71873
71874 has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
71875
71876diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
71877index 7704df4..beb4e16 100644
71878--- a/net/batman-adv/hard-interface.c
71879+++ b/net/batman-adv/hard-interface.c
71880@@ -326,8 +326,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
71881 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
71882 dev_add_pack(&hard_iface->batman_adv_ptype);
71883
71884- atomic_set(&hard_iface->seqno, 1);
71885- atomic_set(&hard_iface->frag_seqno, 1);
71886+ atomic_set_unchecked(&hard_iface->seqno, 1);
71887+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
71888 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
71889 hard_iface->net_dev->name);
71890
71891diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
71892index f9cc957..efd9dae 100644
71893--- a/net/batman-adv/soft-interface.c
71894+++ b/net/batman-adv/soft-interface.c
71895@@ -634,7 +634,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
71896
71897 /* set broadcast sequence number */
71898 bcast_packet->seqno =
71899- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
71900+ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
71901
71902 add_bcast_packet_to_list(bat_priv, skb, 1);
71903
71904@@ -828,7 +828,7 @@ struct net_device *softif_create(const char *name)
71905 atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
71906
71907 atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
71908- atomic_set(&bat_priv->bcast_seqno, 1);
71909+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
71910 atomic_set(&bat_priv->ttvn, 0);
71911 atomic_set(&bat_priv->tt_local_changes, 0);
71912 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
71913diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
71914index ab8d0fe..ceba3fd 100644
71915--- a/net/batman-adv/types.h
71916+++ b/net/batman-adv/types.h
71917@@ -38,8 +38,8 @@ struct hard_iface {
71918 int16_t if_num;
71919 char if_status;
71920 struct net_device *net_dev;
71921- atomic_t seqno;
71922- atomic_t frag_seqno;
71923+ atomic_unchecked_t seqno;
71924+ atomic_unchecked_t frag_seqno;
71925 unsigned char *packet_buff;
71926 int packet_len;
71927 struct kobject *hardif_obj;
71928@@ -154,7 +154,7 @@ struct bat_priv {
71929 atomic_t orig_interval; /* uint */
71930 atomic_t hop_penalty; /* uint */
71931 atomic_t log_level; /* uint */
71932- atomic_t bcast_seqno;
71933+ atomic_unchecked_t bcast_seqno;
71934 atomic_t bcast_queue_left;
71935 atomic_t batman_queue_left;
71936 atomic_t ttvn; /* translation table version number */
71937diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
71938index 07d1c1d..7e9bea9 100644
71939--- a/net/batman-adv/unicast.c
71940+++ b/net/batman-adv/unicast.c
71941@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
71942 frag1->flags = UNI_FRAG_HEAD | large_tail;
71943 frag2->flags = large_tail;
71944
71945- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
71946+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
71947 frag1->seqno = htons(seqno - 1);
71948 frag2->seqno = htons(seqno);
71949
71950diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
71951index c1c597e..05ebb40 100644
71952--- a/net/bluetooth/hci_conn.c
71953+++ b/net/bluetooth/hci_conn.c
71954@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
71955 memset(&cp, 0, sizeof(cp));
71956
71957 cp.handle = cpu_to_le16(conn->handle);
71958- memcpy(cp.ltk, ltk, sizeof(ltk));
71959+ memcpy(cp.ltk, ltk, sizeof(cp.ltk));
71960
71961 hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
71962 }
71963diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
71964index 17b5b1c..826d872 100644
71965--- a/net/bluetooth/l2cap_core.c
71966+++ b/net/bluetooth/l2cap_core.c
71967@@ -2176,8 +2176,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
71968 break;
71969
71970 case L2CAP_CONF_RFC:
71971- if (olen == sizeof(rfc))
71972- memcpy(&rfc, (void *)val, olen);
71973+ if (olen != sizeof(rfc))
71974+ break;
71975+
71976+ memcpy(&rfc, (void *)val, olen);
71977
71978 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
71979 rfc.mode != chan->mode)
71980@@ -2265,8 +2267,10 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
71981
71982 switch (type) {
71983 case L2CAP_CONF_RFC:
71984- if (olen == sizeof(rfc))
71985- memcpy(&rfc, (void *)val, olen);
71986+ if (olen != sizeof(rfc))
71987+ break;
71988+
71989+ memcpy(&rfc, (void *)val, olen);
71990 goto done;
71991 }
71992 }
71993diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
71994index a5f4e57..910ee6d 100644
71995--- a/net/bridge/br_multicast.c
71996+++ b/net/bridge/br_multicast.c
71997@@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
71998 nexthdr = ip6h->nexthdr;
71999 offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
72000
72001- if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
72002+ if (nexthdr != IPPROTO_ICMPV6)
72003 return 0;
72004
72005 /* Okay, we found ICMPv6 header */
72006diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
72007index 5864cc4..121f3a3 100644
72008--- a/net/bridge/netfilter/ebtables.c
72009+++ b/net/bridge/netfilter/ebtables.c
72010@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
72011 tmp.valid_hooks = t->table->valid_hooks;
72012 }
72013 mutex_unlock(&ebt_mutex);
72014- if (copy_to_user(user, &tmp, *len) != 0){
72015+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
72016 BUGPRINT("c2u Didn't work\n");
72017 ret = -EFAULT;
72018 break;
72019diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
72020index a986280..13444a1 100644
72021--- a/net/caif/caif_socket.c
72022+++ b/net/caif/caif_socket.c
72023@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
72024 #ifdef CONFIG_DEBUG_FS
72025 struct debug_fs_counter {
72026 atomic_t caif_nr_socks;
72027- atomic_t caif_sock_create;
72028- atomic_t num_connect_req;
72029- atomic_t num_connect_resp;
72030- atomic_t num_connect_fail_resp;
72031- atomic_t num_disconnect;
72032- atomic_t num_remote_shutdown_ind;
72033- atomic_t num_tx_flow_off_ind;
72034- atomic_t num_tx_flow_on_ind;
72035- atomic_t num_rx_flow_off;
72036- atomic_t num_rx_flow_on;
72037+ atomic_unchecked_t caif_sock_create;
72038+ atomic_unchecked_t num_connect_req;
72039+ atomic_unchecked_t num_connect_resp;
72040+ atomic_unchecked_t num_connect_fail_resp;
72041+ atomic_unchecked_t num_disconnect;
72042+ atomic_unchecked_t num_remote_shutdown_ind;
72043+ atomic_unchecked_t num_tx_flow_off_ind;
72044+ atomic_unchecked_t num_tx_flow_on_ind;
72045+ atomic_unchecked_t num_rx_flow_off;
72046+ atomic_unchecked_t num_rx_flow_on;
72047 };
72048 static struct debug_fs_counter cnt;
72049 #define dbfs_atomic_inc(v) atomic_inc_return(v)
72050+#define dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
72051 #define dbfs_atomic_dec(v) atomic_dec_return(v)
72052 #else
72053 #define dbfs_atomic_inc(v) 0
72054@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72055 atomic_read(&cf_sk->sk.sk_rmem_alloc),
72056 sk_rcvbuf_lowwater(cf_sk));
72057 set_rx_flow_off(cf_sk);
72058- dbfs_atomic_inc(&cnt.num_rx_flow_off);
72059+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
72060 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
72061 }
72062
72063@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72064 set_rx_flow_off(cf_sk);
72065 if (net_ratelimit())
72066 pr_debug("sending flow OFF due to rmem_schedule\n");
72067- dbfs_atomic_inc(&cnt.num_rx_flow_off);
72068+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
72069 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
72070 }
72071 skb->dev = NULL;
72072@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer *layr,
72073 switch (flow) {
72074 case CAIF_CTRLCMD_FLOW_ON_IND:
72075 /* OK from modem to start sending again */
72076- dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
72077+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_on_ind);
72078 set_tx_flow_on(cf_sk);
72079 cf_sk->sk.sk_state_change(&cf_sk->sk);
72080 break;
72081
72082 case CAIF_CTRLCMD_FLOW_OFF_IND:
72083 /* Modem asks us to shut up */
72084- dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
72085+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_off_ind);
72086 set_tx_flow_off(cf_sk);
72087 cf_sk->sk.sk_state_change(&cf_sk->sk);
72088 break;
72089@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
72090 /* We're now connected */
72091 caif_client_register_refcnt(&cf_sk->layer,
72092 cfsk_hold, cfsk_put);
72093- dbfs_atomic_inc(&cnt.num_connect_resp);
72094+ dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
72095 cf_sk->sk.sk_state = CAIF_CONNECTED;
72096 set_tx_flow_on(cf_sk);
72097 cf_sk->sk.sk_state_change(&cf_sk->sk);
72098@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
72099
72100 case CAIF_CTRLCMD_INIT_FAIL_RSP:
72101 /* Connect request failed */
72102- dbfs_atomic_inc(&cnt.num_connect_fail_resp);
72103+ dbfs_atomic_inc_unchecked(&cnt.num_connect_fail_resp);
72104 cf_sk->sk.sk_err = ECONNREFUSED;
72105 cf_sk->sk.sk_state = CAIF_DISCONNECTED;
72106 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
72107@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
72108
72109 case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
72110 /* Modem has closed this connection, or device is down. */
72111- dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
72112+ dbfs_atomic_inc_unchecked(&cnt.num_remote_shutdown_ind);
72113 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
72114 cf_sk->sk.sk_err = ECONNRESET;
72115 set_rx_flow_on(cf_sk);
72116@@ -297,7 +298,7 @@ static void caif_check_flow_release(struct sock *sk)
72117 return;
72118
72119 if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
72120- dbfs_atomic_inc(&cnt.num_rx_flow_on);
72121+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_on);
72122 set_rx_flow_on(cf_sk);
72123 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
72124 }
72125@@ -854,7 +855,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
72126 /*ifindex = id of the interface.*/
72127 cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
72128
72129- dbfs_atomic_inc(&cnt.num_connect_req);
72130+ dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
72131 cf_sk->layer.receive = caif_sktrecv_cb;
72132
72133 err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
72134@@ -943,7 +944,7 @@ static int caif_release(struct socket *sock)
72135 spin_unlock_bh(&sk->sk_receive_queue.lock);
72136 sock->sk = NULL;
72137
72138- dbfs_atomic_inc(&cnt.num_disconnect);
72139+ dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
72140
72141 WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
72142 if (cf_sk->debugfs_socket_dir != NULL)
72143@@ -1122,7 +1123,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
72144 cf_sk->conn_req.protocol = protocol;
72145 /* Increase the number of sockets created. */
72146 dbfs_atomic_inc(&cnt.caif_nr_socks);
72147- num = dbfs_atomic_inc(&cnt.caif_sock_create);
72148+ num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
72149 #ifdef CONFIG_DEBUG_FS
72150 if (!IS_ERR(debugfsdir)) {
72151
72152diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
72153index 5cf5222..6f704ad 100644
72154--- a/net/caif/cfctrl.c
72155+++ b/net/caif/cfctrl.c
72156@@ -9,6 +9,7 @@
72157 #include <linux/stddef.h>
72158 #include <linux/spinlock.h>
72159 #include <linux/slab.h>
72160+#include <linux/sched.h>
72161 #include <net/caif/caif_layer.h>
72162 #include <net/caif/cfpkt.h>
72163 #include <net/caif/cfctrl.h>
72164@@ -42,8 +43,8 @@ struct cflayer *cfctrl_create(void)
72165 memset(&dev_info, 0, sizeof(dev_info));
72166 dev_info.id = 0xff;
72167 cfsrvl_init(&this->serv, 0, &dev_info, false);
72168- atomic_set(&this->req_seq_no, 1);
72169- atomic_set(&this->rsp_seq_no, 1);
72170+ atomic_set_unchecked(&this->req_seq_no, 1);
72171+ atomic_set_unchecked(&this->rsp_seq_no, 1);
72172 this->serv.layer.receive = cfctrl_recv;
72173 sprintf(this->serv.layer.name, "ctrl");
72174 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
72175@@ -129,8 +130,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
72176 struct cfctrl_request_info *req)
72177 {
72178 spin_lock_bh(&ctrl->info_list_lock);
72179- atomic_inc(&ctrl->req_seq_no);
72180- req->sequence_no = atomic_read(&ctrl->req_seq_no);
72181+ atomic_inc_unchecked(&ctrl->req_seq_no);
72182+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
72183 list_add_tail(&req->list, &ctrl->list);
72184 spin_unlock_bh(&ctrl->info_list_lock);
72185 }
72186@@ -148,7 +149,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
72187 if (p != first)
72188 pr_warn("Requests are not received in order\n");
72189
72190- atomic_set(&ctrl->rsp_seq_no,
72191+ atomic_set_unchecked(&ctrl->rsp_seq_no,
72192 p->sequence_no);
72193 list_del(&p->list);
72194 goto out;
72195diff --git a/net/can/gw.c b/net/can/gw.c
72196index 3d79b12..8de85fa 100644
72197--- a/net/can/gw.c
72198+++ b/net/can/gw.c
72199@@ -96,7 +96,7 @@ struct cf_mod {
72200 struct {
72201 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
72202 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
72203- } csumfunc;
72204+ } __no_const csumfunc;
72205 };
72206
72207
72208diff --git a/net/compat.c b/net/compat.c
72209index 6def90e..c6992fa 100644
72210--- a/net/compat.c
72211+++ b/net/compat.c
72212@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
72213 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
72214 __get_user(kmsg->msg_flags, &umsg->msg_flags))
72215 return -EFAULT;
72216- kmsg->msg_name = compat_ptr(tmp1);
72217- kmsg->msg_iov = compat_ptr(tmp2);
72218- kmsg->msg_control = compat_ptr(tmp3);
72219+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
72220+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
72221+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
72222 return 0;
72223 }
72224
72225@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
72226
72227 if (kern_msg->msg_namelen) {
72228 if (mode == VERIFY_READ) {
72229- int err = move_addr_to_kernel(kern_msg->msg_name,
72230+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
72231 kern_msg->msg_namelen,
72232 kern_address);
72233 if (err < 0)
72234@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
72235 kern_msg->msg_name = NULL;
72236
72237 tot_len = iov_from_user_compat_to_kern(kern_iov,
72238- (struct compat_iovec __user *)kern_msg->msg_iov,
72239+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
72240 kern_msg->msg_iovlen);
72241 if (tot_len >= 0)
72242 kern_msg->msg_iov = kern_iov;
72243@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
72244
72245 #define CMSG_COMPAT_FIRSTHDR(msg) \
72246 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
72247- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
72248+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
72249 (struct compat_cmsghdr __user *)NULL)
72250
72251 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
72252 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
72253 (ucmlen) <= (unsigned long) \
72254 ((mhdr)->msg_controllen - \
72255- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
72256+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
72257
72258 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
72259 struct compat_cmsghdr __user *cmsg, int cmsg_len)
72260 {
72261 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
72262- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
72263+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
72264 msg->msg_controllen)
72265 return NULL;
72266 return (struct compat_cmsghdr __user *)ptr;
72267@@ -221,7 +221,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
72268 {
72269 struct compat_timeval ctv;
72270 struct compat_timespec cts[3];
72271- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
72272+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
72273 struct compat_cmsghdr cmhdr;
72274 int cmlen;
72275
72276@@ -273,7 +273,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
72277
72278 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
72279 {
72280- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
72281+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
72282 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
72283 int fdnum = scm->fp->count;
72284 struct file **fp = scm->fp->fp;
72285@@ -370,7 +370,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
72286 return -EFAULT;
72287 old_fs = get_fs();
72288 set_fs(KERNEL_DS);
72289- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
72290+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
72291 set_fs(old_fs);
72292
72293 return err;
72294@@ -431,7 +431,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
72295 len = sizeof(ktime);
72296 old_fs = get_fs();
72297 set_fs(KERNEL_DS);
72298- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
72299+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
72300 set_fs(old_fs);
72301
72302 if (!err) {
72303@@ -566,7 +566,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
72304 case MCAST_JOIN_GROUP:
72305 case MCAST_LEAVE_GROUP:
72306 {
72307- struct compat_group_req __user *gr32 = (void *)optval;
72308+ struct compat_group_req __user *gr32 = (void __user *)optval;
72309 struct group_req __user *kgr =
72310 compat_alloc_user_space(sizeof(struct group_req));
72311 u32 interface;
72312@@ -587,7 +587,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
72313 case MCAST_BLOCK_SOURCE:
72314 case MCAST_UNBLOCK_SOURCE:
72315 {
72316- struct compat_group_source_req __user *gsr32 = (void *)optval;
72317+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
72318 struct group_source_req __user *kgsr = compat_alloc_user_space(
72319 sizeof(struct group_source_req));
72320 u32 interface;
72321@@ -608,7 +608,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
72322 }
72323 case MCAST_MSFILTER:
72324 {
72325- struct compat_group_filter __user *gf32 = (void *)optval;
72326+ struct compat_group_filter __user *gf32 = (void __user *)optval;
72327 struct group_filter __user *kgf;
72328 u32 interface, fmode, numsrc;
72329
72330@@ -646,7 +646,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
72331 char __user *optval, int __user *optlen,
72332 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
72333 {
72334- struct compat_group_filter __user *gf32 = (void *)optval;
72335+ struct compat_group_filter __user *gf32 = (void __user *)optval;
72336 struct group_filter __user *kgf;
72337 int __user *koptlen;
72338 u32 interface, fmode, numsrc;
72339diff --git a/net/core/datagram.c b/net/core/datagram.c
72340index 68bbf9f..5ef0d12 100644
72341--- a/net/core/datagram.c
72342+++ b/net/core/datagram.c
72343@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
72344 }
72345
72346 kfree_skb(skb);
72347- atomic_inc(&sk->sk_drops);
72348+ atomic_inc_unchecked(&sk->sk_drops);
72349 sk_mem_reclaim_partial(sk);
72350
72351 return err;
72352diff --git a/net/core/dev.c b/net/core/dev.c
72353index 5a13edf..a6f2bd2 100644
72354--- a/net/core/dev.c
72355+++ b/net/core/dev.c
72356@@ -1139,10 +1139,14 @@ void dev_load(struct net *net, const char *name)
72357 if (no_module && capable(CAP_NET_ADMIN))
72358 no_module = request_module("netdev-%s", name);
72359 if (no_module && capable(CAP_SYS_MODULE)) {
72360+#ifdef CONFIG_GRKERNSEC_MODHARDEN
72361+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
72362+#else
72363 if (!request_module("%s", name))
72364 pr_err("Loading kernel module for a network device "
72365 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
72366 "instead\n", name);
72367+#endif
72368 }
72369 }
72370 EXPORT_SYMBOL(dev_load);
72371@@ -1573,7 +1577,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
72372 {
72373 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
72374 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
72375- atomic_long_inc(&dev->rx_dropped);
72376+ atomic_long_inc_unchecked(&dev->rx_dropped);
72377 kfree_skb(skb);
72378 return NET_RX_DROP;
72379 }
72380@@ -1583,7 +1587,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
72381 nf_reset(skb);
72382
72383 if (unlikely(!is_skb_forwardable(dev, skb))) {
72384- atomic_long_inc(&dev->rx_dropped);
72385+ atomic_long_inc_unchecked(&dev->rx_dropped);
72386 kfree_skb(skb);
72387 return NET_RX_DROP;
72388 }
72389@@ -2036,7 +2040,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
72390
72391 struct dev_gso_cb {
72392 void (*destructor)(struct sk_buff *skb);
72393-};
72394+} __no_const;
72395
72396 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
72397
72398@@ -2970,7 +2974,7 @@ enqueue:
72399
72400 local_irq_restore(flags);
72401
72402- atomic_long_inc(&skb->dev->rx_dropped);
72403+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
72404 kfree_skb(skb);
72405 return NET_RX_DROP;
72406 }
72407@@ -3044,7 +3048,7 @@ int netif_rx_ni(struct sk_buff *skb)
72408 }
72409 EXPORT_SYMBOL(netif_rx_ni);
72410
72411-static void net_tx_action(struct softirq_action *h)
72412+static void net_tx_action(void)
72413 {
72414 struct softnet_data *sd = &__get_cpu_var(softnet_data);
72415
72416@@ -3333,7 +3337,7 @@ ncls:
72417 if (pt_prev) {
72418 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
72419 } else {
72420- atomic_long_inc(&skb->dev->rx_dropped);
72421+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
72422 kfree_skb(skb);
72423 /* Jamal, now you will not able to escape explaining
72424 * me how you were going to use this. :-)
72425@@ -3891,7 +3895,7 @@ void netif_napi_del(struct napi_struct *napi)
72426 }
72427 EXPORT_SYMBOL(netif_napi_del);
72428
72429-static void net_rx_action(struct softirq_action *h)
72430+static void net_rx_action(void)
72431 {
72432 struct softnet_data *sd = &__get_cpu_var(softnet_data);
72433 unsigned long time_limit = jiffies + 2;
72434@@ -5949,7 +5953,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
72435 } else {
72436 netdev_stats_to_stats64(storage, &dev->stats);
72437 }
72438- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
72439+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
72440 return storage;
72441 }
72442 EXPORT_SYMBOL(dev_get_stats);
72443diff --git a/net/core/flow.c b/net/core/flow.c
72444index e318c7e..168b1d0 100644
72445--- a/net/core/flow.c
72446+++ b/net/core/flow.c
72447@@ -61,7 +61,7 @@ struct flow_cache {
72448 struct timer_list rnd_timer;
72449 };
72450
72451-atomic_t flow_cache_genid = ATOMIC_INIT(0);
72452+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
72453 EXPORT_SYMBOL(flow_cache_genid);
72454 static struct flow_cache flow_cache_global;
72455 static struct kmem_cache *flow_cachep __read_mostly;
72456@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
72457
72458 static int flow_entry_valid(struct flow_cache_entry *fle)
72459 {
72460- if (atomic_read(&flow_cache_genid) != fle->genid)
72461+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
72462 return 0;
72463 if (fle->object && !fle->object->ops->check(fle->object))
72464 return 0;
72465@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
72466 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
72467 fcp->hash_count++;
72468 }
72469- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
72470+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
72471 flo = fle->object;
72472 if (!flo)
72473 goto ret_object;
72474@@ -280,7 +280,7 @@ nocache:
72475 }
72476 flo = resolver(net, key, family, dir, flo, ctx);
72477 if (fle) {
72478- fle->genid = atomic_read(&flow_cache_genid);
72479+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
72480 if (!IS_ERR(flo))
72481 fle->object = flo;
72482 else
72483diff --git a/net/core/iovec.c b/net/core/iovec.c
72484index c40f27e..7f49254 100644
72485--- a/net/core/iovec.c
72486+++ b/net/core/iovec.c
72487@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
72488 if (m->msg_namelen) {
72489 if (mode == VERIFY_READ) {
72490 void __user *namep;
72491- namep = (void __user __force *) m->msg_name;
72492+ namep = (void __force_user *) m->msg_name;
72493 err = move_addr_to_kernel(namep, m->msg_namelen,
72494 address);
72495 if (err < 0)
72496@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
72497 }
72498
72499 size = m->msg_iovlen * sizeof(struct iovec);
72500- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
72501+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
72502 return -EFAULT;
72503
72504 m->msg_iov = iov;
72505diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
72506index 9083e82..1673203 100644
72507--- a/net/core/rtnetlink.c
72508+++ b/net/core/rtnetlink.c
72509@@ -57,7 +57,7 @@ struct rtnl_link {
72510 rtnl_doit_func doit;
72511 rtnl_dumpit_func dumpit;
72512 rtnl_calcit_func calcit;
72513-};
72514+} __no_const;
72515
72516 static DEFINE_MUTEX(rtnl_mutex);
72517 static u16 min_ifinfo_dump_size;
72518diff --git a/net/core/scm.c b/net/core/scm.c
72519index ff52ad0..aff1c0f 100644
72520--- a/net/core/scm.c
72521+++ b/net/core/scm.c
72522@@ -220,7 +220,7 @@ EXPORT_SYMBOL(__scm_send);
72523 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
72524 {
72525 struct cmsghdr __user *cm
72526- = (__force struct cmsghdr __user *)msg->msg_control;
72527+ = (struct cmsghdr __force_user *)msg->msg_control;
72528 struct cmsghdr cmhdr;
72529 int cmlen = CMSG_LEN(len);
72530 int err;
72531@@ -243,7 +243,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
72532 err = -EFAULT;
72533 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
72534 goto out;
72535- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
72536+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
72537 goto out;
72538 cmlen = CMSG_SPACE(len);
72539 if (msg->msg_controllen < cmlen)
72540@@ -259,7 +259,7 @@ EXPORT_SYMBOL(put_cmsg);
72541 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
72542 {
72543 struct cmsghdr __user *cm
72544- = (__force struct cmsghdr __user*)msg->msg_control;
72545+ = (struct cmsghdr __force_user *)msg->msg_control;
72546
72547 int fdmax = 0;
72548 int fdnum = scm->fp->count;
72549@@ -279,7 +279,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
72550 if (fdnum < fdmax)
72551 fdmax = fdnum;
72552
72553- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
72554+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
72555 i++, cmfptr++)
72556 {
72557 int new_fd;
72558diff --git a/net/core/sock.c b/net/core/sock.c
72559index b23f174..b9a0d26 100644
72560--- a/net/core/sock.c
72561+++ b/net/core/sock.c
72562@@ -289,7 +289,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72563 struct sk_buff_head *list = &sk->sk_receive_queue;
72564
72565 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
72566- atomic_inc(&sk->sk_drops);
72567+ atomic_inc_unchecked(&sk->sk_drops);
72568 trace_sock_rcvqueue_full(sk, skb);
72569 return -ENOMEM;
72570 }
72571@@ -299,7 +299,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72572 return err;
72573
72574 if (!sk_rmem_schedule(sk, skb->truesize)) {
72575- atomic_inc(&sk->sk_drops);
72576+ atomic_inc_unchecked(&sk->sk_drops);
72577 return -ENOBUFS;
72578 }
72579
72580@@ -319,7 +319,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72581 skb_dst_force(skb);
72582
72583 spin_lock_irqsave(&list->lock, flags);
72584- skb->dropcount = atomic_read(&sk->sk_drops);
72585+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
72586 __skb_queue_tail(list, skb);
72587 spin_unlock_irqrestore(&list->lock, flags);
72588
72589@@ -339,7 +339,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
72590 skb->dev = NULL;
72591
72592 if (sk_rcvqueues_full(sk, skb)) {
72593- atomic_inc(&sk->sk_drops);
72594+ atomic_inc_unchecked(&sk->sk_drops);
72595 goto discard_and_relse;
72596 }
72597 if (nested)
72598@@ -357,7 +357,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
72599 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
72600 } else if (sk_add_backlog(sk, skb)) {
72601 bh_unlock_sock(sk);
72602- atomic_inc(&sk->sk_drops);
72603+ atomic_inc_unchecked(&sk->sk_drops);
72604 goto discard_and_relse;
72605 }
72606
72607@@ -917,7 +917,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
72608 if (len > sizeof(peercred))
72609 len = sizeof(peercred);
72610 cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
72611- if (copy_to_user(optval, &peercred, len))
72612+ if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
72613 return -EFAULT;
72614 goto lenout;
72615 }
72616@@ -930,7 +930,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
72617 return -ENOTCONN;
72618 if (lv < len)
72619 return -EINVAL;
72620- if (copy_to_user(optval, address, len))
72621+ if (len > sizeof(address) || copy_to_user(optval, address, len))
72622 return -EFAULT;
72623 goto lenout;
72624 }
72625@@ -963,7 +963,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
72626
72627 if (len > lv)
72628 len = lv;
72629- if (copy_to_user(optval, &v, len))
72630+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
72631 return -EFAULT;
72632 lenout:
72633 if (put_user(len, optlen))
72634@@ -2020,7 +2020,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
72635 */
72636 smp_wmb();
72637 atomic_set(&sk->sk_refcnt, 1);
72638- atomic_set(&sk->sk_drops, 0);
72639+ atomic_set_unchecked(&sk->sk_drops, 0);
72640 }
72641 EXPORT_SYMBOL(sock_init_data);
72642
72643diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
72644index 02e75d1..9a57a7c 100644
72645--- a/net/decnet/sysctl_net_decnet.c
72646+++ b/net/decnet/sysctl_net_decnet.c
72647@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
72648
72649 if (len > *lenp) len = *lenp;
72650
72651- if (copy_to_user(buffer, addr, len))
72652+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
72653 return -EFAULT;
72654
72655 *lenp = len;
72656@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
72657
72658 if (len > *lenp) len = *lenp;
72659
72660- if (copy_to_user(buffer, devname, len))
72661+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
72662 return -EFAULT;
72663
72664 *lenp = len;
72665diff --git a/net/econet/Kconfig b/net/econet/Kconfig
72666index 39a2d29..f39c0fe 100644
72667--- a/net/econet/Kconfig
72668+++ b/net/econet/Kconfig
72669@@ -4,7 +4,7 @@
72670
72671 config ECONET
72672 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
72673- depends on EXPERIMENTAL && INET
72674+ depends on EXPERIMENTAL && INET && BROKEN
72675 ---help---
72676 Econet is a fairly old and slow networking protocol mainly used by
72677 Acorn computers to access file and print servers. It uses native
72678diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
72679index 92fc5f6..b790d91 100644
72680--- a/net/ipv4/fib_frontend.c
72681+++ b/net/ipv4/fib_frontend.c
72682@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
72683 #ifdef CONFIG_IP_ROUTE_MULTIPATH
72684 fib_sync_up(dev);
72685 #endif
72686- atomic_inc(&net->ipv4.dev_addr_genid);
72687+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
72688 rt_cache_flush(dev_net(dev), -1);
72689 break;
72690 case NETDEV_DOWN:
72691 fib_del_ifaddr(ifa, NULL);
72692- atomic_inc(&net->ipv4.dev_addr_genid);
72693+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
72694 if (ifa->ifa_dev->ifa_list == NULL) {
72695 /* Last address was deleted from this interface.
72696 * Disable IP.
72697@@ -1011,7 +1011,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
72698 #ifdef CONFIG_IP_ROUTE_MULTIPATH
72699 fib_sync_up(dev);
72700 #endif
72701- atomic_inc(&net->ipv4.dev_addr_genid);
72702+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
72703 rt_cache_flush(dev_net(dev), -1);
72704 break;
72705 case NETDEV_DOWN:
72706diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
72707index 80106d8..232e898 100644
72708--- a/net/ipv4/fib_semantics.c
72709+++ b/net/ipv4/fib_semantics.c
72710@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
72711 nh->nh_saddr = inet_select_addr(nh->nh_dev,
72712 nh->nh_gw,
72713 nh->nh_parent->fib_scope);
72714- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
72715+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
72716
72717 return nh->nh_saddr;
72718 }
72719diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
72720index ccee270..db23c3c 100644
72721--- a/net/ipv4/inet_diag.c
72722+++ b/net/ipv4/inet_diag.c
72723@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct sock *sk,
72724 r->idiag_retrans = 0;
72725
72726 r->id.idiag_if = sk->sk_bound_dev_if;
72727+
72728+#ifdef CONFIG_GRKERNSEC_HIDESYM
72729+ r->id.idiag_cookie[0] = 0;
72730+ r->id.idiag_cookie[1] = 0;
72731+#else
72732 r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
72733 r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
72734+#endif
72735
72736 r->id.idiag_sport = inet->inet_sport;
72737 r->id.idiag_dport = inet->inet_dport;
72738@@ -210,8 +216,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
72739 r->idiag_family = tw->tw_family;
72740 r->idiag_retrans = 0;
72741 r->id.idiag_if = tw->tw_bound_dev_if;
72742+
72743+#ifdef CONFIG_GRKERNSEC_HIDESYM
72744+ r->id.idiag_cookie[0] = 0;
72745+ r->id.idiag_cookie[1] = 0;
72746+#else
72747 r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
72748 r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
72749+#endif
72750+
72751 r->id.idiag_sport = tw->tw_sport;
72752 r->id.idiag_dport = tw->tw_dport;
72753 r->id.idiag_src[0] = tw->tw_rcv_saddr;
72754@@ -294,12 +307,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
72755 if (sk == NULL)
72756 goto unlock;
72757
72758+#ifndef CONFIG_GRKERNSEC_HIDESYM
72759 err = -ESTALE;
72760 if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
72761 req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
72762 ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
72763 (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
72764 goto out;
72765+#endif
72766
72767 err = -ENOMEM;
72768 rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
72769@@ -589,8 +604,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
72770 r->idiag_retrans = req->retrans;
72771
72772 r->id.idiag_if = sk->sk_bound_dev_if;
72773+
72774+#ifdef CONFIG_GRKERNSEC_HIDESYM
72775+ r->id.idiag_cookie[0] = 0;
72776+ r->id.idiag_cookie[1] = 0;
72777+#else
72778 r->id.idiag_cookie[0] = (u32)(unsigned long)req;
72779 r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
72780+#endif
72781
72782 tmo = req->expires - jiffies;
72783 if (tmo < 0)
72784diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
72785index 984ec65..97ac518 100644
72786--- a/net/ipv4/inet_hashtables.c
72787+++ b/net/ipv4/inet_hashtables.c
72788@@ -18,12 +18,15 @@
72789 #include <linux/sched.h>
72790 #include <linux/slab.h>
72791 #include <linux/wait.h>
72792+#include <linux/security.h>
72793
72794 #include <net/inet_connection_sock.h>
72795 #include <net/inet_hashtables.h>
72796 #include <net/secure_seq.h>
72797 #include <net/ip.h>
72798
72799+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
72800+
72801 /*
72802 * Allocate and initialize a new local port bind bucket.
72803 * The bindhash mutex for snum's hash chain must be held here.
72804@@ -530,6 +533,8 @@ ok:
72805 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
72806 spin_unlock(&head->lock);
72807
72808+ gr_update_task_in_ip_table(current, inet_sk(sk));
72809+
72810 if (tw) {
72811 inet_twsk_deschedule(tw, death_row);
72812 while (twrefcnt) {
72813diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
72814index 86f13c67..59a35b5 100644
72815--- a/net/ipv4/inetpeer.c
72816+++ b/net/ipv4/inetpeer.c
72817@@ -436,8 +436,8 @@ relookup:
72818 if (p) {
72819 p->daddr = *daddr;
72820 atomic_set(&p->refcnt, 1);
72821- atomic_set(&p->rid, 0);
72822- atomic_set(&p->ip_id_count,
72823+ atomic_set_unchecked(&p->rid, 0);
72824+ atomic_set_unchecked(&p->ip_id_count,
72825 (daddr->family == AF_INET) ?
72826 secure_ip_id(daddr->addr.a4) :
72827 secure_ipv6_id(daddr->addr.a6));
72828diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
72829index fdaabf2..0ec3205 100644
72830--- a/net/ipv4/ip_fragment.c
72831+++ b/net/ipv4/ip_fragment.c
72832@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
72833 return 0;
72834
72835 start = qp->rid;
72836- end = atomic_inc_return(&peer->rid);
72837+ end = atomic_inc_return_unchecked(&peer->rid);
72838 qp->rid = end;
72839
72840 rc = qp->q.fragments && (end - start) > max;
72841diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
72842index 09ff51b..d3968eb 100644
72843--- a/net/ipv4/ip_sockglue.c
72844+++ b/net/ipv4/ip_sockglue.c
72845@@ -1111,7 +1111,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
72846 len = min_t(unsigned int, len, opt->optlen);
72847 if (put_user(len, optlen))
72848 return -EFAULT;
72849- if (copy_to_user(optval, opt->__data, len))
72850+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
72851+ copy_to_user(optval, opt->__data, len))
72852 return -EFAULT;
72853 return 0;
72854 }
72855@@ -1239,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
72856 if (sk->sk_type != SOCK_STREAM)
72857 return -ENOPROTOOPT;
72858
72859- msg.msg_control = optval;
72860+ msg.msg_control = (void __force_kernel *)optval;
72861 msg.msg_controllen = len;
72862 msg.msg_flags = flags;
72863
72864diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
72865index 99ec116..c5628fe 100644
72866--- a/net/ipv4/ipconfig.c
72867+++ b/net/ipv4/ipconfig.c
72868@@ -318,7 +318,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
72869
72870 mm_segment_t oldfs = get_fs();
72871 set_fs(get_ds());
72872- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
72873+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
72874 set_fs(oldfs);
72875 return res;
72876 }
72877@@ -329,7 +329,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
72878
72879 mm_segment_t oldfs = get_fs();
72880 set_fs(get_ds());
72881- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
72882+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
72883 set_fs(oldfs);
72884 return res;
72885 }
72886@@ -340,7 +340,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
72887
72888 mm_segment_t oldfs = get_fs();
72889 set_fs(get_ds());
72890- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
72891+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
72892 set_fs(oldfs);
72893 return res;
72894 }
72895diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
72896index 2133c30..5c4b40b 100644
72897--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
72898+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
72899@@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(struct asn1_ctx *ctx,
72900
72901 *len = 0;
72902
72903- *octets = kmalloc(eoc - ctx->pointer, GFP_ATOMIC);
72904+ *octets = kmalloc((eoc - ctx->pointer), GFP_ATOMIC);
72905 if (*octets == NULL)
72906 return 0;
72907
72908diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
72909index 43d4c3b..1914409 100644
72910--- a/net/ipv4/ping.c
72911+++ b/net/ipv4/ping.c
72912@@ -836,7 +836,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
72913 sk_rmem_alloc_get(sp),
72914 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
72915 atomic_read(&sp->sk_refcnt), sp,
72916- atomic_read(&sp->sk_drops), len);
72917+ atomic_read_unchecked(&sp->sk_drops), len);
72918 }
72919
72920 static int ping_seq_show(struct seq_file *seq, void *v)
72921diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
72922index 007e2eb..85a18a0 100644
72923--- a/net/ipv4/raw.c
72924+++ b/net/ipv4/raw.c
72925@@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
72926 int raw_rcv(struct sock *sk, struct sk_buff *skb)
72927 {
72928 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
72929- atomic_inc(&sk->sk_drops);
72930+ atomic_inc_unchecked(&sk->sk_drops);
72931 kfree_skb(skb);
72932 return NET_RX_DROP;
72933 }
72934@@ -738,16 +738,20 @@ static int raw_init(struct sock *sk)
72935
72936 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
72937 {
72938+ struct icmp_filter filter;
72939+
72940 if (optlen > sizeof(struct icmp_filter))
72941 optlen = sizeof(struct icmp_filter);
72942- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
72943+ if (copy_from_user(&filter, optval, optlen))
72944 return -EFAULT;
72945+ raw_sk(sk)->filter = filter;
72946 return 0;
72947 }
72948
72949 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
72950 {
72951 int len, ret = -EFAULT;
72952+ struct icmp_filter filter;
72953
72954 if (get_user(len, optlen))
72955 goto out;
72956@@ -757,8 +761,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
72957 if (len > sizeof(struct icmp_filter))
72958 len = sizeof(struct icmp_filter);
72959 ret = -EFAULT;
72960- if (put_user(len, optlen) ||
72961- copy_to_user(optval, &raw_sk(sk)->filter, len))
72962+ filter = raw_sk(sk)->filter;
72963+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
72964 goto out;
72965 ret = 0;
72966 out: return ret;
72967@@ -986,7 +990,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
72968 sk_wmem_alloc_get(sp),
72969 sk_rmem_alloc_get(sp),
72970 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
72971- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
72972+ atomic_read(&sp->sk_refcnt),
72973+#ifdef CONFIG_GRKERNSEC_HIDESYM
72974+ NULL,
72975+#else
72976+ sp,
72977+#endif
72978+ atomic_read_unchecked(&sp->sk_drops));
72979 }
72980
72981 static int raw_seq_show(struct seq_file *seq, void *v)
72982diff --git a/net/ipv4/route.c b/net/ipv4/route.c
72983index 94cdbc5..0cb0063 100644
72984--- a/net/ipv4/route.c
72985+++ b/net/ipv4/route.c
72986@@ -313,7 +313,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
72987
72988 static inline int rt_genid(struct net *net)
72989 {
72990- return atomic_read(&net->ipv4.rt_genid);
72991+ return atomic_read_unchecked(&net->ipv4.rt_genid);
72992 }
72993
72994 #ifdef CONFIG_PROC_FS
72995@@ -937,7 +937,7 @@ static void rt_cache_invalidate(struct net *net)
72996 unsigned char shuffle;
72997
72998 get_random_bytes(&shuffle, sizeof(shuffle));
72999- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
73000+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
73001 redirect_genid++;
73002 }
73003
73004@@ -3022,7 +3022,7 @@ static int rt_fill_info(struct net *net,
73005 error = rt->dst.error;
73006 if (peer) {
73007 inet_peer_refcheck(rt->peer);
73008- id = atomic_read(&peer->ip_id_count) & 0xffff;
73009+ id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
73010 if (peer->tcp_ts_stamp) {
73011 ts = peer->tcp_ts;
73012 tsage = get_seconds() - peer->tcp_ts_stamp;
73013diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
73014index c89e354..8bd55c8 100644
73015--- a/net/ipv4/tcp_ipv4.c
73016+++ b/net/ipv4/tcp_ipv4.c
73017@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
73018 int sysctl_tcp_low_latency __read_mostly;
73019 EXPORT_SYMBOL(sysctl_tcp_low_latency);
73020
73021+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73022+extern int grsec_enable_blackhole;
73023+#endif
73024
73025 #ifdef CONFIG_TCP_MD5SIG
73026 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
73027@@ -1627,6 +1630,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
73028 return 0;
73029
73030 reset:
73031+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73032+ if (!grsec_enable_blackhole)
73033+#endif
73034 tcp_v4_send_reset(rsk, skb);
73035 discard:
73036 kfree_skb(skb);
73037@@ -1689,12 +1695,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
73038 TCP_SKB_CB(skb)->sacked = 0;
73039
73040 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
73041- if (!sk)
73042+ if (!sk) {
73043+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73044+ ret = 1;
73045+#endif
73046 goto no_tcp_socket;
73047-
73048+ }
73049 process:
73050- if (sk->sk_state == TCP_TIME_WAIT)
73051+ if (sk->sk_state == TCP_TIME_WAIT) {
73052+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73053+ ret = 2;
73054+#endif
73055 goto do_time_wait;
73056+ }
73057
73058 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
73059 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
73060@@ -1744,6 +1757,10 @@ no_tcp_socket:
73061 bad_packet:
73062 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
73063 } else {
73064+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73065+ if (!grsec_enable_blackhole || (ret == 1 &&
73066+ (skb->dev->flags & IFF_LOOPBACK)))
73067+#endif
73068 tcp_v4_send_reset(NULL, skb);
73069 }
73070
73071@@ -2404,7 +2421,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
73072 0, /* non standard timer */
73073 0, /* open_requests have no inode */
73074 atomic_read(&sk->sk_refcnt),
73075+#ifdef CONFIG_GRKERNSEC_HIDESYM
73076+ NULL,
73077+#else
73078 req,
73079+#endif
73080 len);
73081 }
73082
73083@@ -2454,7 +2475,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
73084 sock_i_uid(sk),
73085 icsk->icsk_probes_out,
73086 sock_i_ino(sk),
73087- atomic_read(&sk->sk_refcnt), sk,
73088+ atomic_read(&sk->sk_refcnt),
73089+#ifdef CONFIG_GRKERNSEC_HIDESYM
73090+ NULL,
73091+#else
73092+ sk,
73093+#endif
73094 jiffies_to_clock_t(icsk->icsk_rto),
73095 jiffies_to_clock_t(icsk->icsk_ack.ato),
73096 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
73097@@ -2482,7 +2508,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
73098 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
73099 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
73100 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
73101- atomic_read(&tw->tw_refcnt), tw, len);
73102+ atomic_read(&tw->tw_refcnt),
73103+#ifdef CONFIG_GRKERNSEC_HIDESYM
73104+ NULL,
73105+#else
73106+ tw,
73107+#endif
73108+ len);
73109 }
73110
73111 #define TMPSZ 150
73112diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
73113index 66363b6..b0654a3 100644
73114--- a/net/ipv4/tcp_minisocks.c
73115+++ b/net/ipv4/tcp_minisocks.c
73116@@ -27,6 +27,10 @@
73117 #include <net/inet_common.h>
73118 #include <net/xfrm.h>
73119
73120+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73121+extern int grsec_enable_blackhole;
73122+#endif
73123+
73124 int sysctl_tcp_syncookies __read_mostly = 1;
73125 EXPORT_SYMBOL(sysctl_tcp_syncookies);
73126
73127@@ -751,6 +755,10 @@ listen_overflow:
73128
73129 embryonic_reset:
73130 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
73131+
73132+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73133+ if (!grsec_enable_blackhole)
73134+#endif
73135 if (!(flg & TCP_FLAG_RST))
73136 req->rsk_ops->send_reset(sk, skb);
73137
73138diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
73139index 85ee7eb..53277ab 100644
73140--- a/net/ipv4/tcp_probe.c
73141+++ b/net/ipv4/tcp_probe.c
73142@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
73143 if (cnt + width >= len)
73144 break;
73145
73146- if (copy_to_user(buf + cnt, tbuf, width))
73147+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
73148 return -EFAULT;
73149 cnt += width;
73150 }
73151diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
73152index 2e0f0af..e2948bf 100644
73153--- a/net/ipv4/tcp_timer.c
73154+++ b/net/ipv4/tcp_timer.c
73155@@ -22,6 +22,10 @@
73156 #include <linux/gfp.h>
73157 #include <net/tcp.h>
73158
73159+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73160+extern int grsec_lastack_retries;
73161+#endif
73162+
73163 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
73164 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
73165 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
73166@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk)
73167 }
73168 }
73169
73170+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73171+ if ((sk->sk_state == TCP_LAST_ACK) &&
73172+ (grsec_lastack_retries > 0) &&
73173+ (grsec_lastack_retries < retry_until))
73174+ retry_until = grsec_lastack_retries;
73175+#endif
73176+
73177 if (retransmits_timed_out(sk, retry_until,
73178 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
73179 /* Has it gone just too far? */
73180diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
73181index 5a65eea..bd913a1 100644
73182--- a/net/ipv4/udp.c
73183+++ b/net/ipv4/udp.c
73184@@ -86,6 +86,7 @@
73185 #include <linux/types.h>
73186 #include <linux/fcntl.h>
73187 #include <linux/module.h>
73188+#include <linux/security.h>
73189 #include <linux/socket.h>
73190 #include <linux/sockios.h>
73191 #include <linux/igmp.h>
73192@@ -108,6 +109,10 @@
73193 #include <trace/events/udp.h>
73194 #include "udp_impl.h"
73195
73196+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73197+extern int grsec_enable_blackhole;
73198+#endif
73199+
73200 struct udp_table udp_table __read_mostly;
73201 EXPORT_SYMBOL(udp_table);
73202
73203@@ -565,6 +570,9 @@ found:
73204 return s;
73205 }
73206
73207+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
73208+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
73209+
73210 /*
73211 * This routine is called by the ICMP module when it gets some
73212 * sort of error condition. If err < 0 then the socket should
73213@@ -856,9 +864,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
73214 dport = usin->sin_port;
73215 if (dport == 0)
73216 return -EINVAL;
73217+
73218+ err = gr_search_udp_sendmsg(sk, usin);
73219+ if (err)
73220+ return err;
73221 } else {
73222 if (sk->sk_state != TCP_ESTABLISHED)
73223 return -EDESTADDRREQ;
73224+
73225+ err = gr_search_udp_sendmsg(sk, NULL);
73226+ if (err)
73227+ return err;
73228+
73229 daddr = inet->inet_daddr;
73230 dport = inet->inet_dport;
73231 /* Open fast path for connected socket.
73232@@ -1099,7 +1116,7 @@ static unsigned int first_packet_length(struct sock *sk)
73233 udp_lib_checksum_complete(skb)) {
73234 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
73235 IS_UDPLITE(sk));
73236- atomic_inc(&sk->sk_drops);
73237+ atomic_inc_unchecked(&sk->sk_drops);
73238 __skb_unlink(skb, rcvq);
73239 __skb_queue_tail(&list_kill, skb);
73240 }
73241@@ -1185,6 +1202,10 @@ try_again:
73242 if (!skb)
73243 goto out;
73244
73245+ err = gr_search_udp_recvmsg(sk, skb);
73246+ if (err)
73247+ goto out_free;
73248+
73249 ulen = skb->len - sizeof(struct udphdr);
73250 copied = len;
73251 if (copied > ulen)
73252@@ -1487,7 +1508,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
73253
73254 drop:
73255 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
73256- atomic_inc(&sk->sk_drops);
73257+ atomic_inc_unchecked(&sk->sk_drops);
73258 kfree_skb(skb);
73259 return -1;
73260 }
73261@@ -1506,7 +1527,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
73262 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
73263
73264 if (!skb1) {
73265- atomic_inc(&sk->sk_drops);
73266+ atomic_inc_unchecked(&sk->sk_drops);
73267 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
73268 IS_UDPLITE(sk));
73269 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
73270@@ -1675,6 +1696,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
73271 goto csum_error;
73272
73273 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
73274+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73275+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
73276+#endif
73277 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
73278
73279 /*
73280@@ -2098,8 +2122,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
73281 sk_wmem_alloc_get(sp),
73282 sk_rmem_alloc_get(sp),
73283 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
73284- atomic_read(&sp->sk_refcnt), sp,
73285- atomic_read(&sp->sk_drops), len);
73286+ atomic_read(&sp->sk_refcnt),
73287+#ifdef CONFIG_GRKERNSEC_HIDESYM
73288+ NULL,
73289+#else
73290+ sp,
73291+#endif
73292+ atomic_read_unchecked(&sp->sk_drops), len);
73293 }
73294
73295 int udp4_seq_show(struct seq_file *seq, void *v)
73296diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
73297index 836c4ea..cbb74dc 100644
73298--- a/net/ipv6/addrconf.c
73299+++ b/net/ipv6/addrconf.c
73300@@ -2149,7 +2149,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
73301 p.iph.ihl = 5;
73302 p.iph.protocol = IPPROTO_IPV6;
73303 p.iph.ttl = 64;
73304- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
73305+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
73306
73307 if (ops->ndo_do_ioctl) {
73308 mm_segment_t oldfs = get_fs();
73309diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
73310index 1567fb1..29af910 100644
73311--- a/net/ipv6/inet6_connection_sock.c
73312+++ b/net/ipv6/inet6_connection_sock.c
73313@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
73314 #ifdef CONFIG_XFRM
73315 {
73316 struct rt6_info *rt = (struct rt6_info *)dst;
73317- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
73318+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
73319 }
73320 #endif
73321 }
73322@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
73323 #ifdef CONFIG_XFRM
73324 if (dst) {
73325 struct rt6_info *rt = (struct rt6_info *)dst;
73326- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
73327+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
73328 __sk_dst_reset(sk);
73329 dst = NULL;
73330 }
73331diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
73332index 26cb08c..8af9877 100644
73333--- a/net/ipv6/ipv6_sockglue.c
73334+++ b/net/ipv6/ipv6_sockglue.c
73335@@ -960,7 +960,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
73336 if (sk->sk_type != SOCK_STREAM)
73337 return -ENOPROTOOPT;
73338
73339- msg.msg_control = optval;
73340+ msg.msg_control = (void __force_kernel *)optval;
73341 msg.msg_controllen = len;
73342 msg.msg_flags = flags;
73343
73344diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
73345index 361ebf3..d5628fb 100644
73346--- a/net/ipv6/raw.c
73347+++ b/net/ipv6/raw.c
73348@@ -377,7 +377,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
73349 {
73350 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
73351 skb_checksum_complete(skb)) {
73352- atomic_inc(&sk->sk_drops);
73353+ atomic_inc_unchecked(&sk->sk_drops);
73354 kfree_skb(skb);
73355 return NET_RX_DROP;
73356 }
73357@@ -404,7 +404,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
73358 struct raw6_sock *rp = raw6_sk(sk);
73359
73360 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
73361- atomic_inc(&sk->sk_drops);
73362+ atomic_inc_unchecked(&sk->sk_drops);
73363 kfree_skb(skb);
73364 return NET_RX_DROP;
73365 }
73366@@ -428,7 +428,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
73367
73368 if (inet->hdrincl) {
73369 if (skb_checksum_complete(skb)) {
73370- atomic_inc(&sk->sk_drops);
73371+ atomic_inc_unchecked(&sk->sk_drops);
73372 kfree_skb(skb);
73373 return NET_RX_DROP;
73374 }
73375@@ -601,7 +601,7 @@ out:
73376 return err;
73377 }
73378
73379-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
73380+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
73381 struct flowi6 *fl6, struct dst_entry **dstp,
73382 unsigned int flags)
73383 {
73384@@ -909,12 +909,15 @@ do_confirm:
73385 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
73386 char __user *optval, int optlen)
73387 {
73388+ struct icmp6_filter filter;
73389+
73390 switch (optname) {
73391 case ICMPV6_FILTER:
73392 if (optlen > sizeof(struct icmp6_filter))
73393 optlen = sizeof(struct icmp6_filter);
73394- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
73395+ if (copy_from_user(&filter, optval, optlen))
73396 return -EFAULT;
73397+ raw6_sk(sk)->filter = filter;
73398 return 0;
73399 default:
73400 return -ENOPROTOOPT;
73401@@ -927,6 +930,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
73402 char __user *optval, int __user *optlen)
73403 {
73404 int len;
73405+ struct icmp6_filter filter;
73406
73407 switch (optname) {
73408 case ICMPV6_FILTER:
73409@@ -938,7 +942,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
73410 len = sizeof(struct icmp6_filter);
73411 if (put_user(len, optlen))
73412 return -EFAULT;
73413- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
73414+ filter = raw6_sk(sk)->filter;
73415+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
73416 return -EFAULT;
73417 return 0;
73418 default:
73419@@ -1245,7 +1250,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
73420 0, 0L, 0,
73421 sock_i_uid(sp), 0,
73422 sock_i_ino(sp),
73423- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
73424+ atomic_read(&sp->sk_refcnt),
73425+#ifdef CONFIG_GRKERNSEC_HIDESYM
73426+ NULL,
73427+#else
73428+ sp,
73429+#endif
73430+ atomic_read_unchecked(&sp->sk_drops));
73431 }
73432
73433 static int raw6_seq_show(struct seq_file *seq, void *v)
73434diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
73435index b859e4a..f9d1589 100644
73436--- a/net/ipv6/tcp_ipv6.c
73437+++ b/net/ipv6/tcp_ipv6.c
73438@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
73439 }
73440 #endif
73441
73442+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73443+extern int grsec_enable_blackhole;
73444+#endif
73445+
73446 static void tcp_v6_hash(struct sock *sk)
73447 {
73448 if (sk->sk_state != TCP_CLOSE) {
73449@@ -1651,6 +1655,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
73450 return 0;
73451
73452 reset:
73453+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73454+ if (!grsec_enable_blackhole)
73455+#endif
73456 tcp_v6_send_reset(sk, skb);
73457 discard:
73458 if (opt_skb)
73459@@ -1730,12 +1737,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
73460 TCP_SKB_CB(skb)->sacked = 0;
73461
73462 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
73463- if (!sk)
73464+ if (!sk) {
73465+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73466+ ret = 1;
73467+#endif
73468 goto no_tcp_socket;
73469+ }
73470
73471 process:
73472- if (sk->sk_state == TCP_TIME_WAIT)
73473+ if (sk->sk_state == TCP_TIME_WAIT) {
73474+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73475+ ret = 2;
73476+#endif
73477 goto do_time_wait;
73478+ }
73479
73480 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
73481 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
73482@@ -1783,6 +1798,10 @@ no_tcp_socket:
73483 bad_packet:
73484 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
73485 } else {
73486+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73487+ if (!grsec_enable_blackhole || (ret == 1 &&
73488+ (skb->dev->flags & IFF_LOOPBACK)))
73489+#endif
73490 tcp_v6_send_reset(NULL, skb);
73491 }
73492
73493@@ -2043,7 +2062,13 @@ static void get_openreq6(struct seq_file *seq,
73494 uid,
73495 0, /* non standard timer */
73496 0, /* open_requests have no inode */
73497- 0, req);
73498+ 0,
73499+#ifdef CONFIG_GRKERNSEC_HIDESYM
73500+ NULL
73501+#else
73502+ req
73503+#endif
73504+ );
73505 }
73506
73507 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
73508@@ -2093,7 +2118,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
73509 sock_i_uid(sp),
73510 icsk->icsk_probes_out,
73511 sock_i_ino(sp),
73512- atomic_read(&sp->sk_refcnt), sp,
73513+ atomic_read(&sp->sk_refcnt),
73514+#ifdef CONFIG_GRKERNSEC_HIDESYM
73515+ NULL,
73516+#else
73517+ sp,
73518+#endif
73519 jiffies_to_clock_t(icsk->icsk_rto),
73520 jiffies_to_clock_t(icsk->icsk_ack.ato),
73521 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
73522@@ -2128,7 +2158,13 @@ static void get_timewait6_sock(struct seq_file *seq,
73523 dest->s6_addr32[2], dest->s6_addr32[3], destp,
73524 tw->tw_substate, 0, 0,
73525 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
73526- atomic_read(&tw->tw_refcnt), tw);
73527+ atomic_read(&tw->tw_refcnt),
73528+#ifdef CONFIG_GRKERNSEC_HIDESYM
73529+ NULL
73530+#else
73531+ tw
73532+#endif
73533+ );
73534 }
73535
73536 static int tcp6_seq_show(struct seq_file *seq, void *v)
73537diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
73538index 8c25419..47a51ae 100644
73539--- a/net/ipv6/udp.c
73540+++ b/net/ipv6/udp.c
73541@@ -50,6 +50,10 @@
73542 #include <linux/seq_file.h>
73543 #include "udp_impl.h"
73544
73545+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73546+extern int grsec_enable_blackhole;
73547+#endif
73548+
73549 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
73550 {
73551 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
73552@@ -549,7 +553,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
73553
73554 return 0;
73555 drop:
73556- atomic_inc(&sk->sk_drops);
73557+ atomic_inc_unchecked(&sk->sk_drops);
73558 drop_no_sk_drops_inc:
73559 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
73560 kfree_skb(skb);
73561@@ -625,7 +629,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
73562 continue;
73563 }
73564 drop:
73565- atomic_inc(&sk->sk_drops);
73566+ atomic_inc_unchecked(&sk->sk_drops);
73567 UDP6_INC_STATS_BH(sock_net(sk),
73568 UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
73569 UDP6_INC_STATS_BH(sock_net(sk),
73570@@ -780,6 +784,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
73571 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
73572 proto == IPPROTO_UDPLITE);
73573
73574+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73575+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
73576+#endif
73577 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
73578
73579 kfree_skb(skb);
73580@@ -796,7 +803,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
73581 if (!sock_owned_by_user(sk))
73582 udpv6_queue_rcv_skb(sk, skb);
73583 else if (sk_add_backlog(sk, skb)) {
73584- atomic_inc(&sk->sk_drops);
73585+ atomic_inc_unchecked(&sk->sk_drops);
73586 bh_unlock_sock(sk);
73587 sock_put(sk);
73588 goto discard;
73589@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
73590 0, 0L, 0,
73591 sock_i_uid(sp), 0,
73592 sock_i_ino(sp),
73593- atomic_read(&sp->sk_refcnt), sp,
73594- atomic_read(&sp->sk_drops));
73595+ atomic_read(&sp->sk_refcnt),
73596+#ifdef CONFIG_GRKERNSEC_HIDESYM
73597+ NULL,
73598+#else
73599+ sp,
73600+#endif
73601+ atomic_read_unchecked(&sp->sk_drops));
73602 }
73603
73604 int udp6_seq_show(struct seq_file *seq, void *v)
73605diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
73606index 253695d..9481ce8 100644
73607--- a/net/irda/ircomm/ircomm_tty.c
73608+++ b/net/irda/ircomm/ircomm_tty.c
73609@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
73610 add_wait_queue(&self->open_wait, &wait);
73611
73612 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
73613- __FILE__,__LINE__, tty->driver->name, self->open_count );
73614+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
73615
73616 /* As far as I can see, we protect open_count - Jean II */
73617 spin_lock_irqsave(&self->spinlock, flags);
73618 if (!tty_hung_up_p(filp)) {
73619 extra_count = 1;
73620- self->open_count--;
73621+ local_dec(&self->open_count);
73622 }
73623 spin_unlock_irqrestore(&self->spinlock, flags);
73624- self->blocked_open++;
73625+ local_inc(&self->blocked_open);
73626
73627 while (1) {
73628 if (tty->termios->c_cflag & CBAUD) {
73629@@ -331,7 +331,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
73630 }
73631
73632 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
73633- __FILE__,__LINE__, tty->driver->name, self->open_count );
73634+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
73635
73636 schedule();
73637 }
73638@@ -342,13 +342,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
73639 if (extra_count) {
73640 /* ++ is not atomic, so this should be protected - Jean II */
73641 spin_lock_irqsave(&self->spinlock, flags);
73642- self->open_count++;
73643+ local_inc(&self->open_count);
73644 spin_unlock_irqrestore(&self->spinlock, flags);
73645 }
73646- self->blocked_open--;
73647+ local_dec(&self->blocked_open);
73648
73649 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
73650- __FILE__,__LINE__, tty->driver->name, self->open_count);
73651+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
73652
73653 if (!retval)
73654 self->flags |= ASYNC_NORMAL_ACTIVE;
73655@@ -417,14 +417,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
73656 }
73657 /* ++ is not atomic, so this should be protected - Jean II */
73658 spin_lock_irqsave(&self->spinlock, flags);
73659- self->open_count++;
73660+ local_inc(&self->open_count);
73661
73662 tty->driver_data = self;
73663 self->tty = tty;
73664 spin_unlock_irqrestore(&self->spinlock, flags);
73665
73666 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
73667- self->line, self->open_count);
73668+ self->line, local_read(&self->open_count));
73669
73670 /* Not really used by us, but lets do it anyway */
73671 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
73672@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
73673 return;
73674 }
73675
73676- if ((tty->count == 1) && (self->open_count != 1)) {
73677+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
73678 /*
73679 * Uh, oh. tty->count is 1, which means that the tty
73680 * structure will be freed. state->count should always
73681@@ -520,16 +520,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
73682 */
73683 IRDA_DEBUG(0, "%s(), bad serial port count; "
73684 "tty->count is 1, state->count is %d\n", __func__ ,
73685- self->open_count);
73686- self->open_count = 1;
73687+ local_read(&self->open_count));
73688+ local_set(&self->open_count, 1);
73689 }
73690
73691- if (--self->open_count < 0) {
73692+ if (local_dec_return(&self->open_count) < 0) {
73693 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
73694- __func__, self->line, self->open_count);
73695- self->open_count = 0;
73696+ __func__, self->line, local_read(&self->open_count));
73697+ local_set(&self->open_count, 0);
73698 }
73699- if (self->open_count) {
73700+ if (local_read(&self->open_count)) {
73701 spin_unlock_irqrestore(&self->spinlock, flags);
73702
73703 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
73704@@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
73705 tty->closing = 0;
73706 self->tty = NULL;
73707
73708- if (self->blocked_open) {
73709+ if (local_read(&self->blocked_open)) {
73710 if (self->close_delay)
73711 schedule_timeout_interruptible(self->close_delay);
73712 wake_up_interruptible(&self->open_wait);
73713@@ -1013,7 +1013,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
73714 spin_lock_irqsave(&self->spinlock, flags);
73715 self->flags &= ~ASYNC_NORMAL_ACTIVE;
73716 self->tty = NULL;
73717- self->open_count = 0;
73718+ local_set(&self->open_count, 0);
73719 spin_unlock_irqrestore(&self->spinlock, flags);
73720
73721 wake_up_interruptible(&self->open_wait);
73722@@ -1360,7 +1360,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
73723 seq_putc(m, '\n');
73724
73725 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
73726- seq_printf(m, "Open count: %d\n", self->open_count);
73727+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
73728 seq_printf(m, "Max data size: %d\n", self->max_data_size);
73729 seq_printf(m, "Max header size: %d\n", self->max_header_size);
73730
73731diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
73732index 274d150..656a144 100644
73733--- a/net/iucv/af_iucv.c
73734+++ b/net/iucv/af_iucv.c
73735@@ -787,10 +787,10 @@ static int iucv_sock_autobind(struct sock *sk)
73736
73737 write_lock_bh(&iucv_sk_list.lock);
73738
73739- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
73740+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
73741 while (__iucv_get_sock_by_name(name)) {
73742 sprintf(name, "%08x",
73743- atomic_inc_return(&iucv_sk_list.autobind_name));
73744+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
73745 }
73746
73747 write_unlock_bh(&iucv_sk_list.lock);
73748diff --git a/net/key/af_key.c b/net/key/af_key.c
73749index 1e733e9..3d73c9f 100644
73750--- a/net/key/af_key.c
73751+++ b/net/key/af_key.c
73752@@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
73753 static u32 get_acqseq(void)
73754 {
73755 u32 res;
73756- static atomic_t acqseq;
73757+ static atomic_unchecked_t acqseq;
73758
73759 do {
73760- res = atomic_inc_return(&acqseq);
73761+ res = atomic_inc_return_unchecked(&acqseq);
73762 } while (!res);
73763 return res;
73764 }
73765diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
73766index 73495f1..ad51356 100644
73767--- a/net/mac80211/ieee80211_i.h
73768+++ b/net/mac80211/ieee80211_i.h
73769@@ -27,6 +27,7 @@
73770 #include <net/ieee80211_radiotap.h>
73771 #include <net/cfg80211.h>
73772 #include <net/mac80211.h>
73773+#include <asm/local.h>
73774 #include "key.h"
73775 #include "sta_info.h"
73776
73777@@ -764,7 +765,7 @@ struct ieee80211_local {
73778 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
73779 spinlock_t queue_stop_reason_lock;
73780
73781- int open_count;
73782+ local_t open_count;
73783 int monitors, cooked_mntrs;
73784 /* number of interfaces with corresponding FIF_ flags */
73785 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
73786diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
73787index 30d7355..e260095 100644
73788--- a/net/mac80211/iface.c
73789+++ b/net/mac80211/iface.c
73790@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
73791 break;
73792 }
73793
73794- if (local->open_count == 0) {
73795+ if (local_read(&local->open_count) == 0) {
73796 res = drv_start(local);
73797 if (res)
73798 goto err_del_bss;
73799@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
73800 memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
73801
73802 if (!is_valid_ether_addr(dev->dev_addr)) {
73803- if (!local->open_count)
73804+ if (!local_read(&local->open_count))
73805 drv_stop(local);
73806 return -EADDRNOTAVAIL;
73807 }
73808@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
73809 mutex_unlock(&local->mtx);
73810
73811 if (coming_up)
73812- local->open_count++;
73813+ local_inc(&local->open_count);
73814
73815 if (hw_reconf_flags) {
73816 ieee80211_hw_config(local, hw_reconf_flags);
73817@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
73818 err_del_interface:
73819 drv_remove_interface(local, &sdata->vif);
73820 err_stop:
73821- if (!local->open_count)
73822+ if (!local_read(&local->open_count))
73823 drv_stop(local);
73824 err_del_bss:
73825 sdata->bss = NULL;
73826@@ -472,7 +472,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
73827 }
73828
73829 if (going_down)
73830- local->open_count--;
73831+ local_dec(&local->open_count);
73832
73833 switch (sdata->vif.type) {
73834 case NL80211_IFTYPE_AP_VLAN:
73835@@ -531,7 +531,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
73836
73837 ieee80211_recalc_ps(local, -1);
73838
73839- if (local->open_count == 0) {
73840+ if (local_read(&local->open_count) == 0) {
73841 if (local->ops->napi_poll)
73842 napi_disable(&local->napi);
73843 ieee80211_clear_tx_pending(local);
73844diff --git a/net/mac80211/main.c b/net/mac80211/main.c
73845index a7536fd..4039cc0 100644
73846--- a/net/mac80211/main.c
73847+++ b/net/mac80211/main.c
73848@@ -163,7 +163,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
73849 local->hw.conf.power_level = power;
73850 }
73851
73852- if (changed && local->open_count) {
73853+ if (changed && local_read(&local->open_count)) {
73854 ret = drv_config(local, changed);
73855 /*
73856 * Goal:
73857diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
73858index 9ee7164..56c5061 100644
73859--- a/net/mac80211/pm.c
73860+++ b/net/mac80211/pm.c
73861@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
73862 struct ieee80211_sub_if_data *sdata;
73863 struct sta_info *sta;
73864
73865- if (!local->open_count)
73866+ if (!local_read(&local->open_count))
73867 goto suspend;
73868
73869 ieee80211_scan_cancel(local);
73870@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
73871 cancel_work_sync(&local->dynamic_ps_enable_work);
73872 del_timer_sync(&local->dynamic_ps_timer);
73873
73874- local->wowlan = wowlan && local->open_count;
73875+ local->wowlan = wowlan && local_read(&local->open_count);
73876 if (local->wowlan) {
73877 int err = drv_suspend(local, wowlan);
73878 if (err < 0) {
73879@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
73880 }
73881
73882 /* stop hardware - this must stop RX */
73883- if (local->open_count)
73884+ if (local_read(&local->open_count))
73885 ieee80211_stop_device(local);
73886
73887 suspend:
73888diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
73889index 5a5a776..9600b11 100644
73890--- a/net/mac80211/rate.c
73891+++ b/net/mac80211/rate.c
73892@@ -401,7 +401,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
73893
73894 ASSERT_RTNL();
73895
73896- if (local->open_count)
73897+ if (local_read(&local->open_count))
73898 return -EBUSY;
73899
73900 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
73901diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
73902index c97a065..ff61928 100644
73903--- a/net/mac80211/rc80211_pid_debugfs.c
73904+++ b/net/mac80211/rc80211_pid_debugfs.c
73905@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
73906
73907 spin_unlock_irqrestore(&events->lock, status);
73908
73909- if (copy_to_user(buf, pb, p))
73910+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
73911 return -EFAULT;
73912
73913 return p;
73914diff --git a/net/mac80211/util.c b/net/mac80211/util.c
73915index d5230ec..c604b21 100644
73916--- a/net/mac80211/util.c
73917+++ b/net/mac80211/util.c
73918@@ -1000,7 +1000,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
73919 drv_set_coverage_class(local, hw->wiphy->coverage_class);
73920
73921 /* everything else happens only if HW was up & running */
73922- if (!local->open_count)
73923+ if (!local_read(&local->open_count))
73924 goto wake_up;
73925
73926 /*
73927diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
73928index d5597b7..ab6d39c 100644
73929--- a/net/netfilter/Kconfig
73930+++ b/net/netfilter/Kconfig
73931@@ -779,6 +779,16 @@ config NETFILTER_XT_MATCH_ESP
73932
73933 To compile it as a module, choose M here. If unsure, say N.
73934
73935+config NETFILTER_XT_MATCH_GRADM
73936+ tristate '"gradm" match support'
73937+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
73938+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
73939+ ---help---
73940+ The gradm match allows to match on grsecurity RBAC being enabled.
73941+ It is useful when iptables rules are applied early on bootup to
73942+ prevent connections to the machine (except from a trusted host)
73943+ while the RBAC system is disabled.
73944+
73945 config NETFILTER_XT_MATCH_HASHLIMIT
73946 tristate '"hashlimit" match support'
73947 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
73948diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
73949index 1a02853..5d8c22e 100644
73950--- a/net/netfilter/Makefile
73951+++ b/net/netfilter/Makefile
73952@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
73953 obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
73954 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
73955 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
73956+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
73957 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
73958 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
73959 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
73960diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
73961index 29fa5ba..8debc79 100644
73962--- a/net/netfilter/ipvs/ip_vs_conn.c
73963+++ b/net/netfilter/ipvs/ip_vs_conn.c
73964@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
73965 /* Increase the refcnt counter of the dest */
73966 atomic_inc(&dest->refcnt);
73967
73968- conn_flags = atomic_read(&dest->conn_flags);
73969+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
73970 if (cp->protocol != IPPROTO_UDP)
73971 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
73972 /* Bind with the destination and its corresponding transmitter */
73973@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
73974 atomic_set(&cp->refcnt, 1);
73975
73976 atomic_set(&cp->n_control, 0);
73977- atomic_set(&cp->in_pkts, 0);
73978+ atomic_set_unchecked(&cp->in_pkts, 0);
73979
73980 atomic_inc(&ipvs->conn_count);
73981 if (flags & IP_VS_CONN_F_NO_CPORT)
73982@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
73983
73984 /* Don't drop the entry if its number of incoming packets is not
73985 located in [0, 8] */
73986- i = atomic_read(&cp->in_pkts);
73987+ i = atomic_read_unchecked(&cp->in_pkts);
73988 if (i > 8 || i < 0) return 0;
73989
73990 if (!todrop_rate[i]) return 0;
73991diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
73992index 093cc32..9209ae1 100644
73993--- a/net/netfilter/ipvs/ip_vs_core.c
73994+++ b/net/netfilter/ipvs/ip_vs_core.c
73995@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
73996 ret = cp->packet_xmit(skb, cp, pd->pp);
73997 /* do not touch skb anymore */
73998
73999- atomic_inc(&cp->in_pkts);
74000+ atomic_inc_unchecked(&cp->in_pkts);
74001 ip_vs_conn_put(cp);
74002 return ret;
74003 }
74004@@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
74005 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
74006 pkts = sysctl_sync_threshold(ipvs);
74007 else
74008- pkts = atomic_add_return(1, &cp->in_pkts);
74009+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
74010
74011 if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
74012 cp->protocol == IPPROTO_SCTP) {
74013diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
74014index e1a66cf..0910076 100644
74015--- a/net/netfilter/ipvs/ip_vs_ctl.c
74016+++ b/net/netfilter/ipvs/ip_vs_ctl.c
74017@@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
74018 ip_vs_rs_hash(ipvs, dest);
74019 write_unlock_bh(&ipvs->rs_lock);
74020 }
74021- atomic_set(&dest->conn_flags, conn_flags);
74022+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
74023
74024 /* bind the service */
74025 if (!dest->svc) {
74026@@ -2028,7 +2028,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
74027 " %-7s %-6d %-10d %-10d\n",
74028 &dest->addr.in6,
74029 ntohs(dest->port),
74030- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
74031+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
74032 atomic_read(&dest->weight),
74033 atomic_read(&dest->activeconns),
74034 atomic_read(&dest->inactconns));
74035@@ -2039,7 +2039,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
74036 "%-7s %-6d %-10d %-10d\n",
74037 ntohl(dest->addr.ip),
74038 ntohs(dest->port),
74039- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
74040+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
74041 atomic_read(&dest->weight),
74042 atomic_read(&dest->activeconns),
74043 atomic_read(&dest->inactconns));
74044@@ -2509,7 +2509,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
74045
74046 entry.addr = dest->addr.ip;
74047 entry.port = dest->port;
74048- entry.conn_flags = atomic_read(&dest->conn_flags);
74049+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
74050 entry.weight = atomic_read(&dest->weight);
74051 entry.u_threshold = dest->u_threshold;
74052 entry.l_threshold = dest->l_threshold;
74053@@ -3042,7 +3042,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
74054 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
74055
74056 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
74057- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
74058+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
74059 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
74060 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
74061 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
74062diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
74063index 2b6678c0..aaa41fc 100644
74064--- a/net/netfilter/ipvs/ip_vs_sync.c
74065+++ b/net/netfilter/ipvs/ip_vs_sync.c
74066@@ -649,7 +649,7 @@ control:
74067 * i.e only increment in_pkts for Templates.
74068 */
74069 if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
74070- int pkts = atomic_add_return(1, &cp->in_pkts);
74071+ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
74072
74073 if (pkts % sysctl_sync_period(ipvs) != 1)
74074 return;
74075@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
74076
74077 if (opt)
74078 memcpy(&cp->in_seq, opt, sizeof(*opt));
74079- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
74080+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
74081 cp->state = state;
74082 cp->old_state = cp->state;
74083 /*
74084diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
74085index aa2d720..d8aa111 100644
74086--- a/net/netfilter/ipvs/ip_vs_xmit.c
74087+++ b/net/netfilter/ipvs/ip_vs_xmit.c
74088@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
74089 else
74090 rc = NF_ACCEPT;
74091 /* do not touch skb anymore */
74092- atomic_inc(&cp->in_pkts);
74093+ atomic_inc_unchecked(&cp->in_pkts);
74094 goto out;
74095 }
74096
74097@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
74098 else
74099 rc = NF_ACCEPT;
74100 /* do not touch skb anymore */
74101- atomic_inc(&cp->in_pkts);
74102+ atomic_inc_unchecked(&cp->in_pkts);
74103 goto out;
74104 }
74105
74106diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
74107index 66b2c54..c7884e3 100644
74108--- a/net/netfilter/nfnetlink_log.c
74109+++ b/net/netfilter/nfnetlink_log.c
74110@@ -70,7 +70,7 @@ struct nfulnl_instance {
74111 };
74112
74113 static DEFINE_SPINLOCK(instances_lock);
74114-static atomic_t global_seq;
74115+static atomic_unchecked_t global_seq;
74116
74117 #define INSTANCE_BUCKETS 16
74118 static struct hlist_head instance_table[INSTANCE_BUCKETS];
74119@@ -502,7 +502,7 @@ __build_packet_message(struct nfulnl_instance *inst,
74120 /* global sequence number */
74121 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
74122 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
74123- htonl(atomic_inc_return(&global_seq)));
74124+ htonl(atomic_inc_return_unchecked(&global_seq)));
74125
74126 if (data_len) {
74127 struct nlattr *nla;
74128diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
74129new file mode 100644
74130index 0000000..6905327
74131--- /dev/null
74132+++ b/net/netfilter/xt_gradm.c
74133@@ -0,0 +1,51 @@
74134+/*
74135+ * gradm match for netfilter
74136