]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.2.2-3.2.6-201202161839.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.6-201202161839.patch
CommitLineData
b86e1712
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 47fe496..c50bd2a 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..0b22b53 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..4f16a68 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@@ -623,6 +920,7 @@ GLOBAL(int_with_check)
14005 andl %edi,%edx
14006 jnz int_careful
14007 andl $~TS_COMPAT,TI_status(%rcx)
14008+ pax_erase_kstack
14009 jmp retint_swapgs
14010
14011 /* Either reschedule or signal or syscall exit tracking needed. */
14012@@ -669,7 +967,7 @@ int_restore_rest:
14013 TRACE_IRQS_OFF
14014 jmp int_with_check
14015 CFI_ENDPROC
14016-END(system_call)
14017+ENDPROC(system_call)
14018
14019 /*
14020 * Certain special system calls that need to save a complete full stack frame.
14021@@ -685,7 +983,7 @@ ENTRY(\label)
14022 call \func
14023 jmp ptregscall_common
14024 CFI_ENDPROC
14025-END(\label)
14026+ENDPROC(\label)
14027 .endm
14028
14029 PTREGSCALL stub_clone, sys_clone, %r8
14030@@ -703,9 +1001,10 @@ ENTRY(ptregscall_common)
14031 movq_cfi_restore R12+8, r12
14032 movq_cfi_restore RBP+8, rbp
14033 movq_cfi_restore RBX+8, rbx
14034+ pax_force_retaddr
14035 ret $REST_SKIP /* pop extended registers */
14036 CFI_ENDPROC
14037-END(ptregscall_common)
14038+ENDPROC(ptregscall_common)
14039
14040 ENTRY(stub_execve)
14041 CFI_STARTPROC
14042@@ -720,7 +1019,7 @@ ENTRY(stub_execve)
14043 RESTORE_REST
14044 jmp int_ret_from_sys_call
14045 CFI_ENDPROC
14046-END(stub_execve)
14047+ENDPROC(stub_execve)
14048
14049 /*
14050 * sigreturn is special because it needs to restore all registers on return.
14051@@ -738,7 +1037,7 @@ ENTRY(stub_rt_sigreturn)
14052 RESTORE_REST
14053 jmp int_ret_from_sys_call
14054 CFI_ENDPROC
14055-END(stub_rt_sigreturn)
14056+ENDPROC(stub_rt_sigreturn)
14057
14058 /*
14059 * Build the entry stubs and pointer table with some assembler magic.
14060@@ -773,7 +1072,7 @@ vector=vector+1
14061 2: jmp common_interrupt
14062 .endr
14063 CFI_ENDPROC
14064-END(irq_entries_start)
14065+ENDPROC(irq_entries_start)
14066
14067 .previous
14068 END(interrupt)
14069@@ -793,6 +1092,16 @@ END(interrupt)
14070 subq $ORIG_RAX-RBP, %rsp
14071 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
14072 SAVE_ARGS_IRQ
14073+#ifdef CONFIG_PAX_MEMORY_UDEREF
14074+ testb $3, CS(%rdi)
14075+ jnz 1f
14076+ pax_enter_kernel
14077+ jmp 2f
14078+1: pax_enter_kernel_user
14079+2:
14080+#else
14081+ pax_enter_kernel
14082+#endif
14083 call \func
14084 .endm
14085
14086@@ -824,7 +1133,7 @@ ret_from_intr:
14087
14088 exit_intr:
14089 GET_THREAD_INFO(%rcx)
14090- testl $3,CS-ARGOFFSET(%rsp)
14091+ testb $3,CS-ARGOFFSET(%rsp)
14092 je retint_kernel
14093
14094 /* Interrupt came from user space */
14095@@ -846,12 +1155,15 @@ retint_swapgs: /* return to user-space */
14096 * The iretq could re-enable interrupts:
14097 */
14098 DISABLE_INTERRUPTS(CLBR_ANY)
14099+ pax_exit_kernel_user
14100 TRACE_IRQS_IRETQ
14101 SWAPGS
14102 jmp restore_args
14103
14104 retint_restore_args: /* return to kernel space */
14105 DISABLE_INTERRUPTS(CLBR_ANY)
14106+ pax_exit_kernel
14107+ pax_force_retaddr RIP-ARGOFFSET
14108 /*
14109 * The iretq could re-enable interrupts:
14110 */
14111@@ -940,7 +1252,7 @@ ENTRY(retint_kernel)
14112 #endif
14113
14114 CFI_ENDPROC
14115-END(common_interrupt)
14116+ENDPROC(common_interrupt)
14117 /*
14118 * End of kprobes section
14119 */
14120@@ -956,7 +1268,7 @@ ENTRY(\sym)
14121 interrupt \do_sym
14122 jmp ret_from_intr
14123 CFI_ENDPROC
14124-END(\sym)
14125+ENDPROC(\sym)
14126 .endm
14127
14128 #ifdef CONFIG_SMP
14129@@ -1021,12 +1333,22 @@ ENTRY(\sym)
14130 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14131 call error_entry
14132 DEFAULT_FRAME 0
14133+#ifdef CONFIG_PAX_MEMORY_UDEREF
14134+ testb $3, CS(%rsp)
14135+ jnz 1f
14136+ pax_enter_kernel
14137+ jmp 2f
14138+1: pax_enter_kernel_user
14139+2:
14140+#else
14141+ pax_enter_kernel
14142+#endif
14143 movq %rsp,%rdi /* pt_regs pointer */
14144 xorl %esi,%esi /* no error code */
14145 call \do_sym
14146 jmp error_exit /* %ebx: no swapgs flag */
14147 CFI_ENDPROC
14148-END(\sym)
14149+ENDPROC(\sym)
14150 .endm
14151
14152 .macro paranoidzeroentry sym do_sym
14153@@ -1038,15 +1360,25 @@ ENTRY(\sym)
14154 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14155 call save_paranoid
14156 TRACE_IRQS_OFF
14157+#ifdef CONFIG_PAX_MEMORY_UDEREF
14158+ testb $3, CS(%rsp)
14159+ jnz 1f
14160+ pax_enter_kernel
14161+ jmp 2f
14162+1: pax_enter_kernel_user
14163+2:
14164+#else
14165+ pax_enter_kernel
14166+#endif
14167 movq %rsp,%rdi /* pt_regs pointer */
14168 xorl %esi,%esi /* no error code */
14169 call \do_sym
14170 jmp paranoid_exit /* %ebx: no swapgs flag */
14171 CFI_ENDPROC
14172-END(\sym)
14173+ENDPROC(\sym)
14174 .endm
14175
14176-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
14177+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
14178 .macro paranoidzeroentry_ist sym do_sym ist
14179 ENTRY(\sym)
14180 INTR_FRAME
14181@@ -1056,14 +1388,30 @@ ENTRY(\sym)
14182 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14183 call save_paranoid
14184 TRACE_IRQS_OFF
14185+#ifdef CONFIG_PAX_MEMORY_UDEREF
14186+ testb $3, CS(%rsp)
14187+ jnz 1f
14188+ pax_enter_kernel
14189+ jmp 2f
14190+1: pax_enter_kernel_user
14191+2:
14192+#else
14193+ pax_enter_kernel
14194+#endif
14195 movq %rsp,%rdi /* pt_regs pointer */
14196 xorl %esi,%esi /* no error code */
14197+#ifdef CONFIG_SMP
14198+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
14199+ lea init_tss(%r12), %r12
14200+#else
14201+ lea init_tss(%rip), %r12
14202+#endif
14203 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
14204 call \do_sym
14205 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
14206 jmp paranoid_exit /* %ebx: no swapgs flag */
14207 CFI_ENDPROC
14208-END(\sym)
14209+ENDPROC(\sym)
14210 .endm
14211
14212 .macro errorentry sym do_sym
14213@@ -1074,13 +1422,23 @@ ENTRY(\sym)
14214 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14215 call error_entry
14216 DEFAULT_FRAME 0
14217+#ifdef CONFIG_PAX_MEMORY_UDEREF
14218+ testb $3, CS(%rsp)
14219+ jnz 1f
14220+ pax_enter_kernel
14221+ jmp 2f
14222+1: pax_enter_kernel_user
14223+2:
14224+#else
14225+ pax_enter_kernel
14226+#endif
14227 movq %rsp,%rdi /* pt_regs pointer */
14228 movq ORIG_RAX(%rsp),%rsi /* get error code */
14229 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
14230 call \do_sym
14231 jmp error_exit /* %ebx: no swapgs flag */
14232 CFI_ENDPROC
14233-END(\sym)
14234+ENDPROC(\sym)
14235 .endm
14236
14237 /* error code is on the stack already */
14238@@ -1093,13 +1451,23 @@ ENTRY(\sym)
14239 call save_paranoid
14240 DEFAULT_FRAME 0
14241 TRACE_IRQS_OFF
14242+#ifdef CONFIG_PAX_MEMORY_UDEREF
14243+ testb $3, CS(%rsp)
14244+ jnz 1f
14245+ pax_enter_kernel
14246+ jmp 2f
14247+1: pax_enter_kernel_user
14248+2:
14249+#else
14250+ pax_enter_kernel
14251+#endif
14252 movq %rsp,%rdi /* pt_regs pointer */
14253 movq ORIG_RAX(%rsp),%rsi /* get error code */
14254 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
14255 call \do_sym
14256 jmp paranoid_exit /* %ebx: no swapgs flag */
14257 CFI_ENDPROC
14258-END(\sym)
14259+ENDPROC(\sym)
14260 .endm
14261
14262 zeroentry divide_error do_divide_error
14263@@ -1129,9 +1497,10 @@ gs_change:
14264 2: mfence /* workaround */
14265 SWAPGS
14266 popfq_cfi
14267+ pax_force_retaddr
14268 ret
14269 CFI_ENDPROC
14270-END(native_load_gs_index)
14271+ENDPROC(native_load_gs_index)
14272
14273 .section __ex_table,"a"
14274 .align 8
14275@@ -1153,13 +1522,14 @@ ENTRY(kernel_thread_helper)
14276 * Here we are in the child and the registers are set as they were
14277 * at kernel_thread() invocation in the parent.
14278 */
14279+ pax_force_fptr %rsi
14280 call *%rsi
14281 # exit
14282 mov %eax, %edi
14283 call do_exit
14284 ud2 # padding for call trace
14285 CFI_ENDPROC
14286-END(kernel_thread_helper)
14287+ENDPROC(kernel_thread_helper)
14288
14289 /*
14290 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
14291@@ -1186,11 +1556,11 @@ ENTRY(kernel_execve)
14292 RESTORE_REST
14293 testq %rax,%rax
14294 je int_ret_from_sys_call
14295- RESTORE_ARGS
14296 UNFAKE_STACK_FRAME
14297+ pax_force_retaddr
14298 ret
14299 CFI_ENDPROC
14300-END(kernel_execve)
14301+ENDPROC(kernel_execve)
14302
14303 /* Call softirq on interrupt stack. Interrupts are off. */
14304 ENTRY(call_softirq)
14305@@ -1208,9 +1578,10 @@ ENTRY(call_softirq)
14306 CFI_DEF_CFA_REGISTER rsp
14307 CFI_ADJUST_CFA_OFFSET -8
14308 decl PER_CPU_VAR(irq_count)
14309+ pax_force_retaddr
14310 ret
14311 CFI_ENDPROC
14312-END(call_softirq)
14313+ENDPROC(call_softirq)
14314
14315 #ifdef CONFIG_XEN
14316 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
14317@@ -1248,7 +1619,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
14318 decl PER_CPU_VAR(irq_count)
14319 jmp error_exit
14320 CFI_ENDPROC
14321-END(xen_do_hypervisor_callback)
14322+ENDPROC(xen_do_hypervisor_callback)
14323
14324 /*
14325 * Hypervisor uses this for application faults while it executes.
14326@@ -1307,7 +1678,7 @@ ENTRY(xen_failsafe_callback)
14327 SAVE_ALL
14328 jmp error_exit
14329 CFI_ENDPROC
14330-END(xen_failsafe_callback)
14331+ENDPROC(xen_failsafe_callback)
14332
14333 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
14334 xen_hvm_callback_vector xen_evtchn_do_upcall
14335@@ -1356,16 +1727,31 @@ ENTRY(paranoid_exit)
14336 TRACE_IRQS_OFF
14337 testl %ebx,%ebx /* swapgs needed? */
14338 jnz paranoid_restore
14339- testl $3,CS(%rsp)
14340+ testb $3,CS(%rsp)
14341 jnz paranoid_userspace
14342+#ifdef CONFIG_PAX_MEMORY_UDEREF
14343+ pax_exit_kernel
14344+ TRACE_IRQS_IRETQ 0
14345+ SWAPGS_UNSAFE_STACK
14346+ RESTORE_ALL 8
14347+ pax_force_retaddr_bts
14348+ jmp irq_return
14349+#endif
14350 paranoid_swapgs:
14351+#ifdef CONFIG_PAX_MEMORY_UDEREF
14352+ pax_exit_kernel_user
14353+#else
14354+ pax_exit_kernel
14355+#endif
14356 TRACE_IRQS_IRETQ 0
14357 SWAPGS_UNSAFE_STACK
14358 RESTORE_ALL 8
14359 jmp irq_return
14360 paranoid_restore:
14361+ pax_exit_kernel
14362 TRACE_IRQS_IRETQ 0
14363 RESTORE_ALL 8
14364+ pax_force_retaddr_bts
14365 jmp irq_return
14366 paranoid_userspace:
14367 GET_THREAD_INFO(%rcx)
14368@@ -1394,7 +1780,7 @@ paranoid_schedule:
14369 TRACE_IRQS_OFF
14370 jmp paranoid_userspace
14371 CFI_ENDPROC
14372-END(paranoid_exit)
14373+ENDPROC(paranoid_exit)
14374
14375 /*
14376 * Exception entry point. This expects an error code/orig_rax on the stack.
14377@@ -1421,12 +1807,13 @@ ENTRY(error_entry)
14378 movq_cfi r14, R14+8
14379 movq_cfi r15, R15+8
14380 xorl %ebx,%ebx
14381- testl $3,CS+8(%rsp)
14382+ testb $3,CS+8(%rsp)
14383 je error_kernelspace
14384 error_swapgs:
14385 SWAPGS
14386 error_sti:
14387 TRACE_IRQS_OFF
14388+ pax_force_retaddr_bts
14389 ret
14390
14391 /*
14392@@ -1453,7 +1840,7 @@ bstep_iret:
14393 movq %rcx,RIP+8(%rsp)
14394 jmp error_swapgs
14395 CFI_ENDPROC
14396-END(error_entry)
14397+ENDPROC(error_entry)
14398
14399
14400 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
14401@@ -1473,7 +1860,7 @@ ENTRY(error_exit)
14402 jnz retint_careful
14403 jmp retint_swapgs
14404 CFI_ENDPROC
14405-END(error_exit)
14406+ENDPROC(error_exit)
14407
14408
14409 /* runs on exception stack */
14410@@ -1485,6 +1872,16 @@ ENTRY(nmi)
14411 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
14412 call save_paranoid
14413 DEFAULT_FRAME 0
14414+#ifdef CONFIG_PAX_MEMORY_UDEREF
14415+ testb $3, CS(%rsp)
14416+ jnz 1f
14417+ pax_enter_kernel
14418+ jmp 2f
14419+1: pax_enter_kernel_user
14420+2:
14421+#else
14422+ pax_enter_kernel
14423+#endif
14424 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
14425 movq %rsp,%rdi
14426 movq $-1,%rsi
14427@@ -1495,12 +1892,28 @@ ENTRY(nmi)
14428 DISABLE_INTERRUPTS(CLBR_NONE)
14429 testl %ebx,%ebx /* swapgs needed? */
14430 jnz nmi_restore
14431- testl $3,CS(%rsp)
14432+ testb $3,CS(%rsp)
14433 jnz nmi_userspace
14434+#ifdef CONFIG_PAX_MEMORY_UDEREF
14435+ pax_exit_kernel
14436+ SWAPGS_UNSAFE_STACK
14437+ RESTORE_ALL 8
14438+ pax_force_retaddr_bts
14439+ jmp irq_return
14440+#endif
14441 nmi_swapgs:
14442+#ifdef CONFIG_PAX_MEMORY_UDEREF
14443+ pax_exit_kernel_user
14444+#else
14445+ pax_exit_kernel
14446+#endif
14447 SWAPGS_UNSAFE_STACK
14448+ RESTORE_ALL 8
14449+ jmp irq_return
14450 nmi_restore:
14451+ pax_exit_kernel
14452 RESTORE_ALL 8
14453+ pax_force_retaddr_bts
14454 jmp irq_return
14455 nmi_userspace:
14456 GET_THREAD_INFO(%rcx)
14457@@ -1529,14 +1942,14 @@ nmi_schedule:
14458 jmp paranoid_exit
14459 CFI_ENDPROC
14460 #endif
14461-END(nmi)
14462+ENDPROC(nmi)
14463
14464 ENTRY(ignore_sysret)
14465 CFI_STARTPROC
14466 mov $-ENOSYS,%eax
14467 sysret
14468 CFI_ENDPROC
14469-END(ignore_sysret)
14470+ENDPROC(ignore_sysret)
14471
14472 /*
14473 * End of kprobes section
14474diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
14475index c9a281f..ce2f317 100644
14476--- a/arch/x86/kernel/ftrace.c
14477+++ b/arch/x86/kernel/ftrace.c
14478@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */
14479 static const void *mod_code_newcode; /* holds the text to write to the IP */
14480
14481 static unsigned nmi_wait_count;
14482-static atomic_t nmi_update_count = ATOMIC_INIT(0);
14483+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
14484
14485 int ftrace_arch_read_dyn_info(char *buf, int size)
14486 {
14487@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
14488
14489 r = snprintf(buf, size, "%u %u",
14490 nmi_wait_count,
14491- atomic_read(&nmi_update_count));
14492+ atomic_read_unchecked(&nmi_update_count));
14493 return r;
14494 }
14495
14496@@ -177,8 +177,10 @@ void ftrace_nmi_enter(void)
14497
14498 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
14499 smp_rmb();
14500+ pax_open_kernel();
14501 ftrace_mod_code();
14502- atomic_inc(&nmi_update_count);
14503+ pax_close_kernel();
14504+ atomic_inc_unchecked(&nmi_update_count);
14505 }
14506 /* Must have previous changes seen before executions */
14507 smp_mb();
14508@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
14509 {
14510 unsigned char replaced[MCOUNT_INSN_SIZE];
14511
14512+ ip = ktla_ktva(ip);
14513+
14514 /*
14515 * Note: Due to modules and __init, code can
14516 * disappear and change, we need to protect against faulting
14517@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
14518 unsigned char old[MCOUNT_INSN_SIZE], *new;
14519 int ret;
14520
14521- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
14522+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
14523 new = ftrace_call_replace(ip, (unsigned long)func);
14524 ret = ftrace_modify_code(ip, old, new);
14525
14526@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip,
14527 {
14528 unsigned char code[MCOUNT_INSN_SIZE];
14529
14530+ ip = ktla_ktva(ip);
14531+
14532 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
14533 return -EFAULT;
14534
14535diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
14536index 3bb0850..55a56f4 100644
14537--- a/arch/x86/kernel/head32.c
14538+++ b/arch/x86/kernel/head32.c
14539@@ -19,6 +19,7 @@
14540 #include <asm/io_apic.h>
14541 #include <asm/bios_ebda.h>
14542 #include <asm/tlbflush.h>
14543+#include <asm/boot.h>
14544
14545 static void __init i386_default_early_setup(void)
14546 {
14547@@ -33,7 +34,7 @@ void __init i386_start_kernel(void)
14548 {
14549 memblock_init();
14550
14551- memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
14552+ memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
14553
14554 #ifdef CONFIG_BLK_DEV_INITRD
14555 /* Reserve INITRD */
14556diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
14557index ce0be7c..c41476e 100644
14558--- a/arch/x86/kernel/head_32.S
14559+++ b/arch/x86/kernel/head_32.S
14560@@ -25,6 +25,12 @@
14561 /* Physical address */
14562 #define pa(X) ((X) - __PAGE_OFFSET)
14563
14564+#ifdef CONFIG_PAX_KERNEXEC
14565+#define ta(X) (X)
14566+#else
14567+#define ta(X) ((X) - __PAGE_OFFSET)
14568+#endif
14569+
14570 /*
14571 * References to members of the new_cpu_data structure.
14572 */
14573@@ -54,11 +60,7 @@
14574 * and small than max_low_pfn, otherwise will waste some page table entries
14575 */
14576
14577-#if PTRS_PER_PMD > 1
14578-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
14579-#else
14580-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
14581-#endif
14582+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
14583
14584 /* Number of possible pages in the lowmem region */
14585 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
14586@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
14587 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
14588
14589 /*
14590+ * Real beginning of normal "text" segment
14591+ */
14592+ENTRY(stext)
14593+ENTRY(_stext)
14594+
14595+/*
14596 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
14597 * %esi points to the real-mode code as a 32-bit pointer.
14598 * CS and DS must be 4 GB flat segments, but we don't depend on
14599@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
14600 * can.
14601 */
14602 __HEAD
14603+
14604+#ifdef CONFIG_PAX_KERNEXEC
14605+ jmp startup_32
14606+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
14607+.fill PAGE_SIZE-5,1,0xcc
14608+#endif
14609+
14610 ENTRY(startup_32)
14611 movl pa(stack_start),%ecx
14612
14613@@ -105,6 +120,57 @@ ENTRY(startup_32)
14614 2:
14615 leal -__PAGE_OFFSET(%ecx),%esp
14616
14617+#ifdef CONFIG_SMP
14618+ movl $pa(cpu_gdt_table),%edi
14619+ movl $__per_cpu_load,%eax
14620+ movw %ax,__KERNEL_PERCPU + 2(%edi)
14621+ rorl $16,%eax
14622+ movb %al,__KERNEL_PERCPU + 4(%edi)
14623+ movb %ah,__KERNEL_PERCPU + 7(%edi)
14624+ movl $__per_cpu_end - 1,%eax
14625+ subl $__per_cpu_start,%eax
14626+ movw %ax,__KERNEL_PERCPU + 0(%edi)
14627+#endif
14628+
14629+#ifdef CONFIG_PAX_MEMORY_UDEREF
14630+ movl $NR_CPUS,%ecx
14631+ movl $pa(cpu_gdt_table),%edi
14632+1:
14633+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
14634+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
14635+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
14636+ addl $PAGE_SIZE_asm,%edi
14637+ loop 1b
14638+#endif
14639+
14640+#ifdef CONFIG_PAX_KERNEXEC
14641+ movl $pa(boot_gdt),%edi
14642+ movl $__LOAD_PHYSICAL_ADDR,%eax
14643+ movw %ax,__BOOT_CS + 2(%edi)
14644+ rorl $16,%eax
14645+ movb %al,__BOOT_CS + 4(%edi)
14646+ movb %ah,__BOOT_CS + 7(%edi)
14647+ rorl $16,%eax
14648+
14649+ ljmp $(__BOOT_CS),$1f
14650+1:
14651+
14652+ movl $NR_CPUS,%ecx
14653+ movl $pa(cpu_gdt_table),%edi
14654+ addl $__PAGE_OFFSET,%eax
14655+1:
14656+ movw %ax,__KERNEL_CS + 2(%edi)
14657+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
14658+ rorl $16,%eax
14659+ movb %al,__KERNEL_CS + 4(%edi)
14660+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
14661+ movb %ah,__KERNEL_CS + 7(%edi)
14662+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
14663+ rorl $16,%eax
14664+ addl $PAGE_SIZE_asm,%edi
14665+ loop 1b
14666+#endif
14667+
14668 /*
14669 * Clear BSS first so that there are no surprises...
14670 */
14671@@ -195,8 +261,11 @@ ENTRY(startup_32)
14672 movl %eax, pa(max_pfn_mapped)
14673
14674 /* Do early initialization of the fixmap area */
14675- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
14676- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
14677+#ifdef CONFIG_COMPAT_VDSO
14678+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
14679+#else
14680+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
14681+#endif
14682 #else /* Not PAE */
14683
14684 page_pde_offset = (__PAGE_OFFSET >> 20);
14685@@ -226,8 +295,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
14686 movl %eax, pa(max_pfn_mapped)
14687
14688 /* Do early initialization of the fixmap area */
14689- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
14690- movl %eax,pa(initial_page_table+0xffc)
14691+#ifdef CONFIG_COMPAT_VDSO
14692+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
14693+#else
14694+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
14695+#endif
14696 #endif
14697
14698 #ifdef CONFIG_PARAVIRT
14699@@ -241,9 +313,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
14700 cmpl $num_subarch_entries, %eax
14701 jae bad_subarch
14702
14703- movl pa(subarch_entries)(,%eax,4), %eax
14704- subl $__PAGE_OFFSET, %eax
14705- jmp *%eax
14706+ jmp *pa(subarch_entries)(,%eax,4)
14707
14708 bad_subarch:
14709 WEAK(lguest_entry)
14710@@ -255,10 +325,10 @@ WEAK(xen_entry)
14711 __INITDATA
14712
14713 subarch_entries:
14714- .long default_entry /* normal x86/PC */
14715- .long lguest_entry /* lguest hypervisor */
14716- .long xen_entry /* Xen hypervisor */
14717- .long default_entry /* Moorestown MID */
14718+ .long ta(default_entry) /* normal x86/PC */
14719+ .long ta(lguest_entry) /* lguest hypervisor */
14720+ .long ta(xen_entry) /* Xen hypervisor */
14721+ .long ta(default_entry) /* Moorestown MID */
14722 num_subarch_entries = (. - subarch_entries) / 4
14723 .previous
14724 #else
14725@@ -312,6 +382,7 @@ default_entry:
14726 orl %edx,%eax
14727 movl %eax,%cr4
14728
14729+#ifdef CONFIG_X86_PAE
14730 testb $X86_CR4_PAE, %al # check if PAE is enabled
14731 jz 6f
14732
14733@@ -340,6 +411,9 @@ default_entry:
14734 /* Make changes effective */
14735 wrmsr
14736
14737+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
14738+#endif
14739+
14740 6:
14741
14742 /*
14743@@ -443,7 +517,7 @@ is386: movl $2,%ecx # set MP
14744 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
14745 movl %eax,%ss # after changing gdt.
14746
14747- movl $(__USER_DS),%eax # DS/ES contains default USER segment
14748+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
14749 movl %eax,%ds
14750 movl %eax,%es
14751
14752@@ -457,15 +531,22 @@ is386: movl $2,%ecx # set MP
14753 */
14754 cmpb $0,ready
14755 jne 1f
14756- movl $gdt_page,%eax
14757+ movl $cpu_gdt_table,%eax
14758 movl $stack_canary,%ecx
14759+#ifdef CONFIG_SMP
14760+ addl $__per_cpu_load,%ecx
14761+#endif
14762 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
14763 shrl $16, %ecx
14764 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
14765 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
14766 1:
14767-#endif
14768 movl $(__KERNEL_STACK_CANARY),%eax
14769+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14770+ movl $(__USER_DS),%eax
14771+#else
14772+ xorl %eax,%eax
14773+#endif
14774 movl %eax,%gs
14775
14776 xorl %eax,%eax # Clear LDT
14777@@ -558,22 +639,22 @@ early_page_fault:
14778 jmp early_fault
14779
14780 early_fault:
14781- cld
14782 #ifdef CONFIG_PRINTK
14783+ cmpl $1,%ss:early_recursion_flag
14784+ je hlt_loop
14785+ incl %ss:early_recursion_flag
14786+ cld
14787 pusha
14788 movl $(__KERNEL_DS),%eax
14789 movl %eax,%ds
14790 movl %eax,%es
14791- cmpl $2,early_recursion_flag
14792- je hlt_loop
14793- incl early_recursion_flag
14794 movl %cr2,%eax
14795 pushl %eax
14796 pushl %edx /* trapno */
14797 pushl $fault_msg
14798 call printk
14799+; call dump_stack
14800 #endif
14801- call dump_stack
14802 hlt_loop:
14803 hlt
14804 jmp hlt_loop
14805@@ -581,8 +662,11 @@ hlt_loop:
14806 /* This is the default interrupt "handler" :-) */
14807 ALIGN
14808 ignore_int:
14809- cld
14810 #ifdef CONFIG_PRINTK
14811+ cmpl $2,%ss:early_recursion_flag
14812+ je hlt_loop
14813+ incl %ss:early_recursion_flag
14814+ cld
14815 pushl %eax
14816 pushl %ecx
14817 pushl %edx
14818@@ -591,9 +675,6 @@ ignore_int:
14819 movl $(__KERNEL_DS),%eax
14820 movl %eax,%ds
14821 movl %eax,%es
14822- cmpl $2,early_recursion_flag
14823- je hlt_loop
14824- incl early_recursion_flag
14825 pushl 16(%esp)
14826 pushl 24(%esp)
14827 pushl 32(%esp)
14828@@ -622,29 +703,43 @@ ENTRY(initial_code)
14829 /*
14830 * BSS section
14831 */
14832-__PAGE_ALIGNED_BSS
14833- .align PAGE_SIZE
14834 #ifdef CONFIG_X86_PAE
14835+.section .initial_pg_pmd,"a",@progbits
14836 initial_pg_pmd:
14837 .fill 1024*KPMDS,4,0
14838 #else
14839+.section .initial_page_table,"a",@progbits
14840 ENTRY(initial_page_table)
14841 .fill 1024,4,0
14842 #endif
14843+.section .initial_pg_fixmap,"a",@progbits
14844 initial_pg_fixmap:
14845 .fill 1024,4,0
14846+.section .empty_zero_page,"a",@progbits
14847 ENTRY(empty_zero_page)
14848 .fill 4096,1,0
14849+.section .swapper_pg_dir,"a",@progbits
14850 ENTRY(swapper_pg_dir)
14851+#ifdef CONFIG_X86_PAE
14852+ .fill 4,8,0
14853+#else
14854 .fill 1024,4,0
14855+#endif
14856+
14857+/*
14858+ * The IDT has to be page-aligned to simplify the Pentium
14859+ * F0 0F bug workaround.. We have a special link segment
14860+ * for this.
14861+ */
14862+.section .idt,"a",@progbits
14863+ENTRY(idt_table)
14864+ .fill 256,8,0
14865
14866 /*
14867 * This starts the data section.
14868 */
14869 #ifdef CONFIG_X86_PAE
14870-__PAGE_ALIGNED_DATA
14871- /* Page-aligned for the benefit of paravirt? */
14872- .align PAGE_SIZE
14873+.section .initial_page_table,"a",@progbits
14874 ENTRY(initial_page_table)
14875 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
14876 # if KPMDS == 3
14877@@ -663,18 +758,27 @@ ENTRY(initial_page_table)
14878 # error "Kernel PMDs should be 1, 2 or 3"
14879 # endif
14880 .align PAGE_SIZE /* needs to be page-sized too */
14881+
14882+#ifdef CONFIG_PAX_PER_CPU_PGD
14883+ENTRY(cpu_pgd)
14884+ .rept NR_CPUS
14885+ .fill 4,8,0
14886+ .endr
14887+#endif
14888+
14889 #endif
14890
14891 .data
14892 .balign 4
14893 ENTRY(stack_start)
14894- .long init_thread_union+THREAD_SIZE
14895+ .long init_thread_union+THREAD_SIZE-8
14896
14897+ready: .byte 0
14898+
14899+.section .rodata,"a",@progbits
14900 early_recursion_flag:
14901 .long 0
14902
14903-ready: .byte 0
14904-
14905 int_msg:
14906 .asciz "Unknown interrupt or fault at: %p %p %p\n"
14907
14908@@ -707,7 +811,7 @@ fault_msg:
14909 .word 0 # 32 bit align gdt_desc.address
14910 boot_gdt_descr:
14911 .word __BOOT_DS+7
14912- .long boot_gdt - __PAGE_OFFSET
14913+ .long pa(boot_gdt)
14914
14915 .word 0 # 32-bit align idt_desc.address
14916 idt_descr:
14917@@ -718,7 +822,7 @@ idt_descr:
14918 .word 0 # 32 bit align gdt_desc.address
14919 ENTRY(early_gdt_descr)
14920 .word GDT_ENTRIES*8-1
14921- .long gdt_page /* Overwritten for secondary CPUs */
14922+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
14923
14924 /*
14925 * The boot_gdt must mirror the equivalent in setup.S and is
14926@@ -727,5 +831,65 @@ ENTRY(early_gdt_descr)
14927 .align L1_CACHE_BYTES
14928 ENTRY(boot_gdt)
14929 .fill GDT_ENTRY_BOOT_CS,8,0
14930- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
14931- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
14932+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
14933+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
14934+
14935+ .align PAGE_SIZE_asm
14936+ENTRY(cpu_gdt_table)
14937+ .rept NR_CPUS
14938+ .quad 0x0000000000000000 /* NULL descriptor */
14939+ .quad 0x0000000000000000 /* 0x0b reserved */
14940+ .quad 0x0000000000000000 /* 0x13 reserved */
14941+ .quad 0x0000000000000000 /* 0x1b reserved */
14942+
14943+#ifdef CONFIG_PAX_KERNEXEC
14944+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
14945+#else
14946+ .quad 0x0000000000000000 /* 0x20 unused */
14947+#endif
14948+
14949+ .quad 0x0000000000000000 /* 0x28 unused */
14950+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
14951+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
14952+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
14953+ .quad 0x0000000000000000 /* 0x4b reserved */
14954+ .quad 0x0000000000000000 /* 0x53 reserved */
14955+ .quad 0x0000000000000000 /* 0x5b reserved */
14956+
14957+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
14958+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
14959+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
14960+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
14961+
14962+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
14963+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
14964+
14965+ /*
14966+ * Segments used for calling PnP BIOS have byte granularity.
14967+ * The code segments and data segments have fixed 64k limits,
14968+ * the transfer segment sizes are set at run time.
14969+ */
14970+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
14971+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
14972+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
14973+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
14974+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
14975+
14976+ /*
14977+ * The APM segments have byte granularity and their bases
14978+ * are set at run time. All have 64k limits.
14979+ */
14980+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
14981+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
14982+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
14983+
14984+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
14985+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
14986+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
14987+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
14988+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
14989+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
14990+
14991+ /* Be sure this is zeroed to avoid false validations in Xen */
14992+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
14993+ .endr
14994diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
14995index e11e394..9aebc5d 100644
14996--- a/arch/x86/kernel/head_64.S
14997+++ b/arch/x86/kernel/head_64.S
14998@@ -19,6 +19,8 @@
14999 #include <asm/cache.h>
15000 #include <asm/processor-flags.h>
15001 #include <asm/percpu.h>
15002+#include <asm/cpufeature.h>
15003+#include <asm/alternative-asm.h>
15004
15005 #ifdef CONFIG_PARAVIRT
15006 #include <asm/asm-offsets.h>
15007@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
15008 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
15009 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
15010 L3_START_KERNEL = pud_index(__START_KERNEL_map)
15011+L4_VMALLOC_START = pgd_index(VMALLOC_START)
15012+L3_VMALLOC_START = pud_index(VMALLOC_START)
15013+L4_VMALLOC_END = pgd_index(VMALLOC_END)
15014+L3_VMALLOC_END = pud_index(VMALLOC_END)
15015+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
15016+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
15017
15018 .text
15019 __HEAD
15020@@ -85,35 +93,23 @@ startup_64:
15021 */
15022 addq %rbp, init_level4_pgt + 0(%rip)
15023 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
15024+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
15025+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
15026+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
15027 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
15028
15029 addq %rbp, level3_ident_pgt + 0(%rip)
15030+#ifndef CONFIG_XEN
15031+ addq %rbp, level3_ident_pgt + 8(%rip)
15032+#endif
15033
15034- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
15035- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
15036+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
15037+
15038+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
15039+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
15040
15041 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
15042-
15043- /* Add an Identity mapping if I am above 1G */
15044- leaq _text(%rip), %rdi
15045- andq $PMD_PAGE_MASK, %rdi
15046-
15047- movq %rdi, %rax
15048- shrq $PUD_SHIFT, %rax
15049- andq $(PTRS_PER_PUD - 1), %rax
15050- jz ident_complete
15051-
15052- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
15053- leaq level3_ident_pgt(%rip), %rbx
15054- movq %rdx, 0(%rbx, %rax, 8)
15055-
15056- movq %rdi, %rax
15057- shrq $PMD_SHIFT, %rax
15058- andq $(PTRS_PER_PMD - 1), %rax
15059- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
15060- leaq level2_spare_pgt(%rip), %rbx
15061- movq %rdx, 0(%rbx, %rax, 8)
15062-ident_complete:
15063+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
15064
15065 /*
15066 * Fixup the kernel text+data virtual addresses. Note that
15067@@ -160,8 +156,8 @@ ENTRY(secondary_startup_64)
15068 * after the boot processor executes this code.
15069 */
15070
15071- /* Enable PAE mode and PGE */
15072- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
15073+ /* Enable PAE mode and PSE/PGE */
15074+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
15075 movq %rax, %cr4
15076
15077 /* Setup early boot stage 4 level pagetables. */
15078@@ -183,9 +179,17 @@ ENTRY(secondary_startup_64)
15079 movl $MSR_EFER, %ecx
15080 rdmsr
15081 btsl $_EFER_SCE, %eax /* Enable System Call */
15082- btl $20,%edi /* No Execute supported? */
15083+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
15084 jnc 1f
15085 btsl $_EFER_NX, %eax
15086+ leaq init_level4_pgt(%rip), %rdi
15087+#ifndef CONFIG_EFI
15088+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
15089+#endif
15090+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
15091+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
15092+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
15093+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
15094 1: wrmsr /* Make changes effective */
15095
15096 /* Setup cr0 */
15097@@ -247,6 +251,7 @@ ENTRY(secondary_startup_64)
15098 * jump. In addition we need to ensure %cs is set so we make this
15099 * a far return.
15100 */
15101+ pax_set_fptr_mask
15102 movq initial_code(%rip),%rax
15103 pushq $0 # fake return address to stop unwinder
15104 pushq $__KERNEL_CS # set correct cs
15105@@ -269,7 +274,7 @@ ENTRY(secondary_startup_64)
15106 bad_address:
15107 jmp bad_address
15108
15109- .section ".init.text","ax"
15110+ __INIT
15111 #ifdef CONFIG_EARLY_PRINTK
15112 .globl early_idt_handlers
15113 early_idt_handlers:
15114@@ -314,18 +319,23 @@ ENTRY(early_idt_handler)
15115 #endif /* EARLY_PRINTK */
15116 1: hlt
15117 jmp 1b
15118+ .previous
15119
15120 #ifdef CONFIG_EARLY_PRINTK
15121+ __INITDATA
15122 early_recursion_flag:
15123 .long 0
15124+ .previous
15125
15126+ .section .rodata,"a",@progbits
15127 early_idt_msg:
15128 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
15129 early_idt_ripmsg:
15130 .asciz "RIP %s\n"
15131+ .previous
15132 #endif /* CONFIG_EARLY_PRINTK */
15133- .previous
15134
15135+ .section .rodata,"a",@progbits
15136 #define NEXT_PAGE(name) \
15137 .balign PAGE_SIZE; \
15138 ENTRY(name)
15139@@ -338,7 +348,6 @@ ENTRY(name)
15140 i = i + 1 ; \
15141 .endr
15142
15143- .data
15144 /*
15145 * This default setting generates an ident mapping at address 0x100000
15146 * and a mapping for the kernel that precisely maps virtual address
15147@@ -349,13 +358,41 @@ NEXT_PAGE(init_level4_pgt)
15148 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15149 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
15150 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15151+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
15152+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
15153+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
15154+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
15155+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
15156+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
15157 .org init_level4_pgt + L4_START_KERNEL*8, 0
15158 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
15159 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
15160
15161+#ifdef CONFIG_PAX_PER_CPU_PGD
15162+NEXT_PAGE(cpu_pgd)
15163+ .rept NR_CPUS
15164+ .fill 512,8,0
15165+ .endr
15166+#endif
15167+
15168 NEXT_PAGE(level3_ident_pgt)
15169 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
15170+#ifdef CONFIG_XEN
15171 .fill 511,8,0
15172+#else
15173+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
15174+ .fill 510,8,0
15175+#endif
15176+
15177+NEXT_PAGE(level3_vmalloc_start_pgt)
15178+ .fill 512,8,0
15179+
15180+NEXT_PAGE(level3_vmalloc_end_pgt)
15181+ .fill 512,8,0
15182+
15183+NEXT_PAGE(level3_vmemmap_pgt)
15184+ .fill L3_VMEMMAP_START,8,0
15185+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
15186
15187 NEXT_PAGE(level3_kernel_pgt)
15188 .fill L3_START_KERNEL,8,0
15189@@ -363,20 +400,23 @@ NEXT_PAGE(level3_kernel_pgt)
15190 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
15191 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
15192
15193+NEXT_PAGE(level2_vmemmap_pgt)
15194+ .fill 512,8,0
15195+
15196 NEXT_PAGE(level2_fixmap_pgt)
15197- .fill 506,8,0
15198- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
15199- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
15200- .fill 5,8,0
15201+ .fill 507,8,0
15202+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
15203+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
15204+ .fill 4,8,0
15205
15206-NEXT_PAGE(level1_fixmap_pgt)
15207+NEXT_PAGE(level1_vsyscall_pgt)
15208 .fill 512,8,0
15209
15210-NEXT_PAGE(level2_ident_pgt)
15211- /* Since I easily can, map the first 1G.
15212+ /* Since I easily can, map the first 2G.
15213 * Don't set NX because code runs from these pages.
15214 */
15215- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
15216+NEXT_PAGE(level2_ident_pgt)
15217+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
15218
15219 NEXT_PAGE(level2_kernel_pgt)
15220 /*
15221@@ -389,33 +429,55 @@ NEXT_PAGE(level2_kernel_pgt)
15222 * If you want to increase this then increase MODULES_VADDR
15223 * too.)
15224 */
15225- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
15226- KERNEL_IMAGE_SIZE/PMD_SIZE)
15227-
15228-NEXT_PAGE(level2_spare_pgt)
15229- .fill 512, 8, 0
15230+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
15231
15232 #undef PMDS
15233 #undef NEXT_PAGE
15234
15235- .data
15236+ .align PAGE_SIZE
15237+ENTRY(cpu_gdt_table)
15238+ .rept NR_CPUS
15239+ .quad 0x0000000000000000 /* NULL descriptor */
15240+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
15241+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
15242+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
15243+ .quad 0x00cffb000000ffff /* __USER32_CS */
15244+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
15245+ .quad 0x00affb000000ffff /* __USER_CS */
15246+
15247+#ifdef CONFIG_PAX_KERNEXEC
15248+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
15249+#else
15250+ .quad 0x0 /* unused */
15251+#endif
15252+
15253+ .quad 0,0 /* TSS */
15254+ .quad 0,0 /* LDT */
15255+ .quad 0,0,0 /* three TLS descriptors */
15256+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
15257+ /* asm/segment.h:GDT_ENTRIES must match this */
15258+
15259+ /* zero the remaining page */
15260+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
15261+ .endr
15262+
15263 .align 16
15264 .globl early_gdt_descr
15265 early_gdt_descr:
15266 .word GDT_ENTRIES*8-1
15267 early_gdt_descr_base:
15268- .quad INIT_PER_CPU_VAR(gdt_page)
15269+ .quad cpu_gdt_table
15270
15271 ENTRY(phys_base)
15272 /* This must match the first entry in level2_kernel_pgt */
15273 .quad 0x0000000000000000
15274
15275 #include "../../x86/xen/xen-head.S"
15276-
15277- .section .bss, "aw", @nobits
15278+
15279+ .section .rodata,"a",@progbits
15280 .align L1_CACHE_BYTES
15281 ENTRY(idt_table)
15282- .skip IDT_ENTRIES * 16
15283+ .fill 512,8,0
15284
15285 __PAGE_ALIGNED_BSS
15286 .align PAGE_SIZE
15287diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
15288index 9c3bd4a..e1d9b35 100644
15289--- a/arch/x86/kernel/i386_ksyms_32.c
15290+++ b/arch/x86/kernel/i386_ksyms_32.c
15291@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
15292 EXPORT_SYMBOL(cmpxchg8b_emu);
15293 #endif
15294
15295+EXPORT_SYMBOL_GPL(cpu_gdt_table);
15296+
15297 /* Networking helper routines. */
15298 EXPORT_SYMBOL(csum_partial_copy_generic);
15299+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
15300+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
15301
15302 EXPORT_SYMBOL(__get_user_1);
15303 EXPORT_SYMBOL(__get_user_2);
15304@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
15305
15306 EXPORT_SYMBOL(csum_partial);
15307 EXPORT_SYMBOL(empty_zero_page);
15308+
15309+#ifdef CONFIG_PAX_KERNEXEC
15310+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
15311+#endif
15312diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
15313index 6104852..6114160 100644
15314--- a/arch/x86/kernel/i8259.c
15315+++ b/arch/x86/kernel/i8259.c
15316@@ -210,7 +210,7 @@ spurious_8259A_irq:
15317 "spurious 8259A interrupt: IRQ%d.\n", irq);
15318 spurious_irq_mask |= irqmask;
15319 }
15320- atomic_inc(&irq_err_count);
15321+ atomic_inc_unchecked(&irq_err_count);
15322 /*
15323 * Theoretically we do not have to handle this IRQ,
15324 * but in Linux this does not cause problems and is
15325diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
15326index 43e9ccf..44ccf6f 100644
15327--- a/arch/x86/kernel/init_task.c
15328+++ b/arch/x86/kernel/init_task.c
15329@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
15330 * way process stacks are handled. This is done by having a special
15331 * "init_task" linker map entry..
15332 */
15333-union thread_union init_thread_union __init_task_data =
15334- { INIT_THREAD_INFO(init_task) };
15335+union thread_union init_thread_union __init_task_data;
15336
15337 /*
15338 * Initial task structure.
15339@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
15340 * section. Since TSS's are completely CPU-local, we want them
15341 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
15342 */
15343-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
15344-
15345+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
15346+EXPORT_SYMBOL(init_tss);
15347diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
15348index 8c96897..be66bfa 100644
15349--- a/arch/x86/kernel/ioport.c
15350+++ b/arch/x86/kernel/ioport.c
15351@@ -6,6 +6,7 @@
15352 #include <linux/sched.h>
15353 #include <linux/kernel.h>
15354 #include <linux/capability.h>
15355+#include <linux/security.h>
15356 #include <linux/errno.h>
15357 #include <linux/types.h>
15358 #include <linux/ioport.h>
15359@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
15360
15361 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
15362 return -EINVAL;
15363+#ifdef CONFIG_GRKERNSEC_IO
15364+ if (turn_on && grsec_disable_privio) {
15365+ gr_handle_ioperm();
15366+ return -EPERM;
15367+ }
15368+#endif
15369 if (turn_on && !capable(CAP_SYS_RAWIO))
15370 return -EPERM;
15371
15372@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
15373 * because the ->io_bitmap_max value must match the bitmap
15374 * contents:
15375 */
15376- tss = &per_cpu(init_tss, get_cpu());
15377+ tss = init_tss + get_cpu();
15378
15379 if (turn_on)
15380 bitmap_clear(t->io_bitmap_ptr, from, num);
15381@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
15382 return -EINVAL;
15383 /* Trying to gain more privileges? */
15384 if (level > old) {
15385+#ifdef CONFIG_GRKERNSEC_IO
15386+ if (grsec_disable_privio) {
15387+ gr_handle_iopl();
15388+ return -EPERM;
15389+ }
15390+#endif
15391 if (!capable(CAP_SYS_RAWIO))
15392 return -EPERM;
15393 }
15394diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
15395index 429e0c9..17b3ece 100644
15396--- a/arch/x86/kernel/irq.c
15397+++ b/arch/x86/kernel/irq.c
15398@@ -18,7 +18,7 @@
15399 #include <asm/mce.h>
15400 #include <asm/hw_irq.h>
15401
15402-atomic_t irq_err_count;
15403+atomic_unchecked_t irq_err_count;
15404
15405 /* Function pointer for generic interrupt vector handling */
15406 void (*x86_platform_ipi_callback)(void) = NULL;
15407@@ -117,9 +117,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
15408 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
15409 seq_printf(p, " Machine check polls\n");
15410 #endif
15411- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
15412+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
15413 #if defined(CONFIG_X86_IO_APIC)
15414- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
15415+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
15416 #endif
15417 return 0;
15418 }
15419@@ -159,10 +159,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
15420
15421 u64 arch_irq_stat(void)
15422 {
15423- u64 sum = atomic_read(&irq_err_count);
15424+ u64 sum = atomic_read_unchecked(&irq_err_count);
15425
15426 #ifdef CONFIG_X86_IO_APIC
15427- sum += atomic_read(&irq_mis_count);
15428+ sum += atomic_read_unchecked(&irq_mis_count);
15429 #endif
15430 return sum;
15431 }
15432diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
15433index 7209070..cbcd71a 100644
15434--- a/arch/x86/kernel/irq_32.c
15435+++ b/arch/x86/kernel/irq_32.c
15436@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
15437 __asm__ __volatile__("andl %%esp,%0" :
15438 "=r" (sp) : "0" (THREAD_SIZE - 1));
15439
15440- return sp < (sizeof(struct thread_info) + STACK_WARN);
15441+ return sp < STACK_WARN;
15442 }
15443
15444 static void print_stack_overflow(void)
15445@@ -54,8 +54,8 @@ static inline void print_stack_overflow(void) { }
15446 * per-CPU IRQ handling contexts (thread information and stack)
15447 */
15448 union irq_ctx {
15449- struct thread_info tinfo;
15450- u32 stack[THREAD_SIZE/sizeof(u32)];
15451+ unsigned long previous_esp;
15452+ u32 stack[THREAD_SIZE/sizeof(u32)];
15453 } __attribute__((aligned(THREAD_SIZE)));
15454
15455 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
15456@@ -75,10 +75,9 @@ static void call_on_stack(void *func, void *stack)
15457 static inline int
15458 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15459 {
15460- union irq_ctx *curctx, *irqctx;
15461+ union irq_ctx *irqctx;
15462 u32 *isp, arg1, arg2;
15463
15464- curctx = (union irq_ctx *) current_thread_info();
15465 irqctx = __this_cpu_read(hardirq_ctx);
15466
15467 /*
15468@@ -87,21 +86,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15469 * handler) we can't do that and just have to keep using the
15470 * current stack (which is the irq stack already after all)
15471 */
15472- if (unlikely(curctx == irqctx))
15473+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
15474 return 0;
15475
15476 /* build the stack frame on the IRQ stack */
15477- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
15478- irqctx->tinfo.task = curctx->tinfo.task;
15479- irqctx->tinfo.previous_esp = current_stack_pointer;
15480+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
15481+ irqctx->previous_esp = current_stack_pointer;
15482
15483- /*
15484- * Copy the softirq bits in preempt_count so that the
15485- * softirq checks work in the hardirq context.
15486- */
15487- irqctx->tinfo.preempt_count =
15488- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
15489- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
15490+#ifdef CONFIG_PAX_MEMORY_UDEREF
15491+ __set_fs(MAKE_MM_SEG(0));
15492+#endif
15493
15494 if (unlikely(overflow))
15495 call_on_stack(print_stack_overflow, isp);
15496@@ -113,6 +107,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15497 : "0" (irq), "1" (desc), "2" (isp),
15498 "D" (desc->handle_irq)
15499 : "memory", "cc", "ecx");
15500+
15501+#ifdef CONFIG_PAX_MEMORY_UDEREF
15502+ __set_fs(current_thread_info()->addr_limit);
15503+#endif
15504+
15505 return 1;
15506 }
15507
15508@@ -121,29 +120,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
15509 */
15510 void __cpuinit irq_ctx_init(int cpu)
15511 {
15512- union irq_ctx *irqctx;
15513-
15514 if (per_cpu(hardirq_ctx, cpu))
15515 return;
15516
15517- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
15518- THREAD_FLAGS,
15519- THREAD_ORDER));
15520- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
15521- irqctx->tinfo.cpu = cpu;
15522- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
15523- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
15524-
15525- per_cpu(hardirq_ctx, cpu) = irqctx;
15526-
15527- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
15528- THREAD_FLAGS,
15529- THREAD_ORDER));
15530- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
15531- irqctx->tinfo.cpu = cpu;
15532- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
15533-
15534- per_cpu(softirq_ctx, cpu) = irqctx;
15535+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
15536+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
15537
15538 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
15539 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
15540@@ -152,7 +133,6 @@ void __cpuinit irq_ctx_init(int cpu)
15541 asmlinkage void do_softirq(void)
15542 {
15543 unsigned long flags;
15544- struct thread_info *curctx;
15545 union irq_ctx *irqctx;
15546 u32 *isp;
15547
15548@@ -162,15 +142,22 @@ asmlinkage void do_softirq(void)
15549 local_irq_save(flags);
15550
15551 if (local_softirq_pending()) {
15552- curctx = current_thread_info();
15553 irqctx = __this_cpu_read(softirq_ctx);
15554- irqctx->tinfo.task = curctx->task;
15555- irqctx->tinfo.previous_esp = current_stack_pointer;
15556+ irqctx->previous_esp = current_stack_pointer;
15557
15558 /* build the stack frame on the softirq stack */
15559- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
15560+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
15561+
15562+#ifdef CONFIG_PAX_MEMORY_UDEREF
15563+ __set_fs(MAKE_MM_SEG(0));
15564+#endif
15565
15566 call_on_stack(__do_softirq, isp);
15567+
15568+#ifdef CONFIG_PAX_MEMORY_UDEREF
15569+ __set_fs(current_thread_info()->addr_limit);
15570+#endif
15571+
15572 /*
15573 * Shouldn't happen, we returned above if in_interrupt():
15574 */
15575diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
15576index 69bca46..0bac999 100644
15577--- a/arch/x86/kernel/irq_64.c
15578+++ b/arch/x86/kernel/irq_64.c
15579@@ -38,7 +38,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
15580 #ifdef CONFIG_DEBUG_STACKOVERFLOW
15581 u64 curbase = (u64)task_stack_page(current);
15582
15583- if (user_mode_vm(regs))
15584+ if (user_mode(regs))
15585 return;
15586
15587 WARN_ONCE(regs->sp >= curbase &&
15588diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
15589index faba577..93b9e71 100644
15590--- a/arch/x86/kernel/kgdb.c
15591+++ b/arch/x86/kernel/kgdb.c
15592@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
15593 #ifdef CONFIG_X86_32
15594 switch (regno) {
15595 case GDB_SS:
15596- if (!user_mode_vm(regs))
15597+ if (!user_mode(regs))
15598 *(unsigned long *)mem = __KERNEL_DS;
15599 break;
15600 case GDB_SP:
15601- if (!user_mode_vm(regs))
15602+ if (!user_mode(regs))
15603 *(unsigned long *)mem = kernel_stack_pointer(regs);
15604 break;
15605 case GDB_GS:
15606@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
15607 case 'k':
15608 /* clear the trace bit */
15609 linux_regs->flags &= ~X86_EFLAGS_TF;
15610- atomic_set(&kgdb_cpu_doing_single_step, -1);
15611+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
15612
15613 /* set the trace bit if we're stepping */
15614 if (remcomInBuffer[0] == 's') {
15615 linux_regs->flags |= X86_EFLAGS_TF;
15616- atomic_set(&kgdb_cpu_doing_single_step,
15617+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
15618 raw_smp_processor_id());
15619 }
15620
15621@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
15622
15623 switch (cmd) {
15624 case DIE_DEBUG:
15625- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
15626+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
15627 if (user_mode(regs))
15628 return single_step_cont(regs, args);
15629 break;
15630diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
15631index 7da647d..5d3c4c1 100644
15632--- a/arch/x86/kernel/kprobes.c
15633+++ b/arch/x86/kernel/kprobes.c
15634@@ -118,8 +118,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
15635 } __attribute__((packed)) *insn;
15636
15637 insn = (struct __arch_relative_insn *)from;
15638+
15639+ pax_open_kernel();
15640 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
15641 insn->op = op;
15642+ pax_close_kernel();
15643 }
15644
15645 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
15646@@ -156,7 +159,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
15647 kprobe_opcode_t opcode;
15648 kprobe_opcode_t *orig_opcodes = opcodes;
15649
15650- if (search_exception_tables((unsigned long)opcodes))
15651+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
15652 return 0; /* Page fault may occur on this address. */
15653
15654 retry:
15655@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
15656 }
15657 }
15658 insn_get_length(&insn);
15659+ pax_open_kernel();
15660 memcpy(dest, insn.kaddr, insn.length);
15661+ pax_close_kernel();
15662
15663 #ifdef CONFIG_X86_64
15664 if (insn_rip_relative(&insn)) {
15665@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
15666 (u8 *) dest;
15667 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
15668 disp = (u8 *) dest + insn_offset_displacement(&insn);
15669+ pax_open_kernel();
15670 *(s32 *) disp = (s32) newdisp;
15671+ pax_close_kernel();
15672 }
15673 #endif
15674 return insn.length;
15675@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
15676 */
15677 __copy_instruction(p->ainsn.insn, p->addr, 0);
15678
15679- if (can_boost(p->addr))
15680+ if (can_boost(ktla_ktva(p->addr)))
15681 p->ainsn.boostable = 0;
15682 else
15683 p->ainsn.boostable = -1;
15684
15685- p->opcode = *p->addr;
15686+ p->opcode = *(ktla_ktva(p->addr));
15687 }
15688
15689 int __kprobes arch_prepare_kprobe(struct kprobe *p)
15690@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
15691 * nor set current_kprobe, because it doesn't use single
15692 * stepping.
15693 */
15694- regs->ip = (unsigned long)p->ainsn.insn;
15695+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
15696 preempt_enable_no_resched();
15697 return;
15698 }
15699@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
15700 if (p->opcode == BREAKPOINT_INSTRUCTION)
15701 regs->ip = (unsigned long)p->addr;
15702 else
15703- regs->ip = (unsigned long)p->ainsn.insn;
15704+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
15705 }
15706
15707 /*
15708@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
15709 setup_singlestep(p, regs, kcb, 0);
15710 return 1;
15711 }
15712- } else if (*addr != BREAKPOINT_INSTRUCTION) {
15713+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
15714 /*
15715 * The breakpoint instruction was removed right
15716 * after we hit it. Another cpu has removed
15717@@ -683,6 +690,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
15718 " movq %rax, 152(%rsp)\n"
15719 RESTORE_REGS_STRING
15720 " popfq\n"
15721+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
15722+ " btsq $63,(%rsp)\n"
15723+#endif
15724 #else
15725 " pushf\n"
15726 SAVE_REGS_STRING
15727@@ -820,7 +830,7 @@ static void __kprobes resume_execution(struct kprobe *p,
15728 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
15729 {
15730 unsigned long *tos = stack_addr(regs);
15731- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
15732+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
15733 unsigned long orig_ip = (unsigned long)p->addr;
15734 kprobe_opcode_t *insn = p->ainsn.insn;
15735
15736@@ -1002,7 +1012,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
15737 struct die_args *args = data;
15738 int ret = NOTIFY_DONE;
15739
15740- if (args->regs && user_mode_vm(args->regs))
15741+ if (args->regs && user_mode(args->regs))
15742 return ret;
15743
15744 switch (val) {
15745@@ -1384,7 +1394,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
15746 * Verify if the address gap is in 2GB range, because this uses
15747 * a relative jump.
15748 */
15749- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
15750+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
15751 if (abs(rel) > 0x7fffffff)
15752 return -ERANGE;
15753
15754@@ -1405,11 +1415,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
15755 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
15756
15757 /* Set probe function call */
15758- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
15759+ synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
15760
15761 /* Set returning jmp instruction at the tail of out-of-line buffer */
15762 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
15763- (u8 *)op->kp.addr + op->optinsn.size);
15764+ (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
15765
15766 flush_icache_range((unsigned long) buf,
15767 (unsigned long) buf + TMPL_END_IDX +
15768@@ -1431,7 +1441,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
15769 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
15770
15771 /* Backup instructions which will be replaced by jump address */
15772- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
15773+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
15774 RELATIVE_ADDR_SIZE);
15775
15776 insn_buf[0] = RELATIVEJUMP_OPCODE;
15777diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
15778index a9c2116..a52d4fc 100644
15779--- a/arch/x86/kernel/kvm.c
15780+++ b/arch/x86/kernel/kvm.c
15781@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(void)
15782 pv_mmu_ops.set_pud = kvm_set_pud;
15783 #if PAGETABLE_LEVELS == 4
15784 pv_mmu_ops.set_pgd = kvm_set_pgd;
15785+ pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
15786 #endif
15787 #endif
15788 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
15789diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
15790index ea69726..604d066 100644
15791--- a/arch/x86/kernel/ldt.c
15792+++ b/arch/x86/kernel/ldt.c
15793@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
15794 if (reload) {
15795 #ifdef CONFIG_SMP
15796 preempt_disable();
15797- load_LDT(pc);
15798+ load_LDT_nolock(pc);
15799 if (!cpumask_equal(mm_cpumask(current->mm),
15800 cpumask_of(smp_processor_id())))
15801 smp_call_function(flush_ldt, current->mm, 1);
15802 preempt_enable();
15803 #else
15804- load_LDT(pc);
15805+ load_LDT_nolock(pc);
15806 #endif
15807 }
15808 if (oldsize) {
15809@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
15810 return err;
15811
15812 for (i = 0; i < old->size; i++)
15813- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
15814+ write_ldt_entry(new->ldt, i, old->ldt + i);
15815 return 0;
15816 }
15817
15818@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
15819 retval = copy_ldt(&mm->context, &old_mm->context);
15820 mutex_unlock(&old_mm->context.lock);
15821 }
15822+
15823+ if (tsk == current) {
15824+ mm->context.vdso = 0;
15825+
15826+#ifdef CONFIG_X86_32
15827+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
15828+ mm->context.user_cs_base = 0UL;
15829+ mm->context.user_cs_limit = ~0UL;
15830+
15831+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
15832+ cpus_clear(mm->context.cpu_user_cs_mask);
15833+#endif
15834+
15835+#endif
15836+#endif
15837+
15838+ }
15839+
15840 return retval;
15841 }
15842
15843@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
15844 }
15845 }
15846
15847+#ifdef CONFIG_PAX_SEGMEXEC
15848+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
15849+ error = -EINVAL;
15850+ goto out_unlock;
15851+ }
15852+#endif
15853+
15854 fill_ldt(&ldt, &ldt_info);
15855 if (oldmode)
15856 ldt.avl = 0;
15857diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
15858index a3fa43b..8966f4c 100644
15859--- a/arch/x86/kernel/machine_kexec_32.c
15860+++ b/arch/x86/kernel/machine_kexec_32.c
15861@@ -27,7 +27,7 @@
15862 #include <asm/cacheflush.h>
15863 #include <asm/debugreg.h>
15864
15865-static void set_idt(void *newidt, __u16 limit)
15866+static void set_idt(struct desc_struct *newidt, __u16 limit)
15867 {
15868 struct desc_ptr curidt;
15869
15870@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
15871 }
15872
15873
15874-static void set_gdt(void *newgdt, __u16 limit)
15875+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
15876 {
15877 struct desc_ptr curgdt;
15878
15879@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
15880 }
15881
15882 control_page = page_address(image->control_code_page);
15883- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
15884+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
15885
15886 relocate_kernel_ptr = control_page;
15887 page_list[PA_CONTROL_PAGE] = __pa(control_page);
15888diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
15889index 3ca42d0..7cff8cc 100644
15890--- a/arch/x86/kernel/microcode_intel.c
15891+++ b/arch/x86/kernel/microcode_intel.c
15892@@ -436,13 +436,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
15893
15894 static int get_ucode_user(void *to, const void *from, size_t n)
15895 {
15896- return copy_from_user(to, from, n);
15897+ return copy_from_user(to, (const void __force_user *)from, n);
15898 }
15899
15900 static enum ucode_state
15901 request_microcode_user(int cpu, const void __user *buf, size_t size)
15902 {
15903- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
15904+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
15905 }
15906
15907 static void microcode_fini_cpu(int cpu)
15908diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
15909index 925179f..267ac7a 100644
15910--- a/arch/x86/kernel/module.c
15911+++ b/arch/x86/kernel/module.c
15912@@ -36,15 +36,60 @@
15913 #define DEBUGP(fmt...)
15914 #endif
15915
15916-void *module_alloc(unsigned long size)
15917+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
15918 {
15919- if (PAGE_ALIGN(size) > MODULES_LEN)
15920+ if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
15921 return NULL;
15922 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
15923- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
15924+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
15925 -1, __builtin_return_address(0));
15926 }
15927
15928+void *module_alloc(unsigned long size)
15929+{
15930+
15931+#ifdef CONFIG_PAX_KERNEXEC
15932+ return __module_alloc(size, PAGE_KERNEL);
15933+#else
15934+ return __module_alloc(size, PAGE_KERNEL_EXEC);
15935+#endif
15936+
15937+}
15938+
15939+#ifdef CONFIG_PAX_KERNEXEC
15940+#ifdef CONFIG_X86_32
15941+void *module_alloc_exec(unsigned long size)
15942+{
15943+ struct vm_struct *area;
15944+
15945+ if (size == 0)
15946+ return NULL;
15947+
15948+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
15949+ return area ? area->addr : NULL;
15950+}
15951+EXPORT_SYMBOL(module_alloc_exec);
15952+
15953+void module_free_exec(struct module *mod, void *module_region)
15954+{
15955+ vunmap(module_region);
15956+}
15957+EXPORT_SYMBOL(module_free_exec);
15958+#else
15959+void module_free_exec(struct module *mod, void *module_region)
15960+{
15961+ module_free(mod, module_region);
15962+}
15963+EXPORT_SYMBOL(module_free_exec);
15964+
15965+void *module_alloc_exec(unsigned long size)
15966+{
15967+ return __module_alloc(size, PAGE_KERNEL_RX);
15968+}
15969+EXPORT_SYMBOL(module_alloc_exec);
15970+#endif
15971+#endif
15972+
15973 #ifdef CONFIG_X86_32
15974 int apply_relocate(Elf32_Shdr *sechdrs,
15975 const char *strtab,
15976@@ -55,14 +100,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
15977 unsigned int i;
15978 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
15979 Elf32_Sym *sym;
15980- uint32_t *location;
15981+ uint32_t *plocation, location;
15982
15983 DEBUGP("Applying relocate section %u to %u\n", relsec,
15984 sechdrs[relsec].sh_info);
15985 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
15986 /* This is where to make the change */
15987- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
15988- + rel[i].r_offset;
15989+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
15990+ location = (uint32_t)plocation;
15991+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
15992+ plocation = ktla_ktva((void *)plocation);
15993 /* This is the symbol it is referring to. Note that all
15994 undefined symbols have been resolved. */
15995 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
15996@@ -71,11 +118,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
15997 switch (ELF32_R_TYPE(rel[i].r_info)) {
15998 case R_386_32:
15999 /* We add the value into the location given */
16000- *location += sym->st_value;
16001+ pax_open_kernel();
16002+ *plocation += sym->st_value;
16003+ pax_close_kernel();
16004 break;
16005 case R_386_PC32:
16006 /* Add the value, subtract its postition */
16007- *location += sym->st_value - (uint32_t)location;
16008+ pax_open_kernel();
16009+ *plocation += sym->st_value - location;
16010+ pax_close_kernel();
16011 break;
16012 default:
16013 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
16014@@ -120,21 +171,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
16015 case R_X86_64_NONE:
16016 break;
16017 case R_X86_64_64:
16018+ pax_open_kernel();
16019 *(u64 *)loc = val;
16020+ pax_close_kernel();
16021 break;
16022 case R_X86_64_32:
16023+ pax_open_kernel();
16024 *(u32 *)loc = val;
16025+ pax_close_kernel();
16026 if (val != *(u32 *)loc)
16027 goto overflow;
16028 break;
16029 case R_X86_64_32S:
16030+ pax_open_kernel();
16031 *(s32 *)loc = val;
16032+ pax_close_kernel();
16033 if ((s64)val != *(s32 *)loc)
16034 goto overflow;
16035 break;
16036 case R_X86_64_PC32:
16037 val -= (u64)loc;
16038+ pax_open_kernel();
16039 *(u32 *)loc = val;
16040+ pax_close_kernel();
16041+
16042 #if 0
16043 if ((s64)val != *(s32 *)loc)
16044 goto overflow;
16045diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
16046index e88f37b..1353db6 100644
16047--- a/arch/x86/kernel/nmi.c
16048+++ b/arch/x86/kernel/nmi.c
16049@@ -408,6 +408,17 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
16050 dotraplinkage notrace __kprobes void
16051 do_nmi(struct pt_regs *regs, long error_code)
16052 {
16053+
16054+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
16055+ if (!user_mode(regs)) {
16056+ unsigned long cs = regs->cs & 0xFFFF;
16057+ unsigned long ip = ktva_ktla(regs->ip);
16058+
16059+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
16060+ regs->ip = ip;
16061+ }
16062+#endif
16063+
16064 nmi_enter();
16065
16066 inc_irq_stat(__nmi_count);
16067diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
16068index 676b8c7..870ba04 100644
16069--- a/arch/x86/kernel/paravirt-spinlocks.c
16070+++ b/arch/x86/kernel/paravirt-spinlocks.c
16071@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
16072 arch_spin_lock(lock);
16073 }
16074
16075-struct pv_lock_ops pv_lock_ops = {
16076+struct pv_lock_ops pv_lock_ops __read_only = {
16077 #ifdef CONFIG_SMP
16078 .spin_is_locked = __ticket_spin_is_locked,
16079 .spin_is_contended = __ticket_spin_is_contended,
16080diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
16081index d90272e..6bb013b 100644
16082--- a/arch/x86/kernel/paravirt.c
16083+++ b/arch/x86/kernel/paravirt.c
16084@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
16085 {
16086 return x;
16087 }
16088+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
16089+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
16090+#endif
16091
16092 void __init default_banner(void)
16093 {
16094@@ -145,15 +148,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
16095 if (opfunc == NULL)
16096 /* If there's no function, patch it with a ud2a (BUG) */
16097 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
16098- else if (opfunc == _paravirt_nop)
16099+ else if (opfunc == (void *)_paravirt_nop)
16100 /* If the operation is a nop, then nop the callsite */
16101 ret = paravirt_patch_nop();
16102
16103 /* identity functions just return their single argument */
16104- else if (opfunc == _paravirt_ident_32)
16105+ else if (opfunc == (void *)_paravirt_ident_32)
16106 ret = paravirt_patch_ident_32(insnbuf, len);
16107- else if (opfunc == _paravirt_ident_64)
16108+ else if (opfunc == (void *)_paravirt_ident_64)
16109 ret = paravirt_patch_ident_64(insnbuf, len);
16110+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
16111+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
16112+ ret = paravirt_patch_ident_64(insnbuf, len);
16113+#endif
16114
16115 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
16116 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
16117@@ -178,7 +185,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
16118 if (insn_len > len || start == NULL)
16119 insn_len = len;
16120 else
16121- memcpy(insnbuf, start, insn_len);
16122+ memcpy(insnbuf, ktla_ktva(start), insn_len);
16123
16124 return insn_len;
16125 }
16126@@ -302,7 +309,7 @@ void arch_flush_lazy_mmu_mode(void)
16127 preempt_enable();
16128 }
16129
16130-struct pv_info pv_info = {
16131+struct pv_info pv_info __read_only = {
16132 .name = "bare hardware",
16133 .paravirt_enabled = 0,
16134 .kernel_rpl = 0,
16135@@ -313,16 +320,16 @@ struct pv_info pv_info = {
16136 #endif
16137 };
16138
16139-struct pv_init_ops pv_init_ops = {
16140+struct pv_init_ops pv_init_ops __read_only = {
16141 .patch = native_patch,
16142 };
16143
16144-struct pv_time_ops pv_time_ops = {
16145+struct pv_time_ops pv_time_ops __read_only = {
16146 .sched_clock = native_sched_clock,
16147 .steal_clock = native_steal_clock,
16148 };
16149
16150-struct pv_irq_ops pv_irq_ops = {
16151+struct pv_irq_ops pv_irq_ops __read_only = {
16152 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
16153 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
16154 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
16155@@ -334,7 +341,7 @@ struct pv_irq_ops pv_irq_ops = {
16156 #endif
16157 };
16158
16159-struct pv_cpu_ops pv_cpu_ops = {
16160+struct pv_cpu_ops pv_cpu_ops __read_only = {
16161 .cpuid = native_cpuid,
16162 .get_debugreg = native_get_debugreg,
16163 .set_debugreg = native_set_debugreg,
16164@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
16165 .end_context_switch = paravirt_nop,
16166 };
16167
16168-struct pv_apic_ops pv_apic_ops = {
16169+struct pv_apic_ops pv_apic_ops __read_only = {
16170 #ifdef CONFIG_X86_LOCAL_APIC
16171 .startup_ipi_hook = paravirt_nop,
16172 #endif
16173 };
16174
16175-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
16176+#ifdef CONFIG_X86_32
16177+#ifdef CONFIG_X86_PAE
16178+/* 64-bit pagetable entries */
16179+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
16180+#else
16181 /* 32-bit pagetable entries */
16182 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
16183+#endif
16184 #else
16185 /* 64-bit pagetable entries */
16186 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
16187 #endif
16188
16189-struct pv_mmu_ops pv_mmu_ops = {
16190+struct pv_mmu_ops pv_mmu_ops __read_only = {
16191
16192 .read_cr2 = native_read_cr2,
16193 .write_cr2 = native_write_cr2,
16194@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
16195 .make_pud = PTE_IDENT,
16196
16197 .set_pgd = native_set_pgd,
16198+ .set_pgd_batched = native_set_pgd_batched,
16199 #endif
16200 #endif /* PAGETABLE_LEVELS >= 3 */
16201
16202@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
16203 },
16204
16205 .set_fixmap = native_set_fixmap,
16206+
16207+#ifdef CONFIG_PAX_KERNEXEC
16208+ .pax_open_kernel = native_pax_open_kernel,
16209+ .pax_close_kernel = native_pax_close_kernel,
16210+#endif
16211+
16212 };
16213
16214 EXPORT_SYMBOL_GPL(pv_time_ops);
16215diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
16216index 35ccf75..7a15747 100644
16217--- a/arch/x86/kernel/pci-iommu_table.c
16218+++ b/arch/x86/kernel/pci-iommu_table.c
16219@@ -2,7 +2,7 @@
16220 #include <asm/iommu_table.h>
16221 #include <linux/string.h>
16222 #include <linux/kallsyms.h>
16223-
16224+#include <linux/sched.h>
16225
16226 #define DEBUG 1
16227
16228diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
16229index ee5d4fb..426649b 100644
16230--- a/arch/x86/kernel/process.c
16231+++ b/arch/x86/kernel/process.c
16232@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
16233
16234 void free_thread_info(struct thread_info *ti)
16235 {
16236- free_thread_xstate(ti->task);
16237 free_pages((unsigned long)ti, THREAD_ORDER);
16238 }
16239
16240+static struct kmem_cache *task_struct_cachep;
16241+
16242 void arch_task_cache_init(void)
16243 {
16244- task_xstate_cachep =
16245- kmem_cache_create("task_xstate", xstate_size,
16246+ /* create a slab on which task_structs can be allocated */
16247+ task_struct_cachep =
16248+ kmem_cache_create("task_struct", sizeof(struct task_struct),
16249+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
16250+
16251+ task_xstate_cachep =
16252+ kmem_cache_create("task_xstate", xstate_size,
16253 __alignof__(union thread_xstate),
16254- SLAB_PANIC | SLAB_NOTRACK, NULL);
16255+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
16256+}
16257+
16258+struct task_struct *alloc_task_struct_node(int node)
16259+{
16260+ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
16261+}
16262+
16263+void free_task_struct(struct task_struct *task)
16264+{
16265+ free_thread_xstate(task);
16266+ kmem_cache_free(task_struct_cachep, task);
16267 }
16268
16269 /*
16270@@ -70,7 +87,7 @@ void exit_thread(void)
16271 unsigned long *bp = t->io_bitmap_ptr;
16272
16273 if (bp) {
16274- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
16275+ struct tss_struct *tss = init_tss + get_cpu();
16276
16277 t->io_bitmap_ptr = NULL;
16278 clear_thread_flag(TIF_IO_BITMAP);
16279@@ -106,7 +123,7 @@ void show_regs_common(void)
16280
16281 printk(KERN_CONT "\n");
16282 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
16283- current->pid, current->comm, print_tainted(),
16284+ task_pid_nr(current), current->comm, print_tainted(),
16285 init_utsname()->release,
16286 (int)strcspn(init_utsname()->version, " "),
16287 init_utsname()->version);
16288@@ -120,6 +137,9 @@ void flush_thread(void)
16289 {
16290 struct task_struct *tsk = current;
16291
16292+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
16293+ loadsegment(gs, 0);
16294+#endif
16295 flush_ptrace_hw_breakpoint(tsk);
16296 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
16297 /*
16298@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
16299 regs.di = (unsigned long) arg;
16300
16301 #ifdef CONFIG_X86_32
16302- regs.ds = __USER_DS;
16303- regs.es = __USER_DS;
16304+ regs.ds = __KERNEL_DS;
16305+ regs.es = __KERNEL_DS;
16306 regs.fs = __KERNEL_PERCPU;
16307- regs.gs = __KERNEL_STACK_CANARY;
16308+ savesegment(gs, regs.gs);
16309 #else
16310 regs.ss = __KERNEL_DS;
16311 #endif
16312@@ -411,7 +431,7 @@ bool set_pm_idle_to_default(void)
16313
16314 return ret;
16315 }
16316-void stop_this_cpu(void *dummy)
16317+__noreturn void stop_this_cpu(void *dummy)
16318 {
16319 local_irq_disable();
16320 /*
16321@@ -653,16 +673,37 @@ static int __init idle_setup(char *str)
16322 }
16323 early_param("idle", idle_setup);
16324
16325-unsigned long arch_align_stack(unsigned long sp)
16326+#ifdef CONFIG_PAX_RANDKSTACK
16327+void pax_randomize_kstack(struct pt_regs *regs)
16328 {
16329- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
16330- sp -= get_random_int() % 8192;
16331- return sp & ~0xf;
16332-}
16333+ struct thread_struct *thread = &current->thread;
16334+ unsigned long time;
16335
16336-unsigned long arch_randomize_brk(struct mm_struct *mm)
16337-{
16338- unsigned long range_end = mm->brk + 0x02000000;
16339- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
16340-}
16341+ if (!randomize_va_space)
16342+ return;
16343+
16344+ if (v8086_mode(regs))
16345+ return;
16346
16347+ rdtscl(time);
16348+
16349+ /* P4 seems to return a 0 LSB, ignore it */
16350+#ifdef CONFIG_MPENTIUM4
16351+ time &= 0x3EUL;
16352+ time <<= 2;
16353+#elif defined(CONFIG_X86_64)
16354+ time &= 0xFUL;
16355+ time <<= 4;
16356+#else
16357+ time &= 0x1FUL;
16358+ time <<= 3;
16359+#endif
16360+
16361+ thread->sp0 ^= time;
16362+ load_sp0(init_tss + smp_processor_id(), thread);
16363+
16364+#ifdef CONFIG_X86_64
16365+ percpu_write(kernel_stack, thread->sp0);
16366+#endif
16367+}
16368+#endif
16369diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
16370index 795b79f..063767a 100644
16371--- a/arch/x86/kernel/process_32.c
16372+++ b/arch/x86/kernel/process_32.c
16373@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
16374 unsigned long thread_saved_pc(struct task_struct *tsk)
16375 {
16376 return ((unsigned long *)tsk->thread.sp)[3];
16377+//XXX return tsk->thread.eip;
16378 }
16379
16380 #ifndef CONFIG_SMP
16381@@ -130,15 +131,14 @@ void __show_regs(struct pt_regs *regs, int all)
16382 unsigned long sp;
16383 unsigned short ss, gs;
16384
16385- if (user_mode_vm(regs)) {
16386+ if (user_mode(regs)) {
16387 sp = regs->sp;
16388 ss = regs->ss & 0xffff;
16389- gs = get_user_gs(regs);
16390 } else {
16391 sp = kernel_stack_pointer(regs);
16392 savesegment(ss, ss);
16393- savesegment(gs, gs);
16394 }
16395+ gs = get_user_gs(regs);
16396
16397 show_regs_common();
16398
16399@@ -200,13 +200,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
16400 struct task_struct *tsk;
16401 int err;
16402
16403- childregs = task_pt_regs(p);
16404+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
16405 *childregs = *regs;
16406 childregs->ax = 0;
16407 childregs->sp = sp;
16408
16409 p->thread.sp = (unsigned long) childregs;
16410 p->thread.sp0 = (unsigned long) (childregs+1);
16411+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
16412
16413 p->thread.ip = (unsigned long) ret_from_fork;
16414
16415@@ -296,7 +297,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16416 struct thread_struct *prev = &prev_p->thread,
16417 *next = &next_p->thread;
16418 int cpu = smp_processor_id();
16419- struct tss_struct *tss = &per_cpu(init_tss, cpu);
16420+ struct tss_struct *tss = init_tss + cpu;
16421 bool preload_fpu;
16422
16423 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
16424@@ -331,6 +332,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16425 */
16426 lazy_save_gs(prev->gs);
16427
16428+#ifdef CONFIG_PAX_MEMORY_UDEREF
16429+ __set_fs(task_thread_info(next_p)->addr_limit);
16430+#endif
16431+
16432 /*
16433 * Load the per-thread Thread-Local Storage descriptor.
16434 */
16435@@ -366,6 +371,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16436 */
16437 arch_end_context_switch(next_p);
16438
16439+ percpu_write(current_task, next_p);
16440+ percpu_write(current_tinfo, &next_p->tinfo);
16441+
16442 if (preload_fpu)
16443 __math_state_restore();
16444
16445@@ -375,8 +383,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16446 if (prev->gs | next->gs)
16447 lazy_load_gs(next->gs);
16448
16449- percpu_write(current_task, next_p);
16450-
16451 return prev_p;
16452 }
16453
16454@@ -406,4 +412,3 @@ unsigned long get_wchan(struct task_struct *p)
16455 } while (count++ < 16);
16456 return 0;
16457 }
16458-
16459diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
16460index 3bd7e6e..90b2bcf 100644
16461--- a/arch/x86/kernel/process_64.c
16462+++ b/arch/x86/kernel/process_64.c
16463@@ -89,7 +89,7 @@ static void __exit_idle(void)
16464 void exit_idle(void)
16465 {
16466 /* idle loop has pid 0 */
16467- if (current->pid)
16468+ if (task_pid_nr(current))
16469 return;
16470 __exit_idle();
16471 }
16472@@ -264,8 +264,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
16473 struct pt_regs *childregs;
16474 struct task_struct *me = current;
16475
16476- childregs = ((struct pt_regs *)
16477- (THREAD_SIZE + task_stack_page(p))) - 1;
16478+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
16479 *childregs = *regs;
16480
16481 childregs->ax = 0;
16482@@ -277,6 +276,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
16483 p->thread.sp = (unsigned long) childregs;
16484 p->thread.sp0 = (unsigned long) (childregs+1);
16485 p->thread.usersp = me->thread.usersp;
16486+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
16487
16488 set_tsk_thread_flag(p, TIF_FORK);
16489
16490@@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16491 struct thread_struct *prev = &prev_p->thread;
16492 struct thread_struct *next = &next_p->thread;
16493 int cpu = smp_processor_id();
16494- struct tss_struct *tss = &per_cpu(init_tss, cpu);
16495+ struct tss_struct *tss = init_tss + cpu;
16496 unsigned fsindex, gsindex;
16497 bool preload_fpu;
16498
16499@@ -475,10 +475,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
16500 prev->usersp = percpu_read(old_rsp);
16501 percpu_write(old_rsp, next->usersp);
16502 percpu_write(current_task, next_p);
16503+ percpu_write(current_tinfo, &next_p->tinfo);
16504
16505- percpu_write(kernel_stack,
16506- (unsigned long)task_stack_page(next_p) +
16507- THREAD_SIZE - KERNEL_STACK_OFFSET);
16508+ percpu_write(kernel_stack, next->sp0);
16509
16510 /*
16511 * Now maybe reload the debug registers and handle I/O bitmaps
16512@@ -540,12 +539,11 @@ unsigned long get_wchan(struct task_struct *p)
16513 if (!p || p == current || p->state == TASK_RUNNING)
16514 return 0;
16515 stack = (unsigned long)task_stack_page(p);
16516- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
16517+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
16518 return 0;
16519 fp = *(u64 *)(p->thread.sp);
16520 do {
16521- if (fp < (unsigned long)stack ||
16522- fp >= (unsigned long)stack+THREAD_SIZE)
16523+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
16524 return 0;
16525 ip = *(u64 *)(fp+8);
16526 if (!in_sched_functions(ip))
16527diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
16528index 8252879..d3219e0 100644
16529--- a/arch/x86/kernel/ptrace.c
16530+++ b/arch/x86/kernel/ptrace.c
16531@@ -822,7 +822,7 @@ long arch_ptrace(struct task_struct *child, long request,
16532 unsigned long addr, unsigned long data)
16533 {
16534 int ret;
16535- unsigned long __user *datap = (unsigned long __user *)data;
16536+ unsigned long __user *datap = (__force unsigned long __user *)data;
16537
16538 switch (request) {
16539 /* read the word at location addr in the USER area. */
16540@@ -907,14 +907,14 @@ long arch_ptrace(struct task_struct *child, long request,
16541 if ((int) addr < 0)
16542 return -EIO;
16543 ret = do_get_thread_area(child, addr,
16544- (struct user_desc __user *)data);
16545+ (__force struct user_desc __user *) data);
16546 break;
16547
16548 case PTRACE_SET_THREAD_AREA:
16549 if ((int) addr < 0)
16550 return -EIO;
16551 ret = do_set_thread_area(child, addr,
16552- (struct user_desc __user *)data, 0);
16553+ (__force struct user_desc __user *) data, 0);
16554 break;
16555 #endif
16556
16557@@ -1331,7 +1331,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
16558 memset(info, 0, sizeof(*info));
16559 info->si_signo = SIGTRAP;
16560 info->si_code = si_code;
16561- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
16562+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
16563 }
16564
16565 void user_single_step_siginfo(struct task_struct *tsk,
16566diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
16567index 42eb330..139955c 100644
16568--- a/arch/x86/kernel/pvclock.c
16569+++ b/arch/x86/kernel/pvclock.c
16570@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
16571 return pv_tsc_khz;
16572 }
16573
16574-static atomic64_t last_value = ATOMIC64_INIT(0);
16575+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
16576
16577 void pvclock_resume(void)
16578 {
16579- atomic64_set(&last_value, 0);
16580+ atomic64_set_unchecked(&last_value, 0);
16581 }
16582
16583 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
16584@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
16585 * updating at the same time, and one of them could be slightly behind,
16586 * making the assumption that last_value always go forward fail to hold.
16587 */
16588- last = atomic64_read(&last_value);
16589+ last = atomic64_read_unchecked(&last_value);
16590 do {
16591 if (ret < last)
16592 return last;
16593- last = atomic64_cmpxchg(&last_value, last, ret);
16594+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
16595 } while (unlikely(last != ret));
16596
16597 return ret;
16598diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
16599index 37a458b..e63d183 100644
16600--- a/arch/x86/kernel/reboot.c
16601+++ b/arch/x86/kernel/reboot.c
16602@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
16603 EXPORT_SYMBOL(pm_power_off);
16604
16605 static const struct desc_ptr no_idt = {};
16606-static int reboot_mode;
16607+static unsigned short reboot_mode;
16608 enum reboot_type reboot_type = BOOT_ACPI;
16609 int reboot_force;
16610
16611@@ -324,13 +324,17 @@ core_initcall(reboot_init);
16612 extern const unsigned char machine_real_restart_asm[];
16613 extern const u64 machine_real_restart_gdt[3];
16614
16615-void machine_real_restart(unsigned int type)
16616+__noreturn void machine_real_restart(unsigned int type)
16617 {
16618 void *restart_va;
16619 unsigned long restart_pa;
16620- void (*restart_lowmem)(unsigned int);
16621+ void (* __noreturn restart_lowmem)(unsigned int);
16622 u64 *lowmem_gdt;
16623
16624+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
16625+ struct desc_struct *gdt;
16626+#endif
16627+
16628 local_irq_disable();
16629
16630 /* Write zero to CMOS register number 0x0f, which the BIOS POST
16631@@ -356,14 +360,14 @@ void machine_real_restart(unsigned int type)
16632 boot)". This seems like a fairly standard thing that gets set by
16633 REBOOT.COM programs, and the previous reset routine did this
16634 too. */
16635- *((unsigned short *)0x472) = reboot_mode;
16636+ *(unsigned short *)(__va(0x472)) = reboot_mode;
16637
16638 /* Patch the GDT in the low memory trampoline */
16639 lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
16640
16641 restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
16642 restart_pa = virt_to_phys(restart_va);
16643- restart_lowmem = (void (*)(unsigned int))restart_pa;
16644+ restart_lowmem = (void *)restart_pa;
16645
16646 /* GDT[0]: GDT self-pointer */
16647 lowmem_gdt[0] =
16648@@ -374,7 +378,33 @@ void machine_real_restart(unsigned int type)
16649 GDT_ENTRY(0x009b, restart_pa, 0xffff);
16650
16651 /* Jump to the identity-mapped low memory code */
16652+
16653+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
16654+ gdt = get_cpu_gdt_table(smp_processor_id());
16655+ pax_open_kernel();
16656+#ifdef CONFIG_PAX_MEMORY_UDEREF
16657+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
16658+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
16659+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
16660+#endif
16661+#ifdef CONFIG_PAX_KERNEXEC
16662+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
16663+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
16664+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
16665+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
16666+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
16667+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
16668+#endif
16669+ pax_close_kernel();
16670+#endif
16671+
16672+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
16673+ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
16674+ unreachable();
16675+#else
16676 restart_lowmem(type);
16677+#endif
16678+
16679 }
16680 #ifdef CONFIG_APM_MODULE
16681 EXPORT_SYMBOL(machine_real_restart);
16682@@ -540,7 +570,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
16683 * try to force a triple fault and then cycle between hitting the keyboard
16684 * controller and doing that
16685 */
16686-static void native_machine_emergency_restart(void)
16687+__noreturn static void native_machine_emergency_restart(void)
16688 {
16689 int i;
16690 int attempt = 0;
16691@@ -664,13 +694,13 @@ void native_machine_shutdown(void)
16692 #endif
16693 }
16694
16695-static void __machine_emergency_restart(int emergency)
16696+static __noreturn void __machine_emergency_restart(int emergency)
16697 {
16698 reboot_emergency = emergency;
16699 machine_ops.emergency_restart();
16700 }
16701
16702-static void native_machine_restart(char *__unused)
16703+static __noreturn void native_machine_restart(char *__unused)
16704 {
16705 printk("machine restart\n");
16706
16707@@ -679,7 +709,7 @@ static void native_machine_restart(char *__unused)
16708 __machine_emergency_restart(0);
16709 }
16710
16711-static void native_machine_halt(void)
16712+static __noreturn void native_machine_halt(void)
16713 {
16714 /* stop other cpus and apics */
16715 machine_shutdown();
16716@@ -690,7 +720,7 @@ static void native_machine_halt(void)
16717 stop_this_cpu(NULL);
16718 }
16719
16720-static void native_machine_power_off(void)
16721+__noreturn static void native_machine_power_off(void)
16722 {
16723 if (pm_power_off) {
16724 if (!reboot_force)
16725@@ -699,6 +729,7 @@ static void native_machine_power_off(void)
16726 }
16727 /* a fallback in case there is no PM info available */
16728 tboot_shutdown(TB_SHUTDOWN_HALT);
16729+ unreachable();
16730 }
16731
16732 struct machine_ops machine_ops = {
16733diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
16734index 7a6f3b3..bed145d7 100644
16735--- a/arch/x86/kernel/relocate_kernel_64.S
16736+++ b/arch/x86/kernel/relocate_kernel_64.S
16737@@ -11,6 +11,7 @@
16738 #include <asm/kexec.h>
16739 #include <asm/processor-flags.h>
16740 #include <asm/pgtable_types.h>
16741+#include <asm/alternative-asm.h>
16742
16743 /*
16744 * Must be relocatable PIC code callable as a C function
16745@@ -160,13 +161,14 @@ identity_mapped:
16746 xorq %rbp, %rbp
16747 xorq %r8, %r8
16748 xorq %r9, %r9
16749- xorq %r10, %r9
16750+ xorq %r10, %r10
16751 xorq %r11, %r11
16752 xorq %r12, %r12
16753 xorq %r13, %r13
16754 xorq %r14, %r14
16755 xorq %r15, %r15
16756
16757+ pax_force_retaddr 0, 1
16758 ret
16759
16760 1:
16761diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
16762index cf0ef98..e3f780b 100644
16763--- a/arch/x86/kernel/setup.c
16764+++ b/arch/x86/kernel/setup.c
16765@@ -447,7 +447,7 @@ static void __init parse_setup_data(void)
16766
16767 switch (data->type) {
16768 case SETUP_E820_EXT:
16769- parse_e820_ext(data);
16770+ parse_e820_ext((struct setup_data __force_kernel *)data);
16771 break;
16772 case SETUP_DTB:
16773 add_dtb(pa_data);
16774@@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
16775 * area (640->1Mb) as ram even though it is not.
16776 * take them out.
16777 */
16778- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
16779+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
16780 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
16781 }
16782
16783@@ -773,14 +773,14 @@ void __init setup_arch(char **cmdline_p)
16784
16785 if (!boot_params.hdr.root_flags)
16786 root_mountflags &= ~MS_RDONLY;
16787- init_mm.start_code = (unsigned long) _text;
16788- init_mm.end_code = (unsigned long) _etext;
16789+ init_mm.start_code = ktla_ktva((unsigned long) _text);
16790+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
16791 init_mm.end_data = (unsigned long) _edata;
16792 init_mm.brk = _brk_end;
16793
16794- code_resource.start = virt_to_phys(_text);
16795- code_resource.end = virt_to_phys(_etext)-1;
16796- data_resource.start = virt_to_phys(_etext);
16797+ code_resource.start = virt_to_phys(ktla_ktva(_text));
16798+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
16799+ data_resource.start = virt_to_phys(_sdata);
16800 data_resource.end = virt_to_phys(_edata)-1;
16801 bss_resource.start = virt_to_phys(&__bss_start);
16802 bss_resource.end = virt_to_phys(&__bss_stop)-1;
16803diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
16804index 71f4727..16dc9f7 100644
16805--- a/arch/x86/kernel/setup_percpu.c
16806+++ b/arch/x86/kernel/setup_percpu.c
16807@@ -21,19 +21,17 @@
16808 #include <asm/cpu.h>
16809 #include <asm/stackprotector.h>
16810
16811-DEFINE_PER_CPU(int, cpu_number);
16812+#ifdef CONFIG_SMP
16813+DEFINE_PER_CPU(unsigned int, cpu_number);
16814 EXPORT_PER_CPU_SYMBOL(cpu_number);
16815+#endif
16816
16817-#ifdef CONFIG_X86_64
16818 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
16819-#else
16820-#define BOOT_PERCPU_OFFSET 0
16821-#endif
16822
16823 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
16824 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
16825
16826-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
16827+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
16828 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
16829 };
16830 EXPORT_SYMBOL(__per_cpu_offset);
16831@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
16832 {
16833 #ifdef CONFIG_X86_32
16834 struct desc_struct gdt;
16835+ unsigned long base = per_cpu_offset(cpu);
16836
16837- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
16838- 0x2 | DESCTYPE_S, 0x8);
16839- gdt.s = 1;
16840+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
16841+ 0x83 | DESCTYPE_S, 0xC);
16842 write_gdt_entry(get_cpu_gdt_table(cpu),
16843 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
16844 #endif
16845@@ -207,6 +205,11 @@ void __init setup_per_cpu_areas(void)
16846 /* alrighty, percpu areas up and running */
16847 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
16848 for_each_possible_cpu(cpu) {
16849+#ifdef CONFIG_CC_STACKPROTECTOR
16850+#ifdef CONFIG_X86_32
16851+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
16852+#endif
16853+#endif
16854 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
16855 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
16856 per_cpu(cpu_number, cpu) = cpu;
16857@@ -247,6 +250,12 @@ void __init setup_per_cpu_areas(void)
16858 */
16859 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
16860 #endif
16861+#ifdef CONFIG_CC_STACKPROTECTOR
16862+#ifdef CONFIG_X86_32
16863+ if (!cpu)
16864+ per_cpu(stack_canary.canary, cpu) = canary;
16865+#endif
16866+#endif
16867 /*
16868 * Up to this point, the boot CPU has been using .init.data
16869 * area. Reload any changed state for the boot CPU.
16870diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
16871index 54ddaeb2..22c3bdc 100644
16872--- a/arch/x86/kernel/signal.c
16873+++ b/arch/x86/kernel/signal.c
16874@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
16875 * Align the stack pointer according to the i386 ABI,
16876 * i.e. so that on function entry ((sp + 4) & 15) == 0.
16877 */
16878- sp = ((sp + 4) & -16ul) - 4;
16879+ sp = ((sp - 12) & -16ul) - 4;
16880 #else /* !CONFIG_X86_32 */
16881 sp = round_down(sp, 16) - 8;
16882 #endif
16883@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
16884 * Return an always-bogus address instead so we will die with SIGSEGV.
16885 */
16886 if (onsigstack && !likely(on_sig_stack(sp)))
16887- return (void __user *)-1L;
16888+ return (__force void __user *)-1L;
16889
16890 /* save i387 state */
16891 if (used_math() && save_i387_xstate(*fpstate) < 0)
16892- return (void __user *)-1L;
16893+ return (__force void __user *)-1L;
16894
16895 return (void __user *)sp;
16896 }
16897@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
16898 }
16899
16900 if (current->mm->context.vdso)
16901- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
16902+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
16903 else
16904- restorer = &frame->retcode;
16905+ restorer = (void __user *)&frame->retcode;
16906 if (ka->sa.sa_flags & SA_RESTORER)
16907 restorer = ka->sa.sa_restorer;
16908
16909@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
16910 * reasons and because gdb uses it as a signature to notice
16911 * signal handler stack frames.
16912 */
16913- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
16914+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
16915
16916 if (err)
16917 return -EFAULT;
16918@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
16919 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
16920
16921 /* Set up to return from userspace. */
16922- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
16923+ if (current->mm->context.vdso)
16924+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
16925+ else
16926+ restorer = (void __user *)&frame->retcode;
16927 if (ka->sa.sa_flags & SA_RESTORER)
16928 restorer = ka->sa.sa_restorer;
16929 put_user_ex(restorer, &frame->pretcode);
16930@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
16931 * reasons and because gdb uses it as a signature to notice
16932 * signal handler stack frames.
16933 */
16934- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
16935+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
16936 } put_user_catch(err);
16937
16938 if (err)
16939@@ -769,7 +772,7 @@ static void do_signal(struct pt_regs *regs)
16940 * X86_32: vm86 regs switched out by assembly code before reaching
16941 * here, so testing against kernel CS suffices.
16942 */
16943- if (!user_mode(regs))
16944+ if (!user_mode_novm(regs))
16945 return;
16946
16947 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
16948diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
16949index 9f548cb..caf76f7 100644
16950--- a/arch/x86/kernel/smpboot.c
16951+++ b/arch/x86/kernel/smpboot.c
16952@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
16953 set_idle_for_cpu(cpu, c_idle.idle);
16954 do_rest:
16955 per_cpu(current_task, cpu) = c_idle.idle;
16956+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
16957 #ifdef CONFIG_X86_32
16958 /* Stack for startup_32 can be just as for start_secondary onwards */
16959 irq_ctx_init(cpu);
16960 #else
16961 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
16962 initial_gs = per_cpu_offset(cpu);
16963- per_cpu(kernel_stack, cpu) =
16964- (unsigned long)task_stack_page(c_idle.idle) -
16965- KERNEL_STACK_OFFSET + THREAD_SIZE;
16966+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
16967 #endif
16968+
16969+ pax_open_kernel();
16970 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
16971+ pax_close_kernel();
16972+
16973 initial_code = (unsigned long)start_secondary;
16974 stack_start = c_idle.idle->thread.sp;
16975
16976@@ -861,6 +864,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
16977
16978 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
16979
16980+#ifdef CONFIG_PAX_PER_CPU_PGD
16981+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
16982+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
16983+ KERNEL_PGD_PTRS);
16984+#endif
16985+
16986 err = do_boot_cpu(apicid, cpu);
16987 if (err) {
16988 pr_debug("do_boot_cpu failed %d\n", err);
16989diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
16990index c346d11..d43b163 100644
16991--- a/arch/x86/kernel/step.c
16992+++ b/arch/x86/kernel/step.c
16993@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
16994 struct desc_struct *desc;
16995 unsigned long base;
16996
16997- seg &= ~7UL;
16998+ seg >>= 3;
16999
17000 mutex_lock(&child->mm->context.lock);
17001- if (unlikely((seg >> 3) >= child->mm->context.size))
17002+ if (unlikely(seg >= child->mm->context.size))
17003 addr = -1L; /* bogus selector, access would fault */
17004 else {
17005 desc = child->mm->context.ldt + seg;
17006@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
17007 addr += base;
17008 }
17009 mutex_unlock(&child->mm->context.lock);
17010- }
17011+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
17012+ addr = ktla_ktva(addr);
17013
17014 return addr;
17015 }
17016@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
17017 unsigned char opcode[15];
17018 unsigned long addr = convert_ip_to_linear(child, regs);
17019
17020+ if (addr == -EINVAL)
17021+ return 0;
17022+
17023 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
17024 for (i = 0; i < copied; i++) {
17025 switch (opcode[i]) {
17026diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
17027index 0b0cb5f..db6b9ed 100644
17028--- a/arch/x86/kernel/sys_i386_32.c
17029+++ b/arch/x86/kernel/sys_i386_32.c
17030@@ -24,17 +24,224 @@
17031
17032 #include <asm/syscalls.h>
17033
17034-/*
17035- * Do a system call from kernel instead of calling sys_execve so we
17036- * end up with proper pt_regs.
17037- */
17038-int kernel_execve(const char *filename,
17039- const char *const argv[],
17040- const char *const envp[])
17041+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
17042 {
17043- long __res;
17044- asm volatile ("int $0x80"
17045- : "=a" (__res)
17046- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
17047- return __res;
17048+ unsigned long pax_task_size = TASK_SIZE;
17049+
17050+#ifdef CONFIG_PAX_SEGMEXEC
17051+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
17052+ pax_task_size = SEGMEXEC_TASK_SIZE;
17053+#endif
17054+
17055+ if (len > pax_task_size || addr > pax_task_size - len)
17056+ return -EINVAL;
17057+
17058+ return 0;
17059+}
17060+
17061+unsigned long
17062+arch_get_unmapped_area(struct file *filp, unsigned long addr,
17063+ unsigned long len, unsigned long pgoff, unsigned long flags)
17064+{
17065+ struct mm_struct *mm = current->mm;
17066+ struct vm_area_struct *vma;
17067+ unsigned long start_addr, pax_task_size = TASK_SIZE;
17068+
17069+#ifdef CONFIG_PAX_SEGMEXEC
17070+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17071+ pax_task_size = SEGMEXEC_TASK_SIZE;
17072+#endif
17073+
17074+ pax_task_size -= PAGE_SIZE;
17075+
17076+ if (len > pax_task_size)
17077+ return -ENOMEM;
17078+
17079+ if (flags & MAP_FIXED)
17080+ return addr;
17081+
17082+#ifdef CONFIG_PAX_RANDMMAP
17083+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17084+#endif
17085+
17086+ if (addr) {
17087+ addr = PAGE_ALIGN(addr);
17088+ if (pax_task_size - len >= addr) {
17089+ vma = find_vma(mm, addr);
17090+ if (check_heap_stack_gap(vma, addr, len))
17091+ return addr;
17092+ }
17093+ }
17094+ if (len > mm->cached_hole_size) {
17095+ start_addr = addr = mm->free_area_cache;
17096+ } else {
17097+ start_addr = addr = mm->mmap_base;
17098+ mm->cached_hole_size = 0;
17099+ }
17100+
17101+#ifdef CONFIG_PAX_PAGEEXEC
17102+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
17103+ start_addr = 0x00110000UL;
17104+
17105+#ifdef CONFIG_PAX_RANDMMAP
17106+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17107+ start_addr += mm->delta_mmap & 0x03FFF000UL;
17108+#endif
17109+
17110+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
17111+ start_addr = addr = mm->mmap_base;
17112+ else
17113+ addr = start_addr;
17114+ }
17115+#endif
17116+
17117+full_search:
17118+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
17119+ /* At this point: (!vma || addr < vma->vm_end). */
17120+ if (pax_task_size - len < addr) {
17121+ /*
17122+ * Start a new search - just in case we missed
17123+ * some holes.
17124+ */
17125+ if (start_addr != mm->mmap_base) {
17126+ start_addr = addr = mm->mmap_base;
17127+ mm->cached_hole_size = 0;
17128+ goto full_search;
17129+ }
17130+ return -ENOMEM;
17131+ }
17132+ if (check_heap_stack_gap(vma, addr, len))
17133+ break;
17134+ if (addr + mm->cached_hole_size < vma->vm_start)
17135+ mm->cached_hole_size = vma->vm_start - addr;
17136+ addr = vma->vm_end;
17137+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
17138+ start_addr = addr = mm->mmap_base;
17139+ mm->cached_hole_size = 0;
17140+ goto full_search;
17141+ }
17142+ }
17143+
17144+ /*
17145+ * Remember the place where we stopped the search:
17146+ */
17147+ mm->free_area_cache = addr + len;
17148+ return addr;
17149+}
17150+
17151+unsigned long
17152+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17153+ const unsigned long len, const unsigned long pgoff,
17154+ const unsigned long flags)
17155+{
17156+ struct vm_area_struct *vma;
17157+ struct mm_struct *mm = current->mm;
17158+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
17159+
17160+#ifdef CONFIG_PAX_SEGMEXEC
17161+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17162+ pax_task_size = SEGMEXEC_TASK_SIZE;
17163+#endif
17164+
17165+ pax_task_size -= PAGE_SIZE;
17166+
17167+ /* requested length too big for entire address space */
17168+ if (len > pax_task_size)
17169+ return -ENOMEM;
17170+
17171+ if (flags & MAP_FIXED)
17172+ return addr;
17173+
17174+#ifdef CONFIG_PAX_PAGEEXEC
17175+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
17176+ goto bottomup;
17177+#endif
17178+
17179+#ifdef CONFIG_PAX_RANDMMAP
17180+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17181+#endif
17182+
17183+ /* requesting a specific address */
17184+ if (addr) {
17185+ addr = PAGE_ALIGN(addr);
17186+ if (pax_task_size - len >= addr) {
17187+ vma = find_vma(mm, addr);
17188+ if (check_heap_stack_gap(vma, addr, len))
17189+ return addr;
17190+ }
17191+ }
17192+
17193+ /* check if free_area_cache is useful for us */
17194+ if (len <= mm->cached_hole_size) {
17195+ mm->cached_hole_size = 0;
17196+ mm->free_area_cache = mm->mmap_base;
17197+ }
17198+
17199+ /* either no address requested or can't fit in requested address hole */
17200+ addr = mm->free_area_cache;
17201+
17202+ /* make sure it can fit in the remaining address space */
17203+ if (addr > len) {
17204+ vma = find_vma(mm, addr-len);
17205+ if (check_heap_stack_gap(vma, addr - len, len))
17206+ /* remember the address as a hint for next time */
17207+ return (mm->free_area_cache = addr-len);
17208+ }
17209+
17210+ if (mm->mmap_base < len)
17211+ goto bottomup;
17212+
17213+ addr = mm->mmap_base-len;
17214+
17215+ do {
17216+ /*
17217+ * Lookup failure means no vma is above this address,
17218+ * else if new region fits below vma->vm_start,
17219+ * return with success:
17220+ */
17221+ vma = find_vma(mm, addr);
17222+ if (check_heap_stack_gap(vma, addr, len))
17223+ /* remember the address as a hint for next time */
17224+ return (mm->free_area_cache = addr);
17225+
17226+ /* remember the largest hole we saw so far */
17227+ if (addr + mm->cached_hole_size < vma->vm_start)
17228+ mm->cached_hole_size = vma->vm_start - addr;
17229+
17230+ /* try just below the current vma->vm_start */
17231+ addr = skip_heap_stack_gap(vma, len);
17232+ } while (!IS_ERR_VALUE(addr));
17233+
17234+bottomup:
17235+ /*
17236+ * A failed mmap() very likely causes application failure,
17237+ * so fall back to the bottom-up function here. This scenario
17238+ * can happen with large stack limits and large mmap()
17239+ * allocations.
17240+ */
17241+
17242+#ifdef CONFIG_PAX_SEGMEXEC
17243+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
17244+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
17245+ else
17246+#endif
17247+
17248+ mm->mmap_base = TASK_UNMAPPED_BASE;
17249+
17250+#ifdef CONFIG_PAX_RANDMMAP
17251+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17252+ mm->mmap_base += mm->delta_mmap;
17253+#endif
17254+
17255+ mm->free_area_cache = mm->mmap_base;
17256+ mm->cached_hole_size = ~0UL;
17257+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
17258+ /*
17259+ * Restore the topdown base:
17260+ */
17261+ mm->mmap_base = base;
17262+ mm->free_area_cache = base;
17263+ mm->cached_hole_size = ~0UL;
17264+
17265+ return addr;
17266 }
17267diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
17268index 0514890..3dbebce 100644
17269--- a/arch/x86/kernel/sys_x86_64.c
17270+++ b/arch/x86/kernel/sys_x86_64.c
17271@@ -95,8 +95,8 @@ out:
17272 return error;
17273 }
17274
17275-static void find_start_end(unsigned long flags, unsigned long *begin,
17276- unsigned long *end)
17277+static void find_start_end(struct mm_struct *mm, unsigned long flags,
17278+ unsigned long *begin, unsigned long *end)
17279 {
17280 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
17281 unsigned long new_begin;
17282@@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
17283 *begin = new_begin;
17284 }
17285 } else {
17286- *begin = TASK_UNMAPPED_BASE;
17287+ *begin = mm->mmap_base;
17288 *end = TASK_SIZE;
17289 }
17290 }
17291@@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
17292 if (flags & MAP_FIXED)
17293 return addr;
17294
17295- find_start_end(flags, &begin, &end);
17296+ find_start_end(mm, flags, &begin, &end);
17297
17298 if (len > end)
17299 return -ENOMEM;
17300
17301+#ifdef CONFIG_PAX_RANDMMAP
17302+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17303+#endif
17304+
17305 if (addr) {
17306 addr = PAGE_ALIGN(addr);
17307 vma = find_vma(mm, addr);
17308- if (end - len >= addr &&
17309- (!vma || addr + len <= vma->vm_start))
17310+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
17311 return addr;
17312 }
17313 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
17314@@ -172,7 +175,7 @@ full_search:
17315 }
17316 return -ENOMEM;
17317 }
17318- if (!vma || addr + len <= vma->vm_start) {
17319+ if (check_heap_stack_gap(vma, addr, len)) {
17320 /*
17321 * Remember the place where we stopped the search:
17322 */
17323@@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17324 {
17325 struct vm_area_struct *vma;
17326 struct mm_struct *mm = current->mm;
17327- unsigned long addr = addr0;
17328+ unsigned long base = mm->mmap_base, addr = addr0;
17329
17330 /* requested length too big for entire address space */
17331 if (len > TASK_SIZE)
17332@@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17333 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
17334 goto bottomup;
17335
17336+#ifdef CONFIG_PAX_RANDMMAP
17337+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
17338+#endif
17339+
17340 /* requesting a specific address */
17341 if (addr) {
17342 addr = PAGE_ALIGN(addr);
17343- vma = find_vma(mm, addr);
17344- if (TASK_SIZE - len >= addr &&
17345- (!vma || addr + len <= vma->vm_start))
17346- return addr;
17347+ if (TASK_SIZE - len >= addr) {
17348+ vma = find_vma(mm, addr);
17349+ if (check_heap_stack_gap(vma, addr, len))
17350+ return addr;
17351+ }
17352 }
17353
17354 /* check if free_area_cache is useful for us */
17355@@ -232,7 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17356 ALIGN_TOPDOWN);
17357
17358 vma = find_vma(mm, tmp_addr);
17359- if (!vma || tmp_addr + len <= vma->vm_start)
17360+ if (check_heap_stack_gap(vma, tmp_addr, len))
17361 /* remember the address as a hint for next time */
17362 return mm->free_area_cache = tmp_addr;
17363 }
17364@@ -251,7 +259,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17365 * return with success:
17366 */
17367 vma = find_vma(mm, addr);
17368- if (!vma || addr+len <= vma->vm_start)
17369+ if (check_heap_stack_gap(vma, addr, len))
17370 /* remember the address as a hint for next time */
17371 return mm->free_area_cache = addr;
17372
17373@@ -260,8 +268,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
17374 mm->cached_hole_size = vma->vm_start - addr;
17375
17376 /* try just below the current vma->vm_start */
17377- addr = vma->vm_start-len;
17378- } while (len < vma->vm_start);
17379+ addr = skip_heap_stack_gap(vma, len);
17380+ } while (!IS_ERR_VALUE(addr));
17381
17382 bottomup:
17383 /*
17384@@ -270,13 +278,21 @@ bottomup:
17385 * can happen with large stack limits and large mmap()
17386 * allocations.
17387 */
17388+ mm->mmap_base = TASK_UNMAPPED_BASE;
17389+
17390+#ifdef CONFIG_PAX_RANDMMAP
17391+ if (mm->pax_flags & MF_PAX_RANDMMAP)
17392+ mm->mmap_base += mm->delta_mmap;
17393+#endif
17394+
17395+ mm->free_area_cache = mm->mmap_base;
17396 mm->cached_hole_size = ~0UL;
17397- mm->free_area_cache = TASK_UNMAPPED_BASE;
17398 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
17399 /*
17400 * Restore the topdown base:
17401 */
17402- mm->free_area_cache = mm->mmap_base;
17403+ mm->mmap_base = base;
17404+ mm->free_area_cache = base;
17405 mm->cached_hole_size = ~0UL;
17406
17407 return addr;
17408diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
17409index 9a0e312..e6f66f2 100644
17410--- a/arch/x86/kernel/syscall_table_32.S
17411+++ b/arch/x86/kernel/syscall_table_32.S
17412@@ -1,3 +1,4 @@
17413+.section .rodata,"a",@progbits
17414 ENTRY(sys_call_table)
17415 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
17416 .long sys_exit
17417diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
17418index e2410e2..4fe3fbc 100644
17419--- a/arch/x86/kernel/tboot.c
17420+++ b/arch/x86/kernel/tboot.c
17421@@ -219,7 +219,7 @@ static int tboot_setup_sleep(void)
17422
17423 void tboot_shutdown(u32 shutdown_type)
17424 {
17425- void (*shutdown)(void);
17426+ void (* __noreturn shutdown)(void);
17427
17428 if (!tboot_enabled())
17429 return;
17430@@ -241,7 +241,7 @@ void tboot_shutdown(u32 shutdown_type)
17431
17432 switch_to_tboot_pt();
17433
17434- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
17435+ shutdown = (void *)tboot->shutdown_entry;
17436 shutdown();
17437
17438 /* should not reach here */
17439@@ -298,7 +298,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
17440 tboot_shutdown(acpi_shutdown_map[sleep_state]);
17441 }
17442
17443-static atomic_t ap_wfs_count;
17444+static atomic_unchecked_t ap_wfs_count;
17445
17446 static int tboot_wait_for_aps(int num_aps)
17447 {
17448@@ -322,9 +322,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
17449 {
17450 switch (action) {
17451 case CPU_DYING:
17452- atomic_inc(&ap_wfs_count);
17453+ atomic_inc_unchecked(&ap_wfs_count);
17454 if (num_online_cpus() == 1)
17455- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
17456+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
17457 return NOTIFY_BAD;
17458 break;
17459 }
17460@@ -343,7 +343,7 @@ static __init int tboot_late_init(void)
17461
17462 tboot_create_trampoline();
17463
17464- atomic_set(&ap_wfs_count, 0);
17465+ atomic_set_unchecked(&ap_wfs_count, 0);
17466 register_hotcpu_notifier(&tboot_cpu_notifier);
17467 return 0;
17468 }
17469diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
17470index dd5fbf4..b7f2232 100644
17471--- a/arch/x86/kernel/time.c
17472+++ b/arch/x86/kernel/time.c
17473@@ -31,9 +31,9 @@ unsigned long profile_pc(struct pt_regs *regs)
17474 {
17475 unsigned long pc = instruction_pointer(regs);
17476
17477- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
17478+ if (!user_mode(regs) && in_lock_functions(pc)) {
17479 #ifdef CONFIG_FRAME_POINTER
17480- return *(unsigned long *)(regs->bp + sizeof(long));
17481+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
17482 #else
17483 unsigned long *sp =
17484 (unsigned long *)kernel_stack_pointer(regs);
17485@@ -42,11 +42,17 @@ unsigned long profile_pc(struct pt_regs *regs)
17486 * or above a saved flags. Eflags has bits 22-31 zero,
17487 * kernel addresses don't.
17488 */
17489+
17490+#ifdef CONFIG_PAX_KERNEXEC
17491+ return ktla_ktva(sp[0]);
17492+#else
17493 if (sp[0] >> 22)
17494 return sp[0];
17495 if (sp[1] >> 22)
17496 return sp[1];
17497 #endif
17498+
17499+#endif
17500 }
17501 return pc;
17502 }
17503diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
17504index 6bb7b85..dd853e1 100644
17505--- a/arch/x86/kernel/tls.c
17506+++ b/arch/x86/kernel/tls.c
17507@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
17508 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
17509 return -EINVAL;
17510
17511+#ifdef CONFIG_PAX_SEGMEXEC
17512+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
17513+ return -EINVAL;
17514+#endif
17515+
17516 set_tls_desc(p, idx, &info, 1);
17517
17518 return 0;
17519diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
17520index 451c0a7..e57f551 100644
17521--- a/arch/x86/kernel/trampoline_32.S
17522+++ b/arch/x86/kernel/trampoline_32.S
17523@@ -32,6 +32,12 @@
17524 #include <asm/segment.h>
17525 #include <asm/page_types.h>
17526
17527+#ifdef CONFIG_PAX_KERNEXEC
17528+#define ta(X) (X)
17529+#else
17530+#define ta(X) ((X) - __PAGE_OFFSET)
17531+#endif
17532+
17533 #ifdef CONFIG_SMP
17534
17535 .section ".x86_trampoline","a"
17536@@ -62,7 +68,7 @@ r_base = .
17537 inc %ax # protected mode (PE) bit
17538 lmsw %ax # into protected mode
17539 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
17540- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
17541+ ljmpl $__BOOT_CS, $ta(startup_32_smp)
17542
17543 # These need to be in the same 64K segment as the above;
17544 # hence we don't use the boot_gdt_descr defined in head.S
17545diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
17546index 09ff517..df19fbff 100644
17547--- a/arch/x86/kernel/trampoline_64.S
17548+++ b/arch/x86/kernel/trampoline_64.S
17549@@ -90,7 +90,7 @@ startup_32:
17550 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
17551 movl %eax, %ds
17552
17553- movl $X86_CR4_PAE, %eax
17554+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
17555 movl %eax, %cr4 # Enable PAE mode
17556
17557 # Setup trampoline 4 level pagetables
17558@@ -138,7 +138,7 @@ tidt:
17559 # so the kernel can live anywhere
17560 .balign 4
17561 tgdt:
17562- .short tgdt_end - tgdt # gdt limit
17563+ .short tgdt_end - tgdt - 1 # gdt limit
17564 .long tgdt - r_base
17565 .short 0
17566 .quad 0x00cf9b000000ffff # __KERNEL32_CS
17567diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
17568index a8e3eb8..c9dbd7d 100644
17569--- a/arch/x86/kernel/traps.c
17570+++ b/arch/x86/kernel/traps.c
17571@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
17572
17573 /* Do we ignore FPU interrupts ? */
17574 char ignore_fpu_irq;
17575-
17576-/*
17577- * The IDT has to be page-aligned to simplify the Pentium
17578- * F0 0F bug workaround.
17579- */
17580-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
17581 #endif
17582
17583 DECLARE_BITMAP(used_vectors, NR_VECTORS);
17584@@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
17585 }
17586
17587 static void __kprobes
17588-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
17589+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
17590 long error_code, siginfo_t *info)
17591 {
17592 struct task_struct *tsk = current;
17593
17594 #ifdef CONFIG_X86_32
17595- if (regs->flags & X86_VM_MASK) {
17596+ if (v8086_mode(regs)) {
17597 /*
17598 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
17599 * On nmi (interrupt 2), do_trap should not be called.
17600@@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
17601 }
17602 #endif
17603
17604- if (!user_mode(regs))
17605+ if (!user_mode_novm(regs))
17606 goto kernel_trap;
17607
17608 #ifdef CONFIG_X86_32
17609@@ -148,7 +142,7 @@ trap_signal:
17610 printk_ratelimit()) {
17611 printk(KERN_INFO
17612 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
17613- tsk->comm, tsk->pid, str,
17614+ tsk->comm, task_pid_nr(tsk), str,
17615 regs->ip, regs->sp, error_code);
17616 print_vma_addr(" in ", regs->ip);
17617 printk("\n");
17618@@ -165,8 +159,20 @@ kernel_trap:
17619 if (!fixup_exception(regs)) {
17620 tsk->thread.error_code = error_code;
17621 tsk->thread.trap_no = trapnr;
17622+
17623+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17624+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
17625+ str = "PAX: suspicious stack segment fault";
17626+#endif
17627+
17628 die(str, regs, error_code);
17629 }
17630+
17631+#ifdef CONFIG_PAX_REFCOUNT
17632+ if (trapnr == 4)
17633+ pax_report_refcount_overflow(regs);
17634+#endif
17635+
17636 return;
17637
17638 #ifdef CONFIG_X86_32
17639@@ -255,14 +261,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
17640 conditional_sti(regs);
17641
17642 #ifdef CONFIG_X86_32
17643- if (regs->flags & X86_VM_MASK)
17644+ if (v8086_mode(regs))
17645 goto gp_in_vm86;
17646 #endif
17647
17648 tsk = current;
17649- if (!user_mode(regs))
17650+ if (!user_mode_novm(regs))
17651 goto gp_in_kernel;
17652
17653+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17654+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
17655+ struct mm_struct *mm = tsk->mm;
17656+ unsigned long limit;
17657+
17658+ down_write(&mm->mmap_sem);
17659+ limit = mm->context.user_cs_limit;
17660+ if (limit < TASK_SIZE) {
17661+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
17662+ up_write(&mm->mmap_sem);
17663+ return;
17664+ }
17665+ up_write(&mm->mmap_sem);
17666+ }
17667+#endif
17668+
17669 tsk->thread.error_code = error_code;
17670 tsk->thread.trap_no = 13;
17671
17672@@ -295,6 +317,13 @@ gp_in_kernel:
17673 if (notify_die(DIE_GPF, "general protection fault", regs,
17674 error_code, 13, SIGSEGV) == NOTIFY_STOP)
17675 return;
17676+
17677+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17678+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
17679+ die("PAX: suspicious general protection fault", regs, error_code);
17680+ else
17681+#endif
17682+
17683 die("general protection fault", regs, error_code);
17684 }
17685
17686@@ -414,7 +443,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
17687 /* It's safe to allow irq's after DR6 has been saved */
17688 preempt_conditional_sti(regs);
17689
17690- if (regs->flags & X86_VM_MASK) {
17691+ if (v8086_mode(regs)) {
17692 handle_vm86_trap((struct kernel_vm86_regs *) regs,
17693 error_code, 1);
17694 preempt_conditional_cli(regs);
17695@@ -428,7 +457,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
17696 * We already checked v86 mode above, so we can check for kernel mode
17697 * by just checking the CPL of CS.
17698 */
17699- if ((dr6 & DR_STEP) && !user_mode(regs)) {
17700+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
17701 tsk->thread.debugreg6 &= ~DR_STEP;
17702 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
17703 regs->flags &= ~X86_EFLAGS_TF;
17704@@ -457,7 +486,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
17705 return;
17706 conditional_sti(regs);
17707
17708- if (!user_mode_vm(regs))
17709+ if (!user_mode(regs))
17710 {
17711 if (!fixup_exception(regs)) {
17712 task->thread.error_code = error_code;
17713@@ -568,7 +597,7 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
17714 void __math_state_restore(void)
17715 {
17716 struct thread_info *thread = current_thread_info();
17717- struct task_struct *tsk = thread->task;
17718+ struct task_struct *tsk = current;
17719
17720 /*
17721 * Paranoid restore. send a SIGSEGV if we fail to restore the state.
17722@@ -595,8 +624,7 @@ void __math_state_restore(void)
17723 */
17724 asmlinkage void math_state_restore(void)
17725 {
17726- struct thread_info *thread = current_thread_info();
17727- struct task_struct *tsk = thread->task;
17728+ struct task_struct *tsk = current;
17729
17730 if (!tsk_used_math(tsk)) {
17731 local_irq_enable();
17732diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
17733index b9242ba..50c5edd 100644
17734--- a/arch/x86/kernel/verify_cpu.S
17735+++ b/arch/x86/kernel/verify_cpu.S
17736@@ -20,6 +20,7 @@
17737 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
17738 * arch/x86/kernel/trampoline_64.S: secondary processor verification
17739 * arch/x86/kernel/head_32.S: processor startup
17740+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
17741 *
17742 * verify_cpu, returns the status of longmode and SSE in register %eax.
17743 * 0: Success 1: Failure
17744diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
17745index 863f875..4307295 100644
17746--- a/arch/x86/kernel/vm86_32.c
17747+++ b/arch/x86/kernel/vm86_32.c
17748@@ -41,6 +41,7 @@
17749 #include <linux/ptrace.h>
17750 #include <linux/audit.h>
17751 #include <linux/stddef.h>
17752+#include <linux/grsecurity.h>
17753
17754 #include <asm/uaccess.h>
17755 #include <asm/io.h>
17756@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
17757 do_exit(SIGSEGV);
17758 }
17759
17760- tss = &per_cpu(init_tss, get_cpu());
17761+ tss = init_tss + get_cpu();
17762 current->thread.sp0 = current->thread.saved_sp0;
17763 current->thread.sysenter_cs = __KERNEL_CS;
17764 load_sp0(tss, &current->thread);
17765@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
17766 struct task_struct *tsk;
17767 int tmp, ret = -EPERM;
17768
17769+#ifdef CONFIG_GRKERNSEC_VM86
17770+ if (!capable(CAP_SYS_RAWIO)) {
17771+ gr_handle_vm86();
17772+ goto out;
17773+ }
17774+#endif
17775+
17776 tsk = current;
17777 if (tsk->thread.saved_sp0)
17778 goto out;
17779@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
17780 int tmp, ret;
17781 struct vm86plus_struct __user *v86;
17782
17783+#ifdef CONFIG_GRKERNSEC_VM86
17784+ if (!capable(CAP_SYS_RAWIO)) {
17785+ gr_handle_vm86();
17786+ ret = -EPERM;
17787+ goto out;
17788+ }
17789+#endif
17790+
17791 tsk = current;
17792 switch (cmd) {
17793 case VM86_REQUEST_IRQ:
17794@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
17795 tsk->thread.saved_fs = info->regs32->fs;
17796 tsk->thread.saved_gs = get_user_gs(info->regs32);
17797
17798- tss = &per_cpu(init_tss, get_cpu());
17799+ tss = init_tss + get_cpu();
17800 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
17801 if (cpu_has_sep)
17802 tsk->thread.sysenter_cs = 0;
17803@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
17804 goto cannot_handle;
17805 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
17806 goto cannot_handle;
17807- intr_ptr = (unsigned long __user *) (i << 2);
17808+ intr_ptr = (__force unsigned long __user *) (i << 2);
17809 if (get_user(segoffs, intr_ptr))
17810 goto cannot_handle;
17811 if ((segoffs >> 16) == BIOSSEG)
17812diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
17813index 0f703f1..9e15f64 100644
17814--- a/arch/x86/kernel/vmlinux.lds.S
17815+++ b/arch/x86/kernel/vmlinux.lds.S
17816@@ -26,6 +26,13 @@
17817 #include <asm/page_types.h>
17818 #include <asm/cache.h>
17819 #include <asm/boot.h>
17820+#include <asm/segment.h>
17821+
17822+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17823+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
17824+#else
17825+#define __KERNEL_TEXT_OFFSET 0
17826+#endif
17827
17828 #undef i386 /* in case the preprocessor is a 32bit one */
17829
17830@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
17831
17832 PHDRS {
17833 text PT_LOAD FLAGS(5); /* R_E */
17834+#ifdef CONFIG_X86_32
17835+ module PT_LOAD FLAGS(5); /* R_E */
17836+#endif
17837+#ifdef CONFIG_XEN
17838+ rodata PT_LOAD FLAGS(5); /* R_E */
17839+#else
17840+ rodata PT_LOAD FLAGS(4); /* R__ */
17841+#endif
17842 data PT_LOAD FLAGS(6); /* RW_ */
17843-#ifdef CONFIG_X86_64
17844+ init.begin PT_LOAD FLAGS(6); /* RW_ */
17845 #ifdef CONFIG_SMP
17846 percpu PT_LOAD FLAGS(6); /* RW_ */
17847 #endif
17848+ text.init PT_LOAD FLAGS(5); /* R_E */
17849+ text.exit PT_LOAD FLAGS(5); /* R_E */
17850 init PT_LOAD FLAGS(7); /* RWE */
17851-#endif
17852 note PT_NOTE FLAGS(0); /* ___ */
17853 }
17854
17855 SECTIONS
17856 {
17857 #ifdef CONFIG_X86_32
17858- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
17859- phys_startup_32 = startup_32 - LOAD_OFFSET;
17860+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
17861 #else
17862- . = __START_KERNEL;
17863- phys_startup_64 = startup_64 - LOAD_OFFSET;
17864+ . = __START_KERNEL;
17865 #endif
17866
17867 /* Text and read-only data */
17868- .text : AT(ADDR(.text) - LOAD_OFFSET) {
17869- _text = .;
17870+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
17871 /* bootstrapping code */
17872+#ifdef CONFIG_X86_32
17873+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
17874+#else
17875+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
17876+#endif
17877+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
17878+ _text = .;
17879 HEAD_TEXT
17880 #ifdef CONFIG_X86_32
17881 . = ALIGN(PAGE_SIZE);
17882@@ -108,13 +128,47 @@ SECTIONS
17883 IRQENTRY_TEXT
17884 *(.fixup)
17885 *(.gnu.warning)
17886- /* End of text section */
17887- _etext = .;
17888 } :text = 0x9090
17889
17890- NOTES :text :note
17891+ . += __KERNEL_TEXT_OFFSET;
17892
17893- EXCEPTION_TABLE(16) :text = 0x9090
17894+#ifdef CONFIG_X86_32
17895+ . = ALIGN(PAGE_SIZE);
17896+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
17897+
17898+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
17899+ MODULES_EXEC_VADDR = .;
17900+ BYTE(0)
17901+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
17902+ . = ALIGN(HPAGE_SIZE);
17903+ MODULES_EXEC_END = . - 1;
17904+#endif
17905+
17906+ } :module
17907+#endif
17908+
17909+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
17910+ /* End of text section */
17911+ _etext = . - __KERNEL_TEXT_OFFSET;
17912+ }
17913+
17914+#ifdef CONFIG_X86_32
17915+ . = ALIGN(PAGE_SIZE);
17916+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
17917+ *(.idt)
17918+ . = ALIGN(PAGE_SIZE);
17919+ *(.empty_zero_page)
17920+ *(.initial_pg_fixmap)
17921+ *(.initial_pg_pmd)
17922+ *(.initial_page_table)
17923+ *(.swapper_pg_dir)
17924+ } :rodata
17925+#endif
17926+
17927+ . = ALIGN(PAGE_SIZE);
17928+ NOTES :rodata :note
17929+
17930+ EXCEPTION_TABLE(16) :rodata
17931
17932 #if defined(CONFIG_DEBUG_RODATA)
17933 /* .text should occupy whole number of pages */
17934@@ -126,16 +180,20 @@ SECTIONS
17935
17936 /* Data */
17937 .data : AT(ADDR(.data) - LOAD_OFFSET) {
17938+
17939+#ifdef CONFIG_PAX_KERNEXEC
17940+ . = ALIGN(HPAGE_SIZE);
17941+#else
17942+ . = ALIGN(PAGE_SIZE);
17943+#endif
17944+
17945 /* Start of data section */
17946 _sdata = .;
17947
17948 /* init_task */
17949 INIT_TASK_DATA(THREAD_SIZE)
17950
17951-#ifdef CONFIG_X86_32
17952- /* 32 bit has nosave before _edata */
17953 NOSAVE_DATA
17954-#endif
17955
17956 PAGE_ALIGNED_DATA(PAGE_SIZE)
17957
17958@@ -176,12 +234,19 @@ SECTIONS
17959 #endif /* CONFIG_X86_64 */
17960
17961 /* Init code and data - will be freed after init */
17962- . = ALIGN(PAGE_SIZE);
17963 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
17964+ BYTE(0)
17965+
17966+#ifdef CONFIG_PAX_KERNEXEC
17967+ . = ALIGN(HPAGE_SIZE);
17968+#else
17969+ . = ALIGN(PAGE_SIZE);
17970+#endif
17971+
17972 __init_begin = .; /* paired with __init_end */
17973- }
17974+ } :init.begin
17975
17976-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
17977+#ifdef CONFIG_SMP
17978 /*
17979 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
17980 * output PHDR, so the next output section - .init.text - should
17981@@ -190,12 +255,27 @@ SECTIONS
17982 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
17983 #endif
17984
17985- INIT_TEXT_SECTION(PAGE_SIZE)
17986-#ifdef CONFIG_X86_64
17987- :init
17988-#endif
17989+ . = ALIGN(PAGE_SIZE);
17990+ init_begin = .;
17991+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
17992+ VMLINUX_SYMBOL(_sinittext) = .;
17993+ INIT_TEXT
17994+ VMLINUX_SYMBOL(_einittext) = .;
17995+ . = ALIGN(PAGE_SIZE);
17996+ } :text.init
17997
17998- INIT_DATA_SECTION(16)
17999+ /*
18000+ * .exit.text is discard at runtime, not link time, to deal with
18001+ * references from .altinstructions and .eh_frame
18002+ */
18003+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
18004+ EXIT_TEXT
18005+ . = ALIGN(16);
18006+ } :text.exit
18007+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
18008+
18009+ . = ALIGN(PAGE_SIZE);
18010+ INIT_DATA_SECTION(16) :init
18011
18012 /*
18013 * Code and data for a variety of lowlevel trampolines, to be
18014@@ -269,19 +349,12 @@ SECTIONS
18015 }
18016
18017 . = ALIGN(8);
18018- /*
18019- * .exit.text is discard at runtime, not link time, to deal with
18020- * references from .altinstructions and .eh_frame
18021- */
18022- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
18023- EXIT_TEXT
18024- }
18025
18026 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
18027 EXIT_DATA
18028 }
18029
18030-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
18031+#ifndef CONFIG_SMP
18032 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
18033 #endif
18034
18035@@ -300,16 +373,10 @@ SECTIONS
18036 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
18037 __smp_locks = .;
18038 *(.smp_locks)
18039- . = ALIGN(PAGE_SIZE);
18040 __smp_locks_end = .;
18041+ . = ALIGN(PAGE_SIZE);
18042 }
18043
18044-#ifdef CONFIG_X86_64
18045- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
18046- NOSAVE_DATA
18047- }
18048-#endif
18049-
18050 /* BSS */
18051 . = ALIGN(PAGE_SIZE);
18052 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
18053@@ -325,6 +392,7 @@ SECTIONS
18054 __brk_base = .;
18055 . += 64 * 1024; /* 64k alignment slop space */
18056 *(.brk_reservation) /* areas brk users have reserved */
18057+ . = ALIGN(HPAGE_SIZE);
18058 __brk_limit = .;
18059 }
18060
18061@@ -351,13 +419,12 @@ SECTIONS
18062 * for the boot processor.
18063 */
18064 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
18065-INIT_PER_CPU(gdt_page);
18066 INIT_PER_CPU(irq_stack_union);
18067
18068 /*
18069 * Build-time check on the image size:
18070 */
18071-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
18072+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
18073 "kernel image bigger than KERNEL_IMAGE_SIZE");
18074
18075 #ifdef CONFIG_SMP
18076diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
18077index e4d4a22..47ee71f 100644
18078--- a/arch/x86/kernel/vsyscall_64.c
18079+++ b/arch/x86/kernel/vsyscall_64.c
18080@@ -57,15 +57,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
18081 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
18082 };
18083
18084-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
18085+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
18086
18087 static int __init vsyscall_setup(char *str)
18088 {
18089 if (str) {
18090 if (!strcmp("emulate", str))
18091 vsyscall_mode = EMULATE;
18092- else if (!strcmp("native", str))
18093- vsyscall_mode = NATIVE;
18094 else if (!strcmp("none", str))
18095 vsyscall_mode = NONE;
18096 else
18097@@ -178,7 +176,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
18098
18099 tsk = current;
18100 if (seccomp_mode(&tsk->seccomp))
18101- do_exit(SIGKILL);
18102+ do_group_exit(SIGKILL);
18103
18104 switch (vsyscall_nr) {
18105 case 0:
18106@@ -220,8 +218,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
18107 return true;
18108
18109 sigsegv:
18110- force_sig(SIGSEGV, current);
18111- return true;
18112+ do_group_exit(SIGKILL);
18113 }
18114
18115 /*
18116@@ -274,10 +271,7 @@ void __init map_vsyscall(void)
18117 extern char __vvar_page;
18118 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
18119
18120- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
18121- vsyscall_mode == NATIVE
18122- ? PAGE_KERNEL_VSYSCALL
18123- : PAGE_KERNEL_VVAR);
18124+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
18125 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
18126 (unsigned long)VSYSCALL_START);
18127
18128diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
18129index 9796c2f..f686fbf 100644
18130--- a/arch/x86/kernel/x8664_ksyms_64.c
18131+++ b/arch/x86/kernel/x8664_ksyms_64.c
18132@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
18133 EXPORT_SYMBOL(copy_user_generic_string);
18134 EXPORT_SYMBOL(copy_user_generic_unrolled);
18135 EXPORT_SYMBOL(__copy_user_nocache);
18136-EXPORT_SYMBOL(_copy_from_user);
18137-EXPORT_SYMBOL(_copy_to_user);
18138
18139 EXPORT_SYMBOL(copy_page);
18140 EXPORT_SYMBOL(clear_page);
18141diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
18142index a391134..d0b63b6e 100644
18143--- a/arch/x86/kernel/xsave.c
18144+++ b/arch/x86/kernel/xsave.c
18145@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
18146 fx_sw_user->xstate_size > fx_sw_user->extended_size)
18147 return -EINVAL;
18148
18149- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
18150+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
18151 fx_sw_user->extended_size -
18152 FP_XSTATE_MAGIC2_SIZE));
18153 if (err)
18154@@ -267,7 +267,7 @@ fx_only:
18155 * the other extended state.
18156 */
18157 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
18158- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
18159+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
18160 }
18161
18162 /*
18163@@ -299,7 +299,7 @@ int restore_i387_xstate(void __user *buf)
18164 if (use_xsave())
18165 err = restore_user_xstate(buf);
18166 else
18167- err = fxrstor_checking((__force struct i387_fxsave_struct *)
18168+ err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
18169 buf);
18170 if (unlikely(err)) {
18171 /*
18172diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
18173index f1e3be1..588efc8 100644
18174--- a/arch/x86/kvm/emulate.c
18175+++ b/arch/x86/kvm/emulate.c
18176@@ -249,6 +249,7 @@ struct gprefix {
18177
18178 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
18179 do { \
18180+ unsigned long _tmp; \
18181 __asm__ __volatile__ ( \
18182 _PRE_EFLAGS("0", "4", "2") \
18183 _op _suffix " %"_x"3,%1; " \
18184@@ -263,8 +264,6 @@ struct gprefix {
18185 /* Raw emulation: instruction has two explicit operands. */
18186 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
18187 do { \
18188- unsigned long _tmp; \
18189- \
18190 switch ((ctxt)->dst.bytes) { \
18191 case 2: \
18192 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
18193@@ -280,7 +279,6 @@ struct gprefix {
18194
18195 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
18196 do { \
18197- unsigned long _tmp; \
18198 switch ((ctxt)->dst.bytes) { \
18199 case 1: \
18200 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
18201diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
18202index 54abb40..a192606 100644
18203--- a/arch/x86/kvm/lapic.c
18204+++ b/arch/x86/kvm/lapic.c
18205@@ -53,7 +53,7 @@
18206 #define APIC_BUS_CYCLE_NS 1
18207
18208 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
18209-#define apic_debug(fmt, arg...)
18210+#define apic_debug(fmt, arg...) do {} while (0)
18211
18212 #define APIC_LVT_NUM 6
18213 /* 14 is the version for Xeon and Pentium 8.4.8*/
18214diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
18215index f1b36cf..af8a124 100644
18216--- a/arch/x86/kvm/mmu.c
18217+++ b/arch/x86/kvm/mmu.c
18218@@ -3555,7 +3555,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
18219
18220 pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
18221
18222- invlpg_counter = atomic_read(&vcpu->kvm->arch.invlpg_counter);
18223+ invlpg_counter = atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter);
18224
18225 /*
18226 * Assume that the pte write on a page table of the same type
18227@@ -3587,7 +3587,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
18228 }
18229
18230 spin_lock(&vcpu->kvm->mmu_lock);
18231- if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
18232+ if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
18233 gentry = 0;
18234 kvm_mmu_free_some_pages(vcpu);
18235 ++vcpu->kvm->stat.mmu_pte_write;
18236diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
18237index 9299410..ade2f9b 100644
18238--- a/arch/x86/kvm/paging_tmpl.h
18239+++ b/arch/x86/kvm/paging_tmpl.h
18240@@ -197,7 +197,7 @@ retry_walk:
18241 if (unlikely(kvm_is_error_hva(host_addr)))
18242 goto error;
18243
18244- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
18245+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
18246 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
18247 goto error;
18248
18249@@ -705,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)
18250 if (need_flush)
18251 kvm_flush_remote_tlbs(vcpu->kvm);
18252
18253- atomic_inc(&vcpu->kvm->arch.invlpg_counter);
18254+ atomic_inc_unchecked(&vcpu->kvm->arch.invlpg_counter);
18255
18256 spin_unlock(&vcpu->kvm->mmu_lock);
18257
18258diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
18259index e32243e..a6e6172 100644
18260--- a/arch/x86/kvm/svm.c
18261+++ b/arch/x86/kvm/svm.c
18262@@ -3400,7 +3400,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
18263 int cpu = raw_smp_processor_id();
18264
18265 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
18266+
18267+ pax_open_kernel();
18268 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
18269+ pax_close_kernel();
18270+
18271 load_TR_desc();
18272 }
18273
18274@@ -3778,6 +3782,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
18275 #endif
18276 #endif
18277
18278+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
18279+ __set_fs(current_thread_info()->addr_limit);
18280+#endif
18281+
18282 reload_tss(vcpu);
18283
18284 local_irq_disable();
18285diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
18286index 579a0b5..ed7bbf9 100644
18287--- a/arch/x86/kvm/vmx.c
18288+++ b/arch/x86/kvm/vmx.c
18289@@ -1305,7 +1305,11 @@ static void reload_tss(void)
18290 struct desc_struct *descs;
18291
18292 descs = (void *)gdt->address;
18293+
18294+ pax_open_kernel();
18295 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
18296+ pax_close_kernel();
18297+
18298 load_TR_desc();
18299 }
18300
18301@@ -2633,8 +2637,11 @@ static __init int hardware_setup(void)
18302 if (!cpu_has_vmx_flexpriority())
18303 flexpriority_enabled = 0;
18304
18305- if (!cpu_has_vmx_tpr_shadow())
18306- kvm_x86_ops->update_cr8_intercept = NULL;
18307+ if (!cpu_has_vmx_tpr_shadow()) {
18308+ pax_open_kernel();
18309+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
18310+ pax_close_kernel();
18311+ }
18312
18313 if (enable_ept && !cpu_has_vmx_ept_2m_page())
18314 kvm_disable_largepages();
18315@@ -3648,7 +3655,7 @@ static void vmx_set_constant_host_state(void)
18316 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
18317
18318 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
18319- vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
18320+ vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
18321
18322 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
18323 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
18324@@ -6169,6 +6176,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
18325 "jmp .Lkvm_vmx_return \n\t"
18326 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
18327 ".Lkvm_vmx_return: "
18328+
18329+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18330+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
18331+ ".Lkvm_vmx_return2: "
18332+#endif
18333+
18334 /* Save guest registers, load host registers, keep flags */
18335 "mov %0, %c[wordsize](%%"R"sp) \n\t"
18336 "pop %0 \n\t"
18337@@ -6217,6 +6230,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
18338 #endif
18339 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
18340 [wordsize]"i"(sizeof(ulong))
18341+
18342+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18343+ ,[cs]"i"(__KERNEL_CS)
18344+#endif
18345+
18346 : "cc", "memory"
18347 , R"ax", R"bx", R"di", R"si"
18348 #ifdef CONFIG_X86_64
18349@@ -6245,7 +6263,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
18350 }
18351 }
18352
18353- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
18354+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
18355+
18356+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18357+ loadsegment(fs, __KERNEL_PERCPU);
18358+#endif
18359+
18360+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
18361+ __set_fs(current_thread_info()->addr_limit);
18362+#endif
18363+
18364 vmx->loaded_vmcs->launched = 1;
18365
18366 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
18367diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
18368index 4c938da..4ddef65 100644
18369--- a/arch/x86/kvm/x86.c
18370+++ b/arch/x86/kvm/x86.c
18371@@ -1345,8 +1345,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
18372 {
18373 struct kvm *kvm = vcpu->kvm;
18374 int lm = is_long_mode(vcpu);
18375- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
18376- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
18377+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
18378+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
18379 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
18380 : kvm->arch.xen_hvm_config.blob_size_32;
18381 u32 page_num = data & ~PAGE_MASK;
18382@@ -2165,6 +2165,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
18383 if (n < msr_list.nmsrs)
18384 goto out;
18385 r = -EFAULT;
18386+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
18387+ goto out;
18388 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
18389 num_msrs_to_save * sizeof(u32)))
18390 goto out;
18391@@ -2340,15 +2342,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
18392 struct kvm_cpuid2 *cpuid,
18393 struct kvm_cpuid_entry2 __user *entries)
18394 {
18395- int r;
18396+ int r, i;
18397
18398 r = -E2BIG;
18399 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
18400 goto out;
18401 r = -EFAULT;
18402- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
18403- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
18404+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
18405 goto out;
18406+ for (i = 0; i < cpuid->nent; ++i) {
18407+ struct kvm_cpuid_entry2 cpuid_entry;
18408+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
18409+ goto out;
18410+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
18411+ }
18412 vcpu->arch.cpuid_nent = cpuid->nent;
18413 kvm_apic_set_version(vcpu);
18414 kvm_x86_ops->cpuid_update(vcpu);
18415@@ -2363,15 +2370,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
18416 struct kvm_cpuid2 *cpuid,
18417 struct kvm_cpuid_entry2 __user *entries)
18418 {
18419- int r;
18420+ int r, i;
18421
18422 r = -E2BIG;
18423 if (cpuid->nent < vcpu->arch.cpuid_nent)
18424 goto out;
18425 r = -EFAULT;
18426- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
18427- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
18428+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
18429 goto out;
18430+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
18431+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
18432+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
18433+ goto out;
18434+ }
18435 return 0;
18436
18437 out:
18438@@ -2746,7 +2757,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
18439 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
18440 struct kvm_interrupt *irq)
18441 {
18442- if (irq->irq < 0 || irq->irq >= 256)
18443+ if (irq->irq >= 256)
18444 return -EINVAL;
18445 if (irqchip_in_kernel(vcpu->kvm))
18446 return -ENXIO;
18447@@ -5162,7 +5173,7 @@ static void kvm_set_mmio_spte_mask(void)
18448 kvm_mmu_set_mmio_spte_mask(mask);
18449 }
18450
18451-int kvm_arch_init(void *opaque)
18452+int kvm_arch_init(const void *opaque)
18453 {
18454 int r;
18455 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
18456diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
18457index cf4603b..7cdde38 100644
18458--- a/arch/x86/lguest/boot.c
18459+++ b/arch/x86/lguest/boot.c
18460@@ -1195,9 +1195,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
18461 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
18462 * Launcher to reboot us.
18463 */
18464-static void lguest_restart(char *reason)
18465+static __noreturn void lguest_restart(char *reason)
18466 {
18467 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
18468+ BUG();
18469 }
18470
18471 /*G:050
18472diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
18473index 042f682..c92afb6 100644
18474--- a/arch/x86/lib/atomic64_32.c
18475+++ b/arch/x86/lib/atomic64_32.c
18476@@ -8,18 +8,30 @@
18477
18478 long long atomic64_read_cx8(long long, const atomic64_t *v);
18479 EXPORT_SYMBOL(atomic64_read_cx8);
18480+long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v);
18481+EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
18482 long long atomic64_set_cx8(long long, const atomic64_t *v);
18483 EXPORT_SYMBOL(atomic64_set_cx8);
18484+long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
18485+EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
18486 long long atomic64_xchg_cx8(long long, unsigned high);
18487 EXPORT_SYMBOL(atomic64_xchg_cx8);
18488 long long atomic64_add_return_cx8(long long a, atomic64_t *v);
18489 EXPORT_SYMBOL(atomic64_add_return_cx8);
18490+long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
18491+EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
18492 long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
18493 EXPORT_SYMBOL(atomic64_sub_return_cx8);
18494+long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
18495+EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
18496 long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
18497 EXPORT_SYMBOL(atomic64_inc_return_cx8);
18498+long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
18499+EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
18500 long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
18501 EXPORT_SYMBOL(atomic64_dec_return_cx8);
18502+long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
18503+EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
18504 long long atomic64_dec_if_positive_cx8(atomic64_t *v);
18505 EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
18506 int atomic64_inc_not_zero_cx8(atomic64_t *v);
18507@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
18508 #ifndef CONFIG_X86_CMPXCHG64
18509 long long atomic64_read_386(long long, const atomic64_t *v);
18510 EXPORT_SYMBOL(atomic64_read_386);
18511+long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
18512+EXPORT_SYMBOL(atomic64_read_unchecked_386);
18513 long long atomic64_set_386(long long, const atomic64_t *v);
18514 EXPORT_SYMBOL(atomic64_set_386);
18515+long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
18516+EXPORT_SYMBOL(atomic64_set_unchecked_386);
18517 long long atomic64_xchg_386(long long, unsigned high);
18518 EXPORT_SYMBOL(atomic64_xchg_386);
18519 long long atomic64_add_return_386(long long a, atomic64_t *v);
18520 EXPORT_SYMBOL(atomic64_add_return_386);
18521+long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
18522+EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
18523 long long atomic64_sub_return_386(long long a, atomic64_t *v);
18524 EXPORT_SYMBOL(atomic64_sub_return_386);
18525+long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
18526+EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
18527 long long atomic64_inc_return_386(long long a, atomic64_t *v);
18528 EXPORT_SYMBOL(atomic64_inc_return_386);
18529+long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
18530+EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
18531 long long atomic64_dec_return_386(long long a, atomic64_t *v);
18532 EXPORT_SYMBOL(atomic64_dec_return_386);
18533+long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
18534+EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
18535 long long atomic64_add_386(long long a, atomic64_t *v);
18536 EXPORT_SYMBOL(atomic64_add_386);
18537+long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
18538+EXPORT_SYMBOL(atomic64_add_unchecked_386);
18539 long long atomic64_sub_386(long long a, atomic64_t *v);
18540 EXPORT_SYMBOL(atomic64_sub_386);
18541+long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
18542+EXPORT_SYMBOL(atomic64_sub_unchecked_386);
18543 long long atomic64_inc_386(long long a, atomic64_t *v);
18544 EXPORT_SYMBOL(atomic64_inc_386);
18545+long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
18546+EXPORT_SYMBOL(atomic64_inc_unchecked_386);
18547 long long atomic64_dec_386(long long a, atomic64_t *v);
18548 EXPORT_SYMBOL(atomic64_dec_386);
18549+long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
18550+EXPORT_SYMBOL(atomic64_dec_unchecked_386);
18551 long long atomic64_dec_if_positive_386(atomic64_t *v);
18552 EXPORT_SYMBOL(atomic64_dec_if_positive_386);
18553 int atomic64_inc_not_zero_386(atomic64_t *v);
18554diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
18555index e8e7e0d..56fd1b0 100644
18556--- a/arch/x86/lib/atomic64_386_32.S
18557+++ b/arch/x86/lib/atomic64_386_32.S
18558@@ -48,6 +48,10 @@ BEGIN(read)
18559 movl (v), %eax
18560 movl 4(v), %edx
18561 RET_ENDP
18562+BEGIN(read_unchecked)
18563+ movl (v), %eax
18564+ movl 4(v), %edx
18565+RET_ENDP
18566 #undef v
18567
18568 #define v %esi
18569@@ -55,6 +59,10 @@ BEGIN(set)
18570 movl %ebx, (v)
18571 movl %ecx, 4(v)
18572 RET_ENDP
18573+BEGIN(set_unchecked)
18574+ movl %ebx, (v)
18575+ movl %ecx, 4(v)
18576+RET_ENDP
18577 #undef v
18578
18579 #define v %esi
18580@@ -70,6 +78,20 @@ RET_ENDP
18581 BEGIN(add)
18582 addl %eax, (v)
18583 adcl %edx, 4(v)
18584+
18585+#ifdef CONFIG_PAX_REFCOUNT
18586+ jno 0f
18587+ subl %eax, (v)
18588+ sbbl %edx, 4(v)
18589+ int $4
18590+0:
18591+ _ASM_EXTABLE(0b, 0b)
18592+#endif
18593+
18594+RET_ENDP
18595+BEGIN(add_unchecked)
18596+ addl %eax, (v)
18597+ adcl %edx, 4(v)
18598 RET_ENDP
18599 #undef v
18600
18601@@ -77,6 +99,24 @@ RET_ENDP
18602 BEGIN(add_return)
18603 addl (v), %eax
18604 adcl 4(v), %edx
18605+
18606+#ifdef CONFIG_PAX_REFCOUNT
18607+ into
18608+1234:
18609+ _ASM_EXTABLE(1234b, 2f)
18610+#endif
18611+
18612+ movl %eax, (v)
18613+ movl %edx, 4(v)
18614+
18615+#ifdef CONFIG_PAX_REFCOUNT
18616+2:
18617+#endif
18618+
18619+RET_ENDP
18620+BEGIN(add_return_unchecked)
18621+ addl (v), %eax
18622+ adcl 4(v), %edx
18623 movl %eax, (v)
18624 movl %edx, 4(v)
18625 RET_ENDP
18626@@ -86,6 +126,20 @@ RET_ENDP
18627 BEGIN(sub)
18628 subl %eax, (v)
18629 sbbl %edx, 4(v)
18630+
18631+#ifdef CONFIG_PAX_REFCOUNT
18632+ jno 0f
18633+ addl %eax, (v)
18634+ adcl %edx, 4(v)
18635+ int $4
18636+0:
18637+ _ASM_EXTABLE(0b, 0b)
18638+#endif
18639+
18640+RET_ENDP
18641+BEGIN(sub_unchecked)
18642+ subl %eax, (v)
18643+ sbbl %edx, 4(v)
18644 RET_ENDP
18645 #undef v
18646
18647@@ -96,6 +150,27 @@ BEGIN(sub_return)
18648 sbbl $0, %edx
18649 addl (v), %eax
18650 adcl 4(v), %edx
18651+
18652+#ifdef CONFIG_PAX_REFCOUNT
18653+ into
18654+1234:
18655+ _ASM_EXTABLE(1234b, 2f)
18656+#endif
18657+
18658+ movl %eax, (v)
18659+ movl %edx, 4(v)
18660+
18661+#ifdef CONFIG_PAX_REFCOUNT
18662+2:
18663+#endif
18664+
18665+RET_ENDP
18666+BEGIN(sub_return_unchecked)
18667+ negl %edx
18668+ negl %eax
18669+ sbbl $0, %edx
18670+ addl (v), %eax
18671+ adcl 4(v), %edx
18672 movl %eax, (v)
18673 movl %edx, 4(v)
18674 RET_ENDP
18675@@ -105,6 +180,20 @@ RET_ENDP
18676 BEGIN(inc)
18677 addl $1, (v)
18678 adcl $0, 4(v)
18679+
18680+#ifdef CONFIG_PAX_REFCOUNT
18681+ jno 0f
18682+ subl $1, (v)
18683+ sbbl $0, 4(v)
18684+ int $4
18685+0:
18686+ _ASM_EXTABLE(0b, 0b)
18687+#endif
18688+
18689+RET_ENDP
18690+BEGIN(inc_unchecked)
18691+ addl $1, (v)
18692+ adcl $0, 4(v)
18693 RET_ENDP
18694 #undef v
18695
18696@@ -114,6 +203,26 @@ BEGIN(inc_return)
18697 movl 4(v), %edx
18698 addl $1, %eax
18699 adcl $0, %edx
18700+
18701+#ifdef CONFIG_PAX_REFCOUNT
18702+ into
18703+1234:
18704+ _ASM_EXTABLE(1234b, 2f)
18705+#endif
18706+
18707+ movl %eax, (v)
18708+ movl %edx, 4(v)
18709+
18710+#ifdef CONFIG_PAX_REFCOUNT
18711+2:
18712+#endif
18713+
18714+RET_ENDP
18715+BEGIN(inc_return_unchecked)
18716+ movl (v), %eax
18717+ movl 4(v), %edx
18718+ addl $1, %eax
18719+ adcl $0, %edx
18720 movl %eax, (v)
18721 movl %edx, 4(v)
18722 RET_ENDP
18723@@ -123,6 +232,20 @@ RET_ENDP
18724 BEGIN(dec)
18725 subl $1, (v)
18726 sbbl $0, 4(v)
18727+
18728+#ifdef CONFIG_PAX_REFCOUNT
18729+ jno 0f
18730+ addl $1, (v)
18731+ adcl $0, 4(v)
18732+ int $4
18733+0:
18734+ _ASM_EXTABLE(0b, 0b)
18735+#endif
18736+
18737+RET_ENDP
18738+BEGIN(dec_unchecked)
18739+ subl $1, (v)
18740+ sbbl $0, 4(v)
18741 RET_ENDP
18742 #undef v
18743
18744@@ -132,6 +255,26 @@ BEGIN(dec_return)
18745 movl 4(v), %edx
18746 subl $1, %eax
18747 sbbl $0, %edx
18748+
18749+#ifdef CONFIG_PAX_REFCOUNT
18750+ into
18751+1234:
18752+ _ASM_EXTABLE(1234b, 2f)
18753+#endif
18754+
18755+ movl %eax, (v)
18756+ movl %edx, 4(v)
18757+
18758+#ifdef CONFIG_PAX_REFCOUNT
18759+2:
18760+#endif
18761+
18762+RET_ENDP
18763+BEGIN(dec_return_unchecked)
18764+ movl (v), %eax
18765+ movl 4(v), %edx
18766+ subl $1, %eax
18767+ sbbl $0, %edx
18768 movl %eax, (v)
18769 movl %edx, 4(v)
18770 RET_ENDP
18771@@ -143,6 +286,13 @@ BEGIN(add_unless)
18772 adcl %edx, %edi
18773 addl (v), %eax
18774 adcl 4(v), %edx
18775+
18776+#ifdef CONFIG_PAX_REFCOUNT
18777+ into
18778+1234:
18779+ _ASM_EXTABLE(1234b, 2f)
18780+#endif
18781+
18782 cmpl %eax, %esi
18783 je 3f
18784 1:
18785@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
18786 1:
18787 addl $1, %eax
18788 adcl $0, %edx
18789+
18790+#ifdef CONFIG_PAX_REFCOUNT
18791+ into
18792+1234:
18793+ _ASM_EXTABLE(1234b, 2f)
18794+#endif
18795+
18796 movl %eax, (v)
18797 movl %edx, 4(v)
18798 movl $1, %eax
18799@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
18800 movl 4(v), %edx
18801 subl $1, %eax
18802 sbbl $0, %edx
18803+
18804+#ifdef CONFIG_PAX_REFCOUNT
18805+ into
18806+1234:
18807+ _ASM_EXTABLE(1234b, 1f)
18808+#endif
18809+
18810 js 1f
18811 movl %eax, (v)
18812 movl %edx, 4(v)
18813diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
18814index 391a083..d658e9f 100644
18815--- a/arch/x86/lib/atomic64_cx8_32.S
18816+++ b/arch/x86/lib/atomic64_cx8_32.S
18817@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
18818 CFI_STARTPROC
18819
18820 read64 %ecx
18821+ pax_force_retaddr
18822 ret
18823 CFI_ENDPROC
18824 ENDPROC(atomic64_read_cx8)
18825
18826+ENTRY(atomic64_read_unchecked_cx8)
18827+ CFI_STARTPROC
18828+
18829+ read64 %ecx
18830+ pax_force_retaddr
18831+ ret
18832+ CFI_ENDPROC
18833+ENDPROC(atomic64_read_unchecked_cx8)
18834+
18835 ENTRY(atomic64_set_cx8)
18836 CFI_STARTPROC
18837
18838@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
18839 cmpxchg8b (%esi)
18840 jne 1b
18841
18842+ pax_force_retaddr
18843 ret
18844 CFI_ENDPROC
18845 ENDPROC(atomic64_set_cx8)
18846
18847+ENTRY(atomic64_set_unchecked_cx8)
18848+ CFI_STARTPROC
18849+
18850+1:
18851+/* we don't need LOCK_PREFIX since aligned 64-bit writes
18852+ * are atomic on 586 and newer */
18853+ cmpxchg8b (%esi)
18854+ jne 1b
18855+
18856+ pax_force_retaddr
18857+ ret
18858+ CFI_ENDPROC
18859+ENDPROC(atomic64_set_unchecked_cx8)
18860+
18861 ENTRY(atomic64_xchg_cx8)
18862 CFI_STARTPROC
18863
18864@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
18865 cmpxchg8b (%esi)
18866 jne 1b
18867
18868+ pax_force_retaddr
18869 ret
18870 CFI_ENDPROC
18871 ENDPROC(atomic64_xchg_cx8)
18872
18873-.macro addsub_return func ins insc
18874-ENTRY(atomic64_\func\()_return_cx8)
18875+.macro addsub_return func ins insc unchecked=""
18876+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
18877 CFI_STARTPROC
18878 SAVE ebp
18879 SAVE ebx
18880@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
18881 movl %edx, %ecx
18882 \ins\()l %esi, %ebx
18883 \insc\()l %edi, %ecx
18884+
18885+.ifb \unchecked
18886+#ifdef CONFIG_PAX_REFCOUNT
18887+ into
18888+2:
18889+ _ASM_EXTABLE(2b, 3f)
18890+#endif
18891+.endif
18892+
18893 LOCK_PREFIX
18894 cmpxchg8b (%ebp)
18895 jne 1b
18896-
18897-10:
18898 movl %ebx, %eax
18899 movl %ecx, %edx
18900+
18901+.ifb \unchecked
18902+#ifdef CONFIG_PAX_REFCOUNT
18903+3:
18904+#endif
18905+.endif
18906+
18907 RESTORE edi
18908 RESTORE esi
18909 RESTORE ebx
18910 RESTORE ebp
18911+ pax_force_retaddr
18912 ret
18913 CFI_ENDPROC
18914-ENDPROC(atomic64_\func\()_return_cx8)
18915+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
18916 .endm
18917
18918 addsub_return add add adc
18919 addsub_return sub sub sbb
18920+addsub_return add add adc _unchecked
18921+addsub_return sub sub sbb _unchecked
18922
18923-.macro incdec_return func ins insc
18924-ENTRY(atomic64_\func\()_return_cx8)
18925+.macro incdec_return func ins insc unchecked
18926+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
18927 CFI_STARTPROC
18928 SAVE ebx
18929
18930@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
18931 movl %edx, %ecx
18932 \ins\()l $1, %ebx
18933 \insc\()l $0, %ecx
18934+
18935+.ifb \unchecked
18936+#ifdef CONFIG_PAX_REFCOUNT
18937+ into
18938+2:
18939+ _ASM_EXTABLE(2b, 3f)
18940+#endif
18941+.endif
18942+
18943 LOCK_PREFIX
18944 cmpxchg8b (%esi)
18945 jne 1b
18946
18947-10:
18948 movl %ebx, %eax
18949 movl %ecx, %edx
18950+
18951+.ifb \unchecked
18952+#ifdef CONFIG_PAX_REFCOUNT
18953+3:
18954+#endif
18955+.endif
18956+
18957 RESTORE ebx
18958+ pax_force_retaddr
18959 ret
18960 CFI_ENDPROC
18961-ENDPROC(atomic64_\func\()_return_cx8)
18962+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
18963 .endm
18964
18965 incdec_return inc add adc
18966 incdec_return dec sub sbb
18967+incdec_return inc add adc _unchecked
18968+incdec_return dec sub sbb _unchecked
18969
18970 ENTRY(atomic64_dec_if_positive_cx8)
18971 CFI_STARTPROC
18972@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
18973 movl %edx, %ecx
18974 subl $1, %ebx
18975 sbb $0, %ecx
18976+
18977+#ifdef CONFIG_PAX_REFCOUNT
18978+ into
18979+1234:
18980+ _ASM_EXTABLE(1234b, 2f)
18981+#endif
18982+
18983 js 2f
18984 LOCK_PREFIX
18985 cmpxchg8b (%esi)
18986@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
18987 movl %ebx, %eax
18988 movl %ecx, %edx
18989 RESTORE ebx
18990+ pax_force_retaddr
18991 ret
18992 CFI_ENDPROC
18993 ENDPROC(atomic64_dec_if_positive_cx8)
18994@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
18995 movl %edx, %ecx
18996 addl %esi, %ebx
18997 adcl %edi, %ecx
18998+
18999+#ifdef CONFIG_PAX_REFCOUNT
19000+ into
19001+1234:
19002+ _ASM_EXTABLE(1234b, 3f)
19003+#endif
19004+
19005 LOCK_PREFIX
19006 cmpxchg8b (%ebp)
19007 jne 1b
19008@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
19009 CFI_ADJUST_CFA_OFFSET -8
19010 RESTORE ebx
19011 RESTORE ebp
19012+ pax_force_retaddr
19013 ret
19014 4:
19015 cmpl %edx, 4(%esp)
19016@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
19017 movl %edx, %ecx
19018 addl $1, %ebx
19019 adcl $0, %ecx
19020+
19021+#ifdef CONFIG_PAX_REFCOUNT
19022+ into
19023+1234:
19024+ _ASM_EXTABLE(1234b, 3f)
19025+#endif
19026+
19027 LOCK_PREFIX
19028 cmpxchg8b (%esi)
19029 jne 1b
19030@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
19031 movl $1, %eax
19032 3:
19033 RESTORE ebx
19034+ pax_force_retaddr
19035 ret
19036 4:
19037 testl %edx, %edx
19038diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
19039index 78d16a5..fbcf666 100644
19040--- a/arch/x86/lib/checksum_32.S
19041+++ b/arch/x86/lib/checksum_32.S
19042@@ -28,7 +28,8 @@
19043 #include <linux/linkage.h>
19044 #include <asm/dwarf2.h>
19045 #include <asm/errno.h>
19046-
19047+#include <asm/segment.h>
19048+
19049 /*
19050 * computes a partial checksum, e.g. for TCP/UDP fragments
19051 */
19052@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
19053
19054 #define ARGBASE 16
19055 #define FP 12
19056-
19057-ENTRY(csum_partial_copy_generic)
19058+
19059+ENTRY(csum_partial_copy_generic_to_user)
19060 CFI_STARTPROC
19061+
19062+#ifdef CONFIG_PAX_MEMORY_UDEREF
19063+ pushl_cfi %gs
19064+ popl_cfi %es
19065+ jmp csum_partial_copy_generic
19066+#endif
19067+
19068+ENTRY(csum_partial_copy_generic_from_user)
19069+
19070+#ifdef CONFIG_PAX_MEMORY_UDEREF
19071+ pushl_cfi %gs
19072+ popl_cfi %ds
19073+#endif
19074+
19075+ENTRY(csum_partial_copy_generic)
19076 subl $4,%esp
19077 CFI_ADJUST_CFA_OFFSET 4
19078 pushl_cfi %edi
19079@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
19080 jmp 4f
19081 SRC(1: movw (%esi), %bx )
19082 addl $2, %esi
19083-DST( movw %bx, (%edi) )
19084+DST( movw %bx, %es:(%edi) )
19085 addl $2, %edi
19086 addw %bx, %ax
19087 adcl $0, %eax
19088@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
19089 SRC(1: movl (%esi), %ebx )
19090 SRC( movl 4(%esi), %edx )
19091 adcl %ebx, %eax
19092-DST( movl %ebx, (%edi) )
19093+DST( movl %ebx, %es:(%edi) )
19094 adcl %edx, %eax
19095-DST( movl %edx, 4(%edi) )
19096+DST( movl %edx, %es:4(%edi) )
19097
19098 SRC( movl 8(%esi), %ebx )
19099 SRC( movl 12(%esi), %edx )
19100 adcl %ebx, %eax
19101-DST( movl %ebx, 8(%edi) )
19102+DST( movl %ebx, %es:8(%edi) )
19103 adcl %edx, %eax
19104-DST( movl %edx, 12(%edi) )
19105+DST( movl %edx, %es:12(%edi) )
19106
19107 SRC( movl 16(%esi), %ebx )
19108 SRC( movl 20(%esi), %edx )
19109 adcl %ebx, %eax
19110-DST( movl %ebx, 16(%edi) )
19111+DST( movl %ebx, %es:16(%edi) )
19112 adcl %edx, %eax
19113-DST( movl %edx, 20(%edi) )
19114+DST( movl %edx, %es:20(%edi) )
19115
19116 SRC( movl 24(%esi), %ebx )
19117 SRC( movl 28(%esi), %edx )
19118 adcl %ebx, %eax
19119-DST( movl %ebx, 24(%edi) )
19120+DST( movl %ebx, %es:24(%edi) )
19121 adcl %edx, %eax
19122-DST( movl %edx, 28(%edi) )
19123+DST( movl %edx, %es:28(%edi) )
19124
19125 lea 32(%esi), %esi
19126 lea 32(%edi), %edi
19127@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
19128 shrl $2, %edx # This clears CF
19129 SRC(3: movl (%esi), %ebx )
19130 adcl %ebx, %eax
19131-DST( movl %ebx, (%edi) )
19132+DST( movl %ebx, %es:(%edi) )
19133 lea 4(%esi), %esi
19134 lea 4(%edi), %edi
19135 dec %edx
19136@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
19137 jb 5f
19138 SRC( movw (%esi), %cx )
19139 leal 2(%esi), %esi
19140-DST( movw %cx, (%edi) )
19141+DST( movw %cx, %es:(%edi) )
19142 leal 2(%edi), %edi
19143 je 6f
19144 shll $16,%ecx
19145 SRC(5: movb (%esi), %cl )
19146-DST( movb %cl, (%edi) )
19147+DST( movb %cl, %es:(%edi) )
19148 6: addl %ecx, %eax
19149 adcl $0, %eax
19150 7:
19151@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
19152
19153 6001:
19154 movl ARGBASE+20(%esp), %ebx # src_err_ptr
19155- movl $-EFAULT, (%ebx)
19156+ movl $-EFAULT, %ss:(%ebx)
19157
19158 # zero the complete destination - computing the rest
19159 # is too much work
19160@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
19161
19162 6002:
19163 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
19164- movl $-EFAULT,(%ebx)
19165+ movl $-EFAULT,%ss:(%ebx)
19166 jmp 5000b
19167
19168 .previous
19169
19170+ pushl_cfi %ss
19171+ popl_cfi %ds
19172+ pushl_cfi %ss
19173+ popl_cfi %es
19174 popl_cfi %ebx
19175 CFI_RESTORE ebx
19176 popl_cfi %esi
19177@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
19178 popl_cfi %ecx # equivalent to addl $4,%esp
19179 ret
19180 CFI_ENDPROC
19181-ENDPROC(csum_partial_copy_generic)
19182+ENDPROC(csum_partial_copy_generic_to_user)
19183
19184 #else
19185
19186 /* Version for PentiumII/PPro */
19187
19188 #define ROUND1(x) \
19189+ nop; nop; nop; \
19190 SRC(movl x(%esi), %ebx ) ; \
19191 addl %ebx, %eax ; \
19192- DST(movl %ebx, x(%edi) ) ;
19193+ DST(movl %ebx, %es:x(%edi)) ;
19194
19195 #define ROUND(x) \
19196+ nop; nop; nop; \
19197 SRC(movl x(%esi), %ebx ) ; \
19198 adcl %ebx, %eax ; \
19199- DST(movl %ebx, x(%edi) ) ;
19200+ DST(movl %ebx, %es:x(%edi)) ;
19201
19202 #define ARGBASE 12
19203-
19204-ENTRY(csum_partial_copy_generic)
19205+
19206+ENTRY(csum_partial_copy_generic_to_user)
19207 CFI_STARTPROC
19208+
19209+#ifdef CONFIG_PAX_MEMORY_UDEREF
19210+ pushl_cfi %gs
19211+ popl_cfi %es
19212+ jmp csum_partial_copy_generic
19213+#endif
19214+
19215+ENTRY(csum_partial_copy_generic_from_user)
19216+
19217+#ifdef CONFIG_PAX_MEMORY_UDEREF
19218+ pushl_cfi %gs
19219+ popl_cfi %ds
19220+#endif
19221+
19222+ENTRY(csum_partial_copy_generic)
19223 pushl_cfi %ebx
19224 CFI_REL_OFFSET ebx, 0
19225 pushl_cfi %edi
19226@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
19227 subl %ebx, %edi
19228 lea -1(%esi),%edx
19229 andl $-32,%edx
19230- lea 3f(%ebx,%ebx), %ebx
19231+ lea 3f(%ebx,%ebx,2), %ebx
19232 testl %esi, %esi
19233 jmp *%ebx
19234 1: addl $64,%esi
19235@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
19236 jb 5f
19237 SRC( movw (%esi), %dx )
19238 leal 2(%esi), %esi
19239-DST( movw %dx, (%edi) )
19240+DST( movw %dx, %es:(%edi) )
19241 leal 2(%edi), %edi
19242 je 6f
19243 shll $16,%edx
19244 5:
19245 SRC( movb (%esi), %dl )
19246-DST( movb %dl, (%edi) )
19247+DST( movb %dl, %es:(%edi) )
19248 6: addl %edx, %eax
19249 adcl $0, %eax
19250 7:
19251 .section .fixup, "ax"
19252 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
19253- movl $-EFAULT, (%ebx)
19254+ movl $-EFAULT, %ss:(%ebx)
19255 # zero the complete destination (computing the rest is too much work)
19256 movl ARGBASE+8(%esp),%edi # dst
19257 movl ARGBASE+12(%esp),%ecx # len
19258@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
19259 rep; stosb
19260 jmp 7b
19261 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
19262- movl $-EFAULT, (%ebx)
19263+ movl $-EFAULT, %ss:(%ebx)
19264 jmp 7b
19265 .previous
19266
19267+#ifdef CONFIG_PAX_MEMORY_UDEREF
19268+ pushl_cfi %ss
19269+ popl_cfi %ds
19270+ pushl_cfi %ss
19271+ popl_cfi %es
19272+#endif
19273+
19274 popl_cfi %esi
19275 CFI_RESTORE esi
19276 popl_cfi %edi
19277@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
19278 CFI_RESTORE ebx
19279 ret
19280 CFI_ENDPROC
19281-ENDPROC(csum_partial_copy_generic)
19282+ENDPROC(csum_partial_copy_generic_to_user)
19283
19284 #undef ROUND
19285 #undef ROUND1
19286diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
19287index f2145cf..cea889d 100644
19288--- a/arch/x86/lib/clear_page_64.S
19289+++ b/arch/x86/lib/clear_page_64.S
19290@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
19291 movl $4096/8,%ecx
19292 xorl %eax,%eax
19293 rep stosq
19294+ pax_force_retaddr
19295 ret
19296 CFI_ENDPROC
19297 ENDPROC(clear_page_c)
19298@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
19299 movl $4096,%ecx
19300 xorl %eax,%eax
19301 rep stosb
19302+ pax_force_retaddr
19303 ret
19304 CFI_ENDPROC
19305 ENDPROC(clear_page_c_e)
19306@@ -43,6 +45,7 @@ ENTRY(clear_page)
19307 leaq 64(%rdi),%rdi
19308 jnz .Lloop
19309 nop
19310+ pax_force_retaddr
19311 ret
19312 CFI_ENDPROC
19313 .Lclear_page_end:
19314@@ -58,7 +61,7 @@ ENDPROC(clear_page)
19315
19316 #include <asm/cpufeature.h>
19317
19318- .section .altinstr_replacement,"ax"
19319+ .section .altinstr_replacement,"a"
19320 1: .byte 0xeb /* jmp <disp8> */
19321 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
19322 2: .byte 0xeb /* jmp <disp8> */
19323diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
19324index 1e572c5..2a162cd 100644
19325--- a/arch/x86/lib/cmpxchg16b_emu.S
19326+++ b/arch/x86/lib/cmpxchg16b_emu.S
19327@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
19328
19329 popf
19330 mov $1, %al
19331+ pax_force_retaddr
19332 ret
19333
19334 not_same:
19335 popf
19336 xor %al,%al
19337+ pax_force_retaddr
19338 ret
19339
19340 CFI_ENDPROC
19341diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
19342index 01c805b..dccb07f 100644
19343--- a/arch/x86/lib/copy_page_64.S
19344+++ b/arch/x86/lib/copy_page_64.S
19345@@ -9,6 +9,7 @@ copy_page_c:
19346 CFI_STARTPROC
19347 movl $4096/8,%ecx
19348 rep movsq
19349+ pax_force_retaddr
19350 ret
19351 CFI_ENDPROC
19352 ENDPROC(copy_page_c)
19353@@ -39,7 +40,7 @@ ENTRY(copy_page)
19354 movq 16 (%rsi), %rdx
19355 movq 24 (%rsi), %r8
19356 movq 32 (%rsi), %r9
19357- movq 40 (%rsi), %r10
19358+ movq 40 (%rsi), %r13
19359 movq 48 (%rsi), %r11
19360 movq 56 (%rsi), %r12
19361
19362@@ -50,7 +51,7 @@ ENTRY(copy_page)
19363 movq %rdx, 16 (%rdi)
19364 movq %r8, 24 (%rdi)
19365 movq %r9, 32 (%rdi)
19366- movq %r10, 40 (%rdi)
19367+ movq %r13, 40 (%rdi)
19368 movq %r11, 48 (%rdi)
19369 movq %r12, 56 (%rdi)
19370
19371@@ -69,7 +70,7 @@ ENTRY(copy_page)
19372 movq 16 (%rsi), %rdx
19373 movq 24 (%rsi), %r8
19374 movq 32 (%rsi), %r9
19375- movq 40 (%rsi), %r10
19376+ movq 40 (%rsi), %r13
19377 movq 48 (%rsi), %r11
19378 movq 56 (%rsi), %r12
19379
19380@@ -78,7 +79,7 @@ ENTRY(copy_page)
19381 movq %rdx, 16 (%rdi)
19382 movq %r8, 24 (%rdi)
19383 movq %r9, 32 (%rdi)
19384- movq %r10, 40 (%rdi)
19385+ movq %r13, 40 (%rdi)
19386 movq %r11, 48 (%rdi)
19387 movq %r12, 56 (%rdi)
19388
19389@@ -95,6 +96,7 @@ ENTRY(copy_page)
19390 CFI_RESTORE r13
19391 addq $3*8,%rsp
19392 CFI_ADJUST_CFA_OFFSET -3*8
19393+ pax_force_retaddr
19394 ret
19395 .Lcopy_page_end:
19396 CFI_ENDPROC
19397@@ -105,7 +107,7 @@ ENDPROC(copy_page)
19398
19399 #include <asm/cpufeature.h>
19400
19401- .section .altinstr_replacement,"ax"
19402+ .section .altinstr_replacement,"a"
19403 1: .byte 0xeb /* jmp <disp8> */
19404 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
19405 2:
19406diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
19407index 0248402..821c786 100644
19408--- a/arch/x86/lib/copy_user_64.S
19409+++ b/arch/x86/lib/copy_user_64.S
19410@@ -16,6 +16,7 @@
19411 #include <asm/thread_info.h>
19412 #include <asm/cpufeature.h>
19413 #include <asm/alternative-asm.h>
19414+#include <asm/pgtable.h>
19415
19416 /*
19417 * By placing feature2 after feature1 in altinstructions section, we logically
19418@@ -29,7 +30,7 @@
19419 .byte 0xe9 /* 32bit jump */
19420 .long \orig-1f /* by default jump to orig */
19421 1:
19422- .section .altinstr_replacement,"ax"
19423+ .section .altinstr_replacement,"a"
19424 2: .byte 0xe9 /* near jump with 32bit immediate */
19425 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
19426 3: .byte 0xe9 /* near jump with 32bit immediate */
19427@@ -71,47 +72,20 @@
19428 #endif
19429 .endm
19430
19431-/* Standard copy_to_user with segment limit checking */
19432-ENTRY(_copy_to_user)
19433- CFI_STARTPROC
19434- GET_THREAD_INFO(%rax)
19435- movq %rdi,%rcx
19436- addq %rdx,%rcx
19437- jc bad_to_user
19438- cmpq TI_addr_limit(%rax),%rcx
19439- ja bad_to_user
19440- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
19441- copy_user_generic_unrolled,copy_user_generic_string, \
19442- copy_user_enhanced_fast_string
19443- CFI_ENDPROC
19444-ENDPROC(_copy_to_user)
19445-
19446-/* Standard copy_from_user with segment limit checking */
19447-ENTRY(_copy_from_user)
19448- CFI_STARTPROC
19449- GET_THREAD_INFO(%rax)
19450- movq %rsi,%rcx
19451- addq %rdx,%rcx
19452- jc bad_from_user
19453- cmpq TI_addr_limit(%rax),%rcx
19454- ja bad_from_user
19455- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
19456- copy_user_generic_unrolled,copy_user_generic_string, \
19457- copy_user_enhanced_fast_string
19458- CFI_ENDPROC
19459-ENDPROC(_copy_from_user)
19460-
19461 .section .fixup,"ax"
19462 /* must zero dest */
19463 ENTRY(bad_from_user)
19464 bad_from_user:
19465 CFI_STARTPROC
19466+ testl %edx,%edx
19467+ js bad_to_user
19468 movl %edx,%ecx
19469 xorl %eax,%eax
19470 rep
19471 stosb
19472 bad_to_user:
19473 movl %edx,%eax
19474+ pax_force_retaddr
19475 ret
19476 CFI_ENDPROC
19477 ENDPROC(bad_from_user)
19478@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
19479 jz 17f
19480 1: movq (%rsi),%r8
19481 2: movq 1*8(%rsi),%r9
19482-3: movq 2*8(%rsi),%r10
19483+3: movq 2*8(%rsi),%rax
19484 4: movq 3*8(%rsi),%r11
19485 5: movq %r8,(%rdi)
19486 6: movq %r9,1*8(%rdi)
19487-7: movq %r10,2*8(%rdi)
19488+7: movq %rax,2*8(%rdi)
19489 8: movq %r11,3*8(%rdi)
19490 9: movq 4*8(%rsi),%r8
19491 10: movq 5*8(%rsi),%r9
19492-11: movq 6*8(%rsi),%r10
19493+11: movq 6*8(%rsi),%rax
19494 12: movq 7*8(%rsi),%r11
19495 13: movq %r8,4*8(%rdi)
19496 14: movq %r9,5*8(%rdi)
19497-15: movq %r10,6*8(%rdi)
19498+15: movq %rax,6*8(%rdi)
19499 16: movq %r11,7*8(%rdi)
19500 leaq 64(%rsi),%rsi
19501 leaq 64(%rdi),%rdi
19502@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
19503 decl %ecx
19504 jnz 21b
19505 23: xor %eax,%eax
19506+ pax_force_retaddr
19507 ret
19508
19509 .section .fixup,"ax"
19510@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
19511 3: rep
19512 movsb
19513 4: xorl %eax,%eax
19514+ pax_force_retaddr
19515 ret
19516
19517 .section .fixup,"ax"
19518@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
19519 1: rep
19520 movsb
19521 2: xorl %eax,%eax
19522+ pax_force_retaddr
19523 ret
19524
19525 .section .fixup,"ax"
19526diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
19527index cb0c112..e3a6895 100644
19528--- a/arch/x86/lib/copy_user_nocache_64.S
19529+++ b/arch/x86/lib/copy_user_nocache_64.S
19530@@ -8,12 +8,14 @@
19531
19532 #include <linux/linkage.h>
19533 #include <asm/dwarf2.h>
19534+#include <asm/alternative-asm.h>
19535
19536 #define FIX_ALIGNMENT 1
19537
19538 #include <asm/current.h>
19539 #include <asm/asm-offsets.h>
19540 #include <asm/thread_info.h>
19541+#include <asm/pgtable.h>
19542
19543 .macro ALIGN_DESTINATION
19544 #ifdef FIX_ALIGNMENT
19545@@ -50,6 +52,15 @@
19546 */
19547 ENTRY(__copy_user_nocache)
19548 CFI_STARTPROC
19549+
19550+#ifdef CONFIG_PAX_MEMORY_UDEREF
19551+ mov $PAX_USER_SHADOW_BASE,%rcx
19552+ cmp %rcx,%rsi
19553+ jae 1f
19554+ add %rcx,%rsi
19555+1:
19556+#endif
19557+
19558 cmpl $8,%edx
19559 jb 20f /* less then 8 bytes, go to byte copy loop */
19560 ALIGN_DESTINATION
19561@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
19562 jz 17f
19563 1: movq (%rsi),%r8
19564 2: movq 1*8(%rsi),%r9
19565-3: movq 2*8(%rsi),%r10
19566+3: movq 2*8(%rsi),%rax
19567 4: movq 3*8(%rsi),%r11
19568 5: movnti %r8,(%rdi)
19569 6: movnti %r9,1*8(%rdi)
19570-7: movnti %r10,2*8(%rdi)
19571+7: movnti %rax,2*8(%rdi)
19572 8: movnti %r11,3*8(%rdi)
19573 9: movq 4*8(%rsi),%r8
19574 10: movq 5*8(%rsi),%r9
19575-11: movq 6*8(%rsi),%r10
19576+11: movq 6*8(%rsi),%rax
19577 12: movq 7*8(%rsi),%r11
19578 13: movnti %r8,4*8(%rdi)
19579 14: movnti %r9,5*8(%rdi)
19580-15: movnti %r10,6*8(%rdi)
19581+15: movnti %rax,6*8(%rdi)
19582 16: movnti %r11,7*8(%rdi)
19583 leaq 64(%rsi),%rsi
19584 leaq 64(%rdi),%rdi
19585@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
19586 jnz 21b
19587 23: xorl %eax,%eax
19588 sfence
19589+ pax_force_retaddr
19590 ret
19591
19592 .section .fixup,"ax"
19593diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
19594index fb903b7..c92b7f7 100644
19595--- a/arch/x86/lib/csum-copy_64.S
19596+++ b/arch/x86/lib/csum-copy_64.S
19597@@ -8,6 +8,7 @@
19598 #include <linux/linkage.h>
19599 #include <asm/dwarf2.h>
19600 #include <asm/errno.h>
19601+#include <asm/alternative-asm.h>
19602
19603 /*
19604 * Checksum copy with exception handling.
19605@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
19606 CFI_RESTORE rbp
19607 addq $7*8, %rsp
19608 CFI_ADJUST_CFA_OFFSET -7*8
19609+ pax_force_retaddr 0, 1
19610 ret
19611 CFI_RESTORE_STATE
19612
19613diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
19614index 459b58a..9570bc7 100644
19615--- a/arch/x86/lib/csum-wrappers_64.c
19616+++ b/arch/x86/lib/csum-wrappers_64.c
19617@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
19618 len -= 2;
19619 }
19620 }
19621- isum = csum_partial_copy_generic((__force const void *)src,
19622+
19623+#ifdef CONFIG_PAX_MEMORY_UDEREF
19624+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
19625+ src += PAX_USER_SHADOW_BASE;
19626+#endif
19627+
19628+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
19629 dst, len, isum, errp, NULL);
19630 if (unlikely(*errp))
19631 goto out_err;
19632@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
19633 }
19634
19635 *errp = 0;
19636- return csum_partial_copy_generic(src, (void __force *)dst,
19637+
19638+#ifdef CONFIG_PAX_MEMORY_UDEREF
19639+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
19640+ dst += PAX_USER_SHADOW_BASE;
19641+#endif
19642+
19643+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
19644 len, isum, NULL, errp);
19645 }
19646 EXPORT_SYMBOL(csum_partial_copy_to_user);
19647diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
19648index 51f1504..ddac4c1 100644
19649--- a/arch/x86/lib/getuser.S
19650+++ b/arch/x86/lib/getuser.S
19651@@ -33,15 +33,38 @@
19652 #include <asm/asm-offsets.h>
19653 #include <asm/thread_info.h>
19654 #include <asm/asm.h>
19655+#include <asm/segment.h>
19656+#include <asm/pgtable.h>
19657+#include <asm/alternative-asm.h>
19658+
19659+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19660+#define __copyuser_seg gs;
19661+#else
19662+#define __copyuser_seg
19663+#endif
19664
19665 .text
19666 ENTRY(__get_user_1)
19667 CFI_STARTPROC
19668+
19669+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
19670 GET_THREAD_INFO(%_ASM_DX)
19671 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
19672 jae bad_get_user
19673-1: movzb (%_ASM_AX),%edx
19674+
19675+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19676+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
19677+ cmp %_ASM_DX,%_ASM_AX
19678+ jae 1234f
19679+ add %_ASM_DX,%_ASM_AX
19680+1234:
19681+#endif
19682+
19683+#endif
19684+
19685+1: __copyuser_seg movzb (%_ASM_AX),%edx
19686 xor %eax,%eax
19687+ pax_force_retaddr
19688 ret
19689 CFI_ENDPROC
19690 ENDPROC(__get_user_1)
19691@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
19692 ENTRY(__get_user_2)
19693 CFI_STARTPROC
19694 add $1,%_ASM_AX
19695+
19696+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
19697 jc bad_get_user
19698 GET_THREAD_INFO(%_ASM_DX)
19699 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
19700 jae bad_get_user
19701-2: movzwl -1(%_ASM_AX),%edx
19702+
19703+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19704+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
19705+ cmp %_ASM_DX,%_ASM_AX
19706+ jae 1234f
19707+ add %_ASM_DX,%_ASM_AX
19708+1234:
19709+#endif
19710+
19711+#endif
19712+
19713+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
19714 xor %eax,%eax
19715+ pax_force_retaddr
19716 ret
19717 CFI_ENDPROC
19718 ENDPROC(__get_user_2)
19719@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
19720 ENTRY(__get_user_4)
19721 CFI_STARTPROC
19722 add $3,%_ASM_AX
19723+
19724+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
19725 jc bad_get_user
19726 GET_THREAD_INFO(%_ASM_DX)
19727 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
19728 jae bad_get_user
19729-3: mov -3(%_ASM_AX),%edx
19730+
19731+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19732+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
19733+ cmp %_ASM_DX,%_ASM_AX
19734+ jae 1234f
19735+ add %_ASM_DX,%_ASM_AX
19736+1234:
19737+#endif
19738+
19739+#endif
19740+
19741+3: __copyuser_seg mov -3(%_ASM_AX),%edx
19742 xor %eax,%eax
19743+ pax_force_retaddr
19744 ret
19745 CFI_ENDPROC
19746 ENDPROC(__get_user_4)
19747@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
19748 GET_THREAD_INFO(%_ASM_DX)
19749 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
19750 jae bad_get_user
19751+
19752+#ifdef CONFIG_PAX_MEMORY_UDEREF
19753+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
19754+ cmp %_ASM_DX,%_ASM_AX
19755+ jae 1234f
19756+ add %_ASM_DX,%_ASM_AX
19757+1234:
19758+#endif
19759+
19760 4: movq -7(%_ASM_AX),%_ASM_DX
19761 xor %eax,%eax
19762+ pax_force_retaddr
19763 ret
19764 CFI_ENDPROC
19765 ENDPROC(__get_user_8)
19766@@ -91,6 +152,7 @@ bad_get_user:
19767 CFI_STARTPROC
19768 xor %edx,%edx
19769 mov $(-EFAULT),%_ASM_AX
19770+ pax_force_retaddr
19771 ret
19772 CFI_ENDPROC
19773 END(bad_get_user)
19774diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
19775index 374562e..a75830b 100644
19776--- a/arch/x86/lib/insn.c
19777+++ b/arch/x86/lib/insn.c
19778@@ -21,6 +21,11 @@
19779 #include <linux/string.h>
19780 #include <asm/inat.h>
19781 #include <asm/insn.h>
19782+#ifdef __KERNEL__
19783+#include <asm/pgtable_types.h>
19784+#else
19785+#define ktla_ktva(addr) addr
19786+#endif
19787
19788 /* Verify next sizeof(t) bytes can be on the same instruction */
19789 #define validate_next(t, insn, n) \
19790@@ -49,8 +54,8 @@
19791 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
19792 {
19793 memset(insn, 0, sizeof(*insn));
19794- insn->kaddr = kaddr;
19795- insn->next_byte = kaddr;
19796+ insn->kaddr = ktla_ktva(kaddr);
19797+ insn->next_byte = ktla_ktva(kaddr);
19798 insn->x86_64 = x86_64 ? 1 : 0;
19799 insn->opnd_bytes = 4;
19800 if (x86_64)
19801diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
19802index 05a95e7..326f2fa 100644
19803--- a/arch/x86/lib/iomap_copy_64.S
19804+++ b/arch/x86/lib/iomap_copy_64.S
19805@@ -17,6 +17,7 @@
19806
19807 #include <linux/linkage.h>
19808 #include <asm/dwarf2.h>
19809+#include <asm/alternative-asm.h>
19810
19811 /*
19812 * override generic version in lib/iomap_copy.c
19813@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
19814 CFI_STARTPROC
19815 movl %edx,%ecx
19816 rep movsd
19817+ pax_force_retaddr
19818 ret
19819 CFI_ENDPROC
19820 ENDPROC(__iowrite32_copy)
19821diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
19822index efbf2a0..8893637 100644
19823--- a/arch/x86/lib/memcpy_64.S
19824+++ b/arch/x86/lib/memcpy_64.S
19825@@ -34,6 +34,7 @@
19826 rep movsq
19827 movl %edx, %ecx
19828 rep movsb
19829+ pax_force_retaddr
19830 ret
19831 .Lmemcpy_e:
19832 .previous
19833@@ -51,6 +52,7 @@
19834
19835 movl %edx, %ecx
19836 rep movsb
19837+ pax_force_retaddr
19838 ret
19839 .Lmemcpy_e_e:
19840 .previous
19841@@ -81,13 +83,13 @@ ENTRY(memcpy)
19842 */
19843 movq 0*8(%rsi), %r8
19844 movq 1*8(%rsi), %r9
19845- movq 2*8(%rsi), %r10
19846+ movq 2*8(%rsi), %rcx
19847 movq 3*8(%rsi), %r11
19848 leaq 4*8(%rsi), %rsi
19849
19850 movq %r8, 0*8(%rdi)
19851 movq %r9, 1*8(%rdi)
19852- movq %r10, 2*8(%rdi)
19853+ movq %rcx, 2*8(%rdi)
19854 movq %r11, 3*8(%rdi)
19855 leaq 4*8(%rdi), %rdi
19856 jae .Lcopy_forward_loop
19857@@ -110,12 +112,12 @@ ENTRY(memcpy)
19858 subq $0x20, %rdx
19859 movq -1*8(%rsi), %r8
19860 movq -2*8(%rsi), %r9
19861- movq -3*8(%rsi), %r10
19862+ movq -3*8(%rsi), %rcx
19863 movq -4*8(%rsi), %r11
19864 leaq -4*8(%rsi), %rsi
19865 movq %r8, -1*8(%rdi)
19866 movq %r9, -2*8(%rdi)
19867- movq %r10, -3*8(%rdi)
19868+ movq %rcx, -3*8(%rdi)
19869 movq %r11, -4*8(%rdi)
19870 leaq -4*8(%rdi), %rdi
19871 jae .Lcopy_backward_loop
19872@@ -135,12 +137,13 @@ ENTRY(memcpy)
19873 */
19874 movq 0*8(%rsi), %r8
19875 movq 1*8(%rsi), %r9
19876- movq -2*8(%rsi, %rdx), %r10
19877+ movq -2*8(%rsi, %rdx), %rcx
19878 movq -1*8(%rsi, %rdx), %r11
19879 movq %r8, 0*8(%rdi)
19880 movq %r9, 1*8(%rdi)
19881- movq %r10, -2*8(%rdi, %rdx)
19882+ movq %rcx, -2*8(%rdi, %rdx)
19883 movq %r11, -1*8(%rdi, %rdx)
19884+ pax_force_retaddr
19885 retq
19886 .p2align 4
19887 .Lless_16bytes:
19888@@ -153,6 +156,7 @@ ENTRY(memcpy)
19889 movq -1*8(%rsi, %rdx), %r9
19890 movq %r8, 0*8(%rdi)
19891 movq %r9, -1*8(%rdi, %rdx)
19892+ pax_force_retaddr
19893 retq
19894 .p2align 4
19895 .Lless_8bytes:
19896@@ -166,6 +170,7 @@ ENTRY(memcpy)
19897 movl -4(%rsi, %rdx), %r8d
19898 movl %ecx, (%rdi)
19899 movl %r8d, -4(%rdi, %rdx)
19900+ pax_force_retaddr
19901 retq
19902 .p2align 4
19903 .Lless_3bytes:
19904@@ -183,6 +188,7 @@ ENTRY(memcpy)
19905 jnz .Lloop_1
19906
19907 .Lend:
19908+ pax_force_retaddr
19909 retq
19910 CFI_ENDPROC
19911 ENDPROC(memcpy)
19912diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
19913index ee16461..c39c199 100644
19914--- a/arch/x86/lib/memmove_64.S
19915+++ b/arch/x86/lib/memmove_64.S
19916@@ -61,13 +61,13 @@ ENTRY(memmove)
19917 5:
19918 sub $0x20, %rdx
19919 movq 0*8(%rsi), %r11
19920- movq 1*8(%rsi), %r10
19921+ movq 1*8(%rsi), %rcx
19922 movq 2*8(%rsi), %r9
19923 movq 3*8(%rsi), %r8
19924 leaq 4*8(%rsi), %rsi
19925
19926 movq %r11, 0*8(%rdi)
19927- movq %r10, 1*8(%rdi)
19928+ movq %rcx, 1*8(%rdi)
19929 movq %r9, 2*8(%rdi)
19930 movq %r8, 3*8(%rdi)
19931 leaq 4*8(%rdi), %rdi
19932@@ -81,10 +81,10 @@ ENTRY(memmove)
19933 4:
19934 movq %rdx, %rcx
19935 movq -8(%rsi, %rdx), %r11
19936- lea -8(%rdi, %rdx), %r10
19937+ lea -8(%rdi, %rdx), %r9
19938 shrq $3, %rcx
19939 rep movsq
19940- movq %r11, (%r10)
19941+ movq %r11, (%r9)
19942 jmp 13f
19943 .Lmemmove_end_forward:
19944
19945@@ -95,14 +95,14 @@ ENTRY(memmove)
19946 7:
19947 movq %rdx, %rcx
19948 movq (%rsi), %r11
19949- movq %rdi, %r10
19950+ movq %rdi, %r9
19951 leaq -8(%rsi, %rdx), %rsi
19952 leaq -8(%rdi, %rdx), %rdi
19953 shrq $3, %rcx
19954 std
19955 rep movsq
19956 cld
19957- movq %r11, (%r10)
19958+ movq %r11, (%r9)
19959 jmp 13f
19960
19961 /*
19962@@ -127,13 +127,13 @@ ENTRY(memmove)
19963 8:
19964 subq $0x20, %rdx
19965 movq -1*8(%rsi), %r11
19966- movq -2*8(%rsi), %r10
19967+ movq -2*8(%rsi), %rcx
19968 movq -3*8(%rsi), %r9
19969 movq -4*8(%rsi), %r8
19970 leaq -4*8(%rsi), %rsi
19971
19972 movq %r11, -1*8(%rdi)
19973- movq %r10, -2*8(%rdi)
19974+ movq %rcx, -2*8(%rdi)
19975 movq %r9, -3*8(%rdi)
19976 movq %r8, -4*8(%rdi)
19977 leaq -4*8(%rdi), %rdi
19978@@ -151,11 +151,11 @@ ENTRY(memmove)
19979 * Move data from 16 bytes to 31 bytes.
19980 */
19981 movq 0*8(%rsi), %r11
19982- movq 1*8(%rsi), %r10
19983+ movq 1*8(%rsi), %rcx
19984 movq -2*8(%rsi, %rdx), %r9
19985 movq -1*8(%rsi, %rdx), %r8
19986 movq %r11, 0*8(%rdi)
19987- movq %r10, 1*8(%rdi)
19988+ movq %rcx, 1*8(%rdi)
19989 movq %r9, -2*8(%rdi, %rdx)
19990 movq %r8, -1*8(%rdi, %rdx)
19991 jmp 13f
19992@@ -167,9 +167,9 @@ ENTRY(memmove)
19993 * Move data from 8 bytes to 15 bytes.
19994 */
19995 movq 0*8(%rsi), %r11
19996- movq -1*8(%rsi, %rdx), %r10
19997+ movq -1*8(%rsi, %rdx), %r9
19998 movq %r11, 0*8(%rdi)
19999- movq %r10, -1*8(%rdi, %rdx)
20000+ movq %r9, -1*8(%rdi, %rdx)
20001 jmp 13f
20002 10:
20003 cmpq $4, %rdx
20004@@ -178,9 +178,9 @@ ENTRY(memmove)
20005 * Move data from 4 bytes to 7 bytes.
20006 */
20007 movl (%rsi), %r11d
20008- movl -4(%rsi, %rdx), %r10d
20009+ movl -4(%rsi, %rdx), %r9d
20010 movl %r11d, (%rdi)
20011- movl %r10d, -4(%rdi, %rdx)
20012+ movl %r9d, -4(%rdi, %rdx)
20013 jmp 13f
20014 11:
20015 cmp $2, %rdx
20016@@ -189,9 +189,9 @@ ENTRY(memmove)
20017 * Move data from 2 bytes to 3 bytes.
20018 */
20019 movw (%rsi), %r11w
20020- movw -2(%rsi, %rdx), %r10w
20021+ movw -2(%rsi, %rdx), %r9w
20022 movw %r11w, (%rdi)
20023- movw %r10w, -2(%rdi, %rdx)
20024+ movw %r9w, -2(%rdi, %rdx)
20025 jmp 13f
20026 12:
20027 cmp $1, %rdx
20028@@ -202,6 +202,7 @@ ENTRY(memmove)
20029 movb (%rsi), %r11b
20030 movb %r11b, (%rdi)
20031 13:
20032+ pax_force_retaddr
20033 retq
20034 CFI_ENDPROC
20035
20036@@ -210,6 +211,7 @@ ENTRY(memmove)
20037 /* Forward moving data. */
20038 movq %rdx, %rcx
20039 rep movsb
20040+ pax_force_retaddr
20041 retq
20042 .Lmemmove_end_forward_efs:
20043 .previous
20044diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
20045index 79bd454..dff325a 100644
20046--- a/arch/x86/lib/memset_64.S
20047+++ b/arch/x86/lib/memset_64.S
20048@@ -31,6 +31,7 @@
20049 movl %r8d,%ecx
20050 rep stosb
20051 movq %r9,%rax
20052+ pax_force_retaddr
20053 ret
20054 .Lmemset_e:
20055 .previous
20056@@ -53,6 +54,7 @@
20057 movl %edx,%ecx
20058 rep stosb
20059 movq %r9,%rax
20060+ pax_force_retaddr
20061 ret
20062 .Lmemset_e_e:
20063 .previous
20064@@ -60,13 +62,13 @@
20065 ENTRY(memset)
20066 ENTRY(__memset)
20067 CFI_STARTPROC
20068- movq %rdi,%r10
20069 movq %rdx,%r11
20070
20071 /* expand byte value */
20072 movzbl %sil,%ecx
20073 movabs $0x0101010101010101,%rax
20074 mul %rcx /* with rax, clobbers rdx */
20075+ movq %rdi,%rdx
20076
20077 /* align dst */
20078 movl %edi,%r9d
20079@@ -120,7 +122,8 @@ ENTRY(__memset)
20080 jnz .Lloop_1
20081
20082 .Lende:
20083- movq %r10,%rax
20084+ movq %rdx,%rax
20085+ pax_force_retaddr
20086 ret
20087
20088 CFI_RESTORE_STATE
20089diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
20090index c9f2d9b..e7fd2c0 100644
20091--- a/arch/x86/lib/mmx_32.c
20092+++ b/arch/x86/lib/mmx_32.c
20093@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
20094 {
20095 void *p;
20096 int i;
20097+ unsigned long cr0;
20098
20099 if (unlikely(in_interrupt()))
20100 return __memcpy(to, from, len);
20101@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
20102 kernel_fpu_begin();
20103
20104 __asm__ __volatile__ (
20105- "1: prefetch (%0)\n" /* This set is 28 bytes */
20106- " prefetch 64(%0)\n"
20107- " prefetch 128(%0)\n"
20108- " prefetch 192(%0)\n"
20109- " prefetch 256(%0)\n"
20110+ "1: prefetch (%1)\n" /* This set is 28 bytes */
20111+ " prefetch 64(%1)\n"
20112+ " prefetch 128(%1)\n"
20113+ " prefetch 192(%1)\n"
20114+ " prefetch 256(%1)\n"
20115 "2: \n"
20116 ".section .fixup, \"ax\"\n"
20117- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20118+ "3: \n"
20119+
20120+#ifdef CONFIG_PAX_KERNEXEC
20121+ " movl %%cr0, %0\n"
20122+ " movl %0, %%eax\n"
20123+ " andl $0xFFFEFFFF, %%eax\n"
20124+ " movl %%eax, %%cr0\n"
20125+#endif
20126+
20127+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20128+
20129+#ifdef CONFIG_PAX_KERNEXEC
20130+ " movl %0, %%cr0\n"
20131+#endif
20132+
20133 " jmp 2b\n"
20134 ".previous\n"
20135 _ASM_EXTABLE(1b, 3b)
20136- : : "r" (from));
20137+ : "=&r" (cr0) : "r" (from) : "ax");
20138
20139 for ( ; i > 5; i--) {
20140 __asm__ __volatile__ (
20141- "1: prefetch 320(%0)\n"
20142- "2: movq (%0), %%mm0\n"
20143- " movq 8(%0), %%mm1\n"
20144- " movq 16(%0), %%mm2\n"
20145- " movq 24(%0), %%mm3\n"
20146- " movq %%mm0, (%1)\n"
20147- " movq %%mm1, 8(%1)\n"
20148- " movq %%mm2, 16(%1)\n"
20149- " movq %%mm3, 24(%1)\n"
20150- " movq 32(%0), %%mm0\n"
20151- " movq 40(%0), %%mm1\n"
20152- " movq 48(%0), %%mm2\n"
20153- " movq 56(%0), %%mm3\n"
20154- " movq %%mm0, 32(%1)\n"
20155- " movq %%mm1, 40(%1)\n"
20156- " movq %%mm2, 48(%1)\n"
20157- " movq %%mm3, 56(%1)\n"
20158+ "1: prefetch 320(%1)\n"
20159+ "2: movq (%1), %%mm0\n"
20160+ " movq 8(%1), %%mm1\n"
20161+ " movq 16(%1), %%mm2\n"
20162+ " movq 24(%1), %%mm3\n"
20163+ " movq %%mm0, (%2)\n"
20164+ " movq %%mm1, 8(%2)\n"
20165+ " movq %%mm2, 16(%2)\n"
20166+ " movq %%mm3, 24(%2)\n"
20167+ " movq 32(%1), %%mm0\n"
20168+ " movq 40(%1), %%mm1\n"
20169+ " movq 48(%1), %%mm2\n"
20170+ " movq 56(%1), %%mm3\n"
20171+ " movq %%mm0, 32(%2)\n"
20172+ " movq %%mm1, 40(%2)\n"
20173+ " movq %%mm2, 48(%2)\n"
20174+ " movq %%mm3, 56(%2)\n"
20175 ".section .fixup, \"ax\"\n"
20176- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20177+ "3:\n"
20178+
20179+#ifdef CONFIG_PAX_KERNEXEC
20180+ " movl %%cr0, %0\n"
20181+ " movl %0, %%eax\n"
20182+ " andl $0xFFFEFFFF, %%eax\n"
20183+ " movl %%eax, %%cr0\n"
20184+#endif
20185+
20186+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20187+
20188+#ifdef CONFIG_PAX_KERNEXEC
20189+ " movl %0, %%cr0\n"
20190+#endif
20191+
20192 " jmp 2b\n"
20193 ".previous\n"
20194 _ASM_EXTABLE(1b, 3b)
20195- : : "r" (from), "r" (to) : "memory");
20196+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20197
20198 from += 64;
20199 to += 64;
20200@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
20201 static void fast_copy_page(void *to, void *from)
20202 {
20203 int i;
20204+ unsigned long cr0;
20205
20206 kernel_fpu_begin();
20207
20208@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
20209 * but that is for later. -AV
20210 */
20211 __asm__ __volatile__(
20212- "1: prefetch (%0)\n"
20213- " prefetch 64(%0)\n"
20214- " prefetch 128(%0)\n"
20215- " prefetch 192(%0)\n"
20216- " prefetch 256(%0)\n"
20217+ "1: prefetch (%1)\n"
20218+ " prefetch 64(%1)\n"
20219+ " prefetch 128(%1)\n"
20220+ " prefetch 192(%1)\n"
20221+ " prefetch 256(%1)\n"
20222 "2: \n"
20223 ".section .fixup, \"ax\"\n"
20224- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20225+ "3: \n"
20226+
20227+#ifdef CONFIG_PAX_KERNEXEC
20228+ " movl %%cr0, %0\n"
20229+ " movl %0, %%eax\n"
20230+ " andl $0xFFFEFFFF, %%eax\n"
20231+ " movl %%eax, %%cr0\n"
20232+#endif
20233+
20234+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20235+
20236+#ifdef CONFIG_PAX_KERNEXEC
20237+ " movl %0, %%cr0\n"
20238+#endif
20239+
20240 " jmp 2b\n"
20241 ".previous\n"
20242- _ASM_EXTABLE(1b, 3b) : : "r" (from));
20243+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
20244
20245 for (i = 0; i < (4096-320)/64; i++) {
20246 __asm__ __volatile__ (
20247- "1: prefetch 320(%0)\n"
20248- "2: movq (%0), %%mm0\n"
20249- " movntq %%mm0, (%1)\n"
20250- " movq 8(%0), %%mm1\n"
20251- " movntq %%mm1, 8(%1)\n"
20252- " movq 16(%0), %%mm2\n"
20253- " movntq %%mm2, 16(%1)\n"
20254- " movq 24(%0), %%mm3\n"
20255- " movntq %%mm3, 24(%1)\n"
20256- " movq 32(%0), %%mm4\n"
20257- " movntq %%mm4, 32(%1)\n"
20258- " movq 40(%0), %%mm5\n"
20259- " movntq %%mm5, 40(%1)\n"
20260- " movq 48(%0), %%mm6\n"
20261- " movntq %%mm6, 48(%1)\n"
20262- " movq 56(%0), %%mm7\n"
20263- " movntq %%mm7, 56(%1)\n"
20264+ "1: prefetch 320(%1)\n"
20265+ "2: movq (%1), %%mm0\n"
20266+ " movntq %%mm0, (%2)\n"
20267+ " movq 8(%1), %%mm1\n"
20268+ " movntq %%mm1, 8(%2)\n"
20269+ " movq 16(%1), %%mm2\n"
20270+ " movntq %%mm2, 16(%2)\n"
20271+ " movq 24(%1), %%mm3\n"
20272+ " movntq %%mm3, 24(%2)\n"
20273+ " movq 32(%1), %%mm4\n"
20274+ " movntq %%mm4, 32(%2)\n"
20275+ " movq 40(%1), %%mm5\n"
20276+ " movntq %%mm5, 40(%2)\n"
20277+ " movq 48(%1), %%mm6\n"
20278+ " movntq %%mm6, 48(%2)\n"
20279+ " movq 56(%1), %%mm7\n"
20280+ " movntq %%mm7, 56(%2)\n"
20281 ".section .fixup, \"ax\"\n"
20282- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20283+ "3:\n"
20284+
20285+#ifdef CONFIG_PAX_KERNEXEC
20286+ " movl %%cr0, %0\n"
20287+ " movl %0, %%eax\n"
20288+ " andl $0xFFFEFFFF, %%eax\n"
20289+ " movl %%eax, %%cr0\n"
20290+#endif
20291+
20292+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20293+
20294+#ifdef CONFIG_PAX_KERNEXEC
20295+ " movl %0, %%cr0\n"
20296+#endif
20297+
20298 " jmp 2b\n"
20299 ".previous\n"
20300- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
20301+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20302
20303 from += 64;
20304 to += 64;
20305@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
20306 static void fast_copy_page(void *to, void *from)
20307 {
20308 int i;
20309+ unsigned long cr0;
20310
20311 kernel_fpu_begin();
20312
20313 __asm__ __volatile__ (
20314- "1: prefetch (%0)\n"
20315- " prefetch 64(%0)\n"
20316- " prefetch 128(%0)\n"
20317- " prefetch 192(%0)\n"
20318- " prefetch 256(%0)\n"
20319+ "1: prefetch (%1)\n"
20320+ " prefetch 64(%1)\n"
20321+ " prefetch 128(%1)\n"
20322+ " prefetch 192(%1)\n"
20323+ " prefetch 256(%1)\n"
20324 "2: \n"
20325 ".section .fixup, \"ax\"\n"
20326- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20327+ "3: \n"
20328+
20329+#ifdef CONFIG_PAX_KERNEXEC
20330+ " movl %%cr0, %0\n"
20331+ " movl %0, %%eax\n"
20332+ " andl $0xFFFEFFFF, %%eax\n"
20333+ " movl %%eax, %%cr0\n"
20334+#endif
20335+
20336+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
20337+
20338+#ifdef CONFIG_PAX_KERNEXEC
20339+ " movl %0, %%cr0\n"
20340+#endif
20341+
20342 " jmp 2b\n"
20343 ".previous\n"
20344- _ASM_EXTABLE(1b, 3b) : : "r" (from));
20345+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
20346
20347 for (i = 0; i < 4096/64; i++) {
20348 __asm__ __volatile__ (
20349- "1: prefetch 320(%0)\n"
20350- "2: movq (%0), %%mm0\n"
20351- " movq 8(%0), %%mm1\n"
20352- " movq 16(%0), %%mm2\n"
20353- " movq 24(%0), %%mm3\n"
20354- " movq %%mm0, (%1)\n"
20355- " movq %%mm1, 8(%1)\n"
20356- " movq %%mm2, 16(%1)\n"
20357- " movq %%mm3, 24(%1)\n"
20358- " movq 32(%0), %%mm0\n"
20359- " movq 40(%0), %%mm1\n"
20360- " movq 48(%0), %%mm2\n"
20361- " movq 56(%0), %%mm3\n"
20362- " movq %%mm0, 32(%1)\n"
20363- " movq %%mm1, 40(%1)\n"
20364- " movq %%mm2, 48(%1)\n"
20365- " movq %%mm3, 56(%1)\n"
20366+ "1: prefetch 320(%1)\n"
20367+ "2: movq (%1), %%mm0\n"
20368+ " movq 8(%1), %%mm1\n"
20369+ " movq 16(%1), %%mm2\n"
20370+ " movq 24(%1), %%mm3\n"
20371+ " movq %%mm0, (%2)\n"
20372+ " movq %%mm1, 8(%2)\n"
20373+ " movq %%mm2, 16(%2)\n"
20374+ " movq %%mm3, 24(%2)\n"
20375+ " movq 32(%1), %%mm0\n"
20376+ " movq 40(%1), %%mm1\n"
20377+ " movq 48(%1), %%mm2\n"
20378+ " movq 56(%1), %%mm3\n"
20379+ " movq %%mm0, 32(%2)\n"
20380+ " movq %%mm1, 40(%2)\n"
20381+ " movq %%mm2, 48(%2)\n"
20382+ " movq %%mm3, 56(%2)\n"
20383 ".section .fixup, \"ax\"\n"
20384- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20385+ "3:\n"
20386+
20387+#ifdef CONFIG_PAX_KERNEXEC
20388+ " movl %%cr0, %0\n"
20389+ " movl %0, %%eax\n"
20390+ " andl $0xFFFEFFFF, %%eax\n"
20391+ " movl %%eax, %%cr0\n"
20392+#endif
20393+
20394+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
20395+
20396+#ifdef CONFIG_PAX_KERNEXEC
20397+ " movl %0, %%cr0\n"
20398+#endif
20399+
20400 " jmp 2b\n"
20401 ".previous\n"
20402 _ASM_EXTABLE(1b, 3b)
20403- : : "r" (from), "r" (to) : "memory");
20404+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
20405
20406 from += 64;
20407 to += 64;
20408diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
20409index 69fa106..adda88b 100644
20410--- a/arch/x86/lib/msr-reg.S
20411+++ b/arch/x86/lib/msr-reg.S
20412@@ -3,6 +3,7 @@
20413 #include <asm/dwarf2.h>
20414 #include <asm/asm.h>
20415 #include <asm/msr.h>
20416+#include <asm/alternative-asm.h>
20417
20418 #ifdef CONFIG_X86_64
20419 /*
20420@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
20421 CFI_STARTPROC
20422 pushq_cfi %rbx
20423 pushq_cfi %rbp
20424- movq %rdi, %r10 /* Save pointer */
20425+ movq %rdi, %r9 /* Save pointer */
20426 xorl %r11d, %r11d /* Return value */
20427 movl (%rdi), %eax
20428 movl 4(%rdi), %ecx
20429@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
20430 movl 28(%rdi), %edi
20431 CFI_REMEMBER_STATE
20432 1: \op
20433-2: movl %eax, (%r10)
20434+2: movl %eax, (%r9)
20435 movl %r11d, %eax /* Return value */
20436- movl %ecx, 4(%r10)
20437- movl %edx, 8(%r10)
20438- movl %ebx, 12(%r10)
20439- movl %ebp, 20(%r10)
20440- movl %esi, 24(%r10)
20441- movl %edi, 28(%r10)
20442+ movl %ecx, 4(%r9)
20443+ movl %edx, 8(%r9)
20444+ movl %ebx, 12(%r9)
20445+ movl %ebp, 20(%r9)
20446+ movl %esi, 24(%r9)
20447+ movl %edi, 28(%r9)
20448 popq_cfi %rbp
20449 popq_cfi %rbx
20450+ pax_force_retaddr
20451 ret
20452 3:
20453 CFI_RESTORE_STATE
20454diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
20455index 36b0d15..d381858 100644
20456--- a/arch/x86/lib/putuser.S
20457+++ b/arch/x86/lib/putuser.S
20458@@ -15,7 +15,9 @@
20459 #include <asm/thread_info.h>
20460 #include <asm/errno.h>
20461 #include <asm/asm.h>
20462-
20463+#include <asm/segment.h>
20464+#include <asm/pgtable.h>
20465+#include <asm/alternative-asm.h>
20466
20467 /*
20468 * __put_user_X
20469@@ -29,52 +31,119 @@
20470 * as they get called from within inline assembly.
20471 */
20472
20473-#define ENTER CFI_STARTPROC ; \
20474- GET_THREAD_INFO(%_ASM_BX)
20475-#define EXIT ret ; \
20476+#define ENTER CFI_STARTPROC
20477+#define EXIT pax_force_retaddr; ret ; \
20478 CFI_ENDPROC
20479
20480+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20481+#define _DEST %_ASM_CX,%_ASM_BX
20482+#else
20483+#define _DEST %_ASM_CX
20484+#endif
20485+
20486+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20487+#define __copyuser_seg gs;
20488+#else
20489+#define __copyuser_seg
20490+#endif
20491+
20492 .text
20493 ENTRY(__put_user_1)
20494 ENTER
20495+
20496+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20497+ GET_THREAD_INFO(%_ASM_BX)
20498 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
20499 jae bad_put_user
20500-1: movb %al,(%_ASM_CX)
20501+
20502+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20503+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20504+ cmp %_ASM_BX,%_ASM_CX
20505+ jb 1234f
20506+ xor %ebx,%ebx
20507+1234:
20508+#endif
20509+
20510+#endif
20511+
20512+1: __copyuser_seg movb %al,(_DEST)
20513 xor %eax,%eax
20514 EXIT
20515 ENDPROC(__put_user_1)
20516
20517 ENTRY(__put_user_2)
20518 ENTER
20519+
20520+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20521+ GET_THREAD_INFO(%_ASM_BX)
20522 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20523 sub $1,%_ASM_BX
20524 cmp %_ASM_BX,%_ASM_CX
20525 jae bad_put_user
20526-2: movw %ax,(%_ASM_CX)
20527+
20528+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20529+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20530+ cmp %_ASM_BX,%_ASM_CX
20531+ jb 1234f
20532+ xor %ebx,%ebx
20533+1234:
20534+#endif
20535+
20536+#endif
20537+
20538+2: __copyuser_seg movw %ax,(_DEST)
20539 xor %eax,%eax
20540 EXIT
20541 ENDPROC(__put_user_2)
20542
20543 ENTRY(__put_user_4)
20544 ENTER
20545+
20546+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20547+ GET_THREAD_INFO(%_ASM_BX)
20548 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20549 sub $3,%_ASM_BX
20550 cmp %_ASM_BX,%_ASM_CX
20551 jae bad_put_user
20552-3: movl %eax,(%_ASM_CX)
20553+
20554+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20555+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20556+ cmp %_ASM_BX,%_ASM_CX
20557+ jb 1234f
20558+ xor %ebx,%ebx
20559+1234:
20560+#endif
20561+
20562+#endif
20563+
20564+3: __copyuser_seg movl %eax,(_DEST)
20565 xor %eax,%eax
20566 EXIT
20567 ENDPROC(__put_user_4)
20568
20569 ENTRY(__put_user_8)
20570 ENTER
20571+
20572+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
20573+ GET_THREAD_INFO(%_ASM_BX)
20574 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
20575 sub $7,%_ASM_BX
20576 cmp %_ASM_BX,%_ASM_CX
20577 jae bad_put_user
20578-4: mov %_ASM_AX,(%_ASM_CX)
20579+
20580+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
20581+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
20582+ cmp %_ASM_BX,%_ASM_CX
20583+ jb 1234f
20584+ xor %ebx,%ebx
20585+1234:
20586+#endif
20587+
20588+#endif
20589+
20590+4: __copyuser_seg mov %_ASM_AX,(_DEST)
20591 #ifdef CONFIG_X86_32
20592-5: movl %edx,4(%_ASM_CX)
20593+5: __copyuser_seg movl %edx,4(_DEST)
20594 #endif
20595 xor %eax,%eax
20596 EXIT
20597diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
20598index 1cad221..de671ee 100644
20599--- a/arch/x86/lib/rwlock.S
20600+++ b/arch/x86/lib/rwlock.S
20601@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
20602 FRAME
20603 0: LOCK_PREFIX
20604 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
20605+
20606+#ifdef CONFIG_PAX_REFCOUNT
20607+ jno 1234f
20608+ LOCK_PREFIX
20609+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
20610+ int $4
20611+1234:
20612+ _ASM_EXTABLE(1234b, 1234b)
20613+#endif
20614+
20615 1: rep; nop
20616 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
20617 jne 1b
20618 LOCK_PREFIX
20619 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
20620+
20621+#ifdef CONFIG_PAX_REFCOUNT
20622+ jno 1234f
20623+ LOCK_PREFIX
20624+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
20625+ int $4
20626+1234:
20627+ _ASM_EXTABLE(1234b, 1234b)
20628+#endif
20629+
20630 jnz 0b
20631 ENDFRAME
20632+ pax_force_retaddr
20633 ret
20634 CFI_ENDPROC
20635 END(__write_lock_failed)
20636@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
20637 FRAME
20638 0: LOCK_PREFIX
20639 READ_LOCK_SIZE(inc) (%__lock_ptr)
20640+
20641+#ifdef CONFIG_PAX_REFCOUNT
20642+ jno 1234f
20643+ LOCK_PREFIX
20644+ READ_LOCK_SIZE(dec) (%__lock_ptr)
20645+ int $4
20646+1234:
20647+ _ASM_EXTABLE(1234b, 1234b)
20648+#endif
20649+
20650 1: rep; nop
20651 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
20652 js 1b
20653 LOCK_PREFIX
20654 READ_LOCK_SIZE(dec) (%__lock_ptr)
20655+
20656+#ifdef CONFIG_PAX_REFCOUNT
20657+ jno 1234f
20658+ LOCK_PREFIX
20659+ READ_LOCK_SIZE(inc) (%__lock_ptr)
20660+ int $4
20661+1234:
20662+ _ASM_EXTABLE(1234b, 1234b)
20663+#endif
20664+
20665 js 0b
20666 ENDFRAME
20667+ pax_force_retaddr
20668 ret
20669 CFI_ENDPROC
20670 END(__read_lock_failed)
20671diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
20672index 5dff5f0..cadebf4 100644
20673--- a/arch/x86/lib/rwsem.S
20674+++ b/arch/x86/lib/rwsem.S
20675@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
20676 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
20677 CFI_RESTORE __ASM_REG(dx)
20678 restore_common_regs
20679+ pax_force_retaddr
20680 ret
20681 CFI_ENDPROC
20682 ENDPROC(call_rwsem_down_read_failed)
20683@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
20684 movq %rax,%rdi
20685 call rwsem_down_write_failed
20686 restore_common_regs
20687+ pax_force_retaddr
20688 ret
20689 CFI_ENDPROC
20690 ENDPROC(call_rwsem_down_write_failed)
20691@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
20692 movq %rax,%rdi
20693 call rwsem_wake
20694 restore_common_regs
20695-1: ret
20696+1: pax_force_retaddr
20697+ ret
20698 CFI_ENDPROC
20699 ENDPROC(call_rwsem_wake)
20700
20701@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
20702 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
20703 CFI_RESTORE __ASM_REG(dx)
20704 restore_common_regs
20705+ pax_force_retaddr
20706 ret
20707 CFI_ENDPROC
20708 ENDPROC(call_rwsem_downgrade_wake)
20709diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
20710index a63efd6..ccecad8 100644
20711--- a/arch/x86/lib/thunk_64.S
20712+++ b/arch/x86/lib/thunk_64.S
20713@@ -8,6 +8,7 @@
20714 #include <linux/linkage.h>
20715 #include <asm/dwarf2.h>
20716 #include <asm/calling.h>
20717+#include <asm/alternative-asm.h>
20718
20719 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
20720 .macro THUNK name, func, put_ret_addr_in_rdi=0
20721@@ -41,5 +42,6 @@
20722 SAVE_ARGS
20723 restore:
20724 RESTORE_ARGS
20725+ pax_force_retaddr
20726 ret
20727 CFI_ENDPROC
20728diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
20729index e218d5d..35679b4 100644
20730--- a/arch/x86/lib/usercopy_32.c
20731+++ b/arch/x86/lib/usercopy_32.c
20732@@ -43,7 +43,7 @@ do { \
20733 __asm__ __volatile__( \
20734 " testl %1,%1\n" \
20735 " jz 2f\n" \
20736- "0: lodsb\n" \
20737+ "0: "__copyuser_seg"lodsb\n" \
20738 " stosb\n" \
20739 " testb %%al,%%al\n" \
20740 " jz 1f\n" \
20741@@ -128,10 +128,12 @@ do { \
20742 int __d0; \
20743 might_fault(); \
20744 __asm__ __volatile__( \
20745+ __COPYUSER_SET_ES \
20746 "0: rep; stosl\n" \
20747 " movl %2,%0\n" \
20748 "1: rep; stosb\n" \
20749 "2:\n" \
20750+ __COPYUSER_RESTORE_ES \
20751 ".section .fixup,\"ax\"\n" \
20752 "3: lea 0(%2,%0,4),%0\n" \
20753 " jmp 2b\n" \
20754@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
20755 might_fault();
20756
20757 __asm__ __volatile__(
20758+ __COPYUSER_SET_ES
20759 " testl %0, %0\n"
20760 " jz 3f\n"
20761 " andl %0,%%ecx\n"
20762@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
20763 " subl %%ecx,%0\n"
20764 " addl %0,%%eax\n"
20765 "1:\n"
20766+ __COPYUSER_RESTORE_ES
20767 ".section .fixup,\"ax\"\n"
20768 "2: xorl %%eax,%%eax\n"
20769 " jmp 1b\n"
20770@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
20771
20772 #ifdef CONFIG_X86_INTEL_USERCOPY
20773 static unsigned long
20774-__copy_user_intel(void __user *to, const void *from, unsigned long size)
20775+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
20776 {
20777 int d0, d1;
20778 __asm__ __volatile__(
20779@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
20780 " .align 2,0x90\n"
20781 "3: movl 0(%4), %%eax\n"
20782 "4: movl 4(%4), %%edx\n"
20783- "5: movl %%eax, 0(%3)\n"
20784- "6: movl %%edx, 4(%3)\n"
20785+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
20786+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
20787 "7: movl 8(%4), %%eax\n"
20788 "8: movl 12(%4),%%edx\n"
20789- "9: movl %%eax, 8(%3)\n"
20790- "10: movl %%edx, 12(%3)\n"
20791+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
20792+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
20793 "11: movl 16(%4), %%eax\n"
20794 "12: movl 20(%4), %%edx\n"
20795- "13: movl %%eax, 16(%3)\n"
20796- "14: movl %%edx, 20(%3)\n"
20797+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
20798+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
20799 "15: movl 24(%4), %%eax\n"
20800 "16: movl 28(%4), %%edx\n"
20801- "17: movl %%eax, 24(%3)\n"
20802- "18: movl %%edx, 28(%3)\n"
20803+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
20804+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
20805 "19: movl 32(%4), %%eax\n"
20806 "20: movl 36(%4), %%edx\n"
20807- "21: movl %%eax, 32(%3)\n"
20808- "22: movl %%edx, 36(%3)\n"
20809+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
20810+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
20811 "23: movl 40(%4), %%eax\n"
20812 "24: movl 44(%4), %%edx\n"
20813- "25: movl %%eax, 40(%3)\n"
20814- "26: movl %%edx, 44(%3)\n"
20815+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
20816+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
20817 "27: movl 48(%4), %%eax\n"
20818 "28: movl 52(%4), %%edx\n"
20819- "29: movl %%eax, 48(%3)\n"
20820- "30: movl %%edx, 52(%3)\n"
20821+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
20822+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
20823 "31: movl 56(%4), %%eax\n"
20824 "32: movl 60(%4), %%edx\n"
20825- "33: movl %%eax, 56(%3)\n"
20826- "34: movl %%edx, 60(%3)\n"
20827+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
20828+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
20829 " addl $-64, %0\n"
20830 " addl $64, %4\n"
20831 " addl $64, %3\n"
20832@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
20833 " shrl $2, %0\n"
20834 " andl $3, %%eax\n"
20835 " cld\n"
20836+ __COPYUSER_SET_ES
20837 "99: rep; movsl\n"
20838 "36: movl %%eax, %0\n"
20839 "37: rep; movsb\n"
20840 "100:\n"
20841+ __COPYUSER_RESTORE_ES
20842+ ".section .fixup,\"ax\"\n"
20843+ "101: lea 0(%%eax,%0,4),%0\n"
20844+ " jmp 100b\n"
20845+ ".previous\n"
20846+ ".section __ex_table,\"a\"\n"
20847+ " .align 4\n"
20848+ " .long 1b,100b\n"
20849+ " .long 2b,100b\n"
20850+ " .long 3b,100b\n"
20851+ " .long 4b,100b\n"
20852+ " .long 5b,100b\n"
20853+ " .long 6b,100b\n"
20854+ " .long 7b,100b\n"
20855+ " .long 8b,100b\n"
20856+ " .long 9b,100b\n"
20857+ " .long 10b,100b\n"
20858+ " .long 11b,100b\n"
20859+ " .long 12b,100b\n"
20860+ " .long 13b,100b\n"
20861+ " .long 14b,100b\n"
20862+ " .long 15b,100b\n"
20863+ " .long 16b,100b\n"
20864+ " .long 17b,100b\n"
20865+ " .long 18b,100b\n"
20866+ " .long 19b,100b\n"
20867+ " .long 20b,100b\n"
20868+ " .long 21b,100b\n"
20869+ " .long 22b,100b\n"
20870+ " .long 23b,100b\n"
20871+ " .long 24b,100b\n"
20872+ " .long 25b,100b\n"
20873+ " .long 26b,100b\n"
20874+ " .long 27b,100b\n"
20875+ " .long 28b,100b\n"
20876+ " .long 29b,100b\n"
20877+ " .long 30b,100b\n"
20878+ " .long 31b,100b\n"
20879+ " .long 32b,100b\n"
20880+ " .long 33b,100b\n"
20881+ " .long 34b,100b\n"
20882+ " .long 35b,100b\n"
20883+ " .long 36b,100b\n"
20884+ " .long 37b,100b\n"
20885+ " .long 99b,101b\n"
20886+ ".previous"
20887+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
20888+ : "1"(to), "2"(from), "0"(size)
20889+ : "eax", "edx", "memory");
20890+ return size;
20891+}
20892+
20893+static unsigned long
20894+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
20895+{
20896+ int d0, d1;
20897+ __asm__ __volatile__(
20898+ " .align 2,0x90\n"
20899+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
20900+ " cmpl $67, %0\n"
20901+ " jbe 3f\n"
20902+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
20903+ " .align 2,0x90\n"
20904+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
20905+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
20906+ "5: movl %%eax, 0(%3)\n"
20907+ "6: movl %%edx, 4(%3)\n"
20908+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
20909+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
20910+ "9: movl %%eax, 8(%3)\n"
20911+ "10: movl %%edx, 12(%3)\n"
20912+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
20913+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
20914+ "13: movl %%eax, 16(%3)\n"
20915+ "14: movl %%edx, 20(%3)\n"
20916+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
20917+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
20918+ "17: movl %%eax, 24(%3)\n"
20919+ "18: movl %%edx, 28(%3)\n"
20920+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
20921+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
20922+ "21: movl %%eax, 32(%3)\n"
20923+ "22: movl %%edx, 36(%3)\n"
20924+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
20925+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
20926+ "25: movl %%eax, 40(%3)\n"
20927+ "26: movl %%edx, 44(%3)\n"
20928+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
20929+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
20930+ "29: movl %%eax, 48(%3)\n"
20931+ "30: movl %%edx, 52(%3)\n"
20932+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
20933+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
20934+ "33: movl %%eax, 56(%3)\n"
20935+ "34: movl %%edx, 60(%3)\n"
20936+ " addl $-64, %0\n"
20937+ " addl $64, %4\n"
20938+ " addl $64, %3\n"
20939+ " cmpl $63, %0\n"
20940+ " ja 1b\n"
20941+ "35: movl %0, %%eax\n"
20942+ " shrl $2, %0\n"
20943+ " andl $3, %%eax\n"
20944+ " cld\n"
20945+ "99: rep; "__copyuser_seg" movsl\n"
20946+ "36: movl %%eax, %0\n"
20947+ "37: rep; "__copyuser_seg" movsb\n"
20948+ "100:\n"
20949 ".section .fixup,\"ax\"\n"
20950 "101: lea 0(%%eax,%0,4),%0\n"
20951 " jmp 100b\n"
20952@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
20953 int d0, d1;
20954 __asm__ __volatile__(
20955 " .align 2,0x90\n"
20956- "0: movl 32(%4), %%eax\n"
20957+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
20958 " cmpl $67, %0\n"
20959 " jbe 2f\n"
20960- "1: movl 64(%4), %%eax\n"
20961+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
20962 " .align 2,0x90\n"
20963- "2: movl 0(%4), %%eax\n"
20964- "21: movl 4(%4), %%edx\n"
20965+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
20966+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
20967 " movl %%eax, 0(%3)\n"
20968 " movl %%edx, 4(%3)\n"
20969- "3: movl 8(%4), %%eax\n"
20970- "31: movl 12(%4),%%edx\n"
20971+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
20972+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
20973 " movl %%eax, 8(%3)\n"
20974 " movl %%edx, 12(%3)\n"
20975- "4: movl 16(%4), %%eax\n"
20976- "41: movl 20(%4), %%edx\n"
20977+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
20978+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
20979 " movl %%eax, 16(%3)\n"
20980 " movl %%edx, 20(%3)\n"
20981- "10: movl 24(%4), %%eax\n"
20982- "51: movl 28(%4), %%edx\n"
20983+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
20984+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
20985 " movl %%eax, 24(%3)\n"
20986 " movl %%edx, 28(%3)\n"
20987- "11: movl 32(%4), %%eax\n"
20988- "61: movl 36(%4), %%edx\n"
20989+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
20990+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
20991 " movl %%eax, 32(%3)\n"
20992 " movl %%edx, 36(%3)\n"
20993- "12: movl 40(%4), %%eax\n"
20994- "71: movl 44(%4), %%edx\n"
20995+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
20996+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
20997 " movl %%eax, 40(%3)\n"
20998 " movl %%edx, 44(%3)\n"
20999- "13: movl 48(%4), %%eax\n"
21000- "81: movl 52(%4), %%edx\n"
21001+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
21002+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
21003 " movl %%eax, 48(%3)\n"
21004 " movl %%edx, 52(%3)\n"
21005- "14: movl 56(%4), %%eax\n"
21006- "91: movl 60(%4), %%edx\n"
21007+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21008+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21009 " movl %%eax, 56(%3)\n"
21010 " movl %%edx, 60(%3)\n"
21011 " addl $-64, %0\n"
21012@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
21013 " shrl $2, %0\n"
21014 " andl $3, %%eax\n"
21015 " cld\n"
21016- "6: rep; movsl\n"
21017+ "6: rep; "__copyuser_seg" movsl\n"
21018 " movl %%eax,%0\n"
21019- "7: rep; movsb\n"
21020+ "7: rep; "__copyuser_seg" movsb\n"
21021 "8:\n"
21022 ".section .fixup,\"ax\"\n"
21023 "9: lea 0(%%eax,%0,4),%0\n"
21024@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
21025
21026 __asm__ __volatile__(
21027 " .align 2,0x90\n"
21028- "0: movl 32(%4), %%eax\n"
21029+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
21030 " cmpl $67, %0\n"
21031 " jbe 2f\n"
21032- "1: movl 64(%4), %%eax\n"
21033+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
21034 " .align 2,0x90\n"
21035- "2: movl 0(%4), %%eax\n"
21036- "21: movl 4(%4), %%edx\n"
21037+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
21038+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
21039 " movnti %%eax, 0(%3)\n"
21040 " movnti %%edx, 4(%3)\n"
21041- "3: movl 8(%4), %%eax\n"
21042- "31: movl 12(%4),%%edx\n"
21043+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
21044+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
21045 " movnti %%eax, 8(%3)\n"
21046 " movnti %%edx, 12(%3)\n"
21047- "4: movl 16(%4), %%eax\n"
21048- "41: movl 20(%4), %%edx\n"
21049+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
21050+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
21051 " movnti %%eax, 16(%3)\n"
21052 " movnti %%edx, 20(%3)\n"
21053- "10: movl 24(%4), %%eax\n"
21054- "51: movl 28(%4), %%edx\n"
21055+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
21056+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
21057 " movnti %%eax, 24(%3)\n"
21058 " movnti %%edx, 28(%3)\n"
21059- "11: movl 32(%4), %%eax\n"
21060- "61: movl 36(%4), %%edx\n"
21061+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
21062+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
21063 " movnti %%eax, 32(%3)\n"
21064 " movnti %%edx, 36(%3)\n"
21065- "12: movl 40(%4), %%eax\n"
21066- "71: movl 44(%4), %%edx\n"
21067+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
21068+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
21069 " movnti %%eax, 40(%3)\n"
21070 " movnti %%edx, 44(%3)\n"
21071- "13: movl 48(%4), %%eax\n"
21072- "81: movl 52(%4), %%edx\n"
21073+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
21074+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
21075 " movnti %%eax, 48(%3)\n"
21076 " movnti %%edx, 52(%3)\n"
21077- "14: movl 56(%4), %%eax\n"
21078- "91: movl 60(%4), %%edx\n"
21079+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21080+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21081 " movnti %%eax, 56(%3)\n"
21082 " movnti %%edx, 60(%3)\n"
21083 " addl $-64, %0\n"
21084@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
21085 " shrl $2, %0\n"
21086 " andl $3, %%eax\n"
21087 " cld\n"
21088- "6: rep; movsl\n"
21089+ "6: rep; "__copyuser_seg" movsl\n"
21090 " movl %%eax,%0\n"
21091- "7: rep; movsb\n"
21092+ "7: rep; "__copyuser_seg" movsb\n"
21093 "8:\n"
21094 ".section .fixup,\"ax\"\n"
21095 "9: lea 0(%%eax,%0,4),%0\n"
21096@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
21097
21098 __asm__ __volatile__(
21099 " .align 2,0x90\n"
21100- "0: movl 32(%4), %%eax\n"
21101+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
21102 " cmpl $67, %0\n"
21103 " jbe 2f\n"
21104- "1: movl 64(%4), %%eax\n"
21105+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
21106 " .align 2,0x90\n"
21107- "2: movl 0(%4), %%eax\n"
21108- "21: movl 4(%4), %%edx\n"
21109+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
21110+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
21111 " movnti %%eax, 0(%3)\n"
21112 " movnti %%edx, 4(%3)\n"
21113- "3: movl 8(%4), %%eax\n"
21114- "31: movl 12(%4),%%edx\n"
21115+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
21116+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
21117 " movnti %%eax, 8(%3)\n"
21118 " movnti %%edx, 12(%3)\n"
21119- "4: movl 16(%4), %%eax\n"
21120- "41: movl 20(%4), %%edx\n"
21121+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
21122+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
21123 " movnti %%eax, 16(%3)\n"
21124 " movnti %%edx, 20(%3)\n"
21125- "10: movl 24(%4), %%eax\n"
21126- "51: movl 28(%4), %%edx\n"
21127+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
21128+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
21129 " movnti %%eax, 24(%3)\n"
21130 " movnti %%edx, 28(%3)\n"
21131- "11: movl 32(%4), %%eax\n"
21132- "61: movl 36(%4), %%edx\n"
21133+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
21134+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
21135 " movnti %%eax, 32(%3)\n"
21136 " movnti %%edx, 36(%3)\n"
21137- "12: movl 40(%4), %%eax\n"
21138- "71: movl 44(%4), %%edx\n"
21139+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
21140+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
21141 " movnti %%eax, 40(%3)\n"
21142 " movnti %%edx, 44(%3)\n"
21143- "13: movl 48(%4), %%eax\n"
21144- "81: movl 52(%4), %%edx\n"
21145+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
21146+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
21147 " movnti %%eax, 48(%3)\n"
21148 " movnti %%edx, 52(%3)\n"
21149- "14: movl 56(%4), %%eax\n"
21150- "91: movl 60(%4), %%edx\n"
21151+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
21152+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
21153 " movnti %%eax, 56(%3)\n"
21154 " movnti %%edx, 60(%3)\n"
21155 " addl $-64, %0\n"
21156@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
21157 " shrl $2, %0\n"
21158 " andl $3, %%eax\n"
21159 " cld\n"
21160- "6: rep; movsl\n"
21161+ "6: rep; "__copyuser_seg" movsl\n"
21162 " movl %%eax,%0\n"
21163- "7: rep; movsb\n"
21164+ "7: rep; "__copyuser_seg" movsb\n"
21165 "8:\n"
21166 ".section .fixup,\"ax\"\n"
21167 "9: lea 0(%%eax,%0,4),%0\n"
21168@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
21169 */
21170 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
21171 unsigned long size);
21172-unsigned long __copy_user_intel(void __user *to, const void *from,
21173+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
21174+ unsigned long size);
21175+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
21176 unsigned long size);
21177 unsigned long __copy_user_zeroing_intel_nocache(void *to,
21178 const void __user *from, unsigned long size);
21179 #endif /* CONFIG_X86_INTEL_USERCOPY */
21180
21181 /* Generic arbitrary sized copy. */
21182-#define __copy_user(to, from, size) \
21183+#define __copy_user(to, from, size, prefix, set, restore) \
21184 do { \
21185 int __d0, __d1, __d2; \
21186 __asm__ __volatile__( \
21187+ set \
21188 " cmp $7,%0\n" \
21189 " jbe 1f\n" \
21190 " movl %1,%0\n" \
21191 " negl %0\n" \
21192 " andl $7,%0\n" \
21193 " subl %0,%3\n" \
21194- "4: rep; movsb\n" \
21195+ "4: rep; "prefix"movsb\n" \
21196 " movl %3,%0\n" \
21197 " shrl $2,%0\n" \
21198 " andl $3,%3\n" \
21199 " .align 2,0x90\n" \
21200- "0: rep; movsl\n" \
21201+ "0: rep; "prefix"movsl\n" \
21202 " movl %3,%0\n" \
21203- "1: rep; movsb\n" \
21204+ "1: rep; "prefix"movsb\n" \
21205 "2:\n" \
21206+ restore \
21207 ".section .fixup,\"ax\"\n" \
21208 "5: addl %3,%0\n" \
21209 " jmp 2b\n" \
21210@@ -682,14 +799,14 @@ do { \
21211 " negl %0\n" \
21212 " andl $7,%0\n" \
21213 " subl %0,%3\n" \
21214- "4: rep; movsb\n" \
21215+ "4: rep; "__copyuser_seg"movsb\n" \
21216 " movl %3,%0\n" \
21217 " shrl $2,%0\n" \
21218 " andl $3,%3\n" \
21219 " .align 2,0x90\n" \
21220- "0: rep; movsl\n" \
21221+ "0: rep; "__copyuser_seg"movsl\n" \
21222 " movl %3,%0\n" \
21223- "1: rep; movsb\n" \
21224+ "1: rep; "__copyuser_seg"movsb\n" \
21225 "2:\n" \
21226 ".section .fixup,\"ax\"\n" \
21227 "5: addl %3,%0\n" \
21228@@ -775,9 +892,9 @@ survive:
21229 }
21230 #endif
21231 if (movsl_is_ok(to, from, n))
21232- __copy_user(to, from, n);
21233+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
21234 else
21235- n = __copy_user_intel(to, from, n);
21236+ n = __generic_copy_to_user_intel(to, from, n);
21237 return n;
21238 }
21239 EXPORT_SYMBOL(__copy_to_user_ll);
21240@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
21241 unsigned long n)
21242 {
21243 if (movsl_is_ok(to, from, n))
21244- __copy_user(to, from, n);
21245+ __copy_user(to, from, n, __copyuser_seg, "", "");
21246 else
21247- n = __copy_user_intel((void __user *)to,
21248- (const void *)from, n);
21249+ n = __generic_copy_from_user_intel(to, from, n);
21250 return n;
21251 }
21252 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
21253@@ -827,65 +943,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
21254 if (n > 64 && cpu_has_xmm2)
21255 n = __copy_user_intel_nocache(to, from, n);
21256 else
21257- __copy_user(to, from, n);
21258+ __copy_user(to, from, n, __copyuser_seg, "", "");
21259 #else
21260- __copy_user(to, from, n);
21261+ __copy_user(to, from, n, __copyuser_seg, "", "");
21262 #endif
21263 return n;
21264 }
21265 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
21266
21267-/**
21268- * copy_to_user: - Copy a block of data into user space.
21269- * @to: Destination address, in user space.
21270- * @from: Source address, in kernel space.
21271- * @n: Number of bytes to copy.
21272- *
21273- * Context: User context only. This function may sleep.
21274- *
21275- * Copy data from kernel space to user space.
21276- *
21277- * Returns number of bytes that could not be copied.
21278- * On success, this will be zero.
21279- */
21280-unsigned long
21281-copy_to_user(void __user *to, const void *from, unsigned long n)
21282-{
21283- if (access_ok(VERIFY_WRITE, to, n))
21284- n = __copy_to_user(to, from, n);
21285- return n;
21286-}
21287-EXPORT_SYMBOL(copy_to_user);
21288-
21289-/**
21290- * copy_from_user: - Copy a block of data from user space.
21291- * @to: Destination address, in kernel space.
21292- * @from: Source address, in user space.
21293- * @n: Number of bytes to copy.
21294- *
21295- * Context: User context only. This function may sleep.
21296- *
21297- * Copy data from user space to kernel space.
21298- *
21299- * Returns number of bytes that could not be copied.
21300- * On success, this will be zero.
21301- *
21302- * If some data could not be copied, this function will pad the copied
21303- * data to the requested size using zero bytes.
21304- */
21305-unsigned long
21306-_copy_from_user(void *to, const void __user *from, unsigned long n)
21307-{
21308- if (access_ok(VERIFY_READ, from, n))
21309- n = __copy_from_user(to, from, n);
21310- else
21311- memset(to, 0, n);
21312- return n;
21313-}
21314-EXPORT_SYMBOL(_copy_from_user);
21315-
21316 void copy_from_user_overflow(void)
21317 {
21318 WARN(1, "Buffer overflow detected!\n");
21319 }
21320 EXPORT_SYMBOL(copy_from_user_overflow);
21321+
21322+void copy_to_user_overflow(void)
21323+{
21324+ WARN(1, "Buffer overflow detected!\n");
21325+}
21326+EXPORT_SYMBOL(copy_to_user_overflow);
21327+
21328+#ifdef CONFIG_PAX_MEMORY_UDEREF
21329+void __set_fs(mm_segment_t x)
21330+{
21331+ switch (x.seg) {
21332+ case 0:
21333+ loadsegment(gs, 0);
21334+ break;
21335+ case TASK_SIZE_MAX:
21336+ loadsegment(gs, __USER_DS);
21337+ break;
21338+ case -1UL:
21339+ loadsegment(gs, __KERNEL_DS);
21340+ break;
21341+ default:
21342+ BUG();
21343+ }
21344+ return;
21345+}
21346+EXPORT_SYMBOL(__set_fs);
21347+
21348+void set_fs(mm_segment_t x)
21349+{
21350+ current_thread_info()->addr_limit = x;
21351+ __set_fs(x);
21352+}
21353+EXPORT_SYMBOL(set_fs);
21354+#endif
21355diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
21356index b7c2849..8633ad8 100644
21357--- a/arch/x86/lib/usercopy_64.c
21358+++ b/arch/x86/lib/usercopy_64.c
21359@@ -42,6 +42,12 @@ long
21360 __strncpy_from_user(char *dst, const char __user *src, long count)
21361 {
21362 long res;
21363+
21364+#ifdef CONFIG_PAX_MEMORY_UDEREF
21365+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21366+ src += PAX_USER_SHADOW_BASE;
21367+#endif
21368+
21369 __do_strncpy_from_user(dst, src, count, res);
21370 return res;
21371 }
21372@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
21373 {
21374 long __d0;
21375 might_fault();
21376+
21377+#ifdef CONFIG_PAX_MEMORY_UDEREF
21378+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
21379+ addr += PAX_USER_SHADOW_BASE;
21380+#endif
21381+
21382 /* no memory constraint because it doesn't change any memory gcc knows
21383 about */
21384 asm volatile(
21385@@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
21386 }
21387 EXPORT_SYMBOL(strlen_user);
21388
21389-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
21390+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
21391 {
21392- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
21393- return copy_user_generic((__force void *)to, (__force void *)from, len);
21394- }
21395- return len;
21396+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
21397+
21398+#ifdef CONFIG_PAX_MEMORY_UDEREF
21399+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
21400+ to += PAX_USER_SHADOW_BASE;
21401+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
21402+ from += PAX_USER_SHADOW_BASE;
21403+#endif
21404+
21405+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
21406+ }
21407+ return len;
21408 }
21409 EXPORT_SYMBOL(copy_in_user);
21410
21411@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
21412 * it is not necessary to optimize tail handling.
21413 */
21414 unsigned long
21415-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
21416+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
21417 {
21418 char c;
21419 unsigned zero_len;
21420diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
21421index d0474ad..36e9257 100644
21422--- a/arch/x86/mm/extable.c
21423+++ b/arch/x86/mm/extable.c
21424@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs)
21425 const struct exception_table_entry *fixup;
21426
21427 #ifdef CONFIG_PNPBIOS
21428- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
21429+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
21430 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
21431 extern u32 pnp_bios_is_utter_crap;
21432 pnp_bios_is_utter_crap = 1;
21433diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
21434index 5db0490..2ddce45 100644
21435--- a/arch/x86/mm/fault.c
21436+++ b/arch/x86/mm/fault.c
21437@@ -13,11 +13,18 @@
21438 #include <linux/perf_event.h> /* perf_sw_event */
21439 #include <linux/hugetlb.h> /* hstate_index_to_shift */
21440 #include <linux/prefetch.h> /* prefetchw */
21441+#include <linux/unistd.h>
21442+#include <linux/compiler.h>
21443
21444 #include <asm/traps.h> /* dotraplinkage, ... */
21445 #include <asm/pgalloc.h> /* pgd_*(), ... */
21446 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
21447 #include <asm/fixmap.h> /* VSYSCALL_START */
21448+#include <asm/tlbflush.h>
21449+
21450+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21451+#include <asm/stacktrace.h>
21452+#endif
21453
21454 /*
21455 * Page fault error code bits:
21456@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
21457 int ret = 0;
21458
21459 /* kprobe_running() needs smp_processor_id() */
21460- if (kprobes_built_in() && !user_mode_vm(regs)) {
21461+ if (kprobes_built_in() && !user_mode(regs)) {
21462 preempt_disable();
21463 if (kprobe_running() && kprobe_fault_handler(regs, 14))
21464 ret = 1;
21465@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
21466 return !instr_lo || (instr_lo>>1) == 1;
21467 case 0x00:
21468 /* Prefetch instruction is 0x0F0D or 0x0F18 */
21469- if (probe_kernel_address(instr, opcode))
21470+ if (user_mode(regs)) {
21471+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
21472+ return 0;
21473+ } else if (probe_kernel_address(instr, opcode))
21474 return 0;
21475
21476 *prefetch = (instr_lo == 0xF) &&
21477@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
21478 while (instr < max_instr) {
21479 unsigned char opcode;
21480
21481- if (probe_kernel_address(instr, opcode))
21482+ if (user_mode(regs)) {
21483+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
21484+ break;
21485+ } else if (probe_kernel_address(instr, opcode))
21486 break;
21487
21488 instr++;
21489@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
21490 force_sig_info(si_signo, &info, tsk);
21491 }
21492
21493+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
21494+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
21495+#endif
21496+
21497+#ifdef CONFIG_PAX_EMUTRAMP
21498+static int pax_handle_fetch_fault(struct pt_regs *regs);
21499+#endif
21500+
21501+#ifdef CONFIG_PAX_PAGEEXEC
21502+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
21503+{
21504+ pgd_t *pgd;
21505+ pud_t *pud;
21506+ pmd_t *pmd;
21507+
21508+ pgd = pgd_offset(mm, address);
21509+ if (!pgd_present(*pgd))
21510+ return NULL;
21511+ pud = pud_offset(pgd, address);
21512+ if (!pud_present(*pud))
21513+ return NULL;
21514+ pmd = pmd_offset(pud, address);
21515+ if (!pmd_present(*pmd))
21516+ return NULL;
21517+ return pmd;
21518+}
21519+#endif
21520+
21521 DEFINE_SPINLOCK(pgd_lock);
21522 LIST_HEAD(pgd_list);
21523
21524@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
21525 for (address = VMALLOC_START & PMD_MASK;
21526 address >= TASK_SIZE && address < FIXADDR_TOP;
21527 address += PMD_SIZE) {
21528+
21529+#ifdef CONFIG_PAX_PER_CPU_PGD
21530+ unsigned long cpu;
21531+#else
21532 struct page *page;
21533+#endif
21534
21535 spin_lock(&pgd_lock);
21536+
21537+#ifdef CONFIG_PAX_PER_CPU_PGD
21538+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
21539+ pgd_t *pgd = get_cpu_pgd(cpu);
21540+ pmd_t *ret;
21541+#else
21542 list_for_each_entry(page, &pgd_list, lru) {
21543+ pgd_t *pgd = page_address(page);
21544 spinlock_t *pgt_lock;
21545 pmd_t *ret;
21546
21547@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
21548 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
21549
21550 spin_lock(pgt_lock);
21551- ret = vmalloc_sync_one(page_address(page), address);
21552+#endif
21553+
21554+ ret = vmalloc_sync_one(pgd, address);
21555+
21556+#ifndef CONFIG_PAX_PER_CPU_PGD
21557 spin_unlock(pgt_lock);
21558+#endif
21559
21560 if (!ret)
21561 break;
21562@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
21563 * an interrupt in the middle of a task switch..
21564 */
21565 pgd_paddr = read_cr3();
21566+
21567+#ifdef CONFIG_PAX_PER_CPU_PGD
21568+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
21569+#endif
21570+
21571 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
21572 if (!pmd_k)
21573 return -1;
21574@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
21575 * happen within a race in page table update. In the later
21576 * case just flush:
21577 */
21578+
21579+#ifdef CONFIG_PAX_PER_CPU_PGD
21580+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
21581+ pgd = pgd_offset_cpu(smp_processor_id(), address);
21582+#else
21583 pgd = pgd_offset(current->active_mm, address);
21584+#endif
21585+
21586 pgd_ref = pgd_offset_k(address);
21587 if (pgd_none(*pgd_ref))
21588 return -1;
21589@@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
21590 static int is_errata100(struct pt_regs *regs, unsigned long address)
21591 {
21592 #ifdef CONFIG_X86_64
21593- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
21594+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
21595 return 1;
21596 #endif
21597 return 0;
21598@@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
21599 }
21600
21601 static const char nx_warning[] = KERN_CRIT
21602-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
21603+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
21604
21605 static void
21606 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
21607@@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
21608 if (!oops_may_print())
21609 return;
21610
21611- if (error_code & PF_INSTR) {
21612+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
21613 unsigned int level;
21614
21615 pte_t *pte = lookup_address(address, &level);
21616
21617 if (pte && pte_present(*pte) && !pte_exec(*pte))
21618- printk(nx_warning, current_uid());
21619+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
21620 }
21621
21622+#ifdef CONFIG_PAX_KERNEXEC
21623+ if (init_mm.start_code <= address && address < init_mm.end_code) {
21624+ if (current->signal->curr_ip)
21625+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
21626+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
21627+ else
21628+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
21629+ current->comm, task_pid_nr(current), current_uid(), current_euid());
21630+ }
21631+#endif
21632+
21633 printk(KERN_ALERT "BUG: unable to handle kernel ");
21634 if (address < PAGE_SIZE)
21635 printk(KERN_CONT "NULL pointer dereference");
21636@@ -739,6 +820,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
21637 }
21638 #endif
21639
21640+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
21641+ if (pax_is_fetch_fault(regs, error_code, address)) {
21642+
21643+#ifdef CONFIG_PAX_EMUTRAMP
21644+ switch (pax_handle_fetch_fault(regs)) {
21645+ case 2:
21646+ return;
21647+ }
21648+#endif
21649+
21650+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
21651+ do_group_exit(SIGKILL);
21652+ }
21653+#endif
21654+
21655 if (unlikely(show_unhandled_signals))
21656 show_signal_msg(regs, error_code, address, tsk);
21657
21658@@ -835,7 +931,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
21659 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
21660 printk(KERN_ERR
21661 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
21662- tsk->comm, tsk->pid, address);
21663+ tsk->comm, task_pid_nr(tsk), address);
21664 code = BUS_MCEERR_AR;
21665 }
21666 #endif
21667@@ -890,6 +986,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
21668 return 1;
21669 }
21670
21671+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
21672+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
21673+{
21674+ pte_t *pte;
21675+ pmd_t *pmd;
21676+ spinlock_t *ptl;
21677+ unsigned char pte_mask;
21678+
21679+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
21680+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
21681+ return 0;
21682+
21683+ /* PaX: it's our fault, let's handle it if we can */
21684+
21685+ /* PaX: take a look at read faults before acquiring any locks */
21686+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
21687+ /* instruction fetch attempt from a protected page in user mode */
21688+ up_read(&mm->mmap_sem);
21689+
21690+#ifdef CONFIG_PAX_EMUTRAMP
21691+ switch (pax_handle_fetch_fault(regs)) {
21692+ case 2:
21693+ return 1;
21694+ }
21695+#endif
21696+
21697+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
21698+ do_group_exit(SIGKILL);
21699+ }
21700+
21701+ pmd = pax_get_pmd(mm, address);
21702+ if (unlikely(!pmd))
21703+ return 0;
21704+
21705+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
21706+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
21707+ pte_unmap_unlock(pte, ptl);
21708+ return 0;
21709+ }
21710+
21711+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
21712+ /* write attempt to a protected page in user mode */
21713+ pte_unmap_unlock(pte, ptl);
21714+ return 0;
21715+ }
21716+
21717+#ifdef CONFIG_SMP
21718+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
21719+#else
21720+ if (likely(address > get_limit(regs->cs)))
21721+#endif
21722+ {
21723+ set_pte(pte, pte_mkread(*pte));
21724+ __flush_tlb_one(address);
21725+ pte_unmap_unlock(pte, ptl);
21726+ up_read(&mm->mmap_sem);
21727+ return 1;
21728+ }
21729+
21730+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
21731+
21732+ /*
21733+ * PaX: fill DTLB with user rights and retry
21734+ */
21735+ __asm__ __volatile__ (
21736+ "orb %2,(%1)\n"
21737+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
21738+/*
21739+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
21740+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
21741+ * page fault when examined during a TLB load attempt. this is true not only
21742+ * for PTEs holding a non-present entry but also present entries that will
21743+ * raise a page fault (such as those set up by PaX, or the copy-on-write
21744+ * mechanism). in effect it means that we do *not* need to flush the TLBs
21745+ * for our target pages since their PTEs are simply not in the TLBs at all.
21746+
21747+ * the best thing in omitting it is that we gain around 15-20% speed in the
21748+ * fast path of the page fault handler and can get rid of tracing since we
21749+ * can no longer flush unintended entries.
21750+ */
21751+ "invlpg (%0)\n"
21752+#endif
21753+ __copyuser_seg"testb $0,(%0)\n"
21754+ "xorb %3,(%1)\n"
21755+ :
21756+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
21757+ : "memory", "cc");
21758+ pte_unmap_unlock(pte, ptl);
21759+ up_read(&mm->mmap_sem);
21760+ return 1;
21761+}
21762+#endif
21763+
21764 /*
21765 * Handle a spurious fault caused by a stale TLB entry.
21766 *
21767@@ -962,6 +1151,9 @@ int show_unhandled_signals = 1;
21768 static inline int
21769 access_error(unsigned long error_code, struct vm_area_struct *vma)
21770 {
21771+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
21772+ return 1;
21773+
21774 if (error_code & PF_WRITE) {
21775 /* write, present and write, not present: */
21776 if (unlikely(!(vma->vm_flags & VM_WRITE)))
21777@@ -995,18 +1187,32 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
21778 {
21779 struct vm_area_struct *vma;
21780 struct task_struct *tsk;
21781- unsigned long address;
21782 struct mm_struct *mm;
21783 int fault;
21784 int write = error_code & PF_WRITE;
21785 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
21786 (write ? FAULT_FLAG_WRITE : 0);
21787
21788- tsk = current;
21789- mm = tsk->mm;
21790-
21791 /* Get the faulting address: */
21792- address = read_cr2();
21793+ unsigned long address = read_cr2();
21794+
21795+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21796+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
21797+ if (!search_exception_tables(regs->ip)) {
21798+ bad_area_nosemaphore(regs, error_code, address);
21799+ return;
21800+ }
21801+ if (address < PAX_USER_SHADOW_BASE) {
21802+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
21803+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
21804+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
21805+ } else
21806+ address -= PAX_USER_SHADOW_BASE;
21807+ }
21808+#endif
21809+
21810+ tsk = current;
21811+ mm = tsk->mm;
21812
21813 /*
21814 * Detect and handle instructions that would cause a page fault for
21815@@ -1067,7 +1273,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
21816 * User-mode registers count as a user access even for any
21817 * potential system fault or CPU buglet:
21818 */
21819- if (user_mode_vm(regs)) {
21820+ if (user_mode(regs)) {
21821 local_irq_enable();
21822 error_code |= PF_USER;
21823 } else {
21824@@ -1122,6 +1328,11 @@ retry:
21825 might_sleep();
21826 }
21827
21828+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
21829+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
21830+ return;
21831+#endif
21832+
21833 vma = find_vma(mm, address);
21834 if (unlikely(!vma)) {
21835 bad_area(regs, error_code, address);
21836@@ -1133,18 +1344,24 @@ retry:
21837 bad_area(regs, error_code, address);
21838 return;
21839 }
21840- if (error_code & PF_USER) {
21841- /*
21842- * Accessing the stack below %sp is always a bug.
21843- * The large cushion allows instructions like enter
21844- * and pusha to work. ("enter $65535, $31" pushes
21845- * 32 pointers and then decrements %sp by 65535.)
21846- */
21847- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
21848- bad_area(regs, error_code, address);
21849- return;
21850- }
21851+ /*
21852+ * Accessing the stack below %sp is always a bug.
21853+ * The large cushion allows instructions like enter
21854+ * and pusha to work. ("enter $65535, $31" pushes
21855+ * 32 pointers and then decrements %sp by 65535.)
21856+ */
21857+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
21858+ bad_area(regs, error_code, address);
21859+ return;
21860 }
21861+
21862+#ifdef CONFIG_PAX_SEGMEXEC
21863+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
21864+ bad_area(regs, error_code, address);
21865+ return;
21866+ }
21867+#endif
21868+
21869 if (unlikely(expand_stack(vma, address))) {
21870 bad_area(regs, error_code, address);
21871 return;
21872@@ -1199,3 +1416,292 @@ good_area:
21873
21874 up_read(&mm->mmap_sem);
21875 }
21876+
21877+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
21878+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
21879+{
21880+ struct mm_struct *mm = current->mm;
21881+ unsigned long ip = regs->ip;
21882+
21883+ if (v8086_mode(regs))
21884+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
21885+
21886+#ifdef CONFIG_PAX_PAGEEXEC
21887+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
21888+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
21889+ return true;
21890+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
21891+ return true;
21892+ return false;
21893+ }
21894+#endif
21895+
21896+#ifdef CONFIG_PAX_SEGMEXEC
21897+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
21898+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
21899+ return true;
21900+ return false;
21901+ }
21902+#endif
21903+
21904+ return false;
21905+}
21906+#endif
21907+
21908+#ifdef CONFIG_PAX_EMUTRAMP
21909+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
21910+{
21911+ int err;
21912+
21913+ do { /* PaX: libffi trampoline emulation */
21914+ unsigned char mov, jmp;
21915+ unsigned int addr1, addr2;
21916+
21917+#ifdef CONFIG_X86_64
21918+ if ((regs->ip + 9) >> 32)
21919+ break;
21920+#endif
21921+
21922+ err = get_user(mov, (unsigned char __user *)regs->ip);
21923+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
21924+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
21925+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
21926+
21927+ if (err)
21928+ break;
21929+
21930+ if (mov == 0xB8 && jmp == 0xE9) {
21931+ regs->ax = addr1;
21932+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
21933+ return 2;
21934+ }
21935+ } while (0);
21936+
21937+ do { /* PaX: gcc trampoline emulation #1 */
21938+ unsigned char mov1, mov2;
21939+ unsigned short jmp;
21940+ unsigned int addr1, addr2;
21941+
21942+#ifdef CONFIG_X86_64
21943+ if ((regs->ip + 11) >> 32)
21944+ break;
21945+#endif
21946+
21947+ err = get_user(mov1, (unsigned char __user *)regs->ip);
21948+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
21949+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
21950+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
21951+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
21952+
21953+ if (err)
21954+ break;
21955+
21956+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
21957+ regs->cx = addr1;
21958+ regs->ax = addr2;
21959+ regs->ip = addr2;
21960+ return 2;
21961+ }
21962+ } while (0);
21963+
21964+ do { /* PaX: gcc trampoline emulation #2 */
21965+ unsigned char mov, jmp;
21966+ unsigned int addr1, addr2;
21967+
21968+#ifdef CONFIG_X86_64
21969+ if ((regs->ip + 9) >> 32)
21970+ break;
21971+#endif
21972+
21973+ err = get_user(mov, (unsigned char __user *)regs->ip);
21974+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
21975+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
21976+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
21977+
21978+ if (err)
21979+ break;
21980+
21981+ if (mov == 0xB9 && jmp == 0xE9) {
21982+ regs->cx = addr1;
21983+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
21984+ return 2;
21985+ }
21986+ } while (0);
21987+
21988+ return 1; /* PaX in action */
21989+}
21990+
21991+#ifdef CONFIG_X86_64
21992+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
21993+{
21994+ int err;
21995+
21996+ do { /* PaX: libffi trampoline emulation */
21997+ unsigned short mov1, mov2, jmp1;
21998+ unsigned char stcclc, jmp2;
21999+ unsigned long addr1, addr2;
22000+
22001+ err = get_user(mov1, (unsigned short __user *)regs->ip);
22002+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
22003+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
22004+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
22005+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
22006+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
22007+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
22008+
22009+ if (err)
22010+ break;
22011+
22012+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
22013+ regs->r11 = addr1;
22014+ regs->r10 = addr2;
22015+ if (stcclc == 0xF8)
22016+ regs->flags &= ~X86_EFLAGS_CF;
22017+ else
22018+ regs->flags |= X86_EFLAGS_CF;
22019+ regs->ip = addr1;
22020+ return 2;
22021+ }
22022+ } while (0);
22023+
22024+ do { /* PaX: gcc trampoline emulation #1 */
22025+ unsigned short mov1, mov2, jmp1;
22026+ unsigned char jmp2;
22027+ unsigned int addr1;
22028+ unsigned long addr2;
22029+
22030+ err = get_user(mov1, (unsigned short __user *)regs->ip);
22031+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
22032+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
22033+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
22034+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
22035+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
22036+
22037+ if (err)
22038+ break;
22039+
22040+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
22041+ regs->r11 = addr1;
22042+ regs->r10 = addr2;
22043+ regs->ip = addr1;
22044+ return 2;
22045+ }
22046+ } while (0);
22047+
22048+ do { /* PaX: gcc trampoline emulation #2 */
22049+ unsigned short mov1, mov2, jmp1;
22050+ unsigned char jmp2;
22051+ unsigned long addr1, addr2;
22052+
22053+ err = get_user(mov1, (unsigned short __user *)regs->ip);
22054+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
22055+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
22056+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
22057+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
22058+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
22059+
22060+ if (err)
22061+ break;
22062+
22063+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
22064+ regs->r11 = addr1;
22065+ regs->r10 = addr2;
22066+ regs->ip = addr1;
22067+ return 2;
22068+ }
22069+ } while (0);
22070+
22071+ return 1; /* PaX in action */
22072+}
22073+#endif
22074+
22075+/*
22076+ * PaX: decide what to do with offenders (regs->ip = fault address)
22077+ *
22078+ * returns 1 when task should be killed
22079+ * 2 when gcc trampoline was detected
22080+ */
22081+static int pax_handle_fetch_fault(struct pt_regs *regs)
22082+{
22083+ if (v8086_mode(regs))
22084+ return 1;
22085+
22086+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
22087+ return 1;
22088+
22089+#ifdef CONFIG_X86_32
22090+ return pax_handle_fetch_fault_32(regs);
22091+#else
22092+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
22093+ return pax_handle_fetch_fault_32(regs);
22094+ else
22095+ return pax_handle_fetch_fault_64(regs);
22096+#endif
22097+}
22098+#endif
22099+
22100+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
22101+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
22102+{
22103+ long i;
22104+
22105+ printk(KERN_ERR "PAX: bytes at PC: ");
22106+ for (i = 0; i < 20; i++) {
22107+ unsigned char c;
22108+ if (get_user(c, (unsigned char __force_user *)pc+i))
22109+ printk(KERN_CONT "?? ");
22110+ else
22111+ printk(KERN_CONT "%02x ", c);
22112+ }
22113+ printk("\n");
22114+
22115+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
22116+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
22117+ unsigned long c;
22118+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
22119+#ifdef CONFIG_X86_32
22120+ printk(KERN_CONT "???????? ");
22121+#else
22122+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
22123+ printk(KERN_CONT "???????? ???????? ");
22124+ else
22125+ printk(KERN_CONT "???????????????? ");
22126+#endif
22127+ } else {
22128+#ifdef CONFIG_X86_64
22129+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
22130+ printk(KERN_CONT "%08x ", (unsigned int)c);
22131+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
22132+ } else
22133+#endif
22134+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
22135+ }
22136+ }
22137+ printk("\n");
22138+}
22139+#endif
22140+
22141+/**
22142+ * probe_kernel_write(): safely attempt to write to a location
22143+ * @dst: address to write to
22144+ * @src: pointer to the data that shall be written
22145+ * @size: size of the data chunk
22146+ *
22147+ * Safely write to address @dst from the buffer at @src. If a kernel fault
22148+ * happens, handle that and return -EFAULT.
22149+ */
22150+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
22151+{
22152+ long ret;
22153+ mm_segment_t old_fs = get_fs();
22154+
22155+ set_fs(KERNEL_DS);
22156+ pagefault_disable();
22157+ pax_open_kernel();
22158+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
22159+ pax_close_kernel();
22160+ pagefault_enable();
22161+ set_fs(old_fs);
22162+
22163+ return ret ? -EFAULT : 0;
22164+}
22165diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
22166index dd74e46..7d26398 100644
22167--- a/arch/x86/mm/gup.c
22168+++ b/arch/x86/mm/gup.c
22169@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
22170 addr = start;
22171 len = (unsigned long) nr_pages << PAGE_SHIFT;
22172 end = start + len;
22173- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
22174+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
22175 (void __user *)start, len)))
22176 return 0;
22177
22178diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
22179index f4f29b1..5cac4fb 100644
22180--- a/arch/x86/mm/highmem_32.c
22181+++ b/arch/x86/mm/highmem_32.c
22182@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
22183 idx = type + KM_TYPE_NR*smp_processor_id();
22184 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
22185 BUG_ON(!pte_none(*(kmap_pte-idx)));
22186+
22187+ pax_open_kernel();
22188 set_pte(kmap_pte-idx, mk_pte(page, prot));
22189+ pax_close_kernel();
22190+
22191 arch_flush_lazy_mmu_mode();
22192
22193 return (void *)vaddr;
22194diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
22195index f581a18..29efd37 100644
22196--- a/arch/x86/mm/hugetlbpage.c
22197+++ b/arch/x86/mm/hugetlbpage.c
22198@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
22199 struct hstate *h = hstate_file(file);
22200 struct mm_struct *mm = current->mm;
22201 struct vm_area_struct *vma;
22202- unsigned long start_addr;
22203+ unsigned long start_addr, pax_task_size = TASK_SIZE;
22204+
22205+#ifdef CONFIG_PAX_SEGMEXEC
22206+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22207+ pax_task_size = SEGMEXEC_TASK_SIZE;
22208+#endif
22209+
22210+ pax_task_size -= PAGE_SIZE;
22211
22212 if (len > mm->cached_hole_size) {
22213- start_addr = mm->free_area_cache;
22214+ start_addr = mm->free_area_cache;
22215 } else {
22216- start_addr = TASK_UNMAPPED_BASE;
22217- mm->cached_hole_size = 0;
22218+ start_addr = mm->mmap_base;
22219+ mm->cached_hole_size = 0;
22220 }
22221
22222 full_search:
22223@@ -280,26 +287,27 @@ full_search:
22224
22225 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
22226 /* At this point: (!vma || addr < vma->vm_end). */
22227- if (TASK_SIZE - len < addr) {
22228+ if (pax_task_size - len < addr) {
22229 /*
22230 * Start a new search - just in case we missed
22231 * some holes.
22232 */
22233- if (start_addr != TASK_UNMAPPED_BASE) {
22234- start_addr = TASK_UNMAPPED_BASE;
22235+ if (start_addr != mm->mmap_base) {
22236+ start_addr = mm->mmap_base;
22237 mm->cached_hole_size = 0;
22238 goto full_search;
22239 }
22240 return -ENOMEM;
22241 }
22242- if (!vma || addr + len <= vma->vm_start) {
22243- mm->free_area_cache = addr + len;
22244- return addr;
22245- }
22246+ if (check_heap_stack_gap(vma, addr, len))
22247+ break;
22248 if (addr + mm->cached_hole_size < vma->vm_start)
22249 mm->cached_hole_size = vma->vm_start - addr;
22250 addr = ALIGN(vma->vm_end, huge_page_size(h));
22251 }
22252+
22253+ mm->free_area_cache = addr + len;
22254+ return addr;
22255 }
22256
22257 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
22258@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
22259 {
22260 struct hstate *h = hstate_file(file);
22261 struct mm_struct *mm = current->mm;
22262- struct vm_area_struct *vma, *prev_vma;
22263- unsigned long base = mm->mmap_base, addr = addr0;
22264+ struct vm_area_struct *vma;
22265+ unsigned long base = mm->mmap_base, addr;
22266 unsigned long largest_hole = mm->cached_hole_size;
22267- int first_time = 1;
22268
22269 /* don't allow allocations above current base */
22270 if (mm->free_area_cache > base)
22271@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
22272 largest_hole = 0;
22273 mm->free_area_cache = base;
22274 }
22275-try_again:
22276+
22277 /* make sure it can fit in the remaining address space */
22278 if (mm->free_area_cache < len)
22279 goto fail;
22280
22281 /* either no address requested or can't fit in requested address hole */
22282- addr = (mm->free_area_cache - len) & huge_page_mask(h);
22283+ addr = (mm->free_area_cache - len);
22284 do {
22285+ addr &= huge_page_mask(h);
22286+ vma = find_vma(mm, addr);
22287 /*
22288 * Lookup failure means no vma is above this address,
22289 * i.e. return with success:
22290- */
22291- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
22292- return addr;
22293-
22294- /*
22295 * new region fits between prev_vma->vm_end and
22296 * vma->vm_start, use it:
22297 */
22298- if (addr + len <= vma->vm_start &&
22299- (!prev_vma || (addr >= prev_vma->vm_end))) {
22300+ if (check_heap_stack_gap(vma, addr, len)) {
22301 /* remember the address as a hint for next time */
22302- mm->cached_hole_size = largest_hole;
22303- return (mm->free_area_cache = addr);
22304- } else {
22305- /* pull free_area_cache down to the first hole */
22306- if (mm->free_area_cache == vma->vm_end) {
22307- mm->free_area_cache = vma->vm_start;
22308- mm->cached_hole_size = largest_hole;
22309- }
22310+ mm->cached_hole_size = largest_hole;
22311+ return (mm->free_area_cache = addr);
22312+ }
22313+ /* pull free_area_cache down to the first hole */
22314+ if (mm->free_area_cache == vma->vm_end) {
22315+ mm->free_area_cache = vma->vm_start;
22316+ mm->cached_hole_size = largest_hole;
22317 }
22318
22319 /* remember the largest hole we saw so far */
22320 if (addr + largest_hole < vma->vm_start)
22321- largest_hole = vma->vm_start - addr;
22322+ largest_hole = vma->vm_start - addr;
22323
22324 /* try just below the current vma->vm_start */
22325- addr = (vma->vm_start - len) & huge_page_mask(h);
22326- } while (len <= vma->vm_start);
22327+ addr = skip_heap_stack_gap(vma, len);
22328+ } while (!IS_ERR_VALUE(addr));
22329
22330 fail:
22331 /*
22332- * if hint left us with no space for the requested
22333- * mapping then try again:
22334- */
22335- if (first_time) {
22336- mm->free_area_cache = base;
22337- largest_hole = 0;
22338- first_time = 0;
22339- goto try_again;
22340- }
22341- /*
22342 * A failed mmap() very likely causes application failure,
22343 * so fall back to the bottom-up function here. This scenario
22344 * can happen with large stack limits and large mmap()
22345 * allocations.
22346 */
22347- mm->free_area_cache = TASK_UNMAPPED_BASE;
22348+
22349+#ifdef CONFIG_PAX_SEGMEXEC
22350+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22351+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
22352+ else
22353+#endif
22354+
22355+ mm->mmap_base = TASK_UNMAPPED_BASE;
22356+
22357+#ifdef CONFIG_PAX_RANDMMAP
22358+ if (mm->pax_flags & MF_PAX_RANDMMAP)
22359+ mm->mmap_base += mm->delta_mmap;
22360+#endif
22361+
22362+ mm->free_area_cache = mm->mmap_base;
22363 mm->cached_hole_size = ~0UL;
22364 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
22365 len, pgoff, flags);
22366@@ -386,6 +392,7 @@ fail:
22367 /*
22368 * Restore the topdown base:
22369 */
22370+ mm->mmap_base = base;
22371 mm->free_area_cache = base;
22372 mm->cached_hole_size = ~0UL;
22373
22374@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
22375 struct hstate *h = hstate_file(file);
22376 struct mm_struct *mm = current->mm;
22377 struct vm_area_struct *vma;
22378+ unsigned long pax_task_size = TASK_SIZE;
22379
22380 if (len & ~huge_page_mask(h))
22381 return -EINVAL;
22382- if (len > TASK_SIZE)
22383+
22384+#ifdef CONFIG_PAX_SEGMEXEC
22385+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
22386+ pax_task_size = SEGMEXEC_TASK_SIZE;
22387+#endif
22388+
22389+ pax_task_size -= PAGE_SIZE;
22390+
22391+ if (len > pax_task_size)
22392 return -ENOMEM;
22393
22394 if (flags & MAP_FIXED) {
22395@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
22396 if (addr) {
22397 addr = ALIGN(addr, huge_page_size(h));
22398 vma = find_vma(mm, addr);
22399- if (TASK_SIZE - len >= addr &&
22400- (!vma || addr + len <= vma->vm_start))
22401+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
22402 return addr;
22403 }
22404 if (mm->get_unmapped_area == arch_get_unmapped_area)
22405diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
22406index 87488b9..399f416 100644
22407--- a/arch/x86/mm/init.c
22408+++ b/arch/x86/mm/init.c
22409@@ -15,6 +15,7 @@
22410 #include <asm/tlbflush.h>
22411 #include <asm/tlb.h>
22412 #include <asm/proto.h>
22413+#include <asm/desc.h>
22414
22415 unsigned long __initdata pgt_buf_start;
22416 unsigned long __meminitdata pgt_buf_end;
22417@@ -31,7 +32,7 @@ int direct_gbpages
22418 static void __init find_early_table_space(unsigned long end, int use_pse,
22419 int use_gbpages)
22420 {
22421- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
22422+ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
22423 phys_addr_t base;
22424
22425 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
22426@@ -312,8 +313,29 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
22427 */
22428 int devmem_is_allowed(unsigned long pagenr)
22429 {
22430+#ifdef CONFIG_GRKERNSEC_KMEM
22431+ /* allow BDA */
22432+ if (!pagenr)
22433+ return 1;
22434+ /* allow EBDA */
22435+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
22436+ return 1;
22437+#else
22438+ if (!pagenr)
22439+ return 1;
22440+#ifdef CONFIG_VM86
22441+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
22442+ return 1;
22443+#endif
22444+#endif
22445+
22446+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
22447+ return 1;
22448+#ifdef CONFIG_GRKERNSEC_KMEM
22449+ /* throw out everything else below 1MB */
22450 if (pagenr <= 256)
22451- return 1;
22452+ return 0;
22453+#endif
22454 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
22455 return 0;
22456 if (!page_is_ram(pagenr))
22457@@ -372,6 +394,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
22458
22459 void free_initmem(void)
22460 {
22461+
22462+#ifdef CONFIG_PAX_KERNEXEC
22463+#ifdef CONFIG_X86_32
22464+ /* PaX: limit KERNEL_CS to actual size */
22465+ unsigned long addr, limit;
22466+ struct desc_struct d;
22467+ int cpu;
22468+
22469+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
22470+ limit = (limit - 1UL) >> PAGE_SHIFT;
22471+
22472+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
22473+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
22474+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
22475+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
22476+ }
22477+
22478+ /* PaX: make KERNEL_CS read-only */
22479+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
22480+ if (!paravirt_enabled())
22481+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
22482+/*
22483+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
22484+ pgd = pgd_offset_k(addr);
22485+ pud = pud_offset(pgd, addr);
22486+ pmd = pmd_offset(pud, addr);
22487+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
22488+ }
22489+*/
22490+#ifdef CONFIG_X86_PAE
22491+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
22492+/*
22493+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
22494+ pgd = pgd_offset_k(addr);
22495+ pud = pud_offset(pgd, addr);
22496+ pmd = pmd_offset(pud, addr);
22497+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
22498+ }
22499+*/
22500+#endif
22501+
22502+#ifdef CONFIG_MODULES
22503+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
22504+#endif
22505+
22506+#else
22507+ pgd_t *pgd;
22508+ pud_t *pud;
22509+ pmd_t *pmd;
22510+ unsigned long addr, end;
22511+
22512+ /* PaX: make kernel code/rodata read-only, rest non-executable */
22513+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
22514+ pgd = pgd_offset_k(addr);
22515+ pud = pud_offset(pgd, addr);
22516+ pmd = pmd_offset(pud, addr);
22517+ if (!pmd_present(*pmd))
22518+ continue;
22519+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
22520+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
22521+ else
22522+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
22523+ }
22524+
22525+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
22526+ end = addr + KERNEL_IMAGE_SIZE;
22527+ for (; addr < end; addr += PMD_SIZE) {
22528+ pgd = pgd_offset_k(addr);
22529+ pud = pud_offset(pgd, addr);
22530+ pmd = pmd_offset(pud, addr);
22531+ if (!pmd_present(*pmd))
22532+ continue;
22533+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
22534+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
22535+ }
22536+#endif
22537+
22538+ flush_tlb_all();
22539+#endif
22540+
22541 free_init_pages("unused kernel memory",
22542 (unsigned long)(&__init_begin),
22543 (unsigned long)(&__init_end));
22544diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
22545index 29f7c6d..b46b35b 100644
22546--- a/arch/x86/mm/init_32.c
22547+++ b/arch/x86/mm/init_32.c
22548@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
22549 }
22550
22551 /*
22552- * Creates a middle page table and puts a pointer to it in the
22553- * given global directory entry. This only returns the gd entry
22554- * in non-PAE compilation mode, since the middle layer is folded.
22555- */
22556-static pmd_t * __init one_md_table_init(pgd_t *pgd)
22557-{
22558- pud_t *pud;
22559- pmd_t *pmd_table;
22560-
22561-#ifdef CONFIG_X86_PAE
22562- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
22563- if (after_bootmem)
22564- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
22565- else
22566- pmd_table = (pmd_t *)alloc_low_page();
22567- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
22568- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
22569- pud = pud_offset(pgd, 0);
22570- BUG_ON(pmd_table != pmd_offset(pud, 0));
22571-
22572- return pmd_table;
22573- }
22574-#endif
22575- pud = pud_offset(pgd, 0);
22576- pmd_table = pmd_offset(pud, 0);
22577-
22578- return pmd_table;
22579-}
22580-
22581-/*
22582 * Create a page table and place a pointer to it in a middle page
22583 * directory entry:
22584 */
22585@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
22586 page_table = (pte_t *)alloc_low_page();
22587
22588 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
22589+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
22590+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
22591+#else
22592 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
22593+#endif
22594 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
22595 }
22596
22597 return pte_offset_kernel(pmd, 0);
22598 }
22599
22600+static pmd_t * __init one_md_table_init(pgd_t *pgd)
22601+{
22602+ pud_t *pud;
22603+ pmd_t *pmd_table;
22604+
22605+ pud = pud_offset(pgd, 0);
22606+ pmd_table = pmd_offset(pud, 0);
22607+
22608+ return pmd_table;
22609+}
22610+
22611 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
22612 {
22613 int pgd_idx = pgd_index(vaddr);
22614@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
22615 int pgd_idx, pmd_idx;
22616 unsigned long vaddr;
22617 pgd_t *pgd;
22618+ pud_t *pud;
22619 pmd_t *pmd;
22620 pte_t *pte = NULL;
22621
22622@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
22623 pgd = pgd_base + pgd_idx;
22624
22625 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
22626- pmd = one_md_table_init(pgd);
22627- pmd = pmd + pmd_index(vaddr);
22628+ pud = pud_offset(pgd, vaddr);
22629+ pmd = pmd_offset(pud, vaddr);
22630+
22631+#ifdef CONFIG_X86_PAE
22632+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
22633+#endif
22634+
22635 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
22636 pmd++, pmd_idx++) {
22637 pte = page_table_kmap_check(one_page_table_init(pmd),
22638@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
22639 }
22640 }
22641
22642-static inline int is_kernel_text(unsigned long addr)
22643+static inline int is_kernel_text(unsigned long start, unsigned long end)
22644 {
22645- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
22646- return 1;
22647- return 0;
22648+ if ((start > ktla_ktva((unsigned long)_etext) ||
22649+ end <= ktla_ktva((unsigned long)_stext)) &&
22650+ (start > ktla_ktva((unsigned long)_einittext) ||
22651+ end <= ktla_ktva((unsigned long)_sinittext)) &&
22652+
22653+#ifdef CONFIG_ACPI_SLEEP
22654+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
22655+#endif
22656+
22657+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
22658+ return 0;
22659+ return 1;
22660 }
22661
22662 /*
22663@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
22664 unsigned long last_map_addr = end;
22665 unsigned long start_pfn, end_pfn;
22666 pgd_t *pgd_base = swapper_pg_dir;
22667- int pgd_idx, pmd_idx, pte_ofs;
22668+ unsigned int pgd_idx, pmd_idx, pte_ofs;
22669 unsigned long pfn;
22670 pgd_t *pgd;
22671+ pud_t *pud;
22672 pmd_t *pmd;
22673 pte_t *pte;
22674 unsigned pages_2m, pages_4k;
22675@@ -281,8 +282,13 @@ repeat:
22676 pfn = start_pfn;
22677 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
22678 pgd = pgd_base + pgd_idx;
22679- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
22680- pmd = one_md_table_init(pgd);
22681+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
22682+ pud = pud_offset(pgd, 0);
22683+ pmd = pmd_offset(pud, 0);
22684+
22685+#ifdef CONFIG_X86_PAE
22686+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
22687+#endif
22688
22689 if (pfn >= end_pfn)
22690 continue;
22691@@ -294,14 +300,13 @@ repeat:
22692 #endif
22693 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
22694 pmd++, pmd_idx++) {
22695- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
22696+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
22697
22698 /*
22699 * Map with big pages if possible, otherwise
22700 * create normal page tables:
22701 */
22702 if (use_pse) {
22703- unsigned int addr2;
22704 pgprot_t prot = PAGE_KERNEL_LARGE;
22705 /*
22706 * first pass will use the same initial
22707@@ -311,11 +316,7 @@ repeat:
22708 __pgprot(PTE_IDENT_ATTR |
22709 _PAGE_PSE);
22710
22711- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
22712- PAGE_OFFSET + PAGE_SIZE-1;
22713-
22714- if (is_kernel_text(addr) ||
22715- is_kernel_text(addr2))
22716+ if (is_kernel_text(address, address + PMD_SIZE))
22717 prot = PAGE_KERNEL_LARGE_EXEC;
22718
22719 pages_2m++;
22720@@ -332,7 +333,7 @@ repeat:
22721 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
22722 pte += pte_ofs;
22723 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
22724- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
22725+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
22726 pgprot_t prot = PAGE_KERNEL;
22727 /*
22728 * first pass will use the same initial
22729@@ -340,7 +341,7 @@ repeat:
22730 */
22731 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
22732
22733- if (is_kernel_text(addr))
22734+ if (is_kernel_text(address, address + PAGE_SIZE))
22735 prot = PAGE_KERNEL_EXEC;
22736
22737 pages_4k++;
22738@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
22739
22740 pud = pud_offset(pgd, va);
22741 pmd = pmd_offset(pud, va);
22742- if (!pmd_present(*pmd))
22743+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
22744 break;
22745
22746 pte = pte_offset_kernel(pmd, va);
22747@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_range_init(void)
22748
22749 static void __init pagetable_init(void)
22750 {
22751- pgd_t *pgd_base = swapper_pg_dir;
22752-
22753- permanent_kmaps_init(pgd_base);
22754+ permanent_kmaps_init(swapper_pg_dir);
22755 }
22756
22757-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
22758+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
22759 EXPORT_SYMBOL_GPL(__supported_pte_mask);
22760
22761 /* user-defined highmem size */
22762@@ -757,6 +756,12 @@ void __init mem_init(void)
22763
22764 pci_iommu_alloc();
22765
22766+#ifdef CONFIG_PAX_PER_CPU_PGD
22767+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
22768+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
22769+ KERNEL_PGD_PTRS);
22770+#endif
22771+
22772 #ifdef CONFIG_FLATMEM
22773 BUG_ON(!mem_map);
22774 #endif
22775@@ -774,7 +779,7 @@ void __init mem_init(void)
22776 set_highmem_pages_init();
22777
22778 codesize = (unsigned long) &_etext - (unsigned long) &_text;
22779- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
22780+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
22781 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
22782
22783 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
22784@@ -815,10 +820,10 @@ void __init mem_init(void)
22785 ((unsigned long)&__init_end -
22786 (unsigned long)&__init_begin) >> 10,
22787
22788- (unsigned long)&_etext, (unsigned long)&_edata,
22789- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
22790+ (unsigned long)&_sdata, (unsigned long)&_edata,
22791+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
22792
22793- (unsigned long)&_text, (unsigned long)&_etext,
22794+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
22795 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
22796
22797 /*
22798@@ -896,6 +901,7 @@ void set_kernel_text_rw(void)
22799 if (!kernel_set_to_readonly)
22800 return;
22801
22802+ start = ktla_ktva(start);
22803 pr_debug("Set kernel text: %lx - %lx for read write\n",
22804 start, start+size);
22805
22806@@ -910,6 +916,7 @@ void set_kernel_text_ro(void)
22807 if (!kernel_set_to_readonly)
22808 return;
22809
22810+ start = ktla_ktva(start);
22811 pr_debug("Set kernel text: %lx - %lx for read only\n",
22812 start, start+size);
22813
22814@@ -938,6 +945,7 @@ void mark_rodata_ro(void)
22815 unsigned long start = PFN_ALIGN(_text);
22816 unsigned long size = PFN_ALIGN(_etext) - start;
22817
22818+ start = ktla_ktva(start);
22819 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
22820 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
22821 size >> 10);
22822diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
22823index bbaaa00..796fa65 100644
22824--- a/arch/x86/mm/init_64.c
22825+++ b/arch/x86/mm/init_64.c
22826@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpages_on);
22827 * around without checking the pgd every time.
22828 */
22829
22830-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
22831+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
22832 EXPORT_SYMBOL_GPL(__supported_pte_mask);
22833
22834 int force_personality32;
22835@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
22836
22837 for (address = start; address <= end; address += PGDIR_SIZE) {
22838 const pgd_t *pgd_ref = pgd_offset_k(address);
22839+
22840+#ifdef CONFIG_PAX_PER_CPU_PGD
22841+ unsigned long cpu;
22842+#else
22843 struct page *page;
22844+#endif
22845
22846 if (pgd_none(*pgd_ref))
22847 continue;
22848
22849 spin_lock(&pgd_lock);
22850+
22851+#ifdef CONFIG_PAX_PER_CPU_PGD
22852+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
22853+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
22854+#else
22855 list_for_each_entry(page, &pgd_list, lru) {
22856 pgd_t *pgd;
22857 spinlock_t *pgt_lock;
22858@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
22859 /* the pgt_lock only for Xen */
22860 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
22861 spin_lock(pgt_lock);
22862+#endif
22863
22864 if (pgd_none(*pgd))
22865 set_pgd(pgd, *pgd_ref);
22866@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
22867 BUG_ON(pgd_page_vaddr(*pgd)
22868 != pgd_page_vaddr(*pgd_ref));
22869
22870+#ifndef CONFIG_PAX_PER_CPU_PGD
22871 spin_unlock(pgt_lock);
22872+#endif
22873+
22874 }
22875 spin_unlock(&pgd_lock);
22876 }
22877@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
22878 pmd = fill_pmd(pud, vaddr);
22879 pte = fill_pte(pmd, vaddr);
22880
22881+ pax_open_kernel();
22882 set_pte(pte, new_pte);
22883+ pax_close_kernel();
22884
22885 /*
22886 * It's enough to flush this one mapping.
22887@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
22888 pgd = pgd_offset_k((unsigned long)__va(phys));
22889 if (pgd_none(*pgd)) {
22890 pud = (pud_t *) spp_getpage();
22891- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
22892- _PAGE_USER));
22893+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
22894 }
22895 pud = pud_offset(pgd, (unsigned long)__va(phys));
22896 if (pud_none(*pud)) {
22897 pmd = (pmd_t *) spp_getpage();
22898- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
22899- _PAGE_USER));
22900+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
22901 }
22902 pmd = pmd_offset(pud, phys);
22903 BUG_ON(!pmd_none(*pmd));
22904@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
22905 if (pfn >= pgt_buf_top)
22906 panic("alloc_low_page: ran out of memory");
22907
22908- adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
22909+ adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
22910 clear_page(adr);
22911 *phys = pfn * PAGE_SIZE;
22912 return adr;
22913@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *virt)
22914
22915 phys = __pa(virt);
22916 left = phys & (PAGE_SIZE - 1);
22917- adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
22918+ adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
22919 adr = (void *)(((unsigned long)adr) | left);
22920
22921 return adr;
22922@@ -693,6 +707,12 @@ void __init mem_init(void)
22923
22924 pci_iommu_alloc();
22925
22926+#ifdef CONFIG_PAX_PER_CPU_PGD
22927+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
22928+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
22929+ KERNEL_PGD_PTRS);
22930+#endif
22931+
22932 /* clear_bss() already clear the empty_zero_page */
22933
22934 reservedpages = 0;
22935@@ -853,8 +873,8 @@ int kern_addr_valid(unsigned long addr)
22936 static struct vm_area_struct gate_vma = {
22937 .vm_start = VSYSCALL_START,
22938 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
22939- .vm_page_prot = PAGE_READONLY_EXEC,
22940- .vm_flags = VM_READ | VM_EXEC
22941+ .vm_page_prot = PAGE_READONLY,
22942+ .vm_flags = VM_READ
22943 };
22944
22945 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
22946@@ -888,7 +908,7 @@ int in_gate_area_no_mm(unsigned long addr)
22947
22948 const char *arch_vma_name(struct vm_area_struct *vma)
22949 {
22950- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
22951+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
22952 return "[vdso]";
22953 if (vma == &gate_vma)
22954 return "[vsyscall]";
22955diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
22956index 7b179b4..6bd1777 100644
22957--- a/arch/x86/mm/iomap_32.c
22958+++ b/arch/x86/mm/iomap_32.c
22959@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
22960 type = kmap_atomic_idx_push();
22961 idx = type + KM_TYPE_NR * smp_processor_id();
22962 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
22963+
22964+ pax_open_kernel();
22965 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
22966+ pax_close_kernel();
22967+
22968 arch_flush_lazy_mmu_mode();
22969
22970 return (void *)vaddr;
22971diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
22972index be1ef57..55f0160 100644
22973--- a/arch/x86/mm/ioremap.c
22974+++ b/arch/x86/mm/ioremap.c
22975@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
22976 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
22977 int is_ram = page_is_ram(pfn);
22978
22979- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
22980+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
22981 return NULL;
22982 WARN_ON_ONCE(is_ram);
22983 }
22984@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
22985
22986 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
22987 if (page_is_ram(start >> PAGE_SHIFT))
22988+#ifdef CONFIG_HIGHMEM
22989+ if ((start >> PAGE_SHIFT) < max_low_pfn)
22990+#endif
22991 return __va(phys);
22992
22993 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
22994@@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
22995 early_param("early_ioremap_debug", early_ioremap_debug_setup);
22996
22997 static __initdata int after_paging_init;
22998-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
22999+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
23000
23001 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
23002 {
23003@@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
23004 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
23005
23006 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
23007- memset(bm_pte, 0, sizeof(bm_pte));
23008- pmd_populate_kernel(&init_mm, pmd, bm_pte);
23009+ pmd_populate_user(&init_mm, pmd, bm_pte);
23010
23011 /*
23012 * The boot-ioremap range spans multiple pmds, for which
23013diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
23014index d87dd6d..bf3fa66 100644
23015--- a/arch/x86/mm/kmemcheck/kmemcheck.c
23016+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
23017@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
23018 * memory (e.g. tracked pages)? For now, we need this to avoid
23019 * invoking kmemcheck for PnP BIOS calls.
23020 */
23021- if (regs->flags & X86_VM_MASK)
23022+ if (v8086_mode(regs))
23023 return false;
23024- if (regs->cs != __KERNEL_CS)
23025+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
23026 return false;
23027
23028 pte = kmemcheck_pte_lookup(address);
23029diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
23030index 845df68..1d8d29f 100644
23031--- a/arch/x86/mm/mmap.c
23032+++ b/arch/x86/mm/mmap.c
23033@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
23034 * Leave an at least ~128 MB hole with possible stack randomization.
23035 */
23036 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
23037-#define MAX_GAP (TASK_SIZE/6*5)
23038+#define MAX_GAP (pax_task_size/6*5)
23039
23040 static int mmap_is_legacy(void)
23041 {
23042@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
23043 return rnd << PAGE_SHIFT;
23044 }
23045
23046-static unsigned long mmap_base(void)
23047+static unsigned long mmap_base(struct mm_struct *mm)
23048 {
23049 unsigned long gap = rlimit(RLIMIT_STACK);
23050+ unsigned long pax_task_size = TASK_SIZE;
23051+
23052+#ifdef CONFIG_PAX_SEGMEXEC
23053+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
23054+ pax_task_size = SEGMEXEC_TASK_SIZE;
23055+#endif
23056
23057 if (gap < MIN_GAP)
23058 gap = MIN_GAP;
23059 else if (gap > MAX_GAP)
23060 gap = MAX_GAP;
23061
23062- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
23063+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
23064 }
23065
23066 /*
23067 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
23068 * does, but not when emulating X86_32
23069 */
23070-static unsigned long mmap_legacy_base(void)
23071+static unsigned long mmap_legacy_base(struct mm_struct *mm)
23072 {
23073- if (mmap_is_ia32())
23074+ if (mmap_is_ia32()) {
23075+
23076+#ifdef CONFIG_PAX_SEGMEXEC
23077+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
23078+ return SEGMEXEC_TASK_UNMAPPED_BASE;
23079+ else
23080+#endif
23081+
23082 return TASK_UNMAPPED_BASE;
23083- else
23084+ } else
23085 return TASK_UNMAPPED_BASE + mmap_rnd();
23086 }
23087
23088@@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
23089 void arch_pick_mmap_layout(struct mm_struct *mm)
23090 {
23091 if (mmap_is_legacy()) {
23092- mm->mmap_base = mmap_legacy_base();
23093+ mm->mmap_base = mmap_legacy_base(mm);
23094+
23095+#ifdef CONFIG_PAX_RANDMMAP
23096+ if (mm->pax_flags & MF_PAX_RANDMMAP)
23097+ mm->mmap_base += mm->delta_mmap;
23098+#endif
23099+
23100 mm->get_unmapped_area = arch_get_unmapped_area;
23101 mm->unmap_area = arch_unmap_area;
23102 } else {
23103- mm->mmap_base = mmap_base();
23104+ mm->mmap_base = mmap_base(mm);
23105+
23106+#ifdef CONFIG_PAX_RANDMMAP
23107+ if (mm->pax_flags & MF_PAX_RANDMMAP)
23108+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
23109+#endif
23110+
23111 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
23112 mm->unmap_area = arch_unmap_area_topdown;
23113 }
23114diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
23115index de54b9b..799051e 100644
23116--- a/arch/x86/mm/mmio-mod.c
23117+++ b/arch/x86/mm/mmio-mod.c
23118@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
23119 break;
23120 default:
23121 {
23122- unsigned char *ip = (unsigned char *)instptr;
23123+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
23124 my_trace->opcode = MMIO_UNKNOWN_OP;
23125 my_trace->width = 0;
23126 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
23127@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
23128 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
23129 void __iomem *addr)
23130 {
23131- static atomic_t next_id;
23132+ static atomic_unchecked_t next_id;
23133 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
23134 /* These are page-unaligned. */
23135 struct mmiotrace_map map = {
23136@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
23137 .private = trace
23138 },
23139 .phys = offset,
23140- .id = atomic_inc_return(&next_id)
23141+ .id = atomic_inc_return_unchecked(&next_id)
23142 };
23143 map.map_id = trace->id;
23144
23145diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
23146index b008656..773eac2 100644
23147--- a/arch/x86/mm/pageattr-test.c
23148+++ b/arch/x86/mm/pageattr-test.c
23149@@ -36,7 +36,7 @@ enum {
23150
23151 static int pte_testbit(pte_t pte)
23152 {
23153- return pte_flags(pte) & _PAGE_UNUSED1;
23154+ return pte_flags(pte) & _PAGE_CPA_TEST;
23155 }
23156
23157 struct split_state {
23158diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
23159index f9e5267..77b1a40 100644
23160--- a/arch/x86/mm/pageattr.c
23161+++ b/arch/x86/mm/pageattr.c
23162@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
23163 */
23164 #ifdef CONFIG_PCI_BIOS
23165 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
23166- pgprot_val(forbidden) |= _PAGE_NX;
23167+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23168 #endif
23169
23170 /*
23171@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
23172 * Does not cover __inittext since that is gone later on. On
23173 * 64bit we do not enforce !NX on the low mapping
23174 */
23175- if (within(address, (unsigned long)_text, (unsigned long)_etext))
23176- pgprot_val(forbidden) |= _PAGE_NX;
23177+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
23178+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23179
23180+#ifdef CONFIG_DEBUG_RODATA
23181 /*
23182 * The .rodata section needs to be read-only. Using the pfn
23183 * catches all aliases.
23184@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
23185 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
23186 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
23187 pgprot_val(forbidden) |= _PAGE_RW;
23188+#endif
23189
23190 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
23191 /*
23192@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
23193 }
23194 #endif
23195
23196+#ifdef CONFIG_PAX_KERNEXEC
23197+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
23198+ pgprot_val(forbidden) |= _PAGE_RW;
23199+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
23200+ }
23201+#endif
23202+
23203 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
23204
23205 return prot;
23206@@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
23207 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
23208 {
23209 /* change init_mm */
23210+ pax_open_kernel();
23211 set_pte_atomic(kpte, pte);
23212+
23213 #ifdef CONFIG_X86_32
23214 if (!SHARED_KERNEL_PMD) {
23215+
23216+#ifdef CONFIG_PAX_PER_CPU_PGD
23217+ unsigned long cpu;
23218+#else
23219 struct page *page;
23220+#endif
23221
23222+#ifdef CONFIG_PAX_PER_CPU_PGD
23223+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23224+ pgd_t *pgd = get_cpu_pgd(cpu);
23225+#else
23226 list_for_each_entry(page, &pgd_list, lru) {
23227- pgd_t *pgd;
23228+ pgd_t *pgd = (pgd_t *)page_address(page);
23229+#endif
23230+
23231 pud_t *pud;
23232 pmd_t *pmd;
23233
23234- pgd = (pgd_t *)page_address(page) + pgd_index(address);
23235+ pgd += pgd_index(address);
23236 pud = pud_offset(pgd, address);
23237 pmd = pmd_offset(pud, address);
23238 set_pte_atomic((pte_t *)pmd, pte);
23239 }
23240 }
23241 #endif
23242+ pax_close_kernel();
23243 }
23244
23245 static int
23246diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
23247index f6ff57b..481690f 100644
23248--- a/arch/x86/mm/pat.c
23249+++ b/arch/x86/mm/pat.c
23250@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
23251
23252 if (!entry) {
23253 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
23254- current->comm, current->pid, start, end);
23255+ current->comm, task_pid_nr(current), start, end);
23256 return -EINVAL;
23257 }
23258
23259@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
23260 while (cursor < to) {
23261 if (!devmem_is_allowed(pfn)) {
23262 printk(KERN_INFO
23263- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
23264- current->comm, from, to);
23265+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
23266+ current->comm, from, to, cursor);
23267 return 0;
23268 }
23269 cursor += PAGE_SIZE;
23270@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
23271 printk(KERN_INFO
23272 "%s:%d ioremap_change_attr failed %s "
23273 "for %Lx-%Lx\n",
23274- current->comm, current->pid,
23275+ current->comm, task_pid_nr(current),
23276 cattr_name(flags),
23277 base, (unsigned long long)(base + size));
23278 return -EINVAL;
23279@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
23280 if (want_flags != flags) {
23281 printk(KERN_WARNING
23282 "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
23283- current->comm, current->pid,
23284+ current->comm, task_pid_nr(current),
23285 cattr_name(want_flags),
23286 (unsigned long long)paddr,
23287 (unsigned long long)(paddr + size),
23288@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
23289 free_memtype(paddr, paddr + size);
23290 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
23291 " for %Lx-%Lx, got %s\n",
23292- current->comm, current->pid,
23293+ current->comm, task_pid_nr(current),
23294 cattr_name(want_flags),
23295 (unsigned long long)paddr,
23296 (unsigned long long)(paddr + size),
23297diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
23298index 9f0614d..92ae64a 100644
23299--- a/arch/x86/mm/pf_in.c
23300+++ b/arch/x86/mm/pf_in.c
23301@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
23302 int i;
23303 enum reason_type rv = OTHERS;
23304
23305- p = (unsigned char *)ins_addr;
23306+ p = (unsigned char *)ktla_ktva(ins_addr);
23307 p += skip_prefix(p, &prf);
23308 p += get_opcode(p, &opcode);
23309
23310@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
23311 struct prefix_bits prf;
23312 int i;
23313
23314- p = (unsigned char *)ins_addr;
23315+ p = (unsigned char *)ktla_ktva(ins_addr);
23316 p += skip_prefix(p, &prf);
23317 p += get_opcode(p, &opcode);
23318
23319@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
23320 struct prefix_bits prf;
23321 int i;
23322
23323- p = (unsigned char *)ins_addr;
23324+ p = (unsigned char *)ktla_ktva(ins_addr);
23325 p += skip_prefix(p, &prf);
23326 p += get_opcode(p, &opcode);
23327
23328@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
23329 struct prefix_bits prf;
23330 int i;
23331
23332- p = (unsigned char *)ins_addr;
23333+ p = (unsigned char *)ktla_ktva(ins_addr);
23334 p += skip_prefix(p, &prf);
23335 p += get_opcode(p, &opcode);
23336 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
23337@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
23338 struct prefix_bits prf;
23339 int i;
23340
23341- p = (unsigned char *)ins_addr;
23342+ p = (unsigned char *)ktla_ktva(ins_addr);
23343 p += skip_prefix(p, &prf);
23344 p += get_opcode(p, &opcode);
23345 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
23346diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
23347index 8573b83..c3b1a30 100644
23348--- a/arch/x86/mm/pgtable.c
23349+++ b/arch/x86/mm/pgtable.c
23350@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *pgd)
23351 list_del(&page->lru);
23352 }
23353
23354-#define UNSHARED_PTRS_PER_PGD \
23355- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
23356+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23357+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
23358
23359+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
23360+{
23361+ while (count--)
23362+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
23363+}
23364+#endif
23365
23366+#ifdef CONFIG_PAX_PER_CPU_PGD
23367+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
23368+{
23369+ while (count--)
23370+
23371+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23372+ *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
23373+#else
23374+ *dst++ = *src++;
23375+#endif
23376+
23377+}
23378+#endif
23379+
23380+#ifdef CONFIG_X86_64
23381+#define pxd_t pud_t
23382+#define pyd_t pgd_t
23383+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
23384+#define pxd_free(mm, pud) pud_free((mm), (pud))
23385+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
23386+#define pyd_offset(mm, address) pgd_offset((mm), (address))
23387+#define PYD_SIZE PGDIR_SIZE
23388+#else
23389+#define pxd_t pmd_t
23390+#define pyd_t pud_t
23391+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
23392+#define pxd_free(mm, pud) pmd_free((mm), (pud))
23393+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
23394+#define pyd_offset(mm, address) pud_offset((mm), (address))
23395+#define PYD_SIZE PUD_SIZE
23396+#endif
23397+
23398+#ifdef CONFIG_PAX_PER_CPU_PGD
23399+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
23400+static inline void pgd_dtor(pgd_t *pgd) {}
23401+#else
23402 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
23403 {
23404 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
23405@@ -128,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
23406 pgd_list_del(pgd);
23407 spin_unlock(&pgd_lock);
23408 }
23409+#endif
23410
23411 /*
23412 * List of all pgd's needed for non-PAE so it can invalidate entries
23413@@ -140,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
23414 * -- wli
23415 */
23416
23417-#ifdef CONFIG_X86_PAE
23418+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
23419 /*
23420 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
23421 * updating the top-level pagetable entries to guarantee the
23422@@ -152,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
23423 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
23424 * and initialize the kernel pmds here.
23425 */
23426-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
23427+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
23428
23429 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
23430 {
23431@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
23432 */
23433 flush_tlb_mm(mm);
23434 }
23435+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
23436+#define PREALLOCATED_PXDS USER_PGD_PTRS
23437 #else /* !CONFIG_X86_PAE */
23438
23439 /* No need to prepopulate any pagetable entries in non-PAE modes. */
23440-#define PREALLOCATED_PMDS 0
23441+#define PREALLOCATED_PXDS 0
23442
23443 #endif /* CONFIG_X86_PAE */
23444
23445-static void free_pmds(pmd_t *pmds[])
23446+static void free_pxds(pxd_t *pxds[])
23447 {
23448 int i;
23449
23450- for(i = 0; i < PREALLOCATED_PMDS; i++)
23451- if (pmds[i])
23452- free_page((unsigned long)pmds[i]);
23453+ for(i = 0; i < PREALLOCATED_PXDS; i++)
23454+ if (pxds[i])
23455+ free_page((unsigned long)pxds[i]);
23456 }
23457
23458-static int preallocate_pmds(pmd_t *pmds[])
23459+static int preallocate_pxds(pxd_t *pxds[])
23460 {
23461 int i;
23462 bool failed = false;
23463
23464- for(i = 0; i < PREALLOCATED_PMDS; i++) {
23465- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
23466- if (pmd == NULL)
23467+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
23468+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
23469+ if (pxd == NULL)
23470 failed = true;
23471- pmds[i] = pmd;
23472+ pxds[i] = pxd;
23473 }
23474
23475 if (failed) {
23476- free_pmds(pmds);
23477+ free_pxds(pxds);
23478 return -ENOMEM;
23479 }
23480
23481@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[])
23482 * preallocate which never got a corresponding vma will need to be
23483 * freed manually.
23484 */
23485-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
23486+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
23487 {
23488 int i;
23489
23490- for(i = 0; i < PREALLOCATED_PMDS; i++) {
23491+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
23492 pgd_t pgd = pgdp[i];
23493
23494 if (pgd_val(pgd) != 0) {
23495- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
23496+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
23497
23498- pgdp[i] = native_make_pgd(0);
23499+ set_pgd(pgdp + i, native_make_pgd(0));
23500
23501- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
23502- pmd_free(mm, pmd);
23503+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
23504+ pxd_free(mm, pxd);
23505 }
23506 }
23507 }
23508
23509-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
23510+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
23511 {
23512- pud_t *pud;
23513+ pyd_t *pyd;
23514 unsigned long addr;
23515 int i;
23516
23517- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
23518+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
23519 return;
23520
23521- pud = pud_offset(pgd, 0);
23522+#ifdef CONFIG_X86_64
23523+ pyd = pyd_offset(mm, 0L);
23524+#else
23525+ pyd = pyd_offset(pgd, 0L);
23526+#endif
23527
23528- for (addr = i = 0; i < PREALLOCATED_PMDS;
23529- i++, pud++, addr += PUD_SIZE) {
23530- pmd_t *pmd = pmds[i];
23531+ for (addr = i = 0; i < PREALLOCATED_PXDS;
23532+ i++, pyd++, addr += PYD_SIZE) {
23533+ pxd_t *pxd = pxds[i];
23534
23535 if (i >= KERNEL_PGD_BOUNDARY)
23536- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
23537- sizeof(pmd_t) * PTRS_PER_PMD);
23538+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
23539+ sizeof(pxd_t) * PTRS_PER_PMD);
23540
23541- pud_populate(mm, pud, pmd);
23542+ pyd_populate(mm, pyd, pxd);
23543 }
23544 }
23545
23546 pgd_t *pgd_alloc(struct mm_struct *mm)
23547 {
23548 pgd_t *pgd;
23549- pmd_t *pmds[PREALLOCATED_PMDS];
23550+ pxd_t *pxds[PREALLOCATED_PXDS];
23551
23552 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
23553
23554@@ -265,11 +314,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
23555
23556 mm->pgd = pgd;
23557
23558- if (preallocate_pmds(pmds) != 0)
23559+ if (preallocate_pxds(pxds) != 0)
23560 goto out_free_pgd;
23561
23562 if (paravirt_pgd_alloc(mm) != 0)
23563- goto out_free_pmds;
23564+ goto out_free_pxds;
23565
23566 /*
23567 * Make sure that pre-populating the pmds is atomic with
23568@@ -279,14 +328,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
23569 spin_lock(&pgd_lock);
23570
23571 pgd_ctor(mm, pgd);
23572- pgd_prepopulate_pmd(mm, pgd, pmds);
23573+ pgd_prepopulate_pxd(mm, pgd, pxds);
23574
23575 spin_unlock(&pgd_lock);
23576
23577 return pgd;
23578
23579-out_free_pmds:
23580- free_pmds(pmds);
23581+out_free_pxds:
23582+ free_pxds(pxds);
23583 out_free_pgd:
23584 free_page((unsigned long)pgd);
23585 out:
23586@@ -295,7 +344,7 @@ out:
23587
23588 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
23589 {
23590- pgd_mop_up_pmds(mm, pgd);
23591+ pgd_mop_up_pxds(mm, pgd);
23592 pgd_dtor(pgd);
23593 paravirt_pgd_free(mm, pgd);
23594 free_page((unsigned long)pgd);
23595diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
23596index cac7184..09a39fa 100644
23597--- a/arch/x86/mm/pgtable_32.c
23598+++ b/arch/x86/mm/pgtable_32.c
23599@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
23600 return;
23601 }
23602 pte = pte_offset_kernel(pmd, vaddr);
23603+
23604+ pax_open_kernel();
23605 if (pte_val(pteval))
23606 set_pte_at(&init_mm, vaddr, pte, pteval);
23607 else
23608 pte_clear(&init_mm, vaddr, pte);
23609+ pax_close_kernel();
23610
23611 /*
23612 * It's enough to flush this one mapping.
23613diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
23614index 410531d..0f16030 100644
23615--- a/arch/x86/mm/setup_nx.c
23616+++ b/arch/x86/mm/setup_nx.c
23617@@ -5,8 +5,10 @@
23618 #include <asm/pgtable.h>
23619 #include <asm/proto.h>
23620
23621+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
23622 static int disable_nx __cpuinitdata;
23623
23624+#ifndef CONFIG_PAX_PAGEEXEC
23625 /*
23626 * noexec = on|off
23627 *
23628@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
23629 return 0;
23630 }
23631 early_param("noexec", noexec_setup);
23632+#endif
23633+
23634+#endif
23635
23636 void __cpuinit x86_configure_nx(void)
23637 {
23638+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
23639 if (cpu_has_nx && !disable_nx)
23640 __supported_pte_mask |= _PAGE_NX;
23641 else
23642+#endif
23643 __supported_pte_mask &= ~_PAGE_NX;
23644 }
23645
23646diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
23647index d6c0418..06a0ad5 100644
23648--- a/arch/x86/mm/tlb.c
23649+++ b/arch/x86/mm/tlb.c
23650@@ -65,7 +65,11 @@ void leave_mm(int cpu)
23651 BUG();
23652 cpumask_clear_cpu(cpu,
23653 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
23654+
23655+#ifndef CONFIG_PAX_PER_CPU_PGD
23656 load_cr3(swapper_pg_dir);
23657+#endif
23658+
23659 }
23660 EXPORT_SYMBOL_GPL(leave_mm);
23661
23662diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
23663index 6687022..ceabcfa 100644
23664--- a/arch/x86/net/bpf_jit.S
23665+++ b/arch/x86/net/bpf_jit.S
23666@@ -9,6 +9,7 @@
23667 */
23668 #include <linux/linkage.h>
23669 #include <asm/dwarf2.h>
23670+#include <asm/alternative-asm.h>
23671
23672 /*
23673 * Calling convention :
23674@@ -35,6 +36,7 @@ sk_load_word:
23675 jle bpf_slow_path_word
23676 mov (SKBDATA,%rsi),%eax
23677 bswap %eax /* ntohl() */
23678+ pax_force_retaddr
23679 ret
23680
23681
23682@@ -53,6 +55,7 @@ sk_load_half:
23683 jle bpf_slow_path_half
23684 movzwl (SKBDATA,%rsi),%eax
23685 rol $8,%ax # ntohs()
23686+ pax_force_retaddr
23687 ret
23688
23689 sk_load_byte_ind:
23690@@ -66,6 +69,7 @@ sk_load_byte:
23691 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
23692 jle bpf_slow_path_byte
23693 movzbl (SKBDATA,%rsi),%eax
23694+ pax_force_retaddr
23695 ret
23696
23697 /**
23698@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
23699 movzbl (SKBDATA,%rsi),%ebx
23700 and $15,%bl
23701 shl $2,%bl
23702+ pax_force_retaddr
23703 ret
23704 CFI_ENDPROC
23705 ENDPROC(sk_load_byte_msh)
23706@@ -91,6 +96,7 @@ bpf_error:
23707 xor %eax,%eax
23708 mov -8(%rbp),%rbx
23709 leaveq
23710+ pax_force_retaddr
23711 ret
23712
23713 /* rsi contains offset and can be scratched */
23714@@ -113,6 +119,7 @@ bpf_slow_path_word:
23715 js bpf_error
23716 mov -12(%rbp),%eax
23717 bswap %eax
23718+ pax_force_retaddr
23719 ret
23720
23721 bpf_slow_path_half:
23722@@ -121,12 +128,14 @@ bpf_slow_path_half:
23723 mov -12(%rbp),%ax
23724 rol $8,%ax
23725 movzwl %ax,%eax
23726+ pax_force_retaddr
23727 ret
23728
23729 bpf_slow_path_byte:
23730 bpf_slow_path_common(1)
23731 js bpf_error
23732 movzbl -12(%rbp),%eax
23733+ pax_force_retaddr
23734 ret
23735
23736 bpf_slow_path_byte_msh:
23737@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
23738 and $15,%al
23739 shl $2,%al
23740 xchg %eax,%ebx
23741+ pax_force_retaddr
23742 ret
23743diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
23744index 7c1b765..8c072c6 100644
23745--- a/arch/x86/net/bpf_jit_comp.c
23746+++ b/arch/x86/net/bpf_jit_comp.c
23747@@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void *start, void *end)
23748 set_fs(old_fs);
23749 }
23750
23751+struct bpf_jit_work {
23752+ struct work_struct work;
23753+ void *image;
23754+};
23755
23756 void bpf_jit_compile(struct sk_filter *fp)
23757 {
23758@@ -141,6 +145,10 @@ void bpf_jit_compile(struct sk_filter *fp)
23759 if (addrs == NULL)
23760 return;
23761
23762+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
23763+ if (!fp->work)
23764+ goto out;
23765+
23766 /* Before first pass, make a rough estimation of addrs[]
23767 * each bpf instruction is translated to less than 64 bytes
23768 */
23769@@ -476,7 +484,7 @@ void bpf_jit_compile(struct sk_filter *fp)
23770 func = sk_load_word;
23771 common_load: seen |= SEEN_DATAREF;
23772 if ((int)K < 0)
23773- goto out;
23774+ goto error;
23775 t_offset = func - (image + addrs[i]);
23776 EMIT1_off32(0xbe, K); /* mov imm32,%esi */
23777 EMIT1_off32(0xe8, t_offset); /* call */
23778@@ -586,17 +594,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
23779 break;
23780 default:
23781 /* hmm, too complex filter, give up with jit compiler */
23782- goto out;
23783+ goto error;
23784 }
23785 ilen = prog - temp;
23786 if (image) {
23787 if (unlikely(proglen + ilen > oldproglen)) {
23788 pr_err("bpb_jit_compile fatal error\n");
23789- kfree(addrs);
23790- module_free(NULL, image);
23791- return;
23792+ module_free_exec(NULL, image);
23793+ goto error;
23794 }
23795+ pax_open_kernel();
23796 memcpy(image + proglen, temp, ilen);
23797+ pax_close_kernel();
23798 }
23799 proglen += ilen;
23800 addrs[i] = proglen;
23801@@ -617,11 +626,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
23802 break;
23803 }
23804 if (proglen == oldproglen) {
23805- image = module_alloc(max_t(unsigned int,
23806- proglen,
23807- sizeof(struct work_struct)));
23808+ image = module_alloc_exec(proglen);
23809 if (!image)
23810- goto out;
23811+ goto error;
23812 }
23813 oldproglen = proglen;
23814 }
23815@@ -637,7 +644,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
23816 bpf_flush_icache(image, image + proglen);
23817
23818 fp->bpf_func = (void *)image;
23819- }
23820+ } else
23821+error:
23822+ kfree(fp->work);
23823+
23824 out:
23825 kfree(addrs);
23826 return;
23827@@ -645,18 +655,20 @@ out:
23828
23829 static void jit_free_defer(struct work_struct *arg)
23830 {
23831- module_free(NULL, arg);
23832+ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
23833+ kfree(arg);
23834 }
23835
23836 /* run from softirq, we must use a work_struct to call
23837- * module_free() from process context
23838+ * module_free_exec() from process context
23839 */
23840 void bpf_jit_free(struct sk_filter *fp)
23841 {
23842 if (fp->bpf_func != sk_run_filter) {
23843- struct work_struct *work = (struct work_struct *)fp->bpf_func;
23844+ struct work_struct *work = &fp->work->work;
23845
23846 INIT_WORK(work, jit_free_defer);
23847+ fp->work->image = fp->bpf_func;
23848 schedule_work(work);
23849 }
23850 }
23851diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
23852index bff89df..377758a 100644
23853--- a/arch/x86/oprofile/backtrace.c
23854+++ b/arch/x86/oprofile/backtrace.c
23855@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
23856 struct stack_frame_ia32 *fp;
23857 unsigned long bytes;
23858
23859- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
23860+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
23861 if (bytes != sizeof(bufhead))
23862 return NULL;
23863
23864- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
23865+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
23866
23867 oprofile_add_trace(bufhead[0].return_address);
23868
23869@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
23870 struct stack_frame bufhead[2];
23871 unsigned long bytes;
23872
23873- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
23874+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
23875 if (bytes != sizeof(bufhead))
23876 return NULL;
23877
23878@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
23879 {
23880 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
23881
23882- if (!user_mode_vm(regs)) {
23883+ if (!user_mode(regs)) {
23884 unsigned long stack = kernel_stack_pointer(regs);
23885 if (depth)
23886 dump_trace(NULL, regs, (unsigned long *)stack, 0,
23887diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
23888index cb29191..036766d 100644
23889--- a/arch/x86/pci/mrst.c
23890+++ b/arch/x86/pci/mrst.c
23891@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
23892 printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
23893 pci_mmcfg_late_init();
23894 pcibios_enable_irq = mrst_pci_irq_enable;
23895- pci_root_ops = pci_mrst_ops;
23896+ pax_open_kernel();
23897+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
23898+ pax_close_kernel();
23899 /* Continue with standard init */
23900 return 1;
23901 }
23902diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
23903index db0e9a5..0372c14 100644
23904--- a/arch/x86/pci/pcbios.c
23905+++ b/arch/x86/pci/pcbios.c
23906@@ -79,50 +79,93 @@ union bios32 {
23907 static struct {
23908 unsigned long address;
23909 unsigned short segment;
23910-} bios32_indirect = { 0, __KERNEL_CS };
23911+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
23912
23913 /*
23914 * Returns the entry point for the given service, NULL on error
23915 */
23916
23917-static unsigned long bios32_service(unsigned long service)
23918+static unsigned long __devinit bios32_service(unsigned long service)
23919 {
23920 unsigned char return_code; /* %al */
23921 unsigned long address; /* %ebx */
23922 unsigned long length; /* %ecx */
23923 unsigned long entry; /* %edx */
23924 unsigned long flags;
23925+ struct desc_struct d, *gdt;
23926
23927 local_irq_save(flags);
23928- __asm__("lcall *(%%edi); cld"
23929+
23930+ gdt = get_cpu_gdt_table(smp_processor_id());
23931+
23932+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
23933+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
23934+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
23935+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
23936+
23937+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
23938 : "=a" (return_code),
23939 "=b" (address),
23940 "=c" (length),
23941 "=d" (entry)
23942 : "0" (service),
23943 "1" (0),
23944- "D" (&bios32_indirect));
23945+ "D" (&bios32_indirect),
23946+ "r"(__PCIBIOS_DS)
23947+ : "memory");
23948+
23949+ pax_open_kernel();
23950+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
23951+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
23952+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
23953+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
23954+ pax_close_kernel();
23955+
23956 local_irq_restore(flags);
23957
23958 switch (return_code) {
23959- case 0:
23960- return address + entry;
23961- case 0x80: /* Not present */
23962- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
23963- return 0;
23964- default: /* Shouldn't happen */
23965- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
23966- service, return_code);
23967+ case 0: {
23968+ int cpu;
23969+ unsigned char flags;
23970+
23971+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
23972+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
23973+ printk(KERN_WARNING "bios32_service: not valid\n");
23974 return 0;
23975+ }
23976+ address = address + PAGE_OFFSET;
23977+ length += 16UL; /* some BIOSs underreport this... */
23978+ flags = 4;
23979+ if (length >= 64*1024*1024) {
23980+ length >>= PAGE_SHIFT;
23981+ flags |= 8;
23982+ }
23983+
23984+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
23985+ gdt = get_cpu_gdt_table(cpu);
23986+ pack_descriptor(&d, address, length, 0x9b, flags);
23987+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
23988+ pack_descriptor(&d, address, length, 0x93, flags);
23989+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
23990+ }
23991+ return entry;
23992+ }
23993+ case 0x80: /* Not present */
23994+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
23995+ return 0;
23996+ default: /* Shouldn't happen */
23997+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
23998+ service, return_code);
23999+ return 0;
24000 }
24001 }
24002
24003 static struct {
24004 unsigned long address;
24005 unsigned short segment;
24006-} pci_indirect = { 0, __KERNEL_CS };
24007+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
24008
24009-static int pci_bios_present;
24010+static int pci_bios_present __read_only;
24011
24012 static int __devinit check_pcibios(void)
24013 {
24014@@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
24015 unsigned long flags, pcibios_entry;
24016
24017 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
24018- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
24019+ pci_indirect.address = pcibios_entry;
24020
24021 local_irq_save(flags);
24022- __asm__(
24023- "lcall *(%%edi); cld\n\t"
24024+ __asm__("movw %w6, %%ds\n\t"
24025+ "lcall *%%ss:(%%edi); cld\n\t"
24026+ "push %%ss\n\t"
24027+ "pop %%ds\n\t"
24028 "jc 1f\n\t"
24029 "xor %%ah, %%ah\n"
24030 "1:"
24031@@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
24032 "=b" (ebx),
24033 "=c" (ecx)
24034 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
24035- "D" (&pci_indirect)
24036+ "D" (&pci_indirect),
24037+ "r" (__PCIBIOS_DS)
24038 : "memory");
24039 local_irq_restore(flags);
24040
24041@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24042
24043 switch (len) {
24044 case 1:
24045- __asm__("lcall *(%%esi); cld\n\t"
24046+ __asm__("movw %w6, %%ds\n\t"
24047+ "lcall *%%ss:(%%esi); cld\n\t"
24048+ "push %%ss\n\t"
24049+ "pop %%ds\n\t"
24050 "jc 1f\n\t"
24051 "xor %%ah, %%ah\n"
24052 "1:"
24053@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24054 : "1" (PCIBIOS_READ_CONFIG_BYTE),
24055 "b" (bx),
24056 "D" ((long)reg),
24057- "S" (&pci_indirect));
24058+ "S" (&pci_indirect),
24059+ "r" (__PCIBIOS_DS));
24060 /*
24061 * Zero-extend the result beyond 8 bits, do not trust the
24062 * BIOS having done it:
24063@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24064 *value &= 0xff;
24065 break;
24066 case 2:
24067- __asm__("lcall *(%%esi); cld\n\t"
24068+ __asm__("movw %w6, %%ds\n\t"
24069+ "lcall *%%ss:(%%esi); cld\n\t"
24070+ "push %%ss\n\t"
24071+ "pop %%ds\n\t"
24072 "jc 1f\n\t"
24073 "xor %%ah, %%ah\n"
24074 "1:"
24075@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24076 : "1" (PCIBIOS_READ_CONFIG_WORD),
24077 "b" (bx),
24078 "D" ((long)reg),
24079- "S" (&pci_indirect));
24080+ "S" (&pci_indirect),
24081+ "r" (__PCIBIOS_DS));
24082 /*
24083 * Zero-extend the result beyond 16 bits, do not trust the
24084 * BIOS having done it:
24085@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24086 *value &= 0xffff;
24087 break;
24088 case 4:
24089- __asm__("lcall *(%%esi); cld\n\t"
24090+ __asm__("movw %w6, %%ds\n\t"
24091+ "lcall *%%ss:(%%esi); cld\n\t"
24092+ "push %%ss\n\t"
24093+ "pop %%ds\n\t"
24094 "jc 1f\n\t"
24095 "xor %%ah, %%ah\n"
24096 "1:"
24097@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
24098 : "1" (PCIBIOS_READ_CONFIG_DWORD),
24099 "b" (bx),
24100 "D" ((long)reg),
24101- "S" (&pci_indirect));
24102+ "S" (&pci_indirect),
24103+ "r" (__PCIBIOS_DS));
24104 break;
24105 }
24106
24107@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
24108
24109 switch (len) {
24110 case 1:
24111- __asm__("lcall *(%%esi); cld\n\t"
24112+ __asm__("movw %w6, %%ds\n\t"
24113+ "lcall *%%ss:(%%esi); cld\n\t"
24114+ "push %%ss\n\t"
24115+ "pop %%ds\n\t"
24116 "jc 1f\n\t"
24117 "xor %%ah, %%ah\n"
24118 "1:"
24119@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
24120 "c" (value),
24121 "b" (bx),
24122 "D" ((long)reg),
24123- "S" (&pci_indirect));
24124+ "S" (&pci_indirect),
24125+ "r" (__PCIBIOS_DS));
24126 break;
24127 case 2:
24128- __asm__("lcall *(%%esi); cld\n\t"
24129+ __asm__("movw %w6, %%ds\n\t"
24130+ "lcall *%%ss:(%%esi); cld\n\t"
24131+ "push %%ss\n\t"
24132+ "pop %%ds\n\t"
24133 "jc 1f\n\t"
24134 "xor %%ah, %%ah\n"
24135 "1:"
24136@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
24137 "c" (value),
24138 "b" (bx),
24139 "D" ((long)reg),
24140- "S" (&pci_indirect));
24141+ "S" (&pci_indirect),
24142+ "r" (__PCIBIOS_DS));
24143 break;
24144 case 4:
24145- __asm__("lcall *(%%esi); cld\n\t"
24146+ __asm__("movw %w6, %%ds\n\t"
24147+ "lcall *%%ss:(%%esi); cld\n\t"
24148+ "push %%ss\n\t"
24149+ "pop %%ds\n\t"
24150 "jc 1f\n\t"
24151 "xor %%ah, %%ah\n"
24152 "1:"
24153@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
24154 "c" (value),
24155 "b" (bx),
24156 "D" ((long)reg),
24157- "S" (&pci_indirect));
24158+ "S" (&pci_indirect),
24159+ "r" (__PCIBIOS_DS));
24160 break;
24161 }
24162
24163@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
24164
24165 DBG("PCI: Fetching IRQ routing table... ");
24166 __asm__("push %%es\n\t"
24167+ "movw %w8, %%ds\n\t"
24168 "push %%ds\n\t"
24169 "pop %%es\n\t"
24170- "lcall *(%%esi); cld\n\t"
24171+ "lcall *%%ss:(%%esi); cld\n\t"
24172 "pop %%es\n\t"
24173+ "push %%ss\n\t"
24174+ "pop %%ds\n"
24175 "jc 1f\n\t"
24176 "xor %%ah, %%ah\n"
24177 "1:"
24178@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
24179 "1" (0),
24180 "D" ((long) &opt),
24181 "S" (&pci_indirect),
24182- "m" (opt)
24183+ "m" (opt),
24184+ "r" (__PCIBIOS_DS)
24185 : "memory");
24186 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
24187 if (ret & 0xff00)
24188@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
24189 {
24190 int ret;
24191
24192- __asm__("lcall *(%%esi); cld\n\t"
24193+ __asm__("movw %w5, %%ds\n\t"
24194+ "lcall *%%ss:(%%esi); cld\n\t"
24195+ "push %%ss\n\t"
24196+ "pop %%ds\n"
24197 "jc 1f\n\t"
24198 "xor %%ah, %%ah\n"
24199 "1:"
24200@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
24201 : "0" (PCIBIOS_SET_PCI_HW_INT),
24202 "b" ((dev->bus->number << 8) | dev->devfn),
24203 "c" ((irq << 8) | (pin + 10)),
24204- "S" (&pci_indirect));
24205+ "S" (&pci_indirect),
24206+ "r" (__PCIBIOS_DS));
24207 return !(ret & 0xff00);
24208 }
24209 EXPORT_SYMBOL(pcibios_set_irq_routing);
24210diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
24211index 40e4469..1ab536e 100644
24212--- a/arch/x86/platform/efi/efi_32.c
24213+++ b/arch/x86/platform/efi/efi_32.c
24214@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
24215 {
24216 struct desc_ptr gdt_descr;
24217
24218+#ifdef CONFIG_PAX_KERNEXEC
24219+ struct desc_struct d;
24220+#endif
24221+
24222 local_irq_save(efi_rt_eflags);
24223
24224 load_cr3(initial_page_table);
24225 __flush_tlb_all();
24226
24227+#ifdef CONFIG_PAX_KERNEXEC
24228+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
24229+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
24230+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
24231+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
24232+#endif
24233+
24234 gdt_descr.address = __pa(get_cpu_gdt_table(0));
24235 gdt_descr.size = GDT_SIZE - 1;
24236 load_gdt(&gdt_descr);
24237@@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
24238 {
24239 struct desc_ptr gdt_descr;
24240
24241+#ifdef CONFIG_PAX_KERNEXEC
24242+ struct desc_struct d;
24243+
24244+ memset(&d, 0, sizeof d);
24245+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
24246+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
24247+#endif
24248+
24249 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
24250 gdt_descr.size = GDT_SIZE - 1;
24251 load_gdt(&gdt_descr);
24252diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
24253index fbe66e6..c5c0dd2 100644
24254--- a/arch/x86/platform/efi/efi_stub_32.S
24255+++ b/arch/x86/platform/efi/efi_stub_32.S
24256@@ -6,7 +6,9 @@
24257 */
24258
24259 #include <linux/linkage.h>
24260+#include <linux/init.h>
24261 #include <asm/page_types.h>
24262+#include <asm/segment.h>
24263
24264 /*
24265 * efi_call_phys(void *, ...) is a function with variable parameters.
24266@@ -20,7 +22,7 @@
24267 * service functions will comply with gcc calling convention, too.
24268 */
24269
24270-.text
24271+__INIT
24272 ENTRY(efi_call_phys)
24273 /*
24274 * 0. The function can only be called in Linux kernel. So CS has been
24275@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
24276 * The mapping of lower virtual memory has been created in prelog and
24277 * epilog.
24278 */
24279- movl $1f, %edx
24280- subl $__PAGE_OFFSET, %edx
24281- jmp *%edx
24282+ movl $(__KERNEXEC_EFI_DS), %edx
24283+ mov %edx, %ds
24284+ mov %edx, %es
24285+ mov %edx, %ss
24286+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
24287 1:
24288
24289 /*
24290@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
24291 * parameter 2, ..., param n. To make things easy, we save the return
24292 * address of efi_call_phys in a global variable.
24293 */
24294- popl %edx
24295- movl %edx, saved_return_addr
24296- /* get the function pointer into ECX*/
24297- popl %ecx
24298- movl %ecx, efi_rt_function_ptr
24299- movl $2f, %edx
24300- subl $__PAGE_OFFSET, %edx
24301- pushl %edx
24302+ popl (saved_return_addr)
24303+ popl (efi_rt_function_ptr)
24304
24305 /*
24306 * 3. Clear PG bit in %CR0.
24307@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
24308 /*
24309 * 5. Call the physical function.
24310 */
24311- jmp *%ecx
24312+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
24313
24314-2:
24315 /*
24316 * 6. After EFI runtime service returns, control will return to
24317 * following instruction. We'd better readjust stack pointer first.
24318@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
24319 movl %cr0, %edx
24320 orl $0x80000000, %edx
24321 movl %edx, %cr0
24322- jmp 1f
24323-1:
24324+
24325 /*
24326 * 8. Now restore the virtual mode from flat mode by
24327 * adding EIP with PAGE_OFFSET.
24328 */
24329- movl $1f, %edx
24330- jmp *%edx
24331+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
24332 1:
24333+ movl $(__KERNEL_DS), %edx
24334+ mov %edx, %ds
24335+ mov %edx, %es
24336+ mov %edx, %ss
24337
24338 /*
24339 * 9. Balance the stack. And because EAX contain the return value,
24340 * we'd better not clobber it.
24341 */
24342- leal efi_rt_function_ptr, %edx
24343- movl (%edx), %ecx
24344- pushl %ecx
24345+ pushl (efi_rt_function_ptr)
24346
24347 /*
24348- * 10. Push the saved return address onto the stack and return.
24349+ * 10. Return to the saved return address.
24350 */
24351- leal saved_return_addr, %edx
24352- movl (%edx), %ecx
24353- pushl %ecx
24354- ret
24355+ jmpl *(saved_return_addr)
24356 ENDPROC(efi_call_phys)
24357 .previous
24358
24359-.data
24360+__INITDATA
24361 saved_return_addr:
24362 .long 0
24363 efi_rt_function_ptr:
24364diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
24365index 4c07cca..2c8427d 100644
24366--- a/arch/x86/platform/efi/efi_stub_64.S
24367+++ b/arch/x86/platform/efi/efi_stub_64.S
24368@@ -7,6 +7,7 @@
24369 */
24370
24371 #include <linux/linkage.h>
24372+#include <asm/alternative-asm.h>
24373
24374 #define SAVE_XMM \
24375 mov %rsp, %rax; \
24376@@ -40,6 +41,7 @@ ENTRY(efi_call0)
24377 call *%rdi
24378 addq $32, %rsp
24379 RESTORE_XMM
24380+ pax_force_retaddr 0, 1
24381 ret
24382 ENDPROC(efi_call0)
24383
24384@@ -50,6 +52,7 @@ ENTRY(efi_call1)
24385 call *%rdi
24386 addq $32, %rsp
24387 RESTORE_XMM
24388+ pax_force_retaddr 0, 1
24389 ret
24390 ENDPROC(efi_call1)
24391
24392@@ -60,6 +63,7 @@ ENTRY(efi_call2)
24393 call *%rdi
24394 addq $32, %rsp
24395 RESTORE_XMM
24396+ pax_force_retaddr 0, 1
24397 ret
24398 ENDPROC(efi_call2)
24399
24400@@ -71,6 +75,7 @@ ENTRY(efi_call3)
24401 call *%rdi
24402 addq $32, %rsp
24403 RESTORE_XMM
24404+ pax_force_retaddr 0, 1
24405 ret
24406 ENDPROC(efi_call3)
24407
24408@@ -83,6 +88,7 @@ ENTRY(efi_call4)
24409 call *%rdi
24410 addq $32, %rsp
24411 RESTORE_XMM
24412+ pax_force_retaddr 0, 1
24413 ret
24414 ENDPROC(efi_call4)
24415
24416@@ -96,6 +102,7 @@ ENTRY(efi_call5)
24417 call *%rdi
24418 addq $48, %rsp
24419 RESTORE_XMM
24420+ pax_force_retaddr 0, 1
24421 ret
24422 ENDPROC(efi_call5)
24423
24424@@ -112,5 +119,6 @@ ENTRY(efi_call6)
24425 call *%rdi
24426 addq $48, %rsp
24427 RESTORE_XMM
24428+ pax_force_retaddr 0, 1
24429 ret
24430 ENDPROC(efi_call6)
24431diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
24432index ad4ec1c..686479e 100644
24433--- a/arch/x86/platform/mrst/mrst.c
24434+++ b/arch/x86/platform/mrst/mrst.c
24435@@ -76,18 +76,20 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
24436 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
24437 int sfi_mrtc_num;
24438
24439-static void mrst_power_off(void)
24440+static __noreturn void mrst_power_off(void)
24441 {
24442 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
24443 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 1);
24444+ BUG();
24445 }
24446
24447-static void mrst_reboot(void)
24448+static __noreturn void mrst_reboot(void)
24449 {
24450 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
24451 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
24452 else
24453 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
24454+ BUG();
24455 }
24456
24457 /* parse all the mtimer info to a static mtimer array */
24458diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
24459index f10c0af..3ec1f95 100644
24460--- a/arch/x86/power/cpu.c
24461+++ b/arch/x86/power/cpu.c
24462@@ -131,7 +131,7 @@ static void do_fpu_end(void)
24463 static void fix_processor_context(void)
24464 {
24465 int cpu = smp_processor_id();
24466- struct tss_struct *t = &per_cpu(init_tss, cpu);
24467+ struct tss_struct *t = init_tss + cpu;
24468
24469 set_tss_desc(cpu, t); /*
24470 * This just modifies memory; should not be
24471@@ -141,7 +141,9 @@ static void fix_processor_context(void)
24472 */
24473
24474 #ifdef CONFIG_X86_64
24475+ pax_open_kernel();
24476 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
24477+ pax_close_kernel();
24478
24479 syscall_init(); /* This sets MSR_*STAR and related */
24480 #endif
24481diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
24482index 5d17950..2253fc9 100644
24483--- a/arch/x86/vdso/Makefile
24484+++ b/arch/x86/vdso/Makefile
24485@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
24486 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
24487 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
24488
24489-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
24490+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
24491 GCOV_PROFILE := n
24492
24493 #
24494diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
24495index 468d591..8e80a0a 100644
24496--- a/arch/x86/vdso/vdso32-setup.c
24497+++ b/arch/x86/vdso/vdso32-setup.c
24498@@ -25,6 +25,7 @@
24499 #include <asm/tlbflush.h>
24500 #include <asm/vdso.h>
24501 #include <asm/proto.h>
24502+#include <asm/mman.h>
24503
24504 enum {
24505 VDSO_DISABLED = 0,
24506@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
24507 void enable_sep_cpu(void)
24508 {
24509 int cpu = get_cpu();
24510- struct tss_struct *tss = &per_cpu(init_tss, cpu);
24511+ struct tss_struct *tss = init_tss + cpu;
24512
24513 if (!boot_cpu_has(X86_FEATURE_SEP)) {
24514 put_cpu();
24515@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
24516 gate_vma.vm_start = FIXADDR_USER_START;
24517 gate_vma.vm_end = FIXADDR_USER_END;
24518 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
24519- gate_vma.vm_page_prot = __P101;
24520+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
24521 /*
24522 * Make sure the vDSO gets into every core dump.
24523 * Dumping its contents makes post-mortem fully interpretable later
24524@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
24525 if (compat)
24526 addr = VDSO_HIGH_BASE;
24527 else {
24528- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
24529+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
24530 if (IS_ERR_VALUE(addr)) {
24531 ret = addr;
24532 goto up_fail;
24533 }
24534 }
24535
24536- current->mm->context.vdso = (void *)addr;
24537+ current->mm->context.vdso = addr;
24538
24539 if (compat_uses_vma || !compat) {
24540 /*
24541@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
24542 }
24543
24544 current_thread_info()->sysenter_return =
24545- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
24546+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
24547
24548 up_fail:
24549 if (ret)
24550- current->mm->context.vdso = NULL;
24551+ current->mm->context.vdso = 0;
24552
24553 up_write(&mm->mmap_sem);
24554
24555@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
24556
24557 const char *arch_vma_name(struct vm_area_struct *vma)
24558 {
24559- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
24560+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
24561 return "[vdso]";
24562+
24563+#ifdef CONFIG_PAX_SEGMEXEC
24564+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
24565+ return "[vdso]";
24566+#endif
24567+
24568 return NULL;
24569 }
24570
24571@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
24572 * Check to see if the corresponding task was created in compat vdso
24573 * mode.
24574 */
24575- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
24576+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
24577 return &gate_vma;
24578 return NULL;
24579 }
24580diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
24581index 153407c..611cba9 100644
24582--- a/arch/x86/vdso/vma.c
24583+++ b/arch/x86/vdso/vma.c
24584@@ -16,8 +16,6 @@
24585 #include <asm/vdso.h>
24586 #include <asm/page.h>
24587
24588-unsigned int __read_mostly vdso_enabled = 1;
24589-
24590 extern char vdso_start[], vdso_end[];
24591 extern unsigned short vdso_sync_cpuid;
24592
24593@@ -96,7 +94,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
24594 * unaligned here as a result of stack start randomization.
24595 */
24596 addr = PAGE_ALIGN(addr);
24597- addr = align_addr(addr, NULL, ALIGN_VDSO);
24598
24599 return addr;
24600 }
24601@@ -106,40 +103,35 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
24602 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
24603 {
24604 struct mm_struct *mm = current->mm;
24605- unsigned long addr;
24606+ unsigned long addr = 0;
24607 int ret;
24608
24609- if (!vdso_enabled)
24610- return 0;
24611-
24612 down_write(&mm->mmap_sem);
24613+
24614+#ifdef CONFIG_PAX_RANDMMAP
24615+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
24616+#endif
24617+
24618 addr = vdso_addr(mm->start_stack, vdso_size);
24619+ addr = align_addr(addr, NULL, ALIGN_VDSO);
24620 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
24621 if (IS_ERR_VALUE(addr)) {
24622 ret = addr;
24623 goto up_fail;
24624 }
24625
24626- current->mm->context.vdso = (void *)addr;
24627+ mm->context.vdso = addr;
24628
24629 ret = install_special_mapping(mm, addr, vdso_size,
24630 VM_READ|VM_EXEC|
24631 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
24632 VM_ALWAYSDUMP,
24633 vdso_pages);
24634- if (ret) {
24635- current->mm->context.vdso = NULL;
24636- goto up_fail;
24637- }
24638+
24639+ if (ret)
24640+ mm->context.vdso = 0;
24641
24642 up_fail:
24643 up_write(&mm->mmap_sem);
24644 return ret;
24645 }
24646-
24647-static __init int vdso_setup(char *s)
24648-{
24649- vdso_enabled = simple_strtoul(s, NULL, 0);
24650- return 0;
24651-}
24652-__setup("vdso=", vdso_setup);
24653diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
24654index 1f92865..c843b20 100644
24655--- a/arch/x86/xen/enlighten.c
24656+++ b/arch/x86/xen/enlighten.c
24657@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
24658
24659 struct shared_info xen_dummy_shared_info;
24660
24661-void *xen_initial_gdt;
24662-
24663 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
24664 __read_mostly int xen_have_vector_callback;
24665 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
24666@@ -1029,7 +1027,7 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
24667 #endif
24668 };
24669
24670-static void xen_reboot(int reason)
24671+static __noreturn void xen_reboot(int reason)
24672 {
24673 struct sched_shutdown r = { .reason = reason };
24674
24675@@ -1037,17 +1035,17 @@ static void xen_reboot(int reason)
24676 BUG();
24677 }
24678
24679-static void xen_restart(char *msg)
24680+static __noreturn void xen_restart(char *msg)
24681 {
24682 xen_reboot(SHUTDOWN_reboot);
24683 }
24684
24685-static void xen_emergency_restart(void)
24686+static __noreturn void xen_emergency_restart(void)
24687 {
24688 xen_reboot(SHUTDOWN_reboot);
24689 }
24690
24691-static void xen_machine_halt(void)
24692+static __noreturn void xen_machine_halt(void)
24693 {
24694 xen_reboot(SHUTDOWN_poweroff);
24695 }
24696@@ -1153,7 +1151,17 @@ asmlinkage void __init xen_start_kernel(void)
24697 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
24698
24699 /* Work out if we support NX */
24700- x86_configure_nx();
24701+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
24702+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
24703+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
24704+ unsigned l, h;
24705+
24706+ __supported_pte_mask |= _PAGE_NX;
24707+ rdmsr(MSR_EFER, l, h);
24708+ l |= EFER_NX;
24709+ wrmsr(MSR_EFER, l, h);
24710+ }
24711+#endif
24712
24713 xen_setup_features();
24714
24715@@ -1184,13 +1192,6 @@ asmlinkage void __init xen_start_kernel(void)
24716
24717 machine_ops = xen_machine_ops;
24718
24719- /*
24720- * The only reliable way to retain the initial address of the
24721- * percpu gdt_page is to remember it here, so we can go and
24722- * mark it RW later, when the initial percpu area is freed.
24723- */
24724- xen_initial_gdt = &per_cpu(gdt_page, 0);
24725-
24726 xen_smp_init();
24727
24728 #ifdef CONFIG_ACPI_NUMA
24729diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
24730index 87f6673..e2555a6 100644
24731--- a/arch/x86/xen/mmu.c
24732+++ b/arch/x86/xen/mmu.c
24733@@ -1733,6 +1733,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
24734 convert_pfn_mfn(init_level4_pgt);
24735 convert_pfn_mfn(level3_ident_pgt);
24736 convert_pfn_mfn(level3_kernel_pgt);
24737+ convert_pfn_mfn(level3_vmalloc_start_pgt);
24738+ convert_pfn_mfn(level3_vmalloc_end_pgt);
24739+ convert_pfn_mfn(level3_vmemmap_pgt);
24740
24741 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
24742 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
24743@@ -1751,7 +1754,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
24744 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
24745 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
24746 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
24747+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
24748+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
24749+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
24750 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
24751+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
24752 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
24753 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
24754
24755@@ -1962,6 +1969,7 @@ static void __init xen_post_allocator_init(void)
24756 pv_mmu_ops.set_pud = xen_set_pud;
24757 #if PAGETABLE_LEVELS == 4
24758 pv_mmu_ops.set_pgd = xen_set_pgd;
24759+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
24760 #endif
24761
24762 /* This will work as long as patching hasn't happened yet
24763@@ -2043,6 +2051,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
24764 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
24765 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
24766 .set_pgd = xen_set_pgd_hyper,
24767+ .set_pgd_batched = xen_set_pgd_hyper,
24768
24769 .alloc_pud = xen_alloc_pmd_init,
24770 .release_pud = xen_release_pmd_init,
24771diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
24772index 041d4fe..7666b7e 100644
24773--- a/arch/x86/xen/smp.c
24774+++ b/arch/x86/xen/smp.c
24775@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
24776 {
24777 BUG_ON(smp_processor_id() != 0);
24778 native_smp_prepare_boot_cpu();
24779-
24780- /* We've switched to the "real" per-cpu gdt, so make sure the
24781- old memory can be recycled */
24782- make_lowmem_page_readwrite(xen_initial_gdt);
24783-
24784 xen_filter_cpu_maps();
24785 xen_setup_vcpu_info_placement();
24786 }
24787@@ -275,12 +270,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
24788 gdt = get_cpu_gdt_table(cpu);
24789
24790 ctxt->flags = VGCF_IN_KERNEL;
24791- ctxt->user_regs.ds = __USER_DS;
24792- ctxt->user_regs.es = __USER_DS;
24793+ ctxt->user_regs.ds = __KERNEL_DS;
24794+ ctxt->user_regs.es = __KERNEL_DS;
24795 ctxt->user_regs.ss = __KERNEL_DS;
24796 #ifdef CONFIG_X86_32
24797 ctxt->user_regs.fs = __KERNEL_PERCPU;
24798- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
24799+ savesegment(gs, ctxt->user_regs.gs);
24800 #else
24801 ctxt->gs_base_kernel = per_cpu_offset(cpu);
24802 #endif
24803@@ -331,13 +326,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
24804 int rc;
24805
24806 per_cpu(current_task, cpu) = idle;
24807+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
24808 #ifdef CONFIG_X86_32
24809 irq_ctx_init(cpu);
24810 #else
24811 clear_tsk_thread_flag(idle, TIF_FORK);
24812- per_cpu(kernel_stack, cpu) =
24813- (unsigned long)task_stack_page(idle) -
24814- KERNEL_STACK_OFFSET + THREAD_SIZE;
24815+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
24816 #endif
24817 xen_setup_runstate_info(cpu);
24818 xen_setup_timer(cpu);
24819diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
24820index b040b0e..8cc4fe0 100644
24821--- a/arch/x86/xen/xen-asm_32.S
24822+++ b/arch/x86/xen/xen-asm_32.S
24823@@ -83,14 +83,14 @@ ENTRY(xen_iret)
24824 ESP_OFFSET=4 # bytes pushed onto stack
24825
24826 /*
24827- * Store vcpu_info pointer for easy access. Do it this way to
24828- * avoid having to reload %fs
24829+ * Store vcpu_info pointer for easy access.
24830 */
24831 #ifdef CONFIG_SMP
24832- GET_THREAD_INFO(%eax)
24833- movl TI_cpu(%eax), %eax
24834- movl __per_cpu_offset(,%eax,4), %eax
24835- mov xen_vcpu(%eax), %eax
24836+ push %fs
24837+ mov $(__KERNEL_PERCPU), %eax
24838+ mov %eax, %fs
24839+ mov PER_CPU_VAR(xen_vcpu), %eax
24840+ pop %fs
24841 #else
24842 movl xen_vcpu, %eax
24843 #endif
24844diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
24845index aaa7291..3f77960 100644
24846--- a/arch/x86/xen/xen-head.S
24847+++ b/arch/x86/xen/xen-head.S
24848@@ -19,6 +19,17 @@ ENTRY(startup_xen)
24849 #ifdef CONFIG_X86_32
24850 mov %esi,xen_start_info
24851 mov $init_thread_union+THREAD_SIZE,%esp
24852+#ifdef CONFIG_SMP
24853+ movl $cpu_gdt_table,%edi
24854+ movl $__per_cpu_load,%eax
24855+ movw %ax,__KERNEL_PERCPU + 2(%edi)
24856+ rorl $16,%eax
24857+ movb %al,__KERNEL_PERCPU + 4(%edi)
24858+ movb %ah,__KERNEL_PERCPU + 7(%edi)
24859+ movl $__per_cpu_end - 1,%eax
24860+ subl $__per_cpu_start,%eax
24861+ movw %ax,__KERNEL_PERCPU + 0(%edi)
24862+#endif
24863 #else
24864 mov %rsi,xen_start_info
24865 mov $init_thread_union+THREAD_SIZE,%rsp
24866diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
24867index b095739..8c17bcd 100644
24868--- a/arch/x86/xen/xen-ops.h
24869+++ b/arch/x86/xen/xen-ops.h
24870@@ -10,8 +10,6 @@
24871 extern const char xen_hypervisor_callback[];
24872 extern const char xen_failsafe_callback[];
24873
24874-extern void *xen_initial_gdt;
24875-
24876 struct trap_info;
24877 void xen_copy_trap_info(struct trap_info *traps);
24878
24879diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
24880index 58916af..9cb880b 100644
24881--- a/block/blk-iopoll.c
24882+++ b/block/blk-iopoll.c
24883@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
24884 }
24885 EXPORT_SYMBOL(blk_iopoll_complete);
24886
24887-static void blk_iopoll_softirq(struct softirq_action *h)
24888+static void blk_iopoll_softirq(void)
24889 {
24890 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
24891 int rearm = 0, budget = blk_iopoll_budget;
24892diff --git a/block/blk-map.c b/block/blk-map.c
24893index 623e1cd..ca1e109 100644
24894--- a/block/blk-map.c
24895+++ b/block/blk-map.c
24896@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
24897 if (!len || !kbuf)
24898 return -EINVAL;
24899
24900- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
24901+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
24902 if (do_copy)
24903 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
24904 else
24905diff --git a/block/blk-softirq.c b/block/blk-softirq.c
24906index 1366a89..e17f54b 100644
24907--- a/block/blk-softirq.c
24908+++ b/block/blk-softirq.c
24909@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
24910 * Softirq action handler - move entries to local list and loop over them
24911 * while passing them to the queue registered handler.
24912 */
24913-static void blk_done_softirq(struct softirq_action *h)
24914+static void blk_done_softirq(void)
24915 {
24916 struct list_head *cpu_list, local_list;
24917
24918diff --git a/block/bsg.c b/block/bsg.c
24919index 702f131..37808bf 100644
24920--- a/block/bsg.c
24921+++ b/block/bsg.c
24922@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
24923 struct sg_io_v4 *hdr, struct bsg_device *bd,
24924 fmode_t has_write_perm)
24925 {
24926+ unsigned char tmpcmd[sizeof(rq->__cmd)];
24927+ unsigned char *cmdptr;
24928+
24929 if (hdr->request_len > BLK_MAX_CDB) {
24930 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
24931 if (!rq->cmd)
24932 return -ENOMEM;
24933- }
24934+ cmdptr = rq->cmd;
24935+ } else
24936+ cmdptr = tmpcmd;
24937
24938- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
24939+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
24940 hdr->request_len))
24941 return -EFAULT;
24942
24943+ if (cmdptr != rq->cmd)
24944+ memcpy(rq->cmd, cmdptr, hdr->request_len);
24945+
24946 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
24947 if (blk_verify_command(rq->cmd, has_write_perm))
24948 return -EPERM;
24949diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
24950index 7b72502..646105c 100644
24951--- a/block/compat_ioctl.c
24952+++ b/block/compat_ioctl.c
24953@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
24954 err |= __get_user(f->spec1, &uf->spec1);
24955 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
24956 err |= __get_user(name, &uf->name);
24957- f->name = compat_ptr(name);
24958+ f->name = (void __force_kernel *)compat_ptr(name);
24959 if (err) {
24960 err = -EFAULT;
24961 goto out;
24962diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
24963index 688be8a..8a37d98 100644
24964--- a/block/scsi_ioctl.c
24965+++ b/block/scsi_ioctl.c
24966@@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
24967 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
24968 struct sg_io_hdr *hdr, fmode_t mode)
24969 {
24970- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
24971+ unsigned char tmpcmd[sizeof(rq->__cmd)];
24972+ unsigned char *cmdptr;
24973+
24974+ if (rq->cmd != rq->__cmd)
24975+ cmdptr = rq->cmd;
24976+ else
24977+ cmdptr = tmpcmd;
24978+
24979+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
24980 return -EFAULT;
24981+
24982+ if (cmdptr != rq->cmd)
24983+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
24984+
24985 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
24986 return -EPERM;
24987
24988@@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
24989 int err;
24990 unsigned int in_len, out_len, bytes, opcode, cmdlen;
24991 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
24992+ unsigned char tmpcmd[sizeof(rq->__cmd)];
24993+ unsigned char *cmdptr;
24994
24995 if (!sic)
24996 return -EINVAL;
24997@@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
24998 */
24999 err = -EFAULT;
25000 rq->cmd_len = cmdlen;
25001- if (copy_from_user(rq->cmd, sic->data, cmdlen))
25002+
25003+ if (rq->cmd != rq->__cmd)
25004+ cmdptr = rq->cmd;
25005+ else
25006+ cmdptr = tmpcmd;
25007+
25008+ if (copy_from_user(cmdptr, sic->data, cmdlen))
25009 goto error;
25010
25011+ if (rq->cmd != cmdptr)
25012+ memcpy(rq->cmd, cmdptr, cmdlen);
25013+
25014 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
25015 goto error;
25016
25017diff --git a/crypto/cryptd.c b/crypto/cryptd.c
25018index 671d4d6..5f24030 100644
25019--- a/crypto/cryptd.c
25020+++ b/crypto/cryptd.c
25021@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
25022
25023 struct cryptd_blkcipher_request_ctx {
25024 crypto_completion_t complete;
25025-};
25026+} __no_const;
25027
25028 struct cryptd_hash_ctx {
25029 struct crypto_shash *child;
25030@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
25031
25032 struct cryptd_aead_request_ctx {
25033 crypto_completion_t complete;
25034-};
25035+} __no_const;
25036
25037 static void cryptd_queue_worker(struct work_struct *work);
25038
25039diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
25040index 5d41894..22021e4 100644
25041--- a/drivers/acpi/apei/cper.c
25042+++ b/drivers/acpi/apei/cper.c
25043@@ -38,12 +38,12 @@
25044 */
25045 u64 cper_next_record_id(void)
25046 {
25047- static atomic64_t seq;
25048+ static atomic64_unchecked_t seq;
25049
25050- if (!atomic64_read(&seq))
25051- atomic64_set(&seq, ((u64)get_seconds()) << 32);
25052+ if (!atomic64_read_unchecked(&seq))
25053+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
25054
25055- return atomic64_inc_return(&seq);
25056+ return atomic64_inc_return_unchecked(&seq);
25057 }
25058 EXPORT_SYMBOL_GPL(cper_next_record_id);
25059
25060diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
25061index 6c47ae9..abfdd63 100644
25062--- a/drivers/acpi/ec_sys.c
25063+++ b/drivers/acpi/ec_sys.c
25064@@ -12,6 +12,7 @@
25065 #include <linux/acpi.h>
25066 #include <linux/debugfs.h>
25067 #include <linux/module.h>
25068+#include <linux/uaccess.h>
25069 #include "internal.h"
25070
25071 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
25072@@ -40,7 +41,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
25073 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
25074 */
25075 unsigned int size = EC_SPACE_SIZE;
25076- u8 *data = (u8 *) buf;
25077+ u8 data;
25078 loff_t init_off = *off;
25079 int err = 0;
25080
25081@@ -53,9 +54,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
25082 size = count;
25083
25084 while (size) {
25085- err = ec_read(*off, &data[*off - init_off]);
25086+ err = ec_read(*off, &data);
25087 if (err)
25088 return err;
25089+ if (put_user(data, &buf[*off - init_off]))
25090+ return -EFAULT;
25091 *off += 1;
25092 size--;
25093 }
25094@@ -71,7 +74,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
25095
25096 unsigned int size = count;
25097 loff_t init_off = *off;
25098- u8 *data = (u8 *) buf;
25099 int err = 0;
25100
25101 if (*off >= EC_SPACE_SIZE)
25102@@ -82,7 +84,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
25103 }
25104
25105 while (size) {
25106- u8 byte_write = data[*off - init_off];
25107+ u8 byte_write;
25108+ if (get_user(byte_write, &buf[*off - init_off]))
25109+ return -EFAULT;
25110 err = ec_write(*off, byte_write);
25111 if (err)
25112 return err;
25113diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
25114index 251c7b62..000462d 100644
25115--- a/drivers/acpi/proc.c
25116+++ b/drivers/acpi/proc.c
25117@@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
25118 size_t count, loff_t * ppos)
25119 {
25120 struct list_head *node, *next;
25121- char strbuf[5];
25122- char str[5] = "";
25123- unsigned int len = count;
25124+ char strbuf[5] = {0};
25125
25126- if (len > 4)
25127- len = 4;
25128- if (len < 0)
25129+ if (count > 4)
25130+ count = 4;
25131+ if (copy_from_user(strbuf, buffer, count))
25132 return -EFAULT;
25133-
25134- if (copy_from_user(strbuf, buffer, len))
25135- return -EFAULT;
25136- strbuf[len] = '\0';
25137- sscanf(strbuf, "%s", str);
25138+ strbuf[count] = '\0';
25139
25140 mutex_lock(&acpi_device_lock);
25141 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
25142@@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
25143 if (!dev->wakeup.flags.valid)
25144 continue;
25145
25146- if (!strncmp(dev->pnp.bus_id, str, 4)) {
25147+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
25148 if (device_can_wakeup(&dev->dev)) {
25149 bool enable = !device_may_wakeup(&dev->dev);
25150 device_set_wakeup_enable(&dev->dev, enable);
25151diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
25152index 9d7bc9f..a6fc091 100644
25153--- a/drivers/acpi/processor_driver.c
25154+++ b/drivers/acpi/processor_driver.c
25155@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
25156 return 0;
25157 #endif
25158
25159- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
25160+ BUG_ON(pr->id >= nr_cpu_ids);
25161
25162 /*
25163 * Buggy BIOS check
25164diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
25165index c04ad68..0b99473 100644
25166--- a/drivers/ata/libata-core.c
25167+++ b/drivers/ata/libata-core.c
25168@@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
25169 struct ata_port *ap;
25170 unsigned int tag;
25171
25172- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25173+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25174 ap = qc->ap;
25175
25176 qc->flags = 0;
25177@@ -4749,7 +4749,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
25178 struct ata_port *ap;
25179 struct ata_link *link;
25180
25181- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25182+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
25183 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
25184 ap = qc->ap;
25185 link = qc->dev->link;
25186@@ -5754,6 +5754,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
25187 return;
25188
25189 spin_lock(&lock);
25190+ pax_open_kernel();
25191
25192 for (cur = ops->inherits; cur; cur = cur->inherits) {
25193 void **inherit = (void **)cur;
25194@@ -5767,8 +5768,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
25195 if (IS_ERR(*pp))
25196 *pp = NULL;
25197
25198- ops->inherits = NULL;
25199+ *(struct ata_port_operations **)&ops->inherits = NULL;
25200
25201+ pax_close_kernel();
25202 spin_unlock(&lock);
25203 }
25204
25205diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
25206index e8574bb..f9f6a72 100644
25207--- a/drivers/ata/pata_arasan_cf.c
25208+++ b/drivers/ata/pata_arasan_cf.c
25209@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
25210 /* Handle platform specific quirks */
25211 if (pdata->quirk) {
25212 if (pdata->quirk & CF_BROKEN_PIO) {
25213- ap->ops->set_piomode = NULL;
25214+ pax_open_kernel();
25215+ *(void **)&ap->ops->set_piomode = NULL;
25216+ pax_close_kernel();
25217 ap->pio_mask = 0;
25218 }
25219 if (pdata->quirk & CF_BROKEN_MWDMA)
25220diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
25221index f9b983a..887b9d8 100644
25222--- a/drivers/atm/adummy.c
25223+++ b/drivers/atm/adummy.c
25224@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
25225 vcc->pop(vcc, skb);
25226 else
25227 dev_kfree_skb_any(skb);
25228- atomic_inc(&vcc->stats->tx);
25229+ atomic_inc_unchecked(&vcc->stats->tx);
25230
25231 return 0;
25232 }
25233diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
25234index f8f41e0..1f987dd 100644
25235--- a/drivers/atm/ambassador.c
25236+++ b/drivers/atm/ambassador.c
25237@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
25238 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
25239
25240 // VC layer stats
25241- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
25242+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
25243
25244 // free the descriptor
25245 kfree (tx_descr);
25246@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
25247 dump_skb ("<<<", vc, skb);
25248
25249 // VC layer stats
25250- atomic_inc(&atm_vcc->stats->rx);
25251+ atomic_inc_unchecked(&atm_vcc->stats->rx);
25252 __net_timestamp(skb);
25253 // end of our responsibility
25254 atm_vcc->push (atm_vcc, skb);
25255@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
25256 } else {
25257 PRINTK (KERN_INFO, "dropped over-size frame");
25258 // should we count this?
25259- atomic_inc(&atm_vcc->stats->rx_drop);
25260+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
25261 }
25262
25263 } else {
25264@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
25265 }
25266
25267 if (check_area (skb->data, skb->len)) {
25268- atomic_inc(&atm_vcc->stats->tx_err);
25269+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
25270 return -ENOMEM; // ?
25271 }
25272
25273diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
25274index b22d71c..d6e1049 100644
25275--- a/drivers/atm/atmtcp.c
25276+++ b/drivers/atm/atmtcp.c
25277@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
25278 if (vcc->pop) vcc->pop(vcc,skb);
25279 else dev_kfree_skb(skb);
25280 if (dev_data) return 0;
25281- atomic_inc(&vcc->stats->tx_err);
25282+ atomic_inc_unchecked(&vcc->stats->tx_err);
25283 return -ENOLINK;
25284 }
25285 size = skb->len+sizeof(struct atmtcp_hdr);
25286@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
25287 if (!new_skb) {
25288 if (vcc->pop) vcc->pop(vcc,skb);
25289 else dev_kfree_skb(skb);
25290- atomic_inc(&vcc->stats->tx_err);
25291+ atomic_inc_unchecked(&vcc->stats->tx_err);
25292 return -ENOBUFS;
25293 }
25294 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
25295@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
25296 if (vcc->pop) vcc->pop(vcc,skb);
25297 else dev_kfree_skb(skb);
25298 out_vcc->push(out_vcc,new_skb);
25299- atomic_inc(&vcc->stats->tx);
25300- atomic_inc(&out_vcc->stats->rx);
25301+ atomic_inc_unchecked(&vcc->stats->tx);
25302+ atomic_inc_unchecked(&out_vcc->stats->rx);
25303 return 0;
25304 }
25305
25306@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
25307 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
25308 read_unlock(&vcc_sklist_lock);
25309 if (!out_vcc) {
25310- atomic_inc(&vcc->stats->tx_err);
25311+ atomic_inc_unchecked(&vcc->stats->tx_err);
25312 goto done;
25313 }
25314 skb_pull(skb,sizeof(struct atmtcp_hdr));
25315@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
25316 __net_timestamp(new_skb);
25317 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
25318 out_vcc->push(out_vcc,new_skb);
25319- atomic_inc(&vcc->stats->tx);
25320- atomic_inc(&out_vcc->stats->rx);
25321+ atomic_inc_unchecked(&vcc->stats->tx);
25322+ atomic_inc_unchecked(&out_vcc->stats->rx);
25323 done:
25324 if (vcc->pop) vcc->pop(vcc,skb);
25325 else dev_kfree_skb(skb);
25326diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
25327index 956e9ac..133516d 100644
25328--- a/drivers/atm/eni.c
25329+++ b/drivers/atm/eni.c
25330@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
25331 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
25332 vcc->dev->number);
25333 length = 0;
25334- atomic_inc(&vcc->stats->rx_err);
25335+ atomic_inc_unchecked(&vcc->stats->rx_err);
25336 }
25337 else {
25338 length = ATM_CELL_SIZE-1; /* no HEC */
25339@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
25340 size);
25341 }
25342 eff = length = 0;
25343- atomic_inc(&vcc->stats->rx_err);
25344+ atomic_inc_unchecked(&vcc->stats->rx_err);
25345 }
25346 else {
25347 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
25348@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
25349 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
25350 vcc->dev->number,vcc->vci,length,size << 2,descr);
25351 length = eff = 0;
25352- atomic_inc(&vcc->stats->rx_err);
25353+ atomic_inc_unchecked(&vcc->stats->rx_err);
25354 }
25355 }
25356 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
25357@@ -771,7 +771,7 @@ rx_dequeued++;
25358 vcc->push(vcc,skb);
25359 pushed++;
25360 }
25361- atomic_inc(&vcc->stats->rx);
25362+ atomic_inc_unchecked(&vcc->stats->rx);
25363 }
25364 wake_up(&eni_dev->rx_wait);
25365 }
25366@@ -1229,7 +1229,7 @@ static void dequeue_tx(struct atm_dev *dev)
25367 PCI_DMA_TODEVICE);
25368 if (vcc->pop) vcc->pop(vcc,skb);
25369 else dev_kfree_skb_irq(skb);
25370- atomic_inc(&vcc->stats->tx);
25371+ atomic_inc_unchecked(&vcc->stats->tx);
25372 wake_up(&eni_dev->tx_wait);
25373 dma_complete++;
25374 }
25375@@ -1569,7 +1569,7 @@ tx_complete++;
25376 /*--------------------------------- entries ---------------------------------*/
25377
25378
25379-static const char *media_name[] __devinitdata = {
25380+static const char *media_name[] __devinitconst = {
25381 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
25382 "UTP", "05?", "06?", "07?", /* 4- 7 */
25383 "TAXI","09?", "10?", "11?", /* 8-11 */
25384diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
25385index 5072f8a..fa52520d 100644
25386--- a/drivers/atm/firestream.c
25387+++ b/drivers/atm/firestream.c
25388@@ -750,7 +750,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
25389 }
25390 }
25391
25392- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
25393+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
25394
25395 fs_dprintk (FS_DEBUG_TXMEM, "i");
25396 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
25397@@ -817,7 +817,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
25398 #endif
25399 skb_put (skb, qe->p1 & 0xffff);
25400 ATM_SKB(skb)->vcc = atm_vcc;
25401- atomic_inc(&atm_vcc->stats->rx);
25402+ atomic_inc_unchecked(&atm_vcc->stats->rx);
25403 __net_timestamp(skb);
25404 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
25405 atm_vcc->push (atm_vcc, skb);
25406@@ -838,12 +838,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
25407 kfree (pe);
25408 }
25409 if (atm_vcc)
25410- atomic_inc(&atm_vcc->stats->rx_drop);
25411+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
25412 break;
25413 case 0x1f: /* Reassembly abort: no buffers. */
25414 /* Silently increment error counter. */
25415 if (atm_vcc)
25416- atomic_inc(&atm_vcc->stats->rx_drop);
25417+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
25418 break;
25419 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
25420 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
25421diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
25422index 361f5ae..7fc552d 100644
25423--- a/drivers/atm/fore200e.c
25424+++ b/drivers/atm/fore200e.c
25425@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
25426 #endif
25427 /* check error condition */
25428 if (*entry->status & STATUS_ERROR)
25429- atomic_inc(&vcc->stats->tx_err);
25430+ atomic_inc_unchecked(&vcc->stats->tx_err);
25431 else
25432- atomic_inc(&vcc->stats->tx);
25433+ atomic_inc_unchecked(&vcc->stats->tx);
25434 }
25435 }
25436
25437@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
25438 if (skb == NULL) {
25439 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
25440
25441- atomic_inc(&vcc->stats->rx_drop);
25442+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25443 return -ENOMEM;
25444 }
25445
25446@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
25447
25448 dev_kfree_skb_any(skb);
25449
25450- atomic_inc(&vcc->stats->rx_drop);
25451+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25452 return -ENOMEM;
25453 }
25454
25455 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
25456
25457 vcc->push(vcc, skb);
25458- atomic_inc(&vcc->stats->rx);
25459+ atomic_inc_unchecked(&vcc->stats->rx);
25460
25461 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
25462
25463@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
25464 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
25465 fore200e->atm_dev->number,
25466 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
25467- atomic_inc(&vcc->stats->rx_err);
25468+ atomic_inc_unchecked(&vcc->stats->rx_err);
25469 }
25470 }
25471
25472@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
25473 goto retry_here;
25474 }
25475
25476- atomic_inc(&vcc->stats->tx_err);
25477+ atomic_inc_unchecked(&vcc->stats->tx_err);
25478
25479 fore200e->tx_sat++;
25480 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
25481diff --git a/drivers/atm/he.c b/drivers/atm/he.c
25482index 9a51df4..f3bb5f8 100644
25483--- a/drivers/atm/he.c
25484+++ b/drivers/atm/he.c
25485@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
25486
25487 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
25488 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
25489- atomic_inc(&vcc->stats->rx_drop);
25490+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25491 goto return_host_buffers;
25492 }
25493
25494@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
25495 RBRQ_LEN_ERR(he_dev->rbrq_head)
25496 ? "LEN_ERR" : "",
25497 vcc->vpi, vcc->vci);
25498- atomic_inc(&vcc->stats->rx_err);
25499+ atomic_inc_unchecked(&vcc->stats->rx_err);
25500 goto return_host_buffers;
25501 }
25502
25503@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
25504 vcc->push(vcc, skb);
25505 spin_lock(&he_dev->global_lock);
25506
25507- atomic_inc(&vcc->stats->rx);
25508+ atomic_inc_unchecked(&vcc->stats->rx);
25509
25510 return_host_buffers:
25511 ++pdus_assembled;
25512@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
25513 tpd->vcc->pop(tpd->vcc, tpd->skb);
25514 else
25515 dev_kfree_skb_any(tpd->skb);
25516- atomic_inc(&tpd->vcc->stats->tx_err);
25517+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
25518 }
25519 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
25520 return;
25521@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25522 vcc->pop(vcc, skb);
25523 else
25524 dev_kfree_skb_any(skb);
25525- atomic_inc(&vcc->stats->tx_err);
25526+ atomic_inc_unchecked(&vcc->stats->tx_err);
25527 return -EINVAL;
25528 }
25529
25530@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25531 vcc->pop(vcc, skb);
25532 else
25533 dev_kfree_skb_any(skb);
25534- atomic_inc(&vcc->stats->tx_err);
25535+ atomic_inc_unchecked(&vcc->stats->tx_err);
25536 return -EINVAL;
25537 }
25538 #endif
25539@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25540 vcc->pop(vcc, skb);
25541 else
25542 dev_kfree_skb_any(skb);
25543- atomic_inc(&vcc->stats->tx_err);
25544+ atomic_inc_unchecked(&vcc->stats->tx_err);
25545 spin_unlock_irqrestore(&he_dev->global_lock, flags);
25546 return -ENOMEM;
25547 }
25548@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25549 vcc->pop(vcc, skb);
25550 else
25551 dev_kfree_skb_any(skb);
25552- atomic_inc(&vcc->stats->tx_err);
25553+ atomic_inc_unchecked(&vcc->stats->tx_err);
25554 spin_unlock_irqrestore(&he_dev->global_lock, flags);
25555 return -ENOMEM;
25556 }
25557@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
25558 __enqueue_tpd(he_dev, tpd, cid);
25559 spin_unlock_irqrestore(&he_dev->global_lock, flags);
25560
25561- atomic_inc(&vcc->stats->tx);
25562+ atomic_inc_unchecked(&vcc->stats->tx);
25563
25564 return 0;
25565 }
25566diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
25567index b812103..e391a49 100644
25568--- a/drivers/atm/horizon.c
25569+++ b/drivers/atm/horizon.c
25570@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
25571 {
25572 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
25573 // VC layer stats
25574- atomic_inc(&vcc->stats->rx);
25575+ atomic_inc_unchecked(&vcc->stats->rx);
25576 __net_timestamp(skb);
25577 // end of our responsibility
25578 vcc->push (vcc, skb);
25579@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
25580 dev->tx_iovec = NULL;
25581
25582 // VC layer stats
25583- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
25584+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
25585
25586 // free the skb
25587 hrz_kfree_skb (skb);
25588diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
25589index 1c05212..c28e200 100644
25590--- a/drivers/atm/idt77252.c
25591+++ b/drivers/atm/idt77252.c
25592@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
25593 else
25594 dev_kfree_skb(skb);
25595
25596- atomic_inc(&vcc->stats->tx);
25597+ atomic_inc_unchecked(&vcc->stats->tx);
25598 }
25599
25600 atomic_dec(&scq->used);
25601@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25602 if ((sb = dev_alloc_skb(64)) == NULL) {
25603 printk("%s: Can't allocate buffers for aal0.\n",
25604 card->name);
25605- atomic_add(i, &vcc->stats->rx_drop);
25606+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
25607 break;
25608 }
25609 if (!atm_charge(vcc, sb->truesize)) {
25610 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
25611 card->name);
25612- atomic_add(i - 1, &vcc->stats->rx_drop);
25613+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
25614 dev_kfree_skb(sb);
25615 break;
25616 }
25617@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25618 ATM_SKB(sb)->vcc = vcc;
25619 __net_timestamp(sb);
25620 vcc->push(vcc, sb);
25621- atomic_inc(&vcc->stats->rx);
25622+ atomic_inc_unchecked(&vcc->stats->rx);
25623
25624 cell += ATM_CELL_PAYLOAD;
25625 }
25626@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25627 "(CDC: %08x)\n",
25628 card->name, len, rpp->len, readl(SAR_REG_CDC));
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 (stat & SAR_RSQE_CRC) {
25635 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
25636 recycle_rx_pool_skb(card, rpp);
25637- atomic_inc(&vcc->stats->rx_err);
25638+ atomic_inc_unchecked(&vcc->stats->rx_err);
25639 return;
25640 }
25641 if (skb_queue_len(&rpp->queue) > 1) {
25642@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25643 RXPRINTK("%s: Can't alloc RX skb.\n",
25644 card->name);
25645 recycle_rx_pool_skb(card, rpp);
25646- atomic_inc(&vcc->stats->rx_err);
25647+ atomic_inc_unchecked(&vcc->stats->rx_err);
25648 return;
25649 }
25650 if (!atm_charge(vcc, skb->truesize)) {
25651@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25652 __net_timestamp(skb);
25653
25654 vcc->push(vcc, skb);
25655- atomic_inc(&vcc->stats->rx);
25656+ atomic_inc_unchecked(&vcc->stats->rx);
25657
25658 return;
25659 }
25660@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
25661 __net_timestamp(skb);
25662
25663 vcc->push(vcc, skb);
25664- atomic_inc(&vcc->stats->rx);
25665+ atomic_inc_unchecked(&vcc->stats->rx);
25666
25667 if (skb->truesize > SAR_FB_SIZE_3)
25668 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
25669@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
25670 if (vcc->qos.aal != ATM_AAL0) {
25671 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
25672 card->name, vpi, vci);
25673- atomic_inc(&vcc->stats->rx_drop);
25674+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25675 goto drop;
25676 }
25677
25678 if ((sb = dev_alloc_skb(64)) == NULL) {
25679 printk("%s: Can't allocate buffers for AAL0.\n",
25680 card->name);
25681- atomic_inc(&vcc->stats->rx_err);
25682+ atomic_inc_unchecked(&vcc->stats->rx_err);
25683 goto drop;
25684 }
25685
25686@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
25687 ATM_SKB(sb)->vcc = vcc;
25688 __net_timestamp(sb);
25689 vcc->push(vcc, sb);
25690- atomic_inc(&vcc->stats->rx);
25691+ atomic_inc_unchecked(&vcc->stats->rx);
25692
25693 drop:
25694 skb_pull(queue, 64);
25695@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
25696
25697 if (vc == NULL) {
25698 printk("%s: NULL connection in send().\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 if (!test_bit(VCF_TX, &vc->flags)) {
25705 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
25706- atomic_inc(&vcc->stats->tx_err);
25707+ atomic_inc_unchecked(&vcc->stats->tx_err);
25708 dev_kfree_skb(skb);
25709 return -EINVAL;
25710 }
25711@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
25712 break;
25713 default:
25714 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
25715- atomic_inc(&vcc->stats->tx_err);
25716+ atomic_inc_unchecked(&vcc->stats->tx_err);
25717 dev_kfree_skb(skb);
25718 return -EINVAL;
25719 }
25720
25721 if (skb_shinfo(skb)->nr_frags != 0) {
25722 printk("%s: No scatter-gather yet.\n", card->name);
25723- atomic_inc(&vcc->stats->tx_err);
25724+ atomic_inc_unchecked(&vcc->stats->tx_err);
25725 dev_kfree_skb(skb);
25726 return -EINVAL;
25727 }
25728@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
25729
25730 err = queue_skb(card, vc, skb, oam);
25731 if (err) {
25732- atomic_inc(&vcc->stats->tx_err);
25733+ atomic_inc_unchecked(&vcc->stats->tx_err);
25734 dev_kfree_skb(skb);
25735 return err;
25736 }
25737@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
25738 skb = dev_alloc_skb(64);
25739 if (!skb) {
25740 printk("%s: Out of memory in send_oam().\n", card->name);
25741- atomic_inc(&vcc->stats->tx_err);
25742+ atomic_inc_unchecked(&vcc->stats->tx_err);
25743 return -ENOMEM;
25744 }
25745 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
25746diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
25747index 3d0c2b0..45441fa 100644
25748--- a/drivers/atm/iphase.c
25749+++ b/drivers/atm/iphase.c
25750@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
25751 status = (u_short) (buf_desc_ptr->desc_mode);
25752 if (status & (RX_CER | RX_PTE | RX_OFL))
25753 {
25754- atomic_inc(&vcc->stats->rx_err);
25755+ atomic_inc_unchecked(&vcc->stats->rx_err);
25756 IF_ERR(printk("IA: bad packet, dropping it");)
25757 if (status & RX_CER) {
25758 IF_ERR(printk(" cause: packet CRC error\n");)
25759@@ -1169,7 +1169,7 @@ static int rx_pkt(struct atm_dev *dev)
25760 len = dma_addr - buf_addr;
25761 if (len > iadev->rx_buf_sz) {
25762 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
25763- atomic_inc(&vcc->stats->rx_err);
25764+ atomic_inc_unchecked(&vcc->stats->rx_err);
25765 goto out_free_desc;
25766 }
25767
25768@@ -1319,7 +1319,7 @@ static void rx_dle_intr(struct atm_dev *dev)
25769 ia_vcc = INPH_IA_VCC(vcc);
25770 if (ia_vcc == NULL)
25771 {
25772- atomic_inc(&vcc->stats->rx_err);
25773+ atomic_inc_unchecked(&vcc->stats->rx_err);
25774 dev_kfree_skb_any(skb);
25775 atm_return(vcc, atm_guess_pdu2truesize(len));
25776 goto INCR_DLE;
25777@@ -1331,7 +1331,7 @@ static void rx_dle_intr(struct atm_dev *dev)
25778 if ((length > iadev->rx_buf_sz) || (length >
25779 (skb->len - sizeof(struct cpcs_trailer))))
25780 {
25781- atomic_inc(&vcc->stats->rx_err);
25782+ atomic_inc_unchecked(&vcc->stats->rx_err);
25783 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
25784 length, skb->len);)
25785 dev_kfree_skb_any(skb);
25786@@ -1347,7 +1347,7 @@ static void rx_dle_intr(struct atm_dev *dev)
25787
25788 IF_RX(printk("rx_dle_intr: skb push");)
25789 vcc->push(vcc,skb);
25790- atomic_inc(&vcc->stats->rx);
25791+ atomic_inc_unchecked(&vcc->stats->rx);
25792 iadev->rx_pkt_cnt++;
25793 }
25794 INCR_DLE:
25795@@ -2827,15 +2827,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
25796 {
25797 struct k_sonet_stats *stats;
25798 stats = &PRIV(_ia_dev[board])->sonet_stats;
25799- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
25800- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
25801- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
25802- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
25803- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
25804- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
25805- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
25806- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
25807- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
25808+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
25809+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
25810+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
25811+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
25812+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
25813+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
25814+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
25815+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
25816+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
25817 }
25818 ia_cmds.status = 0;
25819 break;
25820@@ -2940,7 +2940,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
25821 if ((desc == 0) || (desc > iadev->num_tx_desc))
25822 {
25823 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
25824- atomic_inc(&vcc->stats->tx);
25825+ atomic_inc_unchecked(&vcc->stats->tx);
25826 if (vcc->pop)
25827 vcc->pop(vcc, skb);
25828 else
25829@@ -3045,14 +3045,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
25830 ATM_DESC(skb) = vcc->vci;
25831 skb_queue_tail(&iadev->tx_dma_q, skb);
25832
25833- atomic_inc(&vcc->stats->tx);
25834+ atomic_inc_unchecked(&vcc->stats->tx);
25835 iadev->tx_pkt_cnt++;
25836 /* Increment transaction counter */
25837 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
25838
25839 #if 0
25840 /* add flow control logic */
25841- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
25842+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
25843 if (iavcc->vc_desc_cnt > 10) {
25844 vcc->tx_quota = vcc->tx_quota * 3 / 4;
25845 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
25846diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
25847index f556969..0da15eb 100644
25848--- a/drivers/atm/lanai.c
25849+++ b/drivers/atm/lanai.c
25850@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
25851 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
25852 lanai_endtx(lanai, lvcc);
25853 lanai_free_skb(lvcc->tx.atmvcc, skb);
25854- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
25855+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
25856 }
25857
25858 /* Try to fill the buffer - don't call unless there is backlog */
25859@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
25860 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
25861 __net_timestamp(skb);
25862 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
25863- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
25864+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
25865 out:
25866 lvcc->rx.buf.ptr = end;
25867 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
25868@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
25869 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
25870 "vcc %d\n", lanai->number, (unsigned int) s, vci);
25871 lanai->stats.service_rxnotaal5++;
25872- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
25873+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
25874 return 0;
25875 }
25876 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
25877@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
25878 int bytes;
25879 read_unlock(&vcc_sklist_lock);
25880 DPRINTK("got trashed rx pdu on vci %d\n", vci);
25881- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
25882+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
25883 lvcc->stats.x.aal5.service_trash++;
25884 bytes = (SERVICE_GET_END(s) * 16) -
25885 (((unsigned long) lvcc->rx.buf.ptr) -
25886@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
25887 }
25888 if (s & SERVICE_STREAM) {
25889 read_unlock(&vcc_sklist_lock);
25890- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
25891+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
25892 lvcc->stats.x.aal5.service_stream++;
25893 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
25894 "PDU on VCI %d!\n", lanai->number, vci);
25895@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
25896 return 0;
25897 }
25898 DPRINTK("got rx crc error on vci %d\n", vci);
25899- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
25900+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
25901 lvcc->stats.x.aal5.service_rxcrc++;
25902 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
25903 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
25904diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
25905index 1c70c45..300718d 100644
25906--- a/drivers/atm/nicstar.c
25907+++ b/drivers/atm/nicstar.c
25908@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
25909 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
25910 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
25911 card->index);
25912- atomic_inc(&vcc->stats->tx_err);
25913+ atomic_inc_unchecked(&vcc->stats->tx_err);
25914 dev_kfree_skb_any(skb);
25915 return -EINVAL;
25916 }
25917@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
25918 if (!vc->tx) {
25919 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
25920 card->index);
25921- atomic_inc(&vcc->stats->tx_err);
25922+ atomic_inc_unchecked(&vcc->stats->tx_err);
25923 dev_kfree_skb_any(skb);
25924 return -EINVAL;
25925 }
25926@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
25927 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
25928 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
25929 card->index);
25930- atomic_inc(&vcc->stats->tx_err);
25931+ atomic_inc_unchecked(&vcc->stats->tx_err);
25932 dev_kfree_skb_any(skb);
25933 return -EINVAL;
25934 }
25935
25936 if (skb_shinfo(skb)->nr_frags != 0) {
25937 printk("nicstar%d: No scatter-gather yet.\n", card->index);
25938- atomic_inc(&vcc->stats->tx_err);
25939+ atomic_inc_unchecked(&vcc->stats->tx_err);
25940 dev_kfree_skb_any(skb);
25941 return -EINVAL;
25942 }
25943@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
25944 }
25945
25946 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
25947- atomic_inc(&vcc->stats->tx_err);
25948+ atomic_inc_unchecked(&vcc->stats->tx_err);
25949 dev_kfree_skb_any(skb);
25950 return -EIO;
25951 }
25952- atomic_inc(&vcc->stats->tx);
25953+ atomic_inc_unchecked(&vcc->stats->tx);
25954
25955 return 0;
25956 }
25957@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25958 printk
25959 ("nicstar%d: Can't allocate buffers for aal0.\n",
25960 card->index);
25961- atomic_add(i, &vcc->stats->rx_drop);
25962+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
25963 break;
25964 }
25965 if (!atm_charge(vcc, sb->truesize)) {
25966 RXPRINTK
25967 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
25968 card->index);
25969- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
25970+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
25971 dev_kfree_skb_any(sb);
25972 break;
25973 }
25974@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25975 ATM_SKB(sb)->vcc = vcc;
25976 __net_timestamp(sb);
25977 vcc->push(vcc, sb);
25978- atomic_inc(&vcc->stats->rx);
25979+ atomic_inc_unchecked(&vcc->stats->rx);
25980 cell += ATM_CELL_PAYLOAD;
25981 }
25982
25983@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25984 if (iovb == NULL) {
25985 printk("nicstar%d: Out of iovec buffers.\n",
25986 card->index);
25987- atomic_inc(&vcc->stats->rx_drop);
25988+ atomic_inc_unchecked(&vcc->stats->rx_drop);
25989 recycle_rx_buf(card, skb);
25990 return;
25991 }
25992@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
25993 small or large buffer itself. */
25994 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
25995 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
25996- atomic_inc(&vcc->stats->rx_err);
25997+ atomic_inc_unchecked(&vcc->stats->rx_err);
25998 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
25999 NS_MAX_IOVECS);
26000 NS_PRV_IOVCNT(iovb) = 0;
26001@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26002 ("nicstar%d: Expected a small buffer, and this is not one.\n",
26003 card->index);
26004 which_list(card, skb);
26005- atomic_inc(&vcc->stats->rx_err);
26006+ atomic_inc_unchecked(&vcc->stats->rx_err);
26007 recycle_rx_buf(card, skb);
26008 vc->rx_iov = NULL;
26009 recycle_iov_buf(card, iovb);
26010@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26011 ("nicstar%d: Expected a large buffer, and this is not one.\n",
26012 card->index);
26013 which_list(card, skb);
26014- atomic_inc(&vcc->stats->rx_err);
26015+ atomic_inc_unchecked(&vcc->stats->rx_err);
26016 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
26017 NS_PRV_IOVCNT(iovb));
26018 vc->rx_iov = NULL;
26019@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26020 printk(" - PDU size mismatch.\n");
26021 else
26022 printk(".\n");
26023- atomic_inc(&vcc->stats->rx_err);
26024+ atomic_inc_unchecked(&vcc->stats->rx_err);
26025 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
26026 NS_PRV_IOVCNT(iovb));
26027 vc->rx_iov = NULL;
26028@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26029 /* skb points to a small buffer */
26030 if (!atm_charge(vcc, skb->truesize)) {
26031 push_rxbufs(card, skb);
26032- atomic_inc(&vcc->stats->rx_drop);
26033+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26034 } else {
26035 skb_put(skb, len);
26036 dequeue_sm_buf(card, skb);
26037@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26038 ATM_SKB(skb)->vcc = vcc;
26039 __net_timestamp(skb);
26040 vcc->push(vcc, skb);
26041- atomic_inc(&vcc->stats->rx);
26042+ atomic_inc_unchecked(&vcc->stats->rx);
26043 }
26044 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
26045 struct sk_buff *sb;
26046@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26047 if (len <= NS_SMBUFSIZE) {
26048 if (!atm_charge(vcc, sb->truesize)) {
26049 push_rxbufs(card, sb);
26050- atomic_inc(&vcc->stats->rx_drop);
26051+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26052 } else {
26053 skb_put(sb, len);
26054 dequeue_sm_buf(card, sb);
26055@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26056 ATM_SKB(sb)->vcc = vcc;
26057 __net_timestamp(sb);
26058 vcc->push(vcc, sb);
26059- atomic_inc(&vcc->stats->rx);
26060+ atomic_inc_unchecked(&vcc->stats->rx);
26061 }
26062
26063 push_rxbufs(card, skb);
26064@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26065
26066 if (!atm_charge(vcc, skb->truesize)) {
26067 push_rxbufs(card, skb);
26068- atomic_inc(&vcc->stats->rx_drop);
26069+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26070 } else {
26071 dequeue_lg_buf(card, skb);
26072 #ifdef NS_USE_DESTRUCTORS
26073@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26074 ATM_SKB(skb)->vcc = vcc;
26075 __net_timestamp(skb);
26076 vcc->push(vcc, skb);
26077- atomic_inc(&vcc->stats->rx);
26078+ atomic_inc_unchecked(&vcc->stats->rx);
26079 }
26080
26081 push_rxbufs(card, sb);
26082@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26083 printk
26084 ("nicstar%d: Out of huge buffers.\n",
26085 card->index);
26086- atomic_inc(&vcc->stats->rx_drop);
26087+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26088 recycle_iovec_rx_bufs(card,
26089 (struct iovec *)
26090 iovb->data,
26091@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26092 card->hbpool.count++;
26093 } else
26094 dev_kfree_skb_any(hb);
26095- atomic_inc(&vcc->stats->rx_drop);
26096+ atomic_inc_unchecked(&vcc->stats->rx_drop);
26097 } else {
26098 /* Copy the small buffer to the huge buffer */
26099 sb = (struct sk_buff *)iov->iov_base;
26100@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
26101 #endif /* NS_USE_DESTRUCTORS */
26102 __net_timestamp(hb);
26103 vcc->push(vcc, hb);
26104- atomic_inc(&vcc->stats->rx);
26105+ atomic_inc_unchecked(&vcc->stats->rx);
26106 }
26107 }
26108
26109diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
26110index 5d1d076..12fbca4 100644
26111--- a/drivers/atm/solos-pci.c
26112+++ b/drivers/atm/solos-pci.c
26113@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
26114 }
26115 atm_charge(vcc, skb->truesize);
26116 vcc->push(vcc, skb);
26117- atomic_inc(&vcc->stats->rx);
26118+ atomic_inc_unchecked(&vcc->stats->rx);
26119 break;
26120
26121 case PKT_STATUS:
26122@@ -1008,7 +1008,7 @@ static uint32_t fpga_tx(struct solos_card *card)
26123 vcc = SKB_CB(oldskb)->vcc;
26124
26125 if (vcc) {
26126- atomic_inc(&vcc->stats->tx);
26127+ atomic_inc_unchecked(&vcc->stats->tx);
26128 solos_pop(vcc, oldskb);
26129 } else
26130 dev_kfree_skb_irq(oldskb);
26131diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
26132index 90f1ccc..04c4a1e 100644
26133--- a/drivers/atm/suni.c
26134+++ b/drivers/atm/suni.c
26135@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
26136
26137
26138 #define ADD_LIMITED(s,v) \
26139- atomic_add((v),&stats->s); \
26140- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
26141+ atomic_add_unchecked((v),&stats->s); \
26142+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
26143
26144
26145 static void suni_hz(unsigned long from_timer)
26146diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
26147index 5120a96..e2572bd 100644
26148--- a/drivers/atm/uPD98402.c
26149+++ b/drivers/atm/uPD98402.c
26150@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
26151 struct sonet_stats tmp;
26152 int error = 0;
26153
26154- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
26155+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
26156 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
26157 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
26158 if (zero && !error) {
26159@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
26160
26161
26162 #define ADD_LIMITED(s,v) \
26163- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
26164- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
26165- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
26166+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
26167+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
26168+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
26169
26170
26171 static void stat_event(struct atm_dev *dev)
26172@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
26173 if (reason & uPD98402_INT_PFM) stat_event(dev);
26174 if (reason & uPD98402_INT_PCO) {
26175 (void) GET(PCOCR); /* clear interrupt cause */
26176- atomic_add(GET(HECCT),
26177+ atomic_add_unchecked(GET(HECCT),
26178 &PRIV(dev)->sonet_stats.uncorr_hcs);
26179 }
26180 if ((reason & uPD98402_INT_RFO) &&
26181@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
26182 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
26183 uPD98402_INT_LOS),PIMR); /* enable them */
26184 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
26185- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
26186- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
26187- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
26188+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
26189+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
26190+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
26191 return 0;
26192 }
26193
26194diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
26195index d889f56..17eb71e 100644
26196--- a/drivers/atm/zatm.c
26197+++ b/drivers/atm/zatm.c
26198@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
26199 }
26200 if (!size) {
26201 dev_kfree_skb_irq(skb);
26202- if (vcc) atomic_inc(&vcc->stats->rx_err);
26203+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
26204 continue;
26205 }
26206 if (!atm_charge(vcc,skb->truesize)) {
26207@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
26208 skb->len = size;
26209 ATM_SKB(skb)->vcc = vcc;
26210 vcc->push(vcc,skb);
26211- atomic_inc(&vcc->stats->rx);
26212+ atomic_inc_unchecked(&vcc->stats->rx);
26213 }
26214 zout(pos & 0xffff,MTA(mbx));
26215 #if 0 /* probably a stupid idea */
26216@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
26217 skb_queue_head(&zatm_vcc->backlog,skb);
26218 break;
26219 }
26220- atomic_inc(&vcc->stats->tx);
26221+ atomic_inc_unchecked(&vcc->stats->tx);
26222 wake_up(&zatm_vcc->tx_wait);
26223 }
26224
26225diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
26226index a4760e0..51283cf 100644
26227--- a/drivers/base/devtmpfs.c
26228+++ b/drivers/base/devtmpfs.c
26229@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
26230 if (!thread)
26231 return 0;
26232
26233- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
26234+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
26235 if (err)
26236 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
26237 else
26238diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
26239index caf995f..6f76697 100644
26240--- a/drivers/base/power/wakeup.c
26241+++ b/drivers/base/power/wakeup.c
26242@@ -30,14 +30,14 @@ bool events_check_enabled;
26243 * They need to be modified together atomically, so it's better to use one
26244 * atomic variable to hold them both.
26245 */
26246-static atomic_t combined_event_count = ATOMIC_INIT(0);
26247+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
26248
26249 #define IN_PROGRESS_BITS (sizeof(int) * 4)
26250 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
26251
26252 static void split_counters(unsigned int *cnt, unsigned int *inpr)
26253 {
26254- unsigned int comb = atomic_read(&combined_event_count);
26255+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
26256
26257 *cnt = (comb >> IN_PROGRESS_BITS);
26258 *inpr = comb & MAX_IN_PROGRESS;
26259@@ -353,7 +353,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
26260 ws->last_time = ktime_get();
26261
26262 /* Increment the counter of events in progress. */
26263- atomic_inc(&combined_event_count);
26264+ atomic_inc_unchecked(&combined_event_count);
26265 }
26266
26267 /**
26268@@ -443,7 +443,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
26269 * Increment the counter of registered wakeup events and decrement the
26270 * couter of wakeup events in progress simultaneously.
26271 */
26272- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
26273+ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
26274 }
26275
26276 /**
26277diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
26278index b0f553b..77b928b 100644
26279--- a/drivers/block/cciss.c
26280+++ b/drivers/block/cciss.c
26281@@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
26282 int err;
26283 u32 cp;
26284
26285+ memset(&arg64, 0, sizeof(arg64));
26286+
26287 err = 0;
26288 err |=
26289 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
26290@@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
26291 while (!list_empty(&h->reqQ)) {
26292 c = list_entry(h->reqQ.next, CommandList_struct, list);
26293 /* can't do anything if fifo is full */
26294- if ((h->access.fifo_full(h))) {
26295+ if ((h->access->fifo_full(h))) {
26296 dev_warn(&h->pdev->dev, "fifo full\n");
26297 break;
26298 }
26299@@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
26300 h->Qdepth--;
26301
26302 /* Tell the controller execute command */
26303- h->access.submit_command(h, c);
26304+ h->access->submit_command(h, c);
26305
26306 /* Put job onto the completed Q */
26307 addQ(&h->cmpQ, c);
26308@@ -3443,17 +3445,17 @@ startio:
26309
26310 static inline unsigned long get_next_completion(ctlr_info_t *h)
26311 {
26312- return h->access.command_completed(h);
26313+ return h->access->command_completed(h);
26314 }
26315
26316 static inline int interrupt_pending(ctlr_info_t *h)
26317 {
26318- return h->access.intr_pending(h);
26319+ return h->access->intr_pending(h);
26320 }
26321
26322 static inline long interrupt_not_for_us(ctlr_info_t *h)
26323 {
26324- return ((h->access.intr_pending(h) == 0) ||
26325+ return ((h->access->intr_pending(h) == 0) ||
26326 (h->interrupts_enabled == 0));
26327 }
26328
26329@@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
26330 u32 a;
26331
26332 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
26333- return h->access.command_completed(h);
26334+ return h->access->command_completed(h);
26335
26336 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
26337 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
26338@@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
26339 trans_support & CFGTBL_Trans_use_short_tags);
26340
26341 /* Change the access methods to the performant access methods */
26342- h->access = SA5_performant_access;
26343+ h->access = &SA5_performant_access;
26344 h->transMethod = CFGTBL_Trans_Performant;
26345
26346 return;
26347@@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
26348 if (prod_index < 0)
26349 return -ENODEV;
26350 h->product_name = products[prod_index].product_name;
26351- h->access = *(products[prod_index].access);
26352+ h->access = products[prod_index].access;
26353
26354 if (cciss_board_disabled(h)) {
26355 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
26356@@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
26357 }
26358
26359 /* make sure the board interrupts are off */
26360- h->access.set_intr_mask(h, CCISS_INTR_OFF);
26361+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
26362 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
26363 if (rc)
26364 goto clean2;
26365@@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
26366 * fake ones to scoop up any residual completions.
26367 */
26368 spin_lock_irqsave(&h->lock, flags);
26369- h->access.set_intr_mask(h, CCISS_INTR_OFF);
26370+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
26371 spin_unlock_irqrestore(&h->lock, flags);
26372 free_irq(h->intr[h->intr_mode], h);
26373 rc = cciss_request_irq(h, cciss_msix_discard_completions,
26374@@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
26375 dev_info(&h->pdev->dev, "Board READY.\n");
26376 dev_info(&h->pdev->dev,
26377 "Waiting for stale completions to drain.\n");
26378- h->access.set_intr_mask(h, CCISS_INTR_ON);
26379+ h->access->set_intr_mask(h, CCISS_INTR_ON);
26380 msleep(10000);
26381- h->access.set_intr_mask(h, CCISS_INTR_OFF);
26382+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
26383
26384 rc = controller_reset_failed(h->cfgtable);
26385 if (rc)
26386@@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
26387 cciss_scsi_setup(h);
26388
26389 /* Turn the interrupts on so we can service requests */
26390- h->access.set_intr_mask(h, CCISS_INTR_ON);
26391+ h->access->set_intr_mask(h, CCISS_INTR_ON);
26392
26393 /* Get the firmware version */
26394 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
26395@@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
26396 kfree(flush_buf);
26397 if (return_code != IO_OK)
26398 dev_warn(&h->pdev->dev, "Error flushing cache\n");
26399- h->access.set_intr_mask(h, CCISS_INTR_OFF);
26400+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
26401 free_irq(h->intr[h->intr_mode], h);
26402 }
26403
26404diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
26405index 7fda30e..eb5dfe0 100644
26406--- a/drivers/block/cciss.h
26407+++ b/drivers/block/cciss.h
26408@@ -101,7 +101,7 @@ struct ctlr_info
26409 /* information about each logical volume */
26410 drive_info_struct *drv[CISS_MAX_LUN];
26411
26412- struct access_method access;
26413+ struct access_method *access;
26414
26415 /* queue and queue Info */
26416 struct list_head reqQ;
26417diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
26418index 9125bbe..eede5c8 100644
26419--- a/drivers/block/cpqarray.c
26420+++ b/drivers/block/cpqarray.c
26421@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
26422 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
26423 goto Enomem4;
26424 }
26425- hba[i]->access.set_intr_mask(hba[i], 0);
26426+ hba[i]->access->set_intr_mask(hba[i], 0);
26427 if (request_irq(hba[i]->intr, do_ida_intr,
26428 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
26429 {
26430@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
26431 add_timer(&hba[i]->timer);
26432
26433 /* Enable IRQ now that spinlock and rate limit timer are set up */
26434- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
26435+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
26436
26437 for(j=0; j<NWD; j++) {
26438 struct gendisk *disk = ida_gendisk[i][j];
26439@@ -694,7 +694,7 @@ DBGINFO(
26440 for(i=0; i<NR_PRODUCTS; i++) {
26441 if (board_id == products[i].board_id) {
26442 c->product_name = products[i].product_name;
26443- c->access = *(products[i].access);
26444+ c->access = products[i].access;
26445 break;
26446 }
26447 }
26448@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
26449 hba[ctlr]->intr = intr;
26450 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
26451 hba[ctlr]->product_name = products[j].product_name;
26452- hba[ctlr]->access = *(products[j].access);
26453+ hba[ctlr]->access = products[j].access;
26454 hba[ctlr]->ctlr = ctlr;
26455 hba[ctlr]->board_id = board_id;
26456 hba[ctlr]->pci_dev = NULL; /* not PCI */
26457@@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
26458
26459 while((c = h->reqQ) != NULL) {
26460 /* Can't do anything if we're busy */
26461- if (h->access.fifo_full(h) == 0)
26462+ if (h->access->fifo_full(h) == 0)
26463 return;
26464
26465 /* Get the first entry from the request Q */
26466@@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
26467 h->Qdepth--;
26468
26469 /* Tell the controller to do our bidding */
26470- h->access.submit_command(h, c);
26471+ h->access->submit_command(h, c);
26472
26473 /* Get onto the completion Q */
26474 addQ(&h->cmpQ, c);
26475@@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
26476 unsigned long flags;
26477 __u32 a,a1;
26478
26479- istat = h->access.intr_pending(h);
26480+ istat = h->access->intr_pending(h);
26481 /* Is this interrupt for us? */
26482 if (istat == 0)
26483 return IRQ_NONE;
26484@@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
26485 */
26486 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
26487 if (istat & FIFO_NOT_EMPTY) {
26488- while((a = h->access.command_completed(h))) {
26489+ while((a = h->access->command_completed(h))) {
26490 a1 = a; a &= ~3;
26491 if ((c = h->cmpQ) == NULL)
26492 {
26493@@ -1449,11 +1449,11 @@ static int sendcmd(
26494 /*
26495 * Disable interrupt
26496 */
26497- info_p->access.set_intr_mask(info_p, 0);
26498+ info_p->access->set_intr_mask(info_p, 0);
26499 /* Make sure there is room in the command FIFO */
26500 /* Actually it should be completely empty at this time. */
26501 for (i = 200000; i > 0; i--) {
26502- temp = info_p->access.fifo_full(info_p);
26503+ temp = info_p->access->fifo_full(info_p);
26504 if (temp != 0) {
26505 break;
26506 }
26507@@ -1466,7 +1466,7 @@ DBG(
26508 /*
26509 * Send the cmd
26510 */
26511- info_p->access.submit_command(info_p, c);
26512+ info_p->access->submit_command(info_p, c);
26513 complete = pollcomplete(ctlr);
26514
26515 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
26516@@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
26517 * we check the new geometry. Then turn interrupts back on when
26518 * we're done.
26519 */
26520- host->access.set_intr_mask(host, 0);
26521+ host->access->set_intr_mask(host, 0);
26522 getgeometry(ctlr);
26523- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
26524+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
26525
26526 for(i=0; i<NWD; i++) {
26527 struct gendisk *disk = ida_gendisk[ctlr][i];
26528@@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
26529 /* Wait (up to 2 seconds) for a command to complete */
26530
26531 for (i = 200000; i > 0; i--) {
26532- done = hba[ctlr]->access.command_completed(hba[ctlr]);
26533+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
26534 if (done == 0) {
26535 udelay(10); /* a short fixed delay */
26536 } else
26537diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
26538index be73e9d..7fbf140 100644
26539--- a/drivers/block/cpqarray.h
26540+++ b/drivers/block/cpqarray.h
26541@@ -99,7 +99,7 @@ struct ctlr_info {
26542 drv_info_t drv[NWD];
26543 struct proc_dir_entry *proc;
26544
26545- struct access_method access;
26546+ struct access_method *access;
26547
26548 cmdlist_t *reqQ;
26549 cmdlist_t *cmpQ;
26550diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
26551index 9cf2035..bffca95 100644
26552--- a/drivers/block/drbd/drbd_int.h
26553+++ b/drivers/block/drbd/drbd_int.h
26554@@ -736,7 +736,7 @@ struct drbd_request;
26555 struct drbd_epoch {
26556 struct list_head list;
26557 unsigned int barrier_nr;
26558- atomic_t epoch_size; /* increased on every request added. */
26559+ atomic_unchecked_t epoch_size; /* increased on every request added. */
26560 atomic_t active; /* increased on every req. added, and dec on every finished. */
26561 unsigned long flags;
26562 };
26563@@ -1108,7 +1108,7 @@ struct drbd_conf {
26564 void *int_dig_in;
26565 void *int_dig_vv;
26566 wait_queue_head_t seq_wait;
26567- atomic_t packet_seq;
26568+ atomic_unchecked_t packet_seq;
26569 unsigned int peer_seq;
26570 spinlock_t peer_seq_lock;
26571 unsigned int minor;
26572@@ -1617,30 +1617,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
26573
26574 static inline void drbd_tcp_cork(struct socket *sock)
26575 {
26576- int __user val = 1;
26577+ int val = 1;
26578 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
26579- (char __user *)&val, sizeof(val));
26580+ (char __force_user *)&val, sizeof(val));
26581 }
26582
26583 static inline void drbd_tcp_uncork(struct socket *sock)
26584 {
26585- int __user val = 0;
26586+ int val = 0;
26587 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
26588- (char __user *)&val, sizeof(val));
26589+ (char __force_user *)&val, sizeof(val));
26590 }
26591
26592 static inline void drbd_tcp_nodelay(struct socket *sock)
26593 {
26594- int __user val = 1;
26595+ int val = 1;
26596 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
26597- (char __user *)&val, sizeof(val));
26598+ (char __force_user *)&val, sizeof(val));
26599 }
26600
26601 static inline void drbd_tcp_quickack(struct socket *sock)
26602 {
26603- int __user val = 2;
26604+ int val = 2;
26605 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
26606- (char __user *)&val, sizeof(val));
26607+ (char __force_user *)&val, sizeof(val));
26608 }
26609
26610 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
26611diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
26612index 0358e55..bc33689 100644
26613--- a/drivers/block/drbd/drbd_main.c
26614+++ b/drivers/block/drbd/drbd_main.c
26615@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
26616 p.sector = sector;
26617 p.block_id = block_id;
26618 p.blksize = blksize;
26619- p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
26620+ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
26621
26622 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
26623 return false;
26624@@ -2696,7 +2696,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
26625 p.sector = cpu_to_be64(req->sector);
26626 p.block_id = (unsigned long)req;
26627 p.seq_num = cpu_to_be32(req->seq_num =
26628- atomic_add_return(1, &mdev->packet_seq));
26629+ atomic_add_return_unchecked(1, &mdev->packet_seq));
26630
26631 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
26632
26633@@ -2981,7 +2981,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
26634 atomic_set(&mdev->unacked_cnt, 0);
26635 atomic_set(&mdev->local_cnt, 0);
26636 atomic_set(&mdev->net_cnt, 0);
26637- atomic_set(&mdev->packet_seq, 0);
26638+ atomic_set_unchecked(&mdev->packet_seq, 0);
26639 atomic_set(&mdev->pp_in_use, 0);
26640 atomic_set(&mdev->pp_in_use_by_net, 0);
26641 atomic_set(&mdev->rs_sect_in, 0);
26642@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
26643 mdev->receiver.t_state);
26644
26645 /* no need to lock it, I'm the only thread alive */
26646- if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
26647- dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
26648+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
26649+ dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
26650 mdev->al_writ_cnt =
26651 mdev->bm_writ_cnt =
26652 mdev->read_cnt =
26653diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
26654index af2a250..219c74b 100644
26655--- a/drivers/block/drbd/drbd_nl.c
26656+++ b/drivers/block/drbd/drbd_nl.c
26657@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
26658 module_put(THIS_MODULE);
26659 }
26660
26661-static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
26662+static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
26663
26664 static unsigned short *
26665 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
26666@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
26667 cn_reply->id.idx = CN_IDX_DRBD;
26668 cn_reply->id.val = CN_VAL_DRBD;
26669
26670- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
26671+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
26672 cn_reply->ack = 0; /* not used here. */
26673 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
26674 (int)((char *)tl - (char *)reply->tag_list);
26675@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
26676 cn_reply->id.idx = CN_IDX_DRBD;
26677 cn_reply->id.val = CN_VAL_DRBD;
26678
26679- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
26680+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
26681 cn_reply->ack = 0; /* not used here. */
26682 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
26683 (int)((char *)tl - (char *)reply->tag_list);
26684@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
26685 cn_reply->id.idx = CN_IDX_DRBD;
26686 cn_reply->id.val = CN_VAL_DRBD;
26687
26688- cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
26689+ cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
26690 cn_reply->ack = 0; // not used here.
26691 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
26692 (int)((char*)tl - (char*)reply->tag_list);
26693@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
26694 cn_reply->id.idx = CN_IDX_DRBD;
26695 cn_reply->id.val = CN_VAL_DRBD;
26696
26697- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
26698+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
26699 cn_reply->ack = 0; /* not used here. */
26700 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
26701 (int)((char *)tl - (char *)reply->tag_list);
26702diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
26703index 43beaca..4a5b1dd 100644
26704--- a/drivers/block/drbd/drbd_receiver.c
26705+++ b/drivers/block/drbd/drbd_receiver.c
26706@@ -894,7 +894,7 @@ retry:
26707 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
26708 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
26709
26710- atomic_set(&mdev->packet_seq, 0);
26711+ atomic_set_unchecked(&mdev->packet_seq, 0);
26712 mdev->peer_seq = 0;
26713
26714 drbd_thread_start(&mdev->asender);
26715@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
26716 do {
26717 next_epoch = NULL;
26718
26719- epoch_size = atomic_read(&epoch->epoch_size);
26720+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
26721
26722 switch (ev & ~EV_CLEANUP) {
26723 case EV_PUT:
26724@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
26725 rv = FE_DESTROYED;
26726 } else {
26727 epoch->flags = 0;
26728- atomic_set(&epoch->epoch_size, 0);
26729+ atomic_set_unchecked(&epoch->epoch_size, 0);
26730 /* atomic_set(&epoch->active, 0); is already zero */
26731 if (rv == FE_STILL_LIVE)
26732 rv = FE_RECYCLED;
26733@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
26734 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
26735 drbd_flush(mdev);
26736
26737- if (atomic_read(&mdev->current_epoch->epoch_size)) {
26738+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
26739 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
26740 if (epoch)
26741 break;
26742 }
26743
26744 epoch = mdev->current_epoch;
26745- wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
26746+ wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
26747
26748 D_ASSERT(atomic_read(&epoch->active) == 0);
26749 D_ASSERT(epoch->flags == 0);
26750@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
26751 }
26752
26753 epoch->flags = 0;
26754- atomic_set(&epoch->epoch_size, 0);
26755+ atomic_set_unchecked(&epoch->epoch_size, 0);
26756 atomic_set(&epoch->active, 0);
26757
26758 spin_lock(&mdev->epoch_lock);
26759- if (atomic_read(&mdev->current_epoch->epoch_size)) {
26760+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
26761 list_add(&epoch->list, &mdev->current_epoch->list);
26762 mdev->current_epoch = epoch;
26763 mdev->epochs++;
26764@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
26765 spin_unlock(&mdev->peer_seq_lock);
26766
26767 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
26768- atomic_inc(&mdev->current_epoch->epoch_size);
26769+ atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
26770 return drbd_drain_block(mdev, data_size);
26771 }
26772
26773@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
26774
26775 spin_lock(&mdev->epoch_lock);
26776 e->epoch = mdev->current_epoch;
26777- atomic_inc(&e->epoch->epoch_size);
26778+ atomic_inc_unchecked(&e->epoch->epoch_size);
26779 atomic_inc(&e->epoch->active);
26780 spin_unlock(&mdev->epoch_lock);
26781
26782@@ -3885,7 +3885,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
26783 D_ASSERT(list_empty(&mdev->done_ee));
26784
26785 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
26786- atomic_set(&mdev->current_epoch->epoch_size, 0);
26787+ atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
26788 D_ASSERT(list_empty(&mdev->current_epoch->list));
26789 }
26790
26791diff --git a/drivers/block/loop.c b/drivers/block/loop.c
26792index 1e888c9..05cf1b0 100644
26793--- a/drivers/block/loop.c
26794+++ b/drivers/block/loop.c
26795@@ -227,7 +227,7 @@ static int __do_lo_send_write(struct file *file,
26796 mm_segment_t old_fs = get_fs();
26797
26798 set_fs(get_ds());
26799- bw = file->f_op->write(file, buf, len, &pos);
26800+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
26801 set_fs(old_fs);
26802 if (likely(bw == len))
26803 return 0;
26804diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
26805index 4364303..9adf4ee 100644
26806--- a/drivers/char/Kconfig
26807+++ b/drivers/char/Kconfig
26808@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
26809
26810 config DEVKMEM
26811 bool "/dev/kmem virtual device support"
26812- default y
26813+ default n
26814+ depends on !GRKERNSEC_KMEM
26815 help
26816 Say Y here if you want to support the /dev/kmem device. The
26817 /dev/kmem device is rarely used, but can be used for certain
26818@@ -596,6 +597,7 @@ config DEVPORT
26819 bool
26820 depends on !M68K
26821 depends on ISA || PCI
26822+ depends on !GRKERNSEC_KMEM
26823 default y
26824
26825 source "drivers/s390/char/Kconfig"
26826diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
26827index 2e04433..22afc64 100644
26828--- a/drivers/char/agp/frontend.c
26829+++ b/drivers/char/agp/frontend.c
26830@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
26831 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
26832 return -EFAULT;
26833
26834- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
26835+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
26836 return -EFAULT;
26837
26838 client = agp_find_client_by_pid(reserve.pid);
26839diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
26840index 095ab90..afad0a4 100644
26841--- a/drivers/char/briq_panel.c
26842+++ b/drivers/char/briq_panel.c
26843@@ -9,6 +9,7 @@
26844 #include <linux/types.h>
26845 #include <linux/errno.h>
26846 #include <linux/tty.h>
26847+#include <linux/mutex.h>
26848 #include <linux/timer.h>
26849 #include <linux/kernel.h>
26850 #include <linux/wait.h>
26851@@ -34,6 +35,7 @@ static int vfd_is_open;
26852 static unsigned char vfd[40];
26853 static int vfd_cursor;
26854 static unsigned char ledpb, led;
26855+static DEFINE_MUTEX(vfd_mutex);
26856
26857 static void update_vfd(void)
26858 {
26859@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
26860 if (!vfd_is_open)
26861 return -EBUSY;
26862
26863+ mutex_lock(&vfd_mutex);
26864 for (;;) {
26865 char c;
26866 if (!indx)
26867 break;
26868- if (get_user(c, buf))
26869+ if (get_user(c, buf)) {
26870+ mutex_unlock(&vfd_mutex);
26871 return -EFAULT;
26872+ }
26873 if (esc) {
26874 set_led(c);
26875 esc = 0;
26876@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
26877 buf++;
26878 }
26879 update_vfd();
26880+ mutex_unlock(&vfd_mutex);
26881
26882 return len;
26883 }
26884diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
26885index f773a9d..65cd683 100644
26886--- a/drivers/char/genrtc.c
26887+++ b/drivers/char/genrtc.c
26888@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
26889 switch (cmd) {
26890
26891 case RTC_PLL_GET:
26892+ memset(&pll, 0, sizeof(pll));
26893 if (get_rtc_pll(&pll))
26894 return -EINVAL;
26895 else
26896diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
26897index 0833896..cccce52 100644
26898--- a/drivers/char/hpet.c
26899+++ b/drivers/char/hpet.c
26900@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
26901 }
26902
26903 static int
26904-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
26905+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
26906 struct hpet_info *info)
26907 {
26908 struct hpet_timer __iomem *timer;
26909diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
26910index 58c0e63..46c16bf 100644
26911--- a/drivers/char/ipmi/ipmi_msghandler.c
26912+++ b/drivers/char/ipmi/ipmi_msghandler.c
26913@@ -415,7 +415,7 @@ struct ipmi_smi {
26914 struct proc_dir_entry *proc_dir;
26915 char proc_dir_name[10];
26916
26917- atomic_t stats[IPMI_NUM_STATS];
26918+ atomic_unchecked_t stats[IPMI_NUM_STATS];
26919
26920 /*
26921 * run_to_completion duplicate of smb_info, smi_info
26922@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
26923
26924
26925 #define ipmi_inc_stat(intf, stat) \
26926- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
26927+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
26928 #define ipmi_get_stat(intf, stat) \
26929- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
26930+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
26931
26932 static int is_lan_addr(struct ipmi_addr *addr)
26933 {
26934@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
26935 INIT_LIST_HEAD(&intf->cmd_rcvrs);
26936 init_waitqueue_head(&intf->waitq);
26937 for (i = 0; i < IPMI_NUM_STATS; i++)
26938- atomic_set(&intf->stats[i], 0);
26939+ atomic_set_unchecked(&intf->stats[i], 0);
26940
26941 intf->proc_dir = NULL;
26942
26943diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
26944index 9397ab4..d01bee1 100644
26945--- a/drivers/char/ipmi/ipmi_si_intf.c
26946+++ b/drivers/char/ipmi/ipmi_si_intf.c
26947@@ -277,7 +277,7 @@ struct smi_info {
26948 unsigned char slave_addr;
26949
26950 /* Counters and things for the proc filesystem. */
26951- atomic_t stats[SI_NUM_STATS];
26952+ atomic_unchecked_t stats[SI_NUM_STATS];
26953
26954 struct task_struct *thread;
26955
26956@@ -286,9 +286,9 @@ struct smi_info {
26957 };
26958
26959 #define smi_inc_stat(smi, stat) \
26960- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
26961+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
26962 #define smi_get_stat(smi, stat) \
26963- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
26964+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
26965
26966 #define SI_MAX_PARMS 4
26967
26968@@ -3230,7 +3230,7 @@ static int try_smi_init(struct smi_info *new_smi)
26969 atomic_set(&new_smi->req_events, 0);
26970 new_smi->run_to_completion = 0;
26971 for (i = 0; i < SI_NUM_STATS; i++)
26972- atomic_set(&new_smi->stats[i], 0);
26973+ atomic_set_unchecked(&new_smi->stats[i], 0);
26974
26975 new_smi->interrupt_disabled = 1;
26976 atomic_set(&new_smi->stop_operation, 0);
26977diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
26978index 1aeaaba..e018570 100644
26979--- a/drivers/char/mbcs.c
26980+++ b/drivers/char/mbcs.c
26981@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *dev)
26982 return 0;
26983 }
26984
26985-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
26986+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
26987 {
26988 .part_num = MBCS_PART_NUM,
26989 .mfg_num = MBCS_MFG_NUM,
26990diff --git a/drivers/char/mem.c b/drivers/char/mem.c
26991index 1451790..f705c30 100644
26992--- a/drivers/char/mem.c
26993+++ b/drivers/char/mem.c
26994@@ -18,6 +18,7 @@
26995 #include <linux/raw.h>
26996 #include <linux/tty.h>
26997 #include <linux/capability.h>
26998+#include <linux/security.h>
26999 #include <linux/ptrace.h>
27000 #include <linux/device.h>
27001 #include <linux/highmem.h>
27002@@ -35,6 +36,10 @@
27003 # include <linux/efi.h>
27004 #endif
27005
27006+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
27007+extern const struct file_operations grsec_fops;
27008+#endif
27009+
27010 static inline unsigned long size_inside_page(unsigned long start,
27011 unsigned long size)
27012 {
27013@@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
27014
27015 while (cursor < to) {
27016 if (!devmem_is_allowed(pfn)) {
27017+#ifdef CONFIG_GRKERNSEC_KMEM
27018+ gr_handle_mem_readwrite(from, to);
27019+#else
27020 printk(KERN_INFO
27021 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
27022 current->comm, from, to);
27023+#endif
27024 return 0;
27025 }
27026 cursor += PAGE_SIZE;
27027@@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
27028 }
27029 return 1;
27030 }
27031+#elif defined(CONFIG_GRKERNSEC_KMEM)
27032+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
27033+{
27034+ return 0;
27035+}
27036 #else
27037 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
27038 {
27039@@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
27040
27041 while (count > 0) {
27042 unsigned long remaining;
27043+ char *temp;
27044
27045 sz = size_inside_page(p, count);
27046
27047@@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
27048 if (!ptr)
27049 return -EFAULT;
27050
27051- remaining = copy_to_user(buf, ptr, sz);
27052+#ifdef CONFIG_PAX_USERCOPY
27053+ temp = kmalloc(sz, GFP_KERNEL);
27054+ if (!temp) {
27055+ unxlate_dev_mem_ptr(p, ptr);
27056+ return -ENOMEM;
27057+ }
27058+ memcpy(temp, ptr, sz);
27059+#else
27060+ temp = ptr;
27061+#endif
27062+
27063+ remaining = copy_to_user(buf, temp, sz);
27064+
27065+#ifdef CONFIG_PAX_USERCOPY
27066+ kfree(temp);
27067+#endif
27068+
27069 unxlate_dev_mem_ptr(p, ptr);
27070 if (remaining)
27071 return -EFAULT;
27072@@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
27073 size_t count, loff_t *ppos)
27074 {
27075 unsigned long p = *ppos;
27076- ssize_t low_count, read, sz;
27077+ ssize_t low_count, read, sz, err = 0;
27078 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
27079- int err = 0;
27080
27081 read = 0;
27082 if (p < (unsigned long) high_memory) {
27083@@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
27084 }
27085 #endif
27086 while (low_count > 0) {
27087+ char *temp;
27088+
27089 sz = size_inside_page(p, low_count);
27090
27091 /*
27092@@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
27093 */
27094 kbuf = xlate_dev_kmem_ptr((char *)p);
27095
27096- if (copy_to_user(buf, kbuf, sz))
27097+#ifdef CONFIG_PAX_USERCOPY
27098+ temp = kmalloc(sz, GFP_KERNEL);
27099+ if (!temp)
27100+ return -ENOMEM;
27101+ memcpy(temp, kbuf, sz);
27102+#else
27103+ temp = kbuf;
27104+#endif
27105+
27106+ err = copy_to_user(buf, temp, sz);
27107+
27108+#ifdef CONFIG_PAX_USERCOPY
27109+ kfree(temp);
27110+#endif
27111+
27112+ if (err)
27113 return -EFAULT;
27114 buf += sz;
27115 p += sz;
27116@@ -867,6 +914,9 @@ static const struct memdev {
27117 #ifdef CONFIG_CRASH_DUMP
27118 [12] = { "oldmem", 0, &oldmem_fops, NULL },
27119 #endif
27120+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
27121+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
27122+#endif
27123 };
27124
27125 static int memory_open(struct inode *inode, struct file *filp)
27126diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
27127index da3cfee..a5a6606 100644
27128--- a/drivers/char/nvram.c
27129+++ b/drivers/char/nvram.c
27130@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
27131
27132 spin_unlock_irq(&rtc_lock);
27133
27134- if (copy_to_user(buf, contents, tmp - contents))
27135+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
27136 return -EFAULT;
27137
27138 *ppos = i;
27139diff --git a/drivers/char/random.c b/drivers/char/random.c
27140index 6035ab8..bdfe4fd 100644
27141--- a/drivers/char/random.c
27142+++ b/drivers/char/random.c
27143@@ -261,8 +261,13 @@
27144 /*
27145 * Configuration information
27146 */
27147+#ifdef CONFIG_GRKERNSEC_RANDNET
27148+#define INPUT_POOL_WORDS 512
27149+#define OUTPUT_POOL_WORDS 128
27150+#else
27151 #define INPUT_POOL_WORDS 128
27152 #define OUTPUT_POOL_WORDS 32
27153+#endif
27154 #define SEC_XFER_SIZE 512
27155 #define EXTRACT_SIZE 10
27156
27157@@ -300,10 +305,17 @@ static struct poolinfo {
27158 int poolwords;
27159 int tap1, tap2, tap3, tap4, tap5;
27160 } poolinfo_table[] = {
27161+#ifdef CONFIG_GRKERNSEC_RANDNET
27162+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
27163+ { 512, 411, 308, 208, 104, 1 },
27164+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
27165+ { 128, 103, 76, 51, 25, 1 },
27166+#else
27167 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
27168 { 128, 103, 76, 51, 25, 1 },
27169 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
27170 { 32, 26, 20, 14, 7, 1 },
27171+#endif
27172 #if 0
27173 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
27174 { 2048, 1638, 1231, 819, 411, 1 },
27175@@ -909,7 +921,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
27176
27177 extract_buf(r, tmp);
27178 i = min_t(int, nbytes, EXTRACT_SIZE);
27179- if (copy_to_user(buf, tmp, i)) {
27180+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
27181 ret = -EFAULT;
27182 break;
27183 }
27184@@ -1228,7 +1240,7 @@ EXPORT_SYMBOL(generate_random_uuid);
27185 #include <linux/sysctl.h>
27186
27187 static int min_read_thresh = 8, min_write_thresh;
27188-static int max_read_thresh = INPUT_POOL_WORDS * 32;
27189+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
27190 static int max_write_thresh = INPUT_POOL_WORDS * 32;
27191 static char sysctl_bootid[16];
27192
27193diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
27194index 1ee8ce7..b778bef 100644
27195--- a/drivers/char/sonypi.c
27196+++ b/drivers/char/sonypi.c
27197@@ -55,6 +55,7 @@
27198 #include <asm/uaccess.h>
27199 #include <asm/io.h>
27200 #include <asm/system.h>
27201+#include <asm/local.h>
27202
27203 #include <linux/sonypi.h>
27204
27205@@ -491,7 +492,7 @@ static struct sonypi_device {
27206 spinlock_t fifo_lock;
27207 wait_queue_head_t fifo_proc_list;
27208 struct fasync_struct *fifo_async;
27209- int open_count;
27210+ local_t open_count;
27211 int model;
27212 struct input_dev *input_jog_dev;
27213 struct input_dev *input_key_dev;
27214@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
27215 static int sonypi_misc_release(struct inode *inode, struct file *file)
27216 {
27217 mutex_lock(&sonypi_device.lock);
27218- sonypi_device.open_count--;
27219+ local_dec(&sonypi_device.open_count);
27220 mutex_unlock(&sonypi_device.lock);
27221 return 0;
27222 }
27223@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
27224 {
27225 mutex_lock(&sonypi_device.lock);
27226 /* Flush input queue on first open */
27227- if (!sonypi_device.open_count)
27228+ if (!local_read(&sonypi_device.open_count))
27229 kfifo_reset(&sonypi_device.fifo);
27230- sonypi_device.open_count++;
27231+ local_inc(&sonypi_device.open_count);
27232 mutex_unlock(&sonypi_device.lock);
27233
27234 return 0;
27235diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
27236index 361a1df..2471eee 100644
27237--- a/drivers/char/tpm/tpm.c
27238+++ b/drivers/char/tpm/tpm.c
27239@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
27240 chip->vendor.req_complete_val)
27241 goto out_recv;
27242
27243- if ((status == chip->vendor.req_canceled)) {
27244+ if (status == chip->vendor.req_canceled) {
27245 dev_err(chip->dev, "Operation Canceled\n");
27246 rc = -ECANCELED;
27247 goto out;
27248diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
27249index 0636520..169c1d0 100644
27250--- a/drivers/char/tpm/tpm_bios.c
27251+++ b/drivers/char/tpm/tpm_bios.c
27252@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
27253 event = addr;
27254
27255 if ((event->event_type == 0 && event->event_size == 0) ||
27256- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
27257+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
27258 return NULL;
27259
27260 return addr;
27261@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
27262 return NULL;
27263
27264 if ((event->event_type == 0 && event->event_size == 0) ||
27265- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
27266+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
27267 return NULL;
27268
27269 (*pos)++;
27270@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
27271 int i;
27272
27273 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
27274- seq_putc(m, data[i]);
27275+ if (!seq_putc(m, data[i]))
27276+ return -EFAULT;
27277
27278 return 0;
27279 }
27280@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
27281 log->bios_event_log_end = log->bios_event_log + len;
27282
27283 virt = acpi_os_map_memory(start, len);
27284+ if (!virt) {
27285+ kfree(log->bios_event_log);
27286+ log->bios_event_log = NULL;
27287+ return -EFAULT;
27288+ }
27289
27290- memcpy(log->bios_event_log, virt, len);
27291+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
27292
27293 acpi_os_unmap_memory(virt, len);
27294 return 0;
27295diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
27296index 8e3c46d..c139b99 100644
27297--- a/drivers/char/virtio_console.c
27298+++ b/drivers/char/virtio_console.c
27299@@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
27300 if (to_user) {
27301 ssize_t ret;
27302
27303- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
27304+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
27305 if (ret)
27306 return -EFAULT;
27307 } else {
27308@@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
27309 if (!port_has_data(port) && !port->host_connected)
27310 return 0;
27311
27312- return fill_readbuf(port, ubuf, count, true);
27313+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
27314 }
27315
27316 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
27317diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
27318index eb1d864..39ee5a7 100644
27319--- a/drivers/dma/dmatest.c
27320+++ b/drivers/dma/dmatest.c
27321@@ -591,7 +591,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
27322 }
27323 if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
27324 cnt = dmatest_add_threads(dtc, DMA_PQ);
27325- thread_count += cnt > 0 ?: 0;
27326+ thread_count += cnt > 0 ? cnt : 0;
27327 }
27328
27329 pr_info("dmatest: Started %u threads using %s\n",
27330diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
27331index c9eee6d..f9d5280 100644
27332--- a/drivers/edac/amd64_edac.c
27333+++ b/drivers/edac/amd64_edac.c
27334@@ -2685,7 +2685,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
27335 * PCI core identifies what devices are on a system during boot, and then
27336 * inquiry this table to see if this driver is for a given device found.
27337 */
27338-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
27339+static const struct pci_device_id amd64_pci_table[] __devinitconst = {
27340 {
27341 .vendor = PCI_VENDOR_ID_AMD,
27342 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
27343diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
27344index e47e73b..348e0bd 100644
27345--- a/drivers/edac/amd76x_edac.c
27346+++ b/drivers/edac/amd76x_edac.c
27347@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
27348 edac_mc_free(mci);
27349 }
27350
27351-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
27352+static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
27353 {
27354 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27355 AMD762},
27356diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
27357index 1af531a..3a8ff27 100644
27358--- a/drivers/edac/e752x_edac.c
27359+++ b/drivers/edac/e752x_edac.c
27360@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
27361 edac_mc_free(mci);
27362 }
27363
27364-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
27365+static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
27366 {
27367 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27368 E7520},
27369diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
27370index 6ffb6d2..383d8d7 100644
27371--- a/drivers/edac/e7xxx_edac.c
27372+++ b/drivers/edac/e7xxx_edac.c
27373@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
27374 edac_mc_free(mci);
27375 }
27376
27377-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
27378+static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
27379 {
27380 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27381 E7205},
27382diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
27383index 495198a..ac08c85 100644
27384--- a/drivers/edac/edac_pci_sysfs.c
27385+++ b/drivers/edac/edac_pci_sysfs.c
27386@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
27387 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
27388 static int edac_pci_poll_msec = 1000; /* one second workq period */
27389
27390-static atomic_t pci_parity_count = ATOMIC_INIT(0);
27391-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
27392+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
27393+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
27394
27395 static struct kobject *edac_pci_top_main_kobj;
27396 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
27397@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27398 edac_printk(KERN_CRIT, EDAC_PCI,
27399 "Signaled System Error on %s\n",
27400 pci_name(dev));
27401- atomic_inc(&pci_nonparity_count);
27402+ atomic_inc_unchecked(&pci_nonparity_count);
27403 }
27404
27405 if (status & (PCI_STATUS_PARITY)) {
27406@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27407 "Master Data Parity Error on %s\n",
27408 pci_name(dev));
27409
27410- atomic_inc(&pci_parity_count);
27411+ atomic_inc_unchecked(&pci_parity_count);
27412 }
27413
27414 if (status & (PCI_STATUS_DETECTED_PARITY)) {
27415@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27416 "Detected Parity Error on %s\n",
27417 pci_name(dev));
27418
27419- atomic_inc(&pci_parity_count);
27420+ atomic_inc_unchecked(&pci_parity_count);
27421 }
27422 }
27423
27424@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27425 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
27426 "Signaled System Error on %s\n",
27427 pci_name(dev));
27428- atomic_inc(&pci_nonparity_count);
27429+ atomic_inc_unchecked(&pci_nonparity_count);
27430 }
27431
27432 if (status & (PCI_STATUS_PARITY)) {
27433@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27434 "Master Data Parity Error on "
27435 "%s\n", pci_name(dev));
27436
27437- atomic_inc(&pci_parity_count);
27438+ atomic_inc_unchecked(&pci_parity_count);
27439 }
27440
27441 if (status & (PCI_STATUS_DETECTED_PARITY)) {
27442@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
27443 "Detected Parity Error on %s\n",
27444 pci_name(dev));
27445
27446- atomic_inc(&pci_parity_count);
27447+ atomic_inc_unchecked(&pci_parity_count);
27448 }
27449 }
27450 }
27451@@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
27452 if (!check_pci_errors)
27453 return;
27454
27455- before_count = atomic_read(&pci_parity_count);
27456+ before_count = atomic_read_unchecked(&pci_parity_count);
27457
27458 /* scan all PCI devices looking for a Parity Error on devices and
27459 * bridges.
27460@@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
27461 /* Only if operator has selected panic on PCI Error */
27462 if (edac_pci_get_panic_on_pe()) {
27463 /* If the count is different 'after' from 'before' */
27464- if (before_count != atomic_read(&pci_parity_count))
27465+ if (before_count != atomic_read_unchecked(&pci_parity_count))
27466 panic("EDAC: PCI Parity Error");
27467 }
27468 }
27469diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
27470index c0510b3..6e2a954 100644
27471--- a/drivers/edac/i3000_edac.c
27472+++ b/drivers/edac/i3000_edac.c
27473@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
27474 edac_mc_free(mci);
27475 }
27476
27477-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
27478+static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
27479 {
27480 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27481 I3000},
27482diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
27483index aa08497..7e6822a 100644
27484--- a/drivers/edac/i3200_edac.c
27485+++ b/drivers/edac/i3200_edac.c
27486@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
27487 edac_mc_free(mci);
27488 }
27489
27490-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
27491+static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
27492 {
27493 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27494 I3200},
27495diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
27496index 4dc3ac2..67d05a6 100644
27497--- a/drivers/edac/i5000_edac.c
27498+++ b/drivers/edac/i5000_edac.c
27499@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
27500 *
27501 * The "E500P" device is the first device supported.
27502 */
27503-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
27504+static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
27505 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
27506 .driver_data = I5000P},
27507
27508diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
27509index bcbdeec..9886d16 100644
27510--- a/drivers/edac/i5100_edac.c
27511+++ b/drivers/edac/i5100_edac.c
27512@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
27513 edac_mc_free(mci);
27514 }
27515
27516-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
27517+static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
27518 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
27519 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
27520 { 0, }
27521diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
27522index 74d6ec34..baff517 100644
27523--- a/drivers/edac/i5400_edac.c
27524+++ b/drivers/edac/i5400_edac.c
27525@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
27526 *
27527 * The "E500P" device is the first device supported.
27528 */
27529-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
27530+static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
27531 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
27532 {0,} /* 0 terminated list. */
27533 };
27534diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
27535index 6104dba..e7ea8e1 100644
27536--- a/drivers/edac/i7300_edac.c
27537+++ b/drivers/edac/i7300_edac.c
27538@@ -1192,7 +1192,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
27539 *
27540 * Has only 8086:360c PCI ID
27541 */
27542-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
27543+static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
27544 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
27545 {0,} /* 0 terminated list. */
27546 };
27547diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
27548index 70ad892..178943c 100644
27549--- a/drivers/edac/i7core_edac.c
27550+++ b/drivers/edac/i7core_edac.c
27551@@ -391,7 +391,7 @@ static const struct pci_id_table pci_dev_table[] = {
27552 /*
27553 * pci_device_id table for which devices we are looking for
27554 */
27555-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
27556+static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
27557 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
27558 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
27559 {0,} /* 0 terminated list. */
27560diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
27561index 4329d39..f3022ef 100644
27562--- a/drivers/edac/i82443bxgx_edac.c
27563+++ b/drivers/edac/i82443bxgx_edac.c
27564@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
27565
27566 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
27567
27568-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
27569+static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
27570 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
27571 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
27572 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
27573diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
27574index 931a057..fd28340 100644
27575--- a/drivers/edac/i82860_edac.c
27576+++ b/drivers/edac/i82860_edac.c
27577@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
27578 edac_mc_free(mci);
27579 }
27580
27581-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
27582+static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
27583 {
27584 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27585 I82860},
27586diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
27587index 33864c6..01edc61 100644
27588--- a/drivers/edac/i82875p_edac.c
27589+++ b/drivers/edac/i82875p_edac.c
27590@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
27591 edac_mc_free(mci);
27592 }
27593
27594-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
27595+static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
27596 {
27597 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27598 I82875P},
27599diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
27600index a5da732..983363b 100644
27601--- a/drivers/edac/i82975x_edac.c
27602+++ b/drivers/edac/i82975x_edac.c
27603@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
27604 edac_mc_free(mci);
27605 }
27606
27607-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
27608+static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
27609 {
27610 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27611 I82975X
27612diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
27613index 0106747..0b40417 100644
27614--- a/drivers/edac/mce_amd.h
27615+++ b/drivers/edac/mce_amd.h
27616@@ -83,7 +83,7 @@ struct amd_decoder_ops {
27617 bool (*dc_mce)(u16, u8);
27618 bool (*ic_mce)(u16, u8);
27619 bool (*nb_mce)(u16, u8);
27620-};
27621+} __no_const;
27622
27623 void amd_report_gart_errors(bool);
27624 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
27625diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
27626index b153674..ad2ba9b 100644
27627--- a/drivers/edac/r82600_edac.c
27628+++ b/drivers/edac/r82600_edac.c
27629@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
27630 edac_mc_free(mci);
27631 }
27632
27633-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
27634+static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
27635 {
27636 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
27637 },
27638diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
27639index 7a402bf..af0b211 100644
27640--- a/drivers/edac/sb_edac.c
27641+++ b/drivers/edac/sb_edac.c
27642@@ -367,7 +367,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
27643 /*
27644 * pci_device_id table for which devices we are looking for
27645 */
27646-static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
27647+static const struct pci_device_id sbridge_pci_tbl[] __devinitconst = {
27648 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
27649 {0,} /* 0 terminated list. */
27650 };
27651diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
27652index b6f47de..c5acf3a 100644
27653--- a/drivers/edac/x38_edac.c
27654+++ b/drivers/edac/x38_edac.c
27655@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
27656 edac_mc_free(mci);
27657 }
27658
27659-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
27660+static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
27661 {
27662 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
27663 X38},
27664diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
27665index 85661b0..c784559a 100644
27666--- a/drivers/firewire/core-card.c
27667+++ b/drivers/firewire/core-card.c
27668@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
27669
27670 void fw_core_remove_card(struct fw_card *card)
27671 {
27672- struct fw_card_driver dummy_driver = dummy_driver_template;
27673+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
27674
27675 card->driver->update_phy_reg(card, 4,
27676 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
27677diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
27678index 4799393..37bd3ab 100644
27679--- a/drivers/firewire/core-cdev.c
27680+++ b/drivers/firewire/core-cdev.c
27681@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct client *client,
27682 int ret;
27683
27684 if ((request->channels == 0 && request->bandwidth == 0) ||
27685- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
27686- request->bandwidth < 0)
27687+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
27688 return -EINVAL;
27689
27690 r = kmalloc(sizeof(*r), GFP_KERNEL);
27691diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
27692index 855ab3f..11f4bbd 100644
27693--- a/drivers/firewire/core-transaction.c
27694+++ b/drivers/firewire/core-transaction.c
27695@@ -37,6 +37,7 @@
27696 #include <linux/timer.h>
27697 #include <linux/types.h>
27698 #include <linux/workqueue.h>
27699+#include <linux/sched.h>
27700
27701 #include <asm/byteorder.h>
27702
27703diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
27704index b45be57..5fad18b 100644
27705--- a/drivers/firewire/core.h
27706+++ b/drivers/firewire/core.h
27707@@ -101,6 +101,7 @@ struct fw_card_driver {
27708
27709 int (*stop_iso)(struct fw_iso_context *ctx);
27710 };
27711+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
27712
27713 void fw_card_initialize(struct fw_card *card,
27714 const struct fw_card_driver *driver, struct device *device);
27715diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
27716index 153980b..4b4d046 100644
27717--- a/drivers/firmware/dmi_scan.c
27718+++ b/drivers/firmware/dmi_scan.c
27719@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
27720 }
27721 }
27722 else {
27723- /*
27724- * no iounmap() for that ioremap(); it would be a no-op, but
27725- * it's so early in setup that sucker gets confused into doing
27726- * what it shouldn't if we actually call it.
27727- */
27728 p = dmi_ioremap(0xF0000, 0x10000);
27729 if (p == NULL)
27730 goto error;
27731@@ -723,7 +718,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
27732 if (buf == NULL)
27733 return -1;
27734
27735- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
27736+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
27737
27738 iounmap(buf);
27739 return 0;
27740diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
27741index 98723cb..10ca85b 100644
27742--- a/drivers/gpio/gpio-vr41xx.c
27743+++ b/drivers/gpio/gpio-vr41xx.c
27744@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
27745 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
27746 maskl, pendl, maskh, pendh);
27747
27748- atomic_inc(&irq_err_count);
27749+ atomic_inc_unchecked(&irq_err_count);
27750
27751 return -EINVAL;
27752 }
27753diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
27754index 8323fc3..5c1d755 100644
27755--- a/drivers/gpu/drm/drm_crtc.c
27756+++ b/drivers/gpu/drm/drm_crtc.c
27757@@ -1379,7 +1379,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
27758 */
27759 if ((out_resp->count_modes >= mode_count) && mode_count) {
27760 copied = 0;
27761- mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
27762+ mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
27763 list_for_each_entry(mode, &connector->modes, head) {
27764 drm_crtc_convert_to_umode(&u_mode, mode);
27765 if (copy_to_user(mode_ptr + copied,
27766@@ -1394,8 +1394,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
27767
27768 if ((out_resp->count_props >= props_count) && props_count) {
27769 copied = 0;
27770- prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
27771- prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
27772+ prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
27773+ prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
27774 for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
27775 if (connector->property_ids[i] != 0) {
27776 if (put_user(connector->property_ids[i],
27777@@ -1417,7 +1417,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
27778
27779 if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
27780 copied = 0;
27781- encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
27782+ encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
27783 for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
27784 if (connector->encoder_ids[i] != 0) {
27785 if (put_user(connector->encoder_ids[i],
27786@@ -1576,7 +1576,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
27787 }
27788
27789 for (i = 0; i < crtc_req->count_connectors; i++) {
27790- set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
27791+ set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
27792 if (get_user(out_id, &set_connectors_ptr[i])) {
27793 ret = -EFAULT;
27794 goto out;
27795@@ -1857,7 +1857,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
27796 fb = obj_to_fb(obj);
27797
27798 num_clips = r->num_clips;
27799- clips_ptr = (struct drm_clip_rect *)(unsigned long)r->clips_ptr;
27800+ clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
27801
27802 if (!num_clips != !clips_ptr) {
27803 ret = -EINVAL;
27804@@ -2283,7 +2283,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
27805 out_resp->flags = property->flags;
27806
27807 if ((out_resp->count_values >= value_count) && value_count) {
27808- values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
27809+ values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
27810 for (i = 0; i < value_count; i++) {
27811 if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
27812 ret = -EFAULT;
27813@@ -2296,7 +2296,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
27814 if (property->flags & DRM_MODE_PROP_ENUM) {
27815 if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
27816 copied = 0;
27817- enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
27818+ enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
27819 list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
27820
27821 if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
27822@@ -2319,7 +2319,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
27823 if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
27824 copied = 0;
27825 blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
27826- blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
27827+ blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
27828
27829 list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
27830 if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
27831@@ -2380,7 +2380,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
27832 struct drm_mode_get_blob *out_resp = data;
27833 struct drm_property_blob *blob;
27834 int ret = 0;
27835- void *blob_ptr;
27836+ void __user *blob_ptr;
27837
27838 if (!drm_core_check_feature(dev, DRIVER_MODESET))
27839 return -EINVAL;
27840@@ -2394,7 +2394,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
27841 blob = obj_to_blob(obj);
27842
27843 if (out_resp->length == blob->length) {
27844- blob_ptr = (void *)(unsigned long)out_resp->data;
27845+ blob_ptr = (void __user *)(unsigned long)out_resp->data;
27846 if (copy_to_user(blob_ptr, blob->data, blob->length)){
27847 ret = -EFAULT;
27848 goto done;
27849diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
27850index d2619d7..bd6bd00 100644
27851--- a/drivers/gpu/drm/drm_crtc_helper.c
27852+++ b/drivers/gpu/drm/drm_crtc_helper.c
27853@@ -279,7 +279,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
27854 struct drm_crtc *tmp;
27855 int crtc_mask = 1;
27856
27857- WARN(!crtc, "checking null crtc?\n");
27858+ BUG_ON(!crtc);
27859
27860 dev = crtc->dev;
27861
27862diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
27863index 40c187c..5746164 100644
27864--- a/drivers/gpu/drm/drm_drv.c
27865+++ b/drivers/gpu/drm/drm_drv.c
27866@@ -308,7 +308,7 @@ module_exit(drm_core_exit);
27867 /**
27868 * Copy and IOCTL return string to user space
27869 */
27870-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
27871+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
27872 {
27873 int len;
27874
27875@@ -387,7 +387,7 @@ long drm_ioctl(struct file *filp,
27876
27877 dev = file_priv->minor->dev;
27878 atomic_inc(&dev->ioctl_count);
27879- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
27880+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
27881 ++file_priv->ioctl_count;
27882
27883 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
27884diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
27885index 828bf65..cdaa0e9 100644
27886--- a/drivers/gpu/drm/drm_fops.c
27887+++ b/drivers/gpu/drm/drm_fops.c
27888@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
27889 }
27890
27891 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
27892- atomic_set(&dev->counts[i], 0);
27893+ atomic_set_unchecked(&dev->counts[i], 0);
27894
27895 dev->sigdata.lock = NULL;
27896
27897@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct file *filp)
27898
27899 retcode = drm_open_helper(inode, filp, dev);
27900 if (!retcode) {
27901- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
27902- if (!dev->open_count++)
27903+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
27904+ if (local_inc_return(&dev->open_count) == 1)
27905 retcode = drm_setup(dev);
27906 }
27907 if (!retcode) {
27908@@ -473,7 +473,7 @@ int drm_release(struct inode *inode, struct file *filp)
27909
27910 mutex_lock(&drm_global_mutex);
27911
27912- DRM_DEBUG("open_count = %d\n", dev->open_count);
27913+ DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
27914
27915 if (dev->driver->preclose)
27916 dev->driver->preclose(dev, file_priv);
27917@@ -485,7 +485,7 @@ int drm_release(struct inode *inode, struct file *filp)
27918 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
27919 task_pid_nr(current),
27920 (long)old_encode_dev(file_priv->minor->device),
27921- dev->open_count);
27922+ local_read(&dev->open_count));
27923
27924 /* Release any auth tokens that might point to this file_priv,
27925 (do that under the drm_global_mutex) */
27926@@ -571,8 +571,8 @@ int drm_release(struct inode *inode, struct file *filp)
27927 * End inline drm_release
27928 */
27929
27930- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
27931- if (!--dev->open_count) {
27932+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
27933+ if (local_dec_and_test(&dev->open_count)) {
27934 if (atomic_read(&dev->ioctl_count)) {
27935 DRM_ERROR("Device busy: %d\n",
27936 atomic_read(&dev->ioctl_count));
27937diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
27938index c87dc96..326055d 100644
27939--- a/drivers/gpu/drm/drm_global.c
27940+++ b/drivers/gpu/drm/drm_global.c
27941@@ -36,7 +36,7 @@
27942 struct drm_global_item {
27943 struct mutex mutex;
27944 void *object;
27945- int refcount;
27946+ atomic_t refcount;
27947 };
27948
27949 static struct drm_global_item glob[DRM_GLOBAL_NUM];
27950@@ -49,7 +49,7 @@ void drm_global_init(void)
27951 struct drm_global_item *item = &glob[i];
27952 mutex_init(&item->mutex);
27953 item->object = NULL;
27954- item->refcount = 0;
27955+ atomic_set(&item->refcount, 0);
27956 }
27957 }
27958
27959@@ -59,7 +59,7 @@ void drm_global_release(void)
27960 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
27961 struct drm_global_item *item = &glob[i];
27962 BUG_ON(item->object != NULL);
27963- BUG_ON(item->refcount != 0);
27964+ BUG_ON(atomic_read(&item->refcount) != 0);
27965 }
27966 }
27967
27968@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
27969 void *object;
27970
27971 mutex_lock(&item->mutex);
27972- if (item->refcount == 0) {
27973+ if (atomic_read(&item->refcount) == 0) {
27974 item->object = kzalloc(ref->size, GFP_KERNEL);
27975 if (unlikely(item->object == NULL)) {
27976 ret = -ENOMEM;
27977@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
27978 goto out_err;
27979
27980 }
27981- ++item->refcount;
27982+ atomic_inc(&item->refcount);
27983 ref->object = item->object;
27984 object = item->object;
27985 mutex_unlock(&item->mutex);
27986@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
27987 struct drm_global_item *item = &glob[ref->global_type];
27988
27989 mutex_lock(&item->mutex);
27990- BUG_ON(item->refcount == 0);
27991+ BUG_ON(atomic_read(&item->refcount) == 0);
27992 BUG_ON(ref->object != item->object);
27993- if (--item->refcount == 0) {
27994+ if (atomic_dec_and_test(&item->refcount)) {
27995 ref->release(ref);
27996 item->object = NULL;
27997 }
27998diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
27999index ab1162d..42587b2 100644
28000--- a/drivers/gpu/drm/drm_info.c
28001+++ b/drivers/gpu/drm/drm_info.c
28002@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
28003 struct drm_local_map *map;
28004 struct drm_map_list *r_list;
28005
28006- /* Hardcoded from _DRM_FRAME_BUFFER,
28007- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
28008- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
28009- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
28010+ static const char * const types[] = {
28011+ [_DRM_FRAME_BUFFER] = "FB",
28012+ [_DRM_REGISTERS] = "REG",
28013+ [_DRM_SHM] = "SHM",
28014+ [_DRM_AGP] = "AGP",
28015+ [_DRM_SCATTER_GATHER] = "SG",
28016+ [_DRM_CONSISTENT] = "PCI",
28017+ [_DRM_GEM] = "GEM" };
28018 const char *type;
28019 int i;
28020
28021@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
28022 map = r_list->map;
28023 if (!map)
28024 continue;
28025- if (map->type < 0 || map->type > 5)
28026+ if (map->type >= ARRAY_SIZE(types))
28027 type = "??";
28028 else
28029 type = types[map->type];
28030@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, void *data)
28031 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
28032 vma->vm_flags & VM_LOCKED ? 'l' : '-',
28033 vma->vm_flags & VM_IO ? 'i' : '-',
28034+#ifdef CONFIG_GRKERNSEC_HIDESYM
28035+ 0);
28036+#else
28037 vma->vm_pgoff);
28038+#endif
28039
28040 #if defined(__i386__)
28041 pgprot = pgprot_val(vma->vm_page_prot);
28042diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
28043index ddd70db..40321e6 100644
28044--- a/drivers/gpu/drm/drm_ioc32.c
28045+++ b/drivers/gpu/drm/drm_ioc32.c
28046@@ -456,7 +456,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
28047 request = compat_alloc_user_space(nbytes);
28048 if (!access_ok(VERIFY_WRITE, request, nbytes))
28049 return -EFAULT;
28050- list = (struct drm_buf_desc *) (request + 1);
28051+ list = (struct drm_buf_desc __user *) (request + 1);
28052
28053 if (__put_user(count, &request->count)
28054 || __put_user(list, &request->list))
28055@@ -517,7 +517,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
28056 request = compat_alloc_user_space(nbytes);
28057 if (!access_ok(VERIFY_WRITE, request, nbytes))
28058 return -EFAULT;
28059- list = (struct drm_buf_pub *) (request + 1);
28060+ list = (struct drm_buf_pub __user *) (request + 1);
28061
28062 if (__put_user(count, &request->count)
28063 || __put_user(list, &request->list))
28064diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
28065index 904d7e9..ab88581 100644
28066--- a/drivers/gpu/drm/drm_ioctl.c
28067+++ b/drivers/gpu/drm/drm_ioctl.c
28068@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev, void *data,
28069 stats->data[i].value =
28070 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
28071 else
28072- stats->data[i].value = atomic_read(&dev->counts[i]);
28073+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
28074 stats->data[i].type = dev->types[i];
28075 }
28076
28077diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
28078index 632ae24..244cf4a 100644
28079--- a/drivers/gpu/drm/drm_lock.c
28080+++ b/drivers/gpu/drm/drm_lock.c
28081@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
28082 if (drm_lock_take(&master->lock, lock->context)) {
28083 master->lock.file_priv = file_priv;
28084 master->lock.lock_time = jiffies;
28085- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
28086+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
28087 break; /* Got lock */
28088 }
28089
28090@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
28091 return -EINVAL;
28092 }
28093
28094- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
28095+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
28096
28097 if (drm_lock_free(&master->lock, lock->context)) {
28098 /* FIXME: Should really bail out here. */
28099diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
28100index 8f371e8..9f85d52 100644
28101--- a/drivers/gpu/drm/i810/i810_dma.c
28102+++ b/drivers/gpu/drm/i810/i810_dma.c
28103@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
28104 dma->buflist[vertex->idx],
28105 vertex->discard, vertex->used);
28106
28107- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
28108- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
28109+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
28110+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
28111 sarea_priv->last_enqueue = dev_priv->counter - 1;
28112 sarea_priv->last_dispatch = (int)hw_status[5];
28113
28114@@ -1111,8 +1111,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
28115 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
28116 mc->last_render);
28117
28118- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
28119- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
28120+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
28121+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
28122 sarea_priv->last_enqueue = dev_priv->counter - 1;
28123 sarea_priv->last_dispatch = (int)hw_status[5];
28124
28125diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
28126index c9339f4..f5e1b9d 100644
28127--- a/drivers/gpu/drm/i810/i810_drv.h
28128+++ b/drivers/gpu/drm/i810/i810_drv.h
28129@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
28130 int page_flipping;
28131
28132 wait_queue_head_t irq_queue;
28133- atomic_t irq_received;
28134- atomic_t irq_emitted;
28135+ atomic_unchecked_t irq_received;
28136+ atomic_unchecked_t irq_emitted;
28137
28138 int front_offset;
28139 } drm_i810_private_t;
28140diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
28141index b2e3c97..58cf079 100644
28142--- a/drivers/gpu/drm/i915/i915_debugfs.c
28143+++ b/drivers/gpu/drm/i915/i915_debugfs.c
28144@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
28145 I915_READ(GTIMR));
28146 }
28147 seq_printf(m, "Interrupts received: %d\n",
28148- atomic_read(&dev_priv->irq_received));
28149+ atomic_read_unchecked(&dev_priv->irq_received));
28150 for (i = 0; i < I915_NUM_RINGS; i++) {
28151 if (IS_GEN6(dev) || IS_GEN7(dev)) {
28152 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
28153@@ -1232,7 +1232,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
28154 return ret;
28155
28156 if (opregion->header)
28157- seq_write(m, opregion->header, OPREGION_SIZE);
28158+ seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
28159
28160 mutex_unlock(&dev->struct_mutex);
28161
28162diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
28163index c4da951..3c59c5c 100644
28164--- a/drivers/gpu/drm/i915/i915_dma.c
28165+++ b/drivers/gpu/drm/i915/i915_dma.c
28166@@ -1172,7 +1172,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
28167 bool can_switch;
28168
28169 spin_lock(&dev->count_lock);
28170- can_switch = (dev->open_count == 0);
28171+ can_switch = (local_read(&dev->open_count) == 0);
28172 spin_unlock(&dev->count_lock);
28173 return can_switch;
28174 }
28175diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
28176index ae294a0..1755461 100644
28177--- a/drivers/gpu/drm/i915/i915_drv.h
28178+++ b/drivers/gpu/drm/i915/i915_drv.h
28179@@ -229,7 +229,7 @@ struct drm_i915_display_funcs {
28180 /* render clock increase/decrease */
28181 /* display clock increase/decrease */
28182 /* pll clock increase/decrease */
28183-};
28184+} __no_const;
28185
28186 struct intel_device_info {
28187 u8 gen;
28188@@ -318,7 +318,7 @@ typedef struct drm_i915_private {
28189 int current_page;
28190 int page_flipping;
28191
28192- atomic_t irq_received;
28193+ atomic_unchecked_t irq_received;
28194
28195 /* protects the irq masks */
28196 spinlock_t irq_lock;
28197@@ -893,7 +893,7 @@ struct drm_i915_gem_object {
28198 * will be page flipped away on the next vblank. When it
28199 * reaches 0, dev_priv->pending_flip_queue will be woken up.
28200 */
28201- atomic_t pending_flip;
28202+ atomic_unchecked_t pending_flip;
28203 };
28204
28205 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
28206@@ -1273,7 +1273,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
28207 extern void intel_teardown_gmbus(struct drm_device *dev);
28208 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
28209 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
28210-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
28211+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
28212 {
28213 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
28214 }
28215diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
28216index b9da890..cad1d98 100644
28217--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
28218+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
28219@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
28220 i915_gem_clflush_object(obj);
28221
28222 if (obj->base.pending_write_domain)
28223- cd->flips |= atomic_read(&obj->pending_flip);
28224+ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
28225
28226 /* The actual obj->write_domain will be updated with
28227 * pending_write_domain after we emit the accumulated flush for all
28228@@ -882,9 +882,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
28229
28230 static int
28231 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
28232- int count)
28233+ unsigned int count)
28234 {
28235- int i;
28236+ unsigned int i;
28237
28238 for (i = 0; i < count; i++) {
28239 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
28240diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
28241index d47a53b..61154c2 100644
28242--- a/drivers/gpu/drm/i915/i915_irq.c
28243+++ b/drivers/gpu/drm/i915/i915_irq.c
28244@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
28245 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
28246 struct drm_i915_master_private *master_priv;
28247
28248- atomic_inc(&dev_priv->irq_received);
28249+ atomic_inc_unchecked(&dev_priv->irq_received);
28250
28251 /* disable master interrupt before clearing iir */
28252 de_ier = I915_READ(DEIER);
28253@@ -566,7 +566,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
28254 struct drm_i915_master_private *master_priv;
28255 u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
28256
28257- atomic_inc(&dev_priv->irq_received);
28258+ atomic_inc_unchecked(&dev_priv->irq_received);
28259
28260 if (IS_GEN6(dev))
28261 bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
28262@@ -1231,7 +1231,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
28263 int ret = IRQ_NONE, pipe;
28264 bool blc_event = false;
28265
28266- atomic_inc(&dev_priv->irq_received);
28267+ atomic_inc_unchecked(&dev_priv->irq_received);
28268
28269 iir = I915_READ(IIR);
28270
28271@@ -1750,7 +1750,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
28272 {
28273 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
28274
28275- atomic_set(&dev_priv->irq_received, 0);
28276+ atomic_set_unchecked(&dev_priv->irq_received, 0);
28277
28278 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
28279 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
28280@@ -1938,7 +1938,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
28281 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
28282 int pipe;
28283
28284- atomic_set(&dev_priv->irq_received, 0);
28285+ atomic_set_unchecked(&dev_priv->irq_received, 0);
28286
28287 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
28288 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
28289diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
28290index daa5743..c0757a9 100644
28291--- a/drivers/gpu/drm/i915/intel_display.c
28292+++ b/drivers/gpu/drm/i915/intel_display.c
28293@@ -2230,7 +2230,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
28294
28295 wait_event(dev_priv->pending_flip_queue,
28296 atomic_read(&dev_priv->mm.wedged) ||
28297- atomic_read(&obj->pending_flip) == 0);
28298+ atomic_read_unchecked(&obj->pending_flip) == 0);
28299
28300 /* Big Hammer, we also need to ensure that any pending
28301 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
28302@@ -2851,7 +2851,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
28303 obj = to_intel_framebuffer(crtc->fb)->obj;
28304 dev_priv = crtc->dev->dev_private;
28305 wait_event(dev_priv->pending_flip_queue,
28306- atomic_read(&obj->pending_flip) == 0);
28307+ atomic_read_unchecked(&obj->pending_flip) == 0);
28308 }
28309
28310 static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
28311@@ -6952,7 +6952,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
28312
28313 atomic_clear_mask(1 << intel_crtc->plane,
28314 &obj->pending_flip.counter);
28315- if (atomic_read(&obj->pending_flip) == 0)
28316+ if (atomic_read_unchecked(&obj->pending_flip) == 0)
28317 wake_up(&dev_priv->pending_flip_queue);
28318
28319 schedule_work(&work->work);
28320@@ -7242,7 +7242,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
28321 /* Block clients from rendering to the new back buffer until
28322 * the flip occurs and the object is no longer visible.
28323 */
28324- atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
28325+ atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
28326
28327 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
28328 if (ret)
28329@@ -7256,7 +7256,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
28330 return 0;
28331
28332 cleanup_pending:
28333- atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
28334+ atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
28335 drm_gem_object_unreference(&work->old_fb_obj->base);
28336 drm_gem_object_unreference(&obj->base);
28337 mutex_unlock(&dev->struct_mutex);
28338diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
28339index 54558a0..2d97005 100644
28340--- a/drivers/gpu/drm/mga/mga_drv.h
28341+++ b/drivers/gpu/drm/mga/mga_drv.h
28342@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
28343 u32 clear_cmd;
28344 u32 maccess;
28345
28346- atomic_t vbl_received; /**< Number of vblanks received. */
28347+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
28348 wait_queue_head_t fence_queue;
28349- atomic_t last_fence_retired;
28350+ atomic_unchecked_t last_fence_retired;
28351 u32 next_fence_to_post;
28352
28353 unsigned int fb_cpp;
28354diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
28355index 2581202..f230a8d9 100644
28356--- a/drivers/gpu/drm/mga/mga_irq.c
28357+++ b/drivers/gpu/drm/mga/mga_irq.c
28358@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
28359 if (crtc != 0)
28360 return 0;
28361
28362- return atomic_read(&dev_priv->vbl_received);
28363+ return atomic_read_unchecked(&dev_priv->vbl_received);
28364 }
28365
28366
28367@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
28368 /* VBLANK interrupt */
28369 if (status & MGA_VLINEPEN) {
28370 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
28371- atomic_inc(&dev_priv->vbl_received);
28372+ atomic_inc_unchecked(&dev_priv->vbl_received);
28373 drm_handle_vblank(dev, 0);
28374 handled = 1;
28375 }
28376@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
28377 if ((prim_start & ~0x03) != (prim_end & ~0x03))
28378 MGA_WRITE(MGA_PRIMEND, prim_end);
28379
28380- atomic_inc(&dev_priv->last_fence_retired);
28381+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
28382 DRM_WAKEUP(&dev_priv->fence_queue);
28383 handled = 1;
28384 }
28385@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
28386 * using fences.
28387 */
28388 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
28389- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
28390+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
28391 - *sequence) <= (1 << 23)));
28392
28393 *sequence = cur_fence;
28394diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
28395index 5fc201b..7b032b9 100644
28396--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
28397+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
28398@@ -201,7 +201,7 @@ struct methods {
28399 const char desc[8];
28400 void (*loadbios)(struct drm_device *, uint8_t *);
28401 const bool rw;
28402-};
28403+} __do_const;
28404
28405 static struct methods shadow_methods[] = {
28406 { "PRAMIN", load_vbios_pramin, true },
28407@@ -5474,7 +5474,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
28408 struct bit_table {
28409 const char id;
28410 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
28411-};
28412+} __no_const;
28413
28414 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
28415
28416diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
28417index 4c0be3a..5757582 100644
28418--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
28419+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
28420@@ -238,7 +238,7 @@ struct nouveau_channel {
28421 struct list_head pending;
28422 uint32_t sequence;
28423 uint32_t sequence_ack;
28424- atomic_t last_sequence_irq;
28425+ atomic_unchecked_t last_sequence_irq;
28426 struct nouveau_vma vma;
28427 } fence;
28428
28429@@ -319,7 +319,7 @@ struct nouveau_exec_engine {
28430 u32 handle, u16 class);
28431 void (*set_tile_region)(struct drm_device *dev, int i);
28432 void (*tlb_flush)(struct drm_device *, int engine);
28433-};
28434+} __no_const;
28435
28436 struct nouveau_instmem_engine {
28437 void *priv;
28438@@ -341,13 +341,13 @@ struct nouveau_instmem_engine {
28439 struct nouveau_mc_engine {
28440 int (*init)(struct drm_device *dev);
28441 void (*takedown)(struct drm_device *dev);
28442-};
28443+} __no_const;
28444
28445 struct nouveau_timer_engine {
28446 int (*init)(struct drm_device *dev);
28447 void (*takedown)(struct drm_device *dev);
28448 uint64_t (*read)(struct drm_device *dev);
28449-};
28450+} __no_const;
28451
28452 struct nouveau_fb_engine {
28453 int num_tiles;
28454@@ -558,7 +558,7 @@ struct nouveau_vram_engine {
28455 void (*put)(struct drm_device *, struct nouveau_mem **);
28456
28457 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
28458-};
28459+} __no_const;
28460
28461 struct nouveau_engine {
28462 struct nouveau_instmem_engine instmem;
28463@@ -706,7 +706,7 @@ struct drm_nouveau_private {
28464 struct drm_global_reference mem_global_ref;
28465 struct ttm_bo_global_ref bo_global_ref;
28466 struct ttm_bo_device bdev;
28467- atomic_t validate_sequence;
28468+ atomic_unchecked_t validate_sequence;
28469 } ttm;
28470
28471 struct {
28472diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
28473index 2f6daae..c9d7b9e 100644
28474--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
28475+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
28476@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
28477 if (USE_REFCNT(dev))
28478 sequence = nvchan_rd32(chan, 0x48);
28479 else
28480- sequence = atomic_read(&chan->fence.last_sequence_irq);
28481+ sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq);
28482
28483 if (chan->fence.sequence_ack == sequence)
28484 goto out;
28485@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
28486 return ret;
28487 }
28488
28489- atomic_set(&chan->fence.last_sequence_irq, 0);
28490+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
28491 return 0;
28492 }
28493
28494diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
28495index 7ce3fde..cb3ea04 100644
28496--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
28497+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
28498@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
28499 int trycnt = 0;
28500 int ret, i;
28501
28502- sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
28503+ sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
28504 retry:
28505 if (++trycnt > 100000) {
28506 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
28507diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
28508index d8831ab..0ba8356 100644
28509--- a/drivers/gpu/drm/nouveau/nouveau_state.c
28510+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
28511@@ -542,7 +542,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
28512 bool can_switch;
28513
28514 spin_lock(&dev->count_lock);
28515- can_switch = (dev->open_count == 0);
28516+ can_switch = (local_read(&dev->open_count) == 0);
28517 spin_unlock(&dev->count_lock);
28518 return can_switch;
28519 }
28520diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
28521index dbdea8e..cd6eeeb 100644
28522--- a/drivers/gpu/drm/nouveau/nv04_graph.c
28523+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
28524@@ -554,7 +554,7 @@ static int
28525 nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
28526 u32 class, u32 mthd, u32 data)
28527 {
28528- atomic_set(&chan->fence.last_sequence_irq, data);
28529+ atomic_set_unchecked(&chan->fence.last_sequence_irq, data);
28530 return 0;
28531 }
28532
28533diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
28534index bcac90b..53bfc76 100644
28535--- a/drivers/gpu/drm/r128/r128_cce.c
28536+++ b/drivers/gpu/drm/r128/r128_cce.c
28537@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
28538
28539 /* GH: Simple idle check.
28540 */
28541- atomic_set(&dev_priv->idle_count, 0);
28542+ atomic_set_unchecked(&dev_priv->idle_count, 0);
28543
28544 /* We don't support anything other than bus-mastering ring mode,
28545 * but the ring can be in either AGP or PCI space for the ring
28546diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
28547index 930c71b..499aded 100644
28548--- a/drivers/gpu/drm/r128/r128_drv.h
28549+++ b/drivers/gpu/drm/r128/r128_drv.h
28550@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
28551 int is_pci;
28552 unsigned long cce_buffers_offset;
28553
28554- atomic_t idle_count;
28555+ atomic_unchecked_t idle_count;
28556
28557 int page_flipping;
28558 int current_page;
28559 u32 crtc_offset;
28560 u32 crtc_offset_cntl;
28561
28562- atomic_t vbl_received;
28563+ atomic_unchecked_t vbl_received;
28564
28565 u32 color_fmt;
28566 unsigned int front_offset;
28567diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
28568index 429d5a0..7e899ed 100644
28569--- a/drivers/gpu/drm/r128/r128_irq.c
28570+++ b/drivers/gpu/drm/r128/r128_irq.c
28571@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
28572 if (crtc != 0)
28573 return 0;
28574
28575- return atomic_read(&dev_priv->vbl_received);
28576+ return atomic_read_unchecked(&dev_priv->vbl_received);
28577 }
28578
28579 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
28580@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
28581 /* VBLANK interrupt */
28582 if (status & R128_CRTC_VBLANK_INT) {
28583 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
28584- atomic_inc(&dev_priv->vbl_received);
28585+ atomic_inc_unchecked(&dev_priv->vbl_received);
28586 drm_handle_vblank(dev, 0);
28587 return IRQ_HANDLED;
28588 }
28589diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
28590index a9e33ce..09edd4b 100644
28591--- a/drivers/gpu/drm/r128/r128_state.c
28592+++ b/drivers/gpu/drm/r128/r128_state.c
28593@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
28594
28595 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
28596 {
28597- if (atomic_read(&dev_priv->idle_count) == 0)
28598+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
28599 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
28600 else
28601- atomic_set(&dev_priv->idle_count, 0);
28602+ atomic_set_unchecked(&dev_priv->idle_count, 0);
28603 }
28604
28605 #endif
28606diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
28607index 5a82b6b..9e69c73 100644
28608--- a/drivers/gpu/drm/radeon/mkregtable.c
28609+++ b/drivers/gpu/drm/radeon/mkregtable.c
28610@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
28611 regex_t mask_rex;
28612 regmatch_t match[4];
28613 char buf[1024];
28614- size_t end;
28615+ long end;
28616 int len;
28617 int done = 0;
28618 int r;
28619 unsigned o;
28620 struct offset *offset;
28621 char last_reg_s[10];
28622- int last_reg;
28623+ unsigned long last_reg;
28624
28625 if (regcomp
28626 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
28627diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
28628index 8227e76..ce0b195 100644
28629--- a/drivers/gpu/drm/radeon/radeon.h
28630+++ b/drivers/gpu/drm/radeon/radeon.h
28631@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_device *rdev);
28632 */
28633 struct radeon_fence_driver {
28634 uint32_t scratch_reg;
28635- atomic_t seq;
28636+ atomic_unchecked_t seq;
28637 uint32_t last_seq;
28638 unsigned long last_jiffies;
28639 unsigned long last_timeout;
28640@@ -530,7 +530,7 @@ struct r600_blit_cp_primitives {
28641 int x2, int y2);
28642 void (*draw_auto)(struct radeon_device *rdev);
28643 void (*set_default_state)(struct radeon_device *rdev);
28644-};
28645+} __no_const;
28646
28647 struct r600_blit {
28648 struct mutex mutex;
28649@@ -954,7 +954,7 @@ struct radeon_asic {
28650 void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
28651 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
28652 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
28653-};
28654+} __no_const;
28655
28656 /*
28657 * Asic structures
28658diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
28659index 9231564..78b00fd 100644
28660--- a/drivers/gpu/drm/radeon/radeon_device.c
28661+++ b/drivers/gpu/drm/radeon/radeon_device.c
28662@@ -687,7 +687,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
28663 bool can_switch;
28664
28665 spin_lock(&dev->count_lock);
28666- can_switch = (dev->open_count == 0);
28667+ can_switch = (local_read(&dev->open_count) == 0);
28668 spin_unlock(&dev->count_lock);
28669 return can_switch;
28670 }
28671diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
28672index a1b59ca..86f2d44 100644
28673--- a/drivers/gpu/drm/radeon/radeon_drv.h
28674+++ b/drivers/gpu/drm/radeon/radeon_drv.h
28675@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
28676
28677 /* SW interrupt */
28678 wait_queue_head_t swi_queue;
28679- atomic_t swi_emitted;
28680+ atomic_unchecked_t swi_emitted;
28681 int vblank_crtc;
28682 uint32_t irq_enable_reg;
28683 uint32_t r500_disp_irq_reg;
28684diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
28685index 76ec0e9..6feb1a3 100644
28686--- a/drivers/gpu/drm/radeon/radeon_fence.c
28687+++ b/drivers/gpu/drm/radeon/radeon_fence.c
28688@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
28689 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
28690 return 0;
28691 }
28692- fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
28693+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
28694 if (!rdev->cp.ready)
28695 /* FIXME: cp is not running assume everythings is done right
28696 * away
28697@@ -373,7 +373,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
28698 return r;
28699 }
28700 radeon_fence_write(rdev, 0);
28701- atomic_set(&rdev->fence_drv.seq, 0);
28702+ atomic_set_unchecked(&rdev->fence_drv.seq, 0);
28703 INIT_LIST_HEAD(&rdev->fence_drv.created);
28704 INIT_LIST_HEAD(&rdev->fence_drv.emited);
28705 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
28706diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
28707index 48b7cea..342236f 100644
28708--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
28709+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
28710@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
28711 request = compat_alloc_user_space(sizeof(*request));
28712 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
28713 || __put_user(req32.param, &request->param)
28714- || __put_user((void __user *)(unsigned long)req32.value,
28715+ || __put_user((unsigned long)req32.value,
28716 &request->value))
28717 return -EFAULT;
28718
28719diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
28720index 00da384..32f972d 100644
28721--- a/drivers/gpu/drm/radeon/radeon_irq.c
28722+++ b/drivers/gpu/drm/radeon/radeon_irq.c
28723@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
28724 unsigned int ret;
28725 RING_LOCALS;
28726
28727- atomic_inc(&dev_priv->swi_emitted);
28728- ret = atomic_read(&dev_priv->swi_emitted);
28729+ atomic_inc_unchecked(&dev_priv->swi_emitted);
28730+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
28731
28732 BEGIN_RING(4);
28733 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
28734@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
28735 drm_radeon_private_t *dev_priv =
28736 (drm_radeon_private_t *) dev->dev_private;
28737
28738- atomic_set(&dev_priv->swi_emitted, 0);
28739+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
28740 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
28741
28742 dev->max_vblank_count = 0x001fffff;
28743diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
28744index e8422ae..d22d4a8 100644
28745--- a/drivers/gpu/drm/radeon/radeon_state.c
28746+++ b/drivers/gpu/drm/radeon/radeon_state.c
28747@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
28748 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
28749 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
28750
28751- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
28752+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
28753 sarea_priv->nbox * sizeof(depth_boxes[0])))
28754 return -EFAULT;
28755
28756@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
28757 {
28758 drm_radeon_private_t *dev_priv = dev->dev_private;
28759 drm_radeon_getparam_t *param = data;
28760- int value;
28761+ int value = 0;
28762
28763 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
28764
28765diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
28766index 0b5468b..9c4b308 100644
28767--- a/drivers/gpu/drm/radeon/radeon_ttm.c
28768+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
28769@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
28770 }
28771 if (unlikely(ttm_vm_ops == NULL)) {
28772 ttm_vm_ops = vma->vm_ops;
28773- radeon_ttm_vm_ops = *ttm_vm_ops;
28774- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
28775+ pax_open_kernel();
28776+ memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
28777+ *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
28778+ pax_close_kernel();
28779 }
28780 vma->vm_ops = &radeon_ttm_vm_ops;
28781 return 0;
28782diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
28783index a9049ed..501f284 100644
28784--- a/drivers/gpu/drm/radeon/rs690.c
28785+++ b/drivers/gpu/drm/radeon/rs690.c
28786@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
28787 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
28788 rdev->pm.sideport_bandwidth.full)
28789 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
28790- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
28791+ read_delay_latency.full = dfixed_const(800 * 1000);
28792 read_delay_latency.full = dfixed_div(read_delay_latency,
28793 rdev->pm.igp_sideport_mclk);
28794+ a.full = dfixed_const(370);
28795+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
28796 } else {
28797 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
28798 rdev->pm.k8_bandwidth.full)
28799diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
28800index 727e93d..1565650 100644
28801--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
28802+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
28803@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages(void)
28804 static int ttm_pool_mm_shrink(struct shrinker *shrink,
28805 struct shrink_control *sc)
28806 {
28807- static atomic_t start_pool = ATOMIC_INIT(0);
28808+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
28809 unsigned i;
28810- unsigned pool_offset = atomic_add_return(1, &start_pool);
28811+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
28812 struct ttm_page_pool *pool;
28813 int shrink_pages = sc->nr_to_scan;
28814
28815diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
28816index 9cf87d9..2000b7d 100644
28817--- a/drivers/gpu/drm/via/via_drv.h
28818+++ b/drivers/gpu/drm/via/via_drv.h
28819@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
28820 typedef uint32_t maskarray_t[5];
28821
28822 typedef struct drm_via_irq {
28823- atomic_t irq_received;
28824+ atomic_unchecked_t irq_received;
28825 uint32_t pending_mask;
28826 uint32_t enable_mask;
28827 wait_queue_head_t irq_queue;
28828@@ -75,7 +75,7 @@ typedef struct drm_via_private {
28829 struct timeval last_vblank;
28830 int last_vblank_valid;
28831 unsigned usec_per_vblank;
28832- atomic_t vbl_received;
28833+ atomic_unchecked_t vbl_received;
28834 drm_via_state_t hc_state;
28835 char pci_buf[VIA_PCI_BUF_SIZE];
28836 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
28837diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
28838index d391f48..10c8ca3 100644
28839--- a/drivers/gpu/drm/via/via_irq.c
28840+++ b/drivers/gpu/drm/via/via_irq.c
28841@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
28842 if (crtc != 0)
28843 return 0;
28844
28845- return atomic_read(&dev_priv->vbl_received);
28846+ return atomic_read_unchecked(&dev_priv->vbl_received);
28847 }
28848
28849 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
28850@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
28851
28852 status = VIA_READ(VIA_REG_INTERRUPT);
28853 if (status & VIA_IRQ_VBLANK_PENDING) {
28854- atomic_inc(&dev_priv->vbl_received);
28855- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
28856+ atomic_inc_unchecked(&dev_priv->vbl_received);
28857+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
28858 do_gettimeofday(&cur_vblank);
28859 if (dev_priv->last_vblank_valid) {
28860 dev_priv->usec_per_vblank =
28861@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
28862 dev_priv->last_vblank = cur_vblank;
28863 dev_priv->last_vblank_valid = 1;
28864 }
28865- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
28866+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
28867 DRM_DEBUG("US per vblank is: %u\n",
28868 dev_priv->usec_per_vblank);
28869 }
28870@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
28871
28872 for (i = 0; i < dev_priv->num_irqs; ++i) {
28873 if (status & cur_irq->pending_mask) {
28874- atomic_inc(&cur_irq->irq_received);
28875+ atomic_inc_unchecked(&cur_irq->irq_received);
28876 DRM_WAKEUP(&cur_irq->irq_queue);
28877 handled = 1;
28878 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
28879@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
28880 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
28881 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
28882 masks[irq][4]));
28883- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
28884+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
28885 } else {
28886 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
28887 (((cur_irq_sequence =
28888- atomic_read(&cur_irq->irq_received)) -
28889+ atomic_read_unchecked(&cur_irq->irq_received)) -
28890 *sequence) <= (1 << 23)));
28891 }
28892 *sequence = cur_irq_sequence;
28893@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
28894 }
28895
28896 for (i = 0; i < dev_priv->num_irqs; ++i) {
28897- atomic_set(&cur_irq->irq_received, 0);
28898+ atomic_set_unchecked(&cur_irq->irq_received, 0);
28899 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
28900 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
28901 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
28902@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
28903 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
28904 case VIA_IRQ_RELATIVE:
28905 irqwait->request.sequence +=
28906- atomic_read(&cur_irq->irq_received);
28907+ atomic_read_unchecked(&cur_irq->irq_received);
28908 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
28909 case VIA_IRQ_ABSOLUTE:
28910 break;
28911diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
28912index dc27970..f18b008 100644
28913--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
28914+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
28915@@ -260,7 +260,7 @@ struct vmw_private {
28916 * Fencing and IRQs.
28917 */
28918
28919- atomic_t marker_seq;
28920+ atomic_unchecked_t marker_seq;
28921 wait_queue_head_t fence_queue;
28922 wait_queue_head_t fifo_queue;
28923 int fence_queue_waiters; /* Protected by hw_mutex */
28924diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
28925index a0c2f12..68ae6cb 100644
28926--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
28927+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
28928@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
28929 (unsigned int) min,
28930 (unsigned int) fifo->capabilities);
28931
28932- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
28933+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
28934 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
28935 vmw_marker_queue_init(&fifo->marker_queue);
28936 return vmw_fifo_send_fence(dev_priv, &dummy);
28937@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
28938 if (reserveable)
28939 iowrite32(bytes, fifo_mem +
28940 SVGA_FIFO_RESERVED);
28941- return fifo_mem + (next_cmd >> 2);
28942+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
28943 } else {
28944 need_bounce = true;
28945 }
28946@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
28947
28948 fm = vmw_fifo_reserve(dev_priv, bytes);
28949 if (unlikely(fm == NULL)) {
28950- *seqno = atomic_read(&dev_priv->marker_seq);
28951+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
28952 ret = -ENOMEM;
28953 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
28954 false, 3*HZ);
28955@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
28956 }
28957
28958 do {
28959- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
28960+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
28961 } while (*seqno == 0);
28962
28963 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
28964diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
28965index cabc95f..14b3d77 100644
28966--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
28967+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
28968@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
28969 * emitted. Then the fence is stale and signaled.
28970 */
28971
28972- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
28973+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
28974 > VMW_FENCE_WRAP);
28975
28976 return ret;
28977@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
28978
28979 if (fifo_idle)
28980 down_read(&fifo_state->rwsem);
28981- signal_seq = atomic_read(&dev_priv->marker_seq);
28982+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
28983 ret = 0;
28984
28985 for (;;) {
28986diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
28987index 8a8725c..afed796 100644
28988--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
28989+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
28990@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
28991 while (!vmw_lag_lt(queue, us)) {
28992 spin_lock(&queue->lock);
28993 if (list_empty(&queue->head))
28994- seqno = atomic_read(&dev_priv->marker_seq);
28995+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
28996 else {
28997 marker = list_first_entry(&queue->head,
28998 struct vmw_marker, head);
28999diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
29000index bb656d8..4169fca 100644
29001--- a/drivers/hid/hid-core.c
29002+++ b/drivers/hid/hid-core.c
29003@@ -2012,7 +2012,7 @@ static bool hid_ignore(struct hid_device *hdev)
29004
29005 int hid_add_device(struct hid_device *hdev)
29006 {
29007- static atomic_t id = ATOMIC_INIT(0);
29008+ static atomic_unchecked_t id = ATOMIC_INIT(0);
29009 int ret;
29010
29011 if (WARN_ON(hdev->status & HID_STAT_ADDED))
29012@@ -2027,7 +2027,7 @@ int hid_add_device(struct hid_device *hdev)
29013 /* XXX hack, any other cleaner solution after the driver core
29014 * is converted to allow more than 20 bytes as the device name? */
29015 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
29016- hdev->vendor, hdev->product, atomic_inc_return(&id));
29017+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
29018
29019 hid_debug_register(hdev, dev_name(&hdev->dev));
29020 ret = device_add(&hdev->dev);
29021diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
29022index 4ef02b2..8a96831 100644
29023--- a/drivers/hid/usbhid/hiddev.c
29024+++ b/drivers/hid/usbhid/hiddev.c
29025@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
29026 break;
29027
29028 case HIDIOCAPPLICATION:
29029- if (arg < 0 || arg >= hid->maxapplication)
29030+ if (arg >= hid->maxapplication)
29031 break;
29032
29033 for (i = 0; i < hid->maxcollection; i++)
29034diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
29035index 4065374..10ed7dc 100644
29036--- a/drivers/hv/channel.c
29037+++ b/drivers/hv/channel.c
29038@@ -400,8 +400,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
29039 int ret = 0;
29040 int t;
29041
29042- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
29043- atomic_inc(&vmbus_connection.next_gpadl_handle);
29044+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
29045+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
29046
29047 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
29048 if (ret)
29049diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
29050index 0fb100e..baf87e5 100644
29051--- a/drivers/hv/hv.c
29052+++ b/drivers/hv/hv.c
29053@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
29054 u64 output_address = (output) ? virt_to_phys(output) : 0;
29055 u32 output_address_hi = output_address >> 32;
29056 u32 output_address_lo = output_address & 0xFFFFFFFF;
29057- void *hypercall_page = hv_context.hypercall_page;
29058+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
29059
29060 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
29061 "=a"(hv_status_lo) : "d" (control_hi),
29062diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
29063index 0aee112..b72d21f 100644
29064--- a/drivers/hv/hyperv_vmbus.h
29065+++ b/drivers/hv/hyperv_vmbus.h
29066@@ -556,7 +556,7 @@ enum vmbus_connect_state {
29067 struct vmbus_connection {
29068 enum vmbus_connect_state conn_state;
29069
29070- atomic_t next_gpadl_handle;
29071+ atomic_unchecked_t next_gpadl_handle;
29072
29073 /*
29074 * Represents channel interrupts. Each bit position represents a
29075diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
29076index d2d0a2a..90b8f4d 100644
29077--- a/drivers/hv/vmbus_drv.c
29078+++ b/drivers/hv/vmbus_drv.c
29079@@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
29080 {
29081 int ret = 0;
29082
29083- static atomic_t device_num = ATOMIC_INIT(0);
29084+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
29085
29086 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
29087- atomic_inc_return(&device_num));
29088+ atomic_inc_return_unchecked(&device_num));
29089
29090 child_device_obj->device.bus = &hv_bus;
29091 child_device_obj->device.parent = &hv_acpi_dev->dev;
29092diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
29093index 66f6729..2d6de0a 100644
29094--- a/drivers/hwmon/acpi_power_meter.c
29095+++ b/drivers/hwmon/acpi_power_meter.c
29096@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
29097 return res;
29098
29099 temp /= 1000;
29100- if (temp < 0)
29101- return -EINVAL;
29102
29103 mutex_lock(&resource->lock);
29104 resource->trip[attr->index - 7] = temp;
29105diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
29106index 5357925..6cf0418 100644
29107--- a/drivers/hwmon/sht15.c
29108+++ b/drivers/hwmon/sht15.c
29109@@ -166,7 +166,7 @@ struct sht15_data {
29110 int supply_uV;
29111 bool supply_uV_valid;
29112 struct work_struct update_supply_work;
29113- atomic_t interrupt_handled;
29114+ atomic_unchecked_t interrupt_handled;
29115 };
29116
29117 /**
29118@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
29119 return ret;
29120
29121 gpio_direction_input(data->pdata->gpio_data);
29122- atomic_set(&data->interrupt_handled, 0);
29123+ atomic_set_unchecked(&data->interrupt_handled, 0);
29124
29125 enable_irq(gpio_to_irq(data->pdata->gpio_data));
29126 if (gpio_get_value(data->pdata->gpio_data) == 0) {
29127 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
29128 /* Only relevant if the interrupt hasn't occurred. */
29129- if (!atomic_read(&data->interrupt_handled))
29130+ if (!atomic_read_unchecked(&data->interrupt_handled))
29131 schedule_work(&data->read_work);
29132 }
29133 ret = wait_event_timeout(data->wait_queue,
29134@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
29135
29136 /* First disable the interrupt */
29137 disable_irq_nosync(irq);
29138- atomic_inc(&data->interrupt_handled);
29139+ atomic_inc_unchecked(&data->interrupt_handled);
29140 /* Then schedule a reading work struct */
29141 if (data->state != SHT15_READING_NOTHING)
29142 schedule_work(&data->read_work);
29143@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
29144 * If not, then start the interrupt again - care here as could
29145 * have gone low in meantime so verify it hasn't!
29146 */
29147- atomic_set(&data->interrupt_handled, 0);
29148+ atomic_set_unchecked(&data->interrupt_handled, 0);
29149 enable_irq(gpio_to_irq(data->pdata->gpio_data));
29150 /* If still not occurred or another handler has been scheduled */
29151 if (gpio_get_value(data->pdata->gpio_data)
29152- || atomic_read(&data->interrupt_handled))
29153+ || atomic_read_unchecked(&data->interrupt_handled))
29154 return;
29155 }
29156
29157diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
29158index 378fcb5..5e91fa8 100644
29159--- a/drivers/i2c/busses/i2c-amd756-s4882.c
29160+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
29161@@ -43,7 +43,7 @@
29162 extern struct i2c_adapter amd756_smbus;
29163
29164 static struct i2c_adapter *s4882_adapter;
29165-static struct i2c_algorithm *s4882_algo;
29166+static i2c_algorithm_no_const *s4882_algo;
29167
29168 /* Wrapper access functions for multiplexed SMBus */
29169 static DEFINE_MUTEX(amd756_lock);
29170diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
29171index 29015eb..af2d8e9 100644
29172--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
29173+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
29174@@ -41,7 +41,7 @@
29175 extern struct i2c_adapter *nforce2_smbus;
29176
29177 static struct i2c_adapter *s4985_adapter;
29178-static struct i2c_algorithm *s4985_algo;
29179+static i2c_algorithm_no_const *s4985_algo;
29180
29181 /* Wrapper access functions for multiplexed SMBus */
29182 static DEFINE_MUTEX(nforce2_lock);
29183diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
29184index d7a4833..7fae376 100644
29185--- a/drivers/i2c/i2c-mux.c
29186+++ b/drivers/i2c/i2c-mux.c
29187@@ -28,7 +28,7 @@
29188 /* multiplexer per channel data */
29189 struct i2c_mux_priv {
29190 struct i2c_adapter adap;
29191- struct i2c_algorithm algo;
29192+ i2c_algorithm_no_const algo;
29193
29194 struct i2c_adapter *parent;
29195 void *mux_dev; /* the mux chip/device */
29196diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
29197index 57d00ca..0145194 100644
29198--- a/drivers/ide/aec62xx.c
29199+++ b/drivers/ide/aec62xx.c
29200@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
29201 .cable_detect = atp86x_cable_detect,
29202 };
29203
29204-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
29205+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
29206 { /* 0: AEC6210 */
29207 .name = DRV_NAME,
29208 .init_chipset = init_chipset_aec62xx,
29209diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
29210index 2c8016a..911a27c 100644
29211--- a/drivers/ide/alim15x3.c
29212+++ b/drivers/ide/alim15x3.c
29213@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
29214 .dma_sff_read_status = ide_dma_sff_read_status,
29215 };
29216
29217-static const struct ide_port_info ali15x3_chipset __devinitdata = {
29218+static const struct ide_port_info ali15x3_chipset __devinitconst = {
29219 .name = DRV_NAME,
29220 .init_chipset = init_chipset_ali15x3,
29221 .init_hwif = init_hwif_ali15x3,
29222diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
29223index 3747b25..56fc995 100644
29224--- a/drivers/ide/amd74xx.c
29225+++ b/drivers/ide/amd74xx.c
29226@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
29227 .udma_mask = udma, \
29228 }
29229
29230-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
29231+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
29232 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
29233 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
29234 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
29235diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
29236index 15f0ead..cb43480 100644
29237--- a/drivers/ide/atiixp.c
29238+++ b/drivers/ide/atiixp.c
29239@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
29240 .cable_detect = atiixp_cable_detect,
29241 };
29242
29243-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
29244+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
29245 { /* 0: IXP200/300/400/700 */
29246 .name = DRV_NAME,
29247 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
29248diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
29249index 5f80312..d1fc438 100644
29250--- a/drivers/ide/cmd64x.c
29251+++ b/drivers/ide/cmd64x.c
29252@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
29253 .dma_sff_read_status = ide_dma_sff_read_status,
29254 };
29255
29256-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
29257+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
29258 { /* 0: CMD643 */
29259 .name = DRV_NAME,
29260 .init_chipset = init_chipset_cmd64x,
29261diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
29262index 2c1e5f7..1444762 100644
29263--- a/drivers/ide/cs5520.c
29264+++ b/drivers/ide/cs5520.c
29265@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
29266 .set_dma_mode = cs5520_set_dma_mode,
29267 };
29268
29269-static const struct ide_port_info cyrix_chipset __devinitdata = {
29270+static const struct ide_port_info cyrix_chipset __devinitconst = {
29271 .name = DRV_NAME,
29272 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
29273 .port_ops = &cs5520_port_ops,
29274diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
29275index 4dc4eb9..49b40ad 100644
29276--- a/drivers/ide/cs5530.c
29277+++ b/drivers/ide/cs5530.c
29278@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
29279 .udma_filter = cs5530_udma_filter,
29280 };
29281
29282-static const struct ide_port_info cs5530_chipset __devinitdata = {
29283+static const struct ide_port_info cs5530_chipset __devinitconst = {
29284 .name = DRV_NAME,
29285 .init_chipset = init_chipset_cs5530,
29286 .init_hwif = init_hwif_cs5530,
29287diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
29288index 5059faf..18d4c85 100644
29289--- a/drivers/ide/cs5535.c
29290+++ b/drivers/ide/cs5535.c
29291@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
29292 .cable_detect = cs5535_cable_detect,
29293 };
29294
29295-static const struct ide_port_info cs5535_chipset __devinitdata = {
29296+static const struct ide_port_info cs5535_chipset __devinitconst = {
29297 .name = DRV_NAME,
29298 .port_ops = &cs5535_port_ops,
29299 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
29300diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
29301index 847553f..3ffb49d 100644
29302--- a/drivers/ide/cy82c693.c
29303+++ b/drivers/ide/cy82c693.c
29304@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
29305 .set_dma_mode = cy82c693_set_dma_mode,
29306 };
29307
29308-static const struct ide_port_info cy82c693_chipset __devinitdata = {
29309+static const struct ide_port_info cy82c693_chipset __devinitconst = {
29310 .name = DRV_NAME,
29311 .init_iops = init_iops_cy82c693,
29312 .port_ops = &cy82c693_port_ops,
29313diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
29314index 58c51cd..4aec3b8 100644
29315--- a/drivers/ide/hpt366.c
29316+++ b/drivers/ide/hpt366.c
29317@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
29318 }
29319 };
29320
29321-static const struct hpt_info hpt36x __devinitdata = {
29322+static const struct hpt_info hpt36x __devinitconst = {
29323 .chip_name = "HPT36x",
29324 .chip_type = HPT36x,
29325 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
29326@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
29327 .timings = &hpt36x_timings
29328 };
29329
29330-static const struct hpt_info hpt370 __devinitdata = {
29331+static const struct hpt_info hpt370 __devinitconst = {
29332 .chip_name = "HPT370",
29333 .chip_type = HPT370,
29334 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
29335@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
29336 .timings = &hpt37x_timings
29337 };
29338
29339-static const struct hpt_info hpt370a __devinitdata = {
29340+static const struct hpt_info hpt370a __devinitconst = {
29341 .chip_name = "HPT370A",
29342 .chip_type = HPT370A,
29343 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
29344@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
29345 .timings = &hpt37x_timings
29346 };
29347
29348-static const struct hpt_info hpt374 __devinitdata = {
29349+static const struct hpt_info hpt374 __devinitconst = {
29350 .chip_name = "HPT374",
29351 .chip_type = HPT374,
29352 .udma_mask = ATA_UDMA5,
29353@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
29354 .timings = &hpt37x_timings
29355 };
29356
29357-static const struct hpt_info hpt372 __devinitdata = {
29358+static const struct hpt_info hpt372 __devinitconst = {
29359 .chip_name = "HPT372",
29360 .chip_type = HPT372,
29361 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29362@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
29363 .timings = &hpt37x_timings
29364 };
29365
29366-static const struct hpt_info hpt372a __devinitdata = {
29367+static const struct hpt_info hpt372a __devinitconst = {
29368 .chip_name = "HPT372A",
29369 .chip_type = HPT372A,
29370 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29371@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
29372 .timings = &hpt37x_timings
29373 };
29374
29375-static const struct hpt_info hpt302 __devinitdata = {
29376+static const struct hpt_info hpt302 __devinitconst = {
29377 .chip_name = "HPT302",
29378 .chip_type = HPT302,
29379 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29380@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
29381 .timings = &hpt37x_timings
29382 };
29383
29384-static const struct hpt_info hpt371 __devinitdata = {
29385+static const struct hpt_info hpt371 __devinitconst = {
29386 .chip_name = "HPT371",
29387 .chip_type = HPT371,
29388 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29389@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
29390 .timings = &hpt37x_timings
29391 };
29392
29393-static const struct hpt_info hpt372n __devinitdata = {
29394+static const struct hpt_info hpt372n __devinitconst = {
29395 .chip_name = "HPT372N",
29396 .chip_type = HPT372N,
29397 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29398@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
29399 .timings = &hpt37x_timings
29400 };
29401
29402-static const struct hpt_info hpt302n __devinitdata = {
29403+static const struct hpt_info hpt302n __devinitconst = {
29404 .chip_name = "HPT302N",
29405 .chip_type = HPT302N,
29406 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29407@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
29408 .timings = &hpt37x_timings
29409 };
29410
29411-static const struct hpt_info hpt371n __devinitdata = {
29412+static const struct hpt_info hpt371n __devinitconst = {
29413 .chip_name = "HPT371N",
29414 .chip_type = HPT371N,
29415 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
29416@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
29417 .dma_sff_read_status = ide_dma_sff_read_status,
29418 };
29419
29420-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
29421+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
29422 { /* 0: HPT36x */
29423 .name = DRV_NAME,
29424 .init_chipset = init_chipset_hpt366,
29425diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
29426index 8126824..55a2798 100644
29427--- a/drivers/ide/ide-cd.c
29428+++ b/drivers/ide/ide-cd.c
29429@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
29430 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
29431 if ((unsigned long)buf & alignment
29432 || blk_rq_bytes(rq) & q->dma_pad_mask
29433- || object_is_on_stack(buf))
29434+ || object_starts_on_stack(buf))
29435 drive->dma = 0;
29436 }
29437 }
29438diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
29439index a743e68..1cfd674 100644
29440--- a/drivers/ide/ide-pci-generic.c
29441+++ b/drivers/ide/ide-pci-generic.c
29442@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
29443 .udma_mask = ATA_UDMA6, \
29444 }
29445
29446-static const struct ide_port_info generic_chipsets[] __devinitdata = {
29447+static const struct ide_port_info generic_chipsets[] __devinitconst = {
29448 /* 0: Unknown */
29449 DECLARE_GENERIC_PCI_DEV(0),
29450
29451diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
29452index 560e66d..d5dd180 100644
29453--- a/drivers/ide/it8172.c
29454+++ b/drivers/ide/it8172.c
29455@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
29456 .set_dma_mode = it8172_set_dma_mode,
29457 };
29458
29459-static const struct ide_port_info it8172_port_info __devinitdata = {
29460+static const struct ide_port_info it8172_port_info __devinitconst = {
29461 .name = DRV_NAME,
29462 .port_ops = &it8172_port_ops,
29463 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
29464diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
29465index 46816ba..1847aeb 100644
29466--- a/drivers/ide/it8213.c
29467+++ b/drivers/ide/it8213.c
29468@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
29469 .cable_detect = it8213_cable_detect,
29470 };
29471
29472-static const struct ide_port_info it8213_chipset __devinitdata = {
29473+static const struct ide_port_info it8213_chipset __devinitconst = {
29474 .name = DRV_NAME,
29475 .enablebits = { {0x41, 0x80, 0x80} },
29476 .port_ops = &it8213_port_ops,
29477diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
29478index 2e3169f..c5611db 100644
29479--- a/drivers/ide/it821x.c
29480+++ b/drivers/ide/it821x.c
29481@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
29482 .cable_detect = it821x_cable_detect,
29483 };
29484
29485-static const struct ide_port_info it821x_chipset __devinitdata = {
29486+static const struct ide_port_info it821x_chipset __devinitconst = {
29487 .name = DRV_NAME,
29488 .init_chipset = init_chipset_it821x,
29489 .init_hwif = init_hwif_it821x,
29490diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
29491index 74c2c4a..efddd7d 100644
29492--- a/drivers/ide/jmicron.c
29493+++ b/drivers/ide/jmicron.c
29494@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
29495 .cable_detect = jmicron_cable_detect,
29496 };
29497
29498-static const struct ide_port_info jmicron_chipset __devinitdata = {
29499+static const struct ide_port_info jmicron_chipset __devinitconst = {
29500 .name = DRV_NAME,
29501 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
29502 .port_ops = &jmicron_port_ops,
29503diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
29504index 95327a2..73f78d8 100644
29505--- a/drivers/ide/ns87415.c
29506+++ b/drivers/ide/ns87415.c
29507@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
29508 .dma_sff_read_status = superio_dma_sff_read_status,
29509 };
29510
29511-static const struct ide_port_info ns87415_chipset __devinitdata = {
29512+static const struct ide_port_info ns87415_chipset __devinitconst = {
29513 .name = DRV_NAME,
29514 .init_hwif = init_hwif_ns87415,
29515 .tp_ops = &ns87415_tp_ops,
29516diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
29517index 1a53a4c..39edc66 100644
29518--- a/drivers/ide/opti621.c
29519+++ b/drivers/ide/opti621.c
29520@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
29521 .set_pio_mode = opti621_set_pio_mode,
29522 };
29523
29524-static const struct ide_port_info opti621_chipset __devinitdata = {
29525+static const struct ide_port_info opti621_chipset __devinitconst = {
29526 .name = DRV_NAME,
29527 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
29528 .port_ops = &opti621_port_ops,
29529diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
29530index 9546fe2..2e5ceb6 100644
29531--- a/drivers/ide/pdc202xx_new.c
29532+++ b/drivers/ide/pdc202xx_new.c
29533@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
29534 .udma_mask = udma, \
29535 }
29536
29537-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
29538+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
29539 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
29540 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
29541 };
29542diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
29543index 3a35ec6..5634510 100644
29544--- a/drivers/ide/pdc202xx_old.c
29545+++ b/drivers/ide/pdc202xx_old.c
29546@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
29547 .max_sectors = sectors, \
29548 }
29549
29550-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
29551+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
29552 { /* 0: PDC20246 */
29553 .name = DRV_NAME,
29554 .init_chipset = init_chipset_pdc202xx,
29555diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
29556index 1892e81..fe0fd60 100644
29557--- a/drivers/ide/piix.c
29558+++ b/drivers/ide/piix.c
29559@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
29560 .udma_mask = udma, \
29561 }
29562
29563-static const struct ide_port_info piix_pci_info[] __devinitdata = {
29564+static const struct ide_port_info piix_pci_info[] __devinitconst = {
29565 /* 0: MPIIX */
29566 { /*
29567 * MPIIX actually has only a single IDE channel mapped to
29568diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
29569index a6414a8..c04173e 100644
29570--- a/drivers/ide/rz1000.c
29571+++ b/drivers/ide/rz1000.c
29572@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
29573 }
29574 }
29575
29576-static const struct ide_port_info rz1000_chipset __devinitdata = {
29577+static const struct ide_port_info rz1000_chipset __devinitconst = {
29578 .name = DRV_NAME,
29579 .host_flags = IDE_HFLAG_NO_DMA,
29580 };
29581diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
29582index 356b9b5..d4758eb 100644
29583--- a/drivers/ide/sc1200.c
29584+++ b/drivers/ide/sc1200.c
29585@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
29586 .dma_sff_read_status = ide_dma_sff_read_status,
29587 };
29588
29589-static const struct ide_port_info sc1200_chipset __devinitdata = {
29590+static const struct ide_port_info sc1200_chipset __devinitconst = {
29591 .name = DRV_NAME,
29592 .port_ops = &sc1200_port_ops,
29593 .dma_ops = &sc1200_dma_ops,
29594diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
29595index b7f5b0c..9701038 100644
29596--- a/drivers/ide/scc_pata.c
29597+++ b/drivers/ide/scc_pata.c
29598@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
29599 .dma_sff_read_status = scc_dma_sff_read_status,
29600 };
29601
29602-static const struct ide_port_info scc_chipset __devinitdata = {
29603+static const struct ide_port_info scc_chipset __devinitconst = {
29604 .name = "sccIDE",
29605 .init_iops = init_iops_scc,
29606 .init_dma = scc_init_dma,
29607diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
29608index 35fb8da..24d72ef 100644
29609--- a/drivers/ide/serverworks.c
29610+++ b/drivers/ide/serverworks.c
29611@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
29612 .cable_detect = svwks_cable_detect,
29613 };
29614
29615-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
29616+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
29617 { /* 0: OSB4 */
29618 .name = DRV_NAME,
29619 .init_chipset = init_chipset_svwks,
29620diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
29621index ddeda44..46f7e30 100644
29622--- a/drivers/ide/siimage.c
29623+++ b/drivers/ide/siimage.c
29624@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
29625 .udma_mask = ATA_UDMA6, \
29626 }
29627
29628-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
29629+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
29630 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
29631 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
29632 };
29633diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
29634index 4a00225..09e61b4 100644
29635--- a/drivers/ide/sis5513.c
29636+++ b/drivers/ide/sis5513.c
29637@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
29638 .cable_detect = sis_cable_detect,
29639 };
29640
29641-static const struct ide_port_info sis5513_chipset __devinitdata = {
29642+static const struct ide_port_info sis5513_chipset __devinitconst = {
29643 .name = DRV_NAME,
29644 .init_chipset = init_chipset_sis5513,
29645 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
29646diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
29647index f21dc2a..d051cd2 100644
29648--- a/drivers/ide/sl82c105.c
29649+++ b/drivers/ide/sl82c105.c
29650@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
29651 .dma_sff_read_status = ide_dma_sff_read_status,
29652 };
29653
29654-static const struct ide_port_info sl82c105_chipset __devinitdata = {
29655+static const struct ide_port_info sl82c105_chipset __devinitconst = {
29656 .name = DRV_NAME,
29657 .init_chipset = init_chipset_sl82c105,
29658 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
29659diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
29660index 864ffe0..863a5e9 100644
29661--- a/drivers/ide/slc90e66.c
29662+++ b/drivers/ide/slc90e66.c
29663@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
29664 .cable_detect = slc90e66_cable_detect,
29665 };
29666
29667-static const struct ide_port_info slc90e66_chipset __devinitdata = {
29668+static const struct ide_port_info slc90e66_chipset __devinitconst = {
29669 .name = DRV_NAME,
29670 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
29671 .port_ops = &slc90e66_port_ops,
29672diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
29673index 4799d5c..1794678 100644
29674--- a/drivers/ide/tc86c001.c
29675+++ b/drivers/ide/tc86c001.c
29676@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
29677 .dma_sff_read_status = ide_dma_sff_read_status,
29678 };
29679
29680-static const struct ide_port_info tc86c001_chipset __devinitdata = {
29681+static const struct ide_port_info tc86c001_chipset __devinitconst = {
29682 .name = DRV_NAME,
29683 .init_hwif = init_hwif_tc86c001,
29684 .port_ops = &tc86c001_port_ops,
29685diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
29686index 281c914..55ce1b8 100644
29687--- a/drivers/ide/triflex.c
29688+++ b/drivers/ide/triflex.c
29689@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
29690 .set_dma_mode = triflex_set_mode,
29691 };
29692
29693-static const struct ide_port_info triflex_device __devinitdata = {
29694+static const struct ide_port_info triflex_device __devinitconst = {
29695 .name = DRV_NAME,
29696 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
29697 .port_ops = &triflex_port_ops,
29698diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
29699index 4b42ca0..e494a98 100644
29700--- a/drivers/ide/trm290.c
29701+++ b/drivers/ide/trm290.c
29702@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
29703 .dma_check = trm290_dma_check,
29704 };
29705
29706-static const struct ide_port_info trm290_chipset __devinitdata = {
29707+static const struct ide_port_info trm290_chipset __devinitconst = {
29708 .name = DRV_NAME,
29709 .init_hwif = init_hwif_trm290,
29710 .tp_ops = &trm290_tp_ops,
29711diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
29712index f46f49c..eb77678 100644
29713--- a/drivers/ide/via82cxxx.c
29714+++ b/drivers/ide/via82cxxx.c
29715@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
29716 .cable_detect = via82cxxx_cable_detect,
29717 };
29718
29719-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
29720+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
29721 .name = DRV_NAME,
29722 .init_chipset = init_chipset_via82cxxx,
29723 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
29724diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
29725index eb0e2cc..14241c7 100644
29726--- a/drivers/ieee802154/fakehard.c
29727+++ b/drivers/ieee802154/fakehard.c
29728@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
29729 phy->transmit_power = 0xbf;
29730
29731 dev->netdev_ops = &fake_ops;
29732- dev->ml_priv = &fake_mlme;
29733+ dev->ml_priv = (void *)&fake_mlme;
29734
29735 priv = netdev_priv(dev);
29736 priv->phy = phy;
29737diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
29738index 8b72f39..55df4c8 100644
29739--- a/drivers/infiniband/core/cm.c
29740+++ b/drivers/infiniband/core/cm.c
29741@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
29742
29743 struct cm_counter_group {
29744 struct kobject obj;
29745- atomic_long_t counter[CM_ATTR_COUNT];
29746+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
29747 };
29748
29749 struct cm_counter_attribute {
29750@@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
29751 struct ib_mad_send_buf *msg = NULL;
29752 int ret;
29753
29754- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29755+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29756 counter[CM_REQ_COUNTER]);
29757
29758 /* Quick state check to discard duplicate REQs. */
29759@@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
29760 if (!cm_id_priv)
29761 return;
29762
29763- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29764+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29765 counter[CM_REP_COUNTER]);
29766 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
29767 if (ret)
29768@@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
29769 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
29770 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
29771 spin_unlock_irq(&cm_id_priv->lock);
29772- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29773+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29774 counter[CM_RTU_COUNTER]);
29775 goto out;
29776 }
29777@@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
29778 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
29779 dreq_msg->local_comm_id);
29780 if (!cm_id_priv) {
29781- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29782+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29783 counter[CM_DREQ_COUNTER]);
29784 cm_issue_drep(work->port, work->mad_recv_wc);
29785 return -EINVAL;
29786@@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
29787 case IB_CM_MRA_REP_RCVD:
29788 break;
29789 case IB_CM_TIMEWAIT:
29790- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29791+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29792 counter[CM_DREQ_COUNTER]);
29793 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
29794 goto unlock;
29795@@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
29796 cm_free_msg(msg);
29797 goto deref;
29798 case IB_CM_DREQ_RCVD:
29799- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29800+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29801 counter[CM_DREQ_COUNTER]);
29802 goto unlock;
29803 default:
29804@@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
29805 ib_modify_mad(cm_id_priv->av.port->mad_agent,
29806 cm_id_priv->msg, timeout)) {
29807 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
29808- atomic_long_inc(&work->port->
29809+ atomic_long_inc_unchecked(&work->port->
29810 counter_group[CM_RECV_DUPLICATES].
29811 counter[CM_MRA_COUNTER]);
29812 goto out;
29813@@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
29814 break;
29815 case IB_CM_MRA_REQ_RCVD:
29816 case IB_CM_MRA_REP_RCVD:
29817- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29818+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29819 counter[CM_MRA_COUNTER]);
29820 /* fall through */
29821 default:
29822@@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
29823 case IB_CM_LAP_IDLE:
29824 break;
29825 case IB_CM_MRA_LAP_SENT:
29826- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29827+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29828 counter[CM_LAP_COUNTER]);
29829 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
29830 goto unlock;
29831@@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
29832 cm_free_msg(msg);
29833 goto deref;
29834 case IB_CM_LAP_RCVD:
29835- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29836+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29837 counter[CM_LAP_COUNTER]);
29838 goto unlock;
29839 default:
29840@@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
29841 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
29842 if (cur_cm_id_priv) {
29843 spin_unlock_irq(&cm.lock);
29844- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
29845+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
29846 counter[CM_SIDR_REQ_COUNTER]);
29847 goto out; /* Duplicate message. */
29848 }
29849@@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
29850 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
29851 msg->retries = 1;
29852
29853- atomic_long_add(1 + msg->retries,
29854+ atomic_long_add_unchecked(1 + msg->retries,
29855 &port->counter_group[CM_XMIT].counter[attr_index]);
29856 if (msg->retries)
29857- atomic_long_add(msg->retries,
29858+ atomic_long_add_unchecked(msg->retries,
29859 &port->counter_group[CM_XMIT_RETRIES].
29860 counter[attr_index]);
29861
29862@@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
29863 }
29864
29865 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
29866- atomic_long_inc(&port->counter_group[CM_RECV].
29867+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
29868 counter[attr_id - CM_ATTR_ID_OFFSET]);
29869
29870 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
29871@@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
29872 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
29873
29874 return sprintf(buf, "%ld\n",
29875- atomic_long_read(&group->counter[cm_attr->index]));
29876+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
29877 }
29878
29879 static const struct sysfs_ops cm_counter_ops = {
29880diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
29881index 176c8f9..2627b62 100644
29882--- a/drivers/infiniband/core/fmr_pool.c
29883+++ b/drivers/infiniband/core/fmr_pool.c
29884@@ -98,8 +98,8 @@ struct ib_fmr_pool {
29885
29886 struct task_struct *thread;
29887
29888- atomic_t req_ser;
29889- atomic_t flush_ser;
29890+ atomic_unchecked_t req_ser;
29891+ atomic_unchecked_t flush_ser;
29892
29893 wait_queue_head_t force_wait;
29894 };
29895@@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
29896 struct ib_fmr_pool *pool = pool_ptr;
29897
29898 do {
29899- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
29900+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
29901 ib_fmr_batch_release(pool);
29902
29903- atomic_inc(&pool->flush_ser);
29904+ atomic_inc_unchecked(&pool->flush_ser);
29905 wake_up_interruptible(&pool->force_wait);
29906
29907 if (pool->flush_function)
29908@@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
29909 }
29910
29911 set_current_state(TASK_INTERRUPTIBLE);
29912- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
29913+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
29914 !kthread_should_stop())
29915 schedule();
29916 __set_current_state(TASK_RUNNING);
29917@@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
29918 pool->dirty_watermark = params->dirty_watermark;
29919 pool->dirty_len = 0;
29920 spin_lock_init(&pool->pool_lock);
29921- atomic_set(&pool->req_ser, 0);
29922- atomic_set(&pool->flush_ser, 0);
29923+ atomic_set_unchecked(&pool->req_ser, 0);
29924+ atomic_set_unchecked(&pool->flush_ser, 0);
29925 init_waitqueue_head(&pool->force_wait);
29926
29927 pool->thread = kthread_run(ib_fmr_cleanup_thread,
29928@@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
29929 }
29930 spin_unlock_irq(&pool->pool_lock);
29931
29932- serial = atomic_inc_return(&pool->req_ser);
29933+ serial = atomic_inc_return_unchecked(&pool->req_ser);
29934 wake_up_process(pool->thread);
29935
29936 if (wait_event_interruptible(pool->force_wait,
29937- atomic_read(&pool->flush_ser) - serial >= 0))
29938+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
29939 return -EINTR;
29940
29941 return 0;
29942@@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
29943 } else {
29944 list_add_tail(&fmr->list, &pool->dirty_list);
29945 if (++pool->dirty_len >= pool->dirty_watermark) {
29946- atomic_inc(&pool->req_ser);
29947+ atomic_inc_unchecked(&pool->req_ser);
29948 wake_up_process(pool->thread);
29949 }
29950 }
29951diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
29952index 40c8353..946b0e4 100644
29953--- a/drivers/infiniband/hw/cxgb4/mem.c
29954+++ b/drivers/infiniband/hw/cxgb4/mem.c
29955@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
29956 int err;
29957 struct fw_ri_tpte tpt;
29958 u32 stag_idx;
29959- static atomic_t key;
29960+ static atomic_unchecked_t key;
29961
29962 if (c4iw_fatal_error(rdev))
29963 return -EIO;
29964@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
29965 &rdev->resource.tpt_fifo_lock);
29966 if (!stag_idx)
29967 return -ENOMEM;
29968- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
29969+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
29970 }
29971 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
29972 __func__, stag_state, type, pdid, stag_idx);
29973diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
29974index 79b3dbc..96e5fcc 100644
29975--- a/drivers/infiniband/hw/ipath/ipath_rc.c
29976+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
29977@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
29978 struct ib_atomic_eth *ateth;
29979 struct ipath_ack_entry *e;
29980 u64 vaddr;
29981- atomic64_t *maddr;
29982+ atomic64_unchecked_t *maddr;
29983 u64 sdata;
29984 u32 rkey;
29985 u8 next;
29986@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
29987 IB_ACCESS_REMOTE_ATOMIC)))
29988 goto nack_acc_unlck;
29989 /* Perform atomic OP and save result. */
29990- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
29991+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
29992 sdata = be64_to_cpu(ateth->swap_data);
29993 e = &qp->s_ack_queue[qp->r_head_ack_queue];
29994 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
29995- (u64) atomic64_add_return(sdata, maddr) - sdata :
29996+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
29997 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
29998 be64_to_cpu(ateth->compare_data),
29999 sdata);
30000diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
30001index 1f95bba..9530f87 100644
30002--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
30003+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
30004@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
30005 unsigned long flags;
30006 struct ib_wc wc;
30007 u64 sdata;
30008- atomic64_t *maddr;
30009+ atomic64_unchecked_t *maddr;
30010 enum ib_wc_status send_status;
30011
30012 /*
30013@@ -382,11 +382,11 @@ again:
30014 IB_ACCESS_REMOTE_ATOMIC)))
30015 goto acc_err;
30016 /* Perform atomic OP and save result. */
30017- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
30018+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
30019 sdata = wqe->wr.wr.atomic.compare_add;
30020 *(u64 *) sqp->s_sge.sge.vaddr =
30021 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
30022- (u64) atomic64_add_return(sdata, maddr) - sdata :
30023+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
30024 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
30025 sdata, wqe->wr.wr.atomic.swap);
30026 goto send_comp;
30027diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
30028index 5965b3d..16817fb 100644
30029--- a/drivers/infiniband/hw/nes/nes.c
30030+++ b/drivers/infiniband/hw/nes/nes.c
30031@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
30032 LIST_HEAD(nes_adapter_list);
30033 static LIST_HEAD(nes_dev_list);
30034
30035-atomic_t qps_destroyed;
30036+atomic_unchecked_t qps_destroyed;
30037
30038 static unsigned int ee_flsh_adapter;
30039 static unsigned int sysfs_nonidx_addr;
30040@@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
30041 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
30042 struct nes_adapter *nesadapter = nesdev->nesadapter;
30043
30044- atomic_inc(&qps_destroyed);
30045+ atomic_inc_unchecked(&qps_destroyed);
30046
30047 /* Free the control structures */
30048
30049diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
30050index 568b4f1..5ea3eff 100644
30051--- a/drivers/infiniband/hw/nes/nes.h
30052+++ b/drivers/infiniband/hw/nes/nes.h
30053@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
30054 extern unsigned int wqm_quanta;
30055 extern struct list_head nes_adapter_list;
30056
30057-extern atomic_t cm_connects;
30058-extern atomic_t cm_accepts;
30059-extern atomic_t cm_disconnects;
30060-extern atomic_t cm_closes;
30061-extern atomic_t cm_connecteds;
30062-extern atomic_t cm_connect_reqs;
30063-extern atomic_t cm_rejects;
30064-extern atomic_t mod_qp_timouts;
30065-extern atomic_t qps_created;
30066-extern atomic_t qps_destroyed;
30067-extern atomic_t sw_qps_destroyed;
30068+extern atomic_unchecked_t cm_connects;
30069+extern atomic_unchecked_t cm_accepts;
30070+extern atomic_unchecked_t cm_disconnects;
30071+extern atomic_unchecked_t cm_closes;
30072+extern atomic_unchecked_t cm_connecteds;
30073+extern atomic_unchecked_t cm_connect_reqs;
30074+extern atomic_unchecked_t cm_rejects;
30075+extern atomic_unchecked_t mod_qp_timouts;
30076+extern atomic_unchecked_t qps_created;
30077+extern atomic_unchecked_t qps_destroyed;
30078+extern atomic_unchecked_t sw_qps_destroyed;
30079 extern u32 mh_detected;
30080 extern u32 mh_pauses_sent;
30081 extern u32 cm_packets_sent;
30082@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
30083 extern u32 cm_packets_received;
30084 extern u32 cm_packets_dropped;
30085 extern u32 cm_packets_retrans;
30086-extern atomic_t cm_listens_created;
30087-extern atomic_t cm_listens_destroyed;
30088+extern atomic_unchecked_t cm_listens_created;
30089+extern atomic_unchecked_t cm_listens_destroyed;
30090 extern u32 cm_backlog_drops;
30091-extern atomic_t cm_loopbacks;
30092-extern atomic_t cm_nodes_created;
30093-extern atomic_t cm_nodes_destroyed;
30094-extern atomic_t cm_accel_dropped_pkts;
30095-extern atomic_t cm_resets_recvd;
30096-extern atomic_t pau_qps_created;
30097-extern atomic_t pau_qps_destroyed;
30098+extern atomic_unchecked_t cm_loopbacks;
30099+extern atomic_unchecked_t cm_nodes_created;
30100+extern atomic_unchecked_t cm_nodes_destroyed;
30101+extern atomic_unchecked_t cm_accel_dropped_pkts;
30102+extern atomic_unchecked_t cm_resets_recvd;
30103+extern atomic_unchecked_t pau_qps_created;
30104+extern atomic_unchecked_t pau_qps_destroyed;
30105
30106 extern u32 int_mod_timer_init;
30107 extern u32 int_mod_cq_depth_256;
30108diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
30109index 0a52d72..0642f36 100644
30110--- a/drivers/infiniband/hw/nes/nes_cm.c
30111+++ b/drivers/infiniband/hw/nes/nes_cm.c
30112@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
30113 u32 cm_packets_retrans;
30114 u32 cm_packets_created;
30115 u32 cm_packets_received;
30116-atomic_t cm_listens_created;
30117-atomic_t cm_listens_destroyed;
30118+atomic_unchecked_t cm_listens_created;
30119+atomic_unchecked_t cm_listens_destroyed;
30120 u32 cm_backlog_drops;
30121-atomic_t cm_loopbacks;
30122-atomic_t cm_nodes_created;
30123-atomic_t cm_nodes_destroyed;
30124-atomic_t cm_accel_dropped_pkts;
30125-atomic_t cm_resets_recvd;
30126+atomic_unchecked_t cm_loopbacks;
30127+atomic_unchecked_t cm_nodes_created;
30128+atomic_unchecked_t cm_nodes_destroyed;
30129+atomic_unchecked_t cm_accel_dropped_pkts;
30130+atomic_unchecked_t cm_resets_recvd;
30131
30132 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
30133 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
30134@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
30135
30136 static struct nes_cm_core *g_cm_core;
30137
30138-atomic_t cm_connects;
30139-atomic_t cm_accepts;
30140-atomic_t cm_disconnects;
30141-atomic_t cm_closes;
30142-atomic_t cm_connecteds;
30143-atomic_t cm_connect_reqs;
30144-atomic_t cm_rejects;
30145+atomic_unchecked_t cm_connects;
30146+atomic_unchecked_t cm_accepts;
30147+atomic_unchecked_t cm_disconnects;
30148+atomic_unchecked_t cm_closes;
30149+atomic_unchecked_t cm_connecteds;
30150+atomic_unchecked_t cm_connect_reqs;
30151+atomic_unchecked_t cm_rejects;
30152
30153 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
30154 {
30155@@ -1271,7 +1271,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
30156 kfree(listener);
30157 listener = NULL;
30158 ret = 0;
30159- atomic_inc(&cm_listens_destroyed);
30160+ atomic_inc_unchecked(&cm_listens_destroyed);
30161 } else {
30162 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
30163 }
30164@@ -1473,7 +1473,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
30165 cm_node->rem_mac);
30166
30167 add_hte_node(cm_core, cm_node);
30168- atomic_inc(&cm_nodes_created);
30169+ atomic_inc_unchecked(&cm_nodes_created);
30170
30171 return cm_node;
30172 }
30173@@ -1531,7 +1531,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
30174 }
30175
30176 atomic_dec(&cm_core->node_cnt);
30177- atomic_inc(&cm_nodes_destroyed);
30178+ atomic_inc_unchecked(&cm_nodes_destroyed);
30179 nesqp = cm_node->nesqp;
30180 if (nesqp) {
30181 nesqp->cm_node = NULL;
30182@@ -1595,7 +1595,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
30183
30184 static void drop_packet(struct sk_buff *skb)
30185 {
30186- atomic_inc(&cm_accel_dropped_pkts);
30187+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
30188 dev_kfree_skb_any(skb);
30189 }
30190
30191@@ -1658,7 +1658,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
30192 {
30193
30194 int reset = 0; /* whether to send reset in case of err.. */
30195- atomic_inc(&cm_resets_recvd);
30196+ atomic_inc_unchecked(&cm_resets_recvd);
30197 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
30198 " refcnt=%d\n", cm_node, cm_node->state,
30199 atomic_read(&cm_node->ref_count));
30200@@ -2299,7 +2299,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
30201 rem_ref_cm_node(cm_node->cm_core, cm_node);
30202 return NULL;
30203 }
30204- atomic_inc(&cm_loopbacks);
30205+ atomic_inc_unchecked(&cm_loopbacks);
30206 loopbackremotenode->loopbackpartner = cm_node;
30207 loopbackremotenode->tcp_cntxt.rcv_wscale =
30208 NES_CM_DEFAULT_RCV_WND_SCALE;
30209@@ -2574,7 +2574,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
30210 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
30211 else {
30212 rem_ref_cm_node(cm_core, cm_node);
30213- atomic_inc(&cm_accel_dropped_pkts);
30214+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
30215 dev_kfree_skb_any(skb);
30216 }
30217 break;
30218@@ -2880,7 +2880,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
30219
30220 if ((cm_id) && (cm_id->event_handler)) {
30221 if (issue_disconn) {
30222- atomic_inc(&cm_disconnects);
30223+ atomic_inc_unchecked(&cm_disconnects);
30224 cm_event.event = IW_CM_EVENT_DISCONNECT;
30225 cm_event.status = disconn_status;
30226 cm_event.local_addr = cm_id->local_addr;
30227@@ -2902,7 +2902,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
30228 }
30229
30230 if (issue_close) {
30231- atomic_inc(&cm_closes);
30232+ atomic_inc_unchecked(&cm_closes);
30233 nes_disconnect(nesqp, 1);
30234
30235 cm_id->provider_data = nesqp;
30236@@ -3038,7 +3038,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
30237
30238 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
30239 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
30240- atomic_inc(&cm_accepts);
30241+ atomic_inc_unchecked(&cm_accepts);
30242
30243 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
30244 netdev_refcnt_read(nesvnic->netdev));
30245@@ -3240,7 +3240,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
30246 struct nes_cm_core *cm_core;
30247 u8 *start_buff;
30248
30249- atomic_inc(&cm_rejects);
30250+ atomic_inc_unchecked(&cm_rejects);
30251 cm_node = (struct nes_cm_node *)cm_id->provider_data;
30252 loopback = cm_node->loopbackpartner;
30253 cm_core = cm_node->cm_core;
30254@@ -3300,7 +3300,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
30255 ntohl(cm_id->local_addr.sin_addr.s_addr),
30256 ntohs(cm_id->local_addr.sin_port));
30257
30258- atomic_inc(&cm_connects);
30259+ atomic_inc_unchecked(&cm_connects);
30260 nesqp->active_conn = 1;
30261
30262 /* cache the cm_id in the qp */
30263@@ -3406,7 +3406,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
30264 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
30265 return err;
30266 }
30267- atomic_inc(&cm_listens_created);
30268+ atomic_inc_unchecked(&cm_listens_created);
30269 }
30270
30271 cm_id->add_ref(cm_id);
30272@@ -3507,7 +3507,7 @@ static void cm_event_connected(struct nes_cm_event *event)
30273
30274 if (nesqp->destroyed)
30275 return;
30276- atomic_inc(&cm_connecteds);
30277+ atomic_inc_unchecked(&cm_connecteds);
30278 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
30279 " local port 0x%04X. jiffies = %lu.\n",
30280 nesqp->hwqp.qp_id,
30281@@ -3694,7 +3694,7 @@ static void cm_event_reset(struct nes_cm_event *event)
30282
30283 cm_id->add_ref(cm_id);
30284 ret = cm_id->event_handler(cm_id, &cm_event);
30285- atomic_inc(&cm_closes);
30286+ atomic_inc_unchecked(&cm_closes);
30287 cm_event.event = IW_CM_EVENT_CLOSE;
30288 cm_event.status = 0;
30289 cm_event.provider_data = cm_id->provider_data;
30290@@ -3730,7 +3730,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
30291 return;
30292 cm_id = cm_node->cm_id;
30293
30294- atomic_inc(&cm_connect_reqs);
30295+ atomic_inc_unchecked(&cm_connect_reqs);
30296 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
30297 cm_node, cm_id, jiffies);
30298
30299@@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
30300 return;
30301 cm_id = cm_node->cm_id;
30302
30303- atomic_inc(&cm_connect_reqs);
30304+ atomic_inc_unchecked(&cm_connect_reqs);
30305 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
30306 cm_node, cm_id, jiffies);
30307
30308diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
30309index b3b2a24..7bfaf1e 100644
30310--- a/drivers/infiniband/hw/nes/nes_mgt.c
30311+++ b/drivers/infiniband/hw/nes/nes_mgt.c
30312@@ -40,8 +40,8 @@
30313 #include "nes.h"
30314 #include "nes_mgt.h"
30315
30316-atomic_t pau_qps_created;
30317-atomic_t pau_qps_destroyed;
30318+atomic_unchecked_t pau_qps_created;
30319+atomic_unchecked_t pau_qps_destroyed;
30320
30321 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
30322 {
30323@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
30324 {
30325 struct sk_buff *skb;
30326 unsigned long flags;
30327- atomic_inc(&pau_qps_destroyed);
30328+ atomic_inc_unchecked(&pau_qps_destroyed);
30329
30330 /* Free packets that have not yet been forwarded */
30331 /* Lock is acquired by skb_dequeue when removing the skb */
30332@@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
30333 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
30334 skb_queue_head_init(&nesqp->pau_list);
30335 spin_lock_init(&nesqp->pau_lock);
30336- atomic_inc(&pau_qps_created);
30337+ atomic_inc_unchecked(&pau_qps_created);
30338 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
30339 }
30340
30341diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
30342index c00d2f3..8834298 100644
30343--- a/drivers/infiniband/hw/nes/nes_nic.c
30344+++ b/drivers/infiniband/hw/nes/nes_nic.c
30345@@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
30346 target_stat_values[++index] = mh_detected;
30347 target_stat_values[++index] = mh_pauses_sent;
30348 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
30349- target_stat_values[++index] = atomic_read(&cm_connects);
30350- target_stat_values[++index] = atomic_read(&cm_accepts);
30351- target_stat_values[++index] = atomic_read(&cm_disconnects);
30352- target_stat_values[++index] = atomic_read(&cm_connecteds);
30353- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
30354- target_stat_values[++index] = atomic_read(&cm_rejects);
30355- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
30356- target_stat_values[++index] = atomic_read(&qps_created);
30357- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
30358- target_stat_values[++index] = atomic_read(&qps_destroyed);
30359- target_stat_values[++index] = atomic_read(&cm_closes);
30360+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
30361+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
30362+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
30363+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
30364+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
30365+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
30366+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
30367+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
30368+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
30369+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
30370+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
30371 target_stat_values[++index] = cm_packets_sent;
30372 target_stat_values[++index] = cm_packets_bounced;
30373 target_stat_values[++index] = cm_packets_created;
30374 target_stat_values[++index] = cm_packets_received;
30375 target_stat_values[++index] = cm_packets_dropped;
30376 target_stat_values[++index] = cm_packets_retrans;
30377- target_stat_values[++index] = atomic_read(&cm_listens_created);
30378- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
30379+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
30380+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
30381 target_stat_values[++index] = cm_backlog_drops;
30382- target_stat_values[++index] = atomic_read(&cm_loopbacks);
30383- target_stat_values[++index] = atomic_read(&cm_nodes_created);
30384- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
30385- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
30386- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
30387+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
30388+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
30389+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
30390+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
30391+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
30392 target_stat_values[++index] = nesadapter->free_4kpbl;
30393 target_stat_values[++index] = nesadapter->free_256pbl;
30394 target_stat_values[++index] = int_mod_timer_init;
30395 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
30396 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
30397 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
30398- target_stat_values[++index] = atomic_read(&pau_qps_created);
30399- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
30400+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
30401+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
30402 }
30403
30404 /**
30405diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
30406index 5095bc4..41e8fff 100644
30407--- a/drivers/infiniband/hw/nes/nes_verbs.c
30408+++ b/drivers/infiniband/hw/nes/nes_verbs.c
30409@@ -46,9 +46,9 @@
30410
30411 #include <rdma/ib_umem.h>
30412
30413-atomic_t mod_qp_timouts;
30414-atomic_t qps_created;
30415-atomic_t sw_qps_destroyed;
30416+atomic_unchecked_t mod_qp_timouts;
30417+atomic_unchecked_t qps_created;
30418+atomic_unchecked_t sw_qps_destroyed;
30419
30420 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
30421
30422@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
30423 if (init_attr->create_flags)
30424 return ERR_PTR(-EINVAL);
30425
30426- atomic_inc(&qps_created);
30427+ atomic_inc_unchecked(&qps_created);
30428 switch (init_attr->qp_type) {
30429 case IB_QPT_RC:
30430 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
30431@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
30432 struct iw_cm_event cm_event;
30433 int ret = 0;
30434
30435- atomic_inc(&sw_qps_destroyed);
30436+ atomic_inc_unchecked(&sw_qps_destroyed);
30437 nesqp->destroyed = 1;
30438
30439 /* Blow away the connection if it exists. */
30440diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
30441index b881bdc..c2e360c 100644
30442--- a/drivers/infiniband/hw/qib/qib.h
30443+++ b/drivers/infiniband/hw/qib/qib.h
30444@@ -51,6 +51,7 @@
30445 #include <linux/completion.h>
30446 #include <linux/kref.h>
30447 #include <linux/sched.h>
30448+#include <linux/slab.h>
30449
30450 #include "qib_common.h"
30451 #include "qib_verbs.h"
30452diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
30453index c351aa4..e6967c2 100644
30454--- a/drivers/input/gameport/gameport.c
30455+++ b/drivers/input/gameport/gameport.c
30456@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
30457 */
30458 static void gameport_init_port(struct gameport *gameport)
30459 {
30460- static atomic_t gameport_no = ATOMIC_INIT(0);
30461+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
30462
30463 __module_get(THIS_MODULE);
30464
30465 mutex_init(&gameport->drv_mutex);
30466 device_initialize(&gameport->dev);
30467 dev_set_name(&gameport->dev, "gameport%lu",
30468- (unsigned long)atomic_inc_return(&gameport_no) - 1);
30469+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
30470 gameport->dev.bus = &gameport_bus;
30471 gameport->dev.release = gameport_release_port;
30472 if (gameport->parent)
30473diff --git a/drivers/input/input.c b/drivers/input/input.c
30474index da38d97..2aa0b79 100644
30475--- a/drivers/input/input.c
30476+++ b/drivers/input/input.c
30477@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
30478 */
30479 int input_register_device(struct input_dev *dev)
30480 {
30481- static atomic_t input_no = ATOMIC_INIT(0);
30482+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
30483 struct input_handler *handler;
30484 const char *path;
30485 int error;
30486@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
30487 dev->setkeycode = input_default_setkeycode;
30488
30489 dev_set_name(&dev->dev, "input%ld",
30490- (unsigned long) atomic_inc_return(&input_no) - 1);
30491+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
30492
30493 error = device_add(&dev->dev);
30494 if (error)
30495diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
30496index b8d8611..7a4a04b 100644
30497--- a/drivers/input/joystick/sidewinder.c
30498+++ b/drivers/input/joystick/sidewinder.c
30499@@ -30,6 +30,7 @@
30500 #include <linux/kernel.h>
30501 #include <linux/module.h>
30502 #include <linux/slab.h>
30503+#include <linux/sched.h>
30504 #include <linux/init.h>
30505 #include <linux/input.h>
30506 #include <linux/gameport.h>
30507diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
30508index d728875..844c89b 100644
30509--- a/drivers/input/joystick/xpad.c
30510+++ b/drivers/input/joystick/xpad.c
30511@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
30512
30513 static int xpad_led_probe(struct usb_xpad *xpad)
30514 {
30515- static atomic_t led_seq = ATOMIC_INIT(0);
30516+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
30517 long led_no;
30518 struct xpad_led *led;
30519 struct led_classdev *led_cdev;
30520@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
30521 if (!led)
30522 return -ENOMEM;
30523
30524- led_no = (long)atomic_inc_return(&led_seq) - 1;
30525+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
30526
30527 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
30528 led->xpad = xpad;
30529diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
30530index 0110b5a..d3ad144 100644
30531--- a/drivers/input/mousedev.c
30532+++ b/drivers/input/mousedev.c
30533@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
30534
30535 spin_unlock_irq(&client->packet_lock);
30536
30537- if (copy_to_user(buffer, data, count))
30538+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
30539 return -EFAULT;
30540
30541 return count;
30542diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
30543index ba70058..571d25d 100644
30544--- a/drivers/input/serio/serio.c
30545+++ b/drivers/input/serio/serio.c
30546@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
30547 */
30548 static void serio_init_port(struct serio *serio)
30549 {
30550- static atomic_t serio_no = ATOMIC_INIT(0);
30551+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
30552
30553 __module_get(THIS_MODULE);
30554
30555@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
30556 mutex_init(&serio->drv_mutex);
30557 device_initialize(&serio->dev);
30558 dev_set_name(&serio->dev, "serio%ld",
30559- (long)atomic_inc_return(&serio_no) - 1);
30560+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
30561 serio->dev.bus = &serio_bus;
30562 serio->dev.release = serio_release_port;
30563 serio->dev.groups = serio_device_attr_groups;
30564diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
30565index e44933d..9ba484a 100644
30566--- a/drivers/isdn/capi/capi.c
30567+++ b/drivers/isdn/capi/capi.c
30568@@ -83,8 +83,8 @@ struct capiminor {
30569
30570 struct capi20_appl *ap;
30571 u32 ncci;
30572- atomic_t datahandle;
30573- atomic_t msgid;
30574+ atomic_unchecked_t datahandle;
30575+ atomic_unchecked_t msgid;
30576
30577 struct tty_port port;
30578 int ttyinstop;
30579@@ -397,7 +397,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
30580 capimsg_setu16(s, 2, mp->ap->applid);
30581 capimsg_setu8 (s, 4, CAPI_DATA_B3);
30582 capimsg_setu8 (s, 5, CAPI_RESP);
30583- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
30584+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
30585 capimsg_setu32(s, 8, mp->ncci);
30586 capimsg_setu16(s, 12, datahandle);
30587 }
30588@@ -518,14 +518,14 @@ static void handle_minor_send(struct capiminor *mp)
30589 mp->outbytes -= len;
30590 spin_unlock_bh(&mp->outlock);
30591
30592- datahandle = atomic_inc_return(&mp->datahandle);
30593+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
30594 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
30595 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
30596 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
30597 capimsg_setu16(skb->data, 2, mp->ap->applid);
30598 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
30599 capimsg_setu8 (skb->data, 5, CAPI_REQ);
30600- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
30601+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
30602 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
30603 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
30604 capimsg_setu16(skb->data, 16, len); /* Data length */
30605diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
30606index db621db..825ea1a 100644
30607--- a/drivers/isdn/gigaset/common.c
30608+++ b/drivers/isdn/gigaset/common.c
30609@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
30610 cs->commands_pending = 0;
30611 cs->cur_at_seq = 0;
30612 cs->gotfwver = -1;
30613- cs->open_count = 0;
30614+ local_set(&cs->open_count, 0);
30615 cs->dev = NULL;
30616 cs->tty = NULL;
30617 cs->tty_dev = NULL;
30618diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
30619index 212efaf..f187c6b 100644
30620--- a/drivers/isdn/gigaset/gigaset.h
30621+++ b/drivers/isdn/gigaset/gigaset.h
30622@@ -35,6 +35,7 @@
30623 #include <linux/tty_driver.h>
30624 #include <linux/list.h>
30625 #include <linux/atomic.h>
30626+#include <asm/local.h>
30627
30628 #define GIG_VERSION {0, 5, 0, 0}
30629 #define GIG_COMPAT {0, 4, 0, 0}
30630@@ -433,7 +434,7 @@ struct cardstate {
30631 spinlock_t cmdlock;
30632 unsigned curlen, cmdbytes;
30633
30634- unsigned open_count;
30635+ local_t open_count;
30636 struct tty_struct *tty;
30637 struct tasklet_struct if_wake_tasklet;
30638 unsigned control_state;
30639diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
30640index ee0a549..a7c9798 100644
30641--- a/drivers/isdn/gigaset/interface.c
30642+++ b/drivers/isdn/gigaset/interface.c
30643@@ -163,9 +163,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
30644 }
30645 tty->driver_data = cs;
30646
30647- ++cs->open_count;
30648-
30649- if (cs->open_count == 1) {
30650+ if (local_inc_return(&cs->open_count) == 1) {
30651 spin_lock_irqsave(&cs->lock, flags);
30652 cs->tty = tty;
30653 spin_unlock_irqrestore(&cs->lock, flags);
30654@@ -193,10 +191,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
30655
30656 if (!cs->connected)
30657 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
30658- else if (!cs->open_count)
30659+ else if (!local_read(&cs->open_count))
30660 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30661 else {
30662- if (!--cs->open_count) {
30663+ if (!local_dec_return(&cs->open_count)) {
30664 spin_lock_irqsave(&cs->lock, flags);
30665 cs->tty = NULL;
30666 spin_unlock_irqrestore(&cs->lock, flags);
30667@@ -231,7 +229,7 @@ static int if_ioctl(struct tty_struct *tty,
30668 if (!cs->connected) {
30669 gig_dbg(DEBUG_IF, "not connected");
30670 retval = -ENODEV;
30671- } else if (!cs->open_count)
30672+ } else if (!local_read(&cs->open_count))
30673 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30674 else {
30675 retval = 0;
30676@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
30677 retval = -ENODEV;
30678 goto done;
30679 }
30680- if (!cs->open_count) {
30681+ if (!local_read(&cs->open_count)) {
30682 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30683 retval = -ENODEV;
30684 goto done;
30685@@ -414,7 +412,7 @@ static int if_write_room(struct tty_struct *tty)
30686 if (!cs->connected) {
30687 gig_dbg(DEBUG_IF, "not connected");
30688 retval = -ENODEV;
30689- } else if (!cs->open_count)
30690+ } else if (!local_read(&cs->open_count))
30691 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30692 else if (cs->mstate != MS_LOCKED) {
30693 dev_warn(cs->dev, "can't write to unlocked device\n");
30694@@ -444,7 +442,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
30695
30696 if (!cs->connected)
30697 gig_dbg(DEBUG_IF, "not connected");
30698- else if (!cs->open_count)
30699+ else if (!local_read(&cs->open_count))
30700 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30701 else if (cs->mstate != MS_LOCKED)
30702 dev_warn(cs->dev, "can't write to unlocked device\n");
30703@@ -472,7 +470,7 @@ static void if_throttle(struct tty_struct *tty)
30704
30705 if (!cs->connected)
30706 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
30707- else if (!cs->open_count)
30708+ else if (!local_read(&cs->open_count))
30709 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30710 else
30711 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
30712@@ -496,7 +494,7 @@ static void if_unthrottle(struct tty_struct *tty)
30713
30714 if (!cs->connected)
30715 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
30716- else if (!cs->open_count)
30717+ else if (!local_read(&cs->open_count))
30718 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30719 else
30720 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
30721@@ -527,7 +525,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
30722 goto out;
30723 }
30724
30725- if (!cs->open_count) {
30726+ if (!local_read(&cs->open_count)) {
30727 dev_warn(cs->dev, "%s: device not opened\n", __func__);
30728 goto out;
30729 }
30730diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
30731index 2a57da59..e7a12ed 100644
30732--- a/drivers/isdn/hardware/avm/b1.c
30733+++ b/drivers/isdn/hardware/avm/b1.c
30734@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
30735 }
30736 if (left) {
30737 if (t4file->user) {
30738- if (copy_from_user(buf, dp, left))
30739+ if (left > sizeof buf || copy_from_user(buf, dp, left))
30740 return -EFAULT;
30741 } else {
30742 memcpy(buf, dp, left);
30743@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
30744 }
30745 if (left) {
30746 if (config->user) {
30747- if (copy_from_user(buf, dp, left))
30748+ if (left > sizeof buf || copy_from_user(buf, dp, left))
30749 return -EFAULT;
30750 } else {
30751 memcpy(buf, dp, left);
30752diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
30753index 85784a7..a19ca98 100644
30754--- a/drivers/isdn/hardware/eicon/divasync.h
30755+++ b/drivers/isdn/hardware/eicon/divasync.h
30756@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
30757 } diva_didd_add_adapter_t;
30758 typedef struct _diva_didd_remove_adapter {
30759 IDI_CALL p_request;
30760-} diva_didd_remove_adapter_t;
30761+} __no_const diva_didd_remove_adapter_t;
30762 typedef struct _diva_didd_read_adapter_array {
30763 void * buffer;
30764 dword length;
30765diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
30766index a3bd163..8956575 100644
30767--- a/drivers/isdn/hardware/eicon/xdi_adapter.h
30768+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
30769@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
30770 typedef struct _diva_os_idi_adapter_interface {
30771 diva_init_card_proc_t cleanup_adapter_proc;
30772 diva_cmd_card_proc_t cmd_proc;
30773-} diva_os_idi_adapter_interface_t;
30774+} __no_const diva_os_idi_adapter_interface_t;
30775
30776 typedef struct _diva_os_xdi_adapter {
30777 struct list_head link;
30778diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
30779index 2339d73..802ab87 100644
30780--- a/drivers/isdn/i4l/isdn_net.c
30781+++ b/drivers/isdn/i4l/isdn_net.c
30782@@ -1901,7 +1901,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
30783 {
30784 isdn_net_local *lp = netdev_priv(dev);
30785 unsigned char *p;
30786- ushort len = 0;
30787+ int len = 0;
30788
30789 switch (lp->p_encap) {
30790 case ISDN_NET_ENCAP_ETHER:
30791diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
30792index 1f355bb..43f1fea 100644
30793--- a/drivers/isdn/icn/icn.c
30794+++ b/drivers/isdn/icn/icn.c
30795@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
30796 if (count > len)
30797 count = len;
30798 if (user) {
30799- if (copy_from_user(msg, buf, count))
30800+ if (count > sizeof msg || copy_from_user(msg, buf, count))
30801 return -EFAULT;
30802 } else
30803 memcpy(msg, buf, count);
30804diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
30805index b5fdcb7..5b6c59f 100644
30806--- a/drivers/lguest/core.c
30807+++ b/drivers/lguest/core.c
30808@@ -92,9 +92,17 @@ static __init int map_switcher(void)
30809 * it's worked so far. The end address needs +1 because __get_vm_area
30810 * allocates an extra guard page, so we need space for that.
30811 */
30812+
30813+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
30814+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
30815+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
30816+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
30817+#else
30818 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
30819 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
30820 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
30821+#endif
30822+
30823 if (!switcher_vma) {
30824 err = -ENOMEM;
30825 printk("lguest: could not map switcher pages high\n");
30826@@ -119,7 +127,7 @@ static __init int map_switcher(void)
30827 * Now the Switcher is mapped at the right address, we can't fail!
30828 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
30829 */
30830- memcpy(switcher_vma->addr, start_switcher_text,
30831+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
30832 end_switcher_text - start_switcher_text);
30833
30834 printk(KERN_INFO "lguest: mapped switcher at %p\n",
30835diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
30836index 65af42f..530c87a 100644
30837--- a/drivers/lguest/x86/core.c
30838+++ b/drivers/lguest/x86/core.c
30839@@ -59,7 +59,7 @@ static struct {
30840 /* Offset from where switcher.S was compiled to where we've copied it */
30841 static unsigned long switcher_offset(void)
30842 {
30843- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
30844+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
30845 }
30846
30847 /* This cpu's struct lguest_pages. */
30848@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
30849 * These copies are pretty cheap, so we do them unconditionally: */
30850 /* Save the current Host top-level page directory.
30851 */
30852+
30853+#ifdef CONFIG_PAX_PER_CPU_PGD
30854+ pages->state.host_cr3 = read_cr3();
30855+#else
30856 pages->state.host_cr3 = __pa(current->mm->pgd);
30857+#endif
30858+
30859 /*
30860 * Set up the Guest's page tables to see this CPU's pages (and no
30861 * other CPU's pages).
30862@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
30863 * compiled-in switcher code and the high-mapped copy we just made.
30864 */
30865 for (i = 0; i < IDT_ENTRIES; i++)
30866- default_idt_entries[i] += switcher_offset();
30867+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
30868
30869 /*
30870 * Set up the Switcher's per-cpu areas.
30871@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
30872 * it will be undisturbed when we switch. To change %cs and jump we
30873 * need this structure to feed to Intel's "lcall" instruction.
30874 */
30875- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
30876+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
30877 lguest_entry.segment = LGUEST_CS;
30878
30879 /*
30880diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
30881index 40634b0..4f5855e 100644
30882--- a/drivers/lguest/x86/switcher_32.S
30883+++ b/drivers/lguest/x86/switcher_32.S
30884@@ -87,6 +87,7 @@
30885 #include <asm/page.h>
30886 #include <asm/segment.h>
30887 #include <asm/lguest.h>
30888+#include <asm/processor-flags.h>
30889
30890 // We mark the start of the code to copy
30891 // It's placed in .text tho it's never run here
30892@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
30893 // Changes type when we load it: damn Intel!
30894 // For after we switch over our page tables
30895 // That entry will be read-only: we'd crash.
30896+
30897+#ifdef CONFIG_PAX_KERNEXEC
30898+ mov %cr0, %edx
30899+ xor $X86_CR0_WP, %edx
30900+ mov %edx, %cr0
30901+#endif
30902+
30903 movl $(GDT_ENTRY_TSS*8), %edx
30904 ltr %dx
30905
30906@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
30907 // Let's clear it again for our return.
30908 // The GDT descriptor of the Host
30909 // Points to the table after two "size" bytes
30910- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
30911+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
30912 // Clear "used" from type field (byte 5, bit 2)
30913- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
30914+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
30915+
30916+#ifdef CONFIG_PAX_KERNEXEC
30917+ mov %cr0, %eax
30918+ xor $X86_CR0_WP, %eax
30919+ mov %eax, %cr0
30920+#endif
30921
30922 // Once our page table's switched, the Guest is live!
30923 // The Host fades as we run this final step.
30924@@ -295,13 +309,12 @@ deliver_to_host:
30925 // I consulted gcc, and it gave
30926 // These instructions, which I gladly credit:
30927 leal (%edx,%ebx,8), %eax
30928- movzwl (%eax),%edx
30929- movl 4(%eax), %eax
30930- xorw %ax, %ax
30931- orl %eax, %edx
30932+ movl 4(%eax), %edx
30933+ movw (%eax), %dx
30934 // Now the address of the handler's in %edx
30935 // We call it now: its "iret" drops us home.
30936- jmp *%edx
30937+ ljmp $__KERNEL_CS, $1f
30938+1: jmp *%edx
30939
30940 // Every interrupt can come to us here
30941 // But we must truly tell each apart.
30942diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
30943index 4daf9e5..b8d1d0f 100644
30944--- a/drivers/macintosh/macio_asic.c
30945+++ b/drivers/macintosh/macio_asic.c
30946@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
30947 * MacIO is matched against any Apple ID, it's probe() function
30948 * will then decide wether it applies or not
30949 */
30950-static const struct pci_device_id __devinitdata pci_ids [] = { {
30951+static const struct pci_device_id __devinitconst pci_ids [] = { {
30952 .vendor = PCI_VENDOR_ID_APPLE,
30953 .device = PCI_ANY_ID,
30954 .subvendor = PCI_ANY_ID,
30955diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
30956index 31c2dc2..a2de7a6 100644
30957--- a/drivers/md/dm-ioctl.c
30958+++ b/drivers/md/dm-ioctl.c
30959@@ -1589,7 +1589,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
30960 cmd == DM_LIST_VERSIONS_CMD)
30961 return 0;
30962
30963- if ((cmd == DM_DEV_CREATE_CMD)) {
30964+ if (cmd == DM_DEV_CREATE_CMD) {
30965 if (!*param->name) {
30966 DMWARN("name not supplied when creating device");
30967 return -EINVAL;
30968diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
30969index 9bfd057..01180bc 100644
30970--- a/drivers/md/dm-raid1.c
30971+++ b/drivers/md/dm-raid1.c
30972@@ -40,7 +40,7 @@ enum dm_raid1_error {
30973
30974 struct mirror {
30975 struct mirror_set *ms;
30976- atomic_t error_count;
30977+ atomic_unchecked_t error_count;
30978 unsigned long error_type;
30979 struct dm_dev *dev;
30980 sector_t offset;
30981@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
30982 struct mirror *m;
30983
30984 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
30985- if (!atomic_read(&m->error_count))
30986+ if (!atomic_read_unchecked(&m->error_count))
30987 return m;
30988
30989 return NULL;
30990@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
30991 * simple way to tell if a device has encountered
30992 * errors.
30993 */
30994- atomic_inc(&m->error_count);
30995+ atomic_inc_unchecked(&m->error_count);
30996
30997 if (test_and_set_bit(error_type, &m->error_type))
30998 return;
30999@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
31000 struct mirror *m = get_default_mirror(ms);
31001
31002 do {
31003- if (likely(!atomic_read(&m->error_count)))
31004+ if (likely(!atomic_read_unchecked(&m->error_count)))
31005 return m;
31006
31007 if (m-- == ms->mirror)
31008@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
31009 {
31010 struct mirror *default_mirror = get_default_mirror(m->ms);
31011
31012- return !atomic_read(&default_mirror->error_count);
31013+ return !atomic_read_unchecked(&default_mirror->error_count);
31014 }
31015
31016 static int mirror_available(struct mirror_set *ms, struct bio *bio)
31017@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
31018 */
31019 if (likely(region_in_sync(ms, region, 1)))
31020 m = choose_mirror(ms, bio->bi_sector);
31021- else if (m && atomic_read(&m->error_count))
31022+ else if (m && atomic_read_unchecked(&m->error_count))
31023 m = NULL;
31024
31025 if (likely(m))
31026@@ -937,7 +937,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
31027 }
31028
31029 ms->mirror[mirror].ms = ms;
31030- atomic_set(&(ms->mirror[mirror].error_count), 0);
31031+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
31032 ms->mirror[mirror].error_type = 0;
31033 ms->mirror[mirror].offset = offset;
31034
31035@@ -1347,7 +1347,7 @@ static void mirror_resume(struct dm_target *ti)
31036 */
31037 static char device_status_char(struct mirror *m)
31038 {
31039- if (!atomic_read(&(m->error_count)))
31040+ if (!atomic_read_unchecked(&(m->error_count)))
31041 return 'A';
31042
31043 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
31044diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
31045index 3d80cf0..b77cc47 100644
31046--- a/drivers/md/dm-stripe.c
31047+++ b/drivers/md/dm-stripe.c
31048@@ -20,7 +20,7 @@ struct stripe {
31049 struct dm_dev *dev;
31050 sector_t physical_start;
31051
31052- atomic_t error_count;
31053+ atomic_unchecked_t error_count;
31054 };
31055
31056 struct stripe_c {
31057@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
31058 kfree(sc);
31059 return r;
31060 }
31061- atomic_set(&(sc->stripe[i].error_count), 0);
31062+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
31063 }
31064
31065 ti->private = sc;
31066@@ -314,7 +314,7 @@ static int stripe_status(struct dm_target *ti,
31067 DMEMIT("%d ", sc->stripes);
31068 for (i = 0; i < sc->stripes; i++) {
31069 DMEMIT("%s ", sc->stripe[i].dev->name);
31070- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
31071+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
31072 'D' : 'A';
31073 }
31074 buffer[i] = '\0';
31075@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
31076 */
31077 for (i = 0; i < sc->stripes; i++)
31078 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
31079- atomic_inc(&(sc->stripe[i].error_count));
31080- if (atomic_read(&(sc->stripe[i].error_count)) <
31081+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
31082+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
31083 DM_IO_ERROR_THRESHOLD)
31084 schedule_work(&sc->trigger_event);
31085 }
31086diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
31087index 8e91321..fd17aef 100644
31088--- a/drivers/md/dm-table.c
31089+++ b/drivers/md/dm-table.c
31090@@ -391,7 +391,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
31091 if (!dev_size)
31092 return 0;
31093
31094- if ((start >= dev_size) || (start + len > dev_size)) {
31095+ if ((start >= dev_size) || (len > dev_size - start)) {
31096 DMWARN("%s: %s too small for target: "
31097 "start=%llu, len=%llu, dev_size=%llu",
31098 dm_device_name(ti->table->md), bdevname(bdev, b),
31099diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
31100index 59c4f04..4c7b661 100644
31101--- a/drivers/md/dm-thin-metadata.c
31102+++ b/drivers/md/dm-thin-metadata.c
31103@@ -431,7 +431,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
31104
31105 pmd->info.tm = tm;
31106 pmd->info.levels = 2;
31107- pmd->info.value_type.context = pmd->data_sm;
31108+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
31109 pmd->info.value_type.size = sizeof(__le64);
31110 pmd->info.value_type.inc = data_block_inc;
31111 pmd->info.value_type.dec = data_block_dec;
31112@@ -450,7 +450,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
31113
31114 pmd->bl_info.tm = tm;
31115 pmd->bl_info.levels = 1;
31116- pmd->bl_info.value_type.context = pmd->data_sm;
31117+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
31118 pmd->bl_info.value_type.size = sizeof(__le64);
31119 pmd->bl_info.value_type.inc = data_block_inc;
31120 pmd->bl_info.value_type.dec = data_block_dec;
31121diff --git a/drivers/md/dm.c b/drivers/md/dm.c
31122index 4720f68..78d1df7 100644
31123--- a/drivers/md/dm.c
31124+++ b/drivers/md/dm.c
31125@@ -177,9 +177,9 @@ struct mapped_device {
31126 /*
31127 * Event handling.
31128 */
31129- atomic_t event_nr;
31130+ atomic_unchecked_t event_nr;
31131 wait_queue_head_t eventq;
31132- atomic_t uevent_seq;
31133+ atomic_unchecked_t uevent_seq;
31134 struct list_head uevent_list;
31135 spinlock_t uevent_lock; /* Protect access to uevent_list */
31136
31137@@ -1845,8 +1845,8 @@ static struct mapped_device *alloc_dev(int minor)
31138 rwlock_init(&md->map_lock);
31139 atomic_set(&md->holders, 1);
31140 atomic_set(&md->open_count, 0);
31141- atomic_set(&md->event_nr, 0);
31142- atomic_set(&md->uevent_seq, 0);
31143+ atomic_set_unchecked(&md->event_nr, 0);
31144+ atomic_set_unchecked(&md->uevent_seq, 0);
31145 INIT_LIST_HEAD(&md->uevent_list);
31146 spin_lock_init(&md->uevent_lock);
31147
31148@@ -1980,7 +1980,7 @@ static void event_callback(void *context)
31149
31150 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
31151
31152- atomic_inc(&md->event_nr);
31153+ atomic_inc_unchecked(&md->event_nr);
31154 wake_up(&md->eventq);
31155 }
31156
31157@@ -2622,18 +2622,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
31158
31159 uint32_t dm_next_uevent_seq(struct mapped_device *md)
31160 {
31161- return atomic_add_return(1, &md->uevent_seq);
31162+ return atomic_add_return_unchecked(1, &md->uevent_seq);
31163 }
31164
31165 uint32_t dm_get_event_nr(struct mapped_device *md)
31166 {
31167- return atomic_read(&md->event_nr);
31168+ return atomic_read_unchecked(&md->event_nr);
31169 }
31170
31171 int dm_wait_event(struct mapped_device *md, int event_nr)
31172 {
31173 return wait_event_interruptible(md->eventq,
31174- (event_nr != atomic_read(&md->event_nr)));
31175+ (event_nr != atomic_read_unchecked(&md->event_nr)));
31176 }
31177
31178 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
31179diff --git a/drivers/md/md.c b/drivers/md/md.c
31180index f47f1f8..b7f559e 100644
31181--- a/drivers/md/md.c
31182+++ b/drivers/md/md.c
31183@@ -278,10 +278,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
31184 * start build, activate spare
31185 */
31186 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
31187-static atomic_t md_event_count;
31188+static atomic_unchecked_t md_event_count;
31189 void md_new_event(struct mddev *mddev)
31190 {
31191- atomic_inc(&md_event_count);
31192+ atomic_inc_unchecked(&md_event_count);
31193 wake_up(&md_event_waiters);
31194 }
31195 EXPORT_SYMBOL_GPL(md_new_event);
31196@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
31197 */
31198 static void md_new_event_inintr(struct mddev *mddev)
31199 {
31200- atomic_inc(&md_event_count);
31201+ atomic_inc_unchecked(&md_event_count);
31202 wake_up(&md_event_waiters);
31203 }
31204
31205@@ -1525,7 +1525,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
31206
31207 rdev->preferred_minor = 0xffff;
31208 rdev->data_offset = le64_to_cpu(sb->data_offset);
31209- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
31210+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
31211
31212 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
31213 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
31214@@ -1742,7 +1742,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
31215 else
31216 sb->resync_offset = cpu_to_le64(0);
31217
31218- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
31219+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
31220
31221 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
31222 sb->size = cpu_to_le64(mddev->dev_sectors);
31223@@ -2639,7 +2639,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
31224 static ssize_t
31225 errors_show(struct md_rdev *rdev, char *page)
31226 {
31227- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
31228+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
31229 }
31230
31231 static ssize_t
31232@@ -2648,7 +2648,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
31233 char *e;
31234 unsigned long n = simple_strtoul(buf, &e, 10);
31235 if (*buf && (*e == 0 || *e == '\n')) {
31236- atomic_set(&rdev->corrected_errors, n);
31237+ atomic_set_unchecked(&rdev->corrected_errors, n);
31238 return len;
31239 }
31240 return -EINVAL;
31241@@ -3039,8 +3039,8 @@ int md_rdev_init(struct md_rdev *rdev)
31242 rdev->sb_loaded = 0;
31243 rdev->bb_page = NULL;
31244 atomic_set(&rdev->nr_pending, 0);
31245- atomic_set(&rdev->read_errors, 0);
31246- atomic_set(&rdev->corrected_errors, 0);
31247+ atomic_set_unchecked(&rdev->read_errors, 0);
31248+ atomic_set_unchecked(&rdev->corrected_errors, 0);
31249
31250 INIT_LIST_HEAD(&rdev->same_set);
31251 init_waitqueue_head(&rdev->blocked_wait);
31252@@ -6683,7 +6683,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
31253
31254 spin_unlock(&pers_lock);
31255 seq_printf(seq, "\n");
31256- seq->poll_event = atomic_read(&md_event_count);
31257+ seq->poll_event = atomic_read_unchecked(&md_event_count);
31258 return 0;
31259 }
31260 if (v == (void*)2) {
31261@@ -6772,7 +6772,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
31262 chunk_kb ? "KB" : "B");
31263 if (bitmap->file) {
31264 seq_printf(seq, ", file: ");
31265- seq_path(seq, &bitmap->file->f_path, " \t\n");
31266+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
31267 }
31268
31269 seq_printf(seq, "\n");
31270@@ -6803,7 +6803,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
31271 return error;
31272
31273 seq = file->private_data;
31274- seq->poll_event = atomic_read(&md_event_count);
31275+ seq->poll_event = atomic_read_unchecked(&md_event_count);
31276 return error;
31277 }
31278
31279@@ -6817,7 +6817,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
31280 /* always allow read */
31281 mask = POLLIN | POLLRDNORM;
31282
31283- if (seq->poll_event != atomic_read(&md_event_count))
31284+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
31285 mask |= POLLERR | POLLPRI;
31286 return mask;
31287 }
31288@@ -6861,7 +6861,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
31289 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
31290 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
31291 (int)part_stat_read(&disk->part0, sectors[1]) -
31292- atomic_read(&disk->sync_io);
31293+ atomic_read_unchecked(&disk->sync_io);
31294 /* sync IO will cause sync_io to increase before the disk_stats
31295 * as sync_io is counted when a request starts, and
31296 * disk_stats is counted when it completes.
31297diff --git a/drivers/md/md.h b/drivers/md/md.h
31298index cf742d9..7c7c745 100644
31299--- a/drivers/md/md.h
31300+++ b/drivers/md/md.h
31301@@ -120,13 +120,13 @@ struct md_rdev {
31302 * only maintained for arrays that
31303 * support hot removal
31304 */
31305- atomic_t read_errors; /* number of consecutive read errors that
31306+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
31307 * we have tried to ignore.
31308 */
31309 struct timespec last_read_error; /* monotonic time since our
31310 * last read error
31311 */
31312- atomic_t corrected_errors; /* number of corrected read errors,
31313+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
31314 * for reporting to userspace and storing
31315 * in superblock.
31316 */
31317@@ -410,7 +410,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
31318
31319 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
31320 {
31321- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
31322+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
31323 }
31324
31325 struct md_personality
31326diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
31327index 50ed53b..4f29d7d 100644
31328--- a/drivers/md/persistent-data/dm-space-map-checker.c
31329+++ b/drivers/md/persistent-data/dm-space-map-checker.c
31330@@ -159,7 +159,7 @@ static void ca_destroy(struct count_array *ca)
31331 /*----------------------------------------------------------------*/
31332
31333 struct sm_checker {
31334- struct dm_space_map sm;
31335+ dm_space_map_no_const sm;
31336
31337 struct count_array old_counts;
31338 struct count_array counts;
31339diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
31340index fc469ba..2d91555 100644
31341--- a/drivers/md/persistent-data/dm-space-map-disk.c
31342+++ b/drivers/md/persistent-data/dm-space-map-disk.c
31343@@ -23,7 +23,7 @@
31344 * Space map interface.
31345 */
31346 struct sm_disk {
31347- struct dm_space_map sm;
31348+ dm_space_map_no_const sm;
31349
31350 struct ll_disk ll;
31351 struct ll_disk old_ll;
31352diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
31353index e89ae5e..062e4c2 100644
31354--- a/drivers/md/persistent-data/dm-space-map-metadata.c
31355+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
31356@@ -43,7 +43,7 @@ struct block_op {
31357 };
31358
31359 struct sm_metadata {
31360- struct dm_space_map sm;
31361+ dm_space_map_no_const sm;
31362
31363 struct ll_disk ll;
31364 struct ll_disk old_ll;
31365diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
31366index 1cbfc6b..56e1dbb 100644
31367--- a/drivers/md/persistent-data/dm-space-map.h
31368+++ b/drivers/md/persistent-data/dm-space-map.h
31369@@ -60,6 +60,7 @@ struct dm_space_map {
31370 int (*root_size)(struct dm_space_map *sm, size_t *result);
31371 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
31372 };
31373+typedef struct dm_space_map __no_const dm_space_map_no_const;
31374
31375 /*----------------------------------------------------------------*/
31376
31377diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
31378index 7d9e071..015b1d5 100644
31379--- a/drivers/md/raid1.c
31380+++ b/drivers/md/raid1.c
31381@@ -1568,7 +1568,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
31382 if (r1_sync_page_io(rdev, sect, s,
31383 bio->bi_io_vec[idx].bv_page,
31384 READ) != 0)
31385- atomic_add(s, &rdev->corrected_errors);
31386+ atomic_add_unchecked(s, &rdev->corrected_errors);
31387 }
31388 sectors -= s;
31389 sect += s;
31390@@ -1781,7 +1781,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
31391 test_bit(In_sync, &rdev->flags)) {
31392 if (r1_sync_page_io(rdev, sect, s,
31393 conf->tmppage, READ)) {
31394- atomic_add(s, &rdev->corrected_errors);
31395+ atomic_add_unchecked(s, &rdev->corrected_errors);
31396 printk(KERN_INFO
31397 "md/raid1:%s: read error corrected "
31398 "(%d sectors at %llu on %s)\n",
31399diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
31400index 685ddf3..955b087 100644
31401--- a/drivers/md/raid10.c
31402+++ b/drivers/md/raid10.c
31403@@ -1440,7 +1440,7 @@ static void end_sync_read(struct bio *bio, int error)
31404 /* The write handler will notice the lack of
31405 * R10BIO_Uptodate and record any errors etc
31406 */
31407- atomic_add(r10_bio->sectors,
31408+ atomic_add_unchecked(r10_bio->sectors,
31409 &conf->mirrors[d].rdev->corrected_errors);
31410
31411 /* for reconstruct, we always reschedule after a read.
31412@@ -1740,7 +1740,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
31413 {
31414 struct timespec cur_time_mon;
31415 unsigned long hours_since_last;
31416- unsigned int read_errors = atomic_read(&rdev->read_errors);
31417+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
31418
31419 ktime_get_ts(&cur_time_mon);
31420
31421@@ -1762,9 +1762,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
31422 * overflowing the shift of read_errors by hours_since_last.
31423 */
31424 if (hours_since_last >= 8 * sizeof(read_errors))
31425- atomic_set(&rdev->read_errors, 0);
31426+ atomic_set_unchecked(&rdev->read_errors, 0);
31427 else
31428- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
31429+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
31430 }
31431
31432 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
31433@@ -1814,8 +1814,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
31434 return;
31435
31436 check_decay_read_errors(mddev, rdev);
31437- atomic_inc(&rdev->read_errors);
31438- if (atomic_read(&rdev->read_errors) > max_read_errors) {
31439+ atomic_inc_unchecked(&rdev->read_errors);
31440+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
31441 char b[BDEVNAME_SIZE];
31442 bdevname(rdev->bdev, b);
31443
31444@@ -1823,7 +1823,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
31445 "md/raid10:%s: %s: Raid device exceeded "
31446 "read_error threshold [cur %d:max %d]\n",
31447 mdname(mddev), b,
31448- atomic_read(&rdev->read_errors), max_read_errors);
31449+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
31450 printk(KERN_NOTICE
31451 "md/raid10:%s: %s: Failing raid device\n",
31452 mdname(mddev), b);
31453@@ -1968,7 +1968,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
31454 (unsigned long long)(
31455 sect + rdev->data_offset),
31456 bdevname(rdev->bdev, b));
31457- atomic_add(s, &rdev->corrected_errors);
31458+ atomic_add_unchecked(s, &rdev->corrected_errors);
31459 }
31460
31461 rdev_dec_pending(rdev, mddev);
31462diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
31463index 858fdbb..b2dac95 100644
31464--- a/drivers/md/raid5.c
31465+++ b/drivers/md/raid5.c
31466@@ -1610,19 +1610,19 @@ static void raid5_end_read_request(struct bio * bi, int error)
31467 (unsigned long long)(sh->sector
31468 + rdev->data_offset),
31469 bdevname(rdev->bdev, b));
31470- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
31471+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
31472 clear_bit(R5_ReadError, &sh->dev[i].flags);
31473 clear_bit(R5_ReWrite, &sh->dev[i].flags);
31474 }
31475- if (atomic_read(&conf->disks[i].rdev->read_errors))
31476- atomic_set(&conf->disks[i].rdev->read_errors, 0);
31477+ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
31478+ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
31479 } else {
31480 const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
31481 int retry = 0;
31482 rdev = conf->disks[i].rdev;
31483
31484 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
31485- atomic_inc(&rdev->read_errors);
31486+ atomic_inc_unchecked(&rdev->read_errors);
31487 if (conf->mddev->degraded >= conf->max_degraded)
31488 printk_ratelimited(
31489 KERN_WARNING
31490@@ -1642,7 +1642,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
31491 (unsigned long long)(sh->sector
31492 + rdev->data_offset),
31493 bdn);
31494- else if (atomic_read(&rdev->read_errors)
31495+ else if (atomic_read_unchecked(&rdev->read_errors)
31496 > conf->max_nr_stripes)
31497 printk(KERN_WARNING
31498 "md/raid:%s: Too many read errors, failing device %s.\n",
31499diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
31500index ba9a643..e474ab5 100644
31501--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
31502+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
31503@@ -1678,7 +1678,7 @@ static struct ddb_info ddb_v6 = {
31504 .subvendor = _subvend, .subdevice = _subdev, \
31505 .driver_data = (unsigned long)&_driverdata }
31506
31507-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
31508+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
31509 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
31510 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
31511 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
31512diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
31513index a7d876f..8c21b61 100644
31514--- a/drivers/media/dvb/dvb-core/dvb_demux.h
31515+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
31516@@ -73,7 +73,7 @@ struct dvb_demux_feed {
31517 union {
31518 dmx_ts_cb ts;
31519 dmx_section_cb sec;
31520- } cb;
31521+ } __no_const cb;
31522
31523 struct dvb_demux *demux;
31524 void *priv;
31525diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
31526index f732877..d38c35a 100644
31527--- a/drivers/media/dvb/dvb-core/dvbdev.c
31528+++ b/drivers/media/dvb/dvb-core/dvbdev.c
31529@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
31530 const struct dvb_device *template, void *priv, int type)
31531 {
31532 struct dvb_device *dvbdev;
31533- struct file_operations *dvbdevfops;
31534+ file_operations_no_const *dvbdevfops;
31535 struct device *clsdev;
31536 int minor;
31537 int id;
31538diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
31539index 9f2a02c..5920f88 100644
31540--- a/drivers/media/dvb/dvb-usb/cxusb.c
31541+++ b/drivers/media/dvb/dvb-usb/cxusb.c
31542@@ -1069,7 +1069,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
31543 struct dib0700_adapter_state {
31544 int (*set_param_save) (struct dvb_frontend *,
31545 struct dvb_frontend_parameters *);
31546-};
31547+} __no_const;
31548
31549 static int dib7070_set_param_override(struct dvb_frontend *fe,
31550 struct dvb_frontend_parameters *fep)
31551diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
31552index f103ec1..5e8968b 100644
31553--- a/drivers/media/dvb/dvb-usb/dw2102.c
31554+++ b/drivers/media/dvb/dvb-usb/dw2102.c
31555@@ -95,7 +95,7 @@ struct su3000_state {
31556
31557 struct s6x0_state {
31558 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
31559-};
31560+} __no_const;
31561
31562 /* debug */
31563 static int dvb_usb_dw2102_debug;
31564diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
31565index 404f63a..4796533 100644
31566--- a/drivers/media/dvb/frontends/dib3000.h
31567+++ b/drivers/media/dvb/frontends/dib3000.h
31568@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
31569 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
31570 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
31571 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
31572-};
31573+} __no_const;
31574
31575 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
31576 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
31577diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
31578index 90bf573..e8463da 100644
31579--- a/drivers/media/dvb/frontends/ds3000.c
31580+++ b/drivers/media/dvb/frontends/ds3000.c
31581@@ -1210,7 +1210,7 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,
31582
31583 for (i = 0; i < 30 ; i++) {
31584 ds3000_read_status(fe, &status);
31585- if (status && FE_HAS_LOCK)
31586+ if (status & FE_HAS_LOCK)
31587 break;
31588
31589 msleep(10);
31590diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
31591index 0564192..75b16f5 100644
31592--- a/drivers/media/dvb/ngene/ngene-cards.c
31593+++ b/drivers/media/dvb/ngene/ngene-cards.c
31594@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780 = {
31595
31596 /****************************************************************************/
31597
31598-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
31599+static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
31600 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
31601 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
31602 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
31603diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
31604index 16a089f..ab1667d 100644
31605--- a/drivers/media/radio/radio-cadet.c
31606+++ b/drivers/media/radio/radio-cadet.c
31607@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
31608 unsigned char readbuf[RDS_BUFFER];
31609 int i = 0;
31610
31611+ if (count > RDS_BUFFER)
31612+ return -EFAULT;
31613 mutex_lock(&dev->lock);
31614 if (dev->rdsstat == 0) {
31615 dev->rdsstat = 1;
31616diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
31617index 61287fc..8b08712 100644
31618--- a/drivers/media/rc/redrat3.c
31619+++ b/drivers/media/rc/redrat3.c
31620@@ -905,7 +905,7 @@ static int redrat3_set_tx_carrier(struct rc_dev *dev, u32 carrier)
31621 return carrier;
31622 }
31623
31624-static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)
31625+static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf, u32 n)
31626 {
31627 struct redrat3_dev *rr3 = rcdev->priv;
31628 struct device *dev = rr3->dev;
31629diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
31630index 9cde353..8c6a1c3 100644
31631--- a/drivers/media/video/au0828/au0828.h
31632+++ b/drivers/media/video/au0828/au0828.h
31633@@ -191,7 +191,7 @@ struct au0828_dev {
31634
31635 /* I2C */
31636 struct i2c_adapter i2c_adap;
31637- struct i2c_algorithm i2c_algo;
31638+ i2c_algorithm_no_const i2c_algo;
31639 struct i2c_client i2c_client;
31640 u32 i2c_rc;
31641
31642diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
31643index 68d1240..46b32eb 100644
31644--- a/drivers/media/video/cx88/cx88-alsa.c
31645+++ b/drivers/media/video/cx88/cx88-alsa.c
31646@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
31647 * Only boards with eeprom and byte 1 at eeprom=1 have it
31648 */
31649
31650-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
31651+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
31652 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
31653 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
31654 {0, }
31655diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
31656index 305e6aa..0143317 100644
31657--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
31658+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
31659@@ -196,7 +196,7 @@ struct pvr2_hdw {
31660
31661 /* I2C stuff */
31662 struct i2c_adapter i2c_adap;
31663- struct i2c_algorithm i2c_algo;
31664+ i2c_algorithm_no_const i2c_algo;
31665 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
31666 int i2c_cx25840_hack_state;
31667 int i2c_linked;
31668diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
31669index a0895bf..b7ebb1b 100644
31670--- a/drivers/media/video/timblogiw.c
31671+++ b/drivers/media/video/timblogiw.c
31672@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
31673
31674 /* Platform device functions */
31675
31676-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
31677+static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
31678 .vidioc_querycap = timblogiw_querycap,
31679 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
31680 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
31681@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
31682 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
31683 };
31684
31685-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
31686+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
31687 .owner = THIS_MODULE,
31688 .open = timblogiw_open,
31689 .release = timblogiw_close,
31690diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
31691index e9c6a60..daf6a33 100644
31692--- a/drivers/message/fusion/mptbase.c
31693+++ b/drivers/message/fusion/mptbase.c
31694@@ -6753,8 +6753,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
31695 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
31696 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
31697
31698+#ifdef CONFIG_GRKERNSEC_HIDESYM
31699+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
31700+#else
31701 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
31702 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
31703+#endif
31704+
31705 /*
31706 * Rounding UP to nearest 4-kB boundary here...
31707 */
31708diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
31709index 9d95042..b808101 100644
31710--- a/drivers/message/fusion/mptsas.c
31711+++ b/drivers/message/fusion/mptsas.c
31712@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
31713 return 0;
31714 }
31715
31716+static inline void
31717+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
31718+{
31719+ if (phy_info->port_details) {
31720+ phy_info->port_details->rphy = rphy;
31721+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
31722+ ioc->name, rphy));
31723+ }
31724+
31725+ if (rphy) {
31726+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
31727+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
31728+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
31729+ ioc->name, rphy, rphy->dev.release));
31730+ }
31731+}
31732+
31733 /* no mutex */
31734 static void
31735 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
31736@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
31737 return NULL;
31738 }
31739
31740-static inline void
31741-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
31742-{
31743- if (phy_info->port_details) {
31744- phy_info->port_details->rphy = rphy;
31745- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
31746- ioc->name, rphy));
31747- }
31748-
31749- if (rphy) {
31750- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
31751- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
31752- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
31753- ioc->name, rphy, rphy->dev.release));
31754- }
31755-}
31756-
31757 static inline struct sas_port *
31758 mptsas_get_port(struct mptsas_phyinfo *phy_info)
31759 {
31760diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
31761index 0c3ced7..1fe34ec 100644
31762--- a/drivers/message/fusion/mptscsih.c
31763+++ b/drivers/message/fusion/mptscsih.c
31764@@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
31765
31766 h = shost_priv(SChost);
31767
31768- if (h) {
31769- if (h->info_kbuf == NULL)
31770- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
31771- return h->info_kbuf;
31772- h->info_kbuf[0] = '\0';
31773+ if (!h)
31774+ return NULL;
31775
31776- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
31777- h->info_kbuf[size-1] = '\0';
31778- }
31779+ if (h->info_kbuf == NULL)
31780+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
31781+ return h->info_kbuf;
31782+ h->info_kbuf[0] = '\0';
31783+
31784+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
31785+ h->info_kbuf[size-1] = '\0';
31786
31787 return h->info_kbuf;
31788 }
31789diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
31790index 07dbeaf..5533142 100644
31791--- a/drivers/message/i2o/i2o_proc.c
31792+++ b/drivers/message/i2o/i2o_proc.c
31793@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
31794 "Array Controller Device"
31795 };
31796
31797-static char *chtostr(u8 * chars, int n)
31798-{
31799- char tmp[256];
31800- tmp[0] = 0;
31801- return strncat(tmp, (char *)chars, n);
31802-}
31803-
31804 static int i2o_report_query_status(struct seq_file *seq, int block_status,
31805 char *group)
31806 {
31807@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
31808
31809 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
31810 seq_printf(seq, "%-#8x", ddm_table.module_id);
31811- seq_printf(seq, "%-29s",
31812- chtostr(ddm_table.module_name_version, 28));
31813+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
31814 seq_printf(seq, "%9d ", ddm_table.data_size);
31815 seq_printf(seq, "%8d", ddm_table.code_size);
31816
31817@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
31818
31819 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
31820 seq_printf(seq, "%-#8x", dst->module_id);
31821- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
31822- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
31823+ seq_printf(seq, "%-.28s", dst->module_name_version);
31824+ seq_printf(seq, "%-.8s", dst->date);
31825 seq_printf(seq, "%8d ", dst->module_size);
31826 seq_printf(seq, "%8d ", dst->mpb_size);
31827 seq_printf(seq, "0x%04x", dst->module_flags);
31828@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
31829 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
31830 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
31831 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
31832- seq_printf(seq, "Vendor info : %s\n",
31833- chtostr((u8 *) (work32 + 2), 16));
31834- seq_printf(seq, "Product info : %s\n",
31835- chtostr((u8 *) (work32 + 6), 16));
31836- seq_printf(seq, "Description : %s\n",
31837- chtostr((u8 *) (work32 + 10), 16));
31838- seq_printf(seq, "Product rev. : %s\n",
31839- chtostr((u8 *) (work32 + 14), 8));
31840+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
31841+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
31842+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
31843+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
31844
31845 seq_printf(seq, "Serial number : ");
31846 print_serial_number(seq, (u8 *) (work32 + 16),
31847@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
31848 }
31849
31850 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
31851- seq_printf(seq, "Module name : %s\n",
31852- chtostr(result.module_name, 24));
31853- seq_printf(seq, "Module revision : %s\n",
31854- chtostr(result.module_rev, 8));
31855+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
31856+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
31857
31858 seq_printf(seq, "Serial number : ");
31859 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
31860@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
31861 return 0;
31862 }
31863
31864- seq_printf(seq, "Device name : %s\n",
31865- chtostr(result.device_name, 64));
31866- seq_printf(seq, "Service name : %s\n",
31867- chtostr(result.service_name, 64));
31868- seq_printf(seq, "Physical name : %s\n",
31869- chtostr(result.physical_location, 64));
31870- seq_printf(seq, "Instance number : %s\n",
31871- chtostr(result.instance_number, 4));
31872+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
31873+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
31874+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
31875+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
31876
31877 return 0;
31878 }
31879diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
31880index a8c08f3..155fe3d 100644
31881--- a/drivers/message/i2o/iop.c
31882+++ b/drivers/message/i2o/iop.c
31883@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
31884
31885 spin_lock_irqsave(&c->context_list_lock, flags);
31886
31887- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
31888- atomic_inc(&c->context_list_counter);
31889+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
31890+ atomic_inc_unchecked(&c->context_list_counter);
31891
31892- entry->context = atomic_read(&c->context_list_counter);
31893+ entry->context = atomic_read_unchecked(&c->context_list_counter);
31894
31895 list_add(&entry->list, &c->context_list);
31896
31897@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
31898
31899 #if BITS_PER_LONG == 64
31900 spin_lock_init(&c->context_list_lock);
31901- atomic_set(&c->context_list_counter, 0);
31902+ atomic_set_unchecked(&c->context_list_counter, 0);
31903 INIT_LIST_HEAD(&c->context_list);
31904 #endif
31905
31906diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
31907index 7ce65f4..e66e9bc 100644
31908--- a/drivers/mfd/abx500-core.c
31909+++ b/drivers/mfd/abx500-core.c
31910@@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
31911
31912 struct abx500_device_entry {
31913 struct list_head list;
31914- struct abx500_ops ops;
31915+ abx500_ops_no_const ops;
31916 struct device *dev;
31917 };
31918
31919diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
31920index 5c2a06a..8fa077c 100644
31921--- a/drivers/mfd/janz-cmodio.c
31922+++ b/drivers/mfd/janz-cmodio.c
31923@@ -13,6 +13,7 @@
31924
31925 #include <linux/kernel.h>
31926 #include <linux/module.h>
31927+#include <linux/slab.h>
31928 #include <linux/init.h>
31929 #include <linux/pci.h>
31930 #include <linux/interrupt.h>
31931diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
31932index 29d12a7..f900ba4 100644
31933--- a/drivers/misc/lis3lv02d/lis3lv02d.c
31934+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
31935@@ -464,7 +464,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
31936 * the lid is closed. This leads to interrupts as soon as a little move
31937 * is done.
31938 */
31939- atomic_inc(&lis3->count);
31940+ atomic_inc_unchecked(&lis3->count);
31941
31942 wake_up_interruptible(&lis3->misc_wait);
31943 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
31944@@ -550,7 +550,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
31945 if (lis3->pm_dev)
31946 pm_runtime_get_sync(lis3->pm_dev);
31947
31948- atomic_set(&lis3->count, 0);
31949+ atomic_set_unchecked(&lis3->count, 0);
31950 return 0;
31951 }
31952
31953@@ -583,7 +583,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
31954 add_wait_queue(&lis3->misc_wait, &wait);
31955 while (true) {
31956 set_current_state(TASK_INTERRUPTIBLE);
31957- data = atomic_xchg(&lis3->count, 0);
31958+ data = atomic_xchg_unchecked(&lis3->count, 0);
31959 if (data)
31960 break;
31961
31962@@ -624,7 +624,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
31963 struct lis3lv02d, miscdev);
31964
31965 poll_wait(file, &lis3->misc_wait, wait);
31966- if (atomic_read(&lis3->count))
31967+ if (atomic_read_unchecked(&lis3->count))
31968 return POLLIN | POLLRDNORM;
31969 return 0;
31970 }
31971diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
31972index 2b1482a..5d33616 100644
31973--- a/drivers/misc/lis3lv02d/lis3lv02d.h
31974+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
31975@@ -266,7 +266,7 @@ struct lis3lv02d {
31976 struct input_polled_dev *idev; /* input device */
31977 struct platform_device *pdev; /* platform device */
31978 struct regulator_bulk_data regulators[2];
31979- atomic_t count; /* interrupt count after last read */
31980+ atomic_unchecked_t count; /* interrupt count after last read */
31981 union axis_conversion ac; /* hw -> logical axis */
31982 int mapped_btns[3];
31983
31984diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
31985index 2f30bad..c4c13d0 100644
31986--- a/drivers/misc/sgi-gru/gruhandles.c
31987+++ b/drivers/misc/sgi-gru/gruhandles.c
31988@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
31989 unsigned long nsec;
31990
31991 nsec = CLKS2NSEC(clks);
31992- atomic_long_inc(&mcs_op_statistics[op].count);
31993- atomic_long_add(nsec, &mcs_op_statistics[op].total);
31994+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
31995+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
31996 if (mcs_op_statistics[op].max < nsec)
31997 mcs_op_statistics[op].max = nsec;
31998 }
31999diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
32000index 7768b87..f8aac38 100644
32001--- a/drivers/misc/sgi-gru/gruprocfs.c
32002+++ b/drivers/misc/sgi-gru/gruprocfs.c
32003@@ -32,9 +32,9 @@
32004
32005 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
32006
32007-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
32008+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
32009 {
32010- unsigned long val = atomic_long_read(v);
32011+ unsigned long val = atomic_long_read_unchecked(v);
32012
32013 seq_printf(s, "%16lu %s\n", val, id);
32014 }
32015@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
32016
32017 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
32018 for (op = 0; op < mcsop_last; op++) {
32019- count = atomic_long_read(&mcs_op_statistics[op].count);
32020- total = atomic_long_read(&mcs_op_statistics[op].total);
32021+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
32022+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
32023 max = mcs_op_statistics[op].max;
32024 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
32025 count ? total / count : 0, max);
32026diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
32027index 5c3ce24..4915ccb 100644
32028--- a/drivers/misc/sgi-gru/grutables.h
32029+++ b/drivers/misc/sgi-gru/grutables.h
32030@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
32031 * GRU statistics.
32032 */
32033 struct gru_stats_s {
32034- atomic_long_t vdata_alloc;
32035- atomic_long_t vdata_free;
32036- atomic_long_t gts_alloc;
32037- atomic_long_t gts_free;
32038- atomic_long_t gms_alloc;
32039- atomic_long_t gms_free;
32040- atomic_long_t gts_double_allocate;
32041- atomic_long_t assign_context;
32042- atomic_long_t assign_context_failed;
32043- atomic_long_t free_context;
32044- atomic_long_t load_user_context;
32045- atomic_long_t load_kernel_context;
32046- atomic_long_t lock_kernel_context;
32047- atomic_long_t unlock_kernel_context;
32048- atomic_long_t steal_user_context;
32049- atomic_long_t steal_kernel_context;
32050- atomic_long_t steal_context_failed;
32051- atomic_long_t nopfn;
32052- atomic_long_t asid_new;
32053- atomic_long_t asid_next;
32054- atomic_long_t asid_wrap;
32055- atomic_long_t asid_reuse;
32056- atomic_long_t intr;
32057- atomic_long_t intr_cbr;
32058- atomic_long_t intr_tfh;
32059- atomic_long_t intr_spurious;
32060- atomic_long_t intr_mm_lock_failed;
32061- atomic_long_t call_os;
32062- atomic_long_t call_os_wait_queue;
32063- atomic_long_t user_flush_tlb;
32064- atomic_long_t user_unload_context;
32065- atomic_long_t user_exception;
32066- atomic_long_t set_context_option;
32067- atomic_long_t check_context_retarget_intr;
32068- atomic_long_t check_context_unload;
32069- atomic_long_t tlb_dropin;
32070- atomic_long_t tlb_preload_page;
32071- atomic_long_t tlb_dropin_fail_no_asid;
32072- atomic_long_t tlb_dropin_fail_upm;
32073- atomic_long_t tlb_dropin_fail_invalid;
32074- atomic_long_t tlb_dropin_fail_range_active;
32075- atomic_long_t tlb_dropin_fail_idle;
32076- atomic_long_t tlb_dropin_fail_fmm;
32077- atomic_long_t tlb_dropin_fail_no_exception;
32078- atomic_long_t tfh_stale_on_fault;
32079- atomic_long_t mmu_invalidate_range;
32080- atomic_long_t mmu_invalidate_page;
32081- atomic_long_t flush_tlb;
32082- atomic_long_t flush_tlb_gru;
32083- atomic_long_t flush_tlb_gru_tgh;
32084- atomic_long_t flush_tlb_gru_zero_asid;
32085+ atomic_long_unchecked_t vdata_alloc;
32086+ atomic_long_unchecked_t vdata_free;
32087+ atomic_long_unchecked_t gts_alloc;
32088+ atomic_long_unchecked_t gts_free;
32089+ atomic_long_unchecked_t gms_alloc;
32090+ atomic_long_unchecked_t gms_free;
32091+ atomic_long_unchecked_t gts_double_allocate;
32092+ atomic_long_unchecked_t assign_context;
32093+ atomic_long_unchecked_t assign_context_failed;
32094+ atomic_long_unchecked_t free_context;
32095+ atomic_long_unchecked_t load_user_context;
32096+ atomic_long_unchecked_t load_kernel_context;
32097+ atomic_long_unchecked_t lock_kernel_context;
32098+ atomic_long_unchecked_t unlock_kernel_context;
32099+ atomic_long_unchecked_t steal_user_context;
32100+ atomic_long_unchecked_t steal_kernel_context;
32101+ atomic_long_unchecked_t steal_context_failed;
32102+ atomic_long_unchecked_t nopfn;
32103+ atomic_long_unchecked_t asid_new;
32104+ atomic_long_unchecked_t asid_next;
32105+ atomic_long_unchecked_t asid_wrap;
32106+ atomic_long_unchecked_t asid_reuse;
32107+ atomic_long_unchecked_t intr;
32108+ atomic_long_unchecked_t intr_cbr;
32109+ atomic_long_unchecked_t intr_tfh;
32110+ atomic_long_unchecked_t intr_spurious;
32111+ atomic_long_unchecked_t intr_mm_lock_failed;
32112+ atomic_long_unchecked_t call_os;
32113+ atomic_long_unchecked_t call_os_wait_queue;
32114+ atomic_long_unchecked_t user_flush_tlb;
32115+ atomic_long_unchecked_t user_unload_context;
32116+ atomic_long_unchecked_t user_exception;
32117+ atomic_long_unchecked_t set_context_option;
32118+ atomic_long_unchecked_t check_context_retarget_intr;
32119+ atomic_long_unchecked_t check_context_unload;
32120+ atomic_long_unchecked_t tlb_dropin;
32121+ atomic_long_unchecked_t tlb_preload_page;
32122+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
32123+ atomic_long_unchecked_t tlb_dropin_fail_upm;
32124+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
32125+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
32126+ atomic_long_unchecked_t tlb_dropin_fail_idle;
32127+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
32128+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
32129+ atomic_long_unchecked_t tfh_stale_on_fault;
32130+ atomic_long_unchecked_t mmu_invalidate_range;
32131+ atomic_long_unchecked_t mmu_invalidate_page;
32132+ atomic_long_unchecked_t flush_tlb;
32133+ atomic_long_unchecked_t flush_tlb_gru;
32134+ atomic_long_unchecked_t flush_tlb_gru_tgh;
32135+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
32136
32137- atomic_long_t copy_gpa;
32138- atomic_long_t read_gpa;
32139+ atomic_long_unchecked_t copy_gpa;
32140+ atomic_long_unchecked_t read_gpa;
32141
32142- atomic_long_t mesq_receive;
32143- atomic_long_t mesq_receive_none;
32144- atomic_long_t mesq_send;
32145- atomic_long_t mesq_send_failed;
32146- atomic_long_t mesq_noop;
32147- atomic_long_t mesq_send_unexpected_error;
32148- atomic_long_t mesq_send_lb_overflow;
32149- atomic_long_t mesq_send_qlimit_reached;
32150- atomic_long_t mesq_send_amo_nacked;
32151- atomic_long_t mesq_send_put_nacked;
32152- atomic_long_t mesq_page_overflow;
32153- atomic_long_t mesq_qf_locked;
32154- atomic_long_t mesq_qf_noop_not_full;
32155- atomic_long_t mesq_qf_switch_head_failed;
32156- atomic_long_t mesq_qf_unexpected_error;
32157- atomic_long_t mesq_noop_unexpected_error;
32158- atomic_long_t mesq_noop_lb_overflow;
32159- atomic_long_t mesq_noop_qlimit_reached;
32160- atomic_long_t mesq_noop_amo_nacked;
32161- atomic_long_t mesq_noop_put_nacked;
32162- atomic_long_t mesq_noop_page_overflow;
32163+ atomic_long_unchecked_t mesq_receive;
32164+ atomic_long_unchecked_t mesq_receive_none;
32165+ atomic_long_unchecked_t mesq_send;
32166+ atomic_long_unchecked_t mesq_send_failed;
32167+ atomic_long_unchecked_t mesq_noop;
32168+ atomic_long_unchecked_t mesq_send_unexpected_error;
32169+ atomic_long_unchecked_t mesq_send_lb_overflow;
32170+ atomic_long_unchecked_t mesq_send_qlimit_reached;
32171+ atomic_long_unchecked_t mesq_send_amo_nacked;
32172+ atomic_long_unchecked_t mesq_send_put_nacked;
32173+ atomic_long_unchecked_t mesq_page_overflow;
32174+ atomic_long_unchecked_t mesq_qf_locked;
32175+ atomic_long_unchecked_t mesq_qf_noop_not_full;
32176+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
32177+ atomic_long_unchecked_t mesq_qf_unexpected_error;
32178+ atomic_long_unchecked_t mesq_noop_unexpected_error;
32179+ atomic_long_unchecked_t mesq_noop_lb_overflow;
32180+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
32181+ atomic_long_unchecked_t mesq_noop_amo_nacked;
32182+ atomic_long_unchecked_t mesq_noop_put_nacked;
32183+ atomic_long_unchecked_t mesq_noop_page_overflow;
32184
32185 };
32186
32187@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
32188 tghop_invalidate, mcsop_last};
32189
32190 struct mcs_op_statistic {
32191- atomic_long_t count;
32192- atomic_long_t total;
32193+ atomic_long_unchecked_t count;
32194+ atomic_long_unchecked_t total;
32195 unsigned long max;
32196 };
32197
32198@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
32199
32200 #define STAT(id) do { \
32201 if (gru_options & OPT_STATS) \
32202- atomic_long_inc(&gru_stats.id); \
32203+ atomic_long_inc_unchecked(&gru_stats.id); \
32204 } while (0)
32205
32206 #ifdef CONFIG_SGI_GRU_DEBUG
32207diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
32208index 851b2f2..a4ec097 100644
32209--- a/drivers/misc/sgi-xp/xp.h
32210+++ b/drivers/misc/sgi-xp/xp.h
32211@@ -289,7 +289,7 @@ struct xpc_interface {
32212 xpc_notify_func, void *);
32213 void (*received) (short, int, void *);
32214 enum xp_retval (*partid_to_nasids) (short, void *);
32215-};
32216+} __no_const;
32217
32218 extern struct xpc_interface xpc_interface;
32219
32220diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
32221index b94d5f7..7f494c5 100644
32222--- a/drivers/misc/sgi-xp/xpc.h
32223+++ b/drivers/misc/sgi-xp/xpc.h
32224@@ -835,6 +835,7 @@ struct xpc_arch_operations {
32225 void (*received_payload) (struct xpc_channel *, void *);
32226 void (*notify_senders_of_disconnect) (struct xpc_channel *);
32227 };
32228+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
32229
32230 /* struct xpc_partition act_state values (for XPC HB) */
32231
32232@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
32233 /* found in xpc_main.c */
32234 extern struct device *xpc_part;
32235 extern struct device *xpc_chan;
32236-extern struct xpc_arch_operations xpc_arch_ops;
32237+extern xpc_arch_operations_no_const xpc_arch_ops;
32238 extern int xpc_disengage_timelimit;
32239 extern int xpc_disengage_timedout;
32240 extern int xpc_activate_IRQ_rcvd;
32241diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
32242index 8d082b4..aa749ae 100644
32243--- a/drivers/misc/sgi-xp/xpc_main.c
32244+++ b/drivers/misc/sgi-xp/xpc_main.c
32245@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
32246 .notifier_call = xpc_system_die,
32247 };
32248
32249-struct xpc_arch_operations xpc_arch_ops;
32250+xpc_arch_operations_no_const xpc_arch_ops;
32251
32252 /*
32253 * Timer function to enforce the timelimit on the partition disengage.
32254diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
32255index 6878a94..fe5c5f1 100644
32256--- a/drivers/mmc/host/sdhci-pci.c
32257+++ b/drivers/mmc/host/sdhci-pci.c
32258@@ -673,7 +673,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
32259 .probe = via_probe,
32260 };
32261
32262-static const struct pci_device_id pci_ids[] __devinitdata = {
32263+static const struct pci_device_id pci_ids[] __devinitconst = {
32264 {
32265 .vendor = PCI_VENDOR_ID_RICOH,
32266 .device = PCI_DEVICE_ID_RICOH_R5C822,
32267diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
32268index e9fad91..0a7a16a 100644
32269--- a/drivers/mtd/devices/doc2000.c
32270+++ b/drivers/mtd/devices/doc2000.c
32271@@ -773,7 +773,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
32272
32273 /* The ECC will not be calculated correctly if less than 512 is written */
32274 /* DBB-
32275- if (len != 0x200 && eccbuf)
32276+ if (len != 0x200)
32277 printk(KERN_WARNING
32278 "ECC needs a full sector write (adr: %lx size %lx)\n",
32279 (long) to, (long) len);
32280diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
32281index a3f7a27..234016e 100644
32282--- a/drivers/mtd/devices/doc2001.c
32283+++ b/drivers/mtd/devices/doc2001.c
32284@@ -392,7 +392,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
32285 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
32286
32287 /* Don't allow read past end of device */
32288- if (from >= this->totlen)
32289+ if (from >= this->totlen || !len)
32290 return -EINVAL;
32291
32292 /* Don't allow a single read to cross a 512-byte block boundary */
32293diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
32294index 3984d48..28aa897 100644
32295--- a/drivers/mtd/nand/denali.c
32296+++ b/drivers/mtd/nand/denali.c
32297@@ -26,6 +26,7 @@
32298 #include <linux/pci.h>
32299 #include <linux/mtd/mtd.h>
32300 #include <linux/module.h>
32301+#include <linux/slab.h>
32302
32303 #include "denali.h"
32304
32305diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
32306index ac40925..483b753 100644
32307--- a/drivers/mtd/nftlmount.c
32308+++ b/drivers/mtd/nftlmount.c
32309@@ -24,6 +24,7 @@
32310 #include <asm/errno.h>
32311 #include <linux/delay.h>
32312 #include <linux/slab.h>
32313+#include <linux/sched.h>
32314 #include <linux/mtd/mtd.h>
32315 #include <linux/mtd/nand.h>
32316 #include <linux/mtd/nftl.h>
32317diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
32318index 6c3fb5a..c542a81 100644
32319--- a/drivers/mtd/ubi/build.c
32320+++ b/drivers/mtd/ubi/build.c
32321@@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
32322 static int __init bytes_str_to_int(const char *str)
32323 {
32324 char *endp;
32325- unsigned long result;
32326+ unsigned long result, scale = 1;
32327
32328 result = simple_strtoul(str, &endp, 0);
32329 if (str == endp || result >= INT_MAX) {
32330@@ -1322,11 +1322,11 @@ static int __init bytes_str_to_int(const char *str)
32331
32332 switch (*endp) {
32333 case 'G':
32334- result *= 1024;
32335+ scale *= 1024;
32336 case 'M':
32337- result *= 1024;
32338+ scale *= 1024;
32339 case 'K':
32340- result *= 1024;
32341+ scale *= 1024;
32342 if (endp[1] == 'i' && endp[2] == 'B')
32343 endp += 2;
32344 case '\0':
32345@@ -1337,7 +1337,13 @@ static int __init bytes_str_to_int(const char *str)
32346 return -EINVAL;
32347 }
32348
32349- return result;
32350+ if ((intoverflow_t)result*scale >= INT_MAX) {
32351+ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
32352+ str);
32353+ return -EINVAL;
32354+ }
32355+
32356+ return result*scale;
32357 }
32358
32359 /**
32360diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
32361index 1feae59..c2a61d2 100644
32362--- a/drivers/net/ethernet/atheros/atlx/atl2.c
32363+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
32364@@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
32365 */
32366
32367 #define ATL2_PARAM(X, desc) \
32368- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
32369+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
32370 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
32371 MODULE_PARM_DESC(X, desc);
32372 #else
32373diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
32374index 9a517c2..a50cfcb 100644
32375--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
32376+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
32377@@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
32378
32379 int (*wait_comp)(struct bnx2x *bp,
32380 struct bnx2x_rx_mode_ramrod_params *p);
32381-};
32382+} __no_const;
32383
32384 /********************** Set multicast group ***********************************/
32385
32386diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
32387index 94b4bd0..73c02de 100644
32388--- a/drivers/net/ethernet/broadcom/tg3.h
32389+++ b/drivers/net/ethernet/broadcom/tg3.h
32390@@ -134,6 +134,7 @@
32391 #define CHIPREV_ID_5750_A0 0x4000
32392 #define CHIPREV_ID_5750_A1 0x4001
32393 #define CHIPREV_ID_5750_A3 0x4003
32394+#define CHIPREV_ID_5750_C1 0x4201
32395 #define CHIPREV_ID_5750_C2 0x4202
32396 #define CHIPREV_ID_5752_A0_HW 0x5000
32397 #define CHIPREV_ID_5752_A0 0x6000
32398diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
32399index c5f5479..2e8c260 100644
32400--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
32401+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
32402@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
32403 */
32404 struct l2t_skb_cb {
32405 arp_failure_handler_func arp_failure_handler;
32406-};
32407+} __no_const;
32408
32409 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
32410
32411diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
32412index 871bcaa..4043505 100644
32413--- a/drivers/net/ethernet/dec/tulip/de4x5.c
32414+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
32415@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
32416 for (i=0; i<ETH_ALEN; i++) {
32417 tmp.addr[i] = dev->dev_addr[i];
32418 }
32419- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
32420+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
32421 break;
32422
32423 case DE4X5_SET_HWADDR: /* Set the hardware address */
32424@@ -5437,7 +5437,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
32425 spin_lock_irqsave(&lp->lock, flags);
32426 memcpy(&statbuf, &lp->pktStats, ioc->len);
32427 spin_unlock_irqrestore(&lp->lock, flags);
32428- if (copy_to_user(ioc->data, &statbuf, ioc->len))
32429+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
32430 return -EFAULT;
32431 break;
32432 }
32433diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
32434index 14d5b61..1398636 100644
32435--- a/drivers/net/ethernet/dec/tulip/eeprom.c
32436+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
32437@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
32438 {NULL}};
32439
32440
32441-static const char *block_name[] __devinitdata = {
32442+static const char *block_name[] __devinitconst = {
32443 "21140 non-MII",
32444 "21140 MII PHY",
32445 "21142 Serial PHY",
32446diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
32447index 4d01219..b58d26d 100644
32448--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
32449+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
32450@@ -236,7 +236,7 @@ struct pci_id_info {
32451 int drv_flags; /* Driver use, intended as capability flags. */
32452 };
32453
32454-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
32455+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
32456 { /* Sometime a Level-One switch card. */
32457 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
32458 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
32459diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
32460index dcd7f7a..ecb7fb3 100644
32461--- a/drivers/net/ethernet/dlink/sundance.c
32462+++ b/drivers/net/ethernet/dlink/sundance.c
32463@@ -218,7 +218,7 @@ enum {
32464 struct pci_id_info {
32465 const char *name;
32466 };
32467-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
32468+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
32469 {"D-Link DFE-550TX FAST Ethernet Adapter"},
32470 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
32471 {"D-Link DFE-580TX 4 port Server Adapter"},
32472diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
32473index bf266a0..e024af7 100644
32474--- a/drivers/net/ethernet/emulex/benet/be_main.c
32475+++ b/drivers/net/ethernet/emulex/benet/be_main.c
32476@@ -397,7 +397,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
32477
32478 if (wrapped)
32479 newacc += 65536;
32480- ACCESS_ONCE(*acc) = newacc;
32481+ ACCESS_ONCE_RW(*acc) = newacc;
32482 }
32483
32484 void be_parse_stats(struct be_adapter *adapter)
32485diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
32486index 61d2bdd..7f1154a 100644
32487--- a/drivers/net/ethernet/fealnx.c
32488+++ b/drivers/net/ethernet/fealnx.c
32489@@ -150,7 +150,7 @@ struct chip_info {
32490 int flags;
32491 };
32492
32493-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
32494+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
32495 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
32496 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
32497 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
32498diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
32499index e1159e5..e18684d 100644
32500--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
32501+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
32502@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
32503 {
32504 struct e1000_hw *hw = &adapter->hw;
32505 struct e1000_mac_info *mac = &hw->mac;
32506- struct e1000_mac_operations *func = &mac->ops;
32507+ e1000_mac_operations_no_const *func = &mac->ops;
32508
32509 /* Set media type */
32510 switch (adapter->pdev->device) {
32511diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
32512index a3e65fd..f451444 100644
32513--- a/drivers/net/ethernet/intel/e1000e/82571.c
32514+++ b/drivers/net/ethernet/intel/e1000e/82571.c
32515@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
32516 {
32517 struct e1000_hw *hw = &adapter->hw;
32518 struct e1000_mac_info *mac = &hw->mac;
32519- struct e1000_mac_operations *func = &mac->ops;
32520+ e1000_mac_operations_no_const *func = &mac->ops;
32521 u32 swsm = 0;
32522 u32 swsm2 = 0;
32523 bool force_clear_smbi = false;
32524diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
32525index 2967039..ca8c40c 100644
32526--- a/drivers/net/ethernet/intel/e1000e/hw.h
32527+++ b/drivers/net/ethernet/intel/e1000e/hw.h
32528@@ -778,6 +778,7 @@ struct e1000_mac_operations {
32529 void (*write_vfta)(struct e1000_hw *, u32, u32);
32530 s32 (*read_mac_addr)(struct e1000_hw *);
32531 };
32532+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
32533
32534 /*
32535 * When to use various PHY register access functions:
32536@@ -818,6 +819,7 @@ struct e1000_phy_operations {
32537 void (*power_up)(struct e1000_hw *);
32538 void (*power_down)(struct e1000_hw *);
32539 };
32540+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
32541
32542 /* Function pointers for the NVM. */
32543 struct e1000_nvm_operations {
32544@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
32545 s32 (*validate)(struct e1000_hw *);
32546 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
32547 };
32548+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
32549
32550 struct e1000_mac_info {
32551- struct e1000_mac_operations ops;
32552+ e1000_mac_operations_no_const ops;
32553 u8 addr[ETH_ALEN];
32554 u8 perm_addr[ETH_ALEN];
32555
32556@@ -872,7 +875,7 @@ struct e1000_mac_info {
32557 };
32558
32559 struct e1000_phy_info {
32560- struct e1000_phy_operations ops;
32561+ e1000_phy_operations_no_const ops;
32562
32563 enum e1000_phy_type type;
32564
32565@@ -906,7 +909,7 @@ struct e1000_phy_info {
32566 };
32567
32568 struct e1000_nvm_info {
32569- struct e1000_nvm_operations ops;
32570+ e1000_nvm_operations_no_const ops;
32571
32572 enum e1000_nvm_type type;
32573 enum e1000_nvm_override override;
32574diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
32575index 4519a13..f97fcd0 100644
32576--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
32577+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
32578@@ -314,6 +314,7 @@ struct e1000_mac_operations {
32579 s32 (*read_mac_addr)(struct e1000_hw *);
32580 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
32581 };
32582+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
32583
32584 struct e1000_phy_operations {
32585 s32 (*acquire)(struct e1000_hw *);
32586@@ -330,6 +331,7 @@ struct e1000_phy_operations {
32587 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
32588 s32 (*write_reg)(struct e1000_hw *, u32, u16);
32589 };
32590+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
32591
32592 struct e1000_nvm_operations {
32593 s32 (*acquire)(struct e1000_hw *);
32594@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
32595 s32 (*update)(struct e1000_hw *);
32596 s32 (*validate)(struct e1000_hw *);
32597 };
32598+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
32599
32600 struct e1000_info {
32601 s32 (*get_invariants)(struct e1000_hw *);
32602@@ -350,7 +353,7 @@ struct e1000_info {
32603 extern const struct e1000_info e1000_82575_info;
32604
32605 struct e1000_mac_info {
32606- struct e1000_mac_operations ops;
32607+ e1000_mac_operations_no_const ops;
32608
32609 u8 addr[6];
32610 u8 perm_addr[6];
32611@@ -388,7 +391,7 @@ struct e1000_mac_info {
32612 };
32613
32614 struct e1000_phy_info {
32615- struct e1000_phy_operations ops;
32616+ e1000_phy_operations_no_const ops;
32617
32618 enum e1000_phy_type type;
32619
32620@@ -423,7 +426,7 @@ struct e1000_phy_info {
32621 };
32622
32623 struct e1000_nvm_info {
32624- struct e1000_nvm_operations ops;
32625+ e1000_nvm_operations_no_const ops;
32626 enum e1000_nvm_type type;
32627 enum e1000_nvm_override override;
32628
32629@@ -468,6 +471,7 @@ struct e1000_mbx_operations {
32630 s32 (*check_for_ack)(struct e1000_hw *, u16);
32631 s32 (*check_for_rst)(struct e1000_hw *, u16);
32632 };
32633+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
32634
32635 struct e1000_mbx_stats {
32636 u32 msgs_tx;
32637@@ -479,7 +483,7 @@ struct e1000_mbx_stats {
32638 };
32639
32640 struct e1000_mbx_info {
32641- struct e1000_mbx_operations ops;
32642+ e1000_mbx_operations_no_const ops;
32643 struct e1000_mbx_stats stats;
32644 u32 timeout;
32645 u32 usec_delay;
32646diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
32647index d7ed58f..64cde36 100644
32648--- a/drivers/net/ethernet/intel/igbvf/vf.h
32649+++ b/drivers/net/ethernet/intel/igbvf/vf.h
32650@@ -189,9 +189,10 @@ struct e1000_mac_operations {
32651 s32 (*read_mac_addr)(struct e1000_hw *);
32652 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
32653 };
32654+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
32655
32656 struct e1000_mac_info {
32657- struct e1000_mac_operations ops;
32658+ e1000_mac_operations_no_const ops;
32659 u8 addr[6];
32660 u8 perm_addr[6];
32661
32662@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
32663 s32 (*check_for_ack)(struct e1000_hw *);
32664 s32 (*check_for_rst)(struct e1000_hw *);
32665 };
32666+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
32667
32668 struct e1000_mbx_stats {
32669 u32 msgs_tx;
32670@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
32671 };
32672
32673 struct e1000_mbx_info {
32674- struct e1000_mbx_operations ops;
32675+ e1000_mbx_operations_no_const ops;
32676 struct e1000_mbx_stats stats;
32677 u32 timeout;
32678 u32 usec_delay;
32679diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
32680index 6c5cca8..de8ef63 100644
32681--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
32682+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
32683@@ -2708,6 +2708,7 @@ struct ixgbe_eeprom_operations {
32684 s32 (*update_checksum)(struct ixgbe_hw *);
32685 u16 (*calc_checksum)(struct ixgbe_hw *);
32686 };
32687+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
32688
32689 struct ixgbe_mac_operations {
32690 s32 (*init_hw)(struct ixgbe_hw *);
32691@@ -2769,6 +2770,7 @@ struct ixgbe_mac_operations {
32692 /* Manageability interface */
32693 s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
32694 };
32695+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
32696
32697 struct ixgbe_phy_operations {
32698 s32 (*identify)(struct ixgbe_hw *);
32699@@ -2788,9 +2790,10 @@ struct ixgbe_phy_operations {
32700 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
32701 s32 (*check_overtemp)(struct ixgbe_hw *);
32702 };
32703+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
32704
32705 struct ixgbe_eeprom_info {
32706- struct ixgbe_eeprom_operations ops;
32707+ ixgbe_eeprom_operations_no_const ops;
32708 enum ixgbe_eeprom_type type;
32709 u32 semaphore_delay;
32710 u16 word_size;
32711@@ -2800,7 +2803,7 @@ struct ixgbe_eeprom_info {
32712
32713 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
32714 struct ixgbe_mac_info {
32715- struct ixgbe_mac_operations ops;
32716+ ixgbe_mac_operations_no_const ops;
32717 enum ixgbe_mac_type type;
32718 u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
32719 u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
32720@@ -2828,7 +2831,7 @@ struct ixgbe_mac_info {
32721 };
32722
32723 struct ixgbe_phy_info {
32724- struct ixgbe_phy_operations ops;
32725+ ixgbe_phy_operations_no_const ops;
32726 struct mdio_if_info mdio;
32727 enum ixgbe_phy_type type;
32728 u32 id;
32729@@ -2856,6 +2859,7 @@ struct ixgbe_mbx_operations {
32730 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
32731 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
32732 };
32733+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
32734
32735 struct ixgbe_mbx_stats {
32736 u32 msgs_tx;
32737@@ -2867,7 +2871,7 @@ struct ixgbe_mbx_stats {
32738 };
32739
32740 struct ixgbe_mbx_info {
32741- struct ixgbe_mbx_operations ops;
32742+ ixgbe_mbx_operations_no_const ops;
32743 struct ixgbe_mbx_stats stats;
32744 u32 timeout;
32745 u32 usec_delay;
32746diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
32747index 10306b4..28df758 100644
32748--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
32749+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
32750@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
32751 s32 (*clear_vfta)(struct ixgbe_hw *);
32752 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
32753 };
32754+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
32755
32756 enum ixgbe_mac_type {
32757 ixgbe_mac_unknown = 0,
32758@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
32759 };
32760
32761 struct ixgbe_mac_info {
32762- struct ixgbe_mac_operations ops;
32763+ ixgbe_mac_operations_no_const ops;
32764 u8 addr[6];
32765 u8 perm_addr[6];
32766
32767@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
32768 s32 (*check_for_ack)(struct ixgbe_hw *);
32769 s32 (*check_for_rst)(struct ixgbe_hw *);
32770 };
32771+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
32772
32773 struct ixgbe_mbx_stats {
32774 u32 msgs_tx;
32775@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
32776 };
32777
32778 struct ixgbe_mbx_info {
32779- struct ixgbe_mbx_operations ops;
32780+ ixgbe_mbx_operations_no_const ops;
32781 struct ixgbe_mbx_stats stats;
32782 u32 timeout;
32783 u32 udelay;
32784diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
32785index 94bbc85..78c12e6 100644
32786--- a/drivers/net/ethernet/mellanox/mlx4/main.c
32787+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
32788@@ -40,6 +40,7 @@
32789 #include <linux/dma-mapping.h>
32790 #include <linux/slab.h>
32791 #include <linux/io-mapping.h>
32792+#include <linux/sched.h>
32793
32794 #include <linux/mlx4/device.h>
32795 #include <linux/mlx4/doorbell.h>
32796diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
32797index 5046a64..71ca936 100644
32798--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
32799+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
32800@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
32801 void (*link_down)(struct __vxge_hw_device *devh);
32802 void (*crit_err)(struct __vxge_hw_device *devh,
32803 enum vxge_hw_event type, u64 ext_data);
32804-};
32805+} __no_const;
32806
32807 /*
32808 * struct __vxge_hw_blockpool_entry - Block private data structure
32809diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
32810index 4a518a3..936b334 100644
32811--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
32812+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
32813@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
32814 struct vxge_hw_mempool_dma *dma_object,
32815 u32 index,
32816 u32 is_last);
32817-};
32818+} __no_const;
32819
32820 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
32821 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
32822diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
32823index c8f47f1..5da9840 100644
32824--- a/drivers/net/ethernet/realtek/r8169.c
32825+++ b/drivers/net/ethernet/realtek/r8169.c
32826@@ -698,17 +698,17 @@ struct rtl8169_private {
32827 struct mdio_ops {
32828 void (*write)(void __iomem *, int, int);
32829 int (*read)(void __iomem *, int);
32830- } mdio_ops;
32831+ } __no_const mdio_ops;
32832
32833 struct pll_power_ops {
32834 void (*down)(struct rtl8169_private *);
32835 void (*up)(struct rtl8169_private *);
32836- } pll_power_ops;
32837+ } __no_const pll_power_ops;
32838
32839 struct jumbo_ops {
32840 void (*enable)(struct rtl8169_private *);
32841 void (*disable)(struct rtl8169_private *);
32842- } jumbo_ops;
32843+ } __no_const jumbo_ops;
32844
32845 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
32846 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
32847diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
32848index 1b4658c..a30dabb 100644
32849--- a/drivers/net/ethernet/sis/sis190.c
32850+++ b/drivers/net/ethernet/sis/sis190.c
32851@@ -1624,7 +1624,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
32852 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
32853 struct net_device *dev)
32854 {
32855- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
32856+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
32857 struct sis190_private *tp = netdev_priv(dev);
32858 struct pci_dev *isa_bridge;
32859 u8 reg, tmp8;
32860diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
32861index edfa15d..002bfa9 100644
32862--- a/drivers/net/ppp/ppp_generic.c
32863+++ b/drivers/net/ppp/ppp_generic.c
32864@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
32865 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
32866 struct ppp_stats stats;
32867 struct ppp_comp_stats cstats;
32868- char *vers;
32869
32870 switch (cmd) {
32871 case SIOCGPPPSTATS:
32872@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
32873 break;
32874
32875 case SIOCGPPPVER:
32876- vers = PPP_VERSION;
32877- if (copy_to_user(addr, vers, strlen(vers) + 1))
32878+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
32879 break;
32880 err = 0;
32881 break;
32882diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
32883index 515f122..41dd273 100644
32884--- a/drivers/net/tokenring/abyss.c
32885+++ b/drivers/net/tokenring/abyss.c
32886@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
32887
32888 static int __init abyss_init (void)
32889 {
32890- abyss_netdev_ops = tms380tr_netdev_ops;
32891+ pax_open_kernel();
32892+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
32893
32894- abyss_netdev_ops.ndo_open = abyss_open;
32895- abyss_netdev_ops.ndo_stop = abyss_close;
32896+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
32897+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
32898+ pax_close_kernel();
32899
32900 return pci_register_driver(&abyss_driver);
32901 }
32902diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
32903index 6153cfd..cf69c1c 100644
32904--- a/drivers/net/tokenring/madgemc.c
32905+++ b/drivers/net/tokenring/madgemc.c
32906@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver = {
32907
32908 static int __init madgemc_init (void)
32909 {
32910- madgemc_netdev_ops = tms380tr_netdev_ops;
32911- madgemc_netdev_ops.ndo_open = madgemc_open;
32912- madgemc_netdev_ops.ndo_stop = madgemc_close;
32913+ pax_open_kernel();
32914+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
32915+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
32916+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
32917+ pax_close_kernel();
32918
32919 return mca_register_driver (&madgemc_driver);
32920 }
32921diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
32922index 8d362e6..f91cc52 100644
32923--- a/drivers/net/tokenring/proteon.c
32924+++ b/drivers/net/tokenring/proteon.c
32925@@ -353,9 +353,11 @@ static int __init proteon_init(void)
32926 struct platform_device *pdev;
32927 int i, num = 0, err = 0;
32928
32929- proteon_netdev_ops = tms380tr_netdev_ops;
32930- proteon_netdev_ops.ndo_open = proteon_open;
32931- proteon_netdev_ops.ndo_stop = tms380tr_close;
32932+ pax_open_kernel();
32933+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
32934+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
32935+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
32936+ pax_close_kernel();
32937
32938 err = platform_driver_register(&proteon_driver);
32939 if (err)
32940diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
32941index 46db5c5..37c1536 100644
32942--- a/drivers/net/tokenring/skisa.c
32943+++ b/drivers/net/tokenring/skisa.c
32944@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
32945 struct platform_device *pdev;
32946 int i, num = 0, err = 0;
32947
32948- sk_isa_netdev_ops = tms380tr_netdev_ops;
32949- sk_isa_netdev_ops.ndo_open = sk_isa_open;
32950- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
32951+ pax_open_kernel();
32952+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
32953+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
32954+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
32955+ pax_close_kernel();
32956
32957 err = platform_driver_register(&sk_isa_driver);
32958 if (err)
32959diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
32960index 304fe78..db112fa 100644
32961--- a/drivers/net/usb/hso.c
32962+++ b/drivers/net/usb/hso.c
32963@@ -71,7 +71,7 @@
32964 #include <asm/byteorder.h>
32965 #include <linux/serial_core.h>
32966 #include <linux/serial.h>
32967-
32968+#include <asm/local.h>
32969
32970 #define MOD_AUTHOR "Option Wireless"
32971 #define MOD_DESCRIPTION "USB High Speed Option driver"
32972@@ -257,7 +257,7 @@ struct hso_serial {
32973
32974 /* from usb_serial_port */
32975 struct tty_struct *tty;
32976- int open_count;
32977+ local_t open_count;
32978 spinlock_t serial_lock;
32979
32980 int (*write_data) (struct hso_serial *serial);
32981@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
32982 struct urb *urb;
32983
32984 urb = serial->rx_urb[0];
32985- if (serial->open_count > 0) {
32986+ if (local_read(&serial->open_count) > 0) {
32987 count = put_rxbuf_data(urb, serial);
32988 if (count == -1)
32989 return;
32990@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
32991 DUMP1(urb->transfer_buffer, urb->actual_length);
32992
32993 /* Anyone listening? */
32994- if (serial->open_count == 0)
32995+ if (local_read(&serial->open_count) == 0)
32996 return;
32997
32998 if (status == 0) {
32999@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
33000 spin_unlock_irq(&serial->serial_lock);
33001
33002 /* check for port already opened, if not set the termios */
33003- serial->open_count++;
33004- if (serial->open_count == 1) {
33005+ if (local_inc_return(&serial->open_count) == 1) {
33006 serial->rx_state = RX_IDLE;
33007 /* Force default termio settings */
33008 _hso_serial_set_termios(tty, NULL);
33009@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
33010 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
33011 if (result) {
33012 hso_stop_serial_device(serial->parent);
33013- serial->open_count--;
33014+ local_dec(&serial->open_count);
33015 kref_put(&serial->parent->ref, hso_serial_ref_free);
33016 }
33017 } else {
33018@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
33019
33020 /* reset the rts and dtr */
33021 /* do the actual close */
33022- serial->open_count--;
33023+ local_dec(&serial->open_count);
33024
33025- if (serial->open_count <= 0) {
33026- serial->open_count = 0;
33027+ if (local_read(&serial->open_count) <= 0) {
33028+ local_set(&serial->open_count, 0);
33029 spin_lock_irq(&serial->serial_lock);
33030 if (serial->tty == tty) {
33031 serial->tty->driver_data = NULL;
33032@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
33033
33034 /* the actual setup */
33035 spin_lock_irqsave(&serial->serial_lock, flags);
33036- if (serial->open_count)
33037+ if (local_read(&serial->open_count))
33038 _hso_serial_set_termios(tty, old);
33039 else
33040 tty->termios = old;
33041@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb)
33042 D1("Pending read interrupt on port %d\n", i);
33043 spin_lock(&serial->serial_lock);
33044 if (serial->rx_state == RX_IDLE &&
33045- serial->open_count > 0) {
33046+ local_read(&serial->open_count) > 0) {
33047 /* Setup and send a ctrl req read on
33048 * port i */
33049 if (!serial->rx_urb_filled[0]) {
33050@@ -3098,7 +3097,7 @@ static int hso_resume(struct usb_interface *iface)
33051 /* Start all serial ports */
33052 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
33053 if (serial_table[i] && (serial_table[i]->interface == iface)) {
33054- if (dev2ser(serial_table[i])->open_count) {
33055+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
33056 result =
33057 hso_start_serial_device(serial_table[i], GFP_NOIO);
33058 hso_kick_transmit(dev2ser(serial_table[i]));
33059diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
33060index e662cbc..8d4a102 100644
33061--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
33062+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
33063@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
33064 * Return with error code if any of the queue indices
33065 * is out of range
33066 */
33067- if (p->ring_index[i] < 0 ||
33068- p->ring_index[i] >= adapter->num_rx_queues)
33069+ if (p->ring_index[i] >= adapter->num_rx_queues)
33070 return -EINVAL;
33071 }
33072
33073diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
33074index 0f9ee46..e2d6e65 100644
33075--- a/drivers/net/wireless/ath/ath.h
33076+++ b/drivers/net/wireless/ath/ath.h
33077@@ -119,6 +119,7 @@ struct ath_ops {
33078 void (*write_flush) (void *);
33079 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
33080 };
33081+typedef struct ath_ops __no_const ath_ops_no_const;
33082
33083 struct ath_common;
33084 struct ath_bus_ops;
33085diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
33086index b592016..fe47870 100644
33087--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
33088+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
33089@@ -183,8 +183,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33090 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
33091 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
33092
33093- ACCESS_ONCE(ads->ds_link) = i->link;
33094- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
33095+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
33096+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
33097
33098 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
33099 ctl6 = SM(i->keytype, AR_EncrType);
33100@@ -198,26 +198,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33101
33102 if ((i->is_first || i->is_last) &&
33103 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
33104- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
33105+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
33106 | set11nTries(i->rates, 1)
33107 | set11nTries(i->rates, 2)
33108 | set11nTries(i->rates, 3)
33109 | (i->dur_update ? AR_DurUpdateEna : 0)
33110 | SM(0, AR_BurstDur);
33111
33112- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
33113+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
33114 | set11nRate(i->rates, 1)
33115 | set11nRate(i->rates, 2)
33116 | set11nRate(i->rates, 3);
33117 } else {
33118- ACCESS_ONCE(ads->ds_ctl2) = 0;
33119- ACCESS_ONCE(ads->ds_ctl3) = 0;
33120+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
33121+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
33122 }
33123
33124 if (!i->is_first) {
33125- ACCESS_ONCE(ads->ds_ctl0) = 0;
33126- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
33127- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
33128+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
33129+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
33130+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
33131 return;
33132 }
33133
33134@@ -242,7 +242,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33135 break;
33136 }
33137
33138- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
33139+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
33140 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
33141 | SM(i->txpower, AR_XmitPower)
33142 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
33143@@ -252,19 +252,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33144 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
33145 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
33146
33147- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
33148- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
33149+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
33150+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
33151
33152 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
33153 return;
33154
33155- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
33156+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
33157 | set11nPktDurRTSCTS(i->rates, 1);
33158
33159- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
33160+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
33161 | set11nPktDurRTSCTS(i->rates, 3);
33162
33163- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
33164+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
33165 | set11nRateFlags(i->rates, 1)
33166 | set11nRateFlags(i->rates, 2)
33167 | set11nRateFlags(i->rates, 3)
33168diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
33169index f5ae3c6..7936af3 100644
33170--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
33171+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
33172@@ -35,47 +35,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33173 (i->qcu << AR_TxQcuNum_S) | 0x17;
33174
33175 checksum += val;
33176- ACCESS_ONCE(ads->info) = val;
33177+ ACCESS_ONCE_RW(ads->info) = val;
33178
33179 checksum += i->link;
33180- ACCESS_ONCE(ads->link) = i->link;
33181+ ACCESS_ONCE_RW(ads->link) = i->link;
33182
33183 checksum += i->buf_addr[0];
33184- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
33185+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
33186 checksum += i->buf_addr[1];
33187- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
33188+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
33189 checksum += i->buf_addr[2];
33190- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
33191+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
33192 checksum += i->buf_addr[3];
33193- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
33194+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
33195
33196 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
33197- ACCESS_ONCE(ads->ctl3) = val;
33198+ ACCESS_ONCE_RW(ads->ctl3) = val;
33199 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
33200- ACCESS_ONCE(ads->ctl5) = val;
33201+ ACCESS_ONCE_RW(ads->ctl5) = val;
33202 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
33203- ACCESS_ONCE(ads->ctl7) = val;
33204+ ACCESS_ONCE_RW(ads->ctl7) = val;
33205 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
33206- ACCESS_ONCE(ads->ctl9) = val;
33207+ ACCESS_ONCE_RW(ads->ctl9) = val;
33208
33209 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
33210- ACCESS_ONCE(ads->ctl10) = checksum;
33211+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
33212
33213 if (i->is_first || i->is_last) {
33214- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
33215+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
33216 | set11nTries(i->rates, 1)
33217 | set11nTries(i->rates, 2)
33218 | set11nTries(i->rates, 3)
33219 | (i->dur_update ? AR_DurUpdateEna : 0)
33220 | SM(0, AR_BurstDur);
33221
33222- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
33223+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
33224 | set11nRate(i->rates, 1)
33225 | set11nRate(i->rates, 2)
33226 | set11nRate(i->rates, 3);
33227 } else {
33228- ACCESS_ONCE(ads->ctl13) = 0;
33229- ACCESS_ONCE(ads->ctl14) = 0;
33230+ ACCESS_ONCE_RW(ads->ctl13) = 0;
33231+ ACCESS_ONCE_RW(ads->ctl14) = 0;
33232 }
33233
33234 ads->ctl20 = 0;
33235@@ -84,17 +84,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33236
33237 ctl17 = SM(i->keytype, AR_EncrType);
33238 if (!i->is_first) {
33239- ACCESS_ONCE(ads->ctl11) = 0;
33240- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
33241- ACCESS_ONCE(ads->ctl15) = 0;
33242- ACCESS_ONCE(ads->ctl16) = 0;
33243- ACCESS_ONCE(ads->ctl17) = ctl17;
33244- ACCESS_ONCE(ads->ctl18) = 0;
33245- ACCESS_ONCE(ads->ctl19) = 0;
33246+ ACCESS_ONCE_RW(ads->ctl11) = 0;
33247+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
33248+ ACCESS_ONCE_RW(ads->ctl15) = 0;
33249+ ACCESS_ONCE_RW(ads->ctl16) = 0;
33250+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
33251+ ACCESS_ONCE_RW(ads->ctl18) = 0;
33252+ ACCESS_ONCE_RW(ads->ctl19) = 0;
33253 return;
33254 }
33255
33256- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
33257+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
33258 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
33259 | SM(i->txpower, AR_XmitPower)
33260 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
33261@@ -130,22 +130,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
33262 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
33263 ctl12 |= SM(val, AR_PAPRDChainMask);
33264
33265- ACCESS_ONCE(ads->ctl12) = ctl12;
33266- ACCESS_ONCE(ads->ctl17) = ctl17;
33267+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
33268+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
33269
33270- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
33271+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
33272 | set11nPktDurRTSCTS(i->rates, 1);
33273
33274- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
33275+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
33276 | set11nPktDurRTSCTS(i->rates, 3);
33277
33278- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
33279+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
33280 | set11nRateFlags(i->rates, 1)
33281 | set11nRateFlags(i->rates, 2)
33282 | set11nRateFlags(i->rates, 3)
33283 | SM(i->rtscts_rate, AR_RTSCTSRate);
33284
33285- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
33286+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
33287 }
33288
33289 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
33290diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
33291index f389b3c..7359e18 100644
33292--- a/drivers/net/wireless/ath/ath9k/hw.h
33293+++ b/drivers/net/wireless/ath/ath9k/hw.h
33294@@ -605,7 +605,7 @@ struct ath_hw_private_ops {
33295
33296 /* ANI */
33297 void (*ani_cache_ini_regs)(struct ath_hw *ah);
33298-};
33299+} __no_const;
33300
33301 /**
33302 * struct ath_hw_ops - callbacks used by hardware code and driver code
33303@@ -635,7 +635,7 @@ struct ath_hw_ops {
33304 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
33305 struct ath_hw_antcomb_conf *antconf);
33306
33307-};
33308+} __no_const;
33309
33310 struct ath_nf_limits {
33311 s16 max;
33312@@ -655,7 +655,7 @@ enum ath_cal_list {
33313 #define AH_FASTCC 0x4
33314
33315 struct ath_hw {
33316- struct ath_ops reg_ops;
33317+ ath_ops_no_const reg_ops;
33318
33319 struct ieee80211_hw *hw;
33320 struct ath_common common;
33321diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
33322index bea8524..c677c06 100644
33323--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
33324+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
33325@@ -547,7 +547,7 @@ struct phy_func_ptr {
33326 void (*carrsuppr)(struct brcms_phy *);
33327 s32 (*rxsigpwr)(struct brcms_phy *, s32);
33328 void (*detach)(struct brcms_phy *);
33329-};
33330+} __no_const;
33331
33332 struct brcms_phy {
33333 struct brcms_phy_pub pubpi_ro;
33334diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
33335index 05f2ad1..ae00eea 100644
33336--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
33337+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
33338@@ -3685,7 +3685,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
33339 */
33340 if (iwl3945_mod_params.disable_hw_scan) {
33341 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
33342- iwl3945_hw_ops.hw_scan = NULL;
33343+ pax_open_kernel();
33344+ *(void **)&iwl3945_hw_ops.hw_scan = NULL;
33345+ pax_close_kernel();
33346 }
33347
33348 IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
33349diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
33350index 69a77e2..552b42c 100644
33351--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
33352+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
33353@@ -71,8 +71,8 @@ do { \
33354 } while (0)
33355
33356 #else
33357-#define IWL_DEBUG(m, level, fmt, args...)
33358-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)
33359+#define IWL_DEBUG(m, level, fmt, args...) do {} while (0)
33360+#define IWL_DEBUG_LIMIT(m, level, fmt, args...) do {} while (0)
33361 #define iwl_print_hex_dump(m, level, p, len)
33362 #endif /* CONFIG_IWLWIFI_DEBUG */
33363
33364diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
33365index 523ad55..f8c5dc5 100644
33366--- a/drivers/net/wireless/mac80211_hwsim.c
33367+++ b/drivers/net/wireless/mac80211_hwsim.c
33368@@ -1678,9 +1678,11 @@ static int __init init_mac80211_hwsim(void)
33369 return -EINVAL;
33370
33371 if (fake_hw_scan) {
33372- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
33373- mac80211_hwsim_ops.sw_scan_start = NULL;
33374- mac80211_hwsim_ops.sw_scan_complete = NULL;
33375+ pax_open_kernel();
33376+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
33377+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
33378+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
33379+ pax_close_kernel();
33380 }
33381
33382 spin_lock_init(&hwsim_radio_lock);
33383diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
33384index 30f138b..c904585 100644
33385--- a/drivers/net/wireless/mwifiex/main.h
33386+++ b/drivers/net/wireless/mwifiex/main.h
33387@@ -543,7 +543,7 @@ struct mwifiex_if_ops {
33388 void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
33389 int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
33390 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
33391-};
33392+} __no_const;
33393
33394 struct mwifiex_adapter {
33395 u8 iface_type;
33396diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
33397index 0c13840..a5c3ed6 100644
33398--- a/drivers/net/wireless/rndis_wlan.c
33399+++ b/drivers/net/wireless/rndis_wlan.c
33400@@ -1275,7 +1275,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
33401
33402 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
33403
33404- if (rts_threshold < 0 || rts_threshold > 2347)
33405+ if (rts_threshold > 2347)
33406 rts_threshold = 2347;
33407
33408 tmp = cpu_to_le32(rts_threshold);
33409diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
33410index a77f1bb..c608b2b 100644
33411--- a/drivers/net/wireless/wl1251/wl1251.h
33412+++ b/drivers/net/wireless/wl1251/wl1251.h
33413@@ -266,7 +266,7 @@ struct wl1251_if_operations {
33414 void (*reset)(struct wl1251 *wl);
33415 void (*enable_irq)(struct wl1251 *wl);
33416 void (*disable_irq)(struct wl1251 *wl);
33417-};
33418+} __no_const;
33419
33420 struct wl1251 {
33421 struct ieee80211_hw *hw;
33422diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
33423index f34b5b2..b5abb9f 100644
33424--- a/drivers/oprofile/buffer_sync.c
33425+++ b/drivers/oprofile/buffer_sync.c
33426@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
33427 if (cookie == NO_COOKIE)
33428 offset = pc;
33429 if (cookie == INVALID_COOKIE) {
33430- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
33431+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
33432 offset = pc;
33433 }
33434 if (cookie != last_cookie) {
33435@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
33436 /* add userspace sample */
33437
33438 if (!mm) {
33439- atomic_inc(&oprofile_stats.sample_lost_no_mm);
33440+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
33441 return 0;
33442 }
33443
33444 cookie = lookup_dcookie(mm, s->eip, &offset);
33445
33446 if (cookie == INVALID_COOKIE) {
33447- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
33448+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
33449 return 0;
33450 }
33451
33452@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
33453 /* ignore backtraces if failed to add a sample */
33454 if (state == sb_bt_start) {
33455 state = sb_bt_ignore;
33456- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
33457+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
33458 }
33459 }
33460 release_mm(mm);
33461diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
33462index c0cc4e7..44d4e54 100644
33463--- a/drivers/oprofile/event_buffer.c
33464+++ b/drivers/oprofile/event_buffer.c
33465@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
33466 }
33467
33468 if (buffer_pos == buffer_size) {
33469- atomic_inc(&oprofile_stats.event_lost_overflow);
33470+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
33471 return;
33472 }
33473
33474diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
33475index f8c752e..28bf4fc 100644
33476--- a/drivers/oprofile/oprof.c
33477+++ b/drivers/oprofile/oprof.c
33478@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
33479 if (oprofile_ops.switch_events())
33480 return;
33481
33482- atomic_inc(&oprofile_stats.multiplex_counter);
33483+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
33484 start_switch_worker();
33485 }
33486
33487diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
33488index 917d28e..d62d981 100644
33489--- a/drivers/oprofile/oprofile_stats.c
33490+++ b/drivers/oprofile/oprofile_stats.c
33491@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
33492 cpu_buf->sample_invalid_eip = 0;
33493 }
33494
33495- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
33496- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
33497- atomic_set(&oprofile_stats.event_lost_overflow, 0);
33498- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
33499- atomic_set(&oprofile_stats.multiplex_counter, 0);
33500+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
33501+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
33502+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
33503+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
33504+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
33505 }
33506
33507
33508diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
33509index 38b6fc0..b5cbfce 100644
33510--- a/drivers/oprofile/oprofile_stats.h
33511+++ b/drivers/oprofile/oprofile_stats.h
33512@@ -13,11 +13,11 @@
33513 #include <linux/atomic.h>
33514
33515 struct oprofile_stat_struct {
33516- atomic_t sample_lost_no_mm;
33517- atomic_t sample_lost_no_mapping;
33518- atomic_t bt_lost_no_mapping;
33519- atomic_t event_lost_overflow;
33520- atomic_t multiplex_counter;
33521+ atomic_unchecked_t sample_lost_no_mm;
33522+ atomic_unchecked_t sample_lost_no_mapping;
33523+ atomic_unchecked_t bt_lost_no_mapping;
33524+ atomic_unchecked_t event_lost_overflow;
33525+ atomic_unchecked_t multiplex_counter;
33526 };
33527
33528 extern struct oprofile_stat_struct oprofile_stats;
33529diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
33530index 2f0aa0f..90fab02 100644
33531--- a/drivers/oprofile/oprofilefs.c
33532+++ b/drivers/oprofile/oprofilefs.c
33533@@ -193,7 +193,7 @@ static const struct file_operations atomic_ro_fops = {
33534
33535
33536 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
33537- char const *name, atomic_t *val)
33538+ char const *name, atomic_unchecked_t *val)
33539 {
33540 return __oprofilefs_create_file(sb, root, name,
33541 &atomic_ro_fops, 0444, val);
33542diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
33543index 3f56bc0..707d642 100644
33544--- a/drivers/parport/procfs.c
33545+++ b/drivers/parport/procfs.c
33546@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
33547
33548 *ppos += len;
33549
33550- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
33551+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
33552 }
33553
33554 #ifdef CONFIG_PARPORT_1284
33555@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
33556
33557 *ppos += len;
33558
33559- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
33560+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
33561 }
33562 #endif /* IEEE1284.3 support. */
33563
33564diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
33565index 9fff878..ad0ad53 100644
33566--- a/drivers/pci/hotplug/cpci_hotplug.h
33567+++ b/drivers/pci/hotplug/cpci_hotplug.h
33568@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
33569 int (*hardware_test) (struct slot* slot, u32 value);
33570 u8 (*get_power) (struct slot* slot);
33571 int (*set_power) (struct slot* slot, int value);
33572-};
33573+} __no_const;
33574
33575 struct cpci_hp_controller {
33576 unsigned int irq;
33577diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
33578index 76ba8a1..20ca857 100644
33579--- a/drivers/pci/hotplug/cpqphp_nvram.c
33580+++ b/drivers/pci/hotplug/cpqphp_nvram.c
33581@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
33582
33583 void compaq_nvram_init (void __iomem *rom_start)
33584 {
33585+
33586+#ifndef CONFIG_PAX_KERNEXEC
33587 if (rom_start) {
33588 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
33589 }
33590+#endif
33591+
33592 dbg("int15 entry = %p\n", compaq_int15_entry_point);
33593
33594 /* initialize our int15 lock */
33595diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
33596index 1cfbf22..be96487 100644
33597--- a/drivers/pci/pcie/aspm.c
33598+++ b/drivers/pci/pcie/aspm.c
33599@@ -27,9 +27,9 @@
33600 #define MODULE_PARAM_PREFIX "pcie_aspm."
33601
33602 /* Note: those are not register definitions */
33603-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
33604-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
33605-#define ASPM_STATE_L1 (4) /* L1 state */
33606+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
33607+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
33608+#define ASPM_STATE_L1 (4U) /* L1 state */
33609 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
33610 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
33611
33612diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
33613index 04e74f4..a960176 100644
33614--- a/drivers/pci/probe.c
33615+++ b/drivers/pci/probe.c
33616@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
33617 u32 l, sz, mask;
33618 u16 orig_cmd;
33619
33620- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
33621+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
33622
33623 if (!dev->mmio_always_on) {
33624 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
33625diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
33626index 27911b5..5b6db88 100644
33627--- a/drivers/pci/proc.c
33628+++ b/drivers/pci/proc.c
33629@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
33630 static int __init pci_proc_init(void)
33631 {
33632 struct pci_dev *dev = NULL;
33633+
33634+#ifdef CONFIG_GRKERNSEC_PROC_ADD
33635+#ifdef CONFIG_GRKERNSEC_PROC_USER
33636+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
33637+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
33638+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
33639+#endif
33640+#else
33641 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
33642+#endif
33643 proc_create("devices", 0, proc_bus_pci_dir,
33644 &proc_bus_pci_dev_operations);
33645 proc_initialized = 1;
33646diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
33647index 7b82868..b9344c9 100644
33648--- a/drivers/platform/x86/thinkpad_acpi.c
33649+++ b/drivers/platform/x86/thinkpad_acpi.c
33650@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
33651 return 0;
33652 }
33653
33654-void static hotkey_mask_warn_incomplete_mask(void)
33655+static void hotkey_mask_warn_incomplete_mask(void)
33656 {
33657 /* log only what the user can fix... */
33658 const u32 wantedmask = hotkey_driver_mask &
33659@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
33660 }
33661 }
33662
33663-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33664- struct tp_nvram_state *newn,
33665- const u32 event_mask)
33666-{
33667-
33668 #define TPACPI_COMPARE_KEY(__scancode, __member) \
33669 do { \
33670 if ((event_mask & (1 << __scancode)) && \
33671@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33672 tpacpi_hotkey_send_key(__scancode); \
33673 } while (0)
33674
33675- void issue_volchange(const unsigned int oldvol,
33676- const unsigned int newvol)
33677- {
33678- unsigned int i = oldvol;
33679+static void issue_volchange(const unsigned int oldvol,
33680+ const unsigned int newvol,
33681+ const u32 event_mask)
33682+{
33683+ unsigned int i = oldvol;
33684
33685- while (i > newvol) {
33686- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
33687- i--;
33688- }
33689- while (i < newvol) {
33690- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
33691- i++;
33692- }
33693+ while (i > newvol) {
33694+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
33695+ i--;
33696 }
33697+ while (i < newvol) {
33698+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
33699+ i++;
33700+ }
33701+}
33702
33703- void issue_brightnesschange(const unsigned int oldbrt,
33704- const unsigned int newbrt)
33705- {
33706- unsigned int i = oldbrt;
33707+static void issue_brightnesschange(const unsigned int oldbrt,
33708+ const unsigned int newbrt,
33709+ const u32 event_mask)
33710+{
33711+ unsigned int i = oldbrt;
33712
33713- while (i > newbrt) {
33714- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
33715- i--;
33716- }
33717- while (i < newbrt) {
33718- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
33719- i++;
33720- }
33721+ while (i > newbrt) {
33722+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
33723+ i--;
33724+ }
33725+ while (i < newbrt) {
33726+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
33727+ i++;
33728 }
33729+}
33730
33731+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33732+ struct tp_nvram_state *newn,
33733+ const u32 event_mask)
33734+{
33735 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
33736 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
33737 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
33738@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33739 oldn->volume_level != newn->volume_level) {
33740 /* recently muted, or repeated mute keypress, or
33741 * multiple presses ending in mute */
33742- issue_volchange(oldn->volume_level, newn->volume_level);
33743+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
33744 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
33745 }
33746 } else {
33747@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33748 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
33749 }
33750 if (oldn->volume_level != newn->volume_level) {
33751- issue_volchange(oldn->volume_level, newn->volume_level);
33752+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
33753 } else if (oldn->volume_toggle != newn->volume_toggle) {
33754 /* repeated vol up/down keypress at end of scale ? */
33755 if (newn->volume_level == 0)
33756@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33757 /* handle brightness */
33758 if (oldn->brightness_level != newn->brightness_level) {
33759 issue_brightnesschange(oldn->brightness_level,
33760- newn->brightness_level);
33761+ newn->brightness_level,
33762+ event_mask);
33763 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
33764 /* repeated key presses that didn't change state */
33765 if (newn->brightness_level == 0)
33766@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
33767 && !tp_features.bright_unkfw)
33768 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
33769 }
33770+}
33771
33772 #undef TPACPI_COMPARE_KEY
33773 #undef TPACPI_MAY_SEND_KEY
33774-}
33775
33776 /*
33777 * Polling driver
33778diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
33779index b859d16..5cc6b1a 100644
33780--- a/drivers/pnp/pnpbios/bioscalls.c
33781+++ b/drivers/pnp/pnpbios/bioscalls.c
33782@@ -59,7 +59,7 @@ do { \
33783 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
33784 } while(0)
33785
33786-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
33787+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
33788 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
33789
33790 /*
33791@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
33792
33793 cpu = get_cpu();
33794 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
33795+
33796+ pax_open_kernel();
33797 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
33798+ pax_close_kernel();
33799
33800 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
33801 spin_lock_irqsave(&pnp_bios_lock, flags);
33802@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
33803 :"memory");
33804 spin_unlock_irqrestore(&pnp_bios_lock, flags);
33805
33806+ pax_open_kernel();
33807 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
33808+ pax_close_kernel();
33809+
33810 put_cpu();
33811
33812 /* If we get here and this is set then the PnP BIOS faulted on us. */
33813@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
33814 return status;
33815 }
33816
33817-void pnpbios_calls_init(union pnp_bios_install_struct *header)
33818+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
33819 {
33820 int i;
33821
33822@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
33823 pnp_bios_callpoint.offset = header->fields.pm16offset;
33824 pnp_bios_callpoint.segment = PNP_CS16;
33825
33826+ pax_open_kernel();
33827+
33828 for_each_possible_cpu(i) {
33829 struct desc_struct *gdt = get_cpu_gdt_table(i);
33830 if (!gdt)
33831@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
33832 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
33833 (unsigned long)__va(header->fields.pm16dseg));
33834 }
33835+
33836+ pax_close_kernel();
33837 }
33838diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
33839index b0ecacb..7c9da2e 100644
33840--- a/drivers/pnp/resource.c
33841+++ b/drivers/pnp/resource.c
33842@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
33843 return 1;
33844
33845 /* check if the resource is valid */
33846- if (*irq < 0 || *irq > 15)
33847+ if (*irq > 15)
33848 return 0;
33849
33850 /* check if the resource is reserved */
33851@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
33852 return 1;
33853
33854 /* check if the resource is valid */
33855- if (*dma < 0 || *dma == 4 || *dma > 7)
33856+ if (*dma == 4 || *dma > 7)
33857 return 0;
33858
33859 /* check if the resource is reserved */
33860diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
33861index bb16f5b..c751eef 100644
33862--- a/drivers/power/bq27x00_battery.c
33863+++ b/drivers/power/bq27x00_battery.c
33864@@ -67,7 +67,7 @@
33865 struct bq27x00_device_info;
33866 struct bq27x00_access_methods {
33867 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
33868-};
33869+} __no_const;
33870
33871 enum bq27x00_chip { BQ27000, BQ27500 };
33872
33873diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
33874index 33f5d9a..d957d3f 100644
33875--- a/drivers/regulator/max8660.c
33876+++ b/drivers/regulator/max8660.c
33877@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
33878 max8660->shadow_regs[MAX8660_OVER1] = 5;
33879 } else {
33880 /* Otherwise devices can be toggled via software */
33881- max8660_dcdc_ops.enable = max8660_dcdc_enable;
33882- max8660_dcdc_ops.disable = max8660_dcdc_disable;
33883+ pax_open_kernel();
33884+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
33885+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
33886+ pax_close_kernel();
33887 }
33888
33889 /*
33890diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
33891index 023d17d..74ef35b 100644
33892--- a/drivers/regulator/mc13892-regulator.c
33893+++ b/drivers/regulator/mc13892-regulator.c
33894@@ -565,10 +565,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
33895 }
33896 mc13xxx_unlock(mc13892);
33897
33898- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
33899+ pax_open_kernel();
33900+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
33901 = mc13892_vcam_set_mode;
33902- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
33903+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
33904 = mc13892_vcam_get_mode;
33905+ pax_close_kernel();
33906 for (i = 0; i < pdata->num_regulators; i++) {
33907 init_data = &pdata->regulators[i];
33908 priv->regulators[i] = regulator_register(
33909diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
33910index cace6d3..f623fda 100644
33911--- a/drivers/rtc/rtc-dev.c
33912+++ b/drivers/rtc/rtc-dev.c
33913@@ -14,6 +14,7 @@
33914 #include <linux/module.h>
33915 #include <linux/rtc.h>
33916 #include <linux/sched.h>
33917+#include <linux/grsecurity.h>
33918 #include "rtc-core.h"
33919
33920 static dev_t rtc_devt;
33921@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
33922 if (copy_from_user(&tm, uarg, sizeof(tm)))
33923 return -EFAULT;
33924
33925+ gr_log_timechange();
33926+
33927 return rtc_set_time(rtc, &tm);
33928
33929 case RTC_PIE_ON:
33930diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
33931index ffb5878..e6d785c 100644
33932--- a/drivers/scsi/aacraid/aacraid.h
33933+++ b/drivers/scsi/aacraid/aacraid.h
33934@@ -492,7 +492,7 @@ struct adapter_ops
33935 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
33936 /* Administrative operations */
33937 int (*adapter_comm)(struct aac_dev * dev, int comm);
33938-};
33939+} __no_const;
33940
33941 /*
33942 * Define which interrupt handler needs to be installed
33943diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
33944index 705e13e..91c873c 100644
33945--- a/drivers/scsi/aacraid/linit.c
33946+++ b/drivers/scsi/aacraid/linit.c
33947@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
33948 #elif defined(__devinitconst)
33949 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
33950 #else
33951-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
33952+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
33953 #endif
33954 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
33955 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
33956diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
33957index d5ff142..49c0ebb 100644
33958--- a/drivers/scsi/aic94xx/aic94xx_init.c
33959+++ b/drivers/scsi/aic94xx/aic94xx_init.c
33960@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
33961 .lldd_control_phy = asd_control_phy,
33962 };
33963
33964-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
33965+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
33966 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
33967 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
33968 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
33969diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
33970index a796de9..1ef20e1 100644
33971--- a/drivers/scsi/bfa/bfa.h
33972+++ b/drivers/scsi/bfa/bfa.h
33973@@ -196,7 +196,7 @@ struct bfa_hwif_s {
33974 u32 *end);
33975 int cpe_vec_q0;
33976 int rme_vec_q0;
33977-};
33978+} __no_const;
33979 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
33980
33981 struct bfa_faa_cbfn_s {
33982diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
33983index e07bd47..cd1bbbb 100644
33984--- a/drivers/scsi/bfa/bfa_fcpim.c
33985+++ b/drivers/scsi/bfa/bfa_fcpim.c
33986@@ -4121,7 +4121,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
33987
33988 bfa_iotag_attach(fcp);
33989
33990- fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
33991+ fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
33992 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
33993 (fcp->num_itns * sizeof(struct bfa_itn_s));
33994 memset(fcp->itn_arr, 0,
33995@@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
33996 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
33997 {
33998 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
33999- struct bfa_itn_s *itn;
34000+ bfa_itn_s_no_const *itn;
34001
34002 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
34003 itn->isr = isr;
34004diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
34005index 1080bcb..a3b39e3 100644
34006--- a/drivers/scsi/bfa/bfa_fcpim.h
34007+++ b/drivers/scsi/bfa/bfa_fcpim.h
34008@@ -37,6 +37,7 @@ struct bfa_iotag_s {
34009 struct bfa_itn_s {
34010 bfa_isr_func_t isr;
34011 };
34012+typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
34013
34014 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
34015 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
34016@@ -149,7 +150,7 @@ struct bfa_fcp_mod_s {
34017 struct list_head iotag_tio_free_q; /* free IO resources */
34018 struct list_head iotag_unused_q; /* unused IO resources*/
34019 struct bfa_iotag_s *iotag_arr;
34020- struct bfa_itn_s *itn_arr;
34021+ bfa_itn_s_no_const *itn_arr;
34022 int num_ioim_reqs;
34023 int num_fwtio_reqs;
34024 int num_itns;
34025diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
34026index 546d46b..642fa5b 100644
34027--- a/drivers/scsi/bfa/bfa_ioc.h
34028+++ b/drivers/scsi/bfa/bfa_ioc.h
34029@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
34030 bfa_ioc_disable_cbfn_t disable_cbfn;
34031 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
34032 bfa_ioc_reset_cbfn_t reset_cbfn;
34033-};
34034+} __no_const;
34035
34036 /*
34037 * IOC event notification mechanism.
34038@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
34039 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
34040 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
34041 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
34042-};
34043+} __no_const;
34044
34045 /*
34046 * Queue element to wait for room in request queue. FIFO order is
34047diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
34048index 351dc0b..951dc32 100644
34049--- a/drivers/scsi/hosts.c
34050+++ b/drivers/scsi/hosts.c
34051@@ -42,7 +42,7 @@
34052 #include "scsi_logging.h"
34053
34054
34055-static atomic_t scsi_host_next_hn; /* host_no for next new host */
34056+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
34057
34058
34059 static void scsi_host_cls_release(struct device *dev)
34060@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
34061 * subtract one because we increment first then return, but we need to
34062 * know what the next host number was before increment
34063 */
34064- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
34065+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
34066 shost->dma_channel = 0xff;
34067
34068 /* These three are default values which can be overridden */
34069diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
34070index 865d452..e9b7fa7 100644
34071--- a/drivers/scsi/hpsa.c
34072+++ b/drivers/scsi/hpsa.c
34073@@ -505,7 +505,7 @@ static inline u32 next_command(struct ctlr_info *h)
34074 u32 a;
34075
34076 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
34077- return h->access.command_completed(h);
34078+ return h->access->command_completed(h);
34079
34080 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
34081 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
34082@@ -2989,7 +2989,7 @@ static void start_io(struct ctlr_info *h)
34083 while (!list_empty(&h->reqQ)) {
34084 c = list_entry(h->reqQ.next, struct CommandList, list);
34085 /* can't do anything if fifo is full */
34086- if ((h->access.fifo_full(h))) {
34087+ if ((h->access->fifo_full(h))) {
34088 dev_warn(&h->pdev->dev, "fifo full\n");
34089 break;
34090 }
34091@@ -2999,7 +2999,7 @@ static void start_io(struct ctlr_info *h)
34092 h->Qdepth--;
34093
34094 /* Tell the controller execute command */
34095- h->access.submit_command(h, c);
34096+ h->access->submit_command(h, c);
34097
34098 /* Put job onto the completed Q */
34099 addQ(&h->cmpQ, c);
34100@@ -3008,17 +3008,17 @@ static void start_io(struct ctlr_info *h)
34101
34102 static inline unsigned long get_next_completion(struct ctlr_info *h)
34103 {
34104- return h->access.command_completed(h);
34105+ return h->access->command_completed(h);
34106 }
34107
34108 static inline bool interrupt_pending(struct ctlr_info *h)
34109 {
34110- return h->access.intr_pending(h);
34111+ return h->access->intr_pending(h);
34112 }
34113
34114 static inline long interrupt_not_for_us(struct ctlr_info *h)
34115 {
34116- return (h->access.intr_pending(h) == 0) ||
34117+ return (h->access->intr_pending(h) == 0) ||
34118 (h->interrupts_enabled == 0);
34119 }
34120
34121@@ -3917,7 +3917,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
34122 if (prod_index < 0)
34123 return -ENODEV;
34124 h->product_name = products[prod_index].product_name;
34125- h->access = *(products[prod_index].access);
34126+ h->access = products[prod_index].access;
34127
34128 if (hpsa_board_disabled(h->pdev)) {
34129 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
34130@@ -4162,7 +4162,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
34131
34132 assert_spin_locked(&lockup_detector_lock);
34133 remove_ctlr_from_lockup_detector_list(h);
34134- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34135+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34136 spin_lock_irqsave(&h->lock, flags);
34137 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
34138 spin_unlock_irqrestore(&h->lock, flags);
34139@@ -4340,7 +4340,7 @@ reinit_after_soft_reset:
34140 }
34141
34142 /* make sure the board interrupts are off */
34143- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34144+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34145
34146 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
34147 goto clean2;
34148@@ -4374,7 +4374,7 @@ reinit_after_soft_reset:
34149 * fake ones to scoop up any residual completions.
34150 */
34151 spin_lock_irqsave(&h->lock, flags);
34152- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34153+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34154 spin_unlock_irqrestore(&h->lock, flags);
34155 free_irq(h->intr[h->intr_mode], h);
34156 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
34157@@ -4393,9 +4393,9 @@ reinit_after_soft_reset:
34158 dev_info(&h->pdev->dev, "Board READY.\n");
34159 dev_info(&h->pdev->dev,
34160 "Waiting for stale completions to drain.\n");
34161- h->access.set_intr_mask(h, HPSA_INTR_ON);
34162+ h->access->set_intr_mask(h, HPSA_INTR_ON);
34163 msleep(10000);
34164- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34165+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34166
34167 rc = controller_reset_failed(h->cfgtable);
34168 if (rc)
34169@@ -4416,7 +4416,7 @@ reinit_after_soft_reset:
34170 }
34171
34172 /* Turn the interrupts on so we can service requests */
34173- h->access.set_intr_mask(h, HPSA_INTR_ON);
34174+ h->access->set_intr_mask(h, HPSA_INTR_ON);
34175
34176 hpsa_hba_inquiry(h);
34177 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
34178@@ -4468,7 +4468,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
34179 * To write all data in the battery backed cache to disks
34180 */
34181 hpsa_flush_cache(h);
34182- h->access.set_intr_mask(h, HPSA_INTR_OFF);
34183+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
34184 free_irq(h->intr[h->intr_mode], h);
34185 #ifdef CONFIG_PCI_MSI
34186 if (h->msix_vector)
34187@@ -4632,7 +4632,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
34188 return;
34189 }
34190 /* Change the access methods to the performant access methods */
34191- h->access = SA5_performant_access;
34192+ h->access = &SA5_performant_access;
34193 h->transMethod = CFGTBL_Trans_Performant;
34194 }
34195
34196diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
34197index 91edafb..a9b88ec 100644
34198--- a/drivers/scsi/hpsa.h
34199+++ b/drivers/scsi/hpsa.h
34200@@ -73,7 +73,7 @@ struct ctlr_info {
34201 unsigned int msix_vector;
34202 unsigned int msi_vector;
34203 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
34204- struct access_method access;
34205+ struct access_method *access;
34206
34207 /* queue and queue Info */
34208 struct list_head reqQ;
34209diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
34210index f2df059..a3a9930 100644
34211--- a/drivers/scsi/ips.h
34212+++ b/drivers/scsi/ips.h
34213@@ -1027,7 +1027,7 @@ typedef struct {
34214 int (*intr)(struct ips_ha *);
34215 void (*enableint)(struct ips_ha *);
34216 uint32_t (*statupd)(struct ips_ha *);
34217-} ips_hw_func_t;
34218+} __no_const ips_hw_func_t;
34219
34220 typedef struct ips_ha {
34221 uint8_t ha_id[IPS_MAX_CHANNELS+1];
34222diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
34223index 9de9db2..1e09660 100644
34224--- a/drivers/scsi/libfc/fc_exch.c
34225+++ b/drivers/scsi/libfc/fc_exch.c
34226@@ -105,12 +105,12 @@ struct fc_exch_mgr {
34227 * all together if not used XXX
34228 */
34229 struct {
34230- atomic_t no_free_exch;
34231- atomic_t no_free_exch_xid;
34232- atomic_t xid_not_found;
34233- atomic_t xid_busy;
34234- atomic_t seq_not_found;
34235- atomic_t non_bls_resp;
34236+ atomic_unchecked_t no_free_exch;
34237+ atomic_unchecked_t no_free_exch_xid;
34238+ atomic_unchecked_t xid_not_found;
34239+ atomic_unchecked_t xid_busy;
34240+ atomic_unchecked_t seq_not_found;
34241+ atomic_unchecked_t non_bls_resp;
34242 } stats;
34243 };
34244
34245@@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
34246 /* allocate memory for exchange */
34247 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
34248 if (!ep) {
34249- atomic_inc(&mp->stats.no_free_exch);
34250+ atomic_inc_unchecked(&mp->stats.no_free_exch);
34251 goto out;
34252 }
34253 memset(ep, 0, sizeof(*ep));
34254@@ -780,7 +780,7 @@ out:
34255 return ep;
34256 err:
34257 spin_unlock_bh(&pool->lock);
34258- atomic_inc(&mp->stats.no_free_exch_xid);
34259+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
34260 mempool_free(ep, mp->ep_pool);
34261 return NULL;
34262 }
34263@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
34264 xid = ntohs(fh->fh_ox_id); /* we originated exch */
34265 ep = fc_exch_find(mp, xid);
34266 if (!ep) {
34267- atomic_inc(&mp->stats.xid_not_found);
34268+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34269 reject = FC_RJT_OX_ID;
34270 goto out;
34271 }
34272@@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
34273 ep = fc_exch_find(mp, xid);
34274 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
34275 if (ep) {
34276- atomic_inc(&mp->stats.xid_busy);
34277+ atomic_inc_unchecked(&mp->stats.xid_busy);
34278 reject = FC_RJT_RX_ID;
34279 goto rel;
34280 }
34281@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
34282 }
34283 xid = ep->xid; /* get our XID */
34284 } else if (!ep) {
34285- atomic_inc(&mp->stats.xid_not_found);
34286+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34287 reject = FC_RJT_RX_ID; /* XID not found */
34288 goto out;
34289 }
34290@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
34291 } else {
34292 sp = &ep->seq;
34293 if (sp->id != fh->fh_seq_id) {
34294- atomic_inc(&mp->stats.seq_not_found);
34295+ atomic_inc_unchecked(&mp->stats.seq_not_found);
34296 if (f_ctl & FC_FC_END_SEQ) {
34297 /*
34298 * Update sequence_id based on incoming last
34299@@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
34300
34301 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
34302 if (!ep) {
34303- atomic_inc(&mp->stats.xid_not_found);
34304+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34305 goto out;
34306 }
34307 if (ep->esb_stat & ESB_ST_COMPLETE) {
34308- atomic_inc(&mp->stats.xid_not_found);
34309+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34310 goto rel;
34311 }
34312 if (ep->rxid == FC_XID_UNKNOWN)
34313 ep->rxid = ntohs(fh->fh_rx_id);
34314 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
34315- atomic_inc(&mp->stats.xid_not_found);
34316+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34317 goto rel;
34318 }
34319 if (ep->did != ntoh24(fh->fh_s_id) &&
34320 ep->did != FC_FID_FLOGI) {
34321- atomic_inc(&mp->stats.xid_not_found);
34322+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34323 goto rel;
34324 }
34325 sof = fr_sof(fp);
34326@@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
34327 sp->ssb_stat |= SSB_ST_RESP;
34328 sp->id = fh->fh_seq_id;
34329 } else if (sp->id != fh->fh_seq_id) {
34330- atomic_inc(&mp->stats.seq_not_found);
34331+ atomic_inc_unchecked(&mp->stats.seq_not_found);
34332 goto rel;
34333 }
34334
34335@@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
34336 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
34337
34338 if (!sp)
34339- atomic_inc(&mp->stats.xid_not_found);
34340+ atomic_inc_unchecked(&mp->stats.xid_not_found);
34341 else
34342- atomic_inc(&mp->stats.non_bls_resp);
34343+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
34344
34345 fc_frame_free(fp);
34346 }
34347diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
34348index db9238f..4378ed2 100644
34349--- a/drivers/scsi/libsas/sas_ata.c
34350+++ b/drivers/scsi/libsas/sas_ata.c
34351@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sata_ops = {
34352 .postreset = ata_std_postreset,
34353 .error_handler = ata_std_error_handler,
34354 .post_internal_cmd = sas_ata_post_internal,
34355- .qc_defer = ata_std_qc_defer,
34356+ .qc_defer = ata_std_qc_defer,
34357 .qc_prep = ata_noop_qc_prep,
34358 .qc_issue = sas_ata_qc_issue,
34359 .qc_fill_rtf = sas_ata_qc_fill_rtf,
34360diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
34361index bb4c8e0..f33d849 100644
34362--- a/drivers/scsi/lpfc/lpfc.h
34363+++ b/drivers/scsi/lpfc/lpfc.h
34364@@ -425,7 +425,7 @@ struct lpfc_vport {
34365 struct dentry *debug_nodelist;
34366 struct dentry *vport_debugfs_root;
34367 struct lpfc_debugfs_trc *disc_trc;
34368- atomic_t disc_trc_cnt;
34369+ atomic_unchecked_t disc_trc_cnt;
34370 #endif
34371 uint8_t stat_data_enabled;
34372 uint8_t stat_data_blocked;
34373@@ -835,8 +835,8 @@ struct lpfc_hba {
34374 struct timer_list fabric_block_timer;
34375 unsigned long bit_flags;
34376 #define FABRIC_COMANDS_BLOCKED 0
34377- atomic_t num_rsrc_err;
34378- atomic_t num_cmd_success;
34379+ atomic_unchecked_t num_rsrc_err;
34380+ atomic_unchecked_t num_cmd_success;
34381 unsigned long last_rsrc_error_time;
34382 unsigned long last_ramp_down_time;
34383 unsigned long last_ramp_up_time;
34384@@ -866,7 +866,7 @@ struct lpfc_hba {
34385
34386 struct dentry *debug_slow_ring_trc;
34387 struct lpfc_debugfs_trc *slow_ring_trc;
34388- atomic_t slow_ring_trc_cnt;
34389+ atomic_unchecked_t slow_ring_trc_cnt;
34390 /* iDiag debugfs sub-directory */
34391 struct dentry *idiag_root;
34392 struct dentry *idiag_pci_cfg;
34393diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
34394index 2838259..a07cfb5 100644
34395--- a/drivers/scsi/lpfc/lpfc_debugfs.c
34396+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
34397@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
34398
34399 #include <linux/debugfs.h>
34400
34401-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
34402+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
34403 static unsigned long lpfc_debugfs_start_time = 0L;
34404
34405 /* iDiag */
34406@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
34407 lpfc_debugfs_enable = 0;
34408
34409 len = 0;
34410- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
34411+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
34412 (lpfc_debugfs_max_disc_trc - 1);
34413 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
34414 dtp = vport->disc_trc + i;
34415@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
34416 lpfc_debugfs_enable = 0;
34417
34418 len = 0;
34419- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
34420+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
34421 (lpfc_debugfs_max_slow_ring_trc - 1);
34422 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
34423 dtp = phba->slow_ring_trc + i;
34424@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
34425 !vport || !vport->disc_trc)
34426 return;
34427
34428- index = atomic_inc_return(&vport->disc_trc_cnt) &
34429+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
34430 (lpfc_debugfs_max_disc_trc - 1);
34431 dtp = vport->disc_trc + index;
34432 dtp->fmt = fmt;
34433 dtp->data1 = data1;
34434 dtp->data2 = data2;
34435 dtp->data3 = data3;
34436- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
34437+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
34438 dtp->jif = jiffies;
34439 #endif
34440 return;
34441@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
34442 !phba || !phba->slow_ring_trc)
34443 return;
34444
34445- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
34446+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
34447 (lpfc_debugfs_max_slow_ring_trc - 1);
34448 dtp = phba->slow_ring_trc + index;
34449 dtp->fmt = fmt;
34450 dtp->data1 = data1;
34451 dtp->data2 = data2;
34452 dtp->data3 = data3;
34453- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
34454+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
34455 dtp->jif = jiffies;
34456 #endif
34457 return;
34458@@ -3986,7 +3986,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
34459 "slow_ring buffer\n");
34460 goto debug_failed;
34461 }
34462- atomic_set(&phba->slow_ring_trc_cnt, 0);
34463+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
34464 memset(phba->slow_ring_trc, 0,
34465 (sizeof(struct lpfc_debugfs_trc) *
34466 lpfc_debugfs_max_slow_ring_trc));
34467@@ -4032,7 +4032,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
34468 "buffer\n");
34469 goto debug_failed;
34470 }
34471- atomic_set(&vport->disc_trc_cnt, 0);
34472+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
34473
34474 snprintf(name, sizeof(name), "discovery_trace");
34475 vport->debug_disc_trc =
34476diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
34477index 55bc4fc..a2a109c 100644
34478--- a/drivers/scsi/lpfc/lpfc_init.c
34479+++ b/drivers/scsi/lpfc/lpfc_init.c
34480@@ -10027,8 +10027,10 @@ lpfc_init(void)
34481 printk(LPFC_COPYRIGHT "\n");
34482
34483 if (lpfc_enable_npiv) {
34484- lpfc_transport_functions.vport_create = lpfc_vport_create;
34485- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
34486+ pax_open_kernel();
34487+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
34488+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
34489+ pax_close_kernel();
34490 }
34491 lpfc_transport_template =
34492 fc_attach_transport(&lpfc_transport_functions);
34493diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
34494index 2e1e54e..1af0a0d 100644
34495--- a/drivers/scsi/lpfc/lpfc_scsi.c
34496+++ b/drivers/scsi/lpfc/lpfc_scsi.c
34497@@ -305,7 +305,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
34498 uint32_t evt_posted;
34499
34500 spin_lock_irqsave(&phba->hbalock, flags);
34501- atomic_inc(&phba->num_rsrc_err);
34502+ atomic_inc_unchecked(&phba->num_rsrc_err);
34503 phba->last_rsrc_error_time = jiffies;
34504
34505 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
34506@@ -346,7 +346,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
34507 unsigned long flags;
34508 struct lpfc_hba *phba = vport->phba;
34509 uint32_t evt_posted;
34510- atomic_inc(&phba->num_cmd_success);
34511+ atomic_inc_unchecked(&phba->num_cmd_success);
34512
34513 if (vport->cfg_lun_queue_depth <= queue_depth)
34514 return;
34515@@ -390,8 +390,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
34516 unsigned long num_rsrc_err, num_cmd_success;
34517 int i;
34518
34519- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
34520- num_cmd_success = atomic_read(&phba->num_cmd_success);
34521+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
34522+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
34523
34524 vports = lpfc_create_vport_work_array(phba);
34525 if (vports != NULL)
34526@@ -411,8 +411,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
34527 }
34528 }
34529 lpfc_destroy_vport_work_array(phba, vports);
34530- atomic_set(&phba->num_rsrc_err, 0);
34531- atomic_set(&phba->num_cmd_success, 0);
34532+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
34533+ atomic_set_unchecked(&phba->num_cmd_success, 0);
34534 }
34535
34536 /**
34537@@ -446,8 +446,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
34538 }
34539 }
34540 lpfc_destroy_vport_work_array(phba, vports);
34541- atomic_set(&phba->num_rsrc_err, 0);
34542- atomic_set(&phba->num_cmd_success, 0);
34543+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
34544+ atomic_set_unchecked(&phba->num_cmd_success, 0);
34545 }
34546
34547 /**
34548diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
34549index 5163edb..7b142bc 100644
34550--- a/drivers/scsi/pmcraid.c
34551+++ b/drivers/scsi/pmcraid.c
34552@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
34553 res->scsi_dev = scsi_dev;
34554 scsi_dev->hostdata = res;
34555 res->change_detected = 0;
34556- atomic_set(&res->read_failures, 0);
34557- atomic_set(&res->write_failures, 0);
34558+ atomic_set_unchecked(&res->read_failures, 0);
34559+ atomic_set_unchecked(&res->write_failures, 0);
34560 rc = 0;
34561 }
34562 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
34563@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
34564
34565 /* If this was a SCSI read/write command keep count of errors */
34566 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
34567- atomic_inc(&res->read_failures);
34568+ atomic_inc_unchecked(&res->read_failures);
34569 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
34570- atomic_inc(&res->write_failures);
34571+ atomic_inc_unchecked(&res->write_failures);
34572
34573 if (!RES_IS_GSCSI(res->cfg_entry) &&
34574 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
34575@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
34576 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
34577 * hrrq_id assigned here in queuecommand
34578 */
34579- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
34580+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
34581 pinstance->num_hrrq;
34582 cmd->cmd_done = pmcraid_io_done;
34583
34584@@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
34585 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
34586 * hrrq_id assigned here in queuecommand
34587 */
34588- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
34589+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
34590 pinstance->num_hrrq;
34591
34592 if (request_size) {
34593@@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
34594
34595 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
34596 /* add resources only after host is added into system */
34597- if (!atomic_read(&pinstance->expose_resources))
34598+ if (!atomic_read_unchecked(&pinstance->expose_resources))
34599 return;
34600
34601 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
34602@@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
34603 init_waitqueue_head(&pinstance->reset_wait_q);
34604
34605 atomic_set(&pinstance->outstanding_cmds, 0);
34606- atomic_set(&pinstance->last_message_id, 0);
34607- atomic_set(&pinstance->expose_resources, 0);
34608+ atomic_set_unchecked(&pinstance->last_message_id, 0);
34609+ atomic_set_unchecked(&pinstance->expose_resources, 0);
34610
34611 INIT_LIST_HEAD(&pinstance->free_res_q);
34612 INIT_LIST_HEAD(&pinstance->used_res_q);
34613@@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
34614 /* Schedule worker thread to handle CCN and take care of adding and
34615 * removing devices to OS
34616 */
34617- atomic_set(&pinstance->expose_resources, 1);
34618+ atomic_set_unchecked(&pinstance->expose_resources, 1);
34619 schedule_work(&pinstance->worker_q);
34620 return rc;
34621
34622diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
34623index ca496c7..9c791d5 100644
34624--- a/drivers/scsi/pmcraid.h
34625+++ b/drivers/scsi/pmcraid.h
34626@@ -748,7 +748,7 @@ struct pmcraid_instance {
34627 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
34628
34629 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
34630- atomic_t last_message_id;
34631+ atomic_unchecked_t last_message_id;
34632
34633 /* configuration table */
34634 struct pmcraid_config_table *cfg_table;
34635@@ -777,7 +777,7 @@ struct pmcraid_instance {
34636 atomic_t outstanding_cmds;
34637
34638 /* should add/delete resources to mid-layer now ?*/
34639- atomic_t expose_resources;
34640+ atomic_unchecked_t expose_resources;
34641
34642
34643
34644@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
34645 struct pmcraid_config_table_entry_ext cfg_entry_ext;
34646 };
34647 struct scsi_device *scsi_dev; /* Link scsi_device structure */
34648- atomic_t read_failures; /* count of failed READ commands */
34649- atomic_t write_failures; /* count of failed WRITE commands */
34650+ atomic_unchecked_t read_failures; /* count of failed READ commands */
34651+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
34652
34653 /* To indicate add/delete/modify during CCN */
34654 u8 change_detected;
34655diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
34656index fcf052c..a8025a4 100644
34657--- a/drivers/scsi/qla2xxx/qla_def.h
34658+++ b/drivers/scsi/qla2xxx/qla_def.h
34659@@ -2244,7 +2244,7 @@ struct isp_operations {
34660 int (*get_flash_version) (struct scsi_qla_host *, void *);
34661 int (*start_scsi) (srb_t *);
34662 int (*abort_isp) (struct scsi_qla_host *);
34663-};
34664+} __no_const;
34665
34666 /* MSI-X Support *************************************************************/
34667
34668diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
34669index fd5edc6..4906148 100644
34670--- a/drivers/scsi/qla4xxx/ql4_def.h
34671+++ b/drivers/scsi/qla4xxx/ql4_def.h
34672@@ -258,7 +258,7 @@ struct ddb_entry {
34673 * (4000 only) */
34674 atomic_t relogin_timer; /* Max Time to wait for
34675 * relogin to complete */
34676- atomic_t relogin_retry_count; /* Num of times relogin has been
34677+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
34678 * retried */
34679 uint32_t default_time2wait; /* Default Min time between
34680 * relogins (+aens) */
34681diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
34682index 4169c8b..a8b896b 100644
34683--- a/drivers/scsi/qla4xxx/ql4_os.c
34684+++ b/drivers/scsi/qla4xxx/ql4_os.c
34685@@ -2104,12 +2104,12 @@ void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
34686 */
34687 if (!iscsi_is_session_online(cls_sess)) {
34688 /* Reset retry relogin timer */
34689- atomic_inc(&ddb_entry->relogin_retry_count);
34690+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
34691 DEBUG2(ql4_printk(KERN_INFO, ha,
34692 "%s: index[%d] relogin timed out-retrying"
34693 " relogin (%d), retry (%d)\n", __func__,
34694 ddb_entry->fw_ddb_index,
34695- atomic_read(&ddb_entry->relogin_retry_count),
34696+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
34697 ddb_entry->default_time2wait + 4));
34698 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
34699 atomic_set(&ddb_entry->retry_relogin_timer,
34700@@ -3835,7 +3835,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
34701
34702 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
34703 atomic_set(&ddb_entry->relogin_timer, 0);
34704- atomic_set(&ddb_entry->relogin_retry_count, 0);
34705+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
34706
34707 ddb_entry->default_relogin_timeout =
34708 le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
34709diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
34710index 2aeb2e9..46e3925 100644
34711--- a/drivers/scsi/scsi.c
34712+++ b/drivers/scsi/scsi.c
34713@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
34714 unsigned long timeout;
34715 int rtn = 0;
34716
34717- atomic_inc(&cmd->device->iorequest_cnt);
34718+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
34719
34720 /* check if the device is still usable */
34721 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
34722diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
34723index f85cfa6..a57c9e8 100644
34724--- a/drivers/scsi/scsi_lib.c
34725+++ b/drivers/scsi/scsi_lib.c
34726@@ -1416,7 +1416,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
34727 shost = sdev->host;
34728 scsi_init_cmd_errh(cmd);
34729 cmd->result = DID_NO_CONNECT << 16;
34730- atomic_inc(&cmd->device->iorequest_cnt);
34731+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
34732
34733 /*
34734 * SCSI request completion path will do scsi_device_unbusy(),
34735@@ -1442,9 +1442,9 @@ static void scsi_softirq_done(struct request *rq)
34736
34737 INIT_LIST_HEAD(&cmd->eh_entry);
34738
34739- atomic_inc(&cmd->device->iodone_cnt);
34740+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
34741 if (cmd->result)
34742- atomic_inc(&cmd->device->ioerr_cnt);
34743+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
34744
34745 disposition = scsi_decide_disposition(cmd);
34746 if (disposition != SUCCESS &&
34747diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
34748index 04c2a27..9d8bd66 100644
34749--- a/drivers/scsi/scsi_sysfs.c
34750+++ b/drivers/scsi/scsi_sysfs.c
34751@@ -660,7 +660,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
34752 char *buf) \
34753 { \
34754 struct scsi_device *sdev = to_scsi_device(dev); \
34755- unsigned long long count = atomic_read(&sdev->field); \
34756+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
34757 return snprintf(buf, 20, "0x%llx\n", count); \
34758 } \
34759 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
34760diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
34761index 84a1fdf..693b0d6 100644
34762--- a/drivers/scsi/scsi_tgt_lib.c
34763+++ b/drivers/scsi/scsi_tgt_lib.c
34764@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
34765 int err;
34766
34767 dprintk("%lx %u\n", uaddr, len);
34768- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
34769+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
34770 if (err) {
34771 /*
34772 * TODO: need to fixup sg_tablesize, max_segment_size,
34773diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
34774index 1b21491..1b7f60e 100644
34775--- a/drivers/scsi/scsi_transport_fc.c
34776+++ b/drivers/scsi/scsi_transport_fc.c
34777@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
34778 * Netlink Infrastructure
34779 */
34780
34781-static atomic_t fc_event_seq;
34782+static atomic_unchecked_t fc_event_seq;
34783
34784 /**
34785 * fc_get_event_number - Obtain the next sequential FC event number
34786@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
34787 u32
34788 fc_get_event_number(void)
34789 {
34790- return atomic_add_return(1, &fc_event_seq);
34791+ return atomic_add_return_unchecked(1, &fc_event_seq);
34792 }
34793 EXPORT_SYMBOL(fc_get_event_number);
34794
34795@@ -645,7 +645,7 @@ static __init int fc_transport_init(void)
34796 {
34797 int error;
34798
34799- atomic_set(&fc_event_seq, 0);
34800+ atomic_set_unchecked(&fc_event_seq, 0);
34801
34802 error = transport_class_register(&fc_host_class);
34803 if (error)
34804@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
34805 char *cp;
34806
34807 *val = simple_strtoul(buf, &cp, 0);
34808- if ((*cp && (*cp != '\n')) || (*val < 0))
34809+ if (*cp && (*cp != '\n'))
34810 return -EINVAL;
34811 /*
34812 * Check for overflow; dev_loss_tmo is u32
34813diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
34814index 96029e6..4d77fa0 100644
34815--- a/drivers/scsi/scsi_transport_iscsi.c
34816+++ b/drivers/scsi/scsi_transport_iscsi.c
34817@@ -79,7 +79,7 @@ struct iscsi_internal {
34818 struct transport_container session_cont;
34819 };
34820
34821-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
34822+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
34823 static struct workqueue_struct *iscsi_eh_timer_workq;
34824
34825 static DEFINE_IDA(iscsi_sess_ida);
34826@@ -1062,7 +1062,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
34827 int err;
34828
34829 ihost = shost->shost_data;
34830- session->sid = atomic_add_return(1, &iscsi_session_nr);
34831+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
34832
34833 if (target_id == ISCSI_MAX_TARGET) {
34834 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
34835@@ -2663,7 +2663,7 @@ static __init int iscsi_transport_init(void)
34836 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
34837 ISCSI_TRANSPORT_VERSION);
34838
34839- atomic_set(&iscsi_session_nr, 0);
34840+ atomic_set_unchecked(&iscsi_session_nr, 0);
34841
34842 err = class_register(&iscsi_transport_class);
34843 if (err)
34844diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
34845index 21a045e..ec89e03 100644
34846--- a/drivers/scsi/scsi_transport_srp.c
34847+++ b/drivers/scsi/scsi_transport_srp.c
34848@@ -33,7 +33,7 @@
34849 #include "scsi_transport_srp_internal.h"
34850
34851 struct srp_host_attrs {
34852- atomic_t next_port_id;
34853+ atomic_unchecked_t next_port_id;
34854 };
34855 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
34856
34857@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
34858 struct Scsi_Host *shost = dev_to_shost(dev);
34859 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
34860
34861- atomic_set(&srp_host->next_port_id, 0);
34862+ atomic_set_unchecked(&srp_host->next_port_id, 0);
34863 return 0;
34864 }
34865
34866@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
34867 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
34868 rport->roles = ids->roles;
34869
34870- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
34871+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
34872 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
34873
34874 transport_setup_device(&rport->dev);
34875diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
34876index 441a1c5..07cece7 100644
34877--- a/drivers/scsi/sg.c
34878+++ b/drivers/scsi/sg.c
34879@@ -1077,7 +1077,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
34880 sdp->disk->disk_name,
34881 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
34882 NULL,
34883- (char *)arg);
34884+ (char __user *)arg);
34885 case BLKTRACESTART:
34886 return blk_trace_startstop(sdp->device->request_queue, 1);
34887 case BLKTRACESTOP:
34888@@ -2312,7 +2312,7 @@ struct sg_proc_leaf {
34889 const struct file_operations * fops;
34890 };
34891
34892-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
34893+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
34894 {"allow_dio", &adio_fops},
34895 {"debug", &debug_fops},
34896 {"def_reserved_size", &dressz_fops},
34897@@ -2327,7 +2327,7 @@ sg_proc_init(void)
34898 {
34899 int k, mask;
34900 int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
34901- struct sg_proc_leaf * leaf;
34902+ const struct sg_proc_leaf * leaf;
34903
34904 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
34905 if (!sg_proc_sgp)
34906diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
34907index f64250e..1ee3049 100644
34908--- a/drivers/spi/spi-dw-pci.c
34909+++ b/drivers/spi/spi-dw-pci.c
34910@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
34911 #define spi_resume NULL
34912 #endif
34913
34914-static const struct pci_device_id pci_ids[] __devinitdata = {
34915+static const struct pci_device_id pci_ids[] __devinitconst = {
34916 /* Intel MID platform SPI controller 0 */
34917 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
34918 {},
34919diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
34920index 77eae99..b7cdcc9 100644
34921--- a/drivers/spi/spi.c
34922+++ b/drivers/spi/spi.c
34923@@ -1024,7 +1024,7 @@ int spi_bus_unlock(struct spi_master *master)
34924 EXPORT_SYMBOL_GPL(spi_bus_unlock);
34925
34926 /* portable code must never pass more than 32 bytes */
34927-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
34928+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
34929
34930 static u8 *buf;
34931
34932diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
34933index 436fe97..4082570 100644
34934--- a/drivers/staging/gma500/power.c
34935+++ b/drivers/staging/gma500/power.c
34936@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
34937 ret = gma_resume_pci(dev->pdev);
34938 if (ret == 0) {
34939 /* FIXME: we want to defer this for Medfield/Oaktrail */
34940- gma_resume_display(dev);
34941+ gma_resume_display(dev->pdev);
34942 psb_irq_preinstall(dev);
34943 psb_irq_postinstall(dev);
34944 pm_runtime_get(&dev->pdev->dev);
34945diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
34946index bafccb3..e3ac78d 100644
34947--- a/drivers/staging/hv/rndis_filter.c
34948+++ b/drivers/staging/hv/rndis_filter.c
34949@@ -42,7 +42,7 @@ struct rndis_device {
34950
34951 enum rndis_device_state state;
34952 bool link_state;
34953- atomic_t new_req_id;
34954+ atomic_unchecked_t new_req_id;
34955
34956 spinlock_t request_lock;
34957 struct list_head req_list;
34958@@ -116,7 +116,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
34959 * template
34960 */
34961 set = &rndis_msg->msg.set_req;
34962- set->req_id = atomic_inc_return(&dev->new_req_id);
34963+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
34964
34965 /* Add to the request list */
34966 spin_lock_irqsave(&dev->request_lock, flags);
34967@@ -646,7 +646,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
34968
34969 /* Setup the rndis set */
34970 halt = &request->request_msg.msg.halt_req;
34971- halt->req_id = atomic_inc_return(&dev->new_req_id);
34972+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
34973
34974 /* Ignore return since this msg is optional. */
34975 rndis_filter_send_request(dev, request);
34976diff --git a/drivers/staging/iio/buffer_generic.h b/drivers/staging/iio/buffer_generic.h
34977index 9e8f010..af9efb5 100644
34978--- a/drivers/staging/iio/buffer_generic.h
34979+++ b/drivers/staging/iio/buffer_generic.h
34980@@ -64,7 +64,7 @@ struct iio_buffer_access_funcs {
34981
34982 int (*is_enabled)(struct iio_buffer *buffer);
34983 int (*enable)(struct iio_buffer *buffer);
34984-};
34985+} __no_const;
34986
34987 /**
34988 * struct iio_buffer_setup_ops - buffer setup related callbacks
34989diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
34990index 8b307b4..a97ac91 100644
34991--- a/drivers/staging/octeon/ethernet-rx.c
34992+++ b/drivers/staging/octeon/ethernet-rx.c
34993@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
34994 /* Increment RX stats for virtual ports */
34995 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
34996 #ifdef CONFIG_64BIT
34997- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
34998- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
34999+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
35000+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
35001 #else
35002- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
35003- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
35004+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
35005+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
35006 #endif
35007 }
35008 netif_receive_skb(skb);
35009@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
35010 dev->name);
35011 */
35012 #ifdef CONFIG_64BIT
35013- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
35014+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
35015 #else
35016- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
35017+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
35018 #endif
35019 dev_kfree_skb_irq(skb);
35020 }
35021diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
35022index 076f866..2308070 100644
35023--- a/drivers/staging/octeon/ethernet.c
35024+++ b/drivers/staging/octeon/ethernet.c
35025@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
35026 * since the RX tasklet also increments it.
35027 */
35028 #ifdef CONFIG_64BIT
35029- atomic64_add(rx_status.dropped_packets,
35030- (atomic64_t *)&priv->stats.rx_dropped);
35031+ atomic64_add_unchecked(rx_status.dropped_packets,
35032+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
35033 #else
35034- atomic_add(rx_status.dropped_packets,
35035- (atomic_t *)&priv->stats.rx_dropped);
35036+ atomic_add_unchecked(rx_status.dropped_packets,
35037+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
35038 #endif
35039 }
35040
35041diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
35042index 7a19555..466456d 100644
35043--- a/drivers/staging/pohmelfs/inode.c
35044+++ b/drivers/staging/pohmelfs/inode.c
35045@@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
35046 mutex_init(&psb->mcache_lock);
35047 psb->mcache_root = RB_ROOT;
35048 psb->mcache_timeout = msecs_to_jiffies(5000);
35049- atomic_long_set(&psb->mcache_gen, 0);
35050+ atomic_long_set_unchecked(&psb->mcache_gen, 0);
35051
35052 psb->trans_max_pages = 100;
35053
35054@@ -1876,7 +1876,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
35055 INIT_LIST_HEAD(&psb->crypto_ready_list);
35056 INIT_LIST_HEAD(&psb->crypto_active_list);
35057
35058- atomic_set(&psb->trans_gen, 1);
35059+ atomic_set_unchecked(&psb->trans_gen, 1);
35060 atomic_long_set(&psb->total_inodes, 0);
35061
35062 mutex_init(&psb->state_lock);
35063diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
35064index e22665c..a2a9390 100644
35065--- a/drivers/staging/pohmelfs/mcache.c
35066+++ b/drivers/staging/pohmelfs/mcache.c
35067@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
35068 m->data = data;
35069 m->start = start;
35070 m->size = size;
35071- m->gen = atomic_long_inc_return(&psb->mcache_gen);
35072+ m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
35073
35074 mutex_lock(&psb->mcache_lock);
35075 err = pohmelfs_mcache_insert(psb, m);
35076diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
35077index 985b6b7..7699e05 100644
35078--- a/drivers/staging/pohmelfs/netfs.h
35079+++ b/drivers/staging/pohmelfs/netfs.h
35080@@ -571,14 +571,14 @@ struct pohmelfs_config;
35081 struct pohmelfs_sb {
35082 struct rb_root mcache_root;
35083 struct mutex mcache_lock;
35084- atomic_long_t mcache_gen;
35085+ atomic_long_unchecked_t mcache_gen;
35086 unsigned long mcache_timeout;
35087
35088 unsigned int idx;
35089
35090 unsigned int trans_retries;
35091
35092- atomic_t trans_gen;
35093+ atomic_unchecked_t trans_gen;
35094
35095 unsigned int crypto_attached_size;
35096 unsigned int crypto_align_size;
35097diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
35098index 06c1a74..866eebc 100644
35099--- a/drivers/staging/pohmelfs/trans.c
35100+++ b/drivers/staging/pohmelfs/trans.c
35101@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
35102 int err;
35103 struct netfs_cmd *cmd = t->iovec.iov_base;
35104
35105- t->gen = atomic_inc_return(&psb->trans_gen);
35106+ t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
35107
35108 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
35109 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
35110diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
35111index 86308a0..feaa925 100644
35112--- a/drivers/staging/rtl8712/rtl871x_io.h
35113+++ b/drivers/staging/rtl8712/rtl871x_io.h
35114@@ -108,7 +108,7 @@ struct _io_ops {
35115 u8 *pmem);
35116 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
35117 u8 *pmem);
35118-};
35119+} __no_const;
35120
35121 struct io_req {
35122 struct list_head list;
35123diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
35124index c7b5e8b..783d6cb 100644
35125--- a/drivers/staging/sbe-2t3e3/netdev.c
35126+++ b/drivers/staging/sbe-2t3e3/netdev.c
35127@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35128 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
35129
35130 if (rlen)
35131- if (copy_to_user(data, &resp, rlen))
35132+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
35133 return -EFAULT;
35134
35135 return 0;
35136diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
35137index be21617..0954e45 100644
35138--- a/drivers/staging/usbip/usbip_common.h
35139+++ b/drivers/staging/usbip/usbip_common.h
35140@@ -289,7 +289,7 @@ struct usbip_device {
35141 void (*shutdown)(struct usbip_device *);
35142 void (*reset)(struct usbip_device *);
35143 void (*unusable)(struct usbip_device *);
35144- } eh_ops;
35145+ } __no_const eh_ops;
35146 };
35147
35148 #if 0
35149diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
35150index 88b3298..3783eee 100644
35151--- a/drivers/staging/usbip/vhci.h
35152+++ b/drivers/staging/usbip/vhci.h
35153@@ -88,7 +88,7 @@ struct vhci_hcd {
35154 unsigned resuming:1;
35155 unsigned long re_timeout;
35156
35157- atomic_t seqnum;
35158+ atomic_unchecked_t seqnum;
35159
35160 /*
35161 * NOTE:
35162diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
35163index 2ee97e2..0420b86 100644
35164--- a/drivers/staging/usbip/vhci_hcd.c
35165+++ b/drivers/staging/usbip/vhci_hcd.c
35166@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
35167 return;
35168 }
35169
35170- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
35171+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
35172 if (priv->seqnum == 0xffff)
35173 dev_info(&urb->dev->dev, "seqnum max\n");
35174
35175@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
35176 return -ENOMEM;
35177 }
35178
35179- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
35180+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
35181 if (unlink->seqnum == 0xffff)
35182 pr_info("seqnum max\n");
35183
35184@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hcd)
35185 vdev->rhport = rhport;
35186 }
35187
35188- atomic_set(&vhci->seqnum, 0);
35189+ atomic_set_unchecked(&vhci->seqnum, 0);
35190 spin_lock_init(&vhci->lock);
35191
35192 hcd->power_budget = 0; /* no limit */
35193diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
35194index 3872b8c..fe6d2f4 100644
35195--- a/drivers/staging/usbip/vhci_rx.c
35196+++ b/drivers/staging/usbip/vhci_rx.c
35197@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
35198 if (!urb) {
35199 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
35200 pr_info("max seqnum %d\n",
35201- atomic_read(&the_controller->seqnum));
35202+ atomic_read_unchecked(&the_controller->seqnum));
35203 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
35204 return;
35205 }
35206diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
35207index 7735027..30eed13 100644
35208--- a/drivers/staging/vt6655/hostap.c
35209+++ b/drivers/staging/vt6655/hostap.c
35210@@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
35211 *
35212 */
35213
35214+static net_device_ops_no_const apdev_netdev_ops;
35215+
35216 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
35217 {
35218 PSDevice apdev_priv;
35219 struct net_device *dev = pDevice->dev;
35220 int ret;
35221- const struct net_device_ops apdev_netdev_ops = {
35222- .ndo_start_xmit = pDevice->tx_80211,
35223- };
35224
35225 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
35226
35227@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
35228 *apdev_priv = *pDevice;
35229 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
35230
35231+ /* only half broken now */
35232+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
35233 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
35234
35235 pDevice->apdev->type = ARPHRD_IEEE80211;
35236diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
35237index 51b5adf..098e320 100644
35238--- a/drivers/staging/vt6656/hostap.c
35239+++ b/drivers/staging/vt6656/hostap.c
35240@@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
35241 *
35242 */
35243
35244+static net_device_ops_no_const apdev_netdev_ops;
35245+
35246 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
35247 {
35248 PSDevice apdev_priv;
35249 struct net_device *dev = pDevice->dev;
35250 int ret;
35251- const struct net_device_ops apdev_netdev_ops = {
35252- .ndo_start_xmit = pDevice->tx_80211,
35253- };
35254
35255 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
35256
35257@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
35258 *apdev_priv = *pDevice;
35259 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
35260
35261+ /* only half broken now */
35262+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
35263 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
35264
35265 pDevice->apdev->type = ARPHRD_IEEE80211;
35266diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
35267index 7843dfd..3db105f 100644
35268--- a/drivers/staging/wlan-ng/hfa384x_usb.c
35269+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
35270@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
35271
35272 struct usbctlx_completor {
35273 int (*complete) (struct usbctlx_completor *);
35274-};
35275+} __no_const;
35276
35277 static int
35278 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
35279diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
35280index 1ca66ea..76f1343 100644
35281--- a/drivers/staging/zcache/tmem.c
35282+++ b/drivers/staging/zcache/tmem.c
35283@@ -39,7 +39,7 @@
35284 * A tmem host implementation must use this function to register callbacks
35285 * for memory allocation.
35286 */
35287-static struct tmem_hostops tmem_hostops;
35288+static tmem_hostops_no_const tmem_hostops;
35289
35290 static void tmem_objnode_tree_init(void);
35291
35292@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
35293 * A tmem host implementation must use this function to register
35294 * callbacks for a page-accessible memory (PAM) implementation
35295 */
35296-static struct tmem_pamops tmem_pamops;
35297+static tmem_pamops_no_const tmem_pamops;
35298
35299 void tmem_register_pamops(struct tmem_pamops *m)
35300 {
35301diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
35302index ed147c4..94fc3c6 100644
35303--- a/drivers/staging/zcache/tmem.h
35304+++ b/drivers/staging/zcache/tmem.h
35305@@ -180,6 +180,7 @@ struct tmem_pamops {
35306 void (*new_obj)(struct tmem_obj *);
35307 int (*replace_in_obj)(void *, struct tmem_obj *);
35308 };
35309+typedef struct tmem_pamops __no_const tmem_pamops_no_const;
35310 extern void tmem_register_pamops(struct tmem_pamops *m);
35311
35312 /* memory allocation methods provided by the host implementation */
35313@@ -189,6 +190,7 @@ struct tmem_hostops {
35314 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
35315 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
35316 };
35317+typedef struct tmem_hostops __no_const tmem_hostops_no_const;
35318 extern void tmem_register_hostops(struct tmem_hostops *m);
35319
35320 /* core tmem accessor functions */
35321diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
35322index 0c1d5c73..88e90a8 100644
35323--- a/drivers/target/iscsi/iscsi_target.c
35324+++ b/drivers/target/iscsi/iscsi_target.c
35325@@ -1364,7 +1364,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
35326 * outstanding_r2ts reaches zero, go ahead and send the delayed
35327 * TASK_ABORTED status.
35328 */
35329- if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
35330+ if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
35331 if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
35332 if (--cmd->outstanding_r2ts < 1) {
35333 iscsit_stop_dataout_timer(cmd);
35334diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
35335index 6845228..df77141 100644
35336--- a/drivers/target/target_core_tmr.c
35337+++ b/drivers/target/target_core_tmr.c
35338@@ -250,7 +250,7 @@ static void core_tmr_drain_task_list(
35339 cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
35340 cmd->t_task_list_num,
35341 atomic_read(&cmd->t_task_cdbs_left),
35342- atomic_read(&cmd->t_task_cdbs_sent),
35343+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
35344 atomic_read(&cmd->t_transport_active),
35345 atomic_read(&cmd->t_transport_stop),
35346 atomic_read(&cmd->t_transport_sent));
35347@@ -281,7 +281,7 @@ static void core_tmr_drain_task_list(
35348 pr_debug("LUN_RESET: got t_transport_active = 1 for"
35349 " task: %p, t_fe_count: %d dev: %p\n", task,
35350 fe_count, dev);
35351- atomic_set(&cmd->t_transport_aborted, 1);
35352+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
35353 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
35354
35355 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
35356@@ -289,7 +289,7 @@ static void core_tmr_drain_task_list(
35357 }
35358 pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
35359 " t_fe_count: %d dev: %p\n", task, fe_count, dev);
35360- atomic_set(&cmd->t_transport_aborted, 1);
35361+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
35362 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
35363
35364 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
35365diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
35366index 861628e..659ae80 100644
35367--- a/drivers/target/target_core_transport.c
35368+++ b/drivers/target/target_core_transport.c
35369@@ -1343,7 +1343,7 @@ struct se_device *transport_add_device_to_core_hba(
35370
35371 dev->queue_depth = dev_limits->queue_depth;
35372 atomic_set(&dev->depth_left, dev->queue_depth);
35373- atomic_set(&dev->dev_ordered_id, 0);
35374+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
35375
35376 se_dev_set_default_attribs(dev, dev_limits);
35377
35378@@ -1530,7 +1530,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
35379 * Used to determine when ORDERED commands should go from
35380 * Dormant to Active status.
35381 */
35382- cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
35383+ cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
35384 smp_mb__after_atomic_inc();
35385 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
35386 cmd->se_ordered_id, cmd->sam_task_attr,
35387@@ -1800,7 +1800,7 @@ static void transport_generic_request_failure(struct se_cmd *cmd)
35388 " t_transport_active: %d t_transport_stop: %d"
35389 " t_transport_sent: %d\n", cmd->t_task_list_num,
35390 atomic_read(&cmd->t_task_cdbs_left),
35391- atomic_read(&cmd->t_task_cdbs_sent),
35392+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
35393 atomic_read(&cmd->t_task_cdbs_ex_left),
35394 atomic_read(&cmd->t_transport_active),
35395 atomic_read(&cmd->t_transport_stop),
35396@@ -2089,9 +2089,9 @@ check_depth:
35397
35398 spin_lock_irqsave(&cmd->t_state_lock, flags);
35399 task->task_flags |= (TF_ACTIVE | TF_SENT);
35400- atomic_inc(&cmd->t_task_cdbs_sent);
35401+ atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
35402
35403- if (atomic_read(&cmd->t_task_cdbs_sent) ==
35404+ if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
35405 cmd->t_task_list_num)
35406 atomic_set(&cmd->t_transport_sent, 1);
35407
35408@@ -4273,7 +4273,7 @@ bool transport_wait_for_tasks(struct se_cmd *cmd)
35409 atomic_set(&cmd->transport_lun_stop, 0);
35410 }
35411 if (!atomic_read(&cmd->t_transport_active) ||
35412- atomic_read(&cmd->t_transport_aborted)) {
35413+ atomic_read_unchecked(&cmd->t_transport_aborted)) {
35414 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
35415 return false;
35416 }
35417@@ -4522,7 +4522,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
35418 {
35419 int ret = 0;
35420
35421- if (atomic_read(&cmd->t_transport_aborted) != 0) {
35422+ if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
35423 if (!send_status ||
35424 (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
35425 return 1;
35426@@ -4559,7 +4559,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
35427 */
35428 if (cmd->data_direction == DMA_TO_DEVICE) {
35429 if (cmd->se_tfo->write_pending_status(cmd) != 0) {
35430- atomic_inc(&cmd->t_transport_aborted);
35431+ atomic_inc_unchecked(&cmd->t_transport_aborted);
35432 smp_mb__after_atomic_inc();
35433 }
35434 }
35435diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
35436index b9040be..e3f5aab 100644
35437--- a/drivers/tty/hvc/hvcs.c
35438+++ b/drivers/tty/hvc/hvcs.c
35439@@ -83,6 +83,7 @@
35440 #include <asm/hvcserver.h>
35441 #include <asm/uaccess.h>
35442 #include <asm/vio.h>
35443+#include <asm/local.h>
35444
35445 /*
35446 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
35447@@ -270,7 +271,7 @@ struct hvcs_struct {
35448 unsigned int index;
35449
35450 struct tty_struct *tty;
35451- int open_count;
35452+ local_t open_count;
35453
35454 /*
35455 * Used to tell the driver kernel_thread what operations need to take
35456@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
35457
35458 spin_lock_irqsave(&hvcsd->lock, flags);
35459
35460- if (hvcsd->open_count > 0) {
35461+ if (local_read(&hvcsd->open_count) > 0) {
35462 spin_unlock_irqrestore(&hvcsd->lock, flags);
35463 printk(KERN_INFO "HVCS: vterm state unchanged. "
35464 "The hvcs device node is still in use.\n");
35465@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
35466 if ((retval = hvcs_partner_connect(hvcsd)))
35467 goto error_release;
35468
35469- hvcsd->open_count = 1;
35470+ local_set(&hvcsd->open_count, 1);
35471 hvcsd->tty = tty;
35472 tty->driver_data = hvcsd;
35473
35474@@ -1179,7 +1180,7 @@ fast_open:
35475
35476 spin_lock_irqsave(&hvcsd->lock, flags);
35477 kref_get(&hvcsd->kref);
35478- hvcsd->open_count++;
35479+ local_inc(&hvcsd->open_count);
35480 hvcsd->todo_mask |= HVCS_SCHED_READ;
35481 spin_unlock_irqrestore(&hvcsd->lock, flags);
35482
35483@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
35484 hvcsd = tty->driver_data;
35485
35486 spin_lock_irqsave(&hvcsd->lock, flags);
35487- if (--hvcsd->open_count == 0) {
35488+ if (local_dec_and_test(&hvcsd->open_count)) {
35489
35490 vio_disable_interrupts(hvcsd->vdev);
35491
35492@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
35493 free_irq(irq, hvcsd);
35494 kref_put(&hvcsd->kref, destroy_hvcs_struct);
35495 return;
35496- } else if (hvcsd->open_count < 0) {
35497+ } else if (local_read(&hvcsd->open_count) < 0) {
35498 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
35499 " is missmanaged.\n",
35500- hvcsd->vdev->unit_address, hvcsd->open_count);
35501+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
35502 }
35503
35504 spin_unlock_irqrestore(&hvcsd->lock, flags);
35505@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struct * tty)
35506
35507 spin_lock_irqsave(&hvcsd->lock, flags);
35508 /* Preserve this so that we know how many kref refs to put */
35509- temp_open_count = hvcsd->open_count;
35510+ temp_open_count = local_read(&hvcsd->open_count);
35511
35512 /*
35513 * Don't kref put inside the spinlock because the destruction
35514@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struct * tty)
35515 hvcsd->tty->driver_data = NULL;
35516 hvcsd->tty = NULL;
35517
35518- hvcsd->open_count = 0;
35519+ local_set(&hvcsd->open_count, 0);
35520
35521 /* This will drop any buffered data on the floor which is OK in a hangup
35522 * scenario. */
35523@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct *tty,
35524 * the middle of a write operation? This is a crummy place to do this
35525 * but we want to keep it all in the spinlock.
35526 */
35527- if (hvcsd->open_count <= 0) {
35528+ if (local_read(&hvcsd->open_count) <= 0) {
35529 spin_unlock_irqrestore(&hvcsd->lock, flags);
35530 return -ENODEV;
35531 }
35532@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_struct *tty)
35533 {
35534 struct hvcs_struct *hvcsd = tty->driver_data;
35535
35536- if (!hvcsd || hvcsd->open_count <= 0)
35537+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
35538 return 0;
35539
35540 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
35541diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
35542index ef92869..f4ebd88 100644
35543--- a/drivers/tty/ipwireless/tty.c
35544+++ b/drivers/tty/ipwireless/tty.c
35545@@ -29,6 +29,7 @@
35546 #include <linux/tty_driver.h>
35547 #include <linux/tty_flip.h>
35548 #include <linux/uaccess.h>
35549+#include <asm/local.h>
35550
35551 #include "tty.h"
35552 #include "network.h"
35553@@ -51,7 +52,7 @@ struct ipw_tty {
35554 int tty_type;
35555 struct ipw_network *network;
35556 struct tty_struct *linux_tty;
35557- int open_count;
35558+ local_t open_count;
35559 unsigned int control_lines;
35560 struct mutex ipw_tty_mutex;
35561 int tx_bytes_queued;
35562@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
35563 mutex_unlock(&tty->ipw_tty_mutex);
35564 return -ENODEV;
35565 }
35566- if (tty->open_count == 0)
35567+ if (local_read(&tty->open_count) == 0)
35568 tty->tx_bytes_queued = 0;
35569
35570- tty->open_count++;
35571+ local_inc(&tty->open_count);
35572
35573 tty->linux_tty = linux_tty;
35574 linux_tty->driver_data = tty;
35575@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
35576
35577 static void do_ipw_close(struct ipw_tty *tty)
35578 {
35579- tty->open_count--;
35580-
35581- if (tty->open_count == 0) {
35582+ if (local_dec_return(&tty->open_count) == 0) {
35583 struct tty_struct *linux_tty = tty->linux_tty;
35584
35585 if (linux_tty != NULL) {
35586@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
35587 return;
35588
35589 mutex_lock(&tty->ipw_tty_mutex);
35590- if (tty->open_count == 0) {
35591+ if (local_read(&tty->open_count) == 0) {
35592 mutex_unlock(&tty->ipw_tty_mutex);
35593 return;
35594 }
35595@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
35596 return;
35597 }
35598
35599- if (!tty->open_count) {
35600+ if (!local_read(&tty->open_count)) {
35601 mutex_unlock(&tty->ipw_tty_mutex);
35602 return;
35603 }
35604@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
35605 return -ENODEV;
35606
35607 mutex_lock(&tty->ipw_tty_mutex);
35608- if (!tty->open_count) {
35609+ if (!local_read(&tty->open_count)) {
35610 mutex_unlock(&tty->ipw_tty_mutex);
35611 return -EINVAL;
35612 }
35613@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
35614 if (!tty)
35615 return -ENODEV;
35616
35617- if (!tty->open_count)
35618+ if (!local_read(&tty->open_count))
35619 return -EINVAL;
35620
35621 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
35622@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
35623 if (!tty)
35624 return 0;
35625
35626- if (!tty->open_count)
35627+ if (!local_read(&tty->open_count))
35628 return 0;
35629
35630 return tty->tx_bytes_queued;
35631@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
35632 if (!tty)
35633 return -ENODEV;
35634
35635- if (!tty->open_count)
35636+ if (!local_read(&tty->open_count))
35637 return -EINVAL;
35638
35639 return get_control_lines(tty);
35640@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
35641 if (!tty)
35642 return -ENODEV;
35643
35644- if (!tty->open_count)
35645+ if (!local_read(&tty->open_count))
35646 return -EINVAL;
35647
35648 return set_control_lines(tty, set, clear);
35649@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
35650 if (!tty)
35651 return -ENODEV;
35652
35653- if (!tty->open_count)
35654+ if (!local_read(&tty->open_count))
35655 return -EINVAL;
35656
35657 /* FIXME: Exactly how is the tty object locked here .. */
35658@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
35659 against a parallel ioctl etc */
35660 mutex_lock(&ttyj->ipw_tty_mutex);
35661 }
35662- while (ttyj->open_count)
35663+ while (local_read(&ttyj->open_count))
35664 do_ipw_close(ttyj);
35665 ipwireless_disassociate_network_ttys(network,
35666 ttyj->channel_idx);
35667diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
35668index fc7bbba..9527e93 100644
35669--- a/drivers/tty/n_gsm.c
35670+++ b/drivers/tty/n_gsm.c
35671@@ -1629,7 +1629,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
35672 kref_init(&dlci->ref);
35673 mutex_init(&dlci->mutex);
35674 dlci->fifo = &dlci->_fifo;
35675- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
35676+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
35677 kfree(dlci);
35678 return NULL;
35679 }
35680diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
35681index 39d6ab6..eb97f41 100644
35682--- a/drivers/tty/n_tty.c
35683+++ b/drivers/tty/n_tty.c
35684@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
35685 {
35686 *ops = tty_ldisc_N_TTY;
35687 ops->owner = NULL;
35688- ops->refcount = ops->flags = 0;
35689+ atomic_set(&ops->refcount, 0);
35690+ ops->flags = 0;
35691 }
35692 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
35693diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
35694index e18604b..a7d5a11 100644
35695--- a/drivers/tty/pty.c
35696+++ b/drivers/tty/pty.c
35697@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
35698 register_sysctl_table(pty_root_table);
35699
35700 /* Now create the /dev/ptmx special device */
35701+ pax_open_kernel();
35702 tty_default_fops(&ptmx_fops);
35703- ptmx_fops.open = ptmx_open;
35704+ *(void **)&ptmx_fops.open = ptmx_open;
35705+ pax_close_kernel();
35706
35707 cdev_init(&ptmx_cdev, &ptmx_fops);
35708 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
35709diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
35710index 2b42a01..32a2ed3 100644
35711--- a/drivers/tty/serial/kgdboc.c
35712+++ b/drivers/tty/serial/kgdboc.c
35713@@ -24,8 +24,9 @@
35714 #define MAX_CONFIG_LEN 40
35715
35716 static struct kgdb_io kgdboc_io_ops;
35717+static struct kgdb_io kgdboc_io_ops_console;
35718
35719-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
35720+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
35721 static int configured = -1;
35722
35723 static char config[MAX_CONFIG_LEN];
35724@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
35725 kgdboc_unregister_kbd();
35726 if (configured == 1)
35727 kgdb_unregister_io_module(&kgdboc_io_ops);
35728+ else if (configured == 2)
35729+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
35730 }
35731
35732 static int configure_kgdboc(void)
35733@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
35734 int err;
35735 char *cptr = config;
35736 struct console *cons;
35737+ int is_console = 0;
35738
35739 err = kgdboc_option_setup(config);
35740 if (err || !strlen(config) || isspace(config[0]))
35741 goto noconfig;
35742
35743 err = -ENODEV;
35744- kgdboc_io_ops.is_console = 0;
35745 kgdb_tty_driver = NULL;
35746
35747 kgdboc_use_kms = 0;
35748@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
35749 int idx;
35750 if (cons->device && cons->device(cons, &idx) == p &&
35751 idx == tty_line) {
35752- kgdboc_io_ops.is_console = 1;
35753+ is_console = 1;
35754 break;
35755 }
35756 cons = cons->next;
35757@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
35758 kgdb_tty_line = tty_line;
35759
35760 do_register:
35761- err = kgdb_register_io_module(&kgdboc_io_ops);
35762+ if (is_console) {
35763+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
35764+ configured = 2;
35765+ } else {
35766+ err = kgdb_register_io_module(&kgdboc_io_ops);
35767+ configured = 1;
35768+ }
35769 if (err)
35770 goto noconfig;
35771
35772- configured = 1;
35773-
35774 return 0;
35775
35776 noconfig:
35777@@ -213,7 +220,7 @@ noconfig:
35778 static int __init init_kgdboc(void)
35779 {
35780 /* Already configured? */
35781- if (configured == 1)
35782+ if (configured >= 1)
35783 return 0;
35784
35785 return configure_kgdboc();
35786@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
35787 if (config[len - 1] == '\n')
35788 config[len - 1] = '\0';
35789
35790- if (configured == 1)
35791+ if (configured >= 1)
35792 cleanup_kgdboc();
35793
35794 /* Go and configure with the new params. */
35795@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
35796 .post_exception = kgdboc_post_exp_handler,
35797 };
35798
35799+static struct kgdb_io kgdboc_io_ops_console = {
35800+ .name = "kgdboc",
35801+ .read_char = kgdboc_get_char,
35802+ .write_char = kgdboc_put_char,
35803+ .pre_exception = kgdboc_pre_exp_handler,
35804+ .post_exception = kgdboc_post_exp_handler,
35805+ .is_console = 1
35806+};
35807+
35808 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
35809 /* This is only available if kgdboc is a built in for early debugging */
35810 static int __init kgdboc_early_init(char *opt)
35811diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
35812index 05085be..67eadb0 100644
35813--- a/drivers/tty/tty_io.c
35814+++ b/drivers/tty/tty_io.c
35815@@ -3240,7 +3240,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
35816
35817 void tty_default_fops(struct file_operations *fops)
35818 {
35819- *fops = tty_fops;
35820+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
35821 }
35822
35823 /*
35824diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
35825index 8e0924f..4204eb4 100644
35826--- a/drivers/tty/tty_ldisc.c
35827+++ b/drivers/tty/tty_ldisc.c
35828@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *ld)
35829 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
35830 struct tty_ldisc_ops *ldo = ld->ops;
35831
35832- ldo->refcount--;
35833+ atomic_dec(&ldo->refcount);
35834 module_put(ldo->owner);
35835 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
35836
35837@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
35838 spin_lock_irqsave(&tty_ldisc_lock, flags);
35839 tty_ldiscs[disc] = new_ldisc;
35840 new_ldisc->num = disc;
35841- new_ldisc->refcount = 0;
35842+ atomic_set(&new_ldisc->refcount, 0);
35843 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
35844
35845 return ret;
35846@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
35847 return -EINVAL;
35848
35849 spin_lock_irqsave(&tty_ldisc_lock, flags);
35850- if (tty_ldiscs[disc]->refcount)
35851+ if (atomic_read(&tty_ldiscs[disc]->refcount))
35852 ret = -EBUSY;
35853 else
35854 tty_ldiscs[disc] = NULL;
35855@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
35856 if (ldops) {
35857 ret = ERR_PTR(-EAGAIN);
35858 if (try_module_get(ldops->owner)) {
35859- ldops->refcount++;
35860+ atomic_inc(&ldops->refcount);
35861 ret = ldops;
35862 }
35863 }
35864@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
35865 unsigned long flags;
35866
35867 spin_lock_irqsave(&tty_ldisc_lock, flags);
35868- ldops->refcount--;
35869+ atomic_dec(&ldops->refcount);
35870 module_put(ldops->owner);
35871 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
35872 }
35873diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
35874index a605549..6bd3c96 100644
35875--- a/drivers/tty/vt/keyboard.c
35876+++ b/drivers/tty/vt/keyboard.c
35877@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
35878 kbd->kbdmode == VC_OFF) &&
35879 value != KVAL(K_SAK))
35880 return; /* SAK is allowed even in raw mode */
35881+
35882+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
35883+ {
35884+ void *func = fn_handler[value];
35885+ if (func == fn_show_state || func == fn_show_ptregs ||
35886+ func == fn_show_mem)
35887+ return;
35888+ }
35889+#endif
35890+
35891 fn_handler[value](vc);
35892 }
35893
35894diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
35895index 65447c5..0526f0a 100644
35896--- a/drivers/tty/vt/vt_ioctl.c
35897+++ b/drivers/tty/vt/vt_ioctl.c
35898@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
35899 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
35900 return -EFAULT;
35901
35902- if (!capable(CAP_SYS_TTY_CONFIG))
35903- perm = 0;
35904-
35905 switch (cmd) {
35906 case KDGKBENT:
35907 key_map = key_maps[s];
35908@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
35909 val = (i ? K_HOLE : K_NOSUCHMAP);
35910 return put_user(val, &user_kbe->kb_value);
35911 case KDSKBENT:
35912+ if (!capable(CAP_SYS_TTY_CONFIG))
35913+ perm = 0;
35914+
35915 if (!perm)
35916 return -EPERM;
35917 if (!i && v == K_NOSUCHMAP) {
35918@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
35919 int i, j, k;
35920 int ret;
35921
35922- if (!capable(CAP_SYS_TTY_CONFIG))
35923- perm = 0;
35924-
35925 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
35926 if (!kbs) {
35927 ret = -ENOMEM;
35928@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
35929 kfree(kbs);
35930 return ((p && *p) ? -EOVERFLOW : 0);
35931 case KDSKBSENT:
35932+ if (!capable(CAP_SYS_TTY_CONFIG))
35933+ perm = 0;
35934+
35935 if (!perm) {
35936 ret = -EPERM;
35937 goto reterr;
35938diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
35939index a783d53..cb30d94 100644
35940--- a/drivers/uio/uio.c
35941+++ b/drivers/uio/uio.c
35942@@ -25,6 +25,7 @@
35943 #include <linux/kobject.h>
35944 #include <linux/cdev.h>
35945 #include <linux/uio_driver.h>
35946+#include <asm/local.h>
35947
35948 #define UIO_MAX_DEVICES (1U << MINORBITS)
35949
35950@@ -32,10 +33,10 @@ struct uio_device {
35951 struct module *owner;
35952 struct device *dev;
35953 int minor;
35954- atomic_t event;
35955+ atomic_unchecked_t event;
35956 struct fasync_struct *async_queue;
35957 wait_queue_head_t wait;
35958- int vma_count;
35959+ local_t vma_count;
35960 struct uio_info *info;
35961 struct kobject *map_dir;
35962 struct kobject *portio_dir;
35963@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
35964 struct device_attribute *attr, char *buf)
35965 {
35966 struct uio_device *idev = dev_get_drvdata(dev);
35967- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
35968+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
35969 }
35970
35971 static struct device_attribute uio_class_attributes[] = {
35972@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
35973 {
35974 struct uio_device *idev = info->uio_dev;
35975
35976- atomic_inc(&idev->event);
35977+ atomic_inc_unchecked(&idev->event);
35978 wake_up_interruptible(&idev->wait);
35979 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
35980 }
35981@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
35982 }
35983
35984 listener->dev = idev;
35985- listener->event_count = atomic_read(&idev->event);
35986+ listener->event_count = atomic_read_unchecked(&idev->event);
35987 filep->private_data = listener;
35988
35989 if (idev->info->open) {
35990@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
35991 return -EIO;
35992
35993 poll_wait(filep, &idev->wait, wait);
35994- if (listener->event_count != atomic_read(&idev->event))
35995+ if (listener->event_count != atomic_read_unchecked(&idev->event))
35996 return POLLIN | POLLRDNORM;
35997 return 0;
35998 }
35999@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
36000 do {
36001 set_current_state(TASK_INTERRUPTIBLE);
36002
36003- event_count = atomic_read(&idev->event);
36004+ event_count = atomic_read_unchecked(&idev->event);
36005 if (event_count != listener->event_count) {
36006 if (copy_to_user(buf, &event_count, count))
36007 retval = -EFAULT;
36008@@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
36009 static void uio_vma_open(struct vm_area_struct *vma)
36010 {
36011 struct uio_device *idev = vma->vm_private_data;
36012- idev->vma_count++;
36013+ local_inc(&idev->vma_count);
36014 }
36015
36016 static void uio_vma_close(struct vm_area_struct *vma)
36017 {
36018 struct uio_device *idev = vma->vm_private_data;
36019- idev->vma_count--;
36020+ local_dec(&idev->vma_count);
36021 }
36022
36023 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
36024@@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
36025 idev->owner = owner;
36026 idev->info = info;
36027 init_waitqueue_head(&idev->wait);
36028- atomic_set(&idev->event, 0);
36029+ atomic_set_unchecked(&idev->event, 0);
36030
36031 ret = uio_get_minor(idev);
36032 if (ret)
36033diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
36034index a845f8b..4f54072 100644
36035--- a/drivers/usb/atm/cxacru.c
36036+++ b/drivers/usb/atm/cxacru.c
36037@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
36038 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
36039 if (ret < 2)
36040 return -EINVAL;
36041- if (index < 0 || index > 0x7f)
36042+ if (index > 0x7f)
36043 return -EINVAL;
36044 pos += tmp;
36045
36046diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
36047index d3448ca..d2864ca 100644
36048--- a/drivers/usb/atm/usbatm.c
36049+++ b/drivers/usb/atm/usbatm.c
36050@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36051 if (printk_ratelimit())
36052 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
36053 __func__, vpi, vci);
36054- atomic_inc(&vcc->stats->rx_err);
36055+ atomic_inc_unchecked(&vcc->stats->rx_err);
36056 return;
36057 }
36058
36059@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36060 if (length > ATM_MAX_AAL5_PDU) {
36061 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
36062 __func__, length, vcc);
36063- atomic_inc(&vcc->stats->rx_err);
36064+ atomic_inc_unchecked(&vcc->stats->rx_err);
36065 goto out;
36066 }
36067
36068@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36069 if (sarb->len < pdu_length) {
36070 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
36071 __func__, pdu_length, sarb->len, vcc);
36072- atomic_inc(&vcc->stats->rx_err);
36073+ atomic_inc_unchecked(&vcc->stats->rx_err);
36074 goto out;
36075 }
36076
36077 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
36078 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
36079 __func__, vcc);
36080- atomic_inc(&vcc->stats->rx_err);
36081+ atomic_inc_unchecked(&vcc->stats->rx_err);
36082 goto out;
36083 }
36084
36085@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36086 if (printk_ratelimit())
36087 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
36088 __func__, length);
36089- atomic_inc(&vcc->stats->rx_drop);
36090+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36091 goto out;
36092 }
36093
36094@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
36095
36096 vcc->push(vcc, skb);
36097
36098- atomic_inc(&vcc->stats->rx);
36099+ atomic_inc_unchecked(&vcc->stats->rx);
36100 out:
36101 skb_trim(sarb, 0);
36102 }
36103@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
36104 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
36105
36106 usbatm_pop(vcc, skb);
36107- atomic_inc(&vcc->stats->tx);
36108+ atomic_inc_unchecked(&vcc->stats->tx);
36109
36110 skb = skb_dequeue(&instance->sndqueue);
36111 }
36112@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
36113 if (!left--)
36114 return sprintf(page,
36115 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
36116- atomic_read(&atm_dev->stats.aal5.tx),
36117- atomic_read(&atm_dev->stats.aal5.tx_err),
36118- atomic_read(&atm_dev->stats.aal5.rx),
36119- atomic_read(&atm_dev->stats.aal5.rx_err),
36120- atomic_read(&atm_dev->stats.aal5.rx_drop));
36121+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
36122+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
36123+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
36124+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
36125+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
36126
36127 if (!left--) {
36128 if (instance->disconnected)
36129diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
36130index d956965..4179a77 100644
36131--- a/drivers/usb/core/devices.c
36132+++ b/drivers/usb/core/devices.c
36133@@ -126,7 +126,7 @@ static const char format_endpt[] =
36134 * time it gets called.
36135 */
36136 static struct device_connect_event {
36137- atomic_t count;
36138+ atomic_unchecked_t count;
36139 wait_queue_head_t wait;
36140 } device_event = {
36141 .count = ATOMIC_INIT(1),
36142@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
36143
36144 void usbfs_conn_disc_event(void)
36145 {
36146- atomic_add(2, &device_event.count);
36147+ atomic_add_unchecked(2, &device_event.count);
36148 wake_up(&device_event.wait);
36149 }
36150
36151@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
36152
36153 poll_wait(file, &device_event.wait, wait);
36154
36155- event_count = atomic_read(&device_event.count);
36156+ event_count = atomic_read_unchecked(&device_event.count);
36157 if (file->f_version != event_count) {
36158 file->f_version = event_count;
36159 return POLLIN | POLLRDNORM;
36160diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
36161index b3bdfed..a9460e0 100644
36162--- a/drivers/usb/core/message.c
36163+++ b/drivers/usb/core/message.c
36164@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device *udev, int index)
36165 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
36166 if (buf) {
36167 len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
36168- if (len > 0) {
36169- smallbuf = kmalloc(++len, GFP_NOIO);
36170+ if (len++ > 0) {
36171+ smallbuf = kmalloc(len, GFP_NOIO);
36172 if (!smallbuf)
36173 return buf;
36174 memcpy(smallbuf, buf, len);
36175diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
36176index 1fc8f12..20647c1 100644
36177--- a/drivers/usb/early/ehci-dbgp.c
36178+++ b/drivers/usb/early/ehci-dbgp.c
36179@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
36180
36181 #ifdef CONFIG_KGDB
36182 static struct kgdb_io kgdbdbgp_io_ops;
36183-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
36184+static struct kgdb_io kgdbdbgp_io_ops_console;
36185+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
36186 #else
36187 #define dbgp_kgdb_mode (0)
36188 #endif
36189@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
36190 .write_char = kgdbdbgp_write_char,
36191 };
36192
36193+static struct kgdb_io kgdbdbgp_io_ops_console = {
36194+ .name = "kgdbdbgp",
36195+ .read_char = kgdbdbgp_read_char,
36196+ .write_char = kgdbdbgp_write_char,
36197+ .is_console = 1
36198+};
36199+
36200 static int kgdbdbgp_wait_time;
36201
36202 static int __init kgdbdbgp_parse_config(char *str)
36203@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
36204 ptr++;
36205 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
36206 }
36207- kgdb_register_io_module(&kgdbdbgp_io_ops);
36208- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
36209+ if (early_dbgp_console.index != -1)
36210+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
36211+ else
36212+ kgdb_register_io_module(&kgdbdbgp_io_ops);
36213
36214 return 0;
36215 }
36216diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
36217index d6bea3e..60b250e 100644
36218--- a/drivers/usb/wusbcore/wa-hc.h
36219+++ b/drivers/usb/wusbcore/wa-hc.h
36220@@ -192,7 +192,7 @@ struct wahc {
36221 struct list_head xfer_delayed_list;
36222 spinlock_t xfer_list_lock;
36223 struct work_struct xfer_work;
36224- atomic_t xfer_id_count;
36225+ atomic_unchecked_t xfer_id_count;
36226 };
36227
36228
36229@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
36230 INIT_LIST_HEAD(&wa->xfer_delayed_list);
36231 spin_lock_init(&wa->xfer_list_lock);
36232 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
36233- atomic_set(&wa->xfer_id_count, 1);
36234+ atomic_set_unchecked(&wa->xfer_id_count, 1);
36235 }
36236
36237 /**
36238diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
36239index 57c01ab..8a05959 100644
36240--- a/drivers/usb/wusbcore/wa-xfer.c
36241+++ b/drivers/usb/wusbcore/wa-xfer.c
36242@@ -296,7 +296,7 @@ out:
36243 */
36244 static void wa_xfer_id_init(struct wa_xfer *xfer)
36245 {
36246- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
36247+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
36248 }
36249
36250 /*
36251diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
36252index c14c42b..f955cc2 100644
36253--- a/drivers/vhost/vhost.c
36254+++ b/drivers/vhost/vhost.c
36255@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
36256 return 0;
36257 }
36258
36259-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
36260+static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
36261 {
36262 struct file *eventfp, *filep = NULL,
36263 *pollstart = NULL, *pollstop = NULL;
36264diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
36265index b0b2ac3..89a4399 100644
36266--- a/drivers/video/aty/aty128fb.c
36267+++ b/drivers/video/aty/aty128fb.c
36268@@ -148,7 +148,7 @@ enum {
36269 };
36270
36271 /* Must match above enum */
36272-static const char *r128_family[] __devinitdata = {
36273+static const char *r128_family[] __devinitconst = {
36274 "AGP",
36275 "PCI",
36276 "PRO AGP",
36277diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
36278index 5c3960d..15cf8fc 100644
36279--- a/drivers/video/fbcmap.c
36280+++ b/drivers/video/fbcmap.c
36281@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
36282 rc = -ENODEV;
36283 goto out;
36284 }
36285- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
36286- !info->fbops->fb_setcmap)) {
36287+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
36288 rc = -EINVAL;
36289 goto out1;
36290 }
36291diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
36292index ad93629..e020fc3 100644
36293--- a/drivers/video/fbmem.c
36294+++ b/drivers/video/fbmem.c
36295@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
36296 image->dx += image->width + 8;
36297 }
36298 } else if (rotate == FB_ROTATE_UD) {
36299- for (x = 0; x < num && image->dx >= 0; x++) {
36300+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
36301 info->fbops->fb_imageblit(info, image);
36302 image->dx -= image->width + 8;
36303 }
36304@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
36305 image->dy += image->height + 8;
36306 }
36307 } else if (rotate == FB_ROTATE_CCW) {
36308- for (x = 0; x < num && image->dy >= 0; x++) {
36309+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
36310 info->fbops->fb_imageblit(info, image);
36311 image->dy -= image->height + 8;
36312 }
36313@@ -1143,7 +1143,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
36314 return -EFAULT;
36315 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
36316 return -EINVAL;
36317- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
36318+ if (con2fb.framebuffer >= FB_MAX)
36319 return -EINVAL;
36320 if (!registered_fb[con2fb.framebuffer])
36321 request_module("fb%d", con2fb.framebuffer);
36322diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
36323index 5a5d092..265c5ed 100644
36324--- a/drivers/video/geode/gx1fb_core.c
36325+++ b/drivers/video/geode/gx1fb_core.c
36326@@ -29,7 +29,7 @@ static int crt_option = 1;
36327 static char panel_option[32] = "";
36328
36329 /* Modes relevant to the GX1 (taken from modedb.c) */
36330-static const struct fb_videomode __devinitdata gx1_modedb[] = {
36331+static const struct fb_videomode __devinitconst gx1_modedb[] = {
36332 /* 640x480-60 VESA */
36333 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
36334 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
36335diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
36336index 0fad23f..0e9afa4 100644
36337--- a/drivers/video/gxt4500.c
36338+++ b/drivers/video/gxt4500.c
36339@@ -156,7 +156,7 @@ struct gxt4500_par {
36340 static char *mode_option;
36341
36342 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
36343-static const struct fb_videomode defaultmode __devinitdata = {
36344+static const struct fb_videomode defaultmode __devinitconst = {
36345 .refresh = 60,
36346 .xres = 1280,
36347 .yres = 1024,
36348@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
36349 return 0;
36350 }
36351
36352-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
36353+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
36354 .id = "IBM GXT4500P",
36355 .type = FB_TYPE_PACKED_PIXELS,
36356 .visual = FB_VISUAL_PSEUDOCOLOR,
36357diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
36358index 7672d2e..b56437f 100644
36359--- a/drivers/video/i810/i810_accel.c
36360+++ b/drivers/video/i810/i810_accel.c
36361@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
36362 }
36363 }
36364 printk("ringbuffer lockup!!!\n");
36365+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
36366 i810_report_error(mmio);
36367 par->dev_flags |= LOCKUP;
36368 info->pixmap.scan_align = 1;
36369diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
36370index 318f6fb..9a389c1 100644
36371--- a/drivers/video/i810/i810_main.c
36372+++ b/drivers/video/i810/i810_main.c
36373@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
36374 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
36375
36376 /* PCI */
36377-static const char *i810_pci_list[] __devinitdata = {
36378+static const char *i810_pci_list[] __devinitconst = {
36379 "Intel(R) 810 Framebuffer Device" ,
36380 "Intel(R) 810-DC100 Framebuffer Device" ,
36381 "Intel(R) 810E Framebuffer Device" ,
36382diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
36383index de36693..3c63fc2 100644
36384--- a/drivers/video/jz4740_fb.c
36385+++ b/drivers/video/jz4740_fb.c
36386@@ -136,7 +136,7 @@ struct jzfb {
36387 uint32_t pseudo_palette[16];
36388 };
36389
36390-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
36391+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
36392 .id = "JZ4740 FB",
36393 .type = FB_TYPE_PACKED_PIXELS,
36394 .visual = FB_VISUAL_TRUECOLOR,
36395diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
36396index 3c14e43..eafa544 100644
36397--- a/drivers/video/logo/logo_linux_clut224.ppm
36398+++ b/drivers/video/logo/logo_linux_clut224.ppm
36399@@ -1,1604 +1,1123 @@
36400 P3
36401-# Standard 224-color Linux logo
36402 80 80
36403 255
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 0 0 0 0 0 0 0 0 0
36413- 6 6 6 6 6 6 10 10 10 10 10 10
36414- 10 10 10 6 6 6 6 6 6 6 6 6
36415- 0 0 0 0 0 0 0 0 0 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 0 0 0 0 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- 0 0 0 6 6 6 10 10 10 14 14 14
36433- 22 22 22 26 26 26 30 30 30 34 34 34
36434- 30 30 30 30 30 30 26 26 26 18 18 18
36435- 14 14 14 10 10 10 6 6 6 0 0 0
36436- 0 0 0 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 0 0 0 1 0 0 1 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 0 0 0
36452- 6 6 6 14 14 14 26 26 26 42 42 42
36453- 54 54 54 66 66 66 78 78 78 78 78 78
36454- 78 78 78 74 74 74 66 66 66 54 54 54
36455- 42 42 42 26 26 26 18 18 18 10 10 10
36456- 6 6 6 0 0 0 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 0 0 0 0 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 0 0 0 10 10 10
36472- 22 22 22 42 42 42 66 66 66 86 86 86
36473- 66 66 66 38 38 38 38 38 38 22 22 22
36474- 26 26 26 34 34 34 54 54 54 66 66 66
36475- 86 86 86 70 70 70 46 46 46 26 26 26
36476- 14 14 14 6 6 6 0 0 0 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 1 0 0 1 0 0 1 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 0 0 0 10 10 10 26 26 26
36492- 50 50 50 82 82 82 58 58 58 6 6 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- 6 6 6 54 54 54 86 86 86 66 66 66
36496- 38 38 38 18 18 18 6 6 6 0 0 0
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 0 0 0 0 0 0 0 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- 0 0 0 6 6 6 22 22 22 50 50 50
36512- 78 78 78 34 34 34 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 2 2 6
36515- 2 2 6 2 2 6 6 6 6 70 70 70
36516- 78 78 78 46 46 46 22 22 22 6 6 6
36517- 0 0 0 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 1 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- 6 6 6 18 18 18 42 42 42 82 82 82
36532- 26 26 26 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 14 14 14
36535- 46 46 46 34 34 34 6 6 6 2 2 6
36536- 42 42 42 78 78 78 42 42 42 18 18 18
36537- 6 6 6 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 0 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- 10 10 10 30 30 30 66 66 66 58 58 58
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 26 26 26
36555- 86 86 86 101 101 101 46 46 46 10 10 10
36556- 2 2 6 58 58 58 70 70 70 34 34 34
36557- 10 10 10 0 0 0 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 1 0 0 1 0 0 1 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 0 0 0
36571- 14 14 14 42 42 42 86 86 86 10 10 10
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 30 30 30
36575- 94 94 94 94 94 94 58 58 58 26 26 26
36576- 2 2 6 6 6 6 78 78 78 54 54 54
36577- 22 22 22 6 6 6 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 0 0 0 0 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- 22 22 22 62 62 62 62 62 62 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 26 26 26
36595- 54 54 54 38 38 38 18 18 18 10 10 10
36596- 2 2 6 2 2 6 34 34 34 82 82 82
36597- 38 38 38 14 14 14 0 0 0 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 0 0 0 1 0 0 1 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 6 6 6
36611- 30 30 30 78 78 78 30 30 30 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 10 10 10
36615- 10 10 10 2 2 6 2 2 6 2 2 6
36616- 2 2 6 2 2 6 2 2 6 78 78 78
36617- 50 50 50 18 18 18 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 1 0 0 0 0 0 0 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 10 10 10
36631- 38 38 38 86 86 86 14 14 14 2 2 6
36632- 2 2 6 2 2 6 2 2 6 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 2 2 6
36635- 2 2 6 2 2 6 2 2 6 2 2 6
36636- 2 2 6 2 2 6 2 2 6 54 54 54
36637- 66 66 66 26 26 26 6 6 6 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 0 0 0 1 0 0 1 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- 42 42 42 82 82 82 2 2 6 2 2 6
36652- 2 2 6 6 6 6 10 10 10 2 2 6
36653- 2 2 6 2 2 6 2 2 6 2 2 6
36654- 2 2 6 2 2 6 2 2 6 6 6 6
36655- 14 14 14 10 10 10 2 2 6 2 2 6
36656- 2 2 6 2 2 6 2 2 6 18 18 18
36657- 82 82 82 34 34 34 10 10 10 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 0 0 0 0 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- 6 6 6 6 6 6 22 22 22 34 34 34
36673- 6 6 6 2 2 6 2 2 6 2 2 6
36674- 2 2 6 2 2 6 18 18 18 34 34 34
36675- 10 10 10 50 50 50 22 22 22 2 2 6
36676- 2 2 6 2 2 6 2 2 6 10 10 10
36677- 86 86 86 42 42 42 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 1 0 0 1 0 0 1 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 2 2 6
36692- 38 38 38 116 116 116 94 94 94 22 22 22
36693- 22 22 22 2 2 6 2 2 6 2 2 6
36694- 14 14 14 86 86 86 138 138 138 162 162 162
36695-154 154 154 38 38 38 26 26 26 6 6 6
36696- 2 2 6 2 2 6 2 2 6 2 2 6
36697- 86 86 86 46 46 46 14 14 14 0 0 0
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 0 0 0 0
36705- 0 0 0 0 0 0 0 0 0 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 14 14 14
36712-134 134 134 198 198 198 195 195 195 116 116 116
36713- 10 10 10 2 2 6 2 2 6 6 6 6
36714-101 98 89 187 187 187 210 210 210 218 218 218
36715-214 214 214 134 134 134 14 14 14 6 6 6
36716- 2 2 6 2 2 6 2 2 6 2 2 6
36717- 86 86 86 50 50 50 18 18 18 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 1 0 0 0
36725- 0 0 1 0 0 1 0 0 1 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 86 86 86 2 2 6 54 54 54
36732-218 218 218 195 195 195 226 226 226 246 246 246
36733- 58 58 58 2 2 6 2 2 6 30 30 30
36734-210 210 210 253 253 253 174 174 174 123 123 123
36735-221 221 221 234 234 234 74 74 74 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 0 0 0 0
36745- 0 0 0 0 0 0 0 0 0 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- 46 46 46 82 82 82 2 2 6 106 106 106
36752-170 170 170 26 26 26 86 86 86 226 226 226
36753-123 123 123 10 10 10 14 14 14 46 46 46
36754-231 231 231 190 190 190 6 6 6 70 70 70
36755- 90 90 90 238 238 238 158 158 158 2 2 6
36756- 2 2 6 2 2 6 2 2 6 2 2 6
36757- 70 70 70 58 58 58 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 1 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 86 86 86 6 6 6 116 116 116
36772-106 106 106 6 6 6 70 70 70 149 149 149
36773-128 128 128 18 18 18 38 38 38 54 54 54
36774-221 221 221 106 106 106 2 2 6 14 14 14
36775- 46 46 46 190 190 190 198 198 198 2 2 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 0
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 14 14 14
36791- 42 42 42 94 94 94 14 14 14 101 101 101
36792-128 128 128 2 2 6 18 18 18 116 116 116
36793-118 98 46 121 92 8 121 92 8 98 78 10
36794-162 162 162 106 106 106 2 2 6 2 2 6
36795- 2 2 6 195 195 195 195 195 195 6 6 6
36796- 2 2 6 2 2 6 2 2 6 2 2 6
36797- 74 74 74 62 62 62 22 22 22 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 1 0 0 1
36805- 0 0 1 0 0 0 0 0 1 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 90 90 90 14 14 14 58 58 58
36812-210 210 210 26 26 26 54 38 6 154 114 10
36813-226 170 11 236 186 11 225 175 15 184 144 12
36814-215 174 15 175 146 61 37 26 9 2 2 6
36815- 70 70 70 246 246 246 138 138 138 2 2 6
36816- 2 2 6 2 2 6 2 2 6 2 2 6
36817- 70 70 70 66 66 66 26 26 26 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- 38 38 38 86 86 86 14 14 14 10 10 10
36832-195 195 195 188 164 115 192 133 9 225 175 15
36833-239 182 13 234 190 10 232 195 16 232 200 30
36834-245 207 45 241 208 19 232 195 16 184 144 12
36835-218 194 134 211 206 186 42 42 42 2 2 6
36836- 2 2 6 2 2 6 2 2 6 2 2 6
36837- 50 50 50 74 74 74 30 30 30 6 6 6
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 86 86 86 14 14 14 2 2 6
36852-121 87 25 192 133 9 219 162 10 239 182 13
36853-236 186 11 232 195 16 241 208 19 244 214 54
36854-246 218 60 246 218 38 246 215 20 241 208 19
36855-241 208 19 226 184 13 121 87 25 2 2 6
36856- 2 2 6 2 2 6 2 2 6 2 2 6
36857- 50 50 50 82 82 82 34 34 34 10 10 10
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- 34 34 34 82 82 82 30 30 30 61 42 6
36872-180 123 7 206 145 10 230 174 11 239 182 13
36873-234 190 10 238 202 15 241 208 19 246 218 74
36874-246 218 38 246 215 20 246 215 20 246 215 20
36875-226 184 13 215 174 15 184 144 12 6 6 6
36876- 2 2 6 2 2 6 2 2 6 2 2 6
36877- 26 26 26 94 94 94 42 42 42 14 14 14
36878- 0 0 0 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 50 50 50 104 69 6
36892-192 133 9 216 158 10 236 178 12 236 186 11
36893-232 195 16 241 208 19 244 214 54 245 215 43
36894-246 215 20 246 215 20 241 208 19 198 155 10
36895-200 144 11 216 158 10 156 118 10 2 2 6
36896- 2 2 6 2 2 6 2 2 6 2 2 6
36897- 6 6 6 90 90 90 54 54 54 18 18 18
36898- 6 6 6 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- 30 30 30 78 78 78 46 46 46 22 22 22
36912-137 92 6 210 162 10 239 182 13 238 190 10
36913-238 202 15 241 208 19 246 215 20 246 215 20
36914-241 208 19 203 166 17 185 133 11 210 150 10
36915-216 158 10 210 150 10 102 78 10 2 2 6
36916- 6 6 6 54 54 54 14 14 14 2 2 6
36917- 2 2 6 62 62 62 74 74 74 30 30 30
36918- 10 10 10 0 0 0 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- 34 34 34 78 78 78 50 50 50 6 6 6
36932- 94 70 30 139 102 15 190 146 13 226 184 13
36933-232 200 30 232 195 16 215 174 15 190 146 13
36934-168 122 10 192 133 9 210 150 10 213 154 11
36935-202 150 34 182 157 106 101 98 89 2 2 6
36936- 2 2 6 78 78 78 116 116 116 58 58 58
36937- 2 2 6 22 22 22 90 90 90 46 46 46
36938- 18 18 18 6 6 6 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 0 0 0 10 10 10
36951- 38 38 38 86 86 86 50 50 50 6 6 6
36952-128 128 128 174 154 114 156 107 11 168 122 10
36953-198 155 10 184 144 12 197 138 11 200 144 11
36954-206 145 10 206 145 10 197 138 11 188 164 115
36955-195 195 195 198 198 198 174 174 174 14 14 14
36956- 2 2 6 22 22 22 116 116 116 116 116 116
36957- 22 22 22 2 2 6 74 74 74 70 70 70
36958- 30 30 30 10 10 10 0 0 0 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 6 6 6 18 18 18
36971- 50 50 50 101 101 101 26 26 26 10 10 10
36972-138 138 138 190 190 190 174 154 114 156 107 11
36973-197 138 11 200 144 11 197 138 11 192 133 9
36974-180 123 7 190 142 34 190 178 144 187 187 187
36975-202 202 202 221 221 221 214 214 214 66 66 66
36976- 2 2 6 2 2 6 50 50 50 62 62 62
36977- 6 6 6 2 2 6 10 10 10 90 90 90
36978- 50 50 50 18 18 18 6 6 6 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 0 0 0 10 10 10 34 34 34
36991- 74 74 74 74 74 74 2 2 6 6 6 6
36992-144 144 144 198 198 198 190 190 190 178 166 146
36993-154 121 60 156 107 11 156 107 11 168 124 44
36994-174 154 114 187 187 187 190 190 190 210 210 210
36995-246 246 246 253 253 253 253 253 253 182 182 182
36996- 6 6 6 2 2 6 2 2 6 2 2 6
36997- 2 2 6 2 2 6 2 2 6 62 62 62
36998- 74 74 74 34 34 34 14 14 14 0 0 0
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- 0 0 0 10 10 10 22 22 22 54 54 54
37011- 94 94 94 18 18 18 2 2 6 46 46 46
37012-234 234 234 221 221 221 190 190 190 190 190 190
37013-190 190 190 187 187 187 187 187 187 190 190 190
37014-190 190 190 195 195 195 214 214 214 242 242 242
37015-253 253 253 253 253 253 253 253 253 253 253 253
37016- 82 82 82 2 2 6 2 2 6 2 2 6
37017- 2 2 6 2 2 6 2 2 6 14 14 14
37018- 86 86 86 54 54 54 22 22 22 6 6 6
37019- 0 0 0 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 0 0 0
37030- 6 6 6 18 18 18 46 46 46 90 90 90
37031- 46 46 46 18 18 18 6 6 6 182 182 182
37032-253 253 253 246 246 246 206 206 206 190 190 190
37033-190 190 190 190 190 190 190 190 190 190 190 190
37034-206 206 206 231 231 231 250 250 250 253 253 253
37035-253 253 253 253 253 253 253 253 253 253 253 253
37036-202 202 202 14 14 14 2 2 6 2 2 6
37037- 2 2 6 2 2 6 2 2 6 2 2 6
37038- 42 42 42 86 86 86 42 42 42 18 18 18
37039- 6 6 6 0 0 0 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 6 6 6
37050- 14 14 14 38 38 38 74 74 74 66 66 66
37051- 2 2 6 6 6 6 90 90 90 250 250 250
37052-253 253 253 253 253 253 238 238 238 198 198 198
37053-190 190 190 190 190 190 195 195 195 221 221 221
37054-246 246 246 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 82 82 82 2 2 6 2 2 6
37057- 2 2 6 2 2 6 2 2 6 2 2 6
37058- 2 2 6 78 78 78 70 70 70 34 34 34
37059- 14 14 14 6 6 6 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 0 0 0 14 14 14
37070- 34 34 34 66 66 66 78 78 78 6 6 6
37071- 2 2 6 18 18 18 218 218 218 253 253 253
37072-253 253 253 253 253 253 253 253 253 246 246 246
37073-226 226 226 231 231 231 246 246 246 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 178 178 178 2 2 6 2 2 6
37077- 2 2 6 2 2 6 2 2 6 2 2 6
37078- 2 2 6 18 18 18 90 90 90 62 62 62
37079- 30 30 30 10 10 10 0 0 0 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 0 0 0 10 10 10 26 26 26
37090- 58 58 58 90 90 90 18 18 18 2 2 6
37091- 2 2 6 110 110 110 253 253 253 253 253 253
37092-253 253 253 253 253 253 253 253 253 253 253 253
37093-250 250 250 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-253 253 253 231 231 231 18 18 18 2 2 6
37097- 2 2 6 2 2 6 2 2 6 2 2 6
37098- 2 2 6 2 2 6 18 18 18 94 94 94
37099- 54 54 54 26 26 26 10 10 10 0 0 0
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- 0 0 0 6 6 6 22 22 22 50 50 50
37110- 90 90 90 26 26 26 2 2 6 2 2 6
37111- 14 14 14 195 195 195 250 250 250 253 253 253
37112-253 253 253 253 253 253 253 253 253 253 253 253
37113-253 253 253 253 253 253 253 253 253 253 253 253
37114-253 253 253 253 253 253 253 253 253 253 253 253
37115-253 253 253 253 253 253 253 253 253 253 253 253
37116-250 250 250 242 242 242 54 54 54 2 2 6
37117- 2 2 6 2 2 6 2 2 6 2 2 6
37118- 2 2 6 2 2 6 2 2 6 38 38 38
37119- 86 86 86 50 50 50 22 22 22 6 6 6
37120- 0 0 0 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- 6 6 6 14 14 14 38 38 38 82 82 82
37130- 34 34 34 2 2 6 2 2 6 2 2 6
37131- 42 42 42 195 195 195 246 246 246 253 253 253
37132-253 253 253 253 253 253 253 253 253 250 250 250
37133-242 242 242 242 242 242 250 250 250 253 253 253
37134-253 253 253 253 253 253 253 253 253 253 253 253
37135-253 253 253 250 250 250 246 246 246 238 238 238
37136-226 226 226 231 231 231 101 101 101 6 6 6
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- 38 38 38 82 82 82 42 42 42 14 14 14
37140- 6 6 6 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- 10 10 10 26 26 26 62 62 62 66 66 66
37150- 2 2 6 2 2 6 2 2 6 6 6 6
37151- 70 70 70 170 170 170 206 206 206 234 234 234
37152-246 246 246 250 250 250 250 250 250 238 238 238
37153-226 226 226 231 231 231 238 238 238 250 250 250
37154-250 250 250 250 250 250 246 246 246 231 231 231
37155-214 214 214 206 206 206 202 202 202 202 202 202
37156-198 198 198 202 202 202 182 182 182 18 18 18
37157- 2 2 6 2 2 6 2 2 6 2 2 6
37158- 2 2 6 2 2 6 2 2 6 2 2 6
37159- 2 2 6 62 62 62 66 66 66 30 30 30
37160- 10 10 10 0 0 0 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 0 0 0
37169- 14 14 14 42 42 42 82 82 82 18 18 18
37170- 2 2 6 2 2 6 2 2 6 10 10 10
37171- 94 94 94 182 182 182 218 218 218 242 242 242
37172-250 250 250 253 253 253 253 253 253 250 250 250
37173-234 234 234 253 253 253 253 253 253 253 253 253
37174-253 253 253 253 253 253 253 253 253 246 246 246
37175-238 238 238 226 226 226 210 210 210 202 202 202
37176-195 195 195 195 195 195 210 210 210 158 158 158
37177- 6 6 6 14 14 14 50 50 50 14 14 14
37178- 2 2 6 2 2 6 2 2 6 2 2 6
37179- 2 2 6 6 6 6 86 86 86 46 46 46
37180- 18 18 18 6 6 6 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 6 6 6
37189- 22 22 22 54 54 54 70 70 70 2 2 6
37190- 2 2 6 10 10 10 2 2 6 22 22 22
37191-166 166 166 231 231 231 250 250 250 253 253 253
37192-253 253 253 253 253 253 253 253 253 250 250 250
37193-242 242 242 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 246 246 246
37196-231 231 231 206 206 206 198 198 198 226 226 226
37197- 94 94 94 2 2 6 6 6 6 38 38 38
37198- 30 30 30 2 2 6 2 2 6 2 2 6
37199- 2 2 6 2 2 6 62 62 62 66 66 66
37200- 26 26 26 10 10 10 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 10 10 10
37209- 30 30 30 74 74 74 50 50 50 2 2 6
37210- 26 26 26 26 26 26 2 2 6 106 106 106
37211-238 238 238 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 246 246 246 218 218 218 202 202 202
37217-210 210 210 14 14 14 2 2 6 2 2 6
37218- 30 30 30 22 22 22 2 2 6 2 2 6
37219- 2 2 6 2 2 6 18 18 18 86 86 86
37220- 42 42 42 14 14 14 0 0 0 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 0 0 0 14 14 14
37229- 42 42 42 90 90 90 22 22 22 2 2 6
37230- 42 42 42 2 2 6 18 18 18 218 218 218
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 250 250 250 221 221 221
37237-218 218 218 101 101 101 2 2 6 14 14 14
37238- 18 18 18 38 38 38 10 10 10 2 2 6
37239- 2 2 6 2 2 6 2 2 6 78 78 78
37240- 58 58 58 22 22 22 6 6 6 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 6 6 6 18 18 18
37249- 54 54 54 82 82 82 2 2 6 26 26 26
37250- 22 22 22 2 2 6 123 123 123 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 253 253 253
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 250 250 250
37257-238 238 238 198 198 198 6 6 6 38 38 38
37258- 58 58 58 26 26 26 38 38 38 2 2 6
37259- 2 2 6 2 2 6 2 2 6 46 46 46
37260- 78 78 78 30 30 30 10 10 10 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 0 0 0 10 10 10 30 30 30
37269- 74 74 74 58 58 58 2 2 6 42 42 42
37270- 2 2 6 22 22 22 231 231 231 253 253 253
37271-253 253 253 253 253 253 253 253 253 253 253 253
37272-253 253 253 253 253 253 253 253 253 250 250 250
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 246 246 246 46 46 46 38 38 38
37278- 42 42 42 14 14 14 38 38 38 14 14 14
37279- 2 2 6 2 2 6 2 2 6 6 6 6
37280- 86 86 86 46 46 46 14 14 14 0 0 0
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 6 6 6 14 14 14 42 42 42
37289- 90 90 90 18 18 18 18 18 18 26 26 26
37290- 2 2 6 116 116 116 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 250 250 250 238 238 238
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 94 94 94 6 6 6
37298- 2 2 6 2 2 6 10 10 10 34 34 34
37299- 2 2 6 2 2 6 2 2 6 2 2 6
37300- 74 74 74 58 58 58 22 22 22 6 6 6
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- 0 0 0 10 10 10 26 26 26 66 66 66
37309- 82 82 82 2 2 6 38 38 38 6 6 6
37310- 14 14 14 210 210 210 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 246 246 246 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 144 144 144 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- 42 42 42 74 74 74 30 30 30 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- 6 6 6 14 14 14 42 42 42 90 90 90
37329- 26 26 26 6 6 6 42 42 42 2 2 6
37330- 74 74 74 250 250 250 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 242 242 242 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 182 182 182 2 2 6
37338- 2 2 6 2 2 6 2 2 6 46 46 46
37339- 2 2 6 2 2 6 2 2 6 2 2 6
37340- 10 10 10 86 86 86 38 38 38 10 10 10
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 0 0 0
37348- 10 10 10 26 26 26 66 66 66 82 82 82
37349- 2 2 6 22 22 22 18 18 18 2 2 6
37350-149 149 149 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 206 206 206 2 2 6
37358- 2 2 6 2 2 6 2 2 6 38 38 38
37359- 2 2 6 2 2 6 2 2 6 2 2 6
37360- 6 6 6 86 86 86 46 46 46 14 14 14
37361- 0 0 0 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 6 6 6
37368- 18 18 18 46 46 46 86 86 86 18 18 18
37369- 2 2 6 34 34 34 10 10 10 6 6 6
37370-210 210 210 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 234 234 234 242 242 242
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 221 221 221 6 6 6
37378- 2 2 6 2 2 6 6 6 6 30 30 30
37379- 2 2 6 2 2 6 2 2 6 2 2 6
37380- 2 2 6 82 82 82 54 54 54 18 18 18
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- 26 26 26 66 66 66 62 62 62 2 2 6
37389- 2 2 6 38 38 38 10 10 10 26 26 26
37390-238 238 238 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 238 238 238
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 231 231 231 6 6 6
37398- 2 2 6 2 2 6 10 10 10 30 30 30
37399- 2 2 6 2 2 6 2 2 6 2 2 6
37400- 2 2 6 66 66 66 58 58 58 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 0 0 0 10 10 10
37408- 38 38 38 78 78 78 6 6 6 2 2 6
37409- 2 2 6 46 46 46 14 14 14 42 42 42
37410-246 246 246 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 242 242 242
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 10 10 10
37418- 2 2 6 2 2 6 22 22 22 14 14 14
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- 50 50 50 74 74 74 2 2 6 2 2 6
37429- 14 14 14 70 70 70 34 34 34 62 62 62
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 234 234 234 14 14 14
37438- 2 2 6 2 2 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 62 62 62 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 18 18 18
37448- 54 54 54 62 62 62 2 2 6 2 2 6
37449- 2 2 6 30 30 30 46 46 46 70 70 70
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 226 226 226 10 10 10
37458- 2 2 6 6 6 6 30 30 30 2 2 6
37459- 2 2 6 2 2 6 2 2 6 2 2 6
37460- 2 2 6 66 66 66 58 58 58 22 22 22
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 22 22 22
37468- 58 58 58 62 62 62 2 2 6 2 2 6
37469- 2 2 6 2 2 6 30 30 30 78 78 78
37470-250 250 250 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 206 206 206 2 2 6
37478- 22 22 22 34 34 34 18 14 6 22 22 22
37479- 26 26 26 18 18 18 6 6 6 2 2 6
37480- 2 2 6 82 82 82 54 54 54 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 0 0 0
37487- 0 0 0 0 0 0 6 6 6 26 26 26
37488- 62 62 62 106 106 106 74 54 14 185 133 11
37489-210 162 10 121 92 8 6 6 6 62 62 62
37490-238 238 238 253 253 253 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 246 246 246
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 253 253 253
37497-253 253 253 253 253 253 158 158 158 18 18 18
37498- 14 14 14 2 2 6 2 2 6 2 2 6
37499- 6 6 6 18 18 18 66 66 66 38 38 38
37500- 6 6 6 94 94 94 50 50 50 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 0 0 0 0 0 0 6 6 6
37507- 10 10 10 10 10 10 18 18 18 38 38 38
37508- 78 78 78 142 134 106 216 158 10 242 186 14
37509-246 190 14 246 190 14 156 118 10 10 10 10
37510- 90 90 90 238 238 238 253 253 253 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 246 230 190
37517-238 204 91 238 204 91 181 142 44 37 26 9
37518- 2 2 6 2 2 6 2 2 6 2 2 6
37519- 2 2 6 2 2 6 38 38 38 46 46 46
37520- 26 26 26 106 106 106 54 54 54 18 18 18
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- 0 0 0 6 6 6 14 14 14 22 22 22
37527- 30 30 30 38 38 38 50 50 50 70 70 70
37528-106 106 106 190 142 34 226 170 11 242 186 14
37529-246 190 14 246 190 14 246 190 14 154 114 10
37530- 6 6 6 74 74 74 226 226 226 253 253 253
37531-253 253 253 253 253 253 253 253 253 253 253 253
37532-253 253 253 253 253 253 231 231 231 250 250 250
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 228 184 62
37537-241 196 14 241 208 19 232 195 16 38 30 10
37538- 2 2 6 2 2 6 2 2 6 2 2 6
37539- 2 2 6 6 6 6 30 30 30 26 26 26
37540-203 166 17 154 142 90 66 66 66 26 26 26
37541- 6 6 6 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- 6 6 6 18 18 18 38 38 38 58 58 58
37547- 78 78 78 86 86 86 101 101 101 123 123 123
37548-175 146 61 210 150 10 234 174 13 246 186 14
37549-246 190 14 246 190 14 246 190 14 238 190 10
37550-102 78 10 2 2 6 46 46 46 198 198 198
37551-253 253 253 253 253 253 253 253 253 253 253 253
37552-253 253 253 253 253 253 234 234 234 242 242 242
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 253 253 253 253 253 253 224 178 62
37557-242 186 14 241 196 14 210 166 10 22 18 6
37558- 2 2 6 2 2 6 2 2 6 2 2 6
37559- 2 2 6 2 2 6 6 6 6 121 92 8
37560-238 202 15 232 195 16 82 82 82 34 34 34
37561- 10 10 10 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 0 0 0
37566- 14 14 14 38 38 38 70 70 70 154 122 46
37567-190 142 34 200 144 11 197 138 11 197 138 11
37568-213 154 11 226 170 11 242 186 14 246 190 14
37569-246 190 14 246 190 14 246 190 14 246 190 14
37570-225 175 15 46 32 6 2 2 6 22 22 22
37571-158 158 158 250 250 250 253 253 253 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 250 250 250 242 242 242 224 178 62
37577-239 182 13 236 186 11 213 154 11 46 32 6
37578- 2 2 6 2 2 6 2 2 6 2 2 6
37579- 2 2 6 2 2 6 61 42 6 225 175 15
37580-238 190 10 236 186 11 112 100 78 42 42 42
37581- 14 14 14 0 0 0 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 6 6 6
37586- 22 22 22 54 54 54 154 122 46 213 154 11
37587-226 170 11 230 174 11 226 170 11 226 170 11
37588-236 178 12 242 186 14 246 190 14 246 190 14
37589-246 190 14 246 190 14 246 190 14 246 190 14
37590-241 196 14 184 144 12 10 10 10 2 2 6
37591- 6 6 6 116 116 116 242 242 242 253 253 253
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 231 231 231 198 198 198 214 170 54
37597-236 178 12 236 178 12 210 150 10 137 92 6
37598- 18 14 6 2 2 6 2 2 6 2 2 6
37599- 6 6 6 70 47 6 200 144 11 236 178 12
37600-239 182 13 239 182 13 124 112 88 58 58 58
37601- 22 22 22 6 6 6 0 0 0 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 10 10 10
37606- 30 30 30 70 70 70 180 133 36 226 170 11
37607-239 182 13 242 186 14 242 186 14 246 186 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 232 195 16 98 70 6 2 2 6
37611- 2 2 6 2 2 6 66 66 66 221 221 221
37612-253 253 253 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-253 253 253 206 206 206 198 198 198 214 166 58
37617-230 174 11 230 174 11 216 158 10 192 133 9
37618-163 110 8 116 81 8 102 78 10 116 81 8
37619-167 114 7 197 138 11 226 170 11 239 182 13
37620-242 186 14 242 186 14 162 146 94 78 78 78
37621- 34 34 34 14 14 14 6 6 6 0 0 0
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 6 6 6
37626- 30 30 30 78 78 78 190 142 34 226 170 11
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 241 196 14 203 166 17 22 18 6
37631- 2 2 6 2 2 6 2 2 6 38 38 38
37632-218 218 218 253 253 253 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 206 206 206 198 198 198 202 162 69
37637-226 170 11 236 178 12 224 166 10 210 150 10
37638-200 144 11 197 138 11 192 133 9 197 138 11
37639-210 150 10 226 170 11 242 186 14 246 190 14
37640-246 190 14 246 186 14 225 175 15 124 112 88
37641- 62 62 62 30 30 30 14 14 14 6 6 6
37642- 0 0 0 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 78 78 78 174 135 50 224 166 10
37647-239 182 13 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 139 102 15
37651- 2 2 6 2 2 6 2 2 6 2 2 6
37652- 78 78 78 250 250 250 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-250 250 250 214 214 214 198 198 198 190 150 46
37657-219 162 10 236 178 12 234 174 13 224 166 10
37658-216 158 10 213 154 11 213 154 11 216 158 10
37659-226 170 11 239 182 13 246 190 14 246 190 14
37660-246 190 14 246 190 14 242 186 14 206 162 42
37661-101 101 101 58 58 58 30 30 30 14 14 14
37662- 6 6 6 0 0 0 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 10 10 10
37666- 30 30 30 74 74 74 174 135 50 216 158 10
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 241 196 14 226 184 13
37671- 61 42 6 2 2 6 2 2 6 2 2 6
37672- 22 22 22 238 238 238 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 226 226 226 187 187 187 180 133 36
37677-216 158 10 236 178 12 239 182 13 236 178 12
37678-230 174 11 226 170 11 226 170 11 230 174 11
37679-236 178 12 242 186 14 246 190 14 246 190 14
37680-246 190 14 246 190 14 246 186 14 239 182 13
37681-206 162 42 106 106 106 66 66 66 34 34 34
37682- 14 14 14 6 6 6 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 213 154 11
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 241 196 14
37691-190 146 13 18 14 6 2 2 6 2 2 6
37692- 46 46 46 246 246 246 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-253 253 253 221 221 221 86 86 86 156 107 11
37697-216 158 10 236 178 12 242 186 14 246 186 14
37698-242 186 14 239 182 13 239 182 13 242 186 14
37699-242 186 14 246 186 14 246 190 14 246 190 14
37700-246 190 14 246 190 14 246 190 14 246 190 14
37701-242 186 14 225 175 15 142 122 72 66 66 66
37702- 30 30 30 10 10 10 0 0 0 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 6 6 6
37706- 26 26 26 70 70 70 163 133 67 210 150 10
37707-236 178 12 246 190 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-232 195 16 121 92 8 34 34 34 106 106 106
37712-221 221 221 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 253 253 253
37716-242 242 242 82 82 82 18 14 6 163 110 8
37717-216 158 10 236 178 12 242 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 190 14 242 186 14 163 133 67
37722- 46 46 46 18 18 18 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 10 10 10
37726- 30 30 30 78 78 78 163 133 67 210 150 10
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-241 196 14 215 174 15 190 178 144 253 253 253
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 253 253 253 253 253 253 218 218 218
37736- 58 58 58 2 2 6 22 18 6 167 114 7
37737-216 158 10 236 178 12 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 190 14 246 186 14 242 186 14 190 150 46
37742- 54 54 54 22 22 22 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 0 0 0 14 14 14
37746- 38 38 38 86 86 86 180 133 36 213 154 11
37747-236 178 12 246 186 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-246 190 14 232 195 16 190 146 13 214 214 214
37752-253 253 253 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-253 253 253 250 250 250 170 170 170 26 26 26
37756- 2 2 6 2 2 6 37 26 9 163 110 8
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 246 190 14
37761-246 186 14 236 178 12 224 166 10 142 122 72
37762- 46 46 46 18 18 18 6 6 6 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 18 18 18
37766- 50 50 50 109 106 95 192 133 9 224 166 10
37767-242 186 14 246 190 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-242 186 14 226 184 13 210 162 10 142 110 46
37772-226 226 226 253 253 253 253 253 253 253 253 253
37773-253 253 253 253 253 253 253 253 253 253 253 253
37774-253 253 253 253 253 253 253 253 253 253 253 253
37775-198 198 198 66 66 66 2 2 6 2 2 6
37776- 2 2 6 2 2 6 50 34 6 156 107 11
37777-219 162 10 239 182 13 246 186 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 246 190 14 246 190 14 242 186 14
37781-234 174 13 213 154 11 154 122 46 66 66 66
37782- 30 30 30 10 10 10 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- 58 58 58 154 121 60 206 145 10 234 174 13
37787-242 186 14 246 186 14 246 190 14 246 190 14
37788-246 190 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 186 14 236 178 12 210 162 10 163 110 8
37792- 61 42 6 138 138 138 218 218 218 250 250 250
37793-253 253 253 253 253 253 253 253 253 250 250 250
37794-242 242 242 210 210 210 144 144 144 66 66 66
37795- 6 6 6 2 2 6 2 2 6 2 2 6
37796- 2 2 6 2 2 6 61 42 6 163 110 8
37797-216 158 10 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 246 190 14 246 190 14 246 190 14
37800-246 190 14 239 182 13 230 174 11 216 158 10
37801-190 142 34 124 112 88 70 70 70 38 38 38
37802- 18 18 18 6 6 6 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 22 22 22
37806- 62 62 62 168 124 44 206 145 10 224 166 10
37807-236 178 12 239 182 13 242 186 14 242 186 14
37808-246 186 14 246 190 14 246 190 14 246 190 14
37809-246 190 14 246 190 14 246 190 14 246 190 14
37810-246 190 14 246 190 14 246 190 14 246 190 14
37811-246 190 14 236 178 12 216 158 10 175 118 6
37812- 80 54 7 2 2 6 6 6 6 30 30 30
37813- 54 54 54 62 62 62 50 50 50 38 38 38
37814- 14 14 14 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 80 54 7 167 114 7
37817-213 154 11 236 178 12 246 190 14 246 190 14
37818-246 190 14 246 190 14 246 190 14 246 190 14
37819-246 190 14 242 186 14 239 182 13 239 182 13
37820-230 174 11 210 150 10 174 135 50 124 112 88
37821- 82 82 82 54 54 54 34 34 34 18 18 18
37822- 6 6 6 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 6 6 6 18 18 18
37826- 50 50 50 158 118 36 192 133 9 200 144 11
37827-216 158 10 219 162 10 224 166 10 226 170 11
37828-230 174 11 236 178 12 239 182 13 239 182 13
37829-242 186 14 246 186 14 246 190 14 246 190 14
37830-246 190 14 246 190 14 246 190 14 246 190 14
37831-246 186 14 230 174 11 210 150 10 163 110 8
37832-104 69 6 10 10 10 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 91 60 6 167 114 7
37837-206 145 10 230 174 11 242 186 14 246 190 14
37838-246 190 14 246 190 14 246 186 14 242 186 14
37839-239 182 13 230 174 11 224 166 10 213 154 11
37840-180 133 36 124 112 88 86 86 86 58 58 58
37841- 38 38 38 22 22 22 10 10 10 6 6 6
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 14 14 14
37846- 34 34 34 70 70 70 138 110 50 158 118 36
37847-167 114 7 180 123 7 192 133 9 197 138 11
37848-200 144 11 206 145 10 213 154 11 219 162 10
37849-224 166 10 230 174 11 239 182 13 242 186 14
37850-246 186 14 246 186 14 246 186 14 246 186 14
37851-239 182 13 216 158 10 185 133 11 152 99 6
37852-104 69 6 18 14 6 2 2 6 2 2 6
37853- 2 2 6 2 2 6 2 2 6 2 2 6
37854- 2 2 6 2 2 6 2 2 6 2 2 6
37855- 2 2 6 2 2 6 2 2 6 2 2 6
37856- 2 2 6 6 6 6 80 54 7 152 99 6
37857-192 133 9 219 162 10 236 178 12 239 182 13
37858-246 186 14 242 186 14 239 182 13 236 178 12
37859-224 166 10 206 145 10 192 133 9 154 121 60
37860- 94 94 94 62 62 62 42 42 42 22 22 22
37861- 14 14 14 6 6 6 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 6 6 6
37866- 18 18 18 34 34 34 58 58 58 78 78 78
37867-101 98 89 124 112 88 142 110 46 156 107 11
37868-163 110 8 167 114 7 175 118 6 180 123 7
37869-185 133 11 197 138 11 210 150 10 219 162 10
37870-226 170 11 236 178 12 236 178 12 234 174 13
37871-219 162 10 197 138 11 163 110 8 130 83 6
37872- 91 60 6 10 10 10 2 2 6 2 2 6
37873- 18 18 18 38 38 38 38 38 38 38 38 38
37874- 38 38 38 38 38 38 38 38 38 38 38 38
37875- 38 38 38 38 38 38 26 26 26 2 2 6
37876- 2 2 6 6 6 6 70 47 6 137 92 6
37877-175 118 6 200 144 11 219 162 10 230 174 11
37878-234 174 13 230 174 11 219 162 10 210 150 10
37879-192 133 9 163 110 8 124 112 88 82 82 82
37880- 50 50 50 30 30 30 14 14 14 6 6 6
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- 6 6 6 14 14 14 22 22 22 34 34 34
37887- 42 42 42 58 58 58 74 74 74 86 86 86
37888-101 98 89 122 102 70 130 98 46 121 87 25
37889-137 92 6 152 99 6 163 110 8 180 123 7
37890-185 133 11 197 138 11 206 145 10 200 144 11
37891-180 123 7 156 107 11 130 83 6 104 69 6
37892- 50 34 6 54 54 54 110 110 110 101 98 89
37893- 86 86 86 82 82 82 78 78 78 78 78 78
37894- 78 78 78 78 78 78 78 78 78 78 78 78
37895- 78 78 78 82 82 82 86 86 86 94 94 94
37896-106 106 106 101 101 101 86 66 34 124 80 6
37897-156 107 11 180 123 7 192 133 9 200 144 11
37898-206 145 10 200 144 11 192 133 9 175 118 6
37899-139 102 15 109 106 95 70 70 70 42 42 42
37900- 22 22 22 10 10 10 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 6 6 6 10 10 10
37907- 14 14 14 22 22 22 30 30 30 38 38 38
37908- 50 50 50 62 62 62 74 74 74 90 90 90
37909-101 98 89 112 100 78 121 87 25 124 80 6
37910-137 92 6 152 99 6 152 99 6 152 99 6
37911-138 86 6 124 80 6 98 70 6 86 66 30
37912-101 98 89 82 82 82 58 58 58 46 46 46
37913- 38 38 38 34 34 34 34 34 34 34 34 34
37914- 34 34 34 34 34 34 34 34 34 34 34 34
37915- 34 34 34 34 34 34 38 38 38 42 42 42
37916- 54 54 54 82 82 82 94 86 76 91 60 6
37917-134 86 6 156 107 11 167 114 7 175 118 6
37918-175 118 6 167 114 7 152 99 6 121 87 25
37919-101 98 89 62 62 62 34 34 34 18 18 18
37920- 6 6 6 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 6 6 6 6 6 6 10 10 10
37928- 18 18 18 22 22 22 30 30 30 42 42 42
37929- 50 50 50 66 66 66 86 86 86 101 98 89
37930-106 86 58 98 70 6 104 69 6 104 69 6
37931-104 69 6 91 60 6 82 62 34 90 90 90
37932- 62 62 62 38 38 38 22 22 22 14 14 14
37933- 10 10 10 10 10 10 10 10 10 10 10 10
37934- 10 10 10 10 10 10 6 6 6 10 10 10
37935- 10 10 10 10 10 10 10 10 10 14 14 14
37936- 22 22 22 42 42 42 70 70 70 89 81 66
37937- 80 54 7 104 69 6 124 80 6 137 92 6
37938-134 86 6 116 81 8 100 82 52 86 86 86
37939- 58 58 58 30 30 30 14 14 14 6 6 6
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 6 6 6 10 10 10 14 14 14
37949- 18 18 18 26 26 26 38 38 38 54 54 54
37950- 70 70 70 86 86 86 94 86 76 89 81 66
37951- 89 81 66 86 86 86 74 74 74 50 50 50
37952- 30 30 30 14 14 14 6 6 6 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- 6 6 6 18 18 18 34 34 34 58 58 58
37957- 82 82 82 89 81 66 89 81 66 89 81 66
37958- 94 86 66 94 86 76 74 74 74 50 50 50
37959- 26 26 26 14 14 14 6 6 6 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- 6 6 6 6 6 6 14 14 14 18 18 18
37970- 30 30 30 38 38 38 46 46 46 54 54 54
37971- 50 50 50 42 42 42 30 30 30 18 18 18
37972- 10 10 10 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 6 6 6 14 14 14 26 26 26
37977- 38 38 38 50 50 50 58 58 58 58 58 58
37978- 54 54 54 42 42 42 30 30 30 18 18 18
37979- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
37985- 0 0 0 0 0 0 0 0 0 0 0 0
37986- 0 0 0 0 0 0 0 0 0 0 0 0
37987- 0 0 0 0 0 0 0 0 0 0 0 0
37988- 0 0 0 0 0 0 0 0 0 0 0 0
37989- 0 0 0 0 0 0 0 0 0 6 6 6
37990- 6 6 6 10 10 10 14 14 14 18 18 18
37991- 18 18 18 14 14 14 10 10 10 6 6 6
37992- 0 0 0 0 0 0 0 0 0 0 0 0
37993- 0 0 0 0 0 0 0 0 0 0 0 0
37994- 0 0 0 0 0 0 0 0 0 0 0 0
37995- 0 0 0 0 0 0 0 0 0 0 0 0
37996- 0 0 0 0 0 0 0 0 0 6 6 6
37997- 14 14 14 18 18 18 22 22 22 22 22 22
37998- 18 18 18 14 14 14 10 10 10 6 6 6
37999- 0 0 0 0 0 0 0 0 0 0 0 0
38000- 0 0 0 0 0 0 0 0 0 0 0 0
38001- 0 0 0 0 0 0 0 0 0 0 0 0
38002- 0 0 0 0 0 0 0 0 0 0 0 0
38003- 0 0 0 0 0 0 0 0 0 0 0 0
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 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
38073+4 4 4 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 4 4 4 4 4 4
38078+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38079+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
38087+4 4 4 4 4 4
38088+4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
38092+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
38093+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
38094+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38095+4 4 4 4 4 4 4 4 4 4 4 4 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 1 1 1 0 0 0
38098+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
38099+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
38100+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38101+4 4 4 4 4 4
38102+4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
38106+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
38107+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
38108+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38109+4 4 4 4 4 4 4 4 4 4 4 4 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 3 3 3 0 0 0 1 1 1 6 6 6
38112+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
38113+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
38114+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38115+4 4 4 4 4 4
38116+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4
38119+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38120+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
38121+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
38122+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
38123+4 4 4 4 4 4 4 4 4 4 4 4 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 0 0 0 4 4 4 41 54 63 125 124 125
38126+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
38127+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
38128+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
38129+4 4 4 4 4 4
38130+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38131+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38132+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38133+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
38134+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
38135+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
38136+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
38137+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38138+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
38139+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
38140+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
38141+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
38142+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
38143+4 4 4 4 4 4
38144+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38145+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38146+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38147+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
38148+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
38149+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
38150+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
38151+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
38152+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
38153+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
38154+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
38155+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
38156+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
38157+4 4 4 4 4 4
38158+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38159+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38160+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
38161+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
38162+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
38163+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
38164+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
38165+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
38166+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
38167+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
38168+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
38169+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
38170+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
38171+4 4 4 4 4 4
38172+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38173+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38174+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
38175+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
38176+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
38177+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
38178+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
38179+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
38180+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
38181+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
38182+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
38183+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
38184+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
38185+4 4 4 4 4 4
38186+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38187+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38188+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
38189+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
38190+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
38191+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
38192+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
38193+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
38194+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
38195+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
38196+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
38197+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
38198+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
38199+4 4 4 4 4 4
38200+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38201+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38202+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
38203+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
38204+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
38205+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
38206+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
38207+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
38208+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
38209+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
38210+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
38211+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
38212+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
38213+4 4 4 4 4 4
38214+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38215+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38216+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
38217+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
38218+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
38219+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
38220+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
38221+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
38222+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
38223+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
38224+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
38225+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
38226+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
38227+4 4 4 4 4 4
38228+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38229+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
38230+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
38231+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
38232+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
38233+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
38234+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
38235+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
38236+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
38237+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
38238+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
38239+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
38240+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
38241+4 4 4 4 4 4
38242+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38243+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
38244+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
38245+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
38246+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
38247+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
38248+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
38249+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
38250+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
38251+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
38252+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
38253+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
38254+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
38255+0 0 0 4 4 4
38256+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
38257+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
38258+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
38259+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
38260+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
38261+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
38262+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
38263+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
38264+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
38265+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
38266+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
38267+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
38268+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
38269+2 0 0 0 0 0
38270+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
38271+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
38272+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
38273+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
38274+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
38275+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
38276+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
38277+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
38278+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
38279+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
38280+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
38281+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
38282+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
38283+37 38 37 0 0 0
38284+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
38285+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
38286+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
38287+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
38288+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
38289+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
38290+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
38291+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
38292+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
38293+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
38294+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
38295+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
38296+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
38297+85 115 134 4 0 0
38298+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
38299+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
38300+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
38301+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
38302+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
38303+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
38304+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
38305+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
38306+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
38307+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
38308+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
38309+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
38310+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
38311+60 73 81 4 0 0
38312+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
38313+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
38314+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
38315+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
38316+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
38317+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
38318+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
38319+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
38320+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
38321+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
38322+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
38323+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
38324+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
38325+16 19 21 4 0 0
38326+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
38327+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
38328+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
38329+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
38330+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
38331+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
38332+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
38333+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
38334+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
38335+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
38336+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
38337+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
38338+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
38339+4 0 0 4 3 3
38340+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
38341+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
38342+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
38343+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
38344+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
38345+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
38346+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
38347+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
38348+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
38349+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
38350+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
38351+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
38352+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
38353+3 2 2 4 4 4
38354+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
38355+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
38356+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
38357+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
38358+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
38359+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
38360+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
38361+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
38362+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
38363+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
38364+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
38365+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
38366+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
38367+4 4 4 4 4 4
38368+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
38369+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
38370+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
38371+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
38372+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
38373+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
38374+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
38375+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
38376+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
38377+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
38378+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
38379+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
38380+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
38381+4 4 4 4 4 4
38382+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
38383+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
38384+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
38385+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
38386+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
38387+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
38388+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
38389+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
38390+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
38391+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
38392+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
38393+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
38394+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
38395+5 5 5 5 5 5
38396+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
38397+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
38398+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
38399+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
38400+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
38401+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38402+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
38403+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
38404+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
38405+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
38406+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
38407+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
38408+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
38409+5 5 5 4 4 4
38410+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
38411+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
38412+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
38413+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
38414+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
38415+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
38416+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
38417+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
38418+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
38419+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
38420+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
38421+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
38422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38423+4 4 4 4 4 4
38424+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
38425+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
38426+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
38427+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
38428+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
38429+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38430+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38431+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
38432+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
38433+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
38434+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
38435+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
38436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38437+4 4 4 4 4 4
38438+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
38439+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
38440+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
38441+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
38442+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
38443+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
38444+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
38445+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
38446+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
38447+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
38448+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
38449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38451+4 4 4 4 4 4
38452+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
38453+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
38454+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
38455+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
38456+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
38457+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38458+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
38459+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
38460+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
38461+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
38462+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
38463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38465+4 4 4 4 4 4
38466+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
38467+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
38468+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
38469+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
38470+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
38471+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
38472+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
38473+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
38474+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
38475+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
38476+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38479+4 4 4 4 4 4
38480+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
38481+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
38482+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
38483+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
38484+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
38485+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
38486+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
38487+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
38488+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
38489+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
38490+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
38491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38493+4 4 4 4 4 4
38494+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
38495+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
38496+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
38497+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
38498+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
38499+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
38500+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
38501+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
38502+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
38503+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
38504+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
38505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38507+4 4 4 4 4 4
38508+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
38509+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
38510+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
38511+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
38512+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
38513+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
38514+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
38515+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
38516+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
38517+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
38518+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38521+4 4 4 4 4 4
38522+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
38523+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
38524+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
38525+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
38526+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38527+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
38528+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
38529+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
38530+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
38531+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
38532+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38535+4 4 4 4 4 4
38536+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
38537+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
38538+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
38539+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
38540+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38541+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
38542+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
38543+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
38544+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
38545+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
38546+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38549+4 4 4 4 4 4
38550+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
38551+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
38552+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
38553+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
38554+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38555+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
38556+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
38557+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
38558+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
38559+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38560+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38563+4 4 4 4 4 4
38564+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
38565+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
38566+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
38567+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
38568+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
38569+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
38570+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
38571+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
38572+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38573+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38574+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38577+4 4 4 4 4 4
38578+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
38579+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
38580+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
38581+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
38582+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38583+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
38584+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
38585+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
38586+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
38587+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38588+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38591+4 4 4 4 4 4
38592+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
38593+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
38594+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
38595+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
38596+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
38597+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
38598+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
38599+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
38600+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38601+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38602+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38604+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38605+4 4 4 4 4 4
38606+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
38607+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
38608+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
38609+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
38610+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
38611+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
38612+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
38613+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
38614+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
38615+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38616+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38618+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38619+4 4 4 4 4 4
38620+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
38621+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
38622+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
38623+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
38624+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
38625+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
38626+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
38627+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
38628+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38629+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38630+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38632+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38633+4 4 4 4 4 4
38634+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
38635+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
38636+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
38637+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
38638+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
38639+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
38640+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
38641+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
38642+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
38643+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38644+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38646+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38647+4 4 4 4 4 4
38648+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
38649+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
38650+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
38651+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
38652+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
38653+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
38654+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
38655+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
38656+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38657+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38658+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38661+4 4 4 4 4 4
38662+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
38663+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
38664+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
38665+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
38666+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
38667+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
38668+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
38669+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
38670+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
38671+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38672+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38675+4 4 4 4 4 4
38676+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
38677+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
38678+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
38679+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
38680+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
38681+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
38682+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38683+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
38684+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
38685+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38686+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38689+4 4 4 4 4 4
38690+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
38691+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
38692+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
38693+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
38694+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
38695+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
38696+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
38697+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
38698+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
38699+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38700+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38703+4 4 4 4 4 4
38704+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
38705+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
38706+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
38707+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
38708+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
38709+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
38710+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
38711+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
38712+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
38713+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38714+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38717+4 4 4 4 4 4
38718+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
38719+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
38720+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
38721+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
38722+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
38723+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
38724+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
38725+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
38726+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
38727+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38728+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38731+4 4 4 4 4 4
38732+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
38733+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
38734+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
38735+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
38736+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
38737+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
38738+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
38739+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
38740+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
38741+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38742+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38745+4 4 4 4 4 4
38746+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
38747+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
38748+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
38749+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
38750+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
38751+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
38752+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
38753+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
38754+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
38755+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
38756+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38759+4 4 4 4 4 4
38760+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
38761+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
38762+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
38763+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
38764+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
38765+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
38766+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
38767+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
38768+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
38769+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
38770+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
38771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38773+4 4 4 4 4 4
38774+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
38775+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
38776+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
38777+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
38778+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
38779+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
38780+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
38781+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
38782+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
38783+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
38784+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38787+4 4 4 4 4 4
38788+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
38789+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
38790+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
38791+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
38792+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
38793+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
38794+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38795+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
38796+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
38797+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
38798+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
38799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38801+4 4 4 4 4 4
38802+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
38803+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
38804+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
38805+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
38806+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
38807+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
38808+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
38809+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
38810+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
38811+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
38812+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38814+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38815+4 4 4 4 4 4
38816+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
38817+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
38818+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
38819+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
38820+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
38821+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
38822+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
38823+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
38824+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
38825+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
38826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38828+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38829+4 4 4 4 4 4
38830+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
38831+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
38832+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
38833+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
38834+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
38835+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
38836+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
38837+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
38838+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
38839+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
38840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38842+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38843+4 4 4 4 4 4
38844+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
38845+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
38846+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
38847+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
38848+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
38849+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
38850+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
38851+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
38852+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
38853+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
38854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38856+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38857+4 4 4 4 4 4
38858+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
38859+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
38860+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
38861+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
38862+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
38863+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
38864+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
38865+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
38866+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
38867+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
38868+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38869+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38870+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38871+4 4 4 4 4 4
38872+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
38873+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
38874+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
38875+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
38876+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
38877+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
38878+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
38879+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
38880+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
38881+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38882+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38883+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38884+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38885+4 4 4 4 4 4
38886+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
38887+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
38888+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
38889+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
38890+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
38891+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
38892+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
38893+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
38894+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
38895+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38896+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38897+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38898+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38899+4 4 4 4 4 4
38900+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
38901+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
38902+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
38903+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
38904+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
38905+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
38906+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
38907+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
38908+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38909+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38910+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38911+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38912+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38913+4 4 4 4 4 4
38914+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
38915+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
38916+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
38917+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
38918+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
38919+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
38920+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
38921+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
38922+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38923+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38924+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38925+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38926+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38927+4 4 4 4 4 4
38928+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
38929+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
38930+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
38931+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
38932+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
38933+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
38934+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
38935+6 6 6 4 0 0 4 0 0 4 3 3 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38938+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38939+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38940+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38941+4 4 4 4 4 4
38942+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
38943+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
38944+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
38945+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
38946+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
38947+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
38948+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
38949+4 0 0 4 3 3 6 6 6 4 4 4 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 4 4 4 4 4 4 4 4 4
38952+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38953+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38954+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38955+4 4 4 4 4 4
38956+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38957+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
38958+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
38959+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
38960+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
38961+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
38962+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
38963+6 6 6 6 6 6 4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38967+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38968+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38969+4 4 4 4 4 4
38970+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38971+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
38972+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
38973+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
38974+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
38975+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
38976+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
38977+5 5 5 5 5 5 4 4 4 4 4 4 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 4 4 4
38981+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38982+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38983+4 4 4 4 4 4
38984+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38985+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38986+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
38987+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
38988+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
38989+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
38990+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
38991+4 3 3 5 5 5 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38996+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
38997+4 4 4 4 4 4
38998+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 5 5 5
39001+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
39002+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
39003+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
39004+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
39005+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
39010+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39011+4 4 4 4 4 4
39012+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
39016+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
39017+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
39018+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
39019+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
39024+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39025+4 4 4 4 4 4
39026+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 6 6 6
39030+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
39031+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
39032+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
39033+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4
39038+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39039+4 4 4 4 4 4
39040+4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5
39044+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
39045+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
39046+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
39047+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39053+4 4 4 4 4 4
39054+4 4 4 4 4 4 4 4 4 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 5 5 5
39058+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
39059+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
39060+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
39061+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39067+4 4 4 4 4 4
39068+4 4 4 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 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
39073+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
39074+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
39075+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
39081+4 4 4 4 4 4
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 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
39087+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
39088+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39089+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4
39095+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 5 5 5 4 3 3 6 6 6
39101+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
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 4 4 4 4 4 4 4 4 4 4 4 4
39104+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39105+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39106+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39107+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39108+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39109+4 4 4 4 4 4
39110+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39111+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39113+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39114+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
39115+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
39116+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39117+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39118+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39119+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39120+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39121+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39122+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
39123+4 4 4 4 4 4
39124diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
39125index 3473e75..c930142 100644
39126--- a/drivers/video/udlfb.c
39127+++ b/drivers/video/udlfb.c
39128@@ -619,11 +619,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
39129 dlfb_urb_completion(urb);
39130
39131 error:
39132- atomic_add(bytes_sent, &dev->bytes_sent);
39133- atomic_add(bytes_identical, &dev->bytes_identical);
39134- atomic_add(width*height*2, &dev->bytes_rendered);
39135+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
39136+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
39137+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
39138 end_cycles = get_cycles();
39139- atomic_add(((unsigned int) ((end_cycles - start_cycles)
39140+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
39141 >> 10)), /* Kcycles */
39142 &dev->cpu_kcycles_used);
39143
39144@@ -744,11 +744,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
39145 dlfb_urb_completion(urb);
39146
39147 error:
39148- atomic_add(bytes_sent, &dev->bytes_sent);
39149- atomic_add(bytes_identical, &dev->bytes_identical);
39150- atomic_add(bytes_rendered, &dev->bytes_rendered);
39151+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
39152+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
39153+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
39154 end_cycles = get_cycles();
39155- atomic_add(((unsigned int) ((end_cycles - start_cycles)
39156+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
39157 >> 10)), /* Kcycles */
39158 &dev->cpu_kcycles_used);
39159 }
39160@@ -1368,7 +1368,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
39161 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39162 struct dlfb_data *dev = fb_info->par;
39163 return snprintf(buf, PAGE_SIZE, "%u\n",
39164- atomic_read(&dev->bytes_rendered));
39165+ atomic_read_unchecked(&dev->bytes_rendered));
39166 }
39167
39168 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
39169@@ -1376,7 +1376,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
39170 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39171 struct dlfb_data *dev = fb_info->par;
39172 return snprintf(buf, PAGE_SIZE, "%u\n",
39173- atomic_read(&dev->bytes_identical));
39174+ atomic_read_unchecked(&dev->bytes_identical));
39175 }
39176
39177 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
39178@@ -1384,7 +1384,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
39179 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39180 struct dlfb_data *dev = fb_info->par;
39181 return snprintf(buf, PAGE_SIZE, "%u\n",
39182- atomic_read(&dev->bytes_sent));
39183+ atomic_read_unchecked(&dev->bytes_sent));
39184 }
39185
39186 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
39187@@ -1392,7 +1392,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
39188 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39189 struct dlfb_data *dev = fb_info->par;
39190 return snprintf(buf, PAGE_SIZE, "%u\n",
39191- atomic_read(&dev->cpu_kcycles_used));
39192+ atomic_read_unchecked(&dev->cpu_kcycles_used));
39193 }
39194
39195 static ssize_t edid_show(
39196@@ -1449,10 +1449,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
39197 struct fb_info *fb_info = dev_get_drvdata(fbdev);
39198 struct dlfb_data *dev = fb_info->par;
39199
39200- atomic_set(&dev->bytes_rendered, 0);
39201- atomic_set(&dev->bytes_identical, 0);
39202- atomic_set(&dev->bytes_sent, 0);
39203- atomic_set(&dev->cpu_kcycles_used, 0);
39204+ atomic_set_unchecked(&dev->bytes_rendered, 0);
39205+ atomic_set_unchecked(&dev->bytes_identical, 0);
39206+ atomic_set_unchecked(&dev->bytes_sent, 0);
39207+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
39208
39209 return count;
39210 }
39211diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
39212index 7f8472c..9842e87 100644
39213--- a/drivers/video/uvesafb.c
39214+++ b/drivers/video/uvesafb.c
39215@@ -19,6 +19,7 @@
39216 #include <linux/io.h>
39217 #include <linux/mutex.h>
39218 #include <linux/slab.h>
39219+#include <linux/moduleloader.h>
39220 #include <video/edid.h>
39221 #include <video/uvesafb.h>
39222 #ifdef CONFIG_X86
39223@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
39224 NULL,
39225 };
39226
39227- return call_usermodehelper(v86d_path, argv, envp, 1);
39228+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
39229 }
39230
39231 /*
39232@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
39233 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
39234 par->pmi_setpal = par->ypan = 0;
39235 } else {
39236+
39237+#ifdef CONFIG_PAX_KERNEXEC
39238+#ifdef CONFIG_MODULES
39239+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
39240+#endif
39241+ if (!par->pmi_code) {
39242+ par->pmi_setpal = par->ypan = 0;
39243+ return 0;
39244+ }
39245+#endif
39246+
39247 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
39248 + task->t.regs.edi);
39249+
39250+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39251+ pax_open_kernel();
39252+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
39253+ pax_close_kernel();
39254+
39255+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
39256+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
39257+#else
39258 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
39259 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
39260+#endif
39261+
39262 printk(KERN_INFO "uvesafb: protected mode interface info at "
39263 "%04x:%04x\n",
39264 (u16)task->t.regs.es, (u16)task->t.regs.edi);
39265@@ -1821,6 +1844,11 @@ out:
39266 if (par->vbe_modes)
39267 kfree(par->vbe_modes);
39268
39269+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39270+ if (par->pmi_code)
39271+ module_free_exec(NULL, par->pmi_code);
39272+#endif
39273+
39274 framebuffer_release(info);
39275 return err;
39276 }
39277@@ -1847,6 +1875,12 @@ static int uvesafb_remove(struct platform_device *dev)
39278 kfree(par->vbe_state_orig);
39279 if (par->vbe_state_saved)
39280 kfree(par->vbe_state_saved);
39281+
39282+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39283+ if (par->pmi_code)
39284+ module_free_exec(NULL, par->pmi_code);
39285+#endif
39286+
39287 }
39288
39289 framebuffer_release(info);
39290diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
39291index 501b340..86bd4cf 100644
39292--- a/drivers/video/vesafb.c
39293+++ b/drivers/video/vesafb.c
39294@@ -9,6 +9,7 @@
39295 */
39296
39297 #include <linux/module.h>
39298+#include <linux/moduleloader.h>
39299 #include <linux/kernel.h>
39300 #include <linux/errno.h>
39301 #include <linux/string.h>
39302@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
39303 static int vram_total __initdata; /* Set total amount of memory */
39304 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
39305 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
39306-static void (*pmi_start)(void) __read_mostly;
39307-static void (*pmi_pal) (void) __read_mostly;
39308+static void (*pmi_start)(void) __read_only;
39309+static void (*pmi_pal) (void) __read_only;
39310 static int depth __read_mostly;
39311 static int vga_compat __read_mostly;
39312 /* --------------------------------------------------------------------- */
39313@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
39314 unsigned int size_vmode;
39315 unsigned int size_remap;
39316 unsigned int size_total;
39317+ void *pmi_code = NULL;
39318
39319 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
39320 return -ENODEV;
39321@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
39322 size_remap = size_total;
39323 vesafb_fix.smem_len = size_remap;
39324
39325-#ifndef __i386__
39326- screen_info.vesapm_seg = 0;
39327-#endif
39328-
39329 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
39330 printk(KERN_WARNING
39331 "vesafb: cannot reserve video memory at 0x%lx\n",
39332@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
39333 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
39334 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
39335
39336+#ifdef __i386__
39337+
39338+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39339+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
39340+ if (!pmi_code)
39341+#elif !defined(CONFIG_PAX_KERNEXEC)
39342+ if (0)
39343+#endif
39344+
39345+#endif
39346+ screen_info.vesapm_seg = 0;
39347+
39348 if (screen_info.vesapm_seg) {
39349- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
39350- screen_info.vesapm_seg,screen_info.vesapm_off);
39351+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
39352+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
39353 }
39354
39355 if (screen_info.vesapm_seg < 0xc000)
39356@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
39357
39358 if (ypan || pmi_setpal) {
39359 unsigned short *pmi_base;
39360+
39361 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
39362- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
39363- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
39364+
39365+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39366+ pax_open_kernel();
39367+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
39368+#else
39369+ pmi_code = pmi_base;
39370+#endif
39371+
39372+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
39373+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
39374+
39375+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39376+ pmi_start = ktva_ktla(pmi_start);
39377+ pmi_pal = ktva_ktla(pmi_pal);
39378+ pax_close_kernel();
39379+#endif
39380+
39381 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
39382 if (pmi_base[3]) {
39383 printk(KERN_INFO "vesafb: pmi: ports = ");
39384@@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
39385 info->node, info->fix.id);
39386 return 0;
39387 err:
39388+
39389+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
39390+ module_free_exec(NULL, pmi_code);
39391+#endif
39392+
39393 if (info->screen_base)
39394 iounmap(info->screen_base);
39395 framebuffer_release(info);
39396diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
39397index 88714ae..16c2e11 100644
39398--- a/drivers/video/via/via_clock.h
39399+++ b/drivers/video/via/via_clock.h
39400@@ -56,7 +56,7 @@ struct via_clock {
39401
39402 void (*set_engine_pll_state)(u8 state);
39403 void (*set_engine_pll)(struct via_pll_config config);
39404-};
39405+} __no_const;
39406
39407
39408 static inline u32 get_pll_internal_frequency(u32 ref_freq,
39409diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
39410index e56c934..fc22f4b 100644
39411--- a/drivers/xen/xen-pciback/conf_space.h
39412+++ b/drivers/xen/xen-pciback/conf_space.h
39413@@ -44,15 +44,15 @@ struct config_field {
39414 struct {
39415 conf_dword_write write;
39416 conf_dword_read read;
39417- } dw;
39418+ } __no_const dw;
39419 struct {
39420 conf_word_write write;
39421 conf_word_read read;
39422- } w;
39423+ } __no_const w;
39424 struct {
39425 conf_byte_write write;
39426 conf_byte_read read;
39427- } b;
39428+ } __no_const b;
39429 } u;
39430 struct list_head list;
39431 };
39432diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
39433index 879ed88..bc03a01 100644
39434--- a/fs/9p/vfs_inode.c
39435+++ b/fs/9p/vfs_inode.c
39436@@ -1286,7 +1286,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
39437 void
39438 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
39439 {
39440- char *s = nd_get_link(nd);
39441+ const char *s = nd_get_link(nd);
39442
39443 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
39444 IS_ERR(s) ? "<error>" : s);
39445diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
39446index 79e2ca7..5828ad1 100644
39447--- a/fs/Kconfig.binfmt
39448+++ b/fs/Kconfig.binfmt
39449@@ -86,7 +86,7 @@ config HAVE_AOUT
39450
39451 config BINFMT_AOUT
39452 tristate "Kernel support for a.out and ECOFF binaries"
39453- depends on HAVE_AOUT
39454+ depends on HAVE_AOUT && BROKEN
39455 ---help---
39456 A.out (Assembler.OUTput) is a set of formats for libraries and
39457 executables used in the earliest versions of UNIX. Linux used
39458diff --git a/fs/aio.c b/fs/aio.c
39459index 969beb0..09fab51 100644
39460--- a/fs/aio.c
39461+++ b/fs/aio.c
39462@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx *ctx)
39463 size += sizeof(struct io_event) * nr_events;
39464 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
39465
39466- if (nr_pages < 0)
39467+ if (nr_pages <= 0)
39468 return -EINVAL;
39469
39470 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
39471@@ -1461,22 +1461,27 @@ static ssize_t aio_fsync(struct kiocb *iocb)
39472 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
39473 {
39474 ssize_t ret;
39475+ struct iovec iovstack;
39476
39477 #ifdef CONFIG_COMPAT
39478 if (compat)
39479 ret = compat_rw_copy_check_uvector(type,
39480 (struct compat_iovec __user *)kiocb->ki_buf,
39481- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
39482+ kiocb->ki_nbytes, 1, &iovstack,
39483 &kiocb->ki_iovec, 1);
39484 else
39485 #endif
39486 ret = rw_copy_check_uvector(type,
39487 (struct iovec __user *)kiocb->ki_buf,
39488- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
39489+ kiocb->ki_nbytes, 1, &iovstack,
39490 &kiocb->ki_iovec, 1);
39491 if (ret < 0)
39492 goto out;
39493
39494+ if (kiocb->ki_iovec == &iovstack) {
39495+ kiocb->ki_inline_vec = iovstack;
39496+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
39497+ }
39498 kiocb->ki_nr_segs = kiocb->ki_nbytes;
39499 kiocb->ki_cur_seg = 0;
39500 /* ki_nbytes/left now reflect bytes instead of segs */
39501diff --git a/fs/attr.c b/fs/attr.c
39502index 7ee7ba4..0c61a60 100644
39503--- a/fs/attr.c
39504+++ b/fs/attr.c
39505@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
39506 unsigned long limit;
39507
39508 limit = rlimit(RLIMIT_FSIZE);
39509+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
39510 if (limit != RLIM_INFINITY && offset > limit)
39511 goto out_sig;
39512 if (offset > inode->i_sb->s_maxbytes)
39513diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
39514index e1fbdee..cd5ea56 100644
39515--- a/fs/autofs4/waitq.c
39516+++ b/fs/autofs4/waitq.c
39517@@ -60,7 +60,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
39518 {
39519 unsigned long sigpipe, flags;
39520 mm_segment_t fs;
39521- const char *data = (const char *)addr;
39522+ const char __user *data = (const char __force_user *)addr;
39523 ssize_t wr = 0;
39524
39525 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
39526diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
39527index 8342ca6..82fd192 100644
39528--- a/fs/befs/linuxvfs.c
39529+++ b/fs/befs/linuxvfs.c
39530@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
39531 {
39532 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
39533 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
39534- char *link = nd_get_link(nd);
39535+ const char *link = nd_get_link(nd);
39536 if (!IS_ERR(link))
39537 kfree(link);
39538 }
39539diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
39540index a6395bd..a5b24c4 100644
39541--- a/fs/binfmt_aout.c
39542+++ b/fs/binfmt_aout.c
39543@@ -16,6 +16,7 @@
39544 #include <linux/string.h>
39545 #include <linux/fs.h>
39546 #include <linux/file.h>
39547+#include <linux/security.h>
39548 #include <linux/stat.h>
39549 #include <linux/fcntl.h>
39550 #include <linux/ptrace.h>
39551@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
39552 #endif
39553 # define START_STACK(u) ((void __user *)u.start_stack)
39554
39555+ memset(&dump, 0, sizeof(dump));
39556+
39557 fs = get_fs();
39558 set_fs(KERNEL_DS);
39559 has_dumped = 1;
39560@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
39561
39562 /* If the size of the dump file exceeds the rlimit, then see what would happen
39563 if we wrote the stack, but not the data area. */
39564+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
39565 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
39566 dump.u_dsize = 0;
39567
39568 /* Make sure we have enough room to write the stack and data areas. */
39569+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
39570 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
39571 dump.u_ssize = 0;
39572
39573@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
39574 rlim = rlimit(RLIMIT_DATA);
39575 if (rlim >= RLIM_INFINITY)
39576 rlim = ~0;
39577+
39578+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
39579 if (ex.a_data + ex.a_bss > rlim)
39580 return -ENOMEM;
39581
39582@@ -262,6 +269,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
39583 install_exec_creds(bprm);
39584 current->flags &= ~PF_FORKNOEXEC;
39585
39586+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
39587+ current->mm->pax_flags = 0UL;
39588+#endif
39589+
39590+#ifdef CONFIG_PAX_PAGEEXEC
39591+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
39592+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
39593+
39594+#ifdef CONFIG_PAX_EMUTRAMP
39595+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
39596+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
39597+#endif
39598+
39599+#ifdef CONFIG_PAX_MPROTECT
39600+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
39601+ current->mm->pax_flags |= MF_PAX_MPROTECT;
39602+#endif
39603+
39604+ }
39605+#endif
39606+
39607 if (N_MAGIC(ex) == OMAGIC) {
39608 unsigned long text_addr, map_size;
39609 loff_t pos;
39610@@ -334,7 +362,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
39611
39612 down_write(&current->mm->mmap_sem);
39613 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
39614- PROT_READ | PROT_WRITE | PROT_EXEC,
39615+ PROT_READ | PROT_WRITE,
39616 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
39617 fd_offset + ex.a_text);
39618 up_write(&current->mm->mmap_sem);
39619diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
39620index 21ac5ee..31d14e9 100644
39621--- a/fs/binfmt_elf.c
39622+++ b/fs/binfmt_elf.c
39623@@ -32,6 +32,7 @@
39624 #include <linux/elf.h>
39625 #include <linux/utsname.h>
39626 #include <linux/coredump.h>
39627+#include <linux/xattr.h>
39628 #include <asm/uaccess.h>
39629 #include <asm/param.h>
39630 #include <asm/page.h>
39631@@ -51,6 +52,10 @@ static int elf_core_dump(struct coredump_params *cprm);
39632 #define elf_core_dump NULL
39633 #endif
39634
39635+#ifdef CONFIG_PAX_MPROTECT
39636+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
39637+#endif
39638+
39639 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
39640 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
39641 #else
39642@@ -70,6 +75,11 @@ static struct linux_binfmt elf_format = {
39643 .load_binary = load_elf_binary,
39644 .load_shlib = load_elf_library,
39645 .core_dump = elf_core_dump,
39646+
39647+#ifdef CONFIG_PAX_MPROTECT
39648+ .handle_mprotect= elf_handle_mprotect,
39649+#endif
39650+
39651 .min_coredump = ELF_EXEC_PAGESIZE,
39652 };
39653
39654@@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
39655
39656 static int set_brk(unsigned long start, unsigned long end)
39657 {
39658+ unsigned long e = end;
39659+
39660 start = ELF_PAGEALIGN(start);
39661 end = ELF_PAGEALIGN(end);
39662 if (end > start) {
39663@@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
39664 if (BAD_ADDR(addr))
39665 return addr;
39666 }
39667- current->mm->start_brk = current->mm->brk = end;
39668+ current->mm->start_brk = current->mm->brk = e;
39669 return 0;
39670 }
39671
39672@@ -148,12 +160,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
39673 elf_addr_t __user *u_rand_bytes;
39674 const char *k_platform = ELF_PLATFORM;
39675 const char *k_base_platform = ELF_BASE_PLATFORM;
39676- unsigned char k_rand_bytes[16];
39677+ u32 k_rand_bytes[4];
39678 int items;
39679 elf_addr_t *elf_info;
39680 int ei_index = 0;
39681 const struct cred *cred = current_cred();
39682 struct vm_area_struct *vma;
39683+ unsigned long saved_auxv[AT_VECTOR_SIZE];
39684
39685 /*
39686 * In some cases (e.g. Hyper-Threading), we want to avoid L1
39687@@ -195,8 +208,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
39688 * Generate 16 random bytes for userspace PRNG seeding.
39689 */
39690 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
39691- u_rand_bytes = (elf_addr_t __user *)
39692- STACK_ALLOC(p, sizeof(k_rand_bytes));
39693+ srandom32(k_rand_bytes[0] ^ random32());
39694+ srandom32(k_rand_bytes[1] ^ random32());
39695+ srandom32(k_rand_bytes[2] ^ random32());
39696+ srandom32(k_rand_bytes[3] ^ random32());
39697+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
39698+ u_rand_bytes = (elf_addr_t __user *) p;
39699 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
39700 return -EFAULT;
39701
39702@@ -308,9 +325,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
39703 return -EFAULT;
39704 current->mm->env_end = p;
39705
39706+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
39707+
39708 /* Put the elf_info on the stack in the right place. */
39709 sp = (elf_addr_t __user *)envp + 1;
39710- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
39711+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
39712 return -EFAULT;
39713 return 0;
39714 }
39715@@ -381,10 +400,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
39716 {
39717 struct elf_phdr *elf_phdata;
39718 struct elf_phdr *eppnt;
39719- unsigned long load_addr = 0;
39720+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
39721 int load_addr_set = 0;
39722 unsigned long last_bss = 0, elf_bss = 0;
39723- unsigned long error = ~0UL;
39724+ unsigned long error = -EINVAL;
39725 unsigned long total_size;
39726 int retval, i, size;
39727
39728@@ -430,6 +449,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
39729 goto out_close;
39730 }
39731
39732+#ifdef CONFIG_PAX_SEGMEXEC
39733+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
39734+ pax_task_size = SEGMEXEC_TASK_SIZE;
39735+#endif
39736+
39737 eppnt = elf_phdata;
39738 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
39739 if (eppnt->p_type == PT_LOAD) {
39740@@ -473,8 +497,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
39741 k = load_addr + eppnt->p_vaddr;
39742 if (BAD_ADDR(k) ||
39743 eppnt->p_filesz > eppnt->p_memsz ||
39744- eppnt->p_memsz > TASK_SIZE ||
39745- TASK_SIZE - eppnt->p_memsz < k) {
39746+ eppnt->p_memsz > pax_task_size ||
39747+ pax_task_size - eppnt->p_memsz < k) {
39748 error = -ENOMEM;
39749 goto out_close;
39750 }
39751@@ -528,6 +552,351 @@ out:
39752 return error;
39753 }
39754
39755+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
39756+{
39757+ unsigned long pax_flags = 0UL;
39758+
39759+#ifdef CONFIG_PAX_PT_PAX_FLAGS
39760+
39761+#ifdef CONFIG_PAX_PAGEEXEC
39762+ if (elf_phdata->p_flags & PF_PAGEEXEC)
39763+ pax_flags |= MF_PAX_PAGEEXEC;
39764+#endif
39765+
39766+#ifdef CONFIG_PAX_SEGMEXEC
39767+ if (elf_phdata->p_flags & PF_SEGMEXEC)
39768+ pax_flags |= MF_PAX_SEGMEXEC;
39769+#endif
39770+
39771+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39772+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39773+ if ((__supported_pte_mask & _PAGE_NX))
39774+ pax_flags &= ~MF_PAX_SEGMEXEC;
39775+ else
39776+ pax_flags &= ~MF_PAX_PAGEEXEC;
39777+ }
39778+#endif
39779+
39780+#ifdef CONFIG_PAX_EMUTRAMP
39781+ if (elf_phdata->p_flags & PF_EMUTRAMP)
39782+ pax_flags |= MF_PAX_EMUTRAMP;
39783+#endif
39784+
39785+#ifdef CONFIG_PAX_MPROTECT
39786+ if (elf_phdata->p_flags & PF_MPROTECT)
39787+ pax_flags |= MF_PAX_MPROTECT;
39788+#endif
39789+
39790+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
39791+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
39792+ pax_flags |= MF_PAX_RANDMMAP;
39793+#endif
39794+
39795+#endif
39796+
39797+ return pax_flags;
39798+}
39799+
39800+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
39801+{
39802+ unsigned long pax_flags = 0UL;
39803+
39804+#ifdef CONFIG_PAX_PT_PAX_FLAGS
39805+
39806+#ifdef CONFIG_PAX_PAGEEXEC
39807+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
39808+ pax_flags |= MF_PAX_PAGEEXEC;
39809+#endif
39810+
39811+#ifdef CONFIG_PAX_SEGMEXEC
39812+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
39813+ pax_flags |= MF_PAX_SEGMEXEC;
39814+#endif
39815+
39816+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39817+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39818+ if ((__supported_pte_mask & _PAGE_NX))
39819+ pax_flags &= ~MF_PAX_SEGMEXEC;
39820+ else
39821+ pax_flags &= ~MF_PAX_PAGEEXEC;
39822+ }
39823+#endif
39824+
39825+#ifdef CONFIG_PAX_EMUTRAMP
39826+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
39827+ pax_flags |= MF_PAX_EMUTRAMP;
39828+#endif
39829+
39830+#ifdef CONFIG_PAX_MPROTECT
39831+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
39832+ pax_flags |= MF_PAX_MPROTECT;
39833+#endif
39834+
39835+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
39836+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
39837+ pax_flags |= MF_PAX_RANDMMAP;
39838+#endif
39839+
39840+#endif
39841+
39842+ return pax_flags;
39843+}
39844+
39845+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
39846+{
39847+ unsigned long pax_flags = 0UL;
39848+
39849+#ifdef CONFIG_PAX_EI_PAX
39850+
39851+#ifdef CONFIG_PAX_PAGEEXEC
39852+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
39853+ pax_flags |= MF_PAX_PAGEEXEC;
39854+#endif
39855+
39856+#ifdef CONFIG_PAX_SEGMEXEC
39857+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
39858+ pax_flags |= MF_PAX_SEGMEXEC;
39859+#endif
39860+
39861+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39862+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39863+ if ((__supported_pte_mask & _PAGE_NX))
39864+ pax_flags &= ~MF_PAX_SEGMEXEC;
39865+ else
39866+ pax_flags &= ~MF_PAX_PAGEEXEC;
39867+ }
39868+#endif
39869+
39870+#ifdef CONFIG_PAX_EMUTRAMP
39871+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
39872+ pax_flags |= MF_PAX_EMUTRAMP;
39873+#endif
39874+
39875+#ifdef CONFIG_PAX_MPROTECT
39876+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
39877+ pax_flags |= MF_PAX_MPROTECT;
39878+#endif
39879+
39880+#ifdef CONFIG_PAX_ASLR
39881+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
39882+ pax_flags |= MF_PAX_RANDMMAP;
39883+#endif
39884+
39885+#else
39886+
39887+#ifdef CONFIG_PAX_PAGEEXEC
39888+ pax_flags |= MF_PAX_PAGEEXEC;
39889+#endif
39890+
39891+#ifdef CONFIG_PAX_MPROTECT
39892+ pax_flags |= MF_PAX_MPROTECT;
39893+#endif
39894+
39895+#ifdef CONFIG_PAX_RANDMMAP
39896+ pax_flags |= MF_PAX_RANDMMAP;
39897+#endif
39898+
39899+#ifdef CONFIG_PAX_SEGMEXEC
39900+ if (!(__supported_pte_mask & _PAGE_NX)) {
39901+ pax_flags &= ~MF_PAX_PAGEEXEC;
39902+ pax_flags |= MF_PAX_SEGMEXEC;
39903+ }
39904+#endif
39905+
39906+#endif
39907+
39908+ return pax_flags;
39909+}
39910+
39911+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
39912+{
39913+
39914+#ifdef CONFIG_PAX_PT_PAX_FLAGS
39915+ unsigned long i;
39916+
39917+ for (i = 0UL; i < elf_ex->e_phnum; i++)
39918+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
39919+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
39920+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
39921+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
39922+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
39923+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
39924+ return ~0UL;
39925+
39926+#ifdef CONFIG_PAX_SOFTMODE
39927+ if (pax_softmode)
39928+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
39929+ else
39930+#endif
39931+
39932+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
39933+ break;
39934+ }
39935+#endif
39936+
39937+ return ~0UL;
39938+}
39939+
39940+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
39941+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
39942+{
39943+ unsigned long pax_flags = 0UL;
39944+
39945+#ifdef CONFIG_PAX_PAGEEXEC
39946+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
39947+ pax_flags |= MF_PAX_PAGEEXEC;
39948+#endif
39949+
39950+#ifdef CONFIG_PAX_SEGMEXEC
39951+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
39952+ pax_flags |= MF_PAX_SEGMEXEC;
39953+#endif
39954+
39955+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39956+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39957+ if ((__supported_pte_mask & _PAGE_NX))
39958+ pax_flags &= ~MF_PAX_SEGMEXEC;
39959+ else
39960+ pax_flags &= ~MF_PAX_PAGEEXEC;
39961+ }
39962+#endif
39963+
39964+#ifdef CONFIG_PAX_EMUTRAMP
39965+ if (pax_flags_softmode & MF_PAX_EMUTRAMP)
39966+ pax_flags |= MF_PAX_EMUTRAMP;
39967+#endif
39968+
39969+#ifdef CONFIG_PAX_MPROTECT
39970+ if (pax_flags_softmode & MF_PAX_MPROTECT)
39971+ pax_flags |= MF_PAX_MPROTECT;
39972+#endif
39973+
39974+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
39975+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
39976+ pax_flags |= MF_PAX_RANDMMAP;
39977+#endif
39978+
39979+ return pax_flags;
39980+}
39981+
39982+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
39983+{
39984+ unsigned long pax_flags = 0UL;
39985+
39986+#ifdef CONFIG_PAX_PAGEEXEC
39987+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
39988+ pax_flags |= MF_PAX_PAGEEXEC;
39989+#endif
39990+
39991+#ifdef CONFIG_PAX_SEGMEXEC
39992+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
39993+ pax_flags |= MF_PAX_SEGMEXEC;
39994+#endif
39995+
39996+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
39997+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
39998+ if ((__supported_pte_mask & _PAGE_NX))
39999+ pax_flags &= ~MF_PAX_SEGMEXEC;
40000+ else
40001+ pax_flags &= ~MF_PAX_PAGEEXEC;
40002+ }
40003+#endif
40004+
40005+#ifdef CONFIG_PAX_EMUTRAMP
40006+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
40007+ pax_flags |= MF_PAX_EMUTRAMP;
40008+#endif
40009+
40010+#ifdef CONFIG_PAX_MPROTECT
40011+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
40012+ pax_flags |= MF_PAX_MPROTECT;
40013+#endif
40014+
40015+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
40016+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
40017+ pax_flags |= MF_PAX_RANDMMAP;
40018+#endif
40019+
40020+ return pax_flags;
40021+}
40022+#endif
40023+
40024+static unsigned long pax_parse_xattr_pax(struct file * const file)
40025+{
40026+
40027+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
40028+ ssize_t xattr_size, i;
40029+ unsigned char xattr_value[5];
40030+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
40031+
40032+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
40033+ if (xattr_size <= 0)
40034+ return ~0UL;
40035+
40036+ for (i = 0; i < xattr_size; i++)
40037+ switch (xattr_value[i]) {
40038+ default:
40039+ return ~0UL;
40040+
40041+#define parse_flag(option1, option2, flag) \
40042+ case option1: \
40043+ pax_flags_hardmode |= MF_PAX_##flag; \
40044+ break; \
40045+ case option2: \
40046+ pax_flags_softmode |= MF_PAX_##flag; \
40047+ break;
40048+
40049+ parse_flag('p', 'P', PAGEEXEC);
40050+ parse_flag('e', 'E', EMUTRAMP);
40051+ parse_flag('m', 'M', MPROTECT);
40052+ parse_flag('r', 'R', RANDMMAP);
40053+ parse_flag('s', 'S', SEGMEXEC);
40054+
40055+#undef parse_flag
40056+ }
40057+
40058+ if (pax_flags_hardmode & pax_flags_softmode)
40059+ return ~0UL;
40060+
40061+#ifdef CONFIG_PAX_SOFTMODE
40062+ if (pax_softmode)
40063+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
40064+ else
40065+#endif
40066+
40067+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
40068+#else
40069+ return ~0UL;
40070+#endif
40071+
40072+}
40073+
40074+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
40075+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
40076+{
40077+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
40078+
40079+ pax_flags = pax_parse_ei_pax(elf_ex);
40080+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
40081+ xattr_pax_flags = pax_parse_xattr_pax(file);
40082+
40083+ if (pt_pax_flags == ~0UL)
40084+ pt_pax_flags = xattr_pax_flags;
40085+ else if (xattr_pax_flags == ~0UL)
40086+ xattr_pax_flags = pt_pax_flags;
40087+ if (pt_pax_flags != xattr_pax_flags)
40088+ return -EINVAL;
40089+ if (pt_pax_flags != ~0UL)
40090+ pax_flags = pt_pax_flags;
40091+
40092+ if (0 > pax_check_flags(&pax_flags))
40093+ return -EINVAL;
40094+
40095+ current->mm->pax_flags = pax_flags;
40096+ return 0;
40097+}
40098+#endif
40099+
40100 /*
40101 * These are the functions used to load ELF style executables and shared
40102 * libraries. There is no binary dependent code anywhere else.
40103@@ -544,6 +913,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
40104 {
40105 unsigned int random_variable = 0;
40106
40107+#ifdef CONFIG_PAX_RANDUSTACK
40108+ if (randomize_va_space)
40109+ return stack_top - current->mm->delta_stack;
40110+#endif
40111+
40112 if ((current->flags & PF_RANDOMIZE) &&
40113 !(current->personality & ADDR_NO_RANDOMIZE)) {
40114 random_variable = get_random_int() & STACK_RND_MASK;
40115@@ -562,7 +936,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40116 unsigned long load_addr = 0, load_bias = 0;
40117 int load_addr_set = 0;
40118 char * elf_interpreter = NULL;
40119- unsigned long error;
40120+ unsigned long error = 0;
40121 struct elf_phdr *elf_ppnt, *elf_phdata;
40122 unsigned long elf_bss, elf_brk;
40123 int retval, i;
40124@@ -572,11 +946,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40125 unsigned long start_code, end_code, start_data, end_data;
40126 unsigned long reloc_func_desc __maybe_unused = 0;
40127 int executable_stack = EXSTACK_DEFAULT;
40128- unsigned long def_flags = 0;
40129 struct {
40130 struct elfhdr elf_ex;
40131 struct elfhdr interp_elf_ex;
40132 } *loc;
40133+ unsigned long pax_task_size = TASK_SIZE;
40134
40135 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
40136 if (!loc) {
40137@@ -713,11 +1087,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40138
40139 /* OK, This is the point of no return */
40140 current->flags &= ~PF_FORKNOEXEC;
40141- current->mm->def_flags = def_flags;
40142+
40143+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
40144+ current->mm->pax_flags = 0UL;
40145+#endif
40146+
40147+#ifdef CONFIG_PAX_DLRESOLVE
40148+ current->mm->call_dl_resolve = 0UL;
40149+#endif
40150+
40151+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
40152+ current->mm->call_syscall = 0UL;
40153+#endif
40154+
40155+#ifdef CONFIG_PAX_ASLR
40156+ current->mm->delta_mmap = 0UL;
40157+ current->mm->delta_stack = 0UL;
40158+#endif
40159+
40160+ current->mm->def_flags = 0;
40161+
40162+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
40163+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
40164+ send_sig(SIGKILL, current, 0);
40165+ goto out_free_dentry;
40166+ }
40167+#endif
40168+
40169+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
40170+ pax_set_initial_flags(bprm);
40171+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
40172+ if (pax_set_initial_flags_func)
40173+ (pax_set_initial_flags_func)(bprm);
40174+#endif
40175+
40176+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
40177+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
40178+ current->mm->context.user_cs_limit = PAGE_SIZE;
40179+ current->mm->def_flags |= VM_PAGEEXEC;
40180+ }
40181+#endif
40182+
40183+#ifdef CONFIG_PAX_SEGMEXEC
40184+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
40185+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
40186+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
40187+ pax_task_size = SEGMEXEC_TASK_SIZE;
40188+ current->mm->def_flags |= VM_NOHUGEPAGE;
40189+ }
40190+#endif
40191+
40192+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
40193+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
40194+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
40195+ put_cpu();
40196+ }
40197+#endif
40198
40199 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
40200 may depend on the personality. */
40201 SET_PERSONALITY(loc->elf_ex);
40202+
40203+#ifdef CONFIG_PAX_ASLR
40204+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
40205+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
40206+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
40207+ }
40208+#endif
40209+
40210+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
40211+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
40212+ executable_stack = EXSTACK_DISABLE_X;
40213+ current->personality &= ~READ_IMPLIES_EXEC;
40214+ } else
40215+#endif
40216+
40217 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
40218 current->personality |= READ_IMPLIES_EXEC;
40219
40220@@ -808,6 +1252,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40221 #else
40222 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
40223 #endif
40224+
40225+#ifdef CONFIG_PAX_RANDMMAP
40226+ /* PaX: randomize base address at the default exe base if requested */
40227+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
40228+#ifdef CONFIG_SPARC64
40229+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
40230+#else
40231+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
40232+#endif
40233+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
40234+ elf_flags |= MAP_FIXED;
40235+ }
40236+#endif
40237+
40238 }
40239
40240 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
40241@@ -840,9 +1298,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40242 * allowed task size. Note that p_filesz must always be
40243 * <= p_memsz so it is only necessary to check p_memsz.
40244 */
40245- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
40246- elf_ppnt->p_memsz > TASK_SIZE ||
40247- TASK_SIZE - elf_ppnt->p_memsz < k) {
40248+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
40249+ elf_ppnt->p_memsz > pax_task_size ||
40250+ pax_task_size - elf_ppnt->p_memsz < k) {
40251 /* set_brk can never work. Avoid overflows. */
40252 send_sig(SIGKILL, current, 0);
40253 retval = -EINVAL;
40254@@ -870,6 +1328,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40255 start_data += load_bias;
40256 end_data += load_bias;
40257
40258+#ifdef CONFIG_PAX_RANDMMAP
40259+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
40260+ elf_brk += PAGE_SIZE + ((pax_get_random_long() & ~PAGE_MASK) << 4);
40261+#endif
40262+
40263 /* Calling set_brk effectively mmaps the pages that we need
40264 * for the bss and break sections. We must do this before
40265 * mapping in the interpreter, to make sure it doesn't wind
40266@@ -881,9 +1344,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
40267 goto out_free_dentry;
40268 }
40269 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
40270- send_sig(SIGSEGV, current, 0);
40271- retval = -EFAULT; /* Nobody gets to see this, but.. */
40272- goto out_free_dentry;
40273+ /*
40274+ * This bss-zeroing can fail if the ELF
40275+ * file specifies odd protections. So
40276+ * we don't check the return value
40277+ */
40278 }
40279
40280 if (elf_interpreter) {
40281@@ -1098,7 +1563,7 @@ out:
40282 * Decide what to dump of a segment, part, all or none.
40283 */
40284 static unsigned long vma_dump_size(struct vm_area_struct *vma,
40285- unsigned long mm_flags)
40286+ unsigned long mm_flags, long signr)
40287 {
40288 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
40289
40290@@ -1132,7 +1597,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
40291 if (vma->vm_file == NULL)
40292 return 0;
40293
40294- if (FILTER(MAPPED_PRIVATE))
40295+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
40296 goto whole;
40297
40298 /*
40299@@ -1354,9 +1819,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
40300 {
40301 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
40302 int i = 0;
40303- do
40304+ do {
40305 i += 2;
40306- while (auxv[i - 2] != AT_NULL);
40307+ } while (auxv[i - 2] != AT_NULL);
40308 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
40309 }
40310
40311@@ -1862,14 +2327,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
40312 }
40313
40314 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
40315- unsigned long mm_flags)
40316+ struct coredump_params *cprm)
40317 {
40318 struct vm_area_struct *vma;
40319 size_t size = 0;
40320
40321 for (vma = first_vma(current, gate_vma); vma != NULL;
40322 vma = next_vma(vma, gate_vma))
40323- size += vma_dump_size(vma, mm_flags);
40324+ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
40325 return size;
40326 }
40327
40328@@ -1963,7 +2428,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40329
40330 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
40331
40332- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
40333+ offset += elf_core_vma_data_size(gate_vma, cprm);
40334 offset += elf_core_extra_data_size();
40335 e_shoff = offset;
40336
40337@@ -1977,10 +2442,12 @@ static int elf_core_dump(struct coredump_params *cprm)
40338 offset = dataoff;
40339
40340 size += sizeof(*elf);
40341+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
40342 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
40343 goto end_coredump;
40344
40345 size += sizeof(*phdr4note);
40346+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
40347 if (size > cprm->limit
40348 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
40349 goto end_coredump;
40350@@ -1994,7 +2461,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40351 phdr.p_offset = offset;
40352 phdr.p_vaddr = vma->vm_start;
40353 phdr.p_paddr = 0;
40354- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
40355+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
40356 phdr.p_memsz = vma->vm_end - vma->vm_start;
40357 offset += phdr.p_filesz;
40358 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
40359@@ -2005,6 +2472,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40360 phdr.p_align = ELF_EXEC_PAGESIZE;
40361
40362 size += sizeof(phdr);
40363+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
40364 if (size > cprm->limit
40365 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
40366 goto end_coredump;
40367@@ -2029,7 +2497,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40368 unsigned long addr;
40369 unsigned long end;
40370
40371- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
40372+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
40373
40374 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
40375 struct page *page;
40376@@ -2038,6 +2506,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40377 page = get_dump_page(addr);
40378 if (page) {
40379 void *kaddr = kmap(page);
40380+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
40381 stop = ((size += PAGE_SIZE) > cprm->limit) ||
40382 !dump_write(cprm->file, kaddr,
40383 PAGE_SIZE);
40384@@ -2055,6 +2524,7 @@ static int elf_core_dump(struct coredump_params *cprm)
40385
40386 if (e_phnum == PN_XNUM) {
40387 size += sizeof(*shdr4extnum);
40388+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
40389 if (size > cprm->limit
40390 || !dump_write(cprm->file, shdr4extnum,
40391 sizeof(*shdr4extnum)))
40392@@ -2075,6 +2545,97 @@ out:
40393
40394 #endif /* CONFIG_ELF_CORE */
40395
40396+#ifdef CONFIG_PAX_MPROTECT
40397+/* PaX: non-PIC ELF libraries need relocations on their executable segments
40398+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
40399+ * we'll remove VM_MAYWRITE for good on RELRO segments.
40400+ *
40401+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
40402+ * basis because we want to allow the common case and not the special ones.
40403+ */
40404+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
40405+{
40406+ struct elfhdr elf_h;
40407+ struct elf_phdr elf_p;
40408+ unsigned long i;
40409+ unsigned long oldflags;
40410+ bool is_textrel_rw, is_textrel_rx, is_relro;
40411+
40412+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
40413+ return;
40414+
40415+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
40416+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
40417+
40418+#ifdef CONFIG_PAX_ELFRELOCS
40419+ /* possible TEXTREL */
40420+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
40421+ 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);
40422+#else
40423+ is_textrel_rw = false;
40424+ is_textrel_rx = false;
40425+#endif
40426+
40427+ /* possible RELRO */
40428+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
40429+
40430+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
40431+ return;
40432+
40433+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
40434+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
40435+
40436+#ifdef CONFIG_PAX_ETEXECRELOCS
40437+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
40438+#else
40439+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
40440+#endif
40441+
40442+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
40443+ !elf_check_arch(&elf_h) ||
40444+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
40445+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
40446+ return;
40447+
40448+ for (i = 0UL; i < elf_h.e_phnum; i++) {
40449+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
40450+ return;
40451+ switch (elf_p.p_type) {
40452+ case PT_DYNAMIC:
40453+ if (!is_textrel_rw && !is_textrel_rx)
40454+ continue;
40455+ i = 0UL;
40456+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
40457+ elf_dyn dyn;
40458+
40459+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
40460+ return;
40461+ if (dyn.d_tag == DT_NULL)
40462+ return;
40463+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
40464+ gr_log_textrel(vma);
40465+ if (is_textrel_rw)
40466+ vma->vm_flags |= VM_MAYWRITE;
40467+ else
40468+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
40469+ vma->vm_flags &= ~VM_MAYWRITE;
40470+ return;
40471+ }
40472+ i++;
40473+ }
40474+ return;
40475+
40476+ case PT_GNU_RELRO:
40477+ if (!is_relro)
40478+ continue;
40479+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
40480+ vma->vm_flags &= ~VM_MAYWRITE;
40481+ return;
40482+ }
40483+ }
40484+}
40485+#endif
40486+
40487 static int __init init_elf_binfmt(void)
40488 {
40489 return register_binfmt(&elf_format);
40490diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
40491index 1bffbe0..c8c283e 100644
40492--- a/fs/binfmt_flat.c
40493+++ b/fs/binfmt_flat.c
40494@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
40495 realdatastart = (unsigned long) -ENOMEM;
40496 printk("Unable to allocate RAM for process data, errno %d\n",
40497 (int)-realdatastart);
40498+ down_write(&current->mm->mmap_sem);
40499 do_munmap(current->mm, textpos, text_len);
40500+ up_write(&current->mm->mmap_sem);
40501 ret = realdatastart;
40502 goto err;
40503 }
40504@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
40505 }
40506 if (IS_ERR_VALUE(result)) {
40507 printk("Unable to read data+bss, errno %d\n", (int)-result);
40508+ down_write(&current->mm->mmap_sem);
40509 do_munmap(current->mm, textpos, text_len);
40510 do_munmap(current->mm, realdatastart, len);
40511+ up_write(&current->mm->mmap_sem);
40512 ret = result;
40513 goto err;
40514 }
40515@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
40516 }
40517 if (IS_ERR_VALUE(result)) {
40518 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
40519+ down_write(&current->mm->mmap_sem);
40520 do_munmap(current->mm, textpos, text_len + data_len + extra +
40521 MAX_SHARED_LIBS * sizeof(unsigned long));
40522+ up_write(&current->mm->mmap_sem);
40523 ret = result;
40524 goto err;
40525 }
40526diff --git a/fs/bio.c b/fs/bio.c
40527index b1fe82c..84da0a9 100644
40528--- a/fs/bio.c
40529+++ b/fs/bio.c
40530@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
40531 const int read = bio_data_dir(bio) == READ;
40532 struct bio_map_data *bmd = bio->bi_private;
40533 int i;
40534- char *p = bmd->sgvecs[0].iov_base;
40535+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
40536
40537 __bio_for_each_segment(bvec, bio, i, 0) {
40538 char *addr = page_address(bvec->bv_page);
40539diff --git a/fs/block_dev.c b/fs/block_dev.c
40540index b07f1da..9efcb92 100644
40541--- a/fs/block_dev.c
40542+++ b/fs/block_dev.c
40543@@ -681,7 +681,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
40544 else if (bdev->bd_contains == bdev)
40545 return true; /* is a whole device which isn't held */
40546
40547- else if (whole->bd_holder == bd_may_claim)
40548+ else if (whole->bd_holder == (void *)bd_may_claim)
40549 return true; /* is a partition of a device that is being partitioned */
40550 else if (whole->bd_holder != NULL)
40551 return false; /* is a partition of a held device */
40552diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
40553index dede441..f2a2507 100644
40554--- a/fs/btrfs/ctree.c
40555+++ b/fs/btrfs/ctree.c
40556@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
40557 free_extent_buffer(buf);
40558 add_root_to_dirty_list(root);
40559 } else {
40560- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
40561- parent_start = parent->start;
40562- else
40563+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
40564+ if (parent)
40565+ parent_start = parent->start;
40566+ else
40567+ parent_start = 0;
40568+ } else
40569 parent_start = 0;
40570
40571 WARN_ON(trans->transid != btrfs_header_generation(parent));
40572diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
40573index fd1a06d..6e9033d 100644
40574--- a/fs/btrfs/inode.c
40575+++ b/fs/btrfs/inode.c
40576@@ -6895,7 +6895,7 @@ fail:
40577 return -ENOMEM;
40578 }
40579
40580-static int btrfs_getattr(struct vfsmount *mnt,
40581+int btrfs_getattr(struct vfsmount *mnt,
40582 struct dentry *dentry, struct kstat *stat)
40583 {
40584 struct inode *inode = dentry->d_inode;
40585@@ -6909,6 +6909,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
40586 return 0;
40587 }
40588
40589+EXPORT_SYMBOL(btrfs_getattr);
40590+
40591+dev_t get_btrfs_dev_from_inode(struct inode *inode)
40592+{
40593+ return BTRFS_I(inode)->root->anon_dev;
40594+}
40595+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
40596+
40597 /*
40598 * If a file is moved, it will inherit the cow and compression flags of the new
40599 * directory.
40600diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
40601index c04f02c..f5c9e2e 100644
40602--- a/fs/btrfs/ioctl.c
40603+++ b/fs/btrfs/ioctl.c
40604@@ -2733,9 +2733,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
40605 for (i = 0; i < num_types; i++) {
40606 struct btrfs_space_info *tmp;
40607
40608+ /* Don't copy in more than we allocated */
40609 if (!slot_count)
40610 break;
40611
40612+ slot_count--;
40613+
40614 info = NULL;
40615 rcu_read_lock();
40616 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
40617@@ -2757,15 +2760,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
40618 memcpy(dest, &space, sizeof(space));
40619 dest++;
40620 space_args.total_spaces++;
40621- slot_count--;
40622 }
40623- if (!slot_count)
40624- break;
40625 }
40626 up_read(&info->groups_sem);
40627 }
40628
40629- user_dest = (struct btrfs_ioctl_space_info *)
40630+ user_dest = (struct btrfs_ioctl_space_info __user *)
40631 (arg + sizeof(struct btrfs_ioctl_space_args));
40632
40633 if (copy_to_user(user_dest, dest_orig, alloc_size))
40634diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
40635index cfb5543..1ae7347 100644
40636--- a/fs/btrfs/relocation.c
40637+++ b/fs/btrfs/relocation.c
40638@@ -1244,7 +1244,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
40639 }
40640 spin_unlock(&rc->reloc_root_tree.lock);
40641
40642- BUG_ON((struct btrfs_root *)node->data != root);
40643+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
40644
40645 if (!del) {
40646 spin_lock(&rc->reloc_root_tree.lock);
40647diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
40648index 622f469..e8d2d55 100644
40649--- a/fs/cachefiles/bind.c
40650+++ b/fs/cachefiles/bind.c
40651@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
40652 args);
40653
40654 /* start by checking things over */
40655- ASSERT(cache->fstop_percent >= 0 &&
40656- cache->fstop_percent < cache->fcull_percent &&
40657+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
40658 cache->fcull_percent < cache->frun_percent &&
40659 cache->frun_percent < 100);
40660
40661- ASSERT(cache->bstop_percent >= 0 &&
40662- cache->bstop_percent < cache->bcull_percent &&
40663+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
40664 cache->bcull_percent < cache->brun_percent &&
40665 cache->brun_percent < 100);
40666
40667diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
40668index 0a1467b..6a53245 100644
40669--- a/fs/cachefiles/daemon.c
40670+++ b/fs/cachefiles/daemon.c
40671@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
40672 if (n > buflen)
40673 return -EMSGSIZE;
40674
40675- if (copy_to_user(_buffer, buffer, n) != 0)
40676+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
40677 return -EFAULT;
40678
40679 return n;
40680@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
40681 if (test_bit(CACHEFILES_DEAD, &cache->flags))
40682 return -EIO;
40683
40684- if (datalen < 0 || datalen > PAGE_SIZE - 1)
40685+ if (datalen > PAGE_SIZE - 1)
40686 return -EOPNOTSUPP;
40687
40688 /* drag the command string into the kernel so we can parse it */
40689@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
40690 if (args[0] != '%' || args[1] != '\0')
40691 return -EINVAL;
40692
40693- if (fstop < 0 || fstop >= cache->fcull_percent)
40694+ if (fstop >= cache->fcull_percent)
40695 return cachefiles_daemon_range_error(cache, args);
40696
40697 cache->fstop_percent = fstop;
40698@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
40699 if (args[0] != '%' || args[1] != '\0')
40700 return -EINVAL;
40701
40702- if (bstop < 0 || bstop >= cache->bcull_percent)
40703+ if (bstop >= cache->bcull_percent)
40704 return cachefiles_daemon_range_error(cache, args);
40705
40706 cache->bstop_percent = bstop;
40707diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
40708index bd6bc1b..b627b53 100644
40709--- a/fs/cachefiles/internal.h
40710+++ b/fs/cachefiles/internal.h
40711@@ -57,7 +57,7 @@ struct cachefiles_cache {
40712 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
40713 struct rb_root active_nodes; /* active nodes (can't be culled) */
40714 rwlock_t active_lock; /* lock for active_nodes */
40715- atomic_t gravecounter; /* graveyard uniquifier */
40716+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
40717 unsigned frun_percent; /* when to stop culling (% files) */
40718 unsigned fcull_percent; /* when to start culling (% files) */
40719 unsigned fstop_percent; /* when to stop allocating (% files) */
40720@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
40721 * proc.c
40722 */
40723 #ifdef CONFIG_CACHEFILES_HISTOGRAM
40724-extern atomic_t cachefiles_lookup_histogram[HZ];
40725-extern atomic_t cachefiles_mkdir_histogram[HZ];
40726-extern atomic_t cachefiles_create_histogram[HZ];
40727+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
40728+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
40729+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
40730
40731 extern int __init cachefiles_proc_init(void);
40732 extern void cachefiles_proc_cleanup(void);
40733 static inline
40734-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
40735+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
40736 {
40737 unsigned long jif = jiffies - start_jif;
40738 if (jif >= HZ)
40739 jif = HZ - 1;
40740- atomic_inc(&histogram[jif]);
40741+ atomic_inc_unchecked(&histogram[jif]);
40742 }
40743
40744 #else
40745diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
40746index a0358c2..d6137f2 100644
40747--- a/fs/cachefiles/namei.c
40748+++ b/fs/cachefiles/namei.c
40749@@ -318,7 +318,7 @@ try_again:
40750 /* first step is to make up a grave dentry in the graveyard */
40751 sprintf(nbuffer, "%08x%08x",
40752 (uint32_t) get_seconds(),
40753- (uint32_t) atomic_inc_return(&cache->gravecounter));
40754+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
40755
40756 /* do the multiway lock magic */
40757 trap = lock_rename(cache->graveyard, dir);
40758diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
40759index eccd339..4c1d995 100644
40760--- a/fs/cachefiles/proc.c
40761+++ b/fs/cachefiles/proc.c
40762@@ -14,9 +14,9 @@
40763 #include <linux/seq_file.h>
40764 #include "internal.h"
40765
40766-atomic_t cachefiles_lookup_histogram[HZ];
40767-atomic_t cachefiles_mkdir_histogram[HZ];
40768-atomic_t cachefiles_create_histogram[HZ];
40769+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
40770+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
40771+atomic_unchecked_t cachefiles_create_histogram[HZ];
40772
40773 /*
40774 * display the latency histogram
40775@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
40776 return 0;
40777 default:
40778 index = (unsigned long) v - 3;
40779- x = atomic_read(&cachefiles_lookup_histogram[index]);
40780- y = atomic_read(&cachefiles_mkdir_histogram[index]);
40781- z = atomic_read(&cachefiles_create_histogram[index]);
40782+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
40783+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
40784+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
40785 if (x == 0 && y == 0 && z == 0)
40786 return 0;
40787
40788diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
40789index 0e3c092..818480e 100644
40790--- a/fs/cachefiles/rdwr.c
40791+++ b/fs/cachefiles/rdwr.c
40792@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
40793 old_fs = get_fs();
40794 set_fs(KERNEL_DS);
40795 ret = file->f_op->write(
40796- file, (const void __user *) data, len, &pos);
40797+ file, (const void __force_user *) data, len, &pos);
40798 set_fs(old_fs);
40799 kunmap(page);
40800 if (ret != len)
40801diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
40802index 9895400..fa40a7d 100644
40803--- a/fs/ceph/dir.c
40804+++ b/fs/ceph/dir.c
40805@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
40806 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
40807 struct ceph_mds_client *mdsc = fsc->mdsc;
40808 unsigned frag = fpos_frag(filp->f_pos);
40809- int off = fpos_off(filp->f_pos);
40810+ unsigned int off = fpos_off(filp->f_pos);
40811 int err;
40812 u32 ftype;
40813 struct ceph_mds_reply_info_parsed *rinfo;
40814diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
40815index 84e8c07..6170d31 100644
40816--- a/fs/cifs/cifs_debug.c
40817+++ b/fs/cifs/cifs_debug.c
40818@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
40819
40820 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
40821 #ifdef CONFIG_CIFS_STATS2
40822- atomic_set(&totBufAllocCount, 0);
40823- atomic_set(&totSmBufAllocCount, 0);
40824+ atomic_set_unchecked(&totBufAllocCount, 0);
40825+ atomic_set_unchecked(&totSmBufAllocCount, 0);
40826 #endif /* CONFIG_CIFS_STATS2 */
40827 spin_lock(&cifs_tcp_ses_lock);
40828 list_for_each(tmp1, &cifs_tcp_ses_list) {
40829@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
40830 tcon = list_entry(tmp3,
40831 struct cifs_tcon,
40832 tcon_list);
40833- atomic_set(&tcon->num_smbs_sent, 0);
40834- atomic_set(&tcon->num_writes, 0);
40835- atomic_set(&tcon->num_reads, 0);
40836- atomic_set(&tcon->num_oplock_brks, 0);
40837- atomic_set(&tcon->num_opens, 0);
40838- atomic_set(&tcon->num_posixopens, 0);
40839- atomic_set(&tcon->num_posixmkdirs, 0);
40840- atomic_set(&tcon->num_closes, 0);
40841- atomic_set(&tcon->num_deletes, 0);
40842- atomic_set(&tcon->num_mkdirs, 0);
40843- atomic_set(&tcon->num_rmdirs, 0);
40844- atomic_set(&tcon->num_renames, 0);
40845- atomic_set(&tcon->num_t2renames, 0);
40846- atomic_set(&tcon->num_ffirst, 0);
40847- atomic_set(&tcon->num_fnext, 0);
40848- atomic_set(&tcon->num_fclose, 0);
40849- atomic_set(&tcon->num_hardlinks, 0);
40850- atomic_set(&tcon->num_symlinks, 0);
40851- atomic_set(&tcon->num_locks, 0);
40852+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
40853+ atomic_set_unchecked(&tcon->num_writes, 0);
40854+ atomic_set_unchecked(&tcon->num_reads, 0);
40855+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
40856+ atomic_set_unchecked(&tcon->num_opens, 0);
40857+ atomic_set_unchecked(&tcon->num_posixopens, 0);
40858+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
40859+ atomic_set_unchecked(&tcon->num_closes, 0);
40860+ atomic_set_unchecked(&tcon->num_deletes, 0);
40861+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
40862+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
40863+ atomic_set_unchecked(&tcon->num_renames, 0);
40864+ atomic_set_unchecked(&tcon->num_t2renames, 0);
40865+ atomic_set_unchecked(&tcon->num_ffirst, 0);
40866+ atomic_set_unchecked(&tcon->num_fnext, 0);
40867+ atomic_set_unchecked(&tcon->num_fclose, 0);
40868+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
40869+ atomic_set_unchecked(&tcon->num_symlinks, 0);
40870+ atomic_set_unchecked(&tcon->num_locks, 0);
40871 }
40872 }
40873 }
40874@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
40875 smBufAllocCount.counter, cifs_min_small);
40876 #ifdef CONFIG_CIFS_STATS2
40877 seq_printf(m, "Total Large %d Small %d Allocations\n",
40878- atomic_read(&totBufAllocCount),
40879- atomic_read(&totSmBufAllocCount));
40880+ atomic_read_unchecked(&totBufAllocCount),
40881+ atomic_read_unchecked(&totSmBufAllocCount));
40882 #endif /* CONFIG_CIFS_STATS2 */
40883
40884 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
40885@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
40886 if (tcon->need_reconnect)
40887 seq_puts(m, "\tDISCONNECTED ");
40888 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
40889- atomic_read(&tcon->num_smbs_sent),
40890- atomic_read(&tcon->num_oplock_brks));
40891+ atomic_read_unchecked(&tcon->num_smbs_sent),
40892+ atomic_read_unchecked(&tcon->num_oplock_brks));
40893 seq_printf(m, "\nReads: %d Bytes: %lld",
40894- atomic_read(&tcon->num_reads),
40895+ atomic_read_unchecked(&tcon->num_reads),
40896 (long long)(tcon->bytes_read));
40897 seq_printf(m, "\nWrites: %d Bytes: %lld",
40898- atomic_read(&tcon->num_writes),
40899+ atomic_read_unchecked(&tcon->num_writes),
40900 (long long)(tcon->bytes_written));
40901 seq_printf(m, "\nFlushes: %d",
40902- atomic_read(&tcon->num_flushes));
40903+ atomic_read_unchecked(&tcon->num_flushes));
40904 seq_printf(m, "\nLocks: %d HardLinks: %d "
40905 "Symlinks: %d",
40906- atomic_read(&tcon->num_locks),
40907- atomic_read(&tcon->num_hardlinks),
40908- atomic_read(&tcon->num_symlinks));
40909+ atomic_read_unchecked(&tcon->num_locks),
40910+ atomic_read_unchecked(&tcon->num_hardlinks),
40911+ atomic_read_unchecked(&tcon->num_symlinks));
40912 seq_printf(m, "\nOpens: %d Closes: %d "
40913 "Deletes: %d",
40914- atomic_read(&tcon->num_opens),
40915- atomic_read(&tcon->num_closes),
40916- atomic_read(&tcon->num_deletes));
40917+ atomic_read_unchecked(&tcon->num_opens),
40918+ atomic_read_unchecked(&tcon->num_closes),
40919+ atomic_read_unchecked(&tcon->num_deletes));
40920 seq_printf(m, "\nPosix Opens: %d "
40921 "Posix Mkdirs: %d",
40922- atomic_read(&tcon->num_posixopens),
40923- atomic_read(&tcon->num_posixmkdirs));
40924+ atomic_read_unchecked(&tcon->num_posixopens),
40925+ atomic_read_unchecked(&tcon->num_posixmkdirs));
40926 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
40927- atomic_read(&tcon->num_mkdirs),
40928- atomic_read(&tcon->num_rmdirs));
40929+ atomic_read_unchecked(&tcon->num_mkdirs),
40930+ atomic_read_unchecked(&tcon->num_rmdirs));
40931 seq_printf(m, "\nRenames: %d T2 Renames %d",
40932- atomic_read(&tcon->num_renames),
40933- atomic_read(&tcon->num_t2renames));
40934+ atomic_read_unchecked(&tcon->num_renames),
40935+ atomic_read_unchecked(&tcon->num_t2renames));
40936 seq_printf(m, "\nFindFirst: %d FNext %d "
40937 "FClose %d",
40938- atomic_read(&tcon->num_ffirst),
40939- atomic_read(&tcon->num_fnext),
40940- atomic_read(&tcon->num_fclose));
40941+ atomic_read_unchecked(&tcon->num_ffirst),
40942+ atomic_read_unchecked(&tcon->num_fnext),
40943+ atomic_read_unchecked(&tcon->num_fclose));
40944 }
40945 }
40946 }
40947diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
40948index 8f1fe32..38f9e27 100644
40949--- a/fs/cifs/cifsfs.c
40950+++ b/fs/cifs/cifsfs.c
40951@@ -989,7 +989,7 @@ cifs_init_request_bufs(void)
40952 cifs_req_cachep = kmem_cache_create("cifs_request",
40953 CIFSMaxBufSize +
40954 MAX_CIFS_HDR_SIZE, 0,
40955- SLAB_HWCACHE_ALIGN, NULL);
40956+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
40957 if (cifs_req_cachep == NULL)
40958 return -ENOMEM;
40959
40960@@ -1016,7 +1016,7 @@ cifs_init_request_bufs(void)
40961 efficient to alloc 1 per page off the slab compared to 17K (5page)
40962 alloc of large cifs buffers even when page debugging is on */
40963 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
40964- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
40965+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
40966 NULL);
40967 if (cifs_sm_req_cachep == NULL) {
40968 mempool_destroy(cifs_req_poolp);
40969@@ -1101,8 +1101,8 @@ init_cifs(void)
40970 atomic_set(&bufAllocCount, 0);
40971 atomic_set(&smBufAllocCount, 0);
40972 #ifdef CONFIG_CIFS_STATS2
40973- atomic_set(&totBufAllocCount, 0);
40974- atomic_set(&totSmBufAllocCount, 0);
40975+ atomic_set_unchecked(&totBufAllocCount, 0);
40976+ atomic_set_unchecked(&totSmBufAllocCount, 0);
40977 #endif /* CONFIG_CIFS_STATS2 */
40978
40979 atomic_set(&midCount, 0);
40980diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
40981index 8238aa1..0347196 100644
40982--- a/fs/cifs/cifsglob.h
40983+++ b/fs/cifs/cifsglob.h
40984@@ -392,28 +392,28 @@ struct cifs_tcon {
40985 __u16 Flags; /* optional support bits */
40986 enum statusEnum tidStatus;
40987 #ifdef CONFIG_CIFS_STATS
40988- atomic_t num_smbs_sent;
40989- atomic_t num_writes;
40990- atomic_t num_reads;
40991- atomic_t num_flushes;
40992- atomic_t num_oplock_brks;
40993- atomic_t num_opens;
40994- atomic_t num_closes;
40995- atomic_t num_deletes;
40996- atomic_t num_mkdirs;
40997- atomic_t num_posixopens;
40998- atomic_t num_posixmkdirs;
40999- atomic_t num_rmdirs;
41000- atomic_t num_renames;
41001- atomic_t num_t2renames;
41002- atomic_t num_ffirst;
41003- atomic_t num_fnext;
41004- atomic_t num_fclose;
41005- atomic_t num_hardlinks;
41006- atomic_t num_symlinks;
41007- atomic_t num_locks;
41008- atomic_t num_acl_get;
41009- atomic_t num_acl_set;
41010+ atomic_unchecked_t num_smbs_sent;
41011+ atomic_unchecked_t num_writes;
41012+ atomic_unchecked_t num_reads;
41013+ atomic_unchecked_t num_flushes;
41014+ atomic_unchecked_t num_oplock_brks;
41015+ atomic_unchecked_t num_opens;
41016+ atomic_unchecked_t num_closes;
41017+ atomic_unchecked_t num_deletes;
41018+ atomic_unchecked_t num_mkdirs;
41019+ atomic_unchecked_t num_posixopens;
41020+ atomic_unchecked_t num_posixmkdirs;
41021+ atomic_unchecked_t num_rmdirs;
41022+ atomic_unchecked_t num_renames;
41023+ atomic_unchecked_t num_t2renames;
41024+ atomic_unchecked_t num_ffirst;
41025+ atomic_unchecked_t num_fnext;
41026+ atomic_unchecked_t num_fclose;
41027+ atomic_unchecked_t num_hardlinks;
41028+ atomic_unchecked_t num_symlinks;
41029+ atomic_unchecked_t num_locks;
41030+ atomic_unchecked_t num_acl_get;
41031+ atomic_unchecked_t num_acl_set;
41032 #ifdef CONFIG_CIFS_STATS2
41033 unsigned long long time_writes;
41034 unsigned long long time_reads;
41035@@ -628,7 +628,7 @@ convert_delimiter(char *path, char delim)
41036 }
41037
41038 #ifdef CONFIG_CIFS_STATS
41039-#define cifs_stats_inc atomic_inc
41040+#define cifs_stats_inc atomic_inc_unchecked
41041
41042 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
41043 unsigned int bytes)
41044@@ -985,8 +985,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
41045 /* Various Debug counters */
41046 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
41047 #ifdef CONFIG_CIFS_STATS2
41048-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
41049-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
41050+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
41051+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
41052 #endif
41053 GLOBAL_EXTERN atomic_t smBufAllocCount;
41054 GLOBAL_EXTERN atomic_t midCount;
41055diff --git a/fs/cifs/link.c b/fs/cifs/link.c
41056index 6b0e064..94e6c3c 100644
41057--- a/fs/cifs/link.c
41058+++ b/fs/cifs/link.c
41059@@ -600,7 +600,7 @@ symlink_exit:
41060
41061 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
41062 {
41063- char *p = nd_get_link(nd);
41064+ const char *p = nd_get_link(nd);
41065 if (!IS_ERR(p))
41066 kfree(p);
41067 }
41068diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
41069index 703ef5c..2a44ed5 100644
41070--- a/fs/cifs/misc.c
41071+++ b/fs/cifs/misc.c
41072@@ -156,7 +156,7 @@ cifs_buf_get(void)
41073 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
41074 atomic_inc(&bufAllocCount);
41075 #ifdef CONFIG_CIFS_STATS2
41076- atomic_inc(&totBufAllocCount);
41077+ atomic_inc_unchecked(&totBufAllocCount);
41078 #endif /* CONFIG_CIFS_STATS2 */
41079 }
41080
41081@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
41082 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
41083 atomic_inc(&smBufAllocCount);
41084 #ifdef CONFIG_CIFS_STATS2
41085- atomic_inc(&totSmBufAllocCount);
41086+ atomic_inc_unchecked(&totSmBufAllocCount);
41087 #endif /* CONFIG_CIFS_STATS2 */
41088
41089 }
41090diff --git a/fs/coda/cache.c b/fs/coda/cache.c
41091index 6901578..d402eb5 100644
41092--- a/fs/coda/cache.c
41093+++ b/fs/coda/cache.c
41094@@ -24,7 +24,7 @@
41095 #include "coda_linux.h"
41096 #include "coda_cache.h"
41097
41098-static atomic_t permission_epoch = ATOMIC_INIT(0);
41099+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
41100
41101 /* replace or extend an acl cache hit */
41102 void coda_cache_enter(struct inode *inode, int mask)
41103@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
41104 struct coda_inode_info *cii = ITOC(inode);
41105
41106 spin_lock(&cii->c_lock);
41107- cii->c_cached_epoch = atomic_read(&permission_epoch);
41108+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
41109 if (cii->c_uid != current_fsuid()) {
41110 cii->c_uid = current_fsuid();
41111 cii->c_cached_perm = mask;
41112@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
41113 {
41114 struct coda_inode_info *cii = ITOC(inode);
41115 spin_lock(&cii->c_lock);
41116- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
41117+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
41118 spin_unlock(&cii->c_lock);
41119 }
41120
41121 /* remove all acl caches */
41122 void coda_cache_clear_all(struct super_block *sb)
41123 {
41124- atomic_inc(&permission_epoch);
41125+ atomic_inc_unchecked(&permission_epoch);
41126 }
41127
41128
41129@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
41130 spin_lock(&cii->c_lock);
41131 hit = (mask & cii->c_cached_perm) == mask &&
41132 cii->c_uid == current_fsuid() &&
41133- cii->c_cached_epoch == atomic_read(&permission_epoch);
41134+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
41135 spin_unlock(&cii->c_lock);
41136
41137 return hit;
41138diff --git a/fs/compat.c b/fs/compat.c
41139index c987875..08771ca 100644
41140--- a/fs/compat.c
41141+++ b/fs/compat.c
41142@@ -132,8 +132,8 @@ asmlinkage long compat_sys_utimes(const char __user *filename, struct compat_tim
41143 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
41144 {
41145 compat_ino_t ino = stat->ino;
41146- typeof(ubuf->st_uid) uid = 0;
41147- typeof(ubuf->st_gid) gid = 0;
41148+ typeof(((struct compat_stat *)0)->st_uid) uid = 0;
41149+ typeof(((struct compat_stat *)0)->st_gid) gid = 0;
41150 int err;
41151
41152 SET_UID(uid, stat->uid);
41153@@ -504,7 +504,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
41154
41155 set_fs(KERNEL_DS);
41156 /* The __user pointer cast is valid because of the set_fs() */
41157- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
41158+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
41159 set_fs(oldfs);
41160 /* truncating is ok because it's a user address */
41161 if (!ret)
41162@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
41163 goto out;
41164
41165 ret = -EINVAL;
41166- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
41167+ if (nr_segs > UIO_MAXIOV)
41168 goto out;
41169 if (nr_segs > fast_segs) {
41170 ret = -ENOMEM;
41171@@ -845,6 +845,7 @@ struct compat_old_linux_dirent {
41172
41173 struct compat_readdir_callback {
41174 struct compat_old_linux_dirent __user *dirent;
41175+ struct file * file;
41176 int result;
41177 };
41178
41179@@ -862,6 +863,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
41180 buf->result = -EOVERFLOW;
41181 return -EOVERFLOW;
41182 }
41183+
41184+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
41185+ return 0;
41186+
41187 buf->result++;
41188 dirent = buf->dirent;
41189 if (!access_ok(VERIFY_WRITE, dirent,
41190@@ -894,6 +899,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
41191
41192 buf.result = 0;
41193 buf.dirent = dirent;
41194+ buf.file = file;
41195
41196 error = vfs_readdir(file, compat_fillonedir, &buf);
41197 if (buf.result)
41198@@ -914,6 +920,7 @@ struct compat_linux_dirent {
41199 struct compat_getdents_callback {
41200 struct compat_linux_dirent __user *current_dir;
41201 struct compat_linux_dirent __user *previous;
41202+ struct file * file;
41203 int count;
41204 int error;
41205 };
41206@@ -935,6 +942,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
41207 buf->error = -EOVERFLOW;
41208 return -EOVERFLOW;
41209 }
41210+
41211+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
41212+ return 0;
41213+
41214 dirent = buf->previous;
41215 if (dirent) {
41216 if (__put_user(offset, &dirent->d_off))
41217@@ -982,6 +993,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
41218 buf.previous = NULL;
41219 buf.count = count;
41220 buf.error = 0;
41221+ buf.file = file;
41222
41223 error = vfs_readdir(file, compat_filldir, &buf);
41224 if (error >= 0)
41225@@ -1003,6 +1015,7 @@ out:
41226 struct compat_getdents_callback64 {
41227 struct linux_dirent64 __user *current_dir;
41228 struct linux_dirent64 __user *previous;
41229+ struct file * file;
41230 int count;
41231 int error;
41232 };
41233@@ -1019,6 +1032,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
41234 buf->error = -EINVAL; /* only used if we fail.. */
41235 if (reclen > buf->count)
41236 return -EINVAL;
41237+
41238+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
41239+ return 0;
41240+
41241 dirent = buf->previous;
41242
41243 if (dirent) {
41244@@ -1070,13 +1087,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
41245 buf.previous = NULL;
41246 buf.count = count;
41247 buf.error = 0;
41248+ buf.file = file;
41249
41250 error = vfs_readdir(file, compat_filldir64, &buf);
41251 if (error >= 0)
41252 error = buf.error;
41253 lastdirent = buf.previous;
41254 if (lastdirent) {
41255- typeof(lastdirent->d_off) d_off = file->f_pos;
41256+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
41257 if (__put_user_unaligned(d_off, &lastdirent->d_off))
41258 error = -EFAULT;
41259 else
41260diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
41261index 112e45a..b59845b 100644
41262--- a/fs/compat_binfmt_elf.c
41263+++ b/fs/compat_binfmt_elf.c
41264@@ -30,11 +30,13 @@
41265 #undef elf_phdr
41266 #undef elf_shdr
41267 #undef elf_note
41268+#undef elf_dyn
41269 #undef elf_addr_t
41270 #define elfhdr elf32_hdr
41271 #define elf_phdr elf32_phdr
41272 #define elf_shdr elf32_shdr
41273 #define elf_note elf32_note
41274+#define elf_dyn Elf32_Dyn
41275 #define elf_addr_t Elf32_Addr
41276
41277 /*
41278diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
41279index 51352de..93292ff 100644
41280--- a/fs/compat_ioctl.c
41281+++ b/fs/compat_ioctl.c
41282@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
41283
41284 err = get_user(palp, &up->palette);
41285 err |= get_user(length, &up->length);
41286+ if (err)
41287+ return -EFAULT;
41288
41289 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
41290 err = put_user(compat_ptr(palp), &up_native->palette);
41291@@ -621,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
41292 return -EFAULT;
41293 if (__get_user(udata, &ss32->iomem_base))
41294 return -EFAULT;
41295- ss.iomem_base = compat_ptr(udata);
41296+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
41297 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
41298 __get_user(ss.port_high, &ss32->port_high))
41299 return -EFAULT;
41300@@ -796,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
41301 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
41302 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
41303 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
41304- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
41305+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
41306 return -EFAULT;
41307
41308 return ioctl_preallocate(file, p);
41309@@ -1644,8 +1646,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
41310 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
41311 {
41312 unsigned int a, b;
41313- a = *(unsigned int *)p;
41314- b = *(unsigned int *)q;
41315+ a = *(const unsigned int *)p;
41316+ b = *(const unsigned int *)q;
41317 if (a > b)
41318 return 1;
41319 if (a < b)
41320diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
41321index 9a37a9b..35792b6 100644
41322--- a/fs/configfs/dir.c
41323+++ b/fs/configfs/dir.c
41324@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
41325 }
41326 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
41327 struct configfs_dirent *next;
41328- const char * name;
41329+ const unsigned char * name;
41330+ char d_name[sizeof(next->s_dentry->d_iname)];
41331 int len;
41332 struct inode *inode = NULL;
41333
41334@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
41335 continue;
41336
41337 name = configfs_get_name(next);
41338- len = strlen(name);
41339+ if (next->s_dentry && name == next->s_dentry->d_iname) {
41340+ len = next->s_dentry->d_name.len;
41341+ memcpy(d_name, name, len);
41342+ name = d_name;
41343+ } else
41344+ len = strlen(name);
41345
41346 /*
41347 * We'll have a dentry and an inode for
41348diff --git a/fs/dcache.c b/fs/dcache.c
41349index f7908ae..920a680 100644
41350--- a/fs/dcache.c
41351+++ b/fs/dcache.c
41352@@ -3042,7 +3042,7 @@ void __init vfs_caches_init(unsigned long mempages)
41353 mempages -= reserve;
41354
41355 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
41356- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
41357+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
41358
41359 dcache_init();
41360 inode_init();
41361diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
41362index f3a257d..715ac0f 100644
41363--- a/fs/debugfs/inode.c
41364+++ b/fs/debugfs/inode.c
41365@@ -261,7 +261,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
41366 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
41367 {
41368 return debugfs_create_file(name,
41369+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
41370+ S_IFDIR | S_IRWXU,
41371+#else
41372 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
41373+#endif
41374 parent, NULL, NULL);
41375 }
41376 EXPORT_SYMBOL_GPL(debugfs_create_dir);
41377diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
41378index d2039ca..a766407 100644
41379--- a/fs/ecryptfs/inode.c
41380+++ b/fs/ecryptfs/inode.c
41381@@ -691,7 +691,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
41382 old_fs = get_fs();
41383 set_fs(get_ds());
41384 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
41385- (char __user *)lower_buf,
41386+ (char __force_user *)lower_buf,
41387 lower_bufsiz);
41388 set_fs(old_fs);
41389 if (rc < 0)
41390@@ -737,7 +737,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
41391 }
41392 old_fs = get_fs();
41393 set_fs(get_ds());
41394- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
41395+ rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
41396 set_fs(old_fs);
41397 if (rc < 0) {
41398 kfree(buf);
41399@@ -752,7 +752,7 @@ out:
41400 static void
41401 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
41402 {
41403- char *buf = nd_get_link(nd);
41404+ const char *buf = nd_get_link(nd);
41405 if (!IS_ERR(buf)) {
41406 /* Free the char* */
41407 kfree(buf);
41408diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
41409index 0dc5a3d..d3cdeea 100644
41410--- a/fs/ecryptfs/miscdev.c
41411+++ b/fs/ecryptfs/miscdev.c
41412@@ -328,7 +328,7 @@ check_list:
41413 goto out_unlock_msg_ctx;
41414 i = 5;
41415 if (msg_ctx->msg) {
41416- if (copy_to_user(&buf[i], packet_length, packet_length_size))
41417+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
41418 goto out_unlock_msg_ctx;
41419 i += packet_length_size;
41420 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
41421diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
41422index 608c1c3..7d040a8 100644
41423--- a/fs/ecryptfs/read_write.c
41424+++ b/fs/ecryptfs/read_write.c
41425@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
41426 return -EIO;
41427 fs_save = get_fs();
41428 set_fs(get_ds());
41429- rc = vfs_write(lower_file, data, size, &offset);
41430+ rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
41431 set_fs(fs_save);
41432 mark_inode_dirty_sync(ecryptfs_inode);
41433 return rc;
41434@@ -244,7 +244,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..7c7ce8b 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@@ -215,6 +223,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
41508 if (size <= ARG_MAX)
41509 return page;
41510
41511+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
41512+ // only allow 1MB for argv+env on suid/sgid binaries
41513+ // to prevent easy ASLR exhaustion
41514+ if (((bprm->cred->euid != current_euid()) ||
41515+ (bprm->cred->egid != current_egid())) &&
41516+ (size > (1024 * 1024))) {
41517+ put_page(page);
41518+ return NULL;
41519+ }
41520+#endif
41521+
41522 /*
41523 * Limit to 1/4-th the stack size for the argv+env strings.
41524 * This ensures that:
41525@@ -274,6 +293,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
41526 vma->vm_end = STACK_TOP_MAX;
41527 vma->vm_start = vma->vm_end - PAGE_SIZE;
41528 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
41529+
41530+#ifdef CONFIG_PAX_SEGMEXEC
41531+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
41532+#endif
41533+
41534 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
41535 INIT_LIST_HEAD(&vma->anon_vma_chain);
41536
41537@@ -288,6 +312,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
41538 mm->stack_vm = mm->total_vm = 1;
41539 up_write(&mm->mmap_sem);
41540 bprm->p = vma->vm_end - sizeof(void *);
41541+
41542+#ifdef CONFIG_PAX_RANDUSTACK
41543+ if (randomize_va_space)
41544+ bprm->p ^= (pax_get_random_long() & ~15) & ~PAGE_MASK;
41545+#endif
41546+
41547 return 0;
41548 err:
41549 up_write(&mm->mmap_sem);
41550@@ -396,19 +426,7 @@ err:
41551 return err;
41552 }
41553
41554-struct user_arg_ptr {
41555-#ifdef CONFIG_COMPAT
41556- bool is_compat;
41557-#endif
41558- union {
41559- const char __user *const __user *native;
41560-#ifdef CONFIG_COMPAT
41561- compat_uptr_t __user *compat;
41562-#endif
41563- } ptr;
41564-};
41565-
41566-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
41567+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
41568 {
41569 const char __user *native;
41570
41571@@ -417,14 +435,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
41572 compat_uptr_t compat;
41573
41574 if (get_user(compat, argv.ptr.compat + nr))
41575- return ERR_PTR(-EFAULT);
41576+ return (const char __force_user *)ERR_PTR(-EFAULT);
41577
41578 return compat_ptr(compat);
41579 }
41580 #endif
41581
41582 if (get_user(native, argv.ptr.native + nr))
41583- return ERR_PTR(-EFAULT);
41584+ return (const char __force_user *)ERR_PTR(-EFAULT);
41585
41586 return native;
41587 }
41588@@ -443,7 +461,7 @@ static int count(struct user_arg_ptr argv, int max)
41589 if (!p)
41590 break;
41591
41592- if (IS_ERR(p))
41593+ if (IS_ERR((const char __force_kernel *)p))
41594 return -EFAULT;
41595
41596 if (i++ >= max)
41597@@ -477,7 +495,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
41598
41599 ret = -EFAULT;
41600 str = get_user_arg_ptr(argv, argc);
41601- if (IS_ERR(str))
41602+ if (IS_ERR((const char __force_kernel *)str))
41603 goto out;
41604
41605 len = strnlen_user(str, MAX_ARG_STRLEN);
41606@@ -559,7 +577,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
41607 int r;
41608 mm_segment_t oldfs = get_fs();
41609 struct user_arg_ptr argv = {
41610- .ptr.native = (const char __user *const __user *)__argv,
41611+ .ptr.native = (const char __force_user *const __force_user *)__argv,
41612 };
41613
41614 set_fs(KERNEL_DS);
41615@@ -594,7 +612,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
41616 unsigned long new_end = old_end - shift;
41617 struct mmu_gather tlb;
41618
41619- BUG_ON(new_start > new_end);
41620+ if (new_start >= new_end || new_start < mmap_min_addr)
41621+ return -ENOMEM;
41622
41623 /*
41624 * ensure there are no vmas between where we want to go
41625@@ -603,6 +622,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
41626 if (vma != find_vma(mm, new_start))
41627 return -EFAULT;
41628
41629+#ifdef CONFIG_PAX_SEGMEXEC
41630+ BUG_ON(pax_find_mirror_vma(vma));
41631+#endif
41632+
41633 /*
41634 * cover the whole range: [new_start, old_end)
41635 */
41636@@ -683,10 +706,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
41637 stack_top = arch_align_stack(stack_top);
41638 stack_top = PAGE_ALIGN(stack_top);
41639
41640- if (unlikely(stack_top < mmap_min_addr) ||
41641- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
41642- return -ENOMEM;
41643-
41644 stack_shift = vma->vm_end - stack_top;
41645
41646 bprm->p -= stack_shift;
41647@@ -698,8 +717,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
41648 bprm->exec -= stack_shift;
41649
41650 down_write(&mm->mmap_sem);
41651+
41652+ /* Move stack pages down in memory. */
41653+ if (stack_shift) {
41654+ ret = shift_arg_pages(vma, stack_shift);
41655+ if (ret)
41656+ goto out_unlock;
41657+ }
41658+
41659 vm_flags = VM_STACK_FLAGS;
41660
41661+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
41662+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
41663+ vm_flags &= ~VM_EXEC;
41664+
41665+#ifdef CONFIG_PAX_MPROTECT
41666+ if (mm->pax_flags & MF_PAX_MPROTECT)
41667+ vm_flags &= ~VM_MAYEXEC;
41668+#endif
41669+
41670+ }
41671+#endif
41672+
41673 /*
41674 * Adjust stack execute permissions; explicitly enable for
41675 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
41676@@ -718,13 +757,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
41677 goto out_unlock;
41678 BUG_ON(prev != vma);
41679
41680- /* Move stack pages down in memory. */
41681- if (stack_shift) {
41682- ret = shift_arg_pages(vma, stack_shift);
41683- if (ret)
41684- goto out_unlock;
41685- }
41686-
41687 /* mprotect_fixup is overkill to remove the temporary stack flags */
41688 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
41689
41690@@ -805,7 +837,7 @@ int kernel_read(struct file *file, loff_t offset,
41691 old_fs = get_fs();
41692 set_fs(get_ds());
41693 /* The cast to a user pointer is valid due to the set_fs() */
41694- result = vfs_read(file, (void __user *)addr, count, &pos);
41695+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
41696 set_fs(old_fs);
41697 return result;
41698 }
41699@@ -1067,6 +1099,21 @@ void set_task_comm(struct task_struct *tsk, char *buf)
41700 perf_event_comm(tsk);
41701 }
41702
41703+static void filename_to_taskname(char *tcomm, const char *fn, unsigned int len)
41704+{
41705+ int i, ch;
41706+
41707+ /* Copies the binary name from after last slash */
41708+ for (i = 0; (ch = *(fn++)) != '\0';) {
41709+ if (ch == '/')
41710+ i = 0; /* overwrite what we wrote */
41711+ else
41712+ if (i < len - 1)
41713+ tcomm[i++] = ch;
41714+ }
41715+ tcomm[i] = '\0';
41716+}
41717+
41718 int flush_old_exec(struct linux_binprm * bprm)
41719 {
41720 int retval;
41721@@ -1081,6 +1128,7 @@ int flush_old_exec(struct linux_binprm * bprm)
41722
41723 set_mm_exe_file(bprm->mm, bprm->file);
41724
41725+ filename_to_taskname(bprm->tcomm, bprm->filename, sizeof(bprm->tcomm));
41726 /*
41727 * Release all of the old mmap stuff
41728 */
41729@@ -1112,10 +1160,6 @@ EXPORT_SYMBOL(would_dump);
41730
41731 void setup_new_exec(struct linux_binprm * bprm)
41732 {
41733- int i, ch;
41734- const char *name;
41735- char tcomm[sizeof(current->comm)];
41736-
41737 arch_pick_mmap_layout(current->mm);
41738
41739 /* This is the point of no return */
41740@@ -1126,18 +1170,7 @@ void setup_new_exec(struct linux_binprm * bprm)
41741 else
41742 set_dumpable(current->mm, suid_dumpable);
41743
41744- name = bprm->filename;
41745-
41746- /* Copies the binary name from after last slash */
41747- for (i=0; (ch = *(name++)) != '\0';) {
41748- if (ch == '/')
41749- i = 0; /* overwrite what we wrote */
41750- else
41751- if (i < (sizeof(tcomm) - 1))
41752- tcomm[i++] = ch;
41753- }
41754- tcomm[i] = '\0';
41755- set_task_comm(current, tcomm);
41756+ set_task_comm(current, bprm->tcomm);
41757
41758 /* Set the new mm task size. We have to do that late because it may
41759 * depend on TIF_32BIT which is only updated in flush_thread() on
41760@@ -1247,7 +1280,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
41761 }
41762 rcu_read_unlock();
41763
41764- if (p->fs->users > n_fs) {
41765+ if (atomic_read(&p->fs->users) > n_fs) {
41766 bprm->unsafe |= LSM_UNSAFE_SHARE;
41767 } else {
41768 res = -EAGAIN;
41769@@ -1442,6 +1475,10 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
41770
41771 EXPORT_SYMBOL(search_binary_handler);
41772
41773+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
41774+atomic64_unchecked_t global_exec_counter = ATOMIC64_INIT(0);
41775+#endif
41776+
41777 /*
41778 * sys_execve() executes a new program.
41779 */
41780@@ -1450,6 +1487,11 @@ static int do_execve_common(const char *filename,
41781 struct user_arg_ptr envp,
41782 struct pt_regs *regs)
41783 {
41784+#ifdef CONFIG_GRKERNSEC
41785+ struct file *old_exec_file;
41786+ struct acl_subject_label *old_acl;
41787+ struct rlimit old_rlim[RLIM_NLIMITS];
41788+#endif
41789 struct linux_binprm *bprm;
41790 struct file *file;
41791 struct files_struct *displaced;
41792@@ -1457,6 +1499,8 @@ static int do_execve_common(const char *filename,
41793 int retval;
41794 const struct cred *cred = current_cred();
41795
41796+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
41797+
41798 /*
41799 * We move the actual failure in case of RLIMIT_NPROC excess from
41800 * set*uid() to execve() because too many poorly written programs
41801@@ -1497,12 +1541,27 @@ static int do_execve_common(const char *filename,
41802 if (IS_ERR(file))
41803 goto out_unmark;
41804
41805+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
41806+ retval = -EPERM;
41807+ goto out_file;
41808+ }
41809+
41810 sched_exec();
41811
41812 bprm->file = file;
41813 bprm->filename = filename;
41814 bprm->interp = filename;
41815
41816+ if (gr_process_user_ban()) {
41817+ retval = -EPERM;
41818+ goto out_file;
41819+ }
41820+
41821+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
41822+ retval = -EACCES;
41823+ goto out_file;
41824+ }
41825+
41826 retval = bprm_mm_init(bprm);
41827 if (retval)
41828 goto out_file;
41829@@ -1532,11 +1591,46 @@ static int do_execve_common(const char *filename,
41830 if (retval < 0)
41831 goto out;
41832
41833+ if (!gr_tpe_allow(file)) {
41834+ retval = -EACCES;
41835+ goto out;
41836+ }
41837+
41838+ if (gr_check_crash_exec(file)) {
41839+ retval = -EACCES;
41840+ goto out;
41841+ }
41842+
41843+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
41844+
41845+ gr_handle_exec_args(bprm, argv);
41846+
41847+#ifdef CONFIG_GRKERNSEC
41848+ old_acl = current->acl;
41849+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
41850+ old_exec_file = current->exec_file;
41851+ get_file(file);
41852+ current->exec_file = file;
41853+#endif
41854+
41855+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
41856+ bprm->unsafe);
41857+ if (retval < 0)
41858+ goto out_fail;
41859+
41860 retval = search_binary_handler(bprm,regs);
41861 if (retval < 0)
41862- goto out;
41863+ goto out_fail;
41864+#ifdef CONFIG_GRKERNSEC
41865+ if (old_exec_file)
41866+ fput(old_exec_file);
41867+#endif
41868
41869 /* execve succeeded */
41870+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
41871+ current->exec_id = atomic64_inc_return_unchecked(&global_exec_counter);
41872+#endif
41873+
41874 current->fs->in_exec = 0;
41875 current->in_execve = 0;
41876 acct_update_integrals(current);
41877@@ -1545,6 +1639,14 @@ static int do_execve_common(const char *filename,
41878 put_files_struct(displaced);
41879 return retval;
41880
41881+out_fail:
41882+#ifdef CONFIG_GRKERNSEC
41883+ current->acl = old_acl;
41884+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
41885+ fput(current->exec_file);
41886+ current->exec_file = old_exec_file;
41887+#endif
41888+
41889 out:
41890 if (bprm->mm) {
41891 acct_arg_size(bprm, 0);
41892@@ -1618,7 +1720,7 @@ static int expand_corename(struct core_name *cn)
41893 {
41894 char *old_corename = cn->corename;
41895
41896- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
41897+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
41898 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
41899
41900 if (!cn->corename) {
41901@@ -1715,7 +1817,7 @@ static int format_corename(struct core_name *cn, long signr)
41902 int pid_in_pattern = 0;
41903 int err = 0;
41904
41905- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
41906+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
41907 cn->corename = kmalloc(cn->size, GFP_KERNEL);
41908 cn->used = 0;
41909
41910@@ -1812,6 +1914,218 @@ out:
41911 return ispipe;
41912 }
41913
41914+int pax_check_flags(unsigned long *flags)
41915+{
41916+ int retval = 0;
41917+
41918+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
41919+ if (*flags & MF_PAX_SEGMEXEC)
41920+ {
41921+ *flags &= ~MF_PAX_SEGMEXEC;
41922+ retval = -EINVAL;
41923+ }
41924+#endif
41925+
41926+ if ((*flags & MF_PAX_PAGEEXEC)
41927+
41928+#ifdef CONFIG_PAX_PAGEEXEC
41929+ && (*flags & MF_PAX_SEGMEXEC)
41930+#endif
41931+
41932+ )
41933+ {
41934+ *flags &= ~MF_PAX_PAGEEXEC;
41935+ retval = -EINVAL;
41936+ }
41937+
41938+ if ((*flags & MF_PAX_MPROTECT)
41939+
41940+#ifdef CONFIG_PAX_MPROTECT
41941+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
41942+#endif
41943+
41944+ )
41945+ {
41946+ *flags &= ~MF_PAX_MPROTECT;
41947+ retval = -EINVAL;
41948+ }
41949+
41950+ if ((*flags & MF_PAX_EMUTRAMP)
41951+
41952+#ifdef CONFIG_PAX_EMUTRAMP
41953+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
41954+#endif
41955+
41956+ )
41957+ {
41958+ *flags &= ~MF_PAX_EMUTRAMP;
41959+ retval = -EINVAL;
41960+ }
41961+
41962+ return retval;
41963+}
41964+
41965+EXPORT_SYMBOL(pax_check_flags);
41966+
41967+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
41968+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
41969+{
41970+ struct task_struct *tsk = current;
41971+ struct mm_struct *mm = current->mm;
41972+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
41973+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
41974+ char *path_exec = NULL;
41975+ char *path_fault = NULL;
41976+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
41977+
41978+ if (buffer_exec && buffer_fault) {
41979+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
41980+
41981+ down_read(&mm->mmap_sem);
41982+ vma = mm->mmap;
41983+ while (vma && (!vma_exec || !vma_fault)) {
41984+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
41985+ vma_exec = vma;
41986+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
41987+ vma_fault = vma;
41988+ vma = vma->vm_next;
41989+ }
41990+ if (vma_exec) {
41991+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
41992+ if (IS_ERR(path_exec))
41993+ path_exec = "<path too long>";
41994+ else {
41995+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
41996+ if (path_exec) {
41997+ *path_exec = 0;
41998+ path_exec = buffer_exec;
41999+ } else
42000+ path_exec = "<path too long>";
42001+ }
42002+ }
42003+ if (vma_fault) {
42004+ start = vma_fault->vm_start;
42005+ end = vma_fault->vm_end;
42006+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
42007+ if (vma_fault->vm_file) {
42008+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
42009+ if (IS_ERR(path_fault))
42010+ path_fault = "<path too long>";
42011+ else {
42012+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
42013+ if (path_fault) {
42014+ *path_fault = 0;
42015+ path_fault = buffer_fault;
42016+ } else
42017+ path_fault = "<path too long>";
42018+ }
42019+ } else
42020+ path_fault = "<anonymous mapping>";
42021+ }
42022+ up_read(&mm->mmap_sem);
42023+ }
42024+ if (tsk->signal->curr_ip)
42025+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
42026+ else
42027+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
42028+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
42029+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
42030+ task_uid(tsk), task_euid(tsk), pc, sp);
42031+ free_page((unsigned long)buffer_exec);
42032+ free_page((unsigned long)buffer_fault);
42033+ pax_report_insns(regs, pc, sp);
42034+ do_coredump(SIGKILL, SIGKILL, regs);
42035+}
42036+#endif
42037+
42038+#ifdef CONFIG_PAX_REFCOUNT
42039+void pax_report_refcount_overflow(struct pt_regs *regs)
42040+{
42041+ if (current->signal->curr_ip)
42042+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
42043+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
42044+ else
42045+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
42046+ current->comm, task_pid_nr(current), current_uid(), current_euid());
42047+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
42048+ show_regs(regs);
42049+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
42050+}
42051+#endif
42052+
42053+#ifdef CONFIG_PAX_USERCOPY
42054+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
42055+int object_is_on_stack(const void *obj, unsigned long len)
42056+{
42057+ const void * const stack = task_stack_page(current);
42058+ const void * const stackend = stack + THREAD_SIZE;
42059+
42060+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
42061+ const void *frame = NULL;
42062+ const void *oldframe;
42063+#endif
42064+
42065+ if (obj + len < obj)
42066+ return -1;
42067+
42068+ if (obj + len <= stack || stackend <= obj)
42069+ return 0;
42070+
42071+ if (obj < stack || stackend < obj + len)
42072+ return -1;
42073+
42074+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
42075+ oldframe = __builtin_frame_address(1);
42076+ if (oldframe)
42077+ frame = __builtin_frame_address(2);
42078+ /*
42079+ low ----------------------------------------------> high
42080+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
42081+ ^----------------^
42082+ allow copies only within here
42083+ */
42084+ while (stack <= frame && frame < stackend) {
42085+ /* if obj + len extends past the last frame, this
42086+ check won't pass and the next frame will be 0,
42087+ causing us to bail out and correctly report
42088+ the copy as invalid
42089+ */
42090+ if (obj + len <= frame)
42091+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
42092+ oldframe = frame;
42093+ frame = *(const void * const *)frame;
42094+ }
42095+ return -1;
42096+#else
42097+ return 1;
42098+#endif
42099+}
42100+
42101+NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
42102+{
42103+ if (current->signal->curr_ip)
42104+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
42105+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
42106+ else
42107+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
42108+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
42109+ dump_stack();
42110+ gr_handle_kernel_exploit();
42111+ do_group_exit(SIGKILL);
42112+}
42113+#endif
42114+
42115+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
42116+void pax_track_stack(void)
42117+{
42118+ unsigned long sp = (unsigned long)&sp;
42119+ if (sp < current_thread_info()->lowest_stack &&
42120+ sp > (unsigned long)task_stack_page(current))
42121+ current_thread_info()->lowest_stack = sp;
42122+}
42123+EXPORT_SYMBOL(pax_track_stack);
42124+#endif
42125+
42126 static int zap_process(struct task_struct *start, int exit_code)
42127 {
42128 struct task_struct *t;
42129@@ -2023,17 +2337,17 @@ static void wait_for_dump_helpers(struct file *file)
42130 pipe = file->f_path.dentry->d_inode->i_pipe;
42131
42132 pipe_lock(pipe);
42133- pipe->readers++;
42134- pipe->writers--;
42135+ atomic_inc(&pipe->readers);
42136+ atomic_dec(&pipe->writers);
42137
42138- while ((pipe->readers > 1) && (!signal_pending(current))) {
42139+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
42140 wake_up_interruptible_sync(&pipe->wait);
42141 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
42142 pipe_wait(pipe);
42143 }
42144
42145- pipe->readers--;
42146- pipe->writers++;
42147+ atomic_dec(&pipe->readers);
42148+ atomic_inc(&pipe->writers);
42149 pipe_unlock(pipe);
42150
42151 }
42152@@ -2094,7 +2408,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
42153 int retval = 0;
42154 int flag = 0;
42155 int ispipe;
42156- static atomic_t core_dump_count = ATOMIC_INIT(0);
42157+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
42158 struct coredump_params cprm = {
42159 .signr = signr,
42160 .regs = regs,
42161@@ -2109,6 +2423,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
42162
42163 audit_core_dumps(signr);
42164
42165+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
42166+ gr_handle_brute_attach(current, cprm.mm_flags);
42167+
42168 binfmt = mm->binfmt;
42169 if (!binfmt || !binfmt->core_dump)
42170 goto fail;
42171@@ -2176,7 +2493,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
42172 }
42173 cprm.limit = RLIM_INFINITY;
42174
42175- dump_count = atomic_inc_return(&core_dump_count);
42176+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
42177 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
42178 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
42179 task_tgid_vnr(current), current->comm);
42180@@ -2203,6 +2520,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
42181 } else {
42182 struct inode *inode;
42183
42184+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
42185+
42186 if (cprm.limit < binfmt->min_coredump)
42187 goto fail_unlock;
42188
42189@@ -2246,7 +2565,7 @@ close_fail:
42190 filp_close(cprm.file, NULL);
42191 fail_dropcount:
42192 if (ispipe)
42193- atomic_dec(&core_dump_count);
42194+ atomic_dec_unchecked(&core_dump_count);
42195 fail_unlock:
42196 kfree(cn.corename);
42197 fail_corename:
42198@@ -2265,7 +2584,7 @@ fail:
42199 */
42200 int dump_write(struct file *file, const void *addr, int nr)
42201 {
42202- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
42203+ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
42204 }
42205 EXPORT_SYMBOL(dump_write);
42206
42207diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
42208index a8cbe1b..fed04cb 100644
42209--- a/fs/ext2/balloc.c
42210+++ b/fs/ext2/balloc.c
42211@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
42212
42213 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
42214 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
42215- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
42216+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
42217 sbi->s_resuid != current_fsuid() &&
42218 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
42219 return 0;
42220diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
42221index a203892..4e64db5 100644
42222--- a/fs/ext3/balloc.c
42223+++ b/fs/ext3/balloc.c
42224@@ -1446,9 +1446,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
42225
42226 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
42227 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
42228- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
42229+ if (free_blocks < root_blocks + 1 &&
42230 !use_reservation && sbi->s_resuid != current_fsuid() &&
42231- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
42232+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)) &&
42233+ !capable_nolog(CAP_SYS_RESOURCE)) {
42234 return 0;
42235 }
42236 return 1;
42237diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
42238index 12ccacd..a6035fce0 100644
42239--- a/fs/ext4/balloc.c
42240+++ b/fs/ext4/balloc.c
42241@@ -436,8 +436,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
42242 /* Hm, nope. Are (enough) root reserved clusters available? */
42243 if (sbi->s_resuid == current_fsuid() ||
42244 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
42245- capable(CAP_SYS_RESOURCE) ||
42246- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
42247+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
42248+ capable_nolog(CAP_SYS_RESOURCE)) {
42249
42250 if (free_clusters >= (nclusters + dirty_clusters))
42251 return 1;
42252diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
42253index 5b0e26a..0aa002d 100644
42254--- a/fs/ext4/ext4.h
42255+++ b/fs/ext4/ext4.h
42256@@ -1208,19 +1208,19 @@ struct ext4_sb_info {
42257 unsigned long s_mb_last_start;
42258
42259 /* stats for buddy allocator */
42260- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
42261- atomic_t s_bal_success; /* we found long enough chunks */
42262- atomic_t s_bal_allocated; /* in blocks */
42263- atomic_t s_bal_ex_scanned; /* total extents scanned */
42264- atomic_t s_bal_goals; /* goal hits */
42265- atomic_t s_bal_breaks; /* too long searches */
42266- atomic_t s_bal_2orders; /* 2^order hits */
42267+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
42268+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
42269+ atomic_unchecked_t s_bal_allocated; /* in blocks */
42270+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
42271+ atomic_unchecked_t s_bal_goals; /* goal hits */
42272+ atomic_unchecked_t s_bal_breaks; /* too long searches */
42273+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
42274 spinlock_t s_bal_lock;
42275 unsigned long s_mb_buddies_generated;
42276 unsigned long long s_mb_generation_time;
42277- atomic_t s_mb_lost_chunks;
42278- atomic_t s_mb_preallocated;
42279- atomic_t s_mb_discarded;
42280+ atomic_unchecked_t s_mb_lost_chunks;
42281+ atomic_unchecked_t s_mb_preallocated;
42282+ atomic_unchecked_t s_mb_discarded;
42283 atomic_t s_lock_busy;
42284
42285 /* locality groups */
42286diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
42287index e2d8be8..c7f0ce9 100644
42288--- a/fs/ext4/mballoc.c
42289+++ b/fs/ext4/mballoc.c
42290@@ -1794,7 +1794,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
42291 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
42292
42293 if (EXT4_SB(sb)->s_mb_stats)
42294- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
42295+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
42296
42297 break;
42298 }
42299@@ -2088,7 +2088,7 @@ repeat:
42300 ac->ac_status = AC_STATUS_CONTINUE;
42301 ac->ac_flags |= EXT4_MB_HINT_FIRST;
42302 cr = 3;
42303- atomic_inc(&sbi->s_mb_lost_chunks);
42304+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
42305 goto repeat;
42306 }
42307 }
42308@@ -2592,25 +2592,25 @@ int ext4_mb_release(struct super_block *sb)
42309 if (sbi->s_mb_stats) {
42310 ext4_msg(sb, KERN_INFO,
42311 "mballoc: %u blocks %u reqs (%u success)",
42312- atomic_read(&sbi->s_bal_allocated),
42313- atomic_read(&sbi->s_bal_reqs),
42314- atomic_read(&sbi->s_bal_success));
42315+ atomic_read_unchecked(&sbi->s_bal_allocated),
42316+ atomic_read_unchecked(&sbi->s_bal_reqs),
42317+ atomic_read_unchecked(&sbi->s_bal_success));
42318 ext4_msg(sb, KERN_INFO,
42319 "mballoc: %u extents scanned, %u goal hits, "
42320 "%u 2^N hits, %u breaks, %u lost",
42321- atomic_read(&sbi->s_bal_ex_scanned),
42322- atomic_read(&sbi->s_bal_goals),
42323- atomic_read(&sbi->s_bal_2orders),
42324- atomic_read(&sbi->s_bal_breaks),
42325- atomic_read(&sbi->s_mb_lost_chunks));
42326+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
42327+ atomic_read_unchecked(&sbi->s_bal_goals),
42328+ atomic_read_unchecked(&sbi->s_bal_2orders),
42329+ atomic_read_unchecked(&sbi->s_bal_breaks),
42330+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
42331 ext4_msg(sb, KERN_INFO,
42332 "mballoc: %lu generated and it took %Lu",
42333 sbi->s_mb_buddies_generated,
42334 sbi->s_mb_generation_time);
42335 ext4_msg(sb, KERN_INFO,
42336 "mballoc: %u preallocated, %u discarded",
42337- atomic_read(&sbi->s_mb_preallocated),
42338- atomic_read(&sbi->s_mb_discarded));
42339+ atomic_read_unchecked(&sbi->s_mb_preallocated),
42340+ atomic_read_unchecked(&sbi->s_mb_discarded));
42341 }
42342
42343 free_percpu(sbi->s_locality_groups);
42344@@ -3096,16 +3096,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
42345 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
42346
42347 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
42348- atomic_inc(&sbi->s_bal_reqs);
42349- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
42350+ atomic_inc_unchecked(&sbi->s_bal_reqs);
42351+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
42352 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
42353- atomic_inc(&sbi->s_bal_success);
42354- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
42355+ atomic_inc_unchecked(&sbi->s_bal_success);
42356+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
42357 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
42358 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
42359- atomic_inc(&sbi->s_bal_goals);
42360+ atomic_inc_unchecked(&sbi->s_bal_goals);
42361 if (ac->ac_found > sbi->s_mb_max_to_scan)
42362- atomic_inc(&sbi->s_bal_breaks);
42363+ atomic_inc_unchecked(&sbi->s_bal_breaks);
42364 }
42365
42366 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
42367@@ -3509,7 +3509,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
42368 trace_ext4_mb_new_inode_pa(ac, pa);
42369
42370 ext4_mb_use_inode_pa(ac, pa);
42371- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
42372+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
42373
42374 ei = EXT4_I(ac->ac_inode);
42375 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
42376@@ -3569,7 +3569,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
42377 trace_ext4_mb_new_group_pa(ac, pa);
42378
42379 ext4_mb_use_group_pa(ac, pa);
42380- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
42381+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
42382
42383 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
42384 lg = ac->ac_lg;
42385@@ -3658,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
42386 * from the bitmap and continue.
42387 */
42388 }
42389- atomic_add(free, &sbi->s_mb_discarded);
42390+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
42391
42392 return err;
42393 }
42394@@ -3676,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
42395 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
42396 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
42397 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
42398- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
42399+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
42400 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
42401
42402 return 0;
42403diff --git a/fs/fcntl.c b/fs/fcntl.c
42404index 22764c7..86372c9 100644
42405--- a/fs/fcntl.c
42406+++ b/fs/fcntl.c
42407@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
42408 if (err)
42409 return err;
42410
42411+ if (gr_handle_chroot_fowner(pid, type))
42412+ return -ENOENT;
42413+ if (gr_check_protected_task_fowner(pid, type))
42414+ return -EACCES;
42415+
42416 f_modown(filp, pid, type, force);
42417 return 0;
42418 }
42419@@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
42420
42421 static int f_setown_ex(struct file *filp, unsigned long arg)
42422 {
42423- struct f_owner_ex * __user owner_p = (void * __user)arg;
42424+ struct f_owner_ex __user *owner_p = (void __user *)arg;
42425 struct f_owner_ex owner;
42426 struct pid *pid;
42427 int type;
42428@@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
42429
42430 static int f_getown_ex(struct file *filp, unsigned long arg)
42431 {
42432- struct f_owner_ex * __user owner_p = (void * __user)arg;
42433+ struct f_owner_ex __user *owner_p = (void __user *)arg;
42434 struct f_owner_ex owner;
42435 int ret = 0;
42436
42437@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
42438 switch (cmd) {
42439 case F_DUPFD:
42440 case F_DUPFD_CLOEXEC:
42441+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
42442 if (arg >= rlimit(RLIMIT_NOFILE))
42443 break;
42444 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
42445diff --git a/fs/fifo.c b/fs/fifo.c
42446index b1a524d..4ee270e 100644
42447--- a/fs/fifo.c
42448+++ b/fs/fifo.c
42449@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
42450 */
42451 filp->f_op = &read_pipefifo_fops;
42452 pipe->r_counter++;
42453- if (pipe->readers++ == 0)
42454+ if (atomic_inc_return(&pipe->readers) == 1)
42455 wake_up_partner(inode);
42456
42457- if (!pipe->writers) {
42458+ if (!atomic_read(&pipe->writers)) {
42459 if ((filp->f_flags & O_NONBLOCK)) {
42460 /* suppress POLLHUP until we have
42461 * seen a writer */
42462@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
42463 * errno=ENXIO when there is no process reading the FIFO.
42464 */
42465 ret = -ENXIO;
42466- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
42467+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
42468 goto err;
42469
42470 filp->f_op = &write_pipefifo_fops;
42471 pipe->w_counter++;
42472- if (!pipe->writers++)
42473+ if (atomic_inc_return(&pipe->writers) == 1)
42474 wake_up_partner(inode);
42475
42476- if (!pipe->readers) {
42477+ if (!atomic_read(&pipe->readers)) {
42478 wait_for_partner(inode, &pipe->r_counter);
42479 if (signal_pending(current))
42480 goto err_wr;
42481@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
42482 */
42483 filp->f_op = &rdwr_pipefifo_fops;
42484
42485- pipe->readers++;
42486- pipe->writers++;
42487+ atomic_inc(&pipe->readers);
42488+ atomic_inc(&pipe->writers);
42489 pipe->r_counter++;
42490 pipe->w_counter++;
42491- if (pipe->readers == 1 || pipe->writers == 1)
42492+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
42493 wake_up_partner(inode);
42494 break;
42495
42496@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
42497 return 0;
42498
42499 err_rd:
42500- if (!--pipe->readers)
42501+ if (atomic_dec_and_test(&pipe->readers))
42502 wake_up_interruptible(&pipe->wait);
42503 ret = -ERESTARTSYS;
42504 goto err;
42505
42506 err_wr:
42507- if (!--pipe->writers)
42508+ if (atomic_dec_and_test(&pipe->writers))
42509 wake_up_interruptible(&pipe->wait);
42510 ret = -ERESTARTSYS;
42511 goto err;
42512
42513 err:
42514- if (!pipe->readers && !pipe->writers)
42515+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
42516 free_pipe_info(inode);
42517
42518 err_nocleanup:
42519diff --git a/fs/file.c b/fs/file.c
42520index 4c6992d..104cdea 100644
42521--- a/fs/file.c
42522+++ b/fs/file.c
42523@@ -15,6 +15,7 @@
42524 #include <linux/slab.h>
42525 #include <linux/vmalloc.h>
42526 #include <linux/file.h>
42527+#include <linux/security.h>
42528 #include <linux/fdtable.h>
42529 #include <linux/bitops.h>
42530 #include <linux/interrupt.h>
42531@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr)
42532 * N.B. For clone tasks sharing a files structure, this test
42533 * will limit the total number of files that can be opened.
42534 */
42535+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
42536 if (nr >= rlimit(RLIMIT_NOFILE))
42537 return -EMFILE;
42538
42539diff --git a/fs/filesystems.c b/fs/filesystems.c
42540index 0845f84..7b4ebef 100644
42541--- a/fs/filesystems.c
42542+++ b/fs/filesystems.c
42543@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(const char *name)
42544 int len = dot ? dot - name : strlen(name);
42545
42546 fs = __get_fs_type(name, len);
42547+
42548+#ifdef CONFIG_GRKERNSEC_MODHARDEN
42549+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
42550+#else
42551 if (!fs && (request_module("%.*s", len, name) == 0))
42552+#endif
42553 fs = __get_fs_type(name, len);
42554
42555 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
42556diff --git a/fs/fs_struct.c b/fs/fs_struct.c
42557index 78b519c..212c0d0 100644
42558--- a/fs/fs_struct.c
42559+++ b/fs/fs_struct.c
42560@@ -4,6 +4,7 @@
42561 #include <linux/path.h>
42562 #include <linux/slab.h>
42563 #include <linux/fs_struct.h>
42564+#include <linux/grsecurity.h>
42565 #include "internal.h"
42566
42567 static inline void path_get_longterm(struct path *path)
42568@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
42569 old_root = fs->root;
42570 fs->root = *path;
42571 path_get_longterm(path);
42572+ gr_set_chroot_entries(current, path);
42573 write_seqcount_end(&fs->seq);
42574 spin_unlock(&fs->lock);
42575 if (old_root.dentry)
42576@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
42577 && fs->root.mnt == old_root->mnt) {
42578 path_get_longterm(new_root);
42579 fs->root = *new_root;
42580+ gr_set_chroot_entries(p, new_root);
42581 count++;
42582 }
42583 if (fs->pwd.dentry == old_root->dentry
42584@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
42585 spin_lock(&fs->lock);
42586 write_seqcount_begin(&fs->seq);
42587 tsk->fs = NULL;
42588- kill = !--fs->users;
42589+ gr_clear_chroot_entries(tsk);
42590+ kill = !atomic_dec_return(&fs->users);
42591 write_seqcount_end(&fs->seq);
42592 spin_unlock(&fs->lock);
42593 task_unlock(tsk);
42594@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
42595 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
42596 /* We don't need to lock fs - think why ;-) */
42597 if (fs) {
42598- fs->users = 1;
42599+ atomic_set(&fs->users, 1);
42600 fs->in_exec = 0;
42601 spin_lock_init(&fs->lock);
42602 seqcount_init(&fs->seq);
42603@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
42604 spin_lock(&old->lock);
42605 fs->root = old->root;
42606 path_get_longterm(&fs->root);
42607+ /* instead of calling gr_set_chroot_entries here,
42608+ we call it from every caller of this function
42609+ */
42610 fs->pwd = old->pwd;
42611 path_get_longterm(&fs->pwd);
42612 spin_unlock(&old->lock);
42613@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
42614
42615 task_lock(current);
42616 spin_lock(&fs->lock);
42617- kill = !--fs->users;
42618+ kill = !atomic_dec_return(&fs->users);
42619 current->fs = new_fs;
42620+ gr_set_chroot_entries(current, &new_fs->root);
42621 spin_unlock(&fs->lock);
42622 task_unlock(current);
42623
42624@@ -170,7 +178,7 @@ EXPORT_SYMBOL(current_umask);
42625
42626 /* to be mentioned only in INIT_TASK */
42627 struct fs_struct init_fs = {
42628- .users = 1,
42629+ .users = ATOMIC_INIT(1),
42630 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
42631 .seq = SEQCNT_ZERO,
42632 .umask = 0022,
42633@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
42634 task_lock(current);
42635
42636 spin_lock(&init_fs.lock);
42637- init_fs.users++;
42638+ atomic_inc(&init_fs.users);
42639 spin_unlock(&init_fs.lock);
42640
42641 spin_lock(&fs->lock);
42642 current->fs = &init_fs;
42643- kill = !--fs->users;
42644+ gr_set_chroot_entries(current, &current->fs->root);
42645+ kill = !atomic_dec_return(&fs->users);
42646 spin_unlock(&fs->lock);
42647
42648 task_unlock(current);
42649diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
42650index 9905350..02eaec4 100644
42651--- a/fs/fscache/cookie.c
42652+++ b/fs/fscache/cookie.c
42653@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
42654 parent ? (char *) parent->def->name : "<no-parent>",
42655 def->name, netfs_data);
42656
42657- fscache_stat(&fscache_n_acquires);
42658+ fscache_stat_unchecked(&fscache_n_acquires);
42659
42660 /* if there's no parent cookie, then we don't create one here either */
42661 if (!parent) {
42662- fscache_stat(&fscache_n_acquires_null);
42663+ fscache_stat_unchecked(&fscache_n_acquires_null);
42664 _leave(" [no parent]");
42665 return NULL;
42666 }
42667@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
42668 /* allocate and initialise a cookie */
42669 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
42670 if (!cookie) {
42671- fscache_stat(&fscache_n_acquires_oom);
42672+ fscache_stat_unchecked(&fscache_n_acquires_oom);
42673 _leave(" [ENOMEM]");
42674 return NULL;
42675 }
42676@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
42677
42678 switch (cookie->def->type) {
42679 case FSCACHE_COOKIE_TYPE_INDEX:
42680- fscache_stat(&fscache_n_cookie_index);
42681+ fscache_stat_unchecked(&fscache_n_cookie_index);
42682 break;
42683 case FSCACHE_COOKIE_TYPE_DATAFILE:
42684- fscache_stat(&fscache_n_cookie_data);
42685+ fscache_stat_unchecked(&fscache_n_cookie_data);
42686 break;
42687 default:
42688- fscache_stat(&fscache_n_cookie_special);
42689+ fscache_stat_unchecked(&fscache_n_cookie_special);
42690 break;
42691 }
42692
42693@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
42694 if (fscache_acquire_non_index_cookie(cookie) < 0) {
42695 atomic_dec(&parent->n_children);
42696 __fscache_cookie_put(cookie);
42697- fscache_stat(&fscache_n_acquires_nobufs);
42698+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
42699 _leave(" = NULL");
42700 return NULL;
42701 }
42702 }
42703
42704- fscache_stat(&fscache_n_acquires_ok);
42705+ fscache_stat_unchecked(&fscache_n_acquires_ok);
42706 _leave(" = %p", cookie);
42707 return cookie;
42708 }
42709@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
42710 cache = fscache_select_cache_for_object(cookie->parent);
42711 if (!cache) {
42712 up_read(&fscache_addremove_sem);
42713- fscache_stat(&fscache_n_acquires_no_cache);
42714+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
42715 _leave(" = -ENOMEDIUM [no cache]");
42716 return -ENOMEDIUM;
42717 }
42718@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
42719 object = cache->ops->alloc_object(cache, cookie);
42720 fscache_stat_d(&fscache_n_cop_alloc_object);
42721 if (IS_ERR(object)) {
42722- fscache_stat(&fscache_n_object_no_alloc);
42723+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
42724 ret = PTR_ERR(object);
42725 goto error;
42726 }
42727
42728- fscache_stat(&fscache_n_object_alloc);
42729+ fscache_stat_unchecked(&fscache_n_object_alloc);
42730
42731 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
42732
42733@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
42734 struct fscache_object *object;
42735 struct hlist_node *_p;
42736
42737- fscache_stat(&fscache_n_updates);
42738+ fscache_stat_unchecked(&fscache_n_updates);
42739
42740 if (!cookie) {
42741- fscache_stat(&fscache_n_updates_null);
42742+ fscache_stat_unchecked(&fscache_n_updates_null);
42743 _leave(" [no cookie]");
42744 return;
42745 }
42746@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
42747 struct fscache_object *object;
42748 unsigned long event;
42749
42750- fscache_stat(&fscache_n_relinquishes);
42751+ fscache_stat_unchecked(&fscache_n_relinquishes);
42752 if (retire)
42753- fscache_stat(&fscache_n_relinquishes_retire);
42754+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
42755
42756 if (!cookie) {
42757- fscache_stat(&fscache_n_relinquishes_null);
42758+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
42759 _leave(" [no cookie]");
42760 return;
42761 }
42762@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
42763
42764 /* wait for the cookie to finish being instantiated (or to fail) */
42765 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
42766- fscache_stat(&fscache_n_relinquishes_waitcrt);
42767+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
42768 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
42769 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
42770 }
42771diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
42772index f6aad48..88dcf26 100644
42773--- a/fs/fscache/internal.h
42774+++ b/fs/fscache/internal.h
42775@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
42776 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
42777 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
42778
42779-extern atomic_t fscache_n_op_pend;
42780-extern atomic_t fscache_n_op_run;
42781-extern atomic_t fscache_n_op_enqueue;
42782-extern atomic_t fscache_n_op_deferred_release;
42783-extern atomic_t fscache_n_op_release;
42784-extern atomic_t fscache_n_op_gc;
42785-extern atomic_t fscache_n_op_cancelled;
42786-extern atomic_t fscache_n_op_rejected;
42787+extern atomic_unchecked_t fscache_n_op_pend;
42788+extern atomic_unchecked_t fscache_n_op_run;
42789+extern atomic_unchecked_t fscache_n_op_enqueue;
42790+extern atomic_unchecked_t fscache_n_op_deferred_release;
42791+extern atomic_unchecked_t fscache_n_op_release;
42792+extern atomic_unchecked_t fscache_n_op_gc;
42793+extern atomic_unchecked_t fscache_n_op_cancelled;
42794+extern atomic_unchecked_t fscache_n_op_rejected;
42795
42796-extern atomic_t fscache_n_attr_changed;
42797-extern atomic_t fscache_n_attr_changed_ok;
42798-extern atomic_t fscache_n_attr_changed_nobufs;
42799-extern atomic_t fscache_n_attr_changed_nomem;
42800-extern atomic_t fscache_n_attr_changed_calls;
42801+extern atomic_unchecked_t fscache_n_attr_changed;
42802+extern atomic_unchecked_t fscache_n_attr_changed_ok;
42803+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
42804+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
42805+extern atomic_unchecked_t fscache_n_attr_changed_calls;
42806
42807-extern atomic_t fscache_n_allocs;
42808-extern atomic_t fscache_n_allocs_ok;
42809-extern atomic_t fscache_n_allocs_wait;
42810-extern atomic_t fscache_n_allocs_nobufs;
42811-extern atomic_t fscache_n_allocs_intr;
42812-extern atomic_t fscache_n_allocs_object_dead;
42813-extern atomic_t fscache_n_alloc_ops;
42814-extern atomic_t fscache_n_alloc_op_waits;
42815+extern atomic_unchecked_t fscache_n_allocs;
42816+extern atomic_unchecked_t fscache_n_allocs_ok;
42817+extern atomic_unchecked_t fscache_n_allocs_wait;
42818+extern atomic_unchecked_t fscache_n_allocs_nobufs;
42819+extern atomic_unchecked_t fscache_n_allocs_intr;
42820+extern atomic_unchecked_t fscache_n_allocs_object_dead;
42821+extern atomic_unchecked_t fscache_n_alloc_ops;
42822+extern atomic_unchecked_t fscache_n_alloc_op_waits;
42823
42824-extern atomic_t fscache_n_retrievals;
42825-extern atomic_t fscache_n_retrievals_ok;
42826-extern atomic_t fscache_n_retrievals_wait;
42827-extern atomic_t fscache_n_retrievals_nodata;
42828-extern atomic_t fscache_n_retrievals_nobufs;
42829-extern atomic_t fscache_n_retrievals_intr;
42830-extern atomic_t fscache_n_retrievals_nomem;
42831-extern atomic_t fscache_n_retrievals_object_dead;
42832-extern atomic_t fscache_n_retrieval_ops;
42833-extern atomic_t fscache_n_retrieval_op_waits;
42834+extern atomic_unchecked_t fscache_n_retrievals;
42835+extern atomic_unchecked_t fscache_n_retrievals_ok;
42836+extern atomic_unchecked_t fscache_n_retrievals_wait;
42837+extern atomic_unchecked_t fscache_n_retrievals_nodata;
42838+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
42839+extern atomic_unchecked_t fscache_n_retrievals_intr;
42840+extern atomic_unchecked_t fscache_n_retrievals_nomem;
42841+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
42842+extern atomic_unchecked_t fscache_n_retrieval_ops;
42843+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
42844
42845-extern atomic_t fscache_n_stores;
42846-extern atomic_t fscache_n_stores_ok;
42847-extern atomic_t fscache_n_stores_again;
42848-extern atomic_t fscache_n_stores_nobufs;
42849-extern atomic_t fscache_n_stores_oom;
42850-extern atomic_t fscache_n_store_ops;
42851-extern atomic_t fscache_n_store_calls;
42852-extern atomic_t fscache_n_store_pages;
42853-extern atomic_t fscache_n_store_radix_deletes;
42854-extern atomic_t fscache_n_store_pages_over_limit;
42855+extern atomic_unchecked_t fscache_n_stores;
42856+extern atomic_unchecked_t fscache_n_stores_ok;
42857+extern atomic_unchecked_t fscache_n_stores_again;
42858+extern atomic_unchecked_t fscache_n_stores_nobufs;
42859+extern atomic_unchecked_t fscache_n_stores_oom;
42860+extern atomic_unchecked_t fscache_n_store_ops;
42861+extern atomic_unchecked_t fscache_n_store_calls;
42862+extern atomic_unchecked_t fscache_n_store_pages;
42863+extern atomic_unchecked_t fscache_n_store_radix_deletes;
42864+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
42865
42866-extern atomic_t fscache_n_store_vmscan_not_storing;
42867-extern atomic_t fscache_n_store_vmscan_gone;
42868-extern atomic_t fscache_n_store_vmscan_busy;
42869-extern atomic_t fscache_n_store_vmscan_cancelled;
42870+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
42871+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
42872+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
42873+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
42874
42875-extern atomic_t fscache_n_marks;
42876-extern atomic_t fscache_n_uncaches;
42877+extern atomic_unchecked_t fscache_n_marks;
42878+extern atomic_unchecked_t fscache_n_uncaches;
42879
42880-extern atomic_t fscache_n_acquires;
42881-extern atomic_t fscache_n_acquires_null;
42882-extern atomic_t fscache_n_acquires_no_cache;
42883-extern atomic_t fscache_n_acquires_ok;
42884-extern atomic_t fscache_n_acquires_nobufs;
42885-extern atomic_t fscache_n_acquires_oom;
42886+extern atomic_unchecked_t fscache_n_acquires;
42887+extern atomic_unchecked_t fscache_n_acquires_null;
42888+extern atomic_unchecked_t fscache_n_acquires_no_cache;
42889+extern atomic_unchecked_t fscache_n_acquires_ok;
42890+extern atomic_unchecked_t fscache_n_acquires_nobufs;
42891+extern atomic_unchecked_t fscache_n_acquires_oom;
42892
42893-extern atomic_t fscache_n_updates;
42894-extern atomic_t fscache_n_updates_null;
42895-extern atomic_t fscache_n_updates_run;
42896+extern atomic_unchecked_t fscache_n_updates;
42897+extern atomic_unchecked_t fscache_n_updates_null;
42898+extern atomic_unchecked_t fscache_n_updates_run;
42899
42900-extern atomic_t fscache_n_relinquishes;
42901-extern atomic_t fscache_n_relinquishes_null;
42902-extern atomic_t fscache_n_relinquishes_waitcrt;
42903-extern atomic_t fscache_n_relinquishes_retire;
42904+extern atomic_unchecked_t fscache_n_relinquishes;
42905+extern atomic_unchecked_t fscache_n_relinquishes_null;
42906+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
42907+extern atomic_unchecked_t fscache_n_relinquishes_retire;
42908
42909-extern atomic_t fscache_n_cookie_index;
42910-extern atomic_t fscache_n_cookie_data;
42911-extern atomic_t fscache_n_cookie_special;
42912+extern atomic_unchecked_t fscache_n_cookie_index;
42913+extern atomic_unchecked_t fscache_n_cookie_data;
42914+extern atomic_unchecked_t fscache_n_cookie_special;
42915
42916-extern atomic_t fscache_n_object_alloc;
42917-extern atomic_t fscache_n_object_no_alloc;
42918-extern atomic_t fscache_n_object_lookups;
42919-extern atomic_t fscache_n_object_lookups_negative;
42920-extern atomic_t fscache_n_object_lookups_positive;
42921-extern atomic_t fscache_n_object_lookups_timed_out;
42922-extern atomic_t fscache_n_object_created;
42923-extern atomic_t fscache_n_object_avail;
42924-extern atomic_t fscache_n_object_dead;
42925+extern atomic_unchecked_t fscache_n_object_alloc;
42926+extern atomic_unchecked_t fscache_n_object_no_alloc;
42927+extern atomic_unchecked_t fscache_n_object_lookups;
42928+extern atomic_unchecked_t fscache_n_object_lookups_negative;
42929+extern atomic_unchecked_t fscache_n_object_lookups_positive;
42930+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
42931+extern atomic_unchecked_t fscache_n_object_created;
42932+extern atomic_unchecked_t fscache_n_object_avail;
42933+extern atomic_unchecked_t fscache_n_object_dead;
42934
42935-extern atomic_t fscache_n_checkaux_none;
42936-extern atomic_t fscache_n_checkaux_okay;
42937-extern atomic_t fscache_n_checkaux_update;
42938-extern atomic_t fscache_n_checkaux_obsolete;
42939+extern atomic_unchecked_t fscache_n_checkaux_none;
42940+extern atomic_unchecked_t fscache_n_checkaux_okay;
42941+extern atomic_unchecked_t fscache_n_checkaux_update;
42942+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
42943
42944 extern atomic_t fscache_n_cop_alloc_object;
42945 extern atomic_t fscache_n_cop_lookup_object;
42946@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
42947 atomic_inc(stat);
42948 }
42949
42950+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
42951+{
42952+ atomic_inc_unchecked(stat);
42953+}
42954+
42955 static inline void fscache_stat_d(atomic_t *stat)
42956 {
42957 atomic_dec(stat);
42958@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
42959
42960 #define __fscache_stat(stat) (NULL)
42961 #define fscache_stat(stat) do {} while (0)
42962+#define fscache_stat_unchecked(stat) do {} while (0)
42963 #define fscache_stat_d(stat) do {} while (0)
42964 #endif
42965
42966diff --git a/fs/fscache/object.c b/fs/fscache/object.c
42967index b6b897c..0ffff9c 100644
42968--- a/fs/fscache/object.c
42969+++ b/fs/fscache/object.c
42970@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
42971 /* update the object metadata on disk */
42972 case FSCACHE_OBJECT_UPDATING:
42973 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
42974- fscache_stat(&fscache_n_updates_run);
42975+ fscache_stat_unchecked(&fscache_n_updates_run);
42976 fscache_stat(&fscache_n_cop_update_object);
42977 object->cache->ops->update_object(object);
42978 fscache_stat_d(&fscache_n_cop_update_object);
42979@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
42980 spin_lock(&object->lock);
42981 object->state = FSCACHE_OBJECT_DEAD;
42982 spin_unlock(&object->lock);
42983- fscache_stat(&fscache_n_object_dead);
42984+ fscache_stat_unchecked(&fscache_n_object_dead);
42985 goto terminal_transit;
42986
42987 /* handle the parent cache of this object being withdrawn from
42988@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
42989 spin_lock(&object->lock);
42990 object->state = FSCACHE_OBJECT_DEAD;
42991 spin_unlock(&object->lock);
42992- fscache_stat(&fscache_n_object_dead);
42993+ fscache_stat_unchecked(&fscache_n_object_dead);
42994 goto terminal_transit;
42995
42996 /* complain about the object being woken up once it is
42997@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
42998 parent->cookie->def->name, cookie->def->name,
42999 object->cache->tag->name);
43000
43001- fscache_stat(&fscache_n_object_lookups);
43002+ fscache_stat_unchecked(&fscache_n_object_lookups);
43003 fscache_stat(&fscache_n_cop_lookup_object);
43004 ret = object->cache->ops->lookup_object(object);
43005 fscache_stat_d(&fscache_n_cop_lookup_object);
43006@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
43007 if (ret == -ETIMEDOUT) {
43008 /* probably stuck behind another object, so move this one to
43009 * the back of the queue */
43010- fscache_stat(&fscache_n_object_lookups_timed_out);
43011+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
43012 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
43013 }
43014
43015@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
43016
43017 spin_lock(&object->lock);
43018 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
43019- fscache_stat(&fscache_n_object_lookups_negative);
43020+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
43021
43022 /* transit here to allow write requests to begin stacking up
43023 * and read requests to begin returning ENODATA */
43024@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
43025 * result, in which case there may be data available */
43026 spin_lock(&object->lock);
43027 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
43028- fscache_stat(&fscache_n_object_lookups_positive);
43029+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
43030
43031 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
43032
43033@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
43034 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
43035 } else {
43036 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
43037- fscache_stat(&fscache_n_object_created);
43038+ fscache_stat_unchecked(&fscache_n_object_created);
43039
43040 object->state = FSCACHE_OBJECT_AVAILABLE;
43041 spin_unlock(&object->lock);
43042@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
43043 fscache_enqueue_dependents(object);
43044
43045 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
43046- fscache_stat(&fscache_n_object_avail);
43047+ fscache_stat_unchecked(&fscache_n_object_avail);
43048
43049 _leave("");
43050 }
43051@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
43052 enum fscache_checkaux result;
43053
43054 if (!object->cookie->def->check_aux) {
43055- fscache_stat(&fscache_n_checkaux_none);
43056+ fscache_stat_unchecked(&fscache_n_checkaux_none);
43057 return FSCACHE_CHECKAUX_OKAY;
43058 }
43059
43060@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
43061 switch (result) {
43062 /* entry okay as is */
43063 case FSCACHE_CHECKAUX_OKAY:
43064- fscache_stat(&fscache_n_checkaux_okay);
43065+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
43066 break;
43067
43068 /* entry requires update */
43069 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
43070- fscache_stat(&fscache_n_checkaux_update);
43071+ fscache_stat_unchecked(&fscache_n_checkaux_update);
43072 break;
43073
43074 /* entry requires deletion */
43075 case FSCACHE_CHECKAUX_OBSOLETE:
43076- fscache_stat(&fscache_n_checkaux_obsolete);
43077+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
43078 break;
43079
43080 default:
43081diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
43082index 30afdfa..2256596 100644
43083--- a/fs/fscache/operation.c
43084+++ b/fs/fscache/operation.c
43085@@ -17,7 +17,7 @@
43086 #include <linux/slab.h>
43087 #include "internal.h"
43088
43089-atomic_t fscache_op_debug_id;
43090+atomic_unchecked_t fscache_op_debug_id;
43091 EXPORT_SYMBOL(fscache_op_debug_id);
43092
43093 /**
43094@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
43095 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
43096 ASSERTCMP(atomic_read(&op->usage), >, 0);
43097
43098- fscache_stat(&fscache_n_op_enqueue);
43099+ fscache_stat_unchecked(&fscache_n_op_enqueue);
43100 switch (op->flags & FSCACHE_OP_TYPE) {
43101 case FSCACHE_OP_ASYNC:
43102 _debug("queue async");
43103@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
43104 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
43105 if (op->processor)
43106 fscache_enqueue_operation(op);
43107- fscache_stat(&fscache_n_op_run);
43108+ fscache_stat_unchecked(&fscache_n_op_run);
43109 }
43110
43111 /*
43112@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
43113 if (object->n_ops > 1) {
43114 atomic_inc(&op->usage);
43115 list_add_tail(&op->pend_link, &object->pending_ops);
43116- fscache_stat(&fscache_n_op_pend);
43117+ fscache_stat_unchecked(&fscache_n_op_pend);
43118 } else if (!list_empty(&object->pending_ops)) {
43119 atomic_inc(&op->usage);
43120 list_add_tail(&op->pend_link, &object->pending_ops);
43121- fscache_stat(&fscache_n_op_pend);
43122+ fscache_stat_unchecked(&fscache_n_op_pend);
43123 fscache_start_operations(object);
43124 } else {
43125 ASSERTCMP(object->n_in_progress, ==, 0);
43126@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
43127 object->n_exclusive++; /* reads and writes must wait */
43128 atomic_inc(&op->usage);
43129 list_add_tail(&op->pend_link, &object->pending_ops);
43130- fscache_stat(&fscache_n_op_pend);
43131+ fscache_stat_unchecked(&fscache_n_op_pend);
43132 ret = 0;
43133 } else {
43134 /* not allowed to submit ops in any other state */
43135@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
43136 if (object->n_exclusive > 0) {
43137 atomic_inc(&op->usage);
43138 list_add_tail(&op->pend_link, &object->pending_ops);
43139- fscache_stat(&fscache_n_op_pend);
43140+ fscache_stat_unchecked(&fscache_n_op_pend);
43141 } else if (!list_empty(&object->pending_ops)) {
43142 atomic_inc(&op->usage);
43143 list_add_tail(&op->pend_link, &object->pending_ops);
43144- fscache_stat(&fscache_n_op_pend);
43145+ fscache_stat_unchecked(&fscache_n_op_pend);
43146 fscache_start_operations(object);
43147 } else {
43148 ASSERTCMP(object->n_exclusive, ==, 0);
43149@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
43150 object->n_ops++;
43151 atomic_inc(&op->usage);
43152 list_add_tail(&op->pend_link, &object->pending_ops);
43153- fscache_stat(&fscache_n_op_pend);
43154+ fscache_stat_unchecked(&fscache_n_op_pend);
43155 ret = 0;
43156 } else if (object->state == FSCACHE_OBJECT_DYING ||
43157 object->state == FSCACHE_OBJECT_LC_DYING ||
43158 object->state == FSCACHE_OBJECT_WITHDRAWING) {
43159- fscache_stat(&fscache_n_op_rejected);
43160+ fscache_stat_unchecked(&fscache_n_op_rejected);
43161 ret = -ENOBUFS;
43162 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
43163 fscache_report_unexpected_submission(object, op, ostate);
43164@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
43165
43166 ret = -EBUSY;
43167 if (!list_empty(&op->pend_link)) {
43168- fscache_stat(&fscache_n_op_cancelled);
43169+ fscache_stat_unchecked(&fscache_n_op_cancelled);
43170 list_del_init(&op->pend_link);
43171 object->n_ops--;
43172 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
43173@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
43174 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
43175 BUG();
43176
43177- fscache_stat(&fscache_n_op_release);
43178+ fscache_stat_unchecked(&fscache_n_op_release);
43179
43180 if (op->release) {
43181 op->release(op);
43182@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
43183 * lock, and defer it otherwise */
43184 if (!spin_trylock(&object->lock)) {
43185 _debug("defer put");
43186- fscache_stat(&fscache_n_op_deferred_release);
43187+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
43188
43189 cache = object->cache;
43190 spin_lock(&cache->op_gc_list_lock);
43191@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
43192
43193 _debug("GC DEFERRED REL OBJ%x OP%x",
43194 object->debug_id, op->debug_id);
43195- fscache_stat(&fscache_n_op_gc);
43196+ fscache_stat_unchecked(&fscache_n_op_gc);
43197
43198 ASSERTCMP(atomic_read(&op->usage), ==, 0);
43199
43200diff --git a/fs/fscache/page.c b/fs/fscache/page.c
43201index 3f7a59b..cf196cc 100644
43202--- a/fs/fscache/page.c
43203+++ b/fs/fscache/page.c
43204@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
43205 val = radix_tree_lookup(&cookie->stores, page->index);
43206 if (!val) {
43207 rcu_read_unlock();
43208- fscache_stat(&fscache_n_store_vmscan_not_storing);
43209+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
43210 __fscache_uncache_page(cookie, page);
43211 return true;
43212 }
43213@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
43214 spin_unlock(&cookie->stores_lock);
43215
43216 if (xpage) {
43217- fscache_stat(&fscache_n_store_vmscan_cancelled);
43218- fscache_stat(&fscache_n_store_radix_deletes);
43219+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
43220+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
43221 ASSERTCMP(xpage, ==, page);
43222 } else {
43223- fscache_stat(&fscache_n_store_vmscan_gone);
43224+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
43225 }
43226
43227 wake_up_bit(&cookie->flags, 0);
43228@@ -107,7 +107,7 @@ page_busy:
43229 /* we might want to wait here, but that could deadlock the allocator as
43230 * the work threads writing to the cache may all end up sleeping
43231 * on memory allocation */
43232- fscache_stat(&fscache_n_store_vmscan_busy);
43233+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
43234 return false;
43235 }
43236 EXPORT_SYMBOL(__fscache_maybe_release_page);
43237@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
43238 FSCACHE_COOKIE_STORING_TAG);
43239 if (!radix_tree_tag_get(&cookie->stores, page->index,
43240 FSCACHE_COOKIE_PENDING_TAG)) {
43241- fscache_stat(&fscache_n_store_radix_deletes);
43242+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
43243 xpage = radix_tree_delete(&cookie->stores, page->index);
43244 }
43245 spin_unlock(&cookie->stores_lock);
43246@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
43247
43248 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
43249
43250- fscache_stat(&fscache_n_attr_changed_calls);
43251+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
43252
43253 if (fscache_object_is_active(object)) {
43254 fscache_stat(&fscache_n_cop_attr_changed);
43255@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
43256
43257 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
43258
43259- fscache_stat(&fscache_n_attr_changed);
43260+ fscache_stat_unchecked(&fscache_n_attr_changed);
43261
43262 op = kzalloc(sizeof(*op), GFP_KERNEL);
43263 if (!op) {
43264- fscache_stat(&fscache_n_attr_changed_nomem);
43265+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
43266 _leave(" = -ENOMEM");
43267 return -ENOMEM;
43268 }
43269@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
43270 if (fscache_submit_exclusive_op(object, op) < 0)
43271 goto nobufs;
43272 spin_unlock(&cookie->lock);
43273- fscache_stat(&fscache_n_attr_changed_ok);
43274+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
43275 fscache_put_operation(op);
43276 _leave(" = 0");
43277 return 0;
43278@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
43279 nobufs:
43280 spin_unlock(&cookie->lock);
43281 kfree(op);
43282- fscache_stat(&fscache_n_attr_changed_nobufs);
43283+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
43284 _leave(" = %d", -ENOBUFS);
43285 return -ENOBUFS;
43286 }
43287@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
43288 /* allocate a retrieval operation and attempt to submit it */
43289 op = kzalloc(sizeof(*op), GFP_NOIO);
43290 if (!op) {
43291- fscache_stat(&fscache_n_retrievals_nomem);
43292+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
43293 return NULL;
43294 }
43295
43296@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
43297 return 0;
43298 }
43299
43300- fscache_stat(&fscache_n_retrievals_wait);
43301+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
43302
43303 jif = jiffies;
43304 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
43305 fscache_wait_bit_interruptible,
43306 TASK_INTERRUPTIBLE) != 0) {
43307- fscache_stat(&fscache_n_retrievals_intr);
43308+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
43309 _leave(" = -ERESTARTSYS");
43310 return -ERESTARTSYS;
43311 }
43312@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
43313 */
43314 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
43315 struct fscache_retrieval *op,
43316- atomic_t *stat_op_waits,
43317- atomic_t *stat_object_dead)
43318+ atomic_unchecked_t *stat_op_waits,
43319+ atomic_unchecked_t *stat_object_dead)
43320 {
43321 int ret;
43322
43323@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
43324 goto check_if_dead;
43325
43326 _debug(">>> WT");
43327- fscache_stat(stat_op_waits);
43328+ fscache_stat_unchecked(stat_op_waits);
43329 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
43330 fscache_wait_bit_interruptible,
43331 TASK_INTERRUPTIBLE) < 0) {
43332@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
43333
43334 check_if_dead:
43335 if (unlikely(fscache_object_is_dead(object))) {
43336- fscache_stat(stat_object_dead);
43337+ fscache_stat_unchecked(stat_object_dead);
43338 return -ENOBUFS;
43339 }
43340 return 0;
43341@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
43342
43343 _enter("%p,%p,,,", cookie, page);
43344
43345- fscache_stat(&fscache_n_retrievals);
43346+ fscache_stat_unchecked(&fscache_n_retrievals);
43347
43348 if (hlist_empty(&cookie->backing_objects))
43349 goto nobufs;
43350@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
43351 goto nobufs_unlock;
43352 spin_unlock(&cookie->lock);
43353
43354- fscache_stat(&fscache_n_retrieval_ops);
43355+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
43356
43357 /* pin the netfs read context in case we need to do the actual netfs
43358 * read because we've encountered a cache read failure */
43359@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
43360
43361 error:
43362 if (ret == -ENOMEM)
43363- fscache_stat(&fscache_n_retrievals_nomem);
43364+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
43365 else if (ret == -ERESTARTSYS)
43366- fscache_stat(&fscache_n_retrievals_intr);
43367+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
43368 else if (ret == -ENODATA)
43369- fscache_stat(&fscache_n_retrievals_nodata);
43370+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
43371 else if (ret < 0)
43372- fscache_stat(&fscache_n_retrievals_nobufs);
43373+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
43374 else
43375- fscache_stat(&fscache_n_retrievals_ok);
43376+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
43377
43378 fscache_put_retrieval(op);
43379 _leave(" = %d", ret);
43380@@ -429,7 +429,7 @@ nobufs_unlock:
43381 spin_unlock(&cookie->lock);
43382 kfree(op);
43383 nobufs:
43384- fscache_stat(&fscache_n_retrievals_nobufs);
43385+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
43386 _leave(" = -ENOBUFS");
43387 return -ENOBUFS;
43388 }
43389@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
43390
43391 _enter("%p,,%d,,,", cookie, *nr_pages);
43392
43393- fscache_stat(&fscache_n_retrievals);
43394+ fscache_stat_unchecked(&fscache_n_retrievals);
43395
43396 if (hlist_empty(&cookie->backing_objects))
43397 goto nobufs;
43398@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
43399 goto nobufs_unlock;
43400 spin_unlock(&cookie->lock);
43401
43402- fscache_stat(&fscache_n_retrieval_ops);
43403+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
43404
43405 /* pin the netfs read context in case we need to do the actual netfs
43406 * read because we've encountered a cache read failure */
43407@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
43408
43409 error:
43410 if (ret == -ENOMEM)
43411- fscache_stat(&fscache_n_retrievals_nomem);
43412+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
43413 else if (ret == -ERESTARTSYS)
43414- fscache_stat(&fscache_n_retrievals_intr);
43415+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
43416 else if (ret == -ENODATA)
43417- fscache_stat(&fscache_n_retrievals_nodata);
43418+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
43419 else if (ret < 0)
43420- fscache_stat(&fscache_n_retrievals_nobufs);
43421+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
43422 else
43423- fscache_stat(&fscache_n_retrievals_ok);
43424+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
43425
43426 fscache_put_retrieval(op);
43427 _leave(" = %d", ret);
43428@@ -545,7 +545,7 @@ nobufs_unlock:
43429 spin_unlock(&cookie->lock);
43430 kfree(op);
43431 nobufs:
43432- fscache_stat(&fscache_n_retrievals_nobufs);
43433+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
43434 _leave(" = -ENOBUFS");
43435 return -ENOBUFS;
43436 }
43437@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
43438
43439 _enter("%p,%p,,,", cookie, page);
43440
43441- fscache_stat(&fscache_n_allocs);
43442+ fscache_stat_unchecked(&fscache_n_allocs);
43443
43444 if (hlist_empty(&cookie->backing_objects))
43445 goto nobufs;
43446@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
43447 goto nobufs_unlock;
43448 spin_unlock(&cookie->lock);
43449
43450- fscache_stat(&fscache_n_alloc_ops);
43451+ fscache_stat_unchecked(&fscache_n_alloc_ops);
43452
43453 ret = fscache_wait_for_retrieval_activation(
43454 object, op,
43455@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
43456
43457 error:
43458 if (ret == -ERESTARTSYS)
43459- fscache_stat(&fscache_n_allocs_intr);
43460+ fscache_stat_unchecked(&fscache_n_allocs_intr);
43461 else if (ret < 0)
43462- fscache_stat(&fscache_n_allocs_nobufs);
43463+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
43464 else
43465- fscache_stat(&fscache_n_allocs_ok);
43466+ fscache_stat_unchecked(&fscache_n_allocs_ok);
43467
43468 fscache_put_retrieval(op);
43469 _leave(" = %d", ret);
43470@@ -625,7 +625,7 @@ nobufs_unlock:
43471 spin_unlock(&cookie->lock);
43472 kfree(op);
43473 nobufs:
43474- fscache_stat(&fscache_n_allocs_nobufs);
43475+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
43476 _leave(" = -ENOBUFS");
43477 return -ENOBUFS;
43478 }
43479@@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
43480
43481 spin_lock(&cookie->stores_lock);
43482
43483- fscache_stat(&fscache_n_store_calls);
43484+ fscache_stat_unchecked(&fscache_n_store_calls);
43485
43486 /* find a page to store */
43487 page = NULL;
43488@@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
43489 page = results[0];
43490 _debug("gang %d [%lx]", n, page->index);
43491 if (page->index > op->store_limit) {
43492- fscache_stat(&fscache_n_store_pages_over_limit);
43493+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
43494 goto superseded;
43495 }
43496
43497@@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
43498 spin_unlock(&cookie->stores_lock);
43499 spin_unlock(&object->lock);
43500
43501- fscache_stat(&fscache_n_store_pages);
43502+ fscache_stat_unchecked(&fscache_n_store_pages);
43503 fscache_stat(&fscache_n_cop_write_page);
43504 ret = object->cache->ops->write_page(op, page);
43505 fscache_stat_d(&fscache_n_cop_write_page);
43506@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
43507 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
43508 ASSERT(PageFsCache(page));
43509
43510- fscache_stat(&fscache_n_stores);
43511+ fscache_stat_unchecked(&fscache_n_stores);
43512
43513 op = kzalloc(sizeof(*op), GFP_NOIO);
43514 if (!op)
43515@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
43516 spin_unlock(&cookie->stores_lock);
43517 spin_unlock(&object->lock);
43518
43519- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
43520+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
43521 op->store_limit = object->store_limit;
43522
43523 if (fscache_submit_op(object, &op->op) < 0)
43524@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
43525
43526 spin_unlock(&cookie->lock);
43527 radix_tree_preload_end();
43528- fscache_stat(&fscache_n_store_ops);
43529- fscache_stat(&fscache_n_stores_ok);
43530+ fscache_stat_unchecked(&fscache_n_store_ops);
43531+ fscache_stat_unchecked(&fscache_n_stores_ok);
43532
43533 /* the work queue now carries its own ref on the object */
43534 fscache_put_operation(&op->op);
43535@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
43536 return 0;
43537
43538 already_queued:
43539- fscache_stat(&fscache_n_stores_again);
43540+ fscache_stat_unchecked(&fscache_n_stores_again);
43541 already_pending:
43542 spin_unlock(&cookie->stores_lock);
43543 spin_unlock(&object->lock);
43544 spin_unlock(&cookie->lock);
43545 radix_tree_preload_end();
43546 kfree(op);
43547- fscache_stat(&fscache_n_stores_ok);
43548+ fscache_stat_unchecked(&fscache_n_stores_ok);
43549 _leave(" = 0");
43550 return 0;
43551
43552@@ -851,14 +851,14 @@ nobufs:
43553 spin_unlock(&cookie->lock);
43554 radix_tree_preload_end();
43555 kfree(op);
43556- fscache_stat(&fscache_n_stores_nobufs);
43557+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
43558 _leave(" = -ENOBUFS");
43559 return -ENOBUFS;
43560
43561 nomem_free:
43562 kfree(op);
43563 nomem:
43564- fscache_stat(&fscache_n_stores_oom);
43565+ fscache_stat_unchecked(&fscache_n_stores_oom);
43566 _leave(" = -ENOMEM");
43567 return -ENOMEM;
43568 }
43569@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
43570 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
43571 ASSERTCMP(page, !=, NULL);
43572
43573- fscache_stat(&fscache_n_uncaches);
43574+ fscache_stat_unchecked(&fscache_n_uncaches);
43575
43576 /* cache withdrawal may beat us to it */
43577 if (!PageFsCache(page))
43578@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
43579 unsigned long loop;
43580
43581 #ifdef CONFIG_FSCACHE_STATS
43582- atomic_add(pagevec->nr, &fscache_n_marks);
43583+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
43584 #endif
43585
43586 for (loop = 0; loop < pagevec->nr; loop++) {
43587diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
43588index 4765190..2a067f2 100644
43589--- a/fs/fscache/stats.c
43590+++ b/fs/fscache/stats.c
43591@@ -18,95 +18,95 @@
43592 /*
43593 * operation counters
43594 */
43595-atomic_t fscache_n_op_pend;
43596-atomic_t fscache_n_op_run;
43597-atomic_t fscache_n_op_enqueue;
43598-atomic_t fscache_n_op_requeue;
43599-atomic_t fscache_n_op_deferred_release;
43600-atomic_t fscache_n_op_release;
43601-atomic_t fscache_n_op_gc;
43602-atomic_t fscache_n_op_cancelled;
43603-atomic_t fscache_n_op_rejected;
43604+atomic_unchecked_t fscache_n_op_pend;
43605+atomic_unchecked_t fscache_n_op_run;
43606+atomic_unchecked_t fscache_n_op_enqueue;
43607+atomic_unchecked_t fscache_n_op_requeue;
43608+atomic_unchecked_t fscache_n_op_deferred_release;
43609+atomic_unchecked_t fscache_n_op_release;
43610+atomic_unchecked_t fscache_n_op_gc;
43611+atomic_unchecked_t fscache_n_op_cancelled;
43612+atomic_unchecked_t fscache_n_op_rejected;
43613
43614-atomic_t fscache_n_attr_changed;
43615-atomic_t fscache_n_attr_changed_ok;
43616-atomic_t fscache_n_attr_changed_nobufs;
43617-atomic_t fscache_n_attr_changed_nomem;
43618-atomic_t fscache_n_attr_changed_calls;
43619+atomic_unchecked_t fscache_n_attr_changed;
43620+atomic_unchecked_t fscache_n_attr_changed_ok;
43621+atomic_unchecked_t fscache_n_attr_changed_nobufs;
43622+atomic_unchecked_t fscache_n_attr_changed_nomem;
43623+atomic_unchecked_t fscache_n_attr_changed_calls;
43624
43625-atomic_t fscache_n_allocs;
43626-atomic_t fscache_n_allocs_ok;
43627-atomic_t fscache_n_allocs_wait;
43628-atomic_t fscache_n_allocs_nobufs;
43629-atomic_t fscache_n_allocs_intr;
43630-atomic_t fscache_n_allocs_object_dead;
43631-atomic_t fscache_n_alloc_ops;
43632-atomic_t fscache_n_alloc_op_waits;
43633+atomic_unchecked_t fscache_n_allocs;
43634+atomic_unchecked_t fscache_n_allocs_ok;
43635+atomic_unchecked_t fscache_n_allocs_wait;
43636+atomic_unchecked_t fscache_n_allocs_nobufs;
43637+atomic_unchecked_t fscache_n_allocs_intr;
43638+atomic_unchecked_t fscache_n_allocs_object_dead;
43639+atomic_unchecked_t fscache_n_alloc_ops;
43640+atomic_unchecked_t fscache_n_alloc_op_waits;
43641
43642-atomic_t fscache_n_retrievals;
43643-atomic_t fscache_n_retrievals_ok;
43644-atomic_t fscache_n_retrievals_wait;
43645-atomic_t fscache_n_retrievals_nodata;
43646-atomic_t fscache_n_retrievals_nobufs;
43647-atomic_t fscache_n_retrievals_intr;
43648-atomic_t fscache_n_retrievals_nomem;
43649-atomic_t fscache_n_retrievals_object_dead;
43650-atomic_t fscache_n_retrieval_ops;
43651-atomic_t fscache_n_retrieval_op_waits;
43652+atomic_unchecked_t fscache_n_retrievals;
43653+atomic_unchecked_t fscache_n_retrievals_ok;
43654+atomic_unchecked_t fscache_n_retrievals_wait;
43655+atomic_unchecked_t fscache_n_retrievals_nodata;
43656+atomic_unchecked_t fscache_n_retrievals_nobufs;
43657+atomic_unchecked_t fscache_n_retrievals_intr;
43658+atomic_unchecked_t fscache_n_retrievals_nomem;
43659+atomic_unchecked_t fscache_n_retrievals_object_dead;
43660+atomic_unchecked_t fscache_n_retrieval_ops;
43661+atomic_unchecked_t fscache_n_retrieval_op_waits;
43662
43663-atomic_t fscache_n_stores;
43664-atomic_t fscache_n_stores_ok;
43665-atomic_t fscache_n_stores_again;
43666-atomic_t fscache_n_stores_nobufs;
43667-atomic_t fscache_n_stores_oom;
43668-atomic_t fscache_n_store_ops;
43669-atomic_t fscache_n_store_calls;
43670-atomic_t fscache_n_store_pages;
43671-atomic_t fscache_n_store_radix_deletes;
43672-atomic_t fscache_n_store_pages_over_limit;
43673+atomic_unchecked_t fscache_n_stores;
43674+atomic_unchecked_t fscache_n_stores_ok;
43675+atomic_unchecked_t fscache_n_stores_again;
43676+atomic_unchecked_t fscache_n_stores_nobufs;
43677+atomic_unchecked_t fscache_n_stores_oom;
43678+atomic_unchecked_t fscache_n_store_ops;
43679+atomic_unchecked_t fscache_n_store_calls;
43680+atomic_unchecked_t fscache_n_store_pages;
43681+atomic_unchecked_t fscache_n_store_radix_deletes;
43682+atomic_unchecked_t fscache_n_store_pages_over_limit;
43683
43684-atomic_t fscache_n_store_vmscan_not_storing;
43685-atomic_t fscache_n_store_vmscan_gone;
43686-atomic_t fscache_n_store_vmscan_busy;
43687-atomic_t fscache_n_store_vmscan_cancelled;
43688+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
43689+atomic_unchecked_t fscache_n_store_vmscan_gone;
43690+atomic_unchecked_t fscache_n_store_vmscan_busy;
43691+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
43692
43693-atomic_t fscache_n_marks;
43694-atomic_t fscache_n_uncaches;
43695+atomic_unchecked_t fscache_n_marks;
43696+atomic_unchecked_t fscache_n_uncaches;
43697
43698-atomic_t fscache_n_acquires;
43699-atomic_t fscache_n_acquires_null;
43700-atomic_t fscache_n_acquires_no_cache;
43701-atomic_t fscache_n_acquires_ok;
43702-atomic_t fscache_n_acquires_nobufs;
43703-atomic_t fscache_n_acquires_oom;
43704+atomic_unchecked_t fscache_n_acquires;
43705+atomic_unchecked_t fscache_n_acquires_null;
43706+atomic_unchecked_t fscache_n_acquires_no_cache;
43707+atomic_unchecked_t fscache_n_acquires_ok;
43708+atomic_unchecked_t fscache_n_acquires_nobufs;
43709+atomic_unchecked_t fscache_n_acquires_oom;
43710
43711-atomic_t fscache_n_updates;
43712-atomic_t fscache_n_updates_null;
43713-atomic_t fscache_n_updates_run;
43714+atomic_unchecked_t fscache_n_updates;
43715+atomic_unchecked_t fscache_n_updates_null;
43716+atomic_unchecked_t fscache_n_updates_run;
43717
43718-atomic_t fscache_n_relinquishes;
43719-atomic_t fscache_n_relinquishes_null;
43720-atomic_t fscache_n_relinquishes_waitcrt;
43721-atomic_t fscache_n_relinquishes_retire;
43722+atomic_unchecked_t fscache_n_relinquishes;
43723+atomic_unchecked_t fscache_n_relinquishes_null;
43724+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
43725+atomic_unchecked_t fscache_n_relinquishes_retire;
43726
43727-atomic_t fscache_n_cookie_index;
43728-atomic_t fscache_n_cookie_data;
43729-atomic_t fscache_n_cookie_special;
43730+atomic_unchecked_t fscache_n_cookie_index;
43731+atomic_unchecked_t fscache_n_cookie_data;
43732+atomic_unchecked_t fscache_n_cookie_special;
43733
43734-atomic_t fscache_n_object_alloc;
43735-atomic_t fscache_n_object_no_alloc;
43736-atomic_t fscache_n_object_lookups;
43737-atomic_t fscache_n_object_lookups_negative;
43738-atomic_t fscache_n_object_lookups_positive;
43739-atomic_t fscache_n_object_lookups_timed_out;
43740-atomic_t fscache_n_object_created;
43741-atomic_t fscache_n_object_avail;
43742-atomic_t fscache_n_object_dead;
43743+atomic_unchecked_t fscache_n_object_alloc;
43744+atomic_unchecked_t fscache_n_object_no_alloc;
43745+atomic_unchecked_t fscache_n_object_lookups;
43746+atomic_unchecked_t fscache_n_object_lookups_negative;
43747+atomic_unchecked_t fscache_n_object_lookups_positive;
43748+atomic_unchecked_t fscache_n_object_lookups_timed_out;
43749+atomic_unchecked_t fscache_n_object_created;
43750+atomic_unchecked_t fscache_n_object_avail;
43751+atomic_unchecked_t fscache_n_object_dead;
43752
43753-atomic_t fscache_n_checkaux_none;
43754-atomic_t fscache_n_checkaux_okay;
43755-atomic_t fscache_n_checkaux_update;
43756-atomic_t fscache_n_checkaux_obsolete;
43757+atomic_unchecked_t fscache_n_checkaux_none;
43758+atomic_unchecked_t fscache_n_checkaux_okay;
43759+atomic_unchecked_t fscache_n_checkaux_update;
43760+atomic_unchecked_t fscache_n_checkaux_obsolete;
43761
43762 atomic_t fscache_n_cop_alloc_object;
43763 atomic_t fscache_n_cop_lookup_object;
43764@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
43765 seq_puts(m, "FS-Cache statistics\n");
43766
43767 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
43768- atomic_read(&fscache_n_cookie_index),
43769- atomic_read(&fscache_n_cookie_data),
43770- atomic_read(&fscache_n_cookie_special));
43771+ atomic_read_unchecked(&fscache_n_cookie_index),
43772+ atomic_read_unchecked(&fscache_n_cookie_data),
43773+ atomic_read_unchecked(&fscache_n_cookie_special));
43774
43775 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
43776- atomic_read(&fscache_n_object_alloc),
43777- atomic_read(&fscache_n_object_no_alloc),
43778- atomic_read(&fscache_n_object_avail),
43779- atomic_read(&fscache_n_object_dead));
43780+ atomic_read_unchecked(&fscache_n_object_alloc),
43781+ atomic_read_unchecked(&fscache_n_object_no_alloc),
43782+ atomic_read_unchecked(&fscache_n_object_avail),
43783+ atomic_read_unchecked(&fscache_n_object_dead));
43784 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
43785- atomic_read(&fscache_n_checkaux_none),
43786- atomic_read(&fscache_n_checkaux_okay),
43787- atomic_read(&fscache_n_checkaux_update),
43788- atomic_read(&fscache_n_checkaux_obsolete));
43789+ atomic_read_unchecked(&fscache_n_checkaux_none),
43790+ atomic_read_unchecked(&fscache_n_checkaux_okay),
43791+ atomic_read_unchecked(&fscache_n_checkaux_update),
43792+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
43793
43794 seq_printf(m, "Pages : mrk=%u unc=%u\n",
43795- atomic_read(&fscache_n_marks),
43796- atomic_read(&fscache_n_uncaches));
43797+ atomic_read_unchecked(&fscache_n_marks),
43798+ atomic_read_unchecked(&fscache_n_uncaches));
43799
43800 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
43801 " oom=%u\n",
43802- atomic_read(&fscache_n_acquires),
43803- atomic_read(&fscache_n_acquires_null),
43804- atomic_read(&fscache_n_acquires_no_cache),
43805- atomic_read(&fscache_n_acquires_ok),
43806- atomic_read(&fscache_n_acquires_nobufs),
43807- atomic_read(&fscache_n_acquires_oom));
43808+ atomic_read_unchecked(&fscache_n_acquires),
43809+ atomic_read_unchecked(&fscache_n_acquires_null),
43810+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
43811+ atomic_read_unchecked(&fscache_n_acquires_ok),
43812+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
43813+ atomic_read_unchecked(&fscache_n_acquires_oom));
43814
43815 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
43816- atomic_read(&fscache_n_object_lookups),
43817- atomic_read(&fscache_n_object_lookups_negative),
43818- atomic_read(&fscache_n_object_lookups_positive),
43819- atomic_read(&fscache_n_object_created),
43820- atomic_read(&fscache_n_object_lookups_timed_out));
43821+ atomic_read_unchecked(&fscache_n_object_lookups),
43822+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
43823+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
43824+ atomic_read_unchecked(&fscache_n_object_created),
43825+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
43826
43827 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
43828- atomic_read(&fscache_n_updates),
43829- atomic_read(&fscache_n_updates_null),
43830- atomic_read(&fscache_n_updates_run));
43831+ atomic_read_unchecked(&fscache_n_updates),
43832+ atomic_read_unchecked(&fscache_n_updates_null),
43833+ atomic_read_unchecked(&fscache_n_updates_run));
43834
43835 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
43836- atomic_read(&fscache_n_relinquishes),
43837- atomic_read(&fscache_n_relinquishes_null),
43838- atomic_read(&fscache_n_relinquishes_waitcrt),
43839- atomic_read(&fscache_n_relinquishes_retire));
43840+ atomic_read_unchecked(&fscache_n_relinquishes),
43841+ atomic_read_unchecked(&fscache_n_relinquishes_null),
43842+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
43843+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
43844
43845 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
43846- atomic_read(&fscache_n_attr_changed),
43847- atomic_read(&fscache_n_attr_changed_ok),
43848- atomic_read(&fscache_n_attr_changed_nobufs),
43849- atomic_read(&fscache_n_attr_changed_nomem),
43850- atomic_read(&fscache_n_attr_changed_calls));
43851+ atomic_read_unchecked(&fscache_n_attr_changed),
43852+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
43853+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
43854+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
43855+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
43856
43857 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
43858- atomic_read(&fscache_n_allocs),
43859- atomic_read(&fscache_n_allocs_ok),
43860- atomic_read(&fscache_n_allocs_wait),
43861- atomic_read(&fscache_n_allocs_nobufs),
43862- atomic_read(&fscache_n_allocs_intr));
43863+ atomic_read_unchecked(&fscache_n_allocs),
43864+ atomic_read_unchecked(&fscache_n_allocs_ok),
43865+ atomic_read_unchecked(&fscache_n_allocs_wait),
43866+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
43867+ atomic_read_unchecked(&fscache_n_allocs_intr));
43868 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
43869- atomic_read(&fscache_n_alloc_ops),
43870- atomic_read(&fscache_n_alloc_op_waits),
43871- atomic_read(&fscache_n_allocs_object_dead));
43872+ atomic_read_unchecked(&fscache_n_alloc_ops),
43873+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
43874+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
43875
43876 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
43877 " int=%u oom=%u\n",
43878- atomic_read(&fscache_n_retrievals),
43879- atomic_read(&fscache_n_retrievals_ok),
43880- atomic_read(&fscache_n_retrievals_wait),
43881- atomic_read(&fscache_n_retrievals_nodata),
43882- atomic_read(&fscache_n_retrievals_nobufs),
43883- atomic_read(&fscache_n_retrievals_intr),
43884- atomic_read(&fscache_n_retrievals_nomem));
43885+ atomic_read_unchecked(&fscache_n_retrievals),
43886+ atomic_read_unchecked(&fscache_n_retrievals_ok),
43887+ atomic_read_unchecked(&fscache_n_retrievals_wait),
43888+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
43889+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
43890+ atomic_read_unchecked(&fscache_n_retrievals_intr),
43891+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
43892 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
43893- atomic_read(&fscache_n_retrieval_ops),
43894- atomic_read(&fscache_n_retrieval_op_waits),
43895- atomic_read(&fscache_n_retrievals_object_dead));
43896+ atomic_read_unchecked(&fscache_n_retrieval_ops),
43897+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
43898+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
43899
43900 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
43901- atomic_read(&fscache_n_stores),
43902- atomic_read(&fscache_n_stores_ok),
43903- atomic_read(&fscache_n_stores_again),
43904- atomic_read(&fscache_n_stores_nobufs),
43905- atomic_read(&fscache_n_stores_oom));
43906+ atomic_read_unchecked(&fscache_n_stores),
43907+ atomic_read_unchecked(&fscache_n_stores_ok),
43908+ atomic_read_unchecked(&fscache_n_stores_again),
43909+ atomic_read_unchecked(&fscache_n_stores_nobufs),
43910+ atomic_read_unchecked(&fscache_n_stores_oom));
43911 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
43912- atomic_read(&fscache_n_store_ops),
43913- atomic_read(&fscache_n_store_calls),
43914- atomic_read(&fscache_n_store_pages),
43915- atomic_read(&fscache_n_store_radix_deletes),
43916- atomic_read(&fscache_n_store_pages_over_limit));
43917+ atomic_read_unchecked(&fscache_n_store_ops),
43918+ atomic_read_unchecked(&fscache_n_store_calls),
43919+ atomic_read_unchecked(&fscache_n_store_pages),
43920+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
43921+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
43922
43923 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
43924- atomic_read(&fscache_n_store_vmscan_not_storing),
43925- atomic_read(&fscache_n_store_vmscan_gone),
43926- atomic_read(&fscache_n_store_vmscan_busy),
43927- atomic_read(&fscache_n_store_vmscan_cancelled));
43928+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
43929+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
43930+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
43931+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
43932
43933 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
43934- atomic_read(&fscache_n_op_pend),
43935- atomic_read(&fscache_n_op_run),
43936- atomic_read(&fscache_n_op_enqueue),
43937- atomic_read(&fscache_n_op_cancelled),
43938- atomic_read(&fscache_n_op_rejected));
43939+ atomic_read_unchecked(&fscache_n_op_pend),
43940+ atomic_read_unchecked(&fscache_n_op_run),
43941+ atomic_read_unchecked(&fscache_n_op_enqueue),
43942+ atomic_read_unchecked(&fscache_n_op_cancelled),
43943+ atomic_read_unchecked(&fscache_n_op_rejected));
43944 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
43945- atomic_read(&fscache_n_op_deferred_release),
43946- atomic_read(&fscache_n_op_release),
43947- atomic_read(&fscache_n_op_gc));
43948+ atomic_read_unchecked(&fscache_n_op_deferred_release),
43949+ atomic_read_unchecked(&fscache_n_op_release),
43950+ atomic_read_unchecked(&fscache_n_op_gc));
43951
43952 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
43953 atomic_read(&fscache_n_cop_alloc_object),
43954diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
43955index 3426521..3b75162 100644
43956--- a/fs/fuse/cuse.c
43957+++ b/fs/fuse/cuse.c
43958@@ -587,10 +587,12 @@ static int __init cuse_init(void)
43959 INIT_LIST_HEAD(&cuse_conntbl[i]);
43960
43961 /* inherit and extend fuse_dev_operations */
43962- cuse_channel_fops = fuse_dev_operations;
43963- cuse_channel_fops.owner = THIS_MODULE;
43964- cuse_channel_fops.open = cuse_channel_open;
43965- cuse_channel_fops.release = cuse_channel_release;
43966+ pax_open_kernel();
43967+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
43968+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
43969+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
43970+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
43971+ pax_close_kernel();
43972
43973 cuse_class = class_create(THIS_MODULE, "cuse");
43974 if (IS_ERR(cuse_class))
43975diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
43976index 2aaf3ea..8e50863 100644
43977--- a/fs/fuse/dev.c
43978+++ b/fs/fuse/dev.c
43979@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
43980 ret = 0;
43981 pipe_lock(pipe);
43982
43983- if (!pipe->readers) {
43984+ if (!atomic_read(&pipe->readers)) {
43985 send_sig(SIGPIPE, current, 0);
43986 if (!ret)
43987 ret = -EPIPE;
43988diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
43989index 9f63e49..d8a64c0 100644
43990--- a/fs/fuse/dir.c
43991+++ b/fs/fuse/dir.c
43992@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *dentry)
43993 return link;
43994 }
43995
43996-static void free_link(char *link)
43997+static void free_link(const char *link)
43998 {
43999 if (!IS_ERR(link))
44000 free_page((unsigned long) link);
44001diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
44002index cfd4959..a780959 100644
44003--- a/fs/gfs2/inode.c
44004+++ b/fs/gfs2/inode.c
44005@@ -1490,7 +1490,7 @@ out:
44006
44007 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
44008 {
44009- char *s = nd_get_link(nd);
44010+ const char *s = nd_get_link(nd);
44011 if (!IS_ERR(s))
44012 kfree(s);
44013 }
44014diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
44015index 0be5a78..9cfb853 100644
44016--- a/fs/hugetlbfs/inode.c
44017+++ b/fs/hugetlbfs/inode.c
44018@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs_fs_type = {
44019 .kill_sb = kill_litter_super,
44020 };
44021
44022-static struct vfsmount *hugetlbfs_vfsmount;
44023+struct vfsmount *hugetlbfs_vfsmount;
44024
44025 static int can_do_hugetlb_shm(void)
44026 {
44027diff --git a/fs/inode.c b/fs/inode.c
44028index ee4e66b..0451521 100644
44029--- a/fs/inode.c
44030+++ b/fs/inode.c
44031@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
44032
44033 #ifdef CONFIG_SMP
44034 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
44035- static atomic_t shared_last_ino;
44036- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
44037+ static atomic_unchecked_t shared_last_ino;
44038+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
44039
44040 res = next - LAST_INO_BATCH;
44041 }
44042diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
44043index e513f19..2ab1351 100644
44044--- a/fs/jffs2/erase.c
44045+++ b/fs/jffs2/erase.c
44046@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
44047 struct jffs2_unknown_node marker = {
44048 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
44049 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
44050- .totlen = cpu_to_je32(c->cleanmarker_size)
44051+ .totlen = cpu_to_je32(c->cleanmarker_size),
44052+ .hdr_crc = cpu_to_je32(0)
44053 };
44054
44055 jffs2_prealloc_raw_node_refs(c, jeb, 1);
44056diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
44057index b09e51d..e482afa 100644
44058--- a/fs/jffs2/wbuf.c
44059+++ b/fs/jffs2/wbuf.c
44060@@ -1011,7 +1011,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
44061 {
44062 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
44063 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
44064- .totlen = constant_cpu_to_je32(8)
44065+ .totlen = constant_cpu_to_je32(8),
44066+ .hdr_crc = constant_cpu_to_je32(0)
44067 };
44068
44069 /*
44070diff --git a/fs/jfs/super.c b/fs/jfs/super.c
44071index a44eff0..462e07d 100644
44072--- a/fs/jfs/super.c
44073+++ b/fs/jfs/super.c
44074@@ -802,7 +802,7 @@ static int __init init_jfs_fs(void)
44075
44076 jfs_inode_cachep =
44077 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
44078- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
44079+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
44080 init_once);
44081 if (jfs_inode_cachep == NULL)
44082 return -ENOMEM;
44083diff --git a/fs/libfs.c b/fs/libfs.c
44084index f6d411e..e82a08d 100644
44085--- a/fs/libfs.c
44086+++ b/fs/libfs.c
44087@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
44088
44089 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
44090 struct dentry *next;
44091+ char d_name[sizeof(next->d_iname)];
44092+ const unsigned char *name;
44093+
44094 next = list_entry(p, struct dentry, d_u.d_child);
44095 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
44096 if (!simple_positive(next)) {
44097@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
44098
44099 spin_unlock(&next->d_lock);
44100 spin_unlock(&dentry->d_lock);
44101- if (filldir(dirent, next->d_name.name,
44102+ name = next->d_name.name;
44103+ if (name == next->d_iname) {
44104+ memcpy(d_name, name, next->d_name.len);
44105+ name = d_name;
44106+ }
44107+ if (filldir(dirent, name,
44108 next->d_name.len, filp->f_pos,
44109 next->d_inode->i_ino,
44110 dt_type(next->d_inode)) < 0)
44111diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
44112index 8392cb8..80d6193 100644
44113--- a/fs/lockd/clntproc.c
44114+++ b/fs/lockd/clntproc.c
44115@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
44116 /*
44117 * Cookie counter for NLM requests
44118 */
44119-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
44120+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
44121
44122 void nlmclnt_next_cookie(struct nlm_cookie *c)
44123 {
44124- u32 cookie = atomic_inc_return(&nlm_cookie);
44125+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
44126
44127 memcpy(c->data, &cookie, 4);
44128 c->len=4;
44129diff --git a/fs/locks.c b/fs/locks.c
44130index 637694b..f84a121 100644
44131--- a/fs/locks.c
44132+++ b/fs/locks.c
44133@@ -2074,16 +2074,16 @@ void locks_remove_flock(struct file *filp)
44134 return;
44135
44136 if (filp->f_op && filp->f_op->flock) {
44137- struct file_lock fl = {
44138+ struct file_lock flock = {
44139 .fl_pid = current->tgid,
44140 .fl_file = filp,
44141 .fl_flags = FL_FLOCK,
44142 .fl_type = F_UNLCK,
44143 .fl_end = OFFSET_MAX,
44144 };
44145- filp->f_op->flock(filp, F_SETLKW, &fl);
44146- if (fl.fl_ops && fl.fl_ops->fl_release_private)
44147- fl.fl_ops->fl_release_private(&fl);
44148+ filp->f_op->flock(filp, F_SETLKW, &flock);
44149+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
44150+ flock.fl_ops->fl_release_private(&flock);
44151 }
44152
44153 lock_flocks();
44154diff --git a/fs/namei.c b/fs/namei.c
44155index 5008f01..90328a7 100644
44156--- a/fs/namei.c
44157+++ b/fs/namei.c
44158@@ -279,16 +279,32 @@ int generic_permission(struct inode *inode, int mask)
44159 if (ret != -EACCES)
44160 return ret;
44161
44162+#ifdef CONFIG_GRKERNSEC
44163+ /* we'll block if we have to log due to a denied capability use */
44164+ if (mask & MAY_NOT_BLOCK)
44165+ return -ECHILD;
44166+#endif
44167+
44168 if (S_ISDIR(inode->i_mode)) {
44169 /* DACs are overridable for directories */
44170- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
44171- return 0;
44172 if (!(mask & MAY_WRITE))
44173- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
44174+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
44175+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
44176 return 0;
44177+ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
44178+ return 0;
44179 return -EACCES;
44180 }
44181 /*
44182+ * Searching includes executable on directories, else just read.
44183+ */
44184+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
44185+ if (mask == MAY_READ)
44186+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
44187+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
44188+ return 0;
44189+
44190+ /*
44191 * Read/write DACs are always overridable.
44192 * Executable DACs are overridable when there is
44193 * at least one exec bit set.
44194@@ -297,14 +313,6 @@ int generic_permission(struct inode *inode, int mask)
44195 if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
44196 return 0;
44197
44198- /*
44199- * Searching includes executable on directories, else just read.
44200- */
44201- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
44202- if (mask == MAY_READ)
44203- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
44204- return 0;
44205-
44206 return -EACCES;
44207 }
44208
44209@@ -653,11 +661,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
44210 return error;
44211 }
44212
44213+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
44214+ dentry->d_inode, dentry, nd->path.mnt)) {
44215+ error = -EACCES;
44216+ *p = ERR_PTR(error); /* no ->put_link(), please */
44217+ path_put(&nd->path);
44218+ return error;
44219+ }
44220+
44221 nd->last_type = LAST_BIND;
44222 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
44223 error = PTR_ERR(*p);
44224 if (!IS_ERR(*p)) {
44225- char *s = nd_get_link(nd);
44226+ const char *s = nd_get_link(nd);
44227 error = 0;
44228 if (s)
44229 error = __vfs_follow_link(nd, s);
44230@@ -1622,6 +1638,21 @@ static int path_lookupat(int dfd, const char *name,
44231 if (!err)
44232 err = complete_walk(nd);
44233
44234+ if (!(nd->flags & LOOKUP_PARENT)) {
44235+#ifdef CONFIG_GRKERNSEC
44236+ if (flags & LOOKUP_RCU) {
44237+ if (!err)
44238+ path_put(&nd->path);
44239+ err = -ECHILD;
44240+ } else
44241+#endif
44242+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
44243+ if (!err)
44244+ path_put(&nd->path);
44245+ err = -ENOENT;
44246+ }
44247+ }
44248+
44249 if (!err && nd->flags & LOOKUP_DIRECTORY) {
44250 if (!nd->inode->i_op->lookup) {
44251 path_put(&nd->path);
44252@@ -1649,6 +1680,15 @@ static int do_path_lookup(int dfd, const char *name,
44253 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
44254
44255 if (likely(!retval)) {
44256+ if (*name != '/' && nd->path.dentry && nd->inode) {
44257+#ifdef CONFIG_GRKERNSEC
44258+ if (flags & LOOKUP_RCU)
44259+ return -ECHILD;
44260+#endif
44261+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
44262+ return -ENOENT;
44263+ }
44264+
44265 if (unlikely(!audit_dummy_context())) {
44266 if (nd->path.dentry && nd->inode)
44267 audit_inode(name, nd->path.dentry);
44268@@ -2046,6 +2086,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
44269 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
44270 return -EPERM;
44271
44272+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
44273+ return -EPERM;
44274+ if (gr_handle_rawio(inode))
44275+ return -EPERM;
44276+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
44277+ return -EACCES;
44278+
44279 return 0;
44280 }
44281
44282@@ -2107,6 +2154,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44283 error = complete_walk(nd);
44284 if (error)
44285 return ERR_PTR(error);
44286+#ifdef CONFIG_GRKERNSEC
44287+ if (nd->flags & LOOKUP_RCU) {
44288+ error = -ECHILD;
44289+ goto exit;
44290+ }
44291+#endif
44292+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
44293+ error = -ENOENT;
44294+ goto exit;
44295+ }
44296 audit_inode(pathname, nd->path.dentry);
44297 if (open_flag & O_CREAT) {
44298 error = -EISDIR;
44299@@ -2117,6 +2174,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44300 error = complete_walk(nd);
44301 if (error)
44302 return ERR_PTR(error);
44303+#ifdef CONFIG_GRKERNSEC
44304+ if (nd->flags & LOOKUP_RCU) {
44305+ error = -ECHILD;
44306+ goto exit;
44307+ }
44308+#endif
44309+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
44310+ error = -ENOENT;
44311+ goto exit;
44312+ }
44313 audit_inode(pathname, dir);
44314 goto ok;
44315 }
44316@@ -2138,6 +2205,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44317 error = complete_walk(nd);
44318 if (error)
44319 return ERR_PTR(-ECHILD);
44320+#ifdef CONFIG_GRKERNSEC
44321+ if (nd->flags & LOOKUP_RCU) {
44322+ error = -ECHILD;
44323+ goto exit;
44324+ }
44325+#endif
44326+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
44327+ error = -ENOENT;
44328+ goto exit;
44329+ }
44330
44331 error = -ENOTDIR;
44332 if (nd->flags & LOOKUP_DIRECTORY) {
44333@@ -2178,6 +2255,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44334 /* Negative dentry, just create the file */
44335 if (!dentry->d_inode) {
44336 int mode = op->mode;
44337+
44338+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
44339+ error = -EACCES;
44340+ goto exit_mutex_unlock;
44341+ }
44342+
44343 if (!IS_POSIXACL(dir->d_inode))
44344 mode &= ~current_umask();
44345 /*
44346@@ -2201,6 +2284,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44347 error = vfs_create(dir->d_inode, dentry, mode, nd);
44348 if (error)
44349 goto exit_mutex_unlock;
44350+ else
44351+ gr_handle_create(path->dentry, path->mnt);
44352 mutex_unlock(&dir->d_inode->i_mutex);
44353 dput(nd->path.dentry);
44354 nd->path.dentry = dentry;
44355@@ -2210,6 +2295,19 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
44356 /*
44357 * It already exists.
44358 */
44359+
44360+ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
44361+ error = -ENOENT;
44362+ goto exit_mutex_unlock;
44363+ }
44364+
44365+ /* only check if O_CREAT is specified, all other checks need to go
44366+ into may_open */
44367+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
44368+ error = -EACCES;
44369+ goto exit_mutex_unlock;
44370+ }
44371+
44372 mutex_unlock(&dir->d_inode->i_mutex);
44373 audit_inode(pathname, path->dentry);
44374
44375@@ -2422,6 +2520,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
44376 *path = nd.path;
44377 return dentry;
44378 eexist:
44379+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
44380+ dput(dentry);
44381+ dentry = ERR_PTR(-ENOENT);
44382+ goto fail;
44383+ }
44384 dput(dentry);
44385 dentry = ERR_PTR(-EEXIST);
44386 fail:
44387@@ -2444,6 +2547,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
44388 }
44389 EXPORT_SYMBOL(user_path_create);
44390
44391+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
44392+{
44393+ char *tmp = getname(pathname);
44394+ struct dentry *res;
44395+ if (IS_ERR(tmp))
44396+ return ERR_CAST(tmp);
44397+ res = kern_path_create(dfd, tmp, path, is_dir);
44398+ if (IS_ERR(res))
44399+ putname(tmp);
44400+ else
44401+ *to = tmp;
44402+ return res;
44403+}
44404+
44405 int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
44406 {
44407 int error = may_create(dir, dentry);
44408@@ -2511,6 +2628,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
44409 error = mnt_want_write(path.mnt);
44410 if (error)
44411 goto out_dput;
44412+
44413+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
44414+ error = -EPERM;
44415+ goto out_drop_write;
44416+ }
44417+
44418+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
44419+ error = -EACCES;
44420+ goto out_drop_write;
44421+ }
44422+
44423 error = security_path_mknod(&path, dentry, mode, dev);
44424 if (error)
44425 goto out_drop_write;
44426@@ -2528,6 +2656,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
44427 }
44428 out_drop_write:
44429 mnt_drop_write(path.mnt);
44430+
44431+ if (!error)
44432+ gr_handle_create(dentry, path.mnt);
44433 out_dput:
44434 dput(dentry);
44435 mutex_unlock(&path.dentry->d_inode->i_mutex);
44436@@ -2577,12 +2708,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
44437 error = mnt_want_write(path.mnt);
44438 if (error)
44439 goto out_dput;
44440+
44441+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
44442+ error = -EACCES;
44443+ goto out_drop_write;
44444+ }
44445+
44446 error = security_path_mkdir(&path, dentry, mode);
44447 if (error)
44448 goto out_drop_write;
44449 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
44450 out_drop_write:
44451 mnt_drop_write(path.mnt);
44452+
44453+ if (!error)
44454+ gr_handle_create(dentry, path.mnt);
44455 out_dput:
44456 dput(dentry);
44457 mutex_unlock(&path.dentry->d_inode->i_mutex);
44458@@ -2662,6 +2802,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
44459 char * name;
44460 struct dentry *dentry;
44461 struct nameidata nd;
44462+ ino_t saved_ino = 0;
44463+ dev_t saved_dev = 0;
44464
44465 error = user_path_parent(dfd, pathname, &nd, &name);
44466 if (error)
44467@@ -2690,6 +2832,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
44468 error = -ENOENT;
44469 goto exit3;
44470 }
44471+
44472+ saved_ino = dentry->d_inode->i_ino;
44473+ saved_dev = gr_get_dev_from_dentry(dentry);
44474+
44475+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
44476+ error = -EACCES;
44477+ goto exit3;
44478+ }
44479+
44480 error = mnt_want_write(nd.path.mnt);
44481 if (error)
44482 goto exit3;
44483@@ -2697,6 +2848,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
44484 if (error)
44485 goto exit4;
44486 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
44487+ if (!error && (saved_dev || saved_ino))
44488+ gr_handle_delete(saved_ino, saved_dev);
44489 exit4:
44490 mnt_drop_write(nd.path.mnt);
44491 exit3:
44492@@ -2759,6 +2912,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
44493 struct dentry *dentry;
44494 struct nameidata nd;
44495 struct inode *inode = NULL;
44496+ ino_t saved_ino = 0;
44497+ dev_t saved_dev = 0;
44498
44499 error = user_path_parent(dfd, pathname, &nd, &name);
44500 if (error)
44501@@ -2781,6 +2936,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
44502 if (!inode)
44503 goto slashes;
44504 ihold(inode);
44505+
44506+ if (inode->i_nlink <= 1) {
44507+ saved_ino = inode->i_ino;
44508+ saved_dev = gr_get_dev_from_dentry(dentry);
44509+ }
44510+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
44511+ error = -EACCES;
44512+ goto exit2;
44513+ }
44514+
44515 error = mnt_want_write(nd.path.mnt);
44516 if (error)
44517 goto exit2;
44518@@ -2788,6 +2953,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
44519 if (error)
44520 goto exit3;
44521 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
44522+ if (!error && (saved_ino || saved_dev))
44523+ gr_handle_delete(saved_ino, saved_dev);
44524 exit3:
44525 mnt_drop_write(nd.path.mnt);
44526 exit2:
44527@@ -2863,10 +3030,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
44528 error = mnt_want_write(path.mnt);
44529 if (error)
44530 goto out_dput;
44531+
44532+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
44533+ error = -EACCES;
44534+ goto out_drop_write;
44535+ }
44536+
44537 error = security_path_symlink(&path, dentry, from);
44538 if (error)
44539 goto out_drop_write;
44540 error = vfs_symlink(path.dentry->d_inode, dentry, from);
44541+ if (!error)
44542+ gr_handle_create(dentry, path.mnt);
44543 out_drop_write:
44544 mnt_drop_write(path.mnt);
44545 out_dput:
44546@@ -2938,6 +3113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
44547 {
44548 struct dentry *new_dentry;
44549 struct path old_path, new_path;
44550+ char *to = NULL;
44551 int how = 0;
44552 int error;
44553
44554@@ -2961,7 +3137,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
44555 if (error)
44556 return error;
44557
44558- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
44559+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
44560 error = PTR_ERR(new_dentry);
44561 if (IS_ERR(new_dentry))
44562 goto out;
44563@@ -2972,13 +3148,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
44564 error = mnt_want_write(new_path.mnt);
44565 if (error)
44566 goto out_dput;
44567+
44568+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
44569+ old_path.dentry->d_inode,
44570+ old_path.dentry->d_inode->i_mode, to)) {
44571+ error = -EACCES;
44572+ goto out_drop_write;
44573+ }
44574+
44575+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
44576+ old_path.dentry, old_path.mnt, to)) {
44577+ error = -EACCES;
44578+ goto out_drop_write;
44579+ }
44580+
44581 error = security_path_link(old_path.dentry, &new_path, new_dentry);
44582 if (error)
44583 goto out_drop_write;
44584 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
44585+ if (!error)
44586+ gr_handle_create(new_dentry, new_path.mnt);
44587 out_drop_write:
44588 mnt_drop_write(new_path.mnt);
44589 out_dput:
44590+ putname(to);
44591 dput(new_dentry);
44592 mutex_unlock(&new_path.dentry->d_inode->i_mutex);
44593 path_put(&new_path);
44594@@ -3206,6 +3399,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
44595 if (new_dentry == trap)
44596 goto exit5;
44597
44598+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
44599+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
44600+ to);
44601+ if (error)
44602+ goto exit5;
44603+
44604 error = mnt_want_write(oldnd.path.mnt);
44605 if (error)
44606 goto exit5;
44607@@ -3215,6 +3414,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
44608 goto exit6;
44609 error = vfs_rename(old_dir->d_inode, old_dentry,
44610 new_dir->d_inode, new_dentry);
44611+ if (!error)
44612+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
44613+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
44614 exit6:
44615 mnt_drop_write(oldnd.path.mnt);
44616 exit5:
44617@@ -3240,6 +3442,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
44618
44619 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
44620 {
44621+ char tmpbuf[64];
44622+ const char *newlink;
44623 int len;
44624
44625 len = PTR_ERR(link);
44626@@ -3249,7 +3453,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
44627 len = strlen(link);
44628 if (len > (unsigned) buflen)
44629 len = buflen;
44630- if (copy_to_user(buffer, link, len))
44631+
44632+ if (len < sizeof(tmpbuf)) {
44633+ memcpy(tmpbuf, link, len);
44634+ newlink = tmpbuf;
44635+ } else
44636+ newlink = link;
44637+
44638+ if (copy_to_user(buffer, newlink, len))
44639 len = -EFAULT;
44640 out:
44641 return len;
44642diff --git a/fs/namespace.c b/fs/namespace.c
44643index cfc6d44..b4632a5 100644
44644--- a/fs/namespace.c
44645+++ b/fs/namespace.c
44646@@ -1326,6 +1326,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
44647 if (!(sb->s_flags & MS_RDONLY))
44648 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
44649 up_write(&sb->s_umount);
44650+
44651+ gr_log_remount(mnt->mnt_devname, retval);
44652+
44653 return retval;
44654 }
44655
44656@@ -1345,6 +1348,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
44657 br_write_unlock(vfsmount_lock);
44658 up_write(&namespace_sem);
44659 release_mounts(&umount_list);
44660+
44661+ gr_log_unmount(mnt->mnt_devname, retval);
44662+
44663 return retval;
44664 }
44665
44666@@ -2336,6 +2342,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
44667 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
44668 MS_STRICTATIME);
44669
44670+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
44671+ retval = -EPERM;
44672+ goto dput_out;
44673+ }
44674+
44675+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
44676+ retval = -EPERM;
44677+ goto dput_out;
44678+ }
44679+
44680 if (flags & MS_REMOUNT)
44681 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
44682 data_page);
44683@@ -2350,6 +2366,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
44684 dev_name, data_page);
44685 dput_out:
44686 path_put(&path);
44687+
44688+ gr_log_mount(dev_name, dir_name, retval);
44689+
44690 return retval;
44691 }
44692
44693@@ -2605,6 +2624,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
44694 if (error)
44695 goto out2;
44696
44697+ if (gr_handle_chroot_pivot()) {
44698+ error = -EPERM;
44699+ goto out2;
44700+ }
44701+
44702 get_fs_root(current->fs, &root);
44703 error = lock_mount(&old);
44704 if (error)
44705diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
44706index 3db6b82..a57597e 100644
44707--- a/fs/nfs/blocklayout/blocklayout.c
44708+++ b/fs/nfs/blocklayout/blocklayout.c
44709@@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block_extent *be, sector_t isect)
44710 */
44711 struct parallel_io {
44712 struct kref refcnt;
44713- struct rpc_call_ops call_ops;
44714+ rpc_call_ops_no_const call_ops;
44715 void (*pnfs_callback) (void *data);
44716 void *data;
44717 };
44718diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
44719index 50a15fa..ca113f9 100644
44720--- a/fs/nfs/inode.c
44721+++ b/fs/nfs/inode.c
44722@@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
44723 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
44724 nfsi->attrtimeo_timestamp = jiffies;
44725
44726- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
44727+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
44728 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
44729 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
44730 else
44731@@ -1002,16 +1002,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
44732 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
44733 }
44734
44735-static atomic_long_t nfs_attr_generation_counter;
44736+static atomic_long_unchecked_t nfs_attr_generation_counter;
44737
44738 static unsigned long nfs_read_attr_generation_counter(void)
44739 {
44740- return atomic_long_read(&nfs_attr_generation_counter);
44741+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
44742 }
44743
44744 unsigned long nfs_inc_attr_generation_counter(void)
44745 {
44746- return atomic_long_inc_return(&nfs_attr_generation_counter);
44747+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
44748 }
44749
44750 void nfs_fattr_init(struct nfs_fattr *fattr)
44751diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
44752index 7a2e442..8e544cc 100644
44753--- a/fs/nfsd/vfs.c
44754+++ b/fs/nfsd/vfs.c
44755@@ -914,7 +914,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
44756 } else {
44757 oldfs = get_fs();
44758 set_fs(KERNEL_DS);
44759- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
44760+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
44761 set_fs(oldfs);
44762 }
44763
44764@@ -1018,7 +1018,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
44765
44766 /* Write the data. */
44767 oldfs = get_fs(); set_fs(KERNEL_DS);
44768- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
44769+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
44770 set_fs(oldfs);
44771 if (host_err < 0)
44772 goto out_nfserr;
44773@@ -1553,7 +1553,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
44774 */
44775
44776 oldfs = get_fs(); set_fs(KERNEL_DS);
44777- host_err = inode->i_op->readlink(dentry, buf, *lenp);
44778+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
44779 set_fs(oldfs);
44780
44781 if (host_err < 0)
44782diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
44783index 9fde1c0..14e8827 100644
44784--- a/fs/notify/fanotify/fanotify_user.c
44785+++ b/fs/notify/fanotify/fanotify_user.c
44786@@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
44787 goto out_close_fd;
44788
44789 ret = -EFAULT;
44790- if (copy_to_user(buf, &fanotify_event_metadata,
44791+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
44792+ copy_to_user(buf, &fanotify_event_metadata,
44793 fanotify_event_metadata.event_len))
44794 goto out_kill_access_response;
44795
44796diff --git a/fs/notify/notification.c b/fs/notify/notification.c
44797index ee18815..7aa5d01 100644
44798--- a/fs/notify/notification.c
44799+++ b/fs/notify/notification.c
44800@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
44801 * get set to 0 so it will never get 'freed'
44802 */
44803 static struct fsnotify_event *q_overflow_event;
44804-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
44805+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
44806
44807 /**
44808 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
44809@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
44810 */
44811 u32 fsnotify_get_cookie(void)
44812 {
44813- return atomic_inc_return(&fsnotify_sync_cookie);
44814+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
44815 }
44816 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
44817
44818diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
44819index 99e3610..02c1068 100644
44820--- a/fs/ntfs/dir.c
44821+++ b/fs/ntfs/dir.c
44822@@ -1329,7 +1329,7 @@ find_next_index_buffer:
44823 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
44824 ~(s64)(ndir->itype.index.block_size - 1)));
44825 /* Bounds checks. */
44826- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
44827+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
44828 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
44829 "inode 0x%lx or driver bug.", vdir->i_ino);
44830 goto err_out;
44831diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
44832index c587e2d..3641eaa 100644
44833--- a/fs/ntfs/file.c
44834+++ b/fs/ntfs/file.c
44835@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_inode_ops = {
44836 #endif /* NTFS_RW */
44837 };
44838
44839-const struct file_operations ntfs_empty_file_ops = {};
44840+const struct file_operations ntfs_empty_file_ops __read_only;
44841
44842-const struct inode_operations ntfs_empty_inode_ops = {};
44843+const struct inode_operations ntfs_empty_inode_ops __read_only;
44844diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
44845index 210c352..a174f83 100644
44846--- a/fs/ocfs2/localalloc.c
44847+++ b/fs/ocfs2/localalloc.c
44848@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
44849 goto bail;
44850 }
44851
44852- atomic_inc(&osb->alloc_stats.moves);
44853+ atomic_inc_unchecked(&osb->alloc_stats.moves);
44854
44855 bail:
44856 if (handle)
44857diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
44858index d355e6e..578d905 100644
44859--- a/fs/ocfs2/ocfs2.h
44860+++ b/fs/ocfs2/ocfs2.h
44861@@ -235,11 +235,11 @@ enum ocfs2_vol_state
44862
44863 struct ocfs2_alloc_stats
44864 {
44865- atomic_t moves;
44866- atomic_t local_data;
44867- atomic_t bitmap_data;
44868- atomic_t bg_allocs;
44869- atomic_t bg_extends;
44870+ atomic_unchecked_t moves;
44871+ atomic_unchecked_t local_data;
44872+ atomic_unchecked_t bitmap_data;
44873+ atomic_unchecked_t bg_allocs;
44874+ atomic_unchecked_t bg_extends;
44875 };
44876
44877 enum ocfs2_local_alloc_state
44878diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
44879index ba5d97e..c77db25 100644
44880--- a/fs/ocfs2/suballoc.c
44881+++ b/fs/ocfs2/suballoc.c
44882@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
44883 mlog_errno(status);
44884 goto bail;
44885 }
44886- atomic_inc(&osb->alloc_stats.bg_extends);
44887+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
44888
44889 /* You should never ask for this much metadata */
44890 BUG_ON(bits_wanted >
44891@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
44892 mlog_errno(status);
44893 goto bail;
44894 }
44895- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44896+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44897
44898 *suballoc_loc = res.sr_bg_blkno;
44899 *suballoc_bit_start = res.sr_bit_offset;
44900@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
44901 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
44902 res->sr_bits);
44903
44904- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44905+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44906
44907 BUG_ON(res->sr_bits != 1);
44908
44909@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
44910 mlog_errno(status);
44911 goto bail;
44912 }
44913- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44914+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
44915
44916 BUG_ON(res.sr_bits != 1);
44917
44918@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
44919 cluster_start,
44920 num_clusters);
44921 if (!status)
44922- atomic_inc(&osb->alloc_stats.local_data);
44923+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
44924 } else {
44925 if (min_clusters > (osb->bitmap_cpg - 1)) {
44926 /* The only paths asking for contiguousness
44927@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
44928 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
44929 res.sr_bg_blkno,
44930 res.sr_bit_offset);
44931- atomic_inc(&osb->alloc_stats.bitmap_data);
44932+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
44933 *num_clusters = res.sr_bits;
44934 }
44935 }
44936diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
44937index 4994f8b..eaab8eb 100644
44938--- a/fs/ocfs2/super.c
44939+++ b/fs/ocfs2/super.c
44940@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
44941 "%10s => GlobalAllocs: %d LocalAllocs: %d "
44942 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
44943 "Stats",
44944- atomic_read(&osb->alloc_stats.bitmap_data),
44945- atomic_read(&osb->alloc_stats.local_data),
44946- atomic_read(&osb->alloc_stats.bg_allocs),
44947- atomic_read(&osb->alloc_stats.moves),
44948- atomic_read(&osb->alloc_stats.bg_extends));
44949+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
44950+ atomic_read_unchecked(&osb->alloc_stats.local_data),
44951+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
44952+ atomic_read_unchecked(&osb->alloc_stats.moves),
44953+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
44954
44955 out += snprintf(buf + out, len - out,
44956 "%10s => State: %u Descriptor: %llu Size: %u bits "
44957@@ -2119,11 +2119,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
44958 spin_lock_init(&osb->osb_xattr_lock);
44959 ocfs2_init_steal_slots(osb);
44960
44961- atomic_set(&osb->alloc_stats.moves, 0);
44962- atomic_set(&osb->alloc_stats.local_data, 0);
44963- atomic_set(&osb->alloc_stats.bitmap_data, 0);
44964- atomic_set(&osb->alloc_stats.bg_allocs, 0);
44965- atomic_set(&osb->alloc_stats.bg_extends, 0);
44966+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
44967+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
44968+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
44969+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
44970+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
44971
44972 /* Copy the blockcheck stats from the superblock probe */
44973 osb->osb_ecc_stats = *stats;
44974diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
44975index 5d22872..523db20 100644
44976--- a/fs/ocfs2/symlink.c
44977+++ b/fs/ocfs2/symlink.c
44978@@ -142,7 +142,7 @@ bail:
44979
44980 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
44981 {
44982- char *link = nd_get_link(nd);
44983+ const char *link = nd_get_link(nd);
44984 if (!IS_ERR(link))
44985 kfree(link);
44986 }
44987diff --git a/fs/open.c b/fs/open.c
44988index 22c41b5..695cb17 100644
44989--- a/fs/open.c
44990+++ b/fs/open.c
44991@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
44992 error = locks_verify_truncate(inode, NULL, length);
44993 if (!error)
44994 error = security_path_truncate(&path);
44995+
44996+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
44997+ error = -EACCES;
44998+
44999 if (!error)
45000 error = do_truncate(path.dentry, length, 0, NULL);
45001
45002@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
45003 if (__mnt_is_readonly(path.mnt))
45004 res = -EROFS;
45005
45006+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
45007+ res = -EACCES;
45008+
45009 out_path_release:
45010 path_put(&path);
45011 out:
45012@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
45013 if (error)
45014 goto dput_and_out;
45015
45016+ gr_log_chdir(path.dentry, path.mnt);
45017+
45018 set_fs_pwd(current->fs, &path);
45019
45020 dput_and_out:
45021@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
45022 goto out_putf;
45023
45024 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
45025+
45026+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
45027+ error = -EPERM;
45028+
45029+ if (!error)
45030+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
45031+
45032 if (!error)
45033 set_fs_pwd(current->fs, &file->f_path);
45034 out_putf:
45035@@ -438,7 +454,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
45036 if (error)
45037 goto dput_and_out;
45038
45039+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
45040+ goto dput_and_out;
45041+
45042 set_fs_root(current->fs, &path);
45043+
45044+ gr_handle_chroot_chdir(&path);
45045+
45046 error = 0;
45047 dput_and_out:
45048 path_put(&path);
45049@@ -456,6 +478,16 @@ static int chmod_common(struct path *path, umode_t mode)
45050 if (error)
45051 return error;
45052 mutex_lock(&inode->i_mutex);
45053+
45054+ if (!gr_acl_handle_fchmod(path->dentry, path->mnt, mode)) {
45055+ error = -EACCES;
45056+ goto out_unlock;
45057+ }
45058+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
45059+ error = -EACCES;
45060+ goto out_unlock;
45061+ }
45062+
45063 error = security_path_chmod(path->dentry, path->mnt, mode);
45064 if (error)
45065 goto out_unlock;
45066@@ -506,6 +538,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
45067 int error;
45068 struct iattr newattrs;
45069
45070+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
45071+ return -EACCES;
45072+
45073 newattrs.ia_valid = ATTR_CTIME;
45074 if (user != (uid_t) -1) {
45075 newattrs.ia_valid |= ATTR_UID;
45076diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
45077index 6296b40..417c00f 100644
45078--- a/fs/partitions/efi.c
45079+++ b/fs/partitions/efi.c
45080@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
45081 if (!gpt)
45082 return NULL;
45083
45084+ if (!le32_to_cpu(gpt->num_partition_entries))
45085+ return NULL;
45086+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
45087+ if (!pte)
45088+ return NULL;
45089+
45090 count = le32_to_cpu(gpt->num_partition_entries) *
45091 le32_to_cpu(gpt->sizeof_partition_entry);
45092- if (!count)
45093- return NULL;
45094- pte = kzalloc(count, GFP_KERNEL);
45095- if (!pte)
45096- return NULL;
45097-
45098 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
45099 (u8 *) pte,
45100 count) < count) {
45101diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
45102index bd8ae78..539d250 100644
45103--- a/fs/partitions/ldm.c
45104+++ b/fs/partitions/ldm.c
45105@@ -1324,7 +1324,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
45106 goto found;
45107 }
45108
45109- f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
45110+ f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
45111 if (!f) {
45112 ldm_crit ("Out of memory.");
45113 return false;
45114diff --git a/fs/pipe.c b/fs/pipe.c
45115index 4065f07..68c0706 100644
45116--- a/fs/pipe.c
45117+++ b/fs/pipe.c
45118@@ -420,9 +420,9 @@ redo:
45119 }
45120 if (bufs) /* More to do? */
45121 continue;
45122- if (!pipe->writers)
45123+ if (!atomic_read(&pipe->writers))
45124 break;
45125- if (!pipe->waiting_writers) {
45126+ if (!atomic_read(&pipe->waiting_writers)) {
45127 /* syscall merging: Usually we must not sleep
45128 * if O_NONBLOCK is set, or if we got some data.
45129 * But if a writer sleeps in kernel space, then
45130@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
45131 mutex_lock(&inode->i_mutex);
45132 pipe = inode->i_pipe;
45133
45134- if (!pipe->readers) {
45135+ if (!atomic_read(&pipe->readers)) {
45136 send_sig(SIGPIPE, current, 0);
45137 ret = -EPIPE;
45138 goto out;
45139@@ -530,7 +530,7 @@ redo1:
45140 for (;;) {
45141 int bufs;
45142
45143- if (!pipe->readers) {
45144+ if (!atomic_read(&pipe->readers)) {
45145 send_sig(SIGPIPE, current, 0);
45146 if (!ret)
45147 ret = -EPIPE;
45148@@ -616,9 +616,9 @@ redo2:
45149 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
45150 do_wakeup = 0;
45151 }
45152- pipe->waiting_writers++;
45153+ atomic_inc(&pipe->waiting_writers);
45154 pipe_wait(pipe);
45155- pipe->waiting_writers--;
45156+ atomic_dec(&pipe->waiting_writers);
45157 }
45158 out:
45159 mutex_unlock(&inode->i_mutex);
45160@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait)
45161 mask = 0;
45162 if (filp->f_mode & FMODE_READ) {
45163 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
45164- if (!pipe->writers && filp->f_version != pipe->w_counter)
45165+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
45166 mask |= POLLHUP;
45167 }
45168
45169@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait)
45170 * Most Unices do not set POLLERR for FIFOs but on Linux they
45171 * behave exactly like pipes for poll().
45172 */
45173- if (!pipe->readers)
45174+ if (!atomic_read(&pipe->readers))
45175 mask |= POLLERR;
45176 }
45177
45178@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw)
45179
45180 mutex_lock(&inode->i_mutex);
45181 pipe = inode->i_pipe;
45182- pipe->readers -= decr;
45183- pipe->writers -= decw;
45184+ atomic_sub(decr, &pipe->readers);
45185+ atomic_sub(decw, &pipe->writers);
45186
45187- if (!pipe->readers && !pipe->writers) {
45188+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
45189 free_pipe_info(inode);
45190 } else {
45191 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
45192@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
45193
45194 if (inode->i_pipe) {
45195 ret = 0;
45196- inode->i_pipe->readers++;
45197+ atomic_inc(&inode->i_pipe->readers);
45198 }
45199
45200 mutex_unlock(&inode->i_mutex);
45201@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
45202
45203 if (inode->i_pipe) {
45204 ret = 0;
45205- inode->i_pipe->writers++;
45206+ atomic_inc(&inode->i_pipe->writers);
45207 }
45208
45209 mutex_unlock(&inode->i_mutex);
45210@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
45211 if (inode->i_pipe) {
45212 ret = 0;
45213 if (filp->f_mode & FMODE_READ)
45214- inode->i_pipe->readers++;
45215+ atomic_inc(&inode->i_pipe->readers);
45216 if (filp->f_mode & FMODE_WRITE)
45217- inode->i_pipe->writers++;
45218+ atomic_inc(&inode->i_pipe->writers);
45219 }
45220
45221 mutex_unlock(&inode->i_mutex);
45222@@ -931,7 +931,7 @@ void free_pipe_info(struct inode *inode)
45223 inode->i_pipe = NULL;
45224 }
45225
45226-static struct vfsmount *pipe_mnt __read_mostly;
45227+struct vfsmount *pipe_mnt __read_mostly;
45228
45229 /*
45230 * pipefs_dname() is called from d_path().
45231@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(void)
45232 goto fail_iput;
45233 inode->i_pipe = pipe;
45234
45235- pipe->readers = pipe->writers = 1;
45236+ atomic_set(&pipe->readers, 1);
45237+ atomic_set(&pipe->writers, 1);
45238 inode->i_fop = &rdwr_pipefifo_fops;
45239
45240 /*
45241diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
45242index 15af622..0e9f4467 100644
45243--- a/fs/proc/Kconfig
45244+++ b/fs/proc/Kconfig
45245@@ -30,12 +30,12 @@ config PROC_FS
45246
45247 config PROC_KCORE
45248 bool "/proc/kcore support" if !ARM
45249- depends on PROC_FS && MMU
45250+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
45251
45252 config PROC_VMCORE
45253 bool "/proc/vmcore support"
45254- depends on PROC_FS && CRASH_DUMP
45255- default y
45256+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
45257+ default n
45258 help
45259 Exports the dump image of crashed kernel in ELF format.
45260
45261@@ -59,8 +59,8 @@ config PROC_SYSCTL
45262 limited in memory.
45263
45264 config PROC_PAGE_MONITOR
45265- default y
45266- depends on PROC_FS && MMU
45267+ default n
45268+ depends on PROC_FS && MMU && !GRKERNSEC
45269 bool "Enable /proc page monitoring" if EXPERT
45270 help
45271 Various /proc files exist to monitor process memory utilization:
45272diff --git a/fs/proc/array.c b/fs/proc/array.c
45273index 3a1dafd..1456746 100644
45274--- a/fs/proc/array.c
45275+++ b/fs/proc/array.c
45276@@ -60,6 +60,7 @@
45277 #include <linux/tty.h>
45278 #include <linux/string.h>
45279 #include <linux/mman.h>
45280+#include <linux/grsecurity.h>
45281 #include <linux/proc_fs.h>
45282 #include <linux/ioport.h>
45283 #include <linux/uaccess.h>
45284@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
45285 seq_putc(m, '\n');
45286 }
45287
45288+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
45289+static inline void task_pax(struct seq_file *m, struct task_struct *p)
45290+{
45291+ if (p->mm)
45292+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
45293+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
45294+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
45295+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
45296+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
45297+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
45298+ else
45299+ seq_printf(m, "PaX:\t-----\n");
45300+}
45301+#endif
45302+
45303 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
45304 struct pid *pid, struct task_struct *task)
45305 {
45306@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
45307 task_cpus_allowed(m, task);
45308 cpuset_task_status_allowed(m, task);
45309 task_context_switch_counts(m, task);
45310+
45311+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
45312+ task_pax(m, task);
45313+#endif
45314+
45315+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
45316+ task_grsec_rbac(m, task);
45317+#endif
45318+
45319 return 0;
45320 }
45321
45322+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45323+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
45324+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
45325+ _mm->pax_flags & MF_PAX_SEGMEXEC))
45326+#endif
45327+
45328 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
45329 struct pid *pid, struct task_struct *task, int whole)
45330 {
45331@@ -378,6 +409,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
45332 char tcomm[sizeof(task->comm)];
45333 unsigned long flags;
45334
45335+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45336+ if (current->exec_id != m->exec_id) {
45337+ gr_log_badprocpid("stat");
45338+ return 0;
45339+ }
45340+#endif
45341+
45342 state = *get_task_state(task);
45343 vsize = eip = esp = 0;
45344 permitted = ptrace_may_access(task, PTRACE_MODE_READ);
45345@@ -449,6 +487,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
45346 gtime = task->gtime;
45347 }
45348
45349+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45350+ if (PAX_RAND_FLAGS(mm)) {
45351+ eip = 0;
45352+ esp = 0;
45353+ wchan = 0;
45354+ }
45355+#endif
45356+#ifdef CONFIG_GRKERNSEC_HIDESYM
45357+ wchan = 0;
45358+ eip =0;
45359+ esp =0;
45360+#endif
45361+
45362 /* scale priority and nice values from timeslices to -20..20 */
45363 /* to make it look like a "normal" Unix priority/nice value */
45364 priority = task_prio(task);
45365@@ -489,9 +540,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
45366 vsize,
45367 mm ? get_mm_rss(mm) : 0,
45368 rsslim,
45369+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45370+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
45371+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
45372+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
45373+#else
45374 mm ? (permitted ? mm->start_code : 1) : 0,
45375 mm ? (permitted ? mm->end_code : 1) : 0,
45376 (permitted && mm) ? mm->start_stack : 0,
45377+#endif
45378 esp,
45379 eip,
45380 /* The signal information here is obsolete.
45381@@ -535,6 +592,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
45382 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
45383 struct mm_struct *mm = get_task_mm(task);
45384
45385+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45386+ if (current->exec_id != m->exec_id) {
45387+ gr_log_badprocpid("statm");
45388+ return 0;
45389+ }
45390+#endif
45391+
45392 if (mm) {
45393 size = task_statm(mm, &shared, &text, &data, &resident);
45394 mmput(mm);
45395@@ -544,3 +608,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
45396
45397 return 0;
45398 }
45399+
45400+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
45401+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
45402+{
45403+ u32 curr_ip = 0;
45404+ unsigned long flags;
45405+
45406+ if (lock_task_sighand(task, &flags)) {
45407+ curr_ip = task->signal->curr_ip;
45408+ unlock_task_sighand(task, &flags);
45409+ }
45410+
45411+ return sprintf(buffer, "%pI4\n", &curr_ip);
45412+}
45413+#endif
45414diff --git a/fs/proc/base.c b/fs/proc/base.c
45415index 1ace83d..357b933 100644
45416--- a/fs/proc/base.c
45417+++ b/fs/proc/base.c
45418@@ -107,6 +107,22 @@ struct pid_entry {
45419 union proc_op op;
45420 };
45421
45422+struct getdents_callback {
45423+ struct linux_dirent __user * current_dir;
45424+ struct linux_dirent __user * previous;
45425+ struct file * file;
45426+ int count;
45427+ int error;
45428+};
45429+
45430+static int gr_fake_filldir(void * __buf, const char *name, int namlen,
45431+ loff_t offset, u64 ino, unsigned int d_type)
45432+{
45433+ struct getdents_callback * buf = (struct getdents_callback *) __buf;
45434+ buf->error = -EINVAL;
45435+ return 0;
45436+}
45437+
45438 #define NOD(NAME, MODE, IOP, FOP, OP) { \
45439 .name = (NAME), \
45440 .len = sizeof(NAME) - 1, \
45441@@ -194,26 +210,6 @@ static int proc_root_link(struct inode *inode, struct path *path)
45442 return result;
45443 }
45444
45445-static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
45446-{
45447- struct mm_struct *mm;
45448- int err;
45449-
45450- err = mutex_lock_killable(&task->signal->cred_guard_mutex);
45451- if (err)
45452- return ERR_PTR(err);
45453-
45454- mm = get_task_mm(task);
45455- if (mm && mm != current->mm &&
45456- !ptrace_may_access(task, mode)) {
45457- mmput(mm);
45458- mm = ERR_PTR(-EACCES);
45459- }
45460- mutex_unlock(&task->signal->cred_guard_mutex);
45461-
45462- return mm;
45463-}
45464-
45465 struct mm_struct *mm_for_maps(struct task_struct *task)
45466 {
45467 return mm_access(task, PTRACE_MODE_READ);
45468@@ -229,6 +225,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
45469 if (!mm->arg_end)
45470 goto out_mm; /* Shh! No looking before we're done */
45471
45472+ if (gr_acl_handle_procpidmem(task))
45473+ goto out_mm;
45474+
45475 len = mm->arg_end - mm->arg_start;
45476
45477 if (len > PAGE_SIZE)
45478@@ -256,12 +255,28 @@ out:
45479 return res;
45480 }
45481
45482+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45483+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
45484+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
45485+ _mm->pax_flags & MF_PAX_SEGMEXEC))
45486+#endif
45487+
45488 static int proc_pid_auxv(struct task_struct *task, char *buffer)
45489 {
45490 struct mm_struct *mm = mm_for_maps(task);
45491 int res = PTR_ERR(mm);
45492 if (mm && !IS_ERR(mm)) {
45493 unsigned int nwords = 0;
45494+
45495+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45496+ /* allow if we're currently ptracing this task */
45497+ if (PAX_RAND_FLAGS(mm) &&
45498+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
45499+ mmput(mm);
45500+ return 0;
45501+ }
45502+#endif
45503+
45504 do {
45505 nwords += 2;
45506 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
45507@@ -275,7 +290,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
45508 }
45509
45510
45511-#ifdef CONFIG_KALLSYMS
45512+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45513 /*
45514 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
45515 * Returns the resolved symbol. If that fails, simply return the address.
45516@@ -314,7 +329,7 @@ static void unlock_trace(struct task_struct *task)
45517 mutex_unlock(&task->signal->cred_guard_mutex);
45518 }
45519
45520-#ifdef CONFIG_STACKTRACE
45521+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45522
45523 #define MAX_STACK_TRACE_DEPTH 64
45524
45525@@ -505,7 +520,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
45526 return count;
45527 }
45528
45529-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
45530+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
45531 static int proc_pid_syscall(struct task_struct *task, char *buffer)
45532 {
45533 long nr;
45534@@ -534,7 +549,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
45535 /************************************************************************/
45536
45537 /* permission checks */
45538-static int proc_fd_access_allowed(struct inode *inode)
45539+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
45540 {
45541 struct task_struct *task;
45542 int allowed = 0;
45543@@ -544,7 +559,10 @@ static int proc_fd_access_allowed(struct inode *inode)
45544 */
45545 task = get_proc_task(inode);
45546 if (task) {
45547- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
45548+ if (log)
45549+ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
45550+ else
45551+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
45552 put_task_struct(task);
45553 }
45554 return allowed;
45555@@ -797,6 +815,11 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
45556 ssize_t copied;
45557 char *page;
45558
45559+#ifdef CONFIG_GRKERNSEC
45560+ if (write)
45561+ return -EPERM;
45562+#endif
45563+
45564 if (!mm)
45565 return 0;
45566
45567@@ -897,6 +920,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
45568 if (!task)
45569 goto out_no_task;
45570
45571+ if (gr_acl_handle_procpidmem(task))
45572+ goto out;
45573+
45574 ret = -ENOMEM;
45575 page = (char *)__get_free_page(GFP_TEMPORARY);
45576 if (!page)
45577@@ -1519,7 +1545,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
45578 path_put(&nd->path);
45579
45580 /* Are we allowed to snoop on the tasks file descriptors? */
45581- if (!proc_fd_access_allowed(inode))
45582+ if (!proc_fd_access_allowed(inode,0))
45583 goto out;
45584
45585 error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
45586@@ -1558,8 +1584,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
45587 struct path path;
45588
45589 /* Are we allowed to snoop on the tasks file descriptors? */
45590- if (!proc_fd_access_allowed(inode))
45591- goto out;
45592+ /* logging this is needed for learning on chromium to work properly,
45593+ but we don't want to flood the logs from 'ps' which does a readlink
45594+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
45595+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
45596+ */
45597+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
45598+ if (!proc_fd_access_allowed(inode,0))
45599+ goto out;
45600+ } else {
45601+ if (!proc_fd_access_allowed(inode,1))
45602+ goto out;
45603+ }
45604
45605 error = PROC_I(inode)->op.proc_get_link(inode, &path);
45606 if (error)
45607@@ -1624,7 +1660,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
45608 rcu_read_lock();
45609 cred = __task_cred(task);
45610 inode->i_uid = cred->euid;
45611+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45612+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
45613+#else
45614 inode->i_gid = cred->egid;
45615+#endif
45616 rcu_read_unlock();
45617 }
45618 security_task_to_inode(task, inode);
45619@@ -1642,6 +1682,9 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
45620 struct inode *inode = dentry->d_inode;
45621 struct task_struct *task;
45622 const struct cred *cred;
45623+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45624+ const struct cred *tmpcred = current_cred();
45625+#endif
45626
45627 generic_fillattr(inode, stat);
45628
45629@@ -1649,13 +1692,41 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
45630 stat->uid = 0;
45631 stat->gid = 0;
45632 task = pid_task(proc_pid(inode), PIDTYPE_PID);
45633+
45634+ if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
45635+ rcu_read_unlock();
45636+ return -ENOENT;
45637+ }
45638+
45639 if (task) {
45640+ cred = __task_cred(task);
45641+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45642+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
45643+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45644+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
45645+#endif
45646+ ) {
45647+#endif
45648 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
45649+#ifdef CONFIG_GRKERNSEC_PROC_USER
45650+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
45651+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45652+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
45653+#endif
45654 task_dumpable(task)) {
45655- cred = __task_cred(task);
45656 stat->uid = cred->euid;
45657+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45658+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
45659+#else
45660 stat->gid = cred->egid;
45661+#endif
45662 }
45663+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45664+ } else {
45665+ rcu_read_unlock();
45666+ return -ENOENT;
45667+ }
45668+#endif
45669 }
45670 rcu_read_unlock();
45671 return 0;
45672@@ -1692,11 +1763,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
45673
45674 if (task) {
45675 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
45676+#ifdef CONFIG_GRKERNSEC_PROC_USER
45677+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
45678+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45679+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
45680+#endif
45681 task_dumpable(task)) {
45682 rcu_read_lock();
45683 cred = __task_cred(task);
45684 inode->i_uid = cred->euid;
45685+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45686+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
45687+#else
45688 inode->i_gid = cred->egid;
45689+#endif
45690 rcu_read_unlock();
45691 } else {
45692 inode->i_uid = 0;
45693@@ -1814,7 +1894,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
45694 int fd = proc_fd(inode);
45695
45696 if (task) {
45697- files = get_files_struct(task);
45698+ if (!gr_acl_handle_procpidmem(task))
45699+ files = get_files_struct(task);
45700 put_task_struct(task);
45701 }
45702 if (files) {
45703@@ -2082,11 +2163,21 @@ static const struct file_operations proc_fd_operations = {
45704 */
45705 static int proc_fd_permission(struct inode *inode, int mask)
45706 {
45707+ struct task_struct *task;
45708 int rv = generic_permission(inode, mask);
45709- if (rv == 0)
45710- return 0;
45711+
45712 if (task_pid(current) == proc_pid(inode))
45713 rv = 0;
45714+
45715+ task = get_proc_task(inode);
45716+ if (task == NULL)
45717+ return rv;
45718+
45719+ if (gr_acl_handle_procpidmem(task))
45720+ rv = -EACCES;
45721+
45722+ put_task_struct(task);
45723+
45724 return rv;
45725 }
45726
45727@@ -2196,6 +2287,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
45728 if (!task)
45729 goto out_no_task;
45730
45731+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
45732+ goto out;
45733+
45734 /*
45735 * Yes, it does not scale. And it should not. Don't add
45736 * new entries into /proc/<tgid>/ without very good reasons.
45737@@ -2240,6 +2334,9 @@ static int proc_pident_readdir(struct file *filp,
45738 if (!task)
45739 goto out_no_task;
45740
45741+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
45742+ goto out;
45743+
45744 ret = 0;
45745 i = filp->f_pos;
45746 switch (i) {
45747@@ -2510,7 +2607,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
45748 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
45749 void *cookie)
45750 {
45751- char *s = nd_get_link(nd);
45752+ const char *s = nd_get_link(nd);
45753 if (!IS_ERR(s))
45754 __putname(s);
45755 }
45756@@ -2708,7 +2805,7 @@ static const struct pid_entry tgid_base_stuff[] = {
45757 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
45758 #endif
45759 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
45760-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
45761+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
45762 INF("syscall", S_IRUGO, proc_pid_syscall),
45763 #endif
45764 INF("cmdline", S_IRUGO, proc_pid_cmdline),
45765@@ -2733,10 +2830,10 @@ static const struct pid_entry tgid_base_stuff[] = {
45766 #ifdef CONFIG_SECURITY
45767 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
45768 #endif
45769-#ifdef CONFIG_KALLSYMS
45770+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45771 INF("wchan", S_IRUGO, proc_pid_wchan),
45772 #endif
45773-#ifdef CONFIG_STACKTRACE
45774+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45775 ONE("stack", S_IRUGO, proc_pid_stack),
45776 #endif
45777 #ifdef CONFIG_SCHEDSTATS
45778@@ -2770,6 +2867,9 @@ static const struct pid_entry tgid_base_stuff[] = {
45779 #ifdef CONFIG_HARDWALL
45780 INF("hardwall", S_IRUGO, proc_pid_hardwall),
45781 #endif
45782+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
45783+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
45784+#endif
45785 };
45786
45787 static int proc_tgid_base_readdir(struct file * filp,
45788@@ -2895,7 +2995,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
45789 if (!inode)
45790 goto out;
45791
45792+#ifdef CONFIG_GRKERNSEC_PROC_USER
45793+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
45794+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45795+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
45796+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
45797+#else
45798 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
45799+#endif
45800 inode->i_op = &proc_tgid_base_inode_operations;
45801 inode->i_fop = &proc_tgid_base_operations;
45802 inode->i_flags|=S_IMMUTABLE;
45803@@ -2937,7 +3044,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
45804 if (!task)
45805 goto out;
45806
45807+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
45808+ goto out_put_task;
45809+
45810 result = proc_pid_instantiate(dir, dentry, task, NULL);
45811+out_put_task:
45812 put_task_struct(task);
45813 out:
45814 return result;
45815@@ -3002,6 +3113,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
45816 {
45817 unsigned int nr;
45818 struct task_struct *reaper;
45819+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45820+ const struct cred *tmpcred = current_cred();
45821+ const struct cred *itercred;
45822+#endif
45823+ filldir_t __filldir = filldir;
45824 struct tgid_iter iter;
45825 struct pid_namespace *ns;
45826
45827@@ -3025,8 +3141,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
45828 for (iter = next_tgid(ns, iter);
45829 iter.task;
45830 iter.tgid += 1, iter = next_tgid(ns, iter)) {
45831+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45832+ rcu_read_lock();
45833+ itercred = __task_cred(iter.task);
45834+#endif
45835+ if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
45836+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45837+ || (tmpcred->uid && (itercred->uid != tmpcred->uid)
45838+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45839+ && !in_group_p(CONFIG_GRKERNSEC_PROC_GID)
45840+#endif
45841+ )
45842+#endif
45843+ )
45844+ __filldir = &gr_fake_filldir;
45845+ else
45846+ __filldir = filldir;
45847+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45848+ rcu_read_unlock();
45849+#endif
45850 filp->f_pos = iter.tgid + TGID_OFFSET;
45851- if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
45852+ if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
45853 put_task_struct(iter.task);
45854 goto out;
45855 }
45856@@ -3054,7 +3189,7 @@ static const struct pid_entry tid_base_stuff[] = {
45857 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
45858 #endif
45859 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
45860-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
45861+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
45862 INF("syscall", S_IRUGO, proc_pid_syscall),
45863 #endif
45864 INF("cmdline", S_IRUGO, proc_pid_cmdline),
45865@@ -3078,10 +3213,10 @@ static const struct pid_entry tid_base_stuff[] = {
45866 #ifdef CONFIG_SECURITY
45867 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
45868 #endif
45869-#ifdef CONFIG_KALLSYMS
45870+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45871 INF("wchan", S_IRUGO, proc_pid_wchan),
45872 #endif
45873-#ifdef CONFIG_STACKTRACE
45874+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
45875 ONE("stack", S_IRUGO, proc_pid_stack),
45876 #endif
45877 #ifdef CONFIG_SCHEDSTATS
45878diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
45879index 82676e3..5f8518a 100644
45880--- a/fs/proc/cmdline.c
45881+++ b/fs/proc/cmdline.c
45882@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
45883
45884 static int __init proc_cmdline_init(void)
45885 {
45886+#ifdef CONFIG_GRKERNSEC_PROC_ADD
45887+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
45888+#else
45889 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
45890+#endif
45891 return 0;
45892 }
45893 module_init(proc_cmdline_init);
45894diff --git a/fs/proc/devices.c b/fs/proc/devices.c
45895index b143471..bb105e5 100644
45896--- a/fs/proc/devices.c
45897+++ b/fs/proc/devices.c
45898@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
45899
45900 static int __init proc_devices_init(void)
45901 {
45902+#ifdef CONFIG_GRKERNSEC_PROC_ADD
45903+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
45904+#else
45905 proc_create("devices", 0, NULL, &proc_devinfo_operations);
45906+#endif
45907 return 0;
45908 }
45909 module_init(proc_devices_init);
45910diff --git a/fs/proc/inode.c b/fs/proc/inode.c
45911index 7737c54..7172574 100644
45912--- a/fs/proc/inode.c
45913+++ b/fs/proc/inode.c
45914@@ -18,12 +18,18 @@
45915 #include <linux/module.h>
45916 #include <linux/sysctl.h>
45917 #include <linux/slab.h>
45918+#include <linux/grsecurity.h>
45919
45920 #include <asm/system.h>
45921 #include <asm/uaccess.h>
45922
45923 #include "internal.h"
45924
45925+#ifdef CONFIG_PROC_SYSCTL
45926+extern const struct inode_operations proc_sys_inode_operations;
45927+extern const struct inode_operations proc_sys_dir_operations;
45928+#endif
45929+
45930 static void proc_evict_inode(struct inode *inode)
45931 {
45932 struct proc_dir_entry *de;
45933@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
45934 ns_ops = PROC_I(inode)->ns_ops;
45935 if (ns_ops && ns_ops->put)
45936 ns_ops->put(PROC_I(inode)->ns);
45937+
45938+#ifdef CONFIG_PROC_SYSCTL
45939+ if (inode->i_op == &proc_sys_inode_operations ||
45940+ inode->i_op == &proc_sys_dir_operations)
45941+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
45942+#endif
45943+
45944 }
45945
45946 static struct kmem_cache * proc_inode_cachep;
45947@@ -440,7 +453,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
45948 if (de->mode) {
45949 inode->i_mode = de->mode;
45950 inode->i_uid = de->uid;
45951+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
45952+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
45953+#else
45954 inode->i_gid = de->gid;
45955+#endif
45956 }
45957 if (de->size)
45958 inode->i_size = de->size;
45959diff --git a/fs/proc/internal.h b/fs/proc/internal.h
45960index 7838e5c..ff92cbc 100644
45961--- a/fs/proc/internal.h
45962+++ b/fs/proc/internal.h
45963@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
45964 struct pid *pid, struct task_struct *task);
45965 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
45966 struct pid *pid, struct task_struct *task);
45967+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
45968+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
45969+#endif
45970 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
45971
45972 extern const struct file_operations proc_maps_operations;
45973diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
45974index d245cb2..f4e8498 100644
45975--- a/fs/proc/kcore.c
45976+++ b/fs/proc/kcore.c
45977@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
45978 * the addresses in the elf_phdr on our list.
45979 */
45980 start = kc_offset_to_vaddr(*fpos - elf_buflen);
45981- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
45982+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
45983+ if (tsz > buflen)
45984 tsz = buflen;
45985-
45986+
45987 while (buflen) {
45988 struct kcore_list *m;
45989
45990@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
45991 kfree(elf_buf);
45992 } else {
45993 if (kern_addr_valid(start)) {
45994- unsigned long n;
45995+ char *elf_buf;
45996+ mm_segment_t oldfs;
45997
45998- n = copy_to_user(buffer, (char *)start, tsz);
45999- /*
46000- * We cannot distingush between fault on source
46001- * and fault on destination. When this happens
46002- * we clear too and hope it will trigger the
46003- * EFAULT again.
46004- */
46005- if (n) {
46006- if (clear_user(buffer + tsz - n,
46007- n))
46008+ elf_buf = kmalloc(tsz, GFP_KERNEL);
46009+ if (!elf_buf)
46010+ return -ENOMEM;
46011+ oldfs = get_fs();
46012+ set_fs(KERNEL_DS);
46013+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
46014+ set_fs(oldfs);
46015+ if (copy_to_user(buffer, elf_buf, tsz)) {
46016+ kfree(elf_buf);
46017 return -EFAULT;
46018+ }
46019 }
46020+ set_fs(oldfs);
46021+ kfree(elf_buf);
46022 } else {
46023 if (clear_user(buffer, tsz))
46024 return -EFAULT;
46025@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
46026
46027 static int open_kcore(struct inode *inode, struct file *filp)
46028 {
46029+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
46030+ return -EPERM;
46031+#endif
46032 if (!capable(CAP_SYS_RAWIO))
46033 return -EPERM;
46034 if (kcore_need_update)
46035diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
46036index 80e4645..53e5fcf 100644
46037--- a/fs/proc/meminfo.c
46038+++ b/fs/proc/meminfo.c
46039@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
46040 vmi.used >> 10,
46041 vmi.largest_chunk >> 10
46042 #ifdef CONFIG_MEMORY_FAILURE
46043- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
46044+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
46045 #endif
46046 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
46047 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
46048diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
46049index b1822dd..df622cb 100644
46050--- a/fs/proc/nommu.c
46051+++ b/fs/proc/nommu.c
46052@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
46053 if (len < 1)
46054 len = 1;
46055 seq_printf(m, "%*c", len, ' ');
46056- seq_path(m, &file->f_path, "");
46057+ seq_path(m, &file->f_path, "\n\\");
46058 }
46059
46060 seq_putc(m, '\n');
46061diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
46062index f738024..876984a 100644
46063--- a/fs/proc/proc_net.c
46064+++ b/fs/proc/proc_net.c
46065@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
46066 struct task_struct *task;
46067 struct nsproxy *ns;
46068 struct net *net = NULL;
46069+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
46070+ const struct cred *cred = current_cred();
46071+#endif
46072+
46073+#ifdef CONFIG_GRKERNSEC_PROC_USER
46074+ if (cred->fsuid)
46075+ return net;
46076+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
46077+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
46078+ return net;
46079+#endif
46080
46081 rcu_read_lock();
46082 task = pid_task(proc_pid(dir), PIDTYPE_PID);
46083diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
46084index a6b6217..1e0579d 100644
46085--- a/fs/proc/proc_sysctl.c
46086+++ b/fs/proc/proc_sysctl.c
46087@@ -9,11 +9,13 @@
46088 #include <linux/namei.h>
46089 #include "internal.h"
46090
46091+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
46092+
46093 static const struct dentry_operations proc_sys_dentry_operations;
46094 static const struct file_operations proc_sys_file_operations;
46095-static const struct inode_operations proc_sys_inode_operations;
46096+const struct inode_operations proc_sys_inode_operations;
46097 static const struct file_operations proc_sys_dir_file_operations;
46098-static const struct inode_operations proc_sys_dir_operations;
46099+const struct inode_operations proc_sys_dir_operations;
46100
46101 void proc_sys_poll_notify(struct ctl_table_poll *poll)
46102 {
46103@@ -131,8 +133,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
46104
46105 err = NULL;
46106 d_set_d_op(dentry, &proc_sys_dentry_operations);
46107+
46108+ gr_handle_proc_create(dentry, inode);
46109+
46110 d_add(dentry, inode);
46111
46112+ if (gr_handle_sysctl(p, MAY_EXEC))
46113+ err = ERR_PTR(-ENOENT);
46114+
46115 out:
46116 sysctl_head_finish(head);
46117 return err;
46118@@ -163,6 +171,12 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
46119 if (!table->proc_handler)
46120 goto out;
46121
46122+#ifdef CONFIG_GRKERNSEC
46123+ error = -EPERM;
46124+ if (write && !capable(CAP_SYS_ADMIN))
46125+ goto out;
46126+#endif
46127+
46128 /* careful: calling conventions are nasty here */
46129 res = count;
46130 error = table->proc_handler(table, write, buf, &res, ppos);
46131@@ -245,6 +259,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
46132 return -ENOMEM;
46133 } else {
46134 d_set_d_op(child, &proc_sys_dentry_operations);
46135+
46136+ gr_handle_proc_create(child, inode);
46137+
46138 d_add(child, inode);
46139 }
46140 } else {
46141@@ -273,6 +290,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
46142 if (*pos < file->f_pos)
46143 continue;
46144
46145+ if (gr_handle_sysctl(table, 0))
46146+ continue;
46147+
46148 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
46149 if (res)
46150 return res;
46151@@ -398,6 +418,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
46152 if (IS_ERR(head))
46153 return PTR_ERR(head);
46154
46155+ if (table && gr_handle_sysctl(table, MAY_EXEC))
46156+ return -ENOENT;
46157+
46158 generic_fillattr(inode, stat);
46159 if (table)
46160 stat->mode = (stat->mode & S_IFMT) | table->mode;
46161@@ -420,13 +443,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
46162 .llseek = generic_file_llseek,
46163 };
46164
46165-static const struct inode_operations proc_sys_inode_operations = {
46166+const struct inode_operations proc_sys_inode_operations = {
46167 .permission = proc_sys_permission,
46168 .setattr = proc_sys_setattr,
46169 .getattr = proc_sys_getattr,
46170 };
46171
46172-static const struct inode_operations proc_sys_dir_operations = {
46173+const struct inode_operations proc_sys_dir_operations = {
46174 .lookup = proc_sys_lookup,
46175 .permission = proc_sys_permission,
46176 .setattr = proc_sys_setattr,
46177diff --git a/fs/proc/root.c b/fs/proc/root.c
46178index 03102d9..4ae347e 100644
46179--- a/fs/proc/root.c
46180+++ b/fs/proc/root.c
46181@@ -121,7 +121,15 @@ void __init proc_root_init(void)
46182 #ifdef CONFIG_PROC_DEVICETREE
46183 proc_device_tree_init();
46184 #endif
46185+#ifdef CONFIG_GRKERNSEC_PROC_ADD
46186+#ifdef CONFIG_GRKERNSEC_PROC_USER
46187+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
46188+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
46189+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
46190+#endif
46191+#else
46192 proc_mkdir("bus", NULL);
46193+#endif
46194 proc_sys_init();
46195 }
46196
46197diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
46198index 7dcd2a2..b2f410e 100644
46199--- a/fs/proc/task_mmu.c
46200+++ b/fs/proc/task_mmu.c
46201@@ -11,6 +11,7 @@
46202 #include <linux/rmap.h>
46203 #include <linux/swap.h>
46204 #include <linux/swapops.h>
46205+#include <linux/grsecurity.h>
46206
46207 #include <asm/elf.h>
46208 #include <asm/uaccess.h>
46209@@ -52,8 +53,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
46210 "VmExe:\t%8lu kB\n"
46211 "VmLib:\t%8lu kB\n"
46212 "VmPTE:\t%8lu kB\n"
46213- "VmSwap:\t%8lu kB\n",
46214- hiwater_vm << (PAGE_SHIFT-10),
46215+ "VmSwap:\t%8lu kB\n"
46216+
46217+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
46218+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
46219+#endif
46220+
46221+ ,hiwater_vm << (PAGE_SHIFT-10),
46222 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
46223 mm->locked_vm << (PAGE_SHIFT-10),
46224 mm->pinned_vm << (PAGE_SHIFT-10),
46225@@ -62,7 +68,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
46226 data << (PAGE_SHIFT-10),
46227 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
46228 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
46229- swap << (PAGE_SHIFT-10));
46230+ swap << (PAGE_SHIFT-10)
46231+
46232+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
46233+ , mm->context.user_cs_base, mm->context.user_cs_limit
46234+#endif
46235+
46236+ );
46237 }
46238
46239 unsigned long task_vsize(struct mm_struct *mm)
46240@@ -209,6 +221,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
46241 return ret;
46242 }
46243
46244+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46245+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
46246+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
46247+ _mm->pax_flags & MF_PAX_SEGMEXEC))
46248+#endif
46249+
46250 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46251 {
46252 struct mm_struct *mm = vma->vm_mm;
46253@@ -227,13 +245,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46254 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
46255 }
46256
46257- /* We don't show the stack guard page in /proc/maps */
46258+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46259+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
46260+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
46261+#else
46262 start = vma->vm_start;
46263- if (stack_guard_page_start(vma, start))
46264- start += PAGE_SIZE;
46265 end = vma->vm_end;
46266- if (stack_guard_page_end(vma, end))
46267- end -= PAGE_SIZE;
46268+#endif
46269
46270 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
46271 start,
46272@@ -242,7 +260,11 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46273 flags & VM_WRITE ? 'w' : '-',
46274 flags & VM_EXEC ? 'x' : '-',
46275 flags & VM_MAYSHARE ? 's' : 'p',
46276+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46277+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
46278+#else
46279 pgoff,
46280+#endif
46281 MAJOR(dev), MINOR(dev), ino, &len);
46282
46283 /*
46284@@ -251,7 +273,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46285 */
46286 if (file) {
46287 pad_len_spaces(m, len);
46288- seq_path(m, &file->f_path, "\n");
46289+ seq_path(m, &file->f_path, "\n\\");
46290 } else {
46291 const char *name = arch_vma_name(vma);
46292 if (!name) {
46293@@ -259,8 +281,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
46294 if (vma->vm_start <= mm->brk &&
46295 vma->vm_end >= mm->start_brk) {
46296 name = "[heap]";
46297- } else if (vma->vm_start <= mm->start_stack &&
46298- vma->vm_end >= mm->start_stack) {
46299+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
46300+ (vma->vm_start <= mm->start_stack &&
46301+ vma->vm_end >= mm->start_stack)) {
46302 name = "[stack]";
46303 }
46304 } else {
46305@@ -281,6 +304,13 @@ static int show_map(struct seq_file *m, void *v)
46306 struct proc_maps_private *priv = m->private;
46307 struct task_struct *task = priv->task;
46308
46309+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46310+ if (current->exec_id != m->exec_id) {
46311+ gr_log_badprocpid("maps");
46312+ return 0;
46313+ }
46314+#endif
46315+
46316 show_map_vma(m, vma);
46317
46318 if (m->count < m->size) /* vma is copied successfully */
46319@@ -434,12 +464,23 @@ static int show_smap(struct seq_file *m, void *v)
46320 .private = &mss,
46321 };
46322
46323+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46324+ if (current->exec_id != m->exec_id) {
46325+ gr_log_badprocpid("smaps");
46326+ return 0;
46327+ }
46328+#endif
46329 memset(&mss, 0, sizeof mss);
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-
46335+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46336+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
46337+#endif
46338+ mss.vma = vma;
46339+ /* mmap_sem is held in m_start */
46340+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
46341+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
46342+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46343+ }
46344+#endif
46345 show_map_vma(m, vma);
46346
46347 seq_printf(m,
46348@@ -457,7 +498,11 @@ static int show_smap(struct seq_file *m, void *v)
46349 "KernelPageSize: %8lu kB\n"
46350 "MMUPageSize: %8lu kB\n"
46351 "Locked: %8lu kB\n",
46352+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46353+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
46354+#else
46355 (vma->vm_end - vma->vm_start) >> 10,
46356+#endif
46357 mss.resident >> 10,
46358 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
46359 mss.shared_clean >> 10,
46360@@ -1015,6 +1060,13 @@ static int show_numa_map(struct seq_file *m, void *v)
46361 int n;
46362 char buffer[50];
46363
46364+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46365+ if (current->exec_id != m->exec_id) {
46366+ gr_log_badprocpid("numa_maps");
46367+ return 0;
46368+ }
46369+#endif
46370+
46371 if (!mm)
46372 return 0;
46373
46374@@ -1032,11 +1084,15 @@ static int show_numa_map(struct seq_file *m, void *v)
46375 mpol_to_str(buffer, sizeof(buffer), pol, 0);
46376 mpol_cond_put(pol);
46377
46378+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46379+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
46380+#else
46381 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
46382+#endif
46383
46384 if (file) {
46385 seq_printf(m, " file=");
46386- seq_path(m, &file->f_path, "\n\t= ");
46387+ seq_path(m, &file->f_path, "\n\t\\= ");
46388 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
46389 seq_printf(m, " heap");
46390 } else if (vma->vm_start <= mm->start_stack &&
46391diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
46392index 980de54..2a4db5f 100644
46393--- a/fs/proc/task_nommu.c
46394+++ b/fs/proc/task_nommu.c
46395@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
46396 else
46397 bytes += kobjsize(mm);
46398
46399- if (current->fs && current->fs->users > 1)
46400+ if (current->fs && atomic_read(&current->fs->users) > 1)
46401 sbytes += kobjsize(current->fs);
46402 else
46403 bytes += kobjsize(current->fs);
46404@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
46405
46406 if (file) {
46407 pad_len_spaces(m, len);
46408- seq_path(m, &file->f_path, "");
46409+ seq_path(m, &file->f_path, "\n\\");
46410 } else if (mm) {
46411 if (vma->vm_start <= mm->start_stack &&
46412 vma->vm_end >= mm->start_stack) {
46413diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
46414index d67908b..d13f6a6 100644
46415--- a/fs/quota/netlink.c
46416+++ b/fs/quota/netlink.c
46417@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
46418 void quota_send_warning(short type, unsigned int id, dev_t dev,
46419 const char warntype)
46420 {
46421- static atomic_t seq;
46422+ static atomic_unchecked_t seq;
46423 struct sk_buff *skb;
46424 void *msg_head;
46425 int ret;
46426@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
46427 "VFS: Not enough memory to send quota warning.\n");
46428 return;
46429 }
46430- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
46431+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
46432 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
46433 if (!msg_head) {
46434 printk(KERN_ERR
46435diff --git a/fs/readdir.c b/fs/readdir.c
46436index 356f715..c918d38 100644
46437--- a/fs/readdir.c
46438+++ b/fs/readdir.c
46439@@ -17,6 +17,7 @@
46440 #include <linux/security.h>
46441 #include <linux/syscalls.h>
46442 #include <linux/unistd.h>
46443+#include <linux/namei.h>
46444
46445 #include <asm/uaccess.h>
46446
46447@@ -67,6 +68,7 @@ struct old_linux_dirent {
46448
46449 struct readdir_callback {
46450 struct old_linux_dirent __user * dirent;
46451+ struct file * file;
46452 int result;
46453 };
46454
46455@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
46456 buf->result = -EOVERFLOW;
46457 return -EOVERFLOW;
46458 }
46459+
46460+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
46461+ return 0;
46462+
46463 buf->result++;
46464 dirent = buf->dirent;
46465 if (!access_ok(VERIFY_WRITE, dirent,
46466@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
46467
46468 buf.result = 0;
46469 buf.dirent = dirent;
46470+ buf.file = file;
46471
46472 error = vfs_readdir(file, fillonedir, &buf);
46473 if (buf.result)
46474@@ -142,6 +149,7 @@ struct linux_dirent {
46475 struct getdents_callback {
46476 struct linux_dirent __user * current_dir;
46477 struct linux_dirent __user * previous;
46478+ struct file * file;
46479 int count;
46480 int error;
46481 };
46482@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
46483 buf->error = -EOVERFLOW;
46484 return -EOVERFLOW;
46485 }
46486+
46487+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
46488+ return 0;
46489+
46490 dirent = buf->previous;
46491 if (dirent) {
46492 if (__put_user(offset, &dirent->d_off))
46493@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
46494 buf.previous = NULL;
46495 buf.count = count;
46496 buf.error = 0;
46497+ buf.file = file;
46498
46499 error = vfs_readdir(file, filldir, &buf);
46500 if (error >= 0)
46501@@ -229,6 +242,7 @@ out:
46502 struct getdents_callback64 {
46503 struct linux_dirent64 __user * current_dir;
46504 struct linux_dirent64 __user * previous;
46505+ struct file *file;
46506 int count;
46507 int error;
46508 };
46509@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
46510 buf->error = -EINVAL; /* only used if we fail.. */
46511 if (reclen > buf->count)
46512 return -EINVAL;
46513+
46514+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
46515+ return 0;
46516+
46517 dirent = buf->previous;
46518 if (dirent) {
46519 if (__put_user(offset, &dirent->d_off))
46520@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
46521
46522 buf.current_dir = dirent;
46523 buf.previous = NULL;
46524+ buf.file = file;
46525 buf.count = count;
46526 buf.error = 0;
46527
46528@@ -299,7 +318,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
46529 error = buf.error;
46530 lastdirent = buf.previous;
46531 if (lastdirent) {
46532- typeof(lastdirent->d_off) d_off = file->f_pos;
46533+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
46534 if (__put_user(d_off, &lastdirent->d_off))
46535 error = -EFAULT;
46536 else
46537diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
46538index 60c0804..d814f98 100644
46539--- a/fs/reiserfs/do_balan.c
46540+++ b/fs/reiserfs/do_balan.c
46541@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
46542 return;
46543 }
46544
46545- atomic_inc(&(fs_generation(tb->tb_sb)));
46546+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
46547 do_balance_starts(tb);
46548
46549 /* balance leaf returns 0 except if combining L R and S into
46550diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
46551index 7a99811..a7c96c4 100644
46552--- a/fs/reiserfs/procfs.c
46553+++ b/fs/reiserfs/procfs.c
46554@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
46555 "SMALL_TAILS " : "NO_TAILS ",
46556 replay_only(sb) ? "REPLAY_ONLY " : "",
46557 convert_reiserfs(sb) ? "CONV " : "",
46558- atomic_read(&r->s_generation_counter),
46559+ atomic_read_unchecked(&r->s_generation_counter),
46560 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
46561 SF(s_do_balance), SF(s_unneeded_left_neighbor),
46562 SF(s_good_search_by_key_reada), SF(s_bmaps),
46563diff --git a/fs/select.c b/fs/select.c
46564index d33418f..2a5345e 100644
46565--- a/fs/select.c
46566+++ b/fs/select.c
46567@@ -20,6 +20,7 @@
46568 #include <linux/module.h>
46569 #include <linux/slab.h>
46570 #include <linux/poll.h>
46571+#include <linux/security.h>
46572 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
46573 #include <linux/file.h>
46574 #include <linux/fdtable.h>
46575@@ -837,6 +838,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
46576 struct poll_list *walk = head;
46577 unsigned long todo = nfds;
46578
46579+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
46580 if (nfds > rlimit(RLIMIT_NOFILE))
46581 return -EINVAL;
46582
46583diff --git a/fs/seq_file.c b/fs/seq_file.c
46584index dba43c3..1dfaf14 100644
46585--- a/fs/seq_file.c
46586+++ b/fs/seq_file.c
46587@@ -40,6 +40,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
46588 memset(p, 0, sizeof(*p));
46589 mutex_init(&p->lock);
46590 p->op = op;
46591+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
46592+ p->exec_id = current->exec_id;
46593+#endif
46594
46595 /*
46596 * Wrappers around seq_open(e.g. swaps_open) need to be
46597@@ -76,7 +79,8 @@ static int traverse(struct seq_file *m, loff_t offset)
46598 return 0;
46599 }
46600 if (!m->buf) {
46601- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
46602+ m->size = PAGE_SIZE;
46603+ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
46604 if (!m->buf)
46605 return -ENOMEM;
46606 }
46607@@ -116,7 +120,8 @@ static int traverse(struct seq_file *m, loff_t offset)
46608 Eoverflow:
46609 m->op->stop(m, p);
46610 kfree(m->buf);
46611- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
46612+ m->size <<= 1;
46613+ m->buf = kmalloc(m->size, GFP_KERNEL);
46614 return !m->buf ? -ENOMEM : -EAGAIN;
46615 }
46616
46617@@ -169,7 +174,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
46618 m->version = file->f_version;
46619 /* grab buffer if we didn't have one */
46620 if (!m->buf) {
46621- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
46622+ m->size = PAGE_SIZE;
46623+ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
46624 if (!m->buf)
46625 goto Enomem;
46626 }
46627@@ -210,7 +216,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
46628 goto Fill;
46629 m->op->stop(m, p);
46630 kfree(m->buf);
46631- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
46632+ m->size <<= 1;
46633+ m->buf = kmalloc(m->size, GFP_KERNEL);
46634 if (!m->buf)
46635 goto Enomem;
46636 m->count = 0;
46637@@ -549,7 +556,7 @@ static void single_stop(struct seq_file *p, void *v)
46638 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
46639 void *data)
46640 {
46641- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
46642+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
46643 int res = -ENOMEM;
46644
46645 if (op) {
46646diff --git a/fs/splice.c b/fs/splice.c
46647index fa2defa..8601650 100644
46648--- a/fs/splice.c
46649+++ b/fs/splice.c
46650@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
46651 pipe_lock(pipe);
46652
46653 for (;;) {
46654- if (!pipe->readers) {
46655+ if (!atomic_read(&pipe->readers)) {
46656 send_sig(SIGPIPE, current, 0);
46657 if (!ret)
46658 ret = -EPIPE;
46659@@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
46660 do_wakeup = 0;
46661 }
46662
46663- pipe->waiting_writers++;
46664+ atomic_inc(&pipe->waiting_writers);
46665 pipe_wait(pipe);
46666- pipe->waiting_writers--;
46667+ atomic_dec(&pipe->waiting_writers);
46668 }
46669
46670 pipe_unlock(pipe);
46671@@ -560,7 +560,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
46672 old_fs = get_fs();
46673 set_fs(get_ds());
46674 /* The cast to a user pointer is valid due to the set_fs() */
46675- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
46676+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
46677 set_fs(old_fs);
46678
46679 return res;
46680@@ -575,7 +575,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
46681 old_fs = get_fs();
46682 set_fs(get_ds());
46683 /* The cast to a user pointer is valid due to the set_fs() */
46684- res = vfs_write(file, (const char __user *)buf, count, &pos);
46685+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
46686 set_fs(old_fs);
46687
46688 return res;
46689@@ -626,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
46690 goto err;
46691
46692 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
46693- vec[i].iov_base = (void __user *) page_address(page);
46694+ vec[i].iov_base = (void __force_user *) page_address(page);
46695 vec[i].iov_len = this_len;
46696 spd.pages[i] = page;
46697 spd.nr_pages++;
46698@@ -846,10 +846,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
46699 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
46700 {
46701 while (!pipe->nrbufs) {
46702- if (!pipe->writers)
46703+ if (!atomic_read(&pipe->writers))
46704 return 0;
46705
46706- if (!pipe->waiting_writers && sd->num_spliced)
46707+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
46708 return 0;
46709
46710 if (sd->flags & SPLICE_F_NONBLOCK)
46711@@ -1182,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
46712 * out of the pipe right after the splice_to_pipe(). So set
46713 * PIPE_READERS appropriately.
46714 */
46715- pipe->readers = 1;
46716+ atomic_set(&pipe->readers, 1);
46717
46718 current->splice_pipe = pipe;
46719 }
46720@@ -1734,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
46721 ret = -ERESTARTSYS;
46722 break;
46723 }
46724- if (!pipe->writers)
46725+ if (!atomic_read(&pipe->writers))
46726 break;
46727- if (!pipe->waiting_writers) {
46728+ if (!atomic_read(&pipe->waiting_writers)) {
46729 if (flags & SPLICE_F_NONBLOCK) {
46730 ret = -EAGAIN;
46731 break;
46732@@ -1768,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
46733 pipe_lock(pipe);
46734
46735 while (pipe->nrbufs >= pipe->buffers) {
46736- if (!pipe->readers) {
46737+ if (!atomic_read(&pipe->readers)) {
46738 send_sig(SIGPIPE, current, 0);
46739 ret = -EPIPE;
46740 break;
46741@@ -1781,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
46742 ret = -ERESTARTSYS;
46743 break;
46744 }
46745- pipe->waiting_writers++;
46746+ atomic_inc(&pipe->waiting_writers);
46747 pipe_wait(pipe);
46748- pipe->waiting_writers--;
46749+ atomic_dec(&pipe->waiting_writers);
46750 }
46751
46752 pipe_unlock(pipe);
46753@@ -1819,14 +1819,14 @@ retry:
46754 pipe_double_lock(ipipe, opipe);
46755
46756 do {
46757- if (!opipe->readers) {
46758+ if (!atomic_read(&opipe->readers)) {
46759 send_sig(SIGPIPE, current, 0);
46760 if (!ret)
46761 ret = -EPIPE;
46762 break;
46763 }
46764
46765- if (!ipipe->nrbufs && !ipipe->writers)
46766+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
46767 break;
46768
46769 /*
46770@@ -1923,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
46771 pipe_double_lock(ipipe, opipe);
46772
46773 do {
46774- if (!opipe->readers) {
46775+ if (!atomic_read(&opipe->readers)) {
46776 send_sig(SIGPIPE, current, 0);
46777 if (!ret)
46778 ret = -EPIPE;
46779@@ -1968,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
46780 * return EAGAIN if we have the potential of some data in the
46781 * future, otherwise just return 0
46782 */
46783- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
46784+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
46785 ret = -EAGAIN;
46786
46787 pipe_unlock(ipipe);
46788diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
46789index 7fdf6a7..e6cd8ad 100644
46790--- a/fs/sysfs/dir.c
46791+++ b/fs/sysfs/dir.c
46792@@ -642,6 +642,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
46793 struct sysfs_dirent *sd;
46794 int rc;
46795
46796+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
46797+ const char *parent_name = parent_sd->s_name;
46798+
46799+ mode = S_IFDIR | S_IRWXU;
46800+
46801+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
46802+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
46803+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
46804+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
46805+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
46806+#endif
46807+
46808 /* allocate */
46809 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
46810 if (!sd)
46811diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
46812index 779789a..f58193c 100644
46813--- a/fs/sysfs/file.c
46814+++ b/fs/sysfs/file.c
46815@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
46816
46817 struct sysfs_open_dirent {
46818 atomic_t refcnt;
46819- atomic_t event;
46820+ atomic_unchecked_t event;
46821 wait_queue_head_t poll;
46822 struct list_head buffers; /* goes through sysfs_buffer.list */
46823 };
46824@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
46825 if (!sysfs_get_active(attr_sd))
46826 return -ENODEV;
46827
46828- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
46829+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
46830 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
46831
46832 sysfs_put_active(attr_sd);
46833@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
46834 return -ENOMEM;
46835
46836 atomic_set(&new_od->refcnt, 0);
46837- atomic_set(&new_od->event, 1);
46838+ atomic_set_unchecked(&new_od->event, 1);
46839 init_waitqueue_head(&new_od->poll);
46840 INIT_LIST_HEAD(&new_od->buffers);
46841 goto retry;
46842@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
46843
46844 sysfs_put_active(attr_sd);
46845
46846- if (buffer->event != atomic_read(&od->event))
46847+ if (buffer->event != atomic_read_unchecked(&od->event))
46848 goto trigger;
46849
46850 return DEFAULT_POLLMASK;
46851@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
46852
46853 od = sd->s_attr.open;
46854 if (od) {
46855- atomic_inc(&od->event);
46856+ atomic_inc_unchecked(&od->event);
46857 wake_up_interruptible(&od->poll);
46858 }
46859
46860diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
46861index a7ac78f..02158e1 100644
46862--- a/fs/sysfs/symlink.c
46863+++ b/fs/sysfs/symlink.c
46864@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
46865
46866 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
46867 {
46868- char *page = nd_get_link(nd);
46869+ const char *page = nd_get_link(nd);
46870 if (!IS_ERR(page))
46871 free_page((unsigned long)page);
46872 }
46873diff --git a/fs/udf/misc.c b/fs/udf/misc.c
46874index c175b4d..8f36a16 100644
46875--- a/fs/udf/misc.c
46876+++ b/fs/udf/misc.c
46877@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
46878
46879 u8 udf_tag_checksum(const struct tag *t)
46880 {
46881- u8 *data = (u8 *)t;
46882+ const u8 *data = (const u8 *)t;
46883 u8 checksum = 0;
46884 int i;
46885 for (i = 0; i < sizeof(struct tag); ++i)
46886diff --git a/fs/utimes.c b/fs/utimes.c
46887index ba653f3..06ea4b1 100644
46888--- a/fs/utimes.c
46889+++ b/fs/utimes.c
46890@@ -1,6 +1,7 @@
46891 #include <linux/compiler.h>
46892 #include <linux/file.h>
46893 #include <linux/fs.h>
46894+#include <linux/security.h>
46895 #include <linux/linkage.h>
46896 #include <linux/mount.h>
46897 #include <linux/namei.h>
46898@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
46899 goto mnt_drop_write_and_out;
46900 }
46901 }
46902+
46903+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
46904+ error = -EACCES;
46905+ goto mnt_drop_write_and_out;
46906+ }
46907+
46908 mutex_lock(&inode->i_mutex);
46909 error = notify_change(path->dentry, &newattrs);
46910 mutex_unlock(&inode->i_mutex);
46911diff --git a/fs/xattr.c b/fs/xattr.c
46912index 67583de..c5aad14 100644
46913--- a/fs/xattr.c
46914+++ b/fs/xattr.c
46915@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
46916 * Extended attribute SET operations
46917 */
46918 static long
46919-setxattr(struct dentry *d, const char __user *name, const void __user *value,
46920+setxattr(struct path *path, const char __user *name, const void __user *value,
46921 size_t size, int flags)
46922 {
46923 int error;
46924@@ -339,7 +339,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
46925 return PTR_ERR(kvalue);
46926 }
46927
46928- error = vfs_setxattr(d, kname, kvalue, size, flags);
46929+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
46930+ error = -EACCES;
46931+ goto out;
46932+ }
46933+
46934+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
46935+out:
46936 kfree(kvalue);
46937 return error;
46938 }
46939@@ -356,7 +362,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
46940 return error;
46941 error = mnt_want_write(path.mnt);
46942 if (!error) {
46943- error = setxattr(path.dentry, name, value, size, flags);
46944+ error = setxattr(&path, name, value, size, flags);
46945 mnt_drop_write(path.mnt);
46946 }
46947 path_put(&path);
46948@@ -375,7 +381,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
46949 return error;
46950 error = mnt_want_write(path.mnt);
46951 if (!error) {
46952- error = setxattr(path.dentry, name, value, size, flags);
46953+ error = setxattr(&path, name, value, size, flags);
46954 mnt_drop_write(path.mnt);
46955 }
46956 path_put(&path);
46957@@ -386,17 +392,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
46958 const void __user *,value, size_t, size, int, flags)
46959 {
46960 struct file *f;
46961- struct dentry *dentry;
46962 int error = -EBADF;
46963
46964 f = fget(fd);
46965 if (!f)
46966 return error;
46967- dentry = f->f_path.dentry;
46968- audit_inode(NULL, dentry);
46969+ audit_inode(NULL, f->f_path.dentry);
46970 error = mnt_want_write_file(f);
46971 if (!error) {
46972- error = setxattr(dentry, name, value, size, flags);
46973+ error = setxattr(&f->f_path, name, value, size, flags);
46974 mnt_drop_write(f->f_path.mnt);
46975 }
46976 fput(f);
46977diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
46978index 8d5a506..7f62712 100644
46979--- a/fs/xattr_acl.c
46980+++ b/fs/xattr_acl.c
46981@@ -17,8 +17,8 @@
46982 struct posix_acl *
46983 posix_acl_from_xattr(const void *value, size_t size)
46984 {
46985- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
46986- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
46987+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
46988+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
46989 int count;
46990 struct posix_acl *acl;
46991 struct posix_acl_entry *acl_e;
46992diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
46993index d0ab788..827999b 100644
46994--- a/fs/xfs/xfs_bmap.c
46995+++ b/fs/xfs/xfs_bmap.c
46996@@ -190,7 +190,7 @@ xfs_bmap_validate_ret(
46997 int nmap,
46998 int ret_nmap);
46999 #else
47000-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
47001+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
47002 #endif /* DEBUG */
47003
47004 STATIC int
47005diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
47006index 79d05e8..e3e5861 100644
47007--- a/fs/xfs/xfs_dir2_sf.c
47008+++ b/fs/xfs/xfs_dir2_sf.c
47009@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
47010 }
47011
47012 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
47013- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
47014+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
47015+ char name[sfep->namelen];
47016+ memcpy(name, sfep->name, sfep->namelen);
47017+ if (filldir(dirent, name, sfep->namelen,
47018+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
47019+ *offset = off & 0x7fffffff;
47020+ return 0;
47021+ }
47022+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
47023 off & 0x7fffffff, ino, DT_UNKNOWN)) {
47024 *offset = off & 0x7fffffff;
47025 return 0;
47026diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
47027index d99a905..9f88202 100644
47028--- a/fs/xfs/xfs_ioctl.c
47029+++ b/fs/xfs/xfs_ioctl.c
47030@@ -128,7 +128,7 @@ xfs_find_handle(
47031 }
47032
47033 error = -EFAULT;
47034- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
47035+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
47036 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
47037 goto out_put;
47038
47039diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
47040index 23ce927..e274cc1 100644
47041--- a/fs/xfs/xfs_iops.c
47042+++ b/fs/xfs/xfs_iops.c
47043@@ -447,7 +447,7 @@ xfs_vn_put_link(
47044 struct nameidata *nd,
47045 void *p)
47046 {
47047- char *s = nd_get_link(nd);
47048+ const char *s = nd_get_link(nd);
47049
47050 if (!IS_ERR(s))
47051 kfree(s);
47052diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
47053new file mode 100644
47054index 0000000..41df561
47055--- /dev/null
47056+++ b/grsecurity/Kconfig
47057@@ -0,0 +1,1075 @@
47058+#
47059+# grecurity configuration
47060+#
47061+
47062+menu "Grsecurity"
47063+
47064+config GRKERNSEC
47065+ bool "Grsecurity"
47066+ select CRYPTO
47067+ select CRYPTO_SHA256
47068+ help
47069+ If you say Y here, you will be able to configure many features
47070+ that will enhance the security of your system. It is highly
47071+ recommended that you say Y here and read through the help
47072+ for each option so that you fully understand the features and
47073+ can evaluate their usefulness for your machine.
47074+
47075+choice
47076+ prompt "Security Level"
47077+ depends on GRKERNSEC
47078+ default GRKERNSEC_CUSTOM
47079+
47080+config GRKERNSEC_LOW
47081+ bool "Low"
47082+ select GRKERNSEC_LINK
47083+ select GRKERNSEC_FIFO
47084+ select GRKERNSEC_RANDNET
47085+ select GRKERNSEC_DMESG
47086+ select GRKERNSEC_CHROOT
47087+ select GRKERNSEC_CHROOT_CHDIR
47088+
47089+ help
47090+ If you choose this option, several of the grsecurity options will
47091+ be enabled that will give you greater protection against a number
47092+ of attacks, while assuring that none of your software will have any
47093+ conflicts with the additional security measures. If you run a lot
47094+ of unusual software, or you are having problems with the higher
47095+ security levels, you should say Y here. With this option, the
47096+ following features are enabled:
47097+
47098+ - Linking restrictions
47099+ - FIFO restrictions
47100+ - Restricted dmesg
47101+ - Enforced chdir("/") on chroot
47102+ - Runtime module disabling
47103+
47104+config GRKERNSEC_MEDIUM
47105+ bool "Medium"
47106+ select PAX
47107+ select PAX_EI_PAX
47108+ select PAX_PT_PAX_FLAGS
47109+ select PAX_HAVE_ACL_FLAGS
47110+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
47111+ select GRKERNSEC_CHROOT
47112+ select GRKERNSEC_CHROOT_SYSCTL
47113+ select GRKERNSEC_LINK
47114+ select GRKERNSEC_FIFO
47115+ select GRKERNSEC_DMESG
47116+ select GRKERNSEC_RANDNET
47117+ select GRKERNSEC_FORKFAIL
47118+ select GRKERNSEC_TIME
47119+ select GRKERNSEC_SIGNAL
47120+ select GRKERNSEC_CHROOT
47121+ select GRKERNSEC_CHROOT_UNIX
47122+ select GRKERNSEC_CHROOT_MOUNT
47123+ select GRKERNSEC_CHROOT_PIVOT
47124+ select GRKERNSEC_CHROOT_DOUBLE
47125+ select GRKERNSEC_CHROOT_CHDIR
47126+ select GRKERNSEC_CHROOT_MKNOD
47127+ select GRKERNSEC_PROC
47128+ select GRKERNSEC_PROC_USERGROUP
47129+ select PAX_RANDUSTACK
47130+ select PAX_ASLR
47131+ select PAX_RANDMMAP
47132+ select PAX_REFCOUNT if (X86 || SPARC64)
47133+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
47134+
47135+ help
47136+ If you say Y here, several features in addition to those included
47137+ in the low additional security level will be enabled. These
47138+ features provide even more security to your system, though in rare
47139+ cases they may be incompatible with very old or poorly written
47140+ software. If you enable this option, make sure that your auth
47141+ service (identd) is running as gid 1001. With this option,
47142+ the following features (in addition to those provided in the
47143+ low additional security level) will be enabled:
47144+
47145+ - Failed fork logging
47146+ - Time change logging
47147+ - Signal logging
47148+ - Deny mounts in chroot
47149+ - Deny double chrooting
47150+ - Deny sysctl writes in chroot
47151+ - Deny mknod in chroot
47152+ - Deny access to abstract AF_UNIX sockets out of chroot
47153+ - Deny pivot_root in chroot
47154+ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
47155+ - /proc restrictions with special GID set to 10 (usually wheel)
47156+ - Address Space Layout Randomization (ASLR)
47157+ - Prevent exploitation of most refcount overflows
47158+ - Bounds checking of copying between the kernel and userland
47159+
47160+config GRKERNSEC_HIGH
47161+ bool "High"
47162+ select GRKERNSEC_LINK
47163+ select GRKERNSEC_FIFO
47164+ select GRKERNSEC_DMESG
47165+ select GRKERNSEC_FORKFAIL
47166+ select GRKERNSEC_TIME
47167+ select GRKERNSEC_SIGNAL
47168+ select GRKERNSEC_CHROOT
47169+ select GRKERNSEC_CHROOT_SHMAT
47170+ select GRKERNSEC_CHROOT_UNIX
47171+ select GRKERNSEC_CHROOT_MOUNT
47172+ select GRKERNSEC_CHROOT_FCHDIR
47173+ select GRKERNSEC_CHROOT_PIVOT
47174+ select GRKERNSEC_CHROOT_DOUBLE
47175+ select GRKERNSEC_CHROOT_CHDIR
47176+ select GRKERNSEC_CHROOT_MKNOD
47177+ select GRKERNSEC_CHROOT_CAPS
47178+ select GRKERNSEC_CHROOT_SYSCTL
47179+ select GRKERNSEC_CHROOT_FINDTASK
47180+ select GRKERNSEC_SYSFS_RESTRICT
47181+ select GRKERNSEC_PROC
47182+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
47183+ select GRKERNSEC_HIDESYM
47184+ select GRKERNSEC_BRUTE
47185+ select GRKERNSEC_PROC_USERGROUP
47186+ select GRKERNSEC_KMEM
47187+ select GRKERNSEC_RESLOG
47188+ select GRKERNSEC_RANDNET
47189+ select GRKERNSEC_PROC_ADD
47190+ select GRKERNSEC_CHROOT_CHMOD
47191+ select GRKERNSEC_CHROOT_NICE
47192+ select GRKERNSEC_SETXID
47193+ select GRKERNSEC_AUDIT_MOUNT
47194+ select GRKERNSEC_MODHARDEN if (MODULES)
47195+ select GRKERNSEC_HARDEN_PTRACE
47196+ select GRKERNSEC_PTRACE_READEXEC
47197+ select GRKERNSEC_VM86 if (X86_32)
47198+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
47199+ select PAX
47200+ select PAX_RANDUSTACK
47201+ select PAX_ASLR
47202+ select PAX_RANDMMAP
47203+ select PAX_NOEXEC
47204+ select PAX_MPROTECT
47205+ select PAX_EI_PAX
47206+ select PAX_PT_PAX_FLAGS
47207+ select PAX_HAVE_ACL_FLAGS
47208+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
47209+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
47210+ select PAX_RANDKSTACK if (X86_TSC && X86)
47211+ select PAX_SEGMEXEC if (X86_32)
47212+ select PAX_PAGEEXEC
47213+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
47214+ select PAX_EMUTRAMP if (PARISC)
47215+ select PAX_EMUSIGRT if (PARISC)
47216+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
47217+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
47218+ select PAX_REFCOUNT if (X86 || SPARC64)
47219+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
47220+ help
47221+ If you say Y here, many of the features of grsecurity will be
47222+ enabled, which will protect you against many kinds of attacks
47223+ against your system. The heightened security comes at a cost
47224+ of an increased chance of incompatibilities with rare software
47225+ on your machine. Since this security level enables PaX, you should
47226+ view <http://pax.grsecurity.net> and read about the PaX
47227+ project. While you are there, download chpax and run it on
47228+ binaries that cause problems with PaX. Also remember that
47229+ since the /proc restrictions are enabled, you must run your
47230+ identd as gid 1001. This security level enables the following
47231+ features in addition to those listed in the low and medium
47232+ security levels:
47233+
47234+ - Additional /proc restrictions
47235+ - Chmod restrictions in chroot
47236+ - No signals, ptrace, or viewing of processes outside of chroot
47237+ - Capability restrictions in chroot
47238+ - Deny fchdir out of chroot
47239+ - Priority restrictions in chroot
47240+ - Segmentation-based implementation of PaX
47241+ - Mprotect restrictions
47242+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
47243+ - Kernel stack randomization
47244+ - Mount/unmount/remount logging
47245+ - Kernel symbol hiding
47246+ - Hardening of module auto-loading
47247+ - Ptrace restrictions
47248+ - Restricted vm86 mode
47249+ - Restricted sysfs/debugfs
47250+ - Active kernel exploit response
47251+
47252+config GRKERNSEC_CUSTOM
47253+ bool "Custom"
47254+ help
47255+ If you say Y here, you will be able to configure every grsecurity
47256+ option, which allows you to enable many more features that aren't
47257+ covered in the basic security levels. These additional features
47258+ include TPE, socket restrictions, and the sysctl system for
47259+ grsecurity. It is advised that you read through the help for
47260+ each option to determine its usefulness in your situation.
47261+
47262+endchoice
47263+
47264+menu "Memory Protections"
47265+depends on GRKERNSEC
47266+
47267+config GRKERNSEC_KMEM
47268+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
47269+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
47270+ help
47271+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
47272+ be written to or read from to modify or leak the contents of the running
47273+ kernel. /dev/port will also not be allowed to be opened. If you have module
47274+ support disabled, enabling this will close up four ways that are
47275+ currently used to insert malicious code into the running kernel.
47276+ Even with all these features enabled, we still highly recommend that
47277+ you use the RBAC system, as it is still possible for an attacker to
47278+ modify the running kernel through privileged I/O granted by ioperm/iopl.
47279+ If you are not using XFree86, you may be able to stop this additional
47280+ case by enabling the 'Disable privileged I/O' option. Though nothing
47281+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
47282+ but only to video memory, which is the only writing we allow in this
47283+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
47284+ not be allowed to mprotect it with PROT_WRITE later.
47285+ It is highly recommended that you say Y here if you meet all the
47286+ conditions above.
47287+
47288+config GRKERNSEC_VM86
47289+ bool "Restrict VM86 mode"
47290+ depends on X86_32
47291+
47292+ help
47293+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
47294+ make use of a special execution mode on 32bit x86 processors called
47295+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
47296+ video cards and will still work with this option enabled. The purpose
47297+ of the option is to prevent exploitation of emulation errors in
47298+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
47299+ Nearly all users should be able to enable this option.
47300+
47301+config GRKERNSEC_IO
47302+ bool "Disable privileged I/O"
47303+ depends on X86
47304+ select RTC_CLASS
47305+ select RTC_INTF_DEV
47306+ select RTC_DRV_CMOS
47307+
47308+ help
47309+ If you say Y here, all ioperm and iopl calls will return an error.
47310+ Ioperm and iopl can be used to modify the running kernel.
47311+ Unfortunately, some programs need this access to operate properly,
47312+ the most notable of which are XFree86 and hwclock. hwclock can be
47313+ remedied by having RTC support in the kernel, so real-time
47314+ clock support is enabled if this option is enabled, to ensure
47315+ that hwclock operates correctly. XFree86 still will not
47316+ operate correctly with this option enabled, so DO NOT CHOOSE Y
47317+ IF YOU USE XFree86. If you use XFree86 and you still want to
47318+ protect your kernel against modification, use the RBAC system.
47319+
47320+config GRKERNSEC_PROC_MEMMAP
47321+ bool "Harden ASLR against information leaks and entropy reduction"
47322+ default y if (PAX_NOEXEC || PAX_ASLR)
47323+ depends on PAX_NOEXEC || PAX_ASLR
47324+ help
47325+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
47326+ give no information about the addresses of its mappings if
47327+ PaX features that rely on random addresses are enabled on the task.
47328+ In addition to sanitizing this information and disabling other
47329+ dangerous sources of information, this option causes reads of sensitive
47330+ /proc/<pid> entries where the file descriptor was opened in a different
47331+ task than the one performing the read. Such attempts are logged.
47332+ Finally, this option limits argv/env strings for suid/sgid binaries
47333+ to 1MB to prevent a complete exhaustion of the stack entropy provided
47334+ by ASLR.
47335+ If you use PaX it is essential that you say Y here as it closes up
47336+ several holes that make full ASLR useless for suid/sgid binaries.
47337+
47338+config GRKERNSEC_BRUTE
47339+ bool "Deter exploit bruteforcing"
47340+ help
47341+ If you say Y here, attempts to bruteforce exploits against forking
47342+ daemons such as apache or sshd, as well as against suid/sgid binaries
47343+ will be deterred. When a child of a forking daemon is killed by PaX
47344+ or crashes due to an illegal instruction or other suspicious signal,
47345+ the parent process will be delayed 30 seconds upon every subsequent
47346+ fork until the administrator is able to assess the situation and
47347+ restart the daemon.
47348+ In the suid/sgid case, the attempt is logged, the user has all their
47349+ processes terminated, and they are prevented from executing any further
47350+ processes for 15 minutes.
47351+ It is recommended that you also enable signal logging in the auditing
47352+ section so that logs are generated when a process triggers a suspicious
47353+ signal.
47354+ If the sysctl option is enabled, a sysctl option with name
47355+ "deter_bruteforce" is created.
47356+
47357+
47358+config GRKERNSEC_MODHARDEN
47359+ bool "Harden module auto-loading"
47360+ depends on MODULES
47361+ help
47362+ If you say Y here, module auto-loading in response to use of some
47363+ feature implemented by an unloaded module will be restricted to
47364+ root users. Enabling this option helps defend against attacks
47365+ by unprivileged users who abuse the auto-loading behavior to
47366+ cause a vulnerable module to load that is then exploited.
47367+
47368+ If this option prevents a legitimate use of auto-loading for a
47369+ non-root user, the administrator can execute modprobe manually
47370+ with the exact name of the module mentioned in the alert log.
47371+ Alternatively, the administrator can add the module to the list
47372+ of modules loaded at boot by modifying init scripts.
47373+
47374+ Modification of init scripts will most likely be needed on
47375+ Ubuntu servers with encrypted home directory support enabled,
47376+ as the first non-root user logging in will cause the ecb(aes),
47377+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
47378+
47379+config GRKERNSEC_HIDESYM
47380+ bool "Hide kernel symbols"
47381+ help
47382+ If you say Y here, getting information on loaded modules, and
47383+ displaying all kernel symbols through a syscall will be restricted
47384+ to users with CAP_SYS_MODULE. For software compatibility reasons,
47385+ /proc/kallsyms will be restricted to the root user. The RBAC
47386+ system can hide that entry even from root.
47387+
47388+ This option also prevents leaking of kernel addresses through
47389+ several /proc entries.
47390+
47391+ Note that this option is only effective provided the following
47392+ conditions are met:
47393+ 1) The kernel using grsecurity is not precompiled by some distribution
47394+ 2) You have also enabled GRKERNSEC_DMESG
47395+ 3) You are using the RBAC system and hiding other files such as your
47396+ kernel image and System.map. Alternatively, enabling this option
47397+ causes the permissions on /boot, /lib/modules, and the kernel
47398+ source directory to change at compile time to prevent
47399+ reading by non-root users.
47400+ If the above conditions are met, this option will aid in providing a
47401+ useful protection against local kernel exploitation of overflows
47402+ and arbitrary read/write vulnerabilities.
47403+
47404+config GRKERNSEC_KERN_LOCKOUT
47405+ bool "Active kernel exploit response"
47406+ depends on X86 || ARM || PPC || SPARC
47407+ help
47408+ If you say Y here, when a PaX alert is triggered due to suspicious
47409+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
47410+ or an OOPs occurs due to bad memory accesses, instead of just
47411+ terminating the offending process (and potentially allowing
47412+ a subsequent exploit from the same user), we will take one of two
47413+ actions:
47414+ If the user was root, we will panic the system
47415+ If the user was non-root, we will log the attempt, terminate
47416+ all processes owned by the user, then prevent them from creating
47417+ any new processes until the system is restarted
47418+ This deters repeated kernel exploitation/bruteforcing attempts
47419+ and is useful for later forensics.
47420+
47421+endmenu
47422+menu "Role Based Access Control Options"
47423+depends on GRKERNSEC
47424+
47425+config GRKERNSEC_RBAC_DEBUG
47426+ bool
47427+
47428+config GRKERNSEC_NO_RBAC
47429+ bool "Disable RBAC system"
47430+ help
47431+ If you say Y here, the /dev/grsec device will be removed from the kernel,
47432+ preventing the RBAC system from being enabled. You should only say Y
47433+ here if you have no intention of using the RBAC system, so as to prevent
47434+ an attacker with root access from misusing the RBAC system to hide files
47435+ and processes when loadable module support and /dev/[k]mem have been
47436+ locked down.
47437+
47438+config GRKERNSEC_ACL_HIDEKERN
47439+ bool "Hide kernel processes"
47440+ help
47441+ If you say Y here, all kernel threads will be hidden to all
47442+ processes but those whose subject has the "view hidden processes"
47443+ flag.
47444+
47445+config GRKERNSEC_ACL_MAXTRIES
47446+ int "Maximum tries before password lockout"
47447+ default 3
47448+ help
47449+ This option enforces the maximum number of times a user can attempt
47450+ to authorize themselves with the grsecurity RBAC system before being
47451+ denied the ability to attempt authorization again for a specified time.
47452+ The lower the number, the harder it will be to brute-force a password.
47453+
47454+config GRKERNSEC_ACL_TIMEOUT
47455+ int "Time to wait after max password tries, in seconds"
47456+ default 30
47457+ help
47458+ This option specifies the time the user must wait after attempting to
47459+ authorize to the RBAC system with the maximum number of invalid
47460+ passwords. The higher the number, the harder it will be to brute-force
47461+ a password.
47462+
47463+endmenu
47464+menu "Filesystem Protections"
47465+depends on GRKERNSEC
47466+
47467+config GRKERNSEC_PROC
47468+ bool "Proc restrictions"
47469+ help
47470+ If you say Y here, the permissions of the /proc filesystem
47471+ will be altered to enhance system security and privacy. You MUST
47472+ choose either a user only restriction or a user and group restriction.
47473+ Depending upon the option you choose, you can either restrict users to
47474+ see only the processes they themselves run, or choose a group that can
47475+ view all processes and files normally restricted to root if you choose
47476+ the "restrict to user only" option. NOTE: If you're running identd as
47477+ a non-root user, you will have to run it as the group you specify here.
47478+
47479+config GRKERNSEC_PROC_USER
47480+ bool "Restrict /proc to user only"
47481+ depends on GRKERNSEC_PROC
47482+ help
47483+ If you say Y here, non-root users will only be able to view their own
47484+ processes, and restricts them from viewing network-related information,
47485+ and viewing kernel symbol and module information.
47486+
47487+config GRKERNSEC_PROC_USERGROUP
47488+ bool "Allow special group"
47489+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
47490+ help
47491+ If you say Y here, you will be able to select a group that will be
47492+ able to view all processes and network-related information. If you've
47493+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
47494+ remain hidden. This option is useful if you want to run identd as
47495+ a non-root user.
47496+
47497+config GRKERNSEC_PROC_GID
47498+ int "GID for special group"
47499+ depends on GRKERNSEC_PROC_USERGROUP
47500+ default 1001
47501+
47502+config GRKERNSEC_PROC_ADD
47503+ bool "Additional restrictions"
47504+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
47505+ help
47506+ If you say Y here, additional restrictions will be placed on
47507+ /proc that keep normal users from viewing device information and
47508+ slabinfo information that could be useful for exploits.
47509+
47510+config GRKERNSEC_LINK
47511+ bool "Linking restrictions"
47512+ help
47513+ If you say Y here, /tmp race exploits will be prevented, since users
47514+ will no longer be able to follow symlinks owned by other users in
47515+ world-writable +t directories (e.g. /tmp), unless the owner of the
47516+ symlink is the owner of the directory. users will also not be
47517+ able to hardlink to files they do not own. If the sysctl option is
47518+ enabled, a sysctl option with name "linking_restrictions" is created.
47519+
47520+config GRKERNSEC_FIFO
47521+ bool "FIFO restrictions"
47522+ help
47523+ If you say Y here, users will not be able to write to FIFOs they don't
47524+ own in world-writable +t directories (e.g. /tmp), unless the owner of
47525+ the FIFO is the same owner of the directory it's held in. If the sysctl
47526+ option is enabled, a sysctl option with name "fifo_restrictions" is
47527+ created.
47528+
47529+config GRKERNSEC_SYSFS_RESTRICT
47530+ bool "Sysfs/debugfs restriction"
47531+ depends on SYSFS
47532+ help
47533+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
47534+ any filesystem normally mounted under it (e.g. debugfs) will be
47535+ mostly accessible only by root. These filesystems generally provide access
47536+ to hardware and debug information that isn't appropriate for unprivileged
47537+ users of the system. Sysfs and debugfs have also become a large source
47538+ of new vulnerabilities, ranging from infoleaks to local compromise.
47539+ There has been very little oversight with an eye toward security involved
47540+ in adding new exporters of information to these filesystems, so their
47541+ use is discouraged.
47542+ For reasons of compatibility, a few directories have been whitelisted
47543+ for access by non-root users:
47544+ /sys/fs/selinux
47545+ /sys/fs/fuse
47546+ /sys/devices/system/cpu
47547+
47548+config GRKERNSEC_ROFS
47549+ bool "Runtime read-only mount protection"
47550+ help
47551+ If you say Y here, a sysctl option with name "romount_protect" will
47552+ be created. By setting this option to 1 at runtime, filesystems
47553+ will be protected in the following ways:
47554+ * No new writable mounts will be allowed
47555+ * Existing read-only mounts won't be able to be remounted read/write
47556+ * Write operations will be denied on all block devices
47557+ This option acts independently of grsec_lock: once it is set to 1,
47558+ it cannot be turned off. Therefore, please be mindful of the resulting
47559+ behavior if this option is enabled in an init script on a read-only
47560+ filesystem. This feature is mainly intended for secure embedded systems.
47561+
47562+config GRKERNSEC_CHROOT
47563+ bool "Chroot jail restrictions"
47564+ help
47565+ If you say Y here, you will be able to choose several options that will
47566+ make breaking out of a chrooted jail much more difficult. If you
47567+ encounter no software incompatibilities with the following options, it
47568+ is recommended that you enable each one.
47569+
47570+config GRKERNSEC_CHROOT_MOUNT
47571+ bool "Deny mounts"
47572+ depends on GRKERNSEC_CHROOT
47573+ help
47574+ If you say Y here, processes inside a chroot will not be able to
47575+ mount or remount filesystems. If the sysctl option is enabled, a
47576+ sysctl option with name "chroot_deny_mount" is created.
47577+
47578+config GRKERNSEC_CHROOT_DOUBLE
47579+ bool "Deny double-chroots"
47580+ depends on GRKERNSEC_CHROOT
47581+ help
47582+ If you say Y here, processes inside a chroot will not be able to chroot
47583+ again outside the chroot. This is a widely used method of breaking
47584+ out of a chroot jail and should not be allowed. If the sysctl
47585+ option is enabled, a sysctl option with name
47586+ "chroot_deny_chroot" is created.
47587+
47588+config GRKERNSEC_CHROOT_PIVOT
47589+ bool "Deny pivot_root in chroot"
47590+ depends on GRKERNSEC_CHROOT
47591+ help
47592+ If you say Y here, processes inside a chroot will not be able to use
47593+ a function called pivot_root() that was introduced in Linux 2.3.41. It
47594+ works similar to chroot in that it changes the root filesystem. This
47595+ function could be misused in a chrooted process to attempt to break out
47596+ of the chroot, and therefore should not be allowed. If the sysctl
47597+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
47598+ created.
47599+
47600+config GRKERNSEC_CHROOT_CHDIR
47601+ bool "Enforce chdir(\"/\") on all chroots"
47602+ depends on GRKERNSEC_CHROOT
47603+ help
47604+ If you say Y here, the current working directory of all newly-chrooted
47605+ applications will be set to the the root directory of the chroot.
47606+ The man page on chroot(2) states:
47607+ Note that this call does not change the current working
47608+ directory, so that `.' can be outside the tree rooted at
47609+ `/'. In particular, the super-user can escape from a
47610+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
47611+
47612+ It is recommended that you say Y here, since it's not known to break
47613+ any software. If the sysctl option is enabled, a sysctl option with
47614+ name "chroot_enforce_chdir" is created.
47615+
47616+config GRKERNSEC_CHROOT_CHMOD
47617+ bool "Deny (f)chmod +s"
47618+ depends on GRKERNSEC_CHROOT
47619+ help
47620+ If you say Y here, processes inside a chroot will not be able to chmod
47621+ or fchmod files to make them have suid or sgid bits. This protects
47622+ against another published method of breaking a chroot. If the sysctl
47623+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
47624+ created.
47625+
47626+config GRKERNSEC_CHROOT_FCHDIR
47627+ bool "Deny fchdir out of chroot"
47628+ depends on GRKERNSEC_CHROOT
47629+ help
47630+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
47631+ to a file descriptor of the chrooting process that points to a directory
47632+ outside the filesystem will be stopped. If the sysctl option
47633+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
47634+
47635+config GRKERNSEC_CHROOT_MKNOD
47636+ bool "Deny mknod"
47637+ depends on GRKERNSEC_CHROOT
47638+ help
47639+ If you say Y here, processes inside a chroot will not be allowed to
47640+ mknod. The problem with using mknod inside a chroot is that it
47641+ would allow an attacker to create a device entry that is the same
47642+ as one on the physical root of your system, which could range from
47643+ anything from the console device to a device for your harddrive (which
47644+ they could then use to wipe the drive or steal data). It is recommended
47645+ that you say Y here, unless you run into software incompatibilities.
47646+ If the sysctl option is enabled, a sysctl option with name
47647+ "chroot_deny_mknod" is created.
47648+
47649+config GRKERNSEC_CHROOT_SHMAT
47650+ bool "Deny shmat() out of chroot"
47651+ depends on GRKERNSEC_CHROOT
47652+ help
47653+ If you say Y here, processes inside a chroot will not be able to attach
47654+ to shared memory segments that were created outside of the chroot jail.
47655+ It is recommended that you say Y here. If the sysctl option is enabled,
47656+ a sysctl option with name "chroot_deny_shmat" is created.
47657+
47658+config GRKERNSEC_CHROOT_UNIX
47659+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
47660+ depends on GRKERNSEC_CHROOT
47661+ help
47662+ If you say Y here, processes inside a chroot will not be able to
47663+ connect to abstract (meaning not belonging to a filesystem) Unix
47664+ domain sockets that were bound outside of a chroot. It is recommended
47665+ that you say Y here. If the sysctl option is enabled, a sysctl option
47666+ with name "chroot_deny_unix" is created.
47667+
47668+config GRKERNSEC_CHROOT_FINDTASK
47669+ bool "Protect outside processes"
47670+ depends on GRKERNSEC_CHROOT
47671+ help
47672+ If you say Y here, processes inside a chroot will not be able to
47673+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
47674+ getsid, or view any process outside of the chroot. If the sysctl
47675+ option is enabled, a sysctl option with name "chroot_findtask" is
47676+ created.
47677+
47678+config GRKERNSEC_CHROOT_NICE
47679+ bool "Restrict priority changes"
47680+ depends on GRKERNSEC_CHROOT
47681+ help
47682+ If you say Y here, processes inside a chroot will not be able to raise
47683+ the priority of processes in the chroot, or alter the priority of
47684+ processes outside the chroot. This provides more security than simply
47685+ removing CAP_SYS_NICE from the process' capability set. If the
47686+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
47687+ is created.
47688+
47689+config GRKERNSEC_CHROOT_SYSCTL
47690+ bool "Deny sysctl writes"
47691+ depends on GRKERNSEC_CHROOT
47692+ help
47693+ If you say Y here, an attacker in a chroot will not be able to
47694+ write to sysctl entries, either by sysctl(2) or through a /proc
47695+ interface. It is strongly recommended that you say Y here. If the
47696+ sysctl option is enabled, a sysctl option with name
47697+ "chroot_deny_sysctl" is created.
47698+
47699+config GRKERNSEC_CHROOT_CAPS
47700+ bool "Capability restrictions"
47701+ depends on GRKERNSEC_CHROOT
47702+ help
47703+ If you say Y here, the capabilities on all processes within a
47704+ chroot jail will be lowered to stop module insertion, raw i/o,
47705+ system and net admin tasks, rebooting the system, modifying immutable
47706+ files, modifying IPC owned by another, and changing the system time.
47707+ This is left an option because it can break some apps. Disable this
47708+ if your chrooted apps are having problems performing those kinds of
47709+ tasks. If the sysctl option is enabled, a sysctl option with
47710+ name "chroot_caps" is created.
47711+
47712+endmenu
47713+menu "Kernel Auditing"
47714+depends on GRKERNSEC
47715+
47716+config GRKERNSEC_AUDIT_GROUP
47717+ bool "Single group for auditing"
47718+ help
47719+ If you say Y here, the exec, chdir, and (un)mount logging features
47720+ will only operate on a group you specify. This option is recommended
47721+ if you only want to watch certain users instead of having a large
47722+ amount of logs from the entire system. If the sysctl option is enabled,
47723+ a sysctl option with name "audit_group" is created.
47724+
47725+config GRKERNSEC_AUDIT_GID
47726+ int "GID for auditing"
47727+ depends on GRKERNSEC_AUDIT_GROUP
47728+ default 1007
47729+
47730+config GRKERNSEC_EXECLOG
47731+ bool "Exec logging"
47732+ help
47733+ If you say Y here, all execve() calls will be logged (since the
47734+ other exec*() calls are frontends to execve(), all execution
47735+ will be logged). Useful for shell-servers that like to keep track
47736+ of their users. If the sysctl option is enabled, a sysctl option with
47737+ name "exec_logging" is created.
47738+ WARNING: This option when enabled will produce a LOT of logs, especially
47739+ on an active system.
47740+
47741+config GRKERNSEC_RESLOG
47742+ bool "Resource logging"
47743+ help
47744+ If you say Y here, all attempts to overstep resource limits will
47745+ be logged with the resource name, the requested size, and the current
47746+ limit. It is highly recommended that you say Y here. If the sysctl
47747+ option is enabled, a sysctl option with name "resource_logging" is
47748+ created. If the RBAC system is enabled, the sysctl value is ignored.
47749+
47750+config GRKERNSEC_CHROOT_EXECLOG
47751+ bool "Log execs within chroot"
47752+ help
47753+ If you say Y here, all executions inside a chroot jail will be logged
47754+ to syslog. This can cause a large amount of logs if certain
47755+ applications (eg. djb's daemontools) are installed on the system, and
47756+ is therefore left as an option. If the sysctl option is enabled, a
47757+ sysctl option with name "chroot_execlog" is created.
47758+
47759+config GRKERNSEC_AUDIT_PTRACE
47760+ bool "Ptrace logging"
47761+ help
47762+ If you say Y here, all attempts to attach to a process via ptrace
47763+ will be logged. If the sysctl option is enabled, a sysctl option
47764+ with name "audit_ptrace" is created.
47765+
47766+config GRKERNSEC_AUDIT_CHDIR
47767+ bool "Chdir logging"
47768+ help
47769+ If you say Y here, all chdir() calls will be logged. If the sysctl
47770+ option is enabled, a sysctl option with name "audit_chdir" is created.
47771+
47772+config GRKERNSEC_AUDIT_MOUNT
47773+ bool "(Un)Mount logging"
47774+ help
47775+ If you say Y here, all mounts and unmounts will be logged. If the
47776+ sysctl option is enabled, a sysctl option with name "audit_mount" is
47777+ created.
47778+
47779+config GRKERNSEC_SIGNAL
47780+ bool "Signal logging"
47781+ help
47782+ If you say Y here, certain important signals will be logged, such as
47783+ SIGSEGV, which will as a result inform you of when a error in a program
47784+ occurred, which in some cases could mean a possible exploit attempt.
47785+ If the sysctl option is enabled, a sysctl option with name
47786+ "signal_logging" is created.
47787+
47788+config GRKERNSEC_FORKFAIL
47789+ bool "Fork failure logging"
47790+ help
47791+ If you say Y here, all failed fork() attempts will be logged.
47792+ This could suggest a fork bomb, or someone attempting to overstep
47793+ their process limit. If the sysctl option is enabled, a sysctl option
47794+ with name "forkfail_logging" is created.
47795+
47796+config GRKERNSEC_TIME
47797+ bool "Time change logging"
47798+ help
47799+ If you say Y here, any changes of the system clock will be logged.
47800+ If the sysctl option is enabled, a sysctl option with name
47801+ "timechange_logging" is created.
47802+
47803+config GRKERNSEC_PROC_IPADDR
47804+ bool "/proc/<pid>/ipaddr support"
47805+ help
47806+ If you say Y here, a new entry will be added to each /proc/<pid>
47807+ directory that contains the IP address of the person using the task.
47808+ The IP is carried across local TCP and AF_UNIX stream sockets.
47809+ This information can be useful for IDS/IPSes to perform remote response
47810+ to a local attack. The entry is readable by only the owner of the
47811+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
47812+ the RBAC system), and thus does not create privacy concerns.
47813+
47814+config GRKERNSEC_RWXMAP_LOG
47815+ bool 'Denied RWX mmap/mprotect logging'
47816+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
47817+ help
47818+ If you say Y here, calls to mmap() and mprotect() with explicit
47819+ usage of PROT_WRITE and PROT_EXEC together will be logged when
47820+ denied by the PAX_MPROTECT feature. If the sysctl option is
47821+ enabled, a sysctl option with name "rwxmap_logging" is created.
47822+
47823+config GRKERNSEC_AUDIT_TEXTREL
47824+ bool 'ELF text relocations logging (READ HELP)'
47825+ depends on PAX_MPROTECT
47826+ help
47827+ If you say Y here, text relocations will be logged with the filename
47828+ of the offending library or binary. The purpose of the feature is
47829+ to help Linux distribution developers get rid of libraries and
47830+ binaries that need text relocations which hinder the future progress
47831+ of PaX. Only Linux distribution developers should say Y here, and
47832+ never on a production machine, as this option creates an information
47833+ leak that could aid an attacker in defeating the randomization of
47834+ a single memory region. If the sysctl option is enabled, a sysctl
47835+ option with name "audit_textrel" is created.
47836+
47837+endmenu
47838+
47839+menu "Executable Protections"
47840+depends on GRKERNSEC
47841+
47842+config GRKERNSEC_DMESG
47843+ bool "Dmesg(8) restriction"
47844+ help
47845+ If you say Y here, non-root users will not be able to use dmesg(8)
47846+ to view up to the last 4kb of messages in the kernel's log buffer.
47847+ The kernel's log buffer often contains kernel addresses and other
47848+ identifying information useful to an attacker in fingerprinting a
47849+ system for a targeted exploit.
47850+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
47851+ created.
47852+
47853+config GRKERNSEC_HARDEN_PTRACE
47854+ bool "Deter ptrace-based process snooping"
47855+ help
47856+ If you say Y here, TTY sniffers and other malicious monitoring
47857+ programs implemented through ptrace will be defeated. If you
47858+ have been using the RBAC system, this option has already been
47859+ enabled for several years for all users, with the ability to make
47860+ fine-grained exceptions.
47861+
47862+ This option only affects the ability of non-root users to ptrace
47863+ processes that are not a descendent of the ptracing process.
47864+ This means that strace ./binary and gdb ./binary will still work,
47865+ but attaching to arbitrary processes will not. If the sysctl
47866+ option is enabled, a sysctl option with name "harden_ptrace" is
47867+ created.
47868+
47869+config GRKERNSEC_PTRACE_READEXEC
47870+ bool "Require read access to ptrace sensitive binaries"
47871+ help
47872+ If you say Y here, unprivileged users will not be able to ptrace unreadable
47873+ binaries. This option is useful in environments that
47874+ remove the read bits (e.g. file mode 4711) from suid binaries to
47875+ prevent infoleaking of their contents. This option adds
47876+ consistency to the use of that file mode, as the binary could normally
47877+ be read out when run without privileges while ptracing.
47878+
47879+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
47880+ is created.
47881+
47882+config GRKERNSEC_SETXID
47883+ bool "Enforce consistent multithreaded privileges"
47884+ help
47885+ If you say Y here, a change from a root uid to a non-root uid
47886+ in a multithreaded application will cause the resulting uids,
47887+ gids, supplementary groups, and capabilities in that thread
47888+ to be propagated to the other threads of the process. In most
47889+ cases this is unnecessary, as glibc will emulate this behavior
47890+ on behalf of the application. Other libcs do not act in the
47891+ same way, allowing the other threads of the process to continue
47892+ running with root privileges. If the sysctl option is enabled,
47893+ a sysctl option with name "consistent_setxid" is created.
47894+
47895+config GRKERNSEC_TPE
47896+ bool "Trusted Path Execution (TPE)"
47897+ help
47898+ If you say Y here, you will be able to choose a gid to add to the
47899+ supplementary groups of users you want to mark as "untrusted."
47900+ These users will not be able to execute any files that are not in
47901+ root-owned directories writable only by root. If the sysctl option
47902+ is enabled, a sysctl option with name "tpe" is created.
47903+
47904+config GRKERNSEC_TPE_ALL
47905+ bool "Partially restrict all non-root users"
47906+ depends on GRKERNSEC_TPE
47907+ help
47908+ If you say Y here, all non-root users will be covered under
47909+ a weaker TPE restriction. This is separate from, and in addition to,
47910+ the main TPE options that you have selected elsewhere. Thus, if a
47911+ "trusted" GID is chosen, this restriction applies to even that GID.
47912+ Under this restriction, all non-root users will only be allowed to
47913+ execute files in directories they own that are not group or
47914+ world-writable, or in directories owned by root and writable only by
47915+ root. If the sysctl option is enabled, a sysctl option with name
47916+ "tpe_restrict_all" is created.
47917+
47918+config GRKERNSEC_TPE_INVERT
47919+ bool "Invert GID option"
47920+ depends on GRKERNSEC_TPE
47921+ help
47922+ If you say Y here, the group you specify in the TPE configuration will
47923+ decide what group TPE restrictions will be *disabled* for. This
47924+ option is useful if you want TPE restrictions to be applied to most
47925+ users on the system. If the sysctl option is enabled, a sysctl option
47926+ with name "tpe_invert" is created. Unlike other sysctl options, this
47927+ entry will default to on for backward-compatibility.
47928+
47929+config GRKERNSEC_TPE_GID
47930+ int "GID for untrusted users"
47931+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
47932+ default 1005
47933+ help
47934+ Setting this GID determines what group TPE restrictions will be
47935+ *enabled* for. If the sysctl option is enabled, a sysctl option
47936+ with name "tpe_gid" is created.
47937+
47938+config GRKERNSEC_TPE_GID
47939+ int "GID for trusted users"
47940+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
47941+ default 1005
47942+ help
47943+ Setting this GID determines what group TPE restrictions will be
47944+ *disabled* for. If the sysctl option is enabled, a sysctl option
47945+ with name "tpe_gid" is created.
47946+
47947+endmenu
47948+menu "Network Protections"
47949+depends on GRKERNSEC
47950+
47951+config GRKERNSEC_RANDNET
47952+ bool "Larger entropy pools"
47953+ help
47954+ If you say Y here, the entropy pools used for many features of Linux
47955+ and grsecurity will be doubled in size. Since several grsecurity
47956+ features use additional randomness, it is recommended that you say Y
47957+ here. Saying Y here has a similar effect as modifying
47958+ /proc/sys/kernel/random/poolsize.
47959+
47960+config GRKERNSEC_BLACKHOLE
47961+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
47962+ depends on NET
47963+ help
47964+ If you say Y here, neither TCP resets nor ICMP
47965+ destination-unreachable packets will be sent in response to packets
47966+ sent to ports for which no associated listening process exists.
47967+ This feature supports both IPV4 and IPV6 and exempts the
47968+ loopback interface from blackholing. Enabling this feature
47969+ makes a host more resilient to DoS attacks and reduces network
47970+ visibility against scanners.
47971+
47972+ The blackhole feature as-implemented is equivalent to the FreeBSD
47973+ blackhole feature, as it prevents RST responses to all packets, not
47974+ just SYNs. Under most application behavior this causes no
47975+ problems, but applications (like haproxy) may not close certain
47976+ connections in a way that cleanly terminates them on the remote
47977+ end, leaving the remote host in LAST_ACK state. Because of this
47978+ side-effect and to prevent intentional LAST_ACK DoSes, this
47979+ feature also adds automatic mitigation against such attacks.
47980+ The mitigation drastically reduces the amount of time a socket
47981+ can spend in LAST_ACK state. If you're using haproxy and not
47982+ all servers it connects to have this option enabled, consider
47983+ disabling this feature on the haproxy host.
47984+
47985+ If the sysctl option is enabled, two sysctl options with names
47986+ "ip_blackhole" and "lastack_retries" will be created.
47987+ While "ip_blackhole" takes the standard zero/non-zero on/off
47988+ toggle, "lastack_retries" uses the same kinds of values as
47989+ "tcp_retries1" and "tcp_retries2". The default value of 4
47990+ prevents a socket from lasting more than 45 seconds in LAST_ACK
47991+ state.
47992+
47993+config GRKERNSEC_SOCKET
47994+ bool "Socket restrictions"
47995+ depends on NET
47996+ help
47997+ If you say Y here, you will be able to choose from several options.
47998+ If you assign a GID on your system and add it to the supplementary
47999+ groups of users you want to restrict socket access to, this patch
48000+ will perform up to three things, based on the option(s) you choose.
48001+
48002+config GRKERNSEC_SOCKET_ALL
48003+ bool "Deny any sockets to group"
48004+ depends on GRKERNSEC_SOCKET
48005+ help
48006+ If you say Y here, you will be able to choose a GID of whose users will
48007+ be unable to connect to other hosts from your machine or run server
48008+ applications from your machine. If the sysctl option is enabled, a
48009+ sysctl option with name "socket_all" is created.
48010+
48011+config GRKERNSEC_SOCKET_ALL_GID
48012+ int "GID to deny all sockets for"
48013+ depends on GRKERNSEC_SOCKET_ALL
48014+ default 1004
48015+ help
48016+ Here you can choose the GID to disable socket access for. Remember to
48017+ add the users you want socket access disabled for to the GID
48018+ specified here. If the sysctl option is enabled, a sysctl option
48019+ with name "socket_all_gid" is created.
48020+
48021+config GRKERNSEC_SOCKET_CLIENT
48022+ bool "Deny client sockets to group"
48023+ depends on GRKERNSEC_SOCKET
48024+ help
48025+ If you say Y here, you will be able to choose a GID of whose users will
48026+ be unable to connect to other hosts from your machine, but will be
48027+ able to run servers. If this option is enabled, all users in the group
48028+ you specify will have to use passive mode when initiating ftp transfers
48029+ from the shell on your machine. If the sysctl option is enabled, a
48030+ sysctl option with name "socket_client" is created.
48031+
48032+config GRKERNSEC_SOCKET_CLIENT_GID
48033+ int "GID to deny client sockets for"
48034+ depends on GRKERNSEC_SOCKET_CLIENT
48035+ default 1003
48036+ help
48037+ Here you can choose the GID to disable client socket access for.
48038+ Remember to add the users you want client socket access disabled for to
48039+ the GID specified here. If the sysctl option is enabled, a sysctl
48040+ option with name "socket_client_gid" is created.
48041+
48042+config GRKERNSEC_SOCKET_SERVER
48043+ bool "Deny server sockets to group"
48044+ depends on GRKERNSEC_SOCKET
48045+ help
48046+ If you say Y here, you will be able to choose a GID of whose users will
48047+ be unable to run server applications from your machine. If the sysctl
48048+ option is enabled, a sysctl option with name "socket_server" is created.
48049+
48050+config GRKERNSEC_SOCKET_SERVER_GID
48051+ int "GID to deny server sockets for"
48052+ depends on GRKERNSEC_SOCKET_SERVER
48053+ default 1002
48054+ help
48055+ Here you can choose the GID to disable server socket access for.
48056+ Remember to add the users you want server socket access disabled for to
48057+ the GID specified here. If the sysctl option is enabled, a sysctl
48058+ option with name "socket_server_gid" is created.
48059+
48060+endmenu
48061+menu "Sysctl support"
48062+depends on GRKERNSEC && SYSCTL
48063+
48064+config GRKERNSEC_SYSCTL
48065+ bool "Sysctl support"
48066+ help
48067+ If you say Y here, you will be able to change the options that
48068+ grsecurity runs with at bootup, without having to recompile your
48069+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
48070+ to enable (1) or disable (0) various features. All the sysctl entries
48071+ are mutable until the "grsec_lock" entry is set to a non-zero value.
48072+ All features enabled in the kernel configuration are disabled at boot
48073+ if you do not say Y to the "Turn on features by default" option.
48074+ All options should be set at startup, and the grsec_lock entry should
48075+ be set to a non-zero value after all the options are set.
48076+ *THIS IS EXTREMELY IMPORTANT*
48077+
48078+config GRKERNSEC_SYSCTL_DISTRO
48079+ bool "Extra sysctl support for distro makers (READ HELP)"
48080+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
48081+ help
48082+ If you say Y here, additional sysctl options will be created
48083+ for features that affect processes running as root. Therefore,
48084+ it is critical when using this option that the grsec_lock entry be
48085+ enabled after boot. Only distros with prebuilt kernel packages
48086+ with this option enabled that can ensure grsec_lock is enabled
48087+ after boot should use this option.
48088+ *Failure to set grsec_lock after boot makes all grsec features
48089+ this option covers useless*
48090+
48091+ Currently this option creates the following sysctl entries:
48092+ "Disable Privileged I/O": "disable_priv_io"
48093+
48094+config GRKERNSEC_SYSCTL_ON
48095+ bool "Turn on features by default"
48096+ depends on GRKERNSEC_SYSCTL
48097+ help
48098+ If you say Y here, instead of having all features enabled in the
48099+ kernel configuration disabled at boot time, the features will be
48100+ enabled at boot time. It is recommended you say Y here unless
48101+ there is some reason you would want all sysctl-tunable features to
48102+ be disabled by default. As mentioned elsewhere, it is important
48103+ to enable the grsec_lock entry once you have finished modifying
48104+ the sysctl entries.
48105+
48106+endmenu
48107+menu "Logging Options"
48108+depends on GRKERNSEC
48109+
48110+config GRKERNSEC_FLOODTIME
48111+ int "Seconds in between log messages (minimum)"
48112+ default 10
48113+ help
48114+ This option allows you to enforce the number of seconds between
48115+ grsecurity log messages. The default should be suitable for most
48116+ people, however, if you choose to change it, choose a value small enough
48117+ to allow informative logs to be produced, but large enough to
48118+ prevent flooding.
48119+
48120+config GRKERNSEC_FLOODBURST
48121+ int "Number of messages in a burst (maximum)"
48122+ default 6
48123+ help
48124+ This option allows you to choose the maximum number of messages allowed
48125+ within the flood time interval you chose in a separate option. The
48126+ default should be suitable for most people, however if you find that
48127+ many of your logs are being interpreted as flooding, you may want to
48128+ raise this value.
48129+
48130+endmenu
48131+
48132+endmenu
48133diff --git a/grsecurity/Makefile b/grsecurity/Makefile
48134new file mode 100644
48135index 0000000..1b9afa9
48136--- /dev/null
48137+++ b/grsecurity/Makefile
48138@@ -0,0 +1,38 @@
48139+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
48140+# during 2001-2009 it has been completely redesigned by Brad Spengler
48141+# into an RBAC system
48142+#
48143+# All code in this directory and various hooks inserted throughout the kernel
48144+# are copyright Brad Spengler - Open Source Security, Inc., and released
48145+# under the GPL v2 or higher
48146+
48147+KBUILD_CFLAGS += -Werror
48148+
48149+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
48150+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
48151+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
48152+
48153+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
48154+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
48155+ gracl_learn.o grsec_log.o
48156+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
48157+
48158+ifdef CONFIG_NET
48159+obj-y += grsec_sock.o
48160+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
48161+endif
48162+
48163+ifndef CONFIG_GRKERNSEC
48164+obj-y += grsec_disabled.o
48165+endif
48166+
48167+ifdef CONFIG_GRKERNSEC_HIDESYM
48168+extra-y := grsec_hidesym.o
48169+$(obj)/grsec_hidesym.o:
48170+ @-chmod -f 500 /boot
48171+ @-chmod -f 500 /lib/modules
48172+ @-chmod -f 500 /lib64/modules
48173+ @-chmod -f 500 /lib32/modules
48174+ @-chmod -f 700 .
48175+ @echo ' grsec: protected kernel image paths'
48176+endif
48177diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
48178new file mode 100644
48179index 0000000..6e989da
48180--- /dev/null
48181+++ b/grsecurity/gracl.c
48182@@ -0,0 +1,4163 @@
48183+#include <linux/kernel.h>
48184+#include <linux/module.h>
48185+#include <linux/sched.h>
48186+#include <linux/mm.h>
48187+#include <linux/file.h>
48188+#include <linux/fs.h>
48189+#include <linux/namei.h>
48190+#include <linux/mount.h>
48191+#include <linux/tty.h>
48192+#include <linux/proc_fs.h>
48193+#include <linux/lglock.h>
48194+#include <linux/slab.h>
48195+#include <linux/vmalloc.h>
48196+#include <linux/types.h>
48197+#include <linux/sysctl.h>
48198+#include <linux/netdevice.h>
48199+#include <linux/ptrace.h>
48200+#include <linux/gracl.h>
48201+#include <linux/gralloc.h>
48202+#include <linux/security.h>
48203+#include <linux/grinternal.h>
48204+#include <linux/pid_namespace.h>
48205+#include <linux/fdtable.h>
48206+#include <linux/percpu.h>
48207+
48208+#include <asm/uaccess.h>
48209+#include <asm/errno.h>
48210+#include <asm/mman.h>
48211+
48212+static struct acl_role_db acl_role_set;
48213+static struct name_db name_set;
48214+static struct inodev_db inodev_set;
48215+
48216+/* for keeping track of userspace pointers used for subjects, so we
48217+ can share references in the kernel as well
48218+*/
48219+
48220+static struct path real_root;
48221+
48222+static struct acl_subj_map_db subj_map_set;
48223+
48224+static struct acl_role_label *default_role;
48225+
48226+static struct acl_role_label *role_list;
48227+
48228+static u16 acl_sp_role_value;
48229+
48230+extern char *gr_shared_page[4];
48231+static DEFINE_MUTEX(gr_dev_mutex);
48232+DEFINE_RWLOCK(gr_inode_lock);
48233+
48234+struct gr_arg *gr_usermode;
48235+
48236+static unsigned int gr_status __read_only = GR_STATUS_INIT;
48237+
48238+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
48239+extern void gr_clear_learn_entries(void);
48240+
48241+#ifdef CONFIG_GRKERNSEC_RESLOG
48242+extern void gr_log_resource(const struct task_struct *task,
48243+ const int res, const unsigned long wanted, const int gt);
48244+#endif
48245+
48246+unsigned char *gr_system_salt;
48247+unsigned char *gr_system_sum;
48248+
48249+static struct sprole_pw **acl_special_roles = NULL;
48250+static __u16 num_sprole_pws = 0;
48251+
48252+static struct acl_role_label *kernel_role = NULL;
48253+
48254+static unsigned int gr_auth_attempts = 0;
48255+static unsigned long gr_auth_expires = 0UL;
48256+
48257+#ifdef CONFIG_NET
48258+extern struct vfsmount *sock_mnt;
48259+#endif
48260+
48261+extern struct vfsmount *pipe_mnt;
48262+extern struct vfsmount *shm_mnt;
48263+#ifdef CONFIG_HUGETLBFS
48264+extern struct vfsmount *hugetlbfs_vfsmount;
48265+#endif
48266+
48267+static struct acl_object_label *fakefs_obj_rw;
48268+static struct acl_object_label *fakefs_obj_rwx;
48269+
48270+extern int gr_init_uidset(void);
48271+extern void gr_free_uidset(void);
48272+extern void gr_remove_uid(uid_t uid);
48273+extern int gr_find_uid(uid_t uid);
48274+
48275+DECLARE_BRLOCK(vfsmount_lock);
48276+
48277+__inline__ int
48278+gr_acl_is_enabled(void)
48279+{
48280+ return (gr_status & GR_READY);
48281+}
48282+
48283+#ifdef CONFIG_BTRFS_FS
48284+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
48285+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
48286+#endif
48287+
48288+static inline dev_t __get_dev(const struct dentry *dentry)
48289+{
48290+#ifdef CONFIG_BTRFS_FS
48291+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
48292+ return get_btrfs_dev_from_inode(dentry->d_inode);
48293+ else
48294+#endif
48295+ return dentry->d_inode->i_sb->s_dev;
48296+}
48297+
48298+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
48299+{
48300+ return __get_dev(dentry);
48301+}
48302+
48303+static char gr_task_roletype_to_char(struct task_struct *task)
48304+{
48305+ switch (task->role->roletype &
48306+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
48307+ GR_ROLE_SPECIAL)) {
48308+ case GR_ROLE_DEFAULT:
48309+ return 'D';
48310+ case GR_ROLE_USER:
48311+ return 'U';
48312+ case GR_ROLE_GROUP:
48313+ return 'G';
48314+ case GR_ROLE_SPECIAL:
48315+ return 'S';
48316+ }
48317+
48318+ return 'X';
48319+}
48320+
48321+char gr_roletype_to_char(void)
48322+{
48323+ return gr_task_roletype_to_char(current);
48324+}
48325+
48326+__inline__ int
48327+gr_acl_tpe_check(void)
48328+{
48329+ if (unlikely(!(gr_status & GR_READY)))
48330+ return 0;
48331+ if (current->role->roletype & GR_ROLE_TPE)
48332+ return 1;
48333+ else
48334+ return 0;
48335+}
48336+
48337+int
48338+gr_handle_rawio(const struct inode *inode)
48339+{
48340+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
48341+ if (inode && S_ISBLK(inode->i_mode) &&
48342+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
48343+ !capable(CAP_SYS_RAWIO))
48344+ return 1;
48345+#endif
48346+ return 0;
48347+}
48348+
48349+static int
48350+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
48351+{
48352+ if (likely(lena != lenb))
48353+ return 0;
48354+
48355+ return !memcmp(a, b, lena);
48356+}
48357+
48358+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
48359+{
48360+ *buflen -= namelen;
48361+ if (*buflen < 0)
48362+ return -ENAMETOOLONG;
48363+ *buffer -= namelen;
48364+ memcpy(*buffer, str, namelen);
48365+ return 0;
48366+}
48367+
48368+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
48369+{
48370+ return prepend(buffer, buflen, name->name, name->len);
48371+}
48372+
48373+static int prepend_path(const struct path *path, struct path *root,
48374+ char **buffer, int *buflen)
48375+{
48376+ struct dentry *dentry = path->dentry;
48377+ struct vfsmount *vfsmnt = path->mnt;
48378+ bool slash = false;
48379+ int error = 0;
48380+
48381+ while (dentry != root->dentry || vfsmnt != root->mnt) {
48382+ struct dentry * parent;
48383+
48384+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
48385+ /* Global root? */
48386+ if (vfsmnt->mnt_parent == vfsmnt) {
48387+ goto out;
48388+ }
48389+ dentry = vfsmnt->mnt_mountpoint;
48390+ vfsmnt = vfsmnt->mnt_parent;
48391+ continue;
48392+ }
48393+ parent = dentry->d_parent;
48394+ prefetch(parent);
48395+ spin_lock(&dentry->d_lock);
48396+ error = prepend_name(buffer, buflen, &dentry->d_name);
48397+ spin_unlock(&dentry->d_lock);
48398+ if (!error)
48399+ error = prepend(buffer, buflen, "/", 1);
48400+ if (error)
48401+ break;
48402+
48403+ slash = true;
48404+ dentry = parent;
48405+ }
48406+
48407+out:
48408+ if (!error && !slash)
48409+ error = prepend(buffer, buflen, "/", 1);
48410+
48411+ return error;
48412+}
48413+
48414+/* this must be called with vfsmount_lock and rename_lock held */
48415+
48416+static char *__our_d_path(const struct path *path, struct path *root,
48417+ char *buf, int buflen)
48418+{
48419+ char *res = buf + buflen;
48420+ int error;
48421+
48422+ prepend(&res, &buflen, "\0", 1);
48423+ error = prepend_path(path, root, &res, &buflen);
48424+ if (error)
48425+ return ERR_PTR(error);
48426+
48427+ return res;
48428+}
48429+
48430+static char *
48431+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
48432+{
48433+ char *retval;
48434+
48435+ retval = __our_d_path(path, root, buf, buflen);
48436+ if (unlikely(IS_ERR(retval)))
48437+ retval = strcpy(buf, "<path too long>");
48438+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
48439+ retval[1] = '\0';
48440+
48441+ return retval;
48442+}
48443+
48444+static char *
48445+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
48446+ char *buf, int buflen)
48447+{
48448+ struct path path;
48449+ char *res;
48450+
48451+ path.dentry = (struct dentry *)dentry;
48452+ path.mnt = (struct vfsmount *)vfsmnt;
48453+
48454+ /* we can use real_root.dentry, real_root.mnt, because this is only called
48455+ by the RBAC system */
48456+ res = gen_full_path(&path, &real_root, buf, buflen);
48457+
48458+ return res;
48459+}
48460+
48461+static char *
48462+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
48463+ char *buf, int buflen)
48464+{
48465+ char *res;
48466+ struct path path;
48467+ struct path root;
48468+ struct task_struct *reaper = &init_task;
48469+
48470+ path.dentry = (struct dentry *)dentry;
48471+ path.mnt = (struct vfsmount *)vfsmnt;
48472+
48473+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
48474+ get_fs_root(reaper->fs, &root);
48475+
48476+ write_seqlock(&rename_lock);
48477+ br_read_lock(vfsmount_lock);
48478+ res = gen_full_path(&path, &root, buf, buflen);
48479+ br_read_unlock(vfsmount_lock);
48480+ write_sequnlock(&rename_lock);
48481+
48482+ path_put(&root);
48483+ return res;
48484+}
48485+
48486+static char *
48487+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
48488+{
48489+ char *ret;
48490+ write_seqlock(&rename_lock);
48491+ br_read_lock(vfsmount_lock);
48492+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
48493+ PAGE_SIZE);
48494+ br_read_unlock(vfsmount_lock);
48495+ write_sequnlock(&rename_lock);
48496+ return ret;
48497+}
48498+
48499+static char *
48500+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
48501+{
48502+ char *ret;
48503+ char *buf;
48504+ int buflen;
48505+
48506+ write_seqlock(&rename_lock);
48507+ br_read_lock(vfsmount_lock);
48508+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
48509+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
48510+ buflen = (int)(ret - buf);
48511+ if (buflen >= 5)
48512+ prepend(&ret, &buflen, "/proc", 5);
48513+ else
48514+ ret = strcpy(buf, "<path too long>");
48515+ br_read_unlock(vfsmount_lock);
48516+ write_sequnlock(&rename_lock);
48517+ return ret;
48518+}
48519+
48520+char *
48521+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
48522+{
48523+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
48524+ PAGE_SIZE);
48525+}
48526+
48527+char *
48528+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
48529+{
48530+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
48531+ PAGE_SIZE);
48532+}
48533+
48534+char *
48535+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
48536+{
48537+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
48538+ PAGE_SIZE);
48539+}
48540+
48541+char *
48542+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
48543+{
48544+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
48545+ PAGE_SIZE);
48546+}
48547+
48548+char *
48549+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
48550+{
48551+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
48552+ PAGE_SIZE);
48553+}
48554+
48555+__inline__ __u32
48556+to_gr_audit(const __u32 reqmode)
48557+{
48558+ /* masks off auditable permission flags, then shifts them to create
48559+ auditing flags, and adds the special case of append auditing if
48560+ we're requesting write */
48561+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
48562+}
48563+
48564+struct acl_subject_label *
48565+lookup_subject_map(const struct acl_subject_label *userp)
48566+{
48567+ unsigned int index = shash(userp, subj_map_set.s_size);
48568+ struct subject_map *match;
48569+
48570+ match = subj_map_set.s_hash[index];
48571+
48572+ while (match && match->user != userp)
48573+ match = match->next;
48574+
48575+ if (match != NULL)
48576+ return match->kernel;
48577+ else
48578+ return NULL;
48579+}
48580+
48581+static void
48582+insert_subj_map_entry(struct subject_map *subjmap)
48583+{
48584+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
48585+ struct subject_map **curr;
48586+
48587+ subjmap->prev = NULL;
48588+
48589+ curr = &subj_map_set.s_hash[index];
48590+ if (*curr != NULL)
48591+ (*curr)->prev = subjmap;
48592+
48593+ subjmap->next = *curr;
48594+ *curr = subjmap;
48595+
48596+ return;
48597+}
48598+
48599+static struct acl_role_label *
48600+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
48601+ const gid_t gid)
48602+{
48603+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
48604+ struct acl_role_label *match;
48605+ struct role_allowed_ip *ipp;
48606+ unsigned int x;
48607+ u32 curr_ip = task->signal->curr_ip;
48608+
48609+ task->signal->saved_ip = curr_ip;
48610+
48611+ match = acl_role_set.r_hash[index];
48612+
48613+ while (match) {
48614+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
48615+ for (x = 0; x < match->domain_child_num; x++) {
48616+ if (match->domain_children[x] == uid)
48617+ goto found;
48618+ }
48619+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
48620+ break;
48621+ match = match->next;
48622+ }
48623+found:
48624+ if (match == NULL) {
48625+ try_group:
48626+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
48627+ match = acl_role_set.r_hash[index];
48628+
48629+ while (match) {
48630+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
48631+ for (x = 0; x < match->domain_child_num; x++) {
48632+ if (match->domain_children[x] == gid)
48633+ goto found2;
48634+ }
48635+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
48636+ break;
48637+ match = match->next;
48638+ }
48639+found2:
48640+ if (match == NULL)
48641+ match = default_role;
48642+ if (match->allowed_ips == NULL)
48643+ return match;
48644+ else {
48645+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
48646+ if (likely
48647+ ((ntohl(curr_ip) & ipp->netmask) ==
48648+ (ntohl(ipp->addr) & ipp->netmask)))
48649+ return match;
48650+ }
48651+ match = default_role;
48652+ }
48653+ } else if (match->allowed_ips == NULL) {
48654+ return match;
48655+ } else {
48656+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
48657+ if (likely
48658+ ((ntohl(curr_ip) & ipp->netmask) ==
48659+ (ntohl(ipp->addr) & ipp->netmask)))
48660+ return match;
48661+ }
48662+ goto try_group;
48663+ }
48664+
48665+ return match;
48666+}
48667+
48668+struct acl_subject_label *
48669+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
48670+ const struct acl_role_label *role)
48671+{
48672+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
48673+ struct acl_subject_label *match;
48674+
48675+ match = role->subj_hash[index];
48676+
48677+ while (match && (match->inode != ino || match->device != dev ||
48678+ (match->mode & GR_DELETED))) {
48679+ match = match->next;
48680+ }
48681+
48682+ if (match && !(match->mode & GR_DELETED))
48683+ return match;
48684+ else
48685+ return NULL;
48686+}
48687+
48688+struct acl_subject_label *
48689+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
48690+ const struct acl_role_label *role)
48691+{
48692+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
48693+ struct acl_subject_label *match;
48694+
48695+ match = role->subj_hash[index];
48696+
48697+ while (match && (match->inode != ino || match->device != dev ||
48698+ !(match->mode & GR_DELETED))) {
48699+ match = match->next;
48700+ }
48701+
48702+ if (match && (match->mode & GR_DELETED))
48703+ return match;
48704+ else
48705+ return NULL;
48706+}
48707+
48708+static struct acl_object_label *
48709+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
48710+ const struct acl_subject_label *subj)
48711+{
48712+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
48713+ struct acl_object_label *match;
48714+
48715+ match = subj->obj_hash[index];
48716+
48717+ while (match && (match->inode != ino || match->device != dev ||
48718+ (match->mode & GR_DELETED))) {
48719+ match = match->next;
48720+ }
48721+
48722+ if (match && !(match->mode & GR_DELETED))
48723+ return match;
48724+ else
48725+ return NULL;
48726+}
48727+
48728+static struct acl_object_label *
48729+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
48730+ const struct acl_subject_label *subj)
48731+{
48732+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
48733+ struct acl_object_label *match;
48734+
48735+ match = subj->obj_hash[index];
48736+
48737+ while (match && (match->inode != ino || match->device != dev ||
48738+ !(match->mode & GR_DELETED))) {
48739+ match = match->next;
48740+ }
48741+
48742+ if (match && (match->mode & GR_DELETED))
48743+ return match;
48744+
48745+ match = subj->obj_hash[index];
48746+
48747+ while (match && (match->inode != ino || match->device != dev ||
48748+ (match->mode & GR_DELETED))) {
48749+ match = match->next;
48750+ }
48751+
48752+ if (match && !(match->mode & GR_DELETED))
48753+ return match;
48754+ else
48755+ return NULL;
48756+}
48757+
48758+static struct name_entry *
48759+lookup_name_entry(const char *name)
48760+{
48761+ unsigned int len = strlen(name);
48762+ unsigned int key = full_name_hash(name, len);
48763+ unsigned int index = key % name_set.n_size;
48764+ struct name_entry *match;
48765+
48766+ match = name_set.n_hash[index];
48767+
48768+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
48769+ match = match->next;
48770+
48771+ return match;
48772+}
48773+
48774+static struct name_entry *
48775+lookup_name_entry_create(const char *name)
48776+{
48777+ unsigned int len = strlen(name);
48778+ unsigned int key = full_name_hash(name, len);
48779+ unsigned int index = key % name_set.n_size;
48780+ struct name_entry *match;
48781+
48782+ match = name_set.n_hash[index];
48783+
48784+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
48785+ !match->deleted))
48786+ match = match->next;
48787+
48788+ if (match && match->deleted)
48789+ return match;
48790+
48791+ match = name_set.n_hash[index];
48792+
48793+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
48794+ match->deleted))
48795+ match = match->next;
48796+
48797+ if (match && !match->deleted)
48798+ return match;
48799+ else
48800+ return NULL;
48801+}
48802+
48803+static struct inodev_entry *
48804+lookup_inodev_entry(const ino_t ino, const dev_t dev)
48805+{
48806+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
48807+ struct inodev_entry *match;
48808+
48809+ match = inodev_set.i_hash[index];
48810+
48811+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
48812+ match = match->next;
48813+
48814+ return match;
48815+}
48816+
48817+static void
48818+insert_inodev_entry(struct inodev_entry *entry)
48819+{
48820+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
48821+ inodev_set.i_size);
48822+ struct inodev_entry **curr;
48823+
48824+ entry->prev = NULL;
48825+
48826+ curr = &inodev_set.i_hash[index];
48827+ if (*curr != NULL)
48828+ (*curr)->prev = entry;
48829+
48830+ entry->next = *curr;
48831+ *curr = entry;
48832+
48833+ return;
48834+}
48835+
48836+static void
48837+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
48838+{
48839+ unsigned int index =
48840+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
48841+ struct acl_role_label **curr;
48842+ struct acl_role_label *tmp;
48843+
48844+ curr = &acl_role_set.r_hash[index];
48845+
48846+ /* if role was already inserted due to domains and already has
48847+ a role in the same bucket as it attached, then we need to
48848+ combine these two buckets
48849+ */
48850+ if (role->next) {
48851+ tmp = role->next;
48852+ while (tmp->next)
48853+ tmp = tmp->next;
48854+ tmp->next = *curr;
48855+ } else
48856+ role->next = *curr;
48857+ *curr = role;
48858+
48859+ return;
48860+}
48861+
48862+static void
48863+insert_acl_role_label(struct acl_role_label *role)
48864+{
48865+ int i;
48866+
48867+ if (role_list == NULL) {
48868+ role_list = role;
48869+ role->prev = NULL;
48870+ } else {
48871+ role->prev = role_list;
48872+ role_list = role;
48873+ }
48874+
48875+ /* used for hash chains */
48876+ role->next = NULL;
48877+
48878+ if (role->roletype & GR_ROLE_DOMAIN) {
48879+ for (i = 0; i < role->domain_child_num; i++)
48880+ __insert_acl_role_label(role, role->domain_children[i]);
48881+ } else
48882+ __insert_acl_role_label(role, role->uidgid);
48883+}
48884+
48885+static int
48886+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
48887+{
48888+ struct name_entry **curr, *nentry;
48889+ struct inodev_entry *ientry;
48890+ unsigned int len = strlen(name);
48891+ unsigned int key = full_name_hash(name, len);
48892+ unsigned int index = key % name_set.n_size;
48893+
48894+ curr = &name_set.n_hash[index];
48895+
48896+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
48897+ curr = &((*curr)->next);
48898+
48899+ if (*curr != NULL)
48900+ return 1;
48901+
48902+ nentry = acl_alloc(sizeof (struct name_entry));
48903+ if (nentry == NULL)
48904+ return 0;
48905+ ientry = acl_alloc(sizeof (struct inodev_entry));
48906+ if (ientry == NULL)
48907+ return 0;
48908+ ientry->nentry = nentry;
48909+
48910+ nentry->key = key;
48911+ nentry->name = name;
48912+ nentry->inode = inode;
48913+ nentry->device = device;
48914+ nentry->len = len;
48915+ nentry->deleted = deleted;
48916+
48917+ nentry->prev = NULL;
48918+ curr = &name_set.n_hash[index];
48919+ if (*curr != NULL)
48920+ (*curr)->prev = nentry;
48921+ nentry->next = *curr;
48922+ *curr = nentry;
48923+
48924+ /* insert us into the table searchable by inode/dev */
48925+ insert_inodev_entry(ientry);
48926+
48927+ return 1;
48928+}
48929+
48930+static void
48931+insert_acl_obj_label(struct acl_object_label *obj,
48932+ struct acl_subject_label *subj)
48933+{
48934+ unsigned int index =
48935+ fhash(obj->inode, obj->device, subj->obj_hash_size);
48936+ struct acl_object_label **curr;
48937+
48938+
48939+ obj->prev = NULL;
48940+
48941+ curr = &subj->obj_hash[index];
48942+ if (*curr != NULL)
48943+ (*curr)->prev = obj;
48944+
48945+ obj->next = *curr;
48946+ *curr = obj;
48947+
48948+ return;
48949+}
48950+
48951+static void
48952+insert_acl_subj_label(struct acl_subject_label *obj,
48953+ struct acl_role_label *role)
48954+{
48955+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
48956+ struct acl_subject_label **curr;
48957+
48958+ obj->prev = NULL;
48959+
48960+ curr = &role->subj_hash[index];
48961+ if (*curr != NULL)
48962+ (*curr)->prev = obj;
48963+
48964+ obj->next = *curr;
48965+ *curr = obj;
48966+
48967+ return;
48968+}
48969+
48970+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
48971+
48972+static void *
48973+create_table(__u32 * len, int elementsize)
48974+{
48975+ unsigned int table_sizes[] = {
48976+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
48977+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
48978+ 4194301, 8388593, 16777213, 33554393, 67108859
48979+ };
48980+ void *newtable = NULL;
48981+ unsigned int pwr = 0;
48982+
48983+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
48984+ table_sizes[pwr] <= *len)
48985+ pwr++;
48986+
48987+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
48988+ return newtable;
48989+
48990+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
48991+ newtable =
48992+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
48993+ else
48994+ newtable = vmalloc(table_sizes[pwr] * elementsize);
48995+
48996+ *len = table_sizes[pwr];
48997+
48998+ return newtable;
48999+}
49000+
49001+static int
49002+init_variables(const struct gr_arg *arg)
49003+{
49004+ struct task_struct *reaper = &init_task;
49005+ unsigned int stacksize;
49006+
49007+ subj_map_set.s_size = arg->role_db.num_subjects;
49008+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
49009+ name_set.n_size = arg->role_db.num_objects;
49010+ inodev_set.i_size = arg->role_db.num_objects;
49011+
49012+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
49013+ !name_set.n_size || !inodev_set.i_size)
49014+ return 1;
49015+
49016+ if (!gr_init_uidset())
49017+ return 1;
49018+
49019+ /* set up the stack that holds allocation info */
49020+
49021+ stacksize = arg->role_db.num_pointers + 5;
49022+
49023+ if (!acl_alloc_stack_init(stacksize))
49024+ return 1;
49025+
49026+ /* grab reference for the real root dentry and vfsmount */
49027+ get_fs_root(reaper->fs, &real_root);
49028+
49029+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
49030+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
49031+#endif
49032+
49033+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
49034+ if (fakefs_obj_rw == NULL)
49035+ return 1;
49036+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
49037+
49038+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
49039+ if (fakefs_obj_rwx == NULL)
49040+ return 1;
49041+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
49042+
49043+ subj_map_set.s_hash =
49044+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
49045+ acl_role_set.r_hash =
49046+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
49047+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
49048+ inodev_set.i_hash =
49049+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
49050+
49051+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
49052+ !name_set.n_hash || !inodev_set.i_hash)
49053+ return 1;
49054+
49055+ memset(subj_map_set.s_hash, 0,
49056+ sizeof(struct subject_map *) * subj_map_set.s_size);
49057+ memset(acl_role_set.r_hash, 0,
49058+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
49059+ memset(name_set.n_hash, 0,
49060+ sizeof (struct name_entry *) * name_set.n_size);
49061+ memset(inodev_set.i_hash, 0,
49062+ sizeof (struct inodev_entry *) * inodev_set.i_size);
49063+
49064+ return 0;
49065+}
49066+
49067+/* free information not needed after startup
49068+ currently contains user->kernel pointer mappings for subjects
49069+*/
49070+
49071+static void
49072+free_init_variables(void)
49073+{
49074+ __u32 i;
49075+
49076+ if (subj_map_set.s_hash) {
49077+ for (i = 0; i < subj_map_set.s_size; i++) {
49078+ if (subj_map_set.s_hash[i]) {
49079+ kfree(subj_map_set.s_hash[i]);
49080+ subj_map_set.s_hash[i] = NULL;
49081+ }
49082+ }
49083+
49084+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
49085+ PAGE_SIZE)
49086+ kfree(subj_map_set.s_hash);
49087+ else
49088+ vfree(subj_map_set.s_hash);
49089+ }
49090+
49091+ return;
49092+}
49093+
49094+static void
49095+free_variables(void)
49096+{
49097+ struct acl_subject_label *s;
49098+ struct acl_role_label *r;
49099+ struct task_struct *task, *task2;
49100+ unsigned int x;
49101+
49102+ gr_clear_learn_entries();
49103+
49104+ read_lock(&tasklist_lock);
49105+ do_each_thread(task2, task) {
49106+ task->acl_sp_role = 0;
49107+ task->acl_role_id = 0;
49108+ task->acl = NULL;
49109+ task->role = NULL;
49110+ } while_each_thread(task2, task);
49111+ read_unlock(&tasklist_lock);
49112+
49113+ /* release the reference to the real root dentry and vfsmount */
49114+ path_put(&real_root);
49115+
49116+ /* free all object hash tables */
49117+
49118+ FOR_EACH_ROLE_START(r)
49119+ if (r->subj_hash == NULL)
49120+ goto next_role;
49121+ FOR_EACH_SUBJECT_START(r, s, x)
49122+ if (s->obj_hash == NULL)
49123+ break;
49124+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
49125+ kfree(s->obj_hash);
49126+ else
49127+ vfree(s->obj_hash);
49128+ FOR_EACH_SUBJECT_END(s, x)
49129+ FOR_EACH_NESTED_SUBJECT_START(r, s)
49130+ if (s->obj_hash == NULL)
49131+ break;
49132+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
49133+ kfree(s->obj_hash);
49134+ else
49135+ vfree(s->obj_hash);
49136+ FOR_EACH_NESTED_SUBJECT_END(s)
49137+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
49138+ kfree(r->subj_hash);
49139+ else
49140+ vfree(r->subj_hash);
49141+ r->subj_hash = NULL;
49142+next_role:
49143+ FOR_EACH_ROLE_END(r)
49144+
49145+ acl_free_all();
49146+
49147+ if (acl_role_set.r_hash) {
49148+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
49149+ PAGE_SIZE)
49150+ kfree(acl_role_set.r_hash);
49151+ else
49152+ vfree(acl_role_set.r_hash);
49153+ }
49154+ if (name_set.n_hash) {
49155+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
49156+ PAGE_SIZE)
49157+ kfree(name_set.n_hash);
49158+ else
49159+ vfree(name_set.n_hash);
49160+ }
49161+
49162+ if (inodev_set.i_hash) {
49163+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
49164+ PAGE_SIZE)
49165+ kfree(inodev_set.i_hash);
49166+ else
49167+ vfree(inodev_set.i_hash);
49168+ }
49169+
49170+ gr_free_uidset();
49171+
49172+ memset(&name_set, 0, sizeof (struct name_db));
49173+ memset(&inodev_set, 0, sizeof (struct inodev_db));
49174+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
49175+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
49176+
49177+ default_role = NULL;
49178+ role_list = NULL;
49179+
49180+ return;
49181+}
49182+
49183+static __u32
49184+count_user_objs(struct acl_object_label *userp)
49185+{
49186+ struct acl_object_label o_tmp;
49187+ __u32 num = 0;
49188+
49189+ while (userp) {
49190+ if (copy_from_user(&o_tmp, userp,
49191+ sizeof (struct acl_object_label)))
49192+ break;
49193+
49194+ userp = o_tmp.prev;
49195+ num++;
49196+ }
49197+
49198+ return num;
49199+}
49200+
49201+static struct acl_subject_label *
49202+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
49203+
49204+static int
49205+copy_user_glob(struct acl_object_label *obj)
49206+{
49207+ struct acl_object_label *g_tmp, **guser;
49208+ unsigned int len;
49209+ char *tmp;
49210+
49211+ if (obj->globbed == NULL)
49212+ return 0;
49213+
49214+ guser = &obj->globbed;
49215+ while (*guser) {
49216+ g_tmp = (struct acl_object_label *)
49217+ acl_alloc(sizeof (struct acl_object_label));
49218+ if (g_tmp == NULL)
49219+ return -ENOMEM;
49220+
49221+ if (copy_from_user(g_tmp, *guser,
49222+ sizeof (struct acl_object_label)))
49223+ return -EFAULT;
49224+
49225+ len = strnlen_user(g_tmp->filename, PATH_MAX);
49226+
49227+ if (!len || len >= PATH_MAX)
49228+ return -EINVAL;
49229+
49230+ if ((tmp = (char *) acl_alloc(len)) == NULL)
49231+ return -ENOMEM;
49232+
49233+ if (copy_from_user(tmp, g_tmp->filename, len))
49234+ return -EFAULT;
49235+ tmp[len-1] = '\0';
49236+ g_tmp->filename = tmp;
49237+
49238+ *guser = g_tmp;
49239+ guser = &(g_tmp->next);
49240+ }
49241+
49242+ return 0;
49243+}
49244+
49245+static int
49246+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
49247+ struct acl_role_label *role)
49248+{
49249+ struct acl_object_label *o_tmp;
49250+ unsigned int len;
49251+ int ret;
49252+ char *tmp;
49253+
49254+ while (userp) {
49255+ if ((o_tmp = (struct acl_object_label *)
49256+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
49257+ return -ENOMEM;
49258+
49259+ if (copy_from_user(o_tmp, userp,
49260+ sizeof (struct acl_object_label)))
49261+ return -EFAULT;
49262+
49263+ userp = o_tmp->prev;
49264+
49265+ len = strnlen_user(o_tmp->filename, PATH_MAX);
49266+
49267+ if (!len || len >= PATH_MAX)
49268+ return -EINVAL;
49269+
49270+ if ((tmp = (char *) acl_alloc(len)) == NULL)
49271+ return -ENOMEM;
49272+
49273+ if (copy_from_user(tmp, o_tmp->filename, len))
49274+ return -EFAULT;
49275+ tmp[len-1] = '\0';
49276+ o_tmp->filename = tmp;
49277+
49278+ insert_acl_obj_label(o_tmp, subj);
49279+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
49280+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
49281+ return -ENOMEM;
49282+
49283+ ret = copy_user_glob(o_tmp);
49284+ if (ret)
49285+ return ret;
49286+
49287+ if (o_tmp->nested) {
49288+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
49289+ if (IS_ERR(o_tmp->nested))
49290+ return PTR_ERR(o_tmp->nested);
49291+
49292+ /* insert into nested subject list */
49293+ o_tmp->nested->next = role->hash->first;
49294+ role->hash->first = o_tmp->nested;
49295+ }
49296+ }
49297+
49298+ return 0;
49299+}
49300+
49301+static __u32
49302+count_user_subjs(struct acl_subject_label *userp)
49303+{
49304+ struct acl_subject_label s_tmp;
49305+ __u32 num = 0;
49306+
49307+ while (userp) {
49308+ if (copy_from_user(&s_tmp, userp,
49309+ sizeof (struct acl_subject_label)))
49310+ break;
49311+
49312+ userp = s_tmp.prev;
49313+ /* do not count nested subjects against this count, since
49314+ they are not included in the hash table, but are
49315+ attached to objects. We have already counted
49316+ the subjects in userspace for the allocation
49317+ stack
49318+ */
49319+ if (!(s_tmp.mode & GR_NESTED))
49320+ num++;
49321+ }
49322+
49323+ return num;
49324+}
49325+
49326+static int
49327+copy_user_allowedips(struct acl_role_label *rolep)
49328+{
49329+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
49330+
49331+ ruserip = rolep->allowed_ips;
49332+
49333+ while (ruserip) {
49334+ rlast = rtmp;
49335+
49336+ if ((rtmp = (struct role_allowed_ip *)
49337+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
49338+ return -ENOMEM;
49339+
49340+ if (copy_from_user(rtmp, ruserip,
49341+ sizeof (struct role_allowed_ip)))
49342+ return -EFAULT;
49343+
49344+ ruserip = rtmp->prev;
49345+
49346+ if (!rlast) {
49347+ rtmp->prev = NULL;
49348+ rolep->allowed_ips = rtmp;
49349+ } else {
49350+ rlast->next = rtmp;
49351+ rtmp->prev = rlast;
49352+ }
49353+
49354+ if (!ruserip)
49355+ rtmp->next = NULL;
49356+ }
49357+
49358+ return 0;
49359+}
49360+
49361+static int
49362+copy_user_transitions(struct acl_role_label *rolep)
49363+{
49364+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
49365+
49366+ unsigned int len;
49367+ char *tmp;
49368+
49369+ rusertp = rolep->transitions;
49370+
49371+ while (rusertp) {
49372+ rlast = rtmp;
49373+
49374+ if ((rtmp = (struct role_transition *)
49375+ acl_alloc(sizeof (struct role_transition))) == NULL)
49376+ return -ENOMEM;
49377+
49378+ if (copy_from_user(rtmp, rusertp,
49379+ sizeof (struct role_transition)))
49380+ return -EFAULT;
49381+
49382+ rusertp = rtmp->prev;
49383+
49384+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
49385+
49386+ if (!len || len >= GR_SPROLE_LEN)
49387+ return -EINVAL;
49388+
49389+ if ((tmp = (char *) acl_alloc(len)) == NULL)
49390+ return -ENOMEM;
49391+
49392+ if (copy_from_user(tmp, rtmp->rolename, len))
49393+ return -EFAULT;
49394+ tmp[len-1] = '\0';
49395+ rtmp->rolename = tmp;
49396+
49397+ if (!rlast) {
49398+ rtmp->prev = NULL;
49399+ rolep->transitions = rtmp;
49400+ } else {
49401+ rlast->next = rtmp;
49402+ rtmp->prev = rlast;
49403+ }
49404+
49405+ if (!rusertp)
49406+ rtmp->next = NULL;
49407+ }
49408+
49409+ return 0;
49410+}
49411+
49412+static struct acl_subject_label *
49413+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
49414+{
49415+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
49416+ unsigned int len;
49417+ char *tmp;
49418+ __u32 num_objs;
49419+ struct acl_ip_label **i_tmp, *i_utmp2;
49420+ struct gr_hash_struct ghash;
49421+ struct subject_map *subjmap;
49422+ unsigned int i_num;
49423+ int err;
49424+
49425+ s_tmp = lookup_subject_map(userp);
49426+
49427+ /* we've already copied this subject into the kernel, just return
49428+ the reference to it, and don't copy it over again
49429+ */
49430+ if (s_tmp)
49431+ return(s_tmp);
49432+
49433+ if ((s_tmp = (struct acl_subject_label *)
49434+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
49435+ return ERR_PTR(-ENOMEM);
49436+
49437+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
49438+ if (subjmap == NULL)
49439+ return ERR_PTR(-ENOMEM);
49440+
49441+ subjmap->user = userp;
49442+ subjmap->kernel = s_tmp;
49443+ insert_subj_map_entry(subjmap);
49444+
49445+ if (copy_from_user(s_tmp, userp,
49446+ sizeof (struct acl_subject_label)))
49447+ return ERR_PTR(-EFAULT);
49448+
49449+ len = strnlen_user(s_tmp->filename, PATH_MAX);
49450+
49451+ if (!len || len >= PATH_MAX)
49452+ return ERR_PTR(-EINVAL);
49453+
49454+ if ((tmp = (char *) acl_alloc(len)) == NULL)
49455+ return ERR_PTR(-ENOMEM);
49456+
49457+ if (copy_from_user(tmp, s_tmp->filename, len))
49458+ return ERR_PTR(-EFAULT);
49459+ tmp[len-1] = '\0';
49460+ s_tmp->filename = tmp;
49461+
49462+ if (!strcmp(s_tmp->filename, "/"))
49463+ role->root_label = s_tmp;
49464+
49465+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
49466+ return ERR_PTR(-EFAULT);
49467+
49468+ /* copy user and group transition tables */
49469+
49470+ if (s_tmp->user_trans_num) {
49471+ uid_t *uidlist;
49472+
49473+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
49474+ if (uidlist == NULL)
49475+ return ERR_PTR(-ENOMEM);
49476+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
49477+ return ERR_PTR(-EFAULT);
49478+
49479+ s_tmp->user_transitions = uidlist;
49480+ }
49481+
49482+ if (s_tmp->group_trans_num) {
49483+ gid_t *gidlist;
49484+
49485+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
49486+ if (gidlist == NULL)
49487+ return ERR_PTR(-ENOMEM);
49488+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
49489+ return ERR_PTR(-EFAULT);
49490+
49491+ s_tmp->group_transitions = gidlist;
49492+ }
49493+
49494+ /* set up object hash table */
49495+ num_objs = count_user_objs(ghash.first);
49496+
49497+ s_tmp->obj_hash_size = num_objs;
49498+ s_tmp->obj_hash =
49499+ (struct acl_object_label **)
49500+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
49501+
49502+ if (!s_tmp->obj_hash)
49503+ return ERR_PTR(-ENOMEM);
49504+
49505+ memset(s_tmp->obj_hash, 0,
49506+ s_tmp->obj_hash_size *
49507+ sizeof (struct acl_object_label *));
49508+
49509+ /* add in objects */
49510+ err = copy_user_objs(ghash.first, s_tmp, role);
49511+
49512+ if (err)
49513+ return ERR_PTR(err);
49514+
49515+ /* set pointer for parent subject */
49516+ if (s_tmp->parent_subject) {
49517+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
49518+
49519+ if (IS_ERR(s_tmp2))
49520+ return s_tmp2;
49521+
49522+ s_tmp->parent_subject = s_tmp2;
49523+ }
49524+
49525+ /* add in ip acls */
49526+
49527+ if (!s_tmp->ip_num) {
49528+ s_tmp->ips = NULL;
49529+ goto insert;
49530+ }
49531+
49532+ i_tmp =
49533+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
49534+ sizeof (struct acl_ip_label *));
49535+
49536+ if (!i_tmp)
49537+ return ERR_PTR(-ENOMEM);
49538+
49539+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
49540+ *(i_tmp + i_num) =
49541+ (struct acl_ip_label *)
49542+ acl_alloc(sizeof (struct acl_ip_label));
49543+ if (!*(i_tmp + i_num))
49544+ return ERR_PTR(-ENOMEM);
49545+
49546+ if (copy_from_user
49547+ (&i_utmp2, s_tmp->ips + i_num,
49548+ sizeof (struct acl_ip_label *)))
49549+ return ERR_PTR(-EFAULT);
49550+
49551+ if (copy_from_user
49552+ (*(i_tmp + i_num), i_utmp2,
49553+ sizeof (struct acl_ip_label)))
49554+ return ERR_PTR(-EFAULT);
49555+
49556+ if ((*(i_tmp + i_num))->iface == NULL)
49557+ continue;
49558+
49559+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
49560+ if (!len || len >= IFNAMSIZ)
49561+ return ERR_PTR(-EINVAL);
49562+ tmp = acl_alloc(len);
49563+ if (tmp == NULL)
49564+ return ERR_PTR(-ENOMEM);
49565+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
49566+ return ERR_PTR(-EFAULT);
49567+ (*(i_tmp + i_num))->iface = tmp;
49568+ }
49569+
49570+ s_tmp->ips = i_tmp;
49571+
49572+insert:
49573+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
49574+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
49575+ return ERR_PTR(-ENOMEM);
49576+
49577+ return s_tmp;
49578+}
49579+
49580+static int
49581+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
49582+{
49583+ struct acl_subject_label s_pre;
49584+ struct acl_subject_label * ret;
49585+ int err;
49586+
49587+ while (userp) {
49588+ if (copy_from_user(&s_pre, userp,
49589+ sizeof (struct acl_subject_label)))
49590+ return -EFAULT;
49591+
49592+ /* do not add nested subjects here, add
49593+ while parsing objects
49594+ */
49595+
49596+ if (s_pre.mode & GR_NESTED) {
49597+ userp = s_pre.prev;
49598+ continue;
49599+ }
49600+
49601+ ret = do_copy_user_subj(userp, role);
49602+
49603+ err = PTR_ERR(ret);
49604+ if (IS_ERR(ret))
49605+ return err;
49606+
49607+ insert_acl_subj_label(ret, role);
49608+
49609+ userp = s_pre.prev;
49610+ }
49611+
49612+ return 0;
49613+}
49614+
49615+static int
49616+copy_user_acl(struct gr_arg *arg)
49617+{
49618+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
49619+ struct sprole_pw *sptmp;
49620+ struct gr_hash_struct *ghash;
49621+ uid_t *domainlist;
49622+ unsigned int r_num;
49623+ unsigned int len;
49624+ char *tmp;
49625+ int err = 0;
49626+ __u16 i;
49627+ __u32 num_subjs;
49628+
49629+ /* we need a default and kernel role */
49630+ if (arg->role_db.num_roles < 2)
49631+ return -EINVAL;
49632+
49633+ /* copy special role authentication info from userspace */
49634+
49635+ num_sprole_pws = arg->num_sprole_pws;
49636+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
49637+
49638+ if (!acl_special_roles) {
49639+ err = -ENOMEM;
49640+ goto cleanup;
49641+ }
49642+
49643+ for (i = 0; i < num_sprole_pws; i++) {
49644+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
49645+ if (!sptmp) {
49646+ err = -ENOMEM;
49647+ goto cleanup;
49648+ }
49649+ if (copy_from_user(sptmp, arg->sprole_pws + i,
49650+ sizeof (struct sprole_pw))) {
49651+ err = -EFAULT;
49652+ goto cleanup;
49653+ }
49654+
49655+ len =
49656+ strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
49657+
49658+ if (!len || len >= GR_SPROLE_LEN) {
49659+ err = -EINVAL;
49660+ goto cleanup;
49661+ }
49662+
49663+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
49664+ err = -ENOMEM;
49665+ goto cleanup;
49666+ }
49667+
49668+ if (copy_from_user(tmp, sptmp->rolename, len)) {
49669+ err = -EFAULT;
49670+ goto cleanup;
49671+ }
49672+ tmp[len-1] = '\0';
49673+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
49674+ printk(KERN_ALERT "Copying special role %s\n", tmp);
49675+#endif
49676+ sptmp->rolename = tmp;
49677+ acl_special_roles[i] = sptmp;
49678+ }
49679+
49680+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
49681+
49682+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
49683+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
49684+
49685+ if (!r_tmp) {
49686+ err = -ENOMEM;
49687+ goto cleanup;
49688+ }
49689+
49690+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
49691+ sizeof (struct acl_role_label *))) {
49692+ err = -EFAULT;
49693+ goto cleanup;
49694+ }
49695+
49696+ if (copy_from_user(r_tmp, r_utmp2,
49697+ sizeof (struct acl_role_label))) {
49698+ err = -EFAULT;
49699+ goto cleanup;
49700+ }
49701+
49702+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
49703+
49704+ if (!len || len >= PATH_MAX) {
49705+ err = -EINVAL;
49706+ goto cleanup;
49707+ }
49708+
49709+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
49710+ err = -ENOMEM;
49711+ goto cleanup;
49712+ }
49713+ if (copy_from_user(tmp, r_tmp->rolename, len)) {
49714+ err = -EFAULT;
49715+ goto cleanup;
49716+ }
49717+ tmp[len-1] = '\0';
49718+ r_tmp->rolename = tmp;
49719+
49720+ if (!strcmp(r_tmp->rolename, "default")
49721+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
49722+ default_role = r_tmp;
49723+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
49724+ kernel_role = r_tmp;
49725+ }
49726+
49727+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
49728+ err = -ENOMEM;
49729+ goto cleanup;
49730+ }
49731+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
49732+ err = -EFAULT;
49733+ goto cleanup;
49734+ }
49735+
49736+ r_tmp->hash = ghash;
49737+
49738+ num_subjs = count_user_subjs(r_tmp->hash->first);
49739+
49740+ r_tmp->subj_hash_size = num_subjs;
49741+ r_tmp->subj_hash =
49742+ (struct acl_subject_label **)
49743+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
49744+
49745+ if (!r_tmp->subj_hash) {
49746+ err = -ENOMEM;
49747+ goto cleanup;
49748+ }
49749+
49750+ err = copy_user_allowedips(r_tmp);
49751+ if (err)
49752+ goto cleanup;
49753+
49754+ /* copy domain info */
49755+ if (r_tmp->domain_children != NULL) {
49756+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
49757+ if (domainlist == NULL) {
49758+ err = -ENOMEM;
49759+ goto cleanup;
49760+ }
49761+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
49762+ err = -EFAULT;
49763+ goto cleanup;
49764+ }
49765+ r_tmp->domain_children = domainlist;
49766+ }
49767+
49768+ err = copy_user_transitions(r_tmp);
49769+ if (err)
49770+ goto cleanup;
49771+
49772+ memset(r_tmp->subj_hash, 0,
49773+ r_tmp->subj_hash_size *
49774+ sizeof (struct acl_subject_label *));
49775+
49776+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
49777+
49778+ if (err)
49779+ goto cleanup;
49780+
49781+ /* set nested subject list to null */
49782+ r_tmp->hash->first = NULL;
49783+
49784+ insert_acl_role_label(r_tmp);
49785+ }
49786+
49787+ goto return_err;
49788+ cleanup:
49789+ free_variables();
49790+ return_err:
49791+ return err;
49792+
49793+}
49794+
49795+static int
49796+gracl_init(struct gr_arg *args)
49797+{
49798+ int error = 0;
49799+
49800+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
49801+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
49802+
49803+ if (init_variables(args)) {
49804+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
49805+ error = -ENOMEM;
49806+ free_variables();
49807+ goto out;
49808+ }
49809+
49810+ error = copy_user_acl(args);
49811+ free_init_variables();
49812+ if (error) {
49813+ free_variables();
49814+ goto out;
49815+ }
49816+
49817+ if ((error = gr_set_acls(0))) {
49818+ free_variables();
49819+ goto out;
49820+ }
49821+
49822+ pax_open_kernel();
49823+ gr_status |= GR_READY;
49824+ pax_close_kernel();
49825+
49826+ out:
49827+ return error;
49828+}
49829+
49830+/* derived from glibc fnmatch() 0: match, 1: no match*/
49831+
49832+static int
49833+glob_match(const char *p, const char *n)
49834+{
49835+ char c;
49836+
49837+ while ((c = *p++) != '\0') {
49838+ switch (c) {
49839+ case '?':
49840+ if (*n == '\0')
49841+ return 1;
49842+ else if (*n == '/')
49843+ return 1;
49844+ break;
49845+ case '\\':
49846+ if (*n != c)
49847+ return 1;
49848+ break;
49849+ case '*':
49850+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
49851+ if (*n == '/')
49852+ return 1;
49853+ else if (c == '?') {
49854+ if (*n == '\0')
49855+ return 1;
49856+ else
49857+ ++n;
49858+ }
49859+ }
49860+ if (c == '\0') {
49861+ return 0;
49862+ } else {
49863+ const char *endp;
49864+
49865+ if ((endp = strchr(n, '/')) == NULL)
49866+ endp = n + strlen(n);
49867+
49868+ if (c == '[') {
49869+ for (--p; n < endp; ++n)
49870+ if (!glob_match(p, n))
49871+ return 0;
49872+ } else if (c == '/') {
49873+ while (*n != '\0' && *n != '/')
49874+ ++n;
49875+ if (*n == '/' && !glob_match(p, n + 1))
49876+ return 0;
49877+ } else {
49878+ for (--p; n < endp; ++n)
49879+ if (*n == c && !glob_match(p, n))
49880+ return 0;
49881+ }
49882+
49883+ return 1;
49884+ }
49885+ case '[':
49886+ {
49887+ int not;
49888+ char cold;
49889+
49890+ if (*n == '\0' || *n == '/')
49891+ return 1;
49892+
49893+ not = (*p == '!' || *p == '^');
49894+ if (not)
49895+ ++p;
49896+
49897+ c = *p++;
49898+ for (;;) {
49899+ unsigned char fn = (unsigned char)*n;
49900+
49901+ if (c == '\0')
49902+ return 1;
49903+ else {
49904+ if (c == fn)
49905+ goto matched;
49906+ cold = c;
49907+ c = *p++;
49908+
49909+ if (c == '-' && *p != ']') {
49910+ unsigned char cend = *p++;
49911+
49912+ if (cend == '\0')
49913+ return 1;
49914+
49915+ if (cold <= fn && fn <= cend)
49916+ goto matched;
49917+
49918+ c = *p++;
49919+ }
49920+ }
49921+
49922+ if (c == ']')
49923+ break;
49924+ }
49925+ if (!not)
49926+ return 1;
49927+ break;
49928+ matched:
49929+ while (c != ']') {
49930+ if (c == '\0')
49931+ return 1;
49932+
49933+ c = *p++;
49934+ }
49935+ if (not)
49936+ return 1;
49937+ }
49938+ break;
49939+ default:
49940+ if (c != *n)
49941+ return 1;
49942+ }
49943+
49944+ ++n;
49945+ }
49946+
49947+ if (*n == '\0')
49948+ return 0;
49949+
49950+ if (*n == '/')
49951+ return 0;
49952+
49953+ return 1;
49954+}
49955+
49956+static struct acl_object_label *
49957+chk_glob_label(struct acl_object_label *globbed,
49958+ struct dentry *dentry, struct vfsmount *mnt, char **path)
49959+{
49960+ struct acl_object_label *tmp;
49961+
49962+ if (*path == NULL)
49963+ *path = gr_to_filename_nolock(dentry, mnt);
49964+
49965+ tmp = globbed;
49966+
49967+ while (tmp) {
49968+ if (!glob_match(tmp->filename, *path))
49969+ return tmp;
49970+ tmp = tmp->next;
49971+ }
49972+
49973+ return NULL;
49974+}
49975+
49976+static struct acl_object_label *
49977+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
49978+ const ino_t curr_ino, const dev_t curr_dev,
49979+ const struct acl_subject_label *subj, char **path, const int checkglob)
49980+{
49981+ struct acl_subject_label *tmpsubj;
49982+ struct acl_object_label *retval;
49983+ struct acl_object_label *retval2;
49984+
49985+ tmpsubj = (struct acl_subject_label *) subj;
49986+ read_lock(&gr_inode_lock);
49987+ do {
49988+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
49989+ if (retval) {
49990+ if (checkglob && retval->globbed) {
49991+ retval2 = chk_glob_label(retval->globbed, (struct dentry *)orig_dentry,
49992+ (struct vfsmount *)orig_mnt, path);
49993+ if (retval2)
49994+ retval = retval2;
49995+ }
49996+ break;
49997+ }
49998+ } while ((tmpsubj = tmpsubj->parent_subject));
49999+ read_unlock(&gr_inode_lock);
50000+
50001+ return retval;
50002+}
50003+
50004+static __inline__ struct acl_object_label *
50005+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
50006+ struct dentry *curr_dentry,
50007+ const struct acl_subject_label *subj, char **path, const int checkglob)
50008+{
50009+ int newglob = checkglob;
50010+ ino_t inode;
50011+ dev_t device;
50012+
50013+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
50014+ as we don't want a / * rule to match instead of the / object
50015+ don't do this for create lookups that call this function though, since they're looking up
50016+ on the parent and thus need globbing checks on all paths
50017+ */
50018+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
50019+ newglob = GR_NO_GLOB;
50020+
50021+ spin_lock(&curr_dentry->d_lock);
50022+ inode = curr_dentry->d_inode->i_ino;
50023+ device = __get_dev(curr_dentry);
50024+ spin_unlock(&curr_dentry->d_lock);
50025+
50026+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
50027+}
50028+
50029+static struct acl_object_label *
50030+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50031+ const struct acl_subject_label *subj, char *path, const int checkglob)
50032+{
50033+ struct dentry *dentry = (struct dentry *) l_dentry;
50034+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
50035+ struct acl_object_label *retval;
50036+ struct dentry *parent;
50037+
50038+ write_seqlock(&rename_lock);
50039+ br_read_lock(vfsmount_lock);
50040+
50041+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
50042+#ifdef CONFIG_NET
50043+ mnt == sock_mnt ||
50044+#endif
50045+#ifdef CONFIG_HUGETLBFS
50046+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
50047+#endif
50048+ /* ignore Eric Biederman */
50049+ IS_PRIVATE(l_dentry->d_inode))) {
50050+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
50051+ goto out;
50052+ }
50053+
50054+ for (;;) {
50055+ if (dentry == real_root.dentry && mnt == real_root.mnt)
50056+ break;
50057+
50058+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
50059+ if (mnt->mnt_parent == mnt)
50060+ break;
50061+
50062+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
50063+ if (retval != NULL)
50064+ goto out;
50065+
50066+ dentry = mnt->mnt_mountpoint;
50067+ mnt = mnt->mnt_parent;
50068+ continue;
50069+ }
50070+
50071+ parent = dentry->d_parent;
50072+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
50073+ if (retval != NULL)
50074+ goto out;
50075+
50076+ dentry = parent;
50077+ }
50078+
50079+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
50080+
50081+ /* real_root is pinned so we don't have to hold a reference */
50082+ if (retval == NULL)
50083+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
50084+out:
50085+ br_read_unlock(vfsmount_lock);
50086+ write_sequnlock(&rename_lock);
50087+
50088+ BUG_ON(retval == NULL);
50089+
50090+ return retval;
50091+}
50092+
50093+static __inline__ struct acl_object_label *
50094+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50095+ const struct acl_subject_label *subj)
50096+{
50097+ char *path = NULL;
50098+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
50099+}
50100+
50101+static __inline__ struct acl_object_label *
50102+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50103+ const struct acl_subject_label *subj)
50104+{
50105+ char *path = NULL;
50106+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
50107+}
50108+
50109+static __inline__ struct acl_object_label *
50110+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50111+ const struct acl_subject_label *subj, char *path)
50112+{
50113+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
50114+}
50115+
50116+static struct acl_subject_label *
50117+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
50118+ const struct acl_role_label *role)
50119+{
50120+ struct dentry *dentry = (struct dentry *) l_dentry;
50121+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
50122+ struct acl_subject_label *retval;
50123+ struct dentry *parent;
50124+
50125+ write_seqlock(&rename_lock);
50126+ br_read_lock(vfsmount_lock);
50127+
50128+ for (;;) {
50129+ if (dentry == real_root.dentry && mnt == real_root.mnt)
50130+ break;
50131+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
50132+ if (mnt->mnt_parent == mnt)
50133+ break;
50134+
50135+ spin_lock(&dentry->d_lock);
50136+ read_lock(&gr_inode_lock);
50137+ retval =
50138+ lookup_acl_subj_label(dentry->d_inode->i_ino,
50139+ __get_dev(dentry), role);
50140+ read_unlock(&gr_inode_lock);
50141+ spin_unlock(&dentry->d_lock);
50142+ if (retval != NULL)
50143+ goto out;
50144+
50145+ dentry = mnt->mnt_mountpoint;
50146+ mnt = mnt->mnt_parent;
50147+ continue;
50148+ }
50149+
50150+ spin_lock(&dentry->d_lock);
50151+ read_lock(&gr_inode_lock);
50152+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
50153+ __get_dev(dentry), role);
50154+ read_unlock(&gr_inode_lock);
50155+ parent = dentry->d_parent;
50156+ spin_unlock(&dentry->d_lock);
50157+
50158+ if (retval != NULL)
50159+ goto out;
50160+
50161+ dentry = parent;
50162+ }
50163+
50164+ spin_lock(&dentry->d_lock);
50165+ read_lock(&gr_inode_lock);
50166+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
50167+ __get_dev(dentry), role);
50168+ read_unlock(&gr_inode_lock);
50169+ spin_unlock(&dentry->d_lock);
50170+
50171+ if (unlikely(retval == NULL)) {
50172+ /* real_root is pinned, we don't need to hold a reference */
50173+ read_lock(&gr_inode_lock);
50174+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
50175+ __get_dev(real_root.dentry), role);
50176+ read_unlock(&gr_inode_lock);
50177+ }
50178+out:
50179+ br_read_unlock(vfsmount_lock);
50180+ write_sequnlock(&rename_lock);
50181+
50182+ BUG_ON(retval == NULL);
50183+
50184+ return retval;
50185+}
50186+
50187+static void
50188+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
50189+{
50190+ struct task_struct *task = current;
50191+ const struct cred *cred = current_cred();
50192+
50193+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
50194+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
50195+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
50196+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
50197+
50198+ return;
50199+}
50200+
50201+static void
50202+gr_log_learn_sysctl(const char *path, const __u32 mode)
50203+{
50204+ struct task_struct *task = current;
50205+ const struct cred *cred = current_cred();
50206+
50207+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
50208+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
50209+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
50210+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
50211+
50212+ return;
50213+}
50214+
50215+static void
50216+gr_log_learn_id_change(const char type, const unsigned int real,
50217+ const unsigned int effective, const unsigned int fs)
50218+{
50219+ struct task_struct *task = current;
50220+ const struct cred *cred = current_cred();
50221+
50222+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
50223+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
50224+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
50225+ type, real, effective, fs, &task->signal->saved_ip);
50226+
50227+ return;
50228+}
50229+
50230+__u32
50231+gr_search_file(const struct dentry * dentry, const __u32 mode,
50232+ const struct vfsmount * mnt)
50233+{
50234+ __u32 retval = mode;
50235+ struct acl_subject_label *curracl;
50236+ struct acl_object_label *currobj;
50237+
50238+ if (unlikely(!(gr_status & GR_READY)))
50239+ return (mode & ~GR_AUDITS);
50240+
50241+ curracl = current->acl;
50242+
50243+ currobj = chk_obj_label(dentry, mnt, curracl);
50244+ retval = currobj->mode & mode;
50245+
50246+ /* if we're opening a specified transfer file for writing
50247+ (e.g. /dev/initctl), then transfer our role to init
50248+ */
50249+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
50250+ current->role->roletype & GR_ROLE_PERSIST)) {
50251+ struct task_struct *task = init_pid_ns.child_reaper;
50252+
50253+ if (task->role != current->role) {
50254+ task->acl_sp_role = 0;
50255+ task->acl_role_id = current->acl_role_id;
50256+ task->role = current->role;
50257+ rcu_read_lock();
50258+ read_lock(&grsec_exec_file_lock);
50259+ gr_apply_subject_to_task(task);
50260+ read_unlock(&grsec_exec_file_lock);
50261+ rcu_read_unlock();
50262+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
50263+ }
50264+ }
50265+
50266+ if (unlikely
50267+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
50268+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
50269+ __u32 new_mode = mode;
50270+
50271+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
50272+
50273+ retval = new_mode;
50274+
50275+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
50276+ new_mode |= GR_INHERIT;
50277+
50278+ if (!(mode & GR_NOLEARN))
50279+ gr_log_learn(dentry, mnt, new_mode);
50280+ }
50281+
50282+ return retval;
50283+}
50284+
50285+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
50286+ const struct dentry *parent,
50287+ const struct vfsmount *mnt)
50288+{
50289+ struct name_entry *match;
50290+ struct acl_object_label *matchpo;
50291+ struct acl_subject_label *curracl;
50292+ char *path;
50293+
50294+ if (unlikely(!(gr_status & GR_READY)))
50295+ return NULL;
50296+
50297+ preempt_disable();
50298+ path = gr_to_filename_rbac(new_dentry, mnt);
50299+ match = lookup_name_entry_create(path);
50300+
50301+ curracl = current->acl;
50302+
50303+ if (match) {
50304+ read_lock(&gr_inode_lock);
50305+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
50306+ read_unlock(&gr_inode_lock);
50307+
50308+ if (matchpo) {
50309+ preempt_enable();
50310+ return matchpo;
50311+ }
50312+ }
50313+
50314+ // lookup parent
50315+
50316+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
50317+
50318+ preempt_enable();
50319+ return matchpo;
50320+}
50321+
50322+__u32
50323+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
50324+ const struct vfsmount * mnt, const __u32 mode)
50325+{
50326+ struct acl_object_label *matchpo;
50327+ __u32 retval;
50328+
50329+ if (unlikely(!(gr_status & GR_READY)))
50330+ return (mode & ~GR_AUDITS);
50331+
50332+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
50333+
50334+ retval = matchpo->mode & mode;
50335+
50336+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
50337+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
50338+ __u32 new_mode = mode;
50339+
50340+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
50341+
50342+ gr_log_learn(new_dentry, mnt, new_mode);
50343+ return new_mode;
50344+ }
50345+
50346+ return retval;
50347+}
50348+
50349+__u32
50350+gr_check_link(const struct dentry * new_dentry,
50351+ const struct dentry * parent_dentry,
50352+ const struct vfsmount * parent_mnt,
50353+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
50354+{
50355+ struct acl_object_label *obj;
50356+ __u32 oldmode, newmode;
50357+ __u32 needmode;
50358+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
50359+ GR_DELETE | GR_INHERIT;
50360+
50361+ if (unlikely(!(gr_status & GR_READY)))
50362+ return (GR_CREATE | GR_LINK);
50363+
50364+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
50365+ oldmode = obj->mode;
50366+
50367+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
50368+ newmode = obj->mode;
50369+
50370+ needmode = newmode & checkmodes;
50371+
50372+ // old name for hardlink must have at least the permissions of the new name
50373+ if ((oldmode & needmode) != needmode)
50374+ goto bad;
50375+
50376+ // if old name had restrictions/auditing, make sure the new name does as well
50377+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
50378+
50379+ // don't allow hardlinking of suid/sgid files without permission
50380+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
50381+ needmode |= GR_SETID;
50382+
50383+ if ((newmode & needmode) != needmode)
50384+ goto bad;
50385+
50386+ // enforce minimum permissions
50387+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
50388+ return newmode;
50389+bad:
50390+ needmode = oldmode;
50391+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
50392+ needmode |= GR_SETID;
50393+
50394+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
50395+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
50396+ return (GR_CREATE | GR_LINK);
50397+ } else if (newmode & GR_SUPPRESS)
50398+ return GR_SUPPRESS;
50399+ else
50400+ return 0;
50401+}
50402+
50403+int
50404+gr_check_hidden_task(const struct task_struct *task)
50405+{
50406+ if (unlikely(!(gr_status & GR_READY)))
50407+ return 0;
50408+
50409+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
50410+ return 1;
50411+
50412+ return 0;
50413+}
50414+
50415+int
50416+gr_check_protected_task(const struct task_struct *task)
50417+{
50418+ if (unlikely(!(gr_status & GR_READY) || !task))
50419+ return 0;
50420+
50421+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
50422+ task->acl != current->acl)
50423+ return 1;
50424+
50425+ return 0;
50426+}
50427+
50428+int
50429+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
50430+{
50431+ struct task_struct *p;
50432+ int ret = 0;
50433+
50434+ if (unlikely(!(gr_status & GR_READY) || !pid))
50435+ return ret;
50436+
50437+ read_lock(&tasklist_lock);
50438+ do_each_pid_task(pid, type, p) {
50439+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
50440+ p->acl != current->acl) {
50441+ ret = 1;
50442+ goto out;
50443+ }
50444+ } while_each_pid_task(pid, type, p);
50445+out:
50446+ read_unlock(&tasklist_lock);
50447+
50448+ return ret;
50449+}
50450+
50451+void
50452+gr_copy_label(struct task_struct *tsk)
50453+{
50454+ tsk->signal->used_accept = 0;
50455+ tsk->acl_sp_role = 0;
50456+ tsk->acl_role_id = current->acl_role_id;
50457+ tsk->acl = current->acl;
50458+ tsk->role = current->role;
50459+ tsk->signal->curr_ip = current->signal->curr_ip;
50460+ tsk->signal->saved_ip = current->signal->saved_ip;
50461+ if (current->exec_file)
50462+ get_file(current->exec_file);
50463+ tsk->exec_file = current->exec_file;
50464+ tsk->is_writable = current->is_writable;
50465+ if (unlikely(current->signal->used_accept)) {
50466+ current->signal->curr_ip = 0;
50467+ current->signal->saved_ip = 0;
50468+ }
50469+
50470+ return;
50471+}
50472+
50473+static void
50474+gr_set_proc_res(struct task_struct *task)
50475+{
50476+ struct acl_subject_label *proc;
50477+ unsigned short i;
50478+
50479+ proc = task->acl;
50480+
50481+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
50482+ return;
50483+
50484+ for (i = 0; i < RLIM_NLIMITS; i++) {
50485+ if (!(proc->resmask & (1 << i)))
50486+ continue;
50487+
50488+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
50489+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
50490+ }
50491+
50492+ return;
50493+}
50494+
50495+extern int __gr_process_user_ban(struct user_struct *user);
50496+
50497+int
50498+gr_check_user_change(int real, int effective, int fs)
50499+{
50500+ unsigned int i;
50501+ __u16 num;
50502+ uid_t *uidlist;
50503+ int curuid;
50504+ int realok = 0;
50505+ int effectiveok = 0;
50506+ int fsok = 0;
50507+
50508+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
50509+ struct user_struct *user;
50510+
50511+ if (real == -1)
50512+ goto skipit;
50513+
50514+ user = find_user(real);
50515+ if (user == NULL)
50516+ goto skipit;
50517+
50518+ if (__gr_process_user_ban(user)) {
50519+ /* for find_user */
50520+ free_uid(user);
50521+ return 1;
50522+ }
50523+
50524+ /* for find_user */
50525+ free_uid(user);
50526+
50527+skipit:
50528+#endif
50529+
50530+ if (unlikely(!(gr_status & GR_READY)))
50531+ return 0;
50532+
50533+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
50534+ gr_log_learn_id_change('u', real, effective, fs);
50535+
50536+ num = current->acl->user_trans_num;
50537+ uidlist = current->acl->user_transitions;
50538+
50539+ if (uidlist == NULL)
50540+ return 0;
50541+
50542+ if (real == -1)
50543+ realok = 1;
50544+ if (effective == -1)
50545+ effectiveok = 1;
50546+ if (fs == -1)
50547+ fsok = 1;
50548+
50549+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
50550+ for (i = 0; i < num; i++) {
50551+ curuid = (int)uidlist[i];
50552+ if (real == curuid)
50553+ realok = 1;
50554+ if (effective == curuid)
50555+ effectiveok = 1;
50556+ if (fs == curuid)
50557+ fsok = 1;
50558+ }
50559+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
50560+ for (i = 0; i < num; i++) {
50561+ curuid = (int)uidlist[i];
50562+ if (real == curuid)
50563+ break;
50564+ if (effective == curuid)
50565+ break;
50566+ if (fs == curuid)
50567+ break;
50568+ }
50569+ /* not in deny list */
50570+ if (i == num) {
50571+ realok = 1;
50572+ effectiveok = 1;
50573+ fsok = 1;
50574+ }
50575+ }
50576+
50577+ if (realok && effectiveok && fsok)
50578+ return 0;
50579+ else {
50580+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
50581+ return 1;
50582+ }
50583+}
50584+
50585+int
50586+gr_check_group_change(int real, int effective, int fs)
50587+{
50588+ unsigned int i;
50589+ __u16 num;
50590+ gid_t *gidlist;
50591+ int curgid;
50592+ int realok = 0;
50593+ int effectiveok = 0;
50594+ int fsok = 0;
50595+
50596+ if (unlikely(!(gr_status & GR_READY)))
50597+ return 0;
50598+
50599+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
50600+ gr_log_learn_id_change('g', real, effective, fs);
50601+
50602+ num = current->acl->group_trans_num;
50603+ gidlist = current->acl->group_transitions;
50604+
50605+ if (gidlist == NULL)
50606+ return 0;
50607+
50608+ if (real == -1)
50609+ realok = 1;
50610+ if (effective == -1)
50611+ effectiveok = 1;
50612+ if (fs == -1)
50613+ fsok = 1;
50614+
50615+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
50616+ for (i = 0; i < num; i++) {
50617+ curgid = (int)gidlist[i];
50618+ if (real == curgid)
50619+ realok = 1;
50620+ if (effective == curgid)
50621+ effectiveok = 1;
50622+ if (fs == curgid)
50623+ fsok = 1;
50624+ }
50625+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
50626+ for (i = 0; i < num; i++) {
50627+ curgid = (int)gidlist[i];
50628+ if (real == curgid)
50629+ break;
50630+ if (effective == curgid)
50631+ break;
50632+ if (fs == curgid)
50633+ break;
50634+ }
50635+ /* not in deny list */
50636+ if (i == num) {
50637+ realok = 1;
50638+ effectiveok = 1;
50639+ fsok = 1;
50640+ }
50641+ }
50642+
50643+ if (realok && effectiveok && fsok)
50644+ return 0;
50645+ else {
50646+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
50647+ return 1;
50648+ }
50649+}
50650+
50651+extern int gr_acl_is_capable(const int cap);
50652+
50653+void
50654+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
50655+{
50656+ struct acl_role_label *role = task->role;
50657+ struct acl_subject_label *subj = NULL;
50658+ struct acl_object_label *obj;
50659+ struct file *filp;
50660+
50661+ if (unlikely(!(gr_status & GR_READY)))
50662+ return;
50663+
50664+ filp = task->exec_file;
50665+
50666+ /* kernel process, we'll give them the kernel role */
50667+ if (unlikely(!filp)) {
50668+ task->role = kernel_role;
50669+ task->acl = kernel_role->root_label;
50670+ return;
50671+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
50672+ role = lookup_acl_role_label(task, uid, gid);
50673+
50674+ /* don't change the role if we're not a privileged process */
50675+ if (role && task->role != role &&
50676+ (((role->roletype & GR_ROLE_USER) && gr_acl_is_capable(CAP_SETUID)) ||
50677+ ((role->roletype & GR_ROLE_GROUP) && gr_acl_is_capable(CAP_SETGID))))
50678+ return;
50679+
50680+ /* perform subject lookup in possibly new role
50681+ we can use this result below in the case where role == task->role
50682+ */
50683+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
50684+
50685+ /* if we changed uid/gid, but result in the same role
50686+ and are using inheritance, don't lose the inherited subject
50687+ if current subject is other than what normal lookup
50688+ would result in, we arrived via inheritance, don't
50689+ lose subject
50690+ */
50691+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
50692+ (subj == task->acl)))
50693+ task->acl = subj;
50694+
50695+ task->role = role;
50696+
50697+ task->is_writable = 0;
50698+
50699+ /* ignore additional mmap checks for processes that are writable
50700+ by the default ACL */
50701+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
50702+ if (unlikely(obj->mode & GR_WRITE))
50703+ task->is_writable = 1;
50704+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
50705+ if (unlikely(obj->mode & GR_WRITE))
50706+ task->is_writable = 1;
50707+
50708+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
50709+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
50710+#endif
50711+
50712+ gr_set_proc_res(task);
50713+
50714+ return;
50715+}
50716+
50717+int
50718+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
50719+ const int unsafe_flags)
50720+{
50721+ struct task_struct *task = current;
50722+ struct acl_subject_label *newacl;
50723+ struct acl_object_label *obj;
50724+ __u32 retmode;
50725+
50726+ if (unlikely(!(gr_status & GR_READY)))
50727+ return 0;
50728+
50729+ newacl = chk_subj_label(dentry, mnt, task->role);
50730+
50731+ task_lock(task);
50732+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
50733+ !(task->role->roletype & GR_ROLE_GOD) &&
50734+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
50735+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
50736+ task_unlock(task);
50737+ if (unsafe_flags & LSM_UNSAFE_SHARE)
50738+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
50739+ else
50740+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
50741+ return -EACCES;
50742+ }
50743+ task_unlock(task);
50744+
50745+ obj = chk_obj_label(dentry, mnt, task->acl);
50746+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
50747+
50748+ if (!(task->acl->mode & GR_INHERITLEARN) &&
50749+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
50750+ if (obj->nested)
50751+ task->acl = obj->nested;
50752+ else
50753+ task->acl = newacl;
50754+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
50755+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
50756+
50757+ task->is_writable = 0;
50758+
50759+ /* ignore additional mmap checks for processes that are writable
50760+ by the default ACL */
50761+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
50762+ if (unlikely(obj->mode & GR_WRITE))
50763+ task->is_writable = 1;
50764+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
50765+ if (unlikely(obj->mode & GR_WRITE))
50766+ task->is_writable = 1;
50767+
50768+ gr_set_proc_res(task);
50769+
50770+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
50771+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
50772+#endif
50773+ return 0;
50774+}
50775+
50776+/* always called with valid inodev ptr */
50777+static void
50778+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
50779+{
50780+ struct acl_object_label *matchpo;
50781+ struct acl_subject_label *matchps;
50782+ struct acl_subject_label *subj;
50783+ struct acl_role_label *role;
50784+ unsigned int x;
50785+
50786+ FOR_EACH_ROLE_START(role)
50787+ FOR_EACH_SUBJECT_START(role, subj, x)
50788+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
50789+ matchpo->mode |= GR_DELETED;
50790+ FOR_EACH_SUBJECT_END(subj,x)
50791+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
50792+ if (subj->inode == ino && subj->device == dev)
50793+ subj->mode |= GR_DELETED;
50794+ FOR_EACH_NESTED_SUBJECT_END(subj)
50795+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
50796+ matchps->mode |= GR_DELETED;
50797+ FOR_EACH_ROLE_END(role)
50798+
50799+ inodev->nentry->deleted = 1;
50800+
50801+ return;
50802+}
50803+
50804+void
50805+gr_handle_delete(const ino_t ino, const dev_t dev)
50806+{
50807+ struct inodev_entry *inodev;
50808+
50809+ if (unlikely(!(gr_status & GR_READY)))
50810+ return;
50811+
50812+ write_lock(&gr_inode_lock);
50813+ inodev = lookup_inodev_entry(ino, dev);
50814+ if (inodev != NULL)
50815+ do_handle_delete(inodev, ino, dev);
50816+ write_unlock(&gr_inode_lock);
50817+
50818+ return;
50819+}
50820+
50821+static void
50822+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
50823+ const ino_t newinode, const dev_t newdevice,
50824+ struct acl_subject_label *subj)
50825+{
50826+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
50827+ struct acl_object_label *match;
50828+
50829+ match = subj->obj_hash[index];
50830+
50831+ while (match && (match->inode != oldinode ||
50832+ match->device != olddevice ||
50833+ !(match->mode & GR_DELETED)))
50834+ match = match->next;
50835+
50836+ if (match && (match->inode == oldinode)
50837+ && (match->device == olddevice)
50838+ && (match->mode & GR_DELETED)) {
50839+ if (match->prev == NULL) {
50840+ subj->obj_hash[index] = match->next;
50841+ if (match->next != NULL)
50842+ match->next->prev = NULL;
50843+ } else {
50844+ match->prev->next = match->next;
50845+ if (match->next != NULL)
50846+ match->next->prev = match->prev;
50847+ }
50848+ match->prev = NULL;
50849+ match->next = NULL;
50850+ match->inode = newinode;
50851+ match->device = newdevice;
50852+ match->mode &= ~GR_DELETED;
50853+
50854+ insert_acl_obj_label(match, subj);
50855+ }
50856+
50857+ return;
50858+}
50859+
50860+static void
50861+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
50862+ const ino_t newinode, const dev_t newdevice,
50863+ struct acl_role_label *role)
50864+{
50865+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
50866+ struct acl_subject_label *match;
50867+
50868+ match = role->subj_hash[index];
50869+
50870+ while (match && (match->inode != oldinode ||
50871+ match->device != olddevice ||
50872+ !(match->mode & GR_DELETED)))
50873+ match = match->next;
50874+
50875+ if (match && (match->inode == oldinode)
50876+ && (match->device == olddevice)
50877+ && (match->mode & GR_DELETED)) {
50878+ if (match->prev == NULL) {
50879+ role->subj_hash[index] = match->next;
50880+ if (match->next != NULL)
50881+ match->next->prev = NULL;
50882+ } else {
50883+ match->prev->next = match->next;
50884+ if (match->next != NULL)
50885+ match->next->prev = match->prev;
50886+ }
50887+ match->prev = NULL;
50888+ match->next = NULL;
50889+ match->inode = newinode;
50890+ match->device = newdevice;
50891+ match->mode &= ~GR_DELETED;
50892+
50893+ insert_acl_subj_label(match, role);
50894+ }
50895+
50896+ return;
50897+}
50898+
50899+static void
50900+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
50901+ const ino_t newinode, const dev_t newdevice)
50902+{
50903+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
50904+ struct inodev_entry *match;
50905+
50906+ match = inodev_set.i_hash[index];
50907+
50908+ while (match && (match->nentry->inode != oldinode ||
50909+ match->nentry->device != olddevice || !match->nentry->deleted))
50910+ match = match->next;
50911+
50912+ if (match && (match->nentry->inode == oldinode)
50913+ && (match->nentry->device == olddevice) &&
50914+ match->nentry->deleted) {
50915+ if (match->prev == NULL) {
50916+ inodev_set.i_hash[index] = match->next;
50917+ if (match->next != NULL)
50918+ match->next->prev = NULL;
50919+ } else {
50920+ match->prev->next = match->next;
50921+ if (match->next != NULL)
50922+ match->next->prev = match->prev;
50923+ }
50924+ match->prev = NULL;
50925+ match->next = NULL;
50926+ match->nentry->inode = newinode;
50927+ match->nentry->device = newdevice;
50928+ match->nentry->deleted = 0;
50929+
50930+ insert_inodev_entry(match);
50931+ }
50932+
50933+ return;
50934+}
50935+
50936+static void
50937+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
50938+{
50939+ struct acl_subject_label *subj;
50940+ struct acl_role_label *role;
50941+ unsigned int x;
50942+
50943+ FOR_EACH_ROLE_START(role)
50944+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
50945+
50946+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
50947+ if ((subj->inode == ino) && (subj->device == dev)) {
50948+ subj->inode = ino;
50949+ subj->device = dev;
50950+ }
50951+ FOR_EACH_NESTED_SUBJECT_END(subj)
50952+ FOR_EACH_SUBJECT_START(role, subj, x)
50953+ update_acl_obj_label(matchn->inode, matchn->device,
50954+ ino, dev, subj);
50955+ FOR_EACH_SUBJECT_END(subj,x)
50956+ FOR_EACH_ROLE_END(role)
50957+
50958+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
50959+
50960+ return;
50961+}
50962+
50963+static void
50964+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
50965+ const struct vfsmount *mnt)
50966+{
50967+ ino_t ino = dentry->d_inode->i_ino;
50968+ dev_t dev = __get_dev(dentry);
50969+
50970+ __do_handle_create(matchn, ino, dev);
50971+
50972+ return;
50973+}
50974+
50975+void
50976+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
50977+{
50978+ struct name_entry *matchn;
50979+
50980+ if (unlikely(!(gr_status & GR_READY)))
50981+ return;
50982+
50983+ preempt_disable();
50984+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
50985+
50986+ if (unlikely((unsigned long)matchn)) {
50987+ write_lock(&gr_inode_lock);
50988+ do_handle_create(matchn, dentry, mnt);
50989+ write_unlock(&gr_inode_lock);
50990+ }
50991+ preempt_enable();
50992+
50993+ return;
50994+}
50995+
50996+void
50997+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
50998+{
50999+ struct name_entry *matchn;
51000+
51001+ if (unlikely(!(gr_status & GR_READY)))
51002+ return;
51003+
51004+ preempt_disable();
51005+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
51006+
51007+ if (unlikely((unsigned long)matchn)) {
51008+ write_lock(&gr_inode_lock);
51009+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
51010+ write_unlock(&gr_inode_lock);
51011+ }
51012+ preempt_enable();
51013+
51014+ return;
51015+}
51016+
51017+void
51018+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
51019+ struct dentry *old_dentry,
51020+ struct dentry *new_dentry,
51021+ struct vfsmount *mnt, const __u8 replace)
51022+{
51023+ struct name_entry *matchn;
51024+ struct inodev_entry *inodev;
51025+ struct inode *inode = new_dentry->d_inode;
51026+ ino_t old_ino = old_dentry->d_inode->i_ino;
51027+ dev_t old_dev = __get_dev(old_dentry);
51028+
51029+ /* vfs_rename swaps the name and parent link for old_dentry and
51030+ new_dentry
51031+ at this point, old_dentry has the new name, parent link, and inode
51032+ for the renamed file
51033+ if a file is being replaced by a rename, new_dentry has the inode
51034+ and name for the replaced file
51035+ */
51036+
51037+ if (unlikely(!(gr_status & GR_READY)))
51038+ return;
51039+
51040+ preempt_disable();
51041+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
51042+
51043+ /* we wouldn't have to check d_inode if it weren't for
51044+ NFS silly-renaming
51045+ */
51046+
51047+ write_lock(&gr_inode_lock);
51048+ if (unlikely(replace && inode)) {
51049+ ino_t new_ino = inode->i_ino;
51050+ dev_t new_dev = __get_dev(new_dentry);
51051+
51052+ inodev = lookup_inodev_entry(new_ino, new_dev);
51053+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
51054+ do_handle_delete(inodev, new_ino, new_dev);
51055+ }
51056+
51057+ inodev = lookup_inodev_entry(old_ino, old_dev);
51058+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
51059+ do_handle_delete(inodev, old_ino, old_dev);
51060+
51061+ if (unlikely((unsigned long)matchn))
51062+ do_handle_create(matchn, old_dentry, mnt);
51063+
51064+ write_unlock(&gr_inode_lock);
51065+ preempt_enable();
51066+
51067+ return;
51068+}
51069+
51070+static int
51071+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
51072+ unsigned char **sum)
51073+{
51074+ struct acl_role_label *r;
51075+ struct role_allowed_ip *ipp;
51076+ struct role_transition *trans;
51077+ unsigned int i;
51078+ int found = 0;
51079+ u32 curr_ip = current->signal->curr_ip;
51080+
51081+ current->signal->saved_ip = curr_ip;
51082+
51083+ /* check transition table */
51084+
51085+ for (trans = current->role->transitions; trans; trans = trans->next) {
51086+ if (!strcmp(rolename, trans->rolename)) {
51087+ found = 1;
51088+ break;
51089+ }
51090+ }
51091+
51092+ if (!found)
51093+ return 0;
51094+
51095+ /* handle special roles that do not require authentication
51096+ and check ip */
51097+
51098+ FOR_EACH_ROLE_START(r)
51099+ if (!strcmp(rolename, r->rolename) &&
51100+ (r->roletype & GR_ROLE_SPECIAL)) {
51101+ found = 0;
51102+ if (r->allowed_ips != NULL) {
51103+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
51104+ if ((ntohl(curr_ip) & ipp->netmask) ==
51105+ (ntohl(ipp->addr) & ipp->netmask))
51106+ found = 1;
51107+ }
51108+ } else
51109+ found = 2;
51110+ if (!found)
51111+ return 0;
51112+
51113+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
51114+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
51115+ *salt = NULL;
51116+ *sum = NULL;
51117+ return 1;
51118+ }
51119+ }
51120+ FOR_EACH_ROLE_END(r)
51121+
51122+ for (i = 0; i < num_sprole_pws; i++) {
51123+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
51124+ *salt = acl_special_roles[i]->salt;
51125+ *sum = acl_special_roles[i]->sum;
51126+ return 1;
51127+ }
51128+ }
51129+
51130+ return 0;
51131+}
51132+
51133+static void
51134+assign_special_role(char *rolename)
51135+{
51136+ struct acl_object_label *obj;
51137+ struct acl_role_label *r;
51138+ struct acl_role_label *assigned = NULL;
51139+ struct task_struct *tsk;
51140+ struct file *filp;
51141+
51142+ FOR_EACH_ROLE_START(r)
51143+ if (!strcmp(rolename, r->rolename) &&
51144+ (r->roletype & GR_ROLE_SPECIAL)) {
51145+ assigned = r;
51146+ break;
51147+ }
51148+ FOR_EACH_ROLE_END(r)
51149+
51150+ if (!assigned)
51151+ return;
51152+
51153+ read_lock(&tasklist_lock);
51154+ read_lock(&grsec_exec_file_lock);
51155+
51156+ tsk = current->real_parent;
51157+ if (tsk == NULL)
51158+ goto out_unlock;
51159+
51160+ filp = tsk->exec_file;
51161+ if (filp == NULL)
51162+ goto out_unlock;
51163+
51164+ tsk->is_writable = 0;
51165+
51166+ tsk->acl_sp_role = 1;
51167+ tsk->acl_role_id = ++acl_sp_role_value;
51168+ tsk->role = assigned;
51169+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
51170+
51171+ /* ignore additional mmap checks for processes that are writable
51172+ by the default ACL */
51173+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
51174+ if (unlikely(obj->mode & GR_WRITE))
51175+ tsk->is_writable = 1;
51176+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
51177+ if (unlikely(obj->mode & GR_WRITE))
51178+ tsk->is_writable = 1;
51179+
51180+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51181+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
51182+#endif
51183+
51184+out_unlock:
51185+ read_unlock(&grsec_exec_file_lock);
51186+ read_unlock(&tasklist_lock);
51187+ return;
51188+}
51189+
51190+int gr_check_secure_terminal(struct task_struct *task)
51191+{
51192+ struct task_struct *p, *p2, *p3;
51193+ struct files_struct *files;
51194+ struct fdtable *fdt;
51195+ struct file *our_file = NULL, *file;
51196+ int i;
51197+
51198+ if (task->signal->tty == NULL)
51199+ return 1;
51200+
51201+ files = get_files_struct(task);
51202+ if (files != NULL) {
51203+ rcu_read_lock();
51204+ fdt = files_fdtable(files);
51205+ for (i=0; i < fdt->max_fds; i++) {
51206+ file = fcheck_files(files, i);
51207+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
51208+ get_file(file);
51209+ our_file = file;
51210+ }
51211+ }
51212+ rcu_read_unlock();
51213+ put_files_struct(files);
51214+ }
51215+
51216+ if (our_file == NULL)
51217+ return 1;
51218+
51219+ read_lock(&tasklist_lock);
51220+ do_each_thread(p2, p) {
51221+ files = get_files_struct(p);
51222+ if (files == NULL ||
51223+ (p->signal && p->signal->tty == task->signal->tty)) {
51224+ if (files != NULL)
51225+ put_files_struct(files);
51226+ continue;
51227+ }
51228+ rcu_read_lock();
51229+ fdt = files_fdtable(files);
51230+ for (i=0; i < fdt->max_fds; i++) {
51231+ file = fcheck_files(files, i);
51232+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
51233+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
51234+ p3 = task;
51235+ while (p3->pid > 0) {
51236+ if (p3 == p)
51237+ break;
51238+ p3 = p3->real_parent;
51239+ }
51240+ if (p3 == p)
51241+ break;
51242+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
51243+ gr_handle_alertkill(p);
51244+ rcu_read_unlock();
51245+ put_files_struct(files);
51246+ read_unlock(&tasklist_lock);
51247+ fput(our_file);
51248+ return 0;
51249+ }
51250+ }
51251+ rcu_read_unlock();
51252+ put_files_struct(files);
51253+ } while_each_thread(p2, p);
51254+ read_unlock(&tasklist_lock);
51255+
51256+ fput(our_file);
51257+ return 1;
51258+}
51259+
51260+ssize_t
51261+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
51262+{
51263+ struct gr_arg_wrapper uwrap;
51264+ unsigned char *sprole_salt = NULL;
51265+ unsigned char *sprole_sum = NULL;
51266+ int error = sizeof (struct gr_arg_wrapper);
51267+ int error2 = 0;
51268+
51269+ mutex_lock(&gr_dev_mutex);
51270+
51271+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
51272+ error = -EPERM;
51273+ goto out;
51274+ }
51275+
51276+ if (count != sizeof (struct gr_arg_wrapper)) {
51277+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
51278+ error = -EINVAL;
51279+ goto out;
51280+ }
51281+
51282+
51283+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
51284+ gr_auth_expires = 0;
51285+ gr_auth_attempts = 0;
51286+ }
51287+
51288+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
51289+ error = -EFAULT;
51290+ goto out;
51291+ }
51292+
51293+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
51294+ error = -EINVAL;
51295+ goto out;
51296+ }
51297+
51298+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
51299+ error = -EFAULT;
51300+ goto out;
51301+ }
51302+
51303+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
51304+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
51305+ time_after(gr_auth_expires, get_seconds())) {
51306+ error = -EBUSY;
51307+ goto out;
51308+ }
51309+
51310+ /* if non-root trying to do anything other than use a special role,
51311+ do not attempt authentication, do not count towards authentication
51312+ locking
51313+ */
51314+
51315+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
51316+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
51317+ current_uid()) {
51318+ error = -EPERM;
51319+ goto out;
51320+ }
51321+
51322+ /* ensure pw and special role name are null terminated */
51323+
51324+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
51325+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
51326+
51327+ /* Okay.
51328+ * We have our enough of the argument structure..(we have yet
51329+ * to copy_from_user the tables themselves) . Copy the tables
51330+ * only if we need them, i.e. for loading operations. */
51331+
51332+ switch (gr_usermode->mode) {
51333+ case GR_STATUS:
51334+ if (gr_status & GR_READY) {
51335+ error = 1;
51336+ if (!gr_check_secure_terminal(current))
51337+ error = 3;
51338+ } else
51339+ error = 2;
51340+ goto out;
51341+ case GR_SHUTDOWN:
51342+ if ((gr_status & GR_READY)
51343+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
51344+ pax_open_kernel();
51345+ gr_status &= ~GR_READY;
51346+ pax_close_kernel();
51347+
51348+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
51349+ free_variables();
51350+ memset(gr_usermode, 0, sizeof (struct gr_arg));
51351+ memset(gr_system_salt, 0, GR_SALT_LEN);
51352+ memset(gr_system_sum, 0, GR_SHA_LEN);
51353+ } else if (gr_status & GR_READY) {
51354+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
51355+ error = -EPERM;
51356+ } else {
51357+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
51358+ error = -EAGAIN;
51359+ }
51360+ break;
51361+ case GR_ENABLE:
51362+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
51363+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
51364+ else {
51365+ if (gr_status & GR_READY)
51366+ error = -EAGAIN;
51367+ else
51368+ error = error2;
51369+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
51370+ }
51371+ break;
51372+ case GR_RELOAD:
51373+ if (!(gr_status & GR_READY)) {
51374+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
51375+ error = -EAGAIN;
51376+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
51377+ preempt_disable();
51378+
51379+ pax_open_kernel();
51380+ gr_status &= ~GR_READY;
51381+ pax_close_kernel();
51382+
51383+ free_variables();
51384+ if (!(error2 = gracl_init(gr_usermode))) {
51385+ preempt_enable();
51386+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
51387+ } else {
51388+ preempt_enable();
51389+ error = error2;
51390+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
51391+ }
51392+ } else {
51393+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
51394+ error = -EPERM;
51395+ }
51396+ break;
51397+ case GR_SEGVMOD:
51398+ if (unlikely(!(gr_status & GR_READY))) {
51399+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
51400+ error = -EAGAIN;
51401+ break;
51402+ }
51403+
51404+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
51405+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
51406+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
51407+ struct acl_subject_label *segvacl;
51408+ segvacl =
51409+ lookup_acl_subj_label(gr_usermode->segv_inode,
51410+ gr_usermode->segv_device,
51411+ current->role);
51412+ if (segvacl) {
51413+ segvacl->crashes = 0;
51414+ segvacl->expires = 0;
51415+ }
51416+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
51417+ gr_remove_uid(gr_usermode->segv_uid);
51418+ }
51419+ } else {
51420+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
51421+ error = -EPERM;
51422+ }
51423+ break;
51424+ case GR_SPROLE:
51425+ case GR_SPROLEPAM:
51426+ if (unlikely(!(gr_status & GR_READY))) {
51427+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
51428+ error = -EAGAIN;
51429+ break;
51430+ }
51431+
51432+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
51433+ current->role->expires = 0;
51434+ current->role->auth_attempts = 0;
51435+ }
51436+
51437+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
51438+ time_after(current->role->expires, get_seconds())) {
51439+ error = -EBUSY;
51440+ goto out;
51441+ }
51442+
51443+ if (lookup_special_role_auth
51444+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
51445+ && ((!sprole_salt && !sprole_sum)
51446+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
51447+ char *p = "";
51448+ assign_special_role(gr_usermode->sp_role);
51449+ read_lock(&tasklist_lock);
51450+ if (current->real_parent)
51451+ p = current->real_parent->role->rolename;
51452+ read_unlock(&tasklist_lock);
51453+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
51454+ p, acl_sp_role_value);
51455+ } else {
51456+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
51457+ error = -EPERM;
51458+ if(!(current->role->auth_attempts++))
51459+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
51460+
51461+ goto out;
51462+ }
51463+ break;
51464+ case GR_UNSPROLE:
51465+ if (unlikely(!(gr_status & GR_READY))) {
51466+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
51467+ error = -EAGAIN;
51468+ break;
51469+ }
51470+
51471+ if (current->role->roletype & GR_ROLE_SPECIAL) {
51472+ char *p = "";
51473+ int i = 0;
51474+
51475+ read_lock(&tasklist_lock);
51476+ if (current->real_parent) {
51477+ p = current->real_parent->role->rolename;
51478+ i = current->real_parent->acl_role_id;
51479+ }
51480+ read_unlock(&tasklist_lock);
51481+
51482+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
51483+ gr_set_acls(1);
51484+ } else {
51485+ error = -EPERM;
51486+ goto out;
51487+ }
51488+ break;
51489+ default:
51490+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
51491+ error = -EINVAL;
51492+ break;
51493+ }
51494+
51495+ if (error != -EPERM)
51496+ goto out;
51497+
51498+ if(!(gr_auth_attempts++))
51499+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
51500+
51501+ out:
51502+ mutex_unlock(&gr_dev_mutex);
51503+ return error;
51504+}
51505+
51506+/* must be called with
51507+ rcu_read_lock();
51508+ read_lock(&tasklist_lock);
51509+ read_lock(&grsec_exec_file_lock);
51510+*/
51511+int gr_apply_subject_to_task(struct task_struct *task)
51512+{
51513+ struct acl_object_label *obj;
51514+ char *tmpname;
51515+ struct acl_subject_label *tmpsubj;
51516+ struct file *filp;
51517+ struct name_entry *nmatch;
51518+
51519+ filp = task->exec_file;
51520+ if (filp == NULL)
51521+ return 0;
51522+
51523+ /* the following is to apply the correct subject
51524+ on binaries running when the RBAC system
51525+ is enabled, when the binaries have been
51526+ replaced or deleted since their execution
51527+ -----
51528+ when the RBAC system starts, the inode/dev
51529+ from exec_file will be one the RBAC system
51530+ is unaware of. It only knows the inode/dev
51531+ of the present file on disk, or the absence
51532+ of it.
51533+ */
51534+ preempt_disable();
51535+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
51536+
51537+ nmatch = lookup_name_entry(tmpname);
51538+ preempt_enable();
51539+ tmpsubj = NULL;
51540+ if (nmatch) {
51541+ if (nmatch->deleted)
51542+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
51543+ else
51544+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
51545+ if (tmpsubj != NULL)
51546+ task->acl = tmpsubj;
51547+ }
51548+ if (tmpsubj == NULL)
51549+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
51550+ task->role);
51551+ if (task->acl) {
51552+ task->is_writable = 0;
51553+ /* ignore additional mmap checks for processes that are writable
51554+ by the default ACL */
51555+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
51556+ if (unlikely(obj->mode & GR_WRITE))
51557+ task->is_writable = 1;
51558+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
51559+ if (unlikely(obj->mode & GR_WRITE))
51560+ task->is_writable = 1;
51561+
51562+ gr_set_proc_res(task);
51563+
51564+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51565+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
51566+#endif
51567+ } else {
51568+ return 1;
51569+ }
51570+
51571+ return 0;
51572+}
51573+
51574+int
51575+gr_set_acls(const int type)
51576+{
51577+ struct task_struct *task, *task2;
51578+ struct acl_role_label *role = current->role;
51579+ __u16 acl_role_id = current->acl_role_id;
51580+ const struct cred *cred;
51581+ int ret;
51582+
51583+ rcu_read_lock();
51584+ read_lock(&tasklist_lock);
51585+ read_lock(&grsec_exec_file_lock);
51586+ do_each_thread(task2, task) {
51587+ /* check to see if we're called from the exit handler,
51588+ if so, only replace ACLs that have inherited the admin
51589+ ACL */
51590+
51591+ if (type && (task->role != role ||
51592+ task->acl_role_id != acl_role_id))
51593+ continue;
51594+
51595+ task->acl_role_id = 0;
51596+ task->acl_sp_role = 0;
51597+
51598+ if (task->exec_file) {
51599+ cred = __task_cred(task);
51600+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
51601+ ret = gr_apply_subject_to_task(task);
51602+ if (ret) {
51603+ read_unlock(&grsec_exec_file_lock);
51604+ read_unlock(&tasklist_lock);
51605+ rcu_read_unlock();
51606+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
51607+ return ret;
51608+ }
51609+ } else {
51610+ // it's a kernel process
51611+ task->role = kernel_role;
51612+ task->acl = kernel_role->root_label;
51613+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
51614+ task->acl->mode &= ~GR_PROCFIND;
51615+#endif
51616+ }
51617+ } while_each_thread(task2, task);
51618+ read_unlock(&grsec_exec_file_lock);
51619+ read_unlock(&tasklist_lock);
51620+ rcu_read_unlock();
51621+
51622+ return 0;
51623+}
51624+
51625+void
51626+gr_learn_resource(const struct task_struct *task,
51627+ const int res, const unsigned long wanted, const int gt)
51628+{
51629+ struct acl_subject_label *acl;
51630+ const struct cred *cred;
51631+
51632+ if (unlikely((gr_status & GR_READY) &&
51633+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
51634+ goto skip_reslog;
51635+
51636+#ifdef CONFIG_GRKERNSEC_RESLOG
51637+ gr_log_resource(task, res, wanted, gt);
51638+#endif
51639+ skip_reslog:
51640+
51641+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
51642+ return;
51643+
51644+ acl = task->acl;
51645+
51646+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
51647+ !(acl->resmask & (1 << (unsigned short) res))))
51648+ return;
51649+
51650+ if (wanted >= acl->res[res].rlim_cur) {
51651+ unsigned long res_add;
51652+
51653+ res_add = wanted;
51654+ switch (res) {
51655+ case RLIMIT_CPU:
51656+ res_add += GR_RLIM_CPU_BUMP;
51657+ break;
51658+ case RLIMIT_FSIZE:
51659+ res_add += GR_RLIM_FSIZE_BUMP;
51660+ break;
51661+ case RLIMIT_DATA:
51662+ res_add += GR_RLIM_DATA_BUMP;
51663+ break;
51664+ case RLIMIT_STACK:
51665+ res_add += GR_RLIM_STACK_BUMP;
51666+ break;
51667+ case RLIMIT_CORE:
51668+ res_add += GR_RLIM_CORE_BUMP;
51669+ break;
51670+ case RLIMIT_RSS:
51671+ res_add += GR_RLIM_RSS_BUMP;
51672+ break;
51673+ case RLIMIT_NPROC:
51674+ res_add += GR_RLIM_NPROC_BUMP;
51675+ break;
51676+ case RLIMIT_NOFILE:
51677+ res_add += GR_RLIM_NOFILE_BUMP;
51678+ break;
51679+ case RLIMIT_MEMLOCK:
51680+ res_add += GR_RLIM_MEMLOCK_BUMP;
51681+ break;
51682+ case RLIMIT_AS:
51683+ res_add += GR_RLIM_AS_BUMP;
51684+ break;
51685+ case RLIMIT_LOCKS:
51686+ res_add += GR_RLIM_LOCKS_BUMP;
51687+ break;
51688+ case RLIMIT_SIGPENDING:
51689+ res_add += GR_RLIM_SIGPENDING_BUMP;
51690+ break;
51691+ case RLIMIT_MSGQUEUE:
51692+ res_add += GR_RLIM_MSGQUEUE_BUMP;
51693+ break;
51694+ case RLIMIT_NICE:
51695+ res_add += GR_RLIM_NICE_BUMP;
51696+ break;
51697+ case RLIMIT_RTPRIO:
51698+ res_add += GR_RLIM_RTPRIO_BUMP;
51699+ break;
51700+ case RLIMIT_RTTIME:
51701+ res_add += GR_RLIM_RTTIME_BUMP;
51702+ break;
51703+ }
51704+
51705+ acl->res[res].rlim_cur = res_add;
51706+
51707+ if (wanted > acl->res[res].rlim_max)
51708+ acl->res[res].rlim_max = res_add;
51709+
51710+ /* only log the subject filename, since resource logging is supported for
51711+ single-subject learning only */
51712+ rcu_read_lock();
51713+ cred = __task_cred(task);
51714+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
51715+ task->role->roletype, cred->uid, cred->gid, acl->filename,
51716+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
51717+ "", (unsigned long) res, &task->signal->saved_ip);
51718+ rcu_read_unlock();
51719+ }
51720+
51721+ return;
51722+}
51723+
51724+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
51725+void
51726+pax_set_initial_flags(struct linux_binprm *bprm)
51727+{
51728+ struct task_struct *task = current;
51729+ struct acl_subject_label *proc;
51730+ unsigned long flags;
51731+
51732+ if (unlikely(!(gr_status & GR_READY)))
51733+ return;
51734+
51735+ flags = pax_get_flags(task);
51736+
51737+ proc = task->acl;
51738+
51739+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
51740+ flags &= ~MF_PAX_PAGEEXEC;
51741+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
51742+ flags &= ~MF_PAX_SEGMEXEC;
51743+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
51744+ flags &= ~MF_PAX_RANDMMAP;
51745+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
51746+ flags &= ~MF_PAX_EMUTRAMP;
51747+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
51748+ flags &= ~MF_PAX_MPROTECT;
51749+
51750+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
51751+ flags |= MF_PAX_PAGEEXEC;
51752+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
51753+ flags |= MF_PAX_SEGMEXEC;
51754+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
51755+ flags |= MF_PAX_RANDMMAP;
51756+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
51757+ flags |= MF_PAX_EMUTRAMP;
51758+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
51759+ flags |= MF_PAX_MPROTECT;
51760+
51761+ pax_set_flags(task, flags);
51762+
51763+ return;
51764+}
51765+#endif
51766+
51767+#ifdef CONFIG_SYSCTL
51768+/* Eric Biederman likes breaking userland ABI and every inode-based security
51769+ system to save 35kb of memory */
51770+
51771+/* we modify the passed in filename, but adjust it back before returning */
51772+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
51773+{
51774+ struct name_entry *nmatch;
51775+ char *p, *lastp = NULL;
51776+ struct acl_object_label *obj = NULL, *tmp;
51777+ struct acl_subject_label *tmpsubj;
51778+ char c = '\0';
51779+
51780+ read_lock(&gr_inode_lock);
51781+
51782+ p = name + len - 1;
51783+ do {
51784+ nmatch = lookup_name_entry(name);
51785+ if (lastp != NULL)
51786+ *lastp = c;
51787+
51788+ if (nmatch == NULL)
51789+ goto next_component;
51790+ tmpsubj = current->acl;
51791+ do {
51792+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
51793+ if (obj != NULL) {
51794+ tmp = obj->globbed;
51795+ while (tmp) {
51796+ if (!glob_match(tmp->filename, name)) {
51797+ obj = tmp;
51798+ goto found_obj;
51799+ }
51800+ tmp = tmp->next;
51801+ }
51802+ goto found_obj;
51803+ }
51804+ } while ((tmpsubj = tmpsubj->parent_subject));
51805+next_component:
51806+ /* end case */
51807+ if (p == name)
51808+ break;
51809+
51810+ while (*p != '/')
51811+ p--;
51812+ if (p == name)
51813+ lastp = p + 1;
51814+ else {
51815+ lastp = p;
51816+ p--;
51817+ }
51818+ c = *lastp;
51819+ *lastp = '\0';
51820+ } while (1);
51821+found_obj:
51822+ read_unlock(&gr_inode_lock);
51823+ /* obj returned will always be non-null */
51824+ return obj;
51825+}
51826+
51827+/* returns 0 when allowing, non-zero on error
51828+ op of 0 is used for readdir, so we don't log the names of hidden files
51829+*/
51830+__u32
51831+gr_handle_sysctl(const struct ctl_table *table, const int op)
51832+{
51833+ struct ctl_table *tmp;
51834+ const char *proc_sys = "/proc/sys";
51835+ char *path;
51836+ struct acl_object_label *obj;
51837+ unsigned short len = 0, pos = 0, depth = 0, i;
51838+ __u32 err = 0;
51839+ __u32 mode = 0;
51840+
51841+ if (unlikely(!(gr_status & GR_READY)))
51842+ return 0;
51843+
51844+ /* for now, ignore operations on non-sysctl entries if it's not a
51845+ readdir*/
51846+ if (table->child != NULL && op != 0)
51847+ return 0;
51848+
51849+ mode |= GR_FIND;
51850+ /* it's only a read if it's an entry, read on dirs is for readdir */
51851+ if (op & MAY_READ)
51852+ mode |= GR_READ;
51853+ if (op & MAY_WRITE)
51854+ mode |= GR_WRITE;
51855+
51856+ preempt_disable();
51857+
51858+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
51859+
51860+ /* it's only a read/write if it's an actual entry, not a dir
51861+ (which are opened for readdir)
51862+ */
51863+
51864+ /* convert the requested sysctl entry into a pathname */
51865+
51866+ for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
51867+ len += strlen(tmp->procname);
51868+ len++;
51869+ depth++;
51870+ }
51871+
51872+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
51873+ /* deny */
51874+ goto out;
51875+ }
51876+
51877+ memset(path, 0, PAGE_SIZE);
51878+
51879+ memcpy(path, proc_sys, strlen(proc_sys));
51880+
51881+ pos += strlen(proc_sys);
51882+
51883+ for (; depth > 0; depth--) {
51884+ path[pos] = '/';
51885+ pos++;
51886+ for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
51887+ if (depth == i) {
51888+ memcpy(path + pos, tmp->procname,
51889+ strlen(tmp->procname));
51890+ pos += strlen(tmp->procname);
51891+ }
51892+ i++;
51893+ }
51894+ }
51895+
51896+ obj = gr_lookup_by_name(path, pos);
51897+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
51898+
51899+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
51900+ ((err & mode) != mode))) {
51901+ __u32 new_mode = mode;
51902+
51903+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
51904+
51905+ err = 0;
51906+ gr_log_learn_sysctl(path, new_mode);
51907+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
51908+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
51909+ err = -ENOENT;
51910+ } else if (!(err & GR_FIND)) {
51911+ err = -ENOENT;
51912+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
51913+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
51914+ path, (mode & GR_READ) ? " reading" : "",
51915+ (mode & GR_WRITE) ? " writing" : "");
51916+ err = -EACCES;
51917+ } else if ((err & mode) != mode) {
51918+ err = -EACCES;
51919+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
51920+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
51921+ path, (mode & GR_READ) ? " reading" : "",
51922+ (mode & GR_WRITE) ? " writing" : "");
51923+ err = 0;
51924+ } else
51925+ err = 0;
51926+
51927+ out:
51928+ preempt_enable();
51929+
51930+ return err;
51931+}
51932+#endif
51933+
51934+int
51935+gr_handle_proc_ptrace(struct task_struct *task)
51936+{
51937+ struct file *filp;
51938+ struct task_struct *tmp = task;
51939+ struct task_struct *curtemp = current;
51940+ __u32 retmode;
51941+
51942+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
51943+ if (unlikely(!(gr_status & GR_READY)))
51944+ return 0;
51945+#endif
51946+
51947+ read_lock(&tasklist_lock);
51948+ read_lock(&grsec_exec_file_lock);
51949+ filp = task->exec_file;
51950+
51951+ while (tmp->pid > 0) {
51952+ if (tmp == curtemp)
51953+ break;
51954+ tmp = tmp->real_parent;
51955+ }
51956+
51957+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
51958+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
51959+ read_unlock(&grsec_exec_file_lock);
51960+ read_unlock(&tasklist_lock);
51961+ return 1;
51962+ }
51963+
51964+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
51965+ if (!(gr_status & GR_READY)) {
51966+ read_unlock(&grsec_exec_file_lock);
51967+ read_unlock(&tasklist_lock);
51968+ return 0;
51969+ }
51970+#endif
51971+
51972+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
51973+ read_unlock(&grsec_exec_file_lock);
51974+ read_unlock(&tasklist_lock);
51975+
51976+ if (retmode & GR_NOPTRACE)
51977+ return 1;
51978+
51979+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
51980+ && (current->acl != task->acl || (current->acl != current->role->root_label
51981+ && current->pid != task->pid)))
51982+ return 1;
51983+
51984+ return 0;
51985+}
51986+
51987+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
51988+{
51989+ if (unlikely(!(gr_status & GR_READY)))
51990+ return;
51991+
51992+ if (!(current->role->roletype & GR_ROLE_GOD))
51993+ return;
51994+
51995+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
51996+ p->role->rolename, gr_task_roletype_to_char(p),
51997+ p->acl->filename);
51998+}
51999+
52000+int
52001+gr_handle_ptrace(struct task_struct *task, const long request)
52002+{
52003+ struct task_struct *tmp = task;
52004+ struct task_struct *curtemp = current;
52005+ __u32 retmode;
52006+
52007+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
52008+ if (unlikely(!(gr_status & GR_READY)))
52009+ return 0;
52010+#endif
52011+
52012+ read_lock(&tasklist_lock);
52013+ while (tmp->pid > 0) {
52014+ if (tmp == curtemp)
52015+ break;
52016+ tmp = tmp->real_parent;
52017+ }
52018+
52019+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
52020+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
52021+ read_unlock(&tasklist_lock);
52022+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
52023+ return 1;
52024+ }
52025+ read_unlock(&tasklist_lock);
52026+
52027+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
52028+ if (!(gr_status & GR_READY))
52029+ return 0;
52030+#endif
52031+
52032+ read_lock(&grsec_exec_file_lock);
52033+ if (unlikely(!task->exec_file)) {
52034+ read_unlock(&grsec_exec_file_lock);
52035+ return 0;
52036+ }
52037+
52038+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
52039+ read_unlock(&grsec_exec_file_lock);
52040+
52041+ if (retmode & GR_NOPTRACE) {
52042+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
52043+ return 1;
52044+ }
52045+
52046+ if (retmode & GR_PTRACERD) {
52047+ switch (request) {
52048+ case PTRACE_SEIZE:
52049+ case PTRACE_POKETEXT:
52050+ case PTRACE_POKEDATA:
52051+ case PTRACE_POKEUSR:
52052+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
52053+ case PTRACE_SETREGS:
52054+ case PTRACE_SETFPREGS:
52055+#endif
52056+#ifdef CONFIG_X86
52057+ case PTRACE_SETFPXREGS:
52058+#endif
52059+#ifdef CONFIG_ALTIVEC
52060+ case PTRACE_SETVRREGS:
52061+#endif
52062+ return 1;
52063+ default:
52064+ return 0;
52065+ }
52066+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
52067+ !(current->role->roletype & GR_ROLE_GOD) &&
52068+ (current->acl != task->acl)) {
52069+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
52070+ return 1;
52071+ }
52072+
52073+ return 0;
52074+}
52075+
52076+static int is_writable_mmap(const struct file *filp)
52077+{
52078+ struct task_struct *task = current;
52079+ struct acl_object_label *obj, *obj2;
52080+
52081+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
52082+ !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))) {
52083+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
52084+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
52085+ task->role->root_label);
52086+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
52087+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
52088+ return 1;
52089+ }
52090+ }
52091+ return 0;
52092+}
52093+
52094+int
52095+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
52096+{
52097+ __u32 mode;
52098+
52099+ if (unlikely(!file || !(prot & PROT_EXEC)))
52100+ return 1;
52101+
52102+ if (is_writable_mmap(file))
52103+ return 0;
52104+
52105+ mode =
52106+ gr_search_file(file->f_path.dentry,
52107+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
52108+ file->f_path.mnt);
52109+
52110+ if (!gr_tpe_allow(file))
52111+ return 0;
52112+
52113+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
52114+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
52115+ return 0;
52116+ } else if (unlikely(!(mode & GR_EXEC))) {
52117+ return 0;
52118+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
52119+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
52120+ return 1;
52121+ }
52122+
52123+ return 1;
52124+}
52125+
52126+int
52127+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
52128+{
52129+ __u32 mode;
52130+
52131+ if (unlikely(!file || !(prot & PROT_EXEC)))
52132+ return 1;
52133+
52134+ if (is_writable_mmap(file))
52135+ return 0;
52136+
52137+ mode =
52138+ gr_search_file(file->f_path.dentry,
52139+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
52140+ file->f_path.mnt);
52141+
52142+ if (!gr_tpe_allow(file))
52143+ return 0;
52144+
52145+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
52146+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
52147+ return 0;
52148+ } else if (unlikely(!(mode & GR_EXEC))) {
52149+ return 0;
52150+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
52151+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
52152+ return 1;
52153+ }
52154+
52155+ return 1;
52156+}
52157+
52158+void
52159+gr_acl_handle_psacct(struct task_struct *task, const long code)
52160+{
52161+ unsigned long runtime;
52162+ unsigned long cputime;
52163+ unsigned int wday, cday;
52164+ __u8 whr, chr;
52165+ __u8 wmin, cmin;
52166+ __u8 wsec, csec;
52167+ struct timespec timeval;
52168+
52169+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
52170+ !(task->acl->mode & GR_PROCACCT)))
52171+ return;
52172+
52173+ do_posix_clock_monotonic_gettime(&timeval);
52174+ runtime = timeval.tv_sec - task->start_time.tv_sec;
52175+ wday = runtime / (3600 * 24);
52176+ runtime -= wday * (3600 * 24);
52177+ whr = runtime / 3600;
52178+ runtime -= whr * 3600;
52179+ wmin = runtime / 60;
52180+ runtime -= wmin * 60;
52181+ wsec = runtime;
52182+
52183+ cputime = (task->utime + task->stime) / HZ;
52184+ cday = cputime / (3600 * 24);
52185+ cputime -= cday * (3600 * 24);
52186+ chr = cputime / 3600;
52187+ cputime -= chr * 3600;
52188+ cmin = cputime / 60;
52189+ cputime -= cmin * 60;
52190+ csec = cputime;
52191+
52192+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
52193+
52194+ return;
52195+}
52196+
52197+void gr_set_kernel_label(struct task_struct *task)
52198+{
52199+ if (gr_status & GR_READY) {
52200+ task->role = kernel_role;
52201+ task->acl = kernel_role->root_label;
52202+ }
52203+ return;
52204+}
52205+
52206+#ifdef CONFIG_TASKSTATS
52207+int gr_is_taskstats_denied(int pid)
52208+{
52209+ struct task_struct *task;
52210+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
52211+ const struct cred *cred;
52212+#endif
52213+ int ret = 0;
52214+
52215+ /* restrict taskstats viewing to un-chrooted root users
52216+ who have the 'view' subject flag if the RBAC system is enabled
52217+ */
52218+
52219+ rcu_read_lock();
52220+ read_lock(&tasklist_lock);
52221+ task = find_task_by_vpid(pid);
52222+ if (task) {
52223+#ifdef CONFIG_GRKERNSEC_CHROOT
52224+ if (proc_is_chrooted(task))
52225+ ret = -EACCES;
52226+#endif
52227+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
52228+ cred = __task_cred(task);
52229+#ifdef CONFIG_GRKERNSEC_PROC_USER
52230+ if (cred->uid != 0)
52231+ ret = -EACCES;
52232+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
52233+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
52234+ ret = -EACCES;
52235+#endif
52236+#endif
52237+ if (gr_status & GR_READY) {
52238+ if (!(task->acl->mode & GR_VIEW))
52239+ ret = -EACCES;
52240+ }
52241+ } else
52242+ ret = -ENOENT;
52243+
52244+ read_unlock(&tasklist_lock);
52245+ rcu_read_unlock();
52246+
52247+ return ret;
52248+}
52249+#endif
52250+
52251+/* AUXV entries are filled via a descendant of search_binary_handler
52252+ after we've already applied the subject for the target
52253+*/
52254+int gr_acl_enable_at_secure(void)
52255+{
52256+ if (unlikely(!(gr_status & GR_READY)))
52257+ return 0;
52258+
52259+ if (current->acl->mode & GR_ATSECURE)
52260+ return 1;
52261+
52262+ return 0;
52263+}
52264+
52265+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
52266+{
52267+ struct task_struct *task = current;
52268+ struct dentry *dentry = file->f_path.dentry;
52269+ struct vfsmount *mnt = file->f_path.mnt;
52270+ struct acl_object_label *obj, *tmp;
52271+ struct acl_subject_label *subj;
52272+ unsigned int bufsize;
52273+ int is_not_root;
52274+ char *path;
52275+ dev_t dev = __get_dev(dentry);
52276+
52277+ if (unlikely(!(gr_status & GR_READY)))
52278+ return 1;
52279+
52280+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
52281+ return 1;
52282+
52283+ /* ignore Eric Biederman */
52284+ if (IS_PRIVATE(dentry->d_inode))
52285+ return 1;
52286+
52287+ subj = task->acl;
52288+ do {
52289+ obj = lookup_acl_obj_label(ino, dev, subj);
52290+ if (obj != NULL)
52291+ return (obj->mode & GR_FIND) ? 1 : 0;
52292+ } while ((subj = subj->parent_subject));
52293+
52294+ /* this is purely an optimization since we're looking for an object
52295+ for the directory we're doing a readdir on
52296+ if it's possible for any globbed object to match the entry we're
52297+ filling into the directory, then the object we find here will be
52298+ an anchor point with attached globbed objects
52299+ */
52300+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
52301+ if (obj->globbed == NULL)
52302+ return (obj->mode & GR_FIND) ? 1 : 0;
52303+
52304+ is_not_root = ((obj->filename[0] == '/') &&
52305+ (obj->filename[1] == '\0')) ? 0 : 1;
52306+ bufsize = PAGE_SIZE - namelen - is_not_root;
52307+
52308+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
52309+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
52310+ return 1;
52311+
52312+ preempt_disable();
52313+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
52314+ bufsize);
52315+
52316+ bufsize = strlen(path);
52317+
52318+ /* if base is "/", don't append an additional slash */
52319+ if (is_not_root)
52320+ *(path + bufsize) = '/';
52321+ memcpy(path + bufsize + is_not_root, name, namelen);
52322+ *(path + bufsize + namelen + is_not_root) = '\0';
52323+
52324+ tmp = obj->globbed;
52325+ while (tmp) {
52326+ if (!glob_match(tmp->filename, path)) {
52327+ preempt_enable();
52328+ return (tmp->mode & GR_FIND) ? 1 : 0;
52329+ }
52330+ tmp = tmp->next;
52331+ }
52332+ preempt_enable();
52333+ return (obj->mode & GR_FIND) ? 1 : 0;
52334+}
52335+
52336+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
52337+EXPORT_SYMBOL(gr_acl_is_enabled);
52338+#endif
52339+EXPORT_SYMBOL(gr_learn_resource);
52340+EXPORT_SYMBOL(gr_set_kernel_label);
52341+#ifdef CONFIG_SECURITY
52342+EXPORT_SYMBOL(gr_check_user_change);
52343+EXPORT_SYMBOL(gr_check_group_change);
52344+#endif
52345+
52346diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
52347new file mode 100644
52348index 0000000..34fefda
52349--- /dev/null
52350+++ b/grsecurity/gracl_alloc.c
52351@@ -0,0 +1,105 @@
52352+#include <linux/kernel.h>
52353+#include <linux/mm.h>
52354+#include <linux/slab.h>
52355+#include <linux/vmalloc.h>
52356+#include <linux/gracl.h>
52357+#include <linux/grsecurity.h>
52358+
52359+static unsigned long alloc_stack_next = 1;
52360+static unsigned long alloc_stack_size = 1;
52361+static void **alloc_stack;
52362+
52363+static __inline__ int
52364+alloc_pop(void)
52365+{
52366+ if (alloc_stack_next == 1)
52367+ return 0;
52368+
52369+ kfree(alloc_stack[alloc_stack_next - 2]);
52370+
52371+ alloc_stack_next--;
52372+
52373+ return 1;
52374+}
52375+
52376+static __inline__ int
52377+alloc_push(void *buf)
52378+{
52379+ if (alloc_stack_next >= alloc_stack_size)
52380+ return 1;
52381+
52382+ alloc_stack[alloc_stack_next - 1] = buf;
52383+
52384+ alloc_stack_next++;
52385+
52386+ return 0;
52387+}
52388+
52389+void *
52390+acl_alloc(unsigned long len)
52391+{
52392+ void *ret = NULL;
52393+
52394+ if (!len || len > PAGE_SIZE)
52395+ goto out;
52396+
52397+ ret = kmalloc(len, GFP_KERNEL);
52398+
52399+ if (ret) {
52400+ if (alloc_push(ret)) {
52401+ kfree(ret);
52402+ ret = NULL;
52403+ }
52404+ }
52405+
52406+out:
52407+ return ret;
52408+}
52409+
52410+void *
52411+acl_alloc_num(unsigned long num, unsigned long len)
52412+{
52413+ if (!len || (num > (PAGE_SIZE / len)))
52414+ return NULL;
52415+
52416+ return acl_alloc(num * len);
52417+}
52418+
52419+void
52420+acl_free_all(void)
52421+{
52422+ if (gr_acl_is_enabled() || !alloc_stack)
52423+ return;
52424+
52425+ while (alloc_pop()) ;
52426+
52427+ if (alloc_stack) {
52428+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
52429+ kfree(alloc_stack);
52430+ else
52431+ vfree(alloc_stack);
52432+ }
52433+
52434+ alloc_stack = NULL;
52435+ alloc_stack_size = 1;
52436+ alloc_stack_next = 1;
52437+
52438+ return;
52439+}
52440+
52441+int
52442+acl_alloc_stack_init(unsigned long size)
52443+{
52444+ if ((size * sizeof (void *)) <= PAGE_SIZE)
52445+ alloc_stack =
52446+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
52447+ else
52448+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
52449+
52450+ alloc_stack_size = size;
52451+
52452+ if (!alloc_stack)
52453+ return 0;
52454+ else
52455+ return 1;
52456+}
52457diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
52458new file mode 100644
52459index 0000000..955ddfb
52460--- /dev/null
52461+++ b/grsecurity/gracl_cap.c
52462@@ -0,0 +1,101 @@
52463+#include <linux/kernel.h>
52464+#include <linux/module.h>
52465+#include <linux/sched.h>
52466+#include <linux/gracl.h>
52467+#include <linux/grsecurity.h>
52468+#include <linux/grinternal.h>
52469+
52470+extern const char *captab_log[];
52471+extern int captab_log_entries;
52472+
52473+int
52474+gr_acl_is_capable(const int cap)
52475+{
52476+ struct task_struct *task = current;
52477+ const struct cred *cred = current_cred();
52478+ struct acl_subject_label *curracl;
52479+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
52480+ kernel_cap_t cap_audit = __cap_empty_set;
52481+
52482+ if (!gr_acl_is_enabled())
52483+ return 1;
52484+
52485+ curracl = task->acl;
52486+
52487+ cap_drop = curracl->cap_lower;
52488+ cap_mask = curracl->cap_mask;
52489+ cap_audit = curracl->cap_invert_audit;
52490+
52491+ while ((curracl = curracl->parent_subject)) {
52492+ /* if the cap isn't specified in the current computed mask but is specified in the
52493+ current level subject, and is lowered in the current level subject, then add
52494+ it to the set of dropped capabilities
52495+ otherwise, add the current level subject's mask to the current computed mask
52496+ */
52497+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
52498+ cap_raise(cap_mask, cap);
52499+ if (cap_raised(curracl->cap_lower, cap))
52500+ cap_raise(cap_drop, cap);
52501+ if (cap_raised(curracl->cap_invert_audit, cap))
52502+ cap_raise(cap_audit, cap);
52503+ }
52504+ }
52505+
52506+ if (!cap_raised(cap_drop, cap)) {
52507+ if (cap_raised(cap_audit, cap))
52508+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
52509+ return 1;
52510+ }
52511+
52512+ curracl = task->acl;
52513+
52514+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
52515+ && cap_raised(cred->cap_effective, cap)) {
52516+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
52517+ task->role->roletype, cred->uid,
52518+ cred->gid, task->exec_file ?
52519+ gr_to_filename(task->exec_file->f_path.dentry,
52520+ task->exec_file->f_path.mnt) : curracl->filename,
52521+ curracl->filename, 0UL,
52522+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
52523+ return 1;
52524+ }
52525+
52526+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
52527+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
52528+ return 0;
52529+}
52530+
52531+int
52532+gr_acl_is_capable_nolog(const int cap)
52533+{
52534+ struct acl_subject_label *curracl;
52535+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
52536+
52537+ if (!gr_acl_is_enabled())
52538+ return 1;
52539+
52540+ curracl = current->acl;
52541+
52542+ cap_drop = curracl->cap_lower;
52543+ cap_mask = curracl->cap_mask;
52544+
52545+ while ((curracl = curracl->parent_subject)) {
52546+ /* if the cap isn't specified in the current computed mask but is specified in the
52547+ current level subject, and is lowered in the current level subject, then add
52548+ it to the set of dropped capabilities
52549+ otherwise, add the current level subject's mask to the current computed mask
52550+ */
52551+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
52552+ cap_raise(cap_mask, cap);
52553+ if (cap_raised(curracl->cap_lower, cap))
52554+ cap_raise(cap_drop, cap);
52555+ }
52556+ }
52557+
52558+ if (!cap_raised(cap_drop, cap))
52559+ return 1;
52560+
52561+ return 0;
52562+}
52563+
52564diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
52565new file mode 100644
52566index 0000000..4eda5c3
52567--- /dev/null
52568+++ b/grsecurity/gracl_fs.c
52569@@ -0,0 +1,433 @@
52570+#include <linux/kernel.h>
52571+#include <linux/sched.h>
52572+#include <linux/types.h>
52573+#include <linux/fs.h>
52574+#include <linux/file.h>
52575+#include <linux/stat.h>
52576+#include <linux/grsecurity.h>
52577+#include <linux/grinternal.h>
52578+#include <linux/gracl.h>
52579+
52580+__u32
52581+gr_acl_handle_hidden_file(const struct dentry * dentry,
52582+ const struct vfsmount * mnt)
52583+{
52584+ __u32 mode;
52585+
52586+ if (unlikely(!dentry->d_inode))
52587+ return GR_FIND;
52588+
52589+ mode =
52590+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
52591+
52592+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
52593+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
52594+ return mode;
52595+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
52596+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
52597+ return 0;
52598+ } else if (unlikely(!(mode & GR_FIND)))
52599+ return 0;
52600+
52601+ return GR_FIND;
52602+}
52603+
52604+__u32
52605+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
52606+ int acc_mode)
52607+{
52608+ __u32 reqmode = GR_FIND;
52609+ __u32 mode;
52610+
52611+ if (unlikely(!dentry->d_inode))
52612+ return reqmode;
52613+
52614+ if (acc_mode & MAY_APPEND)
52615+ reqmode |= GR_APPEND;
52616+ else if (acc_mode & MAY_WRITE)
52617+ reqmode |= GR_WRITE;
52618+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
52619+ reqmode |= GR_READ;
52620+
52621+ mode =
52622+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
52623+ mnt);
52624+
52625+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
52626+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
52627+ reqmode & GR_READ ? " reading" : "",
52628+ reqmode & GR_WRITE ? " writing" : reqmode &
52629+ GR_APPEND ? " appending" : "");
52630+ return reqmode;
52631+ } else
52632+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
52633+ {
52634+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
52635+ reqmode & GR_READ ? " reading" : "",
52636+ reqmode & GR_WRITE ? " writing" : reqmode &
52637+ GR_APPEND ? " appending" : "");
52638+ return 0;
52639+ } else if (unlikely((mode & reqmode) != reqmode))
52640+ return 0;
52641+
52642+ return reqmode;
52643+}
52644+
52645+__u32
52646+gr_acl_handle_creat(const struct dentry * dentry,
52647+ const struct dentry * p_dentry,
52648+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
52649+ const int imode)
52650+{
52651+ __u32 reqmode = GR_WRITE | GR_CREATE;
52652+ __u32 mode;
52653+
52654+ if (acc_mode & MAY_APPEND)
52655+ reqmode |= GR_APPEND;
52656+ // if a directory was required or the directory already exists, then
52657+ // don't count this open as a read
52658+ if ((acc_mode & MAY_READ) &&
52659+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
52660+ reqmode |= GR_READ;
52661+ if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
52662+ reqmode |= GR_SETID;
52663+
52664+ mode =
52665+ gr_check_create(dentry, p_dentry, p_mnt,
52666+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
52667+
52668+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
52669+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
52670+ reqmode & GR_READ ? " reading" : "",
52671+ reqmode & GR_WRITE ? " writing" : reqmode &
52672+ GR_APPEND ? " appending" : "");
52673+ return reqmode;
52674+ } else
52675+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
52676+ {
52677+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
52678+ reqmode & GR_READ ? " reading" : "",
52679+ reqmode & GR_WRITE ? " writing" : reqmode &
52680+ GR_APPEND ? " appending" : "");
52681+ return 0;
52682+ } else if (unlikely((mode & reqmode) != reqmode))
52683+ return 0;
52684+
52685+ return reqmode;
52686+}
52687+
52688+__u32
52689+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
52690+ const int fmode)
52691+{
52692+ __u32 mode, reqmode = GR_FIND;
52693+
52694+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
52695+ reqmode |= GR_EXEC;
52696+ if (fmode & S_IWOTH)
52697+ reqmode |= GR_WRITE;
52698+ if (fmode & S_IROTH)
52699+ reqmode |= GR_READ;
52700+
52701+ mode =
52702+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
52703+ mnt);
52704+
52705+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
52706+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
52707+ reqmode & GR_READ ? " reading" : "",
52708+ reqmode & GR_WRITE ? " writing" : "",
52709+ reqmode & GR_EXEC ? " executing" : "");
52710+ return reqmode;
52711+ } else
52712+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
52713+ {
52714+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
52715+ reqmode & GR_READ ? " reading" : "",
52716+ reqmode & GR_WRITE ? " writing" : "",
52717+ reqmode & GR_EXEC ? " executing" : "");
52718+ return 0;
52719+ } else if (unlikely((mode & reqmode) != reqmode))
52720+ return 0;
52721+
52722+ return reqmode;
52723+}
52724+
52725+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
52726+{
52727+ __u32 mode;
52728+
52729+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
52730+
52731+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
52732+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
52733+ return mode;
52734+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
52735+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
52736+ return 0;
52737+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
52738+ return 0;
52739+
52740+ return (reqmode);
52741+}
52742+
52743+__u32
52744+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
52745+{
52746+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
52747+}
52748+
52749+__u32
52750+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
52751+{
52752+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
52753+}
52754+
52755+__u32
52756+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
52757+{
52758+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
52759+}
52760+
52761+__u32
52762+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
52763+{
52764+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
52765+}
52766+
52767+__u32
52768+gr_acl_handle_fchmod(const struct dentry *dentry, const struct vfsmount *mnt,
52769+ mode_t mode)
52770+{
52771+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
52772+ return 1;
52773+
52774+ if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
52775+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
52776+ GR_FCHMOD_ACL_MSG);
52777+ } else {
52778+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_FCHMOD_ACL_MSG);
52779+ }
52780+}
52781+
52782+__u32
52783+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
52784+ mode_t mode)
52785+{
52786+ if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
52787+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
52788+ GR_CHMOD_ACL_MSG);
52789+ } else {
52790+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
52791+ }
52792+}
52793+
52794+__u32
52795+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
52796+{
52797+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
52798+}
52799+
52800+__u32
52801+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
52802+{
52803+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
52804+}
52805+
52806+__u32
52807+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
52808+{
52809+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
52810+}
52811+
52812+__u32
52813+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
52814+{
52815+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
52816+ GR_UNIXCONNECT_ACL_MSG);
52817+}
52818+
52819+/* hardlinks require at minimum create and link permission,
52820+ any additional privilege required is based on the
52821+ privilege of the file being linked to
52822+*/
52823+__u32
52824+gr_acl_handle_link(const struct dentry * new_dentry,
52825+ const struct dentry * parent_dentry,
52826+ const struct vfsmount * parent_mnt,
52827+ const struct dentry * old_dentry,
52828+ const struct vfsmount * old_mnt, const char *to)
52829+{
52830+ __u32 mode;
52831+ __u32 needmode = GR_CREATE | GR_LINK;
52832+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
52833+
52834+ mode =
52835+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
52836+ old_mnt);
52837+
52838+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
52839+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
52840+ return mode;
52841+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
52842+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
52843+ return 0;
52844+ } else if (unlikely((mode & needmode) != needmode))
52845+ return 0;
52846+
52847+ return 1;
52848+}
52849+
52850+__u32
52851+gr_acl_handle_symlink(const struct dentry * new_dentry,
52852+ const struct dentry * parent_dentry,
52853+ const struct vfsmount * parent_mnt, const char *from)
52854+{
52855+ __u32 needmode = GR_WRITE | GR_CREATE;
52856+ __u32 mode;
52857+
52858+ mode =
52859+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
52860+ GR_CREATE | GR_AUDIT_CREATE |
52861+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
52862+
52863+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
52864+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
52865+ return mode;
52866+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
52867+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
52868+ return 0;
52869+ } else if (unlikely((mode & needmode) != needmode))
52870+ return 0;
52871+
52872+ return (GR_WRITE | GR_CREATE);
52873+}
52874+
52875+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)
52876+{
52877+ __u32 mode;
52878+
52879+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
52880+
52881+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
52882+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
52883+ return mode;
52884+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
52885+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
52886+ return 0;
52887+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
52888+ return 0;
52889+
52890+ return (reqmode);
52891+}
52892+
52893+__u32
52894+gr_acl_handle_mknod(const struct dentry * new_dentry,
52895+ const struct dentry * parent_dentry,
52896+ const struct vfsmount * parent_mnt,
52897+ const int mode)
52898+{
52899+ __u32 reqmode = GR_WRITE | GR_CREATE;
52900+ if (unlikely(mode & (S_ISUID | S_ISGID)))
52901+ reqmode |= GR_SETID;
52902+
52903+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
52904+ reqmode, GR_MKNOD_ACL_MSG);
52905+}
52906+
52907+__u32
52908+gr_acl_handle_mkdir(const struct dentry *new_dentry,
52909+ const struct dentry *parent_dentry,
52910+ const struct vfsmount *parent_mnt)
52911+{
52912+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
52913+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
52914+}
52915+
52916+#define RENAME_CHECK_SUCCESS(old, new) \
52917+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
52918+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
52919+
52920+int
52921+gr_acl_handle_rename(struct dentry *new_dentry,
52922+ struct dentry *parent_dentry,
52923+ const struct vfsmount *parent_mnt,
52924+ struct dentry *old_dentry,
52925+ struct inode *old_parent_inode,
52926+ struct vfsmount *old_mnt, const char *newname)
52927+{
52928+ __u32 comp1, comp2;
52929+ int error = 0;
52930+
52931+ if (unlikely(!gr_acl_is_enabled()))
52932+ return 0;
52933+
52934+ if (!new_dentry->d_inode) {
52935+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
52936+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
52937+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
52938+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
52939+ GR_DELETE | GR_AUDIT_DELETE |
52940+ GR_AUDIT_READ | GR_AUDIT_WRITE |
52941+ GR_SUPPRESS, old_mnt);
52942+ } else {
52943+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
52944+ GR_CREATE | GR_DELETE |
52945+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
52946+ GR_AUDIT_READ | GR_AUDIT_WRITE |
52947+ GR_SUPPRESS, parent_mnt);
52948+ comp2 =
52949+ gr_search_file(old_dentry,
52950+ GR_READ | GR_WRITE | GR_AUDIT_READ |
52951+ GR_DELETE | GR_AUDIT_DELETE |
52952+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
52953+ }
52954+
52955+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
52956+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
52957+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
52958+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
52959+ && !(comp2 & GR_SUPPRESS)) {
52960+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
52961+ error = -EACCES;
52962+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
52963+ error = -EACCES;
52964+
52965+ return error;
52966+}
52967+
52968+void
52969+gr_acl_handle_exit(void)
52970+{
52971+ u16 id;
52972+ char *rolename;
52973+ struct file *exec_file;
52974+
52975+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
52976+ !(current->role->roletype & GR_ROLE_PERSIST))) {
52977+ id = current->acl_role_id;
52978+ rolename = current->role->rolename;
52979+ gr_set_acls(1);
52980+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
52981+ }
52982+
52983+ write_lock(&grsec_exec_file_lock);
52984+ exec_file = current->exec_file;
52985+ current->exec_file = NULL;
52986+ write_unlock(&grsec_exec_file_lock);
52987+
52988+ if (exec_file)
52989+ fput(exec_file);
52990+}
52991+
52992+int
52993+gr_acl_handle_procpidmem(const struct task_struct *task)
52994+{
52995+ if (unlikely(!gr_acl_is_enabled()))
52996+ return 0;
52997+
52998+ if (task != current && task->acl->mode & GR_PROTPROCFD)
52999+ return -EACCES;
53000+
53001+ return 0;
53002+}
53003diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
53004new file mode 100644
53005index 0000000..17050ca
53006--- /dev/null
53007+++ b/grsecurity/gracl_ip.c
53008@@ -0,0 +1,381 @@
53009+#include <linux/kernel.h>
53010+#include <asm/uaccess.h>
53011+#include <asm/errno.h>
53012+#include <net/sock.h>
53013+#include <linux/file.h>
53014+#include <linux/fs.h>
53015+#include <linux/net.h>
53016+#include <linux/in.h>
53017+#include <linux/skbuff.h>
53018+#include <linux/ip.h>
53019+#include <linux/udp.h>
53020+#include <linux/types.h>
53021+#include <linux/sched.h>
53022+#include <linux/netdevice.h>
53023+#include <linux/inetdevice.h>
53024+#include <linux/gracl.h>
53025+#include <linux/grsecurity.h>
53026+#include <linux/grinternal.h>
53027+
53028+#define GR_BIND 0x01
53029+#define GR_CONNECT 0x02
53030+#define GR_INVERT 0x04
53031+#define GR_BINDOVERRIDE 0x08
53032+#define GR_CONNECTOVERRIDE 0x10
53033+#define GR_SOCK_FAMILY 0x20
53034+
53035+static const char * gr_protocols[IPPROTO_MAX] = {
53036+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
53037+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
53038+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
53039+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
53040+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
53041+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
53042+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
53043+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
53044+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
53045+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
53046+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
53047+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
53048+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
53049+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
53050+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
53051+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
53052+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
53053+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
53054+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
53055+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
53056+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
53057+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
53058+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
53059+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
53060+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
53061+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
53062+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
53063+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
53064+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
53065+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
53066+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
53067+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
53068+ };
53069+
53070+static const char * gr_socktypes[SOCK_MAX] = {
53071+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
53072+ "unknown:7", "unknown:8", "unknown:9", "packet"
53073+ };
53074+
53075+static const char * gr_sockfamilies[AF_MAX+1] = {
53076+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
53077+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
53078+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
53079+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
53080+ };
53081+
53082+const char *
53083+gr_proto_to_name(unsigned char proto)
53084+{
53085+ return gr_protocols[proto];
53086+}
53087+
53088+const char *
53089+gr_socktype_to_name(unsigned char type)
53090+{
53091+ return gr_socktypes[type];
53092+}
53093+
53094+const char *
53095+gr_sockfamily_to_name(unsigned char family)
53096+{
53097+ return gr_sockfamilies[family];
53098+}
53099+
53100+int
53101+gr_search_socket(const int domain, const int type, const int protocol)
53102+{
53103+ struct acl_subject_label *curr;
53104+ const struct cred *cred = current_cred();
53105+
53106+ if (unlikely(!gr_acl_is_enabled()))
53107+ goto exit;
53108+
53109+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
53110+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
53111+ goto exit; // let the kernel handle it
53112+
53113+ curr = current->acl;
53114+
53115+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
53116+ /* the family is allowed, if this is PF_INET allow it only if
53117+ the extra sock type/protocol checks pass */
53118+ if (domain == PF_INET)
53119+ goto inet_check;
53120+ goto exit;
53121+ } else {
53122+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
53123+ __u32 fakeip = 0;
53124+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
53125+ current->role->roletype, cred->uid,
53126+ cred->gid, current->exec_file ?
53127+ gr_to_filename(current->exec_file->f_path.dentry,
53128+ current->exec_file->f_path.mnt) :
53129+ curr->filename, curr->filename,
53130+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
53131+ &current->signal->saved_ip);
53132+ goto exit;
53133+ }
53134+ goto exit_fail;
53135+ }
53136+
53137+inet_check:
53138+ /* the rest of this checking is for IPv4 only */
53139+ if (!curr->ips)
53140+ goto exit;
53141+
53142+ if ((curr->ip_type & (1 << type)) &&
53143+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
53144+ goto exit;
53145+
53146+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
53147+ /* we don't place acls on raw sockets , and sometimes
53148+ dgram/ip sockets are opened for ioctl and not
53149+ bind/connect, so we'll fake a bind learn log */
53150+ if (type == SOCK_RAW || type == SOCK_PACKET) {
53151+ __u32 fakeip = 0;
53152+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
53153+ current->role->roletype, cred->uid,
53154+ cred->gid, current->exec_file ?
53155+ gr_to_filename(current->exec_file->f_path.dentry,
53156+ current->exec_file->f_path.mnt) :
53157+ curr->filename, curr->filename,
53158+ &fakeip, 0, type,
53159+ protocol, GR_CONNECT, &current->signal->saved_ip);
53160+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
53161+ __u32 fakeip = 0;
53162+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
53163+ current->role->roletype, cred->uid,
53164+ cred->gid, current->exec_file ?
53165+ gr_to_filename(current->exec_file->f_path.dentry,
53166+ current->exec_file->f_path.mnt) :
53167+ curr->filename, curr->filename,
53168+ &fakeip, 0, type,
53169+ protocol, GR_BIND, &current->signal->saved_ip);
53170+ }
53171+ /* we'll log when they use connect or bind */
53172+ goto exit;
53173+ }
53174+
53175+exit_fail:
53176+ if (domain == PF_INET)
53177+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
53178+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
53179+ else
53180+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
53181+ gr_socktype_to_name(type), protocol);
53182+
53183+ return 0;
53184+exit:
53185+ return 1;
53186+}
53187+
53188+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)
53189+{
53190+ if ((ip->mode & mode) &&
53191+ (ip_port >= ip->low) &&
53192+ (ip_port <= ip->high) &&
53193+ ((ntohl(ip_addr) & our_netmask) ==
53194+ (ntohl(our_addr) & our_netmask))
53195+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
53196+ && (ip->type & (1 << type))) {
53197+ if (ip->mode & GR_INVERT)
53198+ return 2; // specifically denied
53199+ else
53200+ return 1; // allowed
53201+ }
53202+
53203+ return 0; // not specifically allowed, may continue parsing
53204+}
53205+
53206+static int
53207+gr_search_connectbind(const int full_mode, struct sock *sk,
53208+ struct sockaddr_in *addr, const int type)
53209+{
53210+ char iface[IFNAMSIZ] = {0};
53211+ struct acl_subject_label *curr;
53212+ struct acl_ip_label *ip;
53213+ struct inet_sock *isk;
53214+ struct net_device *dev;
53215+ struct in_device *idev;
53216+ unsigned long i;
53217+ int ret;
53218+ int mode = full_mode & (GR_BIND | GR_CONNECT);
53219+ __u32 ip_addr = 0;
53220+ __u32 our_addr;
53221+ __u32 our_netmask;
53222+ char *p;
53223+ __u16 ip_port = 0;
53224+ const struct cred *cred = current_cred();
53225+
53226+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
53227+ return 0;
53228+
53229+ curr = current->acl;
53230+ isk = inet_sk(sk);
53231+
53232+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
53233+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
53234+ addr->sin_addr.s_addr = curr->inaddr_any_override;
53235+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
53236+ struct sockaddr_in saddr;
53237+ int err;
53238+
53239+ saddr.sin_family = AF_INET;
53240+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
53241+ saddr.sin_port = isk->inet_sport;
53242+
53243+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
53244+ if (err)
53245+ return err;
53246+
53247+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
53248+ if (err)
53249+ return err;
53250+ }
53251+
53252+ if (!curr->ips)
53253+ return 0;
53254+
53255+ ip_addr = addr->sin_addr.s_addr;
53256+ ip_port = ntohs(addr->sin_port);
53257+
53258+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
53259+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
53260+ current->role->roletype, cred->uid,
53261+ cred->gid, current->exec_file ?
53262+ gr_to_filename(current->exec_file->f_path.dentry,
53263+ current->exec_file->f_path.mnt) :
53264+ curr->filename, curr->filename,
53265+ &ip_addr, ip_port, type,
53266+ sk->sk_protocol, mode, &current->signal->saved_ip);
53267+ return 0;
53268+ }
53269+
53270+ for (i = 0; i < curr->ip_num; i++) {
53271+ ip = *(curr->ips + i);
53272+ if (ip->iface != NULL) {
53273+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
53274+ p = strchr(iface, ':');
53275+ if (p != NULL)
53276+ *p = '\0';
53277+ dev = dev_get_by_name(sock_net(sk), iface);
53278+ if (dev == NULL)
53279+ continue;
53280+ idev = in_dev_get(dev);
53281+ if (idev == NULL) {
53282+ dev_put(dev);
53283+ continue;
53284+ }
53285+ rcu_read_lock();
53286+ for_ifa(idev) {
53287+ if (!strcmp(ip->iface, ifa->ifa_label)) {
53288+ our_addr = ifa->ifa_address;
53289+ our_netmask = 0xffffffff;
53290+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
53291+ if (ret == 1) {
53292+ rcu_read_unlock();
53293+ in_dev_put(idev);
53294+ dev_put(dev);
53295+ return 0;
53296+ } else if (ret == 2) {
53297+ rcu_read_unlock();
53298+ in_dev_put(idev);
53299+ dev_put(dev);
53300+ goto denied;
53301+ }
53302+ }
53303+ } endfor_ifa(idev);
53304+ rcu_read_unlock();
53305+ in_dev_put(idev);
53306+ dev_put(dev);
53307+ } else {
53308+ our_addr = ip->addr;
53309+ our_netmask = ip->netmask;
53310+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
53311+ if (ret == 1)
53312+ return 0;
53313+ else if (ret == 2)
53314+ goto denied;
53315+ }
53316+ }
53317+
53318+denied:
53319+ if (mode == GR_BIND)
53320+ 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));
53321+ else if (mode == GR_CONNECT)
53322+ 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));
53323+
53324+ return -EACCES;
53325+}
53326+
53327+int
53328+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
53329+{
53330+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
53331+}
53332+
53333+int
53334+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
53335+{
53336+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
53337+}
53338+
53339+int gr_search_listen(struct socket *sock)
53340+{
53341+ struct sock *sk = sock->sk;
53342+ struct sockaddr_in addr;
53343+
53344+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
53345+ addr.sin_port = inet_sk(sk)->inet_sport;
53346+
53347+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
53348+}
53349+
53350+int gr_search_accept(struct socket *sock)
53351+{
53352+ struct sock *sk = sock->sk;
53353+ struct sockaddr_in addr;
53354+
53355+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
53356+ addr.sin_port = inet_sk(sk)->inet_sport;
53357+
53358+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
53359+}
53360+
53361+int
53362+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
53363+{
53364+ if (addr)
53365+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
53366+ else {
53367+ struct sockaddr_in sin;
53368+ const struct inet_sock *inet = inet_sk(sk);
53369+
53370+ sin.sin_addr.s_addr = inet->inet_daddr;
53371+ sin.sin_port = inet->inet_dport;
53372+
53373+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
53374+ }
53375+}
53376+
53377+int
53378+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
53379+{
53380+ struct sockaddr_in sin;
53381+
53382+ if (unlikely(skb->len < sizeof (struct udphdr)))
53383+ return 0; // skip this packet
53384+
53385+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
53386+ sin.sin_port = udp_hdr(skb)->source;
53387+
53388+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
53389+}
53390diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
53391new file mode 100644
53392index 0000000..25f54ef
53393--- /dev/null
53394+++ b/grsecurity/gracl_learn.c
53395@@ -0,0 +1,207 @@
53396+#include <linux/kernel.h>
53397+#include <linux/mm.h>
53398+#include <linux/sched.h>
53399+#include <linux/poll.h>
53400+#include <linux/string.h>
53401+#include <linux/file.h>
53402+#include <linux/types.h>
53403+#include <linux/vmalloc.h>
53404+#include <linux/grinternal.h>
53405+
53406+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
53407+ size_t count, loff_t *ppos);
53408+extern int gr_acl_is_enabled(void);
53409+
53410+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
53411+static int gr_learn_attached;
53412+
53413+/* use a 512k buffer */
53414+#define LEARN_BUFFER_SIZE (512 * 1024)
53415+
53416+static DEFINE_SPINLOCK(gr_learn_lock);
53417+static DEFINE_MUTEX(gr_learn_user_mutex);
53418+
53419+/* we need to maintain two buffers, so that the kernel context of grlearn
53420+ uses a semaphore around the userspace copying, and the other kernel contexts
53421+ use a spinlock when copying into the buffer, since they cannot sleep
53422+*/
53423+static char *learn_buffer;
53424+static char *learn_buffer_user;
53425+static int learn_buffer_len;
53426+static int learn_buffer_user_len;
53427+
53428+static ssize_t
53429+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
53430+{
53431+ DECLARE_WAITQUEUE(wait, current);
53432+ ssize_t retval = 0;
53433+
53434+ add_wait_queue(&learn_wait, &wait);
53435+ set_current_state(TASK_INTERRUPTIBLE);
53436+ do {
53437+ mutex_lock(&gr_learn_user_mutex);
53438+ spin_lock(&gr_learn_lock);
53439+ if (learn_buffer_len)
53440+ break;
53441+ spin_unlock(&gr_learn_lock);
53442+ mutex_unlock(&gr_learn_user_mutex);
53443+ if (file->f_flags & O_NONBLOCK) {
53444+ retval = -EAGAIN;
53445+ goto out;
53446+ }
53447+ if (signal_pending(current)) {
53448+ retval = -ERESTARTSYS;
53449+ goto out;
53450+ }
53451+
53452+ schedule();
53453+ } while (1);
53454+
53455+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
53456+ learn_buffer_user_len = learn_buffer_len;
53457+ retval = learn_buffer_len;
53458+ learn_buffer_len = 0;
53459+
53460+ spin_unlock(&gr_learn_lock);
53461+
53462+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
53463+ retval = -EFAULT;
53464+
53465+ mutex_unlock(&gr_learn_user_mutex);
53466+out:
53467+ set_current_state(TASK_RUNNING);
53468+ remove_wait_queue(&learn_wait, &wait);
53469+ return retval;
53470+}
53471+
53472+static unsigned int
53473+poll_learn(struct file * file, poll_table * wait)
53474+{
53475+ poll_wait(file, &learn_wait, wait);
53476+
53477+ if (learn_buffer_len)
53478+ return (POLLIN | POLLRDNORM);
53479+
53480+ return 0;
53481+}
53482+
53483+void
53484+gr_clear_learn_entries(void)
53485+{
53486+ char *tmp;
53487+
53488+ mutex_lock(&gr_learn_user_mutex);
53489+ spin_lock(&gr_learn_lock);
53490+ tmp = learn_buffer;
53491+ learn_buffer = NULL;
53492+ spin_unlock(&gr_learn_lock);
53493+ if (tmp)
53494+ vfree(tmp);
53495+ if (learn_buffer_user != NULL) {
53496+ vfree(learn_buffer_user);
53497+ learn_buffer_user = NULL;
53498+ }
53499+ learn_buffer_len = 0;
53500+ mutex_unlock(&gr_learn_user_mutex);
53501+
53502+ return;
53503+}
53504+
53505+void
53506+gr_add_learn_entry(const char *fmt, ...)
53507+{
53508+ va_list args;
53509+ unsigned int len;
53510+
53511+ if (!gr_learn_attached)
53512+ return;
53513+
53514+ spin_lock(&gr_learn_lock);
53515+
53516+ /* leave a gap at the end so we know when it's "full" but don't have to
53517+ compute the exact length of the string we're trying to append
53518+ */
53519+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
53520+ spin_unlock(&gr_learn_lock);
53521+ wake_up_interruptible(&learn_wait);
53522+ return;
53523+ }
53524+ if (learn_buffer == NULL) {
53525+ spin_unlock(&gr_learn_lock);
53526+ return;
53527+ }
53528+
53529+ va_start(args, fmt);
53530+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
53531+ va_end(args);
53532+
53533+ learn_buffer_len += len + 1;
53534+
53535+ spin_unlock(&gr_learn_lock);
53536+ wake_up_interruptible(&learn_wait);
53537+
53538+ return;
53539+}
53540+
53541+static int
53542+open_learn(struct inode *inode, struct file *file)
53543+{
53544+ if (file->f_mode & FMODE_READ && gr_learn_attached)
53545+ return -EBUSY;
53546+ if (file->f_mode & FMODE_READ) {
53547+ int retval = 0;
53548+ mutex_lock(&gr_learn_user_mutex);
53549+ if (learn_buffer == NULL)
53550+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
53551+ if (learn_buffer_user == NULL)
53552+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
53553+ if (learn_buffer == NULL) {
53554+ retval = -ENOMEM;
53555+ goto out_error;
53556+ }
53557+ if (learn_buffer_user == NULL) {
53558+ retval = -ENOMEM;
53559+ goto out_error;
53560+ }
53561+ learn_buffer_len = 0;
53562+ learn_buffer_user_len = 0;
53563+ gr_learn_attached = 1;
53564+out_error:
53565+ mutex_unlock(&gr_learn_user_mutex);
53566+ return retval;
53567+ }
53568+ return 0;
53569+}
53570+
53571+static int
53572+close_learn(struct inode *inode, struct file *file)
53573+{
53574+ if (file->f_mode & FMODE_READ) {
53575+ char *tmp = NULL;
53576+ mutex_lock(&gr_learn_user_mutex);
53577+ spin_lock(&gr_learn_lock);
53578+ tmp = learn_buffer;
53579+ learn_buffer = NULL;
53580+ spin_unlock(&gr_learn_lock);
53581+ if (tmp)
53582+ vfree(tmp);
53583+ if (learn_buffer_user != NULL) {
53584+ vfree(learn_buffer_user);
53585+ learn_buffer_user = NULL;
53586+ }
53587+ learn_buffer_len = 0;
53588+ learn_buffer_user_len = 0;
53589+ gr_learn_attached = 0;
53590+ mutex_unlock(&gr_learn_user_mutex);
53591+ }
53592+
53593+ return 0;
53594+}
53595+
53596+const struct file_operations grsec_fops = {
53597+ .read = read_learn,
53598+ .write = write_grsec_handler,
53599+ .open = open_learn,
53600+ .release = close_learn,
53601+ .poll = poll_learn,
53602+};
53603diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
53604new file mode 100644
53605index 0000000..39645c9
53606--- /dev/null
53607+++ b/grsecurity/gracl_res.c
53608@@ -0,0 +1,68 @@
53609+#include <linux/kernel.h>
53610+#include <linux/sched.h>
53611+#include <linux/gracl.h>
53612+#include <linux/grinternal.h>
53613+
53614+static const char *restab_log[] = {
53615+ [RLIMIT_CPU] = "RLIMIT_CPU",
53616+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
53617+ [RLIMIT_DATA] = "RLIMIT_DATA",
53618+ [RLIMIT_STACK] = "RLIMIT_STACK",
53619+ [RLIMIT_CORE] = "RLIMIT_CORE",
53620+ [RLIMIT_RSS] = "RLIMIT_RSS",
53621+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
53622+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
53623+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
53624+ [RLIMIT_AS] = "RLIMIT_AS",
53625+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
53626+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
53627+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
53628+ [RLIMIT_NICE] = "RLIMIT_NICE",
53629+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
53630+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
53631+ [GR_CRASH_RES] = "RLIMIT_CRASH"
53632+};
53633+
53634+void
53635+gr_log_resource(const struct task_struct *task,
53636+ const int res, const unsigned long wanted, const int gt)
53637+{
53638+ const struct cred *cred;
53639+ unsigned long rlim;
53640+
53641+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
53642+ return;
53643+
53644+ // not yet supported resource
53645+ if (unlikely(!restab_log[res]))
53646+ return;
53647+
53648+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
53649+ rlim = task_rlimit_max(task, res);
53650+ else
53651+ rlim = task_rlimit(task, res);
53652+
53653+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
53654+ return;
53655+
53656+ rcu_read_lock();
53657+ cred = __task_cred(task);
53658+
53659+ if (res == RLIMIT_NPROC &&
53660+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
53661+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
53662+ goto out_rcu_unlock;
53663+ else if (res == RLIMIT_MEMLOCK &&
53664+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
53665+ goto out_rcu_unlock;
53666+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
53667+ goto out_rcu_unlock;
53668+ rcu_read_unlock();
53669+
53670+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
53671+
53672+ return;
53673+out_rcu_unlock:
53674+ rcu_read_unlock();
53675+ return;
53676+}
53677diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
53678new file mode 100644
53679index 0000000..5556be3
53680--- /dev/null
53681+++ b/grsecurity/gracl_segv.c
53682@@ -0,0 +1,299 @@
53683+#include <linux/kernel.h>
53684+#include <linux/mm.h>
53685+#include <asm/uaccess.h>
53686+#include <asm/errno.h>
53687+#include <asm/mman.h>
53688+#include <net/sock.h>
53689+#include <linux/file.h>
53690+#include <linux/fs.h>
53691+#include <linux/net.h>
53692+#include <linux/in.h>
53693+#include <linux/slab.h>
53694+#include <linux/types.h>
53695+#include <linux/sched.h>
53696+#include <linux/timer.h>
53697+#include <linux/gracl.h>
53698+#include <linux/grsecurity.h>
53699+#include <linux/grinternal.h>
53700+
53701+static struct crash_uid *uid_set;
53702+static unsigned short uid_used;
53703+static DEFINE_SPINLOCK(gr_uid_lock);
53704+extern rwlock_t gr_inode_lock;
53705+extern struct acl_subject_label *
53706+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
53707+ struct acl_role_label *role);
53708+
53709+#ifdef CONFIG_BTRFS_FS
53710+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
53711+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
53712+#endif
53713+
53714+static inline dev_t __get_dev(const struct dentry *dentry)
53715+{
53716+#ifdef CONFIG_BTRFS_FS
53717+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
53718+ return get_btrfs_dev_from_inode(dentry->d_inode);
53719+ else
53720+#endif
53721+ return dentry->d_inode->i_sb->s_dev;
53722+}
53723+
53724+int
53725+gr_init_uidset(void)
53726+{
53727+ uid_set =
53728+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
53729+ uid_used = 0;
53730+
53731+ return uid_set ? 1 : 0;
53732+}
53733+
53734+void
53735+gr_free_uidset(void)
53736+{
53737+ if (uid_set)
53738+ kfree(uid_set);
53739+
53740+ return;
53741+}
53742+
53743+int
53744+gr_find_uid(const uid_t uid)
53745+{
53746+ struct crash_uid *tmp = uid_set;
53747+ uid_t buid;
53748+ int low = 0, high = uid_used - 1, mid;
53749+
53750+ while (high >= low) {
53751+ mid = (low + high) >> 1;
53752+ buid = tmp[mid].uid;
53753+ if (buid == uid)
53754+ return mid;
53755+ if (buid > uid)
53756+ high = mid - 1;
53757+ if (buid < uid)
53758+ low = mid + 1;
53759+ }
53760+
53761+ return -1;
53762+}
53763+
53764+static __inline__ void
53765+gr_insertsort(void)
53766+{
53767+ unsigned short i, j;
53768+ struct crash_uid index;
53769+
53770+ for (i = 1; i < uid_used; i++) {
53771+ index = uid_set[i];
53772+ j = i;
53773+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
53774+ uid_set[j] = uid_set[j - 1];
53775+ j--;
53776+ }
53777+ uid_set[j] = index;
53778+ }
53779+
53780+ return;
53781+}
53782+
53783+static __inline__ void
53784+gr_insert_uid(const uid_t uid, const unsigned long expires)
53785+{
53786+ int loc;
53787+
53788+ if (uid_used == GR_UIDTABLE_MAX)
53789+ return;
53790+
53791+ loc = gr_find_uid(uid);
53792+
53793+ if (loc >= 0) {
53794+ uid_set[loc].expires = expires;
53795+ return;
53796+ }
53797+
53798+ uid_set[uid_used].uid = uid;
53799+ uid_set[uid_used].expires = expires;
53800+ uid_used++;
53801+
53802+ gr_insertsort();
53803+
53804+ return;
53805+}
53806+
53807+void
53808+gr_remove_uid(const unsigned short loc)
53809+{
53810+ unsigned short i;
53811+
53812+ for (i = loc + 1; i < uid_used; i++)
53813+ uid_set[i - 1] = uid_set[i];
53814+
53815+ uid_used--;
53816+
53817+ return;
53818+}
53819+
53820+int
53821+gr_check_crash_uid(const uid_t uid)
53822+{
53823+ int loc;
53824+ int ret = 0;
53825+
53826+ if (unlikely(!gr_acl_is_enabled()))
53827+ return 0;
53828+
53829+ spin_lock(&gr_uid_lock);
53830+ loc = gr_find_uid(uid);
53831+
53832+ if (loc < 0)
53833+ goto out_unlock;
53834+
53835+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
53836+ gr_remove_uid(loc);
53837+ else
53838+ ret = 1;
53839+
53840+out_unlock:
53841+ spin_unlock(&gr_uid_lock);
53842+ return ret;
53843+}
53844+
53845+static __inline__ int
53846+proc_is_setxid(const struct cred *cred)
53847+{
53848+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
53849+ cred->uid != cred->fsuid)
53850+ return 1;
53851+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
53852+ cred->gid != cred->fsgid)
53853+ return 1;
53854+
53855+ return 0;
53856+}
53857+
53858+extern int gr_fake_force_sig(int sig, struct task_struct *t);
53859+
53860+void
53861+gr_handle_crash(struct task_struct *task, const int sig)
53862+{
53863+ struct acl_subject_label *curr;
53864+ struct task_struct *tsk, *tsk2;
53865+ const struct cred *cred;
53866+ const struct cred *cred2;
53867+
53868+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
53869+ return;
53870+
53871+ if (unlikely(!gr_acl_is_enabled()))
53872+ return;
53873+
53874+ curr = task->acl;
53875+
53876+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
53877+ return;
53878+
53879+ if (time_before_eq(curr->expires, get_seconds())) {
53880+ curr->expires = 0;
53881+ curr->crashes = 0;
53882+ }
53883+
53884+ curr->crashes++;
53885+
53886+ if (!curr->expires)
53887+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
53888+
53889+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
53890+ time_after(curr->expires, get_seconds())) {
53891+ rcu_read_lock();
53892+ cred = __task_cred(task);
53893+ if (cred->uid && proc_is_setxid(cred)) {
53894+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
53895+ spin_lock(&gr_uid_lock);
53896+ gr_insert_uid(cred->uid, curr->expires);
53897+ spin_unlock(&gr_uid_lock);
53898+ curr->expires = 0;
53899+ curr->crashes = 0;
53900+ read_lock(&tasklist_lock);
53901+ do_each_thread(tsk2, tsk) {
53902+ cred2 = __task_cred(tsk);
53903+ if (tsk != task && cred2->uid == cred->uid)
53904+ gr_fake_force_sig(SIGKILL, tsk);
53905+ } while_each_thread(tsk2, tsk);
53906+ read_unlock(&tasklist_lock);
53907+ } else {
53908+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
53909+ read_lock(&tasklist_lock);
53910+ read_lock(&grsec_exec_file_lock);
53911+ do_each_thread(tsk2, tsk) {
53912+ if (likely(tsk != task)) {
53913+ // if this thread has the same subject as the one that triggered
53914+ // RES_CRASH and it's the same binary, kill it
53915+ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
53916+ gr_fake_force_sig(SIGKILL, tsk);
53917+ }
53918+ } while_each_thread(tsk2, tsk);
53919+ read_unlock(&grsec_exec_file_lock);
53920+ read_unlock(&tasklist_lock);
53921+ }
53922+ rcu_read_unlock();
53923+ }
53924+
53925+ return;
53926+}
53927+
53928+int
53929+gr_check_crash_exec(const struct file *filp)
53930+{
53931+ struct acl_subject_label *curr;
53932+
53933+ if (unlikely(!gr_acl_is_enabled()))
53934+ return 0;
53935+
53936+ read_lock(&gr_inode_lock);
53937+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
53938+ __get_dev(filp->f_path.dentry),
53939+ current->role);
53940+ read_unlock(&gr_inode_lock);
53941+
53942+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
53943+ (!curr->crashes && !curr->expires))
53944+ return 0;
53945+
53946+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
53947+ time_after(curr->expires, get_seconds()))
53948+ return 1;
53949+ else if (time_before_eq(curr->expires, get_seconds())) {
53950+ curr->crashes = 0;
53951+ curr->expires = 0;
53952+ }
53953+
53954+ return 0;
53955+}
53956+
53957+void
53958+gr_handle_alertkill(struct task_struct *task)
53959+{
53960+ struct acl_subject_label *curracl;
53961+ __u32 curr_ip;
53962+ struct task_struct *p, *p2;
53963+
53964+ if (unlikely(!gr_acl_is_enabled()))
53965+ return;
53966+
53967+ curracl = task->acl;
53968+ curr_ip = task->signal->curr_ip;
53969+
53970+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
53971+ read_lock(&tasklist_lock);
53972+ do_each_thread(p2, p) {
53973+ if (p->signal->curr_ip == curr_ip)
53974+ gr_fake_force_sig(SIGKILL, p);
53975+ } while_each_thread(p2, p);
53976+ read_unlock(&tasklist_lock);
53977+ } else if (curracl->mode & GR_KILLPROC)
53978+ gr_fake_force_sig(SIGKILL, task);
53979+
53980+ return;
53981+}
53982diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
53983new file mode 100644
53984index 0000000..9d83a69
53985--- /dev/null
53986+++ b/grsecurity/gracl_shm.c
53987@@ -0,0 +1,40 @@
53988+#include <linux/kernel.h>
53989+#include <linux/mm.h>
53990+#include <linux/sched.h>
53991+#include <linux/file.h>
53992+#include <linux/ipc.h>
53993+#include <linux/gracl.h>
53994+#include <linux/grsecurity.h>
53995+#include <linux/grinternal.h>
53996+
53997+int
53998+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
53999+ const time_t shm_createtime, const uid_t cuid, const int shmid)
54000+{
54001+ struct task_struct *task;
54002+
54003+ if (!gr_acl_is_enabled())
54004+ return 1;
54005+
54006+ rcu_read_lock();
54007+ read_lock(&tasklist_lock);
54008+
54009+ task = find_task_by_vpid(shm_cprid);
54010+
54011+ if (unlikely(!task))
54012+ task = find_task_by_vpid(shm_lapid);
54013+
54014+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
54015+ (task->pid == shm_lapid)) &&
54016+ (task->acl->mode & GR_PROTSHM) &&
54017+ (task->acl != current->acl))) {
54018+ read_unlock(&tasklist_lock);
54019+ rcu_read_unlock();
54020+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
54021+ return 0;
54022+ }
54023+ read_unlock(&tasklist_lock);
54024+ rcu_read_unlock();
54025+
54026+ return 1;
54027+}
54028diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
54029new file mode 100644
54030index 0000000..bc0be01
54031--- /dev/null
54032+++ b/grsecurity/grsec_chdir.c
54033@@ -0,0 +1,19 @@
54034+#include <linux/kernel.h>
54035+#include <linux/sched.h>
54036+#include <linux/fs.h>
54037+#include <linux/file.h>
54038+#include <linux/grsecurity.h>
54039+#include <linux/grinternal.h>
54040+
54041+void
54042+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
54043+{
54044+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
54045+ if ((grsec_enable_chdir && grsec_enable_group &&
54046+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
54047+ !grsec_enable_group)) {
54048+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
54049+ }
54050+#endif
54051+ return;
54052+}
54053diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
54054new file mode 100644
54055index 0000000..a2dc675
54056--- /dev/null
54057+++ b/grsecurity/grsec_chroot.c
54058@@ -0,0 +1,351 @@
54059+#include <linux/kernel.h>
54060+#include <linux/module.h>
54061+#include <linux/sched.h>
54062+#include <linux/file.h>
54063+#include <linux/fs.h>
54064+#include <linux/mount.h>
54065+#include <linux/types.h>
54066+#include <linux/pid_namespace.h>
54067+#include <linux/grsecurity.h>
54068+#include <linux/grinternal.h>
54069+
54070+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
54071+{
54072+#ifdef CONFIG_GRKERNSEC
54073+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
54074+ path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
54075+ task->gr_is_chrooted = 1;
54076+ else
54077+ task->gr_is_chrooted = 0;
54078+
54079+ task->gr_chroot_dentry = path->dentry;
54080+#endif
54081+ return;
54082+}
54083+
54084+void gr_clear_chroot_entries(struct task_struct *task)
54085+{
54086+#ifdef CONFIG_GRKERNSEC
54087+ task->gr_is_chrooted = 0;
54088+ task->gr_chroot_dentry = NULL;
54089+#endif
54090+ return;
54091+}
54092+
54093+int
54094+gr_handle_chroot_unix(const pid_t pid)
54095+{
54096+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
54097+ struct task_struct *p;
54098+
54099+ if (unlikely(!grsec_enable_chroot_unix))
54100+ return 1;
54101+
54102+ if (likely(!proc_is_chrooted(current)))
54103+ return 1;
54104+
54105+ rcu_read_lock();
54106+ read_lock(&tasklist_lock);
54107+ p = find_task_by_vpid_unrestricted(pid);
54108+ if (unlikely(p && !have_same_root(current, p))) {
54109+ read_unlock(&tasklist_lock);
54110+ rcu_read_unlock();
54111+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
54112+ return 0;
54113+ }
54114+ read_unlock(&tasklist_lock);
54115+ rcu_read_unlock();
54116+#endif
54117+ return 1;
54118+}
54119+
54120+int
54121+gr_handle_chroot_nice(void)
54122+{
54123+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
54124+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
54125+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
54126+ return -EPERM;
54127+ }
54128+#endif
54129+ return 0;
54130+}
54131+
54132+int
54133+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
54134+{
54135+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
54136+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
54137+ && proc_is_chrooted(current)) {
54138+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
54139+ return -EACCES;
54140+ }
54141+#endif
54142+ return 0;
54143+}
54144+
54145+int
54146+gr_handle_chroot_rawio(const struct inode *inode)
54147+{
54148+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
54149+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
54150+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
54151+ return 1;
54152+#endif
54153+ return 0;
54154+}
54155+
54156+int
54157+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
54158+{
54159+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
54160+ struct task_struct *p;
54161+ int ret = 0;
54162+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
54163+ return ret;
54164+
54165+ read_lock(&tasklist_lock);
54166+ do_each_pid_task(pid, type, p) {
54167+ if (!have_same_root(current, p)) {
54168+ ret = 1;
54169+ goto out;
54170+ }
54171+ } while_each_pid_task(pid, type, p);
54172+out:
54173+ read_unlock(&tasklist_lock);
54174+ return ret;
54175+#endif
54176+ return 0;
54177+}
54178+
54179+int
54180+gr_pid_is_chrooted(struct task_struct *p)
54181+{
54182+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
54183+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
54184+ return 0;
54185+
54186+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
54187+ !have_same_root(current, p)) {
54188+ return 1;
54189+ }
54190+#endif
54191+ return 0;
54192+}
54193+
54194+EXPORT_SYMBOL(gr_pid_is_chrooted);
54195+
54196+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
54197+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
54198+{
54199+ struct path path, currentroot;
54200+ int ret = 0;
54201+
54202+ path.dentry = (struct dentry *)u_dentry;
54203+ path.mnt = (struct vfsmount *)u_mnt;
54204+ get_fs_root(current->fs, &currentroot);
54205+ if (path_is_under(&path, &currentroot))
54206+ ret = 1;
54207+ path_put(&currentroot);
54208+
54209+ return ret;
54210+}
54211+#endif
54212+
54213+int
54214+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
54215+{
54216+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
54217+ if (!grsec_enable_chroot_fchdir)
54218+ return 1;
54219+
54220+ if (!proc_is_chrooted(current))
54221+ return 1;
54222+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
54223+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
54224+ return 0;
54225+ }
54226+#endif
54227+ return 1;
54228+}
54229+
54230+int
54231+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
54232+ const time_t shm_createtime)
54233+{
54234+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
54235+ struct task_struct *p;
54236+ time_t starttime;
54237+
54238+ if (unlikely(!grsec_enable_chroot_shmat))
54239+ return 1;
54240+
54241+ if (likely(!proc_is_chrooted(current)))
54242+ return 1;
54243+
54244+ rcu_read_lock();
54245+ read_lock(&tasklist_lock);
54246+
54247+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
54248+ starttime = p->start_time.tv_sec;
54249+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
54250+ if (have_same_root(current, p)) {
54251+ goto allow;
54252+ } else {
54253+ read_unlock(&tasklist_lock);
54254+ rcu_read_unlock();
54255+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
54256+ return 0;
54257+ }
54258+ }
54259+ /* creator exited, pid reuse, fall through to next check */
54260+ }
54261+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
54262+ if (unlikely(!have_same_root(current, p))) {
54263+ read_unlock(&tasklist_lock);
54264+ rcu_read_unlock();
54265+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
54266+ return 0;
54267+ }
54268+ }
54269+
54270+allow:
54271+ read_unlock(&tasklist_lock);
54272+ rcu_read_unlock();
54273+#endif
54274+ return 1;
54275+}
54276+
54277+void
54278+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
54279+{
54280+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
54281+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
54282+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
54283+#endif
54284+ return;
54285+}
54286+
54287+int
54288+gr_handle_chroot_mknod(const struct dentry *dentry,
54289+ const struct vfsmount *mnt, const int mode)
54290+{
54291+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
54292+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
54293+ proc_is_chrooted(current)) {
54294+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
54295+ return -EPERM;
54296+ }
54297+#endif
54298+ return 0;
54299+}
54300+
54301+int
54302+gr_handle_chroot_mount(const struct dentry *dentry,
54303+ const struct vfsmount *mnt, const char *dev_name)
54304+{
54305+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
54306+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
54307+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
54308+ return -EPERM;
54309+ }
54310+#endif
54311+ return 0;
54312+}
54313+
54314+int
54315+gr_handle_chroot_pivot(void)
54316+{
54317+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
54318+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
54319+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
54320+ return -EPERM;
54321+ }
54322+#endif
54323+ return 0;
54324+}
54325+
54326+int
54327+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
54328+{
54329+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
54330+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
54331+ !gr_is_outside_chroot(dentry, mnt)) {
54332+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
54333+ return -EPERM;
54334+ }
54335+#endif
54336+ return 0;
54337+}
54338+
54339+extern const char *captab_log[];
54340+extern int captab_log_entries;
54341+
54342+int
54343+gr_chroot_is_capable(const int cap)
54344+{
54345+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
54346+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
54347+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
54348+ if (cap_raised(chroot_caps, cap)) {
54349+ const struct cred *creds = current_cred();
54350+ if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
54351+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
54352+ }
54353+ return 0;
54354+ }
54355+ }
54356+#endif
54357+ return 1;
54358+}
54359+
54360+int
54361+gr_chroot_is_capable_nolog(const int cap)
54362+{
54363+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
54364+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
54365+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
54366+ if (cap_raised(chroot_caps, cap)) {
54367+ return 0;
54368+ }
54369+ }
54370+#endif
54371+ return 1;
54372+}
54373+
54374+int
54375+gr_handle_chroot_sysctl(const int op)
54376+{
54377+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
54378+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
54379+ proc_is_chrooted(current))
54380+ return -EACCES;
54381+#endif
54382+ return 0;
54383+}
54384+
54385+void
54386+gr_handle_chroot_chdir(struct path *path)
54387+{
54388+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
54389+ if (grsec_enable_chroot_chdir)
54390+ set_fs_pwd(current->fs, path);
54391+#endif
54392+ return;
54393+}
54394+
54395+int
54396+gr_handle_chroot_chmod(const struct dentry *dentry,
54397+ const struct vfsmount *mnt, const int mode)
54398+{
54399+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
54400+ /* allow chmod +s on directories, but not files */
54401+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
54402+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
54403+ proc_is_chrooted(current)) {
54404+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
54405+ return -EPERM;
54406+ }
54407+#endif
54408+ return 0;
54409+}
54410diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
54411new file mode 100644
54412index 0000000..d81a586
54413--- /dev/null
54414+++ b/grsecurity/grsec_disabled.c
54415@@ -0,0 +1,439 @@
54416+#include <linux/kernel.h>
54417+#include <linux/module.h>
54418+#include <linux/sched.h>
54419+#include <linux/file.h>
54420+#include <linux/fs.h>
54421+#include <linux/kdev_t.h>
54422+#include <linux/net.h>
54423+#include <linux/in.h>
54424+#include <linux/ip.h>
54425+#include <linux/skbuff.h>
54426+#include <linux/sysctl.h>
54427+
54428+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
54429+void
54430+pax_set_initial_flags(struct linux_binprm *bprm)
54431+{
54432+ return;
54433+}
54434+#endif
54435+
54436+#ifdef CONFIG_SYSCTL
54437+__u32
54438+gr_handle_sysctl(const struct ctl_table * table, const int op)
54439+{
54440+ return 0;
54441+}
54442+#endif
54443+
54444+#ifdef CONFIG_TASKSTATS
54445+int gr_is_taskstats_denied(int pid)
54446+{
54447+ return 0;
54448+}
54449+#endif
54450+
54451+int
54452+gr_acl_is_enabled(void)
54453+{
54454+ return 0;
54455+}
54456+
54457+void
54458+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
54459+{
54460+ return;
54461+}
54462+
54463+int
54464+gr_handle_rawio(const struct inode *inode)
54465+{
54466+ return 0;
54467+}
54468+
54469+void
54470+gr_acl_handle_psacct(struct task_struct *task, const long code)
54471+{
54472+ return;
54473+}
54474+
54475+int
54476+gr_handle_ptrace(struct task_struct *task, const long request)
54477+{
54478+ return 0;
54479+}
54480+
54481+int
54482+gr_handle_proc_ptrace(struct task_struct *task)
54483+{
54484+ return 0;
54485+}
54486+
54487+void
54488+gr_learn_resource(const struct task_struct *task,
54489+ const int res, const unsigned long wanted, const int gt)
54490+{
54491+ return;
54492+}
54493+
54494+int
54495+gr_set_acls(const int type)
54496+{
54497+ return 0;
54498+}
54499+
54500+int
54501+gr_check_hidden_task(const struct task_struct *tsk)
54502+{
54503+ return 0;
54504+}
54505+
54506+int
54507+gr_check_protected_task(const struct task_struct *task)
54508+{
54509+ return 0;
54510+}
54511+
54512+int
54513+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
54514+{
54515+ return 0;
54516+}
54517+
54518+void
54519+gr_copy_label(struct task_struct *tsk)
54520+{
54521+ return;
54522+}
54523+
54524+void
54525+gr_set_pax_flags(struct task_struct *task)
54526+{
54527+ return;
54528+}
54529+
54530+int
54531+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
54532+ const int unsafe_share)
54533+{
54534+ return 0;
54535+}
54536+
54537+void
54538+gr_handle_delete(const ino_t ino, const dev_t dev)
54539+{
54540+ return;
54541+}
54542+
54543+void
54544+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
54545+{
54546+ return;
54547+}
54548+
54549+void
54550+gr_handle_crash(struct task_struct *task, const int sig)
54551+{
54552+ return;
54553+}
54554+
54555+int
54556+gr_check_crash_exec(const struct file *filp)
54557+{
54558+ return 0;
54559+}
54560+
54561+int
54562+gr_check_crash_uid(const uid_t uid)
54563+{
54564+ return 0;
54565+}
54566+
54567+void
54568+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
54569+ struct dentry *old_dentry,
54570+ struct dentry *new_dentry,
54571+ struct vfsmount *mnt, const __u8 replace)
54572+{
54573+ return;
54574+}
54575+
54576+int
54577+gr_search_socket(const int family, const int type, const int protocol)
54578+{
54579+ return 1;
54580+}
54581+
54582+int
54583+gr_search_connectbind(const int mode, const struct socket *sock,
54584+ const struct sockaddr_in *addr)
54585+{
54586+ return 0;
54587+}
54588+
54589+void
54590+gr_handle_alertkill(struct task_struct *task)
54591+{
54592+ return;
54593+}
54594+
54595+__u32
54596+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
54597+{
54598+ return 1;
54599+}
54600+
54601+__u32
54602+gr_acl_handle_hidden_file(const struct dentry * dentry,
54603+ const struct vfsmount * mnt)
54604+{
54605+ return 1;
54606+}
54607+
54608+__u32
54609+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
54610+ int acc_mode)
54611+{
54612+ return 1;
54613+}
54614+
54615+__u32
54616+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
54617+{
54618+ return 1;
54619+}
54620+
54621+__u32
54622+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
54623+{
54624+ return 1;
54625+}
54626+
54627+int
54628+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
54629+ unsigned int *vm_flags)
54630+{
54631+ return 1;
54632+}
54633+
54634+__u32
54635+gr_acl_handle_truncate(const struct dentry * dentry,
54636+ const struct vfsmount * mnt)
54637+{
54638+ return 1;
54639+}
54640+
54641+__u32
54642+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
54643+{
54644+ return 1;
54645+}
54646+
54647+__u32
54648+gr_acl_handle_access(const struct dentry * dentry,
54649+ const struct vfsmount * mnt, const int fmode)
54650+{
54651+ return 1;
54652+}
54653+
54654+__u32
54655+gr_acl_handle_fchmod(const struct dentry * dentry, const struct vfsmount * mnt,
54656+ mode_t mode)
54657+{
54658+ return 1;
54659+}
54660+
54661+__u32
54662+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
54663+ mode_t mode)
54664+{
54665+ return 1;
54666+}
54667+
54668+__u32
54669+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
54670+{
54671+ return 1;
54672+}
54673+
54674+__u32
54675+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
54676+{
54677+ return 1;
54678+}
54679+
54680+void
54681+grsecurity_init(void)
54682+{
54683+ return;
54684+}
54685+
54686+__u32
54687+gr_acl_handle_mknod(const struct dentry * new_dentry,
54688+ const struct dentry * parent_dentry,
54689+ const struct vfsmount * parent_mnt,
54690+ const int mode)
54691+{
54692+ return 1;
54693+}
54694+
54695+__u32
54696+gr_acl_handle_mkdir(const struct dentry * new_dentry,
54697+ const struct dentry * parent_dentry,
54698+ const struct vfsmount * parent_mnt)
54699+{
54700+ return 1;
54701+}
54702+
54703+__u32
54704+gr_acl_handle_symlink(const struct dentry * new_dentry,
54705+ const struct dentry * parent_dentry,
54706+ const struct vfsmount * parent_mnt, const char *from)
54707+{
54708+ return 1;
54709+}
54710+
54711+__u32
54712+gr_acl_handle_link(const struct dentry * new_dentry,
54713+ const struct dentry * parent_dentry,
54714+ const struct vfsmount * parent_mnt,
54715+ const struct dentry * old_dentry,
54716+ const struct vfsmount * old_mnt, const char *to)
54717+{
54718+ return 1;
54719+}
54720+
54721+int
54722+gr_acl_handle_rename(const struct dentry *new_dentry,
54723+ const struct dentry *parent_dentry,
54724+ const struct vfsmount *parent_mnt,
54725+ const struct dentry *old_dentry,
54726+ const struct inode *old_parent_inode,
54727+ const struct vfsmount *old_mnt, const char *newname)
54728+{
54729+ return 0;
54730+}
54731+
54732+int
54733+gr_acl_handle_filldir(const struct file *file, const char *name,
54734+ const int namelen, const ino_t ino)
54735+{
54736+ return 1;
54737+}
54738+
54739+int
54740+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
54741+ const time_t shm_createtime, const uid_t cuid, const int shmid)
54742+{
54743+ return 1;
54744+}
54745+
54746+int
54747+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
54748+{
54749+ return 0;
54750+}
54751+
54752+int
54753+gr_search_accept(const struct socket *sock)
54754+{
54755+ return 0;
54756+}
54757+
54758+int
54759+gr_search_listen(const struct socket *sock)
54760+{
54761+ return 0;
54762+}
54763+
54764+int
54765+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
54766+{
54767+ return 0;
54768+}
54769+
54770+__u32
54771+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
54772+{
54773+ return 1;
54774+}
54775+
54776+__u32
54777+gr_acl_handle_creat(const struct dentry * dentry,
54778+ const struct dentry * p_dentry,
54779+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
54780+ const int imode)
54781+{
54782+ return 1;
54783+}
54784+
54785+void
54786+gr_acl_handle_exit(void)
54787+{
54788+ return;
54789+}
54790+
54791+int
54792+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
54793+{
54794+ return 1;
54795+}
54796+
54797+void
54798+gr_set_role_label(const uid_t uid, const gid_t gid)
54799+{
54800+ return;
54801+}
54802+
54803+int
54804+gr_acl_handle_procpidmem(const struct task_struct *task)
54805+{
54806+ return 0;
54807+}
54808+
54809+int
54810+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
54811+{
54812+ return 0;
54813+}
54814+
54815+int
54816+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
54817+{
54818+ return 0;
54819+}
54820+
54821+void
54822+gr_set_kernel_label(struct task_struct *task)
54823+{
54824+ return;
54825+}
54826+
54827+int
54828+gr_check_user_change(int real, int effective, int fs)
54829+{
54830+ return 0;
54831+}
54832+
54833+int
54834+gr_check_group_change(int real, int effective, int fs)
54835+{
54836+ return 0;
54837+}
54838+
54839+int gr_acl_enable_at_secure(void)
54840+{
54841+ return 0;
54842+}
54843+
54844+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
54845+{
54846+ return dentry->d_inode->i_sb->s_dev;
54847+}
54848+
54849+EXPORT_SYMBOL(gr_learn_resource);
54850+EXPORT_SYMBOL(gr_set_kernel_label);
54851+#ifdef CONFIG_SECURITY
54852+EXPORT_SYMBOL(gr_check_user_change);
54853+EXPORT_SYMBOL(gr_check_group_change);
54854+#endif
54855diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
54856new file mode 100644
54857index 0000000..2b05ada
54858--- /dev/null
54859+++ b/grsecurity/grsec_exec.c
54860@@ -0,0 +1,146 @@
54861+#include <linux/kernel.h>
54862+#include <linux/sched.h>
54863+#include <linux/file.h>
54864+#include <linux/binfmts.h>
54865+#include <linux/fs.h>
54866+#include <linux/types.h>
54867+#include <linux/grdefs.h>
54868+#include <linux/grsecurity.h>
54869+#include <linux/grinternal.h>
54870+#include <linux/capability.h>
54871+#include <linux/module.h>
54872+
54873+#include <asm/uaccess.h>
54874+
54875+#ifdef CONFIG_GRKERNSEC_EXECLOG
54876+static char gr_exec_arg_buf[132];
54877+static DEFINE_MUTEX(gr_exec_arg_mutex);
54878+#endif
54879+
54880+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
54881+
54882+void
54883+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
54884+{
54885+#ifdef CONFIG_GRKERNSEC_EXECLOG
54886+ char *grarg = gr_exec_arg_buf;
54887+ unsigned int i, x, execlen = 0;
54888+ char c;
54889+
54890+ if (!((grsec_enable_execlog && grsec_enable_group &&
54891+ in_group_p(grsec_audit_gid))
54892+ || (grsec_enable_execlog && !grsec_enable_group)))
54893+ return;
54894+
54895+ mutex_lock(&gr_exec_arg_mutex);
54896+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
54897+
54898+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
54899+ const char __user *p;
54900+ unsigned int len;
54901+
54902+ p = get_user_arg_ptr(argv, i);
54903+ if (IS_ERR(p))
54904+ goto log;
54905+
54906+ len = strnlen_user(p, 128 - execlen);
54907+ if (len > 128 - execlen)
54908+ len = 128 - execlen;
54909+ else if (len > 0)
54910+ len--;
54911+ if (copy_from_user(grarg + execlen, p, len))
54912+ goto log;
54913+
54914+ /* rewrite unprintable characters */
54915+ for (x = 0; x < len; x++) {
54916+ c = *(grarg + execlen + x);
54917+ if (c < 32 || c > 126)
54918+ *(grarg + execlen + x) = ' ';
54919+ }
54920+
54921+ execlen += len;
54922+ *(grarg + execlen) = ' ';
54923+ *(grarg + execlen + 1) = '\0';
54924+ execlen++;
54925+ }
54926+
54927+ log:
54928+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
54929+ bprm->file->f_path.mnt, grarg);
54930+ mutex_unlock(&gr_exec_arg_mutex);
54931+#endif
54932+ return;
54933+}
54934+
54935+#ifdef CONFIG_GRKERNSEC
54936+extern int gr_acl_is_capable(const int cap);
54937+extern int gr_acl_is_capable_nolog(const int cap);
54938+extern int gr_chroot_is_capable(const int cap);
54939+extern int gr_chroot_is_capable_nolog(const int cap);
54940+#endif
54941+
54942+const char *captab_log[] = {
54943+ "CAP_CHOWN",
54944+ "CAP_DAC_OVERRIDE",
54945+ "CAP_DAC_READ_SEARCH",
54946+ "CAP_FOWNER",
54947+ "CAP_FSETID",
54948+ "CAP_KILL",
54949+ "CAP_SETGID",
54950+ "CAP_SETUID",
54951+ "CAP_SETPCAP",
54952+ "CAP_LINUX_IMMUTABLE",
54953+ "CAP_NET_BIND_SERVICE",
54954+ "CAP_NET_BROADCAST",
54955+ "CAP_NET_ADMIN",
54956+ "CAP_NET_RAW",
54957+ "CAP_IPC_LOCK",
54958+ "CAP_IPC_OWNER",
54959+ "CAP_SYS_MODULE",
54960+ "CAP_SYS_RAWIO",
54961+ "CAP_SYS_CHROOT",
54962+ "CAP_SYS_PTRACE",
54963+ "CAP_SYS_PACCT",
54964+ "CAP_SYS_ADMIN",
54965+ "CAP_SYS_BOOT",
54966+ "CAP_SYS_NICE",
54967+ "CAP_SYS_RESOURCE",
54968+ "CAP_SYS_TIME",
54969+ "CAP_SYS_TTY_CONFIG",
54970+ "CAP_MKNOD",
54971+ "CAP_LEASE",
54972+ "CAP_AUDIT_WRITE",
54973+ "CAP_AUDIT_CONTROL",
54974+ "CAP_SETFCAP",
54975+ "CAP_MAC_OVERRIDE",
54976+ "CAP_MAC_ADMIN",
54977+ "CAP_SYSLOG",
54978+ "CAP_WAKE_ALARM"
54979+};
54980+
54981+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
54982+
54983+int gr_is_capable(const int cap)
54984+{
54985+#ifdef CONFIG_GRKERNSEC
54986+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
54987+ return 1;
54988+ return 0;
54989+#else
54990+ return 1;
54991+#endif
54992+}
54993+
54994+int gr_is_capable_nolog(const int cap)
54995+{
54996+#ifdef CONFIG_GRKERNSEC
54997+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
54998+ return 1;
54999+ return 0;
55000+#else
55001+ return 1;
55002+#endif
55003+}
55004+
55005+EXPORT_SYMBOL(gr_is_capable);
55006+EXPORT_SYMBOL(gr_is_capable_nolog);
55007diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
55008new file mode 100644
55009index 0000000..d3ee748
55010--- /dev/null
55011+++ b/grsecurity/grsec_fifo.c
55012@@ -0,0 +1,24 @@
55013+#include <linux/kernel.h>
55014+#include <linux/sched.h>
55015+#include <linux/fs.h>
55016+#include <linux/file.h>
55017+#include <linux/grinternal.h>
55018+
55019+int
55020+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
55021+ const struct dentry *dir, const int flag, const int acc_mode)
55022+{
55023+#ifdef CONFIG_GRKERNSEC_FIFO
55024+ const struct cred *cred = current_cred();
55025+
55026+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
55027+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
55028+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
55029+ (cred->fsuid != dentry->d_inode->i_uid)) {
55030+ if (!inode_permission(dentry->d_inode, acc_mode))
55031+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
55032+ return -EACCES;
55033+ }
55034+#endif
55035+ return 0;
55036+}
55037diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
55038new file mode 100644
55039index 0000000..8ca18bf
55040--- /dev/null
55041+++ b/grsecurity/grsec_fork.c
55042@@ -0,0 +1,23 @@
55043+#include <linux/kernel.h>
55044+#include <linux/sched.h>
55045+#include <linux/grsecurity.h>
55046+#include <linux/grinternal.h>
55047+#include <linux/errno.h>
55048+
55049+void
55050+gr_log_forkfail(const int retval)
55051+{
55052+#ifdef CONFIG_GRKERNSEC_FORKFAIL
55053+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
55054+ switch (retval) {
55055+ case -EAGAIN:
55056+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
55057+ break;
55058+ case -ENOMEM:
55059+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
55060+ break;
55061+ }
55062+ }
55063+#endif
55064+ return;
55065+}
55066diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
55067new file mode 100644
55068index 0000000..01ddde4
55069--- /dev/null
55070+++ b/grsecurity/grsec_init.c
55071@@ -0,0 +1,277 @@
55072+#include <linux/kernel.h>
55073+#include <linux/sched.h>
55074+#include <linux/mm.h>
55075+#include <linux/gracl.h>
55076+#include <linux/slab.h>
55077+#include <linux/vmalloc.h>
55078+#include <linux/percpu.h>
55079+#include <linux/module.h>
55080+
55081+int grsec_enable_ptrace_readexec;
55082+int grsec_enable_setxid;
55083+int grsec_enable_brute;
55084+int grsec_enable_link;
55085+int grsec_enable_dmesg;
55086+int grsec_enable_harden_ptrace;
55087+int grsec_enable_fifo;
55088+int grsec_enable_execlog;
55089+int grsec_enable_signal;
55090+int grsec_enable_forkfail;
55091+int grsec_enable_audit_ptrace;
55092+int grsec_enable_time;
55093+int grsec_enable_audit_textrel;
55094+int grsec_enable_group;
55095+int grsec_audit_gid;
55096+int grsec_enable_chdir;
55097+int grsec_enable_mount;
55098+int grsec_enable_rofs;
55099+int grsec_enable_chroot_findtask;
55100+int grsec_enable_chroot_mount;
55101+int grsec_enable_chroot_shmat;
55102+int grsec_enable_chroot_fchdir;
55103+int grsec_enable_chroot_double;
55104+int grsec_enable_chroot_pivot;
55105+int grsec_enable_chroot_chdir;
55106+int grsec_enable_chroot_chmod;
55107+int grsec_enable_chroot_mknod;
55108+int grsec_enable_chroot_nice;
55109+int grsec_enable_chroot_execlog;
55110+int grsec_enable_chroot_caps;
55111+int grsec_enable_chroot_sysctl;
55112+int grsec_enable_chroot_unix;
55113+int grsec_enable_tpe;
55114+int grsec_tpe_gid;
55115+int grsec_enable_blackhole;
55116+#ifdef CONFIG_IPV6_MODULE
55117+EXPORT_SYMBOL(grsec_enable_blackhole);
55118+#endif
55119+int grsec_lastack_retries;
55120+int grsec_enable_tpe_all;
55121+int grsec_enable_tpe_invert;
55122+int grsec_enable_socket_all;
55123+int grsec_socket_all_gid;
55124+int grsec_enable_socket_client;
55125+int grsec_socket_client_gid;
55126+int grsec_enable_socket_server;
55127+int grsec_socket_server_gid;
55128+int grsec_resource_logging;
55129+int grsec_disable_privio;
55130+int grsec_enable_log_rwxmaps;
55131+int grsec_lock;
55132+
55133+DEFINE_SPINLOCK(grsec_alert_lock);
55134+unsigned long grsec_alert_wtime = 0;
55135+unsigned long grsec_alert_fyet = 0;
55136+
55137+DEFINE_SPINLOCK(grsec_audit_lock);
55138+
55139+DEFINE_RWLOCK(grsec_exec_file_lock);
55140+
55141+char *gr_shared_page[4];
55142+
55143+char *gr_alert_log_fmt;
55144+char *gr_audit_log_fmt;
55145+char *gr_alert_log_buf;
55146+char *gr_audit_log_buf;
55147+
55148+extern struct gr_arg *gr_usermode;
55149+extern unsigned char *gr_system_salt;
55150+extern unsigned char *gr_system_sum;
55151+
55152+void __init
55153+grsecurity_init(void)
55154+{
55155+ int j;
55156+ /* create the per-cpu shared pages */
55157+
55158+#ifdef CONFIG_X86
55159+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
55160+#endif
55161+
55162+ for (j = 0; j < 4; j++) {
55163+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
55164+ if (gr_shared_page[j] == NULL) {
55165+ panic("Unable to allocate grsecurity shared page");
55166+ return;
55167+ }
55168+ }
55169+
55170+ /* allocate log buffers */
55171+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
55172+ if (!gr_alert_log_fmt) {
55173+ panic("Unable to allocate grsecurity alert log format buffer");
55174+ return;
55175+ }
55176+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
55177+ if (!gr_audit_log_fmt) {
55178+ panic("Unable to allocate grsecurity audit log format buffer");
55179+ return;
55180+ }
55181+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
55182+ if (!gr_alert_log_buf) {
55183+ panic("Unable to allocate grsecurity alert log buffer");
55184+ return;
55185+ }
55186+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
55187+ if (!gr_audit_log_buf) {
55188+ panic("Unable to allocate grsecurity audit log buffer");
55189+ return;
55190+ }
55191+
55192+ /* allocate memory for authentication structure */
55193+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
55194+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
55195+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
55196+
55197+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
55198+ panic("Unable to allocate grsecurity authentication structure");
55199+ return;
55200+ }
55201+
55202+
55203+#ifdef CONFIG_GRKERNSEC_IO
55204+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
55205+ grsec_disable_privio = 1;
55206+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
55207+ grsec_disable_privio = 1;
55208+#else
55209+ grsec_disable_privio = 0;
55210+#endif
55211+#endif
55212+
55213+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
55214+ /* for backward compatibility, tpe_invert always defaults to on if
55215+ enabled in the kernel
55216+ */
55217+ grsec_enable_tpe_invert = 1;
55218+#endif
55219+
55220+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
55221+#ifndef CONFIG_GRKERNSEC_SYSCTL
55222+ grsec_lock = 1;
55223+#endif
55224+
55225+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
55226+ grsec_enable_audit_textrel = 1;
55227+#endif
55228+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
55229+ grsec_enable_log_rwxmaps = 1;
55230+#endif
55231+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
55232+ grsec_enable_group = 1;
55233+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
55234+#endif
55235+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
55236+ grsec_enable_ptrace_readexec = 1;
55237+#endif
55238+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
55239+ grsec_enable_chdir = 1;
55240+#endif
55241+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
55242+ grsec_enable_harden_ptrace = 1;
55243+#endif
55244+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
55245+ grsec_enable_mount = 1;
55246+#endif
55247+#ifdef CONFIG_GRKERNSEC_LINK
55248+ grsec_enable_link = 1;
55249+#endif
55250+#ifdef CONFIG_GRKERNSEC_BRUTE
55251+ grsec_enable_brute = 1;
55252+#endif
55253+#ifdef CONFIG_GRKERNSEC_DMESG
55254+ grsec_enable_dmesg = 1;
55255+#endif
55256+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
55257+ grsec_enable_blackhole = 1;
55258+ grsec_lastack_retries = 4;
55259+#endif
55260+#ifdef CONFIG_GRKERNSEC_FIFO
55261+ grsec_enable_fifo = 1;
55262+#endif
55263+#ifdef CONFIG_GRKERNSEC_EXECLOG
55264+ grsec_enable_execlog = 1;
55265+#endif
55266+#ifdef CONFIG_GRKERNSEC_SETXID
55267+ grsec_enable_setxid = 1;
55268+#endif
55269+#ifdef CONFIG_GRKERNSEC_SIGNAL
55270+ grsec_enable_signal = 1;
55271+#endif
55272+#ifdef CONFIG_GRKERNSEC_FORKFAIL
55273+ grsec_enable_forkfail = 1;
55274+#endif
55275+#ifdef CONFIG_GRKERNSEC_TIME
55276+ grsec_enable_time = 1;
55277+#endif
55278+#ifdef CONFIG_GRKERNSEC_RESLOG
55279+ grsec_resource_logging = 1;
55280+#endif
55281+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
55282+ grsec_enable_chroot_findtask = 1;
55283+#endif
55284+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
55285+ grsec_enable_chroot_unix = 1;
55286+#endif
55287+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
55288+ grsec_enable_chroot_mount = 1;
55289+#endif
55290+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
55291+ grsec_enable_chroot_fchdir = 1;
55292+#endif
55293+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
55294+ grsec_enable_chroot_shmat = 1;
55295+#endif
55296+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
55297+ grsec_enable_audit_ptrace = 1;
55298+#endif
55299+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
55300+ grsec_enable_chroot_double = 1;
55301+#endif
55302+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
55303+ grsec_enable_chroot_pivot = 1;
55304+#endif
55305+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
55306+ grsec_enable_chroot_chdir = 1;
55307+#endif
55308+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
55309+ grsec_enable_chroot_chmod = 1;
55310+#endif
55311+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
55312+ grsec_enable_chroot_mknod = 1;
55313+#endif
55314+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
55315+ grsec_enable_chroot_nice = 1;
55316+#endif
55317+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
55318+ grsec_enable_chroot_execlog = 1;
55319+#endif
55320+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
55321+ grsec_enable_chroot_caps = 1;
55322+#endif
55323+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
55324+ grsec_enable_chroot_sysctl = 1;
55325+#endif
55326+#ifdef CONFIG_GRKERNSEC_TPE
55327+ grsec_enable_tpe = 1;
55328+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
55329+#ifdef CONFIG_GRKERNSEC_TPE_ALL
55330+ grsec_enable_tpe_all = 1;
55331+#endif
55332+#endif
55333+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
55334+ grsec_enable_socket_all = 1;
55335+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
55336+#endif
55337+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
55338+ grsec_enable_socket_client = 1;
55339+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
55340+#endif
55341+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
55342+ grsec_enable_socket_server = 1;
55343+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
55344+#endif
55345+#endif
55346+
55347+ return;
55348+}
55349diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
55350new file mode 100644
55351index 0000000..3efe141
55352--- /dev/null
55353+++ b/grsecurity/grsec_link.c
55354@@ -0,0 +1,43 @@
55355+#include <linux/kernel.h>
55356+#include <linux/sched.h>
55357+#include <linux/fs.h>
55358+#include <linux/file.h>
55359+#include <linux/grinternal.h>
55360+
55361+int
55362+gr_handle_follow_link(const struct inode *parent,
55363+ const struct inode *inode,
55364+ const struct dentry *dentry, const struct vfsmount *mnt)
55365+{
55366+#ifdef CONFIG_GRKERNSEC_LINK
55367+ const struct cred *cred = current_cred();
55368+
55369+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
55370+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
55371+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
55372+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
55373+ return -EACCES;
55374+ }
55375+#endif
55376+ return 0;
55377+}
55378+
55379+int
55380+gr_handle_hardlink(const struct dentry *dentry,
55381+ const struct vfsmount *mnt,
55382+ struct inode *inode, const int mode, const char *to)
55383+{
55384+#ifdef CONFIG_GRKERNSEC_LINK
55385+ const struct cred *cred = current_cred();
55386+
55387+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
55388+ (!S_ISREG(mode) || (mode & S_ISUID) ||
55389+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
55390+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
55391+ !capable(CAP_FOWNER) && cred->uid) {
55392+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
55393+ return -EPERM;
55394+ }
55395+#endif
55396+ return 0;
55397+}
55398diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
55399new file mode 100644
55400index 0000000..a45d2e9
55401--- /dev/null
55402+++ b/grsecurity/grsec_log.c
55403@@ -0,0 +1,322 @@
55404+#include <linux/kernel.h>
55405+#include <linux/sched.h>
55406+#include <linux/file.h>
55407+#include <linux/tty.h>
55408+#include <linux/fs.h>
55409+#include <linux/grinternal.h>
55410+
55411+#ifdef CONFIG_TREE_PREEMPT_RCU
55412+#define DISABLE_PREEMPT() preempt_disable()
55413+#define ENABLE_PREEMPT() preempt_enable()
55414+#else
55415+#define DISABLE_PREEMPT()
55416+#define ENABLE_PREEMPT()
55417+#endif
55418+
55419+#define BEGIN_LOCKS(x) \
55420+ DISABLE_PREEMPT(); \
55421+ rcu_read_lock(); \
55422+ read_lock(&tasklist_lock); \
55423+ read_lock(&grsec_exec_file_lock); \
55424+ if (x != GR_DO_AUDIT) \
55425+ spin_lock(&grsec_alert_lock); \
55426+ else \
55427+ spin_lock(&grsec_audit_lock)
55428+
55429+#define END_LOCKS(x) \
55430+ if (x != GR_DO_AUDIT) \
55431+ spin_unlock(&grsec_alert_lock); \
55432+ else \
55433+ spin_unlock(&grsec_audit_lock); \
55434+ read_unlock(&grsec_exec_file_lock); \
55435+ read_unlock(&tasklist_lock); \
55436+ rcu_read_unlock(); \
55437+ ENABLE_PREEMPT(); \
55438+ if (x == GR_DONT_AUDIT) \
55439+ gr_handle_alertkill(current)
55440+
55441+enum {
55442+ FLOODING,
55443+ NO_FLOODING
55444+};
55445+
55446+extern char *gr_alert_log_fmt;
55447+extern char *gr_audit_log_fmt;
55448+extern char *gr_alert_log_buf;
55449+extern char *gr_audit_log_buf;
55450+
55451+static int gr_log_start(int audit)
55452+{
55453+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
55454+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
55455+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
55456+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
55457+ unsigned long curr_secs = get_seconds();
55458+
55459+ if (audit == GR_DO_AUDIT)
55460+ goto set_fmt;
55461+
55462+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
55463+ grsec_alert_wtime = curr_secs;
55464+ grsec_alert_fyet = 0;
55465+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
55466+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
55467+ grsec_alert_fyet++;
55468+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
55469+ grsec_alert_wtime = curr_secs;
55470+ grsec_alert_fyet++;
55471+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
55472+ return FLOODING;
55473+ }
55474+ else return FLOODING;
55475+
55476+set_fmt:
55477+#endif
55478+ memset(buf, 0, PAGE_SIZE);
55479+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
55480+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
55481+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
55482+ } else if (current->signal->curr_ip) {
55483+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
55484+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
55485+ } else if (gr_acl_is_enabled()) {
55486+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
55487+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
55488+ } else {
55489+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
55490+ strcpy(buf, fmt);
55491+ }
55492+
55493+ return NO_FLOODING;
55494+}
55495+
55496+static void gr_log_middle(int audit, const char *msg, va_list ap)
55497+ __attribute__ ((format (printf, 2, 0)));
55498+
55499+static void gr_log_middle(int audit, const char *msg, va_list ap)
55500+{
55501+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
55502+ unsigned int len = strlen(buf);
55503+
55504+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
55505+
55506+ return;
55507+}
55508+
55509+static void gr_log_middle_varargs(int audit, const char *msg, ...)
55510+ __attribute__ ((format (printf, 2, 3)));
55511+
55512+static void gr_log_middle_varargs(int audit, const char *msg, ...)
55513+{
55514+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
55515+ unsigned int len = strlen(buf);
55516+ va_list ap;
55517+
55518+ va_start(ap, msg);
55519+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
55520+ va_end(ap);
55521+
55522+ return;
55523+}
55524+
55525+static void gr_log_end(int audit, int append_default)
55526+{
55527+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
55528+
55529+ if (append_default) {
55530+ unsigned int len = strlen(buf);
55531+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
55532+ }
55533+
55534+ printk("%s\n", buf);
55535+
55536+ return;
55537+}
55538+
55539+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
55540+{
55541+ int logtype;
55542+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
55543+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
55544+ void *voidptr = NULL;
55545+ int num1 = 0, num2 = 0;
55546+ unsigned long ulong1 = 0, ulong2 = 0;
55547+ struct dentry *dentry = NULL;
55548+ struct vfsmount *mnt = NULL;
55549+ struct file *file = NULL;
55550+ struct task_struct *task = NULL;
55551+ const struct cred *cred, *pcred;
55552+ va_list ap;
55553+
55554+ BEGIN_LOCKS(audit);
55555+ logtype = gr_log_start(audit);
55556+ if (logtype == FLOODING) {
55557+ END_LOCKS(audit);
55558+ return;
55559+ }
55560+ va_start(ap, argtypes);
55561+ switch (argtypes) {
55562+ case GR_TTYSNIFF:
55563+ task = va_arg(ap, struct task_struct *);
55564+ 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);
55565+ break;
55566+ case GR_SYSCTL_HIDDEN:
55567+ str1 = va_arg(ap, char *);
55568+ gr_log_middle_varargs(audit, msg, result, str1);
55569+ break;
55570+ case GR_RBAC:
55571+ dentry = va_arg(ap, struct dentry *);
55572+ mnt = va_arg(ap, struct vfsmount *);
55573+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
55574+ break;
55575+ case GR_RBAC_STR:
55576+ dentry = va_arg(ap, struct dentry *);
55577+ mnt = va_arg(ap, struct vfsmount *);
55578+ str1 = va_arg(ap, char *);
55579+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
55580+ break;
55581+ case GR_STR_RBAC:
55582+ str1 = va_arg(ap, char *);
55583+ dentry = va_arg(ap, struct dentry *);
55584+ mnt = va_arg(ap, struct vfsmount *);
55585+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
55586+ break;
55587+ case GR_RBAC_MODE2:
55588+ dentry = va_arg(ap, struct dentry *);
55589+ mnt = va_arg(ap, struct vfsmount *);
55590+ str1 = va_arg(ap, char *);
55591+ str2 = va_arg(ap, char *);
55592+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
55593+ break;
55594+ case GR_RBAC_MODE3:
55595+ dentry = va_arg(ap, struct dentry *);
55596+ mnt = va_arg(ap, struct vfsmount *);
55597+ str1 = va_arg(ap, char *);
55598+ str2 = va_arg(ap, char *);
55599+ str3 = va_arg(ap, char *);
55600+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
55601+ break;
55602+ case GR_FILENAME:
55603+ dentry = va_arg(ap, struct dentry *);
55604+ mnt = va_arg(ap, struct vfsmount *);
55605+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
55606+ break;
55607+ case GR_STR_FILENAME:
55608+ str1 = va_arg(ap, char *);
55609+ dentry = va_arg(ap, struct dentry *);
55610+ mnt = va_arg(ap, struct vfsmount *);
55611+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
55612+ break;
55613+ case GR_FILENAME_STR:
55614+ dentry = va_arg(ap, struct dentry *);
55615+ mnt = va_arg(ap, struct vfsmount *);
55616+ str1 = va_arg(ap, char *);
55617+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
55618+ break;
55619+ case GR_FILENAME_TWO_INT:
55620+ dentry = va_arg(ap, struct dentry *);
55621+ mnt = va_arg(ap, struct vfsmount *);
55622+ num1 = va_arg(ap, int);
55623+ num2 = va_arg(ap, int);
55624+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
55625+ break;
55626+ case GR_FILENAME_TWO_INT_STR:
55627+ dentry = va_arg(ap, struct dentry *);
55628+ mnt = va_arg(ap, struct vfsmount *);
55629+ num1 = va_arg(ap, int);
55630+ num2 = va_arg(ap, int);
55631+ str1 = va_arg(ap, char *);
55632+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
55633+ break;
55634+ case GR_TEXTREL:
55635+ file = va_arg(ap, struct file *);
55636+ ulong1 = va_arg(ap, unsigned long);
55637+ ulong2 = va_arg(ap, unsigned long);
55638+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
55639+ break;
55640+ case GR_PTRACE:
55641+ task = va_arg(ap, struct task_struct *);
55642+ 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);
55643+ break;
55644+ case GR_RESOURCE:
55645+ task = va_arg(ap, struct task_struct *);
55646+ cred = __task_cred(task);
55647+ pcred = __task_cred(task->real_parent);
55648+ ulong1 = va_arg(ap, unsigned long);
55649+ str1 = va_arg(ap, char *);
55650+ ulong2 = va_arg(ap, unsigned long);
55651+ 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);
55652+ break;
55653+ case GR_CAP:
55654+ task = va_arg(ap, struct task_struct *);
55655+ cred = __task_cred(task);
55656+ pcred = __task_cred(task->real_parent);
55657+ str1 = va_arg(ap, char *);
55658+ 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);
55659+ break;
55660+ case GR_SIG:
55661+ str1 = va_arg(ap, char *);
55662+ voidptr = va_arg(ap, void *);
55663+ gr_log_middle_varargs(audit, msg, str1, voidptr);
55664+ break;
55665+ case GR_SIG2:
55666+ task = va_arg(ap, struct task_struct *);
55667+ cred = __task_cred(task);
55668+ pcred = __task_cred(task->real_parent);
55669+ num1 = va_arg(ap, int);
55670+ 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);
55671+ break;
55672+ case GR_CRASH1:
55673+ task = va_arg(ap, struct task_struct *);
55674+ cred = __task_cred(task);
55675+ pcred = __task_cred(task->real_parent);
55676+ ulong1 = va_arg(ap, unsigned long);
55677+ 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);
55678+ break;
55679+ case GR_CRASH2:
55680+ task = va_arg(ap, struct task_struct *);
55681+ cred = __task_cred(task);
55682+ pcred = __task_cred(task->real_parent);
55683+ ulong1 = va_arg(ap, unsigned long);
55684+ 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);
55685+ break;
55686+ case GR_RWXMAP:
55687+ file = va_arg(ap, struct file *);
55688+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
55689+ break;
55690+ case GR_PSACCT:
55691+ {
55692+ unsigned int wday, cday;
55693+ __u8 whr, chr;
55694+ __u8 wmin, cmin;
55695+ __u8 wsec, csec;
55696+ char cur_tty[64] = { 0 };
55697+ char parent_tty[64] = { 0 };
55698+
55699+ task = va_arg(ap, struct task_struct *);
55700+ wday = va_arg(ap, unsigned int);
55701+ cday = va_arg(ap, unsigned int);
55702+ whr = va_arg(ap, int);
55703+ chr = va_arg(ap, int);
55704+ wmin = va_arg(ap, int);
55705+ cmin = va_arg(ap, int);
55706+ wsec = va_arg(ap, int);
55707+ csec = va_arg(ap, int);
55708+ ulong1 = va_arg(ap, unsigned long);
55709+ cred = __task_cred(task);
55710+ pcred = __task_cred(task->real_parent);
55711+
55712+ 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);
55713+ }
55714+ break;
55715+ default:
55716+ gr_log_middle(audit, msg, ap);
55717+ }
55718+ va_end(ap);
55719+ // these don't need DEFAULTSECARGS printed on the end
55720+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
55721+ gr_log_end(audit, 0);
55722+ else
55723+ gr_log_end(audit, 1);
55724+ END_LOCKS(audit);
55725+}
55726diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
55727new file mode 100644
55728index 0000000..f536303
55729--- /dev/null
55730+++ b/grsecurity/grsec_mem.c
55731@@ -0,0 +1,40 @@
55732+#include <linux/kernel.h>
55733+#include <linux/sched.h>
55734+#include <linux/mm.h>
55735+#include <linux/mman.h>
55736+#include <linux/grinternal.h>
55737+
55738+void
55739+gr_handle_ioperm(void)
55740+{
55741+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
55742+ return;
55743+}
55744+
55745+void
55746+gr_handle_iopl(void)
55747+{
55748+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
55749+ return;
55750+}
55751+
55752+void
55753+gr_handle_mem_readwrite(u64 from, u64 to)
55754+{
55755+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
55756+ return;
55757+}
55758+
55759+void
55760+gr_handle_vm86(void)
55761+{
55762+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
55763+ return;
55764+}
55765+
55766+void
55767+gr_log_badprocpid(const char *entry)
55768+{
55769+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
55770+ return;
55771+}
55772diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
55773new file mode 100644
55774index 0000000..2131422
55775--- /dev/null
55776+++ b/grsecurity/grsec_mount.c
55777@@ -0,0 +1,62 @@
55778+#include <linux/kernel.h>
55779+#include <linux/sched.h>
55780+#include <linux/mount.h>
55781+#include <linux/grsecurity.h>
55782+#include <linux/grinternal.h>
55783+
55784+void
55785+gr_log_remount(const char *devname, const int retval)
55786+{
55787+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
55788+ if (grsec_enable_mount && (retval >= 0))
55789+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
55790+#endif
55791+ return;
55792+}
55793+
55794+void
55795+gr_log_unmount(const char *devname, const int retval)
55796+{
55797+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
55798+ if (grsec_enable_mount && (retval >= 0))
55799+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
55800+#endif
55801+ return;
55802+}
55803+
55804+void
55805+gr_log_mount(const char *from, const char *to, const int retval)
55806+{
55807+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
55808+ if (grsec_enable_mount && (retval >= 0))
55809+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
55810+#endif
55811+ return;
55812+}
55813+
55814+int
55815+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
55816+{
55817+#ifdef CONFIG_GRKERNSEC_ROFS
55818+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
55819+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
55820+ return -EPERM;
55821+ } else
55822+ return 0;
55823+#endif
55824+ return 0;
55825+}
55826+
55827+int
55828+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
55829+{
55830+#ifdef CONFIG_GRKERNSEC_ROFS
55831+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
55832+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
55833+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
55834+ return -EPERM;
55835+ } else
55836+ return 0;
55837+#endif
55838+ return 0;
55839+}
55840diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
55841new file mode 100644
55842index 0000000..a3b12a0
55843--- /dev/null
55844+++ b/grsecurity/grsec_pax.c
55845@@ -0,0 +1,36 @@
55846+#include <linux/kernel.h>
55847+#include <linux/sched.h>
55848+#include <linux/mm.h>
55849+#include <linux/file.h>
55850+#include <linux/grinternal.h>
55851+#include <linux/grsecurity.h>
55852+
55853+void
55854+gr_log_textrel(struct vm_area_struct * vma)
55855+{
55856+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
55857+ if (grsec_enable_audit_textrel)
55858+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
55859+#endif
55860+ return;
55861+}
55862+
55863+void
55864+gr_log_rwxmmap(struct file *file)
55865+{
55866+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
55867+ if (grsec_enable_log_rwxmaps)
55868+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
55869+#endif
55870+ return;
55871+}
55872+
55873+void
55874+gr_log_rwxmprotect(struct file *file)
55875+{
55876+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
55877+ if (grsec_enable_log_rwxmaps)
55878+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
55879+#endif
55880+ return;
55881+}
55882diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
55883new file mode 100644
55884index 0000000..f7f29aa
55885--- /dev/null
55886+++ b/grsecurity/grsec_ptrace.c
55887@@ -0,0 +1,30 @@
55888+#include <linux/kernel.h>
55889+#include <linux/sched.h>
55890+#include <linux/grinternal.h>
55891+#include <linux/security.h>
55892+
55893+void
55894+gr_audit_ptrace(struct task_struct *task)
55895+{
55896+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
55897+ if (grsec_enable_audit_ptrace)
55898+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
55899+#endif
55900+ return;
55901+}
55902+
55903+int
55904+gr_ptrace_readexec(struct file *file, int unsafe_flags)
55905+{
55906+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
55907+ const struct dentry *dentry = file->f_path.dentry;
55908+ const struct vfsmount *mnt = file->f_path.mnt;
55909+
55910+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
55911+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
55912+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
55913+ return -EACCES;
55914+ }
55915+#endif
55916+ return 0;
55917+}
55918diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
55919new file mode 100644
55920index 0000000..7a5b2de
55921--- /dev/null
55922+++ b/grsecurity/grsec_sig.c
55923@@ -0,0 +1,207 @@
55924+#include <linux/kernel.h>
55925+#include <linux/sched.h>
55926+#include <linux/delay.h>
55927+#include <linux/grsecurity.h>
55928+#include <linux/grinternal.h>
55929+#include <linux/hardirq.h>
55930+
55931+char *signames[] = {
55932+ [SIGSEGV] = "Segmentation fault",
55933+ [SIGILL] = "Illegal instruction",
55934+ [SIGABRT] = "Abort",
55935+ [SIGBUS] = "Invalid alignment/Bus error"
55936+};
55937+
55938+void
55939+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
55940+{
55941+#ifdef CONFIG_GRKERNSEC_SIGNAL
55942+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
55943+ (sig == SIGABRT) || (sig == SIGBUS))) {
55944+ if (t->pid == current->pid) {
55945+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
55946+ } else {
55947+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
55948+ }
55949+ }
55950+#endif
55951+ return;
55952+}
55953+
55954+int
55955+gr_handle_signal(const struct task_struct *p, const int sig)
55956+{
55957+#ifdef CONFIG_GRKERNSEC
55958+ /* ignore the 0 signal for protected task checks */
55959+ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
55960+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
55961+ return -EPERM;
55962+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
55963+ return -EPERM;
55964+ }
55965+#endif
55966+ return 0;
55967+}
55968+
55969+#ifdef CONFIG_GRKERNSEC
55970+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
55971+
55972+int gr_fake_force_sig(int sig, struct task_struct *t)
55973+{
55974+ unsigned long int flags;
55975+ int ret, blocked, ignored;
55976+ struct k_sigaction *action;
55977+
55978+ spin_lock_irqsave(&t->sighand->siglock, flags);
55979+ action = &t->sighand->action[sig-1];
55980+ ignored = action->sa.sa_handler == SIG_IGN;
55981+ blocked = sigismember(&t->blocked, sig);
55982+ if (blocked || ignored) {
55983+ action->sa.sa_handler = SIG_DFL;
55984+ if (blocked) {
55985+ sigdelset(&t->blocked, sig);
55986+ recalc_sigpending_and_wake(t);
55987+ }
55988+ }
55989+ if (action->sa.sa_handler == SIG_DFL)
55990+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
55991+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
55992+
55993+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
55994+
55995+ return ret;
55996+}
55997+#endif
55998+
55999+#ifdef CONFIG_GRKERNSEC_BRUTE
56000+#define GR_USER_BAN_TIME (15 * 60)
56001+
56002+static int __get_dumpable(unsigned long mm_flags)
56003+{
56004+ int ret;
56005+
56006+ ret = mm_flags & MMF_DUMPABLE_MASK;
56007+ return (ret >= 2) ? 2 : ret;
56008+}
56009+#endif
56010+
56011+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
56012+{
56013+#ifdef CONFIG_GRKERNSEC_BRUTE
56014+ uid_t uid = 0;
56015+
56016+ if (!grsec_enable_brute)
56017+ return;
56018+
56019+ rcu_read_lock();
56020+ read_lock(&tasklist_lock);
56021+ read_lock(&grsec_exec_file_lock);
56022+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
56023+ p->real_parent->brute = 1;
56024+ else {
56025+ const struct cred *cred = __task_cred(p), *cred2;
56026+ struct task_struct *tsk, *tsk2;
56027+
56028+ if (!__get_dumpable(mm_flags) && cred->uid) {
56029+ struct user_struct *user;
56030+
56031+ uid = cred->uid;
56032+
56033+ /* this is put upon execution past expiration */
56034+ user = find_user(uid);
56035+ if (user == NULL)
56036+ goto unlock;
56037+ user->banned = 1;
56038+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
56039+ if (user->ban_expires == ~0UL)
56040+ user->ban_expires--;
56041+
56042+ do_each_thread(tsk2, tsk) {
56043+ cred2 = __task_cred(tsk);
56044+ if (tsk != p && cred2->uid == uid)
56045+ gr_fake_force_sig(SIGKILL, tsk);
56046+ } while_each_thread(tsk2, tsk);
56047+ }
56048+ }
56049+unlock:
56050+ read_unlock(&grsec_exec_file_lock);
56051+ read_unlock(&tasklist_lock);
56052+ rcu_read_unlock();
56053+
56054+ if (uid)
56055+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
56056+
56057+#endif
56058+ return;
56059+}
56060+
56061+void gr_handle_brute_check(void)
56062+{
56063+#ifdef CONFIG_GRKERNSEC_BRUTE
56064+ if (current->brute)
56065+ msleep(30 * 1000);
56066+#endif
56067+ return;
56068+}
56069+
56070+void gr_handle_kernel_exploit(void)
56071+{
56072+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
56073+ const struct cred *cred;
56074+ struct task_struct *tsk, *tsk2;
56075+ struct user_struct *user;
56076+ uid_t uid;
56077+
56078+ if (in_irq() || in_serving_softirq() || in_nmi())
56079+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
56080+
56081+ uid = current_uid();
56082+
56083+ if (uid == 0)
56084+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
56085+ else {
56086+ /* kill all the processes of this user, hold a reference
56087+ to their creds struct, and prevent them from creating
56088+ another process until system reset
56089+ */
56090+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
56091+ /* we intentionally leak this ref */
56092+ user = get_uid(current->cred->user);
56093+ if (user) {
56094+ user->banned = 1;
56095+ user->ban_expires = ~0UL;
56096+ }
56097+
56098+ read_lock(&tasklist_lock);
56099+ do_each_thread(tsk2, tsk) {
56100+ cred = __task_cred(tsk);
56101+ if (cred->uid == uid)
56102+ gr_fake_force_sig(SIGKILL, tsk);
56103+ } while_each_thread(tsk2, tsk);
56104+ read_unlock(&tasklist_lock);
56105+ }
56106+#endif
56107+}
56108+
56109+int __gr_process_user_ban(struct user_struct *user)
56110+{
56111+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
56112+ if (unlikely(user->banned)) {
56113+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
56114+ user->banned = 0;
56115+ user->ban_expires = 0;
56116+ free_uid(user);
56117+ } else
56118+ return -EPERM;
56119+ }
56120+#endif
56121+ return 0;
56122+}
56123+
56124+int gr_process_user_ban(void)
56125+{
56126+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
56127+ return __gr_process_user_ban(current->cred->user);
56128+#endif
56129+ return 0;
56130+}
56131diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
56132new file mode 100644
56133index 0000000..4030d57
56134--- /dev/null
56135+++ b/grsecurity/grsec_sock.c
56136@@ -0,0 +1,244 @@
56137+#include <linux/kernel.h>
56138+#include <linux/module.h>
56139+#include <linux/sched.h>
56140+#include <linux/file.h>
56141+#include <linux/net.h>
56142+#include <linux/in.h>
56143+#include <linux/ip.h>
56144+#include <net/sock.h>
56145+#include <net/inet_sock.h>
56146+#include <linux/grsecurity.h>
56147+#include <linux/grinternal.h>
56148+#include <linux/gracl.h>
56149+
56150+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
56151+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
56152+
56153+EXPORT_SYMBOL(gr_search_udp_recvmsg);
56154+EXPORT_SYMBOL(gr_search_udp_sendmsg);
56155+
56156+#ifdef CONFIG_UNIX_MODULE
56157+EXPORT_SYMBOL(gr_acl_handle_unix);
56158+EXPORT_SYMBOL(gr_acl_handle_mknod);
56159+EXPORT_SYMBOL(gr_handle_chroot_unix);
56160+EXPORT_SYMBOL(gr_handle_create);
56161+#endif
56162+
56163+#ifdef CONFIG_GRKERNSEC
56164+#define gr_conn_table_size 32749
56165+struct conn_table_entry {
56166+ struct conn_table_entry *next;
56167+ struct signal_struct *sig;
56168+};
56169+
56170+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
56171+DEFINE_SPINLOCK(gr_conn_table_lock);
56172+
56173+extern const char * gr_socktype_to_name(unsigned char type);
56174+extern const char * gr_proto_to_name(unsigned char proto);
56175+extern const char * gr_sockfamily_to_name(unsigned char family);
56176+
56177+static __inline__ int
56178+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
56179+{
56180+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
56181+}
56182+
56183+static __inline__ int
56184+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
56185+ __u16 sport, __u16 dport)
56186+{
56187+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
56188+ sig->gr_sport == sport && sig->gr_dport == dport))
56189+ return 1;
56190+ else
56191+ return 0;
56192+}
56193+
56194+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
56195+{
56196+ struct conn_table_entry **match;
56197+ unsigned int index;
56198+
56199+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
56200+ sig->gr_sport, sig->gr_dport,
56201+ gr_conn_table_size);
56202+
56203+ newent->sig = sig;
56204+
56205+ match = &gr_conn_table[index];
56206+ newent->next = *match;
56207+ *match = newent;
56208+
56209+ return;
56210+}
56211+
56212+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
56213+{
56214+ struct conn_table_entry *match, *last = NULL;
56215+ unsigned int index;
56216+
56217+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
56218+ sig->gr_sport, sig->gr_dport,
56219+ gr_conn_table_size);
56220+
56221+ match = gr_conn_table[index];
56222+ while (match && !conn_match(match->sig,
56223+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
56224+ sig->gr_dport)) {
56225+ last = match;
56226+ match = match->next;
56227+ }
56228+
56229+ if (match) {
56230+ if (last)
56231+ last->next = match->next;
56232+ else
56233+ gr_conn_table[index] = NULL;
56234+ kfree(match);
56235+ }
56236+
56237+ return;
56238+}
56239+
56240+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
56241+ __u16 sport, __u16 dport)
56242+{
56243+ struct conn_table_entry *match;
56244+ unsigned int index;
56245+
56246+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
56247+
56248+ match = gr_conn_table[index];
56249+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
56250+ match = match->next;
56251+
56252+ if (match)
56253+ return match->sig;
56254+ else
56255+ return NULL;
56256+}
56257+
56258+#endif
56259+
56260+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
56261+{
56262+#ifdef CONFIG_GRKERNSEC
56263+ struct signal_struct *sig = task->signal;
56264+ struct conn_table_entry *newent;
56265+
56266+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
56267+ if (newent == NULL)
56268+ return;
56269+ /* no bh lock needed since we are called with bh disabled */
56270+ spin_lock(&gr_conn_table_lock);
56271+ gr_del_task_from_ip_table_nolock(sig);
56272+ sig->gr_saddr = inet->inet_rcv_saddr;
56273+ sig->gr_daddr = inet->inet_daddr;
56274+ sig->gr_sport = inet->inet_sport;
56275+ sig->gr_dport = inet->inet_dport;
56276+ gr_add_to_task_ip_table_nolock(sig, newent);
56277+ spin_unlock(&gr_conn_table_lock);
56278+#endif
56279+ return;
56280+}
56281+
56282+void gr_del_task_from_ip_table(struct task_struct *task)
56283+{
56284+#ifdef CONFIG_GRKERNSEC
56285+ spin_lock_bh(&gr_conn_table_lock);
56286+ gr_del_task_from_ip_table_nolock(task->signal);
56287+ spin_unlock_bh(&gr_conn_table_lock);
56288+#endif
56289+ return;
56290+}
56291+
56292+void
56293+gr_attach_curr_ip(const struct sock *sk)
56294+{
56295+#ifdef CONFIG_GRKERNSEC
56296+ struct signal_struct *p, *set;
56297+ const struct inet_sock *inet = inet_sk(sk);
56298+
56299+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
56300+ return;
56301+
56302+ set = current->signal;
56303+
56304+ spin_lock_bh(&gr_conn_table_lock);
56305+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
56306+ inet->inet_dport, inet->inet_sport);
56307+ if (unlikely(p != NULL)) {
56308+ set->curr_ip = p->curr_ip;
56309+ set->used_accept = 1;
56310+ gr_del_task_from_ip_table_nolock(p);
56311+ spin_unlock_bh(&gr_conn_table_lock);
56312+ return;
56313+ }
56314+ spin_unlock_bh(&gr_conn_table_lock);
56315+
56316+ set->curr_ip = inet->inet_daddr;
56317+ set->used_accept = 1;
56318+#endif
56319+ return;
56320+}
56321+
56322+int
56323+gr_handle_sock_all(const int family, const int type, const int protocol)
56324+{
56325+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
56326+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
56327+ (family != AF_UNIX)) {
56328+ if (family == AF_INET)
56329+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
56330+ else
56331+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
56332+ return -EACCES;
56333+ }
56334+#endif
56335+ return 0;
56336+}
56337+
56338+int
56339+gr_handle_sock_server(const struct sockaddr *sck)
56340+{
56341+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
56342+ if (grsec_enable_socket_server &&
56343+ in_group_p(grsec_socket_server_gid) &&
56344+ sck && (sck->sa_family != AF_UNIX) &&
56345+ (sck->sa_family != AF_LOCAL)) {
56346+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
56347+ return -EACCES;
56348+ }
56349+#endif
56350+ return 0;
56351+}
56352+
56353+int
56354+gr_handle_sock_server_other(const struct sock *sck)
56355+{
56356+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
56357+ if (grsec_enable_socket_server &&
56358+ in_group_p(grsec_socket_server_gid) &&
56359+ sck && (sck->sk_family != AF_UNIX) &&
56360+ (sck->sk_family != AF_LOCAL)) {
56361+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
56362+ return -EACCES;
56363+ }
56364+#endif
56365+ return 0;
56366+}
56367+
56368+int
56369+gr_handle_sock_client(const struct sockaddr *sck)
56370+{
56371+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
56372+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
56373+ sck && (sck->sa_family != AF_UNIX) &&
56374+ (sck->sa_family != AF_LOCAL)) {
56375+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
56376+ return -EACCES;
56377+ }
56378+#endif
56379+ return 0;
56380+}
56381diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
56382new file mode 100644
56383index 0000000..a1aedd7
56384--- /dev/null
56385+++ b/grsecurity/grsec_sysctl.c
56386@@ -0,0 +1,451 @@
56387+#include <linux/kernel.h>
56388+#include <linux/sched.h>
56389+#include <linux/sysctl.h>
56390+#include <linux/grsecurity.h>
56391+#include <linux/grinternal.h>
56392+
56393+int
56394+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
56395+{
56396+#ifdef CONFIG_GRKERNSEC_SYSCTL
56397+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
56398+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
56399+ return -EACCES;
56400+ }
56401+#endif
56402+ return 0;
56403+}
56404+
56405+#ifdef CONFIG_GRKERNSEC_ROFS
56406+static int __maybe_unused one = 1;
56407+#endif
56408+
56409+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
56410+struct ctl_table grsecurity_table[] = {
56411+#ifdef CONFIG_GRKERNSEC_SYSCTL
56412+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
56413+#ifdef CONFIG_GRKERNSEC_IO
56414+ {
56415+ .procname = "disable_priv_io",
56416+ .data = &grsec_disable_privio,
56417+ .maxlen = sizeof(int),
56418+ .mode = 0600,
56419+ .proc_handler = &proc_dointvec,
56420+ },
56421+#endif
56422+#endif
56423+#ifdef CONFIG_GRKERNSEC_LINK
56424+ {
56425+ .procname = "linking_restrictions",
56426+ .data = &grsec_enable_link,
56427+ .maxlen = sizeof(int),
56428+ .mode = 0600,
56429+ .proc_handler = &proc_dointvec,
56430+ },
56431+#endif
56432+#ifdef CONFIG_GRKERNSEC_BRUTE
56433+ {
56434+ .procname = "deter_bruteforce",
56435+ .data = &grsec_enable_brute,
56436+ .maxlen = sizeof(int),
56437+ .mode = 0600,
56438+ .proc_handler = &proc_dointvec,
56439+ },
56440+#endif
56441+#ifdef CONFIG_GRKERNSEC_FIFO
56442+ {
56443+ .procname = "fifo_restrictions",
56444+ .data = &grsec_enable_fifo,
56445+ .maxlen = sizeof(int),
56446+ .mode = 0600,
56447+ .proc_handler = &proc_dointvec,
56448+ },
56449+#endif
56450+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
56451+ {
56452+ .procname = "ptrace_readexec",
56453+ .data = &grsec_enable_ptrace_readexec,
56454+ .maxlen = sizeof(int),
56455+ .mode = 0600,
56456+ .proc_handler = &proc_dointvec,
56457+ },
56458+#endif
56459+#ifdef CONFIG_GRKERNSEC_SETXID
56460+ {
56461+ .procname = "consistent_setxid",
56462+ .data = &grsec_enable_setxid,
56463+ .maxlen = sizeof(int),
56464+ .mode = 0600,
56465+ .proc_handler = &proc_dointvec,
56466+ },
56467+#endif
56468+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
56469+ {
56470+ .procname = "ip_blackhole",
56471+ .data = &grsec_enable_blackhole,
56472+ .maxlen = sizeof(int),
56473+ .mode = 0600,
56474+ .proc_handler = &proc_dointvec,
56475+ },
56476+ {
56477+ .procname = "lastack_retries",
56478+ .data = &grsec_lastack_retries,
56479+ .maxlen = sizeof(int),
56480+ .mode = 0600,
56481+ .proc_handler = &proc_dointvec,
56482+ },
56483+#endif
56484+#ifdef CONFIG_GRKERNSEC_EXECLOG
56485+ {
56486+ .procname = "exec_logging",
56487+ .data = &grsec_enable_execlog,
56488+ .maxlen = sizeof(int),
56489+ .mode = 0600,
56490+ .proc_handler = &proc_dointvec,
56491+ },
56492+#endif
56493+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56494+ {
56495+ .procname = "rwxmap_logging",
56496+ .data = &grsec_enable_log_rwxmaps,
56497+ .maxlen = sizeof(int),
56498+ .mode = 0600,
56499+ .proc_handler = &proc_dointvec,
56500+ },
56501+#endif
56502+#ifdef CONFIG_GRKERNSEC_SIGNAL
56503+ {
56504+ .procname = "signal_logging",
56505+ .data = &grsec_enable_signal,
56506+ .maxlen = sizeof(int),
56507+ .mode = 0600,
56508+ .proc_handler = &proc_dointvec,
56509+ },
56510+#endif
56511+#ifdef CONFIG_GRKERNSEC_FORKFAIL
56512+ {
56513+ .procname = "forkfail_logging",
56514+ .data = &grsec_enable_forkfail,
56515+ .maxlen = sizeof(int),
56516+ .mode = 0600,
56517+ .proc_handler = &proc_dointvec,
56518+ },
56519+#endif
56520+#ifdef CONFIG_GRKERNSEC_TIME
56521+ {
56522+ .procname = "timechange_logging",
56523+ .data = &grsec_enable_time,
56524+ .maxlen = sizeof(int),
56525+ .mode = 0600,
56526+ .proc_handler = &proc_dointvec,
56527+ },
56528+#endif
56529+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
56530+ {
56531+ .procname = "chroot_deny_shmat",
56532+ .data = &grsec_enable_chroot_shmat,
56533+ .maxlen = sizeof(int),
56534+ .mode = 0600,
56535+ .proc_handler = &proc_dointvec,
56536+ },
56537+#endif
56538+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56539+ {
56540+ .procname = "chroot_deny_unix",
56541+ .data = &grsec_enable_chroot_unix,
56542+ .maxlen = sizeof(int),
56543+ .mode = 0600,
56544+ .proc_handler = &proc_dointvec,
56545+ },
56546+#endif
56547+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
56548+ {
56549+ .procname = "chroot_deny_mount",
56550+ .data = &grsec_enable_chroot_mount,
56551+ .maxlen = sizeof(int),
56552+ .mode = 0600,
56553+ .proc_handler = &proc_dointvec,
56554+ },
56555+#endif
56556+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
56557+ {
56558+ .procname = "chroot_deny_fchdir",
56559+ .data = &grsec_enable_chroot_fchdir,
56560+ .maxlen = sizeof(int),
56561+ .mode = 0600,
56562+ .proc_handler = &proc_dointvec,
56563+ },
56564+#endif
56565+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
56566+ {
56567+ .procname = "chroot_deny_chroot",
56568+ .data = &grsec_enable_chroot_double,
56569+ .maxlen = sizeof(int),
56570+ .mode = 0600,
56571+ .proc_handler = &proc_dointvec,
56572+ },
56573+#endif
56574+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
56575+ {
56576+ .procname = "chroot_deny_pivot",
56577+ .data = &grsec_enable_chroot_pivot,
56578+ .maxlen = sizeof(int),
56579+ .mode = 0600,
56580+ .proc_handler = &proc_dointvec,
56581+ },
56582+#endif
56583+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
56584+ {
56585+ .procname = "chroot_enforce_chdir",
56586+ .data = &grsec_enable_chroot_chdir,
56587+ .maxlen = sizeof(int),
56588+ .mode = 0600,
56589+ .proc_handler = &proc_dointvec,
56590+ },
56591+#endif
56592+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
56593+ {
56594+ .procname = "chroot_deny_chmod",
56595+ .data = &grsec_enable_chroot_chmod,
56596+ .maxlen = sizeof(int),
56597+ .mode = 0600,
56598+ .proc_handler = &proc_dointvec,
56599+ },
56600+#endif
56601+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
56602+ {
56603+ .procname = "chroot_deny_mknod",
56604+ .data = &grsec_enable_chroot_mknod,
56605+ .maxlen = sizeof(int),
56606+ .mode = 0600,
56607+ .proc_handler = &proc_dointvec,
56608+ },
56609+#endif
56610+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56611+ {
56612+ .procname = "chroot_restrict_nice",
56613+ .data = &grsec_enable_chroot_nice,
56614+ .maxlen = sizeof(int),
56615+ .mode = 0600,
56616+ .proc_handler = &proc_dointvec,
56617+ },
56618+#endif
56619+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
56620+ {
56621+ .procname = "chroot_execlog",
56622+ .data = &grsec_enable_chroot_execlog,
56623+ .maxlen = sizeof(int),
56624+ .mode = 0600,
56625+ .proc_handler = &proc_dointvec,
56626+ },
56627+#endif
56628+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56629+ {
56630+ .procname = "chroot_caps",
56631+ .data = &grsec_enable_chroot_caps,
56632+ .maxlen = sizeof(int),
56633+ .mode = 0600,
56634+ .proc_handler = &proc_dointvec,
56635+ },
56636+#endif
56637+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
56638+ {
56639+ .procname = "chroot_deny_sysctl",
56640+ .data = &grsec_enable_chroot_sysctl,
56641+ .maxlen = sizeof(int),
56642+ .mode = 0600,
56643+ .proc_handler = &proc_dointvec,
56644+ },
56645+#endif
56646+#ifdef CONFIG_GRKERNSEC_TPE
56647+ {
56648+ .procname = "tpe",
56649+ .data = &grsec_enable_tpe,
56650+ .maxlen = sizeof(int),
56651+ .mode = 0600,
56652+ .proc_handler = &proc_dointvec,
56653+ },
56654+ {
56655+ .procname = "tpe_gid",
56656+ .data = &grsec_tpe_gid,
56657+ .maxlen = sizeof(int),
56658+ .mode = 0600,
56659+ .proc_handler = &proc_dointvec,
56660+ },
56661+#endif
56662+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
56663+ {
56664+ .procname = "tpe_invert",
56665+ .data = &grsec_enable_tpe_invert,
56666+ .maxlen = sizeof(int),
56667+ .mode = 0600,
56668+ .proc_handler = &proc_dointvec,
56669+ },
56670+#endif
56671+#ifdef CONFIG_GRKERNSEC_TPE_ALL
56672+ {
56673+ .procname = "tpe_restrict_all",
56674+ .data = &grsec_enable_tpe_all,
56675+ .maxlen = sizeof(int),
56676+ .mode = 0600,
56677+ .proc_handler = &proc_dointvec,
56678+ },
56679+#endif
56680+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
56681+ {
56682+ .procname = "socket_all",
56683+ .data = &grsec_enable_socket_all,
56684+ .maxlen = sizeof(int),
56685+ .mode = 0600,
56686+ .proc_handler = &proc_dointvec,
56687+ },
56688+ {
56689+ .procname = "socket_all_gid",
56690+ .data = &grsec_socket_all_gid,
56691+ .maxlen = sizeof(int),
56692+ .mode = 0600,
56693+ .proc_handler = &proc_dointvec,
56694+ },
56695+#endif
56696+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
56697+ {
56698+ .procname = "socket_client",
56699+ .data = &grsec_enable_socket_client,
56700+ .maxlen = sizeof(int),
56701+ .mode = 0600,
56702+ .proc_handler = &proc_dointvec,
56703+ },
56704+ {
56705+ .procname = "socket_client_gid",
56706+ .data = &grsec_socket_client_gid,
56707+ .maxlen = sizeof(int),
56708+ .mode = 0600,
56709+ .proc_handler = &proc_dointvec,
56710+ },
56711+#endif
56712+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
56713+ {
56714+ .procname = "socket_server",
56715+ .data = &grsec_enable_socket_server,
56716+ .maxlen = sizeof(int),
56717+ .mode = 0600,
56718+ .proc_handler = &proc_dointvec,
56719+ },
56720+ {
56721+ .procname = "socket_server_gid",
56722+ .data = &grsec_socket_server_gid,
56723+ .maxlen = sizeof(int),
56724+ .mode = 0600,
56725+ .proc_handler = &proc_dointvec,
56726+ },
56727+#endif
56728+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
56729+ {
56730+ .procname = "audit_group",
56731+ .data = &grsec_enable_group,
56732+ .maxlen = sizeof(int),
56733+ .mode = 0600,
56734+ .proc_handler = &proc_dointvec,
56735+ },
56736+ {
56737+ .procname = "audit_gid",
56738+ .data = &grsec_audit_gid,
56739+ .maxlen = sizeof(int),
56740+ .mode = 0600,
56741+ .proc_handler = &proc_dointvec,
56742+ },
56743+#endif
56744+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56745+ {
56746+ .procname = "audit_chdir",
56747+ .data = &grsec_enable_chdir,
56748+ .maxlen = sizeof(int),
56749+ .mode = 0600,
56750+ .proc_handler = &proc_dointvec,
56751+ },
56752+#endif
56753+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
56754+ {
56755+ .procname = "audit_mount",
56756+ .data = &grsec_enable_mount,
56757+ .maxlen = sizeof(int),
56758+ .mode = 0600,
56759+ .proc_handler = &proc_dointvec,
56760+ },
56761+#endif
56762+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
56763+ {
56764+ .procname = "audit_textrel",
56765+ .data = &grsec_enable_audit_textrel,
56766+ .maxlen = sizeof(int),
56767+ .mode = 0600,
56768+ .proc_handler = &proc_dointvec,
56769+ },
56770+#endif
56771+#ifdef CONFIG_GRKERNSEC_DMESG
56772+ {
56773+ .procname = "dmesg",
56774+ .data = &grsec_enable_dmesg,
56775+ .maxlen = sizeof(int),
56776+ .mode = 0600,
56777+ .proc_handler = &proc_dointvec,
56778+ },
56779+#endif
56780+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56781+ {
56782+ .procname = "chroot_findtask",
56783+ .data = &grsec_enable_chroot_findtask,
56784+ .maxlen = sizeof(int),
56785+ .mode = 0600,
56786+ .proc_handler = &proc_dointvec,
56787+ },
56788+#endif
56789+#ifdef CONFIG_GRKERNSEC_RESLOG
56790+ {
56791+ .procname = "resource_logging",
56792+ .data = &grsec_resource_logging,
56793+ .maxlen = sizeof(int),
56794+ .mode = 0600,
56795+ .proc_handler = &proc_dointvec,
56796+ },
56797+#endif
56798+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
56799+ {
56800+ .procname = "audit_ptrace",
56801+ .data = &grsec_enable_audit_ptrace,
56802+ .maxlen = sizeof(int),
56803+ .mode = 0600,
56804+ .proc_handler = &proc_dointvec,
56805+ },
56806+#endif
56807+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
56808+ {
56809+ .procname = "harden_ptrace",
56810+ .data = &grsec_enable_harden_ptrace,
56811+ .maxlen = sizeof(int),
56812+ .mode = 0600,
56813+ .proc_handler = &proc_dointvec,
56814+ },
56815+#endif
56816+ {
56817+ .procname = "grsec_lock",
56818+ .data = &grsec_lock,
56819+ .maxlen = sizeof(int),
56820+ .mode = 0600,
56821+ .proc_handler = &proc_dointvec,
56822+ },
56823+#endif
56824+#ifdef CONFIG_GRKERNSEC_ROFS
56825+ {
56826+ .procname = "romount_protect",
56827+ .data = &grsec_enable_rofs,
56828+ .maxlen = sizeof(int),
56829+ .mode = 0600,
56830+ .proc_handler = &proc_dointvec_minmax,
56831+ .extra1 = &one,
56832+ .extra2 = &one,
56833+ },
56834+#endif
56835+ { }
56836+};
56837+#endif
56838diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
56839new file mode 100644
56840index 0000000..0dc13c3
56841--- /dev/null
56842+++ b/grsecurity/grsec_time.c
56843@@ -0,0 +1,16 @@
56844+#include <linux/kernel.h>
56845+#include <linux/sched.h>
56846+#include <linux/grinternal.h>
56847+#include <linux/module.h>
56848+
56849+void
56850+gr_log_timechange(void)
56851+{
56852+#ifdef CONFIG_GRKERNSEC_TIME
56853+ if (grsec_enable_time)
56854+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
56855+#endif
56856+ return;
56857+}
56858+
56859+EXPORT_SYMBOL(gr_log_timechange);
56860diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
56861new file mode 100644
56862index 0000000..07e0dc0
56863--- /dev/null
56864+++ b/grsecurity/grsec_tpe.c
56865@@ -0,0 +1,73 @@
56866+#include <linux/kernel.h>
56867+#include <linux/sched.h>
56868+#include <linux/file.h>
56869+#include <linux/fs.h>
56870+#include <linux/grinternal.h>
56871+
56872+extern int gr_acl_tpe_check(void);
56873+
56874+int
56875+gr_tpe_allow(const struct file *file)
56876+{
56877+#ifdef CONFIG_GRKERNSEC
56878+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
56879+ const struct cred *cred = current_cred();
56880+ char *msg = NULL;
56881+ char *msg2 = NULL;
56882+
56883+ // never restrict root
56884+ if (!cred->uid)
56885+ return 1;
56886+
56887+ if (grsec_enable_tpe) {
56888+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
56889+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
56890+ msg = "not being in trusted group";
56891+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
56892+ msg = "being in untrusted group";
56893+#else
56894+ if (in_group_p(grsec_tpe_gid))
56895+ msg = "being in untrusted group";
56896+#endif
56897+ }
56898+ if (!msg && gr_acl_tpe_check())
56899+ msg = "being in untrusted role";
56900+
56901+ // not in any affected group/role
56902+ if (!msg)
56903+ goto next_check;
56904+
56905+ if (inode->i_uid)
56906+ msg2 = "file in non-root-owned directory";
56907+ else if (inode->i_mode & S_IWOTH)
56908+ msg2 = "file in world-writable directory";
56909+ else if (inode->i_mode & S_IWGRP)
56910+ msg2 = "file in group-writable directory";
56911+
56912+ if (msg && msg2) {
56913+ char fullmsg[70] = {0};
56914+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
56915+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
56916+ return 0;
56917+ }
56918+ msg = NULL;
56919+next_check:
56920+#ifdef CONFIG_GRKERNSEC_TPE_ALL
56921+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
56922+ return 1;
56923+
56924+ if (inode->i_uid && (inode->i_uid != cred->uid))
56925+ msg = "directory not owned by user";
56926+ else if (inode->i_mode & S_IWOTH)
56927+ msg = "file in world-writable directory";
56928+ else if (inode->i_mode & S_IWGRP)
56929+ msg = "file in group-writable directory";
56930+
56931+ if (msg) {
56932+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
56933+ return 0;
56934+ }
56935+#endif
56936+#endif
56937+ return 1;
56938+}
56939diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
56940new file mode 100644
56941index 0000000..9f7b1ac
56942--- /dev/null
56943+++ b/grsecurity/grsum.c
56944@@ -0,0 +1,61 @@
56945+#include <linux/err.h>
56946+#include <linux/kernel.h>
56947+#include <linux/sched.h>
56948+#include <linux/mm.h>
56949+#include <linux/scatterlist.h>
56950+#include <linux/crypto.h>
56951+#include <linux/gracl.h>
56952+
56953+
56954+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
56955+#error "crypto and sha256 must be built into the kernel"
56956+#endif
56957+
56958+int
56959+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
56960+{
56961+ char *p;
56962+ struct crypto_hash *tfm;
56963+ struct hash_desc desc;
56964+ struct scatterlist sg;
56965+ unsigned char temp_sum[GR_SHA_LEN];
56966+ volatile int retval = 0;
56967+ volatile int dummy = 0;
56968+ unsigned int i;
56969+
56970+ sg_init_table(&sg, 1);
56971+
56972+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
56973+ if (IS_ERR(tfm)) {
56974+ /* should never happen, since sha256 should be built in */
56975+ return 1;
56976+ }
56977+
56978+ desc.tfm = tfm;
56979+ desc.flags = 0;
56980+
56981+ crypto_hash_init(&desc);
56982+
56983+ p = salt;
56984+ sg_set_buf(&sg, p, GR_SALT_LEN);
56985+ crypto_hash_update(&desc, &sg, sg.length);
56986+
56987+ p = entry->pw;
56988+ sg_set_buf(&sg, p, strlen(p));
56989+
56990+ crypto_hash_update(&desc, &sg, sg.length);
56991+
56992+ crypto_hash_final(&desc, temp_sum);
56993+
56994+ memset(entry->pw, 0, GR_PW_LEN);
56995+
56996+ for (i = 0; i < GR_SHA_LEN; i++)
56997+ if (sum[i] != temp_sum[i])
56998+ retval = 1;
56999+ else
57000+ dummy = 1; // waste a cycle
57001+
57002+ crypto_free_hash(tfm);
57003+
57004+ return retval;
57005+}
57006diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
57007index 6cd5b64..f620d2d 100644
57008--- a/include/acpi/acpi_bus.h
57009+++ b/include/acpi/acpi_bus.h
57010@@ -107,7 +107,7 @@ struct acpi_device_ops {
57011 acpi_op_bind bind;
57012 acpi_op_unbind unbind;
57013 acpi_op_notify notify;
57014-};
57015+} __no_const;
57016
57017 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
57018
57019diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
57020index b7babf0..71e4e74 100644
57021--- a/include/asm-generic/atomic-long.h
57022+++ b/include/asm-generic/atomic-long.h
57023@@ -22,6 +22,12 @@
57024
57025 typedef atomic64_t atomic_long_t;
57026
57027+#ifdef CONFIG_PAX_REFCOUNT
57028+typedef atomic64_unchecked_t atomic_long_unchecked_t;
57029+#else
57030+typedef atomic64_t atomic_long_unchecked_t;
57031+#endif
57032+
57033 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
57034
57035 static inline long atomic_long_read(atomic_long_t *l)
57036@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
57037 return (long)atomic64_read(v);
57038 }
57039
57040+#ifdef CONFIG_PAX_REFCOUNT
57041+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
57042+{
57043+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57044+
57045+ return (long)atomic64_read_unchecked(v);
57046+}
57047+#endif
57048+
57049 static inline void atomic_long_set(atomic_long_t *l, long i)
57050 {
57051 atomic64_t *v = (atomic64_t *)l;
57052@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
57053 atomic64_set(v, i);
57054 }
57055
57056+#ifdef CONFIG_PAX_REFCOUNT
57057+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
57058+{
57059+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57060+
57061+ atomic64_set_unchecked(v, i);
57062+}
57063+#endif
57064+
57065 static inline void atomic_long_inc(atomic_long_t *l)
57066 {
57067 atomic64_t *v = (atomic64_t *)l;
57068@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
57069 atomic64_inc(v);
57070 }
57071
57072+#ifdef CONFIG_PAX_REFCOUNT
57073+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
57074+{
57075+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57076+
57077+ atomic64_inc_unchecked(v);
57078+}
57079+#endif
57080+
57081 static inline void atomic_long_dec(atomic_long_t *l)
57082 {
57083 atomic64_t *v = (atomic64_t *)l;
57084@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
57085 atomic64_dec(v);
57086 }
57087
57088+#ifdef CONFIG_PAX_REFCOUNT
57089+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
57090+{
57091+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57092+
57093+ atomic64_dec_unchecked(v);
57094+}
57095+#endif
57096+
57097 static inline void atomic_long_add(long i, atomic_long_t *l)
57098 {
57099 atomic64_t *v = (atomic64_t *)l;
57100@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
57101 atomic64_add(i, v);
57102 }
57103
57104+#ifdef CONFIG_PAX_REFCOUNT
57105+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
57106+{
57107+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57108+
57109+ atomic64_add_unchecked(i, v);
57110+}
57111+#endif
57112+
57113 static inline void atomic_long_sub(long i, atomic_long_t *l)
57114 {
57115 atomic64_t *v = (atomic64_t *)l;
57116@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
57117 atomic64_sub(i, v);
57118 }
57119
57120+#ifdef CONFIG_PAX_REFCOUNT
57121+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
57122+{
57123+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57124+
57125+ atomic64_sub_unchecked(i, v);
57126+}
57127+#endif
57128+
57129 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
57130 {
57131 atomic64_t *v = (atomic64_t *)l;
57132@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
57133 return (long)atomic64_inc_return(v);
57134 }
57135
57136+#ifdef CONFIG_PAX_REFCOUNT
57137+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
57138+{
57139+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
57140+
57141+ return (long)atomic64_inc_return_unchecked(v);
57142+}
57143+#endif
57144+
57145 static inline long atomic_long_dec_return(atomic_long_t *l)
57146 {
57147 atomic64_t *v = (atomic64_t *)l;
57148@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
57149
57150 typedef atomic_t atomic_long_t;
57151
57152+#ifdef CONFIG_PAX_REFCOUNT
57153+typedef atomic_unchecked_t atomic_long_unchecked_t;
57154+#else
57155+typedef atomic_t atomic_long_unchecked_t;
57156+#endif
57157+
57158 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
57159 static inline long atomic_long_read(atomic_long_t *l)
57160 {
57161@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
57162 return (long)atomic_read(v);
57163 }
57164
57165+#ifdef CONFIG_PAX_REFCOUNT
57166+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
57167+{
57168+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57169+
57170+ return (long)atomic_read_unchecked(v);
57171+}
57172+#endif
57173+
57174 static inline void atomic_long_set(atomic_long_t *l, long i)
57175 {
57176 atomic_t *v = (atomic_t *)l;
57177@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
57178 atomic_set(v, i);
57179 }
57180
57181+#ifdef CONFIG_PAX_REFCOUNT
57182+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
57183+{
57184+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57185+
57186+ atomic_set_unchecked(v, i);
57187+}
57188+#endif
57189+
57190 static inline void atomic_long_inc(atomic_long_t *l)
57191 {
57192 atomic_t *v = (atomic_t *)l;
57193@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
57194 atomic_inc(v);
57195 }
57196
57197+#ifdef CONFIG_PAX_REFCOUNT
57198+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
57199+{
57200+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57201+
57202+ atomic_inc_unchecked(v);
57203+}
57204+#endif
57205+
57206 static inline void atomic_long_dec(atomic_long_t *l)
57207 {
57208 atomic_t *v = (atomic_t *)l;
57209@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
57210 atomic_dec(v);
57211 }
57212
57213+#ifdef CONFIG_PAX_REFCOUNT
57214+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
57215+{
57216+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57217+
57218+ atomic_dec_unchecked(v);
57219+}
57220+#endif
57221+
57222 static inline void atomic_long_add(long i, atomic_long_t *l)
57223 {
57224 atomic_t *v = (atomic_t *)l;
57225@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
57226 atomic_add(i, v);
57227 }
57228
57229+#ifdef CONFIG_PAX_REFCOUNT
57230+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
57231+{
57232+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57233+
57234+ atomic_add_unchecked(i, v);
57235+}
57236+#endif
57237+
57238 static inline void atomic_long_sub(long i, atomic_long_t *l)
57239 {
57240 atomic_t *v = (atomic_t *)l;
57241@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
57242 atomic_sub(i, v);
57243 }
57244
57245+#ifdef CONFIG_PAX_REFCOUNT
57246+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
57247+{
57248+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57249+
57250+ atomic_sub_unchecked(i, v);
57251+}
57252+#endif
57253+
57254 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
57255 {
57256 atomic_t *v = (atomic_t *)l;
57257@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
57258 return (long)atomic_inc_return(v);
57259 }
57260
57261+#ifdef CONFIG_PAX_REFCOUNT
57262+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
57263+{
57264+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
57265+
57266+ return (long)atomic_inc_return_unchecked(v);
57267+}
57268+#endif
57269+
57270 static inline long atomic_long_dec_return(atomic_long_t *l)
57271 {
57272 atomic_t *v = (atomic_t *)l;
57273@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
57274
57275 #endif /* BITS_PER_LONG == 64 */
57276
57277+#ifdef CONFIG_PAX_REFCOUNT
57278+static inline void pax_refcount_needs_these_functions(void)
57279+{
57280+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
57281+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
57282+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
57283+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
57284+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
57285+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
57286+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
57287+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
57288+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
57289+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
57290+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
57291+
57292+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
57293+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
57294+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
57295+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
57296+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
57297+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
57298+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
57299+}
57300+#else
57301+#define atomic_read_unchecked(v) atomic_read(v)
57302+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
57303+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
57304+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
57305+#define atomic_inc_unchecked(v) atomic_inc(v)
57306+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
57307+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
57308+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
57309+#define atomic_dec_unchecked(v) atomic_dec(v)
57310+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
57311+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
57312+
57313+#define atomic_long_read_unchecked(v) atomic_long_read(v)
57314+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
57315+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
57316+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
57317+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
57318+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
57319+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
57320+#endif
57321+
57322 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
57323diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
57324index b18ce4f..2ee2843 100644
57325--- a/include/asm-generic/atomic64.h
57326+++ b/include/asm-generic/atomic64.h
57327@@ -16,6 +16,8 @@ typedef struct {
57328 long long counter;
57329 } atomic64_t;
57330
57331+typedef atomic64_t atomic64_unchecked_t;
57332+
57333 #define ATOMIC64_INIT(i) { (i) }
57334
57335 extern long long atomic64_read(const atomic64_t *v);
57336@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
57337 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
57338 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
57339
57340+#define atomic64_read_unchecked(v) atomic64_read(v)
57341+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
57342+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
57343+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
57344+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
57345+#define atomic64_inc_unchecked(v) atomic64_inc(v)
57346+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
57347+#define atomic64_dec_unchecked(v) atomic64_dec(v)
57348+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
57349+
57350 #endif /* _ASM_GENERIC_ATOMIC64_H */
57351diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
57352index 1bfcfe5..e04c5c9 100644
57353--- a/include/asm-generic/cache.h
57354+++ b/include/asm-generic/cache.h
57355@@ -6,7 +6,7 @@
57356 * cache lines need to provide their own cache.h.
57357 */
57358
57359-#define L1_CACHE_SHIFT 5
57360-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
57361+#define L1_CACHE_SHIFT 5UL
57362+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
57363
57364 #endif /* __ASM_GENERIC_CACHE_H */
57365diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
57366index 1ca3efc..e3dc852 100644
57367--- a/include/asm-generic/int-l64.h
57368+++ b/include/asm-generic/int-l64.h
57369@@ -46,6 +46,8 @@ typedef unsigned int u32;
57370 typedef signed long s64;
57371 typedef unsigned long u64;
57372
57373+typedef unsigned int intoverflow_t __attribute__ ((mode(TI)));
57374+
57375 #define S8_C(x) x
57376 #define U8_C(x) x ## U
57377 #define S16_C(x) x
57378diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
57379index f394147..b6152b9 100644
57380--- a/include/asm-generic/int-ll64.h
57381+++ b/include/asm-generic/int-ll64.h
57382@@ -51,6 +51,8 @@ typedef unsigned int u32;
57383 typedef signed long long s64;
57384 typedef unsigned long long u64;
57385
57386+typedef unsigned long long intoverflow_t;
57387+
57388 #define S8_C(x) x
57389 #define U8_C(x) x ## U
57390 #define S16_C(x) x
57391diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
57392index 0232ccb..13d9165 100644
57393--- a/include/asm-generic/kmap_types.h
57394+++ b/include/asm-generic/kmap_types.h
57395@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
57396 KMAP_D(17) KM_NMI,
57397 KMAP_D(18) KM_NMI_PTE,
57398 KMAP_D(19) KM_KDB,
57399+KMAP_D(20) KM_CLEARPAGE,
57400 /*
57401 * Remember to update debug_kmap_atomic() when adding new kmap types!
57402 */
57403-KMAP_D(20) KM_TYPE_NR
57404+KMAP_D(21) KM_TYPE_NR
57405 };
57406
57407 #undef KMAP_D
57408diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
57409index 725612b..9cc513a 100644
57410--- a/include/asm-generic/pgtable-nopmd.h
57411+++ b/include/asm-generic/pgtable-nopmd.h
57412@@ -1,14 +1,19 @@
57413 #ifndef _PGTABLE_NOPMD_H
57414 #define _PGTABLE_NOPMD_H
57415
57416-#ifndef __ASSEMBLY__
57417-
57418 #include <asm-generic/pgtable-nopud.h>
57419
57420-struct mm_struct;
57421-
57422 #define __PAGETABLE_PMD_FOLDED
57423
57424+#define PMD_SHIFT PUD_SHIFT
57425+#define PTRS_PER_PMD 1
57426+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
57427+#define PMD_MASK (~(PMD_SIZE-1))
57428+
57429+#ifndef __ASSEMBLY__
57430+
57431+struct mm_struct;
57432+
57433 /*
57434 * Having the pmd type consist of a pud gets the size right, and allows
57435 * us to conceptually access the pud entry that this pmd is folded into
57436@@ -16,11 +21,6 @@ struct mm_struct;
57437 */
57438 typedef struct { pud_t pud; } pmd_t;
57439
57440-#define PMD_SHIFT PUD_SHIFT
57441-#define PTRS_PER_PMD 1
57442-#define PMD_SIZE (1UL << PMD_SHIFT)
57443-#define PMD_MASK (~(PMD_SIZE-1))
57444-
57445 /*
57446 * The "pud_xxx()" functions here are trivial for a folded two-level
57447 * setup: the pmd is never bad, and a pmd always exists (as it's folded
57448diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
57449index 810431d..ccc3638 100644
57450--- a/include/asm-generic/pgtable-nopud.h
57451+++ b/include/asm-generic/pgtable-nopud.h
57452@@ -1,10 +1,15 @@
57453 #ifndef _PGTABLE_NOPUD_H
57454 #define _PGTABLE_NOPUD_H
57455
57456-#ifndef __ASSEMBLY__
57457-
57458 #define __PAGETABLE_PUD_FOLDED
57459
57460+#define PUD_SHIFT PGDIR_SHIFT
57461+#define PTRS_PER_PUD 1
57462+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
57463+#define PUD_MASK (~(PUD_SIZE-1))
57464+
57465+#ifndef __ASSEMBLY__
57466+
57467 /*
57468 * Having the pud type consist of a pgd gets the size right, and allows
57469 * us to conceptually access the pgd entry that this pud is folded into
57470@@ -12,11 +17,6 @@
57471 */
57472 typedef struct { pgd_t pgd; } pud_t;
57473
57474-#define PUD_SHIFT PGDIR_SHIFT
57475-#define PTRS_PER_PUD 1
57476-#define PUD_SIZE (1UL << PUD_SHIFT)
57477-#define PUD_MASK (~(PUD_SIZE-1))
57478-
57479 /*
57480 * The "pgd_xxx()" functions here are trivial for a folded two-level
57481 * setup: the pud is never bad, and a pud always exists (as it's folded
57482diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
57483index 76bff2b..c7a14e2 100644
57484--- a/include/asm-generic/pgtable.h
57485+++ b/include/asm-generic/pgtable.h
57486@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
57487 #endif /* __HAVE_ARCH_PMD_WRITE */
57488 #endif
57489
57490+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
57491+static inline unsigned long pax_open_kernel(void) { return 0; }
57492+#endif
57493+
57494+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
57495+static inline unsigned long pax_close_kernel(void) { return 0; }
57496+#endif
57497+
57498 #endif /* !__ASSEMBLY__ */
57499
57500 #endif /* _ASM_GENERIC_PGTABLE_H */
57501diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
57502index b5e2e4c..6a5373e 100644
57503--- a/include/asm-generic/vmlinux.lds.h
57504+++ b/include/asm-generic/vmlinux.lds.h
57505@@ -217,6 +217,7 @@
57506 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
57507 VMLINUX_SYMBOL(__start_rodata) = .; \
57508 *(.rodata) *(.rodata.*) \
57509+ *(.data..read_only) \
57510 *(__vermagic) /* Kernel version magic */ \
57511 . = ALIGN(8); \
57512 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
57513@@ -722,17 +723,18 @@
57514 * section in the linker script will go there too. @phdr should have
57515 * a leading colon.
57516 *
57517- * Note that this macros defines __per_cpu_load as an absolute symbol.
57518+ * Note that this macros defines per_cpu_load as an absolute symbol.
57519 * If there is no need to put the percpu section at a predetermined
57520 * address, use PERCPU_SECTION.
57521 */
57522 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
57523- VMLINUX_SYMBOL(__per_cpu_load) = .; \
57524- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
57525+ per_cpu_load = .; \
57526+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
57527 - LOAD_OFFSET) { \
57528+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
57529 PERCPU_INPUT(cacheline) \
57530 } phdr \
57531- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
57532+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
57533
57534 /**
57535 * PERCPU_SECTION - define output section for percpu area, simple version
57536diff --git a/include/drm/drmP.h b/include/drm/drmP.h
57537index bf4b2dc..2d0762f 100644
57538--- a/include/drm/drmP.h
57539+++ b/include/drm/drmP.h
57540@@ -72,6 +72,7 @@
57541 #include <linux/workqueue.h>
57542 #include <linux/poll.h>
57543 #include <asm/pgalloc.h>
57544+#include <asm/local.h>
57545 #include "drm.h"
57546
57547 #include <linux/idr.h>
57548@@ -1038,7 +1039,7 @@ struct drm_device {
57549
57550 /** \name Usage Counters */
57551 /*@{ */
57552- int open_count; /**< Outstanding files open */
57553+ local_t open_count; /**< Outstanding files open */
57554 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
57555 atomic_t vma_count; /**< Outstanding vma areas open */
57556 int buf_use; /**< Buffers in use -- cannot alloc */
57557@@ -1049,7 +1050,7 @@ struct drm_device {
57558 /*@{ */
57559 unsigned long counters;
57560 enum drm_stat_type types[15];
57561- atomic_t counts[15];
57562+ atomic_unchecked_t counts[15];
57563 /*@} */
57564
57565 struct list_head filelist;
57566diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
57567index 73b0712..0b7ef2f 100644
57568--- a/include/drm/drm_crtc_helper.h
57569+++ b/include/drm/drm_crtc_helper.h
57570@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
57571
57572 /* disable crtc when not in use - more explicit than dpms off */
57573 void (*disable)(struct drm_crtc *crtc);
57574-};
57575+} __no_const;
57576
57577 struct drm_encoder_helper_funcs {
57578 void (*dpms)(struct drm_encoder *encoder, int mode);
57579@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
57580 struct drm_connector *connector);
57581 /* disable encoder when not in use - more explicit than dpms off */
57582 void (*disable)(struct drm_encoder *encoder);
57583-};
57584+} __no_const;
57585
57586 struct drm_connector_helper_funcs {
57587 int (*get_modes)(struct drm_connector *connector);
57588diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
57589index 26c1f78..6722682 100644
57590--- a/include/drm/ttm/ttm_memory.h
57591+++ b/include/drm/ttm/ttm_memory.h
57592@@ -47,7 +47,7 @@
57593
57594 struct ttm_mem_shrink {
57595 int (*do_shrink) (struct ttm_mem_shrink *);
57596-};
57597+} __no_const;
57598
57599 /**
57600 * struct ttm_mem_global - Global memory accounting structure.
57601diff --git a/include/linux/a.out.h b/include/linux/a.out.h
57602index e86dfca..40cc55f 100644
57603--- a/include/linux/a.out.h
57604+++ b/include/linux/a.out.h
57605@@ -39,6 +39,14 @@ enum machine_type {
57606 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
57607 };
57608
57609+/* Constants for the N_FLAGS field */
57610+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
57611+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
57612+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
57613+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
57614+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
57615+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
57616+
57617 #if !defined (N_MAGIC)
57618 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
57619 #endif
57620diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
57621index 49a83ca..df96b54 100644
57622--- a/include/linux/atmdev.h
57623+++ b/include/linux/atmdev.h
57624@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
57625 #endif
57626
57627 struct k_atm_aal_stats {
57628-#define __HANDLE_ITEM(i) atomic_t i
57629+#define __HANDLE_ITEM(i) atomic_unchecked_t i
57630 __AAL_STAT_ITEMS
57631 #undef __HANDLE_ITEM
57632 };
57633diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
57634index fd88a39..8a801b4 100644
57635--- a/include/linux/binfmts.h
57636+++ b/include/linux/binfmts.h
57637@@ -18,7 +18,7 @@ struct pt_regs;
57638 #define BINPRM_BUF_SIZE 128
57639
57640 #ifdef __KERNEL__
57641-#include <linux/list.h>
57642+#include <linux/sched.h>
57643
57644 #define CORENAME_MAX_SIZE 128
57645
57646@@ -58,6 +58,7 @@ struct linux_binprm {
57647 unsigned interp_flags;
57648 unsigned interp_data;
57649 unsigned long loader, exec;
57650+ char tcomm[TASK_COMM_LEN];
57651 };
57652
57653 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
57654@@ -88,6 +89,7 @@ struct linux_binfmt {
57655 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
57656 int (*load_shlib)(struct file *);
57657 int (*core_dump)(struct coredump_params *cprm);
57658+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
57659 unsigned long min_coredump; /* minimal dump size */
57660 };
57661
57662diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
57663index 0ed1eb0..3ab569b 100644
57664--- a/include/linux/blkdev.h
57665+++ b/include/linux/blkdev.h
57666@@ -1315,7 +1315,7 @@ struct block_device_operations {
57667 /* this callback is with swap_lock and sometimes page table lock held */
57668 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
57669 struct module *owner;
57670-};
57671+} __do_const;
57672
57673 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
57674 unsigned long);
57675diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
57676index 4d1a074..88f929a 100644
57677--- a/include/linux/blktrace_api.h
57678+++ b/include/linux/blktrace_api.h
57679@@ -162,7 +162,7 @@ struct blk_trace {
57680 struct dentry *dir;
57681 struct dentry *dropped_file;
57682 struct dentry *msg_file;
57683- atomic_t dropped;
57684+ atomic_unchecked_t dropped;
57685 };
57686
57687 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
57688diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
57689index 83195fb..0b0f77d 100644
57690--- a/include/linux/byteorder/little_endian.h
57691+++ b/include/linux/byteorder/little_endian.h
57692@@ -42,51 +42,51 @@
57693
57694 static inline __le64 __cpu_to_le64p(const __u64 *p)
57695 {
57696- return (__force __le64)*p;
57697+ return (__force const __le64)*p;
57698 }
57699 static inline __u64 __le64_to_cpup(const __le64 *p)
57700 {
57701- return (__force __u64)*p;
57702+ return (__force const __u64)*p;
57703 }
57704 static inline __le32 __cpu_to_le32p(const __u32 *p)
57705 {
57706- return (__force __le32)*p;
57707+ return (__force const __le32)*p;
57708 }
57709 static inline __u32 __le32_to_cpup(const __le32 *p)
57710 {
57711- return (__force __u32)*p;
57712+ return (__force const __u32)*p;
57713 }
57714 static inline __le16 __cpu_to_le16p(const __u16 *p)
57715 {
57716- return (__force __le16)*p;
57717+ return (__force const __le16)*p;
57718 }
57719 static inline __u16 __le16_to_cpup(const __le16 *p)
57720 {
57721- return (__force __u16)*p;
57722+ return (__force const __u16)*p;
57723 }
57724 static inline __be64 __cpu_to_be64p(const __u64 *p)
57725 {
57726- return (__force __be64)__swab64p(p);
57727+ return (__force const __be64)__swab64p(p);
57728 }
57729 static inline __u64 __be64_to_cpup(const __be64 *p)
57730 {
57731- return __swab64p((__u64 *)p);
57732+ return __swab64p((const __u64 *)p);
57733 }
57734 static inline __be32 __cpu_to_be32p(const __u32 *p)
57735 {
57736- return (__force __be32)__swab32p(p);
57737+ return (__force const __be32)__swab32p(p);
57738 }
57739 static inline __u32 __be32_to_cpup(const __be32 *p)
57740 {
57741- return __swab32p((__u32 *)p);
57742+ return __swab32p((const __u32 *)p);
57743 }
57744 static inline __be16 __cpu_to_be16p(const __u16 *p)
57745 {
57746- return (__force __be16)__swab16p(p);
57747+ return (__force const __be16)__swab16p(p);
57748 }
57749 static inline __u16 __be16_to_cpup(const __be16 *p)
57750 {
57751- return __swab16p((__u16 *)p);
57752+ return __swab16p((const __u16 *)p);
57753 }
57754 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
57755 #define __le64_to_cpus(x) do { (void)(x); } while (0)
57756diff --git a/include/linux/cache.h b/include/linux/cache.h
57757index 4c57065..4307975 100644
57758--- a/include/linux/cache.h
57759+++ b/include/linux/cache.h
57760@@ -16,6 +16,10 @@
57761 #define __read_mostly
57762 #endif
57763
57764+#ifndef __read_only
57765+#define __read_only __read_mostly
57766+#endif
57767+
57768 #ifndef ____cacheline_aligned
57769 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
57770 #endif
57771diff --git a/include/linux/capability.h b/include/linux/capability.h
57772index a63d13d..069bfd5 100644
57773--- a/include/linux/capability.h
57774+++ b/include/linux/capability.h
57775@@ -548,6 +548,9 @@ extern bool capable(int cap);
57776 extern bool ns_capable(struct user_namespace *ns, int cap);
57777 extern bool task_ns_capable(struct task_struct *t, int cap);
57778 extern bool nsown_capable(int cap);
57779+extern bool task_ns_capable_nolog(struct task_struct *t, int cap);
57780+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
57781+extern bool capable_nolog(int cap);
57782
57783 /* audit system wants to get cap info from files as well */
57784 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
57785diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
57786index 04ffb2e..6799180 100644
57787--- a/include/linux/cleancache.h
57788+++ b/include/linux/cleancache.h
57789@@ -31,7 +31,7 @@ struct cleancache_ops {
57790 void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
57791 void (*flush_inode)(int, struct cleancache_filekey);
57792 void (*flush_fs)(int);
57793-};
57794+} __no_const;
57795
57796 extern struct cleancache_ops
57797 cleancache_register_ops(struct cleancache_ops *ops);
57798diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
57799index dfadc96..c0e70c1 100644
57800--- a/include/linux/compiler-gcc4.h
57801+++ b/include/linux/compiler-gcc4.h
57802@@ -31,6 +31,12 @@
57803
57804
57805 #if __GNUC_MINOR__ >= 5
57806+
57807+#ifdef CONSTIFY_PLUGIN
57808+#define __no_const __attribute__((no_const))
57809+#define __do_const __attribute__((do_const))
57810+#endif
57811+
57812 /*
57813 * Mark a position in code as unreachable. This can be used to
57814 * suppress control flow warnings after asm blocks that transfer
57815@@ -46,6 +52,11 @@
57816 #define __noclone __attribute__((__noclone__))
57817
57818 #endif
57819+
57820+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
57821+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
57822+#define __bos0(ptr) __bos((ptr), 0)
57823+#define __bos1(ptr) __bos((ptr), 1)
57824 #endif
57825
57826 #if __GNUC_MINOR__ > 0
57827diff --git a/include/linux/compiler.h b/include/linux/compiler.h
57828index 320d6c9..8573a1c 100644
57829--- a/include/linux/compiler.h
57830+++ b/include/linux/compiler.h
57831@@ -5,31 +5,62 @@
57832
57833 #ifdef __CHECKER__
57834 # define __user __attribute__((noderef, address_space(1)))
57835+# define __force_user __force __user
57836 # define __kernel __attribute__((address_space(0)))
57837+# define __force_kernel __force __kernel
57838 # define __safe __attribute__((safe))
57839 # define __force __attribute__((force))
57840 # define __nocast __attribute__((nocast))
57841 # define __iomem __attribute__((noderef, address_space(2)))
57842+# define __force_iomem __force __iomem
57843 # define __acquires(x) __attribute__((context(x,0,1)))
57844 # define __releases(x) __attribute__((context(x,1,0)))
57845 # define __acquire(x) __context__(x,1)
57846 # define __release(x) __context__(x,-1)
57847 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
57848 # define __percpu __attribute__((noderef, address_space(3)))
57849+# define __force_percpu __force __percpu
57850 #ifdef CONFIG_SPARSE_RCU_POINTER
57851 # define __rcu __attribute__((noderef, address_space(4)))
57852+# define __force_rcu __force __rcu
57853 #else
57854 # define __rcu
57855+# define __force_rcu
57856 #endif
57857 extern void __chk_user_ptr(const volatile void __user *);
57858 extern void __chk_io_ptr(const volatile void __iomem *);
57859+#elif defined(CHECKER_PLUGIN)
57860+//# define __user
57861+//# define __force_user
57862+//# define __kernel
57863+//# define __force_kernel
57864+# define __safe
57865+# define __force
57866+# define __nocast
57867+# define __iomem
57868+# define __force_iomem
57869+# define __chk_user_ptr(x) (void)0
57870+# define __chk_io_ptr(x) (void)0
57871+# define __builtin_warning(x, y...) (1)
57872+# define __acquires(x)
57873+# define __releases(x)
57874+# define __acquire(x) (void)0
57875+# define __release(x) (void)0
57876+# define __cond_lock(x,c) (c)
57877+# define __percpu
57878+# define __force_percpu
57879+# define __rcu
57880+# define __force_rcu
57881 #else
57882 # define __user
57883+# define __force_user
57884 # define __kernel
57885+# define __force_kernel
57886 # define __safe
57887 # define __force
57888 # define __nocast
57889 # define __iomem
57890+# define __force_iomem
57891 # define __chk_user_ptr(x) (void)0
57892 # define __chk_io_ptr(x) (void)0
57893 # define __builtin_warning(x, y...) (1)
57894@@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
57895 # define __release(x) (void)0
57896 # define __cond_lock(x,c) (c)
57897 # define __percpu
57898+# define __force_percpu
57899 # define __rcu
57900+# define __force_rcu
57901 #endif
57902
57903 #ifdef __KERNEL__
57904@@ -264,6 +297,14 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
57905 # define __attribute_const__ /* unimplemented */
57906 #endif
57907
57908+#ifndef __no_const
57909+# define __no_const
57910+#endif
57911+
57912+#ifndef __do_const
57913+# define __do_const
57914+#endif
57915+
57916 /*
57917 * Tell gcc if a function is cold. The compiler will assume any path
57918 * directly leading to the call is unlikely.
57919@@ -273,6 +314,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
57920 #define __cold
57921 #endif
57922
57923+#ifndef __alloc_size
57924+#define __alloc_size(...)
57925+#endif
57926+
57927+#ifndef __bos
57928+#define __bos(ptr, arg)
57929+#endif
57930+
57931+#ifndef __bos0
57932+#define __bos0(ptr)
57933+#endif
57934+
57935+#ifndef __bos1
57936+#define __bos1(ptr)
57937+#endif
57938+
57939 /* Simple shorthand for a section definition */
57940 #ifndef __section
57941 # define __section(S) __attribute__ ((__section__(#S)))
57942@@ -306,6 +363,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
57943 * use is to mediate communication between process-level code and irq/NMI
57944 * handlers, all running on the same CPU.
57945 */
57946-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
57947+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
57948+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
57949
57950 #endif /* __LINUX_COMPILER_H */
57951diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
57952index e9eaec5..bfeb9bb 100644
57953--- a/include/linux/cpuset.h
57954+++ b/include/linux/cpuset.h
57955@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void)
57956 * nodemask.
57957 */
57958 smp_mb();
57959- --ACCESS_ONCE(current->mems_allowed_change_disable);
57960+ --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
57961 }
57962
57963 static inline void set_mems_allowed(nodemask_t nodemask)
57964diff --git a/include/linux/cred.h b/include/linux/cred.h
57965index 4030896..8d6f342 100644
57966--- a/include/linux/cred.h
57967+++ b/include/linux/cred.h
57968@@ -207,6 +207,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
57969 static inline void validate_process_creds(void)
57970 {
57971 }
57972+static inline void validate_task_creds(struct task_struct *task)
57973+{
57974+}
57975 #endif
57976
57977 /**
57978diff --git a/include/linux/crypto.h b/include/linux/crypto.h
57979index 8a94217..15d49e3 100644
57980--- a/include/linux/crypto.h
57981+++ b/include/linux/crypto.h
57982@@ -365,7 +365,7 @@ struct cipher_tfm {
57983 const u8 *key, unsigned int keylen);
57984 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
57985 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
57986-};
57987+} __no_const;
57988
57989 struct hash_tfm {
57990 int (*init)(struct hash_desc *desc);
57991@@ -386,13 +386,13 @@ struct compress_tfm {
57992 int (*cot_decompress)(struct crypto_tfm *tfm,
57993 const u8 *src, unsigned int slen,
57994 u8 *dst, unsigned int *dlen);
57995-};
57996+} __no_const;
57997
57998 struct rng_tfm {
57999 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
58000 unsigned int dlen);
58001 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
58002-};
58003+} __no_const;
58004
58005 #define crt_ablkcipher crt_u.ablkcipher
58006 #define crt_aead crt_u.aead
58007diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
58008index 7925bf0..d5143d2 100644
58009--- a/include/linux/decompress/mm.h
58010+++ b/include/linux/decompress/mm.h
58011@@ -77,7 +77,7 @@ static void free(void *where)
58012 * warnings when not needed (indeed large_malloc / large_free are not
58013 * needed by inflate */
58014
58015-#define malloc(a) kmalloc(a, GFP_KERNEL)
58016+#define malloc(a) kmalloc((a), GFP_KERNEL)
58017 #define free(a) kfree(a)
58018
58019 #define large_malloc(a) vmalloc(a)
58020diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
58021index e13117c..e9fc938 100644
58022--- a/include/linux/dma-mapping.h
58023+++ b/include/linux/dma-mapping.h
58024@@ -46,7 +46,7 @@ struct dma_map_ops {
58025 u64 (*get_required_mask)(struct device *dev);
58026 #endif
58027 int is_phys;
58028-};
58029+} __do_const;
58030
58031 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
58032
58033diff --git a/include/linux/efi.h b/include/linux/efi.h
58034index 2362a0b..cfaf8fcc 100644
58035--- a/include/linux/efi.h
58036+++ b/include/linux/efi.h
58037@@ -446,7 +446,7 @@ struct efivar_operations {
58038 efi_get_variable_t *get_variable;
58039 efi_get_next_variable_t *get_next_variable;
58040 efi_set_variable_t *set_variable;
58041-};
58042+} __no_const;
58043
58044 struct efivars {
58045 /*
58046diff --git a/include/linux/elf.h b/include/linux/elf.h
58047index 31f0508..5421c01 100644
58048--- a/include/linux/elf.h
58049+++ b/include/linux/elf.h
58050@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
58051 #define PT_GNU_EH_FRAME 0x6474e550
58052
58053 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
58054+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
58055+
58056+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
58057+
58058+/* Constants for the e_flags field */
58059+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
58060+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
58061+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
58062+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
58063+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
58064+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
58065
58066 /*
58067 * Extended Numbering
58068@@ -106,6 +117,8 @@ typedef __s64 Elf64_Sxword;
58069 #define DT_DEBUG 21
58070 #define DT_TEXTREL 22
58071 #define DT_JMPREL 23
58072+#define DT_FLAGS 30
58073+ #define DF_TEXTREL 0x00000004
58074 #define DT_ENCODING 32
58075 #define OLD_DT_LOOS 0x60000000
58076 #define DT_LOOS 0x6000000d
58077@@ -252,6 +265,19 @@ typedef struct elf64_hdr {
58078 #define PF_W 0x2
58079 #define PF_X 0x1
58080
58081+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
58082+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
58083+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
58084+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
58085+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
58086+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
58087+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
58088+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
58089+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
58090+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
58091+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
58092+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
58093+
58094 typedef struct elf32_phdr{
58095 Elf32_Word p_type;
58096 Elf32_Off p_offset;
58097@@ -344,6 +370,8 @@ typedef struct elf64_shdr {
58098 #define EI_OSABI 7
58099 #define EI_PAD 8
58100
58101+#define EI_PAX 14
58102+
58103 #define ELFMAG0 0x7f /* EI_MAG */
58104 #define ELFMAG1 'E'
58105 #define ELFMAG2 'L'
58106@@ -423,6 +451,7 @@ extern Elf32_Dyn _DYNAMIC [];
58107 #define elf_note elf32_note
58108 #define elf_addr_t Elf32_Off
58109 #define Elf_Half Elf32_Half
58110+#define elf_dyn Elf32_Dyn
58111
58112 #else
58113
58114@@ -433,6 +462,7 @@ extern Elf64_Dyn _DYNAMIC [];
58115 #define elf_note elf64_note
58116 #define elf_addr_t Elf64_Off
58117 #define Elf_Half Elf64_Half
58118+#define elf_dyn Elf64_Dyn
58119
58120 #endif
58121
58122diff --git a/include/linux/filter.h b/include/linux/filter.h
58123index 8eeb205..d59bfa2 100644
58124--- a/include/linux/filter.h
58125+++ b/include/linux/filter.h
58126@@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
58127
58128 struct sk_buff;
58129 struct sock;
58130+struct bpf_jit_work;
58131
58132 struct sk_filter
58133 {
58134@@ -141,6 +142,9 @@ struct sk_filter
58135 unsigned int len; /* Number of filter blocks */
58136 unsigned int (*bpf_func)(const struct sk_buff *skb,
58137 const struct sock_filter *filter);
58138+#ifdef CONFIG_BPF_JIT
58139+ struct bpf_jit_work *work;
58140+#endif
58141 struct rcu_head rcu;
58142 struct sock_filter insns[0];
58143 };
58144diff --git a/include/linux/firewire.h b/include/linux/firewire.h
58145index 84ccf8e..2e9b14c 100644
58146--- a/include/linux/firewire.h
58147+++ b/include/linux/firewire.h
58148@@ -428,7 +428,7 @@ struct fw_iso_context {
58149 union {
58150 fw_iso_callback_t sc;
58151 fw_iso_mc_callback_t mc;
58152- } callback;
58153+ } __no_const callback;
58154 void *callback_data;
58155 };
58156
58157diff --git a/include/linux/fs.h b/include/linux/fs.h
58158index e0bc4ff..d79c2fa 100644
58159--- a/include/linux/fs.h
58160+++ b/include/linux/fs.h
58161@@ -1608,7 +1608,8 @@ struct file_operations {
58162 int (*setlease)(struct file *, long, struct file_lock **);
58163 long (*fallocate)(struct file *file, int mode, loff_t offset,
58164 loff_t len);
58165-};
58166+} __do_const;
58167+typedef struct file_operations __no_const file_operations_no_const;
58168
58169 struct inode_operations {
58170 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
58171diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
58172index 003dc0f..3c4ea97 100644
58173--- a/include/linux/fs_struct.h
58174+++ b/include/linux/fs_struct.h
58175@@ -6,7 +6,7 @@
58176 #include <linux/seqlock.h>
58177
58178 struct fs_struct {
58179- int users;
58180+ atomic_t users;
58181 spinlock_t lock;
58182 seqcount_t seq;
58183 int umask;
58184diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
58185index ce31408..b1ad003 100644
58186--- a/include/linux/fscache-cache.h
58187+++ b/include/linux/fscache-cache.h
58188@@ -102,7 +102,7 @@ struct fscache_operation {
58189 fscache_operation_release_t release;
58190 };
58191
58192-extern atomic_t fscache_op_debug_id;
58193+extern atomic_unchecked_t fscache_op_debug_id;
58194 extern void fscache_op_work_func(struct work_struct *work);
58195
58196 extern void fscache_enqueue_operation(struct fscache_operation *);
58197@@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
58198 {
58199 INIT_WORK(&op->work, fscache_op_work_func);
58200 atomic_set(&op->usage, 1);
58201- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
58202+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
58203 op->processor = processor;
58204 op->release = release;
58205 INIT_LIST_HEAD(&op->pend_link);
58206diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
58207index 2a53f10..0187fdf 100644
58208--- a/include/linux/fsnotify.h
58209+++ b/include/linux/fsnotify.h
58210@@ -314,7 +314,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
58211 */
58212 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
58213 {
58214- return kstrdup(name, GFP_KERNEL);
58215+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
58216 }
58217
58218 /*
58219diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
58220index 91d0e0a3..035666b 100644
58221--- a/include/linux/fsnotify_backend.h
58222+++ b/include/linux/fsnotify_backend.h
58223@@ -105,6 +105,7 @@ struct fsnotify_ops {
58224 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
58225 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
58226 };
58227+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
58228
58229 /*
58230 * A group is a "thing" that wants to receive notification about filesystem
58231diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
58232index c3da42d..c70e0df 100644
58233--- a/include/linux/ftrace_event.h
58234+++ b/include/linux/ftrace_event.h
58235@@ -97,7 +97,7 @@ struct trace_event_functions {
58236 trace_print_func raw;
58237 trace_print_func hex;
58238 trace_print_func binary;
58239-};
58240+} __no_const;
58241
58242 struct trace_event {
58243 struct hlist_node node;
58244@@ -254,7 +254,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
58245 extern int trace_add_event_call(struct ftrace_event_call *call);
58246 extern void trace_remove_event_call(struct ftrace_event_call *call);
58247
58248-#define is_signed_type(type) (((type)(-1)) < 0)
58249+#define is_signed_type(type) (((type)(-1)) < (type)1)
58250
58251 int trace_set_clr_event(const char *system, const char *event, int set);
58252
58253diff --git a/include/linux/genhd.h b/include/linux/genhd.h
58254index 6d18f35..ab71e2c 100644
58255--- a/include/linux/genhd.h
58256+++ b/include/linux/genhd.h
58257@@ -185,7 +185,7 @@ struct gendisk {
58258 struct kobject *slave_dir;
58259
58260 struct timer_rand_state *random;
58261- atomic_t sync_io; /* RAID */
58262+ atomic_unchecked_t sync_io; /* RAID */
58263 struct disk_events *ev;
58264 #ifdef CONFIG_BLK_DEV_INTEGRITY
58265 struct blk_integrity *integrity;
58266diff --git a/include/linux/gracl.h b/include/linux/gracl.h
58267new file mode 100644
58268index 0000000..0dc3943
58269--- /dev/null
58270+++ b/include/linux/gracl.h
58271@@ -0,0 +1,317 @@
58272+#ifndef GR_ACL_H
58273+#define GR_ACL_H
58274+
58275+#include <linux/grdefs.h>
58276+#include <linux/resource.h>
58277+#include <linux/capability.h>
58278+#include <linux/dcache.h>
58279+#include <asm/resource.h>
58280+
58281+/* Major status information */
58282+
58283+#define GR_VERSION "grsecurity 2.2.2"
58284+#define GRSECURITY_VERSION 0x2202
58285+
58286+enum {
58287+ GR_SHUTDOWN = 0,
58288+ GR_ENABLE = 1,
58289+ GR_SPROLE = 2,
58290+ GR_RELOAD = 3,
58291+ GR_SEGVMOD = 4,
58292+ GR_STATUS = 5,
58293+ GR_UNSPROLE = 6,
58294+ GR_PASSSET = 7,
58295+ GR_SPROLEPAM = 8,
58296+};
58297+
58298+/* Password setup definitions
58299+ * kernel/grhash.c */
58300+enum {
58301+ GR_PW_LEN = 128,
58302+ GR_SALT_LEN = 16,
58303+ GR_SHA_LEN = 32,
58304+};
58305+
58306+enum {
58307+ GR_SPROLE_LEN = 64,
58308+};
58309+
58310+enum {
58311+ GR_NO_GLOB = 0,
58312+ GR_REG_GLOB,
58313+ GR_CREATE_GLOB
58314+};
58315+
58316+#define GR_NLIMITS 32
58317+
58318+/* Begin Data Structures */
58319+
58320+struct sprole_pw {
58321+ unsigned char *rolename;
58322+ unsigned char salt[GR_SALT_LEN];
58323+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
58324+};
58325+
58326+struct name_entry {
58327+ __u32 key;
58328+ ino_t inode;
58329+ dev_t device;
58330+ char *name;
58331+ __u16 len;
58332+ __u8 deleted;
58333+ struct name_entry *prev;
58334+ struct name_entry *next;
58335+};
58336+
58337+struct inodev_entry {
58338+ struct name_entry *nentry;
58339+ struct inodev_entry *prev;
58340+ struct inodev_entry *next;
58341+};
58342+
58343+struct acl_role_db {
58344+ struct acl_role_label **r_hash;
58345+ __u32 r_size;
58346+};
58347+
58348+struct inodev_db {
58349+ struct inodev_entry **i_hash;
58350+ __u32 i_size;
58351+};
58352+
58353+struct name_db {
58354+ struct name_entry **n_hash;
58355+ __u32 n_size;
58356+};
58357+
58358+struct crash_uid {
58359+ uid_t uid;
58360+ unsigned long expires;
58361+};
58362+
58363+struct gr_hash_struct {
58364+ void **table;
58365+ void **nametable;
58366+ void *first;
58367+ __u32 table_size;
58368+ __u32 used_size;
58369+ int type;
58370+};
58371+
58372+/* Userspace Grsecurity ACL data structures */
58373+
58374+struct acl_subject_label {
58375+ char *filename;
58376+ ino_t inode;
58377+ dev_t device;
58378+ __u32 mode;
58379+ kernel_cap_t cap_mask;
58380+ kernel_cap_t cap_lower;
58381+ kernel_cap_t cap_invert_audit;
58382+
58383+ struct rlimit res[GR_NLIMITS];
58384+ __u32 resmask;
58385+
58386+ __u8 user_trans_type;
58387+ __u8 group_trans_type;
58388+ uid_t *user_transitions;
58389+ gid_t *group_transitions;
58390+ __u16 user_trans_num;
58391+ __u16 group_trans_num;
58392+
58393+ __u32 sock_families[2];
58394+ __u32 ip_proto[8];
58395+ __u32 ip_type;
58396+ struct acl_ip_label **ips;
58397+ __u32 ip_num;
58398+ __u32 inaddr_any_override;
58399+
58400+ __u32 crashes;
58401+ unsigned long expires;
58402+
58403+ struct acl_subject_label *parent_subject;
58404+ struct gr_hash_struct *hash;
58405+ struct acl_subject_label *prev;
58406+ struct acl_subject_label *next;
58407+
58408+ struct acl_object_label **obj_hash;
58409+ __u32 obj_hash_size;
58410+ __u16 pax_flags;
58411+};
58412+
58413+struct role_allowed_ip {
58414+ __u32 addr;
58415+ __u32 netmask;
58416+
58417+ struct role_allowed_ip *prev;
58418+ struct role_allowed_ip *next;
58419+};
58420+
58421+struct role_transition {
58422+ char *rolename;
58423+
58424+ struct role_transition *prev;
58425+ struct role_transition *next;
58426+};
58427+
58428+struct acl_role_label {
58429+ char *rolename;
58430+ uid_t uidgid;
58431+ __u16 roletype;
58432+
58433+ __u16 auth_attempts;
58434+ unsigned long expires;
58435+
58436+ struct acl_subject_label *root_label;
58437+ struct gr_hash_struct *hash;
58438+
58439+ struct acl_role_label *prev;
58440+ struct acl_role_label *next;
58441+
58442+ struct role_transition *transitions;
58443+ struct role_allowed_ip *allowed_ips;
58444+ uid_t *domain_children;
58445+ __u16 domain_child_num;
58446+
58447+ struct acl_subject_label **subj_hash;
58448+ __u32 subj_hash_size;
58449+};
58450+
58451+struct user_acl_role_db {
58452+ struct acl_role_label **r_table;
58453+ __u32 num_pointers; /* Number of allocations to track */
58454+ __u32 num_roles; /* Number of roles */
58455+ __u32 num_domain_children; /* Number of domain children */
58456+ __u32 num_subjects; /* Number of subjects */
58457+ __u32 num_objects; /* Number of objects */
58458+};
58459+
58460+struct acl_object_label {
58461+ char *filename;
58462+ ino_t inode;
58463+ dev_t device;
58464+ __u32 mode;
58465+
58466+ struct acl_subject_label *nested;
58467+ struct acl_object_label *globbed;
58468+
58469+ /* next two structures not used */
58470+
58471+ struct acl_object_label *prev;
58472+ struct acl_object_label *next;
58473+};
58474+
58475+struct acl_ip_label {
58476+ char *iface;
58477+ __u32 addr;
58478+ __u32 netmask;
58479+ __u16 low, high;
58480+ __u8 mode;
58481+ __u32 type;
58482+ __u32 proto[8];
58483+
58484+ /* next two structures not used */
58485+
58486+ struct acl_ip_label *prev;
58487+ struct acl_ip_label *next;
58488+};
58489+
58490+struct gr_arg {
58491+ struct user_acl_role_db role_db;
58492+ unsigned char pw[GR_PW_LEN];
58493+ unsigned char salt[GR_SALT_LEN];
58494+ unsigned char sum[GR_SHA_LEN];
58495+ unsigned char sp_role[GR_SPROLE_LEN];
58496+ struct sprole_pw *sprole_pws;
58497+ dev_t segv_device;
58498+ ino_t segv_inode;
58499+ uid_t segv_uid;
58500+ __u16 num_sprole_pws;
58501+ __u16 mode;
58502+};
58503+
58504+struct gr_arg_wrapper {
58505+ struct gr_arg *arg;
58506+ __u32 version;
58507+ __u32 size;
58508+};
58509+
58510+struct subject_map {
58511+ struct acl_subject_label *user;
58512+ struct acl_subject_label *kernel;
58513+ struct subject_map *prev;
58514+ struct subject_map *next;
58515+};
58516+
58517+struct acl_subj_map_db {
58518+ struct subject_map **s_hash;
58519+ __u32 s_size;
58520+};
58521+
58522+/* End Data Structures Section */
58523+
58524+/* Hash functions generated by empirical testing by Brad Spengler
58525+ Makes good use of the low bits of the inode. Generally 0-1 times
58526+ in loop for successful match. 0-3 for unsuccessful match.
58527+ Shift/add algorithm with modulus of table size and an XOR*/
58528+
58529+static __inline__ unsigned int
58530+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
58531+{
58532+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
58533+}
58534+
58535+ static __inline__ unsigned int
58536+shash(const struct acl_subject_label *userp, const unsigned int sz)
58537+{
58538+ return ((const unsigned long)userp % sz);
58539+}
58540+
58541+static __inline__ unsigned int
58542+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
58543+{
58544+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
58545+}
58546+
58547+static __inline__ unsigned int
58548+nhash(const char *name, const __u16 len, const unsigned int sz)
58549+{
58550+ return full_name_hash((const unsigned char *)name, len) % sz;
58551+}
58552+
58553+#define FOR_EACH_ROLE_START(role) \
58554+ role = role_list; \
58555+ while (role) {
58556+
58557+#define FOR_EACH_ROLE_END(role) \
58558+ role = role->prev; \
58559+ }
58560+
58561+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
58562+ subj = NULL; \
58563+ iter = 0; \
58564+ while (iter < role->subj_hash_size) { \
58565+ if (subj == NULL) \
58566+ subj = role->subj_hash[iter]; \
58567+ if (subj == NULL) { \
58568+ iter++; \
58569+ continue; \
58570+ }
58571+
58572+#define FOR_EACH_SUBJECT_END(subj,iter) \
58573+ subj = subj->next; \
58574+ if (subj == NULL) \
58575+ iter++; \
58576+ }
58577+
58578+
58579+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
58580+ subj = role->hash->first; \
58581+ while (subj != NULL) {
58582+
58583+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
58584+ subj = subj->next; \
58585+ }
58586+
58587+#endif
58588+
58589diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
58590new file mode 100644
58591index 0000000..323ecf2
58592--- /dev/null
58593+++ b/include/linux/gralloc.h
58594@@ -0,0 +1,9 @@
58595+#ifndef __GRALLOC_H
58596+#define __GRALLOC_H
58597+
58598+void acl_free_all(void);
58599+int acl_alloc_stack_init(unsigned long size);
58600+void *acl_alloc(unsigned long len);
58601+void *acl_alloc_num(unsigned long num, unsigned long len);
58602+
58603+#endif
58604diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
58605new file mode 100644
58606index 0000000..b30e9bc
58607--- /dev/null
58608+++ b/include/linux/grdefs.h
58609@@ -0,0 +1,140 @@
58610+#ifndef GRDEFS_H
58611+#define GRDEFS_H
58612+
58613+/* Begin grsecurity status declarations */
58614+
58615+enum {
58616+ GR_READY = 0x01,
58617+ GR_STATUS_INIT = 0x00 // disabled state
58618+};
58619+
58620+/* Begin ACL declarations */
58621+
58622+/* Role flags */
58623+
58624+enum {
58625+ GR_ROLE_USER = 0x0001,
58626+ GR_ROLE_GROUP = 0x0002,
58627+ GR_ROLE_DEFAULT = 0x0004,
58628+ GR_ROLE_SPECIAL = 0x0008,
58629+ GR_ROLE_AUTH = 0x0010,
58630+ GR_ROLE_NOPW = 0x0020,
58631+ GR_ROLE_GOD = 0x0040,
58632+ GR_ROLE_LEARN = 0x0080,
58633+ GR_ROLE_TPE = 0x0100,
58634+ GR_ROLE_DOMAIN = 0x0200,
58635+ GR_ROLE_PAM = 0x0400,
58636+ GR_ROLE_PERSIST = 0x0800
58637+};
58638+
58639+/* ACL Subject and Object mode flags */
58640+enum {
58641+ GR_DELETED = 0x80000000
58642+};
58643+
58644+/* ACL Object-only mode flags */
58645+enum {
58646+ GR_READ = 0x00000001,
58647+ GR_APPEND = 0x00000002,
58648+ GR_WRITE = 0x00000004,
58649+ GR_EXEC = 0x00000008,
58650+ GR_FIND = 0x00000010,
58651+ GR_INHERIT = 0x00000020,
58652+ GR_SETID = 0x00000040,
58653+ GR_CREATE = 0x00000080,
58654+ GR_DELETE = 0x00000100,
58655+ GR_LINK = 0x00000200,
58656+ GR_AUDIT_READ = 0x00000400,
58657+ GR_AUDIT_APPEND = 0x00000800,
58658+ GR_AUDIT_WRITE = 0x00001000,
58659+ GR_AUDIT_EXEC = 0x00002000,
58660+ GR_AUDIT_FIND = 0x00004000,
58661+ GR_AUDIT_INHERIT= 0x00008000,
58662+ GR_AUDIT_SETID = 0x00010000,
58663+ GR_AUDIT_CREATE = 0x00020000,
58664+ GR_AUDIT_DELETE = 0x00040000,
58665+ GR_AUDIT_LINK = 0x00080000,
58666+ GR_PTRACERD = 0x00100000,
58667+ GR_NOPTRACE = 0x00200000,
58668+ GR_SUPPRESS = 0x00400000,
58669+ GR_NOLEARN = 0x00800000,
58670+ GR_INIT_TRANSFER= 0x01000000
58671+};
58672+
58673+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
58674+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
58675+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
58676+
58677+/* ACL subject-only mode flags */
58678+enum {
58679+ GR_KILL = 0x00000001,
58680+ GR_VIEW = 0x00000002,
58681+ GR_PROTECTED = 0x00000004,
58682+ GR_LEARN = 0x00000008,
58683+ GR_OVERRIDE = 0x00000010,
58684+ /* just a placeholder, this mode is only used in userspace */
58685+ GR_DUMMY = 0x00000020,
58686+ GR_PROTSHM = 0x00000040,
58687+ GR_KILLPROC = 0x00000080,
58688+ GR_KILLIPPROC = 0x00000100,
58689+ /* just a placeholder, this mode is only used in userspace */
58690+ GR_NOTROJAN = 0x00000200,
58691+ GR_PROTPROCFD = 0x00000400,
58692+ GR_PROCACCT = 0x00000800,
58693+ GR_RELAXPTRACE = 0x00001000,
58694+ GR_NESTED = 0x00002000,
58695+ GR_INHERITLEARN = 0x00004000,
58696+ GR_PROCFIND = 0x00008000,
58697+ GR_POVERRIDE = 0x00010000,
58698+ GR_KERNELAUTH = 0x00020000,
58699+ GR_ATSECURE = 0x00040000,
58700+ GR_SHMEXEC = 0x00080000
58701+};
58702+
58703+enum {
58704+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
58705+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
58706+ GR_PAX_ENABLE_MPROTECT = 0x0004,
58707+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
58708+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
58709+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
58710+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
58711+ GR_PAX_DISABLE_MPROTECT = 0x0400,
58712+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
58713+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
58714+};
58715+
58716+enum {
58717+ GR_ID_USER = 0x01,
58718+ GR_ID_GROUP = 0x02,
58719+};
58720+
58721+enum {
58722+ GR_ID_ALLOW = 0x01,
58723+ GR_ID_DENY = 0x02,
58724+};
58725+
58726+#define GR_CRASH_RES 31
58727+#define GR_UIDTABLE_MAX 500
58728+
58729+/* begin resource learning section */
58730+enum {
58731+ GR_RLIM_CPU_BUMP = 60,
58732+ GR_RLIM_FSIZE_BUMP = 50000,
58733+ GR_RLIM_DATA_BUMP = 10000,
58734+ GR_RLIM_STACK_BUMP = 1000,
58735+ GR_RLIM_CORE_BUMP = 10000,
58736+ GR_RLIM_RSS_BUMP = 500000,
58737+ GR_RLIM_NPROC_BUMP = 1,
58738+ GR_RLIM_NOFILE_BUMP = 5,
58739+ GR_RLIM_MEMLOCK_BUMP = 50000,
58740+ GR_RLIM_AS_BUMP = 500000,
58741+ GR_RLIM_LOCKS_BUMP = 2,
58742+ GR_RLIM_SIGPENDING_BUMP = 5,
58743+ GR_RLIM_MSGQUEUE_BUMP = 10000,
58744+ GR_RLIM_NICE_BUMP = 1,
58745+ GR_RLIM_RTPRIO_BUMP = 1,
58746+ GR_RLIM_RTTIME_BUMP = 1000000
58747+};
58748+
58749+#endif
58750diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
58751new file mode 100644
58752index 0000000..da390f1
58753--- /dev/null
58754+++ b/include/linux/grinternal.h
58755@@ -0,0 +1,221 @@
58756+#ifndef __GRINTERNAL_H
58757+#define __GRINTERNAL_H
58758+
58759+#ifdef CONFIG_GRKERNSEC
58760+
58761+#include <linux/fs.h>
58762+#include <linux/mnt_namespace.h>
58763+#include <linux/nsproxy.h>
58764+#include <linux/gracl.h>
58765+#include <linux/grdefs.h>
58766+#include <linux/grmsg.h>
58767+
58768+void gr_add_learn_entry(const char *fmt, ...)
58769+ __attribute__ ((format (printf, 1, 2)));
58770+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
58771+ const struct vfsmount *mnt);
58772+__u32 gr_check_create(const struct dentry *new_dentry,
58773+ const struct dentry *parent,
58774+ const struct vfsmount *mnt, const __u32 mode);
58775+int gr_check_protected_task(const struct task_struct *task);
58776+__u32 to_gr_audit(const __u32 reqmode);
58777+int gr_set_acls(const int type);
58778+int gr_apply_subject_to_task(struct task_struct *task);
58779+int gr_acl_is_enabled(void);
58780+char gr_roletype_to_char(void);
58781+
58782+void gr_handle_alertkill(struct task_struct *task);
58783+char *gr_to_filename(const struct dentry *dentry,
58784+ const struct vfsmount *mnt);
58785+char *gr_to_filename1(const struct dentry *dentry,
58786+ const struct vfsmount *mnt);
58787+char *gr_to_filename2(const struct dentry *dentry,
58788+ const struct vfsmount *mnt);
58789+char *gr_to_filename3(const struct dentry *dentry,
58790+ const struct vfsmount *mnt);
58791+
58792+extern int grsec_enable_ptrace_readexec;
58793+extern int grsec_enable_harden_ptrace;
58794+extern int grsec_enable_link;
58795+extern int grsec_enable_fifo;
58796+extern int grsec_enable_execve;
58797+extern int grsec_enable_shm;
58798+extern int grsec_enable_execlog;
58799+extern int grsec_enable_signal;
58800+extern int grsec_enable_audit_ptrace;
58801+extern int grsec_enable_forkfail;
58802+extern int grsec_enable_time;
58803+extern int grsec_enable_rofs;
58804+extern int grsec_enable_chroot_shmat;
58805+extern int grsec_enable_chroot_mount;
58806+extern int grsec_enable_chroot_double;
58807+extern int grsec_enable_chroot_pivot;
58808+extern int grsec_enable_chroot_chdir;
58809+extern int grsec_enable_chroot_chmod;
58810+extern int grsec_enable_chroot_mknod;
58811+extern int grsec_enable_chroot_fchdir;
58812+extern int grsec_enable_chroot_nice;
58813+extern int grsec_enable_chroot_execlog;
58814+extern int grsec_enable_chroot_caps;
58815+extern int grsec_enable_chroot_sysctl;
58816+extern int grsec_enable_chroot_unix;
58817+extern int grsec_enable_tpe;
58818+extern int grsec_tpe_gid;
58819+extern int grsec_enable_tpe_all;
58820+extern int grsec_enable_tpe_invert;
58821+extern int grsec_enable_socket_all;
58822+extern int grsec_socket_all_gid;
58823+extern int grsec_enable_socket_client;
58824+extern int grsec_socket_client_gid;
58825+extern int grsec_enable_socket_server;
58826+extern int grsec_socket_server_gid;
58827+extern int grsec_audit_gid;
58828+extern int grsec_enable_group;
58829+extern int grsec_enable_audit_textrel;
58830+extern int grsec_enable_log_rwxmaps;
58831+extern int grsec_enable_mount;
58832+extern int grsec_enable_chdir;
58833+extern int grsec_resource_logging;
58834+extern int grsec_enable_blackhole;
58835+extern int grsec_lastack_retries;
58836+extern int grsec_enable_brute;
58837+extern int grsec_lock;
58838+
58839+extern spinlock_t grsec_alert_lock;
58840+extern unsigned long grsec_alert_wtime;
58841+extern unsigned long grsec_alert_fyet;
58842+
58843+extern spinlock_t grsec_audit_lock;
58844+
58845+extern rwlock_t grsec_exec_file_lock;
58846+
58847+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
58848+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
58849+ (tsk)->exec_file->f_vfsmnt) : "/")
58850+
58851+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
58852+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
58853+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
58854+
58855+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
58856+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
58857+ (tsk)->exec_file->f_vfsmnt) : "/")
58858+
58859+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
58860+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
58861+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
58862+
58863+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
58864+
58865+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
58866+
58867+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
58868+ (task)->pid, (cred)->uid, \
58869+ (cred)->euid, (cred)->gid, (cred)->egid, \
58870+ gr_parent_task_fullpath(task), \
58871+ (task)->real_parent->comm, (task)->real_parent->pid, \
58872+ (pcred)->uid, (pcred)->euid, \
58873+ (pcred)->gid, (pcred)->egid
58874+
58875+#define GR_CHROOT_CAPS {{ \
58876+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
58877+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
58878+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
58879+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
58880+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
58881+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
58882+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
58883+
58884+#define security_learn(normal_msg,args...) \
58885+({ \
58886+ read_lock(&grsec_exec_file_lock); \
58887+ gr_add_learn_entry(normal_msg "\n", ## args); \
58888+ read_unlock(&grsec_exec_file_lock); \
58889+})
58890+
58891+enum {
58892+ GR_DO_AUDIT,
58893+ GR_DONT_AUDIT,
58894+ /* used for non-audit messages that we shouldn't kill the task on */
58895+ GR_DONT_AUDIT_GOOD
58896+};
58897+
58898+enum {
58899+ GR_TTYSNIFF,
58900+ GR_RBAC,
58901+ GR_RBAC_STR,
58902+ GR_STR_RBAC,
58903+ GR_RBAC_MODE2,
58904+ GR_RBAC_MODE3,
58905+ GR_FILENAME,
58906+ GR_SYSCTL_HIDDEN,
58907+ GR_NOARGS,
58908+ GR_ONE_INT,
58909+ GR_ONE_INT_TWO_STR,
58910+ GR_ONE_STR,
58911+ GR_STR_INT,
58912+ GR_TWO_STR_INT,
58913+ GR_TWO_INT,
58914+ GR_TWO_U64,
58915+ GR_THREE_INT,
58916+ GR_FIVE_INT_TWO_STR,
58917+ GR_TWO_STR,
58918+ GR_THREE_STR,
58919+ GR_FOUR_STR,
58920+ GR_STR_FILENAME,
58921+ GR_FILENAME_STR,
58922+ GR_FILENAME_TWO_INT,
58923+ GR_FILENAME_TWO_INT_STR,
58924+ GR_TEXTREL,
58925+ GR_PTRACE,
58926+ GR_RESOURCE,
58927+ GR_CAP,
58928+ GR_SIG,
58929+ GR_SIG2,
58930+ GR_CRASH1,
58931+ GR_CRASH2,
58932+ GR_PSACCT,
58933+ GR_RWXMAP
58934+};
58935+
58936+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
58937+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
58938+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
58939+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
58940+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
58941+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
58942+#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)
58943+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
58944+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
58945+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
58946+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
58947+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
58948+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
58949+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
58950+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
58951+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
58952+#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)
58953+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
58954+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
58955+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
58956+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
58957+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
58958+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
58959+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
58960+#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)
58961+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
58962+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
58963+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
58964+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
58965+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
58966+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
58967+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
58968+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
58969+#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)
58970+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
58971+
58972+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
58973+
58974+#endif
58975+
58976+#endif
58977diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
58978new file mode 100644
58979index 0000000..8b9ed56
58980--- /dev/null
58981+++ b/include/linux/grmsg.h
58982@@ -0,0 +1,110 @@
58983+#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"
58984+#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"
58985+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
58986+#define GR_STOPMOD_MSG "denied modification of module state by "
58987+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
58988+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
58989+#define GR_IOPERM_MSG "denied use of ioperm() by "
58990+#define GR_IOPL_MSG "denied use of iopl() by "
58991+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
58992+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
58993+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
58994+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
58995+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
58996+#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"
58997+#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"
58998+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
58999+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
59000+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
59001+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
59002+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
59003+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
59004+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
59005+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
59006+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
59007+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
59008+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
59009+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
59010+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
59011+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
59012+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
59013+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
59014+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
59015+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
59016+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
59017+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
59018+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
59019+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
59020+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
59021+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
59022+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
59023+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
59024+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
59025+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
59026+#define GR_FCHMOD_ACL_MSG "%s fchmod of %.950s by "
59027+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
59028+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
59029+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
59030+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
59031+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
59032+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
59033+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
59034+#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"
59035+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbaged by "
59036+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
59037+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
59038+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
59039+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
59040+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
59041+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
59042+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
59043+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
59044+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
59045+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
59046+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
59047+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
59048+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
59049+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
59050+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
59051+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
59052+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
59053+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
59054+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
59055+#define GR_FAILFORK_MSG "failed fork with errno %s by "
59056+#define GR_NICE_CHROOT_MSG "denied priority change by "
59057+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
59058+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
59059+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
59060+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
59061+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
59062+#define GR_TIME_MSG "time set by "
59063+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
59064+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
59065+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
59066+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
59067+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
59068+#define GR_BIND_MSG "denied bind() by "
59069+#define GR_CONNECT_MSG "denied connect() by "
59070+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
59071+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
59072+#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"
59073+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
59074+#define GR_CAP_ACL_MSG "use of %s denied for "
59075+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
59076+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
59077+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
59078+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
59079+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
59080+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
59081+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
59082+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
59083+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
59084+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
59085+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
59086+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
59087+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
59088+#define GR_VM86_MSG "denied use of vm86 by "
59089+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
59090+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
59091+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
59092+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
59093diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
59094new file mode 100644
59095index 0000000..10c8ced
59096--- /dev/null
59097+++ b/include/linux/grsecurity.h
59098@@ -0,0 +1,229 @@
59099+#ifndef GR_SECURITY_H
59100+#define GR_SECURITY_H
59101+#include <linux/fs.h>
59102+#include <linux/fs_struct.h>
59103+#include <linux/binfmts.h>
59104+#include <linux/gracl.h>
59105+
59106+/* notify of brain-dead configs */
59107+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
59108+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
59109+#endif
59110+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
59111+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
59112+#endif
59113+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
59114+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
59115+#endif
59116+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
59117+#error "CONFIG_PAX enabled, but no PaX options are enabled."
59118+#endif
59119+
59120+#include <linux/compat.h>
59121+
59122+struct user_arg_ptr {
59123+#ifdef CONFIG_COMPAT
59124+ bool is_compat;
59125+#endif
59126+ union {
59127+ const char __user *const __user *native;
59128+#ifdef CONFIG_COMPAT
59129+ compat_uptr_t __user *compat;
59130+#endif
59131+ } ptr;
59132+};
59133+
59134+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
59135+void gr_handle_brute_check(void);
59136+void gr_handle_kernel_exploit(void);
59137+int gr_process_user_ban(void);
59138+
59139+char gr_roletype_to_char(void);
59140+
59141+int gr_acl_enable_at_secure(void);
59142+
59143+int gr_check_user_change(int real, int effective, int fs);
59144+int gr_check_group_change(int real, int effective, int fs);
59145+
59146+void gr_del_task_from_ip_table(struct task_struct *p);
59147+
59148+int gr_pid_is_chrooted(struct task_struct *p);
59149+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
59150+int gr_handle_chroot_nice(void);
59151+int gr_handle_chroot_sysctl(const int op);
59152+int gr_handle_chroot_setpriority(struct task_struct *p,
59153+ const int niceval);
59154+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
59155+int gr_handle_chroot_chroot(const struct dentry *dentry,
59156+ const struct vfsmount *mnt);
59157+void gr_handle_chroot_chdir(struct path *path);
59158+int gr_handle_chroot_chmod(const struct dentry *dentry,
59159+ const struct vfsmount *mnt, const int mode);
59160+int gr_handle_chroot_mknod(const struct dentry *dentry,
59161+ const struct vfsmount *mnt, const int mode);
59162+int gr_handle_chroot_mount(const struct dentry *dentry,
59163+ const struct vfsmount *mnt,
59164+ const char *dev_name);
59165+int gr_handle_chroot_pivot(void);
59166+int gr_handle_chroot_unix(const pid_t pid);
59167+
59168+int gr_handle_rawio(const struct inode *inode);
59169+
59170+void gr_handle_ioperm(void);
59171+void gr_handle_iopl(void);
59172+
59173+int gr_tpe_allow(const struct file *file);
59174+
59175+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
59176+void gr_clear_chroot_entries(struct task_struct *task);
59177+
59178+void gr_log_forkfail(const int retval);
59179+void gr_log_timechange(void);
59180+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
59181+void gr_log_chdir(const struct dentry *dentry,
59182+ const struct vfsmount *mnt);
59183+void gr_log_chroot_exec(const struct dentry *dentry,
59184+ const struct vfsmount *mnt);
59185+void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
59186+void gr_log_remount(const char *devname, const int retval);
59187+void gr_log_unmount(const char *devname, const int retval);
59188+void gr_log_mount(const char *from, const char *to, const int retval);
59189+void gr_log_textrel(struct vm_area_struct *vma);
59190+void gr_log_rwxmmap(struct file *file);
59191+void gr_log_rwxmprotect(struct file *file);
59192+
59193+int gr_handle_follow_link(const struct inode *parent,
59194+ const struct inode *inode,
59195+ const struct dentry *dentry,
59196+ const struct vfsmount *mnt);
59197+int gr_handle_fifo(const struct dentry *dentry,
59198+ const struct vfsmount *mnt,
59199+ const struct dentry *dir, const int flag,
59200+ const int acc_mode);
59201+int gr_handle_hardlink(const struct dentry *dentry,
59202+ const struct vfsmount *mnt,
59203+ struct inode *inode,
59204+ const int mode, const char *to);
59205+
59206+int gr_is_capable(const int cap);
59207+int gr_is_capable_nolog(const int cap);
59208+void gr_learn_resource(const struct task_struct *task, const int limit,
59209+ const unsigned long wanted, const int gt);
59210+void gr_copy_label(struct task_struct *tsk);
59211+void gr_handle_crash(struct task_struct *task, const int sig);
59212+int gr_handle_signal(const struct task_struct *p, const int sig);
59213+int gr_check_crash_uid(const uid_t uid);
59214+int gr_check_protected_task(const struct task_struct *task);
59215+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
59216+int gr_acl_handle_mmap(const struct file *file,
59217+ const unsigned long prot);
59218+int gr_acl_handle_mprotect(const struct file *file,
59219+ const unsigned long prot);
59220+int gr_check_hidden_task(const struct task_struct *tsk);
59221+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
59222+ const struct vfsmount *mnt);
59223+__u32 gr_acl_handle_utime(const struct dentry *dentry,
59224+ const struct vfsmount *mnt);
59225+__u32 gr_acl_handle_access(const struct dentry *dentry,
59226+ const struct vfsmount *mnt, const int fmode);
59227+__u32 gr_acl_handle_fchmod(const struct dentry *dentry,
59228+ const struct vfsmount *mnt, mode_t mode);
59229+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
59230+ const struct vfsmount *mnt, mode_t mode);
59231+__u32 gr_acl_handle_chown(const struct dentry *dentry,
59232+ const struct vfsmount *mnt);
59233+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
59234+ const struct vfsmount *mnt);
59235+int gr_handle_ptrace(struct task_struct *task, const long request);
59236+int gr_handle_proc_ptrace(struct task_struct *task);
59237+__u32 gr_acl_handle_execve(const struct dentry *dentry,
59238+ const struct vfsmount *mnt);
59239+int gr_check_crash_exec(const struct file *filp);
59240+int gr_acl_is_enabled(void);
59241+void gr_set_kernel_label(struct task_struct *task);
59242+void gr_set_role_label(struct task_struct *task, const uid_t uid,
59243+ const gid_t gid);
59244+int gr_set_proc_label(const struct dentry *dentry,
59245+ const struct vfsmount *mnt,
59246+ const int unsafe_flags);
59247+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
59248+ const struct vfsmount *mnt);
59249+__u32 gr_acl_handle_open(const struct dentry *dentry,
59250+ const struct vfsmount *mnt, int acc_mode);
59251+__u32 gr_acl_handle_creat(const struct dentry *dentry,
59252+ const struct dentry *p_dentry,
59253+ const struct vfsmount *p_mnt,
59254+ int open_flags, int acc_mode, const int imode);
59255+void gr_handle_create(const struct dentry *dentry,
59256+ const struct vfsmount *mnt);
59257+void gr_handle_proc_create(const struct dentry *dentry,
59258+ const struct inode *inode);
59259+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
59260+ const struct dentry *parent_dentry,
59261+ const struct vfsmount *parent_mnt,
59262+ const int mode);
59263+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
59264+ const struct dentry *parent_dentry,
59265+ const struct vfsmount *parent_mnt);
59266+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
59267+ const struct vfsmount *mnt);
59268+void gr_handle_delete(const ino_t ino, const dev_t dev);
59269+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
59270+ const struct vfsmount *mnt);
59271+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
59272+ const struct dentry *parent_dentry,
59273+ const struct vfsmount *parent_mnt,
59274+ const char *from);
59275+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
59276+ const struct dentry *parent_dentry,
59277+ const struct vfsmount *parent_mnt,
59278+ const struct dentry *old_dentry,
59279+ const struct vfsmount *old_mnt, const char *to);
59280+int gr_acl_handle_rename(struct dentry *new_dentry,
59281+ struct dentry *parent_dentry,
59282+ const struct vfsmount *parent_mnt,
59283+ struct dentry *old_dentry,
59284+ struct inode *old_parent_inode,
59285+ struct vfsmount *old_mnt, const char *newname);
59286+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
59287+ struct dentry *old_dentry,
59288+ struct dentry *new_dentry,
59289+ struct vfsmount *mnt, const __u8 replace);
59290+__u32 gr_check_link(const struct dentry *new_dentry,
59291+ const struct dentry *parent_dentry,
59292+ const struct vfsmount *parent_mnt,
59293+ const struct dentry *old_dentry,
59294+ const struct vfsmount *old_mnt);
59295+int gr_acl_handle_filldir(const struct file *file, const char *name,
59296+ const unsigned int namelen, const ino_t ino);
59297+
59298+__u32 gr_acl_handle_unix(const struct dentry *dentry,
59299+ const struct vfsmount *mnt);
59300+void gr_acl_handle_exit(void);
59301+void gr_acl_handle_psacct(struct task_struct *task, const long code);
59302+int gr_acl_handle_procpidmem(const struct task_struct *task);
59303+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
59304+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
59305+void gr_audit_ptrace(struct task_struct *task);
59306+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
59307+
59308+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
59309+
59310+#ifdef CONFIG_GRKERNSEC
59311+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
59312+void gr_handle_vm86(void);
59313+void gr_handle_mem_readwrite(u64 from, u64 to);
59314+
59315+void gr_log_badprocpid(const char *entry);
59316+
59317+extern int grsec_enable_dmesg;
59318+extern int grsec_disable_privio;
59319+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59320+extern int grsec_enable_chroot_findtask;
59321+#endif
59322+#ifdef CONFIG_GRKERNSEC_SETXID
59323+extern int grsec_enable_setxid;
59324+#endif
59325+#endif
59326+
59327+#endif
59328diff --git a/include/linux/grsock.h b/include/linux/grsock.h
59329new file mode 100644
59330index 0000000..e7ffaaf
59331--- /dev/null
59332+++ b/include/linux/grsock.h
59333@@ -0,0 +1,19 @@
59334+#ifndef __GRSOCK_H
59335+#define __GRSOCK_H
59336+
59337+extern void gr_attach_curr_ip(const struct sock *sk);
59338+extern int gr_handle_sock_all(const int family, const int type,
59339+ const int protocol);
59340+extern int gr_handle_sock_server(const struct sockaddr *sck);
59341+extern int gr_handle_sock_server_other(const struct sock *sck);
59342+extern int gr_handle_sock_client(const struct sockaddr *sck);
59343+extern int gr_search_connect(struct socket * sock,
59344+ struct sockaddr_in * addr);
59345+extern int gr_search_bind(struct socket * sock,
59346+ struct sockaddr_in * addr);
59347+extern int gr_search_listen(struct socket * sock);
59348+extern int gr_search_accept(struct socket * sock);
59349+extern int gr_search_socket(const int domain, const int type,
59350+ const int protocol);
59351+
59352+#endif
59353diff --git a/include/linux/hid.h b/include/linux/hid.h
59354index c235e4e..f0cf7a0 100644
59355--- a/include/linux/hid.h
59356+++ b/include/linux/hid.h
59357@@ -679,7 +679,7 @@ struct hid_ll_driver {
59358 unsigned int code, int value);
59359
59360 int (*parse)(struct hid_device *hdev);
59361-};
59362+} __no_const;
59363
59364 #define PM_HINT_FULLON 1<<5
59365 #define PM_HINT_NORMAL 1<<1
59366diff --git a/include/linux/highmem.h b/include/linux/highmem.h
59367index 3a93f73..b19d0b3 100644
59368--- a/include/linux/highmem.h
59369+++ b/include/linux/highmem.h
59370@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page)
59371 kunmap_atomic(kaddr, KM_USER0);
59372 }
59373
59374+static inline void sanitize_highpage(struct page *page)
59375+{
59376+ void *kaddr;
59377+ unsigned long flags;
59378+
59379+ local_irq_save(flags);
59380+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
59381+ clear_page(kaddr);
59382+ kunmap_atomic(kaddr, KM_CLEARPAGE);
59383+ local_irq_restore(flags);
59384+}
59385+
59386 static inline void zero_user_segments(struct page *page,
59387 unsigned start1, unsigned end1,
59388 unsigned start2, unsigned end2)
59389diff --git a/include/linux/i2c.h b/include/linux/i2c.h
59390index 07d103a..04ec65b 100644
59391--- a/include/linux/i2c.h
59392+++ b/include/linux/i2c.h
59393@@ -364,6 +364,7 @@ struct i2c_algorithm {
59394 /* To determine what the adapter supports */
59395 u32 (*functionality) (struct i2c_adapter *);
59396 };
59397+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
59398
59399 /*
59400 * i2c_adapter is the structure used to identify a physical i2c bus along
59401diff --git a/include/linux/i2o.h b/include/linux/i2o.h
59402index a6deef4..c56a7f2 100644
59403--- a/include/linux/i2o.h
59404+++ b/include/linux/i2o.h
59405@@ -564,7 +564,7 @@ struct i2o_controller {
59406 struct i2o_device *exec; /* Executive */
59407 #if BITS_PER_LONG == 64
59408 spinlock_t context_list_lock; /* lock for context_list */
59409- atomic_t context_list_counter; /* needed for unique contexts */
59410+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
59411 struct list_head context_list; /* list of context id's
59412 and pointers */
59413 #endif
59414diff --git a/include/linux/init.h b/include/linux/init.h
59415index 9146f39..885354d 100644
59416--- a/include/linux/init.h
59417+++ b/include/linux/init.h
59418@@ -293,13 +293,13 @@ void __init parse_early_options(char *cmdline);
59419
59420 /* Each module must use one module_init(). */
59421 #define module_init(initfn) \
59422- static inline initcall_t __inittest(void) \
59423+ static inline __used initcall_t __inittest(void) \
59424 { return initfn; } \
59425 int init_module(void) __attribute__((alias(#initfn)));
59426
59427 /* This is only required if you want to be unloadable. */
59428 #define module_exit(exitfn) \
59429- static inline exitcall_t __exittest(void) \
59430+ static inline __used exitcall_t __exittest(void) \
59431 { return exitfn; } \
59432 void cleanup_module(void) __attribute__((alias(#exitfn)));
59433
59434diff --git a/include/linux/init_task.h b/include/linux/init_task.h
59435index 32574ee..00d4ef1 100644
59436--- a/include/linux/init_task.h
59437+++ b/include/linux/init_task.h
59438@@ -128,6 +128,12 @@ extern struct cred init_cred;
59439
59440 #define INIT_TASK_COMM "swapper"
59441
59442+#ifdef CONFIG_X86
59443+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
59444+#else
59445+#define INIT_TASK_THREAD_INFO
59446+#endif
59447+
59448 /*
59449 * INIT_TASK is used to set up the first task table, touch at
59450 * your own risk!. Base=0, limit=0x1fffff (=2MB)
59451@@ -166,6 +172,7 @@ extern struct cred init_cred;
59452 RCU_INIT_POINTER(.cred, &init_cred), \
59453 .comm = INIT_TASK_COMM, \
59454 .thread = INIT_THREAD, \
59455+ INIT_TASK_THREAD_INFO \
59456 .fs = &init_fs, \
59457 .files = &init_files, \
59458 .signal = &init_signals, \
59459diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
59460index e6ca56d..8583707 100644
59461--- a/include/linux/intel-iommu.h
59462+++ b/include/linux/intel-iommu.h
59463@@ -296,7 +296,7 @@ struct iommu_flush {
59464 u8 fm, u64 type);
59465 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
59466 unsigned int size_order, u64 type);
59467-};
59468+} __no_const;
59469
59470 enum {
59471 SR_DMAR_FECTL_REG,
59472diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
59473index a64b00e..464d8bc 100644
59474--- a/include/linux/interrupt.h
59475+++ b/include/linux/interrupt.h
59476@@ -441,7 +441,7 @@ enum
59477 /* map softirq index to softirq name. update 'softirq_to_name' in
59478 * kernel/softirq.c when adding a new softirq.
59479 */
59480-extern char *softirq_to_name[NR_SOFTIRQS];
59481+extern const char * const softirq_to_name[NR_SOFTIRQS];
59482
59483 /* softirq mask and active fields moved to irq_cpustat_t in
59484 * asm/hardirq.h to get better cache usage. KAO
59485@@ -449,12 +449,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
59486
59487 struct softirq_action
59488 {
59489- void (*action)(struct softirq_action *);
59490+ void (*action)(void);
59491 };
59492
59493 asmlinkage void do_softirq(void);
59494 asmlinkage void __do_softirq(void);
59495-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
59496+extern void open_softirq(int nr, void (*action)(void));
59497 extern void softirq_init(void);
59498 static inline void __raise_softirq_irqoff(unsigned int nr)
59499 {
59500diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
59501index 3875719..4cd454c 100644
59502--- a/include/linux/kallsyms.h
59503+++ b/include/linux/kallsyms.h
59504@@ -15,7 +15,8 @@
59505
59506 struct module;
59507
59508-#ifdef CONFIG_KALLSYMS
59509+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
59510+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
59511 /* Lookup the address for a symbol. Returns 0 if not found. */
59512 unsigned long kallsyms_lookup_name(const char *name);
59513
59514@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
59515 /* Stupid that this does nothing, but I didn't create this mess. */
59516 #define __print_symbol(fmt, addr)
59517 #endif /*CONFIG_KALLSYMS*/
59518+#else /* when included by kallsyms.c, vsnprintf.c, or
59519+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
59520+extern void __print_symbol(const char *fmt, unsigned long address);
59521+extern int sprint_backtrace(char *buffer, unsigned long address);
59522+extern int sprint_symbol(char *buffer, unsigned long address);
59523+const char *kallsyms_lookup(unsigned long addr,
59524+ unsigned long *symbolsize,
59525+ unsigned long *offset,
59526+ char **modname, char *namebuf);
59527+#endif
59528
59529 /* This macro allows us to keep printk typechecking */
59530 static __printf(1, 2)
59531diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
59532index fa39183..40160be 100644
59533--- a/include/linux/kgdb.h
59534+++ b/include/linux/kgdb.h
59535@@ -53,7 +53,7 @@ extern int kgdb_connected;
59536 extern int kgdb_io_module_registered;
59537
59538 extern atomic_t kgdb_setting_breakpoint;
59539-extern atomic_t kgdb_cpu_doing_single_step;
59540+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
59541
59542 extern struct task_struct *kgdb_usethread;
59543 extern struct task_struct *kgdb_contthread;
59544@@ -251,7 +251,7 @@ struct kgdb_arch {
59545 void (*disable_hw_break)(struct pt_regs *regs);
59546 void (*remove_all_hw_break)(void);
59547 void (*correct_hw_break)(void);
59548-};
59549+} __do_const;
59550
59551 /**
59552 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
59553@@ -276,7 +276,7 @@ struct kgdb_io {
59554 void (*pre_exception) (void);
59555 void (*post_exception) (void);
59556 int is_console;
59557-};
59558+} __do_const;
59559
59560 extern struct kgdb_arch arch_kgdb_ops;
59561
59562diff --git a/include/linux/kmod.h b/include/linux/kmod.h
59563index b16f653..eb908f4 100644
59564--- a/include/linux/kmod.h
59565+++ b/include/linux/kmod.h
59566@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
59567 * usually useless though. */
59568 extern __printf(2, 3)
59569 int __request_module(bool wait, const char *name, ...);
59570+extern __printf(3, 4)
59571+int ___request_module(bool wait, char *param_name, const char *name, ...);
59572 #define request_module(mod...) __request_module(true, mod)
59573 #define request_module_nowait(mod...) __request_module(false, mod)
59574 #define try_then_request_module(x, mod...) \
59575diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
59576index d526231..086e89b 100644
59577--- a/include/linux/kvm_host.h
59578+++ b/include/linux/kvm_host.h
59579@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
59580 void vcpu_load(struct kvm_vcpu *vcpu);
59581 void vcpu_put(struct kvm_vcpu *vcpu);
59582
59583-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
59584+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
59585 struct module *module);
59586 void kvm_exit(void);
59587
59588@@ -454,7 +454,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
59589 struct kvm_guest_debug *dbg);
59590 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
59591
59592-int kvm_arch_init(void *opaque);
59593+int kvm_arch_init(const void *opaque);
59594 void kvm_arch_exit(void);
59595
59596 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
59597diff --git a/include/linux/libata.h b/include/linux/libata.h
59598index cafc09a..d7e7829 100644
59599--- a/include/linux/libata.h
59600+++ b/include/linux/libata.h
59601@@ -909,7 +909,7 @@ struct ata_port_operations {
59602 * fields must be pointers.
59603 */
59604 const struct ata_port_operations *inherits;
59605-};
59606+} __do_const;
59607
59608 struct ata_port_info {
59609 unsigned long flags;
59610diff --git a/include/linux/mca.h b/include/linux/mca.h
59611index 3797270..7765ede 100644
59612--- a/include/linux/mca.h
59613+++ b/include/linux/mca.h
59614@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
59615 int region);
59616 void * (*mca_transform_memory)(struct mca_device *,
59617 void *memory);
59618-};
59619+} __no_const;
59620
59621 struct mca_bus {
59622 u64 default_dma_mask;
59623diff --git a/include/linux/memory.h b/include/linux/memory.h
59624index 935699b..11042cc 100644
59625--- a/include/linux/memory.h
59626+++ b/include/linux/memory.h
59627@@ -144,7 +144,7 @@ struct memory_accessor {
59628 size_t count);
59629 ssize_t (*write)(struct memory_accessor *, const char *buf,
59630 off_t offset, size_t count);
59631-};
59632+} __no_const;
59633
59634 /*
59635 * Kernel text modification mutex, used for code patching. Users of this lock
59636diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
59637index 9970337..9444122 100644
59638--- a/include/linux/mfd/abx500.h
59639+++ b/include/linux/mfd/abx500.h
59640@@ -188,6 +188,7 @@ struct abx500_ops {
59641 int (*event_registers_startup_state_get) (struct device *, u8 *);
59642 int (*startup_irq_enabled) (struct device *, unsigned int);
59643 };
59644+typedef struct abx500_ops __no_const abx500_ops_no_const;
59645
59646 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
59647 void abx500_remove_ops(struct device *dev);
59648diff --git a/include/linux/mm.h b/include/linux/mm.h
59649index 4baadd1..2e0b45e 100644
59650--- a/include/linux/mm.h
59651+++ b/include/linux/mm.h
59652@@ -115,7 +115,14 @@ extern unsigned int kobjsize(const void *objp);
59653
59654 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
59655 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
59656+
59657+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
59658+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
59659+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
59660+#else
59661 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
59662+#endif
59663+
59664 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
59665 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
59666
59667@@ -1012,34 +1019,6 @@ int set_page_dirty(struct page *page);
59668 int set_page_dirty_lock(struct page *page);
59669 int clear_page_dirty_for_io(struct page *page);
59670
59671-/* Is the vma a continuation of the stack vma above it? */
59672-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
59673-{
59674- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
59675-}
59676-
59677-static inline int stack_guard_page_start(struct vm_area_struct *vma,
59678- unsigned long addr)
59679-{
59680- return (vma->vm_flags & VM_GROWSDOWN) &&
59681- (vma->vm_start == addr) &&
59682- !vma_growsdown(vma->vm_prev, addr);
59683-}
59684-
59685-/* Is the vma a continuation of the stack vma below it? */
59686-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
59687-{
59688- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
59689-}
59690-
59691-static inline int stack_guard_page_end(struct vm_area_struct *vma,
59692- unsigned long addr)
59693-{
59694- return (vma->vm_flags & VM_GROWSUP) &&
59695- (vma->vm_end == addr) &&
59696- !vma_growsup(vma->vm_next, addr);
59697-}
59698-
59699 extern unsigned long move_page_tables(struct vm_area_struct *vma,
59700 unsigned long old_addr, struct vm_area_struct *new_vma,
59701 unsigned long new_addr, unsigned long len);
59702@@ -1134,6 +1113,15 @@ static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
59703 }
59704 #endif
59705
59706+#ifdef CONFIG_MMU
59707+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
59708+#else
59709+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
59710+{
59711+ return __pgprot(0);
59712+}
59713+#endif
59714+
59715 int vma_wants_writenotify(struct vm_area_struct *vma);
59716
59717 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
59718@@ -1419,6 +1407,7 @@ out:
59719 }
59720
59721 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
59722+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
59723
59724 extern unsigned long do_brk(unsigned long, unsigned long);
59725
59726@@ -1476,6 +1465,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
59727 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
59728 struct vm_area_struct **pprev);
59729
59730+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
59731+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
59732+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
59733+
59734 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
59735 NULL if none. Assume start_addr < end_addr. */
59736 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
59737@@ -1492,15 +1485,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
59738 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
59739 }
59740
59741-#ifdef CONFIG_MMU
59742-pgprot_t vm_get_page_prot(unsigned long vm_flags);
59743-#else
59744-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
59745-{
59746- return __pgprot(0);
59747-}
59748-#endif
59749-
59750 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
59751 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
59752 unsigned long pfn, unsigned long size, pgprot_t);
59753@@ -1614,7 +1598,7 @@ extern int unpoison_memory(unsigned long pfn);
59754 extern int sysctl_memory_failure_early_kill;
59755 extern int sysctl_memory_failure_recovery;
59756 extern void shake_page(struct page *p, int access);
59757-extern atomic_long_t mce_bad_pages;
59758+extern atomic_long_unchecked_t mce_bad_pages;
59759 extern int soft_offline_page(struct page *page, int flags);
59760
59761 extern void dump_page(struct page *page);
59762@@ -1628,5 +1612,11 @@ extern void copy_user_huge_page(struct page *dst, struct page *src,
59763 unsigned int pages_per_huge_page);
59764 #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
59765
59766+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
59767+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
59768+#else
59769+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
59770+#endif
59771+
59772 #endif /* __KERNEL__ */
59773 #endif /* _LINUX_MM_H */
59774diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
59775index 5b42f1b..759e4b4 100644
59776--- a/include/linux/mm_types.h
59777+++ b/include/linux/mm_types.h
59778@@ -253,6 +253,8 @@ struct vm_area_struct {
59779 #ifdef CONFIG_NUMA
59780 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
59781 #endif
59782+
59783+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
59784 };
59785
59786 struct core_thread {
59787@@ -389,6 +391,24 @@ struct mm_struct {
59788 #ifdef CONFIG_CPUMASK_OFFSTACK
59789 struct cpumask cpumask_allocation;
59790 #endif
59791+
59792+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59793+ unsigned long pax_flags;
59794+#endif
59795+
59796+#ifdef CONFIG_PAX_DLRESOLVE
59797+ unsigned long call_dl_resolve;
59798+#endif
59799+
59800+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
59801+ unsigned long call_syscall;
59802+#endif
59803+
59804+#ifdef CONFIG_PAX_ASLR
59805+ unsigned long delta_mmap; /* randomized offset */
59806+ unsigned long delta_stack; /* randomized offset */
59807+#endif
59808+
59809 };
59810
59811 static inline void mm_init_cpumask(struct mm_struct *mm)
59812diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
59813index 1d1b1e1..2a13c78 100644
59814--- a/include/linux/mmu_notifier.h
59815+++ b/include/linux/mmu_notifier.h
59816@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
59817 */
59818 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
59819 ({ \
59820- pte_t __pte; \
59821+ pte_t ___pte; \
59822 struct vm_area_struct *___vma = __vma; \
59823 unsigned long ___address = __address; \
59824- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
59825+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
59826 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
59827- __pte; \
59828+ ___pte; \
59829 })
59830
59831 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
59832diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
59833index 188cb2f..d78409b 100644
59834--- a/include/linux/mmzone.h
59835+++ b/include/linux/mmzone.h
59836@@ -369,7 +369,7 @@ struct zone {
59837 unsigned long flags; /* zone flags, see below */
59838
59839 /* Zone statistics */
59840- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
59841+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
59842
59843 /*
59844 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
59845diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
59846index 468819c..17b9db3 100644
59847--- a/include/linux/mod_devicetable.h
59848+++ b/include/linux/mod_devicetable.h
59849@@ -12,7 +12,7 @@
59850 typedef unsigned long kernel_ulong_t;
59851 #endif
59852
59853-#define PCI_ANY_ID (~0)
59854+#define PCI_ANY_ID ((__u16)~0)
59855
59856 struct pci_device_id {
59857 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
59858@@ -131,7 +131,7 @@ struct usb_device_id {
59859 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
59860 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
59861
59862-#define HID_ANY_ID (~0)
59863+#define HID_ANY_ID (~0U)
59864
59865 struct hid_device_id {
59866 __u16 bus;
59867diff --git a/include/linux/module.h b/include/linux/module.h
59868index 3cb7839..511cb87 100644
59869--- a/include/linux/module.h
59870+++ b/include/linux/module.h
59871@@ -17,6 +17,7 @@
59872 #include <linux/moduleparam.h>
59873 #include <linux/tracepoint.h>
59874 #include <linux/export.h>
59875+#include <linux/fs.h>
59876
59877 #include <linux/percpu.h>
59878 #include <asm/module.h>
59879@@ -261,19 +262,16 @@ struct module
59880 int (*init)(void);
59881
59882 /* If this is non-NULL, vfree after init() returns */
59883- void *module_init;
59884+ void *module_init_rx, *module_init_rw;
59885
59886 /* Here is the actual code + data, vfree'd on unload. */
59887- void *module_core;
59888+ void *module_core_rx, *module_core_rw;
59889
59890 /* Here are the sizes of the init and core sections */
59891- unsigned int init_size, core_size;
59892+ unsigned int init_size_rw, core_size_rw;
59893
59894 /* The size of the executable code in each section. */
59895- unsigned int init_text_size, core_text_size;
59896-
59897- /* Size of RO sections of the module (text+rodata) */
59898- unsigned int init_ro_size, core_ro_size;
59899+ unsigned int init_size_rx, core_size_rx;
59900
59901 /* Arch-specific module values */
59902 struct mod_arch_specific arch;
59903@@ -329,6 +327,10 @@ struct module
59904 #ifdef CONFIG_EVENT_TRACING
59905 struct ftrace_event_call **trace_events;
59906 unsigned int num_trace_events;
59907+ struct file_operations trace_id;
59908+ struct file_operations trace_enable;
59909+ struct file_operations trace_format;
59910+ struct file_operations trace_filter;
59911 #endif
59912 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
59913 unsigned int num_ftrace_callsites;
59914@@ -379,16 +381,46 @@ bool is_module_address(unsigned long addr);
59915 bool is_module_percpu_address(unsigned long addr);
59916 bool is_module_text_address(unsigned long addr);
59917
59918+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
59919+{
59920+
59921+#ifdef CONFIG_PAX_KERNEXEC
59922+ if (ktla_ktva(addr) >= (unsigned long)start &&
59923+ ktla_ktva(addr) < (unsigned long)start + size)
59924+ return 1;
59925+#endif
59926+
59927+ return ((void *)addr >= start && (void *)addr < start + size);
59928+}
59929+
59930+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
59931+{
59932+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
59933+}
59934+
59935+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
59936+{
59937+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
59938+}
59939+
59940+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
59941+{
59942+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
59943+}
59944+
59945+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
59946+{
59947+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
59948+}
59949+
59950 static inline int within_module_core(unsigned long addr, struct module *mod)
59951 {
59952- return (unsigned long)mod->module_core <= addr &&
59953- addr < (unsigned long)mod->module_core + mod->core_size;
59954+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
59955 }
59956
59957 static inline int within_module_init(unsigned long addr, struct module *mod)
59958 {
59959- return (unsigned long)mod->module_init <= addr &&
59960- addr < (unsigned long)mod->module_init + mod->init_size;
59961+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
59962 }
59963
59964 /* Search for module by name: must hold module_mutex. */
59965diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
59966index b2be02e..6a9fdb1 100644
59967--- a/include/linux/moduleloader.h
59968+++ b/include/linux/moduleloader.h
59969@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
59970 sections. Returns NULL on failure. */
59971 void *module_alloc(unsigned long size);
59972
59973+#ifdef CONFIG_PAX_KERNEXEC
59974+void *module_alloc_exec(unsigned long size);
59975+#else
59976+#define module_alloc_exec(x) module_alloc(x)
59977+#endif
59978+
59979 /* Free memory returned from module_alloc. */
59980 void module_free(struct module *mod, void *module_region);
59981
59982+#ifdef CONFIG_PAX_KERNEXEC
59983+void module_free_exec(struct module *mod, void *module_region);
59984+#else
59985+#define module_free_exec(x, y) module_free((x), (y))
59986+#endif
59987+
59988 /* Apply the given relocation to the (simplified) ELF. Return -error
59989 or 0. */
59990 int apply_relocate(Elf_Shdr *sechdrs,
59991diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
59992index 7939f63..ec6df57 100644
59993--- a/include/linux/moduleparam.h
59994+++ b/include/linux/moduleparam.h
59995@@ -260,7 +260,7 @@ static inline void __kernel_param_unlock(void)
59996 * @len is usually just sizeof(string).
59997 */
59998 #define module_param_string(name, string, len, perm) \
59999- static const struct kparam_string __param_string_##name \
60000+ static const struct kparam_string __param_string_##name __used \
60001 = { len, string }; \
60002 __module_param_call(MODULE_PARAM_PREFIX, name, \
60003 &param_ops_string, \
60004@@ -395,7 +395,7 @@ extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
60005 * module_param_named() for why this might be necessary.
60006 */
60007 #define module_param_array_named(name, array, type, nump, perm) \
60008- static const struct kparam_array __param_arr_##name \
60009+ static const struct kparam_array __param_arr_##name __used \
60010 = { .max = ARRAY_SIZE(array), .num = nump, \
60011 .ops = &param_ops_##type, \
60012 .elemsize = sizeof(array[0]), .elem = array }; \
60013diff --git a/include/linux/namei.h b/include/linux/namei.h
60014index ffc0213..2c1f2cb 100644
60015--- a/include/linux/namei.h
60016+++ b/include/linux/namei.h
60017@@ -24,7 +24,7 @@ struct nameidata {
60018 unsigned seq;
60019 int last_type;
60020 unsigned depth;
60021- char *saved_names[MAX_NESTED_LINKS + 1];
60022+ const char *saved_names[MAX_NESTED_LINKS + 1];
60023
60024 /* Intent data */
60025 union {
60026@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
60027 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
60028 extern void unlock_rename(struct dentry *, struct dentry *);
60029
60030-static inline void nd_set_link(struct nameidata *nd, char *path)
60031+static inline void nd_set_link(struct nameidata *nd, const char *path)
60032 {
60033 nd->saved_names[nd->depth] = path;
60034 }
60035
60036-static inline char *nd_get_link(struct nameidata *nd)
60037+static inline const char *nd_get_link(const struct nameidata *nd)
60038 {
60039 return nd->saved_names[nd->depth];
60040 }
60041diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
60042index a82ad4d..90d15b7 100644
60043--- a/include/linux/netdevice.h
60044+++ b/include/linux/netdevice.h
60045@@ -949,6 +949,7 @@ struct net_device_ops {
60046 int (*ndo_set_features)(struct net_device *dev,
60047 u32 features);
60048 };
60049+typedef struct net_device_ops __no_const net_device_ops_no_const;
60050
60051 /*
60052 * The DEVICE structure.
60053@@ -1088,7 +1089,7 @@ struct net_device {
60054 int iflink;
60055
60056 struct net_device_stats stats;
60057- atomic_long_t rx_dropped; /* dropped packets by core network
60058+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
60059 * Do not use this in drivers.
60060 */
60061
60062diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
60063new file mode 100644
60064index 0000000..33f4af8
60065--- /dev/null
60066+++ b/include/linux/netfilter/xt_gradm.h
60067@@ -0,0 +1,9 @@
60068+#ifndef _LINUX_NETFILTER_XT_GRADM_H
60069+#define _LINUX_NETFILTER_XT_GRADM_H 1
60070+
60071+struct xt_gradm_mtinfo {
60072+ __u16 flags;
60073+ __u16 invflags;
60074+};
60075+
60076+#endif
60077diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
60078index c65a18a..0c05f3a 100644
60079--- a/include/linux/of_pdt.h
60080+++ b/include/linux/of_pdt.h
60081@@ -32,7 +32,7 @@ struct of_pdt_ops {
60082
60083 /* return 0 on success; fill in 'len' with number of bytes in path */
60084 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
60085-};
60086+} __no_const;
60087
60088 extern void *prom_early_alloc(unsigned long size);
60089
60090diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
60091index a4c5624..79d6d88 100644
60092--- a/include/linux/oprofile.h
60093+++ b/include/linux/oprofile.h
60094@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
60095 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
60096 char const * name, ulong * val);
60097
60098-/** Create a file for read-only access to an atomic_t. */
60099+/** Create a file for read-only access to an atomic_unchecked_t. */
60100 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
60101- char const * name, atomic_t * val);
60102+ char const * name, atomic_unchecked_t * val);
60103
60104 /** create a directory */
60105 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
60106diff --git a/include/linux/padata.h b/include/linux/padata.h
60107index 4633b2f..988bc08 100644
60108--- a/include/linux/padata.h
60109+++ b/include/linux/padata.h
60110@@ -129,7 +129,7 @@ struct parallel_data {
60111 struct padata_instance *pinst;
60112 struct padata_parallel_queue __percpu *pqueue;
60113 struct padata_serial_queue __percpu *squeue;
60114- atomic_t seq_nr;
60115+ atomic_unchecked_t seq_nr;
60116 atomic_t reorder_objects;
60117 atomic_t refcnt;
60118 unsigned int max_seq_nr;
60119diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
60120index b1f8912..c955bff 100644
60121--- a/include/linux/perf_event.h
60122+++ b/include/linux/perf_event.h
60123@@ -748,8 +748,8 @@ struct perf_event {
60124
60125 enum perf_event_active_state state;
60126 unsigned int attach_state;
60127- local64_t count;
60128- atomic64_t child_count;
60129+ local64_t count; /* PaX: fix it one day */
60130+ atomic64_unchecked_t child_count;
60131
60132 /*
60133 * These are the total time in nanoseconds that the event
60134@@ -800,8 +800,8 @@ struct perf_event {
60135 * These accumulate total time (in nanoseconds) that children
60136 * events have been enabled and running, respectively.
60137 */
60138- atomic64_t child_total_time_enabled;
60139- atomic64_t child_total_time_running;
60140+ atomic64_unchecked_t child_total_time_enabled;
60141+ atomic64_unchecked_t child_total_time_running;
60142
60143 /*
60144 * Protect attach/detach and child_list:
60145diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
60146index 77257c9..51d473a 100644
60147--- a/include/linux/pipe_fs_i.h
60148+++ b/include/linux/pipe_fs_i.h
60149@@ -46,9 +46,9 @@ struct pipe_buffer {
60150 struct pipe_inode_info {
60151 wait_queue_head_t wait;
60152 unsigned int nrbufs, curbuf, buffers;
60153- unsigned int readers;
60154- unsigned int writers;
60155- unsigned int waiting_writers;
60156+ atomic_t readers;
60157+ atomic_t writers;
60158+ atomic_t waiting_writers;
60159 unsigned int r_counter;
60160 unsigned int w_counter;
60161 struct page *tmp_page;
60162diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
60163index d3085e7..fd01052 100644
60164--- a/include/linux/pm_runtime.h
60165+++ b/include/linux/pm_runtime.h
60166@@ -95,7 +95,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
60167
60168 static inline void pm_runtime_mark_last_busy(struct device *dev)
60169 {
60170- ACCESS_ONCE(dev->power.last_busy) = jiffies;
60171+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
60172 }
60173
60174 #else /* !CONFIG_PM_RUNTIME */
60175diff --git a/include/linux/poison.h b/include/linux/poison.h
60176index 79159de..f1233a9 100644
60177--- a/include/linux/poison.h
60178+++ b/include/linux/poison.h
60179@@ -19,8 +19,8 @@
60180 * under normal circumstances, used to verify that nobody uses
60181 * non-initialized list entries.
60182 */
60183-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
60184-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
60185+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
60186+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
60187
60188 /********** include/linux/timer.h **********/
60189 /*
60190diff --git a/include/linux/preempt.h b/include/linux/preempt.h
60191index 58969b2..ead129b 100644
60192--- a/include/linux/preempt.h
60193+++ b/include/linux/preempt.h
60194@@ -123,7 +123,7 @@ struct preempt_ops {
60195 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
60196 void (*sched_out)(struct preempt_notifier *notifier,
60197 struct task_struct *next);
60198-};
60199+} __no_const;
60200
60201 /**
60202 * preempt_notifier - key for installing preemption notifiers
60203diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
60204index 643b96c..ef55a9c 100644
60205--- a/include/linux/proc_fs.h
60206+++ b/include/linux/proc_fs.h
60207@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
60208 return proc_create_data(name, mode, parent, proc_fops, NULL);
60209 }
60210
60211+static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
60212+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
60213+{
60214+#ifdef CONFIG_GRKERNSEC_PROC_USER
60215+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
60216+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60217+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
60218+#else
60219+ return proc_create_data(name, mode, parent, proc_fops, NULL);
60220+#endif
60221+}
60222+
60223+
60224 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
60225 mode_t mode, struct proc_dir_entry *base,
60226 read_proc_t *read_proc, void * data)
60227@@ -258,7 +271,7 @@ union proc_op {
60228 int (*proc_show)(struct seq_file *m,
60229 struct pid_namespace *ns, struct pid *pid,
60230 struct task_struct *task);
60231-};
60232+} __no_const;
60233
60234 struct ctl_table_header;
60235 struct ctl_table;
60236diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
60237index 800f113..e9ee2e3 100644
60238--- a/include/linux/ptrace.h
60239+++ b/include/linux/ptrace.h
60240@@ -129,10 +129,12 @@ extern void __ptrace_unlink(struct task_struct *child);
60241 extern void exit_ptrace(struct task_struct *tracer);
60242 #define PTRACE_MODE_READ 1
60243 #define PTRACE_MODE_ATTACH 2
60244-/* Returns 0 on success, -errno on denial. */
60245-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
60246 /* Returns true on success, false on denial. */
60247 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
60248+/* Returns true on success, false on denial. */
60249+extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
60250+/* Returns true on success, false on denial. */
60251+extern bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode);
60252
60253 static inline int ptrace_reparented(struct task_struct *child)
60254 {
60255diff --git a/include/linux/random.h b/include/linux/random.h
60256index 8f74538..02a1012 100644
60257--- a/include/linux/random.h
60258+++ b/include/linux/random.h
60259@@ -69,12 +69,17 @@ void srandom32(u32 seed);
60260
60261 u32 prandom32(struct rnd_state *);
60262
60263+static inline unsigned long pax_get_random_long(void)
60264+{
60265+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
60266+}
60267+
60268 /*
60269 * Handle minimum values for seeds
60270 */
60271 static inline u32 __seed(u32 x, u32 m)
60272 {
60273- return (x < m) ? x + m : x;
60274+ return (x <= m) ? x + m + 1 : x;
60275 }
60276
60277 /**
60278diff --git a/include/linux/reboot.h b/include/linux/reboot.h
60279index e0879a7..a12f962 100644
60280--- a/include/linux/reboot.h
60281+++ b/include/linux/reboot.h
60282@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
60283 * Architecture-specific implementations of sys_reboot commands.
60284 */
60285
60286-extern void machine_restart(char *cmd);
60287-extern void machine_halt(void);
60288-extern void machine_power_off(void);
60289+extern void machine_restart(char *cmd) __noreturn;
60290+extern void machine_halt(void) __noreturn;
60291+extern void machine_power_off(void) __noreturn;
60292
60293 extern void machine_shutdown(void);
60294 struct pt_regs;
60295@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
60296 */
60297
60298 extern void kernel_restart_prepare(char *cmd);
60299-extern void kernel_restart(char *cmd);
60300-extern void kernel_halt(void);
60301-extern void kernel_power_off(void);
60302+extern void kernel_restart(char *cmd) __noreturn;
60303+extern void kernel_halt(void) __noreturn;
60304+extern void kernel_power_off(void) __noreturn;
60305
60306 extern int C_A_D; /* for sysctl */
60307 void ctrl_alt_del(void);
60308@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
60309 * Emergency restart, callable from an interrupt handler.
60310 */
60311
60312-extern void emergency_restart(void);
60313+extern void emergency_restart(void) __noreturn;
60314 #include <asm/emergency-restart.h>
60315
60316 #endif
60317diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
60318index 96d465f..b084e05 100644
60319--- a/include/linux/reiserfs_fs.h
60320+++ b/include/linux/reiserfs_fs.h
60321@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
60322 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
60323
60324 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
60325-#define get_generation(s) atomic_read (&fs_generation(s))
60326+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
60327 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
60328 #define __fs_changed(gen,s) (gen != get_generation (s))
60329 #define fs_changed(gen,s) \
60330diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
60331index 52c83b6..18ed7eb 100644
60332--- a/include/linux/reiserfs_fs_sb.h
60333+++ b/include/linux/reiserfs_fs_sb.h
60334@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
60335 /* Comment? -Hans */
60336 wait_queue_head_t s_wait;
60337 /* To be obsoleted soon by per buffer seals.. -Hans */
60338- atomic_t s_generation_counter; // increased by one every time the
60339+ atomic_unchecked_t s_generation_counter; // increased by one every time the
60340 // tree gets re-balanced
60341 unsigned long s_properties; /* File system properties. Currently holds
60342 on-disk FS format */
60343diff --git a/include/linux/relay.h b/include/linux/relay.h
60344index 14a86bc..17d0700 100644
60345--- a/include/linux/relay.h
60346+++ b/include/linux/relay.h
60347@@ -159,7 +159,7 @@ struct rchan_callbacks
60348 * The callback should return 0 if successful, negative if not.
60349 */
60350 int (*remove_buf_file)(struct dentry *dentry);
60351-};
60352+} __no_const;
60353
60354 /*
60355 * CONFIG_RELAY kernel API, kernel/relay.c
60356diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
60357index c6c6084..5bf1212 100644
60358--- a/include/linux/rfkill.h
60359+++ b/include/linux/rfkill.h
60360@@ -147,6 +147,7 @@ struct rfkill_ops {
60361 void (*query)(struct rfkill *rfkill, void *data);
60362 int (*set_block)(void *data, bool blocked);
60363 };
60364+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
60365
60366 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
60367 /**
60368diff --git a/include/linux/rio.h b/include/linux/rio.h
60369index 4d50611..c6858a2 100644
60370--- a/include/linux/rio.h
60371+++ b/include/linux/rio.h
60372@@ -315,7 +315,7 @@ struct rio_ops {
60373 int mbox, void *buffer, size_t len);
60374 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
60375 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
60376-};
60377+} __no_const;
60378
60379 #define RIO_RESOURCE_MEM 0x00000100
60380 #define RIO_RESOURCE_DOORBELL 0x00000200
60381diff --git a/include/linux/rmap.h b/include/linux/rmap.h
60382index 2148b12..519b820 100644
60383--- a/include/linux/rmap.h
60384+++ b/include/linux/rmap.h
60385@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
60386 void anon_vma_init(void); /* create anon_vma_cachep */
60387 int anon_vma_prepare(struct vm_area_struct *);
60388 void unlink_anon_vmas(struct vm_area_struct *);
60389-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
60390-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
60391+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
60392+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
60393 void __anon_vma_link(struct vm_area_struct *);
60394
60395 static inline void anon_vma_merge(struct vm_area_struct *vma,
60396diff --git a/include/linux/sched.h b/include/linux/sched.h
60397index 1c4f3e9..b4e4851 100644
60398--- a/include/linux/sched.h
60399+++ b/include/linux/sched.h
60400@@ -101,6 +101,7 @@ struct bio_list;
60401 struct fs_struct;
60402 struct perf_event_context;
60403 struct blk_plug;
60404+struct linux_binprm;
60405
60406 /*
60407 * List of flags we want to share for kernel threads,
60408@@ -380,10 +381,13 @@ struct user_namespace;
60409 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
60410
60411 extern int sysctl_max_map_count;
60412+extern unsigned long sysctl_heap_stack_gap;
60413
60414 #include <linux/aio.h>
60415
60416 #ifdef CONFIG_MMU
60417+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
60418+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
60419 extern void arch_pick_mmap_layout(struct mm_struct *mm);
60420 extern unsigned long
60421 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
60422@@ -629,6 +633,17 @@ struct signal_struct {
60423 #ifdef CONFIG_TASKSTATS
60424 struct taskstats *stats;
60425 #endif
60426+
60427+#ifdef CONFIG_GRKERNSEC
60428+ u32 curr_ip;
60429+ u32 saved_ip;
60430+ u32 gr_saddr;
60431+ u32 gr_daddr;
60432+ u16 gr_sport;
60433+ u16 gr_dport;
60434+ u8 used_accept:1;
60435+#endif
60436+
60437 #ifdef CONFIG_AUDIT
60438 unsigned audit_tty;
60439 struct tty_audit_buf *tty_audit_buf;
60440@@ -710,6 +725,11 @@ struct user_struct {
60441 struct key *session_keyring; /* UID's default session keyring */
60442 #endif
60443
60444+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
60445+ unsigned int banned;
60446+ unsigned long ban_expires;
60447+#endif
60448+
60449 /* Hash table maintenance information */
60450 struct hlist_node uidhash_node;
60451 uid_t uid;
60452@@ -1337,8 +1357,8 @@ struct task_struct {
60453 struct list_head thread_group;
60454
60455 struct completion *vfork_done; /* for vfork() */
60456- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
60457- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
60458+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
60459+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
60460
60461 cputime_t utime, stime, utimescaled, stimescaled;
60462 cputime_t gtime;
60463@@ -1354,13 +1374,6 @@ struct task_struct {
60464 struct task_cputime cputime_expires;
60465 struct list_head cpu_timers[3];
60466
60467-/* process credentials */
60468- const struct cred __rcu *real_cred; /* objective and real subjective task
60469- * credentials (COW) */
60470- const struct cred __rcu *cred; /* effective (overridable) subjective task
60471- * credentials (COW) */
60472- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
60473-
60474 char comm[TASK_COMM_LEN]; /* executable name excluding path
60475 - access with [gs]et_task_comm (which lock
60476 it with task_lock())
60477@@ -1377,8 +1390,16 @@ struct task_struct {
60478 #endif
60479 /* CPU-specific state of this task */
60480 struct thread_struct thread;
60481+/* thread_info moved to task_struct */
60482+#ifdef CONFIG_X86
60483+ struct thread_info tinfo;
60484+#endif
60485 /* filesystem information */
60486 struct fs_struct *fs;
60487+
60488+ const struct cred __rcu *cred; /* effective (overridable) subjective task
60489+ * credentials (COW) */
60490+
60491 /* open file information */
60492 struct files_struct *files;
60493 /* namespaces */
60494@@ -1425,6 +1446,11 @@ struct task_struct {
60495 struct rt_mutex_waiter *pi_blocked_on;
60496 #endif
60497
60498+/* process credentials */
60499+ const struct cred __rcu *real_cred; /* objective and real subjective task
60500+ * credentials (COW) */
60501+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
60502+
60503 #ifdef CONFIG_DEBUG_MUTEXES
60504 /* mutex deadlock detection */
60505 struct mutex_waiter *blocked_on;
60506@@ -1540,6 +1566,27 @@ struct task_struct {
60507 unsigned long default_timer_slack_ns;
60508
60509 struct list_head *scm_work_list;
60510+
60511+#ifdef CONFIG_GRKERNSEC
60512+ /* grsecurity */
60513+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60514+ u64 exec_id;
60515+#endif
60516+#ifdef CONFIG_GRKERNSEC_SETXID
60517+ const struct cred *delayed_cred;
60518+#endif
60519+ struct dentry *gr_chroot_dentry;
60520+ struct acl_subject_label *acl;
60521+ struct acl_role_label *role;
60522+ struct file *exec_file;
60523+ u16 acl_role_id;
60524+ /* is this the task that authenticated to the special role */
60525+ u8 acl_sp_role;
60526+ u8 is_writable;
60527+ u8 brute;
60528+ u8 gr_is_chrooted;
60529+#endif
60530+
60531 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
60532 /* Index of current stored address in ret_stack */
60533 int curr_ret_stack;
60534@@ -1574,6 +1621,51 @@ struct task_struct {
60535 #endif
60536 };
60537
60538+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
60539+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
60540+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
60541+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
60542+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
60543+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
60544+
60545+#ifdef CONFIG_PAX_SOFTMODE
60546+extern int pax_softmode;
60547+#endif
60548+
60549+extern int pax_check_flags(unsigned long *);
60550+
60551+/* if tsk != current then task_lock must be held on it */
60552+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
60553+static inline unsigned long pax_get_flags(struct task_struct *tsk)
60554+{
60555+ if (likely(tsk->mm))
60556+ return tsk->mm->pax_flags;
60557+ else
60558+ return 0UL;
60559+}
60560+
60561+/* if tsk != current then task_lock must be held on it */
60562+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
60563+{
60564+ if (likely(tsk->mm)) {
60565+ tsk->mm->pax_flags = flags;
60566+ return 0;
60567+ }
60568+ return -EINVAL;
60569+}
60570+#endif
60571+
60572+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
60573+extern void pax_set_initial_flags(struct linux_binprm *bprm);
60574+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
60575+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
60576+#endif
60577+
60578+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
60579+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
60580+extern void pax_report_refcount_overflow(struct pt_regs *regs);
60581+extern NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) ATTRIB_NORET;
60582+
60583 /* Future-safe accessor for struct task_struct's cpus_allowed. */
60584 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
60585
60586@@ -2081,7 +2173,9 @@ void yield(void);
60587 extern struct exec_domain default_exec_domain;
60588
60589 union thread_union {
60590+#ifndef CONFIG_X86
60591 struct thread_info thread_info;
60592+#endif
60593 unsigned long stack[THREAD_SIZE/sizeof(long)];
60594 };
60595
60596@@ -2114,6 +2208,7 @@ extern struct pid_namespace init_pid_ns;
60597 */
60598
60599 extern struct task_struct *find_task_by_vpid(pid_t nr);
60600+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
60601 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
60602 struct pid_namespace *ns);
60603
60604@@ -2235,6 +2330,12 @@ static inline void mmdrop(struct mm_struct * mm)
60605 extern void mmput(struct mm_struct *);
60606 /* Grab a reference to a task's mm, if it is not already going away */
60607 extern struct mm_struct *get_task_mm(struct task_struct *task);
60608+/*
60609+ * Grab a reference to a task's mm, if it is not already going away
60610+ * and ptrace_may_access with the mode parameter passed to it
60611+ * succeeds.
60612+ */
60613+extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);
60614 /* Remove the current tasks stale references to the old mm_struct */
60615 extern void mm_release(struct task_struct *, struct mm_struct *);
60616 /* Allocate a new mm structure and copy contents from tsk->mm */
60617@@ -2251,7 +2352,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
60618 extern void exit_itimers(struct signal_struct *);
60619 extern void flush_itimer_signals(void);
60620
60621-extern NORET_TYPE void do_group_exit(int);
60622+extern NORET_TYPE void do_group_exit(int) ATTRIB_NORET;
60623
60624 extern void daemonize(const char *, ...);
60625 extern int allow_signal(int);
60626@@ -2416,13 +2517,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
60627
60628 #endif
60629
60630-static inline int object_is_on_stack(void *obj)
60631+static inline int object_starts_on_stack(void *obj)
60632 {
60633- void *stack = task_stack_page(current);
60634+ const void *stack = task_stack_page(current);
60635
60636 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
60637 }
60638
60639+#ifdef CONFIG_PAX_USERCOPY
60640+extern int object_is_on_stack(const void *obj, unsigned long len);
60641+#endif
60642+
60643 extern void thread_info_cache_init(void);
60644
60645 #ifdef CONFIG_DEBUG_STACK_USAGE
60646diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
60647index 899fbb4..1cb4138 100644
60648--- a/include/linux/screen_info.h
60649+++ b/include/linux/screen_info.h
60650@@ -43,7 +43,8 @@ struct screen_info {
60651 __u16 pages; /* 0x32 */
60652 __u16 vesa_attributes; /* 0x34 */
60653 __u32 capabilities; /* 0x36 */
60654- __u8 _reserved[6]; /* 0x3a */
60655+ __u16 vesapm_size; /* 0x3a */
60656+ __u8 _reserved[4]; /* 0x3c */
60657 } __attribute__((packed));
60658
60659 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
60660diff --git a/include/linux/security.h b/include/linux/security.h
60661index e8c619d..e0cbd1c 100644
60662--- a/include/linux/security.h
60663+++ b/include/linux/security.h
60664@@ -37,6 +37,7 @@
60665 #include <linux/xfrm.h>
60666 #include <linux/slab.h>
60667 #include <linux/xattr.h>
60668+#include <linux/grsecurity.h>
60669 #include <net/flow.h>
60670
60671 /* Maximum number of letters for an LSM name string */
60672diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
60673index 0b69a46..b2ffa4c 100644
60674--- a/include/linux/seq_file.h
60675+++ b/include/linux/seq_file.h
60676@@ -24,6 +24,9 @@ struct seq_file {
60677 struct mutex lock;
60678 const struct seq_operations *op;
60679 int poll_event;
60680+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60681+ u64 exec_id;
60682+#endif
60683 void *private;
60684 };
60685
60686@@ -33,6 +36,7 @@ struct seq_operations {
60687 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
60688 int (*show) (struct seq_file *m, void *v);
60689 };
60690+typedef struct seq_operations __no_const seq_operations_no_const;
60691
60692 #define SEQ_SKIP 1
60693
60694diff --git a/include/linux/shm.h b/include/linux/shm.h
60695index 92808b8..c28cac4 100644
60696--- a/include/linux/shm.h
60697+++ b/include/linux/shm.h
60698@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
60699
60700 /* The task created the shm object. NULL if the task is dead. */
60701 struct task_struct *shm_creator;
60702+#ifdef CONFIG_GRKERNSEC
60703+ time_t shm_createtime;
60704+ pid_t shm_lapid;
60705+#endif
60706 };
60707
60708 /* shm_mode upper byte flags */
60709diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
60710index fe86488..1563c1c 100644
60711--- a/include/linux/skbuff.h
60712+++ b/include/linux/skbuff.h
60713@@ -642,7 +642,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
60714 */
60715 static inline int skb_queue_empty(const struct sk_buff_head *list)
60716 {
60717- return list->next == (struct sk_buff *)list;
60718+ return list->next == (const struct sk_buff *)list;
60719 }
60720
60721 /**
60722@@ -655,7 +655,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
60723 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
60724 const struct sk_buff *skb)
60725 {
60726- return skb->next == (struct sk_buff *)list;
60727+ return skb->next == (const struct sk_buff *)list;
60728 }
60729
60730 /**
60731@@ -668,7 +668,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
60732 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
60733 const struct sk_buff *skb)
60734 {
60735- return skb->prev == (struct sk_buff *)list;
60736+ return skb->prev == (const struct sk_buff *)list;
60737 }
60738
60739 /**
60740@@ -1523,7 +1523,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
60741 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
60742 */
60743 #ifndef NET_SKB_PAD
60744-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
60745+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
60746 #endif
60747
60748 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
60749diff --git a/include/linux/slab.h b/include/linux/slab.h
60750index 573c809..e84c132 100644
60751--- a/include/linux/slab.h
60752+++ b/include/linux/slab.h
60753@@ -11,12 +11,20 @@
60754
60755 #include <linux/gfp.h>
60756 #include <linux/types.h>
60757+#include <linux/err.h>
60758
60759 /*
60760 * Flags to pass to kmem_cache_create().
60761 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
60762 */
60763 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
60764+
60765+#ifdef CONFIG_PAX_USERCOPY
60766+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
60767+#else
60768+#define SLAB_USERCOPY 0x00000000UL
60769+#endif
60770+
60771 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
60772 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
60773 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
60774@@ -87,10 +95,13 @@
60775 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
60776 * Both make kfree a no-op.
60777 */
60778-#define ZERO_SIZE_PTR ((void *)16)
60779+#define ZERO_SIZE_PTR \
60780+({ \
60781+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
60782+ (void *)(-MAX_ERRNO-1L); \
60783+})
60784
60785-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
60786- (unsigned long)ZERO_SIZE_PTR)
60787+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
60788
60789 /*
60790 * struct kmem_cache related prototypes
60791@@ -161,6 +172,7 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
60792 void kfree(const void *);
60793 void kzfree(const void *);
60794 size_t ksize(const void *);
60795+void check_object_size(const void *ptr, unsigned long n, bool to);
60796
60797 /*
60798 * Allocator specific definitions. These are mainly used to establish optimized
60799@@ -353,4 +365,59 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
60800
60801 void __init kmem_cache_init_late(void);
60802
60803+#define kmalloc(x, y) \
60804+({ \
60805+ void *___retval; \
60806+ intoverflow_t ___x = (intoverflow_t)x; \
60807+ if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n")) \
60808+ ___retval = NULL; \
60809+ else \
60810+ ___retval = kmalloc((size_t)___x, (y)); \
60811+ ___retval; \
60812+})
60813+
60814+#define kmalloc_node(x, y, z) \
60815+({ \
60816+ void *___retval; \
60817+ intoverflow_t ___x = (intoverflow_t)x; \
60818+ if (WARN(___x > ULONG_MAX, "kmalloc_node size overflow\n"))\
60819+ ___retval = NULL; \
60820+ else \
60821+ ___retval = kmalloc_node((size_t)___x, (y), (z));\
60822+ ___retval; \
60823+})
60824+
60825+#define kzalloc(x, y) \
60826+({ \
60827+ void *___retval; \
60828+ intoverflow_t ___x = (intoverflow_t)x; \
60829+ if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n")) \
60830+ ___retval = NULL; \
60831+ else \
60832+ ___retval = kzalloc((size_t)___x, (y)); \
60833+ ___retval; \
60834+})
60835+
60836+#define __krealloc(x, y, z) \
60837+({ \
60838+ void *___retval; \
60839+ intoverflow_t ___y = (intoverflow_t)y; \
60840+ if (WARN(___y > ULONG_MAX, "__krealloc size overflow\n"))\
60841+ ___retval = NULL; \
60842+ else \
60843+ ___retval = __krealloc((x), (size_t)___y, (z)); \
60844+ ___retval; \
60845+})
60846+
60847+#define krealloc(x, y, z) \
60848+({ \
60849+ void *___retval; \
60850+ intoverflow_t ___y = (intoverflow_t)y; \
60851+ if (WARN(___y > ULONG_MAX, "krealloc size overflow\n")) \
60852+ ___retval = NULL; \
60853+ else \
60854+ ___retval = krealloc((x), (size_t)___y, (z)); \
60855+ ___retval; \
60856+})
60857+
60858 #endif /* _LINUX_SLAB_H */
60859diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
60860index d00e0ba..1b3bf7b 100644
60861--- a/include/linux/slab_def.h
60862+++ b/include/linux/slab_def.h
60863@@ -68,10 +68,10 @@ struct kmem_cache {
60864 unsigned long node_allocs;
60865 unsigned long node_frees;
60866 unsigned long node_overflow;
60867- atomic_t allochit;
60868- atomic_t allocmiss;
60869- atomic_t freehit;
60870- atomic_t freemiss;
60871+ atomic_unchecked_t allochit;
60872+ atomic_unchecked_t allocmiss;
60873+ atomic_unchecked_t freehit;
60874+ atomic_unchecked_t freemiss;
60875
60876 /*
60877 * If debugging is enabled, then the allocator can add additional
60878diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
60879index a32bcfd..53b71f4 100644
60880--- a/include/linux/slub_def.h
60881+++ b/include/linux/slub_def.h
60882@@ -89,7 +89,7 @@ struct kmem_cache {
60883 struct kmem_cache_order_objects max;
60884 struct kmem_cache_order_objects min;
60885 gfp_t allocflags; /* gfp flags to use on each alloc */
60886- int refcount; /* Refcount for slab cache destroy */
60887+ atomic_t refcount; /* Refcount for slab cache destroy */
60888 void (*ctor)(void *);
60889 int inuse; /* Offset to metadata */
60890 int align; /* Alignment */
60891@@ -215,7 +215,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
60892 }
60893
60894 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
60895-void *__kmalloc(size_t size, gfp_t flags);
60896+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
60897
60898 static __always_inline void *
60899 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
60900diff --git a/include/linux/sonet.h b/include/linux/sonet.h
60901index de8832d..0147b46 100644
60902--- a/include/linux/sonet.h
60903+++ b/include/linux/sonet.h
60904@@ -61,7 +61,7 @@ struct sonet_stats {
60905 #include <linux/atomic.h>
60906
60907 struct k_sonet_stats {
60908-#define __HANDLE_ITEM(i) atomic_t i
60909+#define __HANDLE_ITEM(i) atomic_unchecked_t i
60910 __SONET_ITEMS
60911 #undef __HANDLE_ITEM
60912 };
60913diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
60914index 3d8f9c4..69f1c0a 100644
60915--- a/include/linux/sunrpc/clnt.h
60916+++ b/include/linux/sunrpc/clnt.h
60917@@ -172,9 +172,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
60918 {
60919 switch (sap->sa_family) {
60920 case AF_INET:
60921- return ntohs(((struct sockaddr_in *)sap)->sin_port);
60922+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
60923 case AF_INET6:
60924- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
60925+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
60926 }
60927 return 0;
60928 }
60929@@ -207,7 +207,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
60930 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
60931 const struct sockaddr *src)
60932 {
60933- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
60934+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
60935 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
60936
60937 dsin->sin_family = ssin->sin_family;
60938@@ -310,7 +310,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
60939 if (sa->sa_family != AF_INET6)
60940 return 0;
60941
60942- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
60943+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
60944 }
60945
60946 #endif /* __KERNEL__ */
60947diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
60948index e775689..9e206d9 100644
60949--- a/include/linux/sunrpc/sched.h
60950+++ b/include/linux/sunrpc/sched.h
60951@@ -105,6 +105,7 @@ struct rpc_call_ops {
60952 void (*rpc_call_done)(struct rpc_task *, void *);
60953 void (*rpc_release)(void *);
60954 };
60955+typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
60956
60957 struct rpc_task_setup {
60958 struct rpc_task *task;
60959diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
60960index c14fe86..393245e 100644
60961--- a/include/linux/sunrpc/svc_rdma.h
60962+++ b/include/linux/sunrpc/svc_rdma.h
60963@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
60964 extern unsigned int svcrdma_max_requests;
60965 extern unsigned int svcrdma_max_req_size;
60966
60967-extern atomic_t rdma_stat_recv;
60968-extern atomic_t rdma_stat_read;
60969-extern atomic_t rdma_stat_write;
60970-extern atomic_t rdma_stat_sq_starve;
60971-extern atomic_t rdma_stat_rq_starve;
60972-extern atomic_t rdma_stat_rq_poll;
60973-extern atomic_t rdma_stat_rq_prod;
60974-extern atomic_t rdma_stat_sq_poll;
60975-extern atomic_t rdma_stat_sq_prod;
60976+extern atomic_unchecked_t rdma_stat_recv;
60977+extern atomic_unchecked_t rdma_stat_read;
60978+extern atomic_unchecked_t rdma_stat_write;
60979+extern atomic_unchecked_t rdma_stat_sq_starve;
60980+extern atomic_unchecked_t rdma_stat_rq_starve;
60981+extern atomic_unchecked_t rdma_stat_rq_poll;
60982+extern atomic_unchecked_t rdma_stat_rq_prod;
60983+extern atomic_unchecked_t rdma_stat_sq_poll;
60984+extern atomic_unchecked_t rdma_stat_sq_prod;
60985
60986 #define RPCRDMA_VERSION 1
60987
60988diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
60989index 703cfa3..0b8ca72ac 100644
60990--- a/include/linux/sysctl.h
60991+++ b/include/linux/sysctl.h
60992@@ -155,7 +155,11 @@ enum
60993 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
60994 };
60995
60996-
60997+#ifdef CONFIG_PAX_SOFTMODE
60998+enum {
60999+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
61000+};
61001+#endif
61002
61003 /* CTL_VM names: */
61004 enum
61005@@ -968,6 +972,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
61006
61007 extern int proc_dostring(struct ctl_table *, int,
61008 void __user *, size_t *, loff_t *);
61009+extern int proc_dostring_modpriv(struct ctl_table *, int,
61010+ void __user *, size_t *, loff_t *);
61011 extern int proc_dointvec(struct ctl_table *, int,
61012 void __user *, size_t *, loff_t *);
61013 extern int proc_dointvec_minmax(struct ctl_table *, int,
61014diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
61015index a71a292..51bd91d 100644
61016--- a/include/linux/tracehook.h
61017+++ b/include/linux/tracehook.h
61018@@ -54,12 +54,12 @@ struct linux_binprm;
61019 /*
61020 * ptrace report for syscall entry and exit looks identical.
61021 */
61022-static inline void ptrace_report_syscall(struct pt_regs *regs)
61023+static inline int ptrace_report_syscall(struct pt_regs *regs)
61024 {
61025 int ptrace = current->ptrace;
61026
61027 if (!(ptrace & PT_PTRACED))
61028- return;
61029+ return 0;
61030
61031 ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
61032
61033@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
61034 send_sig(current->exit_code, current, 1);
61035 current->exit_code = 0;
61036 }
61037+
61038+ return fatal_signal_pending(current);
61039 }
61040
61041 /**
61042@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
61043 static inline __must_check int tracehook_report_syscall_entry(
61044 struct pt_regs *regs)
61045 {
61046- ptrace_report_syscall(regs);
61047- return 0;
61048+ return ptrace_report_syscall(regs);
61049 }
61050
61051 /**
61052diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
61053index ff7dc08..893e1bd 100644
61054--- a/include/linux/tty_ldisc.h
61055+++ b/include/linux/tty_ldisc.h
61056@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
61057
61058 struct module *owner;
61059
61060- int refcount;
61061+ atomic_t refcount;
61062 };
61063
61064 struct tty_ldisc {
61065diff --git a/include/linux/types.h b/include/linux/types.h
61066index 57a9723..dbe234a 100644
61067--- a/include/linux/types.h
61068+++ b/include/linux/types.h
61069@@ -213,10 +213,26 @@ typedef struct {
61070 int counter;
61071 } atomic_t;
61072
61073+#ifdef CONFIG_PAX_REFCOUNT
61074+typedef struct {
61075+ int counter;
61076+} atomic_unchecked_t;
61077+#else
61078+typedef atomic_t atomic_unchecked_t;
61079+#endif
61080+
61081 #ifdef CONFIG_64BIT
61082 typedef struct {
61083 long counter;
61084 } atomic64_t;
61085+
61086+#ifdef CONFIG_PAX_REFCOUNT
61087+typedef struct {
61088+ long counter;
61089+} atomic64_unchecked_t;
61090+#else
61091+typedef atomic64_t atomic64_unchecked_t;
61092+#endif
61093 #endif
61094
61095 struct list_head {
61096diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
61097index 5ca0951..ab496a5 100644
61098--- a/include/linux/uaccess.h
61099+++ b/include/linux/uaccess.h
61100@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
61101 long ret; \
61102 mm_segment_t old_fs = get_fs(); \
61103 \
61104- set_fs(KERNEL_DS); \
61105 pagefault_disable(); \
61106- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
61107- pagefault_enable(); \
61108+ set_fs(KERNEL_DS); \
61109+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
61110 set_fs(old_fs); \
61111+ pagefault_enable(); \
61112 ret; \
61113 })
61114
61115diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
61116index 99c1b4d..bb94261 100644
61117--- a/include/linux/unaligned/access_ok.h
61118+++ b/include/linux/unaligned/access_ok.h
61119@@ -6,32 +6,32 @@
61120
61121 static inline u16 get_unaligned_le16(const void *p)
61122 {
61123- return le16_to_cpup((__le16 *)p);
61124+ return le16_to_cpup((const __le16 *)p);
61125 }
61126
61127 static inline u32 get_unaligned_le32(const void *p)
61128 {
61129- return le32_to_cpup((__le32 *)p);
61130+ return le32_to_cpup((const __le32 *)p);
61131 }
61132
61133 static inline u64 get_unaligned_le64(const void *p)
61134 {
61135- return le64_to_cpup((__le64 *)p);
61136+ return le64_to_cpup((const __le64 *)p);
61137 }
61138
61139 static inline u16 get_unaligned_be16(const void *p)
61140 {
61141- return be16_to_cpup((__be16 *)p);
61142+ return be16_to_cpup((const __be16 *)p);
61143 }
61144
61145 static inline u32 get_unaligned_be32(const void *p)
61146 {
61147- return be32_to_cpup((__be32 *)p);
61148+ return be32_to_cpup((const __be32 *)p);
61149 }
61150
61151 static inline u64 get_unaligned_be64(const void *p)
61152 {
61153- return be64_to_cpup((__be64 *)p);
61154+ return be64_to_cpup((const __be64 *)p);
61155 }
61156
61157 static inline void put_unaligned_le16(u16 val, void *p)
61158diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
61159index e5a40c3..20ab0f6 100644
61160--- a/include/linux/usb/renesas_usbhs.h
61161+++ b/include/linux/usb/renesas_usbhs.h
61162@@ -39,7 +39,7 @@ enum {
61163 */
61164 struct renesas_usbhs_driver_callback {
61165 int (*notify_hotplug)(struct platform_device *pdev);
61166-};
61167+} __no_const;
61168
61169 /*
61170 * callback functions for platform
61171@@ -89,7 +89,7 @@ struct renesas_usbhs_platform_callback {
61172 * VBUS control is needed for Host
61173 */
61174 int (*set_vbus)(struct platform_device *pdev, int enable);
61175-};
61176+} __no_const;
61177
61178 /*
61179 * parameters for renesas usbhs
61180diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
61181index 6f8fbcf..8259001 100644
61182--- a/include/linux/vermagic.h
61183+++ b/include/linux/vermagic.h
61184@@ -25,9 +25,35 @@
61185 #define MODULE_ARCH_VERMAGIC ""
61186 #endif
61187
61188+#ifdef CONFIG_PAX_REFCOUNT
61189+#define MODULE_PAX_REFCOUNT "REFCOUNT "
61190+#else
61191+#define MODULE_PAX_REFCOUNT ""
61192+#endif
61193+
61194+#ifdef CONSTIFY_PLUGIN
61195+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
61196+#else
61197+#define MODULE_CONSTIFY_PLUGIN ""
61198+#endif
61199+
61200+#ifdef STACKLEAK_PLUGIN
61201+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
61202+#else
61203+#define MODULE_STACKLEAK_PLUGIN ""
61204+#endif
61205+
61206+#ifdef CONFIG_GRKERNSEC
61207+#define MODULE_GRSEC "GRSEC "
61208+#else
61209+#define MODULE_GRSEC ""
61210+#endif
61211+
61212 #define VERMAGIC_STRING \
61213 UTS_RELEASE " " \
61214 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
61215 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
61216- MODULE_ARCH_VERMAGIC
61217+ MODULE_ARCH_VERMAGIC \
61218+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
61219+ MODULE_GRSEC
61220
61221diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
61222index 4bde182..aec92c1 100644
61223--- a/include/linux/vmalloc.h
61224+++ b/include/linux/vmalloc.h
61225@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
61226 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
61227 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
61228 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
61229+
61230+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
61231+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
61232+#endif
61233+
61234 /* bits [20..32] reserved for arch specific ioremap internals */
61235
61236 /*
61237@@ -156,4 +161,103 @@ pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)
61238 # endif
61239 #endif
61240
61241+#define vmalloc(x) \
61242+({ \
61243+ void *___retval; \
61244+ intoverflow_t ___x = (intoverflow_t)x; \
61245+ if (WARN(___x > ULONG_MAX, "vmalloc size overflow\n")) \
61246+ ___retval = NULL; \
61247+ else \
61248+ ___retval = vmalloc((unsigned long)___x); \
61249+ ___retval; \
61250+})
61251+
61252+#define vzalloc(x) \
61253+({ \
61254+ void *___retval; \
61255+ intoverflow_t ___x = (intoverflow_t)x; \
61256+ if (WARN(___x > ULONG_MAX, "vzalloc size overflow\n")) \
61257+ ___retval = NULL; \
61258+ else \
61259+ ___retval = vzalloc((unsigned long)___x); \
61260+ ___retval; \
61261+})
61262+
61263+#define __vmalloc(x, y, z) \
61264+({ \
61265+ void *___retval; \
61266+ intoverflow_t ___x = (intoverflow_t)x; \
61267+ if (WARN(___x > ULONG_MAX, "__vmalloc size overflow\n"))\
61268+ ___retval = NULL; \
61269+ else \
61270+ ___retval = __vmalloc((unsigned long)___x, (y), (z));\
61271+ ___retval; \
61272+})
61273+
61274+#define vmalloc_user(x) \
61275+({ \
61276+ void *___retval; \
61277+ intoverflow_t ___x = (intoverflow_t)x; \
61278+ if (WARN(___x > ULONG_MAX, "vmalloc_user size overflow\n"))\
61279+ ___retval = NULL; \
61280+ else \
61281+ ___retval = vmalloc_user((unsigned long)___x); \
61282+ ___retval; \
61283+})
61284+
61285+#define vmalloc_exec(x) \
61286+({ \
61287+ void *___retval; \
61288+ intoverflow_t ___x = (intoverflow_t)x; \
61289+ if (WARN(___x > ULONG_MAX, "vmalloc_exec size overflow\n"))\
61290+ ___retval = NULL; \
61291+ else \
61292+ ___retval = vmalloc_exec((unsigned long)___x); \
61293+ ___retval; \
61294+})
61295+
61296+#define vmalloc_node(x, y) \
61297+({ \
61298+ void *___retval; \
61299+ intoverflow_t ___x = (intoverflow_t)x; \
61300+ if (WARN(___x > ULONG_MAX, "vmalloc_node size overflow\n"))\
61301+ ___retval = NULL; \
61302+ else \
61303+ ___retval = vmalloc_node((unsigned long)___x, (y));\
61304+ ___retval; \
61305+})
61306+
61307+#define vzalloc_node(x, y) \
61308+({ \
61309+ void *___retval; \
61310+ intoverflow_t ___x = (intoverflow_t)x; \
61311+ if (WARN(___x > ULONG_MAX, "vzalloc_node size overflow\n"))\
61312+ ___retval = NULL; \
61313+ else \
61314+ ___retval = vzalloc_node((unsigned long)___x, (y));\
61315+ ___retval; \
61316+})
61317+
61318+#define vmalloc_32(x) \
61319+({ \
61320+ void *___retval; \
61321+ intoverflow_t ___x = (intoverflow_t)x; \
61322+ if (WARN(___x > ULONG_MAX, "vmalloc_32 size overflow\n"))\
61323+ ___retval = NULL; \
61324+ else \
61325+ ___retval = vmalloc_32((unsigned long)___x); \
61326+ ___retval; \
61327+})
61328+
61329+#define vmalloc_32_user(x) \
61330+({ \
61331+void *___retval; \
61332+ intoverflow_t ___x = (intoverflow_t)x; \
61333+ if (WARN(___x > ULONG_MAX, "vmalloc_32_user size overflow\n"))\
61334+ ___retval = NULL; \
61335+ else \
61336+ ___retval = vmalloc_32_user((unsigned long)___x);\
61337+ ___retval; \
61338+})
61339+
61340 #endif /* _LINUX_VMALLOC_H */
61341diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
61342index 65efb92..137adbb 100644
61343--- a/include/linux/vmstat.h
61344+++ b/include/linux/vmstat.h
61345@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
61346 /*
61347 * Zone based page accounting with per cpu differentials.
61348 */
61349-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
61350+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
61351
61352 static inline void zone_page_state_add(long x, struct zone *zone,
61353 enum zone_stat_item item)
61354 {
61355- atomic_long_add(x, &zone->vm_stat[item]);
61356- atomic_long_add(x, &vm_stat[item]);
61357+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
61358+ atomic_long_add_unchecked(x, &vm_stat[item]);
61359 }
61360
61361 static inline unsigned long global_page_state(enum zone_stat_item item)
61362 {
61363- long x = atomic_long_read(&vm_stat[item]);
61364+ long x = atomic_long_read_unchecked(&vm_stat[item]);
61365 #ifdef CONFIG_SMP
61366 if (x < 0)
61367 x = 0;
61368@@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
61369 static inline unsigned long zone_page_state(struct zone *zone,
61370 enum zone_stat_item item)
61371 {
61372- long x = atomic_long_read(&zone->vm_stat[item]);
61373+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
61374 #ifdef CONFIG_SMP
61375 if (x < 0)
61376 x = 0;
61377@@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
61378 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
61379 enum zone_stat_item item)
61380 {
61381- long x = atomic_long_read(&zone->vm_stat[item]);
61382+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
61383
61384 #ifdef CONFIG_SMP
61385 int cpu;
61386@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
61387
61388 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
61389 {
61390- atomic_long_inc(&zone->vm_stat[item]);
61391- atomic_long_inc(&vm_stat[item]);
61392+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
61393+ atomic_long_inc_unchecked(&vm_stat[item]);
61394 }
61395
61396 static inline void __inc_zone_page_state(struct page *page,
61397@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
61398
61399 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
61400 {
61401- atomic_long_dec(&zone->vm_stat[item]);
61402- atomic_long_dec(&vm_stat[item]);
61403+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
61404+ atomic_long_dec_unchecked(&vm_stat[item]);
61405 }
61406
61407 static inline void __dec_zone_page_state(struct page *page,
61408diff --git a/include/linux/xattr.h b/include/linux/xattr.h
61409index e5d1220..ef6e406 100644
61410--- a/include/linux/xattr.h
61411+++ b/include/linux/xattr.h
61412@@ -57,6 +57,11 @@
61413 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
61414 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
61415
61416+/* User namespace */
61417+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
61418+#define XATTR_PAX_FLAGS_SUFFIX "flags"
61419+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
61420+
61421 #ifdef __KERNEL__
61422
61423 #include <linux/types.h>
61424diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
61425index 4aeff96..b378cdc 100644
61426--- a/include/media/saa7146_vv.h
61427+++ b/include/media/saa7146_vv.h
61428@@ -163,7 +163,7 @@ struct saa7146_ext_vv
61429 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
61430
61431 /* the extension can override this */
61432- struct v4l2_ioctl_ops ops;
61433+ v4l2_ioctl_ops_no_const ops;
61434 /* pointer to the saa7146 core ops */
61435 const struct v4l2_ioctl_ops *core_ops;
61436
61437diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
61438index c7c40f1..4f01585 100644
61439--- a/include/media/v4l2-dev.h
61440+++ b/include/media/v4l2-dev.h
61441@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
61442
61443
61444 struct v4l2_file_operations {
61445- struct module *owner;
61446+ struct module * const owner;
61447 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
61448 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
61449 unsigned int (*poll) (struct file *, struct poll_table_struct *);
61450@@ -68,6 +68,7 @@ struct v4l2_file_operations {
61451 int (*open) (struct file *);
61452 int (*release) (struct file *);
61453 };
61454+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
61455
61456 /*
61457 * Newer version of video_device, handled by videodev2.c
61458diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
61459index 4d1c74a..65e1221 100644
61460--- a/include/media/v4l2-ioctl.h
61461+++ b/include/media/v4l2-ioctl.h
61462@@ -274,7 +274,7 @@ struct v4l2_ioctl_ops {
61463 long (*vidioc_default) (struct file *file, void *fh,
61464 bool valid_prio, int cmd, void *arg);
61465 };
61466-
61467+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
61468
61469 /* v4l debugging and diagnostics */
61470
61471diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
61472index 8d55251..dfe5b0a 100644
61473--- a/include/net/caif/caif_hsi.h
61474+++ b/include/net/caif/caif_hsi.h
61475@@ -98,7 +98,7 @@ struct cfhsi_drv {
61476 void (*rx_done_cb) (struct cfhsi_drv *drv);
61477 void (*wake_up_cb) (struct cfhsi_drv *drv);
61478 void (*wake_down_cb) (struct cfhsi_drv *drv);
61479-};
61480+} __no_const;
61481
61482 /* Structure implemented by HSI device. */
61483 struct cfhsi_dev {
61484diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
61485index 9e5425b..8136ffc 100644
61486--- a/include/net/caif/cfctrl.h
61487+++ b/include/net/caif/cfctrl.h
61488@@ -52,7 +52,7 @@ struct cfctrl_rsp {
61489 void (*radioset_rsp)(void);
61490 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
61491 struct cflayer *client_layer);
61492-};
61493+} __no_const;
61494
61495 /* Link Setup Parameters for CAIF-Links. */
61496 struct cfctrl_link_param {
61497@@ -101,8 +101,8 @@ struct cfctrl_request_info {
61498 struct cfctrl {
61499 struct cfsrvl serv;
61500 struct cfctrl_rsp res;
61501- atomic_t req_seq_no;
61502- atomic_t rsp_seq_no;
61503+ atomic_unchecked_t req_seq_no;
61504+ atomic_unchecked_t rsp_seq_no;
61505 struct list_head list;
61506 /* Protects from simultaneous access to first_req list */
61507 spinlock_t info_list_lock;
61508diff --git a/include/net/flow.h b/include/net/flow.h
61509index 57f15a7..0de26c6 100644
61510--- a/include/net/flow.h
61511+++ b/include/net/flow.h
61512@@ -208,6 +208,6 @@ extern struct flow_cache_object *flow_cache_lookup(
61513
61514 extern void flow_cache_flush(void);
61515 extern void flow_cache_flush_deferred(void);
61516-extern atomic_t flow_cache_genid;
61517+extern atomic_unchecked_t flow_cache_genid;
61518
61519 #endif
61520diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
61521index e9ff3fc..9d3e5c7 100644
61522--- a/include/net/inetpeer.h
61523+++ b/include/net/inetpeer.h
61524@@ -48,8 +48,8 @@ struct inet_peer {
61525 */
61526 union {
61527 struct {
61528- atomic_t rid; /* Frag reception counter */
61529- atomic_t ip_id_count; /* IP ID for the next packet */
61530+ atomic_unchecked_t rid; /* Frag reception counter */
61531+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
61532 __u32 tcp_ts;
61533 __u32 tcp_ts_stamp;
61534 };
61535@@ -113,11 +113,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
61536 more++;
61537 inet_peer_refcheck(p);
61538 do {
61539- old = atomic_read(&p->ip_id_count);
61540+ old = atomic_read_unchecked(&p->ip_id_count);
61541 new = old + more;
61542 if (!new)
61543 new = 1;
61544- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
61545+ } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
61546 return new;
61547 }
61548
61549diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
61550index 10422ef..662570f 100644
61551--- a/include/net/ip_fib.h
61552+++ b/include/net/ip_fib.h
61553@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
61554
61555 #define FIB_RES_SADDR(net, res) \
61556 ((FIB_RES_NH(res).nh_saddr_genid == \
61557- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
61558+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
61559 FIB_RES_NH(res).nh_saddr : \
61560 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
61561 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
61562diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
61563index e5a7b9a..f4fc44b 100644
61564--- a/include/net/ip_vs.h
61565+++ b/include/net/ip_vs.h
61566@@ -509,7 +509,7 @@ struct ip_vs_conn {
61567 struct ip_vs_conn *control; /* Master control connection */
61568 atomic_t n_control; /* Number of controlled ones */
61569 struct ip_vs_dest *dest; /* real server */
61570- atomic_t in_pkts; /* incoming packet counter */
61571+ atomic_unchecked_t in_pkts; /* incoming packet counter */
61572
61573 /* packet transmitter for different forwarding methods. If it
61574 mangles the packet, it must return NF_DROP or better NF_STOLEN,
61575@@ -647,7 +647,7 @@ struct ip_vs_dest {
61576 __be16 port; /* port number of the server */
61577 union nf_inet_addr addr; /* IP address of the server */
61578 volatile unsigned flags; /* dest status flags */
61579- atomic_t conn_flags; /* flags to copy to conn */
61580+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
61581 atomic_t weight; /* server weight */
61582
61583 atomic_t refcnt; /* reference counter */
61584diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
61585index 69b610a..fe3962c 100644
61586--- a/include/net/irda/ircomm_core.h
61587+++ b/include/net/irda/ircomm_core.h
61588@@ -51,7 +51,7 @@ typedef struct {
61589 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
61590 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
61591 struct ircomm_info *);
61592-} call_t;
61593+} __no_const call_t;
61594
61595 struct ircomm_cb {
61596 irda_queue_t queue;
61597diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
61598index 59ba38bc..d515662 100644
61599--- a/include/net/irda/ircomm_tty.h
61600+++ b/include/net/irda/ircomm_tty.h
61601@@ -35,6 +35,7 @@
61602 #include <linux/termios.h>
61603 #include <linux/timer.h>
61604 #include <linux/tty.h> /* struct tty_struct */
61605+#include <asm/local.h>
61606
61607 #include <net/irda/irias_object.h>
61608 #include <net/irda/ircomm_core.h>
61609@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
61610 unsigned short close_delay;
61611 unsigned short closing_wait; /* time to wait before closing */
61612
61613- int open_count;
61614- int blocked_open; /* # of blocked opens */
61615+ local_t open_count;
61616+ local_t blocked_open; /* # of blocked opens */
61617
61618 /* Protect concurent access to :
61619 * o self->open_count
61620diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
61621index f2419cf..473679f 100644
61622--- a/include/net/iucv/af_iucv.h
61623+++ b/include/net/iucv/af_iucv.h
61624@@ -139,7 +139,7 @@ struct iucv_sock {
61625 struct iucv_sock_list {
61626 struct hlist_head head;
61627 rwlock_t lock;
61628- atomic_t autobind_name;
61629+ atomic_unchecked_t autobind_name;
61630 };
61631
61632 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
61633diff --git a/include/net/neighbour.h b/include/net/neighbour.h
61634index 2720884..3aa5c25 100644
61635--- a/include/net/neighbour.h
61636+++ b/include/net/neighbour.h
61637@@ -122,7 +122,7 @@ struct neigh_ops {
61638 void (*error_report)(struct neighbour *, struct sk_buff *);
61639 int (*output)(struct neighbour *, struct sk_buff *);
61640 int (*connected_output)(struct neighbour *, struct sk_buff *);
61641-};
61642+} __do_const;
61643
61644 struct pneigh_entry {
61645 struct pneigh_entry *next;
61646diff --git a/include/net/netlink.h b/include/net/netlink.h
61647index cb1f350..3279d2c 100644
61648--- a/include/net/netlink.h
61649+++ b/include/net/netlink.h
61650@@ -569,7 +569,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
61651 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
61652 {
61653 if (mark)
61654- skb_trim(skb, (unsigned char *) mark - skb->data);
61655+ skb_trim(skb, (const unsigned char *) mark - skb->data);
61656 }
61657
61658 /**
61659diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
61660index d786b4f..4c3dd41 100644
61661--- a/include/net/netns/ipv4.h
61662+++ b/include/net/netns/ipv4.h
61663@@ -56,8 +56,8 @@ struct netns_ipv4 {
61664
61665 unsigned int sysctl_ping_group_range[2];
61666
61667- atomic_t rt_genid;
61668- atomic_t dev_addr_genid;
61669+ atomic_unchecked_t rt_genid;
61670+ atomic_unchecked_t dev_addr_genid;
61671
61672 #ifdef CONFIG_IP_MROUTE
61673 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
61674diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
61675index 6a72a58..e6a127d 100644
61676--- a/include/net/sctp/sctp.h
61677+++ b/include/net/sctp/sctp.h
61678@@ -318,9 +318,9 @@ do { \
61679
61680 #else /* SCTP_DEBUG */
61681
61682-#define SCTP_DEBUG_PRINTK(whatever...)
61683-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
61684-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
61685+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
61686+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
61687+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
61688 #define SCTP_ENABLE_DEBUG
61689 #define SCTP_DISABLE_DEBUG
61690 #define SCTP_ASSERT(expr, str, func)
61691diff --git a/include/net/sock.h b/include/net/sock.h
61692index 32e3937..87a1dbc 100644
61693--- a/include/net/sock.h
61694+++ b/include/net/sock.h
61695@@ -277,7 +277,7 @@ struct sock {
61696 #ifdef CONFIG_RPS
61697 __u32 sk_rxhash;
61698 #endif
61699- atomic_t sk_drops;
61700+ atomic_unchecked_t sk_drops;
61701 int sk_rcvbuf;
61702
61703 struct sk_filter __rcu *sk_filter;
61704@@ -1402,7 +1402,7 @@ static inline void sk_nocaps_add(struct sock *sk, int flags)
61705 }
61706
61707 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
61708- char __user *from, char *to,
61709+ char __user *from, unsigned char *to,
61710 int copy, int offset)
61711 {
61712 if (skb->ip_summed == CHECKSUM_NONE) {
61713diff --git a/include/net/tcp.h b/include/net/tcp.h
61714index bb18c4d..bb87972 100644
61715--- a/include/net/tcp.h
61716+++ b/include/net/tcp.h
61717@@ -1409,7 +1409,7 @@ struct tcp_seq_afinfo {
61718 char *name;
61719 sa_family_t family;
61720 const struct file_operations *seq_fops;
61721- struct seq_operations seq_ops;
61722+ seq_operations_no_const seq_ops;
61723 };
61724
61725 struct tcp_iter_state {
61726diff --git a/include/net/udp.h b/include/net/udp.h
61727index 3b285f4..0219639 100644
61728--- a/include/net/udp.h
61729+++ b/include/net/udp.h
61730@@ -237,7 +237,7 @@ struct udp_seq_afinfo {
61731 sa_family_t family;
61732 struct udp_table *udp_table;
61733 const struct file_operations *seq_fops;
61734- struct seq_operations seq_ops;
61735+ seq_operations_no_const seq_ops;
61736 };
61737
61738 struct udp_iter_state {
61739diff --git a/include/net/xfrm.h b/include/net/xfrm.h
61740index b203e14..1df3991 100644
61741--- a/include/net/xfrm.h
61742+++ b/include/net/xfrm.h
61743@@ -505,7 +505,7 @@ struct xfrm_policy {
61744 struct timer_list timer;
61745
61746 struct flow_cache_object flo;
61747- atomic_t genid;
61748+ atomic_unchecked_t genid;
61749 u32 priority;
61750 u32 index;
61751 struct xfrm_mark mark;
61752diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
61753index 1a046b1..ee0bef0 100644
61754--- a/include/rdma/iw_cm.h
61755+++ b/include/rdma/iw_cm.h
61756@@ -122,7 +122,7 @@ struct iw_cm_verbs {
61757 int backlog);
61758
61759 int (*destroy_listen)(struct iw_cm_id *cm_id);
61760-};
61761+} __no_const;
61762
61763 /**
61764 * iw_create_cm_id - Create an IW CM identifier.
61765diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
61766index 5d1a758..1dbf795 100644
61767--- a/include/scsi/libfc.h
61768+++ b/include/scsi/libfc.h
61769@@ -748,6 +748,7 @@ struct libfc_function_template {
61770 */
61771 void (*disc_stop_final) (struct fc_lport *);
61772 };
61773+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
61774
61775 /**
61776 * struct fc_disc - Discovery context
61777@@ -851,7 +852,7 @@ struct fc_lport {
61778 struct fc_vport *vport;
61779
61780 /* Operational Information */
61781- struct libfc_function_template tt;
61782+ libfc_function_template_no_const tt;
61783 u8 link_up;
61784 u8 qfull;
61785 enum fc_lport_state state;
61786diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
61787index 5591ed5..13eb457 100644
61788--- a/include/scsi/scsi_device.h
61789+++ b/include/scsi/scsi_device.h
61790@@ -161,9 +161,9 @@ struct scsi_device {
61791 unsigned int max_device_blocked; /* what device_blocked counts down from */
61792 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
61793
61794- atomic_t iorequest_cnt;
61795- atomic_t iodone_cnt;
61796- atomic_t ioerr_cnt;
61797+ atomic_unchecked_t iorequest_cnt;
61798+ atomic_unchecked_t iodone_cnt;
61799+ atomic_unchecked_t ioerr_cnt;
61800
61801 struct device sdev_gendev,
61802 sdev_dev;
61803diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
61804index 2a65167..91e01f8 100644
61805--- a/include/scsi/scsi_transport_fc.h
61806+++ b/include/scsi/scsi_transport_fc.h
61807@@ -711,7 +711,7 @@ struct fc_function_template {
61808 unsigned long show_host_system_hostname:1;
61809
61810 unsigned long disable_target_scan:1;
61811-};
61812+} __do_const;
61813
61814
61815 /**
61816diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
61817index 030b87c..98a6954 100644
61818--- a/include/sound/ak4xxx-adda.h
61819+++ b/include/sound/ak4xxx-adda.h
61820@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
61821 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
61822 unsigned char val);
61823 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
61824-};
61825+} __no_const;
61826
61827 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
61828
61829diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
61830index 8c05e47..2b5df97 100644
61831--- a/include/sound/hwdep.h
61832+++ b/include/sound/hwdep.h
61833@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
61834 struct snd_hwdep_dsp_status *status);
61835 int (*dsp_load)(struct snd_hwdep *hw,
61836 struct snd_hwdep_dsp_image *image);
61837-};
61838+} __no_const;
61839
61840 struct snd_hwdep {
61841 struct snd_card *card;
61842diff --git a/include/sound/info.h b/include/sound/info.h
61843index 5492cc4..1a65278 100644
61844--- a/include/sound/info.h
61845+++ b/include/sound/info.h
61846@@ -44,7 +44,7 @@ struct snd_info_entry_text {
61847 struct snd_info_buffer *buffer);
61848 void (*write)(struct snd_info_entry *entry,
61849 struct snd_info_buffer *buffer);
61850-};
61851+} __no_const;
61852
61853 struct snd_info_entry_ops {
61854 int (*open)(struct snd_info_entry *entry,
61855diff --git a/include/sound/pcm.h b/include/sound/pcm.h
61856index 0cf91b2..b70cae4 100644
61857--- a/include/sound/pcm.h
61858+++ b/include/sound/pcm.h
61859@@ -81,6 +81,7 @@ struct snd_pcm_ops {
61860 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
61861 int (*ack)(struct snd_pcm_substream *substream);
61862 };
61863+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
61864
61865 /*
61866 *
61867diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
61868index af1b49e..a5d55a5 100644
61869--- a/include/sound/sb16_csp.h
61870+++ b/include/sound/sb16_csp.h
61871@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
61872 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
61873 int (*csp_stop) (struct snd_sb_csp * p);
61874 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
61875-};
61876+} __no_const;
61877
61878 /*
61879 * CSP private data
61880diff --git a/include/sound/soc.h b/include/sound/soc.h
61881index 11cfb59..e3f93f4 100644
61882--- a/include/sound/soc.h
61883+++ b/include/sound/soc.h
61884@@ -683,7 +683,7 @@ struct snd_soc_platform_driver {
61885 /* platform IO - used for platform DAPM */
61886 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
61887 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
61888-};
61889+} __do_const;
61890
61891 struct snd_soc_platform {
61892 const char *name;
61893diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
61894index 444cd6b..3327cc5 100644
61895--- a/include/sound/ymfpci.h
61896+++ b/include/sound/ymfpci.h
61897@@ -358,7 +358,7 @@ struct snd_ymfpci {
61898 spinlock_t reg_lock;
61899 spinlock_t voice_lock;
61900 wait_queue_head_t interrupt_sleep;
61901- atomic_t interrupt_sleep_count;
61902+ atomic_unchecked_t interrupt_sleep_count;
61903 struct snd_info_entry *proc_entry;
61904 const struct firmware *dsp_microcode;
61905 const struct firmware *controller_microcode;
61906diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
61907index a79886c..b483af6 100644
61908--- a/include/target/target_core_base.h
61909+++ b/include/target/target_core_base.h
61910@@ -346,7 +346,7 @@ struct t10_reservation_ops {
61911 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
61912 int (*t10_pr_register)(struct se_cmd *);
61913 int (*t10_pr_clear)(struct se_cmd *);
61914-};
61915+} __no_const;
61916
61917 struct t10_reservation {
61918 /* Reservation effects all target ports */
61919@@ -465,8 +465,8 @@ struct se_cmd {
61920 atomic_t t_se_count;
61921 atomic_t t_task_cdbs_left;
61922 atomic_t t_task_cdbs_ex_left;
61923- atomic_t t_task_cdbs_sent;
61924- atomic_t t_transport_aborted;
61925+ atomic_unchecked_t t_task_cdbs_sent;
61926+ atomic_unchecked_t t_transport_aborted;
61927 atomic_t t_transport_active;
61928 atomic_t t_transport_complete;
61929 atomic_t t_transport_queue_active;
61930@@ -704,7 +704,7 @@ struct se_device {
61931 /* Active commands on this virtual SE device */
61932 atomic_t simple_cmds;
61933 atomic_t depth_left;
61934- atomic_t dev_ordered_id;
61935+ atomic_unchecked_t dev_ordered_id;
61936 atomic_t execute_tasks;
61937 atomic_t dev_ordered_sync;
61938 atomic_t dev_qf_count;
61939diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
61940index 1c09820..7f5ec79 100644
61941--- a/include/trace/events/irq.h
61942+++ b/include/trace/events/irq.h
61943@@ -36,7 +36,7 @@ struct softirq_action;
61944 */
61945 TRACE_EVENT(irq_handler_entry,
61946
61947- TP_PROTO(int irq, struct irqaction *action),
61948+ TP_PROTO(int irq, const struct irqaction *action),
61949
61950 TP_ARGS(irq, action),
61951
61952@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
61953 */
61954 TRACE_EVENT(irq_handler_exit,
61955
61956- TP_PROTO(int irq, struct irqaction *action, int ret),
61957+ TP_PROTO(int irq, const struct irqaction *action, int ret),
61958
61959 TP_ARGS(irq, action, ret),
61960
61961diff --git a/include/video/udlfb.h b/include/video/udlfb.h
61962index c41f308..6918de3 100644
61963--- a/include/video/udlfb.h
61964+++ b/include/video/udlfb.h
61965@@ -52,10 +52,10 @@ struct dlfb_data {
61966 u32 pseudo_palette[256];
61967 int blank_mode; /*one of FB_BLANK_ */
61968 /* blit-only rendering path metrics, exposed through sysfs */
61969- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
61970- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
61971- atomic_t bytes_sent; /* to usb, after compression including overhead */
61972- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
61973+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
61974+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
61975+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
61976+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
61977 };
61978
61979 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
61980diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
61981index 0993a22..32ba2fe 100644
61982--- a/include/video/uvesafb.h
61983+++ b/include/video/uvesafb.h
61984@@ -177,6 +177,7 @@ struct uvesafb_par {
61985 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
61986 u8 pmi_setpal; /* PMI for palette changes */
61987 u16 *pmi_base; /* protected mode interface location */
61988+ u8 *pmi_code; /* protected mode code location */
61989 void *pmi_start;
61990 void *pmi_pal;
61991 u8 *vbe_state_orig; /*
61992diff --git a/init/Kconfig b/init/Kconfig
61993index 43298f9..2f56c12 100644
61994--- a/init/Kconfig
61995+++ b/init/Kconfig
61996@@ -1214,7 +1214,7 @@ config SLUB_DEBUG
61997
61998 config COMPAT_BRK
61999 bool "Disable heap randomization"
62000- default y
62001+ default n
62002 help
62003 Randomizing heap placement makes heap exploits harder, but it
62004 also breaks ancient binaries (including anything libc5 based).
62005diff --git a/init/do_mounts.c b/init/do_mounts.c
62006index db6e5ee..7677ff7 100644
62007--- a/init/do_mounts.c
62008+++ b/init/do_mounts.c
62009@@ -325,11 +325,11 @@ static void __init get_fs_names(char *page)
62010
62011 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
62012 {
62013- int err = sys_mount(name, "/root", fs, flags, data);
62014+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
62015 if (err)
62016 return err;
62017
62018- sys_chdir((const char __user __force *)"/root");
62019+ sys_chdir((const char __force_user*)"/root");
62020 ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
62021 printk(KERN_INFO
62022 "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
62023@@ -448,18 +448,18 @@ void __init change_floppy(char *fmt, ...)
62024 va_start(args, fmt);
62025 vsprintf(buf, fmt, args);
62026 va_end(args);
62027- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
62028+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
62029 if (fd >= 0) {
62030 sys_ioctl(fd, FDEJECT, 0);
62031 sys_close(fd);
62032 }
62033 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
62034- fd = sys_open("/dev/console", O_RDWR, 0);
62035+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
62036 if (fd >= 0) {
62037 sys_ioctl(fd, TCGETS, (long)&termios);
62038 termios.c_lflag &= ~ICANON;
62039 sys_ioctl(fd, TCSETSF, (long)&termios);
62040- sys_read(fd, &c, 1);
62041+ sys_read(fd, (char __user *)&c, 1);
62042 termios.c_lflag |= ICANON;
62043 sys_ioctl(fd, TCSETSF, (long)&termios);
62044 sys_close(fd);
62045@@ -553,6 +553,6 @@ void __init prepare_namespace(void)
62046 mount_root();
62047 out:
62048 devtmpfs_mount("dev");
62049- sys_mount(".", "/", NULL, MS_MOVE, NULL);
62050- sys_chroot((const char __user __force *)".");
62051+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
62052+ sys_chroot((const char __force_user *)".");
62053 }
62054diff --git a/init/do_mounts.h b/init/do_mounts.h
62055index f5b978a..69dbfe8 100644
62056--- a/init/do_mounts.h
62057+++ b/init/do_mounts.h
62058@@ -15,15 +15,15 @@ extern int root_mountflags;
62059
62060 static inline int create_dev(char *name, dev_t dev)
62061 {
62062- sys_unlink(name);
62063- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
62064+ sys_unlink((char __force_user *)name);
62065+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
62066 }
62067
62068 #if BITS_PER_LONG == 32
62069 static inline u32 bstat(char *name)
62070 {
62071 struct stat64 stat;
62072- if (sys_stat64(name, &stat) != 0)
62073+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
62074 return 0;
62075 if (!S_ISBLK(stat.st_mode))
62076 return 0;
62077@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
62078 static inline u32 bstat(char *name)
62079 {
62080 struct stat stat;
62081- if (sys_newstat(name, &stat) != 0)
62082+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
62083 return 0;
62084 if (!S_ISBLK(stat.st_mode))
62085 return 0;
62086diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
62087index 3098a38..253064e 100644
62088--- a/init/do_mounts_initrd.c
62089+++ b/init/do_mounts_initrd.c
62090@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
62091 create_dev("/dev/root.old", Root_RAM0);
62092 /* mount initrd on rootfs' /root */
62093 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
62094- sys_mkdir("/old", 0700);
62095- root_fd = sys_open("/", 0, 0);
62096- old_fd = sys_open("/old", 0, 0);
62097+ sys_mkdir((const char __force_user *)"/old", 0700);
62098+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
62099+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
62100 /* move initrd over / and chdir/chroot in initrd root */
62101- sys_chdir("/root");
62102- sys_mount(".", "/", NULL, MS_MOVE, NULL);
62103- sys_chroot(".");
62104+ sys_chdir((const char __force_user *)"/root");
62105+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
62106+ sys_chroot((const char __force_user *)".");
62107
62108 /*
62109 * In case that a resume from disk is carried out by linuxrc or one of
62110@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
62111
62112 /* move initrd to rootfs' /old */
62113 sys_fchdir(old_fd);
62114- sys_mount("/", ".", NULL, MS_MOVE, NULL);
62115+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
62116 /* switch root and cwd back to / of rootfs */
62117 sys_fchdir(root_fd);
62118- sys_chroot(".");
62119+ sys_chroot((const char __force_user *)".");
62120 sys_close(old_fd);
62121 sys_close(root_fd);
62122
62123 if (new_decode_dev(real_root_dev) == Root_RAM0) {
62124- sys_chdir("/old");
62125+ sys_chdir((const char __force_user *)"/old");
62126 return;
62127 }
62128
62129@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
62130 mount_root();
62131
62132 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
62133- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
62134+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
62135 if (!error)
62136 printk("okay\n");
62137 else {
62138- int fd = sys_open("/dev/root.old", O_RDWR, 0);
62139+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
62140 if (error == -ENOENT)
62141 printk("/initrd does not exist. Ignored.\n");
62142 else
62143 printk("failed\n");
62144 printk(KERN_NOTICE "Unmounting old root\n");
62145- sys_umount("/old", MNT_DETACH);
62146+ sys_umount((char __force_user *)"/old", MNT_DETACH);
62147 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
62148 if (fd < 0) {
62149 error = fd;
62150@@ -116,11 +116,11 @@ int __init initrd_load(void)
62151 * mounted in the normal path.
62152 */
62153 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
62154- sys_unlink("/initrd.image");
62155+ sys_unlink((const char __force_user *)"/initrd.image");
62156 handle_initrd();
62157 return 1;
62158 }
62159 }
62160- sys_unlink("/initrd.image");
62161+ sys_unlink((const char __force_user *)"/initrd.image");
62162 return 0;
62163 }
62164diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
62165index 32c4799..c27ee74 100644
62166--- a/init/do_mounts_md.c
62167+++ b/init/do_mounts_md.c
62168@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
62169 partitioned ? "_d" : "", minor,
62170 md_setup_args[ent].device_names);
62171
62172- fd = sys_open(name, 0, 0);
62173+ fd = sys_open((char __force_user *)name, 0, 0);
62174 if (fd < 0) {
62175 printk(KERN_ERR "md: open failed - cannot start "
62176 "array %s\n", name);
62177@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
62178 * array without it
62179 */
62180 sys_close(fd);
62181- fd = sys_open(name, 0, 0);
62182+ fd = sys_open((char __force_user *)name, 0, 0);
62183 sys_ioctl(fd, BLKRRPART, 0);
62184 }
62185 sys_close(fd);
62186@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
62187
62188 wait_for_device_probe();
62189
62190- fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
62191+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
62192 if (fd >= 0) {
62193 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
62194 sys_close(fd);
62195diff --git a/init/initramfs.c b/init/initramfs.c
62196index 2531811..040d4d4 100644
62197--- a/init/initramfs.c
62198+++ b/init/initramfs.c
62199@@ -74,7 +74,7 @@ static void __init free_hash(void)
62200 }
62201 }
62202
62203-static long __init do_utime(char __user *filename, time_t mtime)
62204+static long __init do_utime(__force char __user *filename, time_t mtime)
62205 {
62206 struct timespec t[2];
62207
62208@@ -109,7 +109,7 @@ static void __init dir_utime(void)
62209 struct dir_entry *de, *tmp;
62210 list_for_each_entry_safe(de, tmp, &dir_list, list) {
62211 list_del(&de->list);
62212- do_utime(de->name, de->mtime);
62213+ do_utime((char __force_user *)de->name, de->mtime);
62214 kfree(de->name);
62215 kfree(de);
62216 }
62217@@ -271,7 +271,7 @@ static int __init maybe_link(void)
62218 if (nlink >= 2) {
62219 char *old = find_link(major, minor, ino, mode, collected);
62220 if (old)
62221- return (sys_link(old, collected) < 0) ? -1 : 1;
62222+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
62223 }
62224 return 0;
62225 }
62226@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
62227 {
62228 struct stat st;
62229
62230- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
62231+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
62232 if (S_ISDIR(st.st_mode))
62233- sys_rmdir(path);
62234+ sys_rmdir((char __force_user *)path);
62235 else
62236- sys_unlink(path);
62237+ sys_unlink((char __force_user *)path);
62238 }
62239 }
62240
62241@@ -305,7 +305,7 @@ static int __init do_name(void)
62242 int openflags = O_WRONLY|O_CREAT;
62243 if (ml != 1)
62244 openflags |= O_TRUNC;
62245- wfd = sys_open(collected, openflags, mode);
62246+ wfd = sys_open((char __force_user *)collected, openflags, mode);
62247
62248 if (wfd >= 0) {
62249 sys_fchown(wfd, uid, gid);
62250@@ -317,17 +317,17 @@ static int __init do_name(void)
62251 }
62252 }
62253 } else if (S_ISDIR(mode)) {
62254- sys_mkdir(collected, mode);
62255- sys_chown(collected, uid, gid);
62256- sys_chmod(collected, mode);
62257+ sys_mkdir((char __force_user *)collected, mode);
62258+ sys_chown((char __force_user *)collected, uid, gid);
62259+ sys_chmod((char __force_user *)collected, mode);
62260 dir_add(collected, mtime);
62261 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
62262 S_ISFIFO(mode) || S_ISSOCK(mode)) {
62263 if (maybe_link() == 0) {
62264- sys_mknod(collected, mode, rdev);
62265- sys_chown(collected, uid, gid);
62266- sys_chmod(collected, mode);
62267- do_utime(collected, mtime);
62268+ sys_mknod((char __force_user *)collected, mode, rdev);
62269+ sys_chown((char __force_user *)collected, uid, gid);
62270+ sys_chmod((char __force_user *)collected, mode);
62271+ do_utime((char __force_user *)collected, mtime);
62272 }
62273 }
62274 return 0;
62275@@ -336,15 +336,15 @@ static int __init do_name(void)
62276 static int __init do_copy(void)
62277 {
62278 if (count >= body_len) {
62279- sys_write(wfd, victim, body_len);
62280+ sys_write(wfd, (char __force_user *)victim, body_len);
62281 sys_close(wfd);
62282- do_utime(vcollected, mtime);
62283+ do_utime((char __force_user *)vcollected, mtime);
62284 kfree(vcollected);
62285 eat(body_len);
62286 state = SkipIt;
62287 return 0;
62288 } else {
62289- sys_write(wfd, victim, count);
62290+ sys_write(wfd, (char __force_user *)victim, count);
62291 body_len -= count;
62292 eat(count);
62293 return 1;
62294@@ -355,9 +355,9 @@ static int __init do_symlink(void)
62295 {
62296 collected[N_ALIGN(name_len) + body_len] = '\0';
62297 clean_path(collected, 0);
62298- sys_symlink(collected + N_ALIGN(name_len), collected);
62299- sys_lchown(collected, uid, gid);
62300- do_utime(collected, mtime);
62301+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
62302+ sys_lchown((char __force_user *)collected, uid, gid);
62303+ do_utime((char __force_user *)collected, mtime);
62304 state = SkipIt;
62305 next_state = Reset;
62306 return 0;
62307diff --git a/init/main.c b/init/main.c
62308index 217ed23..ec5406f 100644
62309--- a/init/main.c
62310+++ b/init/main.c
62311@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
62312 extern void tc_init(void);
62313 #endif
62314
62315+extern void grsecurity_init(void);
62316+
62317 /*
62318 * Debug helper: via this flag we know that we are in 'early bootup code'
62319 * where only the boot processor is running with IRQ disabled. This means
62320@@ -149,6 +151,49 @@ static int __init set_reset_devices(char *str)
62321
62322 __setup("reset_devices", set_reset_devices);
62323
62324+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
62325+extern char pax_enter_kernel_user[];
62326+extern char pax_exit_kernel_user[];
62327+extern pgdval_t clone_pgd_mask;
62328+#endif
62329+
62330+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
62331+static int __init setup_pax_nouderef(char *str)
62332+{
62333+#ifdef CONFIG_X86_32
62334+ unsigned int cpu;
62335+ struct desc_struct *gdt;
62336+
62337+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
62338+ gdt = get_cpu_gdt_table(cpu);
62339+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
62340+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
62341+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
62342+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
62343+ }
62344+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
62345+#else
62346+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
62347+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
62348+ clone_pgd_mask = ~(pgdval_t)0UL;
62349+#endif
62350+
62351+ return 0;
62352+}
62353+early_param("pax_nouderef", setup_pax_nouderef);
62354+#endif
62355+
62356+#ifdef CONFIG_PAX_SOFTMODE
62357+int pax_softmode;
62358+
62359+static int __init setup_pax_softmode(char *str)
62360+{
62361+ get_option(&str, &pax_softmode);
62362+ return 1;
62363+}
62364+__setup("pax_softmode=", setup_pax_softmode);
62365+#endif
62366+
62367 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
62368 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
62369 static const char *panic_later, *panic_param;
62370@@ -681,6 +726,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
62371 {
62372 int count = preempt_count();
62373 int ret;
62374+ const char *msg1 = "", *msg2 = "";
62375
62376 if (initcall_debug)
62377 ret = do_one_initcall_debug(fn);
62378@@ -693,15 +739,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
62379 sprintf(msgbuf, "error code %d ", ret);
62380
62381 if (preempt_count() != count) {
62382- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
62383+ msg1 = " preemption imbalance";
62384 preempt_count() = count;
62385 }
62386 if (irqs_disabled()) {
62387- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
62388+ msg2 = " disabled interrupts";
62389 local_irq_enable();
62390 }
62391- if (msgbuf[0]) {
62392- printk("initcall %pF returned with %s\n", fn, msgbuf);
62393+ if (msgbuf[0] || *msg1 || *msg2) {
62394+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
62395 }
62396
62397 return ret;
62398@@ -820,7 +866,7 @@ static int __init kernel_init(void * unused)
62399 do_basic_setup();
62400
62401 /* Open the /dev/console on the rootfs, this should never fail */
62402- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
62403+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
62404 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
62405
62406 (void) sys_dup(0);
62407@@ -833,11 +879,13 @@ static int __init kernel_init(void * unused)
62408 if (!ramdisk_execute_command)
62409 ramdisk_execute_command = "/init";
62410
62411- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
62412+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
62413 ramdisk_execute_command = NULL;
62414 prepare_namespace();
62415 }
62416
62417+ grsecurity_init();
62418+
62419 /*
62420 * Ok, we have completed the initial bootup, and
62421 * we're essentially up and running. Get rid of the
62422diff --git a/ipc/mqueue.c b/ipc/mqueue.c
62423index 5b4293d..f179875 100644
62424--- a/ipc/mqueue.c
62425+++ b/ipc/mqueue.c
62426@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
62427 mq_bytes = (mq_msg_tblsz +
62428 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
62429
62430+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
62431 spin_lock(&mq_lock);
62432 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
62433 u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
62434diff --git a/ipc/msg.c b/ipc/msg.c
62435index 7385de2..a8180e0 100644
62436--- a/ipc/msg.c
62437+++ b/ipc/msg.c
62438@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
62439 return security_msg_queue_associate(msq, msgflg);
62440 }
62441
62442+static struct ipc_ops msg_ops = {
62443+ .getnew = newque,
62444+ .associate = msg_security,
62445+ .more_checks = NULL
62446+};
62447+
62448 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
62449 {
62450 struct ipc_namespace *ns;
62451- struct ipc_ops msg_ops;
62452 struct ipc_params msg_params;
62453
62454 ns = current->nsproxy->ipc_ns;
62455
62456- msg_ops.getnew = newque;
62457- msg_ops.associate = msg_security;
62458- msg_ops.more_checks = NULL;
62459-
62460 msg_params.key = key;
62461 msg_params.flg = msgflg;
62462
62463diff --git a/ipc/sem.c b/ipc/sem.c
62464index 5215a81..cfc0cac 100644
62465--- a/ipc/sem.c
62466+++ b/ipc/sem.c
62467@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
62468 return 0;
62469 }
62470
62471+static struct ipc_ops sem_ops = {
62472+ .getnew = newary,
62473+ .associate = sem_security,
62474+ .more_checks = sem_more_checks
62475+};
62476+
62477 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
62478 {
62479 struct ipc_namespace *ns;
62480- struct ipc_ops sem_ops;
62481 struct ipc_params sem_params;
62482
62483 ns = current->nsproxy->ipc_ns;
62484@@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
62485 if (nsems < 0 || nsems > ns->sc_semmsl)
62486 return -EINVAL;
62487
62488- sem_ops.getnew = newary;
62489- sem_ops.associate = sem_security;
62490- sem_ops.more_checks = sem_more_checks;
62491-
62492 sem_params.key = key;
62493 sem_params.flg = semflg;
62494 sem_params.u.nsems = nsems;
62495diff --git a/ipc/shm.c b/ipc/shm.c
62496index b76be5b..859e750 100644
62497--- a/ipc/shm.c
62498+++ b/ipc/shm.c
62499@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
62500 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
62501 #endif
62502
62503+#ifdef CONFIG_GRKERNSEC
62504+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
62505+ const time_t shm_createtime, const uid_t cuid,
62506+ const int shmid);
62507+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
62508+ const time_t shm_createtime);
62509+#endif
62510+
62511 void shm_init_ns(struct ipc_namespace *ns)
62512 {
62513 ns->shm_ctlmax = SHMMAX;
62514@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
62515 shp->shm_lprid = 0;
62516 shp->shm_atim = shp->shm_dtim = 0;
62517 shp->shm_ctim = get_seconds();
62518+#ifdef CONFIG_GRKERNSEC
62519+ {
62520+ struct timespec timeval;
62521+ do_posix_clock_monotonic_gettime(&timeval);
62522+
62523+ shp->shm_createtime = timeval.tv_sec;
62524+ }
62525+#endif
62526 shp->shm_segsz = size;
62527 shp->shm_nattch = 0;
62528 shp->shm_file = file;
62529@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
62530 return 0;
62531 }
62532
62533+static struct ipc_ops shm_ops = {
62534+ .getnew = newseg,
62535+ .associate = shm_security,
62536+ .more_checks = shm_more_checks
62537+};
62538+
62539 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
62540 {
62541 struct ipc_namespace *ns;
62542- struct ipc_ops shm_ops;
62543 struct ipc_params shm_params;
62544
62545 ns = current->nsproxy->ipc_ns;
62546
62547- shm_ops.getnew = newseg;
62548- shm_ops.associate = shm_security;
62549- shm_ops.more_checks = shm_more_checks;
62550-
62551 shm_params.key = key;
62552 shm_params.flg = shmflg;
62553 shm_params.u.size = size;
62554@@ -988,6 +1005,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
62555 f_mode = FMODE_READ | FMODE_WRITE;
62556 }
62557 if (shmflg & SHM_EXEC) {
62558+
62559+#ifdef CONFIG_PAX_MPROTECT
62560+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
62561+ goto out;
62562+#endif
62563+
62564 prot |= PROT_EXEC;
62565 acc_mode |= S_IXUGO;
62566 }
62567@@ -1011,9 +1034,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
62568 if (err)
62569 goto out_unlock;
62570
62571+#ifdef CONFIG_GRKERNSEC
62572+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
62573+ shp->shm_perm.cuid, shmid) ||
62574+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
62575+ err = -EACCES;
62576+ goto out_unlock;
62577+ }
62578+#endif
62579+
62580 path = shp->shm_file->f_path;
62581 path_get(&path);
62582 shp->shm_nattch++;
62583+#ifdef CONFIG_GRKERNSEC
62584+ shp->shm_lapid = current->pid;
62585+#endif
62586 size = i_size_read(path.dentry->d_inode);
62587 shm_unlock(shp);
62588
62589diff --git a/kernel/acct.c b/kernel/acct.c
62590index fa7eb3d..7faf116 100644
62591--- a/kernel/acct.c
62592+++ b/kernel/acct.c
62593@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
62594 */
62595 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
62596 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
62597- file->f_op->write(file, (char *)&ac,
62598+ file->f_op->write(file, (char __force_user *)&ac,
62599 sizeof(acct_t), &file->f_pos);
62600 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
62601 set_fs(fs);
62602diff --git a/kernel/audit.c b/kernel/audit.c
62603index 09fae26..ed71d5b 100644
62604--- a/kernel/audit.c
62605+++ b/kernel/audit.c
62606@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
62607 3) suppressed due to audit_rate_limit
62608 4) suppressed due to audit_backlog_limit
62609 */
62610-static atomic_t audit_lost = ATOMIC_INIT(0);
62611+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
62612
62613 /* The netlink socket. */
62614 static struct sock *audit_sock;
62615@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
62616 unsigned long now;
62617 int print;
62618
62619- atomic_inc(&audit_lost);
62620+ atomic_inc_unchecked(&audit_lost);
62621
62622 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
62623
62624@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
62625 printk(KERN_WARNING
62626 "audit: audit_lost=%d audit_rate_limit=%d "
62627 "audit_backlog_limit=%d\n",
62628- atomic_read(&audit_lost),
62629+ atomic_read_unchecked(&audit_lost),
62630 audit_rate_limit,
62631 audit_backlog_limit);
62632 audit_panic(message);
62633@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
62634 status_set.pid = audit_pid;
62635 status_set.rate_limit = audit_rate_limit;
62636 status_set.backlog_limit = audit_backlog_limit;
62637- status_set.lost = atomic_read(&audit_lost);
62638+ status_set.lost = atomic_read_unchecked(&audit_lost);
62639 status_set.backlog = skb_queue_len(&audit_skb_queue);
62640 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
62641 &status_set, sizeof(status_set));
62642@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
62643 avail = audit_expand(ab,
62644 max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
62645 if (!avail)
62646- goto out;
62647+ goto out_va_end;
62648 len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
62649 }
62650- va_end(args2);
62651 if (len > 0)
62652 skb_put(skb, len);
62653+out_va_end:
62654+ va_end(args2);
62655 out:
62656 return;
62657 }
62658diff --git a/kernel/auditsc.c b/kernel/auditsc.c
62659index 47b7fc1..c003c33 100644
62660--- a/kernel/auditsc.c
62661+++ b/kernel/auditsc.c
62662@@ -1166,8 +1166,8 @@ static void audit_log_execve_info(struct audit_context *context,
62663 struct audit_buffer **ab,
62664 struct audit_aux_data_execve *axi)
62665 {
62666- int i;
62667- size_t len, len_sent = 0;
62668+ int i, len;
62669+ size_t len_sent = 0;
62670 const char __user *p;
62671 char *buf;
62672
62673@@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
62674 }
62675
62676 /* global counter which is incremented every time something logs in */
62677-static atomic_t session_id = ATOMIC_INIT(0);
62678+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
62679
62680 /**
62681 * audit_set_loginuid - set a task's audit_context loginuid
62682@@ -2131,7 +2131,7 @@ static atomic_t session_id = ATOMIC_INIT(0);
62683 */
62684 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
62685 {
62686- unsigned int sessionid = atomic_inc_return(&session_id);
62687+ unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
62688 struct audit_context *context = task->audit_context;
62689
62690 if (context && context->in_syscall) {
62691diff --git a/kernel/capability.c b/kernel/capability.c
62692index b463871..fa3ea1f 100644
62693--- a/kernel/capability.c
62694+++ b/kernel/capability.c
62695@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
62696 * before modification is attempted and the application
62697 * fails.
62698 */
62699+ if (tocopy > ARRAY_SIZE(kdata))
62700+ return -EFAULT;
62701+
62702 if (copy_to_user(dataptr, kdata, tocopy
62703 * sizeof(struct __user_cap_data_struct))) {
62704 return -EFAULT;
62705@@ -374,7 +377,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
62706 BUG();
62707 }
62708
62709- if (security_capable(ns, current_cred(), cap) == 0) {
62710+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable(cap)) {
62711 current->flags |= PF_SUPERPRIV;
62712 return true;
62713 }
62714@@ -382,6 +385,27 @@ bool ns_capable(struct user_namespace *ns, int cap)
62715 }
62716 EXPORT_SYMBOL(ns_capable);
62717
62718+bool ns_capable_nolog(struct user_namespace *ns, int cap)
62719+{
62720+ if (unlikely(!cap_valid(cap))) {
62721+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
62722+ BUG();
62723+ }
62724+
62725+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
62726+ current->flags |= PF_SUPERPRIV;
62727+ return true;
62728+ }
62729+ return false;
62730+}
62731+EXPORT_SYMBOL(ns_capable_nolog);
62732+
62733+bool capable_nolog(int cap)
62734+{
62735+ return ns_capable_nolog(&init_user_ns, cap);
62736+}
62737+EXPORT_SYMBOL(capable_nolog);
62738+
62739 /**
62740 * task_ns_capable - Determine whether current task has a superior
62741 * capability targeted at a specific task's user namespace.
62742@@ -396,6 +420,12 @@ bool task_ns_capable(struct task_struct *t, int cap)
62743 }
62744 EXPORT_SYMBOL(task_ns_capable);
62745
62746+bool task_ns_capable_nolog(struct task_struct *t, int cap)
62747+{
62748+ return ns_capable_nolog(task_cred_xxx(t, user)->user_ns, cap);
62749+}
62750+EXPORT_SYMBOL(task_ns_capable_nolog);
62751+
62752 /**
62753 * nsown_capable - Check superior capability to one's own user_ns
62754 * @cap: The capability in question
62755diff --git a/kernel/compat.c b/kernel/compat.c
62756index f346ced..aa2b1f4 100644
62757--- a/kernel/compat.c
62758+++ b/kernel/compat.c
62759@@ -13,6 +13,7 @@
62760
62761 #include <linux/linkage.h>
62762 #include <linux/compat.h>
62763+#include <linux/module.h>
62764 #include <linux/errno.h>
62765 #include <linux/time.h>
62766 #include <linux/signal.h>
62767@@ -168,7 +169,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
62768 mm_segment_t oldfs;
62769 long ret;
62770
62771- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
62772+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
62773 oldfs = get_fs();
62774 set_fs(KERNEL_DS);
62775 ret = hrtimer_nanosleep_restart(restart);
62776@@ -200,7 +201,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
62777 oldfs = get_fs();
62778 set_fs(KERNEL_DS);
62779 ret = hrtimer_nanosleep(&tu,
62780- rmtp ? (struct timespec __user *)&rmt : NULL,
62781+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
62782 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
62783 set_fs(oldfs);
62784
62785@@ -309,7 +310,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
62786 mm_segment_t old_fs = get_fs();
62787
62788 set_fs(KERNEL_DS);
62789- ret = sys_sigpending((old_sigset_t __user *) &s);
62790+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
62791 set_fs(old_fs);
62792 if (ret == 0)
62793 ret = put_user(s, set);
62794@@ -332,8 +333,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
62795 old_fs = get_fs();
62796 set_fs(KERNEL_DS);
62797 ret = sys_sigprocmask(how,
62798- set ? (old_sigset_t __user *) &s : NULL,
62799- oset ? (old_sigset_t __user *) &s : NULL);
62800+ set ? (old_sigset_t __force_user *) &s : NULL,
62801+ oset ? (old_sigset_t __force_user *) &s : NULL);
62802 set_fs(old_fs);
62803 if (ret == 0)
62804 if (oset)
62805@@ -370,7 +371,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
62806 mm_segment_t old_fs = get_fs();
62807
62808 set_fs(KERNEL_DS);
62809- ret = sys_old_getrlimit(resource, &r);
62810+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
62811 set_fs(old_fs);
62812
62813 if (!ret) {
62814@@ -442,7 +443,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
62815 mm_segment_t old_fs = get_fs();
62816
62817 set_fs(KERNEL_DS);
62818- ret = sys_getrusage(who, (struct rusage __user *) &r);
62819+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
62820 set_fs(old_fs);
62821
62822 if (ret)
62823@@ -469,8 +470,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
62824 set_fs (KERNEL_DS);
62825 ret = sys_wait4(pid,
62826 (stat_addr ?
62827- (unsigned int __user *) &status : NULL),
62828- options, (struct rusage __user *) &r);
62829+ (unsigned int __force_user *) &status : NULL),
62830+ options, (struct rusage __force_user *) &r);
62831 set_fs (old_fs);
62832
62833 if (ret > 0) {
62834@@ -495,8 +496,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
62835 memset(&info, 0, sizeof(info));
62836
62837 set_fs(KERNEL_DS);
62838- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
62839- uru ? (struct rusage __user *)&ru : NULL);
62840+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
62841+ uru ? (struct rusage __force_user *)&ru : NULL);
62842 set_fs(old_fs);
62843
62844 if ((ret < 0) || (info.si_signo == 0))
62845@@ -626,8 +627,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
62846 oldfs = get_fs();
62847 set_fs(KERNEL_DS);
62848 err = sys_timer_settime(timer_id, flags,
62849- (struct itimerspec __user *) &newts,
62850- (struct itimerspec __user *) &oldts);
62851+ (struct itimerspec __force_user *) &newts,
62852+ (struct itimerspec __force_user *) &oldts);
62853 set_fs(oldfs);
62854 if (!err && old && put_compat_itimerspec(old, &oldts))
62855 return -EFAULT;
62856@@ -644,7 +645,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
62857 oldfs = get_fs();
62858 set_fs(KERNEL_DS);
62859 err = sys_timer_gettime(timer_id,
62860- (struct itimerspec __user *) &ts);
62861+ (struct itimerspec __force_user *) &ts);
62862 set_fs(oldfs);
62863 if (!err && put_compat_itimerspec(setting, &ts))
62864 return -EFAULT;
62865@@ -663,7 +664,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
62866 oldfs = get_fs();
62867 set_fs(KERNEL_DS);
62868 err = sys_clock_settime(which_clock,
62869- (struct timespec __user *) &ts);
62870+ (struct timespec __force_user *) &ts);
62871 set_fs(oldfs);
62872 return err;
62873 }
62874@@ -678,7 +679,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
62875 oldfs = get_fs();
62876 set_fs(KERNEL_DS);
62877 err = sys_clock_gettime(which_clock,
62878- (struct timespec __user *) &ts);
62879+ (struct timespec __force_user *) &ts);
62880 set_fs(oldfs);
62881 if (!err && put_compat_timespec(&ts, tp))
62882 return -EFAULT;
62883@@ -698,7 +699,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
62884
62885 oldfs = get_fs();
62886 set_fs(KERNEL_DS);
62887- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
62888+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
62889 set_fs(oldfs);
62890
62891 err = compat_put_timex(utp, &txc);
62892@@ -718,7 +719,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
62893 oldfs = get_fs();
62894 set_fs(KERNEL_DS);
62895 err = sys_clock_getres(which_clock,
62896- (struct timespec __user *) &ts);
62897+ (struct timespec __force_user *) &ts);
62898 set_fs(oldfs);
62899 if (!err && tp && put_compat_timespec(&ts, tp))
62900 return -EFAULT;
62901@@ -730,9 +731,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
62902 long err;
62903 mm_segment_t oldfs;
62904 struct timespec tu;
62905- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
62906+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
62907
62908- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
62909+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
62910 oldfs = get_fs();
62911 set_fs(KERNEL_DS);
62912 err = clock_nanosleep_restart(restart);
62913@@ -764,8 +765,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
62914 oldfs = get_fs();
62915 set_fs(KERNEL_DS);
62916 err = sys_clock_nanosleep(which_clock, flags,
62917- (struct timespec __user *) &in,
62918- (struct timespec __user *) &out);
62919+ (struct timespec __force_user *) &in,
62920+ (struct timespec __force_user *) &out);
62921 set_fs(oldfs);
62922
62923 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
62924diff --git a/kernel/configs.c b/kernel/configs.c
62925index 42e8fa0..9e7406b 100644
62926--- a/kernel/configs.c
62927+++ b/kernel/configs.c
62928@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
62929 struct proc_dir_entry *entry;
62930
62931 /* create the current config file */
62932+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
62933+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
62934+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
62935+ &ikconfig_file_ops);
62936+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
62937+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
62938+ &ikconfig_file_ops);
62939+#endif
62940+#else
62941 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
62942 &ikconfig_file_ops);
62943+#endif
62944+
62945 if (!entry)
62946 return -ENOMEM;
62947
62948diff --git a/kernel/cred.c b/kernel/cred.c
62949index 5791612..a3c04dc 100644
62950--- a/kernel/cred.c
62951+++ b/kernel/cred.c
62952@@ -204,6 +204,15 @@ void exit_creds(struct task_struct *tsk)
62953 validate_creds(cred);
62954 put_cred(cred);
62955 }
62956+
62957+#ifdef CONFIG_GRKERNSEC_SETXID
62958+ cred = (struct cred *) tsk->delayed_cred;
62959+ if (cred) {
62960+ tsk->delayed_cred = NULL;
62961+ validate_creds(cred);
62962+ put_cred(cred);
62963+ }
62964+#endif
62965 }
62966
62967 /**
62968@@ -470,7 +479,7 @@ error_put:
62969 * Always returns 0 thus allowing this function to be tail-called at the end
62970 * of, say, sys_setgid().
62971 */
62972-int commit_creds(struct cred *new)
62973+static int __commit_creds(struct cred *new)
62974 {
62975 struct task_struct *task = current;
62976 const struct cred *old = task->real_cred;
62977@@ -489,6 +498,8 @@ int commit_creds(struct cred *new)
62978
62979 get_cred(new); /* we will require a ref for the subj creds too */
62980
62981+ gr_set_role_label(task, new->uid, new->gid);
62982+
62983 /* dumpability changes */
62984 if (old->euid != new->euid ||
62985 old->egid != new->egid ||
62986@@ -538,6 +549,92 @@ int commit_creds(struct cred *new)
62987 put_cred(old);
62988 return 0;
62989 }
62990+#ifdef CONFIG_GRKERNSEC_SETXID
62991+extern int set_user(struct cred *new);
62992+
62993+void gr_delayed_cred_worker(void)
62994+{
62995+ const struct cred *new = current->delayed_cred;
62996+ struct cred *ncred;
62997+
62998+ current->delayed_cred = NULL;
62999+
63000+ if (current_uid() && new != NULL) {
63001+ // from doing get_cred on it when queueing this
63002+ put_cred(new);
63003+ return;
63004+ } else if (new == NULL)
63005+ return;
63006+
63007+ ncred = prepare_creds();
63008+ if (!ncred)
63009+ goto die;
63010+ // uids
63011+ ncred->uid = new->uid;
63012+ ncred->euid = new->euid;
63013+ ncred->suid = new->suid;
63014+ ncred->fsuid = new->fsuid;
63015+ // gids
63016+ ncred->gid = new->gid;
63017+ ncred->egid = new->egid;
63018+ ncred->sgid = new->sgid;
63019+ ncred->fsgid = new->fsgid;
63020+ // groups
63021+ if (set_groups(ncred, new->group_info) < 0) {
63022+ abort_creds(ncred);
63023+ goto die;
63024+ }
63025+ // caps
63026+ ncred->securebits = new->securebits;
63027+ ncred->cap_inheritable = new->cap_inheritable;
63028+ ncred->cap_permitted = new->cap_permitted;
63029+ ncred->cap_effective = new->cap_effective;
63030+ ncred->cap_bset = new->cap_bset;
63031+
63032+ if (set_user(ncred)) {
63033+ abort_creds(ncred);
63034+ goto die;
63035+ }
63036+
63037+ // from doing get_cred on it when queueing this
63038+ put_cred(new);
63039+
63040+ __commit_creds(ncred);
63041+ return;
63042+die:
63043+ // from doing get_cred on it when queueing this
63044+ put_cred(new);
63045+ do_group_exit(SIGKILL);
63046+}
63047+#endif
63048+
63049+int commit_creds(struct cred *new)
63050+{
63051+#ifdef CONFIG_GRKERNSEC_SETXID
63052+ struct task_struct *t;
63053+
63054+ /* we won't get called with tasklist_lock held for writing
63055+ and interrupts disabled as the cred struct in that case is
63056+ init_cred
63057+ */
63058+ if (grsec_enable_setxid && !current_is_single_threaded() &&
63059+ !current_uid() && new->uid) {
63060+ rcu_read_lock();
63061+ read_lock(&tasklist_lock);
63062+ for (t = next_thread(current); t != current;
63063+ t = next_thread(t)) {
63064+ if (t->delayed_cred == NULL) {
63065+ t->delayed_cred = get_cred(new);
63066+ set_tsk_need_resched(t);
63067+ }
63068+ }
63069+ read_unlock(&tasklist_lock);
63070+ rcu_read_unlock();
63071+ }
63072+#endif
63073+ return __commit_creds(new);
63074+}
63075+
63076 EXPORT_SYMBOL(commit_creds);
63077
63078 /**
63079diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
63080index 0d7c087..01b8cef 100644
63081--- a/kernel/debug/debug_core.c
63082+++ b/kernel/debug/debug_core.c
63083@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
63084 */
63085 static atomic_t masters_in_kgdb;
63086 static atomic_t slaves_in_kgdb;
63087-static atomic_t kgdb_break_tasklet_var;
63088+static atomic_unchecked_t kgdb_break_tasklet_var;
63089 atomic_t kgdb_setting_breakpoint;
63090
63091 struct task_struct *kgdb_usethread;
63092@@ -129,7 +129,7 @@ int kgdb_single_step;
63093 static pid_t kgdb_sstep_pid;
63094
63095 /* to keep track of the CPU which is doing the single stepping*/
63096-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
63097+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
63098
63099 /*
63100 * If you are debugging a problem where roundup (the collection of
63101@@ -542,7 +542,7 @@ return_normal:
63102 * kernel will only try for the value of sstep_tries before
63103 * giving up and continuing on.
63104 */
63105- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
63106+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
63107 (kgdb_info[cpu].task &&
63108 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
63109 atomic_set(&kgdb_active, -1);
63110@@ -636,8 +636,8 @@ cpu_master_loop:
63111 }
63112
63113 kgdb_restore:
63114- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
63115- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
63116+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
63117+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
63118 if (kgdb_info[sstep_cpu].task)
63119 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
63120 else
63121@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(void)
63122 static void kgdb_tasklet_bpt(unsigned long ing)
63123 {
63124 kgdb_breakpoint();
63125- atomic_set(&kgdb_break_tasklet_var, 0);
63126+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
63127 }
63128
63129 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
63130
63131 void kgdb_schedule_breakpoint(void)
63132 {
63133- if (atomic_read(&kgdb_break_tasklet_var) ||
63134+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
63135 atomic_read(&kgdb_active) != -1 ||
63136 atomic_read(&kgdb_setting_breakpoint))
63137 return;
63138- atomic_inc(&kgdb_break_tasklet_var);
63139+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
63140 tasklet_schedule(&kgdb_tasklet_breakpoint);
63141 }
63142 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
63143diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
63144index 63786e7..0780cac 100644
63145--- a/kernel/debug/kdb/kdb_main.c
63146+++ b/kernel/debug/kdb/kdb_main.c
63147@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
63148 list_for_each_entry(mod, kdb_modules, list) {
63149
63150 kdb_printf("%-20s%8u 0x%p ", mod->name,
63151- mod->core_size, (void *)mod);
63152+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
63153 #ifdef CONFIG_MODULE_UNLOAD
63154 kdb_printf("%4d ", module_refcount(mod));
63155 #endif
63156@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
63157 kdb_printf(" (Loading)");
63158 else
63159 kdb_printf(" (Live)");
63160- kdb_printf(" 0x%p", mod->module_core);
63161+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
63162
63163 #ifdef CONFIG_MODULE_UNLOAD
63164 {
63165diff --git a/kernel/events/core.c b/kernel/events/core.c
63166index 58690af..d903d75 100644
63167--- a/kernel/events/core.c
63168+++ b/kernel/events/core.c
63169@@ -173,7 +173,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
63170 return 0;
63171 }
63172
63173-static atomic64_t perf_event_id;
63174+static atomic64_unchecked_t perf_event_id;
63175
63176 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
63177 enum event_type_t event_type);
63178@@ -2540,7 +2540,7 @@ static void __perf_event_read(void *info)
63179
63180 static inline u64 perf_event_count(struct perf_event *event)
63181 {
63182- return local64_read(&event->count) + atomic64_read(&event->child_count);
63183+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
63184 }
63185
63186 static u64 perf_event_read(struct perf_event *event)
63187@@ -3065,9 +3065,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
63188 mutex_lock(&event->child_mutex);
63189 total += perf_event_read(event);
63190 *enabled += event->total_time_enabled +
63191- atomic64_read(&event->child_total_time_enabled);
63192+ atomic64_read_unchecked(&event->child_total_time_enabled);
63193 *running += event->total_time_running +
63194- atomic64_read(&event->child_total_time_running);
63195+ atomic64_read_unchecked(&event->child_total_time_running);
63196
63197 list_for_each_entry(child, &event->child_list, child_list) {
63198 total += perf_event_read(child);
63199@@ -3474,10 +3474,10 @@ void perf_event_update_userpage(struct perf_event *event)
63200 userpg->offset -= local64_read(&event->hw.prev_count);
63201
63202 userpg->time_enabled = enabled +
63203- atomic64_read(&event->child_total_time_enabled);
63204+ atomic64_read_unchecked(&event->child_total_time_enabled);
63205
63206 userpg->time_running = running +
63207- atomic64_read(&event->child_total_time_running);
63208+ atomic64_read_unchecked(&event->child_total_time_running);
63209
63210 barrier();
63211 ++userpg->lock;
63212@@ -3906,11 +3906,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
63213 values[n++] = perf_event_count(event);
63214 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
63215 values[n++] = enabled +
63216- atomic64_read(&event->child_total_time_enabled);
63217+ atomic64_read_unchecked(&event->child_total_time_enabled);
63218 }
63219 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
63220 values[n++] = running +
63221- atomic64_read(&event->child_total_time_running);
63222+ atomic64_read_unchecked(&event->child_total_time_running);
63223 }
63224 if (read_format & PERF_FORMAT_ID)
63225 values[n++] = primary_event_id(event);
63226@@ -4561,12 +4561,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
63227 * need to add enough zero bytes after the string to handle
63228 * the 64bit alignment we do later.
63229 */
63230- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
63231+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
63232 if (!buf) {
63233 name = strncpy(tmp, "//enomem", sizeof(tmp));
63234 goto got_name;
63235 }
63236- name = d_path(&file->f_path, buf, PATH_MAX);
63237+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
63238 if (IS_ERR(name)) {
63239 name = strncpy(tmp, "//toolong", sizeof(tmp));
63240 goto got_name;
63241@@ -5921,7 +5921,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
63242 event->parent = parent_event;
63243
63244 event->ns = get_pid_ns(current->nsproxy->pid_ns);
63245- event->id = atomic64_inc_return(&perf_event_id);
63246+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
63247
63248 event->state = PERF_EVENT_STATE_INACTIVE;
63249
63250@@ -6443,10 +6443,10 @@ static void sync_child_event(struct perf_event *child_event,
63251 /*
63252 * Add back the child's count to the parent's count:
63253 */
63254- atomic64_add(child_val, &parent_event->child_count);
63255- atomic64_add(child_event->total_time_enabled,
63256+ atomic64_add_unchecked(child_val, &parent_event->child_count);
63257+ atomic64_add_unchecked(child_event->total_time_enabled,
63258 &parent_event->child_total_time_enabled);
63259- atomic64_add(child_event->total_time_running,
63260+ atomic64_add_unchecked(child_event->total_time_running,
63261 &parent_event->child_total_time_running);
63262
63263 /*
63264diff --git a/kernel/exit.c b/kernel/exit.c
63265index e6e01b9..619f837 100644
63266--- a/kernel/exit.c
63267+++ b/kernel/exit.c
63268@@ -57,6 +57,10 @@
63269 #include <asm/pgtable.h>
63270 #include <asm/mmu_context.h>
63271
63272+#ifdef CONFIG_GRKERNSEC
63273+extern rwlock_t grsec_exec_file_lock;
63274+#endif
63275+
63276 static void exit_mm(struct task_struct * tsk);
63277
63278 static void __unhash_process(struct task_struct *p, bool group_dead)
63279@@ -168,6 +172,10 @@ void release_task(struct task_struct * p)
63280 struct task_struct *leader;
63281 int zap_leader;
63282 repeat:
63283+#ifdef CONFIG_NET
63284+ gr_del_task_from_ip_table(p);
63285+#endif
63286+
63287 /* don't need to get the RCU readlock here - the process is dead and
63288 * can't be modifying its own credentials. But shut RCU-lockdep up */
63289 rcu_read_lock();
63290@@ -380,7 +388,7 @@ int allow_signal(int sig)
63291 * know it'll be handled, so that they don't get converted to
63292 * SIGKILL or just silently dropped.
63293 */
63294- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
63295+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
63296 recalc_sigpending();
63297 spin_unlock_irq(&current->sighand->siglock);
63298 return 0;
63299@@ -416,6 +424,17 @@ void daemonize(const char *name, ...)
63300 vsnprintf(current->comm, sizeof(current->comm), name, args);
63301 va_end(args);
63302
63303+#ifdef CONFIG_GRKERNSEC
63304+ write_lock(&grsec_exec_file_lock);
63305+ if (current->exec_file) {
63306+ fput(current->exec_file);
63307+ current->exec_file = NULL;
63308+ }
63309+ write_unlock(&grsec_exec_file_lock);
63310+#endif
63311+
63312+ gr_set_kernel_label(current);
63313+
63314 /*
63315 * If we were started as result of loading a module, close all of the
63316 * user space pages. We don't need them, and if we didn't close them
63317@@ -893,6 +912,8 @@ NORET_TYPE void do_exit(long code)
63318 struct task_struct *tsk = current;
63319 int group_dead;
63320
63321+ set_fs(USER_DS);
63322+
63323 profile_task_exit(tsk);
63324
63325 WARN_ON(blk_needs_flush_plug(tsk));
63326@@ -909,7 +930,6 @@ NORET_TYPE void do_exit(long code)
63327 * mm_release()->clear_child_tid() from writing to a user-controlled
63328 * kernel address.
63329 */
63330- set_fs(USER_DS);
63331
63332 ptrace_event(PTRACE_EVENT_EXIT, code);
63333
63334@@ -971,6 +991,9 @@ NORET_TYPE void do_exit(long code)
63335 tsk->exit_code = code;
63336 taskstats_exit(tsk, group_dead);
63337
63338+ gr_acl_handle_psacct(tsk, code);
63339+ gr_acl_handle_exit();
63340+
63341 exit_mm(tsk);
63342
63343 if (group_dead)
63344diff --git a/kernel/fork.c b/kernel/fork.c
63345index da4a6a1..0483b61 100644
63346--- a/kernel/fork.c
63347+++ b/kernel/fork.c
63348@@ -280,7 +280,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
63349 *stackend = STACK_END_MAGIC; /* for overflow detection */
63350
63351 #ifdef CONFIG_CC_STACKPROTECTOR
63352- tsk->stack_canary = get_random_int();
63353+ tsk->stack_canary = pax_get_random_long();
63354 #endif
63355
63356 /*
63357@@ -304,13 +304,77 @@ out:
63358 }
63359
63360 #ifdef CONFIG_MMU
63361+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
63362+{
63363+ struct vm_area_struct *tmp;
63364+ unsigned long charge;
63365+ struct mempolicy *pol;
63366+ struct file *file;
63367+
63368+ charge = 0;
63369+ if (mpnt->vm_flags & VM_ACCOUNT) {
63370+ unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
63371+ if (security_vm_enough_memory(len))
63372+ goto fail_nomem;
63373+ charge = len;
63374+ }
63375+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
63376+ if (!tmp)
63377+ goto fail_nomem;
63378+ *tmp = *mpnt;
63379+ tmp->vm_mm = mm;
63380+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
63381+ pol = mpol_dup(vma_policy(mpnt));
63382+ if (IS_ERR(pol))
63383+ goto fail_nomem_policy;
63384+ vma_set_policy(tmp, pol);
63385+ if (anon_vma_fork(tmp, mpnt))
63386+ goto fail_nomem_anon_vma_fork;
63387+ tmp->vm_flags &= ~VM_LOCKED;
63388+ tmp->vm_next = tmp->vm_prev = NULL;
63389+ tmp->vm_mirror = NULL;
63390+ file = tmp->vm_file;
63391+ if (file) {
63392+ struct inode *inode = file->f_path.dentry->d_inode;
63393+ struct address_space *mapping = file->f_mapping;
63394+
63395+ get_file(file);
63396+ if (tmp->vm_flags & VM_DENYWRITE)
63397+ atomic_dec(&inode->i_writecount);
63398+ mutex_lock(&mapping->i_mmap_mutex);
63399+ if (tmp->vm_flags & VM_SHARED)
63400+ mapping->i_mmap_writable++;
63401+ flush_dcache_mmap_lock(mapping);
63402+ /* insert tmp into the share list, just after mpnt */
63403+ vma_prio_tree_add(tmp, mpnt);
63404+ flush_dcache_mmap_unlock(mapping);
63405+ mutex_unlock(&mapping->i_mmap_mutex);
63406+ }
63407+
63408+ /*
63409+ * Clear hugetlb-related page reserves for children. This only
63410+ * affects MAP_PRIVATE mappings. Faults generated by the child
63411+ * are not guaranteed to succeed, even if read-only
63412+ */
63413+ if (is_vm_hugetlb_page(tmp))
63414+ reset_vma_resv_huge_pages(tmp);
63415+
63416+ return tmp;
63417+
63418+fail_nomem_anon_vma_fork:
63419+ mpol_put(pol);
63420+fail_nomem_policy:
63421+ kmem_cache_free(vm_area_cachep, tmp);
63422+fail_nomem:
63423+ vm_unacct_memory(charge);
63424+ return NULL;
63425+}
63426+
63427 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63428 {
63429 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
63430 struct rb_node **rb_link, *rb_parent;
63431 int retval;
63432- unsigned long charge;
63433- struct mempolicy *pol;
63434
63435 down_write(&oldmm->mmap_sem);
63436 flush_cache_dup_mm(oldmm);
63437@@ -322,8 +386,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63438 mm->locked_vm = 0;
63439 mm->mmap = NULL;
63440 mm->mmap_cache = NULL;
63441- mm->free_area_cache = oldmm->mmap_base;
63442- mm->cached_hole_size = ~0UL;
63443+ mm->free_area_cache = oldmm->free_area_cache;
63444+ mm->cached_hole_size = oldmm->cached_hole_size;
63445 mm->map_count = 0;
63446 cpumask_clear(mm_cpumask(mm));
63447 mm->mm_rb = RB_ROOT;
63448@@ -339,8 +403,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63449
63450 prev = NULL;
63451 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
63452- struct file *file;
63453-
63454 if (mpnt->vm_flags & VM_DONTCOPY) {
63455 long pages = vma_pages(mpnt);
63456 mm->total_vm -= pages;
63457@@ -348,53 +410,11 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63458 -pages);
63459 continue;
63460 }
63461- charge = 0;
63462- if (mpnt->vm_flags & VM_ACCOUNT) {
63463- unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
63464- if (security_vm_enough_memory(len))
63465- goto fail_nomem;
63466- charge = len;
63467+ tmp = dup_vma(mm, mpnt);
63468+ if (!tmp) {
63469+ retval = -ENOMEM;
63470+ goto out;
63471 }
63472- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
63473- if (!tmp)
63474- goto fail_nomem;
63475- *tmp = *mpnt;
63476- INIT_LIST_HEAD(&tmp->anon_vma_chain);
63477- pol = mpol_dup(vma_policy(mpnt));
63478- retval = PTR_ERR(pol);
63479- if (IS_ERR(pol))
63480- goto fail_nomem_policy;
63481- vma_set_policy(tmp, pol);
63482- tmp->vm_mm = mm;
63483- if (anon_vma_fork(tmp, mpnt))
63484- goto fail_nomem_anon_vma_fork;
63485- tmp->vm_flags &= ~VM_LOCKED;
63486- tmp->vm_next = tmp->vm_prev = NULL;
63487- file = tmp->vm_file;
63488- if (file) {
63489- struct inode *inode = file->f_path.dentry->d_inode;
63490- struct address_space *mapping = file->f_mapping;
63491-
63492- get_file(file);
63493- if (tmp->vm_flags & VM_DENYWRITE)
63494- atomic_dec(&inode->i_writecount);
63495- mutex_lock(&mapping->i_mmap_mutex);
63496- if (tmp->vm_flags & VM_SHARED)
63497- mapping->i_mmap_writable++;
63498- flush_dcache_mmap_lock(mapping);
63499- /* insert tmp into the share list, just after mpnt */
63500- vma_prio_tree_add(tmp, mpnt);
63501- flush_dcache_mmap_unlock(mapping);
63502- mutex_unlock(&mapping->i_mmap_mutex);
63503- }
63504-
63505- /*
63506- * Clear hugetlb-related page reserves for children. This only
63507- * affects MAP_PRIVATE mappings. Faults generated by the child
63508- * are not guaranteed to succeed, even if read-only
63509- */
63510- if (is_vm_hugetlb_page(tmp))
63511- reset_vma_resv_huge_pages(tmp);
63512
63513 /*
63514 * Link in the new vma and copy the page table entries.
63515@@ -417,6 +437,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
63516 if (retval)
63517 goto out;
63518 }
63519+
63520+#ifdef CONFIG_PAX_SEGMEXEC
63521+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
63522+ struct vm_area_struct *mpnt_m;
63523+
63524+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
63525+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
63526+
63527+ if (!mpnt->vm_mirror)
63528+ continue;
63529+
63530+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
63531+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
63532+ mpnt->vm_mirror = mpnt_m;
63533+ } else {
63534+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
63535+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
63536+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
63537+ mpnt->vm_mirror->vm_mirror = mpnt;
63538+ }
63539+ }
63540+ BUG_ON(mpnt_m);
63541+ }
63542+#endif
63543+
63544 /* a new mm has just been created */
63545 arch_dup_mmap(oldmm, mm);
63546 retval = 0;
63547@@ -425,14 +470,6 @@ out:
63548 flush_tlb_mm(oldmm);
63549 up_write(&oldmm->mmap_sem);
63550 return retval;
63551-fail_nomem_anon_vma_fork:
63552- mpol_put(pol);
63553-fail_nomem_policy:
63554- kmem_cache_free(vm_area_cachep, tmp);
63555-fail_nomem:
63556- retval = -ENOMEM;
63557- vm_unacct_memory(charge);
63558- goto out;
63559 }
63560
63561 static inline int mm_alloc_pgd(struct mm_struct *mm)
63562@@ -644,6 +681,26 @@ struct mm_struct *get_task_mm(struct task_struct *task)
63563 }
63564 EXPORT_SYMBOL_GPL(get_task_mm);
63565
63566+struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
63567+{
63568+ struct mm_struct *mm;
63569+ int err;
63570+
63571+ err = mutex_lock_killable(&task->signal->cred_guard_mutex);
63572+ if (err)
63573+ return ERR_PTR(err);
63574+
63575+ mm = get_task_mm(task);
63576+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
63577+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
63578+ mmput(mm);
63579+ mm = ERR_PTR(-EACCES);
63580+ }
63581+ mutex_unlock(&task->signal->cred_guard_mutex);
63582+
63583+ return mm;
63584+}
63585+
63586 /* Please note the differences between mmput and mm_release.
63587 * mmput is called whenever we stop holding onto a mm_struct,
63588 * error success whatever.
63589@@ -829,13 +886,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
63590 spin_unlock(&fs->lock);
63591 return -EAGAIN;
63592 }
63593- fs->users++;
63594+ atomic_inc(&fs->users);
63595 spin_unlock(&fs->lock);
63596 return 0;
63597 }
63598 tsk->fs = copy_fs_struct(fs);
63599 if (!tsk->fs)
63600 return -ENOMEM;
63601+ gr_set_chroot_entries(tsk, &tsk->fs->root);
63602 return 0;
63603 }
63604
63605@@ -1097,6 +1155,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
63606 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
63607 #endif
63608 retval = -EAGAIN;
63609+
63610+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
63611+
63612 if (atomic_read(&p->real_cred->user->processes) >=
63613 task_rlimit(p, RLIMIT_NPROC)) {
63614 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
63615@@ -1256,6 +1317,12 @@ static struct task_struct *copy_process(unsigned long clone_flags,
63616 if (clone_flags & CLONE_THREAD)
63617 p->tgid = current->tgid;
63618
63619+ gr_copy_label(p);
63620+
63621+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63622+ p->exec_id = current->exec_id;
63623+#endif
63624+
63625 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
63626 /*
63627 * Clear TID on mm_release()?
63628@@ -1418,6 +1485,8 @@ bad_fork_cleanup_count:
63629 bad_fork_free:
63630 free_task(p);
63631 fork_out:
63632+ gr_log_forkfail(retval);
63633+
63634 return ERR_PTR(retval);
63635 }
63636
63637@@ -1518,6 +1587,8 @@ long do_fork(unsigned long clone_flags,
63638 if (clone_flags & CLONE_PARENT_SETTID)
63639 put_user(nr, parent_tidptr);
63640
63641+ gr_handle_brute_check();
63642+
63643 if (clone_flags & CLONE_VFORK) {
63644 p->vfork_done = &vfork;
63645 init_completion(&vfork);
63646@@ -1627,7 +1698,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
63647 return 0;
63648
63649 /* don't need lock here; in the worst case we'll do useless copy */
63650- if (fs->users == 1)
63651+ if (atomic_read(&fs->users) == 1)
63652 return 0;
63653
63654 *new_fsp = copy_fs_struct(fs);
63655@@ -1716,7 +1787,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
63656 fs = current->fs;
63657 spin_lock(&fs->lock);
63658 current->fs = new_fs;
63659- if (--fs->users)
63660+ gr_set_chroot_entries(current, &current->fs->root);
63661+ if (atomic_dec_return(&fs->users))
63662 new_fs = NULL;
63663 else
63664 new_fs = fs;
63665diff --git a/kernel/futex.c b/kernel/futex.c
63666index 1614be2..37abc7e 100644
63667--- a/kernel/futex.c
63668+++ b/kernel/futex.c
63669@@ -54,6 +54,7 @@
63670 #include <linux/mount.h>
63671 #include <linux/pagemap.h>
63672 #include <linux/syscalls.h>
63673+#include <linux/ptrace.h>
63674 #include <linux/signal.h>
63675 #include <linux/export.h>
63676 #include <linux/magic.h>
63677@@ -238,6 +239,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
63678 struct page *page, *page_head;
63679 int err, ro = 0;
63680
63681+#ifdef CONFIG_PAX_SEGMEXEC
63682+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
63683+ return -EFAULT;
63684+#endif
63685+
63686 /*
63687 * The futex address must be "naturally" aligned.
63688 */
63689@@ -2459,6 +2465,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
63690 if (!p)
63691 goto err_unlock;
63692 ret = -EPERM;
63693+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63694+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
63695+ goto err_unlock;
63696+#endif
63697 pcred = __task_cred(p);
63698 /* If victim is in different user_ns, then uids are not
63699 comparable, so we must have CAP_SYS_PTRACE */
63700@@ -2724,6 +2734,7 @@ static int __init futex_init(void)
63701 {
63702 u32 curval;
63703 int i;
63704+ mm_segment_t oldfs;
63705
63706 /*
63707 * This will fail and we want it. Some arch implementations do
63708@@ -2735,8 +2746,11 @@ static int __init futex_init(void)
63709 * implementation, the non-functional ones will return
63710 * -ENOSYS.
63711 */
63712+ oldfs = get_fs();
63713+ set_fs(USER_DS);
63714 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
63715 futex_cmpxchg_enabled = 1;
63716+ set_fs(oldfs);
63717
63718 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
63719 plist_head_init(&futex_queues[i].chain);
63720diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
63721index 5f9e689..582d46d 100644
63722--- a/kernel/futex_compat.c
63723+++ b/kernel/futex_compat.c
63724@@ -10,6 +10,7 @@
63725 #include <linux/compat.h>
63726 #include <linux/nsproxy.h>
63727 #include <linux/futex.h>
63728+#include <linux/ptrace.h>
63729
63730 #include <asm/uaccess.h>
63731
63732@@ -136,7 +137,8 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
63733 {
63734 struct compat_robust_list_head __user *head;
63735 unsigned long ret;
63736- const struct cred *cred = current_cred(), *pcred;
63737+ const struct cred *cred = current_cred();
63738+ const struct cred *pcred;
63739
63740 if (!futex_cmpxchg_enabled)
63741 return -ENOSYS;
63742@@ -152,6 +154,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
63743 if (!p)
63744 goto err_unlock;
63745 ret = -EPERM;
63746+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63747+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
63748+ goto err_unlock;
63749+#endif
63750 pcred = __task_cred(p);
63751 /* If victim is in different user_ns, then uids are not
63752 comparable, so we must have CAP_SYS_PTRACE */
63753diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
63754index 9b22d03..6295b62 100644
63755--- a/kernel/gcov/base.c
63756+++ b/kernel/gcov/base.c
63757@@ -102,11 +102,6 @@ void gcov_enable_events(void)
63758 }
63759
63760 #ifdef CONFIG_MODULES
63761-static inline int within(void *addr, void *start, unsigned long size)
63762-{
63763- return ((addr >= start) && (addr < start + size));
63764-}
63765-
63766 /* Update list and generate events when modules are unloaded. */
63767 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
63768 void *data)
63769@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
63770 prev = NULL;
63771 /* Remove entries located in module from linked list. */
63772 for (info = gcov_info_head; info; info = info->next) {
63773- if (within(info, mod->module_core, mod->core_size)) {
63774+ if (within_module_core_rw((unsigned long)info, mod)) {
63775 if (prev)
63776 prev->next = info->next;
63777 else
63778diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
63779index ae34bf5..4e2f3d0 100644
63780--- a/kernel/hrtimer.c
63781+++ b/kernel/hrtimer.c
63782@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
63783 local_irq_restore(flags);
63784 }
63785
63786-static void run_hrtimer_softirq(struct softirq_action *h)
63787+static void run_hrtimer_softirq(void)
63788 {
63789 hrtimer_peek_ahead_timers();
63790 }
63791diff --git a/kernel/jump_label.c b/kernel/jump_label.c
63792index 66ff710..05a5128 100644
63793--- a/kernel/jump_label.c
63794+++ b/kernel/jump_label.c
63795@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
63796
63797 size = (((unsigned long)stop - (unsigned long)start)
63798 / sizeof(struct jump_entry));
63799+ pax_open_kernel();
63800 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
63801+ pax_close_kernel();
63802 }
63803
63804 static void jump_label_update(struct jump_label_key *key, int enable);
63805@@ -303,10 +305,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
63806 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
63807 struct jump_entry *iter;
63808
63809+ pax_open_kernel();
63810 for (iter = iter_start; iter < iter_stop; iter++) {
63811 if (within_module_init(iter->code, mod))
63812 iter->code = 0;
63813 }
63814+ pax_close_kernel();
63815 }
63816
63817 static int
63818diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
63819index 079f1d3..a407562 100644
63820--- a/kernel/kallsyms.c
63821+++ b/kernel/kallsyms.c
63822@@ -11,6 +11,9 @@
63823 * Changed the compression method from stem compression to "table lookup"
63824 * compression (see scripts/kallsyms.c for a more complete description)
63825 */
63826+#ifdef CONFIG_GRKERNSEC_HIDESYM
63827+#define __INCLUDED_BY_HIDESYM 1
63828+#endif
63829 #include <linux/kallsyms.h>
63830 #include <linux/module.h>
63831 #include <linux/init.h>
63832@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
63833
63834 static inline int is_kernel_inittext(unsigned long addr)
63835 {
63836+ if (system_state != SYSTEM_BOOTING)
63837+ return 0;
63838+
63839 if (addr >= (unsigned long)_sinittext
63840 && addr <= (unsigned long)_einittext)
63841 return 1;
63842 return 0;
63843 }
63844
63845+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
63846+#ifdef CONFIG_MODULES
63847+static inline int is_module_text(unsigned long addr)
63848+{
63849+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
63850+ return 1;
63851+
63852+ addr = ktla_ktva(addr);
63853+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
63854+}
63855+#else
63856+static inline int is_module_text(unsigned long addr)
63857+{
63858+ return 0;
63859+}
63860+#endif
63861+#endif
63862+
63863 static inline int is_kernel_text(unsigned long addr)
63864 {
63865 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
63866@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
63867
63868 static inline int is_kernel(unsigned long addr)
63869 {
63870+
63871+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
63872+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
63873+ return 1;
63874+
63875+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
63876+#else
63877 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
63878+#endif
63879+
63880 return 1;
63881 return in_gate_area_no_mm(addr);
63882 }
63883
63884 static int is_ksym_addr(unsigned long addr)
63885 {
63886+
63887+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
63888+ if (is_module_text(addr))
63889+ return 0;
63890+#endif
63891+
63892 if (all_var)
63893 return is_kernel(addr);
63894
63895@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
63896
63897 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
63898 {
63899- iter->name[0] = '\0';
63900 iter->nameoff = get_symbol_offset(new_pos);
63901 iter->pos = new_pos;
63902 }
63903@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, void *p)
63904 {
63905 struct kallsym_iter *iter = m->private;
63906
63907+#ifdef CONFIG_GRKERNSEC_HIDESYM
63908+ if (current_uid())
63909+ return 0;
63910+#endif
63911+
63912 /* Some debugging symbols have no name. Ignore them. */
63913 if (!iter->name[0])
63914 return 0;
63915@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
63916 struct kallsym_iter *iter;
63917 int ret;
63918
63919- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
63920+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
63921 if (!iter)
63922 return -ENOMEM;
63923 reset_iter(iter, 0);
63924diff --git a/kernel/kexec.c b/kernel/kexec.c
63925index dc7bc08..4601964 100644
63926--- a/kernel/kexec.c
63927+++ b/kernel/kexec.c
63928@@ -1048,7 +1048,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
63929 unsigned long flags)
63930 {
63931 struct compat_kexec_segment in;
63932- struct kexec_segment out, __user *ksegments;
63933+ struct kexec_segment out;
63934+ struct kexec_segment __user *ksegments;
63935 unsigned long i, result;
63936
63937 /* Don't allow clients that don't understand the native
63938diff --git a/kernel/kmod.c b/kernel/kmod.c
63939index a4bea97..7a1ae9a 100644
63940--- a/kernel/kmod.c
63941+++ b/kernel/kmod.c
63942@@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
63943 * If module auto-loading support is disabled then this function
63944 * becomes a no-operation.
63945 */
63946-int __request_module(bool wait, const char *fmt, ...)
63947+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
63948 {
63949- va_list args;
63950 char module_name[MODULE_NAME_LEN];
63951 unsigned int max_modprobes;
63952 int ret;
63953- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
63954+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
63955 static char *envp[] = { "HOME=/",
63956 "TERM=linux",
63957 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
63958@@ -88,9 +87,7 @@ int __request_module(bool wait, const char *fmt, ...)
63959 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
63960 static int kmod_loop_msg;
63961
63962- va_start(args, fmt);
63963- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
63964- va_end(args);
63965+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
63966 if (ret >= MODULE_NAME_LEN)
63967 return -ENAMETOOLONG;
63968
63969@@ -98,6 +95,20 @@ int __request_module(bool wait, const char *fmt, ...)
63970 if (ret)
63971 return ret;
63972
63973+#ifdef CONFIG_GRKERNSEC_MODHARDEN
63974+ if (!current_uid()) {
63975+ /* hack to workaround consolekit/udisks stupidity */
63976+ read_lock(&tasklist_lock);
63977+ if (!strcmp(current->comm, "mount") &&
63978+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
63979+ read_unlock(&tasklist_lock);
63980+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
63981+ return -EPERM;
63982+ }
63983+ read_unlock(&tasklist_lock);
63984+ }
63985+#endif
63986+
63987 /* If modprobe needs a service that is in a module, we get a recursive
63988 * loop. Limit the number of running kmod threads to max_threads/2 or
63989 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
63990@@ -133,6 +144,47 @@ int __request_module(bool wait, const char *fmt, ...)
63991 atomic_dec(&kmod_concurrent);
63992 return ret;
63993 }
63994+
63995+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
63996+{
63997+ va_list args;
63998+ int ret;
63999+
64000+ va_start(args, fmt);
64001+ ret = ____request_module(wait, module_param, fmt, args);
64002+ va_end(args);
64003+
64004+ return ret;
64005+}
64006+
64007+int __request_module(bool wait, const char *fmt, ...)
64008+{
64009+ va_list args;
64010+ int ret;
64011+
64012+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64013+ if (current_uid()) {
64014+ char module_param[MODULE_NAME_LEN];
64015+
64016+ memset(module_param, 0, sizeof(module_param));
64017+
64018+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
64019+
64020+ va_start(args, fmt);
64021+ ret = ____request_module(wait, module_param, fmt, args);
64022+ va_end(args);
64023+
64024+ return ret;
64025+ }
64026+#endif
64027+
64028+ va_start(args, fmt);
64029+ ret = ____request_module(wait, NULL, fmt, args);
64030+ va_end(args);
64031+
64032+ return ret;
64033+}
64034+
64035 EXPORT_SYMBOL(__request_module);
64036 #endif /* CONFIG_MODULES */
64037
64038@@ -222,7 +274,7 @@ static int wait_for_helper(void *data)
64039 *
64040 * Thus the __user pointer cast is valid here.
64041 */
64042- sys_wait4(pid, (int __user *)&ret, 0, NULL);
64043+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
64044
64045 /*
64046 * If ret is 0, either ____call_usermodehelper failed and the
64047diff --git a/kernel/kprobes.c b/kernel/kprobes.c
64048index faa39d1..d7ad37e 100644
64049--- a/kernel/kprobes.c
64050+++ b/kernel/kprobes.c
64051@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
64052 * kernel image and loaded module images reside. This is required
64053 * so x86_64 can correctly handle the %rip-relative fixups.
64054 */
64055- kip->insns = module_alloc(PAGE_SIZE);
64056+ kip->insns = module_alloc_exec(PAGE_SIZE);
64057 if (!kip->insns) {
64058 kfree(kip);
64059 return NULL;
64060@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
64061 */
64062 if (!list_is_singular(&kip->list)) {
64063 list_del(&kip->list);
64064- module_free(NULL, kip->insns);
64065+ module_free_exec(NULL, kip->insns);
64066 kfree(kip);
64067 }
64068 return 1;
64069@@ -1953,7 +1953,7 @@ static int __init init_kprobes(void)
64070 {
64071 int i, err = 0;
64072 unsigned long offset = 0, size = 0;
64073- char *modname, namebuf[128];
64074+ char *modname, namebuf[KSYM_NAME_LEN];
64075 const char *symbol_name;
64076 void *addr;
64077 struct kprobe_blackpoint *kb;
64078@@ -2079,7 +2079,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
64079 const char *sym = NULL;
64080 unsigned int i = *(loff_t *) v;
64081 unsigned long offset = 0;
64082- char *modname, namebuf[128];
64083+ char *modname, namebuf[KSYM_NAME_LEN];
64084
64085 head = &kprobe_table[i];
64086 preempt_disable();
64087diff --git a/kernel/lockdep.c b/kernel/lockdep.c
64088index b2e08c9..01d8049 100644
64089--- a/kernel/lockdep.c
64090+++ b/kernel/lockdep.c
64091@@ -592,6 +592,10 @@ static int static_obj(void *obj)
64092 end = (unsigned long) &_end,
64093 addr = (unsigned long) obj;
64094
64095+#ifdef CONFIG_PAX_KERNEXEC
64096+ start = ktla_ktva(start);
64097+#endif
64098+
64099 /*
64100 * static variable?
64101 */
64102@@ -731,6 +735,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
64103 if (!static_obj(lock->key)) {
64104 debug_locks_off();
64105 printk("INFO: trying to register non-static key.\n");
64106+ printk("lock:%pS key:%pS.\n", lock, lock->key);
64107 printk("the code is fine but needs lockdep annotation.\n");
64108 printk("turning off the locking correctness validator.\n");
64109 dump_stack();
64110@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
64111 if (!class)
64112 return 0;
64113 }
64114- atomic_inc((atomic_t *)&class->ops);
64115+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
64116 if (very_verbose(class)) {
64117 printk("\nacquire class [%p] %s", class->key, class->name);
64118 if (class->name_version > 1)
64119diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
64120index 91c32a0..b2c71c5 100644
64121--- a/kernel/lockdep_proc.c
64122+++ b/kernel/lockdep_proc.c
64123@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
64124
64125 static void print_name(struct seq_file *m, struct lock_class *class)
64126 {
64127- char str[128];
64128+ char str[KSYM_NAME_LEN];
64129 const char *name = class->name;
64130
64131 if (!name) {
64132diff --git a/kernel/module.c b/kernel/module.c
64133index 178333c..04e3408 100644
64134--- a/kernel/module.c
64135+++ b/kernel/module.c
64136@@ -58,6 +58,7 @@
64137 #include <linux/jump_label.h>
64138 #include <linux/pfn.h>
64139 #include <linux/bsearch.h>
64140+#include <linux/grsecurity.h>
64141
64142 #define CREATE_TRACE_POINTS
64143 #include <trace/events/module.h>
64144@@ -119,7 +120,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
64145
64146 /* Bounds of module allocation, for speeding __module_address.
64147 * Protected by module_mutex. */
64148-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
64149+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
64150+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
64151
64152 int register_module_notifier(struct notifier_block * nb)
64153 {
64154@@ -284,7 +286,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
64155 return true;
64156
64157 list_for_each_entry_rcu(mod, &modules, list) {
64158- struct symsearch arr[] = {
64159+ struct symsearch modarr[] = {
64160 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
64161 NOT_GPL_ONLY, false },
64162 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
64163@@ -306,7 +308,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
64164 #endif
64165 };
64166
64167- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
64168+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
64169 return true;
64170 }
64171 return false;
64172@@ -438,7 +440,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
64173 static int percpu_modalloc(struct module *mod,
64174 unsigned long size, unsigned long align)
64175 {
64176- if (align > PAGE_SIZE) {
64177+ if (align-1 >= PAGE_SIZE) {
64178 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
64179 mod->name, align, PAGE_SIZE);
64180 align = PAGE_SIZE;
64181@@ -1183,7 +1185,7 @@ resolve_symbol_wait(struct module *mod,
64182 */
64183 #ifdef CONFIG_SYSFS
64184
64185-#ifdef CONFIG_KALLSYMS
64186+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
64187 static inline bool sect_empty(const Elf_Shdr *sect)
64188 {
64189 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
64190@@ -1649,21 +1651,21 @@ static void set_section_ro_nx(void *base,
64191
64192 static void unset_module_core_ro_nx(struct module *mod)
64193 {
64194- set_page_attributes(mod->module_core + mod->core_text_size,
64195- mod->module_core + mod->core_size,
64196+ set_page_attributes(mod->module_core_rw,
64197+ mod->module_core_rw + mod->core_size_rw,
64198 set_memory_x);
64199- set_page_attributes(mod->module_core,
64200- mod->module_core + mod->core_ro_size,
64201+ set_page_attributes(mod->module_core_rx,
64202+ mod->module_core_rx + mod->core_size_rx,
64203 set_memory_rw);
64204 }
64205
64206 static void unset_module_init_ro_nx(struct module *mod)
64207 {
64208- set_page_attributes(mod->module_init + mod->init_text_size,
64209- mod->module_init + mod->init_size,
64210+ set_page_attributes(mod->module_init_rw,
64211+ mod->module_init_rw + mod->init_size_rw,
64212 set_memory_x);
64213- set_page_attributes(mod->module_init,
64214- mod->module_init + mod->init_ro_size,
64215+ set_page_attributes(mod->module_init_rx,
64216+ mod->module_init_rx + mod->init_size_rx,
64217 set_memory_rw);
64218 }
64219
64220@@ -1674,14 +1676,14 @@ void set_all_modules_text_rw(void)
64221
64222 mutex_lock(&module_mutex);
64223 list_for_each_entry_rcu(mod, &modules, list) {
64224- if ((mod->module_core) && (mod->core_text_size)) {
64225- set_page_attributes(mod->module_core,
64226- mod->module_core + mod->core_text_size,
64227+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
64228+ set_page_attributes(mod->module_core_rx,
64229+ mod->module_core_rx + mod->core_size_rx,
64230 set_memory_rw);
64231 }
64232- if ((mod->module_init) && (mod->init_text_size)) {
64233- set_page_attributes(mod->module_init,
64234- mod->module_init + mod->init_text_size,
64235+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
64236+ set_page_attributes(mod->module_init_rx,
64237+ mod->module_init_rx + mod->init_size_rx,
64238 set_memory_rw);
64239 }
64240 }
64241@@ -1695,14 +1697,14 @@ void set_all_modules_text_ro(void)
64242
64243 mutex_lock(&module_mutex);
64244 list_for_each_entry_rcu(mod, &modules, list) {
64245- if ((mod->module_core) && (mod->core_text_size)) {
64246- set_page_attributes(mod->module_core,
64247- mod->module_core + mod->core_text_size,
64248+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
64249+ set_page_attributes(mod->module_core_rx,
64250+ mod->module_core_rx + mod->core_size_rx,
64251 set_memory_ro);
64252 }
64253- if ((mod->module_init) && (mod->init_text_size)) {
64254- set_page_attributes(mod->module_init,
64255- mod->module_init + mod->init_text_size,
64256+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
64257+ set_page_attributes(mod->module_init_rx,
64258+ mod->module_init_rx + mod->init_size_rx,
64259 set_memory_ro);
64260 }
64261 }
64262@@ -1748,16 +1750,19 @@ static void free_module(struct module *mod)
64263
64264 /* This may be NULL, but that's OK */
64265 unset_module_init_ro_nx(mod);
64266- module_free(mod, mod->module_init);
64267+ module_free(mod, mod->module_init_rw);
64268+ module_free_exec(mod, mod->module_init_rx);
64269 kfree(mod->args);
64270 percpu_modfree(mod);
64271
64272 /* Free lock-classes: */
64273- lockdep_free_key_range(mod->module_core, mod->core_size);
64274+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
64275+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
64276
64277 /* Finally, free the core (containing the module structure) */
64278 unset_module_core_ro_nx(mod);
64279- module_free(mod, mod->module_core);
64280+ module_free_exec(mod, mod->module_core_rx);
64281+ module_free(mod, mod->module_core_rw);
64282
64283 #ifdef CONFIG_MPU
64284 update_protections(current->mm);
64285@@ -1826,10 +1831,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
64286 unsigned int i;
64287 int ret = 0;
64288 const struct kernel_symbol *ksym;
64289+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64290+ int is_fs_load = 0;
64291+ int register_filesystem_found = 0;
64292+ char *p;
64293+
64294+ p = strstr(mod->args, "grsec_modharden_fs");
64295+ if (p) {
64296+ char *endptr = p + strlen("grsec_modharden_fs");
64297+ /* copy \0 as well */
64298+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
64299+ is_fs_load = 1;
64300+ }
64301+#endif
64302
64303 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
64304 const char *name = info->strtab + sym[i].st_name;
64305
64306+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64307+ /* it's a real shame this will never get ripped and copied
64308+ upstream! ;(
64309+ */
64310+ if (is_fs_load && !strcmp(name, "register_filesystem"))
64311+ register_filesystem_found = 1;
64312+#endif
64313+
64314 switch (sym[i].st_shndx) {
64315 case SHN_COMMON:
64316 /* We compiled with -fno-common. These are not
64317@@ -1850,7 +1876,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
64318 ksym = resolve_symbol_wait(mod, info, name);
64319 /* Ok if resolved. */
64320 if (ksym && !IS_ERR(ksym)) {
64321+ pax_open_kernel();
64322 sym[i].st_value = ksym->value;
64323+ pax_close_kernel();
64324 break;
64325 }
64326
64327@@ -1869,11 +1897,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
64328 secbase = (unsigned long)mod_percpu(mod);
64329 else
64330 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
64331+ pax_open_kernel();
64332 sym[i].st_value += secbase;
64333+ pax_close_kernel();
64334 break;
64335 }
64336 }
64337
64338+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64339+ if (is_fs_load && !register_filesystem_found) {
64340+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
64341+ ret = -EPERM;
64342+ }
64343+#endif
64344+
64345 return ret;
64346 }
64347
64348@@ -1977,22 +2014,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
64349 || s->sh_entsize != ~0UL
64350 || strstarts(sname, ".init"))
64351 continue;
64352- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
64353+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
64354+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
64355+ else
64356+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
64357 DEBUGP("\t%s\n", name);
64358 }
64359- switch (m) {
64360- case 0: /* executable */
64361- mod->core_size = debug_align(mod->core_size);
64362- mod->core_text_size = mod->core_size;
64363- break;
64364- case 1: /* RO: text and ro-data */
64365- mod->core_size = debug_align(mod->core_size);
64366- mod->core_ro_size = mod->core_size;
64367- break;
64368- case 3: /* whole core */
64369- mod->core_size = debug_align(mod->core_size);
64370- break;
64371- }
64372 }
64373
64374 DEBUGP("Init section allocation order:\n");
64375@@ -2006,23 +2033,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
64376 || s->sh_entsize != ~0UL
64377 || !strstarts(sname, ".init"))
64378 continue;
64379- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
64380- | INIT_OFFSET_MASK);
64381+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
64382+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
64383+ else
64384+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
64385+ s->sh_entsize |= INIT_OFFSET_MASK;
64386 DEBUGP("\t%s\n", sname);
64387 }
64388- switch (m) {
64389- case 0: /* executable */
64390- mod->init_size = debug_align(mod->init_size);
64391- mod->init_text_size = mod->init_size;
64392- break;
64393- case 1: /* RO: text and ro-data */
64394- mod->init_size = debug_align(mod->init_size);
64395- mod->init_ro_size = mod->init_size;
64396- break;
64397- case 3: /* whole init */
64398- mod->init_size = debug_align(mod->init_size);
64399- break;
64400- }
64401 }
64402 }
64403
64404@@ -2187,7 +2204,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
64405
64406 /* Put symbol section at end of init part of module. */
64407 symsect->sh_flags |= SHF_ALLOC;
64408- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
64409+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
64410 info->index.sym) | INIT_OFFSET_MASK;
64411 DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
64412
64413@@ -2204,19 +2221,19 @@ static void layout_symtab(struct module *mod, struct load_info *info)
64414 }
64415
64416 /* Append room for core symbols at end of core part. */
64417- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
64418- mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
64419+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
64420+ mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
64421
64422 /* Put string table section at end of init part of module. */
64423 strsect->sh_flags |= SHF_ALLOC;
64424- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
64425+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
64426 info->index.str) | INIT_OFFSET_MASK;
64427 DEBUGP("\t%s\n", info->secstrings + strsect->sh_name);
64428
64429 /* Append room for core symbols' strings at end of core part. */
64430- info->stroffs = mod->core_size;
64431+ info->stroffs = mod->core_size_rx;
64432 __set_bit(0, info->strmap);
64433- mod->core_size += bitmap_weight(info->strmap, strsect->sh_size);
64434+ mod->core_size_rx += bitmap_weight(info->strmap, strsect->sh_size);
64435 }
64436
64437 static void add_kallsyms(struct module *mod, const struct load_info *info)
64438@@ -2232,11 +2249,13 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
64439 /* Make sure we get permanent strtab: don't use info->strtab. */
64440 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
64441
64442+ pax_open_kernel();
64443+
64444 /* Set types up while we still have access to sections. */
64445 for (i = 0; i < mod->num_symtab; i++)
64446 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
64447
64448- mod->core_symtab = dst = mod->module_core + info->symoffs;
64449+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
64450 src = mod->symtab;
64451 *dst = *src;
64452 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
64453@@ -2249,10 +2268,12 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
64454 }
64455 mod->core_num_syms = ndst;
64456
64457- mod->core_strtab = s = mod->module_core + info->stroffs;
64458+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
64459 for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
64460 if (test_bit(i, info->strmap))
64461 *++s = mod->strtab[i];
64462+
64463+ pax_close_kernel();
64464 }
64465 #else
64466 static inline void layout_symtab(struct module *mod, struct load_info *info)
64467@@ -2286,17 +2307,33 @@ void * __weak module_alloc(unsigned long size)
64468 return size == 0 ? NULL : vmalloc_exec(size);
64469 }
64470
64471-static void *module_alloc_update_bounds(unsigned long size)
64472+static void *module_alloc_update_bounds_rw(unsigned long size)
64473 {
64474 void *ret = module_alloc(size);
64475
64476 if (ret) {
64477 mutex_lock(&module_mutex);
64478 /* Update module bounds. */
64479- if ((unsigned long)ret < module_addr_min)
64480- module_addr_min = (unsigned long)ret;
64481- if ((unsigned long)ret + size > module_addr_max)
64482- module_addr_max = (unsigned long)ret + size;
64483+ if ((unsigned long)ret < module_addr_min_rw)
64484+ module_addr_min_rw = (unsigned long)ret;
64485+ if ((unsigned long)ret + size > module_addr_max_rw)
64486+ module_addr_max_rw = (unsigned long)ret + size;
64487+ mutex_unlock(&module_mutex);
64488+ }
64489+ return ret;
64490+}
64491+
64492+static void *module_alloc_update_bounds_rx(unsigned long size)
64493+{
64494+ void *ret = module_alloc_exec(size);
64495+
64496+ if (ret) {
64497+ mutex_lock(&module_mutex);
64498+ /* Update module bounds. */
64499+ if ((unsigned long)ret < module_addr_min_rx)
64500+ module_addr_min_rx = (unsigned long)ret;
64501+ if ((unsigned long)ret + size > module_addr_max_rx)
64502+ module_addr_max_rx = (unsigned long)ret + size;
64503 mutex_unlock(&module_mutex);
64504 }
64505 return ret;
64506@@ -2474,8 +2511,14 @@ static struct module *setup_load_info(struct load_info *info)
64507 static int check_modinfo(struct module *mod, struct load_info *info)
64508 {
64509 const char *modmagic = get_modinfo(info, "vermagic");
64510+ const char *license = get_modinfo(info, "license");
64511 int err;
64512
64513+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
64514+ if (!license || !license_is_gpl_compatible(license))
64515+ return -ENOEXEC;
64516+#endif
64517+
64518 /* This is allowed: modprobe --force will invalidate it. */
64519 if (!modmagic) {
64520 err = try_to_force_load(mod, "bad vermagic");
64521@@ -2498,7 +2541,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
64522 }
64523
64524 /* Set up license info based on the info section */
64525- set_license(mod, get_modinfo(info, "license"));
64526+ set_license(mod, license);
64527
64528 return 0;
64529 }
64530@@ -2592,7 +2635,7 @@ static int move_module(struct module *mod, struct load_info *info)
64531 void *ptr;
64532
64533 /* Do the allocs. */
64534- ptr = module_alloc_update_bounds(mod->core_size);
64535+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
64536 /*
64537 * The pointer to this block is stored in the module structure
64538 * which is inside the block. Just mark it as not being a
64539@@ -2602,23 +2645,50 @@ static int move_module(struct module *mod, struct load_info *info)
64540 if (!ptr)
64541 return -ENOMEM;
64542
64543- memset(ptr, 0, mod->core_size);
64544- mod->module_core = ptr;
64545+ memset(ptr, 0, mod->core_size_rw);
64546+ mod->module_core_rw = ptr;
64547
64548- ptr = module_alloc_update_bounds(mod->init_size);
64549+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
64550 /*
64551 * The pointer to this block is stored in the module structure
64552 * which is inside the block. This block doesn't need to be
64553 * scanned as it contains data and code that will be freed
64554 * after the module is initialized.
64555 */
64556- kmemleak_ignore(ptr);
64557- if (!ptr && mod->init_size) {
64558- module_free(mod, mod->module_core);
64559+ kmemleak_not_leak(ptr);
64560+ if (!ptr && mod->init_size_rw) {
64561+ module_free(mod, mod->module_core_rw);
64562 return -ENOMEM;
64563 }
64564- memset(ptr, 0, mod->init_size);
64565- mod->module_init = ptr;
64566+ memset(ptr, 0, mod->init_size_rw);
64567+ mod->module_init_rw = ptr;
64568+
64569+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
64570+ kmemleak_not_leak(ptr);
64571+ if (!ptr) {
64572+ module_free(mod, mod->module_init_rw);
64573+ module_free(mod, mod->module_core_rw);
64574+ return -ENOMEM;
64575+ }
64576+
64577+ pax_open_kernel();
64578+ memset(ptr, 0, mod->core_size_rx);
64579+ pax_close_kernel();
64580+ mod->module_core_rx = ptr;
64581+
64582+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
64583+ kmemleak_not_leak(ptr);
64584+ if (!ptr && mod->init_size_rx) {
64585+ module_free_exec(mod, mod->module_core_rx);
64586+ module_free(mod, mod->module_init_rw);
64587+ module_free(mod, mod->module_core_rw);
64588+ return -ENOMEM;
64589+ }
64590+
64591+ pax_open_kernel();
64592+ memset(ptr, 0, mod->init_size_rx);
64593+ pax_close_kernel();
64594+ mod->module_init_rx = ptr;
64595
64596 /* Transfer each section which specifies SHF_ALLOC */
64597 DEBUGP("final section addresses:\n");
64598@@ -2629,16 +2699,45 @@ static int move_module(struct module *mod, struct load_info *info)
64599 if (!(shdr->sh_flags & SHF_ALLOC))
64600 continue;
64601
64602- if (shdr->sh_entsize & INIT_OFFSET_MASK)
64603- dest = mod->module_init
64604- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
64605- else
64606- dest = mod->module_core + shdr->sh_entsize;
64607+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
64608+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
64609+ dest = mod->module_init_rw
64610+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
64611+ else
64612+ dest = mod->module_init_rx
64613+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
64614+ } else {
64615+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
64616+ dest = mod->module_core_rw + shdr->sh_entsize;
64617+ else
64618+ dest = mod->module_core_rx + shdr->sh_entsize;
64619+ }
64620+
64621+ if (shdr->sh_type != SHT_NOBITS) {
64622+
64623+#ifdef CONFIG_PAX_KERNEXEC
64624+#ifdef CONFIG_X86_64
64625+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
64626+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
64627+#endif
64628+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
64629+ pax_open_kernel();
64630+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
64631+ pax_close_kernel();
64632+ } else
64633+#endif
64634
64635- if (shdr->sh_type != SHT_NOBITS)
64636 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
64637+ }
64638 /* Update sh_addr to point to copy in image. */
64639- shdr->sh_addr = (unsigned long)dest;
64640+
64641+#ifdef CONFIG_PAX_KERNEXEC
64642+ if (shdr->sh_flags & SHF_EXECINSTR)
64643+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
64644+ else
64645+#endif
64646+
64647+ shdr->sh_addr = (unsigned long)dest;
64648 DEBUGP("\t0x%lx %s\n",
64649 shdr->sh_addr, info->secstrings + shdr->sh_name);
64650 }
64651@@ -2689,12 +2788,12 @@ static void flush_module_icache(const struct module *mod)
64652 * Do it before processing of module parameters, so the module
64653 * can provide parameter accessor functions of its own.
64654 */
64655- if (mod->module_init)
64656- flush_icache_range((unsigned long)mod->module_init,
64657- (unsigned long)mod->module_init
64658- + mod->init_size);
64659- flush_icache_range((unsigned long)mod->module_core,
64660- (unsigned long)mod->module_core + mod->core_size);
64661+ if (mod->module_init_rx)
64662+ flush_icache_range((unsigned long)mod->module_init_rx,
64663+ (unsigned long)mod->module_init_rx
64664+ + mod->init_size_rx);
64665+ flush_icache_range((unsigned long)mod->module_core_rx,
64666+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
64667
64668 set_fs(old_fs);
64669 }
64670@@ -2774,8 +2873,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
64671 {
64672 kfree(info->strmap);
64673 percpu_modfree(mod);
64674- module_free(mod, mod->module_init);
64675- module_free(mod, mod->module_core);
64676+ module_free_exec(mod, mod->module_init_rx);
64677+ module_free_exec(mod, mod->module_core_rx);
64678+ module_free(mod, mod->module_init_rw);
64679+ module_free(mod, mod->module_core_rw);
64680 }
64681
64682 int __weak module_finalize(const Elf_Ehdr *hdr,
64683@@ -2839,9 +2940,38 @@ static struct module *load_module(void __user *umod,
64684 if (err)
64685 goto free_unload;
64686
64687+ /* Now copy in args */
64688+ mod->args = strndup_user(uargs, ~0UL >> 1);
64689+ if (IS_ERR(mod->args)) {
64690+ err = PTR_ERR(mod->args);
64691+ goto free_unload;
64692+ }
64693+
64694 /* Set up MODINFO_ATTR fields */
64695 setup_modinfo(mod, &info);
64696
64697+#ifdef CONFIG_GRKERNSEC_MODHARDEN
64698+ {
64699+ char *p, *p2;
64700+
64701+ if (strstr(mod->args, "grsec_modharden_netdev")) {
64702+ 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);
64703+ err = -EPERM;
64704+ goto free_modinfo;
64705+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
64706+ p += strlen("grsec_modharden_normal");
64707+ p2 = strstr(p, "_");
64708+ if (p2) {
64709+ *p2 = '\0';
64710+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
64711+ *p2 = '_';
64712+ }
64713+ err = -EPERM;
64714+ goto free_modinfo;
64715+ }
64716+ }
64717+#endif
64718+
64719 /* Fix up syms, so that st_value is a pointer to location. */
64720 err = simplify_symbols(mod, &info);
64721 if (err < 0)
64722@@ -2857,13 +2987,6 @@ static struct module *load_module(void __user *umod,
64723
64724 flush_module_icache(mod);
64725
64726- /* Now copy in args */
64727- mod->args = strndup_user(uargs, ~0UL >> 1);
64728- if (IS_ERR(mod->args)) {
64729- err = PTR_ERR(mod->args);
64730- goto free_arch_cleanup;
64731- }
64732-
64733 /* Mark state as coming so strong_try_module_get() ignores us. */
64734 mod->state = MODULE_STATE_COMING;
64735
64736@@ -2921,11 +3044,10 @@ static struct module *load_module(void __user *umod,
64737 unlock:
64738 mutex_unlock(&module_mutex);
64739 synchronize_sched();
64740- kfree(mod->args);
64741- free_arch_cleanup:
64742 module_arch_cleanup(mod);
64743 free_modinfo:
64744 free_modinfo(mod);
64745+ kfree(mod->args);
64746 free_unload:
64747 module_unload_free(mod);
64748 free_module:
64749@@ -2966,16 +3088,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
64750 MODULE_STATE_COMING, mod);
64751
64752 /* Set RO and NX regions for core */
64753- set_section_ro_nx(mod->module_core,
64754- mod->core_text_size,
64755- mod->core_ro_size,
64756- mod->core_size);
64757+ set_section_ro_nx(mod->module_core_rx,
64758+ mod->core_size_rx,
64759+ mod->core_size_rx,
64760+ mod->core_size_rx);
64761
64762 /* Set RO and NX regions for init */
64763- set_section_ro_nx(mod->module_init,
64764- mod->init_text_size,
64765- mod->init_ro_size,
64766- mod->init_size);
64767+ set_section_ro_nx(mod->module_init_rx,
64768+ mod->init_size_rx,
64769+ mod->init_size_rx,
64770+ mod->init_size_rx);
64771
64772 do_mod_ctors(mod);
64773 /* Start the module */
64774@@ -3021,11 +3143,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
64775 mod->strtab = mod->core_strtab;
64776 #endif
64777 unset_module_init_ro_nx(mod);
64778- module_free(mod, mod->module_init);
64779- mod->module_init = NULL;
64780- mod->init_size = 0;
64781- mod->init_ro_size = 0;
64782- mod->init_text_size = 0;
64783+ module_free(mod, mod->module_init_rw);
64784+ module_free_exec(mod, mod->module_init_rx);
64785+ mod->module_init_rw = NULL;
64786+ mod->module_init_rx = NULL;
64787+ mod->init_size_rw = 0;
64788+ mod->init_size_rx = 0;
64789 mutex_unlock(&module_mutex);
64790
64791 return 0;
64792@@ -3056,10 +3179,16 @@ static const char *get_ksymbol(struct module *mod,
64793 unsigned long nextval;
64794
64795 /* At worse, next value is at end of module */
64796- if (within_module_init(addr, mod))
64797- nextval = (unsigned long)mod->module_init+mod->init_text_size;
64798+ if (within_module_init_rx(addr, mod))
64799+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
64800+ else if (within_module_init_rw(addr, mod))
64801+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
64802+ else if (within_module_core_rx(addr, mod))
64803+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
64804+ else if (within_module_core_rw(addr, mod))
64805+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
64806 else
64807- nextval = (unsigned long)mod->module_core+mod->core_text_size;
64808+ return NULL;
64809
64810 /* Scan for closest preceding symbol, and next symbol. (ELF
64811 starts real symbols at 1). */
64812@@ -3307,7 +3436,7 @@ static int m_show(struct seq_file *m, void *p)
64813 char buf[8];
64814
64815 seq_printf(m, "%s %u",
64816- mod->name, mod->init_size + mod->core_size);
64817+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
64818 print_unload_info(m, mod);
64819
64820 /* Informative for users. */
64821@@ -3316,7 +3445,7 @@ static int m_show(struct seq_file *m, void *p)
64822 mod->state == MODULE_STATE_COMING ? "Loading":
64823 "Live");
64824 /* Used by oprofile and other similar tools. */
64825- seq_printf(m, " 0x%pK", mod->module_core);
64826+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
64827
64828 /* Taints info */
64829 if (mod->taints)
64830@@ -3352,7 +3481,17 @@ static const struct file_operations proc_modules_operations = {
64831
64832 static int __init proc_modules_init(void)
64833 {
64834+#ifndef CONFIG_GRKERNSEC_HIDESYM
64835+#ifdef CONFIG_GRKERNSEC_PROC_USER
64836+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
64837+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64838+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
64839+#else
64840 proc_create("modules", 0, NULL, &proc_modules_operations);
64841+#endif
64842+#else
64843+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
64844+#endif
64845 return 0;
64846 }
64847 module_init(proc_modules_init);
64848@@ -3411,12 +3550,12 @@ struct module *__module_address(unsigned long addr)
64849 {
64850 struct module *mod;
64851
64852- if (addr < module_addr_min || addr > module_addr_max)
64853+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
64854+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
64855 return NULL;
64856
64857 list_for_each_entry_rcu(mod, &modules, list)
64858- if (within_module_core(addr, mod)
64859- || within_module_init(addr, mod))
64860+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
64861 return mod;
64862 return NULL;
64863 }
64864@@ -3450,11 +3589,20 @@ bool is_module_text_address(unsigned long addr)
64865 */
64866 struct module *__module_text_address(unsigned long addr)
64867 {
64868- struct module *mod = __module_address(addr);
64869+ struct module *mod;
64870+
64871+#ifdef CONFIG_X86_32
64872+ addr = ktla_ktva(addr);
64873+#endif
64874+
64875+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
64876+ return NULL;
64877+
64878+ mod = __module_address(addr);
64879+
64880 if (mod) {
64881 /* Make sure it's within the text section. */
64882- if (!within(addr, mod->module_init, mod->init_text_size)
64883- && !within(addr, mod->module_core, mod->core_text_size))
64884+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
64885 mod = NULL;
64886 }
64887 return mod;
64888diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
64889index 7e3443f..b2a1e6b 100644
64890--- a/kernel/mutex-debug.c
64891+++ b/kernel/mutex-debug.c
64892@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
64893 }
64894
64895 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
64896- struct thread_info *ti)
64897+ struct task_struct *task)
64898 {
64899 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
64900
64901 /* Mark the current thread as blocked on the lock: */
64902- ti->task->blocked_on = waiter;
64903+ task->blocked_on = waiter;
64904 }
64905
64906 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
64907- struct thread_info *ti)
64908+ struct task_struct *task)
64909 {
64910 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
64911- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
64912- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
64913- ti->task->blocked_on = NULL;
64914+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
64915+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
64916+ task->blocked_on = NULL;
64917
64918 list_del_init(&waiter->list);
64919 waiter->task = NULL;
64920diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
64921index 0799fd3..d06ae3b 100644
64922--- a/kernel/mutex-debug.h
64923+++ b/kernel/mutex-debug.h
64924@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
64925 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
64926 extern void debug_mutex_add_waiter(struct mutex *lock,
64927 struct mutex_waiter *waiter,
64928- struct thread_info *ti);
64929+ struct task_struct *task);
64930 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
64931- struct thread_info *ti);
64932+ struct task_struct *task);
64933 extern void debug_mutex_unlock(struct mutex *lock);
64934 extern void debug_mutex_init(struct mutex *lock, const char *name,
64935 struct lock_class_key *key);
64936diff --git a/kernel/mutex.c b/kernel/mutex.c
64937index 89096dd..f91ebc5 100644
64938--- a/kernel/mutex.c
64939+++ b/kernel/mutex.c
64940@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
64941 spin_lock_mutex(&lock->wait_lock, flags);
64942
64943 debug_mutex_lock_common(lock, &waiter);
64944- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
64945+ debug_mutex_add_waiter(lock, &waiter, task);
64946
64947 /* add waiting tasks to the end of the waitqueue (FIFO): */
64948 list_add_tail(&waiter.list, &lock->wait_list);
64949@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
64950 * TASK_UNINTERRUPTIBLE case.)
64951 */
64952 if (unlikely(signal_pending_state(state, task))) {
64953- mutex_remove_waiter(lock, &waiter,
64954- task_thread_info(task));
64955+ mutex_remove_waiter(lock, &waiter, task);
64956 mutex_release(&lock->dep_map, 1, ip);
64957 spin_unlock_mutex(&lock->wait_lock, flags);
64958
64959@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
64960 done:
64961 lock_acquired(&lock->dep_map, ip);
64962 /* got the lock - rejoice! */
64963- mutex_remove_waiter(lock, &waiter, current_thread_info());
64964+ mutex_remove_waiter(lock, &waiter, task);
64965 mutex_set_owner(lock);
64966
64967 /* set it to 0 if there are no waiters left: */
64968diff --git a/kernel/padata.c b/kernel/padata.c
64969index b452599..5d68f4e 100644
64970--- a/kernel/padata.c
64971+++ b/kernel/padata.c
64972@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
64973 padata->pd = pd;
64974 padata->cb_cpu = cb_cpu;
64975
64976- if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
64977- atomic_set(&pd->seq_nr, -1);
64978+ if (unlikely(atomic_read_unchecked(&pd->seq_nr) == pd->max_seq_nr))
64979+ atomic_set_unchecked(&pd->seq_nr, -1);
64980
64981- padata->seq_nr = atomic_inc_return(&pd->seq_nr);
64982+ padata->seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
64983
64984 target_cpu = padata_cpu_hash(padata);
64985 queue = per_cpu_ptr(pd->pqueue, target_cpu);
64986@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
64987 padata_init_pqueues(pd);
64988 padata_init_squeues(pd);
64989 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
64990- atomic_set(&pd->seq_nr, -1);
64991+ atomic_set_unchecked(&pd->seq_nr, -1);
64992 atomic_set(&pd->reorder_objects, 0);
64993 atomic_set(&pd->refcnt, 0);
64994 pd->pinst = pinst;
64995diff --git a/kernel/panic.c b/kernel/panic.c
64996index 3458469..342c500 100644
64997--- a/kernel/panic.c
64998+++ b/kernel/panic.c
64999@@ -78,7 +78,11 @@ NORET_TYPE void panic(const char * fmt, ...)
65000 va_end(args);
65001 printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
65002 #ifdef CONFIG_DEBUG_BUGVERBOSE
65003- dump_stack();
65004+ /*
65005+ * Avoid nested stack-dumping if a panic occurs during oops processing
65006+ */
65007+ if (!oops_in_progress)
65008+ dump_stack();
65009 #endif
65010
65011 /*
65012@@ -382,7 +386,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
65013 const char *board;
65014
65015 printk(KERN_WARNING "------------[ cut here ]------------\n");
65016- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
65017+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
65018 board = dmi_get_system_info(DMI_PRODUCT_NAME);
65019 if (board)
65020 printk(KERN_WARNING "Hardware name: %s\n", board);
65021@@ -437,7 +441,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
65022 */
65023 void __stack_chk_fail(void)
65024 {
65025- panic("stack-protector: Kernel stack is corrupted in: %p\n",
65026+ dump_stack();
65027+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
65028 __builtin_return_address(0));
65029 }
65030 EXPORT_SYMBOL(__stack_chk_fail);
65031diff --git a/kernel/pid.c b/kernel/pid.c
65032index fa5f722..0c93e57 100644
65033--- a/kernel/pid.c
65034+++ b/kernel/pid.c
65035@@ -33,6 +33,7 @@
65036 #include <linux/rculist.h>
65037 #include <linux/bootmem.h>
65038 #include <linux/hash.h>
65039+#include <linux/security.h>
65040 #include <linux/pid_namespace.h>
65041 #include <linux/init_task.h>
65042 #include <linux/syscalls.h>
65043@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
65044
65045 int pid_max = PID_MAX_DEFAULT;
65046
65047-#define RESERVED_PIDS 300
65048+#define RESERVED_PIDS 500
65049
65050 int pid_max_min = RESERVED_PIDS + 1;
65051 int pid_max_max = PID_MAX_LIMIT;
65052@@ -418,10 +419,18 @@ EXPORT_SYMBOL(pid_task);
65053 */
65054 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
65055 {
65056+ struct task_struct *task;
65057+
65058 rcu_lockdep_assert(rcu_read_lock_held(),
65059 "find_task_by_pid_ns() needs rcu_read_lock()"
65060 " protection");
65061- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
65062+
65063+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
65064+
65065+ if (gr_pid_is_chrooted(task))
65066+ return NULL;
65067+
65068+ return task;
65069 }
65070
65071 struct task_struct *find_task_by_vpid(pid_t vnr)
65072@@ -429,6 +438,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
65073 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
65074 }
65075
65076+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
65077+{
65078+ rcu_lockdep_assert(rcu_read_lock_held(),
65079+ "find_task_by_pid_ns() needs rcu_read_lock()"
65080+ " protection");
65081+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
65082+}
65083+
65084 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
65085 {
65086 struct pid *pid;
65087diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
65088index e7cb76d..75eceb3 100644
65089--- a/kernel/posix-cpu-timers.c
65090+++ b/kernel/posix-cpu-timers.c
65091@@ -6,6 +6,7 @@
65092 #include <linux/posix-timers.h>
65093 #include <linux/errno.h>
65094 #include <linux/math64.h>
65095+#include <linux/security.h>
65096 #include <asm/uaccess.h>
65097 #include <linux/kernel_stat.h>
65098 #include <trace/events/timer.h>
65099@@ -1606,14 +1607,14 @@ struct k_clock clock_posix_cpu = {
65100
65101 static __init int init_posix_cpu_timers(void)
65102 {
65103- struct k_clock process = {
65104+ static struct k_clock process = {
65105 .clock_getres = process_cpu_clock_getres,
65106 .clock_get = process_cpu_clock_get,
65107 .timer_create = process_cpu_timer_create,
65108 .nsleep = process_cpu_nsleep,
65109 .nsleep_restart = process_cpu_nsleep_restart,
65110 };
65111- struct k_clock thread = {
65112+ static struct k_clock thread = {
65113 .clock_getres = thread_cpu_clock_getres,
65114 .clock_get = thread_cpu_clock_get,
65115 .timer_create = thread_cpu_timer_create,
65116diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
65117index 69185ae..cc2847a 100644
65118--- a/kernel/posix-timers.c
65119+++ b/kernel/posix-timers.c
65120@@ -43,6 +43,7 @@
65121 #include <linux/idr.h>
65122 #include <linux/posix-clock.h>
65123 #include <linux/posix-timers.h>
65124+#include <linux/grsecurity.h>
65125 #include <linux/syscalls.h>
65126 #include <linux/wait.h>
65127 #include <linux/workqueue.h>
65128@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
65129 * which we beg off on and pass to do_sys_settimeofday().
65130 */
65131
65132-static struct k_clock posix_clocks[MAX_CLOCKS];
65133+static struct k_clock *posix_clocks[MAX_CLOCKS];
65134
65135 /*
65136 * These ones are defined below.
65137@@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
65138 */
65139 static __init int init_posix_timers(void)
65140 {
65141- struct k_clock clock_realtime = {
65142+ static struct k_clock clock_realtime = {
65143 .clock_getres = hrtimer_get_res,
65144 .clock_get = posix_clock_realtime_get,
65145 .clock_set = posix_clock_realtime_set,
65146@@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
65147 .timer_get = common_timer_get,
65148 .timer_del = common_timer_del,
65149 };
65150- struct k_clock clock_monotonic = {
65151+ static struct k_clock clock_monotonic = {
65152 .clock_getres = hrtimer_get_res,
65153 .clock_get = posix_ktime_get_ts,
65154 .nsleep = common_nsleep,
65155@@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
65156 .timer_get = common_timer_get,
65157 .timer_del = common_timer_del,
65158 };
65159- struct k_clock clock_monotonic_raw = {
65160+ static struct k_clock clock_monotonic_raw = {
65161 .clock_getres = hrtimer_get_res,
65162 .clock_get = posix_get_monotonic_raw,
65163 };
65164- struct k_clock clock_realtime_coarse = {
65165+ static struct k_clock clock_realtime_coarse = {
65166 .clock_getres = posix_get_coarse_res,
65167 .clock_get = posix_get_realtime_coarse,
65168 };
65169- struct k_clock clock_monotonic_coarse = {
65170+ static struct k_clock clock_monotonic_coarse = {
65171 .clock_getres = posix_get_coarse_res,
65172 .clock_get = posix_get_monotonic_coarse,
65173 };
65174- struct k_clock clock_boottime = {
65175+ static struct k_clock clock_boottime = {
65176 .clock_getres = hrtimer_get_res,
65177 .clock_get = posix_get_boottime,
65178 .nsleep = common_nsleep,
65179@@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
65180 return;
65181 }
65182
65183- posix_clocks[clock_id] = *new_clock;
65184+ posix_clocks[clock_id] = new_clock;
65185 }
65186 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
65187
65188@@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
65189 return (id & CLOCKFD_MASK) == CLOCKFD ?
65190 &clock_posix_dynamic : &clock_posix_cpu;
65191
65192- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
65193+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
65194 return NULL;
65195- return &posix_clocks[id];
65196+ return posix_clocks[id];
65197 }
65198
65199 static int common_timer_create(struct k_itimer *new_timer)
65200@@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
65201 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
65202 return -EFAULT;
65203
65204+ /* only the CLOCK_REALTIME clock can be set, all other clocks
65205+ have their clock_set fptr set to a nosettime dummy function
65206+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
65207+ call common_clock_set, which calls do_sys_settimeofday, which
65208+ we hook
65209+ */
65210+
65211 return kc->clock_set(which_clock, &new_tp);
65212 }
65213
65214diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
65215index d523593..68197a4 100644
65216--- a/kernel/power/poweroff.c
65217+++ b/kernel/power/poweroff.c
65218@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
65219 .enable_mask = SYSRQ_ENABLE_BOOT,
65220 };
65221
65222-static int pm_sysrq_init(void)
65223+static int __init pm_sysrq_init(void)
65224 {
65225 register_sysrq_key('o', &sysrq_poweroff_op);
65226 return 0;
65227diff --git a/kernel/power/process.c b/kernel/power/process.c
65228index 3d4b954..11af930 100644
65229--- a/kernel/power/process.c
65230+++ b/kernel/power/process.c
65231@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_only)
65232 u64 elapsed_csecs64;
65233 unsigned int elapsed_csecs;
65234 bool wakeup = false;
65235+ bool timedout = false;
65236
65237 do_gettimeofday(&start);
65238
65239@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_only)
65240
65241 while (true) {
65242 todo = 0;
65243+ if (time_after(jiffies, end_time))
65244+ timedout = true;
65245 read_lock(&tasklist_lock);
65246 do_each_thread(g, p) {
65247 if (frozen(p) || !freezable(p))
65248@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_only)
65249 * try_to_stop() after schedule() in ptrace/signal
65250 * stop sees TIF_FREEZE.
65251 */
65252- if (!task_is_stopped_or_traced(p) &&
65253- !freezer_should_skip(p))
65254+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
65255 todo++;
65256+ if (timedout) {
65257+ printk(KERN_ERR "Task refusing to freeze:\n");
65258+ sched_show_task(p);
65259+ }
65260+ }
65261 } while_each_thread(g, p);
65262 read_unlock(&tasklist_lock);
65263
65264@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_only)
65265 todo += wq_busy;
65266 }
65267
65268- if (!todo || time_after(jiffies, end_time))
65269+ if (!todo || timedout)
65270 break;
65271
65272 if (pm_wakeup_pending()) {
65273diff --git a/kernel/printk.c b/kernel/printk.c
65274index 7982a0a..2095fdc 100644
65275--- a/kernel/printk.c
65276+++ b/kernel/printk.c
65277@@ -313,6 +313,11 @@ static int check_syslog_permissions(int type, bool from_file)
65278 if (from_file && type != SYSLOG_ACTION_OPEN)
65279 return 0;
65280
65281+#ifdef CONFIG_GRKERNSEC_DMESG
65282+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
65283+ return -EPERM;
65284+#endif
65285+
65286 if (syslog_action_restricted(type)) {
65287 if (capable(CAP_SYSLOG))
65288 return 0;
65289diff --git a/kernel/profile.c b/kernel/profile.c
65290index 76b8e77..a2930e8 100644
65291--- a/kernel/profile.c
65292+++ b/kernel/profile.c
65293@@ -39,7 +39,7 @@ struct profile_hit {
65294 /* Oprofile timer tick hook */
65295 static int (*timer_hook)(struct pt_regs *) __read_mostly;
65296
65297-static atomic_t *prof_buffer;
65298+static atomic_unchecked_t *prof_buffer;
65299 static unsigned long prof_len, prof_shift;
65300
65301 int prof_on __read_mostly;
65302@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
65303 hits[i].pc = 0;
65304 continue;
65305 }
65306- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
65307+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
65308 hits[i].hits = hits[i].pc = 0;
65309 }
65310 }
65311@@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
65312 * Add the current hit(s) and flush the write-queue out
65313 * to the global buffer:
65314 */
65315- atomic_add(nr_hits, &prof_buffer[pc]);
65316+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
65317 for (i = 0; i < NR_PROFILE_HIT; ++i) {
65318- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
65319+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
65320 hits[i].pc = hits[i].hits = 0;
65321 }
65322 out:
65323@@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
65324 {
65325 unsigned long pc;
65326 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
65327- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
65328+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
65329 }
65330 #endif /* !CONFIG_SMP */
65331
65332@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
65333 return -EFAULT;
65334 buf++; p++; count--; read++;
65335 }
65336- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
65337+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
65338 if (copy_to_user(buf, (void *)pnt, count))
65339 return -EFAULT;
65340 read += count;
65341@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
65342 }
65343 #endif
65344 profile_discard_flip_buffers();
65345- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
65346+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
65347 return count;
65348 }
65349
65350diff --git a/kernel/ptrace.c b/kernel/ptrace.c
65351index 78ab24a..332c915 100644
65352--- a/kernel/ptrace.c
65353+++ b/kernel/ptrace.c
65354@@ -172,7 +172,8 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state)
65355 return ret;
65356 }
65357
65358-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
65359+static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
65360+ unsigned int log)
65361 {
65362 const struct cred *cred = current_cred(), *tcred;
65363
65364@@ -198,7 +199,8 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
65365 cred->gid == tcred->sgid &&
65366 cred->gid == tcred->gid))
65367 goto ok;
65368- if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
65369+ if ((!log && ns_capable_nolog(tcred->user->user_ns, CAP_SYS_PTRACE)) ||
65370+ (log && ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)))
65371 goto ok;
65372 rcu_read_unlock();
65373 return -EPERM;
65374@@ -207,7 +209,9 @@ ok:
65375 smp_rmb();
65376 if (task->mm)
65377 dumpable = get_dumpable(task->mm);
65378- if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
65379+ if (!dumpable &&
65380+ ((!log && !task_ns_capable_nolog(task, CAP_SYS_PTRACE)) ||
65381+ (log && !task_ns_capable(task, CAP_SYS_PTRACE))))
65382 return -EPERM;
65383
65384 return security_ptrace_access_check(task, mode);
65385@@ -217,7 +221,21 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
65386 {
65387 int err;
65388 task_lock(task);
65389- err = __ptrace_may_access(task, mode);
65390+ err = __ptrace_may_access(task, mode, 0);
65391+ task_unlock(task);
65392+ return !err;
65393+}
65394+
65395+bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode)
65396+{
65397+ return __ptrace_may_access(task, mode, 0);
65398+}
65399+
65400+bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
65401+{
65402+ int err;
65403+ task_lock(task);
65404+ err = __ptrace_may_access(task, mode, 1);
65405 task_unlock(task);
65406 return !err;
65407 }
65408@@ -262,7 +280,7 @@ static int ptrace_attach(struct task_struct *task, long request,
65409 goto out;
65410
65411 task_lock(task);
65412- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
65413+ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
65414 task_unlock(task);
65415 if (retval)
65416 goto unlock_creds;
65417@@ -277,7 +295,7 @@ static int ptrace_attach(struct task_struct *task, long request,
65418 task->ptrace = PT_PTRACED;
65419 if (seize)
65420 task->ptrace |= PT_SEIZED;
65421- if (task_ns_capable(task, CAP_SYS_PTRACE))
65422+ if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
65423 task->ptrace |= PT_PTRACE_CAP;
65424
65425 __ptrace_link(task, current);
65426@@ -483,7 +501,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
65427 break;
65428 return -EIO;
65429 }
65430- if (copy_to_user(dst, buf, retval))
65431+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
65432 return -EFAULT;
65433 copied += retval;
65434 src += retval;
65435@@ -680,7 +698,7 @@ int ptrace_request(struct task_struct *child, long request,
65436 bool seized = child->ptrace & PT_SEIZED;
65437 int ret = -EIO;
65438 siginfo_t siginfo, *si;
65439- void __user *datavp = (void __user *) data;
65440+ void __user *datavp = (__force void __user *) data;
65441 unsigned long __user *datalp = datavp;
65442 unsigned long flags;
65443
65444@@ -882,14 +900,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
65445 goto out;
65446 }
65447
65448+ if (gr_handle_ptrace(child, request)) {
65449+ ret = -EPERM;
65450+ goto out_put_task_struct;
65451+ }
65452+
65453 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
65454 ret = ptrace_attach(child, request, data);
65455 /*
65456 * Some architectures need to do book-keeping after
65457 * a ptrace attach.
65458 */
65459- if (!ret)
65460+ if (!ret) {
65461 arch_ptrace_attach(child);
65462+ gr_audit_ptrace(child);
65463+ }
65464 goto out_put_task_struct;
65465 }
65466
65467@@ -915,7 +940,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
65468 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
65469 if (copied != sizeof(tmp))
65470 return -EIO;
65471- return put_user(tmp, (unsigned long __user *)data);
65472+ return put_user(tmp, (__force unsigned long __user *)data);
65473 }
65474
65475 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
65476@@ -1025,14 +1050,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
65477 goto out;
65478 }
65479
65480+ if (gr_handle_ptrace(child, request)) {
65481+ ret = -EPERM;
65482+ goto out_put_task_struct;
65483+ }
65484+
65485 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
65486 ret = ptrace_attach(child, request, data);
65487 /*
65488 * Some architectures need to do book-keeping after
65489 * a ptrace attach.
65490 */
65491- if (!ret)
65492+ if (!ret) {
65493 arch_ptrace_attach(child);
65494+ gr_audit_ptrace(child);
65495+ }
65496 goto out_put_task_struct;
65497 }
65498
65499diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
65500index 764825c..3aa6ac4 100644
65501--- a/kernel/rcutorture.c
65502+++ b/kernel/rcutorture.c
65503@@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
65504 { 0 };
65505 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
65506 { 0 };
65507-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
65508-static atomic_t n_rcu_torture_alloc;
65509-static atomic_t n_rcu_torture_alloc_fail;
65510-static atomic_t n_rcu_torture_free;
65511-static atomic_t n_rcu_torture_mberror;
65512-static atomic_t n_rcu_torture_error;
65513+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
65514+static atomic_unchecked_t n_rcu_torture_alloc;
65515+static atomic_unchecked_t n_rcu_torture_alloc_fail;
65516+static atomic_unchecked_t n_rcu_torture_free;
65517+static atomic_unchecked_t n_rcu_torture_mberror;
65518+static atomic_unchecked_t n_rcu_torture_error;
65519 static long n_rcu_torture_boost_ktrerror;
65520 static long n_rcu_torture_boost_rterror;
65521 static long n_rcu_torture_boost_failure;
65522@@ -223,11 +223,11 @@ rcu_torture_alloc(void)
65523
65524 spin_lock_bh(&rcu_torture_lock);
65525 if (list_empty(&rcu_torture_freelist)) {
65526- atomic_inc(&n_rcu_torture_alloc_fail);
65527+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
65528 spin_unlock_bh(&rcu_torture_lock);
65529 return NULL;
65530 }
65531- atomic_inc(&n_rcu_torture_alloc);
65532+ atomic_inc_unchecked(&n_rcu_torture_alloc);
65533 p = rcu_torture_freelist.next;
65534 list_del_init(p);
65535 spin_unlock_bh(&rcu_torture_lock);
65536@@ -240,7 +240,7 @@ rcu_torture_alloc(void)
65537 static void
65538 rcu_torture_free(struct rcu_torture *p)
65539 {
65540- atomic_inc(&n_rcu_torture_free);
65541+ atomic_inc_unchecked(&n_rcu_torture_free);
65542 spin_lock_bh(&rcu_torture_lock);
65543 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
65544 spin_unlock_bh(&rcu_torture_lock);
65545@@ -360,7 +360,7 @@ rcu_torture_cb(struct rcu_head *p)
65546 i = rp->rtort_pipe_count;
65547 if (i > RCU_TORTURE_PIPE_LEN)
65548 i = RCU_TORTURE_PIPE_LEN;
65549- atomic_inc(&rcu_torture_wcount[i]);
65550+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
65551 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
65552 rp->rtort_mbtest = 0;
65553 rcu_torture_free(rp);
65554@@ -407,7 +407,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
65555 i = rp->rtort_pipe_count;
65556 if (i > RCU_TORTURE_PIPE_LEN)
65557 i = RCU_TORTURE_PIPE_LEN;
65558- atomic_inc(&rcu_torture_wcount[i]);
65559+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
65560 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
65561 rp->rtort_mbtest = 0;
65562 list_del(&rp->rtort_free);
65563@@ -872,7 +872,7 @@ rcu_torture_writer(void *arg)
65564 i = old_rp->rtort_pipe_count;
65565 if (i > RCU_TORTURE_PIPE_LEN)
65566 i = RCU_TORTURE_PIPE_LEN;
65567- atomic_inc(&rcu_torture_wcount[i]);
65568+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
65569 old_rp->rtort_pipe_count++;
65570 cur_ops->deferred_free(old_rp);
65571 }
65572@@ -940,7 +940,7 @@ static void rcu_torture_timer(unsigned long unused)
65573 return;
65574 }
65575 if (p->rtort_mbtest == 0)
65576- atomic_inc(&n_rcu_torture_mberror);
65577+ atomic_inc_unchecked(&n_rcu_torture_mberror);
65578 spin_lock(&rand_lock);
65579 cur_ops->read_delay(&rand);
65580 n_rcu_torture_timers++;
65581@@ -1001,7 +1001,7 @@ rcu_torture_reader(void *arg)
65582 continue;
65583 }
65584 if (p->rtort_mbtest == 0)
65585- atomic_inc(&n_rcu_torture_mberror);
65586+ atomic_inc_unchecked(&n_rcu_torture_mberror);
65587 cur_ops->read_delay(&rand);
65588 preempt_disable();
65589 pipe_count = p->rtort_pipe_count;
65590@@ -1060,16 +1060,16 @@ rcu_torture_printk(char *page)
65591 rcu_torture_current,
65592 rcu_torture_current_version,
65593 list_empty(&rcu_torture_freelist),
65594- atomic_read(&n_rcu_torture_alloc),
65595- atomic_read(&n_rcu_torture_alloc_fail),
65596- atomic_read(&n_rcu_torture_free),
65597- atomic_read(&n_rcu_torture_mberror),
65598+ atomic_read_unchecked(&n_rcu_torture_alloc),
65599+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
65600+ atomic_read_unchecked(&n_rcu_torture_free),
65601+ atomic_read_unchecked(&n_rcu_torture_mberror),
65602 n_rcu_torture_boost_ktrerror,
65603 n_rcu_torture_boost_rterror,
65604 n_rcu_torture_boost_failure,
65605 n_rcu_torture_boosts,
65606 n_rcu_torture_timers);
65607- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
65608+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
65609 n_rcu_torture_boost_ktrerror != 0 ||
65610 n_rcu_torture_boost_rterror != 0 ||
65611 n_rcu_torture_boost_failure != 0)
65612@@ -1077,7 +1077,7 @@ rcu_torture_printk(char *page)
65613 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
65614 if (i > 1) {
65615 cnt += sprintf(&page[cnt], "!!! ");
65616- atomic_inc(&n_rcu_torture_error);
65617+ atomic_inc_unchecked(&n_rcu_torture_error);
65618 WARN_ON_ONCE(1);
65619 }
65620 cnt += sprintf(&page[cnt], "Reader Pipe: ");
65621@@ -1091,7 +1091,7 @@ rcu_torture_printk(char *page)
65622 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
65623 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
65624 cnt += sprintf(&page[cnt], " %d",
65625- atomic_read(&rcu_torture_wcount[i]));
65626+ atomic_read_unchecked(&rcu_torture_wcount[i]));
65627 }
65628 cnt += sprintf(&page[cnt], "\n");
65629 if (cur_ops->stats)
65630@@ -1401,7 +1401,7 @@ rcu_torture_cleanup(void)
65631
65632 if (cur_ops->cleanup)
65633 cur_ops->cleanup();
65634- if (atomic_read(&n_rcu_torture_error))
65635+ if (atomic_read_unchecked(&n_rcu_torture_error))
65636 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
65637 else
65638 rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
65639@@ -1465,17 +1465,17 @@ rcu_torture_init(void)
65640
65641 rcu_torture_current = NULL;
65642 rcu_torture_current_version = 0;
65643- atomic_set(&n_rcu_torture_alloc, 0);
65644- atomic_set(&n_rcu_torture_alloc_fail, 0);
65645- atomic_set(&n_rcu_torture_free, 0);
65646- atomic_set(&n_rcu_torture_mberror, 0);
65647- atomic_set(&n_rcu_torture_error, 0);
65648+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
65649+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
65650+ atomic_set_unchecked(&n_rcu_torture_free, 0);
65651+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
65652+ atomic_set_unchecked(&n_rcu_torture_error, 0);
65653 n_rcu_torture_boost_ktrerror = 0;
65654 n_rcu_torture_boost_rterror = 0;
65655 n_rcu_torture_boost_failure = 0;
65656 n_rcu_torture_boosts = 0;
65657 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
65658- atomic_set(&rcu_torture_wcount[i], 0);
65659+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
65660 for_each_possible_cpu(cpu) {
65661 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
65662 per_cpu(rcu_torture_count, cpu)[i] = 0;
65663diff --git a/kernel/rcutree.c b/kernel/rcutree.c
65664index 6b76d81..7afc1b3 100644
65665--- a/kernel/rcutree.c
65666+++ b/kernel/rcutree.c
65667@@ -367,9 +367,9 @@ void rcu_enter_nohz(void)
65668 trace_rcu_dyntick("Start");
65669 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
65670 smp_mb__before_atomic_inc(); /* See above. */
65671- atomic_inc(&rdtp->dynticks);
65672+ atomic_inc_unchecked(&rdtp->dynticks);
65673 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
65674- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
65675+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
65676 local_irq_restore(flags);
65677 }
65678
65679@@ -391,10 +391,10 @@ void rcu_exit_nohz(void)
65680 return;
65681 }
65682 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
65683- atomic_inc(&rdtp->dynticks);
65684+ atomic_inc_unchecked(&rdtp->dynticks);
65685 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
65686 smp_mb__after_atomic_inc(); /* See above. */
65687- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
65688+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
65689 trace_rcu_dyntick("End");
65690 local_irq_restore(flags);
65691 }
65692@@ -411,14 +411,14 @@ void rcu_nmi_enter(void)
65693 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
65694
65695 if (rdtp->dynticks_nmi_nesting == 0 &&
65696- (atomic_read(&rdtp->dynticks) & 0x1))
65697+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
65698 return;
65699 rdtp->dynticks_nmi_nesting++;
65700 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
65701- atomic_inc(&rdtp->dynticks);
65702+ atomic_inc_unchecked(&rdtp->dynticks);
65703 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
65704 smp_mb__after_atomic_inc(); /* See above. */
65705- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
65706+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
65707 }
65708
65709 /**
65710@@ -437,9 +437,9 @@ void rcu_nmi_exit(void)
65711 return;
65712 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
65713 smp_mb__before_atomic_inc(); /* See above. */
65714- atomic_inc(&rdtp->dynticks);
65715+ atomic_inc_unchecked(&rdtp->dynticks);
65716 smp_mb__after_atomic_inc(); /* Force delay to next write. */
65717- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
65718+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
65719 }
65720
65721 /**
65722@@ -474,7 +474,7 @@ void rcu_irq_exit(void)
65723 */
65724 static int dyntick_save_progress_counter(struct rcu_data *rdp)
65725 {
65726- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
65727+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
65728 return 0;
65729 }
65730
65731@@ -489,7 +489,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
65732 unsigned int curr;
65733 unsigned int snap;
65734
65735- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
65736+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
65737 snap = (unsigned int)rdp->dynticks_snap;
65738
65739 /*
65740@@ -1552,7 +1552,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
65741 /*
65742 * Do RCU core processing for the current CPU.
65743 */
65744-static void rcu_process_callbacks(struct softirq_action *unused)
65745+static void rcu_process_callbacks(void)
65746 {
65747 trace_rcu_utilization("Start RCU core");
65748 __rcu_process_callbacks(&rcu_sched_state,
65749diff --git a/kernel/rcutree.h b/kernel/rcutree.h
65750index 849ce9e..74bc9de 100644
65751--- a/kernel/rcutree.h
65752+++ b/kernel/rcutree.h
65753@@ -86,7 +86,7 @@
65754 struct rcu_dynticks {
65755 int dynticks_nesting; /* Track irq/process nesting level. */
65756 int dynticks_nmi_nesting; /* Track NMI nesting level. */
65757- atomic_t dynticks; /* Even value for dynticks-idle, else odd. */
65758+ atomic_unchecked_t dynticks; /* Even value for dynticks-idle, else odd. */
65759 };
65760
65761 /* RCU's kthread states for tracing. */
65762diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
65763index 4b9b9f8..2326053 100644
65764--- a/kernel/rcutree_plugin.h
65765+++ b/kernel/rcutree_plugin.h
65766@@ -842,7 +842,7 @@ void synchronize_rcu_expedited(void)
65767
65768 /* Clean up and exit. */
65769 smp_mb(); /* ensure expedited GP seen before counter increment. */
65770- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
65771+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
65772 unlock_mb_ret:
65773 mutex_unlock(&sync_rcu_preempt_exp_mutex);
65774 mb_ret:
65775@@ -1815,8 +1815,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
65776
65777 #else /* #ifndef CONFIG_SMP */
65778
65779-static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
65780-static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
65781+static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
65782+static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
65783
65784 static int synchronize_sched_expedited_cpu_stop(void *data)
65785 {
65786@@ -1871,7 +1871,7 @@ void synchronize_sched_expedited(void)
65787 int firstsnap, s, snap, trycount = 0;
65788
65789 /* Note that atomic_inc_return() implies full memory barrier. */
65790- firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
65791+ firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
65792 get_online_cpus();
65793
65794 /*
65795@@ -1892,7 +1892,7 @@ void synchronize_sched_expedited(void)
65796 }
65797
65798 /* Check to see if someone else did our work for us. */
65799- s = atomic_read(&sync_sched_expedited_done);
65800+ s = atomic_read_unchecked(&sync_sched_expedited_done);
65801 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
65802 smp_mb(); /* ensure test happens before caller kfree */
65803 return;
65804@@ -1907,7 +1907,7 @@ void synchronize_sched_expedited(void)
65805 * grace period works for us.
65806 */
65807 get_online_cpus();
65808- snap = atomic_read(&sync_sched_expedited_started) - 1;
65809+ snap = atomic_read_unchecked(&sync_sched_expedited_started) - 1;
65810 smp_mb(); /* ensure read is before try_stop_cpus(). */
65811 }
65812
65813@@ -1918,12 +1918,12 @@ void synchronize_sched_expedited(void)
65814 * than we did beat us to the punch.
65815 */
65816 do {
65817- s = atomic_read(&sync_sched_expedited_done);
65818+ s = atomic_read_unchecked(&sync_sched_expedited_done);
65819 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
65820 smp_mb(); /* ensure test happens before caller kfree */
65821 break;
65822 }
65823- } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
65824+ } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
65825
65826 put_online_cpus();
65827 }
65828@@ -1985,7 +1985,7 @@ int rcu_needs_cpu(int cpu)
65829 for_each_online_cpu(thatcpu) {
65830 if (thatcpu == cpu)
65831 continue;
65832- snap = atomic_add_return(0, &per_cpu(rcu_dynticks,
65833+ snap = atomic_add_return_unchecked(0, &per_cpu(rcu_dynticks,
65834 thatcpu).dynticks);
65835 smp_mb(); /* Order sampling of snap with end of grace period. */
65836 if ((snap & 0x1) != 0) {
65837diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
65838index 9feffa4..54058df 100644
65839--- a/kernel/rcutree_trace.c
65840+++ b/kernel/rcutree_trace.c
65841@@ -69,7 +69,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
65842 rdp->qs_pending);
65843 #ifdef CONFIG_NO_HZ
65844 seq_printf(m, " dt=%d/%d/%d df=%lu",
65845- atomic_read(&rdp->dynticks->dynticks),
65846+ atomic_read_unchecked(&rdp->dynticks->dynticks),
65847 rdp->dynticks->dynticks_nesting,
65848 rdp->dynticks->dynticks_nmi_nesting,
65849 rdp->dynticks_fqs);
65850@@ -143,7 +143,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
65851 rdp->qs_pending);
65852 #ifdef CONFIG_NO_HZ
65853 seq_printf(m, ",%d,%d,%d,%lu",
65854- atomic_read(&rdp->dynticks->dynticks),
65855+ atomic_read_unchecked(&rdp->dynticks->dynticks),
65856 rdp->dynticks->dynticks_nesting,
65857 rdp->dynticks->dynticks_nmi_nesting,
65858 rdp->dynticks_fqs);
65859diff --git a/kernel/relay.c b/kernel/relay.c
65860index 226fade..b6f803a 100644
65861--- a/kernel/relay.c
65862+++ b/kernel/relay.c
65863@@ -164,10 +164,14 @@ depopulate:
65864 */
65865 static struct rchan_buf *relay_create_buf(struct rchan *chan)
65866 {
65867- struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
65868+ struct rchan_buf *buf;
65869+
65870+ if (chan->n_subbufs > UINT_MAX / sizeof(size_t *))
65871+ return NULL;
65872+
65873+ buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
65874 if (!buf)
65875 return NULL;
65876-
65877 buf->padding = kmalloc(chan->n_subbufs * sizeof(size_t *), GFP_KERNEL);
65878 if (!buf->padding)
65879 goto free_buf;
65880@@ -574,6 +578,8 @@ struct rchan *relay_open(const char *base_filename,
65881
65882 if (!(subbuf_size && n_subbufs))
65883 return NULL;
65884+ if (subbuf_size > UINT_MAX / n_subbufs)
65885+ return NULL;
65886
65887 chan = kzalloc(sizeof(struct rchan), GFP_KERNEL);
65888 if (!chan)
65889diff --git a/kernel/resource.c b/kernel/resource.c
65890index 7640b3a..5879283 100644
65891--- a/kernel/resource.c
65892+++ b/kernel/resource.c
65893@@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
65894
65895 static int __init ioresources_init(void)
65896 {
65897+#ifdef CONFIG_GRKERNSEC_PROC_ADD
65898+#ifdef CONFIG_GRKERNSEC_PROC_USER
65899+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
65900+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
65901+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65902+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
65903+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
65904+#endif
65905+#else
65906 proc_create("ioports", 0, NULL, &proc_ioports_operations);
65907 proc_create("iomem", 0, NULL, &proc_iomem_operations);
65908+#endif
65909 return 0;
65910 }
65911 __initcall(ioresources_init);
65912diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
65913index 3d9f31c..7fefc9e 100644
65914--- a/kernel/rtmutex-tester.c
65915+++ b/kernel/rtmutex-tester.c
65916@@ -20,7 +20,7 @@
65917 #define MAX_RT_TEST_MUTEXES 8
65918
65919 static spinlock_t rttest_lock;
65920-static atomic_t rttest_event;
65921+static atomic_unchecked_t rttest_event;
65922
65923 struct test_thread_data {
65924 int opcode;
65925@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65926
65927 case RTTEST_LOCKCONT:
65928 td->mutexes[td->opdata] = 1;
65929- td->event = atomic_add_return(1, &rttest_event);
65930+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65931 return 0;
65932
65933 case RTTEST_RESET:
65934@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65935 return 0;
65936
65937 case RTTEST_RESETEVENT:
65938- atomic_set(&rttest_event, 0);
65939+ atomic_set_unchecked(&rttest_event, 0);
65940 return 0;
65941
65942 default:
65943@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65944 return ret;
65945
65946 td->mutexes[id] = 1;
65947- td->event = atomic_add_return(1, &rttest_event);
65948+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65949 rt_mutex_lock(&mutexes[id]);
65950- td->event = atomic_add_return(1, &rttest_event);
65951+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65952 td->mutexes[id] = 4;
65953 return 0;
65954
65955@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65956 return ret;
65957
65958 td->mutexes[id] = 1;
65959- td->event = atomic_add_return(1, &rttest_event);
65960+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65961 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
65962- td->event = atomic_add_return(1, &rttest_event);
65963+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65964 td->mutexes[id] = ret ? 0 : 4;
65965 return ret ? -EINTR : 0;
65966
65967@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
65968 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
65969 return ret;
65970
65971- td->event = atomic_add_return(1, &rttest_event);
65972+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65973 rt_mutex_unlock(&mutexes[id]);
65974- td->event = atomic_add_return(1, &rttest_event);
65975+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65976 td->mutexes[id] = 0;
65977 return 0;
65978
65979@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
65980 break;
65981
65982 td->mutexes[dat] = 2;
65983- td->event = atomic_add_return(1, &rttest_event);
65984+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65985 break;
65986
65987 default:
65988@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
65989 return;
65990
65991 td->mutexes[dat] = 3;
65992- td->event = atomic_add_return(1, &rttest_event);
65993+ td->event = atomic_add_return_unchecked(1, &rttest_event);
65994 break;
65995
65996 case RTTEST_LOCKNOWAIT:
65997@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
65998 return;
65999
66000 td->mutexes[dat] = 1;
66001- td->event = atomic_add_return(1, &rttest_event);
66002+ td->event = atomic_add_return_unchecked(1, &rttest_event);
66003 return;
66004
66005 default:
66006diff --git a/kernel/sched.c b/kernel/sched.c
66007index d6b149c..896cbb8 100644
66008--- a/kernel/sched.c
66009+++ b/kernel/sched.c
66010@@ -4389,6 +4389,19 @@ pick_next_task(struct rq *rq)
66011 BUG(); /* the idle class will always have a runnable task */
66012 }
66013
66014+#ifdef CONFIG_GRKERNSEC_SETXID
66015+extern void gr_delayed_cred_worker(void);
66016+static inline void gr_cred_schedule(void)
66017+{
66018+ if (unlikely(current->delayed_cred))
66019+ gr_delayed_cred_worker();
66020+}
66021+#else
66022+static inline void gr_cred_schedule(void)
66023+{
66024+}
66025+#endif
66026+
66027 /*
66028 * __schedule() is the main scheduler function.
66029 */
66030@@ -4408,6 +4421,8 @@ need_resched:
66031
66032 schedule_debug(prev);
66033
66034+ gr_cred_schedule();
66035+
66036 if (sched_feat(HRTICK))
66037 hrtick_clear(rq);
66038
66039@@ -5098,6 +5113,8 @@ int can_nice(const struct task_struct *p, const int nice)
66040 /* convert nice value [19,-20] to rlimit style value [1,40] */
66041 int nice_rlim = 20 - nice;
66042
66043+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
66044+
66045 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
66046 capable(CAP_SYS_NICE));
66047 }
66048@@ -5131,7 +5148,8 @@ SYSCALL_DEFINE1(nice, int, increment)
66049 if (nice > 19)
66050 nice = 19;
66051
66052- if (increment < 0 && !can_nice(current, nice))
66053+ if (increment < 0 && (!can_nice(current, nice) ||
66054+ gr_handle_chroot_nice()))
66055 return -EPERM;
66056
66057 retval = security_task_setnice(current, nice);
66058@@ -5288,6 +5306,7 @@ recheck:
66059 unsigned long rlim_rtprio =
66060 task_rlimit(p, RLIMIT_RTPRIO);
66061
66062+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
66063 /* can't set/change the rt policy */
66064 if (policy != p->policy && !rlim_rtprio)
66065 return -EPERM;
66066diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
66067index 429242f..d7cca82 100644
66068--- a/kernel/sched_autogroup.c
66069+++ b/kernel/sched_autogroup.c
66070@@ -7,7 +7,7 @@
66071
66072 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
66073 static struct autogroup autogroup_default;
66074-static atomic_t autogroup_seq_nr;
66075+static atomic_unchecked_t autogroup_seq_nr;
66076
66077 static void __init autogroup_init(struct task_struct *init_task)
66078 {
66079@@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
66080
66081 kref_init(&ag->kref);
66082 init_rwsem(&ag->lock);
66083- ag->id = atomic_inc_return(&autogroup_seq_nr);
66084+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
66085 ag->tg = tg;
66086 #ifdef CONFIG_RT_GROUP_SCHED
66087 /*
66088diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
66089index 8a39fa3..34f3dbc 100644
66090--- a/kernel/sched_fair.c
66091+++ b/kernel/sched_fair.c
66092@@ -4801,7 +4801,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
66093 * run_rebalance_domains is triggered when needed from the scheduler tick.
66094 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
66095 */
66096-static void run_rebalance_domains(struct softirq_action *h)
66097+static void run_rebalance_domains(void)
66098 {
66099 int this_cpu = smp_processor_id();
66100 struct rq *this_rq = cpu_rq(this_cpu);
66101diff --git a/kernel/signal.c b/kernel/signal.c
66102index 2065515..aed2987 100644
66103--- a/kernel/signal.c
66104+++ b/kernel/signal.c
66105@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep;
66106
66107 int print_fatal_signals __read_mostly;
66108
66109-static void __user *sig_handler(struct task_struct *t, int sig)
66110+static __sighandler_t sig_handler(struct task_struct *t, int sig)
66111 {
66112 return t->sighand->action[sig - 1].sa.sa_handler;
66113 }
66114
66115-static int sig_handler_ignored(void __user *handler, int sig)
66116+static int sig_handler_ignored(__sighandler_t handler, int sig)
66117 {
66118 /* Is it explicitly or implicitly ignored? */
66119 return handler == SIG_IGN ||
66120@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
66121 static int sig_task_ignored(struct task_struct *t, int sig,
66122 int from_ancestor_ns)
66123 {
66124- void __user *handler;
66125+ __sighandler_t handler;
66126
66127 handler = sig_handler(t, sig);
66128
66129@@ -364,6 +364,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
66130 atomic_inc(&user->sigpending);
66131 rcu_read_unlock();
66132
66133+ if (!override_rlimit)
66134+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
66135+
66136 if (override_rlimit ||
66137 atomic_read(&user->sigpending) <=
66138 task_rlimit(t, RLIMIT_SIGPENDING)) {
66139@@ -488,7 +491,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
66140
66141 int unhandled_signal(struct task_struct *tsk, int sig)
66142 {
66143- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
66144+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
66145 if (is_global_init(tsk))
66146 return 1;
66147 if (handler != SIG_IGN && handler != SIG_DFL)
66148@@ -815,6 +818,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
66149 }
66150 }
66151
66152+ /* allow glibc communication via tgkill to other threads in our
66153+ thread group */
66154+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
66155+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
66156+ && gr_handle_signal(t, sig))
66157+ return -EPERM;
66158+
66159 return security_task_kill(t, info, sig, 0);
66160 }
66161
66162@@ -1165,7 +1175,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
66163 return send_signal(sig, info, p, 1);
66164 }
66165
66166-static int
66167+int
66168 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
66169 {
66170 return send_signal(sig, info, t, 0);
66171@@ -1202,6 +1212,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
66172 unsigned long int flags;
66173 int ret, blocked, ignored;
66174 struct k_sigaction *action;
66175+ int is_unhandled = 0;
66176
66177 spin_lock_irqsave(&t->sighand->siglock, flags);
66178 action = &t->sighand->action[sig-1];
66179@@ -1216,9 +1227,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
66180 }
66181 if (action->sa.sa_handler == SIG_DFL)
66182 t->signal->flags &= ~SIGNAL_UNKILLABLE;
66183+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
66184+ is_unhandled = 1;
66185 ret = specific_send_sig_info(sig, info, t);
66186 spin_unlock_irqrestore(&t->sighand->siglock, flags);
66187
66188+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
66189+ normal operation */
66190+ if (is_unhandled) {
66191+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
66192+ gr_handle_crash(t, sig);
66193+ }
66194+
66195 return ret;
66196 }
66197
66198@@ -1285,8 +1305,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
66199 ret = check_kill_permission(sig, info, p);
66200 rcu_read_unlock();
66201
66202- if (!ret && sig)
66203+ if (!ret && sig) {
66204 ret = do_send_sig_info(sig, info, p, true);
66205+ if (!ret)
66206+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
66207+ }
66208
66209 return ret;
66210 }
66211@@ -2754,7 +2777,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
66212 int error = -ESRCH;
66213
66214 rcu_read_lock();
66215- p = find_task_by_vpid(pid);
66216+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
66217+ /* allow glibc communication via tgkill to other threads in our
66218+ thread group */
66219+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
66220+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
66221+ p = find_task_by_vpid_unrestricted(pid);
66222+ else
66223+#endif
66224+ p = find_task_by_vpid(pid);
66225 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
66226 error = check_kill_permission(sig, info, p);
66227 /*
66228diff --git a/kernel/smp.c b/kernel/smp.c
66229index db197d6..17aef0b 100644
66230--- a/kernel/smp.c
66231+++ b/kernel/smp.c
66232@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
66233 }
66234 EXPORT_SYMBOL(smp_call_function);
66235
66236-void ipi_call_lock(void)
66237+void ipi_call_lock(void) __acquires(call_function.lock)
66238 {
66239 raw_spin_lock(&call_function.lock);
66240 }
66241
66242-void ipi_call_unlock(void)
66243+void ipi_call_unlock(void) __releases(call_function.lock)
66244 {
66245 raw_spin_unlock(&call_function.lock);
66246 }
66247
66248-void ipi_call_lock_irq(void)
66249+void ipi_call_lock_irq(void) __acquires(call_function.lock)
66250 {
66251 raw_spin_lock_irq(&call_function.lock);
66252 }
66253
66254-void ipi_call_unlock_irq(void)
66255+void ipi_call_unlock_irq(void) __releases(call_function.lock)
66256 {
66257 raw_spin_unlock_irq(&call_function.lock);
66258 }
66259diff --git a/kernel/softirq.c b/kernel/softirq.c
66260index 2c71d91..1021f81 100644
66261--- a/kernel/softirq.c
66262+++ b/kernel/softirq.c
66263@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
66264
66265 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
66266
66267-char *softirq_to_name[NR_SOFTIRQS] = {
66268+const char * const softirq_to_name[NR_SOFTIRQS] = {
66269 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
66270 "TASKLET", "SCHED", "HRTIMER", "RCU"
66271 };
66272@@ -235,7 +235,7 @@ restart:
66273 kstat_incr_softirqs_this_cpu(vec_nr);
66274
66275 trace_softirq_entry(vec_nr);
66276- h->action(h);
66277+ h->action();
66278 trace_softirq_exit(vec_nr);
66279 if (unlikely(prev_count != preempt_count())) {
66280 printk(KERN_ERR "huh, entered softirq %u %s %p"
66281@@ -385,9 +385,11 @@ void raise_softirq(unsigned int nr)
66282 local_irq_restore(flags);
66283 }
66284
66285-void open_softirq(int nr, void (*action)(struct softirq_action *))
66286+void open_softirq(int nr, void (*action)(void))
66287 {
66288- softirq_vec[nr].action = action;
66289+ pax_open_kernel();
66290+ *(void **)&softirq_vec[nr].action = action;
66291+ pax_close_kernel();
66292 }
66293
66294 /*
66295@@ -441,7 +443,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
66296
66297 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
66298
66299-static void tasklet_action(struct softirq_action *a)
66300+static void tasklet_action(void)
66301 {
66302 struct tasklet_struct *list;
66303
66304@@ -476,7 +478,7 @@ static void tasklet_action(struct softirq_action *a)
66305 }
66306 }
66307
66308-static void tasklet_hi_action(struct softirq_action *a)
66309+static void tasklet_hi_action(void)
66310 {
66311 struct tasklet_struct *list;
66312
66313diff --git a/kernel/sys.c b/kernel/sys.c
66314index 481611f..0754d86 100644
66315--- a/kernel/sys.c
66316+++ b/kernel/sys.c
66317@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
66318 error = -EACCES;
66319 goto out;
66320 }
66321+
66322+ if (gr_handle_chroot_setpriority(p, niceval)) {
66323+ error = -EACCES;
66324+ goto out;
66325+ }
66326+
66327 no_nice = security_task_setnice(p, niceval);
66328 if (no_nice) {
66329 error = no_nice;
66330@@ -572,6 +578,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
66331 goto error;
66332 }
66333
66334+ if (gr_check_group_change(new->gid, new->egid, -1))
66335+ goto error;
66336+
66337 if (rgid != (gid_t) -1 ||
66338 (egid != (gid_t) -1 && egid != old->gid))
66339 new->sgid = new->egid;
66340@@ -601,6 +610,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
66341 old = current_cred();
66342
66343 retval = -EPERM;
66344+
66345+ if (gr_check_group_change(gid, gid, gid))
66346+ goto error;
66347+
66348 if (nsown_capable(CAP_SETGID))
66349 new->gid = new->egid = new->sgid = new->fsgid = gid;
66350 else if (gid == old->gid || gid == old->sgid)
66351@@ -618,7 +631,7 @@ error:
66352 /*
66353 * change the user struct in a credentials set to match the new UID
66354 */
66355-static int set_user(struct cred *new)
66356+int set_user(struct cred *new)
66357 {
66358 struct user_struct *new_user;
66359
66360@@ -688,6 +701,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
66361 goto error;
66362 }
66363
66364+ if (gr_check_user_change(new->uid, new->euid, -1))
66365+ goto error;
66366+
66367 if (new->uid != old->uid) {
66368 retval = set_user(new);
66369 if (retval < 0)
66370@@ -732,6 +748,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
66371 old = current_cred();
66372
66373 retval = -EPERM;
66374+
66375+ if (gr_check_crash_uid(uid))
66376+ goto error;
66377+ if (gr_check_user_change(uid, uid, uid))
66378+ goto error;
66379+
66380 if (nsown_capable(CAP_SETUID)) {
66381 new->suid = new->uid = uid;
66382 if (uid != old->uid) {
66383@@ -786,6 +808,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
66384 goto error;
66385 }
66386
66387+ if (gr_check_user_change(ruid, euid, -1))
66388+ goto error;
66389+
66390 if (ruid != (uid_t) -1) {
66391 new->uid = ruid;
66392 if (ruid != old->uid) {
66393@@ -850,6 +875,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
66394 goto error;
66395 }
66396
66397+ if (gr_check_group_change(rgid, egid, -1))
66398+ goto error;
66399+
66400 if (rgid != (gid_t) -1)
66401 new->gid = rgid;
66402 if (egid != (gid_t) -1)
66403@@ -896,6 +924,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
66404 old = current_cred();
66405 old_fsuid = old->fsuid;
66406
66407+ if (gr_check_user_change(-1, -1, uid))
66408+ goto error;
66409+
66410 if (uid == old->uid || uid == old->euid ||
66411 uid == old->suid || uid == old->fsuid ||
66412 nsown_capable(CAP_SETUID)) {
66413@@ -906,6 +937,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
66414 }
66415 }
66416
66417+error:
66418 abort_creds(new);
66419 return old_fsuid;
66420
66421@@ -932,12 +964,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
66422 if (gid == old->gid || gid == old->egid ||
66423 gid == old->sgid || gid == old->fsgid ||
66424 nsown_capable(CAP_SETGID)) {
66425+ if (gr_check_group_change(-1, -1, gid))
66426+ goto error;
66427+
66428 if (gid != old_fsgid) {
66429 new->fsgid = gid;
66430 goto change_okay;
66431 }
66432 }
66433
66434+error:
66435 abort_creds(new);
66436 return old_fsgid;
66437
66438@@ -1189,7 +1225,10 @@ static int override_release(char __user *release, int len)
66439 }
66440 v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
66441 snprintf(buf, len, "2.6.%u%s", v, rest);
66442- ret = copy_to_user(release, buf, len);
66443+ if (len > sizeof(buf))
66444+ ret = -EFAULT;
66445+ else
66446+ ret = copy_to_user(release, buf, len);
66447 }
66448 return ret;
66449 }
66450@@ -1243,19 +1282,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
66451 return -EFAULT;
66452
66453 down_read(&uts_sem);
66454- error = __copy_to_user(&name->sysname, &utsname()->sysname,
66455+ error = __copy_to_user(name->sysname, &utsname()->sysname,
66456 __OLD_UTS_LEN);
66457 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
66458- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
66459+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
66460 __OLD_UTS_LEN);
66461 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
66462- error |= __copy_to_user(&name->release, &utsname()->release,
66463+ error |= __copy_to_user(name->release, &utsname()->release,
66464 __OLD_UTS_LEN);
66465 error |= __put_user(0, name->release + __OLD_UTS_LEN);
66466- error |= __copy_to_user(&name->version, &utsname()->version,
66467+ error |= __copy_to_user(name->version, &utsname()->version,
66468 __OLD_UTS_LEN);
66469 error |= __put_user(0, name->version + __OLD_UTS_LEN);
66470- error |= __copy_to_user(&name->machine, &utsname()->machine,
66471+ error |= __copy_to_user(name->machine, &utsname()->machine,
66472 __OLD_UTS_LEN);
66473 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
66474 up_read(&uts_sem);
66475@@ -1720,7 +1759,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
66476 error = get_dumpable(me->mm);
66477 break;
66478 case PR_SET_DUMPABLE:
66479- if (arg2 < 0 || arg2 > 1) {
66480+ if (arg2 > 1) {
66481 error = -EINVAL;
66482 break;
66483 }
66484diff --git a/kernel/sysctl.c b/kernel/sysctl.c
66485index ae27196..7506d69 100644
66486--- a/kernel/sysctl.c
66487+++ b/kernel/sysctl.c
66488@@ -86,6 +86,13 @@
66489
66490
66491 #if defined(CONFIG_SYSCTL)
66492+#include <linux/grsecurity.h>
66493+#include <linux/grinternal.h>
66494+
66495+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
66496+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
66497+ const int op);
66498+extern int gr_handle_chroot_sysctl(const int op);
66499
66500 /* External variables not in a header file. */
66501 extern int sysctl_overcommit_memory;
66502@@ -191,6 +198,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
66503 }
66504
66505 #endif
66506+extern struct ctl_table grsecurity_table[];
66507
66508 static struct ctl_table root_table[];
66509 static struct ctl_table_root sysctl_table_root;
66510@@ -220,6 +228,20 @@ extern struct ctl_table epoll_table[];
66511 int sysctl_legacy_va_layout;
66512 #endif
66513
66514+#ifdef CONFIG_PAX_SOFTMODE
66515+static ctl_table pax_table[] = {
66516+ {
66517+ .procname = "softmode",
66518+ .data = &pax_softmode,
66519+ .maxlen = sizeof(unsigned int),
66520+ .mode = 0600,
66521+ .proc_handler = &proc_dointvec,
66522+ },
66523+
66524+ { }
66525+};
66526+#endif
66527+
66528 /* The default sysctl tables: */
66529
66530 static struct ctl_table root_table[] = {
66531@@ -266,6 +288,22 @@ static int max_extfrag_threshold = 1000;
66532 #endif
66533
66534 static struct ctl_table kern_table[] = {
66535+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
66536+ {
66537+ .procname = "grsecurity",
66538+ .mode = 0500,
66539+ .child = grsecurity_table,
66540+ },
66541+#endif
66542+
66543+#ifdef CONFIG_PAX_SOFTMODE
66544+ {
66545+ .procname = "pax",
66546+ .mode = 0500,
66547+ .child = pax_table,
66548+ },
66549+#endif
66550+
66551 {
66552 .procname = "sched_child_runs_first",
66553 .data = &sysctl_sched_child_runs_first,
66554@@ -550,7 +588,7 @@ static struct ctl_table kern_table[] = {
66555 .data = &modprobe_path,
66556 .maxlen = KMOD_PATH_LEN,
66557 .mode = 0644,
66558- .proc_handler = proc_dostring,
66559+ .proc_handler = proc_dostring_modpriv,
66560 },
66561 {
66562 .procname = "modules_disabled",
66563@@ -717,16 +755,20 @@ static struct ctl_table kern_table[] = {
66564 .extra1 = &zero,
66565 .extra2 = &one,
66566 },
66567+#endif
66568 {
66569 .procname = "kptr_restrict",
66570 .data = &kptr_restrict,
66571 .maxlen = sizeof(int),
66572 .mode = 0644,
66573 .proc_handler = proc_dmesg_restrict,
66574+#ifdef CONFIG_GRKERNSEC_HIDESYM
66575+ .extra1 = &two,
66576+#else
66577 .extra1 = &zero,
66578+#endif
66579 .extra2 = &two,
66580 },
66581-#endif
66582 {
66583 .procname = "ngroups_max",
66584 .data = &ngroups_max,
66585@@ -1216,6 +1258,13 @@ static struct ctl_table vm_table[] = {
66586 .proc_handler = proc_dointvec_minmax,
66587 .extra1 = &zero,
66588 },
66589+ {
66590+ .procname = "heap_stack_gap",
66591+ .data = &sysctl_heap_stack_gap,
66592+ .maxlen = sizeof(sysctl_heap_stack_gap),
66593+ .mode = 0644,
66594+ .proc_handler = proc_doulongvec_minmax,
66595+ },
66596 #else
66597 {
66598 .procname = "nr_trim_pages",
66599@@ -1720,6 +1769,17 @@ static int test_perm(int mode, int op)
66600 int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
66601 {
66602 int mode;
66603+ int error;
66604+
66605+ if (table->parent != NULL && table->parent->procname != NULL &&
66606+ table->procname != NULL &&
66607+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
66608+ return -EACCES;
66609+ if (gr_handle_chroot_sysctl(op))
66610+ return -EACCES;
66611+ error = gr_handle_sysctl(table, op);
66612+ if (error)
66613+ return error;
66614
66615 if (root->permissions)
66616 mode = root->permissions(root, current->nsproxy, table);
66617@@ -2124,6 +2184,16 @@ int proc_dostring(struct ctl_table *table, int write,
66618 buffer, lenp, ppos);
66619 }
66620
66621+int proc_dostring_modpriv(struct ctl_table *table, int write,
66622+ void __user *buffer, size_t *lenp, loff_t *ppos)
66623+{
66624+ if (write && !capable(CAP_SYS_MODULE))
66625+ return -EPERM;
66626+
66627+ return _proc_do_string(table->data, table->maxlen, write,
66628+ buffer, lenp, ppos);
66629+}
66630+
66631 static size_t proc_skip_spaces(char **buf)
66632 {
66633 size_t ret;
66634@@ -2229,6 +2299,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
66635 len = strlen(tmp);
66636 if (len > *size)
66637 len = *size;
66638+ if (len > sizeof(tmp))
66639+ len = sizeof(tmp);
66640 if (copy_to_user(*buf, tmp, len))
66641 return -EFAULT;
66642 *size -= len;
66643@@ -2545,8 +2617,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
66644 *i = val;
66645 } else {
66646 val = convdiv * (*i) / convmul;
66647- if (!first)
66648+ if (!first) {
66649 err = proc_put_char(&buffer, &left, '\t');
66650+ if (err)
66651+ break;
66652+ }
66653 err = proc_put_long(&buffer, &left, val, false);
66654 if (err)
66655 break;
66656@@ -2941,6 +3016,12 @@ int proc_dostring(struct ctl_table *table, int write,
66657 return -ENOSYS;
66658 }
66659
66660+int proc_dostring_modpriv(struct ctl_table *table, int write,
66661+ void __user *buffer, size_t *lenp, loff_t *ppos)
66662+{
66663+ return -ENOSYS;
66664+}
66665+
66666 int proc_dointvec(struct ctl_table *table, int write,
66667 void __user *buffer, size_t *lenp, loff_t *ppos)
66668 {
66669@@ -2997,6 +3078,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
66670 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
66671 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
66672 EXPORT_SYMBOL(proc_dostring);
66673+EXPORT_SYMBOL(proc_dostring_modpriv);
66674 EXPORT_SYMBOL(proc_doulongvec_minmax);
66675 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
66676 EXPORT_SYMBOL(register_sysctl_table);
66677diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
66678index a650694..aaeeb20 100644
66679--- a/kernel/sysctl_binary.c
66680+++ b/kernel/sysctl_binary.c
66681@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
66682 int i;
66683
66684 set_fs(KERNEL_DS);
66685- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
66686+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
66687 set_fs(old_fs);
66688 if (result < 0)
66689 goto out_kfree;
66690@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
66691 }
66692
66693 set_fs(KERNEL_DS);
66694- result = vfs_write(file, buffer, str - buffer, &pos);
66695+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
66696 set_fs(old_fs);
66697 if (result < 0)
66698 goto out_kfree;
66699@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
66700 int i;
66701
66702 set_fs(KERNEL_DS);
66703- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
66704+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
66705 set_fs(old_fs);
66706 if (result < 0)
66707 goto out_kfree;
66708@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
66709 }
66710
66711 set_fs(KERNEL_DS);
66712- result = vfs_write(file, buffer, str - buffer, &pos);
66713+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
66714 set_fs(old_fs);
66715 if (result < 0)
66716 goto out_kfree;
66717@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
66718 int i;
66719
66720 set_fs(KERNEL_DS);
66721- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
66722+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
66723 set_fs(old_fs);
66724 if (result < 0)
66725 goto out;
66726@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
66727 __le16 dnaddr;
66728
66729 set_fs(KERNEL_DS);
66730- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
66731+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
66732 set_fs(old_fs);
66733 if (result < 0)
66734 goto out;
66735@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
66736 le16_to_cpu(dnaddr) & 0x3ff);
66737
66738 set_fs(KERNEL_DS);
66739- result = vfs_write(file, buf, len, &pos);
66740+ result = vfs_write(file, (const char __force_user *)buf, len, &pos);
66741 set_fs(old_fs);
66742 if (result < 0)
66743 goto out;
66744diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
66745index 362da65..ab8ef8c 100644
66746--- a/kernel/sysctl_check.c
66747+++ b/kernel/sysctl_check.c
66748@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
66749 set_fail(&fail, table, "Directory with extra2");
66750 } else {
66751 if ((table->proc_handler == proc_dostring) ||
66752+ (table->proc_handler == proc_dostring_modpriv) ||
66753 (table->proc_handler == proc_dointvec) ||
66754 (table->proc_handler == proc_dointvec_minmax) ||
66755 (table->proc_handler == proc_dointvec_jiffies) ||
66756diff --git a/kernel/taskstats.c b/kernel/taskstats.c
66757index e660464..c8b9e67 100644
66758--- a/kernel/taskstats.c
66759+++ b/kernel/taskstats.c
66760@@ -27,9 +27,12 @@
66761 #include <linux/cgroup.h>
66762 #include <linux/fs.h>
66763 #include <linux/file.h>
66764+#include <linux/grsecurity.h>
66765 #include <net/genetlink.h>
66766 #include <linux/atomic.h>
66767
66768+extern int gr_is_taskstats_denied(int pid);
66769+
66770 /*
66771 * Maximum length of a cpumask that can be specified in
66772 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
66773@@ -556,6 +559,9 @@ err:
66774
66775 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
66776 {
66777+ if (gr_is_taskstats_denied(current->pid))
66778+ return -EACCES;
66779+
66780 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
66781 return cmd_attr_register_cpumask(info);
66782 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
66783diff --git a/kernel/time.c b/kernel/time.c
66784index 73e416d..cfc6f69 100644
66785--- a/kernel/time.c
66786+++ b/kernel/time.c
66787@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
66788 return error;
66789
66790 if (tz) {
66791+ /* we log in do_settimeofday called below, so don't log twice
66792+ */
66793+ if (!tv)
66794+ gr_log_timechange();
66795+
66796 /* SMP safe, global irq locking makes it work. */
66797 sys_tz = *tz;
66798 update_vsyscall_tz();
66799diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
66800index 8a46f5d..bbe6f9c 100644
66801--- a/kernel/time/alarmtimer.c
66802+++ b/kernel/time/alarmtimer.c
66803@@ -773,7 +773,7 @@ static int __init alarmtimer_init(void)
66804 struct platform_device *pdev;
66805 int error = 0;
66806 int i;
66807- struct k_clock alarm_clock = {
66808+ static struct k_clock alarm_clock = {
66809 .clock_getres = alarm_clock_getres,
66810 .clock_get = alarm_clock_get,
66811 .timer_create = alarm_timer_create,
66812diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
66813index fd4a7b1..fae5c2a 100644
66814--- a/kernel/time/tick-broadcast.c
66815+++ b/kernel/time/tick-broadcast.c
66816@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
66817 * then clear the broadcast bit.
66818 */
66819 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
66820- int cpu = smp_processor_id();
66821+ cpu = smp_processor_id();
66822
66823 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
66824 tick_broadcast_clear_oneshot(cpu);
66825diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
66826index 2378413..be455fd 100644
66827--- a/kernel/time/timekeeping.c
66828+++ b/kernel/time/timekeeping.c
66829@@ -14,6 +14,7 @@
66830 #include <linux/init.h>
66831 #include <linux/mm.h>
66832 #include <linux/sched.h>
66833+#include <linux/grsecurity.h>
66834 #include <linux/syscore_ops.h>
66835 #include <linux/clocksource.h>
66836 #include <linux/jiffies.h>
66837@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv)
66838 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
66839 return -EINVAL;
66840
66841+ gr_log_timechange();
66842+
66843 write_seqlock_irqsave(&xtime_lock, flags);
66844
66845 timekeeping_forward_now();
66846diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
66847index 3258455..f35227d 100644
66848--- a/kernel/time/timer_list.c
66849+++ b/kernel/time/timer_list.c
66850@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
66851
66852 static void print_name_offset(struct seq_file *m, void *sym)
66853 {
66854+#ifdef CONFIG_GRKERNSEC_HIDESYM
66855+ SEQ_printf(m, "<%p>", NULL);
66856+#else
66857 char symname[KSYM_NAME_LEN];
66858
66859 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
66860 SEQ_printf(m, "<%pK>", sym);
66861 else
66862 SEQ_printf(m, "%s", symname);
66863+#endif
66864 }
66865
66866 static void
66867@@ -112,7 +116,11 @@ next_one:
66868 static void
66869 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
66870 {
66871+#ifdef CONFIG_GRKERNSEC_HIDESYM
66872+ SEQ_printf(m, " .base: %p\n", NULL);
66873+#else
66874 SEQ_printf(m, " .base: %pK\n", base);
66875+#endif
66876 SEQ_printf(m, " .index: %d\n",
66877 base->index);
66878 SEQ_printf(m, " .resolution: %Lu nsecs\n",
66879@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
66880 {
66881 struct proc_dir_entry *pe;
66882
66883+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66884+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
66885+#else
66886 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
66887+#endif
66888 if (!pe)
66889 return -ENOMEM;
66890 return 0;
66891diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
66892index 0b537f2..9e71eca 100644
66893--- a/kernel/time/timer_stats.c
66894+++ b/kernel/time/timer_stats.c
66895@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
66896 static unsigned long nr_entries;
66897 static struct entry entries[MAX_ENTRIES];
66898
66899-static atomic_t overflow_count;
66900+static atomic_unchecked_t overflow_count;
66901
66902 /*
66903 * The entries are in a hash-table, for fast lookup:
66904@@ -140,7 +140,7 @@ static void reset_entries(void)
66905 nr_entries = 0;
66906 memset(entries, 0, sizeof(entries));
66907 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
66908- atomic_set(&overflow_count, 0);
66909+ atomic_set_unchecked(&overflow_count, 0);
66910 }
66911
66912 static struct entry *alloc_entry(void)
66913@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
66914 if (likely(entry))
66915 entry->count++;
66916 else
66917- atomic_inc(&overflow_count);
66918+ atomic_inc_unchecked(&overflow_count);
66919
66920 out_unlock:
66921 raw_spin_unlock_irqrestore(lock, flags);
66922@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
66923
66924 static void print_name_offset(struct seq_file *m, unsigned long addr)
66925 {
66926+#ifdef CONFIG_GRKERNSEC_HIDESYM
66927+ seq_printf(m, "<%p>", NULL);
66928+#else
66929 char symname[KSYM_NAME_LEN];
66930
66931 if (lookup_symbol_name(addr, symname) < 0)
66932 seq_printf(m, "<%p>", (void *)addr);
66933 else
66934 seq_printf(m, "%s", symname);
66935+#endif
66936 }
66937
66938 static int tstats_show(struct seq_file *m, void *v)
66939@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
66940
66941 seq_puts(m, "Timer Stats Version: v0.2\n");
66942 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
66943- if (atomic_read(&overflow_count))
66944+ if (atomic_read_unchecked(&overflow_count))
66945 seq_printf(m, "Overflow: %d entries\n",
66946- atomic_read(&overflow_count));
66947+ atomic_read_unchecked(&overflow_count));
66948
66949 for (i = 0; i < nr_entries; i++) {
66950 entry = entries + i;
66951@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
66952 {
66953 struct proc_dir_entry *pe;
66954
66955+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66956+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
66957+#else
66958 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
66959+#endif
66960 if (!pe)
66961 return -ENOMEM;
66962 return 0;
66963diff --git a/kernel/timer.c b/kernel/timer.c
66964index 9c3c62b..441690e 100644
66965--- a/kernel/timer.c
66966+++ b/kernel/timer.c
66967@@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
66968 /*
66969 * This function runs timers and the timer-tq in bottom half context.
66970 */
66971-static void run_timer_softirq(struct softirq_action *h)
66972+static void run_timer_softirq(void)
66973 {
66974 struct tvec_base *base = __this_cpu_read(tvec_bases);
66975
66976diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
66977index 16fc34a..efd8bb8 100644
66978--- a/kernel/trace/blktrace.c
66979+++ b/kernel/trace/blktrace.c
66980@@ -324,7 +324,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
66981 struct blk_trace *bt = filp->private_data;
66982 char buf[16];
66983
66984- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
66985+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
66986
66987 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
66988 }
66989@@ -389,7 +389,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
66990 return 1;
66991
66992 bt = buf->chan->private_data;
66993- atomic_inc(&bt->dropped);
66994+ atomic_inc_unchecked(&bt->dropped);
66995 return 0;
66996 }
66997
66998@@ -490,7 +490,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
66999
67000 bt->dir = dir;
67001 bt->dev = dev;
67002- atomic_set(&bt->dropped, 0);
67003+ atomic_set_unchecked(&bt->dropped, 0);
67004
67005 ret = -EIO;
67006 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
67007diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
67008index 25b4f4d..6f4772d 100644
67009--- a/kernel/trace/ftrace.c
67010+++ b/kernel/trace/ftrace.c
67011@@ -1587,12 +1587,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
67012 if (unlikely(ftrace_disabled))
67013 return 0;
67014
67015+ ret = ftrace_arch_code_modify_prepare();
67016+ FTRACE_WARN_ON(ret);
67017+ if (ret)
67018+ return 0;
67019+
67020 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
67021+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
67022 if (ret) {
67023 ftrace_bug(ret, ip);
67024- return 0;
67025 }
67026- return 1;
67027+ return ret ? 0 : 1;
67028 }
67029
67030 /*
67031@@ -2608,7 +2613,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
67032
67033 int
67034 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
67035- void *data)
67036+ void *data)
67037 {
67038 struct ftrace_func_probe *entry;
67039 struct ftrace_page *pg;
67040diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
67041index f2bd275..adaf3a2 100644
67042--- a/kernel/trace/trace.c
67043+++ b/kernel/trace/trace.c
67044@@ -4201,10 +4201,9 @@ static const struct file_operations tracing_dyn_info_fops = {
67045 };
67046 #endif
67047
67048-static struct dentry *d_tracer;
67049-
67050 struct dentry *tracing_init_dentry(void)
67051 {
67052+ static struct dentry *d_tracer;
67053 static int once;
67054
67055 if (d_tracer)
67056@@ -4224,10 +4223,9 @@ struct dentry *tracing_init_dentry(void)
67057 return d_tracer;
67058 }
67059
67060-static struct dentry *d_percpu;
67061-
67062 struct dentry *tracing_dentry_percpu(void)
67063 {
67064+ static struct dentry *d_percpu;
67065 static int once;
67066 struct dentry *d_tracer;
67067
67068diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
67069index c212a7f..7b02394 100644
67070--- a/kernel/trace/trace_events.c
67071+++ b/kernel/trace/trace_events.c
67072@@ -1299,10 +1299,6 @@ static LIST_HEAD(ftrace_module_file_list);
67073 struct ftrace_module_file_ops {
67074 struct list_head list;
67075 struct module *mod;
67076- struct file_operations id;
67077- struct file_operations enable;
67078- struct file_operations format;
67079- struct file_operations filter;
67080 };
67081
67082 static struct ftrace_module_file_ops *
67083@@ -1323,17 +1319,12 @@ trace_create_file_ops(struct module *mod)
67084
67085 file_ops->mod = mod;
67086
67087- file_ops->id = ftrace_event_id_fops;
67088- file_ops->id.owner = mod;
67089-
67090- file_ops->enable = ftrace_enable_fops;
67091- file_ops->enable.owner = mod;
67092-
67093- file_ops->filter = ftrace_event_filter_fops;
67094- file_ops->filter.owner = mod;
67095-
67096- file_ops->format = ftrace_event_format_fops;
67097- file_ops->format.owner = mod;
67098+ pax_open_kernel();
67099+ *(void **)&mod->trace_id.owner = mod;
67100+ *(void **)&mod->trace_enable.owner = mod;
67101+ *(void **)&mod->trace_filter.owner = mod;
67102+ *(void **)&mod->trace_format.owner = mod;
67103+ pax_close_kernel();
67104
67105 list_add(&file_ops->list, &ftrace_module_file_list);
67106
67107@@ -1357,8 +1348,8 @@ static void trace_module_add_events(struct module *mod)
67108
67109 for_each_event(call, start, end) {
67110 __trace_add_event_call(*call, mod,
67111- &file_ops->id, &file_ops->enable,
67112- &file_ops->filter, &file_ops->format);
67113+ &mod->trace_id, &mod->trace_enable,
67114+ &mod->trace_filter, &mod->trace_format);
67115 }
67116 }
67117
67118diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
67119index 00d527c..7c5b1a3 100644
67120--- a/kernel/trace/trace_kprobe.c
67121+++ b/kernel/trace/trace_kprobe.c
67122@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
67123 long ret;
67124 int maxlen = get_rloc_len(*(u32 *)dest);
67125 u8 *dst = get_rloc_data(dest);
67126- u8 *src = addr;
67127+ const u8 __user *src = (const u8 __force_user *)addr;
67128 mm_segment_t old_fs = get_fs();
67129 if (!maxlen)
67130 return;
67131@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
67132 pagefault_disable();
67133 do
67134 ret = __copy_from_user_inatomic(dst++, src++, 1);
67135- while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
67136+ while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
67137 dst[-1] = '\0';
67138 pagefault_enable();
67139 set_fs(old_fs);
67140@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
67141 ((u8 *)get_rloc_data(dest))[0] = '\0';
67142 *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
67143 } else
67144- *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
67145+ *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
67146 get_rloc_offs(*(u32 *)dest));
67147 }
67148 /* Return the length of string -- including null terminal byte */
67149@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
67150 set_fs(KERNEL_DS);
67151 pagefault_disable();
67152 do {
67153- ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
67154+ ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
67155 len++;
67156 } while (c && ret == 0 && len < MAX_STRING_SIZE);
67157 pagefault_enable();
67158diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
67159index fd3c8aa..5f324a6 100644
67160--- a/kernel/trace/trace_mmiotrace.c
67161+++ b/kernel/trace/trace_mmiotrace.c
67162@@ -24,7 +24,7 @@ struct header_iter {
67163 static struct trace_array *mmio_trace_array;
67164 static bool overrun_detected;
67165 static unsigned long prev_overruns;
67166-static atomic_t dropped_count;
67167+static atomic_unchecked_t dropped_count;
67168
67169 static void mmio_reset_data(struct trace_array *tr)
67170 {
67171@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
67172
67173 static unsigned long count_overruns(struct trace_iterator *iter)
67174 {
67175- unsigned long cnt = atomic_xchg(&dropped_count, 0);
67176+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
67177 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
67178
67179 if (over > prev_overruns)
67180@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
67181 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
67182 sizeof(*entry), 0, pc);
67183 if (!event) {
67184- atomic_inc(&dropped_count);
67185+ atomic_inc_unchecked(&dropped_count);
67186 return;
67187 }
67188 entry = ring_buffer_event_data(event);
67189@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
67190 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
67191 sizeof(*entry), 0, pc);
67192 if (!event) {
67193- atomic_inc(&dropped_count);
67194+ atomic_inc_unchecked(&dropped_count);
67195 return;
67196 }
67197 entry = ring_buffer_event_data(event);
67198diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
67199index 5199930..26c73a0 100644
67200--- a/kernel/trace/trace_output.c
67201+++ b/kernel/trace/trace_output.c
67202@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
67203
67204 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
67205 if (!IS_ERR(p)) {
67206- p = mangle_path(s->buffer + s->len, p, "\n");
67207+ p = mangle_path(s->buffer + s->len, p, "\n\\");
67208 if (p) {
67209 s->len = p - s->buffer;
67210 return 1;
67211diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
67212index 77575b3..6e623d1 100644
67213--- a/kernel/trace/trace_stack.c
67214+++ b/kernel/trace/trace_stack.c
67215@@ -50,7 +50,7 @@ static inline void check_stack(void)
67216 return;
67217
67218 /* we do not handle interrupt stacks yet */
67219- if (!object_is_on_stack(&this_size))
67220+ if (!object_starts_on_stack(&this_size))
67221 return;
67222
67223 local_irq_save(flags);
67224diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
67225index 209b379..7f76423 100644
67226--- a/kernel/trace/trace_workqueue.c
67227+++ b/kernel/trace/trace_workqueue.c
67228@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
67229 int cpu;
67230 pid_t pid;
67231 /* Can be inserted from interrupt or user context, need to be atomic */
67232- atomic_t inserted;
67233+ atomic_unchecked_t inserted;
67234 /*
67235 * Don't need to be atomic, works are serialized in a single workqueue thread
67236 * on a single CPU.
67237@@ -60,7 +60,7 @@ probe_workqueue_insertion(void *ignore,
67238 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
67239 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
67240 if (node->pid == wq_thread->pid) {
67241- atomic_inc(&node->inserted);
67242+ atomic_inc_unchecked(&node->inserted);
67243 goto found;
67244 }
67245 }
67246@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
67247 tsk = get_pid_task(pid, PIDTYPE_PID);
67248 if (tsk) {
67249 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
67250- atomic_read(&cws->inserted), cws->executed,
67251+ atomic_read_unchecked(&cws->inserted), cws->executed,
67252 tsk->comm);
67253 put_task_struct(tsk);
67254 }
67255diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
67256index 82928f5..92da771 100644
67257--- a/lib/Kconfig.debug
67258+++ b/lib/Kconfig.debug
67259@@ -1103,6 +1103,7 @@ config LATENCYTOP
67260 depends on DEBUG_KERNEL
67261 depends on STACKTRACE_SUPPORT
67262 depends on PROC_FS
67263+ depends on !GRKERNSEC_HIDESYM
67264 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
67265 select KALLSYMS
67266 select KALLSYMS_ALL
67267diff --git a/lib/bitmap.c b/lib/bitmap.c
67268index 0d4a127..33a06c7 100644
67269--- a/lib/bitmap.c
67270+++ b/lib/bitmap.c
67271@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
67272 {
67273 int c, old_c, totaldigits, ndigits, nchunks, nbits;
67274 u32 chunk;
67275- const char __user __force *ubuf = (const char __user __force *)buf;
67276+ const char __user *ubuf = (const char __force_user *)buf;
67277
67278 bitmap_zero(maskp, nmaskbits);
67279
67280@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user *ubuf,
67281 {
67282 if (!access_ok(VERIFY_READ, ubuf, ulen))
67283 return -EFAULT;
67284- return __bitmap_parse((const char __force *)ubuf,
67285+ return __bitmap_parse((const char __force_kernel *)ubuf,
67286 ulen, 1, maskp, nmaskbits);
67287
67288 }
67289@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
67290 {
67291 unsigned a, b;
67292 int c, old_c, totaldigits;
67293- const char __user __force *ubuf = (const char __user __force *)buf;
67294+ const char __user *ubuf = (const char __force_user *)buf;
67295 int exp_digit, in_range;
67296
67297 totaldigits = c = 0;
67298@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __user *ubuf,
67299 {
67300 if (!access_ok(VERIFY_READ, ubuf, ulen))
67301 return -EFAULT;
67302- return __bitmap_parselist((const char __force *)ubuf,
67303+ return __bitmap_parselist((const char __force_kernel *)ubuf,
67304 ulen, 1, maskp, nmaskbits);
67305 }
67306 EXPORT_SYMBOL(bitmap_parselist_user);
67307diff --git a/lib/bug.c b/lib/bug.c
67308index 1955209..cbbb2ad 100644
67309--- a/lib/bug.c
67310+++ b/lib/bug.c
67311@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
67312 return BUG_TRAP_TYPE_NONE;
67313
67314 bug = find_bug(bugaddr);
67315+ if (!bug)
67316+ return BUG_TRAP_TYPE_NONE;
67317
67318 file = NULL;
67319 line = 0;
67320diff --git a/lib/debugobjects.c b/lib/debugobjects.c
67321index a78b7c6..2c73084 100644
67322--- a/lib/debugobjects.c
67323+++ b/lib/debugobjects.c
67324@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
67325 if (limit > 4)
67326 return;
67327
67328- is_on_stack = object_is_on_stack(addr);
67329+ is_on_stack = object_starts_on_stack(addr);
67330 if (is_on_stack == onstack)
67331 return;
67332
67333diff --git a/lib/devres.c b/lib/devres.c
67334index 7c0e953..f642b5c 100644
67335--- a/lib/devres.c
67336+++ b/lib/devres.c
67337@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
67338 void devm_iounmap(struct device *dev, void __iomem *addr)
67339 {
67340 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
67341- (void *)addr));
67342+ (void __force *)addr));
67343 iounmap(addr);
67344 }
67345 EXPORT_SYMBOL(devm_iounmap);
67346@@ -141,7 +141,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
67347 {
67348 ioport_unmap(addr);
67349 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
67350- devm_ioport_map_match, (void *)addr));
67351+ devm_ioport_map_match, (void __force *)addr));
67352 }
67353 EXPORT_SYMBOL(devm_ioport_unmap);
67354
67355diff --git a/lib/dma-debug.c b/lib/dma-debug.c
67356index fea790a..ebb0e82 100644
67357--- a/lib/dma-debug.c
67358+++ b/lib/dma-debug.c
67359@@ -925,7 +925,7 @@ out:
67360
67361 static void check_for_stack(struct device *dev, void *addr)
67362 {
67363- if (object_is_on_stack(addr))
67364+ if (object_starts_on_stack(addr))
67365 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
67366 "stack [addr=%p]\n", addr);
67367 }
67368diff --git a/lib/extable.c b/lib/extable.c
67369index 4cac81e..63e9b8f 100644
67370--- a/lib/extable.c
67371+++ b/lib/extable.c
67372@@ -13,6 +13,7 @@
67373 #include <linux/init.h>
67374 #include <linux/sort.h>
67375 #include <asm/uaccess.h>
67376+#include <asm/pgtable.h>
67377
67378 #ifndef ARCH_HAS_SORT_EXTABLE
67379 /*
67380@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const void *b)
67381 void sort_extable(struct exception_table_entry *start,
67382 struct exception_table_entry *finish)
67383 {
67384+ pax_open_kernel();
67385 sort(start, finish - start, sizeof(struct exception_table_entry),
67386 cmp_ex, NULL);
67387+ pax_close_kernel();
67388 }
67389
67390 #ifdef CONFIG_MODULES
67391diff --git a/lib/inflate.c b/lib/inflate.c
67392index 013a761..c28f3fc 100644
67393--- a/lib/inflate.c
67394+++ b/lib/inflate.c
67395@@ -269,7 +269,7 @@ static void free(void *where)
67396 malloc_ptr = free_mem_ptr;
67397 }
67398 #else
67399-#define malloc(a) kmalloc(a, GFP_KERNEL)
67400+#define malloc(a) kmalloc((a), GFP_KERNEL)
67401 #define free(a) kfree(a)
67402 #endif
67403
67404diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
67405index bd2bea9..6b3c95e 100644
67406--- a/lib/is_single_threaded.c
67407+++ b/lib/is_single_threaded.c
67408@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
67409 struct task_struct *p, *t;
67410 bool ret;
67411
67412+ if (!mm)
67413+ return true;
67414+
67415 if (atomic_read(&task->signal->live) != 1)
67416 return false;
67417
67418diff --git a/lib/kref.c b/lib/kref.c
67419index 3efb882..8492f4c 100644
67420--- a/lib/kref.c
67421+++ b/lib/kref.c
67422@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
67423 */
67424 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
67425 {
67426- WARN_ON(release == NULL);
67427+ BUG_ON(release == NULL);
67428 WARN_ON(release == (void (*)(struct kref *))kfree);
67429
67430 if (atomic_dec_and_test(&kref->refcount)) {
67431diff --git a/lib/radix-tree.c b/lib/radix-tree.c
67432index d9df745..e73c2fe 100644
67433--- a/lib/radix-tree.c
67434+++ b/lib/radix-tree.c
67435@@ -80,7 +80,7 @@ struct radix_tree_preload {
67436 int nr;
67437 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
67438 };
67439-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
67440+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
67441
67442 static inline void *ptr_to_indirect(void *ptr)
67443 {
67444diff --git a/lib/vsprintf.c b/lib/vsprintf.c
67445index 993599e..84dc70e 100644
67446--- a/lib/vsprintf.c
67447+++ b/lib/vsprintf.c
67448@@ -16,6 +16,9 @@
67449 * - scnprintf and vscnprintf
67450 */
67451
67452+#ifdef CONFIG_GRKERNSEC_HIDESYM
67453+#define __INCLUDED_BY_HIDESYM 1
67454+#endif
67455 #include <stdarg.h>
67456 #include <linux/module.h>
67457 #include <linux/types.h>
67458@@ -413,7 +416,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
67459 char sym[KSYM_SYMBOL_LEN];
67460 if (ext == 'B')
67461 sprint_backtrace(sym, value);
67462- else if (ext != 'f' && ext != 's')
67463+ else if (ext != 'f' && ext != 's' && ext != 'a')
67464 sprint_symbol(sym, value);
67465 else
67466 kallsyms_lookup(value, NULL, NULL, NULL, sym);
67467@@ -777,7 +780,11 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
67468 return string(buf, end, uuid, spec);
67469 }
67470
67471+#ifdef CONFIG_GRKERNSEC_HIDESYM
67472+int kptr_restrict __read_mostly = 2;
67473+#else
67474 int kptr_restrict __read_mostly;
67475+#endif
67476
67477 /*
67478 * Show a '%p' thing. A kernel extension is that the '%p' is followed
67479@@ -791,6 +798,8 @@ int kptr_restrict __read_mostly;
67480 * - 'S' For symbolic direct pointers with offset
67481 * - 's' For symbolic direct pointers without offset
67482 * - 'B' For backtraced symbolic direct pointers with offset
67483+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
67484+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
67485 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
67486 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
67487 * - 'M' For a 6-byte MAC address, it prints the address in the
67488@@ -835,12 +844,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
67489 {
67490 if (!ptr && *fmt != 'K') {
67491 /*
67492- * Print (null) with the same width as a pointer so it makes
67493+ * Print (nil) with the same width as a pointer so it makes
67494 * tabular output look nice.
67495 */
67496 if (spec.field_width == -1)
67497 spec.field_width = 2 * sizeof(void *);
67498- return string(buf, end, "(null)", spec);
67499+ return string(buf, end, "(nil)", spec);
67500 }
67501
67502 switch (*fmt) {
67503@@ -850,6 +859,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
67504 /* Fallthrough */
67505 case 'S':
67506 case 's':
67507+#ifdef CONFIG_GRKERNSEC_HIDESYM
67508+ break;
67509+#else
67510+ return symbol_string(buf, end, ptr, spec, *fmt);
67511+#endif
67512+ case 'A':
67513+ case 'a':
67514 case 'B':
67515 return symbol_string(buf, end, ptr, spec, *fmt);
67516 case 'R':
67517@@ -1608,11 +1624,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
67518 typeof(type) value; \
67519 if (sizeof(type) == 8) { \
67520 args = PTR_ALIGN(args, sizeof(u32)); \
67521- *(u32 *)&value = *(u32 *)args; \
67522- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
67523+ *(u32 *)&value = *(const u32 *)args; \
67524+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
67525 } else { \
67526 args = PTR_ALIGN(args, sizeof(type)); \
67527- value = *(typeof(type) *)args; \
67528+ value = *(const typeof(type) *)args; \
67529 } \
67530 args += sizeof(type); \
67531 value; \
67532@@ -1675,7 +1691,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
67533 case FORMAT_TYPE_STR: {
67534 const char *str_arg = args;
67535 args += strlen(str_arg) + 1;
67536- str = string(str, end, (char *)str_arg, spec);
67537+ str = string(str, end, str_arg, spec);
67538 break;
67539 }
67540
67541diff --git a/localversion-grsec b/localversion-grsec
67542new file mode 100644
67543index 0000000..7cd6065
67544--- /dev/null
67545+++ b/localversion-grsec
67546@@ -0,0 +1 @@
67547+-grsec
67548diff --git a/mm/Kconfig b/mm/Kconfig
67549index 011b110..b492af2 100644
67550--- a/mm/Kconfig
67551+++ b/mm/Kconfig
67552@@ -241,10 +241,10 @@ config KSM
67553 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
67554
67555 config DEFAULT_MMAP_MIN_ADDR
67556- int "Low address space to protect from user allocation"
67557+ int "Low address space to protect from user allocation"
67558 depends on MMU
67559- default 4096
67560- help
67561+ default 65536
67562+ help
67563 This is the portion of low virtual memory which should be protected
67564 from userspace allocation. Keeping a user from writing to low pages
67565 can help reduce the impact of kernel NULL pointer bugs.
67566diff --git a/mm/filemap.c b/mm/filemap.c
67567index 03c5b0e..a01e793 100644
67568--- a/mm/filemap.c
67569+++ b/mm/filemap.c
67570@@ -1770,7 +1770,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
67571 struct address_space *mapping = file->f_mapping;
67572
67573 if (!mapping->a_ops->readpage)
67574- return -ENOEXEC;
67575+ return -ENODEV;
67576 file_accessed(file);
67577 vma->vm_ops = &generic_file_vm_ops;
67578 vma->vm_flags |= VM_CAN_NONLINEAR;
67579@@ -2176,6 +2176,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
67580 *pos = i_size_read(inode);
67581
67582 if (limit != RLIM_INFINITY) {
67583+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
67584 if (*pos >= limit) {
67585 send_sig(SIGXFSZ, current, 0);
67586 return -EFBIG;
67587diff --git a/mm/fremap.c b/mm/fremap.c
67588index 9ed4fd4..c42648d 100644
67589--- a/mm/fremap.c
67590+++ b/mm/fremap.c
67591@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
67592 retry:
67593 vma = find_vma(mm, start);
67594
67595+#ifdef CONFIG_PAX_SEGMEXEC
67596+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
67597+ goto out;
67598+#endif
67599+
67600 /*
67601 * Make sure the vma is shared, that it supports prefaulting,
67602 * and that the remapped range is valid and fully within
67603diff --git a/mm/highmem.c b/mm/highmem.c
67604index 57d82c6..e9e0552 100644
67605--- a/mm/highmem.c
67606+++ b/mm/highmem.c
67607@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
67608 * So no dangers, even with speculative execution.
67609 */
67610 page = pte_page(pkmap_page_table[i]);
67611+ pax_open_kernel();
67612 pte_clear(&init_mm, (unsigned long)page_address(page),
67613 &pkmap_page_table[i]);
67614-
67615+ pax_close_kernel();
67616 set_page_address(page, NULL);
67617 need_flush = 1;
67618 }
67619@@ -186,9 +187,11 @@ start:
67620 }
67621 }
67622 vaddr = PKMAP_ADDR(last_pkmap_nr);
67623+
67624+ pax_open_kernel();
67625 set_pte_at(&init_mm, vaddr,
67626 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
67627-
67628+ pax_close_kernel();
67629 pkmap_count[last_pkmap_nr] = 1;
67630 set_page_address(page, (void *)vaddr);
67631
67632diff --git a/mm/huge_memory.c b/mm/huge_memory.c
67633index 33141f5..e56bef9 100644
67634--- a/mm/huge_memory.c
67635+++ b/mm/huge_memory.c
67636@@ -703,7 +703,7 @@ out:
67637 * run pte_offset_map on the pmd, if an huge pmd could
67638 * materialize from under us from a different thread.
67639 */
67640- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
67641+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
67642 return VM_FAULT_OOM;
67643 /* if an huge pmd materialized from under us just retry later */
67644 if (unlikely(pmd_trans_huge(*pmd)))
67645diff --git a/mm/hugetlb.c b/mm/hugetlb.c
67646index 2316840..b418671 100644
67647--- a/mm/hugetlb.c
67648+++ b/mm/hugetlb.c
67649@@ -2347,6 +2347,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
67650 return 1;
67651 }
67652
67653+#ifdef CONFIG_PAX_SEGMEXEC
67654+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
67655+{
67656+ struct mm_struct *mm = vma->vm_mm;
67657+ struct vm_area_struct *vma_m;
67658+ unsigned long address_m;
67659+ pte_t *ptep_m;
67660+
67661+ vma_m = pax_find_mirror_vma(vma);
67662+ if (!vma_m)
67663+ return;
67664+
67665+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
67666+ address_m = address + SEGMEXEC_TASK_SIZE;
67667+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
67668+ get_page(page_m);
67669+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
67670+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
67671+}
67672+#endif
67673+
67674 /*
67675 * Hugetlb_cow() should be called with page lock of the original hugepage held.
67676 */
67677@@ -2450,6 +2471,11 @@ retry_avoidcopy:
67678 make_huge_pte(vma, new_page, 1));
67679 page_remove_rmap(old_page);
67680 hugepage_add_new_anon_rmap(new_page, vma, address);
67681+
67682+#ifdef CONFIG_PAX_SEGMEXEC
67683+ pax_mirror_huge_pte(vma, address, new_page);
67684+#endif
67685+
67686 /* Make the old page be freed below */
67687 new_page = old_page;
67688 mmu_notifier_invalidate_range_end(mm,
67689@@ -2601,6 +2627,10 @@ retry:
67690 && (vma->vm_flags & VM_SHARED)));
67691 set_huge_pte_at(mm, address, ptep, new_pte);
67692
67693+#ifdef CONFIG_PAX_SEGMEXEC
67694+ pax_mirror_huge_pte(vma, address, page);
67695+#endif
67696+
67697 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
67698 /* Optimization, do the COW without a second fault */
67699 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
67700@@ -2630,6 +2660,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
67701 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
67702 struct hstate *h = hstate_vma(vma);
67703
67704+#ifdef CONFIG_PAX_SEGMEXEC
67705+ struct vm_area_struct *vma_m;
67706+#endif
67707+
67708 ptep = huge_pte_offset(mm, address);
67709 if (ptep) {
67710 entry = huge_ptep_get(ptep);
67711@@ -2641,6 +2675,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
67712 VM_FAULT_SET_HINDEX(h - hstates);
67713 }
67714
67715+#ifdef CONFIG_PAX_SEGMEXEC
67716+ vma_m = pax_find_mirror_vma(vma);
67717+ if (vma_m) {
67718+ unsigned long address_m;
67719+
67720+ if (vma->vm_start > vma_m->vm_start) {
67721+ address_m = address;
67722+ address -= SEGMEXEC_TASK_SIZE;
67723+ vma = vma_m;
67724+ h = hstate_vma(vma);
67725+ } else
67726+ address_m = address + SEGMEXEC_TASK_SIZE;
67727+
67728+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
67729+ return VM_FAULT_OOM;
67730+ address_m &= HPAGE_MASK;
67731+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
67732+ }
67733+#endif
67734+
67735 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
67736 if (!ptep)
67737 return VM_FAULT_OOM;
67738diff --git a/mm/internal.h b/mm/internal.h
67739index 2189af4..f2ca332 100644
67740--- a/mm/internal.h
67741+++ b/mm/internal.h
67742@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
67743 * in mm/page_alloc.c
67744 */
67745 extern void __free_pages_bootmem(struct page *page, unsigned int order);
67746+extern void free_compound_page(struct page *page);
67747 extern void prep_compound_page(struct page *page, unsigned long order);
67748 #ifdef CONFIG_MEMORY_FAILURE
67749 extern bool is_free_buddy_page(struct page *page);
67750diff --git a/mm/kmemleak.c b/mm/kmemleak.c
67751index f3b2a00..61da94d 100644
67752--- a/mm/kmemleak.c
67753+++ b/mm/kmemleak.c
67754@@ -357,7 +357,7 @@ static void print_unreferenced(struct seq_file *seq,
67755
67756 for (i = 0; i < object->trace_len; i++) {
67757 void *ptr = (void *)object->trace[i];
67758- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
67759+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
67760 }
67761 }
67762
67763diff --git a/mm/maccess.c b/mm/maccess.c
67764index d53adf9..03a24bf 100644
67765--- a/mm/maccess.c
67766+++ b/mm/maccess.c
67767@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
67768 set_fs(KERNEL_DS);
67769 pagefault_disable();
67770 ret = __copy_from_user_inatomic(dst,
67771- (__force const void __user *)src, size);
67772+ (const void __force_user *)src, size);
67773 pagefault_enable();
67774 set_fs(old_fs);
67775
67776@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
67777
67778 set_fs(KERNEL_DS);
67779 pagefault_disable();
67780- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
67781+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
67782 pagefault_enable();
67783 set_fs(old_fs);
67784
67785diff --git a/mm/madvise.c b/mm/madvise.c
67786index 74bf193..feb6fd3 100644
67787--- a/mm/madvise.c
67788+++ b/mm/madvise.c
67789@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
67790 pgoff_t pgoff;
67791 unsigned long new_flags = vma->vm_flags;
67792
67793+#ifdef CONFIG_PAX_SEGMEXEC
67794+ struct vm_area_struct *vma_m;
67795+#endif
67796+
67797 switch (behavior) {
67798 case MADV_NORMAL:
67799 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
67800@@ -110,6 +114,13 @@ success:
67801 /*
67802 * vm_flags is protected by the mmap_sem held in write mode.
67803 */
67804+
67805+#ifdef CONFIG_PAX_SEGMEXEC
67806+ vma_m = pax_find_mirror_vma(vma);
67807+ if (vma_m)
67808+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
67809+#endif
67810+
67811 vma->vm_flags = new_flags;
67812
67813 out:
67814@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
67815 struct vm_area_struct ** prev,
67816 unsigned long start, unsigned long end)
67817 {
67818+
67819+#ifdef CONFIG_PAX_SEGMEXEC
67820+ struct vm_area_struct *vma_m;
67821+#endif
67822+
67823 *prev = vma;
67824 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
67825 return -EINVAL;
67826@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
67827 zap_page_range(vma, start, end - start, &details);
67828 } else
67829 zap_page_range(vma, start, end - start, NULL);
67830+
67831+#ifdef CONFIG_PAX_SEGMEXEC
67832+ vma_m = pax_find_mirror_vma(vma);
67833+ if (vma_m) {
67834+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
67835+ struct zap_details details = {
67836+ .nonlinear_vma = vma_m,
67837+ .last_index = ULONG_MAX,
67838+ };
67839+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
67840+ } else
67841+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
67842+ }
67843+#endif
67844+
67845 return 0;
67846 }
67847
67848@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
67849 if (end < start)
67850 goto out;
67851
67852+#ifdef CONFIG_PAX_SEGMEXEC
67853+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
67854+ if (end > SEGMEXEC_TASK_SIZE)
67855+ goto out;
67856+ } else
67857+#endif
67858+
67859+ if (end > TASK_SIZE)
67860+ goto out;
67861+
67862 error = 0;
67863 if (end == start)
67864 goto out;
67865diff --git a/mm/memory-failure.c b/mm/memory-failure.c
67866index 06d3479..0778eef 100644
67867--- a/mm/memory-failure.c
67868+++ b/mm/memory-failure.c
67869@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
67870
67871 int sysctl_memory_failure_recovery __read_mostly = 1;
67872
67873-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
67874+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
67875
67876 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
67877
67878@@ -202,7 +202,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
67879 si.si_signo = SIGBUS;
67880 si.si_errno = 0;
67881 si.si_code = BUS_MCEERR_AO;
67882- si.si_addr = (void *)addr;
67883+ si.si_addr = (void __user *)addr;
67884 #ifdef __ARCH_SI_TRAPNO
67885 si.si_trapno = trapno;
67886 #endif
67887@@ -1010,7 +1010,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
67888 }
67889
67890 nr_pages = 1 << compound_trans_order(hpage);
67891- atomic_long_add(nr_pages, &mce_bad_pages);
67892+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
67893
67894 /*
67895 * We need/can do nothing about count=0 pages.
67896@@ -1040,7 +1040,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
67897 if (!PageHWPoison(hpage)
67898 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
67899 || (p != hpage && TestSetPageHWPoison(hpage))) {
67900- atomic_long_sub(nr_pages, &mce_bad_pages);
67901+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
67902 return 0;
67903 }
67904 set_page_hwpoison_huge_page(hpage);
67905@@ -1098,7 +1098,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
67906 }
67907 if (hwpoison_filter(p)) {
67908 if (TestClearPageHWPoison(p))
67909- atomic_long_sub(nr_pages, &mce_bad_pages);
67910+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
67911 unlock_page(hpage);
67912 put_page(hpage);
67913 return 0;
67914@@ -1315,7 +1315,7 @@ int unpoison_memory(unsigned long pfn)
67915 return 0;
67916 }
67917 if (TestClearPageHWPoison(p))
67918- atomic_long_sub(nr_pages, &mce_bad_pages);
67919+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
67920 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
67921 return 0;
67922 }
67923@@ -1329,7 +1329,7 @@ int unpoison_memory(unsigned long pfn)
67924 */
67925 if (TestClearPageHWPoison(page)) {
67926 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
67927- atomic_long_sub(nr_pages, &mce_bad_pages);
67928+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
67929 freeit = 1;
67930 if (PageHuge(page))
67931 clear_page_hwpoison_huge_page(page);
67932@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
67933 }
67934 done:
67935 if (!PageHWPoison(hpage))
67936- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
67937+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
67938 set_page_hwpoison_huge_page(hpage);
67939 dequeue_hwpoisoned_huge_page(hpage);
67940 /* keep elevated page count for bad page */
67941@@ -1573,7 +1573,7 @@ int soft_offline_page(struct page *page, int flags)
67942 return ret;
67943
67944 done:
67945- atomic_long_add(1, &mce_bad_pages);
67946+ atomic_long_add_unchecked(1, &mce_bad_pages);
67947 SetPageHWPoison(page);
67948 /* keep elevated page count for bad page */
67949 return ret;
67950diff --git a/mm/memory.c b/mm/memory.c
67951index 829d437..3d3926a 100644
67952--- a/mm/memory.c
67953+++ b/mm/memory.c
67954@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
67955 return;
67956
67957 pmd = pmd_offset(pud, start);
67958+
67959+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
67960 pud_clear(pud);
67961 pmd_free_tlb(tlb, pmd, start);
67962+#endif
67963+
67964 }
67965
67966 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
67967@@ -489,9 +493,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
67968 if (end - 1 > ceiling - 1)
67969 return;
67970
67971+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
67972 pud = pud_offset(pgd, start);
67973 pgd_clear(pgd);
67974 pud_free_tlb(tlb, pud, start);
67975+#endif
67976+
67977 }
67978
67979 /*
67980@@ -1566,12 +1573,6 @@ no_page_table:
67981 return page;
67982 }
67983
67984-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
67985-{
67986- return stack_guard_page_start(vma, addr) ||
67987- stack_guard_page_end(vma, addr+PAGE_SIZE);
67988-}
67989-
67990 /**
67991 * __get_user_pages() - pin user pages in memory
67992 * @tsk: task_struct of target task
67993@@ -1644,10 +1645,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
67994 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
67995 i = 0;
67996
67997- do {
67998+ while (nr_pages) {
67999 struct vm_area_struct *vma;
68000
68001- vma = find_extend_vma(mm, start);
68002+ vma = find_vma(mm, start);
68003 if (!vma && in_gate_area(mm, start)) {
68004 unsigned long pg = start & PAGE_MASK;
68005 pgd_t *pgd;
68006@@ -1695,7 +1696,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
68007 goto next_page;
68008 }
68009
68010- if (!vma ||
68011+ if (!vma || start < vma->vm_start ||
68012 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
68013 !(vm_flags & vma->vm_flags))
68014 return i ? : -EFAULT;
68015@@ -1722,11 +1723,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
68016 int ret;
68017 unsigned int fault_flags = 0;
68018
68019- /* For mlock, just skip the stack guard page. */
68020- if (foll_flags & FOLL_MLOCK) {
68021- if (stack_guard_page(vma, start))
68022- goto next_page;
68023- }
68024 if (foll_flags & FOLL_WRITE)
68025 fault_flags |= FAULT_FLAG_WRITE;
68026 if (nonblocking)
68027@@ -1800,7 +1796,7 @@ next_page:
68028 start += PAGE_SIZE;
68029 nr_pages--;
68030 } while (nr_pages && start < vma->vm_end);
68031- } while (nr_pages);
68032+ }
68033 return i;
68034 }
68035 EXPORT_SYMBOL(__get_user_pages);
68036@@ -2007,6 +2003,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
68037 page_add_file_rmap(page);
68038 set_pte_at(mm, addr, pte, mk_pte(page, prot));
68039
68040+#ifdef CONFIG_PAX_SEGMEXEC
68041+ pax_mirror_file_pte(vma, addr, page, ptl);
68042+#endif
68043+
68044 retval = 0;
68045 pte_unmap_unlock(pte, ptl);
68046 return retval;
68047@@ -2041,10 +2041,22 @@ out:
68048 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
68049 struct page *page)
68050 {
68051+
68052+#ifdef CONFIG_PAX_SEGMEXEC
68053+ struct vm_area_struct *vma_m;
68054+#endif
68055+
68056 if (addr < vma->vm_start || addr >= vma->vm_end)
68057 return -EFAULT;
68058 if (!page_count(page))
68059 return -EINVAL;
68060+
68061+#ifdef CONFIG_PAX_SEGMEXEC
68062+ vma_m = pax_find_mirror_vma(vma);
68063+ if (vma_m)
68064+ vma_m->vm_flags |= VM_INSERTPAGE;
68065+#endif
68066+
68067 vma->vm_flags |= VM_INSERTPAGE;
68068 return insert_page(vma, addr, page, vma->vm_page_prot);
68069 }
68070@@ -2130,6 +2142,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
68071 unsigned long pfn)
68072 {
68073 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
68074+ BUG_ON(vma->vm_mirror);
68075
68076 if (addr < vma->vm_start || addr >= vma->vm_end)
68077 return -EFAULT;
68078@@ -2445,6 +2458,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
68079 copy_user_highpage(dst, src, va, vma);
68080 }
68081
68082+#ifdef CONFIG_PAX_SEGMEXEC
68083+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
68084+{
68085+ struct mm_struct *mm = vma->vm_mm;
68086+ spinlock_t *ptl;
68087+ pte_t *pte, entry;
68088+
68089+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
68090+ entry = *pte;
68091+ if (!pte_present(entry)) {
68092+ if (!pte_none(entry)) {
68093+ BUG_ON(pte_file(entry));
68094+ free_swap_and_cache(pte_to_swp_entry(entry));
68095+ pte_clear_not_present_full(mm, address, pte, 0);
68096+ }
68097+ } else {
68098+ struct page *page;
68099+
68100+ flush_cache_page(vma, address, pte_pfn(entry));
68101+ entry = ptep_clear_flush(vma, address, pte);
68102+ BUG_ON(pte_dirty(entry));
68103+ page = vm_normal_page(vma, address, entry);
68104+ if (page) {
68105+ update_hiwater_rss(mm);
68106+ if (PageAnon(page))
68107+ dec_mm_counter_fast(mm, MM_ANONPAGES);
68108+ else
68109+ dec_mm_counter_fast(mm, MM_FILEPAGES);
68110+ page_remove_rmap(page);
68111+ page_cache_release(page);
68112+ }
68113+ }
68114+ pte_unmap_unlock(pte, ptl);
68115+}
68116+
68117+/* PaX: if vma is mirrored, synchronize the mirror's PTE
68118+ *
68119+ * the ptl of the lower mapped page is held on entry and is not released on exit
68120+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
68121+ */
68122+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
68123+{
68124+ struct mm_struct *mm = vma->vm_mm;
68125+ unsigned long address_m;
68126+ spinlock_t *ptl_m;
68127+ struct vm_area_struct *vma_m;
68128+ pmd_t *pmd_m;
68129+ pte_t *pte_m, entry_m;
68130+
68131+ BUG_ON(!page_m || !PageAnon(page_m));
68132+
68133+ vma_m = pax_find_mirror_vma(vma);
68134+ if (!vma_m)
68135+ return;
68136+
68137+ BUG_ON(!PageLocked(page_m));
68138+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
68139+ address_m = address + SEGMEXEC_TASK_SIZE;
68140+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
68141+ pte_m = pte_offset_map(pmd_m, address_m);
68142+ ptl_m = pte_lockptr(mm, pmd_m);
68143+ if (ptl != ptl_m) {
68144+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
68145+ if (!pte_none(*pte_m))
68146+ goto out;
68147+ }
68148+
68149+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
68150+ page_cache_get(page_m);
68151+ page_add_anon_rmap(page_m, vma_m, address_m);
68152+ inc_mm_counter_fast(mm, MM_ANONPAGES);
68153+ set_pte_at(mm, address_m, pte_m, entry_m);
68154+ update_mmu_cache(vma_m, address_m, entry_m);
68155+out:
68156+ if (ptl != ptl_m)
68157+ spin_unlock(ptl_m);
68158+ pte_unmap(pte_m);
68159+ unlock_page(page_m);
68160+}
68161+
68162+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
68163+{
68164+ struct mm_struct *mm = vma->vm_mm;
68165+ unsigned long address_m;
68166+ spinlock_t *ptl_m;
68167+ struct vm_area_struct *vma_m;
68168+ pmd_t *pmd_m;
68169+ pte_t *pte_m, entry_m;
68170+
68171+ BUG_ON(!page_m || PageAnon(page_m));
68172+
68173+ vma_m = pax_find_mirror_vma(vma);
68174+ if (!vma_m)
68175+ return;
68176+
68177+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
68178+ address_m = address + SEGMEXEC_TASK_SIZE;
68179+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
68180+ pte_m = pte_offset_map(pmd_m, address_m);
68181+ ptl_m = pte_lockptr(mm, pmd_m);
68182+ if (ptl != ptl_m) {
68183+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
68184+ if (!pte_none(*pte_m))
68185+ goto out;
68186+ }
68187+
68188+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
68189+ page_cache_get(page_m);
68190+ page_add_file_rmap(page_m);
68191+ inc_mm_counter_fast(mm, MM_FILEPAGES);
68192+ set_pte_at(mm, address_m, pte_m, entry_m);
68193+ update_mmu_cache(vma_m, address_m, entry_m);
68194+out:
68195+ if (ptl != ptl_m)
68196+ spin_unlock(ptl_m);
68197+ pte_unmap(pte_m);
68198+}
68199+
68200+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
68201+{
68202+ struct mm_struct *mm = vma->vm_mm;
68203+ unsigned long address_m;
68204+ spinlock_t *ptl_m;
68205+ struct vm_area_struct *vma_m;
68206+ pmd_t *pmd_m;
68207+ pte_t *pte_m, entry_m;
68208+
68209+ vma_m = pax_find_mirror_vma(vma);
68210+ if (!vma_m)
68211+ return;
68212+
68213+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
68214+ address_m = address + SEGMEXEC_TASK_SIZE;
68215+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
68216+ pte_m = pte_offset_map(pmd_m, address_m);
68217+ ptl_m = pte_lockptr(mm, pmd_m);
68218+ if (ptl != ptl_m) {
68219+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
68220+ if (!pte_none(*pte_m))
68221+ goto out;
68222+ }
68223+
68224+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
68225+ set_pte_at(mm, address_m, pte_m, entry_m);
68226+out:
68227+ if (ptl != ptl_m)
68228+ spin_unlock(ptl_m);
68229+ pte_unmap(pte_m);
68230+}
68231+
68232+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
68233+{
68234+ struct page *page_m;
68235+ pte_t entry;
68236+
68237+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
68238+ goto out;
68239+
68240+ entry = *pte;
68241+ page_m = vm_normal_page(vma, address, entry);
68242+ if (!page_m)
68243+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
68244+ else if (PageAnon(page_m)) {
68245+ if (pax_find_mirror_vma(vma)) {
68246+ pte_unmap_unlock(pte, ptl);
68247+ lock_page(page_m);
68248+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
68249+ if (pte_same(entry, *pte))
68250+ pax_mirror_anon_pte(vma, address, page_m, ptl);
68251+ else
68252+ unlock_page(page_m);
68253+ }
68254+ } else
68255+ pax_mirror_file_pte(vma, address, page_m, ptl);
68256+
68257+out:
68258+ pte_unmap_unlock(pte, ptl);
68259+}
68260+#endif
68261+
68262 /*
68263 * This routine handles present pages, when users try to write
68264 * to a shared page. It is done by copying the page to a new address
68265@@ -2656,6 +2849,12 @@ gotten:
68266 */
68267 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
68268 if (likely(pte_same(*page_table, orig_pte))) {
68269+
68270+#ifdef CONFIG_PAX_SEGMEXEC
68271+ if (pax_find_mirror_vma(vma))
68272+ BUG_ON(!trylock_page(new_page));
68273+#endif
68274+
68275 if (old_page) {
68276 if (!PageAnon(old_page)) {
68277 dec_mm_counter_fast(mm, MM_FILEPAGES);
68278@@ -2707,6 +2906,10 @@ gotten:
68279 page_remove_rmap(old_page);
68280 }
68281
68282+#ifdef CONFIG_PAX_SEGMEXEC
68283+ pax_mirror_anon_pte(vma, address, new_page, ptl);
68284+#endif
68285+
68286 /* Free the old page.. */
68287 new_page = old_page;
68288 ret |= VM_FAULT_WRITE;
68289@@ -2986,6 +3189,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
68290 swap_free(entry);
68291 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
68292 try_to_free_swap(page);
68293+
68294+#ifdef CONFIG_PAX_SEGMEXEC
68295+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
68296+#endif
68297+
68298 unlock_page(page);
68299 if (swapcache) {
68300 /*
68301@@ -3009,6 +3217,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
68302
68303 /* No need to invalidate - it was non-present before */
68304 update_mmu_cache(vma, address, page_table);
68305+
68306+#ifdef CONFIG_PAX_SEGMEXEC
68307+ pax_mirror_anon_pte(vma, address, page, ptl);
68308+#endif
68309+
68310 unlock:
68311 pte_unmap_unlock(page_table, ptl);
68312 out:
68313@@ -3028,40 +3241,6 @@ out_release:
68314 }
68315
68316 /*
68317- * This is like a special single-page "expand_{down|up}wards()",
68318- * except we must first make sure that 'address{-|+}PAGE_SIZE'
68319- * doesn't hit another vma.
68320- */
68321-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
68322-{
68323- address &= PAGE_MASK;
68324- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
68325- struct vm_area_struct *prev = vma->vm_prev;
68326-
68327- /*
68328- * Is there a mapping abutting this one below?
68329- *
68330- * That's only ok if it's the same stack mapping
68331- * that has gotten split..
68332- */
68333- if (prev && prev->vm_end == address)
68334- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
68335-
68336- expand_downwards(vma, address - PAGE_SIZE);
68337- }
68338- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
68339- struct vm_area_struct *next = vma->vm_next;
68340-
68341- /* As VM_GROWSDOWN but s/below/above/ */
68342- if (next && next->vm_start == address + PAGE_SIZE)
68343- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
68344-
68345- expand_upwards(vma, address + PAGE_SIZE);
68346- }
68347- return 0;
68348-}
68349-
68350-/*
68351 * We enter with non-exclusive mmap_sem (to exclude vma changes,
68352 * but allow concurrent faults), and pte mapped but not yet locked.
68353 * We return with mmap_sem still held, but pte unmapped and unlocked.
68354@@ -3070,27 +3249,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
68355 unsigned long address, pte_t *page_table, pmd_t *pmd,
68356 unsigned int flags)
68357 {
68358- struct page *page;
68359+ struct page *page = NULL;
68360 spinlock_t *ptl;
68361 pte_t entry;
68362
68363- pte_unmap(page_table);
68364-
68365- /* Check if we need to add a guard page to the stack */
68366- if (check_stack_guard_page(vma, address) < 0)
68367- return VM_FAULT_SIGBUS;
68368-
68369- /* Use the zero-page for reads */
68370 if (!(flags & FAULT_FLAG_WRITE)) {
68371 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
68372 vma->vm_page_prot));
68373- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
68374+ ptl = pte_lockptr(mm, pmd);
68375+ spin_lock(ptl);
68376 if (!pte_none(*page_table))
68377 goto unlock;
68378 goto setpte;
68379 }
68380
68381 /* Allocate our own private page. */
68382+ pte_unmap(page_table);
68383+
68384 if (unlikely(anon_vma_prepare(vma)))
68385 goto oom;
68386 page = alloc_zeroed_user_highpage_movable(vma, address);
68387@@ -3109,6 +3284,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
68388 if (!pte_none(*page_table))
68389 goto release;
68390
68391+#ifdef CONFIG_PAX_SEGMEXEC
68392+ if (pax_find_mirror_vma(vma))
68393+ BUG_ON(!trylock_page(page));
68394+#endif
68395+
68396 inc_mm_counter_fast(mm, MM_ANONPAGES);
68397 page_add_new_anon_rmap(page, vma, address);
68398 setpte:
68399@@ -3116,6 +3296,12 @@ setpte:
68400
68401 /* No need to invalidate - it was non-present before */
68402 update_mmu_cache(vma, address, page_table);
68403+
68404+#ifdef CONFIG_PAX_SEGMEXEC
68405+ if (page)
68406+ pax_mirror_anon_pte(vma, address, page, ptl);
68407+#endif
68408+
68409 unlock:
68410 pte_unmap_unlock(page_table, ptl);
68411 return 0;
68412@@ -3259,6 +3445,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68413 */
68414 /* Only go through if we didn't race with anybody else... */
68415 if (likely(pte_same(*page_table, orig_pte))) {
68416+
68417+#ifdef CONFIG_PAX_SEGMEXEC
68418+ if (anon && pax_find_mirror_vma(vma))
68419+ BUG_ON(!trylock_page(page));
68420+#endif
68421+
68422 flush_icache_page(vma, page);
68423 entry = mk_pte(page, vma->vm_page_prot);
68424 if (flags & FAULT_FLAG_WRITE)
68425@@ -3278,6 +3470,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68426
68427 /* no need to invalidate: a not-present page won't be cached */
68428 update_mmu_cache(vma, address, page_table);
68429+
68430+#ifdef CONFIG_PAX_SEGMEXEC
68431+ if (anon)
68432+ pax_mirror_anon_pte(vma, address, page, ptl);
68433+ else
68434+ pax_mirror_file_pte(vma, address, page, ptl);
68435+#endif
68436+
68437 } else {
68438 if (cow_page)
68439 mem_cgroup_uncharge_page(cow_page);
68440@@ -3431,6 +3631,12 @@ int handle_pte_fault(struct mm_struct *mm,
68441 if (flags & FAULT_FLAG_WRITE)
68442 flush_tlb_fix_spurious_fault(vma, address);
68443 }
68444+
68445+#ifdef CONFIG_PAX_SEGMEXEC
68446+ pax_mirror_pte(vma, address, pte, pmd, ptl);
68447+ return 0;
68448+#endif
68449+
68450 unlock:
68451 pte_unmap_unlock(pte, ptl);
68452 return 0;
68453@@ -3447,6 +3653,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68454 pmd_t *pmd;
68455 pte_t *pte;
68456
68457+#ifdef CONFIG_PAX_SEGMEXEC
68458+ struct vm_area_struct *vma_m;
68459+#endif
68460+
68461 __set_current_state(TASK_RUNNING);
68462
68463 count_vm_event(PGFAULT);
68464@@ -3458,6 +3668,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68465 if (unlikely(is_vm_hugetlb_page(vma)))
68466 return hugetlb_fault(mm, vma, address, flags);
68467
68468+#ifdef CONFIG_PAX_SEGMEXEC
68469+ vma_m = pax_find_mirror_vma(vma);
68470+ if (vma_m) {
68471+ unsigned long address_m;
68472+ pgd_t *pgd_m;
68473+ pud_t *pud_m;
68474+ pmd_t *pmd_m;
68475+
68476+ if (vma->vm_start > vma_m->vm_start) {
68477+ address_m = address;
68478+ address -= SEGMEXEC_TASK_SIZE;
68479+ vma = vma_m;
68480+ } else
68481+ address_m = address + SEGMEXEC_TASK_SIZE;
68482+
68483+ pgd_m = pgd_offset(mm, address_m);
68484+ pud_m = pud_alloc(mm, pgd_m, address_m);
68485+ if (!pud_m)
68486+ return VM_FAULT_OOM;
68487+ pmd_m = pmd_alloc(mm, pud_m, address_m);
68488+ if (!pmd_m)
68489+ return VM_FAULT_OOM;
68490+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
68491+ return VM_FAULT_OOM;
68492+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
68493+ }
68494+#endif
68495+
68496 pgd = pgd_offset(mm, address);
68497 pud = pud_alloc(mm, pgd, address);
68498 if (!pud)
68499@@ -3487,7 +3725,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
68500 * run pte_offset_map on the pmd, if an huge pmd could
68501 * materialize from under us from a different thread.
68502 */
68503- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
68504+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
68505 return VM_FAULT_OOM;
68506 /* if an huge pmd materialized from under us just retry later */
68507 if (unlikely(pmd_trans_huge(*pmd)))
68508@@ -3591,7 +3829,7 @@ static int __init gate_vma_init(void)
68509 gate_vma.vm_start = FIXADDR_USER_START;
68510 gate_vma.vm_end = FIXADDR_USER_END;
68511 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
68512- gate_vma.vm_page_prot = __P101;
68513+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
68514 /*
68515 * Make sure the vDSO gets into every core dump.
68516 * Dumping its contents makes post-mortem fully interpretable later
68517diff --git a/mm/mempolicy.c b/mm/mempolicy.c
68518index c3fdbcb..2e8ef90 100644
68519--- a/mm/mempolicy.c
68520+++ b/mm/mempolicy.c
68521@@ -640,6 +640,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
68522 unsigned long vmstart;
68523 unsigned long vmend;
68524
68525+#ifdef CONFIG_PAX_SEGMEXEC
68526+ struct vm_area_struct *vma_m;
68527+#endif
68528+
68529 vma = find_vma_prev(mm, start, &prev);
68530 if (!vma || vma->vm_start > start)
68531 return -EFAULT;
68532@@ -678,6 +682,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
68533 err = policy_vma(vma, new_pol);
68534 if (err)
68535 goto out;
68536+
68537+#ifdef CONFIG_PAX_SEGMEXEC
68538+ vma_m = pax_find_mirror_vma(vma);
68539+ if (vma_m) {
68540+ err = policy_vma(vma_m, new_pol);
68541+ if (err)
68542+ goto out;
68543+ }
68544+#endif
68545+
68546 }
68547
68548 out:
68549@@ -1111,6 +1125,17 @@ static long do_mbind(unsigned long start, unsigned long len,
68550
68551 if (end < start)
68552 return -EINVAL;
68553+
68554+#ifdef CONFIG_PAX_SEGMEXEC
68555+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
68556+ if (end > SEGMEXEC_TASK_SIZE)
68557+ return -EINVAL;
68558+ } else
68559+#endif
68560+
68561+ if (end > TASK_SIZE)
68562+ return -EINVAL;
68563+
68564 if (end == start)
68565 return 0;
68566
68567@@ -1329,6 +1354,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
68568 if (!mm)
68569 goto out;
68570
68571+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68572+ if (mm != current->mm &&
68573+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
68574+ err = -EPERM;
68575+ goto out;
68576+ }
68577+#endif
68578+
68579 /*
68580 * Check if this process has the right to modify the specified
68581 * process. The right exists if the process has administrative
68582@@ -1338,8 +1371,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
68583 rcu_read_lock();
68584 tcred = __task_cred(task);
68585 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
68586- cred->uid != tcred->suid && cred->uid != tcred->uid &&
68587- !capable(CAP_SYS_NICE)) {
68588+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
68589 rcu_read_unlock();
68590 err = -EPERM;
68591 goto out;
68592diff --git a/mm/migrate.c b/mm/migrate.c
68593index 177aca4..ab3a744 100644
68594--- a/mm/migrate.c
68595+++ b/mm/migrate.c
68596@@ -1313,6 +1313,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
68597 if (!mm)
68598 return -EINVAL;
68599
68600+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68601+ if (mm != current->mm &&
68602+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
68603+ err = -EPERM;
68604+ goto out;
68605+ }
68606+#endif
68607+
68608 /*
68609 * Check if this process has the right to modify the specified
68610 * process. The right exists if the process has administrative
68611@@ -1322,8 +1330,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
68612 rcu_read_lock();
68613 tcred = __task_cred(task);
68614 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
68615- cred->uid != tcred->suid && cred->uid != tcred->uid &&
68616- !capable(CAP_SYS_NICE)) {
68617+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
68618 rcu_read_unlock();
68619 err = -EPERM;
68620 goto out;
68621diff --git a/mm/mlock.c b/mm/mlock.c
68622index 4f4f53b..9511904 100644
68623--- a/mm/mlock.c
68624+++ b/mm/mlock.c
68625@@ -13,6 +13,7 @@
68626 #include <linux/pagemap.h>
68627 #include <linux/mempolicy.h>
68628 #include <linux/syscalls.h>
68629+#include <linux/security.h>
68630 #include <linux/sched.h>
68631 #include <linux/export.h>
68632 #include <linux/rmap.h>
68633@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
68634 return -EINVAL;
68635 if (end == start)
68636 return 0;
68637+ if (end > TASK_SIZE)
68638+ return -EINVAL;
68639+
68640 vma = find_vma_prev(current->mm, start, &prev);
68641 if (!vma || vma->vm_start > start)
68642 return -ENOMEM;
68643@@ -395,6 +399,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
68644 for (nstart = start ; ; ) {
68645 vm_flags_t newflags;
68646
68647+#ifdef CONFIG_PAX_SEGMEXEC
68648+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
68649+ break;
68650+#endif
68651+
68652 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
68653
68654 newflags = vma->vm_flags | VM_LOCKED;
68655@@ -500,6 +509,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
68656 lock_limit >>= PAGE_SHIFT;
68657
68658 /* check against resource limits */
68659+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
68660 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
68661 error = do_mlock(start, len, 1);
68662 up_write(&current->mm->mmap_sem);
68663@@ -523,17 +533,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
68664 static int do_mlockall(int flags)
68665 {
68666 struct vm_area_struct * vma, * prev = NULL;
68667- unsigned int def_flags = 0;
68668
68669 if (flags & MCL_FUTURE)
68670- def_flags = VM_LOCKED;
68671- current->mm->def_flags = def_flags;
68672+ current->mm->def_flags |= VM_LOCKED;
68673+ else
68674+ current->mm->def_flags &= ~VM_LOCKED;
68675 if (flags == MCL_FUTURE)
68676 goto out;
68677
68678 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
68679 vm_flags_t newflags;
68680
68681+#ifdef CONFIG_PAX_SEGMEXEC
68682+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
68683+ break;
68684+#endif
68685+
68686+ BUG_ON(vma->vm_end > TASK_SIZE);
68687 newflags = vma->vm_flags | VM_LOCKED;
68688 if (!(flags & MCL_CURRENT))
68689 newflags &= ~VM_LOCKED;
68690@@ -566,6 +582,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
68691 lock_limit >>= PAGE_SHIFT;
68692
68693 ret = -ENOMEM;
68694+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
68695 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
68696 capable(CAP_IPC_LOCK))
68697 ret = do_mlockall(flags);
68698diff --git a/mm/mmap.c b/mm/mmap.c
68699index eae90af..51ca80b 100644
68700--- a/mm/mmap.c
68701+++ b/mm/mmap.c
68702@@ -46,6 +46,16 @@
68703 #define arch_rebalance_pgtables(addr, len) (addr)
68704 #endif
68705
68706+static inline void verify_mm_writelocked(struct mm_struct *mm)
68707+{
68708+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
68709+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
68710+ up_read(&mm->mmap_sem);
68711+ BUG();
68712+ }
68713+#endif
68714+}
68715+
68716 static void unmap_region(struct mm_struct *mm,
68717 struct vm_area_struct *vma, struct vm_area_struct *prev,
68718 unsigned long start, unsigned long end);
68719@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm,
68720 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
68721 *
68722 */
68723-pgprot_t protection_map[16] = {
68724+pgprot_t protection_map[16] __read_only = {
68725 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
68726 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
68727 };
68728
68729-pgprot_t vm_get_page_prot(unsigned long vm_flags)
68730+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
68731 {
68732- return __pgprot(pgprot_val(protection_map[vm_flags &
68733+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
68734 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
68735 pgprot_val(arch_vm_get_page_prot(vm_flags)));
68736+
68737+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
68738+ if (!(__supported_pte_mask & _PAGE_NX) &&
68739+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
68740+ (vm_flags & (VM_READ | VM_WRITE)))
68741+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
68742+#endif
68743+
68744+ return prot;
68745 }
68746 EXPORT_SYMBOL(vm_get_page_prot);
68747
68748 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
68749 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
68750 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
68751+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
68752 /*
68753 * Make sure vm_committed_as in one cacheline and not cacheline shared with
68754 * other variables. It can be updated by several CPUs frequently.
68755@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
68756 struct vm_area_struct *next = vma->vm_next;
68757
68758 might_sleep();
68759+ BUG_ON(vma->vm_mirror);
68760 if (vma->vm_ops && vma->vm_ops->close)
68761 vma->vm_ops->close(vma);
68762 if (vma->vm_file) {
68763@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
68764 * not page aligned -Ram Gupta
68765 */
68766 rlim = rlimit(RLIMIT_DATA);
68767+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
68768 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
68769 (mm->end_data - mm->start_data) > rlim)
68770 goto out;
68771@@ -689,6 +711,12 @@ static int
68772 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
68773 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
68774 {
68775+
68776+#ifdef CONFIG_PAX_SEGMEXEC
68777+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
68778+ return 0;
68779+#endif
68780+
68781 if (is_mergeable_vma(vma, file, vm_flags) &&
68782 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
68783 if (vma->vm_pgoff == vm_pgoff)
68784@@ -708,6 +736,12 @@ static int
68785 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
68786 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
68787 {
68788+
68789+#ifdef CONFIG_PAX_SEGMEXEC
68790+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
68791+ return 0;
68792+#endif
68793+
68794 if (is_mergeable_vma(vma, file, vm_flags) &&
68795 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
68796 pgoff_t vm_pglen;
68797@@ -750,13 +784,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
68798 struct vm_area_struct *vma_merge(struct mm_struct *mm,
68799 struct vm_area_struct *prev, unsigned long addr,
68800 unsigned long end, unsigned long vm_flags,
68801- struct anon_vma *anon_vma, struct file *file,
68802+ struct anon_vma *anon_vma, struct file *file,
68803 pgoff_t pgoff, struct mempolicy *policy)
68804 {
68805 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
68806 struct vm_area_struct *area, *next;
68807 int err;
68808
68809+#ifdef CONFIG_PAX_SEGMEXEC
68810+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
68811+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
68812+
68813+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
68814+#endif
68815+
68816 /*
68817 * We later require that vma->vm_flags == vm_flags,
68818 * so this tests vma->vm_flags & VM_SPECIAL, too.
68819@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
68820 if (next && next->vm_end == end) /* cases 6, 7, 8 */
68821 next = next->vm_next;
68822
68823+#ifdef CONFIG_PAX_SEGMEXEC
68824+ if (prev)
68825+ prev_m = pax_find_mirror_vma(prev);
68826+ if (area)
68827+ area_m = pax_find_mirror_vma(area);
68828+ if (next)
68829+ next_m = pax_find_mirror_vma(next);
68830+#endif
68831+
68832 /*
68833 * Can it merge with the predecessor?
68834 */
68835@@ -791,9 +841,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
68836 /* cases 1, 6 */
68837 err = vma_adjust(prev, prev->vm_start,
68838 next->vm_end, prev->vm_pgoff, NULL);
68839- } else /* cases 2, 5, 7 */
68840+
68841+#ifdef CONFIG_PAX_SEGMEXEC
68842+ if (!err && prev_m)
68843+ err = vma_adjust(prev_m, prev_m->vm_start,
68844+ next_m->vm_end, prev_m->vm_pgoff, NULL);
68845+#endif
68846+
68847+ } else { /* cases 2, 5, 7 */
68848 err = vma_adjust(prev, prev->vm_start,
68849 end, prev->vm_pgoff, NULL);
68850+
68851+#ifdef CONFIG_PAX_SEGMEXEC
68852+ if (!err && prev_m)
68853+ err = vma_adjust(prev_m, prev_m->vm_start,
68854+ end_m, prev_m->vm_pgoff, NULL);
68855+#endif
68856+
68857+ }
68858 if (err)
68859 return NULL;
68860 khugepaged_enter_vma_merge(prev);
68861@@ -807,12 +872,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
68862 mpol_equal(policy, vma_policy(next)) &&
68863 can_vma_merge_before(next, vm_flags,
68864 anon_vma, file, pgoff+pglen)) {
68865- if (prev && addr < prev->vm_end) /* case 4 */
68866+ if (prev && addr < prev->vm_end) { /* case 4 */
68867 err = vma_adjust(prev, prev->vm_start,
68868 addr, prev->vm_pgoff, NULL);
68869- else /* cases 3, 8 */
68870+
68871+#ifdef CONFIG_PAX_SEGMEXEC
68872+ if (!err && prev_m)
68873+ err = vma_adjust(prev_m, prev_m->vm_start,
68874+ addr_m, prev_m->vm_pgoff, NULL);
68875+#endif
68876+
68877+ } else { /* cases 3, 8 */
68878 err = vma_adjust(area, addr, next->vm_end,
68879 next->vm_pgoff - pglen, NULL);
68880+
68881+#ifdef CONFIG_PAX_SEGMEXEC
68882+ if (!err && area_m)
68883+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
68884+ next_m->vm_pgoff - pglen, NULL);
68885+#endif
68886+
68887+ }
68888 if (err)
68889 return NULL;
68890 khugepaged_enter_vma_merge(area);
68891@@ -921,14 +1001,11 @@ none:
68892 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
68893 struct file *file, long pages)
68894 {
68895- const unsigned long stack_flags
68896- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
68897-
68898 if (file) {
68899 mm->shared_vm += pages;
68900 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
68901 mm->exec_vm += pages;
68902- } else if (flags & stack_flags)
68903+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
68904 mm->stack_vm += pages;
68905 if (flags & (VM_RESERVED|VM_IO))
68906 mm->reserved_vm += pages;
68907@@ -955,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68908 * (the exception is when the underlying filesystem is noexec
68909 * mounted, in which case we dont add PROT_EXEC.)
68910 */
68911- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
68912+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
68913 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
68914 prot |= PROT_EXEC;
68915
68916@@ -981,7 +1058,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68917 /* Obtain the address to map to. we verify (or select) it and ensure
68918 * that it represents a valid section of the address space.
68919 */
68920- addr = get_unmapped_area(file, addr, len, pgoff, flags);
68921+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
68922 if (addr & ~PAGE_MASK)
68923 return addr;
68924
68925@@ -992,6 +1069,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68926 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
68927 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
68928
68929+#ifdef CONFIG_PAX_MPROTECT
68930+ if (mm->pax_flags & MF_PAX_MPROTECT) {
68931+#ifndef CONFIG_PAX_MPROTECT_COMPAT
68932+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
68933+ gr_log_rwxmmap(file);
68934+
68935+#ifdef CONFIG_PAX_EMUPLT
68936+ vm_flags &= ~VM_EXEC;
68937+#else
68938+ return -EPERM;
68939+#endif
68940+
68941+ }
68942+
68943+ if (!(vm_flags & VM_EXEC))
68944+ vm_flags &= ~VM_MAYEXEC;
68945+#else
68946+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
68947+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
68948+#endif
68949+ else
68950+ vm_flags &= ~VM_MAYWRITE;
68951+ }
68952+#endif
68953+
68954+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
68955+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
68956+ vm_flags &= ~VM_PAGEEXEC;
68957+#endif
68958+
68959 if (flags & MAP_LOCKED)
68960 if (!can_do_mlock())
68961 return -EPERM;
68962@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68963 locked += mm->locked_vm;
68964 lock_limit = rlimit(RLIMIT_MEMLOCK);
68965 lock_limit >>= PAGE_SHIFT;
68966+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
68967 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
68968 return -EAGAIN;
68969 }
68970@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
68971 if (error)
68972 return error;
68973
68974+ if (!gr_acl_handle_mmap(file, prot))
68975+ return -EACCES;
68976+
68977 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
68978 }
68979 EXPORT_SYMBOL(do_mmap_pgoff);
68980@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
68981 vm_flags_t vm_flags = vma->vm_flags;
68982
68983 /* If it was private or non-writable, the write bit is already clear */
68984- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
68985+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
68986 return 0;
68987
68988 /* The backer wishes to know when pages are first written to? */
68989@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
68990 unsigned long charged = 0;
68991 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
68992
68993+#ifdef CONFIG_PAX_SEGMEXEC
68994+ struct vm_area_struct *vma_m = NULL;
68995+#endif
68996+
68997+ /*
68998+ * mm->mmap_sem is required to protect against another thread
68999+ * changing the mappings in case we sleep.
69000+ */
69001+ verify_mm_writelocked(mm);
69002+
69003 /* Clear old maps */
69004 error = -ENOMEM;
69005-munmap_back:
69006 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
69007 if (vma && vma->vm_start < addr + len) {
69008 if (do_munmap(mm, addr, len))
69009 return -ENOMEM;
69010- goto munmap_back;
69011+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
69012+ BUG_ON(vma && vma->vm_start < addr + len);
69013 }
69014
69015 /* Check against address space limit. */
69016@@ -1258,6 +1379,16 @@ munmap_back:
69017 goto unacct_error;
69018 }
69019
69020+#ifdef CONFIG_PAX_SEGMEXEC
69021+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
69022+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
69023+ if (!vma_m) {
69024+ error = -ENOMEM;
69025+ goto free_vma;
69026+ }
69027+ }
69028+#endif
69029+
69030 vma->vm_mm = mm;
69031 vma->vm_start = addr;
69032 vma->vm_end = addr + len;
69033@@ -1281,6 +1412,19 @@ munmap_back:
69034 error = file->f_op->mmap(file, vma);
69035 if (error)
69036 goto unmap_and_free_vma;
69037+
69038+#ifdef CONFIG_PAX_SEGMEXEC
69039+ if (vma_m && (vm_flags & VM_EXECUTABLE))
69040+ added_exe_file_vma(mm);
69041+#endif
69042+
69043+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
69044+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
69045+ vma->vm_flags |= VM_PAGEEXEC;
69046+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
69047+ }
69048+#endif
69049+
69050 if (vm_flags & VM_EXECUTABLE)
69051 added_exe_file_vma(mm);
69052
69053@@ -1316,6 +1460,11 @@ munmap_back:
69054 vma_link(mm, vma, prev, rb_link, rb_parent);
69055 file = vma->vm_file;
69056
69057+#ifdef CONFIG_PAX_SEGMEXEC
69058+ if (vma_m)
69059+ BUG_ON(pax_mirror_vma(vma_m, vma));
69060+#endif
69061+
69062 /* Once vma denies write, undo our temporary denial count */
69063 if (correct_wcount)
69064 atomic_inc(&inode->i_writecount);
69065@@ -1324,6 +1473,7 @@ out:
69066
69067 mm->total_vm += len >> PAGE_SHIFT;
69068 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
69069+ track_exec_limit(mm, addr, addr + len, vm_flags);
69070 if (vm_flags & VM_LOCKED) {
69071 if (!mlock_vma_pages_range(vma, addr, addr + len))
69072 mm->locked_vm += (len >> PAGE_SHIFT);
69073@@ -1341,6 +1491,12 @@ unmap_and_free_vma:
69074 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
69075 charged = 0;
69076 free_vma:
69077+
69078+#ifdef CONFIG_PAX_SEGMEXEC
69079+ if (vma_m)
69080+ kmem_cache_free(vm_area_cachep, vma_m);
69081+#endif
69082+
69083 kmem_cache_free(vm_area_cachep, vma);
69084 unacct_error:
69085 if (charged)
69086@@ -1348,6 +1504,44 @@ unacct_error:
69087 return error;
69088 }
69089
69090+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
69091+{
69092+ if (!vma) {
69093+#ifdef CONFIG_STACK_GROWSUP
69094+ if (addr > sysctl_heap_stack_gap)
69095+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
69096+ else
69097+ vma = find_vma(current->mm, 0);
69098+ if (vma && (vma->vm_flags & VM_GROWSUP))
69099+ return false;
69100+#endif
69101+ return true;
69102+ }
69103+
69104+ if (addr + len > vma->vm_start)
69105+ return false;
69106+
69107+ if (vma->vm_flags & VM_GROWSDOWN)
69108+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
69109+#ifdef CONFIG_STACK_GROWSUP
69110+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
69111+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
69112+#endif
69113+
69114+ return true;
69115+}
69116+
69117+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
69118+{
69119+ if (vma->vm_start < len)
69120+ return -ENOMEM;
69121+ if (!(vma->vm_flags & VM_GROWSDOWN))
69122+ return vma->vm_start - len;
69123+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
69124+ return vma->vm_start - len - sysctl_heap_stack_gap;
69125+ return -ENOMEM;
69126+}
69127+
69128 /* Get an address range which is currently unmapped.
69129 * For shmat() with addr=0.
69130 *
69131@@ -1374,18 +1568,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
69132 if (flags & MAP_FIXED)
69133 return addr;
69134
69135+#ifdef CONFIG_PAX_RANDMMAP
69136+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
69137+#endif
69138+
69139 if (addr) {
69140 addr = PAGE_ALIGN(addr);
69141- vma = find_vma(mm, addr);
69142- if (TASK_SIZE - len >= addr &&
69143- (!vma || addr + len <= vma->vm_start))
69144- return addr;
69145+ if (TASK_SIZE - len >= addr) {
69146+ vma = find_vma(mm, addr);
69147+ if (check_heap_stack_gap(vma, addr, len))
69148+ return addr;
69149+ }
69150 }
69151 if (len > mm->cached_hole_size) {
69152- start_addr = addr = mm->free_area_cache;
69153+ start_addr = addr = mm->free_area_cache;
69154 } else {
69155- start_addr = addr = TASK_UNMAPPED_BASE;
69156- mm->cached_hole_size = 0;
69157+ start_addr = addr = mm->mmap_base;
69158+ mm->cached_hole_size = 0;
69159 }
69160
69161 full_search:
69162@@ -1396,34 +1595,40 @@ full_search:
69163 * Start a new search - just in case we missed
69164 * some holes.
69165 */
69166- if (start_addr != TASK_UNMAPPED_BASE) {
69167- addr = TASK_UNMAPPED_BASE;
69168- start_addr = addr;
69169+ if (start_addr != mm->mmap_base) {
69170+ start_addr = addr = mm->mmap_base;
69171 mm->cached_hole_size = 0;
69172 goto full_search;
69173 }
69174 return -ENOMEM;
69175 }
69176- if (!vma || addr + len <= vma->vm_start) {
69177- /*
69178- * Remember the place where we stopped the search:
69179- */
69180- mm->free_area_cache = addr + len;
69181- return addr;
69182- }
69183+ if (check_heap_stack_gap(vma, addr, len))
69184+ break;
69185 if (addr + mm->cached_hole_size < vma->vm_start)
69186 mm->cached_hole_size = vma->vm_start - addr;
69187 addr = vma->vm_end;
69188 }
69189+
69190+ /*
69191+ * Remember the place where we stopped the search:
69192+ */
69193+ mm->free_area_cache = addr + len;
69194+ return addr;
69195 }
69196 #endif
69197
69198 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
69199 {
69200+
69201+#ifdef CONFIG_PAX_SEGMEXEC
69202+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
69203+ return;
69204+#endif
69205+
69206 /*
69207 * Is this a new hole at the lowest possible address?
69208 */
69209- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
69210+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
69211 mm->free_area_cache = addr;
69212 mm->cached_hole_size = ~0UL;
69213 }
69214@@ -1441,7 +1646,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69215 {
69216 struct vm_area_struct *vma;
69217 struct mm_struct *mm = current->mm;
69218- unsigned long addr = addr0;
69219+ unsigned long base = mm->mmap_base, addr = addr0;
69220
69221 /* requested length too big for entire address space */
69222 if (len > TASK_SIZE)
69223@@ -1450,13 +1655,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69224 if (flags & MAP_FIXED)
69225 return addr;
69226
69227+#ifdef CONFIG_PAX_RANDMMAP
69228+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
69229+#endif
69230+
69231 /* requesting a specific address */
69232 if (addr) {
69233 addr = PAGE_ALIGN(addr);
69234- vma = find_vma(mm, addr);
69235- if (TASK_SIZE - len >= addr &&
69236- (!vma || addr + len <= vma->vm_start))
69237- return addr;
69238+ if (TASK_SIZE - len >= addr) {
69239+ vma = find_vma(mm, addr);
69240+ if (check_heap_stack_gap(vma, addr, len))
69241+ return addr;
69242+ }
69243 }
69244
69245 /* check if free_area_cache is useful for us */
69246@@ -1471,7 +1681,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69247 /* make sure it can fit in the remaining address space */
69248 if (addr > len) {
69249 vma = find_vma(mm, addr-len);
69250- if (!vma || addr <= vma->vm_start)
69251+ if (check_heap_stack_gap(vma, addr - len, len))
69252 /* remember the address as a hint for next time */
69253 return (mm->free_area_cache = addr-len);
69254 }
69255@@ -1488,7 +1698,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69256 * return with success:
69257 */
69258 vma = find_vma(mm, addr);
69259- if (!vma || addr+len <= vma->vm_start)
69260+ if (check_heap_stack_gap(vma, addr, len))
69261 /* remember the address as a hint for next time */
69262 return (mm->free_area_cache = addr);
69263
69264@@ -1497,8 +1707,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
69265 mm->cached_hole_size = vma->vm_start - addr;
69266
69267 /* try just below the current vma->vm_start */
69268- addr = vma->vm_start-len;
69269- } while (len < vma->vm_start);
69270+ addr = skip_heap_stack_gap(vma, len);
69271+ } while (!IS_ERR_VALUE(addr));
69272
69273 bottomup:
69274 /*
69275@@ -1507,13 +1717,21 @@ bottomup:
69276 * can happen with large stack limits and large mmap()
69277 * allocations.
69278 */
69279+ mm->mmap_base = TASK_UNMAPPED_BASE;
69280+
69281+#ifdef CONFIG_PAX_RANDMMAP
69282+ if (mm->pax_flags & MF_PAX_RANDMMAP)
69283+ mm->mmap_base += mm->delta_mmap;
69284+#endif
69285+
69286+ mm->free_area_cache = mm->mmap_base;
69287 mm->cached_hole_size = ~0UL;
69288- mm->free_area_cache = TASK_UNMAPPED_BASE;
69289 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
69290 /*
69291 * Restore the topdown base:
69292 */
69293- mm->free_area_cache = mm->mmap_base;
69294+ mm->mmap_base = base;
69295+ mm->free_area_cache = base;
69296 mm->cached_hole_size = ~0UL;
69297
69298 return addr;
69299@@ -1522,6 +1740,12 @@ bottomup:
69300
69301 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
69302 {
69303+
69304+#ifdef CONFIG_PAX_SEGMEXEC
69305+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
69306+ return;
69307+#endif
69308+
69309 /*
69310 * Is this a new hole at the highest possible address?
69311 */
69312@@ -1529,8 +1753,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
69313 mm->free_area_cache = addr;
69314
69315 /* dont allow allocations above current base */
69316- if (mm->free_area_cache > mm->mmap_base)
69317+ if (mm->free_area_cache > mm->mmap_base) {
69318 mm->free_area_cache = mm->mmap_base;
69319+ mm->cached_hole_size = ~0UL;
69320+ }
69321 }
69322
69323 unsigned long
69324@@ -1638,6 +1864,28 @@ out:
69325 return prev ? prev->vm_next : vma;
69326 }
69327
69328+#ifdef CONFIG_PAX_SEGMEXEC
69329+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
69330+{
69331+ struct vm_area_struct *vma_m;
69332+
69333+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
69334+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
69335+ BUG_ON(vma->vm_mirror);
69336+ return NULL;
69337+ }
69338+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
69339+ vma_m = vma->vm_mirror;
69340+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
69341+ BUG_ON(vma->vm_file != vma_m->vm_file);
69342+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
69343+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
69344+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
69345+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
69346+ return vma_m;
69347+}
69348+#endif
69349+
69350 /*
69351 * Verify that the stack growth is acceptable and
69352 * update accounting. This is shared with both the
69353@@ -1654,6 +1902,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
69354 return -ENOMEM;
69355
69356 /* Stack limit test */
69357+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
69358 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
69359 return -ENOMEM;
69360
69361@@ -1664,6 +1913,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
69362 locked = mm->locked_vm + grow;
69363 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
69364 limit >>= PAGE_SHIFT;
69365+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
69366 if (locked > limit && !capable(CAP_IPC_LOCK))
69367 return -ENOMEM;
69368 }
69369@@ -1694,37 +1944,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
69370 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
69371 * vma is the last one with address > vma->vm_end. Have to extend vma.
69372 */
69373+#ifndef CONFIG_IA64
69374+static
69375+#endif
69376 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
69377 {
69378 int error;
69379+ bool locknext;
69380
69381 if (!(vma->vm_flags & VM_GROWSUP))
69382 return -EFAULT;
69383
69384+ /* Also guard against wrapping around to address 0. */
69385+ if (address < PAGE_ALIGN(address+1))
69386+ address = PAGE_ALIGN(address+1);
69387+ else
69388+ return -ENOMEM;
69389+
69390 /*
69391 * We must make sure the anon_vma is allocated
69392 * so that the anon_vma locking is not a noop.
69393 */
69394 if (unlikely(anon_vma_prepare(vma)))
69395 return -ENOMEM;
69396+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
69397+ if (locknext && anon_vma_prepare(vma->vm_next))
69398+ return -ENOMEM;
69399 vma_lock_anon_vma(vma);
69400+ if (locknext)
69401+ vma_lock_anon_vma(vma->vm_next);
69402
69403 /*
69404 * vma->vm_start/vm_end cannot change under us because the caller
69405 * is required to hold the mmap_sem in read mode. We need the
69406- * anon_vma lock to serialize against concurrent expand_stacks.
69407- * Also guard against wrapping around to address 0.
69408+ * anon_vma locks to serialize against concurrent expand_stacks
69409+ * and expand_upwards.
69410 */
69411- if (address < PAGE_ALIGN(address+4))
69412- address = PAGE_ALIGN(address+4);
69413- else {
69414- vma_unlock_anon_vma(vma);
69415- return -ENOMEM;
69416- }
69417 error = 0;
69418
69419 /* Somebody else might have raced and expanded it already */
69420- if (address > vma->vm_end) {
69421+ 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)
69422+ error = -ENOMEM;
69423+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
69424 unsigned long size, grow;
69425
69426 size = address - vma->vm_start;
69427@@ -1739,6 +2000,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
69428 }
69429 }
69430 }
69431+ if (locknext)
69432+ vma_unlock_anon_vma(vma->vm_next);
69433 vma_unlock_anon_vma(vma);
69434 khugepaged_enter_vma_merge(vma);
69435 return error;
69436@@ -1752,6 +2015,8 @@ int expand_downwards(struct vm_area_struct *vma,
69437 unsigned long address)
69438 {
69439 int error;
69440+ bool lockprev = false;
69441+ struct vm_area_struct *prev;
69442
69443 /*
69444 * We must make sure the anon_vma is allocated
69445@@ -1765,6 +2030,15 @@ int expand_downwards(struct vm_area_struct *vma,
69446 if (error)
69447 return error;
69448
69449+ prev = vma->vm_prev;
69450+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
69451+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
69452+#endif
69453+ if (lockprev && anon_vma_prepare(prev))
69454+ return -ENOMEM;
69455+ if (lockprev)
69456+ vma_lock_anon_vma(prev);
69457+
69458 vma_lock_anon_vma(vma);
69459
69460 /*
69461@@ -1774,9 +2048,17 @@ int expand_downwards(struct vm_area_struct *vma,
69462 */
69463
69464 /* Somebody else might have raced and expanded it already */
69465- if (address < vma->vm_start) {
69466+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
69467+ error = -ENOMEM;
69468+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
69469 unsigned long size, grow;
69470
69471+#ifdef CONFIG_PAX_SEGMEXEC
69472+ struct vm_area_struct *vma_m;
69473+
69474+ vma_m = pax_find_mirror_vma(vma);
69475+#endif
69476+
69477 size = vma->vm_end - address;
69478 grow = (vma->vm_start - address) >> PAGE_SHIFT;
69479
69480@@ -1786,11 +2068,22 @@ int expand_downwards(struct vm_area_struct *vma,
69481 if (!error) {
69482 vma->vm_start = address;
69483 vma->vm_pgoff -= grow;
69484+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
69485+
69486+#ifdef CONFIG_PAX_SEGMEXEC
69487+ if (vma_m) {
69488+ vma_m->vm_start -= grow << PAGE_SHIFT;
69489+ vma_m->vm_pgoff -= grow;
69490+ }
69491+#endif
69492+
69493 perf_event_mmap(vma);
69494 }
69495 }
69496 }
69497 vma_unlock_anon_vma(vma);
69498+ if (lockprev)
69499+ vma_unlock_anon_vma(prev);
69500 khugepaged_enter_vma_merge(vma);
69501 return error;
69502 }
69503@@ -1860,6 +2153,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
69504 do {
69505 long nrpages = vma_pages(vma);
69506
69507+#ifdef CONFIG_PAX_SEGMEXEC
69508+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
69509+ vma = remove_vma(vma);
69510+ continue;
69511+ }
69512+#endif
69513+
69514 mm->total_vm -= nrpages;
69515 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
69516 vma = remove_vma(vma);
69517@@ -1905,6 +2205,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
69518 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
69519 vma->vm_prev = NULL;
69520 do {
69521+
69522+#ifdef CONFIG_PAX_SEGMEXEC
69523+ if (vma->vm_mirror) {
69524+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
69525+ vma->vm_mirror->vm_mirror = NULL;
69526+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
69527+ vma->vm_mirror = NULL;
69528+ }
69529+#endif
69530+
69531 rb_erase(&vma->vm_rb, &mm->mm_rb);
69532 mm->map_count--;
69533 tail_vma = vma;
69534@@ -1933,14 +2243,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69535 struct vm_area_struct *new;
69536 int err = -ENOMEM;
69537
69538+#ifdef CONFIG_PAX_SEGMEXEC
69539+ struct vm_area_struct *vma_m, *new_m = NULL;
69540+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
69541+#endif
69542+
69543 if (is_vm_hugetlb_page(vma) && (addr &
69544 ~(huge_page_mask(hstate_vma(vma)))))
69545 return -EINVAL;
69546
69547+#ifdef CONFIG_PAX_SEGMEXEC
69548+ vma_m = pax_find_mirror_vma(vma);
69549+#endif
69550+
69551 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
69552 if (!new)
69553 goto out_err;
69554
69555+#ifdef CONFIG_PAX_SEGMEXEC
69556+ if (vma_m) {
69557+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
69558+ if (!new_m) {
69559+ kmem_cache_free(vm_area_cachep, new);
69560+ goto out_err;
69561+ }
69562+ }
69563+#endif
69564+
69565 /* most fields are the same, copy all, and then fixup */
69566 *new = *vma;
69567
69568@@ -1953,6 +2282,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69569 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
69570 }
69571
69572+#ifdef CONFIG_PAX_SEGMEXEC
69573+ if (vma_m) {
69574+ *new_m = *vma_m;
69575+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
69576+ new_m->vm_mirror = new;
69577+ new->vm_mirror = new_m;
69578+
69579+ if (new_below)
69580+ new_m->vm_end = addr_m;
69581+ else {
69582+ new_m->vm_start = addr_m;
69583+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
69584+ }
69585+ }
69586+#endif
69587+
69588 pol = mpol_dup(vma_policy(vma));
69589 if (IS_ERR(pol)) {
69590 err = PTR_ERR(pol);
69591@@ -1978,6 +2323,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69592 else
69593 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
69594
69595+#ifdef CONFIG_PAX_SEGMEXEC
69596+ if (!err && vma_m) {
69597+ if (anon_vma_clone(new_m, vma_m))
69598+ goto out_free_mpol;
69599+
69600+ mpol_get(pol);
69601+ vma_set_policy(new_m, pol);
69602+
69603+ if (new_m->vm_file) {
69604+ get_file(new_m->vm_file);
69605+ if (vma_m->vm_flags & VM_EXECUTABLE)
69606+ added_exe_file_vma(mm);
69607+ }
69608+
69609+ if (new_m->vm_ops && new_m->vm_ops->open)
69610+ new_m->vm_ops->open(new_m);
69611+
69612+ if (new_below)
69613+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
69614+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
69615+ else
69616+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
69617+
69618+ if (err) {
69619+ if (new_m->vm_ops && new_m->vm_ops->close)
69620+ new_m->vm_ops->close(new_m);
69621+ if (new_m->vm_file) {
69622+ if (vma_m->vm_flags & VM_EXECUTABLE)
69623+ removed_exe_file_vma(mm);
69624+ fput(new_m->vm_file);
69625+ }
69626+ mpol_put(pol);
69627+ }
69628+ }
69629+#endif
69630+
69631 /* Success. */
69632 if (!err)
69633 return 0;
69634@@ -1990,10 +2371,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69635 removed_exe_file_vma(mm);
69636 fput(new->vm_file);
69637 }
69638- unlink_anon_vmas(new);
69639 out_free_mpol:
69640 mpol_put(pol);
69641 out_free_vma:
69642+
69643+#ifdef CONFIG_PAX_SEGMEXEC
69644+ if (new_m) {
69645+ unlink_anon_vmas(new_m);
69646+ kmem_cache_free(vm_area_cachep, new_m);
69647+ }
69648+#endif
69649+
69650+ unlink_anon_vmas(new);
69651 kmem_cache_free(vm_area_cachep, new);
69652 out_err:
69653 return err;
69654@@ -2006,6 +2395,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
69655 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
69656 unsigned long addr, int new_below)
69657 {
69658+
69659+#ifdef CONFIG_PAX_SEGMEXEC
69660+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
69661+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
69662+ if (mm->map_count >= sysctl_max_map_count-1)
69663+ return -ENOMEM;
69664+ } else
69665+#endif
69666+
69667 if (mm->map_count >= sysctl_max_map_count)
69668 return -ENOMEM;
69669
69670@@ -2017,11 +2415,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
69671 * work. This now handles partial unmappings.
69672 * Jeremy Fitzhardinge <jeremy@goop.org>
69673 */
69674+#ifdef CONFIG_PAX_SEGMEXEC
69675 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
69676 {
69677+ int ret = __do_munmap(mm, start, len);
69678+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
69679+ return ret;
69680+
69681+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
69682+}
69683+
69684+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
69685+#else
69686+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
69687+#endif
69688+{
69689 unsigned long end;
69690 struct vm_area_struct *vma, *prev, *last;
69691
69692+ /*
69693+ * mm->mmap_sem is required to protect against another thread
69694+ * changing the mappings in case we sleep.
69695+ */
69696+ verify_mm_writelocked(mm);
69697+
69698 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
69699 return -EINVAL;
69700
69701@@ -2096,6 +2513,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
69702 /* Fix up all other VM information */
69703 remove_vma_list(mm, vma);
69704
69705+ track_exec_limit(mm, start, end, 0UL);
69706+
69707 return 0;
69708 }
69709
69710@@ -2108,22 +2527,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
69711
69712 profile_munmap(addr);
69713
69714+#ifdef CONFIG_PAX_SEGMEXEC
69715+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
69716+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
69717+ return -EINVAL;
69718+#endif
69719+
69720 down_write(&mm->mmap_sem);
69721 ret = do_munmap(mm, addr, len);
69722 up_write(&mm->mmap_sem);
69723 return ret;
69724 }
69725
69726-static inline void verify_mm_writelocked(struct mm_struct *mm)
69727-{
69728-#ifdef CONFIG_DEBUG_VM
69729- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
69730- WARN_ON(1);
69731- up_read(&mm->mmap_sem);
69732- }
69733-#endif
69734-}
69735-
69736 /*
69737 * this is really a simplified "do_mmap". it only handles
69738 * anonymous maps. eventually we may be able to do some
69739@@ -2137,6 +2552,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69740 struct rb_node ** rb_link, * rb_parent;
69741 pgoff_t pgoff = addr >> PAGE_SHIFT;
69742 int error;
69743+ unsigned long charged;
69744
69745 len = PAGE_ALIGN(len);
69746 if (!len)
69747@@ -2148,16 +2564,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69748
69749 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
69750
69751+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
69752+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
69753+ flags &= ~VM_EXEC;
69754+
69755+#ifdef CONFIG_PAX_MPROTECT
69756+ if (mm->pax_flags & MF_PAX_MPROTECT)
69757+ flags &= ~VM_MAYEXEC;
69758+#endif
69759+
69760+ }
69761+#endif
69762+
69763 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
69764 if (error & ~PAGE_MASK)
69765 return error;
69766
69767+ charged = len >> PAGE_SHIFT;
69768+
69769 /*
69770 * mlock MCL_FUTURE?
69771 */
69772 if (mm->def_flags & VM_LOCKED) {
69773 unsigned long locked, lock_limit;
69774- locked = len >> PAGE_SHIFT;
69775+ locked = charged;
69776 locked += mm->locked_vm;
69777 lock_limit = rlimit(RLIMIT_MEMLOCK);
69778 lock_limit >>= PAGE_SHIFT;
69779@@ -2174,22 +2604,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69780 /*
69781 * Clear old maps. this also does some error checking for us
69782 */
69783- munmap_back:
69784 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
69785 if (vma && vma->vm_start < addr + len) {
69786 if (do_munmap(mm, addr, len))
69787 return -ENOMEM;
69788- goto munmap_back;
69789+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
69790+ BUG_ON(vma && vma->vm_start < addr + len);
69791 }
69792
69793 /* Check against address space limits *after* clearing old maps... */
69794- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
69795+ if (!may_expand_vm(mm, charged))
69796 return -ENOMEM;
69797
69798 if (mm->map_count > sysctl_max_map_count)
69799 return -ENOMEM;
69800
69801- if (security_vm_enough_memory(len >> PAGE_SHIFT))
69802+ if (security_vm_enough_memory(charged))
69803 return -ENOMEM;
69804
69805 /* Can we just expand an old private anonymous mapping? */
69806@@ -2203,7 +2633,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69807 */
69808 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
69809 if (!vma) {
69810- vm_unacct_memory(len >> PAGE_SHIFT);
69811+ vm_unacct_memory(charged);
69812 return -ENOMEM;
69813 }
69814
69815@@ -2217,11 +2647,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
69816 vma_link(mm, vma, prev, rb_link, rb_parent);
69817 out:
69818 perf_event_mmap(vma);
69819- mm->total_vm += len >> PAGE_SHIFT;
69820+ mm->total_vm += charged;
69821 if (flags & VM_LOCKED) {
69822 if (!mlock_vma_pages_range(vma, addr, addr + len))
69823- mm->locked_vm += (len >> PAGE_SHIFT);
69824+ mm->locked_vm += charged;
69825 }
69826+ track_exec_limit(mm, addr, addr + len, flags);
69827 return addr;
69828 }
69829
69830@@ -2268,8 +2699,10 @@ void exit_mmap(struct mm_struct *mm)
69831 * Walk the list again, actually closing and freeing it,
69832 * with preemption enabled, without holding any MM locks.
69833 */
69834- while (vma)
69835+ while (vma) {
69836+ vma->vm_mirror = NULL;
69837 vma = remove_vma(vma);
69838+ }
69839
69840 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
69841 }
69842@@ -2283,6 +2716,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
69843 struct vm_area_struct * __vma, * prev;
69844 struct rb_node ** rb_link, * rb_parent;
69845
69846+#ifdef CONFIG_PAX_SEGMEXEC
69847+ struct vm_area_struct *vma_m = NULL;
69848+#endif
69849+
69850+ if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
69851+ return -EPERM;
69852+
69853 /*
69854 * The vm_pgoff of a purely anonymous vma should be irrelevant
69855 * until its first write fault, when page's anon_vma and index
69856@@ -2305,7 +2745,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
69857 if ((vma->vm_flags & VM_ACCOUNT) &&
69858 security_vm_enough_memory_mm(mm, vma_pages(vma)))
69859 return -ENOMEM;
69860+
69861+#ifdef CONFIG_PAX_SEGMEXEC
69862+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
69863+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
69864+ if (!vma_m)
69865+ return -ENOMEM;
69866+ }
69867+#endif
69868+
69869 vma_link(mm, vma, prev, rb_link, rb_parent);
69870+
69871+#ifdef CONFIG_PAX_SEGMEXEC
69872+ if (vma_m)
69873+ BUG_ON(pax_mirror_vma(vma_m, vma));
69874+#endif
69875+
69876 return 0;
69877 }
69878
69879@@ -2323,6 +2778,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
69880 struct rb_node **rb_link, *rb_parent;
69881 struct mempolicy *pol;
69882
69883+ BUG_ON(vma->vm_mirror);
69884+
69885 /*
69886 * If anonymous vma has not yet been faulted, update new pgoff
69887 * to match new location, to increase its chance of merging.
69888@@ -2373,6 +2830,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
69889 return NULL;
69890 }
69891
69892+#ifdef CONFIG_PAX_SEGMEXEC
69893+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
69894+{
69895+ struct vm_area_struct *prev_m;
69896+ struct rb_node **rb_link_m, *rb_parent_m;
69897+ struct mempolicy *pol_m;
69898+
69899+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
69900+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
69901+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
69902+ *vma_m = *vma;
69903+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
69904+ if (anon_vma_clone(vma_m, vma))
69905+ return -ENOMEM;
69906+ pol_m = vma_policy(vma_m);
69907+ mpol_get(pol_m);
69908+ vma_set_policy(vma_m, pol_m);
69909+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
69910+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
69911+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
69912+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
69913+ if (vma_m->vm_file)
69914+ get_file(vma_m->vm_file);
69915+ if (vma_m->vm_ops && vma_m->vm_ops->open)
69916+ vma_m->vm_ops->open(vma_m);
69917+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
69918+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
69919+ vma_m->vm_mirror = vma;
69920+ vma->vm_mirror = vma_m;
69921+ return 0;
69922+}
69923+#endif
69924+
69925 /*
69926 * Return true if the calling process may expand its vm space by the passed
69927 * number of pages
69928@@ -2383,7 +2873,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
69929 unsigned long lim;
69930
69931 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
69932-
69933+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
69934 if (cur + npages > lim)
69935 return 0;
69936 return 1;
69937@@ -2454,6 +2944,22 @@ int install_special_mapping(struct mm_struct *mm,
69938 vma->vm_start = addr;
69939 vma->vm_end = addr + len;
69940
69941+#ifdef CONFIG_PAX_MPROTECT
69942+ if (mm->pax_flags & MF_PAX_MPROTECT) {
69943+#ifndef CONFIG_PAX_MPROTECT_COMPAT
69944+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
69945+ return -EPERM;
69946+ if (!(vm_flags & VM_EXEC))
69947+ vm_flags &= ~VM_MAYEXEC;
69948+#else
69949+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
69950+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
69951+#endif
69952+ else
69953+ vm_flags &= ~VM_MAYWRITE;
69954+ }
69955+#endif
69956+
69957 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
69958 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
69959
69960diff --git a/mm/mprotect.c b/mm/mprotect.c
69961index 5a688a2..27e031c 100644
69962--- a/mm/mprotect.c
69963+++ b/mm/mprotect.c
69964@@ -23,10 +23,16 @@
69965 #include <linux/mmu_notifier.h>
69966 #include <linux/migrate.h>
69967 #include <linux/perf_event.h>
69968+
69969+#ifdef CONFIG_PAX_MPROTECT
69970+#include <linux/elf.h>
69971+#endif
69972+
69973 #include <asm/uaccess.h>
69974 #include <asm/pgtable.h>
69975 #include <asm/cacheflush.h>
69976 #include <asm/tlbflush.h>
69977+#include <asm/mmu_context.h>
69978
69979 #ifndef pgprot_modify
69980 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
69981@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
69982 flush_tlb_range(vma, start, end);
69983 }
69984
69985+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
69986+/* called while holding the mmap semaphor for writing except stack expansion */
69987+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
69988+{
69989+ unsigned long oldlimit, newlimit = 0UL;
69990+
69991+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
69992+ return;
69993+
69994+ spin_lock(&mm->page_table_lock);
69995+ oldlimit = mm->context.user_cs_limit;
69996+ if ((prot & VM_EXEC) && oldlimit < end)
69997+ /* USER_CS limit moved up */
69998+ newlimit = end;
69999+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
70000+ /* USER_CS limit moved down */
70001+ newlimit = start;
70002+
70003+ if (newlimit) {
70004+ mm->context.user_cs_limit = newlimit;
70005+
70006+#ifdef CONFIG_SMP
70007+ wmb();
70008+ cpus_clear(mm->context.cpu_user_cs_mask);
70009+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
70010+#endif
70011+
70012+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
70013+ }
70014+ spin_unlock(&mm->page_table_lock);
70015+ if (newlimit == end) {
70016+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
70017+
70018+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
70019+ if (is_vm_hugetlb_page(vma))
70020+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
70021+ else
70022+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
70023+ }
70024+}
70025+#endif
70026+
70027 int
70028 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
70029 unsigned long start, unsigned long end, unsigned long newflags)
70030@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
70031 int error;
70032 int dirty_accountable = 0;
70033
70034+#ifdef CONFIG_PAX_SEGMEXEC
70035+ struct vm_area_struct *vma_m = NULL;
70036+ unsigned long start_m, end_m;
70037+
70038+ start_m = start + SEGMEXEC_TASK_SIZE;
70039+ end_m = end + SEGMEXEC_TASK_SIZE;
70040+#endif
70041+
70042 if (newflags == oldflags) {
70043 *pprev = vma;
70044 return 0;
70045 }
70046
70047+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
70048+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
70049+
70050+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
70051+ return -ENOMEM;
70052+
70053+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
70054+ return -ENOMEM;
70055+ }
70056+
70057 /*
70058 * If we make a private mapping writable we increase our commit;
70059 * but (without finer accounting) cannot reduce our commit if we
70060@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
70061 }
70062 }
70063
70064+#ifdef CONFIG_PAX_SEGMEXEC
70065+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
70066+ if (start != vma->vm_start) {
70067+ error = split_vma(mm, vma, start, 1);
70068+ if (error)
70069+ goto fail;
70070+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
70071+ *pprev = (*pprev)->vm_next;
70072+ }
70073+
70074+ if (end != vma->vm_end) {
70075+ error = split_vma(mm, vma, end, 0);
70076+ if (error)
70077+ goto fail;
70078+ }
70079+
70080+ if (pax_find_mirror_vma(vma)) {
70081+ error = __do_munmap(mm, start_m, end_m - start_m);
70082+ if (error)
70083+ goto fail;
70084+ } else {
70085+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
70086+ if (!vma_m) {
70087+ error = -ENOMEM;
70088+ goto fail;
70089+ }
70090+ vma->vm_flags = newflags;
70091+ error = pax_mirror_vma(vma_m, vma);
70092+ if (error) {
70093+ vma->vm_flags = oldflags;
70094+ goto fail;
70095+ }
70096+ }
70097+ }
70098+#endif
70099+
70100 /*
70101 * First try to merge with previous and/or next vma.
70102 */
70103@@ -204,9 +306,21 @@ success:
70104 * vm_flags and vm_page_prot are protected by the mmap_sem
70105 * held in write mode.
70106 */
70107+
70108+#ifdef CONFIG_PAX_SEGMEXEC
70109+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
70110+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
70111+#endif
70112+
70113 vma->vm_flags = newflags;
70114+
70115+#ifdef CONFIG_PAX_MPROTECT
70116+ if (mm->binfmt && mm->binfmt->handle_mprotect)
70117+ mm->binfmt->handle_mprotect(vma, newflags);
70118+#endif
70119+
70120 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
70121- vm_get_page_prot(newflags));
70122+ vm_get_page_prot(vma->vm_flags));
70123
70124 if (vma_wants_writenotify(vma)) {
70125 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
70126@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70127 end = start + len;
70128 if (end <= start)
70129 return -ENOMEM;
70130+
70131+#ifdef CONFIG_PAX_SEGMEXEC
70132+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
70133+ if (end > SEGMEXEC_TASK_SIZE)
70134+ return -EINVAL;
70135+ } else
70136+#endif
70137+
70138+ if (end > TASK_SIZE)
70139+ return -EINVAL;
70140+
70141 if (!arch_validate_prot(prot))
70142 return -EINVAL;
70143
70144@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70145 /*
70146 * Does the application expect PROT_READ to imply PROT_EXEC:
70147 */
70148- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
70149+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
70150 prot |= PROT_EXEC;
70151
70152 vm_flags = calc_vm_prot_bits(prot);
70153@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70154 if (start > vma->vm_start)
70155 prev = vma;
70156
70157+#ifdef CONFIG_PAX_MPROTECT
70158+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
70159+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
70160+#endif
70161+
70162 for (nstart = start ; ; ) {
70163 unsigned long newflags;
70164
70165@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70166
70167 /* newflags >> 4 shift VM_MAY% in place of VM_% */
70168 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
70169+ if (prot & (PROT_WRITE | PROT_EXEC))
70170+ gr_log_rwxmprotect(vma->vm_file);
70171+
70172+ error = -EACCES;
70173+ goto out;
70174+ }
70175+
70176+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
70177 error = -EACCES;
70178 goto out;
70179 }
70180@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
70181 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
70182 if (error)
70183 goto out;
70184+
70185+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
70186+
70187 nstart = tmp;
70188
70189 if (nstart < prev->vm_end)
70190diff --git a/mm/mremap.c b/mm/mremap.c
70191index d6959cb..18a402a 100644
70192--- a/mm/mremap.c
70193+++ b/mm/mremap.c
70194@@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
70195 continue;
70196 pte = ptep_get_and_clear(mm, old_addr, old_pte);
70197 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
70198+
70199+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
70200+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
70201+ pte = pte_exprotect(pte);
70202+#endif
70203+
70204 set_pte_at(mm, new_addr, new_pte, pte);
70205 }
70206
70207@@ -290,6 +296,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
70208 if (is_vm_hugetlb_page(vma))
70209 goto Einval;
70210
70211+#ifdef CONFIG_PAX_SEGMEXEC
70212+ if (pax_find_mirror_vma(vma))
70213+ goto Einval;
70214+#endif
70215+
70216 /* We can't remap across vm area boundaries */
70217 if (old_len > vma->vm_end - addr)
70218 goto Efault;
70219@@ -346,20 +357,25 @@ static unsigned long mremap_to(unsigned long addr,
70220 unsigned long ret = -EINVAL;
70221 unsigned long charged = 0;
70222 unsigned long map_flags;
70223+ unsigned long pax_task_size = TASK_SIZE;
70224
70225 if (new_addr & ~PAGE_MASK)
70226 goto out;
70227
70228- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
70229+#ifdef CONFIG_PAX_SEGMEXEC
70230+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
70231+ pax_task_size = SEGMEXEC_TASK_SIZE;
70232+#endif
70233+
70234+ pax_task_size -= PAGE_SIZE;
70235+
70236+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
70237 goto out;
70238
70239 /* Check if the location we're moving into overlaps the
70240 * old location at all, and fail if it does.
70241 */
70242- if ((new_addr <= addr) && (new_addr+new_len) > addr)
70243- goto out;
70244-
70245- if ((addr <= new_addr) && (addr+old_len) > new_addr)
70246+ if (addr + old_len > new_addr && new_addr + new_len > addr)
70247 goto out;
70248
70249 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
70250@@ -431,6 +447,7 @@ unsigned long do_mremap(unsigned long addr,
70251 struct vm_area_struct *vma;
70252 unsigned long ret = -EINVAL;
70253 unsigned long charged = 0;
70254+ unsigned long pax_task_size = TASK_SIZE;
70255
70256 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
70257 goto out;
70258@@ -449,6 +466,17 @@ unsigned long do_mremap(unsigned long addr,
70259 if (!new_len)
70260 goto out;
70261
70262+#ifdef CONFIG_PAX_SEGMEXEC
70263+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
70264+ pax_task_size = SEGMEXEC_TASK_SIZE;
70265+#endif
70266+
70267+ pax_task_size -= PAGE_SIZE;
70268+
70269+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
70270+ old_len > pax_task_size || addr > pax_task_size-old_len)
70271+ goto out;
70272+
70273 if (flags & MREMAP_FIXED) {
70274 if (flags & MREMAP_MAYMOVE)
70275 ret = mremap_to(addr, old_len, new_addr, new_len);
70276@@ -498,6 +526,7 @@ unsigned long do_mremap(unsigned long addr,
70277 addr + new_len);
70278 }
70279 ret = addr;
70280+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
70281 goto out;
70282 }
70283 }
70284@@ -524,7 +553,13 @@ unsigned long do_mremap(unsigned long addr,
70285 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
70286 if (ret)
70287 goto out;
70288+
70289+ map_flags = vma->vm_flags;
70290 ret = move_vma(vma, addr, old_len, new_len, new_addr);
70291+ if (!(ret & ~PAGE_MASK)) {
70292+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
70293+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
70294+ }
70295 }
70296 out:
70297 if (ret & ~PAGE_MASK)
70298diff --git a/mm/nobootmem.c b/mm/nobootmem.c
70299index 7fa41b4..6087460 100644
70300--- a/mm/nobootmem.c
70301+++ b/mm/nobootmem.c
70302@@ -110,19 +110,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
70303 unsigned long __init free_all_memory_core_early(int nodeid)
70304 {
70305 int i;
70306- u64 start, end;
70307+ u64 start, end, startrange, endrange;
70308 unsigned long count = 0;
70309- struct range *range = NULL;
70310+ struct range *range = NULL, rangerange = { 0, 0 };
70311 int nr_range;
70312
70313 nr_range = get_free_all_memory_range(&range, nodeid);
70314+ startrange = __pa(range) >> PAGE_SHIFT;
70315+ endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
70316
70317 for (i = 0; i < nr_range; i++) {
70318 start = range[i].start;
70319 end = range[i].end;
70320+ if (start <= endrange && startrange < end) {
70321+ BUG_ON(rangerange.start | rangerange.end);
70322+ rangerange = range[i];
70323+ continue;
70324+ }
70325 count += end - start;
70326 __free_pages_memory(start, end);
70327 }
70328+ start = rangerange.start;
70329+ end = rangerange.end;
70330+ count += end - start;
70331+ __free_pages_memory(start, end);
70332
70333 return count;
70334 }
70335diff --git a/mm/nommu.c b/mm/nommu.c
70336index b982290..7d73f53 100644
70337--- a/mm/nommu.c
70338+++ b/mm/nommu.c
70339@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
70340 int sysctl_overcommit_ratio = 50; /* default is 50% */
70341 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
70342 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
70343-int heap_stack_gap = 0;
70344
70345 atomic_long_t mmap_pages_allocated;
70346
70347@@ -825,15 +824,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
70348 EXPORT_SYMBOL(find_vma);
70349
70350 /*
70351- * find a VMA
70352- * - we don't extend stack VMAs under NOMMU conditions
70353- */
70354-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
70355-{
70356- return find_vma(mm, addr);
70357-}
70358-
70359-/*
70360 * expand a stack to a given address
70361 * - not supported under NOMMU conditions
70362 */
70363@@ -1553,6 +1543,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
70364
70365 /* most fields are the same, copy all, and then fixup */
70366 *new = *vma;
70367+ INIT_LIST_HEAD(&new->anon_vma_chain);
70368 *region = *vma->vm_region;
70369 new->vm_region = region;
70370
70371diff --git a/mm/page_alloc.c b/mm/page_alloc.c
70372index 485be89..c059ad3 100644
70373--- a/mm/page_alloc.c
70374+++ b/mm/page_alloc.c
70375@@ -341,7 +341,7 @@ out:
70376 * This usage means that zero-order pages may not be compound.
70377 */
70378
70379-static void free_compound_page(struct page *page)
70380+void free_compound_page(struct page *page)
70381 {
70382 __free_pages_ok(page, compound_order(page));
70383 }
70384@@ -654,6 +654,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
70385 int i;
70386 int bad = 0;
70387
70388+#ifdef CONFIG_PAX_MEMORY_SANITIZE
70389+ unsigned long index = 1UL << order;
70390+#endif
70391+
70392 trace_mm_page_free_direct(page, order);
70393 kmemcheck_free_shadow(page, order);
70394
70395@@ -669,6 +673,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
70396 debug_check_no_obj_freed(page_address(page),
70397 PAGE_SIZE << order);
70398 }
70399+
70400+#ifdef CONFIG_PAX_MEMORY_SANITIZE
70401+ for (; index; --index)
70402+ sanitize_highpage(page + index - 1);
70403+#endif
70404+
70405 arch_free_page(page, order);
70406 kernel_map_pages(page, 1 << order, 0);
70407
70408@@ -784,8 +794,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
70409 arch_alloc_page(page, order);
70410 kernel_map_pages(page, 1 << order, 1);
70411
70412+#ifndef CONFIG_PAX_MEMORY_SANITIZE
70413 if (gfp_flags & __GFP_ZERO)
70414 prep_zero_page(page, order, gfp_flags);
70415+#endif
70416
70417 if (order && (gfp_flags & __GFP_COMP))
70418 prep_compound_page(page, order);
70419@@ -3357,7 +3369,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
70420 unsigned long pfn;
70421
70422 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
70423+#ifdef CONFIG_X86_32
70424+ /* boot failures in VMware 8 on 32bit vanilla since
70425+ this change */
70426+ if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
70427+#else
70428 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
70429+#endif
70430 return 1;
70431 }
70432 return 0;
70433diff --git a/mm/percpu.c b/mm/percpu.c
70434index 716eb4a..8d10419 100644
70435--- a/mm/percpu.c
70436+++ b/mm/percpu.c
70437@@ -121,7 +121,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
70438 static unsigned int pcpu_high_unit_cpu __read_mostly;
70439
70440 /* the address of the first chunk which starts with the kernel static area */
70441-void *pcpu_base_addr __read_mostly;
70442+void *pcpu_base_addr __read_only;
70443 EXPORT_SYMBOL_GPL(pcpu_base_addr);
70444
70445 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
70446diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
70447index e920aa3..137702a 100644
70448--- a/mm/process_vm_access.c
70449+++ b/mm/process_vm_access.c
70450@@ -13,6 +13,7 @@
70451 #include <linux/uio.h>
70452 #include <linux/sched.h>
70453 #include <linux/highmem.h>
70454+#include <linux/security.h>
70455 #include <linux/ptrace.h>
70456 #include <linux/slab.h>
70457 #include <linux/syscalls.h>
70458@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
70459 size_t iov_l_curr_offset = 0;
70460 ssize_t iov_len;
70461
70462+ return -ENOSYS; // PaX: until properly audited
70463+
70464 /*
70465 * Work out how many pages of struct pages we're going to need
70466 * when eventually calling get_user_pages
70467 */
70468 for (i = 0; i < riovcnt; i++) {
70469 iov_len = rvec[i].iov_len;
70470- if (iov_len > 0) {
70471- nr_pages_iov = ((unsigned long)rvec[i].iov_base
70472- + iov_len)
70473- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
70474- / PAGE_SIZE + 1;
70475- nr_pages = max(nr_pages, nr_pages_iov);
70476- }
70477+ if (iov_len <= 0)
70478+ continue;
70479+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
70480+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
70481+ nr_pages = max(nr_pages, nr_pages_iov);
70482 }
70483
70484 if (nr_pages == 0)
70485@@ -298,23 +299,23 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
70486 goto free_proc_pages;
70487 }
70488
70489- task_lock(task);
70490- if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
70491- task_unlock(task);
70492+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
70493 rc = -EPERM;
70494 goto put_task_struct;
70495 }
70496- mm = task->mm;
70497
70498- if (!mm || (task->flags & PF_KTHREAD)) {
70499- task_unlock(task);
70500- rc = -EINVAL;
70501+ mm = mm_access(task, PTRACE_MODE_ATTACH);
70502+ if (!mm || IS_ERR(mm)) {
70503+ rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
70504+ /*
70505+ * Explicitly map EACCES to EPERM as EPERM is a more a
70506+ * appropriate error code for process_vw_readv/writev
70507+ */
70508+ if (rc == -EACCES)
70509+ rc = -EPERM;
70510 goto put_task_struct;
70511 }
70512
70513- atomic_inc(&mm->mm_users);
70514- task_unlock(task);
70515-
70516 for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
70517 rc = process_vm_rw_single_vec(
70518 (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
70519diff --git a/mm/rmap.c b/mm/rmap.c
70520index a4fd368..e0ffec7 100644
70521--- a/mm/rmap.c
70522+++ b/mm/rmap.c
70523@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
70524 struct anon_vma *anon_vma = vma->anon_vma;
70525 struct anon_vma_chain *avc;
70526
70527+#ifdef CONFIG_PAX_SEGMEXEC
70528+ struct anon_vma_chain *avc_m = NULL;
70529+#endif
70530+
70531 might_sleep();
70532 if (unlikely(!anon_vma)) {
70533 struct mm_struct *mm = vma->vm_mm;
70534@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
70535 if (!avc)
70536 goto out_enomem;
70537
70538+#ifdef CONFIG_PAX_SEGMEXEC
70539+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
70540+ if (!avc_m)
70541+ goto out_enomem_free_avc;
70542+#endif
70543+
70544 anon_vma = find_mergeable_anon_vma(vma);
70545 allocated = NULL;
70546 if (!anon_vma) {
70547@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
70548 /* page_table_lock to protect against threads */
70549 spin_lock(&mm->page_table_lock);
70550 if (likely(!vma->anon_vma)) {
70551+
70552+#ifdef CONFIG_PAX_SEGMEXEC
70553+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
70554+
70555+ if (vma_m) {
70556+ BUG_ON(vma_m->anon_vma);
70557+ vma_m->anon_vma = anon_vma;
70558+ avc_m->anon_vma = anon_vma;
70559+ avc_m->vma = vma;
70560+ list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
70561+ list_add(&avc_m->same_anon_vma, &anon_vma->head);
70562+ avc_m = NULL;
70563+ }
70564+#endif
70565+
70566 vma->anon_vma = anon_vma;
70567 avc->anon_vma = anon_vma;
70568 avc->vma = vma;
70569@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
70570
70571 if (unlikely(allocated))
70572 put_anon_vma(allocated);
70573+
70574+#ifdef CONFIG_PAX_SEGMEXEC
70575+ if (unlikely(avc_m))
70576+ anon_vma_chain_free(avc_m);
70577+#endif
70578+
70579 if (unlikely(avc))
70580 anon_vma_chain_free(avc);
70581 }
70582 return 0;
70583
70584 out_enomem_free_avc:
70585+
70586+#ifdef CONFIG_PAX_SEGMEXEC
70587+ if (avc_m)
70588+ anon_vma_chain_free(avc_m);
70589+#endif
70590+
70591 anon_vma_chain_free(avc);
70592 out_enomem:
70593 return -ENOMEM;
70594@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
70595 * Attach the anon_vmas from src to dst.
70596 * Returns 0 on success, -ENOMEM on failure.
70597 */
70598-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
70599+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
70600 {
70601 struct anon_vma_chain *avc, *pavc;
70602 struct anon_vma *root = NULL;
70603@@ -276,7 +313,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
70604 * the corresponding VMA in the parent process is attached to.
70605 * Returns 0 on success, non-zero on failure.
70606 */
70607-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
70608+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
70609 {
70610 struct anon_vma_chain *avc;
70611 struct anon_vma *anon_vma;
70612diff --git a/mm/shmem.c b/mm/shmem.c
70613index 6c253f7..367e20a 100644
70614--- a/mm/shmem.c
70615+++ b/mm/shmem.c
70616@@ -31,7 +31,7 @@
70617 #include <linux/export.h>
70618 #include <linux/swap.h>
70619
70620-static struct vfsmount *shm_mnt;
70621+struct vfsmount *shm_mnt;
70622
70623 #ifdef CONFIG_SHMEM
70624 /*
70625@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
70626 #define BOGO_DIRENT_SIZE 20
70627
70628 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
70629-#define SHORT_SYMLINK_LEN 128
70630+#define SHORT_SYMLINK_LEN 64
70631
70632 struct shmem_xattr {
70633 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
70634@@ -2180,8 +2180,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
70635 int err = -ENOMEM;
70636
70637 /* Round up to L1_CACHE_BYTES to resist false sharing */
70638- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
70639- L1_CACHE_BYTES), GFP_KERNEL);
70640+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
70641 if (!sbinfo)
70642 return -ENOMEM;
70643
70644diff --git a/mm/slab.c b/mm/slab.c
70645index 83311c9a..fcf8f86 100644
70646--- a/mm/slab.c
70647+++ b/mm/slab.c
70648@@ -151,7 +151,7 @@
70649
70650 /* Legal flag mask for kmem_cache_create(). */
70651 #if DEBUG
70652-# define CREATE_MASK (SLAB_RED_ZONE | \
70653+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
70654 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
70655 SLAB_CACHE_DMA | \
70656 SLAB_STORE_USER | \
70657@@ -159,7 +159,7 @@
70658 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
70659 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
70660 #else
70661-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
70662+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
70663 SLAB_CACHE_DMA | \
70664 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
70665 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
70666@@ -288,7 +288,7 @@ struct kmem_list3 {
70667 * Need this for bootstrapping a per node allocator.
70668 */
70669 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
70670-static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
70671+static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
70672 #define CACHE_CACHE 0
70673 #define SIZE_AC MAX_NUMNODES
70674 #define SIZE_L3 (2 * MAX_NUMNODES)
70675@@ -389,10 +389,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
70676 if ((x)->max_freeable < i) \
70677 (x)->max_freeable = i; \
70678 } while (0)
70679-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
70680-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
70681-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
70682-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
70683+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
70684+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
70685+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
70686+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
70687 #else
70688 #define STATS_INC_ACTIVE(x) do { } while (0)
70689 #define STATS_DEC_ACTIVE(x) do { } while (0)
70690@@ -538,7 +538,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
70691 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
70692 */
70693 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
70694- const struct slab *slab, void *obj)
70695+ const struct slab *slab, const void *obj)
70696 {
70697 u32 offset = (obj - slab->s_mem);
70698 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
70699@@ -564,7 +564,7 @@ struct cache_names {
70700 static struct cache_names __initdata cache_names[] = {
70701 #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
70702 #include <linux/kmalloc_sizes.h>
70703- {NULL,}
70704+ {NULL}
70705 #undef CACHE
70706 };
70707
70708@@ -1572,7 +1572,7 @@ void __init kmem_cache_init(void)
70709 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
70710 sizes[INDEX_AC].cs_size,
70711 ARCH_KMALLOC_MINALIGN,
70712- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
70713+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
70714 NULL);
70715
70716 if (INDEX_AC != INDEX_L3) {
70717@@ -1580,7 +1580,7 @@ void __init kmem_cache_init(void)
70718 kmem_cache_create(names[INDEX_L3].name,
70719 sizes[INDEX_L3].cs_size,
70720 ARCH_KMALLOC_MINALIGN,
70721- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
70722+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
70723 NULL);
70724 }
70725
70726@@ -1598,7 +1598,7 @@ void __init kmem_cache_init(void)
70727 sizes->cs_cachep = kmem_cache_create(names->name,
70728 sizes->cs_size,
70729 ARCH_KMALLOC_MINALIGN,
70730- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
70731+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
70732 NULL);
70733 }
70734 #ifdef CONFIG_ZONE_DMA
70735@@ -4322,10 +4322,10 @@ static int s_show(struct seq_file *m, void *p)
70736 }
70737 /* cpu stats */
70738 {
70739- unsigned long allochit = atomic_read(&cachep->allochit);
70740- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
70741- unsigned long freehit = atomic_read(&cachep->freehit);
70742- unsigned long freemiss = atomic_read(&cachep->freemiss);
70743+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
70744+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
70745+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
70746+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
70747
70748 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
70749 allochit, allocmiss, freehit, freemiss);
70750@@ -4584,13 +4584,62 @@ static int __init slab_proc_init(void)
70751 {
70752 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
70753 #ifdef CONFIG_DEBUG_SLAB_LEAK
70754- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
70755+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
70756 #endif
70757 return 0;
70758 }
70759 module_init(slab_proc_init);
70760 #endif
70761
70762+void check_object_size(const void *ptr, unsigned long n, bool to)
70763+{
70764+
70765+#ifdef CONFIG_PAX_USERCOPY
70766+ struct page *page;
70767+ struct kmem_cache *cachep = NULL;
70768+ struct slab *slabp;
70769+ unsigned int objnr;
70770+ unsigned long offset;
70771+ const char *type;
70772+
70773+ if (!n)
70774+ return;
70775+
70776+ type = "<null>";
70777+ if (ZERO_OR_NULL_PTR(ptr))
70778+ goto report;
70779+
70780+ if (!virt_addr_valid(ptr))
70781+ return;
70782+
70783+ page = virt_to_head_page(ptr);
70784+
70785+ type = "<process stack>";
70786+ if (!PageSlab(page)) {
70787+ if (object_is_on_stack(ptr, n) == -1)
70788+ goto report;
70789+ return;
70790+ }
70791+
70792+ cachep = page_get_cache(page);
70793+ type = cachep->name;
70794+ if (!(cachep->flags & SLAB_USERCOPY))
70795+ goto report;
70796+
70797+ slabp = page_get_slab(page);
70798+ objnr = obj_to_index(cachep, slabp, ptr);
70799+ BUG_ON(objnr >= cachep->num);
70800+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
70801+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
70802+ return;
70803+
70804+report:
70805+ pax_report_usercopy(ptr, n, to, type);
70806+#endif
70807+
70808+}
70809+EXPORT_SYMBOL(check_object_size);
70810+
70811 /**
70812 * ksize - get the actual amount of memory allocated for a given object
70813 * @objp: Pointer to the object
70814diff --git a/mm/slob.c b/mm/slob.c
70815index 8105be4..e045f96 100644
70816--- a/mm/slob.c
70817+++ b/mm/slob.c
70818@@ -29,7 +29,7 @@
70819 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
70820 * alloc_pages() directly, allocating compound pages so the page order
70821 * does not have to be separately tracked, and also stores the exact
70822- * allocation size in page->private so that it can be used to accurately
70823+ * allocation size in slob_page->size so that it can be used to accurately
70824 * provide ksize(). These objects are detected in kfree() because slob_page()
70825 * is false for them.
70826 *
70827@@ -58,6 +58,7 @@
70828 */
70829
70830 #include <linux/kernel.h>
70831+#include <linux/sched.h>
70832 #include <linux/slab.h>
70833 #include <linux/mm.h>
70834 #include <linux/swap.h> /* struct reclaim_state */
70835@@ -102,7 +103,8 @@ struct slob_page {
70836 unsigned long flags; /* mandatory */
70837 atomic_t _count; /* mandatory */
70838 slobidx_t units; /* free units left in page */
70839- unsigned long pad[2];
70840+ unsigned long pad[1];
70841+ unsigned long size; /* size when >=PAGE_SIZE */
70842 slob_t *free; /* first free slob_t in page */
70843 struct list_head list; /* linked list of free pages */
70844 };
70845@@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
70846 */
70847 static inline int is_slob_page(struct slob_page *sp)
70848 {
70849- return PageSlab((struct page *)sp);
70850+ return PageSlab((struct page *)sp) && !sp->size;
70851 }
70852
70853 static inline void set_slob_page(struct slob_page *sp)
70854@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
70855
70856 static inline struct slob_page *slob_page(const void *addr)
70857 {
70858- return (struct slob_page *)virt_to_page(addr);
70859+ return (struct slob_page *)virt_to_head_page(addr);
70860 }
70861
70862 /*
70863@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
70864 /*
70865 * Return the size of a slob block.
70866 */
70867-static slobidx_t slob_units(slob_t *s)
70868+static slobidx_t slob_units(const slob_t *s)
70869 {
70870 if (s->units > 0)
70871 return s->units;
70872@@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
70873 /*
70874 * Return the next free slob block pointer after this one.
70875 */
70876-static slob_t *slob_next(slob_t *s)
70877+static slob_t *slob_next(const slob_t *s)
70878 {
70879 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
70880 slobidx_t next;
70881@@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
70882 /*
70883 * Returns true if s is the last free block in its page.
70884 */
70885-static int slob_last(slob_t *s)
70886+static int slob_last(const slob_t *s)
70887 {
70888 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
70889 }
70890@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
70891 if (!page)
70892 return NULL;
70893
70894+ set_slob_page(page);
70895 return page_address(page);
70896 }
70897
70898@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
70899 if (!b)
70900 return NULL;
70901 sp = slob_page(b);
70902- set_slob_page(sp);
70903
70904 spin_lock_irqsave(&slob_lock, flags);
70905 sp->units = SLOB_UNITS(PAGE_SIZE);
70906 sp->free = b;
70907+ sp->size = 0;
70908 INIT_LIST_HEAD(&sp->list);
70909 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
70910 set_slob_page_free(sp, slob_list);
70911@@ -476,10 +479,9 @@ out:
70912 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
70913 */
70914
70915-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
70916+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
70917 {
70918- unsigned int *m;
70919- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
70920+ slob_t *m;
70921 void *ret;
70922
70923 gfp &= gfp_allowed_mask;
70924@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
70925
70926 if (!m)
70927 return NULL;
70928- *m = size;
70929+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
70930+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
70931+ m[0].units = size;
70932+ m[1].units = align;
70933 ret = (void *)m + align;
70934
70935 trace_kmalloc_node(_RET_IP_, ret,
70936@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
70937 gfp |= __GFP_COMP;
70938 ret = slob_new_pages(gfp, order, node);
70939 if (ret) {
70940- struct page *page;
70941- page = virt_to_page(ret);
70942- page->private = size;
70943+ struct slob_page *sp;
70944+ sp = slob_page(ret);
70945+ sp->size = size;
70946 }
70947
70948 trace_kmalloc_node(_RET_IP_, ret,
70949 size, PAGE_SIZE << order, gfp, node);
70950 }
70951
70952- kmemleak_alloc(ret, size, 1, gfp);
70953+ return ret;
70954+}
70955+
70956+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
70957+{
70958+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
70959+ void *ret = __kmalloc_node_align(size, gfp, node, align);
70960+
70961+ if (!ZERO_OR_NULL_PTR(ret))
70962+ kmemleak_alloc(ret, size, 1, gfp);
70963 return ret;
70964 }
70965 EXPORT_SYMBOL(__kmalloc_node);
70966@@ -533,13 +547,92 @@ void kfree(const void *block)
70967 sp = slob_page(block);
70968 if (is_slob_page(sp)) {
70969 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
70970- unsigned int *m = (unsigned int *)(block - align);
70971- slob_free(m, *m + align);
70972- } else
70973+ slob_t *m = (slob_t *)(block - align);
70974+ slob_free(m, m[0].units + align);
70975+ } else {
70976+ clear_slob_page(sp);
70977+ free_slob_page(sp);
70978+ sp->size = 0;
70979 put_page(&sp->page);
70980+ }
70981 }
70982 EXPORT_SYMBOL(kfree);
70983
70984+void check_object_size(const void *ptr, unsigned long n, bool to)
70985+{
70986+
70987+#ifdef CONFIG_PAX_USERCOPY
70988+ struct slob_page *sp;
70989+ const slob_t *free;
70990+ const void *base;
70991+ unsigned long flags;
70992+ const char *type;
70993+
70994+ if (!n)
70995+ return;
70996+
70997+ type = "<null>";
70998+ if (ZERO_OR_NULL_PTR(ptr))
70999+ goto report;
71000+
71001+ if (!virt_addr_valid(ptr))
71002+ return;
71003+
71004+ type = "<process stack>";
71005+ sp = slob_page(ptr);
71006+ if (!PageSlab((struct page *)sp)) {
71007+ if (object_is_on_stack(ptr, n) == -1)
71008+ goto report;
71009+ return;
71010+ }
71011+
71012+ type = "<slob>";
71013+ if (sp->size) {
71014+ base = page_address(&sp->page);
71015+ if (base <= ptr && n <= sp->size - (ptr - base))
71016+ return;
71017+ goto report;
71018+ }
71019+
71020+ /* some tricky double walking to find the chunk */
71021+ spin_lock_irqsave(&slob_lock, flags);
71022+ base = (void *)((unsigned long)ptr & PAGE_MASK);
71023+ free = sp->free;
71024+
71025+ while (!slob_last(free) && (void *)free <= ptr) {
71026+ base = free + slob_units(free);
71027+ free = slob_next(free);
71028+ }
71029+
71030+ while (base < (void *)free) {
71031+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
71032+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
71033+ int offset;
71034+
71035+ if (ptr < base + align)
71036+ break;
71037+
71038+ offset = ptr - base - align;
71039+ if (offset >= m) {
71040+ base += size;
71041+ continue;
71042+ }
71043+
71044+ if (n > m - offset)
71045+ break;
71046+
71047+ spin_unlock_irqrestore(&slob_lock, flags);
71048+ return;
71049+ }
71050+
71051+ spin_unlock_irqrestore(&slob_lock, flags);
71052+report:
71053+ pax_report_usercopy(ptr, n, to, type);
71054+#endif
71055+
71056+}
71057+EXPORT_SYMBOL(check_object_size);
71058+
71059 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
71060 size_t ksize(const void *block)
71061 {
71062@@ -552,10 +645,10 @@ size_t ksize(const void *block)
71063 sp = slob_page(block);
71064 if (is_slob_page(sp)) {
71065 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
71066- unsigned int *m = (unsigned int *)(block - align);
71067- return SLOB_UNITS(*m) * SLOB_UNIT;
71068+ slob_t *m = (slob_t *)(block - align);
71069+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
71070 } else
71071- return sp->page.private;
71072+ return sp->size;
71073 }
71074 EXPORT_SYMBOL(ksize);
71075
71076@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
71077 {
71078 struct kmem_cache *c;
71079
71080+#ifdef CONFIG_PAX_USERCOPY
71081+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
71082+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
71083+#else
71084 c = slob_alloc(sizeof(struct kmem_cache),
71085 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
71086+#endif
71087
71088 if (c) {
71089 c->name = name;
71090@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
71091
71092 lockdep_trace_alloc(flags);
71093
71094+#ifdef CONFIG_PAX_USERCOPY
71095+ b = __kmalloc_node_align(c->size, flags, node, c->align);
71096+#else
71097 if (c->size < PAGE_SIZE) {
71098 b = slob_alloc(c->size, flags, c->align, node);
71099 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
71100 SLOB_UNITS(c->size) * SLOB_UNIT,
71101 flags, node);
71102 } else {
71103+ struct slob_page *sp;
71104+
71105 b = slob_new_pages(flags, get_order(c->size), node);
71106+ sp = slob_page(b);
71107+ sp->size = c->size;
71108 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
71109 PAGE_SIZE << get_order(c->size),
71110 flags, node);
71111 }
71112+#endif
71113
71114 if (c->ctor)
71115 c->ctor(b);
71116@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
71117
71118 static void __kmem_cache_free(void *b, int size)
71119 {
71120- if (size < PAGE_SIZE)
71121+ struct slob_page *sp = slob_page(b);
71122+
71123+ if (is_slob_page(sp))
71124 slob_free(b, size);
71125- else
71126+ else {
71127+ clear_slob_page(sp);
71128+ free_slob_page(sp);
71129+ sp->size = 0;
71130 slob_free_pages(b, get_order(size));
71131+ }
71132 }
71133
71134 static void kmem_rcu_free(struct rcu_head *head)
71135@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_head *head)
71136
71137 void kmem_cache_free(struct kmem_cache *c, void *b)
71138 {
71139+ int size = c->size;
71140+
71141+#ifdef CONFIG_PAX_USERCOPY
71142+ if (size + c->align < PAGE_SIZE) {
71143+ size += c->align;
71144+ b -= c->align;
71145+ }
71146+#endif
71147+
71148 kmemleak_free_recursive(b, c->flags);
71149 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
71150 struct slob_rcu *slob_rcu;
71151- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
71152- slob_rcu->size = c->size;
71153+ slob_rcu = b + (size - sizeof(struct slob_rcu));
71154+ slob_rcu->size = size;
71155 call_rcu(&slob_rcu->head, kmem_rcu_free);
71156 } else {
71157- __kmem_cache_free(b, c->size);
71158+ __kmem_cache_free(b, size);
71159 }
71160
71161+#ifdef CONFIG_PAX_USERCOPY
71162+ trace_kfree(_RET_IP_, b);
71163+#else
71164 trace_kmem_cache_free(_RET_IP_, b);
71165+#endif
71166+
71167 }
71168 EXPORT_SYMBOL(kmem_cache_free);
71169
71170diff --git a/mm/slub.c b/mm/slub.c
71171index 1a919f0..1739c9b 100644
71172--- a/mm/slub.c
71173+++ b/mm/slub.c
71174@@ -208,7 +208,7 @@ struct track {
71175
71176 enum track_item { TRACK_ALLOC, TRACK_FREE };
71177
71178-#ifdef CONFIG_SYSFS
71179+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71180 static int sysfs_slab_add(struct kmem_cache *);
71181 static int sysfs_slab_alias(struct kmem_cache *, const char *);
71182 static void sysfs_slab_remove(struct kmem_cache *);
71183@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
71184 if (!t->addr)
71185 return;
71186
71187- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
71188+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
71189 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
71190 #ifdef CONFIG_STACKTRACE
71191 {
71192@@ -2559,6 +2559,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
71193
71194 page = virt_to_head_page(x);
71195
71196+ BUG_ON(!PageSlab(page));
71197+
71198 slab_free(s, page, x, _RET_IP_);
71199
71200 trace_kmem_cache_free(_RET_IP_, x);
71201@@ -2592,7 +2594,7 @@ static int slub_min_objects;
71202 * Merge control. If this is set then no merging of slab caches will occur.
71203 * (Could be removed. This was introduced to pacify the merge skeptics.)
71204 */
71205-static int slub_nomerge;
71206+static int slub_nomerge = 1;
71207
71208 /*
71209 * Calculate the order of allocation given an slab object size.
71210@@ -3042,7 +3044,7 @@ static int kmem_cache_open(struct kmem_cache *s,
71211 else
71212 s->cpu_partial = 30;
71213
71214- s->refcount = 1;
71215+ atomic_set(&s->refcount, 1);
71216 #ifdef CONFIG_NUMA
71217 s->remote_node_defrag_ratio = 1000;
71218 #endif
71219@@ -3146,8 +3148,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
71220 void kmem_cache_destroy(struct kmem_cache *s)
71221 {
71222 down_write(&slub_lock);
71223- s->refcount--;
71224- if (!s->refcount) {
71225+ if (atomic_dec_and_test(&s->refcount)) {
71226 list_del(&s->list);
71227 up_write(&slub_lock);
71228 if (kmem_cache_close(s)) {
71229@@ -3358,6 +3359,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
71230 EXPORT_SYMBOL(__kmalloc_node);
71231 #endif
71232
71233+void check_object_size(const void *ptr, unsigned long n, bool to)
71234+{
71235+
71236+#ifdef CONFIG_PAX_USERCOPY
71237+ struct page *page;
71238+ struct kmem_cache *s = NULL;
71239+ unsigned long offset;
71240+ const char *type;
71241+
71242+ if (!n)
71243+ return;
71244+
71245+ type = "<null>";
71246+ if (ZERO_OR_NULL_PTR(ptr))
71247+ goto report;
71248+
71249+ if (!virt_addr_valid(ptr))
71250+ return;
71251+
71252+ page = virt_to_head_page(ptr);
71253+
71254+ type = "<process stack>";
71255+ if (!PageSlab(page)) {
71256+ if (object_is_on_stack(ptr, n) == -1)
71257+ goto report;
71258+ return;
71259+ }
71260+
71261+ s = page->slab;
71262+ type = s->name;
71263+ if (!(s->flags & SLAB_USERCOPY))
71264+ goto report;
71265+
71266+ offset = (ptr - page_address(page)) % s->size;
71267+ if (offset <= s->objsize && n <= s->objsize - offset)
71268+ return;
71269+
71270+report:
71271+ pax_report_usercopy(ptr, n, to, type);
71272+#endif
71273+
71274+}
71275+EXPORT_SYMBOL(check_object_size);
71276+
71277 size_t ksize(const void *object)
71278 {
71279 struct page *page;
71280@@ -3632,7 +3677,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
71281 int node;
71282
71283 list_add(&s->list, &slab_caches);
71284- s->refcount = -1;
71285+ atomic_set(&s->refcount, -1);
71286
71287 for_each_node_state(node, N_NORMAL_MEMORY) {
71288 struct kmem_cache_node *n = get_node(s, node);
71289@@ -3749,17 +3794,17 @@ void __init kmem_cache_init(void)
71290
71291 /* Caches that are not of the two-to-the-power-of size */
71292 if (KMALLOC_MIN_SIZE <= 32) {
71293- kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
71294+ kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
71295 caches++;
71296 }
71297
71298 if (KMALLOC_MIN_SIZE <= 64) {
71299- kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
71300+ kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
71301 caches++;
71302 }
71303
71304 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
71305- kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
71306+ kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
71307 caches++;
71308 }
71309
71310@@ -3827,7 +3872,7 @@ static int slab_unmergeable(struct kmem_cache *s)
71311 /*
71312 * We may have set a slab to be unmergeable during bootstrap.
71313 */
71314- if (s->refcount < 0)
71315+ if (atomic_read(&s->refcount) < 0)
71316 return 1;
71317
71318 return 0;
71319@@ -3886,7 +3931,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
71320 down_write(&slub_lock);
71321 s = find_mergeable(size, align, flags, name, ctor);
71322 if (s) {
71323- s->refcount++;
71324+ atomic_inc(&s->refcount);
71325 /*
71326 * Adjust the object sizes so that we clear
71327 * the complete object on kzalloc.
71328@@ -3895,7 +3940,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
71329 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
71330
71331 if (sysfs_slab_alias(s, name)) {
71332- s->refcount--;
71333+ atomic_dec(&s->refcount);
71334 goto err;
71335 }
71336 up_write(&slub_lock);
71337@@ -4023,7 +4068,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
71338 }
71339 #endif
71340
71341-#ifdef CONFIG_SYSFS
71342+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71343 static int count_inuse(struct page *page)
71344 {
71345 return page->inuse;
71346@@ -4410,12 +4455,12 @@ static void resiliency_test(void)
71347 validate_slab_cache(kmalloc_caches[9]);
71348 }
71349 #else
71350-#ifdef CONFIG_SYSFS
71351+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71352 static void resiliency_test(void) {};
71353 #endif
71354 #endif
71355
71356-#ifdef CONFIG_SYSFS
71357+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71358 enum slab_stat_type {
71359 SL_ALL, /* All slabs */
71360 SL_PARTIAL, /* Only partially allocated slabs */
71361@@ -4656,7 +4701,7 @@ SLAB_ATTR_RO(ctor);
71362
71363 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
71364 {
71365- return sprintf(buf, "%d\n", s->refcount - 1);
71366+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
71367 }
71368 SLAB_ATTR_RO(aliases);
71369
71370@@ -5223,6 +5268,7 @@ static char *create_unique_id(struct kmem_cache *s)
71371 return name;
71372 }
71373
71374+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71375 static int sysfs_slab_add(struct kmem_cache *s)
71376 {
71377 int err;
71378@@ -5285,6 +5331,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
71379 kobject_del(&s->kobj);
71380 kobject_put(&s->kobj);
71381 }
71382+#endif
71383
71384 /*
71385 * Need to buffer aliases during bootup until sysfs becomes
71386@@ -5298,6 +5345,7 @@ struct saved_alias {
71387
71388 static struct saved_alias *alias_list;
71389
71390+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
71391 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
71392 {
71393 struct saved_alias *al;
71394@@ -5320,6 +5368,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
71395 alias_list = al;
71396 return 0;
71397 }
71398+#endif
71399
71400 static int __init slab_sysfs_init(void)
71401 {
71402diff --git a/mm/swap.c b/mm/swap.c
71403index 55b266d..a532537 100644
71404--- a/mm/swap.c
71405+++ b/mm/swap.c
71406@@ -31,6 +31,7 @@
71407 #include <linux/backing-dev.h>
71408 #include <linux/memcontrol.h>
71409 #include <linux/gfp.h>
71410+#include <linux/hugetlb.h>
71411
71412 #include "internal.h"
71413
71414@@ -71,6 +72,8 @@ static void __put_compound_page(struct page *page)
71415
71416 __page_cache_release(page);
71417 dtor = get_compound_page_dtor(page);
71418+ if (!PageHuge(page))
71419+ BUG_ON(dtor != free_compound_page);
71420 (*dtor)(page);
71421 }
71422
71423diff --git a/mm/swapfile.c b/mm/swapfile.c
71424index b1cd120..aaae885 100644
71425--- a/mm/swapfile.c
71426+++ b/mm/swapfile.c
71427@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
71428
71429 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
71430 /* Activity counter to indicate that a swapon or swapoff has occurred */
71431-static atomic_t proc_poll_event = ATOMIC_INIT(0);
71432+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
71433
71434 static inline unsigned char swap_count(unsigned char ent)
71435 {
71436@@ -1670,7 +1670,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
71437 }
71438 filp_close(swap_file, NULL);
71439 err = 0;
71440- atomic_inc(&proc_poll_event);
71441+ atomic_inc_unchecked(&proc_poll_event);
71442 wake_up_interruptible(&proc_poll_wait);
71443
71444 out_dput:
71445@@ -1686,8 +1686,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
71446
71447 poll_wait(file, &proc_poll_wait, wait);
71448
71449- if (seq->poll_event != atomic_read(&proc_poll_event)) {
71450- seq->poll_event = atomic_read(&proc_poll_event);
71451+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
71452+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
71453 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
71454 }
71455
71456@@ -1785,7 +1785,7 @@ static int swaps_open(struct inode *inode, struct file *file)
71457 return ret;
71458
71459 seq = file->private_data;
71460- seq->poll_event = atomic_read(&proc_poll_event);
71461+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
71462 return 0;
71463 }
71464
71465@@ -2123,7 +2123,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
71466 (p->flags & SWP_DISCARDABLE) ? "D" : "");
71467
71468 mutex_unlock(&swapon_mutex);
71469- atomic_inc(&proc_poll_event);
71470+ atomic_inc_unchecked(&proc_poll_event);
71471 wake_up_interruptible(&proc_poll_wait);
71472
71473 if (S_ISREG(inode->i_mode))
71474diff --git a/mm/util.c b/mm/util.c
71475index 136ac4f..5117eef 100644
71476--- a/mm/util.c
71477+++ b/mm/util.c
71478@@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
71479 * allocated buffer. Use this if you don't want to free the buffer immediately
71480 * like, for example, with RCU.
71481 */
71482+#undef __krealloc
71483 void *__krealloc(const void *p, size_t new_size, gfp_t flags)
71484 {
71485 void *ret;
71486@@ -147,6 +148,7 @@ EXPORT_SYMBOL(__krealloc);
71487 * behaves exactly like kmalloc(). If @size is 0 and @p is not a
71488 * %NULL pointer, the object pointed to is freed.
71489 */
71490+#undef krealloc
71491 void *krealloc(const void *p, size_t new_size, gfp_t flags)
71492 {
71493 void *ret;
71494@@ -243,6 +245,12 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
71495 void arch_pick_mmap_layout(struct mm_struct *mm)
71496 {
71497 mm->mmap_base = TASK_UNMAPPED_BASE;
71498+
71499+#ifdef CONFIG_PAX_RANDMMAP
71500+ if (mm->pax_flags & MF_PAX_RANDMMAP)
71501+ mm->mmap_base += mm->delta_mmap;
71502+#endif
71503+
71504 mm->get_unmapped_area = arch_get_unmapped_area;
71505 mm->unmap_area = arch_unmap_area;
71506 }
71507diff --git a/mm/vmalloc.c b/mm/vmalloc.c
71508index 27be2f0..0aef2c2 100644
71509--- a/mm/vmalloc.c
71510+++ b/mm/vmalloc.c
71511@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
71512
71513 pte = pte_offset_kernel(pmd, addr);
71514 do {
71515- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
71516- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
71517+
71518+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71519+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
71520+ BUG_ON(!pte_exec(*pte));
71521+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
71522+ continue;
71523+ }
71524+#endif
71525+
71526+ {
71527+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
71528+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
71529+ }
71530 } while (pte++, addr += PAGE_SIZE, addr != end);
71531 }
71532
71533@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
71534 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
71535 {
71536 pte_t *pte;
71537+ int ret = -ENOMEM;
71538
71539 /*
71540 * nr is a running index into the array which helps higher level
71541@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
71542 pte = pte_alloc_kernel(pmd, addr);
71543 if (!pte)
71544 return -ENOMEM;
71545+
71546+ pax_open_kernel();
71547 do {
71548 struct page *page = pages[*nr];
71549
71550- if (WARN_ON(!pte_none(*pte)))
71551- return -EBUSY;
71552- if (WARN_ON(!page))
71553- return -ENOMEM;
71554+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71555+ if (pgprot_val(prot) & _PAGE_NX)
71556+#endif
71557+
71558+ if (WARN_ON(!pte_none(*pte))) {
71559+ ret = -EBUSY;
71560+ goto out;
71561+ }
71562+ if (WARN_ON(!page)) {
71563+ ret = -ENOMEM;
71564+ goto out;
71565+ }
71566 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
71567 (*nr)++;
71568 } while (pte++, addr += PAGE_SIZE, addr != end);
71569- return 0;
71570+ ret = 0;
71571+out:
71572+ pax_close_kernel();
71573+ return ret;
71574 }
71575
71576 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
71577@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
71578 * and fall back on vmalloc() if that fails. Others
71579 * just put it in the vmalloc space.
71580 */
71581-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
71582+#ifdef CONFIG_MODULES
71583+#ifdef MODULES_VADDR
71584 unsigned long addr = (unsigned long)x;
71585 if (addr >= MODULES_VADDR && addr < MODULES_END)
71586 return 1;
71587 #endif
71588+
71589+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71590+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
71591+ return 1;
71592+#endif
71593+
71594+#endif
71595+
71596 return is_vmalloc_addr(x);
71597 }
71598
71599@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
71600
71601 if (!pgd_none(*pgd)) {
71602 pud_t *pud = pud_offset(pgd, addr);
71603+#ifdef CONFIG_X86
71604+ if (!pud_large(*pud))
71605+#endif
71606 if (!pud_none(*pud)) {
71607 pmd_t *pmd = pmd_offset(pud, addr);
71608+#ifdef CONFIG_X86
71609+ if (!pmd_large(*pmd))
71610+#endif
71611 if (!pmd_none(*pmd)) {
71612 pte_t *ptep, pte;
71613
71614@@ -1294,6 +1334,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
71615 struct vm_struct *area;
71616
71617 BUG_ON(in_interrupt());
71618+
71619+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
71620+ if (flags & VM_KERNEXEC) {
71621+ if (start != VMALLOC_START || end != VMALLOC_END)
71622+ return NULL;
71623+ start = (unsigned long)MODULES_EXEC_VADDR;
71624+ end = (unsigned long)MODULES_EXEC_END;
71625+ }
71626+#endif
71627+
71628 if (flags & VM_IOREMAP) {
71629 int bit = fls(size);
71630
71631@@ -1526,6 +1576,11 @@ void *vmap(struct page **pages, unsigned int count,
71632 if (count > totalram_pages)
71633 return NULL;
71634
71635+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
71636+ if (!(pgprot_val(prot) & _PAGE_NX))
71637+ flags |= VM_KERNEXEC;
71638+#endif
71639+
71640 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
71641 __builtin_return_address(0));
71642 if (!area)
71643@@ -1627,6 +1682,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
71644 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
71645 goto fail;
71646
71647+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
71648+ if (!(pgprot_val(prot) & _PAGE_NX))
71649+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
71650+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
71651+ else
71652+#endif
71653+
71654 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
71655 start, end, node, gfp_mask, caller);
71656 if (!area)
71657@@ -1679,6 +1741,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
71658 gfp_mask, prot, node, caller);
71659 }
71660
71661+#undef __vmalloc
71662 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
71663 {
71664 return __vmalloc_node(size, 1, gfp_mask, prot, -1,
71665@@ -1702,6 +1765,7 @@ static inline void *__vmalloc_node_flags(unsigned long size,
71666 * For tight control over page level allocator and protection flags
71667 * use __vmalloc() instead.
71668 */
71669+#undef vmalloc
71670 void *vmalloc(unsigned long size)
71671 {
71672 return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM);
71673@@ -1718,6 +1782,7 @@ EXPORT_SYMBOL(vmalloc);
71674 * For tight control over page level allocator and protection flags
71675 * use __vmalloc() instead.
71676 */
71677+#undef vzalloc
71678 void *vzalloc(unsigned long size)
71679 {
71680 return __vmalloc_node_flags(size, -1,
71681@@ -1732,6 +1797,7 @@ EXPORT_SYMBOL(vzalloc);
71682 * The resulting memory area is zeroed so it can be mapped to userspace
71683 * without leaking data.
71684 */
71685+#undef vmalloc_user
71686 void *vmalloc_user(unsigned long size)
71687 {
71688 struct vm_struct *area;
71689@@ -1759,6 +1825,7 @@ EXPORT_SYMBOL(vmalloc_user);
71690 * For tight control over page level allocator and protection flags
71691 * use __vmalloc() instead.
71692 */
71693+#undef vmalloc_node
71694 void *vmalloc_node(unsigned long size, int node)
71695 {
71696 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
71697@@ -1778,6 +1845,7 @@ EXPORT_SYMBOL(vmalloc_node);
71698 * For tight control over page level allocator and protection flags
71699 * use __vmalloc_node() instead.
71700 */
71701+#undef vzalloc_node
71702 void *vzalloc_node(unsigned long size, int node)
71703 {
71704 return __vmalloc_node_flags(size, node,
71705@@ -1800,10 +1868,10 @@ EXPORT_SYMBOL(vzalloc_node);
71706 * For tight control over page level allocator and protection flags
71707 * use __vmalloc() instead.
71708 */
71709-
71710+#undef vmalloc_exec
71711 void *vmalloc_exec(unsigned long size)
71712 {
71713- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
71714+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
71715 -1, __builtin_return_address(0));
71716 }
71717
71718@@ -1822,6 +1890,7 @@ void *vmalloc_exec(unsigned long size)
71719 * Allocate enough 32bit PA addressable pages to cover @size from the
71720 * page level allocator and map them into contiguous kernel virtual space.
71721 */
71722+#undef vmalloc_32
71723 void *vmalloc_32(unsigned long size)
71724 {
71725 return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
71726@@ -1836,6 +1905,7 @@ EXPORT_SYMBOL(vmalloc_32);
71727 * The resulting memory area is 32bit addressable and zeroed so it can be
71728 * mapped to userspace without leaking data.
71729 */
71730+#undef vmalloc_32_user
71731 void *vmalloc_32_user(unsigned long size)
71732 {
71733 struct vm_struct *area;
71734@@ -2098,6 +2168,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
71735 unsigned long uaddr = vma->vm_start;
71736 unsigned long usize = vma->vm_end - vma->vm_start;
71737
71738+ BUG_ON(vma->vm_mirror);
71739+
71740 if ((PAGE_SIZE-1) & (unsigned long)addr)
71741 return -EINVAL;
71742
71743diff --git a/mm/vmstat.c b/mm/vmstat.c
71744index 8fd603b..cf0d930 100644
71745--- a/mm/vmstat.c
71746+++ b/mm/vmstat.c
71747@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
71748 *
71749 * vm_stat contains the global counters
71750 */
71751-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
71752+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
71753 EXPORT_SYMBOL(vm_stat);
71754
71755 #ifdef CONFIG_SMP
71756@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
71757 v = p->vm_stat_diff[i];
71758 p->vm_stat_diff[i] = 0;
71759 local_irq_restore(flags);
71760- atomic_long_add(v, &zone->vm_stat[i]);
71761+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
71762 global_diff[i] += v;
71763 #ifdef CONFIG_NUMA
71764 /* 3 seconds idle till flush */
71765@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
71766
71767 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
71768 if (global_diff[i])
71769- atomic_long_add(global_diff[i], &vm_stat[i]);
71770+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
71771 }
71772
71773 #endif
71774@@ -1208,10 +1208,20 @@ static int __init setup_vmstat(void)
71775 start_cpu_timer(cpu);
71776 #endif
71777 #ifdef CONFIG_PROC_FS
71778- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
71779- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
71780- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
71781- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
71782+ {
71783+ mode_t gr_mode = S_IRUGO;
71784+#ifdef CONFIG_GRKERNSEC_PROC_ADD
71785+ gr_mode = S_IRUSR;
71786+#endif
71787+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
71788+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
71789+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
71790+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
71791+#else
71792+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
71793+#endif
71794+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
71795+ }
71796 #endif
71797 return 0;
71798 }
71799diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
71800index 5471628..cef8398 100644
71801--- a/net/8021q/vlan.c
71802+++ b/net/8021q/vlan.c
71803@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
71804 err = -EPERM;
71805 if (!capable(CAP_NET_ADMIN))
71806 break;
71807- if ((args.u.name_type >= 0) &&
71808- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
71809+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
71810 struct vlan_net *vn;
71811
71812 vn = net_generic(net, vlan_net_id);
71813diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
71814index fdfdb57..38d368c 100644
71815--- a/net/9p/trans_fd.c
71816+++ b/net/9p/trans_fd.c
71817@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
71818 oldfs = get_fs();
71819 set_fs(get_ds());
71820 /* The cast to a user pointer is valid due to the set_fs() */
71821- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
71822+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
71823 set_fs(oldfs);
71824
71825 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
71826diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
71827index f41f026..fe76ea8 100644
71828--- a/net/atm/atm_misc.c
71829+++ b/net/atm/atm_misc.c
71830@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
71831 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
71832 return 1;
71833 atm_return(vcc, truesize);
71834- atomic_inc(&vcc->stats->rx_drop);
71835+ atomic_inc_unchecked(&vcc->stats->rx_drop);
71836 return 0;
71837 }
71838 EXPORT_SYMBOL(atm_charge);
71839@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
71840 }
71841 }
71842 atm_return(vcc, guess);
71843- atomic_inc(&vcc->stats->rx_drop);
71844+ atomic_inc_unchecked(&vcc->stats->rx_drop);
71845 return NULL;
71846 }
71847 EXPORT_SYMBOL(atm_alloc_charge);
71848@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
71849
71850 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
71851 {
71852-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
71853+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
71854 __SONET_ITEMS
71855 #undef __HANDLE_ITEM
71856 }
71857@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
71858
71859 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
71860 {
71861-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
71862+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
71863 __SONET_ITEMS
71864 #undef __HANDLE_ITEM
71865 }
71866diff --git a/net/atm/lec.h b/net/atm/lec.h
71867index dfc0719..47c5322 100644
71868--- a/net/atm/lec.h
71869+++ b/net/atm/lec.h
71870@@ -48,7 +48,7 @@ struct lane2_ops {
71871 const u8 *tlvs, u32 sizeoftlvs);
71872 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
71873 const u8 *tlvs, u32 sizeoftlvs);
71874-};
71875+} __no_const;
71876
71877 /*
71878 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
71879diff --git a/net/atm/mpc.h b/net/atm/mpc.h
71880index 0919a88..a23d54e 100644
71881--- a/net/atm/mpc.h
71882+++ b/net/atm/mpc.h
71883@@ -33,7 +33,7 @@ struct mpoa_client {
71884 struct mpc_parameters parameters; /* parameters for this client */
71885
71886 const struct net_device_ops *old_ops;
71887- struct net_device_ops new_ops;
71888+ net_device_ops_no_const new_ops;
71889 };
71890
71891
71892diff --git a/net/atm/proc.c b/net/atm/proc.c
71893index 0d020de..011c7bb 100644
71894--- a/net/atm/proc.c
71895+++ b/net/atm/proc.c
71896@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
71897 const struct k_atm_aal_stats *stats)
71898 {
71899 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
71900- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
71901- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
71902- atomic_read(&stats->rx_drop));
71903+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
71904+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
71905+ atomic_read_unchecked(&stats->rx_drop));
71906 }
71907
71908 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
71909diff --git a/net/atm/resources.c b/net/atm/resources.c
71910index 23f45ce..c748f1a 100644
71911--- a/net/atm/resources.c
71912+++ b/net/atm/resources.c
71913@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
71914 static void copy_aal_stats(struct k_atm_aal_stats *from,
71915 struct atm_aal_stats *to)
71916 {
71917-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
71918+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
71919 __AAL_STAT_ITEMS
71920 #undef __HANDLE_ITEM
71921 }
71922@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
71923 static void subtract_aal_stats(struct k_atm_aal_stats *from,
71924 struct atm_aal_stats *to)
71925 {
71926-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
71927+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
71928 __AAL_STAT_ITEMS
71929 #undef __HANDLE_ITEM
71930 }
71931diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
71932index 3512e25..2b33401 100644
71933--- a/net/batman-adv/bat_iv_ogm.c
71934+++ b/net/batman-adv/bat_iv_ogm.c
71935@@ -541,7 +541,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
71936
71937 /* change sequence number to network order */
71938 batman_ogm_packet->seqno =
71939- htonl((uint32_t)atomic_read(&hard_iface->seqno));
71940+ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
71941
71942 batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
71943 batman_ogm_packet->tt_crc = htons((uint16_t)
71944@@ -561,7 +561,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
71945 else
71946 batman_ogm_packet->gw_flags = NO_FLAGS;
71947
71948- atomic_inc(&hard_iface->seqno);
71949+ atomic_inc_unchecked(&hard_iface->seqno);
71950
71951 slide_own_bcast_window(hard_iface);
71952 bat_ogm_queue_add(bat_priv, hard_iface->packet_buff,
71953@@ -922,7 +922,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
71954 return;
71955
71956 /* could be changed by schedule_own_packet() */
71957- if_incoming_seqno = atomic_read(&if_incoming->seqno);
71958+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
71959
71960 has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
71961
71962diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
71963index 7704df4..beb4e16 100644
71964--- a/net/batman-adv/hard-interface.c
71965+++ b/net/batman-adv/hard-interface.c
71966@@ -326,8 +326,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
71967 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
71968 dev_add_pack(&hard_iface->batman_adv_ptype);
71969
71970- atomic_set(&hard_iface->seqno, 1);
71971- atomic_set(&hard_iface->frag_seqno, 1);
71972+ atomic_set_unchecked(&hard_iface->seqno, 1);
71973+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
71974 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
71975 hard_iface->net_dev->name);
71976
71977diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
71978index f9cc957..efd9dae 100644
71979--- a/net/batman-adv/soft-interface.c
71980+++ b/net/batman-adv/soft-interface.c
71981@@ -634,7 +634,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
71982
71983 /* set broadcast sequence number */
71984 bcast_packet->seqno =
71985- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
71986+ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
71987
71988 add_bcast_packet_to_list(bat_priv, skb, 1);
71989
71990@@ -828,7 +828,7 @@ struct net_device *softif_create(const char *name)
71991 atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
71992
71993 atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
71994- atomic_set(&bat_priv->bcast_seqno, 1);
71995+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
71996 atomic_set(&bat_priv->ttvn, 0);
71997 atomic_set(&bat_priv->tt_local_changes, 0);
71998 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
71999diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
72000index ab8d0fe..ceba3fd 100644
72001--- a/net/batman-adv/types.h
72002+++ b/net/batman-adv/types.h
72003@@ -38,8 +38,8 @@ struct hard_iface {
72004 int16_t if_num;
72005 char if_status;
72006 struct net_device *net_dev;
72007- atomic_t seqno;
72008- atomic_t frag_seqno;
72009+ atomic_unchecked_t seqno;
72010+ atomic_unchecked_t frag_seqno;
72011 unsigned char *packet_buff;
72012 int packet_len;
72013 struct kobject *hardif_obj;
72014@@ -154,7 +154,7 @@ struct bat_priv {
72015 atomic_t orig_interval; /* uint */
72016 atomic_t hop_penalty; /* uint */
72017 atomic_t log_level; /* uint */
72018- atomic_t bcast_seqno;
72019+ atomic_unchecked_t bcast_seqno;
72020 atomic_t bcast_queue_left;
72021 atomic_t batman_queue_left;
72022 atomic_t ttvn; /* translation table version number */
72023diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
72024index 07d1c1d..7e9bea9 100644
72025--- a/net/batman-adv/unicast.c
72026+++ b/net/batman-adv/unicast.c
72027@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
72028 frag1->flags = UNI_FRAG_HEAD | large_tail;
72029 frag2->flags = large_tail;
72030
72031- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
72032+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
72033 frag1->seqno = htons(seqno - 1);
72034 frag2->seqno = htons(seqno);
72035
72036diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
72037index c1c597e..05ebb40 100644
72038--- a/net/bluetooth/hci_conn.c
72039+++ b/net/bluetooth/hci_conn.c
72040@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
72041 memset(&cp, 0, sizeof(cp));
72042
72043 cp.handle = cpu_to_le16(conn->handle);
72044- memcpy(cp.ltk, ltk, sizeof(ltk));
72045+ memcpy(cp.ltk, ltk, sizeof(cp.ltk));
72046
72047 hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
72048 }
72049diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
72050index 17b5b1c..826d872 100644
72051--- a/net/bluetooth/l2cap_core.c
72052+++ b/net/bluetooth/l2cap_core.c
72053@@ -2176,8 +2176,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
72054 break;
72055
72056 case L2CAP_CONF_RFC:
72057- if (olen == sizeof(rfc))
72058- memcpy(&rfc, (void *)val, olen);
72059+ if (olen != sizeof(rfc))
72060+ break;
72061+
72062+ memcpy(&rfc, (void *)val, olen);
72063
72064 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
72065 rfc.mode != chan->mode)
72066@@ -2265,8 +2267,10 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
72067
72068 switch (type) {
72069 case L2CAP_CONF_RFC:
72070- if (olen == sizeof(rfc))
72071- memcpy(&rfc, (void *)val, olen);
72072+ if (olen != sizeof(rfc))
72073+ break;
72074+
72075+ memcpy(&rfc, (void *)val, olen);
72076 goto done;
72077 }
72078 }
72079diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
72080index a5f4e57..910ee6d 100644
72081--- a/net/bridge/br_multicast.c
72082+++ b/net/bridge/br_multicast.c
72083@@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
72084 nexthdr = ip6h->nexthdr;
72085 offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
72086
72087- if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
72088+ if (nexthdr != IPPROTO_ICMPV6)
72089 return 0;
72090
72091 /* Okay, we found ICMPv6 header */
72092diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
72093index 5864cc4..121f3a3 100644
72094--- a/net/bridge/netfilter/ebtables.c
72095+++ b/net/bridge/netfilter/ebtables.c
72096@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
72097 tmp.valid_hooks = t->table->valid_hooks;
72098 }
72099 mutex_unlock(&ebt_mutex);
72100- if (copy_to_user(user, &tmp, *len) != 0){
72101+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
72102 BUGPRINT("c2u Didn't work\n");
72103 ret = -EFAULT;
72104 break;
72105diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
72106index a986280..13444a1 100644
72107--- a/net/caif/caif_socket.c
72108+++ b/net/caif/caif_socket.c
72109@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
72110 #ifdef CONFIG_DEBUG_FS
72111 struct debug_fs_counter {
72112 atomic_t caif_nr_socks;
72113- atomic_t caif_sock_create;
72114- atomic_t num_connect_req;
72115- atomic_t num_connect_resp;
72116- atomic_t num_connect_fail_resp;
72117- atomic_t num_disconnect;
72118- atomic_t num_remote_shutdown_ind;
72119- atomic_t num_tx_flow_off_ind;
72120- atomic_t num_tx_flow_on_ind;
72121- atomic_t num_rx_flow_off;
72122- atomic_t num_rx_flow_on;
72123+ atomic_unchecked_t caif_sock_create;
72124+ atomic_unchecked_t num_connect_req;
72125+ atomic_unchecked_t num_connect_resp;
72126+ atomic_unchecked_t num_connect_fail_resp;
72127+ atomic_unchecked_t num_disconnect;
72128+ atomic_unchecked_t num_remote_shutdown_ind;
72129+ atomic_unchecked_t num_tx_flow_off_ind;
72130+ atomic_unchecked_t num_tx_flow_on_ind;
72131+ atomic_unchecked_t num_rx_flow_off;
72132+ atomic_unchecked_t num_rx_flow_on;
72133 };
72134 static struct debug_fs_counter cnt;
72135 #define dbfs_atomic_inc(v) atomic_inc_return(v)
72136+#define dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
72137 #define dbfs_atomic_dec(v) atomic_dec_return(v)
72138 #else
72139 #define dbfs_atomic_inc(v) 0
72140@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72141 atomic_read(&cf_sk->sk.sk_rmem_alloc),
72142 sk_rcvbuf_lowwater(cf_sk));
72143 set_rx_flow_off(cf_sk);
72144- dbfs_atomic_inc(&cnt.num_rx_flow_off);
72145+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
72146 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
72147 }
72148
72149@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72150 set_rx_flow_off(cf_sk);
72151 if (net_ratelimit())
72152 pr_debug("sending flow OFF due to rmem_schedule\n");
72153- dbfs_atomic_inc(&cnt.num_rx_flow_off);
72154+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
72155 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
72156 }
72157 skb->dev = NULL;
72158@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer *layr,
72159 switch (flow) {
72160 case CAIF_CTRLCMD_FLOW_ON_IND:
72161 /* OK from modem to start sending again */
72162- dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
72163+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_on_ind);
72164 set_tx_flow_on(cf_sk);
72165 cf_sk->sk.sk_state_change(&cf_sk->sk);
72166 break;
72167
72168 case CAIF_CTRLCMD_FLOW_OFF_IND:
72169 /* Modem asks us to shut up */
72170- dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
72171+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_off_ind);
72172 set_tx_flow_off(cf_sk);
72173 cf_sk->sk.sk_state_change(&cf_sk->sk);
72174 break;
72175@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
72176 /* We're now connected */
72177 caif_client_register_refcnt(&cf_sk->layer,
72178 cfsk_hold, cfsk_put);
72179- dbfs_atomic_inc(&cnt.num_connect_resp);
72180+ dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
72181 cf_sk->sk.sk_state = CAIF_CONNECTED;
72182 set_tx_flow_on(cf_sk);
72183 cf_sk->sk.sk_state_change(&cf_sk->sk);
72184@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
72185
72186 case CAIF_CTRLCMD_INIT_FAIL_RSP:
72187 /* Connect request failed */
72188- dbfs_atomic_inc(&cnt.num_connect_fail_resp);
72189+ dbfs_atomic_inc_unchecked(&cnt.num_connect_fail_resp);
72190 cf_sk->sk.sk_err = ECONNREFUSED;
72191 cf_sk->sk.sk_state = CAIF_DISCONNECTED;
72192 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
72193@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
72194
72195 case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
72196 /* Modem has closed this connection, or device is down. */
72197- dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
72198+ dbfs_atomic_inc_unchecked(&cnt.num_remote_shutdown_ind);
72199 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
72200 cf_sk->sk.sk_err = ECONNRESET;
72201 set_rx_flow_on(cf_sk);
72202@@ -297,7 +298,7 @@ static void caif_check_flow_release(struct sock *sk)
72203 return;
72204
72205 if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
72206- dbfs_atomic_inc(&cnt.num_rx_flow_on);
72207+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_on);
72208 set_rx_flow_on(cf_sk);
72209 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
72210 }
72211@@ -854,7 +855,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
72212 /*ifindex = id of the interface.*/
72213 cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
72214
72215- dbfs_atomic_inc(&cnt.num_connect_req);
72216+ dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
72217 cf_sk->layer.receive = caif_sktrecv_cb;
72218
72219 err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
72220@@ -943,7 +944,7 @@ static int caif_release(struct socket *sock)
72221 spin_unlock_bh(&sk->sk_receive_queue.lock);
72222 sock->sk = NULL;
72223
72224- dbfs_atomic_inc(&cnt.num_disconnect);
72225+ dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
72226
72227 WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
72228 if (cf_sk->debugfs_socket_dir != NULL)
72229@@ -1122,7 +1123,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
72230 cf_sk->conn_req.protocol = protocol;
72231 /* Increase the number of sockets created. */
72232 dbfs_atomic_inc(&cnt.caif_nr_socks);
72233- num = dbfs_atomic_inc(&cnt.caif_sock_create);
72234+ num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
72235 #ifdef CONFIG_DEBUG_FS
72236 if (!IS_ERR(debugfsdir)) {
72237
72238diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
72239index 5cf5222..6f704ad 100644
72240--- a/net/caif/cfctrl.c
72241+++ b/net/caif/cfctrl.c
72242@@ -9,6 +9,7 @@
72243 #include <linux/stddef.h>
72244 #include <linux/spinlock.h>
72245 #include <linux/slab.h>
72246+#include <linux/sched.h>
72247 #include <net/caif/caif_layer.h>
72248 #include <net/caif/cfpkt.h>
72249 #include <net/caif/cfctrl.h>
72250@@ -42,8 +43,8 @@ struct cflayer *cfctrl_create(void)
72251 memset(&dev_info, 0, sizeof(dev_info));
72252 dev_info.id = 0xff;
72253 cfsrvl_init(&this->serv, 0, &dev_info, false);
72254- atomic_set(&this->req_seq_no, 1);
72255- atomic_set(&this->rsp_seq_no, 1);
72256+ atomic_set_unchecked(&this->req_seq_no, 1);
72257+ atomic_set_unchecked(&this->rsp_seq_no, 1);
72258 this->serv.layer.receive = cfctrl_recv;
72259 sprintf(this->serv.layer.name, "ctrl");
72260 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
72261@@ -129,8 +130,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
72262 struct cfctrl_request_info *req)
72263 {
72264 spin_lock_bh(&ctrl->info_list_lock);
72265- atomic_inc(&ctrl->req_seq_no);
72266- req->sequence_no = atomic_read(&ctrl->req_seq_no);
72267+ atomic_inc_unchecked(&ctrl->req_seq_no);
72268+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
72269 list_add_tail(&req->list, &ctrl->list);
72270 spin_unlock_bh(&ctrl->info_list_lock);
72271 }
72272@@ -148,7 +149,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
72273 if (p != first)
72274 pr_warn("Requests are not received in order\n");
72275
72276- atomic_set(&ctrl->rsp_seq_no,
72277+ atomic_set_unchecked(&ctrl->rsp_seq_no,
72278 p->sequence_no);
72279 list_del(&p->list);
72280 goto out;
72281diff --git a/net/can/gw.c b/net/can/gw.c
72282index 3d79b12..8de85fa 100644
72283--- a/net/can/gw.c
72284+++ b/net/can/gw.c
72285@@ -96,7 +96,7 @@ struct cf_mod {
72286 struct {
72287 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
72288 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
72289- } csumfunc;
72290+ } __no_const csumfunc;
72291 };
72292
72293
72294diff --git a/net/compat.c b/net/compat.c
72295index 6def90e..c6992fa 100644
72296--- a/net/compat.c
72297+++ b/net/compat.c
72298@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
72299 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
72300 __get_user(kmsg->msg_flags, &umsg->msg_flags))
72301 return -EFAULT;
72302- kmsg->msg_name = compat_ptr(tmp1);
72303- kmsg->msg_iov = compat_ptr(tmp2);
72304- kmsg->msg_control = compat_ptr(tmp3);
72305+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
72306+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
72307+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
72308 return 0;
72309 }
72310
72311@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
72312
72313 if (kern_msg->msg_namelen) {
72314 if (mode == VERIFY_READ) {
72315- int err = move_addr_to_kernel(kern_msg->msg_name,
72316+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
72317 kern_msg->msg_namelen,
72318 kern_address);
72319 if (err < 0)
72320@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
72321 kern_msg->msg_name = NULL;
72322
72323 tot_len = iov_from_user_compat_to_kern(kern_iov,
72324- (struct compat_iovec __user *)kern_msg->msg_iov,
72325+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
72326 kern_msg->msg_iovlen);
72327 if (tot_len >= 0)
72328 kern_msg->msg_iov = kern_iov;
72329@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
72330
72331 #define CMSG_COMPAT_FIRSTHDR(msg) \
72332 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
72333- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
72334+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
72335 (struct compat_cmsghdr __user *)NULL)
72336
72337 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
72338 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
72339 (ucmlen) <= (unsigned long) \
72340 ((mhdr)->msg_controllen - \
72341- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
72342+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
72343
72344 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
72345 struct compat_cmsghdr __user *cmsg, int cmsg_len)
72346 {
72347 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
72348- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
72349+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
72350 msg->msg_controllen)
72351 return NULL;
72352 return (struct compat_cmsghdr __user *)ptr;
72353@@ -221,7 +221,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
72354 {
72355 struct compat_timeval ctv;
72356 struct compat_timespec cts[3];
72357- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
72358+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
72359 struct compat_cmsghdr cmhdr;
72360 int cmlen;
72361
72362@@ -273,7 +273,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
72363
72364 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
72365 {
72366- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
72367+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
72368 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
72369 int fdnum = scm->fp->count;
72370 struct file **fp = scm->fp->fp;
72371@@ -370,7 +370,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
72372 return -EFAULT;
72373 old_fs = get_fs();
72374 set_fs(KERNEL_DS);
72375- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
72376+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
72377 set_fs(old_fs);
72378
72379 return err;
72380@@ -431,7 +431,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
72381 len = sizeof(ktime);
72382 old_fs = get_fs();
72383 set_fs(KERNEL_DS);
72384- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
72385+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
72386 set_fs(old_fs);
72387
72388 if (!err) {
72389@@ -566,7 +566,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
72390 case MCAST_JOIN_GROUP:
72391 case MCAST_LEAVE_GROUP:
72392 {
72393- struct compat_group_req __user *gr32 = (void *)optval;
72394+ struct compat_group_req __user *gr32 = (void __user *)optval;
72395 struct group_req __user *kgr =
72396 compat_alloc_user_space(sizeof(struct group_req));
72397 u32 interface;
72398@@ -587,7 +587,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
72399 case MCAST_BLOCK_SOURCE:
72400 case MCAST_UNBLOCK_SOURCE:
72401 {
72402- struct compat_group_source_req __user *gsr32 = (void *)optval;
72403+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
72404 struct group_source_req __user *kgsr = compat_alloc_user_space(
72405 sizeof(struct group_source_req));
72406 u32 interface;
72407@@ -608,7 +608,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
72408 }
72409 case MCAST_MSFILTER:
72410 {
72411- struct compat_group_filter __user *gf32 = (void *)optval;
72412+ struct compat_group_filter __user *gf32 = (void __user *)optval;
72413 struct group_filter __user *kgf;
72414 u32 interface, fmode, numsrc;
72415
72416@@ -646,7 +646,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
72417 char __user *optval, int __user *optlen,
72418 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
72419 {
72420- struct compat_group_filter __user *gf32 = (void *)optval;
72421+ struct compat_group_filter __user *gf32 = (void __user *)optval;
72422 struct group_filter __user *kgf;
72423 int __user *koptlen;
72424 u32 interface, fmode, numsrc;
72425diff --git a/net/core/datagram.c b/net/core/datagram.c
72426index 68bbf9f..5ef0d12 100644
72427--- a/net/core/datagram.c
72428+++ b/net/core/datagram.c
72429@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
72430 }
72431
72432 kfree_skb(skb);
72433- atomic_inc(&sk->sk_drops);
72434+ atomic_inc_unchecked(&sk->sk_drops);
72435 sk_mem_reclaim_partial(sk);
72436
72437 return err;
72438diff --git a/net/core/dev.c b/net/core/dev.c
72439index 5a13edf..a6f2bd2 100644
72440--- a/net/core/dev.c
72441+++ b/net/core/dev.c
72442@@ -1139,10 +1139,14 @@ void dev_load(struct net *net, const char *name)
72443 if (no_module && capable(CAP_NET_ADMIN))
72444 no_module = request_module("netdev-%s", name);
72445 if (no_module && capable(CAP_SYS_MODULE)) {
72446+#ifdef CONFIG_GRKERNSEC_MODHARDEN
72447+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
72448+#else
72449 if (!request_module("%s", name))
72450 pr_err("Loading kernel module for a network device "
72451 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
72452 "instead\n", name);
72453+#endif
72454 }
72455 }
72456 EXPORT_SYMBOL(dev_load);
72457@@ -1573,7 +1577,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
72458 {
72459 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
72460 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
72461- atomic_long_inc(&dev->rx_dropped);
72462+ atomic_long_inc_unchecked(&dev->rx_dropped);
72463 kfree_skb(skb);
72464 return NET_RX_DROP;
72465 }
72466@@ -1583,7 +1587,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
72467 nf_reset(skb);
72468
72469 if (unlikely(!is_skb_forwardable(dev, skb))) {
72470- atomic_long_inc(&dev->rx_dropped);
72471+ atomic_long_inc_unchecked(&dev->rx_dropped);
72472 kfree_skb(skb);
72473 return NET_RX_DROP;
72474 }
72475@@ -2036,7 +2040,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
72476
72477 struct dev_gso_cb {
72478 void (*destructor)(struct sk_buff *skb);
72479-};
72480+} __no_const;
72481
72482 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
72483
72484@@ -2970,7 +2974,7 @@ enqueue:
72485
72486 local_irq_restore(flags);
72487
72488- atomic_long_inc(&skb->dev->rx_dropped);
72489+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
72490 kfree_skb(skb);
72491 return NET_RX_DROP;
72492 }
72493@@ -3044,7 +3048,7 @@ int netif_rx_ni(struct sk_buff *skb)
72494 }
72495 EXPORT_SYMBOL(netif_rx_ni);
72496
72497-static void net_tx_action(struct softirq_action *h)
72498+static void net_tx_action(void)
72499 {
72500 struct softnet_data *sd = &__get_cpu_var(softnet_data);
72501
72502@@ -3333,7 +3337,7 @@ ncls:
72503 if (pt_prev) {
72504 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
72505 } else {
72506- atomic_long_inc(&skb->dev->rx_dropped);
72507+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
72508 kfree_skb(skb);
72509 /* Jamal, now you will not able to escape explaining
72510 * me how you were going to use this. :-)
72511@@ -3891,7 +3895,7 @@ void netif_napi_del(struct napi_struct *napi)
72512 }
72513 EXPORT_SYMBOL(netif_napi_del);
72514
72515-static void net_rx_action(struct softirq_action *h)
72516+static void net_rx_action(void)
72517 {
72518 struct softnet_data *sd = &__get_cpu_var(softnet_data);
72519 unsigned long time_limit = jiffies + 2;
72520@@ -5949,7 +5953,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
72521 } else {
72522 netdev_stats_to_stats64(storage, &dev->stats);
72523 }
72524- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
72525+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
72526 return storage;
72527 }
72528 EXPORT_SYMBOL(dev_get_stats);
72529diff --git a/net/core/flow.c b/net/core/flow.c
72530index e318c7e..168b1d0 100644
72531--- a/net/core/flow.c
72532+++ b/net/core/flow.c
72533@@ -61,7 +61,7 @@ struct flow_cache {
72534 struct timer_list rnd_timer;
72535 };
72536
72537-atomic_t flow_cache_genid = ATOMIC_INIT(0);
72538+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
72539 EXPORT_SYMBOL(flow_cache_genid);
72540 static struct flow_cache flow_cache_global;
72541 static struct kmem_cache *flow_cachep __read_mostly;
72542@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
72543
72544 static int flow_entry_valid(struct flow_cache_entry *fle)
72545 {
72546- if (atomic_read(&flow_cache_genid) != fle->genid)
72547+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
72548 return 0;
72549 if (fle->object && !fle->object->ops->check(fle->object))
72550 return 0;
72551@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
72552 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
72553 fcp->hash_count++;
72554 }
72555- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
72556+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
72557 flo = fle->object;
72558 if (!flo)
72559 goto ret_object;
72560@@ -280,7 +280,7 @@ nocache:
72561 }
72562 flo = resolver(net, key, family, dir, flo, ctx);
72563 if (fle) {
72564- fle->genid = atomic_read(&flow_cache_genid);
72565+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
72566 if (!IS_ERR(flo))
72567 fle->object = flo;
72568 else
72569diff --git a/net/core/iovec.c b/net/core/iovec.c
72570index c40f27e..7f49254 100644
72571--- a/net/core/iovec.c
72572+++ b/net/core/iovec.c
72573@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
72574 if (m->msg_namelen) {
72575 if (mode == VERIFY_READ) {
72576 void __user *namep;
72577- namep = (void __user __force *) m->msg_name;
72578+ namep = (void __force_user *) m->msg_name;
72579 err = move_addr_to_kernel(namep, m->msg_namelen,
72580 address);
72581 if (err < 0)
72582@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
72583 }
72584
72585 size = m->msg_iovlen * sizeof(struct iovec);
72586- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
72587+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
72588 return -EFAULT;
72589
72590 m->msg_iov = iov;
72591diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
72592index 9083e82..1673203 100644
72593--- a/net/core/rtnetlink.c
72594+++ b/net/core/rtnetlink.c
72595@@ -57,7 +57,7 @@ struct rtnl_link {
72596 rtnl_doit_func doit;
72597 rtnl_dumpit_func dumpit;
72598 rtnl_calcit_func calcit;
72599-};
72600+} __no_const;
72601
72602 static DEFINE_MUTEX(rtnl_mutex);
72603 static u16 min_ifinfo_dump_size;
72604diff --git a/net/core/scm.c b/net/core/scm.c
72605index ff52ad0..aff1c0f 100644
72606--- a/net/core/scm.c
72607+++ b/net/core/scm.c
72608@@ -220,7 +220,7 @@ EXPORT_SYMBOL(__scm_send);
72609 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
72610 {
72611 struct cmsghdr __user *cm
72612- = (__force struct cmsghdr __user *)msg->msg_control;
72613+ = (struct cmsghdr __force_user *)msg->msg_control;
72614 struct cmsghdr cmhdr;
72615 int cmlen = CMSG_LEN(len);
72616 int err;
72617@@ -243,7 +243,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
72618 err = -EFAULT;
72619 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
72620 goto out;
72621- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
72622+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
72623 goto out;
72624 cmlen = CMSG_SPACE(len);
72625 if (msg->msg_controllen < cmlen)
72626@@ -259,7 +259,7 @@ EXPORT_SYMBOL(put_cmsg);
72627 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
72628 {
72629 struct cmsghdr __user *cm
72630- = (__force struct cmsghdr __user*)msg->msg_control;
72631+ = (struct cmsghdr __force_user *)msg->msg_control;
72632
72633 int fdmax = 0;
72634 int fdnum = scm->fp->count;
72635@@ -279,7 +279,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
72636 if (fdnum < fdmax)
72637 fdmax = fdnum;
72638
72639- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
72640+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
72641 i++, cmfptr++)
72642 {
72643 int new_fd;
72644diff --git a/net/core/sock.c b/net/core/sock.c
72645index b23f174..b9a0d26 100644
72646--- a/net/core/sock.c
72647+++ b/net/core/sock.c
72648@@ -289,7 +289,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72649 struct sk_buff_head *list = &sk->sk_receive_queue;
72650
72651 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
72652- atomic_inc(&sk->sk_drops);
72653+ atomic_inc_unchecked(&sk->sk_drops);
72654 trace_sock_rcvqueue_full(sk, skb);
72655 return -ENOMEM;
72656 }
72657@@ -299,7 +299,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72658 return err;
72659
72660 if (!sk_rmem_schedule(sk, skb->truesize)) {
72661- atomic_inc(&sk->sk_drops);
72662+ atomic_inc_unchecked(&sk->sk_drops);
72663 return -ENOBUFS;
72664 }
72665
72666@@ -319,7 +319,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
72667 skb_dst_force(skb);
72668
72669 spin_lock_irqsave(&list->lock, flags);
72670- skb->dropcount = atomic_read(&sk->sk_drops);
72671+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
72672 __skb_queue_tail(list, skb);
72673 spin_unlock_irqrestore(&list->lock, flags);
72674
72675@@ -339,7 +339,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
72676 skb->dev = NULL;
72677
72678 if (sk_rcvqueues_full(sk, skb)) {
72679- atomic_inc(&sk->sk_drops);
72680+ atomic_inc_unchecked(&sk->sk_drops);
72681 goto discard_and_relse;
72682 }
72683 if (nested)
72684@@ -357,7 +357,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
72685 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
72686 } else if (sk_add_backlog(sk, skb)) {
72687 bh_unlock_sock(sk);
72688- atomic_inc(&sk->sk_drops);
72689+ atomic_inc_unchecked(&sk->sk_drops);
72690 goto discard_and_relse;
72691 }
72692
72693@@ -917,7 +917,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
72694 if (len > sizeof(peercred))
72695 len = sizeof(peercred);
72696 cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
72697- if (copy_to_user(optval, &peercred, len))
72698+ if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
72699 return -EFAULT;
72700 goto lenout;
72701 }
72702@@ -930,7 +930,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
72703 return -ENOTCONN;
72704 if (lv < len)
72705 return -EINVAL;
72706- if (copy_to_user(optval, address, len))
72707+ if (len > sizeof(address) || copy_to_user(optval, address, len))
72708 return -EFAULT;
72709 goto lenout;
72710 }
72711@@ -963,7 +963,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
72712
72713 if (len > lv)
72714 len = lv;
72715- if (copy_to_user(optval, &v, len))
72716+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
72717 return -EFAULT;
72718 lenout:
72719 if (put_user(len, optlen))
72720@@ -2020,7 +2020,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
72721 */
72722 smp_wmb();
72723 atomic_set(&sk->sk_refcnt, 1);
72724- atomic_set(&sk->sk_drops, 0);
72725+ atomic_set_unchecked(&sk->sk_drops, 0);
72726 }
72727 EXPORT_SYMBOL(sock_init_data);
72728
72729diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
72730index 02e75d1..9a57a7c 100644
72731--- a/net/decnet/sysctl_net_decnet.c
72732+++ b/net/decnet/sysctl_net_decnet.c
72733@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
72734
72735 if (len > *lenp) len = *lenp;
72736
72737- if (copy_to_user(buffer, addr, len))
72738+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
72739 return -EFAULT;
72740
72741 *lenp = len;
72742@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
72743
72744 if (len > *lenp) len = *lenp;
72745
72746- if (copy_to_user(buffer, devname, len))
72747+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
72748 return -EFAULT;
72749
72750 *lenp = len;
72751diff --git a/net/econet/Kconfig b/net/econet/Kconfig
72752index 39a2d29..f39c0fe 100644
72753--- a/net/econet/Kconfig
72754+++ b/net/econet/Kconfig
72755@@ -4,7 +4,7 @@
72756
72757 config ECONET
72758 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
72759- depends on EXPERIMENTAL && INET
72760+ depends on EXPERIMENTAL && INET && BROKEN
72761 ---help---
72762 Econet is a fairly old and slow networking protocol mainly used by
72763 Acorn computers to access file and print servers. It uses native
72764diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
72765index 92fc5f6..b790d91 100644
72766--- a/net/ipv4/fib_frontend.c
72767+++ b/net/ipv4/fib_frontend.c
72768@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
72769 #ifdef CONFIG_IP_ROUTE_MULTIPATH
72770 fib_sync_up(dev);
72771 #endif
72772- atomic_inc(&net->ipv4.dev_addr_genid);
72773+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
72774 rt_cache_flush(dev_net(dev), -1);
72775 break;
72776 case NETDEV_DOWN:
72777 fib_del_ifaddr(ifa, NULL);
72778- atomic_inc(&net->ipv4.dev_addr_genid);
72779+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
72780 if (ifa->ifa_dev->ifa_list == NULL) {
72781 /* Last address was deleted from this interface.
72782 * Disable IP.
72783@@ -1011,7 +1011,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
72784 #ifdef CONFIG_IP_ROUTE_MULTIPATH
72785 fib_sync_up(dev);
72786 #endif
72787- atomic_inc(&net->ipv4.dev_addr_genid);
72788+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
72789 rt_cache_flush(dev_net(dev), -1);
72790 break;
72791 case NETDEV_DOWN:
72792diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
72793index 80106d8..232e898 100644
72794--- a/net/ipv4/fib_semantics.c
72795+++ b/net/ipv4/fib_semantics.c
72796@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
72797 nh->nh_saddr = inet_select_addr(nh->nh_dev,
72798 nh->nh_gw,
72799 nh->nh_parent->fib_scope);
72800- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
72801+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
72802
72803 return nh->nh_saddr;
72804 }
72805diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
72806index ccee270..db23c3c 100644
72807--- a/net/ipv4/inet_diag.c
72808+++ b/net/ipv4/inet_diag.c
72809@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct sock *sk,
72810 r->idiag_retrans = 0;
72811
72812 r->id.idiag_if = sk->sk_bound_dev_if;
72813+
72814+#ifdef CONFIG_GRKERNSEC_HIDESYM
72815+ r->id.idiag_cookie[0] = 0;
72816+ r->id.idiag_cookie[1] = 0;
72817+#else
72818 r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
72819 r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
72820+#endif
72821
72822 r->id.idiag_sport = inet->inet_sport;
72823 r->id.idiag_dport = inet->inet_dport;
72824@@ -210,8 +216,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
72825 r->idiag_family = tw->tw_family;
72826 r->idiag_retrans = 0;
72827 r->id.idiag_if = tw->tw_bound_dev_if;
72828+
72829+#ifdef CONFIG_GRKERNSEC_HIDESYM
72830+ r->id.idiag_cookie[0] = 0;
72831+ r->id.idiag_cookie[1] = 0;
72832+#else
72833 r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
72834 r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
72835+#endif
72836+
72837 r->id.idiag_sport = tw->tw_sport;
72838 r->id.idiag_dport = tw->tw_dport;
72839 r->id.idiag_src[0] = tw->tw_rcv_saddr;
72840@@ -294,12 +307,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
72841 if (sk == NULL)
72842 goto unlock;
72843
72844+#ifndef CONFIG_GRKERNSEC_HIDESYM
72845 err = -ESTALE;
72846 if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
72847 req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
72848 ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
72849 (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
72850 goto out;
72851+#endif
72852
72853 err = -ENOMEM;
72854 rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
72855@@ -589,8 +604,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
72856 r->idiag_retrans = req->retrans;
72857
72858 r->id.idiag_if = sk->sk_bound_dev_if;
72859+
72860+#ifdef CONFIG_GRKERNSEC_HIDESYM
72861+ r->id.idiag_cookie[0] = 0;
72862+ r->id.idiag_cookie[1] = 0;
72863+#else
72864 r->id.idiag_cookie[0] = (u32)(unsigned long)req;
72865 r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
72866+#endif
72867
72868 tmo = req->expires - jiffies;
72869 if (tmo < 0)
72870diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
72871index 984ec65..97ac518 100644
72872--- a/net/ipv4/inet_hashtables.c
72873+++ b/net/ipv4/inet_hashtables.c
72874@@ -18,12 +18,15 @@
72875 #include <linux/sched.h>
72876 #include <linux/slab.h>
72877 #include <linux/wait.h>
72878+#include <linux/security.h>
72879
72880 #include <net/inet_connection_sock.h>
72881 #include <net/inet_hashtables.h>
72882 #include <net/secure_seq.h>
72883 #include <net/ip.h>
72884
72885+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
72886+
72887 /*
72888 * Allocate and initialize a new local port bind bucket.
72889 * The bindhash mutex for snum's hash chain must be held here.
72890@@ -530,6 +533,8 @@ ok:
72891 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
72892 spin_unlock(&head->lock);
72893
72894+ gr_update_task_in_ip_table(current, inet_sk(sk));
72895+
72896 if (tw) {
72897 inet_twsk_deschedule(tw, death_row);
72898 while (twrefcnt) {
72899diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
72900index 86f13c67..59a35b5 100644
72901--- a/net/ipv4/inetpeer.c
72902+++ b/net/ipv4/inetpeer.c
72903@@ -436,8 +436,8 @@ relookup:
72904 if (p) {
72905 p->daddr = *daddr;
72906 atomic_set(&p->refcnt, 1);
72907- atomic_set(&p->rid, 0);
72908- atomic_set(&p->ip_id_count,
72909+ atomic_set_unchecked(&p->rid, 0);
72910+ atomic_set_unchecked(&p->ip_id_count,
72911 (daddr->family == AF_INET) ?
72912 secure_ip_id(daddr->addr.a4) :
72913 secure_ipv6_id(daddr->addr.a6));
72914diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
72915index fdaabf2..0ec3205 100644
72916--- a/net/ipv4/ip_fragment.c
72917+++ b/net/ipv4/ip_fragment.c
72918@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
72919 return 0;
72920
72921 start = qp->rid;
72922- end = atomic_inc_return(&peer->rid);
72923+ end = atomic_inc_return_unchecked(&peer->rid);
72924 qp->rid = end;
72925
72926 rc = qp->q.fragments && (end - start) > max;
72927diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
72928index 09ff51b..d3968eb 100644
72929--- a/net/ipv4/ip_sockglue.c
72930+++ b/net/ipv4/ip_sockglue.c
72931@@ -1111,7 +1111,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
72932 len = min_t(unsigned int, len, opt->optlen);
72933 if (put_user(len, optlen))
72934 return -EFAULT;
72935- if (copy_to_user(optval, opt->__data, len))
72936+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
72937+ copy_to_user(optval, opt->__data, len))
72938 return -EFAULT;
72939 return 0;
72940 }
72941@@ -1239,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
72942 if (sk->sk_type != SOCK_STREAM)
72943 return -ENOPROTOOPT;
72944
72945- msg.msg_control = optval;
72946+ msg.msg_control = (void __force_kernel *)optval;
72947 msg.msg_controllen = len;
72948 msg.msg_flags = flags;
72949
72950diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
72951index 99ec116..c5628fe 100644
72952--- a/net/ipv4/ipconfig.c
72953+++ b/net/ipv4/ipconfig.c
72954@@ -318,7 +318,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
72955
72956 mm_segment_t oldfs = get_fs();
72957 set_fs(get_ds());
72958- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
72959+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
72960 set_fs(oldfs);
72961 return res;
72962 }
72963@@ -329,7 +329,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
72964
72965 mm_segment_t oldfs = get_fs();
72966 set_fs(get_ds());
72967- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
72968+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
72969 set_fs(oldfs);
72970 return res;
72971 }
72972@@ -340,7 +340,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
72973
72974 mm_segment_t oldfs = get_fs();
72975 set_fs(get_ds());
72976- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
72977+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
72978 set_fs(oldfs);
72979 return res;
72980 }
72981diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
72982index 2133c30..5c4b40b 100644
72983--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
72984+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
72985@@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(struct asn1_ctx *ctx,
72986
72987 *len = 0;
72988
72989- *octets = kmalloc(eoc - ctx->pointer, GFP_ATOMIC);
72990+ *octets = kmalloc((eoc - ctx->pointer), GFP_ATOMIC);
72991 if (*octets == NULL)
72992 return 0;
72993
72994diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
72995index 43d4c3b..1914409 100644
72996--- a/net/ipv4/ping.c
72997+++ b/net/ipv4/ping.c
72998@@ -836,7 +836,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
72999 sk_rmem_alloc_get(sp),
73000 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
73001 atomic_read(&sp->sk_refcnt), sp,
73002- atomic_read(&sp->sk_drops), len);
73003+ atomic_read_unchecked(&sp->sk_drops), len);
73004 }
73005
73006 static int ping_seq_show(struct seq_file *seq, void *v)
73007diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
73008index 007e2eb..85a18a0 100644
73009--- a/net/ipv4/raw.c
73010+++ b/net/ipv4/raw.c
73011@@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
73012 int raw_rcv(struct sock *sk, struct sk_buff *skb)
73013 {
73014 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
73015- atomic_inc(&sk->sk_drops);
73016+ atomic_inc_unchecked(&sk->sk_drops);
73017 kfree_skb(skb);
73018 return NET_RX_DROP;
73019 }
73020@@ -738,16 +738,20 @@ static int raw_init(struct sock *sk)
73021
73022 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
73023 {
73024+ struct icmp_filter filter;
73025+
73026 if (optlen > sizeof(struct icmp_filter))
73027 optlen = sizeof(struct icmp_filter);
73028- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
73029+ if (copy_from_user(&filter, optval, optlen))
73030 return -EFAULT;
73031+ raw_sk(sk)->filter = filter;
73032 return 0;
73033 }
73034
73035 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
73036 {
73037 int len, ret = -EFAULT;
73038+ struct icmp_filter filter;
73039
73040 if (get_user(len, optlen))
73041 goto out;
73042@@ -757,8 +761,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
73043 if (len > sizeof(struct icmp_filter))
73044 len = sizeof(struct icmp_filter);
73045 ret = -EFAULT;
73046- if (put_user(len, optlen) ||
73047- copy_to_user(optval, &raw_sk(sk)->filter, len))
73048+ filter = raw_sk(sk)->filter;
73049+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
73050 goto out;
73051 ret = 0;
73052 out: return ret;
73053@@ -986,7 +990,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
73054 sk_wmem_alloc_get(sp),
73055 sk_rmem_alloc_get(sp),
73056 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
73057- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
73058+ atomic_read(&sp->sk_refcnt),
73059+#ifdef CONFIG_GRKERNSEC_HIDESYM
73060+ NULL,
73061+#else
73062+ sp,
73063+#endif
73064+ atomic_read_unchecked(&sp->sk_drops));
73065 }
73066
73067 static int raw_seq_show(struct seq_file *seq, void *v)
73068diff --git a/net/ipv4/route.c b/net/ipv4/route.c
73069index 94cdbc5..0cb0063 100644
73070--- a/net/ipv4/route.c
73071+++ b/net/ipv4/route.c
73072@@ -313,7 +313,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
73073
73074 static inline int rt_genid(struct net *net)
73075 {
73076- return atomic_read(&net->ipv4.rt_genid);
73077+ return atomic_read_unchecked(&net->ipv4.rt_genid);
73078 }
73079
73080 #ifdef CONFIG_PROC_FS
73081@@ -937,7 +937,7 @@ static void rt_cache_invalidate(struct net *net)
73082 unsigned char shuffle;
73083
73084 get_random_bytes(&shuffle, sizeof(shuffle));
73085- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
73086+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
73087 redirect_genid++;
73088 }
73089
73090@@ -3022,7 +3022,7 @@ static int rt_fill_info(struct net *net,
73091 error = rt->dst.error;
73092 if (peer) {
73093 inet_peer_refcheck(rt->peer);
73094- id = atomic_read(&peer->ip_id_count) & 0xffff;
73095+ id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
73096 if (peer->tcp_ts_stamp) {
73097 ts = peer->tcp_ts;
73098 tsage = get_seconds() - peer->tcp_ts_stamp;
73099diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
73100index c89e354..8bd55c8 100644
73101--- a/net/ipv4/tcp_ipv4.c
73102+++ b/net/ipv4/tcp_ipv4.c
73103@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
73104 int sysctl_tcp_low_latency __read_mostly;
73105 EXPORT_SYMBOL(sysctl_tcp_low_latency);
73106
73107+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73108+extern int grsec_enable_blackhole;
73109+#endif
73110
73111 #ifdef CONFIG_TCP_MD5SIG
73112 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
73113@@ -1627,6 +1630,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
73114 return 0;
73115
73116 reset:
73117+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73118+ if (!grsec_enable_blackhole)
73119+#endif
73120 tcp_v4_send_reset(rsk, skb);
73121 discard:
73122 kfree_skb(skb);
73123@@ -1689,12 +1695,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
73124 TCP_SKB_CB(skb)->sacked = 0;
73125
73126 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
73127- if (!sk)
73128+ if (!sk) {
73129+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73130+ ret = 1;
73131+#endif
73132 goto no_tcp_socket;
73133-
73134+ }
73135 process:
73136- if (sk->sk_state == TCP_TIME_WAIT)
73137+ if (sk->sk_state == TCP_TIME_WAIT) {
73138+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73139+ ret = 2;
73140+#endif
73141 goto do_time_wait;
73142+ }
73143
73144 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
73145 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
73146@@ -1744,6 +1757,10 @@ no_tcp_socket:
73147 bad_packet:
73148 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
73149 } else {
73150+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73151+ if (!grsec_enable_blackhole || (ret == 1 &&
73152+ (skb->dev->flags & IFF_LOOPBACK)))
73153+#endif
73154 tcp_v4_send_reset(NULL, skb);
73155 }
73156
73157@@ -2404,7 +2421,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
73158 0, /* non standard timer */
73159 0, /* open_requests have no inode */
73160 atomic_read(&sk->sk_refcnt),
73161+#ifdef CONFIG_GRKERNSEC_HIDESYM
73162+ NULL,
73163+#else
73164 req,
73165+#endif
73166 len);
73167 }
73168
73169@@ -2454,7 +2475,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
73170 sock_i_uid(sk),
73171 icsk->icsk_probes_out,
73172 sock_i_ino(sk),
73173- atomic_read(&sk->sk_refcnt), sk,
73174+ atomic_read(&sk->sk_refcnt),
73175+#ifdef CONFIG_GRKERNSEC_HIDESYM
73176+ NULL,
73177+#else
73178+ sk,
73179+#endif
73180 jiffies_to_clock_t(icsk->icsk_rto),
73181 jiffies_to_clock_t(icsk->icsk_ack.ato),
73182 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
73183@@ -2482,7 +2508,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
73184 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
73185 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
73186 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
73187- atomic_read(&tw->tw_refcnt), tw, len);
73188+ atomic_read(&tw->tw_refcnt),
73189+#ifdef CONFIG_GRKERNSEC_HIDESYM
73190+ NULL,
73191+#else
73192+ tw,
73193+#endif
73194+ len);
73195 }
73196
73197 #define TMPSZ 150
73198diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
73199index 66363b6..b0654a3 100644
73200--- a/net/ipv4/tcp_minisocks.c
73201+++ b/net/ipv4/tcp_minisocks.c
73202@@ -27,6 +27,10 @@
73203 #include <net/inet_common.h>
73204 #include <net/xfrm.h>
73205
73206+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73207+extern int grsec_enable_blackhole;
73208+#endif
73209+
73210 int sysctl_tcp_syncookies __read_mostly = 1;
73211 EXPORT_SYMBOL(sysctl_tcp_syncookies);
73212
73213@@ -751,6 +755,10 @@ listen_overflow:
73214
73215 embryonic_reset:
73216 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
73217+
73218+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73219+ if (!grsec_enable_blackhole)
73220+#endif
73221 if (!(flg & TCP_FLAG_RST))
73222 req->rsk_ops->send_reset(sk, skb);
73223
73224diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
73225index 85ee7eb..53277ab 100644
73226--- a/net/ipv4/tcp_probe.c
73227+++ b/net/ipv4/tcp_probe.c
73228@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
73229 if (cnt + width >= len)
73230 break;
73231
73232- if (copy_to_user(buf + cnt, tbuf, width))
73233+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
73234 return -EFAULT;
73235 cnt += width;
73236 }
73237diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
73238index 2e0f0af..e2948bf 100644
73239--- a/net/ipv4/tcp_timer.c
73240+++ b/net/ipv4/tcp_timer.c
73241@@ -22,6 +22,10 @@
73242 #include <linux/gfp.h>
73243 #include <net/tcp.h>
73244
73245+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73246+extern int grsec_lastack_retries;
73247+#endif
73248+
73249 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
73250 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
73251 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
73252@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk)
73253 }
73254 }
73255
73256+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73257+ if ((sk->sk_state == TCP_LAST_ACK) &&
73258+ (grsec_lastack_retries > 0) &&
73259+ (grsec_lastack_retries < retry_until))
73260+ retry_until = grsec_lastack_retries;
73261+#endif
73262+
73263 if (retransmits_timed_out(sk, retry_until,
73264 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
73265 /* Has it gone just too far? */
73266diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
73267index 5a65eea..bd913a1 100644
73268--- a/net/ipv4/udp.c
73269+++ b/net/ipv4/udp.c
73270@@ -86,6 +86,7 @@
73271 #include <linux/types.h>
73272 #include <linux/fcntl.h>
73273 #include <linux/module.h>
73274+#include <linux/security.h>
73275 #include <linux/socket.h>
73276 #include <linux/sockios.h>
73277 #include <linux/igmp.h>
73278@@ -108,6 +109,10 @@
73279 #include <trace/events/udp.h>
73280 #include "udp_impl.h"
73281
73282+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73283+extern int grsec_enable_blackhole;
73284+#endif
73285+
73286 struct udp_table udp_table __read_mostly;
73287 EXPORT_SYMBOL(udp_table);
73288
73289@@ -565,6 +570,9 @@ found:
73290 return s;
73291 }
73292
73293+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
73294+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
73295+
73296 /*
73297 * This routine is called by the ICMP module when it gets some
73298 * sort of error condition. If err < 0 then the socket should
73299@@ -856,9 +864,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
73300 dport = usin->sin_port;
73301 if (dport == 0)
73302 return -EINVAL;
73303+
73304+ err = gr_search_udp_sendmsg(sk, usin);
73305+ if (err)
73306+ return err;
73307 } else {
73308 if (sk->sk_state != TCP_ESTABLISHED)
73309 return -EDESTADDRREQ;
73310+
73311+ err = gr_search_udp_sendmsg(sk, NULL);
73312+ if (err)
73313+ return err;
73314+
73315 daddr = inet->inet_daddr;
73316 dport = inet->inet_dport;
73317 /* Open fast path for connected socket.
73318@@ -1099,7 +1116,7 @@ static unsigned int first_packet_length(struct sock *sk)
73319 udp_lib_checksum_complete(skb)) {
73320 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
73321 IS_UDPLITE(sk));
73322- atomic_inc(&sk->sk_drops);
73323+ atomic_inc_unchecked(&sk->sk_drops);
73324 __skb_unlink(skb, rcvq);
73325 __skb_queue_tail(&list_kill, skb);
73326 }
73327@@ -1185,6 +1202,10 @@ try_again:
73328 if (!skb)
73329 goto out;
73330
73331+ err = gr_search_udp_recvmsg(sk, skb);
73332+ if (err)
73333+ goto out_free;
73334+
73335 ulen = skb->len - sizeof(struct udphdr);
73336 copied = len;
73337 if (copied > ulen)
73338@@ -1487,7 +1508,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
73339
73340 drop:
73341 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
73342- atomic_inc(&sk->sk_drops);
73343+ atomic_inc_unchecked(&sk->sk_drops);
73344 kfree_skb(skb);
73345 return -1;
73346 }
73347@@ -1506,7 +1527,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
73348 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
73349
73350 if (!skb1) {
73351- atomic_inc(&sk->sk_drops);
73352+ atomic_inc_unchecked(&sk->sk_drops);
73353 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
73354 IS_UDPLITE(sk));
73355 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
73356@@ -1675,6 +1696,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
73357 goto csum_error;
73358
73359 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
73360+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73361+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
73362+#endif
73363 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
73364
73365 /*
73366@@ -2098,8 +2122,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
73367 sk_wmem_alloc_get(sp),
73368 sk_rmem_alloc_get(sp),
73369 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
73370- atomic_read(&sp->sk_refcnt), sp,
73371- atomic_read(&sp->sk_drops), len);
73372+ atomic_read(&sp->sk_refcnt),
73373+#ifdef CONFIG_GRKERNSEC_HIDESYM
73374+ NULL,
73375+#else
73376+ sp,
73377+#endif
73378+ atomic_read_unchecked(&sp->sk_drops), len);
73379 }
73380
73381 int udp4_seq_show(struct seq_file *seq, void *v)
73382diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
73383index 836c4ea..cbb74dc 100644
73384--- a/net/ipv6/addrconf.c
73385+++ b/net/ipv6/addrconf.c
73386@@ -2149,7 +2149,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
73387 p.iph.ihl = 5;
73388 p.iph.protocol = IPPROTO_IPV6;
73389 p.iph.ttl = 64;
73390- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
73391+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
73392
73393 if (ops->ndo_do_ioctl) {
73394 mm_segment_t oldfs = get_fs();
73395diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
73396index 1567fb1..29af910 100644
73397--- a/net/ipv6/inet6_connection_sock.c
73398+++ b/net/ipv6/inet6_connection_sock.c
73399@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
73400 #ifdef CONFIG_XFRM
73401 {
73402 struct rt6_info *rt = (struct rt6_info *)dst;
73403- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
73404+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
73405 }
73406 #endif
73407 }
73408@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
73409 #ifdef CONFIG_XFRM
73410 if (dst) {
73411 struct rt6_info *rt = (struct rt6_info *)dst;
73412- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
73413+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
73414 __sk_dst_reset(sk);
73415 dst = NULL;
73416 }
73417diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
73418index 26cb08c..8af9877 100644
73419--- a/net/ipv6/ipv6_sockglue.c
73420+++ b/net/ipv6/ipv6_sockglue.c
73421@@ -960,7 +960,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
73422 if (sk->sk_type != SOCK_STREAM)
73423 return -ENOPROTOOPT;
73424
73425- msg.msg_control = optval;
73426+ msg.msg_control = (void __force_kernel *)optval;
73427 msg.msg_controllen = len;
73428 msg.msg_flags = flags;
73429
73430diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
73431index 361ebf3..d5628fb 100644
73432--- a/net/ipv6/raw.c
73433+++ b/net/ipv6/raw.c
73434@@ -377,7 +377,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
73435 {
73436 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
73437 skb_checksum_complete(skb)) {
73438- atomic_inc(&sk->sk_drops);
73439+ atomic_inc_unchecked(&sk->sk_drops);
73440 kfree_skb(skb);
73441 return NET_RX_DROP;
73442 }
73443@@ -404,7 +404,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
73444 struct raw6_sock *rp = raw6_sk(sk);
73445
73446 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
73447- atomic_inc(&sk->sk_drops);
73448+ atomic_inc_unchecked(&sk->sk_drops);
73449 kfree_skb(skb);
73450 return NET_RX_DROP;
73451 }
73452@@ -428,7 +428,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
73453
73454 if (inet->hdrincl) {
73455 if (skb_checksum_complete(skb)) {
73456- atomic_inc(&sk->sk_drops);
73457+ atomic_inc_unchecked(&sk->sk_drops);
73458 kfree_skb(skb);
73459 return NET_RX_DROP;
73460 }
73461@@ -601,7 +601,7 @@ out:
73462 return err;
73463 }
73464
73465-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
73466+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
73467 struct flowi6 *fl6, struct dst_entry **dstp,
73468 unsigned int flags)
73469 {
73470@@ -909,12 +909,15 @@ do_confirm:
73471 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
73472 char __user *optval, int optlen)
73473 {
73474+ struct icmp6_filter filter;
73475+
73476 switch (optname) {
73477 case ICMPV6_FILTER:
73478 if (optlen > sizeof(struct icmp6_filter))
73479 optlen = sizeof(struct icmp6_filter);
73480- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
73481+ if (copy_from_user(&filter, optval, optlen))
73482 return -EFAULT;
73483+ raw6_sk(sk)->filter = filter;
73484 return 0;
73485 default:
73486 return -ENOPROTOOPT;
73487@@ -927,6 +930,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
73488 char __user *optval, int __user *optlen)
73489 {
73490 int len;
73491+ struct icmp6_filter filter;
73492
73493 switch (optname) {
73494 case ICMPV6_FILTER:
73495@@ -938,7 +942,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
73496 len = sizeof(struct icmp6_filter);
73497 if (put_user(len, optlen))
73498 return -EFAULT;
73499- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
73500+ filter = raw6_sk(sk)->filter;
73501+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
73502 return -EFAULT;
73503 return 0;
73504 default:
73505@@ -1245,7 +1250,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
73506 0, 0L, 0,
73507 sock_i_uid(sp), 0,
73508 sock_i_ino(sp),
73509- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
73510+ atomic_read(&sp->sk_refcnt),
73511+#ifdef CONFIG_GRKERNSEC_HIDESYM
73512+ NULL,
73513+#else
73514+ sp,
73515+#endif
73516+ atomic_read_unchecked(&sp->sk_drops));
73517 }
73518
73519 static int raw6_seq_show(struct seq_file *seq, void *v)
73520diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
73521index b859e4a..f9d1589 100644
73522--- a/net/ipv6/tcp_ipv6.c
73523+++ b/net/ipv6/tcp_ipv6.c
73524@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
73525 }
73526 #endif
73527
73528+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73529+extern int grsec_enable_blackhole;
73530+#endif
73531+
73532 static void tcp_v6_hash(struct sock *sk)
73533 {
73534 if (sk->sk_state != TCP_CLOSE) {
73535@@ -1651,6 +1655,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
73536 return 0;
73537
73538 reset:
73539+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73540+ if (!grsec_enable_blackhole)
73541+#endif
73542 tcp_v6_send_reset(sk, skb);
73543 discard:
73544 if (opt_skb)
73545@@ -1730,12 +1737,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
73546 TCP_SKB_CB(skb)->sacked = 0;
73547
73548 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
73549- if (!sk)
73550+ if (!sk) {
73551+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73552+ ret = 1;
73553+#endif
73554 goto no_tcp_socket;
73555+ }
73556
73557 process:
73558- if (sk->sk_state == TCP_TIME_WAIT)
73559+ if (sk->sk_state == TCP_TIME_WAIT) {
73560+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73561+ ret = 2;
73562+#endif
73563 goto do_time_wait;
73564+ }
73565
73566 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
73567 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
73568@@ -1783,6 +1798,10 @@ no_tcp_socket:
73569 bad_packet:
73570 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
73571 } else {
73572+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73573+ if (!grsec_enable_blackhole || (ret == 1 &&
73574+ (skb->dev->flags & IFF_LOOPBACK)))
73575+#endif
73576 tcp_v6_send_reset(NULL, skb);
73577 }
73578
73579@@ -2043,7 +2062,13 @@ static void get_openreq6(struct seq_file *seq,
73580 uid,
73581 0, /* non standard timer */
73582 0, /* open_requests have no inode */
73583- 0, req);
73584+ 0,
73585+#ifdef CONFIG_GRKERNSEC_HIDESYM
73586+ NULL
73587+#else
73588+ req
73589+#endif
73590+ );
73591 }
73592
73593 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
73594@@ -2093,7 +2118,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
73595 sock_i_uid(sp),
73596 icsk->icsk_probes_out,
73597 sock_i_ino(sp),
73598- atomic_read(&sp->sk_refcnt), sp,
73599+ atomic_read(&sp->sk_refcnt),
73600+#ifdef CONFIG_GRKERNSEC_HIDESYM
73601+ NULL,
73602+#else
73603+ sp,
73604+#endif
73605 jiffies_to_clock_t(icsk->icsk_rto),
73606 jiffies_to_clock_t(icsk->icsk_ack.ato),
73607 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
73608@@ -2128,7 +2158,13 @@ static void get_timewait6_sock(struct seq_file *seq,
73609 dest->s6_addr32[2], dest->s6_addr32[3], destp,
73610 tw->tw_substate, 0, 0,
73611 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
73612- atomic_read(&tw->tw_refcnt), tw);
73613+ atomic_read(&tw->tw_refcnt),
73614+#ifdef CONFIG_GRKERNSEC_HIDESYM
73615+ NULL
73616+#else
73617+ tw
73618+#endif
73619+ );
73620 }
73621
73622 static int tcp6_seq_show(struct seq_file *seq, void *v)
73623diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
73624index 8c25419..47a51ae 100644
73625--- a/net/ipv6/udp.c
73626+++ b/net/ipv6/udp.c
73627@@ -50,6 +50,10 @@
73628 #include <linux/seq_file.h>
73629 #include "udp_impl.h"
73630
73631+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73632+extern int grsec_enable_blackhole;
73633+#endif
73634+
73635 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
73636 {
73637 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
73638@@ -549,7 +553,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
73639
73640 return 0;
73641 drop:
73642- atomic_inc(&sk->sk_drops);
73643+ atomic_inc_unchecked(&sk->sk_drops);
73644 drop_no_sk_drops_inc:
73645 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
73646 kfree_skb(skb);
73647@@ -625,7 +629,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
73648 continue;
73649 }
73650 drop:
73651- atomic_inc(&sk->sk_drops);
73652+ atomic_inc_unchecked(&sk->sk_drops);
73653 UDP6_INC_STATS_BH(sock_net(sk),
73654 UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
73655 UDP6_INC_STATS_BH(sock_net(sk),
73656@@ -780,6 +784,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
73657 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
73658 proto == IPPROTO_UDPLITE);
73659
73660+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
73661+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
73662+#endif
73663 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
73664
73665 kfree_skb(skb);
73666@@ -796,7 +803,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
73667 if (!sock_owned_by_user(sk))
73668 udpv6_queue_rcv_skb(sk, skb);
73669 else if (sk_add_backlog(sk, skb)) {
73670- atomic_inc(&sk->sk_drops);
73671+ atomic_inc_unchecked(&sk->sk_drops);
73672 bh_unlock_sock(sk);
73673 sock_put(sk);
73674 goto discard;
73675@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
73676 0, 0L, 0,
73677 sock_i_uid(sp), 0,
73678 sock_i_ino(sp),
73679- atomic_read(&sp->sk_refcnt), sp,
73680- atomic_read(&sp->sk_drops));
73681+ atomic_read(&sp->sk_refcnt),
73682+#ifdef CONFIG_GRKERNSEC_HIDESYM
73683+ NULL,
73684+#else
73685+ sp,
73686+#endif
73687+ atomic_read_unchecked(&sp->sk_drops));
73688 }
73689
73690 int udp6_seq_show(struct seq_file *seq, void *v)
73691diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
73692index 253695d..9481ce8 100644
73693--- a/net/irda/ircomm/ircomm_tty.c
73694+++ b/net/irda/ircomm/ircomm_tty.c
73695@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
73696 add_wait_queue(&self->open_wait, &wait);
73697
73698 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
73699- __FILE__,__LINE__, tty->driver->name, self->open_count );
73700+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
73701
73702 /* As far as I can see, we protect open_count - Jean II */
73703 spin_lock_irqsave(&self->spinlock, flags);
73704 if (!tty_hung_up_p(filp)) {
73705 extra_count = 1;
73706- self->open_count--;
73707+ local_dec(&self->open_count);
73708 }
73709 spin_unlock_irqrestore(&self->spinlock, flags);
73710- self->blocked_open++;
73711+ local_inc(&self->blocked_open);
73712
73713 while (1) {
73714 if (tty->termios->c_cflag & CBAUD) {
73715@@ -331,7 +331,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
73716 }
73717
73718 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
73719- __FILE__,__LINE__, tty->driver->name, self->open_count );
73720+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
73721
73722 schedule();
73723 }
73724@@ -342,13 +342,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
73725 if (extra_count) {
73726 /* ++ is not atomic, so this should be protected - Jean II */
73727 spin_lock_irqsave(&self->spinlock, flags);
73728- self->open_count++;
73729+ local_inc(&self->open_count);
73730 spin_unlock_irqrestore(&self->spinlock, flags);
73731 }
73732- self->blocked_open--;
73733+ local_dec(&self->blocked_open);
73734
73735 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
73736- __FILE__,__LINE__, tty->driver->name, self->open_count);
73737+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
73738
73739 if (!retval)
73740 self->flags |= ASYNC_NORMAL_ACTIVE;
73741@@ -417,14 +417,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
73742 }
73743 /* ++ is not atomic, so this should be protected - Jean II */
73744 spin_lock_irqsave(&self->spinlock, flags);
73745- self->open_count++;
73746+ local_inc(&self->open_count);
73747
73748 tty->driver_data = self;
73749 self->tty = tty;
73750 spin_unlock_irqrestore(&self->spinlock, flags);
73751
73752 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
73753- self->line, self->open_count);
73754+ self->line, local_read(&self->open_count));
73755
73756 /* Not really used by us, but lets do it anyway */
73757 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
73758@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
73759 return;
73760 }
73761
73762- if ((tty->count == 1) && (self->open_count != 1)) {
73763+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
73764 /*
73765 * Uh, oh. tty->count is 1, which means that the tty
73766 * structure will be freed. state->count should always
73767@@ -520,16 +520,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
73768 */
73769 IRDA_DEBUG(0, "%s(), bad serial port count; "
73770 "tty->count is 1, state->count is %d\n", __func__ ,
73771- self->open_count);
73772- self->open_count = 1;
73773+ local_read(&self->open_count));
73774+ local_set(&self->open_count, 1);
73775 }
73776
73777- if (--self->open_count < 0) {
73778+ if (local_dec_return(&self->open_count) < 0) {
73779 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
73780- __func__, self->line, self->open_count);
73781- self->open_count = 0;
73782+ __func__, self->line, local_read(&self->open_count));
73783+ local_set(&self->open_count, 0);
73784 }
73785- if (self->open_count) {
73786+ if (local_read(&self->open_count)) {
73787 spin_unlock_irqrestore(&self->spinlock, flags);
73788
73789 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
73790@@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
73791 tty->closing = 0;
73792 self->tty = NULL;
73793
73794- if (self->blocked_open) {
73795+ if (local_read(&self->blocked_open)) {
73796 if (self->close_delay)
73797 schedule_timeout_interruptible(self->close_delay);
73798 wake_up_interruptible(&self->open_wait);
73799@@ -1013,7 +1013,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
73800 spin_lock_irqsave(&self->spinlock, flags);
73801 self->flags &= ~ASYNC_NORMAL_ACTIVE;
73802 self->tty = NULL;
73803- self->open_count = 0;
73804+ local_set(&self->open_count, 0);
73805 spin_unlock_irqrestore(&self->spinlock, flags);
73806
73807 wake_up_interruptible(&self->open_wait);
73808@@ -1360,7 +1360,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
73809 seq_putc(m, '\n');
73810
73811 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
73812- seq_printf(m, "Open count: %d\n", self->open_count);
73813+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
73814 seq_printf(m, "Max data size: %d\n", self->max_data_size);
73815 seq_printf(m, "Max header size: %d\n", self->max_header_size);
73816
73817diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
73818index 274d150..656a144 100644
73819--- a/net/iucv/af_iucv.c
73820+++ b/net/iucv/af_iucv.c
73821@@ -787,10 +787,10 @@ static int iucv_sock_autobind(struct sock *sk)
73822
73823 write_lock_bh(&iucv_sk_list.lock);
73824
73825- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
73826+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
73827 while (__iucv_get_sock_by_name(name)) {
73828 sprintf(name, "%08x",
73829- atomic_inc_return(&iucv_sk_list.autobind_name));
73830+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
73831 }
73832
73833 write_unlock_bh(&iucv_sk_list.lock);
73834diff --git a/net/key/af_key.c b/net/key/af_key.c
73835index 1e733e9..3d73c9f 100644
73836--- a/net/key/af_key.c
73837+++ b/net/key/af_key.c
73838@@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
73839 static u32 get_acqseq(void)
73840 {
73841 u32 res;
73842- static atomic_t acqseq;
73843+ static atomic_unchecked_t acqseq;
73844
73845 do {
73846- res = atomic_inc_return(&acqseq);
73847+ res = atomic_inc_return_unchecked(&acqseq);
73848 } while (!res);
73849 return res;
73850 }
73851diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
73852index 73495f1..ad51356 100644
73853--- a/net/mac80211/ieee80211_i.h
73854+++ b/net/mac80211/ieee80211_i.h
73855@@ -27,6 +27,7 @@
73856 #include <net/ieee80211_radiotap.h>
73857 #include <net/cfg80211.h>
73858 #include <net/mac80211.h>
73859+#include <asm/local.h>
73860 #include "key.h"
73861 #include "sta_info.h"
73862
73863@@ -764,7 +765,7 @@ struct ieee80211_local {
73864 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
73865 spinlock_t queue_stop_reason_lock;
73866
73867- int open_count;
73868+ local_t open_count;
73869 int monitors, cooked_mntrs;
73870 /* number of interfaces with corresponding FIF_ flags */
73871 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
73872diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
73873index 30d7355..e260095 100644
73874--- a/net/mac80211/iface.c
73875+++ b/net/mac80211/iface.c
73876@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
73877 break;
73878 }
73879
73880- if (local->open_count == 0) {
73881+ if (local_read(&local->open_count) == 0) {
73882 res = drv_start(local);
73883 if (res)
73884 goto err_del_bss;
73885@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
73886 memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
73887
73888 if (!is_valid_ether_addr(dev->dev_addr)) {
73889- if (!local->open_count)
73890+ if (!local_read(&local->open_count))
73891 drv_stop(local);
73892 return -EADDRNOTAVAIL;
73893 }
73894@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
73895 mutex_unlock(&local->mtx);
73896
73897 if (coming_up)
73898- local->open_count++;
73899+ local_inc(&local->open_count);
73900
73901 if (hw_reconf_flags) {
73902 ieee80211_hw_config(local, hw_reconf_flags);
73903@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
73904 err_del_interface:
73905 drv_remove_interface(local, &sdata->vif);
73906 err_stop:
73907- if (!local->open_count)
73908+ if (!local_read(&local->open_count))
73909 drv_stop(local);
73910 err_del_bss:
73911 sdata->bss = NULL;
73912@@ -472,7 +472,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
73913 }
73914
73915 if (going_down)
73916- local->open_count--;
73917+ local_dec(&local->open_count);
73918
73919 switch (sdata->vif.type) {
73920 case NL80211_IFTYPE_AP_VLAN:
73921@@ -531,7 +531,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
73922
73923 ieee80211_recalc_ps(local, -1);
73924
73925- if (local->open_count == 0) {
73926+ if (local_read(&local->open_count) == 0) {
73927 if (local->ops->napi_poll)
73928 napi_disable(&local->napi);
73929 ieee80211_clear_tx_pending(local);
73930diff --git a/net/mac80211/main.c b/net/mac80211/main.c
73931index a7536fd..4039cc0 100644
73932--- a/net/mac80211/main.c
73933+++ b/net/mac80211/main.c
73934@@ -163,7 +163,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
73935 local->hw.conf.power_level = power;
73936 }
73937
73938- if (changed && local->open_count) {
73939+ if (changed && local_read(&local->open_count)) {
73940 ret = drv_config(local, changed);
73941 /*
73942 * Goal:
73943diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
73944index 9ee7164..56c5061 100644
73945--- a/net/mac80211/pm.c
73946+++ b/net/mac80211/pm.c
73947@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
73948 struct ieee80211_sub_if_data *sdata;
73949 struct sta_info *sta;
73950
73951- if (!local->open_count)
73952+ if (!local_read(&local->open_count))
73953 goto suspend;
73954
73955 ieee80211_scan_cancel(local);
73956@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
73957 cancel_work_sync(&local->dynamic_ps_enable_work);
73958 del_timer_sync(&local->dynamic_ps_timer);
73959
73960- local->wowlan = wowlan && local->open_count;
73961+ local->wowlan = wowlan && local_read(&local->open_count);
73962 if (local->wowlan) {
73963 int err = drv_suspend(local, wowlan);
73964 if (err < 0) {
73965@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
73966 }
73967
73968 /* stop hardware - this must stop RX */
73969- if (local->open_count)
73970+ if (local_read(&local->open_count))
73971 ieee80211_stop_device(local);
73972
73973 suspend:
73974diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
73975index 5a5a776..9600b11 100644
73976--- a/net/mac80211/rate.c
73977+++ b/net/mac80211/rate.c
73978@@ -401,7 +401,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
73979
73980 ASSERT_RTNL();
73981
73982- if (local->open_count)
73983+ if (local_read(&local->open_count))
73984 return -EBUSY;
73985
73986 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
73987diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
73988index c97a065..ff61928 100644
73989--- a/net/mac80211/rc80211_pid_debugfs.c
73990+++ b/net/mac80211/rc80211_pid_debugfs.c
73991@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
73992
73993 spin_unlock_irqrestore(&events->lock, status);
73994
73995- if (copy_to_user(buf, pb, p))
73996+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
73997 return -EFAULT;
73998
73999 return p;
74000diff --git a/net/mac80211/util.c b/net/mac80211/util.c
74001index d5230ec..c604b21 100644
74002--- a/net/mac80211/util.c
74003+++ b/net/mac80211/util.c
74004@@ -1000,7 +1000,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
74005 drv_set_coverage_class(local, hw->wiphy->coverage_class);
74006
74007 /* everything else happens only if HW was up & running */
74008- if (!local->open_count)
74009+ if (!local_read(&local->open_count))
74010 goto wake_up;
74011
74012 /*
74013diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
74014index d5597b7..ab6d39c 100644
74015--- a/net/netfilter/Kconfig
74016+++ b/net/netfilter/Kconfig
74017@@ -779,6 +779,16 @@ config NETFILTER_XT_MATCH_ESP
74018
74019 To compile it as a module, choose M here. If unsure, say N.
74020
74021+config NETFILTER_XT_MATCH_GRADM
74022+ tristate '"gradm" match support'
74023+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
74024+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
74025+ ---help---
74026+ The gradm match allows to match on grsecurity RBAC being enabled.
74027+ It is useful when iptables rules are applied early on bootup to
74028+ prevent connections to the machine (except from a trusted host)
74029+ while the RBAC system is disabled.
74030+
74031 config NETFILTER_XT_MATCH_HASHLIMIT
74032 tristate '"hashlimit" match support'
74033 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
74034diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
74035index 1a02853..5d8c22e 100644
74036--- a/net/netfilter/Makefile
74037+++ b/net/netfilter/Makefile
74038@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
74039 obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
74040 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
74041 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
74042+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
74043 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
74044 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
74045 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
74046diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
74047index 29fa5ba..8debc79 100644
74048--- a/net/netfilter/ipvs/ip_vs_conn.c
74049+++ b/net/netfilter/ipvs/ip_vs_conn.c
74050@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
74051 /* Increase the refcnt counter of the dest */
74052 atomic_inc(&dest->refcnt);
74053
74054- conn_flags = atomic_read(&dest->conn_flags);
74055+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
74056 if (cp->protocol != IPPROTO_UDP)
74057 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
74058 /* Bind with the destination and its corresponding transmitter */
74059@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
74060 atomic_set(&cp->refcnt, 1);
74061
74062 atomic_set(&cp->n_control, 0);
74063- atomic_set(&cp->in_pkts, 0);
74064+ atomic_set_unchecked(&cp->in_pkts, 0);
74065
74066 atomic_inc(&ipvs->conn_count);
74067 if (flags & IP_VS_CONN_F_NO_CPORT)
74068@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
74069
74070 /* Don't drop the entry if its number of incoming packets is not
74071 located in [0, 8] */
74072- i = atomic_read(&cp->in_pkts);
74073+ i = atomic_read_unchecked(&cp->in_pkts);
74074 if (i > 8 || i < 0) return 0;
74075
74076 if (!todrop_rate[i]) return 0;
74077diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
74078index 093cc32..9209ae1 100644
74079--- a/net/netfilter/ipvs/ip_vs_core.c
74080+++ b/net/netfilter/ipvs/ip_vs_core.c
74081@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
74082 ret = cp->packet_xmit(skb, cp, pd->pp);
74083 /* do not touch skb anymore */
74084
74085- atomic_inc(&cp->in_pkts);
74086+ atomic_inc_unchecked(&cp->in_pkts);
74087 ip_vs_conn_put(cp);
74088 return ret;
74089 }
74090@@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
74091 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
74092 pkts = sysctl_sync_threshold(ipvs);
74093 else
74094- pkts = atomic_add_return(1, &cp->in_pkts);
74095+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
74096
74097 if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
74098 cp->protocol == IPPROTO_SCTP) {
74099diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
74100index e1a66cf..0910076 100644
74101--- a/net/netfilter/ipvs/ip_vs_ctl.c
74102+++ b/net/netfilter/ipvs/ip_vs_ctl.c
74103@@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
74104 ip_vs_rs_hash(ipvs, dest);
74105 write_unlock_bh(&ipvs->rs_lock);
74106 }
74107- atomic_set(&dest->conn_flags, conn_flags);
74108+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
74109
74110 /* bind the service */
74111 if (!dest->svc) {
74112@@ -2028,7 +2028,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
74113 " %-7s %-6d %-10d %-10d\n",
74114 &dest->addr.in6,
74115 ntohs(dest->port),
74116- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
74117+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
74118 atomic_read(&dest->weight),
74119 atomic_read(&dest->activeconns),
74120 atomic_read(&dest->inactconns));
74121@@ -2039,7 +2039,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
74122 "%-7s %-6d %-10d %-10d\n",
74123 ntohl(dest->addr.ip),
74124 ntohs(dest->port),
74125- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
74126+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
74127 atomic_read(&dest->weight),
74128 atomic_read(&dest->activeconns),
74129 atomic_read(&dest->inactconns));
74130@@ -2509,7 +2509,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
74131
74132 entry.addr = dest->addr.ip;
74133 entry.port = dest->port;
74134- entry.conn_flags = atomic_read(&dest->conn_flags);
74135+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
74136 entry.weight = atomic_read(&dest->weight);
74137 entry.u_threshold = dest->u_threshold;
74138 entry.l_threshold = dest->l_threshold;
74139@@ -3042,7 +3042,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
74140 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
74141
74142 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
74143- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
74144+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
74145 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
74146 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
74147 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
74148diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
74149index 2b6678c0..aaa41fc 100644
74150--- a/net/netfilter/ipvs/ip_vs_sync.c
74151+++ b/net/netfilter/ipvs/ip_vs_sync.c
74152@@ -649,7 +649,7 @@ control:
74153 * i.e only increment in_pkts for Templates.
74154 */
74155 if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
74156- int pkts = atomic_add_return(1, &cp->in_pkts);
74157+ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
74158
74159 if (pkts % sysctl_sync_period(ipvs) != 1)
74160 return;
74161@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
74162
74163 if (opt)
74164 memcpy(&cp->in_seq, opt, sizeof(*opt));
74165- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
74166+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
74167 cp->state = state;
74168 cp->old_state = cp->state;
74169 /*
74170diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
74171index aa2d720..d8aa111 100644
74172--- a/net/netfilter/ipvs/ip_vs_xmit.c
74173+++ b/net/netfilter/ipvs/ip_vs_xmit.c
74174@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
74175 else
74176 rc = NF_ACCEPT;
74177 /* do not touch skb anymore */
74178- atomic_inc(&cp->in_pkts);
74179+ atomic_inc_unchecked(&cp->in_pkts);
74180 goto out;
74181 }
74182
74183@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
74184 else
74185 rc = NF_ACCEPT;
74186 /* do not touch skb anymore */
74187- atomic_inc(&cp->in_pkts);
74188+ atomic_inc_unchecked(&cp->in_pkts);
74189 goto out;
74190 }
74191
74192diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
74193index 66b2c54..c7884e3 100644
74194--- a/net/netfilter/nfnetlink_log.c
74195+++ b/net/netfilter/nfnetlink_log.c
74196@@ -70,7 +70,7 @@ struct nfulnl_instance {
74197 };
74198
74199 static DEFINE_SPINLOCK(instances_lock);
74200-static atomic_t global_seq;
74201+static atomic_unchecked_t global_seq;
74202
74203 #define INSTANCE_BUCKETS 16
74204 static struct hlist_head instance_table[INSTANCE_BUCKETS];
74205@@ -502,7 +502,7 @@ __build_packet_message(struct nfulnl_instance *inst,
74206 /* global sequence number */
74207 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
74208 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
74209- htonl(atomic_inc_return(&global_seq)));
74210+ htonl(atomic_inc_return_unchecked(&global_seq)));
74211
74212 if (data_len) {
74213 struct nlattr *nla;
74214diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
74215new file mode 100644
74216index 0000000..6905327
74217--- /dev/null
74218+++ b/net/netfilter/xt_gradm.c
74219@@ -0,0 +1,51 @@
74220+/*
74221+ * gradm match for netfilter
74222